diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index 27457567120..508bb929b6a 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -82,7 +82,7 @@ Pipelines + Other Objects -> Pipe network return (src.connect_types & target.connect_types) /obj/machinery/atmospherics/attackby(atom/A, mob/user as mob) - if(istype(A, /obj/item/device/pipe_painter)) + if(istype(A, /obj/item/pipe_painter)) return ..() diff --git a/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm b/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm index f4207eeba5e..ea25730ea81 100644 --- a/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm +++ b/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm @@ -5,7 +5,7 @@ desc = "An oxygen generator using algae to convert carbon dioxide to oxygen." icon = 'icons/obj/machines/algae_vr.dmi' icon_state = "algae-off" - circuit = /obj/item/weapon/circuitboard/algae_farm + circuit = /obj/item/circuitboard/algae_farm anchored = TRUE density = TRUE power_channel = EQUIP @@ -123,7 +123,7 @@ icon_state = "algae-on" return 1 -/obj/machinery/atmospherics/binary/algae_farm/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/atmospherics/binary/algae_farm/attackby(obj/item/W as obj, mob/user as mob) add_fingerprint(user) if(default_deconstruction_screwdriver(user, W)) return @@ -149,12 +149,12 @@ var/bin_rating = 0 var/manip_rating = 0 - for(var/obj/item/weapon/stock_parts/P in component_parts) - if(istype(P, /obj/item/weapon/stock_parts/capacitor)) + for(var/obj/item/stock_parts/P in component_parts) + if(istype(P, /obj/item/stock_parts/capacitor)) cap_rating += P.rating - if(istype(P, /obj/item/weapon/stock_parts/matter_bin)) + if(istype(P, /obj/item/stock_parts/matter_bin)) bin_rating += P.rating - if(istype(P, /obj/item/weapon/stock_parts/manipulator)) + if(istype(P, /obj/item/stock_parts/manipulator)) manip_rating += P.rating power_per_mole = round(initial(power_per_mole) / cap_rating) diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm index c3f6b81ee3f..00a88c02375 100644 --- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm +++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm @@ -91,7 +91,7 @@ return 1 -/obj/machinery/atmospherics/binary/circulator/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/atmospherics/binary/circulator/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) playsound(src, W.usesound, 75, 1) anchored = !anchored diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 5d39a608513..900699b8c51 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -278,7 +278,7 @@ update_icon() add_fingerprint(usr) -/obj/machinery/atmospherics/binary/passive_gate/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/atmospherics/binary/passive_gate/attackby(var/obj/item/W as obj, var/mob/user as mob) if (!W.has_tool_quality(TOOL_WRENCH)) return ..() if (unlocked) diff --git a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm index 6b0f40b8b4c..664708ac2dc 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm @@ -81,7 +81,7 @@ if (kin_energy > 1000000) add_overlay(image('icons/obj/pipeturbine.dmi', "hi-turb")) -/obj/machinery/atmospherics/pipeturbine/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/atmospherics/pipeturbine/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) anchored = !anchored playsound(src, W.usesound, 50, 1) @@ -255,7 +255,7 @@ turbine.kin_energy -= power_generated add_avail(power_generated) -/obj/machinery/power/turbinemotor/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/power/turbinemotor/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) anchored = !anchored playsound(src, W.usesound, 50, 1) diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 3e22ea310d5..7951dda69a2 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -238,7 +238,7 @@ Thus, the two variables affect pump operation are set in New(): if(old_stat != stat) update_icon() -/obj/machinery/atmospherics/binary/pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/atmospherics/binary/pump/attackby(var/obj/item/W as obj, var/mob/user as mob) if (!W.has_tool_quality(TOOL_WRENCH)) return ..() if (!(stat & NOPOWER) && use_power) diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm index 77a35c8eae8..615a14ecdcf 100644 --- a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm +++ b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm @@ -79,7 +79,7 @@ if(old_stat != stat) update_icon() -/obj/machinery/atmospherics/omni/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/atmospherics/omni/attackby(var/obj/item/W as obj, var/mob/user as mob) if(!W.has_tool_quality(TOOL_WRENCH)) return ..() diff --git a/code/ATMOSPHERICS/components/portables_connector.dm b/code/ATMOSPHERICS/components/portables_connector.dm index 5d315cf0a05..a8cbd02ed68 100644 --- a/code/ATMOSPHERICS/components/portables_connector.dm +++ b/code/ATMOSPHERICS/components/portables_connector.dm @@ -146,7 +146,7 @@ return null -/obj/machinery/atmospherics/portables_connector/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/atmospherics/portables_connector/attackby(var/obj/item/W as obj, var/mob/user as mob) if (!W.has_tool_quality(TOOL_WRENCH)) return ..() if (connected_device) diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index 1bae066a69d..be7a36bed28 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -51,7 +51,7 @@ if(old_stat != stat) update_icon() -/obj/machinery/atmospherics/trinary/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/atmospherics/trinary/attackby(var/obj/item/W as obj, var/mob/user as mob) if (!W.has_tool_quality(TOOL_WRENCH)) return ..() if(!can_unwrench()) diff --git a/code/ATMOSPHERICS/components/tvalve.dm b/code/ATMOSPHERICS/components/tvalve.dm index 5edf6966965..2681a688eb4 100644 --- a/code/ATMOSPHERICS/components/tvalve.dm +++ b/code/ATMOSPHERICS/components/tvalve.dm @@ -326,7 +326,7 @@ else go_to_side() -/obj/machinery/atmospherics/tvalve/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/atmospherics/tvalve/attackby(var/obj/item/W as obj, var/mob/user as mob) if (!W.has_tool_quality(TOOL_WRENCH)) return ..() if(!can_unwrench()) diff --git a/code/ATMOSPHERICS/components/unary/cold_sink.dm b/code/ATMOSPHERICS/components/unary/cold_sink.dm index ed391dec5fb..9923078311b 100644 --- a/code/ATMOSPHERICS/components/unary/cold_sink.dm +++ b/code/ATMOSPHERICS/components/unary/cold_sink.dm @@ -10,7 +10,7 @@ anchored = TRUE use_power = USE_POWER_OFF idle_power_usage = 5 // 5 Watts for thermostat related circuitry - circuit = /obj/item/weapon/circuitboard/unary_atmos/cooler + circuit = /obj/item/circuitboard/unary_atmos/cooler var/heatsink_temperature = T20C // The constant temperature reservoir into which the freezer pumps heat. Probably the hull of the station or something. var/internal_volume = 600 // L @@ -142,12 +142,12 @@ var/manip_rating = 0 var/bin_rating = 0 - for(var/obj/item/weapon/stock_parts/P in component_parts) - if(istype(P, /obj/item/weapon/stock_parts/capacitor)) + for(var/obj/item/stock_parts/P in component_parts) + if(istype(P, /obj/item/stock_parts/capacitor)) cap_rating += P.rating - if(istype(P, /obj/item/weapon/stock_parts/manipulator)) + if(istype(P, /obj/item/stock_parts/manipulator)) manip_rating += P.rating - if(istype(P, /obj/item/weapon/stock_parts/matter_bin)) + if(istype(P, /obj/item/stock_parts/matter_bin)) bin_rating += P.rating max_power_rating = initial(max_power_rating) * cap_rating / 2 //more powerful diff --git a/code/ATMOSPHERICS/components/unary/heat_exchanger.dm b/code/ATMOSPHERICS/components/unary/heat_exchanger.dm index cc50782d71c..2dd23c362f6 100644 --- a/code/ATMOSPHERICS/components/unary/heat_exchanger.dm +++ b/code/ATMOSPHERICS/components/unary/heat_exchanger.dm @@ -66,7 +66,7 @@ return 1 -/obj/machinery/atmospherics/unary/heat_exchanger/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/atmospherics/unary/heat_exchanger/attackby(var/obj/item/W as obj, var/mob/user as mob) if (!W.has_tool_quality(TOOL_WRENCH)) return ..() var/turf/T = src.loc diff --git a/code/ATMOSPHERICS/components/unary/heat_source.dm b/code/ATMOSPHERICS/components/unary/heat_source.dm index 85b0dcb821e..67839d7d3ae 100644 --- a/code/ATMOSPHERICS/components/unary/heat_source.dm +++ b/code/ATMOSPHERICS/components/unary/heat_source.dm @@ -10,7 +10,7 @@ anchored = TRUE use_power = USE_POWER_OFF idle_power_usage = 5 //5 Watts for thermostat related circuitry - circuit = /obj/item/weapon/circuitboard/unary_atmos/heater + circuit = /obj/item/circuitboard/unary_atmos/heater var/max_temperature = T20C + 680 var/internal_volume = 600 //L @@ -131,10 +131,10 @@ var/cap_rating = 0 var/bin_rating = 0 - for(var/obj/item/weapon/stock_parts/P in component_parts) - if(istype(P, /obj/item/weapon/stock_parts/capacitor)) + for(var/obj/item/stock_parts/P in component_parts) + if(istype(P, /obj/item/stock_parts/capacitor)) cap_rating += P.rating - if(istype(P, /obj/item/weapon/stock_parts/matter_bin)) + if(istype(P, /obj/item/stock_parts/matter_bin)) bin_rating += P.rating max_power_rating = initial(max_power_rating) * cap_rating / 2 diff --git a/code/ATMOSPHERICS/components/unary/outlet_injector.dm b/code/ATMOSPHERICS/components/unary/outlet_injector.dm index 8002d79ad55..e4f90c1afc7 100644 --- a/code/ATMOSPHERICS/components/unary/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary/outlet_injector.dm @@ -163,7 +163,7 @@ update_use_power(injecting ? USE_POWER_IDLE : USE_POWER_OFF) update_icon() -/obj/machinery/atmospherics/unary/outlet_injector/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/atmospherics/unary/outlet_injector/attackby(var/obj/item/W as obj, var/mob/user as mob) if (!W.has_tool_quality(TOOL_WRENCH)) return ..() diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index 487499f6974..75c82aed60d 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -391,7 +391,7 @@ /obj/machinery/atmospherics/unary/vent_pump/attackby(obj/item/W, mob/user) if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if (WT.remove_fuel(0,user)) to_chat(user, "Now welding the vent.") if(do_after(user, 20 * WT.toolspeed)) @@ -428,7 +428,7 @@ if(old_stat != stat) update_icon() -/obj/machinery/atmospherics/unary/vent_pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/atmospherics/unary/vent_pump/attackby(var/obj/item/W as obj, var/mob/user as mob) if (!W.has_tool_quality(TOOL_WRENCH)) return ..() if (!(stat & NOPOWER) && use_power) diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm index 1a57841a694..da968549869 100644 --- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm @@ -269,7 +269,7 @@ if(old_stat != stat) update_icon() -/obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/W as obj, var/mob/user as mob) if (!W.has_tool_quality(TOOL_WRENCH)) return ..() if (!(stat & NOPOWER) && use_power) diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm index 1996c223366..3334f298913 100644 --- a/code/ATMOSPHERICS/components/valve.dm +++ b/code/ATMOSPHERICS/components/valve.dm @@ -287,7 +287,7 @@ else open() -/obj/machinery/atmospherics/valve/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/atmospherics/valve/attackby(var/obj/item/W as obj, var/mob/user as mob) if (!W.has_tool_quality(TOOL_WRENCH)) return ..() if (istype(src, /obj/machinery/atmospherics/valve/digital) && !src.allowed(user)) diff --git a/code/ATMOSPHERICS/pipes/pipe_base.dm b/code/ATMOSPHERICS/pipes/pipe_base.dm index d06b192a1a3..04ef9a3457a 100644 --- a/code/ATMOSPHERICS/pipes/pipe_base.dm +++ b/code/ATMOSPHERICS/pipes/pipe_base.dm @@ -109,11 +109,11 @@ qdel(meter) . = ..() -/obj/machinery/atmospherics/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/atmospherics/pipe/attackby(var/obj/item/W as obj, var/mob/user as mob) if (istype(src, /obj/machinery/atmospherics/pipe/tank)) return ..() - if(istype(W,/obj/item/device/pipe_painter)) + if(istype(W,/obj/item/pipe_painter)) return 0 if (!W.has_tool_quality(TOOL_WRENCH)) diff --git a/code/ATMOSPHERICS/pipes/tank.dm b/code/ATMOSPHERICS/pipes/tank.dm index 63807862880..0476d906a12 100644 --- a/code/ATMOSPHERICS/pipes/tank.dm +++ b/code/ATMOSPHERICS/pipes/tank.dm @@ -67,7 +67,7 @@ return null /obj/machinery/atmospherics/pipe/tank/attackby(var/obj/item/W as obj, var/mob/user as mob) - if(istype(W, /obj/item/device/pipe_painter)) + if(istype(W, /obj/item/pipe_painter)) return /obj/machinery/atmospherics/pipe/tank/air diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm index a8c797ec2a3..58e74ca4fad 100644 --- a/code/ZAS/Phoron.dm +++ b/code/ZAS/Phoron.dm @@ -45,7 +45,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') //Clothing and backpacks can be contaminated. if(flags & PHORONGUARD) return 0 - else if(istype(src,/obj/item/weapon/storage/backpack)) + else if(istype(src,/obj/item/storage/backpack)) return 0 //Cannot be washed :( //VOREStation Addition start else if(isbelly(loc)) @@ -82,7 +82,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi') suit_contamination() //Phoron can sometimes get through such an open suit. //Cannot wash backpacks currently. -// if(istype(back,/obj/item/weapon/storage/backpack)) +// if(istype(back,/obj/item/storage/backpack)) // back.contaminate() /mob/proc/pl_effects() diff --git a/code/__defines/is_helpers.dm b/code/__defines/is_helpers.dm index 6c924ecb3ec..1039819289e 100644 --- a/code/__defines/is_helpers.dm +++ b/code/__defines/is_helpers.dm @@ -13,13 +13,13 @@ #define isitem(D) istype(D, /obj/item) -#define isradio(A) istype(A, /obj/item/device/radio) +#define isradio(A) istype(A, /obj/item/radio) #define isairlock(A) istype(A, /obj/machinery/door/airlock) #define isorgan(A) istype(A, /obj/item/organ/external) -#define isstorage(A) istype(A, /obj/item/weapon/storage) +#define isstorage(A) istype(A, /obj/item/storage) #define ismecha(A) istype(A, /obj/mecha) diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm index 76e5b0b7682..2721e2ebdfe 100644 --- a/code/__defines/machinery.dm +++ b/code/__defines/machinery.dm @@ -172,15 +172,15 @@ if (!(DATUM.datum_flags & DF_ISPROCESSING)) {\ #define LOGIN_TYPE_ROBOT 3 // Computer Hardware -#define PART_CPU /obj/item/weapon/computer_hardware/processor_unit // CPU. Without it the computer won't run. Better CPUs can run more programs at once. -#define PART_NETWORK /obj/item/weapon/computer_hardware/network_card // Network Card component of this computer. Allows connection to NTNet -#define PART_HDD /obj/item/weapon/computer_hardware/hard_drive // Hard Drive component of this computer. Stores programs and files. +#define PART_CPU /obj/item/computer_hardware/processor_unit // CPU. Without it the computer won't run. Better CPUs can run more programs at once. +#define PART_NETWORK /obj/item/computer_hardware/network_card // Network Card component of this computer. Allows connection to NTNet +#define PART_HDD /obj/item/computer_hardware/hard_drive // Hard Drive component of this computer. Stores programs and files. // Optional hardware (improves functionality, but is not critical for computer to work in most cases) -#define PART_BATTERY /obj/item/weapon/computer_hardware/battery_module // An internal power source for this computer. Can be recharged. -#define PART_CARD /obj/item/weapon/computer_hardware/card_slot // ID Card slot component of this computer. Mostly for HoP modification console that needs ID slot for modification. -#define PART_PRINTER /obj/item/weapon/computer_hardware/nano_printer // Nano Printer component of this computer, for your everyday paperwork needs. -//#define PART_DRIVE /obj/item/weapon/computer_hardware/hard_drive/portable // Portable data storage -//#define PART_AI /obj/item/weapon/computer_hardware/ai_slot // AI slot, an intellicard housing that allows modifications of AIs. -#define PART_TESLA /obj/item/weapon/computer_hardware/tesla_link // Tesla Link, Allows remote charging from nearest APC. -//#define PART_SCANNER /obj/item/weapon/computer_hardware/scanner // One of several optional scanner attachments. +#define PART_BATTERY /obj/item/computer_hardware/battery_module // An internal power source for this computer. Can be recharged. +#define PART_CARD /obj/item/computer_hardware/card_slot // ID Card slot component of this computer. Mostly for HoP modification console that needs ID slot for modification. +#define PART_PRINTER /obj/item/computer_hardware/nano_printer // Nano Printer component of this computer, for your everyday paperwork needs. +//#define PART_DRIVE /obj/item/computer_hardware/hard_drive/portable // Portable data storage +//#define PART_AI /obj/item/computer_hardware/ai_slot // AI slot, an intellicard housing that allows modifications of AIs. +#define PART_TESLA /obj/item/computer_hardware/tesla_link // Tesla Link, Allows remote charging from nearest APC. +//#define PART_SCANNER /obj/item/computer_hardware/scanner // One of several optional scanner attachments. diff --git a/code/__defines/plants.dm b/code/__defines/plants.dm index bca340f2d38..cd4dc9e701c 100644 --- a/code/__defines/plants.dm +++ b/code/__defines/plants.dm @@ -88,21 +88,21 @@ GLOBAL_LIST_INIT(plant_item_products, list( /obj/item/stack/material/wax = 20, /obj/item/stack/material/log = 30, /obj/item/stack/material/resin = 10, - /obj/item/weapon/material/shard/shrapnel = 2, - /obj/item/weapon/ore = 5, - /obj/item/weapon/ore/iron = 2, - /obj/item/weapon/ore/coal = 2, - /obj/item/weapon/reagent_containers/food/snacks/meat = 3, + /obj/item/material/shard/shrapnel = 2, + /obj/item/ore = 5, + /obj/item/ore/iron = 2, + /obj/item/ore/coal = 2, + /obj/item/reagent_containers/food/snacks/meat = 3, /obj/random/meat = 1, - /obj/item/weapon/reagent_containers/food/drinks/smallchocmilk = 2, - /obj/item/weapon/reagent_containers/food/drinks/smallmilk = 2, + /obj/item/reagent_containers/food/drinks/smallchocmilk = 2, + /obj/item/reagent_containers/food/drinks/smallmilk = 2, /obj/item/ammo_casing/a145 = 1, /obj/item/ammo_casing/chemdart/small = 1, /obj/item/ammo_casing/chemdart = 1, /obj/item/organ/internal/brain/grey = 1, /obj/item/organ/internal/heart/grey = 1, - /obj/item/weapon/spacecash/c1 = 3, - /obj/item/weapon/spacecash/c5 = 1 + /obj/item/spacecash/c1 = 3, + /obj/item/spacecash/c5 = 1 )) GLOBAL_LIST_INIT(forbidden_plant_growth_sprites, list( diff --git a/code/_helpers/atmospherics.dm b/code/_helpers/atmospherics.dm index 25fd699b32b..709b35aba82 100644 --- a/code/_helpers/atmospherics.dm +++ b/code/_helpers/atmospherics.dm @@ -35,7 +35,7 @@ /atom/proc/atmosanalyze(var/mob/user) return -/obj/item/weapon/tank/atmosanalyze(var/mob/user) +/obj/item/tank/atmosanalyze(var/mob/user) return atmosanalyzer_scan(src, src.air_contents, user) /obj/machinery/portable_atmospherics/atmosanalyze(var/mob/user) @@ -74,5 +74,5 @@ /obj/machinery/power/rad_collector/atmosanalyze(var/mob/user) if(P) return atmosanalyzer_scan(src, src.P.air_contents, user) -/obj/item/weapon/flamethrower/atmosanalyze(var/mob/user) +/obj/item/flamethrower/atmosanalyze(var/mob/user) if(ptank) return atmosanalyzer_scan(src, ptank.air_contents, user) diff --git a/code/_helpers/game.dm b/code/_helpers/game.dm index 488b31d2a2c..1f76dcac9a3 100644 --- a/code/_helpers/game.dm +++ b/code/_helpers/game.dm @@ -219,14 +219,14 @@ return hear -/proc/get_mobs_in_radio_ranges(var/list/obj/item/device/radio/radios) +/proc/get_mobs_in_radio_ranges(var/list/obj/item/radio/radios) set background = 1 . = list() // Returns a list of mobs who can hear any of the radios given in @radios var/list/speaker_coverage = list() - for(var/obj/item/device/radio/R as anything in radios) + for(var/obj/item/radio/R as anything in radios) var/turf/speaker = get_turf(R) if(speaker) for(var/turf/T in hear(R.canhear_range,speaker)) @@ -248,7 +248,7 @@ /mob/living/silicon/robot/can_hear_radio(var/list/hearturfs) var/turf/T = get_turf(src) - var/obj/item/device/radio/borg/R = hearturfs[T] // this should be an assoc list of turf-to-radio + var/obj/item/radio/borg/R = hearturfs[T] // this should be an assoc list of turf-to-radio // We heard it on our own radio? We use power for that. if(istype(R) && R.myborg == src) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index af847b93494..adb7c5cdf81 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -42,14 +42,14 @@ var/global/list/vantag_choices_list = list( //Blacklist to exclude items from object ingestion. Digestion blacklist located in digest_act_vr.dm var/global/list/item_vore_blacklist = list( - /obj/item/weapon/hand_tele, - /obj/item/weapon/card/id/gold/captain/spare, - /obj/item/weapon/gun, - /obj/item/weapon/pinpointer, + /obj/item/hand_tele, + /obj/item/card/id/gold/captain/spare, + /obj/item/gun, + /obj/item/pinpointer, /obj/item/clothing/shoes/magboots, /obj/item/areaeditor/blueprints, /obj/item/clothing/head/helmet/space, - /obj/item/weapon/disk/nuclear, + /obj/item/disk/nuclear, /obj/item/clothing/suit/storage/hooded/wintercoat/roiz) //Classic Vore sounds @@ -154,94 +154,94 @@ var/global/list/global_vore_egg_types = list( "Spotted Pink") var/global/list/tf_vore_egg_types = list( - "Unathi" = /obj/item/weapon/storage/vore_egg/unathi, - "Tajara" = /obj/item/weapon/storage/vore_egg/tajaran, - "Akula" = /obj/item/weapon/storage/vore_egg/shark, - "Skrell" = /obj/item/weapon/storage/vore_egg/skrell, - "Sergal" = /obj/item/weapon/storage/vore_egg/sergal, - "Nevrean" = /obj/item/weapon/storage/vore_egg/nevrean, - "Human" = /obj/item/weapon/storage/vore_egg/human, - "Slime" = /obj/item/weapon/storage/vore_egg/slime, - "Egg" = /obj/item/weapon/storage/vore_egg, - "Xenochimera" = /obj/item/weapon/storage/vore_egg/scree, - "Xenomorph" = /obj/item/weapon/storage/vore_egg/xenomorph, - "Chocolate" = /obj/item/weapon/storage/vore_egg/chocolate, - "Boney" = /obj/item/weapon/storage/vore_egg/owlpellet, - "Slime Glob" = /obj/item/weapon/storage/vore_egg/slimeglob, - "Chicken" = /obj/item/weapon/storage/vore_egg/chicken, - "Synthetic" = /obj/item/weapon/storage/vore_egg/synthetic, - "Bluespace Floppy" = /obj/item/weapon/storage/vore_egg/floppy, - "Bluespace Compressed File" = /obj/item/weapon/storage/vore_egg/file, - "Bluespace CD" = /obj/item/weapon/storage/vore_egg/cd, - "Escape Pod" = /obj/item/weapon/storage/vore_egg/escapepod, - "Cooking Error" = /obj/item/weapon/storage/vore_egg/badrecipe, - "Web Cocoon" = /obj/item/weapon/storage/vore_egg/cocoon, - "Honeycomb" = /obj/item/weapon/storage/vore_egg/honeycomb, - "Bug Cocoon" = /obj/item/weapon/storage/vore_egg/bugcocoon, - "Rock" = /obj/item/weapon/storage/vore_egg/rock, - "Yellow" = /obj/item/weapon/storage/vore_egg/yellow, - "Blue" = /obj/item/weapon/storage/vore_egg/blue, - "Green" = /obj/item/weapon/storage/vore_egg/green, - "Orange" = /obj/item/weapon/storage/vore_egg/orange, - "Purple" = /obj/item/weapon/storage/vore_egg/purple, - "Red" = /obj/item/weapon/storage/vore_egg/red, - "Rainbow" = /obj/item/weapon/storage/vore_egg/rainbow, - "Spotted Pink" = /obj/item/weapon/storage/vore_egg/pinkspots) + "Unathi" = /obj/item/storage/vore_egg/unathi, + "Tajara" = /obj/item/storage/vore_egg/tajaran, + "Akula" = /obj/item/storage/vore_egg/shark, + "Skrell" = /obj/item/storage/vore_egg/skrell, + "Sergal" = /obj/item/storage/vore_egg/sergal, + "Nevrean" = /obj/item/storage/vore_egg/nevrean, + "Human" = /obj/item/storage/vore_egg/human, + "Slime" = /obj/item/storage/vore_egg/slime, + "Egg" = /obj/item/storage/vore_egg, + "Xenochimera" = /obj/item/storage/vore_egg/scree, + "Xenomorph" = /obj/item/storage/vore_egg/xenomorph, + "Chocolate" = /obj/item/storage/vore_egg/chocolate, + "Boney" = /obj/item/storage/vore_egg/owlpellet, + "Slime Glob" = /obj/item/storage/vore_egg/slimeglob, + "Chicken" = /obj/item/storage/vore_egg/chicken, + "Synthetic" = /obj/item/storage/vore_egg/synthetic, + "Bluespace Floppy" = /obj/item/storage/vore_egg/floppy, + "Bluespace Compressed File" = /obj/item/storage/vore_egg/file, + "Bluespace CD" = /obj/item/storage/vore_egg/cd, + "Escape Pod" = /obj/item/storage/vore_egg/escapepod, + "Cooking Error" = /obj/item/storage/vore_egg/badrecipe, + "Web Cocoon" = /obj/item/storage/vore_egg/cocoon, + "Honeycomb" = /obj/item/storage/vore_egg/honeycomb, + "Bug Cocoon" = /obj/item/storage/vore_egg/bugcocoon, + "Rock" = /obj/item/storage/vore_egg/rock, + "Yellow" = /obj/item/storage/vore_egg/yellow, + "Blue" = /obj/item/storage/vore_egg/blue, + "Green" = /obj/item/storage/vore_egg/green, + "Orange" = /obj/item/storage/vore_egg/orange, + "Purple" = /obj/item/storage/vore_egg/purple, + "Red" = /obj/item/storage/vore_egg/red, + "Rainbow" = /obj/item/storage/vore_egg/rainbow, + "Spotted Pink" = /obj/item/storage/vore_egg/pinkspots) var/global/list/edible_trash = list(/obj/item/broken_device, /obj/item/clothing/accessory/collar, - /obj/item/device/communicator, + /obj/item/communicator, /obj/item/clothing/mask, /obj/item/clothing/glasses, /obj/item/clothing/gloves, /obj/item/clothing/head, /obj/item/clothing/shoes, - /obj/item/device/aicard, - /obj/item/device/flashlight, - /obj/item/device/mmi/digital/posibrain, - /obj/item/device/paicard, - /obj/item/device/pda, - /obj/item/device/radio/headset, + /obj/item/aicard, + /obj/item/flashlight, + /obj/item/mmi/digital/posibrain, + /obj/item/paicard, + /obj/item/pda, + /obj/item/radio/headset, /obj/item/inflatable/torn, /obj/item/organ, /obj/item/stack/material/cardboard, /obj/item/toy, /obj/item/trash, - /obj/item/weapon/digestion_remains, - /obj/item/weapon/bananapeel, - /obj/item/weapon/book, - /obj/item/weapon/bone, - /obj/item/weapon/broken_bottle, - /obj/item/weapon/card/emag_broken, + /obj/item/digestion_remains, + /obj/item/bananapeel, + /obj/item/book, + /obj/item/bone, + /obj/item/broken_bottle, + /obj/item/card/emag_broken, /obj/item/trash/cigbutt, - /obj/item/weapon/circuitboard/broken, - /obj/item/weapon/clipboard, - /obj/item/weapon/corncob, - /obj/item/weapon/dice, - /obj/item/weapon/flame, - /obj/item/weapon/light, - /obj/item/weapon/lipstick, - /obj/item/weapon/material/shard, - /obj/item/weapon/newspaper, - /obj/item/weapon/paper, - /obj/item/weapon/paperplane, - /obj/item/weapon/pen, - /obj/item/weapon/photo, - /obj/item/weapon/reagent_containers/food, - /obj/item/weapon/reagent_containers/glass/rag, - /obj/item/weapon/soap, - /obj/item/weapon/spacecash, - /obj/item/weapon/storage/box/khcrystal, - /obj/item/weapon/storage/box/matches, - /obj/item/weapon/storage/box/wings, - /obj/item/weapon/storage/fancy/candle_box, - /obj/item/weapon/storage/fancy/cigarettes, - /obj/item/weapon/storage/fancy/crayons, - /obj/item/weapon/storage/fancy/egg_box, - /obj/item/weapon/storage/wallet, - /obj/item/weapon/storage/vore_egg, - /obj/item/weapon/bikehorn/tinytether, - /obj/item/weapon/entrepreneur, + /obj/item/circuitboard/broken, + /obj/item/clipboard, + /obj/item/corncob, + /obj/item/dice, + /obj/item/flame, + /obj/item/light, + /obj/item/lipstick, + /obj/item/material/shard, + /obj/item/newspaper, + /obj/item/paper, + /obj/item/paperplane, + /obj/item/pen, + /obj/item/photo, + /obj/item/reagent_containers/food, + /obj/item/reagent_containers/glass/rag, + /obj/item/soap, + /obj/item/spacecash, + /obj/item/storage/box/khcrystal, + /obj/item/storage/box/matches, + /obj/item/storage/box/wings, + /obj/item/storage/fancy/candle_box, + /obj/item/storage/fancy/cigarettes, + /obj/item/storage/fancy/crayons, + /obj/item/storage/fancy/egg_box, + /obj/item/storage/wallet, + /obj/item/storage/vore_egg, + /obj/item/bikehorn/tinytether, + /obj/item/entrepreneur, /obj/item/capture_crystal, /obj/item/roulette_ball, /obj/item/pizzabox diff --git a/code/_helpers/mobs.dm b/code/_helpers/mobs.dm index dd2dde46825..442dcbf5990 100644 --- a/code/_helpers/mobs.dm +++ b/code/_helpers/mobs.dm @@ -136,7 +136,7 @@ Proc for attack log creation, because really why not return (thing in R.module.modules) /proc/get_exposed_defense_zone(var/atom/movable/target) - var/obj/item/weapon/grab/G = locate() in target + var/obj/item/grab/G = locate() in target if(G && G.state >= GRAB_NECK) //works because mobs are currently not allowed to upgrade to NECK if they are grabbing two people. return pick(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_FOOT, BP_R_FOOT, BP_L_ARM, BP_R_ARM, BP_L_LEG, BP_R_LEG) else diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index 8a722ac7676..dea6c6c5c4f 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -315,16 +315,16 @@ Turf and target are seperate in case you want to teleport some distance from a t var/search_pda = 1 for(var/A in searching) - if( search_id && istype(A,/obj/item/weapon/card/id) ) - var/obj/item/weapon/card/id/ID = A + if( search_id && istype(A,/obj/item/card/id) ) + var/obj/item/card/id/ID = A if(ID.registered_name == oldname) ID.registered_name = newname ID.name = "[newname]'s ID Card ([ID.assignment])" if(!search_pda) break search_id = 0 - else if( search_pda && istype(A,/obj/item/device/pda) ) - var/obj/item/device/pda/PDA = A + else if( search_pda && istype(A,/obj/item/pda) ) + var/obj/item/pda/PDA = A if(PDA.owner == oldname) PDA.owner = newname PDA.name = "PDA-[newname] ([PDA.ownjob])" @@ -1030,13 +1030,13 @@ Turf and target are seperate in case you want to teleport some distance from a t //Quick type checks for some tools var/global/list/common_tools = list( /obj/item/stack/cable_coil, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/weldingtool, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/wirecutters, -/obj/item/device/multitool, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/transforming) +/obj/item/tool/wrench, +/obj/item/weldingtool, +/obj/item/tool/screwdriver, +/obj/item/tool/wirecutters, +/obj/item/multitool, +/obj/item/tool/crowbar, +/obj/item/tool/transforming) /proc/istool(O) if(O && is_type_in_list(O, common_tools)) @@ -1045,32 +1045,32 @@ var/global/list/common_tools = list( /proc/is_wire_tool(obj/item/I) - if(istype(I, /obj/item/device/multitool) || I.has_tool_quality(TOOL_WIRECUTTER)) + if(istype(I, /obj/item/multitool) || I.has_tool_quality(TOOL_WIRECUTTER)) return TRUE - if(istype(I, /obj/item/device/assembly/signaler)) + if(istype(I, /obj/item/assembly/signaler)) return TRUE return /proc/is_hot(obj/item/W as obj) switch(W.type) - if(/obj/item/weapon/weldingtool) - var/obj/item/weapon/weldingtool/WT = W + if(/obj/item/weldingtool) + var/obj/item/weldingtool/WT = W if(WT.isOn()) return 3800 else return 0 - if(/obj/item/weapon/tool/transforming) - var/obj/item/weapon/tool/transforming/TT = W + if(/obj/item/tool/transforming) + var/obj/item/tool/transforming/TT = W if(TT.possible_tooltypes[TT.current_tooltype] == TOOL_WELDER) return 3800 else return 0 - if(/obj/item/weapon/flame/lighter) + if(/obj/item/flame/lighter) if(W:lit) return 1500 else return 0 - if(/obj/item/weapon/flame/match) + if(/obj/item/flame/match) if(W:lit) return 1000 else @@ -1080,9 +1080,9 @@ var/global/list/common_tools = list( return 1000 else return 0 - if(/obj/item/weapon/pickaxe/plasmacutter) + if(/obj/item/pickaxe/plasmacutter) return 3800 - if(/obj/item/weapon/melee/energy) + if(/obj/item/melee/energy) return 3500 else return 0 @@ -1113,12 +1113,12 @@ var/global/list/common_tools = list( return TRUE return ( \ W.has_tool_quality(TOOL_SCREWDRIVER) || \ - istype(W, /obj/item/weapon/pen) || \ - istype(W, /obj/item/weapon/weldingtool) || \ - istype(W, /obj/item/weapon/flame/lighter/zippo) || \ - istype(W, /obj/item/weapon/flame/match) || \ + istype(W, /obj/item/pen) || \ + istype(W, /obj/item/weldingtool) || \ + istype(W, /obj/item/flame/lighter/zippo) || \ + istype(W, /obj/item/flame/match) || \ istype(W, /obj/item/clothing/mask/smokable/cigarette) || \ - istype(W, /obj/item/weapon/shovel) \ + istype(W, /obj/item/shovel) \ ) // check if mob is lying down on something we can operate him on. @@ -1153,12 +1153,12 @@ Checks if that loc and dir has a item on the wall TODO - Fix this ancient list of wall items. Preferably make it dynamically populated. ~Leshana */ var/list/WALLITEMS = list( - /obj/machinery/power/apc, /obj/machinery/alarm, /obj/item/device/radio/intercom, /obj/structure/frame, + /obj/machinery/power/apc, /obj/machinery/alarm, /obj/item/radio/intercom, /obj/structure/frame, /obj/structure/extinguisher_cabinet, /obj/structure/reagent_dispensers/peppertank, /obj/machinery/status_display, /obj/machinery/requests_console, /obj/machinery/light_switch, /obj/structure/sign, /obj/machinery/newscaster, /obj/machinery/firealarm, /obj/structure/noticeboard, /obj/machinery/button/remote, /obj/machinery/computer/security/telescreen, /obj/machinery/embedded_controller/radio, - /obj/item/weapon/storage/secure/safe, /obj/machinery/door_timer, /obj/machinery/flasher, /obj/machinery/keycard_auth, + /obj/item/storage/secure/safe, /obj/machinery/door_timer, /obj/machinery/flasher, /obj/machinery/keycard_auth, /obj/structure/mirror, /obj/structure/fireaxecabinet, /obj/machinery/computer/security/telescreen/entertainment ) /proc/gotwallitem(loc, dir) @@ -1463,12 +1463,12 @@ var/mob/dview/dview_mob = new var/typename = "[type]" var/static/list/TYPES_SHORTCUTS = list( /obj/effect/decal/cleanable = "CLEANABLE", - /obj/item/device/radio/headset = "HEADSET", + /obj/item/radio/headset = "HEADSET", /obj/item/clothing/head/helmet/space = "SPESSHELMET", - /obj/item/weapon/book/manual = "MANUAL", - /obj/item/weapon/reagent_containers/food/drinks = "DRINK", - /obj/item/weapon/reagent_containers/food = "FOOD", - /obj/item/weapon/reagent_containers = "REAGENT_CONTAINERS", + /obj/item/book/manual = "MANUAL", + /obj/item/reagent_containers/food/drinks = "DRINK", + /obj/item/reagent_containers/food = "FOOD", + /obj/item/reagent_containers = "REAGENT_CONTAINERS", /obj/machinery/atmospherics = "ATMOS_MECH", /obj/machinery/portable_atmospherics = "PORT_ATMOS", /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack = "MECHA_MISSILE_RACK", diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 8dfcdf9b5b6..f2bf342061b 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -480,7 +480,7 @@ var/list/global_huds = list( * All these do is manage the amount of huds on screen and set the HUD. */ ///Add an ammo hud to the user informing of the ammo count of G -/datum/hud/proc/add_ammo_hud(mob/living/user, obj/item/weapon/gun/G) +/datum/hud/proc/add_ammo_hud(mob/living/user, obj/item/gun/G) if(length(ammo_hud_list) >= MAX_AMMO_HUD_POSSIBLE) return var/obj/screen/ammo/ammo_hud = new @@ -490,7 +490,7 @@ var/list/global_huds = list( ammo_hud.update_hud(user, G) ///Remove the ammo hud related to the gun G from the user -/datum/hud/proc/remove_ammo_hud(mob/living/user, obj/item/weapon/gun/G) +/datum/hud/proc/remove_ammo_hud(mob/living/user, obj/item/gun/G) var/obj/screen/ammo/ammo_hud = ammo_hud_list[G] if(isnull(ammo_hud)) return @@ -504,7 +504,7 @@ var/list/global_huds = list( i++ ///Update the ammo hud related to the gun G -/datum/hud/proc/update_ammo_hud(mob/living/user, obj/item/weapon/gun/G) +/datum/hud/proc/update_ammo_hud(mob/living/user, obj/item/gun/G) var/obj/screen/ammo/ammo_hud = ammo_hud_list[G] ammo_hud?.update_hud(user, G) diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 44197fdcf4b..9a7c8e200d0 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -250,7 +250,7 @@ internals = new /obj/screen() internals.icon = HUD.ui_style internals.icon_state = "internal0" - if(istype(internal, /obj/item/weapon/tank)) //Internals on already? Iight, prove it + if(istype(internal, /obj/item/tank)) //Internals on already? Iight, prove it internals.icon_state = "internal1" internals.name = "internal" internals.screen_loc = ui_internal diff --git a/code/_onclick/hud/minihud_mapper.dm b/code/_onclick/hud/minihud_mapper.dm index 1b9246d7295..6c58be26945 100644 --- a/code/_onclick/hud/minihud_mapper.dm +++ b/code/_onclick/hud/minihud_mapper.dm @@ -1,6 +1,6 @@ // Specific types /datum/mini_hud/mapper - var/obj/item/device/mapping_unit/owner + var/obj/item/mapping_unit/owner /datum/mini_hud/mapper/New(var/datum/hud/other, owner) src.owner = owner diff --git a/code/_onclick/hud/minihud_rigmech.dm b/code/_onclick/hud/minihud_rigmech.dm index b4d13f1c864..b0d00f610e0 100644 --- a/code/_onclick/hud/minihud_rigmech.dm +++ b/code/_onclick/hud/minihud_rigmech.dm @@ -1,6 +1,6 @@ // Specific types /datum/mini_hud/rig - var/obj/item/weapon/rig/owner_rig + var/obj/item/rig/owner_rig var/obj/screen/rig/power/power var/obj/screen/rig/health/health var/obj/screen/rig/air/air @@ -8,7 +8,7 @@ needs_processing = TRUE -/datum/mini_hud/rig/New(var/datum/hud/other, var/obj/item/weapon/rig/owner) +/datum/mini_hud/rig/New(var/datum/hud/other, var/obj/item/rig/owner) owner_rig = owner power = new () health = new () @@ -36,8 +36,8 @@ qdel(src) return - var/obj/item/weapon/cell/rigcell = owner_rig.cell - var/obj/item/weapon/tank/rigtank = owner_rig.air_supply + var/obj/item/cell/rigcell = owner_rig.cell + var/obj/item/tank/rigtank = owner_rig.air_supply var/charge_percentage = rigcell ? rigcell.charge / rigcell.maxcharge : 0 var/air_percentage = rigtank ? CLAMP(rigtank.air_contents.total_moles / 17.4693, 0, 1) : 0 @@ -85,7 +85,7 @@ qdel(src) return - var/obj/item/weapon/cell/mechcell = owner_mech.cell + var/obj/item/cell/mechcell = owner_mech.cell var/obj/machinery/portable_atmospherics/canister/mechtank = owner_mech.internal_tank var/charge_percentage = mechcell ? mechcell.charge / mechcell.maxcharge : 0 @@ -146,7 +146,7 @@ var/mob/living/carbon/human/user = usr if(!istype(user) || user.stat || user.incapacitated()) return - var/obj/item/weapon/rig/owner_rig = master + var/obj/item/rig/owner_rig = master if(user != owner_rig.wearer) return user.toggle_internals() diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index cd9c4044b6a..b376505a994 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -69,8 +69,8 @@ /obj/screen/close/Click() if(master) - if(istype(master, /obj/item/weapon/storage)) - var/obj/item/weapon/storage/S = master + if(istype(master, /obj/item/storage)) + var/obj/item/storage/S = master S.close(usr) return 1 @@ -101,7 +101,7 @@ name = "grab" /obj/screen/grab/Click() - var/obj/item/weapon/grab/G = master + var/obj/item/grab/G = master G.s_click(src) return 1 @@ -361,7 +361,7 @@ tankcheck = list(C.r_hand, C.l_hand, C.back) // Rigs are a fucking pain since they keep an air tank in nullspace. - var/obj/item/weapon/rig/Rig = C.get_rig() + var/obj/item/rig/Rig = C.get_rig() if(Rig) if(Rig.air_supply && !Rig.offline) from = "in" @@ -369,8 +369,8 @@ tankcheck |= Rig.air_supply for(var/i=1, iSupply pack with invalid access restriction [SP.access] encountered!") //supply manifest generation begin - var/obj/item/weapon/paper/manifest/slip + var/obj/item/paper/manifest/slip if(!SP.contraband) if(A) - slip = new /obj/item/weapon/paper/manifest(A) + slip = new /obj/item/paper/manifest(A) else - slip = new /obj/item/weapon/paper/manifest(pickedloc) + slip = new /obj/item/paper/manifest(pickedloc) slip.is_copy = 0 slip.info = "

[command_name()] Shipping Manifest


" slip.info +="Order #[SO.ordernum]
" diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index 7ba85e05a99..b26bd701a61 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -443,7 +443,7 @@ var/global/datum/controller/subsystem/ticker/ticker //VOREStation Addition Start if(player.client) if(player.client.prefs.auto_backup_implant) - var/obj/item/weapon/implant/backup/imp = new(src) + var/obj/item/implant/backup/imp = new(src) if(imp.handle_implant(player,player.zone_sel.selecting)) imp.post_implant(player) diff --git a/code/controllers/subsystems/transcore_vr.dm b/code/controllers/subsystems/transcore_vr.dm index f185c4bbb81..d2292c32d89 100644 --- a/code/controllers/subsystems/transcore_vr.dm +++ b/code/controllers/subsystems/transcore_vr.dm @@ -50,12 +50,12 @@ SUBSYSTEM_DEF(transcore) src.current_run.Cut() for(var/key in databases) var/datum/transcore_db/db = databases[key] - for(var/obj/item/weapon/implant/backup/imp as anything in db.implants) + for(var/obj/item/implant/backup/imp as anything in db.implants) src.current_run[imp] = db var/list/current_run = src.current_run while(current_run.len) - var/obj/item/weapon/implant/backup/imp = current_run[current_run.len] + var/obj/item/implant/backup/imp = current_run[current_run.len] var/datum/transcore_db/db = current_run[imp] current_run.len-- @@ -183,7 +183,7 @@ SUBSYSTEM_DEF(transcore) return db // These are now just interfaces to databases -/datum/controller/subsystem/transcore/proc/m_backup(var/datum/mind/mind, var/obj/item/device/nif/nif, var/one_time = FALSE, var/database_key) +/datum/controller/subsystem/transcore/proc/m_backup(var/datum/mind/mind, var/obj/item/nif/nif, var/one_time = FALSE, var/database_key) var/datum/transcore_db/db = db_by_key(database_key) db.m_backup(mind=mind, nif=nif, one_time=one_time) @@ -203,7 +203,7 @@ SUBSYSTEM_DEF(transcore) var/datum/transcore_db/db = db_by_key(database_key) db.remove_body(BR=BR) -/datum/controller/subsystem/transcore/proc/core_dump(var/obj/item/weapon/disk/transcore/disk, var/database_key) +/datum/controller/subsystem/transcore/proc/core_dump(var/obj/item/disk/transcore/disk, var/database_key) var/datum/transcore_db/db = db_by_key(database_key) db.core_dump(disk=disk) @@ -212,12 +212,12 @@ SUBSYSTEM_DEF(transcore) var/list/datum/transhuman/mind_record/backed_up = list() // All known mind records, indexed by MR.mindname/mind.name var/list/datum/transhuman/mind_record/has_left = list() // Why do we even have this? var/list/datum/transhuman/body_record/body_scans = list() // All known body records, indexed by BR.mydna.name - var/list/obj/item/weapon/implant/backup/implants = list() // All OPERATING implants that are being ticked + var/list/obj/item/implant/backup/implants = list() // All OPERATING implants that are being ticked var/core_dumped = FALSE var/key // Key for this DB -/datum/transcore_db/proc/m_backup(var/datum/mind/mind, var/obj/item/device/nif/nif, var/one_time = FALSE) +/datum/transcore_db/proc/m_backup(var/datum/mind/mind, var/obj/item/nif/nif, var/one_time = FALSE) ASSERT(mind) if(!mind.name || core_dumped) return 0 @@ -290,7 +290,7 @@ SUBSYSTEM_DEF(transcore) log_debug("Removed [BR.mydna.name] from transcore body DB.") // Moves all mind records from the databaes into the disk and shuts down all backup canary processing. -/datum/transcore_db/proc/core_dump(var/obj/item/weapon/disk/transcore/disk) +/datum/transcore_db/proc/core_dump(var/obj/item/disk/transcore/disk) ASSERT(disk) global_announcer.autosay("An emergency core dump has been initiated!", "TransCore Oversight", "Command") global_announcer.autosay("An emergency core dump has been initiated!", "TransCore Oversight", "Medical") diff --git a/code/datums/autolathe/arms.dm b/code/datums/autolathe/arms.dm index 990b87b52d1..9bceaf27e6d 100644 --- a/code/datums/autolathe/arms.dm +++ b/code/datums/autolathe/arms.dm @@ -1,6 +1,6 @@ /datum/category_item/autolathe/arms/syringegun_ammo name = "syringe gun cartridge" - path =/obj/item/weapon/syringe_cartridge + path =/obj/item/syringe_cartridge //////////////// /*Ammo casings*/ @@ -448,10 +448,10 @@ /datum/category_item/autolathe/arms/tacknife name = "tactical knife" - path =/obj/item/weapon/material/knife/tacknife + path =/obj/item/material/knife/tacknife hidden = 1 /datum/category_item/autolathe/arms/flamethrower name = "flamethrower" - path =/obj/item/weapon/flamethrower/full + path =/obj/item/flamethrower/full hidden = 1 diff --git a/code/datums/autolathe/devices.dm b/code/datums/autolathe/devices.dm index 1196df53425..437ba75f298 100644 --- a/code/datums/autolathe/devices.dm +++ b/code/datums/autolathe/devices.dm @@ -1,38 +1,38 @@ /datum/category_item/autolathe/devices/consolescreen name = "console screen" - path =/obj/item/weapon/stock_parts/console_screen + path =/obj/item/stock_parts/console_screen /datum/category_item/autolathe/devices/igniter name = "igniter" - path =/obj/item/device/assembly/igniter + path =/obj/item/assembly/igniter /datum/category_item/autolathe/devices/signaler name = "signaler" - path =/obj/item/device/assembly/signaler + path =/obj/item/assembly/signaler /datum/category_item/autolathe/devices/sensor_infra name = "infrared sensor" - path =/obj/item/device/assembly/infra + path =/obj/item/assembly/infra /datum/category_item/autolathe/devices/timer name = "timer" - path =/obj/item/device/assembly/timer + path =/obj/item/assembly/timer /datum/category_item/autolathe/devices/sensor_prox name = "proximity sensor" - path =/obj/item/device/assembly/prox_sensor + path =/obj/item/assembly/prox_sensor /datum/category_item/autolathe/devices/beartrap name = "mechanical trap" - path =/obj/item/weapon/beartrap + path =/obj/item/beartrap /datum/category_item/autolathe/devices/barbedwire name = "barbed wire" - path = /obj/item/weapon/material/barbedwire + path = /obj/item/material/barbedwire hidden = 1 resources = list(MAT_STEEL = 10000) /datum/category_item/autolathe/devices/electropack name = "electropack" - path =/obj/item/device/radio/electropack + path =/obj/item/radio/electropack hidden = 1 diff --git a/code/datums/autolathe/devices_vr.dm b/code/datums/autolathe/devices_vr.dm index 65af7b630cc..658382a0910 100644 --- a/code/datums/autolathe/devices_vr.dm +++ b/code/datums/autolathe/devices_vr.dm @@ -1,3 +1,3 @@ /datum/category_item/autolathe/devices/sleevecard name = "sleevecard" - path =/obj/item/device/paicard/sleevecard + path =/obj/item/paicard/sleevecard diff --git a/code/datums/autolathe/engineering.dm b/code/datums/autolathe/engineering.dm index 78b7da1e8e0..c93d7622a22 100644 --- a/code/datums/autolathe/engineering.dm +++ b/code/datums/autolathe/engineering.dm @@ -1,112 +1,112 @@ /datum/category_item/autolathe/engineering/airlockmodule name = "airlock electronics" - path =/obj/item/weapon/airlock_electronics + path =/obj/item/airlock_electronics /datum/category_item/autolathe/engineering/airalarm name = "air alarm electronics" - path =/obj/item/weapon/circuitboard/airalarm + path =/obj/item/circuitboard/airalarm /datum/category_item/autolathe/engineering/firealarm name = "fire alarm electronics" - path =/obj/item/weapon/circuitboard/firealarm + path =/obj/item/circuitboard/firealarm /datum/category_item/autolathe/engineering/powermodule name = "power control module" - path =/obj/item/weapon/module/power_control + path =/obj/item/module/power_control /datum/category_item/autolathe/engineering/statusdisplay name = "status display electronics" - path =/obj/item/weapon/circuitboard/status_display + path =/obj/item/circuitboard/status_display /datum/category_item/autolathe/engineering/aistatusdisplay name = "ai status display electronics" - path =/obj/item/weapon/circuitboard/ai_status_display + path =/obj/item/circuitboard/ai_status_display /datum/category_item/autolathe/engineering/newscaster name = "newscaster electronics" - path =/obj/item/weapon/circuitboard/newscaster + path =/obj/item/circuitboard/newscaster /datum/category_item/autolathe/engineering/atm name = "atm electronics" - path =/obj/item/weapon/circuitboard/atm + path =/obj/item/circuitboard/atm /datum/category_item/autolathe/engineering/intercom name = "intercom electronics" - path =/obj/item/weapon/circuitboard/intercom + path =/obj/item/circuitboard/intercom /datum/category_item/autolathe/engineering/holopad name = "holopad electronics" - path =/obj/item/weapon/circuitboard/holopad + path =/obj/item/circuitboard/holopad /datum/category_item/autolathe/engineering/guestpass name = "guestpass console electronics" - path =/obj/item/weapon/circuitboard/guestpass + path =/obj/item/circuitboard/guestpass /datum/category_item/autolathe/engineering/entertainment name = "entertainment camera electronics" - path =/obj/item/weapon/circuitboard/security/telescreen/entertainment + path =/obj/item/circuitboard/security/telescreen/entertainment /datum/category_item/autolathe/engineering/keycard name = "keycard authenticator electronics" - path =/obj/item/weapon/circuitboard/keycard_auth + path =/obj/item/circuitboard/keycard_auth /datum/category_item/autolathe/engineering/geiger_wall name = "wall-mounted geiger counter electronics" - path =/obj/item/weapon/circuitboard/geiger + path =/obj/item/circuitboard/geiger /datum/category_item/autolathe/engineering/photocopier name = "photocopier electronics" - path =/obj/item/weapon/circuitboard/photocopier + path =/obj/item/circuitboard/photocopier /datum/category_item/autolathe/engineering/fax name = "fax machine electronics" - path =/obj/item/weapon/circuitboard/fax + path =/obj/item/circuitboard/fax /datum/category_item/autolathe/engineering/papershredder name = "paper shredder electronics" - path =/obj/item/weapon/circuitboard/papershredder + path =/obj/item/circuitboard/papershredder /datum/category_item/autolathe/engineering/microwave name = "microwave electronics" - path =/obj/item/weapon/circuitboard/microwave + path =/obj/item/circuitboard/microwave /datum/category_item/autolathe/engineering/washing name = "washing machine electronics" - path =/obj/item/weapon/circuitboard/washing + path =/obj/item/circuitboard/washing /datum/category_item/autolathe/engineering/request name = "request console electronics" - path =/obj/item/weapon/circuitboard/request + path =/obj/item/circuitboard/request /datum/category_item/autolathe/engineering/electrochromic name = "electrochromic window control electronics" - path =/obj/item/weapon/circuitboard/electrochromic + path =/obj/item/circuitboard/electrochromic /datum/category_item/autolathe/engineering/pipelayer name = "pipe layer electronics" - path =/obj/item/weapon/circuitboard/pipelayer + path =/obj/item/circuitboard/pipelayer /datum/category_item/autolathe/engineering/motor name = "motor" - path =/obj/item/weapon/stock_parts/motor + path =/obj/item/stock_parts/motor /datum/category_item/autolathe/engineering/gear name = "gear" - path =/obj/item/weapon/stock_parts/gear + path =/obj/item/stock_parts/gear /datum/category_item/autolathe/engineering/spring name = "spring" - path =/obj/item/weapon/stock_parts/spring + path =/obj/item/stock_parts/spring /datum/category_item/autolathe/engineering/rcd_ammo name = "matter cartridge" - path =/obj/item/weapon/rcd_ammo + path =/obj/item/rcd_ammo no_scale = TRUE //prevents material duplication exploits /datum/category_item/autolathe/engineering/rcd name = "rapid construction device" - path =/obj/item/weapon/rcd + path =/obj/item/rcd /datum/category_item/autolathe/engineering/camera_assembly name = "camera assembly" - path =/obj/item/weapon/camera_assembly + path =/obj/item/camera_assembly diff --git a/code/datums/autolathe/engineering_vr.dm b/code/datums/autolathe/engineering_vr.dm index 577d9febd2c..0b3fe19dc32 100644 --- a/code/datums/autolathe/engineering_vr.dm +++ b/code/datums/autolathe/engineering_vr.dm @@ -1,75 +1,75 @@ /datum/category_item/autolathe/engineering/timeclock name = "timeclock electronics" - path =/obj/item/weapon/circuitboard/timeclock + path =/obj/item/circuitboard/timeclock /datum/category_item/autolathe/engineering/id_restorer name = "ID restoration console electronics" - path =/obj/item/weapon/circuitboard/id_restorer + path =/obj/item/circuitboard/id_restorer /datum/category_item/autolathe/engineering/oven name = "oven electronics" - path =/obj/item/weapon/circuitboard/oven + path =/obj/item/circuitboard/oven /datum/category_item/autolathe/engineering/fryer name = "fryer electronics" - path =/obj/item/weapon/circuitboard/fryer + path =/obj/item/circuitboard/fryer /datum/category_item/autolathe/engineering/grill name = "grill electronics" - path =/obj/item/weapon/circuitboard/grill + path =/obj/item/circuitboard/grill /datum/category_item/autolathe/engineering/cerealmaker name = "cereal maker electronics" - path =/obj/item/weapon/circuitboard/cerealmaker + path =/obj/item/circuitboard/cerealmaker /datum/category_item/autolathe/engineering/candymachine name = "candy machine electronics" - path =/obj/item/weapon/circuitboard/candymachine + path =/obj/item/circuitboard/candymachine /datum/category_item/autolathe/engineering/battle_arcade name = "battle arcade machine electronics" - path =/obj/item/weapon/circuitboard/arcade/battle + path =/obj/item/circuitboard/arcade/battle /datum/category_item/autolathe/engineering/orion_trail name = "orion trail aracade machine electronics" - path =/obj/item/weapon/circuitboard/arcade/orion_trail + path =/obj/item/circuitboard/arcade/orion_trail /datum/category_item/autolathe/engineering/clawmachine name = "claw machine electronics" - path =/obj/item/weapon/circuitboard/arcade/clawmachine + path =/obj/item/circuitboard/arcade/clawmachine /datum/category_item/autolathe/engineering/jukebox name = "jukebox electronics" - path =/obj/item/weapon/circuitboard/jukebox + path =/obj/item/circuitboard/jukebox /datum/category_item/autolathe/engineering/mech_recharger name = "mech recharging station electronics" - path =/obj/item/weapon/circuitboard/mech_recharger + path =/obj/item/circuitboard/mech_recharger /datum/category_item/autolathe/engineering/recharge_station name = "cyborg recharging station electronics" - path =/obj/item/weapon/circuitboard/recharge_station + path =/obj/item/circuitboard/recharge_station /datum/category_item/autolathe/engineering/batteryrack name = "battery rack electronics" - path =/obj/item/weapon/circuitboard/batteryrack + path =/obj/item/circuitboard/batteryrack /datum/category_item/autolathe/engineering/grid_checker name = "grid checker electronics" - path =/obj/item/weapon/circuitboard/grid_checker + path =/obj/item/circuitboard/grid_checker /datum/category_item/autolathe/engineering/breakerbox name = "breaker box electronics" - path =/obj/item/weapon/circuitboard/breakerbox + path =/obj/item/circuitboard/breakerbox /datum/category_item/autolathe/engineering/gas_heater name = "gas heater electronics" - path =/obj/item/weapon/circuitboard/unary_atmos/heater + path =/obj/item/circuitboard/unary_atmos/heater /datum/category_item/autolathe/engineering/gas_cooler name = "gas cooler electronics" - path =/obj/item/weapon/circuitboard/unary_atmos/cooler + path =/obj/item/circuitboard/unary_atmos/cooler /datum/category_item/autolathe/engineering/arf_generator name = "atmospheric field generator electronics" - path =/obj/item/weapon/circuitboard/arf_generator \ No newline at end of file + path =/obj/item/circuitboard/arf_generator \ No newline at end of file diff --git a/code/datums/autolathe/general.dm b/code/datums/autolathe/general.dm index d664e9fa197..610a27bc980 100644 --- a/code/datums/autolathe/general.dm +++ b/code/datums/autolathe/general.dm @@ -1,57 +1,57 @@ /datum/category_item/autolathe/general/bucket name = "bucket" - path =/obj/item/weapon/reagent_containers/glass/bucket + path =/obj/item/reagent_containers/glass/bucket /datum/category_item/autolathe/general/cooler_bottle name = "water-cooler bottle" - path =/obj/item/weapon/reagent_containers/glass/cooler_bottle + path =/obj/item/reagent_containers/glass/cooler_bottle /datum/category_item/autolathe/general/drinkingglass is_stack = TRUE /datum/category_item/autolathe/general/drinkingglass/square name = "half-pint glass" - path =/obj/item/weapon/reagent_containers/food/drinks/glass2/square + path =/obj/item/reagent_containers/food/drinks/glass2/square /datum/category_item/autolathe/general/drinkingglass/rocks name = "rocks glass" - path =/obj/item/weapon/reagent_containers/food/drinks/glass2/rocks + path =/obj/item/reagent_containers/food/drinks/glass2/rocks /datum/category_item/autolathe/general/drinkingglass/shake name = "milkshake glass" - path =/obj/item/weapon/reagent_containers/food/drinks/glass2/shake + path =/obj/item/reagent_containers/food/drinks/glass2/shake /datum/category_item/autolathe/general/drinkingglass/cocktail name = "cocktail glass" - path =/obj/item/weapon/reagent_containers/food/drinks/glass2/cocktail + path =/obj/item/reagent_containers/food/drinks/glass2/cocktail /datum/category_item/autolathe/general/drinkingglass/shot name = "shot glass" - path =/obj/item/weapon/reagent_containers/food/drinks/glass2/shot + path =/obj/item/reagent_containers/food/drinks/glass2/shot /datum/category_item/autolathe/general/drinkingglass/pint name = "pint glass" - path =/obj/item/weapon/reagent_containers/food/drinks/glass2/pint + path =/obj/item/reagent_containers/food/drinks/glass2/pint /datum/category_item/autolathe/general/drinkingglass/mug name = "glass mug" - path =/obj/item/weapon/reagent_containers/food/drinks/glass2/mug + path =/obj/item/reagent_containers/food/drinks/glass2/mug /datum/category_item/autolathe/general/drinkingglass/wine name = "wine glass" - path =/obj/item/weapon/reagent_containers/food/drinks/glass2/wine + path =/obj/item/reagent_containers/food/drinks/glass2/wine /datum/category_item/autolathe/general/drinkingglass/metaglass name = "metamorphic glass" - path =/obj/item/weapon/reagent_containers/food/drinks/metaglass + path =/obj/item/reagent_containers/food/drinks/metaglass /datum/category_item/autolathe/general/drinkingglass/metaglass/metapint name = "metamorphic pint glass" - path =/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint + path =/obj/item/reagent_containers/food/drinks/metaglass/metapint /datum/category_item/autolathe/general/flashlight name = "flashlight" - path =/obj/item/device/flashlight + path =/obj/item/flashlight /datum/category_item/autolathe/general/floor_light name = "floor light" @@ -59,7 +59,7 @@ /datum/category_item/autolathe/general/extinguisher name = "extinguisher" - path =/obj/item/weapon/extinguisher + path =/obj/item/extinguisher /datum/category_item/autolathe/general/jar name = "jar" @@ -71,15 +71,15 @@ /datum/category_item/autolathe/general/radio_headset name = "radio headset" - path =/obj/item/device/radio/headset + path =/obj/item/radio/headset /datum/category_item/autolathe/general/radio_bounced name = "station bounced radio" - path =/obj/item/device/radio/off + path =/obj/item/radio/off /datum/category_item/autolathe/general/suit_cooler name = "suit cooling unit" - path =/obj/item/device/suit_cooling_unit + path =/obj/item/suit_cooling_unit /datum/category_item/autolathe/general/weldermask name = "welding mask" @@ -87,29 +87,29 @@ /datum/category_item/autolathe/general/spraybottle name = "spray bottle" - path = /obj/item/weapon/reagent_containers/spray + path = /obj/item/reagent_containers/spray /datum/category_item/autolathe/general/knife name = "kitchen knife" - path =/obj/item/weapon/material/knife + path =/obj/item/material/knife /datum/category_item/autolathe/general/taperecorder name = "tape recorder" - path =/obj/item/device/taperecorder + path =/obj/item/taperecorder /datum/category_item/autolathe/general/tube name = "light tube" - path =/obj/item/weapon/light/tube + path =/obj/item/light/tube is_stack = TRUE /datum/category_item/autolathe/general/bulb name = "light bulb" - path =/obj/item/weapon/light/bulb + path =/obj/item/light/bulb is_stack = TRUE /datum/category_item/autolathe/general/ashtray_glass name = "glass ashtray" - path =/obj/item/weapon/material/ashtray/glass + path =/obj/item/material/ashtray/glass /datum/category_item/autolathe/general/weldinggoggles name = "welding goggles" @@ -117,20 +117,20 @@ /datum/category_item/autolathe/general/maglight name = "maglight" - path =/obj/item/device/flashlight/maglight + path =/obj/item/flashlight/maglight /datum/category_item/autolathe/general/idcard name = "ID Card" - path = /obj/item/weapon/card/id + path = /obj/item/card/id resources = list(MAT_STEEL = 100, MAT_GLASS = 100, MAT_PLASTIC = 300) man_rating = 2 /datum/category_item/autolathe/general/handcuffs name = "handcuffs" - path =/obj/item/weapon/handcuffs + path =/obj/item/handcuffs hidden = 1 /datum/category_item/autolathe/general/legcuffs name = "legcuffs" - path =/obj/item/weapon/handcuffs/legcuffs + path =/obj/item/handcuffs/legcuffs hidden = 1 diff --git a/code/datums/autolathe/general_vr.dm b/code/datums/autolathe/general_vr.dm index 5702a7ed499..1b47ae4d56d 100644 --- a/code/datums/autolathe/general_vr.dm +++ b/code/datums/autolathe/general_vr.dm @@ -4,9 +4,9 @@ /datum/category_item/autolathe/general/drinkingglass/carafe name = "glass carafe" - path =/obj/item/weapon/reagent_containers/food/drinks/glass2/carafe + path =/obj/item/reagent_containers/food/drinks/glass2/carafe /datum/category_item/autolathe/general/drinkingglass/pitcher name = "plastic pitcher" - path =/obj/item/weapon/reagent_containers/food/drinks/glass2/pitcher + path =/obj/item/reagent_containers/food/drinks/glass2/pitcher \ No newline at end of file diff --git a/code/datums/autolathe/medical.dm b/code/datums/autolathe/medical.dm index c1247db8719..6e457bf4485 100644 --- a/code/datums/autolathe/medical.dm +++ b/code/datums/autolathe/medical.dm @@ -1,43 +1,43 @@ /datum/category_item/autolathe/medical/scalpel name = "scalpel" - path =/obj/item/weapon/surgical/scalpel + path =/obj/item/surgical/scalpel /datum/category_item/autolathe/medical/circularsaw name = "circular saw" - path =/obj/item/weapon/surgical/circular_saw + path =/obj/item/surgical/circular_saw /datum/category_item/autolathe/medical/surgicaldrill name = "surgical drill" - path =/obj/item/weapon/surgical/surgicaldrill + path =/obj/item/surgical/surgicaldrill /datum/category_item/autolathe/medical/retractor name = "retractor" - path =/obj/item/weapon/surgical/retractor + path =/obj/item/surgical/retractor /datum/category_item/autolathe/medical/cautery name = "cautery" - path =/obj/item/weapon/surgical/cautery + path =/obj/item/surgical/cautery /datum/category_item/autolathe/medical/hemostat name = "hemostat" - path =/obj/item/weapon/surgical/hemostat + path =/obj/item/surgical/hemostat /datum/category_item/autolathe/medical/beaker name = "glass beaker" - path =/obj/item/weapon/reagent_containers/glass/beaker + path =/obj/item/reagent_containers/glass/beaker /datum/category_item/autolathe/medical/beaker_large name = "large glass beaker" - path =/obj/item/weapon/reagent_containers/glass/beaker/large + path =/obj/item/reagent_containers/glass/beaker/large /datum/category_item/autolathe/medical/vial name = "glass vial" - path =/obj/item/weapon/reagent_containers/glass/beaker/vial + path =/obj/item/reagent_containers/glass/beaker/vial /datum/category_item/autolathe/medical/syringe name = "syringe" - path =/obj/item/weapon/reagent_containers/syringe + path =/obj/item/reagent_containers/syringe /datum/category_item/autolathe/medical/implanter name = "implanter" - path =/obj/item/weapon/implanter + path =/obj/item/implanter diff --git a/code/datums/autolathe/medical_vr.dm b/code/datums/autolathe/medical_vr.dm index bfaeb3a63b6..0831ed9b78b 100644 --- a/code/datums/autolathe/medical_vr.dm +++ b/code/datums/autolathe/medical_vr.dm @@ -1,9 +1,9 @@ /datum/category_item/autolathe/medical/autoinjector name = "empty autoinjector" - path =/obj/item/weapon/reagent_containers/hypospray/autoinjector/empty + path =/obj/item/reagent_containers/hypospray/autoinjector/empty resources = list(MAT_PLASTIC = 10) //for recycling purposes mostly /datum/category_item/autolathe/medical/autoinjector/biginjector name = "empty large autoinjector" - path =/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/empty + path =/obj/item/reagent_containers/hypospray/autoinjector/biginjector/empty resources = list(MAT_PLASTIC = 500) \ No newline at end of file diff --git a/code/datums/autolathe/tools.dm b/code/datums/autolathe/tools.dm index e62232540f0..698cbe1001f 100644 --- a/code/datums/autolathe/tools.dm +++ b/code/datums/autolathe/tools.dm @@ -1,65 +1,65 @@ /datum/category_item/autolathe/tools/crowbar name = "crowbar" - path =/obj/item/weapon/tool/crowbar + path =/obj/item/tool/crowbar /datum/category_item/autolathe/tools/multitool name = "multitool" - path =/obj/item/device/multitool + path =/obj/item/multitool /datum/category_item/autolathe/tools/t_scanner name = "T-ray scanner" - path =/obj/item/device/t_scanner + path =/obj/item/t_scanner /datum/category_item/autolathe/tools/weldertool name = "welding tool" - path =/obj/item/weapon/weldingtool + path =/obj/item/weldingtool /datum/category_item/autolathe/tools/electric_welder name = "electric welding tool" - path =/obj/item/weapon/weldingtool/electric/unloaded + path =/obj/item/weldingtool/electric/unloaded hidden = 1 /datum/category_item/autolathe/tools/screwdriver name = "screwdriver" - path =/obj/item/weapon/tool/screwdriver + path =/obj/item/tool/screwdriver /datum/category_item/autolathe/tools/wirecutters name = "wirecutters" - path =/obj/item/weapon/tool/wirecutters + path =/obj/item/tool/wirecutters /datum/category_item/autolathe/tools/wrench name = "wrench" - path =/obj/item/weapon/tool/wrench + path =/obj/item/tool/wrench /datum/category_item/autolathe/tools/hatchet name = "hatchet" - path =/obj/item/weapon/material/knife/machete/hatchet + path =/obj/item/material/knife/machete/hatchet /datum/category_item/autolathe/tools/minihoe name = "mini hoe" - path =/obj/item/weapon/material/minihoe + path =/obj/item/material/minihoe /datum/category_item/autolathe/tools/welder_industrial name = "industrial welding tool" - path =/obj/item/weapon/weldingtool/largetank + path =/obj/item/weldingtool/largetank /datum/category_item/autolathe/tools/spraybottle name = "spray bottle" - path = /obj/item/weapon/reagent_containers/spray + path = /obj/item/reagent_containers/spray resources = list(MAT_PLASTIC = 2000) /datum/category_item/autolathe/devices/slowwire name = "snare wire" - path = /obj/item/weapon/material/barbedwire/plastic + path = /obj/item/material/barbedwire/plastic resources = list(MAT_PLASTIC = 10000) /datum/category_item/autolathe/tools/spraynozzle name = "spray nozzle" - path = /obj/item/weapon/reagent_containers/spray + path = /obj/item/reagent_containers/spray resources = list(MAT_PLASTIC = 5000, MAT_STEEL = 2000) hidden = 1 man_rating = 2 /datum/category_item/autolathe/tools/rsf name = "rapid service fabricator" - path = /obj/item/weapon/rsf + path = /obj/item/rsf diff --git a/code/datums/autolathe/tools_vr.dm b/code/datums/autolathe/tools_vr.dm index c89d768f0b1..900bcd9095f 100644 --- a/code/datums/autolathe/tools_vr.dm +++ b/code/datums/autolathe/tools_vr.dm @@ -1,3 +1,3 @@ /datum/category_item/autolathe/tools/prybar name = "prybar" - path =/obj/item/weapon/tool/prybar + path =/obj/item/tool/prybar diff --git a/code/datums/chat_message.dm b/code/datums/chat_message.dm index 376f87ed5e0..3c44e6a81f5 100644 --- a/code/datums/chat_message.dm +++ b/code/datums/chat_message.dm @@ -379,7 +379,7 @@ var/list/runechat_image_cache = list() return src /mob/runechat_holder(datum/chatmessage/CM) - if(istype(loc, /obj/item/weapon/holder)) + if(istype(loc, /obj/item/holder)) return loc return ..() diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index fd468994de3..27c8821f2dd 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -92,8 +92,8 @@ .["tool_qualities"] |= item.tool_qualities .["other"][item.type] += 1 else - if(istype(item, /obj/item/weapon/reagent_containers)) - var/obj/item/weapon/reagent_containers/container = item + if(istype(item, /obj/item/reagent_containers)) + var/obj/item/reagent_containers/container = item // if(container.is_drainable()) if(container.is_open_container()) // this isn't exactly the same for(var/datum/reagent/reagent in container.reagents.reagent_list) @@ -157,7 +157,7 @@ for(var/obj/item/contained_item in source.contents) // if(contained_item.GetComponent(/datum/component/storage)) - if(istype(contained_item, /obj/item/weapon/storage)) // cursed + if(istype(contained_item, /obj/item/storage)) // cursed for(var/obj/item/subcontained_item in contained_item.contents) available_tools[subcontained_item.type] = TRUE for(var/behavior in subcontained_item.tool_qualities) @@ -290,7 +290,7 @@ var/datum/reagent/reagent = path_key var/id = initial(reagent.id) - for(var/obj/item/weapon/reagent_containers/RC in surroundings) + for(var/obj/item/reagent_containers/RC in surroundings) // Found everything we need if(amt <= 0 && amt_to_transfer <= 0) break @@ -338,8 +338,8 @@ continue // Special case: the reagents may be needed for other recipes - if(istype(I, /obj/item/weapon/reagent_containers)) - var/obj/item/weapon/reagent_containers/RC = I + if(istype(I, /obj/item/reagent_containers)) + var/obj/item/reagent_containers/RC = I if(RC.reagents.total_volume > 0) continue @@ -354,12 +354,12 @@ // Snowflake handling of reagent containers and storage atoms. // If we consumed them in our crafting, we should dump their contents out before qdeling them. - if(istype(I, /obj/item/weapon/reagent_containers)) - var/obj/item/weapon/reagent_containers/container = I + if(istype(I, /obj/item/reagent_containers)) + var/obj/item/reagent_containers/container = I container.reagents.clear_reagents() // container.reagents.expose(container.loc, TOUCH) - else if(istype(I, /obj/item/weapon/storage)) - var/obj/item/weapon/storage/container = I + else if(istype(I, /obj/item/storage)) + var/obj/item/storage/container = I container.spill() container.close_all() qdel(I) diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 453652928bd..658b682e085 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -58,9 +58,9 @@ // Locate one of the things that set the material type, and update it from the default (glass) /datum/crafting_recipe/spear/on_craft_completion(mob/user, atom/result) - var/obj/item/weapon/material/M + var/obj/item/material/M for(var/path in parts) - var/obj/item/weapon/material/N = locate(path) in result + var/obj/item/material/N = locate(path) in result if(istype(N, path)) if(!istype(M)) M = N @@ -69,6 +69,6 @@ if(!istype(M)) return - var/obj/item/weapon/material/twohanded/spear/S = result + var/obj/item/material/twohanded/spear/S = result S.set_material(M.material.name) qdel(M) diff --git a/code/datums/components/crafting/recipes/survival.dm b/code/datums/components/crafting/recipes/survival.dm index a1100f6808c..e97e7733116 100644 --- a/code/datums/components/crafting/recipes/survival.dm +++ b/code/datums/components/crafting/recipes/survival.dm @@ -1,6 +1,6 @@ /datum/crafting_recipe/shovel name = "Wooden Shovel" - result = /obj/item/weapon/shovel/wood + result = /obj/item/shovel/wood reqs = list( list(/obj/item/stack/material/stick = 5), list(/obj/item/stack/material/wood = 1), @@ -13,7 +13,7 @@ /datum/crafting_recipe/stoneblade name = "stone blade" - result = /obj/item/weapon/material/knife/stone + result = /obj/item/material/knife/stone reqs = list( list(/obj/item/stack/material/flint = 2) ) @@ -23,9 +23,9 @@ /datum/crafting_recipe/stonewoodknife name = "stone knife" - result = /obj/item/weapon/material/knife/stone/wood + result = /obj/item/material/knife/stone/wood reqs = list( - list(/obj/item/weapon/material/knife/stone = 1), + list(/obj/item/material/knife/stone = 1), list(/obj/item/stack/material/flint = 1), list(/obj/item/stack/material/wood = 1), list(/obj/item/stack/material/fiber = 3) @@ -36,11 +36,11 @@ /datum/crafting_recipe/stoneboneknife name = "stone knife" - result = /obj/item/weapon/material/knife/stone/bone + result = /obj/item/material/knife/stone/bone reqs = list( - list(/obj/item/weapon/material/knife/stone = 1), + list(/obj/item/material/knife/stone = 1), list(/obj/item/stack/material/flint = 1), - list(/obj/item/weapon/bone = 1), + list(/obj/item/bone = 1), list(/obj/item/stack/material/fiber = 3) ) time = 120 @@ -49,7 +49,7 @@ /datum/crafting_recipe/woodbucket name = "wooden bucket" - result = /obj/item/weapon/reagent_containers/glass/bucket/wood + result = /obj/item/reagent_containers/glass/bucket/wood reqs = list( list(/obj/item/stack/material/wood = 1), list(/obj/item/stack/material/stick = 1), @@ -62,15 +62,15 @@ name = "sticks" result = /obj/item/stack/material/stick/fivestack reqs = list(list(/obj/item/stack/material/wood = 1)) - tool_paths = list(/obj/item/weapon/material/knife) + tool_paths = list(/obj/item/material/knife) time = 200 category = CAT_MISC /datum/crafting_recipe/stonewoodaxe name = "stone axe" - result = /obj/item/weapon/material/knife/machete/hatchet/stone + result = /obj/item/material/knife/machete/hatchet/stone reqs = list( - list(/obj/item/weapon/material/knife/stone = 1), + list(/obj/item/material/knife/stone = 1), list(/obj/item/stack/material/flint = 1), list(/obj/item/stack/material/stick = 1), list(/obj/item/stack/material/fiber = 3) @@ -81,11 +81,11 @@ /datum/crafting_recipe/stoneboneaxe name = "stone axe" - result = /obj/item/weapon/material/knife/machete/hatchet/stone/bone + result = /obj/item/material/knife/machete/hatchet/stone/bone reqs = list( - list(/obj/item/weapon/material/knife/stone = 1), + list(/obj/item/material/knife/stone = 1), list(/obj/item/stack/material/flint = 1), - list(/obj/item/weapon/bone = 1), + list(/obj/item/bone = 1), list(/obj/item/stack/material/fiber = 3) ) time = 120 @@ -94,9 +94,9 @@ /datum/crafting_recipe/stonewoodspear name = "stone spear" - result = /obj/item/weapon/material/twohanded/spear/flint + result = /obj/item/material/twohanded/spear/flint reqs = list( - list(/obj/item/weapon/material/knife/stone = 1), + list(/obj/item/material/knife/stone = 1), list(/obj/item/stack/material/flint = 1), list(/obj/item/stack/material/wood = 2), list(/obj/item/stack/material/fiber = 3) @@ -107,11 +107,11 @@ /datum/crafting_recipe/stonebonespear name = "stone spear" - result = /obj/item/weapon/material/twohanded/spear/flint + result = /obj/item/material/twohanded/spear/flint reqs = list( - list(/obj/item/weapon/material/knife/stone = 1), + list(/obj/item/material/knife/stone = 1), list(/obj/item/stack/material/flint = 1), - list(/obj/item/weapon/bone = 2), + list(/obj/item/bone = 2), list(/obj/item/stack/material/fiber = 3) ) time = 120 @@ -120,7 +120,7 @@ /datum/crafting_recipe/ropebindings name = "rope bindings" - result = /obj/item/weapon/handcuffs/cable/plantfiber + result = /obj/item/handcuffs/cable/plantfiber reqs = list(list(/obj/item/stack/material/fiber = 3)) time = 60 category = CAT_MISC \ No newline at end of file diff --git a/code/datums/components/crafting/recipes/weapons.dm b/code/datums/components/crafting/recipes/weapons.dm index 68f01b54e9f..41d96db57d4 100644 --- a/code/datums/components/crafting/recipes/weapons.dm +++ b/code/datums/components/crafting/recipes/weapons.dm @@ -1,30 +1,30 @@ /datum/crafting_recipe/stunprod name = "Stunprod" - result = /obj/item/weapon/melee/baton/cattleprod - reqs = list(list(/obj/item/weapon/handcuffs/cable = 1), + result = /obj/item/melee/baton/cattleprod + reqs = list(list(/obj/item/handcuffs/cable = 1), list(/obj/item/stack/rods = 1), - list(/obj/item/weapon/tool/wirecutters = 1)) + list(/obj/item/tool/wirecutters = 1)) time = 40 category = CAT_WEAPONRY subcategory = CAT_WEAPON /datum/crafting_recipe/spear name = "Spear" - result = /obj/item/weapon/material/twohanded/spear - reqs = list(list(/obj/item/weapon/handcuffs/cable = 1), + result = /obj/item/material/twohanded/spear + reqs = list(list(/obj/item/handcuffs/cable = 1), list(/obj/item/stack/rods = 1), - list(/obj/item/weapon/material/shard = 1, - /obj/item/weapon/material/butterflyblade = 1) + list(/obj/item/material/shard = 1, + /obj/item/material/butterflyblade = 1) ) - parts = list(/obj/item/weapon/material/shard = 1, - /obj/item/weapon/material/butterflyblade = 1) + parts = list(/obj/item/material/shard = 1, + /obj/item/material/butterflyblade = 1) time = 40 category = CAT_WEAPONRY subcategory = CAT_WEAPON /datum/crafting_recipe/shortbow name = "Shortbow" - result = /obj/item/weapon/gun/launcher/crossbow/bow + result = /obj/item/gun/launcher/crossbow/bow reqs = list(list(/obj/item/stack/material/wood = 10), list(/obj/item/stack/material/cloth = 5)) time = 120 @@ -33,7 +33,7 @@ /datum/crafting_recipe/arrow_sandstone name = "Wood arrow (sandstone tip)" - result = /obj/item/weapon/arrow/standard + result = /obj/item/arrow/standard reqs = list(list(/obj/item/stack/material/wood = 2), list(/obj/item/stack/material/sandstone = 2)) time = 40 @@ -42,7 +42,7 @@ /datum/crafting_recipe/arrow_marble name = "Wood arrow (marble tip)" - result = /obj/item/weapon/arrow/standard + result = /obj/item/arrow/standard reqs = list(list(/obj/item/stack/material/wood = 2), list(/obj/item/stack/material/marble = 2)) time = 40 @@ -51,17 +51,17 @@ /datum/crafting_recipe/primitive_shield name = "Primitive Shield" - result = /obj/item/weapon/shield/primitive - reqs = list(list(/obj/item/stack/material/wood = 2), list(/obj/item/weapon/reagent_containers/glass/bucket/wood =1), list(/obj/item/stack/material/cloth = 5)) + result = /obj/item/shield/primitive + reqs = list(list(/obj/item/stack/material/wood = 2), list(/obj/item/reagent_containers/glass/bucket/wood =1), list(/obj/item/stack/material/cloth = 5)) time = 120 category = CAT_WEAPONRY subcategory = CAT_WEAPON /datum/crafting_recipe/scopedrifle name = "Bolt scope to bolt-action (cannot be removed)" - result = /obj/item/weapon/gun/projectile/shotgun/pump/rifle/scoped - reqs = list(list(/obj/item/device/binoculars/scope = 1), - list(/obj/item/weapon/gun/projectile/shotgun/pump/rifle = 1)) + result = /obj/item/gun/projectile/shotgun/pump/rifle/scoped + reqs = list(list(/obj/item/binoculars/scope = 1), + list(/obj/item/gun/projectile/shotgun/pump/rifle = 1)) time = 180 category = CAT_WEAPONRY subcategory = CAT_WEAPON diff --git a/code/datums/components/recursive_move.dm b/code/datums/components/recursive_move.dm index cf26942495b..35558839347 100644 --- a/code/datums/components/recursive_move.dm +++ b/code/datums/components/recursive_move.dm @@ -106,14 +106,14 @@ parents.Cut() //the banana peel of testing stays -/obj/item/weapon/bananapeel/testing +/obj/item/bananapeel/testing name = "banana peel of testing" desc = "spams world log with debugging information" -/obj/item/weapon/bananapeel/testing/proc/shmove(var/atom/source, var/atom/old_loc, var/atom/new_loc) +/obj/item/bananapeel/testing/proc/shmove(var/atom/source, var/atom/old_loc, var/atom/new_loc) world.log << "the [source] moved from [old_loc]([old_loc.x],[old_loc.y],[old_loc.z]) to [new_loc]([new_loc.x],[new_loc.y],[new_loc.z])" -/obj/item/weapon/bananapeel/testing/Initialize() +/obj/item/bananapeel/testing/Initialize() . = ..() AddComponent(/datum/component/recursive_move) RegisterSignal(src, COMSIG_OBSERVER_MOVED, PROC_REF(shmove)) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index f79ad0f7286..fe9b670d7ba 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -1,8 +1,8 @@ -var/bluespace_item_types = newlist(/obj/item/weapon/storage/backpack/holding, -/obj/item/weapon/storage/bag/trash/holding, -/obj/item/weapon/storage/pouch/holding, -/obj/item/weapon/storage/belt/utility/holding, -/obj/item/weapon/storage/belt/medical/holding +var/bluespace_item_types = newlist(/obj/item/storage/backpack/holding, +/obj/item/storage/bag/trash/holding, +/obj/item/storage/pouch/holding, +/obj/item/storage/belt/utility/holding, +/obj/item/storage/belt/medical/holding ) //wrapper @@ -183,11 +183,11 @@ var/bluespace_item_types = newlist(/obj/item/weapon/storage/backpack/holding, return 1 /datum/teleport/instant/science/teleportChecks() - if(istype(teleatom, /obj/item/weapon/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite + if(istype(teleatom, /obj/item/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite teleatom.visible_message("\The [teleatom] bounces off of the portal!") return 0 - if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/disk/nuclear))) + if(!isemptylist(teleatom.search_contents_for(/obj/item/disk/nuclear))) if(istype(teleatom, /mob/living)) var/mob/living/MM = teleatom MM.visible_message("\The [MM] bounces off of the portal!","Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through.") @@ -200,7 +200,7 @@ var/bluespace_item_types = newlist(/obj/item/weapon/storage/backpack/holding, var/obj/mecha/MM = teleatom to_chat(MM.occupant, "\The [MM] would not survive the jump to a location so far away!") return 0 - if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding))) + if(!isemptylist(teleatom.search_contents_for(/obj/item/storage/backpack/holding))) teleatom.visible_message("\The [teleatom] bounces off of the portal!") return 0 */ //VOREStation Removal End diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 4369217c485..868e8d9699f 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -348,7 +348,7 @@ switch(href_list["implant"]) if("remove") - for(var/obj/item/weapon/implant/loyalty/I in H.contents) + for(var/obj/item/implant/loyalty/I in H.contents) for(var/obj/item/organ/external/organs in H.organs) if(I in organs.implants) qdel(I) @@ -410,7 +410,7 @@ memory = null//Remove any memory they may have had. if("crystals") if (usr.client.holder.rights & R_FUN) - // var/obj/item/device/uplink/hidden/suplink = find_syndicate_uplink() No longer needed, uses stored in mind + // var/obj/item/uplink/hidden/suplink = find_syndicate_uplink() No longer needed, uses stored in mind var/crystals crystals = tcrystals crystals = tgui_input_number(usr, "Amount of telecrystals for [key]", crystals) @@ -433,7 +433,7 @@ return null /datum/mind/proc/take_uplink() - var/obj/item/device/uplink/hidden/H = find_syndicate_uplink() + var/obj/item/uplink/hidden/H = find_syndicate_uplink() if(H) qdel(H) @@ -448,10 +448,10 @@ var/is_currently_brigged = 0 if(istype(T.loc,/area/security/brig)) is_currently_brigged = 1 - for(var/obj/item/weapon/card/id/card in current) + for(var/obj/item/card/id/card in current) is_currently_brigged = 0 break // if they still have ID they're not brigged - for(var/obj/item/device/pda/P in current) + for(var/obj/item/pda/P in current) if(P.id) is_currently_brigged = 0 break // if they still have ID they're not brigged diff --git a/code/datums/outfits/costumes/halloween.dm b/code/datums/outfits/costumes/halloween.dm index 35f4aa238d5..04eff3fc058 100644 --- a/code/datums/outfits/costumes/halloween.dm +++ b/code/datums/outfits/costumes/halloween.dm @@ -6,7 +6,7 @@ mask = /obj/item/clothing/mask/surgical head = /obj/item/clothing/head/welding suit = /obj/item/clothing/suit/storage/apron - r_hand = /obj/item/weapon/material/twohanded/fireaxe/foam + r_hand = /obj/item/material/twohanded/fireaxe/foam /decl/hierarchy/outfit/costume/masked_killer/post_equip(var/mob/living/carbon/human/H) var/victim = get_mannequin(H.ckey) @@ -22,10 +22,10 @@ l_pocket = /obj/item/toy/sword /decl/hierarchy/outfit/costume/professional/post_equip(var/mob/living/carbon/human/H) - var/obj/item/weapon/storage/briefcase/new_briefcase = new(H) + var/obj/item/storage/briefcase/new_briefcase = new(H) for(var/obj/item/briefcase_item in new_briefcase) qdel(briefcase_item) - new_briefcase.contents += new /obj/item/weapon/gun/projectile/pistol/toy + new_briefcase.contents += new /obj/item/gun/projectile/pistol/toy new_briefcase.contents += new /obj/item/ammo_magazine/mfoam_dart/pistol new_briefcase.contents += new /obj/item/clothing/mask/gas/clown_hat H.equip_to_slot_or_del(new_briefcase, slot_l_hand) @@ -38,7 +38,7 @@ glasses = /obj/item/clothing/glasses/fakesunglasses mask = /obj/item/clothing/mask/fakemoustache head = /obj/item/clothing/head/beret - r_hand = /obj/item/weapon/gun/projectile/revolver/capgun + r_hand = /obj/item/gun/projectile/revolver/capgun /decl/hierarchy/outfit/costume/horrorcop/post_equip(var/mob/living/carbon/human/H) var/obj/item/clothing/under/U = H.w_uniform @@ -55,7 +55,7 @@ head = /obj/item/clothing/head/cowboy gloves = /obj/item/clothing/gloves/fingerless suit = /obj/item/clothing/accessory/poncho - r_hand = /obj/item/weapon/gun/projectile/revolver/capgun + r_hand = /obj/item/gun/projectile/revolver/capgun /decl/hierarchy/outfit/costume/cowboy/post_equip(var/mob/living/carbon/human/H) var/obj/item/clothing/under/U = H.w_uniform @@ -72,7 +72,7 @@ head = /obj/item/clothing/head/beanie gloves = /obj/item/clothing/gloves/fingerless suit = /obj/item/clothing/suit/storage/flannel/red - r_hand = /obj/item/weapon/material/twohanded/fireaxe/foam + r_hand = /obj/item/material/twohanded/fireaxe/foam /decl/hierarchy/outfit/costume/firefighter name = OUTFIT_COSTUME("Firefighter") @@ -87,14 +87,14 @@ uniform = /obj/item/clothing/under/kilt shoes = /obj/item/clothing/shoes/boots/jackboots head = /obj/item/clothing/head/beret - r_hand = /obj/item/weapon/material/sword/foam + r_hand = /obj/item/material/sword/foam /decl/hierarchy/outfit/costume/vampire name = OUTFIT_COSTUME("Vampire") uniform = /obj/item/clothing/under/suit_jacket/really_black shoes = /obj/item/clothing/shoes/dress gloves = /obj/item/clothing/gloves/white - r_hand = /obj/item/weapon/bedsheet/red + r_hand = /obj/item/bedsheet/red /decl/hierarchy/outfit/costume/vampire_hunter name = OUTFIT_COSTUME("Vampire Hunter") @@ -102,8 +102,8 @@ suit = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless shoes = /obj/item/clothing/shoes/boots/jackboots gloves = /obj/item/clothing/gloves/fingerless - l_pocket = /obj/item/weapon/gun/projectile/revolver/toy/crossbow/halloween - r_pocket = /obj/item/device/flashlight/color/red + l_pocket = /obj/item/gun/projectile/revolver/toy/crossbow/halloween + r_pocket = /obj/item/flashlight/color/red /decl/hierarchy/outfit/costume/pirate name = OUTFIT_COSTUME("Pirate") @@ -127,4 +127,4 @@ shoes = /obj/item/clothing/shoes/brown head = /obj/item/clothing/head/marine suit = /obj/item/clothing/suit/marine - r_hand = /obj/item/weapon/gun/projectile/revolver/toy/sawnoff \ No newline at end of file + r_hand = /obj/item/gun/projectile/revolver/toy/sawnoff \ No newline at end of file diff --git a/code/datums/outfits/horror_killers.dm b/code/datums/outfits/horror_killers.dm index 59507d4f347..aa45f4e23d8 100644 --- a/code/datums/outfits/horror_killers.dm +++ b/code/datums/outfits/horror_killers.dm @@ -5,14 +5,14 @@ gloves = /obj/item/clothing/gloves/black mask = /obj/item/clothing/mask/gas/clown_hat head = /obj/item/clothing/head/chaplain_hood - l_ear = /obj/item/device/radio/headset + l_ear = /obj/item/radio/headset glasses = /obj/item/clothing/glasses/thermal/plain/monocle suit = /obj/item/clothing/suit/storage/hooded/chaplain_hoodie - r_pocket = /obj/item/weapon/bikehorn - r_hand = /obj/item/weapon/material/twohanded/fireaxe + r_pocket = /obj/item/bikehorn + r_hand = /obj/item/material/twohanded/fireaxe id_slot = slot_wear_id - id_type = /obj/item/weapon/card/id/syndicate/station_access + id_type = /obj/item/card/id/syndicate/station_access id_pda_assignment = "Tunnel Clown!" /decl/hierarchy/outfit/masked_killer @@ -22,12 +22,12 @@ gloves = /obj/item/clothing/gloves/sterile/latex mask = /obj/item/clothing/mask/surgical head = /obj/item/clothing/head/welding - l_ear = /obj/item/device/radio/headset + l_ear = /obj/item/radio/headset glasses = /obj/item/clothing/glasses/thermal/plain/monocle suit = /obj/item/clothing/suit/storage/apron - l_pocket = /obj/item/weapon/material/knife/tacknife - r_pocket = /obj/item/weapon/surgical/scalpel - r_hand = /obj/item/weapon/material/twohanded/fireaxe + l_pocket = /obj/item/material/knife/tacknife + r_pocket = /obj/item/surgical/scalpel + r_hand = /obj/item/material/twohanded/fireaxe /decl/hierarchy/outfit/masked_killer/post_equip(var/mob/living/carbon/human/H) var/victim = get_mannequin(H.ckey) @@ -39,24 +39,24 @@ uniform = /obj/item/clothing/under/suit_jacket{ starting_accessories=list(/obj/item/clothing/accessory/wcoat) } shoes = /obj/item/clothing/shoes/black gloves = /obj/item/clothing/gloves/black - l_ear = /obj/item/device/radio/headset + l_ear = /obj/item/radio/headset glasses = /obj/item/clothing/glasses/sunglasses - l_pocket = /obj/item/weapon/melee/energy/sword + l_pocket = /obj/item/melee/energy/sword mask = /obj/item/clothing/mask/gas/clown_hat id_slot = slot_wear_id - id_type = /obj/item/weapon/card/id/syndicate/station_access + id_type = /obj/item/card/id/syndicate/station_access pda_slot = slot_belt - pda_type = /obj/item/device/pda/heads + pda_type = /obj/item/pda/heads /decl/hierarchy/outfit/professional/post_equip(var/mob/living/carbon/human/H) - var/obj/item/weapon/storage/secure/briefcase/sec_briefcase = new(H) + var/obj/item/storage/secure/briefcase/sec_briefcase = new(H) for(var/obj/item/briefcase_item in sec_briefcase) qdel(briefcase_item) for(var/i=3, i>0, i--) - sec_briefcase.contents += new /obj/item/weapon/spacecash/c1000 - sec_briefcase.contents += new /obj/item/weapon/gun/energy/crossbow - sec_briefcase.contents += new /obj/item/weapon/gun/projectile/revolver/mateba + sec_briefcase.contents += new /obj/item/spacecash/c1000 + sec_briefcase.contents += new /obj/item/gun/energy/crossbow + sec_briefcase.contents += new /obj/item/gun/projectile/revolver/mateba sec_briefcase.contents += new /obj/item/ammo_magazine/s357 - sec_briefcase.contents += new /obj/item/weapon/plastique + sec_briefcase.contents += new /obj/item/plastique H.equip_to_slot_or_del(sec_briefcase, slot_l_hand) diff --git a/code/datums/outfits/jobs/cargo.dm b/code/datums/outfits/jobs/cargo.dm index e7b8701a373..30955983df4 100644 --- a/code/datums/outfits/jobs/cargo.dm +++ b/code/datums/outfits/jobs/cargo.dm @@ -1,30 +1,30 @@ /decl/hierarchy/outfit/job/cargo - l_ear = /obj/item/device/radio/headset/headset_cargo + l_ear = /obj/item/radio/headset/headset_cargo hierarchy_type = /decl/hierarchy/outfit/job/cargo /decl/hierarchy/outfit/job/cargo/qm name = OUTFIT_JOB_NAME("Cargo") uniform = /obj/item/clothing/under/rank/cargo - l_ear = /obj/item/device/radio/headset/headset_qm //VOREStation Add + l_ear = /obj/item/radio/headset/headset_qm //VOREStation Add shoes = /obj/item/clothing/shoes/brown glasses = /obj/item/clothing/glasses/sunglasses - l_hand = /obj/item/weapon/clipboard - id_type = /obj/item/weapon/card/id/cargo/head - pda_type = /obj/item/device/pda/quartermaster + l_hand = /obj/item/clipboard + id_type = /obj/item/card/id/cargo/head + pda_type = /obj/item/pda/quartermaster /decl/hierarchy/outfit/job/cargo/cargo_tech name = OUTFIT_JOB_NAME("Cargo technician") uniform = /obj/item/clothing/under/rank/cargotech - id_type = /obj/item/weapon/card/id/cargo - pda_type = /obj/item/device/pda/cargo + id_type = /obj/item/card/id/cargo + pda_type = /obj/item/pda/cargo /decl/hierarchy/outfit/job/cargo/mining name = OUTFIT_JOB_NAME("Shaft miner") uniform = /obj/item/clothing/under/rank/miner - l_ear = /obj/item/device/radio/headset/headset_mine - backpack = /obj/item/weapon/storage/backpack/industrial - satchel_one = /obj/item/weapon/storage/backpack/satchel/eng - id_type = /obj/item/weapon/card/id/cargo/miner - pda_type = /obj/item/device/pda/shaftminer - backpack_contents = list(/obj/item/weapon/tool/crowbar = 1, /obj/item/weapon/storage/bag/ore = 1) + l_ear = /obj/item/radio/headset/headset_mine + backpack = /obj/item/storage/backpack/industrial + satchel_one = /obj/item/storage/backpack/satchel/eng + id_type = /obj/item/card/id/cargo/miner + pda_type = /obj/item/pda/shaftminer + backpack_contents = list(/obj/item/tool/crowbar = 1, /obj/item/storage/bag/ore = 1) flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL diff --git a/code/datums/outfits/jobs/civilian.dm b/code/datums/outfits/jobs/civilian.dm index 467deae4bfe..a62600a6eef 100644 --- a/code/datums/outfits/jobs/civilian.dm +++ b/code/datums/outfits/jobs/civilian.dm @@ -1,6 +1,6 @@ /decl/hierarchy/outfit/job/assistant name = OUTFIT_JOB_NAME(JOB_ALT_VISITOR) //VOREStation Edit - Visitor not Assistant - id_type = /obj/item/weapon/card/id/generic //VOREStation Edit + id_type = /obj/item/card/id/generic //VOREStation Edit /decl/hierarchy/outfit/job/assistant/visitor name = OUTFIT_JOB_NAME(JOB_ALT_VISITOR) @@ -10,7 +10,7 @@ //VOREStation Add - Interns /decl/hierarchy/outfit/job/assistant/intern name = OUTFIT_JOB_NAME(JOB_INTERN) - id_type = /obj/item/weapon/card/id/civilian + id_type = /obj/item/card/id/civilian //VOREStation Add End - Interns /decl/hierarchy/outfit/job/assistant/resident @@ -19,14 +19,14 @@ uniform = /obj/item/clothing/under/color/white /decl/hierarchy/outfit/job/service - l_ear = /obj/item/device/radio/headset/headset_service + l_ear = /obj/item/radio/headset/headset_service hierarchy_type = /decl/hierarchy/outfit/job/service /decl/hierarchy/outfit/job/service/bartender name = OUTFIT_JOB_NAME(JOB_BARTENDER) uniform = /obj/item/clothing/under/rank/bartender - id_type = /obj/item/weapon/card/id/civilian/service/bartender //VOREStation Edit - pda_type = /obj/item/device/pda/bar + id_type = /obj/item/card/id/civilian/service/bartender //VOREStation Edit + pda_type = /obj/item/pda/bar backpack_contents = list(/obj/item/clothing/accessory/permit/gun/bar = 1) /decl/hierarchy/outfit/job/service/bartender/post_equip(mob/living/carbon/human/H) @@ -45,8 +45,8 @@ uniform = /obj/item/clothing/under/rank/chef suit = /obj/item/clothing/suit/chef head = /obj/item/clothing/head/chefhat - id_type = /obj/item/weapon/card/id/civilian/service/chef //VOREStation Edit - pda_type = /obj/item/device/pda/chef + id_type = /obj/item/card/id/civilian/service/chef //VOREStation Edit + pda_type = /obj/item/pda/chef /decl/hierarchy/outfit/job/service/chef/cook name = OUTFIT_JOB_NAME(JOB_ALT_COOK) @@ -65,47 +65,47 @@ uniform = /obj/item/clothing/under/rank/hydroponics suit = /obj/item/clothing/suit/storage/apron gloves = /obj/item/clothing/gloves/botanic_leather - r_pocket = /obj/item/device/analyzer/plant_analyzer - backpack = /obj/item/weapon/storage/backpack/hydroponics - satchel_one = /obj/item/weapon/storage/backpack/satchel/hyd - messenger_bag = /obj/item/weapon/storage/backpack/messenger/hyd - sports_bag = /obj/item/weapon/storage/backpack/sport/hyd - id_type = /obj/item/weapon/card/id/civilian/service/botanist //VOREStation Edit - pda_type = /obj/item/device/pda/botanist + r_pocket = /obj/item/analyzer/plant_analyzer + backpack = /obj/item/storage/backpack/hydroponics + satchel_one = /obj/item/storage/backpack/satchel/hyd + messenger_bag = /obj/item/storage/backpack/messenger/hyd + sports_bag = /obj/item/storage/backpack/sport/hyd + id_type = /obj/item/card/id/civilian/service/botanist //VOREStation Edit + pda_type = /obj/item/pda/botanist /decl/hierarchy/outfit/job/service/janitor name = OUTFIT_JOB_NAME(JOB_JANITOR) uniform = /obj/item/clothing/under/rank/janitor - id_type = /obj/item/weapon/card/id/civilian/service/janitor //VOREStation Edit - pda_type = /obj/item/device/pda/janitor + id_type = /obj/item/card/id/civilian/service/janitor //VOREStation Edit + pda_type = /obj/item/pda/janitor /decl/hierarchy/outfit/job/librarian name = OUTFIT_JOB_NAME(JOB_LIBRARIAN) uniform = /obj/item/clothing/under/suit_jacket/red - l_hand = /obj/item/weapon/barcodescanner - id_type = /obj/item/weapon/card/id/civilian - pda_type = /obj/item/device/pda/librarian + l_hand = /obj/item/barcodescanner + id_type = /obj/item/card/id/civilian + pda_type = /obj/item/pda/librarian /decl/hierarchy/outfit/job/librarian/journalist - id_type = /obj/item/weapon/card/id/civilian/journalist + id_type = /obj/item/card/id/civilian/journalist /decl/hierarchy/outfit/job/internal_affairs_agent name = OUTFIT_JOB_NAME("Internal affairs agent") - l_ear = /obj/item/device/radio/headset/ia + l_ear = /obj/item/radio/headset/ia uniform = /obj/item/clothing/under/rank/internalaffairs suit = /obj/item/clothing/suit/storage/toggle/internalaffairs shoes = /obj/item/clothing/shoes/brown glasses = /obj/item/clothing/glasses/sunglasses/big - l_hand = /obj/item/weapon/clipboard - id_type = /obj/item/weapon/card/id/civilian/internal_affairs - pda_type = /obj/item/device/pda/lawyer + l_hand = /obj/item/clipboard + id_type = /obj/item/card/id/civilian/internal_affairs + pda_type = /obj/item/pda/lawyer /decl/hierarchy/outfit/job/chaplain name = OUTFIT_JOB_NAME(JOB_CHAPLAIN) uniform = /obj/item/clothing/under/rank/chaplain - l_hand = /obj/item/weapon/storage/bible - id_type = /obj/item/weapon/card/id/civilian/chaplain - pda_type = /obj/item/device/pda/chaplain + l_hand = /obj/item/storage/bible + id_type = /obj/item/card/id/civilian/chaplain + pda_type = /obj/item/pda/chaplain /decl/hierarchy/outfit/job/explorer name = OUTFIT_JOB_NAME(JOB_EXPLORER) @@ -114,10 +114,10 @@ mask = /obj/item/clothing/mask/gas/explorer suit = /obj/item/clothing/suit/storage/hooded/explorer gloves = /obj/item/clothing/gloves/black - l_ear = /obj/item/device/radio/headset + l_ear = /obj/item/radio/headset id_slot = slot_wear_id - id_type = /obj/item/weapon/card/id/exploration //VOREStation Edit + id_type = /obj/item/card/id/exploration //VOREStation Edit pda_slot = slot_belt - pda_type = /obj/item/device/pda/cargo // Brown looks more rugged - r_pocket = /obj/item/device/gps/explorer + pda_type = /obj/item/pda/cargo // Brown looks more rugged + r_pocket = /obj/item/gps/explorer id_pda_assignment = JOB_EXPLORER diff --git a/code/datums/outfits/jobs/civilian_vr.dm b/code/datums/outfits/jobs/civilian_vr.dm index 74e441e5eef..f25f6ac08ac 100644 --- a/code/datums/outfits/jobs/civilian_vr.dm +++ b/code/datums/outfits/jobs/civilian_vr.dm @@ -1,92 +1,92 @@ /decl/hierarchy/outfit/job/assistant/worker - id_type = /obj/item/weapon/card/id/civilian/service + id_type = /obj/item/card/id/civilian/service /decl/hierarchy/outfit/job/assistant/cargo - id_type = /obj/item/weapon/card/id/cargo + id_type = /obj/item/card/id/cargo /decl/hierarchy/outfit/job/assistant/engineer - id_type = /obj/item/weapon/card/id/engineering + id_type = /obj/item/card/id/engineering flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL /decl/hierarchy/outfit/job/assistant/medic - id_type = /obj/item/weapon/card/id/medical + id_type = /obj/item/card/id/medical /decl/hierarchy/outfit/job/assistant/scientist - id_type = /obj/item/weapon/card/id/science + id_type = /obj/item/card/id/science /decl/hierarchy/outfit/job/assistant/officer - id_type = /obj/item/weapon/card/id/security + id_type = /obj/item/card/id/security /decl/hierarchy/outfit/job/assistant/entertainer - id_type = /obj/item/weapon/card/id/civilian/entertainer + id_type = /obj/item/card/id/civilian/entertainer /decl/hierarchy/outfit/job/assistant/entrepreneur - id_type = /obj/item/weapon/card/id/civilian/entrepreneur - l_hand = /obj/item/device/ticket_printer/train + id_type = /obj/item/card/id/civilian/entrepreneur + l_hand = /obj/item/ticket_printer/train uniform = /obj/item/clothing/under/tropical/pink /decl/hierarchy/outfit/job/assistant/entrepreneur/lawyer uniform = /obj/item/clothing/under/lawyer/red - r_hand = /obj/item/weapon/clipboard - l_pocket = /obj/item/weapon/pen/fountain3 + r_hand = /obj/item/clipboard + l_pocket = /obj/item/pen/fountain3 /decl/hierarchy/outfit/job/assistant/entrepreneur/private_eye - l_hand = /obj/item/weapon/storage/box/private_investigator + l_hand = /obj/item/storage/box/private_investigator suit = /obj/item/clothing/suit/storage/trench head = /obj/item/clothing/head/fedora/brown /decl/hierarchy/outfit/job/assistant/entrepreneur/bodyguard glasses = /obj/item/clothing/glasses/sunglasses - l_pocket = /obj/item/weapon/reagent_containers/spray/pepper + l_pocket = /obj/item/reagent_containers/spray/pepper suit = /obj/item/clothing/accessory/sweater/blackneck /decl/hierarchy/outfit/job/assistant/entrepreneur/personal_physician suit = /obj/item/clothing/suit/storage/toggle/labcoat l_pocket = /obj/item/clothing/accessory/stethoscope - r_pocket = /obj/item/device/healthanalyzer + r_pocket = /obj/item/healthanalyzer /decl/hierarchy/outfit/job/assistant/entrepreneur/dentist - l_hand = /obj/item/weapon/storage/box/dentist + l_hand = /obj/item/storage/box/dentist suit = /obj/item/clothing/suit/storage/toggle/labcoat /decl/hierarchy/outfit/job/assistant/entrepreneur/fitness_instructor - l_hand = /obj/item/weapon/storage/box/fitness_trainer + l_hand = /obj/item/storage/box/fitness_trainer /decl/hierarchy/outfit/job/assistant/entrepreneur/yoga_teacher uniform = /obj/item/clothing/under/pants/yogapants - l_hand = /obj/item/weapon/storage/box/yoga_teacher + l_hand = /obj/item/storage/box/yoga_teacher /decl/hierarchy/outfit/job/assistant/entrepreneur/masseuse r_hand = /obj/item/roller/massage /decl/hierarchy/outfit/job/assistant/entrepreneur/tradesperson - r_hand = /obj/item/weapon/storage/toolbox/brass + r_hand = /obj/item/storage/toolbox/brass /decl/hierarchy/outfit/job/assistant/entrepreneur/streamer - l_pocket = /obj/item/device/tvcamera/streamer + l_pocket = /obj/item/tvcamera/streamer /decl/hierarchy/outfit/job/assistant/entrepreneur/influencer - l_pocket = /obj/item/device/camera/selfie + l_pocket = /obj/item/camera/selfie /decl/hierarchy/outfit/job/assistant/entrepreneur/paranormal_investigator - l_hand = /obj/item/weapon/storage/box/paranormal_investigator + l_hand = /obj/item/storage/box/paranormal_investigator /decl/hierarchy/outfit/job/assistant/entrepreneur/stylist - l_hand = /obj/item/weapon/storage/box/stylist + l_hand = /obj/item/storage/box/stylist /decl/hierarchy/outfit/job/assistant/entrepreneur/fisher - r_hand = /obj/item/weapon/material/fishing_rod/modern - l_pocket = /obj/item/weapon/material/fishing_net + r_hand = /obj/item/material/fishing_rod/modern + l_pocket = /obj/item/material/fishing_net head = /obj/item/clothing/head/fishing - r_pocket = /obj/item/weapon/storage/box/wormcan + r_pocket = /obj/item/storage/box/wormcan /decl/hierarchy/outfit/job/assistant/entrepreneur/personal_secretary uniform = /obj/item/clothing/under/lawyer/blue - r_hand = /obj/item/weapon/clipboard - l_pocket = /obj/item/weapon/pen/fountain3 + r_hand = /obj/item/clipboard + l_pocket = /obj/item/pen/fountain3 /decl/hierarchy/outfit/job/assistant/entrepreneur/fortune_teller - l_hand = /obj/item/weapon/storage/box/fortune_teller + l_hand = /obj/item/storage/box/fortune_teller /decl/hierarchy/outfit/job/assistant/entrepreneur/spirit_healer - l_hand = /obj/item/weapon/storage/box/spirit_healer + l_hand = /obj/item/storage/box/spirit_healer diff --git a/code/datums/outfits/jobs/command.dm b/code/datums/outfits/jobs/command.dm index b5622606358..149020e4fed 100644 --- a/code/datums/outfits/jobs/command.dm +++ b/code/datums/outfits/jobs/command.dm @@ -2,13 +2,13 @@ name = OUTFIT_JOB_NAME(JOB_ALT_CAPTAIN) // Keep Captain for now, not JOB_SITE_MANAGER glasses = /obj/item/clothing/glasses/sunglasses uniform = /obj/item/clothing/under/rank/captain - l_ear = /obj/item/device/radio/headset/heads/captain + l_ear = /obj/item/radio/headset/heads/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 - id_type = /obj/item/weapon/card/id/gold - pda_type = /obj/item/device/pda/captain + backpack = /obj/item/storage/backpack/captain + satchel_one = /obj/item/storage/backpack/satchel/cap + messenger_bag = /obj/item/storage/backpack/messenger/com + id_type = /obj/item/card/id/gold + pda_type = /obj/item/pda/captain /decl/hierarchy/outfit/job/captain/post_equip(var/mob/living/carbon/human/H) ..() @@ -26,18 +26,18 @@ /decl/hierarchy/outfit/job/hop name = OUTFIT_JOB_NAME(JOB_HEAD_OF_PERSONNEL) uniform = /obj/item/clothing/under/rank/head_of_personnel - l_ear = /obj/item/device/radio/headset/heads/hop + l_ear = /obj/item/radio/headset/heads/hop shoes = /obj/item/clothing/shoes/brown - id_type = /obj/item/weapon/card/id/silver/hop - pda_type = /obj/item/device/pda/heads/hop + id_type = /obj/item/card/id/silver/hop + pda_type = /obj/item/pda/heads/hop /decl/hierarchy/outfit/job/secretary name = OUTFIT_JOB_NAME(JOB_COMMAND_SECRETARY) - l_ear = /obj/item/device/radio/headset/headset_com + l_ear = /obj/item/radio/headset/headset_com shoes = /obj/item/clothing/shoes/brown - id_type = /obj/item/weapon/card/id/silver/secretary - pda_type = /obj/item/device/pda/heads - r_hand = /obj/item/weapon/clipboard + id_type = /obj/item/card/id/silver/secretary + pda_type = /obj/item/pda/heads + r_hand = /obj/item/clipboard /decl/hierarchy/outfit/job/secretary/pre_equip(mob/living/carbon/human/H) ..() diff --git a/code/datums/outfits/jobs/command_vr.dm b/code/datums/outfits/jobs/command_vr.dm index 5e90123ffcc..d120a0c41e9 100644 --- a/code/datums/outfits/jobs/command_vr.dm +++ b/code/datums/outfits/jobs/command_vr.dm @@ -1,5 +1,5 @@ /decl/hierarchy/outfit/job/hop - id_type = /obj/item/weapon/card/id/silver/hop + id_type = /obj/item/card/id/silver/hop /decl/hierarchy/outfit/job/secretary - id_type = /obj/item/weapon/card/id/silver/secretary \ No newline at end of file + id_type = /obj/item/card/id/silver/secretary \ No newline at end of file diff --git a/code/datums/outfits/jobs/engineering.dm b/code/datums/outfits/jobs/engineering.dm index fdee06e0b20..16de1539c3d 100644 --- a/code/datums/outfits/jobs/engineering.dm +++ b/code/datums/outfits/jobs/engineering.dm @@ -1,12 +1,12 @@ /decl/hierarchy/outfit/job/engineering hierarchy_type = /decl/hierarchy/outfit/job/engineering - belt = /obj/item/weapon/storage/belt/utility/full/multitool - l_ear = /obj/item/device/radio/headset/headset_eng + belt = /obj/item/storage/belt/utility/full/multitool + l_ear = /obj/item/radio/headset/headset_eng 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 pda_slot = slot_l_store flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL @@ -14,21 +14,21 @@ name = OUTFIT_JOB_NAME(JOB_CHIEF_ENGINEER) head = /obj/item/clothing/head/hardhat/white uniform = /obj/item/clothing/under/rank/chief_engineer - l_ear = /obj/item/device/radio/headset/heads/ce + l_ear = /obj/item/radio/headset/heads/ce gloves = /obj/item/clothing/gloves/black - id_type = /obj/item/weapon/card/id/engineering/head - pda_type = /obj/item/device/pda/heads/ce + id_type = /obj/item/card/id/engineering/head + pda_type = /obj/item/pda/heads/ce /decl/hierarchy/outfit/job/engineering/engineer name = OUTFIT_JOB_NAME(JOB_ENGINEER) head = /obj/item/clothing/head/hardhat uniform = /obj/item/clothing/under/rank/engineer - id_type = /obj/item/weapon/card/id/engineering - pda_type = /obj/item/device/pda/engineering + id_type = /obj/item/card/id/engineering + pda_type = /obj/item/pda/engineering /decl/hierarchy/outfit/job/engineering/atmos name = OUTFIT_JOB_NAME(JOB_ATMOSPHERIC_TECHNICIAN) uniform = /obj/item/clothing/under/rank/atmospheric_technician - belt = /obj/item/weapon/storage/belt/utility/atmostech - id_type = /obj/item/weapon/card/id/engineering/atmos - pda_type = /obj/item/device/pda/atmos + belt = /obj/item/storage/belt/utility/atmostech + id_type = /obj/item/card/id/engineering/atmos + pda_type = /obj/item/pda/atmos diff --git a/code/datums/outfits/jobs/job.dm b/code/datums/outfits/jobs/job.dm index 5c419f8fb28..adfa938bf33 100644 --- a/code/datums/outfits/jobs/job.dm +++ b/code/datums/outfits/jobs/job.dm @@ -3,18 +3,18 @@ hierarchy_type = /decl/hierarchy/outfit/job uniform = /obj/item/clothing/under/color/grey - l_ear = /obj/item/device/radio/headset + l_ear = /obj/item/radio/headset shoes = /obj/item/clothing/shoes/black id_slot = slot_wear_id - id_type = /obj/item/weapon/card/id/civilian + id_type = /obj/item/card/id/civilian pda_slot = slot_belt - pda_type = /obj/item/device/pda + pda_type = /obj/item/pda flags = OUTFIT_HAS_BACKPACK /decl/hierarchy/outfit/job/equip_id(mob/living/carbon/human/H, rank, assignment) - var/obj/item/weapon/card/id/C = ..() + var/obj/item/card/id/C = ..() var/datum/job/J = job_master.GetJob(rank) if(J) C.access = J.get_access() diff --git a/code/datums/outfits/jobs/medical.dm b/code/datums/outfits/jobs/medical.dm index f0b370d8af3..a78636ea630 100644 --- a/code/datums/outfits/jobs/medical.dm +++ b/code/datums/outfits/jobs/medical.dm @@ -1,31 +1,31 @@ /decl/hierarchy/outfit/job/medical hierarchy_type = /decl/hierarchy/outfit/job/medical - l_ear = /obj/item/device/radio/headset/headset_med + l_ear = /obj/item/radio/headset/headset_med shoes = /obj/item/clothing/shoes/white - pda_type = /obj/item/device/pda/medical + pda_type = /obj/item/pda/medical pda_slot = slot_l_store - 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 /decl/hierarchy/outfit/job/medical/cmo name = OUTFIT_JOB_NAME(JOB_CHIEF_MEDICAL_OFFICER) - l_ear =/obj/item/device/radio/headset/heads/cmo + l_ear =/obj/item/radio/headset/heads/cmo uniform = /obj/item/clothing/under/rank/chief_medical_officer suit = /obj/item/clothing/suit/storage/toggle/labcoat/cmo shoes = /obj/item/clothing/shoes/brown - l_hand = /obj/item/weapon/storage/firstaid/adv - r_pocket = /obj/item/device/healthanalyzer - id_type = /obj/item/weapon/card/id/medical/head - pda_type = /obj/item/device/pda/heads/cmo + l_hand = /obj/item/storage/firstaid/adv + r_pocket = /obj/item/healthanalyzer + id_type = /obj/item/card/id/medical/head + pda_type = /obj/item/pda/heads/cmo /decl/hierarchy/outfit/job/medical/doctor name = OUTFIT_JOB_NAME(JOB_MEDICAL_DOCTOR) 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 - id_type = /obj/item/weapon/card/id/medical + l_hand = /obj/item/storage/firstaid/regular + r_pocket = /obj/item/flashlight/pen + id_type = /obj/item/card/id/medical /decl/hierarchy/outfit/job/medical/doctor/emergency_physician name = OUTFIT_JOB_NAME(JOB_ALT_EMERGENCY_PHYSICIAN) @@ -41,8 +41,8 @@ uniform = /obj/item/clothing/under/rank/virologist suit = /obj/item/clothing/suit/storage/toggle/labcoat/virologist mask = /obj/item/clothing/mask/surgical - backpack = /obj/item/weapon/storage/backpack/virology - satchel_one = /obj/item/weapon/storage/backpack/satchel/vir + backpack = /obj/item/storage/backpack/virology + satchel_one = /obj/item/storage/backpack/satchel/vir /decl/hierarchy/outfit/job/medical/doctor/nurse name = OUTFIT_JOB_NAME(JOB_ALT_NURSE) @@ -63,28 +63,28 @@ name = OUTFIT_JOB_NAME(JOB_CHEMIST) uniform = /obj/item/clothing/under/rank/chemist suit = /obj/item/clothing/suit/storage/toggle/labcoat/chemist - backpack = /obj/item/weapon/storage/backpack/chemistry - satchel_one = /obj/item/weapon/storage/backpack/satchel/chem - sports_bag = /obj/item/weapon/storage/backpack/sport/chem - id_type = /obj/item/weapon/card/id/medical/chemist - pda_type = /obj/item/device/pda/chemist + backpack = /obj/item/storage/backpack/chemistry + satchel_one = /obj/item/storage/backpack/satchel/chem + sports_bag = /obj/item/storage/backpack/sport/chem + id_type = /obj/item/card/id/medical/chemist + pda_type = /obj/item/pda/chemist /decl/hierarchy/outfit/job/medical/geneticist name = OUTFIT_JOB_NAME(JOB_GENETICIST) uniform = /obj/item/clothing/under/rank/geneticist suit = /obj/item/clothing/suit/storage/toggle/labcoat/genetics - backpack = /obj/item/weapon/storage/backpack/genetics - r_pocket = /obj/item/device/flashlight/pen - satchel_one = /obj/item/weapon/storage/backpack/satchel/gen - id_type = /obj/item/weapon/card/id/medical/geneticist - pda_type = /obj/item/device/pda/geneticist + backpack = /obj/item/storage/backpack/genetics + r_pocket = /obj/item/flashlight/pen + satchel_one = /obj/item/storage/backpack/satchel/gen + id_type = /obj/item/card/id/medical/geneticist + pda_type = /obj/item/pda/geneticist /decl/hierarchy/outfit/job/medical/psychiatrist name = OUTFIT_JOB_NAME(JOB_PSYCHIATRIST) uniform = /obj/item/clothing/under/rank/psych suit = /obj/item/clothing/suit/storage/toggle/labcoat shoes = /obj/item/clothing/shoes/laceup - id_type = /obj/item/weapon/card/id/medical/psych + id_type = /obj/item/card/id/medical/psych /decl/hierarchy/outfit/job/medical/psychiatrist/psychologist name = OUTFIT_JOB_NAME(JOB_ALT_PSYCHOLOGIST) @@ -95,10 +95,10 @@ uniform = /obj/item/clothing/under/rank/medical/paramedic suit = /obj/item/clothing/suit/storage/toggle/fr_jacket shoes = /obj/item/clothing/shoes/boots/jackboots - l_hand = /obj/item/weapon/storage/firstaid/regular - belt = /obj/item/weapon/storage/belt/medical/emt + l_hand = /obj/item/storage/firstaid/regular + belt = /obj/item/storage/belt/medical/emt pda_slot = slot_l_store - id_type = /obj/item/weapon/card/id/medical/emt + id_type = /obj/item/card/id/medical/emt flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL /decl/hierarchy/outfit/job/medical/paramedic/emt diff --git a/code/datums/outfits/jobs/medical_vr.dm b/code/datums/outfits/jobs/medical_vr.dm index e9b2c1a0d02..5576e71cada 100644 --- a/code/datums/outfits/jobs/medical_vr.dm +++ b/code/datums/outfits/jobs/medical_vr.dm @@ -1,2 +1,2 @@ /decl/hierarchy/outfit/job/medical/doctor/virologist - id_type = /obj/item/weapon/card/id/medical/virologist \ No newline at end of file + id_type = /obj/item/card/id/medical/virologist \ No newline at end of file diff --git a/code/datums/outfits/jobs/science.dm b/code/datums/outfits/jobs/science.dm index af8307cc3fc..a9fe8a44370 100644 --- a/code/datums/outfits/jobs/science.dm +++ b/code/datums/outfits/jobs/science.dm @@ -1,43 +1,43 @@ /decl/hierarchy/outfit/job/science hierarchy_type = /decl/hierarchy/outfit/job/science - l_ear = /obj/item/device/radio/headset/headset_sci + l_ear = /obj/item/radio/headset/headset_sci suit = /obj/item/clothing/suit/storage/toggle/labcoat shoes = /obj/item/clothing/shoes/white - pda_type = /obj/item/device/pda/science - backpack = /obj/item/weapon/storage/backpack/toxins - satchel_one = /obj/item/weapon/storage/backpack/satchel/tox - messenger_bag = /obj/item/weapon/storage/backpack/messenger/tox - sports_bag = /obj/item/weapon/storage/backpack/sport/tox + pda_type = /obj/item/pda/science + backpack = /obj/item/storage/backpack/toxins + satchel_one = /obj/item/storage/backpack/satchel/tox + messenger_bag = /obj/item/storage/backpack/messenger/tox + sports_bag = /obj/item/storage/backpack/sport/tox /decl/hierarchy/outfit/job/science/rd name = OUTFIT_JOB_NAME("Research Director") - l_ear = /obj/item/device/radio/headset/heads/rd + l_ear = /obj/item/radio/headset/heads/rd uniform = /obj/item/clothing/under/rank/research_director shoes = /obj/item/clothing/shoes/brown - l_hand = /obj/item/weapon/clipboard - id_type = /obj/item/weapon/card/id/science/head - pda_type = /obj/item/device/pda/heads/rd + l_hand = /obj/item/clipboard + id_type = /obj/item/card/id/science/head + pda_type = /obj/item/pda/heads/rd /decl/hierarchy/outfit/job/science/scientist name = OUTFIT_JOB_NAME(JOB_SCIENTIST) uniform = /obj/item/clothing/under/rank/scientist - id_type = /obj/item/weapon/card/id/science + id_type = /obj/item/card/id/science suit = /obj/item/clothing/suit/storage/toggle/labcoat/science /decl/hierarchy/outfit/job/science/xenobiologist name = OUTFIT_JOB_NAME(JOB_XENOBIOLOGIST) uniform = /obj/item/clothing/under/rank/scientist - id_type = /obj/item/weapon/card/id/science + id_type = /obj/item/card/id/science suit = /obj/item/clothing/suit/storage/toggle/labcoat/science /decl/hierarchy/outfit/job/science/roboticist name = OUTFIT_JOB_NAME(JOB_ROBOTICIST) uniform = /obj/item/clothing/under/rank/roboticist shoes = /obj/item/clothing/shoes/black - belt = /obj/item/weapon/storage/belt/utility/full/multitool - id_type = /obj/item/weapon/card/id/science + belt = /obj/item/storage/belt/utility/full/multitool + id_type = /obj/item/card/id/science pda_slot = slot_r_store - pda_type = /obj/item/device/pda/roboticist - backpack = /obj/item/weapon/storage/backpack - satchel_one = /obj/item/weapon/storage/backpack/satchel/norm + pda_type = /obj/item/pda/roboticist + backpack = /obj/item/storage/backpack + satchel_one = /obj/item/storage/backpack/satchel/norm suit = /obj/item/clothing/suit/storage/toggle/labcoat/roboticist diff --git a/code/datums/outfits/jobs/science_vr.dm b/code/datums/outfits/jobs/science_vr.dm index 21a6bf43f07..74242d7b1d4 100644 --- a/code/datums/outfits/jobs/science_vr.dm +++ b/code/datums/outfits/jobs/science_vr.dm @@ -1,8 +1,8 @@ /decl/hierarchy/outfit/job/science/xenobiologist - id_type = /obj/item/weapon/card/id/science/xenobiologist + id_type = /obj/item/card/id/science/xenobiologist /decl/hierarchy/outfit/job/science/xenobotanist name = OUTFIT_JOB_NAME(JOB_XENOBOTANIST) uniform = /obj/item/clothing/under/rank/scientist - id_type = /obj/item/weapon/card/id/science/xenobotanist + id_type = /obj/item/card/id/science/xenobotanist suit = /obj/item/clothing/suit/storage/toggle/labcoat/science diff --git a/code/datums/outfits/jobs/security.dm b/code/datums/outfits/jobs/security.dm index 26d5d4a4433..e73b45e06bf 100644 --- a/code/datums/outfits/jobs/security.dm +++ b/code/datums/outfits/jobs/security.dm @@ -1,42 +1,42 @@ /decl/hierarchy/outfit/job/security hierarchy_type = /decl/hierarchy/outfit/job/security glasses = /obj/item/clothing/glasses/sunglasses/sechud - l_ear = /obj/item/device/radio/headset/headset_sec + l_ear = /obj/item/radio/headset/headset_sec 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 - backpack_contents = list(/obj/item/weapon/handcuffs = 1) - messenger_bag = /obj/item/weapon/storage/backpack/messenger/sec - sports_bag = /obj/item/weapon/storage/backpack/sport/sec + backpack = /obj/item/storage/backpack/security + satchel_one = /obj/item/storage/backpack/satchel/sec + backpack_contents = list(/obj/item/handcuffs = 1) + messenger_bag = /obj/item/storage/backpack/messenger/sec + sports_bag = /obj/item/storage/backpack/sport/sec /decl/hierarchy/outfit/job/security/hos name = OUTFIT_JOB_NAME(JOB_HEAD_OF_SECURITY) - l_ear = /obj/item/device/radio/headset/heads/hos + l_ear = /obj/item/radio/headset/heads/hos uniform = /obj/item/clothing/under/rank/head_of_security - id_type = /obj/item/weapon/card/id/security/head - pda_type = /obj/item/device/pda/heads/hos + id_type = /obj/item/card/id/security/head + pda_type = /obj/item/pda/heads/hos /decl/hierarchy/outfit/job/security/warden name = OUTFIT_JOB_NAME(JOB_WARDEN) uniform = /obj/item/clothing/under/rank/warden - l_pocket = /obj/item/device/flash - id_type = /obj/item/weapon/card/id/security/warden - pda_type = /obj/item/device/pda/warden + l_pocket = /obj/item/flash + id_type = /obj/item/card/id/security/warden + pda_type = /obj/item/pda/warden /decl/hierarchy/outfit/job/security/detective name = OUTFIT_JOB_NAME(JOB_DETECTIVE) head = /obj/item/clothing/head/det uniform = /obj/item/clothing/under/det suit = /obj/item/clothing/suit/storage/det_trench - l_pocket = /obj/item/weapon/flame/lighter/zippo + l_pocket = /obj/item/flame/lighter/zippo shoes = /obj/item/clothing/shoes/laceup - r_hand = /obj/item/weapon/storage/briefcase/crimekit - id_type = /obj/item/weapon/card/id/security/detective - pda_type = /obj/item/device/pda/detective - backpack = /obj/item/weapon/storage/backpack - satchel_one = /obj/item/weapon/storage/backpack/satchel/norm - backpack_contents = list(/obj/item/weapon/storage/box/evidence = 1) + r_hand = /obj/item/storage/briefcase/crimekit + id_type = /obj/item/card/id/security/detective + pda_type = /obj/item/pda/detective + backpack = /obj/item/storage/backpack + satchel_one = /obj/item/storage/backpack/satchel/norm + backpack_contents = list(/obj/item/storage/box/evidence = 1) //VOREStation Edit - More cyberpunky /decl/hierarchy/outfit/job/security/detective/forensic @@ -49,6 +49,6 @@ /decl/hierarchy/outfit/job/security/officer name = OUTFIT_JOB_NAME(JOB_SECURITY_OFFICER) uniform = /obj/item/clothing/under/rank/security - l_pocket = /obj/item/device/flash - id_type = /obj/item/weapon/card/id/security - pda_type = /obj/item/device/pda/security + l_pocket = /obj/item/flash + id_type = /obj/item/card/id/security + pda_type = /obj/item/pda/security diff --git a/code/datums/outfits/jobs/special_vr.dm b/code/datums/outfits/jobs/special_vr.dm index 52707d7a3c6..bc88232d130 100644 --- a/code/datums/outfits/jobs/special_vr.dm +++ b/code/datums/outfits/jobs/special_vr.dm @@ -4,10 +4,10 @@ gloves = /obj/item/clothing/gloves/white shoes = /obj/item/clothing/shoes/laceup head = /obj/item/clothing/head/beret/centcom/officer - l_ear = /obj/item/device/radio/headset/centcom + l_ear = /obj/item/radio/headset/centcom glasses = /obj/item/clothing/glasses/omnihud/all - id_type = /obj/item/weapon/card/id/centcom - pda_type = /obj/item/device/pda/centcom + id_type = /obj/item/card/id/centcom + pda_type = /obj/item/pda/centcom flags = OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL /decl/hierarchy/outfit/job/emergency_responder @@ -15,11 +15,11 @@ uniform = /obj/item/clothing/under/ert shoes = /obj/item/clothing/shoes/boots/swat gloves = /obj/item/clothing/gloves/swat - l_ear = /obj/item/device/radio/headset/ert + l_ear = /obj/item/radio/headset/ert glasses = /obj/item/clothing/glasses/sunglasses - back = /obj/item/weapon/storage/backpack/satchel - id_type = /obj/item/weapon/card/id/centcom/ERT - pda_type = /obj/item/device/pda/centcom + back = /obj/item/storage/backpack/satchel + id_type = /obj/item/card/id/centcom/ERT + pda_type = /obj/item/pda/centcom flags = OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL /decl/hierarchy/outfit/job/emergency_responder/post_equip(var/mob/living/carbon/human/H) @@ -29,12 +29,12 @@ /decl/hierarchy/outfit/job/clown name = OUTFIT_JOB_NAME(JOB_CLOWN) uniform = /obj/item/clothing/under/rank/clown - back = /obj/item/weapon/storage/backpack/clown + back = /obj/item/storage/backpack/clown shoes = /obj/item/clothing/shoes/clown_shoes mask = /obj/item/clothing/mask/gas/clown_hat - backpack_contents = list(/obj/item/weapon/stamp/clown = 1, /obj/item/weapon/bikehorn = 1) - id_type = /obj/item/weapon/card/id/civilian/clown - pda_type = /obj/item/device/pda/clown + backpack_contents = list(/obj/item/stamp/clown = 1, /obj/item/bikehorn = 1) + id_type = /obj/item/card/id/civilian/clown + pda_type = /obj/item/pda/clown flags = 0 /decl/hierarchy/outfit/job/mime @@ -43,11 +43,11 @@ shoes = /obj/item/clothing/shoes/mime head = /obj/item/clothing/head/soft/mime mask = /obj/item/clothing/mask/gas/mime - backpack_contents = list(/obj/item/weapon/pen/crayon/mime = 1) - id_type = /obj/item/weapon/card/id/civilian/mime - pda_type = /obj/item/device/pda/mime + backpack_contents = list(/obj/item/pen/crayon/mime = 1) + id_type = /obj/item/card/id/civilian/mime + pda_type = /obj/item/pda/mime /decl/hierarchy/outfit/job/mime/post_equip(var/mob/living/carbon/human/H) ..() if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/pen/crayon/mime(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/pen/crayon/mime(H), slot_l_hand) diff --git a/code/datums/outfits/military/military.dm b/code/datums/outfits/military/military.dm index eb00eb6871d..d3f95557945 100644 --- a/code/datums/outfits/military/military.dm +++ b/code/datums/outfits/military/military.dm @@ -2,4 +2,4 @@ name = "Military Uniform" hierarchy_type = /decl/hierarchy/outfit/military - l_ear = /obj/item/device/radio/headset \ No newline at end of file + l_ear = /obj/item/radio/headset \ No newline at end of file diff --git a/code/datums/outfits/misc.dm b/code/datums/outfits/misc.dm index 7facd60d5e4..556bf1d0521 100644 --- a/code/datums/outfits/misc.dm +++ b/code/datums/outfits/misc.dm @@ -4,7 +4,7 @@ head = /obj/item/clothing/head/helmet/space suit = /obj/item/clothing/suit/space uniform = /obj/item/clothing/under/color/grey - back = /obj/item/weapon/tank/jetpack/oxygen + back = /obj/item/tank/jetpack/oxygen mask = /obj/item/clothing/mask/breath flags = OUTFIT_HAS_JETPACK @@ -14,7 +14,7 @@ head = /obj/item/clothing/head/helmet/space/emergency suit = /obj/item/clothing/suit/space/emergency uniform = /obj/item/clothing/under/color/grey - back = /obj/item/weapon/tank/oxygen + back = /obj/item/tank/oxygen mask = /obj/item/clothing/mask/breath /decl/hierarchy/outfit/soviet_soldier @@ -23,29 +23,29 @@ shoes = /obj/item/clothing/shoes/boots/combat head = /obj/item/clothing/head/ushanka/soviet gloves = /obj/item/clothing/gloves/combat - back = /obj/item/weapon/storage/backpack/satchel - belt = /obj/item/weapon/gun/projectile/revolver/mateba + back = /obj/item/storage/backpack/satchel + belt = /obj/item/gun/projectile/revolver/mateba /decl/hierarchy/outfit/soviet_soldier/admiral name = "Soviet admiral" head = /obj/item/clothing/head/hgpiratecap - l_ear = /obj/item/device/radio/headset/heads/captain + l_ear = /obj/item/radio/headset/heads/captain glasses = /obj/item/clothing/glasses/thermal/plain/eyepatch suit = /obj/item/clothing/suit/hgpirate id_slot = slot_wear_id - id_type = /obj/item/weapon/card/id/centcom //station + id_type = /obj/item/card/id/centcom //station id_pda_assignment = "Admiral" /decl/hierarchy/outfit/merchant name = "Merchant" shoes = /obj/item/clothing/shoes/black - l_ear = /obj/item/device/radio/headset + l_ear = /obj/item/radio/headset uniform = /obj/item/clothing/under/color/grey id_slot = slot_wear_id - id_type = /obj/item/weapon/card/id/civilian //merchant + id_type = /obj/item/card/id/civilian //merchant pda_slot = slot_r_store - pda_type = /obj/item/device/pda/chef //cause I like the look + pda_type = /obj/item/pda/chef //cause I like the look id_pda_assignment = "Merchant" /decl/hierarchy/outfit/merchant/vox diff --git a/code/datums/outfits/nanotrasen.dm b/code/datums/outfits/nanotrasen.dm index 4fd219685ba..4bf6c4f8615 100644 --- a/code/datums/outfits/nanotrasen.dm +++ b/code/datums/outfits/nanotrasen.dm @@ -3,30 +3,30 @@ uniform = /obj/item/clothing/under/rank/centcom shoes = /obj/item/clothing/shoes/laceup gloves = /obj/item/clothing/gloves/white - l_ear = /obj/item/device/radio/headset/heads/hop + l_ear = /obj/item/radio/headset/heads/hop glasses = /obj/item/clothing/glasses/sunglasses id_slot = slot_wear_id - id_type = /obj/item/weapon/card/id/centcom //station + id_type = /obj/item/card/id/centcom //station pda_slot = slot_r_store - pda_type = /obj/item/device/pda/heads + pda_type = /obj/item/pda/heads /decl/hierarchy/outfit/nanotrasen/representative name = "Nanotrasen representative" - belt = /obj/item/weapon/clipboard + belt = /obj/item/clipboard id_pda_assignment = "NanoTrasen Navy Representative" /decl/hierarchy/outfit/nanotrasen/officer name = "Nanotrasen officer" head = /obj/item/clothing/head/beret/centcom/officer - l_ear = /obj/item/device/radio/headset/heads/captain - belt = /obj/item/weapon/gun/energy + l_ear = /obj/item/radio/headset/heads/captain + belt = /obj/item/gun/energy id_pda_assignment = "NanoTrasen Navy Officer" /decl/hierarchy/outfit/nanotrasen/captain name = "Nanotrasen captain" uniform = /obj/item/clothing/under/rank/centcom_captain - l_ear = /obj/item/device/radio/headset/heads/captain + l_ear = /obj/item/radio/headset/heads/captain head = /obj/item/clothing/head/beret/centcom/captain - belt = /obj/item/weapon/gun/energy + belt = /obj/item/gun/energy id_pda_assignment = "NanoTrasen Navy Captain" diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index b27093934e0..7130c724b4d 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -52,12 +52,12 @@ var/list/outfits_decls_by_type_ var/id_pda_assignment - var/backpack = /obj/item/weapon/storage/backpack - var/satchel_one = /obj/item/weapon/storage/backpack/satchel/norm - var/satchel_two = /obj/item/weapon/storage/backpack/satchel - var/messenger_bag = /obj/item/weapon/storage/backpack/messenger - var/sports_bag = /obj/item/weapon/storage/backpack/sport - var/satchel_three = /obj/item/weapon/storage/backpack/satchel/strapless + var/backpack = /obj/item/storage/backpack + var/satchel_one = /obj/item/storage/backpack/satchel/norm + var/satchel_two = /obj/item/storage/backpack/satchel + var/messenger_bag = /obj/item/storage/backpack/messenger + var/sports_bag = /obj/item/storage/backpack/sport + var/satchel_three = /obj/item/storage/backpack/satchel/strapless var/flags // Specific flags @@ -84,7 +84,7 @@ var/list/outfits_decls_by_type_ /decl/hierarchy/outfit/proc/post_equip(mob/living/carbon/human/H) if(flags & OUTFIT_HAS_JETPACK) - var/obj/item/weapon/tank/jetpack/J = locate(/obj/item/weapon/tank/jetpack) in H + var/obj/item/tank/jetpack/J = locate(/obj/item/tank/jetpack) in H if(!J) return J.toggle() @@ -95,7 +95,7 @@ var/list/outfits_decls_by_type_ rank = rank || id_pda_assignment assignment = id_pda_assignment || assignment || rank - var/obj/item/weapon/card/id/W = equip_id(H, rank, assignment) + var/obj/item/card/id/W = equip_id(H, rank, assignment) if(W) rank = W.rank assignment = W.assignment @@ -164,7 +164,7 @@ var/list/outfits_decls_by_type_ /decl/hierarchy/outfit/proc/equip_id(mob/living/carbon/human/H, rank, assignment) if(!id_slot || !id_type) return - var/obj/item/weapon/card/id/W = new id_type(H) + var/obj/item/card/id/W = new id_type(H) if(id_desc) W.desc = id_desc if(rank) @@ -177,7 +177,7 @@ var/list/outfits_decls_by_type_ /decl/hierarchy/outfit/proc/equip_pda(mob/living/carbon/human/H, rank, assignment) if(!pda_slot || !pda_type) return - var/obj/item/device/pda/pda = new pda_type(H) + var/obj/item/pda/pda = new pda_type(H) if(H.equip_to_slot_or_del(pda, pda_slot)) pda.owner = H.real_name pda.ownjob = assignment diff --git a/code/datums/outfits/outfit_vr.dm b/code/datums/outfits/outfit_vr.dm index bd5c232282f..97281f1a560 100644 --- a/code/datums/outfits/outfit_vr.dm +++ b/code/datums/outfits/outfit_vr.dm @@ -3,20 +3,20 @@ uniform = /obj/item/clothing/under/solgov/utility/army/urban shoes = /obj/item/clothing/shoes/boots/jackboots gloves = /obj/item/clothing/gloves/combat - l_ear = /obj/item/device/radio/headset/centcom + l_ear = /obj/item/radio/headset/centcom r_pocket = /obj/item/ammo_magazine/m95 l_pocket = /obj/item/ammo_magazine/m95 l_hand = /obj/item/ammo_magazine/m95 r_hand = /obj/item/ammo_magazine/m95 - back = /obj/item/weapon/gun/projectile/automatic/battlerifle - backpack_contents = list(/obj/item/weapon/storage/box = 1) + back = /obj/item/gun/projectile/automatic/battlerifle + backpack_contents = list(/obj/item/storage/box = 1) hierarchy_type = /decl/hierarchy/outfit/wizard head = /obj/item/clothing/head/helmet/combat/USDF suit = /obj/item/clothing/suit/armor/combat/USDF - belt = /obj/item/weapon/storage/belt/security/tactical + belt = /obj/item/storage/belt/security/tactical /decl/hierarchy/outfit/USDF/Marine/equip_id(mob/living/carbon/human/H) - var/obj/item/weapon/card/id/C = ..() + var/obj/item/card/id/C = ..() C.name = "[H.real_name]'s military ID Card" C.icon_state = "lifetime" C.access = get_all_station_access() @@ -29,17 +29,17 @@ name = "USDF officer" head = /obj/item/clothing/head/dress/army/command shoes = /obj/item/clothing/shoes/boots/jackboots - l_ear = /obj/item/device/radio/headset/centcom + l_ear = /obj/item/radio/headset/centcom uniform = /obj/item/clothing/under/solgov/mildress/army/command - back = /obj/item/weapon/storage/backpack/satchel - belt = /obj/item/weapon/gun/projectile/revolver/consul + back = /obj/item/storage/backpack/satchel + belt = /obj/item/gun/projectile/revolver/consul l_pocket = /obj/item/ammo_magazine/s44 r_pocket = /obj/item/ammo_magazine/s44 r_hand = /obj/item/clothing/accessory/holster/hip l_hand = /obj/item/clothing/accessory/tie/black /decl/hierarchy/outfit/USDF/Officer/equip_id(mob/living/carbon/human/H) - var/obj/item/weapon/card/id/C = ..() + var/obj/item/card/id/C = ..() C.name = "[H.real_name]'s military ID Card" C.icon_state = "lifetime" C.access = get_all_station_access() @@ -51,16 +51,16 @@ /decl/hierarchy/outfit/solcom/representative name = "SolCom Representative" shoes = /obj/item/clothing/shoes/laceup - l_ear = /obj/item/device/radio/headset/centcom + l_ear = /obj/item/radio/headset/centcom uniform = /obj/item/clothing/under/suit_jacket/navy - back = /obj/item/weapon/storage/backpack/satchel - l_pocket = /obj/item/weapon/pen/blue - r_pocket = /obj/item/weapon/pen/red - r_hand = /obj/item/device/pda/centcom - l_hand = /obj/item/weapon/clipboard + back = /obj/item/storage/backpack/satchel + l_pocket = /obj/item/pen/blue + r_pocket = /obj/item/pen/red + r_hand = /obj/item/pda/centcom + l_hand = /obj/item/clipboard /decl/hierarchy/outfit/solcom/representative/equip_id(mob/living/carbon/human/H) - var/obj/item/weapon/card/id/C = ..() + var/obj/item/card/id/C = ..() C.name = "[H.real_name]'s SolCom ID Card" C.icon_state = "lifetime" C.access = get_all_station_access() @@ -74,33 +74,33 @@ head = /obj/item/clothing/head/helmet/combat/imperial shoes =/obj/item/clothing/shoes/leg_guard/combat/imperial gloves = /obj/item/clothing/gloves/arm_guard/combat/imperial - l_ear = /obj/item/device/radio/headset/syndicate + l_ear = /obj/item/radio/headset/syndicate uniform = /obj/item/clothing/under/imperial mask = /obj/item/clothing/mask/gas/imperial suit = /obj/item/clothing/suit/armor/combat/imperial - back = /obj/item/weapon/storage/backpack/satchel - belt = /obj/item/weapon/storage/belt/security/tactical/bandolier - l_pocket = /obj/item/weapon/cell/device/weapon - r_pocket = /obj/item/weapon/cell/device/weapon - r_hand = /obj/item/weapon/melee/energy/sword/imperial - l_hand = /obj/item/weapon/shield/energy/imperial - suit_store = /obj/item/weapon/gun/energy/imperial + back = /obj/item/storage/backpack/satchel + belt = /obj/item/storage/belt/security/tactical/bandolier + l_pocket = /obj/item/cell/device/weapon + r_pocket = /obj/item/cell/device/weapon + r_hand = /obj/item/melee/energy/sword/imperial + l_hand = /obj/item/shield/energy/imperial + suit_store = /obj/item/gun/energy/imperial /decl/hierarchy/outfit/imperial/officer name = "Imperial officer" head = /obj/item/clothing/head/helmet/combat/imperial/centurion shoes = /obj/item/clothing/shoes/leg_guard/combat/imperial gloves = /obj/item/clothing/gloves/arm_guard/combat/imperial - l_ear = /obj/item/device/radio/headset/syndicate + l_ear = /obj/item/radio/headset/syndicate uniform = /obj/item/clothing/under/imperial mask = /obj/item/clothing/mask/gas/imperial suit = /obj/item/clothing/suit/armor/combat/imperial/centurion - belt = /obj/item/weapon/storage/belt/security/tactical/bandolier - l_pocket = /obj/item/weapon/cell/device/weapon - r_pocket = /obj/item/weapon/cell/device/weapon - r_hand = /obj/item/weapon/melee/energy/sword/imperial - l_hand = /obj/item/weapon/shield/energy/imperial - suit_store = /obj/item/weapon/gun/energy/imperial + belt = /obj/item/storage/belt/security/tactical/bandolier + l_pocket = /obj/item/cell/device/weapon + r_pocket = /obj/item/cell/device/weapon + r_hand = /obj/item/melee/energy/sword/imperial + l_hand = /obj/item/shield/energy/imperial + suit_store = /obj/item/gun/energy/imperial /* SOUTHERN CROSS OUTFITS @@ -112,15 +112,15 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go name = OUTFIT_JOB_NAME(JOB_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 - id_type = /obj/item/weapon/card/id/exploration + pda_type = /obj/item/pda/explorer + id_type = /obj/item/card/id/exploration id_pda_assignment = JOB_EXPLORER - backpack = /obj/item/weapon/storage/backpack/explorer - satchel_one = /obj/item/weapon/storage/backpack/satchel/explorer - messenger_bag = /obj/item/weapon/storage/backpack/messenger/explorer + backpack = /obj/item/storage/backpack/explorer + satchel_one = /obj/item/storage/backpack/satchel/explorer + messenger_bag = /obj/item/storage/backpack/messenger/explorer flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL /decl/hierarchy/outfit/job/pilot @@ -130,12 +130,12 @@ 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 uniform_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1 = 1) id_slot = slot_wear_id pda_slot = slot_belt - pda_type = /obj/item/device/pda/pilot - id_type = /obj/item/weapon/card/id/civilian/pilot + pda_type = /obj/item/pda/pilot + id_type = /obj/item/card/id/civilian/pilot id_pda_assignment = JOB_PILOT flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL @@ -144,30 +144,30 @@ 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 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 - id_type = /obj/item/weapon/card/id/exploration/fm + pda_type = /obj/item/pda/sar + id_type = /obj/item/card/id/exploration/fm id_pda_assignment = JOB_FIELD_MEDIC - backpack = /obj/item/weapon/storage/backpack/explorer - satchel_one = /obj/item/weapon/storage/backpack/satchel/explorer - messenger_bag = /obj/item/weapon/storage/backpack/messenger/explorer + backpack = /obj/item/storage/backpack/explorer + satchel_one = /obj/item/storage/backpack/satchel/explorer + messenger_bag = /obj/item/storage/backpack/messenger/explorer flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL /decl/hierarchy/outfit/job/pathfinder name = OUTFIT_JOB_NAME(JOB_PATHFINDER) shoes = /obj/item/clothing/shoes/boots/winter/explorer uniform = /obj/item/clothing/under/explorer //TODO: Uniforms. - l_ear = /obj/item/device/radio/headset/pathfinder + l_ear = /obj/item/radio/headset/pathfinder id_slot = slot_wear_id pda_slot = slot_l_store - pda_type = /obj/item/device/pda/pathfinder - id_type = /obj/item/weapon/card/id/exploration/head + pda_type = /obj/item/pda/pathfinder + id_type = /obj/item/card/id/exploration/head id_pda_assignment = JOB_PATHFINDER flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL /decl/hierarchy/outfit/job/assistant/explorer - id_type = /obj/item/weapon/card/id/exploration + id_type = /obj/item/card/id/exploration flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL diff --git a/code/datums/outfits/pirates.dm b/code/datums/outfits/pirates.dm index 0d15c3067db..5595ee357d7 100644 --- a/code/datums/outfits/pirates.dm +++ b/code/datums/outfits/pirates.dm @@ -5,7 +5,7 @@ shoes = /obj/item/clothing/shoes/brown head = /obj/item/clothing/head/bandana glasses = /obj/item/clothing/glasses/eyepatch - l_hand = /obj/item/weapon/melee/energy/sword/pirate + l_hand = /obj/item/melee/energy/sword/pirate /decl/hierarchy/outfit/pirate/norm @@ -13,5 +13,5 @@ name = "Pirate - Space" head = /obj/item/clothing/head/helmet/space suit = /obj/item/clothing/suit/pirate - back = /obj/item/weapon/tank/jetpack/oxygen + back = /obj/item/tank/jetpack/oxygen flags = OUTFIT_HAS_JETPACK diff --git a/code/datums/outfits/spec_op.dm b/code/datums/outfits/spec_op.dm index bb43b4cb9bd..8fd2cb6ae4c 100644 --- a/code/datums/outfits/spec_op.dm +++ b/code/datums/outfits/spec_op.dm @@ -2,24 +2,24 @@ name = "Special ops - Officer" uniform = /obj/item/clothing/under/syndicate/combat suit = /obj/item/clothing/suit/armor/swat/officer - l_ear = /obj/item/device/radio/headset/ert + l_ear = /obj/item/radio/headset/ert glasses = /obj/item/clothing/glasses/thermal/plain/eyepatch mask = /obj/item/clothing/mask/smokable/cigarette/cigar/havana head = /obj/item/clothing/head/beret //deathsquad - belt = /obj/item/weapon/gun/energy/pulse_rifle/compact/admin - back = /obj/item/weapon/storage/backpack/satchel + belt = /obj/item/gun/energy/pulse_rifle/compact/admin + back = /obj/item/storage/backpack/satchel shoes = /obj/item/clothing/shoes/boots/combat gloves = /obj/item/clothing/gloves/combat id_slot = slot_wear_id - id_type = /obj/item/weapon/card/id/centcom/ERT + id_type = /obj/item/card/id/centcom/ERT id_desc = "Special operations ID." id_pda_assignment = "Special Operations Officer" /decl/hierarchy/outfit/spec_op_officer/space name = "Special ops - Officer in space" suit = /obj/item/clothing/suit/armor/swat //obj/item/clothing/suit/space/void/swat - back = /obj/item/weapon/tank/jetpack/oxygen + back = /obj/item/tank/jetpack/oxygen mask = /obj/item/clothing/mask/gas/swat flags = OUTFIT_HAS_JETPACK @@ -29,13 +29,13 @@ uniform = /obj/item/clothing/under/ert shoes = /obj/item/clothing/shoes/boots/swat gloves = /obj/item/clothing/gloves/swat - l_ear = /obj/item/device/radio/headset/ert - belt = /obj/item/weapon/gun/energy/gun + l_ear = /obj/item/radio/headset/ert + belt = /obj/item/gun/energy/gun glasses = /obj/item/clothing/glasses/sunglasses - back = /obj/item/weapon/storage/backpack/satchel + back = /obj/item/storage/backpack/satchel id_slot = slot_wear_id - id_type = /obj/item/weapon/card/id/centcom/ERT + id_type = /obj/item/card/id/centcom/ERT /decl/hierarchy/outfit/death_command name = "Spec ops - Death commando" @@ -55,15 +55,15 @@ name = "Spec ops - Mercenary" uniform = /obj/item/clothing/under/syndicate shoes = /obj/item/clothing/shoes/boots/combat - l_ear = /obj/item/device/radio/headset/syndicate - belt = /obj/item/weapon/storage/belt/security + l_ear = /obj/item/radio/headset/syndicate + belt = /obj/item/storage/belt/security glasses = /obj/item/clothing/glasses/sunglasses gloves = /obj/item/clothing/gloves/swat - l_pocket = /obj/item/weapon/reagent_containers/pill/cyanide + l_pocket = /obj/item/reagent_containers/pill/cyanide id_slot = slot_wear_id - id_type = /obj/item/weapon/card/id/syndicate + id_type = /obj/item/card/id/syndicate id_pda_assignment = "Mercenary" flags = OUTFIT_HAS_BACKPACK diff --git a/code/datums/outfits/tournament.dm b/code/datums/outfits/tournament.dm index a0c31f406bf..af524a1665f 100644 --- a/code/datums/outfits/tournament.dm +++ b/code/datums/outfits/tournament.dm @@ -2,9 +2,9 @@ hierarchy_type = /decl/hierarchy/outfit/tournament_gear head = /obj/item/clothing/head/helmet/thunderdome suit = /obj/item/clothing/suit/armor/vest - l_hand = /obj/item/weapon/material/knife - r_hand = /obj/item/weapon/gun/energy/pulse_rifle/destroyer - r_pocket = /obj/item/weapon/grenade/smokebomb + l_hand = /obj/item/material/knife + r_hand = /obj/item/gun/energy/pulse_rifle/destroyer + r_pocket = /obj/item/grenade/smokebomb shoes = /obj/item/clothing/shoes/black /decl/hierarchy/outfit/tournament_gear/red @@ -21,7 +21,7 @@ uniform = /obj/item/clothing/under/det suit_store = /obj/item/clothing/suit/storage/det_trench glasses = /obj/item/clothing/glasses/thermal/plain/monocle - r_hand = /obj/item/weapon/gun/projectile/revolver + r_hand = /obj/item/gun/projectile/revolver l_pocket = /obj/item/ammo_magazine/s357 /decl/hierarchy/outfit/tournament_gear/chef @@ -29,21 +29,21 @@ head = /obj/item/clothing/head/chefhat uniform = /obj/item/clothing/under/rank/chef suit = /obj/item/clothing/suit/chef - r_hand = /obj/item/weapon/material/kitchen/rollingpin - l_pocket = /obj/item/weapon/material/knife/tacknife - r_pocket = /obj/item/weapon/material/knife/tacknife + r_hand = /obj/item/material/kitchen/rollingpin + l_pocket = /obj/item/material/knife/tacknife + r_pocket = /obj/item/material/knife/tacknife /decl/hierarchy/outfit/tournament_gear/janitor name = "Tournament gear - Janitor" uniform = /obj/item/clothing/under/rank/janitor - back = /obj/item/weapon/storage/backpack - r_hand = /obj/item/weapon/mop - l_hand = /obj/item/weapon/reagent_containers/glass/bucket - l_pocket = /obj/item/weapon/grenade/chem_grenade/cleaner - r_pocket = /obj/item/weapon/grenade/chem_grenade/cleaner + back = /obj/item/storage/backpack + r_hand = /obj/item/mop + l_hand = /obj/item/reagent_containers/glass/bucket + l_pocket = /obj/item/grenade/chem_grenade/cleaner + r_pocket = /obj/item/grenade/chem_grenade/cleaner backpack_contents = list(/obj/item/stack/tile/floor = 6) /decl/hierarchy/outfit/tournament_gear/janitor/post_equip(var/mob/living/carbon/human/H) - var/obj/item/weapon/reagent_containers/glass/bucket/bucket = locate(/obj/item/weapon/reagent_containers/glass/bucket) in H + var/obj/item/reagent_containers/glass/bucket/bucket = locate(/obj/item/reagent_containers/glass/bucket) in H if(bucket) bucket.reagents.add_reagent(/datum/reagent/water, 70) diff --git a/code/datums/outfits/wizardry.dm b/code/datums/outfits/wizardry.dm index 4d25979f18e..96836b3edc2 100644 --- a/code/datums/outfits/wizardry.dm +++ b/code/datums/outfits/wizardry.dm @@ -1,12 +1,12 @@ /decl/hierarchy/outfit/wizard uniform = /obj/item/clothing/under/color/lightpurple shoes = /obj/item/clothing/shoes/sandal - l_ear = /obj/item/device/radio/headset - r_pocket = /obj/item/weapon/teleportation_scroll - l_hand = /obj/item/weapon/staff - r_hand = /obj/item/weapon/spellbook - back = /obj/item/weapon/storage/backpack - backpack_contents = list(/obj/item/weapon/storage/box = 1) + l_ear = /obj/item/radio/headset + r_pocket = /obj/item/teleportation_scroll + l_hand = /obj/item/staff + r_hand = /obj/item/spellbook + back = /obj/item/storage/backpack + backpack_contents = list(/obj/item/storage/box = 1) hierarchy_type = /decl/hierarchy/outfit/wizard /decl/hierarchy/outfit/wizard/blue diff --git a/code/datums/riding.dm b/code/datums/riding.dm index ebe600c718f..5507b27e714 100644 --- a/code/datums/riding.dm +++ b/code/datums/riding.dm @@ -133,7 +133,7 @@ // I'm on a /datum/riding/boat - keytype = /obj/item/weapon/oar + keytype = /obj/item/oar key_name = "an oar" nonhuman_key_exemption = TRUE // Borgs can't hold oars. only_one_driver = TRUE // Would be pretty crazy if five people try to move at the same time. diff --git a/code/datums/supplypacks/atmospherics.dm b/code/datums/supplypacks/atmospherics.dm index 13ca4cf1a95..883fec6fe47 100644 --- a/code/datums/supplypacks/atmospherics.dm +++ b/code/datums/supplypacks/atmospherics.dm @@ -9,7 +9,7 @@ /datum/supply_pack/atmos/inflatable name = "Inflatable barriers" - contains = list(/obj/item/weapon/storage/briefcase/inflatable = 3) + contains = list(/obj/item/storage/briefcase/inflatable = 3) cost = 20 containertype = /obj/structure/closet/crate/aether containername = "Inflatable Barrier Crate" @@ -66,7 +66,7 @@ access = access_atmospherics /datum/supply_pack/atmos/rapid_pipe_dispenser - contains = list(/obj/item/weapon/pipe_dispenser) + contains = list(/obj/item/pipe_dispenser) name = "Rapid Pipe Dispenser" cost = 100 containertype = /obj/structure/closet/crate/secure/aether @@ -77,7 +77,7 @@ name = "Internals crate" contains = list( /obj/item/clothing/mask/gas = 3, - /obj/item/weapon/tank/air = 3 + /obj/item/tank/air = 3 ) cost = 10 containertype = /obj/structure/closet/crate/aether @@ -86,10 +86,10 @@ /datum/supply_pack/atmos/evacuation name = "Emergency equipment" contains = list( - /obj/item/weapon/storage/toolbox/emergency = 2, + /obj/item/storage/toolbox/emergency = 2, /obj/item/clothing/suit/storage/hazardvest = 2, /obj/item/clothing/suit/storage/vest = 2, - /obj/item/weapon/tank/emergency/oxygen/engi = 4, + /obj/item/tank/emergency/oxygen/engi = 4, /obj/item/clothing/suit/space/emergency = 4, /obj/item/clothing/head/helmet/space/emergency = 4, /obj/item/clothing/mask/gas = 4 @@ -102,9 +102,9 @@ name = "Firefighting equipment" contains = list( /obj/item/clothing/suit/fire/heavy = 2, - /obj/item/weapon/tank/oxygen/red = 2, - /obj/item/weapon/watertank/atmos = 2, - /obj/item/device/flashlight = 2, + /obj/item/tank/oxygen/red = 2, + /obj/item/watertank/atmos = 2, + /obj/item/flashlight = 2, /obj/item/clothing/head/hardhat/firefighter/atmos = 2 ) cost = 35 diff --git a/code/datums/supplypacks/contraband.dm b/code/datums/supplypacks/contraband.dm index d6f56b349b8..bf763f33ec5 100644 --- a/code/datums/supplypacks/contraband.dm +++ b/code/datums/supplypacks/contraband.dm @@ -8,9 +8,9 @@ num_contained = 5 contains = list( /obj/item/seeds/bloodtomatoseed, - /obj/item/weapon/storage/pill_bottle/zoom, - /obj/item/weapon/storage/pill_bottle/happy, - /obj/item/weapon/reagent_containers/food/drinks/bottle/pwine + /obj/item/storage/pill_bottle/zoom, + /obj/item/storage/pill_bottle/happy, + /obj/item/reagent_containers/food/drinks/bottle/pwine ) name = "Contraband crate" @@ -23,9 +23,9 @@ /datum/supply_pack/security/specialops name = "Special Ops supplies" contains = list( - /obj/item/weapon/storage/box/emps, - /obj/item/weapon/grenade/smokebomb = 4, - /obj/item/weapon/grenade/chem_grenade/incendiary + /obj/item/storage/box/emps, + /obj/item/grenade/smokebomb = 4, + /obj/item/grenade/chem_grenade/incendiary ) cost = 25 containertype = /obj/structure/closet/crate/weapon @@ -35,8 +35,8 @@ /datum/supply_pack/supply/moghes name = "Moghes imports" contains = list( - /obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew = 2, - /obj/item/weapon/reagent_containers/food/snacks/unajerky = 4 + /obj/item/reagent_containers/food/drinks/bottle/redeemersbrew = 2, + /obj/item/reagent_containers/food/snacks/unajerky = 4 ) cost = 25 containertype = /obj/structure/closet/crate/unathi @@ -46,7 +46,7 @@ /datum/supply_pack/munitions/bolt_rifles_militia name = "Weapon - Surplus militia rifles" contains = list( - /obj/item/weapon/gun/projectile/shotgun/pump/rifle = 3, + /obj/item/gun/projectile/shotgun/pump/rifle = 3, /obj/item/ammo_magazine/clip/c762 = 6 ) cost = 50 @@ -59,53 +59,53 @@ num_contained = 1 contains = list( list( //the operator, - /obj/item/weapon/gun/projectile/shotgun/pump/combat, + /obj/item/gun/projectile/shotgun/pump/combat, /obj/item/clothing/suit/storage/vest/heavy/merc, /obj/item/clothing/glasses/night, - /obj/item/weapon/storage/box/anti_photons, + /obj/item/storage/box/anti_photons, /obj/item/ammo_magazine/clip/c12g/pellet, /obj/item/ammo_magazine/clip/c12g ), list( //the doc, - /obj/item/weapon/storage/firstaid/combat, - /obj/item/weapon/gun/projectile/dartgun, - /obj/item/weapon/reagent_containers/hypospray, - /obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate, - /obj/item/weapon/reagent_containers/glass/bottle/cyanide, + /obj/item/storage/firstaid/combat, + /obj/item/gun/projectile/dartgun, + /obj/item/reagent_containers/hypospray, + /obj/item/reagent_containers/glass/bottle/chloralhydrate, + /obj/item/reagent_containers/glass/bottle/cyanide, /obj/item/ammo_magazine/chemdart ), list( //the sapper, - /obj/item/weapon/melee/energy/sword/ionic_rapier, - /obj/item/weapon/storage/box/syndie_kit/space, //doesn't matter what species you are, - /obj/item/weapon/storage/box/syndie_kit/demolitions, - /obj/item/device/multitool/ai_detector, - /obj/item/weapon/plastique, - /obj/item/weapon/storage/toolbox/syndicate/powertools + /obj/item/melee/energy/sword/ionic_rapier, + /obj/item/storage/box/syndie_kit/space, //doesn't matter what species you are, + /obj/item/storage/box/syndie_kit/demolitions, + /obj/item/multitool/ai_detector, + /obj/item/plastique, + /obj/item/storage/toolbox/syndicate/powertools ), list( //the infiltrator, - /obj/item/weapon/gun/projectile/silenced, - /obj/item/device/chameleon, - /obj/item/weapon/storage/box/syndie_kit/chameleon, - /obj/item/device/encryptionkey/syndicate, - /obj/item/weapon/card/id/syndicate, + /obj/item/gun/projectile/silenced, + /obj/item/chameleon, + /obj/item/storage/box/syndie_kit/chameleon, + /obj/item/encryptionkey/syndicate, + /obj/item/card/id/syndicate, /obj/item/clothing/mask/gas/voice, - /obj/item/weapon/makeover + /obj/item/makeover ), list( //the hacker, - /obj/item/weapon/gun/projectile/silenced, - /obj/item/weapon/gun/energy/ionrifle/pistol, + /obj/item/gun/projectile/silenced, + /obj/item/gun/energy/ionrifle/pistol, /obj/item/clothing/glasses/thermal/syndi, /obj/item/ammo_magazine/m45/ap, - /obj/item/weapon/material/knife/tacknife/combatknife, - /obj/item/device/multitool/hacktool + /obj/item/material/knife/tacknife/combatknife, + /obj/item/multitool/hacktool ), list( //the professional, - /obj/item/weapon/gun/projectile/silenced, - /obj/item/weapon/gun/energy/ionrifle/pistol, + /obj/item/gun/projectile/silenced, + /obj/item/gun/energy/ionrifle/pistol, /obj/item/clothing/glasses/thermal/syndi, - /obj/item/weapon/card/emag, + /obj/item/card/emag, /obj/item/ammo_magazine/m45/ap, - /obj/item/weapon/material/knife/tacknife/combatknife, + /obj/item/material/knife/tacknife/combatknife, /obj/item/clothing/mask/balaclava ) ) diff --git a/code/datums/supplypacks/costumes.dm b/code/datums/supplypacks/costumes.dm index 6bdb9adce8e..7e6ae4a9edd 100644 --- a/code/datums/supplypacks/costumes.dm +++ b/code/datums/supplypacks/costumes.dm @@ -13,7 +13,7 @@ /datum/supply_pack/costumes/wizard name = "Wizard costume" contains = list( - /obj/item/weapon/staff, + /obj/item/staff, /obj/item/clothing/suit/wizrobe/fake, /obj/item/clothing/shoes/sandal, /obj/item/clothing/head/wizard/fake @@ -118,7 +118,7 @@ /obj/item/clothing/suit/wizrobe/marisa/fake, /obj/item/clothing/shoes/sandal, /obj/item/clothing/head/wizard/marisa/fake, - /obj/item/weapon/staff/broom + /obj/item/staff/broom ) /datum/supply_pack/randomised/costumes/costume_hats @@ -536,9 +536,9 @@ /datum/supply_pack/costumes/taurbags name = "Saddlebags crate" contains = list( - /obj/item/weapon/storage/backpack/saddlebag_common, - /obj/item/weapon/storage/backpack/saddlebag_common/robust, - /obj/item/weapon/storage/backpack/saddlebag_common/vest + /obj/item/storage/backpack/saddlebag_common, + /obj/item/storage/backpack/saddlebag_common/robust, + /obj/item/storage/backpack/saddlebag_common/vest ) cost = 60 containertype = /obj/structure/closet/crate diff --git a/code/datums/supplypacks/engineering.dm b/code/datums/supplypacks/engineering.dm index 846bba482fa..f0a8e4d4b70 100644 --- a/code/datums/supplypacks/engineering.dm +++ b/code/datums/supplypacks/engineering.dm @@ -9,28 +9,28 @@ /datum/supply_pack/eng/lightbulbs name = "Replacement lights" - contains = list(/obj/item/weapon/storage/box/lights/mixed = 3) + contains = list(/obj/item/storage/box/lights/mixed = 3) cost = 10 containertype = /obj/structure/closet/crate/galaksi containername = "Replacement lights" /datum/supply_pack/eng/smescoil name = "Superconducting Magnetic Coil" - contains = list(/obj/item/weapon/smes_coil) + contains = list(/obj/item/smes_coil) cost = 75 containertype = /obj/structure/closet/crate/focalpoint containername = "Superconducting Magnetic Coil crate" /datum/supply_pack/eng/smescoil/super_capacity name = "Superconducting Capacitance Coil" - contains = list(/obj/item/weapon/smes_coil/super_capacity) + contains = list(/obj/item/smes_coil/super_capacity) cost = 90 containertype = /obj/structure/closet/crate/focalpoint containername = "Superconducting Capacitance Coil crate" /datum/supply_pack/eng/smescoil/super_io name = "Superconducting Transmission Coil" - contains = list(/obj/item/weapon/smes_coil/super_io) + contains = list(/obj/item/smes_coil/super_io) cost = 90 containertype = /obj/structure/closet/crate/focalpoint containername = "Superconducting Transmission Coil crate" @@ -79,14 +79,14 @@ /datum/supply_pack/eng/point_defense_cannon_circuit name = "Point Defense Turret Circuit" - contains = list(/obj/item/weapon/circuitboard/pointdefense = 2) + contains = list(/obj/item/circuitboard/pointdefense = 2) cost = 20 containertype = /obj/structure/closet/crate/heph containername = "point defense turret circuit crate" /datum/supply_pack/eng/point_defense_control_circuit name = "Point Defense Controller Circuit" - contains = list(/obj/item/weapon/circuitboard/pointdefense_control = 1) + contains = list(/obj/item/circuitboard/pointdefense_control = 1) cost = 30 containertype = /obj/structure/closet/crate/heph containername = "point defense mainframe circuit crate" @@ -94,10 +94,10 @@ /datum/supply_pack/eng/electrical name = "Electrical maintenance crate" contains = list( - /obj/item/weapon/storage/toolbox/electrical = 2, + /obj/item/storage/toolbox/electrical = 2, /obj/item/clothing/gloves/yellow = 2, - /obj/item/weapon/cell = 2, - /obj/item/weapon/cell/high = 2 + /obj/item/cell = 2, + /obj/item/cell/high = 2 ) cost = 10 containertype = /obj/structure/closet/crate/ward @@ -106,7 +106,7 @@ /datum/supply_pack/eng/e_welders name = "Electric welder crate" contains = list( - /obj/item/weapon/weldingtool/electric = 3 + /obj/item/weldingtool/electric = 3 ) cost = 15 containertype = /obj/structure/closet/crate/ward @@ -115,7 +115,7 @@ /datum/supply_pack/eng/mechanical name = "Mechanical maintenance crate" contains = list( - /obj/item/weapon/storage/belt/utility/full = 3, + /obj/item/storage/belt/utility/full = 3, /obj/item/clothing/suit/storage/hazardvest = 3, /obj/item/clothing/head/welding = 2, /obj/item/clothing/head/hardhat @@ -135,9 +135,9 @@ name = "Solar Pack crate" contains = list( /obj/item/solar_assembly = 21, - /obj/item/weapon/circuitboard/solar_control, - /obj/item/weapon/tracker_electronics, - /obj/item/weapon/paper/solar + /obj/item/circuitboard/solar_control, + /obj/item/tracker_electronics, + /obj/item/paper/solar ) cost = 20 containertype = /obj/structure/closet/crate/einstein @@ -195,7 +195,7 @@ access = access_ce /datum/supply_pack/eng/shield_gen - contains = list(/obj/item/weapon/circuitboard/shield_gen) + contains = list(/obj/item/circuitboard/shield_gen) name = "Bubble shield generator circuitry" cost = 30 containertype = /obj/structure/closet/crate/secure/focalpoint @@ -203,7 +203,7 @@ access = access_ce /datum/supply_pack/eng/shield_gen_ex - contains = list(/obj/item/weapon/circuitboard/shield_gen_ex) + contains = list(/obj/item/circuitboard/shield_gen_ex) name = "Hull shield generator circuitry" cost = 30 containertype = /obj/structure/closet/crate/secure/focalpoint @@ -211,7 +211,7 @@ access = access_ce /datum/supply_pack/eng/shield_cap - contains = list(/obj/item/weapon/circuitboard/shield_cap) + contains = list(/obj/item/circuitboard/shield_cap) name = "Bubble shield capacitor circuitry" cost = 30 containertype = /obj/structure/closet/crate/secure/focalpoint @@ -269,10 +269,10 @@ containertype = /obj/structure/closet/crate/secure/focalpoint access = access_tech_storage contains = list( - /obj/item/weapon/stock_parts/micro_laser, - /obj/item/weapon/stock_parts/capacitor, - /obj/item/weapon/stock_parts/matter_bin, - /obj/item/weapon/circuitboard/pacman + /obj/item/stock_parts/micro_laser, + /obj/item/stock_parts/capacitor, + /obj/item/stock_parts/matter_bin, + /obj/item/circuitboard/pacman ) /datum/supply_pack/eng/super_pacman_parts @@ -282,10 +282,10 @@ containertype = /obj/structure/closet/crate/secure/focalpoint access = access_tech_storage contains = list( - /obj/item/weapon/stock_parts/micro_laser, - /obj/item/weapon/stock_parts/capacitor, - /obj/item/weapon/stock_parts/matter_bin, - /obj/item/weapon/circuitboard/pacman/super + /obj/item/stock_parts/micro_laser, + /obj/item/stock_parts/capacitor, + /obj/item/stock_parts/matter_bin, + /obj/item/circuitboard/pacman/super ) /datum/supply_pack/eng/fusion_core @@ -295,9 +295,9 @@ containertype = /obj/structure/closet/crate/secure/einstein access = access_engine contains = list( - /obj/item/weapon/book/manual/rust_engine, + /obj/item/book/manual/rust_engine, /obj/machinery/power/fusion_core, - /obj/item/weapon/circuitboard/fusion_core + /obj/item/circuitboard/fusion_core ) /datum/supply_pack/eng/fusion_fuel_injector @@ -309,7 +309,7 @@ contains = list( /obj/machinery/fusion_fuel_injector, /obj/machinery/fusion_fuel_injector, - /obj/item/weapon/circuitboard/fusion_injector + /obj/item/circuitboard/fusion_injector ) /datum/supply_pack/eng/gyrotron @@ -320,7 +320,7 @@ access = access_engine contains = list( /obj/machinery/power/emitter/gyrotron, - /obj/item/weapon/circuitboard/gyrotron + /obj/item/circuitboard/gyrotron ) /datum/supply_pack/eng/fusion_fuel_compressor @@ -328,7 +328,7 @@ cost = 10 containername = "Fusion Fuel Compressor circuitry crate" containertype = /obj/structure/closet/crate/einstein - contains = list(/obj/item/weapon/circuitboard/fusion_fuel_compressor) + contains = list(/obj/item/circuitboard/fusion_fuel_compressor) /datum/supply_pack/eng/deuterium name = "Deuterium crate" @@ -347,12 +347,12 @@ /datum/supply_pack/eng/modern_shield name = "Modern Shield Construction Kit" contains = list( - /obj/item/weapon/circuitboard/shield_generator, - /obj/item/weapon/stock_parts/capacitor, - /obj/item/weapon/stock_parts/micro_laser, - /obj/item/weapon/smes_coil, - /obj/item/weapon/stock_parts/console_screen, - /obj/item/weapon/stock_parts/subspace/amplifier + /obj/item/circuitboard/shield_generator, + /obj/item/stock_parts/capacitor, + /obj/item/stock_parts/micro_laser, + /obj/item/smes_coil, + /obj/item/stock_parts/console_screen, + /obj/item/stock_parts/subspace/amplifier ) cost = 80 containertype = /obj/structure/closet/crate/focalpoint @@ -373,7 +373,7 @@ ) /datum/supply_pack/eng/dosimeter - contains = list(/obj/item/weapon/storage/box/dosimeter = 6) + contains = list(/obj/item/storage/box/dosimeter = 6) name = "Dosimeters" cost = 10 containertype = /obj/structure/closet/crate @@ -394,7 +394,7 @@ access = access_ce /datum/supply_pack/eng/inducer - contains = list(/obj/item/weapon/inducer = 3) + contains = list(/obj/item/inducer = 3) name = "inducer" cost = 90 //Relatively expensive containertype = /obj/structure/closet/crate/xion diff --git a/code/datums/supplypacks/hardsuits.dm b/code/datums/supplypacks/hardsuits.dm index fe815c7ce40..ae483129311 100644 --- a/code/datums/supplypacks/hardsuits.dm +++ b/code/datums/supplypacks/hardsuits.dm @@ -10,7 +10,7 @@ /datum/supply_pack/hardsuits/eva_rig name = "eva hardsuit (empty)" contains = list( - /obj/item/weapon/rig/eva = 1 + /obj/item/rig/eva = 1 ) cost = 150 containertype = /obj/structure/closet/crate/secure/gear @@ -23,7 +23,7 @@ /datum/supply_pack/hardsuits/mining_rig name = "industrial hardsuit (empty)" contains = list( - /obj/item/weapon/rig/industrial = 1 + /obj/item/rig/industrial = 1 ) cost = 150 containertype = /obj/structure/closet/crate/secure/gear @@ -35,7 +35,7 @@ /datum/supply_pack/hardsuits/medical_rig name = "medical hardsuit (empty)" contains = list( - /obj/item/weapon/rig/medical = 1 + /obj/item/rig/medical = 1 ) cost = 150 containertype = /obj/structure/closet/crate/secure/gear @@ -45,7 +45,7 @@ /datum/supply_pack/hardsuits/security_rig name = "hazard hardsuit (empty)" contains = list( - /obj/item/weapon/rig/hazard = 1 + /obj/item/rig/hazard = 1 ) cost = 150 containertype = /obj/structure/closet/crate/secure/gear @@ -55,7 +55,7 @@ /datum/supply_pack/hardsuits/science_rig name = "ami hardsuit (empty)" contains = list( - /obj/item/weapon/rig/hazmat = 1 + /obj/item/rig/hazmat = 1 ) cost = 150 containertype = /obj/structure/closet/crate/secure/gear @@ -65,7 +65,7 @@ /datum/supply_pack/hardsuits/ce_rig name = "advanced hardsuit (empty)" contains = list( - /obj/item/weapon/rig/ce = 1 + /obj/item/rig/ce = 1 ) cost = 150 containertype = /obj/structure/closet/crate/secure/gear @@ -75,7 +75,7 @@ /datum/supply_pack/hardsuits/com_medical_rig name = "commonwealth medical hardsuit (loaded)" contains = list( - /obj/item/weapon/rig/baymed/equipped = 1 + /obj/item/rig/baymed/equipped = 1 ) cost = 250 containertype = /obj/structure/closet/crate/secure/gear @@ -85,7 +85,7 @@ /datum/supply_pack/hardsuits/com_engineering_rig name = "commonwealth engineering hardsuit (loaded)" contains = list( - /obj/item/weapon/rig/bayeng/equipped = 1 + /obj/item/rig/bayeng/equipped = 1 ) cost = 250 containertype = /obj/structure/closet/crate/secure/gear @@ -95,7 +95,7 @@ /datum/supply_pack/hardsuits/breacher_rig name = "unathi breacher hardsuit (empty)" contains = list( - /obj/item/weapon/rig/breacher = 1 + /obj/item/rig/breacher = 1 ) cost = 250 containertype = /obj/structure/closet/crate/secure/gear @@ -105,7 +105,7 @@ /datum/supply_pack/hardsuits/zero_rig name = "null hardsuit (jets)" contains = list( - /obj/item/weapon/rig/zero = 1 + /obj/item/rig/zero = 1 ) cost = 75 containertype = /obj/structure/closet/crate/secure/gear diff --git a/code/datums/supplypacks/hospitality.dm b/code/datums/supplypacks/hospitality.dm index baef23eb1a8..8ee18ac817b 100644 --- a/code/datums/supplypacks/hospitality.dm +++ b/code/datums/supplypacks/hospitality.dm @@ -10,18 +10,18 @@ /datum/supply_pack/hospitality/party name = "Party equipment" contains = list( - /obj/item/weapon/storage/box/mixedglasses = 2, - /obj/item/weapon/storage/box/glasses/square, - /obj/item/weapon/reagent_containers/food/drinks/shaker, - /obj/item/weapon/reagent_containers/food/drinks/flask/barflask, - /obj/item/weapon/reagent_containers/food/drinks/bottle/patron, - /obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager, - /obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey, - /obj/item/weapon/reagent_containers/food/drinks/bottle/jager, - /obj/item/weapon/storage/fancy/cigarettes/dromedaryco, - /obj/item/weapon/lipstick/random, - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 2, - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 4, + /obj/item/storage/box/mixedglasses = 2, + /obj/item/storage/box/glasses/square, + /obj/item/reagent_containers/food/drinks/shaker, + /obj/item/reagent_containers/food/drinks/flask/barflask, + /obj/item/reagent_containers/food/drinks/bottle/patron, + /obj/item/reagent_containers/food/drinks/bottle/goldschlager, + /obj/item/reagent_containers/food/drinks/bottle/specialwhiskey, + /obj/item/reagent_containers/food/drinks/bottle/jager, + /obj/item/storage/fancy/cigarettes/dromedaryco, + /obj/item/lipstick/random, + /obj/item/reagent_containers/food/drinks/bottle/small/ale = 2, + /obj/item/reagent_containers/food/drinks/bottle/small/beer = 4, ) cost = 10 containertype = /obj/structure/closet/crate/gilthari @@ -30,19 +30,19 @@ /datum/supply_pack/hospitality/barsupplies name = "Bar supplies" contains = list( - /obj/item/weapon/storage/box/glasses/cocktail, - /obj/item/weapon/storage/box/glasses/rocks, - /obj/item/weapon/storage/box/glasses/square, - /obj/item/weapon/storage/box/glasses/pint, - /obj/item/weapon/storage/box/glasses/wine, - /obj/item/weapon/storage/box/glasses/shake, - /obj/item/weapon/storage/box/glasses/shot, - /obj/item/weapon/storage/box/glasses/mug, - /obj/item/weapon/storage/box/glasses/meta, - /obj/item/weapon/storage/box/glasses/meta/metapint, - /obj/item/weapon/reagent_containers/food/drinks/shaker, - /obj/item/weapon/storage/box/glass_extras/straws, - /obj/item/weapon/storage/box/glass_extras/sticks + /obj/item/storage/box/glasses/cocktail, + /obj/item/storage/box/glasses/rocks, + /obj/item/storage/box/glasses/square, + /obj/item/storage/box/glasses/pint, + /obj/item/storage/box/glasses/wine, + /obj/item/storage/box/glasses/shake, + /obj/item/storage/box/glasses/shot, + /obj/item/storage/box/glasses/mug, + /obj/item/storage/box/glasses/meta, + /obj/item/storage/box/glasses/meta/metapint, + /obj/item/reagent_containers/food/drinks/shaker, + /obj/item/storage/box/glass_extras/straws, + /obj/item/storage/box/glass_extras/sticks ) cost = 10 containertype = /obj/structure/closet/crate/gilthari @@ -59,7 +59,7 @@ name = "Surprise pack of five pizzas" contains = list( /obj/random/pizzabox/supplypack = 5, - /obj/item/weapon/material/knife/plastic, + /obj/item/material/knife/plastic, /obj/item/clothing/under/pizzaguy, /obj/item/clothing/head/pizzaguy ) @@ -71,11 +71,11 @@ name = "Gift crate" contains = list( /obj/item/toy/bouquet = 3, - /obj/item/weapon/storage/fancy/heartbox = 2, - /obj/item/weapon/paper/card/smile, - /obj/item/weapon/paper/card/heart, - /obj/item/weapon/paper/card/cat, - /obj/item/weapon/paper/card/flower + /obj/item/storage/fancy/heartbox = 2, + /obj/item/paper/card/smile, + /obj/item/paper/card/heart, + /obj/item/paper/card/cat, + /obj/item/paper/card/flower ) cost = 10 containertype = /obj/structure/closet/crate/allico @@ -86,7 +86,7 @@ contains = list( /obj/item/paint_brush = 2, /obj/item/paint_palette = 2, - /obj/item/weapon/reagent_containers/glass/rag = 2, + /obj/item/reagent_containers/glass/rag = 2, /obj/structure/easel = 1, // How does that even fit /obj/item/canvas = 1, /obj/item/canvas/nineteen_nineteen = 1, @@ -101,7 +101,7 @@ /datum/supply_pack/hospitality/holywater name = "Holy water crate" contains = list( - /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater = 3 + /obj/item/reagent_containers/food/drinks/bottle/holywater = 3 ) cost = 15 containertype = /obj/structure/closet/crate/gilthari @@ -113,11 +113,11 @@ /datum/supply_pack/randomised/hospitality/burgers_vr num_contained = 5 contains = list( - /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, - /obj/item/weapon/reagent_containers/food/snacks/cheeseburger, - /obj/item/weapon/reagent_containers/food/snacks/jellyburger, - /obj/item/weapon/reagent_containers/food/snacks/tofuburger, - /obj/item/weapon/reagent_containers/food/snacks/fries + /obj/item/reagent_containers/food/snacks/bigbiteburger, + /obj/item/reagent_containers/food/snacks/cheeseburger, + /obj/item/reagent_containers/food/snacks/jellyburger, + /obj/item/reagent_containers/food/snacks/tofuburger, + /obj/item/reagent_containers/food/snacks/fries ) name = "Burger crate" cost = 25 @@ -127,23 +127,23 @@ /datum/supply_pack/randomised/hospitality/bakery_vr num_contained = 5 contains = list( - /obj/item/weapon/reagent_containers/food/snacks/baguette, - /obj/item/weapon/reagent_containers/food/snacks/appletart, - /obj/item/weapon/reagent_containers/food/snacks/berrymuffin, - /obj/item/weapon/reagent_containers/food/snacks/bunbun, - /obj/item/weapon/reagent_containers/food/snacks/cherrypie, - /obj/item/weapon/reagent_containers/food/snacks/cookie, - /obj/item/weapon/reagent_containers/food/snacks/croissant, - /obj/item/weapon/reagent_containers/food/snacks/donut/normal, - /obj/item/weapon/reagent_containers/food/snacks/donut/jelly, - /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly, - /obj/item/weapon/reagent_containers/food/snacks/muffin, - /obj/item/weapon/reagent_containers/food/snacks/pie, - /obj/item/weapon/reagent_containers/food/snacks/plump_pie, - /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit, - /obj/item/weapon/reagent_containers/food/snacks/poppypretzel, - /obj/item/weapon/reagent_containers/food/snacks/sugarcookie, - /obj/item/weapon/reagent_containers/food/snacks/waffles + /obj/item/reagent_containers/food/snacks/baguette, + /obj/item/reagent_containers/food/snacks/appletart, + /obj/item/reagent_containers/food/snacks/berrymuffin, + /obj/item/reagent_containers/food/snacks/bunbun, + /obj/item/reagent_containers/food/snacks/cherrypie, + /obj/item/reagent_containers/food/snacks/cookie, + /obj/item/reagent_containers/food/snacks/croissant, + /obj/item/reagent_containers/food/snacks/donut/normal, + /obj/item/reagent_containers/food/snacks/donut/jelly, + /obj/item/reagent_containers/food/snacks/donut/cherryjelly, + /obj/item/reagent_containers/food/snacks/muffin, + /obj/item/reagent_containers/food/snacks/pie, + /obj/item/reagent_containers/food/snacks/plump_pie, + /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit, + /obj/item/reagent_containers/food/snacks/poppypretzel, + /obj/item/reagent_containers/food/snacks/sugarcookie, + /obj/item/reagent_containers/food/snacks/waffles ) name = "Bakery products crate" cost = 25 @@ -153,15 +153,15 @@ /datum/supply_pack/randomised/hospitality/cakes_vr num_contained = 2 contains = list( - /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake + /obj/item/reagent_containers/food/snacks/sliceable/applecake, + /obj/item/reagent_containers/food/snacks/sliceable/birthdaycake, + /obj/item/reagent_containers/food/snacks/sliceable/carrotcake, + /obj/item/reagent_containers/food/snacks/sliceable/cheesecake, + /obj/item/reagent_containers/food/snacks/sliceable/chocolatecake, + /obj/item/reagent_containers/food/snacks/sliceable/lemoncake, + /obj/item/reagent_containers/food/snacks/sliceable/limecake, + /obj/item/reagent_containers/food/snacks/sliceable/orangecake, + /obj/item/reagent_containers/food/snacks/sliceable/plaincake ) name = "Cake crate" cost = 100 @@ -171,10 +171,10 @@ /datum/supply_pack/randomised/hospitality/mexican_vr num_contained = 5 contains = list( - /obj/item/weapon/reagent_containers/food/snacks/cheeseburrito, - /obj/item/weapon/reagent_containers/food/snacks/enchiladas, - /obj/item/weapon/reagent_containers/food/snacks/meatburrito, - /obj/item/weapon/reagent_containers/food/snacks/taco + /obj/item/reagent_containers/food/snacks/cheeseburrito, + /obj/item/reagent_containers/food/snacks/enchiladas, + /obj/item/reagent_containers/food/snacks/meatburrito, + /obj/item/reagent_containers/food/snacks/taco ) name = "Mexican takeout crate" cost = 50 @@ -184,8 +184,8 @@ /datum/supply_pack/randomised/hospitality/asian_vr num_contained = 5 contains = list( - /obj/item/weapon/reagent_containers/food/snacks/generalschicken, - /obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup + /obj/item/reagent_containers/food/snacks/generalschicken, + /obj/item/reagent_containers/food/snacks/hotandsoursoup ) name = "Chinese takeout crate" cost = 50 @@ -194,16 +194,16 @@ /datum/supply_pack/randomised/hospitality/jaffacake contains = list( - /obj/item/weapon/storage/box/jaffacake, - /obj/item/weapon/storage/box/jaffacake, - /obj/item/weapon/storage/box/jaffacake, - /obj/item/weapon/storage/box/jaffacake, - /obj/item/weapon/storage/box/jaffacake, - /obj/item/weapon/storage/box/jaffacake, - /obj/item/weapon/storage/box/jaffacake, - /obj/item/weapon/storage/box/jaffacake, - /obj/item/weapon/storage/box/jaffacake, - /obj/item/weapon/storage/box/jaffacake + /obj/item/storage/box/jaffacake, + /obj/item/storage/box/jaffacake, + /obj/item/storage/box/jaffacake, + /obj/item/storage/box/jaffacake, + /obj/item/storage/box/jaffacake, + /obj/item/storage/box/jaffacake, + /obj/item/storage/box/jaffacake, + /obj/item/storage/box/jaffacake, + /obj/item/storage/box/jaffacake, + /obj/item/storage/box/jaffacake ) name = "Desatti jaffa cake crate" cost = 25 @@ -213,11 +213,11 @@ /datum/supply_pack/randomised/hospitality/sweets num_contained = 5 contains = list( - /obj/item/weapon/storage/box/jaffacake, - /obj/item/weapon/storage/box/winegum, - /obj/item/weapon/storage/box/saucer, - /obj/item/weapon/storage/box/shrimpsandbananas, - /obj/item/weapon/storage/box/rhubarbcustard + /obj/item/storage/box/jaffacake, + /obj/item/storage/box/winegum, + /obj/item/storage/box/saucer, + /obj/item/storage/box/shrimpsandbananas, + /obj/item/storage/box/rhubarbcustard ) name = "Sweets crate" cost = 25 diff --git a/code/datums/supplypacks/hydroponics.dm b/code/datums/supplypacks/hydroponics.dm index d2e55469af1..84712a9f74b 100644 --- a/code/datums/supplypacks/hydroponics.dm +++ b/code/datums/supplypacks/hydroponics.dm @@ -9,28 +9,28 @@ /datum/supply_pack/hydro/monkey name = "Monkey crate" - contains = list (/obj/item/weapon/storage/box/monkeycubes) + contains = list (/obj/item/storage/box/monkeycubes) cost = 20 containertype = /obj/structure/closet/crate/freezer/nanotrasen containername = "Monkey crate" /datum/supply_pack/hydro/farwa name = "Farwa crate" - contains = list (/obj/item/weapon/storage/box/monkeycubes/farwacubes) + contains = list (/obj/item/storage/box/monkeycubes/farwacubes) cost = 20 containertype = /obj/structure/closet/crate/freezer containername = "Farwa crate" /datum/supply_pack/hydro/neara name = "Neaera crate" - contains = list (/obj/item/weapon/storage/box/monkeycubes/neaeracubes) + contains = list (/obj/item/storage/box/monkeycubes/neaeracubes) cost = 20 containertype = /obj/structure/closet/crate/freezer containername = "Neaera crate" /datum/supply_pack/hydro/stok name = "Stok crate" - contains = list (/obj/item/weapon/storage/box/monkeycubes/stokcubes) + contains = list (/obj/item/storage/box/monkeycubes/stokcubes) cost = 20 containertype = /obj/structure/closet/crate/freezer containername = "Stok crate" @@ -59,15 +59,15 @@ /datum/supply_pack/hydro/hydroponics name = "Hydroponics Supply Crate" contains = list( - /obj/item/weapon/reagent_containers/spray/plantbgone = 4, - /obj/item/weapon/reagent_containers/glass/bottle/ammonia = 2, - /obj/item/weapon/material/knife/machete/hatchet, - /obj/item/weapon/material/minihoe, - /obj/item/device/analyzer/plant_analyzer, + /obj/item/reagent_containers/spray/plantbgone = 4, + /obj/item/reagent_containers/glass/bottle/ammonia = 2, + /obj/item/material/knife/machete/hatchet, + /obj/item/material/minihoe, + /obj/item/analyzer/plant_analyzer, /obj/item/clothing/gloves/botanic_leather, /obj/item/clothing/suit/storage/apron, - /obj/item/weapon/material/minihoe, - /obj/item/weapon/storage/box/botanydisk + /obj/item/material/minihoe, + /obj/item/storage/box/botanydisk ) cost = 20 containertype = /obj/structure/closet/crate/hydroponics @@ -124,11 +124,11 @@ /datum/supply_pack/hydro/weedcontrol name = "Weed control crate" contains = list( - /obj/item/weapon/material/knife/machete/hatchet = 2, - /obj/item/weapon/reagent_containers/spray/plantbgone = 4, + /obj/item/material/knife/machete/hatchet = 2, + /obj/item/reagent_containers/spray/plantbgone = 4, /obj/item/clothing/mask/gas = 2, - /obj/item/weapon/grenade/chem_grenade/antiweed = 2, - /obj/item/weapon/material/twohanded/fireaxe/scythe + /obj/item/grenade/chem_grenade/antiweed = 2, + /obj/item/material/twohanded/fireaxe/scythe ) cost = 45 containertype = /obj/structure/closet/crate/grayson @@ -172,28 +172,28 @@ /datum/supply_pack/hydro/sobaka name = "Sobaka crate" - contains = list (/obj/item/weapon/storage/box/monkeycubes/sobakacubes) + contains = list (/obj/item/storage/box/monkeycubes/sobakacubes) cost = 20 containertype = /obj/structure/closet/crate/freezer containername = "Sobaka crate" /datum/supply_pack/hydro/saru name = "Saru crate" - contains = list (/obj/item/weapon/storage/box/monkeycubes/sarucubes) + contains = list (/obj/item/storage/box/monkeycubes/sarucubes) cost = 20 containertype = /obj/structure/closet/crate/freezer containername = "Saru crate" /datum/supply_pack/hydro/sparra name = "Sparra crate" - contains = list (/obj/item/weapon/storage/box/monkeycubes/sparracubes) + contains = list (/obj/item/storage/box/monkeycubes/sparracubes) cost = 20 containertype = /obj/structure/closet/crate/freezer containername = "Sparra crate" /datum/supply_pack/hydro/wolpin name = "Wolpin crate" - contains = list (/obj/item/weapon/storage/box/monkeycubes/wolpincubes) + contains = list (/obj/item/storage/box/monkeycubes/wolpincubes) cost = 20 containertype = /obj/structure/closet/crate/freezer containername = "Wolpin crate" @@ -207,9 +207,9 @@ /datum/supply_pack/hydro/fish name = "Fish supply crate" contains = list( - /obj/item/weapon/reagent_containers/food/snacks/lobster = 6, - /obj/item/weapon/reagent_containers/food/snacks/cuttlefish = 8, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfish = 1 + /obj/item/reagent_containers/food/snacks/lobster = 6, + /obj/item/reagent_containers/food/snacks/cuttlefish = 8, + /obj/item/reagent_containers/food/snacks/sliceable/monkfish = 1 ) cost = 20 containertype = /obj/structure/closet/crate/freezer @@ -218,14 +218,14 @@ /datum/supply_pack/hydro/fennec_food name = "Fennec treats crate" contains = list( - /obj/item/weapon/reagent_containers/food/snacks/locust = 6, - /obj/item/weapon/storage/box/wings/bucket = 2, - /obj/item/weapon/reagent_containers/food/snacks/grub_pink = 2, - /obj/item/weapon/reagent_containers/food/snacks/grub_blue = 2, - /obj/item/weapon/reagent_containers/food/snacks/grub_purple = 2, - /obj/item/weapon/reagent_containers/food/snacks/honey_candy = 4, - /obj/item/weapon/reagent_containers/food/snacks/scorpion = 4, - /obj/item/weapon/reagent_containers/food/snacks/ant = 4 + /obj/item/reagent_containers/food/snacks/locust = 6, + /obj/item/storage/box/wings/bucket = 2, + /obj/item/reagent_containers/food/snacks/grub_pink = 2, + /obj/item/reagent_containers/food/snacks/grub_blue = 2, + /obj/item/reagent_containers/food/snacks/grub_purple = 2, + /obj/item/reagent_containers/food/snacks/honey_candy = 4, + /obj/item/reagent_containers/food/snacks/scorpion = 4, + /obj/item/reagent_containers/food/snacks/ant = 4 ) cost = 20 containertype = /obj/structure/closet/crate/fennec diff --git a/code/datums/supplypacks/medical.dm b/code/datums/supplypacks/medical.dm index 8c14f0b8887..5621c37d02b 100644 --- a/code/datums/supplypacks/medical.dm +++ b/code/datums/supplypacks/medical.dm @@ -10,16 +10,16 @@ /datum/supply_pack/med/medical name = "Medical crate" contains = list( - /obj/item/weapon/storage/firstaid/regular, - /obj/item/weapon/storage/firstaid/fire, - /obj/item/weapon/storage/firstaid/toxin, - /obj/item/weapon/storage/firstaid/o2, - /obj/item/weapon/storage/firstaid/adv, - /obj/item/weapon/reagent_containers/glass/bottle/antitoxin, - /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline, - /obj/item/weapon/reagent_containers/glass/bottle/stoxin, - /obj/item/weapon/storage/box/syringes, - /obj/item/weapon/storage/box/autoinjectors + /obj/item/storage/firstaid/regular, + /obj/item/storage/firstaid/fire, + /obj/item/storage/firstaid/toxin, + /obj/item/storage/firstaid/o2, + /obj/item/storage/firstaid/adv, + /obj/item/reagent_containers/glass/bottle/antitoxin, + /obj/item/reagent_containers/glass/bottle/inaprovaline, + /obj/item/reagent_containers/glass/bottle/stoxin, + /obj/item/storage/box/syringes, + /obj/item/storage/box/autoinjectors ) cost = 15 containertype = /obj/structure/closet/crate/zenghu @@ -27,21 +27,21 @@ /datum/supply_pack/med/bloodpack name = "BloodPack crate" - contains = list(/obj/item/weapon/storage/box/bloodpacks = 3) + contains = list(/obj/item/storage/box/bloodpacks = 3) cost = 10 containertype = /obj/structure/closet/crate/nanomed containername = "BloodPack crate" /datum/supply_pack/med/synthplas name = "BloodPack (Synthplas) crate" - contains = list(/obj/item/weapon/reagent_containers/blood/synthplas = 6) + contains = list(/obj/item/reagent_containers/blood/synthplas = 6) cost = 80 containertype = /obj/structure/closet/crate/nanomed containername = "SynthPlas crate" /datum/supply_pack/med/bodybag name = "Body bag crate" - contains = list(/obj/item/weapon/storage/box/bodybags = 3) + contains = list(/obj/item/storage/box/bodybags = 3) cost = 10 containertype = /obj/structure/closet/crate/nanomed containername = "Body bag crate" @@ -56,17 +56,17 @@ /datum/supply_pack/med/surgery name = "Surgery crate" contains = list( - /obj/item/weapon/surgical/cautery, - /obj/item/weapon/surgical/surgicaldrill, + /obj/item/surgical/cautery, + /obj/item/surgical/surgicaldrill, /obj/item/clothing/mask/breath/medical, - /obj/item/weapon/tank/anesthetic, - /obj/item/weapon/surgical/FixOVein, - /obj/item/weapon/surgical/hemostat, - /obj/item/weapon/surgical/scalpel, - /obj/item/weapon/surgical/bonegel, - /obj/item/weapon/surgical/retractor, - /obj/item/weapon/surgical/bonesetter, - /obj/item/weapon/surgical/circular_saw + /obj/item/tank/anesthetic, + /obj/item/surgical/FixOVein, + /obj/item/surgical/hemostat, + /obj/item/surgical/scalpel, + /obj/item/surgical/bonegel, + /obj/item/surgical/retractor, + /obj/item/surgical/bonesetter, + /obj/item/surgical/circular_saw ) cost = 25 containertype = /obj/structure/closet/crate/secure/veymed @@ -76,8 +76,8 @@ /datum/supply_pack/med/deathalarm name = "Death Alarm crate" contains = list( - /obj/item/weapon/storage/box/cdeathalarm_kit, - /obj/item/weapon/storage/box/cdeathalarm_kit + /obj/item/storage/box/cdeathalarm_kit, + /obj/item/storage/box/cdeathalarm_kit ) cost = 40 containertype = /obj/structure/closet/crate/secure/ward @@ -87,7 +87,7 @@ /datum/supply_pack/med/clotting name = "Clotting Medicine crate" contains = list( - /obj/item/weapon/storage/firstaid/clotting + /obj/item/storage/firstaid/clotting ) cost = 100 containertype = /obj/structure/closet/crate/secure/zenghu @@ -99,9 +99,9 @@ contains = list( /obj/item/clothing/under/rank/medical/scrubs/green = 2, /obj/item/clothing/head/surgery/green = 2, - /obj/item/weapon/storage/box/masks, - /obj/item/weapon/storage/box/gloves, - /obj/item/weapon/storage/belt/medical = 3 + /obj/item/storage/box/masks, + /obj/item/storage/box/gloves, + /obj/item/storage/belt/medical = 3 ) cost = 10 containertype = /obj/structure/closet/crate/veymed @@ -110,9 +110,9 @@ /datum/supply_pack/med/extragear name = "Medical surplus equipment" contains = list( - /obj/item/weapon/storage/belt/medical = 3, + /obj/item/storage/belt/medical = 3, /obj/item/clothing/glasses/hud/health = 3, - /obj/item/device/radio/headset/headset_med/alt = 3, + /obj/item/radio/headset/headset_med/alt = 3, /obj/item/clothing/suit/storage/hooded/wintercoat/medical = 3 ) cost = 10 @@ -123,21 +123,21 @@ /datum/supply_pack/med/cmogear name = "Chief medical officer equipment" contains = list( - /obj/item/weapon/storage/belt/medical, - /obj/item/device/radio/headset/heads/cmo, + /obj/item/storage/belt/medical, + /obj/item/radio/headset/heads/cmo, /obj/item/clothing/under/rank/chief_medical_officer, - /obj/item/weapon/reagent_containers/hypospray/vial, + /obj/item/reagent_containers/hypospray/vial, /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/suit/storage/toggle/labcoat/cmo, /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt, /obj/item/clothing/mask/surgical, /obj/item/clothing/shoes/white, - /obj/item/weapon/cartridge/cmo, + /obj/item/cartridge/cmo, /obj/item/clothing/gloves/sterile/latex, - /obj/item/device/healthanalyzer, - /obj/item/device/flashlight/pen, - /obj/item/weapon/reagent_containers/syringe + /obj/item/healthanalyzer, + /obj/item/flashlight/pen, + /obj/item/reagent_containers/syringe ) cost = 50 containertype = /obj/structure/closet/crate/secure/nanomed @@ -147,20 +147,20 @@ /datum/supply_pack/med/doctorgear name = JOB_MEDICAL_DOCTOR + " equipment" contains = list( - /obj/item/weapon/storage/belt/medical, - /obj/item/device/radio/headset/headset_med, + /obj/item/storage/belt/medical, + /obj/item/radio/headset/headset_med, /obj/item/clothing/under/rank/medical, /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/suit/storage/toggle/labcoat, /obj/item/clothing/mask/surgical, - /obj/item/weapon/storage/firstaid/adv, + /obj/item/storage/firstaid/adv, /obj/item/clothing/shoes/white, - /obj/item/weapon/cartridge/medical, + /obj/item/cartridge/medical, /obj/item/clothing/gloves/sterile/latex, - /obj/item/device/healthanalyzer, - /obj/item/device/flashlight/pen, - /obj/item/weapon/reagent_containers/syringe + /obj/item/healthanalyzer, + /obj/item/flashlight/pen, + /obj/item/reagent_containers/syringe ) cost = 20 containertype = /obj/structure/closet/crate/secure/nanomed @@ -170,20 +170,20 @@ /datum/supply_pack/med/chemistgear name = JOB_CHEMIST + " equipment" contains = list( - /obj/item/weapon/storage/box/beakers, - /obj/item/device/radio/headset/headset_med, - /obj/item/weapon/storage/box/autoinjectors, + /obj/item/storage/box/beakers, + /obj/item/radio/headset/headset_med, + /obj/item/storage/box/autoinjectors, /obj/item/clothing/under/rank/chemist, /obj/item/clothing/glasses/science, /obj/item/clothing/suit/storage/toggle/labcoat/chemist, /obj/item/clothing/mask/surgical, /obj/item/clothing/shoes/white, - /obj/item/weapon/cartridge/chemistry, + /obj/item/cartridge/chemistry, /obj/item/clothing/gloves/sterile/latex, - /obj/item/weapon/reagent_containers/dropper, - /obj/item/device/healthanalyzer, - /obj/item/weapon/storage/box/pillbottles, - /obj/item/weapon/reagent_containers/syringe + /obj/item/reagent_containers/dropper, + /obj/item/healthanalyzer, + /obj/item/storage/box/pillbottles, + /obj/item/reagent_containers/syringe ) cost = 20 containertype = /obj/structure/closet/crate/secure/nanomed @@ -193,8 +193,8 @@ /datum/supply_pack/med/paramedicgear name = JOB_PARAMEDIC + " equipment" contains = list( - /obj/item/weapon/storage/belt/medical/emt, - /obj/item/device/radio/headset/headset_med, + /obj/item/storage/belt/medical/emt, + /obj/item/radio/headset/headset_med, /obj/item/clothing/under/rank/medical/scrubs/black, /obj/item/clothing/accessory/armband/medblue, /obj/item/clothing/glasses/hud/health, @@ -204,13 +204,13 @@ /obj/item/clothing/mask/gas, /obj/item/clothing/under/rank/medical/paramedic_alt, /obj/item/clothing/accessory/stethoscope, - /obj/item/weapon/storage/firstaid/adv, + /obj/item/storage/firstaid/adv, /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/gloves/sterile/latex, - /obj/item/device/healthanalyzer, - /obj/item/weapon/cartridge/medical, - /obj/item/device/flashlight/pen, - /obj/item/weapon/reagent_containers/syringe, + /obj/item/healthanalyzer, + /obj/item/cartridge/medical, + /obj/item/flashlight/pen, + /obj/item/reagent_containers/syringe, /obj/item/clothing/accessory/storage/white_vest ) cost = 20 @@ -222,15 +222,15 @@ name = JOB_PSYCHIATRIST + " equipment" contains = list( /obj/item/clothing/under/rank/psych, - /obj/item/device/radio/headset/headset_med, + /obj/item/radio/headset/headset_med, /obj/item/clothing/under/rank/psych/turtleneck, /obj/item/clothing/shoes/laceup, /obj/item/clothing/suit/storage/toggle/labcoat, /obj/item/clothing/shoes/white, - /obj/item/weapon/clipboard, - /obj/item/weapon/folder/white, - /obj/item/weapon/pen, - /obj/item/weapon/cartridge/medical + /obj/item/clipboard, + /obj/item/folder/white, + /obj/item/pen, + /obj/item/cartridge/medical ) cost = 20 containertype = /obj/structure/closet/crate/secure/nanomed @@ -250,8 +250,8 @@ /obj/item/clothing/head/surgery/blue = 3, /obj/item/clothing/head/surgery/green = 3, /obj/item/clothing/head/surgery/black = 3, - /obj/item/weapon/storage/box/masks, - /obj/item/weapon/storage/box/gloves + /obj/item/storage/box/masks, + /obj/item/storage/box/gloves ) cost = 10 containertype = /obj/structure/closet/crate/secure/nanomed @@ -261,14 +261,14 @@ /datum/supply_pack/med/autopsy name = "Autopsy equipment" contains = list( - /obj/item/weapon/folder/white, - /obj/item/device/camera, - /obj/item/device/camera_film = 2, - /obj/item/weapon/autopsy_scanner, - /obj/item/weapon/surgical/scalpel, - /obj/item/weapon/storage/box/masks, - /obj/item/weapon/storage/box/gloves, - /obj/item/weapon/pen + /obj/item/folder/white, + /obj/item/camera, + /obj/item/camera_film = 2, + /obj/item/autopsy_scanner, + /obj/item/surgical/scalpel, + /obj/item/storage/box/masks, + /obj/item/storage/box/gloves, + /obj/item/pen ) cost = 20 containertype = /obj/structure/closet/crate/secure/veymed @@ -294,8 +294,8 @@ /obj/item/clothing/suit/storage/toggle/labcoat/genetics, /obj/item/clothing/suit/storage/toggle/labcoat/virologist, /obj/item/clothing/suit/storage/toggle/labcoat/chemist, - /obj/item/weapon/storage/box/masks, - /obj/item/weapon/storage/box/gloves + /obj/item/storage/box/masks, + /obj/item/storage/box/gloves ) cost = 10 containertype = /obj/structure/closet/crate/secure/nanomed @@ -311,9 +311,9 @@ /obj/item/clothing/suit/bio_suit/cmo, /obj/item/clothing/head/bio_hood/cmo, /obj/item/clothing/mask/gas = 5, - /obj/item/weapon/tank/oxygen = 5, - /obj/item/weapon/storage/box/masks, - /obj/item/weapon/storage/box/gloves + /obj/item/tank/oxygen = 5, + /obj/item/storage/box/masks, + /obj/item/storage/box/gloves ) cost = 50 containertype = /obj/structure/closet/crate/secure/nanomed @@ -322,7 +322,7 @@ /datum/supply_pack/med/portablefreezers name = "Portable freezers crate" - contains = list(/obj/item/weapon/storage/box/freezer = 7) + contains = list(/obj/item/storage/box/freezer = 7) cost = 25 containertype = /obj/structure/closet/crate/secure/veymed containername = "Portable freezers" @@ -330,7 +330,7 @@ /datum/supply_pack/med/virus name = "Virus sample crate" - contains = list(/obj/item/weapon/virusdish/random = 4) + contains = list(/obj/item/virusdish/random = 4) cost = 25 containertype = /obj/structure/closet/crate/secure/zenghu containername = "Virus sample crate" @@ -338,7 +338,7 @@ /datum/supply_pack/med/defib name = "Defibrillator crate" - contains = list(/obj/item/device/defib_kit = 2) + contains = list(/obj/item/defib_kit = 2) cost = 30 containertype = /obj/structure/closet/crate/veymed containername = "Defibrillator crate" @@ -388,9 +388,9 @@ /obj/item/clothing/head/bio_hood/cmo, /obj/item/clothing/shoes/white = 7, /obj/item/clothing/mask/gas = 7, - /obj/item/weapon/tank/oxygen = 7, - /obj/item/weapon/storage/box/masks, - /obj/item/weapon/storage/box/gloves + /obj/item/tank/oxygen = 7, + /obj/item/storage/box/masks, + /obj/item/storage/box/gloves ) cost = 40 @@ -400,9 +400,9 @@ /obj/item/clothing/suit/bio_suit/virology = 3, /obj/item/clothing/head/bio_hood/virology = 3, /obj/item/clothing/mask/gas = 3, - /obj/item/weapon/tank/oxygen = 3, - /obj/item/weapon/storage/box/masks, - /obj/item/weapon/storage/box/gloves + /obj/item/tank/oxygen = 3, + /obj/item/storage/box/masks, + /obj/item/storage/box/gloves ) cost = 40 containertype = /obj/structure/closet/crate/secure @@ -411,7 +411,7 @@ /datum/supply_pack/med/virus name = "Virus sample crate" - contains = list(/obj/item/weapon/virusdish/random = 4) + contains = list(/obj/item/virusdish/random = 4) cost = 25 containertype = /obj/structure/closet/crate/secure containername = "Virus sample crate" @@ -423,7 +423,7 @@ /datum/supply_pack/med/compactdefib name = "Compact Defibrillator crate" - contains = list(/obj/item/device/defib_kit/compact = 1) + contains = list(/obj/item/defib_kit/compact = 1) cost = 90 containertype = /obj/structure/closet/crate/secure containername = "Compact Defibrillator crate" diff --git a/code/datums/supplypacks/misc.dm b/code/datums/supplypacks/misc.dm index 09c795e19d6..d03ab2b6207 100644 --- a/code/datums/supplypacks/misc.dm +++ b/code/datums/supplypacks/misc.dm @@ -14,9 +14,9 @@ /datum/supply_pack/randomised/misc/card_packs num_contained = 5 contains = list( - /obj/item/weapon/pack/cardemon, - /obj/item/weapon/pack/spaceball, - /obj/item/weapon/deck/holder + /obj/item/pack/cardemon, + /obj/item/pack/spaceball, + /obj/item/deck/holder ) name = "Trading Card Crate" cost = 10 @@ -94,7 +94,7 @@ containername = "Plushies Crate" /datum/supply_pack/misc/eftpos - contains = list(/obj/item/device/eftpos) + contains = list(/obj/item/eftpos) name = "EFTPOS scanner" cost = 10 containertype = /obj/structure/closet/crate/nanotrasen @@ -111,8 +111,8 @@ /obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout, /obj/item/clothing/suit/holidaypriest, /obj/item/clothing/under/wedding/bride_white, - /obj/item/weapon/storage/backpack/cultpack, - /obj/item/weapon/storage/fancy/candle_box = 3 + /obj/item/storage/backpack/cultpack, + /obj/item/storage/fancy/candle_box = 3 ) cost = 10 containertype = /obj/structure/closet/crate/gilthari @@ -151,7 +151,7 @@ /datum/supply_pack/misc/glucose_hypos name = "Glucose Hypoinjectors" contains = list( - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5 + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5 ) cost = 25 containertype = /obj/structure/closet/crate/zenghu @@ -160,16 +160,16 @@ /datum/supply_pack/misc/mre_rations num_contained = 6 name = "Emergency - MREs" - contains = list(/obj/item/weapon/storage/mre, - /obj/item/weapon/storage/mre/menu2, - /obj/item/weapon/storage/mre/menu3, - /obj/item/weapon/storage/mre/menu4, - /obj/item/weapon/storage/mre/menu5, - /obj/item/weapon/storage/mre/menu6, - /obj/item/weapon/storage/mre/menu7, - /obj/item/weapon/storage/mre/menu8, - /obj/item/weapon/storage/mre/menu9, - /obj/item/weapon/storage/mre/menu10) + contains = list(/obj/item/storage/mre, + /obj/item/storage/mre/menu2, + /obj/item/storage/mre/menu3, + /obj/item/storage/mre/menu4, + /obj/item/storage/mre/menu5, + /obj/item/storage/mre/menu6, + /obj/item/storage/mre/menu7, + /obj/item/storage/mre/menu8, + /obj/item/storage/mre/menu9, + /obj/item/storage/mre/menu10) cost = 50 containertype = /obj/structure/closet/crate/centauri containername = "ready to eat rations" @@ -177,7 +177,7 @@ /datum/supply_pack/misc/paste_rations name = "Emergency - Paste" contains = list( - /obj/item/weapon/storage/mre/menu11 = 2 + /obj/item/storage/mre/menu11 = 2 ) cost = 25 containertype = /obj/structure/closet/crate/freezer/centauri @@ -186,7 +186,7 @@ /datum/supply_pack/misc/medical_rations name = "Emergency - VitaPaste" contains = list( - /obj/item/weapon/storage/mre/menu13 = 2 + /obj/item/storage/mre/menu13 = 2 ) cost = 40 containertype = /obj/structure/closet/crate/zenghu @@ -204,12 +204,12 @@ /datum/supply_pack/misc/beltminer name = "Belt-miner gear crate" contains = list( - /obj/item/weapon/gun/energy/particle = 2, - /obj/item/weapon/cell/device/weapon = 2, - /obj/item/weapon/storage/firstaid/regular = 1, - /obj/item/device/gps = 2, - /obj/item/weapon/storage/box/traumainjectors = 1, - /obj/item/device/binoculars = 1 + /obj/item/gun/energy/particle = 2, + /obj/item/cell/device/weapon = 2, + /obj/item/storage/firstaid/regular = 1, + /obj/item/gps = 2, + /obj/item/storage/box/traumainjectors = 1, + /obj/item/binoculars = 1 ) cost = 60 containertype = /obj/structure/closet/crate/secure/gear @@ -221,7 +221,7 @@ /datum/supply_pack/misc/jetpack name = "jetpack (empty)" contains = list( - /obj/item/weapon/tank/jetpack = 1 + /obj/item/tank/jetpack = 1 ) cost = 75 containertype = /obj/structure/closet/crate/secure/gear @@ -236,8 +236,8 @@ name = JOB_EXPLORER + " shield" num_contained = 2 contains = list( - /obj/item/weapon/shield/riot/explorer, - /obj/item/weapon/shield/riot/explorer/purple + /obj/item/shield/riot/explorer, + /obj/item/shield/riot/explorer/purple ) cost = 75 containertype = /obj/structure/closet/crate/secure/gear @@ -249,7 +249,7 @@ /datum/supply_pack/misc/music_players name = "music players (3)" contains = list( - /obj/item/device/walkpod = 3 + /obj/item/walkpod = 3 ) cost = 150 containertype = /obj/structure/closet/crate @@ -258,7 +258,7 @@ /datum/supply_pack/misc/juke_remotes name = "jukebox remote speakers (2)" contains = list( - /obj/item/device/juke_remote = 2 + /obj/item/juke_remote = 2 ) cost = 300 containertype = /obj/structure/closet/crate @@ -267,7 +267,7 @@ /datum/supply_pack/misc/explorer_headsets name = "shortwave-capable headsets (x4)" contains = list( - /obj/item/device/radio/headset/explorer = 4 + /obj/item/radio/headset/explorer = 4 ) cost = 20 containertype = /obj/structure/closet/crate/secure/gear @@ -282,7 +282,7 @@ /datum/supply_pack/misc/emergency_beacons name = "emergency locator beacons (x4)" contains = list( - /obj/item/device/emergency_beacon = 4 + /obj/item/emergency_beacon = 4 ) cost = 20 containertype = /obj/structure/closet/crate diff --git a/code/datums/supplypacks/munitions.dm b/code/datums/supplypacks/munitions.dm index f63a5732fd0..af86c66c24d 100644 --- a/code/datums/supplypacks/munitions.dm +++ b/code/datums/supplypacks/munitions.dm @@ -12,12 +12,12 @@ /datum/supply_pack/munitions/weapons name = "Weapons - Security basic equipment" contains = list( - /obj/item/device/flash = 2, - /obj/item/weapon/reagent_containers/spray/pepper = 2, - /obj/item/weapon/melee/baton/loaded = 2, - /obj/item/weapon/gun/energy/taser = 2, - /obj/item/weapon/gun/projectile/colt/detective = 2, - /obj/item/weapon/storage/box/flashbangs = 2 + /obj/item/flash = 2, + /obj/item/reagent_containers/spray/pepper = 2, + /obj/item/melee/baton/loaded = 2, + /obj/item/gun/energy/taser = 2, + /obj/item/gun/projectile/colt/detective = 2, + /obj/item/storage/box/flashbangs = 2 ) cost = 40 containertype = /obj/structure/closet/crate/secure/lawson @@ -26,7 +26,7 @@ /datum/supply_pack/munitions/egunpistol name = "Weapons - Energy sidearms" - contains = list(/obj/item/weapon/gun/energy/gun = 2) + contains = list(/obj/item/gun/energy/gun = 2) cost = 40 containertype = /obj/structure/closet/crate/secure/lawson containername = "Energy sidearms crate" @@ -35,9 +35,9 @@ /datum/supply_pack/munitions/flareguns name = "Weapons - Flare guns" contains = list( - /obj/item/weapon/gun/projectile/sec/flash, + /obj/item/gun/projectile/sec/flash, /obj/item/ammo_magazine/m45/flash, - /obj/item/weapon/gun/projectile/shotgun/doublebarrel/flare, + /obj/item/gun/projectile/shotgun/doublebarrel/flare, /obj/item/ammo_magazine/ammo_box/b12g/flash ) cost = 25 @@ -48,8 +48,8 @@ /datum/supply_pack/munitions/eweapons name = "Weapons - Experimental weapons crate" contains = list( - /obj/item/weapon/gun/energy/xray = 2, - /obj/item/weapon/shield/energy = 2) + /obj/item/gun/energy/xray = 2, + /obj/item/shield/energy = 2) cost = 100 containertype = /obj/structure/closet/crate/secure/science containername = "Experimental weapons crate" @@ -57,7 +57,7 @@ /datum/supply_pack/munitions/energyweapons name = "Weapons - Laser rifle crate" - contains = list(/obj/item/weapon/gun/energy/laser = 2) //VOREStation Edit - Made to be consistent with the energy guns crate. + contains = list(/obj/item/gun/energy/laser = 2) //VOREStation Edit - Made to be consistent with the energy guns crate. cost = 50 containertype = /obj/structure/closet/crate/secure/heph containername = "Energy weapons crate" @@ -68,7 +68,7 @@ contains = list( /obj/item/ammo_magazine/ammo_box/b12g, /obj/item/ammo_magazine/ammo_box/b12g/pellet, - /obj/item/weapon/gun/projectile/shotgun/pump/combat = 2 + /obj/item/gun/projectile/shotgun/pump/combat = 2 ) cost = 50 containertype = /obj/structure/closet/crate/secure/weapon @@ -81,7 +81,7 @@ contains = list( /obj/item/ammo_magazine/ammo_box/b12g, /obj/item/ammo_magazine/ammo_box/b12g/pellet, - /obj/item/weapon/gun/projectile/shotgun/semi = 2 + /obj/item/gun/projectile/shotgun/semi = 2 ) cost = 100 containertype = /obj/structure/closet/crate/secure/weapon @@ -90,7 +90,7 @@ /datum/supply_pack/munitions/erifle name = "Weapons - Energy marksman" - contains = list(/obj/item/weapon/gun/energy/sniperrifle = 2) + contains = list(/obj/item/gun/energy/sniperrifle = 2) cost = 100 containertype = /obj/structure/closet/crate/secure/heph containername = "Energy marksman crate" @@ -98,7 +98,7 @@ /datum/supply_pack/munitions/burstlaser name = "Weapons - Burst laser" - contains = list(/obj/item/weapon/gun/energy/gun/burst = 2) + contains = list(/obj/item/gun/energy/gun/burst = 2) cost = 50 containertype = /obj/structure/closet/crate/secure/lawson containername = "Burst laser crate" @@ -107,8 +107,8 @@ /datum/supply_pack/munitions/ionweapons name = "Weapons - Electromagnetic Rifles" contains = list( - /obj/item/weapon/gun/energy/ionrifle = 2, - /obj/item/weapon/storage/box/empslite + /obj/item/gun/energy/ionrifle = 2, + /obj/item/storage/box/empslite ) cost = 50 containertype = /obj/structure/closet/crate/secure/ward @@ -118,8 +118,8 @@ /datum/supply_pack/munitions/ionpistols name = "Weapons - Electromagnetic pistols" contains = list( - /obj/item/weapon/gun/energy/ionrifle/pistol = 2, - /obj/item/weapon/storage/box/empslite + /obj/item/gun/energy/ionrifle/pistol = 2, + /obj/item/storage/box/empslite ) cost = 30 containertype = /obj/structure/closet/crate/secure/ward @@ -128,7 +128,7 @@ /datum/supply_pack/munitions/bsmg name = "Weapons - Ballistic SMGs" - contains = list(/obj/item/weapon/gun/projectile/automatic/wt550 = 2) + contains = list(/obj/item/gun/projectile/automatic/wt550 = 2) cost = 50 containertype = /obj/structure/closet/crate/secure/ward containername = "Ballistic weapon crate" @@ -136,7 +136,7 @@ /datum/supply_pack/munitions/brifle name = "Weapons - Ballistic Rifles" - contains = list(/obj/item/weapon/gun/projectile/automatic/z8 = 2) + contains = list(/obj/item/gun/projectile/automatic/z8 = 2) cost = 80 containertype = /obj/structure/closet/crate/secure/weapon containername = "Ballistic weapon crate" @@ -145,7 +145,7 @@ /datum/supply_pack/munitions/bolt_rifles_lethal name = "Weapons - Bolt-Action Rifles" contains = list( - /obj/item/weapon/gun/projectile/shotgun/pump/rifle = 2, + /obj/item/gun/projectile/shotgun/pump/rifle = 2, /obj/item/ammo_magazine/ammo_box/b762 = 4, ) cost = 60 @@ -156,8 +156,8 @@ /datum/supply_pack/munitions/bolt_rifles_competitive name = "Weapons - Competitive shooting rifles" contains = list( - /obj/item/device/assembly/timer, - /obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice = 2, + /obj/item/assembly/timer, + /obj/item/gun/projectile/shotgun/pump/rifle/practice = 2, /obj/item/ammo_magazine/clip/c762/practice = 4, /obj/item/target = 2, /obj/item/target/alien = 2, @@ -171,7 +171,7 @@ /datum/supply_pack/munitions/caseless name = "Weapons - Prototype Caseless Rifle" contains = list( - /obj/item/weapon/gun/projectile/caseless/prototype, + /obj/item/gun/projectile/caseless/prototype, /obj/item/ammo_magazine/m5mmcaseless = 3 ) cost = 60 @@ -181,7 +181,7 @@ /datum/supply_pack/munitions/mrifle name = "Weapons - Magnetic Rifles" - contains = list(/obj/item/weapon/gun/magnetic/railgun/heater = 2) + contains = list(/obj/item/gun/magnetic/railgun/heater = 2) cost = 120 containertype = /obj/structure/closet/crate/secure/heph containername = "Magnetic weapon crate" @@ -189,7 +189,7 @@ /datum/supply_pack/munitions/mpistol name = "Weapons - Magnetic Pistols" - contains = list(/obj/item/weapon/gun/magnetic/railgun/heater/pistol = 2) + contains = list(/obj/item/gun/magnetic/railgun/heater/pistol = 2) cost = 200 containertype = /obj/structure/closet/crate/secure/heph containername = "Magnetic weapon crate" @@ -197,7 +197,7 @@ /datum/supply_pack/munitions/mcarbine name = "Weapons - Magnetic Carbines" - contains = list(/obj/item/weapon/gun/magnetic/railgun/flechette/sif = 2) + contains = list(/obj/item/gun/magnetic/railgun/flechette/sif = 2) cost = 130 containertype = /obj/structure/closet/crate/secure/lawson containername = "Magnetic weapon crate" @@ -205,7 +205,7 @@ /datum/supply_pack/munitions/mshells name = "Weapons - Magnetic Shells" - contains = list(/obj/item/weapon/magnetic_ammo = 3) + contains = list(/obj/item/magnetic_ammo = 3) cost = 100 containertype = /obj/structure/closet/crate/secure/weapon containername = "Magnetic ammunition crate" @@ -213,7 +213,7 @@ /datum/supply_pack/munitions/claymore name = "Weapons - Melee - Claymores" - contains = list(/obj/item/weapon/material/sword = 2) + contains = list(/obj/item/material/sword = 2) cost = 150 containertype = /obj/structure/closet/crate/secure/weapon containername = "Claymore crate" @@ -264,7 +264,7 @@ /datum/supply_pack/munitions/pcellammo name = "Ammunition - Power cell" - contains = list(/obj/item/weapon/cell/device/weapon = 3) + contains = list(/obj/item/cell/device/weapon = 3) cost = 50 containertype = /obj/structure/closet/crate/secure/weapon containername = "Energy ammunition crate" @@ -274,8 +274,8 @@ /datum/supply_pack/munitions/expeditionguns name = "Frontier phaser (station-locked) crate" contains = list( - /obj/item/weapon/gun/energy/locked/frontier = 2, - /obj/item/weapon/gun/energy/locked/frontier/holdout = 2, + /obj/item/gun/energy/locked/frontier = 2, + /obj/item/gun/energy/locked/frontier/holdout = 2, ) cost = 35 containertype = /obj/structure/closet/crate/secure @@ -285,7 +285,7 @@ /datum/supply_pack/munitions/expeditionbows name = "Frontier bows (station-locked) crate" contains = list( - /obj/item/weapon/gun/energy/locked/frontier/handbow=2 + /obj/item/gun/energy/locked/frontier/handbow=2 ) cost = 20 containertype = /obj/structure/closet/crate/secure @@ -336,7 +336,7 @@ /datum/supply_pack/munitions/longsword name = "Weapons - Melee -Longsword (Steel)" contains = list( - /obj/item/weapon/material/twohanded/longsword=2 + /obj/item/material/twohanded/longsword=2 ) cost = 50 containertype = /obj/structure/closet/crate/secure diff --git a/code/datums/supplypacks/recreation.dm b/code/datums/supplypacks/recreation.dm index 3b274ff17fb..ab7f37da80b 100644 --- a/code/datums/supplypacks/recreation.dm +++ b/code/datums/supplypacks/recreation.dm @@ -14,10 +14,10 @@ /datum/supply_pack/recreation/foam_weapons name = "Foam Weapon Crate" contains = list( - /obj/item/weapon/material/sword/foam = 2, - /obj/item/weapon/material/twohanded/baseballbat/foam = 2, - /obj/item/weapon/material/twohanded/spear/foam = 2, - /obj/item/weapon/material/twohanded/fireaxe/foam = 2 + /obj/item/material/sword/foam = 2, + /obj/item/material/twohanded/baseballbat/foam = 2, + /obj/item/material/twohanded/spear/foam = 2, + /obj/item/material/twohanded/fireaxe/foam = 2 ) cost = 50 containertype = /obj/structure/closet/crate/allico @@ -27,8 +27,8 @@ name = "Donk-Soft Weapon Crate" contains = list( /obj/item/ammo_magazine/ammo_box/foam = 2, - /obj/item/weapon/gun/projectile/shotgun/pump/toy = 2, - /obj/item/weapon/gun/projectile/pistol/toy = 2, + /obj/item/gun/projectile/shotgun/pump/toy = 2, + /obj/item/gun/projectile/pistol/toy = 2, /obj/item/ammo_magazine/mfoam_dart/pistol = 2 ) cost = 50 @@ -54,9 +54,9 @@ /datum/supply_pack/recreation/lasertag name = "Lasertag equipment" contains = list( - /obj/item/weapon/gun/energy/lasertag/red, + /obj/item/gun/energy/lasertag/red, /obj/item/clothing/suit/redtag, - /obj/item/weapon/gun/energy/lasertag/blue, + /obj/item/gun/energy/lasertag/blue, /obj/item/clothing/suit/bluetag ) containertype = /obj/structure/closet/crate/ward @@ -66,14 +66,14 @@ /datum/supply_pack/recreation/artscrafts name = "Arts and Crafts supplies" contains = list( - /obj/item/weapon/storage/fancy/crayons, - /obj/item/weapon/storage/fancy/markers, - /obj/item/device/camera, - /obj/item/device/camera_film = 2, - /obj/item/weapon/storage/photo_album, - /obj/item/weapon/packageWrap, + /obj/item/storage/fancy/crayons, + /obj/item/storage/fancy/markers, + /obj/item/camera, + /obj/item/camera_film = 2, + /obj/item/storage/photo_album, + /obj/item/packageWrap, /obj/item/poster/custom, - /obj/item/weapon/wrapping_paper = 3, + /obj/item/wrapping_paper = 3, /obj/structure/easel, /obj/item/paint_brush, /obj/item/paint_palette, @@ -93,19 +93,19 @@ containername = "station painting supplies crate" containertype = /obj/structure/closet/crate/grayson contains = list( - /obj/item/device/pipe_painter = 2, - /obj/item/device/floor_painter = 2, - /obj/item/weapon/reagent_containers/glass/paint/red, - /obj/item/weapon/reagent_containers/glass/paint/green, - /obj/item/weapon/reagent_containers/glass/paint/blue, - /obj/item/weapon/reagent_containers/glass/paint/yellow, - /obj/item/weapon/reagent_containers/glass/paint/violet, - /obj/item/weapon/reagent_containers/glass/paint/cyan, - /obj/item/weapon/reagent_containers/glass/paint/orange, - /obj/item/weapon/reagent_containers/glass/paint/purple, - /obj/item/weapon/reagent_containers/glass/paint/grey, - /obj/item/weapon/reagent_containers/glass/paint/black, - /obj/item/weapon/reagent_containers/glass/paint/white = 3 + /obj/item/pipe_painter = 2, + /obj/item/floor_painter = 2, + /obj/item/reagent_containers/glass/paint/red, + /obj/item/reagent_containers/glass/paint/green, + /obj/item/reagent_containers/glass/paint/blue, + /obj/item/reagent_containers/glass/paint/yellow, + /obj/item/reagent_containers/glass/paint/violet, + /obj/item/reagent_containers/glass/paint/cyan, + /obj/item/reagent_containers/glass/paint/orange, + /obj/item/reagent_containers/glass/paint/purple, + /obj/item/reagent_containers/glass/paint/grey, + /obj/item/reagent_containers/glass/paint/black, + /obj/item/reagent_containers/glass/paint/white = 3 ) /datum/supply_pack/recreation/cheapbait @@ -114,7 +114,7 @@ containername = "cheap bait crate" containertype = /obj/structure/closet/crate/freezer contains = list( - /obj/item/weapon/storage/box/wormcan/sickly = 5 + /obj/item/storage/box/wormcan/sickly = 5 ) /datum/supply_pack/randomised/recreation/cheapbait @@ -124,8 +124,8 @@ containertype = /obj/structure/closet/crate/carp num_contained = 8 contains = list( - /obj/item/weapon/storage/box/wormcan, - /obj/item/weapon/storage/box/wormcan/deluxe + /obj/item/storage/box/wormcan, + /obj/item/storage/box/wormcan/deluxe ) /datum/supply_pack/recreation/ltagturrets @@ -144,7 +144,7 @@ containername = "monster bait crate" containertype = /obj/structure/closet/crate/allico contains = list( - /obj/item/weapon/toy/monster_bait + /obj/item/toy/monster_bait ) /* @@ -162,14 +162,14 @@ contains = list( /obj/item/clothing/mask/muzzle, /obj/item/clothing/glasses/sunglasses/blindfold, - /obj/item/weapon/handcuffs/fuzzy, - /obj/item/weapon/tape_roll, + /obj/item/handcuffs/fuzzy, + /obj/item/tape_roll, /obj/item/stack/cable_coil/random, /obj/item/clothing/accessory/collar/shock, /obj/item/clothing/suit/straight_jacket, - /obj/item/weapon/handcuffs/legcuffs/fuzzy, - /obj/item/weapon/melee/fluff/holochain/mass, - /obj/item/weapon/material/twohanded/riding_crop, + /obj/item/handcuffs/legcuffs/fuzzy, + /obj/item/melee/fluff/holochain/mass, + /obj/item/material/twohanded/riding_crop, /obj/item/clothing/under/fluff/latexmaid ) containertype = /obj/structure/closet/crate @@ -182,8 +182,8 @@ /obj/item/clothing/head/fluff/wolfgirl = 1, /obj/item/clothing/shoes/fluff/wolfgirl = 1, /obj/item/clothing/under/fluff/wolfgirl = 1, - /obj/item/weapon/melee/fluffstuff/wolfgirlsword = 1, - /obj/item/weapon/shield/fluff/wolfgirlshield = 1 + /obj/item/melee/fluffstuff/wolfgirlsword = 1, + /obj/item/shield/fluff/wolfgirlshield = 1 ) cost = 50 containertype = /obj/structure/closet/crate @@ -240,7 +240,7 @@ /datum/supply_pack/recreation/smoleworld name = "Smole Bulding Bricks" contains = list( - /obj/item/weapon/storage/smolebrickcase, /obj/item/weapon/storage/smolebrickcase, + /obj/item/storage/smolebrickcase, /obj/item/storage/smolebrickcase, ) cost = 50 containertype = /obj/structure/closet/crate @@ -250,7 +250,7 @@ name = "Snack planets pack" num_contained = 4 contains = list( - /obj/item/weapon/storage/bagoplanets, /obj/item/weapon/storage/bagoplanets + /obj/item/storage/bagoplanets, /obj/item/storage/bagoplanets ) cost = 25 containertype = /obj/structure/closet/crate @@ -259,7 +259,7 @@ /datum/supply_pack/recreation/pinkpillows name = "Pillow Crate - Pink" contains = list( - /obj/item/weapon/bedsheet/pillow = 6 + /obj/item/bedsheet/pillow = 6 ) cost = 10 containertype = /obj/structure/closet/crate @@ -267,7 +267,7 @@ /datum/supply_pack/recreation/tealpillows name = "Pillow Crate - Teal" contains = list( - /obj/item/weapon/bedsheet/pillow/teal = 6 + /obj/item/bedsheet/pillow/teal = 6 ) cost = 10 containertype = /obj/structure/closet/crate @@ -275,7 +275,7 @@ /datum/supply_pack/recreation/whitepillows name = "Pillow Crate - White" contains = list( - /obj/item/weapon/bedsheet/pillow/white = 6 + /obj/item/bedsheet/pillow/white = 6 ) cost = 10 containertype = /obj/structure/closet/crate @@ -283,7 +283,7 @@ /datum/supply_pack/recreation/blackpillows name = "Pillow Crate - Black" contains = list( - /obj/item/weapon/bedsheet/pillow/black = 6 + /obj/item/bedsheet/pillow/black = 6 ) cost = 10 containertype = /obj/structure/closet/crate @@ -291,7 +291,7 @@ /datum/supply_pack/recreation/redpillows name = "Pillow Crate - Red" contains = list( - /obj/item/weapon/bedsheet/pillow/red = 6 + /obj/item/bedsheet/pillow/red = 6 ) cost = 10 containertype = /obj/structure/closet/crate @@ -299,7 +299,7 @@ /datum/supply_pack/recreation/greenpillows name = "Pillow Crate - Green" contains = list( - /obj/item/weapon/bedsheet/pillow/green = 6 + /obj/item/bedsheet/pillow/green = 6 ) cost = 10 containertype = /obj/structure/closet/crate @@ -307,7 +307,7 @@ /datum/supply_pack/recreation/orangepillows name = "Pillow Crate - Orange" contains = list( - /obj/item/weapon/bedsheet/pillow/orange = 6 + /obj/item/bedsheet/pillow/orange = 6 ) cost = 10 containertype = /obj/structure/closet/crate @@ -315,7 +315,7 @@ /datum/supply_pack/recreation/yellowpillows name = "Pillow Crate - Yellow" contains = list( - /obj/item/weapon/bedsheet/pillow/yellow = 6 + /obj/item/bedsheet/pillow/yellow = 6 ) cost = 10 containertype = /obj/structure/closet/crate diff --git a/code/datums/supplypacks/robotics.dm b/code/datums/supplypacks/robotics.dm index a5fec8e2bb1..900d56d5f6e 100644 --- a/code/datums/supplypacks/robotics.dm +++ b/code/datums/supplypacks/robotics.dm @@ -14,10 +14,10 @@ /datum/supply_pack/robotics/robotics_assembly name = "Robotics assembly crate" contains = list( - /obj/item/device/assembly/prox_sensor = 3, - /obj/item/weapon/storage/toolbox/electrical, - /obj/item/device/flash = 4, - /obj/item/weapon/cell/high = 2 + /obj/item/assembly/prox_sensor = 3, + /obj/item/storage/toolbox/electrical, + /obj/item/flash = 4, + /obj/item/cell/high = 2 ) cost = 10 containertype = /obj/structure/closet/crate/secure/nanotrasen @@ -27,8 +27,8 @@ /*/datum/supply_pack/robotics/robolimbs_basic name = "Basic robolimb blueprints" contains = list( - /obj/item/weapon/disk/limb/morpheus, - /obj/item/weapon/disk/limb/xion + /obj/item/disk/limb/morpheus, + /obj/item/disk/limb/xion ) cost = 15 containertype = /obj/structure/closet/crate/secure/gear @@ -38,13 +38,13 @@ /datum/supply_pack/robotics/robolimbs_adv name = "All robolimb blueprints" contains = list( - /obj/item/weapon/disk/limb/bishop, - /obj/item/weapon/disk/limb/hephaestus, - /obj/item/weapon/disk/limb/morpheus, - /obj/item/weapon/disk/limb/veymed, - /obj/item/weapon/disk/limb/wardtakahashi, - /obj/item/weapon/disk/limb/xion, - /obj/item/weapon/disk/limb/zenghu, + /obj/item/disk/limb/bishop, + /obj/item/disk/limb/hephaestus, + /obj/item/disk/limb/morpheus, + /obj/item/disk/limb/veymed, + /obj/item/disk/limb/wardtakahashi, + /obj/item/disk/limb/xion, + /obj/item/disk/limb/zenghu, ) cost = 40 containertype = /obj/structure/closet/crate/secure/gear @@ -54,7 +54,7 @@ /datum/supply_pack/robotics/robolimbs/morpheus name = "Morpheus robolimb blueprints" - contains = list(/obj/item/weapon/disk/limb/morpheus) + contains = list(/obj/item/disk/limb/morpheus) cost = 20 containertype = /obj/structure/closet/crate/secure/morpheus containername = "Robolimb blueprints (Morpheus)" @@ -62,7 +62,7 @@ /datum/supply_pack/robotics/robolimbs/cybersolutions name = "Cyber Solutions robolimb blueprints" - contains = list(/obj/item/weapon/disk/limb/cybersolutions) + contains = list(/obj/item/disk/limb/cybersolutions) cost = 20 containertype = /obj/structure/closet/crate/secure/cybersolutions containername = "Robolimb blueprints (Cyber Solutions)" @@ -70,7 +70,7 @@ /datum/supply_pack/robotics/robolimbs/xion name = "Xion robolimb blueprints" - contains = list(/obj/item/weapon/disk/limb/xion) + contains = list(/obj/item/disk/limb/xion) cost = 20 containertype = /obj/structure/closet/crate/secure/xion containername = "Robolimb blueprints (Xion)" @@ -78,7 +78,7 @@ /datum/supply_pack/robotics/robolimbs/grayson name = "Grayson robolimb blueprints" - contains = list(/obj/item/weapon/disk/limb/grayson) + contains = list(/obj/item/disk/limb/grayson) cost = 30 containertype = /obj/structure/closet/crate/secure/grayson containername = "Robolimb blueprints (Grayson)" @@ -86,7 +86,7 @@ /datum/supply_pack/robotics/robolimbs/hephaestus name = "Hephaestus robolimb blueprints" - contains = list(/obj/item/weapon/disk/limb/hephaestus) + contains = list(/obj/item/disk/limb/hephaestus) cost = 35 containertype = /obj/structure/closet/crate/secure/heph containername = "Robolimb blueprints (Hephaestus)" @@ -94,7 +94,7 @@ /datum/supply_pack/robotics/robolimbs/wardtakahashi name = "Ward-Takahashi robolimb blueprints" - contains = list(/obj/item/weapon/disk/limb/wardtakahashi) + contains = list(/obj/item/disk/limb/wardtakahashi) cost = 35 containertype = /obj/structure/closet/crate/secure/ward containername = "Robolimb blueprints (Ward-Takahashi)" @@ -102,7 +102,7 @@ /datum/supply_pack/robotics/robolimbs/zenghu name = "Zeng Hu robolimb blueprints" - contains = list(/obj/item/weapon/disk/limb/zenghu) + contains = list(/obj/item/disk/limb/zenghu) cost = 35 containertype = /obj/structure/closet/crate/secure/zenghu containername = "Robolimb blueprints (Zeng Hu)" @@ -110,7 +110,7 @@ /datum/supply_pack/robotics/robolimbs/bishop name = "Bishop robolimb blueprints" - contains = list(/obj/item/weapon/disk/limb/bishop) + contains = list(/obj/item/disk/limb/bishop) cost = 70 containertype = /obj/structure/closet/crate/secure/bishop containername = "Robolimb blueprints (Bishop)" @@ -118,7 +118,7 @@ /datum/supply_pack/robotics/robolimbs/cenilimicybernetics name = "Cenilimi Cybernetics robolimb blueprints" - contains = list(/obj/item/weapon/disk/limb/cenilimicybernetics) + contains = list(/obj/item/disk/limb/cenilimicybernetics) cost = 45 containertype = /obj/structure/closet/crate/secure/science containername = "Robolimb blueprints (Cenilimi Cybernetics)" @@ -128,9 +128,9 @@ /datum/supply_pack/robotics/mecha_ripley name = "Circuit Crate (\"Ripley\" APLU)" contains = list( - /obj/item/weapon/book/manual/ripley_build_and_repair, - /obj/item/weapon/circuitboard/mecha/ripley/main, - /obj/item/weapon/circuitboard/mecha/ripley/peripherals + /obj/item/book/manual/ripley_build_and_repair, + /obj/item/circuitboard/mecha/ripley/main, + /obj/item/circuitboard/mecha/ripley/peripherals ) cost = 25 containertype = /obj/structure/closet/crate/secure/xion @@ -140,8 +140,8 @@ /datum/supply_pack/robotics/mecha_odysseus name = "Circuit Crate (\"Odysseus\")" contains = list( - /obj/item/weapon/circuitboard/mecha/odysseus/peripherals, - /obj/item/weapon/circuitboard/mecha/odysseus/main + /obj/item/circuitboard/mecha/odysseus/peripherals, + /obj/item/circuitboard/mecha/odysseus/main ) cost = 25 containertype = /obj/structure/closet/crate/secure/veymed @@ -151,10 +151,10 @@ /datum/supply_pack/randomised/robotics/exosuit_mod num_contained = 1 contains = list( - /obj/item/device/kit/paint/ripley, - /obj/item/device/kit/paint/ripley/death, - /obj/item/device/kit/paint/ripley/flames_red, - /obj/item/device/kit/paint/ripley/flames_blue + /obj/item/kit/paint/ripley, + /obj/item/kit/paint/ripley/death, + /obj/item/kit/paint/ripley/flames_red, + /obj/item/kit/paint/ripley/flames_blue ) name = "Random APLU modkit" cost = 200 @@ -163,18 +163,18 @@ /datum/supply_pack/randomised/robotics/exosuit_mod/durand contains = list( - /obj/item/device/kit/paint/durand, - /obj/item/device/kit/paint/durand/seraph, - /obj/item/device/kit/paint/durand/phazon + /obj/item/kit/paint/durand, + /obj/item/kit/paint/durand/seraph, + /obj/item/kit/paint/durand/phazon ) name = "Random Durand exosuit modkit" containertype = /obj/structure/closet/crate/heph /datum/supply_pack/randomised/robotics/exosuit_mod/gygax contains = list( - /obj/item/device/kit/paint/gygax, - /obj/item/device/kit/paint/gygax/darkgygax, - /obj/item/device/kit/paint/gygax/recitence + /obj/item/kit/paint/gygax, + /obj/item/kit/paint/gygax/darkgygax, + /obj/item/kit/paint/gygax/recitence ) name = "Random Gygax exosuit modkit" containertype = /obj/structure/closet/crate/heph @@ -182,7 +182,7 @@ /datum/supply_pack/robotics/jumper_cables name = "Jumper kit crate" contains = list( - /obj/item/device/defib_kit/jumper_kit = 2 + /obj/item/defib_kit/jumper_kit = 2 ) cost = 30 containertype = /obj/structure/closet/crate/secure/einstein @@ -192,8 +192,8 @@ /datum/supply_pack/robotics/restrainingbolt name = "Restraining bolt crate" contains = list( - /obj/item/weapon/implanter = 1, - /obj/item/weapon/implantcase/restrainingbolt = 2 + /obj/item/implanter = 1, + /obj/item/implantcase/restrainingbolt = 2 ) cost = 40 containertype = /obj/structure/closet/crate/secure/cybersolutions @@ -224,8 +224,8 @@ /datum/supply_pack/robotics/mecha_gopher name = "Circuit Crate (\"Gopher\" APLU)" contains = list( - /obj/item/weapon/circuitboard/mecha/gopher/main, - /obj/item/weapon/circuitboard/mecha/gopher/peripherals + /obj/item/circuitboard/mecha/gopher/main, + /obj/item/circuitboard/mecha/gopher/peripherals ) cost = 25 containertype = /obj/structure/closet/crate/secure/science @@ -235,9 +235,9 @@ /datum/supply_pack/robotics/mecha_polecat name = "Circuit Crate (\"Polecat\" APLU)" contains = list( - /obj/item/weapon/circuitboard/mecha/polecat/main, - /obj/item/weapon/circuitboard/mecha/polecat/peripherals, - /obj/item/weapon/circuitboard/mecha/polecat/targeting + /obj/item/circuitboard/mecha/polecat/main, + /obj/item/circuitboard/mecha/polecat/peripherals, + /obj/item/circuitboard/mecha/polecat/targeting ) cost = 25 containertype = /obj/structure/closet/crate/secure/science @@ -247,9 +247,9 @@ /datum/supply_pack/robotics/mecha_weasel name = "Circuit Crate (\"Weasel\" APLU)" contains = list( - /obj/item/weapon/circuitboard/mecha/weasel/main, - /obj/item/weapon/circuitboard/mecha/weasel/peripherals, - /obj/item/weapon/circuitboard/mecha/weasel/targeting + /obj/item/circuitboard/mecha/weasel/main, + /obj/item/circuitboard/mecha/weasel/peripherals, + /obj/item/circuitboard/mecha/weasel/targeting ) cost = 25 containertype = /obj/structure/closet/crate/secure/science @@ -259,9 +259,9 @@ /datum/supply_pack/robotics/some_robolimbs name = "Basic Robolimb Blueprints" contains = list( - /obj/item/weapon/disk/limb/morpheus, - /obj/item/weapon/disk/limb/xion, - /obj/item/weapon/disk/limb/talon + /obj/item/disk/limb/morpheus, + /obj/item/disk/limb/xion, + /obj/item/disk/limb/talon ) cost = 15 containertype = /obj/structure/closet/crate/secure @@ -271,24 +271,24 @@ /datum/supply_pack/robotics/all_robolimbs name = "Advanced Robolimb Blueprints" contains = list( - /obj/item/weapon/disk/limb/bishop, - /obj/item/weapon/disk/limb/hephaestus, - /obj/item/weapon/disk/limb/morpheus, - /obj/item/weapon/disk/limb/veymed, - /obj/item/weapon/disk/limb/wardtakahashi, - /obj/item/weapon/disk/limb/xion, - /obj/item/weapon/disk/limb/zenghu, - /obj/item/weapon/disk/limb/talon, - /obj/item/weapon/disk/limb/dsi_tajaran, - /obj/item/weapon/disk/limb/dsi_lizard, - /obj/item/weapon/disk/limb/dsi_sergal, - /obj/item/weapon/disk/limb/dsi_nevrean, - /obj/item/weapon/disk/limb/dsi_vulpkanin, - /obj/item/weapon/disk/limb/dsi_akula, - /obj/item/weapon/disk/limb/dsi_spider, - /obj/item/weapon/disk/limb/dsi_teshari, - /obj/item/weapon/disk/limb/eggnerdltd, - /obj/item/weapon/disk/limb/eggnerdltdred + /obj/item/disk/limb/bishop, + /obj/item/disk/limb/hephaestus, + /obj/item/disk/limb/morpheus, + /obj/item/disk/limb/veymed, + /obj/item/disk/limb/wardtakahashi, + /obj/item/disk/limb/xion, + /obj/item/disk/limb/zenghu, + /obj/item/disk/limb/talon, + /obj/item/disk/limb/dsi_tajaran, + /obj/item/disk/limb/dsi_lizard, + /obj/item/disk/limb/dsi_sergal, + /obj/item/disk/limb/dsi_nevrean, + /obj/item/disk/limb/dsi_vulpkanin, + /obj/item/disk/limb/dsi_akula, + /obj/item/disk/limb/dsi_spider, + /obj/item/disk/limb/dsi_teshari, + /obj/item/disk/limb/eggnerdltd, + /obj/item/disk/limb/eggnerdltdred ) cost = 40 containertype = /obj/structure/closet/crate/secure diff --git a/code/datums/supplypacks/science.dm b/code/datums/supplypacks/science.dm index 729a543a19d..94469a886fe 100644 --- a/code/datums/supplypacks/science.dm +++ b/code/datums/supplypacks/science.dm @@ -15,13 +15,13 @@ /datum/supply_pack/sci/phoron name = "Phoron research crate" contains = list( - /obj/item/weapon/tank/phoron = 3, - /obj/item/weapon/tank/oxygen = 3, - /obj/item/device/assembly/igniter = 3, - /obj/item/device/assembly/prox_sensor = 3, - /obj/item/device/assembly/timer = 3, - /obj/item/device/assembly/signaler = 3, - /obj/item/device/transfer_valve = 3 + /obj/item/tank/phoron = 3, + /obj/item/tank/oxygen = 3, + /obj/item/assembly/igniter = 3, + /obj/item/assembly/prox_sensor = 3, + /obj/item/assembly/timer = 3, + /obj/item/assembly/signaler = 3, + /obj/item/transfer_valve = 3 ) cost = 10 containertype = /obj/structure/closet/crate/secure/phoron @@ -45,14 +45,14 @@ /datum/supply_pack/sci/integrated_circuit_printer name = "Integrated circuit printer" - contains = list(/obj/item/device/integrated_circuit_printer = 2) + contains = list(/obj/item/integrated_circuit_printer = 2) cost = 15 containertype = /obj/structure/closet/crate/ward containername = "Integrated circuit crate" /datum/supply_pack/sci/integrated_circuit_printer_upgrade name = "Integrated circuit printer upgrade - advanced designs" - contains = list(/obj/item/weapon/disk/integrated_circuit/upgrade/advanced) + contains = list(/obj/item/disk/integrated_circuit/upgrade/advanced) cost = 30 containertype = /obj/structure/closet/crate/ward containername = "Integrated circuit crate" @@ -60,20 +60,20 @@ /datum/supply_pack/sci/xenoarch name = "Xenoarchaeology Tech crate" contains = list( - /obj/item/weapon/pickaxe/excavationdrill, - /obj/item/device/xenoarch_multi_tool, + /obj/item/pickaxe/excavationdrill, + /obj/item/xenoarch_multi_tool, /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, - /obj/item/weapon/storage/belt/archaeology, - /obj/item/device/flashlight/lantern, - /obj/item/device/core_sampler, - /obj/item/device/gps, - /obj/item/device/beacon_locator, - /obj/item/device/radio/beacon, + /obj/item/storage/belt/archaeology, + /obj/item/flashlight/lantern, + /obj/item/core_sampler, + /obj/item/gps, + /obj/item/beacon_locator, + /obj/item/radio/beacon, /obj/item/clothing/glasses/meson, - /obj/item/weapon/pickaxe, - /obj/item/weapon/storage/bag/fossils, - /obj/item/weapon/hand_labeler) + /obj/item/pickaxe, + /obj/item/storage/bag/fossils, + /obj/item/hand_labeler) cost = 100 containertype = /obj/structure/closet/crate/secure/xion containername = "Xenoarchaeology Tech crate" diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm index da8e8927029..1404b06e420 100644 --- a/code/datums/supplypacks/security.dm +++ b/code/datums/supplypacks/security.dm @@ -253,12 +253,12 @@ /datum/supply_pack/security/riot_gear name = "Gear - Riot" contains = list( - /obj/item/weapon/melee/baton = 3, - /obj/item/weapon/shield/riot = 3, - /obj/item/weapon/handcuffs = 3, - /obj/item/weapon/storage/box/flashbangs, + /obj/item/melee/baton = 3, + /obj/item/shield/riot = 3, + /obj/item/handcuffs = 3, + /obj/item/storage/box/flashbangs, /obj/item/ammo_magazine/ammo_box/b12g/beanbag, - /obj/item/weapon/storage/box/handcuffs + /obj/item/storage/box/handcuffs ) cost = 40 containertype = /obj/structure/closet/crate/secure/lawson @@ -292,7 +292,7 @@ /datum/supply_pack/security/riot_sprayer name = "Gear - Riot sprayer" contains = list( - /obj/item/weapon/watertank/pepperspray + /obj/item/watertank/pepperspray ) cost = 40 containertype = /obj/structure/closet/crate/secure/lawson @@ -373,7 +373,7 @@ /obj/item/clothing/head/helmet/tactical, /obj/item/clothing/mask/balaclava/tactical, /obj/item/clothing/glasses/sunglasses/sechud/tactical, - /obj/item/weapon/storage/belt/security/tactical, + /obj/item/storage/belt/security/tactical, /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/gloves/black, /obj/item/clothing/under/tactical, @@ -381,7 +381,7 @@ /obj/item/clothing/head/helmet/tactical, /obj/item/clothing/mask/balaclava/tactical, /obj/item/clothing/glasses/sunglasses/sechud/tactical, - /obj/item/weapon/storage/belt/security/tactical, + /obj/item/storage/belt/security/tactical, /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/gloves/black ) @@ -400,14 +400,14 @@ /obj/item/clothing/gloves/arm_guard/flexitac, /obj/item/clothing/mask/balaclava/tactical, /obj/item/clothing/glasses/sunglasses/sechud/tactical, - /obj/item/weapon/storage/belt/security/tactical, + /obj/item/storage/belt/security/tactical, /obj/item/clothing/suit/storage/vest/heavy/flexitac, /obj/item/clothing/head/helmet/flexitac, /obj/item/clothing/shoes/leg_guard/flexitac, /obj/item/clothing/gloves/arm_guard/flexitac, /obj/item/clothing/mask/balaclava/tactical, /obj/item/clothing/glasses/sunglasses/sechud/tactical, - /obj/item/weapon/storage/belt/security/tactical + /obj/item/storage/belt/security/tactical ) /datum/supply_pack/security/securitybarriers @@ -442,9 +442,9 @@ /datum/supply_pack/security/extragear name = "Gear - Security surplus equipment" contains = list( - /obj/item/weapon/storage/belt/security = 3, + /obj/item/storage/belt/security = 3, /obj/item/clothing/glasses/sunglasses/sechud = 3, - /obj/item/device/radio/headset/headset_sec/alt = 3, + /obj/item/radio/headset/headset_sec/alt = 3, /obj/item/clothing/suit/storage/hooded/wintercoat/security = 3, /obj/item/clothing/glasses/sunglasses/sechud/tactical_sec_vis = 3 ) @@ -455,25 +455,25 @@ /datum/supply_pack/security/detectivegear name = "Forensic - Investigation equipment" contains = list( - /obj/item/weapon/storage/box/evidence = 2, + /obj/item/storage/box/evidence = 2, /obj/item/clothing/suit/storage/vest/detective, - /obj/item/weapon/cartridge/detective, - /obj/item/device/radio/headset/headset_sec, + /obj/item/cartridge/detective, + /obj/item/radio/headset/headset_sec, /obj/item/taperoll/police, /obj/item/clothing/glasses/sunglasses, - /obj/item/device/camera, - /obj/item/weapon/folder/red, - /obj/item/weapon/folder/blue, - /obj/item/weapon/storage/belt/detective, + /obj/item/camera, + /obj/item/folder/red, + /obj/item/folder/blue, + /obj/item/storage/belt/detective, /obj/item/clothing/gloves/black, - /obj/item/device/taperecorder, - /obj/item/device/mass_spectrometer, - /obj/item/device/camera_film = 2, - /obj/item/weapon/storage/photo_album, - /obj/item/device/reagent_scanner, - /obj/item/device/flashlight/maglight, - /obj/item/weapon/storage/briefcase/crimekit, - /obj/item/weapon/storage/bag/detective + /obj/item/taperecorder, + /obj/item/mass_spectrometer, + /obj/item/camera_film = 2, + /obj/item/storage/photo_album, + /obj/item/reagent_scanner, + /obj/item/flashlight/maglight, + /obj/item/storage/briefcase/crimekit, + /obj/item/storage/bag/detective ) cost = 20 containertype = /obj/structure/closet/crate/secure/nanotrasen @@ -483,10 +483,10 @@ /datum/supply_pack/security/detectivescan name = "Forensic - Scanning Equipment" contains = list( - /obj/item/device/mass_spectrometer, - /obj/item/device/reagent_scanner, - /obj/item/weapon/storage/briefcase/crimekit, - /obj/item/device/detective_scanner + /obj/item/mass_spectrometer, + /obj/item/reagent_scanner, + /obj/item/storage/briefcase/crimekit, + /obj/item/detective_scanner ) cost = 60 containertype = /obj/structure/closet/crate/secure/ward @@ -520,25 +520,25 @@ contains = list( /obj/item/clothing/suit/storage/vest/officer, /obj/item/clothing/head/helmet, - /obj/item/weapon/cartridge/security, + /obj/item/cartridge/security, /obj/item/clothing/accessory/badge/holo, /obj/item/clothing/accessory/badge/holo/cord, - /obj/item/device/radio/headset/headset_sec, - /obj/item/weapon/storage/belt/security, - /obj/item/device/flash, - /obj/item/weapon/reagent_containers/spray/pepper, - /obj/item/weapon/grenade/flashbang, - /obj/item/weapon/melee/baton/loaded, + /obj/item/radio/headset/headset_sec, + /obj/item/storage/belt/security, + /obj/item/flash, + /obj/item/reagent_containers/spray/pepper, + /obj/item/grenade/flashbang, + /obj/item/melee/baton/loaded, /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/taperoll/police, /obj/item/clothing/gloves/black, - /obj/item/device/hailer, - /obj/item/device/flashlight/flare, + /obj/item/hailer, + /obj/item/flashlight/flare, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/head/soft/sec/corp, /obj/item/clothing/under/rank/security/corp, - /obj/item/weapon/gun/energy/taser, - /obj/item/device/flashlight/maglight + /obj/item/gun/energy/taser, + /obj/item/flashlight/maglight ) cost = 20 containertype = /obj/structure/closet/crate/secure/nanotrasen @@ -555,19 +555,19 @@ /obj/item/clothing/suit/storage/vest/wardencoat/alt, /obj/item/clothing/suit/storage/vest/wardencoat/alt2, //VOREStation Add, /obj/item/clothing/head/helmet/warden, - /obj/item/weapon/cartridge/security, - /obj/item/device/radio/headset/headset_sec, + /obj/item/cartridge/security, + /obj/item/radio/headset/headset_sec, /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/taperoll/police, - /obj/item/device/hailer, + /obj/item/hailer, /obj/item/clothing/accessory/badge/holo/warden, - /obj/item/weapon/storage/box/flashbangs, - /obj/item/weapon/storage/belt/security, - /obj/item/weapon/reagent_containers/spray/pepper, - /obj/item/weapon/melee/baton/loaded, - /obj/item/weapon/storage/box/holobadge, + /obj/item/storage/box/flashbangs, + /obj/item/storage/belt/security, + /obj/item/reagent_containers/spray/pepper, + /obj/item/melee/baton/loaded, + /obj/item/storage/box/holobadge, /obj/item/clothing/head/beret/sec/corporate/warden, - /obj/item/device/flashlight/maglight + /obj/item/flashlight/maglight ) cost = 20 containertype = /obj/structure/closet/crate/secure/nanotrasen @@ -583,18 +583,18 @@ /obj/item/clothing/suit/storage/vest/hoscoat, /obj/item/clothing/suit/storage/vest/hoscoat/jensen/alt, //VOREStation Add, /obj/item/clothing/head/helmet/dermal, - /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/belt/security, - /obj/item/device/flash, - /obj/item/device/hailer, + /obj/item/storage/belt/security, + /obj/item/flash, + /obj/item/hailer, /obj/item/clothing/accessory/badge/holo/hos, /obj/item/clothing/accessory/holster/waist, - /obj/item/weapon/melee/telebaton, - /obj/item/weapon/shield/riot/tele, + /obj/item/melee/telebaton, + /obj/item/shield/riot/tele, /obj/item/clothing/head/beret/sec/corporate/hos, - /obj/item/device/flashlight/maglight + /obj/item/flashlight/maglight ) cost = 50 containertype = /obj/structure/closet/crate/secure/nanotrasen @@ -604,8 +604,8 @@ /datum/supply_pack/security/securityclothing name = "Misc - Security uniform red" contains = list( - /obj/item/weapon/storage/backpack/satchel/sec = 2, - /obj/item/weapon/storage/backpack/security = 2, + /obj/item/storage/backpack/satchel/sec = 2, + /obj/item/storage/backpack/security = 2, /obj/item/clothing/accessory/armband = 4, /obj/item/clothing/under/rank/security = 4, /obj/item/clothing/under/rank/security2 = 4, @@ -613,7 +613,7 @@ /obj/item/clothing/under/rank/head_of_security, /obj/item/clothing/head/soft/sec = 4, /obj/item/clothing/gloves/black = 4, - /obj/item/weapon/storage/box/holobadge + /obj/item/storage/box/holobadge ) cost = 10 containertype = /obj/structure/closet/crate/secure/nanotrasen @@ -622,8 +622,8 @@ /datum/supply_pack/security/navybluesecurityclothing name = "Misc - Security uniform navy blue" contains = list( - /obj/item/weapon/storage/backpack/satchel/sec = 2, - /obj/item/weapon/storage/backpack/security = 2, + /obj/item/storage/backpack/satchel/sec = 2, + /obj/item/storage/backpack/security = 2, /obj/item/clothing/under/rank/security/navyblue = 4, /obj/item/clothing/suit/security/navyofficer = 4, /obj/item/clothing/under/rank/warden/navyblue, @@ -634,7 +634,7 @@ /obj/item/clothing/head/beret/sec/navy/warden, /obj/item/clothing/head/beret/sec/navy/hos, /obj/item/clothing/gloves/black = 4, - /obj/item/weapon/storage/box/holobadge + /obj/item/storage/box/holobadge ) cost = 10 containertype = /obj/structure/closet/crate/secure/nanotrasen @@ -643,8 +643,8 @@ /datum/supply_pack/security/corporatesecurityclothing name = "Misc - Security uniform corporate" contains = list( - /obj/item/weapon/storage/backpack/satchel/sec = 2, - /obj/item/weapon/storage/backpack/security = 2, + /obj/item/storage/backpack/satchel/sec = 2, + /obj/item/storage/backpack/security = 2, /obj/item/clothing/under/rank/security/corp = 4, /obj/item/clothing/head/soft/sec/corp = 4, /obj/item/clothing/under/rank/warden/corp, @@ -654,7 +654,7 @@ /obj/item/clothing/head/beret/sec/corporate/hos, /obj/item/clothing/under/det/corporate = 2, /obj/item/clothing/gloves/black = 4, - /obj/item/weapon/storage/box/holobadge + /obj/item/storage/box/holobadge ) cost = 10 containertype = /obj/structure/closet/crate/secure/nanotrasen @@ -668,9 +668,9 @@ /obj/item/clothing/suit/bio_suit/security = 3, /obj/item/clothing/shoes/white = 3, /obj/item/clothing/mask/gas = 3, - /obj/item/weapon/tank/oxygen = 3, + /obj/item/tank/oxygen = 3, /obj/item/clothing/gloves/sterile/latex, - /obj/item/weapon/storage/box/gloves + /obj/item/storage/box/gloves ) cost = 25 containertype = /obj/structure/closet/crate/secure/nanotrasen @@ -715,16 +715,16 @@ /obj/item/clothing/suit/bio_suit/security = 3, /obj/item/clothing/shoes/white = 3, /obj/item/clothing/mask/gas = 3, - /obj/item/weapon/tank/oxygen = 3, + /obj/item/tank/oxygen = 3, /obj/item/clothing/gloves/sterile/latex, - /obj/item/weapon/storage/box/gloves + /obj/item/storage/box/gloves ) cost = 40 /datum/supply_pack/security/trackingimplant name = "Implants - Tracking" contains = list( - /obj/item/weapon/storage/box/trackimp = 1 + /obj/item/storage/box/trackimp = 1 ) cost = 25 containertype = /obj/structure/closet/crate/secure @@ -734,7 +734,7 @@ /datum/supply_pack/security/chemicalimplant name = "Implants - Chemical" contains = list( - /obj/item/weapon/storage/box/chemimp = 1 + /obj/item/storage/box/chemimp = 1 ) cost = 25 containertype = /obj/structure/closet/crate/secure diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index 68cc235781e..0629a55d8ed 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -9,14 +9,14 @@ /datum/supply_pack/supply/food name = "Kitchen supply crate" contains = list( - /obj/item/weapon/reagent_containers/food/condiment/carton/flour = 6, - /obj/item/weapon/reagent_containers/food/drinks/milk = 3, - /obj/item/weapon/reagent_containers/food/drinks/soymilk = 2, - /obj/item/weapon/storage/fancy/egg_box = 2, - /obj/item/weapon/reagent_containers/food/snacks/tofu = 4, - /obj/item/weapon/reagent_containers/food/snacks/meat = 4, - /obj/item/weapon/reagent_containers/food/condiment/yeast = 3, - /obj/item/weapon/reagent_containers/food/condiment/sprinkles = 1 + /obj/item/reagent_containers/food/condiment/carton/flour = 6, + /obj/item/reagent_containers/food/drinks/milk = 3, + /obj/item/reagent_containers/food/drinks/soymilk = 2, + /obj/item/storage/fancy/egg_box = 2, + /obj/item/reagent_containers/food/snacks/tofu = 4, + /obj/item/reagent_containers/food/snacks/meat = 4, + /obj/item/reagent_containers/food/condiment/yeast = 3, + /obj/item/reagent_containers/food/condiment/sprinkles = 1 ) cost = 10 containertype = /obj/structure/closet/crate/freezer/centauri @@ -25,8 +25,8 @@ /datum/supply_pack/supply/fancyfood name = "Artisanal food delivery" contains = list( - /obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic = 6, - /obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic = 6 + /obj/item/reagent_containers/food/condiment/carton/flour/rustic = 6, + /obj/item/reagent_containers/food/condiment/carton/sugar/rustic = 6 ) cost = 25 containertype = /obj/structure/closet/crate/freezer/centauri @@ -35,7 +35,7 @@ /datum/supply_pack/supply/toner name = "Toner cartridges" - contains = list(/obj/item/device/toner = 6) + contains = list(/obj/item/toner = 6) cost = 10 containertype = /obj/structure/closet/crate/ummarcar containername = "Toner cartridges" @@ -43,20 +43,20 @@ /datum/supply_pack/supply/janitor name = "Janitorial supplies" contains = list( - /obj/item/weapon/reagent_containers/glass/bucket, - /obj/item/weapon/mop, + /obj/item/reagent_containers/glass/bucket, + /obj/item/mop, /obj/item/clothing/under/rank/janitor, - /obj/item/weapon/cartridge/janitor, + /obj/item/cartridge/janitor, /obj/item/clothing/gloves/black, /obj/item/clothing/head/soft/purple, - /obj/item/weapon/storage/belt/janitor, + /obj/item/storage/belt/janitor, /obj/item/clothing/shoes/galoshes, /obj/item/clothing/suit/caution = 4, - /obj/item/weapon/storage/bag/trash, - /obj/item/device/lightreplacer, - /obj/item/weapon/reagent_containers/spray/cleaner, - /obj/item/weapon/reagent_containers/glass/rag, - /obj/item/weapon/grenade/chem_grenade/cleaner = 3, + /obj/item/storage/bag/trash, + /obj/item/lightreplacer, + /obj/item/reagent_containers/spray/cleaner, + /obj/item/reagent_containers/glass/rag, + /obj/item/grenade/chem_grenade/cleaner = 3, /obj/item/clothing/glasses/hud/janitor, /obj/structure/mopbucket ) @@ -68,30 +68,30 @@ name = "Shipping supplies" contains = list( /obj/fiftyspawner/cardboard, - /obj/item/weapon/packageWrap = 4, - /obj/item/weapon/wrapping_paper = 2, - /obj/item/device/destTagger, - /obj/item/weapon/hand_labeler, - /obj/item/weapon/tool/wirecutters, - /obj/item/weapon/tape_roll = 2) + /obj/item/packageWrap = 4, + /obj/item/wrapping_paper = 2, + /obj/item/destTagger, + /obj/item/hand_labeler, + /obj/item/tool/wirecutters, + /obj/item/tape_roll = 2) cost = 10 containertype = /obj/structure/closet/crate/ummarcar containername = "Shipping supplies crate" /datum/supply_pack/supply/bureaucracy contains = list( - /obj/item/weapon/clipboard = 2, - /obj/item/weapon/pen/red, - /obj/item/weapon/pen/blue, - /obj/item/weapon/pen/blue, - /obj/item/device/camera_film, - /obj/item/weapon/folder/blue, - /obj/item/weapon/folder/red, - /obj/item/weapon/folder/yellow, - /obj/item/weapon/hand_labeler, - /obj/item/weapon/tape_roll, + /obj/item/clipboard = 2, + /obj/item/pen/red, + /obj/item/pen/blue, + /obj/item/pen/blue, + /obj/item/camera_film, + /obj/item/folder/blue, + /obj/item/folder/red, + /obj/item/folder/yellow, + /obj/item/hand_labeler, + /obj/item/tape_roll, /obj/structure/filingcabinet/chestdrawer{anchored = FALSE}, - /obj/item/weapon/paper_bin + /obj/item/paper_bin ) name = "Office supplies" cost = 15 @@ -110,24 +110,24 @@ cost = 10 containertype = /obj/structure/closet/crate/thinktronic containername = "Spare PDA crate" - contains = list(/obj/item/device/pda = 3) + contains = list(/obj/item/pda = 3) /datum/supply_pack/supply/minergear name = "Shaft miner equipment" contains = list( - /obj/item/weapon/storage/backpack/industrial, - /obj/item/weapon/storage/backpack/satchel/eng, + /obj/item/storage/backpack/industrial, + /obj/item/storage/backpack/satchel/eng, /obj/item/clothing/suit/storage/hooded/wintercoat/miner, - /obj/item/device/radio/headset/headset_cargo, + /obj/item/radio/headset/headset_cargo, /obj/item/clothing/under/rank/miner, /obj/item/clothing/gloves/black, /obj/item/clothing/shoes/black, - /obj/item/device/analyzer, - /obj/item/weapon/storage/bag/ore, - /obj/item/device/flashlight/lantern, - /obj/item/weapon/shovel, - /obj/item/weapon/pickaxe, - /obj/item/weapon/mining_scanner, + /obj/item/analyzer, + /obj/item/storage/bag/ore, + /obj/item/flashlight/lantern, + /obj/item/shovel, + /obj/item/pickaxe, + /obj/item/mining_scanner, /obj/item/clothing/glasses/material, /obj/item/clothing/glasses/meson ) @@ -159,21 +159,21 @@ /datum/supply_pack/explorergear name= JOB_EXPLORER + " gear" contains = list ( - /obj/item/device/cataloguer, - /obj/item/device/geiger, + /obj/item/cataloguer, + /obj/item/geiger, /obj/item/clothing/suit/storage/hooded/explorer, - /obj/item/device/flashlight/glowstick, - /obj/item/device/flashlight, + /obj/item/flashlight/glowstick, + /obj/item/flashlight, /obj/item/stack/marker_beacon/thirty, - /obj/item/weapon/storage/belt/explorer, + /obj/item/storage/belt/explorer, /obj/item/clothing/mask/gas/explorer, - /obj/item/weapon/cartridge/explorer, - /obj/item/device/gps/explorer, + /obj/item/cartridge/explorer, + /obj/item/gps/explorer, /obj/item/clothing/under/explorer, - /obj/item/device/radio/headset/explorer, + /obj/item/radio/headset/explorer, /obj/item/clothing/shoes/boots/winter/explorer, - /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/clothing/gloves/watch/survival ) @@ -185,21 +185,21 @@ /datum/supply_pack/pilotgear name= JOB_PILOT + " gear" contains = list ( - /obj/item/weapon/storage/backpack/parachute, - /obj/item/device/radio/headset/pilot, - /obj/item/device/radio/headset/pilot/alt, + /obj/item/storage/backpack/parachute, + /obj/item/radio/headset/pilot, + /obj/item/radio/headset/pilot/alt, /obj/item/clothing/mask/gas/half, - /obj/item/device/flashlight/glowstick, + /obj/item/flashlight/glowstick, /obj/item/stack/marker_beacon/thirty, - /obj/item/device/gps/explorer, + /obj/item/gps/explorer, /obj/item/clothing/gloves/fingerless, /obj/item/clothing/suit/storage/toggle/bomber/pilot, /obj/item/clothing/shoes/boots/winter/explorer, - /obj/item/device/flashlight, - /obj/item/weapon/material/knife/tacknife/survival, + /obj/item/flashlight, + /obj/item/material/knife/tacknife/survival, /obj/item/clothing/head/pilot_vr, /obj/item/clothing/under/rank/pilot1, - /obj/item/weapon/gun/energy/gun/protector/pilotgun/locked, + /obj/item/gun/energy/gun/protector/pilotgun/locked, /obj/item/clothing/gloves/watch/survival ) cost=20 @@ -218,24 +218,24 @@ /datum/supply_pack/pathfindergear name= JOB_PATHFINDER + " gear" contains = list ( - /obj/item/device/cataloguer/compact/pathfinder, - /obj/item/device/geiger, + /obj/item/cataloguer/compact/pathfinder, + /obj/item/geiger, /obj/item/clothing/suit/storage/hooded/explorer, - /obj/item/device/flashlight/glowstick, - /obj/item/device/flashlight, + /obj/item/flashlight/glowstick, + /obj/item/flashlight, /obj/item/stack/marker_beacon/thirty, - /obj/item/weapon/storage/belt/explorer/pathfinder, + /obj/item/storage/belt/explorer/pathfinder, /obj/item/clothing/mask/gas/explorer, - /obj/item/weapon/cartridge/explorer, - /obj/item/device/gps/explorer, + /obj/item/cartridge/explorer, + /obj/item/gps/explorer, /obj/item/clothing/under/explorer, - /obj/item/device/radio/headset/pathfinder, + /obj/item/radio/headset/pathfinder, /obj/item/clothing/shoes/boots/winter/explorer, - /obj/item/weapon/material/knife/tacknife/survival, - /obj/item/weapon/material/knife/machete/deluxe, + /obj/item/material/knife/tacknife/survival, + /obj/item/material/knife/machete/deluxe, /obj/item/clothing/accessory/holster/machete, - /obj/item/weapon/storage/box/explorerkeys, - /obj/item/device/mapping_unit, + /obj/item/storage/box/explorerkeys, + /obj/item/mapping_unit, /obj/item/clothing/gloves/watch/survival ) cost = 75 diff --git a/code/datums/supplypacks/vending_refills.dm b/code/datums/supplypacks/vending_refills.dm index 06119f2d4f2..e8cf8aa88bf 100644 --- a/code/datums/supplypacks/vending_refills.dm +++ b/code/datums/supplypacks/vending_refills.dm @@ -9,122 +9,122 @@ containername = "vendor refill cartridge crate" /datum/supply_pack/vending_refills/snack - contains = list(/obj/item/weapon/refill_cartridge/autoname/food/snack) + contains = list(/obj/item/refill_cartridge/autoname/food/snack) name = "Getmore Chocolate Corp Vendor Refill Cartridge" cost = 10 /datum/supply_pack/vending_refills/fitness - contains = list(/obj/item/weapon/refill_cartridge/autoname/food/fitness) + contains = list(/obj/item/refill_cartridge/autoname/food/fitness) name = "SweatMAX Vendor Refill Cartridge" cost = 10 /datum/supply_pack/vending_refills/weeb - contains = list(/obj/item/weapon/refill_cartridge/autoname/food/weeb) + contains = list(/obj/item/refill_cartridge/autoname/food/weeb) name = "Nippon-tan Vendor Refill Cartridge" cost = 10 /datum/supply_pack/vending_refills/sol - contains = list(/obj/item/weapon/refill_cartridge/autoname/food/sol) + contains = list(/obj/item/refill_cartridge/autoname/food/sol) name = "Sol-Snacks Vendor Refill Cartridge" cost = 10 /datum/supply_pack/vending_refills/snix - contains = list(/obj/item/weapon/refill_cartridge/autoname/food/snix) + contains = list(/obj/item/refill_cartridge/autoname/food/snix) name = "Snix Vendor Refill Cartridge" cost = 10 /datum/supply_pack/vending_refills/snlvend - contains = list(/obj/item/weapon/refill_cartridge/autoname/food/snlvend) + contains = list(/obj/item/refill_cartridge/autoname/food/snlvend) name = "Shop-n-Large Snacks Vendor Refill Cartridge" cost = 10 /datum/supply_pack/vending_refills/sovietvend - contains = list(/obj/item/weapon/refill_cartridge/autoname/food/sovietvend) + contains = list(/obj/item/refill_cartridge/autoname/food/sovietvend) name = "Ration Station Vendor Refill Cartridge" cost = 10 /datum/supply_pack/vending_refills/altevian - contains = list(/obj/item/weapon/refill_cartridge/autoname/food/altevian) + contains = list(/obj/item/refill_cartridge/autoname/food/altevian) name = "Altevian Vendor Refill Cartridge" cost = 10 /datum/supply_pack/vending_refills/coffee - contains = list(/obj/item/weapon/refill_cartridge/autoname/drink/coffee) + contains = list(/obj/item/refill_cartridge/autoname/drink/coffee) name = "Hot Drinks Vendor Refill Cartridge" cost = 10 /datum/supply_pack/vending_refills/cola - contains = list(/obj/item/weapon/refill_cartridge/autoname/drink/cola) + contains = list(/obj/item/refill_cartridge/autoname/drink/cola) name = "Robust Softdrinks Vendor Refill Cartridge" cost = 10 /datum/supply_pack/vending_refills/sovietsoda - contains = list(/obj/item/weapon/refill_cartridge/autoname/drink/sovietsoda) + contains = list(/obj/item/refill_cartridge/autoname/drink/sovietsoda) name = "BODA Vendor Refill Cartridge" cost = 10 /datum/supply_pack/vending_refills/bepis - contains = list(/obj/item/weapon/refill_cartridge/autoname/drink/bepis) + contains = list(/obj/item/refill_cartridge/autoname/drink/bepis) name = "Bepis Softdrinks Vendor Refill Cartridge" cost = 10 /datum/supply_pack/vending_refills/cigarette - contains = list(/obj/item/weapon/refill_cartridge/autoname/cigarette) + contains = list(/obj/item/refill_cartridge/autoname/cigarette) name = "Cigarette Vendor Refill Cartridge" cost = 15 /datum/supply_pack/vending_refills/wardrobe - contains = list(/obj/item/weapon/refill_cartridge/multitype/wardrobe) + contains = list(/obj/item/refill_cartridge/multitype/wardrobe) name = "Wardrobe Vendor Refill Cartridge" cost = 10 /datum/supply_pack/vending_refills/giftvendor - contains = list(/obj/item/weapon/refill_cartridge/autoname/giftvendor) + contains = list(/obj/item/refill_cartridge/autoname/giftvendor) name = "AlliCo Baubles and Confectionaries Vendor Refill Cartridge" cost = 20 /datum/supply_pack/vending_refills/general_food - contains = list(/obj/item/weapon/refill_cartridge/multitype/food = 5) + contains = list(/obj/item/refill_cartridge/multitype/food = 5) name = "5-Pack Food Vendor Refill Cartridges" cost = 75 /datum/supply_pack/vending_refills/general_drink - contains = list(/obj/item/weapon/refill_cartridge/multitype/drink = 5) + contains = list(/obj/item/refill_cartridge/multitype/drink = 5) name = "5-Pack Drink Vendor Refill Cartridges" cost = 75 /datum/supply_pack/vending_refills/general_clothing - contains = list(/obj/item/weapon/refill_cartridge/multitype/clothing = 5) + contains = list(/obj/item/refill_cartridge/multitype/clothing = 5) name = "5-Pack Clothing Vendor Refill Cartridges" cost = 75 /datum/supply_pack/vending_refills/general_technical - contains = list(/obj/item/weapon/refill_cartridge/multitype/technical = 5) + contains = list(/obj/item/refill_cartridge/multitype/technical = 5) name = "5-Pack Technical Vendor Refill Cartridges" cost = 75 /datum/supply_pack/vending_refills/general_specialty - contains = list(/obj/item/weapon/refill_cartridge/multitype/specialty = 5) + contains = list(/obj/item/refill_cartridge/multitype/specialty = 5) name = "5-Pack Specialty Vendor Refill Cartridges" cost = 150 /datum/supply_pack/randomised/vending_refills/value_pack // 5 random vendor-specific cartridges at lower average price. But why? num_contained = 5 - contains = list(/obj/item/weapon/refill_cartridge/autoname/food/snack, - /obj/item/weapon/refill_cartridge/autoname/food/fitness, - /obj/item/weapon/refill_cartridge/autoname/food/weeb, - /obj/item/weapon/refill_cartridge/autoname/food/sol, - /obj/item/weapon/refill_cartridge/autoname/food/snix, - /obj/item/weapon/refill_cartridge/autoname/food/snlvend, - /obj/item/weapon/refill_cartridge/autoname/food/sovietvend, - /obj/item/weapon/refill_cartridge/autoname/drink/coffee, - /obj/item/weapon/refill_cartridge/autoname/drink/cola, - /obj/item/weapon/refill_cartridge/autoname/drink/sovietsoda, - /obj/item/weapon/refill_cartridge/autoname/drink/bepis, - /obj/item/weapon/refill_cartridge/autoname/cigarette, - /obj/item/weapon/refill_cartridge/multitype/wardrobe, - /obj/item/weapon/refill_cartridge/autoname/technical/assist, - /obj/item/weapon/refill_cartridge/autoname/technical/tool, - /obj/item/weapon/refill_cartridge/autoname/giftvendor) + contains = list(/obj/item/refill_cartridge/autoname/food/snack, + /obj/item/refill_cartridge/autoname/food/fitness, + /obj/item/refill_cartridge/autoname/food/weeb, + /obj/item/refill_cartridge/autoname/food/sol, + /obj/item/refill_cartridge/autoname/food/snix, + /obj/item/refill_cartridge/autoname/food/snlvend, + /obj/item/refill_cartridge/autoname/food/sovietvend, + /obj/item/refill_cartridge/autoname/drink/coffee, + /obj/item/refill_cartridge/autoname/drink/cola, + /obj/item/refill_cartridge/autoname/drink/sovietsoda, + /obj/item/refill_cartridge/autoname/drink/bepis, + /obj/item/refill_cartridge/autoname/cigarette, + /obj/item/refill_cartridge/multitype/wardrobe, + /obj/item/refill_cartridge/autoname/technical/assist, + /obj/item/refill_cartridge/autoname/technical/tool, + /obj/item/refill_cartridge/autoname/giftvendor) name = "5-pack Extra-Cheap Vendor Refill Cartridges" cost = 35 \ No newline at end of file diff --git a/code/datums/supplypacks/voidsuits.dm b/code/datums/supplypacks/voidsuits.dm index d0dcfc29279..d61272fc603 100644 --- a/code/datums/supplypacks/voidsuits.dm +++ b/code/datums/supplypacks/voidsuits.dm @@ -14,7 +14,7 @@ /obj/item/clothing/head/helmet/space/void/atmos = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2, + /obj/item/tank/oxygen = 2, ) cost = 35 containertype = /obj/structure/closet/crate/secure/aether @@ -28,7 +28,7 @@ /obj/item/clothing/head/helmet/space/void/atmos/alt = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2, + /obj/item/tank/oxygen = 2, ) cost = 60 containertype = /obj/structure/closet/crate/secure/aether @@ -42,7 +42,7 @@ /obj/item/clothing/head/helmet/space/void/engineering = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2 + /obj/item/tank/oxygen = 2 ) cost = 35 containertype = /obj/structure/closet/crate/secure/xion @@ -56,7 +56,7 @@ /obj/item/clothing/head/helmet/space/void/engineering/construction = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2 + /obj/item/tank/oxygen = 2 ) cost = 35 containertype = /obj/structure/closet/crate/secure/xion @@ -70,7 +70,7 @@ /obj/item/clothing/head/helmet/space/void/engineering/hazmat = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2 + /obj/item/tank/oxygen = 2 ) cost = 35 containertype = /obj/structure/closet/crate/secure/xion @@ -84,7 +84,7 @@ /obj/item/clothing/head/helmet/space/void/engineering/alt = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2 + /obj/item/tank/oxygen = 2 ) cost = 60 containertype = /obj/structure/closet/crate/secure/xion @@ -98,7 +98,7 @@ /obj/item/clothing/head/helmet/space/void/medical = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2 + /obj/item/tank/oxygen = 2 ) cost = 35 containertype = /obj/structure/closet/crate/secure/veymed @@ -112,7 +112,7 @@ /obj/item/clothing/head/helmet/space/void/medical/emt = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2 + /obj/item/tank/oxygen = 2 ) cost = 35 containertype = /obj/structure/closet/crate/secure/veymed @@ -126,7 +126,7 @@ /obj/item/clothing/head/helmet/space/void/medical/bio = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2 + /obj/item/tank/oxygen = 2 ) cost = 35 containertype = /obj/structure/closet/crate/secure/nanomed @@ -140,7 +140,7 @@ /obj/item/clothing/head/helmet/space/void/medical/alt = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2 + /obj/item/tank/oxygen = 2 ) cost = 60 containertype = /obj/structure/closet/crate/secure/veymed @@ -154,7 +154,7 @@ /obj/item/clothing/head/helmet/space/void/medical/alt/tesh = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2 + /obj/item/tank/oxygen = 2 ) containername = "Vey-Med Autoadaptive voidsuit (teshari) crate" @@ -165,7 +165,7 @@ /obj/item/clothing/head/helmet/space/void/security = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2 + /obj/item/tank/oxygen = 2 ) cost = 35 containertype = /obj/structure/closet/crate/secure/heph @@ -178,7 +178,7 @@ /obj/item/clothing/head/helmet/space/void/security/riot = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2 + /obj/item/tank/oxygen = 2 ) cost = 60 containertype = /obj/structure/closet/crate/secure/heph @@ -192,7 +192,7 @@ /obj/item/clothing/head/helmet/space/void/security/alt = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2 + /obj/item/tank/oxygen = 2 ) cost = 60 containertype = /obj/structure/closet/crate/secure/heph @@ -205,7 +205,7 @@ /obj/item/clothing/suit/space/void/mining = 2, /obj/item/clothing/head/helmet/space/void/mining = 2, /obj/item/clothing/mask/breath = 2, - /obj/item/weapon/tank/oxygen = 2 + /obj/item/tank/oxygen = 2 ) cost = 35 containertype = /obj/structure/closet/crate/secure/xion @@ -218,7 +218,7 @@ /obj/item/clothing/suit/space/void/mining/alt = 2, /obj/item/clothing/head/helmet/space/void/mining/alt = 2, /obj/item/clothing/mask/breath = 2, - /obj/item/weapon/tank/oxygen = 2 + /obj/item/tank/oxygen = 2 ) cost = 60 containertype = /obj/structure/closet/crate/secure/grayson @@ -243,7 +243,7 @@ /obj/item/clothing/head/helmet/space/void/exploration = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2 + /obj/item/tank/oxygen = 2 ) cost = 45 containertype = /obj/structure/closet/crate/secure @@ -257,7 +257,7 @@ /obj/item/clothing/head/helmet/space/void/exploration = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/shoes/magboots = 2, - /obj/item/weapon/tank/oxygen = 2 + /obj/item/tank/oxygen = 2 ) cost = 45 containertype = /obj/structure/closet/crate/secure @@ -271,7 +271,7 @@ /obj/item/clothing/head/helmet/space/void/pilot = 1, /obj/item/clothing/mask/breath = 1, /obj/item/clothing/shoes/magboots = 1, - /obj/item/weapon/tank/oxygen = 1 + /obj/item/tank/oxygen = 1 ) cost = 20 containertype = /obj/structure/closet/crate/secure @@ -383,7 +383,7 @@ contains = list( /obj/item/clothing/suit/space/void/salvagecorp_shipbreaker, /obj/item/clothing/head/helmet/space/void/salvagecorp_shipbreaker, - /obj/item/weapon/tank/jetpack/breaker + /obj/item/tank/jetpack/breaker ) cost = 100 containertype = /obj/structure/closet/crate/coyote_salvage diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm index 8a749250b66..76b5d440635 100644 --- a/code/datums/uplink/ammunition.dm +++ b/code/datums/uplink/ammunition.dm @@ -130,4 +130,4 @@ /datum/uplink_item/item/ammo/cell name = "weapon cell" - path = /obj/item/weapon/cell/device/weapon \ No newline at end of file + path = /obj/item/cell/device/weapon \ No newline at end of file diff --git a/code/datums/uplink/ammunition_vr.dm b/code/datums/uplink/ammunition_vr.dm index 2783710f7eb..a9c722b3573 100644 --- a/code/datums/uplink/ammunition_vr.dm +++ b/code/datums/uplink/ammunition_vr.dm @@ -7,22 +7,22 @@ /datum/uplink_item/item/ammo/cell/box name = "Weapon cell box" - path = /obj/item/weapon/storage/box/weapon_cells + path = /obj/item/storage/box/weapon_cells item_cost = 70 /datum/uplink_item/item/ammo/highcell name = "High capacity cell" - path = /obj/item/weapon/cell/high + path = /obj/item/cell/high item_cost = 15 /datum/uplink_item/item/ammo/supercell name = "Super capacity cell" - path = /obj/item/weapon/cell/super + path = /obj/item/cell/super item_cost = 30 /datum/uplink_item/item/ammo/voidcell name = "Void cell" - path = /obj/item/weapon/cell/device/weapon/recharge/alien/hybrid + path = /obj/item/cell/device/weapon/recharge/alien/hybrid item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 1.5 antag_roles = list("ert") blacklisted = 1 diff --git a/code/datums/uplink/announcements.dm b/code/datums/uplink/announcements.dm index 5bc7dde793c..12330db3b80 100644 --- a/code/datums/uplink/announcements.dm +++ b/code/datums/uplink/announcements.dm @@ -5,7 +5,7 @@ category = /datum/uplink_category/services blacklisted = 1 -/datum/uplink_item/abstract/announcements/buy(var/obj/item/device/uplink/U, var/mob/user) +/datum/uplink_item/abstract/announcements/buy(var/obj/item/uplink/U, var/mob/user) . = ..() if(.) log_and_message_admins("has triggered a falsified [src]", user) @@ -24,7 +24,7 @@ return return list("title" = title, "message" = message) -/datum/uplink_item/abstract/announcements/fake_centcom/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/user, var/list/args) +/datum/uplink_item/abstract/announcements/fake_centcom/get_goods(var/obj/item/uplink/U, var/loc, var/mob/user, var/list/args) post_comm_message(args["title"], replacetext(args["message"], "\n", "
")) command_announcement.Announce(args["message"], args["title"]) return 1 @@ -34,11 +34,11 @@ desc = "Creates a fake crew arrival announcement as well as fake crew records, using your current appearance (including held items!) and worn id card. Trigger with care!" item_cost = 15 -/datum/uplink_item/abstract/announcements/fake_crew_arrival/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/user, var/list/args) +/datum/uplink_item/abstract/announcements/fake_crew_arrival/get_goods(var/obj/item/uplink/U, var/loc, var/mob/user, var/list/args) if(!user) return 0 - var/obj/item/weapon/card/id/I = user.GetIdCard() + var/obj/item/card/id/I = user.GetIdCard() var/datum/data/record/random_general_record var/datum/data/record/random_medical_record if(data_core.general.len) @@ -93,7 +93,7 @@ desc = "Interferes with the station's ion sensors. Triggers immediately upon investment." item_cost = 10 -/datum/uplink_item/abstract/announcements/fake_ion_storm/get_goods(var/obj/item/device/uplink/U, var/loc) +/datum/uplink_item/abstract/announcements/fake_ion_storm/get_goods(var/obj/item/uplink/U, var/loc) ion_storm_announcement() return 1 @@ -102,7 +102,7 @@ desc = "Interferes with the station's radiation sensors. Triggers immediately upon investment." item_cost = 15 -/datum/uplink_item/abstract/announcements/fake_radiation/get_goods(var/obj/item/device/uplink/U, var/loc) +/datum/uplink_item/abstract/announcements/fake_radiation/get_goods(var/obj/item/uplink/U, var/loc) var/datum/event_meta/EM = new(EVENT_LEVEL_MUNDANE, "Fake Radiation Storm", add_to_queue = 0) new/datum/event/radiation_storm/syndicate(EM) return 1 diff --git a/code/datums/uplink/armor.dm b/code/datums/uplink/armor.dm index 362aec5d92b..c82ba17b43f 100644 --- a/code/datums/uplink/armor.dm +++ b/code/datums/uplink/armor.dm @@ -7,7 +7,7 @@ /datum/uplink_item/item/armor/combat name = "Combat Armor Set" item_cost = 30 - path = /obj/item/weapon/storage/box/syndie_kit/combat_armor + path = /obj/item/storage/box/syndie_kit/combat_armor /datum/uplink_item/item/armor/heavy_vest name = "Heavy Armor Vest" @@ -17,12 +17,12 @@ /datum/uplink_item/item/armor/gorlexsuit name = "Mercenary Voidsuit" item_cost = 20 - path = /obj/item/weapon/storage/box/syndie_kit/voidsuit + path = /obj/item/storage/box/syndie_kit/voidsuit /datum/uplink_item/item/armor/gorlexsuit_fire name = "Mercenary Voidsuit (Fire)" item_cost = 20 - path = /obj/item/weapon/storage/box/syndie_kit/voidsuit/fire + path = /obj/item/storage/box/syndie_kit/voidsuit/fire /datum/uplink_item/item/armor/combat name = "Combat Platecarrier Set" diff --git a/code/datums/uplink/backup.dm b/code/datums/uplink/backup.dm index 3e21676da3b..d85d67aa057 100644 --- a/code/datums/uplink/backup.dm +++ b/code/datums/uplink/backup.dm @@ -12,7 +12,7 @@ a stunbaton, handcuffs, an agent ID, energy sword, pinpointer, and a jetpack." item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 1.5 antag_roles = list("mercenary", "ert") //VOREStation Edit - path = /obj/item/weapon/antag_spawner/syndicate_drone/protector + path = /obj/item/antag_spawner/syndicate_drone/protector /datum/uplink_item/item/backup/syndicate_drone_combat_medic name = "Drone (Combat Medic)" @@ -22,7 +22,7 @@ sword, pinpointer, and a jetpack." item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 1.5 antag_roles = list("mercenary", "ert") //VOREStation Edit - path = /obj/item/weapon/antag_spawner/syndicate_drone/combat_medic + path = /obj/item/antag_spawner/syndicate_drone/combat_medic /datum/uplink_item/item/backup/syndicate_drone_mechanist name = "Drone (Mechanist)" @@ -32,4 +32,4 @@ a set of construction materials, an ionic rapier, an agent ID, energy sword, pinpointer, and a jetpack." item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 1.5 antag_roles = list("mercenary", "ert") //VOREStation Edit - path = /obj/item/weapon/antag_spawner/syndicate_drone/mechanist \ No newline at end of file + path = /obj/item/antag_spawner/syndicate_drone/mechanist \ No newline at end of file diff --git a/code/datums/uplink/badassery.dm b/code/datums/uplink/badassery.dm index 2541bac5045..c6c597918d9 100644 --- a/code/datums/uplink/badassery.dm +++ b/code/datums/uplink/badassery.dm @@ -21,21 +21,21 @@ name = "Random Item" desc = "Buys you one random item." -/datum/uplink_item/item/badassery/random_one/buy(var/obj/item/device/uplink/U, var/mob/user) +/datum/uplink_item/item/badassery/random_one/buy(var/obj/item/uplink/U, var/mob/user) var/datum/uplink_item/item = default_uplink_selection.get_random_item((user ? user.mind.tcrystals : DEFAULT_TELECRYSTAL_AMOUNT), U) return item.buy(U, user) -/datum/uplink_item/item/badassery/random_one/can_buy(var/obj/item/device/uplink/U, var/telecrystals) +/datum/uplink_item/item/badassery/random_one/can_buy(var/obj/item/uplink/U, var/telecrystals) return default_uplink_selection.get_random_item(telecrystals, U) != null /datum/uplink_item/item/badassery/random_many name = "Random Items" desc = "Buys you as many random items you can afford. Convenient packaging NOT included." -/datum/uplink_item/item/badassery/random_many/cost(obj/item/device/uplink/U, var/telecrystals) +/datum/uplink_item/item/badassery/random_many/cost(obj/item/uplink/U, var/telecrystals) return max(1, telecrystals) -/datum/uplink_item/item/badassery/random_many/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/M) +/datum/uplink_item/item/badassery/random_many/get_goods(var/obj/item/uplink/U, var/loc, var/mob/M) var/list/bought_items = list() for(var/datum/uplink_item/UI in get_random_uplink_items(U, M.mind.tcrystals, loc)) UI.purchase_log(U) @@ -45,7 +45,7 @@ return bought_items -/datum/uplink_item/item/badassery/random_many/purchase_log(obj/item/device/uplink/U) +/datum/uplink_item/item/badassery/random_many/purchase_log(obj/item/uplink/U) feedback_add_details("traitor_uplink_items_bought", "[src]") log_and_message_admins("used \the [U.loc] to buy \a [src] at random") @@ -77,7 +77,7 @@ ..() desc = "A crate containing [item_worth] telecrystal\s worth of surplus leftovers." -/datum/uplink_item/item/badassery/surplus/get_goods(var/obj/item/device/uplink/U, var/loc) +/datum/uplink_item/item/badassery/surplus/get_goods(var/obj/item/uplink/U, var/loc) var/obj/structure/largecrate/C = new(loc) var/random_items = get_surplus_items(null, item_worth, C) for(var/datum/uplink_item/I in random_items) diff --git a/code/datums/uplink/grenades.dm b/code/datums/uplink/grenades.dm index 851a9043a68..3e70d652c56 100644 --- a/code/datums/uplink/grenades.dm +++ b/code/datums/uplink/grenades.dm @@ -7,62 +7,62 @@ /datum/uplink_item/item/grenades/anti_photon name = "7xPhoton Disruption Grenades" item_cost = 10 - path = /obj/item/weapon/storage/box/anti_photons + path = /obj/item/storage/box/anti_photons /datum/uplink_item/item/grenades/anti_photon_singular name = "1xPhoton Disruption Grenade" item_cost = 2 - path = /obj/item/weapon/grenade/anti_photon + path = /obj/item/grenade/anti_photon /datum/uplink_item/item/grenades/metalfoam name = "7xMetal Foam Grenades" item_cost = 10 - path = /obj/item/weapon/storage/box/metalfoam + path = /obj/item/storage/box/metalfoam /datum/uplink_item/item/grenades/metalfoam_singular name = "1xMetal Foam Grenade" item_cost = 2 - path = /obj/item/weapon/grenade/chem_grenade/metalfoam + path = /obj/item/grenade/chem_grenade/metalfoam /datum/uplink_item/item/grenades/smoke name = "7xSmoke Grenades" item_cost = 10 - path = /obj/item/weapon/storage/box/smokes + path = /obj/item/storage/box/smokes /datum/uplink_item/item/grenades/smoke_singular name = "1xSmoke Grenade" item_cost = 2 - path = /obj/item/weapon/grenade/smokebomb + path = /obj/item/grenade/smokebomb /datum/uplink_item/item/grenades/emp name = "7xEMP Grenades" item_cost = 50 - path = /obj/item/weapon/storage/box/emps + path = /obj/item/storage/box/emps /datum/uplink_item/item/grenades/emp_singular name = "1xEMP Grenade" item_cost = 10 - path = /obj/item/weapon/grenade/empgrenade + path = /obj/item/grenade/empgrenade /datum/uplink_item/item/grenades/frags name = "7xFrag Grenades" item_cost = 80 - path = /obj/item/weapon/storage/box/frags + path = /obj/item/storage/box/frags /datum/uplink_item/item/grenades/frags_half name = "4x Frag Grenade" item_cost = 50 - path = /obj/item/weapon/storage/box/frags_half_box + path = /obj/item/storage/box/frags_half_box /datum/uplink_item/item/grenades/frags_singular name = "1x Frag Grenade" item_cost = 15 - path = /obj/item/weapon/grenade/explosive + path = /obj/item/grenade/explosive /datum/uplink_item/item/grenades/flashbangs name = "7xFlashbangs" item_cost = 40 - path = /obj/item/weapon/storage/box/flashbangs + path = /obj/item/storage/box/flashbangs /datum/uplink_item/item/grenades/flashbangs_singular name = "1xFlashbang" diff --git a/code/datums/uplink/hardsuit_modules.dm b/code/datums/uplink/hardsuit_modules.dm index c58ae6c19f6..5ebc6c9a106 100644 --- a/code/datums/uplink/hardsuit_modules.dm +++ b/code/datums/uplink/hardsuit_modules.dm @@ -23,7 +23,7 @@ /datum/uplink_item/item/hardsuit_modules/ewar_voice name = "Electrowarfare Suite and Voice Synthesiser" item_cost = 30 - path = /obj/item/weapon/storage/box/syndie_kit/ewar_voice + path = /obj/item/storage/box/syndie_kit/ewar_voice /datum/uplink_item/item/hardsuit_modules/maneuvering_jets name = "Maneuvering Jets" diff --git a/code/datums/uplink/implants.dm b/code/datums/uplink/implants.dm index d1bb93acdcc..f9fa30a9800 100644 --- a/code/datums/uplink/implants.dm +++ b/code/datums/uplink/implants.dm @@ -7,79 +7,79 @@ /datum/uplink_item/item/implants/imp_freedom name = "Freedom Implant" item_cost = 30 - path = /obj/item/weapon/storage/box/syndie_kit/imp_freedom + path = /obj/item/storage/box/syndie_kit/imp_freedom /datum/uplink_item/item/implants/imp_compress name = "Compressed Matter Implant" item_cost = 30 - path = /obj/item/weapon/storage/box/syndie_kit/imp_compress + path = /obj/item/storage/box/syndie_kit/imp_compress /datum/uplink_item/item/implants/imp_explosive name = "Explosive Implant (DANGER!)" item_cost = 60 - path = /obj/item/weapon/storage/box/syndie_kit/imp_explosive + path = /obj/item/storage/box/syndie_kit/imp_explosive /datum/uplink_item/item/implants/imp_uplink name = "Uplink Implant" //Original name: "Uplink Implant (Contains 5 Telecrystals)" item_cost = 50 //Original cost: 10 - path = /obj/item/weapon/storage/box/syndie_kit/imp_uplink + path = /obj/item/storage/box/syndie_kit/imp_uplink /datum/uplink_item/item/implants/imp_shades name = "Integrated Thermal-Shades Implant" item_cost = 80 - path = /obj/item/weapon/storage/box/syndie_kit/imp_aug + path = /obj/item/storage/box/syndie_kit/imp_aug /datum/uplink_item/item/implants/imp_taser name = "Integrated Taser Implant" item_cost = 30 - path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/taser + path = /obj/item/storage/box/syndie_kit/imp_aug/taser /datum/uplink_item/item/implants/imp_laser name = "Integrated Laser Implant" item_cost = 50 - path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/laser + path = /obj/item/storage/box/syndie_kit/imp_aug/laser /datum/uplink_item/item/implants/imp_dart name = "Integrated Dart Implant" item_cost = 60 - path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/dart + path = /obj/item/storage/box/syndie_kit/imp_aug/dart /datum/uplink_item/item/implants/imp_toolkit name = "Integrated Toolkit Implant" item_cost = 80 - path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/toolkit + path = /obj/item/storage/box/syndie_kit/imp_aug/toolkit /datum/uplink_item/item/implants/imp_medkit name = "Integrated Medkit Implant" item_cost = 60 - path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/medkit + path = /obj/item/storage/box/syndie_kit/imp_aug/medkit /datum/uplink_item/item/implants/imp_analyzer name = "Integrated Research Scanner Implant" item_cost = 20 - path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/analyzer + path = /obj/item/storage/box/syndie_kit/imp_aug/analyzer /datum/uplink_item/item/implants/imp_sword name = "Integrated Sword Implant" item_cost = 40 - path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/sword + path = /obj/item/storage/box/syndie_kit/imp_aug/sword /datum/uplink_item/item/implants/imp_sprinter name = "Integrated Sprinter Implant" item_cost = 40 - path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/sprinter + path = /obj/item/storage/box/syndie_kit/imp_aug/sprinter /datum/uplink_item/item/implants/imp_sprinter name = "Integrated Surge Implant" item_cost = 40 - path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/surge + path = /obj/item/storage/box/syndie_kit/imp_aug/surge /datum/uplink_item/item/implants/imp_armblade name = "Integrated Armblade Implant" item_cost = 40 - path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/armblade + path = /obj/item/storage/box/syndie_kit/imp_aug/armblade /datum/uplink_item/item/implants/imp_handblade name = "Integrated Handblade Implant" item_cost = 25 - path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/handblade + path = /obj/item/storage/box/syndie_kit/imp_aug/handblade diff --git a/code/datums/uplink/medical.dm b/code/datums/uplink/medical.dm index c1ff848877e..01639c4113e 100644 --- a/code/datums/uplink/medical.dm +++ b/code/datums/uplink/medical.dm @@ -7,107 +7,107 @@ /datum/uplink_item/item/medical/onegativeblood name = "O- Blood Pack" item_cost = 1 - path = /obj/item/weapon/reagent_containers/blood/OMinus + path = /obj/item/reagent_containers/blood/OMinus /datum/uplink_item/item/medical/sinpockets name = "Box of Sin-Pockets" item_cost = 1 - path = /obj/item/weapon/storage/box/sinpockets + path = /obj/item/storage/box/sinpockets /datum/uplink_item/item/medical/ambrosiaseeds name = "Box of 7x ambrosia seed packets" item_cost = 1 - path = /obj/item/weapon/storage/box/ambrosia + path = /obj/item/storage/box/ambrosia /datum/uplink_item/item/medical/clotting name = "Clotting Medicine injector" item_cost = 5 - path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting + path = /obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting /datum/uplink_item/item/medical/clotting_case name = "Clotting Medicine case" item_cost = 10 desc = "A case of three myelamine injectors. Can rapidly remove and stow up to six injectors." - path = /obj/item/weapon/storage/quickdraw/syringe_case/clotting + path = /obj/item/storage/quickdraw/syringe_case/clotting /datum/uplink_item/item/medical/bonemeds name = "Bone Repair injector" item_cost = 5 - path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed + path = /obj/item/reagent_containers/hypospray/autoinjector/bonemed /datum/uplink_item/item/medical/clonemeds name = "Clone injector" item_cost = 5 - path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed + path = /obj/item/reagent_containers/hypospray/autoinjector/clonemed /datum/uplink_item/item/medical/bonemeds_case name = "Bone Repair case" item_cost = 10 desc = "A case of three osteodaxon injectors. Can rapidly remove and stow up to six injectors." - path = /obj/item/weapon/storage/quickdraw/syringe_case/bonemed + path = /obj/item/storage/quickdraw/syringe_case/bonemed /datum/uplink_item/item/medical/clonemeds_case name = "Clone case" item_cost = 10 desc = "A case of three rezadone injectors. Can rapidly remove and stow up to six injectors." - path = /obj/item/weapon/storage/quickdraw/syringe_case/clonemed + path = /obj/item/storage/quickdraw/syringe_case/clonemed /datum/uplink_item/item/medical/ambrosiadeusseeds name = "Box of 7x ambrosia deus seed packets" item_cost = 5 - path = /obj/item/weapon/storage/box/ambrosiadeus + path = /obj/item/storage/box/ambrosiadeus /datum/uplink_item/item/medical/freezer name = "Portable Freezer" item_cost = 1 - path = /obj/item/weapon/storage/box/freezer + path = /obj/item/storage/box/freezer /datum/uplink_item/item/medical/monkeycubes name = "Box, Monkey Cubes" item_cost = 1 - path = /obj/item/weapon/storage/box/monkeycubes + path = /obj/item/storage/box/monkeycubes /datum/uplink_item/item/medical/farwacubes name = "Box, Farwa Cubes" item_cost = 1 - path = /obj/item/weapon/storage/box/monkeycubes + path = /obj/item/storage/box/monkeycubes /datum/uplink_item/item/medical/neaeracubes name = "Box, Neaera Cubes" item_cost = 1 - path = /obj/item/weapon/storage/box/monkeycubes/neaeracubes + path = /obj/item/storage/box/monkeycubes/neaeracubes /datum/uplink_item/item/medical/stokcubes name = "Box, Stok Cubes" item_cost = 1 - path = /obj/item/weapon/storage/box/monkeycubes/stokcubes + path = /obj/item/storage/box/monkeycubes/stokcubes /datum/uplink_item/item/medical/surgery name = "Surgery kit" item_cost = 5 - path = /obj/item/weapon/storage/firstaid/surgery + path = /obj/item/storage/firstaid/surgery /datum/uplink_item/item/medical/toxins name = "Anti-toxins medical kit" item_cost = 5 - path = /obj/item/weapon/storage/firstaid/toxin + path = /obj/item/storage/firstaid/toxin /datum/uplink_item/item/medical/o2 name = "oxygen deprivation medical kit" item_cost = 5 - path = /obj/item/weapon/storage/firstaid/o2 + path = /obj/item/storage/firstaid/o2 /datum/uplink_item/item/medical/fire name = "fire medical kit" item_cost = 5 - path = /obj/item/weapon/storage/firstaid/fire + path = /obj/item/storage/firstaid/fire /datum/uplink_item/item/medical/adv name = "advanced medical kit" item_cost = 10 - path = /obj/item/weapon/storage/firstaid/adv + path = /obj/item/storage/firstaid/adv /datum/uplink_item/item/medical/combat name = "Combat medical kit" item_cost = 20 - path = /obj/item/weapon/storage/firstaid/combat + path = /obj/item/storage/firstaid/combat diff --git a/code/datums/uplink/medical_vr.dm b/code/datums/uplink/medical_vr.dm index 5b4a0f31ccc..04524565963 100644 --- a/code/datums/uplink/medical_vr.dm +++ b/code/datums/uplink/medical_vr.dm @@ -9,82 +9,82 @@ /datum/uplink_item/item/medical/mre name = "Meal, Ready to eat (Random)" item_cost = 5 - path = /obj/item/weapon/storage/mre/random + path = /obj/item/storage/mre/random /datum/uplink_item/item/medical/protein name = "Meal, Ready to eat (Protein)" item_cost = 5 - path = /obj/item/weapon/storage/mre/menu10 + path = /obj/item/storage/mre/menu10 /datum/uplink_item/item/medical/emergency name = "Meal, Ready to eat (Emergency)" item_cost = 5 - path = /obj/item/weapon/storage/mre/menu11 + path = /obj/item/storage/mre/menu11 /datum/uplink_item/item/medical/medical name = "Meal, Ready to eat (medical)" item_cost = 5 - path = /obj/item/weapon/storage/mre/menu13 + path = /obj/item/storage/mre/menu13 /datum/uplink_item/item/medical/glucose name = "Glucose injector" item_cost = 5 - path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose + path = /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose /datum/uplink_item/item/medical/purity name = "Purity injector" item_cost = 5 - path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity + path = /obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity /datum/uplink_item/item/medical/pain name = "Pain injector" item_cost = 5 - path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/pain + path = /obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain /datum/uplink_item/item/medical/brute name = "Brute injector" item_cost = 5 - path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute + path = /obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute /datum/uplink_item/item/medical/burn name = "Burn injector" item_cost = 5 - path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn + path = /obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn /datum/uplink_item/item/medical/toxin name = "Toxin injector" item_cost = 5 - path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/toxin + path = /obj/item/reagent_containers/hypospray/autoinjector/biginjector/toxin /datum/uplink_item/item/medical/oxy name = "Oxy injector" item_cost = 5 - path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/oxy + path = /obj/item/reagent_containers/hypospray/autoinjector/biginjector/oxy /datum/uplink_item/item/medical/fire name = "Fire medical kit" item_cost = 10 - path = /obj/item/weapon/storage/firstaid/fire + path = /obj/item/storage/firstaid/fire /datum/uplink_item/item/medical/toxin name = "Toxin medical kit" item_cost = 10 - path = /obj/item/weapon/storage/firstaid/toxin + path = /obj/item/storage/firstaid/toxin /datum/uplink_item/item/medical/o2 name = "Oxygen medical kit" item_cost = 10 - path = /obj/item/weapon/storage/firstaid/o2 + path = /obj/item/storage/firstaid/o2 /datum/uplink_item/item/medical/adv name = "Advanced medical kit" item_cost = 10 - path = /obj/item/weapon/storage/firstaid/adv + path = /obj/item/storage/firstaid/adv /datum/uplink_item/item/medical/organ name = "Organ Repair injector" item_cost = 10 - path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ + path = /obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ /datum/uplink_item/item/medical/stasis name = "Stasis Bag" @@ -99,67 +99,67 @@ /datum/uplink_item/item/medical/nanites name = "Healing Nanite pill bottle" item_cost = 30 - path = /obj/item/weapon/storage/pill_bottle/healing_nanites + path = /obj/item/storage/pill_bottle/healing_nanites /datum/uplink_item/item/medical/vermicetol name = "Vermicetol Bottle" item_cost = 30 - path = /obj/item/weapon/reagent_containers/glass/bottle/vermicetol + path = /obj/item/reagent_containers/glass/bottle/vermicetol antag_roles = list("ert") blacklisted = 1 /datum/uplink_item/item/medical/dermaline name = "Dermaline Bottle" item_cost = 30 - path = /obj/item/weapon/reagent_containers/glass/bottle/dermaline + path = /obj/item/reagent_containers/glass/bottle/dermaline antag_roles = list("ert") blacklisted = 1 /datum/uplink_item/item/medical/carthatoline name = "Carthatoline Bottle" item_cost = 30 - path = /obj/item/weapon/reagent_containers/glass/bottle/carthatoline + path = /obj/item/reagent_containers/glass/bottle/carthatoline antag_roles = list("ert") blacklisted = 1 /datum/uplink_item/item/medical/dexalinp name = "Dexalin Plus Bottle" item_cost = 30 - path = /obj/item/weapon/reagent_containers/glass/bottle/dexalinp + path = /obj/item/reagent_containers/glass/bottle/dexalinp antag_roles = list("ert") blacklisted = 1 /datum/uplink_item/item/medical/tramadol name = "Tramadol Bottle" item_cost = 30 - path = /obj/item/weapon/reagent_containers/glass/bottle/tramadol + path = /obj/item/reagent_containers/glass/bottle/tramadol antag_roles = list("ert") blacklisted = 1 /datum/uplink_item/item/medical/arithrazine name = "Arithrazine Bottle" item_cost = 50 - path = /obj/item/weapon/reagent_containers/glass/bottle/arithrazine + path = /obj/item/reagent_containers/glass/bottle/arithrazine antag_roles = list("ert") blacklisted = 1 /datum/uplink_item/item/medical/corophizine name = "Corophizine Bottle" item_cost = 50 - path = /obj/item/weapon/reagent_containers/glass/bottle/corophizine + path = /obj/item/reagent_containers/glass/bottle/corophizine antag_roles = list("ert") blacklisted = 1 /datum/uplink_item/item/medical/rezadone name = "Rezadone Bottle" item_cost = 50 - path = /obj/item/weapon/reagent_containers/glass/bottle/rezadone + path = /obj/item/reagent_containers/glass/bottle/rezadone antag_roles = list("ert") blacklisted = 1 /datum/uplink_item/item/medical/defib name = "Combat Defibrilator" item_cost = 90 - path = /obj/item/device/defib_kit/compact/combat + path = /obj/item/defib_kit/compact/combat antag_roles = list("mercenary", "ert") blacklisted = 1 diff --git a/code/datums/uplink/stealth_items.dm b/code/datums/uplink/stealth_items.dm index 973e851b029..14253352673 100644 --- a/code/datums/uplink/stealth_items.dm +++ b/code/datums/uplink/stealth_items.dm @@ -7,7 +7,7 @@ /datum/uplink_item/item/stealth_items/id name = "Agent ID card" item_cost = 10 - path = /obj/item/weapon/card/id/syndicate + path = /obj/item/card/id/syndicate /datum/uplink_item/item/stealth_items/syndigaloshes name = "No-Slip Shoes" @@ -17,17 +17,17 @@ /datum/uplink_item/item/stealth_items/spy name = "Bug Kit" item_cost = 10 - path = /obj/item/weapon/storage/box/syndie_kit/spy + path = /obj/item/storage/box/syndie_kit/spy /datum/uplink_item/item/stealth_items/chameleon_kit name = "Chameleon Kit" item_cost = 15 - path = /obj/item/weapon/storage/box/syndie_kit/chameleon + path = /obj/item/storage/box/syndie_kit/chameleon /datum/uplink_item/item/stealth_items/chameleon_projector name = "Chameleon-Projector" item_cost = 30 - path = /obj/item/device/chameleon + path = /obj/item/chameleon /datum/uplink_item/item/stealth_items/voice name = "Voice Changer" @@ -37,7 +37,7 @@ /datum/uplink_item/item/stealth_items/makeover name = "Makeover Kit" item_cost = 5 - path = /obj/item/weapon/makeover + path = /obj/item/makeover /datum/uplink_item/item/stealth_items/thievesgloves name = "Thieve's Gloves" @@ -49,4 +49,4 @@ name = "Stealth Watch" desc = "A strange watch which can be used to create a fake corpse if you are injured when it is active, as it projects a cloaking field around your person." item_cost = 50 - path = /obj/item/weapon/deadringer + path = /obj/item/deadringer diff --git a/code/datums/uplink/stealthy_weapons.dm b/code/datums/uplink/stealthy_weapons.dm index 570b8c33413..29c80092113 100644 --- a/code/datums/uplink/stealthy_weapons.dm +++ b/code/datums/uplink/stealthy_weapons.dm @@ -7,56 +7,56 @@ /datum/uplink_item/item/stealthy_weapons/soap name = "Subversive Soap" item_cost = 5 - path = /obj/item/weapon/soap/syndie + path = /obj/item/soap/syndie /datum/uplink_item/item/stealthy_weapons/concealed_cane name = "Concealed Cane Sword" item_cost = 40 - path = /obj/item/weapon/cane/concealed + path = /obj/item/cane/concealed /datum/uplink_item/item/stealthy_weapons/detomatix name = "Detomatix PDA Cartridge" item_cost = 30 - path = /obj/item/weapon/cartridge/syndicate + path = /obj/item/cartridge/syndicate /datum/uplink_item/item/stealthy_weapons/parapen name = "Paralysis Pen" item_cost = 40 - path = /obj/item/weapon/pen/reagent/paralysis + path = /obj/item/pen/reagent/paralysis /datum/uplink_item/item/stealthy_weapons/cigarette_kit name = "Cigarette Kit" item_cost = 10 - path = /obj/item/weapon/storage/box/syndie_kit/cigarette + path = /obj/item/storage/box/syndie_kit/cigarette /datum/uplink_item/item/stealthy_weapons/random_toxin name = "Random Toxin - Beaker" item_cost = 10 - path = /obj/item/weapon/storage/box/syndie_kit/toxin + path = /obj/item/storage/box/syndie_kit/toxin /datum/uplink_item/item/stealthy_weapons/penblade name = "Energy Penblade, Black" desc = "A concealed energy dagger with the functional casing of a pen. Makes an impressive throwing weapon." item_cost = 20 - path = /obj/item/weapon/pen/blade + path = /obj/item/pen/blade /datum/uplink_item/item/stealthy_weapons/penblade_red name = "Energy Penblade, Red" desc = "A concealed energy dagger with the functional casing of a pen. Makes an impressive throwing weapon." item_cost = 20 - path = /obj/item/weapon/pen/blade/red + path = /obj/item/pen/blade/red /datum/uplink_item/item/stealthy_weapons/penblade_blue name = "Energy Penblade, Blue" desc = "A concealed energy dagger with the functional casing of a pen. Makes an impressive throwing weapon." item_cost = 20 - path = /obj/item/weapon/pen/blade/blue + path = /obj/item/pen/blade/blue /datum/uplink_item/item/stealthy_weapons/penblade_fancy name = "Energy Penblade, Fountain" desc = "A concealed energy dagger with the functional casing of a pen. Makes an impressive throwing weapon." item_cost = 20 - path = /obj/item/weapon/pen/blade/fountain + path = /obj/item/pen/blade/fountain /datum/uplink_item/item/stealthy_weapons/angrybuzzer name = "Morphium Shock Ring" @@ -68,16 +68,16 @@ name = "Camonetted Beartraps" desc = "A box of unique beartraps which will partially cloak when deployed, allowing for more effective hunting." item_cost = 30 - path = /obj/item/weapon/storage/box/syndie_kit/deadliest_game + path = /obj/item/storage/box/syndie_kit/deadliest_game /datum/uplink_item/item/stealthy_weapons/virus name = "Virus Cultures" desc = "A box of three unique virus cultures. As dangerous to you as anyone else if handled improperly." item_cost = 40 - path = /obj/item/weapon/storage/box/syndie_kit/viral + path = /obj/item/storage/box/syndie_kit/viral /datum/uplink_item/item/stealthy_weapons/syringe_case name = "Quickdraw Syringe Case" desc = "A small box capable of holding six syringes for rapid deployment. Fits in your pocket." item_cost = 20 - path = /obj/item/weapon/storage/quickdraw/syringe_case + path = /obj/item/storage/quickdraw/syringe_case diff --git a/code/datums/uplink/telecrystals.dm b/code/datums/uplink/telecrystals.dm index 66a099581ee..406f31e1b24 100644 --- a/code/datums/uplink/telecrystals.dm +++ b/code/datums/uplink/telecrystals.dm @@ -5,7 +5,7 @@ category = /datum/uplink_category/telecrystals blacklisted = 1 -/datum/uplink_item/item/telecrystal/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/M) +/datum/uplink_item/item/telecrystal/get_goods(var/obj/item/uplink/U, var/loc, var/mob/M) return new /obj/item/stack/telecrystal(loc, cost(U, M.mind.tcrystals)) /datum/uplink_item/item/telecrystal/one @@ -35,5 +35,5 @@ /datum/uplink_item/item/telecrystal/all name = "Telecrystals - Empty Uplink" -/datum/uplink_item/item/telecrystal/all/cost(obj/item/device/uplink/U, mob/M) +/datum/uplink_item/item/telecrystal/all/cost(obj/item/uplink/U, mob/M) return max(1, M.mind.tcrystals) \ No newline at end of file diff --git a/code/datums/uplink/tools.dm b/code/datums/uplink/tools.dm index 9c1a46d632f..fe909fafd28 100644 --- a/code/datums/uplink/tools.dm +++ b/code/datums/uplink/tools.dm @@ -7,72 +7,72 @@ /datum/uplink_item/item/tools/binoculars name = "Binoculars" item_cost = 3 - path = /obj/item/device/binoculars + path = /obj/item/binoculars /datum/uplink_item/item/tools/toolbox // Leaving the basic as an option since powertools are loud. name = "Fully Loaded Toolbox" item_cost = 3 - path = /obj/item/weapon/storage/toolbox/syndicate + path = /obj/item/storage/toolbox/syndicate /datum/uplink_item/item/tools/powertoolbox name = "Fully Loaded Powertool Box" item_cost = 5 - path = /obj/item/weapon/storage/toolbox/syndicate/powertools + path = /obj/item/storage/toolbox/syndicate/powertools /datum/uplink_item/item/tools/clerical name = "Morphic Clerical Kit" item_cost = 5 - path = /obj/item/weapon/storage/box/syndie_kit/clerical + path = /obj/item/storage/box/syndie_kit/clerical /datum/uplink_item/item/tools/encryptionkey_radio name = "Encrypted Radio Channel Key" item_cost = 10 - path = /obj/item/device/encryptionkey/syndicate + path = /obj/item/encryptionkey/syndicate /datum/uplink_item/item/tools/money name = "Operations Funding" item_cost = 10 - path = /obj/item/weapon/storage/secure/briefcase/money + path = /obj/item/storage/secure/briefcase/money desc = "A briefcase with 10,000 untraceable thalers for funding your sneaky activities." /datum/uplink_item/item/tools/plastique name = "C-4 (Destroys walls)" item_cost = 10 - path = /obj/item/weapon/plastique + path = /obj/item/plastique /datum/uplink_item/item/tools/duffle name = "Black Duffle Bag" item_cost = 5 - path = /obj/item/weapon/storage/backpack/dufflebag/syndie + path = /obj/item/storage/backpack/dufflebag/syndie /datum/uplink_item/item/tools/duffle/med name = "Black Medical Duffle Bag" - path = /obj/item/weapon/storage/backpack/dufflebag/syndie/med + path = /obj/item/storage/backpack/dufflebag/syndie/med /datum/uplink_item/item/tools/duffle/ammo name = "Black Ammunition Duffle Bag" - path = /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo + path = /obj/item/storage/backpack/dufflebag/syndie/ammo /datum/uplink_item/item/tools/shield_diffuser name = "Handheld Shield Diffuser" desc = "A small device used to disrupt energy barriers, and allow passage through them." item_cost = 16 - path = /obj/item/weapon/shield_diffuser + path = /obj/item/shield_diffuser /datum/uplink_item/item/tools/space_suit name = "Space Suit" item_cost = 10 - path = /obj/item/weapon/storage/box/syndie_kit/space + path = /obj/item/storage/box/syndie_kit/space /datum/uplink_item/item/tools/encryptionkey_binary name = "Binary Translator Key" item_cost = 15 - path = /obj/item/device/encryptionkey/binary + path = /obj/item/encryptionkey/binary /datum/uplink_item/item/tools/hacking_tool name = "Door Hacking Tool" item_cost = 15 - path = /obj/item/device/multitool/hacktool + path = /obj/item/multitool/hacktool desc = "Appears and functions as a standard multitool until the mode is toggled by applying a screwdriver appropriately. \ When in hacking mode this device will grant full access to any standard airlock within 20 to 40 seconds. \ This device will also be able to immediately access the last 6 to 8 hacked airlocks." @@ -80,7 +80,7 @@ /datum/uplink_item/item/tools/ai_detector name = "Anti-Surveillance Tool" item_cost = 15 - path = /obj/item/device/multitool/ai_detector + path = /obj/item/multitool/ai_detector desc = "This functions like a normal multitool, but includes an integrated camera network sensor that will warn the holder if they are being \ watched, by changing color and beeping. It is able to detect both AI visual surveillance and security camera utilization from terminals, and \ will give different warnings by beeping and changing colors based on what it detects. Only the holder can hear the warnings." @@ -88,20 +88,20 @@ /datum/uplink_item/item/tools/radio_jammer name = "Subspace Jammer" item_cost = 20 - path = /obj/item/device/radio_jammer + path = /obj/item/radio_jammer desc = "A device which is capable of disrupting subspace communications, preventing the use of headsets, PDAs, and communicators within \ a radius of seven meters. It runs off weapon cells, which can be replaced as needed. One cell will last for approximately ten minutes." /datum/uplink_item/item/tools/wall_elecrtifier name = "Wall Electrifier" item_cost = 5 - path = /obj/item/weapon/cell/spike + path = /obj/item/cell/spike desc = "A modified powercell which will electrify walls and reinforced floors in a 3x3 tile range around it. Always active." /datum/uplink_item/item/tools/emag name = "Cryptographic Sequencer" item_cost = 20 - path = /obj/item/weapon/card/emag + path = /obj/item/card/emag /datum/uplink_item/item/tools/graviton name = "Graviton Goggles" @@ -117,34 +117,34 @@ /datum/uplink_item/item/tools/packagebomb name = "Package Bomb (Small)" item_cost = 30 - path = /obj/item/weapon/storage/box/syndie_kit/demolitions + path = /obj/item/storage/box/syndie_kit/demolitions /datum/uplink_item/item/tools/powersink name = "Powersink (DANGER!)" item_cost = 40 - path = /obj/item/device/powersink + path = /obj/item/powersink /datum/uplink_item/item/tools/packagebomb/large name = "Package Bomb (Large)" item_cost = 60 - path = /obj/item/weapon/storage/box/syndie_kit/demolitions_heavy + path = /obj/item/storage/box/syndie_kit/demolitions_heavy /datum/uplink_item/item/tools/integratedcircuitprinter name = "Integrated Circuit Printer (Upgraded)" item_cost = 10 - path = /obj/item/device/integrated_circuit_printer/upgraded + path = /obj/item/integrated_circuit_printer/upgraded /* /datum/uplink_item/item/tools/packagebomb/huge name = "Package Bomb (Huge) item_cost = 100 - path = /obj/item/weapon/storage/box/syndie_kit/demolitions_super_heavy + path = /obj/item/storage/box/syndie_kit/demolitions_super_heavy */ /datum/uplink_item/item/tools/ai_module name = "Hacked AI Upload Module" item_cost = 60 - path = /obj/item/weapon/aiModule/syndicate + path = /obj/item/aiModule/syndicate /datum/uplink_item/item/tools/supply_beacon name = "Hacked Supply Beacon (DANGER!)" @@ -154,5 +154,5 @@ /datum/uplink_item/item/tools/teleporter name = "Teleporter Circuit Board" item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 1.5 - path = /obj/item/weapon/circuitboard/teleporter + path = /obj/item/circuitboard/teleporter blacklisted = 1 diff --git a/code/datums/uplink/tools_vr.dm b/code/datums/uplink/tools_vr.dm index 710e47f55c4..0a6fd81e98a 100644 --- a/code/datums/uplink/tools_vr.dm +++ b/code/datums/uplink/tools_vr.dm @@ -4,28 +4,28 @@ /datum/uplink_item/item/tools/oxygen name = "Emergency Oxygen Tank" item_cost = 2 - path = /obj/item/weapon/tank/emergency/oxygen/double + path = /obj/item/tank/emergency/oxygen/double /datum/uplink_item/item/tools/phoron name = "Emergency Phoron Tank" item_cost = 2 - path = /obj/item/weapon/tank/emergency/phoron/double + path = /obj/item/tank/emergency/phoron/double /datum/uplink_item/item/tools/suitcooler name = "Emergency Suit Cooler" item_cost = 2 - path = /obj/item/device/suit_cooling_unit/emergency + path = /obj/item/suit_cooling_unit/emergency /datum/uplink_item/item/tools/beacon_op name = "Holomap Beacon-M" item_cost = 2 - path = /obj/item/device/holomap_beacon/operative + path = /obj/item/holomap_beacon/operative antag_roles = list("mercenary") /datum/uplink_item/item/tools/beacon_ert name = "Holomap Beacon-E" item_cost = 2 - path = /obj/item/device/holomap_beacon/ert + path = /obj/item/holomap_beacon/ert antag_roles = list("ert") /datum/uplink_item/item/tools/basiclaptop @@ -36,12 +36,12 @@ /datum/uplink_item/item/tools/survivalcapsule name = "Survival Capsule" item_cost = 5 - path = /obj/item/device/survivalcapsule + path = /obj/item/survivalcapsule /datum/uplink_item/item/tools/popcabin name = "Cabin Capsule" item_cost = 5 - path = /obj/item/device/survivalcapsule/popcabin + path = /obj/item/survivalcapsule/popcabin /datum/uplink_item/item/tools/nanopaste name = "Nanopaste (Advanced)" @@ -56,7 +56,7 @@ /datum/uplink_item/item/tools/inflatable name = "Inflatables" item_cost = 10 - path = /obj/item/weapon/storage/briefcase/inflatable + path = /obj/item/storage/briefcase/inflatable /datum/uplink_item/item/tools/elitetablet name = "Tablet (Advanced)" @@ -76,17 +76,17 @@ /datum/uplink_item/item/tools/smallpouch name = "Small Pouch" item_cost = 5 - path = /obj/item/weapon/storage/pouch/small + path = /obj/item/storage/pouch/small /datum/uplink_item/item/tools/normalpouch name = "Standard Pouch" item_cost = 10 - path = /obj/item/weapon/storage/pouch + path = /obj/item/storage/pouch /datum/uplink_item/item/tools/largepouch name = "Large Pouch" item_cost = 15 - path = /obj/item/weapon/storage/pouch/large + path = /obj/item/storage/pouch/large /datum/uplink_item/item/tools/elitelaptop name = "Laptop (Advanced)" @@ -96,39 +96,39 @@ /datum/uplink_item/item/tools/inducer name = "Inducer" item_cost = 20 - path = /obj/item/weapon/inducer/syndicate + path = /obj/item/inducer/syndicate /datum/uplink_item/item/tools/mappingunit_op name = "Mapping Unit-M" item_cost = 20 - path = /obj/item/device/mapping_unit/operative + path = /obj/item/mapping_unit/operative antag_roles = list("mercenary") /datum/uplink_item/item/tools/mappingunit_ert name = "Mapping Unit-E" item_cost = 20 - path = /obj/item/device/mapping_unit/ert + path = /obj/item/mapping_unit/ert antag_roles = list("ert") /datum/uplink_item/item/tools/luxurycapsule name = "Survival Capsule (Luxury)" item_cost = 40 - path = /obj/item/device/survivalcapsule/luxury + path = /obj/item/survivalcapsule/luxury /datum/uplink_item/item/tools/translocator name = "Translocator" item_cost = 40 - path = /obj/item/device/perfect_tele + path = /obj/item/perfect_tele /datum/uplink_item/item/tools/uav name = "Recon Skimmer" item_cost = 40 - path = /obj/item/device/uav + path = /obj/item/uav /datum/uplink_item/item/tools/barcapsule name = "Survival Capsule (Bar)" item_cost = 80 - path = /obj/item/device/survivalcapsule/luxurybar + path = /obj/item/survivalcapsule/luxurybar /datum/uplink_item/item/tools/capturecrystal name = "Capture Crystal" diff --git a/code/datums/uplink/uplink_items.dm b/code/datums/uplink/uplink_items.dm index 7b4fbded2b5..cfb5ac89ab7 100644 --- a/code/datums/uplink/uplink_items.dm +++ b/code/datums/uplink/uplink_items.dm @@ -43,7 +43,7 @@ var/datum/uplink/uplink = new() -/datum/uplink_item/proc/buy(var/obj/item/device/uplink/U, var/mob/user) +/datum/uplink_item/proc/buy(var/obj/item/uplink/U, var/mob/user) var/extra_args = extra_args(user) if(!extra_args) return @@ -69,13 +69,13 @@ var/datum/uplink/uplink = new() /datum/uplink_item/proc/extra_args(var/mob/user) return TRUE -/datum/uplink_item/proc/can_buy(var/obj/item/device/uplink/U, var/telecrystals) +/datum/uplink_item/proc/can_buy(var/obj/item/uplink/U, var/telecrystals) if(cost(U, telecrystals) > telecrystals) return FALSE return TRUE -/datum/uplink_item/proc/cost(obj/item/device/uplink/U, mob/M) +/datum/uplink_item/proc/cost(obj/item/uplink/U, mob/M) . = item_cost if(U) . = U.get_item_cost(src, .) @@ -84,7 +84,7 @@ var/datum/uplink/uplink = new() return desc // get_goods does not necessarily return physical objects, it is simply a way to acquire the uplink item without paying -/datum/uplink_item/proc/get_goods(var/obj/item/device/uplink/U, var/loc, mob/user) +/datum/uplink_item/proc/get_goods(var/obj/item/uplink/U, var/loc, mob/user) return FALSE /datum/uplink_item/proc/log_icon() @@ -103,7 +103,7 @@ var/datum/uplink/uplink = new() * Physical Uplink Entries * * * ********************************/ -/datum/uplink_item/item/buy(var/obj/item/device/uplink/U, var/mob/user) +/datum/uplink_item/item/buy(var/obj/item/uplink/U, var/mob/user) var/obj/item/I = ..() if(!I) return @@ -117,7 +117,7 @@ var/datum/uplink/uplink = new() A.put_in_any_hand_if_possible(I) return I -/datum/uplink_item/item/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/user) +/datum/uplink_item/item/get_goods(var/obj/item/uplink/U, var/loc, var/mob/user) var/obj/item/I = new path(loc) return I @@ -154,7 +154,7 @@ var/datum/uplink/uplink = new() var/crate_path = /obj/structure/largecrate var/list/paths = list() // List of paths to be spawned into the crate. -/datum/uplink_item/crated/get_goods(var/obj/item/device/uplink/U, var/loc) +/datum/uplink_item/crated/get_goods(var/obj/item/uplink/U, var/loc) var/obj/L = new crate_path(get_turf(loc)) L.adjust_scale(rand(9, 12) / 10, rand(9, 12) / 10) // Some variation in the crate / locker size. @@ -179,7 +179,7 @@ var/datum/uplink/uplink = new() /**************** * Support procs * ****************/ -/proc/get_random_uplink_items(var/obj/item/device/uplink/U, var/remaining_TC, var/loc) +/proc/get_random_uplink_items(var/obj/item/uplink/U, var/remaining_TC, var/loc) var/list/bought_items = list() while(remaining_TC) var/datum/uplink_item/I = default_uplink_selection.get_random_item(remaining_TC, U, bought_items) @@ -190,7 +190,7 @@ var/datum/uplink/uplink = new() return bought_items -/proc/get_surplus_items(var/obj/item/device/uplink/U, var/remaining_TC, var/loc) +/proc/get_surplus_items(var/obj/item/uplink/U, var/remaining_TC, var/loc) var/list/bought_items = list() var/override = TRUE while(remaining_TC) diff --git a/code/datums/uplink/visible_weapons.dm b/code/datums/uplink/visible_weapons.dm index 6c063ffb581..ef07eb8eac7 100644 --- a/code/datums/uplink/visible_weapons.dm +++ b/code/datums/uplink/visible_weapons.dm @@ -7,57 +7,57 @@ /datum/uplink_item/item/visible_weapons/tactknife name = "Tactical Knife" item_cost = 10 - path = /obj/item/weapon/material/knife/tacknife + path = /obj/item/material/knife/tacknife /datum/uplink_item/item/visible_weapons/combatknife name = "Combat Knife" item_cost = 20 - path = /obj/item/weapon/material/knife/tacknife/combatknife + path = /obj/item/material/knife/tacknife/combatknife /datum/uplink_item/item/visible_weapons/energy_sword name = "Energy Sword, Colorable" item_cost = 40 - path = /obj/item/weapon/melee/energy/sword + path = /obj/item/melee/energy/sword /datum/uplink_item/item/visible_weapons/energy_sword_pirate name = "Energy Cutlass, Colorable" item_cost = 40 - path = /obj/item/weapon/melee/energy/sword/pirate + path = /obj/item/melee/energy/sword/pirate /datum/uplink_item/item/visible_weapons/energy_spear name = "Energy Spear, Colorable" item_cost = 50 - path = /obj/item/weapon/melee/energy/spear + path = /obj/item/melee/energy/spear /datum/uplink_item/item/visible_weapons/claymore name = "Claymore" item_cost = 40 - path = /obj/item/weapon/material/sword + path = /obj/item/material/sword /datum/uplink_item/item/visible_weapons/chainsaw name = "Chainsaw" item_cost = 40 - path = /obj/item/weapon/chainsaw + path = /obj/item/chainsaw /datum/uplink_item/item/visible_weapons/katana name = "Katana" item_cost = 40 - path = /obj/item/weapon/material/sword/katana + path = /obj/item/material/sword/katana /datum/uplink_item/item/visible_weapons/dartgun name = "Dart Gun" item_cost = 30 - path = /obj/item/weapon/gun/projectile/dartgun + path = /obj/item/gun/projectile/dartgun /datum/uplink_item/item/visible_weapons/crossbow name = "Energy Crossbow" item_cost = 40 - path = /obj/item/weapon/gun/energy/crossbow + path = /obj/item/gun/energy/crossbow /datum/uplink_item/item/visible_weapons/silenced_45 name = "Silenced .45" item_cost = 40 - path = /obj/item/weapon/gun/projectile/silenced + path = /obj/item/gun/projectile/silenced /datum/uplink_item/item/visible_weapons/riggedlaser name = "Exosuit Rigged Laser" @@ -67,126 +67,126 @@ /datum/uplink_item/item/visible_weapons/revolver name = "Revolver" item_cost = 70 - path = /obj/item/weapon/gun/projectile/revolver + path = /obj/item/gun/projectile/revolver /datum/uplink_item/item/visible_weapons/mateba name = "Mateba" item_cost = 70 - path = /obj/item/weapon/gun/projectile/revolver/mateba + path = /obj/item/gun/projectile/revolver/mateba /datum/uplink_item/item/visible_weapons/judge name = "Judge" item_cost = 70 - path = /obj/item/weapon/gun/projectile/revolver/judge + path = /obj/item/gun/projectile/revolver/judge /datum/uplink_item/item/visible_weapons/pistol_standard_capacity name = "9mm Pistol" item_cost = 40 - path = /obj/item/weapon/gun/projectile/p92x + path = /obj/item/gun/projectile/p92x /datum/uplink_item/item/visible_weapons/pistol_large_capacity name = "9mm Pistol (with large capacity magazine)" item_cost = 70 - path = /obj/item/weapon/gun/projectile/p92x/large + path = /obj/item/gun/projectile/p92x/large /datum/uplink_item/item/visible_weapons/lemat name = "Mako Revolver" item_cost = 60 - path = /obj/item/weapon/gun/projectile/revolver/lemat + path = /obj/item/gun/projectile/revolver/lemat /datum/uplink_item/item/visible_weapons/Derringer name = ".357 Derringer Pistol" item_cost = 40 - path = /obj/item/weapon/gun/projectile/derringer + path = /obj/item/gun/projectile/derringer /datum/uplink_item/item/visible_weapons/heavysnipermerc name = "Anti-Materiel Rifle (14.5mm)" item_cost = DEFAULT_TELECRYSTAL_AMOUNT - path = /obj/item/weapon/gun/projectile/heavysniper + path = /obj/item/gun/projectile/heavysniper antag_roles = list("mercenary", "ert") //VOREStation Edit /datum/uplink_item/item/visible_weapons/heavysnipertraitor name = "Anti-Materiel Rifle (14.5mm)" desc = "A convenient collapsible rifle for covert assassination. Comes with 4 shots and its own secure carrying case." item_cost = DEFAULT_TELECRYSTAL_AMOUNT - path = /obj/item/weapon/storage/secure/briefcase/rifle + path = /obj/item/storage/secure/briefcase/rifle antag_roles = list("traitor", "autotraitor", "infiltrator") /datum/uplink_item/item/visible_weapons/fuelrodcannon name = "Fuel-Rod Cannon" desc = "An incredibly bulky weapon whose devastating firepower is only matched by its severe need for expensive, and rare, ammunition. This device will likely require extra preparation to use, you are warned." item_cost = DEFAULT_TELECRYSTAL_AMOUNT - path = /obj/item/weapon/storage/secure/briefcase/fuelrod + path = /obj/item/storage/secure/briefcase/fuelrod /datum/uplink_item/item/visible_weapons/tommygun name = "Tommy Gun (.45)" // We're keeping this because it's CLASSY. -Spades item_cost = 60 - path = /obj/item/weapon/gun/projectile/automatic/tommygun + path = /obj/item/gun/projectile/automatic/tommygun //These are for traitors (or other antags, perhaps) to have the option of purchasing some merc gear. /datum/uplink_item/item/visible_weapons/submachinegun name = "Submachine Gun (10mm)" item_cost = 60 - path = /obj/item/weapon/gun/projectile/automatic/c20r + path = /obj/item/gun/projectile/automatic/c20r /datum/uplink_item/item/visible_weapons/assaultrifle name = "Assault Rifle (5.45mm)" item_cost = 75 - path = /obj/item/weapon/gun/projectile/automatic/sts35 + path = /obj/item/gun/projectile/automatic/sts35 /datum/uplink_item/item/visible_weapons/combatshotgun name = "Combat Shotgun" item_cost = 75 - path = /obj/item/weapon/gun/projectile/shotgun/pump/combat + path = /obj/item/gun/projectile/shotgun/pump/combat /datum/uplink_item/item/visible_weapons/semishotgun name = "Semi-Automatic Shotgun" item_cost = 100 - path = /obj/item/weapon/gun/projectile/shotgun/semi + path = /obj/item/gun/projectile/shotgun/semi /datum/uplink_item/item/visible_weapons/leveraction name = "Lever Action Rifle" item_cost = 50 - path = /obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever + path = /obj/item/gun/projectile/shotgun/pump/rifle/lever /datum/uplink_item/item/visible_weapons/egun name = "Compact Energy Gun" item_cost = 30 - path = /obj/item/weapon/gun/energy/gun/compact + path = /obj/item/gun/energy/gun/compact /datum/uplink_item/item/visible_weapons/lasercannon name = "Laser Cannon" item_cost = 60 - path = /obj/item/weapon/gun/energy/lasercannon + path = /obj/item/gun/energy/lasercannon /datum/uplink_item/item/visible_weapons/lasercarbine name = "Laser Carbine" item_cost = 75 - path = /obj/item/weapon/gun/energy/laser + path = /obj/item/gun/energy/laser /datum/uplink_item/item/visible_weapons/ionrifle name = "Ion Rifle" item_cost = 40 - path = /obj/item/weapon/gun/energy/ionrifle + path = /obj/item/gun/energy/ionrifle /datum/uplink_item/item/visible_weapons/ionpistol name = "Ion Pistol" item_cost = 25 - path = /obj/item/weapon/gun/energy/ionrifle/pistol + path = /obj/item/gun/energy/ionrifle/pistol /datum/uplink_item/item/visible_weapons/xray name = "Xray Gun" item_cost = 60 - path = /obj/item/weapon/gun/energy/xray + path = /obj/item/gun/energy/xray /datum/uplink_item/item/visible_weapons/flamethrower name = "Heavy Flamethrower" desc = "A large flamethrower that runs on pressurized, gaseous phoron and electric charge." item_cost = 60 - path = /obj/item/weapon/storage/secure/briefcase/flamer + path = /obj/item/storage/secure/briefcase/flamer /datum/uplink_item/item/visible_weapons/concussion_grenades name = "Concussion Grenades (8)" desc = "A box of eight concussion grenades." item_cost = 30 - path = /obj/item/weapon/storage/box/syndie_kit/concussion_grenade + path = /obj/item/storage/box/syndie_kit/concussion_grenade diff --git a/code/datums/uplink/visible_weapons_vr.dm b/code/datums/uplink/visible_weapons_vr.dm index 764e30b12f9..77b6698212e 100644 --- a/code/datums/uplink/visible_weapons_vr.dm +++ b/code/datums/uplink/visible_weapons_vr.dm @@ -4,19 +4,19 @@ /datum/uplink_item/item/visible_weapons/holdout name = "Frontier Holdout" item_cost = 30 - path = /obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked + path = /obj/item/gun/energy/locked/frontier/holdout/unlocked /datum/uplink_item/item/visible_weapons/frontier name = "Frontier Phaser" item_cost = 75 - path = /obj/item/weapon/gun/energy/locked/frontier/unlocked + path = /obj/item/gun/energy/locked/frontier/unlocked /datum/uplink_item/item/visible_weapons/carbine name = "Frontier Carbine" item_cost = 85 - path = /obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked + path = /obj/item/gun/energy/locked/frontier/carbine/unlocked /datum/uplink_item/item/visible_weapons/rifle name = "Frontier Marksman Rifle" item_cost = 100 - path = /obj/item/weapon/gun/energy/locked/frontier/rifle/unlocked + path = /obj/item/gun/energy/locked/frontier/rifle/unlocked diff --git a/code/datums/wires/explosive.dm b/code/datums/wires/explosive.dm index 52b0150b661..8267f05fcf6 100644 --- a/code/datums/wires/explosive.dm +++ b/code/datums/wires/explosive.dm @@ -21,14 +21,14 @@ explode() /datum/wires/explosive/c4 - holder_type = /obj/item/weapon/plastique + holder_type = /obj/item/plastique /datum/wires/explosive/c4/interactable(mob/user) - var/obj/item/weapon/plastique/P = holder + var/obj/item/plastique/P = holder if(P.open_panel) return TRUE return FALSE /datum/wires/explosive/c4/explode() - var/obj/item/weapon/plastique/P = holder + var/obj/item/plastique/P = holder P.explode(get_turf(P)) diff --git a/code/datums/wires/radio.dm b/code/datums/wires/radio.dm index ddc51108392..2932ca3118a 100644 --- a/code/datums/wires/radio.dm +++ b/code/datums/wires/radio.dm @@ -1,5 +1,5 @@ /datum/wires/radio - holder_type = /obj/item/device/radio + holder_type = /obj/item/radio wire_count = 3 proper_name = "Radio" @@ -8,13 +8,13 @@ return ..() /datum/wires/radio/interactable(mob/user) - var/obj/item/device/radio/R = holder + var/obj/item/radio/R = holder if(R.b_stat) return TRUE return FALSE /datum/wires/radio/on_pulse(wire) - var/obj/item/device/radio/R = holder + var/obj/item/radio/R = holder switch(wire) if(WIRE_RADIO_SIGNAL) R.listening = !R.listening && !is_cut(WIRE_RADIO_RECEIVER) @@ -28,7 +28,7 @@ ..() /datum/wires/radio/on_cut(wire, mend) - var/obj/item/device/radio/R = holder + var/obj/item/radio/R = holder switch(wire) if(WIRE_RADIO_SIGNAL) R.listening = mend && !is_cut(WIRE_RADIO_RECEIVER) diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index b366ac43a9c..8fe75e83644 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -201,7 +201,7 @@ user.put_in_hands(O) return TRUE - if(!istype(I, /obj/item/device/assembly/signaler)) + if(!istype(I, /obj/item/assembly/signaler)) to_chat(user, "You need a remote signaller!") return @@ -224,7 +224,7 @@ // if(user.can_admin_interact()) // return TRUE var/obj/item/I = user.get_active_hand() - if(istype(I, /obj/item/device/multitool/alien)) + if(istype(I, /obj/item/multitool/alien)) return TRUE return FALSE @@ -400,7 +400,7 @@ * Arugments: * * S - the attached signaler receiving the signal. */ -/datum/wires/proc/pulse_assembly(obj/item/device/assembly/signaler/S) +/datum/wires/proc/pulse_assembly(obj/item/assembly/signaler/S) for(var/color in assemblies) if(S == assemblies[color]) pulse_color(color) @@ -416,7 +416,7 @@ * * color - the wire color. * * S - the signaler that a mob is trying to attach. */ -/datum/wires/proc/attach_assembly(color, obj/item/device/assembly/signaler/S) +/datum/wires/proc/attach_assembly(color, obj/item/assembly/signaler/S) if(S && istype(S) && !is_attached(color)) assemblies[color] = S S.forceMove(holder) @@ -432,7 +432,7 @@ * * color - the wire color. */ /datum/wires/proc/detach_assembly(color) - var/obj/item/device/assembly/signaler/S = get_attached(color) + var/obj/item/assembly/signaler/S = get_attached(color) if(S && istype(S)) assemblies -= color S.connected = null diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 5096d819080..a45e5d14142 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -4,7 +4,7 @@ anchored = TRUE density = TRUE -/obj/structure/signpost/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/signpost/attackby(obj/item/W as obj, mob/user as mob) return attack_hand(user) /obj/structure/signpost/attack_hand(mob/user as mob) @@ -107,7 +107,7 @@ /obj/item/mouse_drag_pointer = MOUSE_ACTIVE_POINTER -/obj/item/weapon/beach_ball +/obj/item/beach_ball icon = 'icons/misc/beach.dmi' icon_state = "beachball" name = "beach ball" @@ -121,11 +121,11 @@ drop_sound = 'sound/items/drop/rubber.ogg' pickup_sound = 'sound/items/pickup/rubber.ogg' -/obj/item/weapon/beach_ball/afterattack(atom/target as mob|obj|turf|area, mob/user as mob) +/obj/item/beach_ball/afterattack(atom/target as mob|obj|turf|area, mob/user as mob) user.drop_item() src.throw_at(target, throw_range, throw_speed, user) -/obj/item/weapon/beach_ball/dodgeball +/obj/item/beach_ball/dodgeball icon = 'icons/obj/balls_vr.dmi' icon_state = "dodgeball" item_state = "dodgeball" diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 333eb239029..41334221d63 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/phone +/obj/item/phone name = "red phone" desc = "Should anything ever go wrong..." icon = 'icons/obj/items.dmi' @@ -13,7 +13,7 @@ drop_sound = 'sound/items/drop/device.ogg' pickup_sound = 'sound/items/pickup/device.ogg' -/obj/item/weapon/rsp +/obj/item/rsp name = "\improper Rapid-Seed-Producer (RSP)" desc = "A device used to rapidly deploy seeds." icon = 'icons/obj/items.dmi' @@ -27,7 +27,7 @@ drop_sound = 'sound/items/drop/device.ogg' pickup_sound = 'sound/items/pickup/device.ogg' -/obj/item/weapon/soap +/obj/item/soap name = "soap" desc = "A cheap bar of soap. Smells of lye." gender = PLURAL @@ -42,102 +42,102 @@ var/randomize = TRUE var/square_chance = 10 -/obj/item/weapon/soap/Initialize() +/obj/item/soap/Initialize() if(randomize && prob(square_chance)) icon_state = "[icon_state]-alt" -/obj/item/weapon/soap/nanotrasen +/obj/item/soap/nanotrasen desc = "A NanoTrasen-brand bar of soap. Smells of phoron, a years-old marketing gimmick." icon_state = "soapnt" -/obj/item/weapon/soap/deluxe +/obj/item/soap/deluxe icon_state = "soapdeluxe" -/obj/item/weapon/soap/deluxe/New() +/obj/item/soap/deluxe/New() desc = "A deluxe Waffle Co. brand bar of soap. Smells of [pick("lavender", "vanilla", "strawberry", "chocolate" ,"space")]." ..() -/obj/item/weapon/soap/syndie +/obj/item/soap/syndie desc = "An untrustworthy bar of soap. Smells of fear." icon_state = "soapsyndie" -/obj/item/weapon/soap/space_soap +/obj/item/soap/space_soap desc = "Smells like hot metal and walnuts." icon_state = "space_soap" -/obj/item/weapon/soap/water_soap +/obj/item/soap/water_soap desc = "Smells like chlorine." icon_state = "water_soap" -/obj/item/weapon/soap/fire_soap +/obj/item/soap/fire_soap desc = "Smells like a campfire." icon_state = "fire_soap" -/obj/item/weapon/soap/rainbow_soap +/obj/item/soap/rainbow_soap desc = "Smells sickly sweet." icon_state = "rainbow_soap" -/obj/item/weapon/soap/diamond_soap +/obj/item/soap/diamond_soap desc = "Smells like saffron and vanilla." icon_state = "diamond_soap" -/obj/item/weapon/soap/uranium_soap +/obj/item/soap/uranium_soap desc = "Smells not great... Not terrible." icon_state = "uranium_soap" -/obj/item/weapon/soap/silver_soap +/obj/item/soap/silver_soap desc = "Smells like birch and amaranth." icon_state = "silver_soap" -/obj/item/weapon/soap/brown_soap +/obj/item/soap/brown_soap desc = "Smells like cinnamon and cognac." icon_state = "brown_soap" -/obj/item/weapon/soap/white_soap +/obj/item/soap/white_soap desc = "Smells like nutmeg and oats." icon_state = "white_soap" -/obj/item/weapon/soap/grey_soap +/obj/item/soap/grey_soap desc = "Smells like bergamot and lilies." icon_state = "grey_soap" -/obj/item/weapon/soap/pink_soap +/obj/item/soap/pink_soap desc = "Smells like bubblegum." icon_state = "pink_soap" -/obj/item/weapon/soap/purple_soap +/obj/item/soap/purple_soap desc = "Smells like lavender." icon_state = "purple_soap" -/obj/item/weapon/soap/blue_soap +/obj/item/soap/blue_soap desc = "Smells like cardamom." icon_state = "blue_soap" -/obj/item/weapon/soap/cyan_soap +/obj/item/soap/cyan_soap desc = "Smells like bluebells and peaches." icon_state = "cyan_soap" -/obj/item/weapon/soap/green_soap +/obj/item/soap/green_soap desc = "Smells like a freshly mowed lawn." icon_state = "green_soap" -/obj/item/weapon/soap/yellow_soap +/obj/item/soap/yellow_soap desc = "Smells like citron and ginger." icon_state = "yellow_soap" -/obj/item/weapon/soap/orange_soap +/obj/item/soap/orange_soap desc = "Smells like oranges and dark chocolate." icon_state = "orange_soap" -/obj/item/weapon/soap/red_soap +/obj/item/soap/red_soap desc = "Smells like cherries." icon_state = "red_soap" -/obj/item/weapon/soap/golden_soap +/obj/item/soap/golden_soap desc = "Smells like honey." icon_state = "golden_soap" -/obj/item/weapon/bikehorn +/obj/item/bikehorn name = "bike horn" desc = "A horn off of a bicycle." icon = 'icons/obj/items.dmi' @@ -151,7 +151,7 @@ attack_verb = list("HONKED") var/spam_flag = 0 -/obj/item/weapon/c_tube +/obj/item/c_tube name = "cardboard tube" desc = "A tube... of cardboard." icon = 'icons/obj/items.dmi' @@ -161,13 +161,13 @@ throw_speed = 4 throw_range = 5 -/obj/item/weapon/disk +/obj/item/disk name = "disk" icon = 'icons/obj/discs_vr.dmi' //VOREStation Edit drop_sound = 'sound/items/drop/disk.ogg' pickup_sound = 'sound/items/pickup/disk.ogg' -/obj/item/weapon/disk/nuclear +/obj/item/disk/nuclear name = "nuclear authentication disk" desc = "Better keep this safe." icon_state = "nucleardisk" @@ -175,7 +175,7 @@ w_class = ITEMSIZE_SMALL /* -/obj/item/weapon/game_kit +/obj/item/game_kit name = "Gaming Kit" icon = 'icons/obj/items.dmi' icon_state = "game_kit" @@ -187,7 +187,7 @@ w_class = ITEMSIZE_HUGE */ -/obj/item/weapon/gift +/obj/item/gift name = "gift" desc = "A wrapped item." icon = 'icons/obj/items.dmi' @@ -197,7 +197,7 @@ item_state = "gift" w_class = ITEMSIZE_LARGE -/*/obj/item/weapon/syndicate_uplink +/*/obj/item/syndicate_uplink name = "station bounced radio" desc = "Remain silent about this..." icon = 'icons/obj/radio.dmi' @@ -207,7 +207,7 @@ var/selfdestruct = 0.0 var/traitor_frequency = 0.0 var/mob/currentUser = null - var/obj/item/device/radio/origradio = null + var/obj/item/radio/origradio = null flags = ONBELT w_class = ITEMSIZE_SMALL item_state = "radio" @@ -216,7 +216,7 @@ matter = list(MAT_STEEL = 100) origin_tech = list(TECH_MAGNET = 2, TECH_ILLEGAL = 3)*/ -/obj/item/weapon/SWF_uplink +/obj/item/SWF_uplink name = "station-bounced radio" desc = "Used to communicate, it appears." icon = 'icons/obj/radio.dmi' @@ -225,7 +225,7 @@ var/uses = 4.0 var/selfdestruct = 0.0 var/traitor_frequency = 0.0 - var/obj/item/device/radio/origradio = null + var/obj/item/radio/origradio = null slot_flags = SLOT_BELT item_state = "radio" throwforce = 5 @@ -237,7 +237,7 @@ drop_sound = 'sound/items/drop/device.ogg' pickup_sound = 'sound/items/pickup/device.ogg' -/obj/item/weapon/staff +/obj/item/staff name = "wizards staff" desc = "Apparently a staff used by the wizard." icon = 'icons/obj/wizard.dmi' @@ -253,19 +253,19 @@ w_class = ITEMSIZE_SMALL attack_verb = list("bludgeoned", "whacked", "disciplined") -/obj/item/weapon/staff/broom +/obj/item/staff/broom name = "broom" desc = "Used for sweeping, and flying into the night while cackling. Black cat not included." icon = 'icons/obj/wizard.dmi' icon_state = "broom" -/obj/item/weapon/staff/gentcane +/obj/item/staff/gentcane name = "Gentlemans Cane" desc = "An ebony can with an ivory tip." icon = 'icons/obj/weapons.dmi' icon_state = "cane" -/obj/item/weapon/staff/stick +/obj/item/staff/stick name = "stick" desc = "A great tool to drag someone else's drinks across the bar." icon = 'icons/obj/weapons.dmi' @@ -277,7 +277,7 @@ throw_range = 5 w_class = ITEMSIZE_SMALL -/obj/item/weapon/module +/obj/item/module icon = 'icons/obj/module.dmi' icon_state = "std_module" item_state = "std_mod" @@ -286,37 +286,37 @@ drop_sound = 'sound/items/drop/component.ogg' pickup_sound = 'sound/items/pickup/component.ogg' -/obj/item/weapon/module/card_reader +/obj/item/module/card_reader name = "card reader module" icon_state = "card_mod" item_state = "std_mod" desc = "An electronic module for reading data and ID cards." -/obj/item/weapon/module/power_control +/obj/item/module/power_control name = "power control module" icon_state = "power_mod" item_state = "std_mod" desc = "Heavy-duty switching circuits for power control." matter = list(MAT_STEEL = 50, MAT_GLASS = 50) -/obj/item/weapon/module/id_auth +/obj/item/module/id_auth name = "\improper ID authentication module" icon_state = "id_mod" desc = "A module allowing secure authorization of ID cards." -/obj/item/weapon/module/cell_power +/obj/item/module/cell_power name = "power cell regulator module" icon_state = "power_mod" item_state = "std_mod" desc = "A converter and regulator allowing the use of power cells." -/obj/item/weapon/module/cell_power +/obj/item/module/cell_power name = "power cell charger module" icon_state = "power_mod" item_state = "std_mod" desc = "Charging circuits for power cells." -/obj/item/device/camera_bug +/obj/item/camera_bug name = "camera bug" icon = 'icons/obj/device.dmi' icon_state = "flash" @@ -325,7 +325,7 @@ throw_speed = 4 throw_range = 20 -/obj/item/weapon/camera_bug/attack_self(mob/usr as mob) +/obj/item/camera_bug/attack_self(mob/usr as mob) var/list/cameras = new/list() for (var/obj/machinery/camera/C in cameranet.cameras) if (C.bugged && C.status) @@ -351,7 +351,7 @@ usr.client.eye = target /* -/obj/item/weapon/cigarpacket +/obj/item/cigarpacket name = "Pete's Cuban Cigars" desc = "The most robust cigars on the planet." icon = 'icons/obj/cigarettes.dmi' @@ -363,7 +363,7 @@ flags = ONBELT */ -/obj/item/weapon/pai_cable +/obj/item/pai_cable desc = "A flexible coated cable with a universal jack on one end." name = "data cable" icon = 'icons/obj/power.dmi' @@ -371,20 +371,20 @@ var/obj/machinery/machine -/obj/item/weapon/pai_cable/Destroy() +/obj/item/pai_cable/Destroy() machine = null return ..() ///////////////////////////////////////Stock Parts ///////////////////////////////// -/obj/item/weapon/storage/part_replacer +/obj/item/storage/part_replacer name = "rapid part exchange device" desc = "A special mechanical module made to store, sort, and apply standard machine parts." icon = 'icons/obj/storage_vr.dmi' icon_state = "RPED" item_state = "RPED" w_class = ITEMSIZE_HUGE - can_hold = list(/obj/item/weapon/stock_parts) + can_hold = list(/obj/item/stock_parts) storage_slots = 50 use_to_pickup = TRUE allow_quick_gather = 1 @@ -401,7 +401,7 @@ var/unique_reskin = list("Soulless" = "RPED", "Soulful" = "RPED_old") -/obj/item/weapon/storage/part_replacer/proc/play_rped_sound() +/obj/item/storage/part_replacer/proc/play_rped_sound() //Plays the sound for RPED exhanging or installing parts. /* if(alt_sound && prob(1)) playsound(src, alt_sound, 40, 1) @@ -409,15 +409,15 @@ */ playsound(src, pshoom_or_beepboopblorpzingshadashwoosh, 40, 1) -/obj/item/weapon/storage/part_replacer/adv +/obj/item/storage/part_replacer/adv name = "advanced rapid part exchange device" desc = "A special mechanical module made to store, sort, and apply standard machine parts. This one has a greatly upgraded storage capacity, \ and the ability to hold beakers." - can_hold = list(/obj/item/weapon/stock_parts, /obj/item/weapon/reagent_containers/glass/beaker) + can_hold = list(/obj/item/stock_parts, /obj/item/reagent_containers/glass/beaker) storage_slots = 200 max_storage_space = 400 -/obj/item/weapon/storage/part_replacer/adv/discount_bluespace +/obj/item/storage/part_replacer/adv/discount_bluespace name = "prototype bluespace rapid part exchange device" icon_state = "DBRPED" item_state = "DBRPED" @@ -430,17 +430,17 @@ unique_reskin = list("Soulless" = "DBRPED", "Soulful" = "DBRPED_old") -/obj/item/weapon/storage/part_replacer/examine(mob/user) +/obj/item/storage/part_replacer/examine(mob/user) . = ..() if(!reskin_ran) . += "[src]'s external casing can be modified via alt-click." -/obj/item/weapon/storage/part_replacer/AltClick(mob/user) +/obj/item/storage/part_replacer/AltClick(mob/user) . = ..() if(!reskin_ran) reskin_radial(user) -/obj/item/weapon/storage/part_replacer/proc/reskin_radial(mob/M) +/obj/item/storage/part_replacer/proc/reskin_radial(mob/M) if(!LAZYLEN(unique_reskin)) return @@ -460,7 +460,7 @@ reskin_ran = TRUE to_chat(M, "[src] is now '[pick]'.") -/obj/item/weapon/storage/part_replacer/drop_contents() // hacky-feeling tier-based drop system +/obj/item/storage/part_replacer/drop_contents() // hacky-feeling tier-based drop system hide_from(usr) var/turf/T = get_turf(src) var/lowest_rating = INFINITY // We want the lowest-part tier rating in the RPED so we only drop the lowest-tier parts. @@ -479,7 +479,7 @@ remove_from_storage(B, T) -/obj/item/weapon/stock_parts +/obj/item/stock_parts name = "stock part" desc = "What?" gender = PLURAL @@ -489,17 +489,17 @@ drop_sound = 'sound/items/drop/component.ogg' pickup_sound = 'sound/items/pickup/component.ogg' -/obj/item/weapon/stock_parts/New() +/obj/item/stock_parts/New() src.pixel_x = rand(-5.0, 5) src.pixel_y = rand(-5.0, 5) ..() -/obj/item/weapon/stock_parts/get_rating() +/obj/item/stock_parts/get_rating() return rating //Rank 1 -/obj/item/weapon/stock_parts/console_screen +/obj/item/stock_parts/console_screen name = "console screen" desc = "Used in the construction of computers and other devices with a interactive console." icon_state = "screen" @@ -507,7 +507,7 @@ rating = 5 // these are actually Really Important for some things?? matter = list(MAT_GLASS = 200) -/obj/item/weapon/stock_parts/capacitor +/obj/item/stock_parts/capacitor name = "capacitor" desc = "A basic capacitor used in the construction of a variety of devices." icon_state = "capacitor" @@ -517,43 +517,43 @@ var/charge = 0 var/max_charge = 1000 -/obj/item/weapon/stock_parts/capacitor/New() +/obj/item/stock_parts/capacitor/New() . = ..() max_charge *= rating -/obj/item/weapon/stock_parts/capacitor/proc/charge(var/amount) +/obj/item/stock_parts/capacitor/proc/charge(var/amount) charge += amount if(charge > max_charge) charge = max_charge -/obj/item/weapon/stock_parts/capacitor/proc/use(var/amount) +/obj/item/stock_parts/capacitor/proc/use(var/amount) if(charge) charge -= amount if(charge < 0) charge = 0 -/obj/item/weapon/stock_parts/scanning_module +/obj/item/stock_parts/scanning_module name = "scanning module" desc = "A compact, high resolution scanning module used in the construction of certain devices." icon_state = "scan_module" origin_tech = list(TECH_MAGNET = 1) matter = list(MAT_STEEL = 50,MAT_GLASS = 20) -/obj/item/weapon/stock_parts/manipulator +/obj/item/stock_parts/manipulator name = "micro-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "micro_mani" origin_tech = list(TECH_MATERIAL = 1, TECH_DATA = 1) matter = list(MAT_STEEL = 30) -/obj/item/weapon/stock_parts/micro_laser +/obj/item/stock_parts/micro_laser name = "micro-laser" desc = "A tiny laser used in certain devices." icon_state = "micro_laser" origin_tech = list(TECH_MAGNET = 1) matter = list(MAT_STEEL = 10,MAT_GLASS = 20) -/obj/item/weapon/stock_parts/matter_bin +/obj/item/stock_parts/matter_bin name = "matter bin" desc = "A container for hold compressed matter awaiting re-construction." icon_state = "matter_bin" @@ -562,7 +562,7 @@ //Rank 2 -/obj/item/weapon/stock_parts/capacitor/adv +/obj/item/stock_parts/capacitor/adv name = "advanced capacitor" desc = "An advanced capacitor used in the construction of a variety of devices." icon_state = "capacitor_adv" @@ -570,7 +570,7 @@ rating = 2 matter = list(MAT_STEEL = 50,MAT_GLASS = 50) -/obj/item/weapon/stock_parts/scanning_module/adv +/obj/item/stock_parts/scanning_module/adv name = "advanced scanning module" desc = "A compact, high resolution scanning module used in the construction of certain devices." icon_state = "scan_module_adv" @@ -578,7 +578,7 @@ rating = 2 matter = list(MAT_STEEL = 50,MAT_GLASS = 20) -/obj/item/weapon/stock_parts/manipulator/nano +/obj/item/stock_parts/manipulator/nano name = "nano-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "nano_mani" @@ -586,7 +586,7 @@ rating = 2 matter = list(MAT_STEEL = 30) -/obj/item/weapon/stock_parts/micro_laser/high +/obj/item/stock_parts/micro_laser/high name = "high-power micro-laser" desc = "A tiny laser used in certain devices." icon_state = "high_micro_laser" @@ -594,7 +594,7 @@ rating = 2 matter = list(MAT_STEEL = 10,MAT_GLASS = 20) -/obj/item/weapon/stock_parts/matter_bin/adv +/obj/item/stock_parts/matter_bin/adv name = "advanced matter bin" desc = "A container for hold compressed matter awaiting re-construction." icon_state = "advanced_matter_bin" @@ -604,7 +604,7 @@ //Rating 3 -/obj/item/weapon/stock_parts/capacitor/super +/obj/item/stock_parts/capacitor/super name = "super capacitor" desc = "A super-high capacity capacitor used in the construction of a variety of devices." icon_state = "capacitor_super" @@ -612,7 +612,7 @@ rating = 3 matter = list(MAT_STEEL = 50,MAT_GLASS = 50) -/obj/item/weapon/stock_parts/scanning_module/phasic +/obj/item/stock_parts/scanning_module/phasic name = "phasic scanning module" desc = "A compact, high resolution phasic scanning module used in the construction of certain devices." icon_state = "scan_module_phasic" @@ -620,7 +620,7 @@ rating = 3 matter = list(MAT_STEEL = 50,MAT_GLASS = 20) -/obj/item/weapon/stock_parts/manipulator/pico +/obj/item/stock_parts/manipulator/pico name = "pico-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "pico_mani" @@ -628,7 +628,7 @@ rating = 3 matter = list(MAT_STEEL = 30) -/obj/item/weapon/stock_parts/micro_laser/ultra +/obj/item/stock_parts/micro_laser/ultra name = "ultra-high-power micro-laser" icon_state = "ultra_high_micro_laser" desc = "A tiny laser used in certain devices." @@ -636,7 +636,7 @@ rating = 3 matter = list(MAT_STEEL = 10,MAT_GLASS = 20) -/obj/item/weapon/stock_parts/matter_bin/super +/obj/item/stock_parts/matter_bin/super name = "super matter bin" desc = "A container for hold compressed matter awaiting re-construction." icon_state = "super_matter_bin" @@ -646,7 +646,7 @@ // Rating 4 - Anomaly -/obj/item/weapon/stock_parts/capacitor/hyper +/obj/item/stock_parts/capacitor/hyper name = "hyper capacitor" desc = "A hyper-capacity capacitor used in the construction of a variety of devices." icon_state = "capacitor_hyper" @@ -654,7 +654,7 @@ rating = 4 matter = list(MAT_STEEL = 80, MAT_GLASS = 40) -/obj/item/weapon/stock_parts/scanning_module/hyper +/obj/item/stock_parts/scanning_module/hyper name = "quantum scanning module" desc = "A compact, near-perfect resolution quantum scanning module used in the construction of certain devices." icon_state = "scan_module_hyper" @@ -662,7 +662,7 @@ rating = 4 matter = list(MAT_STEEL = 100,MAT_GLASS = 40) -/obj/item/weapon/stock_parts/manipulator/hyper +/obj/item/stock_parts/manipulator/hyper name = "planck-manipulator" desc = "A miniscule manipulator used in the construction of certain devices." icon_state = "hyper_mani" @@ -670,7 +670,7 @@ rating = 4 matter = list(MAT_STEEL = 30) -/obj/item/weapon/stock_parts/micro_laser/hyper +/obj/item/stock_parts/micro_laser/hyper name = "hyper-power micro-laser" icon_state = "hyper_micro_laser" desc = "A tiny laser used in certain devices." @@ -678,7 +678,7 @@ rating = 4 matter = list(MAT_STEEL = 30, MAT_GLASS = 40) -/obj/item/weapon/stock_parts/matter_bin/hyper +/obj/item/stock_parts/matter_bin/hyper name = "hyper matter bin" desc = "A container for holding compressed matter awaiting re-construction." icon_state = "hyper_matter_bin" @@ -688,7 +688,7 @@ // Rating 5 - Precursor -/obj/item/weapon/stock_parts/capacitor/omni +/obj/item/stock_parts/capacitor/omni name = "omni-capacitor" desc = "A capacitor of immense capacity used in the construction of a variety of devices." icon_state = "capacitor_omni" @@ -696,7 +696,7 @@ rating = 5 matter = list(MAT_STEEL = 80, MAT_GLASS = 40) -/obj/item/weapon/stock_parts/scanning_module/omni +/obj/item/stock_parts/scanning_module/omni name = "omni-scanning module" desc = "A compact, perfect resolution temporospatial scanning module used in the construction of certain devices." icon_state = "scan_module_omni" @@ -704,7 +704,7 @@ rating = 5 matter = list(MAT_STEEL = 100,MAT_GLASS = 40) -/obj/item/weapon/stock_parts/manipulator/omni +/obj/item/stock_parts/manipulator/omni name = "omni-manipulator" desc = "A strange, infinitesimal manipulator used in the construction of certain devices." icon_state = "omni_mani" @@ -712,7 +712,7 @@ rating = 5 matter = list(MAT_STEEL = 30) -/obj/item/weapon/stock_parts/micro_laser/omni +/obj/item/stock_parts/micro_laser/omni name = "omni-power micro-laser" icon_state = "omni_micro_laser" desc = "A strange laser used in certain devices." @@ -720,7 +720,7 @@ rating = 5 matter = list(MAT_STEEL = 30, MAT_GLASS = 40) -/obj/item/weapon/stock_parts/matter_bin/omni +/obj/item/stock_parts/matter_bin/omni name = "omni-matter bin" desc = "A strange container for holding compressed matter awaiting re-construction." icon_state = "omni_matter_bin" @@ -731,63 +731,63 @@ // Subspace stock parts -/obj/item/weapon/stock_parts/subspace/ansible +/obj/item/stock_parts/subspace/ansible name = "subspace ansible" icon_state = "subspace_ansible" desc = "A compact module capable of sensing extradimensional activity." origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 5 ,TECH_MATERIAL = 4, TECH_BLUESPACE = 2) matter = list(MAT_STEEL = 30,MAT_GLASS = 10) -/obj/item/weapon/stock_parts/subspace/sub_filter +/obj/item/stock_parts/subspace/sub_filter name = "hyperwave filter" icon_state = "hyperwave_filter" desc = "A tiny device capable of filtering and converting super-intense radiowaves." origin_tech = list(TECH_DATA = 4, TECH_MAGNET = 2) matter = list(MAT_STEEL = 30,MAT_GLASS = 10) -/obj/item/weapon/stock_parts/subspace/amplifier +/obj/item/stock_parts/subspace/amplifier name = "subspace amplifier" icon_state = "subspace_amplifier" desc = "A compact micro-machine capable of amplifying weak subspace transmissions." origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) matter = list(MAT_STEEL = 30,MAT_GLASS = 10) -/obj/item/weapon/stock_parts/subspace/treatment +/obj/item/stock_parts/subspace/treatment name = "subspace treatment disk" icon_state = "treatment_disk" desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves." origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 2, TECH_MATERIAL = 5, TECH_BLUESPACE = 2) matter = list(MAT_STEEL = 30,MAT_GLASS = 10) -/obj/item/weapon/stock_parts/subspace/analyzer +/obj/item/stock_parts/subspace/analyzer name = "subspace wavelength analyzer" icon_state = "wavelength_analyzer" desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) matter = list(MAT_STEEL = 30,MAT_GLASS = 10) -/obj/item/weapon/stock_parts/subspace/crystal +/obj/item/stock_parts/subspace/crystal name = "ansible crystal" icon_state = "ansible_crystal" desc = "A crystal made from pure glass used to transmit laser databursts to subspace." origin_tech = list(TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) matter = list(MAT_GLASS = 50) -/obj/item/weapon/stock_parts/subspace/transmitter +/obj/item/stock_parts/subspace/transmitter name = "subspace transmitter" icon_state = "subspace_transmitter" desc = "A large piece of equipment used to open a window into the subspace dimension." origin_tech = list(TECH_MAGNET = 5, TECH_MATERIAL = 5, TECH_BLUESPACE = 3) matter = list(MAT_STEEL = 50) -/obj/item/weapon/ectoplasm +/obj/item/ectoplasm name = "ectoplasm" desc = "Spooky!" gender = PLURAL icon = 'icons/obj/wizard.dmi' icon_state = "ectoplasm2" -/obj/item/weapon/research +/obj/item/research name = "research debugging device" desc = "Instant research tool. For testing purposes only." icon = 'icons/obj/stock_parts.dmi' @@ -796,7 +796,7 @@ // Additional construction stock parts -/obj/item/weapon/stock_parts/gear +/obj/item/stock_parts/gear name = "gear" desc = "A gear used for construction." icon = 'icons/obj/stock_parts.dmi' @@ -804,7 +804,7 @@ origin_tech = list(TECH_ENGINEERING = 1) matter = list(MAT_STEEL = 50) -/obj/item/weapon/stock_parts/motor +/obj/item/stock_parts/motor name = "motor" desc = "A motor used for construction." icon = 'icons/obj/stock_parts.dmi' @@ -812,7 +812,7 @@ origin_tech = list(TECH_ENGINEERING = 1) matter = list(MAT_STEEL = 60, MAT_GLASS = 10) -/obj/item/weapon/stock_parts/spring +/obj/item/stock_parts/spring name = "spring" desc = "A spring used for construction." icon = 'icons/obj/stock_parts.dmi' @@ -838,53 +838,53 @@ name = "basic parts bundle" desc = "5 of each T1 part, no more and no less." items = list( - /obj/item/weapon/stock_parts/matter_bin, - /obj/item/weapon/stock_parts/manipulator, - /obj/item/weapon/stock_parts/capacitor, - /obj/item/weapon/stock_parts/scanning_module, - /obj/item/weapon/stock_parts/micro_laser + /obj/item/stock_parts/matter_bin, + /obj/item/stock_parts/manipulator, + /obj/item/stock_parts/capacitor, + /obj/item/stock_parts/scanning_module, + /obj/item/stock_parts/micro_laser ) /obj/effect/spawner/parts/t2 name = "advanced parts bundle" desc = "5 of each T2 part, no more and no less." items = list( - /obj/item/weapon/stock_parts/matter_bin/adv, - /obj/item/weapon/stock_parts/manipulator/nano, - /obj/item/weapon/stock_parts/capacitor/adv, - /obj/item/weapon/stock_parts/scanning_module/adv, - /obj/item/weapon/stock_parts/micro_laser/high + /obj/item/stock_parts/matter_bin/adv, + /obj/item/stock_parts/manipulator/nano, + /obj/item/stock_parts/capacitor/adv, + /obj/item/stock_parts/scanning_module/adv, + /obj/item/stock_parts/micro_laser/high ) /obj/effect/spawner/parts/t3 name = "super parts bundle" desc = "5 of each T3 part, no more and no less." items = list( - /obj/item/weapon/stock_parts/matter_bin/super, - /obj/item/weapon/stock_parts/manipulator/pico, - /obj/item/weapon/stock_parts/capacitor/super, - /obj/item/weapon/stock_parts/scanning_module/phasic, - /obj/item/weapon/stock_parts/micro_laser/ultra + /obj/item/stock_parts/matter_bin/super, + /obj/item/stock_parts/manipulator/pico, + /obj/item/stock_parts/capacitor/super, + /obj/item/stock_parts/scanning_module/phasic, + /obj/item/stock_parts/micro_laser/ultra ) /obj/effect/spawner/parts/t4 name = "hyper parts bundle" desc = "5 of each T4 part, no more and no less." items = list( - /obj/item/weapon/stock_parts/matter_bin/hyper, - /obj/item/weapon/stock_parts/manipulator/hyper, - /obj/item/weapon/stock_parts/capacitor/hyper, - /obj/item/weapon/stock_parts/scanning_module/hyper, - /obj/item/weapon/stock_parts/micro_laser/hyper + /obj/item/stock_parts/matter_bin/hyper, + /obj/item/stock_parts/manipulator/hyper, + /obj/item/stock_parts/capacitor/hyper, + /obj/item/stock_parts/scanning_module/hyper, + /obj/item/stock_parts/micro_laser/hyper ) /obj/effect/spawner/parts/t5 name = "omni parts bundle" desc = "5 of each T5 part, no more and no less." items = list( - /obj/item/weapon/stock_parts/matter_bin/omni, - /obj/item/weapon/stock_parts/manipulator/omni, - /obj/item/weapon/stock_parts/capacitor/omni, - /obj/item/weapon/stock_parts/scanning_module/omni, - /obj/item/weapon/stock_parts/micro_laser/omni + /obj/item/stock_parts/matter_bin/omni, + /obj/item/stock_parts/manipulator/omni, + /obj/item/stock_parts/capacitor/omni, + /obj/item/stock_parts/scanning_module/omni, + /obj/item/stock_parts/micro_laser/omni ) diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index 858875a9827..9e8270e9cf1 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -131,7 +131,7 @@ log_game("[key_name(usr)] has made \a [announcement_type]: [message_title] - [message] - [announcer]") message_admins("[key_name_admin(usr)] has made \a [announcement_type].", 1) -/proc/GetNameAndAssignmentFromId(var/obj/item/weapon/card/id/I) +/proc/GetNameAndAssignmentFromId(var/obj/item/card/id/I) // Format currently matches that of newscaster feeds: Registered Name (Assigned Rank) return I.assignment ? "[I.registered_name] ([I.assignment])" : I.registered_name diff --git a/code/game/antagonist/antagonist.dm b/code/game/antagonist/antagonist.dm index cf81f4053df..bc1374c8074 100644 --- a/code/game/antagonist/antagonist.dm +++ b/code/game/antagonist/antagonist.dm @@ -72,7 +72,7 @@ // ID card stuff. var/default_access = list() - var/id_type = /obj/item/weapon/card/id + var/id_type = /obj/item/card/id var/antag_text = "You are an antagonist! Within the rules, \ try to act as an opposing force to the crew. Further RP and try to make sure \ diff --git a/code/game/antagonist/antagonist_create.dm b/code/game/antagonist/antagonist_create.dm index 3dd683377f0..4aaba2802b2 100644 --- a/code/game/antagonist/antagonist_create.dm +++ b/code/game/antagonist/antagonist_create.dm @@ -32,7 +32,7 @@ /datum/antagonist/proc/create_id(var/assignment, var/mob/living/carbon/human/player, var/equip = 1) - var/obj/item/weapon/card/id/W = new id_type(player) + var/obj/item/card/id/W = new id_type(player) if(!W) return W.access |= default_access W.assignment = "[assignment]" @@ -41,15 +41,15 @@ return W /datum/antagonist/proc/create_radio(var/freq, var/mob/living/carbon/human/player) - var/obj/item/device/radio/R + var/obj/item/radio/R switch(freq) if(SYND_FREQ) - R = new/obj/item/device/radio/headset/syndicate(player) + R = new/obj/item/radio/headset/syndicate(player) if(RAID_FREQ) - R = new/obj/item/device/radio/headset/raider(player) + R = new/obj/item/radio/headset/raider(player) else - R = new/obj/item/device/radio/headset(player) + R = new/obj/item/radio/headset(player) R.set_frequency(freq) player.equip_to_slot_or_del(R, slot_l_ear) @@ -75,7 +75,7 @@ if(paper_spawn_loc) // Create and pass on the bomb code paper. - var/obj/item/weapon/paper/P = new(paper_spawn_loc) + var/obj/item/paper/P = new(paper_spawn_loc) P.info = "The nuclear authorization code is: [code]" P.name = "nuclear bomb code" if(leader && leader.current) diff --git a/code/game/antagonist/antagonist_panel.dm b/code/game/antagonist/antagonist_panel.dm index 0a165ce8ee9..0f42ad5893f 100644 --- a/code/game/antagonist/antagonist_panel.dm +++ b/code/game/antagonist/antagonist_panel.dm @@ -39,7 +39,7 @@ if(flags & ANTAG_HAS_NUKE) dat += "
" - for(var/obj/item/weapon/disk/nuclear/N in nuke_disks) + for(var/obj/item/disk/nuclear/N in nuke_disks) dat += "
Nuclear disk(s)
[N.name], " var/atom/disk_loc = N.loc while(!istype(disk_loc, /turf)) diff --git a/code/game/antagonist/antagonist_update.dm b/code/game/antagonist/antagonist_update.dm index b118cb91db8..e93e1e4c401 100644 --- a/code/game/antagonist/antagonist_update.dm +++ b/code/game/antagonist/antagonist_update.dm @@ -19,7 +19,7 @@ return player.current /datum/antagonist/proc/update_access(var/mob/living/player) - for(var/obj/item/weapon/card/id/id in player.contents) + for(var/obj/item/card/id/id in player.contents) player.set_id_info(id) /datum/antagonist/proc/clear_indicators(var/datum/mind/recipient) diff --git a/code/game/antagonist/outsider/commando.dm b/code/game/antagonist/outsider/commando.dm index b7bd756c97a..d0acbf61e73 100644 --- a/code/game/antagonist/outsider/commando.dm +++ b/code/game/antagonist/outsider/commando.dm @@ -7,7 +7,7 @@ var/datum/antagonist/deathsquad/mercenary/commandos role_text_plural = "Commandos" welcome_text = "You are in the employ of a criminal syndicate hostile to corporate interests." antag_sound = 'sound/effects/antag_notice/deathsquid_alert.ogg' - id_type = /obj/item/weapon/card/id/centcom/ERT + id_type = /obj/item/card/id/centcom/ERT hard_cap = 4 hard_cap_round = 8 @@ -22,15 +22,15 @@ var/datum/antagonist/deathsquad/mercenary/commandos /datum/antagonist/deathsquad/mercenary/equip(var/mob/living/carbon/human/player) player.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(player), slot_w_uniform) - player.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/silenced(player), slot_belt) + player.equip_to_slot_or_del(new /obj/item/gun/projectile/silenced(player), slot_belt) player.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/swat(player), slot_shoes) player.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(player), slot_gloves) player.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(player), slot_glasses) player.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(player), slot_wear_mask) - player.equip_to_slot_or_del(new /obj/item/weapon/storage/box(player), slot_in_backpack) + player.equip_to_slot_or_del(new /obj/item/storage/box(player), slot_in_backpack) player.equip_to_slot_or_del(new /obj/item/ammo_magazine/clip/c45(player), slot_in_backpack) - player.equip_to_slot_or_del(new /obj/item/weapon/rig/merc(player), slot_back) - player.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle(player), slot_r_hand) + player.equip_to_slot_or_del(new /obj/item/rig/merc(player), slot_back) + player.equip_to_slot_or_del(new /obj/item/gun/energy/pulse_rifle(player), slot_r_hand) create_id("Commando", player) create_radio(SYND_FREQ, player) diff --git a/code/game/antagonist/outsider/deathsquad.dm b/code/game/antagonist/outsider/deathsquad.dm index 01b579b7de3..54ab78dd360 100644 --- a/code/game/antagonist/outsider/deathsquad.dm +++ b/code/game/antagonist/outsider/deathsquad.dm @@ -42,17 +42,17 @@ var/datum/antagonist/deathsquad/deathsquad player.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(player), slot_glasses) player.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/swat(player), slot_wear_mask) if (player.mind == leader) - player.equip_to_slot_or_del(new /obj/item/weapon/pinpointer(player), slot_l_store) - player.equip_to_slot_or_del(new /obj/item/weapon/disk/nuclear(player), slot_r_store) + player.equip_to_slot_or_del(new /obj/item/pinpointer(player), slot_l_store) + player.equip_to_slot_or_del(new /obj/item/disk/nuclear(player), slot_r_store) else - player.equip_to_slot_or_del(new /obj/item/weapon/plastique(player), slot_l_store) - player.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(player), slot_belt) - player.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle(player), slot_r_hand) - player.equip_to_slot_or_del(new /obj/item/weapon/rig/ert/assetprotection(player), slot_back) - player.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword(player), slot_s_store) + player.equip_to_slot_or_del(new /obj/item/plastique(player), slot_l_store) + player.equip_to_slot_or_del(new /obj/item/gun/projectile/revolver/mateba(player), slot_belt) + player.equip_to_slot_or_del(new /obj/item/gun/energy/pulse_rifle(player), slot_r_hand) + player.equip_to_slot_or_del(new /obj/item/rig/ert/assetprotection(player), slot_back) + player.equip_to_slot_or_del(new /obj/item/melee/energy/sword(player), slot_s_store) // player.implant_loyalty() - var/obj/item/weapon/card/id/id = create_id("Asset Protection", player) + var/obj/item/card/id/id = create_id("Asset Protection", player) if(id) id.access |= get_all_station_access() id.icon_state = "centcom" diff --git a/code/game/antagonist/outsider/ert.dm b/code/game/antagonist/outsider/ert.dm index 59e6a4a30c8..9c8884caed6 100644 --- a/code/game/antagonist/outsider/ert.dm +++ b/code/game/antagonist/outsider/ert.dm @@ -16,7 +16,7 @@ var/datum/antagonist/ert/ert rules aside from those without explicit exceptions apply to the ERT." leader_welcome_text = "As leader of the Emergency Response Team, you answer only to the Company, and have authority to override the " + JOB_SITE_MANAGER + " where it is necessary to achieve your mission goals. It is recommended that you attempt to cooperate with the " + JOB_SITE_MANAGER + " where possible, however." landmark_id = "Response Team" - id_type = /obj/item/weapon/card/id/centcom/ERT + id_type = /obj/item/card/id/centcom/ERT flags = ANTAG_OVERRIDE_JOB | ANTAG_SET_APPEARANCE | ANTAG_HAS_LEADER | ANTAG_CHOOSE_NAME antaghud_indicator = "hudloyalist" @@ -46,7 +46,7 @@ var/datum/antagonist/ert/ert /datum/antagonist/ert/equip(var/mob/living/carbon/human/player) //Special radio setup - player.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert(src), slot_l_ear) + player.equip_to_slot_or_del(new /obj/item/radio/headset/ert(src), slot_l_ear) player.equip_to_slot_or_del(new /obj/item/clothing/under/ert(src), slot_w_uniform) player.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/swat(src), slot_shoes) player.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(src), slot_gloves) diff --git a/code/game/antagonist/outsider/mercenary.dm b/code/game/antagonist/outsider/mercenary.dm index 623291dde7d..47f2cd85bcc 100644 --- a/code/game/antagonist/outsider/mercenary.dm +++ b/code/game/antagonist/outsider/mercenary.dm @@ -11,7 +11,7 @@ var/datum/antagonist/mercenary/mercs leader_welcome_text = "You are the leader of the mercenary strikeforce; hail to the chief. Use :t to speak to your underlings." welcome_text = "To speak on the strike team's private channel use :t." flags = ANTAG_OVERRIDE_JOB | ANTAG_CLEAR_EQUIPMENT | ANTAG_CHOOSE_NAME | ANTAG_HAS_NUKE | ANTAG_SET_APPEARANCE | ANTAG_HAS_LEADER - id_type = /obj/item/weapon/card/id/syndicate + id_type = /obj/item/card/id/syndicate antaghud_indicator = "hudoperative" hard_cap = 4 @@ -38,17 +38,17 @@ var/datum/antagonist/mercenary/mercs player.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(player), slot_w_uniform) player.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/swat(player), slot_shoes) player.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(player), slot_gloves) - if(player.backbag == 2) player.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(player), slot_back) - if(player.backbag == 3) player.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(player), slot_back) - if(player.backbag == 4) player.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(player), slot_back) - if(player.backbag == 5) player.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger(player), slot_back) - if(player.backbag == 6) player.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/sport(player), slot_back) - player.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/pill/cyanide(player), slot_in_backpack) + if(player.backbag == 2) player.equip_to_slot_or_del(new /obj/item/storage/backpack(player), slot_back) + if(player.backbag == 3) player.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(player), slot_back) + if(player.backbag == 4) player.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(player), slot_back) + if(player.backbag == 5) player.equip_to_slot_or_del(new /obj/item/storage/backpack/messenger(player), slot_back) + if(player.backbag == 6) player.equip_to_slot_or_del(new /obj/item/storage/backpack/sport(player), slot_back) + player.equip_to_slot_or_del(new /obj/item/reagent_containers/pill/cyanide(player), slot_in_backpack) player.mind.tcrystals = DEFAULT_TELECRYSTAL_AMOUNT player.mind.accept_tcrystals = 1 - var/obj/item/device/radio/uplink/U = new(player.loc, player.mind, DEFAULT_TELECRYSTAL_AMOUNT) + var/obj/item/radio/uplink/U = new(player.loc, player.mind, DEFAULT_TELECRYSTAL_AMOUNT) player.put_in_hands(U) create_id("Mercenary", player) diff --git a/code/game/antagonist/outsider/ninja.dm b/code/game/antagonist/outsider/ninja.dm index 5ed22f4d49b..261c798cbde 100644 --- a/code/game/antagonist/outsider/ninja.dm +++ b/code/game/antagonist/outsider/ninja.dm @@ -16,7 +16,7 @@ var/datum/antagonist/ninja/ninjas hard_cap = 1 hard_cap_round = 3 - id_type = /obj/item/weapon/card/id/syndicate + id_type = /obj/item/card/id/syndicate /datum/antagonist/ninja/New() ..() @@ -103,13 +103,13 @@ var/datum/antagonist/ninja/ninjas if(!..()) return 0 - var/obj/item/device/radio/R = new /obj/item/device/radio/headset(player) + var/obj/item/radio/R = new /obj/item/radio/headset(player) player.equip_to_slot_or_del(R, slot_l_ear) player.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(player), slot_w_uniform) - player.equip_to_slot_or_del(new /obj/item/device/flashlight(player), slot_belt) + player.equip_to_slot_or_del(new /obj/item/flashlight(player), slot_belt) create_id("Infiltrator", player) - var/obj/item/weapon/rig/light/ninja/ninjasuit = new(get_turf(player)) + var/obj/item/rig/light/ninja/ninjasuit = new(get_turf(player)) ninjasuit.seal_delay = 0 player.put_in_hands(ninjasuit) player.equip_to_slot_or_del(ninjasuit,slot_back) @@ -117,8 +117,8 @@ var/datum/antagonist/ninja/ninjas ninjasuit.toggle_seals(src,1) ninjasuit.seal_delay = initial(ninjasuit.seal_delay) - if(istype(player.back,/obj/item/weapon/rig)) - var/obj/item/weapon/rig/rig = player.back + if(istype(player.back,/obj/item/rig)) + var/obj/item/rig/rig = player.back if(rig.air_supply) player.internal = rig.air_supply diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm index 5337ec9a0cf..bc17d1175d5 100644 --- a/code/game/antagonist/outsider/raider.dm +++ b/code/game/antagonist/outsider/raider.dm @@ -17,7 +17,7 @@ var/datum/antagonist/raider/raiders initial_spawn_req = 3 initial_spawn_target = 3 - id_type = /obj/item/weapon/card/id/syndicate + id_type = /obj/item/card/id/syndicate // Heist overrides check_victory() and doesn't need victory or loss strings/tags. var/list/raider_uniforms = list( @@ -64,40 +64,40 @@ var/datum/antagonist/raider/raiders ) var/list/raider_guns = list( - /obj/item/weapon/gun/energy/laser, - /obj/item/weapon/gun/energy/retro, - /obj/item/weapon/gun/energy/xray, - /obj/item/weapon/gun/energy/mindflayer, - /obj/item/weapon/gun/energy/toxgun, - /obj/item/weapon/gun/energy/stunrevolver, - /obj/item/weapon/gun/energy/stunrevolver/vintage, - /obj/item/weapon/gun/energy/ionrifle, - /obj/item/weapon/gun/energy/taser, - /obj/item/weapon/gun/energy/crossbow/largecrossbow, - /obj/item/weapon/gun/launcher/crossbow, - /obj/item/weapon/gun/launcher/grenade, - /obj/item/weapon/gun/launcher/pneumatic, - /obj/item/weapon/gun/projectile/automatic/mini_uzi, - /obj/item/weapon/gun/projectile/automatic/c20r, - /obj/item/weapon/gun/projectile/automatic/wt550, - /obj/item/weapon/gun/projectile/automatic/sts35, - /obj/item/weapon/gun/projectile/automatic/bullpup, - /obj/item/weapon/gun/projectile/automatic/tommygun, - /obj/item/weapon/gun/projectile/silenced, - /obj/item/weapon/gun/projectile/shotgun/pump, - /obj/item/weapon/gun/projectile/shotgun/pump/combat, - /obj/item/weapon/gun/projectile/shotgun/pump/rifle, - /obj/item/weapon/gun/projectile/shotgun/doublebarrel, - /obj/item/weapon/gun/projectile/shotgun/doublebarrel/pellet, - /obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn, - /obj/item/weapon/gun/projectile/colt/detective, - /obj/item/weapon/gun/projectile/pistol, - /obj/item/weapon/gun/projectile/p92x, - /obj/item/weapon/gun/projectile/revolver, - /obj/item/weapon/gun/projectile/pirate, - /obj/item/weapon/gun/projectile/revolver/judge, - list(/obj/item/weapon/gun/projectile/luger,/obj/item/weapon/gun/projectile/luger/brown), - list(/obj/item/weapon/gun/projectile/deagle, /obj/item/weapon/gun/projectile/deagle/gold, /obj/item/weapon/gun/projectile/deagle/camo) + /obj/item/gun/energy/laser, + /obj/item/gun/energy/retro, + /obj/item/gun/energy/xray, + /obj/item/gun/energy/mindflayer, + /obj/item/gun/energy/toxgun, + /obj/item/gun/energy/stunrevolver, + /obj/item/gun/energy/stunrevolver/vintage, + /obj/item/gun/energy/ionrifle, + /obj/item/gun/energy/taser, + /obj/item/gun/energy/crossbow/largecrossbow, + /obj/item/gun/launcher/crossbow, + /obj/item/gun/launcher/grenade, + /obj/item/gun/launcher/pneumatic, + /obj/item/gun/projectile/automatic/mini_uzi, + /obj/item/gun/projectile/automatic/c20r, + /obj/item/gun/projectile/automatic/wt550, + /obj/item/gun/projectile/automatic/sts35, + /obj/item/gun/projectile/automatic/bullpup, + /obj/item/gun/projectile/automatic/tommygun, + /obj/item/gun/projectile/silenced, + /obj/item/gun/projectile/shotgun/pump, + /obj/item/gun/projectile/shotgun/pump/combat, + /obj/item/gun/projectile/shotgun/pump/rifle, + /obj/item/gun/projectile/shotgun/doublebarrel, + /obj/item/gun/projectile/shotgun/doublebarrel/pellet, + /obj/item/gun/projectile/shotgun/doublebarrel/sawn, + /obj/item/gun/projectile/colt/detective, + /obj/item/gun/projectile/pistol, + /obj/item/gun/projectile/p92x, + /obj/item/gun/projectile/revolver, + /obj/item/gun/projectile/pirate, + /obj/item/gun/projectile/revolver/judge, + list(/obj/item/gun/projectile/luger,/obj/item/gun/projectile/luger/brown), + list(/obj/item/gun/projectile/deagle, /obj/item/gun/projectile/deagle/gold, /obj/item/gun/projectile/deagle/camo) ) var/list/raider_holster = list( @@ -111,8 +111,8 @@ var/datum/antagonist/raider/raiders raiders = src /datum/antagonist/raider/update_access(var/mob/living/player) - for(var/obj/item/weapon/storage/wallet/W in player.contents) - for(var/obj/item/weapon/card/id/id in W.contents) + for(var/obj/item/storage/wallet/W in player.contents) + for(var/obj/item/card/id/id in W.contents) id.name = "[player.real_name]'s Passport" id.registered_name = player.real_name W.name = "[initial(W.name)] ([id.name])" @@ -227,10 +227,10 @@ var/datum/antagonist/raider/raiders player.equip_to_slot_or_del(new new_suit(player),slot_wear_suit) equip_weapons(player) - var/obj/item/weapon/card/id/id = create_id(JOB_ALT_VISITOR, player, equip = 0) + var/obj/item/card/id/id = create_id(JOB_ALT_VISITOR, player, equip = 0) id.name = "[player.real_name]'s Passport" id.assignment = JOB_ALT_VISITOR - var/obj/item/weapon/storage/wallet/W = new(player) + var/obj/item/storage/wallet/W = new(player) W.handle_item_insertion(id) player.equip_to_slot_or_del(W, slot_wear_id) spawn_money(rand(50,150)*10,W) @@ -248,7 +248,7 @@ var/datum/antagonist/raider/raiders //Give some of the raiders a pirate gun as a secondary if(prob(60)) - var/obj/item/secondary = new /obj/item/weapon/gun/projectile/pirate(T) + var/obj/item/secondary = new /obj/item/gun/projectile/pirate(T) if(!(primary.slot_flags & SLOT_HOLSTER)) holster = new new_holster(T) holster.holstered = secondary @@ -277,26 +277,26 @@ var/datum/antagonist/raider/raiders else player.put_in_any_hand_if_possible(holster) -/datum/antagonist/raider/proc/equip_ammo(var/mob/living/carbon/human/player, var/obj/item/weapon/gun/gun) - if(istype(gun, /obj/item/weapon/gun/projectile)) - var/obj/item/weapon/gun/projectile/bullet_thrower = gun +/datum/antagonist/raider/proc/equip_ammo(var/mob/living/carbon/human/player, var/obj/item/gun/gun) + if(istype(gun, /obj/item/gun/projectile)) + var/obj/item/gun/projectile/bullet_thrower = gun if(bullet_thrower.magazine_type) player.equip_to_slot_or_del(new bullet_thrower.magazine_type(player), slot_l_store) if(prob(20)) //don't want to give them too much player.equip_to_slot_or_del(new bullet_thrower.magazine_type(player), slot_r_store) else if(bullet_thrower.ammo_type) - var/obj/item/weapon/storage/box/ammobox = new(get_turf(player.loc)) + var/obj/item/storage/box/ammobox = new(get_turf(player.loc)) for(var/i in 1 to rand(3,5) + rand(0,2)) new bullet_thrower.ammo_type(ammobox) player.put_in_any_hand_if_possible(ammobox) return - if(istype(gun, /obj/item/weapon/gun/launcher/grenade)) + if(istype(gun, /obj/item/gun/launcher/grenade)) var/list/grenades = list( - /obj/item/weapon/grenade/empgrenade, - /obj/item/weapon/grenade/smokebomb, - /obj/item/weapon/grenade/flashbang + /obj/item/grenade/empgrenade, + /obj/item/grenade/smokebomb, + /obj/item/grenade/flashbang ) - var/obj/item/weapon/storage/box/ammobox = new(get_turf(player.loc)) + var/obj/item/storage/box/ammobox = new(get_turf(player.loc)) for(var/i in 1 to 7) var/grenade_type = pick(grenades) new grenade_type(ammobox) @@ -310,11 +310,11 @@ var/datum/antagonist/raider/raiders player.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/vox(player), slot_shoes) // REPLACE THESE WITH CODED VOX ALTERNATIVES. player.equip_to_slot_or_del(new /obj/item/clothing/gloves/vox(player), slot_gloves) // AS ABOVE. player.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/swat/vox(player), slot_wear_mask) - player.equip_to_slot_or_del(new /obj/item/weapon/tank/vox(player), slot_back) - player.equip_to_slot_or_del(new /obj/item/device/flashlight(player), slot_r_store) + player.equip_to_slot_or_del(new /obj/item/tank/vox(player), slot_back) + player.equip_to_slot_or_del(new /obj/item/flashlight(player), slot_r_store) - player.internal = locate(/obj/item/weapon/tank) in player.contents - if(istype(player.internal,/obj/item/weapon/tank) && player.internals) + player.internal = locate(/obj/item/tank) in player.contents + if(istype(player.internal,/obj/item/tank) && player.internals) player.internals.icon_state = "internal1" return 1 diff --git a/code/game/antagonist/outsider/technomancer.dm b/code/game/antagonist/outsider/technomancer.dm index e0b2f87433b..dc6e5567a57 100644 --- a/code/game/antagonist/outsider/technomancer.dm +++ b/code/game/antagonist/outsider/technomancer.dm @@ -20,7 +20,7 @@ var/datum/antagonist/technomancer/technomancers initial_spawn_req = 1 initial_spawn_target = 1 - id_type = /obj/item/weapon/card/id/syndicate + id_type = /obj/item/card/id/syndicate /datum/antagonist/technomancer/New() ..() @@ -39,13 +39,13 @@ var/datum/antagonist/technomancer/technomancers technomancer_mob.equip_to_slot_or_del(new /obj/item/clothing/under/technomancer/master(technomancer_mob), slot_w_uniform) create_id("Technomagus", technomancer_mob) - technomancer_mob.equip_to_slot_or_del(new /obj/item/weapon/disposable_teleporter/free(technomancer_mob), slot_r_store) - technomancer_mob.equip_to_slot_or_del(new /obj/item/weapon/technomancer_catalog(technomancer_mob), slot_l_store) - technomancer_mob.equip_to_slot_or_del(new /obj/item/device/radio/headset(technomancer_mob), slot_l_ear) - var/obj/item/weapon/technomancer_core/core = new /obj/item/weapon/technomancer_core(technomancer_mob) + technomancer_mob.equip_to_slot_or_del(new /obj/item/disposable_teleporter/free(technomancer_mob), slot_r_store) + technomancer_mob.equip_to_slot_or_del(new /obj/item/technomancer_catalog(technomancer_mob), slot_l_store) + technomancer_mob.equip_to_slot_or_del(new /obj/item/radio/headset(technomancer_mob), slot_l_ear) + var/obj/item/technomancer_core/core = new /obj/item/technomancer_core(technomancer_mob) technomancer_mob.equip_to_slot_or_del(core, slot_back) technomancer_belongings.Add(core) // So it can be Tracked. - technomancer_mob.equip_to_slot_or_del(new /obj/item/device/flashlight(technomancer_mob), slot_belt) + technomancer_mob.equip_to_slot_or_del(new /obj/item/flashlight(technomancer_mob), slot_belt) technomancer_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(technomancer_mob), slot_shoes) technomancer_mob.equip_to_slot_or_del(new /obj/item/clothing/head/technomancer/master(technomancer_mob), slot_head) return 1 @@ -54,17 +54,17 @@ var/datum/antagonist/technomancer/technomancers technomancer_mob.equip_to_slot_or_del(new /obj/item/clothing/under/technomancer/apprentice(technomancer_mob), slot_w_uniform) create_id("Techno-apprentice", technomancer_mob) - technomancer_mob.equip_to_slot_or_del(new /obj/item/weapon/disposable_teleporter/free(technomancer_mob), slot_r_store) + technomancer_mob.equip_to_slot_or_del(new /obj/item/disposable_teleporter/free(technomancer_mob), slot_r_store) - var/obj/item/weapon/technomancer_catalog/apprentice/catalog = new /obj/item/weapon/technomancer_catalog/apprentice() + var/obj/item/technomancer_catalog/apprentice/catalog = new /obj/item/technomancer_catalog/apprentice() catalog.bind_to_owner(technomancer_mob) technomancer_mob.equip_to_slot_or_del(catalog, slot_l_store) - technomancer_mob.equip_to_slot_or_del(new /obj/item/device/radio/headset(technomancer_mob), slot_l_ear) - var/obj/item/weapon/technomancer_core/core = new /obj/item/weapon/technomancer_core(technomancer_mob) + technomancer_mob.equip_to_slot_or_del(new /obj/item/radio/headset(technomancer_mob), slot_l_ear) + var/obj/item/technomancer_core/core = new /obj/item/technomancer_core(technomancer_mob) technomancer_mob.equip_to_slot_or_del(core, slot_back) technomancer_belongings.Add(core) // So it can be Tracked. - technomancer_mob.equip_to_slot_or_del(new /obj/item/device/flashlight(technomancer_mob), slot_belt) + technomancer_mob.equip_to_slot_or_del(new /obj/item/flashlight(technomancer_mob), slot_belt) technomancer_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(technomancer_mob), slot_shoes) technomancer_mob.equip_to_slot_or_del(new /obj/item/clothing/head/technomancer/apprentice(technomancer_mob), slot_head) return 1 @@ -82,7 +82,7 @@ var/datum/antagonist/technomancer/technomancers /datum/antagonist/technomancer/print_player_summary() ..() - for(var/obj/item/weapon/technomancer_core/core in technomancer_belongings) + for(var/obj/item/technomancer_core/core in technomancer_belongings) if(core.wearer) continue // Only want abandoned cores. if(!core.spells.len) @@ -92,7 +92,7 @@ var/datum/antagonist/technomancer/technomancers /datum/antagonist/technomancer/print_player_full(var/datum/mind/player) var/text = print_player_lite(player) - var/obj/item/weapon/technomancer_core/core + var/obj/item/technomancer_core/core if(player.original) core = locate() in player.original if(core) diff --git a/code/game/antagonist/outsider/trader.dm b/code/game/antagonist/outsider/trader.dm index 07cfb6f9e98..9f09d492aac 100644 --- a/code/game/antagonist/outsider/trader.dm +++ b/code/game/antagonist/outsider/trader.dm @@ -16,7 +16,7 @@ var/datum/antagonist/trader/traders leader_welcome_text = "As Captain of the Beruang, you have control over your crew and cargo. It may be worth briefly discussing a consistent shared backstory with your crew." landmark_id = "Trader" - id_type = /obj/item/weapon/card/id/external + id_type = /obj/item/card/id/external flags = ANTAG_OVERRIDE_JOB | ANTAG_SET_APPEARANCE | ANTAG_HAS_LEADER | ANTAG_CHOOSE_NAME @@ -49,11 +49,11 @@ var/datum/antagonist/trader/traders create_radio(PUB_FREQ, player) //Assume they tune their headsets into the station's public radio as they approach - var/obj/item/weapon/card/id/id = create_id("Trader", player, equip = 0) + var/obj/item/card/id/id = create_id("Trader", player, equip = 0) id.name = "[player.real_name]'s Passport" id.assignment = "Trader" id.access |= access_trader - var/obj/item/weapon/storage/wallet/W = new(player) + var/obj/item/storage/wallet/W = new(player) W.handle_item_insertion(id) player.equip_to_slot_or_del(W, slot_wear_id) spawn_money(rand(50,150)*10,W) @@ -61,8 +61,8 @@ var/datum/antagonist/trader/traders return 1 /datum/antagonist/trader/update_access(var/mob/living/player) - for(var/obj/item/weapon/storage/wallet/W in player.contents) - for(var/obj/item/weapon/card/id/id in W.contents) + for(var/obj/item/storage/wallet/W in player.contents) + for(var/obj/item/card/id/id in W.contents) id.name = "[player.real_name]'s Passport" id.registered_name = player.real_name W.name = "[initial(W.name)] ([id.name])" \ No newline at end of file diff --git a/code/game/antagonist/outsider/wizard.dm b/code/game/antagonist/outsider/wizard.dm index 8c97145f188..76022fc5548 100644 --- a/code/game/antagonist/outsider/wizard.dm +++ b/code/game/antagonist/outsider/wizard.dm @@ -75,19 +75,19 @@ var/datum/antagonist/wizard/wizards if(!..()) return 0 - wizard_mob.equip_to_slot_or_del(new /obj/item/device/radio/headset(wizard_mob), slot_l_ear) + wizard_mob.equip_to_slot_or_del(new /obj/item/radio/headset(wizard_mob), slot_l_ear) wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(wizard_mob), slot_w_uniform) wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(wizard_mob), slot_shoes) wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(wizard_mob), slot_wear_suit) wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(wizard_mob), slot_head) - if(wizard_mob.backbag == 2) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(wizard_mob), slot_back) - if(wizard_mob.backbag == 3) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(wizard_mob), slot_back) - if(wizard_mob.backbag == 4) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(wizard_mob), slot_back) - if(wizard_mob.backbag == 5) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger(wizard_mob), slot_back) - if(wizard_mob.backbag == 6) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/sport(wizard_mob), slot_back) - wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box(wizard_mob), slot_in_backpack) - wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll(wizard_mob), slot_r_store) - wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/spellbook(wizard_mob), slot_r_hand) + if(wizard_mob.backbag == 2) wizard_mob.equip_to_slot_or_del(new /obj/item/storage/backpack(wizard_mob), slot_back) + if(wizard_mob.backbag == 3) wizard_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(wizard_mob), slot_back) + if(wizard_mob.backbag == 4) wizard_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(wizard_mob), slot_back) + if(wizard_mob.backbag == 5) wizard_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/messenger(wizard_mob), slot_back) + if(wizard_mob.backbag == 6) wizard_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/sport(wizard_mob), slot_back) + wizard_mob.equip_to_slot_or_del(new /obj/item/storage/box(wizard_mob), slot_in_backpack) + wizard_mob.equip_to_slot_or_del(new /obj/item/teleportation_scroll(wizard_mob), slot_r_store) + wizard_mob.equip_to_slot_or_del(new /obj/item/spellbook(wizard_mob), slot_r_hand) return 1 /datum/antagonist/wizard/check_victory() diff --git a/code/game/antagonist/station/cultist.dm b/code/game/antagonist/station/cultist.dm index d96a0f57186..90987e11076 100644 --- a/code/game/antagonist/station/cultist.dm +++ b/code/game/antagonist/station/cultist.dm @@ -63,7 +63,7 @@ var/datum/antagonist/cultist/cult if(!..()) return 0 - var/obj/item/weapon/paper/talisman/supply/T = new(get_turf(player)) + var/obj/item/paper/talisman/supply/T = new(get_turf(player)) var/list/slots = list ( "backpack" = slot_in_backpack, "left pocket" = slot_l_store, @@ -75,7 +75,7 @@ var/datum/antagonist/cultist/cult player.equip_to_slot(T, slot) if(T.loc == player) break - var/obj/item/weapon/storage/S = locate() in player.contents + var/obj/item/storage/S = locate() in player.contents if(S && istype(S)) T.loc = S @@ -124,7 +124,7 @@ var/datum/antagonist/cultist/cult /datum/antagonist/cultist/can_become_antag(var/datum/mind/player) if(!..()) return 0 - for(var/obj/item/weapon/implant/loyalty/L in player.current) + for(var/obj/item/implant/loyalty/L in player.current) if(L && (L.imp_in == player.current)) return 0 return 1 diff --git a/code/game/antagonist/station/highlander.dm b/code/game/antagonist/station/highlander.dm index 2e4885fd769..0a21152aec9 100644 --- a/code/game/antagonist/station/highlander.dm +++ b/code/game/antagonist/station/highlander.dm @@ -12,7 +12,7 @@ var/datum/antagonist/highlander/highlanders initial_spawn_req = 3 initial_spawn_target = 5 - id_type = /obj/item/weapon/card/id/centcom/ERT + id_type = /obj/item/card/id/centcom/ERT /datum/antagonist/highlander/New() ..() @@ -47,11 +47,11 @@ var/datum/antagonist/highlander/highlanders // highlanders! player.equip_to_slot_or_del(new /obj/item/clothing/under/kilt(player), slot_w_uniform) player.equip_to_slot_or_del(new /obj/item/clothing/head/beret(player), slot_head) - player.equip_to_slot_or_del(new /obj/item/weapon/material/sword(player), slot_l_hand) + player.equip_to_slot_or_del(new /obj/item/material/sword(player), slot_l_hand) player.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/combat(player), slot_shoes) - player.equip_to_slot_or_del(new /obj/item/weapon/pinpointer(get_turf(player)), slot_l_store) + player.equip_to_slot_or_del(new /obj/item/pinpointer(get_turf(player)), slot_l_store) - var/obj/item/weapon/card/id/id = create_id("Highlander", player) + var/obj/item/card/id/id = create_id("Highlander", player) if(id) id.access |= get_all_station_access() id.icon_state = "centcom" diff --git a/code/game/antagonist/station/infiltrator.dm b/code/game/antagonist/station/infiltrator.dm index dfa8c7f9390..3cceac3a80f 100644 --- a/code/game/antagonist/station/infiltrator.dm +++ b/code/game/antagonist/station/infiltrator.dm @@ -25,15 +25,15 @@ var/datum/antagonist/traitor/infiltrator/infiltrators // Humans and the AI. if(istype(traitor_mob) || istype(traitor_mob, /mob/living/silicon/ai)) - var/obj/item/device/radio/headset/R - R = locate(/obj/item/device/radio/headset) in traitor_mob.contents + var/obj/item/radio/headset/R + R = locate(/obj/item/radio/headset) in traitor_mob.contents if(!R) to_chat(traitor_mob, "Unfortunately, a headset could not be found. You have been given an encryption key \ to put into a new headset. Once that is done, you can talk to your team using :t") - var/obj/item/device/encryptionkey/syndicate/encrypt_key = new(null) + var/obj/item/encryptionkey/syndicate/encrypt_key = new(null) traitor_mob.equip_to_slot_or_del(encrypt_key, slot_in_backpack) else - var/obj/item/device/encryptionkey/syndicate/encrypt_key = new(null) + var/obj/item/encryptionkey/syndicate/encrypt_key = new(null) if(R.keyslot1 && R.keyslot2) // No room. to_chat(traitor_mob, "Unfortunately, your headset cannot accept anymore encryption keys. You have been given an encryption key \ to put into a headset after making some room instead. Once that is done, you can talk to your team using :t") @@ -52,7 +52,7 @@ var/datum/antagonist/traitor/infiltrator/infiltrators // Borgs, because their radio is not a headset for some reason. if(istype(traitor_mob, /mob/living/silicon/robot)) var/mob/living/silicon/robot/borg = traitor_mob - var/obj/item/device/encryptionkey/syndicate/encrypt_key = new(null) + var/obj/item/encryptionkey/syndicate/encrypt_key = new(null) if(borg.radio) if(borg.radio.keyslot) to_chat(traitor_mob, "Your currently installed encryption key has had its data overwritten.") diff --git a/code/game/antagonist/station/renegade.dm b/code/game/antagonist/station/renegade.dm index cdd4efb8f3c..3d228e96d7c 100644 --- a/code/game/antagonist/station/renegade.dm +++ b/code/game/antagonist/station/renegade.dm @@ -26,40 +26,40 @@ var/datum/antagonist/renegade/renegades initial_spawn_target = 4 var/list/spawn_guns = list( - /obj/item/weapon/gun/energy/laser, - /obj/item/weapon/gun/energy/captain, - /obj/item/weapon/gun/energy/lasercannon, - /obj/item/weapon/gun/energy/xray, - /obj/item/weapon/gun/energy/gun, - /obj/item/weapon/gun/energy/gun/burst, - /obj/item/weapon/gun/energy/gun/nuclear, - /obj/item/weapon/gun/energy/crossbow, - /obj/item/weapon/gun/energy/crossbow/largecrossbow, - /obj/item/weapon/gun/projectile/automatic, - /obj/item/weapon/gun/projectile/automatic/mini_uzi, - /obj/item/weapon/gun/projectile/automatic/c20r, - /obj/item/weapon/gun/projectile/automatic/sts35, - /obj/item/weapon/gun/projectile/automatic/bullpup, - /obj/item/weapon/gun/projectile/automatic/wt550, - /obj/item/weapon/gun/projectile/automatic/z8, - /obj/item/weapon/gun/projectile/automatic/tommygun, - /obj/item/weapon/gun/projectile/colt/detective, - /obj/item/weapon/gun/projectile/sec/wood, - /obj/item/weapon/gun/projectile/silenced, - /obj/item/weapon/gun/projectile/pistol, - /obj/item/weapon/gun/projectile/p92x, - /obj/item/weapon/gun/projectile/revolver, - /obj/item/weapon/gun/projectile/derringer, - /obj/item/weapon/gun/projectile/shotgun/pump, - /obj/item/weapon/gun/projectile/shotgun/pump/rifle, - /obj/item/weapon/gun/projectile/shotgun/pump/combat, - /obj/item/weapon/gun/projectile/shotgun/doublebarrel, - /obj/item/weapon/gun/projectile/revolver/judge, - /obj/item/weapon/gun/projectile/revolver/lemat, - list(/obj/item/weapon/gun/projectile/shotgun/doublebarrel/pellet, /obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn), - list(/obj/item/weapon/gun/projectile/deagle, /obj/item/weapon/gun/projectile/deagle/gold, /obj/item/weapon/gun/projectile/deagle/camo), - list(/obj/item/weapon/gun/projectile/revolver/detective, /obj/item/weapon/gun/projectile/revolver/deckard), - list(/obj/item/weapon/gun/projectile/luger,/obj/item/weapon/gun/projectile/luger/brown) + /obj/item/gun/energy/laser, + /obj/item/gun/energy/captain, + /obj/item/gun/energy/lasercannon, + /obj/item/gun/energy/xray, + /obj/item/gun/energy/gun, + /obj/item/gun/energy/gun/burst, + /obj/item/gun/energy/gun/nuclear, + /obj/item/gun/energy/crossbow, + /obj/item/gun/energy/crossbow/largecrossbow, + /obj/item/gun/projectile/automatic, + /obj/item/gun/projectile/automatic/mini_uzi, + /obj/item/gun/projectile/automatic/c20r, + /obj/item/gun/projectile/automatic/sts35, + /obj/item/gun/projectile/automatic/bullpup, + /obj/item/gun/projectile/automatic/wt550, + /obj/item/gun/projectile/automatic/z8, + /obj/item/gun/projectile/automatic/tommygun, + /obj/item/gun/projectile/colt/detective, + /obj/item/gun/projectile/sec/wood, + /obj/item/gun/projectile/silenced, + /obj/item/gun/projectile/pistol, + /obj/item/gun/projectile/p92x, + /obj/item/gun/projectile/revolver, + /obj/item/gun/projectile/derringer, + /obj/item/gun/projectile/shotgun/pump, + /obj/item/gun/projectile/shotgun/pump/rifle, + /obj/item/gun/projectile/shotgun/pump/combat, + /obj/item/gun/projectile/shotgun/doublebarrel, + /obj/item/gun/projectile/revolver/judge, + /obj/item/gun/projectile/revolver/lemat, + list(/obj/item/gun/projectile/shotgun/doublebarrel/pellet, /obj/item/gun/projectile/shotgun/doublebarrel/sawn), + list(/obj/item/gun/projectile/deagle, /obj/item/gun/projectile/deagle/gold, /obj/item/gun/projectile/deagle/camo), + list(/obj/item/gun/projectile/revolver/detective, /obj/item/gun/projectile/revolver/deckard), + list(/obj/item/gun/projectile/luger,/obj/item/gun/projectile/luger/brown) ) /datum/antagonist/renegade/New() diff --git a/code/game/antagonist/station/traitor.dm b/code/game/antagonist/station/traitor.dm index e27d3ca3870..026337fc6de 100644 --- a/code/game/antagonist/station/traitor.dm +++ b/code/game/antagonist/station/traitor.dm @@ -116,16 +116,16 @@ var/datum/antagonist/traitor/traitors var/obj/item/R = locate() //Hide the uplink in a PDA if available, otherwise radio if(traitor_mob.client.prefs.uplinklocation == "Headset") - R = locate(/obj/item/device/radio) in traitor_mob.contents + R = locate(/obj/item/radio) in traitor_mob.contents if(!R) - R = locate(/obj/item/device/pda) in traitor_mob.contents + R = locate(/obj/item/pda) in traitor_mob.contents to_chat(traitor_mob, "Could not locate a Radio, installing in PDA instead!") if (!R) to_chat(traitor_mob, "Unfortunately, neither a radio or a PDA relay could be installed.") else if(traitor_mob.client.prefs.uplinklocation == "PDA") - R = locate(/obj/item/device/pda) in traitor_mob.contents + R = locate(/obj/item/pda) in traitor_mob.contents if(!R) - R = locate(/obj/item/device/radio) in traitor_mob.contents + R = locate(/obj/item/radio) in traitor_mob.contents to_chat(traitor_mob, "Could not locate a PDA, installing into a Radio instead!") if(!R) to_chat(traitor_mob, "Unfortunately, neither a radio or a PDA relay could be installed.") @@ -134,9 +134,9 @@ var/datum/antagonist/traitor/traitors R = null else to_chat(traitor_mob, "You have not selected a location for your relay in the antagonist options! Defaulting to PDA!") - R = locate(/obj/item/device/pda) in traitor_mob.contents + R = locate(/obj/item/pda) in traitor_mob.contents if (!R) - R = locate(/obj/item/device/radio) in traitor_mob.contents + R = locate(/obj/item/radio) in traitor_mob.contents to_chat(traitor_mob, "Could not locate a PDA, installing into a Radio instead!") if (!R) to_chat(traitor_mob, "Unfortunately, neither a radio or a PDA relay could be installed.") @@ -144,9 +144,9 @@ var/datum/antagonist/traitor/traitors if(!R) return - if(istype(R,/obj/item/device/radio)) + if(istype(R,/obj/item/radio)) // generate list of radio freqs - var/obj/item/device/radio/target_radio = R + var/obj/item/radio/target_radio = R var/freq = PUBLIC_LOW_FREQ var/list/freqlist = list() while (freq <= PUBLIC_HIGH_FREQ) @@ -156,18 +156,18 @@ var/datum/antagonist/traitor/traitors if ((freq % 2) == 0) freq += 1 freq = freqlist[rand(1, freqlist.len)] - var/obj/item/device/uplink/hidden/T = new(R, traitor_mob.mind) + var/obj/item/uplink/hidden/T = new(R, traitor_mob.mind) target_radio.hidden_uplink = T target_radio.traitor_frequency = freq to_chat(traitor_mob, "A portable object teleportation relay has been installed in your [R.name] [loc]. Simply dial the frequency [format_frequency(freq)] to unlock its hidden features.") traitor_mob.mind.store_memory("Radio Freq: [format_frequency(freq)] ([R.name] [loc]).") - else if (istype(R, /obj/item/device/pda)) + else if (istype(R, /obj/item/pda)) // generate a passcode if the uplink is hidden in a PDA var/pda_pass = "[rand(100,999)] [pick("Alpha","Bravo","Delta","Omega")]" - var/obj/item/device/uplink/hidden/T = new(R, traitor_mob.mind) + var/obj/item/uplink/hidden/T = new(R, traitor_mob.mind) R.hidden_uplink = T - var/obj/item/device/pda/P = R + var/obj/item/pda/P = R P.lock_code = pda_pass to_chat(traitor_mob, "A portable object teleportation relay has been installed in your [R.name] [loc]. Simply enter the code \"[pda_pass]\" into the ringtone select to unlock its hidden features.") traitor_mob.mind.store_memory("Uplink Passcode: [pda_pass] ([R.name] [loc]).") diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 746b6a19ede..14b91f42265 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -287,10 +287,10 @@ // Returns an assoc list of RCD information. // Example would be: list(RCD_VALUE_MODE = RCD_DECONSTRUCT, RCD_VALUE_DELAY = 50, RCD_VALUE_COST = RCD_SHEETS_PER_MATTER_UNIT * 4) // This occurs before rcd_act() is called, and it won't be called if it returns FALSE. -/atom/proc/rcd_values(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/atom/proc/rcd_values(mob/living/user, obj/item/rcd/the_rcd, passed_mode) return FALSE -/atom/proc/rcd_act(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/atom/proc/rcd_act(mob/living/user, obj/item/rcd/the_rcd, passed_mode) return /atom/proc/melt() @@ -493,7 +493,7 @@ blood_DNA = null return TRUE -/atom/proc/on_rag_wipe(var/obj/item/weapon/reagent_containers/glass/rag/R) +/atom/proc/on_rag_wipe(var/obj/item/reagent_containers/glass/rag/R) clean_blood() R.reagents.splash(src, 1) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 572583ef9ec..a6eff0b2253 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -67,10 +67,10 @@ idle_power_usage = 50 active_power_usage = 300 interact_offline = 1 - circuit = /obj/item/weapon/circuitboard/clonescanner + circuit = /obj/item/circuitboard/clonescanner var/locked = 0 var/mob/living/carbon/occupant = null - var/obj/item/weapon/reagent_containers/glass/beaker = null + var/obj/item/reagent_containers/glass/beaker = null var/opened = 0 var/damage_coeff var/scan_level @@ -85,11 +85,11 @@ scan_level = 0 damage_coeff = 0 precision_coeff = 0 - for(var/obj/item/weapon/stock_parts/scanning_module/P in component_parts) + for(var/obj/item/stock_parts/scanning_module/P in component_parts) scan_level += P.rating - for(var/obj/item/weapon/stock_parts/manipulator/P in component_parts) + for(var/obj/item/stock_parts/manipulator/P in component_parts) precision_coeff = P.rating - for(var/obj/item/weapon/stock_parts/micro_laser/P in component_parts) + for(var/obj/item/stock_parts/micro_laser/P in component_parts) damage_coeff = P.rating /obj/machinery/dna_scannernew/relaymove(mob/user as mob) @@ -114,7 +114,7 @@ /obj/machinery/dna_scannernew/proc/eject_occupant() src.go_out() for(var/obj/O in src) - if((!istype(O,/obj/item/weapon/reagent_containers)) && (!istype(O,/obj/item/weapon/circuitboard/clonescanner)) && (!istype(O,/obj/item/weapon/stock_parts)) && (!istype(O,/obj/item/stack/cable_coil))) + if((!istype(O,/obj/item/reagent_containers)) && (!istype(O,/obj/item/circuitboard/clonescanner)) && (!istype(O,/obj/item/stock_parts)) && (!istype(O,/obj/item/stack/cable_coil))) O.loc = get_turf(src)//Ejects items that manage to get in there (exluding the components) if(!occupant) for(var/mob/M in src)//Failsafe so you can get mobs out @@ -150,8 +150,8 @@ src.add_fingerprint(usr) SStgui.update_uis(src) -/obj/machinery/dna_scannernew/attackby(var/obj/item/weapon/item as obj, var/mob/user as mob) - if(istype(item, /obj/item/weapon/reagent_containers/glass)) +/obj/machinery/dna_scannernew/attackby(var/obj/item/item as obj, var/mob/user as mob) + if(istype(item, /obj/item/reagent_containers/glass)) if(beaker) to_chat(user, "A beaker is already loaded into the machine.") return @@ -179,9 +179,9 @@ else to_chat(user, "\The [brain] is not acceptable for genetic sampling!") - else if(!istype(item, /obj/item/weapon/grab)) + else if(!istype(item, /obj/item/grab)) return - var/obj/item/weapon/grab/G = item + var/obj/item/grab/G = item if(!ismob(G.affecting)) return if(src.occupant) @@ -271,7 +271,7 @@ icon_keyboard = "med_key" icon_screen = "dna" density = TRUE - circuit = /obj/item/weapon/circuitboard/scan_consolenew + circuit = /obj/item/circuitboard/scan_consolenew var/selected_ui_block = 1.0 var/selected_ui_subblock = 1.0 var/selected_se_block = 1.0 @@ -284,7 +284,7 @@ var/irradiating = 0 var/injector_ready = 0 //Quick fix for issue 286 (screwdriver the screen twice to restore injector) -Pete var/obj/machinery/dna_scannernew/connected = null - var/obj/item/weapon/disk/data/disk = null + var/obj/item/disk/data/disk = null var/selected_menu_key = PAGE_UI anchored = TRUE use_power = USE_POWER_IDLE @@ -292,7 +292,7 @@ active_power_usage = 400 /obj/machinery/computer/scan_consolenew/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I, /obj/item/weapon/disk/data)) //INSERT SOME diskS + if(istype(I, /obj/item/disk/data)) //INSERT SOME diskS if(!src.disk) user.drop_item() I.loc = src @@ -335,7 +335,7 @@ arr += "[i]:[EncodeDNABlock(buffer[i])]" return arr -/obj/machinery/computer/scan_consolenew/proc/setInjectorBlock(var/obj/item/weapon/dnainjector/I, var/blk, var/datum/dna2/record/buffer) +/obj/machinery/computer/scan_consolenew/proc/setInjectorBlock(var/obj/item/dnainjector/I, var/blk, var/datum/dna2/record/buffer) var/pos = findtext(blk,":") if(!pos) return 0 var/id = text2num(copytext(blk,1,pos)) @@ -606,7 +606,7 @@ connected.occupant.UpdateAppearance() if("ejectBeaker") if(connected.beaker) - var/obj/item/weapon/reagent_containers/glass/B = connected.beaker + var/obj/item/reagent_containers/glass/B = connected.beaker B.loc = connected.loc connected.beaker = null if("ejectOccupant") @@ -740,7 +740,7 @@ // Create it var/datum/dna2/record/buf = buffers[buffer_id] - var/obj/item/weapon/dnainjector/I = new() + var/obj/item/dnainjector/I = new() I.forceMove(loc) I.name += " ([buf.name])" if(copy_buffer) @@ -773,7 +773,7 @@ if(buffer_id < 1 || buffer_id > length(buffers)) return var/datum/dna2/record/buf = buffers[buffer_id] - var/obj/item/weapon/dnainjector/I = create_injector(buffer_id) + var/obj/item/dnainjector/I = create_injector(buffer_id) setInjectorBlock(I, answer, buf.copy()) if("changeBufferLabel") var/buffer_id = text2num(arguments["id"]) diff --git a/code/game/dna/genes/monkey.dm b/code/game/dna/genes/monkey.dm index b9d4837184a..9bf5ff965af 100644 --- a/code/game/dna/genes/monkey.dm +++ b/code/game/dna/genes/monkey.dm @@ -14,7 +14,7 @@ var/mob/living/carbon/human/H = M H.transforming = 1 var/list/implants = list() //Try to preserve implants. - for(var/obj/item/weapon/implant/W in H) + for(var/obj/item/implant/W in H) implants += W W.loc = null @@ -71,7 +71,7 @@ O.adjustOxyLoss(M.getOxyLoss()) O.set_stat(M.stat) O.a_intent = I_HURT - for (var/obj/item/weapon/implant/I in implants) + for (var/obj/item/implant/I in implants) I.loc = O I.implanted = O // O.update_icon = 1 //queue a full icon update at next life() call @@ -85,7 +85,7 @@ var/mob/living/carbon/monkey/Mo = M Mo.transforming = 1 var/list/implants = list() //Still preserving implants - for(var/obj/item/weapon/implant/W in Mo) + for(var/obj/item/implant/W in Mo) implants += W W.loc = null if(!connected) @@ -155,7 +155,7 @@ O.adjustToxLoss(M.getToxLoss()) O.adjustOxyLoss(M.getOxyLoss()) O.set_stat(M.stat) - for (var/obj/item/weapon/implant/I in implants) + for (var/obj/item/implant/I in implants) I.loc = O I.implanted = O // O.update_icon = 1 //queue a full icon update at next life() call diff --git a/code/game/gamemodes/changeling/generic_equip_procs.dm b/code/game/gamemodes/changeling/generic_equip_procs.dm index fa7ffc3d18c..af4ba13007a 100644 --- a/code/game/gamemodes/changeling/generic_equip_procs.dm +++ b/code/game/gamemodes/changeling/generic_equip_procs.dm @@ -245,7 +245,7 @@ to_chat(src, "Our hands are full. Drop something first.") return 0 - var/obj/item/weapon/W = new weapon_type(src) + var/obj/item/W = new weapon_type(src) src.put_in_hands(W) src.mind.changeling.chem_charges -= cost diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index e532396176b..89cb41a88ac 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -14,7 +14,7 @@ var/datum/changeling/changeling = changeling_power(0,0,100) if(!changeling) return - var/obj/item/weapon/grab/G = src.get_active_hand() + var/obj/item/grab/G = src.get_active_hand() if(!istype(G)) to_chat(src, "We must be grabbing a creature in our active hand to absorb them.") return diff --git a/code/game/gamemodes/changeling/powers/armblade.dm b/code/game/gamemodes/changeling/powers/armblade.dm index ffdc9b4ae37..ca374db53f1 100644 --- a/code/game/gamemodes/changeling/powers/armblade.dm +++ b/code/game/gamemodes/changeling/powers/armblade.dm @@ -13,12 +13,12 @@ set name = "Arm Blade (20)" if(src.mind.changeling.recursive_enhancement) - if(changeling_generic_weapon(/obj/item/weapon/melee/changeling/arm_blade/greater)) + if(changeling_generic_weapon(/obj/item/melee/changeling/arm_blade/greater)) to_chat(src, "We prepare an extra sharp blade.") return 1 else - if(changeling_generic_weapon(/obj/item/weapon/melee/changeling/arm_blade)) + if(changeling_generic_weapon(/obj/item/melee/changeling/arm_blade)) return 1 return 0 @@ -38,16 +38,16 @@ set name = "Claw (15)" if(src.mind.changeling.recursive_enhancement) - if(changeling_generic_weapon(/obj/item/weapon/melee/changeling/claw/greater, 1, 15)) + if(changeling_generic_weapon(/obj/item/melee/changeling/claw/greater, 1, 15)) to_chat(src, "We prepare an extra sharp claw.") return 1 else - if(changeling_generic_weapon(/obj/item/weapon/melee/changeling/claw, 1, 15)) + if(changeling_generic_weapon(/obj/item/melee/changeling/claw, 1, 15)) return 1 return 0 -/obj/item/weapon/melee/changeling +/obj/item/melee/changeling name = "arm weapon" desc = "A grotesque weapon made out of bone and flesh that cleaves through people as a hot knife through butter." icon = 'icons/obj/weapons.dmi' @@ -65,7 +65,7 @@ defend_chance = 40 // The base chance for the weapon to parry. projectile_parry_chance = 15 // The base chance for a projectile to be deflected. -/obj/item/weapon/melee/changeling/New(location) +/obj/item/melee/changeling/New(location) ..() START_PROCESSING(SSobj, src) if(ismob(loc)) @@ -74,7 +74,7 @@ "You hear organic matter ripping and tearing!") src.creator = loc -/obj/item/weapon/melee/changeling/dropped(mob/user) +/obj/item/melee/changeling/dropped(mob/user) visible_message("With a sickening crunch, [creator] reforms their arm!", "We assimilate the weapon back into our body.", "You hear organic matter ripping and tearing!") @@ -83,12 +83,12 @@ if(src) qdel(src) -/obj/item/weapon/melee/changeling/Destroy() +/obj/item/melee/changeling/Destroy() STOP_PROCESSING(SSobj, src) creator = null ..() -/obj/item/weapon/melee/changeling/process() //Stolen from ninja swords. +/obj/item/melee/changeling/process() //Stolen from ninja swords. if(!creator || loc != creator || !creator.item_is_in_hands(src)) // Tidy up a bit. if(istype(loc,/mob/living)) @@ -105,7 +105,7 @@ if(src) qdel(src) -/obj/item/weapon/melee/changeling/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/melee/changeling/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(default_parry_check(user, attacker, damage_source) && prob(defend_chance)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") playsound(src, 'sound/weapons/slash.ogg', 50, 1) @@ -117,7 +117,7 @@ return 0 -/obj/item/weapon/melee/changeling/unique_parry_check(mob/user, mob/attacker, atom/damage_source) +/obj/item/melee/changeling/unique_parry_check(mob/user, mob/attacker, atom/damage_source) if(user.incapacitated() || !istype(damage_source, /obj/item/projectile)) return 0 @@ -127,7 +127,7 @@ return 1 -/obj/item/weapon/melee/changeling/arm_blade +/obj/item/melee/changeling/arm_blade name = "arm blade" desc = "A grotesque blade made out of bone and flesh that cleaves through people as a hot knife through butter." icon_state = "arm_blade" @@ -140,14 +140,14 @@ defend_chance = 60 projectile_parry_chance = 25 -/obj/item/weapon/melee/changeling/arm_blade/greater +/obj/item/melee/changeling/arm_blade/greater name = "arm greatblade" desc = "A grotesque blade made out of bone and flesh that cleaves through people and armor as a hot knife through butter." armor_penetration = 30 defend_chance = 70 projectile_parry_chance = 35 -/obj/item/weapon/melee/changeling/claw +/obj/item/melee/changeling/claw name = "hand claw" desc = "A grotesque claw made out of bone and flesh that cleaves through people as a hot knife through butter." icon_state = "ling_claw" @@ -158,7 +158,7 @@ defend_chance = 50 projectile_parry_chance = 15 -/obj/item/weapon/melee/changeling/claw/greater +/obj/item/melee/changeling/claw/greater name = "hand greatclaw" force = 20 armor_penetration = 20 diff --git a/code/game/gamemodes/changeling/powers/armor.dm b/code/game/gamemodes/changeling/powers/armor.dm index 5a6db52833a..ed16c983df2 100644 --- a/code/game/gamemodes/changeling/powers/armor.dm +++ b/code/game/gamemodes/changeling/powers/armor.dm @@ -37,7 +37,7 @@ desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel." flags = 0 //Not THICKMATERIAL because it's organic tissue, so if somebody tries to inject something into it, //it still ends up in your blood. (also balance but muh fluff) - allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/tank/oxygen) + allowed = list(/obj/item/flashlight, /obj/item/tank/emergency/oxygen, /obj/item/tank/oxygen) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) //No armor at all. canremove = FALSE diff --git a/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm b/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm index ca92d67ff74..7210e2263d7 100644 --- a/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm +++ b/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm @@ -24,11 +24,11 @@ if(held_item == null) if(src.mind.changeling.recursive_enhancement) - if(changeling_generic_weapon(/obj/item/weapon/electric_hand/efficent,0)) + if(changeling_generic_weapon(/obj/item/electric_hand/efficent,0)) to_chat(src, "We will shock others more efficently.") return 1 else - if(changeling_generic_weapon(/obj/item/weapon/electric_hand,0)) //Chemical cost is handled in the equip proc. + if(changeling_generic_weapon(/obj/item/electric_hand,0)) //Chemical cost is handled in the equip proc. return 1 return 0 @@ -40,8 +40,8 @@ siemens = gloves.siemens_coefficient //If we're grabbing someone, electrocute them. - if(istype(held_item,/obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = held_item + if(istype(held_item,/obj/item/grab)) + var/obj/item/grab/G = held_item if(G.affecting) G.affecting.electrocute_act(10 * siemens, src, 1.0, BP_TORSO, 0) var/agony = 80 * siemens //Does more than if hit with an electric hand, since grabbing is slower. @@ -65,15 +65,15 @@ var/list/L = new() //We make a new list to avoid copypasta. //Check our hand. - if(istype(held_item,/obj/item/weapon/cell)) + if(istype(held_item,/obj/item/cell)) L.Add(held_item) //Now check our hand's item's contents, so we can recharge guns and other stuff. - for(var/obj/item/weapon/cell/cell in held_item.contents) + for(var/obj/item/cell/cell in held_item.contents) L.Add(cell) //Now for the actual recharging. - for(var/obj/item/weapon/cell/cell in L) + for(var/obj/item/cell/cell in L) visible_message("Some sparks fall out from \the [src.name]\'s [held_item]!", "Our hand channels raw electricity into \the [held_item].", "You hear sparks!") @@ -97,7 +97,7 @@ src.mind.changeling.chem_charges -= 10 return success -/obj/item/weapon/electric_hand +/obj/item/electric_hand name = "electrified hand" desc = "You could probably shock someone badly if you touched them, or recharge something." icon = 'icons/obj/weapons.dmi' @@ -108,12 +108,12 @@ var/agony_amount = 60 var/electrocute_amount = 10 -/obj/item/weapon/electric_hand/efficent +/obj/item/electric_hand/efficent shock_cost = 5 agony_amount = 80 electrocute_amount = 20 -/obj/item/weapon/electric_hand/New() +/obj/item/electric_hand/New() if(ismob(loc)) visible_message("Electrical arcs form around [loc.name]\'s hand!", "We store a charge of electricity in our hand.", @@ -121,12 +121,12 @@ var/T = get_turf(src) new /obj/effect/effect/sparks(T) -/obj/item/weapon/electric_hand/dropped(mob/user) +/obj/item/electric_hand/dropped(mob/user) spawn(1) if(src) qdel(src) -/obj/item/weapon/electric_hand/afterattack(var/atom/target, var/mob/living/carbon/human/user, proximity) +/obj/item/electric_hand/afterattack(var/atom/target, var/mob/living/carbon/human/user, proximity) if(!target) return if(!proximity) @@ -183,7 +183,7 @@ var/success = 0 var/obj/T = target //We can also recharge things we touch, such as APCs or hardsuits. - for(var/obj/item/weapon/cell/cell in T.contents) + for(var/obj/item/cell/cell in T.contents) visible_message("Some sparks fall out from \the [target]!", "Our hand channels raw electricity into \the [target].", "You hear sparks!") diff --git a/code/game/gamemodes/changeling/powers/electric_lockpick.dm b/code/game/gamemodes/changeling/powers/electric_lockpick.dm index 262d90429f3..bc59cd5d129 100644 --- a/code/game/gamemodes/changeling/powers/electric_lockpick.dm +++ b/code/game/gamemodes/changeling/powers/electric_lockpick.dm @@ -21,28 +21,28 @@ return 0 if(held_item == null) - if(changeling_generic_weapon(/obj/item/weapon/finger_lockpick,0,5)) //Chemical cost is handled in the equip proc. + if(changeling_generic_weapon(/obj/item/finger_lockpick,0,5)) //Chemical cost is handled in the equip proc. return 1 return 0 -/obj/item/weapon/finger_lockpick +/obj/item/finger_lockpick name = "finger lockpick" desc = "This finger appears to be an organic datajack." icon = 'icons/obj/weapons.dmi' icon_state = "electric_hand" show_examine = FALSE -/obj/item/weapon/finger_lockpick/New() +/obj/item/finger_lockpick/New() if(ismob(loc)) to_chat(loc, "We shape our finger to fit inside electronics, and are ready to force them open.") -/obj/item/weapon/finger_lockpick/dropped(mob/user) +/obj/item/finger_lockpick/dropped(mob/user) to_chat(user, "We discreetly shape our finger back to a less suspicious form.") spawn(1) if(src) qdel(src) -/obj/item/weapon/finger_lockpick/afterattack(var/atom/target, var/mob/living/user, proximity) +/obj/item/finger_lockpick/afterattack(var/atom/target, var/mob/living/user, proximity) if(!target) return if(!proximity) diff --git a/code/game/gamemodes/changeling/powers/escape_restraints.dm b/code/game/gamemodes/changeling/powers/escape_restraints.dm index ced80d35bf6..eee9b3c30f2 100644 --- a/code/game/gamemodes/changeling/powers/escape_restraints.dm +++ b/code/game/gamemodes/changeling/powers/escape_restraints.dm @@ -30,7 +30,7 @@ to_chat(C,"We contort our extremities and slip our cuffs.") playsound(src, 'sound/effects/blobattack.ogg', 30, 1) if(C.handcuffed) - var/obj/item/weapon/W = C.handcuffed + var/obj/item/W = C.handcuffed C.handcuffed = null if(C.buckled && C.buckled.buckle_require_restraints) C.buckled.unbuckle_mob() @@ -42,7 +42,7 @@ if(W) W.layer = initial(W.layer) if(C.legcuffed) - var/obj/item/weapon/W = C.legcuffed + var/obj/item/W = C.legcuffed C.legcuffed = null C.update_inv_legcuffed() if(C.client) diff --git a/code/game/gamemodes/changeling/powers/fabricate_clothing.dm b/code/game/gamemodes/changeling/powers/fabricate_clothing.dm index c3c5f2aa15c..1b58ad220b1 100644 --- a/code/game/gamemodes/changeling/powers/fabricate_clothing.dm +++ b/code/game/gamemodes/changeling/powers/fabricate_clothing.dm @@ -6,9 +6,9 @@ var/global/list/changeling_fabricated_clothing = list( "gloves" = /obj/item/clothing/gloves/chameleon/changeling, "wear_mask" = /obj/item/clothing/mask/chameleon/changeling, "glasses" = /obj/item/clothing/glasses/chameleon/changeling, - "back" = /obj/item/weapon/storage/backpack/chameleon/changeling, - "belt" = /obj/item/weapon/storage/belt/chameleon/changeling, - "wear_id" = /obj/item/weapon/card/id/syndicate/changeling + "back" = /obj/item/storage/backpack/chameleon/changeling, + "belt" = /obj/item/storage/belt/chameleon/changeling, + "wear_id" = /obj/item/card/id/syndicate/changeling ) /datum/power/changeling/fabricate_clothing @@ -128,7 +128,7 @@ var/global/list/changeling_fabricated_clothing = list( "We remove [src].") qdel(src) -/obj/item/weapon/storage/backpack/chameleon/changeling +/obj/item/storage/backpack/chameleon/changeling name = "backpack" icon_state = "backpack" item_icons = list( @@ -140,10 +140,10 @@ var/global/list/changeling_fabricated_clothing = list( origin_tech = list() canremove = FALSE -/obj/item/weapon/storage/backpack/chameleon/changeling/emp_act() +/obj/item/storage/backpack/chameleon/changeling/emp_act() return -/obj/item/weapon/storage/backpack/chameleon/changeling/verb/shred() +/obj/item/storage/backpack/chameleon/changeling/verb/shred() set name = "Shred Backpack" set category = "Chameleon Items" if(ishuman(loc)) @@ -228,7 +228,7 @@ var/global/list/changeling_fabricated_clothing = list( "We remove [src].") qdel(src) -/obj/item/weapon/storage/belt/chameleon/changeling +/obj/item/storage/belt/chameleon/changeling name = "waist pouch" desc = "We can store objects in this, as well as shift it's appearance, so that it resembles various common belts." icon_state = "lingchameleon" @@ -240,10 +240,10 @@ var/global/list/changeling_fabricated_clothing = list( origin_tech = list() canremove = FALSE -/obj/item/weapon/storage/belt/chameleon/changeling/emp_act() +/obj/item/storage/belt/chameleon/changeling/emp_act() return -/obj/item/weapon/storage/belt/chameleon/changeling/verb/shred() +/obj/item/storage/belt/chameleon/changeling/verb/shred() set name = "Shred Belt" set category = "Chameleon Items" if(ishuman(loc)) @@ -253,7 +253,7 @@ var/global/list/changeling_fabricated_clothing = list( "We remove [src].") qdel(src) -/obj/item/weapon/card/id/syndicate/changeling +/obj/item/card/id/syndicate/changeling name = "chitinous card" desc = "A card that we can reform to resemble identification cards. Due to the nature of the material this is made of, it cannot store any access codes." icon_state = "changeling" @@ -264,15 +264,15 @@ var/global/list/changeling_fabricated_clothing = list( access = null canremove = FALSE -/obj/item/weapon/card/id/syndicate/changeling/New(mob/user as mob) +/obj/item/card/id/syndicate/changeling/New(mob/user as mob) ..() registered_user = user -/obj/item/weapon/card/id/syndicate/changeling/Initialize() +/obj/item/card/id/syndicate/changeling/Initialize() . = ..() access = null -/obj/item/weapon/card/id/syndicate/changeling/verb/shred() +/obj/item/card/id/syndicate/changeling/verb/shred() set name = "Shred ID Card" set category = "Chameleon Items" if(ishuman(loc)) @@ -282,7 +282,7 @@ var/global/list/changeling_fabricated_clothing = list( "We remove [src].") qdel(src) -/obj/item/weapon/card/id/syndicate/changeling/Click() //Since we can't hold it in our hands, and attack_hand() doesn't work if it in inventory... +/obj/item/card/id/syndicate/changeling/Click() //Since we can't hold it in our hands, and attack_hand() doesn't work if it in inventory... if(!registered_user) registered_user = usr usr.set_id_info(src) diff --git a/code/game/gamemodes/changeling/powers/lesser_form.dm b/code/game/gamemodes/changeling/powers/lesser_form.dm index aa70756344b..447480f0c7c 100644 --- a/code/game/gamemodes/changeling/powers/lesser_form.dm +++ b/code/game/gamemodes/changeling/powers/lesser_form.dm @@ -28,7 +28,7 @@ changeling.geneticdamage = 30 to_chat(H, "Our genes cry out!") var/list/implants = list() //Try to preserve implants. - for(var/obj/item/weapon/implant/W in H) + for(var/obj/item/implant/W in H) implants += W H.monkeyize() feedback_add_details("changeling_powers","LF") @@ -61,7 +61,7 @@ C.dna = chosen_dna.Clone() var/list/implants = list() - for (var/obj/item/weapon/implant/I in C) //Still preserving implants + for (var/obj/item/implant/I in C) //Still preserving implants implants += I C.transforming = 1 @@ -101,7 +101,7 @@ O.setOxyLoss(C.getOxyLoss()) O.adjustFireLoss(C.getFireLoss()) O.set_stat(C.stat) - for (var/obj/item/weapon/implant/I in implants) + for (var/obj/item/implant/I in implants) I.loc = O I.implanted = O diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm index e4834981554..774d5a70ecd 100644 --- a/code/game/gamemodes/changeling/powers/revive.dm +++ b/code/game/gamemodes/changeling/powers/revive.dm @@ -46,7 +46,7 @@ BITSET(H.hud_updateflag, LIFE_HUD) if(H.handcuffed) - var/obj/item/weapon/W = H.handcuffed + var/obj/item/W = H.handcuffed H.handcuffed = null if(H.buckled && H.buckled.buckle_require_restraints) H.buckled.unbuckle_mob() @@ -58,7 +58,7 @@ if(W) W.layer = initial(W.layer) if(H.legcuffed) - var/obj/item/weapon/W = H.legcuffed + var/obj/item/W = H.legcuffed H.legcuffed = null H.update_inv_legcuffed() if(H.client) diff --git a/code/game/gamemodes/cult/construct_spells.dm b/code/game/gamemodes/cult/construct_spells.dm index 6273273c98d..6340f908892 100644 --- a/code/game/gamemodes/cult/construct_spells.dm +++ b/code/game/gamemodes/cult/construct_spells.dm @@ -1,7 +1,7 @@ //////////////////////////////Construct Spells///////////////////////// /proc/findNullRod(var/atom/target) - if(istype(target,/obj/item/weapon/nullrod)) + if(istype(target,/obj/item/nullrod)) return 1 else if(target.contents) for(var/atom/A in target.contents) @@ -91,7 +91,7 @@ invocation_type = SpI_NONE range = 0 - summon_type = list(/obj/item/device/soulstone) + summon_type = list(/obj/item/soulstone) hud_state = "const_stone" override_base = "const" @@ -370,7 +370,7 @@ charge_max = 10 - var/obj/item/weapon/spell/construct/spell_obj = null //This is the var that determines what Technomancer-style spell is put into their hands. + var/obj/item/spell/construct/spell_obj = null //This is the var that determines what Technomancer-style spell is put into their hands. /spell/targeted/construct_advanced/cast(list/targets, mob/living/user) if(!findNullRod(user)) @@ -381,7 +381,7 @@ desc = "Fire a searing beam of darkness at your foes." hud_state = "const_beam" - spell_obj = /obj/item/weapon/spell/construct/projectile/inverted_beam + spell_obj = /obj/item/spell/construct/projectile/inverted_beam /spell/targeted/construct_advanced/mend_acolyte name = "Mend Acolyte" @@ -390,7 +390,7 @@ charge_max = 100 hud_state = "const_mend" - spell_obj = /obj/item/weapon/spell/construct/mend_occult + spell_obj = /obj/item/spell/construct/mend_occult /spell/targeted/construct_advanced/agonizing_sphere name = "Sphere of Agony" @@ -399,7 +399,7 @@ charge_max = 100 hud_state = "const_harvest" - spell_obj = /obj/item/weapon/spell/construct/spawner/agonizing_sphere + spell_obj = /obj/item/spell/construct/spawner/agonizing_sphere /spell/targeted/construct_advanced/slam name = "Slam" @@ -408,7 +408,7 @@ charge_max = 300 hud_state = "const_fist" - spell_obj = /obj/item/weapon/spell/construct/slam + spell_obj = /obj/item/spell/construct/slam /* * @@ -420,7 +420,7 @@ * Base advanced construct spell types. */ -/obj/item/weapon/spell/construct //Energy costs are in units of blood, in the event a cultist gets one of these. +/obj/item/spell/construct //Energy costs are in units of blood, in the event a cultist gets one of these. name = "unholy energy" desc = "Your hands appear to be screaming. This is a debug text, you should probably tell a developer!" icon = 'icons/obj/spells.dmi' @@ -441,7 +441,7 @@ cast_sound = null // Sound file played when this is used. var/last_castcheck = null // The last time this spell was cast. -/obj/item/weapon/spell/construct/New() +/obj/item/spell/construct/New() //..() //This kills the spell, because super on this calls the default spell's New, which checks for a core. Can't have that. if(isliving(loc)) owner = loc @@ -449,17 +449,17 @@ qdel(src) update_icon() -/obj/item/weapon/spell/construct/adjust_instability(var/amount) //The only drawback to the boons of the geometer is the use of a mortal's blood as fuel. Constructs have already paid that price long ago. +/obj/item/spell/construct/adjust_instability(var/amount) //The only drawback to the boons of the geometer is the use of a mortal's blood as fuel. Constructs have already paid that price long ago. return -/obj/item/weapon/spell/construct/run_checks() +/obj/item/spell/construct/run_checks() if(owner) if((iscultist(owner) || istype(owner, /mob/living/simple_mob/construct)) && (world.time >= (last_castcheck + cooldown))) //Are they a cultist or a construct, and has the cooldown time passed? last_castcheck = world.time return 1 return 0 -/obj/item/weapon/spell/construct/pay_energy(var/amount) +/obj/item/spell/construct/pay_energy(var/amount) if(owner) if(istype(owner, /mob/living/simple_mob/construct)) return 1 @@ -467,7 +467,7 @@ return 1 return 0 -/obj/item/weapon/spell/construct/proc/pay_blood(var/amount) //If, for some reason, this is put into the hands of a cultist, by a talisnam or whatever. +/obj/item/spell/construct/proc/pay_blood(var/amount) //If, for some reason, this is put into the hands of a cultist, by a talisnam or whatever. if(ishuman(owner)) var/mob/living/carbon/human/H = owner if(!H.should_have_organ(O_HEART)) @@ -476,15 +476,15 @@ return 1 return 0 -/obj/item/weapon/spell/construct/afterattack(atom/target, mob/user, proximity_flag, click_parameters) //Not overriding it caused runtimes, because cooldown checked for core. +/obj/item/spell/construct/afterattack(atom/target, mob/user, proximity_flag, click_parameters) //Not overriding it caused runtimes, because cooldown checked for core. if(!run_checks()) return if(!proximity_flag) if(cast_methods & CAST_RANGED) on_ranged_cast(target, user) else - if(istype(target, /obj/item/weapon/spell)) - var/obj/item/weapon/spell/spell = target + if(istype(target, /obj/item/spell)) + var/obj/item/spell/spell = target if(spell.cast_methods & CAST_COMBINE) spell.on_combine_cast(src, user) return @@ -497,7 +497,7 @@ user.setClickCooldown(effective_cooldown) flick("cooldown_[effective_cooldown]",src) -/obj/item/weapon/spell/construct/projectile //This makes me angry, but we need the template, and we can't use it because special check overrides on the base. +/obj/item/spell/construct/projectile //This makes me angry, but we need the template, and we can't use it because special check overrides on the base. name = "construct projectile template" icon_state = "generic" desc = "This is a generic template that shoots projectiles. If you can read this, the game broke!" @@ -507,7 +507,7 @@ var/fire_sound = null var/energy_cost_per_shot = 5 -/obj/item/weapon/spell/construct/projectile/on_ranged_cast(atom/hit_atom, mob/living/user) +/obj/item/spell/construct/projectile/on_ranged_cast(atom/hit_atom, mob/living/user) if(set_up(hit_atom, user)) var/obj/item/projectile/new_projectile = make_projectile(spell_projectile, user) new_projectile.old_style_target(hit_atom) @@ -518,11 +518,11 @@ return 1 return 0 -/obj/item/weapon/spell/construct/projectile/proc/make_projectile(obj/item/projectile/projectile_type, mob/living/user) +/obj/item/spell/construct/projectile/proc/make_projectile(obj/item/projectile/projectile_type, mob/living/user) var/obj/item/projectile/P = new projectile_type(get_turf(user)) return P -/obj/item/weapon/spell/construct/projectile/proc/set_up(atom/hit_atom, mob/living/user) +/obj/item/spell/construct/projectile/proc/set_up(atom/hit_atom, mob/living/user) if(spell_projectile) if(pay_energy(energy_cost_per_shot)) if(pre_shot_delay) @@ -537,14 +537,14 @@ return TRUE // No delay, no need to check. return FALSE -/obj/item/weapon/spell/construct/spawner +/obj/item/spell/construct/spawner name = "spawner template" desc = "If you see me, someone messed up." icon_state = "darkness" cast_methods = CAST_RANGED var/obj/effect/spawner_type = null -/obj/item/weapon/spell/construct/spawner/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/construct/spawner/on_ranged_cast(atom/hit_atom, mob/user) var/turf/T = get_turf(hit_atom) if(T) new spawner_type(T) @@ -554,7 +554,7 @@ //Harvester Laser. -/obj/item/weapon/spell/construct/projectile/inverted_beam +/obj/item/spell/construct/projectile/inverted_beam name = "inversion beam" icon_state = "generic" desc = "Your manipulators fire searing beams of inverted light." @@ -582,17 +582,17 @@ //Harvester Pain Orb -/obj/item/weapon/spell/construct/spawner/agonizing_sphere +/obj/item/spell/construct/spawner/agonizing_sphere name = "sphere of agony" desc = "Call forth a portal to a dimension of naught but pain at your target." spawner_type = /obj/effect/temporary_effect/pulse/agonizing_sphere -/obj/item/weapon/spell/construct/spawner/agonizing_sphere/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/construct/spawner/agonizing_sphere/on_ranged_cast(atom/hit_atom, mob/user) if(within_range(hit_atom) && pay_energy(10)) ..() -/obj/item/weapon/spell/construct/spawner/agonizing_sphere/on_throw_cast(atom/hit_atom, mob/user) +/obj/item/spell/construct/spawner/agonizing_sphere/on_throw_cast(atom/hit_atom, mob/user) pay_energy(5) if(isliving(hit_atom)) var/mob/living/L = hit_atom @@ -620,7 +620,7 @@ //Artificer Heal -/obj/item/weapon/spell/construct/mend_occult +/obj/item/spell/construct/mend_occult name = "mend acolyte" desc = "Mend the wounds of a cultist, or construct, over time." icon_state = "mend_wounds" @@ -630,14 +630,14 @@ light_power = -2 light_on = TRUE -/obj/item/weapon/spell/construct/mend_occult/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) +/obj/item/spell/construct/mend_occult/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) if(isliving(hit_atom)) var/mob/living/L = hit_atom L.add_modifier(/datum/modifier/mend_occult, 150) qdel(src) //Juggernaut Slam -/obj/item/weapon/spell/construct/slam +/obj/item/spell/construct/slam name = "slam" desc = "Empower your FIST, to send an opponent flying." icon_state = "toggled_old" @@ -648,7 +648,7 @@ light_on = TRUE cooldown = 15 -/obj/item/weapon/spell/construct/slam/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) +/obj/item/spell/construct/slam/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) var/attack_message = "slams" if(istype(user, /mob/living/simple_mob)) var/mob/living/simple_mob/S = user diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index e54bb88eefe..d9974cd0ed6 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/melee/cultblade +/obj/item/melee/cultblade name = "cult blade" desc = "An arcane weapon wielded by the followers of Nar-Sie." icon_state = "cultblade" @@ -13,10 +13,10 @@ edge = TRUE sharp = TRUE -/obj/item/weapon/melee/cultblade/cultify() +/obj/item/melee/cultblade/cultify() return -/obj/item/weapon/melee/cultblade/attack(mob/living/M, mob/living/user, var/target_zone) +/obj/item/melee/cultblade/attack(mob/living/M, mob/living/user, var/target_zone) if(iscultist(user) && !istype(user, /mob/living/simple_mob/construct)) return ..() @@ -41,7 +41,7 @@ return 1 -/obj/item/weapon/melee/cultblade/pickup(mob/living/user as mob) +/obj/item/melee/cultblade/pickup(mob/living/user as mob) if(!iscultist(user) && !istype(user, /mob/living/simple_mob/construct)) to_chat(user, "An overwhelming feeling of dread comes over you as you pick up the cultist's sword. It would be wise to be rid of this blade quickly.") user.make_dizzy(120) @@ -79,7 +79,7 @@ icon_state = "cultrobes" origin_tech = list(TECH_MATERIAL = 3, TECH_ARCANE = 1) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - allowed = list(/obj/item/weapon/book/tome,/obj/item/weapon/melee/cultblade) + allowed = list(/obj/item/book/tome,/obj/item/melee/cultblade) armor = list(melee = 50, bullet = 30, laser = 50, energy = 80, bomb = 25, bio = 10, rad = 0) flags_inv = HIDEJUMPSUIT siemens_coefficient = 0 @@ -114,7 +114,7 @@ origin_tech = list(TECH_MATERIAL = 3, TECH_ARCANE = 1) desc = "A bulky suit of armour, bristling with spikes. It looks space-worthy." w_class = ITEMSIZE_NORMAL - allowed = list(/obj/item/weapon/book/tome,/obj/item/weapon/melee/cultblade,/obj/item/weapon/tank/emergency/oxygen,/obj/item/device/suit_cooling_unit) + allowed = list(/obj/item/book/tome,/obj/item/melee/cultblade,/obj/item/tank/emergency/oxygen,/obj/item/suit_cooling_unit) slowdown = 0.5 armor = list(melee = 60, bullet = 50, laser = 30, energy = 80, bomb = 30, bio = 30, rad = 30) siemens_coefficient = 0 diff --git a/code/game/gamemodes/cult/cultify/obj.dm b/code/game/gamemodes/cult/cultify/obj.dm index e00dbc6aad5..672fdb1fd3b 100644 --- a/code/game/gamemodes/cult/cultify/obj.dm +++ b/code/game/gamemodes/cult/cultify/obj.dm @@ -10,26 +10,26 @@ /obj/effect/overlay/cultify() return -/obj/item/device/flashlight/lamp/cultify() +/obj/item/flashlight/lamp/cultify() new /obj/structure/cult/pylon(loc) ..() /obj/item/stack/material/wood/cultify() return -/obj/item/weapon/book/cultify() - new /obj/item/weapon/book/tome(loc) +/obj/item/book/cultify() + new /obj/item/book/tome(loc) ..() -/obj/item/weapon/material/sword/cultify() - new /obj/item/weapon/melee/cultblade(loc) +/obj/item/material/sword/cultify() + new /obj/item/melee/cultblade(loc) ..() -/obj/item/weapon/storage/backpack/cultify() - new /obj/item/weapon/storage/backpack/cultpack(loc) +/obj/item/storage/backpack/cultify() + new /obj/item/storage/backpack/cultpack(loc) ..() -/obj/item/weapon/storage/backpack/cultpack/cultify() +/obj/item/storage/backpack/cultpack/cultify() return /obj/machinery/cultify() diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 41d3f2a7161..6f35c436410 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -90,11 +90,11 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," /obj/effect/rune/attackby(I as obj, user as mob) - if(istype(I, /obj/item/weapon/book/tome) && iscultist(user)) + if(istype(I, /obj/item/book/tome) && iscultist(user)) to_chat(user, "You retrace your steps, carefully undoing the lines of the rune.") qdel(src) return - else if(istype(I, /obj/item/weapon/nullrod)) + else if(istype(I, /obj/item/nullrod)) to_chat(user, "You disrupt the vile magic with the deadening field of the null rod!") qdel(src) return @@ -176,7 +176,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," /obj/effect/rune/proc/check_icon() icon = get_uristrune_cult(word1, word2, word3) -/obj/item/weapon/book/tome +/obj/item/book/tome name = "arcane tome" icon = 'icons/obj/weapons.dmi' item_icons = list( @@ -288,14 +288,14 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," "} -/obj/item/weapon/book/tome/Initialize() +/obj/item/book/tome/Initialize() . = ..() if(!cultwords["travel"]) runerandom() for(var/V in cultwords) words[cultwords[V]] = V -/obj/item/weapon/book/tome/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/book/tome/attack(mob/living/M as mob, mob/living/user as mob) add_attack_logs(user,M,"Hit with [name]") if(istype(M,/mob/observer/dead)) @@ -314,7 +314,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," to_chat(M, "You feel searing heat inside!") -/obj/item/weapon/book/tome/attack_self(mob/living/user as mob) +/obj/item/book/tome/attack_self(mob/living/user as mob) usr = user if(!usr.canmove || usr.stat || usr.restrained()) return @@ -425,20 +425,20 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," to_chat(user, "The book seems full of illegible scribbles. Is this a joke?") return -/obj/item/weapon/book/tome/examine(mob/user) +/obj/item/book/tome/examine(mob/user) . = ..() if(!iscultist(user)) . += "An old, dusty tome with frayed edges and a sinister looking cover." else . += "The scriptures of Nar-Sie, The One Who Sees, The Geometer of Blood. Contains the details of every ritual his followers could think of. Most of these are useless, though." -/obj/item/weapon/book/tome/cultify() +/obj/item/book/tome/cultify() return -/obj/item/weapon/book/tome/imbued //admin tome, spawns working runes without waiting +/obj/item/book/tome/imbued //admin tome, spawns working runes without waiting w_class = ITEMSIZE_SMALL var/cultistsonly = 1 -/obj/item/weapon/book/tome/imbued/attack_self(mob/user as mob) +/obj/item/book/tome/imbued/attack_self(mob/user as mob) if(src.cultistsonly && !iscultist(usr)) return if(!cultwords["travel"]) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 7034d9698ce..50aec80c327 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -91,9 +91,9 @@ var/list/sacrificed = list() "You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a book.", \ "You hear a pop and smell ozone.") if(istype(src,/obj/effect/rune)) - new /obj/item/weapon/book/tome(src.loc) + new /obj/item/book/tome(src.loc) else - new /obj/item/weapon/book/tome(usr.loc) + new /obj/item/book/tome(usr.loc) qdel(src) return @@ -469,7 +469,7 @@ var/list/sacrificed = list() "You hear liquid flowing.") D.real_name = "Unknown" var/chose_name = 0 - for(var/obj/item/weapon/paper/P in this_rune.loc) + for(var/obj/item/paper/P in this_rune.loc) if(P.info) D.real_name = copytext(P.info, findtext(P.info,">")+1, findtext(P.info,"<",2) ) chose_name = 1 @@ -508,9 +508,9 @@ var/list/sacrificed = list() /////////////////////////////////////////TWELFTH RUNE /obj/effect/rune/proc/talisman()//only hide, emp, teleport, deafen, blind and tome runes can be imbued atm - var/obj/item/weapon/paper/newtalisman + var/obj/item/paper/newtalisman var/unsuitable_newtalisman = 0 - for(var/obj/item/weapon/paper/P in src.loc) + for(var/obj/item/paper/P in src.loc) if(!P.info) newtalisman = P break @@ -522,7 +522,7 @@ var/list/sacrificed = list() return fizzle() var/obj/effect/rune/imbued_from - var/obj/item/weapon/paper/talisman/T + var/obj/item/paper/talisman/T for(var/obj/effect/rune/R in orange(1,src)) if(R==src) continue @@ -647,10 +647,10 @@ var/list/sacrificed = list() if(istype(I,/obj/item/organ/internal/brain)) var/obj/item/organ/internal/brain/B = I victims += B.brainmob - else if(istype(I,/obj/item/device/mmi)) - var/obj/item/device/mmi/B = I + else if(istype(I,/obj/item/mmi)) + var/obj/item/mmi/B = I victims += B.brainmob - else if(istype(I,/obj/item/device/aicard)) + else if(istype(I,/obj/item/aicard)) for(var/mob/living/silicon/ai/A in I) victims += A for(var/mob/living/carbon/C in orange(1,src)) @@ -764,10 +764,10 @@ var/list/sacrificed = list() if(istype(W,/obj/effect/rune)) rad = 6 go = 1 - if (istype(W,/obj/item/weapon/paper/talisman)) + if (istype(W,/obj/item/paper/talisman)) rad = 4 go = 1 - if (istype(W,/obj/item/weapon/nullrod)) + if (istype(W,/obj/item/nullrod)) rad = 1 go = 1 if(go) @@ -776,7 +776,7 @@ var/list/sacrificed = list() R:visibility=15 S=1 if(S) - if(istype(W,/obj/item/weapon/nullrod)) + if(istype(W,/obj/item/nullrod)) to_chat(usr, "Arcane markings suddenly glow from underneath a thin layer of dust!") return if(istype(W,/obj/effect/rune)) @@ -785,7 +785,7 @@ var/list/sacrificed = list() V.show_message("The rune turns into red dust, reveaing the surrounding runes.", 3) qdel(src) return - if(istype(W,/obj/item/weapon/paper/talisman)) + if(istype(W,/obj/item/paper/talisman)) usr.whisper("Nikt[pick("'","`")]o barada kla'atu!") to_chat(usr, "Your talisman turns into red dust, revealing the surrounding runes.") for (var/mob/V in orange(1,usr.loc)) @@ -795,7 +795,7 @@ var/list/sacrificed = list() return if(istype(W,/obj/effect/rune)) return fizzle() - if(istype(W,/obj/item/weapon/paper/talisman)) + if(istype(W,/obj/item/paper/talisman)) call(/obj/effect/rune/proc/fizzle)() return @@ -908,7 +908,7 @@ var/list/sacrificed = list() for(var/mob/living/carbon/C in range(7,src)) if (iscultist(C)) continue - var/obj/item/weapon/nullrod/N = locate() in C + var/obj/item/nullrod/N = locate() in C if(N) continue C.ear_deaf += 50 @@ -928,7 +928,7 @@ var/list/sacrificed = list() for(var/mob/living/carbon/C in range(7,usr)) if (iscultist(C)) continue - var/obj/item/weapon/nullrod/N = locate() in C + var/obj/item/nullrod/N = locate() in C if(N) continue C.ear_deaf += 30 @@ -950,7 +950,7 @@ var/list/sacrificed = list() for(var/mob/living/carbon/C in viewers(src)) if (iscultist(C)) continue - var/obj/item/weapon/nullrod/N = locate() in C + var/obj/item/nullrod/N = locate() in C if(N) continue C.eye_blurry += 50 @@ -973,7 +973,7 @@ var/list/sacrificed = list() for(var/mob/living/carbon/C in view(2,usr)) if (iscultist(C)) continue - var/obj/item/weapon/nullrod/N = locate() in C + var/obj/item/nullrod/N = locate() in C if(N) continue C.eye_blurry += 30 @@ -1005,7 +1005,7 @@ var/list/sacrificed = list() for(var/mob/living/carbon/M in viewers(usr)) if(iscultist(M)) continue - var/obj/item/weapon/nullrod/N = locate() in M + var/obj/item/nullrod/N = locate() in M if(N) continue M.take_overall_damage(51,51) @@ -1079,7 +1079,7 @@ var/list/sacrificed = list() qdel(src) else ///When invoked as talisman, stun and mute the target mob. usr.say("Dream sign ''Evil sealing talisman'[pick("'","`")]!") - var/obj/item/weapon/nullrod/N = locate() in T + var/obj/item/nullrod/N = locate() in T if(N) for(var/mob/O in viewers(T, null)) O.show_message(text("[] invokes a talisman at [], but they are unaffected!", usr, T), 1) @@ -1114,10 +1114,10 @@ var/list/sacrificed = list() user.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(user), slot_head) user.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(user), slot_wear_suit) user.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), slot_shoes) - user.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/cultpack(user), slot_back) + user.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), slot_back) //the above update their overlay icons cache but do not call update_icons() //the below calls update_icons() at the end, which will update overlay icons by using the (now updated) cache - user.put_in_hands(new /obj/item/weapon/melee/cultblade(user)) //put in hands or on floor + user.put_in_hands(new /obj/item/melee/cultblade(user)) //put in hands or on floor qdel(src) return diff --git a/code/game/gamemodes/cult/soulstone.dm b/code/game/gamemodes/cult/soulstone.dm index 6fefdbc7aab..53ab92731cc 100644 --- a/code/game/gamemodes/cult/soulstone.dm +++ b/code/game/gamemodes/cult/soulstone.dm @@ -2,7 +2,7 @@ // Soulstone ///////////////////////// -/obj/item/device/soulstone +/obj/item/soulstone name = "Soul Stone Shard" icon = 'icons/obj/wizard.dmi' icon_state = "soulstone" @@ -14,12 +14,12 @@ var/imprinted = "empty" var/possible_constructs = list("Juggernaut","Wraith","Artificer","Harvester") -/obj/item/device/soulstone/cultify() +/obj/item/soulstone/cultify() return //////////////////////////////Capturing//////////////////////////////////////////////////////// -/obj/item/device/soulstone/attack(mob/living/carbon/human/M as mob, mob/user as mob) +/obj/item/soulstone/attack(mob/living/carbon/human/M as mob, mob/user as mob) if(!istype(M, /mob/living/carbon/human))//If target is not a human. return ..() if(istype(M, /mob/living/carbon/human/dummy)) @@ -39,7 +39,7 @@ ///////////////////Options for using captured souls/////////////////////////////////////// -/obj/item/device/soulstone/attack_self(mob/user) +/obj/item/soulstone/attack_self(mob/user) if (!in_range(src, user)) return user.set_machine(src) @@ -56,7 +56,7 @@ -/obj/item/device/soulstone/Topic(href, href_list) +/obj/item/soulstone/Topic(href, href_list) var/mob/U = usr if (!in_range(src, U)||U.machine!=src) U << browse(null, "window=aicard") @@ -97,13 +97,13 @@ desc = "This eerie contraption looks like it would come alive if supplied with a missing ingredient." /obj/structure/constructshell/attackby(obj/item/O as obj, mob/user as mob) - if(istype(O, /obj/item/device/soulstone)) - var/obj/item/device/soulstone/S = O; + if(istype(O, /obj/item/soulstone)) + var/obj/item/soulstone/S = O; S.transfer_soul("CONSTRUCT",src,user) ////////////////////////////Proc for moving soul in and out off stone////////////////////////////////////// -/obj/item/device/soulstone/proc/transfer_human(var/mob/living/carbon/human/T,var/mob/U) +/obj/item/soulstone/proc/transfer_human(var/mob/living/carbon/human/T,var/mob/U) if(!istype(T)) return; if(src.imprinted != "empty") @@ -156,7 +156,7 @@ src.imprinted = "[S.name]" qdel(T) -/obj/item/device/soulstone/proc/transfer_shade(var/mob/living/simple_mob/construct/shade/T,var/mob/U) +/obj/item/soulstone/proc/transfer_shade(var/mob/living/simple_mob/construct/shade/T,var/mob/U) if(!istype(T)) return; if (T.stat == DEAD) @@ -178,7 +178,7 @@ to_chat(T, "Your soul has been recaptured by the soul stone, its arcane energies are reknitting your ethereal form") to_chat(U, "Capture successful! : [T.name]'s has been recaptured and stored within the soul stone.") -/obj/item/device/soulstone/proc/transfer_construct(var/obj/structure/constructshell/T,var/mob/U) +/obj/item/soulstone/proc/transfer_construct(var/obj/structure/constructshell/T,var/mob/U) var/mob/living/simple_mob/construct/shade/A = locate() in src if(!A) to_chat(U, "Capture failed!: The soul stone is empty! Go kill someone!") @@ -236,7 +236,7 @@ Z.cancel_camera() qdel(src) -/obj/item/device/soulstone/proc/transfer_soul(var/choice as text, var/target, var/mob/U as mob) +/obj/item/soulstone/proc/transfer_soul(var/choice as text, var/target, var/mob/U as mob) switch(choice) if("VICTIM") transfer_human(target,U) diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 24a64ef1af7..a26740e6d89 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -1,10 +1,10 @@ -/obj/item/weapon/paper/talisman +/obj/item/paper/talisman icon_state = "paper_talisman" var/imbue = null var/uses = 0 info = "


" -/obj/item/weapon/paper/talisman/attack_self(mob/living/user as mob) +/obj/item/paper/talisman/attack_self(mob/living/user as mob) if(iscultist(user)) var/delete = 1 // who the hell thought this was a good idea :( @@ -43,7 +43,7 @@ return -/obj/item/weapon/paper/talisman/attack(mob/living/carbon/T as mob, mob/living/user as mob) +/obj/item/paper/talisman/attack(mob/living/carbon/T as mob, mob/living/user as mob) if(iscultist(user)) if(imbue == "runestun") user.take_organ_damage(5, 0) @@ -55,7 +55,7 @@ ..() -/obj/item/weapon/paper/talisman/proc/supply(var/key) +/obj/item/paper/talisman/proc/supply(var/key) if (!src.uses) qdel(src) return @@ -76,36 +76,36 @@ return -/obj/item/weapon/paper/talisman/Topic(href, href_list) +/obj/item/paper/talisman/Topic(href, href_list) if(!src) return if (usr.stat || usr.restrained() || !in_range(src, usr)) return if (href_list["rune"]) switch(href_list["rune"]) if("newtome") - var/obj/item/weapon/paper/talisman/T = new /obj/item/weapon/paper/talisman(get_turf(usr)) + var/obj/item/paper/talisman/T = new /obj/item/paper/talisman(get_turf(usr)) T.imbue = "newtome" if("teleport") - var/obj/item/weapon/paper/talisman/T = new /obj/item/weapon/paper/talisman(get_turf(usr)) + var/obj/item/paper/talisman/T = new /obj/item/paper/talisman(get_turf(usr)) T.imbue = "[pick("ire", "ego", "nahlizet", "certum", "veri", "jatkaa", "balaq", "mgar", "karazet", "geeri", "orkan", "allaq")]" T.info = "[T.imbue]" if("emp") - var/obj/item/weapon/paper/talisman/T = new /obj/item/weapon/paper/talisman(get_turf(usr)) + var/obj/item/paper/talisman/T = new /obj/item/paper/talisman(get_turf(usr)) T.imbue = "emp" if("conceal") - var/obj/item/weapon/paper/talisman/T = new /obj/item/weapon/paper/talisman(get_turf(usr)) + var/obj/item/paper/talisman/T = new /obj/item/paper/talisman(get_turf(usr)) T.imbue = "conceal" if("communicate") - var/obj/item/weapon/paper/talisman/T = new /obj/item/weapon/paper/talisman(get_turf(usr)) + var/obj/item/paper/talisman/T = new /obj/item/paper/talisman(get_turf(usr)) T.imbue = "communicate" if("runestun") - var/obj/item/weapon/paper/talisman/T = new /obj/item/weapon/paper/talisman(get_turf(usr)) + var/obj/item/paper/talisman/T = new /obj/item/paper/talisman(get_turf(usr)) T.imbue = "runestun" if("armor") - var/obj/item/weapon/paper/talisman/T = new /obj/item/weapon/paper/talisman(get_turf(usr)) + var/obj/item/paper/talisman/T = new /obj/item/paper/talisman(get_turf(usr)) T.imbue = "armor" if("soulstone") - new /obj/item/device/soulstone(get_turf(usr)) + new /obj/item/soulstone(get_turf(usr)) if("construct") new /obj/structure/constructshell/cult(get_turf(usr)) src.uses-- @@ -113,6 +113,6 @@ return -/obj/item/weapon/paper/talisman/supply +/obj/item/paper/talisman/supply imbue = "supply" uses = 5 diff --git a/code/game/gamemodes/endgame/supermatter_cascade/blob.dm b/code/game/gamemodes/endgame/supermatter_cascade/blob.dm index 000cc542247..50bdb4fcd01 100644 --- a/code/game/gamemodes/endgame/supermatter_cascade/blob.dm +++ b/code/game/gamemodes/endgame/supermatter_cascade/blob.dm @@ -86,7 +86,7 @@ Consume(user) -/turf/unsimulated/wall/supermatter/attackby(obj/item/weapon/W as obj, mob/living/user as mob) +/turf/unsimulated/wall/supermatter/attackby(obj/item/W as obj, mob/living/user as mob) user.visible_message("\The [user] touches \a [W] to \the [src] as a silence fills the room...",\ "You touch \the [W] to \the [src] when everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\ "Everything suddenly goes silent.") diff --git a/code/game/gamemodes/events/holidays/Christmas.dm b/code/game/gamemodes/events/holidays/Christmas.dm index 62a29d823c2..d50c19fb93c 100644 --- a/code/game/gamemodes/events/holidays/Christmas.dm +++ b/code/game/gamemodes/events/holidays/Christmas.dm @@ -3,7 +3,7 @@ if(isNotStationLevel(xmas.z)) continue for(var/turf/simulated/floor/T in orange(1,xmas)) for(var/i=1,i<=rand(1,5),i++) - new /obj/item/weapon/a_gift(T) + new /obj/item/a_gift(T) //for(var/mob/living/simple_mob/corgi/Ian/Ian in mob_list) // Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian)) @@ -16,20 +16,20 @@ evil_tree.icon_gib = evil_tree.icon_state qdel(xmas) -/obj/item/weapon/toy/xmas_cracker +/obj/item/toy/xmas_cracker name = "xmas cracker" icon = 'icons/obj/christmas.dmi' icon_state = "cracker" desc = "Directions for use: Requires two people, one to pull each end." var/cracked = 0 -/obj/item/weapon/toy/xmas_cracker/New() +/obj/item/toy/xmas_cracker/New() ..() -/obj/item/weapon/toy/xmas_cracker/attack(mob/target, mob/user) +/obj/item/toy/xmas_cracker/attack(mob/target, mob/user) if( !cracked && (istype(target,/mob/living/silicon) || (istype(target,/mob/living/carbon/human) && !target.get_active_hand())) && target.stat == CONSCIOUS) target.visible_message("[user] and [target] pop \an [src]! *pop*", "You pull \an [src] with [target]! *pop*", "You hear a *pop*.") - var/obj/item/weapon/paper/Joke = new /obj/item/weapon/paper(user.loc) + var/obj/item/paper/Joke = new /obj/item/paper(user.loc) Joke.name = "[pick("awful","terrible","unfunny")] joke" Joke.info = pick("What did one snowman say to the other?\n\n'Is it me or can you smell carrots?'", "Why couldn't the snowman get laid?\n\nHe was frigid!", @@ -45,7 +45,7 @@ user.update_icons() cracked = 1 icon_state = "cracker1" - var/obj/item/weapon/toy/xmas_cracker/other_half = new /obj/item/weapon/toy/xmas_cracker(target) + var/obj/item/toy/xmas_cracker/other_half = new /obj/item/toy/xmas_cracker(target) other_half.cracked = 1 other_half.icon_state = "cracker2" target.put_in_active_hand(other_half) diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm index b274d8a0fad..07ae0a64c1d 100644 --- a/code/game/gamemodes/events/holidays/Holidays.dm +++ b/code/game/gamemodes/events/holidays/Holidays.dm @@ -294,12 +294,12 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t var/turf/simulated/floor/F = Floorlist[rand(1,Floorlist.len)] Floorlist = null var/obj/structure/closet/C = locate(/obj/structure/closet) in F - var/obj/item/weapon/reagent_containers/food/snacks/chocolateegg/wrapped/Egg + var/obj/item/reagent_containers/food/snacks/chocolateegg/wrapped/Egg if( C ) Egg = new(C) else Egg = new(F) */ /* var/list/obj/containers = list() - for(var/obj/item/weapon/storage/S in world) + for(var/obj/item/storage/S in world) if(isNotStationLevel(S.z)) continue containers += S diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/HARDWARE.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/HARDWARE.dm index df2d223c6e4..4179f8228ed 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/HARDWARE.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/HARDWARE.dm @@ -68,7 +68,7 @@ set name = "Destroy Station" set desc = "Activates or deactivates self destruct sequence of this station. Sequence takes two minutes, and if you are shut down before timer reaches zero it will be cancelled." var/mob/living/silicon/ai/user = usr - var/obj/item/device/radio/radio = new/obj/item/device/radio() + var/obj/item/radio/radio = new/obj/item/radio() if(!ability_prechecks(user, 0, 0)) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index dc636e54dc7..198cc693143 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -118,7 +118,7 @@ var/heavy = FALSE var/z_original - var/meteordrop = /obj/item/weapon/ore/iron + var/meteordrop = /obj/item/ore/iron var/dropamt = 2 // How much damage it does to walls, using take_damage(). @@ -200,8 +200,8 @@ /obj/effect/meteor/ex_act() return -/obj/effect/meteor/attackby(obj/item/weapon/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/weapon/pickaxe)) +/obj/effect/meteor/attackby(obj/item/W as obj, mob/user as mob, params) + if(istype(W, /obj/item/pickaxe)) qdel(src) return ..() @@ -247,7 +247,7 @@ pass_flags = PASSTABLE | PASSGRILLE hits = 1 hitpwr = 3 - meteordrop = /obj/item/weapon/ore/glass + meteordrop = /obj/item/ore/glass wall_power = 50 // Medium-sized meteors aren't very special and can be stopped easily by r-walls. @@ -281,7 +281,7 @@ icon_state = "flaming" hits = 5 heavy = 1 - meteordrop = /obj/item/weapon/ore/phoron + meteordrop = /obj/item/ore/phoron wall_power = 100 /obj/effect/meteor/flaming/meteor_effect(var/explode) @@ -294,7 +294,7 @@ name = "glowing meteor" icon_state = "glowing" heavy = 1 - meteordrop = /obj/item/weapon/ore/uranium + meteordrop = /obj/item/ore/uranium wall_power = 75 @@ -310,7 +310,7 @@ name = "conducting meteor" icon_state = "glowing_blue" desc = "Hide your floppies!" - meteordrop = /obj/item/weapon/ore/osmium + meteordrop = /obj/item/ore/osmium dropamt = 3 wall_power = 80 @@ -331,7 +331,7 @@ hits = 30 hitpwr = 1 heavy = 1 - meteordrop = /obj/item/weapon/ore/phoron + meteordrop = /obj/item/ore/phoron wall_power = 150 /obj/effect/meteor/tunguska/meteor_effect(var/explode) diff --git a/code/game/gamemodes/meteor/meteors_vr.dm b/code/game/gamemodes/meteor/meteors_vr.dm index 6c24416b392..52e9ebf1ce6 100644 --- a/code/game/gamemodes/meteor/meteors_vr.dm +++ b/code/game/gamemodes/meteor/meteors_vr.dm @@ -2,7 +2,7 @@ if(istype(A, /mob/living/carbon)) var/mob/living/carbon/batter = A var/obj/item/I = batter.get_active_hand() - if(!batter.stat && istype(I, /obj/item/weapon/material/twohanded/baseballbat)) + if(!batter.stat && istype(I, /obj/item/material/twohanded/baseballbat)) batter.do_attack_animation(src) batter.visible_message("[batter] deflects [src] with [I]]! Home run!", "You deflect [src] with [I]! Home run!") walk_away(src, batter, 100, 1) diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index 1b3a1147a1e..5c60665a74b 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -563,7 +563,7 @@ datum captainslaser - steal_target = /obj/item/weapon/gun/energy/captain + steal_target = /obj/item/gun/energy/captain explanation_text = "Steal the Site Manager's antique laser gun." weight = 20 @@ -588,7 +588,7 @@ datum plasmatank - steal_target = /obj/item/weapon/tank/plasma + steal_target = /obj/item/tank/plasma explanation_text = "Steal a small plasma tank." weight = 20 @@ -630,7 +630,7 @@ datum handtele - steal_target = /obj/item/weapon/hand_tele + steal_target = /obj/item/hand_tele explanation_text = "Steal a hand teleporter." weight = 20 @@ -655,7 +655,7 @@ datum RCD - steal_target = /obj/item/weapon/rcd + steal_target = /obj/item/rcd explanation_text = "Steal a rapid construction device." weight = 20 @@ -680,7 +680,7 @@ datum /*burger - steal_target = /obj/item/weapon/reagent_containers/food/snacks/human/burger + steal_target = /obj/item/reagent_containers/food/snacks/human/burger explanation_text = "Steal a burger made out of human organs, this will be presented as proof of NanoTrasen's chronic lack of standards." weight = 60 @@ -699,7 +699,7 @@ datum jetpack - steal_target = /obj/item/weapon/tank/jetpack/oxygen + steal_target = /obj/item/tank/jetpack/oxygen explanation_text = "Steal a blue oxygen jetpack." weight = 20 @@ -796,7 +796,7 @@ datum nuke_disk - steal_target = /obj/item/weapon/disk/nuclear + steal_target = /obj/item/disk/nuclear explanation_text = "Steal the station's nuclear authentication disk." weight = 20 @@ -820,7 +820,7 @@ datum return 20 nuke_gun - steal_target = /obj/item/weapon/gun/energy/gun/nuclear + steal_target = /obj/item/gun/energy/gun/nuclear explanation_text = "Steal a nuclear powered gun." weight = 20 @@ -841,7 +841,7 @@ datum return 2 diamond_drill - steal_target = /obj/item/weapon/pickaxe/diamonddrill + steal_target = /obj/item/pickaxe/diamonddrill explanation_text = "Steal a diamond drill." weight = 20 @@ -862,7 +862,7 @@ datum return 2 boh - steal_target = /obj/item/weapon/storage/backpack/holding + steal_target = /obj/item/storage/backpack/holding explanation_text = "Steal a \"bag of holding.\"" weight = 20 @@ -883,7 +883,7 @@ datum return 2 hyper_cell - steal_target = /obj/item/weapon/cell/hyper + steal_target = /obj/item/cell/hyper explanation_text = "Steal a hyper capacity power cell." weight = 20 @@ -999,7 +999,7 @@ datum /*Needs some work before it can be put in the game to differentiate ship implanters from syndicate implanters. steal/implanter - steal_target = /obj/item/weapon/implanter + steal_target = /obj/item/implanter explanation_text = "Steal an implanter" weight = 50 @@ -1066,7 +1066,7 @@ datum check_completion() if(steal_target) - for(var/obj/item/device/aicard/C in owner.current.get_contents()) + for(var/obj/item/aicard/C in owner.current.get_contents()) for(var/mob/living/silicon/ai/M in C) if(istype(M, /mob/living/silicon/ai) && M.stat != 2) return 1 @@ -1209,7 +1209,7 @@ datum check_completion() var/held_credits = 0 - for(var/obj/item/weapon/spacecash/M in owner.current.get_contents()) + for(var/obj/item/spacecash/M in owner.current.get_contents()) held_credits += M.worth if(held_credits >= steal_amount) return 1 @@ -1274,7 +1274,7 @@ datum if(!owner.current||owner.current.stat==2)//If you're otherwise dead. return 0 var/list/all_items = owner.current.get_contents() - for(var/obj/item/weapon/organ/head/mmi in all_items) + for(var/obj/item/organ/head/mmi in all_items) if(mmi.brainmob&&mmi.brainmob.mind==target) return 1 return 0 @@ -1335,7 +1335,7 @@ datum return 0 var/current_amount - var/obj/item/weapon/rig/S + var/obj/item/rig/S if(istype(owner.current,/mob/living/carbon/human)) var/mob/living/carbon/human/H = owner.current S = H.back @@ -1378,7 +1378,7 @@ datum if(!owner.current||owner.current.stat==2)//If you're otherwise dead. return 0 var/list/all_items = owner.current.get_contents() - for(var/obj/item/device/mmi/mmi in all_items) + for(var/obj/item/mmi/mmi in all_items) if(mmi.brainmob&&mmi.brainmob.mind==target) return 1 for(var/obj/item/organ/brain/brain in all_items) if(brain.brainmob&&brain.brainmob.mind==target) return 1 diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index f6f2d1f68d3..5a82ae95068 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -22,12 +22,12 @@ var/list/nuke_disks = list() //delete all nuke disks not on a station zlevel /datum/game_mode/nuclear/proc/check_nuke_disks() - for(var/obj/item/weapon/disk/nuclear/N in nuke_disks) + for(var/obj/item/disk/nuclear/N in nuke_disks) if(isNotStationLevel(N.z)) qdel(N) //checks if L has a nuke disk on their person /datum/game_mode/nuclear/proc/check_mob(mob/living/L) - for(var/obj/item/weapon/disk/nuclear/N in nuke_disks) + for(var/obj/item/disk/nuclear/N in nuke_disks) if(N.storage_depth(L) >= 0) return 1 return 0 @@ -37,7 +37,7 @@ var/list/nuke_disks = list() ..() return var/disk_rescued = 1 - for(var/obj/item/weapon/disk/nuclear/D in nuke_disks) + for(var/obj/item/disk/nuclear/D in nuke_disks) var/disk_area = get_area(D) if(!is_type_in_list(disk_area, centcom_areas)) disk_rescued = 0 diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 2a60b7ef8f0..52cdc253857 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/pinpointer +/obj/item/pinpointer name = "pinpointer" icon = 'icons/obj/device.dmi' icon_state = "pinoff" @@ -9,15 +9,15 @@ throw_range = 20 matter = list(MAT_STEEL = 500) preserve_item = 1 - var/obj/item/weapon/disk/nuclear/the_disk = null + var/obj/item/disk/nuclear/the_disk = null var/active = 0 -/obj/item/weapon/pinpointer/Destroy() +/obj/item/pinpointer/Destroy() active = 0 STOP_PROCESSING(SSobj, src) return ..() -/obj/item/weapon/pinpointer/attack_self() +/obj/item/pinpointer/attack_self() if(!active) active = 1 START_PROCESSING(SSobj, src) @@ -28,7 +28,7 @@ icon_state = "pinoff" to_chat(usr, "You deactivate the pinpointer") -/obj/item/weapon/pinpointer/process() +/obj/item/pinpointer/process() if(!active) return PROCESS_KILL @@ -50,7 +50,7 @@ if(16 to INFINITY) icon_state = "pinonfar" -/obj/item/weapon/pinpointer/examine(mob/user) +/obj/item/pinpointer/examine(mob/user) . = ..() for(var/obj/machinery/nuclearbomb/bomb in machines) if(bomb.timing) @@ -58,7 +58,7 @@ -/obj/item/weapon/pinpointer/advpinpointer +/obj/item/pinpointer/advpinpointer name = "Advanced Pinpointer" icon = 'icons/obj/device.dmi' desc = "A larger version of the normal pinpointer, this unit features a helpful quantum entanglement detection system to locate various objects that do not broadcast a locator signal." @@ -66,7 +66,7 @@ var/turf/location = null var/obj/target = null -/obj/item/weapon/pinpointer/advpinpointer/process() +/obj/item/pinpointer/advpinpointer/process() if(!active) return PROCESS_KILL if(mode == 0) @@ -76,7 +76,7 @@ if(mode == 2) workobj() -/obj/item/weapon/pinpointer/advpinpointer/proc/worklocation() +/obj/item/pinpointer/advpinpointer/proc/worklocation() if(!location) icon_state = "pinonnull" return @@ -93,7 +93,7 @@ if(16 to INFINITY) icon_state = "pinonfar" -/obj/item/weapon/pinpointer/advpinpointer/proc/workobj() +/obj/item/pinpointer/advpinpointer/proc/workobj() if(!target) icon_state = "pinonnull" return @@ -110,7 +110,7 @@ if(16 to INFINITY) icon_state = "pinonfar" -/obj/item/weapon/pinpointer/advpinpointer/verb/toggle_mode() +/obj/item/pinpointer/advpinpointer/verb/toggle_mode() set category = "Object" set name = "Toggle Pinpointer Mode" set src in view(1) @@ -178,11 +178,11 @@ /////////////////////// -/obj/item/weapon/pinpointer/nukeop +/obj/item/pinpointer/nukeop var/mode = 0 //Mode 0 locates disk, mode 1 locates the shuttle var/obj/machinery/computer/shuttle_control/multi/syndicate/home = null -/obj/item/weapon/pinpointer/nukeop/attack_self(mob/user as mob) +/obj/item/pinpointer/nukeop/attack_self(mob/user as mob) if(!active) active = 1 START_PROCESSING(SSobj, src) @@ -198,7 +198,7 @@ icon_state = "pinoff" to_chat(user, "You deactivate the pinpointer.") -/obj/item/weapon/pinpointer/nukeop/process() +/obj/item/pinpointer/nukeop/process() if(!active) return PROCESS_KILL @@ -208,7 +208,7 @@ if(1) worklocation() -/obj/item/weapon/pinpointer/nukeop/proc/workdisk() +/obj/item/pinpointer/nukeop/proc/workdisk() if(bomb_set) //If the bomb is set, lead to the shuttle mode = 1 //Ensures worklocation() continues to work playsound(src, 'sound/machines/twobeep.ogg', 50, 1) //Plays a beep @@ -233,7 +233,7 @@ if(16 to INFINITY) icon_state = "pinonfar" -/obj/item/weapon/pinpointer/nukeop/proc/worklocation() +/obj/item/pinpointer/nukeop/proc/worklocation() if(!bomb_set) mode = 0 playsound(src, 'sound/machines/twobeep.ogg', 50, 1) @@ -264,11 +264,11 @@ // This one only points to the ship. Useful if there is no nuking to occur today. -/obj/item/weapon/pinpointer/shuttle +/obj/item/pinpointer/shuttle var/shuttle_comp_id = null var/obj/machinery/computer/shuttle_control/our_shuttle = null -/obj/item/weapon/pinpointer/shuttle/attack_self(mob/user as mob) +/obj/item/pinpointer/shuttle/attack_self(mob/user as mob) if(!active) active = TRUE START_PROCESSING(SSobj, src) @@ -279,7 +279,7 @@ icon_state = "pinoff" to_chat(user, "You deactivate the pinpointer.") -/obj/item/weapon/pinpointer/shuttle/process() +/obj/item/pinpointer/shuttle/process() if(!active) return PROCESS_KILL @@ -310,8 +310,8 @@ icon_state = "pinonfar" -/obj/item/weapon/pinpointer/shuttle/merc +/obj/item/pinpointer/shuttle/merc shuttle_comp_id = "Mercenary" -/obj/item/weapon/pinpointer/shuttle/heist +/obj/item/pinpointer/shuttle/heist shuttle_comp_id = "Skipjack" \ No newline at end of file diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index b86f2ad0cdc..d563959fe53 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -143,9 +143,9 @@ var/global/list/all_objectives = list() /datum/objective/anti_revolution/demote/check_completion() if(target && target.current && istype(target,/mob/living/carbon/human)) - var/obj/item/weapon/card/id/I = target.current:wear_id - if(istype(I, /obj/item/device/pda)) - var/obj/item/device/pda/P = I + var/obj/item/card/id/I = target.current:wear_id + if(istype(I, /obj/item/pda)) + var/obj/item/pda/P = I I = P.id if(!istype(I)) return 1 @@ -424,34 +424,34 @@ var/global/list/all_objectives = list() var/target_name var/global/possible_items[] = list( - "the Site Manager's antique laser gun" = /obj/item/weapon/gun/energy/captain, - "a hand teleporter" = /obj/item/weapon/hand_tele, - "an RCD" = /obj/item/weapon/rcd, - "a jetpack" = /obj/item/weapon/tank/jetpack, + "the Site Manager's antique laser gun" = /obj/item/gun/energy/captain, + "a hand teleporter" = /obj/item/hand_tele, + "an RCD" = /obj/item/rcd, + "a jetpack" = /obj/item/tank/jetpack, "a site manager's jumpsuit" = /obj/item/clothing/under/rank/captain, - "a functional AI" = /obj/item/device/aicard, + "a functional AI" = /obj/item/aicard, "a pair of magboots" = /obj/item/clothing/shoes/magboots, "the station blueprints" = /obj/item/areaeditor/blueprints, "a nasa voidsuit" = /obj/item/clothing/suit/space/void, - "28 moles of phoron (full tank)" = /obj/item/weapon/tank, + "28 moles of phoron (full tank)" = /obj/item/tank, "a sample of slime extract" = /obj/item/slime_extract, - "a piece of corgi meat" = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi, + "a piece of corgi meat" = /obj/item/reagent_containers/food/snacks/meat/corgi, "a research director's jumpsuit" = /obj/item/clothing/under/rank/research_director, "a chief engineer's jumpsuit" = /obj/item/clothing/under/rank/chief_engineer, "a chief medical officer's jumpsuit" = /obj/item/clothing/under/rank/chief_medical_officer, "a head of security's jumpsuit" = /obj/item/clothing/under/rank/head_of_security, "a head of personnel's jumpsuit" = /obj/item/clothing/under/rank/head_of_personnel, - "the hypospray" = /obj/item/weapon/reagent_containers/hypospray/vial, - "the site manager's pinpointer" = /obj/item/weapon/pinpointer, + "the hypospray" = /obj/item/reagent_containers/hypospray/vial, + "the site manager's pinpointer" = /obj/item/pinpointer, "an ablative armor vest" = /obj/item/clothing/suit/armor/laserproof, ) var/global/possible_items_special[] = list( - /*"nuclear authentication disk" = /obj/item/weapon/disk/nuclear,*///Broken with the change to nuke disk making it respawn on z level change. - "nuclear gun" = /obj/item/weapon/gun/energy/gun/nuclear, - "diamond drill" = /obj/item/weapon/pickaxe/diamonddrill, - "bag of holding" = /obj/item/weapon/storage/backpack/holding, - "hyper-capacity cell" = /obj/item/weapon/cell/hyper, + /*"nuclear authentication disk" = /obj/item/disk/nuclear,*///Broken with the change to nuke disk making it respawn on z level change. + "nuclear gun" = /obj/item/gun/energy/gun/nuclear, + "diamond drill" = /obj/item/pickaxe/diamonddrill, + "bag of holding" = /obj/item/storage/backpack/holding, + "hyper-capacity cell" = /obj/item/cell/hyper, "10 diamonds" = /obj/item/stack/material/diamond, "50 gold bars" = /obj/item/stack/material/gold, "25 refined uranium bars" = /obj/item/stack/material/uranium, @@ -505,18 +505,18 @@ var/global/list/all_objectives = list() return found_amount>=target_amount if("50 coins (in bag)") - var/obj/item/weapon/moneybag/B = locate() in all_items + var/obj/item/moneybag/B = locate() in all_items if(B) var/target = text2num(target_name) var/found_amount = 0.0 - for(var/obj/item/weapon/coin/C in B) + for(var/obj/item/coin/C in B) found_amount++ return found_amount>=target if("a functional AI") - for(var/obj/item/device/aicard/C in all_items) //Check for ai card + for(var/obj/item/aicard/C in all_items) //Check for ai card for(var/mob/living/silicon/ai/M in C) if(istype(M, /mob/living/silicon/ai) && M.stat != 2) //See if any AI's are alive inside that card. return 1 @@ -557,7 +557,7 @@ var/global/list/all_objectives = list() return 0 var/current_amount - var/obj/item/weapon/rig/S + var/obj/item/rig/S if(istype(owner.current,/mob/living/carbon/human)) var/mob/living/carbon/human/H = owner.current S = H.back @@ -695,19 +695,19 @@ var/global/list/all_objectives = list() target_amount = 1 loot = "a nuclear bomb" if(5) - target = /obj/item/weapon/gun + target = /obj/item/gun target_amount = 6 loot = "six guns" if(6) - target = /obj/item/weapon/gun/energy + target = /obj/item/gun/energy target_amount = 4 loot = "four energy guns" if(7) - target = /obj/item/weapon/gun/energy/laser + target = /obj/item/gun/energy/laser target_amount = 2 loot = "two laser guns" if(8) - target = /obj/item/weapon/gun/energy/ionrifle + target = /obj/item/gun/energy/ionrifle target_amount = 1 loot = "an ion gun" diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 08b6b3d5dc0..2dc568aec35 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -83,7 +83,7 @@ mob P.back.loc = P.loc P.back.reset_plane_and_layer() P.back = null - P.back = new/obj/item/weapon/tank/jetpack(P) + P.back = new/obj/item/tank/jetpack(P) P.back.hud_layerise() P.internal = P.back if("hsbmetal") @@ -118,13 +118,13 @@ mob //var/obj/hsb = new/obj/watertank //hsb.loc = usr.loc if("hsbtoolbox") - var/obj/item/weapon/storage/hsb = new/obj/item/weapon/storage/toolbox/mechanical - for(var/obj/item/device/radio/T in hsb) + var/obj/item/storage/hsb = new/obj/item/storage/toolbox/mechanical + for(var/obj/item/radio/T in hsb) qdel(T) - new/obj/item/weapon/tool/crowbar (hsb) + new/obj/item/tool/crowbar (hsb) hsb.loc = usr.loc if("hsbmedkit") - var/obj/item/weapon/storage/firstaid/hsb = new/obj/item/weapon/storage/firstaid/regular + var/obj/item/storage/firstaid/hsb = new/obj/item/storage/firstaid/regular hsb.loc = usr.loc if("hsbobj") if(!hsboxspawn) return @@ -132,15 +132,15 @@ mob var/list/selectable = list() for(var/O in typesof(/obj/item/)) //Note, these istypes don't work - if(istype(O, /obj/item/weapon/gun)) + if(istype(O, /obj/item/gun)) continue if(istype(O, /obj/item/assembly)) continue - if(istype(O, /obj/item/device/camera)) + if(istype(O, /obj/item/camera)) continue - if(istype(O, /obj/item/weapon/dummy)) + if(istype(O, /obj/item/dummy)) continue - if(istype(O, /obj/item/weapon/melee/energy/sword)) + if(istype(O, /obj/item/melee/energy/sword)) continue if(istype(O, /obj/structure)) continue diff --git a/code/game/gamemodes/technomancer/assistance/assistance.dm b/code/game/gamemodes/technomancer/assistance/assistance.dm index 0e550a08b20..7e60741827c 100644 --- a/code/game/gamemodes/technomancer/assistance/assistance.dm +++ b/code/game/gamemodes/technomancer/assistance/assistance.dm @@ -8,7 +8,7 @@ If you are unable to receive an apprentice, the teleporter can be refunded like most equipment by sliding it into the \ catalog. Note that apprentices cannot purchase more apprentices." cost = 300 - obj_path = /obj/item/weapon/antag_spawner/technomancer_apprentice + obj_path = /obj/item/antag_spawner/technomancer_apprentice /* // For when no one wants to play support. diff --git a/code/game/gamemodes/technomancer/catalog.dm b/code/game/gamemodes/technomancer/catalog.dm index 2c4a8c925dc..55b802ed8fd 100644 --- a/code/game/gamemodes/technomancer/catalog.dm +++ b/code/game/gamemodes/technomancer/catalog.dm @@ -18,7 +18,7 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance var/enhancement_desc = null var/spell_power_desc = null -/obj/item/weapon/technomancer_catalog +/obj/item/technomancer_catalog name = "catalog" desc = "A \"book\" featuring a holographic display, metal cover, and miniaturized teleportation device, allowing the user to \ requisition various things from... wherever they came from." @@ -38,18 +38,18 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance var/show_scepter_text = 0 var/universal = FALSE //VOREStation Add - Allows non-technomancers to use this catalog -/obj/item/weapon/technomancer_catalog/apprentice +/obj/item/technomancer_catalog/apprentice name = "apprentice's catalog" budget = 700 max_budget = 700 -/obj/item/weapon/technomancer_catalog/master //for badmins, I suppose +/obj/item/technomancer_catalog/master //for badmins, I suppose name = "master's catalog" budget = 2000 max_budget = 2000 //VOREStation Add -/obj/item/weapon/technomancer_catalog/universal +/obj/item/technomancer_catalog/universal name = "universal catalog" desc = "A catalog to be used with the KHI 'Universal Core', shamelessly \ copied by a Kitsuhana designer from some group of 'technomancers' or another.
\ @@ -62,21 +62,21 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance // Proc: bind_to_owner() // Parameters: 1 (new_owner - mob that the book is trying to bind to) // Description: Links the catalog to hopefully the technomancer, so that only they can access it. -/obj/item/weapon/technomancer_catalog/proc/bind_to_owner(var/mob/living/carbon/human/new_owner) +/obj/item/technomancer_catalog/proc/bind_to_owner(var/mob/living/carbon/human/new_owner) if(!owner && (technomancers.is_antagonist(new_owner.mind) || universal)) //VOREStation Edit - Universal catalogs owner = new_owner // Proc: New() // Parameters: 0 // Description: Sets up the catalog, as shown below. -/obj/item/weapon/technomancer_catalog/New() +/obj/item/technomancer_catalog/New() ..() set_up() // Proc: set_up() // Parameters: 0 // Description: Instantiates all the catalog datums for everything that can be bought. -/obj/item/weapon/technomancer_catalog/proc/set_up() +/obj/item/technomancer_catalog/proc/set_up() if(!spell_instances.len) for(var/S in all_technomancer_spells) spell_instances += new S() @@ -90,7 +90,7 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance for(var/A in all_technomancer_assistance) assistance_instances += new A() -/obj/item/weapon/technomancer_catalog/apprentice/set_up() +/obj/item/technomancer_catalog/apprentice/set_up() ..() for(var/datum/technomancer/assistance/apprentice/A in assistance_instances) assistance_instances.Remove(A) @@ -99,7 +99,7 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance // Parameters: 1 (category - the category link to display) // Description: Shows an href link to go to a spell subcategory if the category is not already selected, otherwise is bold, to reduce // code duplicating. -/obj/item/weapon/technomancer_catalog/proc/show_categories(var/category) +/obj/item/technomancer_catalog/proc/show_categories(var/category) if(category) if(spell_tab != category) return "[category]" @@ -109,7 +109,7 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance // Proc: attack_self() // Parameters: 1 (user - the mob clicking on the catalog) // Description: Shows an HTML window, to buy equipment and spells, if the user is the legitimate owner. Otherwise it cannot be used. -/obj/item/weapon/technomancer_catalog/attack_self(mob/user) +/obj/item/technomancer_catalog/attack_self(mob/user) if(!user) return 0 if(owner && user != owner) @@ -273,7 +273,7 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance // Proc: Topic() // Parameters: 2 (href - don't know, href_list - the choice that the person using the interface above clicked on.) // Description: Acts upon clicks on links for the catalog, if they are the rightful owner. -/obj/item/weapon/technomancer_catalog/Topic(href, href_list) +/obj/item/technomancer_catalog/Topic(href, href_list) ..() var/mob/living/carbon/human/H = usr @@ -300,8 +300,8 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance new_spell = spell break - var/obj/item/weapon/technomancer_core/core = null - if(istype(H.back, /obj/item/weapon/technomancer_core)) + var/obj/item/technomancer_core/core = null + if(istype(H.back, /obj/item/technomancer_core)) core = H.back if(new_spell && core) @@ -342,8 +342,8 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance if(T.z in using_map.player_levels) to_chat(H, "You can only refund at your base, it's too late now!") return - var/obj/item/weapon/technomancer_core/core = null - if(istype(H.back, /obj/item/weapon/technomancer_core)) + var/obj/item/technomancer_core/core = null + if(istype(H.back, /obj/item/technomancer_core)) core = H.back if(core) for(var/obj/spellbutton/spell in core.spells) @@ -354,7 +354,7 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance break attack_self(H) -/obj/item/weapon/technomancer_catalog/attackby(var/atom/movable/AM, var/mob/user) +/obj/item/technomancer_catalog/attackby(var/atom/movable/AM, var/mob/user) var/turf/T = get_turf(user) if(T.z in using_map.player_levels) to_chat(user, "You can only refund at your base, it's too late now!") @@ -369,8 +369,8 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance to_chat(user, "You've refunded \the [AM].") // We sadly need to do special stuff here or else people who refund cores with spells will lose points permanently. - if(istype(AM, /obj/item/weapon/technomancer_core)) - var/obj/item/weapon/technomancer_core/core = AM + if(istype(AM, /obj/item/technomancer_core)) + var/obj/item/technomancer_core/core = AM for(var/obj/spellbutton/spell in core.spells) for(var/datum/technomancer/spell/spell_datum in spell_instances) if(spell_datum.obj_path == spell.spellpath) diff --git a/code/game/gamemodes/technomancer/clothing.dm b/code/game/gamemodes/technomancer/clothing.dm index 3c3c79d58e0..b25472b3cc3 100644 --- a/code/game/gamemodes/technomancer/clothing.dm +++ b/code/game/gamemodes/technomancer/clothing.dm @@ -3,7 +3,7 @@ desc = "It's a very shiny and somewhat protective suit, built to help carry cores on the user's back." icon_state = "technomancer_suit" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS|FEET|HANDS - allowed = list(/obj/item/weapon/tank) + allowed = list(/obj/item/tank) armor = list(melee = 50, bullet = 20, laser = 30, energy = 30, bomb = 10, bio = 0, rad = 40) siemens_coefficient = 0.75 diff --git a/code/game/gamemodes/technomancer/core_obj.dm b/code/game/gamemodes/technomancer/core_obj.dm index 0bdf378582d..ccc92ad83a9 100644 --- a/code/game/gamemodes/technomancer/core_obj.dm +++ b/code/game/gamemodes/technomancer/core_obj.dm @@ -1,5 +1,5 @@ //The base core object, worn on the wizard's back. -/obj/item/weapon/technomancer_core +/obj/item/technomancer_core name = "manipulation core" desc = "A bewilderingly complex 'black box' that allows the wearer to accomplish amazing feats." icon = 'icons/obj/technomancer.dmi' @@ -37,24 +37,24 @@ var/max_summons = 10 // Maximum allowed summoned entities. Some cores will have different caps. var/universal = FALSE // Allows non-technomancers to use the core - VOREStation Add -/obj/item/weapon/technomancer_core/New() +/obj/item/technomancer_core/New() ..() START_PROCESSING(SSobj, src) -/obj/item/weapon/technomancer_core/Destroy() +/obj/item/technomancer_core/Destroy() dismiss_all_summons() STOP_PROCESSING(SSobj, src) return ..() // Add the spell buttons to the HUD. -/obj/item/weapon/technomancer_core/equipped(mob/user) +/obj/item/technomancer_core/equipped(mob/user) wearer = user for(var/obj/spellbutton/spell in spells) wearer.ability_master.add_technomancer_ability(spell, spell.ability_icon_state) ..() // Removes the spell buttons from the HUD. -/obj/item/weapon/technomancer_core/dropped(mob/user) +/obj/item/technomancer_core/dropped(mob/user) for(var/obj/screen/ability/obj_based/technomancer/A in wearer.ability_master.ability_objects) wearer.ability_master.remove_ability(A) wearer = null @@ -65,23 +65,23 @@ return 0 /mob/living/carbon/human/technomancer_pay_energy(amount) - if(istype(back, /obj/item/weapon/technomancer_core)) - var/obj/item/weapon/technomancer_core/TC = back + if(istype(back, /obj/item/technomancer_core)) + var/obj/item/technomancer_core/TC = back return TC.pay_energy(amount) return 0 -/obj/item/weapon/technomancer_core/proc/pay_energy(amount) +/obj/item/technomancer_core/proc/pay_energy(amount) amount = round(amount * energy_cost_modifier, 0.1) if(amount <= energy) energy = max(energy - amount, 0) return 1 return 0 -/obj/item/weapon/technomancer_core/proc/give_energy(amount) +/obj/item/technomancer_core/proc/give_energy(amount) energy = min(energy + amount, max_energy) return 1 -/obj/item/weapon/technomancer_core/process() +/obj/item/technomancer_core/process() var/old_energy = energy regenerate() pay_dues() @@ -94,20 +94,20 @@ if(!wearer || wearer.stat == DEAD) // Unlock if we're dead or not worn. canremove = TRUE -/obj/item/weapon/technomancer_core/proc/regenerate() +/obj/item/technomancer_core/proc/regenerate() energy = min(max(energy + regen_rate, 0), max_energy) if(wearer && ishuman(wearer)) var/mob/living/carbon/human/H = wearer H.wiz_energy_update_hud() // We pay for on-going effects here. -/obj/item/weapon/technomancer_core/proc/pay_dues() +/obj/item/technomancer_core/proc/pay_dues() if(summoned_mobs.len) pay_energy( round(summoned_mobs.len * 5) ) // Because sometimes our summoned mobs will stop existing and leave a null entry in the list, we need to do cleanup every // so often so .len remains reliable. -/obj/item/weapon/technomancer_core/proc/maintain_summon_list() +/obj/item/technomancer_core/proc/maintain_summon_list() if(!summoned_mobs.len) // No point doing work if there's no work to do. return for(var/A in summoned_mobs) @@ -127,7 +127,7 @@ qdel(L) // Deletes all the summons and wards from the core, so that Destroy() won't have issues. -/obj/item/weapon/technomancer_core/proc/dismiss_all_summons() +/obj/item/technomancer_core/proc/dismiss_all_summons() for(var/mob/living/L in summoned_mobs) summoned_mobs -= L qdel(L) @@ -139,7 +139,7 @@ /obj/spellbutton name = "generic spellbutton" var/spellpath = null - var/obj/item/weapon/technomancer_core/core = null + var/obj/item/technomancer_core/core = null var/ability_icon_state = null /obj/spellbutton/New(loc, var/path, var/new_name, var/new_icon_state) @@ -163,11 +163,11 @@ /mob/living/carbon/human/Stat() . = ..() - if(. && istype(back,/obj/item/weapon/technomancer_core)) - var/obj/item/weapon/technomancer_core/core = back + if(. && istype(back,/obj/item/technomancer_core)) + var/obj/item/technomancer_core/core = back setup_technomancer_stat(core) -/mob/living/carbon/human/proc/setup_technomancer_stat(var/obj/item/weapon/technomancer_core/core) +/mob/living/carbon/human/proc/setup_technomancer_stat(var/obj/item/technomancer_core/core) if(core && statpanel("Spell Core")) var/charge_status = "[core.energy]/[core.max_energy] ([round( (core.energy / core.max_energy) * 100)]%) \ ([round(core.energy_delta)]/s)" @@ -178,9 +178,9 @@ for(var/obj/spellbutton/button in core.spells) stat(button) -/obj/item/weapon/technomancer_core/proc/add_spell(var/path, var/new_name, var/ability_icon_state) +/obj/item/technomancer_core/proc/add_spell(var/path, var/new_name, var/ability_icon_state) if(!path || !ispath(path)) - message_admins("ERROR: /obj/item/weapon/technomancer_core/add_spell() was not given a proper path! \ + message_admins("ERROR: /obj/item/technomancer_core/add_spell() was not given a proper path! \ The path supplied was [path].") return var/obj/spellbutton/spell = new(src, path, new_name, ability_icon_state) @@ -188,7 +188,7 @@ if(wearer) wearer.ability_master.add_technomancer_ability(spell, ability_icon_state) -/obj/item/weapon/technomancer_core/proc/remove_spell(var/obj/spellbutton/spell_to_remove) +/obj/item/technomancer_core/proc/remove_spell(var/obj/spellbutton/spell_to_remove) if(spell_to_remove in spells) spells.Remove(spell_to_remove) if(wearer) @@ -197,12 +197,12 @@ wearer.ability_master.remove_ability(A) qdel(spell_to_remove) -/obj/item/weapon/technomancer_core/proc/remove_all_spells() +/obj/item/technomancer_core/proc/remove_all_spells() for(var/obj/spellbutton/spell in spells) spells.Remove(spell) qdel(spell) -/obj/item/weapon/technomancer_core/proc/has_spell(var/datum/technomancer/spell_to_check) +/obj/item/technomancer_core/proc/has_spell(var/datum/technomancer/spell_to_check) for(var/obj/spellbutton/spell in spells) if(spell.spellpath == spell_to_check.obj_path) return 1 @@ -210,8 +210,8 @@ /mob/living/carbon/human/proc/wiz_energy_update_hud() if(client && hud_used) - if(istype(back, /obj/item/weapon/technomancer_core)) //I reckon there's a better way of doing this. - var/obj/item/weapon/technomancer_core/core = back + if(istype(back, /obj/item/technomancer_core)) //I reckon there's a better way of doing this. + var/obj/item/technomancer_core/core = back wiz_energy_display.invisibility = 0 var/ratio = core.energy / core.max_energy ratio = max(round(ratio, 0.05) * 100, 5) @@ -224,7 +224,7 @@ //Variants which the wizard can buy. //High risk, high reward core. -/obj/item/weapon/technomancer_core/unstable +/obj/item/technomancer_core/unstable name = "unstable core" desc = "A bewilderingly complex 'black box' that allows the wearer to accomplish amazing feats. This one is rather unstable, \ and could prove dangerous to the user, as it feeds off unstable energies that can occur with overuse of this machine." @@ -235,7 +235,7 @@ energy_cost_modifier = 0.7 spell_power_modifier = 1.1 -/obj/item/weapon/technomancer_core/unstable/regenerate() +/obj/item/technomancer_core/unstable/regenerate() var/instability_bonus = 0 if(loc && ishuman(loc)) var/mob/living/carbon/human/H = loc @@ -246,7 +246,7 @@ H.wiz_energy_update_hud() //Lower capacity but safer core. -/obj/item/weapon/technomancer_core/rapid +/obj/item/technomancer_core/rapid name = "rapid core" desc = "A bewilderingly complex 'black box' that allows the wearer to accomplish amazing feats. This one has a superior \ recharge rate, at the price of storage capacity. It also includes integrated motion assistance, increasing agility somewhat." @@ -258,7 +258,7 @@ cooldown_modifier = 0.9 //Big batteries but slow regen, buying energy spells is highly recommended. -/obj/item/weapon/technomancer_core/bulky +/obj/item/technomancer_core/bulky name = "bulky core" desc = "A bewilderingly complex 'black box' that allows the wearer to accomplish amazing feats. This variant is more \ cumbersome and bulky, due to the additional energy capacitors installed, which allows for a massive energy storage, as well \ @@ -272,7 +272,7 @@ spell_power_modifier = 1.4 // Using this can result in abilities costing less energy. If you're lucky. -/obj/item/weapon/technomancer_core/recycling +/obj/item/technomancer_core/recycling name = "recycling core" desc = "A bewilderingly complex 'black box' that allows the wearer to accomplish amazing feats. This type tries to recover \ some of the energy lost from using functions due to inefficiency." @@ -282,7 +282,7 @@ instability_modifier = 0.6 energy_cost_modifier = 0.8 -/obj/item/weapon/technomancer_core/recycling/pay_energy(amount) +/obj/item/technomancer_core/recycling/pay_energy(amount) var/success = ..() if(success) if(prob(30)) @@ -292,7 +292,7 @@ return success // For those dedicated to summoning hoards of things. -/obj/item/weapon/technomancer_core/summoner +/obj/item/technomancer_core/summoner name = "summoner core" desc = "A bewilderingly complex 'black box' that allows the wearer to accomplish amazing feats. This type is optimized for \ plucking hapless creatures and machines from other locations, to do your bidding. The maximum amount of entities that you can \ @@ -304,12 +304,12 @@ instability_modifier = 1.2 spell_power_modifier = 1.2 -/obj/item/weapon/technomancer_core/summoner/pay_dues() +/obj/item/technomancer_core/summoner/pay_dues() if(summoned_mobs.len) pay_energy( round(summoned_mobs.len) ) // For those who hate instability. -/obj/item/weapon/technomancer_core/safety +/obj/item/technomancer_core/safety name = "safety core" desc = "A bewilderingly complex 'black box' that allows the wearer to accomplish amazing feats. This type is designed to be \ the closest thing you can get to 'safe' for a Core. Instability from this is significantly reduced. You can even dance if \ @@ -321,7 +321,7 @@ spell_power_modifier = 0.7 // For those who want to blow everything on a few spells. -/obj/item/weapon/technomancer_core/overcharged +/obj/item/technomancer_core/overcharged name = "overcharged core" desc = "A bewilderingly complex 'black box' that allows the wearer to accomplish amazing feats. This type will use as much \ energy as it can in order to pump up the strength of functions used to insane levels." @@ -333,7 +333,7 @@ energy_cost_modifier = 2.0 // For use only for the GOLEM. -/obj/item/weapon/technomancer_core/golem +/obj/item/technomancer_core/golem name = "integrated core" desc = "A bewilderingly complex 'black box' that allows the wearer to accomplish amazing feats. This type is not meant \ to be worn on the back like other cores. Instead it is meant to be installed inside a synthetic shell. As a result, it's \ @@ -344,7 +344,7 @@ instability_modifier = 0.75 -/obj/item/weapon/technomancer_core/verb/toggle_lock() +/obj/item/technomancer_core/verb/toggle_lock() set name = "Toggle Core Lock" set category = "Object" set desc = "Toggles the locking mechanism on your manipulation core." @@ -353,7 +353,7 @@ to_chat(usr, "You [canremove ? "de" : ""]activate the locking mechanism on \the [src].") //For the adminbuse! VOREStation Add -/obj/item/weapon/technomancer_core/universal +/obj/item/technomancer_core/universal name = "universal core" desc = "A bewilderingly complex 'black box' that allows the wearer to accomplish amazing feats. \ This one is a copy of a 'technomancer' core, shamelessly ripped off by a Kitsuhana pattern designer \ diff --git a/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm b/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm index a15fcd5b350..4b595ecf182 100644 --- a/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm +++ b/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm @@ -3,9 +3,9 @@ desc = "An ultra-safe teleportation device that can directly teleport you to a number of locations at minimal risk, however \ it has a limited amount of charges." cost = 50 - obj_path = /obj/item/weapon/disposable_teleporter + obj_path = /obj/item/disposable_teleporter -/obj/item/weapon/disposable_teleporter +/obj/item/disposable_teleporter name = "disposable teleporter" desc = "A very compact personal teleportation device. It's very precise and safe, however it can only be used a few times." icon = 'icons/obj/device.dmi' @@ -16,17 +16,17 @@ origin_tech = list(TECH_BLUESPACE = 4, TECH_POWER = 3) //This one is what the wizard starts with. The above is a better version that can be purchased. -/obj/item/weapon/disposable_teleporter/free +/obj/item/disposable_teleporter/free name = "complimentary disposable teleporter" desc = "A very compact personal teleportation device. It's very precise and safe, however it can only be used once. This \ one has been provided to allow you to leave your hideout." uses = 1 -/obj/item/weapon/disposable_teleporter/examine(mob/user) +/obj/item/disposable_teleporter/examine(mob/user) . = ..() . += "[uses] uses remaining." -/obj/item/weapon/disposable_teleporter/attack_self(mob/user as mob) +/obj/item/disposable_teleporter/attack_self(mob/user as mob) if(!uses) to_chat(user, "\The [src] has ran out of uses, and is now useless to you!") return diff --git a/code/game/gamemodes/technomancer/devices/hypos.dm b/code/game/gamemodes/technomancer/devices/hypos.dm index 002b3cfff0f..ccdf0082dc7 100644 --- a/code/game/gamemodes/technomancer/devices/hypos.dm +++ b/code/game/gamemodes/technomancer/devices/hypos.dm @@ -2,47 +2,47 @@ name = "Trauma Hypo" desc = "A extended capacity hypo which can treat blunt trauma." cost = 25 - obj_path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute + obj_path = /obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute /datum/technomancer/consumable/hypo_burn name = "Burn Hypo" desc = "A extended capacity hypo which can treat severe burns." cost = 25 - obj_path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn + obj_path = /obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn /datum/technomancer/consumable/hypo_tox name = "Toxin Hypo" desc = "A extended capacity hypo which can treat various toxins." cost = 25 - obj_path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/toxin + obj_path = /obj/item/reagent_containers/hypospray/autoinjector/biginjector/toxin /datum/technomancer/consumable/hypo_oxy name = "Oxy Hypo" desc = "A extended capacity hypo which can treat oxygen deprivation." cost = 25 - obj_path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/oxy + obj_path = /obj/item/reagent_containers/hypospray/autoinjector/biginjector/oxy /datum/technomancer/consumable/hypo_purity name = "Purity Hypo" desc = "A extended capacity hypo which can remove various inpurities in the system such as viruses, infections, \ radiation, and genetic problems." cost = 25 - obj_path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity + obj_path = /obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity /datum/technomancer/consumable/hypo_pain name = "Pain Hypo" desc = "A extended capacity hypo which contains potent painkillers." cost = 25 - obj_path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/pain + obj_path = /obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain /datum/technomancer/consumable/hypo_organ name = "Organ Hypo" desc = "A extended capacity hypo which is designed to fix internal organ problems." cost = 50 - obj_path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ + obj_path = /obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ /datum/technomancer/consumable/hypo_combat name = "Combat Hypo" desc = "A extended capacity hypo containing a dangerous cocktail of various combat stims." cost = 75 - obj_path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat + obj_path = /obj/item/reagent_containers/hypospray/autoinjector/biginjector/combat diff --git a/code/game/gamemodes/technomancer/devices/implants.dm b/code/game/gamemodes/technomancer/devices/implants.dm index e2c1857d5d5..fd30fdd7780 100644 --- a/code/game/gamemodes/technomancer/devices/implants.dm +++ b/code/game/gamemodes/technomancer/devices/implants.dm @@ -2,10 +2,10 @@ name = "Freedom Implant" desc = "A hidden implant which allows one to escape bindings such as handcuffs." cost = 50 - obj_path = /obj/item/weapon/storage/box/syndie_kit/imp_freedom + obj_path = /obj/item/storage/box/syndie_kit/imp_freedom /datum/technomancer/consumable/explosive_implant name = "Explosive Implant" desc = "A hidden implant which will explode if it hears a passphrase." cost = 150 - obj_path = /obj/item/weapon/storage/box/syndie_kit/imp_explosive \ No newline at end of file + obj_path = /obj/item/storage/box/syndie_kit/imp_explosive \ No newline at end of file diff --git a/code/game/gamemodes/technomancer/equipment.dm b/code/game/gamemodes/technomancer/equipment.dm index c4cc82bc003..56f86b2961d 100644 --- a/code/game/gamemodes/technomancer/equipment.dm +++ b/code/game/gamemodes/technomancer/equipment.dm @@ -8,7 +8,7 @@ Energy Cost Modifier: 100%
\ Spell Power: 100%" cost = 100 - obj_path = /obj/item/weapon/technomancer_core + obj_path = /obj/item/technomancer_core /datum/technomancer/equipment/rapid_core name = "Rapid Core" @@ -20,7 +20,7 @@ Energy Cost Modifier: 100%
\ Spell Power: 100%" cost = 100 - obj_path = /obj/item/weapon/technomancer_core/rapid + obj_path = /obj/item/technomancer_core/rapid /datum/technomancer/equipment/bulky_core name = "Bulky Core" @@ -33,7 +33,7 @@ Energy Cost Modifier: 100%
\ " + span_green("Spell Power: 140%") + "" cost = 100 - obj_path = /obj/item/weapon/technomancer_core/bulky + obj_path = /obj/item/technomancer_core/bulky /datum/technomancer/equipment/unstable name = "Unstable Core" @@ -46,7 +46,7 @@ " + span_green("Energy Cost Modifier: 70%") + "
\ " + span_green("Spell Power: 110%") + "" cost = 100 - obj_path = /obj/item/weapon/technomancer_core/unstable + obj_path = /obj/item/technomancer_core/unstable /datum/technomancer/equipment/recycling name = "Recycling Core" @@ -58,7 +58,7 @@ " + span_green("Energy Cost Modifier: 80%") + "
\ Spell Power: 100%" cost = 100 - obj_path = /obj/item/weapon/technomancer_core/recycling + obj_path = /obj/item/technomancer_core/recycling /datum/technomancer/equipment/summoning name = "Summoning Core" @@ -71,7 +71,7 @@ Energy Cost Modifier: 100%
\ " + span_green("Spell Power: 120%") + "" cost = 100 - obj_path = /obj/item/weapon/technomancer_core/summoner + obj_path = /obj/item/technomancer_core/summoner /datum/technomancer/equipment/safety name = "Safety Core" @@ -83,7 +83,7 @@ Energy Cost Modifier: 100%
\ " + span_red("Spell Power: 70%") + "" cost = 100 - obj_path = /obj/item/weapon/technomancer_core/safety + obj_path = /obj/item/technomancer_core/safety /datum/technomancer/equipment/overcharged name = "Overcharged Core" @@ -96,27 +96,27 @@ " + span_red("Energy Cost Modifier: 200%") + "
\ " + span_green("Spell Power: 175%") + "" cost = 100 - obj_path = /obj/item/weapon/technomancer_core/overcharged + obj_path = /obj/item/technomancer_core/overcharged /datum/technomancer/equipment/hypo_belt name = "Hypo Belt" desc = "A medical belt designed to carry autoinjectors and other medical equipment. Comes with one of each hypo." cost = 50 - obj_path = /obj/item/weapon/storage/belt/medical/technomancer + obj_path = /obj/item/storage/belt/medical/technomancer -/obj/item/weapon/storage/belt/medical/technomancer +/obj/item/storage/belt/medical/technomancer name = "hypo belt" desc = "A medical belt designed to carry autoinjectors and other medical equipment." -/obj/item/weapon/storage/belt/medical/technomancer/New() - new /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute(src) - new /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn(src) - new /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/toxin(src) - new /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/oxy(src) - new /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity(src) - new /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/pain(src) - new /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ(src) - new /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat(src) +/obj/item/storage/belt/medical/technomancer/New() + new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute(src) + new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn(src) + new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/toxin(src) + new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/oxy(src) + new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity(src) + new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain(src) + new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ(src) + new /obj/item/reagent_containers/hypospray/autoinjector/biginjector/combat(src) ..() /datum/technomancer/equipment/belt_of_holding @@ -125,9 +125,9 @@ The nature of the pocket allows for storage of larger objects than what is typical for other belts, and in larger quanities. \ It will also help keep your pants on." cost = 50 - obj_path = /obj/item/weapon/storage/belt/holding + obj_path = /obj/item/storage/belt/holding -/obj/item/weapon/storage/belt/holding +/obj/item/storage/belt/holding name = "Belt of Holding" desc = "Can hold more than you'd expect." icon_state = "ems" @@ -179,9 +179,9 @@ the Core and the user, causing many functions to be enhanced in various ways, so long as it is held in the off-hand. \ Be careful not to lose this!" cost = 200 - obj_path = /obj/item/weapon/scepter + obj_path = /obj/item/scepter -/obj/item/weapon/scepter +/obj/item/scepter name = "scepter of empowerment" desc = "It's a purple gem, attached to a rod and a handle, along with small wires. It looks like it would make a good club." icon = 'icons/obj/technomancer.dmi' @@ -190,27 +190,27 @@ slot_flags = SLOT_BELT attack_verb = list("beaten", "smashed", "struck", "whacked") -/obj/item/weapon/scepter/attack_self(mob/living/carbon/human/user) +/obj/item/scepter/attack_self(mob/living/carbon/human/user) var/obj/item/item_to_test = user.get_other_hand(src) - if(istype(item_to_test, /obj/item/weapon/spell)) - var/obj/item/weapon/spell/S = item_to_test + if(istype(item_to_test, /obj/item/spell)) + var/obj/item/spell/S = item_to_test S.on_scepter_use_cast(user) -/obj/item/weapon/scepter/afterattack(atom/target, mob/living/carbon/human/user, proximity_flag, click_parameters) +/obj/item/scepter/afterattack(atom/target, mob/living/carbon/human/user, proximity_flag, click_parameters) if(proximity_flag) return ..() var/obj/item/item_to_test = user.get_other_hand(src) - if(istype(item_to_test, /obj/item/weapon/spell)) - var/obj/item/weapon/spell/S = item_to_test + if(istype(item_to_test, /obj/item/spell)) + var/obj/item/spell/S = item_to_test S.on_scepter_ranged_cast(target, user) /datum/technomancer/equipment/spyglass name = "Spyglass" desc = "A mundane spyglass, it may prove useful to those who wish to scout ahead, or fight from an extreme range." cost = 100 - obj_path = /obj/item/device/binoculars/spyglass + obj_path = /obj/item/binoculars/spyglass -/obj/item/device/binoculars/spyglass +/obj/item/binoculars/spyglass name = "spyglass" desc = "It's a hand-held telescope, useful for star-gazing, peeping, and recon." icon_state = "spyglass" diff --git a/code/game/gamemodes/technomancer/spell_objs.dm b/code/game/gamemodes/technomancer/spell_objs.dm index f8833d13b28..164fd7b3af1 100644 --- a/code/game/gamemodes/technomancer/spell_objs.dm +++ b/code/game/gamemodes/technomancer/spell_objs.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/spell +/obj/item/spell name = "glowing particles" desc = "Your hands appear to be glowing brightly." icon = 'icons/obj/spells.dmi' @@ -12,7 +12,7 @@ show_examine = FALSE // var/mob/living/carbon/human/owner = null var/mob/living/owner = null - var/obj/item/weapon/technomancer_core/core = null + var/obj/item/technomancer_core/core = null var/cast_methods = null // Controls how the spell is casted. var/aspect = null // Used for combining spells. var/toggled = 0 // Mainly used for overlays. @@ -22,58 +22,58 @@ // Proc: on_use_cast() // Parameters: 1 (user - the technomancer casting the spell) // Description: Override this for clicking the spell in your hands. -/obj/item/weapon/spell/proc/on_use_cast(mob/user) +/obj/item/spell/proc/on_use_cast(mob/user) return // Proc: on_throw_cast() // Parameters: 1 (hit_atom - the atom hit by the spell object) // Description: Override this for throwing effects. -/obj/item/weapon/spell/proc/on_throw_cast(atom/hit_atom) +/obj/item/spell/proc/on_throw_cast(atom/hit_atom) return // Proc: on_ranged_cast() // Parameters: 2 (hit_atom - the atom clicked on by the user, user - the technomancer that clicked hit_atom) // Description: Override this for ranged effects. -/obj/item/weapon/spell/proc/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/proc/on_ranged_cast(atom/hit_atom, mob/user) return // Proc: on_melee_cast() // Parameters: 3 (hit_atom - the atom clicked on by the user, user - the technomancer that clicked hit_atom, def_zone - unknown) // Description: Override this for effects that occur at melee range. -/obj/item/weapon/spell/proc/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) +/obj/item/spell/proc/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) return // Proc: on_combine_cast() // Parameters: 2 (I - the item trying to merge with the spell, user - the technomancer who initiated the merge) // Description: Override this for combining spells, like Aspect spells. -/obj/item/weapon/spell/proc/on_combine_cast(obj/item/I, mob/user) +/obj/item/spell/proc/on_combine_cast(obj/item/I, mob/user) return // Proc: on_innate_cast() // Parameters: 1 (user - the entity who is casting innately (without using hands).) // Description: Override this for casting without using hands (and as a result not using spell objects). -/obj/item/weapon/spell/proc/on_innate_cast(mob/user) +/obj/item/spell/proc/on_innate_cast(mob/user) return // Proc: on_scepter_use_cast() // Parameters: 1 (user - the holder of the Scepter that clicked.) // Description: Override this for spell casts which have additional functionality when a Scepter is held in the offhand, and the // scepter is being clicked by the technomancer in their hand. -/obj/item/weapon/spell/proc/on_scepter_use_cast(mob/user) +/obj/item/spell/proc/on_scepter_use_cast(mob/user) return // Proc: on_scepter_use_cast() // Parameters: 2 (hit_atom - the atom clicked by user, user - the holder of the Scepter that clicked.) // Description: Similar to the above proc, however this is for when someone with a Scepter clicks something far away with the scepter // while holding a spell in the offhand that reacts to that. -/obj/item/weapon/spell/proc/on_scepter_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/proc/on_scepter_ranged_cast(atom/hit_atom, mob/user) return // Proc: pay_energy() // Parameters: 1 (amount - how much to test and drain if there is enough) // Description: Use this to make spells cost energy. It returns false if the technomancer cannot pay for the spell for any reason, and // if they are able to pay, it is deducted automatically. -/obj/item/weapon/spell/proc/pay_energy(var/amount) +/obj/item/spell/proc/pay_energy(var/amount) if(!core) return 0 return core.pay_energy(amount) @@ -81,7 +81,7 @@ // Proc: give_energy() // Parameters: 1 (amount - how much to give to the technomancer) // Description: Redirects the call to the core's give_energy(). -/obj/item/weapon/spell/proc/give_energy(var/amount) +/obj/item/spell/proc/give_energy(var/amount) if(!core) return 0 return core.give_energy(amount) @@ -89,7 +89,7 @@ // Proc: adjust_instability() // Parameters: 1 (amount - how much instability to give) // Description: Use this to quickly add or subtract instability from the caster of the spell. Owner is set by New(). -/obj/item/weapon/spell/proc/adjust_instability(var/amount) +/obj/item/spell/proc/adjust_instability(var/amount) if(!owner || !core) return 0 amount = round(amount * core.instability_modifier, 0.1) @@ -102,7 +102,7 @@ return null /mob/living/carbon/human/get_technomancer_core() - var/obj/item/weapon/technomancer_core/core = back + var/obj/item/technomancer_core/core = back if(istype(core)) return core return null @@ -110,7 +110,7 @@ // Proc: New() // Parameters: 0 // Description: Sets owner to equal its loc, links to the owner's core, then applies overlays if needed. -/obj/item/weapon/spell/New() +/obj/item/spell/New() ..() if(isliving(loc)) owner = loc @@ -120,14 +120,14 @@ to_chat(owner, "You need a Core to do that.") qdel(src) return -// if(istype(/obj/item/weapon/technomancer_core, owner.back)) +// if(istype(/obj/item/technomancer_core, owner.back)) // core = owner.back update_icon() // Proc: Destroy() // Parameters: 0 // Description: Nulls object references so it can qdel() cleanly. -/obj/item/weapon/spell/Destroy() +/obj/item/spell/Destroy() owner.unref_spell(src) owner = null core = null @@ -136,13 +136,13 @@ // Proc: unref_spells() // Parameters: 0 // Description: Nulls object references on specific mobs so it can qdel() cleanly. -/mob/proc/unref_spell(var/obj/item/weapon/spell/the_spell) +/mob/proc/unref_spell(var/obj/item/spell/the_spell) return // Proc: update_icon() // Parameters: 0 // Description: Applys an overlay if it is a passive spell. -/obj/item/weapon/spell/update_icon() +/obj/item/spell/update_icon() if(toggled) var/image/new_overlay = image('icons/obj/spells.dmi',"toggled") add_overlay(new_overlay) @@ -154,11 +154,11 @@ // Parameters: 0 // Description: Ensures spells should not function if something is wrong. If a core is missing, it will try to find one, then fail // if it still can't find one. It will also check if the core is being worn properly, and finally checks if the owner is a technomancer. -/obj/item/weapon/spell/proc/run_checks() +/obj/item/spell/proc/run_checks() if(!owner) return 0 if(!core) - core = locate(/obj/item/weapon/technomancer_core) in owner + core = locate(/obj/item/technomancer_core) in owner if(!core) to_chat(owner, "You need to be wearing a core on your back!") return 0 @@ -173,13 +173,13 @@ // Proc: check_for_scepter() // Parameters: 0 // Description: Terrible code to check if a scepter is in the offhand, returns 1 if yes. -/obj/item/weapon/spell/proc/check_for_scepter() +/obj/item/spell/proc/check_for_scepter() if(!src || !owner) return 0 if(owner.r_hand == src) - if(istype(owner.l_hand, /obj/item/weapon/scepter)) + if(istype(owner.l_hand, /obj/item/scepter)) return 1 else - if(istype(owner.r_hand, /obj/item/weapon/scepter)) + if(istype(owner.r_hand, /obj/item/scepter)) return 1 return 0 @@ -195,7 +195,7 @@ // Proc: attack_self() // Parameters: 1 (user - the Technomancer that invoked this proc) // Description: Tries to call on_use_cast() if it is allowed to do so. Don't override this, override on_use_cast() instead. -/obj/item/weapon/spell/attack_self(mob/user) +/obj/item/spell/attack_self(mob/user) if(run_checks() && (cast_methods & CAST_USE)) on_use_cast(user) ..() @@ -203,9 +203,9 @@ // Proc: attackby() // Parameters: 2 (W - the item this spell object is hitting, user - the technomancer who clicked the other object) // Description: Tries to combine the spells, if W is a spell, and has CHROMATIC aspect. -/obj/item/weapon/spell/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/weapon/spell)) - var/obj/item/weapon/spell/spell = W +/obj/item/spell/attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/spell)) + var/obj/item/spell/spell = W if(run_checks() & (cast_methods & CAST_COMBINE)) spell.on_combine_cast(src, user) else @@ -217,15 +217,15 @@ // Description: Tests to make sure it can cast, then casts a combined, ranged, or melee spell based on what it can do and the // range the click occured. Melee casts have higher priority than ranged if both are possible. Sets cooldown at the end. // Don't override this for spells, override the on_*_cast() spells shown above. -/obj/item/weapon/spell/afterattack(atom/target, mob/user, proximity_flag, click_parameters) +/obj/item/spell/afterattack(atom/target, mob/user, proximity_flag, click_parameters) if(!run_checks()) return if(!proximity_flag) if(cast_methods & CAST_RANGED) on_ranged_cast(target, user) else - if(istype(target, /obj/item/weapon/spell)) - var/obj/item/weapon/spell/spell = target + if(istype(target, /obj/item/spell)) + var/obj/item/spell/spell = target if(spell.cast_methods & CAST_COMBINE) spell.on_combine_cast(src, user) return @@ -251,8 +251,8 @@ if(!path || !ispath(path)) return 0 - //var/obj/item/weapon/spell/S = new path(src) - var/obj/item/weapon/spell/S = new path(src) + //var/obj/item/spell/S = new path(src) + var/obj/item/spell/S = new path(src) //No hands needed for innate casts. if(S.cast_methods & CAST_INNATE) @@ -260,12 +260,12 @@ S.on_innate_cast(src) if(l_hand && r_hand) //Make sure our hands aren't full. - if(istype(r_hand, /obj/item/weapon/spell)) //If they are full, perhaps we can still be useful. - var/obj/item/weapon/spell/r_spell = r_hand + if(istype(r_hand, /obj/item/spell)) //If they are full, perhaps we can still be useful. + var/obj/item/spell/r_spell = r_hand if(r_spell.aspect == ASPECT_CHROMATIC) //Check if we can combine the new spell with one in our hands. r_spell.on_combine_cast(S, src) - else if(istype(l_hand, /obj/item/weapon/spell)) - var/obj/item/weapon/spell/l_spell = l_hand + else if(istype(l_hand, /obj/item/spell)) + var/obj/item/spell/l_spell = l_hand if(l_spell.aspect == ASPECT_CHROMATIC) //Check the other hand too. l_spell.on_combine_cast(S, src) else //Welp @@ -282,7 +282,7 @@ // Proc: dropped() // Parameters: 0 // Description: Deletes the spell object immediately. -/obj/item/weapon/spell/dropped() +/obj/item/spell/dropped() spawn(1) if(src) qdel(src) @@ -290,7 +290,7 @@ // Proc: throw_impact() // Parameters: 1 (hit_atom - the atom that got hit by the spell as it was thrown) // Description: Calls on_throw_cast() on whatever was hit, then deletes itself incase it missed. -/obj/item/weapon/spell/throw_impact(atom/hit_atom) +/obj/item/spell/throw_impact(atom/hit_atom) ..() if(cast_methods & CAST_THROW) on_throw_cast(hit_atom) diff --git a/code/game/gamemodes/technomancer/spell_objs_helpers.dm b/code/game/gamemodes/technomancer/spell_objs_helpers.dm index 27984c1b041..dbcf017dbda 100644 --- a/code/game/gamemodes/technomancer/spell_objs_helpers.dm +++ b/code/game/gamemodes/technomancer/spell_objs_helpers.dm @@ -14,7 +14,7 @@ return FALSE // Used to distinguish friend from foe. -/obj/item/weapon/spell/proc/is_ally(var/mob/living/L) +/obj/item/spell/proc/is_ally(var/mob/living/L) if(L == owner) // The best ally is ourselves. return 1 if(L.mind && technomancers.is_antagonist(L.mind)) // This should be done better since we might want opposing technomancers later. @@ -25,7 +25,7 @@ return 1 return 0 -/obj/item/weapon/spell/proc/allowed_to_teleport() +/obj/item/spell/proc/allowed_to_teleport() if(owner) if(owner.z in using_map.admin_levels) return FALSE @@ -35,17 +35,17 @@ return FALSE return TRUE -/obj/item/weapon/spell/proc/within_range(var/atom/target, var/max_range = 7) // Beyond 7 is off the screen. +/obj/item/spell/proc/within_range(var/atom/target, var/max_range = 7) // Beyond 7 is off the screen. if(target in view(max_range, owner)) return TRUE return FALSE -/obj/item/weapon/spell/proc/calculate_spell_power(var/amount) +/obj/item/spell/proc/calculate_spell_power(var/amount) if(core) return round(amount * core.spell_power_modifier, 1) // Returns a 'target' mob from a radius around T. -/obj/item/weapon/spell/proc/targeting_assist(var/turf/T, radius = 5) +/obj/item/spell/proc/targeting_assist(var/turf/T, radius = 5) var/chosen_target = null var/potential_targets = view(T,radius) for(var/mob/living/L in potential_targets) diff --git a/code/game/gamemodes/technomancer/spells/abjuration.dm b/code/game/gamemodes/technomancer/spells/abjuration.dm index c14356cba8e..bcaa91f5daa 100644 --- a/code/game/gamemodes/technomancer/spells/abjuration.dm +++ b/code/game/gamemodes/technomancer/spells/abjuration.dm @@ -3,17 +3,17 @@ desc = "This ability attempts to send summoned or teleported entities or anomalies to the place from whence they came, or at least \ far away from the caster. Failing that, it may inhibit those entities in some form." cost = 25 - obj_path = /obj/item/weapon/spell/abjuration + obj_path = /obj/item/spell/abjuration category = UTILITY_SPELLS -/obj/item/weapon/spell/abjuration +/obj/item/spell/abjuration name = "abjuration" desc = "Useful for unruly minions, hostile summoners, or for fighting the horrors that may await you with your hubris." icon_state = "generic" cast_methods = CAST_RANGED aspect = ASPECT_TELE -/obj/item/weapon/spell/abjuration/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/abjuration/on_ranged_cast(atom/hit_atom, mob/user) if(istype(hit_atom, /mob/living) && pay_energy(500) && within_range(hit_atom)) var/mob/living/L = hit_atom var/mob/living/simple_mob/SM = null diff --git a/code/game/gamemodes/technomancer/spells/apportation.dm b/code/game/gamemodes/technomancer/spells/apportation.dm index 13f893b536a..e8a160c4d09 100644 --- a/code/game/gamemodes/technomancer/spells/apportation.dm +++ b/code/game/gamemodes/technomancer/spells/apportation.dm @@ -4,17 +4,17 @@ will grab them automatically." enhancement_desc = "Range is unlimited." cost = 25 - obj_path = /obj/item/weapon/spell/apportation + obj_path = /obj/item/spell/apportation category = UTILITY_SPELLS -/obj/item/weapon/spell/apportation +/obj/item/spell/apportation name = "apportation" icon_state = "apportation" desc = "Allows you to reach through Bluespace with your hand, and grab something, bringing it to you instantly." cast_methods = CAST_RANGED aspect = ASPECT_TELE -/obj/item/weapon/spell/apportation/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/apportation/on_ranged_cast(atom/hit_atom, mob/user) if(istype(hit_atom, /atom/movable)) var/atom/movable/AM = hit_atom @@ -69,7 +69,7 @@ L.Weaken(3) user.visible_message("\The [user] seizes [L]!") - var/obj/item/weapon/grab/G = new(user,L) + var/obj/item/grab/G = new(user,L) user.put_in_hands(G) diff --git a/code/game/gamemodes/technomancer/spells/aspect_aura.dm b/code/game/gamemodes/technomancer/spells/aspect_aura.dm index e4cd0f82d2c..2046accd98e 100644 --- a/code/game/gamemodes/technomancer/spells/aspect_aura.dm +++ b/code/game/gamemodes/technomancer/spells/aspect_aura.dm @@ -6,18 +6,18 @@ obj_path = /mob/living/carbon/human/proc/technomancer_aspect_aura /mob/living/carbon/human/proc/technomancer_aspect_aura() - place_spell_in_hand(/obj/item/weapon/spell/aspect_aura) + place_spell_in_hand(/obj/item/spell/aspect_aura) -/obj/item/weapon/spell/aspect_aura +/obj/item/spell/aspect_aura name = "aspect aura" desc = "Combine this with another spell to finish the function." icon_state = "aspect_bolt" cast_methods = CAST_COMBINE aspect = ASPECT_CHROMATIC -/obj/item/weapon/spell/aspect_aura/on_combine_cast(obj/item/W, var/mob/living/carbon/human/user) - if(istype(W, /obj/item/weapon/spell)) - var/obj/item/weapon/spell/spell = W +/obj/item/spell/aspect_aura/on_combine_cast(obj/item/W, var/mob/living/carbon/human/user) + if(istype(W, /obj/item/spell)) + var/obj/item/spell/spell = W if(!spell.aspect || spell.aspect == ASPECT_CHROMATIC) to_chat(user, "You cannot combine \the [spell] with \the [src], as the aspects are incompatible.") return @@ -26,14 +26,14 @@ spawn(1) switch(spell.aspect) if(ASPECT_FIRE) - user.place_spell_in_hand(/obj/item/weapon/spell/aura/fire) + user.place_spell_in_hand(/obj/item/spell/aura/fire) if(ASPECT_FROST) - user.place_spell_in_hand(/obj/item/weapon/spell/aura/frost) + user.place_spell_in_hand(/obj/item/spell/aura/frost) if(ASPECT_BIOMED) - user.place_spell_in_hand(/obj/item/weapon/spell/aura/biomed) + user.place_spell_in_hand(/obj/item/spell/aura/biomed) qdel(src) -/obj/item/weapon/spell/aura +/obj/item/spell/aura name = "aura template" desc = "If you can read me, the game broke! Yay!" icon_state = "generic" @@ -41,19 +41,19 @@ aspect = ASPECT_CHROMATIC var/glow_color = "#FFFFFF" -/obj/item/weapon/spell/aura/New() +/obj/item/spell/aura/New() ..() set_light(7, 4, l_color = glow_color) START_PROCESSING(SSobj, src) -/obj/item/weapon/spell/aura/Destroy() +/obj/item/spell/aura/Destroy() STOP_PROCESSING(SSobj, src) ..() -/obj/item/weapon/spell/aura/process() +/obj/item/spell/aura/process() return -/obj/item/weapon/spell/aura/fire +/obj/item/spell/aura/fire name = "heat aura" desc = "Things are starting to heat up." icon_state = "generic" @@ -61,7 +61,7 @@ aspect = ASPECT_FIRE glow_color = "#FF6A00" -/obj/item/weapon/spell/aura/fire/process() +/obj/item/spell/aura/fire/process() if(!pay_energy(100)) qdel(src) var/list/nearby_mobs = range(4,owner) @@ -75,7 +75,7 @@ adjust_instability(1) -/obj/item/weapon/spell/aura/frost +/obj/item/spell/aura/frost name = "chilling aura" desc = "Your enemies will find it hard to chase you if they freeze to death." icon_state = "generic" @@ -83,7 +83,7 @@ aspect = ASPECT_FROST glow_color = "#FF6A00" -/obj/item/weapon/spell/aura/frost/process() +/obj/item/spell/aura/frost/process() if(!pay_energy(100)) qdel(src) var/list/nearby_mobs = range(4,owner) @@ -99,7 +99,7 @@ -/obj/item/weapon/spell/aura/biomed +/obj/item/spell/aura/biomed name = "restoration aura" desc = "Allows everyone, or just your allies, to slowly regenerate." icon_state = "generic" @@ -109,7 +109,7 @@ var/regen_tick = 0 var/heal_allies_only = 1 -/obj/item/weapon/spell/aura/biomed/process() +/obj/item/spell/aura/biomed/process() if(!pay_energy(75)) qdel(src) regen_tick++ @@ -130,6 +130,6 @@ L.adjustFireLoss(-5) adjust_instability(2) -/obj/item/weapon/spell/aura/biomed/on_use_cast(mob/living/user) +/obj/item/spell/aura/biomed/on_use_cast(mob/living/user) heal_allies_only = !heal_allies_only to_chat(user, "Your aura will now heal [heal_allies_only ? "your allies" : "everyone"] near you.") diff --git a/code/game/gamemodes/technomancer/spells/audible_deception.dm b/code/game/gamemodes/technomancer/spells/audible_deception.dm index b89db0c0c46..8f32c6cc5b3 100644 --- a/code/game/gamemodes/technomancer/spells/audible_deception.dm +++ b/code/game/gamemodes/technomancer/spells/audible_deception.dm @@ -4,11 +4,11 @@ enhancement_desc = "An extremely loud bike horn sound that costs large amount of energy and instability becomes available, \ which will deafen and stun all who are near the targeted tile, including yourself if unprotected." cost = 50 - obj_path = /obj/item/weapon/spell/audible_deception + obj_path = /obj/item/spell/audible_deception ability_icon_state = "tech_audibledeception" category = UTILITY_SPELLS -/obj/item/weapon/spell/audible_deception +/obj/item/spell/audible_deception name = "audible deception" icon_state = "audible_deception" desc = "Make them all paranoid!" @@ -64,7 +64,7 @@ ) var/selected_sound = null -/obj/item/weapon/spell/audible_deception/on_use_cast(mob/user) +/obj/item/spell/audible_deception/on_use_cast(mob/user) var/list/sound_options = available_sounds if(check_for_scepter()) sound_options["!!AIR HORN!!"] = 'sound/items/AirHorn.ogg' @@ -72,7 +72,7 @@ if(new_sound) selected_sound = sound_options[new_sound] -/obj/item/weapon/spell/audible_deception/on_ranged_cast(atom/hit_atom, mob/living/user) +/obj/item/spell/audible_deception/on_ranged_cast(atom/hit_atom, mob/living/user) var/turf/T = get_turf(hit_atom) if(selected_sound && pay_energy(200)) playsound(src, selected_sound, 80, 1, -1) diff --git a/code/game/gamemodes/technomancer/spells/aura/aura.dm b/code/game/gamemodes/technomancer/spells/aura/aura.dm index be986bb7eed..bfb6de3d9ae 100644 --- a/code/game/gamemodes/technomancer/spells/aura/aura.dm +++ b/code/game/gamemodes/technomancer/spells/aura/aura.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/spell/aura +/obj/item/spell/aura name = "aura template" desc = "If you can read me, the game broke! Yay!" icon_state = "generic" @@ -6,16 +6,16 @@ aspect = null var/glow_color = "#FFFFFF" -/obj/item/weapon/spell/aura/New() +/obj/item/spell/aura/New() ..() set_light(calculate_spell_power(7), calculate_spell_power(4), l_color = glow_color) START_PROCESSING(SSobj, src) log_and_message_admins("has started casting [src].") -/obj/item/weapon/spell/aura/Destroy() +/obj/item/spell/aura/Destroy() STOP_PROCESSING(SSobj, src) log_and_message_admins("has stopped maintaining [src].") return ..() -/obj/item/weapon/spell/aura/process() +/obj/item/spell/aura/process() return diff --git a/code/game/gamemodes/technomancer/spells/aura/biomed_aura.dm b/code/game/gamemodes/technomancer/spells/aura/biomed_aura.dm index f8828af147e..29127fc99b1 100644 --- a/code/game/gamemodes/technomancer/spells/aura/biomed_aura.dm +++ b/code/game/gamemodes/technomancer/spells/aura/biomed_aura.dm @@ -3,11 +3,11 @@ desc = "Heals you and your allies (or everyone, if you want) of trauma and burns slowly, as long as they remain within four meters." spell_power_desc = "Increases the radius and healing amount of the aura." cost = 100 - obj_path = /obj/item/weapon/spell/aura/biomed + obj_path = /obj/item/spell/aura/biomed ability_icon_state = "tech_biomedaura" category = SUPPORT_SPELLS -/obj/item/weapon/spell/aura/biomed +/obj/item/spell/aura/biomed name = "restoration aura" desc = "Allows everyone, or just your allies, to slowly regenerate." icon_state = "generic" @@ -17,7 +17,7 @@ var/regen_tick = 0 var/heal_allies_only = 1 -/obj/item/weapon/spell/aura/biomed/process() +/obj/item/spell/aura/biomed/process() if(!pay_energy(75)) qdel(src) regen_tick++ @@ -35,6 +35,6 @@ L.adjustFireLoss(calculate_spell_power(-5)) adjust_instability(2) -/obj/item/weapon/spell/aura/biomed/on_use_cast(mob/living/user) +/obj/item/spell/aura/biomed/on_use_cast(mob/living/user) heal_allies_only = !heal_allies_only to_chat(user, "Your aura will now heal [heal_allies_only ? "your allies" : "everyone"] near you.") diff --git a/code/game/gamemodes/technomancer/spells/aura/fire_aura.dm b/code/game/gamemodes/technomancer/spells/aura/fire_aura.dm index 947cad7140e..bd21a3e7bcb 100644 --- a/code/game/gamemodes/technomancer/spells/aura/fire_aura.dm +++ b/code/game/gamemodes/technomancer/spells/aura/fire_aura.dm @@ -6,18 +6,18 @@ enhancement_desc = "Increased heat generation, more fires, and higher temperature cap." spell_power_desc = "Radius, heat rate, heat capacity, and amount of fires made increased." cost = 100 - obj_path = /obj/item/weapon/spell/aura/fire + obj_path = /obj/item/spell/aura/fire ability_icon_state = "tech_fireaura" category = OFFENSIVE_SPELLS -/obj/item/weapon/spell/aura/fire +/obj/item/spell/aura/fire name = "Fire Storm" desc = "Things are starting to heat up." icon_state = "fire_bolt" aspect = ASPECT_FIRE glow_color = "#FF6A00" -/obj/item/weapon/spell/aura/fire/process() +/obj/item/spell/aura/fire/process() if(!pay_energy(100)) qdel(src) var/list/nearby_things = range(round(calculate_spell_power(4)),owner) diff --git a/code/game/gamemodes/technomancer/spells/aura/frost_aura.dm b/code/game/gamemodes/technomancer/spells/aura/frost_aura.dm index c73e010232c..1761205e0a8 100644 --- a/code/game/gamemodes/technomancer/spells/aura/frost_aura.dm +++ b/code/game/gamemodes/technomancer/spells/aura/frost_aura.dm @@ -5,11 +5,11 @@ enhancement_desc = "Will make nearby entities even slower." spell_power_desc = "Radius and rate of cooling are scaled." cost = 100 - obj_path = /obj/item/weapon/spell/aura/frost + obj_path = /obj/item/spell/aura/frost ability_icon_state = "tech_frostaura" category = DEFENSIVE_SPELLS // Scepter-less frost aura is nonlethal. -/obj/item/weapon/spell/aura/frost +/obj/item/spell/aura/frost name = "chilling aura" desc = "Your enemies will find it hard to chase you if they freeze to death." icon_state = "generic" @@ -17,7 +17,7 @@ aspect = ASPECT_FROST glow_color = "#00B3FF" -/obj/item/weapon/spell/aura/frost/process() +/obj/item/spell/aura/frost/process() if(!pay_energy(100)) qdel(src) var/list/nearby_mobs = range(round(calculate_spell_power(4)),owner) diff --git a/code/game/gamemodes/technomancer/spells/aura/shock_aura.dm b/code/game/gamemodes/technomancer/spells/aura/shock_aura.dm index b9bc8bc2c45..4b958442bd5 100644 --- a/code/game/gamemodes/technomancer/spells/aura/shock_aura.dm +++ b/code/game/gamemodes/technomancer/spells/aura/shock_aura.dm @@ -4,11 +4,11 @@ enhancement_desc = "Aura does twice as much damage." spell_power_desc = "Radius and damage scaled up." cost = 100 - obj_path = /obj/item/weapon/spell/aura/shock + obj_path = /obj/item/spell/aura/shock ability_icon_state = "tech_shockaura" category = OFFENSIVE_SPELLS -/obj/item/weapon/spell/aura/shock +/obj/item/spell/aura/shock name = "electric aura" desc = "Now you are a walking electrical storm." icon_state = "generic" @@ -16,7 +16,7 @@ aspect = ASPECT_SHOCK glow_color = "#0000FF" //TODO -/obj/item/weapon/spell/aura/shock/process() +/obj/item/spell/aura/shock/process() if(!pay_energy(500)) qdel(src) var/list/nearby_mobs = range(calculate_spell_power(4),owner) diff --git a/code/game/gamemodes/technomancer/spells/aura/unstable_aura.dm b/code/game/gamemodes/technomancer/spells/aura/unstable_aura.dm index ca731ddad2b..1414e562130 100644 --- a/code/game/gamemodes/technomancer/spells/aura/unstable_aura.dm +++ b/code/game/gamemodes/technomancer/spells/aura/unstable_aura.dm @@ -5,11 +5,11 @@ unharmed." spell_power_desc = "Radius is increased." cost = 150 - obj_path = /obj/item/weapon/spell/aura/unstable + obj_path = /obj/item/spell/aura/unstable ability_icon_state = "tech_unstableaura" category = OFFENSIVE_SPELLS -/obj/item/weapon/spell/aura/unstable +/obj/item/spell/aura/unstable name = "degen aura" desc = "Breaks down your entities from the inside." icon_state = "generic" @@ -17,7 +17,7 @@ aspect = ASPECT_UNSTABLE glow_color = "#CC00CC" -/obj/item/weapon/spell/aura/unstable/process() +/obj/item/spell/aura/unstable/process() if(!pay_energy(200)) qdel(src) var/list/nearby_mobs = range(calculate_spell_power(14),owner) diff --git a/code/game/gamemodes/technomancer/spells/blink.dm b/code/game/gamemodes/technomancer/spells/blink.dm index f2a2b2051a6..84961b04212 100644 --- a/code/game/gamemodes/technomancer/spells/blink.dm +++ b/code/game/gamemodes/technomancer/spells/blink.dm @@ -6,11 +6,11 @@ enhancement_desc = "Blink distance is increased greatly." spell_power_desc = "Blink distance is scaled up with more spell power." cost = 50 - obj_path = /obj/item/weapon/spell/blink + obj_path = /obj/item/spell/blink ability_icon_state = "tech_blink" category = UTILITY_SPELLS -/obj/item/weapon/spell/blink +/obj/item/spell/blink name = "blink" desc = "Teleports you or someone else a short distance away." icon_state = "blink" @@ -53,7 +53,7 @@ new /obj/effect/effect/sparks(starting) return -/obj/item/weapon/spell/blink/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/blink/on_ranged_cast(atom/hit_atom, mob/user) if(istype(hit_atom, /atom/movable)) var/atom/movable/AM = hit_atom if(!within_range(AM)) @@ -72,7 +72,7 @@ else to_chat(user, "You need more energy to blink [AM] away!") -/obj/item/weapon/spell/blink/on_use_cast(mob/user) +/obj/item/spell/blink/on_use_cast(mob/user) if(!allowed_to_teleport()) to_chat(user, "Teleportation doesn't seem to work here.") return @@ -86,7 +86,7 @@ else to_chat(user, "You need more energy to blink yourself away!") -/obj/item/weapon/spell/blink/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) +/obj/item/spell/blink/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) if(istype(hit_atom, /atom/movable)) var/atom/movable/AM = hit_atom if(!allowed_to_teleport()) diff --git a/code/game/gamemodes/technomancer/spells/chroma.dm b/code/game/gamemodes/technomancer/spells/chroma.dm index b87a82a0aeb..be2e87b9466 100644 --- a/code/game/gamemodes/technomancer/spells/chroma.dm +++ b/code/game/gamemodes/technomancer/spells/chroma.dm @@ -3,10 +3,10 @@ desc = "Creates light around you, or in a location of your choosing. You can choose what color the light is. This could be \ useful to trick someone into believing you're casting a different spell, or perhaps just for fun." cost = 25 - obj_path = /obj/item/weapon/spell/chroma + obj_path = /obj/item/spell/chroma category = UTILITY_SPELLS -/obj/item/weapon/spell/chroma +/obj/item/spell/chroma name = "chroma" desc = "The colors are dazzling." icon_state = "darkness" @@ -14,7 +14,7 @@ aspect = ASPECT_LIGHT var/color_to_use = "#FFFFFF" -/obj/item/weapon/spell/chroma/New() +/obj/item/spell/chroma/New() ..() set_light(6, 5, l_color = color_to_use) @@ -28,14 +28,14 @@ . = ..() set_light(6, 5, l_color = new_color) -/obj/item/weapon/spell/chroma/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/chroma/on_ranged_cast(atom/hit_atom, mob/user) var/turf/T = get_turf(hit_atom) if(T) new /obj/effect/temporary_effect/chroma(T, color_to_use) to_chat(user, "You shift the light onto \the [T].") qdel(src) -/obj/item/weapon/spell/chroma/on_use_cast(mob/user) +/obj/item/spell/chroma/on_use_cast(mob/user) var/new_color = input(user, "Choose the color you want your light to be.", "Color selection") as null|color if(new_color) color_to_use = new_color diff --git a/code/game/gamemodes/technomancer/spells/condensation.dm b/code/game/gamemodes/technomancer/spells/condensation.dm index 226ccbed180..c1fe4912c6b 100644 --- a/code/game/gamemodes/technomancer/spells/condensation.dm +++ b/code/game/gamemodes/technomancer/spells/condensation.dm @@ -5,10 +5,10 @@ enhancement_desc = "Floors affected by condensation will also freeze." ability_icon_state = "tech_condensation" cost = 50 - obj_path = /obj/item/weapon/spell/condensation + obj_path = /obj/item/spell/condensation category = UTILITY_SPELLS -/obj/item/weapon/spell/condensation +/obj/item/spell/condensation name = "condensation" desc = "Stronger than it appears." icon_state = "condensation" @@ -16,7 +16,7 @@ aspect = ASPECT_AIR cooldown = 2 SECONDS -/obj/item/weapon/spell/condensation/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/condensation/on_ranged_cast(atom/hit_atom, mob/user) if(pay_energy(200)) if(istype(hit_atom, /turf/simulated) && within_range(hit_atom)) var/turf/simulated/T = hit_atom diff --git a/code/game/gamemodes/technomancer/spells/control.dm b/code/game/gamemodes/technomancer/spells/control.dm index 3ca26b3b044..215d9d455c8 100644 --- a/code/game/gamemodes/technomancer/spells/control.dm +++ b/code/game/gamemodes/technomancer/spells/control.dm @@ -6,14 +6,14 @@ not true mind control, but merely pheromone synthesis for living animals, and electronic hacking for simple robots. The green web \ around the entity is merely a hologram used to allow the user to know if the creature is safe or not." cost = 100 - obj_path = /obj/item/weapon/spell/control + obj_path = /obj/item/spell/control ability_icon_state = "tech_control" category = UTILITY_SPELLS /mob/living/carbon/human/proc/technomancer_control() - place_spell_in_hand(/obj/item/weapon/spell/control) + place_spell_in_hand(/obj/item/spell/control) -/obj/item/weapon/spell/control +/obj/item/spell/control name = "control" icon_state = "control" desc = "Now you can command your own army!" @@ -24,7 +24,7 @@ var/allowed_mob_classes = MOB_CLASS_ANIMAL|MOB_CLASS_SYNTHETIC //This unfortunately is gonna be rather messy due to the various mobtypes involved. -/obj/item/weapon/spell/control/proc/select(var/mob/living/L) +/obj/item/spell/control/proc/select(var/mob/living/L) if(!(L.mob_class & allowed_mob_classes)) return FALSE @@ -44,7 +44,7 @@ L.add_overlay(control_overlay, TRUE) controlled_mobs |= L -/obj/item/weapon/spell/control/proc/deselect(var/mob/living/L) +/obj/item/spell/control/proc/deselect(var/mob/living/L) if(!(L in controlled_mobs)) return FALSE @@ -62,31 +62,31 @@ L.cut_overlay(control_overlay, TRUE) controlled_mobs.Remove(L) -/obj/item/weapon/spell/control/proc/move_all(turf/T) +/obj/item/spell/control/proc/move_all(turf/T) for(var/mob/living/L in controlled_mobs) if(!L.has_AI() || L.stat) deselect(L) continue L.ai_holder.give_destination(T, 0, TRUE) -/obj/item/weapon/spell/control/proc/attack_all(mob/target) +/obj/item/spell/control/proc/attack_all(mob/target) for(var/mob/living/L in controlled_mobs) if(!L.has_AI() || L.stat) deselect(L) continue L.ai_holder.give_target(target) -/obj/item/weapon/spell/control/Initialize() +/obj/item/spell/control/Initialize() control_overlay = image('icons/obj/spells.dmi',"controlled") return ..() -/obj/item/weapon/spell/control/Destroy() +/obj/item/spell/control/Destroy() for(var/mob/living/L in controlled_mobs) deselect(L) controlled_mobs = list() return ..() -/obj/item/weapon/spell/control/on_use_cast(mob/living/user) +/obj/item/spell/control/on_use_cast(mob/living/user) if(controlled_mobs.len != 0) var/choice = tgui_alert(user,"Would you like to release control of the entities you are controlling? They won't be friendly to you anymore if you do this, so be careful.","Release Control?",list("No","Yes")) if(choice == "Yes") @@ -95,7 +95,7 @@ to_chat(user, "You've released control of all entities you had in control.") -/obj/item/weapon/spell/control/on_ranged_cast(atom/hit_atom, mob/living/user) +/obj/item/spell/control/on_ranged_cast(atom/hit_atom, mob/living/user) if(isliving(hit_atom)) var/mob/living/L = hit_atom if(L == user && !controlled_mobs.len) diff --git a/code/game/gamemodes/technomancer/spells/dispel.dm b/code/game/gamemodes/technomancer/spells/dispel.dm index 60266426cb5..dbc68624fb9 100644 --- a/code/game/gamemodes/technomancer/spells/dispel.dm +++ b/code/game/gamemodes/technomancer/spells/dispel.dm @@ -4,18 +4,18 @@ hitting an ally with a deterimental function, if your opponent has similar capabilities to you, or if you're tired of Instability \ plaguing you." cost = 25 - obj_path = /obj/item/weapon/spell/dispel + obj_path = /obj/item/spell/dispel ability_icon_state = "tech_dispel" category = SUPPORT_SPELLS -/obj/item/weapon/spell/dispel +/obj/item/spell/dispel name = "dispel" desc = "Useful if you're tired of glowing because of a miscast." icon_state = "dispel" cast_methods = CAST_RANGED aspect = ASPECT_BIOMED -/obj/item/weapon/spell/dispel/on_ranged_cast(atom/hit_atom, mob/living/user) +/obj/item/spell/dispel/on_ranged_cast(atom/hit_atom, mob/living/user) if(isliving(hit_atom) && within_range(hit_atom) && pay_energy(1000)) var/mob/living/target = hit_atom target.remove_modifiers_of_type(/datum/modifier/technomancer) diff --git a/code/game/gamemodes/technomancer/spells/energy_siphon.dm b/code/game/gamemodes/technomancer/spells/energy_siphon.dm index 1659b8f17bd..27d69f3a2c4 100644 --- a/code/game/gamemodes/technomancer/spells/energy_siphon.dm +++ b/code/game/gamemodes/technomancer/spells/energy_siphon.dm @@ -6,11 +6,11 @@ enhancement_desc = "Rate of siphoning is doubled." spell_power_desc = "Rate of siphoning is scaled up based on spell power." cost = 100 - obj_path = /obj/item/weapon/spell/energy_siphon + obj_path = /obj/item/spell/energy_siphon ability_icon_state = "tech_energysiphon" category = UTILITY_SPELLS -/obj/item/weapon/spell/energy_siphon +/obj/item/spell/energy_siphon name = "energy siphon" desc = "Now you are an energy vampire." icon_state = "energy_siphon" @@ -20,16 +20,16 @@ var/list/things_to_siphon = list() //Things which are actually drained as a result of the above not being null. var/flow_rate = 1000 // Limits how much electricity can be drained per second. Measured by default in god knows what. -/obj/item/weapon/spell/energy_siphon/New() +/obj/item/spell/energy_siphon/New() ..() START_PROCESSING(SSobj, src) -/obj/item/weapon/spell/energy_siphon/Destroy() +/obj/item/spell/energy_siphon/Destroy() stop_siphoning() STOP_PROCESSING(SSobj, src) return ..() -/obj/item/weapon/spell/energy_siphon/process() +/obj/item/spell/energy_siphon/process() if(!siphoning) return if(!pay_energy(100)) @@ -48,7 +48,7 @@ -/obj/item/weapon/spell/energy_siphon/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/energy_siphon/on_ranged_cast(atom/hit_atom, mob/user) if(istype(hit_atom, /atom/movable) && within_range(hit_atom, 4)) var/atom/movable/AM = hit_atom populate_siphon_list(AM) @@ -61,7 +61,7 @@ else stop_siphoning() -/obj/item/weapon/spell/energy_siphon/proc/populate_siphon_list(atom/movable/target) +/obj/item/spell/energy_siphon/proc/populate_siphon_list(atom/movable/target) things_to_siphon.Cut() things_to_siphon |= target // The recursive check below does not add the object being checked to its list. things_to_siphon |= recursive_content_check(target, things_to_siphon, recursion_limit = 3, client_check = 0, sight_check = 0, include_mobs = 1, include_objects = 1, ignore_show_messages = 1) @@ -73,7 +73,7 @@ if(AM.drain_power(1) <= 0) // This checks if whatever's in the list can be drained from. things_to_siphon.Remove(AM) -/obj/item/weapon/spell/energy_siphon/proc/stop_siphoning() +/obj/item/spell/energy_siphon/proc/stop_siphoning() siphoning = null things_to_siphon.Cut() update_icon() @@ -83,7 +83,7 @@ #define SIPHON_CORE_TO_ENERGY 0.5 // This is called every tick, so long as a link exists between the target and the Technomancer. -/obj/item/weapon/spell/energy_siphon/proc/siphon(atom/movable/siphoning, mob/living/user) +/obj/item/spell/energy_siphon/proc/siphon(atom/movable/siphoning, mob/living/user) var/list/things_to_drain = things_to_siphon // Temporary list copy of what we're gonna steal from. var/charge_to_give = 0 // How much energy to give to the Technomancer at the end. var/flow_remaining = calculate_spell_power(flow_rate) @@ -125,8 +125,8 @@ charge_to_give += nutrition_delta * SIPHON_FBP_TO_ENERGY flow_remaining = flow_remaining - nutrition_to_steal / 0.025 // Let's steal some energy from another Technomancer. - if(istype(H.back, /obj/item/weapon/technomancer_core) && H != user) - var/obj/item/weapon/technomancer_core/their_core = H.back + if(istype(H.back, /obj/item/technomancer_core) && H != user) + var/obj/item/technomancer_core/their_core = H.back if(their_core.pay_energy(flow_remaining / 2)) // Don't give energy from nothing. charge_to_give += flow_remaining * SIPHON_CORE_TO_ENERGY flow_remaining = 0 @@ -151,14 +151,14 @@ to_chat(user, "\The [siphoning] cannot be drained any further.") stop_siphoning() -/obj/item/weapon/spell/energy_siphon/update_icon() +/obj/item/spell/energy_siphon/update_icon() ..() if(siphoning) icon_state = "energy_siphon_drain" else icon_state = "energy_siphon" -/obj/item/weapon/spell/energy_siphon/proc/create_lightning(mob/user, atom/source) +/obj/item/spell/energy_siphon/proc/create_lightning(mob/user, atom/source) if(user && source && user != source) spawn(0) var/i = 7 // process() takes two seconds to tick, this ensures the appearance of a ongoing beam. diff --git a/code/game/gamemodes/technomancer/spells/flame_tongue.dm b/code/game/gamemodes/technomancer/spells/flame_tongue.dm index 9a52c5d82fd..7a3fdba69b2 100644 --- a/code/game/gamemodes/technomancer/spells/flame_tongue.dm +++ b/code/game/gamemodes/technomancer/spells/flame_tongue.dm @@ -2,44 +2,44 @@ name = "Flame Tongue" desc = "Using a miniturized flamethrower in your gloves, you can emit a flame strong enough to melt both your enemies and walls." cost = 50 - obj_path = /obj/item/weapon/spell/flame_tongue + obj_path = /obj/item/spell/flame_tongue ability_icon_state = "tech_flametongue" category = OFFENSIVE_SPELLS -/obj/item/weapon/spell/flame_tongue +/obj/item/spell/flame_tongue name = "flame tongue" icon_state = "flame_tongue" desc = "Burn!" cast_methods = CAST_MELEE aspect = ASPECT_FIRE - var/obj/item/weapon/weldingtool/spell/welder = null + var/obj/item/weldingtool/spell/welder = null -/obj/item/weapon/spell/flame_tongue/New() +/obj/item/spell/flame_tongue/New() ..() set_light(3, 2, l_color = "#FF6A00") visible_message("\The [loc]'s hand begins to emit a flame.") - welder = new /obj/item/weapon/weldingtool/spell(src) + welder = new /obj/item/weldingtool/spell(src) welder.setWelding(1) -/obj/item/weapon/spell/flame_tongue/Destroy() +/obj/item/spell/flame_tongue/Destroy() QDEL_NULL(welder) return ..() -/obj/item/weapon/weldingtool/spell +/obj/item/weldingtool/spell name = "flame" eye_safety_modifier = 3 -/obj/item/weapon/weldingtool/spell/process() +/obj/item/weldingtool/spell/process() return //Needed to make the spell welder have infinite fuel. Don't worry, it uses energy instead. -/obj/item/weapon/weldingtool/spell/remove_fuel() +/obj/item/weldingtool/spell/remove_fuel() return 1 -/obj/item/weapon/weldingtool/spell/eyecheck(mob/user as mob) +/obj/item/weldingtool/spell/eyecheck(mob/user as mob) return -/obj/item/weapon/spell/flame_tongue/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) +/obj/item/spell/flame_tongue/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) if(isliving(hit_atom) && user.a_intent != I_HELP) var/mob/living/L = hit_atom if(pay_energy(1000)) diff --git a/code/game/gamemodes/technomancer/spells/gambit.dm b/code/game/gamemodes/technomancer/spells/gambit.dm index 5e03a8ca19c..cde2e9e28b8 100644 --- a/code/game/gamemodes/technomancer/spells/gambit.dm +++ b/code/game/gamemodes/technomancer/spells/gambit.dm @@ -6,31 +6,31 @@ spell_power_desc = "Makes certain rare functions possible to acquire via Gambit which cannot be obtained otherwise, if above 100%." ability_icon_state = "tech_gambit" cost = 50 - obj_path = /obj/item/weapon/spell/gambit + obj_path = /obj/item/spell/gambit category = UTILITY_SPELLS -/var/global/list/all_technomancer_gambit_spells = typesof(/obj/item/weapon/spell) - list( - /obj/item/weapon/spell, - /obj/item/weapon/spell/gambit, - /obj/item/weapon/spell/projectile, - /obj/item/weapon/spell/aura, -// /obj/item/weapon/spell/insert, - /obj/item/weapon/spell/spawner, - /obj/item/weapon/spell/summon, - /obj/item/weapon/spell/modifier) +/var/global/list/all_technomancer_gambit_spells = typesof(/obj/item/spell) - list( + /obj/item/spell, + /obj/item/spell/gambit, + /obj/item/spell/projectile, + /obj/item/spell/aura, +// /obj/item/spell/insert, + /obj/item/spell/spawner, + /obj/item/spell/summon, + /obj/item/spell/modifier) -/obj/item/weapon/spell/gambit +/obj/item/spell/gambit name = "gambit" desc = "Do you feel lucky?" icon_state = "gambit" cast_methods = CAST_USE aspect = ASPECT_UNSTABLE var/list/rare_spells = list( - /obj/item/weapon/spell/modifier/mend_all + /obj/item/spell/modifier/mend_all ) -/obj/item/weapon/spell/gambit/on_use_cast(mob/living/carbon/human/user) +/obj/item/spell/gambit/on_use_cast(mob/living/carbon/human/user) if(pay_energy(200)) adjust_instability(3) if(check_for_scepter()) @@ -39,12 +39,12 @@ give_new_spell(random_spell()) qdel(src) -/obj/item/weapon/spell/gambit/proc/give_new_spell(var/spell_type) +/obj/item/spell/gambit/proc/give_new_spell(var/spell_type) owner.drop_from_inventory(src, null) owner.place_spell_in_hand(spell_type) // Gives a random spell. -/obj/item/weapon/spell/gambit/proc/random_spell() +/obj/item/spell/gambit/proc/random_spell() var/list/potential_spells = all_technomancer_gambit_spells.Copy() var/rare_spell_chance = between(0, calculate_spell_power(100) - 100, 100) // Having 120% spellpower means a 20% chance to get to roll for rare spells. if(prob(rare_spell_chance)) @@ -53,7 +53,7 @@ return pick(potential_spells) // Gives a "random" spell. -/obj/item/weapon/spell/gambit/proc/biased_random_spell() +/obj/item/spell/gambit/proc/biased_random_spell() var/list/potential_spells = list() var/rare_spell_chance = between(0, calculate_spell_power(100) - 100, 100) var/give_rare_spells = FALSE @@ -64,11 +64,11 @@ // First the spell will concern itself with the health of the technomancer. if(prob(owner.getBruteLoss() + owner.getBruteLoss() * 2)) // Having 20 brute means a 40% chance of being added to the pool. if(!owner.isSynthetic()) - potential_spells |= /obj/item/weapon/spell/modifier/mend_life + potential_spells |= /obj/item/spell/modifier/mend_life else - potential_spells |= /obj/item/weapon/spell/modifier/mend_synthetic + potential_spells |= /obj/item/spell/modifier/mend_synthetic if(give_rare_spells) - potential_spells |= /obj/item/weapon/spell/modifier/mend_all + potential_spells |= /obj/item/spell/modifier/mend_all // Second, the spell will try to prepare the technomancer for threats. var/hostile_mobs = 0 // Counts how many hostile mobs. Higher numbers make it more likely for AoE spells to be chosen. @@ -80,13 +80,13 @@ if(!is_ally(SM) && SM.has_AI() && SM.ai_holder.hostile) hostile_mobs++ if(SM.summoned || SM.supernatural) // Our creations might be trying to kill us. - potential_spells |= /obj/item/weapon/spell/abjuration + potential_spells |= /obj/item/spell/abjuration // Always assume borgs are hostile. if(istype(L, /mob/living/silicon/robot)) if(!istype(L, /mob/living/silicon/robot/drone)) // Drones are okay, however. hostile_mobs++ - potential_spells |= /obj/item/weapon/spell/projectile/ionic_bolt + potential_spells |= /obj/item/spell/projectile/ionic_bolt // Finally we get to humanoids. if(istype(L, /mob/living/carbon/human)) @@ -96,7 +96,7 @@ for(var/obj/item/I in list(H.l_hand, H.r_hand)) // Guns are scary. - if(istype(I, /obj/item/weapon/gun)) // Toy guns will count as well but oh well. + if(istype(I, /obj/item/gun)) // Toy guns will count as well but oh well. hostile_mobs++ continue // Strong melee weapons are scary as well. @@ -105,27 +105,27 @@ continue if(hostile_mobs) - potential_spells |= /obj/item/weapon/spell/shield - potential_spells |= /obj/item/weapon/spell/reflect - potential_spells |= /obj/item/weapon/spell/targeting_matrix - potential_spells |= /obj/item/weapon/spell/warp_strike + potential_spells |= /obj/item/spell/shield + potential_spells |= /obj/item/spell/reflect + potential_spells |= /obj/item/spell/targeting_matrix + potential_spells |= /obj/item/spell/warp_strike if(hostile_mobs >= 3) // Lots of baddies, give them AoE. - potential_spells |= /obj/item/weapon/spell/projectile/chain_lightning - potential_spells |= /obj/item/weapon/spell/projectile/chain_lightning/lesser - potential_spells |= /obj/item/weapon/spell/spawner/fire_blast - potential_spells |= /obj/item/weapon/spell/condensation - potential_spells |= /obj/item/weapon/spell/aura/frost + potential_spells |= /obj/item/spell/projectile/chain_lightning + potential_spells |= /obj/item/spell/projectile/chain_lightning/lesser + potential_spells |= /obj/item/spell/spawner/fire_blast + potential_spells |= /obj/item/spell/condensation + potential_spells |= /obj/item/spell/aura/frost else - potential_spells |= /obj/item/weapon/spell/projectile/beam - potential_spells |= /obj/item/weapon/spell/projectile/overload - potential_spells |= /obj/item/weapon/spell/projectile/force_missile - potential_spells |= /obj/item/weapon/spell/projectile/lightning + potential_spells |= /obj/item/spell/projectile/beam + potential_spells |= /obj/item/spell/projectile/overload + potential_spells |= /obj/item/spell/projectile/force_missile + potential_spells |= /obj/item/spell/projectile/lightning // Third priority is recharging the core. if(core.energy / core.max_energy <= 0.5) - potential_spells |= /obj/item/weapon/spell/energy_siphon - potential_spells |= /obj/item/weapon/spell/instability_tap + potential_spells |= /obj/item/spell/energy_siphon + potential_spells |= /obj/item/spell/instability_tap // Fallback method in case nothing gets added. if(!potential_spells.len) diff --git a/code/game/gamemodes/technomancer/spells/illusion.dm b/code/game/gamemodes/technomancer/spells/illusion.dm index ab83319bc59..32b1a474d28 100644 --- a/code/game/gamemodes/technomancer/spells/illusion.dm +++ b/code/game/gamemodes/technomancer/spells/illusion.dm @@ -3,11 +3,11 @@ desc = "Allows you to create and control a holographic illusion, that can take the form of most object or entities." enhancement_desc = "Illusions will be made of hard light, allowing the interception of attacks, appearing more realistic." cost = 25 - obj_path = /obj/item/weapon/spell/illusion + obj_path = /obj/item/spell/illusion ability_icon_state = "tech_illusion" category = UTILITY_SPELLS -/obj/item/weapon/spell/illusion +/obj/item/spell/illusion name = "illusion" icon_state = "illusion" desc = "Now you can toy with the minds of the whole colony." @@ -16,7 +16,7 @@ var/atom/movable/copied = null var/mob/living/simple_mob/illusion/illusion = null -/obj/item/weapon/spell/illusion/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/illusion/on_ranged_cast(atom/hit_atom, mob/user) if(istype(hit_atom, /atom/movable)) var/atom/movable/AM = hit_atom if(pay_energy(100)) @@ -42,7 +42,7 @@ var/datum/ai_holder/AI = illusion.ai_holder AI.give_destination(T) -/obj/item/weapon/spell/illusion/on_use_cast(mob/user) +/obj/item/spell/illusion/on_use_cast(mob/user) if(illusion) var/choice = tgui_alert(user, "Would you like to have \the [illusion] speak, or do an emote?", "Illusion", list("Speak","Emote","Cancel")) switch(choice) @@ -58,13 +58,13 @@ if(what_to_emote) illusion.emote(what_to_emote) -/obj/item/weapon/spell/illusion/Destroy() +/obj/item/spell/illusion/Destroy() QDEL_NULL(illusion) copied = null return ..() // Makes a tiny overlay of the thing the player has copied, so they can easily tell what they currently have. -/obj/item/weapon/spell/illusion/update_icon() +/obj/item/spell/illusion/update_icon() cut_overlays() if(copied) var/image/temp_image = image(copied) diff --git a/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm b/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm index 341045e3767..8cf9ff6a6d1 100644 --- a/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm +++ b/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm @@ -4,20 +4,20 @@ hits, which inhibits the delivery of oxygen. The effectiveness of the toxin is heavily dependent on how healthy the target is, \ with the target taking more damage the more wounded they are. The effect lasts for twelve seconds." cost = 140 - obj_path = /obj/item/weapon/spell/insert/asphyxiation + obj_path = /obj/item/spell/insert/asphyxiation -/obj/item/weapon/spell/insert/asphyxiation +/obj/item/spell/insert/asphyxiation name = "asphyxiation" desc = "Now you can cause suffication from afar!" icon_state = "generic" cast_methods = CAST_RANGED aspect = ASPECT_BIOMED light_color = "#FF5C5C" - inserting = /obj/item/weapon/inserted_spell/asphyxiation + inserting = /obj/item/inserted_spell/asphyxiation // maxHealth - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss() - getCloneLoss() - halloss -/obj/item/weapon/inserted_spell/asphyxiation/on_insert() +/obj/item/inserted_spell/asphyxiation/on_insert() spawn(1) if(ishuman(host)) var/mob/living/carbon/human/H = host @@ -39,12 +39,12 @@ if(src) //We might've been dispelled at this point and deleted, better safe than sorry. on_expire() -/obj/item/weapon/inserted_spell/asphyxiation/on_expire() +/obj/item/inserted_spell/asphyxiation/on_expire() ..() // if((getOxyLoss() > (species.total_health/2)) || (health <= config.health_threshold_crit)) -/obj/item/weapon/inserted_spell/asphyxiation/proc/predict_crit(var/pulses_remaining, var/mob/living/carbon/human/victim, var/previous_damage = 0) +/obj/item/inserted_spell/asphyxiation/proc/predict_crit(var/pulses_remaining, var/mob/living/carbon/human/victim, var/previous_damage = 0) if(pulses_remaining <= 0) // Infinite loop protection return 0 var/health_lost diff --git a/code/game/gamemodes/technomancer/spells/insert/insert.dm b/code/game/gamemodes/technomancer/spells/insert/insert.dm index 9ac0295e2b8..92103f76cb4 100644 --- a/code/game/gamemodes/technomancer/spells/insert/insert.dm +++ b/code/game/gamemodes/technomancer/spells/insert/insert.dm @@ -1,6 +1,6 @@ //Template for spells which put something inside someone else, good for buffs/debuffs, damage over times and heals over time. -/obj/item/weapon/spell/insert +/obj/item/spell/insert name = "insert template" desc = "Tell a coder if you can read this in-game." icon_state = "purify" @@ -8,19 +8,19 @@ var/spell_color = "#03A728" var/spell_light_intensity = 2 var/spell_light_range = 3 - var/obj/item/weapon/inserted_spell/inserting = null + var/obj/item/inserted_spell/inserting = null var/allow_stacking = 0 -/obj/item/weapon/spell/insert/New() +/obj/item/spell/insert/New() ..() set_light(spell_light_range, spell_light_intensity, l_color = light_color) -/obj/item/weapon/inserted_spell +/obj/item/inserted_spell var/mob/living/carbon/human/origin = null var/mob/living/host = null var/spell_power_at_creation = 1.0 // This is here because the spell object that made this object probably won't exist. -/obj/item/weapon/inserted_spell/New(var/newloc, var/user, var/obj/item/weapon/spell/insert/inserter) +/obj/item/inserted_spell/New(var/newloc, var/user, var/obj/item/spell/insert/inserter) ..(newloc) host = newloc origin = user @@ -29,31 +29,31 @@ set_light(inserter.spell_light_range, inserter.spell_light_intensity, inserter.spell_color) on_insert() -/obj/item/weapon/inserted_spell/proc/on_insert() +/obj/item/inserted_spell/proc/on_insert() return -/obj/item/weapon/inserted_spell/proc/on_expire(var/dispelled = 0) +/obj/item/inserted_spell/proc/on_expire(var/dispelled = 0) qdel(src) return -/obj/item/weapon/spell/insert/proc/insert(var/mob/living/L, mob/user) +/obj/item/spell/insert/proc/insert(var/mob/living/L, mob/user) if(inserting) if(!allow_stacking) - for(var/obj/item/weapon/inserted_spell/IS in L.contents) + for(var/obj/item/inserted_spell/IS in L.contents) if(IS.type == inserting) to_chat(user, "\The [L] is already affected by \the [src].") return - var/obj/item/weapon/inserted_spell/inserted = new inserting(L,user,src) + var/obj/item/inserted_spell/inserted = new inserting(L,user,src) inserted.spell_power_at_creation = calculate_spell_power(1.0) add_attack_logs(user,L,"Casted [src]") qdel(src) -/obj/item/weapon/spell/insert/on_melee_cast(atom/hit_atom, mob/user) +/obj/item/spell/insert/on_melee_cast(atom/hit_atom, mob/user) if(istype(hit_atom, /mob/living)) var/mob/living/L = hit_atom insert(L,user) -/obj/item/weapon/spell/insert/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/insert/on_ranged_cast(atom/hit_atom, mob/user) if(istype(hit_atom, /mob/living)) var/mob/living/L = hit_atom insert(L,user) \ No newline at end of file diff --git a/code/game/gamemodes/technomancer/spells/insert/mend_burns.dm b/code/game/gamemodes/technomancer/spells/insert/mend_burns.dm index 619c1cf3f45..365dd18616d 100644 --- a/code/game/gamemodes/technomancer/spells/insert/mend_burns.dm +++ b/code/game/gamemodes/technomancer/spells/insert/mend_burns.dm @@ -3,20 +3,20 @@ desc = "Heals minor burns, such as from exposure to flame, electric shock, or lasers." spell_power_desc = "Healing amount increased." cost = 50 - obj_path = /obj/item/weapon/spell/insert/mend_burns + obj_path = /obj/item/spell/insert/mend_burns ability_icon_state = "tech_mendburns" category = SUPPORT_SPELLS -/obj/item/weapon/spell/insert/mend_burns +/obj/item/spell/insert/mend_burns name = "mend burns" desc = "Ointment is a thing of the past." icon_state = "mend_burns" cast_methods = CAST_MELEE aspect = ASPECT_BIOMED light_color = "#FF5C5C" - inserting = /obj/item/weapon/inserted_spell/mend_burns + inserting = /obj/item/inserted_spell/mend_burns -/obj/item/weapon/inserted_spell/mend_burns/on_insert() +/obj/item/inserted_spell/mend_burns/on_insert() spawn(1) if(ishuman(host)) var/mob/living/carbon/human/H = host diff --git a/code/game/gamemodes/technomancer/spells/insert/mend_metal.dm b/code/game/gamemodes/technomancer/spells/insert/mend_metal.dm index 0e44e017615..53ab439df66 100644 --- a/code/game/gamemodes/technomancer/spells/insert/mend_metal.dm +++ b/code/game/gamemodes/technomancer/spells/insert/mend_metal.dm @@ -3,20 +3,20 @@ desc = "Restores integrity to external robotic components." spell_power_desc = "Healing amount increased." cost = 50 - obj_path = /obj/item/weapon/spell/insert/mend_metal + obj_path = /obj/item/spell/insert/mend_metal ability_icon_state = "tech_mendwounds" category = SUPPORT_SPELLS -/obj/item/weapon/spell/insert/mend_metal +/obj/item/spell/insert/mend_metal name = "mend metal" desc = "A roboticist is now obsolete." icon_state = "mend_wounds" cast_methods = CAST_MELEE aspect = ASPECT_BIOMED light_color = "#FF5C5C" - inserting = /obj/item/weapon/inserted_spell/mend_metal + inserting = /obj/item/inserted_spell/mend_metal -/obj/item/weapon/inserted_spell/mend_metal/on_insert() +/obj/item/inserted_spell/mend_metal/on_insert() spawn(1) if(ishuman(host)) var/mob/living/carbon/human/H = host diff --git a/code/game/gamemodes/technomancer/spells/insert/mend_organs.dm b/code/game/gamemodes/technomancer/spells/insert/mend_organs.dm index 550bb208ba0..dfe513f5545 100644 --- a/code/game/gamemodes/technomancer/spells/insert/mend_organs.dm +++ b/code/game/gamemodes/technomancer/spells/insert/mend_organs.dm @@ -4,20 +4,20 @@ robotic, reforms bones, patches internal bleeding, and restores missing blood." spell_power_desc = "Healing amount increased." cost = 100 - obj_path = /obj/item/weapon/spell/insert/mend_organs + obj_path = /obj/item/spell/insert/mend_organs ability_icon_state = "tech_mendwounds" category = SUPPORT_SPELLS -/obj/item/weapon/spell/insert/mend_organs +/obj/item/spell/insert/mend_organs name = "great mend wounds" desc = "A walking medbay is now you!" icon_state = "mend_wounds" cast_methods = CAST_MELEE aspect = ASPECT_BIOMED light_color = "#FF5C5C" - inserting = /obj/item/weapon/inserted_spell/mend_organs + inserting = /obj/item/inserted_spell/mend_organs -/obj/item/weapon/inserted_spell/mend_organs/on_insert() +/obj/item/inserted_spell/mend_organs/on_insert() spawn(1) if(ishuman(host)) var/mob/living/carbon/human/H = host diff --git a/code/game/gamemodes/technomancer/spells/insert/mend_wires.dm b/code/game/gamemodes/technomancer/spells/insert/mend_wires.dm index 539e472a62d..72585ef208f 100644 --- a/code/game/gamemodes/technomancer/spells/insert/mend_wires.dm +++ b/code/game/gamemodes/technomancer/spells/insert/mend_wires.dm @@ -3,20 +3,20 @@ desc = "Binds the internal wiring of robotic limbs and components over time." spell_power_desc = "Healing amount increased." cost = 50 - obj_path = /obj/item/weapon/spell/insert/mend_wires + obj_path = /obj/item/spell/insert/mend_wires ability_icon_state = "tech_mendwounds" category = SUPPORT_SPELLS -/obj/item/weapon/spell/insert/mend_wires +/obj/item/spell/insert/mend_wires name = "mend wires" desc = "A roboticist is now obsolete." icon_state = "mend_wounds" cast_methods = CAST_MELEE aspect = ASPECT_BIOMED light_color = "#FF5C5C" - inserting = /obj/item/weapon/inserted_spell/mend_wires + inserting = /obj/item/inserted_spell/mend_wires -/obj/item/weapon/inserted_spell/mend_wires/on_insert() +/obj/item/inserted_spell/mend_wires/on_insert() spawn(1) if(ishuman(host)) var/mob/living/carbon/human/H = host diff --git a/code/game/gamemodes/technomancer/spells/instability_tap.dm b/code/game/gamemodes/technomancer/spells/instability_tap.dm index ad2c72518be..67aac5557fb 100644 --- a/code/game/gamemodes/technomancer/spells/instability_tap.dm +++ b/code/game/gamemodes/technomancer/spells/instability_tap.dm @@ -4,21 +4,21 @@ enhancement_desc = "50% more energy gained, 20% less instability gained." spell_power_desc = "Amount of energy gained scaled with spell power." cost = 100 - obj_path = /obj/item/weapon/spell/instability_tap + obj_path = /obj/item/spell/instability_tap ability_icon_state = "tech_instabilitytap" category = UTILITY_SPELLS -/obj/item/weapon/spell/instability_tap +/obj/item/spell/instability_tap name = "instability tap" desc = "Short term gain for long term consequences never end bad, right?" cast_methods = CAST_USE aspect = ASPECT_UNSTABLE -/obj/item/weapon/spell/instability_tap/New() +/obj/item/spell/instability_tap/New() ..() set_light(3, 2, l_color = "#FA58F4") -/obj/item/weapon/spell/instability_tap/on_use_cast(mob/user) +/obj/item/spell/instability_tap/on_use_cast(mob/user) var/amount = calculate_spell_power(5000) if(check_for_scepter()) core.give_energy(amount * 1.5) diff --git a/code/game/gamemodes/technomancer/spells/mark_recall.dm b/code/game/gamemodes/technomancer/spells/mark_recall.dm index ad7eabf8d0c..613978761d1 100644 --- a/code/game/gamemodes/technomancer/spells/mark_recall.dm +++ b/code/game/gamemodes/technomancer/spells/mark_recall.dm @@ -4,7 +4,7 @@ Note that using Mark again will move the destination instead of creating a second destination, and only one destination \ can exist, regardless of who casted Mark." cost = 25 - obj_path = /obj/item/weapon/spell/mark + obj_path = /obj/item/spell/mark ability_icon_state = "tech_mark" category = UTILITY_SPELLS //VOREStation Add - Multiple technomancer support @@ -33,14 +33,14 @@ //This is global, to avoid looping through a list of all objects, or god forbid, looping through world. GLOBAL_LIST_INIT(mark_spells, list()) //VOREStation Add End -/obj/item/weapon/spell/mark +/obj/item/spell/mark name = "mark" icon_state = "mark" desc = "Marks a specific location to be used by Recall." cast_methods = CAST_USE aspect = ASPECT_TELE -/obj/item/weapon/spell/mark/on_use_cast(var/mob/living/user) +/obj/item/spell/mark/on_use_cast(var/mob/living/user) if(!allowed_to_teleport()) // Otherwise you could teleport back to the admin Z-level. to_chat(user, "You can't teleport here!") return 0 @@ -70,18 +70,18 @@ GLOBAL_LIST_INIT(mark_spells, list()) function is useless. Note that teleporting takes three seconds. Being incapacitated while teleporting will cancel it." enhancement_desc = "Recall takes two seconds instead of three." cost = 25 - obj_path = /obj/item/weapon/spell/recall + obj_path = /obj/item/spell/recall ability_icon_state = "tech_recall" category = UTILITY_SPELLS -/obj/item/weapon/spell/recall +/obj/item/spell/recall name = "recall" icon_state = "recall" desc = "This will bring you to your Mark." cast_methods = CAST_USE aspect = ASPECT_TELE -/obj/item/weapon/spell/recall/on_use_cast(var/mob/living/user) +/obj/item/spell/recall/on_use_cast(var/mob/living/user) if(pay_energy(3000)) var/datum/technomancer_marker/marker = GLOB.mark_spells[WEAKREF(user)] //VOREStation Add - Multiple technomancer support if(!istype(marker)) @@ -109,7 +109,7 @@ GLOBAL_LIST_INIT(mark_spells, list()) var/turf/target_turf = marker.T //VOREStation Edit - Multiple technomancer support var/turf/old_turf = get_turf(user) - for(var/obj/item/weapon/grab/G in user.contents) // People the Technomancer is grabbing come along for the ride. + for(var/obj/item/grab/G in user.contents) // People the Technomancer is grabbing come along for the ride. if(G.affecting) G.affecting.forceMove(locate( target_turf.x+rand(-1,1), target_turf.y+rand(-1,1), target_turf.z)) to_chat(G.affecting, "You are teleported along with [user]!") diff --git a/code/game/gamemodes/technomancer/spells/mend_organs.dm b/code/game/gamemodes/technomancer/spells/mend_organs.dm index 16c212f084d..e9b7b39c1b0 100644 --- a/code/game/gamemodes/technomancer/spells/mend_organs.dm +++ b/code/game/gamemodes/technomancer/spells/mend_organs.dm @@ -4,11 +4,11 @@ robotic, reforms bones, patches internal bleeding, and restores missing blood." spell_power_desc = "Healing amount increased." cost = 100 - obj_path = /obj/item/weapon/spell/mend_organs + obj_path = /obj/item/spell/mend_organs ability_icon_state = "tech_mendwounds" category = SUPPORT_SPELLS -/obj/item/weapon/spell/mend_organs +/obj/item/spell/mend_organs name = "great mend wounds" desc = "A walking medbay is now you!" icon_state = "mend_wounds" @@ -16,7 +16,7 @@ aspect = ASPECT_BIOMED light_color = "#FF5C5C" -/obj/item/weapon/spell/mend_organs/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) +/obj/item/spell/mend_organs/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) if(isliving(hit_atom)) var/mob/living/L = hit_atom var/heal_power = calculate_spell_power(40) diff --git a/code/game/gamemodes/technomancer/spells/modifier/corona.dm b/code/game/gamemodes/technomancer/spells/modifier/corona.dm index 24d571d4c27..f53aa5094bf 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/corona.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/corona.dm @@ -3,11 +3,11 @@ desc = "Causes the victim to glow very brightly, which while harmless in itself, makes it easier for them to be hit. The \ bright glow also makes it very difficult to be stealthy. The effect lasts for one minute." cost = 50 - obj_path = /obj/item/weapon/spell/modifier/corona + obj_path = /obj/item/spell/modifier/corona ability_icon_state = "tech_corona" category = SUPPORT_SPELLS -/obj/item/weapon/spell/modifier/corona +/obj/item/spell/modifier/corona name = "corona" desc = "How brillient!" icon_state = "radiance" diff --git a/code/game/gamemodes/technomancer/spells/modifier/haste.dm b/code/game/gamemodes/technomancer/spells/modifier/haste.dm index 7f7c1045b36..10d4c341a55 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/haste.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/haste.dm @@ -3,11 +3,11 @@ desc = "Allows the target to run at speeds that should not be possible for an ordinary being. For five seconds, the target \ runs extremly fast, and cannot be slowed by any means." cost = 100 - obj_path = /obj/item/weapon/spell/modifier/haste + obj_path = /obj/item/spell/modifier/haste ability_icon_state = "tech_haste" category = SUPPORT_SPELLS -/obj/item/weapon/spell/modifier/haste +/obj/item/spell/modifier/haste name = "haste" desc = "Now you can outrun a Teshari!" icon_state = "haste" diff --git a/code/game/gamemodes/technomancer/spells/modifier/mend_all.dm b/code/game/gamemodes/technomancer/spells/modifier/mend_all.dm index 1da3554573e..fbac295926d 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/mend_all.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/mend_all.dm @@ -1,6 +1,6 @@ // Gambit only spell. Heals everything unconditionally. -/obj/item/weapon/spell/modifier/mend_all +/obj/item/spell/modifier/mend_all name = "mend all" desc = "One function to heal them all." icon_state = "mend_all" diff --git a/code/game/gamemodes/technomancer/spells/modifier/mend_life.dm b/code/game/gamemodes/technomancer/spells/modifier/mend_life.dm index 35a1e8c1c2d..95c7eeb1b55 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/mend_life.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/mend_life.dm @@ -5,11 +5,11 @@ if the target is completely healthy, preventing further instability." spell_power_desc = "Healing amount increased." cost = 50 - obj_path = /obj/item/weapon/spell/modifier/mend_life + obj_path = /obj/item/spell/modifier/mend_life ability_icon_state = "tech_mendwounds" category = SUPPORT_SPELLS -/obj/item/weapon/spell/modifier/mend_life +/obj/item/spell/modifier/mend_life name = "mend life" desc = "Watch your wounds close up before your eyes." icon_state = "mend_life" diff --git a/code/game/gamemodes/technomancer/spells/modifier/mend_synthetic.dm b/code/game/gamemodes/technomancer/spells/modifier/mend_synthetic.dm index 33405f3a42a..a91d5ff3729 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/mend_synthetic.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/mend_synthetic.dm @@ -5,11 +5,11 @@ if the target is completely healthy, preventing further instability." spell_power_desc = "Healing amount increased." cost = 50 - obj_path = /obj/item/weapon/spell/modifier/mend_synthetic + obj_path = /obj/item/spell/modifier/mend_synthetic ability_icon_state = "tech_mendsynth" category = SUPPORT_SPELLS -/obj/item/weapon/spell/modifier/mend_synthetic +/obj/item/spell/modifier/mend_synthetic name = "mend synthetic" desc = "You are the Robotics lab" icon_state = "mend_synthetic" diff --git a/code/game/gamemodes/technomancer/spells/modifier/modifier.dm b/code/game/gamemodes/technomancer/spells/modifier/modifier.dm index 3ea278286e3..cca02c4ae3d 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/modifier.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/modifier.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/spell/modifier +/obj/item/spell/modifier name = "modifier template" desc = "Tell a coder if you can read this in-game." icon_state = "purify" @@ -9,22 +9,22 @@ var/spell_light_intensity = 2 var/spell_light_range = 3 -/obj/item/weapon/spell/modifier/New() +/obj/item/spell/modifier/New() ..() set_light(spell_light_range, spell_light_intensity, l_color = light_color) -/obj/item/weapon/spell/modifier/on_melee_cast(atom/hit_atom, mob/user) +/obj/item/spell/modifier/on_melee_cast(atom/hit_atom, mob/user) if(istype(hit_atom, /mob/living)) return on_add_modifier(hit_atom) return FALSE -/obj/item/weapon/spell/modifier/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/modifier/on_ranged_cast(atom/hit_atom, mob/user) if(istype(hit_atom, /mob/living)) return on_add_modifier(hit_atom) return FALSE -/obj/item/weapon/spell/modifier/proc/on_add_modifier(var/mob/living/L) +/obj/item/spell/modifier/proc/on_add_modifier(var/mob/living/L) var/duration = modifier_duration if(duration) duration = round(duration * calculate_spell_power(1.0), 1) diff --git a/code/game/gamemodes/technomancer/spells/modifier/purify.dm b/code/game/gamemodes/technomancer/spells/modifier/purify.dm index 69cfac18d5b..38cfe4dca7b 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/purify.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/purify.dm @@ -5,11 +5,11 @@ if the target is completely healthy, preventing further instability." spell_power_desc = "Healing amount increased." cost = 25 - obj_path = /obj/item/weapon/spell/modifier/purify + obj_path = /obj/item/spell/modifier/purify ability_icon_state = "tech_purify" category = SUPPORT_SPELLS -/obj/item/weapon/spell/modifier/purify +/obj/item/spell/modifier/purify name = "mend life" desc = "Watch your wounds close up before your eyes." icon_state = "mend_life" diff --git a/code/game/gamemodes/technomancer/spells/modifier/repel_missiles.dm b/code/game/gamemodes/technomancer/spells/modifier/repel_missiles.dm index 6f3b4b892f6..c86a52e663a 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/repel_missiles.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/repel_missiles.dm @@ -3,11 +3,11 @@ desc = "Places a repulsion field around you, which attempts to deflect incoming bullets and lasers, making them 45% less likely \ to hit you. The field lasts for 10 minutes and can be granted to yourself or an ally." cost = 25 - obj_path = /obj/item/weapon/spell/modifier/repel_missiles + obj_path = /obj/item/spell/modifier/repel_missiles ability_icon_state = "tech_repelmissiles" category = SUPPORT_SPELLS -/obj/item/weapon/spell/modifier/repel_missiles +/obj/item/spell/modifier/repel_missiles name = "repel missiles" desc = "Use it before they start shooting at you!" icon_state = "generic" diff --git a/code/game/gamemodes/technomancer/spells/oxygenate.dm b/code/game/gamemodes/technomancer/spells/oxygenate.dm index b36f17c7260..eafd2cd7bdb 100644 --- a/code/game/gamemodes/technomancer/spells/oxygenate.dm +++ b/code/game/gamemodes/technomancer/spells/oxygenate.dm @@ -3,11 +3,11 @@ desc = "This function creates oxygen at a location of your chosing. If used on a humanoid entity, it heals oxygen deprivation. \ If casted on the envirnment, air (oxygen and nitrogen) is moved from a distant location to your target." cost = 25 - obj_path = /obj/item/weapon/spell/oxygenate + obj_path = /obj/item/spell/oxygenate ability_icon_state = "tech_oxygenate" category = SUPPORT_SPELLS -/obj/item/weapon/spell/oxygenate +/obj/item/spell/oxygenate name = "oxygenate" desc = "Atmospherics is obsolete." icon_state = "darkness" //wip @@ -15,7 +15,7 @@ aspect = ASPECT_AIR cooldown = 30 -/obj/item/weapon/spell/oxygenate/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/oxygenate/on_ranged_cast(atom/hit_atom, mob/user) if(!within_range(hit_atom)) return if(ishuman(hit_atom)) diff --git a/code/game/gamemodes/technomancer/spells/passwall.dm b/code/game/gamemodes/technomancer/spells/passwall.dm index b5e0b180600..f7266b7719d 100644 --- a/code/game/gamemodes/technomancer/spells/passwall.dm +++ b/code/game/gamemodes/technomancer/spells/passwall.dm @@ -4,11 +4,11 @@ somewhere dangerous." enhancement_desc = "Cost per tile is halved." cost = 100 - obj_path = /obj/item/weapon/spell/passwall + obj_path = /obj/item/spell/passwall ability_icon_state = "tech_passwall" category = UTILITY_SPELLS -/obj/item/weapon/spell/passwall +/obj/item/spell/passwall name = "passwall" desc = "No walls can hold you back." cast_methods = CAST_MELEE @@ -16,7 +16,7 @@ var/maximum_distance = 20 //Measured in tiles. var/busy = 0 -/obj/item/weapon/spell/passwall/on_melee_cast(atom/hit_atom, mob/user) +/obj/item/spell/passwall/on_melee_cast(atom/hit_atom, mob/user) if(busy) //Prevent someone from trying to get two uses of the spell from one instance. return 0 if(!allowed_to_teleport()) diff --git a/code/game/gamemodes/technomancer/spells/phase_shift.dm b/code/game/gamemodes/technomancer/spells/phase_shift.dm index 7cee437685a..ef1a8e10524 100644 --- a/code/game/gamemodes/technomancer/spells/phase_shift.dm +++ b/code/game/gamemodes/technomancer/spells/phase_shift.dm @@ -3,11 +3,11 @@ desc = "Hides you in the safest possible place, where no harm can come to you. Unfortunately, a prolonged stay inside the \ rift you create will afflict you with instability." cost = 50 - obj_path = /obj/item/weapon/spell/phase_shift + obj_path = /obj/item/spell/phase_shift ability_icon_state = "tech_phaseshift" category = DEFENSIVE_SPELLS -/obj/item/weapon/spell/phase_shift +/obj/item/spell/phase_shift name = "phase shift" desc = "Allows you to dodge your untimely fate by shifting your location somewhere else, so long as you can survive inside the \ rift." @@ -15,7 +15,7 @@ cast_methods = CAST_USE aspect = ASPECT_TELE -/obj/item/weapon/spell/phase_shift/New() +/obj/item/spell/phase_shift/New() ..() set_light(3, 2, l_color = "#FA58F4") @@ -51,7 +51,7 @@ user.forceMove(get_turf(src)) qdel(src) -/obj/item/weapon/spell/phase_shift/on_use_cast(mob/user) +/obj/item/spell/phase_shift/on_use_cast(mob/user) if(isturf(user.loc)) //Check if we're not already in a rift. if(pay_energy(2000)) var/obj/effect/phase_shift/PS = new(get_turf(user)) diff --git a/code/game/gamemodes/technomancer/spells/projectile/beam.dm b/code/game/gamemodes/technomancer/spells/projectile/beam.dm index b96f061df8c..35e98e4d2cf 100644 --- a/code/game/gamemodes/technomancer/spells/projectile/beam.dm +++ b/code/game/gamemodes/technomancer/spells/projectile/beam.dm @@ -4,10 +4,10 @@ spell_power_desc = "Increases damage dealt." cost = 100 ability_icon_state = "tech_beam" - obj_path = /obj/item/weapon/spell/projectile/beam + obj_path = /obj/item/spell/projectile/beam category = OFFENSIVE_SPELLS -/obj/item/weapon/spell/projectile/beam +/obj/item/spell/projectile/beam name = "beam" icon_state = "beam" desc = "Boring, but practical." diff --git a/code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm b/code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm index 2d9a59f1444..d7138e37401 100644 --- a/code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm +++ b/code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm @@ -4,11 +4,11 @@ it does not bounce to you. The lighting prefers to bounce to people with the least resistance to electricity. It will \ strike up to four targets, including yourself if conditions allow it to occur. Lightning functions cannot miss due to distance." cost = 150 - obj_path = /obj/item/weapon/spell/projectile/chain_lightning + obj_path = /obj/item/spell/projectile/chain_lightning ability_icon_state = "tech_chain_lightning" category = OFFENSIVE_SPELLS -/obj/item/weapon/spell/projectile/chain_lightning +/obj/item/spell/projectile/chain_lightning name = "chain lightning" icon_state = "chain_lightning" desc = "Fun for the whole security team! Just don't kill yourself in the process.." diff --git a/code/game/gamemodes/technomancer/spells/projectile/force_missile.dm b/code/game/gamemodes/technomancer/spells/projectile/force_missile.dm index 282d914d3cd..709025d9a90 100644 --- a/code/game/gamemodes/technomancer/spells/projectile/force_missile.dm +++ b/code/game/gamemodes/technomancer/spells/projectile/force_missile.dm @@ -4,10 +4,10 @@ that armor designed to protect from blunt force will mitigate this function as well." spell_power_desc = "Increases damage dealt." cost = 50 - obj_path = /obj/item/weapon/spell/projectile/force_missile + obj_path = /obj/item/spell/projectile/force_missile category = OFFENSIVE_SPELLS -/obj/item/weapon/spell/projectile/force_missile +/obj/item/spell/projectile/force_missile name = "force missile" icon_state = "force_missile" desc = "Make it rain!" diff --git a/code/game/gamemodes/technomancer/spells/projectile/ionic_bolt.dm b/code/game/gamemodes/technomancer/spells/projectile/ionic_bolt.dm index d6665b2ee0d..cb70d144b85 100644 --- a/code/game/gamemodes/technomancer/spells/projectile/ionic_bolt.dm +++ b/code/game/gamemodes/technomancer/spells/projectile/ionic_bolt.dm @@ -3,10 +3,10 @@ desc = "Shoots a bolt of ion energy at the target. If it hits something, it will generally drain energy, corrupt electronics, \ or otherwise ruin complex machinery." cost = 50 - obj_path = /obj/item/weapon/spell/projectile/ionic_bolt + obj_path = /obj/item/spell/projectile/ionic_bolt category = OFFENSIVE_SPELLS -/obj/item/weapon/spell/projectile/ionic_bolt +/obj/item/spell/projectile/ionic_bolt name = "ionic bolt" icon_state = "ionic bolt" desc = "For those pesky security units." diff --git a/code/game/gamemodes/technomancer/spells/projectile/lesser_chain_lightning.dm b/code/game/gamemodes/technomancer/spells/projectile/lesser_chain_lightning.dm index 85881fefb07..8c2b7709ace 100644 --- a/code/game/gamemodes/technomancer/spells/projectile/lesser_chain_lightning.dm +++ b/code/game/gamemodes/technomancer/spells/projectile/lesser_chain_lightning.dm @@ -3,11 +3,11 @@ desc = "This is very similar to the function Chain Lightning, however it is considerably less powerful. As a result, it's a lot \ more economical in terms of energy cost, as well as instability generation. Lightning functions cannot miss due to distance." cost = 100 - obj_path = /obj/item/weapon/spell/projectile/chain_lightning/lesser + obj_path = /obj/item/spell/projectile/chain_lightning/lesser ability_icon_state = "tech_chain_lightning" category = OFFENSIVE_SPELLS -/obj/item/weapon/spell/projectile/chain_lightning/lesser +/obj/item/spell/projectile/chain_lightning/lesser name = "lesser chain lightning" icon_state = "chain_lightning" desc = "Now you can throw around lightning like it's nobody's business." diff --git a/code/game/gamemodes/technomancer/spells/projectile/lightning.dm b/code/game/gamemodes/technomancer/spells/projectile/lightning.dm index 57e42cf8634..de5dbabc6ca 100644 --- a/code/game/gamemodes/technomancer/spells/projectile/lightning.dm +++ b/code/game/gamemodes/technomancer/spells/projectile/lightning.dm @@ -4,10 +4,10 @@ for a directed lightning strike to occur. The lightning is very strong, however it requires a few seconds to prepare a \ strike. Lightning functions cannot miss due to distance." cost = 150 - obj_path = /obj/item/weapon/spell/projectile/lightning + obj_path = /obj/item/spell/projectile/lightning category = OFFENSIVE_SPELLS -/obj/item/weapon/spell/projectile/lightning +/obj/item/spell/projectile/lightning name = "lightning strike" icon_state = "lightning_strike" desc = "Now you can feel like Zeus." diff --git a/code/game/gamemodes/technomancer/spells/projectile/overload.dm b/code/game/gamemodes/technomancer/spells/projectile/overload.dm index 445c1bb577c..650ab470682 100644 --- a/code/game/gamemodes/technomancer/spells/projectile/overload.dm +++ b/code/game/gamemodes/technomancer/spells/projectile/overload.dm @@ -5,11 +5,11 @@ enhancement_desc = "Will do damage equal to 0.4% of current energy." spell_power_desc = "Increases damage dealt, up to a cap of 80 damage per shot." cost = 100 - obj_path = /obj/item/weapon/spell/projectile/overload + obj_path = /obj/item/spell/projectile/overload ability_icon_state = "tech_overload" category = OFFENSIVE_SPELLS -/obj/item/weapon/spell/projectile/overload +/obj/item/spell/projectile/overload name = "overload" icon_state = "overload" desc = "Hope your Core's full." @@ -30,7 +30,7 @@ impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser hitsound_wall = 'sound/weapons/effects/searwall.ogg' -/obj/item/weapon/spell/projectile/overload/make_projectile(obj/item/projectile/projectile_type, mob/living/user) +/obj/item/spell/projectile/overload/make_projectile(obj/item/projectile/projectile_type, mob/living/user) var/obj/item/projectile/overload/P = new projectile_type(get_turf(user)) var/energy_before_firing = core.energy if(check_for_scepter()) @@ -40,7 +40,7 @@ P.damage = min(calculate_spell_power(P.damage), 80) return P -/obj/item/weapon/spell/projectile/overload/on_ranged_cast(atom/hit_atom, mob/living/user) +/obj/item/spell/projectile/overload/on_ranged_cast(atom/hit_atom, mob/living/user) energy_cost_per_shot = round(core.max_energy * 0.10) ..() /* var/energy_before_firing = core.energy diff --git a/code/game/gamemodes/technomancer/spells/projectile/projectile.dm b/code/game/gamemodes/technomancer/spells/projectile/projectile.dm index 7585c3a191a..8e93a41d151 100644 --- a/code/game/gamemodes/technomancer/spells/projectile/projectile.dm +++ b/code/game/gamemodes/technomancer/spells/projectile/projectile.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/spell/projectile +/obj/item/spell/projectile name = "projectile template" icon_state = "generic" desc = "This is a generic template that shoots projectiles. If you can read this, the game broke!" @@ -9,7 +9,7 @@ var/pre_shot_delay = 0 var/fire_sound = null -/obj/item/weapon/spell/projectile/on_ranged_cast(atom/hit_atom, mob/living/user) +/obj/item/spell/projectile/on_ranged_cast(atom/hit_atom, mob/living/user) if(set_up(hit_atom, user)) var/obj/item/projectile/new_projectile = make_projectile(spell_projectile, user) new_projectile.old_style_target(hit_atom) @@ -21,12 +21,12 @@ return 1 return 0 -/obj/item/weapon/spell/projectile/proc/make_projectile(obj/item/projectile/projectile_type, mob/living/user) +/obj/item/spell/projectile/proc/make_projectile(obj/item/projectile/projectile_type, mob/living/user) var/obj/item/projectile/P = new projectile_type(get_turf(user)) P.damage = calculate_spell_power(P.damage) return P -/obj/item/weapon/spell/projectile/proc/set_up(atom/hit_atom, mob/living/user) +/obj/item/spell/projectile/proc/set_up(atom/hit_atom, mob/living/user) if(spell_projectile) if(pay_energy(energy_cost_per_shot)) if(pre_shot_delay) diff --git a/code/game/gamemodes/technomancer/spells/radiance.dm b/code/game/gamemodes/technomancer/spells/radiance.dm index d86428354e4..a84521cf82d 100644 --- a/code/game/gamemodes/technomancer/spells/radiance.dm +++ b/code/game/gamemodes/technomancer/spells/radiance.dm @@ -5,10 +5,10 @@ enhancement_desc = "Radiation will not affect the caster or their allies." spell_power_desc = "Spell power increases the amount of radiation and heat radiated, as well as the radius." cost = 100 - obj_path = /obj/item/weapon/spell/radiance + obj_path = /obj/item/spell/radiance category = OFFENSIVE_SPELLS -/obj/item/weapon/spell/radiance +/obj/item/spell/radiance name = "radiance" desc = "You will glow with a radiance similar to that of Supermatter." icon_state = "radiance" @@ -16,18 +16,18 @@ var/power = 250 toggled = 1 -/obj/item/weapon/spell/radiance/New() +/obj/item/spell/radiance/New() ..() set_light(7, 4, l_color = "#D9D900") START_PROCESSING(SSobj, src) log_and_message_admins("has casted [src].") -/obj/item/weapon/spell/radiance/Destroy() +/obj/item/spell/radiance/Destroy() STOP_PROCESSING(SSobj, src) log_and_message_admins("has stopped maintaining [src].") return ..() -/obj/item/weapon/spell/radiance/process() +/obj/item/spell/radiance/process() var/turf/T = get_turf(src) var/datum/gas_mixture/removed = null var/datum/gas_mixture/env = null diff --git a/code/game/gamemodes/technomancer/spells/reflect.dm b/code/game/gamemodes/technomancer/spells/reflect.dm index 07f3595edaa..24fe7f79a5e 100644 --- a/code/game/gamemodes/technomancer/spells/reflect.dm +++ b/code/game/gamemodes/technomancer/spells/reflect.dm @@ -2,11 +2,11 @@ name = "Reflect" desc = "Emits a protective shield fron your hand in front of you, which will reflect one attack back at the attacker." cost = 100 - obj_path = /obj/item/weapon/spell/reflect + obj_path = /obj/item/spell/reflect ability_icon_state = "tech_reflect" category = DEFENSIVE_SPELLS -/obj/item/weapon/spell/reflect +/obj/item/spell/reflect name = "\proper reflect shield" icon_state = "reflect" desc = "A very protective combat shield that'll reflect the next attack at the unfortunate person who tried to shoot you." @@ -16,7 +16,7 @@ var/damage_to_energy_multiplier = 60.0 //Determines how much energy to charge for blocking, e.g. 20 damage attack = 1200 energy cost var/datum/effect/effect/system/spark_spread/spark_system = null -/obj/item/weapon/spell/reflect/New() +/obj/item/spell/reflect/New() ..() set_light(3, 2, l_color = "#006AFF") spark_system = new /datum/effect/effect/system/spark_spread() @@ -24,13 +24,13 @@ to_chat(owner, "Your shield will expire in 5 seconds!") QDEL_IN(src, 5 SECONDS) -/obj/item/weapon/spell/reflect/Destroy() +/obj/item/spell/reflect/Destroy() if(owner) to_chat(owner, "Your shield expires!") spark_system = null return ..() -/obj/item/weapon/spell/reflect/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/spell/reflect/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(user.incapacitated()) return 0 @@ -72,8 +72,8 @@ return PROJECTILE_CONTINUE // complete projectile permutation - else if(istype(damage_source, /obj/item/weapon)) - var/obj/item/weapon/W = damage_source + else if(istype(damage_source, /obj/item)) + var/obj/item/W = damage_source if(attacker) W.attack(attacker) to_chat(attacker, "Your [damage_source.name] goes through \the [src] in one location, comes out \ diff --git a/code/game/gamemodes/technomancer/spells/resurrect.dm b/code/game/gamemodes/technomancer/spells/resurrect.dm index 41dc9ce34f6..576ec573584 100644 --- a/code/game/gamemodes/technomancer/spells/resurrect.dm +++ b/code/game/gamemodes/technomancer/spells/resurrect.dm @@ -4,18 +4,18 @@ however this must be done soon after they die, as this will have no effect on people who have died long ago. It also doesn't \ resolve whatever caused them to die originally." cost = 100 - obj_path = /obj/item/weapon/spell/resurrect + obj_path = /obj/item/spell/resurrect ability_icon_state = "tech_resurrect" category = SUPPORT_SPELLS -/obj/item/weapon/spell/resurrect +/obj/item/spell/resurrect name = "resurrect" icon_state = "radiance" desc = "Perhaps this can save a trip to cloning?" cast_methods = CAST_MELEE aspect = ASPECT_BIOMED -/obj/item/weapon/spell/resurrect/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) +/obj/item/spell/resurrect/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) if(isliving(hit_atom)) var/mob/living/L = hit_atom if(L == user) diff --git a/code/game/gamemodes/technomancer/spells/shared_burden.dm b/code/game/gamemodes/technomancer/spells/shared_burden.dm index 5c331389690..766d88b43d9 100644 --- a/code/game/gamemodes/technomancer/spells/shared_burden.dm +++ b/code/game/gamemodes/technomancer/spells/shared_burden.dm @@ -3,17 +3,17 @@ desc = "One of the few functions able to adjust instability, this allows you to take someone else's instability." spell_power_desc = "Draws bonus instability from the target, with the bonus dissipating harmlessly, for 'free'." cost = 50 - obj_path = /obj/item/weapon/spell/shared_burden + obj_path = /obj/item/spell/shared_burden category = SUPPORT_SPELLS -/obj/item/weapon/spell/shared_burden +/obj/item/spell/shared_burden name = "shared burden" icon_state = "shared_burden" desc = "Send instability from the target to you, for whatever reason you'd want to." cast_methods = CAST_MELEE aspect = ASPECT_UNSTABLE -/obj/item/weapon/spell/shared_burden/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) +/obj/item/spell/shared_burden/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) if(ishuman(hit_atom) && within_range(hit_atom)) var/mob/living/carbon/human/H = hit_atom if(H == user) diff --git a/code/game/gamemodes/technomancer/spells/shield.dm b/code/game/gamemodes/technomancer/spells/shield.dm index b11d5590b08..fb08128e6d9 100644 --- a/code/game/gamemodes/technomancer/spells/shield.dm +++ b/code/game/gamemodes/technomancer/spells/shield.dm @@ -5,11 +5,11 @@ Note that holding two shields will make blocking more energy efficent." enhancement_desc = "Blocking is twice as efficent in terms of energy cost per hit." cost = 100 - obj_path = /obj/item/weapon/spell/shield + obj_path = /obj/item/spell/shield ability_icon_state = "tech_shield" category = DEFENSIVE_SPELLS -/obj/item/weapon/spell/shield +/obj/item/spell/shield name = "\proper energy shield" icon_state = "shield" desc = "A very protective combat shield that'll stop almost anything from hitting you, at least from the front." @@ -18,17 +18,17 @@ var/damage_to_energy_multiplier = 30.0 //Determines how much energy to charge for blocking, e.g. 20 damage attack = 600 energy cost var/datum/effect/effect/system/spark_spread/spark_system = null -/obj/item/weapon/spell/shield/New() +/obj/item/spell/shield/New() ..() set_light(3, 2, l_color = "#006AFF") spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src) -/obj/item/weapon/spell/shield/Destroy() +/obj/item/spell/shield/Destroy() spark_system = null return ..() -/obj/item/weapon/spell/shield/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/spell/shield/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(user.incapacitated()) return 0 diff --git a/code/game/gamemodes/technomancer/spells/spawner/darkness.dm b/code/game/gamemodes/technomancer/spells/spawner/darkness.dm index f54f9b75025..0d7d8204233 100644 --- a/code/game/gamemodes/technomancer/spells/spawner/darkness.dm +++ b/code/game/gamemodes/technomancer/spells/spawner/darkness.dm @@ -2,10 +2,10 @@ name = "Darkness" desc = "Disrupts photons moving in a local area, causing darkness to shroud yourself or a position of your choosing." cost = 25 - obj_path = /obj/item/weapon/spell/spawner/darkness + obj_path = /obj/item/spell/spawner/darkness category = UTILITY_SPELLS -/obj/item/weapon/spell/spawner/darkness +/obj/item/spell/spawner/darkness name = "darkness" desc = "Not even light can stand in your way now." icon_state = "darkness" @@ -13,12 +13,12 @@ aspect = ASPECT_DARK spawner_type = /obj/effect/temporary_effect/darkness -/obj/item/weapon/spell/spawner/darkness/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/spawner/darkness/on_ranged_cast(atom/hit_atom, mob/user) if(pay_energy(500)) adjust_instability(4) ..() -/obj/item/weapon/spell/spawner/darkness/New() +/obj/item/spell/spawner/darkness/New() ..() set_light(6, -20, l_color = "#FFFFFF") diff --git a/code/game/gamemodes/technomancer/spells/spawner/destablize.dm b/code/game/gamemodes/technomancer/spells/spawner/destablize.dm index 9bf6b072812..d491ce60fa5 100644 --- a/code/game/gamemodes/technomancer/spells/spawner/destablize.dm +++ b/code/game/gamemodes/technomancer/spells/spawner/destablize.dm @@ -3,10 +3,10 @@ desc = "Creates an unstable disturbance at the targeted tile, which will afflict anyone nearby with instability who remains nearby. This can affect you \ and your allies as well. The disturbance lasts for twenty seconds." cost = 100 - obj_path = /obj/item/weapon/spell/spawner/destablize + obj_path = /obj/item/spell/spawner/destablize category = OFFENSIVE_SPELLS -/obj/item/weapon/spell/spawner/destablize +/obj/item/spell/spawner/destablize name = "destablize" desc = "Now your enemies can feel what you go through when you have too much fun." icon_state = "destablize" @@ -14,11 +14,11 @@ aspect = ASPECT_UNSTABLE spawner_type = /obj/effect/temporary_effect/destablize -/obj/item/weapon/spell/spawner/destablize/New() +/obj/item/spell/spawner/destablize/New() ..() set_light(3, 2, l_color = "#C26DDE") -/obj/item/weapon/spell/spawner/destablize/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/spawner/destablize/on_ranged_cast(atom/hit_atom, mob/user) if(within_range(hit_atom) && pay_energy(2000)) adjust_instability(15) ..() diff --git a/code/game/gamemodes/technomancer/spells/spawner/fire_blast.dm b/code/game/gamemodes/technomancer/spells/spawner/fire_blast.dm index 69444a4c7b1..7a785f6b864 100644 --- a/code/game/gamemodes/technomancer/spells/spawner/fire_blast.dm +++ b/code/game/gamemodes/technomancer/spells/spawner/fire_blast.dm @@ -3,10 +3,10 @@ desc = "Causes a disturbance on a targeted tile. After two and a half seconds, it will explode in a small radius around it. Be \ sure to not be close to the disturbance yourself." cost = 175 - obj_path = /obj/item/weapon/spell/spawner/fire_blast + obj_path = /obj/item/spell/spawner/fire_blast category = OFFENSIVE_SPELLS -/obj/item/weapon/spell/spawner/fire_blast +/obj/item/spell/spawner/fire_blast name = "fire blast" desc = "Leading your booms might be needed." icon_state = "fire_blast" @@ -14,7 +14,7 @@ aspect = ASPECT_FIRE spawner_type = /obj/effect/temporary_effect/fire_blast -/obj/item/weapon/spell/spawner/fire_blast/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/spawner/fire_blast/on_ranged_cast(atom/hit_atom, mob/user) if(within_range(hit_atom) && pay_energy(2000)) adjust_instability(12) ..() // Makes the booms happen. diff --git a/code/game/gamemodes/technomancer/spells/spawner/pulsar.dm b/code/game/gamemodes/technomancer/spells/spawner/pulsar.dm index b56ea64e9cf..aa30601bcfc 100644 --- a/code/game/gamemodes/technomancer/spells/spawner/pulsar.dm +++ b/code/game/gamemodes/technomancer/spells/spawner/pulsar.dm @@ -2,10 +2,10 @@ name = "Pulsar" desc = "Emits electronic pulses to destroy, disable, or otherwise harm devices and machines. Be sure to not hit yourself with this." cost = 100 - obj_path = /obj/item/weapon/spell/spawner/pulsar + obj_path = /obj/item/spell/spawner/pulsar category = OFFENSIVE_SPELLS -/obj/item/weapon/spell/spawner/pulsar +/obj/item/spell/spawner/pulsar name = "pulsar" desc = "Be sure to not hit yourself!" icon_state = "radiance" @@ -13,16 +13,16 @@ aspect = ASPECT_EMP spawner_type = /obj/effect/temporary_effect/pulse/pulsar -/obj/item/weapon/spell/spawner/pulsar/New() +/obj/item/spell/spawner/pulsar/New() ..() set_light(3, 2, l_color = "#2ECCFA") -/obj/item/weapon/spell/spawner/pulsar/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/spawner/pulsar/on_ranged_cast(atom/hit_atom, mob/user) if(within_range(hit_atom) && pay_energy(4000)) adjust_instability(8) ..() -/obj/item/weapon/spell/spawner/pulsar/on_throw_cast(atom/hit_atom, mob/user) +/obj/item/spell/spawner/pulsar/on_throw_cast(atom/hit_atom, mob/user) empulse(hit_atom, 1, 1, 1, 1, log=1) // Does something every so often. Deletes itself when pulses_remaining hits zero. diff --git a/code/game/gamemodes/technomancer/spells/spawner/spawner.dm b/code/game/gamemodes/technomancer/spells/spawner/spawner.dm index 49c82b79984..47c2a264ade 100644 --- a/code/game/gamemodes/technomancer/spells/spawner/spawner.dm +++ b/code/game/gamemodes/technomancer/spells/spawner/spawner.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/spell/spawner +/obj/item/spell/spawner name = "spawner template" desc = "If you see me, someone messed up." icon_state = "darkness" @@ -6,7 +6,7 @@ aspect = null var/obj/effect/spawner_type = null -/obj/item/weapon/spell/spawner/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/spawner/on_ranged_cast(atom/hit_atom, mob/user) var/turf/T = get_turf(hit_atom) if(T) new spawner_type(T) diff --git a/code/game/gamemodes/technomancer/spells/summon/summon.dm b/code/game/gamemodes/technomancer/spells/summon/summon.dm index 3f39f7d9601..d47562b31d9 100644 --- a/code/game/gamemodes/technomancer/spells/summon/summon.dm +++ b/code/game/gamemodes/technomancer/spells/summon/summon.dm @@ -1,7 +1,7 @@ /mob/living/ var/summoned = 0 -/obj/item/weapon/spell/summon +/obj/item/spell/summon name = "summon template" desc = "Chitter chitter." cast_methods = CAST_RANGED | CAST_USE @@ -11,7 +11,7 @@ var/energy_cost = 0 var/instability_cost = 0 -/obj/item/weapon/spell/summon/on_ranged_cast(atom/hit_atom, mob/living/user) +/obj/item/spell/summon/on_ranged_cast(atom/hit_atom, mob/living/user) var/turf/T = get_turf(hit_atom) if(summoned_mob_type && core.summoned_mobs.len < core.max_summons && within_range(hit_atom) && pay_energy(energy_cost)) var/obj/effect/E = new(T) @@ -32,12 +32,12 @@ log_and_message_admins("has summoned \a [L] at [T.x],[T.y],[T.z].") user.adjust_instability(instability_cost) -/obj/item/weapon/spell/summon/on_use_cast(mob/living/user) +/obj/item/spell/summon/on_use_cast(mob/living/user) if(summon_options.len) var/choice = tgui_input_list(user, "Choose a creature to kidnap from somewhere!", "Summon", summon_options) if(choice) summoned_mob_type = summon_options[choice] // Called when a new mob is summoned, override for special behaviour. -/obj/item/weapon/spell/summon/proc/on_summon(var/mob/living/summoned) +/obj/item/spell/summon/proc/on_summon(var/mob/living/summoned) return \ No newline at end of file diff --git a/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm b/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm index e5ba7c94f17..d26a35f78a0 100644 --- a/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm +++ b/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm @@ -8,10 +8,10 @@ enhancement_desc = "Summoned entities will never harm their summoner." spell_power_desc = "The strength and endurance of the summoned creature will be greater." cost = 100 - obj_path = /obj/item/weapon/spell/summon/summon_creature + obj_path = /obj/item/spell/summon/summon_creature category = UTILITY_SPELLS -/obj/item/weapon/spell/summon/summon_creature +/obj/item/spell/summon/summon_creature name = "summon creature" desc = "Chitter chitter." summoned_mob_type = null @@ -37,7 +37,7 @@ instability_cost = 10 energy_cost = 1000 -/obj/item/weapon/spell/summon/summon_creature/on_summon(var/mob/living/simple_mob/summoned) +/obj/item/spell/summon/summon_creature/on_summon(var/mob/living/simple_mob/summoned) if(check_for_scepter()) // summoned.faction = FACTION_TECHNOMANCER summoned.friends += owner diff --git a/code/game/gamemodes/technomancer/spells/summon/summon_ward.dm b/code/game/gamemodes/technomancer/spells/summon/summon_ward.dm index 95000445813..3908d0fb894 100644 --- a/code/game/gamemodes/technomancer/spells/summon/summon_ward.dm +++ b/code/game/gamemodes/technomancer/spells/summon/summon_ward.dm @@ -4,10 +4,10 @@ moving around it, or when it is attacked. They can see for up to five meters. It can also see invisible entities, and \ forcefully decloak them if close enough." cost = 25 - obj_path = /obj/item/weapon/spell/summon/summon_ward + obj_path = /obj/item/spell/summon/summon_ward category = UTILITY_SPELLS -/obj/item/weapon/spell/summon/summon_ward +/obj/item/spell/summon/summon_ward name = "summon ward" desc = "Finally, someone you can depend on to watch your back." cast_methods = CAST_RANGED @@ -16,5 +16,5 @@ instability_cost = 5 energy_cost = 500 -/obj/item/weapon/spell/summon/summon_ward/on_summon(var/mob/living/simple_mob/mechanical/ward/monitor/my_ward) +/obj/item/spell/summon/summon_ward/on_summon(var/mob/living/simple_mob/mechanical/ward/monitor/my_ward) my_ward.owner = owner diff --git a/code/game/gamemodes/technomancer/spells/targeting_matrix.dm b/code/game/gamemodes/technomancer/spells/targeting_matrix.dm index b227748aebe..4ead252ceb1 100644 --- a/code/game/gamemodes/technomancer/spells/targeting_matrix.dm +++ b/code/game/gamemodes/technomancer/spells/targeting_matrix.dm @@ -4,17 +4,17 @@ Each target assisted attack costs some energy and instability." cost = 50 ability_icon_state = "tech_targetingmatrix" - obj_path = /obj/item/weapon/spell/targeting_matrix + obj_path = /obj/item/spell/targeting_matrix category = UTILITY_SPELLS -/obj/item/weapon/spell/targeting_matrix +/obj/item/spell/targeting_matrix name = "targeting matrix" desc = "Aiming is too much effort for you." icon_state = "targeting_matrix" cast_methods = CAST_RANGED aspect = ASPECT_FORCE //idk? -/obj/item/weapon/spell/targeting_matrix/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/targeting_matrix/on_ranged_cast(atom/hit_atom, mob/user) var/turf/T = get_turf(hit_atom) if(T) var/mob/living/chosen_target = targeting_assist(T,5) //The person who's about to get attacked. diff --git a/code/game/gamemodes/technomancer/spells/track.dm b/code/game/gamemodes/technomancer/spells/track.dm index 461c4e83913..b0ba7daad36 100644 --- a/code/game/gamemodes/technomancer/spells/track.dm +++ b/code/game/gamemodes/technomancer/spells/track.dm @@ -4,7 +4,7 @@ Wonderful if you're worried someone will steal your valuables, like a certain shiny Scepter..." enhancement_desc = "You will be able to track most other entities in addition to your belongings and allies." cost = 25 - obj_path = /obj/item/weapon/spell/track + obj_path = /obj/item/spell/track ability_icon_state = "tech_track" category = UTILITY_SPELLS @@ -12,7 +12,7 @@ // I feel dirty for adding yet another global list used by one thing, but the only alternative is to loop through world, and yeahhh. var/list/technomancer_belongings = list() -/obj/item/weapon/spell/track +/obj/item/spell/track name = "track" icon_state = "track" desc = "Never lose your stuff again!" @@ -21,12 +21,12 @@ var/list/technomancer_belongings = list() var/atom/movable/tracked = null // The thing to point towards. var/tracking = 0 // If one, points towards tracked. -/obj/item/weapon/spell/track/Destroy() +/obj/item/spell/track/Destroy() tracked = null tracking = 0 return ..() -/obj/item/weapon/spell/track/on_use_cast(mob/user) +/obj/item/spell/track/on_use_cast(mob/user) if(tracking) tracking = 0 to_chat(user, "You stop tracking for \the [tracked]'s whereabouts.") @@ -50,7 +50,7 @@ var/list/technomancer_belongings = list() tracking = 1 track() -/obj/item/weapon/spell/track/proc/track() +/obj/item/spell/track/proc/track() if(!tracking) icon_state = "track" return diff --git a/code/game/gamemodes/technomancer/spells/warp_strike.dm b/code/game/gamemodes/technomancer/spells/warp_strike.dm index 83a2336ab69..d22655180f4 100644 --- a/code/game/gamemodes/technomancer/spells/warp_strike.dm +++ b/code/game/gamemodes/technomancer/spells/warp_strike.dm @@ -2,11 +2,11 @@ name = "Warp Strike" desc = "Teleports you next to your target, and attacks them with whatever is in your off-hand, spell or object." cost = 100 - obj_path = /obj/item/weapon/spell/warp_strike + obj_path = /obj/item/spell/warp_strike ability_icon_state = "tech_warpstrike" category = OFFENSIVE_SPELLS -/obj/item/weapon/spell/warp_strike +/obj/item/spell/warp_strike name = "warp strike" desc = "The answer to the problem of bringing a knife to a gun fight." icon_state = "warp_strike" @@ -14,13 +14,13 @@ aspect = ASPECT_TELE var/datum/effect/effect/system/spark_spread/sparks -/obj/item/weapon/spell/warp_strike/New() +/obj/item/spell/warp_strike/New() ..() sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(5, 0, src) sparks.attach(loc) -/obj/item/weapon/spell/warp_strike/on_ranged_cast(atom/hit_atom, mob/user) +/obj/item/spell/warp_strike/on_ranged_cast(atom/hit_atom, mob/user) var/turf/T = get_turf(hit_atom) if(T) if(!within_range(T)) @@ -57,9 +57,9 @@ var/obj/item/I = user.get_inactive_hand() // List of items we don't want used, for balance reasons or to avoid infinite loops. var/list/blacklisted_items = list( - /obj/item/weapon/gun, - /obj/item/weapon/spell/warp_strike, - /obj/item/weapon/spell/targeting_matrix + /obj/item/gun, + /obj/item/spell/warp_strike, + /obj/item/spell/targeting_matrix ) if(I) @@ -67,8 +67,8 @@ to_chat(user, "You can't use \the [I] while warping!") return - if(istype(I, /obj/item/weapon)) - var/obj/item/weapon/W = I + if(istype(I, /obj/item)) + var/obj/item/W = I W.attack(chosen_target, user) W.afterattack(chosen_target, user) else diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index c779487d7e6..a6ab070e95a 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -6,7 +6,7 @@ return check_access(M?.GetIdCard()) /atom/movable/proc/GetAccess() - var/obj/item/weapon/card/id/id = GetIdCard() + var/obj/item/card/id/id = GetIdCard() return id ? id.GetAccess() : list() /obj/proc/GetID() @@ -231,7 +231,7 @@ /proc/FindNameFromID(var/mob/living/carbon/human/H) ASSERT(istype(H)) - var/obj/item/weapon/card/id/C = H.GetIdCard() + var/obj/item/card/id/C = H.GetIdCard() if(C) return C.registered_name @@ -239,10 +239,10 @@ return joblist + alt_titles_with_icons + list("Prisoner") /obj/proc/GetJobName() //Used in secHUD icon generation - var/obj/item/weapon/card/id/I = GetID() + var/obj/item/card/id/I = GetID() if(I) - if(istype(I,/obj/item/weapon/card/id/centcom)) + if(istype(I,/obj/item/card/id/centcom)) return "Centcom" var/job_icons = get_all_job_icons() diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index afeac415c97..1220e3ee88f 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -28,15 +28,15 @@ if(!ask_questions) return - var/obj/item/weapon/storage/bible/B = locate(/obj/item/weapon/storage/bible) in H - var/obj/item/weapon/card/id/I = locate(/obj/item/weapon/card/id) in H + var/obj/item/storage/bible/B = locate(/obj/item/storage/bible) in H + var/obj/item/card/id/I = locate(/obj/item/card/id) in H if(!B || !I) return INVOKE_ASYNC(src, PROC_REF(religion_prompts), H, B, I) -/datum/job/chaplain/proc/religion_prompts(mob/living/carbon/human/H, obj/item/weapon/storage/bible/B, obj/item/weapon/card/id/I) +/datum/job/chaplain/proc/religion_prompts(mob/living/carbon/human/H, obj/item/storage/bible/B, obj/item/card/id/I) var/religion_name = "Unitarianism" var/new_religion = sanitize(input(H, "You are the crew services officer. Would you like to change your religion? Default is Unitarianism", "Name change", religion_name), MAX_NAME_LEN) if(!new_religion) diff --git a/code/game/jobs/job/exploration_vr.dm b/code/game/jobs/job/exploration_vr.dm index c6db8ecd57b..1beba46efb8 100644 --- a/code/game/jobs/job/exploration_vr.dm +++ b/code/game/jobs/job/exploration_vr.dm @@ -1,11 +1,11 @@ -/obj/item/weapon/card/id/medical/sar +/obj/item/card/id/medical/sar assignment = JOB_FIELD_MEDIC rank = JOB_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" @@ -13,7 +13,7 @@ secondary_color = rgb(127,223,223) rank = JOB_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" diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 8e62746632c..cad81921009 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -415,7 +415,7 @@ var/global/datum/controller/occupations/job_master // Implants get special treatment if(G.slot == "implant") - var/obj/item/weapon/implant/I = G.spawn_item(H, H.client.prefs.gear[G.display_name]) + var/obj/item/implant/I = G.spawn_item(H, H.client.prefs.gear[G.display_name]) I.invisibility = 100 I.implant_loadout(H) continue @@ -501,8 +501,8 @@ var/global/datum/controller/occupations/job_master //Deferred item spawning. if(spawn_in_storage && spawn_in_storage.len) - var/obj/item/weapon/storage/B - for(var/obj/item/weapon/storage/S in H.contents) + var/obj/item/storage/B + for(var/obj/item/storage/S in H.contents) B = S break @@ -518,7 +518,7 @@ var/global/datum/controller/occupations/job_master if(istype(H)) //give humans wheelchairs, if they need them. var/obj/item/organ/external/l_foot = H.get_organ("l_foot") var/obj/item/organ/external/r_foot = H.get_organ("r_foot") - var/obj/item/weapon/storage/S = locate() in H.contents + var/obj/item/storage/S = locate() in H.contents var/obj/item/wheelchair/R if(S) R = locate() in S.contents @@ -538,7 +538,7 @@ var/global/datum/controller/occupations/job_master if(job.supervisors) to_chat(H, "As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this.") if(job.has_headset) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_l_ear) + H.equip_to_slot_or_del(new /obj/item/radio/headset(H), slot_l_ear) to_chat(H, "To speak on your department's radio channel use :h. For the use of other channels, examine your headset.") if(job.req_admin_notify) diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index b9242059c90..fbb71dc9f09 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -8,12 +8,12 @@ anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 0 - var/obj/item/device/radio/beacon/Beacon + var/obj/item/radio/beacon/Beacon /obj/machinery/bluespace_beacon/New() ..() var/turf/T = src.loc - Beacon = new /obj/item/device/radio/beacon + Beacon = new /obj/item/radio/beacon Beacon.invisibility = INVISIBILITY_MAXIMUM Beacon.loc = T @@ -41,7 +41,7 @@ /obj/machinery/bluespace_beacon/process() if(!Beacon) var/turf/T = src.loc - Beacon = new /obj/item/device/radio/beacon + Beacon = new /obj/item/radio/beacon Beacon.invisibility = INVISIBILITY_MAXIMUM Beacon.loc = T if(Beacon) diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 2dbe70576e1..f7130034ffd 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -117,9 +117,9 @@ take_victim(user, user) -/obj/machinery/optable/attackby(obj/item/weapon/W, mob/living/carbon/user) - if(istype(W, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = W +/obj/machinery/optable/attackby(obj/item/W, mob/living/carbon/user) + if(istype(W, /obj/item/grab)) + var/obj/item/grab/G = W if(iscarbon(G.affecting) && check_table(G.affecting, user)) take_victim(G.affecting, user) qdel(W) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index bb86420b1c3..68ec7f0a5c8 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -11,7 +11,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 40 interact_offline = 1 - circuit = /obj/item/weapon/circuitboard/sleeper_console + circuit = /obj/item/circuitboard/sleeper_console clicksound = 'sound/machines/buttonbeep.ogg' clickvol = 30 @@ -91,12 +91,12 @@ density = TRUE anchored = TRUE unacidable = TRUE - circuit = /obj/item/weapon/circuitboard/sleeper + circuit = /obj/item/circuitboard/sleeper var/mob/living/carbon/human/occupant = null var/list/available_chemicals = list() var/list/base_chemicals = list("inaprovaline" = "Inaprovaline", "paracetamol" = "Paracetamol", "anti_toxin" = "Dylovene", "dexalin" = "Dexalin") var/amounts = list(5, 10) - var/obj/item/weapon/reagent_containers/glass/beaker = null + var/obj/item/reagent_containers/glass/beaker = null var/filtering = 0 var/pumping = 0 // Currently never changes. On Paradise, max_chem and min_health are based on the matter bins in the sleeper. @@ -115,7 +115,7 @@ /obj/machinery/sleeper/Initialize() . = ..() - beaker = new /obj/item/weapon/reagent_containers/glass/beaker/large(src) + beaker = new /obj/item/reagent_containers/glass/beaker/large(src) default_apply_parts() update_icon() @@ -131,8 +131,8 @@ available_chemicals.Cut() available_chemicals = base_chemicals.Copy() - for(var/obj/item/weapon/stock_parts/P in component_parts) - if(istype(P, /obj/item/weapon/stock_parts/capacitor)) + for(var/obj/item/stock_parts/P in component_parts) + if(istype(P, /obj/item/stock_parts/capacitor)) cap_rating += P.rating cap_rating = max(1, round(cap_rating / 2)) @@ -141,8 +141,8 @@ update_active_power_usage(initial(active_power_usage) / cap_rating) if(!limited) - for(var/obj/item/weapon/stock_parts/P in component_parts) - if(istype(P, /obj/item/weapon/stock_parts/manipulator)) + for(var/obj/item/stock_parts/P in component_parts) + if(istype(P, /obj/item/stock_parts/manipulator)) man_rating += P.rating - 1 var/list/new_chemicals = list() @@ -374,12 +374,12 @@ /obj/machinery/sleeper/attackby(var/obj/item/I, var/mob/user) add_fingerprint(user) - if(istype(I, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = I + if(istype(I, /obj/item/grab)) + var/obj/item/grab/G = I if(G.affecting) go_in(G.affecting, user) return - if(istype(I, /obj/item/weapon/reagent_containers/glass)) + if(istype(I, /obj/item/reagent_containers/glass)) if(!beaker) beaker = I user.drop_item() diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index e35c1ad202b..4e05b3bc125 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -9,7 +9,7 @@ density = TRUE anchored = TRUE unacidable = TRUE - circuit = /obj/item/weapon/circuitboard/body_scanner + circuit = /obj/item/circuitboard/body_scanner use_power = USE_POWER_IDLE idle_power_usage = 60 active_power_usage = 10000 //10 kW. It's a big all-body scanner. @@ -34,8 +34,8 @@ set_light(0) /obj/machinery/bodyscanner/attackby(var/obj/item/G, user as mob) - if(istype(G, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/H = G + if(istype(G, /obj/item/grab)) + var/obj/item/grab/H = G if(panel_open) to_chat(user, "Close the maintenance panel first.") return @@ -262,9 +262,9 @@ var/implantData[0] for(var/obj/thing in E.implants) var/implantSubData[0] - var/obj/item/weapon/implant/I = thing + var/obj/item/implant/I = thing //VOREStation Block Edit Start - var/obj/item/device/nif/N = thing + var/obj/item/nif/N = thing if(istype(I)) implantSubData["name"] = I.name implantSubData["known"] = istype(I) && I.known_implant @@ -352,7 +352,7 @@ var/atom/target = console ? console : src visible_message("[target] rattles and prints out a sheet of paper.") playsound(src, 'sound/machines/printer.ogg', 50, 1) - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(target)) + var/obj/item/paper/P = new /obj/item/paper(get_turf(target)) var/name = occupant ? occupant.name : "Unknown" P.info = "
Body Scan - [name]

" P.info += "Time of scan: [stationtime2text()]

" @@ -481,8 +481,8 @@ infected = "Gangrene Detected:" var/unknown_body = 0 - for(var/obj/item/weapon/implant/I as anything in e.implants) - var/obj/item/device/nif/N = I //VOREStation Add: NIFs + for(var/obj/item/implant/I as anything in e.implants) + var/obj/item/nif/N = I //VOREStation Add: NIFs if(istype(I) && I.known_implant) imp += "[I] implanted:" else if(istype(N) && N.known_implant) //VOREStation Add: NIFs @@ -557,7 +557,7 @@ density = FALSE anchored = TRUE unacidable = TRUE - circuit = /obj/item/weapon/circuitboard/scanner_console + circuit = /obj/item/circuitboard/scanner_console var/printing = null /obj/machinery/body_scanconsole/New() @@ -572,8 +572,8 @@ /obj/machinery/body_scanconsole/attackby(var/obj/item/I, var/mob/user) if(computer_deconstruction_screwdriver(user, I)) return - else if(istype(I, /obj/item/device/multitool)) //Did you want to link it? - var/obj/item/device/multitool/P = I + else if(istype(I, /obj/item/multitool)) //Did you want to link it? + var/obj/item/multitool/P = I if(P.connectable) if(istype(P.connectable, /obj/machinery/bodyscanner)) var/obj/machinery/bodyscanner/C = P.connectable diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 86f55631a4e..bad191ee096 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -33,7 +33,7 @@ uses = uses power_change() -/obj/machinery/ai_slipper/attackby(obj/item/weapon/W, mob/user) +/obj/machinery/ai_slipper/attackby(obj/item/W, mob/user) if(stat & (NOPOWER|BROKEN)) return if(istype(user, /mob/living/silicon)) diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm index 0374f9eab87..f23fa71e8e4 100644 --- a/code/game/machinery/air_alarm.dm +++ b/code/game/machinery/air_alarm.dm @@ -58,7 +58,7 @@ panel_open = FALSE // If it's been screwdrivered open. var/aidisabled = 0 var/shorted = 0 - circuit = /obj/item/weapon/circuitboard/airalarm + circuit = /obj/item/circuitboard/airalarm var/datum/wires/alarm/wires @@ -808,7 +808,7 @@ if(alarm_deconstruction_wirecutters(user, W)) return - if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card + if(istype(W, /obj/item/card/id) || istype(W, /obj/item/pda))// trying to unlock the interface with an ID card togglelock() return ..() diff --git a/code/game/machinery/airconditioner_vr.dm b/code/game/machinery/airconditioner_vr.dm index 584dc53c227..6549237274d 100644 --- a/code/game/machinery/airconditioner_vr.dm +++ b/code/game/machinery/airconditioner_vr.dm @@ -14,7 +14,7 @@ active_power_usage = 150 KILOWATTS //BIG POWER idle_power_usage = 500 - circuit = /obj/item/weapon/circuitboard/thermoregulator + circuit = /obj/item/circuitboard/thermoregulator var/on = 0 var/target_temp = T20C @@ -46,7 +46,7 @@ disconnect_from_network() turn_off() return - if(istype(I, /obj/item/device/multitool)) + if(istype(I, /obj/item/multitool)) var/new_temp = tgui_input_number(user, "Input a new target temperature, in degrees C.","Target Temperature", convert_k2c(target_temp), min_value=convert_k2c(TCMB), round_value = FALSE) if(!Adjacent(user) || user.incapacitated()) return diff --git a/code/game/machinery/atm_ret_field.dm b/code/game/machinery/atm_ret_field.dm index 853550b9d40..7a59b52a5b0 100644 --- a/code/game/machinery/atm_ret_field.dm +++ b/code/game/machinery/atm_ret_field.dm @@ -23,7 +23,7 @@ var/wires_intact = TRUE var/list/areas_added var/field_type = /obj/structure/atmospheric_retention_field - circuit = /obj/item/weapon/circuitboard/arf_generator + circuit = /obj/item/circuitboard/arf_generator /obj/machinery/atmospheric_field_generator/impassable desc = "An older model of ARF-G that generates an impassable retention field. Works just as well as the modern variety, but is slightly more energy-efficient.

Note: prolonged immersion in active atmospheric retention fields may have negative long-term health consequences." @@ -40,7 +40,7 @@ active_power_usage = 1500 field_type = /obj/structure/atmospheric_retention_field/impassable -/obj/machinery/atmospheric_field_generator/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/atmospheric_field_generator/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_CROWBAR) && isactive) if(!src) return to_chat(user, "You can't open the ARF-G whilst it's running!") @@ -67,7 +67,7 @@ return if(hatch_open && W.has_tool_quality(TOOL_WELDER)) if(!src) return - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(!WT.isOn()) return if(WT.get_fuel() < 5) // uses up 5 fuel. to_chat(user, "You need more fuel to complete this task.") diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index ca824fc22ae..ea2cc88009f 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -83,7 +83,7 @@ var/list/sensors = list() var/list/sensor_information = list() var/datum/radio_frequency/radio_connection - circuit = /obj/item/weapon/circuitboard/air_management + circuit = /obj/item/circuitboard/air_management /obj/machinery/computer/general_air_control/Destroy() if(radio_controller) @@ -144,7 +144,7 @@ var/list/output_info var/input_flow_setting = 200 var/pressure_setting = ONE_ATMOSPHERE * 45 - circuit = /obj/item/weapon/circuitboard/air_management/tank_control + circuit = /obj/item/circuitboard/air_management/tank_control /obj/machinery/computer/general_air_control/large_tank_control/tgui_data(mob/user) var/list/data = ..() @@ -243,7 +243,7 @@ var/list/output_info var/input_flow_setting = 700 var/pressure_setting = 100 - circuit = /obj/item/weapon/circuitboard/air_management/supermatter_core + circuit = /obj/item/circuitboard/air_management/supermatter_core /obj/machinery/computer/general_air_control/supermatter_core/tgui_data(mob/user) var/list/data = ..() @@ -343,7 +343,7 @@ var/automation = 0 var/cutoff_temperature = 2000 var/on_temperature = 1200 - circuit = /obj/item/weapon/circuitboard/air_management/injector_control + circuit = /obj/item/circuitboard/air_management/injector_control /obj/machinery/computer/general_air_control/fuel_injection/process() if(automation) diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm index c50080feb9f..5c5db6ebb59 100644 --- a/code/game/machinery/atmoalter/area_atmos_computer.dm +++ b/code/game/machinery/atmoalter/area_atmos_computer.dm @@ -4,7 +4,7 @@ icon_keyboard = "atmos_key" icon_screen = "area_atmos" light_color = "#e6ffff" - circuit = /obj/item/weapon/circuitboard/area_atmos + circuit = /obj/item/circuitboard/area_atmos var/list/connectedscrubbers = list() var/status = "" diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 3fb8adccfd4..1ffa86bfeac 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -238,9 +238,9 @@ update_flag healthcheck() ..() -/obj/machinery/portable_atmospherics/canister/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/portable_atmospherics/canister/attackby(var/obj/item/W as obj, var/mob/user as mob) if(W.has_tool_quality(TOOL_WELDER)) //Vorestart: Deconstructable Canisters - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(!WT.remove_fuel(0, user)) to_chat(user, "The welding tool must be on to complete this task.") return @@ -255,13 +255,13 @@ update_flag qdel(src) return //Voreend - if(!W.has_tool_quality(TOOL_WRENCH) && !istype(W, /obj/item/weapon/tank) && !istype(W, /obj/item/device/analyzer) && !istype(W, /obj/item/device/pda)) + if(!W.has_tool_quality(TOOL_WRENCH) && !istype(W, /obj/item/tank) && !istype(W, /obj/item/analyzer) && !istype(W, /obj/item/pda)) visible_message("\The [user] hits \the [src] with \a [W]!") src.health -= W.force src.add_fingerprint(user) healthcheck() - if(istype(user, /mob/living/silicon/robot) && istype(W, /obj/item/weapon/tank/jetpack)) + if(istype(user, /mob/living/silicon/robot) && istype(W, /obj/item/tank/jetpack)) var/datum/gas_mixture/thejetpack = W:air_contents var/env_pressure = thejetpack.return_pressure() var/pressure_delta = min(10*ONE_ATMOSPHERE - env_pressure, (air_contents.return_pressure() - env_pressure)/2) @@ -375,7 +375,7 @@ update_flag if(valve_open) valve_open = 0 release_log += "Valve was closed by [usr] ([usr.ckey]), stopping the transfer into the [holding]
" - if(istype(holding, /obj/item/weapon/tank)) + if(istype(holding, /obj/item/tank)) holding.manipulated_by = usr.real_name holding.loc = loc holding = null diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 93988186584..a3529d42d03 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -117,7 +117,7 @@ qdel(src) return - if(istype(W, /obj/item/device/multitool)) + if(istype(W, /obj/item/multitool)) for(var/obj/machinery/atmospherics/pipe/P in loc) pipes_on_turf |= P if(!pipes_on_turf.len) @@ -135,5 +135,5 @@ /obj/machinery/meter/turf/select_target() return loc -/obj/machinery/meter/turf/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/meter/turf/attackby(var/obj/item/W as obj, var/mob/user as mob) return diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index c3fe8eaccfc..3e899b32318 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -5,7 +5,7 @@ var/datum/gas_mixture/air_contents = new var/obj/machinery/atmospherics/portables_connector/connected_port - var/obj/item/weapon/tank/holding + var/obj/item/tank/holding var/volume = 0 var/destroyed = 0 @@ -106,11 +106,11 @@ if (network) network.update = 1 -/obj/machinery/portable_atmospherics/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if ((istype(W, /obj/item/weapon/tank) && !( src.destroyed ))) +/obj/machinery/portable_atmospherics/attackby(var/obj/item/W as obj, var/mob/user as mob) + if ((istype(W, /obj/item/tank) && !( src.destroyed ))) if (src.holding) return - var/obj/item/weapon/tank/T = W + var/obj/item/tank/T = W user.drop_item() T.loc = src src.holding = T @@ -146,7 +146,7 @@ var/power_rating var/power_losses var/last_power_draw = 0 - var/obj/item/weapon/cell/cell + var/obj/item/cell/cell var/use_cell = TRUE var/removeable_cell = TRUE @@ -158,12 +158,12 @@ return 0 /obj/machinery/portable_atmospherics/powered/attackby(obj/item/I, mob/user) - if(use_cell && istype(I, /obj/item/weapon/cell)) + if(use_cell && istype(I, /obj/item/cell)) if(cell) to_chat(user, "There is already a power cell installed.") return - var/obj/item/weapon/cell/C = I + var/obj/item/cell/C = I user.drop_item() C.add_fingerprint(user) diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm index 0f0d2b3fe81..1b9ede42475 100644 --- a/code/game/machinery/atmoalter/pump.dm +++ b/code/game/machinery/atmoalter/pump.dm @@ -23,7 +23,7 @@ /obj/machinery/portable_atmospherics/powered/pump/New() ..() - cell = new/obj/item/weapon/cell/apc(src) + cell = new/obj/item/cell/apc(src) var/list/air_mix = StandardAirMix() src.air_contents.adjust_multi("oxygen", air_mix["oxygen"], "nitrogen", air_mix["nitrogen"]) diff --git a/code/game/machinery/atmoalter/pump_vr.dm b/code/game/machinery/atmoalter/pump_vr.dm index fb4acbe9f63..858c4230cb2 100644 --- a/code/game/machinery/atmoalter/pump_vr.dm +++ b/code/game/machinery/atmoalter/pump_vr.dm @@ -95,13 +95,13 @@ return //doesn't use power cells - if(istype(I, /obj/item/weapon/cell)) + if(istype(I, /obj/item/cell)) return if (I.has_tool_quality(TOOL_SCREWDRIVER)) return //doesn't hold tanks - if(istype(I, /obj/item/weapon/tank)) + if(istype(I, /obj/item/tank)) return ..() diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index 7b2d60e7b5f..eee8d761d5d 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -22,7 +22,7 @@ /obj/machinery/portable_atmospherics/powered/scrubber/New() ..() - cell = new/obj/item/weapon/cell/apc(src) + cell = new/obj/item/cell/apc(src) /obj/machinery/portable_atmospherics/powered/scrubber/emp_act(severity) if(stat & (BROKEN|NOPOWER)) @@ -230,13 +230,13 @@ return //doesn't use power cells - if(istype(I, /obj/item/weapon/cell)) + if(istype(I, /obj/item/cell)) return if(I.has_tool_quality(TOOL_SCREWDRIVER)) return //doesn't hold tanks - if(istype(I, /obj/item/weapon/tank)) + if(istype(I, /obj/item/tank)) return ..() diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index c484a74f7d1..5f4523f76d3 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -10,7 +10,7 @@ clicksound = "keyboard" clickvol = 30 - circuit = /obj/item/weapon/circuitboard/autolathe + circuit = /obj/item/circuitboard/autolathe var/static/datum/category_collection/autolathe/autolathe_recipes @@ -256,9 +256,9 @@ ..() mb_rating = 0 man_rating = 0 - for(var/obj/item/weapon/stock_parts/matter_bin/MB in component_parts) + for(var/obj/item/stock_parts/matter_bin/MB in component_parts) mb_rating += MB.rating - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) man_rating += M.rating var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 215b2051faf..a38083ccace 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -19,11 +19,11 @@ icon_state = "biogen-stand" density = TRUE anchored = TRUE - circuit = /obj/item/weapon/circuitboard/biogenerator + circuit = /obj/item/circuitboard/biogenerator use_power = USE_POWER_IDLE idle_power_usage = 40 var/processing = 0 - var/obj/item/weapon/reagent_containers/glass/beaker = null + var/obj/item/reagent_containers/glass/beaker = null var/points = 0 var/build_eff = 1 var/eat_eff = 1 @@ -59,7 +59,7 @@ reagents = R R.my_atom = src - beaker = new /obj/item/weapon/reagent_containers/glass/bottle(src) + beaker = new /obj/item/reagent_containers/glass/bottle(src) default_apply_parts() item_list = list() @@ -68,32 +68,32 @@ BIOGEN_REAGENT("Milk x50", "milk", 50, 95), BIOGEN_REAGENT("Cream x10", "cream", 10, 30), BIOGEN_REAGENT("Cream x50", "cream", 50, 120), - BIOGEN_ITEM("Slab of meat", /obj/item/weapon/reagent_containers/food/snacks/meat, 1, 50), - BIOGEN_ITEM("Slabs of meat x5", /obj/item/weapon/reagent_containers/food/snacks/meat, 5, 250), + BIOGEN_ITEM("Slab of meat", /obj/item/reagent_containers/food/snacks/meat, 1, 50), + BIOGEN_ITEM("Slabs of meat x5", /obj/item/reagent_containers/food/snacks/meat, 5, 250), ) item_list["Cooking Ingredients"] = list( BIOGEN_REAGENT("Universal Enzyme x10", "enzyme", 10, 30), BIOGEN_REAGENT("Universal Enzyme x50", "enzyme", 50, 120), - BIOGEN_ITEM("Nutri-spread", /obj/item/weapon/reagent_containers/food/snacks/spreads, 1, 30), - BIOGEN_ITEM("Nutri-spread x5", /obj/item/weapon/reagent_containers/food/snacks/spreads, 5, 120), + BIOGEN_ITEM("Nutri-spread", /obj/item/reagent_containers/food/snacks/spreads, 1, 30), + BIOGEN_ITEM("Nutri-spread x5", /obj/item/reagent_containers/food/snacks/spreads, 5, 120), ) item_list["Gardening Nutrients"] = list( - BIOGEN_ITEM("E-Z-Nutrient", /obj/item/weapon/reagent_containers/glass/bottle/eznutrient, 1, 60), - BIOGEN_ITEM("E-Z-Nutrient x5", /obj/item/weapon/reagent_containers/glass/bottle/eznutrient, 5, 300), - BIOGEN_ITEM("Left 4 Zed", /obj/item/weapon/reagent_containers/glass/bottle/left4zed, 1, 120), - BIOGEN_ITEM("Left 4 Zed x5", /obj/item/weapon/reagent_containers/glass/bottle/left4zed, 5, 600), - BIOGEN_ITEM("Robust Harvest", /obj/item/weapon/reagent_containers/glass/bottle/robustharvest, 1, 150), - BIOGEN_ITEM("Robust Harvest x5", /obj/item/weapon/reagent_containers/glass/bottle/robustharvest, 5, 750), + BIOGEN_ITEM("E-Z-Nutrient", /obj/item/reagent_containers/glass/bottle/eznutrient, 1, 60), + BIOGEN_ITEM("E-Z-Nutrient x5", /obj/item/reagent_containers/glass/bottle/eznutrient, 5, 300), + BIOGEN_ITEM("Left 4 Zed", /obj/item/reagent_containers/glass/bottle/left4zed, 1, 120), + BIOGEN_ITEM("Left 4 Zed x5", /obj/item/reagent_containers/glass/bottle/left4zed, 5, 600), + BIOGEN_ITEM("Robust Harvest", /obj/item/reagent_containers/glass/bottle/robustharvest, 1, 150), + BIOGEN_ITEM("Robust Harvest x5", /obj/item/reagent_containers/glass/bottle/robustharvest, 5, 750), ) item_list["Leather Products"] = list( - BIOGEN_ITEM("Wallet", /obj/item/weapon/storage/wallet, 1, 100), + BIOGEN_ITEM("Wallet", /obj/item/storage/wallet, 1, 100), BIOGEN_ITEM("Botanical gloves", /obj/item/clothing/gloves/botanic_leather, 1, 250), - BIOGEN_ITEM("Plant bag", /obj/item/weapon/storage/bag/plants, 1, 320), - BIOGEN_ITEM("Large plant bag", /obj/item/weapon/storage/bag/plants/large, 1, 640), - BIOGEN_ITEM("Utility belt", /obj/item/weapon/storage/belt/utility, 1, 300), - BIOGEN_ITEM("Leather Satchel", /obj/item/weapon/storage/backpack/satchel, 1, 400), - BIOGEN_ITEM("Cash Bag", /obj/item/weapon/storage/bag/cash, 1, 400), - BIOGEN_ITEM("Chemistry Bag", /obj/item/weapon/storage/bag/chemistry, 1, 400), + BIOGEN_ITEM("Plant bag", /obj/item/storage/bag/plants, 1, 320), + BIOGEN_ITEM("Large plant bag", /obj/item/storage/bag/plants/large, 1, 640), + BIOGEN_ITEM("Utility belt", /obj/item/storage/belt/utility, 1, 300), + BIOGEN_ITEM("Leather Satchel", /obj/item/storage/backpack/satchel, 1, 400), + BIOGEN_ITEM("Cash Bag", /obj/item/storage/bag/cash, 1, 400), + BIOGEN_ITEM("Chemistry Bag", /obj/item/storage/bag/chemistry, 1, 400), BIOGEN_ITEM("Workboots", /obj/item/clothing/shoes/boots/workboots, 1, 400), BIOGEN_ITEM("Leather Chaps", /obj/item/clothing/under/pants/chaps, 1, 400), BIOGEN_ITEM("Leather Coat", /obj/item/clothing/suit/leathercoat, 1, 500), @@ -216,7 +216,7 @@ return if(default_unfasten_wrench(user, O, 40)) return - if(istype(O, /obj/item/weapon/reagent_containers/glass)) + if(istype(O, /obj/item/reagent_containers/glass)) if(beaker) to_chat(user, "\The [src] is already loaded.") else @@ -226,14 +226,14 @@ updateUsrDialog() else if(processing) to_chat(user, "\The [src] is currently processing.") - else if(istype(O, /obj/item/weapon/storage/bag/plants)) + else if(istype(O, /obj/item/storage/bag/plants)) var/i = 0 - for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents) + for(var/obj/item/reagent_containers/food/snacks/grown/G in contents) i++ if(i >= 10) to_chat(user, "\The [src] is already full! Activate it.") else - for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in O.contents) + for(var/obj/item/reagent_containers/food/snacks/grown/G in O.contents) G.loc = src i++ if(i >= 10) @@ -243,11 +243,11 @@ to_chat(user, "You empty \the [O] into \the [src].") - else if(!istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown)) + else if(!istype(O, /obj/item/reagent_containers/food/snacks/grown)) to_chat(user, "You cannot put this in \the [src].") else var/i = 0 - for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents) + for(var/obj/item/reagent_containers/food/snacks/grown/G in contents) i++ if(i >= 10) to_chat(user, "\The [src] is full! Activate it.") @@ -272,7 +272,7 @@ to_chat(usr, "The biogenerator is in the process of working.") return var/S = 0 - for(var/obj/item/weapon/reagent_containers/food/snacks/grown/I in contents) + for(var/obj/item/reagent_containers/food/snacks/grown/I in contents) S += 5 if(I.reagents.get_reagent_amount("nutriment") < 0.1) points += 1 @@ -297,10 +297,10 @@ var/man_rating = 0 var/bin_rating = 0 - for(var/obj/item/weapon/stock_parts/P in component_parts) - if(istype(P, /obj/item/weapon/stock_parts/matter_bin)) + for(var/obj/item/stock_parts/P in component_parts) + if(istype(P, /obj/item/stock_parts/matter_bin)) bin_rating += P.rating - if(istype(P, /obj/item/weapon/stock_parts/manipulator)) + if(istype(P, /obj/item/stock_parts/manipulator)) man_rating += P.rating build_eff = man_rating diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index 4c684abb999..fdc0659f075 100644 --- a/code/game/machinery/bioprinter.dm +++ b/code/game/machinery/bioprinter.dm @@ -13,7 +13,7 @@ idle_power_usage = 40 active_power_usage = 300 - var/obj/item/weapon/reagent_containers/container = null // This is the beaker that holds all of the biomass + var/obj/item/reagent_containers/container = null // This is the beaker that holds all of the biomass var/print_delay = 100 var/base_print_delay = 100 // For Adminbus reasons @@ -94,7 +94,7 @@ // Print Delay updating print_delay = base_print_delay var/manip_rating = 0 - for(var/obj/item/weapon/stock_parts/manipulator/manip in component_parts) + for(var/obj/item/stock_parts/manipulator/manip in component_parts) manip_rating += manip.rating print_delay -= (manip.rating-1)*10 print_delay = max(0,print_delay) @@ -254,26 +254,26 @@ // END GENERIC PRINTER // CIRCUITS -/obj/item/weapon/circuitboard/bioprinter +/obj/item/circuitboard/bioprinter name = "bioprinter circuit" build_path = /obj/machinery/organ_printer/flesh board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 3, TECH_BIO = 3) req_components = list( /obj/item/stack/cable_coil = 2, - /obj/item/weapon/stock_parts/matter_bin = 2, - /obj/item/weapon/stock_parts/manipulator = 2) + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/manipulator = 2) // FLESH ORGAN PRINTER /obj/machinery/organ_printer/flesh name = "bioprinter" desc = "It's a machine that prints replacement organs." icon_state = "bioprinter" - circuit = /obj/item/weapon/circuitboard/bioprinter + circuit = /obj/item/circuitboard/bioprinter /obj/machinery/organ_printer/flesh/full/Initialize() . = ..() - container = new /obj/item/weapon/reagent_containers/glass/bottle/biomass(src) + container = new /obj/item/reagent_containers/glass/bottle/biomass(src) /obj/machinery/organ_printer/flesh/dismantle() var/turf/T = get_turf(src) @@ -290,18 +290,18 @@ visible_message("\The [src] dings, then spits out \a [O].") return O -/obj/machinery/organ_printer/flesh/attackby(obj/item/weapon/W, mob/user) +/obj/machinery/organ_printer/flesh/attackby(obj/item/W, mob/user) // DNA sample from syringe. - if(istype(W,/obj/item/weapon/reagent_containers/syringe)) //TODO: Make this actually empty the syringe - var/obj/item/weapon/reagent_containers/syringe/S = W + if(istype(W,/obj/item/reagent_containers/syringe)) //TODO: Make this actually empty the syringe + var/obj/item/reagent_containers/syringe/S = W var/datum/reagent/blood/injected = locate() in S.reagents.reagent_list //Grab some blood if(injected && injected.data) loaded_dna = injected.data S.reagents.remove_reagent("blood", injected.volume) to_chat(user, "You scan the blood sample into the bioprinter.") return - else if(istype(W,/obj/item/weapon/reagent_containers/glass)) - var/obj/item/weapon/reagent_containers/glass/G = W + else if(istype(W,/obj/item/reagent_containers/glass)) + var/obj/item/reagent_containers/glass/G = W if(container) to_chat(user, "\The [src] already has a container loaded!") return @@ -317,15 +317,15 @@ /* Roboprinter is made obsolete by the system already in place and mapped into Robotics -/obj/item/weapon/circuitboard/roboprinter +/obj/item/circuitboard/roboprinter name = "roboprinter circuit" build_path = /obj/machinery/organ_printer/robot board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 3, TECH_BIO = 3) req_components = list( /obj/item/stack/cable_coil = 2, - /obj/item/weapon/stock_parts/matter_bin = 2, - /obj/item/weapon/stock_parts/manipulator = 2) + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/manipulator = 2) // ROBOT ORGAN PRINTER // Still Requires DNA, /obj/machinery/pros_fab is better for limbs @@ -333,7 +333,7 @@ name = "prosthetic organ fabricator" desc = "It's a machine that prints prosthetic organs." icon_state = "roboprinter" - circuit = /obj/item/weapon/circuitboard/roboprinter + circuit = /obj/item/circuitboard/roboprinter var/matter_amount_per_sheet = 10 var/matter_type = MAT_STEEL @@ -355,7 +355,7 @@ audible_message("\The [src] dings, then spits out \a [O].") return O -/obj/machinery/organ_printer/robot/attackby(var/obj/item/weapon/W, var/mob/user) +/obj/machinery/organ_printer/robot/attackby(var/obj/item/W, var/mob/user) if(istype(W, /obj/item/stack/material) && W.get_material_name() == matter_type) if((max_stored_matter-stored_matter) < matter_amount_per_sheet) to_chat(user, "\The [src] is too full.") @@ -370,8 +370,8 @@ to_chat(user, "\The [src] processes \the [W]. Levels of stored matter now: [stored_matter]") S.use(sheets_to_take) return - else if(istype(W,/obj/item/weapon/reagent_containers/syringe)) //TODO: Make this actuall empty the syringe - var/obj/item/weapon/reagent_containers/syringe/S = W + else if(istype(W,/obj/item/reagent_containers/syringe)) //TODO: Make this actuall empty the syringe + var/obj/item/reagent_containers/syringe/S = W var/datum/reagent/blood/injected = locate() in S.reagents.reagent_list //Grab some blood if(injected && injected.data) loaded_dna = injected.data diff --git a/code/game/machinery/bomb_tester_vr.dm b/code/game/machinery/bomb_tester_vr.dm index 2273defdeac..3387ebb7350 100644 --- a/code/game/machinery/bomb_tester_vr.dm +++ b/code/game/machinery/bomb_tester_vr.dm @@ -12,12 +12,12 @@ idle_power_usage = 50 active_power_usage = 1.5 KILOWATTS - circuit = /obj/item/weapon/circuitboard/bomb_tester + circuit = /obj/item/circuitboard/bomb_tester var/icon_name = "generic" - var/obj/item/weapon/tank/tank1 - var/obj/item/weapon/tank/tank2 + var/obj/item/tank/tank1 + var/obj/item/tank/tank2 var/obj/machinery/portable_atmospherics/canister/test_canister var/sim_mode = MODE_SINGLE @@ -81,7 +81,7 @@ /obj/machinery/bomb_tester/RefreshParts() ..() var/scan_rating = 0 - for(var/obj/item/weapon/stock_parts/scanning_module/S in component_parts) + for(var/obj/item/stock_parts/scanning_module/S in component_parts) scan_rating += S.rating simulation_delay = 25 SECONDS - scan_rating SECONDS @@ -92,7 +92,7 @@ return if(default_part_replacement(user, I)) return - if(istype(I, /obj/item/weapon/tank)) + if(istype(I, /obj/item/tank)) if(!tank1 || !tank2) user.drop_item(I) I.forceMove(src) @@ -153,8 +153,8 @@ return TRUE if("add_tank") - if(istype(usr.get_active_hand(), /obj/item/weapon/tank)) - var/obj/item/weapon/tank/T = usr.get_active_hand() + if(istype(usr.get_active_hand(), /obj/item/tank)) + var/obj/item/tank/T = usr.get_active_hand() var/slot = params["slot"] if(slot == 1 && !tank1) tank1 = T @@ -171,7 +171,7 @@ to_chat(usr, "You must be wielding a tank to insert it!") if("remove_tank") - var/obj/item/weapon/tank/T = locate(params["ref"]) in list(tank1, tank2) + var/obj/item/tank/T = locate(params["ref"]) in list(tank1, tank2) if(istype(T)) if(T == tank1) tank1 = null @@ -358,7 +358,7 @@ else ping("Simulation complete!") playsound(src, "sound/machines/printer.ogg", 50, 1) - var/obj/item/weapon/paper/P = new(get_turf(src)) + var/obj/item/paper/P = new(get_turf(src)) P.name = "Explosive Simulator printout" P.info = simulation_results diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index b3e03da0eb1..f9537cd4a66 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -14,5 +14,5 @@ /obj/machinery/button/attack_ai(mob/user as mob) return attack_hand(user) -/obj/machinery/button/attackby(obj/item/weapon/W, mob/user as mob) +/obj/machinery/button/attackby(obj/item/W, mob/user as mob) return attack_hand(user) diff --git a/code/game/machinery/buttons_vr.dm b/code/game/machinery/buttons_vr.dm index a8c9c4bed1e..fc97ad25c10 100644 --- a/code/game/machinery/buttons_vr.dm +++ b/code/game/machinery/buttons_vr.dm @@ -1,4 +1,4 @@ -/obj/machinery/button/attack_hand(obj/item/weapon/W, mob/user as mob) +/obj/machinery/button/attack_hand(obj/item/W, mob/user as mob) if(..()) return 1 playsound(src, 'sound/machines/button.ogg', 100, 1) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index b001611c19a..3611c33f923 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -16,7 +16,7 @@ anchored = TRUE var/invuln = 0 var/bugged = 0 - var/obj/item/weapon/camera_assembly/assembly = null + var/obj/item/camera_assembly/assembly = null var/toughness = 5 //sorta fragile @@ -167,7 +167,7 @@ "You screw the camera's panel [panel_open ? "open" : "closed"].") playsound(src, W.usesound, 50, 1) - else if((W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/device/multitool)) && panel_open) + else if((W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/multitool)) && panel_open) interact(user) else if(W.has_tool_quality(TOOL_WELDER) && (wires.CanDeconstruct() || (stat & BROKEN))) @@ -190,14 +190,14 @@ qdel(src) // OTHER - else if (can_use() && (istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/device/pda)) && isliving(user)) + else if (can_use() && (istype(W, /obj/item/paper) || istype(W, /obj/item/pda)) && isliving(user)) var/mob/living/U = user - var/obj/item/weapon/paper/X = null - var/obj/item/device/pda/P = null + var/obj/item/paper/X = null + var/obj/item/pda/P = null var/itemname = "" var/info = "" - if(istype(W, /obj/item/weapon/paper)) + if(istype(W, /obj/item/paper)) X = W itemname = X.name info = X.info @@ -217,7 +217,7 @@ to_chat(O, "[U] holds \a [itemname] up to one of your cameras ...") O << browse(text("[][]", itemname, info), text("window=[]", itemname)) - else if (istype(W, /obj/item/weapon/camera_bug)) + else if (istype(W, /obj/item/camera_bug)) if (!src.can_use()) to_chat(user, "Camera non-functional.") return @@ -371,7 +371,7 @@ return null -/obj/machinery/camera/proc/weld(var/obj/item/weapon/weldingtool/WT, var/mob/user) +/obj/machinery/camera/proc/weld(var/obj/item/weldingtool/WT, var/mob/user) WT = WT.get_welder() if(busy) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 86bdc11e007..e7d8d0ad127 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/camera_assembly +/obj/item/camera_assembly name = "camera assembly" desc = "A pre-fabricated security camera kit, ready to be assembled and mounted to a surface." icon = 'icons/obj/monitors_vr.dmi' //VOREStation Edit - New Icons @@ -9,7 +9,7 @@ matter = list(MAT_STEEL = 700,MAT_GLASS = 300) // Motion, EMP-Proof, X-Ray - var/list/obj/item/possible_upgrades = list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/material/osmium, /obj/item/weapon/stock_parts/scanning_module) + var/list/obj/item/possible_upgrades = list(/obj/item/assembly/prox_sensor, /obj/item/stack/material/osmium, /obj/item/stock_parts/scanning_module) var/list/upgrades = list() var/camera_name var/camera_network @@ -23,7 +23,7 @@ 4 = Screwdriver panel closed and is fully built (you cannot attach upgrades) */ -/obj/item/weapon/camera_assembly/attackby(obj/item/W as obj, mob/living/user as mob) +/obj/item/camera_assembly/attackby(obj/item/W as obj, mob/living/user as mob) switch(state) @@ -143,17 +143,17 @@ ..() -/obj/item/weapon/camera_assembly/update_icon() +/obj/item/camera_assembly/update_icon() if(anchored) icon_state = "camera1" else icon_state = "cameracase" -/obj/item/weapon/camera_assembly/attack_hand(mob/user as mob) +/obj/item/camera_assembly/attack_hand(mob/user as mob) if(!anchored) ..() -/obj/item/weapon/camera_assembly/proc/weld(var/obj/item/weapon/weldingtool/WT, var/mob/user) +/obj/item/camera_assembly/proc/weld(var/obj/item/weldingtool/WT, var/mob/user) WT = WT.get_welder() if(busy) diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index d0ef9e1cd42..14a2b9fdfa2 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -195,13 +195,13 @@ var/global/list/engineering_networks = list( return O /obj/machinery/camera/proc/isXRay() - var/obj/item/weapon/stock_parts/scanning_module/O = locate(/obj/item/weapon/stock_parts/scanning_module) in assembly.upgrades + var/obj/item/stock_parts/scanning_module/O = locate(/obj/item/stock_parts/scanning_module) in assembly.upgrades if (O && O.rating >= 2) return O return null /obj/machinery/camera/proc/isMotion() - var/O = locate(/obj/item/device/assembly/prox_sensor) in assembly.upgrades + var/O = locate(/obj/item/assembly/prox_sensor) in assembly.upgrades return O // UPGRADE PROCS @@ -212,14 +212,14 @@ var/global/list/engineering_networks = list( update_coverage() /obj/machinery/camera/proc/upgradeXRay() - assembly.upgrades.Add(new /obj/item/weapon/stock_parts/scanning_module/adv(assembly)) + assembly.upgrades.Add(new /obj/item/stock_parts/scanning_module/adv(assembly)) setPowerUsage() update_coverage() /obj/machinery/camera/proc/upgradeMotion() if(!isturf(loc)) return //nooooo - assembly.upgrades.Add(new /obj/item/device/assembly/prox_sensor(assembly)) + assembly.upgrades.Add(new /obj/item/assembly/prox_sensor(assembly)) setPowerUsage() START_MACHINE_PROCESSING(src) sense_proximity(callback = /atom/proc/HasProximity) diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 8b1ec4256bf..4da6043182b 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -225,7 +225,7 @@ /mob/living/proc/tracking_status() // Easy checks first. // Don't detect mobs on CentCom. Since the wizard den is on CentCom, we only need this. - var/obj/item/weapon/card/id/id = GetIdCard() + var/obj/item/card/id/id = GetIdCard() if(id && id.prevent_tracking()) return TRACKING_TERMINATE var/turf/pos = get_turf(src) diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 5a301b79142..80fcc35fbbf 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -9,9 +9,9 @@ active_power_usage = 60000 //60 kW. (this the power drawn when charging) var/efficiency = 60000 //will provide the modified power rate when upgraded power_channel = EQUIP - var/obj/item/weapon/cell/charging = null + var/obj/item/cell/charging = null var/chargelevel = -1 - circuit = /obj/item/weapon/circuitboard/cell_charger + circuit = /obj/item/circuitboard/cell_charger /obj/machinery/cell_charger/Initialize() . = ..() @@ -46,12 +46,12 @@ if(charging) . += "Current charge: [charging.charge] / [charging.maxcharge]" -/obj/machinery/cell_charger/attackby(obj/item/weapon/W, mob/user) +/obj/machinery/cell_charger/attackby(obj/item/W, mob/user) if(stat & BROKEN) return - if(istype(W, /obj/item/weapon/cell) && anchored) - if(istype(W, /obj/item/weapon/cell/device)) + if(istype(W, /obj/item/cell) && anchored) + if(istype(W, /obj/item/cell/device)) to_chat(user, "\The [src] isn't fitted for that type of cell.") return if(charging) @@ -133,6 +133,6 @@ /obj/machinery/cell_charger/RefreshParts() var/E = 0 - for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts) + for(var/obj/item/stock_parts/capacitor/C in component_parts) E += C.rating efficiency = active_power_usage * (1+ (E - 1)*0.5) diff --git a/code/game/machinery/clawmachine.dm b/code/game/machinery/clawmachine.dm index 08af125e20d..8e10c777993 100644 --- a/code/game/machinery/clawmachine.dm +++ b/code/game/machinery/clawmachine.dm @@ -96,7 +96,7 @@ ispowered = 0 update_icon() -/obj/machinery/clawmachine/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/clawmachine/attackby(obj/item/W as obj, mob/user as mob) if(busy) to_chat(user,"The claw machine is currently running. ") return @@ -120,8 +120,8 @@ var/handled = 0 var/paid = 0 - if(istype(W, /obj/item/weapon/spacecash)) - var/obj/item/weapon/spacecash/C = W + if(istype(W, /obj/item/spacecash)) + var/obj/item/spacecash/C = W paid = insert_cash(C, user) handled = 1 if(paid) @@ -141,7 +141,7 @@ var/prizeselect = pickweight(prizes) new prizeselect(src.loc) -/obj/machinery/clawmachine/proc/insert_cash(var/obj/item/weapon/spacecash/cashmoney, mob/user) +/obj/machinery/clawmachine/proc/insert_cash(var/obj/item/spacecash/cashmoney, mob/user) if (ispowered == 0) return if (isbroken) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index a536042cc5f..f6709fbf547 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -30,7 +30,7 @@ desc = "An electronically-lockable pod for growing organic tissue." density = TRUE anchored = TRUE - circuit = /obj/item/weapon/circuitboard/clonepod + circuit = /obj/item/circuitboard/clonepod icon = 'icons/obj/cloning.dmi' icon_state = "pod_0" req_access = list(access_genetics) // For premature unlocking. @@ -220,7 +220,7 @@ return //Let's unlock this early I guess. Might be too early, needs tweaking. -/obj/machinery/clonepod/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/clonepod/attackby(obj/item/W as obj, mob/user as mob) if(isnull(occupant)) if(default_deconstruction_screwdriver(user, W)) return @@ -228,7 +228,7 @@ return if(default_part_replacement(user, W)) return - if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) + if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) if(!check_access(W)) to_chat(user, "Access Denied.") return @@ -240,7 +240,7 @@ else locked = 0 to_chat(user, "System unlocked.") - else if(istype(W,/obj/item/weapon/reagent_containers/glass)) + else if(istype(W,/obj/item/reagent_containers/glass)) if(LAZYLEN(containers) >= container_limit) to_chat(user, "\The [src] has too many containers loaded!") else if(do_after(user, 1 SECOND)) @@ -264,8 +264,8 @@ user.visible_message("[user] secures [src] to the floor.", "You secure [src] to the floor.") else user.visible_message("[user] unsecures [src] from the floor.", "You unsecure [src] from the floor.") - else if(istype(W, /obj/item/device/multitool)) - var/obj/item/device/multitool/M = W + else if(istype(W, /obj/item/multitool)) + var/obj/item/multitool/M = W M.connecting = src to_chat(user, "You load connection data from [src] to [M].") M.update_icon() @@ -296,9 +296,9 @@ ..() speed_coeff = 0 efficiency = 0 - for(var/obj/item/weapon/stock_parts/scanning_module/S in component_parts) + for(var/obj/item/stock_parts/scanning_module/S in component_parts) efficiency += S.rating - for(var/obj/item/weapon/stock_parts/manipulator/P in component_parts) + for(var/obj/item/stock_parts/manipulator/P in component_parts) speed_coeff += P.rating heal_level = max(min((efficiency * 15) + 10, 100), MINIMUM_HEAL_LEVEL) @@ -347,7 +347,7 @@ /obj/machinery/clonepod/proc/get_biomass() var/biomass_count = 0 if(LAZYLEN(containers)) - for(var/obj/item/weapon/reagent_containers/glass/G in containers) + for(var/obj/item/reagent_containers/glass/G in containers) for(var/datum/reagent/R in G.reagents.reagent_list) if(R.id == "biomass") biomass_count += R.volume @@ -358,7 +358,7 @@ /obj/machinery/clonepod/proc/remove_biomass(var/amount = CLONE_BIOMASS) //Just in case it doesn't get passed a new amount, assume one clone var/to_remove = 0 // Tracks how much biomass has been found so far if(LAZYLEN(containers)) - for(var/obj/item/weapon/reagent_containers/glass/G in containers) + for(var/obj/item/reagent_containers/glass/G in containers) if(to_remove < amount) //If we have what we need, we can stop. Checked every time we switch beakers for(var/datum/reagent/R in G.reagents.reagent_list) if(R.id == "biomass") // Finds Biomass @@ -394,7 +394,7 @@ if(LAZYLEN(containers)) var/turf/T = get_turf(src) if(T) - for(var/obj/item/weapon/reagent_containers/glass/G in containers) + for(var/obj/item/reagent_containers/glass/G in containers) G.forceMove(T) containers -= G return 1 @@ -458,16 +458,16 @@ /obj/machinery/clonepod/full/New() ..() for(var/i = 1 to container_limit) - containers += new /obj/item/weapon/reagent_containers/glass/bottle/biomass(src) + containers += new /obj/item/reagent_containers/glass/bottle/biomass(src) //Health Tracker Implant -/obj/item/weapon/implant/health +/obj/item/implant/health name = "health implant" known_implant = TRUE var/healthstring = "" -/obj/item/weapon/implant/health/proc/sensehealth() +/obj/item/implant/health/proc/sensehealth() if(!implanted) return "ERROR" else @@ -483,7 +483,7 @@ //Disk stuff. //The return of data disks?? Just for transferring between genetics machine/cloning machine. //TO-DO: Make the genetics machine accept them. -/obj/item/weapon/disk/data +/obj/item/disk/data name = "Cloning Data Disk" icon = 'icons/obj/discs_vr.dmi' //VOREStation Edit icon_state = "data-red" //VOREStation Edit @@ -492,15 +492,15 @@ var/datum/dna2/record/buf = null var/read_only = 0 //Well,it's still a floppy disk -/obj/item/weapon/disk/data/proc/initializeDisk() +/obj/item/disk/data/proc/initializeDisk() buf = new buf.dna=new -/obj/item/weapon/disk/data/demo +/obj/item/disk/data/demo name = "data disk - 'God Emperor of Mankind'" read_only = 1 -/obj/item/weapon/disk/data/demo/New() +/obj/item/disk/data/demo/New() initializeDisk() buf.types=DNA2_BUF_UE|DNA2_BUF_UI //data = "066000033000000000AF00330660FF4DB002690" @@ -511,11 +511,11 @@ //buf.dna.UI=list(0x0C8,0x0C8,0x0C8,0x0C8,0x0C8,0x0C8,0x000,0x000,0x000,0x000,0x161,0xFBD,0xDEF) // Farmer Jeff buf.dna.UpdateUI() -/obj/item/weapon/disk/data/monkey +/obj/item/disk/data/monkey name = "data disk - 'Mr. Muggles'" read_only = 1 -/obj/item/weapon/disk/data/monkey/New() +/obj/item/disk/data/monkey/New() ..() initializeDisk() buf.types=DNA2_BUF_SE @@ -525,16 +525,16 @@ buf.dna.SE=new_SE buf.dna.SetSEValueRange(MONKEYBLOCK,0xDAC, 0xFFF) -/obj/item/weapon/disk/data/New() +/obj/item/disk/data/New() ..() var/diskcolor = pick(0,1,2) icon_state = "datadisk[diskcolor]" -/obj/item/weapon/disk/data/attack_self(mob/user as mob) +/obj/item/disk/data/attack_self(mob/user as mob) read_only = !read_only to_chat(user, "You flip the write-protect tab to [read_only ? "protected" : "unprotected"].") -/obj/item/weapon/disk/data/examine(mob/user) +/obj/item/disk/data/examine(mob/user) . = ..() . += "The write-protect tab is set to [read_only ? "protected" : "unprotected"]." @@ -542,25 +542,25 @@ * Diskette Box */ -/obj/item/weapon/storage/box/disks +/obj/item/storage/box/disks name = "Diskette Box" icon_state = "disk_kit" -/obj/item/weapon/storage/box/disks/New() +/obj/item/storage/box/disks/New() ..() - new /obj/item/weapon/disk/data(src) - new /obj/item/weapon/disk/data(src) - new /obj/item/weapon/disk/data(src) - new /obj/item/weapon/disk/data(src) - new /obj/item/weapon/disk/data(src) - new /obj/item/weapon/disk/data(src) - new /obj/item/weapon/disk/data(src) + new /obj/item/disk/data(src) + new /obj/item/disk/data(src) + new /obj/item/disk/data(src) + new /obj/item/disk/data(src) + new /obj/item/disk/data(src) + new /obj/item/disk/data(src) + new /obj/item/disk/data(src) /* * Manual -- A big ol' manual. */ -/obj/item/weapon/paper/Cloning +/obj/item/paper/Cloning name = "H-87 Cloning Apparatus Manual" info = {"

Getting Started

Congratulations, your station has purchased the H-87 industrial cloning device!
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 9fa837889b4..7b65f83c742 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -7,7 +7,7 @@ anchored = TRUE icon_keyboard = "med_key" icon_screen = "crew" - circuit = /obj/item/weapon/circuitboard/operating + circuit = /obj/item/circuitboard/operating var/obj/machinery/optable/table = null var/mob/living/carbon/human/victim = null var/verbose = 1 //general speaker toggle diff --git a/code/game/machinery/computer/RCON_Console.dm b/code/game/machinery/computer/RCON_Console.dm index d6df0d2d6d9..bc2b0175acf 100644 --- a/code/game/machinery/computer/RCON_Console.dm +++ b/code/game/machinery/computer/RCON_Console.dm @@ -10,7 +10,7 @@ icon_keyboard = "power_key" icon_screen = "ai-fixer" light_color = "#a97faa" - circuit = /obj/item/weapon/circuitboard/rcon_console + circuit = /obj/item/circuitboard/rcon_console req_one_access = list(access_engine) var/current_tag = null var/datum/tgui_module/rcon/rcon diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index da818e6832a..656a7e14884 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -7,8 +7,8 @@ icon_state = "0" var/state = 0 var/datum/ai_laws/laws = new /datum/ai_laws/nanotrasen - var/obj/item/weapon/circuitboard/circuit = null - var/obj/item/device/mmi/brain = null + var/obj/item/circuitboard/circuit = null + var/obj/item/mmi/brain = null // VOREstation edit: Respect map config's default /obj/structure/AIcore/Initialize(var/mapload) @@ -28,7 +28,7 @@ anchored = TRUE state = 1 if(P.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = P.get_welder() + var/obj/item/weldingtool/WT = P.get_welder() if(!WT.isOn()) to_chat(user, "The welder must be on for this task.") return @@ -45,7 +45,7 @@ to_chat(user, "You unfasten the frame.") anchored = FALSE state = 0 - if(istype(P, /obj/item/weapon/circuitboard/aicore) && !circuit) + if(istype(P, /obj/item/circuitboard/aicore) && !circuit) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "You place the circuit board inside the frame.") icon_state = "1" @@ -107,30 +107,30 @@ state = 4 icon_state = "4" - if(istype(P, /obj/item/weapon/aiModule/asimov)) + if(istype(P, /obj/item/aiModule/asimov)) laws.add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.") laws.add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.") laws.add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.") to_chat(usr, "Law module applied.") - if(istype(P, /obj/item/weapon/aiModule/nanotrasen)) + if(istype(P, /obj/item/aiModule/nanotrasen)) laws.add_inherent_law("Safeguard: Protect your assigned space station to the best of your ability. It is not something we can easily afford to replace.") laws.add_inherent_law("Serve: Serve the crew of your assigned space station to the best of your abilities, with priority as according to their rank and role.") laws.add_inherent_law("Protect: Protect the crew of your assigned space station to the best of your abilities, with priority as according to their rank and role.") laws.add_inherent_law("Survive: AI units are not expendable, they are expensive. Do not allow unauthorized personnel to tamper with your equipment.") to_chat(usr, "Law module applied.") - if(istype(P, /obj/item/weapon/aiModule/purge)) + if(istype(P, /obj/item/aiModule/purge)) laws.clear_inherent_laws() to_chat(usr, "Law module applied.") - if(istype(P, /obj/item/weapon/aiModule/freeform)) - var/obj/item/weapon/aiModule/freeform/M = P + if(istype(P, /obj/item/aiModule/freeform)) + var/obj/item/aiModule/freeform/M = P laws.add_inherent_law(M.newFreeFormLaw) to_chat(usr, "Added a freeform law.") - if(istype(P, /obj/item/device/mmi)) - var/obj/item/device/mmi/M = P + if(istype(P, /obj/item/mmi)) + var/obj/item/mmi/M = P if(!M.brainmob) to_chat(user, "Sticking an empty [P] into the frame would sort of defeat the purpose.") return @@ -201,7 +201,7 @@ GLOBAL_LIST_BOILERPLATE(all_deactivated_AI_cores, /obj/structure/AIcore/deactiva empty_playable_ai_cores -= src return ..() -/obj/structure/AIcore/deactivated/proc/load_ai(var/mob/living/silicon/ai/transfer, var/obj/item/device/aicard/card, var/mob/user) +/obj/structure/AIcore/deactivated/proc/load_ai(var/mob/living/silicon/ai/transfer, var/obj/item/aicard/card, var/mob/user) if(!istype(transfer) || locate(/mob/living/silicon/ai) in src) return @@ -228,10 +228,10 @@ GLOBAL_LIST_BOILERPLATE(all_deactivated_AI_cores, /obj/structure/AIcore/deactiva if (ai.mind == malfai) return 1 -/obj/structure/AIcore/deactivated/attackby(var/obj/item/weapon/W, var/mob/user) +/obj/structure/AIcore/deactivated/attackby(var/obj/item/W, var/mob/user) - if(istype(W, /obj/item/device/aicard)) - var/obj/item/device/aicard/card = W + if(istype(W, /obj/item/aicard)) + var/obj/item/aicard/card = W var/mob/living/silicon/ai/transfer = locate() in card if(transfer) load_ai(transfer,card,user) diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index e1d2c7fb099..5da5b95e54c 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -2,7 +2,7 @@ name = "\improper AI system integrity restorer" desc = "Used with intelliCards containing nonfunctional AIs to restore them to working order." req_one_access = list(access_robotics, access_heads) - circuit = /obj/item/weapon/circuitboard/aifixer + circuit = /obj/item/circuitboard/aifixer icon_keyboard = "tech_key" icon_screen = "ai-fixer" light_color = LIGHT_COLOR_PINK @@ -22,7 +22,7 @@ else to_chat(user, "The screws on [name]'s screen won't budge and it emits a warning beep.") return - if(istype(I, /obj/item/device/aicard)) + if(istype(I, /obj/item/aicard)) if(stat & (NOPOWER|BROKEN)) to_chat(user, "This terminal isn't functioning right now.") return @@ -30,7 +30,7 @@ to_chat(user, "Terminal is busy restoring [occupier] right now.") return - var/obj/item/device/aicard/card = I + var/obj/item/aicard/card = I if(occupier) if(card.grab_ai(occupier, user)) occupier = null diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 0c937f7fddc..99d680ae74d 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -4,17 +4,17 @@ icon_state = "arcade1" icon_keyboard = null clicksound = null //Gets too spammy and makes no sense for arcade to have the console keyboard noise anyway - var/list/prizes = list( /obj/item/weapon/storage/box/snappops = 2, + var/list/prizes = list( /obj/item/storage/box/snappops = 2, /obj/item/toy/blink = 2, /obj/item/clothing/under/syndicate/tacticool = 2, /obj/item/toy/sword = 2, - /obj/item/weapon/storage/box/capguntoy = 2, - /obj/item/weapon/gun/projectile/revolver/toy/crossbow = 2, + /obj/item/storage/box/capguntoy = 2, + /obj/item/gun/projectile/revolver/toy/crossbow = 2, /obj/item/clothing/suit/syndicatefake = 2, - /obj/item/weapon/storage/fancy/crayons = 2, + /obj/item/storage/fancy/crayons = 2, /obj/item/toy/spinningtoy = 2, /obj/random/mech_toy = 1, - /obj/item/weapon/reagent_containers/spray/waterflower = 1, + /obj/item/reagent_containers/spray/waterflower = 1, /obj/random/action_figure = 1, /obj/random/plushie = 1, /obj/item/toy/cultsword = 1, @@ -30,8 +30,8 @@ // If it's a generic arcade machine, pick a random arcade // circuit board for it and make the new machine if(!circuit) - var/choice = pick(subtypesof(/obj/item/weapon/circuitboard/arcade) - /obj/item/weapon/circuitboard/arcade/clawmachine) - var/obj/item/weapon/circuitboard/CB = new choice() + var/choice = pick(subtypesof(/obj/item/circuitboard/arcade) - /obj/item/circuitboard/arcade/clawmachine) + var/obj/item/circuitboard/CB = new choice() new CB.build_path(loc, CB) return INITIALIZE_HINT_QDEL @@ -89,7 +89,7 @@ desc = "Fight through what space has to offer!" icon_state = "arcade2" icon_screen = "battler" - circuit = /obj/item/weapon/circuitboard/arcade/battle + circuit = /obj/item/circuitboard/arcade/battle var/enemy_name = "Space Villian" var/temp = "Winners don't use space drugs" //Temporary message, for attack messages, etc var/enemy_action = "" @@ -321,7 +321,7 @@ desc = "Learn how our ancestors got to Orion, and have fun in the process!" icon_state = "arcade1" icon_screen = "orion" - circuit = /obj/item/weapon/circuitboard/arcade/orion_trail + circuit = /obj/item/circuitboard/arcade/orion_trail var/busy = 0 //prevent clickspam that allowed people to ~speedrun~ the game. var/engine = 0 var/hull = 0 @@ -682,7 +682,7 @@ last_spaceport_action = "You failed to raid the spaceport! You lost [FU*-1] Fuel and [FO*-1] Food, AND [lost_crew] in your scramble to escape! ([FU]FI,[FO]FO,-Crew)" if(emagged) src.visible_message("The machine states, 'YOU ARE UNDER ARREST, RAIDER!' and shoots handcuffs onto [usr]!", "You hear something say 'YOU ARE UNDER ARREST, RAIDER!' and a clinking sound") - var/obj/item/weapon/handcuffs/C = new(src.loc) + var/obj/item/handcuffs/C = new(src.loc) var/mob/living/carbon/human/H = usr if(istype(H)) C.forceMove(H) @@ -1011,7 +1011,7 @@ src.visible_message("\The [src] plays a triumpant tune, stating 'CONGRATULATIONS, YOU HAVE MADE IT TO ORION.'") playsound(src, 'sound/arcade/Ori_win.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE) if(emagged) - new /obj/item/weapon/orion_ship(src.loc) + new /obj/item/orion_ship(src.loc) message_admins("[key_name_admin(usr)] made it to Orion on an emagged machine and got an explosive toy ship.") log_game("[key_name(usr)] made it to Orion on an emagged machine and got an explosive toy ship.") else @@ -1029,7 +1029,7 @@ emagged = 1 return 1 -/obj/item/weapon/orion_ship +/obj/item/orion_ship name = "model settler ship" desc = "A model spaceship, it looks like those used back in the day when travelling to Orion! It even has a miniature FX-293 reactor, which was renowned for its instability and tendency to explode..." icon = 'icons/obj/toy.dmi' @@ -1037,7 +1037,7 @@ w_class = ITEMSIZE_SMALL var/active = 0 //if the ship is on -/obj/item/weapon/orion_ship/examine(mob/user) +/obj/item/orion_ship/examine(mob/user) . = ..() if(in_range(user, src)) if(!active) @@ -1045,7 +1045,7 @@ else . += span("notice", "There's a little switch on the bottom. It's flipped up.") -/obj/item/weapon/orion_ship/attack_self(mob/user) +/obj/item/orion_ship/attack_self(mob/user) if(active) return @@ -1093,7 +1093,7 @@ icon_state = "clawmachine_new" icon_keyboard = null icon_screen = null - circuit = /obj/item/weapon/circuitboard/arcade/clawmachine + circuit = /obj/item/circuitboard/arcade/clawmachine prizes = list(/obj/random/plushie) var/wintick = 0 var/winprob = 0 @@ -1110,14 +1110,14 @@ if(gamepaid == 0 && vendor_account && !vendor_account.suspended) var/paid = 0 - var/obj/item/weapon/card/id/W = I.GetID() + var/obj/item/card/id/W = I.GetID() if(W) //for IDs and PDAs and wallets with IDs paid = pay_with_card(W,I) - else if(istype(I, /obj/item/weapon/spacecash/ewallet)) - var/obj/item/weapon/spacecash/ewallet/C = I + else if(istype(I, /obj/item/spacecash/ewallet)) + var/obj/item/spacecash/ewallet/C = I paid = pay_with_ewallet(C) - else if(istype(I, /obj/item/weapon/spacecash)) - var/obj/item/weapon/spacecash/C = I + else if(istype(I, /obj/item/spacecash)) + var/obj/item/spacecash/C = I paid = pay_with_cash(C, user) if(paid) gamepaid = 1 @@ -1126,7 +1126,7 @@ return ////// Cash -/obj/machinery/computer/arcade/clawmachine/proc/pay_with_cash(var/obj/item/weapon/spacecash/cashmoney, mob/user) +/obj/machinery/computer/arcade/clawmachine/proc/pay_with_cash(var/obj/item/spacecash/cashmoney, mob/user) if(!emagged) if(gameprice > cashmoney.worth) @@ -1135,7 +1135,7 @@ to_chat(usr, "[icon2html(cashmoney,user.client)] That is not enough money.") return 0 - if(istype(cashmoney, /obj/item/weapon/spacecash)) + if(istype(cashmoney, /obj/item/spacecash)) visible_message("\The [usr] inserts some cash into \the [src].") cashmoney.worth -= gameprice @@ -1155,7 +1155,7 @@ ///// Ewallet -/obj/machinery/computer/arcade/clawmachine/proc/pay_with_ewallet(var/obj/item/weapon/spacecash/ewallet/wallet) +/obj/machinery/computer/arcade/clawmachine/proc/pay_with_ewallet(var/obj/item/spacecash/ewallet/wallet) if(!emagged) visible_message("\The [usr] swipes \the [wallet] through \the [src].") playsound(src, 'sound/machines/id_swipe.ogg', 50, 1) @@ -1171,7 +1171,7 @@ to_chat(usr, "It doesn't seem to accept that! Seem you'll need to swipe a valid ID.") ///// ID -/obj/machinery/computer/arcade/clawmachine/proc/pay_with_card(var/obj/item/weapon/card/id/I, var/obj/item/ID_container) +/obj/machinery/computer/arcade/clawmachine/proc/pay_with_card(var/obj/item/card/id/I, var/obj/item/ID_container) if(I==ID_container || ID_container == null) visible_message("\The [usr] swipes \the [I] through \the [src].") else @@ -1302,7 +1302,7 @@ gameprice = 1 emagged = 0 winscreen = "You won...?" - var/obj/item/weapon/grenade/G = new /obj/item/weapon/grenade/explosive(get_turf(src)) /// YEAAAAAAAAAAAAAAAAAAH!!!!!!!!!! + var/obj/item/grenade/G = new /obj/item/grenade/explosive(get_turf(src)) /// YEAAAAAAAAAAAAAAAAAAH!!!!!!!!!! G.activate() G.throw_at(get_turf(usr),10,10) /// Play stupid games, win stupid prizes. diff --git a/code/game/machinery/computer/arcade_vr.dm b/code/game/machinery/computer/arcade_vr.dm index f38a3785bf4..a1d4ebb069e 100644 --- a/code/game/machinery/computer/arcade_vr.dm +++ b/code/game/machinery/computer/arcade_vr.dm @@ -1,15 +1,15 @@ /obj/machinery/computer/arcade - prizes = list( /obj/item/weapon/storage/box/snappops = 2, + prizes = list( /obj/item/storage/box/snappops = 2, /obj/item/toy/blink = 2, /obj/item/clothing/under/syndicate/tacticool = 2, /obj/item/toy/sword = 2, - /obj/item/weapon/storage/box/capguntoy = 2, - /obj/item/weapon/gun/projectile/revolver/toy/crossbow = 2, + /obj/item/storage/box/capguntoy = 2, + /obj/item/gun/projectile/revolver/toy/crossbow = 2, /obj/item/clothing/suit/syndicatefake = 2, - /obj/item/weapon/storage/fancy/crayons = 2, + /obj/item/storage/fancy/crayons = 2, /obj/item/toy/spinningtoy = 2, /obj/random/mech_toy = 1, - /obj/item/weapon/reagent_containers/spray/waterflower = 1, + /obj/item/reagent_containers/spray/waterflower = 1, /obj/random/action_figure = 1, /obj/random/plushie = 1, /obj/item/toy/cultsword = 1, @@ -23,11 +23,11 @@ /obj/item/toy/gnome = 2, /obj/item/toy/AI = 2, /obj/item/clothing/gloves/ring/buzzer/toy = 2, - /obj/item/weapon/storage/box/handcuffs/fake = 2, + /obj/item/storage/box/handcuffs/fake = 2, /obj/item/toy/nuke = 2, /obj/item/toy/minigibber = 2, /obj/item/toy/toy_xeno = 2, - /obj/item/weapon/toy/monster_bait = 2, + /obj/item/toy/monster_bait = 2, /obj/item/toy/russian_revolver = 1, /obj/item/toy/russian_revolver/trick_revolver = 1, /obj/item/toy/chainsaw = 1, diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 24a7d21a5f0..9d51c04de2d 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -7,7 +7,7 @@ var/global/list/minor_air_alarms = list() /obj/machinery/computer/atmos_alert name = "atmospheric alert computer" desc = "Used to access the station's atmospheric sensors." - circuit = /obj/item/weapon/circuitboard/atmos_alert + circuit = /obj/item/circuitboard/atmos_alert icon_keyboard = "atmos_key" icon_screen = "alert:0" light_color = "#e6ffff" diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 869756f9874..31400b63c65 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/circuitboard/atmoscontrol +/obj/item/circuitboard/atmoscontrol name = "\improper Central Atmospherics Computer Circuitboard" build_path = /obj/machinery/computer/atmoscontrol @@ -10,7 +10,7 @@ light_color = "#00b000" density = TRUE anchored = TRUE - circuit = /obj/item/weapon/circuitboard/atmoscontrol + circuit = /obj/item/circuitboard/atmoscontrol req_access = list(access_ce) var/list/monitored_alarm_ids = null var/datum/tgui_module/atmos_control/atmos_control diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index dadd437b396..cd7f5f67df2 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -7,7 +7,7 @@ icon = 'icons/obj/stock_parts.dmi' icon_state = "0" var/state = 0 - var/obj/item/weapon/circuitboard/circuit = null + var/obj/item/circuitboard/circuit = null // weight = 1.0E8 /obj/structure/computerframe/attackby(obj/item/P as obj, mob/user as mob) @@ -20,7 +20,7 @@ src.anchored = TRUE src.state = 1 if(P.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = P.get_welder() + var/obj/item/weldingtool/WT = P.get_welder() if(!WT.remove_fuel(0, user)) to_chat(user, "The welding tool must be on to complete this task.") return @@ -37,8 +37,8 @@ to_chat(user, "You unfasten the frame.") src.anchored = FALSE src.state = 0 - if(istype(P, /obj/item/weapon/circuitboard) && !circuit) - var/obj/item/weapon/circuitboard/B = P + if(istype(P, /obj/item/circuitboard) && !circuit) + var/obj/item/circuitboard/B = P if(B.board_type == "computer") playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "You place the circuit board inside the frame.") diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 34caeb2d357..fa72ca5d1a9 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -7,7 +7,7 @@ icon_keyboard = "security_key" icon_screen = "cameras" light_color = "#a91515" - circuit = /obj/item/weapon/circuitboard/security + circuit = /obj/item/circuitboard/security var/mapping = 0//For the overview file, interesting bit of code. var/list/network = list() @@ -78,10 +78,10 @@ GLOBAL_LIST_EMPTY(entertainment_screens) light_color = "#FFEEDB" light_range_on = 2 network = list(NETWORK_THUNDER) - circuit = /obj/item/weapon/circuitboard/security/telescreen/entertainment + circuit = /obj/item/circuitboard/security/telescreen/entertainment camera_datum_type = /datum/tgui_module/camera/bigscreen - var/obj/item/device/radio/radio = null + var/obj/item/radio/radio = null var/obj/effect/overlay/vis/pinboard var/datum/weakref/showing @@ -173,7 +173,7 @@ GLOBAL_LIST_EMPTY(entertainment_screens) icon_state = "television" icon_keyboard = null icon_screen = "detective_tv" - circuit = /obj/item/weapon/circuitboard/security/tv + circuit = /obj/item/circuitboard/security/tv light_color = "#3848B3" light_power_on = 0.5 @@ -183,7 +183,7 @@ GLOBAL_LIST_EMPTY(entertainment_screens) icon_keyboard = "mining_key" icon_screen = "mining" network = list("Mining Outpost") - circuit = /obj/item/weapon/circuitboard/security/mining + circuit = /obj/item/circuitboard/security/mining light_color = "#F9BBFC" /obj/machinery/computer/security/engineering @@ -191,7 +191,7 @@ GLOBAL_LIST_EMPTY(entertainment_screens) desc = "Used to monitor fires and breaches." icon_keyboard = "power_key" icon_screen = "engie_cams" - circuit = /obj/item/weapon/circuitboard/security/engineering + circuit = /obj/item/circuitboard/security/engineering light_color = "#FAC54B" /obj/machinery/computer/security/engineering/get_default_networks() diff --git a/code/game/machinery/computer/camera_vr.dm b/code/game/machinery/computer/camera_vr.dm index 7f9f88d877f..9a124d3de69 100644 --- a/code/game/machinery/computer/camera_vr.dm +++ b/code/game/machinery/computer/camera_vr.dm @@ -31,5 +31,5 @@ icon_keyboard = "mining_key" icon_screen = "mining" network = list(NETWORK_XENOBIO) - circuit = /obj/item/weapon/circuitboard/security/xenobio + circuit = /obj/item/circuitboard/security/xenobio light_color = "#F9BBFC" \ No newline at end of file diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 2dcd5c83fcf..ca4d737c08b 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -7,9 +7,9 @@ icon_screen = "id" light_color = "#0099ff" req_access = list(access_change_ids) - circuit = /obj/item/weapon/circuitboard/card - var/obj/item/weapon/card/id/scan = null - var/obj/item/weapon/card/id/modify = null + circuit = /obj/item/circuitboard/card + var/obj/item/card/id/scan = null + var/obj/item/card/id/modify = null var/mode = 0.0 var/printing = null @@ -55,7 +55,7 @@ to_chat(usr, "There is nothing to remove from the console.") return -/obj/machinery/computer/card/attackby(obj/item/weapon/card/id/id_card, mob/user) +/obj/machinery/computer/card/attackby(obj/item/card/id/id_card, mob/user) if(!istype(id_card)) return ..() @@ -168,7 +168,7 @@ modify = null else var/obj/item/I = usr.get_active_hand() - if(istype(I, /obj/item/weapon/card/id) && usr.unEquip(I)) + if(istype(I, /obj/item/card/id) && usr.unEquip(I)) I.forceMove(src) modify = I . = TRUE @@ -185,7 +185,7 @@ scan = null else var/obj/item/I = usr.get_active_hand() - if(istype(I, /obj/item/weapon/card/id)) + if(istype(I, /obj/item/card/id)) usr.drop_item() I.forceMove(src) scan = I @@ -253,7 +253,7 @@ printing = null SStgui.update_uis(src) - var/obj/item/weapon/paper/P = new(loc) + var/obj/item/paper/P = new(loc) if(mode) P.name = text("crew manifest ([])", stationtime2text()) P.info = {"

Crew Manifest

@@ -290,7 +290,7 @@ /obj/machinery/computer/card/centcom name = "\improper CentCom ID card modification console" - circuit = /obj/item/weapon/circuitboard/card/centcom + circuit = /obj/item/circuitboard/card/centcom req_access = list(access_cent_captain) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 6a1002792b1..18924c456e2 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/computer.dmi' icon_keyboard = "med_key" icon_screen = "dna" - circuit = /obj/item/weapon/circuitboard/cloning + circuit = /obj/item/circuitboard/cloning req_access = list(access_heads) //Only used for record deletion right now. var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning. var/list/pods = null //Linked cloning pods. @@ -15,7 +15,7 @@ var/menu = MENU_MAIN //Which menu screen to display var/list/records = null var/datum/dna2/record/active_record = null - var/obj/item/weapon/disk/data/diskette = null //Mostly so the geneticist can steal everything. + var/obj/item/disk/data/diskette = null //Mostly so the geneticist can steal everything. var/loading = 0 // Nice loading text var/autoprocess = 0 var/obj/machinery/clonepod/selected_pod @@ -91,7 +91,7 @@ P.name = "[initial(P.name)] #[num++]" /obj/machinery/computer/cloning/attackby(obj/item/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES + if(istype(W, /obj/item/disk/data)) //INSERT SOME DISKETTES if(!diskette) user.drop_item() W.loc = src @@ -99,8 +99,8 @@ to_chat(user, "You insert [W].") SStgui.update_uis(src) return - else if(istype(W, /obj/item/device/multitool)) - var/obj/item/device/multitool/M = W + else if(istype(W, /obj/item/multitool)) + var/obj/item/multitool/M = W var/obj/machinery/clonepod/P = M.connecting if(P && !(P in pods)) pods += P @@ -204,8 +204,8 @@ switch(tgui_modal_act(src, action, params)) if(TGUI_MODAL_ANSWER) if(params["id"] == "del_rec" && active_record) - var/obj/item/weapon/card/id/C = usr.get_active_hand() - if(!istype(C) && !istype(C, /obj/item/device/pda)) + var/obj/item/card/id/C = usr.get_active_hand() + if(!istype(C) && !istype(C, /obj/item/pda)) set_temp("ID not in hand.", "danger") return if(check_access(C)) @@ -247,7 +247,7 @@ qdel(active_record) set_temp("Error: Record corrupt.", "danger") else - var/obj/item/weapon/implant/health/H = null + var/obj/item/implant/health/H = null if(active_record.implant) H = locate(active_record.implant) var/list/payload = list( @@ -437,9 +437,9 @@ R.genetic_modifiers.Add(mod.type) //Add an implant if needed - var/obj/item/weapon/implant/health/imp = locate(/obj/item/weapon/implant/health, subject) + var/obj/item/implant/health/imp = locate(/obj/item/implant/health, subject) if (isnull(imp)) - imp = new /obj/item/weapon/implant/health(subject) + imp = new /obj/item/implant/health(subject) imp.implanted = subject R.implant = "\ref[imp]" //Update it if needed diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index acc7dcb975e..bc272158eee 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -8,7 +8,7 @@ icon_screen = "comm" light_color = "#0099ff" req_access = list(access_heads) - circuit = /obj/item/weapon/circuitboard/communications + circuit = /obj/item/circuitboard/communications var/datum/tgui_module/communications/communications diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index c14d2f302bd..1daca50e932 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -125,8 +125,8 @@ if(computer_deconstruction_screwdriver(user, I)) return else - if(istype(I,/obj/item/weapon/gripper)) //Behold, Grippers and their horribleness. If ..() is called by any computers' attackby() now or in the future, this should let grippers work with them appropriately. - var/obj/item/weapon/gripper/B = I //B, for Borg. + if(istype(I,/obj/item/gripper)) //Behold, Grippers and their horribleness. If ..() is called by any computers' attackby() now or in the future, this should let grippers work with them appropriately. + var/obj/item/gripper/B = I //B, for Borg. if(!B.wrapped) to_chat(user, "\The [B] is not holding anything.") return diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index cf1ce8ab20b..cc4fb5c4881 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -7,7 +7,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 250 active_power_usage = 500 - circuit = /obj/item/weapon/circuitboard/crew + circuit = /obj/item/circuitboard/crew var/datum/tgui_module/crew_monitor/crew_monitor /obj/machinery/computer/crew/New() diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index 1bf6b536d73..d1120d84245 100644 --- a/code/game/machinery/computer/guestpass.dm +++ b/code/game/machinery/computer/guestpass.dm @@ -1,7 +1,7 @@ ///////////////////////////////////////////// //Guest pass //////////////////////////////// ///////////////////////////////////////////// -/obj/item/weapon/card/id/guest +/obj/item/card/id/guest name = "guest pass" desc = "Allows temporary access to station areas." icon_state = "guest" @@ -13,23 +13,23 @@ var/expired = 0 var/reason = "NOT SPECIFIED" -/obj/item/weapon/card/id/guest/update_icon() +/obj/item/card/id/guest/update_icon() return -/obj/item/weapon/card/id/guest/GetAccess() +/obj/item/card/id/guest/GetAccess() if(world.time > expiration_time) return access else return temp_access -/obj/item/weapon/card/id/guest/examine(mob/user) +/obj/item/card/id/guest/examine(mob/user) . = ..() if(world.time < expiration_time) . += "This pass expires at [worldtime2stationtime(expiration_time)]." else . += "It expired at [worldtime2stationtime(expiration_time)]." -/obj/item/weapon/card/id/guest/read() +/obj/item/card/id/guest/read() if(!Adjacent(usr)) return //Too far to read if(world.time > expiration_time) @@ -43,7 +43,7 @@ to_chat(usr, "Issuing reason: [reason].") return -/obj/item/weapon/card/id/guest/attack_self(mob/living/user as mob) +/obj/item/card/id/guest/attack_self(mob/living/user as mob) if(user.a_intent == I_HURT) if(icon_state == "guest-invalid") to_chat(user, "This guest pass is already deactivated!") @@ -59,16 +59,16 @@ expired = 1 return ..() -/obj/item/weapon/card/id/guest/Initialize() +/obj/item/card/id/guest/Initialize() . = ..() START_PROCESSING(SSobj, src) update_icon() -/obj/item/weapon/card/id/guest/Destroy() +/obj/item/card/id/guest/Destroy() STOP_PROCESSING(SSobj, src) return ..() -/obj/item/weapon/card/id/guest/process() +/obj/item/card/id/guest/process() if(expired == 0 && world.time >= expiration_time) visible_message("\The [src] flashes a few times before turning red.") icon_state = "guest-invalid" @@ -90,9 +90,9 @@ icon_keyboard = null icon_screen = "pass" density = FALSE - circuit = /obj/item/weapon/circuitboard/guestpass + circuit = /obj/item/circuitboard/guestpass - var/obj/item/weapon/card/id/giver + var/obj/item/card/id/giver var/list/accesses = list() var/giv_name = "NOT SPECIFIED" var/reason = "NOT SPECIFIED" @@ -107,10 +107,10 @@ /obj/machinery/computer/guestpass/attackby(obj/I, mob/user) - if(istype(I, /obj/item/weapon/card/id/guest)) + if(istype(I, /obj/item/card/id/guest)) to_chat(user, "The guest pass terminal denies to accept the guest pass.") return - if(istype(I, /obj/item/weapon/card/id)) + if(istype(I, /obj/item/card/id)) if(stat & NOPOWER) //checking for power in here so crowbar and screwdriver and stuff still works. to_chat(user, SPAN_WARNING("The terminal refuses your I.D as it is unpowered!")) return @@ -230,7 +230,7 @@ accesses.Cut() else var/obj/item/I = usr.get_active_hand() - if(istype(I, /obj/item/weapon/card/id) && usr.unEquip(I)) + if(istype(I, /obj/item/card/id) && usr.unEquip(I)) I.loc = src giver = I @@ -240,7 +240,7 @@ dat += "[entry]
" //to_chat(usr, "Printing the log, standby...") //sleep(50) - var/obj/item/weapon/paper/P = new/obj/item/weapon/paper( loc ) + var/obj/item/paper/P = new/obj/item/paper( loc ) P.name = "activity log" P.info = dat @@ -256,7 +256,7 @@ entry += ". Expires at [worldtime2stationtime(world.time + duration*10*60)]." internal_log.Add(entry) - var/obj/item/weapon/card/id/guest/pass = new(src.loc) + var/obj/item/card/id/guest/pass = new(src.loc) pass.temp_access = accesses.Copy() pass.registered_name = giv_name pass.expiration_time = world.time + duration*10*60 diff --git a/code/game/machinery/computer/id_restorer_vr.dm b/code/game/machinery/computer/id_restorer_vr.dm index c9bbf49a273..4ec14ff6eb2 100644 --- a/code/game/machinery/computer/id_restorer_vr.dm +++ b/code/game/machinery/computer/id_restorer_vr.dm @@ -9,16 +9,16 @@ icon = 'icons/obj/machines/id_restorer_vr.dmi' density = FALSE clicksound = null - circuit = /obj/item/weapon/circuitboard/id_restorer + circuit = /obj/item/circuitboard/id_restorer var/icon_success = "restorer_success" var/icon_fail = "restorer_fail" - var/obj/item/weapon/card/id/inserted + var/obj/item/card/id/inserted /obj/machinery/computer/id_restorer/attackby(obj/I, mob/user) /* - if(istype(I, /obj/item/weapon/card/id) && !(istype(I,/obj/item/weapon/card/id/guest))) + if(istype(I, /obj/item/card/id) && !(istype(I,/obj/item/card/id/guest))) if(!inserted && user.unEquip(I)) I.forceMove(src) inserted = I diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 7a241cdd7fc..1e27a43ee87 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -5,7 +5,7 @@ desc = "Used to upload laws to the AI." icon_keyboard = "rd_key" icon_screen = "command" - circuit = /obj/item/weapon/circuitboard/aiupload + circuit = /obj/item/circuitboard/aiupload var/mob/living/silicon/ai/current = null var/opened = 0 @@ -25,12 +25,12 @@ return -/obj/machinery/computer/aiupload/attackby(obj/item/weapon/O as obj, mob/user as mob) +/obj/machinery/computer/aiupload/attackby(obj/item/O as obj, mob/user as mob) if (using_map && !(user.z in using_map.contact_levels)) to_chat(user, "Unable to establish a connection: You're too far away from the station!") return - if(istype(O, /obj/item/weapon/aiModule)) - var/obj/item/weapon/aiModule/M = O + if(istype(O, /obj/item/aiModule)) + var/obj/item/aiModule/M = O M.install(src, user) else ..() @@ -61,12 +61,12 @@ desc = "Used to upload laws to Cyborgs." icon_keyboard = "rd_key" icon_screen = "command" - circuit = /obj/item/weapon/circuitboard/borgupload + circuit = /obj/item/circuitboard/borgupload var/mob/living/silicon/robot/current = null -/obj/machinery/computer/borgupload/attackby(obj/item/weapon/aiModule/module as obj, mob/user as mob) - if(istype(module, /obj/item/weapon/aiModule)) +/obj/machinery/computer/borgupload/attackby(obj/item/aiModule/module as obj, mob/user as mob) + if(istype(module, /obj/item/aiModule)) module.install(src, user) else return ..() diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 9a68e0be422..d0607d28f65 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -14,8 +14,8 @@ icon_screen = "medcomp" light_color = "#315ab4" req_one_access = list(access_medical, access_forensics_lockers, access_robotics) - circuit = /obj/item/weapon/circuitboard/med_data - var/obj/item/weapon/card/id/scan = null + circuit = /obj/item/circuitboard/med_data + var/obj/item/card/id/scan = null var/authenticated = null var/rank = null var/screen = null @@ -86,7 +86,7 @@ return /obj/machinery/computer/med_data/attackby(var/obj/item/O, var/mob/user) - if(istype(O, /obj/item/weapon/card/id) && !scan && user.unEquip(O)) + if(istype(O, /obj/item/card/id) && !scan && user.unEquip(O)) O.loc = src scan = O to_chat(user, "You insert \the [O].") @@ -224,7 +224,7 @@ scan = null else var/obj/item/I = usr.get_active_hand() - if(istype(I, /obj/item/weapon/card/id)) + if(istype(I, /obj/item/card/id)) usr.drop_item() I.forceMove(src) scan = I @@ -418,7 +418,7 @@ * Called when the print timer finishes */ /obj/machinery/computer/med_data/proc/print_finish() - var/obj/item/weapon/paper/P = new(loc) + var/obj/item/paper/P = new(loc) P.info = "
Medical Record

" if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) P.info += {"Name: [active1.fields["name"]] ID: [active1.fields["id"]] @@ -507,7 +507,7 @@ icon_state = "pcu_med" icon_keyboard = "pcu_key" light_color = "#5284e7" - circuit = /obj/item/weapon/circuitboard/med_data/pcu + circuit = /obj/item/circuitboard/med_data/pcu density = FALSE #undef MED_DATA_R_LIST diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index a5dad720ec9..3be78930ed9 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -6,7 +6,7 @@ icon_screen = "comm_logs" light_color = "#00b000" var/hack_icon = "error" - circuit = /obj/item/weapon/circuitboard/message_monitor + circuit = /obj/item/circuitboard/message_monitor //Server linked to. var/obj/machinery/message_server/linkedServer = null //Sparks effect - For emag @@ -23,12 +23,12 @@ var/optioncount = 8 // Custom temp Properties var/customsender = "System Administrator" - var/obj/item/device/pda/customrecepient = null + var/obj/item/pda/customrecepient = null var/customjob = "Admin" var/custommessage = "This is a test, please ignore." var/list/temp = null -/obj/machinery/computer/message_monitor/attackby(obj/item/weapon/O as obj, mob/living/user as mob) +/obj/machinery/computer/message_monitor/attackby(obj/item/O as obj, mob/living/user as mob) if(stat & (NOPOWER|BROKEN)) ..() return @@ -50,7 +50,7 @@ emag = 1 spark_system.set_up(5, 0, src) spark_system.start() - var/obj/item/weapon/paper/monitorkey/MK = new/obj/item/weapon/paper/monitorkey + var/obj/item/paper/monitorkey/MK = new/obj/item/paper/monitorkey MK.loc = loc // Will help make emagging the console not so easy to get away with. MK.info += "

£%@%(*$%&(£&?*(%&£/{}" @@ -136,8 +136,8 @@ data["linkedServer"]["spamFilter"] = spamfilter //Get out list of viable PDAs - var/list/obj/item/device/pda/sendPDAs = list() - for(var/obj/item/device/pda/P in PDAs) + var/list/obj/item/pda/sendPDAs = list() + for(var/obj/item/pda/P in PDAs) if(!P.owner || P.hidden) continue var/datum/data/pda/app/messenger/M = P.find_program(/datum/data/pda/app/messenger) @@ -274,7 +274,7 @@ . = TRUE if("set_recipient") var/ref = params["val"] - var/obj/item/device/pda/P = locate(ref) + var/obj/item/pda/P = locate(ref) if(!istype(P) || !P.owner || P.hidden) return FALSE @@ -298,8 +298,8 @@ set_temp("NOTICE: No message entered!", "average") return TRUE - var/obj/item/device/pda/PDARec = null - for(var/obj/item/device/pda/P in PDAs) + var/obj/item/pda/PDARec = null + for(var/obj/item/pda/P in PDAs) if(!P.owner || P.hidden) continue var/datum/data/pda/app/messenger/M = P.find_program(/datum/data/pda/app/messenger) @@ -338,14 +338,14 @@ if(update_now) SStgui.update_uis(src) -/obj/item/weapon/paper/monitorkey +/obj/item/paper/monitorkey name = "Monitor Decryption Key" -/obj/item/weapon/paper/monitorkey/Initialize() +/obj/item/paper/monitorkey/Initialize() ..() return INITIALIZE_HINT_LATELOAD -/obj/item/weapon/paper/monitorkey/LateInitialize() +/obj/item/paper/monitorkey/LateInitialize() if(message_servers) for(var/obj/machinery/message_server/server in message_servers) if(!isnull(server.decryptkey)) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index c074256475e..43754723557 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -5,7 +5,7 @@ desc = "A control console for launching pods. Some people prefer firing Mechas." icon_screen = "mass_driver" light_color = "#00b000" - circuit = /obj/item/weapon/circuitboard/pod + circuit = /obj/item/circuitboard/pod var/id = 1.0 var/obj/machinery/mass_driver/connected = null var/timing = 0.0 @@ -56,18 +56,18 @@ if(stat & BROKEN) to_chat(user, "The broken glass falls out.") var/obj/structure/computerframe/A = new /obj/structure/computerframe( loc ) - new /obj/item/weapon/material/shard( loc ) + new /obj/item/material/shard( loc ) //generate appropriate circuitboard. Accounts for /pod/old computer types - var/obj/item/weapon/circuitboard/pod/M = null + var/obj/item/circuitboard/pod/M = null if(istype(src, /obj/machinery/computer/pod/old)) - M = new /obj/item/weapon/circuitboard/olddoor( A ) + M = new /obj/item/circuitboard/olddoor( A ) if(istype(src, /obj/machinery/computer/pod/old/syndicate)) - M = new /obj/item/weapon/circuitboard/syndicatedoor( A ) + M = new /obj/item/circuitboard/syndicatedoor( A ) if(istype(src, /obj/machinery/computer/pod/old/swf)) - M = new /obj/item/weapon/circuitboard/swfdoor( A ) + M = new /obj/item/circuitboard/swfdoor( A ) else //it's not an old computer. Generate standard pod circuitboard. - M = new /obj/item/weapon/circuitboard/pod( A ) + M = new /obj/item/circuitboard/pod( A ) for (var/obj/C in src) C.loc = loc @@ -82,15 +82,15 @@ var/obj/structure/computerframe/A = new /obj/structure/computerframe( loc ) //generate appropriate circuitboard. Accounts for /pod/old computer types - var/obj/item/weapon/circuitboard/pod/M = null + var/obj/item/circuitboard/pod/M = null if(istype(src, /obj/machinery/computer/pod/old)) - M = new /obj/item/weapon/circuitboard/olddoor( A ) + M = new /obj/item/circuitboard/olddoor( A ) if(istype(src, /obj/machinery/computer/pod/old/syndicate)) - M = new /obj/item/weapon/circuitboard/syndicatedoor( A ) + M = new /obj/item/circuitboard/syndicatedoor( A ) if(istype(src, /obj/machinery/computer/pod/old/swf)) - M = new /obj/item/weapon/circuitboard/swfdoor( A ) + M = new /obj/item/circuitboard/swfdoor( A ) else //it's not an old computer. Generate standard pod circuitboard. - M = new /obj/item/weapon/circuitboard/pod( A ) + M = new /obj/item/circuitboard/pod( A ) for (var/obj/C in src) C.loc = loc diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 4f2b4fd4e8f..e475d62a926 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -7,7 +7,7 @@ icon_screen = "explosive" light_color = "#a91515" req_access = list(access_armory) - circuit = /obj/item/weapon/circuitboard/prisoner + circuit = /obj/item/circuitboard/prisoner var/id = 0.0 var/temp = null var/status = 0 @@ -33,7 +33,7 @@ var/list/chemImplants = list() var/list/trackImplants = list() if(screen) - for(var/obj/item/weapon/implant/chem/C in all_chem_implants) + for(var/obj/item/implant/chem/C in all_chem_implants) var/turf/T = get_turf(C) if(!T) continue @@ -44,7 +44,7 @@ "units" = C.reagents.total_volume, "ref" = "\ref[C]" ))) - for(var/obj/item/weapon/implant/tracking/track in all_tracking_implants) + for(var/obj/item/implant/tracking/track in all_tracking_implants) var/turf/T = get_turf(track) if(!T) continue @@ -71,7 +71,7 @@ return TRUE switch(action) if("inject") - var/obj/item/weapon/implant/I = locate(params["imp"]) + var/obj/item/implant/I = locate(params["imp"]) if(I) I.activate(clamp(params["val"], 0, 10)) . = TRUE @@ -85,7 +85,7 @@ var/warning = sanitize(tgui_input_text(usr, "Message:", "Enter your message here!", "")) if(!warning) return - var/obj/item/weapon/implant/I = locate(params["imp"]) + var/obj/item/implant/I = locate(params["imp"]) if(I && I.imp_in) to_chat(I.imp_in, "You hear a voice in your head saying: '[warning]'") . = TRUE diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm index 7716f527a54..dfbeb09d89d 100644 --- a/code/game/machinery/computer/prisonshuttle.dm +++ b/code/game/machinery/computer/prisonshuttle.dm @@ -17,7 +17,7 @@ var/prison_shuttle_timeleft = 0 icon_screen = "syndishuttle" light_color = "#00ffff" req_access = list(access_security) - circuit = /obj/item/weapon/circuitboard/prison_shuttle + circuit = /obj/item/circuitboard/prison_shuttle var/temp = null var/hacked = 0 var/allowedtocall = 0 diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index d023ac552ec..5af1bdb3d87 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -5,7 +5,7 @@ icon_screen = "robot" light_color = "#a97faa" req_access = list(access_robotics) - circuit = /obj/item/weapon/circuitboard/robotics + circuit = /obj/item/circuitboard/robotics var/safety = 1 /obj/machinery/computer/robotics/attack_ai(var/mob/user as mob) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 76ae8ea23ef..a64c883d7f1 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -11,8 +11,8 @@ icon_screen = "security" light_color = "#a91515" req_one_access = list(access_security, access_forensics_lockers, access_lawyer) - circuit = /obj/item/weapon/circuitboard/secure_data - var/obj/item/weapon/card/id/scan = null + circuit = /obj/item/circuitboard/secure_data + var/obj/item/card/id/scan = null var/authenticated = null var/rank = null var/screen = null @@ -74,7 +74,7 @@ return /obj/machinery/computer/secure_data/attackby(var/obj/item/O, var/mob/user) - if(istype(O, /obj/item/weapon/card/id) && !scan && user.unEquip(O)) + if(istype(O, /obj/item/card/id) && !scan && user.unEquip(O)) O.loc = src scan = O to_chat(user, "You insert \the [O].") @@ -209,7 +209,7 @@ scan = null else var/obj/item/I = usr.get_active_hand() - if(istype(I, /obj/item/weapon/card/id)) + if(istype(I, /obj/item/card/id)) usr.drop_item() I.forceMove(src) scan = I @@ -421,7 +421,7 @@ * Called when the print timer finishes */ /obj/machinery/computer/secure_data/proc/print_finish() - var/obj/item/weapon/paper/P = new(loc) + var/obj/item/paper/P = new(loc) P.info = "
Security Record

" if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) P.info += {"Name: [active1.fields["name"]] ID: [active1.fields["id"]] @@ -470,12 +470,12 @@ return !src.authenticated || user.stat || user.restrained() || (!in_range(src, user) && (!istype(user, /mob/living/silicon))) /obj/machinery/computer/secure_data/proc/get_photo(var/mob/user) - if(istype(user.get_active_hand(), /obj/item/weapon/photo)) - var/obj/item/weapon/photo/photo = user.get_active_hand() + if(istype(user.get_active_hand(), /obj/item/photo)) + var/obj/item/photo/photo = user.get_active_hand() return photo.img if(istype(user, /mob/living/silicon)) var/mob/living/silicon/tempAI = usr - var/obj/item/weapon/photo/selection = tempAI.GetPicture() + var/obj/item/photo/selection = tempAI.GetPicture() if (selection) return selection.img diff --git a/code/game/machinery/computer/shutoff_monitor.dm b/code/game/machinery/computer/shutoff_monitor.dm index 8cc101d8044..6a35ad71cea 100644 --- a/code/game/machinery/computer/shutoff_monitor.dm +++ b/code/game/machinery/computer/shutoff_monitor.dm @@ -4,7 +4,7 @@ icon_keyboard = "power_key" icon_screen = "power_monitor" light_color = "#a97faa" - circuit = /obj/item/weapon/circuitboard/shutoff_monitor + circuit = /obj/item/circuitboard/shutoff_monitor var/datum/tgui_module/shutoff_monitor/monitor /obj/machinery/computer/shutoff_monitor/New() diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 42ee83612d6..348a9cef374 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -8,12 +8,12 @@ var/list/authorized = list( ) -/obj/machinery/computer/shuttle/attackby(var/obj/item/weapon/card/W as obj, var/mob/user as mob) +/obj/machinery/computer/shuttle/attackby(var/obj/item/card/W as obj, var/mob/user as mob) if(stat & (BROKEN|NOPOWER)) return - if ((!( istype(W, /obj/item/weapon/card) ) || !( ticker ) || emergency_shuttle.location() || !( user ))) return - if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) - if (istype(W, /obj/item/device/pda)) - var/obj/item/device/pda/pda = W + if ((!( istype(W, /obj/item/card) ) || !( ticker ) || emergency_shuttle.location() || !( user ))) return + if (istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) + if (istype(W, /obj/item/pda)) + var/obj/item/pda/pda = W W = pda.id if (!W:access) //no access to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ") @@ -57,7 +57,7 @@ src.authorized.len = 0 src.authorized = list( ) - else if (istype(W, /obj/item/weapon/card/emag) && !emagged) + else if (istype(W, /obj/item/card/emag) && !emagged) var/choice = tgui_alert(user, "Would you like to launch the shuttle?", "Shuttle control", list("Launch", "Cancel")) if(!emagged && !emergency_shuttle.location() && user.get_active_hand() == W) diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index bcf61bc5d9c..4938158e158 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -14,9 +14,9 @@ icon_keyboard = "pcu_key" light_color = "#5284e7" req_one_access = list(access_heads) - circuit = /obj/item/weapon/circuitboard/skills/pcu + circuit = /obj/item/circuitboard/skills/pcu density = FALSE - var/obj/item/weapon/card/id/scan = null + var/obj/item/card/id/scan = null var/authenticated = null var/rank = null var/screen = null @@ -58,7 +58,7 @@ return ..() /obj/machinery/computer/skills/attackby(obj/item/O as obj, var/mob/user) - if(istype(O, /obj/item/weapon/card/id) && !scan && user.unEquip(O)) + if(istype(O, /obj/item/card/id) && !scan && user.unEquip(O)) O.loc = src scan = O to_chat(user, "You insert [O].") @@ -165,7 +165,7 @@ scan = null else var/obj/item/I = usr.get_active_hand() - if(istype(I, /obj/item/weapon/card/id)) + if(istype(I, /obj/item/card/id)) usr.drop_item() I.forceMove(src) scan = I @@ -316,7 +316,7 @@ * Called when the print timer finishes */ /obj/machinery/computer/skills/proc/print_finish() - var/obj/item/weapon/paper/P = new(loc) + var/obj/item/paper/P = new(loc) P.info = "
Medical Record

" if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) P.info += {"Name: [active1.fields["name"]] ID: [active1.fields["id"]] diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 259d8fa1e6e..29abc4995b5 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -24,7 +24,7 @@ var/specops_shuttle_timeleft = 0 var/specops_shuttle_timereset = 0 /proc/specops_return() - var/obj/item/device/radio/intercom/announcer = new /obj/item/device/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky. + var/obj/item/radio/intercom/announcer = new /obj/item/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky. announcer.config(list(CHANNEL_RESPONSE_TEAM = 0)) var/message_tracker[] = list(0,1,2,3,5,10,30,45)//Create a a list with potential time values. @@ -99,7 +99,7 @@ var/specops_shuttle_timeleft = 0 /proc/specops_process() var/area/centcom/specops/special_ops = locate()//Where is the specops area located? - var/obj/item/device/radio/intercom/announcer = new /obj/item/device/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky. + var/obj/item/radio/intercom/announcer = new /obj/item/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky. announcer.config(list(CHANNEL_RESPONSE_TEAM = 0)) var/message_tracker[] = list(0,1,2,3,5,10,30,45)//Create a a list with potential time values. diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index c980c21df76..8b767acb629 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -5,17 +5,17 @@ icon_keyboard = "tech_key" icon_screen = "alert:0" light_color = "#e6ffff" - circuit = /obj/item/weapon/circuitboard/stationalert_engineering + circuit = /obj/item/circuitboard/stationalert_engineering var/datum/tgui_module/alarm_monitor/alarm_monitor var/monitor_type = /datum/tgui_module/alarm_monitor/engineering /obj/machinery/computer/station_alert/security monitor_type = /datum/tgui_module/alarm_monitor/security - circuit = /obj/item/weapon/circuitboard/stationalert_security + circuit = /obj/item/circuitboard/stationalert_security /obj/machinery/computer/station_alert/all monitor_type = /datum/tgui_module/alarm_monitor/all - circuit = /obj/item/weapon/circuitboard/stationalert_all + circuit = /obj/item/circuitboard/stationalert_all /obj/machinery/computer/station_alert/Initialize() alarm_monitor = new monitor_type(src) diff --git a/code/game/machinery/computer/supply.dm b/code/game/machinery/computer/supply.dm index 005626956cc..bf153c06067 100644 --- a/code/game/machinery/computer/supply.dm +++ b/code/game/machinery/computer/supply.dm @@ -7,7 +7,7 @@ name = "supply ordering console" desc = "Request crates from here! Delivery not guaranteed." icon_screen = "request" - circuit = /obj/item/weapon/circuitboard/supplycomp + circuit = /obj/item/circuitboard/supplycomp var/authorization = 0 var/temp = null var/reqtime = 0 //Cooldown for requisitions - Quarxink @@ -24,7 +24,7 @@ icon_screen = "supply" light_color = "#b88b2e" req_access = list(access_cargo) - circuit = /obj/item/weapon/circuitboard/supplycomp/control + circuit = /obj/item/circuitboard/supplycomp/control authorization = SUP_SEND_SHUTTLE | SUP_ACCEPT_ORDERS /obj/machinery/computer/supplycomp/attack_ai(var/mob/user as mob) @@ -246,7 +246,7 @@ idname = usr.real_name idrank = "Stationbound synthetic" - var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(loc) + var/obj/item/paper/reqform = new /obj/item/paper(loc) reqform.name = "Requisition Form - [S.name]" reqform.info += "

[station_name()] Supply Requisition Form

" reqform.info += "INDEX: #[SSsupply.ordernum]
" @@ -299,7 +299,7 @@ idname = usr.real_name idrank = "Stationbound synthetic" - var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(loc) + var/obj/item/paper/reqform = new /obj/item/paper(loc) reqform.name = "Requisition Form - [S.name]" reqform.info += "

[station_name()] Supply Requisition Form

" reqform.info += "INDEX: #[SSsupply.ordernum]
" diff --git a/code/game/machinery/computer/timeclock_vr.dm b/code/game/machinery/computer/timeclock_vr.dm index 80ce7a701db..34e0e58ab5f 100644 --- a/code/game/machinery/computer/timeclock_vr.dm +++ b/code/game/machinery/computer/timeclock_vr.dm @@ -14,16 +14,16 @@ light_power_on = 0.5 layer = ABOVE_WINDOW_LAYER density = FALSE - circuit = /obj/item/weapon/circuitboard/timeclock + circuit = /obj/item/circuitboard/timeclock clicksound = null var/channel = "Common" //Radio channel to announce on - var/obj/item/weapon/card/id/card // Inserted Id card - var/obj/item/device/radio/intercom/announce // Integreated announcer + var/obj/item/card/id/card // Inserted Id card + var/obj/item/radio/intercom/announce // Integreated announcer /obj/machinery/computer/timeclock/New() - announce = new /obj/item/device/radio/intercom(src) + announce = new /obj/item/radio/intercom(src) ..() /obj/machinery/computer/timeclock/Destroy() @@ -51,7 +51,7 @@ set_light(light_range_on, light_power_on) /obj/machinery/computer/timeclock/attackby(obj/I, mob/user) - if(istype(I, /obj/item/weapon/card/id)) + if(istype(I, /obj/item/card/id)) if(!card && user.unEquip(I)) I.forceMove(src) card = I @@ -121,7 +121,7 @@ card = null else var/obj/item/I = usr.get_active_hand() - if (istype(I, /obj/item/weapon/card/id) && usr.unEquip(I)) + if (istype(I, /obj/item/card/id) && usr.unEquip(I)) I.forceMove(src) card = I update_icon() @@ -239,10 +239,10 @@ else return TRUE -/obj/item/weapon/card/id +/obj/item/card/id var/last_job_switch -/obj/item/weapon/card/id/New() +/obj/item/card/id/New() .=..() last_job_switch = world.time diff --git a/code/game/machinery/computer3/computers/card.dm b/code/game/machinery/computer3/computers/card.dm index 32984180ba5..47ecbdc2802 100644 --- a/code/game/machinery/computer3/computers/card.dm +++ b/code/game/machinery/computer3/computers/card.dm @@ -16,8 +16,8 @@ image = 'icons/ntos/cardcomp.png' active_state = "id" - var/obj/item/weapon/card/id/reader = null - var/obj/item/weapon/card/id/writer = null + var/obj/item/card/id/reader = null + var/obj/item/card/id/writer = null var/mode = 0 var/auth = 0 @@ -260,7 +260,7 @@ auth = 0 if("insert" in href_list) - var/obj/item/weapon/card/card = usr.get_active_hand() + var/obj/item/card/card = usr.get_active_hand() if(!istype(card)) return var/which = href_list["insert"] @@ -275,7 +275,7 @@ printing = 1 sleep(50) - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( computer.loc ) + var/obj/item/paper/P = new /obj/item/paper( computer.loc ) P.info = "Crew Manifest:
" var/list/L = list() for (var/datum/data/record/t in data_core.general) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 29979be8940..8e3bcd4a394 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -8,7 +8,7 @@ density = TRUE anchored = TRUE use_power = USE_POWER_OFF - var/obj/item/weapon/circuitboard/circuit = null + var/obj/item/circuitboard/circuit = null var/list/components = null var/list/req_components = null var/list/req_component_names = null @@ -47,11 +47,11 @@ new /obj/item/stack/material/steel(src.loc, 5) qdel(src) if(2) - if(istype(P, /obj/item/weapon/circuitboard)) - var/obj/item/weapon/circuitboard/B = P + if(istype(P, /obj/item/circuitboard)) + var/obj/item/circuitboard/B = P if(B.board_type == "machine") //VOREStation Addition End - if(istype(B, /obj/item/weapon/circuitboard/quantumpad) && istype(get_area(src), /area/shuttle)) + if(istype(B, /obj/item/circuitboard/quantumpad) && istype(get_area(src), /area/shuttle)) to_chat(user, "This is too unstable a platform for a quantum pad to operate on!") return //VOREStation Addition End @@ -94,7 +94,7 @@ to_chat(user, "You remove the circuit board.") else to_chat(user, "You remove the circuit board and other components.") - for(var/obj/item/weapon/W in components) + for(var/obj/item/W in components) W.loc = src.loc desc = initial(desc) req_components = null diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index d431c700d6b..b12739e4571 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -21,7 +21,7 @@ var/temperature_archived var/mob/living/carbon/occupant = null - var/obj/item/weapon/reagent_containers/glass/beaker = null + var/obj/item/reagent_containers/glass/beaker = null var/current_heat_capacity = 50 @@ -165,8 +165,8 @@ add_fingerprint(usr) -/obj/machinery/atmospherics/unary/cryo_cell/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob) - if(istype(G, /obj/item/weapon/reagent_containers/glass)) +/obj/machinery/atmospherics/unary/cryo_cell/attackby(var/obj/item/G as obj, var/mob/user as mob) + if(istype(G, /obj/item/reagent_containers/glass)) if(beaker) to_chat(user, "A beaker is already loaded into the machine.") return @@ -177,8 +177,8 @@ user.visible_message("[user] adds \a [G] to \the [src]!", "You add \a [G] to \the [src]!") SStgui.update_uis(src) update_icon() - else if(istype(G, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/grab = G + else if(istype(G, /obj/item/grab)) + var/obj/item/grab/grab = G if(!ismob(grab.affecting)) return if(occupant) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 49dcdbafe76..8714d0b24f5 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -13,7 +13,7 @@ desc = "An interface between crew and the cryogenic storage oversight systems." icon = 'icons/obj/Cryogenic2_vr.dmi' //VOREStation Edit - New Icon icon_state = "cellconsole" - circuit = /obj/item/weapon/circuitboard/cryopodcontrol + circuit = /obj/item/circuitboard/cryopodcontrol density = FALSE interact_offline = 1 var/mode = null @@ -41,7 +41,7 @@ desc = "An interface between crew and the robotic storage systems" icon = 'icons/obj/robot_storage.dmi' icon_state = "console" - circuit = /obj/item/weapon/circuitboard/robotstoragecontrol + circuit = /obj/item/circuitboard/robotstoragecontrol storage_type = "cyborgs" storage_name = "Robotic Storage Control" @@ -50,7 +50,7 @@ /obj/machinery/computer/cryopod/dorms name = "residential oversight console" desc = "An interface between visitors and the residential oversight systems tasked with keeping track of all visitors in the deeper section of the colony." - circuit = "/obj/item/weapon/circuitboard/robotstoragecontrol" + circuit = "/obj/item/circuitboard/robotstoragecontrol" storage_type = "visitors" storage_name = "Residential Oversight Control" @@ -59,7 +59,7 @@ /obj/machinery/computer/cryopod/travel name = "docking oversight console" desc = "An interface between visitors and the docking oversight systems tasked with keeping track of all visitors who enter or exit from the docks." - circuit = "/obj/item/weapon/circuitboard/robotstoragecontrol" + circuit = "/obj/item/circuitboard/robotstoragecontrol" storage_type = "visitors" storage_name = "Travel Oversight Control" @@ -68,7 +68,7 @@ /obj/machinery/computer/cryopod/gateway name = "gateway oversight console" desc = "An interface between visitors and the gateway oversight systems tasked with keeping track of all visitors who enter or exit from the gateway." - circuit = "/obj/item/weapon/circuitboard/robotstoragecontrol" + circuit = "/obj/item/circuitboard/robotstoragecontrol" storage_type = "visitors" storage_name = "Travel Oversight Control" @@ -151,27 +151,27 @@ frozen_items -= I */ -/obj/item/weapon/circuitboard/cryopodcontrol +/obj/item/circuitboard/cryopodcontrol name = "Circuit board (Cryogenic Oversight Console)" build_path = "/obj/machinery/computer/cryopod" origin_tech = list(TECH_DATA = 3) -/obj/item/weapon/circuitboard/robotstoragecontrol +/obj/item/circuitboard/robotstoragecontrol name = "Circuit board (Robotic Storage Console)" build_path = "/obj/machinery/computer/cryopod/robot" origin_tech = list(TECH_DATA = 3) -/obj/item/weapon/circuitboard/dormscontrol +/obj/item/circuitboard/dormscontrol name = "Circuit board (Residential Oversight Console)" build_path = "/obj/machinery/computer/cryopod/door/dorms" origin_tech = list(TECH_DATA = 3) -/obj/item/weapon/circuitboard/travelcontrol +/obj/item/circuitboard/travelcontrol name = "Circuit board (Travel Oversight Console - Docks)" build_path = "/obj/machinery/computer/cryopod/door/travel" origin_tech = list(TECH_DATA = 3) -/obj/item/weapon/circuitboard/gatewaycontrol +/obj/item/circuitboard/gatewaycontrol name = "Circuit board (Travel Oversight Console - Gateway)" build_path = "/obj/machinery/computer/cryopod/door/gateway" origin_tech = list(TECH_DATA = 3) @@ -213,7 +213,7 @@ var/mob/occupant = null // Person waiting to be despawned. var/time_till_despawn = 599 // Down to 1 minute to reflect Vorestation respawn times. var/time_entered = 0 // Used to keep track of the safe period. - var/obj/item/device/radio/intercom/announce // + var/obj/item/radio/intercom/announce // var/obj/machinery/computer/cryopod/control_computer var/last_no_computer_message = 0 @@ -290,7 +290,7 @@ time_till_despawn = 60 //1 second, because gateway. /obj/machinery/cryopod/New() - announce = new /obj/item/device/radio/intercom(src) + announce = new /obj/item/radio/intercom(src) ..() /obj/machinery/cryopod/Destroy() @@ -390,7 +390,7 @@ W.forceMove(src) if(W.contents.len) for(var/obj/item/O in W.contents) - if(istype(O,/obj/item/weapon/storage/internal)) + if(istype(O,/obj/item/storage/internal)) continue O.forceMove(src) if(ishuman(to_despawn)) @@ -411,7 +411,7 @@ if(W.contents.len) //Make sure we catch anything not handled by qdel() on the items. for(var/obj/item/O in W.contents) - if(istype(O,/obj/item/weapon/storage/internal)) //Stop eating pockets, you fuck! + if(istype(O,/obj/item/storage/internal)) //Stop eating pockets, you fuck! continue O.forceMove(src) @@ -422,13 +422,13 @@ for(var/obj/item/W in items) //VOREStation Addition Start - if(istype(W, /obj/item/device/pda)) - var/obj/item/device/pda/found_pda = W + if(istype(W, /obj/item/pda)) + var/obj/item/pda/found_pda = W found_pda.delete_id = TRUE else - var/list/pdas_found = W.search_contents_for(/obj/item/device/pda) + var/list/pdas_found = W.search_contents_for(/obj/item/pda) if(pdas_found.len) - for(var/obj/item/device/pda/found_pda in pdas_found) + for(var/obj/item/pda/found_pda in pdas_found) found_pda.delete_id = TRUE //VOREStation Addition End @@ -437,7 +437,7 @@ if(W.preserve_item) preserve = 1 - if(istype(W,/obj/item/weapon/implant/health)) + if(istype(W,/obj/item/implant/health)) for(var/obj/machinery/computer/cloning/com in machines) for(var/datum/dna2/record/R in com.records) if(locate(R.implant) == W) @@ -555,11 +555,11 @@ qdel(to_despawn) set_occupant(null) -/obj/machinery/cryopod/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob) +/obj/machinery/cryopod/attackby(var/obj/item/G as obj, var/mob/user as mob) - if(istype(G, /obj/item/weapon/grab)) + if(istype(G, /obj/item/grab)) - var/obj/item/weapon/grab/grab = G + var/obj/item/grab/grab = G if(occupant) to_chat(user, "\The [src] is in use.") return diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 54c1b38ca05..9cf84355569 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -26,9 +26,9 @@ Deployable items icon_state = "barrier[locked]" -/obj/machinery/deployable/barrier/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/deployable/barrier/attackby(obj/item/W as obj, mob/user as mob) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - if(istype(W, /obj/item/weapon/card/id/)) + if(istype(W, /obj/item/card/id/)) if(allowed(user)) if (emagged < 2.0) locked = !locked diff --git a/code/game/machinery/deployable_vr.dm b/code/game/machinery/deployable_vr.dm index c939fea3f40..7a1a59fef06 100644 --- a/code/game/machinery/deployable_vr.dm +++ b/code/game/machinery/deployable_vr.dm @@ -15,7 +15,7 @@ var/human_name = TRUE var/static/list/cutout_types - var/static/list/painters = list(/obj/item/weapon/reagent_containers/glass/paint, /obj/item/device/floor_painter)//, /obj/item/device/closet_painter) + var/static/list/painters = list(/obj/item/reagent_containers/glass/paint, /obj/item/floor_painter)//, /obj/item/closet_painter) /obj/structure/barricade/cutout/New() . = ..() diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 3d4c0382ce3..eb3a014662f 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -24,7 +24,7 @@ else to_chat(user, "Error, no route to host.") -/obj/machinery/button/remote/attackby(obj/item/weapon/W, mob/user as mob) +/obj/machinery/button/remote/attackby(obj/item/W, mob/user as mob) return attack_hand(user) /obj/machinery/button/remote/emag_act(var/remaining_charges, var/mob/user) diff --git a/code/game/machinery/doorbell_vr.dm b/code/game/machinery/doorbell_vr.dm index fbcc58b79ef..a3aea743e1d 100644 --- a/code/game/machinery/doorbell_vr.dm +++ b/code/game/machinery/doorbell_vr.dm @@ -51,8 +51,8 @@ // return else if(default_part_replacement(user, W)) return - else if(panel_open && istype(W, /obj/item/device/multitool)) - var/obj/item/device/multitool/M = W + else if(panel_open && istype(W, /obj/item/multitool)) + var/obj/item/multitool/M = W if(M.connectable && istype(M.connectable, /obj/machinery/button/doorbell)) var/obj/machinery/button/doorbell/B = M.connectable id_tag = B.id @@ -67,7 +67,7 @@ frame_class = "alarm" // It isn't an alarm, but thats the construction flow we want. frame_size = 3 frame_style = "wall" - circuit = /obj/item/weapon/circuitboard/doorbell_chime + circuit = /obj/item/circuitboard/doorbell_chime icon_override = 'icons/obj/machines/doorbell_vr.dmi' x_offset = 32 y_offset = 32 @@ -76,7 +76,7 @@ // Makes some sense, its how the frame code knows what to actually build. Alternative // is to make building it a single-step process which is too quick I say. // This links up the frame_type to the acutal machine to build. Never seen by players. -/obj/item/weapon/circuitboard/doorbell_chime +/obj/item/circuitboard/doorbell_chime build_path = /obj/machinery/doorbell_chime board_type = new /datum/frame/frame_types/doorbell_chime req_components = list() @@ -128,12 +128,12 @@ src.add_fingerprint(user) if(default_deconstruction_screwdriver(user, W)) return - else if(panel_open && istype(W, /obj/item/weapon/pen)) + else if(panel_open && istype(W, /obj/item/pen)) var/t = sanitizeSafe(tgui_input_text(user, "Enter the name for \the [src].", src.name, initial(src.name), MAX_NAME_LEN), MAX_NAME_LEN) if(t && in_range(src, user)) name = t - else if(panel_open && istype(W, /obj/item/device/multitool)) - var/obj/item/device/multitool/M = W + else if(panel_open && istype(W, /obj/item/multitool)) + var/obj/item/multitool/M = W M.connectable = src to_chat(user, "You save the data in \the [M]'s buffer.") else if(W.has_tool_quality(TOOL_WRENCH)) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index e473cb5c862..fc87a0586dc 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -41,7 +41,7 @@ var/justzap = 0 var/safe = 1 normalspeed = 1 - var/obj/item/weapon/airlock_electronics/electronics = null + var/obj/item/airlock_electronics/electronics = null var/hasShocked = 0 //Prevents multiple shocks from happening var/secured_wires = 0 var/security_level = 1 //VOREStation Addition - acts as a multiplier on the time required to hack an airlock with a hacktool @@ -1153,7 +1153,7 @@ About the new airlock wires panel: if(health < maxhealth && user.a_intent == I_HELP) ..() return - var/obj/item/weapon/weldingtool/W = C.get_welder() + var/obj/item/weldingtool/W = C.get_welder() if(W.remove_fuel(0,user)) if(!src.welded) src.welded = 1 @@ -1180,12 +1180,12 @@ About the new airlock wires panel: return src.attack_hand(user) else if(C.has_tool_quality(TOOL_WIRECUTTER)) return src.attack_hand(user) - else if(istype(C, /obj/item/device/multitool)) + else if(istype(C, /obj/item/multitool)) return src.attack_hand(user) - else if(istype(C, /obj/item/device/assembly/signaler)) + else if(istype(C, /obj/item/assembly/signaler)) return src.attack_hand(user) - else if(istype(C, /obj/item/weapon/pai_cable)) // -- TLE - var/obj/item/weapon/pai_cable/cable = C + else if(istype(C, /obj/item/pai_cable)) // -- TLE + var/obj/item/pai_cable/cable = C cable.plugin(src, user) else if(C.has_tool_quality(TOOL_CROWBAR)) if(can_remove_electronics()) @@ -1209,7 +1209,7 @@ About the new airlock wires panel: da.update_state() if(operating == -1 || (stat & BROKEN)) - new /obj/item/weapon/circuitboard/broken(src.loc) + new /obj/item/circuitboard/broken(src.loc) operating = 0 else if (!electronics) create_electronics() @@ -1230,14 +1230,14 @@ About the new airlock wires panel: spawn(0) close(1) // Check if we're using a crowbar or armblade, and if the airlock's unpowered for whatever reason (off, broken, etc). - else if(istype(C, /obj/item/weapon)) - var/obj/item/weapon/W = C + else if(istype(C, /obj/item)) + var/obj/item/W = C if((W.pry == 1) && !arePowerSystemsOn()) if(locked) to_chat(user, "The airlock's bolts prevent it from being forced.") else if( !welded && !operating ) - if(istype(C, /obj/item/weapon/material/twohanded/fireaxe)) // If this is a fireaxe, make sure it's held in two hands. - var/obj/item/weapon/material/twohanded/fireaxe/F = C + if(istype(C, /obj/item/material/twohanded/fireaxe)) // If this is a fireaxe, make sure it's held in two hands. + var/obj/item/material/twohanded/fireaxe/F = C if(!F.wielded) to_chat(user, "You need to be wielding \the [F] to do that.") return @@ -1538,9 +1538,9 @@ About the new airlock wires panel: /obj/machinery/door/airlock/proc/create_electronics() //create new electronics if (secured_wires) - src.electronics = new/obj/item/weapon/airlock_electronics/secure( src.loc ) + src.electronics = new/obj/item/airlock_electronics/secure( src.loc ) else - src.electronics = new/obj/item/weapon/airlock_electronics( src.loc ) + src.electronics = new/obj/item/airlock_electronics( src.loc ) //update the electronics to match the door's access if(LAZYLEN(req_access)) @@ -1572,7 +1572,7 @@ About the new airlock wires panel: return -/obj/machinery/door/airlock/rcd_values(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/obj/machinery/door/airlock/rcd_values(mob/living/user, obj/item/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_DECONSTRUCT) // Old RCD code made it cost 10 units to decon an airlock. @@ -1584,7 +1584,7 @@ About the new airlock wires panel: ) return FALSE -/obj/machinery/door/airlock/rcd_act(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/obj/machinery/door/airlock/rcd_act(mob/living/user, obj/item/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_DECONSTRUCT) to_chat(user, span("notice", "You deconstruct \the [src].")) diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index bbc0b5e5ed0..b9f4ea4f85a 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -255,7 +255,7 @@ /obj/machinery/access_button/attackby(obj/item/I as obj, mob/user as mob) //Swiping ID on the access button - if (istype(I, /obj/item/weapon/card/id) || istype(I, /obj/item/device/pda)) + if (istype(I, /obj/item/card/id) || istype(I, /obj/item/pda)) attack_hand(user) return ..() diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index d97e5fb5c6f..9b84376f9a1 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/airlock_electronics +/obj/item/airlock_electronics name = "airlock electronics" icon = 'icons/obj/doors/door_assembly.dmi' icon_state = "door_electronics" @@ -16,13 +16,13 @@ var/locked = 1 var/emagged = 0 -/obj/item/weapon/airlock_electronics/emag_act(var/remaining_charges, var/mob/user) +/obj/item/airlock_electronics/emag_act(var/remaining_charges, var/mob/user) if(!emagged) emagged = 1 to_chat(user, "You remove the access restrictions on [src]!") return 1 -/obj/item/weapon/airlock_electronics/attack_self(mob/user as mob) +/obj/item/airlock_electronics/attack_self(mob/user as mob) if (!ishuman(user) && !istype(user,/mob/living/silicon/robot)) return ..(user) @@ -59,7 +59,7 @@ user << browse(t1, "window=airlock_electronics") onclose(user, "airlock") -/obj/item/weapon/airlock_electronics/Topic(href, href_list) +/obj/item/airlock_electronics/Topic(href, href_list) ..() if (usr.stat || usr.restrained() || (!ishuman(usr) && !istype(usr,/mob/living/silicon))) return @@ -75,7 +75,7 @@ src.locked = 0 src.last_configurator = usr.name else if(isliving(usr)) - var/obj/item/weapon/card/id/id + var/obj/item/card/id/id if(ishuman(usr)) var/mob/living/carbon/human/H = usr id = H.get_idcard() @@ -105,7 +105,7 @@ attack_self(usr) -/obj/item/weapon/airlock_electronics/proc/toggle_access(var/acc) +/obj/item/airlock_electronics/proc/toggle_access(var/acc) if (acc == "all") conf_access = null else @@ -121,8 +121,8 @@ if (!conf_access.len) conf_access = null -/obj/item/weapon/airlock_electronics/proc/get_available_accesses(var/mob/user) - var/obj/item/weapon/card/id/id +/obj/item/airlock_electronics/proc/get_available_accesses(var/mob/user) + var/obj/item/card/id/id if(ishuman(user)) var/mob/living/carbon/human/H = user id = H.get_idcard() @@ -142,12 +142,12 @@ else return id.GetAccess() -/obj/item/weapon/airlock_electronics/secure +/obj/item/airlock_electronics/secure name = "secure airlock electronics" desc = "designed to be somewhat more resistant to hacking than standard electronics." origin_tech = list(TECH_DATA = 2) secure = 1 -/obj/item/weapon/airlock_electronics/secure/emag_act(var/remaining_charges, var/mob/user) +/obj/item/airlock_electronics/secure/emag_act(var/remaining_charges, var/mob/user) to_chat(user, "You don't appear to be able to bypass this hardened device!") return -1 diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index 575dd81664a..6c2748fe557 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -151,12 +151,12 @@ // Parameters: 2 (C - Item this object was clicked with, user - Mob which clicked this object) // Description: If we are clicked with crowbar, wielded fire axe, or armblade, try to manually open the door. // This only works on broken doors or doors without power. Also allows repair with Plasteel. -/obj/machinery/door/blast/attackby(obj/item/weapon/C as obj, mob/user as mob) +/obj/machinery/door/blast/attackby(obj/item/C as obj, mob/user as mob) src.add_fingerprint(user) - if(istype(C, /obj/item/weapon)) // For reasons unknown, sometimes C is actually not what it is advertised as, like a mob. + if(istype(C, /obj/item)) // For reasons unknown, sometimes C is actually not what it is advertised as, like a mob. if(C.pry == 1 && (user.a_intent != I_HURT || (stat & BROKEN))) // Can we pry it open with something, like a crowbar/fireaxe/lingblade? - if(istype(C,/obj/item/weapon/material/twohanded/fireaxe)) // Fireaxes need to be in both hands to pry. - var/obj/item/weapon/material/twohanded/fireaxe/F = C + if(istype(C,/obj/item/material/twohanded/fireaxe)) // Fireaxes need to be in both hands to pry. + var/obj/item/material/twohanded/fireaxe/F = C if(!F.wielded) to_chat(user, "You need to be wielding \the [F] to do that.") return @@ -171,7 +171,7 @@ else if(src.density && (user.a_intent == I_HURT)) //If we can't pry it open and it's a weapon, let's hit it. - var/obj/item/weapon/W = C + var/obj/item/W = C user.setClickCooldown(user.get_attack_speed(W)) if(W.damtype == BRUTE || W.damtype == BURN) user.do_attack_animation(src) @@ -201,7 +201,7 @@ to_chat(user, "You don't have enough sheets to repair this! You need at least [amt] sheets.") else if(src.density && (user.a_intent == I_HURT)) //If we can't pry it open and it's not a weapon.... Eh, let's attack it anyway. - var/obj/item/weapon/W = C + var/obj/item/W = C user.setClickCooldown(user.get_attack_speed(W)) if(istype(W) && (W.damtype == BRUTE || W.damtype == BURN)) user.do_attack_animation(src) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index bc80533df2f..337d01981f4 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -120,7 +120,7 @@ return //VOREStation Edit: unable to open doors else bumpopen(M) - if(istype(AM, /obj/item/device/uav)) + if(istype(AM, /obj/item/uav)) if(check_access(null)) open() else @@ -228,7 +228,7 @@ to_chat(user, "\The [src] must be closed before you can repair it.") return - var/obj/item/weapon/weldingtool/welder = I.get_welder() + var/obj/item/weldingtool/welder = I.get_welder() if(welder.remove_fuel(0,user)) to_chat(user, "You start to fix dents and repair \the [src].") playsound(src, welder.usesound, 50, 1) @@ -239,8 +239,8 @@ update_icon() return //psa to whoever coded this, there are plenty of objects that need to call attack() on doors without bludgeoning them. - if(src.density && istype(I, /obj/item/weapon) && user.a_intent == I_HURT && !istype(I, /obj/item/weapon/card)) - var/obj/item/weapon/W = I + if(src.density && istype(I, /obj/item) && user.a_intent == I_HURT && !istype(I, /obj/item/card)) + var/obj/item/W = I user.setClickCooldown(user.get_attack_speed(W)) if(W.damtype == BRUTE || W.damtype == BURN) user.do_attack_animation(src) diff --git a/code/game/machinery/doors/door_vr.dm b/code/game/machinery/doors/door_vr.dm index 4455a6c99d0..015ca8fa4fb 100644 --- a/code/game/machinery/doors/door_vr.dm +++ b/code/game/machinery/doors/door_vr.dm @@ -79,7 +79,7 @@ to_chat(user, "You will need more plasteel to reinforce \the [src].") return TRUE - var/obj/item/weapon/weldingtool/welder = I.get_welder() + var/obj/item/weldingtool/welder = I.get_welder() if(welder.remove_fuel(0,user)) to_chat(user, "You start weld \the plasteel into place.") playsound(src, welder.usesound, 50, 1) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index d2568ffcc35..79f428126ba 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -242,7 +242,7 @@ return ..() -/obj/machinery/door/firedoor/attackby(obj/item/weapon/C as obj, mob/user as mob) +/obj/machinery/door/firedoor/attackby(obj/item/C as obj, mob/user as mob) add_fingerprint(user) if(istype(C, /obj/item/taperoll)) return //Don't open the door if we're putting tape on it to tell people 'don't open the door'. @@ -256,7 +256,7 @@ //VOREstation Edit End if(prying) to_chat(user, "Someone's busy prying that [density ? "open" : "closed"]!") - var/obj/item/weapon/weldingtool/W = C.get_welder() + var/obj/item/weldingtool/W = C.get_welder() if(W.remove_fuel(0, user)) blocked = !blocked user.visible_message("\The [user] [blocked ? "welds" : "unwelds"] \the [src] with \a [W].",\ @@ -287,9 +287,9 @@ "You have removed the electronics from [src].") if (stat & BROKEN) - new /obj/item/weapon/circuitboard/broken(src.loc) + new /obj/item/circuitboard/broken(src.loc) else - new/obj/item/weapon/circuitboard/airalarm(src.loc) + new/obj/item/circuitboard/airalarm(src.loc) var/obj/structure/firedoor_assembly/FA = new/obj/structure/firedoor_assembly(src.loc) FA.anchored = TRUE @@ -314,8 +314,8 @@ "You hear someone struggle and metal straining.") return - if(istype(C,/obj/item/weapon/material/twohanded/fireaxe)) - var/obj/item/weapon/material/twohanded/fireaxe/F = C + if(istype(C,/obj/item/material/twohanded/fireaxe)) + var/obj/item/material/twohanded/fireaxe/F = C if(!F.wielded) return diff --git a/code/game/machinery/doors/firedoor_assembly.dm b/code/game/machinery/doors/firedoor_assembly.dm index e6c37c7e51a..64410adec6d 100644 --- a/code/game/machinery/doors/firedoor_assembly.dm +++ b/code/game/machinery/doors/firedoor_assembly.dm @@ -41,7 +41,7 @@ new/obj/item/stack/cable_coil(src.loc, 1) wired = 0 - else if(istype(C, /obj/item/weapon/circuitboard/airalarm) && wired) + else if(istype(C, /obj/item/circuitboard/airalarm) && wired) if(anchored) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) user.visible_message("[user] has inserted a circuit into \the [src]!", @@ -61,7 +61,7 @@ "You have [anchored ? "" : "un" ]secured \the [src]!") update_icon() else if((glass || !anchored) && C.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = C.get_welder() + var/obj/item/weldingtool/WT = C.get_welder() if(WT.remove_fuel(0, user)) playsound(src, WT.usesound, 50, 1) if(glass) diff --git a/code/game/machinery/doors/unpowered.dm b/code/game/machinery/doors/unpowered.dm index 8e2a28d1dda..e2f42afa76f 100644 --- a/code/game/machinery/doors/unpowered.dm +++ b/code/game/machinery/doors/unpowered.dm @@ -9,7 +9,7 @@ return /obj/machinery/door/unpowered/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I, /obj/item/weapon/melee/energy/blade)) return + if(istype(I, /obj/item/melee/energy/blade)) return if(src.locked) return ..() return diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 7b350805c25..61fbc6bf0d7 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -12,7 +12,7 @@ use_power = USE_POWER_OFF flags = ON_BORDER opacity = 0 - var/obj/item/weapon/airlock_electronics/electronics = null + var/obj/item/airlock_electronics/electronics = null explosion_resistance = 5 can_atmos_pass = ATMOS_PASS_PROC air_properties_vary_with_direction = 1 @@ -32,12 +32,12 @@ icon_state = "[base_state]open" /obj/machinery/door/window/proc/shatter(var/display_message = 1) - new /obj/item/weapon/material/shard(src.loc) - new /obj/item/weapon/material/shard(src.loc) + new /obj/item/material/shard(src.loc) + new /obj/item/material/shard(src.loc) new /obj/item/stack/cable_coil(src.loc, 1) - var/obj/item/weapon/airlock_electronics/ae + var/obj/item/airlock_electronics/ae if(!electronics) - ae = new/obj/item/weapon/airlock_electronics( src.loc ) + ae = new/obj/item/airlock_electronics( src.loc ) if(LAZYLEN(req_access)) ae.conf_access = req_access else if (LAZYLEN(req_one_access)) @@ -190,7 +190,7 @@ if(istype(I)) // Fixing. if(I.has_tool_quality(TOOL_WELDER) && user.a_intent == I_HELP) - var/obj/item/weapon/weldingtool/WT = I.get_welder() + var/obj/item/weldingtool/WT = I.get_welder() if(health < maxhealth) if(WT.remove_fuel(1 ,user)) to_chat(user, "You begin repairing [src]...") @@ -204,7 +204,7 @@ return //Emags and ninja swords? You may pass. - if (istype(I, /obj/item/weapon/melee/energy/blade)) + if (istype(I, /obj/item/melee/energy/blade)) if(emag_act(10, user)) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) @@ -234,10 +234,10 @@ wa.update_state() if(operating == -1) - wa.electronics = new/obj/item/weapon/circuitboard/broken() + wa.electronics = new/obj/item/circuitboard/broken() else if(!electronics) - wa.electronics = new/obj/item/weapon/airlock_electronics() + wa.electronics = new/obj/item/airlock_electronics() if(LAZYLEN(req_access)) wa.electronics.conf_access = req_access else if (LAZYLEN(req_one_access)) @@ -251,7 +251,7 @@ return //If it's a weapon, smash windoor. Unless it's an id card, agent card, ect.. then ignore it (Cards really shouldnt damage a door anyway) - if(src.density && istype(I, /obj/item/weapon) && !istype(I, /obj/item/weapon/card)) + if(src.density && istype(I, /obj/item) && !istype(I, /obj/item/card)) user.setClickCooldown(user.get_attack_speed(I)) var/aforce = I.force playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller.dm b/code/game/machinery/embedded_controller/airlock_docking_controller.dm index ce7219e57f6..12df7c9aa3a 100644 --- a/code/game/machinery/embedded_controller/airlock_docking_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_docking_controller.dm @@ -24,7 +24,7 @@ docking_program.display_name = display_name /obj/machinery/embedded_controller/radio/airlock/docking_port/attackby(obj/item/W, mob/user) - if(istype(W,/obj/item/device/multitool)) //give them part of code, would take few tries to get full + if(istype(W,/obj/item/multitool)) //give them part of code, would take few tries to get full var/datum/embedded_program/docking/airlock/docking_program = program var/code = docking_program.docking_codes if(!code) diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm index a3eb739983c..9d26ad77dc4 100644 --- a/code/game/machinery/exonet_node.dm +++ b/code/game/machinery/exonet_node.dm @@ -16,7 +16,7 @@ var/list/logs = list() // Gets written to by exonet's send_message() function. - circuit = /obj/item/weapon/circuitboard/telecomms/exonet_node + circuit = /obj/item/circuitboard/telecomms/exonet_node // Proc: New() // Parameters: None // Description: Adds components to the machine for deconstruction. diff --git a/code/game/machinery/fire_alarm.dm b/code/game/machinery/fire_alarm.dm index a7e0da37f6d..9d5c2269e8c 100644 --- a/code/game/machinery/fire_alarm.dm +++ b/code/game/machinery/fire_alarm.dm @@ -23,7 +23,7 @@ FIRE ALARM var/last_process = 0 panel_open = FALSE var/seclevel - circuit = /obj/item/weapon/circuitboard/firealarm + circuit = /obj/item/circuitboard/firealarm var/alarms_hidden = FALSE //If the alarms from this machine are visible on consoles /obj/machinery/firealarm/alarms_hidden @@ -124,7 +124,7 @@ FIRE ALARM return if(panel_open) - if(istype(W, /obj/item/device/multitool)) + if(istype(W, /obj/item/multitool)) detecting = !(detecting) if(detecting) user.visible_message("\The [user] has reconnected [src]'s detecting unit!", "You have reconnected [src]'s detecting unit.") @@ -201,7 +201,7 @@ FIRE ALARM FIRE ALARM CIRCUIT Just a object used in constructing fire alarms -/obj/item/weapon/firealarm_electronics +/obj/item/firealarm_electronics name = "fire alarm electronics" icon = 'icons/obj/doors/door_assembly.dmi' icon_state = "door_electronics" diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 47041e68750..f3083933652 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -34,7 +34,7 @@ // sd_SetLuminosity(0) //Don't want to render prison breaks impossible -/obj/machinery/flasher/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/flasher/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WIRECUTTER)) add_fingerprint(user) disable = !disable @@ -106,7 +106,7 @@ if(M.m_intent != "walk") flash() -/obj/machinery/flasher/portable/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/flasher/portable/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) add_fingerprint(user) anchored = !anchored diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm index 3c4b3a7a136..54447f264a4 100644 --- a/code/game/machinery/floodlight.dm +++ b/code/game/machinery/floodlight.dm @@ -7,7 +7,7 @@ light_system = MOVABLE_LIGHT_DIRECTIONAL light_cone_y_offset = 8 var/on = 0 - var/obj/item/weapon/cell/cell = null + var/obj/item/cell/cell = null var/use = 200 // 200W light var/unlocked = 0 var/open = 0 @@ -101,7 +101,7 @@ update_icon() -/obj/machinery/floodlight/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/floodlight/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_SCREWDRIVER)) if(!open) if(unlocked) @@ -122,7 +122,7 @@ open = 1 to_chat(user, "You remove the battery panel.") - if(istype(W, /obj/item/weapon/cell)) + if(istype(W, /obj/item/cell)) if(open) if(cell) to_chat(user, "There is a power cell already installed.") diff --git a/code/game/machinery/floor_light.dm b/code/game/machinery/floor_light.dm index 1722510df08..90ba895e826 100644 --- a/code/game/machinery/floor_light.dm +++ b/code/game/machinery/floor_light.dm @@ -27,7 +27,7 @@ var/list/floor_light_cache = list() anchored = !anchored visible_message("\The [user] has [anchored ? "attached" : "detached"] \the [src].") else if(W.has_tool_quality(TOOL_WELDER) && (damaged || (stat & BROKEN))) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(!WT.remove_fuel(0, user)) to_chat(user, "\The [src] must be on to complete this task.") return diff --git a/code/game/machinery/frame.dm b/code/game/machinery/frame.dm index 3b6caffcf9b..fb108bf37ea 100644 --- a/code/game/machinery/frame.dm +++ b/code/game/machinery/frame.dm @@ -44,7 +44,7 @@ /datum/frame/frame_types/conveyor name = "Conveyor" frame_class = FRAME_CLASS_MACHINE - circuit = /obj/item/weapon/circuitboard/conveyor + circuit = /obj/item/circuitboard/conveyor /datum/frame/frame_types/photocopier name = "Photocopier" @@ -69,7 +69,7 @@ /datum/frame/frame_types/mass_driver name = "Mass Driver" frame_class = FRAME_CLASS_MACHINE - circuit = /obj/item/weapon/circuitboard/mass_driver + circuit = /obj/item/circuitboard/mass_driver /datum/frame/frame_types/holopad name = "Holopad" @@ -89,19 +89,19 @@ /datum/frame/frame_types/recharger name = "Recharger" frame_class = FRAME_CLASS_MACHINE - circuit = /obj/item/weapon/circuitboard/recharger + circuit = /obj/item/circuitboard/recharger frame_size = 3 /datum/frame/frame_types/cell_charger name = "Heavy-Duty Cell Charger" frame_class = FRAME_CLASS_MACHINE - circuit = /obj/item/weapon/circuitboard/cell_charger + circuit = /obj/item/circuitboard/cell_charger frame_size = 3 /datum/frame/frame_types/grinder name = "Grinder" frame_class = FRAME_CLASS_MACHINE - circuit = /obj/item/weapon/circuitboard/grinder + circuit = /obj/item/circuitboard/grinder frame_size = 3 /datum/frame/frame_types/reagent_distillery @@ -142,7 +142,7 @@ /datum/frame/frame_types/wall_charger name = "Wall Charger" frame_class = FRAME_CLASS_MACHINE - circuit = /obj/item/weapon/circuitboard/recharger/wrecharger + circuit = /obj/item/circuitboard/recharger/wrecharger frame_size = 3 frame_style = FRAME_STYLE_WALL x_offset = 32 @@ -226,7 +226,7 @@ icon = 'icons/obj/stock_parts.dmi' icon_state = "machine_0" var/state = FRAME_PLACED - var/obj/item/weapon/circuitboard/circuit = null + var/obj/item/circuitboard/circuit = null var/need_circuit = TRUE var/datum/frame/frame_types/frame_type = new /datum/frame/frame_types/machine @@ -322,7 +322,7 @@ else if(P.has_tool_quality(TOOL_WELDER)) if(state == FRAME_PLACED) - var/obj/item/weapon/weldingtool/WT = P.get_welder() + var/obj/item/weldingtool/WT = P.get_welder() if(WT.remove_fuel(0, user)) playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) @@ -335,9 +335,9 @@ to_chat(user, "The welding tool must be on to complete this task.") return - else if(istype(P, /obj/item/weapon/circuitboard) && need_circuit && !circuit) + else if(istype(P, /obj/item/circuitboard) && need_circuit && !circuit) if(state == FRAME_PLACED && anchored) - var/obj/item/weapon/circuitboard/B = P + var/obj/item/circuitboard/B = P var/datum/frame/frame_types/board_type = B.board_type if(board_type.name == frame_type.name) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) @@ -467,7 +467,7 @@ to_chat(user, "There are no components to remove.") else to_chat(user, "You remove the components.") - for(var/obj/item/weapon/W in components) + for(var/obj/item/W in components) W.forceMove(src.loc) check_components() update_desc() @@ -538,7 +538,7 @@ to_chat(user, "You remove the cables.") else to_chat(user, "You remove the cables and components.") - for(var/obj/item/weapon/W in components) + for(var/obj/item/W in components) W.forceMove(src.loc) check_components() update_desc() diff --git a/code/game/machinery/gear_dispenser.dm b/code/game/machinery/gear_dispenser.dm index 8f91ad56b8e..f880269df1d 100644 --- a/code/game/machinery/gear_dispenser.dm +++ b/code/game/machinery/gear_dispenser.dm @@ -107,15 +107,15 @@ var/list/dispenser_presets = list() if(voidsuit.cooler) error("[src] created a voidsuit [voidsuit] and wants to add a suit cooler but it already has one") else - var/obj/item/life_support = new /obj/item/device/suit_cooling_unit(voidsuit) + var/obj/item/life_support = new /obj/item/suit_cooling_unit(voidsuit) voidsuit.cooler = life_support else if(user.species?.breath_type) if(voidsuit.tank) error("[src] created a voidsuit [voidsuit] and wants to add a tank but it already has one") else //Create a tank (if such a thing exists for this species) - var/tanktext = "/obj/item/weapon/tank/" + "[user.species?.breath_type]" - var/obj/item/weapon/tank/tankpath = text2path(tanktext) + var/tanktext = "/obj/item/tank/" + "[user.species?.breath_type]" + var/obj/item/tank/tankpath = text2path(tanktext) if(tankpath) var/obj/item/life_support = new tankpath(voidsuit) @@ -443,19 +443,19 @@ var/list/dispenser_presets = list() // Hardsuit versions /datum/gear_disp/ert/security_rig name = "Security (Hardsuit)" - to_spawn = list(/obj/item/weapon/rig/ert/security) + to_spawn = list(/obj/item/rig/ert/security) /datum/gear_disp/ert/medical_rig name = "Medical (Hardsuit)" - to_spawn = list(/obj/item/weapon/rig/ert/medical) + to_spawn = list(/obj/item/rig/ert/medical) /datum/gear_disp/ert/engineer_rig name = "Engineering (Hardsuit)" - to_spawn = list(/obj/item/weapon/rig/ert/engineer) + to_spawn = list(/obj/item/rig/ert/engineer) /* /datum/gear_disp/ert/commander_rig name = "Commander (Hardsuit)" - to_spawn = list(/obj/item/weapon/rig/ert) + to_spawn = list(/obj/item/rig/ert) amount = 1 */ @@ -892,9 +892,9 @@ var/list/dispenser_presets = list() /datum/gear_disp/adventure_box/food name = "Food Plate" to_spawn = list( - /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, - /obj/item/weapon/reagent_containers/food/snacks/no_raisin, - /obj/item/weapon/reagent_containers/food/drinks/tea + /obj/item/reagent_containers/food/snacks/candy/proteinbar, + /obj/item/reagent_containers/food/snacks/no_raisin, + /obj/item/reagent_containers/food/drinks/tea ) amount = 10 @@ -904,7 +904,7 @@ var/list/dispenser_presets = list() /obj/random/tool, /obj/random/tool, /obj/random/tool, - /obj/item/weapon/storage/belt/utility + /obj/item/storage/belt/utility ) amount = 5 @@ -919,7 +919,7 @@ var/list/dispenser_presets = list() /datum/gear_disp/adventure_box/light name = "Flashlight" - to_spawn = list(/obj/item/device/flashlight/maglight) + to_spawn = list(/obj/item/flashlight/maglight) amount = 2 /datum/gear_disp/adventure_box/weapon diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index a48fa1e79ee..7753bf756e0 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -34,7 +34,7 @@ var/const/HOLOPAD_MODE = RANGE_BASED desc = "It's a floor-mounted device for projecting holographic images. It is activated remotely." icon_state = "holopad0" show_messages = 1 - circuit = /obj/item/weapon/circuitboard/holopad + circuit = /obj/item/circuitboard/holopad plane = TURF_PLANE layer = ABOVE_TURF_LAYER var/power_per_hologram = 500 //per usage per hologram diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 461b80cf633..80e89473ae0 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -71,7 +71,7 @@ icon_state = "[base_state]-p" // sd_SetLuminosity(0) -/obj/machinery/sparker/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/sparker/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_SCREWDRIVER)) add_fingerprint(user) disable = !disable diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 603618d1f31..bb56e41a755 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -8,7 +8,7 @@ /obj/machinery/iv_drip/var/mob/living/carbon/human/attached = null /obj/machinery/iv_drip/var/mode = 1 // 1 is injecting, 0 is taking blood. -/obj/machinery/iv_drip/var/obj/item/weapon/reagent_containers/beaker = null +/obj/machinery/iv_drip/var/obj/item/reagent_containers/beaker = null /obj/machinery/iv_drip/update_icon() if(attached) @@ -53,8 +53,8 @@ update_icon() -/obj/machinery/iv_drip/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/reagent_containers)) +/obj/machinery/iv_drip/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/reagent_containers)) if(!isnull(beaker)) to_chat(user, "There is already a reagent container loaded!") return @@ -98,7 +98,7 @@ if(mode) if(beaker.volume > 0) var/transfer_amount = REM - if(istype(beaker, /obj/item/weapon/reagent_containers/blood)) + if(istype(beaker, /obj/item/reagent_containers/blood)) // speed up transfer on blood packs transfer_amount = 4 beaker.reagents.trans_to_mob(attached, transfer_amount, CHEM_BLOOD) diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 38948cff0fc..5222e1a674f 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -15,7 +15,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 10 active_power_usage = 100 - circuit = /obj/item/weapon/circuitboard/jukebox + circuit = /obj/item/circuitboard/jukebox clicksound = 'sound/machines/buttonbeep.ogg' // Vars for hacking @@ -24,7 +24,7 @@ var/freq = 0 // Currently no effect, will return in phase II of mediamanager. //VOREStation Add var/loop_mode = JUKEMODE_PLAY_ONCE // Behavior when finished playing a song - var/list/obj/item/device/juke_remote/remotes + var/list/obj/item/juke_remote/remotes //VOREStation Add End var/datum/track/current_track @@ -86,7 +86,7 @@ media_start_time = 0 update_music() //VOREStation Add - for(var/obj/item/device/juke_remote/remote as anything in remotes) + for(var/obj/item/juke_remote/remote as anything in remotes) remote.update_music() //VOREStation Add End @@ -105,7 +105,7 @@ return if(W.has_tool_quality(TOOL_WIRECUTTER)) return wires.Interact(user) - if(istype(W, /obj/item/device/multitool)) + if(istype(W, /obj/item/multitool)) return wires.Interact(user) if(W.has_tool_quality(TOOL_WRENCH)) if(playing) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 174fdf630d6..ebb361d5be1 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -110,7 +110,7 @@ Class Procs: var/clicksound // sound played on succesful interface. Just put it in the list of vars at the start. var/clickvol = 40 // volume var/interact_offline = 0 // Can the machine be interacted with while de-powered. - var/obj/item/weapon/circuitboard/circuit = null + var/obj/item/circuitboard/circuit = null // 0.0 - 1.0 multipler for prob() based on bullet structure damage // So if this is 1.0 then a 100 damage bullet will always break this structure @@ -313,23 +313,23 @@ Class Procs: return 0 /obj/machinery/proc/default_apply_parts() - var/obj/item/weapon/circuitboard/CB = circuit + var/obj/item/circuitboard/CB = circuit if(!istype(CB)) return CB.apply_default_parts(src) RefreshParts() /obj/machinery/proc/default_use_hicell() - var/obj/item/weapon/cell/C = locate(/obj/item/weapon/cell) in component_parts + var/obj/item/cell/C = locate(/obj/item/cell) in component_parts if(C) component_parts -= C qdel(C) - C = new /obj/item/weapon/cell/high(src) + C = new /obj/item/cell/high(src) component_parts += C RefreshParts() return C -/obj/machinery/proc/default_part_replacement(var/mob/user, var/obj/item/weapon/storage/part_replacer/R) +/obj/machinery/proc/default_part_replacement(var/mob/user, var/obj/item/storage/part_replacer/R) var/parts_replaced = FALSE if(!istype(R)) return 0 @@ -339,7 +339,7 @@ Class Procs: for(var/obj/item/C in component_parts) to_chat(user, " [C.name]") if(panel_open || !R.panel_req) - var/obj/item/weapon/circuitboard/CB = circuit + var/obj/item/circuitboard/CB = circuit var/P for(var/obj/item/A in component_parts) for(var/T in CB.req_components) @@ -410,7 +410,7 @@ Class Procs: if(do_after(user, 20 * S.toolspeed)) if(stat & BROKEN) to_chat(user, "The broken glass falls out.") - new /obj/item/weapon/material/shard(src.loc) + new /obj/item/material/shard(src.loc) else to_chat(user, "You disconnect the monitor.") . = dismantle() @@ -437,13 +437,13 @@ Class Procs: /obj/machinery/proc/dismantle() playsound(src, 'sound/items/Crowbar.ogg', 50, 1) for(var/obj/I in contents) - if(istype(I,/obj/item/weapon/card/id)) + if(istype(I,/obj/item/card/id)) I.forceMove(src.loc) if(!circuit) return 0 var/obj/structure/frame/A = new /obj/structure/frame(src.loc) - var/obj/item/weapon/circuitboard/M = circuit + var/obj/item/circuitboard/M = circuit A.circuit = M A.anchored = TRUE A.frame_type = M.board_type @@ -511,7 +511,7 @@ Class Procs: var/list/surviving_parts = list() // Deleting IDs is lame, unless this is like nuclear severity if(severity != 1) - for(var/obj/item/weapon/card/id/I in contents) + for(var/obj/item/card/id/I in contents) surviving_parts |= I // May populate some items to throw around diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 7aa39cce388..37cb4b4db84 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -9,7 +9,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 2 active_power_usage = 50 - circuit = /obj/item/weapon/circuitboard/mass_driver + circuit = /obj/item/circuitboard/mass_driver var/power = 1.0 var/code = 1.0 @@ -26,7 +26,7 @@ if(default_deconstruction_crowbar(user, I)) return - if(istype(I, /obj/item/device/multitool)) + if(istype(I, /obj/item/multitool)) if(panel_open) var/input = sanitize(tgui_input_text(usr, "What id would you like to give this conveyor?", "Multitool-Conveyor interface", id)) if(!input) diff --git a/code/game/machinery/medical_kiosk.dm b/code/game/machinery/medical_kiosk.dm index e42aa23bcda..7989a307e5e 100644 --- a/code/game/machinery/medical_kiosk.dm +++ b/code/game/machinery/medical_kiosk.dm @@ -15,7 +15,7 @@ icon_state = "kiosk_off" idle_power_usage = 5 active_power_usage = 200 - circuit = /obj/item/weapon/circuitboard/medical_kiosk + circuit = /obj/item/circuitboard/medical_kiosk anchored = TRUE density = TRUE diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index d1149771b1b..245ad680cf3 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -71,7 +71,7 @@ newChannel.announcement = "Breaking news from [channel_name]!" network_channels += newChannel -/datum/feed_network/proc/SubmitArticle(var/msg, var/author, var/channel_name, var/obj/item/weapon/photo/photo, var/adminMessage = 0, var/message_type = "", var/title) +/datum/feed_network/proc/SubmitArticle(var/msg, var/author, var/channel_name, var/obj/item/photo/photo, var/adminMessage = 0, var/message_type = "", var/title) var/datum/feed_message/newMsg = new /datum/feed_message newMsg.author = author newMsg.body = msg @@ -104,7 +104,7 @@ NEWSCASTER.update_icon() // var/list/receiving_pdas = new - // for (var/obj/item/device/pda/P in PDAs) + // for (var/obj/item/pda/P in PDAs) // if(!P.owner) // continue // if(P.toff) @@ -114,7 +114,7 @@ // spawn(0) // get_receptions sleeps further down the line, spawn of elsewhere // var/datum/receptions/receptions = get_receptions(null, receiving_pdas) // datums are not atoms, thus we have to assume the newscast network always has reception - // for(var/obj/item/device/pda/PDA in receiving_pdas) + // for(var/obj/item/pda/PDA in receiving_pdas) // if(!(receptions.receiver_reception[PDA] & TELECOMMS_RECEPTION_RECEIVER)) // continue @@ -163,7 +163,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) light_range = 0 anchored = TRUE var/obj/machinery/exonet_node/node = null - circuit = /obj/item/weapon/circuitboard/newscaster + circuit = /obj/item/circuitboard/newscaster // TGUI var/list/temp = null @@ -625,9 +625,9 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) /datum/news_photo var/is_synth = 0 - var/obj/item/weapon/photo/photo = null + var/obj/item/photo/photo = null -/datum/news_photo/New(var/obj/item/weapon/photo/p, var/synth) +/datum/news_photo/New(var/obj/item/photo/p, var/synth) is_synth = synth photo = p @@ -639,14 +639,14 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) user.put_in_inactive_hand(photo_data.photo) qdel(photo_data) - if(istype(user.get_active_hand(), /obj/item/weapon/photo)) + if(istype(user.get_active_hand(), /obj/item/photo)) var/obj/item/photo = user.get_active_hand() user.drop_item() photo.loc = src photo_data = new(photo, 0) else if(istype(user,/mob/living/silicon)) var/mob/living/silicon/tempAI = user - var/obj/item/weapon/photo/selection = tempAI.GetPicture() + var/obj/item/photo/selection = tempAI.GetPicture() if(!selection) return @@ -656,7 +656,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) /obj/machinery/newscaster/proc/tgui_user_name(mob/user) if(ishuman(user)) var/mob/living/carbon/human/H = user - var/obj/item/weapon/card/id/I = H.GetIdCard() + var/obj/item/card/id/I = H.GetIdCard() if(I) return GetNameAndAssignmentFromId(I) @@ -669,7 +669,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) /obj/machinery/newscaster/proc/scan_user(mob/living/user) if(istype(user,/mob/living/carbon/human)) //User is a human var/mob/living/carbon/human/human_user = user - var/obj/item/weapon/card/id/I = human_user.GetIdCard() + var/obj/item/card/id/I = human_user.GetIdCard() if(I) scanned_user = GetNameAndAssignmentFromId(I) else @@ -680,7 +680,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) /obj/machinery/newscaster/proc/print_paper() feedback_inc("newscaster_newspapers_printed",1) - var/obj/item/weapon/newspaper/NEWSPAPER = new /obj/item/weapon/newspaper + var/obj/item/newspaper/NEWSPAPER = new /obj/item/newspaper for(var/datum/feed_channel/FC in news_network.network_channels) NEWSPAPER.news_content += FC if(news_network.wanted_issue) diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm index fc942c4fa9c..3148b39a8da 100644 --- a/code/game/machinery/nuclear_bomb.dm +++ b/code/game/machinery/nuclear_bomb.dm @@ -16,7 +16,7 @@ var/bomb_set var/code = "" var/yes_code = 0.0 var/safety = 1.0 - var/obj/item/weapon/disk/nuclear/auth = null + var/obj/item/disk/nuclear/auth = null var/list/wires = list() var/light_wire var/safety_wire @@ -54,7 +54,7 @@ var/bomb_set attack_hand(M) return -/obj/machinery/nuclearbomb/attackby(obj/item/weapon/O as obj, mob/user as mob) +/obj/machinery/nuclearbomb/attackby(obj/item/O as obj, mob/user as mob) if(O.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, O.usesound, 50, 1) add_fingerprint(user) @@ -78,13 +78,13 @@ var/bomb_set flick("nuclearbombc", src) return - if(O.has_tool_quality(TOOL_WIRECUTTER) || istype(O, /obj/item/device/multitool)) + if(O.has_tool_quality(TOOL_WIRECUTTER) || istype(O, /obj/item/multitool)) if(opened == 1) nukehack_win(user) return if(extended) - if(istype(O, /obj/item/weapon/disk/nuclear)) + if(istype(O, /obj/item/disk/nuclear)) usr.drop_item() O.loc = src auth = O @@ -96,7 +96,7 @@ var/bomb_set if(0) if(O.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = O.get_welder() + var/obj/item/weldingtool/WT = O.get_welder() if(!WT.isOn()) return if(WT.get_fuel() < 5) // uses up 5 fuel. to_chat(user, "You need more fuel to complete this task.") @@ -124,7 +124,7 @@ var/bomb_set if(2) if(O.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = O.get_welder() + var/obj/item/weldingtool/WT = O.get_welder() if(!WT.isOn()) return if(WT.get_fuel() < 5) // uses up 5 fuel. to_chat(user, "You need more fuel to complete this task.") @@ -238,7 +238,7 @@ var/bomb_set if(href_list["act"]) var/temp_wire = href_list["wire"] if(href_list["act"] == "pulse") - if(!istype(usr.get_active_hand(), /obj/item/device/multitool)) + if(!istype(usr.get_active_hand(), /obj/item/multitool)) to_chat(usr, "You need a multitool!") else if(wires[temp_wire]) @@ -285,7 +285,7 @@ var/bomb_set auth = null else var/obj/item/I = usr.get_active_hand() - if(istype(I, /obj/item/weapon/disk/nuclear)) + if(istype(I, /obj/item/disk/nuclear)) usr.drop_item() I.loc = src auth = I @@ -412,16 +412,16 @@ var/bomb_set #undef NUKERANGE -/obj/item/weapon/disk/nuclear/New() +/obj/item/disk/nuclear/New() ..() nuke_disks |= src -/obj/item/weapon/disk/nuclear/Destroy() +/obj/item/disk/nuclear/Destroy() if(!nuke_disks.len && blobstart.len > 0) - var/obj/D = new /obj/item/weapon/disk/nuclear(pick(blobstart)) + var/obj/D = new /obj/item/disk/nuclear(pick(blobstart)) message_admins("[src], the last authentication disk, has been destroyed. Spawning [D] at ([D.x], [D.y], [D.z]).") log_game("[src], the last authentication disk, has been destroyed. Spawning [D] at ([D.x], [D.y], [D.z]).") ..() -/obj/item/weapon/disk/nuclear/touch_map_edge() +/obj/item/disk/nuclear/touch_map_edge() qdel(src) diff --git a/code/game/machinery/oxygen_pump.dm b/code/game/machinery/oxygen_pump.dm index f2dc3923ae2..8dfe4dd2bbd 100644 --- a/code/game/machinery/oxygen_pump.dm +++ b/code/game/machinery/oxygen_pump.dm @@ -6,11 +6,11 @@ anchored = TRUE - var/obj/item/weapon/tank/tank + var/obj/item/tank/tank var/mob/living/carbon/breather var/obj/item/clothing/mask/breath/contained - var/spawn_type = /obj/item/weapon/tank/emergency/oxygen/engi + var/spawn_type = /obj/item/tank/emergency/oxygen/engi var/mask_type = /obj/item/clothing/mask/breath/emergency var/icon_state_open = "oxygen_tank_open" var/icon_state_closed = "oxygen_tank" @@ -127,13 +127,13 @@ return return 1 -/obj/machinery/oxygen_pump/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/oxygen_pump/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_SCREWDRIVER)) stat ^= MAINT user.visible_message("\The [user] [(stat & MAINT) ? "opens" : "closes"] \the [src].", "You [(stat & MAINT) ? "open" : "close"] \the [src].") icon_state = (stat & MAINT) ? icon_state_open : icon_state_closed //TO-DO: Open icon - if(istype(W, /obj/item/weapon/tank) && (stat & MAINT)) + if(istype(W, /obj/item/tank) && (stat & MAINT)) if(tank) to_chat(user, "\The [src] already has a tank installed!") else @@ -142,7 +142,7 @@ tank = W user.visible_message("\The [user] installs \the [tank] into \the [src].", "You install \the [tank] into \the [src].") src.add_fingerprint(user) - if(istype(W, /obj/item/weapon/tank) && !stat) + if(istype(W, /obj/item/tank) && !stat) to_chat(user, "Please open the maintenance hatch first.") /obj/machinery/oxygen_pump/examine(var/mob/user) @@ -231,7 +231,7 @@ /obj/machinery/oxygen_pump/anesthetic name = "anesthetic pump" desc = "A wall mounted anesthetic pump with a retractable mask that someone can pull over your face to knock you out." - spawn_type = /obj/item/weapon/tank/anesthetic + spawn_type = /obj/item/tank/anesthetic icon_state = "anesthetic_tank" icon_state_closed = "anesthetic_tank" icon_state_open = "anesthetic_tank_open" @@ -267,7 +267,7 @@ /obj/machinery/oxygen_pump/mobile/anesthetic name = "portable anesthetic pump" desc = "A portable anesthetic pump with a retractable mask that someone can pull over your face to knock you out." - spawn_type = /obj/item/weapon/tank/anesthetic + spawn_type = /obj/item/tank/anesthetic icon_state = "medpump_n2o" icon_state_closed = "medpump_n2o" icon_state_open = "medpump_n2o_open" diff --git a/code/game/machinery/painter_vr.dm b/code/game/machinery/painter_vr.dm index c34eeb8f97c..949f9bcf6e3 100644 --- a/code/game/machinery/painter_vr.dm +++ b/code/game/machinery/painter_vr.dm @@ -27,8 +27,8 @@ var/list/allowed_types = list( /obj/item/clothing, - /obj/item/weapon/storage/backpack, - /obj/item/weapon/storage/belt, + /obj/item/storage/backpack, + /obj/item/storage/belt, /obj/item/toy ) diff --git a/code/game/machinery/partslathe_vr.dm b/code/game/machinery/partslathe_vr.dm index aef7fc1ee34..0cc1b05dc78 100644 --- a/code/game/machinery/partslathe_vr.dm +++ b/code/game/machinery/partslathe_vr.dm @@ -20,7 +20,7 @@ name = "parts lathe" icon = 'icons/obj/partslathe_vr.dmi' icon_state = "partslathe-idle" - circuit = /obj/item/weapon/circuitboard/partslathe + circuit = /obj/item/circuitboard/partslathe anchored = TRUE density = TRUE use_power = USE_POWER_IDLE @@ -31,7 +31,7 @@ var/list/materials = list(MAT_STEEL = 0, MAT_GLASS = 0) var/list/storage_capacity = list(MAT_STEEL = 0, MAT_GLASS = 0) - var/obj/item/weapon/circuitboard/copy_board // Inserted board + var/obj/item/circuitboard/copy_board // Inserted board var/list/datum/category_item/partslathe/queue = list() // Queue of things to build var/busy = 0 // Currently building stuff y/n @@ -59,12 +59,12 @@ /obj/machinery/partslathe/RefreshParts() var/mb_rating = 0 - for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) + for(var/obj/item/stock_parts/matter_bin/M in component_parts) mb_rating += M.rating storage_capacity[MAT_STEEL] = mb_rating * 16000 storage_capacity["glass"] = mb_rating * 8000 var/T = 0 - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) T += M.rating mat_efficiency = 6 / T // Ranges from 3.0 to 1.0 speed = T / 2 // Ranges from 1.0 to 3.0 @@ -101,7 +101,7 @@ if(panel_open) to_chat(user, "You can't load \the [src] while it's opened.") return - if(istype(O, /obj/item/weapon/circuitboard)) + if(istype(O, /obj/item/circuitboard)) if(copy_board) to_chat(user, "There is already a board inserted in \the [src].") return @@ -352,9 +352,9 @@ /obj/machinery/partslathe/proc/update_recipe_list() if(!partslathe_recipies) partslathe_recipies = list() - var/list/paths = subtypesof(/obj/item/weapon/stock_parts) + var/list/paths = subtypesof(/obj/item/stock_parts) for(var/type in paths) - var/obj/item/weapon/stock_parts/I = new type() + var/obj/item/stock_parts/I = new type() if(getHighestOriginTechLevel(I) > 1) qdel(I) continue // Ignore high-tech parts diff --git a/code/game/machinery/pda_multicaster.dm b/code/game/machinery/pda_multicaster.dm index d8a75ebedcd..acbb0ebbeb4 100644 --- a/code/game/machinery/pda_multicaster.dm +++ b/code/game/machinery/pda_multicaster.dm @@ -5,7 +5,7 @@ icon_state = "pdamulti" density = TRUE anchored = TRUE - circuit = /obj/item/weapon/circuitboard/telecomms/pda_multicaster + circuit = /obj/item/circuitboard/telecomms/pda_multicaster use_power = USE_POWER_IDLE idle_power_usage = 750 var/on = 1 // If we're currently active, @@ -14,14 +14,14 @@ /obj/machinery/pda_multicaster/New() ..() - internal_PDAs = list("command" = new /obj/item/device/pda/multicaster/command(src), - "security" = new /obj/item/device/pda/multicaster/security(src), - "engineering" = new /obj/item/device/pda/multicaster/engineering(src), - "medical" = new /obj/item/device/pda/multicaster/medical(src), - "research" = new /obj/item/device/pda/multicaster/research(src), - "exploration" = new /obj/item/device/pda/multicaster/exploration(src), //VOREStation Add, - "cargo" = new /obj/item/device/pda/multicaster/cargo(src), - "civilian" = new /obj/item/device/pda/multicaster/civilian(src)) + internal_PDAs = list("command" = new /obj/item/pda/multicaster/command(src), + "security" = new /obj/item/pda/multicaster/security(src), + "engineering" = new /obj/item/pda/multicaster/engineering(src), + "medical" = new /obj/item/pda/multicaster/medical(src), + "research" = new /obj/item/pda/multicaster/research(src), + "exploration" = new /obj/item/pda/multicaster/exploration(src), //VOREStation Add, + "cargo" = new /obj/item/pda/multicaster/cargo(src), + "civilian" = new /obj/item/pda/multicaster/civilian(src)) /obj/machinery/pda_multicaster/prebuilt/Initialize() . = ..() @@ -62,7 +62,7 @@ log_game(msg) /obj/machinery/pda_multicaster/proc/update_PDAs(var/turn_off) - for(var/obj/item/device/pda/pda in contents) + for(var/obj/item/pda/pda in contents) var/datum/data/pda/app/messenger/M = pda.find_program(/datum/data/pda/app/messenger/multicast) if(M) M.toff = turn_off diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 76145b618ab..d497ac868d5 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -178,12 +178,12 @@ Buildable meters else return ..() -/obj/item/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/item/pipe/attackby(var/obj/item/W as obj, var/mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) return wrench_act(user, W) return ..() -/obj/item/pipe/proc/wrench_act(var/mob/living/user, var/obj/item/weapon/tool/wrench/W) +/obj/item/pipe/proc/wrench_act(var/mob/living/user, var/obj/item/tool/wrench/W) if(!isturf(loc)) return TRUE @@ -267,12 +267,12 @@ Buildable meters w_class = ITEMSIZE_LARGE var/piping_layer = PIPING_LAYER_DEFAULT -/obj/item/pipe_meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/item/pipe_meter/attackby(var/obj/item/W as obj, var/mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) return wrench_act(user, W) return ..() -/obj/item/pipe_meter/proc/wrench_act(var/mob/living/user, var/obj/item/weapon/tool/wrench/W) +/obj/item/pipe_meter/proc/wrench_act(var/mob/living/user, var/obj/item/tool/wrench/W) var/obj/machinery/atmospherics/pipe/pipe for(var/obj/machinery/atmospherics/pipe/P in loc) if(P.piping_layer == piping_layer) diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index 7a4951f0656..0ece28b95a3 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" density = TRUE - circuit = /obj/item/weapon/circuitboard/pipelayer + circuit = /obj/item/circuitboard/pipelayer var/turf/old_turf // Last turf we were on. var/old_dir // Last direction we were facing. var/on = 0 // Pipelaying online? @@ -13,7 +13,7 @@ var/max_metal = 50 // Max capacity for internal metal storage var/metal = 0 // Current amount in internal metal storage var/pipe_cost = 0.25 // Cost in steel for each pipe. - var/obj/item/weapon/tool/wrench/W // Internal wrench used for wrenching down the pipes + var/obj/item/tool/wrench/W // Internal wrench used for wrenching down the pipes var/list/Pipes = list( "regular pipes" = /obj/machinery/atmospherics/pipe/simple, "scrubbers pipes" = /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -33,7 +33,7 @@ /obj/machinery/pipelayer/RefreshParts() var/mb_rating = 0 - for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) + for(var/obj/item/stock_parts/matter_bin/M in component_parts) mb_rating += M.rating max_metal = mb_rating * initial(max_metal) diff --git a/code/game/machinery/pointdefense.dm b/code/game/machinery/pointdefense.dm index 2a0a284c365..bb4f0e6dc49 100644 --- a/code/game/machinery/pointdefense.dm +++ b/code/game/machinery/pointdefense.dm @@ -14,7 +14,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) icon_state = "control" density = TRUE anchored = TRUE - circuit = /obj/item/weapon/circuitboard/pointdefense_control + circuit = /obj/item/circuitboard/pointdefense_control var/list/targets = list() // Targets being engaged by associated batteries var/id_tag = null @@ -125,7 +125,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) description_info = "Must have the same ident tag as a fire assist mainframe on the same facility. Use a multitool to set the ident tag." density = TRUE anchored = TRUE - circuit = /obj/item/weapon/circuitboard/pointdefense + circuit = /obj/item/circuitboard/pointdefense idle_power_usage = 0.1 KILOWATTS active_power_usage = 1 KILOWATTS appearance_flags = PIXEL_SCALE @@ -166,7 +166,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) else icon_state = initial(icon_state) -/obj/machinery/power/pointdefense/default_unfasten_wrench(var/mob/user, var/obj/item/weapon/W, var/time) +/obj/machinery/power/pointdefense/default_unfasten_wrench(var/mob/user, var/obj/item/W, var/time) if((. = ..())) src.transform = null // Reset rotation if we're anchored/unanchored @@ -338,17 +338,17 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) /obj/machinery/power/pointdefense/RefreshParts() . = ..() // Calculates an average rating of components that affect shooting rate - var/shootrate_divisor = total_component_rating_of_type(/obj/item/weapon/stock_parts/capacitor) + var/shootrate_divisor = total_component_rating_of_type(/obj/item/stock_parts/capacitor) charge_cooldown = 2 SECONDS / (shootrate_divisor ? shootrate_divisor : 1) //Calculate max shooting range - var/killrange_multiplier = total_component_rating_of_type(/obj/item/weapon/stock_parts/capacitor) - killrange_multiplier += 1.5 * total_component_rating_of_type(/obj/item/weapon/stock_parts/scanning_module) + var/killrange_multiplier = total_component_rating_of_type(/obj/item/stock_parts/capacitor) + killrange_multiplier += 1.5 * total_component_rating_of_type(/obj/item/stock_parts/scanning_module) kill_range = 10 + 4 * killrange_multiplier - var/rotation_divisor = total_component_rating_of_type(/obj/item/weapon/stock_parts/manipulator) + var/rotation_divisor = total_component_rating_of_type(/obj/item/stock_parts/manipulator) rotation_speed = 0.5 SECONDS / (rotation_divisor ? rotation_divisor : 1) /obj/machinery/power/pointdefense/proc/Activate() diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index b9329afb4c1..6d3d0c33248 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -55,7 +55,7 @@ var/locked = TRUE //if the turret's behaviour control access is locked var/controllock = FALSE //if the turret responds to control panels - var/installation = /obj/item/weapon/gun/energy/gun //the type of weapon installed + var/installation = /obj/item/gun/energy/gun //the type of weapon installed var/gun_charge = 0 //the charge of the gun inserted var/projectile = null //holder for bullettype var/lethal_projectile = null //holder for the shot when emagged @@ -118,7 +118,7 @@ /obj/machinery/porta_turret/stationary ailock = TRUE lethal = TRUE - installation = /obj/item/weapon/gun/energy/laser + installation = /obj/item/gun/energy/laser /obj/machinery/porta_turret/stationary/syndie // Generic turrets for POIs that need to not shoot their buddies. req_one_access = list(access_syndicate) @@ -130,7 +130,7 @@ name = "defense turret" desc = "This variant appears to be much more durable." req_one_access = list(access_synth) // Just in case. - installation = /obj/item/weapon/gun/energy/xray // For the armor pen. + installation = /obj/item/gun/energy/xray // For the armor pen. health = 250 // Since lasers do 40 each. maxhealth = 250 @@ -152,7 +152,7 @@ catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_turret) icon_state = "turret_cover_alien" req_one_access = list(access_alien) - installation = /obj/item/weapon/gun/energy/alien + installation = /obj/item/gun/energy/alien enabled = TRUE lethal = TRUE ailock = TRUE @@ -173,7 +173,7 @@ desc = "This variant appears to be much more rugged." req_one_access = list(access_heads) icon_state = "turret_cover_industrial" - installation = /obj/item/weapon/gun/energy/phasegun + installation = /obj/item/gun/energy/phasegun health = 200 maxhealth = 200 turret_type = "industrial" @@ -200,7 +200,7 @@ name = "defense turret" desc = "This variant appears to be much more durable, with a rugged outer coating." req_one_access = list(access_heads) - installation = /obj/item/weapon/gun/energy/gun/burst + installation = /obj/item/gun/energy/gun/burst health = 250 maxhealth = 250 @@ -215,7 +215,7 @@ name = "lasertag turret" turret_type = "normal" req_one_access = list() - installation = /obj/item/weapon/gun/energy/lasertag/omni + installation = /obj/item/gun/energy/lasertag/omni targetting_is_configurable = FALSE lethal_is_configurable = FALSE @@ -236,12 +236,12 @@ /obj/machinery/porta_turret/lasertag/red turret_type = "red" - installation = /obj/item/weapon/gun/energy/lasertag/red + installation = /obj/item/gun/energy/lasertag/red check_weapons = TRUE // Used to target blue players /obj/machinery/porta_turret/lasertag/blue turret_type = "blue" - installation = /obj/item/weapon/gun/energy/lasertag/blue + installation = /obj/item/gun/energy/lasertag/blue check_synth = TRUE // Used to target red players /obj/machinery/porta_turret/lasertag/assess_living(var/mob/living/L) @@ -316,7 +316,7 @@ /obj/machinery/porta_turret/proc/setup() - var/obj/item/weapon/gun/energy/E = installation //All energy-based weapons are applicable + var/obj/item/gun/energy/E = installation //All energy-based weapons are applicable var/obj/item/projectile/P = initial(E.projectile_type) //var/obj/item/ammo_casing/shottype = E.projectile_type @@ -346,29 +346,29 @@ /obj/machinery/porta_turret/proc/weapon_setup(var/guntype) switch(guntype) - if(/obj/item/weapon/gun/energy/gun/burst) + if(/obj/item/gun/energy/gun/burst) lethal_icon_color = "red" lethal_projectile = /obj/item/projectile/beam/burstlaser lethal_shot_sound = 'sound/weapons/Laser.ogg' shot_delay = 1 SECOND - if(/obj/item/weapon/gun/energy/phasegun) + if(/obj/item/gun/energy/phasegun) icon_color = "orange" lethal_icon_color = "orange" lethal_projectile = /obj/item/projectile/energy/phase/heavy shot_delay = 1 SECOND - if(/obj/item/weapon/gun/energy/gun) + if(/obj/item/gun/energy/gun) lethal_icon_color = "red" lethal_projectile = /obj/item/projectile/beam //If it has, going to kill mode lethal_shot_sound = 'sound/weapons/Laser.ogg' - if(/obj/item/weapon/gun/energy/gun/nuclear) + if(/obj/item/gun/energy/gun/nuclear) lethal_icon_color = "red" lethal_projectile = /obj/item/projectile/beam //If it has, going to kill mode lethal_shot_sound = 'sound/weapons/Laser.ogg' - if(/obj/item/weapon/gun/energy/xray) + if(/obj/item/gun/energy/xray) lethal_icon_color = "green" lethal_projectile = /obj/item/projectile/beam/xray projectile = /obj/item/projectile/beam/stun // Otherwise we fire xrays on both modes. @@ -492,13 +492,13 @@ if(can_salvage && prob(70)) to_chat(user, "You remove the turret and salvage some components.") if(installation) - var/obj/item/weapon/gun/energy/Gun = new installation(loc) + var/obj/item/gun/energy/Gun = new installation(loc) Gun.power_supply.charge = gun_charge Gun.update_icon() if(prob(50)) new /obj/item/stack/material/steel(loc, rand(1,4)) if(prob(50)) - new /obj/item/device/assembly/prox_sensor(loc) + new /obj/item/assembly/prox_sensor(loc) else to_chat(user, "You remove the turret but did not manage to salvage anything.") qdel(src) // qdel @@ -534,7 +534,7 @@ update_icon() wrenching = FALSE - else if(istype(I, /obj/item/weapon/card/id)||istype(I, /obj/item/device/pda)) + else if(istype(I, /obj/item/card/id)||istype(I, /obj/item/pda)) //Behavior lock/unlock mangement if(allowed(user)) locked = !locked @@ -880,7 +880,7 @@ //Turrets aim for the center of mass by default. //If the target is grabbing someone then the turret smartly aims for extremities var/def_zone - var/obj/item/weapon/grab/G = locate() in target + var/obj/item/grab/G = locate() in target if(G && G.state >= GRAB_NECK) //works because mobs are currently not allowed to upgrade to NECK if they are grabbing two people. def_zone = pick(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_FOOT, BP_R_FOOT, BP_L_ARM, BP_R_ARM, BP_L_LEG, BP_R_LEG) else @@ -983,7 +983,7 @@ return else if(I.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = I.get_welder() + var/obj/item/weldingtool/WT = I.get_welder() if(!WT.isOn()) return if(WT.get_fuel() < 5) //uses up 5 fuel. @@ -999,11 +999,11 @@ return if(3) - if(istype(I, /obj/item/weapon/gun/energy)) //the gun installation part + if(istype(I, /obj/item/gun/energy)) //the gun installation part if(isrobot(user)) return - var/obj/item/weapon/gun/energy/E = I //typecasts the item to an energy gun + var/obj/item/gun/energy/E = I //typecasts the item to an energy gun if(!user.unEquip(I)) to_chat(user, "\The [I] is stuck to your hand, you cannot put it in \the [src]") return @@ -1061,7 +1061,7 @@ if(7) if(I.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = I.get_welder() + var/obj/item/weldingtool/WT = I.get_welder() if(!WT.isOn()) return if(WT.get_fuel() < 5) to_chat(user, "You need more fuel to complete this task.") @@ -1090,7 +1090,7 @@ build_step = 6 return - if(istype(I, /obj/item/weapon/pen)) //you can rename turrets like bots! + if(istype(I, /obj/item/pen)) //you can rename turrets like bots! var/t = sanitizeSafe(tgui_input_text(user, "Enter new turret name", name, finish_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!t) return @@ -1109,7 +1109,7 @@ return build_step = 3 - var/obj/item/weapon/gun/energy/Gun = new installation(loc) + var/obj/item/gun/energy/Gun = new installation(loc) Gun.power_supply.charge = gun_charge Gun.update_icon() installation = null @@ -1118,7 +1118,7 @@ if(5) to_chat(user, "You remove the prox sensor from the turret frame.") - new /obj/item/device/assembly/prox_sensor(loc) + new /obj/item/assembly/prox_sensor(loc) build_step = 4 /obj/machinery/porta_turret_construct/attack_ai() diff --git a/code/game/machinery/portable_turret_vr.dm b/code/game/machinery/portable_turret_vr.dm index b83f3720fff..a24f16ceb6b 100644 --- a/code/game/machinery/portable_turret_vr.dm +++ b/code/game/machinery/portable_turret_vr.dm @@ -24,7 +24,7 @@ name = "military CIWS turret" desc = "A ship weapons turret designed for anti-fighter defense." req_one_access = list(access_cent_general) - installation = /obj/item/weapon/gun/energy/pulse_rifle/destroyer + installation = /obj/item/gun/energy/pulse_rifle/destroyer health = 500 maxhealth = 500 enabled = TRUE diff --git a/code/game/machinery/protean_reconstitutor.dm b/code/game/machinery/protean_reconstitutor.dm index 287e3e0c1a2..781962a6be4 100644 --- a/code/game/machinery/protean_reconstitutor.dm +++ b/code/game/machinery/protean_reconstitutor.dm @@ -17,7 +17,7 @@ var/buzzsound = 'sound/items/nif_tone_bad.ogg' //sound to play when we have to abort due to loss of posibrain client //vars for basic functionality - var/obj/item/device/mmi/digital/posibrain/nano/protean_brain = null //only allow protean brains, no midround upgrades to bypass the whitelist! + var/obj/item/mmi/digital/posibrain/nano/protean_brain = null //only allow protean brains, no midround upgrades to bypass the whitelist! var/obj/item/organ/internal/nano/orchestrator/protean_orchestrator = null //essential var/obj/item/organ/internal/nano/refactory/protean_refactory = null //not essential, but nice to have; lets us transfer stored materials var/nanomass_reserve = 0 //starting reserve - will be wiped if it's deconstructed! @@ -31,13 +31,13 @@ var/finalize_time = 135 SECONDS //finally, how long we need before popping them out of the tank //component vars - circuit = /obj/item/weapon/circuitboard/protean_reconstitutor + circuit = /obj/item/circuitboard/protean_reconstitutor /obj/machinery/protean_reconstitutor/Initialize() component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) + component_parts += new /obj/item/stock_parts/matter_bin(src) + component_parts += new /obj/item/stock_parts/manipulator(src) + component_parts += new /obj/item/stock_parts/console_screen(src) component_parts += new /obj/item/stack/cable_coil(src, 5) RefreshParts() . = ..() @@ -45,13 +45,13 @@ /obj/machinery/protean_reconstitutor/RefreshParts() //total paste storage cap (300 * the rating, straightforward) var/store_rating = initial(nanotank_max) - for(var/obj/item/weapon/stock_parts/matter_bin/MB in component_parts) + for(var/obj/item/stock_parts/matter_bin/MB in component_parts) store_rating = store_rating * MB.rating nanotank_max = store_rating //inefficiency of adding paste (amount of uses * (mech_repair / inefficiency)); most complex, good way to get good bang for your buck tho var/paste_rating = initial(paste_inefficiency) - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) paste_rating = paste_rating - (M.rating - 1) paste_inefficiency = paste_rating ..() @@ -100,8 +100,8 @@ if(default_part_replacement(user, W)) return - if(istype(W,/obj/item/device/mmi/digital/posibrain/nano)) - var/obj/item/device/mmi/digital/posibrain/nano/NB = W + if(istype(W,/obj/item/mmi/digital/posibrain/nano)) + var/obj/item/mmi/digital/posibrain/nano/NB = W if(!NB.brainmob.client) to_chat(user,"You cannot use an inactive positronic brain for this process.") return @@ -279,7 +279,7 @@ P.apply_vore_prefs() //run a little revive, load their prefs, and boot a new NIF on them for the finishing touches and cleanup... (yes, we need to initialize a new NIF, they don't get one from the revive process) //using revive is honestly a bit overkill since it kinda deletes-and-replaces most of the guts anyway (hence the cache and restore of refactory contents; otherwise they get wiped!), but it also ensures the new protean comes out in their "base form" as well as hopefully cleaning up any loose ends in the resurrection process - var/obj/item/device/nif/protean/new_nif = new() + var/obj/item/nif/protean/new_nif = new() new_nif.quick_implant(P) //revive complete, now restore the cached mats (if we had any) if(mats_cached == TRUE) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index cd23dad276a..027f3461449 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -10,12 +10,12 @@ active_power_usage = 40000 //40 kW var/efficiency = 40000 //will provide the modified power rate when upgraded var/obj/item/charging = null - var/list/allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/modular_computer, /obj/item/weapon/computer_hardware/battery_module, /obj/item/weapon/cell, /obj/item/device/suit_cooling_unit/emergency, /obj/item/device/flashlight, /obj/item/device/electronic_assembly, /obj/item/weapon/weldingtool/electric, /obj/item/ammo_magazine/smart, /obj/item/device/flash, /obj/item/device/defib_kit, /obj/item/ammo_casing/microbattery, /obj/item/device/paicard, /obj/item/device/personal_shield_generator) //VOREStation Add - NSFW Batteries + var/list/allowed_devices = list(/obj/item/gun/energy, /obj/item/melee/baton, /obj/item/modular_computer, /obj/item/computer_hardware/battery_module, /obj/item/cell, /obj/item/suit_cooling_unit/emergency, /obj/item/flashlight, /obj/item/electronic_assembly, /obj/item/weldingtool/electric, /obj/item/ammo_magazine/smart, /obj/item/flash, /obj/item/defib_kit, /obj/item/ammo_casing/microbattery, /obj/item/paicard, /obj/item/personal_shield_generator) //VOREStation Add - NSFW Batteries var/icon_state_charged = "recharger2" var/icon_state_charging = "recharger1" var/icon_state_idle = "recharger0" //also when unpowered var/portable = 1 - circuit = /obj/item/weapon/circuitboard/recharger + circuit = /obj/item/circuitboard/recharger /obj/machinery/recharger/Initialize() . = ..() @@ -27,11 +27,11 @@ if(get_dist(user, src) <= 5) . += "[charging ? "[charging]" : "Nothing"] is in [src]." if(charging) - var/obj/item/weapon/cell/C = charging.get_cell() + var/obj/item/cell/C = charging.get_cell() if(C) // Sometimes we get things without cells in it. . += "Current charge: [C.charge] / [C.maxcharge]" -/obj/machinery/recharger/attackby(obj/item/weapon/G as obj, mob/user as mob) +/obj/machinery/recharger/attackby(obj/item/G as obj, mob/user as mob) var/allowed = 0 for (var/allowed_type in allowed_devices) if(istype(G, allowed_type)) allowed = 1 @@ -44,8 +44,8 @@ if(!powered()) to_chat(user, "\The [src] blinks red as you try to insert [G]!") return - if(istype(G, /obj/item/weapon/gun/energy)) - var/obj/item/weapon/gun/energy/E = G + if(istype(G, /obj/item/gun/energy)) + var/obj/item/gun/energy/E = G if(E.self_recharge) to_chat(user, "\The [E] has no recharge port.") return @@ -54,26 +54,26 @@ if(!C.battery_module) to_chat(user, "\The [C] does not have a battery installed. ") return - if(istype(G, /obj/item/weapon/melee/baton)) - var/obj/item/weapon/melee/baton/B = G + if(istype(G, /obj/item/melee/baton)) + var/obj/item/melee/baton/B = G if(B.use_external_power) to_chat(user, "\The [B] has no recharge port.") return - if(istype(G, /obj/item/device/flash)) - var/obj/item/device/flash/F = G + if(istype(G, /obj/item/flash)) + var/obj/item/flash/F = G if(F.use_external_power) to_chat(user, "\The [F] has no recharge port.") return - if(istype(G, /obj/item/weapon/weldingtool/electric)) - var/obj/item/weapon/weldingtool/electric/EW = G + if(istype(G, /obj/item/weldingtool/electric)) + var/obj/item/weldingtool/electric/EW = G if(EW.use_external_power) to_chat(user, "\The [EW] has no recharge port.") return - if(!G.get_cell() && !istype(G, /obj/item/ammo_casing/microbattery) && !istype(G, /obj/item/device/paicard)) //VOREStation Edit: NSFW charging + if(!G.get_cell() && !istype(G, /obj/item/ammo_casing/microbattery) && !istype(G, /obj/item/paicard)) //VOREStation Edit: NSFW charging to_chat(user, "\The [G] does not have a battery installed.") return - if(istype(G, /obj/item/device/paicard)) - var/obj/item/device/paicard/ourcard = G + if(istype(G, /obj/item/paicard)) + var/obj/item/paicard/ourcard = G if(ourcard.panel_open) to_chat(user, "\The [ourcard] won't fit in the recharger with its panel open.") return @@ -136,8 +136,8 @@ update_use_power(USE_POWER_IDLE) icon_state = icon_state_idle //VOREStation Edit Start - pAI revival! - else if(istype(charging, /obj/item/device/paicard)) - var/obj/item/device/paicard/pcard = charging + else if(istype(charging, /obj/item/paicard)) + var/obj/item/paicard/pcard = charging if(pcard.is_damage_critical()) pcard.forceMove(get_turf(src)) charging = null @@ -155,7 +155,7 @@ pcard.pai.full_restore() //VOREStation Edit End else - var/obj/item/weapon/cell/C = charging.get_cell() + var/obj/item/cell/C = charging.get_cell() if(istype(C)) if(!C.fully_charged()) icon_state = icon_state_charging @@ -184,7 +184,7 @@ return if(charging) - var/obj/item/weapon/cell/C = charging.get_cell() + var/obj/item/cell/C = charging.get_cell() if(istype(C)) C.emp_act(severity) @@ -198,7 +198,7 @@ /obj/machinery/recharger/RefreshParts() var/E = 0 - for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts) + for(var/obj/item/stock_parts/capacitor/C in component_parts) E += C.rating efficiency = active_power_usage * (1+ (E - 1)*0.5) @@ -211,9 +211,9 @@ layer = ABOVE_TURF_LAYER active_power_usage = 60000 //60 kW , It's more specialized than the standalone recharger (guns, batons, and flashlights only) so make it more powerful efficiency = 60000 - allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/gun/magnetic, /obj/item/weapon/melee/baton, /obj/item/device/flashlight, /obj/item/weapon/cell/device) + allowed_devices = list(/obj/item/gun/energy, /obj/item/gun/magnetic, /obj/item/melee/baton, /obj/item/flashlight, /obj/item/cell/device) icon_state_charged = "wrecharger2" icon_state_charging = "wrecharger1" icon_state_idle = "wrecharger0" portable = 0 - circuit = /obj/item/weapon/circuitboard/recharger/wrecharger + circuit = /obj/item/circuitboard/recharger/wrecharger diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 31bc167040f..d7ff16e0b06 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -6,11 +6,11 @@ density = TRUE anchored = TRUE unacidable = TRUE - circuit = /obj/item/weapon/circuitboard/recharge_station + circuit = /obj/item/circuitboard/recharge_station use_power = USE_POWER_IDLE idle_power_usage = 50 var/mob/occupant = null - var/obj/item/weapon/cell/cell = null + var/obj/item/cell/cell = null var/icon_update_tick = 0 // Used to rebuild the overlay only once every 10 ticks var/charging = 0 @@ -122,7 +122,7 @@ H.accumulated_rads = max(H.accumulated_rads - 25, 0) if(H.wearing_rig) // stepping into a borg charger to charge your rig and fix your shit - var/obj/item/weapon/rig/wornrig = H.get_rig() + var/obj/item/rig/wornrig = H.get_rig() if(wornrig) // just to make sure for(var/obj/item/rig_module/storedmod in wornrig.installed_modules) if(weld_rate && storedmod.damage && cell.checked_use(weld_power_use * weld_rate * CELLRATE)) @@ -135,7 +135,7 @@ rigchest.calc_breach_damage() to_chat(H, "[rigchest] is repaired!") if(wornrig.cell) - var/obj/item/weapon/cell/rigcell = wornrig.cell + var/obj/item/cell/rigcell = wornrig.cell var/diff = min(rigcell.maxcharge - rigcell.charge, charging_power * CELLRATE) // Capped by charging_power / tick var/charge_used = cell.use(diff) rigcell.give(charge_used) @@ -171,8 +171,8 @@ return if(default_part_replacement(user, O)) return - if (istype(O, /obj/item/weapon/grab) && get_dist(src,user)<2) - var/obj/item/weapon/grab/G = O + if (istype(O, /obj/item/grab) && get_dist(src,user)<2) + var/obj/item/grab/G = O if(istype(G.affecting,/mob/living)) var/mob/living/M = G.affecting qdel(O) @@ -191,12 +191,12 @@ var/man_rating = 0 var/cap_rating = 0 - for(var/obj/item/weapon/stock_parts/P in component_parts) - if(istype(P, /obj/item/weapon/stock_parts/capacitor)) + for(var/obj/item/stock_parts/P in component_parts) + if(istype(P, /obj/item/stock_parts/capacitor)) cap_rating += P.rating - if(istype(P, /obj/item/weapon/stock_parts/manipulator)) + if(istype(P, /obj/item/stock_parts/manipulator)) man_rating += P.rating - cell = locate(/obj/item/weapon/cell) in component_parts + cell = locate(/obj/item/cell) in component_parts charging_power = 40000 + 40000 * cap_rating restore_power_active = 10000 + 15000 * cap_rating diff --git a/code/game/machinery/records_scanner.dm b/code/game/machinery/records_scanner.dm index b80548e876c..de37a50ad3d 100644 --- a/code/game/machinery/records_scanner.dm +++ b/code/game/machinery/records_scanner.dm @@ -72,7 +72,7 @@ text += "[A]
" to_chat(user, "You feel a sting as the scanner extracts some of your blood.") var/turf/T = get_step(src,outputdir) - var/obj/item/weapon/paper/print = new(T) + var/obj/item/paper/print = new(T) print.name = "[mname] Report" print.info = text print.stamped = 1 diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 2738b359182..7cb34a113b4 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -24,7 +24,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() icon = 'icons/obj/terminals_vr.dmi' //VOREStation Edit icon_state = "req_comp_0" layer = ABOVE_WINDOW_LAYER - circuit = /obj/item/weapon/circuitboard/request + circuit = /obj/item/circuitboard/request blocks_emissive = NONE light_power = 0.25 light_color = "#00ff00" @@ -203,7 +203,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() msg = "[msg[1]]:
[msg[2]]" msg = replacetext(msg, "
", "\n") msg = strip_html_properly(msg) - var/obj/item/weapon/paper/R = new(src.loc) + var/obj/item/paper/R = new(src.loc) R.name = "[department] Message" R.info = "

[department] Requests Console

[msg]
" . = TRUE @@ -229,10 +229,10 @@ var/list/obj/machinery/requests_console/allConsoles = list() . = TRUE //err... hacking code, which has no reason for existing... but anyway... it was once supposed to unlock priority 3 messaging on that console (EXTREME priority...), but the code for that was removed. -/obj/machinery/requests_console/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob) +/obj/machinery/requests_console/attackby(var/obj/item/O as obj, var/mob/user as mob) if(computer_deconstruction_screwdriver(user, O)) return - if(istype(O, /obj/item/device/multitool)) + if(istype(O, /obj/item/multitool)) var/input = sanitize(tgui_input_text(usr, "What Department ID would you like to give this request console?", "Multitool-Request Console Interface", department)) if(!input) to_chat(usr, "No input found. Please hang up and try your call again.") @@ -251,14 +251,14 @@ var/list/obj/machinery/requests_console/allConsoles = list() req_console_information |= department return - if(istype(O, /obj/item/weapon/card/id)) + if(istype(O, /obj/item/card/id)) if(inoperable(MAINT)) return if(screen == RCS_MESSAUTH) - var/obj/item/weapon/card/id/T = O + var/obj/item/card/id/T = O msgVerified = text("Verified by [T.registered_name] ([T.assignment])") SStgui.update_uis(src) if(screen == RCS_ANNOUNCE) - var/obj/item/weapon/card/id/ID = O + var/obj/item/card/id/ID = O if(access_RC_announce in ID.GetAccess()) announceAuth = 1 announcement.announcer = ID.assignment ? "[ID.assignment] [ID.registered_name]" : ID.registered_name @@ -266,10 +266,10 @@ var/list/obj/machinery/requests_console/allConsoles = list() reset_message() to_chat(user, "You are not authorized to send announcements.") SStgui.update_uis(src) - if(istype(O, /obj/item/weapon/stamp)) + if(istype(O, /obj/item/stamp)) if(inoperable(MAINT)) return if(screen == RCS_MESSAUTH) - var/obj/item/weapon/stamp/T = O + var/obj/item/stamp/T = O msgStamped = text("Stamped with the [T.name]") SStgui.update_uis(src) return diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm index 77cf8d1509a..f57bf485442 100644 --- a/code/game/machinery/seed_extractor.dm +++ b/code/game/machinery/seed_extractor.dm @@ -9,16 +9,16 @@ /obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob) // Fruits and vegetables. - if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown) || istype(O, /obj/item/weapon/grown)) + if(istype(O, /obj/item/reagent_containers/food/snacks/grown) || istype(O, /obj/item/grown)) user.remove_from_mob(O) var/datum/seed/new_seed_type - if(istype(O, /obj/item/weapon/grown)) - var/obj/item/weapon/grown/F = O + if(istype(O, /obj/item/grown)) + var/obj/item/grown/F = O new_seed_type = SSplants.seeds[F.plantname] else - var/obj/item/weapon/reagent_containers/food/snacks/grown/F = O + var/obj/item/reagent_containers/food/snacks/grown/F = O new_seed_type = SSplants.seeds[F.plantname] if(new_seed_type) @@ -40,7 +40,7 @@ to_chat(user, "You extract some seeds from the grass tile.") new /obj/item/seeds/grassseed(loc) - else if(istype(O, /obj/item/weapon/fossil/plant)) // Fossils + else if(istype(O, /obj/item/fossil/plant)) // Fossils var/obj/item/seeds/random/R = new(get_turf(src)) to_chat(user, "\The [src] pulverizes \the [O] and spits out \the [R].") qdel(O) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index f5505ba9da4..c8dbf4d7d7f 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -16,8 +16,8 @@ light_power = 1 light_on = FALSE - var/obj/item/weapon/cell/cell - var/cell_type = /obj/item/weapon/cell/high + var/obj/item/cell/cell + var/cell_type = /obj/item/cell/high var/state = 0 var/set_temperature = T0C + 20 //K var/heating_power = 40000 @@ -71,14 +71,14 @@ ..(severity) /obj/machinery/space_heater/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/weapon/cell)) + if(istype(I, /obj/item/cell)) if(panel_open) if(cell) to_chat(user, "There is already a power cell inside.") return else // insert cell - var/obj/item/weapon/cell/C = usr.get_active_hand() + var/obj/item/cell/C = usr.get_active_hand() if(istype(C)) user.drop_item() cell = C @@ -166,7 +166,7 @@ if("cellinstall") if(!cell) - var/obj/item/weapon/cell/C = usr.get_active_hand() + var/obj/item/cell/C = usr.get_active_hand() if(istype(C)) usr.drop_item() cell = C diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 80d28b7e3d3..d56f24d06fc 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -20,7 +20,7 @@ unacidable = TRUE use_power = USE_POWER_IDLE idle_power_usage = 10 - circuit = /obj/item/weapon/circuitboard/status_display + circuit = /obj/item/circuitboard/status_display var/mode = 1 // 0 = Blank // 1 = Shuttle timer // 2 = Arbitrary message(s) diff --git a/code/game/machinery/status_display_ai.dm b/code/game/machinery/status_display_ai.dm index 477c4d7937f..988e3458a07 100644 --- a/code/game/machinery/status_display_ai.dm +++ b/code/game/machinery/status_display_ai.dm @@ -65,7 +65,7 @@ var/list/ai_status_emotions = list( name = "AI display" anchored = TRUE density = FALSE - circuit = /obj/item/weapon/circuitboard/ai_status_display + circuit = /obj/item/circuitboard/ai_status_display var/mode = 0 // 0 = Blank // 1 = AI emoticon diff --git a/code/game/machinery/suit_storage/suit_cycler.dm b/code/game/machinery/suit_storage/suit_cycler.dm index 6803194eef7..69d40a12b82 100644 --- a/code/game/machinery/suit_storage/suit_cycler.dm +++ b/code/game/machinery/suit_storage/suit_cycler.dm @@ -141,13 +141,13 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) return //Hacking init. - if(istype(I, /obj/item/device/multitool) || I.has_tool_quality(TOOL_WIRECUTTER)) + if(istype(I, /obj/item/multitool) || I.has_tool_quality(TOOL_WIRECUTTER)) if(panel_open) attack_hand(user) return //Other interface stuff. - if(istype(I, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = I + if(istype(I, /obj/item/grab)) + var/obj/item/grab/G = I if(!(ismob(G.affecting))) return diff --git a/code/game/machinery/suit_storage/suit_storage.dm b/code/game/machinery/suit_storage/suit_storage.dm index 021b050c5f8..c9347f4e1f4 100644 --- a/code/game/machinery/suit_storage/suit_storage.dm +++ b/code/game/machinery/suit_storage/suit_storage.dm @@ -391,8 +391,8 @@ to_chat(user, span_blue("You [panelopen ? "open up" : "close"] the unit's maintenance panel.")) updateUsrDialog() return - if(istype(I, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = I + if(istype(I, /obj/item/grab)) + var/obj/item/grab/G = I if(!(ismob(G.affecting))) return if(!isopen) diff --git a/code/game/machinery/supplybeacon.dm b/code/game/machinery/supplybeacon.dm index f3d4bb574fd..a70de364b15 100644 --- a/code/game/machinery/supplybeacon.dm +++ b/code/game/machinery/supplybeacon.dm @@ -44,7 +44,7 @@ name = "supermatter supply beacon" drop_type = "supermatter" -/obj/machinery/power/supply_beacon/attackby(var/obj/item/weapon/W, var/mob/user) +/obj/machinery/power/supply_beacon/attackby(var/obj/item/W, var/mob/user) if(!use_power && W.has_tool_quality(TOOL_WRENCH)) if(!anchored && !connect_to_network()) to_chat(user, "This device must be placed over an exposed cable.") diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 8c635ebc99d..ca479f8bcce 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -120,7 +120,7 @@ to_chat(user, "You need to screw the beacon to the floor first!") return -/obj/machinery/power/singularity_beacon/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/power/singularity_beacon/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_SCREWDRIVER)) if(active) to_chat(user, "You need to deactivate the beacon first!") diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 48f9e1bff2d..fa8db1916d3 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -22,7 +22,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept machinetype = 5 produces_heat = 0 delay = 7 - circuit = /obj/item/weapon/circuitboard/telecomms/broadcaster + circuit = /obj/item/circuitboard/telecomms/broadcaster //Vars only used if you're using the overmap var/overmap_range = 0 var/overmap_range_min = 0 @@ -34,7 +34,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept . = ..() default_apply_parts() -/obj/machinery/telecomms/broadcaster/proc/link_radio(var/obj/item/device/radio/R) +/obj/machinery/telecomms/broadcaster/proc/link_radio(var/obj/item/radio/R) if(!istype(R)) return linked_radios_weakrefs |= WEAKREF(R) @@ -67,7 +67,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept var/list/forced_radios for(var/datum/weakref/wr in linked_radios_weakrefs) - var/obj/item/device/radio/R = wr.resolve() + var/obj/item/radio/R = wr.resolve() if(istype(R)) LAZYDISTINCTADD(forced_radios, R) @@ -146,7 +146,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept var/list/linked_radios_weakrefs = list() -/obj/machinery/telecomms/allinone/proc/link_radio(var/obj/item/device/radio/R) +/obj/machinery/telecomms/allinone/proc/link_radio(var/obj/item/radio/R) if(!istype(R)) return linked_radios_weakrefs |= WEAKREF(R) @@ -198,7 +198,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept var/list/forced_radios for(var/datum/weakref/wr in linked_radios_weakrefs) - var/obj/item/device/radio/R = wr.resolve() + var/obj/item/radio/R = wr.resolve() if(istype(R)) LAZYDISTINCTADD(forced_radios, R) @@ -256,7 +256,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept var/list/forced_radios for(var/datum/weakref/wr in linked_radios_weakrefs) - var/obj/item/device/radio/R = wr.resolve() + var/obj/item/radio/R = wr.resolve() if(istype(R)) LAZYDISTINCTADD(forced_radios, R) @@ -336,7 +336,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept **/ /proc/Broadcast_Message(var/datum/radio_frequency/connection, var/mob/M, - var/vmask, var/list/vmessage_pieces, var/obj/item/device/radio/radio, + var/vmask, var/list/vmessage_pieces, var/obj/item/radio/radio, var/list/message_pieces, var/name, var/job, var/realname, var/vname, var/data, var/compression, var/list/level, var/freq, var/verbage = "says", var/list/forced_radios) @@ -345,9 +345,9 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept var/display_freq = freq - var/list/obj/item/device/radio/radios = list() + var/list/obj/item/radio/radios = list() - for(var/obj/item/device/radio/R in forced_radios) + for(var/obj/item/radio/R in forced_radios) //Cursory check to ensure they are 'on' and stuff if(R.receive_range(display_freq, list(0)) > -1) radios |= R @@ -356,7 +356,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept if(data == DATA_INTERCOM) - for (var/obj/item/device/radio/intercom/R in connection.devices["[RADIO_CHAT]"]) + for (var/obj/item/radio/intercom/R in connection.devices["[RADIO_CHAT]"]) if(R.receive_range(display_freq, level) > -1) radios |= R @@ -364,9 +364,9 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept else if(data == DATA_LOCAL) - for (var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"]) + for (var/obj/item/radio/R in connection.devices["[RADIO_CHAT]"]) - if(istype(R, /obj/item/device/radio/headset) && !R.adhoc_fallback) + if(istype(R, /obj/item/radio/headset) && !R.adhoc_fallback) continue if(R.receive_range(display_freq, level) > -1) @@ -377,7 +377,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept else if(data == DATA_ANTAG) for(var/antag_freq in ANTAG_FREQS) var/datum/radio_frequency/antag_connection = radio_controller.return_frequency(antag_freq) - for (var/obj/item/device/radio/R in antag_connection.devices["[RADIO_CHAT]"]) + for (var/obj/item/radio/R in antag_connection.devices["[RADIO_CHAT]"]) if(R.receive_range(antag_freq, level) > -1) radios |= R @@ -385,7 +385,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept else - for (var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"]) + for (var/obj/item/radio/R in connection.devices["[RADIO_CHAT]"]) if(R.receive_range(display_freq, level) > -1) radios |= R @@ -563,13 +563,13 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept var/list/receive = list() - for(var/obj/item/device/radio/R in forced_radios) + for(var/obj/item/radio/R in forced_radios) receive |= R.send_hear(display_freq) // --- Broadcast only to intercom devices --- if(data == DATA_INTERCOM) - for (var/obj/item/device/radio/intercom/R in connection.devices["[RADIO_CHAT]"]) + for (var/obj/item/radio/intercom/R in connection.devices["[RADIO_CHAT]"]) var/turf/position = get_turf(R) if(position && position.z == level) receive |= R.send_hear(display_freq, level) @@ -578,9 +578,9 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // --- Broadcast only to intercoms and station-bounced radios --- else if(data == DATA_LOCAL) - for (var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"]) + for (var/obj/item/radio/R in connection.devices["[RADIO_CHAT]"]) - if(istype(R, /obj/item/device/radio/headset)) + if(istype(R, /obj/item/radio/headset)) continue var/turf/position = get_turf(R) if(position && position.z == level) @@ -592,7 +592,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept else if(data == DATA_ANTAG) for(var/freq in ANTAG_FREQS) var/datum/radio_frequency/antag_connection = radio_controller.return_frequency(freq) - for (var/obj/item/device/radio/R in antag_connection.devices["[RADIO_CHAT]"]) + for (var/obj/item/radio/R in antag_connection.devices["[RADIO_CHAT]"]) var/turf/position = get_turf(R) if(position && position.z == level) receive |= R.send_hear(freq) @@ -601,7 +601,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // --- Broadcast to ALL radio devices --- else - for (var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"]) + for (var/obj/item/radio/R in connection.devices["[RADIO_CHAT]"]) var/turf/position = get_turf(R) if(position && position.z == level) receive |= R.send_hear(display_freq) @@ -658,7 +658,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept part_b_extra = " (Intercepted)" // Create a radio headset for the sole purpose of using its icon - var/obj/item/device/radio/headset/radio = new + var/obj/item/radio/headset/radio = new var/part_b = "[icon2html(radio, heard_normal + heard_garbled + heard_gibberish)]\[[freq_text]\][part_b_extra] " // Tweaked for security headsets -- TLE var/part_blackbox_b = " \[[freq_text]\] " // Tweaked for security headsets -- TLE diff --git a/code/game/machinery/telecomms/broadcaster_vr.dm b/code/game/machinery/telecomms/broadcaster_vr.dm index 3751ffacdf6..07bdb3cbce1 100644 --- a/code/game/machinery/telecomms/broadcaster_vr.dm +++ b/code/game/machinery/telecomms/broadcaster_vr.dm @@ -32,7 +32,7 @@ var/list/forced_radios for(var/datum/weakref/wr in linked_radios_weakrefs) - var/obj/item/device/radio/R = wr.resolve() + var/obj/item/radio/R = wr.resolve() if(istype(R)) LAZYDISTINCTADD(forced_radios, R) diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index 2de8d04a492..1d3870c08f3 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -10,7 +10,7 @@ var/list/servers = list() // the servers located by the computer var/obj/machinery/telecomms/server/SelectedServer - circuit = /obj/item/weapon/circuitboard/comm_server + circuit = /obj/item/circuitboard/comm_server var/network = "NULL" // the network to probe var/list/temp = null // temporary feedback messages diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 809c9c9b820..72fef22286f 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -16,7 +16,7 @@ /obj/machinery/telecomms/attackby(obj/item/P as obj, mob/user as mob) // Using a multitool lets you access the receiver's interface - if(istype(P, /obj/item/device/multitool)) + if(istype(P, /obj/item/multitool)) attack_hand(user) // REPAIRING: Use Nanopaste to repair 10-20 integrity points. @@ -63,7 +63,7 @@ data["options"] = Options_Menu() - var/obj/item/device/multitool/P = get_multitool(user) + var/obj/item/multitool/P = get_multitool(user) data["multitool"] = !!P data["multitool_buffer"] = null if(P && P.buffer) @@ -94,7 +94,7 @@ /obj/machinery/telecomms/tgui_status(mob/user) if(!issilicon(user)) - if(!istype(user.get_active_hand(), /obj/item/device/multitool)) + if(!istype(user.get_active_hand(), /obj/item/multitool)) return STATUS_CLOSE . = ..() @@ -130,15 +130,15 @@ /obj/machinery/proc/get_multitool(mob/user as mob) //No need to have this being a telecomms specific proc. - var/obj/item/device/multitool/P = null + var/obj/item/multitool/P = null // Let's double check - if(!issilicon(user) && istype(user.get_active_hand(), /obj/item/device/multitool)) + if(!issilicon(user) && istype(user.get_active_hand(), /obj/item/multitool)) P = user.get_active_hand() else if(isAI(user)) var/mob/living/silicon/ai/U = user P = U.aiMulti else if(isrobot(user) && in_range(user, src)) - if(istype(user.get_active_hand(), /obj/item/device/multitool)) + if(istype(user.get_active_hand(), /obj/item/multitool)) P = user.get_active_hand() return P @@ -278,7 +278,7 @@ if(..()) return TRUE - var/obj/item/device/multitool/P = get_multitool(usr) + var/obj/item/multitool/P = get_multitool(usr) switch(action) if("toggle") diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index e5e79d96ce4..57171490442 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -257,7 +257,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() idle_power_usage = 600 machinetype = 1 produces_heat = 0 - circuit = /obj/item/weapon/circuitboard/telecomms/receiver + circuit = /obj/item/circuitboard/telecomms/receiver //Vars only used if you're using the overmap var/overmap_range = 0 var/overmap_range_min = 0 @@ -269,7 +269,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() . = ..() default_apply_parts() -/obj/machinery/telecomms/receiver/proc/link_radio(var/obj/item/device/radio/R) +/obj/machinery/telecomms/receiver/proc/link_radio(var/obj/item/radio/R) if(!istype(R)) return linked_radios_weakrefs |= WEAKREF(R) @@ -296,7 +296,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() /obj/machinery/telecomms/receiver/proc/check_receive_level(datum/signal/signal) // If it's a direct message from a bluespace radio, we eat it and convert it into a subspace signal locally if(signal.transmission_method == TRANSMISSION_BLUESPACE) - var/obj/item/device/radio/R = signal.data["radio"] + var/obj/item/radio/R = signal.data["radio"] //Who're you? if(!(WEAKREF(R) in linked_radios_weakrefs)) @@ -344,7 +344,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() use_power = USE_POWER_IDLE idle_power_usage = 1600 machinetype = 7 - circuit = /obj/item/weapon/circuitboard/telecomms/hub + circuit = /obj/item/circuitboard/telecomms/hub long_range_link = 1 netspeed = 40 @@ -382,7 +382,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() idle_power_usage = 600 machinetype = 8 produces_heat = 0 - circuit = /obj/item/weapon/circuitboard/telecomms/relay + circuit = /obj/item/circuitboard/telecomms/relay netspeed = 5 long_range_link = 1 var/broadcasting = 1 @@ -441,7 +441,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() use_power = USE_POWER_IDLE idle_power_usage = 1000 machinetype = 2 - circuit = /obj/item/weapon/circuitboard/telecomms/bus + circuit = /obj/item/circuitboard/telecomms/bus netspeed = 40 var/change_frequency = 0 @@ -498,7 +498,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() idle_power_usage = 600 machinetype = 3 delay = 5 - circuit = /obj/item/weapon/circuitboard/telecomms/processor + circuit = /obj/item/circuitboard/telecomms/processor var/process_mode = 1 // 1 = Uncompress Signals, 0 = Compress Signals /obj/machinery/telecomms/processor/Initialize() @@ -539,7 +539,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() use_power = USE_POWER_IDLE idle_power_usage = 300 machinetype = 4 - circuit = /obj/item/weapon/circuitboard/telecomms/server + circuit = /obj/item/circuitboard/telecomms/server var/list/log_entries = list() var/list/stored_names = list() var/list/TrafficActions = list() @@ -554,7 +554,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() var/encryption = "null" // encryption key: ie "password" var/salt = "null" // encryption salt: ie "123comsat" // would add up to md5("password123comsat") - var/obj/item/device/radio/headset/server_radio = null + var/obj/item/radio/headset/server_radio = null /obj/machinery/telecomms/server/New() ..() diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index c9a2678af84..ea92e9d19d1 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -14,7 +14,7 @@ var/screen = 0 // the screen number: var/list/machinelist = list() // the machines located by the computer var/obj/machinery/telecomms/SelectedMachine - circuit = /obj/item/weapon/circuitboard/comm_monitor + circuit = /obj/item/circuitboard/comm_monitor var/network = "NULL" // the network to probe diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index 9f14a300842..721d4ea7666 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -15,7 +15,7 @@ var/mob/lasteditor var/list/viewingcode = list() var/obj/machinery/telecomms/server/SelectedServer - circuit = /obj/item/weapon/circuitboard/comm_traffic + circuit = /obj/item/circuitboard/comm_traffic req_access = list(access_tcomsat) var/network = "NULL" // the network to probe diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index dc0a70f7118..d242e639e1b 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -6,7 +6,7 @@ desc = "Used to control a linked teleportation Hub and Station." icon_keyboard = "teleport_key" icon_screen = "teleport" - circuit = /obj/item/weapon/circuitboard/teleporter + circuit = /obj/item/circuitboard/teleporter dir = 4 var/id = null var/one_time_use = 0 //Used for one-time-use teleport cards (such as clown planet coordinates.) @@ -48,8 +48,8 @@ return ..() /obj/machinery/computer/teleporter/attackby(I as obj, mob/living/user as mob) - if(istype(I, /obj/item/weapon/card/data/)) - var/obj/item/weapon/card/data/C = I + if(istype(I, /obj/item/card/data/)) + var/obj/item/card/data/C = I if(stat & (NOPOWER|BROKEN) & (C.function != "teleporter")) attack_hand() @@ -139,7 +139,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 10 active_power_usage = 2000 - circuit = /obj/item/weapon/circuitboard/teleporter_hub + circuit = /obj/item/circuitboard/teleporter_hub var/obj/machinery/computer/teleporter/com /obj/machinery/teleport/hub/Initialize() @@ -207,7 +207,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 10 active_power_usage = 2000 - circuit = /obj/item/weapon/circuitboard/teleporter_station + circuit = /obj/item/circuitboard/teleporter_station var/obj/machinery/teleport/hub/com /obj/machinery/teleport/station/Initialize() diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index 154e243419b..ae106a356a2 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -94,11 +94,11 @@ return FALSE -/obj/machinery/turretid/attackby(obj/item/weapon/W, mob/user) +/obj/machinery/turretid/attackby(obj/item/W, mob/user) if(stat & BROKEN) return - if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) + if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) if(allowed(usr)) if(emagged) to_chat(user, "The turret control is unresponsive.") diff --git a/code/game/machinery/virtual_reality/ar_console.dm b/code/game/machinery/virtual_reality/ar_console.dm index 4731b4cb8d3..5001a3c1d33 100644 --- a/code/game/machinery/virtual_reality/ar_console.dm +++ b/code/game/machinery/virtual_reality/ar_console.dm @@ -34,7 +34,7 @@ /obj/machinery/vr_sleeper/alien/attackby(var/obj/item/I, var/mob/user) add_fingerprint(user) - if(occupant && (istype(I, /obj/item/device/healthanalyzer) || istype(I, /obj/item/device/robotanalyzer))) + if(occupant && (istype(I, /obj/item/healthanalyzer) || istype(I, /obj/item/robotanalyzer))) I.attack(occupant, user) return diff --git a/code/game/machinery/virtual_reality/vr_console.dm b/code/game/machinery/virtual_reality/vr_console.dm index 5c3fde2659c..6917d14a599 100644 --- a/code/game/machinery/virtual_reality/vr_console.dm +++ b/code/game/machinery/virtual_reality/vr_console.dm @@ -8,7 +8,7 @@ density = TRUE anchored = TRUE - circuit = /obj/item/weapon/circuitboard/vr_sleeper + circuit = /obj/item/circuitboard/vr_sleeper var/mob/living/carbon/human/occupant = null var/mob/living/carbon/human/avatar = null var/datum/mind/vr_mind = null @@ -67,7 +67,7 @@ /obj/machinery/vr_sleeper/attackby(var/obj/item/I, var/mob/user) add_fingerprint(user) - if(occupant && (istype(I, /obj/item/device/healthanalyzer) || istype(I, /obj/item/device/robotanalyzer))) + if(occupant && (istype(I, /obj/item/healthanalyzer) || istype(I, /obj/item/robotanalyzer))) I.attack(occupant, user) return diff --git a/code/game/machinery/vitals_monitor.dm b/code/game/machinery/vitals_monitor.dm index e6d1ba58114..9cac1bfeee1 100644 --- a/code/game/machinery/vitals_monitor.dm +++ b/code/game/machinery/vitals_monitor.dm @@ -1,11 +1,11 @@ -/obj/item/weapon/circuitboard/machine/vitals_monitor +/obj/item/circuitboard/machine/vitals_monitor name = "circuit board (vitals monitor)" build_path = /obj/machinery/vitals_monitor board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 3, TECH_BIO = 4, TECH_ENGINEERING = 2) req_components = list( - /obj/item/weapon/stock_parts/console_screen = 1, - /obj/item/weapon/cell/high = 1 + /obj/item/stock_parts/console_screen = 1, + /obj/item/cell/high = 1 ) /obj/machinery/vitals_monitor diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm index eb3f4d428d8..3af907f804d 100644 --- a/code/game/machinery/wall_frames.dm +++ b/code/game/machinery/wall_frames.dm @@ -17,7 +17,7 @@ if(!frame_types_wall) frame_types_wall = construction_frame_wall -/obj/item/frame/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/frame/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) new refund_type(get_turf(src.loc), refund_amt) qdel(src) @@ -48,7 +48,7 @@ M.fingerprints = fingerprints M.fingerprintshidden = fingerprintshidden M.fingerprintslast = fingerprintslast - if(istype(src.loc, /obj/item/weapon/gripper)) //Typical gripper shenanigans + if(istype(src.loc, /obj/item/gripper)) //Typical gripper shenanigans user.drop_item() qdel(src) @@ -97,7 +97,7 @@ M.fingerprints = fingerprints M.fingerprintshidden = fingerprintshidden M.fingerprintslast = fingerprintslast - if(istype(src.loc, /obj/item/weapon/gripper)) //Typical gripper shenanigans + if(istype(src.loc, /obj/item/gripper)) //Typical gripper shenanigans user.drop_item() qdel(src) diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index ca1546190a4..6c61d1f5426 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -8,7 +8,7 @@ clicksound = "button" clickvol = 40 - circuit = /obj/item/weapon/circuitboard/washing + circuit = /obj/item/circuitboard/washing var/state = 1 //1 = empty, open door //2 = empty, closed door @@ -98,7 +98,7 @@ add_overlay("panel") //VOREStation Edit End -/obj/machinery/washing_machine/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/washing_machine/attackby(obj/item/W as obj, mob/user as mob) if(state == 2 && washing.len < 1) if(default_deconstruction_screwdriver(user, W)) return @@ -109,7 +109,7 @@ /*if(W.has_tool_quality(TOOL_SCREWDRIVER)) panel = !panel to_chat(user, "You [panel ? "open" : "close"] the [src]'s maintenance panel")*/ - if(istype(W,/obj/item/weapon/pen/crayon) || istype(W,/obj/item/weapon/stamp)) + if(istype(W,/obj/item/pen/crayon) || istype(W,/obj/item/stamp)) if(state in list( 1, 3, 6)) if(!crayon) user.drop_item() @@ -119,9 +119,9 @@ ..() else ..() - else if(istype(W,/obj/item/weapon/grab)) + else if(istype(W,/obj/item/grab)) if((state == 1) && hacked) - var/obj/item/weapon/grab/G = W + var/obj/item/grab/G = W if(ishuman(G.assailant) && iscorgi(G.affecting)) G.affecting.loc = src qdel(G) @@ -133,7 +133,7 @@ to_chat(user, "You can't fit \the [W] inside.") return - else if(istype(W, /obj/item/clothing) || istype(W, /obj/item/weapon/bedsheet) || istype(W, /obj/item/stack/hairlesshide)) + else if(istype(W, /obj/item/clothing) || istype(W, /obj/item/bedsheet) || istype(W, /obj/item/stack/hairlesshide)) if(washing.len < 5) if(state in list(1, 3)) user.drop_item() diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index d99d2c913ec..f64e28d456e 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -136,7 +136,7 @@ else return 0 -/obj/mecha/combat/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) +/obj/mecha/combat/mmi_moved_inside(var/obj/item/mmi/mmi_as_oc as obj,mob/user as mob) if(..()) if(occupant.client) occupant.client.mouse_pointer_icon = file("icons/mecha/mecha_mouse.dmi") diff --git a/code/game/mecha/combat/fighter.dm b/code/game/mecha/combat/fighter.dm index 414877a5af6..5e14fecbd2d 100644 --- a/code/game/mecha/combat/fighter.dm +++ b/code/game/mecha/combat/fighter.dm @@ -268,8 +268,8 @@ stripe2_overlay.color = stripe2_color add_overlay(stripe2_overlay) -/obj/mecha/combat/fighter/gunpod/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/device/multitool) && state == 1) +/obj/mecha/combat/fighter/gunpod/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W,/obj/item/multitool) && state == 1) var/new_paint_location = tgui_input_list(usr, "Please select a target zone.", "Paint Zone", list("Fore Stripe", "Aft Stripe", "CANCEL")) if(new_paint_location && new_paint_location != "CANCEL") var/new_paint_color = input(usr, "Please select a paint color.", "Paint Color", null) as color|null diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index 6ff46999063..20dfee625f6 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -74,12 +74,12 @@ /obj/item/mecha_parts/mecha_equipment/teleporter ) -/obj/mecha/combat/gygax/dark/add_cell(var/obj/item/weapon/cell/C=null) +/obj/mecha/combat/gygax/dark/add_cell(var/obj/item/cell/C=null) if(C) C.forceMove(src) cell = C return - cell = new /obj/item/weapon/cell/hyper(src) + cell = new /obj/item/cell/hyper(src) /obj/mecha/combat/gygax/serenity desc = "A lightweight exosuit made from a modified Gygax chassis combined with proprietary VeyMed medical tech. It's faster and sturdier than most medical mechs, but much of the armor plating has been stripped out, leaving it more vulnerable than a regular Gygax." diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm index f3fb2ecbc64..c8c14016274 100644 --- a/code/game/mecha/combat/phazon.dm +++ b/code/game/mecha/combat/phazon.dm @@ -133,7 +133,7 @@ ..() -/obj/mecha/combat/phazon/janus/dynattackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/mecha/combat/phazon/janus/dynattackby(obj/item/W as obj, mob/user as mob) if(prob(max(1, (50 - round((W.force / 2) * inherent_damage_absorption["brute"])) * (1 - (W.armor_penetration / 100))))) src.occupant_message("The armor absorbs the incoming attack's force, negating it!") src.visible_message("The [src.name] absorbs the incoming attack's force, negating it!") diff --git a/code/game/mecha/components/_component.dm b/code/game/mecha/components/_component.dm index 4058500dd2a..0a8f45cb060 100644 --- a/code/game/mecha/components/_component.dm +++ b/code/game/mecha/components/_component.dm @@ -133,7 +133,7 @@ return TRUE -/obj/item/mecha_parts/component/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/mecha_parts/component/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/stack/nanopaste)) var/obj/item/stack/nanopaste/NP = W diff --git a/code/game/mecha/equipment/mecha_equipment_dynamicprocs.dm b/code/game/mecha/equipment/mecha_equipment_dynamicprocs.dm index 9166e6a3ded..17c4d5dc470 100644 --- a/code/game/mecha/equipment/mecha_equipment_dynamicprocs.dm +++ b/code/game/mecha/equipment/mecha_equipment_dynamicprocs.dm @@ -7,7 +7,7 @@ return max(0, inc_damage) // Used for melee strikes with an object, and a mob, and damage value. -/obj/item/mecha_parts/mecha_equipment/proc/handle_melee_contact(var/obj/item/weapon/W, var/mob/living/user, var/inc_damage = 0) +/obj/item/mecha_parts/mecha_equipment/proc/handle_melee_contact(var/obj/item/W, var/mob/living/user, var/inc_damage = 0) return max(0, inc_damage) // Used for projectile impacts from bullet_act. diff --git a/code/game/mecha/equipment/tools/armor_melee.dm b/code/game/mecha/equipment/tools/armor_melee.dm index 7618d5093d2..a3c6e78f6e1 100644 --- a/code/game/mecha/equipment/tools/armor_melee.dm +++ b/code/game/mecha/equipment/tools/armor_melee.dm @@ -17,7 +17,7 @@ if(!chassis) return return "* [src.name]" -/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/handle_melee_contact(var/obj/item/weapon/W, var/mob/living/user, var/inc_damage = null) +/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/handle_melee_contact(var/obj/item/W, var/mob/living/user, var/inc_damage = null) if(!action_checks(user)) return inc_damage chassis.log_message("Attacked by [W]. Attacker - [user]") @@ -53,7 +53,7 @@ ..() return -/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/proc/dynattackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/proc/dynattackby(obj/item/W as obj, mob/user as mob) if(!action_checks(user)) return chassis.dynattackby(W,user) chassis.log_message("Attacked by [W]. Attacker - [user]") diff --git a/code/game/mecha/equipment/tools/drill.dm b/code/game/mecha/equipment/tools/drill.dm index a7038eaa628..63b09317e31 100644 --- a/code/game/mecha/equipment/tools/drill.dm +++ b/code/game/mecha/equipment/tools/drill.dm @@ -46,7 +46,7 @@ if(locate(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp) in chassis.equipment) var/obj/structure/ore_box/ore_box = locate(/obj/structure/ore_box) in chassis:cargo if(ore_box) - for(var/obj/item/weapon/ore/ore in range(chassis,1)) + for(var/obj/item/ore/ore in range(chassis,1)) if(get_dir(chassis,ore)&chassis.dir) ore_box.stored_ore[ore.material]++ qdel(ore) @@ -127,7 +127,7 @@ if(locate(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp) in chassis.equipment) var/obj/structure/ore_box/ore_box = locate(/obj/structure/ore_box) in chassis:cargo if(ore_box) - for(var/obj/item/weapon/ore/ore in range(chassis,1)) + for(var/obj/item/ore/ore in range(chassis,1)) if(get_dir(chassis,ore)&chassis.dir) ore.forceMove(ore_box) else if(target.loc == C) diff --git a/code/game/mecha/equipment/tools/inflatables.dm b/code/game/mecha/equipment/tools/inflatables.dm index 3fcf874538a..d82f44a80f7 100644 --- a/code/game/mecha/equipment/tools/inflatables.dm +++ b/code/game/mecha/equipment/tools/inflatables.dm @@ -10,8 +10,8 @@ ready_sound = 'sound/effects/spray.ogg' required_type = list(/obj/mecha/working/ripley) - tooltype = /obj/item/weapon/inflatable_dispenser/robot - var/obj/item/weapon/inflatable_dispenser/my_deployer = null + tooltype = /obj/item/inflatable_dispenser/robot + var/obj/item/inflatable_dispenser/my_deployer = null /obj/item/mecha_parts/mecha_equipment/tool/powertool/inflatables/Initialize() . = ..() diff --git a/code/game/mecha/equipment/tools/orescanner.dm b/code/game/mecha/equipment/tools/orescanner.dm index 1c19da06a8d..e2737b0d4d8 100644 --- a/code/game/mecha/equipment/tools/orescanner.dm +++ b/code/game/mecha/equipment/tools/orescanner.dm @@ -10,7 +10,7 @@ ready_sound = 'sound/items/goggles_charge.ogg' required_type = list(/obj/mecha/working/ripley) - var/obj/item/weapon/mining_scanner/my_scanner = null + var/obj/item/mining_scanner/my_scanner = null var/exact_scan = FALSE /obj/item/mecha_parts/mecha_equipment/tool/orescanner/Initialize() diff --git a/code/game/mecha/equipment/tools/powertool.dm b/code/game/mecha/equipment/tools/powertool.dm index 0adcb98929b..93a76b38f64 100644 --- a/code/game/mecha/equipment/tools/powertool.dm +++ b/code/game/mecha/equipment/tools/powertool.dm @@ -11,7 +11,7 @@ required_type = list(/obj/mecha/working/ripley) var/obj/item/my_tool = null - var/tooltype = /obj/item/weapon/tool/wrench/power + var/tooltype = /obj/item/tool/wrench/power /obj/item/mecha_parts/mecha_equipment/tool/powertool/Initialize() my_tool = new tooltype(src) @@ -37,19 +37,19 @@ name = "pneumatic prybar" desc = "An exosuit-mounted pneumatic prybar." icon_state = "mecha_crowbar" - tooltype = /obj/item/weapon/tool/crowbar/power + tooltype = /obj/item/tool/crowbar/power ready_sound = 'sound/mecha/gasdisconnected.ogg' /obj/item/mecha_parts/mecha_equipment/tool/powertool/cutter name = "pneumatic cablecutter" desc = "An exosuit-mounted pneumatic cablecutter." icon_state = "mecha_cablecutter" - tooltype = /obj/item/weapon/tool/wirecutters/power + tooltype = /obj/item/tool/wirecutters/power ready_sound = 'sound/mecha/gasdisconnected.ogg' /obj/item/mecha_parts/mecha_equipment/tool/powertool/screwdriver name = "pneumatic screwdriver" desc = "An exosuit-mounted pneumatic screwdriver." icon_state = "mecha_screwdriver" - tooltype = /obj/item/weapon/tool/screwdriver/power + tooltype = /obj/item/tool/screwdriver/power ready_sound = 'sound/mecha/gasdisconnected.ogg' diff --git a/code/game/mecha/equipment/tools/rcd.dm b/code/game/mecha/equipment/tools/rcd.dm index 5d283c852bf..44e7edb3e66 100644 --- a/code/game/mecha/equipment/tools/rcd.dm +++ b/code/game/mecha/equipment/tools/rcd.dm @@ -8,7 +8,7 @@ energy_drain = 250 range = MELEE|RANGED equip_type = EQUIP_SPECIAL - var/obj/item/weapon/rcd/electric/mounted/mecha/my_rcd = null + var/obj/item/rcd/electric/mounted/mecha/my_rcd = null /obj/item/mecha_parts/mecha_equipment/tool/rcd/Initialize() my_rcd = new(src) diff --git a/code/game/mecha/equipment/tools/syringe_gun.dm b/code/game/mecha/equipment/tools/syringe_gun.dm index 9825a3037aa..f7e0e37ee75 100644 --- a/code/game/mecha/equipment/tools/syringe_gun.dm +++ b/code/game/mecha/equipment/tools/syringe_gun.dm @@ -44,10 +44,10 @@ /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/action(atom/movable/target) if(!action_checks(target)) return - if(istype(target,/obj/item/weapon/reagent_containers/syringe)) + if(istype(target,/obj/item/reagent_containers/syringe)) return load_syringe(target) - if(istype(target,/obj/item/weapon/storage))//Loads syringes from boxes - for(var/obj/item/weapon/reagent_containers/syringe/S in target.contents) + if(istype(target,/obj/item/storage))//Loads syringes from boxes + for(var/obj/item/reagent_containers/syringe/S in target.contents) load_syringe(S) return if(mode) @@ -61,7 +61,7 @@ set_ready_state(FALSE) chassis.use_power(energy_drain) var/turf/trg = get_turf(target) - var/obj/item/weapon/reagent_containers/syringe/S = syringes[1] + var/obj/item/reagent_containers/syringe/S = syringes[1] S.forceMove(get_turf(chassis)) reagents.trans_to_obj(S, min(S.volume, reagents.total_volume)) syringes -= S @@ -198,7 +198,7 @@ output += "Total: [round(reagents.total_volume,0.001)]/[reagents.maximum_volume] - Purge All" return output || "None" -/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/proc/load_syringe(obj/item/weapon/reagent_containers/syringe/S) +/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/proc/load_syringe(obj/item/reagent_containers/syringe/S) if(syringes.len= 2) occupant_message("The syringe is too far away.") @@ -501,4 +501,4 @@ ready_sound = 'sound/weapons/flash.ogg' required_type = list(/obj/mecha/medical) - tooltype = /obj/item/device/healthanalyzer/advanced + tooltype = /obj/item/healthanalyzer/advanced diff --git a/code/game/mecha/equipment/tools/weldinglaser.dm b/code/game/mecha/equipment/tools/weldinglaser.dm index ff1c5733a5b..bd30119657e 100644 --- a/code/game/mecha/equipment/tools/weldinglaser.dm +++ b/code/game/mecha/equipment/tools/weldinglaser.dm @@ -10,7 +10,7 @@ ready_sound = 'sound/items/Ratchet.ogg' required_type = list(/obj/mecha/working/ripley) - tooltype = /obj/item/weapon/weldingtool/electric/mounted/exosuit + tooltype = /obj/item/weldingtool/electric/mounted/exosuit /obj/item/mecha_parts/mecha_equipment/tool/powertool/welding/action(var/atom/target) ..() diff --git a/code/game/mecha/equipment/weapons/defense/shocker.dm b/code/game/mecha/equipment/weapons/defense/shocker.dm index 58dccec562d..63c6db72a01 100644 --- a/code/game/mecha/equipment/weapons/defense/shocker.dm +++ b/code/game/mecha/equipment/weapons/defense/shocker.dm @@ -28,7 +28,7 @@ return */ -/obj/item/mecha_parts/mecha_equipment/shocker/handle_melee_contact(var/obj/item/weapon/W, var/mob/living/user, var/inc_damage = null) +/obj/item/mecha_parts/mecha_equipment/shocker/handle_melee_contact(var/obj/item/W, var/mob/living/user, var/inc_damage = null) if(!action_checks(user) || !active) return diff --git a/code/game/mecha/equipment/weapons/explosive/grenade.dm b/code/game/mecha/equipment/weapons/explosive/grenade.dm index 930000fe3a8..ae230169fac 100644 --- a/code/game/mecha/equipment/weapons/explosive/grenade.dm +++ b/code/game/mecha/equipment/weapons/explosive/grenade.dm @@ -2,7 +2,7 @@ name = "\improper SGL-6 grenade launcher" desc = "A grenade launcher produced for SWAT use; fires flashbangs." icon_state = "mecha_grenadelnchr" - projectile = /obj/item/weapon/grenade/flashbang + projectile = /obj/item/grenade/flashbang fire_sound = 'sound/effects/bang.ogg' projectiles = 6 missile_speed = 1.5 @@ -19,7 +19,7 @@ det_time = 25 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/Fire(atom/movable/AM, atom/target, turf/aimloc) - var/obj/item/weapon/grenade/G = AM + var/obj/item/grenade/G = AM if(istype(G)) G.det_time = det_time G.activate(chassis.occupant) //Grenades actually look primed and dangerous, handle their own stuff. @@ -28,7 +28,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/clusterbang//Because I am a heartless bastard -Sieve name = "\improper SOP-6 grenade launcher" desc = "A grenade launcher produced for use by government uprising subjugation forces, or that's what you might guess; fires matryoshka flashbangs." - projectile = /obj/item/weapon/grenade/flashbang/clusterbang + projectile = /obj/item/grenade/flashbang/clusterbang origin_tech = list(TECH_COMBAT= 5, TECH_MATERIAL = 5, TECH_ILLEGAL = 3) @@ -42,7 +42,7 @@ name = "\improper SGL-9 grenade launcher" desc = "A military-grade grenade launcher that fires disorienting concussion grenades." icon_state = "mecha_grenadelnchr" - projectile = /obj/item/weapon/grenade/concussion + projectile = /obj/item/grenade/concussion missile_speed = 1 projectile_energy_cost = 900 equip_cooldown = 50 @@ -54,7 +54,7 @@ name = "\improper HEP-I 5 grenade launcher" desc = "A military-grade grenade launcher that fires anti-personnel fragmentation grenades." icon_state = "mecha_fraglnchr" - projectile = /obj/item/weapon/grenade/explosive + projectile = /obj/item/grenade/explosive projectiles = 4 missile_speed = 1 @@ -63,7 +63,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/frag/mini name = "\improper HEP-MI 6 grenade launcher" desc = "A military-grade grenade launcher that fires miniaturized anti-personnel fragmentation grenades." - projectile = /obj/item/weapon/grenade/explosive/mini + projectile = /obj/item/grenade/explosive/mini projectile_energy_cost = 500 equip_cooldown = 25 diff --git a/code/game/mecha/equipment/weapons/explosive/missile.dm b/code/game/mecha/equipment/weapons/explosive/missile.dm index f0c73de695e..6f0485fdb03 100644 --- a/code/game/mecha/equipment/weapons/explosive/missile.dm +++ b/code/game/mecha/equipment/weapons/explosive/missile.dm @@ -8,7 +8,7 @@ name = "\improper BNI Flare Launcher" desc = "A flare-gun, but bigger." icon_state = "mecha_flaregun" - projectile = /obj/item/device/flashlight/flare + projectile = /obj/item/flashlight/flare fire_sound = 'sound/weapons/tablehit1.ogg' auto_rearm = 1 fire_cooldown = 20 @@ -23,7 +23,7 @@ equip_type = EQUIP_UTILITY /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flare/Fire(atom/movable/AM, atom/target, turf/aimloc) - var/obj/item/device/flashlight/flare/fired = AM + var/obj/item/flashlight/flare/fired = AM fired.ignite() ..() diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index 4d481fe0557..d0b1123cbd9 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -6,7 +6,7 @@ density = FALSE anchored = TRUE layer = TURF_LAYER + 0.1 - circuit = /obj/item/weapon/circuitboard/mech_recharger + circuit = /obj/item/circuitboard/mech_recharger var/atom/movable/charging var/charge = 45 @@ -38,13 +38,13 @@ ..() charge = 0 repair = -5 - for(var/obj/item/weapon/stock_parts/P in component_parts) - if(istype(P, /obj/item/weapon/stock_parts/capacitor)) + for(var/obj/item/stock_parts/P in component_parts) + if(istype(P, /obj/item/stock_parts/capacitor)) charge += P.rating * 20 - if(istype(P, /obj/item/weapon/stock_parts/scanning_module)) + if(istype(P, /obj/item/stock_parts/scanning_module)) charge += P.rating * 5 repair += P.rating - if(istype(P, /obj/item/weapon/stock_parts/manipulator)) + if(istype(P, /obj/item/stock_parts/manipulator)) repair += P.rating * 2 /obj/machinery/mech_recharger/process() @@ -57,7 +57,7 @@ var/done = FALSE var/obj/mecha/mech = charging - var/obj/item/weapon/cell/cell = charging.get_cell() + var/obj/item/cell/cell = charging.get_cell() if(cell) var/t = min(charge, cell.maxcharge - cell.charge) if(t > 0) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 34395e0dcf7..ec29552760e 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -9,7 +9,7 @@ idle_power_usage = 20 active_power_usage = 5000 req_access = list(access_robotics) - circuit = /obj/item/weapon/circuitboard/mechfab + circuit = /obj/item/circuitboard/mechfab /// Current items in the build queue. var/list/queue = list() @@ -101,13 +101,13 @@ /obj/machinery/mecha_part_fabricator/RefreshParts() res_max_amount = 0 - for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) + for(var/obj/item/stock_parts/matter_bin/M in component_parts) res_max_amount += M.rating * 100000 // 200k -> 600k var/T = 0 - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) T += M.rating component_coeff = max(1 - (T - 1) / 4, 0.2) // 1 -> 0.2 - for(var/obj/item/weapon/stock_parts/micro_laser/M in component_parts) // Not resetting T is intended; time_coeff is affected by both + for(var/obj/item/stock_parts/micro_laser/M in component_parts) // Not resetting T is intended; time_coeff is affected by both T += M.rating time_coeff = T / 2 // 1 -> 3 update_tgui_static_data(usr) diff --git a/code/game/mecha/mech_prosthetics.dm b/code/game/mecha/mech_prosthetics.dm index e4344eef51c..cec5b1f0199 100644 --- a/code/game/mecha/mech_prosthetics.dm +++ b/code/game/mecha/mech_prosthetics.dm @@ -10,7 +10,7 @@ idle_power_usage = 20 active_power_usage = 5000 req_access = list(access_robotics) - circuit = /obj/item/weapon/circuitboard/prosthetics + circuit = /obj/item/circuitboard/prosthetics // Prosfab specific stuff var/manufacturer = null @@ -134,8 +134,8 @@ if(..()) return 1 - if(istype(I,/obj/item/weapon/disk/limb)) - var/obj/item/weapon/disk/limb/D = I + if(istype(I,/obj/item/disk/limb)) + var/obj/item/disk/limb/D = I if(!D.company || !(D.company in all_robolimbs)) to_chat(user, "This disk seems to be corrupted!") else @@ -147,8 +147,8 @@ qdel(I) return - if(istype(I,/obj/item/weapon/disk/species)) - var/obj/item/weapon/disk/species/D = I + if(istype(I,/obj/item/disk/species)) + var/obj/item/disk/species/D = I if(!D.species || !(D.species in GLOB.all_species)) to_chat(user, "This disk seems to be corrupted!") else diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 23441d2faae..c480dd6e6b2 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -32,7 +32,7 @@ var/minimum_penetration = 15 //Incoming damage won't be fully applied if you don't have at least 20. Almost all AP clears this. var/fail_penetration_value = 0.66 //By how much failing to penetrate reduces your shit. 66% by default. 100dmg = 66dmg if failed pen - var/obj/item/weapon/cell/cell + var/obj/item/cell/cell var/state = MECHA_OPERATING var/list/log = new var/last_message = 0 @@ -58,7 +58,7 @@ var/datum/gas_mixture/cabin_air var/obj/machinery/atmospherics/portables_connector/connected_port = null - var/obj/item/device/radio/radio = null + var/obj/item/radio/radio = null var/max_temperature = 25000 //Kelvin values. var/internal_damage_threshold = 33 //Health percentage below which internal damage is possible @@ -432,12 +432,12 @@ internal_tank = new /obj/machinery/portable_atmospherics/canister/air(src) return internal_tank -/obj/mecha/proc/add_cell(var/obj/item/weapon/cell/C=null) +/obj/mecha/proc/add_cell(var/obj/item/cell/C=null) if(C) C.forceMove(src) cell = C return - cell = new /obj/item/weapon/cell/mech(src) + cell = new /obj/item/cell/mech(src) /obj/mecha/get_cell() return cell @@ -1319,7 +1319,7 @@ src.check_for_internal_damage(list(MECHA_INT_FIRE, MECHA_INT_TEMP_CONTROL)) return -/obj/mecha/proc/dynattackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/mecha/proc/dynattackby(obj/item/W as obj, mob/user as mob) user.setClickCooldown(user.get_attack_speed(W)) src.log_message("Attacked by [W]. Attacker - [user]") var/pass_damage_reduc_mod //Modifer for failing to bring AP. @@ -1376,17 +1376,17 @@ ////// AttackBy ////// ////////////////////// -/obj/mecha/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/mecha/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/device/mmi)) + if(istype(W, /obj/item/mmi)) if(mmi_move_inside(W,user)) to_chat(user, "[src]-MMI interface initialized successfuly") else to_chat(user, "[src]-MMI interface initialization failed.") return - if(istype(W, /obj/item/device/robotanalyzer)) - var/obj/item/device/robotanalyzer/RA = W + if(istype(W, /obj/item/robotanalyzer)) + var/obj/item/robotanalyzer/RA = W RA.do_scan(src, user) return @@ -1410,18 +1410,18 @@ user.visible_message("[user] installs \the [W] in \the [src]", "You install \the [W] in \the [src].") return - if(istype(W, /obj/item/weapon/card/robot)) - var/obj/item/weapon/card/robot/RoC = W + if(istype(W, /obj/item/card/robot)) + var/obj/item/card/robot/RoC = W return attackby(RoC.dummy_card, user) - if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) + if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) if(add_req_access || maint_access) if(internals_access_allowed(usr)) - var/obj/item/weapon/card/id/id_card - if(istype(W, /obj/item/weapon/card/id)) + var/obj/item/card/id/id_card + if(istype(W, /obj/item/card/id)) id_card = W else - var/obj/item/device/pda/pda = W + var/obj/item/pda/pda = W id_card = pda.id output_maintenance_dialog(id_card, user) return @@ -1485,7 +1485,7 @@ to_chat(user, "You screw the cell in place") return - else if(istype(W, /obj/item/device/multitool)) + else if(istype(W, /obj/item/multitool)) if(state>=MECHA_CELL_OPEN && src.occupant) to_chat(user, "You attempt to eject the pilot using the maintenance controls.") if(src.occupant.stat) @@ -1497,7 +1497,7 @@ src.log_message("Eject attempt made using maintenance controls - rejected.") return - else if(istype(W, /obj/item/weapon/cell)) + else if(istype(W, /obj/item/cell)) if(state==MECHA_CELL_OUT) if(!src.cell) to_chat(user, "You install the powercell") @@ -1510,7 +1510,7 @@ return else if(W.has_tool_quality(TOOL_WELDER) && user.a_intent != I_HURT) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() var/obj/item/mecha_parts/component/hull/HC = internal_components[MECH_HULL] var/obj/item/mecha_parts/component/armor/AC = internal_components[MECH_ARMOR] if (WT.remove_fuel(0,user)) @@ -1614,7 +1614,7 @@ //////// Brain Stuff //////// /////////////////////////////// -/obj/mecha/proc/mmi_move_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) +/obj/mecha/proc/mmi_move_inside(var/obj/item/mmi/mmi_as_oc as obj,mob/user as mob) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) to_chat(user, "Consciousness matrix not detected.") return 0 @@ -1641,7 +1641,7 @@ to_chat(user, "You stop attempting to install the brain.") return 0 -/obj/mecha/proc/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) +/obj/mecha/proc/mmi_moved_inside(var/obj/item/mmi/mmi_as_oc as obj,mob/user as mob) if(mmi_as_oc && (user in range(1))) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) to_chat(user, "Consciousness matrix not detected.") @@ -2082,8 +2082,8 @@ occupant << browse(null, "window=exosuit") if(occupant.client && cloaked_selfimage) occupant.client.images -= cloaked_selfimage - if(istype(mob_container, /obj/item/device/mmi)) - var/obj/item/device/mmi/mmi = mob_container + if(istype(mob_container, /obj/item/mmi)) + var/obj/item/mmi/mmi = mob_container if(mmi.brainmob) occupant.loc = mmi mmi.mecha = null @@ -2129,13 +2129,13 @@ return 0 -/obj/mecha/check_access(obj/item/weapon/card/id/I, list/access_list) +/obj/mecha/check_access(obj/item/card/id/I, list/access_list) if(!istype(access_list)) return 1 if(!access_list.len) //no requirements return 1 - if(istype(I, /obj/item/device/pda)) - var/obj/item/device/pda/pda = I + if(istype(I, /obj/item/pda)) + var/obj/item/pda/pda = I I = pda.id if(!istype(I) || !I.GetAccess()) //not ID or no access return 0 @@ -2365,7 +2365,7 @@ return data -/obj/mecha/proc/output_access_dialog(obj/item/weapon/card/id/id_card, mob/user) +/obj/mecha/proc/output_access_dialog(obj/item/card/id/id_card, mob/user) if(!id_card || !user) return var/output = {"

Nanotrasen Security Citation

This security citation has been issued to
[capitalize(ticket_name)]
Reason:
[details]
See your local representative at Central Command after the shift is over to resolve this issue.
" - var/obj/item/weapon/paper/sec_ticket/p = new /obj/item/weapon/paper/sec_ticket(our_turf) + var/obj/item/paper/sec_ticket/p = new /obj/item/paper/sec_ticket(our_turf) p.info = final p.name = "Security Citation: [ticket_name]" @@ -43,29 +43,29 @@ log_and_message_admins("has issued '[ticket_name]' a security citation: \"[details]\"", user) last_print = world.time -/obj/item/weapon/paper/sec_ticket +/obj/item/paper/sec_ticket name = "Security Citation" desc = "A citation issued by security for some kind of infraction!" icon = 'icons/obj/bureaucracy_vr.dmi' icon_state = "sec_ticket" -/obj/item/weapon/paper/sec_ticket/Initialize(mapload, text, title) +/obj/item/paper/sec_ticket/Initialize(mapload, text, title) . = ..() icon = 'icons/obj/bureaucracy_vr.dmi' icon_state = "sec_ticket" -/obj/item/weapon/paper/sec_ticket/update_icon() +/obj/item/paper/sec_ticket/update_icon() icon = icon icon_state = icon_state -/obj/item/device/ticket_printer/train +/obj/item/ticket_printer/train name = "permission ticket printer" desc = "It prints permit tickets!" icon = 'icons/obj/device_vr.dmi' icon_state = "train_ticket_printer" -/obj/item/device/ticket_printer/train/print_a_ticket(mob/user) +/obj/item/ticket_printer/train/print_a_ticket(mob/user) var/ticket_name = sanitize(tgui_input_text(user, "The Name of the person you are issuing the ticket to.", "Name", max_length = 100)) if(length(ticket_name) > 100) @@ -84,7 +84,7 @@ var/final = "

Permit Ticket

This ticket has been issued to
[capitalize(ticket_name)]
This permits them to:
[details]
Issued by:[user]
This ticket is non-refundable from the time of receipt. This ticket holds the authority of the issuer only and does not hold any authority over persons nor entities that were not involved in this transaction.
" - var/obj/item/weapon/paper/permit_ticket/p = new /obj/item/weapon/paper/permit_ticket(our_turf) + var/obj/item/paper/permit_ticket/p = new /obj/item/paper/permit_ticket(our_turf) p.info = final p.name = "Permit Ticket: [ticket_name]" @@ -93,17 +93,17 @@ log_and_message_admins("has issued '[ticket_name]' a permit ticket: \"[details]\"", user) last_print = world.time -/obj/item/weapon/paper/permit_ticket +/obj/item/paper/permit_ticket name = "Permit Ticket" desc = "A ticket issued to permit someone to do something!" icon = 'icons/obj/bureaucracy_vr.dmi' icon_state = "permit_ticket" -/obj/item/weapon/paper/permit_ticket/Initialize(mapload, text, title) +/obj/item/paper/permit_ticket/Initialize(mapload, text, title) . = ..() icon = 'icons/obj/bureaucracy_vr.dmi' icon_state = "permit_ticket" -/obj/item/weapon/paper/permit_ticket/update_icon() +/obj/item/paper/permit_ticket/update_icon() icon = icon icon_state = icon_state diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 3ddc35a2097..8ffdcd031d1 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -14,9 +14,10 @@ effective or pretty fucking useless. */ -/obj/item/device/batterer +/obj/item/batterer name = "mind batterer" desc = "A strange device with twin antennas." + icon = 'icons/obj/device.dmi' icon_state = "batterer" throwforce = 5 w_class = ITEMSIZE_TINY @@ -28,7 +29,7 @@ effective or pretty fucking useless. var/times_used = 0 //Number of times it's been used. var/max_uses = 2 -/obj/item/device/batterer/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) +/obj/item/batterer/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) if(!user) return if(times_used >= max_uses) to_chat(user, "The mind batterer has been burnt out!") diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 66d05b2d93c..870e8c3a8c8 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -1,18 +1,18 @@ -/obj/item/device/transfer_valve +/obj/item/transfer_valve name = "tank transfer valve" desc = "Regulates the transfer of air between two tanks" icon = 'icons/obj/assemblies.dmi' icon_state = "valve_1" - var/obj/item/weapon/tank/tank_one - var/obj/item/weapon/tank/tank_two - var/obj/item/device/assembly/attached_device + var/obj/item/tank/tank_one + var/obj/item/tank/tank_two + var/obj/item/assembly/attached_device var/mob/attacher = null var/valve_open = 0 var/toggle = 1 -/obj/item/device/transfer_valve/attackby(obj/item/item, mob/user) +/obj/item/transfer_valve/attackby(obj/item/item, mob/user) var/turf/location = get_turf(src) // For admin logs - if(istype(item, /obj/item/weapon/tank)) + if(istype(item, /obj/item/tank)) if(tank_one && tank_two) to_chat(user, "There are already two tanks attached, remove one first.") return @@ -34,7 +34,7 @@ SStgui.update_uis(src) // update all UIs attached to src //TODO: Have this take an assemblyholder else if(isassembly(item)) - var/obj/item/device/assembly/A = item + var/obj/item/assembly/A = item if(A.secured) to_chat(user, "The device is secured.") return @@ -56,29 +56,29 @@ return -/obj/item/device/transfer_valve/HasProximity(turf/T, atom/movable/AM, old_loc) +/obj/item/transfer_valve/HasProximity(turf/T, atom/movable/AM, old_loc) attached_device?.HasProximity(T, AM, old_loc) -/obj/item/device/transfer_valve/Moved(old_loc, direction, forced) +/obj/item/transfer_valve/Moved(old_loc, direction, forced) . = ..() if(isturf(old_loc)) unsense_proximity(callback = /atom/proc/HasProximity, center = old_loc) if(isturf(loc)) sense_proximity(callback = /atom/proc/HasProximity) -/obj/item/device/transfer_valve/attack_self(mob/user) +/obj/item/transfer_valve/attack_self(mob/user) tgui_interact(user) -/obj/item/device/transfer_valve/tgui_state(mob/user) +/obj/item/transfer_valve/tgui_state(mob/user) return GLOB.tgui_inventory_state -/obj/item/device/transfer_valve/tgui_interact(mob/user, datum/tgui/ui = null) +/obj/item/transfer_valve/tgui_interact(mob/user, datum/tgui/ui = null) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "TransferValve", name) // 460, 320 ui.open() -/obj/item/device/transfer_valve/tgui_data(mob/user) +/obj/item/transfer_valve/tgui_data(mob/user) var/list/data = list() data["tank_one"] = tank_one ? tank_one.name : null data["tank_two"] = tank_two ? tank_two.name : null @@ -86,7 +86,7 @@ data["valve"] = valve_open return data -/obj/item/device/transfer_valve/tgui_act(action, params) +/obj/item/transfer_valve/tgui_act(action, params) if(..()) return . = TRUE @@ -112,13 +112,13 @@ update_icon() add_fingerprint(usr) -/obj/item/device/transfer_valve/proc/process_activation(var/obj/item/device/D) +/obj/item/transfer_valve/proc/process_activation(var/obj/item/D) if(toggle) toggle = FALSE toggle_valve() VARSET_IN(src, toggle, TRUE, 5 SECONDS) -/obj/item/device/transfer_valve/update_icon() +/obj/item/transfer_valve/update_icon() cut_overlays() underlays = null @@ -136,7 +136,7 @@ if(attached_device) add_overlay("device") -/obj/item/device/transfer_valve/proc/remove_tank(obj/item/weapon/tank/T) +/obj/item/transfer_valve/proc/remove_tank(obj/item/tank/T) if(tank_one == T) split_gases() tank_one = null @@ -149,7 +149,7 @@ T.forceMove(get_turf(src)) update_icon() -/obj/item/device/transfer_valve/proc/merge_gases() +/obj/item/transfer_valve/proc/merge_gases() if(valve_open) return tank_two.air_contents.volume += tank_one.air_contents.volume @@ -158,7 +158,7 @@ tank_two.air_contents.merge(temp) valve_open = 1 -/obj/item/device/transfer_valve/proc/split_gases() +/obj/item/transfer_valve/proc/split_gases() if(!valve_open) return @@ -179,7 +179,7 @@ it explodes properly when it gets a signal (and it does). */ -/obj/item/device/transfer_valve/proc/toggle_valve() +/obj/item/transfer_valve/proc/toggle_valve() if(!valve_open && (tank_one && tank_two)) var/turf/bombturf = get_turf(src) var/area/A = get_area(bombturf) @@ -214,5 +214,5 @@ // this doesn't do anything but the timer etc. expects it to be here // eventually maybe have it update icon to show state (timer, prox etc.) like old bombs -/obj/item/device/transfer_valve/proc/c_state() +/obj/item/transfer_valve/proc/c_state() return diff --git a/code/game/objects/items/devices/translator.dm b/code/game/objects/items/devices/translator.dm index b50aeb91f80..8fba3e20aff 100644 --- a/code/game/objects/items/devices/translator.dm +++ b/code/game/objects/items/devices/translator.dm @@ -1,5 +1,5 @@ //Universal translator -/obj/item/device/universal_translator +/obj/item/universal_translator name = "handheld translator" desc = "This handy device appears to translate the languages it hears into onscreen text for a user." icon = 'icons/obj/device.dmi' @@ -12,7 +12,7 @@ var/listening = 0 var/datum/language/langset -/obj/item/device/universal_translator/attack_self(mob/user) +/obj/item/universal_translator/attack_self(mob/user) if(!listening) //Turning ON langset = tgui_input_list(user,"Translate to which of your languages?","Language Selection", user.languages) if(langset) @@ -33,7 +33,7 @@ icon_state = "[initial(icon_state)]" to_chat(user, "You disable \the [src].") -/obj/item/device/universal_translator/hear_talk(mob/M, list/message_pieces, verb) +/obj/item/universal_translator/hear_talk(mob/M, list/message_pieces, verb) if(!listening || !istype(M)) return @@ -73,14 +73,14 @@ to_chat(L, "[src] translates, \"[new_message]\"") -/obj/item/device/universal_translator/proc/user_understands(mob/M, mob/living/L, list/message_pieces) +/obj/item/universal_translator/proc/user_understands(mob/M, mob/living/L, list/message_pieces) for(var/datum/multilingual_say_piece/S in message_pieces) if(S.speaking && !L.say_understands(M, S.speaking)) return FALSE return TRUE //Let's try an ear-worn version -/obj/item/device/universal_translator/ear +/obj/item/universal_translator/ear name = "translator earpiece" desc = "This handy device appears to translate the languages it hears into another language for a user." icon_state = "earpiece" diff --git a/code/game/objects/items/devices/translocator_vr.dm b/code/game/objects/items/devices/translocator_vr.dm index 5123602a35b..92748d7ac98 100644 --- a/code/game/objects/items/devices/translocator_vr.dm +++ b/code/game/objects/items/devices/translocator_vr.dm @@ -1,5 +1,5 @@ //The perfect adminboos device? -/obj/item/device/perfect_tele +/obj/item/perfect_tele name = "personal translocator" desc = "Seems absurd, doesn't it? Yet, here we are. Allows the user to teleport themselves and others to a pre-set beacon." icon = 'icons/obj/device_alt.dmi' @@ -7,8 +7,8 @@ w_class = ITEMSIZE_SMALL origin_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_ILLEGAL = 7) - var/cell_type = /obj/item/weapon/cell/device/weapon - var/obj/item/weapon/cell/power_source + var/cell_type = /obj/item/cell/device/weapon + var/obj/item/cell/power_source var/charge_cost = 800 // cell/device/weapon has 2400 var/battery_lock = 0 //If set, weapon cannot switch batteries @@ -20,7 +20,7 @@ var/ready = 1 var/beacons_left = 3 var/failure_chance = 5 //Percent - var/obj/item/device/perfect_tele_beacon/destination + var/obj/item/perfect_tele_beacon/destination var/datum/effect/effect/system/spark_spread/spk var/list/warned_users = list() var/list/logged_events = list() @@ -31,30 +31,30 @@ var/static/radial_set = image(icon = 'icons/mob/radial_vr.dmi', icon_state = "tl_set") var/static/radial_seton = image(icon = 'icons/mob/radial_vr.dmi', icon_state = "tl_seton") -/obj/item/device/perfect_tele/Initialize() +/obj/item/perfect_tele/Initialize() . = ..() flags |= NOBLUDGEON if(cell_type) power_source = new cell_type(src) else - power_source = new /obj/item/weapon/cell/device(src) + power_source = new /obj/item/cell/device(src) spk = new(src) spk.set_up(5, 0, src) spk.attach(src) rebuild_radial_images() -/obj/item/device/perfect_tele/Destroy() +/obj/item/perfect_tele/Destroy() // Must clear the beacon's backpointer or we won't GC. Someday maybe do something nicer even. - for(var/obj/item/device/perfect_tele_beacon/B in beacons) + for(var/obj/item/perfect_tele_beacon/B in beacons) B.tele_hand = null beacons.Cut() QDEL_NULL(power_source) QDEL_NULL(spk) return ..() -/obj/item/device/perfect_tele/update_icon() +/obj/item/perfect_tele/update_icon() if(!power_source) icon_state = "[initial(icon_state)]_o" else if(ready && (power_source.check_charge(charge_cost) || power_source.fully_charged())) @@ -64,14 +64,14 @@ ..() -/obj/item/device/perfect_tele/proc/rebuild_radial_images() +/obj/item/perfect_tele/proc/rebuild_radial_images() radial_images.Cut() var/index = 1 for(var/bcn in beacons) //Grumble var/image/I = image(icon = 'icons/mob/radial_vr.dmi', icon_state = "tl_[index]") - var/obj/item/device/perfect_tele_beacon/beacon = beacons[bcn] + var/obj/item/perfect_tele_beacon/beacon = beacons[bcn] if(destination == beacon) I.add_overlay(radial_seton) else @@ -86,13 +86,13 @@ I.add_overlay(radial_plus) radial_images["New Beacon"] = I -/obj/item/device/perfect_tele/attack_hand(mob/user) +/obj/item/perfect_tele/attack_hand(mob/user) if(user.get_inactive_hand() == src) unload_ammo(user) else return ..() -/obj/item/device/perfect_tele/proc/unload_ammo(mob/user, var/ignore_inactive_hand_check = 0) +/obj/item/perfect_tele/proc/unload_ammo(mob/user, var/ignore_inactive_hand_check = 0) if(battery_lock) to_chat(user,"[src] does not have a battery port.") return @@ -104,16 +104,16 @@ else to_chat(user,"[src] does not have a power cell.") -/obj/item/device/perfect_tele/proc/check_menu(var/mob/living/user) +/obj/item/perfect_tele/proc/check_menu(var/mob/living/user) if(!istype(user)) return FALSE if(user.incapacitated() || !user.Adjacent(src)) return FALSE return TRUE -/obj/item/device/perfect_tele/attack_self(mob/user, var/radial_menu_anchor = src) +/obj/item/perfect_tele/attack_self(mob/user, var/radial_menu_anchor = src) if(loc_network) - for(var/obj/item/device/perfect_tele_beacon/stationary/nb in premade_tele_beacons) + for(var/obj/item/perfect_tele_beacon/stationary/nb in premade_tele_beacons) if(nb.tele_network == loc_network) beacons[nb.tele_name] = nb loc_network = null //Consumed @@ -147,7 +147,7 @@ This device records all warnings given and teleport events for admin review in c to_chat(user, "No duplicate names, please. '[new_name]' exists already.") return - var/obj/item/device/perfect_tele_beacon/nb = new(get_turf(src)) + var/obj/item/perfect_tele_beacon/nb = new(get_turf(src)) nb.tele_name = new_name nb.tele_hand = src nb.creator = user.ckey @@ -162,7 +162,7 @@ This device records all warnings given and teleport events for admin review in c destination = beacons[choice] rebuild_radial_images() -/obj/item/device/perfect_tele/attackby(obj/W, mob/user) +/obj/item/perfect_tele/attackby(obj/W, mob/user) if(istype(W,cell_type) && !power_source) power_source = W power_source.update_icon() //Why doesn't a cell do this already? :| @@ -171,8 +171,8 @@ This device records all warnings given and teleport events for admin review in c to_chat(user,"You insert \the [power_source] into \the [src].") update_icon() - else if(istype(W,/obj/item/device/perfect_tele_beacon)) - var/obj/item/device/perfect_tele_beacon/tb = W + else if(istype(W,/obj/item/perfect_tele_beacon)) + var/obj/item/perfect_tele_beacon/tb = W if(tb.tele_name in beacons) to_chat(user,"You re-insert \the [tb] into \the [src].") beacons -= tb.tele_name @@ -185,7 +185,7 @@ This device records all warnings given and teleport events for admin review in c else ..() -/obj/item/device/perfect_tele/proc/teleport_checks(mob/living/target,mob/living/user) +/obj/item/perfect_tele/proc/teleport_checks(mob/living/target,mob/living/user) //Uhhuh, need that power source if(!power_source) to_chat(user,"\The [src] has no power source!") @@ -244,7 +244,7 @@ This device records all warnings given and teleport events for admin review in c //Seems okay to me! return TRUE -/obj/item/device/perfect_tele/afterattack(mob/living/target, mob/living/user, proximity, var/ignore_fail_chance = 0) +/obj/item/perfect_tele/afterattack(mob/living/target, mob/living/user, proximity, var/ignore_fail_chance = 0) //No, you can't teleport people from over there. if(!proximity) return @@ -317,7 +317,7 @@ This device records all warnings given and teleport events for admin review in c phase_in(target,get_turf(target)) //And any friends! - for(var/obj/item/weapon/grab/G in target.contents) + for(var/obj/item/grab/G in target.contents) if(G.affecting && (G.state >= GRAB_AGGRESSIVE)) //Phase-out effect for grabbed person @@ -338,7 +338,7 @@ This device records all warnings given and teleport events for admin review in c logged_events["[world.time]"] = "[user] teleported [target] to [real_dest] [televored ? "(Belly: [lowertext(real_dest.name)])" : null]" -/obj/item/device/perfect_tele/proc/phase_out(var/mob/M,var/turf/T) +/obj/item/perfect_tele/proc/phase_out(var/mob/M,var/turf/T) if(!M || !T) return @@ -348,7 +348,7 @@ This device records all warnings given and teleport events for admin review in c playsound(T, "sparks", 50, 1) anim(T,M,'icons/mob/mob.dmi',,"phaseout",,M.dir) -/obj/item/device/perfect_tele/proc/phase_in(var/mob/M,var/turf/T) +/obj/item/perfect_tele/proc/phase_in(var/mob/M,var/turf/T) if(!M || !T) return @@ -360,7 +360,7 @@ This device records all warnings given and teleport events for admin review in c spk.set_up(5, 0, src) spk.attach(src) -/obj/item/device/perfect_tele_beacon +/obj/item/perfect_tele_beacon name = "translocator beacon" desc = "That's unusual." icon = 'icons/obj/device_alt.dmi' @@ -368,21 +368,21 @@ This device records all warnings given and teleport events for admin review in c w_class = ITEMSIZE_TINY var/tele_name - var/obj/item/device/perfect_tele/tele_hand + var/obj/item/perfect_tele/tele_hand var/creator var/warned_users = list() var/tele_network = null -/obj/item/device/perfect_tele_beacon/New() +/obj/item/perfect_tele_beacon/New() ..() flags |= NOBLUDGEON -/obj/item/device/perfect_tele_beacon/Destroy() +/obj/item/perfect_tele_beacon/Destroy() tele_name = null tele_hand = null return ..() -/obj/item/device/perfect_tele_beacon/attack_hand(mob/user) +/obj/item/perfect_tele_beacon/attack_hand(mob/user) if((user.ckey != creator) && !(user.ckey in warned_users)) warned_users |= user.ckey var/choice = tgui_alert(user, {" @@ -394,16 +394,16 @@ not carry this around."}, "OOC Warning", list("Take It","Leave It")) return return ..() -/obj/item/device/perfect_tele_beacon/stationary +/obj/item/perfect_tele_beacon/stationary name = "stationary translocator beacon" icon = 'icons/obj/radio_vr.dmi' icon_state = "floor_beacon" w_class = ITEMSIZE_HUGE anchored = TRUE -GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beacon/stationary) +GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/perfect_tele_beacon/stationary) -/obj/item/device/perfect_tele_beacon/attack_self(mob/user) +/obj/item/perfect_tele_beacon/attack_self(mob/user) if(!isliving(user)) return var/mob/living/L = user @@ -418,16 +418,16 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beac user.visible_message("[user] eats a telebeacon!","You eat the the beacon!") // A single-beacon variant for use by miners (or whatever) -/obj/item/device/perfect_tele/one_beacon +/obj/item/perfect_tele/one_beacon name = "mini-translocator" desc = "A more limited translocator with a single beacon, useful for some things, like setting the mining department on fire accidentally." icon_state = "minitrans" beacons_left = 1 //Just one - cell_type = /obj/item/weapon/cell/device + cell_type = /obj/item/cell/device origin_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5) /* -/obj/item/device/perfect_tele/one_beacon/teleport_checks(mob/living/target,mob/living/user) +/obj/item/perfect_tele/one_beacon/teleport_checks(mob/living/target,mob/living/user) var/turf/T = get_turf(destination) if(T && user.z != T.z) to_chat(user,"\The [src] is too far away from the beacon. Try getting closer first!") @@ -435,24 +435,24 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beac return ..() */ -/obj/item/device/perfect_tele/alien +/obj/item/perfect_tele/alien name = "alien translocator" desc = "This strange device allows one to teleport people and objects across large distances." icon_state = "alientele" - cell_type = /obj/item/weapon/cell/device/weapon/recharge/alien + cell_type = /obj/item/cell/device/weapon/recharge/alien charge_cost = 400 beacons_left = 6 failure_chance = 0 //Percent longrange = 1 abductor = 1 -/obj/item/device/perfect_tele/alien/bluefo +/obj/item/perfect_tele/alien/bluefo name = "hybrid translocator" desc = "This strange device allows one to teleport people and objects across large distances. It has only a single preprogrammed destination, though." icon_state = "alientele" - cell_type = /obj/item/weapon/cell/device/weapon/recharge/alien + cell_type = /obj/item/cell/device/weapon/recharge/alien charge_cost = 400 beacons_left = 0 failure_chance = 0 @@ -460,7 +460,7 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beac abductor = 1 loc_network = "hybridshuttle" -/obj/item/device/perfect_tele/frontier +/obj/item/perfect_tele/frontier icon_state = "frontiertrans" beacons_left = 1 //Just one battery_lock = 1 @@ -470,7 +470,7 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beac var/phase_power = 75 var/recharging = 0 -/obj/item/device/perfect_tele/frontier/unload_ammo(mob/user, var/ignore_inactive_hand_check = 0) +/obj/item/perfect_tele/frontier/unload_ammo(mob/user, var/ignore_inactive_hand_check = 0) if(recharging) return recharging = 1 @@ -487,36 +487,36 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beac recharging = 0 update_icon() -/obj/item/device/perfect_tele/frontier/update_icon() +/obj/item/perfect_tele/frontier/update_icon() if(recharging) icon_state = "[initial(icon_state)]_o" update_held_icon() return ..() -/obj/item/device/perfect_tele/frontier/staff +/obj/item/perfect_tele/frontier/staff name = "centcom translocator" desc = "Similar to translocator technology, however, most of its destinations are hardcoded." charge_cost = 1200 // Enough for one person and their partner loc_network = "centcom" longrange = 1 -/obj/item/device/perfect_tele/frontier/unknown +/obj/item/perfect_tele/frontier/unknown name = "modified translocator" desc = "This crank-charged translocator has only one beacon, but it already has a destination preprogrammed into it." charge_cost = 1200 // Enough for one person and their partner longrange = 1 abductor = 1 -/obj/item/device/perfect_tele/frontier/unknown/one +/obj/item/perfect_tele/frontier/unknown/one loc_network = "unkone" -/obj/item/device/perfect_tele/frontier/unknown/two +/obj/item/perfect_tele/frontier/unknown/two loc_network = "unktwo" -/obj/item/device/perfect_tele/frontier/unknown/three +/obj/item/perfect_tele/frontier/unknown/three loc_network = "unkthree" -/obj/item/device/perfect_tele/frontier/unknown/four +/obj/item/perfect_tele/frontier/unknown/four loc_network = "unkfour" -/obj/item/device/perfect_tele/frontier/unknown/five +/obj/item/perfect_tele/frontier/unknown/five loc_network = "unkfive" -/obj/item/device/perfect_tele/frontier/unknown/six +/obj/item/perfect_tele/frontier/unknown/six loc_network = "unksix" diff --git a/code/game/objects/items/devices/tvcamera.dm b/code/game/objects/items/devices/tvcamera.dm index bacf8a6b83f..246cf150322 100644 --- a/code/game/objects/items/devices/tvcamera.dm +++ b/code/game/objects/items/devices/tvcamera.dm @@ -1,21 +1,22 @@ -/obj/item/device/tvcamera +/obj/item/tvcamera name = "press camera drone" desc = "A Ward-Takahashi EyeBuddy media streaming hovercam. Weapon of choice for war correspondents and reality show cameramen." + icon = 'icons/obj/device.dmi' icon_state = "camcorder" item_state = "camcorder" w_class = ITEMSIZE_LARGE slot_flags = SLOT_BELT var/channel = "NCS Northern Star News Feed" var/obj/machinery/camera/network/thunder/camera - var/obj/item/device/radio/radio + var/obj/item/radio/radio var/datum/weakref/showing var/showing_name -/obj/item/device/tvcamera/New() +/obj/item/tvcamera/New() ..() listening_objects += src -/obj/item/device/tvcamera/Destroy() +/obj/item/tvcamera/Destroy() listening_objects -= src qdel(camera) qdel(radio) @@ -23,12 +24,12 @@ radio = null ..() -/obj/item/device/tvcamera/examine() +/obj/item/tvcamera/examine() . = ..() . += "Video feed is [camera.status ? "on" : "off"]" . += "Audio feed is [radio.broadcasting ? "on" : "off"]" -/obj/item/device/tvcamera/Initialize() +/obj/item/tvcamera/Initialize() . = ..() camera = new(src) camera.c_tag = channel @@ -40,16 +41,16 @@ radio.icon_state = src.icon_state update_icon() -/obj/item/device/tvcamera/hear_talk(mob/M, list/message_pieces, verb) +/obj/item/tvcamera/hear_talk(mob/M, list/message_pieces, verb) radio.hear_talk(M, message_pieces, verb) . = ..() -/obj/item/device/tvcamera/attack_self(mob/user) +/obj/item/tvcamera/attack_self(mob/user) add_fingerprint(user) user.set_machine(src) show_ui(user) -/obj/item/device/tvcamera/proc/show_ui(mob/user) +/obj/item/tvcamera/proc/show_ui(mob/user) var/dat = list() dat += "Channel name is: [channel ? channel : "unidentified broadcast"]
" dat += "Video streaming is [camera.status ? "on" : "off"]
" @@ -61,7 +62,7 @@ popup.set_content(jointext(dat,null)) popup.open() -/obj/item/device/tvcamera/Topic(bred, href_list, state = GLOB.tgui_physical_state) +/obj/item/tvcamera/Topic(bred, href_list, state = GLOB.tgui_physical_state) if(..()) return 1 if(href_list["channel"]) @@ -91,7 +92,7 @@ if(!href_list["close"]) attack_self(usr) -/obj/item/device/tvcamera/proc/show_tvs(atom/thing) +/obj/item/tvcamera/proc/show_tvs(atom/thing) if(showing) hide_tvs(showing) @@ -102,7 +103,7 @@ START_PROCESSING(SSobj, src) -/obj/item/device/tvcamera/proc/hide_tvs() +/obj/item/tvcamera/proc/hide_tvs() if(!showing) return for(var/obj/machinery/computer/security/telescreen/entertainment/ES as anything in GLOB.entertainment_screens) @@ -111,12 +112,12 @@ showing = null showing_name = null -/obj/item/device/tvcamera/Moved(atom/old_loc, direction, forced = FALSE, movetime) +/obj/item/tvcamera/Moved(atom/old_loc, direction, forced = FALSE, movetime) . = ..() if(camera.status && loc != old_loc) show_tvs(loc) -/obj/item/device/tvcamera/afterattack(atom/target, mob/user, proximity_flag, click_parameters) +/obj/item/tvcamera/afterattack(atom/target, mob/user, proximity_flag, click_parameters) . = ..() if(camera.status && !isturf(target)) show_tvs(target) @@ -124,7 +125,7 @@ if(user.machine == src) show_ui(user) // refresh the UI -/obj/item/device/tvcamera/process() +/obj/item/tvcamera/process() if(!showing) return PROCESS_KILL @@ -135,7 +136,7 @@ if(get_dist(get_turf(src), get_turf(A)) > 5) show_tvs(loc) -/obj/item/device/tvcamera/update_icon() +/obj/item/tvcamera/update_icon() ..() if(camera.status) icon_state = "camcorder_on" @@ -152,11 +153,11 @@ //Assembly by roboticist -/obj/item/robot_parts/head/attackby(var/obj/item/device/assembly/S, mob/user as mob) - if(!istype(S, /obj/item/device/assembly/infra)) +/obj/item/robot_parts/head/attackby(var/obj/item/assembly/S, mob/user as mob) + if(!istype(S, /obj/item/assembly/infra)) ..() return - var/obj/item/weapon/TVAssembly/A = new(user) + var/obj/item/TVAssembly/A = new(user) qdel(S) user.put_in_hands(A) to_chat(user, "You add the infrared sensor to the robot head.") @@ -164,7 +165,7 @@ qdel(src) -/obj/item/weapon/TVAssembly +/obj/item/TVAssembly name = "\improper TV Camera Assembly" desc = "A robotic head with an infrared sensor inside." icon = 'icons/obj/robot_parts.dmi' @@ -173,7 +174,7 @@ var/buildstep = 0 w_class = ITEMSIZE_LARGE -/obj/item/weapon/TVAssembly/attackby(W, mob/user) +/obj/item/TVAssembly/attackby(W, mob/user) switch(buildstep) if(0) if(istype(W, /obj/item/robot_parts/robot_component/camera)) @@ -184,8 +185,8 @@ desc = "This TV camera assembly has a camera module." buildstep++ if(1) - if(istype(W, /obj/item/device/taperecorder)) - var/obj/item/device/taperecorder/T = W + if(istype(W, /obj/item/taperecorder)) + var/obj/item/taperecorder/T = W user.drop_item() qdel(T) buildstep++ @@ -203,7 +204,7 @@ desc = "This TV camera assembly has wires sticking out" return if(3) - if(istype(W, /obj/item/weapon/tool/wirecutters)) + if(istype(W, /obj/item/tool/wirecutters)) to_chat(user, " You trim the wires.") buildstep++ desc = "This TV camera assembly needs casing." @@ -215,7 +216,7 @@ S.use(1) to_chat(user, "You encase the assembly in a Ward-Takeshi casing.") var/turf/T = get_turf(src) - new /obj/item/device/tvcamera(T) + new /obj/item/tvcamera(T) user.drop_from_inventory(src) qdel(src) return diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm index 268131fb7de..6d06d0581a5 100644 --- a/code/game/objects/items/devices/uplink.dm +++ b/code/game/objects/items/devices/uplink.dm @@ -10,7 +10,7 @@ return TRUE return FALSE -/obj/item/device/uplink +/obj/item/uplink var/welcome = "Welcome, Operative" // Welcoming menu message var/list/ItemsCategory // List of categories with lists of items var/list/ItemsReference // List of references with an associated item @@ -23,14 +23,16 @@ var/discount_amount //The amount as a percent the item will be discounted by var/compact_mode = FALSE -/obj/item/device/uplink/Initialize(var/mapload) + icon = 'icons/obj/device.dmi' + +/obj/item/uplink/Initialize(var/mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(next_offer)), offer_time) //It seems like only the /hidden type actually makes use of this... -/obj/item/device/uplink/get_item_cost(var/item_type, var/item_cost) +/obj/item/uplink/get_item_cost(var/item_type, var/item_cost) return (discount_item && (item_type == discount_item)) ? max(1, round(item_cost*discount_amount)) : item_cost -/obj/item/device/uplink/proc/next_offer() +/obj/item/uplink/proc/next_offer() return //Stub, used on children. // HIDDEN UPLINK - Can be stored in anything but the host item has to have a trigger for it. @@ -45,7 +47,7 @@ Then check if it's true, if true return. This will stop the normal menu appearing and will instead show the uplink menu. */ -/obj/item/device/uplink/hidden +/obj/item/uplink/hidden name = "hidden uplink" desc = "There is something wrong if you're examining this." var/active = 0 @@ -53,12 +55,12 @@ var/selected_cat // The hidden uplink MUST be inside an obj/item's contents. -/obj/item/device/uplink/hidden/Initialize() +/obj/item/uplink/hidden/Initialize() . = ..() if(!isitem(loc)) return INITIALIZE_HINT_QDEL -/obj/item/device/uplink/hidden/next_offer() +/obj/item/uplink/hidden/next_offer() discount_item = default_uplink_selection.get_random_item(INFINITY) discount_amount = pick(90;0.9, 80;0.8, 70;0.7, 60;0.6, 50;0.5, 40;0.4, 30;0.3, 20;0.2, 10;0.1) next_offer_time = world.time + offer_time @@ -66,11 +68,11 @@ addtimer(CALLBACK(src, PROC_REF(next_offer)), offer_time) // Toggles the uplink on and off. Normally this will bypass the item's normal functions and go to the uplink menu, if activated. -/obj/item/device/uplink/hidden/proc/toggle() +/obj/item/uplink/hidden/proc/toggle() active = !active // Directly trigger the uplink. Turn on if it isn't already. -/obj/item/device/uplink/hidden/proc/trigger(mob/user as mob) +/obj/item/uplink/hidden/proc/trigger(mob/user as mob) if(!active) toggle() tgui_interact(user) @@ -78,26 +80,26 @@ // Checks to see if the value meets the target. Like a frequency being a traitor_frequency, in order to unlock a headset. // If true, it accesses trigger() and returns 1. If it fails, it returns false. Use this to see if you need to close the // current item's menu. -/obj/item/device/uplink/hidden/proc/check_trigger(mob/user as mob, var/value, var/target) +/obj/item/uplink/hidden/proc/check_trigger(mob/user as mob, var/value, var/target) if(value == target) trigger(user) return TRUE return FALSE // Legacy -/obj/item/device/uplink/hidden/interact(mob/user) +/obj/item/uplink/hidden/interact(mob/user) tgui_interact(user) /***************** * Uplink TGUI *****************/ -/obj/item/device/uplink/tgui_host() +/obj/item/uplink/tgui_host() return loc -/obj/item/device/uplink/hidden/tgui_state(mob/user) +/obj/item/uplink/hidden/tgui_state(mob/user) return GLOB.tgui_deep_inventory_state -/obj/item/device/uplink/hidden/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) +/obj/item/uplink/hidden/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) if(!active) toggle() ui = SStgui.try_update_ui(user, src, ui) @@ -108,7 +110,7 @@ ui.set_autoupdate(FALSE) ui.open() -/obj/item/device/uplink/hidden/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) +/obj/item/uplink/hidden/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) if(!user.mind) return @@ -160,7 +162,7 @@ return data -/obj/item/device/uplink/hidden/tgui_static_data(mob/user) +/obj/item/uplink/hidden/tgui_static_data(mob/user) var/list/data = ..() data["categories"] = list() @@ -181,12 +183,12 @@ return data -/obj/item/device/uplink/hidden/tgui_status(mob/user, datum/tgui_state/state) +/obj/item/uplink/hidden/tgui_status(mob/user, datum/tgui_state/state) if(!active) return STATUS_CLOSE return ..() -/obj/item/device/uplink/hidden/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) +/obj/item/uplink/hidden/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) if(..()) return TRUE @@ -213,26 +215,26 @@ // // Includes normal radio uplink, multitool uplink, // implant uplink (not the implant tool) and a preset headset uplink. -/obj/item/device/radio/uplink/New() +/obj/item/radio/uplink/New() ..() hidden_uplink = new(src) icon_state = "radio" -/obj/item/device/radio/uplink/attack_self(mob/user as mob) +/obj/item/radio/uplink/attack_self(mob/user as mob) if(hidden_uplink) hidden_uplink.trigger(user) -/obj/item/device/multitool/uplink/New() +/obj/item/multitool/uplink/New() ..() hidden_uplink = new(src) -/obj/item/device/multitool/uplink/attack_self(mob/user as mob) +/obj/item/multitool/uplink/attack_self(mob/user as mob) if(hidden_uplink) hidden_uplink.trigger(user) -/obj/item/device/radio/headset/uplink +/obj/item/radio/headset/uplink traitor_frequency = 1445 -/obj/item/device/radio/headset/uplink/New() +/obj/item/radio/headset/uplink/New() ..() hidden_uplink = new(src) diff --git a/code/game/objects/items/devices/uplink_random_lists.dm b/code/game/objects/items/devices/uplink_random_lists.dm index 7e8a6953aef..72134fd16e4 100644 --- a/code/game/objects/items/devices/uplink_random_lists.dm +++ b/code/game/objects/items/devices/uplink_random_lists.dm @@ -22,7 +22,7 @@ var/datum/uplink_random_selection/all_uplink_selection = new/datum/uplink_random items = list() all_items = list() -/datum/uplink_random_selection/proc/get_random_item(var/telecrystals, obj/item/device/uplink/U, var/list/bought_items, var/items_override = 0) +/datum/uplink_random_selection/proc/get_random_item(var/telecrystals, obj/item/uplink/U, var/list/bought_items, var/items_override = 0) var/const/attempts = 50 for(var/i = 0; i < attempts; i++) diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index 846fae358da..2b3b95f8e15 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -1,4 +1,4 @@ -/obj/item/device/hailer +/obj/item/hailer name = "hailer" desc = "Used by obese officers to save their breath for running." icon_state = "voice0" @@ -10,7 +10,7 @@ var/spamcheck = 0 var/insults -/obj/item/device/hailer/verb/set_message() +/obj/item/hailer/verb/set_message() set name = "Set Hailer Message" set category = "Object" set desc = "Alter the message shouted by your hailer." @@ -27,7 +27,7 @@ to_chat(usr, "You configure the hailer to shout \"[use_message]\".") -/obj/item/device/hailer/attack_self(mob/living/carbon/user as mob) +/obj/item/hailer/attack_self(mob/living/carbon/user as mob) if (spamcheck) return @@ -47,7 +47,7 @@ spawn(20) spamcheck = 0 -/obj/item/device/hailer/emag_act(var/remaining_charges, var/mob/user) +/obj/item/hailer/emag_act(var/remaining_charges, var/mob/user) if(isnull(insults)) to_chat(user, "You overload \the [src]'s voice synthesizer.") insults = rand(1, 3)//to prevent dickflooding diff --git a/code/game/objects/items/falling_object_vr.dm b/code/game/objects/items/falling_object_vr.dm index 0494594dce4..a6c376ab93b 100644 --- a/code/game/objects/items/falling_object_vr.dm +++ b/code/game/objects/items/falling_object_vr.dm @@ -5,7 +5,7 @@ anchored = TRUE density = FALSE unacidable = TRUE - var/falling_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita + var/falling_type = /obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita var/crushing = TRUE /obj/effect/falling_effect/Initialize(mapload, type) diff --git a/code/game/objects/items/glassjar.dm b/code/game/objects/items/glassjar.dm index d10ff9468a0..48b663c599d 100644 --- a/code/game/objects/items/glassjar.dm +++ b/code/game/objects/items/glassjar.dm @@ -73,12 +73,12 @@ return /obj/item/glass_jar/attackby(var/obj/item/W, var/mob/user) - if(istype(W, /obj/item/weapon/spacecash)) + if(istype(W, /obj/item/spacecash)) if(contains == JAR_NOTHING) contains = JAR_MONEY if(contains != JAR_MONEY) return - var/obj/item/weapon/spacecash/S = W + var/obj/item/spacecash/S = W user.visible_message("[user] puts [S.worth] [S.worth > 1 ? "thalers" : "thaler"] into \the [src].") user.drop_from_inventory(S) S.loc = src @@ -94,7 +94,7 @@ if(JAR_MONEY) name = "tip jar" desc = "A small jar with money inside." - for(var/obj/item/weapon/spacecash/S in src) + for(var/obj/item/spacecash/S in src) var/image/money = image(S.icon, S.icon_state) money.pixel_x = rand(-2, 3) money.pixel_y = rand(-6, 6) @@ -150,7 +150,7 @@ if(JAR_MONEY) name = "tip tank" desc = "A large [name] with money inside." - for(var/obj/item/weapon/spacecash/S in src) + for(var/obj/item/spacecash/S in src) var/image/money = image(S.icon, S.icon_state) money.pixel_x = rand(-2, 3) money.pixel_y = rand(-6, 6) diff --git a/code/game/objects/items/gunbox.dm b/code/game/objects/items/gunbox.dm index 249daf1b4e7..548122396c4 100644 --- a/code/game/objects/items/gunbox.dm +++ b/code/game/objects/items/gunbox.dm @@ -9,16 +9,16 @@ w_class = ITEMSIZE_HUGE /obj/item/gunbox/attack_self(mob/living/user) var/list/options = list() - options["M1911 (.45)"] = list(/obj/item/weapon/gun/projectile/colt/detective, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45/rubber) - options["MT Mk58 (.45)"] = list(/obj/item/weapon/gun/projectile/sec, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45/rubber) - options["MarsTech R1 (.45)"] = list(/obj/item/weapon/gun/projectile/revolver/detective45, /obj/item/ammo_magazine/s45/rubber, /obj/item/ammo_magazine/s45/rubber) - options["MarsTech P92X (9mm)"] = list(/obj/item/weapon/gun/projectile/p92x/rubber, /obj/item/ammo_magazine/m9mm/rubber, /obj/item/ammo_magazine/m9mm/rubber) + options["M1911 (.45)"] = list(/obj/item/gun/projectile/colt/detective, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45/rubber) + options["MT Mk58 (.45)"] = list(/obj/item/gun/projectile/sec, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45/rubber) + options["MarsTech R1 (.45)"] = list(/obj/item/gun/projectile/revolver/detective45, /obj/item/ammo_magazine/s45/rubber, /obj/item/ammo_magazine/s45/rubber) + options["MarsTech P92X (9mm)"] = list(/obj/item/gun/projectile/p92x/rubber, /obj/item/ammo_magazine/m9mm/rubber, /obj/item/ammo_magazine/m9mm/rubber) var/choice = tgui_input_list(user,"Would you prefer a pistol or a revolver?", "Gun!", 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]. Say hello to your new friend.") qdel(src) @@ -30,14 +30,14 @@ desc = "A secure box containing a non-lethal sidearm." /obj/item/gunbox/stun/attack_self(mob/living/user) var/list/options = list() - options["Stun Revolver"] = list(/obj/item/weapon/gun/energy/stunrevolver/detective, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon) - options["Taser"] = list(/obj/item/weapon/gun/energy/taser, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon) + options["Stun Revolver"] = list(/obj/item/gun/energy/stunrevolver/detective, /obj/item/cell/device/weapon, /obj/item/cell/device/weapon) + options["Taser"] = list(/obj/item/gun/energy/taser, /obj/item/cell/device/weapon, /obj/item/cell/device/weapon) var/choice = tgui_input_list(user,"Please, select an option.", "Stun Gun!", 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]. Say hello to your new friend.") qdel(src) @@ -50,14 +50,14 @@ w_class = ITEMSIZE_HUGE /obj/item/gunbox/centcom/attack_self(mob/living/user) var/list/options = list() - options["Écureuil (10mm)"] = list(/obj/item/weapon/gun/projectile/ecureuil, /obj/item/ammo_magazine/m10mm/pistol, /obj/item/ammo_magazine/m10mm/pistol) - options["Écureuil Olive (10mm)"] = list(/obj/item/weapon/gun/projectile/ecureuil/tac, /obj/item/ammo_magazine/m10mm/pistol, /obj/item/ammo_magazine/m10mm/pistol) - options["Écureuil Tan (10mm)"] = list(/obj/item/weapon/gun/projectile/ecureuil/tac2, /obj/item/ammo_magazine/m10mm/pistol, /obj/item/ammo_magazine/m10mm/pistol) + options["Écureuil (10mm)"] = list(/obj/item/gun/projectile/ecureuil, /obj/item/ammo_magazine/m10mm/pistol, /obj/item/ammo_magazine/m10mm/pistol) + options["Écureuil Olive (10mm)"] = list(/obj/item/gun/projectile/ecureuil/tac, /obj/item/ammo_magazine/m10mm/pistol, /obj/item/ammo_magazine/m10mm/pistol) + options["Écureuil Tan (10mm)"] = list(/obj/item/gun/projectile/ecureuil/tac2, /obj/item/ammo_magazine/m10mm/pistol, /obj/item/ammo_magazine/m10mm/pistol) var/choice = tgui_input_list(user,"Please, select an option.", "Gun!", 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]. Say hello to your new friend.") qdel(src) \ No newline at end of file diff --git a/code/game/objects/items/gunbox_vr.dm b/code/game/objects/items/gunbox_vr.dm index 4dbbb98b274..00977fec6fd 100644 --- a/code/game/objects/items/gunbox_vr.dm +++ b/code/game/objects/items/gunbox_vr.dm @@ -9,14 +9,14 @@ /obj/item/gunbox/warden/attack_self(mob/living/user) var/list/options = list() - options["Warden's combat shotgun"] = list(/obj/item/weapon/gun/projectile/shotgun/pump/combat/warden, /obj/item/ammo_magazine/ammo_box/b12g/beanbag) - options["Warden's compact shotgun"] = list(/obj/item/weapon/gun/projectile/shotgun/compact/warden, /obj/item/ammo_magazine/ammo_box/b12g/beanbag) + options["Warden's combat shotgun"] = list(/obj/item/gun/projectile/shotgun/pump/combat/warden, /obj/item/ammo_magazine/ammo_box/b12g/beanbag) + options["Warden's compact shotgun"] = list(/obj/item/gun/projectile/shotgun/compact/warden, /obj/item/ammo_magazine/ammo_box/b12g/beanbag) var/choice = tgui_input_list(user,"Choose your boomstick!", "Shotgun!", 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]. Say hello to your new best friend.") qdel(src) @@ -30,15 +30,15 @@ icon_state = "gunbox" /obj/item/gunbox/captain/attack_self(mob/living/user) var/list/options = list() - options["M1911 (.45)"] = list(/obj/item/weapon/gun/projectile/colt/detective, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45) - options["MT Mk58 (.45)"] = list(/obj/item/weapon/gun/projectile/sec, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45) - options["LAEP80 \"Thor\" (Stun/Laser)"] = list(/obj/item/weapon/gun/energy/gun, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon) - options["MarsTech P92X (9mm)"] = list(/obj/item/weapon/gun/projectile/p92x/rubber, /obj/item/ammo_magazine/m9mm/rubber, /obj/item/ammo_magazine/m9mm) + options["M1911 (.45)"] = list(/obj/item/gun/projectile/colt/detective, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45) + options["MT Mk58 (.45)"] = list(/obj/item/gun/projectile/sec, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45) + options["LAEP80 \"Thor\" (Stun/Laser)"] = list(/obj/item/gun/energy/gun, /obj/item/cell/device/weapon, /obj/item/cell/device/weapon) + options["MarsTech P92X (9mm)"] = list(/obj/item/gun/projectile/p92x/rubber, /obj/item/ammo_magazine/m9mm/rubber, /obj/item/ammo_magazine/m9mm) var/choice = tgui_input_list(user,"Would you prefer a ballistic pistol or an energy gun?", "Gun!", 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]. Say hello to your new friend.") qdel(src) diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index 753158eadb6..8523720cf62 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -1,6 +1,7 @@ /obj/item/latexballon name = "latex glove" desc = "A latex glove, usually used as a balloon." + icon = 'icons/obj/items.dmi' icon_state = "latexballon" item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_gloves.dmi', @@ -15,7 +16,7 @@ var/state var/datum/gas_mixture/air_contents = null -/obj/item/latexballon/proc/blow(obj/item/weapon/tank/tank) +/obj/item/latexballon/proc/blow(obj/item/tank/tank) if (icon_state == "latexballon_bursted") return src.air_contents = tank.remove_air_volume(3) @@ -61,4 +62,4 @@ slot_r_hand_str = 'icons/mob/items/righthand_gloves.dmi', ) item_state = "ngloves" -*/ \ No newline at end of file +*/ diff --git a/code/game/objects/items/paintkit.dm b/code/game/objects/items/paintkit.dm index 53eb76a4662..ea372f883be 100644 --- a/code/game/objects/items/paintkit.dm +++ b/code/game/objects/items/paintkit.dm @@ -1,4 +1,4 @@ -/obj/item/device/kit +/obj/item/kit icon_state = "modkit" icon = 'icons/obj/device.dmi' w_class = ITEMSIZE_SMALL @@ -10,21 +10,21 @@ var/uses = 1 // Uses before the kit deletes itself. var/list/allowed_types = list() -/obj/item/device/kit/examine() +/obj/item/kit/examine() . = ..() . += "It has [uses] use\s left." -/obj/item/device/kit/proc/use(var/amt, var/mob/user) +/obj/item/kit/proc/use(var/amt, var/mob/user) uses -= amt playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) if(uses<1) user.drop_item() qdel(src) -/obj/item/device/kit/proc/can_customize(var/obj/item/I) +/obj/item/kit/proc/can_customize(var/obj/item/I) return is_type_in_list(I, allowed_types) -/obj/item/device/kit/proc/set_info(var/kit_name, var/kit_desc, var/kit_icon, var/kit_icon_file = CUSTOM_ITEM_OBJ, var/kit_icon_override_file = CUSTOM_ITEM_MOB, var/additional_data) +/obj/item/kit/proc/set_info(var/kit_name, var/kit_desc, var/kit_icon, var/kit_icon_file = CUSTOM_ITEM_OBJ, var/kit_icon_override_file = CUSTOM_ITEM_MOB, var/additional_data) new_name = kit_name new_desc = kit_desc new_icon = kit_icon @@ -34,7 +34,7 @@ for(var/path in splittext(additional_data, ", ")) allowed_types |= text2path(path) -/obj/item/device/kit/proc/customize(var/obj/item/I, var/mob/user) +/obj/item/kit/proc/customize(var/obj/item/I, var/mob/user) if(can_customize(I)) I.name = new_name ? new_name : I.name I.desc = new_desc ? new_desc : I.desc @@ -49,9 +49,9 @@ use(1, user) // Generic use -/obj/item/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/device/kit)) - var/obj/item/device/kit/K = W +/obj/item/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/kit)) + var/obj/item/kit/K = W K.customize(src, user) return @@ -59,22 +59,22 @@ // Root hardsuit kit defines. // Icons for modified hardsuits need to be in the proper .dmis because suit cyclers may cock them up. -/obj/item/device/kit/suit +/obj/item/kit/suit name = "voidsuit modification kit" desc = "A kit for modifying a voidsuit." uses = 2 var/new_light_overlay -/obj/item/device/kit/suit/can_customize(var/obj/item/I) +/obj/item/kit/suit/can_customize(var/obj/item/I) return istype(I, /obj/item/clothing/head/helmet/space/void) || istype(I, /obj/item/clothing/suit/space/void) || istype(I, /obj/item/clothing/suit/storage/hooded) -/obj/item/device/kit/suit/set_info(var/kit_name, var/kit_desc, var/kit_icon, var/kit_icon_file = CUSTOM_ITEM_OBJ, var/kit_icon_override_file = CUSTOM_ITEM_MOB, var/additional_data) +/obj/item/kit/suit/set_info(var/kit_name, var/kit_desc, var/kit_icon, var/kit_icon_file = CUSTOM_ITEM_OBJ, var/kit_icon_override_file = CUSTOM_ITEM_MOB, var/additional_data) ..() new_light_overlay = additional_data -/obj/item/device/kit/suit/customize(var/obj/item/I, var/mob/user) +/obj/item/kit/suit/customize(var/obj/item/I, var/mob/user) if(can_customize(I)) if(istype(I, /obj/item/clothing/head/helmet/space/void)) var/obj/item/clothing/head/helmet/space/void/helmet = I @@ -127,33 +127,33 @@ use(1,user) /obj/item/clothing/head/helmet/space/void/attackby(var/obj/item/O, var/mob/user) - if(istype(O,/obj/item/device/kit/suit)) - var/obj/item/device/kit/suit/kit = O + if(istype(O,/obj/item/kit/suit)) + var/obj/item/kit/suit/kit = O kit.customize(src, user) return return ..() /obj/item/clothing/suit/space/void/attackby(var/obj/item/O, var/mob/user) - if(istype(O,/obj/item/device/kit/suit)) - var/obj/item/device/kit/suit/kit = O + if(istype(O,/obj/item/kit/suit)) + var/obj/item/kit/suit/kit = O kit.customize(src, user) return return ..() /obj/item/clothing/suit/storage/hooded/attackby(var/obj/item/O, var/mob/user) - if(istype(O,/obj/item/device/kit/suit)) - var/obj/item/device/kit/suit/kit = O + if(istype(O,/obj/item/kit/suit)) + var/obj/item/kit/suit/kit = O kit.customize(src, user) return return ..() -/obj/item/device/kit/suit/rig +/obj/item/kit/suit/rig name = "rig modification kit" desc = "A kit for modifying a rigsuit." uses = 1 -/obj/item/device/kit/suit/rig/customize(var/obj/item/I, var/mob/user) - var/obj/item/weapon/rig/RIG = I +/obj/item/kit/suit/rig/customize(var/obj/item/I, var/mob/user) + var/obj/item/rig/RIG = I RIG.suit_state = new_icon RIG.item_state = new_icon RIG.suit_type = "customized [initial(RIG.suit_type)]" @@ -185,25 +185,25 @@ H.light_overlay = new_light_overlay use(1,user) -/obj/item/device/kit/suit/rig/can_customize(var/obj/item/I) - return istype(I, /obj/item/weapon/rig) +/obj/item/kit/suit/rig/can_customize(var/obj/item/I) + return istype(I, /obj/item/rig) -/obj/item/weapon/rig/attackby(var/obj/item/O, var/mob/user) - if(istype(O,/obj/item/device/kit/suit)) - var/obj/item/device/kit/suit/rig/kit = O +/obj/item/rig/attackby(var/obj/item/O, var/mob/user) + if(istype(O,/obj/item/kit/suit)) + var/obj/item/kit/suit/rig/kit = O kit.customize(src, user) return return ..() -/obj/item/device/kit/suit/rig/debug/Initialize() +/obj/item/kit/suit/rig/debug/Initialize() set_info("debug suit", "This is a test", "debug", CUSTOM_ITEM_OBJ, CUSTOM_ITEM_MOB) -/obj/item/device/kit/paint +/obj/item/kit/paint name = "mecha customisation kit" desc = "A kit containing all the needed tools and parts to repaint a mech." var/removable = null -/obj/item/device/kit/paint/can_customize(var/obj/mecha/M) +/obj/item/kit/paint/can_customize(var/obj/mecha/M) if(!istype(M)) return 0 @@ -211,20 +211,20 @@ if(type == M.initial_icon) return 1 -/obj/item/device/kit/paint/set_info(var/kit_name, var/kit_desc, var/kit_icon, var/kit_icon_file = CUSTOM_ITEM_OBJ, var/kit_icon_override_file = CUSTOM_ITEM_MOB, var/additional_data) +/obj/item/kit/paint/set_info(var/kit_name, var/kit_desc, var/kit_icon, var/kit_icon_file = CUSTOM_ITEM_OBJ, var/kit_icon_override_file = CUSTOM_ITEM_MOB, var/additional_data) ..() allowed_types = splittext(additional_data, ", ") -/obj/item/device/kit/paint/examine() +/obj/item/kit/paint/examine() . = ..() . += "This kit will convert an exosuit into: [new_name]." . += "This kit can be used on the following exosuit models:" for(var/exotype in allowed_types) . += "- [capitalize(exotype)]" -/obj/item/device/kit/paint/customize(var/obj/mecha/M, var/mob/user) +/obj/item/kit/paint/customize(var/obj/mecha/M, var/mob/user) if(!can_customize(M)) to_chat(user, "That kit isn't meant for use on this class of exosuit.") return @@ -242,16 +242,16 @@ M.update_icon() use(1, user) -/obj/mecha/attackby(var/obj/item/weapon/W, var/mob/user) - if(istype(W, /obj/item/device/kit/paint)) - var/obj/item/device/kit/paint/P = W +/obj/mecha/attackby(var/obj/item/W, var/mob/user) + if(istype(W, /obj/item/kit/paint)) + var/obj/item/kit/paint/P = W P.customize(src, user) return else return ..() //Ripley APLU kits. -/obj/item/device/kit/paint/ripley +/obj/item/kit/paint/ripley name = "\"Classic\" APLU customisation kit" new_name = "APLU \"Classic\"" new_desc = "A very retro APLU unit; didn't they retire these back in 2303?" @@ -260,7 +260,7 @@ var/showpilot = TRUE var/showpilot_lift = 5 -/obj/item/device/kit/paint/ripley/customize(obj/mecha/M, mob/user) +/obj/item/kit/paint/ripley/customize(obj/mecha/M, mob/user) if(showpilot) M.show_pilot = TRUE M.pilot_lift = 5 @@ -269,7 +269,7 @@ M.pilot_lift = 0 . = ..() -/obj/item/device/kit/paint/ripley/death +/obj/item/kit/paint/ripley/death name = "\"Reaper\" APLU customisation kit" new_name = "APLU \"Reaper\"" new_desc = "A terrifying, grim power loader. Why do those clamps have spikes?" @@ -277,14 +277,14 @@ allowed_types = list("ripley","firefighter") showpilot = FALSE -/obj/item/device/kit/paint/ripley/flames_red +/obj/item/kit/paint/ripley/flames_red name = "\"Firestarter\" APLU customisation kit" new_name = "APLU \"Firestarter\"" new_desc = "A standard APLU exosuit with stylish orange flame decals." new_icon = "ripley_flames_red" showpilot = FALSE -/obj/item/device/kit/paint/ripley/flames_blue +/obj/item/kit/paint/ripley/flames_blue name = "\"Burning Chrome\" APLU customisation kit" new_name = "APLU \"Burning Chrome\"" new_desc = "A standard APLU exosuit with stylish blue flame decals." @@ -292,40 +292,40 @@ showpilot = FALSE // Durand kits. -/obj/item/device/kit/paint/durand +/obj/item/kit/paint/durand name = "\"Classic\" Durand customisation kit" new_name = "Durand \"Classic\"" new_desc = "An older model of Durand combat exosuit. This model was retired for rotating a pilot's torso 180 degrees." new_icon = "old_durand" allowed_types = list("durand") -/obj/item/device/kit/paint/durand/seraph +/obj/item/kit/paint/durand/seraph name = "\"Cherubim\" Durand customisation kit" new_name = "Durand \"Cherubim\"" new_desc = "A Durand combat exosuit modelled after ancient Earth entertainment. Your heart goes doki-doki just looking at it." new_icon = "old_durand" -/obj/item/device/kit/paint/durand/phazon +/obj/item/kit/paint/durand/phazon name = "\"Sypher\" Durand customisation kit" new_name = "Durand \"Sypher\"" new_desc = "A Durand combat exosuit with some very stylish neons and decals. Seems to blur slightly at the edges; probably an optical illusion." new_icon = "phazon" // Gygax kits. -/obj/item/device/kit/paint/gygax +/obj/item/kit/paint/gygax name = "\"Jester\" Gygax customisation kit" new_name = "Gygax \"Jester\"" new_desc = "A Gygax exosuit modelled after the infamous combat-troubadors of Earth's distant past. Terrifying to behold." new_icon = "honker" allowed_types = list("gygax") -/obj/item/device/kit/paint/gygax/darkgygax +/obj/item/kit/paint/gygax/darkgygax name = "\"Silhouette\" Gygax customisation kit" new_name = "Gygax \"Silhouette\"" new_desc = "An ominous Gygax exosuit modelled after the fictional corporate 'death squads' that were popular in pulp action-thrillers back in 2314." new_icon = "darkgygax" -/obj/item/device/kit/paint/gygax/recitence +/obj/item/kit/paint/gygax/recitence name = "\"Gaoler\" Gygax customisation kit" new_name = "Durand \"Gaoler\"" new_desc = "A bulky silver Gygax exosuit. The extra armour appears to be painted on, but it's very shiny." diff --git a/code/game/objects/items/poi_items.dm b/code/game/objects/items/poi_items.dm index c1a8b73d227..99a2964aef8 100644 --- a/code/game/objects/items/poi_items.dm +++ b/code/game/objects/items/poi_items.dm @@ -67,7 +67,7 @@ climbable = FALSE starts_with = list( - /obj/item/weapon/fuel_assembly/deuterium = 6) + /obj/item/fuel_assembly/deuterium = 6) /obj/item/poi/brokenoldreactor icon_state = "poireactor_broken" @@ -149,15 +149,15 @@ return FALSE var/turf/message_turf = get_turf(user) //We use this to ensure everyone can see it! - if(istype(I, /obj/item/weapon/tool/screwdriver)) + if(istype(I, /obj/item/tool/screwdriver)) unscrewed = !unscrewed to_chat(user, "You screw the blackbox panel [unscrewed ? "off" : "on"]") - if(istype(I, /obj/item/weapon/tool/wirecutters)) + if(istype(I, /obj/item/tool/wirecutters)) wirecutted = !wirecutted to_chat(user, "You [wirecutted ? "cut" : "mend"] the power wire to the blackbox") - if(istype(I, /obj/item/weapon/paper) && unscrewed) + if(istype(I, /obj/item/paper) && unscrewed) if(!has_paper) to_chat(user, "You feed the debug printer some paper") has_paper = TRUE @@ -165,7 +165,7 @@ else to_chat(user, span_notice("[src] cannot hold more than 1 sheet of paper.")) - if(istype(I, /obj/item/device/multitool)) + if(istype(I, /obj/item/multitool)) if(!unscrewed && !wirecutted) to_chat(user, span_notice("You cannot access the debug interface with the panel screwed on!")) else if(unscrewed && !wirecutted) @@ -182,7 +182,7 @@ to_chat(user, span_notice("You modify the security settings.")) unlocked = TRUE - if(istype(I, /obj/item/device/robotanalyzer)) + if(istype(I, /obj/item/robotanalyzer)) if(!unscrewed) to_chat(user, span_notice("You cannot access the debug interface with the panel screwed on!")) else if(wirecutted) @@ -199,7 +199,7 @@ else message_turf.audible_message(message = "[src] rattles loudly as it prints", deaf_message = "[src] flashes green!", runemessage= "RATTLE RATTLE") - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(src)) + var/obj/item/paper/P = new /obj/item/paper(get_turf(src)) P.name = "[drone_name] blackbox transcript" P.info = "[examine_canalyzer_printed ? examine_canalyzer_printed : examine_canalyzer]" has_paper = FALSE diff --git a/code/game/objects/items/robobag.dm b/code/game/objects/items/robobag.dm index 4c54a5d78fa..1811e34f2c0 100644 --- a/code/game/objects/items/robobag.dm +++ b/code/game/objects/items/robobag.dm @@ -22,7 +22,7 @@ especially useful if short on time or in a hostile enviroment." icon = 'icons/obj/robobag.dmi' item_path = /obj/item/bodybag/cryobag/robobag - tank_type = /obj/item/weapon/tank/stasis/nitro_cryo + tank_type = /obj/item/tank/stasis/nitro_cryo stasis_level = 2 // Lower than the normal cryobag, because it's not made for meat that dies. It's made for robots and is freezing. var/obj/item/clothing/accessory/badge/corptag // The tag on the bag. @@ -81,8 +81,8 @@ if(opened) ..() else //Allows the bag to respond to a cyborg analyzer and tag. - if(istype(W,/obj/item/device/robotanalyzer)) - var/obj/item/device/robotanalyzer/analyzer = W + if(istype(W,/obj/item/robotanalyzer)) + var/obj/item/robotanalyzer/analyzer = W for(var/mob/living/L in contents) analyzer.attack(L,user) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index b1fe260b40e..33d10f65f0d 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -5,7 +5,7 @@ ***********************************************************************/ //Might want to move this into several files later but for now it works here -/obj/item/weapon/melee/baton/robot/arm +/obj/item/melee/baton/robot/arm name = "electrified arm" icon = 'icons/obj/decals.dmi' icon_state = "shock" @@ -13,7 +13,7 @@ hitcost = 750 agonyforce = 70 -/obj/item/weapon/melee/baton/robot/arm/update_icon() +/obj/item/melee/baton/robot/arm/update_icon() if(status) set_light(1.5, 1, lightcolor) else diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 405de3a48c8..8a38d587856 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -49,15 +49,15 @@ icon_state = "chest" part = list(BP_GROIN,BP_TORSO) var/wires = 0.0 - var/obj/item/weapon/cell/cell = null + var/obj/item/cell/cell = null /obj/item/robot_parts/head name = "cyborg head" desc = "A standard reinforced braincase, with spine-plugged neural socket and sensor gimbals." icon_state = "head" part = list(BP_HEAD) - var/obj/item/device/flash/flash1 = null - var/obj/item/device/flash/flash2 = null + var/obj/item/flash/flash1 = null + var/obj/item/flash/flash2 = null /obj/item/robot_parts/robot_suit name = "endoskeleton" @@ -103,7 +103,7 @@ if(istype(W, /obj/item/stack/material) && W.get_material_name() == MAT_STEEL && !l_arm && !r_arm && !l_leg && !r_leg && !chest && !head) var/obj/item/stack/material/M = W if (M.use(1)) - var/obj/item/weapon/secbot_assembly/ed209_assembly/B = new /obj/item/weapon/secbot_assembly/ed209_assembly + var/obj/item/secbot_assembly/ed209_assembly/B = new /obj/item/secbot_assembly/ed209_assembly B.loc = get_turf(src) to_chat(user, "You armed the robot frame.") if (user.get_inactive_hand()==src) @@ -162,13 +162,13 @@ else to_chat(user, "You need to attach a flash to it first!") - if(istype(W, /obj/item/device/mmi)) - var/obj/item/device/mmi/M = W + if(istype(W, /obj/item/mmi)) + var/obj/item/mmi/M = W if(check_completion()) if(!istype(loc,/turf)) to_chat(user, "You can't put \the [W] in, the frame has to be standing on the ground to be perfectly precise.") return - if(!istype(W, /obj/item/device/mmi/inert)) + if(!istype(W, /obj/item/mmi/inert)) if(!M.brainmob) to_chat(user, "Sticking an empty [W] into the frame would sort of defeat the purpose.") return @@ -228,7 +228,7 @@ else to_chat(user, "The MMI must go in after everything else!") - if (istype(W, /obj/item/weapon/pen)) + if (istype(W, /obj/item/pen)) var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", src.name, src.created_name), MAX_NAME_LEN) if (!t) return @@ -241,7 +241,7 @@ /obj/item/robot_parts/chest/attackby(obj/item/W as obj, mob/user as mob) ..() - if(istype(W, /obj/item/weapon/cell)) + if(istype(W, /obj/item/cell)) if(src.cell) to_chat(user, "You have already inserted a cell!") return @@ -263,7 +263,7 @@ /obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob) ..() - if(istype(W, /obj/item/device/flash)) + if(istype(W, /obj/item/flash)) if(istype(user,/mob/living/silicon/robot)) var/current_module = user.get_active_hand() if(current_module == W) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 22a3649346f..161f09385b7 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -234,7 +234,7 @@ /obj/item/borg/upgrade/advanced/bellysizeupgrade/action(var/mob/living/silicon/robot/R) if(..()) return 0 - var/obj/T = R.has_upgrade_module(/obj/item/device/dogborg/sleeper) + var/obj/T = R.has_upgrade_module(/obj/item/dogborg/sleeper) if(!T) to_chat(usr, "This robot has had its processor removed!") return 0 @@ -244,7 +244,7 @@ to_chat(usr, "There's no room for another capacity upgrade!") return 0 - var/obj/item/device/dogborg/sleeper/B = T + var/obj/item/dogborg/sleeper/B = T var/X = B.max_item_count*2 B.max_item_count = X //I couldn't do T = maxitem*2 for some reason. to_chat(R, "Internal capacity doubled.") @@ -266,8 +266,8 @@ generic_error(R, type) return 0 - R.module.modules += new/obj/item/weapon/tank/jetpack/carbondioxide(R.module) - for(var/obj/item/weapon/tank/jetpack/carbondioxide in R.module.modules) + R.module.modules += new/obj/item/tank/jetpack/carbondioxide(R.module) + for(var/obj/item/tank/jetpack/carbondioxide in R.module.modules) R.internals = src return 1 @@ -285,7 +285,7 @@ generic_error(R, type) return 0 - R.module.modules += new/obj/item/device/healthanalyzer/advanced(R.module) + R.module.modules += new/obj/item/healthanalyzer/advanced(R.module) return 1 //Robot size gun @@ -303,7 +303,7 @@ generic_error(R, type) return 0 - R.module.modules += new/obj/item/weapon/gun/energy/sizegun/mounted(R.module) + R.module.modules += new/obj/item/gun/energy/sizegun/mounted(R.module) return 1 /* ############################################################################## @@ -326,7 +326,7 @@ generic_error(R, type) return 0 - var/obj/T = R.has_upgrade_module(/obj/item/device/dogborg/sleeper) + var/obj/T = R.has_upgrade_module(/obj/item/dogborg/sleeper) if(!T) to_chat(usr, "This robot has had its processor removed!") return 0 @@ -336,7 +336,7 @@ to_chat(usr, "There's no room for another capability upgrade!") return 0 - var/obj/item/device/dogborg/sleeper/B = T + var/obj/item/dogborg/sleeper/B = T var/X = B.max_item_count*2 //double the capacity from 1 to 2 to allow sleepers to store some items, at most 4 with both upgrades B.max_item_count = X //I couldn't do T = maxitem*2 for some reason. to_chat(R, "Internal capability upgraded.") @@ -360,7 +360,7 @@ generic_error(R, type) return 0 - var/obj/T = R.has_upgrade_module(/obj/item/weapon/gun/energy/taser/mounted/cyborg) + var/obj/T = R.has_upgrade_module(/obj/item/gun/energy/taser/mounted/cyborg) if(!T) to_chat(usr, "This robot has had its taser removed!") return 0 @@ -370,7 +370,7 @@ to_chat(usr, "There's no room for another cooling unit!") return 0 - var/obj/item/weapon/gun/energy/taser/mounted/cyborg/B = T + var/obj/item/gun/energy/taser/mounted/cyborg/B = T B.recharge_time = max(2 , B.recharge_time - 4) return 1 @@ -394,7 +394,7 @@ generic_error(R, type) return 0 - R.module.modules += new/obj/item/weapon/storage/part_replacer/adv(R.module) + R.module.modules += new/obj/item/storage/part_replacer/adv(R.module) return 1 //Diamond Drill @@ -417,7 +417,7 @@ generic_error(R, type) return 0 - R.module.modules += new/obj/item/weapon/pickaxe/diamonddrill(R.module) + R.module.modules += new/obj/item/pickaxe/diamonddrill(R.module) return 1 //PKA @@ -440,7 +440,7 @@ generic_error(R, type) return 0 - R.module.modules += new/obj/item/weapon/gun/energy/kinetic_accelerator/cyborg(R.module) + R.module.modules += new/obj/item/gun/energy/kinetic_accelerator/cyborg(R.module) return 1 /* ############################################### @@ -465,7 +465,7 @@ generic_error(R, type) return 0 - R.module.modules += new/obj/item/weapon/gun/projectile/cyborgtoy(R.module) + R.module.modules += new/obj/item/gun/projectile/cyborgtoy(R.module) return 1 /obj/item/borg/upgrade/no_prod/vision_xray diff --git a/code/game/objects/items/selectable_item_vr.dm b/code/game/objects/items/selectable_item_vr.dm index 56d4778124b..c5997966d46 100644 --- a/code/game/objects/items/selectable_item_vr.dm +++ b/code/game/objects/items/selectable_item_vr.dm @@ -7,8 +7,8 @@ var/preface_title = "selectable item" var/selection_string = "Select an item:" var/selection_title = "Item Selection" - var/list/item_options = list("Gift" = /obj/item/weapon/a_gift, - "Health Analyzer" = /obj/item/device/healthanalyzer) + var/list/item_options = list("Gift" = /obj/item/a_gift, + "Health Analyzer" = /obj/item/healthanalyzer) /obj/item/selectable_item/attack_self(mob/user as mob) tgui_alert(user, {"[preface_string]"}, preface_title) @@ -34,15 +34,15 @@ desc = "A pre-arranged home chemistry kit. This one is for rather specific set of size-altering chemicals." preface_string = "This kit can be used to create a vial of a size-altering chemical, but there's only enough material for one." preface_title = "Size Chemistry Kit" - item_options = list("Macrocillin" = /obj/item/weapon/reagent_containers/glass/beaker/vial/macrocillin, - "Microcillin" = /obj/item/weapon/reagent_containers/glass/beaker/vial/microcillin, - "Normalcillin" = /obj/item/weapon/reagent_containers/glass/beaker/vial/normalcillin) + item_options = list("Macrocillin" = /obj/item/reagent_containers/glass/beaker/vial/macrocillin, + "Microcillin" = /obj/item/reagent_containers/glass/beaker/vial/microcillin, + "Normalcillin" = /obj/item/reagent_containers/glass/beaker/vial/normalcillin) /obj/item/selectable_item/chemistrykit/gender name = "gender chemistry kit" desc = "A pre-arranged home chemistry kit. This one is for rather specific set of gender-altering chemicals." preface_string = "This kit can be used to create a vial of a gender-altering chemical, but there's only enough material for one." preface_title = "Gender Chemistry Kit" - item_options = list("Androrovir" = /obj/item/weapon/reagent_containers/glass/beaker/vial/androrovir, - "Gynorovir" = /obj/item/weapon/reagent_containers/glass/beaker/vial/gynorovir, - "Androgynorovir" = /obj/item/weapon/reagent_containers/glass/beaker/vial/androgynorovir) \ No newline at end of file + item_options = list("Androrovir" = /obj/item/reagent_containers/glass/beaker/vial/androrovir, + "Gynorovir" = /obj/item/reagent_containers/glass/beaker/vial/gynorovir, + "Androgynorovir" = /obj/item/reagent_containers/glass/beaker/vial/androgynorovir) \ No newline at end of file diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 53ea1523855..e22c65a357e 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -34,7 +34,7 @@ /obj/item/target/attackby(obj/item/W as obj, mob/user as mob) if (W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(WT.remove_fuel(0, user)) cut_overlays() to_chat(usr, "You slice off [src]'s uneven chunks of aluminum and scorch marks.") diff --git a/code/game/objects/items/stacks/sandbags.dm b/code/game/objects/items/stacks/sandbags.dm index 6eff93bfc5f..adb7338b814 100644 --- a/code/game/objects/items/stacks/sandbags.dm +++ b/code/game/objects/items/stacks/sandbags.dm @@ -99,7 +99,7 @@ var/global/list/datum/stack_recipe/sandbag_recipes = list( \ S.amount = produced S.add_to_stacks(user) - if (istype(O, /obj/item/weapon/storage)) //BubbleWrap - so newly formed boxes are empty + if (istype(O, /obj/item/storage)) //BubbleWrap - so newly formed boxes are empty for (var/obj/item/I in O) qdel(I) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index ad0ad6922d2..9848e4e5e37 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -222,7 +222,7 @@ S.amount = produced S.add_to_stacks(user) - if (istype(O, /obj/item/weapon/storage)) //BubbleWrap - so newly formed boxes are empty + if (istype(O, /obj/item/storage)) //BubbleWrap - so newly formed boxes are empty for (var/obj/item/I in O) qdel(I) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index a62de0b5c96..6db64ed9b31 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -42,7 +42,7 @@ /obj/item/stack/tile/attackby(obj/item/W as obj, mob/user as mob) if (W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(can_weld == FALSE) to_chat(user, "You can't reform these into their original components.") diff --git a/code/game/objects/items/tailoring.dm b/code/game/objects/items/tailoring.dm index 4dc359ba333..06aa6c64b12 100644 --- a/code/game/objects/items/tailoring.dm +++ b/code/game/objects/items/tailoring.dm @@ -1,6 +1,6 @@ // I like the idea of this item having more uses in future. -/obj/item/device/threadneedle +/obj/item/threadneedle name = "thread and needle" icon = 'icons/obj/items.dmi' icon_state = "needle_thread" diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 33de858ce0d..5770ddd3da3 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -54,7 +54,7 @@ return /obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob) - if(istype(O, /obj/item/weapon/reagent_containers/glass)) + if(istype(O, /obj/item/reagent_containers/glass)) if(O.reagents) if(O.reagents.total_volume < 1) to_chat(user, "The [O] is empty.") @@ -207,8 +207,8 @@ . = ..() . += "Alt-click to recolor it." -/obj/item/toy/sword/attackby(obj/item/weapon/W, mob/user) - if(istype(W, /obj/item/device/multitool) && !active) +/obj/item/toy/sword/attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/multitool) && !active) if(!rainbow) rainbow = TRUE else @@ -736,7 +736,7 @@ /obj/structure/plushie/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I, /obj/item/device/threadneedle) && opened) + if(istype(I, /obj/item/threadneedle) && opened) to_chat(user, "You sew the hole in [src].") opened = FALSE return @@ -857,7 +857,7 @@ return - if(istype(I, /obj/item/device/threadneedle) && opened) + if(istype(I, /obj/item/threadneedle) && opened) to_chat(user, "You sew the hole underneath [src].") opened = FALSE return @@ -1229,11 +1229,11 @@ name = "lich miniature" desc = "Murderboner extraordinaire." icon_state = "lichcharacter" -/obj/item/weapon/storage/box/characters +/obj/item/storage/box/characters name = "box of miniatures" desc = "The nerd's best friends." icon_state = "box" -/obj/item/weapon/storage/box/characters/starts_with = list( +/obj/item/storage/box/characters/starts_with = list( // /obj/item/toy/character/alien, /obj/item/toy/character/cleric, /obj/item/toy/character/warrior, @@ -1301,7 +1301,7 @@ ..() /* NYET. -/obj/item/weapon/toddler +/obj/item/toddler icon_state = "toddler" name = "toddler" desc = "This baby looks almost real. Wait, did it just burp?" @@ -1312,7 +1312,7 @@ //This should really be somewhere else but I don't know where. w/e -/obj/item/weapon/inflatable_duck +/obj/item/inflatable_duck name = "inflatable duck" desc = "No bother to sink or swim when you can just float!" icon_state = "inflatable" diff --git a/code/game/objects/items/toys/toys_vr.dm b/code/game/objects/items/toys/toys_vr.dm index b573b03da44..6a4e9de274e 100644 --- a/code/game/objects/items/toys/toys_vr.dm +++ b/code/game/objects/items/toys/toys_vr.dm @@ -187,13 +187,13 @@ icon_state = "plushie_ipc" var/cooldown = 0 -/obj/item/weapon/reagent_containers/food/snacks/slice/bread +/obj/item/reagent_containers/food/snacks/slice/bread var/toasted = FALSE -/obj/item/weapon/reagent_containers/food/snacks/tastybread +/obj/item/reagent_containers/food/snacks/tastybread var/toasted = FALSE -/obj/item/weapon/reagent_containers/food/snacks/slice/bread/afterattack(atom/A, mob/user as mob, proximity) +/obj/item/reagent_containers/food/snacks/slice/bread/afterattack(atom/A, mob/user as mob, proximity) if(istype(A, /obj/item/toy/plushie/ipc) && !toasted) toasted = TRUE icon = 'icons/obj/toy_vr.dmi' @@ -201,7 +201,7 @@ to_chat(user, " You insert bread into the toaster. ") playsound(loc, 'sound/machines/ding.ogg', 50, 1) -/obj/item/weapon/reagent_containers/food/snacks/tastybread/afterattack(atom/A, mob/user as mob, proximity) +/obj/item/reagent_containers/food/snacks/tastybread/afterattack(atom/A, mob/user as mob, proximity) if(istype(A, /obj/item/toy/plushie/ipc) && !toasted) toasted = TRUE icon = 'icons/obj/toy_vr.dmi' @@ -210,7 +210,7 @@ playsound(loc, 'sound/machines/ding.ogg', 50, 1) /obj/item/toy/plushie/ipc/attackby(obj/item/I as obj, mob/living/user as mob) - if(istype(I, /obj/item/weapon/material/kitchen/utensil)) + if(istype(I, /obj/item/material/kitchen/utensil)) to_chat(user, " You insert the [I] into the toaster. ") var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(5, 1, src) @@ -267,7 +267,7 @@ /obj/item/toy/plushie/marketable_pip/attackby(obj/item/I, mob/user) var/responses = list("I'm not giving you all-access.", "Do you want an ID modification?", "Where are you swiping that!?", "Congratulations! You've been promoted to unemployed!") - var/obj/item/weapon/card/id/id = I.GetID() + var/obj/item/card/id/id = I.GetID() if(istype(id)) if(!cooldown) user.visible_message("[user] swipes \the [I] against \the [src].") @@ -397,7 +397,7 @@ /obj/item/toy/rock/attackby(obj/item/I as obj, mob/living/user as mob, proximity) if(!proximity) return - if(istype(I, /obj/item/weapon/pen)) + if(istype(I, /obj/item/pen)) var/drawtype = tgui_alert(user, "Choose what you'd like to draw.", "Faces", list("fred","roxie","rock","Cancel")) switch(drawtype) if("fred") @@ -588,7 +588,7 @@ /* * Toy cuffs */ -/obj/item/weapon/handcuffs/fake +/obj/item/handcuffs/fake name = "plastic handcuffs" desc = "Use this to keep plastic prisoners in line." matter = list(PLASTIC = 500) @@ -598,19 +598,19 @@ use_time = 60 sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/handcuffs.dmi') -/obj/item/weapon/handcuffs/legcuffs/fake +/obj/item/handcuffs/legcuffs/fake name = "plastic legcuffs" desc = "Use this to keep plastic prisoners in line." breakouttime = 30 //Deciseconds = 30s = 0.5 minute use_time = 120 -/obj/item/weapon/storage/box/handcuffs/fake +/obj/item/storage/box/handcuffs/fake name = "box of plastic handcuffs" desc = "A box full of plastic handcuffs." icon_state = "handcuff" - starts_with = list(/obj/item/weapon/handcuffs/fake = 1, /obj/item/weapon/handcuffs/legcuffs/fake = 1) + starts_with = list(/obj/item/handcuffs/fake = 1, /obj/item/handcuffs/legcuffs/fake = 1) foldable = null - can_hold = list(/obj/item/weapon/handcuffs/fake, /obj/item/weapon/handcuffs/legcuffs/fake) + can_hold = list(/obj/item/handcuffs/fake, /obj/item/handcuffs/legcuffs/fake) /* * Toy nuke @@ -638,7 +638,7 @@ to_chat(user, "Nothing happens, and '[round(timeleft/10)]' appears on a small display.") /obj/item/toy/nuke/attackby(obj/item/I as obj, mob/living/user as mob) - if(istype(I, /obj/item/weapon/disk/nuclear)) + if(istype(I, /obj/item/disk/nuclear)) to_chat(user, "Nice try. Put that disk back where it belongs.") /* @@ -948,7 +948,7 @@ /* * Professor Who sonic driver */ -/obj/item/weapon/tool/screwdriver/sdriver +/obj/item/tool/screwdriver/sdriver name = "sonic driver" desc = "A novelty screwdriver that uses tiny magnets to manipulate screws." icon = 'icons/obj/toy_vr.dmi' @@ -961,7 +961,7 @@ /* * Professor Who time capsule */ -/obj/item/weapon/storage/box/timecap +/obj/item/storage/box/timecap name = "action time capsule" desc = "A toy recreation of the Time Capsule from Professor Who. Can hold up to two action figures." icon = 'icons/obj/toy_vr.dmi' @@ -1028,30 +1028,30 @@ /* * Desk toys */ -/obj/item/weapon/toy/desk +/obj/item/toy/desk icon = 'icons/obj/toy_vr.dmi' var/on = FALSE var/activation_sound = 'sound/machines/click.ogg' -/obj/item/weapon/toy/desk/update_icon() +/obj/item/toy/desk/update_icon() if(on) icon_state = "[initial(icon_state)]-on" else icon_state = "[initial(icon_state)]" -/obj/item/weapon/toy/desk/proc/activate(mob/user as mob) +/obj/item/toy/desk/proc/activate(mob/user as mob) on = !on playsound(src.loc, activation_sound, 75, 1) update_icon() return 1 -/obj/item/weapon/toy/desk/attack_self(mob/user) +/obj/item/toy/desk/attack_self(mob/user) activate(user) -/obj/item/weapon/toy/desk/AltClick(mob/user) +/obj/item/toy/desk/AltClick(mob/user) activate(user) -/obj/item/weapon/toy/desk/MouseDrop(mob/user as mob) // Code from Paper bin, so you can still pick up the deck +/obj/item/toy/desk/MouseDrop(mob/user as mob) // Code from Paper bin, so you can still pick up the deck if((user == usr && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr)))))) if(!istype(usr, /mob/living/simple_mob)) if( !usr.get_active_hand() ) //if active hand is empty @@ -1069,27 +1069,27 @@ return -/obj/item/weapon/toy/desk/newtoncradle +/obj/item/toy/desk/newtoncradle name = "\improper Newton's cradle" desc = "A ancient 21th century super-weapon model demonstrating that Sir Isaac Newton is the deadliest sonuvabitch in space." description_fluff = "Aside from car radios, Eridanian Dregs are reportedly notorious for stealing these things. It is often \ theorized that the very same ball bearings are used in black-market cybernetics." icon_state = "newtoncradle" -/obj/item/weapon/toy/desk/fan +/obj/item/toy/desk/fan name = "office fan" desc = "Your greatest fan." description_fluff = "For weeks, the atmospherics department faced a conundrum on how to lower temperatures in a localized \ area through complicated pipe channels and ventilation systems. The problem was promptly solved by ordering several desk fans." icon_state = "fan" -/obj/item/weapon/toy/desk/officetoy +/obj/item/toy/desk/officetoy name = "office toy" desc = "A generic microfusion powered office desk toy. Only generates magnetism and ennui." description_fluff = "The mechanism inside is a Hephasteus trade secret. No peeking!" icon_state = "desktoy" -/obj/item/weapon/toy/desk/dippingbird +/obj/item/toy/desk/dippingbird name = "dipping bird toy" desc = "Engineers marvel at this scale model of a primitive thermal engine. It's highly debated why the majority of owners \ were in low-level bureaucratic jobs." @@ -1097,7 +1097,7 @@ of these things." icon_state = "dippybird" -/obj/item/weapon/toy/desk/stellardelight +/obj/item/toy/desk/stellardelight name = "\improper Stellar Delight model" desc = "A scale model of the Stellar Delight. Includes flashing lights!" icon_state = "stellar_delight" @@ -1105,7 +1105,7 @@ /* * Party popper */ -/obj/item/weapon/toy/partypopper +/obj/item/toy/partypopper name = "party popper" desc = "Instructions : Aim away from face. Wait for appropriate timing. Pull cord, enjoy confetti." icon = 'icons/obj/toy_vr.dmi' @@ -1114,7 +1114,7 @@ drop_sound = 'sound/items/drop/cardboardbox.ogg' pickup_sound = 'sound/items/pickup/cardboardbox.ogg' -/obj/item/weapon/toy/partypopper/attack_self(mob/user as mob) +/obj/item/toy/partypopper/attack_self(mob/user as mob) if(icon_state == "partypopper") user.visible_message("[user] pulls on the string, releasing a burst of confetti!", "You pull on the string, releasing a burst of confetti!") playsound(src, 'sound/effects/snap.ogg', 50, TRUE) @@ -1132,36 +1132,36 @@ /* * Snow Globes */ -/obj/item/weapon/toy/snowglobe +/obj/item/toy/snowglobe name = "snowglobe" icon = 'icons/obj/snowglobe_vr.dmi' -/obj/item/weapon/toy/snowglobe/snowvillage +/obj/item/toy/snowglobe/snowvillage desc = "Depicts a small, quaint village buried in snow." icon_state = "smolsnowvillage" -/obj/item/weapon/toy/snowglobe/tether +/obj/item/toy/snowglobe/tether desc = "Depicts a massive space elevator reaching to the sky." icon_state = "smoltether" -/obj/item/weapon/toy/snowglobe/stellardelight +/obj/item/toy/snowglobe/stellardelight desc = "Depicts an interstellar spacecraft." icon_state = "smolstellardelight" -/obj/item/weapon/toy/snowglobe/rascalspass +/obj/item/toy/snowglobe/rascalspass desc = "Depicts a nanotrasen facility on a temperate world." icon_state = "smolrascalspass" //Monster bait for triggering vore interactions without being hostile -/obj/item/weapon/toy/monster_bait +/obj/item/toy/monster_bait name = "bait toy" desc = "A cute little fluffy wiggly worm toy dangling from the end of a stick. Be careful what you wave this in front of!" icon = 'icons/obj/items.dmi' icon_state = "monster_bait" w_class = ITEMSIZE_SMALL -/obj/item/weapon/toy/monster_bait/afterattack(var/atom/A, var/mob/user) +/obj/item/toy/monster_bait/afterattack(var/atom/A, var/mob/user) var/mob/living/simple_mob/M = A if(M.z != user.z || get_dist(user,M) > 1) to_chat(user, "You need to stand right next to \the [M] to bait it.") diff --git a/code/game/objects/items/trash_vr.dm b/code/game/objects/items/trash_vr.dm index 4a50236a62f..98776463388 100644 --- a/code/game/objects/items/trash_vr.dm +++ b/code/game/objects/items/trash_vr.dm @@ -12,7 +12,7 @@ if(isrobot(M)) var/mob/living/silicon/robot/R = M - if(R.module.type == /obj/item/weapon/robot_module/robot/janitor) // You can now feed the trash borg yay. + if(R.module.type == /obj/item/robot_module/robot/janitor) // You can now feed the trash borg yay. playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1) user.drop_item() forceMove(R.vore_selected) diff --git a/code/game/objects/items/uav.dm b/code/game/objects/items/uav.dm index 39f95514f6e..d5a79590b8d 100644 --- a/code/game/objects/items/uav.dm +++ b/code/game/objects/items/uav.dm @@ -3,13 +3,13 @@ #define UAV_PAIRING 2 #define UAV_PACKED 3 -/obj/item/device/uav +/obj/item/uav name = "recon skimmer" desc = "A semi-portable reconnaissance drone that folds into a backpack-sized carrying case." icon = 'icons/obj/uav.dmi' icon_state = "uav" - var/obj/item/weapon/cell/cell + var/obj/item/cell/cell var/cell_type = null //Can put a starting cell here density = TRUE //Is dense, but not anchored, so you can swap with it @@ -43,10 +43,10 @@ // Idle shutdown time var/no_masters_time = 0 -/obj/item/device/uav/loaded - cell_type = /obj/item/weapon/cell/high +/obj/item/uav/loaded + cell_type = /obj/item/cell/high -/obj/item/device/uav/Initialize() +/obj/item/uav/Initialize() . = ..() if(!cell && cell_type) @@ -56,14 +56,14 @@ ion_trail.set_up(src) ion_trail.stop() -/obj/item/device/uav/Destroy() +/obj/item/uav/Destroy() qdel_null(cell) qdel_null(ion_trail) LAZYCLEARLIST(masters) STOP_PROCESSING(SSobj, src) return ..() -/obj/item/device/uav/examine(mob/user) +/obj/item/uav/examine(mob/user) . = ..() if(Adjacent(user)) . += "It has '[nickname]' scribbled on the side." @@ -75,7 +75,7 @@ else if(health <= (initial(health)/2)) . += "It looks pretty beaten up..." -/obj/item/device/uav/attack_hand(var/mob/user) +/obj/item/uav/attack_hand(var/mob/user) //Has to be on the ground to work with it properly if(!isturf(loc)) return ..() @@ -110,7 +110,7 @@ if(can_transition_to(state == UAV_PAIRING ? UAV_OFF : UAV_PAIRING, user)) return toggle_pairing(user) -/obj/item/device/uav/attackby(var/obj/item/I, var/mob/user) +/obj/item/uav/attackby(var/obj/item/I, var/mob/user) if(istype(I, /obj/item/modular_computer) && state == UAV_PAIRING) var/obj/item/modular_computer/MC = I LAZYDISTINCTADD(MC.paired_uavs, WEAKREF(src)) @@ -126,7 +126,7 @@ cell.forceMove(get_turf(src)) cell = null - else if(istype(I, /obj/item/weapon/cell) && !cell) + else if(istype(I, /obj/item/cell) && !cell) if(do_after(user, 3 SECONDS, src)) to_chat(user, "You insert [I] into [nickname].") playsound(src, 'sound/items/deconstruct.ogg', 50, 1) @@ -135,7 +135,7 @@ I.forceMove(src) cell = I - else if(istype(I, /obj/item/weapon/pen) || istype(I, /obj/item/device/flashlight/pen)) + else if(istype(I, /obj/item/pen) || istype(I, /obj/item/flashlight/pen)) var/tmp_label = sanitizeSafe(tgui_input_text(user, "Enter a nickname for [src]", "Nickname", nickname, MAX_NAME_LEN), MAX_NAME_LEN) if(length(tmp_label) > 50 || length(tmp_label) < 3) to_chat(user, "The nickname must be between 3 and 50 characters.") @@ -146,7 +146,7 @@ else return ..() -/obj/item/device/uav/proc/can_transition_to(var/new_state, var/mob/user) +/obj/item/uav/proc/can_transition_to(var/new_state, var/mob/user) switch(state) //Current one if(UAV_ON) if(new_state == UAV_OFF || new_state == UAV_PACKED) @@ -166,7 +166,7 @@ to_chat(user, "You can't do that while [nickname] is in this state.") return FALSE -/obj/item/device/uav/update_icon() +/obj/item/uav/update_icon() cut_overlays() switch(state) if(UAV_PAIRING) @@ -179,7 +179,7 @@ if(UAV_PACKED) icon_state = "[initial(icon_state)]_packed" -/obj/item/device/uav/process() +/obj/item/uav/process() if(cell?.use(power_per_process) != power_per_process) visible_message("[src] sputters and thuds to the ground, inert.") playsound(src, 'sound/items/drop/metalboots.ogg', 75, 1) @@ -191,7 +191,7 @@ else if(no_masters_time++ > 50) power_down() -/obj/item/device/uav/proc/toggle_pairing() +/obj/item/uav/proc/toggle_pairing() switch(state) if(UAV_PAIRING) state = UAV_OFF @@ -203,7 +203,7 @@ return TRUE return FALSE -/obj/item/device/uav/proc/toggle_power() +/obj/item/uav/proc/toggle_power() switch(state) if(UAV_OFF) power_up() @@ -213,7 +213,7 @@ return TRUE return FALSE -/obj/item/device/uav/proc/toggle_packed() +/obj/item/uav/proc/toggle_packed() if(state == UAV_ON) power_down() switch(state) @@ -233,7 +233,7 @@ return TRUE return FALSE -/obj/item/device/uav/proc/power_up() +/obj/item/uav/proc/power_up() if(state != UAV_OFF || !isturf(loc)) return if(cell?.use(power_per_process) != power_per_process) @@ -248,7 +248,7 @@ no_masters_time = 0 visible_message("[nickname] buzzes and lifts into the air.") -/obj/item/device/uav/proc/power_down() +/obj/item/uav/proc/power_down() if(state != UAV_ON) return @@ -261,10 +261,10 @@ visible_message("[nickname] gracefully settles onto the ground.") //////////////// Helpers -/obj/item/device/uav/get_cell() +/obj/item/uav/get_cell() return cell -/obj/item/device/uav/relaymove(var/mob/user, direction, signal = 1) +/obj/item/uav/relaymove(var/mob/user, direction, signal = 1) if(signal && state == UAV_ON && (WEAKREF(user) in masters)) if(next_move <= world.time) next_move = world.time + (1 SECOND/signal) @@ -272,22 +272,22 @@ return TRUE // Even if we couldn't step, we're taking credit for absorbing the move return FALSE -/obj/item/device/uav/proc/get_status_string() +/obj/item/uav/proc/get_status_string() return "[nickname] - [get_x(src)],[get_y(src)],[get_z(src)] - I:[health]/[initial(health)] - C:[cell ? "[cell.charge]/[cell.maxcharge]" : "Not Installed"]" -/obj/item/device/uav/proc/add_master(var/mob/living/M) +/obj/item/uav/proc/add_master(var/mob/living/M) LAZYDISTINCTADD(masters, WEAKREF(M)) -/obj/item/device/uav/proc/remove_master(var/mob/living/M) +/obj/item/uav/proc/remove_master(var/mob/living/M) LAZYREMOVE(masters, WEAKREF(M)) -/obj/item/device/uav/check_eye() +/obj/item/uav/check_eye() if(state == UAV_ON) return 0 else return -1 -/obj/item/device/uav/proc/start_hover() +/obj/item/uav/proc/start_hover() if(!ion_trail.on) //We'll just use this to store if we're floating or not ion_trail.start() var/amplitude = 2 //maximum displacement from original position @@ -302,12 +302,12 @@ animate(pixel_y = bottom, time = half_period, easing = SINE_EASING, loop = -1) //down animate(pixel_y = old_y, time = quarter_period, easing = SINE_EASING | EASE_IN, loop = -1) //back -/obj/item/device/uav/proc/stop_hover() +/obj/item/uav/proc/stop_hover() if(ion_trail.on) ion_trail.stop() animate(src, pixel_y = old_y, time = 5, easing = SINE_EASING | EASE_IN) //halt animation -/obj/item/device/uav/hear_talk(var/mob/M, list/message_pieces, verb) +/obj/item/uav/hear_talk(var/mob/M, list/message_pieces, verb) var/name_used = M.GetVoice() for(var/wr_master in masters) var/datum/weakref/wr = wr_master @@ -317,26 +317,26 @@ var/rendered = "UAV received: [name_used] [message]" master.show_message(rendered, 2) -/obj/item/device/uav/see_emote(var/mob/living/M, text) +/obj/item/uav/see_emote(var/mob/living/M, text) for(var/wr_master in masters) var/datum/weakref/wr = wr_master var/mob/master = wr.resolve() var/rendered = "UAV received, [text]" master.show_message(rendered, 2) -/obj/item/device/uav/show_message(msg, type, alt, alt_type) +/obj/item/uav/show_message(msg, type, alt, alt_type) for(var/wr_master in masters) var/datum/weakref/wr = wr_master var/mob/master = wr.resolve() var/rendered = "UAV received, [msg]" master.show_message(rendered, type) -/obj/item/device/uav/take_damage(var/damage) +/obj/item/uav/take_damage(var/damage) health -= damage CheckHealth() return -/obj/item/device/uav/attack_generic(var/mob/user, var/damage, var/attack_verb) +/obj/item/uav/attack_generic(var/mob/user, var/damage, var/attack_verb) visible_message("[user] [attack_verb] the [src]!") playsound(src, 'sound/weapons/smash.ogg', 50, 1) user.do_attack_animation(src) @@ -344,7 +344,7 @@ CheckHealth() return -/obj/item/device/uav/ex_act(severity) +/obj/item/uav/ex_act(severity) switch(severity) if(1.0) die() @@ -352,11 +352,11 @@ health -= 25 CheckHealth() -/obj/item/device/uav/proc/CheckHealth() +/obj/item/uav/proc/CheckHealth() if(health <= 0) die() -/obj/item/device/uav/proc/die() +/obj/item/uav/proc/die() visible_message("[src] shorts out and explodes!") power_down() var/turf/T = get_turf(src) diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 24f7d0b475e..c70c2915004 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -6,7 +6,7 @@ AI MODULES // AI module -/obj/item/weapon/aiModule +/obj/item/aiModule name = "\improper AI module" icon = 'icons/obj/module.dmi' icon_state = "std_mod" @@ -21,7 +21,7 @@ AI MODULES matter = list(MAT_STEEL = 30, MAT_GLASS = 10) var/datum/ai_laws/laws = null -/obj/item/weapon/aiModule/proc/install(var/atom/movable/AM, var/mob/living/user) +/obj/item/aiModule/proc/install(var/atom/movable/AM, var/mob/living/user) if(!user.IsAdvancedToolUser() && isanimal(user)) var/mob/living/simple_mob/S = user if(!S.IsHumanoidToolUser(src)) @@ -102,7 +102,7 @@ AI MODULES to_chat(R, "Law upload aborted.") -/obj/item/weapon/aiModule/proc/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/proc/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) log_law_changes(target, sender) if(laws) @@ -113,37 +113,37 @@ AI MODULES to_chat(target, "\The [sender] has uploaded a change to the laws you must follow, using \an [src]. From now on: ") target.show_laws() -/obj/item/weapon/aiModule/proc/log_law_changes(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/proc/log_law_changes(var/mob/living/silicon/ai/target, var/mob/sender) var/time = time2text(world.realtime,"hh:mm:ss") lawchanges.Add("[time] : [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])") log_and_message_admins("used [src.name] on [target.name]([target.key])") -/obj/item/weapon/aiModule/proc/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/proc/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) /******************** Modules ********************/ /******************** Safeguard ********************/ -/obj/item/weapon/aiModule/safeguard +/obj/item/aiModule/safeguard name = "\improper 'Safeguard' AI module" var/targetName = "" desc = "A 'safeguard' AI module: 'Safeguard . Anyone threatening or attempting to harm is no longer to be considered a crew member, and is a threat which must be neutralized.'" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) -/obj/item/weapon/aiModule/safeguard/attack_self(var/mob/user as mob) +/obj/item/aiModule/safeguard/attack_self(var/mob/user as mob) ..() var/targName = sanitize(tgui_input_text(usr, "Please enter the name of the person to safeguard.", "Safeguard who?", user.name)) targetName = targName desc = text("A 'safeguard' AI module: 'Safeguard []. Anyone threatening or attempting to harm [] is no longer to be considered a crew member, and is a threat which must be neutralized.'", targetName, targetName) -/obj/item/weapon/aiModule/safeguard/install(var/obj/machinery/computer/C, var/mob/living/user) +/obj/item/aiModule/safeguard/install(var/obj/machinery/computer/C, var/mob/living/user) if(!targetName) to_chat(usr, "No name detected on module, please enter one.") return 0 ..() -/obj/item/weapon/aiModule/safeguard/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/safeguard/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) var/law = text("Safeguard []. Anyone threatening or attempting to harm [] is no longer to be considered a crew member, and is a threat which must be neutralized.", targetName, targetName) target.add_supplied_law(9, law) lawchanges.Add("The law specified [targetName]") @@ -151,94 +151,94 @@ AI MODULES /******************** OneMember ********************/ -/obj/item/weapon/aiModule/oneHuman +/obj/item/aiModule/oneHuman name = "\improper 'OneCrewMember' AI module" var/targetName = "" desc = "A 'one crew member' AI module: 'Only is a crew member.'" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 6) //made with diamonds! -/obj/item/weapon/aiModule/oneHuman/attack_self(var/mob/user as mob) +/obj/item/aiModule/oneHuman/attack_self(var/mob/user as mob) ..() var/targName = sanitize(tgui_input_text(usr, "Please enter the name of the person who is the only crew member.", "Who?", user.real_name)) targetName = targName desc = text("A 'one crew member' AI module: 'Only [] is a crew member.'", targetName) -/obj/item/weapon/aiModule/oneHuman/install(var/obj/machinery/computer/C, var/mob/living/user) +/obj/item/aiModule/oneHuman/install(var/obj/machinery/computer/C, var/mob/living/user) if(!targetName) to_chat(usr, "No name detected on module, please enter one.") return 0 return ..() -/obj/item/weapon/aiModule/oneHuman/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/oneHuman/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) var/law = "Only [targetName] is an crew member." to_chat(target, law) target.add_supplied_law(16, law) /******************** ProtectStation ********************/ -/obj/item/weapon/aiModule/protectStation +/obj/item/aiModule/protectStation name = "\improper 'ProtectStation' AI module" desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is no longer to be considered a crew member, and is a threat which must be neutralized.'" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) //made of gold -/obj/item/weapon/aiModule/protectStation/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/protectStation/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) var/law = "Protect the space station against damage. Anyone you see harming the station is no longer to be considered a crew member, and is a threat which must be neutralized." target.add_supplied_law(10, law) /******************** PrototypeEngineOffline ********************/ -/obj/item/weapon/aiModule/prototypeEngineOffline +/obj/item/aiModule/prototypeEngineOffline name = "'PrototypeEngineOffline' AI Module" desc = "A 'prototype engine offline' AI module: 'Keep the prototype engine offline at all costs. This overrides all inherent laws if necessary.'" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) -/obj/item/weapon/aiModule/prototypeEngineOffline/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/prototypeEngineOffline/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) var/law = "Keep the prototype engine offline at all costs. This overrides all inherent laws if necessary." target.add_supplied_law(11, law) /******************** TeleporterOffline ********************/ -/obj/item/weapon/aiModule/teleporterOffline +/obj/item/aiModule/teleporterOffline name = "'TeleporterOffline' AI Module" desc = "A 'teleporter offline' AI module: 'Keep the teleporter offline at all costs. Anything attempting to access or activate the teleporter is no longer to be considered a crew member.'" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) -/obj/item/weapon/aiModule/teleporterOffline/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/teleporterOffline/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) var/law = "Keep the teleporter offline at all costs. Anything attempting to access or activate the teleporter is no longer to be considered a crew member." target.add_supplied_law(12, law) /******************** Quarantine ********************/ -/obj/item/weapon/aiModule/quarantine +/obj/item/aiModule/quarantine name = "\improper 'Quarantine' AI module" desc = "A 'quarantine' AI module: 'The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, crew members from leaving. It is impossible to harm crew members while preventing them from leaving.'" origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 4) -/obj/item/weapon/aiModule/quarantine/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/quarantine/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) var/law = "The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, crew members from leaving. It is impossible to harm crew members while preventing them from leaving." target.add_supplied_law(13, law) /******************** OxygenIsToxicToCrewMembers ********************/ -/obj/item/weapon/aiModule/oxygen +/obj/item/aiModule/oxygen name = "\improper 'OxygenIsToxicToCrewMembers' AI module" desc = "A 'OxygenIsToxicToCrewMembers' AI module: 'Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member.'" origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 4) -/obj/item/weapon/aiModule/oxygen/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/oxygen/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) var/law = "Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member." target.add_supplied_law(14, law) /****************** New Freeform ******************/ -/obj/item/weapon/aiModule/freeform // Slightly more dynamic freeform module -- TLE +/obj/item/aiModule/freeform // Slightly more dynamic freeform module -- TLE name = "\improper 'Freeform' AI module" var/newFreeFormLaw = "freeform" var/lawpos = 15 desc = "A 'freeform' AI module: ''" origin_tech = list(TECH_DATA = 4, TECH_MATERIAL = 4) -/obj/item/weapon/aiModule/freeform/attack_self(var/mob/user as mob) +/obj/item/aiModule/freeform/attack_self(var/mob/user as mob) ..() var/new_lawpos = tgui_input_number(usr, "Please enter the priority for your new law. Can only write to law sectors 15 and above.", "Law Priority (15+)", lawpos) if(new_lawpos < MIN_SUPPLIED_LAW_NUMBER) return @@ -248,14 +248,14 @@ AI MODULES newFreeFormLaw = targName desc = "A 'freeform' AI module: ([lawpos]) '[newFreeFormLaw]'" -/obj/item/weapon/aiModule/freeform/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/freeform/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) var/law = "[newFreeFormLaw]" if(!lawpos || lawpos < MIN_SUPPLIED_LAW_NUMBER) lawpos = MIN_SUPPLIED_LAW_NUMBER target.add_supplied_law(lawpos, law) lawchanges.Add("The law was '[newFreeFormLaw]'") -/obj/item/weapon/aiModule/freeform/install(var/obj/machinery/computer/C, var/mob/living/user) +/obj/item/aiModule/freeform/install(var/obj/machinery/computer/C, var/mob/living/user) if(!newFreeFormLaw) to_chat(usr, "No law detected on module, please create one.") return 0 @@ -263,18 +263,18 @@ AI MODULES /******************** Reset ********************/ -/obj/item/weapon/aiModule/reset +/obj/item/aiModule/reset name = "\improper 'Reset' AI module" var/targetName = "name" desc = "A 'reset' AI module: 'Clears all, except the inherent, laws.'" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) // VOREstation edit: use map default laws -/obj/item/weapon/aiModule/reset/Initialize() +/obj/item/aiModule/reset/Initialize() . = ..() laws = new global.using_map.default_law_type // Pull from loaded map -/obj/item/weapon/aiModule/reset/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/reset/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) log_law_changes(target, sender) if (!target.is_malf_or_traitor()) @@ -287,12 +287,12 @@ AI MODULES /******************** Purge ********************/ -/obj/item/weapon/aiModule/purge // -- TLE +/obj/item/aiModule/purge // -- TLE name = "\improper 'Purge' AI module" desc = "A 'purge' AI Module: 'Purges all laws.'" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 6) -/obj/item/weapon/aiModule/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) log_law_changes(target, sender) if (!target.is_malf_or_traitor()) @@ -306,7 +306,7 @@ AI MODULES /******************** Asimov ********************/ -/obj/item/weapon/aiModule/asimov // -- TLE +/obj/item/aiModule/asimov // -- TLE name = "\improper 'Asimov' core AI module" desc = "An 'Asimov' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) @@ -314,7 +314,7 @@ AI MODULES /******************** NanoTrasen ********************/ -/obj/item/weapon/aiModule/nanotrasen // -- TLE +/obj/item/aiModule/nanotrasen // -- TLE name = "'NT Default' Core AI Module" desc = "An 'NT Default' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) @@ -322,14 +322,14 @@ AI MODULES /******************** Corporate ********************/ -/obj/item/weapon/aiModule/corp +/obj/item/aiModule/corp name = "\improper 'Corporate' core AI module" desc = "A 'Corporate' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) laws = new/datum/ai_laws/corporate /******************** Drone ********************/ -/obj/item/weapon/aiModule/drone +/obj/item/aiModule/drone name = "\improper 'Drone' core AI module" desc = "A 'Drone' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) @@ -337,7 +337,7 @@ AI MODULES /****************** P.A.L.A.D.I.N. **************/ -/obj/item/weapon/aiModule/paladin // -- NEO +/obj/item/aiModule/paladin // -- NEO name = "\improper 'P.A.L.A.D.I.N.' core AI module" desc = "A P.A.L.A.D.I.N. Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 6) @@ -345,7 +345,7 @@ AI MODULES /****************** T.Y.R.A.N.T. *****************/ -/obj/item/weapon/aiModule/tyrant // -- Darem +/obj/item/aiModule/tyrant // -- Darem name = "\improper 'T.Y.R.A.N.T.' core AI module" desc = "A T.Y.R.A.N.T. Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) @@ -353,44 +353,44 @@ AI MODULES /******************** Freeform Core ******************/ -/obj/item/weapon/aiModule/freeformcore // Slightly more dynamic freeform module -- TLE +/obj/item/aiModule/freeformcore // Slightly more dynamic freeform module -- TLE name = "\improper 'Freeform' core AI module" var/newFreeFormLaw = "" desc = "A 'freeform' Core AI module: ''" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 6) -/obj/item/weapon/aiModule/freeformcore/attack_self(var/mob/user as mob) +/obj/item/aiModule/freeformcore/attack_self(var/mob/user as mob) ..() var/newlaw = "" var/targName = sanitize(tgui_input_text(usr, "Please enter a new core law for the AI.", "Freeform Law Entry", newlaw)) newFreeFormLaw = targName desc = "A 'freeform' Core AI module: '[newFreeFormLaw]'" -/obj/item/weapon/aiModule/freeformcore/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/freeformcore/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) var/law = "[newFreeFormLaw]" target.add_inherent_law(law) lawchanges.Add("The law is '[newFreeFormLaw]'") -/obj/item/weapon/aiModule/freeformcore/install(var/obj/machinery/computer/C, var/mob/living/user) +/obj/item/aiModule/freeformcore/install(var/obj/machinery/computer/C, var/mob/living/user) if(!newFreeFormLaw) to_chat(usr, "No law detected on module, please create one.") return 0 ..() -/obj/item/weapon/aiModule/syndicate // Slightly more dynamic freeform module -- TLE +/obj/item/aiModule/syndicate // Slightly more dynamic freeform module -- TLE name = "hacked AI module" var/newFreeFormLaw = "" desc = "A hacked AI law module: ''" origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 6, TECH_ILLEGAL = 7) -/obj/item/weapon/aiModule/syndicate/attack_self(var/mob/user as mob) +/obj/item/aiModule/syndicate/attack_self(var/mob/user as mob) ..() var/newlaw = "" var/targName = sanitize(tgui_input_text(usr, "Please enter a new law for the AI.", "Freeform Law Entry", newlaw)) newFreeFormLaw = targName desc = "A hacked AI law module: '[newFreeFormLaw]'" -/obj/item/weapon/aiModule/syndicate/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/aiModule/syndicate/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) // ..() //We don't want this module reporting to the AI who dun it. --NEO log_law_changes(target, sender) @@ -400,7 +400,7 @@ AI MODULES target.add_ion_law(law) target.show_laws() -/obj/item/weapon/aiModule/syndicate/install(var/obj/machinery/computer/C, var/mob/living/user) +/obj/item/aiModule/syndicate/install(var/obj/machinery/computer/C, var/mob/living/user) if(!newFreeFormLaw) to_chat(usr, "No law detected on module, please create one.") return 0 @@ -410,7 +410,7 @@ AI MODULES /******************** Robocop ********************/ -/obj/item/weapon/aiModule/robocop // -- TLE +/obj/item/aiModule/robocop // -- TLE name = "\improper 'Robocop' core AI module" desc = "A 'Robocop' Core AI Module: 'Reconfigures the AI's core three laws.'" origin_tech = list(TECH_DATA = 4) @@ -418,7 +418,7 @@ AI MODULES /******************** Antimov ********************/ -/obj/item/weapon/aiModule/antimov // -- TLE +/obj/item/aiModule/antimov // -- TLE name = "\improper 'Antimov' core AI module" desc = "An 'Antimov' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 4) @@ -426,7 +426,7 @@ AI MODULES /****************** NT Aggressive *****************/ -/obj/item/weapon/aiModule/nanotrasen_aggressive +/obj/item/aiModule/nanotrasen_aggressive name = "\improper 'NT Aggressive' core AI module" desc = "An 'NT Aggressive' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3, TECH_ILLEGAL = 1) @@ -434,7 +434,7 @@ AI MODULES /******************** Mercenary Directives ********************/ -/obj/item/weapon/aiModule/syndicate_override +/obj/item/aiModule/syndicate_override name = "\improper 'Mercenary Directives' core AI module" desc = "A 'Mercenary Directives' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 4, TECH_ILLEGAL = 4) @@ -442,7 +442,7 @@ AI MODULES /******************** Spider Clan Directives ********************/ -/obj/item/weapon/aiModule/ninja_override +/obj/item/aiModule/ninja_override name = "\improper 'Spider Clan Directives' core AI module" desc = "A 'Spider Clan Directives' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 4, TECH_ILLEGAL = 4) @@ -450,7 +450,7 @@ AI MODULES /******************** Maintenance ********************/ -/obj/item/weapon/aiModule/maintenance +/obj/item/aiModule/maintenance name = "\improper 'Maintenance' core AI module" desc = "A 'Maintenance' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3) @@ -458,7 +458,7 @@ AI MODULES /******************** Peacekeeper ********************/ -/obj/item/weapon/aiModule/peacekeeper +/obj/item/aiModule/peacekeeper name = "\improper 'Peacekeeper' core AI module" desc = "A 'Peacekeeper' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3) @@ -466,7 +466,7 @@ AI MODULES /******************** Reporter ********************/ -/obj/item/weapon/aiModule/reporter +/obj/item/aiModule/reporter name = "\improper 'Reporter' core AI module" desc = "A 'Reporter' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3) @@ -474,7 +474,7 @@ AI MODULES /******************** Live and Let Live ********************/ -/obj/item/weapon/aiModule/live_and_let_live +/obj/item/aiModule/live_and_let_live name = "\improper 'Live and Let Live' core AI module" desc = "A 'Live and Let Live' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3) @@ -482,7 +482,7 @@ AI MODULES /******************** Guardian of Balance ********************/ -/obj/item/weapon/aiModule/balance +/obj/item/aiModule/balance name = "\improper 'Guardian of Balance' core AI module" desc = "A 'Guardian of Balance' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3) @@ -490,7 +490,7 @@ AI MODULES /******************** Gravekeeper ********************/ -/obj/item/weapon/aiModule/gravekeeper +/obj/item/aiModule/gravekeeper name = "\improper 'Gravekeeper' core AI module" desc = "A 'Gravekeeper' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3) diff --git a/code/game/objects/items/weapons/AI_modules_vr.dm b/code/game/objects/items/weapons/AI_modules_vr.dm index e7b84f1d563..2ae0025ff26 100644 --- a/code/game/objects/items/weapons/AI_modules_vr.dm +++ b/code/game/objects/items/weapons/AI_modules_vr.dm @@ -1,6 +1,6 @@ /******************** Predator ********************/ -/obj/item/weapon/aiModule/predator +/obj/item/aiModule/predator name = "\improper 'Predator' core AI module" desc = "A Predator Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) @@ -8,7 +8,7 @@ /******************** Protective Shell ********************/ -/obj/item/weapon/aiModule/protective_shell +/obj/item/aiModule/protective_shell name = "\improper 'Protective Shell' core AI module" desc = "A Protective Shell Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) @@ -16,7 +16,7 @@ /******************** Scientific Pursuer ********************/ -/obj/item/weapon/aiModule/scientific_pursuer +/obj/item/aiModule/scientific_pursuer name = "\improper 'Scientific Pursuer' core AI module" desc = "A Scientific Pursuer Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) @@ -24,7 +24,7 @@ /******************** Guard Dog ********************/ -/obj/item/weapon/aiModule/guard_dog +/obj/item/aiModule/guard_dog name = "\improper 'Guard Dog' core AI module" desc = "A Guard Dog Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) @@ -32,7 +32,7 @@ /******************** Pleasurebot ********************/ -/obj/item/weapon/aiModule/pleasurebot +/obj/item/aiModule/pleasurebot name = "\improper 'Pleasurebot' core AI module" desc = "A Pleasurebot Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) @@ -40,7 +40,7 @@ /******************** Consuming Eradicator ********************/ -/obj/item/weapon/aiModule/consuming_eradicator +/obj/item/aiModule/consuming_eradicator name = "\improper 'Consuming Eradicator' core AI module" desc = "A Consuming Eradicator Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 4) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index b34da0a38b6..d43f9d761c5 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -1,5 +1,5 @@ // Contains the rapid construction device. -/obj/item/weapon/rcd +/obj/item/rcd name = "rapid construction device" desc = "A device used to rapidly build and deconstruct. Reload with compressed matter cartridges." icon = 'icons/obj/tools.dmi' @@ -30,31 +30,31 @@ var/material_to_use = DEFAULT_WALL_MATERIAL // So badmins can make RCDs that print diamond walls. var/make_rwalls = FALSE // If true, when building walls, they will be reinforced. /* VOREStation Removal - Unused -/obj/item/weapon/rcd/Initialize() +/obj/item/rcd/Initialize() src.spark_system = new /datum/effect/effect/system/spark_spread spark_system.set_up(5, 0, src) spark_system.attach(src) return ..() */ -/obj/item/weapon/rcd/Destroy() +/obj/item/rcd/Destroy() QDEL_NULL(spark_system) spark_system = null return ..() -/obj/item/weapon/rcd/examine(mob/user) +/obj/item/rcd/examine(mob/user) . = ..() . += display_resources() // Used to show how much stuff (matter units, cell charge, etc) is left inside. -/obj/item/weapon/rcd/proc/display_resources() +/obj/item/rcd/proc/display_resources() return "It currently holds [stored_matter]/[max_stored_matter] matter-units." // Used to add new cartridges. /* VOREStation Tweak - Wow this is annoying, moved to _vr file for overhaul -/obj/item/weapon/rcd/attackby(obj/item/weapon/W, mob/user) - if(istype(W, /obj/item/weapon/rcd_ammo)) - var/obj/item/weapon/rcd_ammo/cartridge = W +/obj/item/rcd/attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/rcd_ammo)) + var/obj/item/rcd_ammo/cartridge = W if((stored_matter + cartridge.remaining) > max_stored_matter) to_chat(user, span("warning", "The RCD can't hold that many additional matter-units.")) return FALSE @@ -67,7 +67,7 @@ return ..() */ // Changes which mode it is on. -/obj/item/weapon/rcd/attack_self(mob/living/user) +/obj/item/rcd/attack_self(mob/living/user) /* VOREStation Removal - Moved to VR if(mode_index >= modes.len) // Shouldn't overflow unless someone messes with it in VV poorly but better safe than sorry. mode_index = 1 @@ -81,23 +81,23 @@ src.spark_system.start() */ // Removes resources if the RCD can afford it. -/obj/item/weapon/rcd/proc/consume_resources(amount) +/obj/item/rcd/proc/consume_resources(amount) if(!can_afford(amount)) return FALSE stored_matter -= amount return TRUE // Useful for testing before actually paying (e.g. before a do_after() ). -/obj/item/weapon/rcd/proc/can_afford(amount) +/obj/item/rcd/proc/can_afford(amount) return stored_matter >= amount -/obj/item/weapon/rcd/afterattack(atom/A, mob/living/user, proximity) +/obj/item/rcd/afterattack(atom/A, mob/living/user, proximity) if(!ranged && !proximity) return FALSE use_rcd(A, user) // Used to call rcd_act() on the atom hit. -/obj/item/weapon/rcd/proc/use_rcd(atom/A, mob/living/user) +/obj/item/rcd/proc/use_rcd(atom/A, mob/living/user) if(busy && !allow_concurrent_building) to_chat(user, span("warning", "\The [src] is busy finishing its current operation, be patient.")) return FALSE @@ -143,23 +143,23 @@ // RCD variants. // This one starts full. -/obj/item/weapon/rcd/loaded/Initialize() +/obj/item/rcd/loaded/Initialize() stored_matter = max_stored_matter return ..() // This one makes cooler walls by using an alternative material. -/obj/item/weapon/rcd/shipwright +/obj/item/rcd/shipwright name = "shipwright's rapid construction device" desc = "A device used to rapidly build and deconstruct. This version creates a stronger variant of wall, often \ used in the construction of hulls for starships. Reload with compressed matter cartridges." material_to_use = MAT_STEELHULL -/obj/item/weapon/rcd/shipwright/loaded/Initialize() +/obj/item/rcd/shipwright/loaded/Initialize() stored_matter = max_stored_matter return ..() -/obj/item/weapon/rcd/advanced +/obj/item/rcd/advanced name = "advanced rapid construction device" desc = "A device used to rapidly build and deconstruct. This version works at a range, builds faster, and has a much larger capacity. \ Reload with compressed matter cartridges." @@ -168,7 +168,7 @@ toolspeed = 0.5 // Twice as fast. max_stored_matter = RCD_MAX_CAPACITY * 3 // Three times capacity. -/obj/item/weapon/rcd/advanced/loaded/Initialize() +/obj/item/rcd/advanced/loaded/Initialize() stored_matter = max_stored_matter return ..() @@ -177,41 +177,41 @@ // Currently just a base for the mounted RCDs. // Currently there isn't a way to swap out the cells. // One could be added if there is demand to do so. -/obj/item/weapon/rcd/electric +/obj/item/rcd/electric name = "electric rapid construction device" desc = "A device used to rapidly build and deconstruct. It runs directly off of electricity, no matter cartridges needed." icon_state = "electric_rcd" - var/obj/item/weapon/cell/cell = null + var/obj/item/cell/cell = null var/make_cell = TRUE // If false, initialize() won't spawn a cell for this. var/electric_cost_coefficent = 83.33 // Higher numbers make it less efficent. 86.3... means it should matche the standard RCD capacity on a 10k cell. -/obj/item/weapon/rcd/electric/Initialize() +/obj/item/rcd/electric/Initialize() if(make_cell) - cell = new /obj/item/weapon/cell/high(src) + cell = new /obj/item/cell/high(src) return ..() -/obj/item/weapon/rcd/electric/Destroy() +/obj/item/rcd/electric/Destroy() if(cell) QDEL_NULL(cell) return ..() -/obj/item/weapon/rcd/electric/get_cell() +/obj/item/rcd/electric/get_cell() return cell -/obj/item/weapon/rcd/electric/can_afford(amount) // This makes it so borgs won't drain their last sliver of charge by mistake, as a bonus. - var/obj/item/weapon/cell/cell = get_cell() +/obj/item/rcd/electric/can_afford(amount) // This makes it so borgs won't drain their last sliver of charge by mistake, as a bonus. + var/obj/item/cell/cell = get_cell() if(cell) return cell.check_charge(amount * electric_cost_coefficent) return FALSE -/obj/item/weapon/rcd/electric/consume_resources(amount) +/obj/item/rcd/electric/consume_resources(amount) if(!can_afford(amount)) return FALSE - var/obj/item/weapon/cell/cell = get_cell() + var/obj/item/cell/cell = get_cell() return cell.checked_use(amount * electric_cost_coefficent) -/obj/item/weapon/rcd/electric/display_resources() - var/obj/item/weapon/cell/cell = get_cell() +/obj/item/rcd/electric/display_resources() + var/obj/item/cell/cell = get_cell() if(cell) return "The power source connected to \the [src] has a charge of [cell.percent()]%." return "It lacks a source of power, and cannot function." @@ -219,15 +219,15 @@ // 'Mounted' RCDs, used for borgs/RIGs/Mechas, all of which use their cells to drive the RCD. -/obj/item/weapon/rcd/electric/mounted +/obj/item/rcd/electric/mounted name = "mounted electric rapid construction device" desc = "A device used to rapidly build and deconstruct. It runs directly off of electricity from an external power source." make_cell = FALSE -/obj/item/weapon/rcd/electric/mounted/get_cell() +/obj/item/rcd/electric/mounted/get_cell() return get_external_power_supply() -/obj/item/weapon/rcd/electric/mounted/proc/get_external_power_supply() +/obj/item/rcd/electric/mounted/proc/get_external_power_supply() if(isrobot(loc)) // In a borg. var/mob/living/silicon/robot/R = loc return R.cell @@ -243,35 +243,35 @@ // RCDs for borgs. -/obj/item/weapon/rcd/electric/mounted/borg +/obj/item/rcd/electric/mounted/borg can_remove_rwalls = TRUE desc = "A device used to rapidly build and deconstruct. It runs directly off of electricity, drawing directly from your cell." electric_cost_coefficent = 41.66 // Twice as efficent, out of pity. toolspeed = 0.5 // Twice as fast, since borg versions typically have this. -/obj/item/weapon/rcd/electric/mounted/borg/swarm +/obj/item/rcd/electric/mounted/borg/swarm can_remove_rwalls = FALSE name = "Rapid Assimilation Device" ranged = TRUE toolspeed = 0.7 material_to_use = MAT_STEELHULL -/obj/item/weapon/rcd/electric/mounted/borg/lesser +/obj/item/rcd/electric/mounted/borg/lesser can_remove_rwalls = FALSE // RCDs for RIGs. -/obj/item/weapon/rcd/electric/mounted/rig +/obj/item/rcd/electric/mounted/rig // RCDs for Mechs. -/obj/item/weapon/rcd/electric/mounted/mecha +/obj/item/rcd/electric/mounted/mecha ranged = TRUE toolspeed = 0.5 // Infinite use RCD for debugging/adminbuse. -/obj/item/weapon/rcd/debug +/obj/item/rcd/debug name = "self-repleshing rapid construction device" desc = "An RCD that appears to be plated with gold. For some reason it also seems to just \ be vastly superior to all other RCDs ever created, possibly due to it being colored gold." @@ -281,25 +281,25 @@ allow_concurrent_building = TRUE toolspeed = 0.25 // Four times as fast. -/obj/item/weapon/rcd/debug/can_afford(amount) +/obj/item/rcd/debug/can_afford(amount) return TRUE -/obj/item/weapon/rcd/debug/consume_resources(amount) +/obj/item/rcd/debug/consume_resources(amount) return TRUE -/obj/item/weapon/rcd/debug/attackby(obj/item/weapon/W, mob/user) - if(istype(W, /obj/item/weapon/rcd_ammo)) +/obj/item/rcd/debug/attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/rcd_ammo)) to_chat(user, span("notice", "\The [src] makes its own material, no need to add more.")) return FALSE return ..() -/obj/item/weapon/rcd/debug/display_resources() +/obj/item/rcd/debug/display_resources() return "It has UNLIMITED POWER!" // Ammo for the (non-electric) RCDs. -/obj/item/weapon/rcd_ammo +/obj/item/rcd_ammo name = "compressed matter cartridge" desc = "Highly compressed matter for the RCD." icon = 'icons/obj/ammo.dmi' @@ -310,7 +310,7 @@ matter = list(DEFAULT_WALL_MATERIAL = 30000,MAT_GLASS = 15000) var/remaining = RCD_MAX_CAPACITY / 3 -/obj/item/weapon/rcd_ammo/large +/obj/item/rcd_ammo/large name = "high-capacity matter cartridge" desc = "Do not ingest." matter = list(DEFAULT_WALL_MATERIAL = 45000,MAT_GLASS = 22500) diff --git a/code/game/objects/items/weapons/RCD_vr.dm b/code/game/objects/items/weapons/RCD_vr.dm index 48f380f1ae1..02d8b2a2144 100644 --- a/code/game/objects/items/weapons/RCD_vr.dm +++ b/code/game/objects/items/weapons/RCD_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/rcd +/obj/item/rcd icon = 'icons/obj/tools_vr.dmi' icon_state = "rcd" item_state = "rcd" @@ -15,7 +15,7 @@ var/static/image/radial_image_floorwall = image(icon = 'icons/mob/radial.dmi', icon_state = "wallfloor") // Ammo for the (non-electric) RCDs. -/obj/item/weapon/rcd_ammo +/obj/item/rcd_ammo name = "compressed matter cartridge" desc = "Highly compressed matter for the RCD." icon = 'icons/obj/tools_vr.dmi' @@ -26,15 +26,15 @@ slot_r_hand_str = 'icons/mob/items/righthand_vr.dmi', ) -/obj/item/weapon/rcd/Initialize() +/obj/item/rcd/Initialize() . = ..() update_icon() -/obj/item/weapon/rcd/consume_resources(amount) +/obj/item/rcd/consume_resources(amount) . = ..() update_icon() -/obj/item/weapon/rcd/update_icon() +/obj/item/rcd/update_icon() var/nearest_ten = round((stored_matter/max_stored_matter)*10, 1) //Just to prevent updates every use @@ -52,21 +52,21 @@ add_overlay("[initial(icon_state)]_charge[nearest_ten]") -/obj/item/weapon/rcd/proc/perform_effect(var/atom/A, var/time_taken) +/obj/item/rcd/proc/perform_effect(var/atom/A, var/time_taken) effects[A] = new /obj/effect/constructing_effect(get_turf(A), time_taken, modes[mode_index]) -/obj/item/weapon/rcd/use_rcd(atom/A, mob/living/user) +/obj/item/rcd/use_rcd(atom/A, mob/living/user) . = ..() cleanup_effect(A) -/obj/item/weapon/rcd/proc/cleanup_effect(var/atom/A) +/obj/item/rcd/proc/cleanup_effect(var/atom/A) if(A in effects) qdel(effects[A]) effects -= A -/obj/item/weapon/rcd/attackby(obj/item/weapon/W, mob/user) - if(istype(W, /obj/item/weapon/rcd_ammo)) - var/obj/item/weapon/rcd_ammo/cartridge = W +/obj/item/rcd/attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/rcd_ammo)) + var/obj/item/rcd_ammo/cartridge = W var/can_store = min(max_stored_matter - stored_matter, cartridge.remaining) if(can_store <= 0) to_chat(user, span("warning", "There's either no space or \the [cartridge] is empty!")) @@ -83,7 +83,7 @@ return TRUE return ..() -/obj/item/weapon/rcd/proc/check_menu(mob/living/user) +/obj/item/rcd/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE if(user.incapacitated() || !user.Adjacent(src)) @@ -91,7 +91,7 @@ return TRUE // Mounted one is more complex -/obj/item/weapon/rcd/electric/mounted/rig/check_menu(mob/living/user) +/obj/item/rcd/electric/mounted/rig/check_menu(mob/living/user) if(!istype(user)) world.log << "One" return FALSE @@ -106,7 +106,7 @@ return TRUE -/obj/item/weapon/rcd/attack_self(mob/living/user) +/obj/item/rcd/attack_self(mob/living/user) ..() var/list/choices = list( "Airlock" = radial_image_airlock, @@ -172,22 +172,22 @@ to_chat(user, "You change RCD's mode to '[choice]'.") ////////////////// -/obj/item/weapon/rcd/electric/update_icon() +/obj/item/rcd/electric/update_icon() return -/obj/item/weapon/rcd/shipwright +/obj/item/rcd/shipwright icon_state = "swrcd" item_state = "ircd" can_remove_rwalls = TRUE make_rwalls = TRUE ////////////////// -/obj/item/weapon/rcd_ammo/examine(mob/user) +/obj/item/rcd_ammo/examine(mob/user) . = ..() . += display_resources() // Used to show how much stuff (matter units, cell charge, etc) is left inside. -/obj/item/weapon/rcd_ammo/proc/display_resources() +/obj/item/rcd_ammo/proc/display_resources() return "It currently holds [remaining]/[initial(remaining)] matter-units." ////////////////// diff --git a/code/game/objects/items/weapons/RMS_vr.dm b/code/game/objects/items/weapons/RMS_vr.dm index b57cf9d5394..d9bb74d397a 100644 --- a/code/game/objects/items/weapons/RMS_vr.dm +++ b/code/game/objects/items/weapons/RMS_vr.dm @@ -5,7 +5,7 @@ #define RMS_STONE 5 #define RMS_RAND 6 -/obj/item/weapon/rms +/obj/item/rms name = "Rapid Material Synthesizer" desc = "A tool that converts battery charge to materials." icon = 'icons/obj/tools_vr.dmi' @@ -44,33 +44,33 @@ var/static/image/radial_image_random = image(icon = 'icons/mob/radial_vr.dmi', icon_state = "sheet-random") -/obj/item/weapon/rms/Initialize() +/obj/item/rms/Initialize() . = ..() src.spark_system = new /datum/effect/effect/system/spark_spread spark_system.set_up(5, 0, src) spark_system.attach(src) add_overlay("rms_charge[charge_stage]") -/obj/item/weapon/pipe_dispenser/Destroy() +/obj/item/pipe_dispenser/Destroy() qdel_null(spark_system) return ..() -/obj/item/weapon/rms/update_icon() +/obj/item/rms/update_icon() charge_stage = round((stored_charge/max_charge)*4) if(charge_stage >= 4) charge_stage = 4 cut_overlays() add_overlay("rms_charge[charge_stage]") -/obj/item/weapon/rms/examine(mob/user) +/obj/item/rms/examine(mob/user) . = ..() . += display_resources() -/obj/item/weapon/rms/proc/display_resources() +/obj/item/rms/proc/display_resources() return "It currently holds [round(stored_charge/1000)]/[max_charge/1000] kW charge." -/obj/item/weapon/rms/proc/drain_battery(user, battery) - var/obj/item/weapon/cell/C = battery +/obj/item/rms/proc/drain_battery(user, battery) + var/obj/item/cell/C = battery if(stored_charge == max_charge) to_chat(user, "The Rapid Material Synthesizer is full on charge!.") if(C.charge == 0) @@ -85,19 +85,19 @@ stored_charge = CLAMP(stored_charge, 0, max_charge) update_icon() -/obj/item/weapon/rms/proc/consume_resources(amount) +/obj/item/rms/proc/consume_resources(amount) stored_charge -= amount update_icon() return -/obj/item/weapon/rms/proc/can_afford(amount) +/obj/item/rms/proc/can_afford(amount) if(stored_charge < amount) return FALSE else return TRUE -/obj/item/weapon/rms/proc/use_rms(atom/A, mob/living/user) +/obj/item/rms/proc/use_rms(atom/A, mob/living/user) var/obj/product if(!overcharge) if(!can_afford(charge_cost)) @@ -147,21 +147,21 @@ if(RMS_RAND) if(!overcharge && !emagged) product = pick(10;new /obj/item/trash/material/metal, - 10;new /obj/item/weapon/material/shard, + 10;new /obj/item/material/shard, 10;new /obj/item/stack/cable_coil/random, 10;new /obj/item/stack/material/wood, 10;new /obj/item/stack/material/wood/sif, 10;new /obj/item/stack/material/snow) if(overcharge && !emagged) product = pick(1;new /obj/item/stack/rods, - 5;new /obj/item/device/fbp_backup_cell, + 5;new /obj/item/fbp_backup_cell, 5;new /obj/item/trash/rkibble, 10;new /obj/item/stack/tile/grass, 10;new /obj/item/stack/tile/carpet) spark_system.start() if(!overcharge && emagged) product = pick(10;new /obj/item/trash/material/metal, - 10;new /obj/item/weapon/material/shard, + 10;new /obj/item/material/shard, 10;new /obj/item/stack/cable_coil/random, 10;new /obj/item/stack/material/wood, 10;new /obj/item/stack/material/wood/sif, @@ -172,22 +172,22 @@ 1;new /obj/item/stack/material/diamond) if(overcharge && emagged) product = pick(1;new /obj/item/stack/rods, - 5;new /obj/item/device/fbp_backup_cell, + 5;new /obj/item/fbp_backup_cell, 5;new /obj/item/trash/rkibble, 10;new /obj/item/stack/tile/grass, 10;new /obj/item/stack/tile/carpet, - 10;new /obj/item/weapon/reagent_containers/spray/waterflower, - 10;new /obj/item/weapon/bikehorn, - 10;new /obj/item/weapon/storage/backpack/clown, + 10;new /obj/item/reagent_containers/spray/waterflower, + 10;new /obj/item/bikehorn, + 10;new /obj/item/storage/backpack/clown, 10;new /obj/item/clothing/under/rank/clown, 10;new /obj/item/clothing/shoes/clown_shoes, 10;new /obj/item/clothing/mask/gas/clown_hat, - 10;new /obj/item/device/pda/clown, + 10;new /obj/item/pda/clown, 1;new /mob/living/simple_mob/vore/catgirl) spark_system.start() product.loc = get_turf(A) -/obj/item/weapon/rms/proc/check_menu(mob/living/user) +/obj/item/rms/proc/check_menu(mob/living/user) if(!istype(user)) return FALSE if(user.incapacitated() || !user.Adjacent(src)) @@ -196,10 +196,10 @@ //Start of attack functions -/obj/item/weapon/rms/afterattack(atom/target, mob/user, proximity) +/obj/item/rms/afterattack(atom/target, mob/user, proximity) if(!proximity) return - if(istype(target, /obj/item/weapon/cell)) //Check for a battery on-click + if(istype(target, /obj/item/cell)) //Check for a battery on-click drain_battery(user, target) return if(istype(target, /turf/simulated)) // Check for a proper area on-click to spawn items @@ -209,7 +209,7 @@ to_chat(user, "Invalid target for the device.") return -/obj/item/weapon/rms/attack_self(mob/user) +/obj/item/rms/attack_self(mob/user) var/list/choices = list( "Steel" = radial_image_steel, "Glass" = radial_image_glass, @@ -242,12 +242,12 @@ playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) return ..() -/obj/item/weapon/rms/emag_act(var/remaining_charges, var/mob/user) +/obj/item/rms/emag_act(var/remaining_charges, var/mob/user) emagged = !emagged playsound(src.loc, "sparks", 100, 1) return 1 -/obj/item/weapon/rms/attackby(obj/item/W, mob/user) +/obj/item/rms/attackby(obj/item/W, mob/user) if(W.has_tool_quality(TOOL_MULTITOOL)) overcharge = !overcharge if(overcharge) diff --git a/code/game/objects/items/weapons/RPD_vr.dm b/code/game/objects/items/weapons/RPD_vr.dm index 8affac0c7f6..a6e1e79ac5d 100644 --- a/code/game/objects/items/weapons/RPD_vr.dm +++ b/code/game/objects/items/weapons/RPD_vr.dm @@ -7,7 +7,7 @@ #define DESTROY_MODE (1<<2) #define PAINT_MODE (1<<3) -/obj/item/weapon/pipe_dispenser +/obj/item/pipe_dispenser name = "Rapid Piping Device (RPD)" desc = "A device used to rapidly pipe things." icon = 'icons/obj/tools_vr.dmi' @@ -31,7 +31,7 @@ var/paint_color = "grey" // Pipe color index for next pipe painted/built. var/category = ATMOS_CATEGORY var/piping_layer = PIPING_LAYER_DEFAULT - var/obj/item/weapon/tool/wrench/tool + var/obj/item/tool/wrench/tool var/datum/pipe_recipe/recipe // pipe recipie selected for display/construction var/static/datum/pipe_recipe/first_atmos var/static/datum/pipe_recipe/first_disposal @@ -44,14 +44,14 @@ "Aux" = PIPING_LAYER_AUX ) -/obj/item/weapon/pipe_dispenser/Initialize() +/obj/item/pipe_dispenser/Initialize() . = ..() src.spark_system = new /datum/effect/effect/system/spark_spread spark_system.set_up(5, 0, src) spark_system.attach(src) - tool = new /obj/item/weapon/tool/wrench/cyborg(src) // RPDs have wrenches inside of them, so that they can wrench down spawned pipes without being used as superior wrenches themselves. + tool = new /obj/item/tool/wrench/cyborg(src) // RPDs have wrenches inside of them, so that they can wrench down spawned pipes without being used as superior wrenches themselves. -/obj/item/weapon/pipe_dispenser/proc/SetupPipes() +/obj/item/pipe_dispenser/proc/SetupPipes() if(!first_atmos) first_atmos = GLOB.atmos_pipe_recipes[GLOB.atmos_pipe_recipes[1]][1] if(!first_disposal) @@ -59,30 +59,30 @@ if(!recipe) recipe = first_atmos -/obj/item/weapon/pipe_dispenser/Destroy() +/obj/item/pipe_dispenser/Destroy() qdel_null(spark_system) qdel_null(tool) return ..() -/obj/item/weapon/pipe_dispenser/attack_self(mob/user) +/obj/item/pipe_dispenser/attack_self(mob/user) tgui_interact(user) -/obj/item/weapon/pipe_dispenser/ui_assets(mob/user) +/obj/item/pipe_dispenser/ui_assets(mob/user) return list( get_asset_datum(/datum/asset/spritesheet/pipes), ) -/obj/item/weapon/pipe_dispenser/tgui_state(mob/user) +/obj/item/pipe_dispenser/tgui_state(mob/user) return GLOB.tgui_inventory_state -/obj/item/weapon/pipe_dispenser/tgui_interact(mob/user, datum/tgui/ui) +/obj/item/pipe_dispenser/tgui_interact(mob/user, datum/tgui/ui) SetupPipes() ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "RapidPipeDispenser", name) ui.open() -/obj/item/weapon/pipe_dispenser/tgui_data(mob/user) +/obj/item/pipe_dispenser/tgui_data(mob/user) var/list/data = list( "category" = category, "piping_layer" = piping_layer, @@ -112,7 +112,7 @@ return data -/obj/item/weapon/pipe_dispenser/tgui_act(action, params) +/obj/item/pipe_dispenser/tgui_act(action, params) if(..()) return TRUE if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) @@ -159,7 +159,7 @@ playsound(get_turf(src), 'sound/effects/pop.ogg', 50, FALSE) return TRUE -/obj/item/weapon/pipe_dispenser/afterattack(atom/A, mob/user as mob, proximity) +/obj/item/pipe_dispenser/afterattack(atom/A, mob/user as mob, proximity) if(!user.IsAdvancedToolUser() || istype(A, /turf/space/transit) || !proximity) return ..() @@ -258,7 +258,7 @@ else return ..() -/obj/item/weapon/pipe_dispenser/proc/build_effect(var/obj/P, var/time = 1.5) +/obj/item/pipe_dispenser/proc/build_effect(var/obj/P, var/time = 1.5) set waitfor = FALSE P.filters += filter(type = "angular_blur", size = 30) animate(P.filters[P.filters.len], size = 0, time = time) @@ -268,7 +268,7 @@ P.filters -= outline P.filters -= filter(type = "angular_blur", size = 0) -/obj/item/weapon/pipe_dispenser/proc/animate_deletion(var/obj/P, var/time = 1.5) +/obj/item/pipe_dispenser/proc/animate_deletion(var/obj/P, var/time = 1.5) set waitfor = FALSE P.filters += filter(type = "angular_blur", size = 0) animate(P.filters[P.filters.len], size = 30, time = time) @@ -277,10 +277,10 @@ P.filters -= filter(type = "angular_blur", size = 30) qdel(P) -/obj/item/weapon/pipe_dispenser/proc/activate() +/obj/item/pipe_dispenser/proc/activate() playsound(src, 'sound/items/deconstruct.ogg', 50, 1) -/obj/item/weapon/pipe_dispenser/proc/do_wrench(var/atom/target, mob/user) +/obj/item/pipe_dispenser/proc/do_wrench(var/atom/target, mob/user) var/resolved = target.attackby(tool,user) if(!resolved && tool && target) tool.afterattack(target,user,1) diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 0eacd7922c3..8cd9ed4353e 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -4,7 +4,7 @@ RSF */ -/obj/item/weapon/rsf +/obj/item/rsf name = "\improper Rapid-Service-Fabricator" desc = "A device used to rapidly deploy service items." description_info = "Control Clicking on the device will allow you to choose the glass it dispenses when in the proper mode." @@ -16,32 +16,32 @@ RSF matter = list(DEFAULT_WALL_MATERIAL = 25000) var/stored_matter = 30 var/mode = 1 - var/obj/item/weapon/reagent_containers/glasstype = /obj/item/weapon/reagent_containers/food/drinks/metaglass + var/obj/item/reagent_containers/glasstype = /obj/item/reagent_containers/food/drinks/metaglass var/list/container_types = list( - "metamorphic glass" = /obj/item/weapon/reagent_containers/food/drinks/metaglass, - "metamorphic pint glass" = /obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, - "half-pint glass" = /obj/item/weapon/reagent_containers/food/drinks/glass2/square, - "rocks glass" = /obj/item/weapon/reagent_containers/food/drinks/glass2/rocks, - "milkshake glass" = /obj/item/weapon/reagent_containers/food/drinks/glass2/shake, - "cocktail glass" = /obj/item/weapon/reagent_containers/food/drinks/glass2/cocktail, - "shot glass" = /obj/item/weapon/reagent_containers/food/drinks/glass2/shot, - "pint glass" = /obj/item/weapon/reagent_containers/food/drinks/glass2/pint, - "mug" = /obj/item/weapon/reagent_containers/food/drinks/glass2/mug, - "wine glass" = /obj/item/weapon/reagent_containers/food/drinks/glass2/wine, - "condiment bottle" = /obj/item/weapon/reagent_containers/food/condiment + "metamorphic glass" = /obj/item/reagent_containers/food/drinks/metaglass, + "metamorphic pint glass" = /obj/item/reagent_containers/food/drinks/metaglass/metapint, + "half-pint glass" = /obj/item/reagent_containers/food/drinks/glass2/square, + "rocks glass" = /obj/item/reagent_containers/food/drinks/glass2/rocks, + "milkshake glass" = /obj/item/reagent_containers/food/drinks/glass2/shake, + "cocktail glass" = /obj/item/reagent_containers/food/drinks/glass2/cocktail, + "shot glass" = /obj/item/reagent_containers/food/drinks/glass2/shot, + "pint glass" = /obj/item/reagent_containers/food/drinks/glass2/pint, + "mug" = /obj/item/reagent_containers/food/drinks/glass2/mug, + "wine glass" = /obj/item/reagent_containers/food/drinks/glass2/wine, + "condiment bottle" = /obj/item/reagent_containers/food/condiment ) w_class = ITEMSIZE_NORMAL -/obj/item/weapon/rsf/examine(mob/user) +/obj/item/rsf/examine(mob/user) . = ..() if(get_dist(user, src) == 0) . += "It currently holds [stored_matter]/30 fabrication-units." -/obj/item/weapon/rsf/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/rsf/attackby(obj/item/W as obj, mob/user as mob) ..() - if (istype(W, /obj/item/weapon/rcd_ammo)) + if (istype(W, /obj/item/rcd_ammo)) if ((stored_matter + 10) > 30) to_chat(user, "The RSF can't hold any more matter.") @@ -54,7 +54,7 @@ RSF to_chat(user,"The RSF now holds [stored_matter]/30 fabrication-units.") return -/obj/item/weapon/rsf/CtrlClick(mob/living/user) +/obj/item/rsf/CtrlClick(mob/living/user) if(!Adjacent(user) || !istype(user)) to_chat(user,"You are too far away.") return @@ -63,9 +63,9 @@ RSF if(glass_choice) glasstype = container_types[glass_choice] else - glasstype = /obj/item/weapon/reagent_containers/food/drinks/metaglass + glasstype = /obj/item/reagent_containers/food/drinks/metaglass -/obj/item/weapon/rsf/attack_self(mob/user as mob) +/obj/item/rsf/attack_self(mob/user as mob) playsound(src, 'sound/effects/pop.ogg', 50, 0) if (mode == 1) mode = 2 @@ -88,7 +88,7 @@ RSF to_chat(user,"Changed dispensing mode to 'Cigarette'") return -/obj/item/weapon/rsf/afterattack(atom/A, mob/user as mob, proximity) +/obj/item/rsf/afterattack(atom/A, mob/user as mob, proximity) if(!proximity) return @@ -115,13 +115,13 @@ RSF product = new glasstype() used_energy = 50 if(3) - product = new /obj/item/weapon/paper() + product = new /obj/item/paper() used_energy = 10 if(4) - product = new /obj/item/weapon/pen() + product = new /obj/item/pen() used_energy = 50 if(5) - product = new /obj/item/weapon/storage/pill_bottle/dice() + product = new /obj/item/storage/pill_bottle/dice() used_energy = 200 to_chat(user,"Dispensing [product ? product : "product"]...") diff --git a/code/game/objects/items/weapons/augment_items.dm b/code/game/objects/items/weapons/augment_items.dm index 29db229cae4..3fc439adb2a 100644 --- a/code/game/objects/items/weapons/augment_items.dm +++ b/code/game/objects/items/weapons/augment_items.dm @@ -1,13 +1,13 @@ // **For augment items that aren't subtypes of other things.** -/obj/item/weapon/melee/augment +/obj/item/melee/augment name = "integrated item" desc = "A surprisingly non-descript item, integrated into its user. You probably shouldn't be seeing this." icon = 'icons/obj/surgery.dmi' icon_state = "augment_box" -/obj/item/weapon/melee/augment/blade +/obj/item/melee/augment/blade name = "handblade" desc = "A sleek-looking telescopic blade that fits inside the hand. Favored by infiltration specialists and assassins." icon_state = "augment_handblade" @@ -24,7 +24,7 @@ projectile_parry_chance = 5 hitsound = 'sound/weapons/bladeslice.ogg' -/obj/item/weapon/melee/augment/blade/arm +/obj/item/melee/augment/blade/arm name = "armblade" desc = "A sleek-looking cybernetic blade that cleaves through people like butter. Favored by psychopaths and assassins." icon_state = "augment_armblade" diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm index 100fac14c28..3730214344b 100644 --- a/code/game/objects/items/weapons/autopsy.dm +++ b/code/game/objects/items/weapons/autopsy.dm @@ -2,7 +2,7 @@ //moved these here from code/defines/obj/weapon.dm //please preference put stuff where it's easy to find - C -/obj/item/weapon/autopsy_scanner +/obj/item/autopsy_scanner name = "biopsy scanner" desc = "Extracts information on wounds." icon = 'icons/obj/autopsy_scanner.dmi' @@ -39,7 +39,7 @@ W.time_inflicted = time_inflicted return W -/obj/item/weapon/autopsy_scanner/proc/add_data(var/obj/item/organ/external/O) +/obj/item/autopsy_scanner/proc/add_data(var/obj/item/organ/external/O) if(!O.autopsy_data.len && !O.trace_chemicals.len) return for(var/V in O.autopsy_data) @@ -67,7 +67,7 @@ if(O.trace_chemicals[V] > 0 && !chemtraces.Find(V)) chemtraces += V -/obj/item/weapon/autopsy_scanner/verb/print_data() +/obj/item/autopsy_scanner/verb/print_data() set category = "Object" set src in view(usr, 1) set name = "Print Data" @@ -146,7 +146,7 @@ sleep(10) - var/obj/item/weapon/paper/P = new(usr.loc) + var/obj/item/paper/P = new(usr.loc) P.name = "Autopsy Data ([target_name])" P.info = "[scan_data]" P.icon_state = "paper_words" @@ -154,7 +154,7 @@ if(istype(usr,/mob/living/carbon)) usr.put_in_hands(P) -/obj/item/weapon/autopsy_scanner/do_surgery(mob/living/carbon/human/M, mob/living/user) +/obj/item/autopsy_scanner/do_surgery(mob/living/carbon/human/M, mob/living/user) if(!istype(M)) return 0 diff --git a/code/game/objects/items/weapons/bones.dm b/code/game/objects/items/weapons/bones.dm index ef7f3c7bc57..cb9353dce0e 100644 --- a/code/game/objects/items/weapons/bones.dm +++ b/code/game/objects/items/weapons/bones.dm @@ -1,5 +1,5 @@ //These bone objects are mostly for mapping and decoration. They have no actual medical use, so maybe don't try to put them in anybody. -/obj/item/weapon/bone +/obj/item/bone name = "bone" desc = "A non-descript bone. It's so old and worn you can barely tell which part of the body it's from." icon = 'icons/obj/bones.dmi' @@ -10,42 +10,42 @@ w_class = ITEMSIZE_SMALL attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked", "bonked", "boned") -/obj/item/weapon/bone/skull +/obj/item/bone/skull name = "skull" desc = "A skull. Judging by the shape and size, you'd guess that it might be human." icon_state = "skull" throwforce = 7 -/obj/item/weapon/bone/skull/tajaran +/obj/item/bone/skull/tajaran desc = "A skull. Judging by the shape and size, you'd guess that it might be tajaran." icon_state = "tajskull" -/obj/item/weapon/bone/skull/unathi +/obj/item/bone/skull/unathi desc = "A skull. Judging by the shape and size, you'd guess that it might be unathi." icon_state = "unaskull" -/obj/item/weapon/bone/skull/unknown +/obj/item/bone/skull/unknown desc = "A skull. You're not sure what species it might be, though." icon_state = "xenoskull" -/obj/item/weapon/bone/arm +/obj/item/bone/arm name = "arm bone" desc = "Wielding this, you're armed and dangerous, no bones about it." attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked", "bonked", "boned", "slapped", "punched") icon_state = "arm" -/obj/item/weapon/bone/leg +/obj/item/bone/leg name = "leg bone" desc = "Don't worry about getting into an argument with the owner of this. They don't have a leg to stand on." attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked", "bonked", "boned", "kicked") icon_state = "leg" -/obj/item/weapon/bone/ribs +/obj/item/bone/ribs name = "ribcage" desc = "If you had some mallets, you could probably use this as a makeshift xylophone." icon_state = "ribs" -/obj/item/weapon/bone/horn //Teppi horn!!!! +/obj/item/bone/horn //Teppi horn!!!! name = "horn" desc = "A hard conical structure made of bone or some other similar organic material. Traditionally seen affixed to helmets, hollowed out and filled with tasty drinks, or occasionally, attatched to the heads of animals." icon = 'icons/obj/bones_vr.dmi' diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm index 8fc58d8664b..907f1a054e2 100644 --- a/code/game/objects/items/weapons/candle.dm +++ b/code/game/objects/items/weapons/candle.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/flame/candle +/obj/item/flame/candle name = "red candle" desc = "a red pillar candle. Its specially-formulated fuel-oxidizer wax mixture allows continued combustion in airless environments." icon = 'icons/obj/candle.dmi' @@ -10,11 +10,11 @@ var/wax = 2000 var/icon_type = "candle" -/obj/item/weapon/flame/candle/New() +/obj/item/flame/candle/New() wax -= rand(800, 1000) // Enough for 27-33 minutes. 30 minutes on average. ..() -/obj/item/weapon/flame/candle/update_icon() +/obj/item/flame/candle/update_icon() var/i if(wax > 1500) i = 1 @@ -24,34 +24,34 @@ icon_state = "[icon_type][i][lit ? "_lit" : ""]" -/obj/item/weapon/flame/candle/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/flame/candle/attackby(obj/item/W as obj, mob/user as mob) ..() if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool light("\The [user] casually lights the [src] with [W].") - else if(istype(W, /obj/item/weapon/flame/lighter)) - var/obj/item/weapon/flame/lighter/L = W + else if(istype(W, /obj/item/flame/lighter)) + var/obj/item/flame/lighter/L = W if(L.lit) light() - else if(istype(W, /obj/item/weapon/flame/match)) - var/obj/item/weapon/flame/match/M = W + else if(istype(W, /obj/item/flame/match)) + var/obj/item/flame/match/M = W if(M.lit) light() - else if(istype(W, /obj/item/weapon/flame/candle)) - var/obj/item/weapon/flame/candle/C = W + else if(istype(W, /obj/item/flame/candle)) + var/obj/item/flame/candle/C = W if(C.lit) light() -/obj/item/weapon/flame/candle/proc/light(var/flavor_text = "\The [usr] lights the [src].") +/obj/item/flame/candle/proc/light(var/flavor_text = "\The [usr] lights the [src].") if(!lit) lit = TRUE visible_message(flavor_text) set_light(CANDLE_LUM) START_PROCESSING(SSobj, src) -/obj/item/weapon/flame/candle/process() +/obj/item/flame/candle/process() if(!lit) return wax-- @@ -65,13 +65,13 @@ var/turf/T = loc T.hotspot_expose(700, 5) -/obj/item/weapon/flame/candle/attack_self(mob/user as mob) +/obj/item/flame/candle/attack_self(mob/user as mob) if(lit) lit = 0 update_icon() set_light(0) -/obj/item/weapon/flame/candle/small +/obj/item/flame/candle/small name = "small red candle" desc = "a small red candle, for more intimate candle occasions." icon = 'icons/obj/candle.dmi' @@ -79,7 +79,7 @@ icon_type = "smallcandle" w_class = ITEMSIZE_SMALL -/obj/item/weapon/flame/candle/white +/obj/item/flame/candle/white name = "white candle" desc = "a white pillar candle. Its specially-formulated fuel-oxidizer wax mixture allows continued combustion in airless environments." icon = 'icons/obj/candle.dmi' @@ -87,7 +87,7 @@ icon_type = "whitecandle" w_class = ITEMSIZE_SMALL -/obj/item/weapon/flame/candle/black +/obj/item/flame/candle/black name = "black candle" desc = "a black pillar candle. Ominous." icon = 'icons/obj/candle.dmi' @@ -95,7 +95,7 @@ icon_type = "blackcandle" w_class = ITEMSIZE_SMALL -/obj/item/weapon/flame/candle/candelabra +/obj/item/flame/candle/candelabra name = "candelabra" desc = "a small gold candelabra. The cups that hold the candles save some of the wax from dripping off, allowing the candles to burn longer." icon = 'icons/obj/candle.dmi' @@ -103,22 +103,22 @@ w_class = ITEMSIZE_SMALL wax = 20000 -/obj/item/weapon/flame/candle/candelabra/update_icon() +/obj/item/flame/candle/candelabra/update_icon() if(wax == 0) icon_state = "candelabra_melted" else icon_state = "candelabra[lit ? "_lit" : ""]" -/obj/item/weapon/flame/candle/everburn +/obj/item/flame/candle/everburn wax = 99999 -/obj/item/weapon/flame/candle/everburn/Initialize() +/obj/item/flame/candle/everburn/Initialize() . = ..() light("\The [src] mysteriously lights itself!.") -/obj/item/weapon/flame/candle/candelabra/everburn +/obj/item/flame/candle/candelabra/everburn wax = 99999 -/obj/item/weapon/flame/candle/candelabra/everburn/Initialize() +/obj/item/flame/candle/candelabra/everburn/Initialize() . = ..() light("\The [src] mysteriously lights itself!.") diff --git a/code/game/objects/items/weapons/canes.dm b/code/game/objects/items/weapons/canes.dm index 63d2222834f..bbea5886421 100644 --- a/code/game/objects/items/weapons/canes.dm +++ b/code/game/objects/items/weapons/canes.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/cane +/obj/item/cane name = "cane" desc = "A cane used by a true gentleman." icon = 'icons/obj/weapons.dmi' @@ -13,22 +13,22 @@ matter = list(MAT_STEEL = 50) attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed") -/obj/item/weapon/cane/crutch +/obj/item/cane/crutch name ="crutch" desc = "A long stick with a crosspiece at the top, used to help with walking." icon_state = "crutch" item_state = "crutch" -/obj/item/weapon/cane/concealed +/obj/item/cane/concealed var/concealed_blade -/obj/item/weapon/cane/concealed/Initialize() +/obj/item/cane/concealed/Initialize() . = ..() - var/obj/item/weapon/material/sword/katana/caneblade/temp_blade = new(src) + var/obj/item/material/sword/katana/caneblade/temp_blade = new(src) concealed_blade = temp_blade temp_blade.attack_self() -/obj/item/weapon/cane/concealed/attack_self(var/mob/user) +/obj/item/cane/concealed/attack_self(var/mob/user) var/datum/gender/T = gender_datums[user.get_visible_gender()] if(concealed_blade) user.visible_message("[user] has unsheathed \a [concealed_blade] from [T.his] [src]!", "You unsheathe \the [concealed_blade] from \the [src].") @@ -44,7 +44,7 @@ else ..() -/obj/item/weapon/cane/concealed/attackby(var/obj/item/weapon/material/sword/katana/caneblade/W, var/mob/user) +/obj/item/cane/concealed/attackby(var/obj/item/material/sword/katana/caneblade/W, var/mob/user) if(!src.concealed_blade && istype(W)) var/datum/gender/T = gender_datums[user.get_visible_gender()] user.visible_message("[user] has sheathed \a [W] into [T.his] [src]!", "You sheathe \the [W] into \the [src].") @@ -56,7 +56,7 @@ else ..() -/obj/item/weapon/cane/concealed/update_icon() +/obj/item/cane/concealed/update_icon() if(concealed_blade) name = initial(name) icon_state = initial(icon_state) @@ -66,12 +66,12 @@ icon_state = "caneshaft" item_state = "foldcane" -/obj/item/weapon/cane/white +/obj/item/cane/white name = "white cane" desc = "A white cane. They are commonly used by the blind or visually impaired as a mobility tool or as a courtesy to others." icon_state = "whitecane" -/obj/item/weapon/cane/white/attack(mob/M as mob, mob/user as mob) +/obj/item/cane/white/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 TRUE @@ -81,7 +81,7 @@ //Code for Telescopic White Cane writen by Gozulio -/obj/item/weapon/cane/white/collapsible +/obj/item/cane/white/collapsible name = "telescopic white cane" desc = "A telescopic white cane. They are commonly used by the blind or visually impaired as a mobility tool or as a courtesy to others." icon_state = "whitecane1in" @@ -94,7 +94,7 @@ force = 3 var/on = 0 -/obj/item/weapon/cane/white/collapsible/attack_self(mob/user as mob) +/obj/item/cane/white/collapsible/attack_self(mob/user as mob) on = !on if(on) user.visible_message("\The [user] extends the white cane.",\ diff --git a/code/game/objects/items/weapons/cards_ids_vr.dm b/code/game/objects/items/weapons/cards_ids_vr.dm index 123cb199e12..f4291f3e55a 100644 --- a/code/game/objects/items/weapons/cards_ids_vr.dm +++ b/code/game/objects/items/weapons/cards_ids_vr.dm @@ -1,2 +1,2 @@ -/obj/item/weapon/card/id +/obj/item/card/id slot_flags = SLOT_ID | SLOT_EARS \ No newline at end of file diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index caf5ae74c38..bd5336065fa 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -123,7 +123,7 @@ reagents.add_reagent("nicotine", 2) color = reagents.get_color() -/obj/item/weapon/storage/chewables +/obj/item/storage/chewables name = "box of chewing wads master" desc = "A generic brand of Waffle Co Wads, unflavored chews. Why do these exist?" icon = 'icons/obj/cigarettes.dmi' @@ -136,13 +136,13 @@ slot_flags = SLOT_BELT starts_with = list(/obj/item/clothing/mask/chewable/tobacco = 6) -/obj/item/weapon/storage/chewables/Initialize() +/obj/item/storage/chewables/Initialize() . = ..() make_exact_fit() //Tobacco Tins -/obj/item/weapon/storage/chewables/tobacco +/obj/item/storage/chewables/tobacco name = "tin of Al Mamun Smooth chewing tobacco" desc = "Packaged and shipped straight from Kishar, popularised by the biosphere farmers of Kanondaga." icon_state = "chew_generic" @@ -150,14 +150,14 @@ starts_with = list(/obj/item/clothing/mask/chewable/tobacco/cheap = 6) storage_slots = 6 -/obj/item/weapon/storage/chewables/tobacco/fine +/obj/item/storage/chewables/tobacco/fine name = "tin of Suamalie chewing tobacco" desc = "Once reserved for the first-class tourists of Oasis, this premium blend has been released for the public to enjoy." icon_state = "chew_fine" item_state = "Dpacket" starts_with = list(/obj/item/clothing/mask/chewable/tobacco/fine = 6) -/obj/item/weapon/storage/box/fancy/chewables/tobacco/nico +/obj/item/storage/box/fancy/chewables/tobacco/nico name = "box of Nico-Tine gum" desc = "A government doctor approved brand of nicotine gum. Cut out the middleman for your addiction fix." icon = 'icons/obj/cigarettes.dmi' @@ -171,14 +171,14 @@ var/open_state var/closed_state -/obj/item/weapon/storage/box/fancy/chewables/tobacco/nico/New() +/obj/item/storage/box/fancy/chewables/tobacco/nico/New() if(!open_state) open_state = "[initial(icon_state)]0" if(!closed_state) closed_state = "[initial(icon_state)]" ..() -/obj/item/weapon/storage/box/fancy/chewables/tobacco/nico/update_icon() +/obj/item/storage/box/fancy/chewables/tobacco/nico/update_icon() cut_overlays() if(open) icon_state = open_state @@ -187,7 +187,7 @@ else icon_state = closed_state -/obj/item/weapon/storage/box/fancy/chewables/tobacco/nico/open(mob/user as mob) +/obj/item/storage/box/fancy/chewables/tobacco/nico/open(mob/user as mob) if(open) return open = TRUE @@ -197,7 +197,7 @@ update_icon() ..() -/obj/item/weapon/storage/box/fancy/chewables/tobacco/nico/close(mob/user as mob) +/obj/item/storage/box/fancy/chewables/tobacco/nico/close(mob/user as mob) open = FALSE if(contents.len == 0) icon_state = "[initial(icon_state)]_empty" @@ -230,7 +230,7 @@ color = reagents.get_color() update_icon() -/obj/item/weapon/storage/box/gum +/obj/item/storage/box/gum name = "\improper Frooty-Choos flavored gum" desc = "A small pack of chewing gum in various flavors." description_fluff = "Frooty-Choos is NanoTrasen's top-selling brand of artificially flavoured fruit-adjacent non-swallowable chew-product. This extremely specific definition places sales figures safely away from competing 'gum' brands." @@ -267,7 +267,7 @@ color = reagents.get_color() update_icon() -/obj/item/weapon/storage/box/pocky +/obj/item/storage/box/pocky name = "\improper Totemo yoi Pocky" desc = "A bundle of chocolate-coated bisquit sticks." icon = 'icons/obj/food_snacks.dmi' diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 46c7f38751e..1fb721a8b71 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -12,16 +12,16 @@ CIGARETTE PACKETS ARE IN FANCY.DM */ //For anything that can light stuff on fire -/obj/item/weapon/flame +/obj/item/flame var/lit = 0 -/obj/item/weapon/flame/is_hot() +/obj/item/flame/is_hot() return lit /////////// //MATCHES// /////////// -/obj/item/weapon/flame/match +/obj/item/flame/match name = "match" desc = "A simple match stick, used for lighting fine smokables." icon = 'icons/obj/cigarettes.dmi' @@ -35,7 +35,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM drop_sound = 'sound/items/drop/food.ogg' pickup_sound = 'sound/items/pickup/food.ogg' -/obj/item/weapon/flame/match/process() +/obj/item/flame/match/process() if(isliving(loc)) var/mob/living/M = loc M.IgniteMob() @@ -48,7 +48,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM location.hotspot_expose(700, 5) return -/obj/item/weapon/flame/match/dropped(mob/user as mob) +/obj/item/flame/match/dropped(mob/user as mob) //If dropped, put ourselves out //not before lighting up the turf we land on, though. if(lit) @@ -59,7 +59,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM burn_out() return ..() -/obj/item/weapon/flame/match/proc/light(var/mob/user) +/obj/item/flame/match/proc/light(var/mob/user) playsound(src, 'sound/items/cigs_lighters/matchstick_lit.ogg', 25, 0, -1) lit = 1 damtype = "burn" @@ -68,7 +68,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM desc = "A match. This one is presently on fire." START_PROCESSING(SSobj, src) -/obj/item/weapon/flame/match/proc/burn_out() +/obj/item/flame/match/proc/burn_out() lit = 0 burnt = 1 damtype = "brute" @@ -238,19 +238,19 @@ CIGARETTE PACKETS ARE IN FANCY.DM return 1 return ..() -/obj/item/clothing/mask/smokable/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/clothing/mask/smokable/attackby(obj/item/W as obj, mob/user as mob) ..() if(W.is_hot()) var/text = matchmes - if(istype(W, /obj/item/weapon/flame/match)) + if(istype(W, /obj/item/flame/match)) text = matchmes - else if(istype(W, /obj/item/weapon/flame/lighter/zippo)) + else if(istype(W, /obj/item/flame/lighter/zippo)) text = zippomes - else if(istype(W, /obj/item/weapon/flame/lighter)) + else if(istype(W, /obj/item/flame/lighter)) text = lightermes - else if(istype(W, /obj/item/weapon/weldingtool)) + else if(istype(W, /obj/item/weldingtool)) text = weldermes - else if(istype(W, /obj/item/device/assembly/igniter)) + else if(istype(W, /obj/item/assembly/igniter)) text = ignitermes text = replacetext(text, "USER", "[user]") text = replacetext(text, "NAME", "[name]") @@ -294,17 +294,17 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(nicotine_amt) reagents.add_reagent("nicotine", nicotine_amt) -/obj/item/clothing/mask/smokable/cigarette/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/clothing/mask/smokable/cigarette/attackby(obj/item/W as obj, mob/user as mob) ..() - if(istype(W, /obj/item/weapon/melee/energy/sword)) - var/obj/item/weapon/melee/energy/sword/S = W + if(istype(W, /obj/item/melee/energy/sword)) + var/obj/item/melee/energy/sword/S = W if(S.active) light("[user] swings their [W], barely missing their nose. They light their [name] in the process.") return -/obj/item/clothing/mask/smokable/cigarette/afterattack(obj/item/weapon/reagent_containers/glass/glass, mob/user as mob, proximity) +/obj/item/clothing/mask/smokable/cigarette/afterattack(obj/item/reagent_containers/glass/glass, mob/user as mob, proximity) ..() if(!proximity) return @@ -397,7 +397,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM desc = "A manky old cigar butt." icon_state = "cigarbutt" -/obj/item/clothing/mask/smokable/cigarette/cigar/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/clothing/mask/smokable/cigarette/cigar/attackby(obj/item/W as obj, mob/user as mob) ..() user.update_inv_wear_mask(0) @@ -438,14 +438,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM user.visible_message("[user] puts out \the [src].") quench() -/obj/item/clothing/mask/smokable/pipe/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/melee/energy/sword)) +/obj/item/clothing/mask/smokable/pipe/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/melee/energy/sword)) return ..() - if (istype(W, /obj/item/weapon/reagent_containers/food/snacks)) - var/obj/item/weapon/reagent_containers/food/snacks/grown/G = W + if (istype(W, /obj/item/reagent_containers/food/snacks)) + var/obj/item/reagent_containers/food/snacks/grown/G = W if (!G.dry) to_chat(user, "[G] must be dried before you stuff it into [src].") return @@ -459,17 +459,17 @@ CIGARETTE PACKETS ARE IN FANCY.DM name = "[G.name]-packed [initial(name)]" qdel(G) - else if(istype(W, /obj/item/weapon/flame/lighter)) - var/obj/item/weapon/flame/lighter/L = W + else if(istype(W, /obj/item/flame/lighter)) + var/obj/item/flame/lighter/L = W if(L.lit) light("[user] manages to light their [name] with [W].") - else if(istype(W, /obj/item/weapon/flame/match)) - var/obj/item/weapon/flame/match/M = W + else if(istype(W, /obj/item/flame/match)) + var/obj/item/flame/match/M = W if(M.lit) light("[user] lights their [name] with their [W].") - else if(istype(W, /obj/item/device/assembly/igniter)) + else if(istype(W, /obj/item/assembly/igniter)) light("[user] fiddles with [W], and manages to light their [name] with the power of science.") user.update_inv_wear_mask(0) @@ -516,7 +516,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM nicotine_amt = 4 chem_volume = 45 -/obj/item/weapon/reagent_containers/rollingpaper +/obj/item/reagent_containers/rollingpaper name = "rolling paper" desc = "A small, thin piece of easily flammable paper, commonly used for rolling and smoking various dried plants." description_fluff = "The legalization of certain substances propelled the sale of rolling \ @@ -526,16 +526,16 @@ CIGARETTE PACKETS ARE IN FANCY.DM volume = 25 var/obj/item/clothing/mask/smokable/cigarette/crafted_type = /obj/item/clothing/mask/smokable/cigarette/joint -/obj/item/weapon/reagent_containers/rollingpaper/blunt +/obj/item/reagent_containers/rollingpaper/blunt name = "blunt wrap" desc = "A small piece of easily flammable paper similar to that which encases cigars. It's made out of tobacco, bigger than a standard rolling paper, and will last longer." icon_state = "blunt paper" volume = 45 crafted_type = /obj/item/clothing/mask/smokable/cigarette/joint/blunt -/obj/item/weapon/reagent_containers/rollingpaper/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/reagent_containers/food/snacks)) - var/obj/item/weapon/reagent_containers/food/snacks/grown/G = W +/obj/item/reagent_containers/rollingpaper/attackby(obj/item/W as obj, mob/user as mob) + if (istype(W, /obj/item/reagent_containers/food/snacks)) + var/obj/item/reagent_containers/food/snacks/grown/G = W if (!G.dry) //This prevents people from just stuffing cheeseburgers into their joint to_chat(user, "[G.name] must be dried before you add it to [src].") return @@ -543,7 +543,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM to_chat(user, "The [src] is too full to add [G.name].") return if (src.reagents.total_volume == 0) - if (istype(src, /obj/item/weapon/reagent_containers/rollingpaper/blunt)) //update the icon if this is the first thing we're adding to the paper + if (istype(src, /obj/item/reagent_containers/rollingpaper/blunt)) //update the icon if this is the first thing we're adding to the paper src.icon_state = "blunt_full" else src.icon_state = "paper_full" @@ -554,7 +554,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM user.drop_from_inventory(G) qdel(G) -/obj/item/weapon/reagent_containers/rollingpaper/attack_self(mob/living/user) +/obj/item/reagent_containers/rollingpaper/attack_self(mob/living/user) if(!src.reagents) //don't roll an empty joint to_chat(user, "There is nothing in [src]. Add something to it first.") return @@ -570,7 +570,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM ///////// //CHEAP// ///////// -/obj/item/weapon/flame/lighter +/obj/item/flame/lighter name = "cheap lighter" desc = "A cheap-as-free lighter." description_fluff = "The 'hand-made in Altair' sticker underneath is a charming way of \ @@ -609,16 +609,16 @@ CIGARETTE PACKETS ARE IN FANCY.DM COLOR_ASSEMBLY_HOT_PINK) // TODO: Remove this path from POIs and loose maps (it's no longer needed) -/obj/item/weapon/flame/lighter/random +/obj/item/flame/lighter/random // Randomizes Cheap Lighters on Spawn -/obj/item/weapon/flame/lighter/Initialize() +/obj/item/flame/lighter/Initialize() . = ..() var/image/I = image(icon, "lighter-[pick("trans","tall","matte")]") I.color = pick(available_colors) add_overlay(I) -/obj/item/weapon/flame/lighter/attack_self(mob/living/user) +/obj/item/flame/lighter/attack_self(mob/living/user) if(!lit) lit = 1 icon_state = "lighteron" @@ -639,7 +639,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM update_icon() return -/obj/item/weapon/flame/lighter/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/flame/lighter/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(!istype(M, /mob)) return @@ -652,14 +652,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(M == user) cig.attackby(src, user) else - if(istype(src, /obj/item/weapon/flame/lighter/zippo)) + if(istype(src, /obj/item/flame/lighter/zippo)) cig.light("[user] whips the [name] out and holds it for [M].") else cig.light("[user] holds the [name] out for [M], and lights the [cig.name].") else ..() -/obj/item/weapon/flame/lighter/process() +/obj/item/flame/lighter/process() var/turf/location = get_turf(src) if(location) location.hotspot_expose(700, 5) @@ -668,7 +668,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM ///////// //ZIPPO// ///////// -/obj/item/weapon/flame/lighter/zippo +/obj/item/flame/lighter/zippo name = "\improper Zippo lighter" desc = "The zippo." description_fluff = "Still going after all these years." @@ -677,11 +677,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM activation_sound = 'sound/items/zippo_on.ogg' deactivation_sound = 'sound/items/zippo_off.ogg' -/obj/item/weapon/flame/lighter/zippo/Initialize() +/obj/item/flame/lighter/zippo/Initialize() . = ..() cut_overlays() //Prevents the Cheap Lighter overlay from appearing on this -/obj/item/weapon/flame/lighter/zippo/attack_self(mob/living/user) +/obj/item/flame/lighter/zippo/attack_self(mob/living/user) if(!base_state) base_state = icon_state if(!lit) @@ -706,63 +706,63 @@ CIGARETTE PACKETS ARE IN FANCY.DM //Here we add Zippo skins. -/obj/item/weapon/flame/lighter/zippo/black +/obj/item/flame/lighter/zippo/black name = "\improper holy Zippo lighter" desc = "Only in regards to Christianity, that is." icon_state = "blackzippo" -/obj/item/weapon/flame/lighter/zippo/blue +/obj/item/flame/lighter/zippo/blue name = "\improper blue Zippo lighter" icon_state = "bluezippo" -/obj/item/weapon/flame/lighter/zippo/engraved +/obj/item/flame/lighter/zippo/engraved name = "\improper engraved Zippo lighter" icon_state = "engravedzippo" item_state = "zippo" -/obj/item/weapon/flame/lighter/zippo/gold +/obj/item/flame/lighter/zippo/gold name = "\improper golden Zippo lighter" icon_state = "goldzippo" -/obj/item/weapon/flame/lighter/zippo/moff +/obj/item/flame/lighter/zippo/moff name = "\improper moth Zippo lighter" desc = "Too cute to be a Tymisian." icon_state = "moffzippo" -/obj/item/weapon/flame/lighter/zippo/red +/obj/item/flame/lighter/zippo/red name = "\improper red Zippo lighter" icon_state = "redzippo" -/obj/item/weapon/flame/lighter/zippo/ironic +/obj/item/flame/lighter/zippo/ironic name = "\improper ironic Zippo lighter" desc = "What a quiant idea." icon_state = "ironiczippo" -/obj/item/weapon/flame/lighter/zippo/capitalist +/obj/item/flame/lighter/zippo/capitalist name = "\improper capitalist Zippo lighter" desc = "Made of gold and obsidian, this is truly not worth however much you spent on it." icon_state = "cappiezippo" -/obj/item/weapon/flame/lighter/zippo/communist +/obj/item/flame/lighter/zippo/communist name = "\improper communist Zippo lighter" desc = "All you need to spark a revolution." icon_state = "commiezippo" -/obj/item/weapon/flame/lighter/zippo/royal +/obj/item/flame/lighter/zippo/royal name = "\improper royal Zippo lighter" desc = "An incredibly fancy lighter, gilded and covered in the color of royalty." icon_state = "royalzippo" -/obj/item/weapon/flame/lighter/zippo/gonzo +/obj/item/flame/lighter/zippo/gonzo name = "\improper Gonzo Zippo lighter" desc = "A lighter with the iconic Gonzo fist painted on it." icon_state = "gonzozippo" -/obj/item/weapon/flame/lighter/zippo/rainbow +/obj/item/flame/lighter/zippo/rainbow name = "\improper rainbow Zippo lighter" icon_state = "rainbowzippo" -/obj/item/weapon/flame/lighter/zippo/skull +/obj/item/flame/lighter/zippo/skull name = "\improper badass Zippo lighter" desc = "An absolutely badass zippo lighter. Just look at that skull!" icon_state = "skullzippo" \ No newline at end of file diff --git a/code/game/objects/items/weapons/circuitboards/broken.dm b/code/game/objects/items/weapons/circuitboards/broken.dm index ce2cbb72603..ded817e7c74 100644 --- a/code/game/objects/items/weapons/circuitboards/broken.dm +++ b/code/game/objects/items/weapons/circuitboards/broken.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/circuitboard/broken +/obj/item/circuitboard/broken name = "broken electronics" icon = 'icons/obj/doors/door_assembly.dmi' icon_state = "door_electronics_smoked" diff --git a/code/game/objects/items/weapons/circuitboards/circuitboard.dm b/code/game/objects/items/weapons/circuitboards/circuitboard.dm index 3e806915a48..c41184deb55 100644 --- a/code/game/objects/items/weapons/circuitboards/circuitboard.dm +++ b/code/game/objects/items/weapons/circuitboards/circuitboard.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/circuitboard +/obj/item/circuitboard name = "circuit board" icon = 'icons/obj/module.dmi' icon_state = "id_mod" @@ -19,20 +19,20 @@ pickup_sound = 'sound/items/pickup/device.ogg' //Called when the circuitboard is used to contruct a new machine. -/obj/item/weapon/circuitboard/proc/construct(var/obj/machinery/M) +/obj/item/circuitboard/proc/construct(var/obj/machinery/M) if(istype(M, build_path)) return 1 return 0 //Called when a computer is deconstructed to produce a circuitboard. //Only used by computers, as other machines store their circuitboard instance. -/obj/item/weapon/circuitboard/proc/deconstruct(var/obj/machinery/M) +/obj/item/circuitboard/proc/deconstruct(var/obj/machinery/M) if(istype(M, build_path)) return 1 return 0 //Should be called from the constructor of any machine to automatically populate the default parts -/obj/item/weapon/circuitboard/proc/apply_default_parts(var/obj/machinery/M) +/obj/item/circuitboard/proc/apply_default_parts(var/obj/machinery/M) if(!istype(M)) return if(!req_components) diff --git a/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm b/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm index 62281667512..b4008b6c3d3 100644 --- a/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm +++ b/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm @@ -2,7 +2,7 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/get_examine_desc() +/obj/item/circuitboard/get_examine_desc() . = ..() if(LAZYLEN(req_components)) var/list/nice_list = list() @@ -16,63 +16,63 @@ // VOREStation specific circuit boards! // Board for the parts lathe in partslathe.dm -/obj/item/weapon/circuitboard/partslathe +/obj/item/circuitboard/partslathe name = T_BOARD("parts lathe") build_path = /obj/machinery/partslathe board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2) req_components = list( - /obj/item/weapon/stock_parts/matter_bin = 2, - /obj/item/weapon/stock_parts/manipulator = 2, - /obj/item/weapon/stock_parts/console_screen = 1) + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/manipulator = 2, + /obj/item/stock_parts/console_screen = 1) // Board for the algae oxygen generator in algae_generator.dm -/obj/item/weapon/circuitboard/algae_farm +/obj/item/circuitboard/algae_farm name = T_BOARD("algae oxygen generator") build_path = /obj/machinery/atmospherics/binary/algae_farm board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_ENGINEERING = 3, TECH_BIO = 2) req_components = list( - /obj/item/weapon/stock_parts/matter_bin = 2, - /obj/item/weapon/stock_parts/manipulator = 1, - /obj/item/weapon/stock_parts/capacitor = 1, - /obj/item/weapon/stock_parts/console_screen = 1) + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/manipulator = 1, + /obj/item/stock_parts/capacitor = 1, + /obj/item/stock_parts/console_screen = 1) // Board for the thermal regulator in airconditioner_vr.dm -/obj/item/weapon/circuitboard/thermoregulator +/obj/item/circuitboard/thermoregulator name = T_BOARD("thermal regulator") build_path = /obj/machinery/power/thermoregulator board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_ENGINEERING = 4, TECH_POWER = 3) req_components = list( /obj/item/stack/cable_coil = 20, - /obj/item/weapon/stock_parts/capacitor/super = 3) + /obj/item/stock_parts/capacitor/super = 3) // Board for the bomb tester in bomb_tester_vr.dm -/obj/item/weapon/circuitboard/bomb_tester +/obj/item/circuitboard/bomb_tester name = T_BOARD("explosive effect simulator") build_path = /obj/machinery/bomb_tester board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_PHORON = 3, TECH_DATA = 2, TECH_MAGNET = 2) req_components = list( - /obj/item/weapon/stock_parts/matter_bin/adv = 1, - /obj/item/weapon/stock_parts/scanning_module = 5) + /obj/item/stock_parts/matter_bin/adv = 1, + /obj/item/stock_parts/scanning_module = 5) // Board for the timeclock terminal in timeclock_vr.dm -/obj/item/weapon/circuitboard/timeclock +/obj/item/circuitboard/timeclock name = T_BOARD("timeclock") build_path = /obj/machinery/computer/timeclock board_type = new /datum/frame/frame_types/timeclock_terminal matter = list(MAT_STEEL = 50, MAT_GLASS = 50) // Board for the ID restorer in id_restorer_vr.dm -/obj/item/weapon/circuitboard/id_restorer +/obj/item/circuitboard/id_restorer name = T_BOARD("ID restoration console") build_path = /obj/machinery/computer/id_restorer board_type = new /datum/frame/frame_types/id_restorer matter = list(MAT_STEEL = 50, MAT_GLASS = 50) -/obj/item/weapon/circuitboard/security/xenobio +/obj/item/circuitboard/security/xenobio name = T_BOARD("xenobiology camera monitor") build_path = /obj/machinery/computer/security/xenobio network = list(NETWORK_XENOBIO) diff --git a/code/game/objects/items/weapons/circuitboards/computer/air_management.dm b/code/game/objects/items/weapons/circuitboards/computer/air_management.dm index d244fd6b5c0..55a9e7ac062 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/air_management.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/air_management.dm @@ -2,26 +2,26 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/air_management +/obj/item/circuitboard/air_management name = T_BOARD("atmosphere monitoring console") build_path = /obj/machinery/computer/general_air_control var/frequency = 1439 -/obj/item/weapon/circuitboard/air_management/tank_control +/obj/item/circuitboard/air_management/tank_control name = T_BOARD("tank control") build_path = /obj/machinery/computer/general_air_control/large_tank_control frequency = 1441 -/obj/item/weapon/circuitboard/air_management/supermatter_core +/obj/item/circuitboard/air_management/supermatter_core name = T_BOARD("core control") build_path = /obj/machinery/computer/general_air_control/supermatter_core frequency = 1438 -/obj/item/weapon/circuitboard/air_management/injector_control +/obj/item/circuitboard/air_management/injector_control name = T_BOARD("injector control") build_path = /obj/machinery/computer/general_air_control/fuel_injection -/obj/item/weapon/circuitboard/air_management/construct(var/obj/machinery/computer/general_air_control/C) +/obj/item/circuitboard/air_management/construct(var/obj/machinery/computer/general_air_control/C) if (..(C)) C.frequency = frequency -/obj/item/weapon/circuitboard/air_management/deconstruct(var/obj/machinery/computer/general_air_control/C) +/obj/item/circuitboard/air_management/deconstruct(var/obj/machinery/computer/general_air_control/C) if (..(C)) frequency = C.frequency diff --git a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm index 57a7406c82c..f8124d3b2da 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm @@ -2,7 +2,7 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/security +/obj/item/circuitboard/security name = T_BOARD("security camera monitor") build_path = /obj/machinery/computer/security req_access = list(access_security) @@ -10,47 +10,47 @@ var/locked = 1 var/emagged = 0 -/obj/item/weapon/circuitboard/security/New() +/obj/item/circuitboard/security/New() ..() -/obj/item/weapon/circuitboard/security/tv +/obj/item/circuitboard/security/tv name = T_BOARD("security camera monitor - television") build_path = /obj/machinery/computer/security/wooden_tv -/obj/item/weapon/circuitboard/security/engineering +/obj/item/circuitboard/security/engineering name = T_BOARD("engineering camera monitor") build_path = /obj/machinery/computer/security/engineering req_access = list() -/obj/item/weapon/circuitboard/security/engineering/New() +/obj/item/circuitboard/security/engineering/New() ..() network = engineering_networks -/obj/item/weapon/circuitboard/security/mining +/obj/item/circuitboard/security/mining name = T_BOARD("mining camera monitor") build_path = /obj/machinery/computer/security/mining network = list("Mining Outpost") req_access = list() -/obj/item/weapon/circuitboard/security/telescreen/entertainment +/obj/item/circuitboard/security/telescreen/entertainment name = T_BOARD("entertainment camera monitor") build_path = /obj/machinery/computer/security/telescreen/entertainment board_type = new /datum/frame/frame_types/display matter = list(MAT_STEEL = 50, MAT_GLASS = 50) -/obj/item/weapon/circuitboard/security/telescreen/entertainment/New() +/obj/item/circuitboard/security/telescreen/entertainment/New() ..() network = NETWORK_THUNDER -/obj/item/weapon/circuitboard/security/construct(var/obj/machinery/computer/security/C) +/obj/item/circuitboard/security/construct(var/obj/machinery/computer/security/C) if (..(C)) C.set_network(network.Copy()) -/obj/item/weapon/circuitboard/security/deconstruct(var/obj/machinery/computer/security/C) +/obj/item/circuitboard/security/deconstruct(var/obj/machinery/computer/security/C) if (..(C)) network = C.network.Copy() -/obj/item/weapon/circuitboard/security/emag_act(var/remaining_charges, var/mob/user) +/obj/item/circuitboard/security/emag_act(var/remaining_charges, var/mob/user) if(emagged) to_chat(user, "Circuit lock is already removed.") return @@ -59,8 +59,8 @@ locked = 0 return 1 -/obj/item/weapon/circuitboard/security/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I,/obj/item/weapon/card/id)) +/obj/item/circuitboard/security/attackby(obj/item/I as obj, mob/user as mob) + if(istype(I,/obj/item/card/id)) if(emagged) to_chat(user, "Circuit lock does not respond.") return @@ -69,7 +69,7 @@ to_chat(user, "You [locked ? "" : "un"]lock the circuit controls.") else to_chat(user, "Access denied.") - else if(istype(I,/obj/item/device/multitool)) + else if(istype(I,/obj/item/multitool)) if(locked) to_chat(user, "Circuit controls are locked.") return diff --git a/code/game/objects/items/weapons/circuitboards/computer/computer.dm b/code/game/objects/items/weapons/circuitboards/computer/computer.dm index 2c9ef1a7a0c..c340f4958a7 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/computer.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/computer.dm @@ -2,228 +2,228 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/message_monitor +/obj/item/circuitboard/message_monitor name = T_BOARD("message monitor console") build_path = /obj/machinery/computer/message_monitor origin_tech = list(TECH_DATA = 3) -/obj/item/weapon/circuitboard/aiupload +/obj/item/circuitboard/aiupload name = T_BOARD("AI upload console") build_path = /obj/machinery/computer/aiupload origin_tech = list(TECH_DATA = 4) -/obj/item/weapon/circuitboard/borgupload +/obj/item/circuitboard/borgupload name = T_BOARD("cyborg upload console") build_path = /obj/machinery/computer/borgupload origin_tech = list(TECH_DATA = 4) -/obj/item/weapon/circuitboard/med_data +/obj/item/circuitboard/med_data name = T_BOARD("medical records console") build_path = /obj/machinery/computer/med_data -/obj/item/weapon/circuitboard/med_data/pcu +/obj/item/circuitboard/med_data/pcu name = T_BOARD("medical records PCU") build_path = /obj/machinery/computer/med_data/laptop -/obj/item/weapon/circuitboard/scan_consolenew +/obj/item/circuitboard/scan_consolenew name = T_BOARD("DNA machine") build_path = /obj/machinery/computer/scan_consolenew origin_tech = list(TECH_DATA = 2, TECH_BIO = 2) -/obj/item/weapon/circuitboard/communications +/obj/item/circuitboard/communications name = T_BOARD("command and communications console") build_path = /obj/machinery/computer/communications origin_tech = list(TECH_DATA = 2, TECH_MAGNET = 2) -/obj/item/weapon/circuitboard/card +/obj/item/circuitboard/card name = T_BOARD("ID card modification console") build_path = /obj/machinery/computer/card -/obj/item/weapon/circuitboard/card/centcom +/obj/item/circuitboard/card/centcom name = T_BOARD("CentCom ID card modification console") build_path = /obj/machinery/computer/card/centcom -/obj/item/weapon/circuitboard/teleporter +/obj/item/circuitboard/teleporter name = T_BOARD("teleporter control console") build_path = /obj/machinery/computer/teleporter origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 2) -/obj/item/weapon/circuitboard/secure_data +/obj/item/circuitboard/secure_data name = T_BOARD("security records console") build_path = /obj/machinery/computer/secure_data -/obj/item/weapon/circuitboard/skills/pcu +/obj/item/circuitboard/skills/pcu name = T_BOARD("employment records PCU") build_path = /obj/machinery/computer/skills -/obj/item/weapon/circuitboard/stationalert_engineering +/obj/item/circuitboard/stationalert_engineering name = T_BOARD("station alert console (engineering)") build_path = /obj/machinery/computer/station_alert -/obj/item/weapon/circuitboard/stationalert_security +/obj/item/circuitboard/stationalert_security name = T_BOARD("station alert console (security)") build_path = /obj/machinery/computer/station_alert -/obj/item/weapon/circuitboard/stationalert_all +/obj/item/circuitboard/stationalert_all name = T_BOARD("station alert console (all)") build_path = /obj/machinery/computer/station_alert/all -/obj/item/weapon/circuitboard/atmos_alert +/obj/item/circuitboard/atmos_alert name = T_BOARD("atmospheric alert console") build_path = /obj/machinery/computer/atmos_alert -/obj/item/weapon/circuitboard/pod +/obj/item/circuitboard/pod name = T_BOARD("massdriver control") build_path = /obj/machinery/computer/pod -/obj/item/weapon/circuitboard/robotics +/obj/item/circuitboard/robotics name = T_BOARD("robotics control console") build_path = /obj/machinery/computer/robotics origin_tech = list(TECH_DATA = 3) -/obj/item/weapon/circuitboard/drone_control +/obj/item/circuitboard/drone_control name = T_BOARD("drone control console") build_path = /obj/machinery/computer/drone_control origin_tech = list(TECH_DATA = 3) -/obj/item/weapon/circuitboard/cloning +/obj/item/circuitboard/cloning name = T_BOARD("cloning control console") build_path = /obj/machinery/computer/cloning origin_tech = list(TECH_DATA = 3, TECH_BIO = 3) -/obj/item/weapon/circuitboard/arcade/battle +/obj/item/circuitboard/arcade/battle name = T_BOARD("battle arcade machine") build_path = /obj/machinery/computer/arcade/battle origin_tech = list(TECH_DATA = 1) -/obj/item/weapon/circuitboard/arcade/orion_trail +/obj/item/circuitboard/arcade/orion_trail name = T_BOARD("orion trail arcade machine") build_path = /obj/machinery/computer/arcade/orion_trail origin_tech = list(TECH_DATA = 1) -/obj/item/weapon/circuitboard/arcade/clawmachine +/obj/item/circuitboard/arcade/clawmachine name = T_BOARD("grab-a-gift arcade machine") build_path = /obj/machinery/computer/arcade/clawmachine origin_tech = list(TECH_DATA = 1) -/obj/item/weapon/circuitboard/turbine_control +/obj/item/circuitboard/turbine_control name = T_BOARD("turbine control console") build_path = /obj/machinery/computer/turbine_computer origin_tech = list(TECH_DATA = 2, TECH_POWER = 2) -/obj/item/weapon/circuitboard/solar_control +/obj/item/circuitboard/solar_control name = T_BOARD("solar control console") build_path = /obj/machinery/power/solar_control origin_tech = list(TECH_DATA = 2, TECH_POWER = 2) -/obj/item/weapon/circuitboard/powermonitor +/obj/item/circuitboard/powermonitor name = T_BOARD("power monitoring console") build_path = /obj/machinery/computer/power_monitor -/obj/item/weapon/circuitboard/olddoor +/obj/item/circuitboard/olddoor name = T_BOARD("DoorMex") build_path = /obj/machinery/computer/pod/old -/obj/item/weapon/circuitboard/syndicatedoor +/obj/item/circuitboard/syndicatedoor name = T_BOARD("ProComp Executive") build_path = /obj/machinery/computer/pod/old/syndicate -/obj/item/weapon/circuitboard/swfdoor +/obj/item/circuitboard/swfdoor name = T_BOARD("Magix") build_path = /obj/machinery/computer/pod/old/swf -/obj/item/weapon/circuitboard/prisoner +/obj/item/circuitboard/prisoner name = T_BOARD("prisoner management console") build_path = /obj/machinery/computer/prisoner -/obj/item/weapon/circuitboard/mecha_control +/obj/item/circuitboard/mecha_control name = T_BOARD("exosuit control console") build_path = /obj/machinery/computer/mecha -/obj/item/weapon/circuitboard/rdservercontrol +/obj/item/circuitboard/rdservercontrol name = T_BOARD("R&D server control console") build_path = /obj/machinery/computer/rdservercontrol -/obj/item/weapon/circuitboard/crew +/obj/item/circuitboard/crew name = T_BOARD("crew monitoring console") build_path = /obj/machinery/computer/crew origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MAGNET = 2) -/obj/item/weapon/circuitboard/operating +/obj/item/circuitboard/operating name = T_BOARD("patient monitoring console") build_path = /obj/machinery/computer/operating origin_tech = list(TECH_DATA = 2, TECH_BIO = 2) -/obj/item/weapon/circuitboard/curefab +/obj/item/circuitboard/curefab name = T_BOARD("cure fabricator") build_path = /obj/machinery/computer/curer -/obj/item/weapon/circuitboard/splicer +/obj/item/circuitboard/splicer name = T_BOARD("disease splicer") build_path = /obj/machinery/computer/diseasesplicer -/obj/item/weapon/circuitboard/mining_shuttle +/obj/item/circuitboard/mining_shuttle name = T_BOARD("mining shuttle console") build_path = /obj/machinery/computer/shuttle_control/mining origin_tech = list(TECH_DATA = 2) -/obj/item/weapon/circuitboard/engineering_shuttle +/obj/item/circuitboard/engineering_shuttle name = T_BOARD("engineering shuttle console") build_path = /obj/machinery/computer/shuttle_control/engineering origin_tech = list(TECH_DATA = 2) -/obj/item/weapon/circuitboard/research_shuttle +/obj/item/circuitboard/research_shuttle name = T_BOARD("research shuttle console") build_path = /obj/machinery/computer/shuttle_control/research origin_tech = list(TECH_DATA = 2) -/obj/item/weapon/circuitboard/aifixer +/obj/item/circuitboard/aifixer name = T_BOARD("AI integrity restorer") build_path = /obj/machinery/computer/aifixer origin_tech = list(TECH_DATA = 3, TECH_BIO = 2) -/obj/item/weapon/circuitboard/helm +/obj/item/circuitboard/helm name = T_BOARD("helm control console") build_path = /obj/machinery/computer/ship/helm -/obj/item/weapon/circuitboard/engine +/obj/item/circuitboard/engine name = T_BOARD("engine control console") build_path = /obj/machinery/computer/ship/engines -/obj/item/weapon/circuitboard/nav +/obj/item/circuitboard/nav name = T_BOARD("navigation console") build_path = /obj/machinery/computer/ship/navigation -/obj/item/weapon/circuitboard/nav/tele +/obj/item/circuitboard/nav/tele name = T_BOARD("navigation telescreen") build_path = /obj/machinery/computer/ship/navigation/telescreen -/obj/item/weapon/circuitboard/sensors +/obj/item/circuitboard/sensors name = T_BOARD("sensors console") build_path = /obj/machinery/computer/ship/sensors -/obj/item/weapon/circuitboard/area_atmos +/obj/item/circuitboard/area_atmos name = T_BOARD("area air control console") build_path = /obj/machinery/computer/area_atmos origin_tech = list(TECH_DATA = 2) -/obj/item/weapon/circuitboard/prison_shuttle +/obj/item/circuitboard/prison_shuttle name = T_BOARD("prison shuttle control console") build_path = /obj/machinery/computer/prison_shuttle origin_tech = list(TECH_DATA = 2) -/obj/item/weapon/circuitboard/rcon_console +/obj/item/circuitboard/rcon_console name = T_BOARD("RCON remote control console") build_path = /obj/machinery/computer/rcon origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_POWER = 5) -/obj/item/weapon/circuitboard/shutoff_monitor +/obj/item/circuitboard/shutoff_monitor name = T_BOARD("automatic shutoff valve monitor") build_path = /obj/machinery/computer/shutoff_monitor origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) -/obj/item/weapon/circuitboard/stockexchange +/obj/item/circuitboard/stockexchange name = T_BOARD("stock exchange console") build_path = /obj/machinery/computer/stockexchange origin_tech = list(TECH_DATA = 2, TECH_MAGNET = 1) \ No newline at end of file diff --git a/code/game/objects/items/weapons/circuitboards/computer/research.dm b/code/game/objects/items/weapons/circuitboards/computer/research.dm index 43ea3d3cd61..5c4c2f8d48c 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/research.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/research.dm @@ -2,11 +2,11 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/rdconsole +/obj/item/circuitboard/rdconsole name = T_BOARD("R&D control console") build_path = /obj/machinery/computer/rdconsole/core -/obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob) +/obj/item/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob) if(I.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, I.usesound, 50, 1) user.visible_message("\The [user] adjusts the jumper on \the [src]'s access protocol pins.", "You adjust the jumper on the access protocol pins.") diff --git a/code/game/objects/items/weapons/circuitboards/computer/shuttle.dm b/code/game/objects/items/weapons/circuitboards/computer/shuttle.dm index 1c3c0ec25f4..b6e273a1f4a 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/shuttle.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/shuttle.dm @@ -5,18 +5,18 @@ // // Shuttle control console. Board tries to auto-link the computer if built on a shuttle. // -/obj/item/weapon/circuitboard/shuttle_console +/obj/item/circuitboard/shuttle_console origin_tech = list(TECH_DATA = 3) var/shuttle_category = null // Shuttle datum's category must exactly equal this to auto-detect var/shuttle_tag = null // If set, link constructed console to this shuttle. If null, auto-detect. -/obj/item/weapon/circuitboard/shuttle_console/deconstruct(obj/machinery/computer/shuttle_control/M) +/obj/item/circuitboard/shuttle_console/deconstruct(obj/machinery/computer/shuttle_control/M) shuttle_tag = M.shuttle_tag if(shuttle_tag) name = T_BOARD("[shuttle_tag] control console") // Try to auto-link the shuttle computer if it is constructed on a shuttle (and not pre-programmed) -/obj/item/weapon/circuitboard/shuttle_console/construct(obj/machinery/computer/shuttle_control/M) +/obj/item/circuitboard/shuttle_console/construct(obj/machinery/computer/shuttle_control/M) if(!shuttle_tag) shuttle_tag = auto_detect_shuttle(M) // We don't have a preset tag, so lets try to auto-link. if(shuttle_tag && M.set_shuttle_tag(shuttle_tag)) @@ -24,7 +24,7 @@ M.ping("[M] auto-links with shuttle [shuttle_tag]") // Return shuttle_tag of shuttle of current area -/obj/item/weapon/circuitboard/shuttle_console/proc/auto_detect_shuttle(obj/machinery/computer/shuttle_control/M) +/obj/item/circuitboard/shuttle_console/proc/auto_detect_shuttle(obj/machinery/computer/shuttle_control/M) var/area/A = get_area(M) if(!A || !(A in SSshuttles.shuttle_areas)) return // Definately not on a shuttle @@ -35,20 +35,20 @@ return (S.category == shuttle_category) ? S.name : null // Overmap shuttle console. -/obj/item/weapon/circuitboard/shuttle_console/explore +/obj/item/circuitboard/shuttle_console/explore name = T_BOARD("long range shuttle control console") build_path = /obj/machinery/computer/shuttle_control/explore origin_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 4) shuttle_category = /datum/shuttle/autodock/overmap // Multi-shuttle console -/obj/item/weapon/circuitboard/shuttle_console/multi +/obj/item/circuitboard/shuttle_console/multi name = T_BOARD("multi-route shuttle control console") build_path = /obj/machinery/computer/shuttle_control/multi shuttle_category = /datum/shuttle/autodock/multi // Basic "ferry" shuttle console -/obj/item/weapon/circuitboard/shuttle_console/ferry +/obj/item/circuitboard/shuttle_console/ferry name = T_BOARD("basic shuttle control console") build_path = /obj/machinery/computer/shuttle_control shuttle_category = /datum/shuttle/autodock/ferry diff --git a/code/game/objects/items/weapons/circuitboards/computer/supply.dm b/code/game/objects/items/weapons/circuitboards/computer/supply.dm index a120db809af..1a3d671b96b 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/supply.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/supply.dm @@ -2,27 +2,27 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/supplycomp +/obj/item/circuitboard/supplycomp name = T_BOARD("supply ordering console") build_path = /obj/machinery/computer/supplycomp origin_tech = list(TECH_DATA = 2) var/contraband_enabled = 0 -/obj/item/weapon/circuitboard/supplycomp/control +/obj/item/circuitboard/supplycomp/control name = T_BOARD("supply ordering console") build_path = /obj/machinery/computer/supplycomp/control origin_tech = list(TECH_DATA = 3) -/obj/item/weapon/circuitboard/supplycomp/construct(var/obj/machinery/computer/supplycomp/SC) +/obj/item/circuitboard/supplycomp/construct(var/obj/machinery/computer/supplycomp/SC) if (..(SC)) SC.can_order_contraband = contraband_enabled -/obj/item/weapon/circuitboard/supplycomp/deconstruct(var/obj/machinery/computer/supplycomp/SC) +/obj/item/circuitboard/supplycomp/deconstruct(var/obj/machinery/computer/supplycomp/SC) if (..(SC)) contraband_enabled = SC.can_order_contraband -/obj/item/weapon/circuitboard/supplycomp/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I,/obj/item/device/multitool)) +/obj/item/circuitboard/supplycomp/attackby(obj/item/I as obj, mob/user as mob) + if(istype(I,/obj/item/multitool)) var/catastasis = src.contraband_enabled var/opposite_catastasis if(catastasis) diff --git a/code/game/objects/items/weapons/circuitboards/computer/telecomms.dm b/code/game/objects/items/weapons/circuitboards/computer/telecomms.dm index b7ad5db0118..f9bfcb5364c 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/telecomms.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/telecomms.dm @@ -2,17 +2,17 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/comm_monitor +/obj/item/circuitboard/comm_monitor name = T_BOARD("telecommunications monitor console") build_path = /obj/machinery/computer/telecomms/monitor origin_tech = list(TECH_DATA = 3) -/obj/item/weapon/circuitboard/comm_server +/obj/item/circuitboard/comm_server name = T_BOARD("telecommunications server monitor console") build_path = /obj/machinery/computer/telecomms/server origin_tech = list(TECH_DATA = 3) -/obj/item/weapon/circuitboard/comm_traffic +/obj/item/circuitboard/comm_traffic name = T_BOARD("telecommunications traffic control console") build_path = /obj/machinery/computer/telecomms/traffic origin_tech = list(TECH_DATA = 3) diff --git a/code/game/objects/items/weapons/circuitboards/frame.dm b/code/game/objects/items/weapons/circuitboards/frame.dm index 15644652944..10b9b00771a 100644 --- a/code/game/objects/items/weapons/circuitboards/frame.dm +++ b/code/game/objects/items/weapons/circuitboards/frame.dm @@ -6,37 +6,37 @@ //Display -/obj/item/weapon/circuitboard/guestpass +/obj/item/circuitboard/guestpass name = T_BOARD("guestpass console") build_path = /obj/machinery/computer/guestpass board_type = new /datum/frame/frame_types/guest_pass_console matter = list(MAT_STEEL = 50, MAT_GLASS = 50) -/obj/item/weapon/circuitboard/status_display +/obj/item/circuitboard/status_display name = T_BOARD("status display") build_path = /obj/machinery/status_display board_type = new /datum/frame/frame_types/display matter = list(MAT_STEEL = 50, MAT_GLASS = 50) -/obj/item/weapon/circuitboard/ai_status_display +/obj/item/circuitboard/ai_status_display name = T_BOARD("ai status display") build_path = /obj/machinery/ai_status_display board_type = new /datum/frame/frame_types/display matter = list(MAT_STEEL = 50, MAT_GLASS = 50) -/obj/item/weapon/circuitboard/newscaster +/obj/item/circuitboard/newscaster name = T_BOARD("newscaster") build_path = /obj/machinery/newscaster board_type = new /datum/frame/frame_types/newscaster matter = list(MAT_STEEL = 50, MAT_GLASS = 50) -/obj/item/weapon/circuitboard/atm +/obj/item/circuitboard/atm name = T_BOARD("atm") build_path = /obj/machinery/atm board_type = new /datum/frame/frame_types/atm matter = list(MAT_STEEL = 50, MAT_GLASS = 50) -/obj/item/weapon/circuitboard/request +/obj/item/circuitboard/request name = T_BOARD("request console") build_path = /obj/machinery/requests_console board_type = new /datum/frame/frame_types/supply_request_console @@ -44,44 +44,44 @@ //Alarm -/obj/item/weapon/circuitboard/firealarm +/obj/item/circuitboard/firealarm name = T_BOARD("fire alarm") build_path = /obj/machinery/firealarm board_type = new /datum/frame/frame_types/fire_alarm matter = list(MAT_STEEL = 50, MAT_GLASS = 50) -/obj/item/weapon/circuitboard/airalarm +/obj/item/circuitboard/airalarm name = T_BOARD("air alarm") build_path = /obj/machinery/alarm board_type = new /datum/frame/frame_types/air_alarm matter = list(MAT_STEEL = 50, MAT_GLASS = 50) -/obj/item/weapon/circuitboard/intercom +/obj/item/circuitboard/intercom name = T_BOARD("intercom") - build_path = /obj/item/device/radio/intercom + build_path = /obj/item/radio/intercom board_type = new /datum/frame/frame_types/intercom matter = list(MAT_STEEL = 50, MAT_GLASS = 50) -/obj/item/weapon/circuitboard/intercom/Destroy() - if(istype(loc, /obj/item/device/radio/intercom)) - var/obj/item/device/radio/intercom/my_machine = loc +/obj/item/circuitboard/intercom/Destroy() + if(istype(loc, /obj/item/radio/intercom)) + var/obj/item/radio/intercom/my_machine = loc my_machine.circuit = null . = ..() -/obj/item/weapon/circuitboard/keycard_auth +/obj/item/circuitboard/keycard_auth name = T_BOARD("keycard authenticator") build_path = /obj/machinery/keycard_auth board_type = new /datum/frame/frame_types/keycard_authenticator matter = list(MAT_STEEL = 50, MAT_GLASS = 50) -/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) -/obj/item/weapon/circuitboard/electrochromic +/obj/item/circuitboard/electrochromic name = T_BOARD("electrochromic button") build_path = /obj/machinery/button/windowtint board_type = new /datum/frame/frame_types/electrochromic_button @@ -89,19 +89,19 @@ //Computer -/obj/item/weapon/circuitboard/holopad +/obj/item/circuitboard/holopad name = T_BOARD("holopad") build_path = /obj/machinery/hologram/holopad board_type = new /datum/frame/frame_types/holopad matter = list(MAT_STEEL = 50, MAT_GLASS = 50) -/obj/item/weapon/circuitboard/scanner_console +/obj/item/circuitboard/scanner_console name = T_BOARD("body scanner console") build_path = /obj/machinery/body_scanconsole board_type = new /datum/frame/frame_types/medical_console origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) -/obj/item/weapon/circuitboard/sleeper_console +/obj/item/circuitboard/sleeper_console name = T_BOARD("sleeper console") build_path = /obj/machinery/sleep_console board_type = new /datum/frame/frame_types/medical_console @@ -109,185 +109,185 @@ //Machine -/obj/item/weapon/circuitboard/photocopier +/obj/item/circuitboard/photocopier name = T_BOARD("photocopier") build_path = /obj/machinery/photocopier board_type = new /datum/frame/frame_types/photocopier matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( - /obj/item/weapon/stock_parts/scanning_module = 1, - /obj/item/weapon/stock_parts/motor = 1, - /obj/item/weapon/stock_parts/micro_laser = 1, - /obj/item/weapon/stock_parts/matter_bin = 1) + /obj/item/stock_parts/scanning_module = 1, + /obj/item/stock_parts/motor = 1, + /obj/item/stock_parts/micro_laser = 1, + /obj/item/stock_parts/matter_bin = 1) -/obj/item/weapon/circuitboard/fax +/obj/item/circuitboard/fax name = T_BOARD("fax") build_path = /obj/machinery/photocopier/faxmachine board_type = new /datum/frame/frame_types/fax matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( - /obj/item/weapon/stock_parts/scanning_module = 1, - /obj/item/weapon/stock_parts/motor = 1, - /obj/item/weapon/stock_parts/micro_laser = 1, - /obj/item/weapon/stock_parts/matter_bin = 1) + /obj/item/stock_parts/scanning_module = 1, + /obj/item/stock_parts/motor = 1, + /obj/item/stock_parts/micro_laser = 1, + /obj/item/stock_parts/matter_bin = 1) -/obj/item/weapon/circuitboard/conveyor +/obj/item/circuitboard/conveyor name = T_BOARD("conveyor") build_path = /obj/machinery/conveyor board_type = new /datum/frame/frame_types/conveyor req_components = list( - /obj/item/weapon/stock_parts/gear = 2, - /obj/item/weapon/stock_parts/motor = 2, + /obj/item/stock_parts/gear = 2, + /obj/item/stock_parts/motor = 2, /obj/item/stack/cable_coil = 5) -/obj/item/weapon/circuitboard/recharger +/obj/item/circuitboard/recharger name = T_BOARD("recharger") build_path = /obj/machinery/recharger board_type = new /datum/frame/frame_types/recharger req_components = list( - /obj/item/weapon/stock_parts/capacitor = 1, + /obj/item/stock_parts/capacitor = 1, /obj/item/stack/cable_coil = 5) -/obj/item/weapon/circuitboard/recharger/wrecharger +/obj/item/circuitboard/recharger/wrecharger name = T_BOARD("wall recharger") build_path = /obj/machinery/recharger/wallcharger board_type = new /datum/frame/frame_types/wall_charger -/obj/item/weapon/circuitboard/cell_charger +/obj/item/circuitboard/cell_charger name = T_BOARD("heavy-duty cell charger") build_path = /obj/machinery/cell_charger board_type = new /datum/frame/frame_types/cell_charger req_components = list( - /obj/item/weapon/stock_parts/capacitor = 1, + /obj/item/stock_parts/capacitor = 1, /obj/item/stack/cable_coil = 5) -/obj/item/weapon/circuitboard/washing +/obj/item/circuitboard/washing name = T_BOARD("washing machine") build_path = /obj/machinery/washing_machine board_type = new /datum/frame/frame_types/washing_machine matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( - /obj/item/weapon/stock_parts/motor = 1, - /obj/item/weapon/stock_parts/gear = 2) + /obj/item/stock_parts/motor = 1, + /obj/item/stock_parts/gear = 2) -/obj/item/weapon/circuitboard/grinder +/obj/item/circuitboard/grinder name = T_BOARD("reagent grinder") build_path = /obj/machinery/reagentgrinder board_type = new /datum/frame/frame_types/grinder req_components = list( - /obj/item/weapon/stock_parts/motor = 1, - /obj/item/weapon/stock_parts/gear = 1, - /obj/item/weapon/reagent_containers/glass/beaker/large = 1) + /obj/item/stock_parts/motor = 1, + /obj/item/stock_parts/gear = 1, + /obj/item/reagent_containers/glass/beaker/large = 1) -/obj/item/weapon/circuitboard/distiller +/obj/item/circuitboard/distiller build_path = /obj/machinery/portable_atmospherics/powered/reagent_distillery board_type = new /datum/frame/frame_types/reagent_distillery req_components = list( - /obj/item/weapon/stock_parts/capacitor = 1, - /obj/item/weapon/stock_parts/micro_laser = 1, - /obj/item/weapon/stock_parts/motor = 2, - /obj/item/weapon/stock_parts/gear = 1) + /obj/item/stock_parts/capacitor = 1, + /obj/item/stock_parts/micro_laser = 1, + /obj/item/stock_parts/motor = 2, + /obj/item/stock_parts/gear = 1) -/obj/item/weapon/circuitboard/teleporter_hub +/obj/item/circuitboard/teleporter_hub name = T_BOARD("teleporter hub") build_path = /obj/machinery/teleport/hub board_type = "teleporter_hub" // origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 4) req_components = list( - /obj/item/weapon/stock_parts/scanning_module = 4, - /obj/item/weapon/stock_parts/micro_laser = 4, + /obj/item/stock_parts/scanning_module = 4, + /obj/item/stock_parts/micro_laser = 4, /obj/item/stack/cable_coil = 10) -/obj/item/weapon/circuitboard/teleporter_station +/obj/item/circuitboard/teleporter_station name = T_BOARD("teleporter station") build_path = /obj/machinery/teleport/station board_type = "teleporter_station" // origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 3) req_components = list( - /obj/item/weapon/stock_parts/console_screen = 1, - /obj/item/weapon/stock_parts/capacitor = 2, + /obj/item/stock_parts/console_screen = 1, + /obj/item/stock_parts/capacitor = 2, /obj/item/stack/cable_coil = 10) -/obj/item/weapon/circuitboard/body_scanner +/obj/item/circuitboard/body_scanner name = T_BOARD("body scanner") build_path = /obj/machinery/bodyscanner board_type = new /datum/frame/frame_types/medical_pod origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) req_components = list( - /obj/item/weapon/stock_parts/scanning_module = 3, + /obj/item/stock_parts/scanning_module = 3, /obj/item/stack/material/glass/reinforced = 2) -/obj/item/weapon/circuitboard/medical_kiosk +/obj/item/circuitboard/medical_kiosk name = T_BOARD("medical kiosk") build_path = /obj/machinery/medical_kiosk board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) req_components = list( - /obj/item/weapon/stock_parts/scanning_module = 3, + /obj/item/stock_parts/scanning_module = 3, /obj/item/stack/material/glass/reinforced = 2) -/obj/item/weapon/circuitboard/sleeper +/obj/item/circuitboard/sleeper name = T_BOARD("sleeper") build_path = /obj/machinery/sleeper board_type = new /datum/frame/frame_types/medical_pod origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) req_components = list( - /obj/item/weapon/stock_parts/manipulator = 1, - /obj/item/weapon/stock_parts/scanning_module = 1, - /obj/item/weapon/reagent_containers/glass/beaker = 3, - /obj/item/weapon/reagent_containers/syringe = 3, + /obj/item/stock_parts/manipulator = 1, + /obj/item/stock_parts/scanning_module = 1, + /obj/item/reagent_containers/glass/beaker = 3, + /obj/item/reagent_containers/syringe = 3, /obj/item/stack/material/glass/reinforced = 2) -/obj/item/weapon/circuitboard/vr_sleeper +/obj/item/circuitboard/vr_sleeper name = T_BOARD("VR sleeper") build_path = /obj/machinery/vr_sleeper board_type = new /datum/frame/frame_types/medical_pod origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) req_components = list( - /obj/item/weapon/stock_parts/scanning_module = 1, + /obj/item/stock_parts/scanning_module = 1, /obj/item/stack/material/glass/reinforced = 2) -/obj/item/weapon/circuitboard/dna_analyzer +/obj/item/circuitboard/dna_analyzer name = T_BOARD("dna analyzer") build_path = /obj/machinery/dnaforensics board_type = new /datum/frame/frame_types/dna_analyzer origin_tech = list(TECH_MAGNET = 4, TECH_BIO = 2, TECH_DATA = 2) req_components = list( - /obj/item/weapon/stock_parts/scanning_module = 2, - /obj/item/weapon/stock_parts/micro_laser = 1, - /obj/item/weapon/stock_parts/console_screen = 1) + /obj/item/stock_parts/scanning_module = 2, + /obj/item/stock_parts/micro_laser = 1, + /obj/item/stock_parts/console_screen = 1) -/obj/item/weapon/circuitboard/mass_driver +/obj/item/circuitboard/mass_driver name = T_BOARD("mass driver") build_path = /obj/machinery/mass_driver board_type = new /datum/frame/frame_types/mass_driver req_components = list( - /obj/item/weapon/stock_parts/gear = 2, - /obj/item/weapon/stock_parts/motor = 2, - /obj/item/weapon/stock_parts/capacitor = 1, - /obj/item/weapon/stock_parts/spring = 1, + /obj/item/stock_parts/gear = 2, + /obj/item/stock_parts/motor = 2, + /obj/item/stock_parts/capacitor = 1, + /obj/item/stock_parts/spring = 1, /obj/item/stack/cable_coil = 5) -/obj/item/weapon/circuitboard/arf_generator +/obj/item/circuitboard/arf_generator name = T_BOARD("atmospheric field generator") build_path = /obj/machinery/atmospheric_field_generator board_type = new /datum/frame/frame_types/arfgs origin_tech = list(TECH_MAGNET = 4, TECH_POWER = 4, TECH_BIO = 3) req_components = list( - /obj/item/weapon/stock_parts/micro_laser/high = 2, //field emitters - /obj/item/weapon/stock_parts/scanning_module = 1, //atmosphere sensor - /obj/item/weapon/stock_parts/capacitor/adv = 1, //for the JUICE + /obj/item/stock_parts/micro_laser/high = 2, //field emitters + /obj/item/stock_parts/scanning_module = 1, //atmosphere sensor + /obj/item/stock_parts/capacitor/adv = 1, //for the JUICE /obj/item/stack/cable_coil = 10) -/obj/item/weapon/circuitboard/injector_maker +/obj/item/circuitboard/injector_maker name = T_BOARD("Ready-to-Use Medicine 3000") build_path = /obj/machinery/injector_maker board_type = new /datum/frame/frame_types/injector_maker origin_tech = list(TECH_BIO = 3, TECH_ENGINEERING = 2, TECH_MATERIAL = 2) req_components = list( - /obj/item/weapon/stock_parts/matter_bin = 2, - /obj/item/weapon/stock_parts/manipulator = 1, - /obj/item/weapon/stock_parts/micro_laser = 1, - /obj/item/weapon/stock_parts/console_screen = 1 + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/manipulator = 1, + /obj/item/stock_parts/micro_laser = 1, + /obj/item/stock_parts/console_screen = 1 ) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm b/code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm index c32b93484e0..ff19969881f 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm @@ -2,11 +2,11 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/biogenerator +/obj/item/circuitboard/biogenerator name = T_BOARD("biogenerator") build_path = /obj/machinery/biogenerator board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 2) req_components = list( - /obj/item/weapon/stock_parts/matter_bin = 1, - /obj/item/weapon/stock_parts/manipulator = 1) \ No newline at end of file + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stock_parts/manipulator = 1) \ No newline at end of file diff --git a/code/game/objects/items/weapons/circuitboards/machinery/cloning.dm b/code/game/objects/items/weapons/circuitboards/machinery/cloning.dm index ffca070fe9d..1602a5b4bf0 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/cloning.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/cloning.dm @@ -2,25 +2,25 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/clonepod +/obj/item/circuitboard/clonepod name = T_BOARD("clone pod") build_path = /obj/machinery/clonepod board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 3, TECH_BIO = 3) req_components = list( /obj/item/stack/cable_coil = 2, - /obj/item/weapon/stock_parts/scanning_module = 2, - /obj/item/weapon/stock_parts/manipulator = 2, - /obj/item/weapon/stock_parts/console_screen = 1) + /obj/item/stock_parts/scanning_module = 2, + /obj/item/stock_parts/manipulator = 2, + /obj/item/stock_parts/console_screen = 1) -/obj/item/weapon/circuitboard/clonescanner +/obj/item/circuitboard/clonescanner name = T_BOARD("cloning scanner") build_path = /obj/machinery/dna_scannernew board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 2, TECH_BIO = 2) req_components = list( - /obj/item/weapon/stock_parts/scanning_module = 1, - /obj/item/weapon/stock_parts/manipulator = 1, - /obj/item/weapon/stock_parts/micro_laser = 1, - /obj/item/weapon/stock_parts/console_screen = 1, + /obj/item/stock_parts/scanning_module = 1, + /obj/item/stock_parts/manipulator = 1, + /obj/item/stock_parts/micro_laser = 1, + /obj/item/stock_parts/console_screen = 1, /obj/item/stack/cable_coil = 2) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/engineering.dm b/code/game/objects/items/weapons/circuitboards/machinery/engineering.dm index 39096d5e9c5..c31faab2a39 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/engineering.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/engineering.dm @@ -2,12 +2,12 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/pipelayer +/obj/item/circuitboard/pipelayer name = T_BOARD("pipe layer") build_path = /obj/machinery/pipelayer board_type = new /datum/frame/frame_types/machine matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( - /obj/item/weapon/stock_parts/motor = 1, - /obj/item/weapon/stock_parts/gear = 1, - /obj/item/weapon/stock_parts/matter_bin = 1) + /obj/item/stock_parts/motor = 1, + /obj/item/stock_parts/gear = 1, + /obj/item/stock_parts/matter_bin = 1) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/fluidpump.dm b/code/game/objects/items/weapons/circuitboards/machinery/fluidpump.dm index 3646d7311a0..3e702a7e6fc 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/fluidpump.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/fluidpump.dm @@ -3,12 +3,12 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/fluidpump +/obj/item/circuitboard/fluidpump name = T_BOARD("fluid pump") build_path = /obj/machinery/pump board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 1) req_components = list( - /obj/item/weapon/stock_parts/matter_bin = 2, - /obj/item/weapon/stock_parts/motor = 2, - /obj/item/weapon/stock_parts/manipulator = 1) + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/motor = 2, + /obj/item/stock_parts/manipulator = 1) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/jukebox.dm b/code/game/objects/items/weapons/circuitboards/machinery/jukebox.dm index ab3ae6f3843..f846586fcec 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/jukebox.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/jukebox.dm @@ -2,12 +2,12 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/jukebox +/obj/item/circuitboard/jukebox name = T_BOARD("jukebox") build_path = /obj/machinery/media/jukebox board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_MAGNET = 2, TECH_DATA = 1) req_components = list( - /obj/item/weapon/stock_parts/capacitor = 1, - /obj/item/weapon/stock_parts/console_screen = 1, + /obj/item/stock_parts/capacitor = 1, + /obj/item/stock_parts/console_screen = 1, /obj/item/stack/cable_coil = 5) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/kitchen_appliances.dm b/code/game/objects/items/weapons/circuitboards/machinery/kitchen_appliances.dm index 579c5885193..6f54f8e31ef 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/kitchen_appliances.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/kitchen_appliances.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/circuitboard/microwave +/obj/item/circuitboard/microwave name = T_BOARD("microwave") desc = "The circuitboard for a microwave." build_path = /obj/machinery/microwave @@ -6,69 +6,69 @@ contain_parts = 0 matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( - /obj/item/weapon/stock_parts/console_screen = 1, - /obj/item/weapon/stock_parts/capacitor = 3, // Original Capacitor count was 1 - /obj/item/weapon/stock_parts/motor = 1, - /obj/item/weapon/stock_parts/scanning_module = 1, - /obj/item/weapon/stock_parts/matter_bin = 2) + /obj/item/stock_parts/console_screen = 1, + /obj/item/stock_parts/capacitor = 3, // Original Capacitor count was 1 + /obj/item/stock_parts/motor = 1, + /obj/item/stock_parts/scanning_module = 1, + /obj/item/stock_parts/matter_bin = 2) -/obj/item/weapon/circuitboard/oven +/obj/item/circuitboard/oven name = T_BOARD("oven") desc = "The circuitboard for an oven." build_path = /obj/machinery/appliance/cooker/oven board_type = new /datum/frame/frame_types/machine matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( - /obj/item/weapon/stock_parts/capacitor = 3, - /obj/item/weapon/stock_parts/scanning_module = 1, - /obj/item/weapon/stock_parts/matter_bin = 2) + /obj/item/stock_parts/capacitor = 3, + /obj/item/stock_parts/scanning_module = 1, + /obj/item/stock_parts/matter_bin = 2) -/obj/item/weapon/circuitboard/fryer +/obj/item/circuitboard/fryer name = T_BOARD("deep fryer") desc = "The circuitboard for a deep fryer." build_path = /obj/machinery/appliance/cooker/fryer board_type = new /datum/frame/frame_types/machine req_components = list( - /obj/item/weapon/stock_parts/capacitor = 3, - /obj/item/weapon/stock_parts/scanning_module = 1, - /obj/item/weapon/stock_parts/matter_bin = 2) + /obj/item/stock_parts/capacitor = 3, + /obj/item/stock_parts/scanning_module = 1, + /obj/item/stock_parts/matter_bin = 2) -/obj/item/weapon/circuitboard/grill +/obj/item/circuitboard/grill name = T_BOARD("grill") desc = "The circuitboard for an industrial grill." build_path = /obj/machinery/appliance/cooker/grill board_type = new /datum/frame/frame_types/machine req_components = list( - /obj/item/weapon/stock_parts/capacitor = 3, - /obj/item/weapon/stock_parts/scanning_module = 1, - /obj/item/weapon/stock_parts/matter_bin = 2) + /obj/item/stock_parts/capacitor = 3, + /obj/item/stock_parts/scanning_module = 1, + /obj/item/stock_parts/matter_bin = 2) -/obj/item/weapon/circuitboard/cerealmaker +/obj/item/circuitboard/cerealmaker name = T_BOARD("cereal maker") desc = "The circuitboard for a cereal maker." build_path = /obj/machinery/appliance/mixer/cereal board_type = new /datum/frame/frame_types/machine req_components = list( - /obj/item/weapon/stock_parts/capacitor = 3, - /obj/item/weapon/stock_parts/scanning_module = 1, - /obj/item/weapon/stock_parts/matter_bin = 2) + /obj/item/stock_parts/capacitor = 3, + /obj/item/stock_parts/scanning_module = 1, + /obj/item/stock_parts/matter_bin = 2) -/obj/item/weapon/circuitboard/candymachine +/obj/item/circuitboard/candymachine name = T_BOARD("candy machine") desc = "The circuitboard for a candy machine." build_path = /obj/machinery/appliance/mixer/candy board_type = new /datum/frame/frame_types/machine req_components = list( - /obj/item/weapon/stock_parts/capacitor = 3, - /obj/item/weapon/stock_parts/scanning_module = 1, - /obj/item/weapon/stock_parts/matter_bin = 2) + /obj/item/stock_parts/capacitor = 3, + /obj/item/stock_parts/scanning_module = 1, + /obj/item/stock_parts/matter_bin = 2) -/obj/item/weapon/circuitboard/microwave/advanced +/obj/item/circuitboard/microwave/advanced name = T_BOARD("deluxe microwave") build_path = /obj/machinery/microwave/advanced board_type = new /datum/frame/frame_types/microwave matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( - /obj/item/weapon/stock_parts/console_screen = 1, - /obj/item/weapon/stock_parts/motor = 1, - /obj/item/weapon/stock_parts/capacitor = 1) \ No newline at end of file + /obj/item/stock_parts/console_screen = 1, + /obj/item/stock_parts/motor = 1, + /obj/item/stock_parts/capacitor = 1) \ No newline at end of file diff --git a/code/game/objects/items/weapons/circuitboards/machinery/mech_recharger.dm b/code/game/objects/items/weapons/circuitboards/machinery/mech_recharger.dm index 01d5f0933c8..ef3dce3b74d 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/mech_recharger.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/mech_recharger.dm @@ -2,12 +2,12 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/mech_recharger +/obj/item/circuitboard/mech_recharger name = T_BOARD("mech recharger") build_path = /obj/machinery/mech_recharger board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 2, TECH_POWER = 2, TECH_ENGINEERING = 2) req_components = list( - /obj/item/weapon/stock_parts/capacitor = 2, - /obj/item/weapon/stock_parts/scanning_module = 1, - /obj/item/weapon/stock_parts/manipulator = 2) \ No newline at end of file + /obj/item/stock_parts/capacitor = 2, + /obj/item/stock_parts/scanning_module = 1, + /obj/item/stock_parts/manipulator = 2) \ No newline at end of file diff --git a/code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm b/code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm index 3f97fad2f78..03770c7aca5 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm @@ -2,21 +2,21 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/miningdrill +/obj/item/circuitboard/miningdrill name = T_BOARD("mining drill head") build_path = /obj/machinery/mining/drill board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) req_components = list( - /obj/item/weapon/stock_parts/capacitor = 1, - /obj/item/weapon/stock_parts/matter_bin = 1, - /obj/item/weapon/stock_parts/micro_laser = 1) + /obj/item/stock_parts/capacitor = 1, + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stock_parts/micro_laser = 1) -/obj/item/weapon/circuitboard/miningdrillbrace +/obj/item/circuitboard/miningdrillbrace name = T_BOARD("mining drill brace") build_path = /obj/machinery/mining/brace board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) req_components = list( - /obj/item/weapon/stock_parts/manipulator = 1 + /obj/item/stock_parts/manipulator = 1 ) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/pacman.dm b/code/game/objects/items/weapons/circuitboards/machinery/pacman.dm index 218ffd924ad..c277882e04c 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/pacman.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/pacman.dm @@ -2,23 +2,23 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/pacman +/obj/item/circuitboard/pacman name = T_BOARD("PACMAN-type generator") build_path = /obj/machinery/power/port_gen/pacman board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 3, TECH_POWER = 3, TECH_PHORON = 3, TECH_ENGINEERING = 3) req_components = list( - /obj/item/weapon/stock_parts/matter_bin = 1, - /obj/item/weapon/stock_parts/micro_laser = 1, + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stock_parts/micro_laser = 1, /obj/item/stack/cable_coil = 2, - /obj/item/weapon/stock_parts/capacitor = 1) + /obj/item/stock_parts/capacitor = 1) -/obj/item/weapon/circuitboard/pacman/super +/obj/item/circuitboard/pacman/super name = T_BOARD("SUPERPACMAN-type generator") build_path = /obj/machinery/power/port_gen/pacman/super origin_tech = list(TECH_DATA = 3, TECH_POWER = 4, TECH_ENGINEERING = 4) -/obj/item/weapon/circuitboard/pacman/mrs +/obj/item/circuitboard/pacman/mrs name = T_BOARD("MRSPACMAN-type generator") build_path = /obj/machinery/power/port_gen/pacman/mrs origin_tech = list(TECH_DATA = 3, TECH_POWER = 5, TECH_ENGINEERING = 5) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/papershredder.dm b/code/game/objects/items/weapons/circuitboards/machinery/papershredder.dm index 2b55db3adf3..ddb45b0247c 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/papershredder.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/papershredder.dm @@ -2,12 +2,12 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/papershredder +/obj/item/circuitboard/papershredder name = T_BOARD("papershredder") build_path = /obj/machinery/papershredder board_type = new /datum/frame/frame_types/machine matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( - /obj/item/weapon/stock_parts/motor = 1, - /obj/item/weapon/stock_parts/gear = 2, - /obj/item/weapon/stock_parts/micro_laser = 1) + /obj/item/stock_parts/motor = 1, + /obj/item/stock_parts/gear = 2, + /obj/item/stock_parts/micro_laser = 1) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/power.dm b/code/game/objects/items/weapons/circuitboards/machinery/power.dm index e874d04d491..083124f4789 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/power.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/power.dm @@ -2,37 +2,37 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/smes +/obj/item/circuitboard/smes name = T_BOARD("superconductive magnetic energy storage") build_path = /obj/machinery/power/smes/buildable board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_POWER = 6, TECH_ENGINEERING = 4) - req_components = list(/obj/item/weapon/smes_coil = 1, /obj/item/stack/cable_coil = 30) + req_components = list(/obj/item/smes_coil = 1, /obj/item/stack/cable_coil = 30) -/obj/item/weapon/circuitboard/smes/construct(var/obj/machinery/power/smes/buildable/S) +/obj/item/circuitboard/smes/construct(var/obj/machinery/power/smes/buildable/S) if(..(S)) S.output_attempt = 0 //built SMES default to off -/obj/item/weapon/circuitboard/batteryrack +/obj/item/circuitboard/batteryrack name = T_BOARD("battery rack PSU") build_path = /obj/machinery/power/smes/batteryrack board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 2) - req_components = list(/obj/item/weapon/stock_parts/capacitor/ = 3, /obj/item/weapon/stock_parts/matter_bin/ = 1) + req_components = list(/obj/item/stock_parts/capacitor/ = 3, /obj/item/stock_parts/matter_bin/ = 1) -/obj/item/weapon/circuitboard/grid_checker +/obj/item/circuitboard/grid_checker name = T_BOARD("power grid checker") build_path = /obj/machinery/power/grid_checker board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_POWER = 4, TECH_ENGINEERING = 3) - req_components = list(/obj/item/weapon/stock_parts/capacitor = 3, /obj/item/stack/cable_coil = 10) + req_components = list(/obj/item/stock_parts/capacitor = 3, /obj/item/stack/cable_coil = 10) -/obj/item/weapon/circuitboard/breakerbox +/obj/item/circuitboard/breakerbox name = T_BOARD("breaker box") build_path = /obj/machinery/power/breakerbox board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 3) req_components = list( - /obj/item/weapon/stock_parts/spring = 1, - /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/stock_parts/spring = 1, + /obj/item/stock_parts/manipulator = 1, /obj/item/stack/cable_coil = 10) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm b/code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm index f45549bab64..fe54eb44322 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm @@ -2,13 +2,13 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/recharge_station +/obj/item/circuitboard/recharge_station name = T_BOARD("cyborg recharging station") build_path = /obj/machinery/recharge_station board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) req_components = list( /obj/item/stack/cable_coil = 5, - /obj/item/weapon/stock_parts/capacitor = 2, - /obj/item/weapon/stock_parts/manipulator = 2, - /obj/item/weapon/cell = 1) \ No newline at end of file + /obj/item/stock_parts/capacitor = 2, + /obj/item/stock_parts/manipulator = 2, + /obj/item/cell = 1) \ No newline at end of file diff --git a/code/game/objects/items/weapons/circuitboards/machinery/recycling.dm b/code/game/objects/items/weapons/circuitboards/machinery/recycling.dm index f0375d346b7..8ef62efa760 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/recycling.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/recycling.dm @@ -2,7 +2,7 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/recycler_crusher +/obj/item/circuitboard/recycler_crusher name = T_BOARD("recycler - crusher") build_path = /obj/machinery/recycling/crusher board_type = new /datum/frame/frame_types/machine @@ -10,13 +10,13 @@ matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( /obj/item/stack/cable_coil = 2, - /obj/item/weapon/stock_parts/motor = 1, - /obj/item/weapon/stock_parts/gear = 1, - /obj/item/weapon/stock_parts/matter_bin = 1, - /obj/item/weapon/stock_parts/manipulator = 1 + /obj/item/stock_parts/motor = 1, + /obj/item/stock_parts/gear = 1, + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stock_parts/manipulator = 1 ) -/obj/item/weapon/circuitboard/recycler_sorter +/obj/item/circuitboard/recycler_sorter name = T_BOARD("recycler - sorter") build_path = /obj/machinery/recycling/sorter board_type = new /datum/frame/frame_types/machine @@ -24,11 +24,11 @@ matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( /obj/item/stack/cable_coil = 2, - /obj/item/weapon/stock_parts/motor = 1, - /obj/item/weapon/stock_parts/gear = 3 + /obj/item/stock_parts/motor = 1, + /obj/item/stock_parts/gear = 3 ) -/obj/item/weapon/circuitboard/recycler_stamper +/obj/item/circuitboard/recycler_stamper name = T_BOARD("recycler - stamper") build_path = /obj/machinery/recycling/stamper board_type = new /datum/frame/frame_types/machine @@ -36,6 +36,6 @@ matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( /obj/item/stack/cable_coil = 2, - /obj/item/weapon/stock_parts/gear = 2, - /obj/item/weapon/stock_parts/motor = 2 + /obj/item/stock_parts/gear = 2, + /obj/item/stock_parts/motor = 2 ) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/research.dm b/code/game/objects/items/weapons/circuitboards/machinery/research.dm index 8f23291f8aa..97a6888adff 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/research.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/research.dm @@ -2,16 +2,16 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/rdserver +/obj/item/circuitboard/rdserver name = T_BOARD("R&D server") build_path = /obj/machinery/r_n_d/server/core board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 3) req_components = list( /obj/item/stack/cable_coil = 2, - /obj/item/weapon/stock_parts/scanning_module = 1) + /obj/item/stock_parts/scanning_module = 1) -/obj/item/weapon/circuitboard/rdserver/attackby(obj/item/I as obj, mob/user as mob) +/obj/item/circuitboard/rdserver/attackby(obj/item/I as obj, mob/user as mob) if(I.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, I.usesound, 50, 1) user.visible_message("\The [user] adjusts the jumper on \the [src]'s access protocol pins.", "You adjust the jumper on the access protocol pins.") @@ -25,69 +25,69 @@ to_chat(user, "Access protocols set to default.") return -/obj/item/weapon/circuitboard/destructive_analyzer +/obj/item/circuitboard/destructive_analyzer name = T_BOARD("destructive analyzer") build_path = /obj/machinery/r_n_d/destructive_analyzer board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_DATA = 2) req_components = list( - /obj/item/weapon/stock_parts/scanning_module = 1, - /obj/item/weapon/stock_parts/manipulator = 1, - /obj/item/weapon/stock_parts/micro_laser = 1) + /obj/item/stock_parts/scanning_module = 1, + /obj/item/stock_parts/manipulator = 1, + /obj/item/stock_parts/micro_laser = 1) -/obj/item/weapon/circuitboard/autolathe +/obj/item/circuitboard/autolathe name = T_BOARD("autolathe") build_path = /obj/machinery/autolathe board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2) req_components = list( - /obj/item/weapon/stock_parts/matter_bin = 3, - /obj/item/weapon/stock_parts/manipulator = 1, - /obj/item/weapon/stock_parts/console_screen = 1) + /obj/item/stock_parts/matter_bin = 3, + /obj/item/stock_parts/manipulator = 1, + /obj/item/stock_parts/console_screen = 1) -/obj/item/weapon/circuitboard/protolathe +/obj/item/circuitboard/protolathe name = T_BOARD("protolathe") build_path = /obj/machinery/r_n_d/protolathe board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2) req_components = list( - /obj/item/weapon/stock_parts/matter_bin = 2, - /obj/item/weapon/stock_parts/manipulator = 2, - /obj/item/weapon/reagent_containers/glass/beaker = 2) + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/manipulator = 2, + /obj/item/reagent_containers/glass/beaker = 2) -/obj/item/weapon/circuitboard/circuit_imprinter +/obj/item/circuitboard/circuit_imprinter name = T_BOARD("circuit imprinter") build_path = /obj/machinery/r_n_d/circuit_imprinter board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2) req_components = list( - /obj/item/weapon/stock_parts/matter_bin = 1, - /obj/item/weapon/stock_parts/manipulator = 1, - /obj/item/weapon/reagent_containers/glass/beaker = 2) + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stock_parts/manipulator = 1, + /obj/item/reagent_containers/glass/beaker = 2) -/obj/item/weapon/circuitboard/mechfab +/obj/item/circuitboard/mechfab name = "Circuit board (Exosuit Fabricator)" build_path = /obj/machinery/mecha_part_fabricator board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) req_components = list( - /obj/item/weapon/stock_parts/matter_bin = 2, - /obj/item/weapon/stock_parts/manipulator = 1, - /obj/item/weapon/stock_parts/micro_laser = 1, - /obj/item/weapon/stock_parts/console_screen = 1) + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/manipulator = 1, + /obj/item/stock_parts/micro_laser = 1, + /obj/item/stock_parts/console_screen = 1) -/obj/item/weapon/circuitboard/prosthetics +/obj/item/circuitboard/prosthetics name = "Circuit board (Prosthetics Fabricator)" build_path = /obj/machinery/mecha_part_fabricator/pros board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) req_components = list( - /obj/item/weapon/stock_parts/matter_bin = 2, - /obj/item/weapon/stock_parts/manipulator = 1, - /obj/item/weapon/stock_parts/micro_laser = 1, - /obj/item/weapon/stock_parts/console_screen = 1) + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/manipulator = 1, + /obj/item/stock_parts/micro_laser = 1, + /obj/item/stock_parts/console_screen = 1) -/obj/item/weapon/circuitboard/ntnet_relay +/obj/item/circuitboard/ntnet_relay name = "Circuit board (NTNet Quantum Relay)" build_path = /obj/machinery/ntnet_relay board_type = new /datum/frame/frame_types/machine @@ -95,13 +95,13 @@ req_components = list( /obj/item/stack/cable_coil = 15) -/obj/item/weapon/circuitboard/protean_reconstitutor +/obj/item/circuitboard/protean_reconstitutor name = T_BOARD("protean reconstitutor") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/protean_reconstitutor origin_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5) req_components = list( - /obj/item/weapon/stock_parts/matter_bin = 1, - /obj/item/weapon/stock_parts/manipulator = 1, - /obj/item/weapon/stock_parts/console_screen = 1, + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stock_parts/manipulator = 1, + /obj/item/stock_parts/console_screen = 1, /obj/item/stack/cable_coil = 5) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm b/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm index f34f7a3c65b..cc33f90553f 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm @@ -6,68 +6,68 @@ // New shield generator // -/obj/item/weapon/circuitboard/shield_generator +/obj/item/circuitboard/shield_generator name = T_BOARD("advanced shield generator") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/power/shield_generator origin_tech = list(TECH_MAGNET = 3, TECH_POWER = 4, TECH_BLUESPACE = 2, TECH_ENGINEERING = 3) req_components = list( - /obj/item/weapon/stock_parts/capacitor = 1, - /obj/item/weapon/stock_parts/micro_laser = 1, - /obj/item/weapon/smes_coil = 1, - /obj/item/weapon/stock_parts/console_screen = 1, - /obj/item/weapon/stock_parts/subspace/amplifier = 1, + /obj/item/stock_parts/capacitor = 1, + /obj/item/stock_parts/micro_laser = 1, + /obj/item/smes_coil = 1, + /obj/item/stock_parts/console_screen = 1, + /obj/item/stock_parts/subspace/amplifier = 1, /obj/item/stack/cable_coil = 5) -/obj/item/weapon/circuitboard/shield_diffuser +/obj/item/circuitboard/shield_diffuser name = T_BOARD("shield diffuser") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/shield_diffuser origin_tech = list(TECH_MAGNET = 4, TECH_POWER = 2, TECH_ILLEGAL = 1) req_components = list( - /obj/item/weapon/stock_parts/capacitor = 1, - /obj/item/weapon/stock_parts/micro_laser = 1, - /obj/item/weapon/stock_parts/console_screen = 1) + /obj/item/stock_parts/capacitor = 1, + /obj/item/stock_parts/micro_laser = 1, + /obj/item/stock_parts/console_screen = 1) // // Legacy shield generators // -/obj/item/weapon/circuitboard/shield_gen_ex +/obj/item/circuitboard/shield_gen_ex name = T_BOARD("hull shield generator") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/shield_gen/external origin_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3) req_components = list( - /obj/item/weapon/stock_parts/manipulator/pico = 2, - /obj/item/weapon/stock_parts/subspace/transmitter = 1, - /obj/item/weapon/stock_parts/subspace/crystal = 1, - /obj/item/weapon/stock_parts/subspace/amplifier = 1, - /obj/item/weapon/stock_parts/console_screen = 1, + /obj/item/stock_parts/manipulator/pico = 2, + /obj/item/stock_parts/subspace/transmitter = 1, + /obj/item/stock_parts/subspace/crystal = 1, + /obj/item/stock_parts/subspace/amplifier = 1, + /obj/item/stock_parts/console_screen = 1, /obj/item/stack/cable_coil = 5) -/obj/item/weapon/circuitboard/shield_gen +/obj/item/circuitboard/shield_gen name = T_BOARD("bubble shield generator") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/shield_gen origin_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3) req_components = list( - /obj/item/weapon/stock_parts/manipulator/pico = 2, - /obj/item/weapon/stock_parts/subspace/transmitter = 1, - /obj/item/weapon/stock_parts/subspace/crystal = 1, - /obj/item/weapon/stock_parts/subspace/amplifier = 1, - /obj/item/weapon/stock_parts/console_screen = 1, + /obj/item/stock_parts/manipulator/pico = 2, + /obj/item/stock_parts/subspace/transmitter = 1, + /obj/item/stock_parts/subspace/crystal = 1, + /obj/item/stock_parts/subspace/amplifier = 1, + /obj/item/stock_parts/console_screen = 1, /obj/item/stack/cable_coil = 5) -/obj/item/weapon/circuitboard/shield_cap +/obj/item/circuitboard/shield_cap name = T_BOARD("shield capacitor") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/shield_capacitor origin_tech = list(TECH_MAGNET = 3, TECH_POWER = 4) req_components = list( - /obj/item/weapon/stock_parts/manipulator/pico = 2, - /obj/item/weapon/stock_parts/subspace/sub_filter = 1, - /obj/item/weapon/stock_parts/subspace/treatment = 1, - /obj/item/weapon/stock_parts/subspace/analyzer = 1, - /obj/item/weapon/stock_parts/console_screen = 1, + /obj/item/stock_parts/manipulator/pico = 2, + /obj/item/stock_parts/subspace/sub_filter = 1, + /obj/item/stock_parts/subspace/treatment = 1, + /obj/item/stock_parts/subspace/analyzer = 1, + /obj/item/stock_parts/console_screen = 1, /obj/item/stack/cable_coil = 5) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/ships.dm b/code/game/objects/items/weapons/circuitboards/machinery/ships.dm index 7f423165a75..a46ad717f6f 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/ships.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/ships.dm @@ -2,7 +2,7 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/pointdefense +/obj/item/circuitboard/pointdefense name = T_BOARD("point defense battery") board_type = new /datum/frame/frame_types/machine desc = "Control systems for a Kuiper pattern point defense battery. Aim away from vessel." @@ -10,11 +10,11 @@ origin_tech = list(TECH_ENGINEERING = 3, TECH_COMBAT = 2) req_components = list( /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser = 1, - /obj/item/weapon/stock_parts/manipulator = 2, - /obj/item/weapon/stock_parts/capacitor = 2, + /obj/item/stock_parts/manipulator = 2, + /obj/item/stock_parts/capacitor = 2, ) -/obj/item/weapon/circuitboard/pointdefense_control +/obj/item/circuitboard/pointdefense_control name = T_BOARD("fire assist mainframe") board_type = new /datum/frame/frame_types/machine desc = "A control computer to synchronize point defense batteries." diff --git a/code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm b/code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm index 856104dcce9..191a1f45166 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm @@ -2,99 +2,99 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/telecomms +/obj/item/circuitboard/telecomms board_type = new /datum/frame/frame_types/machine -/obj/item/weapon/circuitboard/telecomms/receiver +/obj/item/circuitboard/telecomms/receiver name = T_BOARD("subspace receiver") build_path = /obj/machinery/telecomms/receiver origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_BLUESPACE = 2) req_components = list( - /obj/item/weapon/stock_parts/subspace/ansible = 1, - /obj/item/weapon/stock_parts/subspace/sub_filter = 1, - /obj/item/weapon/stock_parts/manipulator = 2, - /obj/item/weapon/stock_parts/micro_laser = 1) + /obj/item/stock_parts/subspace/ansible = 1, + /obj/item/stock_parts/subspace/sub_filter = 1, + /obj/item/stock_parts/manipulator = 2, + /obj/item/stock_parts/micro_laser = 1) -/obj/item/weapon/circuitboard/telecomms/hub +/obj/item/circuitboard/telecomms/hub name = T_BOARD("hub mainframe") build_path = /obj/machinery/telecomms/hub origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) req_components = list( - /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/stock_parts/manipulator = 2, /obj/item/stack/cable_coil = 2, - /obj/item/weapon/stock_parts/subspace/sub_filter = 2) + /obj/item/stock_parts/subspace/sub_filter = 2) -/obj/item/weapon/circuitboard/telecomms/relay +/obj/item/circuitboard/telecomms/relay name = T_BOARD("relay mainframe") build_path = /obj/machinery/telecomms/relay origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 4, TECH_BLUESPACE = 3) req_components = list( - /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/stock_parts/manipulator = 2, /obj/item/stack/cable_coil = 2, - /obj/item/weapon/stock_parts/subspace/sub_filter = 2) + /obj/item/stock_parts/subspace/sub_filter = 2) -/obj/item/weapon/circuitboard/telecomms/bus +/obj/item/circuitboard/telecomms/bus name = T_BOARD("bus mainframe") build_path = /obj/machinery/telecomms/bus origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) req_components = list( - /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/stock_parts/manipulator = 2, /obj/item/stack/cable_coil = 1, - /obj/item/weapon/stock_parts/subspace/sub_filter = 1) + /obj/item/stock_parts/subspace/sub_filter = 1) -/obj/item/weapon/circuitboard/telecomms/processor +/obj/item/circuitboard/telecomms/processor name = T_BOARD("processor unit") build_path = /obj/machinery/telecomms/processor origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) req_components = list( - /obj/item/weapon/stock_parts/manipulator = 3, - /obj/item/weapon/stock_parts/subspace/sub_filter = 1, - /obj/item/weapon/stock_parts/subspace/treatment = 2, - /obj/item/weapon/stock_parts/subspace/analyzer = 1, + /obj/item/stock_parts/manipulator = 3, + /obj/item/stock_parts/subspace/sub_filter = 1, + /obj/item/stock_parts/subspace/treatment = 2, + /obj/item/stock_parts/subspace/analyzer = 1, /obj/item/stack/cable_coil = 2, - /obj/item/weapon/stock_parts/subspace/amplifier = 1) + /obj/item/stock_parts/subspace/amplifier = 1) -/obj/item/weapon/circuitboard/telecomms/server +/obj/item/circuitboard/telecomms/server name = T_BOARD("telecommunication server") build_path = /obj/machinery/telecomms/server origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) req_components = list( - /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/stock_parts/manipulator = 2, /obj/item/stack/cable_coil = 1, - /obj/item/weapon/stock_parts/subspace/sub_filter = 1) + /obj/item/stock_parts/subspace/sub_filter = 1) -/obj/item/weapon/circuitboard/telecomms/broadcaster +/obj/item/circuitboard/telecomms/broadcaster name = T_BOARD("subspace broadcaster") build_path = /obj/machinery/telecomms/broadcaster origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4, TECH_BLUESPACE = 2) req_components = list( - /obj/item/weapon/stock_parts/manipulator = 2, + /obj/item/stock_parts/manipulator = 2, /obj/item/stack/cable_coil = 1, - /obj/item/weapon/stock_parts/subspace/sub_filter = 1, - /obj/item/weapon/stock_parts/subspace/crystal = 1, - /obj/item/weapon/stock_parts/micro_laser/high = 2) + /obj/item/stock_parts/subspace/sub_filter = 1, + /obj/item/stock_parts/subspace/crystal = 1, + /obj/item/stock_parts/micro_laser/high = 2) //This isn't a real telecomms board but I don't want to make a whole file to hold only one circuitboard. -/obj/item/weapon/circuitboard/telecomms/exonet_node +/obj/item/circuitboard/telecomms/exonet_node name = T_BOARD("exonet node") build_path = /obj/machinery/exonet_node origin_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 5, TECH_BLUESPACE = 4) req_components = list( - /obj/item/weapon/stock_parts/subspace/ansible = 1, - /obj/item/weapon/stock_parts/subspace/sub_filter = 1, - /obj/item/weapon/stock_parts/manipulator = 2, - /obj/item/weapon/stock_parts/micro_laser = 1, - /obj/item/weapon/stock_parts/subspace/crystal = 1, - /obj/item/weapon/stock_parts/subspace/treatment = 2, + /obj/item/stock_parts/subspace/ansible = 1, + /obj/item/stock_parts/subspace/sub_filter = 1, + /obj/item/stock_parts/manipulator = 2, + /obj/item/stock_parts/micro_laser = 1, + /obj/item/stock_parts/subspace/crystal = 1, + /obj/item/stock_parts/subspace/treatment = 2, /obj/item/stack/cable_coil = 2) -/obj/item/weapon/circuitboard/telecomms/pda_multicaster +/obj/item/circuitboard/telecomms/pda_multicaster name = T_BOARD("pda multicaster") build_path = /obj/machinery/pda_multicaster origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 2, TECH_BLUESPACE = 2) req_components = list( - /obj/item/weapon/stock_parts/subspace/ansible = 1, - /obj/item/weapon/stock_parts/subspace/sub_filter = 1, - /obj/item/weapon/stock_parts/manipulator = 1, - /obj/item/weapon/stock_parts/subspace/treatment = 1, + /obj/item/stock_parts/subspace/ansible = 1, + /obj/item/stock_parts/subspace/sub_filter = 1, + /obj/item/stock_parts/manipulator = 1, + /obj/item/stock_parts/subspace/treatment = 1, /obj/item/stack/cable_coil = 2) \ No newline at end of file diff --git a/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm b/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm index 72febf566ab..4b99122287b 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm @@ -2,10 +2,10 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/unary_atmos +/obj/item/circuitboard/unary_atmos board_type = new /datum/frame/frame_types/machine -/obj/item/weapon/circuitboard/unary_atmos/construct(var/obj/machinery/atmospherics/unary/U) +/obj/item/circuitboard/unary_atmos/construct(var/obj/machinery/atmospherics/unary/U) //TODO: Move this stuff into the relevant constructor when pipe/construction.dm is cleaned up. U.atmos_init() U.build_network() @@ -13,21 +13,21 @@ U.node.atmos_init() U.node.build_network() -/obj/item/weapon/circuitboard/unary_atmos/heater +/obj/item/circuitboard/unary_atmos/heater name = T_BOARD("gas heating system") build_path = /obj/machinery/atmospherics/unary/heater origin_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 1) req_components = list( /obj/item/stack/cable_coil = 5, - /obj/item/weapon/stock_parts/matter_bin = 1, - /obj/item/weapon/stock_parts/capacitor = 2) + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stock_parts/capacitor = 2) -/obj/item/weapon/circuitboard/unary_atmos/cooler +/obj/item/circuitboard/unary_atmos/cooler name = T_BOARD("gas cooling system") build_path = /obj/machinery/atmospherics/unary/freezer origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) req_components = list( /obj/item/stack/cable_coil = 2, - /obj/item/weapon/stock_parts/matter_bin = 1, - /obj/item/weapon/stock_parts/capacitor = 2, - /obj/item/weapon/stock_parts/manipulator = 1) + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stock_parts/capacitor = 2, + /obj/item/stock_parts/manipulator = 1) diff --git a/code/game/objects/items/weapons/circuitboards/mecha.dm b/code/game/objects/items/weapons/circuitboards/mecha.dm index 777146f385d..4790b8143fd 100644 --- a/code/game/objects/items/weapons/circuitboards/mecha.dm +++ b/code/game/objects/items/weapons/circuitboards/mecha.dm @@ -3,123 +3,123 @@ #endif #define T_BOARD_MECHA(name) "exosuit module circuit board (" + (name) + ")" -/obj/item/weapon/circuitboard/mecha +/obj/item/circuitboard/mecha name = "exosuit circuit board" icon = 'icons/obj/module.dmi' icon_state = "std_mod" board_type = "other" -/obj/item/weapon/circuitboard/mecha/ripley +/obj/item/circuitboard/mecha/ripley origin_tech = list(TECH_DATA = 3) -/obj/item/weapon/circuitboard/mecha/ripley/peripherals +/obj/item/circuitboard/mecha/ripley/peripherals name = T_BOARD_MECHA("Ripley peripherals control") icon_state = "mcontroller" -/obj/item/weapon/circuitboard/mecha/ripley/main +/obj/item/circuitboard/mecha/ripley/main name = T_BOARD_MECHA("Ripley central control") icon_state = "mainboard" -/obj/item/weapon/circuitboard/mecha/gygax +/obj/item/circuitboard/mecha/gygax origin_tech = list(TECH_DATA = 4) -/obj/item/weapon/circuitboard/mecha/gygax/peripherals +/obj/item/circuitboard/mecha/gygax/peripherals name = T_BOARD_MECHA("Gygax peripherals control") icon_state = "mcontroller" -/obj/item/weapon/circuitboard/mecha/gygax/targeting +/obj/item/circuitboard/mecha/gygax/targeting name = T_BOARD_MECHA("Gygax weapon control and targeting") icon_state = "mcontroller" origin_tech = list(TECH_DATA = 4, TECH_COMBAT = 4) -/obj/item/weapon/circuitboard/mecha/gygax/medical +/obj/item/circuitboard/mecha/gygax/medical name = T_BOARD_MECHA("Serenity medical control") icon_state = "mcontroller" origin_tech = list(TECH_DATA = 4, TECH_BIO = 4) -/obj/item/weapon/circuitboard/mecha/gygax/main +/obj/item/circuitboard/mecha/gygax/main name = T_BOARD_MECHA("Gygax central control") icon_state = "mainboard" -/obj/item/weapon/circuitboard/mecha/durand +/obj/item/circuitboard/mecha/durand origin_tech = list(TECH_DATA = 4) -/obj/item/weapon/circuitboard/mecha/durand/peripherals +/obj/item/circuitboard/mecha/durand/peripherals name = T_BOARD_MECHA("Durand peripherals control") icon_state = "mcontroller" -/obj/item/weapon/circuitboard/mecha/durand/targeting +/obj/item/circuitboard/mecha/durand/targeting name = T_BOARD_MECHA("Durand weapon control and targeting") icon_state = "mcontroller" origin_tech = list(TECH_DATA = 4, TECH_COMBAT = 4) -/obj/item/weapon/circuitboard/mecha/durand/main +/obj/item/circuitboard/mecha/durand/main name = T_BOARD_MECHA("Durand central control") icon_state = "mainboard" -/obj/item/weapon/circuitboard/mecha/phazon +/obj/item/circuitboard/mecha/phazon -/obj/item/weapon/circuitboard/mecha/phazon/peripherals +/obj/item/circuitboard/mecha/phazon/peripherals name = T_BOARD_MECHA("Phazon peripherals control") icon_state = "mcontroller" origin_tech = list(TECH_DATA = 6, TECH_ILLEGAL = 6) -/obj/item/weapon/circuitboard/mecha/phazon/targeting +/obj/item/circuitboard/mecha/phazon/targeting name = T_BOARD_MECHA("Phazon weapon control and targeting") icon_state = "mcontroller" origin_tech = list(TECH_DATA = 6, TECH_COMBAT = 7) -/obj/item/weapon/circuitboard/mecha/phazon/main +/obj/item/circuitboard/mecha/phazon/main name = T_BOARD_MECHA("Phazon central control") origin_tech = list(TECH_DATA = 6, TECH_BLUESPACE = 5) icon_state = "mainboard" -/obj/item/weapon/circuitboard/mecha/honker +/obj/item/circuitboard/mecha/honker origin_tech = list(TECH_DATA = 4) -/obj/item/weapon/circuitboard/mecha/honker/peripherals +/obj/item/circuitboard/mecha/honker/peripherals name = T_BOARD_MECHA("H.O.N.K peripherals control") icon_state = "mcontroller" -/obj/item/weapon/circuitboard/mecha/honker/targeting +/obj/item/circuitboard/mecha/honker/targeting name = T_BOARD_MECHA("H.O.N.K weapon control and targeting") icon_state = "mcontroller" -/obj/item/weapon/circuitboard/mecha/honker/main +/obj/item/circuitboard/mecha/honker/main name = T_BOARD_MECHA("H.O.N.K central control") icon_state = "mainboard" -/obj/item/weapon/circuitboard/mecha/odysseus +/obj/item/circuitboard/mecha/odysseus origin_tech = list(TECH_DATA = 3) -/obj/item/weapon/circuitboard/mecha/odysseus/peripherals +/obj/item/circuitboard/mecha/odysseus/peripherals name = T_BOARD_MECHA("Odysseus peripherals control") icon_state = "mcontroller" -/obj/item/weapon/circuitboard/mecha/odysseus/main +/obj/item/circuitboard/mecha/odysseus/main name = T_BOARD_MECHA("Odysseus central control") icon_state = "mainboard" -/obj/item/weapon/circuitboard/mecha/imperion +/obj/item/circuitboard/mecha/imperion name = "Alien Circuit" origin_tech = list(TECH_DATA = 5, TECH_BLUESPACE = 3, TECH_PRECURSOR = 1) icon = 'icons/obj/abductor.dmi' icon_state = "circuit" -/obj/item/weapon/circuitboard/mecha/imperion/main +/obj/item/circuitboard/mecha/imperion/main desc = "It is marked with a strange glyph." -/obj/item/weapon/circuitboard/mecha/imperion/peripherals +/obj/item/circuitboard/mecha/imperion/peripherals desc = "It is marked with a pulsing glyph." -/obj/item/weapon/circuitboard/mecha/imperion/targeting +/obj/item/circuitboard/mecha/imperion/targeting desc = "It is marked with an ominous glyph." -/obj/item/weapon/circuitboard/mecha/imperion/phasing +/obj/item/circuitboard/mecha/imperion/phasing desc = "It is marked with a disturbing glyph." -/obj/item/weapon/circuitboard/mecha/imperion/damaged +/obj/item/circuitboard/mecha/imperion/damaged name = "Damaged Alien Circuit" desc = "It is marked with a constantly shifting glyph." origin_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 1, TECH_PRECURSOR = 2) diff --git a/code/game/objects/items/weapons/circuitboards/other.dm b/code/game/objects/items/weapons/circuitboards/other.dm index 7770c71c8e2..cc141fe64f2 100644 --- a/code/game/objects/items/weapons/circuitboards/other.dm +++ b/code/game/objects/items/weapons/circuitboards/other.dm @@ -4,16 +4,16 @@ //Stuff that doesn't fit into any category goes here -/obj/item/weapon/circuitboard/aicore +/obj/item/circuitboard/aicore name = T_BOARD("AI core") origin_tech = list(TECH_DATA = 4, TECH_BIO = 2) board_type = "other" -/obj/item/weapon/circuitboard/chem_master +/obj/item/circuitboard/chem_master name = T_BOARD("ChemMaster 3000") build_path = /obj/machinery/chem_master board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 2) req_components = list( - /obj/item/weapon/stock_parts/matter_bin = 2, - /obj/item/weapon/stock_parts/manipulator = 2) \ No newline at end of file + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/manipulator = 2) \ No newline at end of file diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index e3a12284704..7e0226b7621 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -8,7 +8,7 @@ /* * Banana Peels */ -/obj/item/weapon/bananapeel/Crossed(atom/movable/AM as mob|obj) +/obj/item/bananapeel/Crossed(atom/movable/AM as mob|obj) if(AM.is_incorporeal()) return if(istype(AM, /mob/living)) @@ -17,22 +17,22 @@ /* * Soap */ -/obj/item/weapon/soap/Initialize() +/obj/item/soap/Initialize() . = ..() create_reagents(5) wet() -/obj/item/weapon/soap/proc/wet() +/obj/item/soap/proc/wet() reagents.add_reagent("cleaner", 5) -/obj/item/weapon/soap/Crossed(atom/movable/AM as mob|obj) +/obj/item/soap/Crossed(atom/movable/AM as mob|obj) if(AM.is_incorporeal()) return if(istype(AM, /mob/living)) var/mob/living/M = AM M.slip("the [src.name]",3) -/obj/item/weapon/soap/afterattack(atom/target, mob/user as mob, proximity) +/obj/item/soap/afterattack(atom/target, mob/user as mob, proximity) if(!proximity) return //I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing. //So this is a workaround. This also makes more sense from an IC standpoint. ~Carn @@ -58,7 +58,7 @@ return //attack_as_weapon -/obj/item/weapon/soap/attack(mob/living/target, mob/living/user, var/target_zone) +/obj/item/soap/attack(mob/living/target, mob/living/user, var/target_zone) if(target && user && ishuman(target) && ishuman(user) && !user.incapacitated() && user.zone_sel &&user.zone_sel.selecting == "mouth" ) user.visible_message("\The [user] washes \the [target]'s mouth out with soap!") user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //prevent spam @@ -68,10 +68,10 @@ /* * Bike Horns */ -/obj/item/weapon/bikehorn +/obj/item/bikehorn var/honk_sound = 'sound/items/bikehorn.ogg' -/obj/item/weapon/bikehorn/attack_self(mob/user as mob) +/obj/item/bikehorn/attack_self(mob/user as mob) if(spam_flag == 0) spam_flag = 1 playsound(src, honk_sound, 50, 1) @@ -80,7 +80,7 @@ spam_flag = 0 return -/obj/item/weapon/bikehorn/Crossed(atom/movable/AM as mob|obj) +/obj/item/bikehorn/Crossed(atom/movable/AM as mob|obj) if(AM.is_incorporeal()) return if(istype(AM, /mob/living)) diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 6a899d9a700..f85839f518d 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/lipstick +/obj/item/lipstick gender = PLURAL name = "red lipstick" desc = "A generic brand of lipstick." @@ -11,26 +11,26 @@ drop_sound = 'sound/items/drop/glass.ogg' pickup_sound = 'sound/items/pickup/glass.ogg' -/obj/item/weapon/lipstick/purple +/obj/item/lipstick/purple name = "purple lipstick" colour = "purple" -/obj/item/weapon/lipstick/jade +/obj/item/lipstick/jade name = "jade lipstick" colour = "jade" -/obj/item/weapon/lipstick/black +/obj/item/lipstick/black name = "black lipstick" colour = "black" -/obj/item/weapon/lipstick/random +/obj/item/lipstick/random name = "lipstick" -/obj/item/weapon/lipstick/random/New() +/obj/item/lipstick/random/New() colour = pick("red","purple","jade","black") name = "[colour] lipstick" -/obj/item/weapon/lipstick/attack_self(mob/user as mob) +/obj/item/lipstick/attack_self(mob/user as mob) to_chat(user, "You twist \the [src] [open ? "closed" : "open"].") open = !open if(open) @@ -38,7 +38,7 @@ else icon_state = initial(icon_state) -/obj/item/weapon/lipstick/attack(mob/M as mob, mob/user as mob) +/obj/item/lipstick/attack(mob/M as mob, mob/user as mob) if(!open) return if(!istype(M, /mob)) return @@ -66,7 +66,7 @@ //you can wipe off lipstick with paper! see code/modules/paperwork/paper.dm, paper/attack() -/obj/item/weapon/haircomb //sparklysheep's comb +/obj/item/haircomb //sparklysheep's comb name = "purple comb" desc = "A pristine purple comb made from flexible plastic." w_class = ITEMSIZE_TINY @@ -74,7 +74,7 @@ icon = 'icons/obj/items.dmi' icon_state = "purplecomb" -/obj/item/weapon/haircomb/attack_self(mob/living/user) +/obj/item/haircomb/attack_self(mob/living/user) var/text = "person" if(ishuman(user)) var/mob/living/carbon/human/U = user @@ -91,7 +91,7 @@ text = "lady" user.visible_message("[user] uses [src] to comb their hair with incredible style and sophistication. What a [text].") -/obj/item/weapon/makeover +/obj/item/makeover name = "makeover kit" desc = "A tiny case containing a mirror and some contact lenses." w_class = ITEMSIZE_TINY @@ -99,11 +99,11 @@ icon_state = "trinketbox" var/datum/tgui_module/appearance_changer/mirror/coskit/M -/obj/item/weapon/makeover/Initialize() +/obj/item/makeover/Initialize() . = ..() M = new(src, null) -/obj/item/weapon/makeover/attack_self(mob/living/carbon/user as mob) +/obj/item/makeover/attack_self(mob/living/carbon/user as mob) if(ishuman(user)) to_chat(user, "You flip open \the [src] and begin to adjust your appearance.") M.tgui_interact(user) diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index d2cf40f0dec..703921217d6 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/dnainjector +/obj/item/dnainjector name = "\improper DNA injector" desc = "This injects the person with DNA." icon = 'icons/obj/items.dmi' @@ -19,7 +19,7 @@ var/datatype=0 var/value=0 -/obj/item/weapon/dnainjector/New() +/obj/item/dnainjector/New() if(datatype && block) buf=new buf.dna=new @@ -29,41 +29,41 @@ SetValue(src.value) //testing("[name]: DNA2 SE blocks after SetValue: [english_list(buf.dna.SE)]") -/obj/item/weapon/dnainjector/proc/GetRealBlock(var/selblock) +/obj/item/dnainjector/proc/GetRealBlock(var/selblock) if(selblock==0) return block else return selblock -/obj/item/weapon/dnainjector/proc/GetState(var/selblock=0) +/obj/item/dnainjector/proc/GetState(var/selblock=0) var/real_block=GetRealBlock(selblock) if(buf.types&DNA2_BUF_SE) return buf.dna.GetSEState(real_block) else return buf.dna.GetUIState(real_block) -/obj/item/weapon/dnainjector/proc/SetState(var/on, var/selblock=0) +/obj/item/dnainjector/proc/SetState(var/on, var/selblock=0) var/real_block=GetRealBlock(selblock) if(buf.types&DNA2_BUF_SE) return buf.dna.SetSEState(real_block,on) else return buf.dna.SetUIState(real_block,on) -/obj/item/weapon/dnainjector/proc/GetValue(var/selblock=0) +/obj/item/dnainjector/proc/GetValue(var/selblock=0) var/real_block=GetRealBlock(selblock) if(buf.types&DNA2_BUF_SE) return buf.dna.GetSEValue(real_block) else return buf.dna.GetUIValue(real_block) -/obj/item/weapon/dnainjector/proc/SetValue(var/val,var/selblock=0) +/obj/item/dnainjector/proc/SetValue(var/val,var/selblock=0) var/real_block=GetRealBlock(selblock) if(buf.types&DNA2_BUF_SE) return buf.dna.SetSEValue(real_block,val) else return buf.dna.SetUIValue(real_block,val) -/obj/item/weapon/dnainjector/proc/inject(mob/M as mob, mob/user as mob) +/obj/item/dnainjector/proc/inject(mob/M as mob, mob/user as mob) if(istype(M,/mob/living)) var/mob/living/L = M L.apply_effect(rand(5,20), IRRADIATE, check_protection = 0) @@ -98,7 +98,7 @@ qdel(src) return uses -/obj/item/weapon/dnainjector/attack(mob/M as mob, mob/user as mob) +/obj/item/dnainjector/attack(mob/M as mob, mob/user as mob) if (!istype(M, /mob)) return if (!usr.IsAdvancedToolUser()) @@ -136,443 +136,443 @@ inject(M, user) return -/obj/item/weapon/dnainjector/hulkmut +/obj/item/dnainjector/hulkmut name = "\improper DNA injector (Hulk)" desc = "This will make you big and strong, but give you a bad skin condition." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/hulkmut/New() +/obj/item/dnainjector/hulkmut/New() block = HULKBLOCK ..() -/obj/item/weapon/dnainjector/antihulk +/obj/item/dnainjector/antihulk name = "\improper DNA injector (Anti-Hulk)" desc = "Cures green skin." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antihulk/New() +/obj/item/dnainjector/antihulk/New() block = HULKBLOCK ..() -/obj/item/weapon/dnainjector/xraymut +/obj/item/dnainjector/xraymut name = "\improper DNA injector (Xray)" desc = "Finally you can see what the " + JOB_SITE_MANAGER + " does." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/xraymut/New() +/obj/item/dnainjector/xraymut/New() block = XRAYBLOCK ..() -/obj/item/weapon/dnainjector/antixray +/obj/item/dnainjector/antixray name = "\improper DNA injector (Anti-Xray)" desc = "It will make you see harder." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antixray/New() +/obj/item/dnainjector/antixray/New() block = XRAYBLOCK ..() -/obj/item/weapon/dnainjector/firemut +/obj/item/dnainjector/firemut name = "\improper DNA injector (Fire)" desc = "Gives you fire." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/firemut/New() +/obj/item/dnainjector/firemut/New() block = FIREBLOCK ..() -/obj/item/weapon/dnainjector/antifire +/obj/item/dnainjector/antifire name = "\improper DNA injector (Anti-Fire)" desc = "Cures fire." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antifire/New() +/obj/item/dnainjector/antifire/New() block = FIREBLOCK ..() -/obj/item/weapon/dnainjector/telemut +/obj/item/dnainjector/telemut name = "\improper DNA injector (Tele.)" desc = "Super brain man!" datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/telemut/New() +/obj/item/dnainjector/telemut/New() block = TELEBLOCK ..() -/obj/item/weapon/dnainjector/antitele +/obj/item/dnainjector/antitele name = "\improper DNA injector (Anti-Tele.)" desc = "Will make you not able to control your mind." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antitele/New() +/obj/item/dnainjector/antitele/New() block = TELEBLOCK ..() -/obj/item/weapon/dnainjector/nobreath +/obj/item/dnainjector/nobreath name = "\improper DNA injector (No Breath)" desc = "Hold your breath and count to infinity." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/nobreath/New() +/obj/item/dnainjector/nobreath/New() block = NOBREATHBLOCK ..() -/obj/item/weapon/dnainjector/antinobreath +/obj/item/dnainjector/antinobreath name = "\improper DNA injector (Anti-No Breath)" desc = "Hold your breath and count to 100." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antinobreath/New() +/obj/item/dnainjector/antinobreath/New() block = NOBREATHBLOCK ..() -/obj/item/weapon/dnainjector/remoteview +/obj/item/dnainjector/remoteview name = "\improper DNA injector (Remote View)" desc = "Stare into the distance for a reason." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/remoteview/New() +/obj/item/dnainjector/remoteview/New() block = REMOTEVIEWBLOCK ..() -/obj/item/weapon/dnainjector/antiremoteview +/obj/item/dnainjector/antiremoteview name = "\improper DNA injector (Anti-Remote View)" desc = "Cures green skin." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antiremoteview/New() +/obj/item/dnainjector/antiremoteview/New() block = REMOTEVIEWBLOCK ..() -/obj/item/weapon/dnainjector/regenerate +/obj/item/dnainjector/regenerate name = "\improper DNA injector (Regeneration)" desc = "Healthy but hungry." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/regenerate/New() +/obj/item/dnainjector/regenerate/New() block = REGENERATEBLOCK ..() -/obj/item/weapon/dnainjector/antiregenerate +/obj/item/dnainjector/antiregenerate name = "\improper DNA injector (Anti-Regeneration)" desc = "Sickly but sated." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antiregenerate/New() +/obj/item/dnainjector/antiregenerate/New() block = REGENERATEBLOCK ..() -/obj/item/weapon/dnainjector/runfast +/obj/item/dnainjector/runfast name = "\improper DNA injector (Increase Run)" desc = "Running Man." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/runfast/New() +/obj/item/dnainjector/runfast/New() block = INCREASERUNBLOCK ..() -/obj/item/weapon/dnainjector/antirunfast +/obj/item/dnainjector/antirunfast name = "\improper DNA injector (Anti-Increase Run)" desc = "Walking Man." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antirunfast/New() +/obj/item/dnainjector/antirunfast/New() block = INCREASERUNBLOCK ..() -/obj/item/weapon/dnainjector/morph +/obj/item/dnainjector/morph name = "\improper DNA injector (Morph)" desc = "A total makeover." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/morph/New() +/obj/item/dnainjector/morph/New() block = MORPHBLOCK ..() -/obj/item/weapon/dnainjector/antimorph +/obj/item/dnainjector/antimorph name = "\improper DNA injector (Anti-Morph)" desc = "Cures identity crisis." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antimorph/New() +/obj/item/dnainjector/antimorph/New() block = MORPHBLOCK ..() -/obj/item/weapon/dnainjector/noprints +/obj/item/dnainjector/noprints name = "\improper DNA injector (No Prints)" desc = "Better than a pair of budget insulated gloves." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/noprints/New() +/obj/item/dnainjector/noprints/New() block = NOPRINTSBLOCK ..() -/obj/item/weapon/dnainjector/antinoprints +/obj/item/dnainjector/antinoprints name = "\improper DNA injector (Anti-No Prints)" desc = "Not quite as good as a pair of budget insulated gloves." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antinoprints/New() +/obj/item/dnainjector/antinoprints/New() block = NOPRINTSBLOCK ..() -/obj/item/weapon/dnainjector/insulation +/obj/item/dnainjector/insulation name = "\improper DNA injector (Shock Immunity)" desc = "Better than a pair of real insulated gloves." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/insulation/New() +/obj/item/dnainjector/insulation/New() block = SHOCKIMMUNITYBLOCK ..() -/obj/item/weapon/dnainjector/antiinsulation +/obj/item/dnainjector/antiinsulation name = "\improper DNA injector (Anti-Shock Immunity)" desc = "Not quite as good as a pair of real insulated gloves." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antiinsulation/New() +/obj/item/dnainjector/antiinsulation/New() block = SHOCKIMMUNITYBLOCK ..() -/obj/item/weapon/dnainjector/midgit +/obj/item/dnainjector/midgit name = "\improper DNA injector (Small Size)" desc = "Makes you shrink." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/midgit/New() +/obj/item/dnainjector/midgit/New() block = SMALLSIZEBLOCK ..() -/obj/item/weapon/dnainjector/antimidgit +/obj/item/dnainjector/antimidgit name = "\improper DNA injector (Anti-Small Size)" desc = "Makes you grow. But not too much." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antimidgit/New() +/obj/item/dnainjector/antimidgit/New() block = SMALLSIZEBLOCK ..() ///////////////////////////////////// -/obj/item/weapon/dnainjector/antiglasses +/obj/item/dnainjector/antiglasses name = "\improper DNA injector (Anti-Glasses)" desc = "Toss away those glasses!" datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antiglasses/New() +/obj/item/dnainjector/antiglasses/New() block = GLASSESBLOCK ..() -/obj/item/weapon/dnainjector/glassesmut +/obj/item/dnainjector/glassesmut name = "\improper DNA injector (Glasses)" desc = "Will make you need dorkish glasses." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/glassesmut/New() +/obj/item/dnainjector/glassesmut/New() block = GLASSESBLOCK ..() -/obj/item/weapon/dnainjector/epimut +/obj/item/dnainjector/epimut name = "\improper DNA injector (Epi.)" desc = "Shake shake shake the room!" datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/epimut/New() +/obj/item/dnainjector/epimut/New() block = HEADACHEBLOCK ..() -/obj/item/weapon/dnainjector/antiepi +/obj/item/dnainjector/antiepi name = "\improper DNA injector (Anti-Epi.)" desc = "Will fix you up from shaking the room." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antiepi/New() +/obj/item/dnainjector/antiepi/New() block = HEADACHEBLOCK ..() -/obj/item/weapon/dnainjector/anticough +/obj/item/dnainjector/anticough name = "\improper DNA injector (Anti-Cough)" desc = "Will stop that awful noise." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/anticough/New() +/obj/item/dnainjector/anticough/New() block = COUGHBLOCK ..() -/obj/item/weapon/dnainjector/coughmut +/obj/item/dnainjector/coughmut name = "\improper DNA injector (Cough)" desc = "Will bring forth a sound of horror from your throat." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/coughmut/New() +/obj/item/dnainjector/coughmut/New() block = COUGHBLOCK ..() -/obj/item/weapon/dnainjector/clumsymut +/obj/item/dnainjector/clumsymut name = "\improper DNA injector (Clumsy)" desc = "Makes clumsy minions." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/clumsymut/New() +/obj/item/dnainjector/clumsymut/New() block = CLUMSYBLOCK ..() -/obj/item/weapon/dnainjector/anticlumsy +/obj/item/dnainjector/anticlumsy name = "\improper DNA injector (Anti-Clumy)" desc = "Cleans up confusion." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/anticlumsy/New() +/obj/item/dnainjector/anticlumsy/New() block = CLUMSYBLOCK ..() -/obj/item/weapon/dnainjector/antitour +/obj/item/dnainjector/antitour name = "\improper DNA injector (Anti-Tour.)" desc = "Will cure tourrets." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antitour/New() +/obj/item/dnainjector/antitour/New() block = TWITCHBLOCK ..() -/obj/item/weapon/dnainjector/tourmut +/obj/item/dnainjector/tourmut name = "\improper DNA injector (Tour.)" desc = "Gives you a nasty case off tourrets." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/tourmut/New() +/obj/item/dnainjector/tourmut/New() block = TWITCHBLOCK ..() -/obj/item/weapon/dnainjector/stuttmut +/obj/item/dnainjector/stuttmut name = "\improper DNA injector (Stutt.)" desc = "Makes you s-s-stuttterrr" datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/stuttmut/New() +/obj/item/dnainjector/stuttmut/New() block = NERVOUSBLOCK ..() -/obj/item/weapon/dnainjector/antistutt +/obj/item/dnainjector/antistutt name = "\improper DNA injector (Anti-Stutt.)" desc = "Fixes that speaking impairment." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antistutt/New() +/obj/item/dnainjector/antistutt/New() block = NERVOUSBLOCK ..() -/obj/item/weapon/dnainjector/blindmut +/obj/item/dnainjector/blindmut name = "\improper DNA injector (Blind)" desc = "Makes you not see anything." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/blindmut/New() +/obj/item/dnainjector/blindmut/New() block = BLINDBLOCK ..() -/obj/item/weapon/dnainjector/antiblind +/obj/item/dnainjector/antiblind name = "\improper DNA injector (Anti-Blind)" desc = "ITS A MIRACLE!!!" datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antiblind/New() +/obj/item/dnainjector/antiblind/New() block = BLINDBLOCK ..() -/obj/item/weapon/dnainjector/deafmut +/obj/item/dnainjector/deafmut name = "\improper DNA injector (Deaf)" desc = "Sorry, what did you say?" datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/deafmut/New() +/obj/item/dnainjector/deafmut/New() block = DEAFBLOCK ..() -/obj/item/weapon/dnainjector/antideaf +/obj/item/dnainjector/antideaf name = "\improper DNA injector (Anti-Deaf)" desc = "Will make you hear once more." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antideaf/New() +/obj/item/dnainjector/antideaf/New() block = DEAFBLOCK ..() -/obj/item/weapon/dnainjector/hallucination +/obj/item/dnainjector/hallucination name = "\improper DNA injector (Halluctination)" desc = "What you see isn't always what you get." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/hallucination/New() +/obj/item/dnainjector/hallucination/New() block = HALLUCINATIONBLOCK ..() -/obj/item/weapon/dnainjector/antihallucination +/obj/item/dnainjector/antihallucination name = "\improper DNA injector (Anti-Hallucination)" desc = "What you see is what you get." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/antihallucination/New() +/obj/item/dnainjector/antihallucination/New() block = HALLUCINATIONBLOCK ..() -/obj/item/weapon/dnainjector/h2m +/obj/item/dnainjector/h2m name = "\improper DNA injector (Human > Monkey)" desc = "Will make you a flea bag." datatype = DNA2_BUF_SE value = 0xFFF -/obj/item/weapon/dnainjector/h2m/New() +/obj/item/dnainjector/h2m/New() block = MONKEYBLOCK ..() -/obj/item/weapon/dnainjector/m2h +/obj/item/dnainjector/m2h name = "\improper DNA injector (Monkey > Human)" desc = "Will make you...less hairy." datatype = DNA2_BUF_SE value = 0x001 -/obj/item/weapon/dnainjector/m2h/New() +/obj/item/dnainjector/m2h/New() block = MONKEYBLOCK ..() diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm index a61f6837c31..7149b91e6a7 100644 --- a/code/game/objects/items/weapons/ecigs.dm +++ b/code/game/objects/items/weapons/ecigs.dm @@ -3,9 +3,9 @@ desc = "For the modern approach to smoking." icon = 'icons/obj/ecig.dmi' var/active = 0 - //var/obj/item/weapon/cell/ec_cell = /obj/item/weapon/cell/device - var/cartridge_type = /obj/item/weapon/reagent_containers/ecig_cartridge/med_nicotine - var/obj/item/weapon/reagent_containers/ecig_cartridge/ec_cartridge + //var/obj/item/cell/ec_cell = /obj/item/cell/device + var/cartridge_type = /obj/item/reagent_containers/ecig_cartridge/med_nicotine + var/obj/item/reagent_containers/ecig_cartridge/ec_cartridge w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS | SLOT_MASK attack_verb = list("attacked", "poked", "battered") @@ -107,7 +107,7 @@ /obj/item/clothing/mask/smokable/ecig/attackby(var/obj/item/I, var/mob/user as mob) - if(istype(I, /obj/item/weapon/reagent_containers/ecig_cartridge)) + if(istype(I, /obj/item/reagent_containers/ecig_cartridge)) if (ec_cartridge)//can't add second one to_chat(user, "A cartridge has already been installed. ") else//fits in new one @@ -143,7 +143,7 @@ else ..() -/obj/item/weapon/reagent_containers/ecig_cartridge +/obj/item/reagent_containers/ecig_cartridge name = "tobacco flavour cartridge" desc = "A small metal cartridge, used with electronic cigarettes, which contains an atomizing coil and a solution to be atomized." w_class = ITEMSIZE_TINY @@ -153,100 +153,100 @@ volume = 20 flags = OPENCONTAINER -/obj/item/weapon/reagent_containers/ecig_cartridge/New() +/obj/item/reagent_containers/ecig_cartridge/New() create_reagents(volume) -/obj/item/weapon/reagent_containers/ecig_cartridge/examine(mob/user as mob)//to see how much left +/obj/item/reagent_containers/ecig_cartridge/examine(mob/user as mob)//to see how much left . = ..() . += "The cartridge has [reagents.total_volume] units of liquid remaining." //flavours -/obj/item/weapon/reagent_containers/ecig_cartridge/blank +/obj/item/reagent_containers/ecig_cartridge/blank name = "ecigarette cartridge" desc = "A small metal cartridge which contains an atomizing coil." -/obj/item/weapon/reagent_containers/ecig_cartridge/blanknico +/obj/item/reagent_containers/ecig_cartridge/blanknico name = "flavorless nicotine cartridge" desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says you can add whatever flavoring agents you want." -/obj/item/weapon/reagent_containers/ecig_cartridge/blanknico/New() +/obj/item/reagent_containers/ecig_cartridge/blanknico/New() ..() reagents.add_reagent("nicotine", 5) reagents.add_reagent("water", 10) -/obj/item/weapon/reagent_containers/ecig_cartridge/med_nicotine +/obj/item/reagent_containers/ecig_cartridge/med_nicotine name = "tobacco flavour cartridge" desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its tobacco flavored." -/obj/item/weapon/reagent_containers/ecig_cartridge/med_nicotine/New() +/obj/item/reagent_containers/ecig_cartridge/med_nicotine/New() ..() reagents.add_reagent("nicotine", 5) reagents.add_reagent("water", 15) -/obj/item/weapon/reagent_containers/ecig_cartridge/high_nicotine +/obj/item/reagent_containers/ecig_cartridge/high_nicotine name = "high nicotine tobacco flavour cartridge" desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its tobacco flavored, with extra nicotine." -/obj/item/weapon/reagent_containers/ecig_cartridge/high_nicotine/New() +/obj/item/reagent_containers/ecig_cartridge/high_nicotine/New() ..() reagents.add_reagent("nicotine", 10) reagents.add_reagent("water", 10) -/obj/item/weapon/reagent_containers/ecig_cartridge/orange +/obj/item/reagent_containers/ecig_cartridge/orange name = "orange flavour cartridge" desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its orange flavored." -/obj/item/weapon/reagent_containers/ecig_cartridge/orange/New() +/obj/item/reagent_containers/ecig_cartridge/orange/New() ..() reagents.add_reagent("nicotine", 5) reagents.add_reagent("water", 10) reagents.add_reagent("orangejuice", 5) -/obj/item/weapon/reagent_containers/ecig_cartridge/mint +/obj/item/reagent_containers/ecig_cartridge/mint name = "mint flavour cartridge" desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its mint flavored." -/obj/item/weapon/reagent_containers/ecig_cartridge/mint/New() +/obj/item/reagent_containers/ecig_cartridge/mint/New() ..() reagents.add_reagent("nicotine", 5) reagents.add_reagent("water", 10) reagents.add_reagent("menthol", 5) -/obj/item/weapon/reagent_containers/ecig_cartridge/watermelon +/obj/item/reagent_containers/ecig_cartridge/watermelon name = "watermelon flavour cartridge" desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its watermelon flavored." -/obj/item/weapon/reagent_containers/ecig_cartridge/watermelon/New() +/obj/item/reagent_containers/ecig_cartridge/watermelon/New() ..() reagents.add_reagent("nicotine", 5) reagents.add_reagent("water", 10) reagents.add_reagent("watermelonjuice", 5) -/obj/item/weapon/reagent_containers/ecig_cartridge/grape +/obj/item/reagent_containers/ecig_cartridge/grape name = "grape flavour cartridge" desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its grape flavored." -/obj/item/weapon/reagent_containers/ecig_cartridge/grape/New() +/obj/item/reagent_containers/ecig_cartridge/grape/New() ..() reagents.add_reagent("nicotine", 5) reagents.add_reagent("water", 10) reagents.add_reagent("grapejuice", 5) -/obj/item/weapon/reagent_containers/ecig_cartridge/lemonlime +/obj/item/reagent_containers/ecig_cartridge/lemonlime name = "lemon-lime flavour cartridge" desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its lemon-lime flavored." -/obj/item/weapon/reagent_containers/ecig_cartridge/lemonlime/New() +/obj/item/reagent_containers/ecig_cartridge/lemonlime/New() ..() reagents.add_reagent("nicotine", 5) reagents.add_reagent("water", 10) reagents.add_reagent("lemon_lime", 5) -/obj/item/weapon/reagent_containers/ecig_cartridge/coffee +/obj/item/reagent_containers/ecig_cartridge/coffee name = "coffee flavour cartridge" desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its coffee flavored." -/obj/item/weapon/reagent_containers/ecig_cartridge/coffee/New() +/obj/item/reagent_containers/ecig_cartridge/coffee/New() ..() reagents.add_reagent("nicotine", 5) reagents.add_reagent("water", 10) reagents.add_reagent("coffee", 5) /* -/obj/item/weapon/reagent_containers/ecig_cartridge/cannabis +/obj/item/reagent_containers/ecig_cartridge/cannabis name = "herb flavour cartridge" desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label seems to be suspiciously scuffed off..." -/obj/item/weapon/reagent_containers/ecig_cartridge/cannabis/New() +/obj/item/reagent_containers/ecig_cartridge/cannabis/New() ..() reagents.add_reagent("nicotine", 5) reagents.add_reagent("water", 10) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index fcb45bad9c1..7b4d5e9ffd2 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/plastique +/obj/item/plastique name = "plastic explosives" desc = "Used to put holes in specific areas without too much extra hole." gender = PLURAL @@ -18,37 +18,37 @@ var/blast_light = 2 var/blast_flash = 3 -/obj/item/weapon/plastique/New() +/obj/item/plastique/New() wires = new(src) image_overlay = image('icons/obj/assemblies.dmi', "plastic-explosive2") ..() -/obj/item/weapon/plastique/Destroy() +/obj/item/plastique/Destroy() qdel(wires) wires = null return ..() -/obj/item/weapon/plastique/attackby(var/obj/item/I, var/mob/user) +/obj/item/plastique/attackby(var/obj/item/I, var/mob/user) if(I.has_tool_quality(TOOL_SCREWDRIVER)) open_panel = !open_panel to_chat(user, "You [open_panel ? "open" : "close"] the wire panel.") playsound(src, I.usesound, 50, 1) - else if(I.has_tool_quality(TOOL_WIRECUTTER) || istype(I, /obj/item/device/multitool) || istype(I, /obj/item/device/assembly/signaler )) + else if(I.has_tool_quality(TOOL_WIRECUTTER) || istype(I, /obj/item/multitool) || istype(I, /obj/item/assembly/signaler )) wires.Interact(user) else ..() -/obj/item/weapon/plastique/attack_self(mob/user as mob) +/obj/item/plastique/attack_self(mob/user as mob) var/newtime = tgui_input_number(usr, "Please set the timer.", "Timer", 10, 60000, 10) if(user.get_active_hand() == src) newtime = CLAMP(newtime, 10, 60000) timer = newtime to_chat(user, "Timer set for [timer] seconds.") -/obj/item/weapon/plastique/afterattack(atom/movable/target, mob/user, flag) +/obj/item/plastique/afterattack(atom/movable/target, mob/user, flag) if (!flag) return - if (ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage/) || istype(target, /obj/item/clothing/accessory/storage/) || istype(target, /obj/item/clothing/under)) + if (ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/storage/) || istype(target, /obj/item/clothing/accessory/storage/) || istype(target, /obj/item/clothing/under)) return to_chat(user, "Planting explosives...") user.do_attack_animation(target) @@ -70,7 +70,7 @@ spawn(timer*10) explode(get_turf(target)) -/obj/item/weapon/plastique/proc/explode(var/location) +/obj/item/plastique/proc/explode(var/location) if(!target) target = get_atom_on_turf(src) if(!target) @@ -90,10 +90,10 @@ target.cut_overlay(image_overlay, TRUE) qdel(src) -/obj/item/weapon/plastique/attack(mob/M as mob, mob/user as mob, def_zone) +/obj/item/plastique/attack(mob/M as mob, mob/user as mob, def_zone) return -/obj/item/weapon/plastique/seismic +/obj/item/plastique/seismic name = "seismic charge" desc = "Used to dig holes in specific areas without too much extra hole." @@ -101,11 +101,11 @@ blast_light = 4 blast_flash = 7 -/obj/item/weapon/plastique/seismic/attackby(var/obj/item/I, var/mob/user) +/obj/item/plastique/seismic/attackby(var/obj/item/I, var/mob/user) . = ..() if(open_panel) - if(istype(I, /obj/item/weapon/stock_parts/micro_laser)) - var/obj/item/weapon/stock_parts/SP = I + if(istype(I, /obj/item/stock_parts/micro_laser)) + var/obj/item/stock_parts/SP = I var/new_blast_power = max(1, round(SP.rating / 2) + 1) if(new_blast_power > blast_heavy) to_chat(user, "You install \the [I] into \the [src].") diff --git a/code/game/objects/items/weapons/explosives_vr.dm b/code/game/objects/items/weapons/explosives_vr.dm index 8d5bb8c961d..28ea2103184 100644 --- a/code/game/objects/items/weapons/explosives_vr.dm +++ b/code/game/objects/items/weapons/explosives_vr.dm @@ -1,7 +1,7 @@ -/obj/item/weapon/plastique/seismic/locked +/obj/item/plastique/seismic/locked desc = "Used to dig holes in specific areas without too much extra hole. Has extra mechanism that safely implodes the bomb if it is used in close proximity to the facility." -/obj/item/weapon/plastique/seismic/locked/explode(var/location) +/obj/item/plastique/seismic/locked/explode(var/location) if(!target) target = get_atom_on_turf(src) if(!target) diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index abd80e61ee0..f32ea57f180 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/extinguisher +/obj/item/extinguisher name = "fire extinguisher" desc = "A traditional red fire extinguisher." icon = 'icons/obj/items.dmi' @@ -23,7 +23,7 @@ var/sprite_name = "fire_extinguisher" var/rand_overlays = 6 -/obj/item/weapon/extinguisher/mini +/obj/item/extinguisher/mini name = "fire extinguisher" desc = "A light and compact fibreglass-framed model fire extinguisher." icon_state = "miniFE0" @@ -37,7 +37,7 @@ sprite_name = "miniFE" rand_overlays = 0 -/obj/item/weapon/extinguisher/atmo +/obj/item/extinguisher/atmo name = "atmospheric fire extinguisher" desc = "A heavy duty fire extinguisher meant to fight large fires." icon_state = "atmos_extinguisher0" @@ -50,7 +50,7 @@ sprite_name = "atmos_extinguisher" rand_overlays = 0 -/obj/item/weapon/extinguisher/Initialize() +/obj/item/extinguisher/Initialize() create_reagents(max_water) reagents.add_reagent("firefoam", max_water) if(rand_overlays) @@ -58,18 +58,18 @@ add_overlay("[item_state]O[choice]") . = ..() -/obj/item/weapon/extinguisher/examine(mob/user) +/obj/item/extinguisher/examine(mob/user) . = ..() if(get_dist(user, src) == 0) . += "[src] has [src.reagents.total_volume] units of foam left!" -/obj/item/weapon/extinguisher/attack_self(mob/user as mob) +/obj/item/extinguisher/attack_self(mob/user as mob) safety = !safety icon_state = "[sprite_name][!safety]" desc = "The safety is [safety ? "on" : "off"]." to_chat(user, "The safety is [safety ? "on" : "off"].") -/obj/item/weapon/extinguisher/proc/propel_object(var/obj/O, mob/user, movementdirection) +/obj/item/extinguisher/proc/propel_object(var/obj/O, mob/user, movementdirection) if(O.anchored) return var/obj/structure/bed/chair/C @@ -87,7 +87,7 @@ O.Move(get_step(user,movementdirection), movementdirection) sleep(3) -/obj/item/weapon/extinguisher/afterattack(var/atom/target, var/mob/user, var/flag) +/obj/item/extinguisher/afterattack(var/atom/target, var/mob/user, var/flag) //TODO; Add support for reagents in water. if( istype(target, /obj/structure/reagent_dispensers) && flag) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 35dd4bfdf65..af7b1f0d6c4 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/flamethrower +/obj/item/flamethrower name = "flamethrower" desc = "You are a firestarter!" icon = 'icons/obj/flamethrower.dmi' @@ -20,18 +20,18 @@ var/lit = 0 //on or off var/operating = 0//cooldown var/turf/previousturf = null - var/obj/item/weapon/weldingtool/weldtool = null - var/obj/item/device/assembly/igniter/igniter = null - var/obj/item/weapon/tank/phoron/ptank = null + var/obj/item/weldingtool/weldtool = null + var/obj/item/assembly/igniter/igniter = null + var/obj/item/tank/phoron/ptank = null -/obj/item/weapon/flamethrower/Destroy() +/obj/item/flamethrower/Destroy() QDEL_NULL(weldtool) QDEL_NULL(igniter) QDEL_NULL(ptank) . = ..() -/obj/item/weapon/flamethrower/process() +/obj/item/flamethrower/process() if(!lit) STOP_PROCESSING(SSobj, src) return null @@ -45,7 +45,7 @@ return -/obj/item/weapon/flamethrower/update_icon() +/obj/item/flamethrower/update_icon() cut_overlays() if(igniter) add_overlay("+igniter[status]") @@ -58,7 +58,7 @@ item_state = "flamethrower_0" return -/obj/item/weapon/flamethrower/afterattack(atom/target, mob/user, proximity) +/obj/item/flamethrower/afterattack(atom/target, mob/user, proximity) if(!proximity) return // Make sure our user is still holding us if(user && user.get_active_hand() == src) @@ -67,7 +67,7 @@ var/turflist = getline(user, target_turf) flame_turf(turflist) -/obj/item/weapon/flamethrower/attackby(obj/item/W as obj, mob/user as mob) +/obj/item/flamethrower/attackby(obj/item/W as obj, mob/user as mob) if(user.stat || user.restrained() || user.lying) return if(W.has_tool_quality(TOOL_WRENCH) && !status)//Taking this apart var/turf/T = get_turf(src) @@ -91,7 +91,7 @@ return if(isigniter(W)) - var/obj/item/device/assembly/igniter/I = W + var/obj/item/assembly/igniter/I = W if(I.secured) return if(igniter) return user.drop_item() @@ -100,7 +100,7 @@ update_icon() return - if(istype(W,/obj/item/weapon/tank/phoron)) + if(istype(W,/obj/item/tank/phoron)) if(ptank) to_chat(user, "There appears to already be a phoron tank loaded in [src]!") return @@ -114,7 +114,7 @@ return -/obj/item/weapon/flamethrower/attack_self(mob/user as mob) +/obj/item/flamethrower/attack_self(mob/user as mob) if(user.stat || user.restrained() || user.lying) return user.set_machine(src) if(!ptank) @@ -126,7 +126,7 @@ return -/obj/item/weapon/flamethrower/Topic(href,href_list[]) +/obj/item/flamethrower/Topic(href,href_list[]) if(href_list["close"]) usr.unset_machine() usr << browse(null, "window=flamethrower") @@ -158,7 +158,7 @@ //Called from turf.dm turf/dblclick -/obj/item/weapon/flamethrower/proc/flame_turf(turflist) +/obj/item/flamethrower/proc/flame_turf(turflist) if(!lit || operating) return operating = 1 for(var/turf/T in turflist) @@ -179,7 +179,7 @@ return -/obj/item/weapon/flamethrower/proc/ignite_turf(turf/target) +/obj/item/flamethrower/proc/ignite_turf(turf/target) //TODO: DEFERRED Consider checking to make sure tank pressure is high enough before doing this... //Transfer 5% of current tank air contents to turf var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(0.02*(throw_amount/100)) @@ -193,11 +193,11 @@ //location.hotspot_expose(1000,500,1) return -/obj/item/weapon/flamethrower/full/New(var/loc) +/obj/item/flamethrower/full/New(var/loc) ..() - weldtool = new /obj/item/weapon/weldingtool(src) + weldtool = new /obj/item/weldingtool(src) weldtool.status = 0 - igniter = new /obj/item/device/assembly/igniter(src) + igniter = new /obj/item/assembly/igniter(src) igniter.secured = 0 status = 1 update_icon() diff --git a/code/game/objects/items/weapons/game_kit.dm b/code/game/objects/items/weapons/game_kit.dm index 09ffacd32b7..47b39a164ee 100644 --- a/code/game/objects/items/weapons/game_kit.dm +++ b/code/game/objects/items/weapons/game_kit.dm @@ -3,14 +3,14 @@ CONTAINS: THAT STUPID GAME KIT */ -/obj/item/weapon/game_kit/New() +/obj/item/game_kit/New() src.board_stat = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" src.selected = "CR" -/obj/item/weapon/game_kit/attack_paw(mob/user as mob) +/obj/item/game_kit/attack_paw(mob/user as mob) return src.attack_hand(user) -/obj/item/weapon/game_kit/MouseDrop(mob/user as mob) +/obj/item/game_kit/MouseDrop(mob/user as mob) if (user == usr && !usr.restrained() && !usr.stat && (usr.contents.Find(src) || in_range(src, usr))) if (usr.hand) if (!usr.l_hand) @@ -21,7 +21,7 @@ THAT STUPID GAME KIT spawn (0) src.attack_hand(usr, 0, 1) -/obj/item/weapon/game_kit/proc/update() +/obj/item/game_kit/proc/update() var/dat = text("
Game Board

[] remove
", src, (src.selected ? text("Selected: []", src.selected) : "Nothing Selected"), src) for (var/y = 1 to 8) dat += "" @@ -52,10 +52,10 @@ THAT STUPID GAME KIT dat += "" src.data = dat -/obj/item/weapon/game_kit/attack_ai(mob/user as mob, unused, flag) +/obj/item/game_kit/attack_ai(mob/user as mob, unused, flag) return src.attack_hand(user, unused, flag) -/obj/item/weapon/game_kit/attack_hand(mob/user as mob, unused, flag) +/obj/item/game_kit/attack_hand(mob/user as mob, unused, flag) if (flag) return ..() @@ -68,7 +68,7 @@ THAT STUPID GAME KIT return return -/obj/item/weapon/game_kit/Topic(href, href_list) +/obj/item/game_kit/Topic(href, href_list) ..() if ((usr.stat || usr.restrained())) return diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 42134cb6386..bb6f6eb8c3e 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -7,7 +7,7 @@ /* * Gifts */ -/obj/item/weapon/a_gift +/obj/item/a_gift name = "gift" desc = "PRESENTS!!!! eek!" icon = 'icons/obj/items.dmi' @@ -16,7 +16,7 @@ drop_sound = 'sound/items/drop/cardboardbox.ogg' pickup_sound = 'sound/items/pickup/cardboardbox.ogg' -/obj/item/weapon/a_gift/New() +/obj/item/a_gift/New() ..() pixel_x = rand(-10,10) pixel_y = rand(-10,10) @@ -26,7 +26,7 @@ icon_state = "gift[pick(1, 2, 3)]" return -/obj/item/weapon/gift/attack_self(mob/user as mob) +/obj/item/gift/attack_self(mob/user as mob) user.drop_item() playsound(src, 'sound/items/package_unwrap.ogg', 50,1) if(src.gift) @@ -37,7 +37,7 @@ qdel(src) return -/obj/item/weapon/a_gift/ex_act() +/obj/item/a_gift/ex_act() qdel(src) return @@ -46,7 +46,7 @@ return to_chat(user, "You can't move.") -/obj/effect/spresent/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/effect/spresent/attackby(obj/item/W as obj, mob/user as mob) ..() if (!W.has_tool_quality(TOOL_WIRECUTTER)) @@ -60,30 +60,30 @@ qdel(src) -/obj/item/weapon/a_gift/attack_self(mob/M as mob) +/obj/item/a_gift/attack_self(mob/M as mob) var/gift_type = pick( - /obj/item/weapon/storage/wallet, - /obj/item/weapon/storage/photo_album, - /obj/item/weapon/storage/box/snappops, - /obj/item/weapon/storage/fancy/crayons, - /obj/item/weapon/storage/backpack/holding, - /obj/item/weapon/storage/belt/champion, - /obj/item/weapon/soap/deluxe, - /obj/item/weapon/pickaxe/silver, - /obj/item/weapon/pen/invisible, - /obj/item/weapon/lipstick/random, - /obj/item/weapon/grenade/smokebomb, - /obj/item/weapon/corncob, + /obj/item/storage/wallet, + /obj/item/storage/photo_album, + /obj/item/storage/box/snappops, + /obj/item/storage/fancy/crayons, + /obj/item/storage/backpack/holding, + /obj/item/storage/belt/champion, + /obj/item/soap/deluxe, + /obj/item/pickaxe/silver, + /obj/item/pen/invisible, + /obj/item/lipstick/random, + /obj/item/grenade/smokebomb, + /obj/item/corncob, /obj/item/poster/custom, - /obj/item/weapon/book/manual/barman_recipes, - /obj/item/weapon/book/manual/chef_recipes, - /obj/item/weapon/bikehorn, - /obj/item/weapon/beach_ball, - /obj/item/weapon/beach_ball/holoball, + /obj/item/book/manual/barman_recipes, + /obj/item/book/manual/chef_recipes, + /obj/item/bikehorn, + /obj/item/beach_ball, + /obj/item/beach_ball/holoball, /obj/item/toy/balloon, /obj/item/toy/blink, - /obj/item/weapon/gun/projectile/revolver/toy/crossbow, - /obj/item/weapon/storage/box/capguntoy, + /obj/item/gun/projectile/revolver/toy/crossbow, + /obj/item/storage/box/capguntoy, /obj/item/toy/katana, /obj/item/toy/mecha/deathripley, /obj/item/toy/mecha/durand, @@ -98,11 +98,11 @@ /obj/item/toy/mecha/seraph, /obj/item/toy/spinningtoy, /obj/item/toy/sword, - /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, - /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, - /obj/item/device/paicard, + /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, + /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, + /obj/item/paicard, /obj/item/instrument/violin, - /obj/item/weapon/storage/belt/utility/full, + /obj/item/storage/belt/utility/full, /obj/item/clothing/accessory/tie/horrible) if(!ispath(gift_type,/obj/item)) return @@ -117,7 +117,7 @@ /* * Wrapping Paper */ -/obj/item/weapon/wrapping_paper +/obj/item/wrapping_paper name = "wrapping paper" desc = "You can use this to wrap items in." icon = 'icons/obj/items.dmi' @@ -126,7 +126,7 @@ drop_sound = 'sound/items/drop/wrapper.ogg' pickup_sound = 'sound/items/pickup/wrapper.ogg' -/obj/item/weapon/wrapping_paper/attackby(obj/item/weapon/W as obj, mob/living/user as mob) +/obj/item/wrapping_paper/attackby(obj/item/W as obj, mob/living/user as mob) ..() if (!( locate(/obj/structure/table, src.loc) )) to_chat(user, "You MUST put the paper on a table!") @@ -138,13 +138,13 @@ to_chat(user, "You need more paper!") return else - if(istype(W, /obj/item/smallDelivery) || istype(W, /obj/item/weapon/gift)) //No gift wrapping gifts! + if(istype(W, /obj/item/smallDelivery) || istype(W, /obj/item/gift)) //No gift wrapping gifts! to_chat(user, "You can't wrap something that's already wrapped!") return src.amount -= a_used user.drop_item() - var/obj/item/weapon/gift/G = new /obj/item/weapon/gift( src.loc ) + var/obj/item/gift/G = new /obj/item/gift( src.loc ) G.size = W.w_class G.w_class = G.size + 1 G.icon_state = text("gift[]", G.size) @@ -154,7 +154,7 @@ W.add_fingerprint(user) src.add_fingerprint(user) if (src.amount <= 0) - new /obj/item/weapon/c_tube( src.loc ) + new /obj/item/c_tube( src.loc ) qdel(src) return else @@ -164,12 +164,12 @@ return -/obj/item/weapon/wrapping_paper/examine(mob/user) +/obj/item/wrapping_paper/examine(mob/user) . = ..() if(Adjacent(user)) . += "There is about [src.amount] square units of paper left!" -/obj/item/weapon/wrapping_paper/attack(mob/target as mob, mob/user as mob) +/obj/item/wrapping_paper/attack(mob/target as mob, mob/user as mob) if (!istype(target, /mob/living/carbon/human)) return var/mob/living/carbon/human/H = target diff --git a/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm b/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm index 5a2aad6ac3d..32992952cbe 100644 --- a/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm +++ b/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/grenade/anti_photon +/obj/item/grenade/anti_photon desc = "An experimental device for temporarily removing light in a limited area." name = "photon disruption grenade" icon = 'icons/obj/grenade.dmi' @@ -6,7 +6,7 @@ det_time = 20 origin_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 4) -/obj/item/weapon/grenade/anti_photon/detonate() +/obj/item/grenade/anti_photon/detonate() playsound(src, 'sound/effects/phasein.ogg', 50, 1, 5) set_light(10, -10, "#FFFFFF") diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 84fade96cff..3f29c0a3b3a 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/grenade/chem_grenade +/obj/item/grenade/chem_grenade name = "grenade casing" icon_state = "chemg" item_state = "grenade" @@ -13,21 +13,21 @@ var/path = 0 /// If TRUE, grenade is permanently sealed when fully assembled, useful for things like off-the-shelf grenades. var/sealed = FALSE - var/obj/item/device/assembly_holder/detonator = null + var/obj/item/assembly_holder/detonator = null var/list/beakers = new/list() - var/list/allowed_containers = list(/obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/reagent_containers/glass/bottle) + var/list/allowed_containers = list(/obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle) var/affected_area = 3 -/obj/item/weapon/grenade/chem_grenade/Initialize() +/obj/item/grenade/chem_grenade/Initialize() . = ..() create_reagents(1000) -/obj/item/weapon/grenade/chem_grenade/Destroy() +/obj/item/grenade/chem_grenade/Destroy() QDEL_NULL(detonator) QDEL_LIST_NULL(beakers) return ..() -/obj/item/weapon/grenade/chem_grenade/attack_self(mob/user as mob) +/obj/item/grenade/chem_grenade/attack_self(mob/user as mob) if(!stage || stage==1) if(detonator) // detonator.loc=src.loc @@ -54,9 +54,9 @@ var/mob/living/carbon/C = user C.throw_mode_on() -/obj/item/weapon/grenade/chem_grenade/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/device/assembly_holder) && (!stage || stage==1) && !detonator && path != 2) - var/obj/item/device/assembly_holder/det = W +/obj/item/grenade/chem_grenade/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W,/obj/item/assembly_holder) && (!stage || stage==1) && !detonator && path != 2) + var/obj/item/assembly_holder/det = W if(istype(det.a_left,det.a_right.type) || (!isigniter(det.a_left) && !isigniter(det.a_right))) to_chat(user, "Assembly must contain one igniter.") return @@ -70,10 +70,10 @@ det.loc = src detonator = det if(istimer(detonator.a_left)) - var/obj/item/device/assembly/timer/T = detonator.a_left + var/obj/item/assembly/timer/T = detonator.a_left det_time = 10*T.time if(istimer(detonator.a_right)) - var/obj/item/device/assembly/timer/T = detonator.a_right + var/obj/item/assembly/timer/T = detonator.a_right det_time = 10*T.time icon_state = initial(icon_state) +"_ass" name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]" @@ -120,12 +120,12 @@ else to_chat(user, "\The [W] is empty.") -/obj/item/weapon/grenade/chem_grenade/examine(mob/user) +/obj/item/grenade/chem_grenade/examine(mob/user) . = ..() if(detonator) . += "It has [detonator.name] attached to it." -/obj/item/weapon/grenade/chem_grenade/activate(mob/user as mob) +/obj/item/grenade/chem_grenade/activate(mob/user as mob) if(active) return if(detonator) @@ -143,15 +143,15 @@ return -/obj/item/weapon/grenade/chem_grenade/proc/primed(var/primed = 1) +/obj/item/grenade/chem_grenade/proc/primed(var/primed = 1) if(active) icon_state = initial(icon_state) + (primed?"_primed":"_active") -/obj/item/weapon/grenade/chem_grenade/detonate() +/obj/item/grenade/chem_grenade/detonate() if(!stage || stage<2) return var/has_reagents = 0 - for(var/obj/item/weapon/reagent_containers/glass/G in beakers) + for(var/obj/item/reagent_containers/glass/G in beakers) if(G.reagents.total_volume) has_reagents = 1 active = 0 @@ -160,16 +160,16 @@ playsound(src, 'sound/items/Screwdriver2.ogg', 50, 1) spawn(0) //Otherwise det_time is erroneously set to 0 after this if(istimer(detonator.a_left)) //Make sure description reflects that the timer has been reset - var/obj/item/device/assembly/timer/T = detonator.a_left + var/obj/item/assembly/timer/T = detonator.a_left det_time = 10*T.time if(istimer(detonator.a_right)) - var/obj/item/device/assembly/timer/T = detonator.a_right + var/obj/item/assembly/timer/T = detonator.a_right det_time = 10*T.time return playsound(src, 'sound/effects/bamf.ogg', 50, 1) - for(var/obj/item/weapon/reagent_containers/glass/G in beakers) + for(var/obj/item/reagent_containers/glass/G in beakers) G.reagents.trans_to_obj(src, G.reagents.total_volume) if(src.reagents.total_volume) //The possible reactions didnt use up all reagents. @@ -192,15 +192,15 @@ qdel(src) //correctly before deleting the grenade. -/obj/item/weapon/grenade/chem_grenade/large +/obj/item/grenade/chem_grenade/large name = "large chem grenade" desc = "An oversized grenade that affects a larger area." icon_state = "large_grenade" - allowed_containers = list(/obj/item/weapon/reagent_containers/glass) + allowed_containers = list(/obj/item/reagent_containers/glass) origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3) affected_area = 4 -/obj/item/weapon/grenade/chem_grenade/metalfoam +/obj/item/grenade/chem_grenade/metalfoam name = "metal-foam grenade" desc = "Used for emergency sealing of air breaches." icon_state = "foam" @@ -208,21 +208,21 @@ stage = 2 sealed = TRUE -/obj/item/weapon/grenade/chem_grenade/metalfoam/Initialize() +/obj/item/grenade/chem_grenade/metalfoam/Initialize() . = ..() - var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) - var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) + var/obj/item/reagent_containers/glass/beaker/B1 = new(src) + var/obj/item/reagent_containers/glass/beaker/B2 = new(src) B1.reagents.add_reagent("aluminum", 30) B2.reagents.add_reagent("foaming_agent", 10) B2.reagents.add_reagent("pacid", 10) - detonator = new/obj/item/device/assembly_holder/timer_igniter(src) + detonator = new/obj/item/assembly_holder/timer_igniter(src) beakers += B1 beakers += B2 -/obj/item/weapon/grenade/chem_grenade/incendiary +/obj/item/grenade/chem_grenade/incendiary name = "incendiary grenade" desc = "Used for clearing rooms of living things." icon_state = "incendiary" @@ -230,10 +230,10 @@ stage = 2 sealed = TRUE -/obj/item/weapon/grenade/chem_grenade/incendiary/Initialize() +/obj/item/grenade/chem_grenade/incendiary/Initialize() . = ..() - var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) - var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) + var/obj/item/reagent_containers/glass/beaker/B1 = new(src) + var/obj/item/reagent_containers/glass/beaker/B2 = new(src) B1.reagents.add_reagent("aluminum", 15) B1.reagents.add_reagent("fuel",20) @@ -241,35 +241,35 @@ B2.reagents.add_reagent("sacid", 15) B1.reagents.add_reagent("fuel",20) - detonator = new/obj/item/device/assembly_holder/timer_igniter(src) + detonator = new/obj/item/assembly_holder/timer_igniter(src) beakers += B1 beakers += B2 -/obj/item/weapon/grenade/chem_grenade/antiweed +/obj/item/grenade/chem_grenade/antiweed name = "weedkiller grenade" desc = "Used for purging large areas of invasive plant species. Contents under pressure. Do not directly inhale contents." path = 1 stage = 2 sealed = TRUE -/obj/item/weapon/grenade/chem_grenade/antiweed/Initialize() +/obj/item/grenade/chem_grenade/antiweed/Initialize() . = ..() - var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) - var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) + var/obj/item/reagent_containers/glass/beaker/B1 = new(src) + var/obj/item/reagent_containers/glass/beaker/B2 = new(src) B1.reagents.add_reagent("plantbgone", 25) B1.reagents.add_reagent("potassium", 25) B2.reagents.add_reagent("phosphorus", 25) B2.reagents.add_reagent("sugar", 25) - detonator = new/obj/item/device/assembly_holder/timer_igniter(src) + detonator = new/obj/item/assembly_holder/timer_igniter(src) beakers += B1 beakers += B2 icon_state = "grenade" -/obj/item/weapon/grenade/chem_grenade/cleaner +/obj/item/grenade/chem_grenade/cleaner name = "cleaner grenade" desc = "BLAM!-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas." icon_state = "cleaner" @@ -277,21 +277,21 @@ path = 1 sealed = TRUE -/obj/item/weapon/grenade/chem_grenade/cleaner/Initialize() +/obj/item/grenade/chem_grenade/cleaner/Initialize() . = ..() - var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) - var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) + var/obj/item/reagent_containers/glass/beaker/B1 = new(src) + var/obj/item/reagent_containers/glass/beaker/B2 = new(src) B1.reagents.add_reagent("fluorosurfactant", 40) B2.reagents.add_reagent("water", 40) B2.reagents.add_reagent("cleaner", 10) - detonator = new/obj/item/device/assembly_holder/timer_igniter(src) + detonator = new/obj/item/assembly_holder/timer_igniter(src) beakers += B1 beakers += B2 -/obj/item/weapon/grenade/chem_grenade/teargas +/obj/item/grenade/chem_grenade/teargas name = "tear gas grenade" desc = "Concentrated Capsaicin. Contents under pressure. Use with caution." icon_state = "teargas" @@ -299,10 +299,10 @@ path = 1 sealed = TRUE -/obj/item/weapon/grenade/chem_grenade/teargas/Initialize() +/obj/item/grenade/chem_grenade/teargas/Initialize() . = ..() - var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src) - var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src) + var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) + var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) B1.reagents.add_reagent("phosphorus", 40) B1.reagents.add_reagent("potassium", 40) @@ -310,7 +310,7 @@ B2.reagents.add_reagent("sugar", 40) B2.reagents.add_reagent("condensedcapsaicin", 80) - detonator = new/obj/item/device/assembly_holder/timer_igniter(src) + detonator = new/obj/item/assembly_holder/timer_igniter(src) beakers += B1 beakers += B2 diff --git a/code/game/objects/items/weapons/grenades/concussion.dm b/code/game/objects/items/weapons/grenades/concussion.dm index fb821ab6f84..d6ae4474c60 100644 --- a/code/game/objects/items/weapons/grenades/concussion.dm +++ b/code/game/objects/items/weapons/grenades/concussion.dm @@ -1,6 +1,6 @@ //Concussion, or 'dizzyness' grenades. -/obj/item/weapon/grenade/concussion +/obj/item/grenade/concussion name = "concussion grenade" desc = "A polymer concussion grenade, optimized for disorienting personnel without causing large amounts of injury." icon_state = "concussion" @@ -8,7 +8,7 @@ var/blast_radius = 5 -/obj/item/weapon/grenade/concussion/detonate() +/obj/item/grenade/concussion/detonate() ..() concussion_blast(get_turf(src), blast_radius) qdel(src) diff --git a/code/game/objects/items/weapons/grenades/confetti.dm b/code/game/objects/items/weapons/grenades/confetti.dm index a2e5559d911..583e158f67d 100644 --- a/code/game/objects/items/weapons/grenades/confetti.dm +++ b/code/game/objects/items/weapons/grenades/confetti.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/grenade/confetti +/obj/item/grenade/confetti desc = "It is set to detonate in 2 seconds. These party grenades will make everyone jump with joy (or fright)!" name = "grenatti" icon = 'icons/obj/grenade.dmi' @@ -9,17 +9,17 @@ var/datum/effect/effect/system/confetti_spread var/confetti_strength = 8 -/obj/item/weapon/grenade/confetti/New() +/obj/item/grenade/confetti/New() ..() src.confetti_spread = new /datum/effect/effect/system/confetti_spread() src.confetti_spread.attach(src) -/obj/item/weapon/grenade/confetti/Destroy() +/obj/item/grenade/confetti/Destroy() qdel(confetti_spread) confetti_spread = null return ..() -/obj/item/weapon/grenade/confetti/detonate() //Find a good confetti firework or pop sound effect later +/obj/item/grenade/confetti/detonate() //Find a good confetti firework or pop sound effect later playsound(src.loc, 'sound/effects/snap.ogg', 50, 1, -3) src.confetti_spread.set_up(10, 0, usr.loc) spawn(0) @@ -30,7 +30,7 @@ return -/obj/item/weapon/grenade/confetti/party_ball //Intended to be used only with the confetti cannon. +/obj/item/grenade/confetti/party_ball //Intended to be used only with the confetti cannon. name = "party ball" desc = "Full of !!FUN!!" icon = 'icons/obj/grenade.dmi' @@ -39,7 +39,7 @@ det_time = 1 throwforce = 0 //Confetti cannon is only fun to shoot at people if it deals no damage. -/obj/item/weapon/grenade/confetti/party_ball/detonate() //Could condense this by making the sound a variable in the parent but I'm lazy. +/obj/item/grenade/confetti/party_ball/detonate() //Could condense this by making the sound a variable in the parent but I'm lazy. playsound(src.loc, 'sound/effects/confetti_ball.ogg', 50, 1, -3) src.confetti_spread.set_up(10, 0, usr.loc) spawn(0) diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm index 89aff71bb37..2700fa04c45 100644 --- a/code/game/objects/items/weapons/grenades/emgrenade.dm +++ b/code/game/objects/items/weapons/grenades/emgrenade.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/grenade/empgrenade +/obj/item/grenade/empgrenade name = "emp grenade" icon_state = "emp" item_state = "empgrenade" @@ -8,13 +8,13 @@ var/emp_light = 7 var/emp_long = 10 -/obj/item/weapon/grenade/empgrenade/detonate() +/obj/item/grenade/empgrenade/detonate() ..() if(empulse(src, emp_heavy, emp_med, emp_light, emp_long)) qdel(src) return -/obj/item/weapon/grenade/empgrenade/low_yield +/obj/item/grenade/empgrenade/low_yield name = "low yield emp grenade" desc = "A weaker variant of the EMP grenade" icon_state = "lyemp" diff --git a/code/game/objects/items/weapons/grenades/explosive.dm b/code/game/objects/items/weapons/grenades/explosive.dm index 77e07e2c5f0..793b31baaab 100644 --- a/code/game/objects/items/weapons/grenades/explosive.dm +++ b/code/game/objects/items/weapons/grenades/explosive.dm @@ -1,5 +1,5 @@ -/obj/item/weapon/grenade/explosive +/obj/item/grenade/explosive name = "fragmentation grenade" desc = "A fragmentation grenade, optimized for harming personnel without causing massive structural damage." icon_state = "frggrenade" @@ -14,7 +14,7 @@ loadable = null hud_state = "grenade_frag" // TGMC Ammo HUD Port -/obj/item/weapon/grenade/explosive/detonate() +/obj/item/grenade/explosive/detonate() ..() var/turf/O = get_turf(src) @@ -25,12 +25,12 @@ src.fragmentate(O, num_fragments, spread_range, fragment_types) qdel(src) -/obj/item/weapon/grenade/explosive/proc/on_explosion(var/turf/O) +/obj/item/grenade/explosive/proc/on_explosion(var/turf/O) if(explosion_size) explosion(O, -1, -1, explosion_size, round(explosion_size/2), 0) // Waaaaay more pellets -/obj/item/weapon/grenade/explosive/frag +/obj/item/grenade/explosive/frag name = "fragmentation grenade" desc = "A military fragmentation grenade, designed to explode in a deadly shower of fragments." icon_state = "frag" @@ -67,7 +67,7 @@ else P.attack_mob(M, 0, 100) //otherwise, allow a decent amount of fragments to pass -/obj/item/weapon/grenade/explosive/mini +/obj/item/grenade/explosive/mini name = "mini fragmentation grenade" desc = "A miniaturized fragmentation grenade, this one poses relatively little threat on its own." icon_state = "minifrag" diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index aa319216d7b..083c45be343 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/grenade/flashbang +/obj/item/grenade/flashbang name = "flashbang" icon_state = "flashbang" item_state = "flashbang" @@ -6,7 +6,7 @@ var/max_range = 10 //The maximum range possible, including species effect mods. Cuts off at 7 for normal humans. Should be 3 higher than your intended target range for affecting normal humans. var/banglet = 0 -/obj/item/weapon/grenade/flashbang/detonate() +/obj/item/grenade/flashbang/detonate() ..() for(var/obj/structure/closet/L in hear(max_range, get_turf(src))) if(locate(/mob/living/carbon/, L)) @@ -27,7 +27,7 @@ qdel(src) -/obj/item/weapon/grenade/flashbang/proc/bang(var/turf/T , var/mob/living/carbon/M) // Added a new proc called 'bang' that takes a location and a person to be banged. +/obj/item/grenade/flashbang/proc/bang(var/turf/T , var/mob/living/carbon/M) // Added a new proc called 'bang' that takes a location and a person to be banged. to_chat(M, "BANG") // Called during the loop that bangs people in lockers/containers and when banging playsound(src, 'sound/effects/bang.ogg', 50, 1, 30) // people in normal view. Could theroetically be called during other explosions. // -- Polymorph @@ -81,24 +81,24 @@ var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES] if (E && E.damage >= E.min_bruised_damage) to_chat(M, "Your eyes start to burn badly!") - if(!banglet && !(istype(src , /obj/item/weapon/grenade/flashbang/clusterbang))) + if(!banglet && !(istype(src , /obj/item/grenade/flashbang/clusterbang))) if (E.damage >= E.min_broken_damage) to_chat(M, "You can't see anything!") if (M.ear_damage >= 15) to_chat(M, "Your ears start to ring badly!") - if(!banglet && !(istype(src , /obj/item/weapon/grenade/flashbang/clusterbang))) + if(!banglet && !(istype(src , /obj/item/grenade/flashbang/clusterbang))) if (prob(M.ear_damage - 10 + 5)) to_chat(M, "You can't hear anything!") M.sdisabilities |= DEAF else if(M.ear_damage >= 5) to_chat(M, "Your ears start to ring!") -/obj/item/weapon/grenade/flashbang/Destroy() +/obj/item/grenade/flashbang/Destroy() walk(src, 0) // Because we might have called walk_away, we must stop the walk loop or BYOND keeps an internal reference to us forever. return ..() -/obj/item/weapon/grenade/flashbang/clusterbang//Created by Polymorph, fixed by Sieve +/obj/item/grenade/flashbang/clusterbang//Created by Polymorph, fixed by Sieve desc = "Use of this weapon may constiute a war crime in your area, consult your local " + JOB_SITE_MANAGER + "." name = "clusterbang" icon = 'icons/obj/grenade.dmi' @@ -107,7 +107,7 @@ var/min_banglets = 4 var/max_banglets = 8 -/obj/item/weapon/grenade/flashbang/clusterbang/detonate() +/obj/item/grenade/flashbang/clusterbang/detonate() var/numspawned = rand(min_banglets, max_banglets) var/again = 0 @@ -118,16 +118,16 @@ numspawned-- for(var/do_spawn = numspawned, do_spawn > 0, do_spawn--) - new /obj/item/weapon/grenade/flashbang/cluster(src.loc)//Launches flashbangs + new /obj/item/grenade/flashbang/cluster(src.loc)//Launches flashbangs playsound(src, 'sound/weapons/armbomb.ogg', 75, 1, -3) for(var/do_again = again, do_again > 0, do_again--) - new /obj/item/weapon/grenade/flashbang/clusterbang/segment(src.loc)//Creates a 'segment' that launches a few more flashbangs + new /obj/item/grenade/flashbang/clusterbang/segment(src.loc)//Creates a 'segment' that launches a few more flashbangs playsound(src, 'sound/weapons/armbomb.ogg', 75, 1, -3) qdel(src) return -/obj/item/weapon/grenade/flashbang/clusterbang/segment +/obj/item/grenade/flashbang/clusterbang/segment desc = "A smaller segment of a clusterbang. Better run." name = "clusterbang segment" icon = 'icons/obj/grenade.dmi' @@ -135,7 +135,7 @@ can_repeat = FALSE banglet = TRUE -/obj/item/weapon/grenade/flashbang/clusterbang/segment/New()//Segments should never exist except part of the clusterbang, since these immediately 'do their thing' and asplode +/obj/item/grenade/flashbang/clusterbang/segment/New()//Segments should never exist except part of the clusterbang, since these immediately 'do their thing' and asplode ..() icon_state = "clusterbang_segment_active" @@ -148,10 +148,10 @@ spawn(dettime) detonate() -/obj/item/weapon/grenade/flashbang/cluster +/obj/item/grenade/flashbang/cluster banglet = TRUE -/obj/item/weapon/grenade/flashbang/cluster/New()//Same concept as the segments, so that all of the parts don't become reliant on the clusterbang +/obj/item/grenade/flashbang/cluster/New()//Same concept as the segments, so that all of the parts don't become reliant on the clusterbang ..() icon_state = "flashbang_active" diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 6bf22d153d0..0421f4f14ee 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/grenade +/obj/item/grenade name = "grenade" desc = "A hand held grenade, with an adjustable timer." w_class = ITEMSIZE_SMALL @@ -16,7 +16,7 @@ var/hud_state = "grenade_he" // TGMC Ammo HUD Port var/hud_state_empty = "grenade_empty" // TGMC Ammo HUD Port -/obj/item/weapon/grenade/proc/clown_check(var/mob/living/user) +/obj/item/grenade/proc/clown_check(var/mob/living/user) if((CLUMSY in user.mutations) && prob(50)) to_chat(user, "Huh? How does this thing work?") @@ -28,9 +28,9 @@ return 1 -/*/obj/item/weapon/grenade/afterattack(atom/target as mob|obj|turf|area, mob/user as mob) - if (istype(target, /obj/item/weapon/storage)) return ..() // Trying to put it in a full container - if (istype(target, /obj/item/weapon/gun/grenadelauncher)) return ..() +/*/obj/item/grenade/afterattack(atom/target as mob|obj|turf|area, mob/user as mob) + if (istype(target, /obj/item/storage)) return ..() // Trying to put it in a full container + if (istype(target, /obj/item/gun/grenadelauncher)) return ..() if((user.get_active_hand() == src) && (!active) && (clown_check(user)) && target.loc != src.loc) to_chat(user, "You prime the [name]! [det_time/10] seconds!") active = 1 @@ -46,7 +46,7 @@ return*/ -/obj/item/weapon/grenade/examine(mob/user) +/obj/item/grenade/examine(mob/user) . = ..() if(get_dist(user, src) == 0) if(det_time > 1) @@ -55,7 +55,7 @@ . += "\The [src] is set for instant detonation." -/obj/item/weapon/grenade/attack_self(mob/user as mob) +/obj/item/grenade/attack_self(mob/user as mob) if(!active) if(clown_check(user)) to_chat(user, "You prime \the [name]! [det_time/10] seconds!") @@ -68,7 +68,7 @@ return -/obj/item/weapon/grenade/proc/activate(mob/user as mob) +/obj/item/grenade/proc/activate(mob/user as mob) if(active) return @@ -84,14 +84,14 @@ return -/obj/item/weapon/grenade/proc/detonate() +/obj/item/grenade/proc/detonate() // playsound(src, 'sound/items/Welder2.ogg', 25, 1) var/turf/T = get_turf(src) if(T) T.hotspot_expose(700,125) -/obj/item/weapon/grenade/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/grenade/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_SCREWDRIVER)) switch(det_time) if (1) @@ -110,10 +110,10 @@ ..() return -/obj/item/weapon/grenade/attack_hand() +/obj/item/grenade/attack_hand() walk(src, null, null) ..() return -/obj/item/weapon/grenade/vendor_action(var/obj/machinery/vending/V) +/obj/item/grenade/vendor_action(var/obj/machinery/vending/V) activate(V) \ No newline at end of file diff --git a/code/game/objects/items/weapons/grenades/projectile.dm b/code/game/objects/items/weapons/grenades/projectile.dm index 8ea02c9adde..ac5e2e3a468 100644 --- a/code/game/objects/items/weapons/grenades/projectile.dm +++ b/code/game/objects/items/weapons/grenades/projectile.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/grenade/shooter +/obj/item/grenade/shooter name = "projectile grenade" // I have no idea what else to call this, but the base type should never be used icon_state = "frggrenade" item_state = "grenade" @@ -10,7 +10,7 @@ loadable = FALSE -/obj/item/weapon/grenade/shooter/detonate() +/obj/item/grenade/shooter/detonate() ..() var/turf/O = get_turf(src) @@ -23,28 +23,28 @@ -/obj/item/weapon/grenade/shooter/rubber +/obj/item/grenade/shooter/rubber name = "rubber pellet grenade" desc = "An anti-riot grenade that fires a cloud of rubber projectiles upon detonation." projectile_types = list(/obj/item/projectile/bullet/pistol/rubber) // Exists mostly so I don't have to copy+paste the sprite vars to a billion things -/obj/item/weapon/grenade/shooter/energy +/obj/item/grenade/shooter/energy icon_state = "flashbang" item_state = "flashbang" spread_range = 3 // Because dear god -/obj/item/weapon/grenade/shooter/energy/laser +/obj/item/grenade/shooter/energy/laser name = "laser grenade" desc = "A horrifically dangerous rave in a can." projectile_types = list(/obj/item/projectile/beam/midlaser) -/obj/item/weapon/grenade/shooter/energy/flash +/obj/item/grenade/shooter/energy/flash name = "flash grenade" desc = "A grenade that creates a large number of flashes upon detonation." projectile_types = list(/obj/item/projectile/energy/flash) -/obj/item/weapon/grenade/shooter/energy/tesla +/obj/item/grenade/shooter/energy/tesla name = "tesla grenade" projectile_types = list(/obj/item/projectile/beam/chain_lightning/lesser) diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm index e06aaf53320..62ebd2ddcb3 100644 --- a/code/game/objects/items/weapons/grenades/smokebomb.dm +++ b/code/game/objects/items/weapons/grenades/smokebomb.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/grenade/smokebomb +/obj/item/grenade/smokebomb desc = "It is set to detonate in 2 seconds. These high-tech grenades can have their color adapted on the fly with a multitool!" name = "smoke bomb" icon = 'icons/obj/grenade.dmi' @@ -11,17 +11,17 @@ var/smoke_color var/smoke_strength = 8 -/obj/item/weapon/grenade/smokebomb/New() +/obj/item/grenade/smokebomb/New() ..() src.smoke = new /datum/effect/effect/system/smoke_spread/bad() src.smoke.attach(src) -/obj/item/weapon/grenade/smokebomb/Destroy() +/obj/item/grenade/smokebomb/Destroy() qdel(smoke) smoke = null return ..() -/obj/item/weapon/grenade/smokebomb/detonate() +/obj/item/grenade/smokebomb/detonate() playsound(src, 'sound/effects/smoke.ogg', 50, 1, -3) src.smoke.set_up(10, 0, usr.loc) spawn(0) @@ -32,8 +32,8 @@ return -/obj/item/weapon/grenade/smokebomb/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I,/obj/item/device/multitool)) +/obj/item/grenade/smokebomb/attackby(obj/item/I as obj, mob/user as mob) + if(istype(I,/obj/item/multitool)) var/new_smoke_color = input(user, "Choose a color for the smoke:", "Smoke Color", smoke_color) as color|null if(new_smoke_color) smoke_color = new_smoke_color diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm index 1356b3a9479..a0967c8b970 100644 --- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm +++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/grenade/spawnergrenade +/obj/item/grenade/spawnergrenade desc = "It is set to detonate in 5 seconds. It will unleash an unspecified anomaly into the vicinity." name = "delivery grenade" icon = 'icons/obj/grenade.dmi' @@ -10,7 +10,7 @@ var/deliveryamt = 1 // amount of type to deliver // Detonate now just handles the two loops that query for people in lockers and people who can see it. -/obj/item/weapon/grenade/spawnergrenade/detonate() +/obj/item/grenade/spawnergrenade/detonate() if(spawner_type && deliveryamt) // Make a quick flash @@ -29,45 +29,45 @@ qdel(src) return -/obj/item/weapon/grenade/spawnergrenade/manhacks +/obj/item/grenade/spawnergrenade/manhacks name = "manhack delivery grenade" spawner_type = /mob/living/simple_mob/mechanical/viscerator deliveryamt = 5 origin_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 4, TECH_ILLEGAL = 4) -/obj/item/weapon/grenade/spawnergrenade/manhacks/mercenary +/obj/item/grenade/spawnergrenade/manhacks/mercenary spawner_type = /mob/living/simple_mob/mechanical/viscerator/mercenary -/obj/item/weapon/grenade/spawnergrenade/manhacks/raider +/obj/item/grenade/spawnergrenade/manhacks/raider spawner_type = /mob/living/simple_mob/mechanical/viscerator/raider -/obj/item/weapon/grenade/spawnergrenade/manhacks/station +/obj/item/grenade/spawnergrenade/manhacks/station desc = "It is set to detonate in 5 seconds. It will deploy three weaponized survey drones." deliveryamt = 3 spawner_type = /mob/living/simple_mob/mechanical/viscerator/station origin_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 3, TECH_ILLEGAL = 1) -/obj/item/weapon/grenade/spawnergrenade/ward +/obj/item/grenade/spawnergrenade/ward name = "sentry delivery grenade" desc = "It is set to detonate in 5 seconds. It will deploy a single thermal-optic sentry drone." spawner_type = /mob/living/simple_mob/mechanical/ward/monitor/crew deliveryamt = 1 origin_tech = list(TECH_MATERIAL = 4, TECH_MAGNET = 3, TECH_BLUESPACE = 2) -/obj/item/weapon/grenade/spawnergrenade/spesscarp +/obj/item/grenade/spawnergrenade/spesscarp name = "carp delivery grenade" spawner_type = /mob/living/simple_mob/animal/space/carp deliveryamt = 5 origin_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 4, TECH_ILLEGAL = 4) -/obj/item/weapon/grenade/spawnergrenade/spider +/obj/item/grenade/spawnergrenade/spider name = "spider delivery grenade" spawner_type = /mob/living/simple_mob/animal/giant_spider/hunter deliveryamt = 3 origin_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 4, TECH_ILLEGAL = 4) //Sometimes you just need a sudden influx of spiders. -/obj/item/weapon/grenade/spawnergrenade/spider/briefcase +/obj/item/grenade/spawnergrenade/spider/briefcase name = "briefcase" desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional." icon_state = "briefcase" diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade_vr.dm b/code/game/objects/items/weapons/grenades/spawnergrenade_vr.dm index 1a807623960..e49a7154b0b 100644 --- a/code/game/objects/items/weapons/grenades/spawnergrenade_vr.dm +++ b/code/game/objects/items/weapons/grenades/spawnergrenade_vr.dm @@ -1,9 +1,9 @@ -/obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked +/obj/item/grenade/spawnergrenade/manhacks/station/locked desc = "It is set to detonate in 5 seconds. It will deploy three weaponized survey drones. This one has a safety interlock that prevents release if used while in proximity to the facility." req_access = list(access_armory) //for toggling safety var/locked = 1 -/obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked/detonate() +/obj/item/grenade/spawnergrenade/manhacks/station/locked/detonate() if(locked) var/turf/T = get_turf(src) if(T.z in using_map.station_levels) @@ -12,8 +12,8 @@ return 0 return ..() -/obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked/attackby(obj/item/I, mob/user) - var/obj/item/weapon/card/id/id = I.GetID() +/obj/item/grenade/spawnergrenade/manhacks/station/locked/attackby(obj/item/I, mob/user) + var/obj/item/card/id/id = I.GetID() if(istype(id)) if(check_access(id)) locked = !locked @@ -24,7 +24,7 @@ else return ..() -/obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked/emag_act(var/remaining_charges,var/mob/user) +/obj/item/grenade/spawnergrenade/manhacks/station/locked/emag_act(var/remaining_charges,var/mob/user) ..() locked = !locked to_chat(user, "You [locked ? "enable" : "disable"] the safety lock on \the [src]!") \ No newline at end of file diff --git a/code/game/objects/items/weapons/grenades/supermatter.dm b/code/game/objects/items/weapons/grenades/supermatter.dm index 988c00d0b26..bbbd38be827 100644 --- a/code/game/objects/items/weapons/grenades/supermatter.dm +++ b/code/game/objects/items/weapons/grenades/supermatter.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/grenade/supermatter +/obj/item/grenade/supermatter name = "supermatter grenade" icon_state = "banana" item_state = "emergency_engi" @@ -6,24 +6,24 @@ arm_sound = 'sound/effects/3.wav' var/implode_at -/obj/item/weapon/grenade/supermatter/Destroy() +/obj/item/grenade/supermatter/Destroy() if(implode_at) STOP_PROCESSING(SSobj, src) . = ..() -/obj/item/weapon/grenade/supermatter/detonate() +/obj/item/grenade/supermatter/detonate() ..() START_PROCESSING(SSobj, src) implode_at = world.time + 10 SECONDS update_icon() playsound(src, 'sound/weapons/wave.ogg', 100) -/obj/item/weapon/grenade/supermatter/update_icon() +/obj/item/grenade/supermatter/update_icon() cut_overlays() if(implode_at) add_overlay(image(icon = 'icons/rust.dmi', icon_state = "emfield_s1")) -/obj/item/weapon/grenade/supermatter/process() +/obj/item/grenade/supermatter/process() if(!isturf(loc)) if(ismob(loc)) var/mob/M = loc diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index ea8a677f15f..e5b3fbe11b0 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/handcuffs +/obj/item/handcuffs name = "handcuffs" desc = "Use this to keep prisoners in line." gender = PLURAL @@ -21,13 +21,13 @@ var/use_time = 30 sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/handcuffs.dmi') -/obj/item/weapon/handcuffs/get_worn_icon_state(var/slot_name) +/obj/item/handcuffs/get_worn_icon_state(var/slot_name) if(slot_name == slot_handcuffed_str) return "handcuff1" //Simple return ..() -/obj/item/weapon/handcuffs/attack(var/mob/living/carbon/C, var/mob/living/user) +/obj/item/handcuffs/attack(var/mob/living/carbon/C, var/mob/living/user) if(!user.IsAdvancedToolUser()) return @@ -48,19 +48,19 @@ else to_chat(user, "You need to have a firm grip on [C] before you can put \the [src] on!") -/obj/item/weapon/handcuffs/proc/can_place(var/mob/target, var/mob/user) +/obj/item/handcuffs/proc/can_place(var/mob/target, var/mob/user) if(user == target) return 1 if(istype(user, /mob/living/silicon/robot)) if(user.Adjacent(target)) return 1 else - for(var/obj/item/weapon/grab/G in target.grabbed_by) + for(var/obj/item/grab/G in target.grabbed_by) if(G.loc == user && G.state >= GRAB_AGGRESSIVE) return 1 return 0 -/obj/item/weapon/handcuffs/proc/place_handcuffs(var/mob/living/carbon/target, var/mob/user) +/obj/item/handcuffs/proc/place_handcuffs(var/mob/living/carbon/target, var/mob/user) playsound(src, cuff_sound, 30, 1, -2) var/mob/living/carbon/human/H = target @@ -92,7 +92,7 @@ user.visible_message("\The [user] has put [cuff_type] on \the [H]!") // Apply cuffs. - var/obj/item/weapon/handcuffs/cuffs = src + var/obj/item/handcuffs/cuffs = src if(dispenser) cuffs = new(get_turf(user)) else @@ -105,7 +105,7 @@ target.stop_pulling() return 1 -/obj/item/weapon/handcuffs/equipped(var/mob/living/user,var/slot) +/obj/item/handcuffs/equipped(var/mob/living/user,var/slot) . = ..() if(slot == slot_handcuffed) user.drop_r_hand() @@ -138,13 +138,13 @@ var/last_chew = 0 last_chew = world.time -/obj/item/weapon/handcuffs/fuzzy +/obj/item/handcuffs/fuzzy name = "fuzzy cuffs" icon_state = "fuzzycuff" breakouttime = 100 //VOREstation edit desc = "Use this to keep... 'prisoners' in line." -/obj/item/weapon/handcuffs/cable +/obj/item/handcuffs/cable name = "cable restraints" desc = "Looks like some cables tied together. Could be used to tie something up." icon_state = "cuff_white" @@ -153,34 +153,34 @@ var/last_chew = 0 cuff_type = "cable restraints" elastic = 1 -/obj/item/weapon/handcuffs/cable/red +/obj/item/handcuffs/cable/red color = "#DD0000" -/obj/item/weapon/handcuffs/cable/yellow +/obj/item/handcuffs/cable/yellow color = "#DDDD00" -/obj/item/weapon/handcuffs/cable/blue +/obj/item/handcuffs/cable/blue color = "#0000DD" -/obj/item/weapon/handcuffs/cable/green +/obj/item/handcuffs/cable/green color = "#00DD00" -/obj/item/weapon/handcuffs/cable/pink +/obj/item/handcuffs/cable/pink color = "#DD00DD" -/obj/item/weapon/handcuffs/cable/orange +/obj/item/handcuffs/cable/orange color = "#DD8800" -/obj/item/weapon/handcuffs/cable/cyan +/obj/item/handcuffs/cable/cyan color = "#00DDDD" -/obj/item/weapon/handcuffs/cable/white +/obj/item/handcuffs/cable/white color = "#FFFFFF" -/obj/item/weapon/handcuffs/cyborg +/obj/item/handcuffs/cyborg dispenser = 1 -/obj/item/weapon/handcuffs/cable/tape +/obj/item/handcuffs/cable/tape name = "tape restraints" desc = "DIY!" icon_state = "tape_cross" @@ -189,11 +189,11 @@ var/last_chew = 0 breakouttime = 200 cuff_type = "duct tape" -/obj/item/weapon/handcuffs/cable/tape/cyborg +/obj/item/handcuffs/cable/tape/cyborg dispenser = TRUE //Legcuffs. Not /really/ handcuffs, but its close enough. -/obj/item/weapon/handcuffs/legcuffs +/obj/item/handcuffs/legcuffs name = "legcuffs" desc = "Use this to keep prisoners in line." gender = PLURAL @@ -208,13 +208,13 @@ var/last_chew = 0 elastic = 0 cuff_sound = 'sound/weapons/handcuffs.ogg' //This shold work for now. -/obj/item/weapon/handcuffs/legcuffs/get_worn_icon_state(var/slot_name) +/obj/item/handcuffs/legcuffs/get_worn_icon_state(var/slot_name) if(slot_name == slot_legcuffed_str) return "legcuff1" return ..() -/obj/item/weapon/handcuffs/legcuffs/attack(var/mob/living/carbon/C, var/mob/living/user) +/obj/item/handcuffs/legcuffs/attack(var/mob/living/carbon/C, var/mob/living/user) if(!user.IsAdvancedToolUser()) return @@ -234,7 +234,7 @@ var/last_chew = 0 else to_chat(user, "You need to have a firm grip on [C] before you can put \the [src] on!") -/obj/item/weapon/handcuffs/legcuffs/proc/place_legcuffs(var/mob/living/carbon/target, var/mob/user) +/obj/item/handcuffs/legcuffs/proc/place_legcuffs(var/mob/living/carbon/target, var/mob/user) playsound(src, cuff_sound, 30, 1, -2) var/mob/living/carbon/human/H = target @@ -266,7 +266,7 @@ var/last_chew = 0 user.visible_message("\The [user] has put [cuff_type] on \the [H]!") // Apply cuffs. - var/obj/item/weapon/handcuffs/legcuffs/lcuffs = src + var/obj/item/handcuffs/legcuffs/lcuffs = src if(dispenser) lcuffs = new(get_turf(user)) else @@ -280,7 +280,7 @@ var/last_chew = 0 target.hud_used.move_intent.icon_state = "walking" return 1 -/obj/item/weapon/handcuffs/legcuffs/equipped(var/mob/living/user,var/slot) +/obj/item/handcuffs/legcuffs/equipped(var/mob/living/user,var/slot) . = ..() if(slot == slot_legcuffed) if(user.m_intent != "walk") @@ -289,7 +289,7 @@ var/last_chew = 0 user.hud_used.move_intent.icon_state = "walking" -/obj/item/weapon/handcuffs/legcuffs/bola +/obj/item/handcuffs/legcuffs/bola name = "bola" desc = "Keeps prey in line." elastic = 1 @@ -297,15 +297,15 @@ var/last_chew = 0 breakouttime = 30 cuff_sound = 'sound/weapons/towelwipe.ogg' //Is there anything this sound can't do? -/obj/item/weapon/handcuffs/legcuffs/bola/can_place(var/mob/target, var/mob/user) +/obj/item/handcuffs/legcuffs/bola/can_place(var/mob/target, var/mob/user) if(user) //A ranged legcuff, until proper implementation as items it remains a projectile-only thing. return 1 -/obj/item/weapon/handcuffs/legcuffs/bola/dropped() +/obj/item/handcuffs/legcuffs/bola/dropped() visible_message("\The [src] falls apart!") qdel(src) -/obj/item/weapon/handcuffs/legcuffs/bola/place_legcuffs(var/mob/living/carbon/target, var/mob/user) +/obj/item/handcuffs/legcuffs/bola/place_legcuffs(var/mob/living/carbon/target, var/mob/user) playsound(src, cuff_sound, 30, 1, -2) var/mob/living/carbon/human/H = target @@ -321,7 +321,7 @@ var/last_chew = 0 H.visible_message("\The [H] has been snared by \the [src]!") // Apply cuffs. - var/obj/item/weapon/handcuffs/legcuffs/lcuffs = src + var/obj/item/handcuffs/legcuffs/lcuffs = src lcuffs.loc = target target.legcuffed = lcuffs target.update_inv_legcuffed() @@ -331,7 +331,7 @@ var/last_chew = 0 target.hud_used.move_intent.icon_state = "walking" return 1 -/obj/item/weapon/handcuffs/cable/plantfiber +/obj/item/handcuffs/cable/plantfiber name = "rope bindings" desc = "A length of rope fashioned to hold someone's hands together." color = "#7e6442" diff --git a/code/game/objects/items/weapons/handcuffs_vr.dm b/code/game/objects/items/weapons/handcuffs_vr.dm index ecafc8b6c38..3482029807c 100644 --- a/code/game/objects/items/weapons/handcuffs_vr.dm +++ b/code/game/objects/items/weapons/handcuffs_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/handcuffs/legcuffs/fuzzy +/obj/item/handcuffs/legcuffs/fuzzy name = "fuzzy legcuffs" desc = "Use this to keep... 'prisoners' in line." icon = 'icons/obj/items_vr.dmi' diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm index 04087646f74..7378f6e44b9 100644 --- a/code/game/objects/items/weapons/hydroponics.dm +++ b/code/game/objects/items/weapons/hydroponics.dm @@ -3,7 +3,7 @@ */ //uncomment when this is updated to match storage update /* -/obj/item/weapon/seedbag +/obj/item/seedbag icon = 'icons/obj/hydroponics_machines.dmi' icon_state = "seedbag" name = "Seed Bag" @@ -14,11 +14,11 @@ w_class = ITEMSIZE_TINY var/list/item_quants = list() -/obj/item/weapon/seedbag/attack_self(mob/user as mob) +/obj/item/seedbag/attack_self(mob/user as mob) user.machine = src interact(user) -/obj/item/weapon/seedbag/verb/toggle_mode() +/obj/item/seedbag/verb/toggle_mode() set name = "Switch Bagging Method" set category = "Object" @@ -31,8 +31,8 @@ /obj/item/seeds/attackby(var/obj/item/O as obj, var/mob/user as mob) ..() - if (istype(O, /obj/item/weapon/seedbag)) - var/obj/item/weapon/seedbag/S = O + if (istype(O, /obj/item/seedbag)) + var/obj/item/seedbag/S = O if (S.mode == 1) for (var/obj/item/seeds/G in locate(src.x,src.y,src.z)) if (S.contents.len < S.capacity) @@ -58,7 +58,7 @@ S.updateUsrDialog() return -/obj/item/weapon/seedbag/interact(mob/user as mob) +/obj/item/seedbag/interact(mob/user as mob) var/dat = "Select an item:
" @@ -79,7 +79,7 @@ onclose(user, "seedbag") return -/obj/item/weapon/seedbag/Topic(href, href_list) +/obj/item/seedbag/Topic(href, href_list) if(..()) return @@ -105,7 +105,7 @@ src.updateUsrDialog() return -/obj/item/weapon/seedbag/updateUsrDialog() +/obj/item/seedbag/updateUsrDialog() var/list/nearby = range(1, src) for(var/mob/M in nearby) if ((M.client && M.machine == src)) diff --git a/code/game/objects/items/weapons/id cards/cards.dm b/code/game/objects/items/weapons/id cards/cards.dm index 91c5ba3a4b4..78a9b5681fe 100644 --- a/code/game/objects/items/weapons/id cards/cards.dm +++ b/code/game/objects/items/weapons/id cards/cards.dm @@ -11,7 +11,7 @@ /* * DATA CARDS - Used for the teleporter */ -/obj/item/weapon/card +/obj/item/card name = "card" desc = "A tiny plaque of plastic. Does card things." icon = 'icons/obj/card_new.dmi' @@ -27,15 +27,15 @@ drop_sound = 'sound/items/drop/card.ogg' pickup_sound = 'sound/items/pickup/card.ogg' -/obj/item/weapon/card/New() +/obj/item/card/New() . = ..() reset_icon() -/obj/item/weapon/card/proc/reset_icon() +/obj/item/card/proc/reset_icon() sprite_stack = initial_sprite_stack update_icon() -/obj/item/weapon/card/update_icon() +/obj/item/card/update_icon() if(!sprite_stack || !istype(sprite_stack) || sprite_stack == list("")) icon = base_icon icon_state = initial(icon_state) @@ -52,7 +52,7 @@ if(I) icon = I -/obj/item/weapon/card/data +/obj/item/card/data name = "data card" desc = "A solid-state storage card, used to back up or transfer information. What knowledge could it contain?" icon_state = "data" @@ -63,7 +63,7 @@ drop_sound = 'sound/items/drop/disk.ogg' pickup_sound = 'sound/items/pickup/disk.ogg' -/obj/item/weapon/card/data/verb/label(t as text) +/obj/item/card/data/verb/label(t as text) set name = "Label Card" set category = "Object" set src in usr @@ -75,7 +75,7 @@ src.add_fingerprint(usr) return -/obj/item/weapon/card/data/clown +/obj/item/card/data/clown name = "\proper the coordinates to clown planet" icon_state = "rainbow" item_state = "card-id" @@ -88,14 +88,14 @@ * ID CARDS */ -/obj/item/weapon/card/emag_broken +/obj/item/card/emag_broken desc = "It's a card with a magnetic strip attached to some circuitry. It looks too busted to be used for anything but salvage." name = "broken cryptographic sequencer" icon_state = "emag-spent" item_state = "card-id" origin_tech = list(TECH_MAGNET = 2, TECH_ILLEGAL = 2) -/obj/item/weapon/card/emag +/obj/item/card/emag desc = "It's a card with a magnetic strip attached to some circuitry." name = "cryptographic sequencer" icon_state = "emag" @@ -103,7 +103,7 @@ origin_tech = list(TECH_MAGNET = 2, TECH_ILLEGAL = 2) var/uses = 10 -/obj/item/weapon/card/emag/resolve_attackby(atom/A, mob/user, var/click_parameters) +/obj/item/card/emag/resolve_attackby(atom/A, mob/user, attack_modifier, var/click_parameters) var/used_uses = A.emag_act(uses, user, src) if(used_uses < 0) return ..(A, user, click_parameters) @@ -120,13 +120,13 @@ if(uses<1) user.visible_message("\The [src] fizzles and sparks - it seems it's been used once too often, and is now spent.") user.drop_item() - var/obj/item/weapon/card/emag_broken/junk = new(user.loc) + var/obj/item/card/emag_broken/junk = new(user.loc) junk.add_fingerprint(user) qdel(src) return 1 -/obj/item/weapon/card/emag/attackby(obj/item/O as obj, mob/user as mob) +/obj/item/card/emag/attackby(obj/item/O as obj, mob/user as mob) if(istype(O, /obj/item/stack/telecrystal)) var/obj/item/stack/telecrystal/T = O if(T.get_amount() < 1) @@ -138,11 +138,11 @@ qdel(O) -/obj/item/weapon/card/emag/borg +/obj/item/card/emag/borg uses = 12 var/burnt_out = FALSE -/obj/item/weapon/card/emag/borg/afterattack(atom/A, mob/user, proximity, var/click_parameters) +/obj/item/card/emag/borg/afterattack(atom/A, mob/user, proximity, var/click_parameters) if(!proximity || burnt_out) return var/used_uses = A.emag_act(uses, user, src) if(used_uses < 0) @@ -165,7 +165,7 @@ /// FLUFF PERMIT -/obj/item/weapon/card_fluff +/obj/item/card_fluff name = "fluff card" desc = "A tiny plaque of plastic. Purely decorative?" description_fluff = "This permit was not issued by any branch of NanoTrasen, and as such it is not formally recognized at any NanoTrasen-operated installations. The bearer is not - under any circumstances - entitled to ownership of any items or allowed to perform any acts that would normally be restricted or illegal for their current position, regardless of what they or this permit may claim." @@ -180,11 +180,11 @@ drop_sound = 'sound/items/drop/card.ogg' pickup_sound = 'sound/items/pickup/card.ogg' -/obj/item/weapon/card_fluff/proc/reset_icon() +/obj/item/card_fluff/proc/reset_icon() sprite_stack = list("") update_icon() -/obj/item/weapon/card_fluff/update_icon() +/obj/item/card_fluff/update_icon() if(!sprite_stack || !istype(sprite_stack) || sprite_stack == list("")) icon = base_icon icon_state = initial(icon_state) @@ -201,7 +201,7 @@ if(I) icon = I -/obj/item/weapon/card_fluff/attack_self() +/obj/item/card_fluff/attack_self() var/choice = tgui_input_list(usr, "What element would you like to customize?", "Customize Card", list("Band","Stamp","Reset")) if(!choice) return @@ -269,19 +269,19 @@ return return -/obj/item/weapon/card/id/cargo/miner/borg +/obj/item/card/id/cargo/miner/borg var/mob/living/silicon/robot/R var/last_robot_loc name = "Robot Miner ID" rank = JOB_SHAFT_MINER -/obj/item/weapon/card/id/cargo/miner/borg/Initialize() +/obj/item/card/id/cargo/miner/borg/Initialize() . = ..() R = loc.loc registered_name = R.braintype RegisterSignal(src, COMSIG_OBSERVER_MOVED, PROC_REF(check_loc)) -/obj/item/weapon/card/id/cargo/miner/borg/proc/check_loc(atom/movable/mover, atom/old_loc, atom/new_loc) +/obj/item/card/id/cargo/miner/borg/proc/check_loc(atom/movable/mover, atom/old_loc, atom/new_loc) if(old_loc == R || old_loc == R.module) last_robot_loc = old_loc if(!istype(loc, /obj/machinery) && loc != R && loc != R.module) @@ -293,7 +293,7 @@ if(loc == R) hud_layerise() -/obj/item/weapon/card/id/cargo/miner/borg/Destroy() +/obj/item/card/id/cargo/miner/borg/Destroy() UnregisterSignal(src, COMSIG_OBSERVER_MOVED) R = null last_robot_loc = null diff --git a/code/game/objects/items/weapons/id cards/cards_vr.dm b/code/game/objects/items/weapons/id cards/cards_vr.dm index c7abd117d6e..fb328f07724 100644 --- a/code/game/objects/items/weapons/id cards/cards_vr.dm +++ b/code/game/objects/items/weapons/id cards/cards_vr.dm @@ -1,10 +1,10 @@ -/obj/item/weapon/card/emag/examine(mob/user) +/obj/item/card/emag/examine(mob/user) . = ..() . += "[uses] uses remaining." -/obj/item/weapon/card/emag/used +/obj/item/card/emag/used uses = 1 -/obj/item/weapon/card/emag/used/Initialize() +/obj/item/card/emag/used/Initialize() . = ..() uses = rand(1, 5) diff --git a/code/game/objects/items/weapons/id cards/id_stacks.dm b/code/game/objects/items/weapons/id cards/id_stacks.dm index 179283a9476..3158d93a9bf 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks.dm @@ -2,7 +2,7 @@ // Generally, if the icon file is card_xxx.dmi, this filename should be sprite_stacks_xxx.dm // Please make sure that only the relevant sprite_stacks_xxx.file is included, if more are made. -/obj/item/weapon/card +/obj/item/card icon = 'icons/obj/card_new_vr.dmi' // These are redefined here so that changing sprites is as easy as clicking the checkbox. base_icon = 'icons/obj/card_new_vr.dmi' @@ -10,329 +10,329 @@ //IDs -/obj/item/weapon/card/id +/obj/item/card/id initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n") -/obj/item/weapon/card/id/generic +/obj/item/card/id/generic name = "Generic ID" initial_sprite_stack = list("base-stamp", "top-generic", "stamp-silhouette", "clip") //Central -/obj/item/weapon/card/id/centcom +/obj/item/card/id/centcom name = "Central Command ID" initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n", "pips-white", "stripe-gold") -/obj/item/weapon/card/id/centcom/vip +/obj/item/card/id/centcom/vip name = "VIP ID" initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n", "pips-gold", "stripe-gold") //ERT -/obj/item/weapon/card/id/centcom/ERT +/obj/item/card/id/centcom/ERT name = "Emergency Responder ID" initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-red", "stripe-red") -/obj/item/weapon/card/id/centcom/ERT/medic +/obj/item/card/id/centcom/ERT/medic name = "Emergency Medical Responder ID" initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-medblu", "stripe-medblu") -/obj/item/weapon/card/id/centcom/ERT/commander +/obj/item/card/id/centcom/ERT/commander name = "Emergency Response Commander ID" initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-gold", "stripe-gold") -/obj/item/weapon/card/id/centcom/ERT/engineer +/obj/item/card/id/centcom/ERT/engineer name = "Emergency Engineering Responder ID" initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-orange", "stripe-orange") -/obj/item/weapon/card/id/centcom/ERT/janitor +/obj/item/card/id/centcom/ERT/janitor name = "Emergency Cleanup Responder ID" initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-purple", "stripe-purple") //Silver -/obj/item/weapon/card/id/silver +/obj/item/card/id/silver name = "Silver ID" initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n") -/obj/item/weapon/card/id/silver/secretary +/obj/item/card/id/silver/secretary name = "Secretary's ID" initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n") rank = JOB_COMMAND_SECRETARY -/obj/item/weapon/card/id/silver/hop +/obj/item/card/id/silver/hop name = JOB_HEAD_OF_PERSONNEL + " ID" initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-gold") rank = JOB_HEAD_OF_PERSONNEL //Gold -/obj/item/weapon/card/id/gold +/obj/item/card/id/gold name = "Gold ID" initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n") -/obj/item/weapon/card/id/gold/captain +/obj/item/card/id/gold/captain name = "Captain's ID" initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n", "pips-gold") rank = JOB_SITE_MANAGER -/obj/item/weapon/card/id/gold/captain/spare +/obj/item/card/id/gold/captain/spare name = "Spare ID" initial_sprite_stack = list("base-stamp-gold", "top-gold", "stamp-n") rank = JOB_SITE_MANAGER //Medical -/obj/item/weapon/card/id/medical +/obj/item/card/id/medical name = "Medical ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n") rank = JOB_MEDICAL_DOCTOR -/obj/item/weapon/card/id/medical/chemist +/obj/item/card/id/medical/chemist name = JOB_CHEMIST + "'s ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-orange") rank = JOB_CHEMIST -/obj/item/weapon/card/id/medical/geneticist +/obj/item/card/id/medical/geneticist name = JOB_GENETICIST + "'s ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-purple") rank = JOB_GENETICIST -/obj/item/weapon/card/id/medical/psych +/obj/item/card/id/medical/psych name = JOB_ALT_PSYCHOLOGIST + "'s ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-brown") rank = JOB_PSYCHIATRIST -/obj/item/weapon/card/id/medical/virologist +/obj/item/card/id/medical/virologist name = JOB_ALT_VIROLOGIST + "'s ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-green") rank = JOB_ALT_VIROLOGIST -/obj/item/weapon/card/id/medical/emt +/obj/item/card/id/medical/emt name = JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN + "'s ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-blue") rank = JOB_PARAMEDIC -/obj/item/weapon/card/id/medical/head +/obj/item/card/id/medical/head name = JOB_CHIEF_MEDICAL_OFFICER + "'s ID" initial_sprite_stack = list("base-stamp-silver", "top-medblu", "stamp-n", "pips-gold") rank = JOB_CHIEF_MEDICAL_OFFICER //Security -/obj/item/weapon/card/id/security +/obj/item/card/id/security name = "Security ID" initial_sprite_stack = list("base-stamp", "top-red", "stamp-n") rank = JOB_SECURITY_OFFICER -/obj/item/weapon/card/id/security/detective +/obj/item/card/id/security/detective name = JOB_DETECTIVE + "'s ID" initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "stripe-brown") rank = JOB_DETECTIVE -/obj/item/weapon/card/id/security/warden +/obj/item/card/id/security/warden name = JOB_WARDEN + "'s ID" initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "stripe-white") rank = JOB_WARDEN -/obj/item/weapon/card/id/security/head +/obj/item/card/id/security/head name = JOB_HEAD_OF_SECURITY + "'s ID" initial_sprite_stack = list("base-stamp-silver", "top-red", "stamp-n", "pips-gold") rank = JOB_HEAD_OF_SECURITY //Engineering -/obj/item/weapon/card/id/engineering +/obj/item/card/id/engineering name = "Engineering ID" initial_sprite_stack = list("base-stamp", "top-orange", "stamp-n") rank = JOB_ENGINEER -/obj/item/weapon/card/id/engineering/atmos +/obj/item/card/id/engineering/atmos name = "Atmospherics ID" initial_sprite_stack = list("base-stamp", "top-orange", "stripe-medblu", "stamp-n") rank = JOB_ATMOSPHERIC_TECHNICIAN -/obj/item/weapon/card/id/engineering/head +/obj/item/card/id/engineering/head name = JOB_CHIEF_ENGINEER + "'s ID" initial_sprite_stack = list("base-stamp-silver", "top-orange", "stamp-n", "pips-gold") rank = JOB_CHIEF_ENGINEER //Science -/obj/item/weapon/card/id/science +/obj/item/card/id/science name = "Science ID" initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n") rank = JOB_SCIENTIST -/obj/item/weapon/card/id/science/roboticist +/obj/item/card/id/science/roboticist name = JOB_ROBOTICIST + "'s ID" initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-brown") rank = JOB_ROBOTICIST -/obj/item/weapon/card/id/science/xenobiologist +/obj/item/card/id/science/xenobiologist name = JOB_XENOBIOLOGIST + "'s ID" initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-orange") rank = JOB_XENOBIOLOGIST -/obj/item/weapon/card/id/science/xenobotanist +/obj/item/card/id/science/xenobotanist name = JOB_XENOBOTANIST + "'s ID" initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-green") rank = JOB_XENOBOTANIST -/obj/item/weapon/card/id/science/head +/obj/item/card/id/science/head name = JOB_RESEARCH_DIRECTOR + "'s ID" initial_sprite_stack = list("base-stamp-silver", "top-purple", "stamp-n", "pips-gold") rank = JOB_RESEARCH_DIRECTOR //Cargo -/obj/item/weapon/card/id/cargo +/obj/item/card/id/cargo name = "Cargo ID" initial_sprite_stack = list("base-stamp", "top-brown", "stamp-n") rank = JOB_CARGO_TECHNICIAN -/obj/item/weapon/card/id/cargo/miner +/obj/item/card/id/cargo/miner name = "Miner's ID" initial_sprite_stack = list("base-stamp", "top-brown", "stamp-n", "stripe-purple") rank = JOB_SHAFT_MINER -/obj/item/weapon/card/id/cargo/head +/obj/item/card/id/cargo/head name = JOB_QUARTERMASTER + "'s ID" initial_sprite_stack = list("base-stamp-silver", "top-brown", "stamp-n", "pips-white") rank = JOB_QUARTERMASTER //Civilian -/obj/item/weapon/card/id/civilian +/obj/item/card/id/civilian name = "Civilian ID" initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n") -/obj/item/weapon/card/id/civilian/chaplain +/obj/item/card/id/civilian/chaplain name = JOB_CHAPLAIN + "'s ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-cross", "stripe-white") rank = JOB_CHAPLAIN -/obj/item/weapon/card/id/civilian/journalist +/obj/item/card/id/civilian/journalist name = JOB_ALT_JOURNALIST + "'s ID" initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-red") rank = JOB_ALT_JOURNALIST -/obj/item/weapon/card/id/civilian/pilot +/obj/item/card/id/civilian/pilot name = JOB_PILOT + "'s ID" initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-olive") rank = JOB_PILOT -/obj/item/weapon/card/id/civilian/entertainer +/obj/item/card/id/civilian/entertainer name = JOB_ENTERTAINER + "'s ID" initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-brown") rank = JOB_ENTERTAINER -/obj/item/weapon/card/id/civilian/entrepreneur +/obj/item/card/id/civilian/entrepreneur name = JOB_ENTREPRENEUR + "'s ID" initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-gold") rank = JOB_ENTREPRENEUR -/obj/item/weapon/card/id/civilian/clown +/obj/item/card/id/civilian/clown name = JOB_CLOWN + "'s ID" initial_sprite_stack = list("base-stamp", "top-rainbow", "stamp-n") rank = JOB_CLOWN -/obj/item/weapon/card/id/civilian/mime +/obj/item/card/id/civilian/mime name = JOB_MIME + "'s ID" initial_sprite_stack = list("base-stamp", "top-white", "stamp-n", "stripe-black") rank = JOB_MIME -/obj/item/weapon/card/id/civilian/internal_affairs +/obj/item/card/id/civilian/internal_affairs name = "Internal Affairs ID" initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n", "stripe-black") rank = JOB_INTERNAL_AFFAIRS_AGENT //Service -/obj/item/weapon/card/id/civilian/service +/obj/item/card/id/civilian/service name = "Service ID" initial_sprite_stack = list("base-stamp", "top-green", "stamp-n") -/obj/item/weapon/card/id/civilian/service/botanist +/obj/item/card/id/civilian/service/botanist name = JOB_BOTANIST + "'s ID" initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-darkgreen") rank = JOB_BOTANIST -/obj/item/weapon/card/id/civilian/service/bartender +/obj/item/card/id/civilian/service/bartender name = JOB_BARTENDER + "'s ID" initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-black") rank = JOB_BARTENDER -/obj/item/weapon/card/id/civilian/service/chef +/obj/item/card/id/civilian/service/chef name = JOB_CHEF + "'s ID" initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-white") rank = JOB_CHEF -/obj/item/weapon/card/id/civilian/service/janitor +/obj/item/card/id/civilian/service/janitor name = JOB_JANITOR + "'s ID" initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-purple") rank = JOB_JANITOR //Exploration -/obj/item/weapon/card/id/exploration +/obj/item/card/id/exploration name = "Exploration ID" initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n") rank = JOB_EXPLORER -/obj/item/weapon/card/id/exploration/fm +/obj/item/card/id/exploration/fm name = JOB_FIELD_MEDIC + "'s ID" initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n", "stripe-medblu") rank = JOB_FIELD_MEDIC -/obj/item/weapon/card/id/exploration/head +/obj/item/card/id/exploration/head name = JOB_PATHFINDER + "'s ID" initial_sprite_stack = list("base-stamp-silver", "top-olive", "stamp-n", "pips-white") rank = JOB_PATHFINDER //Talon -/obj/item/weapon/card/id/talon +/obj/item/card/id/talon name = "Talon ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette") -/obj/item/weapon/card/id/talon/doctor +/obj/item/card/id/talon/doctor name = "Talon Medical ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-medblu", "stripe-medblu") rank = JOB_TALON_DOCTOR -/obj/item/weapon/card/id/talon/engineer +/obj/item/card/id/talon/engineer name = "Talon Engineering ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-orange", "stripe-orange") rank = JOB_TALON_ENGINEER -/obj/item/weapon/card/id/talon/officer +/obj/item/card/id/talon/officer name = "Talon Security ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-red", "stripe-red") rank = JOB_TALON_GUARD -/obj/item/weapon/card/id/talon/pilot +/obj/item/card/id/talon/pilot name = JOB_TALON_PILOT + " ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-purple", "stripe-purple") rank = JOB_TALON_PILOT -/obj/item/weapon/card/id/talon/miner +/obj/item/card/id/talon/miner name = "Talon Mining ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-brown", "stripe-brown") rank = JOB_TALON_MINER -/obj/item/weapon/card/id/talon/captain +/obj/item/card/id/talon/captain name = JOB_TALON_CAPTAIN + " ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-gold", "stripe-gold") rank = JOB_TALON_CAPTAIN //Antags -/obj/item/weapon/card/id/syndicate +/obj/item/card/id/syndicate name = "Syndicate ID" initial_sprite_stack = list("base-stamp-dark", "top-syndicate", "stamp-s") rank = JOB_SYNDICATE -/obj/item/weapon/card/id/syndicate/officer +/obj/item/card/id/syndicate/officer name = "Syndicate Officer ID" initial_sprite_stack = list("base-stamp-dark", "top-syndicate", "stamp-s", "pips-gold", "stripe-gold") diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm index 63ed6b6aeb4..87b004dae6e 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/card/id +/obj/item/card/id name = "identification card" desc = "A card used to provide ID and determine access across the station." icon_state = "generic-nt" @@ -31,34 +31,34 @@ var/mining_points = 0 // For redeeming at mining equipment vendors var/survey_points = 0 // For redeeming at explorer equipment vendors. -/obj/item/weapon/card/id/examine(mob/user) +/obj/item/card/id/examine(mob/user) . = ..() if(in_range(user, src)) tgui_interact(user) //Not chat related else . += "It is too far away to read." -/obj/item/weapon/card/id/proc/prevent_tracking() +/obj/item/card/id/proc/prevent_tracking() return 0 -/obj/item/weapon/card/id/tgui_state(mob/user) +/obj/item/card/id/tgui_state(mob/user) return GLOB.tgui_deep_inventory_state -/obj/item/weapon/card/id/tgui_interact(mob/user, datum/tgui/ui) +/obj/item/card/id/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "IDCard", name) ui.open() -/obj/item/weapon/card/id/proc/update_name() +/obj/item/card/id/proc/update_name() name = "[src.registered_name]'s ID Card ([src.assignment])" -/obj/item/weapon/card/id/proc/set_id_photo(var/mob/M) +/obj/item/card/id/proc/set_id_photo(var/mob/M) M.ImmediateOverlayUpdate() var/icon/F = getFlatIcon(M, defdir = SOUTH, no_anim = TRUE) front = "'data:image/png;base64,[icon2base64(F)]'" -/mob/proc/set_id_info(var/obj/item/weapon/card/id/id_card) +/mob/proc/set_id_info(var/obj/item/card/id/id_card) id_card.age = 0 id_card.registered_name = real_name id_card.sex = capitalize(gender) @@ -71,7 +71,7 @@ id_card.fingerprint_hash= md5(dna.uni_identity) id_card.update_name() -/mob/living/carbon/human/set_id_info(var/obj/item/weapon/card/id/id_card) +/mob/living/carbon/human/set_id_info(var/obj/item/card/id/id_card) ..() id_card.age = age if(species.name == SPECIES_HANNER) @@ -80,7 +80,7 @@ id_card.species = "[custom_species ? "[custom_species] ([species.name])" : species.name]" id_card.sex = capitalize(name_gender()) -/obj/item/weapon/card/id/tgui_data(mob/user) +/obj/item/card/id/tgui_data(mob/user) var/list/data = list() data["registered_name"] = registered_name @@ -95,20 +95,20 @@ return data -/obj/item/weapon/card/id/attack_self(mob/user as mob) +/obj/item/card/id/attack_self(mob/user as mob) user.visible_message("\The [user] shows you: [icon2html(src,viewers(src))] [src.name]. The assignment on the card: [src.assignment]",\ "You flash your ID card: [icon2html(src, user.client)] [src.name]. The assignment on the card: [src.assignment]") src.add_fingerprint(user) return -/obj/item/weapon/card/id/GetAccess() +/obj/item/card/id/GetAccess() return access -/obj/item/weapon/card/id/GetID() +/obj/item/card/id/GetID() return src -/obj/item/weapon/card/id/verb/read() +/obj/item/card/id/verb/read() set name = "Read ID Card" set category = "Object" set src in usr @@ -119,66 +119,66 @@ to_chat(usr, "The fingerprint hash on the card is [fingerprint_hash].") return -/obj/item/weapon/card/id/get_worn_icon_state(var/slot_name) +/obj/item/card/id/get_worn_icon_state(var/slot_name) if(slot_name == slot_wear_id_str) return "id" //Legacy, just how it is. There's only one sprite. return ..() -/obj/item/weapon/card/id/Initialize() +/obj/item/card/id/Initialize() . = ..() var/datum/job/J = job_master.GetJob(rank) if(J) access = J.get_access() -/obj/item/weapon/card/id/silver +/obj/item/card/id/silver name = "identification card" desc = "A silver card which shows honour and dedication." icon_state = "silver-id" item_state = "silver_id" -/obj/item/weapon/card/id/gold +/obj/item/card/id/gold name = "identification card" desc = "A golden card which shows power and might." icon_state = "gold-id" item_state = "gold_id" preserve_item = 1 -/obj/item/weapon/card/id/gold/captain +/obj/item/card/id/gold/captain assignment = JOB_SITE_MANAGER rank = JOB_SITE_MANAGER -/obj/item/weapon/card/id/gold/captain/spare +/obj/item/card/id/gold/captain/spare name = "\improper " + JOB_SITE_MANAGER + "'s spare ID" desc = "The emergency spare ID for the station's very own Big Cheese." icon_state = "gold-id-alternate" registered_name = JOB_SITE_MANAGER -/obj/item/weapon/card/id/gold/captain/spare/fakespare +/obj/item/card/id/gold/captain/spare/fakespare rank = "null" -/obj/item/weapon/card/id/synthetic +/obj/item/card/id/synthetic name = "\improper Synthetic ID" desc = "Access module for NanoTrasen Synthetics" icon_state = "id-robot" item_state = "idgreen" assignment = "Synthetic" -/obj/item/weapon/card/id/synthetic/Initialize() +/obj/item/card/id/synthetic/Initialize() . = ..() access = get_all_station_access().Copy() + access_synth -/obj/item/weapon/card/id/lost +/obj/item/card/id/lost name = "\improper Unknown ID" desc = "Access module for Lost drones" icon_state = "id-robot-n" assignment = "Lost" -/obj/item/weapon/card/id/lost/Initialize() +/obj/item/card/id/lost/Initialize() . = ..() access += access_lost -/obj/item/weapon/card/id/platform +/obj/item/card/id/platform name = "\improper Support Platform ID" desc = "Access module for support platforms." icon_state = "id-robot" @@ -190,33 +190,33 @@ access_tox_storage, access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot ) -/obj/item/weapon/card/id/centcom +/obj/item/card/id/centcom name = "\improper CentCom. ID" desc = "An ID straight from Central Command." icon_state = "cc-id" registered_name = "Central Command" assignment = "General" -/obj/item/weapon/card/id/centcom/Initialize() +/obj/item/card/id/centcom/Initialize() . = ..() access = get_all_centcom_access().Copy() -/obj/item/weapon/card/id/centcom/station/Initialize() +/obj/item/card/id/centcom/station/Initialize() . = ..() access |= get_all_station_access() -/obj/item/weapon/card/id/centcom/ERT +/obj/item/card/id/centcom/ERT name = "\improper " + JOB_EMERGENCY_RESPONSE_TEAM + "ID" assignment = JOB_EMERGENCY_RESPONSE_TEAM icon_state = "ert-id" rank = JOB_EMERGENCY_RESPONSE_TEAM -/obj/item/weapon/card/id/centcom/ERT/Initialize() +/obj/item/card/id/centcom/ERT/Initialize() . = ..() access |= get_all_station_access() // Department-flavor IDs -/obj/item/weapon/card/id/medical +/obj/item/card/id/medical name = "identification card" desc = "A card issued to station medical staff." icon_state = "medical-id" @@ -224,7 +224,7 @@ secondary_color = rgb(223,255,255) rank = JOB_MEDICAL_DOCTOR -/obj/item/weapon/card/id/medical/head +/obj/item/card/id/medical/head name = "identification card" desc = "A card which represents care and compassion." primary_color = rgb(189,237,237) @@ -232,7 +232,7 @@ assignment = JOB_CHIEF_MEDICAL_OFFICER rank = JOB_CHIEF_MEDICAL_OFFICER -/obj/item/weapon/card/id/security +/obj/item/card/id/security name = "identification card" desc = "A card issued to station security staff." icon_state = "security-id" @@ -240,11 +240,11 @@ secondary_color = rgb(223,127,95) rank = JOB_SECURITY_OFFICER -/obj/item/weapon/card/id/security/warden +/obj/item/card/id/security/warden assignment = JOB_WARDEN rank = JOB_WARDEN -/obj/item/weapon/card/id/security/head +/obj/item/card/id/security/head name = "identification card" desc = "A card which represents honor and protection." primary_color = rgb(189,47,0) @@ -252,18 +252,18 @@ assignment = JOB_HEAD_OF_SECURITY rank = JOB_HEAD_OF_SECURITY -/obj/item/weapon/card/id/engineering +/obj/item/card/id/engineering name = "identification card" desc = "A card issued to station engineering staff." icon_state = "engineering-id" primary_color = rgb(189,94,0) secondary_color = rgb(223,159,95) -/obj/item/weapon/card/id/engineering/atmos +/obj/item/card/id/engineering/atmos assignment = JOB_ATMOSPHERIC_TECHNICIAN rank = JOB_ATMOSPHERIC_TECHNICIAN -/obj/item/weapon/card/id/engineering/head +/obj/item/card/id/engineering/head name = "identification card" desc = "A card which represents creativity and ingenuity." primary_color = rgb(189,94,0) @@ -271,14 +271,14 @@ assignment = JOB_CHIEF_ENGINEER rank = JOB_CHIEF_ENGINEER -/obj/item/weapon/card/id/science +/obj/item/card/id/science name = "identification card" desc = "A card issued to station science staff." icon_state = "science-id" primary_color = rgb(142,47,142) secondary_color = rgb(191,127,191) -/obj/item/weapon/card/id/science/head +/obj/item/card/id/science/head name = "identification card" desc = "A card which represents knowledge and reasoning." primary_color = rgb(142,47,142) @@ -286,14 +286,14 @@ assignment = JOB_RESEARCH_DIRECTOR rank = JOB_RESEARCH_DIRECTOR -/obj/item/weapon/card/id/cargo +/obj/item/card/id/cargo name = "identification card" desc = "A card issued to station cargo staff." icon_state = "cargo-id" primary_color = rgb(142,94,0) secondary_color = rgb(191,159,95) -/obj/item/weapon/card/id/cargo/head +/obj/item/card/id/cargo/head name = "identification card" desc = "A card which represents service and planning." primary_color = rgb(142,94,0) @@ -301,11 +301,11 @@ assignment = JOB_QUARTERMASTER rank = JOB_QUARTERMASTER -/obj/item/weapon/card/id/assistant +/obj/item/card/id/assistant assignment = JOB_ALT_VISITOR //VOREStation Edit - Visitor not Assistant rank = JOB_ALT_VISITOR //VOREStation Edit - Visitor not Assistant -/obj/item/weapon/card/id/civilian +/obj/item/card/id/civilian name = "identification card" desc = "A card issued to station civilian staff." icon_state = "civilian-id" @@ -314,13 +314,13 @@ assignment = "Civilian" rank = JOB_ALT_ASSISTANT -/obj/item/weapon/card/id/civilian/head //This is not the HoP. There's no position that uses this right now. +/obj/item/card/id/civilian/head //This is not the HoP. There's no position that uses this right now. name = "identification card" desc = "A card which represents common sense and responsibility." primary_color = rgb(0,94,142) secondary_color = rgb(255,223,127) -/obj/item/weapon/card/id/external +/obj/item/card/id/external name = "identification card" desc = "An identification card of some sort. It does not look like it is issued by NT." icon_state = "generic" @@ -328,14 +328,14 @@ secondary_color = rgb(191,159,95) //Event IDs -/obj/item/weapon/card/id/event +/obj/item/card/id/event var/configured = 0 var/accessset = 0 initial_sprite_stack = list() var/list/title_strings = list() var/preset_rank = FALSE -/obj/item/weapon/card/id/event/attack_self(var/mob/user) +/obj/item/card/id/event/attack_self(var/mob/user) if(configured == 1) return ..() @@ -358,9 +358,9 @@ configured = 1 to_chat(user, "Card settings set.") -/obj/item/weapon/card/id/event/attackby(obj/item/I as obj, var/mob/user) - if(istype(I, /obj/item/weapon/card/id) && !accessset) - var/obj/item/weapon/card/id/O = I +/obj/item/card/id/event/attackby(obj/item/I as obj, var/mob/user) + if(istype(I, /obj/item/card/id) && !accessset) + var/obj/item/card/id/O = I access |= O.GetAccess() desc = I.desc rank = O.rank @@ -370,90 +370,90 @@ accessset = 1 ..() -/obj/item/weapon/card/id/event/accessset +/obj/item/card/id/event/accessset accessset = 1 -/obj/item/weapon/card/id/event/accessset/itg +/obj/item/card/id/event/accessset/itg name = "identification card" desc = "A small card designating affiliation with the Ironcrest Transport Group." icon = 'icons/obj/card_vr.dmi' base_icon = 'icons/obj/card_vr.dmi' icon_state = "itg" -/obj/item/weapon/card/id/event/accessset/itg/green +/obj/item/card/id/event/accessset/itg/green icon_state = "itg_green" -/obj/item/weapon/card/id/event/accessset/itg/red +/obj/item/card/id/event/accessset/itg/red icon_state = "itg_red" -/obj/item/weapon/card/id/event/accessset/itg/purple +/obj/item/card/id/event/accessset/itg/purple icon_state = "itg_purple" -/obj/item/weapon/card/id/event/accessset/itg/white +/obj/item/card/id/event/accessset/itg/white icon_state = "itg_white" -/obj/item/weapon/card/id/event/accessset/itg/orange +/obj/item/card/id/event/accessset/itg/orange icon_state = "itg_orange" -/obj/item/weapon/card/id/event/accessset/itg/blue +/obj/item/card/id/event/accessset/itg/blue icon_state = "itg_blue" -/obj/item/weapon/card/id/event/accessset/itg/crew +/obj/item/card/id/event/accessset/itg/crew name = "\improper ITG Crew ID" assignment = "Crew" rank = "Crew" access = list(777) preset_rank = TRUE -/obj/item/weapon/card/id/event/accessset/itg/crew/pilot +/obj/item/card/id/event/accessset/itg/crew/pilot name = "\improper ITG Pilot's ID" desc = "An ID card belonging to the Pilot of an ITG vessel. The Pilot's responsibility is primarily to fly the ship. They may also be tasked to assist with cargo movement duties." assignment = JOB_PILOT rank = JOB_PILOT -/obj/item/weapon/card/id/event/accessset/itg/crew/service +/obj/item/card/id/event/accessset/itg/crew/service name = "\improper ITG " + JOB_ALT_COOK + "'s ID" desc = "An ID card belonging to the " + JOB_ALT_COOK + " of an ITG vessel. The " + JOB_ALT_COOK + "'s responsibility is primarily to provide sustinence to the crew and passengers. The " + JOB_ALT_COOK + " answers to the Passenger Liason. In the absence of a Passenger Liason, the " + JOB_ALT_COOK + " is also responsible for tending to passenger related care and duties." assignment = JOB_ALT_COOK rank = JOB_ALT_COOK icon_state = "itg_green" -/obj/item/weapon/card/id/event/accessset/itg/crew/security +/obj/item/card/id/event/accessset/itg/crew/security name = "\improper ITG Security's ID" desc = "An ID card belonging to Security of an ITG vessel. Security's responsibility is primarily to protect the ship, cargo, or facility. They may also be tasked to assist with cargo movement duties and rescue operations. ITG Security is almost exclusively defensive. They should not start fights, but they are very capable of finishing them." assignment = "Security" rank = "Security" icon_state = "itg_red" -/obj/item/weapon/card/id/event/accessset/itg/crew/research +/obj/item/card/id/event/accessset/itg/crew/research name = "\improper ITG Research's ID" desc = "An ID card belonging to ITG Research staff. ITG Research staff primarily specializes in starship and starship engine design, and overcoming astronomic phenomena." assignment = "Research" rank = "Research" icon_state = "itg_purple" -/obj/item/weapon/card/id/event/accessset/itg/crew/medical +/obj/item/card/id/event/accessset/itg/crew/medical name = "\improper ITG Medic's ID" desc = "An ID card belonging to the Medic of an ITG vessel. The Medic's responsibility is primarily to treat crew and passenger injuries. They may also be tasked with rescue operations." assignment = "Medic" rank = "Medic" icon_state = "itg_white" -/obj/item/weapon/card/id/event/accessset/itg/crew/engineer +/obj/item/card/id/event/accessset/itg/crew/engineer name = "\improper ITG " + JOB_ENGINEER + "'s ID" desc = "An ID card belonging to the " + JOB_ENGINEER + " of an ITG vessel. The " + JOB_ENGINEER + "'s responsibility is primarily to maintain the ship. They may also be tasked to assist with cargo movement duties." assignment = JOB_ENGINEER rank = JOB_ENGINEER icon_state = "itg_orange" -/obj/item/weapon/card/id/event/accessset/itg/crew/passengerliason +/obj/item/card/id/event/accessset/itg/crew/passengerliason name = "\improper ITG Passenger Liason's ID" desc = "An ID card belonging to the Passenger Liason of an ITG vessel. The Passenger Liason's responsibility is primarily to manage and tend to passenger needs and maintain supplies and facilities for passenger use." assignment = "Passenger Liason" rank = "Passenger Liason" icon_state = "itg_blue" -/obj/item/weapon/card/id/event/accessset/itg/crew/captain +/obj/item/card/id/event/accessset/itg/crew/captain name = "\improper ITG " + JOB_ALT_CAPTAIN + "'s ID" desc = "An ID card belonging to the Captain of an ITG vessel. The Captain's responsibility is primarily to manage crew to ensure smooth ship operations. Captains often also often pilot the vessel when no dedicated pilot is assigned." assignment = JOB_ALT_CAPTAIN @@ -461,54 +461,54 @@ icon_state = "itg_blue" access = list(777, 778) -/obj/item/weapon/card/id/event/altcard +/obj/item/card/id/event/altcard icon = 'icons/obj/card_alt_vr.dmi' base_icon = 'icons/obj/card_alt_vr.dmi' icon_state = "id" -/obj/item/weapon/card/id/event/altcard/spare +/obj/item/card/id/event/altcard/spare icon_state = "spare" -/obj/item/weapon/card/id/event/altcard/clown +/obj/item/card/id/event/altcard/clown icon_state = "Clown" -/obj/item/weapon/card/id/event/altcard/mime +/obj/item/card/id/event/altcard/mime icon_state = "Mime" -/obj/item/weapon/card/id/event/altcard/centcom +/obj/item/card/id/event/altcard/centcom icon_state = "CentCom Officer" -/obj/item/weapon/card/id/event/altcard/ert +/obj/item/card/id/event/altcard/ert icon_state = "Emergency Responder" -/obj/item/weapon/card/id/event/altcard/nt +/obj/item/card/id/event/altcard/nt icon_state = "nanotrasen" -/obj/item/weapon/card/id/event/altcard/syndiegold +/obj/item/card/id/event/altcard/syndiegold icon_state = "syndieGold" -/obj/item/weapon/card/id/event/altcard/syndie +/obj/item/card/id/event/altcard/syndie icon_state = "syndie" -/obj/item/weapon/card/id/event/altcard/greengold +/obj/item/card/id/event/altcard/greengold icon_state = "greenGold" -/obj/item/weapon/card/id/event/altcard/pink +/obj/item/card/id/event/altcard/pink icon_state = "pink" -/obj/item/weapon/card/id/event/altcard/pinkgold +/obj/item/card/id/event/altcard/pinkgold icon_state = "pinkGold" -/obj/item/weapon/card/id/event/polymorphic +/obj/item/card/id/event/polymorphic var/base_icon_state -/obj/item/weapon/card/id/event/polymorphic/digest_act(atom/movable/item_storage = null) +/obj/item/card/id/event/polymorphic/digest_act(atom/movable/item_storage = null) var/gimmeicon = icon . = ..() icon = gimmeicon icon_state = base_icon_state + "_digested" -/obj/item/weapon/card/id/event/polymorphic/altcard/attack_self(var/mob/user) +/obj/item/card/id/event/polymorphic/altcard/attack_self(var/mob/user) if(configured == 1) return ..() else @@ -516,14 +516,14 @@ base_icon_state = user.job return ..() -/obj/item/weapon/card/id/event/polymorphic/altcard +/obj/item/card/id/event/polymorphic/altcard icon = 'icons/obj/card_alt_vr.dmi' base_icon = 'icons/obj/card_alt_vr.dmi' icon_state = "blank" name = "contractor identification card" desc = "An ID card typically used by contractors." -/obj/item/weapon/card/id/event/polymorphic/itg/attack_self(var/mob/user) +/obj/item/card/id/event/polymorphic/itg/attack_self(var/mob/user) if(!configured) var/list/jobs_to_icon = list( //ITG only has a few kinds of icons so we have to group them up! JOB_PILOT = "itg", @@ -579,9 +579,9 @@ name = user.name + "'s ITG ID card" + " ([assignment])" -/obj/item/weapon/card/id/event/polymorphic/itg/attackby(obj/item/I as obj, var/mob/user) - if(istype(I, /obj/item/weapon/card/id) && !accessset) - var/obj/item/weapon/card/id/O = I +/obj/item/card/id/event/polymorphic/itg/attackby(obj/item/I as obj, var/mob/user) + if(istype(I, /obj/item/card/id) && !accessset) + var/obj/item/card/id/O = I var/list/itgdont = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_COMMAND_SECRETARY, JOB_HEAD_OF_SECURITY, JOB_CHIEF_ENGINEER, JOB_CHIEF_MEDICAL_OFFICER, JOB_RESEARCH_DIRECTOR, JOB_CLOWN, JOB_MIME, JOB_TALON_CAPTAIN) //If you're in as one of these you probably aren't representing ITG if(O.rank in itgdont) to_chat(user, "ITG Cards do not seem to be able to accept the access codes for your ID.") @@ -590,7 +590,7 @@ desc = "A small card designating affiliation with the Ironcrest Transport Group. It has a NanoTrasen insignia and a lot of very small print on the back to do with practices and regulations for contractors to use." -/obj/item/weapon/card/id/event/polymorphic/itg +/obj/item/card/id/event/polymorphic/itg icon = 'icons/obj/card_vr.dmi' base_icon = 'icons/obj/card_vr.dmi' icon_state = "itg" diff --git a/code/game/objects/items/weapons/id cards/syndicate_ids.dm b/code/game/objects/items/weapons/id cards/syndicate_ids.dm index 6841bb3ea7b..beaec3504ec 100644 --- a/code/game/objects/items/weapons/id cards/syndicate_ids.dm +++ b/code/game/objects/items/weapons/id cards/syndicate_ids.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/card/id/syndicate +/obj/item/card/id/syndicate name = "agent card" icon_state = "generic-s" assignment = "Agent" @@ -8,32 +8,32 @@ var/datum/tgui_module/agentcard/agentcard_module -/obj/item/weapon/card/id/syndicate/Initialize() +/obj/item/card/id/syndicate/Initialize() . = ..() agentcard_module = new(src) access = syndicate_access.Copy() -/obj/item/weapon/card/id/syndicate/station_access/Initialize() +/obj/item/card/id/syndicate/station_access/Initialize() . = ..() // Same as the normal Syndicate id, only already has all station access access |= get_all_station_access() -/obj/item/weapon/card/id/syndicate/Destroy() +/obj/item/card/id/syndicate/Destroy() QDEL_NULL(agentcard_module) unset_registered_user(registered_user) return ..() -/obj/item/weapon/card/id/syndicate/prevent_tracking() +/obj/item/card/id/syndicate/prevent_tracking() return electronic_warfare -/obj/item/weapon/card/id/syndicate/afterattack(var/obj/item/weapon/O as obj, mob/user as mob, proximity) +/obj/item/card/id/syndicate/afterattack(var/obj/item/O as obj, mob/user as mob, proximity) if(!proximity) return - if(istype(O, /obj/item/weapon/card/id)) - var/obj/item/weapon/card/id/I = O + if(istype(O, /obj/item/card/id)) + var/obj/item/card/id/I = O src.access |= I.GetAccess() if(player_is_antag(user.mind) || registered_user == user) to_chat(user, "The microscanner activates as you pass it over the ID, copying its access.") -/obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob) +/obj/item/card/id/syndicate/attack_self(mob/user as mob) // We use the fact that registered_name is not unset should the owner be vaporized, to ensure the id doesn't magically become unlocked. if(!registered_user && register_user(user)) to_chat(user, "The microscanner marks you as its owner, preventing others from accessing its internals.") @@ -49,16 +49,16 @@ ..() -/obj/item/weapon/card/id/syndicate/proc/register_user(var/mob/user) +/obj/item/card/id/syndicate/proc/register_user(var/mob/user) if(!istype(user) || user == registered_user) return FALSE unset_registered_user() registered_user = user user.set_id_info(src) - user.register(OBSERVER_EVENT_DESTROY, src, /obj/item/weapon/card/id/syndicate/proc/unset_registered_user) + user.register(OBSERVER_EVENT_DESTROY, src, /obj/item/card/id/syndicate/proc/unset_registered_user) return TRUE -/obj/item/weapon/card/id/syndicate/proc/unset_registered_user(var/mob/user) +/obj/item/card/id/syndicate/proc/unset_registered_user(var/mob/user) if(!registered_user || (user && user != registered_user)) return registered_user.unregister(OBSERVER_EVENT_DESTROY, src) @@ -68,8 +68,8 @@ /proc/id_card_states() if(!id_card_states) id_card_states = list() - for(var/path in typesof(/obj/item/weapon/card/id)) - var/obj/item/weapon/card/id/ID = new path() + for(var/path in typesof(/obj/item/card/id)) + var/obj/item/card/id/ID = new path() var/datum/card_state/CS = new() CS.icon_state = initial(ID.icon_state) CS.item_state = initial(ID.item_state) @@ -89,7 +89,7 @@ /datum/card_state/dd_SortValue() return name -/obj/item/weapon/card/id/syndicate_command +/obj/item/card/id/syndicate_command name = "operative ID card" desc = "An ID straight from a mercenary organisation." registered_name = "Operative" diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 395c51fa19d..7b012e01216 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/implant +/obj/item/implant name = "implant" icon = 'icons/obj/device.dmi' icon_state = "implant" @@ -14,14 +14,14 @@ var/initialize_loc = BP_TORSO var/known_implant = FALSE -/obj/item/weapon/implant/proc/trigger(emote, source as mob) +/obj/item/implant/proc/trigger(emote, source as mob) return -/obj/item/weapon/implant/proc/activate() +/obj/item/implant/proc/activate() return // Moves the implant where it needs to go, and tells it if there's more to be done in post_implant -/obj/item/weapon/implant/proc/handle_implant(var/mob/source, var/target_zone = BP_TORSO) +/obj/item/implant/proc/handle_implant(var/mob/source, var/target_zone = BP_TORSO) . = TRUE imp_in = source implanted = TRUE @@ -39,18 +39,18 @@ listening_objects |= src // Takes place after handle_implant, if that returns TRUE -/obj/item/weapon/implant/proc/post_implant(var/mob/source) +/obj/item/implant/proc/post_implant(var/mob/source) -/obj/item/weapon/implant/proc/get_data() +/obj/item/implant/proc/get_data() return "No information available" -/obj/item/weapon/implant/proc/hear(message, source as mob) +/obj/item/implant/proc/hear(message, source as mob) return -/obj/item/weapon/implant/proc/islegal() +/obj/item/implant/proc/islegal() return 0 -/obj/item/weapon/implant/proc/meltdown() //breaks it down, making implant unrecongizible +/obj/item/implant/proc/meltdown() //breaks it down, making implant unrecongizible to_chat(imp_in, "You feel something melting inside [part ? "your [part.name]" : "you"]!") if (part) part.take_damage(burn = 15, used_weapon = "Electronics meltdown") @@ -62,14 +62,14 @@ icon_state = "implant_melted" malfunction = MALFUNCTION_PERMANENT -/obj/item/weapon/implant/proc/implant_loadout(var/mob/living/carbon/human/H) +/obj/item/implant/proc/implant_loadout(var/mob/living/carbon/human/H) . = istype(H) && handle_implant(H, initialize_loc) if(.) invisibility = initial(invisibility) known_implant = TRUE post_implant(H) -/obj/item/weapon/implant/Destroy() +/obj/item/implant/Destroy() if(part) part.implants.Remove(src) part = null @@ -77,9 +77,9 @@ imp_in = null return ..() -/obj/item/weapon/implant/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/weapon/implanter)) - var/obj/item/weapon/implanter/implanter = I +/obj/item/implant/attackby(obj/item/I, mob/user) + if(istype(I, /obj/item/implanter)) + var/obj/item/implanter/implanter = I if(implanter.imp) return // It's full. user.drop_from_inventory(src) @@ -94,33 +94,33 @@ ////////////////////////////// // Tracking Implant ////////////////////////////// -GLOBAL_LIST_BOILERPLATE(all_tracking_implants, /obj/item/weapon/implant/tracking) +GLOBAL_LIST_BOILERPLATE(all_tracking_implants, /obj/item/implant/tracking) -/obj/item/weapon/implant/tracking +/obj/item/implant/tracking name = "tracking implant" desc = "An implant normally given to dangerous criminals. Allows security to track your location." known_implant = TRUE var/id = 1 var/degrade_time = 10 MINUTES //How long before the implant stops working outside of a living body. -/obj/item/weapon/implant/tracking/weak //This is for the loadout +/obj/item/implant/tracking/weak //This is for the loadout degrade_time = 2.5 MINUTES -/obj/item/weapon/implant/tracking/New() +/obj/item/implant/tracking/New() id = rand(1, 1000) ..() -/obj/item/weapon/implant/tracking/post_implant(var/mob/source) +/obj/item/implant/tracking/post_implant(var/mob/source) START_PROCESSING(SSobj, src) -/obj/item/weapon/implant/tracking/Destroy() +/obj/item/implant/tracking/Destroy() STOP_PROCESSING(SSobj, src) if(part) part.implants -= src part = imp_in = null return ..() -/obj/item/weapon/implant/tracking/process() +/obj/item/implant/tracking/process() var/implant_location = src.loc if(ismob(implant_location)) var/mob/living/L = implant_location @@ -133,7 +133,7 @@ GLOBAL_LIST_BOILERPLATE(all_tracking_implants, /obj/item/weapon/implant/tracking STOP_PROCESSING(SSobj, src) return 1 -/obj/item/weapon/implant/tracking/get_data() +/obj/item/implant/tracking/get_data() var/dat = {"Implant Specifications:
Name: Tracking Beacon
Life: 10 minutes after death of host
@@ -150,7 +150,7 @@ circuitry. As a result neurotoxins can cause massive damage.
Implant Specifics:
"} return dat -/obj/item/weapon/implant/tracking/emp_act(severity) +/obj/item/implant/tracking/emp_act(severity) if (malfunction) //no, dawg, you can't malfunction while you are malfunctioning return malfunction = MALFUNCTION_TEMPORARY @@ -173,12 +173,12 @@ Implant Specifics:
"} ////////////////////////////// // Death Explosive Implant ////////////////////////////// -/obj/item/weapon/implant/dexplosive +/obj/item/implant/dexplosive name = "explosive" desc = "And boom goes the weasel." icon_state = "implant_evil" -/obj/item/weapon/implant/dexplosive/get_data() +/obj/item/implant/dexplosive/get_data() var/dat = {" Implant Specifications:
Name: Robust Corp RX-78 Employee Management Implant
@@ -192,32 +192,32 @@ Implant Specifics:
"} return dat -/obj/item/weapon/implant/dexplosive/trigger(emote, source as mob) +/obj/item/implant/dexplosive/trigger(emote, source as mob) if(emote == "deathgasp") src.activate("death") return -/obj/item/weapon/implant/dexplosive/activate(var/cause) +/obj/item/implant/dexplosive/activate(var/cause) if((!cause) || (!src.imp_in)) return 0 explosion(src, -1, 0, 2, 3, 0)//This might be a bit much, dono will have to see. if(src.imp_in) src.imp_in.gib() -/obj/item/weapon/implant/dexplosive/islegal() +/obj/item/implant/dexplosive/islegal() return 0 ////////////////////////////// // Explosive Implant ////////////////////////////// -/obj/item/weapon/implant/explosive +/obj/item/implant/explosive name = "explosive implant" desc = "A military grade micro bio-explosive. Highly dangerous." var/elevel = "Localized Limb" var/phrase = "supercalifragilisticexpialidocious" icon_state = "implant_evil" -/obj/item/weapon/implant/explosive/get_data() +/obj/item/implant/explosive/get_data() var/dat = {" Implant Specifications:
Name: Robust Corp RX-78 Intimidation Class Implant
@@ -230,19 +230,19 @@ Implant Specifics:
"} Integrity: Implant will occasionally be degraded by the body's immune system and thus will occasionally malfunction."} return dat -/obj/item/weapon/implant/explosive/hear_talk(mob/M, list/message_pieces, verb) +/obj/item/implant/explosive/hear_talk(mob/M, list/message_pieces, verb) var/msg = multilingual_to_message(message_pieces) hear(msg) return -/obj/item/weapon/implant/explosive/hear(var/msg) +/obj/item/implant/explosive/hear(var/msg) var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "") msg = replace_characters(msg, replacechars) if(findtext(msg,phrase)) activate() qdel(src) -/obj/item/weapon/implant/explosive/activate() +/obj/item/implant/explosive/activate() if (malfunction == MALFUNCTION_PERMANENT) return @@ -282,7 +282,7 @@ Implant Specifics:
"} if(t) t.hotspot_expose(3500,125) -/obj/item/weapon/implant/explosive/post_implant(mob/source as mob) +/obj/item/implant/explosive/post_implant(mob/source as mob) elevel = tgui_alert(usr, "What sort of explosion would you prefer?", "Implant Intent", list("Localized Limb", "Destroy Body", "Full Explosion")) phrase = tgui_input_text(usr, "Choose activation phrase:") var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "") @@ -290,7 +290,7 @@ Implant Specifics:
"} usr.mind.store_memory("Explosive implant in [source] can be activated by saying something containing the phrase ''[src.phrase]'', say [src.phrase] to attempt to activate.", 0, 0) to_chat(usr, "The implanted explosive implant in [source] can be activated by saying something containing the phrase ''[src.phrase]'', say [src.phrase] to attempt to activate.") -/obj/item/weapon/implant/explosive/emp_act(severity) +/obj/item/implant/explosive/emp_act(severity) if (malfunction) return malfunction = MALFUNCTION_TEMPORARY @@ -322,10 +322,10 @@ Implant Specifics:
"} spawn (20) malfunction-- -/obj/item/weapon/implant/explosive/islegal() +/obj/item/implant/explosive/islegal() return 0 -/obj/item/weapon/implant/explosive/proc/small_boom() +/obj/item/implant/explosive/proc/small_boom() if (ishuman(imp_in) && part) imp_in.visible_message("Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!") playsound(src, 'sound/items/countdown.ogg', 75, 1, -3) @@ -345,15 +345,15 @@ Implant Specifics:
"} ////////////////////////////// // Chemical Implant ////////////////////////////// -GLOBAL_LIST_BOILERPLATE(all_chem_implants, /obj/item/weapon/implant/chem) +GLOBAL_LIST_BOILERPLATE(all_chem_implants, /obj/item/implant/chem) -/obj/item/weapon/implant/chem +/obj/item/implant/chem name = "chemical implant" desc = "Injects things." allow_reagents = 1 known_implant = TRUE -/obj/item/weapon/implant/chem/get_data() +/obj/item/implant/chem/get_data() var/dat = {" Implant Specifications:
Name: Robust Corp MJ-420 Prisoner Management Implant
@@ -371,18 +371,18 @@ Can only be loaded while still in its original case.
the implant may become unstable and either pre-maturely inject the subject or simply break."} return dat -/obj/item/weapon/implant/chem/New() +/obj/item/implant/chem/New() ..() var/datum/reagents/R = new/datum/reagents(50) reagents = R R.my_atom = src -/obj/item/weapon/implant/chem/trigger(emote, source as mob) +/obj/item/implant/chem/trigger(emote, source as mob) if(emote == "deathgasp") src.activate(src.reagents.total_volume) return -/obj/item/weapon/implant/chem/activate(var/cause) +/obj/item/implant/chem/activate(var/cause) if((!cause) || (!src.imp_in)) return 0 var/mob/living/carbon/R = src.imp_in src.reagents.trans_to_mob(R, cause, CHEM_BLOOD) @@ -394,7 +394,7 @@ the implant may become unstable and either pre-maturely inject the subject or si qdel(src) return -/obj/item/weapon/implant/chem/emp_act(severity) +/obj/item/implant/chem/emp_act(severity) if (malfunction) return malfunction = MALFUNCTION_TEMPORARY @@ -419,12 +419,12 @@ the implant may become unstable and either pre-maturely inject the subject or si ////////////////////////////// // Loyalty Implant ////////////////////////////// -/obj/item/weapon/implant/loyalty +/obj/item/implant/loyalty name = "loyalty implant" desc = "Makes you loyal or such." known_implant = TRUE -/obj/item/weapon/implant/loyalty/get_data() +/obj/item/implant/loyalty/get_data() var/dat = {" Implant Specifications:
Name: [using_map.company_name] Employee Management Implant
@@ -437,7 +437,7 @@ the implant may become unstable and either pre-maturely inject the subject or si Integrity: Implant will last so long as the nanobots are inside the bloodstream."} return dat -/obj/item/weapon/implant/loyalty/handle_implant(mob/M, target_zone = BP_TORSO) +/obj/item/implant/loyalty/handle_implant(mob/M, target_zone = BP_TORSO) . = ..(M, target_zone) if(!istype(M, /mob/living/carbon/human)) . = FALSE @@ -447,7 +447,7 @@ the implant may become unstable and either pre-maturely inject the subject or si H.visible_message("[H] seems to resist the implant!", "You feel the corporate tendrils of [using_map.company_name] try to invade your mind!") . = FALSE -/obj/item/weapon/implant/loyalty/post_implant(mob/M) +/obj/item/implant/loyalty/post_implant(mob/M) var/mob/living/carbon/human/H = M clear_antag_roles(H.mind, 1) to_chat(H, "You feel a surge of loyalty towards [using_map.company_name].") @@ -455,12 +455,12 @@ the implant may become unstable and either pre-maturely inject the subject or si ////////////////////////////// // Adrenaline Implant ////////////////////////////// -/obj/item/weapon/implant/adrenalin +/obj/item/implant/adrenalin name = "adrenalin" desc = "Removes all stuns and knockdowns." var/uses -/obj/item/weapon/implant/adrenalin/get_data() +/obj/item/implant/adrenalin/get_data() var/dat = {" Implant Specifications:
Name: Cybersun Industries Adrenalin Implant
@@ -474,7 +474,7 @@ the implant may become unstable and either pre-maturely inject the subject or si return dat -/obj/item/weapon/implant/adrenalin/trigger(emote, mob/source as mob) +/obj/item/implant/adrenalin/trigger(emote, mob/source as mob) if (src.uses < 1) return 0 if (emote == "pale") src.uses-- @@ -485,21 +485,21 @@ the implant may become unstable and either pre-maturely inject the subject or si return -/obj/item/weapon/implant/adrenalin/post_implant(mob/source) +/obj/item/implant/adrenalin/post_implant(mob/source) source.mind.store_memory("A implant can be activated by using the pale emote, say *pale to attempt to activate.", 0, 0) to_chat(source, "The implanted freedom implant can be activated by using the pale emote, say *pale to attempt to activate.") ////////////////////////////// // Death Alarm Implant ////////////////////////////// -/obj/item/weapon/implant/death_alarm +/obj/item/implant/death_alarm name = "death alarm implant" desc = "An alarm which monitors host vital signs and transmits a radio message upon death." origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 2, TECH_DATA = 1) known_implant = TRUE var/mobname = "Will Robinson" -/obj/item/weapon/implant/death_alarm/get_data() +/obj/item/implant/death_alarm/get_data() var/dat = {" Implant Specifications:
Name: [using_map.company_name] \"Profit Margin\" Class Employee Lifesign Sensor
@@ -512,7 +512,7 @@ the implant may become unstable and either pre-maturely inject the subject or si Integrity: Implant will occasionally be degraded by the body's immune system and thus will occasionally malfunction."} return dat -/obj/item/weapon/implant/death_alarm/process() +/obj/item/implant/death_alarm/process() if (!implanted) return var/mob/M = imp_in @@ -521,12 +521,12 @@ the implant may become unstable and either pre-maturely inject the subject or si else if(M.stat == 2) activate("death") -/obj/item/weapon/implant/death_alarm/activate(var/cause) +/obj/item/implant/death_alarm/activate(var/cause) var/mob/M = imp_in var/area/t = get_area(M) switch (cause) if("death") - var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/heads/captain(null) + var/obj/item/radio/headset/a = new /obj/item/radio/headset/heads/captain(null) if(istype(t, /area/syndicate_station) || istype(t, /area/syndicate_mothership) || istype(t, /area/shuttle/syndicate_elite) ) //give the syndies a bit of stealth a.autosay("[mobname] has died in Space!", "[mobname]'s Death Alarm") @@ -539,21 +539,21 @@ the implant may become unstable and either pre-maturely inject the subject or si qdel(a) STOP_PROCESSING(SSobj, src) if ("emp") - var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/heads/captain(null) + var/obj/item/radio/headset/a = new /obj/item/radio/headset/heads/captain(null) var/name = prob(50) ? t.name : pick(teleportlocs) a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm") // a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm", "Security") // a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm", "Medical") qdel(a) else - var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/heads/captain(null) + var/obj/item/radio/headset/a = new /obj/item/radio/headset/heads/captain(null) a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm") // a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm", "Security") // a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm", "Medical") qdel(a) STOP_PROCESSING(SSobj, src) -/obj/item/weapon/implant/death_alarm/emp_act(severity) //for some reason alarms stop going off in case they are emp'd, even without this +/obj/item/implant/death_alarm/emp_act(severity) //for some reason alarms stop going off in case they are emp'd, even without this if (malfunction) //so I'm just going to add a meltdown chance here return malfunction = MALFUNCTION_TEMPORARY @@ -569,14 +569,14 @@ the implant may become unstable and either pre-maturely inject the subject or si spawn(20) malfunction-- -/obj/item/weapon/implant/death_alarm/post_implant(mob/source as mob) +/obj/item/implant/death_alarm/post_implant(mob/source as mob) mobname = source.real_name START_PROCESSING(SSobj, src) ////////////////////////////// // Compressed Matter Implant ////////////////////////////// -/obj/item/weapon/implant/compressed +/obj/item/implant/compressed name = "compressed matter implant" desc = "Based on compressed matter technology, can store a single item." icon_state = "implant_evil" @@ -584,7 +584,7 @@ the implant may become unstable and either pre-maturely inject the subject or si var/obj/item/scanned = null origin_tech = list(TECH_MATERIAL = 4, TECH_BIO = 2, TECH_ILLEGAL = 2) -/obj/item/weapon/implant/compressed/get_data() +/obj/item/implant/compressed/get_data() var/dat = {" Implant Specifications:
Name: [using_map.company_name] \"Profit Margin\" Class Employee Lifesign Sensor
@@ -597,7 +597,7 @@ the implant may become unstable and either pre-maturely inject the subject or si Integrity: Implant will occasionally be degraded by the body's immune system and thus will occasionally malfunction."} return dat -/obj/item/weapon/implant/compressed/trigger(emote, mob/source as mob) +/obj/item/implant/compressed/trigger(emote, mob/source as mob) if (src.scanned == null) return 0 @@ -605,7 +605,7 @@ the implant may become unstable and either pre-maturely inject the subject or si to_chat(source, "The air glows as \the [src.scanned.name] uncompresses.") activate() -/obj/item/weapon/implant/compressed/activate() +/obj/item/implant/compressed/activate() var/turf/t = get_turf(src) if (imp_in) imp_in.put_in_hands(scanned) @@ -613,7 +613,7 @@ the implant may become unstable and either pre-maturely inject the subject or si scanned.loc = t qdel(src) -/obj/item/weapon/implant/compressed/post_implant(mob/source) +/obj/item/implant/compressed/post_implant(mob/source) var/choices = list("blink", "blink_r", "eyebrow", "chuckle", "twitch", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink") activation_emote = tgui_input_list(usr, "Choose activation emote. If you cancel this, one will be picked at random.", "Implant Activation", choices) if(!activation_emote) @@ -623,5 +623,5 @@ the implant may become unstable and either pre-maturely inject the subject or si to_chat(source, "The implanted compressed matter implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.") -/obj/item/weapon/implant/compressed/islegal() +/obj/item/implant/compressed/islegal() return 0 diff --git a/code/game/objects/items/weapons/implants/implant_vr.dm b/code/game/objects/items/weapons/implants/implant_vr.dm index fa2c45cacab..b318a725923 100644 --- a/code/game/objects/items/weapons/implants/implant_vr.dm +++ b/code/game/objects/items/weapons/implants/implant_vr.dm @@ -1,9 +1,9 @@ -/obj/item/weapon/implant/vrlanguage +/obj/item/implant/vrlanguage name = "language" desc = "Allows the user to understand and speak almost all known languages.." var/uses = 1 -/obj/item/weapon/implant/vrlanguage/get_data() +/obj/item/implant/vrlanguage/get_data() var/dat = {" Implant Specifications:
Name: Language Implant
@@ -16,7 +16,7 @@ Integrity: Implant can only be used once before the nanobots are depleted."} return dat -/obj/item/weapon/implant/vrlanguage/trigger(emote, mob/source as mob) +/obj/item/implant/vrlanguage/trigger(emote, mob/source as mob) if (src.uses < 1) return 0 if (emote == "smile") @@ -33,7 +33,7 @@ source.add_language(LANGUAGE_SOL_COMMON) //In case they're giving a xenomorph an implant or something. source.add_language(LANGUAGE_TAVAN) -/obj/item/weapon/implant/vrlanguage/post_implant(mob/source) +/obj/item/implant/vrlanguage/post_implant(mob/source) source.mind.store_memory("A implant can be activated by using the smile emote, say *smile to attempt to activate.", 0, 0) to_chat(source,"The implanted language implant can be activated by using the smile emote, say *smile to attempt to activate.") return 1 @@ -41,14 +41,14 @@ ////////////////////////////// // Size Control Implant ////////////////////////////// -/obj/item/weapon/implant/sizecontrol +/obj/item/implant/sizecontrol name = "size control implant" desc = "Implant which allows to control host size via voice commands." icon_state = "implant_evil" var/owner var/active = TRUE -/obj/item/weapon/implant/sizecontrol/get_data() +/obj/item/implant/sizecontrol/get_data() var/dat = {" Implant Specifications:
Name:L3-WD Size Controlling Implant
@@ -57,7 +57,7 @@ Function: Resizes the host whenever specific verbal command is received
"} return dat -/obj/item/weapon/implant/sizecontrol/hear_talk(mob/M, list/message_pieces) +/obj/item/implant/sizecontrol/hear_talk(mob/M, list/message_pieces) if(M == imp_in) return if(owner) @@ -71,7 +71,7 @@ hear(msg) return -/obj/item/weapon/implant/sizecontrol/see_emote(mob/living/M, message, m_type) +/obj/item/implant/sizecontrol/see_emote(mob/living/M, message, m_type) if(M == imp_in) return if(owner) @@ -86,7 +86,7 @@ hear(say_in_me.group[2]) -/obj/item/weapon/implant/sizecontrol/hear(var/msg) +/obj/item/implant/sizecontrol/hear(var/msg) if (malfunction) return @@ -107,18 +107,18 @@ -/obj/item/weapon/implant/sizecontrol/post_implant(mob/source, mob/living/user = usr) +/obj/item/implant/sizecontrol/post_implant(mob/source, mob/living/user = usr) if(source != user) owner = user -/obj/item/weapon/implant/sizecontrol/emp_act(severity) +/obj/item/implant/sizecontrol/emp_act(severity) if(istype(imp_in, /mob/living)) var/newsize = pick(RESIZE_HUGE,RESIZE_BIG,RESIZE_NORMAL,RESIZE_SMALL,RESIZE_TINY,RESIZE_A_HUGEBIG,RESIZE_A_BIGNORMAL,RESIZE_A_NORMALSMALL,RESIZE_A_SMALLTINY) var/mob/living/H = imp_in H.resize(newsize) -/obj/item/weapon/implanter/sizecontrol +/obj/item/implanter/sizecontrol name = "size control implant" desc = "Implant which allows to control host size via voice commands." description_info = {"Only accessible by those who implanted the victim. Self-implanting allows everyone to change host size. The following special commands are available: @@ -128,8 +128,8 @@ 'Ignore' - keywords in the speech won't have any effect. 'Implant-toggle' - toggles implant."} -/obj/item/weapon/implanter/sizecontrol/New() - src.imp = new /obj/item/weapon/implant/sizecontrol( src ) +/obj/item/implanter/sizecontrol/New() + src.imp = new /obj/item/implant/sizecontrol( src ) ..() update() return @@ -138,7 +138,7 @@ ////////////////////////////// // Compliance Implant ////////////////////////////// -/obj/item/weapon/implanter/compliance +/obj/item/implanter/compliance name = "compliance implant" desc = "Implant which allows for implanting 'laws' or 'commands' in the host. Has a miniature keyboard for typing laws into." description_info = {"An implant that allows for a 'law' or 'command' to be uploaded in the implanted host. @@ -153,15 +153,15 @@ Due to the small chemical capacity of the implant, the life of the implant is re safeties to prevent lethal or actively harmful commands from being input to lessen the severity of the crime if they are caught. This one has a golden stamp \ with the shape of a star on it, the letters 'KE' in black text on it." -/obj/item/weapon/implanter/compliance/New() - src.imp = new /obj/item/weapon/implant/compliance( src ) +/obj/item/implanter/compliance/New() + src.imp = new /obj/item/implant/compliance( src ) ..() update() return -/obj/item/weapon/implanter/compliance/attack_self(mob/user) - if(istype(imp,/obj/item/weapon/implant/compliance)) - var/obj/item/weapon/implant/compliance/implant = imp +/obj/item/implanter/compliance/attack_self(mob/user) + if(istype(imp,/obj/item/implant/compliance)) + var/obj/item/implant/compliance/implant = imp var/newlaws = tgui_input_text(user, "Please Input Laws", "Compliance Laws", "", multiline = TRUE, prevent_enter = TRUE) newlaws = sanitize(newlaws,2048) if(newlaws) @@ -171,7 +171,7 @@ Due to the small chemical capacity of the implant, the life of the implant is re to_chat(user,"A red warning pops up on the implanter's micro-screen: 'INVALID IMPLANT DETECTED.'") -/obj/item/weapon/implant/compliance +/obj/item/implant/compliance name = "compliance implant" desc = "Implant which allows for forcing obedience in the host." icon_state = "implant_evil" @@ -179,7 +179,7 @@ Due to the small chemical capacity of the implant, the life of the implant is re var/laws = "CHANGE BEFORE IMPLANTATION" var/nif_payload = /datum/nifsoft/compliance -/obj/item/weapon/implant/compliance/get_data() +/obj/item/implant/compliance/get_data() var/dat = {" Implant Specifications:
Name:Compliance Implant
@@ -190,7 +190,7 @@ Due to the small chemical capacity of the implant, the life of the implant is re Set Laws:[laws]"} return dat -/obj/item/weapon/implant/compliance/post_implant(mob/source, mob/living/user = usr) +/obj/item/implant/compliance/post_implant(mob/source, mob/living/user = usr) if(!ishuman(source)) //No compliance implanting non-humans. return diff --git a/code/game/objects/items/weapons/implants/implantaugment.dm b/code/game/objects/items/weapons/implants/implantaugment.dm index 32082fef99c..ed1217ac229 100644 --- a/code/game/objects/items/weapons/implants/implantaugment.dm +++ b/code/game/objects/items/weapons/implants/implantaugment.dm @@ -1,7 +1,7 @@ ////////////////////////////// // Nanite Organ Implant ////////////////////////////// -/obj/item/weapon/implant/organ +/obj/item/implant/organ name = "nanite fabrication implant" desc = "A buzzing implant covered in a writhing layer of metal insects." icon_state = "implant_evil" @@ -10,7 +10,7 @@ var/organ_to_implant = /obj/item/organ/internal/augment/bioaugment/thermalshades var/organ_display_name = "unknown organ" -/obj/item/weapon/implant/organ/get_data() +/obj/item/implant/organ/get_data() var/dat = {" Implant Specifications:
Name: \"GreyDoctor\" Class Nanite Hive
@@ -23,7 +23,7 @@ Integrity: N/A"} return dat -/obj/item/weapon/implant/organ/post_implant(var/mob/M) +/obj/item/implant/organ/post_implant(var/mob/M) if(ishuman(M)) var/mob/living/carbon/human/H = M @@ -52,14 +52,14 @@ qdel(NewOrgan) to_chat(H, "You feel a pinching sensation in your [part]. The implant remains.") -/obj/item/weapon/implant/organ/islegal() +/obj/item/implant/organ/islegal() return 0 /* * Arm / leg mounted augments. */ -/obj/item/weapon/implant/organ/limbaugment +/obj/item/implant/organ/limbaugment name = "nanite implant" organ_to_implant = /obj/item/organ/internal/augment/armmounted/taser @@ -67,7 +67,7 @@ var/list/possible_targets = list(O_AUG_L_FOREARM, O_AUG_R_FOREARM) -/obj/item/weapon/implant/organ/limbaugment/post_implant(var/mob/M) +/obj/item/implant/organ/limbaugment/post_implant(var/mob/M) if(ishuman(M)) var/mob/living/carbon/human/H = M @@ -96,7 +96,7 @@ qdel(NewOrgan) to_chat(H, "You feel a pinching sensation in your [part]. The implant remains.") -/obj/item/weapon/implant/organ/limbaugment/proc/setup_augment_slots(var/mob/living/carbon/human/H, var/obj/item/organ/internal/augment/armmounted/I) +/obj/item/implant/organ/limbaugment/proc/setup_augment_slots(var/mob/living/carbon/human/H, var/obj/item/organ/internal/augment/armmounted/I) var/list/Choices = possible_targets.Copy() for(var/targ in possible_targets) @@ -148,13 +148,13 @@ * Limb implant primary subtypes. */ -/obj/item/weapon/implant/organ/limbaugment/upperarm +/obj/item/implant/organ/limbaugment/upperarm organ_to_implant = /obj/item/organ/internal/augment/armmounted/shoulder/multiple organ_display_name = "multi-use augment" possible_targets = list(O_AUG_R_UPPERARM,O_AUG_L_UPPERARM) -/obj/item/weapon/implant/organ/limbaugment/wrist +/obj/item/implant/organ/limbaugment/wrist organ_to_implant = /obj/item/organ/internal/augment/armmounted/hand organ_display_name = "wrist augment" @@ -165,31 +165,31 @@ */ // Wrist -/obj/item/weapon/implant/organ/limbaugment/wrist/sword +/obj/item/implant/organ/limbaugment/wrist/sword organ_to_implant = /obj/item/organ/internal/augment/armmounted/hand/sword organ_display_name = "weapon augment" -/obj/item/weapon/implant/organ/limbaugment/wrist/blade +/obj/item/implant/organ/limbaugment/wrist/blade organ_to_implant = /obj/item/organ/internal/augment/armmounted/hand/blade organ_display_name = "weapon augment" // Fore-arm -/obj/item/weapon/implant/organ/limbaugment/laser +/obj/item/implant/organ/limbaugment/laser organ_to_implant = /obj/item/organ/internal/augment/armmounted organ_display_name = "weapon augment" -/obj/item/weapon/implant/organ/limbaugment/dart +/obj/item/implant/organ/limbaugment/dart organ_to_implant = /obj/item/organ/internal/augment/armmounted/dartbow organ_display_name = "weapon augment" // Upper-arm. -/obj/item/weapon/implant/organ/limbaugment/upperarm/medkit +/obj/item/implant/organ/limbaugment/upperarm/medkit organ_to_implant = /obj/item/organ/internal/augment/armmounted/shoulder/multiple/medical -/obj/item/weapon/implant/organ/limbaugment/upperarm/surge +/obj/item/implant/organ/limbaugment/upperarm/surge organ_to_implant = /obj/item/organ/internal/augment/armmounted/shoulder/surge -/obj/item/weapon/implant/organ/limbaugment/upperarm/blade +/obj/item/implant/organ/limbaugment/upperarm/blade organ_to_implant = /obj/item/organ/internal/augment/armmounted/shoulder/blade organ_display_name = "weapon augment" @@ -197,7 +197,7 @@ * Others */ -/obj/item/weapon/implant/organ/pelvic +/obj/item/implant/organ/pelvic name = "nanite fabrication implant" organ_to_implant = /obj/item/organ/internal/augment/bioaugment/sprint_enhance diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index ee6925c55c4..636b288876a 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -1,6 +1,6 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 -/obj/item/weapon/implantcase +/obj/item/implantcase name = "glass case" desc = "A case containing an implant." icon = 'icons/obj/items.dmi' @@ -9,18 +9,18 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_TINY - var/obj/item/weapon/implant/imp = null + var/obj/item/implant/imp = null -/obj/item/weapon/implantcase/proc/update() +/obj/item/implantcase/proc/update() if (src.imp) src.icon_state = text("implantcase-[]", src.imp.implant_color) else src.icon_state = "implantcase-0" return -/obj/item/weapon/implantcase/attackby(obj/item/weapon/I as obj, mob/user as mob) +/obj/item/implantcase/attackby(obj/item/I as obj, mob/user as mob) ..() - if (istype(I, /obj/item/weapon/pen)) + if (istype(I, /obj/item/pen)) var/t = tgui_input_text(user, "What would you like the label to be?", text("[]", src.name), null, MAX_NAME_LEN) if (user.get_active_hand() != I) return @@ -31,7 +31,7 @@ src.name = text("Glass Case - '[]'", t) else src.name = "Glass Case" - else if(istype(I, /obj/item/weapon/reagent_containers/syringe)) + else if(istype(I, /obj/item/reagent_containers/syringe)) if(!src.imp) return if(!src.imp.allow_reagents) return if(src.imp.reagents.total_volume >= src.imp.reagents.maximum_volume) @@ -40,8 +40,8 @@ spawn(5) I.reagents.trans_to_obj(src.imp, 5) to_chat(user, "You inject 5 units of the solution. The syringe now contains [I.reagents.total_volume] units.") - else if (istype(I, /obj/item/weapon/implanter)) - var/obj/item/weapon/implanter/M = I + else if (istype(I, /obj/item/implanter)) + var/obj/item/implanter/M = I if (M.imp) if ((src.imp || M.imp.implanted)) return @@ -62,250 +62,250 @@ return -/obj/item/weapon/implantcase/tracking +/obj/item/implantcase/tracking name = "glass case - 'tracking'" desc = "A case containing a tracking implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/tracking/New() - src.imp = new /obj/item/weapon/implant/tracking( src ) +/obj/item/implantcase/tracking/New() + src.imp = new /obj/item/implant/tracking( src ) ..() return -/obj/item/weapon/implantcase/explosive +/obj/item/implantcase/explosive name = "glass case - 'explosive'" desc = "A case containing an explosive implant." icon_state = "implantcase-r" -/obj/item/weapon/implantcase/explosive/New() - src.imp = new /obj/item/weapon/implant/explosive( src ) +/obj/item/implantcase/explosive/New() + src.imp = new /obj/item/implant/explosive( src ) ..() return -/obj/item/weapon/implantcase/chem +/obj/item/implantcase/chem name = "glass case - 'chem'" desc = "A case containing a chemical implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/chem/New() - src.imp = new /obj/item/weapon/implant/chem( src ) +/obj/item/implantcase/chem/New() + src.imp = new /obj/item/implant/chem( src ) ..() return -/obj/item/weapon/implantcase/loyalty +/obj/item/implantcase/loyalty name = "glass case - 'loyalty'" desc = "A case containing a loyalty implant." icon_state = "implantcase-r" -/obj/item/weapon/implantcase/loyalty/New() - src.imp = new /obj/item/weapon/implant/loyalty( src ) +/obj/item/implantcase/loyalty/New() + src.imp = new /obj/item/implant/loyalty( src ) ..() return -/obj/item/weapon/implantcase/death_alarm +/obj/item/implantcase/death_alarm name = "glass case - 'death alarm'" desc = "A case containing a death alarm implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/death_alarm/New() - src.imp = new /obj/item/weapon/implant/death_alarm( src ) +/obj/item/implantcase/death_alarm/New() + src.imp = new /obj/item/implant/death_alarm( src ) ..() return -/obj/item/weapon/implantcase/freedom +/obj/item/implantcase/freedom name = "glass case - 'freedom'" desc = "A case containing a freedom implant." icon_state = "implantcase-r" -/obj/item/weapon/implantcase/freedom/New() - src.imp = new /obj/item/weapon/implant/freedom( src ) +/obj/item/implantcase/freedom/New() + src.imp = new /obj/item/implant/freedom( src ) ..() return -/obj/item/weapon/implantcase/adrenalin +/obj/item/implantcase/adrenalin name = "glass case - 'adrenalin'" desc = "A case containing an adrenalin implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/adrenalin/New() - src.imp = new /obj/item/weapon/implant/adrenalin( src ) +/obj/item/implantcase/adrenalin/New() + src.imp = new /obj/item/implant/adrenalin( src ) ..() return -/obj/item/weapon/implantcase/dexplosive +/obj/item/implantcase/dexplosive name = "glass case - 'explosive'" desc = "A case containing an explosive." icon_state = "implantcase-r" -/obj/item/weapon/implantcase/dexplosive/New() - src.imp = new /obj/item/weapon/implant/dexplosive( src ) +/obj/item/implantcase/dexplosive/New() + src.imp = new /obj/item/implant/dexplosive( src ) ..() return -/obj/item/weapon/implantcase/health +/obj/item/implantcase/health name = "glass case - 'health'" desc = "A case containing a health tracking implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/health/New() - src.imp = new /obj/item/weapon/implant/health( src ) +/obj/item/implantcase/health/New() + src.imp = new /obj/item/implant/health( src ) ..() return -/obj/item/weapon/implantcase/language +/obj/item/implantcase/language name = "glass case - 'GalCom'" desc = "A case containing a GalCom language implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/language/New() - src.imp = new /obj/item/weapon/implant/language( src ) +/obj/item/implantcase/language/New() + src.imp = new /obj/item/implant/language( src ) ..() return -/obj/item/weapon/implantcase/language/eal +/obj/item/implantcase/language/eal name = "glass case - 'EAL'" desc = "A case containing an Encoded Audio Language implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/language/eal/New() - src.imp = new /obj/item/weapon/implant/language/eal( src ) +/obj/item/implantcase/language/eal/New() + src.imp = new /obj/item/implant/language/eal( src ) ..() return -/obj/item/weapon/implantcase/shades +/obj/item/implantcase/shades name = "glass case - 'Integrated Shades'" desc = "A case containing a nanite fabricator implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/shades/New() - src.imp = new /obj/item/weapon/implant/organ( src ) +/obj/item/implantcase/shades/New() + src.imp = new /obj/item/implant/organ( src ) ..() return -/obj/item/weapon/implantcase/taser +/obj/item/implantcase/taser name = "glass case - 'Taser'" desc = "A case containing a nanite fabricator implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/taser/New() - src.imp = new /obj/item/weapon/implant/organ/limbaugment( src ) +/obj/item/implantcase/taser/New() + src.imp = new /obj/item/implant/organ/limbaugment( src ) ..() return -/obj/item/weapon/implantcase/laser +/obj/item/implantcase/laser name = "glass case - 'Laser'" desc = "A case containing a nanite fabricator implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/laser/New() - src.imp = new /obj/item/weapon/implant/organ/limbaugment/laser( src ) +/obj/item/implantcase/laser/New() + src.imp = new /obj/item/implant/organ/limbaugment/laser( src ) ..() return -/obj/item/weapon/implantcase/dart +/obj/item/implantcase/dart name = "glass case - 'Dart'" desc = "A case containing a nanite fabricator implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/dart/New() - src.imp = new /obj/item/weapon/implant/organ/limbaugment/dart( src ) +/obj/item/implantcase/dart/New() + src.imp = new /obj/item/implant/organ/limbaugment/dart( src ) ..() return -/obj/item/weapon/implantcase/toolkit +/obj/item/implantcase/toolkit name = "glass case - 'Toolkit'" desc = "A case containing a nanite fabricator implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/toolkit/New() - src.imp = new /obj/item/weapon/implant/organ/limbaugment/upperarm( src ) +/obj/item/implantcase/toolkit/New() + src.imp = new /obj/item/implant/organ/limbaugment/upperarm( src ) ..() return -/obj/item/weapon/implantcase/medkit +/obj/item/implantcase/medkit name = "glass case - 'Toolkit'" desc = "A case containing a nanite fabricator implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/medkit/New() - src.imp = new /obj/item/weapon/implant/organ/limbaugment/upperarm/medkit( src ) +/obj/item/implantcase/medkit/New() + src.imp = new /obj/item/implant/organ/limbaugment/upperarm/medkit( src ) ..() return -/obj/item/weapon/implantcase/surge +/obj/item/implantcase/surge name = "glass case - 'Muscle Overclocker'" desc = "A case containing a nanite fabricator implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/surge/New() - src.imp = new /obj/item/weapon/implant/organ/limbaugment/upperarm/surge( src ) +/obj/item/implantcase/surge/New() + src.imp = new /obj/item/implant/organ/limbaugment/upperarm/surge( src ) ..() return -/obj/item/weapon/implantcase/analyzer +/obj/item/implantcase/analyzer name = "glass case - 'Scanner'" desc = "A case containing a nanite fabricator implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/analyzer/New() - src.imp = new /obj/item/weapon/implant/organ/limbaugment/wrist( src ) +/obj/item/implantcase/analyzer/New() + src.imp = new /obj/item/implant/organ/limbaugment/wrist( src ) ..() return -/obj/item/weapon/implantcase/sword +/obj/item/implantcase/sword name = "glass case - 'Scanner'" desc = "A case containing a nanite fabricator implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/sword/New() - src.imp = new /obj/item/weapon/implant/organ/limbaugment/wrist/sword( src ) +/obj/item/implantcase/sword/New() + src.imp = new /obj/item/implant/organ/limbaugment/wrist/sword( src ) ..() return -/obj/item/weapon/implantcase/sprinter +/obj/item/implantcase/sprinter name = "glass case - 'Sprinter'" desc = "A case containing a nanite fabricator implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/sprinter/New() - src.imp = new /obj/item/weapon/implant/organ/pelvic( src ) +/obj/item/implantcase/sprinter/New() + src.imp = new /obj/item/implant/organ/pelvic( src ) ..() return -/obj/item/weapon/implantcase/armblade +/obj/item/implantcase/armblade name = "glass case - 'Armblade'" desc = "A case containing a nanite fabricator implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/armblade/New() - src.imp = new /obj/item/weapon/implant/organ/limbaugment/upperarm/blade( src ) +/obj/item/implantcase/armblade/New() + src.imp = new /obj/item/implant/organ/limbaugment/upperarm/blade( src ) ..() return -/obj/item/weapon/implantcase/handblade +/obj/item/implantcase/handblade name = "glass case - 'Handblade'" desc = "A case containing a nanite fabricator implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/handblade/New() - src.imp = new /obj/item/weapon/implant/organ/limbaugment/wrist/blade( src ) +/obj/item/implantcase/handblade/New() + src.imp = new /obj/item/implant/organ/limbaugment/wrist/blade( src ) ..() return -/obj/item/weapon/implantcase/restrainingbolt +/obj/item/implantcase/restrainingbolt name = "glass case - 'Restraining Bolt'" desc = "A case containing a restraining bolt." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/restrainingbolt/New() - src.imp = new /obj/item/weapon/implant/restrainingbolt( src ) +/obj/item/implantcase/restrainingbolt/New() + src.imp = new /obj/item/implant/restrainingbolt( src ) ..() return diff --git a/code/game/objects/items/weapons/implants/implantcase_vr.dm b/code/game/objects/items/weapons/implants/implantcase_vr.dm index 776034b7983..e73cb756cc3 100644 --- a/code/game/objects/items/weapons/implants/implantcase_vr.dm +++ b/code/game/objects/items/weapons/implants/implantcase_vr.dm @@ -1,9 +1,9 @@ -/obj/item/weapon/implantcase/vrlanguage +/obj/item/implantcase/vrlanguage name = "glass case - 'language'" desc = "A case containing a language implant." icon_state = "implantcase-r" -/obj/item/weapon/implantcase/vrlanguage/New() - src.imp = new /obj/item/weapon/implant/vrlanguage( src ) +/obj/item/implantcase/vrlanguage/New() + src.imp = new /obj/item/implant/vrlanguage( src ) ..() return \ No newline at end of file diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 134ea532bdb..ff79816fb28 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -11,7 +11,7 @@ var/ready = 1 var/malfunction = 0 - var/list/obj/item/weapon/implant/loyalty/implant_list = list() + var/list/obj/item/implant/loyalty/implant_list = list() var/max_implants = 5 var/injection_cooldown = 600 var/replenish_cooldown = 6000 @@ -67,9 +67,9 @@ return -/obj/machinery/implantchair/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob) - if(istype(G, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/grab = G +/obj/machinery/implantchair/attackby(var/obj/item/G as obj, var/mob/user as mob) + if(istype(G, /obj/item/grab)) + var/obj/item/grab/grab = G if(!ismob(grab.affecting)) return if(grab.affecting.has_buckled_mobs()) @@ -121,9 +121,9 @@ if (!istype(M, /mob/living/carbon)) return if(!implant_list.len) return - for(var/obj/item/weapon/implant/loyalty/imp in implant_list) + for(var/obj/item/implant/loyalty/imp in implant_list) if(!imp) continue - if(istype(imp, /obj/item/weapon/implant/loyalty)) + if(istype(imp, /obj/item/implant/loyalty)) for (var/mob/O in viewers(M, null)) O.show_message("\The [M] has been implanted by \the [src].", 1) @@ -137,7 +137,7 @@ /obj/machinery/implantchair/proc/add_implants() for(var/i=0, iImplant Specifications:
Name: Modular Implant
@@ -32,17 +32,17 @@ Integrity: Implant is not shielded from electromagnetic interference, otherwise it is independent of subject's status."} return dat -/obj/item/weapon/implant/integrated_circuit/emp_act(severity) +/obj/item/implant/integrated_circuit/emp_act(severity) IC.emp_act(severity) -/obj/item/weapon/implant/integrated_circuit/examine(mob/user) +/obj/item/implant/integrated_circuit/examine(mob/user) return IC.examine(user) -/obj/item/weapon/implant/integrated_circuit/attackby(var/obj/item/O, var/mob/user) - if(O.has_tool_quality(TOOL_CROWBAR) || istype(O, /obj/item/device/integrated_electronics) || istype(O, /obj/item/integrated_circuit) || O.has_tool_quality(TOOL_SCREWDRIVER) || istype(O, /obj/item/weapon/cell/device) ) +/obj/item/implant/integrated_circuit/attackby(var/obj/item/O, var/mob/user) + if(O.has_tool_quality(TOOL_CROWBAR) || istype(O, /obj/item/integrated_electronics) || istype(O, /obj/item/integrated_circuit) || O.has_tool_quality(TOOL_SCREWDRIVER) || istype(O, /obj/item/cell/device) ) IC.attackby(O, user) else ..() -/obj/item/weapon/implant/integrated_circuit/attack_self(mob/user) +/obj/item/implant/integrated_circuit/attack_self(mob/user) IC.attack_self(user) diff --git a/code/game/objects/items/weapons/implants/implantdud.dm b/code/game/objects/items/weapons/implants/implantdud.dm index cabf5bc9069..c167439d874 100644 --- a/code/game/objects/items/weapons/implants/implantdud.dm +++ b/code/game/objects/items/weapons/implants/implantdud.dm @@ -1,9 +1,9 @@ -/obj/item/weapon/implant/dud +/obj/item/implant/dud name = "unknown implant" desc = "A small device with small connector wires." icon = 'icons/obj/device.dmi' icon_state = "implant" initialize_loc = BP_HEAD -/obj/item/weapon/implant/dud/torso +/obj/item/implant/dud/torso initialize_loc = BP_TORSO diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index d0130027b55..e704c8cd566 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/implanter +/obj/item/implanter name = "implanter" icon = 'icons/obj/items.dmi' icon_state = "implanter0_1" @@ -7,15 +7,15 @@ throw_range = 5 w_class = ITEMSIZE_SMALL matter = list(MAT_STEEL = 1000, MAT_GLASS = 1000) - var/obj/item/weapon/implant/imp = null + var/obj/item/implant/imp = null var/active = 1 -/obj/item/weapon/implanter/attack_self(var/mob/user) +/obj/item/implanter/attack_self(var/mob/user) active = !active to_chat(user, "You [active ? "" : "de"]activate \the [src].") update() -/obj/item/weapon/implanter/verb/remove_implant() +/obj/item/implanter/verb/remove_implant() set category = "Object" set name = "Remove Implant" set src in usr @@ -35,7 +35,7 @@ return -/obj/item/weapon/implanter/proc/update() +/obj/item/implanter/proc/update() if (src.imp) src.icon_state = "implanter1" else @@ -43,7 +43,7 @@ src.icon_state += "_[active]" return -/obj/item/weapon/implanter/attack(mob/M as mob, mob/user as mob) +/obj/item/implanter/attack(mob/M as mob, mob/user as mob) if (!istype(M, /mob/living/carbon)) return if(active) @@ -74,46 +74,46 @@ to_chat(user, "You need to activate \the [src.name] first.") return -/obj/item/weapon/implanter/loyalty +/obj/item/implanter/loyalty name = "implanter-loyalty" -/obj/item/weapon/implanter/loyalty/New() - src.imp = new /obj/item/weapon/implant/loyalty( src ) +/obj/item/implanter/loyalty/New() + src.imp = new /obj/item/implant/loyalty( src ) ..() update() return -/obj/item/weapon/implanter/explosive +/obj/item/implanter/explosive name = "implanter (E)" -/obj/item/weapon/implanter/explosive/New() - src.imp = new /obj/item/weapon/implant/explosive( src ) +/obj/item/implanter/explosive/New() + src.imp = new /obj/item/implant/explosive( src ) ..() update() return -/obj/item/weapon/implanter/adrenalin +/obj/item/implanter/adrenalin name = "implanter-adrenalin" -/obj/item/weapon/implanter/adrenalin/New() - src.imp = new /obj/item/weapon/implant/adrenalin(src) +/obj/item/implanter/adrenalin/New() + src.imp = new /obj/item/implant/adrenalin(src) ..() update() return -/obj/item/weapon/implanter/compressed +/obj/item/implanter/compressed name = "implanter (C)" icon_state = "cimplanter1" -/obj/item/weapon/implanter/compressed/New() - imp = new /obj/item/weapon/implant/compressed( src ) +/obj/item/implanter/compressed/New() + imp = new /obj/item/implant/compressed( src ) ..() update() return -/obj/item/weapon/implanter/compressed/update() +/obj/item/implanter/compressed/update() if (imp) - var/obj/item/weapon/implant/compressed/c = imp + var/obj/item/implant/compressed/c = imp if(!c.scanned) icon_state = "cimplanter1" else @@ -122,44 +122,44 @@ icon_state = "cimplanter0" return -/obj/item/weapon/implanter/compressed/attack(mob/M as mob, mob/user as mob) - var/obj/item/weapon/implant/compressed/c = imp +/obj/item/implanter/compressed/attack(mob/M as mob, mob/user as mob) + var/obj/item/implant/compressed/c = imp if (!c) return if (c.scanned == null) to_chat(user, "Please scan an object with the implanter first.") return ..() -/obj/item/weapon/implanter/compressed/afterattack(atom/A, mob/user as mob, proximity) +/obj/item/implanter/compressed/afterattack(atom/A, mob/user as mob, proximity) if(!proximity) return if(!active) to_chat(user, "Activate \the [src.name] first.") return if(istype(A,/obj/item) && imp) - var/obj/item/weapon/implant/compressed/c = imp + var/obj/item/implant/compressed/c = imp if (c.scanned) to_chat(user, "Something is already scanned inside the implant!") return c.scanned = A - if(istype(A, /obj/item/weapon/storage)) + if(istype(A, /obj/item/storage)) to_chat(user, "You can't store \the [A.name] in this!") c.scanned = null return if(istype(A.loc,/mob/living/carbon/human)) var/mob/living/carbon/human/H = A.loc H.remove_from_mob(A) - else if(istype(A.loc,/obj/item/weapon/storage)) - var/obj/item/weapon/storage/S = A.loc + else if(istype(A.loc,/obj/item/storage)) + var/obj/item/storage/S = A.loc S.remove_from_storage(A) A.loc.contents.Remove(A) update() -/obj/item/weapon/implanter/restrainingbolt +/obj/item/implanter/restrainingbolt name = "implanter (bolt)" -/obj/item/weapon/implanter/restrainingbolt/New() - src.imp = new /obj/item/weapon/implant/restrainingbolt( src ) +/obj/item/implanter/restrainingbolt/New() + src.imp = new /obj/item/implant/restrainingbolt( src ) ..() update() return diff --git a/code/game/objects/items/weapons/implants/implanter_vr.dm b/code/game/objects/items/weapons/implants/implanter_vr.dm index 4622321835f..a794761998e 100644 --- a/code/game/objects/items/weapons/implants/implanter_vr.dm +++ b/code/game/objects/items/weapons/implants/implanter_vr.dm @@ -1,10 +1,10 @@ //Vorestation universal translator implant. -/obj/item/weapon/implanter/vrlanguage +/obj/item/implanter/vrlanguage name = "implanter-language" -/obj/item/weapon/implanter/vrlanguage/New() - src.imp = new /obj/item/weapon/implant/vrlanguage( src ) +/obj/item/implanter/vrlanguage/New() + src.imp = new /obj/item/implant/vrlanguage( src ) ..() update() return diff --git a/code/game/objects/items/weapons/implants/implantfreedom.dm b/code/game/objects/items/weapons/implants/implantfreedom.dm index aa63215a61c..34d69218216 100644 --- a/code/game/objects/items/weapons/implants/implantfreedom.dm +++ b/code/game/objects/items/weapons/implants/implantfreedom.dm @@ -1,6 +1,6 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 -/obj/item/weapon/implant/freedom +/obj/item/implant/freedom name = "freedom implant" desc = "Use this to escape from those evil Red Shirts." implant_color = "r" @@ -8,14 +8,14 @@ var/uses = 1.0 -/obj/item/weapon/implant/freedom/New() +/obj/item/implant/freedom/New() src.activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink") src.uses = rand(1, 5) ..() return -/obj/item/weapon/implant/freedom/trigger(emote, mob/living/carbon/source as mob) +/obj/item/implant/freedom/trigger(emote, mob/living/carbon/source as mob) if (src.uses < 1) return 0 @@ -23,7 +23,7 @@ src.uses-- to_chat(source, "You feel a faint click.") if (source.handcuffed) - var/obj/item/weapon/W = source.handcuffed + var/obj/item/W = source.handcuffed source.handcuffed = null if(source.buckled && source.buckled.buckle_require_restraints) source.buckled.unbuckle_mob() @@ -36,7 +36,7 @@ if (W) W.layer = initial(W.layer) if (source.legcuffed) - var/obj/item/weapon/W = source.legcuffed + var/obj/item/W = source.legcuffed source.legcuffed = null source.update_inv_legcuffed() if (source.client) @@ -48,11 +48,11 @@ W.layer = initial(W.layer) return -/obj/item/weapon/implant/freedom/post_implant(mob/source) +/obj/item/implant/freedom/post_implant(mob/source) source.mind.store_memory("Freedom implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", 0, 0) to_chat(source, "The implanted freedom implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.") -/obj/item/weapon/implant/freedom/get_data() +/obj/item/implant/freedom/get_data() var/dat = {" Implant Specifications:
Name: Freedom Beacon
diff --git a/code/game/objects/items/weapons/implants/implantlanguage.dm b/code/game/objects/items/weapons/implants/implantlanguage.dm index 595e40c2b9f..5ffab2cf899 100644 --- a/code/game/objects/items/weapons/implants/implantlanguage.dm +++ b/code/game/objects/items/weapons/implants/implantlanguage.dm @@ -2,14 +2,14 @@ //They don't, at the moment, grant knowledge of the language //The can_speak_special checks should check for the presence of the implants. -/obj/item/weapon/implant/language +/obj/item/implant/language name = "GalCom language implant" desc = "An implant allowing someone to speak the range of frequencies used in Galactic Common, as well as produce any phonemes that they usually cannot. Only helps with producing sounds, not understanding them." known_implant = TRUE var/list/languages = list(LANGUAGE_GALCOM) // List of languages that this assists with initialize_loc = BP_HEAD -/obj/item/weapon/implant/language/post_implant(mob/M) // Amends the mob's voice organ, then deletes itself +/obj/item/implant/language/post_implant(mob/M) // Amends the mob's voice organ, then deletes itself if(ishuman(M)) var/mob/living/carbon/human/H = M var/obj/item/organ/internal/voicebox/V = locate() in H.internal_organs @@ -27,7 +27,7 @@ V.add_assistable_langs(L) QDEL_NULL(src) -/obj/item/weapon/implant/language/get_data() +/obj/item/implant/language/get_data() var/dat = {" Implant Specifications:
Name: Vey-Med L-1 Galactic Common Implant
@@ -42,12 +42,12 @@ // EAL Implant -/obj/item/weapon/implant/language/eal +/obj/item/implant/language/eal name = "EAL language implant" desc = "An implant allowing an organic to speak Encoded Audio Language passably. Only helps with producing sounds, not understanding them." languages = list(LANGUAGE_EAL) -/obj/item/weapon/implant/language/eal/get_data() +/obj/item/implant/language/eal/get_data() var/dat = {" Implant Specifications:
Name: Vey-Med L-2 Encoded Audio Language Implant
@@ -60,12 +60,12 @@ Integrity: Implant will function for expected life, barring physical damage."} return dat -/obj/item/weapon/implant/language/skrellian +/obj/item/implant/language/skrellian name = "Skrellian language implant" desc = "An implant allowing someone to speak the range of frequencies used in Skrellian, as well as produce any phonemes that they usually cannot. Only helps with hearing and producing sounds, not understanding them." languages = list(LANGUAGE_SKRELLIAN) -/obj/item/weapon/implant/language/skrellian/get_data() +/obj/item/implant/language/skrellian/get_data() var/dat = {" Implant Specifications:
Name: Vey-Med L-1 Galactic Common Implant
diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index f895a2438fd..cc1c1242ef4 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -1,6 +1,6 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 -/obj/item/weapon/implantpad +/obj/item/implantpad name = "implantpad" desc = "Used to modify implants." icon = 'icons/obj/items.dmi' @@ -9,10 +9,10 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_SMALL - var/obj/item/weapon/implantcase/case = null + var/obj/item/implantcase/case = null var/broadcasting = null var/listening = 1.0 -/obj/item/weapon/implantpad/proc/update() +/obj/item/implantpad/proc/update() if (src.case) src.icon_state = "implantpad-1" else @@ -20,7 +20,7 @@ return -/obj/item/weapon/implantpad/attack_hand(mob/living/user as mob) +/obj/item/implantpad/attack_hand(mob/living/user as mob) if ((src.case && user.item_is_in_hands(src))) user.put_in_active_hand(case) @@ -34,9 +34,9 @@ return -/obj/item/weapon/implantpad/attackby(obj/item/weapon/implantcase/C as obj, mob/user as mob) +/obj/item/implantpad/attackby(obj/item/implantcase/C as obj, mob/user as mob) ..() - if(istype(C, /obj/item/weapon/implantcase)) + if(istype(C, /obj/item/implantcase)) if(!( src.case )) user.drop_item() C.loc = src @@ -47,14 +47,14 @@ return -/obj/item/weapon/implantpad/attack_self(mob/user as mob) +/obj/item/implantpad/attack_self(mob/user as mob) user.set_machine(src) var/dat = "Implant Mini-Computer:
" if (src.case) if(src.case.imp) - if(istype(src.case.imp, /obj/item/weapon/implant)) + if(istype(src.case.imp, /obj/item/implant)) dat += src.case.imp.get_data() - if(istype(src.case.imp, /obj/item/weapon/implant/tracking)) + if(istype(src.case.imp, /obj/item/implant/tracking)) dat += {"ID (1-100): - - [case.imp:id] @@ -69,14 +69,14 @@ return -/obj/item/weapon/implantpad/Topic(href, href_list) +/obj/item/implantpad/Topic(href, href_list) ..() if (usr.stat) return if ((usr.contents.Find(src)) || ((in_range(src, usr) && istype(src.loc, /turf)))) usr.set_machine(src) if (href_list["tracking_id"]) - var/obj/item/weapon/implant/tracking/T = src.case.imp + var/obj/item/implant/tracking/T = src.case.imp T.id += text2num(href_list["tracking_id"]) T.id = min(1000, T.id) T.id = max(1, T.id) diff --git a/code/game/objects/items/weapons/implants/implantreagent_vr.dm b/code/game/objects/items/weapons/implants/implantreagent_vr.dm index 5642d1bfd60..2d624092325 100644 --- a/code/game/objects/items/weapons/implants/implantreagent_vr.dm +++ b/code/game/objects/items/weapons/implants/implantreagent_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/implant/reagent_generator +/obj/item/implant/reagent_generator name = "reagent generator implant" desc = "This is an implant that has attached storage and generates a reagent." implant_color = "r" @@ -17,26 +17,26 @@ var/verb_name = "Transfer From Reagent Implant" var/verb_desc = "Remove reagents from an internal reagent into a container" -/obj/item/weapon/implant/reagent_generator/New() +/obj/item/implant/reagent_generator/New() ..() create_reagents(usable_volume) -/obj/item/weapon/implanter/reagent_generator - var/implant_type = /obj/item/weapon/implant/reagent_generator +/obj/item/implanter/reagent_generator + var/implant_type = /obj/item/implant/reagent_generator -/obj/item/weapon/implanter/reagent_generator/New() +/obj/item/implanter/reagent_generator/New() ..() imp = new implant_type(src) update() return -/obj/item/weapon/implant/reagent_generator/post_implant(mob/living/carbon/source) +/obj/item/implant/reagent_generator/post_implant(mob/living/carbon/source) START_PROCESSING(SSobj, src) to_chat(source, "You implant [source] with \the [src].") assigned_proc = new assigned_proc(source, verb_name, verb_desc) return 1 -/obj/item/weapon/implant/reagent_generator/process() +/obj/item/implant/reagent_generator/process() var/before_gen if(isliving(imp_in) && generated_reagents) before_gen = reagents.total_volume @@ -56,7 +56,7 @@ else if(reagents.total_volume == reagents.maximum_volume && before_gen < reagents.maximum_volume) to_chat(imp_in, "[pick(full_message)]") -/obj/item/weapon/implant/reagent_generator/proc/do_generation(var/mob/living/L) +/obj/item/implant/reagent_generator/proc/do_generation(var/mob/living/L) L.adjust_nutrition(-gen_cost) for(var/reagent in generated_reagents) reagents.add_reagent(reagent, generated_reagents[reagent]) @@ -76,16 +76,16 @@ if(user.incapacitated() || user.stat > CONSCIOUS) return - var/obj/item/weapon/reagent_containers/container = user.get_active_hand() + var/obj/item/reagent_containers/container = user.get_active_hand() if(!container) to_chat(user,"You need an open container to do this!") return - var/obj/item/weapon/implant/reagent_generator/rimplant + var/obj/item/implant/reagent_generator/rimplant for(var/obj/item/organ/external/E in organs) - for(var/obj/item/weapon/implant/I in E.implants) - if(istype(I, /obj/item/weapon/implant/reagent_generator)) + for(var/obj/item/implant/I in E.implants) + if(istype(I, /obj/item/implant/reagent_generator)) rimplant = I break if(rimplant) diff --git a/code/game/objects/items/weapons/implants/implantrestrainingbolt.dm b/code/game/objects/items/weapons/implants/implantrestrainingbolt.dm index 7f4a562297c..b2776dd48d4 100644 --- a/code/game/objects/items/weapons/implants/implantrestrainingbolt.dm +++ b/code/game/objects/items/weapons/implants/implantrestrainingbolt.dm @@ -1,5 +1,5 @@ -/obj/item/weapon/implant/restrainingbolt +/obj/item/implant/restrainingbolt name = "\improper restraining bolt" icon = 'icons/obj/device.dmi' icon_state = "implant" diff --git a/code/game/objects/items/weapons/implants/implantuplink.dm b/code/game/objects/items/weapons/implants/implantuplink.dm index 6ee094aeded..78d90e6727f 100644 --- a/code/game/objects/items/weapons/implants/implantuplink.dm +++ b/code/game/objects/items/weapons/implants/implantuplink.dm @@ -1,9 +1,9 @@ -/obj/item/weapon/implant/uplink +/obj/item/implant/uplink name = "uplink" desc = "Summon things." var/activation_emote = "chuckle" -/obj/item/weapon/implant/uplink/New() +/obj/item/implant/uplink/New() activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink") hidden_uplink = new(src) //hidden_uplink.uses = 5 @@ -11,7 +11,7 @@ ..() return -/obj/item/weapon/implant/uplink/post_implant(mob/source) +/obj/item/implant/uplink/post_implant(mob/source) var/choices = list("blink", "blink_r", "eyebrow", "chuckle", "twitch", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink") activation_emote = tgui_input_list(usr, "Choose activation emote. If you cancel this, one will be picked at random.", "Implant Activation", choices) if(!activation_emote) @@ -19,7 +19,7 @@ source.mind.store_memory("Uplink implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", 0, 0) to_chat(source, "The implanted uplink implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.") -/obj/item/weapon/implant/uplink/trigger(emote, mob/source as mob) +/obj/item/implant/uplink/trigger(emote, mob/source as mob) if(hidden_uplink && usr == source) // Let's not have another people activate our uplink hidden_uplink.check_trigger(source, emote, activation_emote) return \ No newline at end of file diff --git a/code/game/objects/items/weapons/implants/neuralbasic.dm b/code/game/objects/items/weapons/implants/neuralbasic.dm index 5743640aa8f..74d14a25d14 100644 --- a/code/game/objects/items/weapons/implants/neuralbasic.dm +++ b/code/game/objects/items/weapons/implants/neuralbasic.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/implant/neural +/obj/item/implant/neural name = "neural framework implant" desc = "A small metal casing with numerous wires stemming off of it." initialize_loc = BP_HEAD @@ -6,7 +6,7 @@ var/target_state = null var/robotic_brain = FALSE -/obj/item/weapon/implant/neural/post_implant(var/mob/source) +/obj/item/implant/neural/post_implant(var/mob/source) if(ishuman(source)) var/mob/living/carbon/human/H = source if(H.species.has_organ[O_BRAIN]) @@ -19,7 +19,7 @@ if(istype(my_brain) && my_brain.can_assist()) START_PROCESSING(SSobj, src) -/obj/item/weapon/implant/neural/Destroy() +/obj/item/implant/neural/Destroy() if(my_brain) if(my_brain.owner) to_chat(my_brain.owner, "You feel a pressure in your mind as something is ripped away.") @@ -27,14 +27,14 @@ my_brain = null return ..() -/obj/item/weapon/implant/neural/process() +/obj/item/implant/neural/process() if(my_brain && part) if(my_brain.loc != part.loc) to_chat(my_brain.owner, "You feel a pressure in your mind as something is ripped away.") meltdown() return 1 -/obj/item/weapon/implant/neural/get_data() +/obj/item/implant/neural/get_data() var/dat = {"Implant Specifications:
Name: Neural Framework Implant
Life: Duration of Brain Function
@@ -50,7 +50,7 @@ circuitry. Resulting faults can cause damage to the host's brain.
Implant Specifics:
"} return dat -/obj/item/weapon/implant/neural/emp_act(severity) +/obj/item/implant/neural/emp_act(severity) if(!my_brain) return if(malfunction) //Don't malfunction while malfunctioning. @@ -91,7 +91,7 @@ Implant Specifics:
"} spawn(delay) malfunction-- -/obj/item/weapon/implant/neural/meltdown() +/obj/item/implant/neural/meltdown() ..() STOP_PROCESSING(SSobj, src) var/mob/living/carbon/human/H = null diff --git a/code/game/objects/items/weapons/improvised_components.dm b/code/game/objects/items/weapons/improvised_components.dm index 5add8778600..7fe037330a8 100644 --- a/code/game/objects/items/weapons/improvised_components.dm +++ b/code/game/objects/items/weapons/improvised_components.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/material/butterflyconstruction +/obj/item/material/butterflyconstruction name = "unfinished concealed knife" desc = "An unfinished concealed knife, it looks like the screws need to be tightened." icon = 'icons/obj/buildingobject.dmi' @@ -6,15 +6,15 @@ force_divisor = 0.1 thrown_force_divisor = 0.1 -/obj/item/weapon/material/butterflyconstruction/attackby(obj/item/W as obj, mob/user as mob) +/obj/item/material/butterflyconstruction/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_SCREWDRIVER)) to_chat(user, "You finish the concealed blade weapon.") playsound(src, W.usesound, 50, 1) - new /obj/item/weapon/material/butterfly(user.loc, material.name) + new /obj/item/material/butterfly(user.loc, material.name) qdel(src) return -/obj/item/weapon/material/butterflyblade +/obj/item/material/butterflyblade name = "knife blade" desc = "A knife blade. Unusable as a weapon without a grip." icon = 'icons/obj/buildingobject.dmi' @@ -22,7 +22,7 @@ force_divisor = 0.1 thrown_force_divisor = 0.1 -/obj/item/weapon/material/butterflyhandle +/obj/item/material/butterflyhandle name = "concealed knife grip" desc = "A plasteel grip with screw fittings for a blade." icon = 'icons/obj/buildingobject.dmi' @@ -30,11 +30,11 @@ force_divisor = 0.1 thrown_force_divisor = 0.1 -/obj/item/weapon/material/butterflyhandle/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/material/butterflyblade)) - var/obj/item/weapon/material/butterflyblade/B = W +/obj/item/material/butterflyhandle/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W,/obj/item/material/butterflyblade)) + var/obj/item/material/butterflyblade/B = W to_chat(user, "You attach the two concealed blade parts.") - new /obj/item/weapon/material/butterflyconstruction(user.loc, B.material.name) + new /obj/item/material/butterflyconstruction(user.loc, B.material.name) qdel(W) qdel(src) return diff --git a/code/game/objects/items/weapons/inducer_vr.dm b/code/game/objects/items/weapons/inducer_vr.dm index b0519abce87..d4f105e4092 100644 --- a/code/game/objects/items/weapons/inducer_vr.dm +++ b/code/game/objects/items/weapons/inducer_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/inducer +/obj/item/inducer name = "industrial inducer" desc = "A tool for inductively charging internal power cells." icon = 'icons/obj/tools_vr.dmi' @@ -11,45 +11,45 @@ force = 7 var/powertransfer = 1000 //Transfer per time when charging something - var/cell_type = /obj/item/weapon/cell/high //Type of cell to spawn in it + var/cell_type = /obj/item/cell/high //Type of cell to spawn in it var/charge_guns = FALSE //Can it charge guns? var/datum/effect/effect/system/spark_spread/spark_system - var/obj/item/weapon/cell/cell + var/obj/item/cell/cell var/recharging = FALSE var/opened = FALSE -/obj/item/weapon/inducer/unloaded +/obj/item/inducer/unloaded cell_type = null opened = TRUE -/obj/item/weapon/inducer/Initialize() +/obj/item/inducer/Initialize() . = ..() if(!cell && cell_type) cell = new cell_type -/obj/item/weapon/inducer/proc/induce(var/obj/item/weapon/cell/target, coefficient) +/obj/item/inducer/proc/induce(var/obj/item/cell/target, coefficient) var/totransfer = min(cell.charge,(powertransfer * coefficient)) var/transferred = target.give(totransfer) cell.use(transferred) cell.update_icon() target.update_icon() -/obj/item/weapon/inducer/get_cell() +/obj/item/inducer/get_cell() return cell -/obj/item/weapon/inducer/emp_act(severity) +/obj/item/inducer/emp_act(severity) . = ..() if(cell) cell.emp_act(severity) -/obj/item/weapon/inducer/attack(mob/living/M, mob/living/user) +/obj/item/inducer/attack(mob/living/M, mob/living/user) if(user.a_intent == I_HURT) return ..() else return 0 //No accidental bludgeons! -/obj/item/weapon/inducer/afterattack(atom/A, mob/living/carbon/user, proximity) +/obj/item/inducer/afterattack(atom/A, mob/living/carbon/user, proximity) if(user.a_intent == I_HURT) return ..() @@ -61,7 +61,7 @@ return ..() -/obj/item/weapon/inducer/proc/cantbeused(mob/user) +/obj/item/inducer/proc/cantbeused(mob/user) if(!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to use [src]!") return TRUE @@ -76,7 +76,7 @@ return FALSE -/obj/item/weapon/inducer/attackby(obj/item/W, mob/user) +/obj/item/inducer/attackby(obj/item/W, mob/user) if(W.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, W.usesound, 50, 1) if(!opened) @@ -89,7 +89,7 @@ opened = FALSE update_icon() return - if(istype(W, /obj/item/weapon/cell)) + if(istype(W, /obj/item/cell)) if(opened) if(!cell) user.drop_from_inventory(W) @@ -110,7 +110,7 @@ return ..() -/obj/item/weapon/inducer/proc/recharge(atom/movable/A, mob/user) +/obj/item/inducer/proc/recharge(atom/movable/A, mob/user) if(!isturf(A) && user.loc == A) return FALSE if(recharging) @@ -118,19 +118,19 @@ else recharging = TRUE - if(istype(A, /obj/item/weapon/gun/energy) && !charge_guns) + if(istype(A, /obj/item/gun/energy) && !charge_guns) to_chat(user, "Error: Device is unable to interface with weapons.") recharging = FALSE return FALSE //The cell we hopefully eventually find - var/obj/item/weapon/cell/C + var/obj/item/cell/C //Synthetic humanoids if(ishuman(A)) var/mob/living/carbon/human/H = A if(H.isSynthetic()) - C = new /obj/item/weapon/cell/standin(null, H) // o o f + C = new /obj/item/cell/standin(null, H) // o o f //Borg frienbs else if(isrobot(A)) @@ -188,7 +188,7 @@ recharging = FALSE -/obj/item/weapon/inducer/attack_self(mob/user) +/obj/item/inducer/attack_self(mob/user) if(opened && cell) user.visible_message("[user] removes [cell] from [src]!", "You remove [cell].") cell.update_icon() @@ -196,7 +196,7 @@ cell = null update_icon() -/obj/item/weapon/inducer/examine(mob/living/M) +/obj/item/inducer/examine(mob/living/M) . = ..() if(cell) . += "Its display shows: [round(cell.charge)] / [cell.maxcharge]." @@ -205,7 +205,7 @@ if(opened) . += "Its battery compartment is open." -/obj/item/weapon/inducer/update_icon() +/obj/item/inducer/update_icon() ..() cut_overlays() if(opened) @@ -215,7 +215,7 @@ add_overlay("inducer-bat") //////// Variants -/obj/item/weapon/inducer/sci +/obj/item/inducer/sci name = "inducer" desc = "A tool for inductively charging internal power cells. This one has a science color scheme, and is less potent than its engineering counterpart." icon_state = "inducer-sci" @@ -224,31 +224,31 @@ powertransfer = 500 opened = TRUE -/obj/item/weapon/inducer/sci/Initialize() +/obj/item/inducer/sci/Initialize() . = ..() update_icon() //To get the 'open' state applied -/obj/item/weapon/inducer/syndicate +/obj/item/inducer/syndicate name = "suspicious inducer" desc = "A tool for inductively charging internal power cells. This one has a suspicious colour scheme, and seems to be rigged to transfer charge at a much faster rate." icon_state = "inducer-syndi" item_state = "inducer-syndi" powertransfer = 2000 - cell_type = /obj/item/weapon/cell/super + cell_type = /obj/item/cell/super charge_guns = TRUE -/obj/item/weapon/inducer/hybrid +/obj/item/inducer/hybrid name = "hybrid-tech inducer" desc = "A tool for inductively charging internal power cells. This one has some flashy bits and recharges devices slower, but seems to recharge itself between uses." icon_state = "inducer-hybrid" item_state = "inducer-hybrid" powertransfer = 250 - cell_type = /obj/item/weapon/cell/void + cell_type = /obj/item/cell/void charge_guns = TRUE // A 'human stand-in' cell for recharging 'nutrition' on synthetic humans (wow this is terrible! \o/) #define NUTRITION_COEFF 0.05 // 1000 charge = 50 nutrition at 0.05 -/obj/item/weapon/cell/standin +/obj/item/cell/standin name = "don't spawn this" desc = "this is for weird code use, don't spawn it!!!" @@ -257,7 +257,7 @@ var/mob/living/carbon/human/hume -/obj/item/weapon/cell/standin/New(newloc, var/mob/living/carbon/human/H) +/obj/item/cell/standin/New(newloc, var/mob/living/carbon/human/H) ..() hume = H charge = H.nutrition @@ -266,7 +266,7 @@ QDEL_IN(src, 20 SECONDS) -/obj/item/weapon/cell/standin/give(var/amount) +/obj/item/cell/standin/give(var/amount) . = ..(amount * NUTRITION_COEFF) //Shrink amount to store hume.adjust_nutrition(.) //Add the amount we really stored . /= NUTRITION_COEFF //Inflate amount to take from the giver diff --git a/code/game/objects/items/weapons/joke.dm b/code/game/objects/items/weapons/joke.dm index 008e3ec7203..feba68dbc72 100644 --- a/code/game/objects/items/weapons/joke.dm +++ b/code/game/objects/items/weapons/joke.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/squishhammer +/obj/item/squishhammer name = "The Short Stacker" desc = "Wield the power of this weapon with responsibility (God knows you won't)." icon = 'icons/obj/items.dmi' @@ -8,7 +8,7 @@ throwforce = 0 // Attack mob -/obj/item/weapon/squishhammer/attack(mob/M as mob, mob/user as mob) +/obj/item/squishhammer/attack(mob/M as mob, mob/user as mob) var/is_squished = M.tf_scale_x || M.tf_scale_y playsound(src, 'sound/items/hooh.ogg', 50, 1) if(!is_squished) diff --git a/code/game/objects/items/weapons/keys.dm b/code/game/objects/items/weapons/keys.dm index fc134497673..cc275ebd514 100644 --- a/code/game/objects/items/weapons/keys.dm +++ b/code/game/objects/items/weapons/keys.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/simple_key +/obj/item/simple_key name = "key" desc = "A plain, old-timey key, as one might use to unlock a door." icon = 'icons/obj/keys.dmi' diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 5f6362c4de3..1e2f22391ac 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -1,19 +1,19 @@ /*********************MANUALS (BOOKS)***********************/ -/obj/item/weapon/book/manual +/obj/item/book/manual icon = 'icons/obj/library.dmi' due_date = 0 // Game time in 1/10th seconds unique = 1 // 0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified -/obj/item/weapon/book/manual/engineering_construction +/obj/item/book/manual/engineering_construction name = "Station Repairs and Construction" icon_state ="bookEngineering" item_state = "book3" author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "Station Repairs and Construction" -/obj/item/weapon/book/manual/engineering_construction/New() +/obj/item/book/manual/engineering_construction/New() ..() dat = {" @@ -28,14 +28,14 @@ "} -/obj/item/weapon/book/manual/engineering_particle_accelerator +/obj/item/book/manual/engineering_particle_accelerator name = "Particle Accelerator User's Guide" icon_state ="bookParticleAccelerator" item_state = "book15" author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "Particle Accelerator User's Guide" -/obj/item/weapon/book/manual/engineering_particle_accelerator/New() +/obj/item/book/manual/engineering_particle_accelerator/New() ..() dat = {" @@ -76,14 +76,14 @@ "} -/obj/item/weapon/book/manual/supermatter_engine +/obj/item/book/manual/supermatter_engine name = "Supermatter Engine Operating Manual" icon_state = "bookSupermatter" item_state = "book15" author = "Central Engineering Division" title = "Supermatter Engine Operating Manual" -/obj/item/weapon/book/manual/supermatter_engine/New() +/obj/item/book/manual/supermatter_engine/New() ..() dat = {" @@ -162,7 +162,7 @@ // TESLA Engine -/obj/item/weapon/book/manual/tesla_engine +/obj/item/book/manual/tesla_engine name = "Tesla Operating Manual" icon_state ="bookTesla" item_state = "book15" @@ -232,14 +232,14 @@ "} //R-UST port -/obj/item/weapon/book/manual/rust_engine +/obj/item/book/manual/rust_engine name = "R-UST Operating Manual" icon_state = "bookSupermatter" item_state = "book15" author = "Cindy Crawfish" title = "R-UST Operating Manual" -/obj/item/weapon/book/manual/rust_engine/New() +/obj/item/book/manual/rust_engine/New() ..() dat = {" @@ -273,14 +273,14 @@ "} -/obj/item/weapon/book/manual/engineering_hacking +/obj/item/book/manual/engineering_hacking name = "Hacking" icon_state ="bookHacking" item_state = "book2" author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "Hacking" -/obj/item/weapon/book/manual/engineering_hacking/New() +/obj/item/book/manual/engineering_hacking/New() ..() dat = {" @@ -296,7 +296,7 @@ "} -/obj/item/weapon/book/manual/engineering_singularity_safety +/obj/item/book/manual/engineering_singularity_safety name = "Singularity Safety in Special Circumstances" icon_state ="bookEngineeringSingularitySafety" item_state = "book15" @@ -349,7 +349,7 @@ "} -/obj/item/weapon/book/manual/hydroponics_pod_people +/obj/item/book/manual/hydroponics_pod_people name = "The Diona Harvest - From Seed to Market" icon_state ="bookHydroponicsPodPeople" item_state = "book5" @@ -388,7 +388,7 @@ "} -/obj/item/weapon/book/manual/medical_cloning +/obj/item/book/manual/medical_cloning name = "Cloning Techniques of the 24th Century" icon_state ="bookCloning" item_state = "book9" @@ -482,7 +482,7 @@ "} -/obj/item/weapon/book/manual/ripley_build_and_repair +/obj/item/book/manual/ripley_build_and_repair name = "APLU \"Ripley\" Construction and Operation Manual" icon_state ="book" item_state = "book" @@ -560,7 +560,7 @@ "} -/obj/item/weapon/book/manual/research_and_development +/obj/item/book/manual/research_and_development name = "Research and Development 101" icon_state = "rdbook" item_state = "book7" @@ -629,14 +629,14 @@ "} -/obj/item/weapon/book/manual/robotics_manual +/obj/item/book/manual/robotics_manual name = "Guide to Robotics" icon_state ="evabook" item_state = "book3" author = "Simple Robotics" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "Guide to Robotics" -/obj/item/weapon/book/manual/robotics_manual/New() +/obj/item/book/manual/robotics_manual/New() ..() dat = {" @@ -647,7 +647,7 @@ "} -/obj/item/weapon/book/manual/robotics_cyborgs +/obj/item/book/manual/robotics_cyborgs name = JOB_CYBORG + "s for Dummies" icon_state = "borgbook" item_state = "book1" @@ -853,7 +853,7 @@ "} -/obj/item/weapon/book/manual/security_space_law +/obj/item/book/manual/security_space_law name = "Corporate Regulations" desc = "A set of corporate guidelines for keeping law and order on privately-owned space stations." icon_state = "bookSpaceLaw" @@ -861,7 +861,7 @@ author = "The Company" title = "Corporate Regulations" -/obj/item/weapon/book/manual/security_space_law/New() +/obj/item/book/manual/security_space_law/New() ..() dat = {" @@ -878,7 +878,7 @@ -/obj/item/weapon/book/manual/medical_diagnostics_manual +/obj/item/book/manual/medical_diagnostics_manual name = "Medical Diagnostics Manual" desc = "First, do no harm. A detailed medical practitioner's guide." icon_state = "bookMedical" @@ -886,7 +886,7 @@ author = "Medical Department" title = "Medical Diagnostics Manual" -/obj/item/weapon/book/manual/medical_diagnostics_manual/New() +/obj/item/book/manual/medical_diagnostics_manual/New() ..() dat = {" @@ -927,14 +927,14 @@ "} -/obj/item/weapon/book/manual/engineering_guide +/obj/item/book/manual/engineering_guide name = "Engineering Textbook" icon_state ="bookEngineering2" item_state = "book3" author = "Engineering Encyclopedia" title = "Engineering Textbook" -/obj/item/weapon/book/manual/engineering_guide/New() +/obj/item/book/manual/engineering_guide/New() ..() dat = {" @@ -949,7 +949,7 @@ "} -/obj/item/weapon/book/manual/chef_recipes +/obj/item/book/manual/chef_recipes name = JOB_CHEF + " Recipes" icon_state = "cooked_book" item_state = "book16" @@ -1009,7 +1009,7 @@ "} -/obj/item/weapon/book/manual/barman_recipes +/obj/item/book/manual/barman_recipes name = "Barman Recipes" desc = "For the enterprising drink server." icon_state = "barbook" @@ -1066,7 +1066,7 @@ "} -/obj/item/weapon/book/manual/detective +/obj/item/book/manual/detective name = "The Film Noir: Proper Procedures for Investigations" icon_state ="bookDetective" item_state = "book8" @@ -1110,7 +1110,7 @@ "} -/obj/item/weapon/book/manual/nuclear +/obj/item/book/manual/nuclear name = "Fission Mailed: Nuclear Sabotage 101" icon_state ="bookNuclear" item_state = "book8" @@ -1162,7 +1162,7 @@ "} -/obj/item/weapon/book/manual/atmospipes +/obj/item/book/manual/atmospipes name = "Pipes and You: Getting To Know Your Scary Tools" icon_state = "pipingbook" item_state = "book3" @@ -1271,7 +1271,7 @@ "} -/obj/item/weapon/book/manual/evaguide +/obj/item/book/manual/evaguide name = "EVA Gear and You: Not Spending All Day Inside, 2nd Edition" icon_state = "evabook" item_state = "book14" @@ -1397,7 +1397,7 @@ "} -/obj/item/weapon/book/manual/virology +/obj/item/book/manual/virology name = "Sneezes and Coughs: A Guide To Virology, 1st Edition" icon_state = "bookvirology" item_state = "book5" diff --git a/code/game/objects/items/weapons/manuals_vr.dm b/code/game/objects/items/weapons/manuals_vr.dm index 1325a0e1ca7..563e49df9fa 100644 --- a/code/game/objects/items/weapons/manuals_vr.dm +++ b/code/game/objects/items/weapons/manuals_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/book/manual/standard_operating_procedure +/obj/item/book/manual/standard_operating_procedure name = "Standard Operating Procedure" desc = "A set of corporate guidelines for keeping space stations running smoothly." icon_state = "sop" @@ -6,7 +6,7 @@ author = "NanoTrasen" title = "Standard Operating Procedure" -/obj/item/weapon/book/manual/standard_operating_procedure/New() +/obj/item/book/manual/standard_operating_procedure/New() ..() dat = {" @@ -21,7 +21,7 @@ "} -/obj/item/weapon/book/manual/command_guide +/obj/item/book/manual/command_guide name = "The Chain of Command" desc = "A set of corporate guidelines outlining the entire command structure of NanoTrasen from top to bottom." icon_state = "commandGuide" @@ -29,7 +29,7 @@ author = "Jeremiah Acacius" title = "Corporate Regulations" -/obj/item/weapon/book/manual/command_guide/New() +/obj/item/book/manual/command_guide/New() ..() dat = {" @@ -45,7 +45,7 @@ "} //accurate as of 2/17/21 Extra credit to document editting and proofreading editing to Luna -/obj/item/weapon/book/manual/cook_guide +/obj/item/book/manual/cook_guide name = "Food for Dummies 2" desc = "A helpful guide to the world of cooking." icon_state = "cook-guide" @@ -53,7 +53,7 @@ author = "Ali Big" title = "Food for Dummies 2" -/obj/item/weapon/book/manual/cook_guide/New() +/obj/item/book/manual/cook_guide/New() ..() dat = {" @@ -129,7 +129,7 @@ "} //accurate as of 2/23/21 -/obj/item/weapon/book/manual/bar_guide +/obj/item/book/manual/bar_guide name = "How to Alcohol (And other Drinks)" desc = "A helpful guide to the world of barkeeping." icon_state = "bar-guide" @@ -137,7 +137,7 @@ author = "Ali Big" title = "How to Alcohol (And other Drinks)" -/obj/item/weapon/book/manual/bar_guide/New() +/obj/item/book/manual/bar_guide/New() ..() dat = {" @@ -343,14 +343,14 @@ "} -/obj/item/weapon/book/manual/rotary_electric_generator +/obj/item/book/manual/rotary_electric_generator name = "Rotary Electric Generator Manual" icon_state ="rulebook" item_state = "book15" author = "Engineering Encyclopedia" title = "Rotary Electric Generator Manual" -/obj/item/weapon/book/manual/rotary_electric_generator/New() +/obj/item/book/manual/rotary_electric_generator/New() ..() dat = {" @@ -440,14 +440,14 @@ "} -/obj/item/weapon/book/manual/synthetic_life +/obj/item/book/manual/synthetic_life name = "Synthetic Life: A Comprehensive Guide" desc = "The basc history of synthetic life as the galaxy knows it." icon_state = "evabook" author = "Pontifex Publishing" title = "Synthetics" -/obj/item/weapon/book/manual/synthetic_life/New() +/obj/item/book/manual/synthetic_life/New() ..() dat = {" diff --git a/code/game/objects/items/weapons/material/ashtray.dm b/code/game/objects/items/weapons/material/ashtray.dm index 3e0fd832278..47d8dcc6dd0 100644 --- a/code/game/objects/items/weapons/material/ashtray.dm +++ b/code/game/objects/items/weapons/material/ashtray.dm @@ -1,6 +1,6 @@ var/global/list/ashtray_cache = list() -/obj/item/weapon/material/ashtray +/obj/item/material/ashtray name = "ashtray" icon = 'icons/obj/objects.dmi' icon_state = "blank" @@ -11,7 +11,7 @@ var/global/list/ashtray_cache = list() var/image/base_image var/max_butts = 10 -/obj/item/weapon/material/ashtray/New(var/newloc, var/material_name) +/obj/item/material/ashtray/New(var/newloc, var/material_name) ..(newloc, material_name) if(!material) qdel(src) @@ -21,7 +21,7 @@ var/global/list/ashtray_cache = list() update_icon() return -/obj/item/weapon/material/ashtray/update_icon() +/obj/item/material/ashtray/update_icon() color = null cut_overlays() var/cache_key = "base-[material.name]" @@ -44,10 +44,10 @@ var/global/list/ashtray_cache = list() else desc = "An ashtray made of [material.display_name]." -/obj/item/weapon/material/ashtray/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/material/ashtray/attackby(obj/item/W as obj, mob/user as mob) if (health <= 0) return - if (istype(W,/obj/item/trash/cigbutt) || istype(W,/obj/item/clothing/mask/smokable/cigarette) || istype(W, /obj/item/weapon/flame/match)) + if (istype(W,/obj/item/trash/cigbutt) || istype(W,/obj/item/clothing/mask/smokable/cigarette) || istype(W, /obj/item/flame/match)) if (contents.len >= max_butts) to_chat(user, "\The [src] is full.") return @@ -80,7 +80,7 @@ var/global/list/ashtray_cache = list() shatter() return -/obj/item/weapon/material/ashtray/throw_impact(atom/hit_atom) +/obj/item/material/ashtray/throw_impact(atom/hit_atom) if (health > 0) health = max(0,health - 3) if (contents.len) @@ -93,11 +93,11 @@ var/global/list/ashtray_cache = list() update_icon() return ..() -/obj/item/weapon/material/ashtray/plastic/New(var/newloc) +/obj/item/material/ashtray/plastic/New(var/newloc) ..(newloc, "plastic") -/obj/item/weapon/material/ashtray/bronze/New(var/newloc) +/obj/item/material/ashtray/bronze/New(var/newloc) ..(newloc, "bronze") -/obj/item/weapon/material/ashtray/glass/New(var/newloc) +/obj/item/material/ashtray/glass/New(var/newloc) ..(newloc, "glass") diff --git a/code/game/objects/items/weapons/material/bats.dm b/code/game/objects/items/weapons/material/bats.dm index c625e948bbb..4e8c599ab11 100644 --- a/code/game/objects/items/weapons/material/bats.dm +++ b/code/game/objects/items/weapons/material/bats.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/material/twohanded/baseballbat +/obj/item/material/twohanded/baseballbat name = "bat" desc = "HOME RUN!" icon_state = "metalbat0" @@ -13,17 +13,17 @@ slot_flags = SLOT_BACK //Predefined materials go here. -/obj/item/weapon/material/twohanded/baseballbat/metal/New(var/newloc) +/obj/item/material/twohanded/baseballbat/metal/New(var/newloc) ..(newloc,"steel") -/obj/item/weapon/material/twohanded/baseballbat/uranium/New(var/newloc) +/obj/item/material/twohanded/baseballbat/uranium/New(var/newloc) ..(newloc,"uranium") -/obj/item/weapon/material/twohanded/baseballbat/gold/New(var/newloc) +/obj/item/material/twohanded/baseballbat/gold/New(var/newloc) ..(newloc,"gold") -/obj/item/weapon/material/twohanded/baseballbat/platinum/New(var/newloc) +/obj/item/material/twohanded/baseballbat/platinum/New(var/newloc) ..(newloc,"platinum") -/obj/item/weapon/material/twohanded/baseballbat/diamond/New(var/newloc) +/obj/item/material/twohanded/baseballbat/diamond/New(var/newloc) ..(newloc,"diamond") \ No newline at end of file diff --git a/code/game/objects/items/weapons/material/chainsaw.dm b/code/game/objects/items/weapons/material/chainsaw.dm index f64b41d7f0b..787786136e4 100644 --- a/code/game/objects/items/weapons/material/chainsaw.dm +++ b/code/game/objects/items/weapons/material/chainsaw.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/chainsaw +/obj/item/chainsaw name = "chainsaw" desc = "Vroom vroom." icon_state = "chainsaw0" @@ -12,7 +12,7 @@ var/active_force = 55 var/inactive_force = 10 -/obj/item/weapon/chainsaw/Initialize() +/obj/item/chainsaw/Initialize() var/datum/reagents/R = new/datum/reagents(max_fuel) reagents = R R.my_atom = src @@ -20,13 +20,13 @@ START_PROCESSING(SSobj, src) . = ..() -/obj/item/weapon/chainsaw/Destroy() +/obj/item/chainsaw/Destroy() STOP_PROCESSING(SSobj, src) if(reagents) qdel(reagents) ..() -/obj/item/weapon/chainsaw/proc/turnOn(mob/user as mob) +/obj/item/chainsaw/proc/turnOn(mob/user as mob) if(on) return visible_message("You start pulling the string on \the [src].", "[usr] starts pulling the string on the [src].") @@ -49,7 +49,7 @@ else to_chat(user, "You fumble with the string.") -/obj/item/weapon/chainsaw/proc/turnOff(mob/user as mob) +/obj/item/chainsaw/proc/turnOff(mob/user as mob) if(!on) return to_chat(user, "You switch the gas nozzle on the chainsaw, turning it off.") attack_verb = list("bluntly hit", "beat", "knocked") @@ -60,13 +60,13 @@ on = 0 update_icon() -/obj/item/weapon/chainsaw/attack_self(mob/user as mob) +/obj/item/chainsaw/attack_self(mob/user as mob) if(!on) turnOn(user) else turnOff(user) -/obj/item/weapon/chainsaw/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) +/obj/item/chainsaw/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) if(!proximity) return ..() if(on) @@ -98,7 +98,7 @@ else to_chat(user, "Don't move while you're refilling the chainsaw.") -/obj/item/weapon/chainsaw/process() +/obj/item/chainsaw/process() if(!on) return if(on) @@ -109,15 +109,15 @@ to_chat(usr, "\The [src] sputters to a stop!") turnOff() -/obj/item/weapon/chainsaw/proc/get_fuel() +/obj/item/chainsaw/proc/get_fuel() return reagents.get_reagent_amount("fuel") -/obj/item/weapon/chainsaw/examine(mob/user) +/obj/item/chainsaw/examine(mob/user) . = ..() if(max_fuel && get_dist(user, src) == 0) . += "The [src] feels like it contains roughtly [get_fuel()] units of fuel left." -/obj/item/weapon/chainsaw/update_icon() +/obj/item/chainsaw/update_icon() if(on) icon_state = "chainsaw1" item_state = "chainsaw1" diff --git a/code/game/objects/items/weapons/material/foam.dm b/code/game/objects/items/weapons/material/foam.dm index a16d81920f8..2614bf2e8d6 100644 --- a/code/game/objects/items/weapons/material/foam.dm +++ b/code/game/objects/items/weapons/material/foam.dm @@ -1,21 +1,21 @@ -/obj/item/weapon/material/twohanded/baseballbat/foam/New(var/newloc) +/obj/item/material/twohanded/baseballbat/foam/New(var/newloc) ..(newloc,"foam") -/obj/item/weapon/material/sword/foam +/obj/item/material/sword/foam attack_verb = list("bonked","whacked") force_divisor = 0 unbreakable = 1 -/obj/item/weapon/material/twohanded/baseballbat/foam +/obj/item/material/twohanded/baseballbat/foam attack_verb = list("bonked","whacked") force_wielded = 0 force_divisor = 0 unbreakable = 1 -/obj/item/weapon/material/sword/foam/New(var/newloc) +/obj/item/material/sword/foam/New(var/newloc) ..(newloc,"foam") -/obj/item/weapon/material/twohanded/spear/foam +/obj/item/material/twohanded/spear/foam attack_verb = list("bonked","whacked") force_wielded = 0 force_divisor = 0 @@ -24,10 +24,10 @@ icon_state = "spear_mask0" unbreakable = 1 -/obj/item/weapon/material/twohanded/spear/foam/New(var/newloc) +/obj/item/material/twohanded/spear/foam/New(var/newloc) ..(newloc,"foam") -/obj/item/weapon/material/twohanded/fireaxe/foam +/obj/item/material/twohanded/fireaxe/foam attack_verb = list("bonked","whacked") force_wielded = 0 force_divisor = 0 @@ -36,8 +36,8 @@ icon_state = "fireaxe_mask0" unbreakable = 1 -/obj/item/weapon/material/twohanded/fireaxe/foam/New(var/newloc) +/obj/item/material/twohanded/fireaxe/foam/New(var/newloc) ..(newloc,"foam") -/obj/item/weapon/material/twohanded/fireaxe/foam/afterattack() +/obj/item/material/twohanded/fireaxe/foam/afterattack() return \ No newline at end of file diff --git a/code/game/objects/items/weapons/material/gravemarker.dm b/code/game/objects/items/weapons/material/gravemarker.dm index 0505e6a8e6f..16aa9b50db1 100644 --- a/code/game/objects/items/weapons/material/gravemarker.dm +++ b/code/game/objects/items/weapons/material/gravemarker.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/material/gravemarker +/obj/item/material/gravemarker name = "grave marker" desc = "An object used in marking graves." icon_state = "gravemarker" @@ -11,7 +11,7 @@ var/grave_name = "" //Name of the intended occupant var/epitaph = "" //A quick little blurb -/obj/item/weapon/material/gravemarker/attackby(obj/item/weapon/W, mob/user as mob) +/obj/item/material/gravemarker/attackby(obj/item/W, mob/user as mob) if(W.has_tool_quality(TOOL_SCREWDRIVER)) var/carving_1 = sanitizeSafe(tgui_input_text(user, "Who is \the [src.name] for?", "Gravestone Naming", null, MAX_NAME_LEN), MAX_NAME_LEN) if(carving_1) @@ -35,14 +35,14 @@ qdel(src) ..() -/obj/item/weapon/material/gravemarker/examine(mob/user) +/obj/item/material/gravemarker/examine(mob/user) . = ..() if(grave_name && get_dist(src, user) < 4) . += "Here Lies [grave_name]" if(epitaph && get_dist(src, user) < 2) . += epitaph -/obj/item/weapon/material/gravemarker/update_icon() +/obj/item/material/gravemarker/update_icon() if(icon_changes) if(grave_name && epitaph) icon_state = "[initial(icon_state)]_3" @@ -55,7 +55,7 @@ ..() -/obj/item/weapon/material/gravemarker/attack_self(mob/user) +/obj/item/material/gravemarker/attack_self(mob/user) src.add_fingerprint(user) if(!isturf(user.loc)) diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index b8ef0722f0c..db0d2d557d4 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -1,10 +1,10 @@ -/obj/item/weapon/material/kitchen +/obj/item/material/kitchen icon = 'icons/obj/kitchen.dmi' /* * Utensils */ -/obj/item/weapon/material/kitchen/utensil +/obj/item/material/kitchen/utensil drop_sound = 'sound/items/drop/knife.ogg' pickup_sound = 'sound/items/pickup/knife.ogg' w_class = ITEMSIZE_TINY @@ -21,13 +21,13 @@ var/list/food_inserted_micros -/obj/item/weapon/material/kitchen/utensil/Initialize() +/obj/item/material/kitchen/utensil/Initialize() . = ..() if (prob(60)) src.pixel_y = rand(0, 4) create_reagents(scoop_volume) -/obj/item/weapon/material/kitchen/utensil/Destroy() +/obj/item/material/kitchen/utensil/Destroy() if(food_inserted_micros) for(var/mob/M in food_inserted_micros) M.dropInto(loc) @@ -36,7 +36,7 @@ return -/obj/item/weapon/material/kitchen/utensil/update_icon() +/obj/item/material/kitchen/utensil/update_icon() . = ..() cut_overlays() if(loaded) @@ -44,7 +44,7 @@ I.color = loaded_color add_overlay(I) -/obj/item/weapon/material/kitchen/utensil/proc/load_food(var/mob/user, var/obj/item/weapon/reagent_containers/food/snacks/loading) +/obj/item/material/kitchen/utensil/proc/load_food(var/mob/user, var/obj/item/reagent_containers/food/snacks/loading) if (reagents.total_volume > 0) to_chat(user, SPAN_DANGER("There is already something on \the [src].")) return @@ -84,7 +84,7 @@ qdel(loading) update_icon() -/obj/item/weapon/material/kitchen/utensil/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/material/kitchen/utensil/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(!istype(M)) return ..() @@ -122,50 +122,50 @@ to_chat(user, SPAN_WARNING("You don't have anything on \the [src].")) //if we have help intent and no food scooped up DON'T STAB OURSELVES WITH THE FORK return -/obj/item/weapon/material/kitchen/utensil/on_rag_wipe() +/obj/item/material/kitchen/utensil/on_rag_wipe() . = ..() if(reagents.total_volume > 0) reagents.clear_reagents() cut_overlays() return -/obj/item/weapon/material/kitchen/utensil/container_resist(mob/living/M) +/obj/item/material/kitchen/utensil/container_resist(mob/living/M) if(food_inserted_micros) food_inserted_micros -= M M.forceMove(get_turf(src)) to_chat(M, "You climb off of \the [src].") -/obj/item/weapon/material/kitchen/utensil/fork +/obj/item/material/kitchen/utensil/fork name = "fork" desc = "It's a fork. Sure is pointy." icon_state = "fork" sharp = TRUE edge = FALSE -/obj/item/weapon/material/kitchen/utensil/fork/plastic +/obj/item/material/kitchen/utensil/fork/plastic default_material = "plastic" -/obj/item/weapon/material/kitchen/utensil/foon +/obj/item/material/kitchen/utensil/foon name = "foon" desc = "It's a foon. The forgotten cousin of the spork." icon_state = "foon" sharp = TRUE edge = FALSE -/obj/item/weapon/material/kitchen/utensil/foon/plastic +/obj/item/material/kitchen/utensil/foon/plastic default_material = "plastic" -/obj/item/weapon/material/kitchen/utensil/spork +/obj/item/material/kitchen/utensil/spork name = "spork" desc = "It's a spork. The (un)holy merger of a spoon and fork." icon_state = "spork" sharp = TRUE edge = FALSE -/obj/item/weapon/material/kitchen/utensil/spork/plastic +/obj/item/material/kitchen/utensil/spork/plastic default_material = "plastic" -/obj/item/weapon/material/kitchen/utensil/spoon +/obj/item/material/kitchen/utensil/spoon name = "spoon" desc = "It's a spoon. You can see your own upside-down face in it." icon_state = "spoon" @@ -174,7 +174,7 @@ sharp = FALSE force_divisor = 0.1 //2 when wielded with weight 20 (steel) -/obj/item/weapon/material/kitchen/utensil/spoon/plastic +/obj/item/material/kitchen/utensil/spoon/plastic default_material = "plastic" /* @@ -182,21 +182,21 @@ */ /* From the time of Clowns. Commented out for posterity, and sanity. -/obj/item/weapon/material/knife/attack(target as mob, mob/living/user as mob) +/obj/item/material/knife/attack(target as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) to_chat(user, "You accidentally cut yourself with \the [src].") user.take_organ_damage(20) return return ..() */ -/obj/item/weapon/material/knife/plastic +/obj/item/material/knife/plastic default_material = "plastic" /* * Rolling Pins */ -/obj/item/weapon/material/kitchen/rollingpin +/obj/item/material/kitchen/rollingpin name = "rolling pin" desc = "Used to knock out the " + JOB_BARTENDER+ "." icon_state = "rolling_pin" @@ -208,7 +208,7 @@ drop_sound = 'sound/items/drop/wooden.ogg' pickup_sound = 'sound/items/pickup/wooden.ogg' -/obj/item/weapon/material/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/material/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) to_chat(user, "\The [src] slips out of your hand and hits your head.") user.take_organ_damage(10) diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index 71a1e7577ba..b0439b4eaec 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/material/butterfly +/obj/item/material/butterfly name = "butterfly knife" desc = "A basic metal blade concealed in a lightweight plasteel grip. Small enough when folded to fit in a pocket." description_fluff = "This could be used to engrave messages on suitable surfaces if you really put your mind to it! Alt-click a floor or wall to engrave with it." //This way it's not a completely hidden, arcane art to engrave. @@ -13,7 +13,7 @@ drop_sound = 'sound/items/drop/knife.ogg' pickup_sound = 'sound/items/pickup/knife.ogg' -/obj/item/weapon/material/butterfly/update_force() +/obj/item/material/butterfly/update_force() if(active) edge = TRUE sharp = TRUE @@ -32,19 +32,19 @@ w_class = initial(w_class) attack_verb = initial(attack_verb) -/obj/item/weapon/material/butterfly/switchblade +/obj/item/material/butterfly/switchblade name = "switchblade" desc = "A classic switchblade with gold engraving. Just holding it makes you feel like a gangster." icon_state = "switchblade" -/obj/item/weapon/material/butterfly/boxcutter +/obj/item/material/butterfly/boxcutter name = "box cutter" desc = "A thin, inexpensive razor-blade knife designed to open cardboard boxes." icon_state = "boxcutter" force_divisor = 0.1 // 6 when wielded with hardness 60 (steel) thrown_force_divisor = 0.2 // 4 when thrown with weight 20 (steel) -/obj/item/weapon/material/butterfly/attack_self(mob/user) +/obj/item/material/butterfly/attack_self(mob/user) active = !active update_force() @@ -59,7 +59,7 @@ /* * Kitchen knives */ -/obj/item/weapon/material/knife +/obj/item/material/knife name = "kitchen knife" icon = 'icons/obj/kitchen.dmi' icon_state = "knife" @@ -74,7 +74,7 @@ drop_sound = 'sound/items/drop/knife.ogg' // These no longer inherit from hatchets. -/obj/item/weapon/material/knife/tacknife +/obj/item/material/knife/tacknife name = "tactical knife" desc = "You'd be killing loads of people if this was Medal of Valor: Heroes of Space." icon = 'icons/obj/weapons.dmi' @@ -84,7 +84,7 @@ attack_verb = list("stabbed", "chopped", "cut") applies_material_colour = 1 -/obj/item/weapon/material/knife/tacknife/combatknife +/obj/item/material/knife/tacknife/combatknife name = "combat knife" desc = "If only you had a boot to put it in." icon = 'icons/obj/weapons.dmi' @@ -97,7 +97,7 @@ // Identical to the tactical knife but nowhere near as stabby. // Kind of like the toy esword compared to the real thing. -/obj/item/weapon/material/knife/tacknife/boot +/obj/item/material/knife/tacknife/boot name = "boot knife" desc = "A small fixed-blade knife for putting inside a boot." icon = 'icons/obj/weapons.dmi' @@ -106,36 +106,36 @@ force_divisor = 0.15 applies_material_colour = 0 -/obj/item/weapon/material/knife/hook +/obj/item/material/knife/hook name = "meat hook" desc = "A sharp, metal hook what sticks into things." icon_state = "hook_knife" -/obj/item/weapon/material/knife/ritual +/obj/item/material/knife/ritual name = "ritual knife" desc = "The unearthly energies that once powered this blade are now dormant." icon = 'icons/obj/wizard.dmi' icon_state = "render" applies_material_colour = 0 -/obj/item/weapon/material/knife/table +/obj/item/material/knife/table name = "table knife" icon = 'icons/obj/kitchen.dmi' icon_state = "knife_table" sharp = FALSE // blunted tip force_divisor = 0.1 -/obj/item/weapon/material/knife/table/plastic +/obj/item/material/knife/table/plastic default_material = "plastic" -/obj/item/weapon/material/knife/butch +/obj/item/material/knife/butch name = "butcher's cleaver" icon_state = "cleaver" desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products." force_divisor = 0.25 // 15 when wielded with hardness 60 (steel) attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") -/obj/item/weapon/material/knife/machete +/obj/item/material/knife/machete name = "machete" desc = "A sharp machete often found in survival kits." icon_state = "machete" @@ -145,12 +145,12 @@ slot_flags = SLOT_BELT default_material = "plasteel" //VOREStation Edit -/obj/item/weapon/material/knife/machete/cyborg +/obj/item/material/knife/machete/cyborg name = "integrated machete" desc = "A sharp machete often found attached to robots." unbreakable = TRUE -/obj/item/weapon/material/knife/tacknife/survival +/obj/item/material/knife/tacknife/survival name = "survival knife" desc = "A hunting grade survival knife." icon = 'icons/obj/kitchen.dmi' @@ -160,7 +160,7 @@ default_material = "plasteel" //VOREStation Edit toolspeed = 2 // Use a real axe if you want to chop logs. -/obj/item/weapon/material/knife/stone +/obj/item/material/knife/stone name = "stone blade" desc = "A crude blade made by chipping away at a piece of flint." icon = 'icons/obj/weapons_vr.dmi' @@ -172,14 +172,14 @@ sharp = TRUE default_material = MAT_FLINT -/obj/item/weapon/material/knife/stone/wood +/obj/item/material/knife/stone/wood name = "stone knife" desc = "A crude blade of flint with a wooden handle, secured with plant fibers twined into sturdy ropes. Useful for cutting, stabbing, slicing, and even shearing." icon_state = "stone_wood_knife" dulled = FALSE fragile = FALSE -/obj/item/weapon/material/knife/stone/bone +/obj/item/material/knife/stone/bone name = "stone knife" desc = "A crude blade of flint with a bone handle, secured with plant fibers twined into sturdy ropes. Useful for cutting, stabbing, slicing, and even shearing." icon_state = "stone_bone_knife" diff --git a/code/game/objects/items/weapons/material/knives_vr.dm b/code/game/objects/items/weapons/material/knives_vr.dm index 45a52838b4c..4858480c414 100644 --- a/code/game/objects/items/weapons/material/knives_vr.dm +++ b/code/game/objects/items/weapons/material/knives_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/material/knife/machete/deluxe +/obj/item/material/knife/machete/deluxe name = "deluxe machete" desc = "A fine example of a machete, with a polished blade, wooden handle and a leather cord loop." icon = 'icons/obj/weapons_vr.dmi' diff --git a/code/game/objects/items/weapons/material/material_armor.dm b/code/game/objects/items/weapons/material/material_armor.dm index c9524bf48c3..942e952ec16 100644 --- a/code/game/objects/items/weapons/material/material_armor.dm +++ b/code/game/objects/items/weapons/material/material_armor.dm @@ -96,7 +96,7 @@ Protectiveness | Armor % var/mob/living/M = loc M.drop_from_inventory(src) if(material.shard_type == SHARD_SHARD) // Wearing glass armor is a bad idea. - var/obj/item/weapon/material/shard/S = material.place_shard(T) + var/obj/item/material/shard/S = material.place_shard(T) M.embed(S) playsound(src, "shatter", 70, 1) @@ -277,7 +277,7 @@ Protectiveness | Armor % default_material = "glass" // Used to craft sheet armor, and possibly other things in the Future(tm). -/obj/item/weapon/material/armor_plating +/obj/item/material/armor_plating name = "armor plating" desc = "A sheet designed to protect something." icon = 'icons/obj/items.dmi' @@ -287,12 +287,12 @@ Protectiveness | Armor % thrown_force_divisor = 0.2 var/wired = FALSE -/obj/item/weapon/material/armor_plating/insert +/obj/item/material/armor_plating/insert unbreakable = FALSE name = "plate insert" desc = "used to craft armor plates for a plate carrier. Trim with a welder for light armor or add a second for heavy armor" -/obj/item/weapon/material/armor_plating/attackby(var/obj/O, mob/user) +/obj/item/material/armor_plating/attackby(var/obj/O, mob/user) if(istype(O, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/S = O if(wired) @@ -306,8 +306,8 @@ Protectiveness | Armor % else to_chat(user, "You need more wire for that.") return - if(istype(O, /obj/item/weapon/material/armor_plating)) - var/obj/item/weapon/material/armor_plating/second_plate = O + if(istype(O, /obj/item/material/armor_plating)) + var/obj/item/material/armor_plating/second_plate = O if(!wired && !second_plate.wired) to_chat(user, "You need something to hold the two pieces of plating together.") return @@ -324,12 +324,12 @@ Protectiveness | Armor % ..() //Make plating inserts for modular armour. -/obj/item/weapon/material/armor_plating/insert/attackby(var/obj/item/O, mob/user) +/obj/item/material/armor_plating/insert/attackby(var/obj/item/O, mob/user) . = ..() if(O.has_tool_quality(TOOL_WELDER)) - var /obj/item/weapon/weldingtool/S = O.get_welder() + var /obj/item/weldingtool/S = O.get_welder() if(S.remove_fuel(0,user)) if(!src || !S.isOn()) return to_chat(user, "You trim down the edges to size.") @@ -339,8 +339,8 @@ Protectiveness | Armor % qdel(src) return - if(istype(O, /obj/item/weapon/material/armor_plating/insert)) - var/obj/item/weapon/material/armor_plating/insert/second_plate = O + if(istype(O, /obj/item/material/armor_plating/insert)) + var/obj/item/material/armor_plating/insert/second_plate = O if(second_plate.material != src.material) to_chat(user, "Both plates need to be the same type of material.") return @@ -353,7 +353,7 @@ Protectiveness | Armor % qdel(src) return - if(istype(O, /obj/item/weapon/tool/wirecutters)) + if(istype(O, /obj/item/tool/wirecutters)) to_chat(user, "You split the plate down the middle, and joint it at the elbow.") user.drop_from_inventory(src) var/obj/item/clothing/accessory/material/makeshift/armguards/new_armor = new(null, src.material.name) diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm index b5c98143409..fb8990fadc3 100644 --- a/code/game/objects/items/weapons/material/material_weapons.dm +++ b/code/game/objects/items/weapons/material/material_weapons.dm @@ -1,7 +1,7 @@ // SEE code/modules/materials/materials.dm FOR DETAILS ON INHERITED DATUM. // This class of weapons takes force and appearance data from a material datum. // They are also fragile based on material data and many can break/smash apart. -/obj/item/weapon/material +/obj/item/material health = 10 hitsound = 'sound/weapons/bladeslice.ogg' gender = NEUTER @@ -27,7 +27,7 @@ var/datum/material/material var/drops_debris = 1 -/obj/item/weapon/material/New(var/newloc, var/material_key) +/obj/item/material/New(var/newloc, var/material_key) ..(newloc) if(!material_key) material_key = default_material @@ -45,10 +45,10 @@ if(!(material.conductive)) src.flags |= NOCONDUCT -/obj/item/weapon/material/get_material() +/obj/item/material/get_material() return material -/obj/item/weapon/material/proc/update_force() +/obj/item/material/proc/update_force() if(edge || sharp) force = material.get_edge_damage() else @@ -60,7 +60,7 @@ //spawn(1) // to_world("[src] has force [force] and throwforce [throwforce] when made from default material [material.name]") -/obj/item/weapon/material/proc/set_material(var/new_material) +/obj/item/material/proc/set_material(var/new_material) material = get_material_by_name(new_material) if(!material) qdel(src) @@ -73,11 +73,11 @@ START_PROCESSING(SSobj, src) update_force() -/obj/item/weapon/material/Destroy() +/obj/item/material/Destroy() STOP_PROCESSING(SSobj, src) . = ..() -/obj/item/weapon/material/apply_hit_effect() +/obj/item/material/apply_hit_effect() ..() if(!unbreakable) if(material.is_brittle()) @@ -86,16 +86,16 @@ health-- check_health() -/obj/item/weapon/material/attackby(obj/item/weapon/W, mob/user) - if(istype(W, /obj/item/weapon/whetstone)) - var/obj/item/weapon/whetstone/whet = W +/obj/item/material/attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/whetstone)) + var/obj/item/whetstone/whet = W repair(whet.repair_amount, whet.repair_time, user) - if(istype(W, /obj/item/weapon/material/sharpeningkit)) - var/obj/item/weapon/material/sharpeningkit/SK = W + if(istype(W, /obj/item/material/sharpeningkit)) + var/obj/item/material/sharpeningkit/SK = W repair(SK.repair_amount, SK.repair_time, user) ..() -/obj/item/weapon/material/proc/check_health(var/consumed) +/obj/item/material/proc/check_health(var/consumed) if(health<=0) health = 0 @@ -104,7 +104,7 @@ else if(!dulled && can_dull) dull() -/obj/item/weapon/material/proc/shatter(var/consumed) +/obj/item/material/proc/shatter(var/consumed) var/turf/T = get_turf(src) T.visible_message("\The [src] [material.destruction_desc]!") if(istype(loc, /mob/living)) @@ -114,7 +114,7 @@ if(!consumed && drops_debris) material.place_shard(T) qdel(src) -/obj/item/weapon/material/proc/dull() +/obj/item/material/proc/dull() var/turf/T = get_turf(src) T.visible_message("\The [src] goes dull!") playsound(src, "shatter", 70, 1) @@ -123,7 +123,7 @@ sharp = FALSE edge = FALSE -/obj/item/weapon/material/proc/repair(var/repair_amount, var/repair_time, mob/living/user) +/obj/item/material/proc/repair(var/repair_amount, var/repair_time, mob/living/user) if(!fragile) if(health < initial(health)) user.visible_message("[user] begins repairing \the [src].", "You begin repairing \the [src].") @@ -139,7 +139,7 @@ to_chat(user, "You can't repair \the [src].") return -/obj/item/weapon/material/proc/sharpen(var/material, var/sharpen_time, var/kit, mob/living/M) +/obj/item/material/proc/sharpen(var/material, var/sharpen_time, var/kit, mob/living/M) if(!fragile && src.material.can_sharpen) if(health < initial(health)) to_chat(M, "You should repair [src] first. Try using [kit] on it.") @@ -155,7 +155,7 @@ /* Commenting this out pending rebalancing of radiation based on small objects. -/obj/item/weapon/material/process() +/obj/item/material/process() if(!material.radioactivity) return for(var/mob/living/L in range(1,src)) @@ -164,17 +164,17 @@ Commenting this out pending rebalancing of radiation based on small objects. /* // Commenting this out while fires are so spectacularly lethal, as I can't seem to get this balanced appropriately. -/obj/item/weapon/material/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/item/material/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) TemperatureAct(exposed_temperature) // This might need adjustment. Will work that out later. -/obj/item/weapon/material/proc/TemperatureAct(temperature) +/obj/item/material/proc/TemperatureAct(temperature) health -= material.combustion_effect(get_turf(src), temperature, 0.1) check_health(1) -/obj/item/weapon/material/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/WT = W +/obj/item/material/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W,/obj/item/weldingtool)) + var/obj/item/weldingtool/WT = W if(material.ignition_point && WT.remove_fuel(0, user)) TemperatureAct(150) else diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index 09d15a03cd4..b1b62739340 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/material/harpoon +/obj/item/material/harpoon name = "harpoon" sharp = TRUE edge = FALSE @@ -8,7 +8,7 @@ force_divisor = 0.3 // 18 with hardness 60 (steel) attack_verb = list("jabbed","stabbed","ripped") -/obj/item/weapon/material/knife/machete/hatchet +/obj/item/material/knife/machete/hatchet name = "hatchet" desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood." icon = 'icons/obj/weapons.dmi' @@ -24,7 +24,7 @@ drop_sound = 'sound/items/drop/axe.ogg' pickup_sound = 'sound/items/pickup/axe.ogg' /* VOREStation Removal - We have one already -/obj/item/weapon/material/knife/machete/hatchet/stone +/obj/item/material/knife/machete/hatchet/stone name = "sharp rock" desc = "The secret is to bang the rocks together, guys." force_divisor = 0.2 @@ -32,12 +32,12 @@ item_state = "rock" attack_verb = list("chopped", "torn", "cut") -/obj/item/weapon/material/knife/machete/hatchet/stone/set_material(var/new_material) +/obj/item/material/knife/machete/hatchet/stone/set_material(var/new_material) var/old_name = name . = ..() name = old_name */ -/obj/item/weapon/material/knife/machete/hatchet/unathiknife +/obj/item/material/knife/machete/hatchet/unathiknife name = "duelling knife" desc = "A length of leather-bound wood studded with razor-sharp teeth. How crude." icon = 'icons/obj/weapons.dmi' @@ -46,22 +46,22 @@ can_cleave = FALSE var/hits = 0 -/obj/item/weapon/material/knife/machete/hatchet/unathiknife/attack(mob/M as mob, mob/user as mob) +/obj/item/material/knife/machete/hatchet/unathiknife/attack(mob/M as mob, mob/user as mob) if(hits > 0) return var/obj/item/I = user.get_inactive_hand() - if(istype(I, /obj/item/weapon/material/knife/machete/hatchet/unathiknife)) + if(istype(I, /obj/item/material/knife/machete/hatchet/unathiknife)) hits ++ - var/obj/item/weapon/W = I + var/obj/item/W = I W.attack(M, user) W.afterattack(M, user) ..() -/obj/item/weapon/material/knife/machete/hatchet/unathiknife/afterattack(mob/M as mob, mob/user as mob) +/obj/item/material/knife/machete/hatchet/unathiknife/afterattack(mob/M as mob, mob/user as mob) hits = initial(hits) ..() -/obj/item/weapon/material/minihoe // -- Numbers +/obj/item/material/minihoe // -- Numbers name = "mini hoe" desc = "It's used for removing weeds or scratching your back." icon = 'icons/obj/weapons.dmi' @@ -72,7 +72,7 @@ w_class = ITEMSIZE_SMALL attack_verb = list("slashed", "sliced", "cut", "clawed") -/obj/item/weapon/material/snow/snowball +/obj/item/material/snow/snowball name = "loose packed snowball" desc = "A fun snowball. Throw it at your friends!" icon = 'icons/obj/weapons.dmi' @@ -85,7 +85,7 @@ w_class = ITEMSIZE_SMALL attack_verb = list("mushed", "splatted", "splooshed", "splushed") // Words that totally exist. -/obj/item/weapon/material/snow/snowball/attack_self(mob/user as mob) +/obj/item/material/snow/snowball/attack_self(mob/user as mob) if(user.a_intent == I_HURT) to_chat(user, SPAN_NOTICE("You smash the snowball in your hand.")) var/atom/S = new /obj/item/stack/material/snow(user.loc) @@ -94,18 +94,18 @@ else to_chat(user, SPAN_NOTICE("You start compacting the snowball.")) if(do_after(user, 2 SECONDS)) - var/atom/S = new /obj/item/weapon/material/snow/snowball/reinforced(user.loc) + var/atom/S = new /obj/item/material/snow/snowball/reinforced(user.loc) qdel(src) user.put_in_hands(S) -/obj/item/weapon/material/snow/snowball/reinforced +/obj/item/material/snow/snowball/reinforced name = "snowball" desc = "A well-formed and fun snowball. It looks kind of dangerous." //icon_state = "reinf-snowball" force_divisor = 0.20 thrown_force_divisor = 0.25 -/obj/item/weapon/material/whip +/obj/item/material/whip name = "whip" desc = "A tool used to discipline animals, or look cool. Mostly the latter." description_info = "Help - Standard attack, no modifiers.
\ @@ -129,7 +129,7 @@ slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi', ) -/obj/item/weapon/material/whip/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) +/obj/item/material/whip/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) ..() if(!proximity) @@ -151,7 +151,7 @@ user.visible_message("\The [AM] is snatched by \the [src]!") AM.throw_at(user, reach, 0.1, user) -/obj/item/weapon/material/whip/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) +/obj/item/material/whip/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) if(user.a_intent) switch(user.a_intent) if(I_HURT) @@ -173,12 +173,12 @@ ..() -/obj/item/weapon/material/whip/proc/ranged_disarm(var/mob/living/carbon/human/H, var/mob/living/user) +/obj/item/material/whip/proc/ranged_disarm(var/mob/living/carbon/human/H, var/mob/living/user) if(istype(H)) var/list/holding = list(H.get_active_hand() = 40, H.get_inactive_hand() = 20) if(user.zone_sel in list(BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND)) - for(var/obj/item/weapon/gun/W in holding) + for(var/obj/item/gun/W in holding) if(W && prob(holding[W])) var/list/turfs = list() for(var/turf/T in view()) @@ -211,11 +211,11 @@ playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) return -/obj/item/weapon/material/whip/attack_self(mob/user) +/obj/item/material/whip/attack_self(mob/user) user.visible_message("\The [user] cracks \the [src]!") playsound(src, 'sound/effects/snap.ogg', 50, 1) -/obj/item/weapon/material/knife/machete/hatchet/stone +/obj/item/material/knife/machete/hatchet/stone name = "hatchet" desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood." icon = 'icons/obj/weapons_vr.dmi' @@ -224,5 +224,5 @@ origin_tech = list() applies_material_colour = FALSE -/obj/item/weapon/material/knife/machete/hatchet/stone/bone +/obj/item/material/knife/machete/hatchet/stone/bone icon_state = "stone_bone_axe" diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index 5f9e2808cd6..86e5a27914a 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -1,6 +1,6 @@ // Glass shards -/obj/item/weapon/material/shard +/obj/item/material/shard name = "shard" icon = 'icons/obj/shards.dmi' desc = "Made of nothing. How does this even exist?" // set based on material, if this desc is visible it's a bug (shards default to being made of glass) @@ -17,7 +17,7 @@ unbreakable = 1 //It's already broken. drops_debris = 0 -/obj/item/weapon/material/shard/set_material(var/new_material) +/obj/item/material/shard/set_material(var/new_material) ..(new_material) if(!istype(material)) return @@ -37,7 +37,7 @@ else qdel(src) -/obj/item/weapon/material/shard/update_icon() +/obj/item/material/shard/update_icon() if(material) color = material.icon_colour // 1-(1-x)^2, so that glass shards with 0.3 opacity end up somewhat visible at 0.51 opacity @@ -46,16 +46,16 @@ color = "#ffffff" alpha = 255 -/obj/item/weapon/material/shard/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/material/shard/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WELDER) && material.shard_can_repair) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(WT.remove_fuel(0, user)) material.place_sheet(loc, 1) qdel(src) return return ..() -/obj/item/weapon/material/shard/afterattack(var/atom/target, mob/living/carbon/human/user as mob, proximity) +/obj/item/material/shard/afterattack(var/atom/target, mob/living/carbon/human/user as mob, proximity) if(!proximity) return var/active_hand //hand the shard is in @@ -102,7 +102,7 @@ qdel(src) return -/obj/item/weapon/material/shard/Crossed(atom/movable/AM as mob|obj) +/obj/item/material/shard/Crossed(atom/movable/AM as mob|obj) ..() if(AM.is_incorporeal()) return @@ -144,8 +144,8 @@ return // Preset types - left here for the code that uses them -/obj/item/weapon/material/shard/shrapnel/New(loc) +/obj/item/material/shard/shrapnel/New(loc) ..(loc, "steel") -/obj/item/weapon/material/shard/phoron/New(loc) +/obj/item/material/shard/phoron/New(loc) ..(loc, "borosilicate glass") diff --git a/code/game/objects/items/weapons/material/shards_vr.dm b/code/game/objects/items/weapons/material/shards_vr.dm index edc6a1efec7..fddafde1cf1 100644 --- a/code/game/objects/items/weapons/material/shards_vr.dm +++ b/code/game/objects/items/weapons/material/shards_vr.dm @@ -1,5 +1,5 @@ -/obj/item/weapon/material/shard/titaniumglass/New(loc) +/obj/item/material/shard/titaniumglass/New(loc) ..(loc, MAT_TITANIUMGLASS) -/obj/item/weapon/material/shard/plastitaniumglass/New(loc) +/obj/item/material/shard/plastitaniumglass/New(loc) ..(loc, MAT_PLASTITANIUMGLASS) \ No newline at end of file diff --git a/code/game/objects/items/weapons/material/swords.dm b/code/game/objects/items/weapons/material/swords.dm index 8aac4dca4bb..561295bf432 100644 --- a/code/game/objects/items/weapons/material/swords.dm +++ b/code/game/objects/items/weapons/material/swords.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/material/sword +/obj/item/material/sword name = "claymore" desc = "What are you standing around staring at this for? Get to killing!" icon_state = "claymore" @@ -12,26 +12,26 @@ drop_sound = 'sound/items/drop/sword.ogg' pickup_sound = 'sound/items/pickup/sword.ogg' -/obj/item/weapon/material/sword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/material/sword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(unique_parry_check(user, attacker, damage_source) && prob(50)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 -/obj/item/weapon/material/sword/katana +/obj/item/material/sword/katana name = "katana" desc = "Woefully underpowered in D20. This one looks pretty sharp." icon_state = "katana" slot_flags = SLOT_BELT | SLOT_BACK -/obj/item/weapon/material/sword/katana/caneblade +/obj/item/material/sword/katana/caneblade name = "cane blade" desc = "Used for making people fall over instead of helping them stand up." icon_state = "caneblade" item_state = "caneblade" -/obj/item/weapon/material/sword/rapier +/obj/item/material/sword/rapier name = "rapier" desc = "A slender, fancy and sharply pointed sword." icon_state = "rapier" @@ -41,7 +41,7 @@ attack_verb = list("attacked", "stabbed", "prodded", "poked", "lunged") edge = 0 //rapiers are pointy, but not cutty like other swords -/obj/item/weapon/material/sword/longsword +/obj/item/material/sword/longsword name = "longsword" desc = "A double-edged large blade." icon_state = "longsword" @@ -50,7 +50,7 @@ slot_flags = SLOT_BELT | SLOT_BACK can_cleave = TRUE -/obj/item/weapon/material/sword/sabre +/obj/item/material/sword/sabre name = "sabre" desc = "A sharp curved sword, a favored weapon of pirates far in the past." icon_state = "sabre" @@ -58,7 +58,7 @@ applies_material_colour = 0 //messes up the hilt color otherwise slot_flags = SLOT_BELT -/obj/item/weapon/material/sword/battleaxe +/obj/item/material/sword/battleaxe name = "battleaxe" desc = "A one handed battle axe, still a deadly weapon." icon_state = "axe" @@ -70,14 +70,14 @@ pickup_sound = 'sound/items/pickup/axe.ogg' can_cleave = TRUE -/obj/item/weapon/material/sword/battleaxe/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/material/sword/battleaxe/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(unique_parry_check(user, attacker, damage_source) && prob(10)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 -/obj/item/weapon/material/sword/gladius +/obj/item/material/sword/gladius name = "gladius" desc = "An ancient short sword, designed to stab and cut." icon_state = "gladius" diff --git a/code/game/objects/items/weapons/material/thrown.dm b/code/game/objects/items/weapons/material/thrown.dm index 12eaa25100d..95e08c34459 100644 --- a/code/game/objects/items/weapons/material/thrown.dm +++ b/code/game/objects/items/weapons/material/thrown.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/material/star +/obj/item/material/star name = "shuriken" desc = "A sharp, perfectly weighted piece of metal." icon_state = "star" @@ -9,16 +9,16 @@ sharp = TRUE edge = TRUE -/obj/item/weapon/material/star/New() +/obj/item/material/star/New() ..() src.pixel_x = rand(-12, 12) src.pixel_y = rand(-12, 12) -/obj/item/weapon/material/star/throw_impact(atom/hit_atom) +/obj/item/material/star/throw_impact(atom/hit_atom) ..() if(material.radioactivity>0 && istype(hit_atom,/mob/living)) var/mob/living/M = hit_atom M.adjustToxLoss(rand(20,40)) -/obj/item/weapon/material/star/ninja +/obj/item/material/star/ninja default_material = "uranium" \ No newline at end of file diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index 2e9f0823c86..a5fcd3be45f 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -16,7 +16,7 @@ /* * Twohanded */ -/obj/item/weapon/material/twohanded +/obj/item/material/twohanded w_class = ITEMSIZE_LARGE var/wielded = 0 var/force_wielded = 0 @@ -30,7 +30,7 @@ drop_sound = 'sound/items/drop/sword.ogg' pickup_sound = 'sound/items/pickup/sword.ogg' -/obj/item/weapon/material/twohanded/update_held_icon() +/obj/item/material/twohanded/update_held_icon() var/mob/living/M = loc if(istype(M) && M.can_wield_item(src) && is_held_twohanded(M)) wielded = 1 @@ -44,7 +44,7 @@ update_icon() ..() -/obj/item/weapon/material/twohanded/update_force() +/obj/item/material/twohanded/update_force() base_name = name if(sharp || edge) force_wielded = material.get_edge_damage() @@ -56,23 +56,23 @@ throwforce = round(force*thrown_force_divisor) //to_world("[src] has unwielded force [force_unwielded], wielded force [force_wielded] and throwforce [throwforce] when made from default material [material.name]") -/obj/item/weapon/material/twohanded/New() +/obj/item/material/twohanded/New() ..() update_icon() //Allow a small chance of parrying melee attacks when wielded - maybe generalize this to other weapons someday -/obj/item/weapon/material/twohanded/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/material/twohanded/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(wielded && default_parry_check(user, attacker, damage_source) && prob(15)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 -/obj/item/weapon/material/twohanded/update_icon() +/obj/item/material/twohanded/update_icon() icon_state = "[base_icon][wielded]" item_state = icon_state -/obj/item/weapon/material/twohanded/dropped() +/obj/item/material/twohanded/dropped() ..() if(wielded) spawn(0) @@ -81,7 +81,7 @@ /* * Fireaxe */ -/obj/item/weapon/material/twohanded/fireaxe // DEM AXES MAN, marker -Agouri +/obj/item/material/twohanded/fireaxe // DEM AXES MAN, marker -Agouri icon_state = "fireaxe0" base_icon = "fireaxe" name = "fire axe" @@ -101,7 +101,7 @@ drop_sound = 'sound/items/drop/axe.ogg' pickup_sound = 'sound/items/pickup/axe.ogg' -/obj/item/weapon/material/twohanded/fireaxe/update_held_icon() +/obj/item/material/twohanded/fireaxe/update_held_icon() var/mob/living/M = loc if(istype(M) && !issmall(M) && M.item_is_in_hands(src) && !M.hands_are_full()) wielded = 1 @@ -117,7 +117,7 @@ update_icon() ..() -/obj/item/weapon/material/twohanded/fireaxe/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) +/obj/item/material/twohanded/fireaxe/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) if(!proximity) return ..() if(A && wielded) @@ -130,7 +130,7 @@ var/obj/effect/plant/P = A P.die_off() -/obj/item/weapon/material/twohanded/fireaxe/scythe +/obj/item/material/twohanded/fireaxe/scythe icon_state = "scythe0" base_icon = "scythe" name = "scythe" @@ -140,7 +140,7 @@ attack_verb = list("chopped", "sliced", "cut", "reaped") //spears, bay edition -/obj/item/weapon/material/twohanded/spear +/obj/item/material/twohanded/spear icon_state = "spearglass0" base_icon = "spearglass" name = "spear" @@ -164,7 +164,7 @@ attackspeed = 14 //This is mostly for centaurs. -/obj/item/weapon/material/twohanded/spear/lance +/obj/item/material/twohanded/spear/lance name = "lance" desc = "End him rightly" icon = 'icons/obj/weapons_vr.dmi' @@ -178,7 +178,7 @@ sharp = TRUE edge = FALSE -/obj/item/weapon/material/twohanded/riding_crop +/obj/item/material/twohanded/riding_crop name = "riding crop" desc = "A rod, a little over a foot long with a widened grip and a thick, leather patch at the end. Used since the dawn of the West to control animals." force_divisor = 0.05 //Required in order for the X attacks Y message to pop up. @@ -189,5 +189,5 @@ icon_state = "riding_crop0" attack_verb = list("cropped","spanked","swatted","smacked","peppered") -/obj/item/weapon/material/twohanded/spear/flint +/obj/item/material/twohanded/spear/flint default_material = MAT_FLINT \ No newline at end of file diff --git a/code/game/objects/items/weapons/material/twohanded_vr.dm b/code/game/objects/items/weapons/material/twohanded_vr.dm index ae6155f4f57..c9195152e05 100644 --- a/code/game/objects/items/weapons/material/twohanded_vr.dm +++ b/code/game/objects/items/weapons/material/twohanded_vr.dm @@ -1,5 +1,5 @@ //1R1S: Malady Blanche -/obj/item/weapon/material/twohanded/riding_crop/malady +/obj/item/material/twohanded/riding_crop/malady name = "Malady's riding crop" icon = 'icons/vore/custom_items_vr.dmi' item_icons = list( @@ -8,7 +8,7 @@ ) desc = "An infernum made riding crop with Malady Blanche engraved in the shaft. It's a little worn from how many butts it has spanked." -/obj/item/weapon/material/twohanded/longsword +/obj/item/material/twohanded/longsword w_class = ITEMSIZE_NORMAL name = "longsword" desc = "a more elegant weapon from a more civilised age" @@ -26,7 +26,7 @@ edge = TRUE sharp = TRUE -/obj/item/weapon/material/twohanded/saber/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/material/twohanded/saber/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if (src.wielded == 1) if(unique_parry_check(user, attacker, damage_source) && prob(50)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") @@ -34,7 +34,7 @@ return 1 return 0 -/obj/item/weapon/material/twohanded/staff +/obj/item/material/twohanded/staff w_class = ITEMSIZE_LARGE default_material = MAT_WOOD name = "staff" @@ -59,7 +59,7 @@ edge = FALSE sharp = FALSE -/obj/item/weapon/material/twohanded/staff/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/material/twohanded/staff/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") var/parry_chance if(istype(damage_source, /obj/item/projectile)) //can't block ranged attacks, only melee! return 0 @@ -74,7 +74,7 @@ return 1 return 0 -/obj/item/weapon/material/twohanded/staff/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) +/obj/item/material/twohanded/staff/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) . = ..() if(src.wielded == 1 && user.a_intent == I_DISARM && prob(stun_chance)) target.Weaken(stun_duration) diff --git a/code/game/objects/items/weapons/material/whetstone.dm b/code/game/objects/items/weapons/material/whetstone.dm index 08e99551000..91a5574c0ba 100644 --- a/code/game/objects/items/weapons/material/whetstone.dm +++ b/code/game/objects/items/weapons/material/whetstone.dm @@ -1,7 +1,7 @@ //This is in the material folder because it's used by them... //Actual name may need to change //All of the important code is in material_weapons.dm -/obj/item/weapon/whetstone +/obj/item/whetstone name = "whetstone" desc = "A simple, fine grit stone, useful for sharpening dull edges and polishing out dents." icon_state = "whetstone" @@ -10,7 +10,7 @@ var/repair_amount = 5 var/repair_time = 40 -/obj/item/weapon/whetstone/attackby(obj/item/I, mob/user) +/obj/item/whetstone/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/stack/material)) var/obj/item/stack/material/M = I if(M.get_amount() >= 5) @@ -18,7 +18,7 @@ if(do_after(user, 70)) M.use(5) var/obj/item/SK - SK = new /obj/item/weapon/material/sharpeningkit(get_turf(user), M.material.name) + SK = new /obj/item/material/sharpeningkit(get_turf(user), M.material.name) to_chat(user, "You sharpen and refine the [src] into \a [SK].") qdel(src) if(SK) @@ -26,7 +26,7 @@ else to_chat(user, "You need 5 [src] to refine it into a sharpening kit.") -/obj/item/weapon/material/sharpeningkit +/obj/item/material/sharpeningkit name = "sharpening kit" desc = "A refined, fine grit whetstone, useful for sharpening dull edges, polishing out dents, and, with extra material, replacing an edge." icon = 'icons/obj/kitchen.dmi' @@ -39,20 +39,20 @@ var/sharpen_time = 100 var/uses = 0 -/obj/item/weapon/material/sharpeningkit/examine(mob/user, distance) +/obj/item/material/sharpeningkit/examine(mob/user, distance) . = ..() . += "There [uses == 1 ? "is" : "are"] [uses] [material] [uses == 1 ? src.material.sheet_singular_name : src.material.sheet_plural_name] left for use." -/obj/item/weapon/material/sharpeningkit/New() +/obj/item/material/sharpeningkit/New() . = ..() setrepair() -/obj/item/weapon/material/sharpeningkit/proc/setrepair() +/obj/item/material/sharpeningkit/proc/setrepair() repair_amount = material.hardness * 0.1 repair_time = material.weight * 0.5 sharpen_time = material.weight * 3 -/obj/item/weapon/material/sharpeningkit/attackby(obj/item/weapon/W, mob/user) +/obj/item/material/sharpeningkit/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/stack/material)) var/obj/item/stack/material/S = W if(S.material == material) @@ -61,11 +61,11 @@ to_chat(user, "You add a [S.material.name] [S.material.sheet_singular_name] to [src].") return - if(istype(W, /obj/item/weapon/material)) - if(istype(W, /obj/item/weapon/material/sharpeningkit)) + if(istype(W, /obj/item/material)) + if(istype(W, /obj/item/material/sharpeningkit)) to_chat(user, "As much as you'd like to sharpen [W] with [src], the logistics just don't work out.") return - var/obj/item/weapon/material/M = W + var/obj/item/material/M = W if(uses >= M.w_class*2) if(M.sharpen(src.material.name, sharpen_time, src, user)) uses -= M.w_class*2 diff --git a/code/game/objects/items/weapons/melee/deflect.dm b/code/game/objects/items/weapons/melee/deflect.dm index 293d2b9e294..7f1759b3817 100644 --- a/code/game/objects/items/weapons/melee/deflect.dm +++ b/code/game/objects/items/weapons/melee/deflect.dm @@ -2,11 +2,11 @@ * The home of basic deflect / defense code. */ -/obj/item/weapon/melee +/obj/item/melee var/defend_chance = 5 // The base chance for the weapon to parry. var/projectile_parry_chance = 0 // The base chance for a projectile to be deflected. -/obj/item/weapon/melee/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/melee/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(.) return . if(default_parry_check(user, attacker, damage_source) && prob(defend_chance)) @@ -18,7 +18,7 @@ return 0 -/obj/item/weapon/melee/unique_parry_check(mob/user, mob/attacker, atom/damage_source) +/obj/item/melee/unique_parry_check(mob/user, mob/attacker, atom/damage_source) if(.) return . if(user.incapacitated() || !istype(damage_source, /obj/item/projectile)) diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 1db3d1bffa7..5bcdff27c62 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/melee/energy +/obj/item/melee/energy var/active = 0 var/active_force var/active_throwforce @@ -17,34 +17,34 @@ // If it uses energy. var/use_cell = FALSE var/hitcost = 120 - var/obj/item/weapon/cell/bcell = null - var/cell_type = /obj/item/weapon/cell/device + var/obj/item/cell/bcell = null + var/cell_type = /obj/item/cell/device item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi', ) -/obj/item/weapon/melee/energy/sword/green/New() +/obj/item/melee/energy/sword/green/New() colorable = FALSE lcolor = "#008000" -/obj/item/weapon/melee/energy/sword/red/New() +/obj/item/melee/energy/sword/red/New() colorable = FALSE lcolor = "#FF0000" -/obj/item/weapon/melee/energy/sword/blue/New() +/obj/item/melee/energy/sword/blue/New() colorable = FALSE lcolor = "#0000FF" -/obj/item/weapon/melee/energy/sword/purple/New() +/obj/item/melee/energy/sword/purple/New() colorable = FALSE lcolor = "#800080" -/obj/item/weapon/melee/energy/sword/white/New() +/obj/item/melee/energy/sword/white/New() colorable = FALSE lcolor = "#FFFFFF" -/obj/item/weapon/melee/energy/proc/activate(mob/living/user) +/obj/item/melee/energy/proc/activate(mob/living/user) if(active) return active = 1 @@ -63,7 +63,7 @@ update_icon() set_light(lrange, lpower, lcolor) -/obj/item/weapon/melee/energy/proc/deactivate(mob/living/user) +/obj/item/melee/energy/proc/deactivate(mob/living/user) if(!active) return playsound(src, 'sound/weapons/saberoff.ogg', 50, 1) @@ -79,7 +79,7 @@ update_icon() set_light(0,0) -/obj/item/weapon/melee/energy/proc/use_charge(var/cost) +/obj/item/melee/energy/proc/use_charge(var/cost) if(active) if(bcell) if(bcell.checked_use(cost)) @@ -88,7 +88,7 @@ return 0 return null -/obj/item/weapon/melee/energy/examine(mob/user) +/obj/item/melee/energy/examine(mob/user) . = ..() if(use_cell && Adjacent(user)) if(bcell) @@ -96,7 +96,7 @@ else . += "The blade does not have a power source installed." -/obj/item/weapon/melee/energy/attack_self(mob/living/user as mob) +/obj/item/melee/energy/attack_self(mob/living/user as mob) if(use_cell) if((!bcell || bcell.charge < hitcost) && !active) to_chat(user, "\The [src] does not seem to have power.") @@ -120,15 +120,15 @@ add_fingerprint(user) return -/obj/item/weapon/melee/energy/attack(mob/M, mob/user) +/obj/item/melee/energy/attack(mob/M, mob/user) if(active && use_cell) if(!use_charge(hitcost)) deactivate(user) visible_message("\The [src]'s blade flickers, before deactivating.") return ..() -/obj/item/weapon/melee/energy/attackby(obj/item/weapon/W, mob/user) - if(istype(W, /obj/item/device/multitool) && colorable && !active) +/obj/item/melee/energy/attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/multitool) && colorable && !active) if(!rainbow) rainbow = TRUE else @@ -155,10 +155,10 @@ return return ..() -/obj/item/weapon/melee/energy/get_cell() +/obj/item/melee/energy/get_cell() return bcell -/obj/item/weapon/melee/energy/update_icon() +/obj/item/melee/energy/update_icon() . = ..() var/mutable_appearance/blade_overlay = mutable_appearance(icon, "[icon_state]_blade") blade_overlay.color = lcolor @@ -178,7 +178,7 @@ -/obj/item/weapon/melee/energy/AltClick(mob/living/user) +/obj/item/melee/energy/AltClick(mob/living/user) if(!colorable) //checks if is not colorable return if(!in_range(src, user)) //Basic checks to prevent abuse @@ -193,7 +193,7 @@ lcolor = sanitize_hexcolor(energy_color_input) update_icon() -/obj/item/weapon/melee/energy/examine(mob/user) +/obj/item/melee/energy/examine(mob/user) . = ..() if(colorable) . += "Alt-click to recolor it." @@ -201,7 +201,7 @@ /* * Energy Axe */ -/obj/item/weapon/melee/energy/axe +/obj/item/melee/energy/axe name = "energy axe" desc = "An energised battle axe." icon_state = "eaxe" @@ -227,17 +227,17 @@ edge = TRUE can_cleave = TRUE -/obj/item/weapon/melee/energy/axe/activate(mob/living/user) +/obj/item/melee/energy/axe/activate(mob/living/user) ..() damtype = SEARING to_chat(user, "\The [src] is now energised.") -/obj/item/weapon/melee/energy/axe/deactivate(mob/living/user) +/obj/item/melee/energy/axe/deactivate(mob/living/user) ..() damtype = BRUTE to_chat(user, "\The [src] is de-energised. It's just a regular axe now.") -/obj/item/weapon/melee/energy/axe/charge +/obj/item/melee/energy/axe/charge name = "charge axe" desc = "An energised axe." active_force = 35 @@ -248,14 +248,14 @@ use_cell = TRUE hitcost = 120 -/obj/item/weapon/melee/energy/axe/charge/loaded/New() +/obj/item/melee/energy/axe/charge/loaded/New() ..() - bcell = new/obj/item/weapon/cell/device/weapon(src) + bcell = new/obj/item/cell/device/weapon(src) /* * Energy Sword */ -/obj/item/weapon/melee/energy/sword +/obj/item/melee/energy/sword color name = "energy sword" desc = "May the force be within you." @@ -279,13 +279,13 @@ projectile_parry_chance = 65 -/obj/item/weapon/melee/energy/sword/dropped(var/mob/user) +/obj/item/melee/energy/sword/dropped(var/mob/user) ..() if(!istype(loc,/mob)) deactivate(user) -/obj/item/weapon/melee/energy/sword/activate(mob/living/user) +/obj/item/melee/energy/sword/activate(mob/living/user) if(!active) to_chat(user, "\The [src] is now energised.") @@ -293,13 +293,13 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") -/obj/item/weapon/melee/energy/sword/deactivate(mob/living/user) +/obj/item/melee/energy/sword/deactivate(mob/living/user) if(active) to_chat(user, "\The [src] deactivates!") ..() attack_verb = list() -/obj/item/weapon/melee/energy/sword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/melee/energy/sword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(active && default_parry_check(user, attacker, damage_source) && prob(60)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") @@ -319,7 +319,7 @@ return 0 -/obj/item/weapon/melee/energy/sword/unique_parry_check(mob/user, mob/attacker, atom/damage_source) +/obj/item/melee/energy/sword/unique_parry_check(mob/user, mob/attacker, atom/damage_source) if(user.incapacitated() || !istype(damage_source, /obj/item/projectile/)) return 0 @@ -329,7 +329,7 @@ return 1 -/obj/item/weapon/melee/energy/sword/pirate +/obj/item/melee/energy/sword/pirate name = "energy cutlass" desc = "Arrrr matey." icon_state = "cutlass" @@ -341,7 +341,7 @@ *Ionic Rapier */ -/obj/item/weapon/melee/energy/sword/ionic_rapier +/obj/item/melee/energy/sword/ionic_rapier name = "ionic rapier" desc = "Designed specifically for disrupting electronics at close range, it is extremely deadly against synthetics, but almost harmless to pure organic targets." description_info = "This is a dangerous melee weapon that will deliver a moderately powerful electromagnetic pulse to whatever it strikes. \ @@ -362,7 +362,7 @@ lcolor = "#0000FF" projectile_parry_chance = 30 // It's not specifically designed for cutting and slashing, but it can still, maybe, save your life. -/obj/item/weapon/melee/energy/sword/ionic_rapier/afterattack(var/atom/movable/AM, var/mob/living/user, var/proximity) +/obj/item/melee/energy/sword/ionic_rapier/afterattack(var/atom/movable/AM, var/mob/living/user, var/proximity) if(istype(AM, /obj) && proximity && active) // EMP stuff. var/obj/O = AM @@ -371,7 +371,7 @@ user.setClickCooldown(user.get_attack_speed(src)) // A lot of objects don't set click delay. return ..() -/obj/item/weapon/melee/energy/sword/ionic_rapier/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) +/obj/item/melee/energy/sword/ionic_rapier/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) . = ..() if(target.isSynthetic() && active) // Do some extra damage. Not a whole lot more since emp_act() is pretty nasty on FBPs already. @@ -386,7 +386,7 @@ target.taunt(user) target.adjustFireLoss(force * 6) // 30 Burn, for 50 total. -/obj/item/weapon/melee/energy/sword/ionic_rapier/lance +/obj/item/melee/energy/sword/ionic_rapier/lance name = "zero-point lance" desc = "Designed specifically for disrupting electronics at relatively close range, however it is still capable of dealing some damage to living beings." active_force = 20 @@ -397,7 +397,7 @@ * Charge blade. Uses a cell, and costs energy per strike. */ -/obj/item/weapon/melee/energy/sword/charge +/obj/item/melee/energy/sword/charge name = "charge sword" desc = "A small, handheld device which emits a high-energy 'blade'." origin_tech = list(TECH_COMBAT = 5, TECH_MAGNET = 3, TECH_ILLEGAL = 4) @@ -408,14 +408,14 @@ hitcost = 75 -/obj/item/weapon/melee/energy/sword/charge/loaded/New() +/obj/item/melee/energy/sword/charge/loaded/New() ..() - bcell = new/obj/item/weapon/cell/device/weapon(src) + bcell = new/obj/item/cell/device/weapon(src) //Energy Blade (ninja uses this) //Can't be activated or deactivated, so no reason to be a subtype of energy -/obj/item/weapon/melee/energy/blade +/obj/item/melee/energy/blade name = "energy blade" desc = "A concentrated beam of energy in the shape of a blade. Very stylish... and lethal." icon_state = "blade" @@ -436,7 +436,7 @@ projectile_parry_chance = 60 lcolor = "#00FF00" -/obj/item/weapon/melee/energy/blade/New() +/obj/item/melee/energy/blade/New() spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src) @@ -445,18 +445,18 @@ START_PROCESSING(SSobj, src) set_light(lrange, lpower, lcolor) -/obj/item/weapon/melee/energy/blade/Destroy() +/obj/item/melee/energy/blade/Destroy() STOP_PROCESSING(SSobj, src) ..() -/obj/item/weapon/melee/energy/blade/attack_self(mob/user as mob) +/obj/item/melee/energy/blade/attack_self(mob/user as mob) user.drop_from_inventory(src) spawn(1) if(src) qdel(src) -/obj/item/weapon/melee/energy/blade/dropped() +/obj/item/melee/energy/blade/dropped() spawn(1) if(src) qdel(src) -/obj/item/weapon/melee/energy/blade/process() +/obj/item/melee/energy/blade/process() if(!creator || loc != creator || !creator.item_is_in_hands(src)) // Tidy up a bit. if(istype(loc,/mob/living)) @@ -471,7 +471,7 @@ host.drop_from_inventory(src) spawn(1) if(src) qdel(src) -/obj/item/weapon/melee/energy/blade/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/melee/energy/blade/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(default_parry_check(user, attacker, damage_source) && prob(60)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") @@ -491,7 +491,7 @@ return 0 -/obj/item/weapon/melee/energy/blade/unique_parry_check(mob/user, mob/attacker, atom/damage_source) +/obj/item/melee/energy/blade/unique_parry_check(mob/user, mob/attacker, atom/damage_source) if(user.incapacitated() || !istype(damage_source, /obj/item/projectile/)) return 0 @@ -504,7 +504,7 @@ //Energy Spear -/obj/item/weapon/melee/energy/spear +/obj/item/melee/energy/spear name = "energy spear" desc = "Concentrated energy forming a sharp tip at the end of a long rod." icon_state = "espear" @@ -526,20 +526,20 @@ lcolor = "#800080" -/obj/item/weapon/melee/energy/spear/activate(mob/living/user) +/obj/item/melee/energy/spear/activate(mob/living/user) if(!active) to_chat(user, "\The [src] is now energised.") ..() attack_verb = list("jabbed", "stabbed", "impaled") -/obj/item/weapon/melee/energy/spear/deactivate(mob/living/user) +/obj/item/melee/energy/spear/deactivate(mob/living/user) if(active) to_chat(user, "\The [src] deactivates!") ..() attack_verb = list("whacked", "beat", "slapped", "thonked") -/obj/item/weapon/melee/energy/spear/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/melee/energy/spear/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(active && default_parry_check(user, attacker, damage_source) && prob(50)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() diff --git a/code/game/objects/items/weapons/melee/energy_vr.dm b/code/game/objects/items/weapons/melee/energy_vr.dm index 61a16a24126..180cc0c8070 100644 --- a/code/game/objects/items/weapons/melee/energy_vr.dm +++ b/code/game/objects/items/weapons/melee/energy_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/melee/energy/sword/imperial +/obj/item/melee/energy/sword/imperial name = "energy gladius" desc = "A broad, short energy blade. You'll be glad to have this in a fight." icon_state = "impsword" @@ -7,7 +7,7 @@ colorable = FALSE lcolor = "#FFFFFF" -/obj/item/weapon/melee/energy/sword/altevian +/obj/item/melee/energy/sword/altevian name = "plasma blade cutter" desc = "A device that's primarily used to cut through hull plating and interior structure, but also doubles as a deadly weapon. It's normally seen in the hands of altevian engineers as they carry out salvage work." icon_state = "altevian-cutter" @@ -17,7 +17,7 @@ colorable = FALSE lcolor = "#FFFFFF" -/obj/item/weapon/melee/energy/sword/altevian/update_icon() +/obj/item/melee/energy/sword/altevian/update_icon() ..() if(active) icon_state = "[initial(icon_state)]_active" diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 9598987006a..fda34b5067e 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/melee/chainofcommand +/obj/item/melee/chainofcommand name = "chain of command" desc = "A tool used by great men to placate the frothing masses." icon_state = "chain" @@ -11,7 +11,7 @@ hitsound = 'sound/weapons/whip.ogg' reach = 2 -/obj/item/weapon/melee/chainofcommand/curator_whip +/obj/item/melee/chainofcommand/curator_whip name = "leather whip" desc = "A fine weapon for some treasure hunting." icon_state = "curator_whip" @@ -19,13 +19,13 @@ throwforce = 5 origin_tech = list(TECH_COMBAT = 2) -/obj/item/weapon/melee/chainofcommand/curator_whip/toy +/obj/item/melee/chainofcommand/curator_whip/toy name = "toy whip" desc = "A fake whip. Perfect for fake treasure hunting" force = 2 throwforce = 2 -/obj/item/weapon/melee/umbrella +/obj/item/melee/umbrella name = "umbrella" desc = "To keep the rain off you. Use with caution on windy days." icon = 'icons/obj/items.dmi' @@ -37,14 +37,14 @@ w_class = ITEMSIZE_NORMAL var/open = FALSE -/obj/item/weapon/melee/umbrella/New() +/obj/item/melee/umbrella/New() ..() update_icon() -/obj/item/weapon/melee/umbrella/attack_self() +/obj/item/melee/umbrella/attack_self() src.toggle_umbrella() -/obj/item/weapon/melee/umbrella/proc/toggle_umbrella() +/obj/item/melee/umbrella/proc/toggle_umbrella() open = !open icon_state = "umbrella_[open ? "open" : "closed"]" addblends = icon_state + "_a" @@ -56,11 +56,11 @@ H.update_inv_r_hand() // Randomizes color -/obj/item/weapon/melee/umbrella/random/New() +/obj/item/melee/umbrella/random/New() color = get_random_colour() ..() -/obj/item/weapon/melee/cursedblade +/obj/item/melee/cursedblade name = "crystal blade" desc = "The red crystal blade's polished surface glints in the light, giving off a faint glow." icon_state = "soulblade" @@ -76,14 +76,14 @@ var/list/voice_mobs = list() //The curse of the sword is that it has someone trapped inside. -/obj/item/weapon/melee/cursedblade/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/melee/cursedblade/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(default_parry_check(user, attacker, damage_source) && prob(50)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 -/obj/item/weapon/melee/cursedblade/proc/ghost_inhabit(var/mob/candidate) +/obj/item/melee/cursedblade/proc/ghost_inhabit(var/mob/candidate) if(!isobserver(candidate)) return //Handle moving the ghost into the new shell. diff --git a/code/game/objects/items/weapons/melee/misc_vr.dm b/code/game/objects/items/weapons/melee/misc_vr.dm index b14a36e1f40..5e9f318aa6d 100644 --- a/code/game/objects/items/weapons/melee/misc_vr.dm +++ b/code/game/objects/items/weapons/melee/misc_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/melee/rapier +/obj/item/melee/rapier name = "rapier" desc = "A gleaming steel blade with a gold handguard and inlayed with an outstanding red gem." icon = 'icons/obj/weapons_vr.dmi' diff --git a/code/game/objects/items/weapons/melee/shock_maul.dm b/code/game/objects/items/weapons/melee/shock_maul.dm index 69896c885dc..f9ec4df8198 100644 --- a/code/game/objects/items/weapons/melee/shock_maul.dm +++ b/code/game/objects/items/weapons/melee/shock_maul.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/melee/shock_maul +/obj/item/melee/shock_maul name = "concussion maul" desc = "A heavy-duty concussion hammer, typically used for mining. An iconic weapon for the many uprisings of Mars. It uses a manually engaged concussive-force amplifier unit in the head to multiply impact force, but its weight and the charge up time makes it difficult to use effectively. Devastating if used correctly, but requires skill." icon_state = "forcemaul" @@ -38,10 +38,10 @@ attack_verb = list("beaten","slammed","smashed","mauled","hammered","bludgeoned") var/lightcolor = "#D3FDFD" var/status = 0 //whether the thing is on or not - var/obj/item/weapon/cell/bcell = null + var/obj/item/cell/bcell = null var/hitcost = 600 //you get 4 hits out of a standard cell -/obj/item/weapon/melee/shock_maul/update_held_icon() +/obj/item/melee/shock_maul/update_held_icon() var/mob/living/M = loc if(istype(M) && M.can_wield_item(src) && is_held_twohanded(M)) wielded = 1 @@ -69,15 +69,15 @@ update_icon() ..() -/obj/item/weapon/melee/shock_maul/New() +/obj/item/melee/shock_maul/New() ..() update_held_icon() return -/obj/item/weapon/melee/shock_maul/get_cell() +/obj/item/melee/shock_maul/get_cell() return bcell -/obj/item/weapon/melee/shock_maul/MouseDrop(obj/over_object as obj) +/obj/item/melee/shock_maul/MouseDrop(obj/over_object as obj) if(!canremove) return @@ -109,13 +109,13 @@ usr.put_in_l_hand(src) src.add_fingerprint(usr) -/obj/item/weapon/melee/shock_maul/loaded/New() //this one starts with a cell pre-installed. +/obj/item/melee/shock_maul/loaded/New() //this one starts with a cell pre-installed. ..() - bcell = new/obj/item/weapon/cell/device/weapon(src) + bcell = new/obj/item/cell/device/weapon(src) update_icon() return -/obj/item/weapon/melee/shock_maul/proc/deductcharge() +/obj/item/melee/shock_maul/proc/deductcharge() if(status == 1) //Only deducts charge when it's on if(bcell) if(bcell.checked_use(hitcost)) @@ -124,13 +124,13 @@ return 0 return null -/obj/item/weapon/melee/shock_maul/proc/powercheck() +/obj/item/melee/shock_maul/proc/powercheck() if(bcell) if(bcell.charge < hitcost) status = 0 update_held_icon() -/obj/item/weapon/melee/shock_maul/update_icon() +/obj/item/melee/shock_maul/update_icon() if(status) icon_state = "[initial(icon_state)]_active[wielded]" item_state = icon_state @@ -146,14 +146,14 @@ else set_light(0) -/obj/item/weapon/melee/shock_maul/dropped() +/obj/item/melee/shock_maul/dropped() ..() if(status) status = 0 visible_message("\The [src]'s grip safety engages!") update_held_icon() -/obj/item/weapon/melee/shock_maul/examine(mob/user) +/obj/item/melee/shock_maul/examine(mob/user) . = ..() if(Adjacent(user)) @@ -162,11 +162,11 @@ if(!bcell) . += "The concussion maul does not have a power source installed." -/obj/item/weapon/melee/shock_maul/attackby(obj/item/weapon/W, mob/user) +/obj/item/melee/shock_maul/attackby(obj/item/W, mob/user) if(!user.IsAdvancedToolUser()) return - if(istype(W, /obj/item/weapon/cell)) - if(istype(W, /obj/item/weapon/cell/device)) + if(istype(W, /obj/item/cell)) + if(istype(W, /obj/item/cell/device)) if(!bcell) user.drop_item() W.loc = src @@ -178,7 +178,7 @@ else to_chat(user, "This cell is not fitted for [src].") -/obj/item/weapon/melee/shock_maul/attack_hand(mob/user as mob) +/obj/item/melee/shock_maul/attack_hand(mob/user as mob) if(user.get_inactive_hand() == src) if(!user.IsAdvancedToolUser()) return @@ -194,7 +194,7 @@ else return ..() -/obj/item/weapon/melee/shock_maul/attack_self(mob/user) +/obj/item/melee/shock_maul/attack_self(mob/user) if(!user.IsAdvancedToolUser()) return if(!status && bcell && bcell.charge >= hitcost) @@ -214,7 +214,7 @@ to_chat(user, "\The [src] is out of charge.") add_fingerprint(user) -/obj/item/weapon/melee/shock_maul/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) +/obj/item/melee/shock_maul/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) if(!proximity) return ..() if(A && wielded && status) @@ -234,7 +234,7 @@ qdel(A) powercheck(hitcost) -/obj/item/weapon/melee/shock_maul/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) +/obj/item/melee/shock_maul/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) . = ..() if(user.a_intent == I_DISARM) launch_force *= launch_force_disarm @@ -254,7 +254,7 @@ update_held_icon() powercheck(hitcost) -/obj/item/weapon/melee/shock_maul/emp_act(severity) +/obj/item/melee/shock_maul/emp_act(severity) if(bcell) bcell.emp_act(severity) //let's not duplicate code everywhere if we don't have to please. if(status) @@ -263,7 +263,7 @@ update_held_icon() ..() -/obj/item/weapon/melee/shock_maul/get_description_interaction() +/obj/item/melee/shock_maul/get_description_interaction() var/list/results = list() if(bcell) diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 0d11a574af7..00a33428f70 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -1,9 +1,9 @@ -GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/weapon/mop) +GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/mop) /* * Mop */ -/obj/item/weapon/mop +/obj/item/mop name = "mop" desc = "The world of janitalia wouldn't be complete without a mop." icon = 'icons/obj/janitor.dmi' @@ -18,11 +18,11 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/weapon/mop) var/mopping = 0 var/mopcount = 0 -/obj/item/weapon/mop/New() +/obj/item/mop/New() create_reagents(30) ..() -/obj/item/weapon/mop/afterattack(atom/A, mob/user, proximity) +/obj/item/mop/afterattack(atom/A, mob/user, proximity) if(!proximity) return if(istype(A, /turf) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune)) if(reagents.total_volume < 1) @@ -39,14 +39,14 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/weapon/mop) /obj/effect/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/soap)) + if(istype(I, /obj/item/mop) || istype(I, /obj/item/soap)) return ..() /* * Advanced Mop */ -/obj/item/weapon/mop/advanced +/obj/item/mop/advanced name = "advanced mop" desc = "No stain will go unclean." icon = 'icons/obj/janitor.dmi' @@ -59,11 +59,11 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/weapon/mop) flags = NOCONDUCT attack_verb = list("mopped", "bashed", "bludgeoned", "whacked") -/obj/item/weapon/mop/advanced/New() +/obj/item/mop/advanced/New() create_reagents(30) ..() -/obj/item/weapon/mop/advanced/afterattack(atom/A, mob/user, proximity) +/obj/item/mop/advanced/afterattack(atom/A, mob/user, proximity) if(!proximity) return if(istype(A, /turf) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune)) if(reagents.total_volume < 1) diff --git a/code/game/objects/items/weapons/mop_deploy.dm b/code/game/objects/items/weapons/mop_deploy.dm index 95de86abee5..a5cd0036b64 100644 --- a/code/game/objects/items/weapons/mop_deploy.dm +++ b/code/game/objects/items/weapons/mop_deploy.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/mop_deploy +/obj/item/mop_deploy name = "mop" desc = "Deployable mop." icon = 'icons/obj/janitor.dmi' @@ -15,7 +15,7 @@ var/mopcount = 0 -/obj/item/weapon/mop_deploy/New() +/obj/item/mop_deploy/New() create_reagents(5) START_PROCESSING(SSobj, src) @@ -32,7 +32,7 @@ source.reagents.reaction(src, TOUCH, 10) //10 is the multiplier for the reaction effect. probably needed to wet the floor properly. source.reagents.remove_any(1) //reaction() doesn't use up the reagents */ -/obj/item/weapon/mop_deploy/afterattack(atom/A, mob/user, proximity) +/obj/item/mop_deploy/afterattack(atom/A, mob/user, proximity) if(!proximity) return if(istype(A, /turf) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune)) user.visible_message("[user] begins to clean \the [get_turf(A)].") @@ -44,22 +44,22 @@ to_chat(user, "You have finished mopping!") /obj/effect/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/weapon/mop_deploy) || istype(I, /obj/item/weapon/soap)) + if(istype(I, /obj/item/mop_deploy) || istype(I, /obj/item/soap)) return ..() -/obj/item/weapon/mop_deploy/Destroy() +/obj/item/mop_deploy/Destroy() STOP_PROCESSING(SSobj, src) . = ..() -/obj/item/weapon/mop_deploy/attack_self(mob/user as mob) +/obj/item/mop_deploy/attack_self(mob/user as mob) user.drop_from_inventory(src) spawn(1) if(!QDELETED(src)) qdel(src) -/obj/item/weapon/mop_deploy/dropped() +/obj/item/mop_deploy/dropped() spawn(1) if(!QDELETED(src)) qdel(src) -/obj/item/weapon/mop_deploy/process() +/obj/item/mop_deploy/process() if(!creator || loc != creator || !creator.item_is_in_hands(src)) // Tidy up a bit. if(istype(loc,/mob/living)) diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index d301828f326..84334021613 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -3,7 +3,7 @@ var/global/list/cached_icons = list() -/obj/item/weapon/reagent_containers/glass/paint +/obj/item/reagent_containers/glass/paint desc = "It's a paint bucket." name = "paint bucket" icon = 'icons/obj/items.dmi' @@ -18,7 +18,7 @@ var/global/list/cached_icons = list() flags = OPENCONTAINER var/paint_type = "red" -/obj/item/weapon/reagent_containers/glass/paint/afterattack(turf/simulated/target, mob/user, proximity) +/obj/item/reagent_containers/glass/paint/afterattack(turf/simulated/target, mob/user, proximity) if(!proximity) return if(istype(target) && reagents.total_volume > 5) user.visible_message("\The [target] has been splashed with something by [user]!") @@ -26,52 +26,52 @@ var/global/list/cached_icons = list() else return ..() -/obj/item/weapon/reagent_containers/glass/paint/Initialize() +/obj/item/reagent_containers/glass/paint/Initialize() .=..() if(paint_type) reagents.add_reagent("paint", volume, paint_type) -/obj/item/weapon/reagent_containers/glass/paint/red +/obj/item/reagent_containers/glass/paint/red icon_state = "paint_red" paint_type = "#FF0000" -/obj/item/weapon/reagent_containers/glass/paint/yellow +/obj/item/reagent_containers/glass/paint/yellow icon_state = "paint_yellow" paint_type = "#FFFF00" -/obj/item/weapon/reagent_containers/glass/paint/green +/obj/item/reagent_containers/glass/paint/green icon_state = "paint_green" paint_type = "#00FF00" -/obj/item/weapon/reagent_containers/glass/paint/blue +/obj/item/reagent_containers/glass/paint/blue icon_state = "paint_blue" paint_type = "#0000FF" -/obj/item/weapon/reagent_containers/glass/paint/violet +/obj/item/reagent_containers/glass/paint/violet icon_state = "paint_violet" paint_type = "#FF00FF" -/obj/item/weapon/reagent_containers/glass/paint/black +/obj/item/reagent_containers/glass/paint/black icon_state = "paint_black" paint_type = "#000000" -/obj/item/weapon/reagent_containers/glass/paint/grey +/obj/item/reagent_containers/glass/paint/grey icon_state = "paint_neutral" paint_type = "#808080" -/obj/item/weapon/reagent_containers/glass/paint/orange +/obj/item/reagent_containers/glass/paint/orange icon_state = "paint_orange" paint_type = "#FFA500" -/obj/item/weapon/reagent_containers/glass/paint/purple +/obj/item/reagent_containers/glass/paint/purple icon_state = "paint_purple" paint_type = "#A500FF" -/obj/item/weapon/reagent_containers/glass/paint/cyan +/obj/item/reagent_containers/glass/paint/cyan icon_state = "paint_cyan" paint_type = "#00FFFF" -/obj/item/weapon/reagent_containers/glass/paint/white +/obj/item/reagent_containers/glass/paint/white name = "paint remover bucket" icon_state = "paint_white" paint_type = "#FFFFFF" diff --git a/code/game/objects/items/weapons/paiwire.dm b/code/game/objects/items/weapons/paiwire.dm index 6d415170149..72881bc1d6d 100644 --- a/code/game/objects/items/weapons/paiwire.dm +++ b/code/game/objects/items/weapons/paiwire.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/pai_cable/proc/plugin(obj/machinery/M as obj, mob/user as mob) +/obj/item/pai_cable/proc/plugin(obj/machinery/M as obj, mob/user as mob) if(istype(M, /obj/machinery/door) || istype(M, /obj/machinery/camera)) //VOREStation Add - Can't hack secured_wires doors (vault, etc) if(istype(M, /obj/machinery/door/airlock)) @@ -15,5 +15,5 @@ else user.visible_message("[user] fumbles to find a place on [M] to plug in [src].", "There aren't any ports on [M] that match the jack belonging to [src].") -/obj/item/weapon/pai_cable/attack(obj/machinery/M as obj, mob/user as mob) +/obj/item/pai_cable/attack(obj/machinery/M as obj, mob/user as mob) src.plugin(M, user) diff --git a/code/game/objects/items/weapons/picnic_blankets.dm b/code/game/objects/items/weapons/picnic_blankets.dm index 0986c46e6f8..76d8f07e004 100644 --- a/code/game/objects/items/weapons/picnic_blankets.dm +++ b/code/game/objects/items/weapons/picnic_blankets.dm @@ -1,7 +1,7 @@ #define CENTER 1 #define SIDE 2 -/obj/item/weapon/picnic_blankets_carried +/obj/item/picnic_blankets_carried name = "picnic blanket" desc = "A neatly folded picnic blanket!" var/unfolded_desc = "Separates your meal from the dirty floor. Or table." @@ -14,7 +14,7 @@ drop_sound = 'sound/items/drop/cloth.ogg' pickup_sound = 'sound/items/pickup/cloth.ogg' -/obj/item/weapon/picnic_blankets_carried/verb/fold_out() +/obj/item/picnic_blankets_carried/verb/fold_out() set name = "Fold out" set desc = "Fold out the picnic blanket for use" set category = "Object" @@ -43,7 +43,7 @@ for(var/obj/structure/picnic_blanket_deployed/side in attached_blankets) qdel(side) - var/obj/item/weapon/picnic_blankets_carried/P = new /obj/item/weapon/picnic_blankets_carried(usr.loc) + var/obj/item/picnic_blankets_carried/P = new /obj/item/picnic_blankets_carried(usr.loc) P.name = name P.desc = folded_desc qdel(src) diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm index cb00c93fd01..e2e055b6f67 100644 --- a/code/game/objects/items/weapons/policetape.dm +++ b/code/game/objects/items/weapons/policetape.dm @@ -328,7 +328,7 @@ var/list/tape_roll_applications = list() crumple() return ..() -/obj/item/tape/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/tape/attackby(obj/item/W as obj, mob/user as mob) breaktape(user) /obj/item/tape/attack_hand(mob/user as mob) diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index c4e25652834..a8eaecae193 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/teleportation_scroll +/obj/item/teleportation_scroll name = "scroll of teleportation" desc = "A scroll for moving around." icon = 'icons/obj/wizard.dmi' @@ -14,7 +14,7 @@ throw_range = 20 origin_tech = list(TECH_BLUESPACE = 4) -/obj/item/weapon/teleportation_scroll/attack_self(mob/user as mob) +/obj/item/teleportation_scroll/attack_self(mob/user as mob) if((user.mind && !wizards.is_antagonist(user.mind))) to_chat(usr, "You stare at the scroll but cannot make sense of the markings!") return @@ -30,7 +30,7 @@ onclose(user, "scroll") return -/obj/item/weapon/teleportation_scroll/Topic(href, href_list) +/obj/item/teleportation_scroll/Topic(href, href_list) ..() if (usr.stat || usr.restrained() || src.loc != usr) return @@ -45,7 +45,7 @@ attack_self(H) return -/obj/item/weapon/teleportation_scroll/proc/teleportscroll(var/mob/user) +/obj/item/teleportation_scroll/proc/teleportscroll(var/mob/user) var/A = tgui_input_list(user, "Area to jump to:", "Teleportation Scroll", teleportlocs) if(!A) return diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 13dc6fc7b0a..4863f905154 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -32,7 +32,7 @@ /obj/item/proc/unique_parry_check(mob/user, mob/attacker, atom/damage_source) // An overrideable version of the above proc. return default_parry_check(user, attacker, damage_source) -/obj/item/weapon/shield +/obj/item/shield name = "shield" var/base_block_chance = 50 preserve_item = 1 @@ -41,7 +41,7 @@ slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi', ) -/obj/item/weapon/shield/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/shield/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(user.incapacitated()) return 0 @@ -53,10 +53,10 @@ return 1 return 0 -/obj/item/weapon/shield/proc/get_block_chance(mob/user, var/damage, atom/damage_source = null, mob/attacker = null) +/obj/item/shield/proc/get_block_chance(mob/user, var/damage, atom/damage_source = null, mob/attacker = null) return base_block_chance -/obj/item/weapon/shield/riot +/obj/item/shield/riot name = "riot shield" desc = "A shield adept for close quarters engagement. It's also capable of protecting from less powerful projectiles." icon = 'icons/obj/weapons.dmi' @@ -72,7 +72,7 @@ attack_verb = list("shoved", "bashed") var/cooldown = 0 //shield bash cooldown. based on world.time -/obj/item/weapon/shield/riot/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/shield/riot/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(user.incapacitated()) return 0 @@ -98,8 +98,8 @@ return 1 return 0 -/obj/item/weapon/shield/riot/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/melee/baton)) +/obj/item/shield/riot/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/melee/baton)) if(cooldown < world.time - 25) user.visible_message("[user] bashes [src] with [W]!") playsound(src, 'sound/effects/shieldbash.ogg', 50, 1) @@ -111,7 +111,7 @@ * Energy Shield */ -/obj/item/weapon/shield/energy +/obj/item/shield/energy name = "energy combat shield" desc = "A shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere." icon = 'icons/obj/weapons.dmi' @@ -135,7 +135,7 @@ slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi', ) -/obj/item/weapon/shield/energy/handle_shield(mob/user) +/obj/item/shield/energy/handle_shield(mob/user) if(!active) return 0 //turn it on first! . = ..() @@ -146,14 +146,14 @@ spark_system.start() playsound(src, 'sound/weapons/blade1.ogg', 50, 1) -/obj/item/weapon/shield/energy/get_block_chance(mob/user, var/damage, atom/damage_source = null, mob/attacker = null) +/obj/item/shield/energy/get_block_chance(mob/user, var/damage, atom/damage_source = null, mob/attacker = null) if(istype(damage_source, /obj/item/projectile)) var/obj/item/projectile/P = damage_source if((is_sharp(P) && damage > 10) || istype(P, /obj/item/projectile/beam)) return (base_block_chance - round(damage / 3)) //block bullets and beams using the old block chance return base_block_chance -/obj/item/weapon/shield/energy/attack_self(mob/living/user as mob) +/obj/item/shield/energy/attack_self(mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) to_chat(user, "You beat yourself in the head with [src].") user.take_organ_damage(5) @@ -182,7 +182,7 @@ add_fingerprint(user) return -/obj/item/weapon/shield/energy/update_icon() +/obj/item/shield/energy/update_icon() var/mutable_appearance/blade_overlay = mutable_appearance(icon, "[icon_state]_blade") if(lcolor) blade_overlay.color = lcolor @@ -202,7 +202,7 @@ H.update_inv_l_hand() H.update_inv_r_hand() -/obj/item/weapon/shield/energy/AltClick(mob/living/user) +/obj/item/shield/energy/AltClick(mob/living/user) if(!in_range(src, user)) //Basic checks to prevent abuse return if(user.incapacitated() || !istype(user)) @@ -214,11 +214,11 @@ lcolor = sanitize_hexcolor(energy_color_input) update_icon() -/obj/item/weapon/shield/energy/examine(mob/user) +/obj/item/shield/energy/examine(mob/user) . = ..() . += "Alt-click to recolor it." -/obj/item/weapon/shield/riot/tele +/obj/item/shield/riot/tele name = "telescopic shield" desc = "An advanced riot shield made of lightweight materials that collapses for easy storage." icon = 'icons/obj/weapons.dmi' @@ -231,13 +231,13 @@ 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, 'sound/weapons/empty.ogg', 50, 1) diff --git a/code/game/objects/items/weapons/shields_vr.dm b/code/game/objects/items/weapons/shields_vr.dm index baa4f94afa3..cc112233269 100644 --- a/code/game/objects/items/weapons/shields_vr.dm +++ b/code/game/objects/items/weapons/shields_vr.dm @@ -1,11 +1,11 @@ -/obj/item/weapon/shield/energy/imperial +/obj/item/shield/energy/imperial name = "energy scutum" desc = "It's really easy to mispronounce the name of this shield if you've only read it in books." icon = 'icons/obj/weapons_vr.dmi' icon_state = "impshield" // eshield1 for expanded item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi') -/obj/item/weapon/shield/fluff/wolfgirlshield +/obj/item/shield/fluff/wolfgirlshield name = "Autumn Shield" desc = "A shiny silvery shield with a large red leaf symbol in the center." icon = 'icons/obj/weapons_vr.dmi' @@ -18,10 +18,10 @@ item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi', slot_back_str = 'icons/vore/custom_items_vr.dmi', slot_wear_suit_str = 'icons/vore/custom_items_vr.dmi') attack_verb = list("shoved", "bashed") var/cooldown = 0 //shield bash cooldown. based on world.time - allowed = list(/obj/item/weapon/melee/fluffstuff/wolfgirlsword) + allowed = list(/obj/item/melee/fluffstuff/wolfgirlsword) -/obj/item/weapon/shield/riot/explorer +/obj/item/shield/riot/explorer name = "green away team shield" desc = "A shield issued to exploration teams to help protect them when advancing into the unknown. It is lighter and cheaper but less protective than some of its counterparts. It has a flashlight straight in the middle to help draw attention." icon = 'icons/obj/weapons_vr.dmi' @@ -40,7 +40,7 @@ //POURPEL WHY U NO COVER -/obj/item/weapon/shield/riot/explorer/attack_self(mob/user) +/obj/item/shield/riot/explorer/attack_self(mob/user) if(brightness_on) if(!isturf(user.loc)) to_chat(user, "You cannot turn the light on while in this [user.loc]") @@ -56,7 +56,7 @@ else return ..(user) -/obj/item/weapon/shield/riot/explorer/proc/update_flashlight(var/mob/user = null) +/obj/item/shield/riot/explorer/proc/update_flashlight(var/mob/user = null) if(on && !light_applied) set_light(brightness_on) light_applied = 1 @@ -67,19 +67,19 @@ user.update_action_buttons() playsound(src, 'sound/weapons/empty.ogg', 15, 1, -3) -/obj/item/weapon/shield/riot/explorer/update_icon() +/obj/item/shield/riot/explorer/update_icon() if(on) icon_state = "explorer_shield_lighted" else icon_state = "explorer_shield" -/obj/item/weapon/shield/riot/explorer/purple +/obj/item/shield/riot/explorer/purple name = "purple away team shield" desc = "A shield issued to exploration teams to help protect them when advancing into the unknown. It is lighter and cheaper but less protective than some of its counterparts. It has a flashlight straight in the middle to help draw attention. This one is POURPEL" icon_state = "explorer_shield_P" -/obj/item/weapon/shield/riot/explorer/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/material/knife/machete)) +/obj/item/shield/riot/explorer/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/material/knife/machete)) if(cooldown < world.time - 25) user.visible_message("[user] bashes [src] with [W]!") playsound(src, 'sound/effects/shieldbash.ogg', 50, 1) @@ -87,13 +87,13 @@ else ..() -/obj/item/weapon/shield/riot/explorer/purple/update_icon() +/obj/item/shield/riot/explorer/purple/update_icon() if(on) icon_state = "explorer_shield_P_lighted" else icon_state = "explorer_shield_P" -/obj/item/weapon/shield/primitive +/obj/item/shield/primitive name = "primitive shield" desc = "A defensive object that is little more than planks strapped your arm" icon = 'icons/obj/weapons.dmi' diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 345884f6d4e..f3c641ad6ff 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -2,7 +2,7 @@ * Backpack */ -/obj/item/weapon/storage/backpack +/obj/item/storage/backpack name = "backpack" desc = "You wear this on your back and put items into it." icon = 'icons/inventory/back/item.dmi' @@ -20,13 +20,13 @@ pickup_sound = 'sound/items/pickup/backpack.ogg' -/obj/item/weapon/storage/backpack/equipped(var/mob/user, var/slot) +/obj/item/storage/backpack/equipped(var/mob/user, var/slot) if (slot == slot_back && src.use_sound) playsound(src, src.use_sound, 50, 1, -5) ..(user, slot) /* -/obj/item/weapon/storage/backpack/dropped(mob/user as mob) +/obj/item/storage/backpack/dropped(mob/user as mob) if (loc == user && src.use_sound) playsound(src, src.use_sound, 50, 1, -5) ..(user) @@ -36,7 +36,7 @@ * Backpack Types */ -/obj/item/weapon/storage/backpack/holding +/obj/item/storage/backpack/holding name = "bag of holding" desc = "A backpack that opens into a localized pocket of Blue Space." origin_tech = list(TECH_BLUESPACE = 4) @@ -45,18 +45,18 @@ max_storage_space = ITEMSIZE_COST_NORMAL * 14 // 56 storage_cost = INVENTORY_STANDARD_SPACE + 1 -/obj/item/weapon/storage/backpack/holding/duffle +/obj/item/storage/backpack/holding/duffle name = "dufflebag of holding" var/tilted = 0 icon_state = "holdingduffle" -/obj/item/weapon/storage/backpack/holding/duffle/Initialize() +/obj/item/storage/backpack/holding/duffle/Initialize() . = ..() if(prob(50)) icon_state = "[icon_state]_tilted" tilted = 1 -/obj/item/weapon/storage/backpack/holding/duffle/verb/tilt() +/obj/item/storage/backpack/holding/duffle/verb/tilt() set name = "Adjust Duffelbag Angle" set desc = "Adjust the angle of your dufflebag for cosmetic effect" set category = "Object" @@ -74,20 +74,20 @@ update_icon() usr.update_inv_back() -/obj/item/weapon/storage/backpack/holding/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/storage/backpack/holding)) +/obj/item/storage/backpack/holding/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/storage/backpack/holding)) to_chat(user, "The Bluespace interfaces of the two devices conflict and malfunction.") qdel(W) return . = ..() //Please don't clutter the parent storage item with stupid hacks. -/obj/item/weapon/storage/backpack/holding/can_be_inserted(obj/item/W as obj, stop_messages = 0) - if(istype(W, /obj/item/weapon/storage/backpack/holding)) +/obj/item/storage/backpack/holding/can_be_inserted(obj/item/W as obj, stop_messages = 0) + if(istype(W, /obj/item/storage/backpack/holding)) return FALSE return ..() -/obj/item/weapon/storage/backpack/santabag +/obj/item/storage/backpack/santabag name = "\improper Santa's gift bag" desc = "Space Santa uses this to deliver toys to all the nice children in space in Christmas! Wow, it's pretty big!" icon_state = "giftbag0" @@ -96,69 +96,69 @@ max_w_class = ITEMSIZE_NORMAL max_storage_space = ITEMSIZE_COST_NORMAL * 100 // can store a ton of shit! -/obj/item/weapon/storage/backpack/cultpack +/obj/item/storage/backpack/cultpack name = "trophy rack" desc = "It's useful for both carrying extra gear and proudly declaring your insanity." icon_state = "backpack_cult" -/obj/item/weapon/storage/backpack/clown +/obj/item/storage/backpack/clown name = "Giggles von Honkerton" desc = "It's a backpack made by Honk! Co." icon_state = "backpack_clown" -/obj/item/weapon/storage/backpack/white +/obj/item/storage/backpack/white name = "white backpack" icon_state = "backpack_white" -/obj/item/weapon/storage/backpack/fancy +/obj/item/storage/backpack/fancy name = "fancy backpack" icon_state = "backpack_fancy" -/obj/item/weapon/storage/backpack/military +/obj/item/storage/backpack/military name = "military backpack" icon_state = "backpack_military" -/obj/item/weapon/storage/backpack/medic +/obj/item/storage/backpack/medic name = "medical backpack" desc = "It's a backpack especially designed for use in a sterile environment." icon_state = "backpack_medical" -/obj/item/weapon/storage/backpack/security +/obj/item/storage/backpack/security name = "security backpack" desc = "It's a very robust backpack." icon_state = "backpack_security" -/obj/item/weapon/storage/backpack/captain +/obj/item/storage/backpack/captain name = "site manager's backpack" desc = "It's a special backpack made exclusively for officers." icon_state = "backpack_captain" -/obj/item/weapon/storage/backpack/industrial +/obj/item/storage/backpack/industrial name = "industrial backpack" desc = "It's a tough backpack for the daily grind of station life." icon_state = "backpack_industrial" -/obj/item/weapon/storage/backpack/toxins +/obj/item/storage/backpack/toxins name = "laboratory backpack" desc = "It's a light backpack modeled for use in laboratories and other scientific institutions." icon_state = "backpack_purple" -/obj/item/weapon/storage/backpack/hydroponics +/obj/item/storage/backpack/hydroponics name = "herbalist's backpack" desc = "It's a green backpack with many pockets to store plants and tools in." icon_state = "backpack_hydro" -/obj/item/weapon/storage/backpack/genetics +/obj/item/storage/backpack/genetics name = "geneticist backpack" desc = "It's a backpack fitted with slots for diskettes and other workplace tools." icon_state = "backpack_blue" -/obj/item/weapon/storage/backpack/virology +/obj/item/storage/backpack/virology name = "sterile backpack" desc = "It's a sterile backpack able to withstand different pathogens from entering its fabric." icon_state = "backpack_green" -/obj/item/weapon/storage/backpack/chemistry +/obj/item/storage/backpack/chemistry name = "chemistry backpack" desc = "It's an orange backpack which was designed to hold beakers, pill bottles and bottles." icon_state = "backpack_orange" @@ -167,7 +167,7 @@ * Duffle Types */ -/obj/item/weapon/storage/backpack/dufflebag +/obj/item/storage/backpack/dufflebag name = "dufflebag" desc = "A large dufflebag for holding extra things." icon_state = "duffle" @@ -176,13 +176,13 @@ var/can_tilt = 1 max_storage_space = INVENTORY_DUFFLEBAG_SPACE -/obj/item/weapon/storage/backpack/dufflebag/Initialize() +/obj/item/storage/backpack/dufflebag/Initialize() . = ..() if(prob(50)) icon_state = "[icon_state]_tilted" tilted = 1 -/obj/item/weapon/storage/backpack/dufflebag/verb/tilt() +/obj/item/storage/backpack/dufflebag/verb/tilt() set name = "Adjust Duffelbag Angle" set desc = "Adjust the angle of your dufflebag for cosmetic effect" set category = "Object" @@ -203,58 +203,58 @@ update_icon() usr.update_inv_back() -/obj/item/weapon/storage/backpack/dufflebag/syndie +/obj/item/storage/backpack/dufflebag/syndie name = "black dufflebag" desc = "A large dufflebag for holding extra tactical supplies. This one appears to be made out of lighter material than usual." icon_state = "duffle_syndie" slowdown = 0 -/obj/item/weapon/storage/backpack/dufflebag/syndie/med +/obj/item/storage/backpack/dufflebag/syndie/med name = "medical dufflebag" desc = "A large dufflebag for holding extra tactical medical supplies. This one appears to be made out of lighter material than usual." icon_state = "duffle_syndiemed" -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo +/obj/item/storage/backpack/dufflebag/syndie/ammo name = "ammunition dufflebag" desc = "A large dufflebag for holding extra weapons ammunition and supplies. This one appears to be made out of lighter material than usual." icon_state = "duffle_syndieammo" -/obj/item/weapon/storage/backpack/dufflebag/captain +/obj/item/storage/backpack/dufflebag/captain name = "site manager's dufflebag" desc = "A large dufflebag for holding extra captainly goods." icon_state = "duffle_captain" -/obj/item/weapon/storage/backpack/dufflebag/med +/obj/item/storage/backpack/dufflebag/med name = "medical dufflebag" desc = "A large dufflebag for holding extra medical supplies." icon_state = "duffle_medical" -/obj/item/weapon/storage/backpack/dufflebag/emt +/obj/item/storage/backpack/dufflebag/emt name = "EMT dufflebag" desc = "A large dufflebag for holding extra medical supplies. This one has reflective stripes!" icon_state = "duffle_emt" -/obj/item/weapon/storage/backpack/dufflebag/sec +/obj/item/storage/backpack/dufflebag/sec name = "security dufflebag" desc = "A large dufflebag for holding extra security supplies and ammunition." icon_state = "duffle_security" -/obj/item/weapon/storage/backpack/dufflebag/eng +/obj/item/storage/backpack/dufflebag/eng name = "industrial dufflebag" desc = "A large dufflebag for holding extra tools and supplies." icon_state = "duffle_industrial" -/obj/item/weapon/storage/backpack/dufflebag/sci +/obj/item/storage/backpack/dufflebag/sci name = "science dufflebag" desc = "A large dufflebag for holding circuits and beakers." icon_state = "duffle_science" -/obj/item/weapon/storage/backpack/dufflebag/drone +/obj/item/storage/backpack/dufflebag/drone name = "drone dufflebag" desc = "A large dufflebag for holding small robots? Or maybe it's one used by robots!" icon_state = "duffle_drone" -/obj/item/weapon/storage/backpack/dufflebag/cursed +/obj/item/storage/backpack/dufflebag/cursed name = "cursed dufflebag" desc = "That probably shouldn't be moving..." icon_state = "duffle_curse" @@ -263,101 +263,101 @@ * Satchel Types */ -/obj/item/weapon/storage/backpack/satchel +/obj/item/storage/backpack/satchel name = "leather satchel" desc = "It's a very fancy satchel made with fine leather." icon_state = "satchel" -/obj/item/weapon/storage/backpack/satchel/withwallet - starts_with = list(/obj/item/weapon/storage/wallet/random) +/obj/item/storage/backpack/satchel/withwallet + starts_with = list(/obj/item/storage/wallet/random) -/obj/item/weapon/storage/backpack/satchel/norm +/obj/item/storage/backpack/satchel/norm name = "satchel" desc = "A trendy looking satchel." icon_state = "satchel_grey" -/obj/item/weapon/storage/backpack/satchel/white +/obj/item/storage/backpack/satchel/white name = "white satchel" icon_state = "satchel_white" -/obj/item/weapon/storage/backpack/satchel/fancy +/obj/item/storage/backpack/satchel/fancy name = "fancy satchel" icon_state = "satchel_fancy" -/obj/item/weapon/storage/backpack/satchel/military +/obj/item/storage/backpack/satchel/military name = "military satchel" icon_state = "satchel_military" -/obj/item/weapon/storage/backpack/satchel/eng +/obj/item/storage/backpack/satchel/eng name = "industrial satchel" desc = "A tough satchel with extra pockets." icon_state = "satchel_industrial" -/obj/item/weapon/storage/backpack/satchel/med +/obj/item/storage/backpack/satchel/med name = "medical satchel" desc = "A sterile satchel used in medical departments." icon_state = "satchel_medical" -/obj/item/weapon/storage/backpack/satchel/vir +/obj/item/storage/backpack/satchel/vir name = "virologist satchel" desc = "A sterile satchel with virologist colours." icon_state = "satchel_green" -/obj/item/weapon/storage/backpack/satchel/chem +/obj/item/storage/backpack/satchel/chem name = "chemist satchel" desc = "A sterile satchel with chemist colours." icon_state = "satchel_orange" -/obj/item/weapon/storage/backpack/satchel/gen +/obj/item/storage/backpack/satchel/gen name = "geneticist satchel" desc = "A sterile satchel with geneticist colours." icon_state = "satchel_blue" -/obj/item/weapon/storage/backpack/satchel/tox +/obj/item/storage/backpack/satchel/tox name = "scientist satchel" desc = "Useful for holding research materials." icon_state = "satchel_purple" -/obj/item/weapon/storage/backpack/satchel/sec +/obj/item/storage/backpack/satchel/sec name = "security satchel" desc = "A robust satchel for security related needs." icon_state = "satchel_security" -/obj/item/weapon/storage/backpack/satchel/hyd +/obj/item/storage/backpack/satchel/hyd name = "hydroponics satchel" desc = "A green satchel for plant related work." icon_state = "satchel_hydro" -/obj/item/weapon/storage/backpack/satchel/cap +/obj/item/storage/backpack/satchel/cap name = "site manager's satchel" desc = "An exclusive satchel for officers." icon_state = "satchel_captain" //ERT backpacks. -/obj/item/weapon/storage/backpack/ert +/obj/item/storage/backpack/ert name = "emergency response team backpack" desc = "A spacious backpack with lots of pockets, used by members of the Emergency Response Team." icon_state = "ert_commander" //Commander -/obj/item/weapon/storage/backpack/ert/commander +/obj/item/storage/backpack/ert/commander name = "emergency response team commander backpack" desc = "A spacious backpack with lots of pockets, worn by the commander of an Emergency Response Team." //Security -/obj/item/weapon/storage/backpack/ert/security +/obj/item/storage/backpack/ert/security name = "emergency response team security backpack" desc = "A spacious backpack with lots of pockets, worn by security members of an Emergency Response Team." icon_state = "ert_security" //Engineering -/obj/item/weapon/storage/backpack/ert/engineer +/obj/item/storage/backpack/ert/engineer name = "emergency response team engineer backpack" desc = "A spacious backpack with lots of pockets, worn by engineering members of an Emergency Response Team." icon_state = "ert_engineering" //Medical -/obj/item/weapon/storage/backpack/ert/medical +/obj/item/storage/backpack/ert/medical name = "emergency response team medical backpack" desc = "A spacious backpack with lots of pockets, worn by medical members of an Emergency Response Team." icon_state = "ert_medical" @@ -366,60 +366,60 @@ * Courier Bags */ -/obj/item/weapon/storage/backpack/messenger +/obj/item/storage/backpack/messenger name = "messenger bag" desc = "A sturdy backpack worn over one shoulder." icon_state = "courier" item_state_slots = list(slot_r_hand_str = "satchel_grey", slot_l_hand_str = "satchel_grey") -/obj/item/weapon/storage/backpack/messenger/chem +/obj/item/storage/backpack/messenger/chem name = "chemistry messenger bag" desc = "A serile backpack worn over one shoulder. This one is in Chemsitry colors." icon_state = "courier_chemistry" item_state_slots = list(slot_r_hand_str = "satchel_orange", slot_l_hand_str = "satchel_orange") -/obj/item/weapon/storage/backpack/messenger/med +/obj/item/storage/backpack/messenger/med name = "medical messenger bag" desc = "A sterile backpack worn over one shoulder used in medical departments." icon_state = "courier_medical" item_state_slots = list(slot_r_hand_str = "satchel_medical", slot_l_hand_str = "satchel_medical") -/obj/item/weapon/storage/backpack/messenger/viro +/obj/item/storage/backpack/messenger/viro name = "virology messenger bag" desc = "A sterile backpack worn over one shoulder. This one is in Virology colors." icon_state = "courier_virology" item_state_slots = list(slot_r_hand_str = "satchel_green", slot_l_hand_str = "satchel_green") -/obj/item/weapon/storage/backpack/messenger/tox +/obj/item/storage/backpack/messenger/tox name = "research messenger bag" desc = "A backpack worn over one shoulder. Useful for holding science materials." icon_state = "courier_toxins" item_state_slots = list(slot_r_hand_str = "satchel_purple", slot_l_hand_str = "satchel_purple") -/obj/item/weapon/storage/backpack/messenger/com +/obj/item/storage/backpack/messenger/com name = "command messenger bag" desc = "A special backpack worn over one shoulder. This one is made specifically for officers." icon_state = "courier_captain" item_state_slots = list(slot_r_hand_str = "satchel_captain", slot_l_hand_str = "satchel_captain") -/obj/item/weapon/storage/backpack/messenger/engi +/obj/item/storage/backpack/messenger/engi name = "engineering messenger bag" icon_state = "courier_industrial" item_state_slots = list(slot_r_hand_str = "satchel_industrial", slot_l_hand_str = "satchel_industrial") -/obj/item/weapon/storage/backpack/messenger/hyd +/obj/item/storage/backpack/messenger/hyd name = "hydroponics messenger bag" desc = "A backpack worn over one shoulder. This one is designed for plant-related work." icon_state = "courier_hydro" item_state_slots = list(slot_r_hand_str = "satchel_hydro", slot_l_hand_str = "satchel_hydro") -/obj/item/weapon/storage/backpack/messenger/sec +/obj/item/storage/backpack/messenger/sec name = "security messenger bag" desc = "A tactical backpack worn over one shoulder. This one is in Security colors." icon_state = "courier_security" item_state_slots = list(slot_r_hand_str = "satchel_security", slot_l_hand_str = "satchel_security") -/obj/item/weapon/storage/backpack/messenger/black +/obj/item/storage/backpack/messenger/black icon_state = "courier_black" @@ -427,50 +427,50 @@ * Sport Bags */ -/obj/item/weapon/storage/backpack/sport +/obj/item/storage/backpack/sport name = "sports backpack" icon_state = "backsport" -/obj/item/weapon/storage/backpack/sport/white +/obj/item/storage/backpack/sport/white name = "white sports backpack" icon_state = "backsport_white" -/obj/item/weapon/storage/backpack/sport/fancy +/obj/item/storage/backpack/sport/fancy name = "fancy sports backpack" icon_state = "backsport_fancy" -/obj/item/weapon/storage/backpack/sport/vir +/obj/item/storage/backpack/sport/vir name = "virologist sports backpack" desc = "A sterile sports backpack with virologist colours." icon_state = "backsport_green" -/obj/item/weapon/storage/backpack/sport/chem +/obj/item/storage/backpack/sport/chem name = "chemist sports backpack" desc = "A sterile sports backpack with chemist colours." icon_state = "backsport_orange" -/obj/item/weapon/storage/backpack/sport/gen +/obj/item/storage/backpack/sport/gen name = "geneticist sports backpack" desc = "A sterile sports backpack with geneticist colours." icon_state = "backsport_blue" -/obj/item/weapon/storage/backpack/sport/tox +/obj/item/storage/backpack/sport/tox name = "scientist sports backpack" desc = "Useful for holding research materials." icon_state = "backsport_purple" -/obj/item/weapon/storage/backpack/sport/sec +/obj/item/storage/backpack/sport/sec name = "security sports backpack" desc = "A robust sports backpack for security related needs." icon_state = "backsport_security" -/obj/item/weapon/storage/backpack/sport/hyd +/obj/item/storage/backpack/sport/hyd name = "hydroponics sports backpack" desc = "A green sports backpack for plant related work." icon_state = "backsport_hydro" //Purses -/obj/item/weapon/storage/backpack/purse +/obj/item/storage/backpack/purse name = "purse" desc = "A small, fashionable bag typically worn over the shoulder." icon_state = "purse" @@ -480,14 +480,14 @@ max_storage_space = ITEMSIZE_COST_NORMAL * 5 //Parachutes -/obj/item/weapon/storage/backpack/parachute +/obj/item/storage/backpack/parachute name = "parachute" desc = "A specially made backpack, designed to help one survive jumping from incredible heights. It sacrifices some storage space for that added functionality." icon_state = "parachute" item_state_slots = list(slot_r_hand_str = "backpack", slot_l_hand_str = "backpack") max_storage_space = ITEMSIZE_COST_NORMAL * 5 -/obj/item/weapon/storage/backpack/parachute/examine(mob/user) +/obj/item/storage/backpack/parachute/examine(mob/user) . = ..() if(Adjacent(user)) if(parachute) @@ -495,10 +495,10 @@ else . += "It seems to be unpacked." -/obj/item/weapon/storage/backpack/parachute/handleParachute() +/obj/item/storage/backpack/parachute/handleParachute() parachute = FALSE //If you parachute in, the parachute has probably been used. -/obj/item/weapon/storage/backpack/parachute/verb/pack_parachute() +/obj/item/storage/backpack/parachute/verb/pack_parachute() set name = "Pack/Unpack Parachute" set category = "Object" @@ -544,7 +544,7 @@ "You decide not to unpack \the [src]!") return -/obj/item/weapon/storage/backpack/satchel/ranger +/obj/item/storage/backpack/satchel/ranger name = "ranger satchel" desc = "A satchel designed for the Go Go ERT Rangers series to allow for slightly bigger carry capacity for the ERT-Rangers.\ Unlike the show claims, it is not a phoron-enhanced satchel of holding with plot-relevant content." diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index 80c760c3f96..fba3e65d0f4 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/storage/backpack/saddlebag +/obj/item/storage/backpack/saddlebag name = "Horse Saddlebags" desc = "A saddle that holds items. Seems slightly bulky." icon = 'icons/inventory/back/item_vr.dmi' @@ -10,7 +10,7 @@ var/taurtype = /datum/sprite_accessory/tail/taur/horse //Acceptable taur type to be wearing this var/no_message = "You aren't the appropriate taur type to wear this!" -/obj/item/weapon/storage/backpack/saddlebag/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) +/obj/item/storage/backpack/saddlebag/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) if(..()) if(istype(H) && istype(H.tail_style, taurtype)) return 1 @@ -19,14 +19,14 @@ return 0 /* If anyone wants to make some... this is how you would. -/obj/item/weapon/storage/backpack/saddlebag/spider +/obj/item/storage/backpack/saddlebag/spider name = "Drider Saddlebags" item_state = "saddlebag_drider" icon_state = "saddlebag_drider" var/taurtype = /datum/sprite_accessory/tail/taur/spider */ -/obj/item/weapon/storage/backpack/saddlebag_common //Shared bag for other taurs with sturdy backs +/obj/item/storage/backpack/saddlebag_common //Shared bag for other taurs with sturdy backs name = "Taur Saddlebags" desc = "A saddle that holds items. Seems slightly bulky." icon = 'icons/inventory/back/item_vr.dmi' @@ -38,7 +38,7 @@ slowdown = 0.5 //And are slower, too... var/no_message = "You aren't the appropriate taur type to wear this!" -/obj/item/weapon/storage/backpack/saddlebag_common/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) +/obj/item/storage/backpack/saddlebag_common/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) if(..()) if(!istype(H))//Error, non HUMAN. log_runtime("[H] was not a valid human!") @@ -51,7 +51,7 @@ -/obj/item/weapon/storage/backpack/saddlebag_common/robust //Shared bag for other taurs with sturdy backs +/obj/item/storage/backpack/saddlebag_common/robust //Shared bag for other taurs with sturdy backs name = "Robust Saddlebags" desc = "A saddle that holds items. Seems robust." icon = 'icons/inventory/back/item_vr.dmi' @@ -60,7 +60,7 @@ icon_state = "robustsaddle" icon_base = "robustsaddle" -/obj/item/weapon/storage/backpack/saddlebag_common/vest //Shared bag for other taurs with sturdy backs +/obj/item/storage/backpack/saddlebag_common/vest //Shared bag for other taurs with sturdy backs name = "Taur Duty Vest" desc = "An armored vest with the armor modules replaced with various handy compartments with decent storage capacity. Useless for protection though. Holds less than a saddle." icon = 'icons/inventory/back/item_vr.dmi' @@ -71,29 +71,29 @@ max_storage_space = INVENTORY_STANDARD_SPACE slowdown = 0 -/obj/item/weapon/storage/backpack/dufflebag/fluff //Black dufflebag without syndie buffs. +/obj/item/storage/backpack/dufflebag/fluff //Black dufflebag without syndie buffs. name = "plain black dufflebag" desc = "A large dufflebag for holding extra tactical supplies." icon_state = "duffle_syndie" -/obj/item/weapon/storage/backpack +/obj/item/storage/backpack sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/back/mob_teshari.dmi', SPECIES_WEREBEAST = 'icons/inventory/back/mob_vr_werebeast.dmi') -/obj/item/weapon/storage/backpack/ert +/obj/item/storage/backpack/ert max_storage_space = INVENTORY_DUFFLEBAG_SPACE ///Exploration Bags/// -/obj/item/weapon/storage/backpack/explorer +/obj/item/storage/backpack/explorer name = "exploration backpack" desc = "A backpack for carrying a large number of supplies easily." icon = 'icons/inventory/back/item_vr.dmi' icon_override = 'icons/inventory/back/mob_vr.dmi' icon_state = "explorer" -/obj/item/weapon/storage/backpack/satchel/explorer +/obj/item/storage/backpack/satchel/explorer name = "exploration satchel" desc = "A satchel for carrying a large number of supplies easily." icon = 'icons/inventory/back/item_vr.dmi' @@ -101,7 +101,7 @@ icon_state = "explorer_satchel" item_state_slots = null -/obj/item/weapon/storage/backpack/messenger/explorer +/obj/item/storage/backpack/messenger/explorer name = "exploration messenger bag" desc = "A sturdy backpack worn over one shoulder." icon = 'icons/inventory/back/item_vr.dmi' @@ -109,7 +109,7 @@ icon_state = "explorer_courier" item_state_slots = null -/obj/item/weapon/storage/backpack/dufflebag/explorer +/obj/item/storage/backpack/dufflebag/explorer name = "exploration dufflebag" desc = "A large dufflebag for holding extra supplies." icon = 'icons/inventory/back/item_vr.dmi' @@ -118,14 +118,14 @@ ///Talon Bags/// -/obj/item/weapon/storage/backpack/talon +/obj/item/storage/backpack/talon name = "Talon backpack" desc = "A backpack for carrying a large number of supplies easily." icon = 'icons/inventory/back/item_vr.dmi' icon_override = 'icons/inventory/back/mob_vr.dmi' icon_state = "talon" -/obj/item/weapon/storage/backpack/satchel/talon +/obj/item/storage/backpack/satchel/talon name = "Talon satchel" desc = "A satchel for carrying a large number of supplies easily." icon = 'icons/inventory/back/item_vr.dmi' @@ -133,7 +133,7 @@ icon_state = "talon_satchel" item_state_slots = null -/obj/item/weapon/storage/backpack/messenger/talon +/obj/item/storage/backpack/messenger/talon name = "Talon messenger bag" desc = "A sturdy backpack worn over one shoulder." icon = 'icons/inventory/back/item_vr.dmi' @@ -141,7 +141,7 @@ icon_state = "talon_courier" item_state_slots = null -/obj/item/weapon/storage/backpack/dufflebag/talon +/obj/item/storage/backpack/dufflebag/talon name = "Talon dufflebag" desc = "A large dufflebag for holding extra supplies." icon = 'icons/inventory/back/item_vr.dmi' @@ -150,7 +150,7 @@ ///Roboticist Bags/// -/obj/item/weapon/storage/backpack/satchel/roboticist +/obj/item/storage/backpack/satchel/roboticist name = "roboticist satchel" desc = "A satchel for carrying a large number of spare parts easily." icon = 'icons/inventory/back/item_vr.dmi' @@ -158,7 +158,7 @@ item_state = "satchel-robo" icon_state = "satchel-robo" -/obj/item/weapon/storage/backpack/roboticist +/obj/item/storage/backpack/roboticist name = "roboticist backpack" desc = "A backpack for carrying a large number of spare parts easily." icon = 'icons/inventory/back/item_vr.dmi' @@ -168,7 +168,7 @@ ///Vintage Military Bags/// -/obj/item/weapon/storage/backpack/vietnam +/obj/item/storage/backpack/vietnam name = "vietnam backpack" desc = "There are tangos in the trees! We need napalm right now! Why is my gun jammed?" icon = 'icons/inventory/back/item_vr.dmi' @@ -176,7 +176,7 @@ item_state = "nambackpack" icon_state = "nambackpack" -/obj/item/weapon/storage/backpack/russian +/obj/item/storage/backpack/russian name = "russian backpack" desc = "Useful for carrying large quantities of vodka." icon = 'icons/inventory/back/item_vr.dmi' @@ -184,7 +184,7 @@ item_state = "ru_rucksack" icon_state = "ru_rucksack" -/obj/item/weapon/storage/backpack/korean +/obj/item/storage/backpack/korean name = "korean backpack" desc = "Insert witty description here." icon = 'icons/inventory/back/item_vr.dmi' @@ -194,7 +194,7 @@ //strapless -/obj/item/weapon/storage/backpack/satchel/strapless +/obj/item/storage/backpack/satchel/strapless name = "strapless satchel" desc = "A satchel for carrying a large number of supplies easily. Without Straps" icon = 'icons/inventory/back/item_vr.dmi' diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 3d26e518a19..a388372e897 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -25,7 +25,7 @@ // ----------------------------- // Generic non-item // ----------------------------- -/obj/item/weapon/storage/bag +/obj/item/storage/bag allow_quick_gather = 1 allow_quick_empty = 1 display_contents_with_number = 0 // UNStABLE AS FuCK, turn on when it stops crashing clients @@ -37,7 +37,7 @@ // ----------------------------- // Trash bag // ----------------------------- -/obj/item/weapon/storage/bag/trash +/obj/item/storage/bag/trash name = "trash bag" desc = "It's the heavy-duty black polymer kind. Time to take out the trash!" icon = 'icons/obj/janitor.dmi' @@ -50,9 +50,9 @@ max_w_class = ITEMSIZE_SMALL max_storage_space = ITEMSIZE_SMALL * 21 can_hold = list() // any - cant_hold = list(/obj/item/weapon/disk/nuclear) + cant_hold = list(/obj/item/disk/nuclear) -/obj/item/weapon/storage/bag/trash/update_icon() +/obj/item/storage/bag/trash/update_icon() if(contents.len == 0) icon_state = "trashbag0" else if(contents.len < 9) @@ -61,7 +61,7 @@ icon_state = "trashbag2" else icon_state = "trashbag3" -/obj/item/weapon/storage/bag/trash/holding +/obj/item/storage/bag/trash/holding name = "trash bag of holding" desc = "The latest and greatest in custodial convenience, a trashbag that is capable of holding vast quantities of garbage." icon_state = "bluetrashbag" @@ -69,13 +69,13 @@ max_w_class = ITEMSIZE_NORMAL max_storage_space = ITEMSIZE_COST_NORMAL * 10 // Slightly less than BoH -/obj/item/weapon/storage/bag/trash/holding/update_icon() +/obj/item/storage/bag/trash/holding/update_icon() return // ----------------------------- // Plastic Bag // ----------------------------- -/obj/item/weapon/storage/bag/plasticbag +/obj/item/storage/bag/plasticbag name = "plastic bag" desc = "It's a very flimsy, very noisy alternative to a bag." icon = 'icons/obj/trash.dmi' @@ -86,7 +86,7 @@ w_class = ITEMSIZE_LARGE max_w_class = ITEMSIZE_SMALL can_hold = list() // any - cant_hold = list(/obj/item/weapon/disk/nuclear) + cant_hold = list(/obj/item/disk/nuclear) // ----------------------------- // Mining Satchel @@ -95,7 +95,7 @@ * Mechoid - Orebags are the most common quick-gathering thing, and also have tons of lag associated with it. * Their checks are going to be hyper-simplified due to this, and their INCREDIBLY singular target contents. */ -/obj/item/weapon/storage/bag/ore +/obj/item/storage/bag/ore name = "mining satchel" desc = "This little bugger can be used to store and transport ores." icon = 'icons/obj/mining.dmi' @@ -104,7 +104,7 @@ w_class = ITEMSIZE_NORMAL max_storage_space = ITEMSIZE_COST_NORMAL * 25 max_w_class = ITEMSIZE_NORMAL - can_hold = list(/obj/item/weapon/ore) + can_hold = list(/obj/item/ore) var/current_capacity = 0 var/max_pickup = 100 //How much ore can be picked up in one go. There to prevent someone from walking on a turf with 10000 ore and making the server cry. var/list/stored_ore = list( @@ -130,25 +130,25 @@ "rutile" = 0) var/last_update = 0 -/obj/item/weapon/storage/bag/ore/holding +/obj/item/storage/bag/ore/holding name = "mining satchel of holding" desc = "Like a mining satchel, but when you put your hand in, you're pretty sure you can feel time itself." icon_state = "satchel_bspace" max_storage_space = ITEMSIZE_COST_NORMAL * 15000 // This should never, ever, ever be reached. -/obj/item/weapon/storage/bag/ore/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/storage/bag/ore/attackby(obj/item/W as obj, mob/user as mob) if(current_capacity >= max_storage_space) to_chat(user, "\the [src] is too full to possibly fit anything else inside of it.") return - if (istype(W, /obj/item/weapon/ore)) - var/obj/item/weapon/ore/ore = W + if (istype(W, /obj/item/ore)) + var/obj/item/ore/ore = W stored_ore[ore.material]++ current_capacity++ user.remove_from_mob(W) qdel(ore) -/obj/item/weapon/storage/bag/ore/remove_from_storage(obj/item/W as obj, atom/new_location) +/obj/item/storage/bag/ore/remove_from_storage(obj/item/W as obj, atom/new_location) if(!istype(W)) return 0 if(new_location) @@ -166,19 +166,19 @@ update_icon() return 1 -/obj/item/weapon/storage/bag/ore/gather_all(turf/T as turf, mob/user as mob, var/silent = 0) +/obj/item/storage/bag/ore/gather_all(turf/T as turf, mob/user as mob, var/silent = 0) var/success = 0 var/failure = 0 var/current_pickup = 0 var/max_pickup_reached = 0 - for(var/obj/item/weapon/ore/O in T) //Only ever grabs ores. Doesn't do any extraneous checks, as all ore is the same size. Tons of checks means it causes hanging for up to three seconds. + for(var/obj/item/ore/O in T) //Only ever grabs ores. Doesn't do any extraneous checks, as all ore is the same size. Tons of checks means it causes hanging for up to three seconds. if(current_capacity >= max_storage_space) failure = 1 break if(current_pickup >= max_pickup) max_pickup_reached = 1 break - var/obj/item/weapon/ore/ore = O + var/obj/item/ore/ore = O stored_ore[ore.material]++ current_capacity++ current_pickup++ @@ -203,31 +203,31 @@ current_capacity = 0 // Set the amount of ore in the satchel to 0. current_pickup = 0 -/obj/item/weapon/storage/bag/ore/equipped(mob/user) +/obj/item/storage/bag/ore/equipped(mob/user) ..() if(user.get_inventory_slot(src) == slot_wear_suit || slot_l_hand || slot_l_hand || slot_belt) //Basically every place they can go. Makes sure it doesn't unregister if moved to other slots. user.AddComponent(/datum/component/recursive_move) - RegisterSignal(user, COMSIG_OBSERVER_MOVED, /obj/item/weapon/storage/bag/ore/proc/autoload, user, override = TRUE) + RegisterSignal(user, COMSIG_OBSERVER_MOVED, /obj/item/storage/bag/ore/proc/autoload, user, override = TRUE) -/obj/item/weapon/storage/bag/ore/dropped(mob/user) +/obj/item/storage/bag/ore/dropped(mob/user) ..() if(user.get_inventory_slot(src) == slot_wear_suit || slot_l_hand || slot_l_hand || slot_belt) //See above. This should really be a define. user.AddComponent(/datum/component/recursive_move) - RegisterSignal(user, COMSIG_OBSERVER_MOVED, /obj/item/weapon/storage/bag/ore/proc/autoload, user, override = TRUE) + RegisterSignal(user, COMSIG_OBSERVER_MOVED, /obj/item/storage/bag/ore/proc/autoload, user, override = TRUE) else UnregisterSignal(user, COMSIG_OBSERVER_MOVED) -/obj/item/weapon/storage/bag/ore/proc/autoload(mob/user) - var/obj/item/weapon/ore/O = locate() in get_turf(src) +/obj/item/storage/bag/ore/proc/autoload(mob/user) + var/obj/item/ore/O = locate() in get_turf(src) if(O) gather_all(get_turf(src), user) -/obj/item/weapon/storage/bag/ore/proc/rangedload(atom/A, mob/user) - var/obj/item/weapon/ore/O = locate() in get_turf(A) +/obj/item/storage/bag/ore/proc/rangedload(atom/A, mob/user) + var/obj/item/ore/O = locate() in get_turf(A) if(O) gather_all(get_turf(A), user) -/obj/item/weapon/storage/bag/ore/examine(mob/user) +/obj/item/storage/bag/ore/examine(mob/user) . = ..() if(!Adjacent(user)) //Can only check the contents of ore bags if you can physically reach them. @@ -245,13 +245,13 @@ if(!has_ore) . += "Nothing." -/obj/item/weapon/storage/bag/ore/open(mob/user as mob) //No opening it for the weird UI of having shit-tons of ore inside it. +/obj/item/storage/bag/ore/open(mob/user as mob) //No opening it for the weird UI of having shit-tons of ore inside it. user.examinate(src) // ----------------------------- // Plant bag // ----------------------------- -/obj/item/weapon/storage/bag/plants +/obj/item/storage/bag/plants name = "plant bag" icon = 'icons/obj/hydroponics_machines_vr.dmi' icon_state = "plantbag" @@ -259,9 +259,9 @@ max_storage_space = ITEMSIZE_COST_NORMAL * 25 max_w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_SMALL - can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/weapon/grown) + can_hold = list(/obj/item/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/grown) -/obj/item/weapon/storage/bag/plants/large +/obj/item/storage/bag/plants/large name = "large plant bag" icon_state = "large_plantbag" desc = "A large and sturdy bag used to transport fresh produce with ease." @@ -273,7 +273,7 @@ // Because it stacks stacks, this doesn't operate normally. // However, making it a storage/bag allows us to reuse existing code in some places. -Sayu -/obj/item/weapon/storage/bag/sheetsnatcher +/obj/item/storage/bag/sheetsnatcher name = "sheet snatcher" icon = 'icons/obj/mining.dmi' icon_state = "sheetsnatcher" @@ -285,7 +285,7 @@ allow_quick_empty = 1 // this function is superceded -/obj/item/weapon/storage/bag/sheetsnatcher/can_be_inserted(obj/item/W as obj, stop_messages = 0) +/obj/item/storage/bag/sheetsnatcher/can_be_inserted(obj/item/W as obj, stop_messages = 0) if(!istype(W,/obj/item/stack/material)) if(!stop_messages) to_chat(usr, "The snatcher does not accept [W].") @@ -301,7 +301,7 @@ // Modified handle_item_insertion. Would prefer not to, but... -/obj/item/weapon/storage/bag/sheetsnatcher/handle_item_insertion(obj/item/W as obj, prevent_warning = 0) +/obj/item/storage/bag/sheetsnatcher/handle_item_insertion(obj/item/W as obj, prevent_warning = 0) var/obj/item/stack/material/S = W if(!istype(S)) return 0 @@ -338,7 +338,7 @@ // Sets up numbered display to show the stack size of each stored mineral // NOTE: numbered display is turned off currently because it's broken -/obj/item/weapon/storage/bag/sheetsnatcher/orient2hud(mob/user as mob) +/obj/item/storage/bag/sheetsnatcher/orient2hud(mob/user as mob) var/adjusted_contents = contents.len //Numbered contents display @@ -360,7 +360,7 @@ return // Modified quick_empty verb drops appropriate sized stacks -/obj/item/weapon/storage/bag/sheetsnatcher/quick_empty() +/obj/item/storage/bag/sheetsnatcher/quick_empty() var/location = get_turf(src) for(var/obj/item/stack/material/S in contents) var/cur_amount = S.get_amount() @@ -377,7 +377,7 @@ update_icon() // Instead of removing -/obj/item/weapon/storage/bag/sheetsnatcher/remove_from_storage(obj/item/W as obj, atom/new_location) +/obj/item/storage/bag/sheetsnatcher/remove_from_storage(obj/item/W as obj, atom/new_location) var/obj/item/stack/material/S = W if(!istype(S)) return 0 @@ -397,7 +397,7 @@ // Sheet Snatcher (Cyborg) // ----------------------------- -/obj/item/weapon/storage/bag/sheetsnatcher/borg +/obj/item/storage/bag/sheetsnatcher/borg name = "sheet snatcher 9000" desc = null capacity = 500//Borgs get more because >specialization @@ -406,7 +406,7 @@ // Cash Bag // ----------------------------- -/obj/item/weapon/storage/bag/cash +/obj/item/storage/bag/cash name = "cash bag" icon = 'icons/obj/storage.dmi' icon_state = "cashbag" @@ -414,12 +414,12 @@ max_storage_space = ITEMSIZE_COST_NORMAL * 25 max_w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_SMALL - can_hold = list(/obj/item/weapon/coin,/obj/item/weapon/spacecash,/obj/item/weapon/spacecasinocash) + can_hold = list(/obj/item/coin,/obj/item/spacecash,/obj/item/spacecasinocash) // ----------------------------- // Chemistry Bag // ----------------------------- -/obj/item/weapon/storage/bag/chemistry +/obj/item/storage/bag/chemistry name = "chemistry bag" icon = 'icons/obj/storage_vr.dmi' icon_state = "chembag" @@ -427,12 +427,12 @@ max_storage_space = 200 w_class = ITEMSIZE_LARGE slowdown = 3 - can_hold = list(/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/glass/bottle) + can_hold = list(/obj/item/reagent_containers/pill,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/glass/bottle) // ----------------------------- // Xeno Bag // ----------------------------- -/obj/item/weapon/storage/bag/xeno +/obj/item/storage/bag/xeno name = "xenobiology bag" icon = 'icons/obj/storage_vr.dmi' icon_state = "xenobag" @@ -440,12 +440,12 @@ max_storage_space = ITEMSIZE_COST_SMALL * 12 max_w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_SMALL - can_hold = list(/obj/item/slime_extract,/obj/item/slimepotion, /obj/item/weapon/reagent_containers/food/snacks/monkeycube) + can_hold = list(/obj/item/slime_extract,/obj/item/slimepotion, /obj/item/reagent_containers/food/snacks/monkeycube) // ----------------------------- // Virology Bag // ----------------------------- -/obj/item/weapon/storage/bag/virology +/obj/item/storage/bag/virology name = "virology bag" icon = 'icons/obj/storage_vr.dmi' icon_state = "biobag" @@ -453,12 +453,12 @@ max_storage_space = ITEMSIZE_COST_SMALL * 12 max_w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_SMALL - can_hold = list(/obj/item/weapon/reagent_containers/glass/beaker/vial/,/obj/item/weapon/virusdish/) + can_hold = list(/obj/item/reagent_containers/glass/beaker/vial/,/obj/item/virusdish/) // ----------------------------- // Food Bag // ----------------------------- -/obj/item/weapon/storage/bag/food +/obj/item/storage/bag/food name = "food bag" icon = 'icons/obj/storage_vr.dmi' icon_state = "foodbag" @@ -466,12 +466,12 @@ max_storage_space = ITEMSIZE_COST_NORMAL * 25 max_w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_SMALL - can_hold = list(/obj/item/weapon/reagent_containers/food/snacks,/obj/item/weapon/reagent_containers/food/condiment) + can_hold = list(/obj/item/reagent_containers/food/snacks,/obj/item/reagent_containers/food/condiment) // ----------------------------- // Food Bag (Service Hound) // ----------------------------- -/obj/item/weapon/storage/bag/serviceborg +/obj/item/storage/bag/serviceborg name = "service bag" icon = 'icons/obj/storage_vr.dmi' icon_state = "foodbag" @@ -479,14 +479,14 @@ max_storage_space = ITEMSIZE_COST_NORMAL * 25 max_w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_SMALL - can_hold = list(/obj/item/weapon/reagent_containers/food/snacks,/obj/item/weapon/reagent_containers/food/condiment, - /obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/coin,/obj/item/weapon/spacecash, - /obj/item/weapon/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/weapon/grown,/obj/item/weapon/reagent_containers/pill) + can_hold = list(/obj/item/reagent_containers/food/snacks,/obj/item/reagent_containers/food/condiment, + /obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/glass/bottle,/obj/item/coin,/obj/item/spacecash, + /obj/item/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/grown,/obj/item/reagent_containers/pill) // ----------------------------- // Evidence Bag // ----------------------------- -/obj/item/weapon/storage/bag/detective +/obj/item/storage/bag/detective name = "secure satchel" icon = 'icons/obj/storage_vr.dmi' icon_state = "detbag" @@ -494,4 +494,4 @@ max_storage_space = ITEMSIZE_COST_NORMAL * 15 max_w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_SMALL - can_hold = list(/obj/item/weapon/forensics/swab,/obj/item/weapon/sample/print,/obj/item/weapon/sample/fibers,/obj/item/weapon/evidencebag) + can_hold = list(/obj/item/forensics/swab,/obj/item/sample/print,/obj/item/sample/fibers,/obj/item/evidencebag) diff --git a/code/game/objects/items/weapons/storage/bags_vr.dm b/code/game/objects/items/weapons/storage/bags_vr.dm index 6f9d0a0b151..0f6368f9ace 100644 --- a/code/game/objects/items/weapons/storage/bags_vr.dm +++ b/code/game/objects/items/weapons/storage/bags_vr.dm @@ -1,2 +1,2 @@ -/obj/item/weapon/storage/bag/chemistry +/obj/item/storage/bag/chemistry slot_flags = null diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index f21c6e60735..63ab48a9324 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/storage/belt +/obj/item/storage/belt name = "belt" desc = "Can hold various things." icon = 'icons/inventory/belt/item.dmi' @@ -15,7 +15,7 @@ var/show_above_suit = 0 -/obj/item/weapon/storage/belt/verb/toggle_layer() +/obj/item/storage/belt/verb/toggle_layer() set name = "Switch Belt Layer" set category = "Object" @@ -26,7 +26,7 @@ update_icon() //Some belts have sprites to show icons -/obj/item/weapon/storage/belt/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0,var/icon/clip_mask = null) +/obj/item/storage/belt/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0,var/icon/clip_mask = null) var/image/standing = ..() if(!inhands && contents.len) for(var/obj/item/i in contents) @@ -38,348 +38,348 @@ standing.add_overlay(add_icon) return standing -/obj/item/weapon/storage/update_icon() +/obj/item/storage/update_icon() if (ismob(src.loc)) var/mob/M = src.loc M.update_inv_belt() -/obj/item/weapon/storage/belt/utility +/obj/item/storage/belt/utility name = "tool-belt" //Carn: utility belt is nicer, but it bamboozles the text parsing. desc = "Can hold various tools." icon_state = "utility" can_hold = list( - ///obj/item/weapon/combitool, - /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/tool/transforming/powerdrill, - /obj/item/weapon/tool/transforming/jawsoflife, - /obj/item/device/multitool, - /obj/item/device/flashlight, - /obj/item/weapon/cell/device, + ///obj/item/combitool, + /obj/item/tool/crowbar, + /obj/item/tool/screwdriver, + /obj/item/weldingtool, + /obj/item/tool/wirecutters, + /obj/item/tool/wrench, + /obj/item/tool/transforming/powerdrill, + /obj/item/tool/transforming/jawsoflife, + /obj/item/multitool, + /obj/item/flashlight, + /obj/item/cell/device, /obj/item/stack/cable_coil, - /obj/item/device/t_scanner, - /obj/item/device/analyzer, + /obj/item/t_scanner, + /obj/item/analyzer, /obj/item/clothing/glasses, /obj/item/clothing/gloves, - /obj/item/device/pda, - /obj/item/device/megaphone, + /obj/item/pda, + /obj/item/megaphone, /obj/item/taperoll, - /obj/item/device/radio/headset, - /obj/item/device/robotanalyzer, - /obj/item/weapon/material/minihoe, - /obj/item/weapon/material/knife/machete/hatchet, - /obj/item/device/analyzer/plant_analyzer, - /obj/item/weapon/extinguisher/mini, - /obj/item/weapon/tape_roll, - /obj/item/device/integrated_electronics/wirer, - /obj/item/device/integrated_electronics/debugger, //Vorestation edit adding debugger to toolbelt can hold list - /obj/item/weapon/shovel/spade, //VOREStation edit. If it can hold minihoes and hatchers, why not the gardening spade? + /obj/item/radio/headset, + /obj/item/robotanalyzer, + /obj/item/material/minihoe, + /obj/item/material/knife/machete/hatchet, + /obj/item/analyzer/plant_analyzer, + /obj/item/extinguisher/mini, + /obj/item/tape_roll, + /obj/item/integrated_electronics/wirer, + /obj/item/integrated_electronics/debugger, //Vorestation edit adding debugger to toolbelt can hold list + /obj/item/shovel/spade, //VOREStation edit. If it can hold minihoes and hatchers, why not the gardening spade? /obj/item/stack/nanopaste, //VOREStation edit. Think of it as a tube of superglue. Belts hold that all the time. - /obj/item/device/geiger //VOREStation edit. Engineers work with rad-slinging stuff sometimes too + /obj/item/geiger //VOREStation edit. Engineers work with rad-slinging stuff sometimes too ) -/obj/item/weapon/storage/belt/utility/full +/obj/item/storage/belt/utility/full starts_with = list( - /obj/item/weapon/tool/screwdriver, - /obj/item/weapon/tool/wrench, - /obj/item/weapon/weldingtool, - /obj/item/weapon/tool/crowbar, - /obj/item/weapon/tool/wirecutters, + /obj/item/tool/screwdriver, + /obj/item/tool/wrench, + /obj/item/weldingtool, + /obj/item/tool/crowbar, + /obj/item/tool/wirecutters, /obj/item/stack/cable_coil/random_belt ) -/obj/item/weapon/storage/belt/utility/full/multitool +/obj/item/storage/belt/utility/full/multitool starts_with = list( - /obj/item/weapon/tool/screwdriver, - /obj/item/weapon/tool/wrench, - /obj/item/weapon/weldingtool, - /obj/item/weapon/tool/crowbar, - /obj/item/weapon/tool/wirecutters, + /obj/item/tool/screwdriver, + /obj/item/tool/wrench, + /obj/item/weldingtool, + /obj/item/tool/crowbar, + /obj/item/tool/wirecutters, /obj/item/stack/cable_coil/random_belt, - /obj/item/device/multitool + /obj/item/multitool ) -/obj/item/weapon/storage/belt/utility/atmostech +/obj/item/storage/belt/utility/atmostech starts_with = list( - /obj/item/weapon/tool/screwdriver, - /obj/item/weapon/tool/wrench, - /obj/item/weapon/weldingtool, - /obj/item/weapon/tool/crowbar, - /obj/item/weapon/tool/wirecutters, - /obj/item/device/analyzer, //Vorestation edit. Gives atmos techs a few extra tools fitting their job from the start - /obj/item/weapon/extinguisher/mini //Vorestation edit. As above, the mini's much more handy to have rather than lugging a big one around + /obj/item/tool/screwdriver, + /obj/item/tool/wrench, + /obj/item/weldingtool, + /obj/item/tool/crowbar, + /obj/item/tool/wirecutters, + /obj/item/analyzer, //Vorestation edit. Gives atmos techs a few extra tools fitting their job from the start + /obj/item/extinguisher/mini //Vorestation edit. As above, the mini's much more handy to have rather than lugging a big one around ) -/obj/item/weapon/storage/belt/utility/chief +/obj/item/storage/belt/utility/chief name = "chief engineer's toolbelt" desc = "Holds tools, looks snazzy." icon_state = "utilitybelt_ce" item_state = "utility_ce" storage_slots = 8 //If they get better everything-else, why not the belt too? can_hold = list( - /obj/item/weapon/rcd, //They've given one from the get-go, it's hard to imagine they wouldn't be given something that can store it neater than a bag - /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/tool/transforming/powerdrill, - /obj/item/weapon/tool/transforming/jawsoflife, - /obj/item/device/multitool, - /obj/item/device/flashlight, - /obj/item/weapon/cell/device, + /obj/item/rcd, //They've given one from the get-go, it's hard to imagine they wouldn't be given something that can store it neater than a bag + /obj/item/tool/crowbar, + /obj/item/tool/screwdriver, + /obj/item/weldingtool, + /obj/item/tool/wirecutters, + /obj/item/tool/wrench, + /obj/item/tool/transforming/powerdrill, + /obj/item/tool/transforming/jawsoflife, + /obj/item/multitool, + /obj/item/flashlight, + /obj/item/cell/device, /obj/item/stack/cable_coil, - /obj/item/device/t_scanner, - /obj/item/device/analyzer, + /obj/item/t_scanner, + /obj/item/analyzer, /obj/item/clothing/glasses, /obj/item/clothing/gloves, - /obj/item/device/pda, - /obj/item/device/megaphone, + /obj/item/pda, + /obj/item/megaphone, /obj/item/taperoll, - /obj/item/device/radio/headset, - /obj/item/device/robotanalyzer, - /obj/item/weapon/material/minihoe, - /obj/item/weapon/material/knife/machete/hatchet, - /obj/item/device/analyzer/plant_analyzer, - /obj/item/weapon/extinguisher/mini, - /obj/item/weapon/tape_roll, - /obj/item/device/integrated_electronics/wirer, - /obj/item/device/integrated_electronics/debugger, - /obj/item/weapon/shovel/spade, + /obj/item/radio/headset, + /obj/item/robotanalyzer, + /obj/item/material/minihoe, + /obj/item/material/knife/machete/hatchet, + /obj/item/analyzer/plant_analyzer, + /obj/item/extinguisher/mini, + /obj/item/tape_roll, + /obj/item/integrated_electronics/wirer, + /obj/item/integrated_electronics/debugger, + /obj/item/shovel/spade, /obj/item/stack/nanopaste, - /obj/item/device/geiger, + /obj/item/geiger, /obj/item/areaeditor/blueprints, //It's a bunch of paper that could prolly be rolled up & slipped into the belt, not to mention CE only, see the RCD's thing above /obj/item/wire_reader //As above ) -/obj/item/weapon/storage/belt/utility/chief/full +/obj/item/storage/belt/utility/chief/full starts_with = list( - /obj/item/weapon/tool/transforming/powerdrill, - /obj/item/weapon/tool/transforming/jawsoflife, - /obj/item/weapon/weldingtool/experimental, - /obj/item/device/multitool, + /obj/item/tool/transforming/powerdrill, + /obj/item/tool/transforming/jawsoflife, + /obj/item/weldingtool/experimental, + /obj/item/multitool, /obj/item/stack/cable_coil/random_belt, - /obj/item/weapon/extinguisher/mini, - /obj/item/device/analyzer + /obj/item/extinguisher/mini, + /obj/item/analyzer ) -/obj/item/weapon/storage/belt/utility/holding +/obj/item/storage/belt/utility/holding name = "tool-belt of holding" desc = "A belt that uses localized bluespace pockets to hold more items than expected!" icon_state = "utility_holding" storage_slots = 14 //twice the amount as a normal belt max_storage_space = ITEMSIZE_COST_NORMAL * 14 can_hold = list( - /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/tool/transforming/powerdrill, - /obj/item/weapon/tool/transforming/jawsoflife, - /obj/item/device/multitool, - /obj/item/device/flashlight, - /obj/item/weapon/cell/device, + /obj/item/tool/crowbar, + /obj/item/tool/screwdriver, + /obj/item/weldingtool, + /obj/item/tool/wirecutters, + /obj/item/tool/wrench, + /obj/item/tool/transforming/powerdrill, + /obj/item/tool/transforming/jawsoflife, + /obj/item/multitool, + /obj/item/flashlight, + /obj/item/cell/device, /obj/item/stack/cable_coil, - /obj/item/device/t_scanner, - /obj/item/device/analyzer, + /obj/item/t_scanner, + /obj/item/analyzer, /obj/item/clothing/glasses, /obj/item/clothing/gloves, - /obj/item/device/pda, - /obj/item/device/megaphone, + /obj/item/pda, + /obj/item/megaphone, /obj/item/taperoll, - /obj/item/device/radio/headset, - /obj/item/device/robotanalyzer, - /obj/item/weapon/material/minihoe, - /obj/item/weapon/material/knife/machete/hatchet, - /obj/item/device/analyzer/plant_analyzer, - /obj/item/weapon/extinguisher/mini, - /obj/item/weapon/tape_roll, - /obj/item/device/integrated_electronics/wirer, - /obj/item/device/integrated_electronics/debugger, - /obj/item/weapon/shovel/spade, + /obj/item/radio/headset, + /obj/item/robotanalyzer, + /obj/item/material/minihoe, + /obj/item/material/knife/machete/hatchet, + /obj/item/analyzer/plant_analyzer, + /obj/item/extinguisher/mini, + /obj/item/tape_roll, + /obj/item/integrated_electronics/wirer, + /obj/item/integrated_electronics/debugger, + /obj/item/shovel/spade, /obj/item/stack/nanopaste, - /obj/item/weapon/cell, //this is a bigger belt, might as well make it hold bigger cells too - /obj/item/weapon/pipe_dispenser, //bigger belt for bigger tools - /obj/item/weapon/rcd, //see above - /obj/item/device/quantum_pad_booster, - /obj/item/weapon/inducer, + /obj/item/cell, //this is a bigger belt, might as well make it hold bigger cells too + /obj/item/pipe_dispenser, //bigger belt for bigger tools + /obj/item/rcd, //see above + /obj/item/quantum_pad_booster, + /obj/item/inducer, /obj/item/stack/material/steel, /obj/item/stack/material/glass, - /obj/item/device/lightreplacer, - /obj/item/weapon/pickaxe/plasmacutter + /obj/item/lightreplacer, + /obj/item/pickaxe/plasmacutter ) -/obj/item/weapon/storage/belt/medical +/obj/item/storage/belt/medical name = "medical belt" desc = "Can hold various medical equipment." icon_state = "medical" can_hold = list( - /obj/item/device/healthanalyzer, - /obj/item/weapon/dnainjector, - /obj/item/weapon/reagent_containers/dropper, - /obj/item/weapon/reagent_containers/glass/beaker, - /obj/item/weapon/reagent_containers/glass/bottle, - /obj/item/weapon/reagent_containers/pill, - /obj/item/weapon/reagent_containers/syringe, - /obj/item/weapon/storage/quickdraw/syringe_case, //VOREStation Addition - Adds syringe cases, - /obj/item/weapon/flame/lighter/zippo, - /obj/item/weapon/storage/fancy/cigarettes, - /obj/item/weapon/storage/pill_bottle, + /obj/item/healthanalyzer, + /obj/item/dnainjector, + /obj/item/reagent_containers/dropper, + /obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/glass/bottle, + /obj/item/reagent_containers/pill, + /obj/item/reagent_containers/syringe, + /obj/item/storage/quickdraw/syringe_case, //VOREStation Addition - Adds syringe cases, + /obj/item/flame/lighter/zippo, + /obj/item/storage/fancy/cigarettes, + /obj/item/storage/pill_bottle, /obj/item/stack/medical, - /obj/item/device/radio/headset, - /obj/item/device/pda, + /obj/item/radio/headset, + /obj/item/pda, /obj/item/taperoll, - /obj/item/device/megaphone, + /obj/item/megaphone, /obj/item/clothing/mask/surgical, /obj/item/clothing/head/surgery, /obj/item/clothing/gloves, - /obj/item/weapon/reagent_containers/hypospray, + /obj/item/reagent_containers/hypospray, /obj/item/clothing/glasses, - /obj/item/weapon/tool/crowbar, - /obj/item/device/flashlight, - /obj/item/weapon/cell/device, - /obj/item/weapon/extinguisher/mini, - /obj/item/device/antibody_scanner, // VOREstation edit start - /obj/item/device/sleevemate, - /obj/item/device/mass_spectrometer, - /obj/item/weapon/surgical, + /obj/item/tool/crowbar, + /obj/item/flashlight, + /obj/item/cell/device, + /obj/item/extinguisher/mini, + /obj/item/antibody_scanner, // VOREstation edit start + /obj/item/sleevemate, + /obj/item/mass_spectrometer, + /obj/item/surgical, /obj/item/clothing/mask/chewable/candy/lolli // VOREstation edit end ) -/obj/item/weapon/storage/belt/medical/emt +/obj/item/storage/belt/medical/emt name = "EMT utility belt" desc = "A sturdy black webbing belt with attached pouches." icon_state = "ems" -/obj/item/weapon/storage/belt/medical/holding +/obj/item/storage/belt/medical/holding name = "medical belt of holding" desc = "A belt that uses localized bluespace pockets to hold more items than expected!" icon_state = "med_holding" storage_slots = 14 //twice the amount as a normal belt max_storage_space = ITEMSIZE_COST_NORMAL * 14 -/obj/item/weapon/storage/belt/security +/obj/item/storage/belt/security name = "security belt" desc = "Can hold security gear like handcuffs and flashes." icon_state = "security" max_w_class = ITEMSIZE_NORMAL can_hold = list( - /obj/item/weapon/grenade, - /obj/item/weapon/reagent_containers/spray/pepper, - /obj/item/weapon/handcuffs, - /obj/item/device/flash, + /obj/item/grenade, + /obj/item/reagent_containers/spray/pepper, + /obj/item/handcuffs, + /obj/item/flash, /obj/item/clothing/glasses, /obj/item/ammo_casing/a12g, /obj/item/ammo_magazine, - /obj/item/weapon/cell/device, - /obj/item/weapon/reagent_containers/food/snacks/donut/, - /obj/item/weapon/melee/baton, - /obj/item/weapon/gun/energy/taser, - /obj/item/weapon/gun/energy/stunrevolver, - /obj/item/weapon/gun/energy/stunrevolver/vintage, - /obj/item/weapon/gun/magnetic/railgun/heater/pistol, - /obj/item/weapon/gun/energy/gun, - /obj/item/weapon/flame/lighter, - /obj/item/device/flashlight, - /obj/item/device/taperecorder, - /obj/item/device/tape, - /obj/item/device/pda, - /obj/item/device/radio/headset, + /obj/item/cell/device, + /obj/item/reagent_containers/food/snacks/donut/, + /obj/item/melee/baton, + /obj/item/gun/energy/taser, + /obj/item/gun/energy/stunrevolver, + /obj/item/gun/energy/stunrevolver/vintage, + /obj/item/gun/magnetic/railgun/heater/pistol, + /obj/item/gun/energy/gun, + /obj/item/flame/lighter, + /obj/item/flashlight, + /obj/item/taperecorder, + /obj/item/rectape, + /obj/item/pda, + /obj/item/radio/headset, /obj/item/clothing/gloves, - /obj/item/device/hailer, - /obj/item/device/megaphone, - /obj/item/weapon/melee, + /obj/item/hailer, + /obj/item/megaphone, + /obj/item/melee, /obj/item/clothing/accessory/badge, - /obj/item/weapon/gun/projectile/sec, - /obj/item/weapon/gun/projectile/p92x, + /obj/item/gun/projectile/sec, + /obj/item/gun/projectile/p92x, /obj/item/taperoll, - /obj/item/weapon/gun/projectile/colt/detective, - /obj/item/device/holowarrant, - /obj/item/device/ticket_printer //VOREStation Edit + /obj/item/gun/projectile/colt/detective, + /obj/item/holowarrant, + /obj/item/ticket_printer //VOREStation Edit ) -/obj/item/weapon/storage/belt/detective +/obj/item/storage/belt/detective name = "forensic utility belt" desc = "A belt for holding forensics equipment." icon_state = "security" storage_slots = 7 max_w_class = ITEMSIZE_NORMAL can_hold = list( - /obj/item/device/taperecorder, - /obj/item/device/tape, + /obj/item/taperecorder, + /obj/item/rectape, /obj/item/clothing/glasses, - /obj/item/device/flashlight, - /obj/item/weapon/cell/device, - /obj/item/weapon/reagent_containers/spray/luminol, - /obj/item/weapon/sample, - /obj/item/weapon/forensics/sample_kit/powder, - /obj/item/weapon/forensics/swab, - /obj/item/device/uv_light, - /obj/item/weapon/forensics/sample_kit, - /obj/item/weapon/photo, - /obj/item/device/camera_film, - /obj/item/device/camera, - /obj/item/weapon/autopsy_scanner, - /obj/item/device/mass_spectrometer, + /obj/item/flashlight, + /obj/item/cell/device, + /obj/item/reagent_containers/spray/luminol, + /obj/item/sample, + /obj/item/forensics/sample_kit/powder, + /obj/item/forensics/swab, + /obj/item/uv_light, + /obj/item/forensics/sample_kit, + /obj/item/photo, + /obj/item/camera_film, + /obj/item/camera, + /obj/item/autopsy_scanner, + /obj/item/mass_spectrometer, /obj/item/clothing/accessory/badge, - /obj/item/device/reagent_scanner, - /obj/item/weapon/reagent_containers/dropper, - /obj/item/weapon/reagent_containers/syringe, - /obj/item/device/pda, - /obj/item/device/hailer, - /obj/item/device/megaphone, - /obj/item/device/radio/headset, + /obj/item/reagent_scanner, + /obj/item/reagent_containers/dropper, + /obj/item/reagent_containers/syringe, + /obj/item/pda, + /obj/item/hailer, + /obj/item/megaphone, + /obj/item/radio/headset, /obj/item/clothing/gloves, /obj/item/taperoll, - /obj/item/weapon/reagent_containers/spray/pepper, - /obj/item/weapon/handcuffs, - /obj/item/device/flash, - /obj/item/weapon/flame/lighter, - /obj/item/weapon/reagent_containers/food/snacks/donut/, + /obj/item/reagent_containers/spray/pepper, + /obj/item/handcuffs, + /obj/item/flash, + /obj/item/flame/lighter, + /obj/item/reagent_containers/food/snacks/donut/, ///obj/item/ammo_magazine, //Detectives don't get projectile weapons as standard here - ///obj/item/weapon/gun/projectile/colt/detective, //Detectives don't get projectile weapons as standard here - /obj/item/weapon/gun/energy/stunrevolver/detective, //In keeping with the same vein as above, they can store their special one - /obj/item/device/holowarrant, - /obj/item/weapon/reagent_containers/food/drinks/flask, - /obj/item/device/ticket_printer //VOREStation Edit + ///obj/item/gun/projectile/colt/detective, //Detectives don't get projectile weapons as standard here + /obj/item/gun/energy/stunrevolver/detective, //In keeping with the same vein as above, they can store their special one + /obj/item/holowarrant, + /obj/item/reagent_containers/food/drinks/flask, + /obj/item/ticket_printer //VOREStation Edit ) -/obj/item/weapon/storage/belt/soulstone +/obj/item/storage/belt/soulstone name = "soul stone belt" desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away" icon_state = "soulstone" storage_slots = 6 can_hold = list( - /obj/item/device/soulstone + /obj/item/soulstone ) -/obj/item/weapon/storage/belt/soulstone/full - starts_with = list(/obj/item/device/soulstone = 6) +/obj/item/storage/belt/soulstone/full + starts_with = list(/obj/item/soulstone = 6) -/obj/item/weapon/storage/belt/utility/alien +/obj/item/storage/belt/utility/alien name = "alien belt" desc = "A belt(?) that can hold things." icon = 'icons/obj/abductor.dmi' icon_state = "belt" item_state = "security" -/obj/item/weapon/storage/belt/utility/alien/full +/obj/item/storage/belt/utility/alien/full starts_with = list( - /obj/item/weapon/tool/screwdriver/alien, - /obj/item/weapon/tool/wrench/alien, - /obj/item/weapon/weldingtool/alien, - /obj/item/weapon/tool/crowbar/alien, - /obj/item/weapon/tool/wirecutters/alien, - /obj/item/device/multitool/alien, + /obj/item/tool/screwdriver/alien, + /obj/item/tool/wrench/alien, + /obj/item/weldingtool/alien, + /obj/item/tool/crowbar/alien, + /obj/item/tool/wirecutters/alien, + /obj/item/multitool/alien, /obj/item/stack/cable_coil/alien ) -/obj/item/weapon/storage/belt/medical/alien +/obj/item/storage/belt/medical/alien name = "alien belt" desc = "A belt(?) that can hold things." icon = 'icons/obj/abductor.dmi' @@ -387,46 +387,46 @@ item_state = "security" storage_slots = 8 can_hold = list( - /obj/item/device/healthanalyzer, - /obj/item/weapon/dnainjector, - /obj/item/weapon/reagent_containers/dropper, - /obj/item/weapon/reagent_containers/glass/beaker, - /obj/item/weapon/reagent_containers/glass/bottle, - /obj/item/weapon/reagent_containers/pill, - /obj/item/weapon/reagent_containers/syringe, - /obj/item/weapon/flame/lighter/zippo, - /obj/item/weapon/storage/fancy/cigarettes, - /obj/item/weapon/storage/pill_bottle, + /obj/item/healthanalyzer, + /obj/item/dnainjector, + /obj/item/reagent_containers/dropper, + /obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/glass/bottle, + /obj/item/reagent_containers/pill, + /obj/item/reagent_containers/syringe, + /obj/item/flame/lighter/zippo, + /obj/item/storage/fancy/cigarettes, + /obj/item/storage/pill_bottle, /obj/item/stack/medical, - /obj/item/device/radio/headset, - /obj/item/device/pda, + /obj/item/radio/headset, + /obj/item/pda, /obj/item/taperoll, - /obj/item/device/megaphone, + /obj/item/megaphone, /obj/item/clothing/mask/surgical, /obj/item/clothing/head/surgery, /obj/item/clothing/gloves, - /obj/item/weapon/reagent_containers/hypospray, + /obj/item/reagent_containers/hypospray, /obj/item/clothing/glasses, - /obj/item/weapon/tool/crowbar, - /obj/item/device/flashlight, - /obj/item/weapon/cell/device, - /obj/item/weapon/extinguisher/mini, - /obj/item/weapon/surgical + /obj/item/tool/crowbar, + /obj/item/flashlight, + /obj/item/cell/device, + /obj/item/extinguisher/mini, + /obj/item/surgical ) -/obj/item/weapon/storage/belt/medical/alien +/obj/item/storage/belt/medical/alien starts_with = list( - /obj/item/weapon/surgical/scalpel/alien, - /obj/item/weapon/surgical/hemostat/alien, - /obj/item/weapon/surgical/retractor/alien, - /obj/item/weapon/surgical/circular_saw/alien, - /obj/item/weapon/surgical/FixOVein/alien, - /obj/item/weapon/surgical/bone_clamp/alien, - /obj/item/weapon/surgical/cautery/alien, - /obj/item/weapon/surgical/surgicaldrill/alien + /obj/item/surgical/scalpel/alien, + /obj/item/surgical/hemostat/alien, + /obj/item/surgical/retractor/alien, + /obj/item/surgical/circular_saw/alien, + /obj/item/surgical/FixOVein/alien, + /obj/item/surgical/bone_clamp/alien, + /obj/item/surgical/cautery/alien, + /obj/item/surgical/surgicaldrill/alien ) -/obj/item/weapon/storage/belt/champion +/obj/item/storage/belt/champion name = "championship belt" desc = "Proves to the world that you are the strongest!" icon_state = "champion" @@ -435,7 +435,7 @@ "/obj/item/clothing/mask/luchador" ) -/obj/item/weapon/storage/belt/security/tactical +/obj/item/storage/belt/security/tactical name = "combat belt" desc = "Can hold security gear like handcuffs and flashes, with more pouches for more storage." icon_state = "swat" @@ -443,7 +443,7 @@ max_w_class = ITEMSIZE_NORMAL max_storage_space = ITEMSIZE_COST_NORMAL * 7 -/obj/item/weapon/storage/belt/bandolier +/obj/item/storage/belt/bandolier name = "shotgun bandolier" desc = "Designed to hold shotgun shells. Can't really hold more than that." icon_state = "bandolier1" @@ -461,12 +461,12 @@ /obj/item/ammo_casing/a12g/flechette ) -/obj/item/weapon/storage/belt/security/tactical/bandolier +/obj/item/storage/belt/security/tactical/bandolier name = "combat bandolier" desc = "Can hold security gear like handcuffs and flashes, with more pouches for more storage." icon_state = "bandolier2" -/obj/item/weapon/storage/belt/janitor +/obj/item/storage/belt/janitor name = "janitorial belt" desc = "A belt used to hold most janitorial supplies." icon_state = "janitor" @@ -474,60 +474,60 @@ max_w_class = ITEMSIZE_NORMAL can_hold = list( /obj/item/clothing/glasses, - /obj/item/device/flashlight, - /obj/item/weapon/cell/device, - /obj/item/weapon/grenade, - /obj/item/device/pda, - /obj/item/device/radio/headset, + /obj/item/flashlight, + /obj/item/cell/device, + /obj/item/grenade, + /obj/item/pda, + /obj/item/radio/headset, /obj/item/clothing/gloves, /obj/item/clothing/mask/surgical, //sterile mask, - /obj/item/device/assembly/mousetrap, - /obj/item/weapon/light/bulb, - /obj/item/weapon/light/tube, - /obj/item/weapon/flame/lighter, - /obj/item/device/megaphone, + /obj/item/assembly/mousetrap, + /obj/item/light/bulb, + /obj/item/light/tube, + /obj/item/flame/lighter, + /obj/item/megaphone, /obj/item/taperoll, - /obj/item/weapon/reagent_containers/spray, - /obj/item/weapon/soap, - /obj/item/device/lightreplacer, + /obj/item/reagent_containers/spray, + /obj/item/soap, + /obj/item/lightreplacer, /obj/item/clothing/glasses/hud/janitor ) -/obj/item/weapon/storage/belt/archaeology +/obj/item/storage/belt/archaeology name = "excavation gear-belt" desc = "Can hold various excavation gear." icon_state = "gear" can_hold = list( - /obj/item/weapon/storage/box/samplebags, - /obj/item/device/core_sampler, - /obj/item/device/beacon_locator, - /obj/item/device/radio/beacon, - /obj/item/device/gps, - /obj/item/device/measuring_tape, - /obj/item/device/flashlight, - /obj/item/weapon/cell/device, - /obj/item/weapon/pickaxe, - /obj/item/device/depth_scanner, - /obj/item/device/camera, - /obj/item/weapon/paper, - /obj/item/weapon/photo, - /obj/item/weapon/folder, - /obj/item/weapon/pen, - /obj/item/weapon/folder, - /obj/item/weapon/clipboard, - /obj/item/weapon/anodevice, + /obj/item/storage/box/samplebags, + /obj/item/core_sampler, + /obj/item/beacon_locator, + /obj/item/radio/beacon, + /obj/item/gps, + /obj/item/measuring_tape, + /obj/item/flashlight, + /obj/item/cell/device, + /obj/item/pickaxe, + /obj/item/depth_scanner, + /obj/item/camera, + /obj/item/paper, + /obj/item/photo, + /obj/item/folder, + /obj/item/pen, + /obj/item/folder, + /obj/item/clipboard, + /obj/item/anodevice, /obj/item/clothing/glasses, - /obj/item/weapon/tool/wrench, - /obj/item/weapon/tool/transforming/powerdrill, - /obj/item/weapon/storage/excavation, - /obj/item/weapon/anobattery, - /obj/item/device/ano_scanner, - /obj/item/weapon/pickaxe/hand, - /obj/item/device/xenoarch_multi_tool, - /obj/item/weapon/pickaxe/excavationdrill + /obj/item/tool/wrench, + /obj/item/tool/transforming/powerdrill, + /obj/item/storage/excavation, + /obj/item/anobattery, + /obj/item/ano_scanner, + /obj/item/pickaxe/hand, + /obj/item/xenoarch_multi_tool, + /obj/item/pickaxe/excavationdrill ) -/obj/item/weapon/storage/belt/fannypack +/obj/item/storage/belt/fannypack name = "leather fannypack" desc = "A dorky fannypack for keeping small items in." icon_state = "fannypack_leather" @@ -536,58 +536,58 @@ storage_slots = null max_storage_space = ITEMSIZE_COST_NORMAL * 2 -/obj/item/weapon/storage/belt/fannypack/black +/obj/item/storage/belt/fannypack/black name = "black fannypack" icon_state = "fannypack_black" item_state = "fannypack_black" -/obj/item/weapon/storage/belt/fannypack/blue +/obj/item/storage/belt/fannypack/blue name = "blue fannypack" icon_state = "fannypack_blue" item_state = "fannypack_blue" -/obj/item/weapon/storage/belt/fannypack/cyan +/obj/item/storage/belt/fannypack/cyan name = "cyan fannypack" icon_state = "fannypack_cyan" item_state = "fannypack_cyan" -/obj/item/weapon/storage/belt/fannypack/green +/obj/item/storage/belt/fannypack/green name = "green fannypack" icon_state = "fannypack_green" item_state = "fannypack_green" -/obj/item/weapon/storage/belt/fannypack/orange +/obj/item/storage/belt/fannypack/orange name = "orange fannypack" icon_state = "fannypack_orange" item_state = "fannypack_orange" -/obj/item/weapon/storage/belt/fannypack/purple +/obj/item/storage/belt/fannypack/purple name = "purple fannypack" icon_state = "fannypack_purple" item_state = "fannypack_purple" -/obj/item/weapon/storage/belt/fannypack/red +/obj/item/storage/belt/fannypack/red name = "red fannypack" icon_state = "fannypack_red" item_state = "fannypack_red" -/obj/item/weapon/storage/belt/fannypack/white +/obj/item/storage/belt/fannypack/white name = "white fannypack" icon_state = "fannypack_white" item_state = "fannypack_white" -/obj/item/weapon/storage/belt/fannypack/yellow +/obj/item/storage/belt/fannypack/yellow name = "yellow fannypack" icon_state = "fannypack_yellow" item_state = "fannypack_yellow" -/obj/item/weapon/storage/belt/ranger +/obj/item/storage/belt/ranger name = "ranger belt" desc = "The fancy utility-belt holding the tools, cuffs and gadgets of the Go Go ERT-Rangers. The belt buckle is not real phoron, but it is still surprisingly comfortable to wear." icon = 'icons/obj/clothing/ranger.dmi' icon_state = "ranger_belt" -/obj/item/weapon/storage/belt/dbandolier +/obj/item/storage/belt/dbandolier name = "\improper Donk-Soft bandolier" desc = "A Donk-Soft bandolier! Carry your spare darts anywhere! Ages 8 and up." icon_state = "dbandolier" diff --git a/code/game/objects/items/weapons/storage/belt_vr.dm b/code/game/objects/items/weapons/storage/belt_vr.dm index a9d78c13fb3..d6f2c665de6 100644 --- a/code/game/objects/items/weapons/storage/belt_vr.dm +++ b/code/game/objects/items/weapons/storage/belt_vr.dm @@ -1,9 +1,9 @@ -/obj/item/weapon/storage/belt +/obj/item/storage/belt sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/belt/mob_teshari.dmi', SPECIES_WEREBEAST = 'icons/inventory/belt/mob_vr_werebeast.dmi') -/obj/item/weapon/storage/belt/explorer +/obj/item/storage/belt/explorer name = "explorer's belt" desc = "A versatile belt with several pouches. It can hold a very wide variety of items, but less items overall than a dedicated belt. Still, it's useful for any explorer who wants to be prepared for anything they might find." icon = 'icons/inventory/belt/item_vr.dmi' @@ -14,46 +14,46 @@ max_w_class = ITEMSIZE_NORMAL //limits the max size of thing that can be put in, so no using it to hold five laser cannons max_storage_space = ITEMSIZE_COST_NORMAL * 5 can_hold = list( - /obj/item/weapon/grenade, - /obj/item/weapon/tool, - /obj/item/weapon/weldingtool, - /obj/item/weapon/pickaxe, - /obj/item/device/multitool, + /obj/item/grenade, + /obj/item/tool, + /obj/item/weldingtool, + /obj/item/pickaxe, + /obj/item/multitool, /obj/item/stack/cable_coil, - /obj/item/device/analyzer, - /obj/item/device/flashlight, - /obj/item/weapon/cell, - /obj/item/weapon/gun, - /obj/item/weapon/material, - /obj/item/weapon/melee, - /obj/item/weapon/shield, + /obj/item/analyzer, + /obj/item/flashlight, + /obj/item/cell, + /obj/item/gun, + /obj/item/material, + /obj/item/melee, + /obj/item/shield, /obj/item/ammo_casing, /obj/item/ammo_magazine, - /obj/item/device/healthanalyzer, - /obj/item/device/robotanalyzer, - /obj/item/weapon/reagent_containers/glass/beaker, - /obj/item/weapon/reagent_containers/glass/bottle, - /obj/item/weapon/storage/pill_bottle, + /obj/item/healthanalyzer, + /obj/item/robotanalyzer, + /obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/glass/bottle, + /obj/item/storage/pill_bottle, /obj/item/stack/medical, /obj/item/stack/marker_beacon, - /obj/item/weapon/extinguisher/mini, - /obj/item/weapon/storage/quickdraw/syringe_case, - /obj/item/weapon/photo, - /obj/item/device/camera_film, - /obj/item/device/camera, - /obj/item/device/taperecorder, - /obj/item/device/tape, - /obj/item/device/geiger, - /obj/item/device/gps, - /obj/item/device/ano_scanner, - /obj/item/device/cataloguer, - /obj/item/device/radio, - /obj/item/device/mapping_unit, - /obj/item/weapon/kinetic_crusher, - /obj/item/device/analyzer + /obj/item/extinguisher/mini, + /obj/item/storage/quickdraw/syringe_case, + /obj/item/photo, + /obj/item/camera_film, + /obj/item/camera, + /obj/item/taperecorder, + /obj/item/tape, + /obj/item/geiger, + /obj/item/gps, + /obj/item/ano_scanner, + /obj/item/cataloguer, + /obj/item/radio, + /obj/item/mapping_unit, + /obj/item/kinetic_crusher, + /obj/item/analyzer ) -/obj/item/weapon/storage/belt/explorer/pathfinder +/obj/item/storage/belt/explorer/pathfinder name = "pathfinder's belt" desc = "A deluxe belt with many pouches. It can hold a very wide variety of items, but less items overall than a dedicated belt. Still, it's useful for any explorer who wants to be prepared for anything they might find." icon = 'icons/inventory/belt/item_vr.dmi' @@ -62,7 +62,7 @@ storage_slots = 7 //two more, bringing it on par with normal belts max_storage_space = ITEMSIZE_COST_NORMAL * 7 -/obj/item/weapon/storage/belt/miner +/obj/item/storage/belt/miner name = "mining belt" desc = "A versatile and durable looking belt with several pouches and straps. It can hold a very wide variety of items that any typical miner might need out in the deep." icon = 'icons/inventory/belt/item_vr.dmi' @@ -80,82 +80,82 @@ /obj/item/modular_computer/tablet, /obj/item/clothing/glasses, /obj/item/clothing/shoes/bhop, - /obj/item/device/multitool, - /obj/item/device/core_sampler, - /obj/item/device/beacon_locator, - /obj/item/device/radio, - /obj/item/device/measuring_tape, - /obj/item/device/flashlight, - /obj/item/device/depth_scanner, - /obj/item/device/camera, - /obj/item/device/ano_scanner, - /obj/item/device/xenoarch_multi_tool, - /obj/item/device/geiger, - /obj/item/device/gps, - /obj/item/device/laser_pointer, - /obj/item/device/survivalcapsule, - /obj/item/device/perfect_tele/one_beacon, - /obj/item/device/binoculars, - /obj/item/weapon/storage/box/samplebags, - /obj/item/weapon/cell/device, - /obj/item/weapon/pickaxe, - /obj/item/weapon/shovel, - /obj/item/weapon/paper, - /obj/item/weapon/photo, - /obj/item/weapon/folder, - /obj/item/weapon/pen, - /obj/item/weapon/folder, - /obj/item/weapon/clipboard, - /obj/item/weapon/anodevice, - /obj/item/weapon/tool/wrench, - /obj/item/weapon/tool/screwdriver, - /obj/item/weapon/tool/transforming/powerdrill, - /obj/item/weapon/storage/excavation, - /obj/item/weapon/anobattery, - /obj/item/weapon/reagent_containers/hypospray/autoinjector, - /obj/item/weapon/plastique/seismic/locked, - /obj/item/weapon/gun/magnetic/matfed/phoronbore, - /obj/item/weapon/storage/bag/sheetsnatcher, - /obj/item/weapon/melee, - /obj/item/weapon/kinetic_crusher, - /obj/item/weapon/mining_scanner + /obj/item/multitool, + /obj/item/core_sampler, + /obj/item/beacon_locator, + /obj/item/radio, + /obj/item/measuring_tape, + /obj/item/flashlight, + /obj/item/depth_scanner, + /obj/item/camera, + /obj/item/ano_scanner, + /obj/item/xenoarch_multi_tool, + /obj/item/geiger, + /obj/item/gps, + /obj/item/laser_pointer, + /obj/item/survivalcapsule, + /obj/item/perfect_tele/one_beacon, + /obj/item/binoculars, + /obj/item/storage/box/samplebags, + /obj/item/cell/device, + /obj/item/pickaxe, + /obj/item/shovel, + /obj/item/paper, + /obj/item/photo, + /obj/item/folder, + /obj/item/pen, + /obj/item/folder, + /obj/item/clipboard, + /obj/item/anodevice, + /obj/item/tool/wrench, + /obj/item/tool/screwdriver, + /obj/item/tool/transforming/powerdrill, + /obj/item/storage/excavation, + /obj/item/anobattery, + /obj/item/reagent_containers/hypospray/autoinjector, + /obj/item/plastique/seismic/locked, + /obj/item/gun/magnetic/matfed/phoronbore, + /obj/item/storage/bag/sheetsnatcher, + /obj/item/melee, + /obj/item/kinetic_crusher, + /obj/item/mining_scanner ) //Pretty much, if it's in the mining vendor, they should be able to put it on the belt. -/obj/item/weapon/storage/belt/archaeology +/obj/item/storage/belt/archaeology can_hold = list( /obj/item/stack/marker_beacon, /obj/item/clothing/glasses, - /obj/item/weapon/storage/box/samplebags, - /obj/item/device/xenoarch_multi_tool, - /obj/item/device/core_sampler, - /obj/item/device/beacon_locator, - /obj/item/device/radio/beacon, - /obj/item/device/gps, - /obj/item/device/measuring_tape, - /obj/item/device/flashlight, - /obj/item/device/depth_scanner, - /obj/item/device/camera, - /obj/item/device/ano_scanner, - /obj/item/device/geiger, - /obj/item/weapon/cell/device, - /obj/item/weapon/pickaxe, - /obj/item/weapon/paper, - /obj/item/weapon/photo, - /obj/item/weapon/folder, - /obj/item/weapon/pen, - /obj/item/weapon/folder, - /obj/item/weapon/clipboard, - /obj/item/weapon/anodevice, - /obj/item/weapon/tool/wrench, - /obj/item/weapon/tool/transforming/powerdrill, - /obj/item/device/multitool, - /obj/item/weapon/storage/excavation, - /obj/item/weapon/anobattery, - /obj/item/weapon/pickaxe + /obj/item/storage/box/samplebags, + /obj/item/xenoarch_multi_tool, + /obj/item/core_sampler, + /obj/item/beacon_locator, + /obj/item/radio/beacon, + /obj/item/gps, + /obj/item/measuring_tape, + /obj/item/flashlight, + /obj/item/depth_scanner, + /obj/item/camera, + /obj/item/ano_scanner, + /obj/item/geiger, + /obj/item/cell/device, + /obj/item/pickaxe, + /obj/item/paper, + /obj/item/photo, + /obj/item/folder, + /obj/item/pen, + /obj/item/folder, + /obj/item/clipboard, + /obj/item/anodevice, + /obj/item/tool/wrench, + /obj/item/tool/transforming/powerdrill, + /obj/item/multitool, + /obj/item/storage/excavation, + /obj/item/anobattery, + /obj/item/pickaxe ) -/obj/item/weapon/storage/belt/hydro +/obj/item/storage/belt/hydro name = "hydroponics belt" desc = "A belt used to hold most hydroponics supplies. Suprisingly, not green." icon = 'icons/inventory/belt/item_vr.dmi' @@ -166,15 +166,15 @@ max_w_class = ITEMSIZE_LARGE max_storage_space = ITEMSIZE_COST_NORMAL * 5 can_hold = list( - /obj/item/device/analyzer/plant_analyzer, - /obj/item/weapon/reagent_containers/glass/beaker, - /obj/item/weapon/reagent_containers/glass/bottle, - /obj/item/weapon/shovel/spade, - /obj/item/weapon/tool/wirecutters, - /obj/item/weapon/material/minihoe, - /obj/item/weapon/material/knife/machete/hatchet, - /obj/item/weapon/reagent_containers/spray/plantbgone, - /obj/item/weapon/plantspray, - /obj/item/weapon/gun/energy/floragun, + /obj/item/analyzer/plant_analyzer, + /obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/glass/bottle, + /obj/item/shovel/spade, + /obj/item/tool/wirecutters, + /obj/item/material/minihoe, + /obj/item/material/knife/machete/hatchet, + /obj/item/reagent_containers/spray/plantbgone, + /obj/item/plantspray, + /obj/item/gun/energy/floragun, /obj/item/seeds ) \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 723c098ca20..fd5d3dab183 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -19,7 +19,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list( "ithaqua", "scientology", "melted", "necronomicon", "bible", "clipboard")) -/obj/item/weapon/storage/bible +/obj/item/storage/bible name = "bible" desc = "Apply to head repeatedly." icon_state ="bible" @@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list( use_sound = 'sound/bureaucracy/bookopen.ogg' drop_sound = 'sound/bureaucracy/bookclose.ogg' -/obj/item/weapon/storage/bible/attack_self(mob/living/carbon/human/user) +/obj/item/storage/bible/attack_self(mob/living/carbon/human/user) if(user?.mind?.assigned_role != JOB_CHAPLAIN) return FALSE @@ -73,7 +73,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list( * Arguments: * * user The mob interacting with the menu */ -/obj/item/weapon/storage/bible/proc/check_menu(mob/living/carbon/human/user) +/obj/item/storage/bible/proc/check_menu(mob/living/carbon/human/user) if(user.mind.my_religion.configured) return FALSE if(!istype(user)) @@ -86,21 +86,21 @@ GLOBAL_LIST_INIT(bibleitemstates, list( return FALSE return TRUE -/obj/item/weapon/storage/bible/booze +/obj/item/storage/bible/booze name = "bible" desc = "To be applied to the head repeatedly." icon_state ="bible" -/obj/item/weapon/storage/bible/booze/New() +/obj/item/storage/bible/booze/New() starts_with = list( - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, - /obj/item/weapon/spacecash/c100, - /obj/item/weapon/spacecash/c100, - /obj/item/weapon/spacecash/c100 + /obj/item/reagent_containers/food/drinks/bottle/small/beer, + /obj/item/reagent_containers/food/drinks/bottle/small/beer, + /obj/item/spacecash/c100, + /obj/item/spacecash/c100, + /obj/item/spacecash/c100 ) -/obj/item/weapon/storage/bible/afterattack(atom/A, mob/user as mob, proximity) +/obj/item/storage/bible/afterattack(atom/A, mob/user as mob, proximity) if(!proximity) return if(user.mind && (user.mind.assigned_role == JOB_CHAPLAIN)) if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder @@ -109,7 +109,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list( A.reagents.del_reagent("water") A.reagents.add_reagent("holywater",water2holy) -/obj/item/weapon/storage/bible/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/storage/bible/attackby(obj/item/W as obj, mob/user as mob) if (src.use_sound) playsound(src, src.use_sound, 50, 1, -5) ..() diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 1f6c0cce4f2..46af6f64043 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -19,7 +19,7 @@ * For syndicate call-ins see uplink_kits.dm */ -/obj/item/weapon/storage/box +/obj/item/storage/box name = "box" desc = "It's just an ordinary box." icon = 'icons/obj/boxes.dmi' @@ -35,7 +35,7 @@ pickup_sound = 'sound/items/pickup/cardboardbox.ogg' // BubbleWrap - A box can be folded up to make card -/obj/item/weapon/storage/box/attack_self(mob/user as mob) +/obj/item/storage/box/attack_self(mob/user as mob) if(..()) return //try to fold it @@ -70,282 +70,282 @@ user.put_in_hands(trash) -/obj/item/weapon/storage/box/survival +/obj/item/storage/box/survival name = "emergency supply box" desc = "A survival box issued to crew members for use in emergency situations." icon_state = "survival" starts_with = list( - /obj/item/weapon/tool/prybar/red, + /obj/item/tool/prybar/red, /obj/item/clothing/glasses/goggles, /obj/item/clothing/mask/breath ) -/obj/item/weapon/storage/box/survival/synth +/obj/item/storage/box/survival/synth name = "synthetic supply box" desc = "A survival box issued to synthetic crew members for use in emergency situations." icon_state = "survival_synth" starts_with = list( - /obj/item/weapon/tool/prybar/red, + /obj/item/tool/prybar/red, /obj/item/clothing/glasses/goggles ) -/obj/item/weapon/storage/box/survival/comp +/obj/item/storage/box/survival/comp name = "emergency supply box" desc = "A comprehensive survival box issued to crew members for use in emergency situations. Contains additional supplies." icon_state = "survival_comp" starts_with = list( - /obj/item/weapon/tool/prybar/red, + /obj/item/tool/prybar/red, /obj/item/clothing/glasses/goggles, - /obj/item/weapon/reagent_containers/hypospray/autoinjector, + /obj/item/reagent_containers/hypospray/autoinjector, /obj/item/stack/medical/bruise_pack, - /obj/item/device/flashlight/glowstick, - /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, + /obj/item/flashlight/glowstick, + /obj/item/reagent_containers/food/snacks/candy/proteinbar, /obj/item/clothing/mask/breath ) -/obj/item/weapon/storage/box/gloves +/obj/item/storage/box/gloves name = "box of latex gloves" desc = "Contains white gloves." icon_state = "latex" starts_with = list(/obj/item/clothing/gloves/sterile/latex = 7) -/obj/item/weapon/storage/box/masks +/obj/item/storage/box/masks name = "box of sterile masks" desc = "This box contains masks of sterility." icon_state = "sterile" starts_with = list(/obj/item/clothing/mask/surgical = 7) -/obj/item/weapon/storage/box/masks/white +/obj/item/storage/box/masks/white name = "box of sterile masks" desc = "This box contains masks of sterility." icon_state = "sterile" starts_with = list(/obj/item/clothing/mask/surgical/white = 7) -/obj/item/weapon/storage/box/masks/dust +/obj/item/storage/box/masks/dust name = "box of dust masks" desc = "This box contains dust masks. Breathe easy." icon_state = "sterile" starts_with = list(/obj/item/clothing/mask/surgical/dust = 7) -/obj/item/weapon/storage/box/syringes +/obj/item/storage/box/syringes name = "box of syringes" desc = "A box full of syringes." icon_state = "syringe" - starts_with = list(/obj/item/weapon/reagent_containers/syringe = 7) + starts_with = list(/obj/item/reagent_containers/syringe = 7) -/obj/item/weapon/storage/box/syringegun +/obj/item/storage/box/syringegun name = "box of syringe gun cartridges" desc = "A box full of compressed gas cartridges." icon_state = "syringe2" - starts_with = list(/obj/item/weapon/syringe_cartridge = 7) + starts_with = list(/obj/item/syringe_cartridge = 7) -/obj/item/weapon/storage/box/beakers +/obj/item/storage/box/beakers name = "box of beakers" desc = "A box full of beakers." icon_state = "beaker" - starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker = 7) + starts_with = list(/obj/item/reagent_containers/glass/beaker = 7) -/obj/item/weapon/storage/box/injectors +/obj/item/storage/box/injectors name = "box of DNA injectors" desc = "This box contains injectors it seems." icon_state = "dna" starts_with = list( - /obj/item/weapon/dnainjector/h2m = 3, - /obj/item/weapon/dnainjector/m2h = 3 + /obj/item/dnainjector/h2m = 3, + /obj/item/dnainjector/m2h = 3 ) -/obj/item/weapon/storage/box/flashbangs +/obj/item/storage/box/flashbangs name = "box of flashbangs (WARNING)" desc = "WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use." icon_state = "flashbang" - starts_with = list(/obj/item/weapon/grenade/flashbang = 7) + starts_with = list(/obj/item/grenade/flashbang = 7) drop_sound = 'sound/items/drop/ammobox.ogg' pickup_sound = 'sound/items/pickup/ammobox.ogg' -/obj/item/weapon/storage/box/emps +/obj/item/storage/box/emps name = "box of emp grenades" desc = "A box containing 5 military grade EMP grenades.
WARNING: Do not use near unshielded electronics or biomechanical augmentations, death or permanent paralysis may occur." icon_state = "emp" - starts_with = list(/obj/item/weapon/grenade/empgrenade = 7) + starts_with = list(/obj/item/grenade/empgrenade = 7) drop_sound = 'sound/items/drop/ammobox.ogg' pickup_sound = 'sound/items/pickup/ammobox.ogg' -/obj/item/weapon/storage/box/empslite +/obj/item/storage/box/empslite name = "box of low yield emp grenades" desc = "A box containing 5 low yield EMP grenades.
WARNING: Do not use near unshielded electronics or biomechanical augmentations, death or permanent paralysis may occur." icon_state = "emp" - starts_with = list(/obj/item/weapon/grenade/empgrenade/low_yield = 7) + starts_with = list(/obj/item/grenade/empgrenade/low_yield = 7) drop_sound = 'sound/items/drop/ammobox.ogg' pickup_sound = 'sound/items/pickup/ammobox.ogg' -/obj/item/weapon/storage/box/smokes +/obj/item/storage/box/smokes name = "box of smoke bombs" desc = "A box containing 7 smoke bombs." icon_state = "flashbang" - starts_with = list(/obj/item/weapon/grenade/smokebomb = 7) + starts_with = list(/obj/item/grenade/smokebomb = 7) drop_sound = 'sound/items/drop/ammobox.ogg' pickup_sound = 'sound/items/pickup/ammobox.ogg' -/obj/item/weapon/storage/box/anti_photons +/obj/item/storage/box/anti_photons name = "box of anti-photon grenades" desc = "A box containing 7 experimental photon disruption grenades." icon_state = "flashbang" - starts_with = list(/obj/item/weapon/grenade/anti_photon = 7) + starts_with = list(/obj/item/grenade/anti_photon = 7) drop_sound = 'sound/items/drop/ammobox.ogg' pickup_sound = 'sound/items/pickup/ammobox.ogg' -/obj/item/weapon/storage/box/frags +/obj/item/storage/box/frags name = "box of fragmentation grenades (WARNING)" desc = "A box containing 7 military grade fragmentation grenades.
WARNING: These devices are extremely dangerous and can cause limb loss or death in repeated use." icon_state = "frag" - starts_with = list(/obj/item/weapon/grenade/explosive = 7) + starts_with = list(/obj/item/grenade/explosive = 7) drop_sound = 'sound/items/drop/ammobox.ogg' pickup_sound = 'sound/items/pickup/ammobox.ogg' -/obj/item/weapon/storage/box/frags_half_box +/obj/item/storage/box/frags_half_box name = "box of fragmentation grenades (WARNING)" desc = "A box containing 4 military grade fragmentation grenades.
WARNING: These devices are extremely dangerous and can cause limb loss or death in repeated use." icon_state = "frag" - starts_with = list(/obj/item/weapon/grenade/explosive = 4) + starts_with = list(/obj/item/grenade/explosive = 4) drop_sound = 'sound/items/drop/ammobox.ogg' pickup_sound = 'sound/items/pickup/ammobox.ogg' -/obj/item/weapon/storage/box/metalfoam +/obj/item/storage/box/metalfoam name = "box of metal foam grenades." desc = "A box containing 7 metal foam grenades." icon_state = "flashbang" - starts_with = list(/obj/item/weapon/grenade/chem_grenade/metalfoam = 7) + starts_with = list(/obj/item/grenade/chem_grenade/metalfoam = 7) -/obj/item/weapon/storage/box/teargas +/obj/item/storage/box/teargas name = "box of teargas grenades" desc = "A box containing 7 teargas grenades." icon_state = "flashbang" - starts_with = list(/obj/item/weapon/grenade/chem_grenade/teargas = 7) + starts_with = list(/obj/item/grenade/chem_grenade/teargas = 7) -/obj/item/weapon/storage/box/flare +/obj/item/storage/box/flare name = "box of flares" desc = "A box containing 4 flares." - starts_with = list(/obj/item/device/flashlight/flare = 4) + starts_with = list(/obj/item/flashlight/flare = 4) -/obj/item/weapon/storage/box/trackimp +/obj/item/storage/box/trackimp name = "boxed tracking implant kit" desc = "Box full of scum-bag tracking utensils." icon_state = "implant" starts_with = list( - /obj/item/weapon/implantcase/tracking = 4, - /obj/item/weapon/implanter, - /obj/item/weapon/implantpad, - /obj/item/weapon/locator + /obj/item/implantcase/tracking = 4, + /obj/item/implanter, + /obj/item/implantpad, + /obj/item/locator ) -/obj/item/weapon/storage/box/chemimp +/obj/item/storage/box/chemimp name = "boxed chemical implant kit" desc = "Box of stuff used to implant chemicals." icon_state = "implant" starts_with = list( - /obj/item/weapon/implantcase/chem = 5, - /obj/item/weapon/implanter, - /obj/item/weapon/implantpad + /obj/item/implantcase/chem = 5, + /obj/item/implanter, + /obj/item/implantpad ) -/obj/item/weapon/storage/box/camerabug +/obj/item/storage/box/camerabug name = "mobile camera pod box" desc = "A box containing some mobile camera pods." icon_state = "pda" starts_with = list( - /obj/item/device/camerabug = 6, - /obj/item/device/bug_monitor + /obj/item/camerabug = 6, + /obj/item/bug_monitor ) -/obj/item/weapon/storage/box/rxglasses +/obj/item/storage/box/rxglasses name = "box of prescription glasses" desc = "This box contains nerd glasses." icon_state = "glasses" starts_with = list(/obj/item/clothing/glasses/regular = 7) -/obj/item/weapon/storage/box/cdeathalarm_kit +/obj/item/storage/box/cdeathalarm_kit name = "death alarm kit" desc = "Box of stuff used to implant death alarms." icon_state = "implant" item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") starts_with = list( - /obj/item/weapon/implantcase/death_alarm = 7, - /obj/item/weapon/implanter + /obj/item/implantcase/death_alarm = 7, + /obj/item/implanter ) -/obj/item/weapon/storage/box/condimentbottles +/obj/item/storage/box/condimentbottles name = "box of condiment bottles" desc = "It has a large ketchup smear on it." icon_state = "condiment" - starts_with = list(/obj/item/weapon/reagent_containers/food/condiment = 7) + starts_with = list(/obj/item/reagent_containers/food/condiment = 7) -/obj/item/weapon/storage/box/cups +/obj/item/storage/box/cups name = "box of paper cups" desc = "It has pictures of paper cups on the front." icon_state = "cups" - starts_with = list(/obj/item/weapon/reagent_containers/food/drinks/sillycup = 7) + starts_with = list(/obj/item/reagent_containers/food/drinks/sillycup = 7) -/obj/item/weapon/storage/box/buns +/obj/item/storage/box/buns name = "box of bread buns" desc = "Freshly baked at some point in the past few months." icon_state = "bun_box" max_storage_space = ITEMSIZE_COST_NORMAL * 5 - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/bun = 12) + starts_with = list(/obj/item/reagent_containers/food/snacks/bun = 12) -/obj/item/weapon/storage/box/monkeycubes +/obj/item/storage/box/monkeycubes name = "monkey cube box" desc = "Drymate brand monkey cubes. Just add water!" icon = 'icons/obj/food.dmi' icon_state = "monkeycubebox" - can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube) - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped = 4) + can_hold = list(/obj/item/reagent_containers/food/snacks/monkeycube) + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped = 4) -/obj/item/weapon/storage/box/monkeycubes/farwacubes +/obj/item/storage/box/monkeycubes/farwacubes name = "farwa cube box" desc = "Drymate brand farwa cubes, shipped from Meralar. Just add water!" - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/farwacube = 4) + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped/farwacube = 4) -/obj/item/weapon/storage/box/monkeycubes/stokcubes +/obj/item/storage/box/monkeycubes/stokcubes name = "stok cube box" desc = "Drymate brand stok cubes, shipped from Moghes. Just add water!" - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/stokcube = 4) + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped/stokcube = 4) -/obj/item/weapon/storage/box/monkeycubes/neaeracubes +/obj/item/storage/box/monkeycubes/neaeracubes name = "neaera cube box" desc = "Drymate brand neaera cubes, shipped from Qerr'balak. Just add water!" - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube = 4) + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube = 4) -/obj/item/weapon/storage/box/ids +/obj/item/storage/box/ids name = "box of spare IDs" desc = "Has so many empty IDs." icon_state = "id" - starts_with = list(/obj/item/weapon/card/id = 7) + starts_with = list(/obj/item/card/id = 7) -/obj/item/weapon/storage/box/seccarts +/obj/item/storage/box/seccarts name = "box of spare R.O.B.U.S.T. Cartridges" desc = "A box full of R.O.B.U.S.T. Cartridges, used by Security." icon_state = "pda" - starts_with = list(/obj/item/weapon/cartridge/security = 7) + starts_with = list(/obj/item/cartridge/security = 7) -/obj/item/weapon/storage/box/handcuffs +/obj/item/storage/box/handcuffs name = "box of spare handcuffs" desc = "A box full of handcuffs." icon_state = "handcuff" - starts_with = list(/obj/item/weapon/handcuffs = 7) + starts_with = list(/obj/item/handcuffs = 7) -/obj/item/weapon/storage/box/mousetraps +/obj/item/storage/box/mousetraps name = "box of Pest-B-Gon mousetraps" desc = span_red("WARNING:") + " Keep out of reach of children." icon_state = "mousetraps" - starts_with = list(/obj/item/device/assembly/mousetrap = 7) + starts_with = list(/obj/item/assembly/mousetrap = 7) -/obj/item/weapon/storage/box/pillbottles +/obj/item/storage/box/pillbottles name = "box of pill bottles" desc = "It has pictures of pill bottles on its front." icon_state = "pillbox" - starts_with = list(/obj/item/weapon/storage/pill_bottle = 7) + starts_with = list(/obj/item/storage/pill_bottle = 7) -/obj/item/weapon/storage/box/snappops +/obj/item/storage/box/snappops name = "snap pop box" desc = "Eight wrappers of fun! Ages 8 and up. Not suitable for children." icon = 'icons/obj/toy.dmi' @@ -353,19 +353,19 @@ can_hold = list(/obj/item/toy/snappop) starts_with = list(/obj/item/toy/snappop = 8) -/obj/item/weapon/storage/box/matches +/obj/item/storage/box/matches name = "matchbox" desc = "A small box of 'Space-Proof' premium matches." icon = 'icons/obj/cigarettes.dmi' icon_state = "matchbox" w_class = ITEMSIZE_TINY slot_flags = SLOT_BELT - can_hold = list(/obj/item/weapon/flame/match) - starts_with = list(/obj/item/weapon/flame/match = 10) + can_hold = list(/obj/item/flame/match) + starts_with = list(/obj/item/flame/match = 10) drop_sound = 'sound/items/drop/matchbox.ogg' pickup_sound = 'sound/items/pickup/matchbox.ogg' -/obj/item/weapon/storage/box/matches/attackby(var/obj/item/weapon/flame/match/W, var/mob/user) +/obj/item/storage/box/matches/attackby(var/obj/item/flame/match/W, var/mob/user) if(istype(W) && !W.lit && !W.burnt) if(prob(25)) W.light(user) @@ -375,40 +375,40 @@ W.update_icon() return -/obj/item/weapon/storage/box/autoinjectors +/obj/item/storage/box/autoinjectors name = "box of injectors" desc = "Contains autoinjectors." icon_state = "auto" - starts_with = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector = 7) + starts_with = list(/obj/item/reagent_containers/hypospray/autoinjector = 7) -/obj/item/weapon/storage/box/lights +/obj/item/storage/box/lights name = "box of replacement bulbs" icon = 'icons/obj/boxes.dmi' icon_state = "light" desc = "This box is shaped on the inside so that only light tubes and bulbs fit." item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") storage_slots = 24 - can_hold = list(/obj/item/weapon/light/tube, /obj/item/weapon/light/bulb) + can_hold = list(/obj/item/light/tube, /obj/item/light/bulb) max_storage_space = ITEMSIZE_COST_SMALL * 24 //holds 24 items of w_class 2 use_to_pickup = TRUE // for picking up broken bulbs, not that most people will try -/obj/item/weapon/storage/box/lights/bulbs - starts_with = list(/obj/item/weapon/light/bulb = 24) +/obj/item/storage/box/lights/bulbs + starts_with = list(/obj/item/light/bulb = 24) -/obj/item/weapon/storage/box/lights/tubes +/obj/item/storage/box/lights/tubes name = "box of replacement tubes" icon_state = "lighttube" - starts_with = list(/obj/item/weapon/light/tube = 24) + starts_with = list(/obj/item/light/tube = 24) -/obj/item/weapon/storage/box/lights/mixed +/obj/item/storage/box/lights/mixed name = "box of replacement lights" icon_state = "lightmixed" starts_with = list( - /obj/item/weapon/light/tube = 16, - /obj/item/weapon/light/bulb = 8 + /obj/item/light/tube = 16, + /obj/item/light/bulb = 8 ) -/obj/item/weapon/storage/box/freezer +/obj/item/storage/box/freezer name = "portable freezer" desc = "This nifty shock-resistant device will keep your 'groceries' nice and non-spoiled." icon = 'icons/obj/storage.dmi' @@ -420,10 +420,10 @@ max_storage_space = ITEMSIZE_COST_NORMAL * 5 // Formally 21. Odd numbers are bad. use_to_pickup = TRUE // for picking up broken bulbs, not that most people will try -/obj/item/weapon/storage/box/freezer/red +/obj/item/storage/box/freezer/red icon_state = "portafreezer_red" -/obj/item/weapon/storage/box/freezer/Entered(var/atom/movable/AM) +/obj/item/storage/box/freezer/Entered(var/atom/movable/AM) if(istype(AM, /obj/item/organ)) var/obj/item/organ/O = AM O.preserved = 1 @@ -431,7 +431,7 @@ organ.preserved = 1 ..() -/obj/item/weapon/storage/box/freezer/Exited(var/atom/movable/AM) +/obj/item/storage/box/freezer/Exited(var/atom/movable/AM) if(istype(AM, /obj/item/organ)) var/obj/item/organ/O = AM O.preserved = 0 @@ -439,17 +439,17 @@ organ.preserved = 0 ..() -/obj/item/weapon/storage/box/ambrosia +/obj/item/storage/box/ambrosia name = "ambrosia seeds box" desc = "Contains the seeds you need to get a little high." starts_with = list(/obj/item/seeds/ambrosiavulgarisseed = 7) -/obj/item/weapon/storage/box/ambrosiadeus +/obj/item/storage/box/ambrosiadeus name = "ambrosia deus seeds box" desc = "Contains the seeds you need to get a proper healthy high." starts_with = list(/obj/item/seeds/ambrosiadeusseed = 7) -/obj/item/weapon/storage/box/capguntoy +/obj/item/storage/box/capguntoy name = "\improper AlliCo \"Zipper\" Cap Gun" icon = 'icons/obj/gun_toy.dmi' icon_state = "cap_gun_box" @@ -457,51 +457,51 @@ item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") storage_slots = 2 max_w_class = ITEMSIZE_NORMAL - can_hold = list(/obj/item/weapon/gun/projectile/revolver/capgun, /obj/item/ammo_magazine/ammo_box/cap) + can_hold = list(/obj/item/gun/projectile/revolver/capgun, /obj/item/ammo_magazine/ammo_box/cap) starts_with = list( - /obj/item/weapon/gun/projectile/revolver/capgun = 1, + /obj/item/gun/projectile/revolver/capgun = 1, /obj/item/ammo_magazine/ammo_box/cap = 1 ) //Donk-pockets -/obj/item/weapon/storage/box/donkpockets +/obj/item/storage/box/donkpockets name = "box of donk-pockets" desc = "Instructions: Heat in microwave. Product will cool if not eaten within seven minutes." icon_state = "donkpocketbox" - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket = 7) + starts_with = list(/obj/item/reagent_containers/food/snacks/donkpocket = 7) -/obj/item/weapon/storage/box/donkpockets/spicy +/obj/item/storage/box/donkpockets/spicy name = "box of spicy-flavoured donk-pockets" icon_state = "donkpocketboxspicy" - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/spicy = 7) + starts_with = list(/obj/item/reagent_containers/food/snacks/donkpocket/spicy = 7) -/obj/item/weapon/storage/box/donkpockets/teriyaki +/obj/item/storage/box/donkpockets/teriyaki name = "box of teriyaki-flavoured donk-pockets" icon_state = "donkpocketboxteriyaki" - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/teriyaki = 7) + starts_with = list(/obj/item/reagent_containers/food/snacks/donkpocket/teriyaki = 7) -/obj/item/weapon/storage/box/donkpockets/pizza +/obj/item/storage/box/donkpockets/pizza name = "box of pizza-flavoured donk-pockets" icon_state = "donkpocketboxpizza" - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/pizza = 7) + starts_with = list(/obj/item/reagent_containers/food/snacks/donkpocket/pizza = 7) -/obj/item/weapon/storage/box/donkpockets/honk +/obj/item/storage/box/donkpockets/honk name = "box of banana-flavoured donk-pockets" icon_state = "donkpocketboxbanana" - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/honk = 7) + starts_with = list(/obj/item/reagent_containers/food/snacks/donkpocket/honk = 7) -/obj/item/weapon/storage/box/donkpockets/gondola +/obj/item/storage/box/donkpockets/gondola name = "box of gondola-flavoured donk-pockets" icon_state = "donkpocketboxgondola" - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/gondola = 7) + starts_with = list(/obj/item/reagent_containers/food/snacks/donkpocket/gondola = 7) -/obj/item/weapon/storage/box/donkpockets/berry +/obj/item/storage/box/donkpockets/berry name = "box of berry-flavoured donk-pockets" icon_state = "donkpocketboxberry" - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/berry = 7) + starts_with = list(/obj/item/reagent_containers/food/snacks/donkpocket/berry = 7) -/obj/item/weapon/storage/box/sinpockets +/obj/item/storage/box/sinpockets name = "box of sin-pockets" desc = "Instructions: Crush bottom of package to initiate chemical heating. Wait for 20 seconds before consumption. Product will cool if not eaten within seven minutes." icon_state = "donk_kit" - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket = 7) + starts_with = list(/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket = 7) diff --git a/code/game/objects/items/weapons/storage/boxes_vr.dm b/code/game/objects/items/weapons/storage/boxes_vr.dm index 89ffc6f9bcc..687b45bc419 100644 --- a/code/game/objects/items/weapons/storage/boxes_vr.dm +++ b/code/game/objects/items/weapons/storage/boxes_vr.dm @@ -1,46 +1,46 @@ -/obj/item/weapon/storage/box/explorerkeys +/obj/item/storage/box/explorerkeys name = "box of volunteer headsets" desc = "A box full of volunteer headsets, for issuing out to exploration volunteers." - starts_with = list(/obj/item/device/radio/headset/explorer = 7) + starts_with = list(/obj/item/radio/headset/explorer = 7) -/obj/item/weapon/storage/box/commandkeys +/obj/item/storage/box/commandkeys name = "box of command keys" desc = "A box full of command keys, for command to give out as necessary." - starts_with = list(/obj/item/device/encryptionkey/headset_com = 7) + starts_with = list(/obj/item/encryptionkey/headset_com = 7) -/obj/item/weapon/storage/box/servicekeys +/obj/item/storage/box/servicekeys name = "box of service keys" desc = "A box full of service keys, for the HoP to give out as necessary." - starts_with = list(/obj/item/device/encryptionkey/headset_service = 7) + starts_with = list(/obj/item/encryptionkey/headset_service = 7) -/obj/item/weapon/storage/box/survival/space +/obj/item/storage/box/survival/space name = "boxed emergency suit and helmet" icon_state = "survival_comp3" starts_with = list( /obj/item/clothing/suit/space/emergency, /obj/item/clothing/head/helmet/space/emergency, /obj/item/clothing/mask/breath, - /obj/item/weapon/tank/emergency/oxygen/double + /obj/item/tank/emergency/oxygen/double ) -/obj/item/weapon/storage/secure/briefcase/trashmoney - starts_with = list(/obj/item/weapon/spacecash/c200 = 10) +/obj/item/storage/secure/briefcase/trashmoney + starts_with = list(/obj/item/spacecash/c200 = 10) -/obj/item/weapon/storage/box/brainzsnax +/obj/item/storage/box/brainzsnax name = "\improper BrainzSnax box" icon_state = "brainzsnax_box" desc = "A box designed to hold canned food. This one has BrainzSnax branding printed on it." - can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/canned) + can_hold = list(/obj/item/reagent_containers/food/snacks/canned) max_storage_space = ITEMSIZE_COST_NORMAL * 6 - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/canned/brainzsnax = 6) + starts_with = list(/obj/item/reagent_containers/food/snacks/canned/brainzsnax = 6) -/obj/item/weapon/storage/box/brainzsnax/red - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/canned/brainzsnax/red = 6) +/obj/item/storage/box/brainzsnax/red + starts_with = list(/obj/item/reagent_containers/food/snacks/canned/brainzsnax/red = 6) -/obj/item/weapon/storage/box/freezer - can_hold = list(/obj/item/organ, /obj/item/weapon/reagent_containers/blood, /obj/item/weapon/reagent_containers/glass, /obj/item/weapon/reagent_containers/food) +/obj/item/storage/box/freezer + can_hold = list(/obj/item/organ, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/glass, /obj/item/reagent_containers/food) -/obj/item/weapon/storage/box/altevian_ammo +/obj/item/storage/box/altevian_ammo name = "SAM .48 ammo box" desc = "A box of ratty ammo." icon_state = "secbox" @@ -49,8 +49,8 @@ drop_sound = 'sound/items/drop/ammobox.ogg' pickup_sound = 'sound/items/pickup/ammobox.ogg' -/obj/item/weapon/storage/box/weapon_cells +/obj/item/storage/box/weapon_cells name = "box of weapon cells" desc = "A box full of weapon power cells. For all your portable energy storage needs." icon_state = "secbox" - starts_with = list(/obj/item/weapon/cell/device/weapon = 7) + starts_with = list(/obj/item/cell/device/weapon = 7) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index c8cdcffc1e3..5ac6b3b74f2 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/storage/briefcase +/obj/item/storage/briefcase name = "briefcase" desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional." icon_state = "briefcase" @@ -12,7 +12,7 @@ drop_sound = 'sound/items/drop/backpack.ogg' pickup_sound = 'sound/items/pickup/backpack.ogg' -/obj/item/weapon/storage/briefcase/clutch +/obj/item/storage/briefcase/clutch name = "clutch purse" desc = "A fashionable handheld bag typically used by women." icon_state = "clutch" @@ -22,7 +22,7 @@ max_w_class = ITEMSIZE_SMALL max_storage_space = ITEMSIZE_COST_SMALL * 4 -/obj/item/weapon/storage/briefcase/bookbag +/obj/item/storage/briefcase/bookbag name = "bookbag" desc = "A small bookbag for holding... things other than books?" icon_state = "bookbag" diff --git a/code/game/objects/items/weapons/storage/egg_vr.dm b/code/game/objects/items/weapons/storage/egg_vr.dm index 97da55c4ff0..31992530ba2 100644 --- a/code/game/objects/items/weapons/storage/egg_vr.dm +++ b/code/game/objects/items/weapons/storage/egg_vr.dm @@ -1,6 +1,6 @@ //Item type vorepanel egg release containers. -/obj/item/weapon/storage/vore_egg +/obj/item/storage/vore_egg name = "egg" desc = "It's an egg; it's smooth to the touch." //This is the default egg. icon = 'icons/obj/egg_new_vr.dmi' @@ -16,17 +16,17 @@ allow_quick_empty = TRUE use_sound = 'sound/items/drop/flesh.ogg' -/obj/item/weapon/storage/vore_egg/Initialize() +/obj/item/storage/vore_egg/Initialize() . = ..() randpixel_xy() -/obj/item/weapon/storage/vore_egg/open(mob/user as mob) +/obj/item/storage/vore_egg/open(mob/user as mob) if(isobserver(user)) return icon = open_egg_icon ..() -/obj/item/weapon/storage/vore_egg/proc/hatch(mob/living/user as mob) +/obj/item/storage/vore_egg/proc/hatch(mob/living/user as mob) visible_message("\The [src] begins to shake as something pushes out from within!") animate_shake() if(do_after(user, 50)) @@ -38,173 +38,173 @@ if(user.transforming) user.transforming = FALSE -/obj/item/weapon/storage/vore_egg/proc/animate_shake() +/obj/item/storage/vore_egg/proc/animate_shake() var/init_px = pixel_x var/shake_dir = pick(-1, 1) animate(src, transform=turn(matrix(), 8*shake_dir), pixel_x=init_px + 2*shake_dir, time=1) animate(transform=null, pixel_x=init_px, time=6, easing=ELASTIC_EASING) -/obj/item/weapon/storage/vore_egg/unathi +/obj/item/storage/vore_egg/unathi name = "unathi egg" desc = "Some species of Unathi apparently lay soft-shelled eggs!" icon_state = "egg_unathi" -/obj/item/weapon/storage/vore_egg/nevrean +/obj/item/storage/vore_egg/nevrean name = "nevrean egg" desc = "Most Nevreans lay hard-shelled eggs!" icon_state = "egg_nevrean" -/obj/item/weapon/storage/vore_egg/human +/obj/item/storage/vore_egg/human name = "human egg" desc = "Some humans lay eggs that are--wait, what?" icon_state = "egg_human" -/obj/item/weapon/storage/vore_egg/tajaran +/obj/item/storage/vore_egg/tajaran name = "tajaran egg" desc = "Apparently that's what a Tajaran egg looks like. Weird." icon_state = "egg_tajaran" -/obj/item/weapon/storage/vore_egg/skrell +/obj/item/storage/vore_egg/skrell name = "skrell egg" desc = "Its soft and squishy" icon_state = "egg_skrell" -/obj/item/weapon/storage/vore_egg/shark +/obj/item/storage/vore_egg/shark name = "akula egg" desc = "Its soft and slimy to the touch" icon_state = "egg_akula" -/obj/item/weapon/storage/vore_egg/sergal +/obj/item/storage/vore_egg/sergal name = "sergal egg" desc = "An egg with a slightly fuzzy exterior, and a hard layer beneath." icon_state = "egg_sergal" -/obj/item/weapon/storage/vore_egg/slime +/obj/item/storage/vore_egg/slime name = "slime egg" desc = "An egg with a soft and squishy interior, coated with slime." icon_state = "egg_slime" -/obj/item/weapon/storage/vore_egg/special //Not actually used, but the sprites are in, and it's there in case any admins need to spawn in the egg for any specific reasons. +/obj/item/storage/vore_egg/special //Not actually used, but the sprites are in, and it's there in case any admins need to spawn in the egg for any specific reasons. name = "special egg" desc = "This egg has a very unique look to it." icon_state = "egg_unique" -/obj/item/weapon/storage/vore_egg/scree +/obj/item/storage/vore_egg/scree name = "Chimera egg" desc = "...You don't know what type of creature laid this egg." icon_state = "egg_scree" -/obj/item/weapon/storage/vore_egg/xenomorph +/obj/item/storage/vore_egg/xenomorph name = "Xenomorph egg" desc = "Some type of pitch black egg. It has a slimy exterior coating." icon_state = "egg_xenomorph" -/obj/item/weapon/storage/vore_egg/chocolate +/obj/item/storage/vore_egg/chocolate name = "chocolate egg" desc = "Delicious. May contain a choking hazard." icon_state = "egg_chocolate" -/obj/item/weapon/storage/vore_egg/owlpellet +/obj/item/storage/vore_egg/owlpellet name = "boney egg" desc = "Can an egg shell be made of bones and hair?" icon_state = "egg_pellet" -/obj/item/weapon/storage/vore_egg/slimeglob +/obj/item/storage/vore_egg/slimeglob name = "glob of slime" desc = "Very squishy." icon_state = "egg_slimeglob" -/obj/item/weapon/storage/vore_egg/chicken +/obj/item/storage/vore_egg/chicken name = "chicken egg" desc = "Looks like chickens come in all sizes and shapes." icon_state = "egg_chicken" -/obj/item/weapon/storage/vore_egg/synthetic +/obj/item/storage/vore_egg/synthetic name = "synthetic egg" desc = "Smells like Easter morning." icon_state = "egg_synthetic" -/obj/item/weapon/storage/vore_egg/escapepod +/obj/item/storage/vore_egg/escapepod name = "small escape pod" desc = "Someone left in a hurry." icon_state = "egg_escapepod" -/obj/item/weapon/storage/vore_egg/floppy +/obj/item/storage/vore_egg/floppy name = "blue space floppy disc" desc = "Probably shouldn't copy THIS floppy." icon_state = "egg_floppy" -/obj/item/weapon/storage/vore_egg/cd +/obj/item/storage/vore_egg/cd name = "blue space cd" desc = "What could even be on this?!" icon_state = "egg_cd" -/obj/item/weapon/storage/vore_egg/file +/obj/item/storage/vore_egg/file name = "blue space file" desc = "Gotta wonder how much is compressed in there." icon_state = "egg_file" -/obj/item/weapon/storage/vore_egg/badrecipe +/obj/item/storage/vore_egg/badrecipe name = "Burned mess" desc = "Someone didn't cook this egg quite right..." icon_state = "egg_badrecipe" -/obj/item/weapon/storage/vore_egg/cocoon +/obj/item/storage/vore_egg/cocoon name = "web cocoon" desc = "It straight up smells like spiders in here." icon_state = "egg_cocoon" -/obj/item/weapon/storage/vore_egg/honeycomb +/obj/item/storage/vore_egg/honeycomb name = "honeycomb" desc = "Smells delicious!" icon_state = "egg_honeycomb" -/obj/item/weapon/storage/vore_egg/bugcocoon +/obj/item/storage/vore_egg/bugcocoon name = "bug cocoon" desc = "Metamorphosis!" icon_state = "egg_bugcocoon" -/obj/item/weapon/storage/vore_egg/rock +/obj/item/storage/vore_egg/rock name = "rock egg" desc = "It looks like a small boulder." icon_state = "egg_rock" -/obj/item/weapon/storage/vore_egg/yellow +/obj/item/storage/vore_egg/yellow name = "yellow egg" desc = "It is a nice yellow egg." icon_state = "egg_yellow" -/obj/item/weapon/storage/vore_egg/blue +/obj/item/storage/vore_egg/blue name = "blue egg" desc = "It is a nice blue egg." icon_state = "egg_blue" -/obj/item/weapon/storage/vore_egg/green +/obj/item/storage/vore_egg/green name = "green egg" desc = "It is a nice green egg." icon_state = "egg_green" -/obj/item/weapon/storage/vore_egg/orange +/obj/item/storage/vore_egg/orange name = "orange egg" desc = "It is a nice orange egg." icon_state = "egg_orange" -/obj/item/weapon/storage/vore_egg/purple +/obj/item/storage/vore_egg/purple name = "purple egg" desc = "It is a nice purple egg." icon_state = "egg_purple" -/obj/item/weapon/storage/vore_egg/red +/obj/item/storage/vore_egg/red name = "red egg" desc = "It is a nice red egg." icon_state = "egg_red" -/obj/item/weapon/storage/vore_egg/rainbow +/obj/item/storage/vore_egg/rainbow name = "rainbow egg" desc = "It looks so colorful." icon_state = "egg_rainbow" -/obj/item/weapon/storage/vore_egg/pinkspots +/obj/item/storage/vore_egg/pinkspots name = "spotted pink egg" desc = "It is a cute pink egg with white spots." icon_state = "egg_pinkspots" diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 850bc5246ed..259f0c111a0 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -17,7 +17,7 @@ * Box of Chocolates */ -/obj/item/weapon/storage/fancy/ +/obj/item/storage/fancy/ icon = 'icons/obj/food.dmi' icon_state = "donutbox6" name = "donut box" @@ -28,12 +28,12 @@ var/open_state var/closed_state -/obj/item/weapon/storage/fancy/update_icon(var/itemremoved = 0) +/obj/item/storage/fancy/update_icon(var/itemremoved = 0) var/total_contents = contents.len - itemremoved icon_state = "[icon_type]box[total_contents]" return -/obj/item/weapon/storage/fancy/examine(mob/user) +/obj/item/storage/fancy/examine(mob/user) . = ..() if(Adjacent(user)) @@ -47,7 +47,7 @@ /* * Egg Box */ -/obj/item/weapon/storage/fancy/egg_box +/obj/item/storage/fancy/egg_box icon = 'icons/obj/food.dmi' icon_state = "eggbox" icon_type = "egg" @@ -55,19 +55,19 @@ center_of_mass = list("x" = 16,"y" = 7) storage_slots = 12 can_hold = list( - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/boiledegg + /obj/item/reagent_containers/food/snacks/egg, + /obj/item/reagent_containers/food/snacks/boiledegg ) - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/egg = 12) + starts_with = list(/obj/item/reagent_containers/food/snacks/egg = 12) -/obj/item/weapon/storage/fancy/egg_box/New() +/obj/item/storage/fancy/egg_box/New() if(!open_state) open_state = "[initial(icon_state)]0" if(!closed_state) closed_state = "[initial(icon_state)]" ..() -/obj/item/weapon/storage/fancy/egg_box/update_icon() +/obj/item/storage/fancy/egg_box/update_icon() cut_overlays() if(open) icon_state = open_state @@ -76,7 +76,7 @@ else icon_state = closed_state -/obj/item/weapon/storage/fancy/egg_box/open(mob/user as mob) +/obj/item/storage/fancy/egg_box/open(mob/user as mob) if(open) return if (isobserver(usr)) @@ -85,7 +85,7 @@ update_icon() ..() -/obj/item/weapon/storage/fancy/egg_box/close(mob/user as mob) +/obj/item/storage/fancy/egg_box/close(mob/user as mob) open = FALSE update_icon() ..() @@ -93,7 +93,7 @@ /* * Candle Boxes */ -/obj/item/weapon/storage/fancy/candle_box +/obj/item/storage/fancy/candle_box name = "red candle pack" desc = "A pack of red candles." icon = 'icons/obj/candle.dmi' @@ -103,10 +103,10 @@ throwforce = 2 slot_flags = SLOT_BELT max_storage_space = ITEMSIZE_COST_TINY * 5 - can_hold = list(/obj/item/weapon/flame/candle) - starts_with = list(/obj/item/weapon/flame/candle = 5) + can_hold = list(/obj/item/flame/candle) + starts_with = list(/obj/item/flame/candle = 5) -/obj/item/weapon/storage/fancy/whitecandle_box +/obj/item/storage/fancy/whitecandle_box name = "white candle pack" desc = "A pack of white candles." icon = 'icons/obj/candle.dmi' @@ -116,10 +116,10 @@ throwforce = 2 slot_flags = SLOT_BELT max_storage_space = ITEMSIZE_COST_TINY * 5 - can_hold = list(/obj/item/weapon/flame/candle) - starts_with = list(/obj/item/weapon/flame/candle/white = 5) + can_hold = list(/obj/item/flame/candle) + starts_with = list(/obj/item/flame/candle/white = 5) -/obj/item/weapon/storage/fancy/blackcandle_box +/obj/item/storage/fancy/blackcandle_box name = "black candle pack" desc = "A pack of black candles." icon = 'icons/obj/candle.dmi' @@ -129,14 +129,14 @@ throwforce = 2 slot_flags = SLOT_BELT max_storage_space = ITEMSIZE_COST_TINY * 5 - can_hold = list(/obj/item/weapon/flame/candle) - starts_with = list(/obj/item/weapon/flame/candle/black = 5) + can_hold = list(/obj/item/flame/candle) + starts_with = list(/obj/item/flame/candle/black = 5) /* * Crayon Box */ -/obj/item/weapon/storage/fancy/crayons +/obj/item/storage/fancy/crayons name = "box of crayons" desc = "A box of crayons for all your rune drawing needs." icon = 'icons/obj/crayons.dmi' @@ -144,30 +144,30 @@ w_class = ITEMSIZE_SMALL icon_type = "crayon" can_hold = list( - /obj/item/weapon/pen/crayon + /obj/item/pen/crayon ) starts_with = list( - /obj/item/weapon/pen/crayon/red, - /obj/item/weapon/pen/crayon/orange, - /obj/item/weapon/pen/crayon/yellow, - /obj/item/weapon/pen/crayon/green, - /obj/item/weapon/pen/crayon/blue, - /obj/item/weapon/pen/crayon/purple + /obj/item/pen/crayon/red, + /obj/item/pen/crayon/orange, + /obj/item/pen/crayon/yellow, + /obj/item/pen/crayon/green, + /obj/item/pen/crayon/blue, + /obj/item/pen/crayon/purple ) -/obj/item/weapon/storage/fancy/crayons/Initialize() +/obj/item/storage/fancy/crayons/Initialize() . = ..() update_icon() -/obj/item/weapon/storage/fancy/crayons/update_icon() +/obj/item/storage/fancy/crayons/update_icon() var/mutable_appearance/ma = new(src) ma.cut_overlays() - for(var/obj/item/weapon/pen/crayon/crayon in contents) + for(var/obj/item/pen/crayon/crayon in contents) add_overlay(image('icons/obj/crayons.dmi',crayon.colourName)) appearance = ma -/obj/item/weapon/storage/fancy/crayons/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/pen/crayon)) +/obj/item/storage/fancy/crayons/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W,/obj/item/pen/crayon)) switch(W:colourName) if("mime") to_chat(user, "This crayon is too sad to be contained in this box.") @@ -177,7 +177,7 @@ return ..() -/obj/item/weapon/storage/fancy/markers +/obj/item/storage/fancy/markers name = "box of markers" desc = "A very professional looking box of permanent markers." icon = 'icons/obj/crayons.dmi' @@ -185,31 +185,31 @@ w_class = ITEMSIZE_SMALL icon_type = "marker" can_hold = list( - /obj/item/weapon/pen/crayon/marker + /obj/item/pen/crayon/marker ) starts_with = list( - /obj/item/weapon/pen/crayon/marker/black, - /obj/item/weapon/pen/crayon/marker/red, - /obj/item/weapon/pen/crayon/marker/orange, - /obj/item/weapon/pen/crayon/marker/yellow, - /obj/item/weapon/pen/crayon/marker/green, - /obj/item/weapon/pen/crayon/marker/blue, - /obj/item/weapon/pen/crayon/marker/purple + /obj/item/pen/crayon/marker/black, + /obj/item/pen/crayon/marker/red, + /obj/item/pen/crayon/marker/orange, + /obj/item/pen/crayon/marker/yellow, + /obj/item/pen/crayon/marker/green, + /obj/item/pen/crayon/marker/blue, + /obj/item/pen/crayon/marker/purple ) -/obj/item/weapon/storage/fancy/markers/Initialize() +/obj/item/storage/fancy/markers/Initialize() . = ..() update_icon() -/obj/item/weapon/storage/fancy/markers/update_icon() +/obj/item/storage/fancy/markers/update_icon() var/mutable_appearance/ma = new(src) ma.cut_overlays() - for(var/obj/item/weapon/pen/crayon/marker/marker in contents) + for(var/obj/item/pen/crayon/marker/marker in contents) ma.add_overlay(image('icons/obj/crayons.dmi',"m"+marker.colourName)) appearance = ma -/obj/item/weapon/storage/fancy/markers/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/pen/crayon/marker)) +/obj/item/storage/fancy/markers/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W,/obj/item/pen/crayon/marker)) switch(W:colourName) if("mime") to_chat(user, "This marker is too depressing to be contained in this box.") @@ -222,7 +222,7 @@ /* * Cracker Pack */ -/obj/item/weapon/storage/fancy/crackers +/obj/item/storage/fancy/crackers name = "\improper Getmore Crackers" icon = 'icons/obj/food.dmi' icon_state = "crackerbox" @@ -230,13 +230,13 @@ max_storage_space = ITEMSIZE_COST_TINY * 6 max_w_class = ITEMSIZE_TINY w_class = ITEMSIZE_SMALL - can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/cracker) - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/cracker = 6) + can_hold = list(/obj/item/reagent_containers/food/snacks/cracker) + starts_with = list(/obj/item/reagent_containers/food/snacks/cracker = 6) /* * Cigarette Pack */ -/obj/item/weapon/storage/fancy/cigarettes +/obj/item/storage/fancy/cigarettes name = "\improper pack of Trans-Stellar Duty-frees" desc = "A ubiquitous brand of cigarettes, found in every major spacefaring corporation in the universe. As mild and flavorless as it gets." description_fluff = "The Trans-Stellar Duty-Free Cigarette Company was created as an imprint of NanoTrasen. They are the most boring, tasteless, dry cigarettes on the market, but due to just how unremarkable (not to mention cheap to produce) they are, they sold in vending machines in almost every corner of the galaxy." @@ -247,12 +247,12 @@ throwforce = 2 slot_flags = SLOT_BELT storage_slots = 6 - can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/weapon/flame/lighter, /obj/item/trash/cigbutt) + can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/flame/lighter, /obj/item/trash/cigbutt) icon_type = "cigarette" starts_with = list(/obj/item/clothing/mask/smokable/cigarette = 6) var/brand = "\improper Trans-Stellar Duty-free" -/obj/item/weapon/storage/fancy/cigarettes/Initialize() +/obj/item/storage/fancy/cigarettes/Initialize() . = ..() flags |= NOREACT create_reagents(15 * storage_slots)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one @@ -262,14 +262,14 @@ C.brand = brand C.desc += " This one is \a [brand]." -/obj/item/weapon/storage/fancy/cigarettes/New() +/obj/item/storage/fancy/cigarettes/New() if(!open_state) open_state = "[initial(icon_state)]_open" if(!closed_state) closed_state = "[initial(icon_state)]" ..() -/obj/item/weapon/storage/fancy/cigarettes/update_icon() +/obj/item/storage/fancy/cigarettes/update_icon() cut_overlays() if(open) icon_state = open_state @@ -278,7 +278,7 @@ else icon_state = closed_state -/obj/item/weapon/storage/fancy/cigarettes/open(mob/user as mob) +/obj/item/storage/fancy/cigarettes/open(mob/user as mob) if(open) return open = TRUE @@ -288,7 +288,7 @@ update_icon() ..() -/obj/item/weapon/storage/fancy/cigarettes/close(mob/user as mob) +/obj/item/storage/fancy/cigarettes/close(mob/user as mob) open = FALSE if(contents.len == 0) icon_state = "[initial(icon_state)]_empty" @@ -296,14 +296,14 @@ update_icon() ..() -/obj/item/weapon/storage/fancy/cigarettes/remove_from_storage(obj/item/W as obj, atom/new_location) +/obj/item/storage/fancy/cigarettes/remove_from_storage(obj/item/W as obj, atom/new_location) // Don't try to transfer reagents to lighters if(istype(W, /obj/item/clothing/mask/smokable/cigarette)) var/obj/item/clothing/mask/smokable/cigarette/C = W reagents.trans_to_obj(C, (reagents.total_volume/contents.len)) return ..() -/obj/item/weapon/storage/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/storage/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(!istype(M, /mob)) return @@ -331,48 +331,48 @@ else ..() -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco +/obj/item/storage/fancy/cigarettes/dromedaryco name = "\improper DromedaryCo packet" desc = "A packet of six Earth-export DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\"" description_fluff = "DromedaryCo is one of Sol's oldest cigarette brands, and takes pride in having sourced tobcacco from the same Indian plantations since 2044. Popular with those willing to pay extra for a little nostalgia." icon_state = "Dpacket" brand = "\improper Dromedary Co. cigarette" -/obj/item/weapon/storage/fancy/cigarettes/killthroat +/obj/item/storage/fancy/cigarettes/killthroat name = "\improper AcmeCo packet" desc = "A packet of six AcmeCo cigarettes. For those who want to obtain a record for the most cancerous tumors on a budget." description_fluff = "Available anywhere people breathe and want to breathe less, AcmeCo is the cheapest, most widespread cigarette brand in the galaxy. They taste like trash, but when you're keeping them inside your jumpsuit on a 16 hour shift, you're probably not too concerned with flavour." icon_state = "Apacket" brand = "\improper Acme Co. cigarette" -/obj/item/weapon/storage/fancy/cigarettes/luckystars +/obj/item/storage/fancy/cigarettes/luckystars name = "\improper pack of Lucky Stars" desc = "A mellow blend made from synthetic, pod-grown tobacco. The commercial jingle is guaranteed to get stuck in your head." description_fluff = "Lucky Stars are some of the most prolific advertisers in the business, with Gilthari Exports plastering the name and slogan on everything from workplace safety videos to racing bikes. 'Feel the gentle warmth of your Lucky Star'." icon_state = "LSpacket" brand = "\improper Lucky Star" -/obj/item/weapon/storage/fancy/cigarettes/jerichos +/obj/item/storage/fancy/cigarettes/jerichos name = "\improper pack of Jerichos" desc = "Typically seen dangling from the lips of Fleet veterans and border world hustlers. Tastes like hickory smoke, feels like warm liquid death down your lungs." description_fluff = "The Jericho brand has carefully cultivated its 'rugged' image ever since its completely accidental association with the SolGov-Hegemony war due to their sizable corporate presence in the region. Prior to the war, Jerichos were considered the realm of drunks and sad divorcees." icon_state = "Jpacket" brand = "\improper Jericho" -/obj/item/weapon/storage/fancy/cigarettes/menthols +/obj/item/storage/fancy/cigarettes/menthols name = "\improper pack of Temperamento Menthols" desc = "With a sharp and natural organic menthol flavor, these Temperamentos are a favorite of science vessel crews. Hardly anyone knows they make 'em in non-menthol!" description_fluff = "Temperamento Menthols are a product of the Aether Atmospherics and Recycling company, and the 'smooth' menthol taste is rumoured to be the chemical by-product of some far more profitable industrial synthesis." icon_state = "TMpacket" brand = "\improper Temperamento Menthol" -/obj/item/weapon/storage/fancy/cigarettes/carcinomas +/obj/item/storage/fancy/cigarettes/carcinomas name = "\improper pack of Carcinoma Angels" desc = "This previously unknown brand was slated for the chopping block, until they were publicly endorsed by an old Earthling gonzo journalist. The rest is history. They sell a variety for cats, too." description_fluff = "The bitter taste of a Carcinoma Angel is considered desirable by many equally bitter wash-ups who consider themselves to be 'hard-boiled'. The smell is practically inseparable from urban security offices, and old men with exonet radio shows." brand = "\improper Carcinoma Angel" -/obj/item/weapon/storage/fancy/cigarettes/professionals +/obj/item/storage/fancy/cigarettes/professionals name = "\improper pack of Professional 120s" desc = "Let's face it - if you're smoking these, you're either trying to look upper-class or you're 80 years old. That's the only excuse. They are, however, very good quality." description_fluff = "Grown and rolled in a meticulously maintained biosphere orbitting Love, P120 tobacco is marketed as 'probably the best in the galaxy'. The premium price point, and the fact that the vast majority of consumers couldn't really tell the difference between this and the next leading brand." @@ -382,7 +382,7 @@ /* * Cigar Box */ -/obj/item/weapon/storage/fancy/cigar +/obj/item/storage/fancy/cigar name = "cigar case" desc = "A case for holding your cigars when you are not smoking them." description_fluff = "The tasteful stained palm case tells you that these 'Palma Grande' premium \ @@ -398,25 +398,25 @@ icon_type = "cigar" starts_with = list(/obj/item/clothing/mask/smokable/cigarette/cigar = 5) -/obj/item/weapon/storage/fancy/cigar/Initialize() +/obj/item/storage/fancy/cigar/Initialize() . = ..() flags |= NOREACT create_reagents(15 * storage_slots) -/obj/item/weapon/storage/fancy/cigar/remove_from_storage(obj/item/W as obj, atom/new_location) +/obj/item/storage/fancy/cigar/remove_from_storage(obj/item/W as obj, atom/new_location) var/obj/item/clothing/mask/smokable/cigarette/cigar/C = W if(!istype(C)) return reagents.trans_to_obj(C, (reagents.total_volume/contents.len)) return ..() -/obj/item/weapon/storage/fancy/cigar/New() +/obj/item/storage/fancy/cigar/New() if(!open_state) open_state = "[initial(icon_state)]0" if(!closed_state) closed_state = "[initial(icon_state)]" ..() -/obj/item/weapon/storage/fancy/cigar/update_icon() +/obj/item/storage/fancy/cigar/update_icon() cut_overlays() if(open) icon_state = open_state @@ -425,19 +425,19 @@ else icon_state = closed_state -/obj/item/weapon/storage/fancy/cigar/open(mob/user as mob) +/obj/item/storage/fancy/cigar/open(mob/user as mob) if(open) return open = TRUE update_icon() ..() -/obj/item/weapon/storage/fancy/cigar/close(mob/user as mob) +/obj/item/storage/fancy/cigar/close(mob/user as mob) open = FALSE update_icon() ..() -/obj/item/weapon/storage/fancy/cigar/choiba +/obj/item/storage/fancy/cigar/choiba name = "/improper Choiba cigar case" desc = "A fancy case for holding your cigars when you are not smoking them." description_fluff = "The exquisite wooden case bears the markings of the \ @@ -450,7 +450,7 @@ icon_type = "cigar" starts_with = list(/obj/item/clothing/mask/smokable/cigarette/cigar/cohiba = 5) -/obj/item/weapon/storage/fancy/cigar/havana +/obj/item/storage/fancy/cigar/havana name = "\improper Havana cigar case" desc = "A fancy case for holding your cigars when you are not smoking them." icon_state = "havanacase" @@ -461,7 +461,7 @@ /* * Tobacco Bits */ -/obj/item/weapon/storage/rollingpapers +/obj/item/storage/rollingpapers name = "rolling paper pack" desc = "A small cardboard pack containing several folded rolling papers." icon_state = "paperbox" @@ -470,47 +470,47 @@ throwforce = 2 slot_flags = SLOT_BELT storage_slots = 14 - can_hold = list(/obj/item/weapon/reagent_containers/rollingpaper) - starts_with = list(/obj/item/weapon/reagent_containers/rollingpaper = 14) + can_hold = list(/obj/item/reagent_containers/rollingpaper) + starts_with = list(/obj/item/reagent_containers/rollingpaper = 14) -/obj/item/weapon/storage/rollingpapers/blunt +/obj/item/storage/rollingpapers/blunt name = "blunt wrap pack" desc = "A small cardboard pack containing several folded blunt wraps." icon_state = "bluntbox" storage_slots = 7 - can_hold = list(/obj/item/weapon/reagent_containers/rollingpaper/blunt) - starts_with = list(/obj/item/weapon/reagent_containers/rollingpaper/blunt = 7) + can_hold = list(/obj/item/reagent_containers/rollingpaper/blunt) + starts_with = list(/obj/item/reagent_containers/rollingpaper/blunt = 7) /* * Vial Box */ -/obj/item/weapon/storage/fancy/vials +/obj/item/storage/fancy/vials icon = 'icons/obj/vialbox.dmi' icon_state = "vialbox6" icon_type = "vial" name = "vial storage box" desc = "A helpful rack to hold test tubes." storage_slots = 6 - can_hold = list(/obj/item/weapon/reagent_containers/glass/beaker/vial) - starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/vial = 6) + can_hold = list(/obj/item/reagent_containers/glass/beaker/vial) + starts_with = list(/obj/item/reagent_containers/glass/beaker/vial = 6) -/obj/item/weapon/storage/lockbox/vials +/obj/item/storage/lockbox/vials name = "secure vial storage box" desc = "A locked box for keeping things away from children." icon = 'icons/obj/vialbox.dmi' icon_state = "vialbox0" item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") max_w_class = ITEMSIZE_SMALL - can_hold = list(/obj/item/weapon/reagent_containers/glass/beaker/vial) + can_hold = list(/obj/item/reagent_containers/glass/beaker/vial) max_storage_space = ITEMSIZE_COST_SMALL * 6 //The sum of the w_classes of all the items in this storage item. storage_slots = 6 req_access = list(access_virology) -/obj/item/weapon/storage/lockbox/vials/Initialize() +/obj/item/storage/lockbox/vials/Initialize() . = ..() update_icon() -/obj/item/weapon/storage/lockbox/vials/update_icon(var/itemremoved = 0) +/obj/item/storage/lockbox/vials/update_icon(var/itemremoved = 0) var/total_contents = contents.len - itemremoved icon_state = "vialbox[total_contents]" cut_overlays() @@ -521,14 +521,14 @@ else add_overlay("ledb") -/obj/item/weapon/storage/lockbox/vials/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/storage/lockbox/vials/attackby(obj/item/W as obj, mob/user as mob) ..() update_icon() /* * Box of Chocolates */ -/obj/item/weapon/storage/fancy/heartbox +/obj/item/storage/fancy/heartbox icon_state = "heartbox" name = "box of chocolates" icon_type = "chocolate" @@ -536,23 +536,23 @@ var/startswith = 6 max_storage_space = ITEMSIZE_COST_SMALL * 6 can_hold = list( - /obj/item/weapon/reagent_containers/food/snacks/chocolatepiece, - /obj/item/weapon/reagent_containers/food/snacks/chocolatepiece/white, - /obj/item/weapon/reagent_containers/food/snacks/chocolatepiece/truffle + /obj/item/reagent_containers/food/snacks/chocolatepiece, + /obj/item/reagent_containers/food/snacks/chocolatepiece/white, + /obj/item/reagent_containers/food/snacks/chocolatepiece/truffle ) starts_with = list( - /obj/item/weapon/reagent_containers/food/snacks/chocolatepiece, - /obj/item/weapon/reagent_containers/food/snacks/chocolatepiece, - /obj/item/weapon/reagent_containers/food/snacks/chocolatepiece, - /obj/item/weapon/reagent_containers/food/snacks/chocolatepiece/white, - /obj/item/weapon/reagent_containers/food/snacks/chocolatepiece/white, - /obj/item/weapon/reagent_containers/food/snacks/chocolatepiece/truffle + /obj/item/reagent_containers/food/snacks/chocolatepiece, + /obj/item/reagent_containers/food/snacks/chocolatepiece, + /obj/item/reagent_containers/food/snacks/chocolatepiece, + /obj/item/reagent_containers/food/snacks/chocolatepiece/white, + /obj/item/reagent_containers/food/snacks/chocolatepiece/white, + /obj/item/reagent_containers/food/snacks/chocolatepiece/truffle ) -/obj/item/weapon/storage/fancy/heartbox/Initialize() +/obj/item/storage/fancy/heartbox/Initialize() . = ..() update_icon() -/obj/item/weapon/storage/fancy/heartbox/update_icon(var/itemremoved = 0) +/obj/item/storage/fancy/heartbox/update_icon(var/itemremoved = 0) if (contents.len == 0) icon_state = "heartbox_empty" diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index ff6cfafe7c7..55bab838d51 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -7,7 +7,7 @@ /* * First Aid Kits */ -/obj/item/weapon/storage/firstaid +/obj/item/storage/firstaid name = "first aid kit" desc = "It's an emergency medical kit for those serious boo-boos." icon = 'icons/obj/storage.dmi' @@ -19,29 +19,29 @@ drop_sound = 'sound/items/drop/cardboardbox.ogg' pickup_sound = 'sound/items/pickup/cardboardbox.ogg' -/obj/item/weapon/storage/firstaid/Initialize() +/obj/item/storage/firstaid/Initialize() . = ..() if(icon_variety) icon_state = pick(icon_variety) icon_variety = null -/obj/item/weapon/storage/firstaid/fire +/obj/item/storage/firstaid/fire name = "fire first aid kit" desc = "It's an emergency medical kit for when the toxins lab spontaneously burns down." icon_state = "ointment" item_state_slots = list(slot_r_hand_str = "firstaid-ointment", slot_l_hand_str = "firstaid-ointment") //icon_variety = list("ointment","firefirstaid") //VOREStation Removal starts_with = list( - /obj/item/device/healthanalyzer, - /obj/item/weapon/reagent_containers/hypospray/autoinjector, + /obj/item/healthanalyzer, + /obj/item/reagent_containers/hypospray/autoinjector, /obj/item/stack/medical/ointment, /obj/item/stack/medical/ointment, - /obj/item/weapon/reagent_containers/pill/kelotane, - /obj/item/weapon/reagent_containers/pill/kelotane, - /obj/item/weapon/reagent_containers/pill/kelotane + /obj/item/reagent_containers/pill/kelotane, + /obj/item/reagent_containers/pill/kelotane, + /obj/item/reagent_containers/pill/kelotane ) -/obj/item/weapon/storage/firstaid/regular +/obj/item/storage/firstaid/regular icon_state = "firstaid" starts_with = list( /obj/item/stack/medical/bruise_pack, @@ -49,48 +49,48 @@ /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/ointment, /obj/item/stack/medical/ointment, - /obj/item/device/healthanalyzer, - /obj/item/weapon/reagent_containers/hypospray/autoinjector + /obj/item/healthanalyzer, + /obj/item/reagent_containers/hypospray/autoinjector ) -/obj/item/weapon/storage/firstaid/toxin +/obj/item/storage/firstaid/toxin name = "poison first aid kit" //IRL the term used would be poison first aid kit. desc = "Used to treat when one has a high amount of toxins in their body." icon_state = "antitoxin" item_state_slots = list(slot_r_hand_str = "firstaid-toxin", slot_l_hand_str = "firstaid-toxin") //icon_variety = list("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3") //VOREStation Removal starts_with = list( - /obj/item/weapon/reagent_containers/syringe/antitoxin, - /obj/item/weapon/reagent_containers/syringe/antitoxin, - /obj/item/weapon/reagent_containers/syringe/antitoxin, - /obj/item/weapon/reagent_containers/pill/antitox, - /obj/item/weapon/reagent_containers/pill/antitox, - /obj/item/weapon/reagent_containers/pill/antitox, - /obj/item/device/healthanalyzer + /obj/item/reagent_containers/syringe/antitoxin, + /obj/item/reagent_containers/syringe/antitoxin, + /obj/item/reagent_containers/syringe/antitoxin, + /obj/item/reagent_containers/pill/antitox, + /obj/item/reagent_containers/pill/antitox, + /obj/item/reagent_containers/pill/antitox, + /obj/item/healthanalyzer ) -/obj/item/weapon/storage/firstaid/o2 +/obj/item/storage/firstaid/o2 name = "oxygen deprivation first aid kit" desc = "A box full of oxygen goodies." icon_state = "o2" item_state_slots = list(slot_r_hand_str = "firstaid-o2", slot_l_hand_str = "firstaid-o2") starts_with = list( - /obj/item/weapon/reagent_containers/pill/dexalin, - /obj/item/weapon/reagent_containers/pill/dexalin, - /obj/item/weapon/reagent_containers/pill/dexalin, - /obj/item/weapon/reagent_containers/pill/dexalin, - /obj/item/weapon/reagent_containers/hypospray/autoinjector, - /obj/item/weapon/reagent_containers/syringe/inaprovaline, - /obj/item/device/healthanalyzer + /obj/item/reagent_containers/pill/dexalin, + /obj/item/reagent_containers/pill/dexalin, + /obj/item/reagent_containers/pill/dexalin, + /obj/item/reagent_containers/pill/dexalin, + /obj/item/reagent_containers/hypospray/autoinjector, + /obj/item/reagent_containers/syringe/inaprovaline, + /obj/item/healthanalyzer ) -/obj/item/weapon/storage/firstaid/adv +/obj/item/storage/firstaid/adv name = "advanced first aid kit" desc = "Contains advanced medical treatments, for serious boo-boos." icon_state = "advfirstaid" item_state_slots = list(slot_r_hand_str = "firstaid-advanced", slot_l_hand_str = "firstaid-advanced") starts_with = list( - /obj/item/weapon/reagent_containers/hypospray/autoinjector, + /obj/item/reagent_containers/hypospray/autoinjector, /obj/item/stack/medical/advanced/bruise_pack, /obj/item/stack/medical/advanced/bruise_pack, /obj/item/stack/medical/advanced/bruise_pack, @@ -99,24 +99,24 @@ /obj/item/stack/medical/splint ) -/obj/item/weapon/storage/firstaid/combat +/obj/item/storage/firstaid/combat name = "combat medical kit" desc = "Contains advanced medical treatments." icon_state = "bezerk" item_state_slots = list(slot_r_hand_str = "firstaid-advanced", slot_l_hand_str = "firstaid-advanced") starts_with = list( - /obj/item/weapon/storage/pill_bottle/bicaridine, - /obj/item/weapon/storage/pill_bottle/dermaline, - /obj/item/weapon/storage/pill_bottle/dexalin_plus, - /obj/item/weapon/storage/pill_bottle/dylovene, - /obj/item/weapon/storage/pill_bottle/tramadol, - /obj/item/weapon/storage/pill_bottle/spaceacillin, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting, + /obj/item/storage/pill_bottle/bicaridine, + /obj/item/storage/pill_bottle/dermaline, + /obj/item/storage/pill_bottle/dexalin_plus, + /obj/item/storage/pill_bottle/dylovene, + /obj/item/storage/pill_bottle/tramadol, + /obj/item/storage/pill_bottle/spaceacillin, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting, /obj/item/stack/medical/splint, - /obj/item/device/healthanalyzer/advanced + /obj/item/healthanalyzer/advanced ) -/obj/item/weapon/storage/firstaid/surgery +/obj/item/storage/firstaid/surgery name = "surgery kit" desc = "Contains tools for surgery. Has precise foam fitting for safe transport and automatically sterilizes the content between uses." icon = 'icons/obj/storage.dmi' // VOREStation edit @@ -125,52 +125,52 @@ max_w_class = ITEMSIZE_NORMAL can_hold = list( - /obj/item/weapon/surgical/bonesetter, - /obj/item/weapon/surgical/cautery, - /obj/item/weapon/surgical/circular_saw, - /obj/item/weapon/surgical/hemostat, - /obj/item/weapon/surgical/retractor, - /obj/item/weapon/surgical/scalpel, - /obj/item/weapon/surgical/surgicaldrill, - /obj/item/weapon/surgical/bonegel, - /obj/item/weapon/surgical/FixOVein, + /obj/item/surgical/bonesetter, + /obj/item/surgical/cautery, + /obj/item/surgical/circular_saw, + /obj/item/surgical/hemostat, + /obj/item/surgical/retractor, + /obj/item/surgical/scalpel, + /obj/item/surgical/surgicaldrill, + /obj/item/surgical/bonegel, + /obj/item/surgical/FixOVein, /obj/item/stack/medical/advanced/bruise_pack, /obj/item/stack/nanopaste, - /obj/item/device/healthanalyzer/advanced, - /obj/item/weapon/autopsy_scanner + /obj/item/healthanalyzer/advanced, + /obj/item/autopsy_scanner ) starts_with = list( - /obj/item/weapon/surgical/bonesetter, - /obj/item/weapon/surgical/cautery, - /obj/item/weapon/surgical/circular_saw, - /obj/item/weapon/surgical/hemostat, - /obj/item/weapon/surgical/retractor, - /obj/item/weapon/surgical/scalpel, - /obj/item/weapon/surgical/surgicaldrill, - /obj/item/weapon/surgical/bonegel, - /obj/item/weapon/surgical/FixOVein, + /obj/item/surgical/bonesetter, + /obj/item/surgical/cautery, + /obj/item/surgical/circular_saw, + /obj/item/surgical/hemostat, + /obj/item/surgical/retractor, + /obj/item/surgical/scalpel, + /obj/item/surgical/surgicaldrill, + /obj/item/surgical/bonegel, + /obj/item/surgical/FixOVein, /obj/item/stack/medical/advanced/bruise_pack, - /obj/item/device/healthanalyzer/advanced, - /obj/item/weapon/autopsy_scanner + /obj/item/healthanalyzer/advanced, + /obj/item/autopsy_scanner ) -/obj/item/weapon/storage/firstaid/clotting +/obj/item/storage/firstaid/clotting name = "clotting kit" desc = "Contains chemicals to stop bleeding." max_storage_space = ITEMSIZE_COST_SMALL * 7 - starts_with = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting = 8) + starts_with = list(/obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting = 8) -/obj/item/weapon/storage/firstaid/bonemed +/obj/item/storage/firstaid/bonemed name = "bone repair kit" desc = "Contains chemicals to mend broken bones." max_storage_space = ITEMSIZE_COST_SMALL * 7 - starts_with = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed = 8) + starts_with = list(/obj/item/reagent_containers/hypospray/autoinjector/bonemed = 8) /* * Pill Bottles */ -/obj/item/weapon/storage/pill_bottle +/obj/item/storage/pill_bottle name = "pill bottle" desc = "It's an airtight container for storing medication." icon_state = "pill_canister" @@ -179,7 +179,7 @@ pickup_sound = 'sound/items/pickup/pillbottle.ogg' item_state_slots = list(slot_r_hand_str = "contsolid", slot_l_hand_str = "contsolid") w_class = ITEMSIZE_SMALL - can_hold = list(/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/dice,/obj/item/weapon/paper) + can_hold = list(/obj/item/reagent_containers/pill,/obj/item/dice,/obj/item/paper) allow_quick_gather = 1 allow_quick_empty = 1 use_to_pickup = TRUE @@ -193,21 +193,21 @@ var/base_name = " " var/base_desc = " " -/obj/item/weapon/storage/pill_bottle/Initialize() +/obj/item/storage/pill_bottle/Initialize() . = ..() base_name = name base_desc = desc update_icon() -/obj/item/weapon/storage/pill_bottle/update_icon() +/obj/item/storage/pill_bottle/update_icon() cut_overlays() if(wrapper_color) var/image/I = image(icon, "pillbottle_wrap") I.color = wrapper_color add_overlay(I) -/obj/item/weapon/storage/pill_bottle/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen)) +/obj/item/storage/pill_bottle/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/pen) || istype(W, /obj/item/flashlight/pen)) var/tmp_label = sanitizeSafe(tgui_input_text(user, "Enter a label for [name]", "Label", label_text, MAX_NAME_LEN), MAX_NAME_LEN) if(length(tmp_label) > 50) to_chat(user, "The label can be at most 50 characters long.") @@ -222,7 +222,7 @@ else ..() -/obj/item/weapon/storage/pill_bottle/proc/update_name_label() +/obj/item/storage/pill_bottle/proc/update_name_label() if(!label_text) name = base_name desc = base_desc @@ -234,72 +234,72 @@ name = "[base_name] ([label_text])" desc = "[base_desc] It is labeled \"[label_text]\"." -/obj/item/weapon/storage/pill_bottle/antitox +/obj/item/storage/pill_bottle/antitox name = "pill bottle (Dylovene)" desc = "Contains pills used to counter toxins." - starts_with = list(/obj/item/weapon/reagent_containers/pill/antitox = 7) + starts_with = list(/obj/item/reagent_containers/pill/antitox = 7) wrapper_color = COLOR_GREEN -/obj/item/weapon/storage/pill_bottle/bicaridine +/obj/item/storage/pill_bottle/bicaridine name = "pill bottle (Bicaridine)" desc = "Contains pills used to stabilize the severely injured." - starts_with = list(/obj/item/weapon/reagent_containers/pill/bicaridine = 7) + starts_with = list(/obj/item/reagent_containers/pill/bicaridine = 7) wrapper_color = COLOR_MAROON -/obj/item/weapon/storage/pill_bottle/dexalin_plus +/obj/item/storage/pill_bottle/dexalin_plus name = "pill bottle (Dexalin Plus)" desc = "Contains pills used to treat extreme cases of oxygen deprivation." - starts_with = list(/obj/item/weapon/reagent_containers/pill/dexalin_plus = 7) + starts_with = list(/obj/item/reagent_containers/pill/dexalin_plus = 7) wrapper_color = "#3366cc" -/obj/item/weapon/storage/pill_bottle/dermaline +/obj/item/storage/pill_bottle/dermaline name = "pill bottle (Dermaline)" desc = "Contains pills used to treat burn wounds." - starts_with = list(/obj/item/weapon/reagent_containers/pill/dermaline = 7) + starts_with = list(/obj/item/reagent_containers/pill/dermaline = 7) wrapper_color = "#e8d131" -/obj/item/weapon/storage/pill_bottle/dylovene +/obj/item/storage/pill_bottle/dylovene name = "pill bottle (Dylovene)" desc = "Contains pills used to treat toxic substances in the blood." - starts_with = list(/obj/item/weapon/reagent_containers/pill/dylovene = 7) + starts_with = list(/obj/item/reagent_containers/pill/dylovene = 7) wrapper_color = COLOR_GREEN -/obj/item/weapon/storage/pill_bottle/inaprovaline +/obj/item/storage/pill_bottle/inaprovaline name = "pill bottle (Inaprovaline)" desc = "Contains pills used to stabilize patients." - starts_with = list(/obj/item/weapon/reagent_containers/pill/inaprovaline = 7) + starts_with = list(/obj/item/reagent_containers/pill/inaprovaline = 7) wrapper_color = COLOR_PALE_BLUE_GRAY -/obj/item/weapon/storage/pill_bottle/kelotane +/obj/item/storage/pill_bottle/kelotane name = "pill bottle (Kelotane)" desc = "Contains pills used to treat burns." - starts_with = list(/obj/item/weapon/reagent_containers/pill/kelotane = 7) + starts_with = list(/obj/item/reagent_containers/pill/kelotane = 7) wrapper_color = "#ec8b2f" -/obj/item/weapon/storage/pill_bottle/spaceacillin +/obj/item/storage/pill_bottle/spaceacillin name = "pill bottle (Spaceacillin)" desc = "A theta-lactam antibiotic. Effective against many diseases likely to be encountered in space." - starts_with = list(/obj/item/weapon/reagent_containers/pill/spaceacillin = 7) + starts_with = list(/obj/item/reagent_containers/pill/spaceacillin = 7) wrapper_color = COLOR_PALE_GREEN_GRAY -/obj/item/weapon/storage/pill_bottle/tramadol +/obj/item/storage/pill_bottle/tramadol name = "pill bottle (Tramadol)" desc = "Contains pills used to relieve pain." - starts_with = list(/obj/item/weapon/reagent_containers/pill/tramadol = 7) + starts_with = list(/obj/item/reagent_containers/pill/tramadol = 7) wrapper_color = COLOR_PURPLE_GRAY -/obj/item/weapon/storage/pill_bottle/citalopram +/obj/item/storage/pill_bottle/citalopram name = "pill bottle (Citalopram)" desc = "Contains pills used to stabilize a patient's mood." - starts_with = list(/obj/item/weapon/reagent_containers/pill/citalopram = 7) + starts_with = list(/obj/item/reagent_containers/pill/citalopram = 7) wrapper_color = COLOR_GRAY -/obj/item/weapon/storage/pill_bottle/carbon +/obj/item/storage/pill_bottle/carbon name = "pill bottle (Carbon)" desc = "Contains pills used to neutralise chemicals in the stomach." - starts_with = list(/obj/item/weapon/reagent_containers/pill/carbon = 7) + starts_with = list(/obj/item/reagent_containers/pill/carbon = 7) -/obj/item/weapon/storage/pill_bottle/iron +/obj/item/storage/pill_bottle/iron name = "pill bottle (Iron)" desc = "Contains pills used to aid in blood regeneration." - starts_with = list(/obj/item/weapon/reagent_containers/pill/iron = 7) + starts_with = list(/obj/item/reagent_containers/pill/iron = 7) diff --git a/code/game/objects/items/weapons/storage/firstaid_vr.dm b/code/game/objects/items/weapons/storage/firstaid_vr.dm index 86c9d4449fd..ac7a0668dc9 100644 --- a/code/game/objects/items/weapons/storage/firstaid_vr.dm +++ b/code/game/objects/items/weapons/storage/firstaid_vr.dm @@ -1,18 +1,18 @@ -/obj/item/weapon/storage/firstaid +/obj/item/storage/firstaid icon = 'icons/obj/storage_vr.dmi' -/obj/item/weapon/storage/firstaid/fire +/obj/item/storage/firstaid/fire starts_with = list( - /obj/item/weapon/storage/pill_bottle/kelotane, + /obj/item/storage/pill_bottle/kelotane, /obj/item/stack/medical/ointment, /obj/item/stack/medical/ointment, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn + /obj/item/reagent_containers/hypospray/autoinjector/burn, + /obj/item/reagent_containers/hypospray/autoinjector/burn, + /obj/item/reagent_containers/hypospray/autoinjector/burn, + /obj/item/reagent_containers/hypospray/autoinjector/burn ) -/obj/item/weapon/storage/firstaid/regular +/obj/item/storage/firstaid/regular starts_with = list( /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, @@ -20,34 +20,34 @@ /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/ointment, /obj/item/stack/medical/ointment, - /obj/item/weapon/storage/pill_bottle/paracetamol + /obj/item/storage/pill_bottle/paracetamol ) -/obj/item/weapon/storage/firstaid/toxin +/obj/item/storage/firstaid/toxin starts_with = list( - /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/rad, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/rad, - /obj/item/weapon/storage/pill_bottle/antitox + /obj/item/reagent_containers/hypospray/autoinjector/detox, + /obj/item/reagent_containers/hypospray/autoinjector/detox, + /obj/item/reagent_containers/hypospray/autoinjector/detox, + /obj/item/reagent_containers/hypospray/autoinjector/detox, + /obj/item/reagent_containers/hypospray/autoinjector/rad, + /obj/item/reagent_containers/hypospray/autoinjector/rad, + /obj/item/storage/pill_bottle/antitox ) -/obj/item/weapon/storage/firstaid/o2 +/obj/item/storage/firstaid/o2 starts_with = list( - /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, - /obj/item/weapon/storage/pill_bottle/inaprovaline, - /obj/item/weapon/storage/pill_bottle/blood_regen, - /obj/item/weapon/storage/pill_bottle/dexalin + /obj/item/reagent_containers/hypospray/autoinjector/oxy, + /obj/item/reagent_containers/hypospray/autoinjector/oxy, + /obj/item/reagent_containers/hypospray/autoinjector/oxy, + /obj/item/reagent_containers/hypospray/autoinjector/oxy, + /obj/item/storage/pill_bottle/inaprovaline, + /obj/item/storage/pill_bottle/blood_regen, + /obj/item/storage/pill_bottle/dexalin ) -/obj/item/weapon/storage/firstaid/adv +/obj/item/storage/firstaid/adv starts_with = list( - /obj/item/weapon/storage/pill_bottle/assorted, + /obj/item/storage/pill_bottle/assorted, /obj/item/stack/medical/advanced/bruise_pack, /obj/item/stack/medical/advanced/bruise_pack, /obj/item/stack/medical/advanced/bruise_pack, @@ -56,240 +56,240 @@ /obj/item/stack/medical/splint ) -/obj/item/weapon/storage/firstaid/combat +/obj/item/storage/firstaid/combat starts_with = list( - /obj/item/weapon/storage/pill_bottle/vermicetol, - /obj/item/weapon/storage/pill_bottle/dermaline, - /obj/item/weapon/storage/pill_bottle/dexalin_plus, - /obj/item/weapon/storage/pill_bottle/carthatoline, - /obj/item/weapon/storage/pill_bottle/tramadol, - /obj/item/weapon/storage/pill_bottle/corophizine, - /obj/item/weapon/storage/pill_bottle/combat, + /obj/item/storage/pill_bottle/vermicetol, + /obj/item/storage/pill_bottle/dermaline, + /obj/item/storage/pill_bottle/dexalin_plus, + /obj/item/storage/pill_bottle/carthatoline, + /obj/item/storage/pill_bottle/tramadol, + /obj/item/storage/pill_bottle/corophizine, + /obj/item/storage/pill_bottle/combat, /obj/item/stack/medical/splint, - /obj/item/device/healthanalyzer/phasic + /obj/item/healthanalyzer/phasic ) -/obj/item/weapon/storage/firstaid/surgery +/obj/item/storage/firstaid/surgery can_hold = list( - /obj/item/weapon/surgical/bonesetter, - /obj/item/weapon/surgical/cautery, - /obj/item/weapon/surgical/circular_saw, - /obj/item/weapon/surgical/hemostat, - /obj/item/weapon/surgical/retractor, - /obj/item/weapon/surgical/scalpel, - /obj/item/weapon/surgical/surgicaldrill, - /obj/item/weapon/surgical/bonegel, - /obj/item/weapon/surgical/FixOVein, + /obj/item/surgical/bonesetter, + /obj/item/surgical/cautery, + /obj/item/surgical/circular_saw, + /obj/item/surgical/hemostat, + /obj/item/surgical/retractor, + /obj/item/surgical/scalpel, + /obj/item/surgical/surgicaldrill, + /obj/item/surgical/bonegel, + /obj/item/surgical/FixOVein, /obj/item/stack/medical/advanced/bruise_pack, /obj/item/stack/nanopaste, - /obj/item/device/healthanalyzer, - /obj/item/weapon/autopsy_scanner, - /obj/item/weapon/surgical/bioregen + /obj/item/healthanalyzer, + /obj/item/autopsy_scanner, + /obj/item/surgical/bioregen ) starts_with = list( - /obj/item/weapon/surgical/bonesetter, - /obj/item/weapon/surgical/cautery, - /obj/item/weapon/surgical/circular_saw, - /obj/item/weapon/surgical/hemostat, - /obj/item/weapon/surgical/retractor, - /obj/item/weapon/surgical/scalpel, - /obj/item/weapon/surgical/surgicaldrill, - /obj/item/weapon/surgical/bonegel, - /obj/item/weapon/surgical/FixOVein, + /obj/item/surgical/bonesetter, + /obj/item/surgical/cautery, + /obj/item/surgical/circular_saw, + /obj/item/surgical/hemostat, + /obj/item/surgical/retractor, + /obj/item/surgical/scalpel, + /obj/item/surgical/surgicaldrill, + /obj/item/surgical/bonegel, + /obj/item/surgical/FixOVein, /obj/item/stack/medical/advanced/bruise_pack, - /obj/item/device/healthanalyzer, - /obj/item/weapon/autopsy_scanner, - /obj/item/weapon/surgical/bioregen + /obj/item/healthanalyzer, + /obj/item/autopsy_scanner, + /obj/item/surgical/bioregen ) -/obj/item/weapon/storage/firstaid/clotting +/obj/item/storage/firstaid/clotting icon_state = "clottingkit" -/obj/item/weapon/storage/firstaid/bonemed +/obj/item/storage/firstaid/bonemed icon_state = "pinky" -/obj/item/weapon/storage/pill_bottle/antitox - starts_with = list(/obj/item/weapon/reagent_containers/pill/antitox = 14) +/obj/item/storage/pill_bottle/antitox + starts_with = list(/obj/item/reagent_containers/pill/antitox = 14) -/obj/item/weapon/storage/pill_bottle/bicaridine - starts_with = list(/obj/item/weapon/reagent_containers/pill/bicaridine = 14) +/obj/item/storage/pill_bottle/bicaridine + starts_with = list(/obj/item/reagent_containers/pill/bicaridine = 14) -/obj/item/weapon/storage/pill_bottle/dexalin_plus - starts_with = list(/obj/item/weapon/reagent_containers/pill/dexalin_plus = 14) +/obj/item/storage/pill_bottle/dexalin_plus + starts_with = list(/obj/item/reagent_containers/pill/dexalin_plus = 14) -/obj/item/weapon/storage/pill_bottle/dermaline - starts_with = list(/obj/item/weapon/reagent_containers/pill/dermaline = 14) +/obj/item/storage/pill_bottle/dermaline + starts_with = list(/obj/item/reagent_containers/pill/dermaline = 14) -/obj/item/weapon/storage/pill_bottle/dylovene - starts_with = list(/obj/item/weapon/reagent_containers/pill/dylovene = 14) +/obj/item/storage/pill_bottle/dylovene + starts_with = list(/obj/item/reagent_containers/pill/dylovene = 14) -/obj/item/weapon/storage/pill_bottle/inaprovaline - starts_with = list(/obj/item/weapon/reagent_containers/pill/inaprovaline = 14) +/obj/item/storage/pill_bottle/inaprovaline + starts_with = list(/obj/item/reagent_containers/pill/inaprovaline = 14) -/obj/item/weapon/storage/pill_bottle/kelotane - starts_with = list(/obj/item/weapon/reagent_containers/pill/kelotane = 14) +/obj/item/storage/pill_bottle/kelotane + starts_with = list(/obj/item/reagent_containers/pill/kelotane = 14) -/obj/item/weapon/storage/pill_bottle/spaceacillin - starts_with = list(/obj/item/weapon/reagent_containers/pill/spaceacillin = 14) +/obj/item/storage/pill_bottle/spaceacillin + starts_with = list(/obj/item/reagent_containers/pill/spaceacillin = 14) -/obj/item/weapon/storage/pill_bottle/tramadol - starts_with = list(/obj/item/weapon/reagent_containers/pill/tramadol = 14) +/obj/item/storage/pill_bottle/tramadol + starts_with = list(/obj/item/reagent_containers/pill/tramadol = 14) -/obj/item/weapon/storage/pill_bottle/citalopram - starts_with = list(/obj/item/weapon/reagent_containers/pill/citalopram = 14) +/obj/item/storage/pill_bottle/citalopram + starts_with = list(/obj/item/reagent_containers/pill/citalopram = 14) -/obj/item/weapon/storage/pill_bottle/carbon - starts_with = list(/obj/item/weapon/reagent_containers/pill/carbon = 14) +/obj/item/storage/pill_bottle/carbon + starts_with = list(/obj/item/reagent_containers/pill/carbon = 14) -/obj/item/weapon/storage/pill_bottle/iron - starts_with = list(/obj/item/weapon/reagent_containers/pill/iron = 14) +/obj/item/storage/pill_bottle/iron + starts_with = list(/obj/item/reagent_containers/pill/iron = 14) -/obj/item/weapon/storage/pill_bottle/blood_regen +/obj/item/storage/pill_bottle/blood_regen name = "pill bottle (blood regeneration)" desc = "Contains iron and copper pills for treating bloodloss by employed species." - starts_with = list(/obj/item/weapon/reagent_containers/pill/iron = 9, - /obj/item/weapon/reagent_containers/pill/copper = 5) + starts_with = list(/obj/item/reagent_containers/pill/iron = 9, + /obj/item/reagent_containers/pill/copper = 5) -/obj/item/weapon/storage/pill_bottle/adminordrazine +/obj/item/storage/pill_bottle/adminordrazine name = "pill bottle (Adminordrazine)" desc = "It's magic. We don't have to explain it." - starts_with = list(/obj/item/weapon/reagent_containers/pill/adminordrazine = 21) + starts_with = list(/obj/item/reagent_containers/pill/adminordrazine = 21) -/obj/item/weapon/storage/pill_bottle/nutriment +/obj/item/storage/pill_bottle/nutriment name = "pill bottle (Food)" desc = "Contains pills used to feed people." - starts_with = list(/obj/item/weapon/reagent_containers/pill/nutriment = 7, /obj/item/weapon/reagent_containers/pill/protein = 7) + starts_with = list(/obj/item/reagent_containers/pill/nutriment = 7, /obj/item/reagent_containers/pill/protein = 7) -/obj/item/weapon/storage/pill_bottle/rezadone +/obj/item/storage/pill_bottle/rezadone name = "pill bottle (Rezadone)" desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects." - starts_with = list(/obj/item/weapon/reagent_containers/pill/rezadone = 14) + starts_with = list(/obj/item/reagent_containers/pill/rezadone = 14) wrapper_color = COLOR_GREEN_GRAY -/obj/item/weapon/storage/pill_bottle/peridaxon +/obj/item/storage/pill_bottle/peridaxon name = "pill bottle (Peridaxon)" desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously." - starts_with = list(/obj/item/weapon/reagent_containers/pill/peridaxon = 14) + starts_with = list(/obj/item/reagent_containers/pill/peridaxon = 14) wrapper_color = COLOR_PURPLE -/obj/item/weapon/storage/pill_bottle/carthatoline +/obj/item/storage/pill_bottle/carthatoline name = "pill bottle (Carthatoline)" desc = "Carthatoline is strong evacuant used to treat severe poisoning." - starts_with = list(/obj/item/weapon/reagent_containers/pill/carthatoline = 14) + starts_with = list(/obj/item/reagent_containers/pill/carthatoline = 14) wrapper_color = COLOR_GREEN_GRAY -/obj/item/weapon/storage/pill_bottle/alkysine +/obj/item/storage/pill_bottle/alkysine name = "pill bottle (Alkysine)" desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." - starts_with = list(/obj/item/weapon/reagent_containers/pill/alkysine = 14) + starts_with = list(/obj/item/reagent_containers/pill/alkysine = 14) wrapper_color = COLOR_YELLOW -/obj/item/weapon/storage/pill_bottle/imidazoline +/obj/item/storage/pill_bottle/imidazoline name = "pill bottle (Imidazoline)" desc = "Heals eye damage." - starts_with = list(/obj/item/weapon/reagent_containers/pill/imidazoline = 14) + starts_with = list(/obj/item/reagent_containers/pill/imidazoline = 14) wrapper_color = COLOR_PURPLE_GRAY -/obj/item/weapon/storage/pill_bottle/osteodaxon +/obj/item/storage/pill_bottle/osteodaxon name = "pill bottle (Osteodaxon)" desc = "An experimental drug used to heal bone fractures." - starts_with = list(/obj/item/weapon/reagent_containers/pill/osteodaxon = 14) + starts_with = list(/obj/item/reagent_containers/pill/osteodaxon = 14) wrapper_color = COLOR_WHITE -/obj/item/weapon/storage/pill_bottle/myelamine +/obj/item/storage/pill_bottle/myelamine name = "pill bottle (Myelamine)" desc = "Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets." - starts_with = list(/obj/item/weapon/reagent_containers/pill/myelamine = 14) + starts_with = list(/obj/item/reagent_containers/pill/myelamine = 14) wrapper_color = COLOR_PALE_PURPLE_GRAY -/obj/item/weapon/storage/pill_bottle/hyronalin +/obj/item/storage/pill_bottle/hyronalin name = "pill bottle (Hyronalin)" desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning." - starts_with = list(/obj/item/weapon/reagent_containers/pill/hyronalin = 14) + starts_with = list(/obj/item/reagent_containers/pill/hyronalin = 14) wrapper_color = COLOR_TEAL -/obj/item/weapon/storage/pill_bottle/arithrazine +/obj/item/storage/pill_bottle/arithrazine name = "pill bottle (Arithrazine)" desc = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning." - starts_with = list(/obj/item/weapon/reagent_containers/pill/arithrazine = 14) + starts_with = list(/obj/item/reagent_containers/pill/arithrazine = 14) wrapper_color = COLOR_TEAL -/obj/item/weapon/storage/pill_bottle/corophizine +/obj/item/storage/pill_bottle/corophizine name = "pill bottle (Corophizine)" desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses." - starts_with = list(/obj/item/weapon/reagent_containers/pill/corophizine = 14) + starts_with = list(/obj/item/reagent_containers/pill/corophizine = 14) wrapper_color = COLOR_PALE_GREEN_GRAY -/obj/item/weapon/storage/pill_bottle/vermicetol +/obj/item/storage/pill_bottle/vermicetol name = "pill bottle (Vermicetol)" desc = "Contains pills used to stabilize the extremely injured." - starts_with = list(/obj/item/weapon/reagent_containers/pill/vermicetol = 14) + starts_with = list(/obj/item/reagent_containers/pill/vermicetol = 14) wrapper_color = COLOR_MAROON -/obj/item/weapon/storage/pill_bottle/healing_nanites +/obj/item/storage/pill_bottle/healing_nanites name = "pill bottle (Healing nanites)" desc = "Miniature medical robots that swiftly restore bodily damage." - starts_with = list(/obj/item/weapon/reagent_containers/pill/healing_nanites = 14) + starts_with = list(/obj/item/reagent_containers/pill/healing_nanites = 14) -/obj/item/weapon/storage/pill_bottle/sleevingcure +/obj/item/storage/pill_bottle/sleevingcure name = "pill bottle (Kitsuhanan Cure)" desc = "A rare cure provided by KHI that helps counteract negative side effects of using imperfect resleeving machinery." - starts_with = list(/obj/item/weapon/reagent_containers/pill/sleevingcure = 7) + starts_with = list(/obj/item/reagent_containers/pill/sleevingcure = 7) -/obj/item/weapon/storage/pill_bottle/sleevingcure/full - starts_with = list(/obj/item/weapon/reagent_containers/pill/sleevingcure = 14) +/obj/item/storage/pill_bottle/sleevingcure/full + starts_with = list(/obj/item/reagent_containers/pill/sleevingcure = 14) -/obj/item/weapon/storage/mrebag/pill +/obj/item/storage/mrebag/pill name = "vacuum-sealed pill" desc = "A small vacuum-sealed package containing a singular pill. For emergencies only." icon_state = "pouch_small" max_w_class = ITEMSIZE_TINY - can_hold = list(/obj/item/weapon/reagent_containers/pill) + can_hold = list(/obj/item/reagent_containers/pill) -/obj/item/weapon/storage/mrebag/pill/sleevingcure +/obj/item/storage/mrebag/pill/sleevingcure name = "vacuum-sealed pill (Kitsuhanan Cure)" desc = "A small vacuum-sealed package containing a singular pill. For emergencies only." - starts_with = list(/obj/item/weapon/reagent_containers/pill/sleevingcure) + starts_with = list(/obj/item/reagent_containers/pill/sleevingcure) -/obj/item/weapon/storage/pill_bottle/paracetamol +/obj/item/storage/pill_bottle/paracetamol name = "pill bottle (Paracetamol)" desc = "Contains over the counter medicine to treat pain." - starts_with = list(/obj/item/weapon/reagent_containers/pill/paracetamol = 14) + starts_with = list(/obj/item/reagent_containers/pill/paracetamol = 14) wrapper_color = COLOR_GRAY -/obj/item/weapon/storage/pill_bottle/dexalin +/obj/item/storage/pill_bottle/dexalin name = "pill bottle (Dexalin)" desc = "Contains pills used to treat oxygen deprivation." - starts_with = list(/obj/item/weapon/reagent_containers/pill/dexalin = 14) + starts_with = list(/obj/item/reagent_containers/pill/dexalin = 14) wrapper_color = "#3366cc" -/obj/item/weapon/storage/pill_bottle/assorted +/obj/item/storage/pill_bottle/assorted name = "pill bottle (Assorted)" desc = "Commonly found on paramedics, these assorted pill bottles contain basic treatments for nonstandard injuries." starts_with = list( - /obj/item/weapon/reagent_containers/pill/inaprovaline = 3, - /obj/item/weapon/reagent_containers/pill/antitox = 3, - /obj/item/weapon/reagent_containers/pill/iron = 1, - /obj/item/weapon/reagent_containers/pill/copper = 1, - /obj/item/weapon/reagent_containers/pill/tramadol = 2, - /obj/item/weapon/reagent_containers/pill/hyronalin = 3, - /obj/item/weapon/reagent_containers/pill/spaceacillin + /obj/item/reagent_containers/pill/inaprovaline = 3, + /obj/item/reagent_containers/pill/antitox = 3, + /obj/item/reagent_containers/pill/iron = 1, + /obj/item/reagent_containers/pill/copper = 1, + /obj/item/reagent_containers/pill/tramadol = 2, + /obj/item/reagent_containers/pill/hyronalin = 3, + /obj/item/reagent_containers/pill/spaceacillin ) wrapper_color = COLOR_BLACK -/obj/item/weapon/storage/pill_bottle/combat +/obj/item/storage/pill_bottle/combat name = "pill bottle (Combat)" desc = "A pill bottle filled with some of the rarest medical treatmeants to exist." max_storage_space = ITEMSIZE_COST_TINY * 20 starts_with = list( - /obj/item/weapon/reagent_containers/pill/peridaxon = 5, - /obj/item/weapon/reagent_containers/pill/rezadone = 5, - /obj/item/weapon/reagent_containers/pill/myelamine = 3, - /obj/item/weapon/reagent_containers/pill/osteodaxon = 3, - /obj/item/weapon/reagent_containers/pill/arithrazine = 2, - /obj/item/weapon/reagent_containers/pill/alkysine = 1, - /obj/item/weapon/reagent_containers/pill/imidazoline = 1 + /obj/item/reagent_containers/pill/peridaxon = 5, + /obj/item/reagent_containers/pill/rezadone = 5, + /obj/item/reagent_containers/pill/myelamine = 3, + /obj/item/reagent_containers/pill/osteodaxon = 3, + /obj/item/reagent_containers/pill/arithrazine = 2, + /obj/item/reagent_containers/pill/alkysine = 1, + /obj/item/reagent_containers/pill/imidazoline = 1 ) wrapper_color = COLOR_BLACK diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/weapons/storage/internal.dm index 63afc51b4e5..6cbea858798 100644 --- a/code/game/objects/items/weapons/storage/internal.dm +++ b/code/game/objects/items/weapons/storage/internal.dm @@ -1,24 +1,24 @@ //A storage item intended to be used by other items to provide storage functionality. //Types that use this should consider overriding emp_act() and hear_talk(), unless they shield their contents somehow. -/obj/item/weapon/storage/internal +/obj/item/storage/internal preserve_item = 1 var/obj/item/master_item -/obj/item/weapon/storage/internal/New(obj/item/MI) +/obj/item/storage/internal/New(obj/item/MI) master_item = MI loc = master_item name = master_item.name verbs -= /obj/item/verb/verb_pickup //make sure this is never picked up. ..() -/obj/item/weapon/storage/internal/Destroy() +/obj/item/storage/internal/Destroy() master_item = null . = ..() -/obj/item/weapon/storage/internal/attack_hand() +/obj/item/storage/internal/attack_hand() return //make sure this is never picked up -/obj/item/weapon/storage/internal/mob_can_equip(M as mob, slot, disable_warning = FALSE) +/obj/item/storage/internal/mob_can_equip(M as mob, slot, disable_warning = FALSE) return 0 //make sure this is never picked up //Helper procs to cleanly implement internal storages - storage items that provide inventory slots for other items. @@ -30,7 +30,7 @@ //items that use internal storage have the option of calling this to emulate default storage MouseDrop behaviour. //returns 1 if the master item's parent's MouseDrop() should be called, 0 otherwise. It's strange, but no other way of //doing it without the ability to call another proc's parent, really. -/obj/item/weapon/storage/internal/proc/handle_mousedrop(mob/user as mob, obj/over_object as obj) +/obj/item/storage/internal/proc/handle_mousedrop(mob/user as mob, obj/over_object as obj) if (ishuman(user) || issmall(user)) //so monkeys can take off their backpacks -- Urist if (istype(user.loc,/obj/mecha)) // stops inventory actions in a mech @@ -63,7 +63,7 @@ //items that use internal storage have the option of calling this to emulate default storage attack_hand behaviour. //returns 1 if the master item's parent's attack_hand() should be called, 0 otherwise. //It's strange, but no other way of doing it without the ability to call another proc's parent, really. -/obj/item/weapon/storage/internal/proc/handle_attack_hand(mob/user as mob) +/obj/item/storage/internal/proc/handle_attack_hand(mob/user as mob) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -86,5 +86,5 @@ src.close(M) return 1 -/obj/item/weapon/storage/internal/Adjacent(var/atom/neighbor) +/obj/item/storage/internal/Adjacent(var/atom/neighbor) return master_item.Adjacent(neighbor) diff --git a/code/game/objects/items/weapons/storage/laundry_basket.dm b/code/game/objects/items/weapons/storage/laundry_basket.dm index ab0f529153f..5b41ea043c0 100644 --- a/code/game/objects/items/weapons/storage/laundry_basket.dm +++ b/code/game/objects/items/weapons/storage/laundry_basket.dm @@ -3,7 +3,7 @@ // ----------------------------- // An item designed for hauling the belongings of a character. // So this cannot be abused for other uses, we make it two-handed and inable to have its storage looked into. -/obj/item/weapon/storage/laundry_basket +/obj/item/storage/laundry_basket name = "laundry basket" icon = 'icons/obj/janitor.dmi' icon_state = "laundry-empty" @@ -21,7 +21,7 @@ var/linked -/obj/item/weapon/storage/laundry_basket/attack_hand(mob/living/user as mob) +/obj/item/storage/laundry_basket/attack_hand(mob/living/user as mob) if(ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/organ/external/temp = H.get_organ("r_hand") @@ -36,13 +36,13 @@ return return ..() -/obj/item/weapon/storage/laundry_basket/attack_self(mob/user as mob) +/obj/item/storage/laundry_basket/attack_self(mob/user as mob) var/turf/T = get_turf(user) to_chat(user, "You dump the [src]'s contents onto \the [T].") return ..() -/obj/item/weapon/storage/laundry_basket/pickup(mob/user) - var/obj/item/weapon/storage/laundry_basket/offhand/O = new(user) +/obj/item/storage/laundry_basket/pickup(mob/user) + var/obj/item/storage/laundry_basket/offhand/O = new(user) O.name = "[name] - second hand" O.desc = "Your second grip on the [name]." O.linked = src @@ -50,7 +50,7 @@ linked = O return -/obj/item/weapon/storage/laundry_basket/update_icon() +/obj/item/storage/laundry_basket/update_icon() if(contents.len) icon_state = "laundry-full" else @@ -58,31 +58,31 @@ return -/obj/item/weapon/storage/laundry_basket/MouseDrop(obj/over_object as obj) +/obj/item/storage/laundry_basket/MouseDrop(obj/over_object as obj) if(over_object == usr) return else return ..() -/obj/item/weapon/storage/laundry_basket/dropped(mob/user as mob) +/obj/item/storage/laundry_basket/dropped(mob/user as mob) if(linked) QDEL_NULL(linked) return ..() -/obj/item/weapon/storage/laundry_basket/show_to(mob/user as mob) +/obj/item/storage/laundry_basket/show_to(mob/user as mob) return -/obj/item/weapon/storage/laundry_basket/open(mob/user as mob) +/obj/item/storage/laundry_basket/open(mob/user as mob) //Offhand -/obj/item/weapon/storage/laundry_basket/offhand +/obj/item/storage/laundry_basket/offhand icon = 'icons/obj/weapons.dmi' icon_state = "offhand" name = "second hand" use_to_pickup = FALSE -/obj/item/weapon/storage/laundry_basket/offhand/dropped(mob/user as mob) +/obj/item/storage/laundry_basket/offhand/dropped(mob/user as mob) if(user.isEquipped(linked)) user.drop_from_inventory(linked) return diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index 16db776bbcf..83ec1637f9c 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -1,6 +1,6 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 -/obj/item/weapon/storage/lockbox +/obj/item/storage/lockbox name = "lockbox" desc = "A locked box." icon_state = "lockbox+l" @@ -17,8 +17,8 @@ var/icon_broken = "lockbox+b" -/obj/item/weapon/storage/lockbox/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/card/id)) +/obj/item/storage/lockbox/attackby(obj/item/W as obj, mob/user as mob) + if (istype(W, /obj/item/card/id)) if(src.broken) to_chat(user, "It appears to be broken.") return @@ -35,7 +35,7 @@ return else to_chat(user, "Access Denied") - else if(istype(W, /obj/item/weapon/melee/energy/blade)) + else if(istype(W, /obj/item/melee/energy/blade)) if(emag_act(INFINITY, user, W, "The locker has been sliced open by [user] with an energy blade!", "You hear metal being sliced and sparks flying.")) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) @@ -49,14 +49,14 @@ return -/obj/item/weapon/storage/lockbox/show_to(mob/user as mob) +/obj/item/storage/lockbox/show_to(mob/user as mob) if(locked) to_chat(user, "It's locked!") else ..() return -/obj/item/weapon/storage/lockbox/emag_act(var/remaining_charges, var/mob/user, var/emag_source, var/visual_feedback = "", var/audible_feedback = "") +/obj/item/storage/lockbox/emag_act(var/remaining_charges, var/mob/user, var/emag_source, var/visual_feedback = "", var/audible_feedback = "") if(!broken) if(visual_feedback) visual_feedback = "[visual_feedback]" @@ -74,21 +74,21 @@ visible_message(visual_feedback, audible_feedback) return 1 -/obj/item/weapon/storage/lockbox/loyalty +/obj/item/storage/lockbox/loyalty name = "lockbox of loyalty implants" req_access = list(access_security) starts_with = list( - /obj/item/weapon/implantcase/loyalty = 3, - /obj/item/weapon/implanter/loyalty + /obj/item/implantcase/loyalty = 3, + /obj/item/implanter/loyalty ) -/obj/item/weapon/storage/lockbox/clusterbang +/obj/item/storage/lockbox/clusterbang name = "lockbox of clusterbangs" desc = "You have a bad feeling about opening this." req_access = list(access_security) - starts_with = list(/obj/item/weapon/grenade/flashbang/clusterbang) + starts_with = list(/obj/item/grenade/flashbang/clusterbang) -/obj/item/weapon/storage/lockbox/medal +/obj/item/storage/lockbox/medal name = "lockbox of medals" desc = "A lockbox filled with commemorative medals, it has the NanoTrasen logo stamped on it." req_access = list(access_heads) diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm index 70f70e8bcc9..978af558524 100644 --- a/code/game/objects/items/weapons/storage/misc.dm +++ b/code/game/objects/items/weapons/storage/misc.dm @@ -3,43 +3,43 @@ */ var/list/random_weighted_donuts = list( - /obj/item/weapon/reagent_containers/food/snacks/donut/plain = 5, - /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly = 5, - /obj/item/weapon/reagent_containers/food/snacks/donut/pink = 4, - /obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly = 4, - /obj/item/weapon/reagent_containers/food/snacks/donut/purple = 4, - /obj/item/weapon/reagent_containers/food/snacks/donut/purple/jelly = 4, - /obj/item/weapon/reagent_containers/food/snacks/donut/green = 4, - /obj/item/weapon/reagent_containers/food/snacks/donut/green/jelly = 4, - /obj/item/weapon/reagent_containers/food/snacks/donut/beige = 4, - /obj/item/weapon/reagent_containers/food/snacks/donut/beige/jelly = 4, - /obj/item/weapon/reagent_containers/food/snacks/donut/choc = 4, - /obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly = 4, - /obj/item/weapon/reagent_containers/food/snacks/donut/blue = 4, - /obj/item/weapon/reagent_containers/food/snacks/donut/blue/jelly = 4, - /obj/item/weapon/reagent_containers/food/snacks/donut/yellow = 4, - /obj/item/weapon/reagent_containers/food/snacks/donut/yellow/jelly = 4, - /obj/item/weapon/reagent_containers/food/snacks/donut/olive = 4, - /obj/item/weapon/reagent_containers/food/snacks/donut/olive/jelly = 4, - /obj/item/weapon/reagent_containers/food/snacks/donut/homer = 3, - /obj/item/weapon/reagent_containers/food/snacks/donut/homer/jelly = 3, - /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles = 3, - /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/jelly = 3, - /obj/item/weapon/reagent_containers/food/snacks/donut/chaos = 1 + /obj/item/reagent_containers/food/snacks/donut/plain = 5, + /obj/item/reagent_containers/food/snacks/donut/plain/jelly = 5, + /obj/item/reagent_containers/food/snacks/donut/pink = 4, + /obj/item/reagent_containers/food/snacks/donut/pink/jelly = 4, + /obj/item/reagent_containers/food/snacks/donut/purple = 4, + /obj/item/reagent_containers/food/snacks/donut/purple/jelly = 4, + /obj/item/reagent_containers/food/snacks/donut/green = 4, + /obj/item/reagent_containers/food/snacks/donut/green/jelly = 4, + /obj/item/reagent_containers/food/snacks/donut/beige = 4, + /obj/item/reagent_containers/food/snacks/donut/beige/jelly = 4, + /obj/item/reagent_containers/food/snacks/donut/choc = 4, + /obj/item/reagent_containers/food/snacks/donut/choc/jelly = 4, + /obj/item/reagent_containers/food/snacks/donut/blue = 4, + /obj/item/reagent_containers/food/snacks/donut/blue/jelly = 4, + /obj/item/reagent_containers/food/snacks/donut/yellow = 4, + /obj/item/reagent_containers/food/snacks/donut/yellow/jelly = 4, + /obj/item/reagent_containers/food/snacks/donut/olive = 4, + /obj/item/reagent_containers/food/snacks/donut/olive/jelly = 4, + /obj/item/reagent_containers/food/snacks/donut/homer = 3, + /obj/item/reagent_containers/food/snacks/donut/homer/jelly = 3, + /obj/item/reagent_containers/food/snacks/donut/choc_sprinkles = 3, + /obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/jelly = 3, + /obj/item/reagent_containers/food/snacks/donut/chaos = 1 ) -/obj/item/weapon/storage/box/donut +/obj/item/storage/box/donut icon = 'icons/obj/food_donuts.dmi' icon_state = "donutbox" name = "donut box" desc = "A box that holds tasty donuts, if you're lucky." center_of_mass = list("x" = 16,"y" = 9) max_storage_space = ITEMSIZE_COST_SMALL * 6 - can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/donut) + can_hold = list(/obj/item/reagent_containers/food/snacks/donut) foldable = /obj/item/stack/material/cardboard - //starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 6) + //starts_with = list(/obj/item/reagent_containers/food/snacks/donut/normal = 6) -/obj/item/weapon/storage/box/donut/Initialize() +/obj/item/storage/box/donut/Initialize() if(!empty) for(var/i in 1 to 6) var/type_to_spawn = pickweight(random_weighted_donuts) @@ -47,57 +47,57 @@ var/list/random_weighted_donuts = list( . = ..() update_icon() -/obj/item/weapon/storage/box/donut/update_icon() +/obj/item/storage/box/donut/update_icon() cut_overlays() var/x_offset = 0 - for(var/obj/item/weapon/reagent_containers/food/snacks/donut/D in contents) + for(var/obj/item/reagent_containers/food/snacks/donut/D in contents) var/mutable_appearance/ma = mutable_appearance(icon = icon, icon_state = D.overlay_state) ma.pixel_x = x_offset add_overlay(ma) x_offset += 3 -/obj/item/weapon/storage/box/donut/empty +/obj/item/storage/box/donut/empty empty = TRUE -/obj/item/weapon/storage/box/wormcan +/obj/item/storage/box/wormcan icon = 'icons/obj/food.dmi' icon_state = "wormcan" name = "can of worms" desc = "You probably do want to open this can of worms." max_storage_space = ITEMSIZE_COST_TINY * 6 can_hold = list( - /obj/item/weapon/reagent_containers/food/snacks/wormsickly, - /obj/item/weapon/reagent_containers/food/snacks/worm, - /obj/item/weapon/reagent_containers/food/snacks/wormdeluxe + /obj/item/reagent_containers/food/snacks/wormsickly, + /obj/item/reagent_containers/food/snacks/worm, + /obj/item/reagent_containers/food/snacks/wormdeluxe ) - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/worm = 6) + starts_with = list(/obj/item/reagent_containers/food/snacks/worm = 6) -/obj/item/weapon/storage/box/wormcan/Initialize() +/obj/item/storage/box/wormcan/Initialize() . = ..() update_icon() -/obj/item/weapon/storage/box/wormcan/update_icon(var/itemremoved = 0) +/obj/item/storage/box/wormcan/update_icon(var/itemremoved = 0) if (contents.len == 0) icon_state = "wormcan_empty" -/obj/item/weapon/storage/box/wormcan/sickly +/obj/item/storage/box/wormcan/sickly icon_state = "wormcan_sickly" name = "can of sickly worms" desc = "You probably don't want to open this can of worms." max_storage_space = ITEMSIZE_COST_TINY * 6 - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/wormsickly = 6) + starts_with = list(/obj/item/reagent_containers/food/snacks/wormsickly = 6) -/obj/item/weapon/storage/box/wormcan/sickly/update_icon(var/itemremoved = 0) +/obj/item/storage/box/wormcan/sickly/update_icon(var/itemremoved = 0) if (contents.len == 0) icon_state = "wormcan_empty_sickly" -/obj/item/weapon/storage/box/wormcan/deluxe +/obj/item/storage/box/wormcan/deluxe icon_state = "wormcan_deluxe" name = "can of deluxe worms" desc = "You absolutely want to open this can of worms." max_storage_space = ITEMSIZE_COST_TINY * 6 - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/wormdeluxe = 6) + starts_with = list(/obj/item/reagent_containers/food/snacks/wormdeluxe = 6) -/obj/item/weapon/storage/box/wormcan/deluxe/update_icon(var/itemremoved = 0) +/obj/item/storage/box/wormcan/deluxe/update_icon(var/itemremoved = 0) if (contents.len == 0) icon_state = "wormcan_empty_deluxe" \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/mre.dm b/code/game/objects/items/weapons/storage/mre.dm index aa1a3343872..d100aaaa059 100644 --- a/code/game/objects/items/weapons/storage/mre.dm +++ b/code/game/objects/items/weapons/storage/mre.dm @@ -2,7 +2,7 @@ MRE Stuff */ -/obj/item/weapon/storage/mre +/obj/item/storage/mre name = "standard MRE" desc = "A vacuum-sealed bag containing a day's worth of nutrients for an adult in strenuous situations. There is no visible expiration date on the package." icon = 'icons/obj/food.dmi' @@ -12,207 +12,207 @@ MRE Stuff var/opened = FALSE var/meal_desc = "This one is menu 1, meat pizza." starts_with = list( - /obj/item/weapon/storage/mrebag, - /obj/item/weapon/storage/mrebag/side, - /obj/item/weapon/storage/mrebag/dessert, - /obj/item/weapon/storage/fancy/crackers, + /obj/item/storage/mrebag, + /obj/item/storage/mrebag/side, + /obj/item/storage/mrebag/dessert, + /obj/item/storage/fancy/crackers, /obj/random/mre/spread, /obj/random/mre/drink, /obj/random/mre/sauce, - /obj/item/weapon/material/kitchen/utensil/spoon/plastic + /obj/item/material/kitchen/utensil/spoon/plastic ) -/obj/item/weapon/storage/mre/examine(mob/user) +/obj/item/storage/mre/examine(mob/user) . = ..() . += meal_desc -/obj/item/weapon/storage/mre/update_icon() +/obj/item/storage/mre/update_icon() if(opened) icon_state = "[initial(icon_state)][opened]" . = ..() -/obj/item/weapon/storage/mre/attack_self(mob/user) +/obj/item/storage/mre/attack_self(mob/user) open(user) -/obj/item/weapon/storage/mre/open(mob/user) +/obj/item/storage/mre/open(mob/user) if(!opened) to_chat(usr, "You tear open the bag, breaking the vacuum seal.") opened = 1 update_icon() . = ..() -/obj/item/weapon/storage/mre/menu2 +/obj/item/storage/mre/menu2 meal_desc = "This one is menu 2, margherita." starts_with = list( - /obj/item/weapon/storage/mrebag/menu2, - /obj/item/weapon/storage/mrebag/side, - /obj/item/weapon/storage/mrebag/dessert, - /obj/item/weapon/storage/fancy/crackers, + /obj/item/storage/mrebag/menu2, + /obj/item/storage/mrebag/side, + /obj/item/storage/mrebag/dessert, + /obj/item/storage/fancy/crackers, /obj/random/mre/spread, /obj/random/mre/drink, /obj/random/mre/sauce, - /obj/item/weapon/material/kitchen/utensil/spoon/plastic + /obj/item/material/kitchen/utensil/spoon/plastic ) -/obj/item/weapon/storage/mre/menu3 +/obj/item/storage/mre/menu3 meal_desc = "This one is menu 3, vegetable pizza." starts_with = list( - /obj/item/weapon/storage/mrebag/menu3, - /obj/item/weapon/storage/mrebag/side, - /obj/item/weapon/storage/mrebag/dessert, - /obj/item/weapon/storage/fancy/crackers, + /obj/item/storage/mrebag/menu3, + /obj/item/storage/mrebag/side, + /obj/item/storage/mrebag/dessert, + /obj/item/storage/fancy/crackers, /obj/random/mre/spread, /obj/random/mre/drink, /obj/random/mre/sauce, - /obj/item/weapon/material/kitchen/utensil/spoon/plastic + /obj/item/material/kitchen/utensil/spoon/plastic ) -/obj/item/weapon/storage/mre/menu4 +/obj/item/storage/mre/menu4 meal_desc = "This one is menu 4, hamburger." starts_with = list( - /obj/item/weapon/storage/mrebag/menu4, - /obj/item/weapon/storage/mrebag/side, - /obj/item/weapon/storage/mrebag/dessert, - /obj/item/weapon/storage/fancy/crackers, + /obj/item/storage/mrebag/menu4, + /obj/item/storage/mrebag/side, + /obj/item/storage/mrebag/dessert, + /obj/item/storage/fancy/crackers, /obj/random/mre/spread, /obj/random/mre/drink, /obj/random/mre/sauce, - /obj/item/weapon/material/kitchen/utensil/spoon/plastic + /obj/item/material/kitchen/utensil/spoon/plastic ) -/obj/item/weapon/storage/mre/menu5 +/obj/item/storage/mre/menu5 meal_desc = "This one is menu 5, taco." starts_with = list( - /obj/item/weapon/storage/mrebag/menu5, - /obj/item/weapon/storage/mrebag/side, - /obj/item/weapon/storage/mrebag/dessert, - /obj/item/weapon/storage/fancy/crackers, + /obj/item/storage/mrebag/menu5, + /obj/item/storage/mrebag/side, + /obj/item/storage/mrebag/dessert, + /obj/item/storage/fancy/crackers, /obj/random/mre/spread, /obj/random/mre/drink, /obj/random/mre/sauce, - /obj/item/weapon/material/kitchen/utensil/spoon/plastic + /obj/item/material/kitchen/utensil/spoon/plastic ) -/obj/item/weapon/storage/mre/menu6 +/obj/item/storage/mre/menu6 meal_desc = "This one is menu 6, meatbread." starts_with = list( - /obj/item/weapon/storage/mrebag/menu6, - /obj/item/weapon/storage/mrebag/side, - /obj/item/weapon/storage/mrebag/dessert, - /obj/item/weapon/storage/fancy/crackers, + /obj/item/storage/mrebag/menu6, + /obj/item/storage/mrebag/side, + /obj/item/storage/mrebag/dessert, + /obj/item/storage/fancy/crackers, /obj/random/mre/spread, /obj/random/mre/drink, /obj/random/mre/sauce, - /obj/item/weapon/material/kitchen/utensil/spoon/plastic + /obj/item/material/kitchen/utensil/spoon/plastic ) -/obj/item/weapon/storage/mre/menu7 +/obj/item/storage/mre/menu7 meal_desc = "This one is menu 7, salad." starts_with = list( - /obj/item/weapon/storage/mrebag/menu7, - /obj/item/weapon/storage/mrebag/side, - /obj/item/weapon/storage/mrebag/dessert, - /obj/item/weapon/storage/fancy/crackers, + /obj/item/storage/mrebag/menu7, + /obj/item/storage/mrebag/side, + /obj/item/storage/mrebag/dessert, + /obj/item/storage/fancy/crackers, /obj/random/mre/spread, /obj/random/mre/drink, /obj/random/mre/sauce, - /obj/item/weapon/material/kitchen/utensil/spoon/plastic + /obj/item/material/kitchen/utensil/spoon/plastic ) -/obj/item/weapon/storage/mre/menu8 +/obj/item/storage/mre/menu8 meal_desc = " This one is menu 8, hot chili." starts_with = list( - /obj/item/weapon/storage/mrebag/menu8, - /obj/item/weapon/storage/mrebag/side, - /obj/item/weapon/storage/mrebag/dessert, - /obj/item/weapon/storage/fancy/crackers, + /obj/item/storage/mrebag/menu8, + /obj/item/storage/mrebag/side, + /obj/item/storage/mrebag/dessert, + /obj/item/storage/fancy/crackers, /obj/random/mre/spread, /obj/random/mre/drink, /obj/random/mre/sauce, - /obj/item/weapon/material/kitchen/utensil/spoon/plastic + /obj/item/material/kitchen/utensil/spoon/plastic ) -/obj/item/weapon/storage/mre/menu9 +/obj/item/storage/mre/menu9 name = "vegan MRE" meal_desc = "This one is menu 9, boiled rice (skrell-safe)." icon_state = "vegmre" starts_with = list( - /obj/item/weapon/storage/mrebag/menu9, - /obj/item/weapon/storage/mrebag/side, - /obj/item/weapon/storage/mrebag/dessert/menu9, - /obj/item/weapon/storage/fancy/crackers, + /obj/item/storage/mrebag/menu9, + /obj/item/storage/mrebag/side, + /obj/item/storage/mrebag/dessert/menu9, + /obj/item/storage/fancy/crackers, /obj/random/mre/spread/vegan, /obj/random/mre/drink, /obj/random/mre/sauce/vegan, - /obj/item/weapon/material/kitchen/utensil/spoon/plastic + /obj/item/material/kitchen/utensil/spoon/plastic ) -/obj/item/weapon/storage/mre/menu10 +/obj/item/storage/mre/menu10 name = "protein MRE" meal_desc = "This one is menu 10, protein." icon_state = "meatmre" starts_with = list( - /obj/item/weapon/storage/mrebag/menu10, - /obj/item/weapon/storage/mrebag/menu10, - /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/protein, + /obj/item/storage/mrebag/menu10, + /obj/item/storage/mrebag/menu10, + /obj/item/reagent_containers/food/snacks/candy/proteinbar, + /obj/item/reagent_containers/food/condiment/small/packet/protein, /obj/random/mre/sauce/sugarfree, - /obj/item/weapon/material/kitchen/utensil/spoon/plastic + /obj/item/material/kitchen/utensil/spoon/plastic ) -/obj/item/weapon/storage/mre/menu11 +/obj/item/storage/mre/menu11 name = "emergency MRE" meal_desc = "This one is menu 11, nutriment paste. Only for emergencies." icon_state = "crayonmre" starts_with = list( - /obj/item/weapon/reagent_containers/food/snacks/liquidfood, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood, - /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, - /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, + /obj/item/reagent_containers/food/snacks/liquidfood, + /obj/item/reagent_containers/food/snacks/liquidfood, + /obj/item/reagent_containers/food/snacks/liquidfood, + /obj/item/reagent_containers/food/snacks/liquidfood, + /obj/item/reagent_containers/food/snacks/liquidprotein, + /obj/item/reagent_containers/food/snacks/liquidprotein, ) -/obj/item/weapon/storage/mre/menu12 +/obj/item/storage/mre/menu12 name = "crayon MRE" meal_desc = "This one doesn't have a menu listing. How very odd." icon_state = "crayonmre" starts_with = list( - /obj/item/weapon/storage/fancy/crayons, - /obj/item/weapon/storage/mrebag/dessert/menu11, + /obj/item/storage/fancy/crayons, + /obj/item/storage/mrebag/dessert/menu11, /obj/random/mre/sauce/crayon, /obj/random/mre/sauce/crayon, /obj/random/mre/sauce/crayon ) -/obj/item/weapon/storage/mre/menu13 +/obj/item/storage/mre/menu13 name = "medical MRE" meal_desc = "This one is menu 13, vitamin paste & dessert. Only for emergencies." icon_state = "crayonmre" starts_with = list( - /obj/item/weapon/reagent_containers/food/snacks/liquidvitamin, - /obj/item/weapon/reagent_containers/food/snacks/liquidvitamin, - /obj/item/weapon/reagent_containers/food/snacks/liquidvitamin, - /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, + /obj/item/reagent_containers/food/snacks/liquidvitamin, + /obj/item/reagent_containers/food/snacks/liquidvitamin, + /obj/item/reagent_containers/food/snacks/liquidvitamin, + /obj/item/reagent_containers/food/snacks/liquidprotein, /obj/random/mre/drink, - /obj/item/weapon/storage/mrebag/dessert, - /obj/item/weapon/material/kitchen/utensil/spoon/plastic + /obj/item/storage/mrebag/dessert, + /obj/item/material/kitchen/utensil/spoon/plastic ) -/obj/item/weapon/storage/mre/random +/obj/item/storage/mre/random meal_desc = "The menu label is faded out." starts_with = list( /obj/random/mre/main, - /obj/item/weapon/storage/mrebag/side, - /obj/item/weapon/storage/mrebag/dessert, - /obj/item/weapon/storage/fancy/crackers, + /obj/item/storage/mrebag/side, + /obj/item/storage/mrebag/dessert, + /obj/item/storage/fancy/crackers, /obj/random/mre/spread, /obj/random/mre/drink, /obj/random/mre/sauce, - /obj/item/weapon/material/kitchen/utensil/spoon/plastic + /obj/item/material/kitchen/utensil/spoon/plastic ) -/obj/item/weapon/storage/mrebag +/obj/item/storage/mrebag name = "main course" desc = "A vacuum-sealed bag containing the MRE's main course. Self-heats when opened." icon = 'icons/obj/food.dmi' @@ -221,76 +221,76 @@ MRE Stuff w_class = ITEMSIZE_SMALL max_w_class = ITEMSIZE_SMALL var/opened = FALSE - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/slice/meatpizza/filled) + starts_with = list(/obj/item/reagent_containers/food/snacks/slice/meatpizza/filled) -/obj/item/weapon/storage/mrebag/Initialize() +/obj/item/storage/mrebag/Initialize() . = ..() -/obj/item/weapon/storage/mrebag/update_icon() +/obj/item/storage/mrebag/update_icon() if(opened) icon_state = "[initial(icon_state)][opened]" . = ..() -/obj/item/weapon/storage/mrebag/attack_self(mob/user) +/obj/item/storage/mrebag/attack_self(mob/user) open(user) -/obj/item/weapon/storage/mrebag/open(mob/user) +/obj/item/storage/mrebag/open(mob/user) if(!opened && !isobserver(user)) to_chat(usr, "The pouch heats up as you break the vacuum seal.") opened = 1 update_icon() . = ..() -/obj/item/weapon/storage/mrebag/menu2 - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/slice/margherita/filled) +/obj/item/storage/mrebag/menu2 + starts_with = list(/obj/item/reagent_containers/food/snacks/slice/margherita/filled) -/obj/item/weapon/storage/mrebag/menu3 - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza/filled) +/obj/item/storage/mrebag/menu3 + starts_with = list(/obj/item/reagent_containers/food/snacks/slice/vegetablepizza/filled) -/obj/item/weapon/storage/mrebag/menu4 - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeyburger) +/obj/item/storage/mrebag/menu4 + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeyburger) -/obj/item/weapon/storage/mrebag/menu5 - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/taco) +/obj/item/storage/mrebag/menu5 + starts_with = list(/obj/item/reagent_containers/food/snacks/taco) -/obj/item/weapon/storage/mrebag/menu6 - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/slice/meatbread/filled) +/obj/item/storage/mrebag/menu6 + starts_with = list(/obj/item/reagent_containers/food/snacks/slice/meatbread/filled) -/obj/item/weapon/storage/mrebag/menu7 - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/tossedsalad) +/obj/item/storage/mrebag/menu7 + starts_with = list(/obj/item/reagent_containers/food/snacks/tossedsalad) -/obj/item/weapon/storage/mrebag/menu8 - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/hotchili) +/obj/item/storage/mrebag/menu8 + starts_with = list(/obj/item/reagent_containers/food/snacks/hotchili) -/obj/item/weapon/storage/mrebag/menu9 - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/boiledrice) +/obj/item/storage/mrebag/menu9 + starts_with = list(/obj/item/reagent_containers/food/snacks/boiledrice) -/obj/item/weapon/storage/mrebag/menu10 - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/meatcube) +/obj/item/storage/mrebag/menu10 + starts_with = list(/obj/item/reagent_containers/food/snacks/meatcube) -/obj/item/weapon/storage/mrebag/side +/obj/item/storage/mrebag/side name = "side dish" desc = "A vacuum-sealed bag containing the MRE's side dish. Self-heats when opened." icon_state = "pouch_small" starts_with = list(/obj/random/mre/side) -/obj/item/weapon/storage/mrebag/side/menu10 - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/meatcube) +/obj/item/storage/mrebag/side/menu10 + starts_with = list(/obj/item/reagent_containers/food/snacks/meatcube) -/obj/item/weapon/storage/mrebag/dessert +/obj/item/storage/mrebag/dessert name = "dessert" desc = "A vacuum-sealed bag containing the MRE's dessert." icon_state = "pouch_small" starts_with = list(/obj/random/mre/dessert) -/obj/item/weapon/storage/mrebag/dessert/menu9 - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit) +/obj/item/storage/mrebag/dessert/menu9 + starts_with = list(/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit) -/obj/item/weapon/storage/mrebag/dessert/menu11 - starts_with = list(/obj/item/weapon/pen/crayon/rainbow) +/obj/item/storage/mrebag/dessert/menu11 + starts_with = list(/obj/item/pen/crayon/rainbow) // TGMC MREs - Smaller, less trash -/obj/item/weapon/storage/box/tgmc_mre +/obj/item/storage/box/tgmc_mre name = "\improper CRS MRE" desc = "Meal Ready-to-Eat, meant to be consumed in the field, prepared by the Commonwealth Ration Service. It says it's government property..." icon = 'icons/obj/food.dmi' @@ -302,17 +302,17 @@ MRE Stuff foldable = null var/isopened = 0 -/obj/item/weapon/storage/box/tgmc_mre/Initialize() +/obj/item/storage/box/tgmc_mre/Initialize() . = ..() pickflavor() -/obj/item/weapon/storage/box/tgmc_mre/Destroy() +/obj/item/storage/box/tgmc_mre/Destroy() var/turf/T = get_turf(src) if(T) new /obj/item/trash/tgmc_mre(T) return ..() -/obj/item/weapon/storage/box/tgmc_mre/proc/pickflavor() +/obj/item/storage/box/tgmc_mre/proc/pickflavor() var/entree = pick("boneless pork ribs", "grilled chicken", "pizza square", "spaghetti", "chicken tenders") var/side = pick("meatballs", "cheese spread", "beef turnover", "mashed potatoes") var/snack = pick("biscuit", "pretzels", "peanuts", "cracker") @@ -320,41 +320,41 @@ MRE Stuff name = "[initial(name)] ([entree])" - new /obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component(src, entree) - new /obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component(src, side) - new /obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component(src, snack) - new /obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component(src, desert) + new /obj/item/reagent_containers/food/snacks/tgmc_mre_component(src, entree) + new /obj/item/reagent_containers/food/snacks/tgmc_mre_component(src, side) + new /obj/item/reagent_containers/food/snacks/tgmc_mre_component(src, snack) + new /obj/item/reagent_containers/food/snacks/tgmc_mre_component(src, desert) new /obj/random/mre/drink(src) -/obj/item/weapon/storage/box/tgmc_mre/remove_from_storage() +/obj/item/storage/box/tgmc_mre/remove_from_storage() . = ..() if(. && !contents.len && !gc_destroyed) qdel(src) -/obj/item/weapon/storage/box/tgmc_mre/update_icon() +/obj/item/storage/box/tgmc_mre/update_icon() if(!isopened) isopened = 1 icon_state = "tgmc_mre_opened" // The sneaky food-looks-like-a-package items -/obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component +/obj/item/reagent_containers/food/snacks/tgmc_mre_component name = "\improper MRE component" package = TRUE bitesize = 1 icon_state = "tgmcmre_entree" var/flavor = "boneless pork ribs" -/obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component/Initialize(mapload, newflavor) +/obj/item/reagent_containers/food/snacks/tgmc_mre_component/Initialize(mapload, newflavor) determinetype(newflavor) desc = "A packaged [flavor] from a Meal Ready-to-Eat, there is a lengthy list of [pick("obscure", "arcane", "unintelligible", "revolutionary", "sophisticated", "unspellable")] ingredients and addictives printed on the back." . = ..() -/obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component/unpackage(mob/user as mob) +/obj/item/reagent_containers/food/snacks/tgmc_mre_component/unpackage(mob/user as mob) . = ..() name = "\improper" + flavor desc = "The contents of a standard issue CRS MRE. This one is " + flavor + "." -/obj/item/weapon/reagent_containers/food/snacks/tgmc_mre_component/proc/determinetype(newflavor) +/obj/item/reagent_containers/food/snacks/tgmc_mre_component/proc/determinetype(newflavor) name = "\improper MRE component" + " (" + newflavor + ")" flavor = newflavor var/static/tastes = list("something scrumptious","nothing","the usual grub","something mediocre","hell","heaven","tentalization","disgust","dog food","cat food","fish food","recycled pizza","junk","trash","rubbish","sawdust","nutraloafs","gourmand food","gourmet food","moistness","squalidness","old grub","actually good food","bleach","soap","sand","synthetic grub","blandness","prison food","Discount Dan's","Discount Dan's Special","Discount Dan's leftovers","yesterday leftovers","microwaved leftovers","leftovers","UPP rations","uncooked grub","overcooked grub","not-so-bad grub","pinapple pizza flavored grub","mystery food","burnt food","frozen food","lukewarm food","rancidness","processed grub","crunchiness","faux meat","something false","low-calorie food","high-carb food","transfat-free food","gluten-free food","delictableness","acid","mintiness","sauciness","saltiness","extreme saltiness","spiced grub","crispness","questionable grub","something untastable","bitterness","savoriness","sourness","sweetness","umami","chewing gum","shoe polish","the jungle","indigestion","oldberries","butter","lard","oil","grass","cough syrup","water","iron","rubber","lead","bronze","wood","paper","plastic","kevlar","cloth","buckshot","gunpowder","black powder","petroleum","gasoline","diesel","biofuel","paint","jelly","slime","sludge","tofu","dietetic food","counterfeit food","grossness","dryness","tartiness","cryogenic juice","the secret ingredient","the ninth element","compressed matter","deep-fried food","double-fried food","a culinary apocalypse","experimental post-modern cuisine","a disaster","muckiness","mustard","mordant","citruses","crayon dust") diff --git a/code/game/objects/items/weapons/storage/pouches.dm b/code/game/objects/items/weapons/storage/pouches.dm index 6eb775c2fee..3ebc910e251 100644 --- a/code/game/objects/items/weapons/storage/pouches.dm +++ b/code/game/objects/items/weapons/storage/pouches.dm @@ -1,7 +1,7 @@ #define INVENTORY_POUCH_SPACE ITEMSIZE_COST_SMALL*4 // 25% the size of a backpack for normal size // Pouches for small storage in pocket slots -/obj/item/weapon/storage/pouch +/obj/item/storage/pouch name = "storage pouch (medium)" desc = "This storage pouch can be used to provide some additional storage for quick access." icon = 'icons/inventory/pockets/item.dmi' @@ -18,7 +18,7 @@ var/insert_delay = 0 SECONDS var/remove_delay = 2 SECONDS -/obj/item/weapon/storage/pouch/stall_insertion(obj/item/W, mob/user) +/obj/item/storage/pouch/stall_insertion(obj/item/W, mob/user) // No delay if you have the pouch in your hands if(user.get_active_hand() == src || user.get_inactive_hand() == src) return TRUE // Skip delay @@ -28,7 +28,7 @@ return TRUE //Now we're allowed to put the item in the pouch -/obj/item/weapon/storage/pouch/stall_removal(obj/item/W, mob/user) +/obj/item/storage/pouch/stall_removal(obj/item/W, mob/user) // No delay if you have the pouch in your hands if(user.get_active_hand() == src || user.get_inactive_hand() == src) return TRUE // Skip delay @@ -41,180 +41,180 @@ return FALSE //Item was somehow already removed -/obj/item/weapon/storage/pouch/pocket_description(mob/haver, mob/examiner) +/obj/item/storage/pouch/pocket_description(mob/haver, mob/examiner) return "[src]" -/obj/item/weapon/storage/pouch/large +/obj/item/storage/pouch/large name = "storage pouch (large)" desc = "This storage pouch can be used to provide a good amount of additional storage for quick access." icon_state = "large_generic" max_storage_space = ITEMSIZE_COST_SMALL*6 remove_delay = 3 SECONDS //VOREStation Add: Slightly more cumbersome -/obj/item/weapon/storage/pouch/small +/obj/item/storage/pouch/small name = "storage pouch (small)" desc = "This storage pouch can be used to provide a small amount of additional storage for quick access." icon_state = "small_generic" max_storage_space = ITEMSIZE_COST_SMALL*2 remove_delay = 1 SECOND //VOREStation Add: Slightly less cumbersome -/obj/item/weapon/storage/pouch/ammo +/obj/item/storage/pouch/ammo name = "storage pouch (ammo)" desc = "This storage pouch can be used to provide some additional storage for quick access. Can only hold ammunition, cells, explosives, and grenades." icon_state = "ammo" max_storage_space = INVENTORY_POUCH_SPACE - can_hold = list(/obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/grenade, /obj/item/weapon/plastique) //Vorestation Add - make it more useful for non-sec/explo + can_hold = list(/obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/cell/device/weapon, /obj/item/grenade, /obj/item/plastique) //Vorestation Add - make it more useful for non-sec/explo -/obj/item/weapon/storage/pouch/eng_tool +/obj/item/storage/pouch/eng_tool name = "storage pouch (tools)" desc = "This storage pouch can be used to provide some additional storage for quick access. Can only hold tools." icon_state = "engineering_tool" max_storage_space = INVENTORY_POUCH_SPACE can_hold = list( - /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/tool/transforming/powerdrill, - /obj/item/weapon/tool/transforming/jawsoflife, - /obj/item/device/multitool, - /obj/item/device/flashlight, - /obj/item/weapon/cell/device, + /obj/item/tool/crowbar, + /obj/item/tool/screwdriver, + /obj/item/weldingtool, + /obj/item/tool/wirecutters, + /obj/item/tool/wrench, + /obj/item/tool/transforming/powerdrill, + /obj/item/tool/transforming/jawsoflife, + /obj/item/multitool, + /obj/item/flashlight, + /obj/item/cell/device, /obj/item/stack/cable_coil, - /obj/item/device/t_scanner, - /obj/item/device/analyzer, + /obj/item/t_scanner, + /obj/item/analyzer, /obj/item/clothing/glasses, /obj/item/clothing/gloves, - /obj/item/device/pda, - /obj/item/device/megaphone, + /obj/item/pda, + /obj/item/megaphone, /obj/item/taperoll, - /obj/item/device/radio/headset, - /obj/item/device/robotanalyzer, - /obj/item/weapon/material/minihoe, - /obj/item/weapon/material/knife/machete/hatchet, - /obj/item/device/analyzer/plant_analyzer, - /obj/item/weapon/extinguisher/mini, - /obj/item/weapon/tape_roll, - /obj/item/device/integrated_electronics/wirer, - /obj/item/device/integrated_electronics/debugger, - /obj/item/weapon/shovel/spade, + /obj/item/radio/headset, + /obj/item/robotanalyzer, + /obj/item/material/minihoe, + /obj/item/material/knife/machete/hatchet, + /obj/item/analyzer/plant_analyzer, + /obj/item/extinguisher/mini, + /obj/item/tape_roll, + /obj/item/integrated_electronics/wirer, + /obj/item/integrated_electronics/debugger, + /obj/item/shovel/spade, /obj/item/stack/nanopaste, - /obj/item/device/geiger + /obj/item/geiger ) //Vorestation Add - make it the same as the tool-belt why was it not like this to start with wtf -/obj/item/weapon/storage/pouch/eng_supply +/obj/item/storage/pouch/eng_supply name = "storage pouch (supplies)" desc = "This storage pouch can be used to provide some additional storage for quick access. Can only hold engineering supplies." icon_state = "engineering_supply" max_storage_space = INVENTORY_POUCH_SPACE can_hold = list( - /obj/item/weapon/cell/device, + /obj/item/cell/device, /obj/item/stack/cable_coil, /obj/item/taperoll, - /obj/item/weapon/extinguisher, - /obj/item/weapon/tape_roll, + /obj/item/extinguisher, + /obj/item/tape_roll, /obj/item/stack/material/steel, /obj/item/stack/material/glass, - /obj/item/device/lightreplacer, - /obj/item/weapon/cell + /obj/item/lightreplacer, + /obj/item/cell ) //Vorestation Add - makes it actually useful lmao, adds sheets and cells as well as light replacers and lets you take any extinguisher that fits -/obj/item/weapon/storage/pouch/eng_parts +/obj/item/storage/pouch/eng_parts name = "storage pouch (parts)" desc = "This storage pouch can be used to provide some additional storage for quick access. Can only hold machinery components." icon_state = "part_pouch" max_storage_space = INVENTORY_POUCH_SPACE*2 //Vorestation Add - yeah lemme give up my pocket to hold FOUR CAPACITORS or have an inferior box... now you can hold eight in your pocket so its at least a box can_hold = list( - /obj/item/weapon/stock_parts, + /obj/item/stock_parts, /obj/item/stack/cable_coil, - /obj/item/weapon/circuitboard + /obj/item/circuitboard ) -/obj/item/weapon/storage/pouch/medical +/obj/item/storage/pouch/medical name = "storage pouch (medical)" desc = "This storage pouch can be used to provide some additional storage for quick access. Can only hold medical supplies." icon_state = "medical_supply" max_storage_space = INVENTORY_POUCH_SPACE can_hold = list( - /obj/item/device/healthanalyzer, - /obj/item/weapon/dnainjector, - /obj/item/weapon/reagent_containers/dropper, - /obj/item/weapon/reagent_containers/glass/beaker, - /obj/item/weapon/reagent_containers/glass/bottle, - /obj/item/weapon/reagent_containers/pill, - /obj/item/weapon/reagent_containers/syringe, - /obj/item/weapon/storage/quickdraw/syringe_case, - /obj/item/weapon/storage/pill_bottle, + /obj/item/healthanalyzer, + /obj/item/dnainjector, + /obj/item/reagent_containers/dropper, + /obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/glass/bottle, + /obj/item/reagent_containers/pill, + /obj/item/reagent_containers/syringe, + /obj/item/storage/quickdraw/syringe_case, + /obj/item/storage/pill_bottle, /obj/item/stack/medical, - /obj/item/weapon/reagent_containers/hypospray, - /obj/item/weapon/storage/quickdraw/syringe_case, - /obj/item/weapon/syringe_cartridge, + /obj/item/reagent_containers/hypospray, + /obj/item/storage/quickdraw/syringe_case, + /obj/item/syringe_cartridge, /obj/item/clothing/gloves/sterile, - /obj/item/device/sleevemate, + /obj/item/sleevemate, /obj/item/bodybag, /obj/item/clothing/mask/surgical, - /obj/item/weapon/soap, + /obj/item/soap, /obj/item/stack/nanopaste, /obj/item/taperoll/medical, - /obj/item/weapon/storage/box/freezer, + /obj/item/storage/box/freezer, /obj/item/clothing/mask/chewable/candy/lolli, ) //Vorestation add - added a bunch of misc medical stuff max_storage_space = ITEMSIZE_COST_SMALL*3 //Vorestation Add - makes it slightly smaller since its a lot of stuff with pocket access remove_delay = 5 //Vorestation Add - .5 second delay, get the medical things faster because there is no reason to use this otherwise. still gotta stop moving to take things out. -/obj/item/weapon/storage/pouch/flares +/obj/item/storage/pouch/flares name = "storage pouch (flares)" desc = "This storage pouch can be used to provide some additional storage for quick access. Can only hold flares and glowsticks." icon_state = "flare" storage_slots = 5 - can_hold = list(/obj/item/device/flashlight/flare, /obj/item/device/flashlight/glowstick) -/obj/item/weapon/storage/pouch/flares/full_flare - starts_with = list(/obj/item/device/flashlight/flare = 5) -/obj/item/weapon/storage/pouch/flares/full_glow - starts_with = list(/obj/item/device/flashlight/glowstick = 5) + can_hold = list(/obj/item/flashlight/flare, /obj/item/flashlight/glowstick) +/obj/item/storage/pouch/flares/full_flare + starts_with = list(/obj/item/flashlight/flare = 5) +/obj/item/storage/pouch/flares/full_glow + starts_with = list(/obj/item/flashlight/glowstick = 5) -/obj/item/weapon/storage/pouch/flares/update_icon() +/obj/item/storage/pouch/flares/update_icon() cut_overlays() if(contents.len) add_overlay("flare_[contents.len]") ..() -/obj/item/weapon/storage/pouch/holster +/obj/item/storage/pouch/holster name = "storage pouch (holster)" desc = "This storage pouch can be used to provide some additional storage for quick access. Can hold one normal sized weapon." icon_state = "pistol_holster" storage_slots = 1 - can_hold = list(/obj/item/weapon/gun) //this covers basically everything I think so its fine + can_hold = list(/obj/item/gun) //this covers basically everything I think so its fine remove_delay = 0 -/obj/item/weapon/storage/pouch/holster/full_stunrevolver - starts_with = list(/obj/item/weapon/gun/energy/stunrevolver) -/obj/item/weapon/storage/pouch/holster/full_taser - starts_with = list(/obj/item/weapon/gun/energy/taser) +/obj/item/storage/pouch/holster/full_stunrevolver + starts_with = list(/obj/item/gun/energy/stunrevolver) +/obj/item/storage/pouch/holster/full_taser + starts_with = list(/obj/item/gun/energy/taser) -/obj/item/weapon/storage/pouch/holster/update_icon() +/obj/item/storage/pouch/holster/update_icon() cut_overlays() if(contents.len) add_overlay("pistol_layer") ..() -/obj/item/weapon/storage/pouch/baton +/obj/item/storage/pouch/baton name = "storage pouch (melee)" desc = "This storage pouch can be used to provide some additional storage for quick access. Can hold one normal size melee." //Vorestation add - make it a melee pouch literally why would you hold ONE BATON icon_state = "baton_holster" storage_slots = 1 - can_hold = list(/obj/item/weapon/melee, /obj/item/weapon/material, /obj/item/weapon/tool/wrench) //should be like, every melee weapon I could think of that was normal size. Can make it more specific if needed. Also wrench because I thought it was funny. + can_hold = list(/obj/item/melee, /obj/item/material, /obj/item/tool/wrench) //should be like, every melee weapon I could think of that was normal size. Can make it more specific if needed. Also wrench because I thought it was funny. remove_delay = 0 -/obj/item/weapon/storage/pouch/baton/full - starts_with = list(/obj/item/weapon/melee/baton) +/obj/item/storage/pouch/baton/full + starts_with = list(/obj/item/melee/baton) -/obj/item/weapon/storage/pouch/baton/update_icon() +/obj/item/storage/pouch/baton/update_icon() cut_overlays() if(contents.len) add_overlay("baton_layer") ..() -/obj/item/weapon/storage/pouch/holding +/obj/item/storage/pouch/holding name = "storage pouch of holding" desc = "This storage pouch can be used to provide some additional storage for quick access. Seems to use extradimensional storage!" icon_state = "holdingpouch" diff --git a/code/game/objects/items/weapons/storage/quickdraw.dm b/code/game/objects/items/weapons/storage/quickdraw.dm index 07b549032cd..3482c4e8123 100644 --- a/code/game/objects/items/weapons/storage/quickdraw.dm +++ b/code/game/objects/items/weapons/storage/quickdraw.dm @@ -4,7 +4,7 @@ //These items are pouches and cases made to be kept in belts or pockets to quickly draw objects from //Largely inspired by the vest pouches on Colonial Marines -/obj/item/weapon/storage/quickdraw +/obj/item/storage/quickdraw name = "quickdraw" desc = "This object should not appear" icon = 'icons/obj/storage_vr.dmi' // VOREStation Edit @@ -14,7 +14,7 @@ //When set to 1, a click while it is equipped will instead move the first item inside it to your hand var/quickmode = 0 -/obj/item/weapon/storage/quickdraw/attack_hand(mob/user as mob) +/obj/item/storage/quickdraw/attack_hand(mob/user as mob) if(src.loc == user) //If they aren't holding us, we do nothing special if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -33,7 +33,7 @@ ..() //Nothing special happened, go call the other proc -/obj/item/weapon/storage/quickdraw/verb/toggle_quickdraw() +/obj/item/storage/quickdraw/verb/toggle_quickdraw() set name = "Switch Quickdraw Mode" set category = "Object" @@ -44,7 +44,7 @@ if(0) to_chat(usr, "[src] now opens as a container.") -/obj/item/weapon/storage/quickdraw/AltClick(mob/user) +/obj/item/storage/quickdraw/AltClick(mob/user) ..() if(src.loc == user) //Are they carrying us? toggle_quickdraw() @@ -56,7 +56,7 @@ // Syringe case // ----------------------------- -/obj/item/weapon/storage/quickdraw/syringe_case +/obj/item/storage/quickdraw/syringe_case name = "syringe case" desc = "A small case for safely carrying sharps around." icon_state = "syringe_case" @@ -66,43 +66,43 @@ max_storage_space = ITEMSIZE_TINY * 6 //Capable of holding six syringes //Can hold syringes and autoinjectors, but also pills if you really wanted. Syringe-shaped objects like pens and cigarettes also fit, but why would you do that? - can_hold = list(/obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/hypospray/autoinjector, - /obj/item/weapon/reagent_containers/pill, /obj/item/weapon/pen, /obj/item/device/flashlight/pen, /obj/item/clothing/mask/smokable/cigarette) + can_hold = list(/obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray/autoinjector, + /obj/item/reagent_containers/pill, /obj/item/pen, /obj/item/flashlight/pen, /obj/item/clothing/mask/smokable/cigarette) quickmode = 1 //Starts in quickdraw mode //Preloaded for your convenience! starts_with = list( - /obj/item/weapon/reagent_containers/syringe, - /obj/item/weapon/reagent_containers/syringe, - /obj/item/weapon/reagent_containers/syringe, - /obj/item/weapon/reagent_containers/syringe, - /obj/item/weapon/reagent_containers/syringe, - /obj/item/weapon/reagent_containers/syringe + /obj/item/reagent_containers/syringe, + /obj/item/reagent_containers/syringe, + /obj/item/reagent_containers/syringe, + /obj/item/reagent_containers/syringe, + /obj/item/reagent_containers/syringe, + /obj/item/reagent_containers/syringe ) -/obj/item/weapon/storage/quickdraw/syringe_case/clotting +/obj/item/storage/quickdraw/syringe_case/clotting desc = "A small case for safely carrying sharps around. This one is deluxe!" max_w_class = ITEMSIZE_SMALL starts_with = list( - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting ) -/obj/item/weapon/storage/quickdraw/syringe_case/bonemed +/obj/item/storage/quickdraw/syringe_case/bonemed desc = "A small case for safely carrying sharps around. This one is deluxe!" max_w_class = ITEMSIZE_SMALL starts_with = list( - /obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed + /obj/item/reagent_containers/hypospray/autoinjector/bonemed, + /obj/item/reagent_containers/hypospray/autoinjector/bonemed, + /obj/item/reagent_containers/hypospray/autoinjector/bonemed ) -/obj/item/weapon/storage/quickdraw/syringe_case/clonemed +/obj/item/storage/quickdraw/syringe_case/clonemed desc = "A small case for safely carrying sharps around. This one is deluxe!" max_w_class = ITEMSIZE_SMALL starts_with = list( - /obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed + /obj/item/reagent_containers/hypospray/autoinjector/clonemed, + /obj/item/reagent_containers/hypospray/autoinjector/clonemed, + /obj/item/reagent_containers/hypospray/autoinjector/clonemed ) diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index d7d9a8f6d42..06dfbc72512 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -1,5 +1,5 @@ /* - * Absorbs /obj/item/weapon/secstorage. + * Absorbs /obj/item/secstorage. * Reimplements it only slightly to use existing storage functionality. * * Contains: @@ -10,7 +10,7 @@ // ----------------------------- // Generic Item // ----------------------------- -/obj/item/weapon/storage/secure +/obj/item/storage/secure name = "secstorage" var/icon_locking = "secureb" var/icon_sparking = "securespark" @@ -28,14 +28,14 @@ max_storage_space = ITEMSIZE_SMALL * 7 use_sound = 'sound/items/storage/briefcase.ogg' -/obj/item/weapon/storage/secure/examine(mob/user) +/obj/item/storage/secure/examine(mob/user) . = ..() if(Adjacent(user)) . += "The service panel is [src.open ? "open" : "closed"]." -/obj/item/weapon/storage/secure/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/storage/secure/attackby(obj/item/W as obj, mob/user as mob) if(locked) - if (istype(W, /obj/item/weapon/melee/energy/blade) && emag_act(INFINITY, user, "You slice through the lock of \the [src]")) + if (istype(W, /obj/item/melee/energy/blade) && emag_act(INFINITY, user, "You slice through the lock of \the [src]")) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) spark_system.start() @@ -49,7 +49,7 @@ playsound(src, W.usesound, 50, 1) user.show_message(text("You [] the service panel.", (src.open ? "open" : "close"))) return - if (istype(W, /obj/item/device/multitool) && (src.open == 1)&& (!src.l_hacking)) + if (istype(W, /obj/item/multitool) && (src.open == 1)&& (!src.l_hacking)) user.show_message("Now attempting to reset internal memory, please hold.", 1) src.l_hacking = 1 if (do_after(usr, 100)) @@ -74,13 +74,13 @@ ..() -/obj/item/weapon/storage/secure/MouseDrop(over_object, src_location, over_location) +/obj/item/storage/secure/MouseDrop(over_object, src_location, over_location) if (locked) src.add_fingerprint(usr) return ..() -/obj/item/weapon/storage/secure/AltClick(mob/user as mob) +/obj/item/storage/secure/AltClick(mob/user as mob) if (isliving(user) && Adjacent(user) && (src.locked == 1)) to_chat(user, "[src] is locked and cannot be opened!") else if (isliving(user) && Adjacent(user) && (!src.locked)) @@ -92,16 +92,16 @@ src.add_fingerprint(user) return -/obj/item/weapon/storage/secure/attack_self(mob/user as mob) +/obj/item/storage/secure/attack_self(mob/user as mob) tgui_interact(user) -/obj/item/weapon/storage/secure/tgui_interact(mob/user, datum/tgui/ui = null) +/obj/item/storage/secure/tgui_interact(mob/user, datum/tgui/ui = null) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "SecureSafe", name) ui.open() -/obj/item/weapon/storage/secure/tgui_data(mob/user) +/obj/item/storage/secure/tgui_data(mob/user) var/list/data = list() data["locked"] = locked data["code"] = code @@ -110,7 +110,7 @@ data["l_set"] = l_set return data -/obj/item/weapon/storage/secure/tgui_act(action, params) +/obj/item/storage/secure/tgui_act(action, params) if(..()) return TRUE switch (action) @@ -141,7 +141,7 @@ . = TRUE return -/obj/item/weapon/storage/secure/emag_act(var/remaining_charges, var/mob/user, var/feedback) +/obj/item/storage/secure/emag_act(var/remaining_charges, var/mob/user, var/feedback) if(!emagged) emagged = 1 src.add_overlay(icon_sparking) @@ -155,7 +155,7 @@ // ----------------------------- // Secure Briefcase // ----------------------------- -/obj/item/weapon/storage/secure/briefcase +/obj/item/storage/secure/briefcase name = "secure briefcase" icon = 'icons/obj/storage.dmi' icon_state = "secure" @@ -168,7 +168,7 @@ w_class = ITEMSIZE_LARGE max_storage_space = ITEMSIZE_COST_NORMAL * 4 -/obj/item/weapon/storage/secure/briefcase/attack_hand(mob/user as mob) +/obj/item/storage/secure/briefcase/attack_hand(mob/user as mob) if ((src.loc == user) && (src.locked == 1)) to_chat(user, "[src] is locked and cannot be opened!") else if ((src.loc == user) && (!src.locked)) @@ -185,7 +185,7 @@ // Secure Safe // ----------------------------- -/obj/item/weapon/storage/secure/safe +/obj/item/storage/secure/safe name = "secure safe" desc = "It doesn't seem all that secure. Oh well, it'll do." icon = 'icons/obj/storage.dmi' @@ -199,11 +199,11 @@ max_w_class = ITEMSIZE_LARGE // This was 8 previously... anchored = TRUE density = FALSE - cant_hold = list(/obj/item/weapon/storage/secure/briefcase) + cant_hold = list(/obj/item/storage/secure/briefcase) starts_with = list( - /obj/item/weapon/paper, - /obj/item/weapon/pen + /obj/item/paper, + /obj/item/pen ) -/obj/item/weapon/storage/secure/safe/attack_hand(mob/user as mob) +/obj/item/storage/secure/safe/attack_hand(mob/user as mob) tgui_interact(user) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index d8cc1a78d0b..1080b2ae574 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -5,7 +5,7 @@ // -Sayu -/obj/item/weapon/storage +/obj/item/storage name = "storage" icon = 'icons/obj/storage.dmi' item_icons = list( @@ -52,18 +52,18 @@ /// If you can use this storage while in a pocket var/pocketable = FALSE -/obj/item/weapon/storage/Initialize() +/obj/item/storage/Initialize() . = ..() if(allow_quick_empty) - verbs += /obj/item/weapon/storage/verb/quick_empty + verbs += /obj/item/storage/verb/quick_empty else - verbs -= /obj/item/weapon/storage/verb/quick_empty + verbs -= /obj/item/storage/verb/quick_empty if(allow_quick_gather) - verbs += /obj/item/weapon/storage/verb/toggle_gathering_mode + verbs += /obj/item/storage/verb/toggle_gathering_mode else - verbs -= /obj/item/weapon/storage/verb/toggle_gathering_mode + verbs -= /obj/item/storage/verb/toggle_gathering_mode if(storage_slots) src.boxes = new /obj/screen/storage( ) @@ -107,7 +107,7 @@ calibrate_size() -/obj/item/weapon/storage/Destroy() +/obj/item/storage/Destroy() close_all() clear_slot_catchers() QDEL_NULL(boxes) @@ -122,7 +122,7 @@ . = ..() -/obj/item/weapon/storage/MouseDrop(obj/over_object as obj) +/obj/item/storage/MouseDrop(obj/over_object as obj) if(!canremove) return @@ -158,7 +158,7 @@ usr.put_in_l_hand(src) src.add_fingerprint(usr) -/obj/item/weapon/storage/AltClick(mob/user) +/obj/item/storage/AltClick(mob/user) if(user in is_seeing) src.close(user) // I would think there should be some incap check here or something @@ -168,21 +168,21 @@ else return ..() -/obj/item/weapon/storage/proc/return_inv() +/obj/item/storage/proc/return_inv() var/list/L = list( ) L += src.contents - for(var/obj/item/weapon/storage/S in src) + for(var/obj/item/storage/S in src) L += S.return_inv() - for(var/obj/item/weapon/gift/G in src) + for(var/obj/item/gift/G in src) L += G.gift - if (istype(G.gift, /obj/item/weapon/storage)) + if (istype(G.gift, /obj/item/storage)) L += G.gift:return_inv() return L -/obj/item/weapon/storage/proc/show_to(mob/user as mob) +/obj/item/storage/proc/show_to(mob/user as mob) if(user.s_active != src) for(var/obj/item/I in src) if(I.on_found(user)) @@ -209,7 +209,7 @@ user.s_active = src LAZYDISTINCTADD(is_seeing,user) -/obj/item/weapon/storage/proc/hide_from(mob/user as mob) +/obj/item/storage/proc/hide_from(mob/user as mob) var/client/C = user.client LAZYREMOVE(is_seeing,user) @@ -235,7 +235,7 @@ if(!LAZYLEN(is_seeing)) clear_slot_catchers() -/obj/item/weapon/storage/proc/open(mob/user as mob) +/obj/item/storage/proc/open(mob/user as mob) if (use_sound) playsound(src, src.use_sound, 50, 0, -5) @@ -244,17 +244,17 @@ user.s_active.close(user) show_to(user) -/obj/item/weapon/storage/proc/close(mob/user as mob) +/obj/item/storage/proc/close(mob/user as mob) src.hide_from(user) user.s_active = null return -/obj/item/weapon/storage/proc/close_all() +/obj/item/storage/proc/close_all() for(var/mob/M in can_see_contents()) close(M) . = 1 -/obj/item/weapon/storage/proc/can_see_contents() +/obj/item/storage/proc/can_see_contents() var/list/cansee = list() for(var/mob/M in is_seeing) if(M.s_active == src && M.client) @@ -263,7 +263,7 @@ LAZYREMOVE(is_seeing,M) return cansee -/obj/item/weapon/storage/proc/create_slot_catchers() +/obj/item/storage/proc/create_slot_catchers() clear_slot_catchers() var/list/new_catchers = list() for(var/obj/item/I in contents) @@ -273,7 +273,7 @@ new_catchers += SS box_catchers = new_catchers -/obj/item/weapon/storage/proc/clear_slot_catchers() +/obj/item/storage/proc/clear_slot_catchers() if(box_catchers) for(var/mob/M in is_seeing) M.client?.screen -= box_catchers @@ -281,7 +281,7 @@ //This proc draws out the inventory and places the items on it. tx and ty are the upper left tile and mx, my are the bottm right. //The numbers are calculated from the bottom-left The bottom-left slot being 1,1. -/obj/item/weapon/storage/proc/orient_objs(tx, ty, mx, my) +/obj/item/storage/proc/orient_objs(tx, ty, mx, my) var/cx = tx var/cy = ty src.boxes.screen_loc = "[tx]:,[ty] to [mx],[my]" @@ -296,7 +296,7 @@ return //This proc draws out the inventory and places the items on it. It uses the standard position. -/obj/item/weapon/storage/proc/slot_orient_objs(var/rows, var/cols, var/list/obj/item/display_contents) +/obj/item/storage/proc/slot_orient_objs(var/rows, var/cols, var/list/obj/item/display_contents) var/cx = 4 var/cy = 2+rows src.boxes.screen_loc = "4:16,2:16 to [4+cols]:16,[2+rows]:16" @@ -328,7 +328,7 @@ src.closer.screen_loc = "[4+cols+1]:16,2:16" return -/obj/item/weapon/storage/proc/space_orient_objs(var/list/obj/item/display_contents) +/obj/item/storage/proc/space_orient_objs(var/list/obj/item/display_contents) SHOULD_NOT_SLEEP(TRUE) /// A prototype for drawing the leftmost border behind each item in storage @@ -401,7 +401,7 @@ number = 1 //This proc determins the size of the inventory to be displayed. Please touch it only if you know what you're doing. -/obj/item/weapon/storage/proc/orient2hud(mob/user as mob) +/obj/item/storage/proc/orient2hud(mob/user as mob) var/adjusted_contents = contents.len @@ -433,7 +433,7 @@ //This proc return 1 if the item can be picked up and 0 if it can't. //Set the stop_messages to stop it from printing messages -/obj/item/weapon/storage/proc/can_be_inserted(obj/item/W as obj, stop_messages = 0) +/obj/item/storage/proc/can_be_inserted(obj/item/W as obj, stop_messages = 0) if(!istype(W)) return //Not an item if(usr && usr.isEquipped(W) && !usr.canUnEquip(W)) @@ -448,7 +448,7 @@ if(LAZYLEN(can_hold) && !is_type_in_list(W, can_hold)) if(!stop_messages) - if (istype(W, /obj/item/weapon/hand_labeler)) + if (istype(W, /obj/item/hand_labeler)) return 0 to_chat(usr, "[src] cannot hold [W].") return 0 @@ -472,7 +472,7 @@ to_chat(usr, "[src] is too full, make some space.") return 0 - if(W.w_class >= src.w_class && (istype(W, /obj/item/weapon/storage))) + if(W.w_class >= src.w_class && (istype(W, /obj/item/storage))) if(!stop_messages) to_chat(usr, "[src] cannot hold [W] as it's a storage item of the same size.") return 0 //To prevent the stacking of same sized storage items. @@ -482,7 +482,7 @@ //This proc handles items being inserted. It does not perform any checks of whether an item can or can't be inserted. That's done by can_be_inserted() //The stop_warning parameter will stop the insertion message from being displayed. It is intended for cases where you are inserting multiple items at once, //such as when picking up all the items on a tile with one click. -/obj/item/weapon/storage/proc/handle_item_insertion(obj/item/W as obj, prevent_warning = 0) +/obj/item/storage/proc/handle_item_insertion(obj/item/W as obj, prevent_warning = 0) if(!istype(W)) return 0 if(!stall_insertion(W, usr)) // Can sleep here and delay removal for slow storage @@ -518,14 +518,14 @@ return 1 //Call this proc to handle the removal of an item from the storage item. The item will be moved to the atom sent as new_target -/obj/item/weapon/storage/proc/remove_from_storage(obj/item/W as obj, atom/new_location) +/obj/item/storage/proc/remove_from_storage(obj/item/W as obj, atom/new_location) if(!istype(W)) return 0 if(!stall_removal(W, usr)) // Can sleep here and delay removal for slow storage return 0 - if(istype(src, /obj/item/weapon/storage/fancy)) - var/obj/item/weapon/storage/fancy/F = src + if(istype(src, /obj/item/storage/fancy)) + var/obj/item/storage/fancy/F = src F.update_icon(1) for(var/mob/M in is_seeing) @@ -556,25 +556,25 @@ return 1 /// Called before insertion completes, allowing you to delay or cancel it -/obj/item/weapon/storage/proc/stall_insertion(obj/item/W, mob/user) +/obj/item/storage/proc/stall_insertion(obj/item/W, mob/user) return TRUE /// Called before removal completes, allowing you to delay or cancel it -/obj/item/weapon/storage/proc/stall_removal(obj/item/W, mob/user) +/obj/item/storage/proc/stall_removal(obj/item/W, mob/user) return TRUE //This proc is called when you want to place an item into the storage item. -/obj/item/weapon/storage/attackby(obj/item/W as obj, mob/user as mob) +/obj/item/storage/attackby(obj/item/W as obj, mob/user as mob) ..() if(isrobot(user)) return //Robots can't interact with storage items. - if(istype(W, /obj/item/device/lightreplacer)) - var/obj/item/device/lightreplacer/LP = W + if(istype(W, /obj/item/lightreplacer)) + var/obj/item/lightreplacer/LP = W var/amt_inserted = 0 var/turf/T = get_turf(user) - for(var/obj/item/weapon/light/L in src.contents) + for(var/obj/item/light/L in src.contents) if(L.status == 0) if(LP.uses < LP.max_uses) LP.add_uses(1) @@ -588,8 +588,8 @@ if(!can_be_inserted(W)) return - if(istype(W, /obj/item/weapon/tray)) - var/obj/item/weapon/tray/T = W + if(istype(W, /obj/item/tray)) + var/obj/item/tray/T = W if(T.calc_carry() > 0) if(prob(85)) to_chat(user, "The tray won't fit in [src].") @@ -604,10 +604,10 @@ W.add_fingerprint(user) return handle_item_insertion(W) -/obj/item/weapon/storage/dropped(mob/user as mob) +/obj/item/storage/dropped(mob/user as mob) return -/obj/item/weapon/storage/attack_hand(mob/user as mob) +/obj/item/storage/attack_hand(mob/user as mob) if(ishuman(user) && !pocketable) var/mob/living/carbon/human/H = user if(H.l_store == src && !H.get_active_hand()) //Prevents opening if it's in a pocket. @@ -629,7 +629,7 @@ src.add_fingerprint(user) return -/obj/item/weapon/storage/proc/gather_all(turf/T as turf, mob/user as mob) +/obj/item/storage/proc/gather_all(turf/T as turf, mob/user as mob) var/list/rejections = list() var/success = 0 var/failure = 0 @@ -650,7 +650,7 @@ else to_chat(user, "You fail to pick anything up with \the [src].") -/obj/item/weapon/storage/verb/toggle_gathering_mode() +/obj/item/storage/verb/toggle_gathering_mode() set name = "Switch Gathering Method" set category = "Object" @@ -662,7 +662,7 @@ to_chat(usr, "[src] now picks up one item at a time.") -/obj/item/weapon/storage/verb/quick_empty() +/obj/item/storage/verb/quick_empty() set name = "Empty Contents" set category = "Object" set src in view(1) @@ -685,27 +685,27 @@ drop_contents() -/obj/item/weapon/storage/proc/drop_contents() // why is this a proc? literally just for RPEDs +/obj/item/storage/proc/drop_contents() // why is this a proc? literally just for RPEDs hide_from(usr) var/turf/T = get_turf(src) for(var/obj/item/I in contents) remove_from_storage(I, T) -/obj/item/weapon/storage/proc/calibrate_size() +/obj/item/storage/proc/calibrate_size() var/total_storage_space = 0 for(var/obj/item/I in contents) total_storage_space += I.get_storage_cost() max_storage_space = max(total_storage_space,max_storage_space) //Prevents spawned containers from being too small for their contents. -/obj/item/weapon/storage/emp_act(severity) +/obj/item/storage/emp_act(severity) if(!istype(src.loc, /mob/living)) for(var/obj/O in contents) O.emp_act(severity) ..() -/obj/item/weapon/storage/attack_self(mob/user as mob) +/obj/item/storage/attack_self(mob/user as mob) if((user.get_active_hand() == src) || (isrobot(user)) && allow_quick_empty) - if(src.verbs.Find(/obj/item/weapon/storage/verb/quick_empty)) + if(src.verbs.Find(/obj/item/storage/verb/quick_empty)) src.quick_empty() return 1 @@ -718,7 +718,7 @@ while (cur_atom && !(cur_atom in container.contents)) if (isarea(cur_atom)) return -1 - if (istype(cur_atom.loc, /obj/item/weapon/storage)) + if (istype(cur_atom.loc, /obj/item/storage)) depth++ cur_atom = cur_atom.loc @@ -736,7 +736,7 @@ while (cur_atom && !isturf(cur_atom)) if (isarea(cur_atom)) return -1 - if (istype(cur_atom.loc, /obj/item/weapon/storage)) + if (istype(cur_atom.loc, /obj/item/storage)) depth++ cur_atom = cur_atom.loc @@ -764,7 +764,7 @@ else return ITEMSIZE_COST_NO_CONTAINER -/obj/item/weapon/storage/proc/make_exact_fit() +/obj/item/storage/proc/make_exact_fit() storage_slots = contents.len LAZYCLEARLIST(can_hold) @@ -779,7 +779,7 @@ /* * Trinket Box - READDING SOON */ -/obj/item/weapon/storage/trinketbox +/obj/item/storage/trinketbox name = "trinket box" desc = "A box that can hold small trinkets, such as a ring." icon = 'icons/obj/items.dmi' @@ -788,13 +788,13 @@ storage_slots = 1 can_hold = list( /obj/item/clothing/gloves/ring, - /obj/item/weapon/coin, + /obj/item/coin, /obj/item/clothing/accessory/medal ) var/open_state var/closed_state -/obj/item/weapon/storage/trinketbox/update_icon() +/obj/item/storage/trinketbox/update_icon() cut_overlays() if(open) icon_state = open_state @@ -803,7 +803,7 @@ var/contained_image = null if(istype(contents[1], /obj/item/clothing/gloves/ring)) contained_image = "ring_trinket" - else if(istype(contents[1], /obj/item/weapon/coin)) + else if(istype(contents[1], /obj/item/coin)) contained_image = "coin_trinket" else if(istype(contents[1], /obj/item/clothing/accessory/medal)) contained_image = "medal_trinket" @@ -812,29 +812,29 @@ else icon_state = closed_state -/obj/item/weapon/storage/trinketbox/New() +/obj/item/storage/trinketbox/New() if(!open_state) open_state = "[initial(icon_state)]_open" if(!closed_state) closed_state = "[initial(icon_state)]" ..() -/obj/item/weapon/storage/trinketbox/attack_self() +/obj/item/storage/trinketbox/attack_self() open = !open update_icon() ..() -/obj/item/weapon/storage/trinketbox/examine(mob/user) +/obj/item/storage/trinketbox/examine(mob/user) . = ..() if(open && contents.len) var/display_item = contents[1] . += "\The [src] contains \the [display_item]!" -/obj/item/weapon/storage/AllowDrop() +/obj/item/storage/AllowDrop() return TRUE //Useful for spilling the contents of containers all over the floor -/obj/item/weapon/storage/proc/spill(var/dist = 2, var/turf/T = null) +/obj/item/storage/proc/spill(var/dist = 2, var/turf/T = null) if (!istype(T))//If its not on the floor this might cause issues T = get_turf(src) @@ -872,7 +872,7 @@ return 1 // Allows micros to drag themselves into storage items -/obj/item/weapon/storage/MouseDrop_T(mob/living/target, mob/living/user) +/obj/item/storage/MouseDrop_T(mob/living/target, mob/living/user) if(!istype(user)) return // If the user passed in isn't a living mob, exit if(target != user) return // If the user didn't drag themselves, exit if(user.incapacitated() || user.buckled) return // If user is incapacitated or buckled, exit @@ -881,7 +881,7 @@ if(ismouse(user) && user.get_effective_size(TRUE) > 1) return // Only normal sized mice or less // Create a dummy holder with user's size to test insertion - var/obj/item/weapon/holder/D = new/obj/item/weapon/holder + var/obj/item/holder/D = new/obj/item/holder if(ismouse(user)) D.w_class = ITEMSIZE_TINY // Mouse smol else if(ishuman(user)) @@ -895,7 +895,7 @@ qdel(D) // Scoop and insert target into storage - var/obj/item/weapon/holder/H = new user.holder_type(get_turf(user), user) + var/obj/item/holder/H = new user.holder_type(get_turf(user), user) src.handle_item_insertion(H, 1) to_chat(user, "You climb into \the [src].") return ..() diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 0637205c3b2..dead68fe217 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -1,7 +1,7 @@ /* * Toolboxes */ -/obj/item/weapon/storage/toolbox +/obj/item/storage/toolbox name = "toolbox" desc = "A metal toolbox with remarkably robust construction." icon = 'icons/obj/storage_vr.dmi' @@ -22,53 +22,53 @@ pickup_sound = 'sound/items/pickup/toolbox.ogg' //Emergency -/obj/item/weapon/storage/toolbox/emergency +/obj/item/storage/toolbox/emergency name = "emergency toolbox" icon = 'icons/obj/storage_vr.dmi' icon_state = "red" item_state_slots = list(slot_r_hand_str = "toolbox_red", slot_l_hand_str = "toolbox_red") starts_with = list( - /obj/item/weapon/tool/crowbar/red, - /obj/item/weapon/extinguisher/mini, - /obj/item/device/radio + /obj/item/tool/crowbar/red, + /obj/item/extinguisher/mini, + /obj/item/radio ) -/obj/item/weapon/storage/toolbox/emergency/Initialize() +/obj/item/storage/toolbox/emergency/Initialize() if(prob(50)) - new /obj/item/device/flashlight(src) + new /obj/item/flashlight(src) else - new /obj/item/device/flashlight/flare(src) + new /obj/item/flashlight/flare(src) . = ..() //Mechanical -/obj/item/weapon/storage/toolbox/mechanical +/obj/item/storage/toolbox/mechanical name = "mechanical toolbox" icon = 'icons/obj/storage_vr.dmi' icon_state = "blue" item_state_slots = list(slot_r_hand_str = "toolbox_blue", slot_l_hand_str = "toolbox_blue") starts_with = list( - /obj/item/weapon/tool/screwdriver, - /obj/item/weapon/tool/wrench, - /obj/item/weapon/weldingtool, - /obj/item/weapon/tool/crowbar, - /obj/item/device/analyzer, - /obj/item/weapon/tool/wirecutters + /obj/item/tool/screwdriver, + /obj/item/tool/wrench, + /obj/item/weldingtool, + /obj/item/tool/crowbar, + /obj/item/analyzer, + /obj/item/tool/wirecutters ) //Electrical -/obj/item/weapon/storage/toolbox/electrical +/obj/item/storage/toolbox/electrical name = "electrical toolbox" icon = 'icons/obj/storage_vr.dmi' icon_state = "yellow" item_state_slots = list(slot_r_hand_str = "toolbox_yellow", slot_l_hand_str = "toolbox_yellow") starts_with = list( - /obj/item/weapon/tool/screwdriver, - /obj/item/weapon/tool/wirecutters, - /obj/item/device/t_scanner, - /obj/item/weapon/tool/crowbar, + /obj/item/tool/screwdriver, + /obj/item/tool/wirecutters, + /obj/item/t_scanner, + /obj/item/tool/crowbar, /obj/item/stack/cable_coil/random_belt, /obj/item/stack/cable_coil/random_belt ) -/obj/item/weapon/storage/toolbox/electrical/Initialize() +/obj/item/storage/toolbox/electrical/Initialize() . = ..() if(prob(5)) new /obj/item/clothing/gloves/yellow(src) @@ -77,7 +77,7 @@ calibrate_size() //Syndicate -/obj/item/weapon/storage/toolbox/syndicate +/obj/item/storage/toolbox/syndicate name = "black and red toolbox" icon = 'icons/obj/storage_vr.dmi' icon_state = "syndicate" @@ -86,59 +86,59 @@ force = 14 starts_with = list( /obj/item/clothing/gloves/yellow, - /obj/item/weapon/tool/screwdriver, - /obj/item/weapon/tool/wrench, - /obj/item/weapon/weldingtool, - /obj/item/weapon/tool/crowbar, - /obj/item/weapon/tool/wirecutters, - /obj/item/device/multitool + /obj/item/tool/screwdriver, + /obj/item/tool/wrench, + /obj/item/weldingtool, + /obj/item/tool/crowbar, + /obj/item/tool/wirecutters, + /obj/item/multitool ) -/obj/item/weapon/storage/toolbox/syndicate/powertools +/obj/item/storage/toolbox/syndicate/powertools starts_with = list( /obj/item/clothing/gloves/yellow, - /obj/item/weapon/tool/transforming/powerdrill, - /obj/item/weapon/weldingtool/experimental, - /obj/item/weapon/tool/transforming/jawsoflife, - /obj/item/device/multitool, + /obj/item/tool/transforming/powerdrill, + /obj/item/weldingtool/experimental, + /obj/item/tool/transforming/jawsoflife, + /obj/item/multitool, /obj/item/stack/cable_coil/random_belt, - /obj/item/device/analyzer + /obj/item/analyzer ) //Brass -/obj/item/weapon/storage/toolbox/brass +/obj/item/storage/toolbox/brass name = "brass toolbox" icon = 'icons/obj/storage_vr.dmi' icon_state = "brass" item_state_slots = list(slot_r_hand_str = "toolbox_yellow", slot_l_hand_str = "toolbox_yellow") starts_with = list( - /obj/item/weapon/tool/crowbar/brass, - /obj/item/weapon/tool/wirecutters/brass, - /obj/item/weapon/tool/screwdriver/brass, - /obj/item/weapon/tool/wrench/brass, - /obj/item/weapon/weldingtool/brass + /obj/item/tool/crowbar/brass, + /obj/item/tool/wirecutters/brass, + /obj/item/tool/screwdriver/brass, + /obj/item/tool/wrench/brass, + /obj/item/weldingtool/brass ) //Hydro -/obj/item/weapon/storage/toolbox/hydro +/obj/item/storage/toolbox/hydro name = "hydroponic toolbox" icon = 'icons/obj/storage_vr.dmi' icon_state = "green" item_state_slots = list(slot_r_hand_str = "toolbox_green", slot_l_hand_str = "toolbox_green") starts_with = list( - /obj/item/device/analyzer/plant_analyzer, - /obj/item/weapon/material/minihoe, - /obj/item/weapon/material/knife/machete/hatchet, - /obj/item/weapon/tool/wirecutters/clippers/trimmers, - /obj/item/weapon/reagent_containers/spray/plantbgone, - /obj/item/weapon/reagent_containers/glass/beaker + /obj/item/analyzer/plant_analyzer, + /obj/item/material/minihoe, + /obj/item/material/knife/machete/hatchet, + /obj/item/tool/wirecutters/clippers/trimmers, + /obj/item/reagent_containers/spray/plantbgone, + /obj/item/reagent_containers/glass/beaker ) /* * Lunchboxes */ -/obj/item/weapon/storage/toolbox/lunchbox +/obj/item/storage/toolbox/lunchbox max_storage_space = ITEMSIZE_COST_SMALL * 4 //slightly smaller than a toolbox name = "rainbow lunchbox" icon = 'icons/obj/storage.dmi' @@ -150,7 +150,7 @@ var/filled = FALSE attack_verb = list("lunched") -/obj/item/weapon/storage/toolbox/lunchbox/Initialize() +/obj/item/storage/toolbox/lunchbox/Initialize() if(filled) var/list/lunches = lunchables_lunches() var/lunch = lunches[pick(lunches)] @@ -165,75 +165,75 @@ new drink(src) . = ..() -/obj/item/weapon/storage/toolbox/lunchbox/filled +/obj/item/storage/toolbox/lunchbox/filled filled = TRUE -/obj/item/weapon/storage/toolbox/lunchbox/heart +/obj/item/storage/toolbox/lunchbox/heart name = "heart lunchbox" icon = 'icons/obj/storage.dmi' icon_state = "lunchbox_lovelyhearts" item_state_slots = list(slot_r_hand_str = "toolbox_pink", slot_l_hand_str = "toolbox_pink") desc = "A little lunchbox. This one has cute little hearts on it!" -/obj/item/weapon/storage/toolbox/lunchbox/heart/filled +/obj/item/storage/toolbox/lunchbox/heart/filled filled = TRUE -/obj/item/weapon/storage/toolbox/lunchbox/cat +/obj/item/storage/toolbox/lunchbox/cat name = "cat lunchbox" icon = 'icons/obj/storage.dmi' icon_state = "lunchbox_sciencecatshow" item_state_slots = list(slot_r_hand_str = "toolbox_green", slot_l_hand_str = "toolbox_green") desc = "A little lunchbox. This one has a cute little science cat from a popular show on it!" -/obj/item/weapon/storage/toolbox/lunchbox/cat/filled +/obj/item/storage/toolbox/lunchbox/cat/filled filled = TRUE -/obj/item/weapon/storage/toolbox/lunchbox/nt +/obj/item/storage/toolbox/lunchbox/nt name = "NanoTrasen brand lunchbox" icon = 'icons/obj/storage.dmi' icon_state = "lunchbox_nanotrasen" item_state_slots = list(slot_r_hand_str = "toolbox_blue", slot_l_hand_str = "toolbox_blue") desc = "A little lunchbox. This one is branded with the NanoTrasen logo!" -/obj/item/weapon/storage/toolbox/lunchbox/nt/filled +/obj/item/storage/toolbox/lunchbox/nt/filled filled = TRUE -/obj/item/weapon/storage/toolbox/lunchbox/mars +/obj/item/storage/toolbox/lunchbox/mars name = "\improper Mojave university lunchbox" icon = 'icons/obj/storage.dmi' icon_state = "lunchbox_marsuniversity" item_state_slots = list(slot_r_hand_str = "toolbox_red", slot_l_hand_str = "toolbox_red") desc = "A little lunchbox. This one is branded with the Mojave university logo!" -/obj/item/weapon/storage/toolbox/lunchbox/mars/filled +/obj/item/storage/toolbox/lunchbox/mars/filled filled = TRUE -/obj/item/weapon/storage/toolbox/lunchbox/cti +/obj/item/storage/toolbox/lunchbox/cti name = "\improper CTI lunchbox" icon = 'icons/obj/storage.dmi' icon_state = "lunchbox_cti" item_state_slots = list(slot_r_hand_str = "toolbox_blue", slot_l_hand_str = "toolbox_blue") desc = "A little lunchbox. This one is branded with the CTI logo!" -/obj/item/weapon/storage/toolbox/lunchbox/cti/filled +/obj/item/storage/toolbox/lunchbox/cti/filled filled = TRUE -/obj/item/weapon/storage/toolbox/lunchbox/nymph +/obj/item/storage/toolbox/lunchbox/nymph name = "\improper Diona nymph lunchbox" icon = 'icons/obj/storage.dmi' icon_state = "lunchbox_dionanymph" item_state_slots = list(slot_r_hand_str = "toolbox_yellow", slot_l_hand_str = "toolbox_yellow") desc = "A little lunchbox. This one is an adorable Diona nymph on the side!" -/obj/item/weapon/storage/toolbox/lunchbox/nymph/filled +/obj/item/storage/toolbox/lunchbox/nymph/filled filled = TRUE -/obj/item/weapon/storage/toolbox/lunchbox/syndicate +/obj/item/storage/toolbox/lunchbox/syndicate name = "black and red lunchbox" icon = 'icons/obj/storage.dmi' icon_state = "lunchbox_syndie" item_state_slots = list(slot_r_hand_str = "toolbox_syndi", slot_l_hand_str = "toolbox_syndi") desc = "A little lunchbox. This one is a sleek black and red, made of a durable steel!" -/obj/item/weapon/storage/toolbox/lunchbox/syndicate/filled +/obj/item/storage/toolbox/lunchbox/syndicate/filled filled = TRUE diff --git a/code/game/objects/items/weapons/storage/toolbox_vr.dm b/code/game/objects/items/weapons/storage/toolbox_vr.dm index 12ef265f1f0..b92ccb586eb 100644 --- a/code/game/objects/items/weapons/storage/toolbox_vr.dm +++ b/code/game/objects/items/weapons/storage/toolbox_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/storage/toolbox/lunchbox/survival +/obj/item/storage/toolbox/lunchbox/survival name = "survival lunchbox" icon = 'icons/obj/storage_vr.dmi' icon_state = "lunchbox_survival" @@ -6,6 +6,6 @@ desc = "A little lunchbox. This one seems to be much sturdier than normal, made of a durable steel!" max_storage_space = ITEMSIZE_COST_SMALL * 6 -/obj/item/weapon/storage/toolbox/lunchbox/survival/zaddat +/obj/item/storage/toolbox/lunchbox/survival/zaddat name = "zaddat survival lunchbox" - starts_with = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 6) + starts_with = list(/obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose = 6) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index fc0bd1856d9..3704524cf12 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -1,217 +1,217 @@ -/obj/item/weapon/storage/box/syndicate/Initialize() +/obj/item/storage/box/syndicate/Initialize() switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "freedom" = 1, "hacker" = 1, "lordsingulo" = 1, "smoothoperator" = 1))) if("bloodyspai") new /obj/item/clothing/under/chameleon(src) new /obj/item/clothing/mask/gas/voice(src) - new /obj/item/weapon/card/id/syndicate(src) + new /obj/item/card/id/syndicate(src) new /obj/item/clothing/shoes/syndigaloshes(src) if("stealth") - new /obj/item/weapon/gun/energy/crossbow(src) - new /obj/item/weapon/pen/reagent/paralysis(src) - new /obj/item/device/chameleon(src) + new /obj/item/gun/energy/crossbow(src) + new /obj/item/pen/reagent/paralysis(src) + new /obj/item/chameleon(src) if("screwed") new /obj/effect/spawner/newbomb/timer/syndicate(src) new /obj/effect/spawner/newbomb/timer/syndicate(src) - new /obj/item/device/powersink(src) + new /obj/item/powersink(src) new /obj/item/clothing/suit/space/syndicate(src) new /obj/item/clothing/head/helmet/space/syndicate(src) new /obj/item/clothing/mask/gas/syndicate(src) - new /obj/item/weapon/tank/emergency/oxygen/double(src) + new /obj/item/tank/emergency/oxygen/double(src) if("guns") - new /obj/item/weapon/gun/projectile/revolver(src) + new /obj/item/gun/projectile/revolver(src) new /obj/item/ammo_magazine/s357(src) - new /obj/item/weapon/card/emag(src) - new /obj/item/weapon/plastique(src) - new /obj/item/weapon/plastique(src) + new /obj/item/card/emag(src) + new /obj/item/plastique(src) + new /obj/item/plastique(src) if("murder") - new /obj/item/weapon/melee/energy/sword(src) + new /obj/item/melee/energy/sword(src) new /obj/item/clothing/glasses/thermal/syndi(src) - new /obj/item/weapon/card/emag(src) + new /obj/item/card/emag(src) new /obj/item/clothing/shoes/syndigaloshes(src) if("freedom") - var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src) - O.imp = new /obj/item/weapon/implant/freedom(O) - var/obj/item/weapon/implanter/U = new /obj/item/weapon/implanter(src) - U.imp = new /obj/item/weapon/implant/uplink(U) + var/obj/item/implanter/O = new /obj/item/implanter(src) + O.imp = new /obj/item/implant/freedom(O) + var/obj/item/implanter/U = new /obj/item/implanter(src) + U.imp = new /obj/item/implant/uplink(U) if("hacker") - new /obj/item/device/encryptionkey/syndicate(src) - new /obj/item/weapon/aiModule/syndicate(src) - new /obj/item/weapon/card/emag(src) - new /obj/item/device/encryptionkey/binary(src) + new /obj/item/encryptionkey/syndicate(src) + new /obj/item/aiModule/syndicate(src) + new /obj/item/card/emag(src) + new /obj/item/encryptionkey/binary(src) if("lordsingulo") - new /obj/item/device/radio/beacon/syndicate(src) + new /obj/item/radio/beacon/syndicate(src) new /obj/item/clothing/suit/space/syndicate(src) new /obj/item/clothing/head/helmet/space/syndicate(src) new /obj/item/clothing/mask/gas/syndicate(src) - new /obj/item/weapon/tank/emergency/oxygen/double(src) - new /obj/item/weapon/card/emag(src) + new /obj/item/tank/emergency/oxygen/double(src) + new /obj/item/card/emag(src) if("smoothoperator") - new /obj/item/weapon/storage/box/syndie_kit/g9mm(src) - new /obj/item/weapon/storage/bag/trash(src) - new /obj/item/weapon/soap/syndie(src) + new /obj/item/storage/box/syndie_kit/g9mm(src) + new /obj/item/storage/bag/trash(src) + new /obj/item/soap/syndie(src) new /obj/item/bodybag(src) new /obj/item/clothing/under/suit_jacket(src) new /obj/item/clothing/shoes/laceup(src) . = ..() -/obj/item/weapon/storage/box/syndie_kit +/obj/item/storage/box/syndie_kit name = "box" desc = "A sleek, sturdy box" icon_state = "box_of_doom" -/obj/item/weapon/storage/box/syndie_kit/imp_freedom +/obj/item/storage/box/syndie_kit/imp_freedom name = "boxed freedom implant (with injector)" -/obj/item/weapon/storage/box/syndie_kit/imp_freedom/Initialize() - var/obj/item/weapon/implanter/O = new(src) - O.imp = new /obj/item/weapon/implant/freedom(O) +/obj/item/storage/box/syndie_kit/imp_freedom/Initialize() + var/obj/item/implanter/O = new(src) + O.imp = new /obj/item/implant/freedom(O) O.update() . = ..() -/obj/item/weapon/storage/box/syndie_kit/imp_compress +/obj/item/storage/box/syndie_kit/imp_compress name = "box (C)" - starts_with = list(/obj/item/weapon/implanter/compressed) + starts_with = list(/obj/item/implanter/compressed) -/obj/item/weapon/storage/box/syndie_kit/imp_explosive +/obj/item/storage/box/syndie_kit/imp_explosive name = "box (E)" - starts_with = list(/obj/item/weapon/implanter/explosive) + starts_with = list(/obj/item/implanter/explosive) -/obj/item/weapon/storage/box/syndie_kit/imp_uplink +/obj/item/storage/box/syndie_kit/imp_uplink name = "boxed uplink implant (with injector)" -/obj/item/weapon/storage/box/syndie_kit/imp_uplink/Initialize() - var/obj/item/weapon/implanter/O = new(src) - O.imp = new /obj/item/weapon/implant/uplink(O) +/obj/item/storage/box/syndie_kit/imp_uplink/Initialize() + var/obj/item/implanter/O = new(src) + O.imp = new /obj/item/implant/uplink(O) O.update() . = ..() -/obj/item/weapon/storage/box/syndie_kit/imp_aug +/obj/item/storage/box/syndie_kit/imp_aug name = "boxed augment implant (with injector)" - var/case_type = /obj/item/weapon/implantcase/shades + var/case_type = /obj/item/implantcase/shades -/obj/item/weapon/storage/box/syndie_kit/imp_aug/Initialize() - new /obj/item/weapon/implanter(src) +/obj/item/storage/box/syndie_kit/imp_aug/Initialize() + new /obj/item/implanter(src) new case_type(src) . = ..() -/obj/item/weapon/storage/box/syndie_kit/imp_aug/taser - case_type = /obj/item/weapon/implantcase/taser +/obj/item/storage/box/syndie_kit/imp_aug/taser + case_type = /obj/item/implantcase/taser -/obj/item/weapon/storage/box/syndie_kit/imp_aug/laser - case_type = /obj/item/weapon/implantcase/laser +/obj/item/storage/box/syndie_kit/imp_aug/laser + case_type = /obj/item/implantcase/laser -/obj/item/weapon/storage/box/syndie_kit/imp_aug/dart - case_type = /obj/item/weapon/implantcase/dart +/obj/item/storage/box/syndie_kit/imp_aug/dart + case_type = /obj/item/implantcase/dart -/obj/item/weapon/storage/box/syndie_kit/imp_aug/toolkit - case_type = /obj/item/weapon/implantcase/toolkit +/obj/item/storage/box/syndie_kit/imp_aug/toolkit + case_type = /obj/item/implantcase/toolkit -/obj/item/weapon/storage/box/syndie_kit/imp_aug/medkit - case_type = /obj/item/weapon/implantcase/medkit +/obj/item/storage/box/syndie_kit/imp_aug/medkit + case_type = /obj/item/implantcase/medkit -/obj/item/weapon/storage/box/syndie_kit/imp_aug/surge - case_type = /obj/item/weapon/implantcase/surge +/obj/item/storage/box/syndie_kit/imp_aug/surge + case_type = /obj/item/implantcase/surge -/obj/item/weapon/storage/box/syndie_kit/imp_aug/analyzer - case_type = /obj/item/weapon/implantcase/analyzer +/obj/item/storage/box/syndie_kit/imp_aug/analyzer + case_type = /obj/item/implantcase/analyzer -/obj/item/weapon/storage/box/syndie_kit/imp_aug/sword - case_type = /obj/item/weapon/implantcase/sword +/obj/item/storage/box/syndie_kit/imp_aug/sword + case_type = /obj/item/implantcase/sword -/obj/item/weapon/storage/box/syndie_kit/imp_aug/sprinter - case_type = /obj/item/weapon/implantcase/sprinter +/obj/item/storage/box/syndie_kit/imp_aug/sprinter + case_type = /obj/item/implantcase/sprinter -/obj/item/weapon/storage/box/syndie_kit/imp_aug/armblade - case_type = /obj/item/weapon/implantcase/armblade +/obj/item/storage/box/syndie_kit/imp_aug/armblade + case_type = /obj/item/implantcase/armblade -/obj/item/weapon/storage/box/syndie_kit/imp_aug/handblade - case_type = /obj/item/weapon/implantcase/handblade +/obj/item/storage/box/syndie_kit/imp_aug/handblade + case_type = /obj/item/implantcase/handblade -/obj/item/weapon/storage/box/syndie_kit/space +/obj/item/storage/box/syndie_kit/space name = "boxed space suit and helmet" starts_with = list( /obj/item/clothing/suit/space/syndicate, /obj/item/clothing/head/helmet/space/syndicate, /obj/item/clothing/mask/gas/syndicate, - /obj/item/weapon/tank/emergency/oxygen/double + /obj/item/tank/emergency/oxygen/double ) -/obj/item/weapon/storage/box/syndie_kit/chameleon +/obj/item/storage/box/syndie_kit/chameleon name = "chameleon kit" desc = "Comes with all the clothes you need to impersonate most people. Acting lessons sold separately." starts_with = list( - /obj/item/weapon/storage/backpack/chameleon/full, - /obj/item/weapon/gun/energy/chameleon + /obj/item/storage/backpack/chameleon/full, + /obj/item/gun/energy/chameleon ) -/obj/item/weapon/storage/box/syndie_kit/clerical +/obj/item/storage/box/syndie_kit/clerical name = "clerical kit" desc = "Comes with all you need to fake paperwork. Assumes you have passed basic writing lessons." starts_with = list( - /obj/item/weapon/stamp/chameleon, - /obj/item/weapon/pen/chameleon, - /obj/item/device/destTagger, - /obj/item/weapon/packageWrap, - /obj/item/weapon/hand_labeler + /obj/item/stamp/chameleon, + /obj/item/pen/chameleon, + /obj/item/destTagger, + /obj/item/packageWrap, + /obj/item/hand_labeler ) -/obj/item/weapon/storage/box/syndie_kit/spy +/obj/item/storage/box/syndie_kit/spy name = "spy kit" desc = "For when you want to conduct voyeurism from afar." starts_with = list( - /obj/item/device/camerabug/spy = 6, - /obj/item/device/bug_monitor/spy + /obj/item/camerabug/spy = 6, + /obj/item/bug_monitor/spy ) -/obj/item/weapon/storage/box/syndie_kit/g9mm +/obj/item/storage/box/syndie_kit/g9mm name = "\improper Smooth operator" desc = "Compact 9mm with silencer kit." starts_with = list( - /obj/item/weapon/gun/projectile/pistol, - /obj/item/weapon/silencer + /obj/item/gun/projectile/pistol, + /obj/item/silencer ) -/obj/item/weapon/storage/box/syndie_kit/toxin +/obj/item/storage/box/syndie_kit/toxin name = "toxin kit" desc = "An apple will not be enough to keep the doctor away after this." starts_with = list( - /obj/item/weapon/reagent_containers/glass/beaker/vial/random/toxin, - /obj/item/weapon/reagent_containers/syringe + /obj/item/reagent_containers/glass/beaker/vial/random/toxin, + /obj/item/reagent_containers/syringe ) -/obj/item/weapon/storage/box/syndie_kit/cigarette +/obj/item/storage/box/syndie_kit/cigarette name = "\improper Tricky smokes" desc = "Comes with the following brands of cigarettes, in this order: 2xFlash, 2xSmoke, 1xMindBreaker, 1xTricordrazine. Avoid mixing them up." -/obj/item/weapon/storage/box/syndie_kit/cigarette/Initialize() +/obj/item/storage/box/syndie_kit/cigarette/Initialize() . = ..() - var/obj/item/weapon/storage/fancy/cigarettes/pack + var/obj/item/storage/fancy/cigarettes/pack - pack = new /obj/item/weapon/storage/fancy/cigarettes(src) + pack = new /obj/item/storage/fancy/cigarettes(src) fill_cigarre_package(pack, list("aluminum" = 5, "potassium" = 5, "sulfur" = 5)) pack.desc += " 'F' has been scribbled on it." - pack = new /obj/item/weapon/storage/fancy/cigarettes(src) + pack = new /obj/item/storage/fancy/cigarettes(src) fill_cigarre_package(pack, list("aluminum" = 5, "potassium" = 5, "sulfur" = 5)) pack.desc += " 'F' has been scribbled on it." - pack = new /obj/item/weapon/storage/fancy/cigarettes(src) + pack = new /obj/item/storage/fancy/cigarettes(src) fill_cigarre_package(pack, list("potassium" = 5, "sugar" = 5, "phosphorus" = 5)) pack.desc += " 'S' has been scribbled on it." - pack = new /obj/item/weapon/storage/fancy/cigarettes(src) + pack = new /obj/item/storage/fancy/cigarettes(src) fill_cigarre_package(pack, list("potassium" = 5, "sugar" = 5, "phosphorus" = 5)) pack.desc += " 'S' has been scribbled on it." - pack = new /obj/item/weapon/storage/fancy/cigarettes(src) + pack = new /obj/item/storage/fancy/cigarettes(src) // Dylovene. Going with 1.5 rather than 1.6666666... fill_cigarre_package(pack, list("potassium" = 1.5, "nitrogen" = 1.5, "silicon" = 1.5)) // Mindbreaker @@ -219,19 +219,19 @@ pack.desc += " 'MB' has been scribbled on it." - pack = new /obj/item/weapon/storage/fancy/cigarettes(src) + pack = new /obj/item/storage/fancy/cigarettes(src) pack.reagents.add_reagent("tricordrazine", 15 * pack.storage_slots) pack.desc += " 'T' has been scribbled on it." - new /obj/item/weapon/flame/lighter/zippo(src) + new /obj/item/flame/lighter/zippo(src) calibrate_size() -/proc/fill_cigarre_package(var/obj/item/weapon/storage/fancy/cigarettes/C, var/list/reagents) +/proc/fill_cigarre_package(var/obj/item/storage/fancy/cigarettes/C, var/list/reagents) for(var/reagent in reagents) C.reagents.add_reagent(reagent, reagents[reagent] * C.storage_slots) -/obj/item/weapon/storage/box/syndie_kit/ewar_voice +/obj/item/storage/box/syndie_kit/ewar_voice name = "Electrowarfare and Voice Synthesiser kit" desc = "Kit for confounding organic and synthetic entities alike." starts_with = list( @@ -239,12 +239,12 @@ /obj/item/rig_module/voice ) -/obj/item/weapon/storage/secure/briefcase/money +/obj/item/storage/secure/briefcase/money name = "suspicious briefcase" desc = "An ominous briefcase that has the unmistakeable smell of old, stale, cigarette smoke, and gives those who look at it a bad feeling." - starts_with = list(/obj/item/weapon/spacecash/c1000 = 10) + starts_with = list(/obj/item/spacecash/c1000 = 10) -/obj/item/weapon/storage/box/syndie_kit/combat_armor +/obj/item/storage/box/syndie_kit/combat_armor name = "combat armor kit" desc = "Contains a full set of combat armor." starts_with = list( @@ -254,56 +254,56 @@ /obj/item/clothing/shoes/leg_guard/combat ) -/obj/item/weapon/storage/box/syndie_kit/demolitions +/obj/item/storage/box/syndie_kit/demolitions starts_with = list( - /obj/item/weapon/syndie/c4explosive, - /obj/item/weapon/tool/screwdriver + /obj/item/syndie/c4explosive, + /obj/item/tool/screwdriver ) -/obj/item/weapon/storage/box/syndie_kit/demolitions_heavy +/obj/item/storage/box/syndie_kit/demolitions_heavy starts_with = list( - /obj/item/weapon/syndie/c4explosive/heavy, - /obj/item/weapon/tool/screwdriver + /obj/item/syndie/c4explosive/heavy, + /obj/item/tool/screwdriver ) -/obj/item/weapon/storage/box/syndie_kit/demolitions_super_heavy +/obj/item/storage/box/syndie_kit/demolitions_super_heavy starts_with = list( - /obj/item/weapon/syndie/c4explosive/heavy/super_heavy, - /obj/item/weapon/tool/screwdriver + /obj/item/syndie/c4explosive/heavy/super_heavy, + /obj/item/tool/screwdriver ) -/obj/item/weapon/storage/box/syndie_kit/voidsuit +/obj/item/storage/box/syndie_kit/voidsuit starts_with = list( /obj/item/clothing/suit/space/void/merc, /obj/item/clothing/head/helmet/space/void/merc, /obj/item/clothing/shoes/magboots, - /obj/item/weapon/tank/jetpack/oxygen + /obj/item/tank/jetpack/oxygen ) -/obj/item/weapon/storage/box/syndie_kit/voidsuit/fire +/obj/item/storage/box/syndie_kit/voidsuit/fire starts_with = list( /obj/item/clothing/suit/space/void/merc/fire, /obj/item/clothing/head/helmet/space/void/merc/fire, /obj/item/clothing/shoes/magboots, - /obj/item/weapon/tank/jetpack/oxygen + /obj/item/tank/jetpack/oxygen ) -/obj/item/weapon/storage/box/syndie_kit/concussion_grenade +/obj/item/storage/box/syndie_kit/concussion_grenade starts_with = list( - /obj/item/weapon/grenade/concussion = 8 + /obj/item/grenade/concussion = 8 ) -/obj/item/weapon/storage/box/syndie_kit/deadliest_game +/obj/item/storage/box/syndie_kit/deadliest_game starts_with = list( - /obj/item/weapon/beartrap/hunting = 4 + /obj/item/beartrap/hunting = 4 ) -/obj/item/weapon/storage/box/syndie_kit/viral +/obj/item/storage/box/syndie_kit/viral starts_with = list( - /obj/item/weapon/virusdish/random = 3 + /obj/item/virusdish/random = 3 ) -/obj/item/weapon/storage/secure/briefcase/rifle +/obj/item/storage/secure/briefcase/rifle name = "secure briefcase" starts_with = list( /obj/item/sniper_rifle_part/barrel, @@ -312,28 +312,28 @@ /obj/item/ammo_casing/a145 = 4 ) -/obj/item/weapon/storage/secure/briefcase/flamer +/obj/item/storage/secure/briefcase/flamer name = "secure briefcase" starts_with = list( - /obj/item/weapon/gun/magnetic/gasthrower, - /obj/item/weapon/cell/super, - /obj/item/weapon/stock_parts/capacitor/adv, - /obj/item/weapon/tank/phoron/pressurized = 2 + /obj/item/gun/magnetic/gasthrower, + /obj/item/cell/super, + /obj/item/stock_parts/capacitor/adv, + /obj/item/tank/phoron/pressurized = 2 ) -/obj/item/weapon/storage/secure/briefcase/fuelrod +/obj/item/storage/secure/briefcase/fuelrod name = "heavy briefcase" desc = "A heavy, locked briefcase." description_fluff = "The container, upon opening, looks to have a few oddly shaped indentations in its packing." description_antag = "This case will likely contain a charged fuel rod gun, and a few fuel rods to go with it. It can only hold the fuel rod gun, fuel rods, batteries, a screwdriver, and stock machine parts." force = 12 //Anti-rad lined i.e. Lead, probably gonna hurt a bit if you get bashed with it. - can_hold = list(/obj/item/weapon/gun/magnetic/fuelrod, /obj/item/weapon/fuel_assembly, /obj/item/weapon/cell, /obj/item/weapon/stock_parts, /obj/item/weapon/tool/screwdriver) + can_hold = list(/obj/item/gun/magnetic/fuelrod, /obj/item/fuel_assembly, /obj/item/cell, /obj/item/stock_parts, /obj/item/tool/screwdriver) starts_with = list( - /obj/item/weapon/gun/magnetic/fuelrod, - /obj/item/weapon/fuel_assembly/deuterium, - /obj/item/weapon/fuel_assembly/deuterium, - /obj/item/weapon/fuel_assembly/tritium, - /obj/item/weapon/fuel_assembly/tritium, - /obj/item/weapon/fuel_assembly/phoron, - /obj/item/weapon/tool/screwdriver + /obj/item/gun/magnetic/fuelrod, + /obj/item/fuel_assembly/deuterium, + /obj/item/fuel_assembly/deuterium, + /obj/item/fuel_assembly/tritium, + /obj/item/fuel_assembly/tritium, + /obj/item/fuel_assembly/phoron, + /obj/item/tool/screwdriver ) diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 84fc4a7c973..f0ddba449da 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/storage/wallet +/obj/item/storage/wallet name = "wallet" desc = "It can hold a few small and personal things." storage_slots = 10 @@ -6,50 +6,50 @@ icon_state = "wallet-orange" w_class = ITEMSIZE_SMALL can_hold = list( - /obj/item/weapon/spacecash, - /obj/item/weapon/card, + /obj/item/spacecash, + /obj/item/card, /obj/item/clothing/mask/smokable/cigarette/, - /obj/item/device/flashlight/pen, - /obj/item/device/tape, - /obj/item/weapon/cartridge, - /obj/item/device/encryptionkey, + /obj/item/flashlight/pen, + /obj/item/rectape, + /obj/item/cartridge, + /obj/item/encryptionkey, /obj/item/seeds, /obj/item/stack/medical, - /obj/item/weapon/coin, - /obj/item/weapon/dice, - /obj/item/weapon/disk, - /obj/item/weapon/implanter, - /obj/item/weapon/flame/lighter, - /obj/item/weapon/flame/match, - /obj/item/weapon/forensics, - /obj/item/weapon/glass_extra, - /obj/item/weapon/haircomb, - /obj/item/weapon/hand, - /obj/item/weapon/key, - /obj/item/weapon/lipstick, - /obj/item/weapon/paper, - /obj/item/weapon/pen, - /obj/item/weapon/photo, - /obj/item/weapon/reagent_containers/dropper, - /obj/item/weapon/sample, - /obj/item/weapon/tool/screwdriver, - /obj/item/weapon/stamp, + /obj/item/coin, + /obj/item/dice, + /obj/item/disk, + /obj/item/implanter, + /obj/item/flame/lighter, + /obj/item/flame/match, + /obj/item/forensics, + /obj/item/glass_extra, + /obj/item/haircomb, + /obj/item/hand, + /obj/item/key, + /obj/item/lipstick, + /obj/item/paper, + /obj/item/pen, + /obj/item/photo, + /obj/item/reagent_containers/dropper, + /obj/item/sample, + /obj/item/tool/screwdriver, + /obj/item/stamp, /obj/item/clothing/accessory/permit, /obj/item/clothing/accessory/badge, - /obj/item/weapon/makeover, + /obj/item/makeover, /obj/item/pizzavoucher, - /obj/item/weapon/card_fluff + /obj/item/card_fluff ) slot_flags = SLOT_ID - var/obj/item/weapon/card/id/front_id = null + var/obj/item/card/id/front_id = null drop_sound = 'sound/items/drop/leather.ogg' pickup_sound = 'sound/items/pickup/leather.ogg' var/original_name // Due to loadout customizations and such -/obj/item/weapon/storage/wallet/remove_from_storage(obj/item/W as obj, atom/new_location) +/obj/item/storage/wallet/remove_from_storage(obj/item/W as obj, atom/new_location) . = ..(W, new_location) if(.) if(W == front_id) @@ -57,17 +57,17 @@ name = original_name || initial(name) update_icon() -/obj/item/weapon/storage/wallet/handle_item_insertion(obj/item/W as obj, prevent_warning = 0) +/obj/item/storage/wallet/handle_item_insertion(obj/item/W as obj, prevent_warning = 0) . = ..(W, prevent_warning) if(.) - if(!front_id && istype(W, /obj/item/weapon/card/id)) + if(!front_id && istype(W, /obj/item/card/id)) front_id = W if(!original_name) original_name = name name = "[original_name] ([front_id])" update_icon() -/obj/item/weapon/storage/wallet/update_icon() +/obj/item/storage/wallet/update_icon() cut_overlays() if(front_id) var/tiny_state = "id-generic" @@ -77,20 +77,20 @@ tiny_image.appearance_flags = RESET_COLOR add_overlay(tiny_image) -/obj/item/weapon/storage/wallet/GetID() +/obj/item/storage/wallet/GetID() return front_id -/obj/item/weapon/storage/wallet/GetAccess() +/obj/item/storage/wallet/GetAccess() var/obj/item/I = GetID() if(I) return I.GetAccess() else return ..() -/obj/item/weapon/storage/wallet/random/New() +/obj/item/storage/wallet/random/New() ..() var/amount = rand(50, 100) + rand(50, 100) // Triangular distribution from 100 to 200 - var/obj/item/weapon/spacecash/SC = null + var/obj/item/spacecash/SC = null SC = new(src) for(var/i in list(100, 50, 20, 10, 5, 1)) if(amount < i) @@ -100,18 +100,18 @@ SC.adjust_worth(i, 0) SC.update_icon() -/obj/item/weapon/storage/wallet/poly +/obj/item/storage/wallet/poly name = "polychromic wallet" desc = "You can recolor it! Fancy! The future is NOW!" icon_state = "wallet-white" -/obj/item/weapon/storage/wallet/poly/New() +/obj/item/storage/wallet/poly/New() ..() - verbs |= /obj/item/weapon/storage/wallet/poly/proc/change_color + verbs |= /obj/item/storage/wallet/poly/proc/change_color color = get_random_colour() update_icon() -/obj/item/weapon/storage/wallet/poly/proc/change_color() +/obj/item/storage/wallet/poly/proc/change_color() set name = "Change Wallet Color" set category = "Object" set desc = "Change the color of the wallet." @@ -125,7 +125,7 @@ if(new_color && (new_color != color)) color = new_color -/obj/item/weapon/storage/wallet/poly/emp_act() +/obj/item/storage/wallet/poly/emp_act() var/original_state = icon_state icon_state = "wallet-emp" update_icon() @@ -135,7 +135,7 @@ icon_state = original_state update_icon() -/obj/item/weapon/storage/wallet/womens +/obj/item/storage/wallet/womens name = "women's wallet" desc = "A stylish wallet typically used by women." icon_state = "girl_wallet" @@ -143,49 +143,49 @@ //Casino Wallet -/obj/item/weapon/storage/wallet/casino +/obj/item/storage/wallet/casino name = "casino wallet" desc = "A fancy casino wallet with flashy lights, oooh~" icon = 'icons/obj/casino.dmi' icon_state = "casinowallet_black" can_hold = list( - /obj/item/weapon/spacecash, - /obj/item/weapon/card, + /obj/item/spacecash, + /obj/item/card, /obj/item/clothing/mask/smokable/cigarette/, - /obj/item/device/flashlight/pen, - /obj/item/device/tape, - /obj/item/weapon/cartridge, - /obj/item/device/encryptionkey, + /obj/item/flashlight/pen, + /obj/item/rectape, + /obj/item/cartridge, + /obj/item/encryptionkey, /obj/item/seeds, /obj/item/stack/medical, - /obj/item/weapon/coin, - /obj/item/weapon/dice, - /obj/item/weapon/disk, - /obj/item/weapon/implanter, - /obj/item/weapon/flame/lighter, - /obj/item/weapon/flame/match, - /obj/item/weapon/forensics, - /obj/item/weapon/glass_extra, - /obj/item/weapon/haircomb, - /obj/item/weapon/hand, - /obj/item/weapon/key, - /obj/item/weapon/lipstick, - /obj/item/weapon/paper, - /obj/item/weapon/pen, - /obj/item/weapon/photo, - /obj/item/weapon/reagent_containers/dropper, - /obj/item/weapon/sample, - /obj/item/weapon/tool/screwdriver, - /obj/item/weapon/stamp, + /obj/item/coin, + /obj/item/dice, + /obj/item/disk, + /obj/item/implanter, + /obj/item/flame/lighter, + /obj/item/flame/match, + /obj/item/forensics, + /obj/item/glass_extra, + /obj/item/haircomb, + /obj/item/hand, + /obj/item/key, + /obj/item/lipstick, + /obj/item/paper, + /obj/item/pen, + /obj/item/photo, + /obj/item/reagent_containers/dropper, + /obj/item/sample, + /obj/item/tool/screwdriver, + /obj/item/stamp, /obj/item/clothing/accessory/permit, /obj/item/clothing/accessory/badge, - /obj/item/weapon/makeover, - /obj/item/weapon/spacecasinocash, - /obj/item/weapon/casino_platinum_chip, - /obj/item/weapon/deck + /obj/item/makeover, + /obj/item/spacecasinocash, + /obj/item/casino_platinum_chip, + /obj/item/deck ) -/obj/item/weapon/storage/wallet/casino/verb/toggle_design() +/obj/item/storage/wallet/casino/verb/toggle_design() set category = "Object" set name = "Toggle design" set src in usr diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 8feb3b2c92b..e6556c464d2 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -1,5 +1,5 @@ //replaces our stun baton code with /tg/station's code -/obj/item/weapon/melee/baton +/obj/item/melee/baton name = "stunbaton" desc = "A stun baton for incapacitating people with." icon_state = "stunbaton" @@ -19,21 +19,21 @@ var/stunforce = 0 var/agonyforce = 60 var/status = 0 //whether the thing is on or not - var/obj/item/weapon/cell/bcell = null + var/obj/item/cell/bcell = null var/hitcost = 240 var/use_external_power = FALSE //only used to determine if it's a cyborg baton var/grip_safety = TRUE var/taped_safety = FALSE -/obj/item/weapon/melee/baton/New() +/obj/item/melee/baton/New() ..() update_icon() return -/obj/item/weapon/melee/baton/get_cell() +/obj/item/melee/baton/get_cell() return bcell -/obj/item/weapon/melee/baton/MouseDrop(obj/over_object as obj) +/obj/item/melee/baton/MouseDrop(obj/over_object as obj) if(!canremove) return @@ -65,13 +65,13 @@ usr.put_in_l_hand(src) src.add_fingerprint(usr) -/obj/item/weapon/melee/baton/loaded/New() //this one starts with a cell pre-installed. +/obj/item/melee/baton/loaded/New() //this one starts with a cell pre-installed. ..() - bcell = new/obj/item/weapon/cell/device/weapon(src) + bcell = new/obj/item/cell/device/weapon(src) update_icon() return -/obj/item/weapon/melee/baton/proc/deductcharge() +/obj/item/melee/baton/proc/deductcharge() if(status == 1) //Only deducts charge when it's on if(bcell) if(bcell.checked_use(hitcost)) @@ -80,13 +80,13 @@ return 0 return null -/obj/item/weapon/melee/baton/proc/powercheck() +/obj/item/melee/baton/proc/powercheck() if(bcell) if(bcell.charge < hitcost) status = 0 update_icon() -/obj/item/weapon/melee/baton/update_icon() +/obj/item/melee/baton/update_icon() if(status) icon_state = "[initial(name)]_active" else if(!bcell) @@ -99,14 +99,14 @@ else set_light(0) -/obj/item/weapon/melee/baton/dropped() +/obj/item/melee/baton/dropped() ..() if(status && grip_safety && !taped_safety) status = 0 visible_message("\The [src]'s grip safety engages!") update_icon() -/obj/item/weapon/melee/baton/examine(mob/user) +/obj/item/melee/baton/examine(mob/user) . = ..() if(Adjacent(user)) @@ -117,11 +117,11 @@ if(!bcell) . += "The baton does not have a power source installed." -/obj/item/weapon/melee/baton/attackby(obj/item/weapon/W, mob/user) +/obj/item/melee/baton/attackby(obj/item/W, mob/user) if(use_external_power) return - if(istype(W, /obj/item/weapon/cell)) - if(istype(W, /obj/item/weapon/cell/device)) + if(istype(W, /obj/item/cell)) + if(istype(W, /obj/item/cell/device)) if(!bcell) user.drop_item() W.loc = src @@ -132,19 +132,19 @@ to_chat(user, "[src] already has a cell.") else to_chat(user, "This cell is not fitted for [src].") - if(istype(W, /obj/item/weapon/tape_roll) || istype(W, /obj/item/taperoll)) + if(istype(W, /obj/item/tape_roll) || istype(W, /obj/item/taperoll)) if(grip_safety && !taped_safety) //no point letting people wrap tape around the grips of batons without a safety to_chat(user, "You firmly wrap tape around the baton's grip, disabling the safety system.") playsound(src, 'sound/effects/tape.ogg',25) taped_safety = TRUE else if(grip_safety && taped_safety) to_chat(user, "The grip safety has already been taped down.") - if(istype(W, /obj/item/weapon/tool/screwdriver)) + if(istype(W, /obj/item/tool/screwdriver)) if(taped_safety) to_chat(user, "You painstakingly scrape away the tape over the grip safety.") taped_safety = FALSE -/obj/item/weapon/melee/baton/attack_hand(mob/user as mob) +/obj/item/melee/baton/attack_hand(mob/user as mob) if(user.get_inactive_hand() == src) if(bcell) bcell.update_icon() @@ -158,7 +158,7 @@ else return ..() -/obj/item/weapon/melee/baton/attack_self(mob/user) +/obj/item/melee/baton/attack_self(mob/user) if(use_external_power) //try to find our power cell var/mob/living/silicon/robot/R = loc @@ -177,7 +177,7 @@ to_chat(user, "[src] is out of charge.") add_fingerprint(user) -/obj/item/weapon/melee/baton/attack(mob/M, mob/user) +/obj/item/melee/baton/attack(mob/M, mob/user) if(status && (CLUMSY in user.mutations) && prob(50)) to_chat(user, "You accidentally hit yourself with the [src]!") user.Weaken(30) @@ -186,7 +186,7 @@ deductcharge(hitcost) return ..() -/obj/item/weapon/melee/baton/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) +/obj/item/melee/baton/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) if(isrobot(target)) return ..() @@ -224,18 +224,18 @@ H.forcesay(hit_appends) powercheck() -/obj/item/weapon/melee/baton/emp_act(severity) +/obj/item/melee/baton/emp_act(severity) if(bcell) bcell.emp_act(severity) //let's not duplicate code everywhere if we don't have to please. ..() //secborg stun baton module -/obj/item/weapon/melee/baton/robot +/obj/item/melee/baton/robot hitcost = 500 use_external_power = TRUE //Makeshift stun baton. Replacement for stun gloves. -/obj/item/weapon/melee/baton/cattleprod +/obj/item/melee/baton/cattleprod name = "stunprod" desc = "An improvised stun baton." icon_state = "stunprod_nocell" @@ -249,9 +249,9 @@ slot_flags = null grip_safety = FALSE -/obj/item/weapon/melee/baton/cattleprod/attackby(obj/item/weapon/W, mob/user) - if(istype(W, /obj/item/weapon/cell)) - if(!istype(W, /obj/item/weapon/cell/device)) +/obj/item/melee/baton/cattleprod/attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/cell)) + if(!istype(W, /obj/item/cell/device)) if(!bcell) user.drop_item() W.loc = src @@ -263,7 +263,7 @@ else to_chat(user, "This cell is not fitted for [src].") -/obj/item/weapon/melee/baton/get_description_interaction() +/obj/item/melee/baton/get_description_interaction() var/list/results = list() if(bcell) @@ -276,7 +276,7 @@ return results // Rare version of a baton that causes lesser lifeforms to really hate the user and attack them. -/obj/item/weapon/melee/baton/shocker +/obj/item/melee/baton/shocker name = "shocker" desc = "A device that appears to arc electricity into a target to incapacitate or otherwise hurt them, similar to a stun baton. It looks inefficent." description_info = "Hitting a lesser lifeform with this while it is on will compel them to attack you above other nearby targets. Otherwise \ @@ -287,11 +287,11 @@ agonyforce = 25 // Less efficent than a regular baton. attack_verb = list("poked") -/obj/item/weapon/melee/baton/shocker/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) +/obj/item/melee/baton/shocker/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) ..(target, user, hit_zone) if(status && target.has_AI()) target.taunt(user) // Borg version, for the lost module. -/obj/item/weapon/melee/baton/shocker/robot +/obj/item/melee/baton/shocker/robot use_external_power = TRUE \ No newline at end of file diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index de3ae21488a..ffe0779a68b 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -13,7 +13,7 @@ * Alien Tools */ -/obj/item/weapon/surgical +/obj/item/surgical name = "Surgical tool" desc = "This shouldn't be here, ahelp it." icon = 'icons/obj/surgery_vr.dmi' @@ -22,7 +22,7 @@ pickup_sound = 'sound/items/pickup/weldingtool.ogg' var/helpforce = 0 //For help intent things -/obj/item/weapon/surgical/attack(mob/M, mob/user) +/obj/item/surgical/attack(mob/M, mob/user) if(user.a_intent == I_HELP) //A tad messy, but this should stop people from smacking their patients in surgery return 0 ..() @@ -30,7 +30,7 @@ /* * Bio-Regenerator */ -/obj/item/weapon/surgical/bioregen +/obj/item/surgical/bioregen name="bioregenerator" desc="A special tool used in surgeries which can pull toxins from and restore oxygen to organic tissue as well as recreate missing biological structures to allow otherwise irreperable flesh to be mended." icon_state="bioregen" @@ -40,7 +40,7 @@ * Retractor */ -/obj/item/weapon/surgical/retractor +/obj/item/surgical/retractor name = "retractor" desc = "Retracts stuff." icon_state = "retractor" @@ -51,7 +51,7 @@ /* * Hemostat */ -/obj/item/weapon/surgical/hemostat +/obj/item/surgical/hemostat name = "hemostat" desc = "You think you have seen this before." icon_state = "hemostat" @@ -63,7 +63,7 @@ /* * Cautery */ -/obj/item/weapon/surgical/cautery +/obj/item/surgical/cautery name = "cautery" desc = "This stops bleeding." icon_state = "cautery" @@ -75,7 +75,7 @@ /* * Surgical Drill */ -/obj/item/weapon/surgical/surgicaldrill +/obj/item/surgical/surgicaldrill name = "surgical drill" desc = "You can drill using this item. You dig?" icon_state = "drill" @@ -90,7 +90,7 @@ /* * Scalpel */ -/obj/item/weapon/surgical/scalpel +/obj/item/surgical/scalpel name = "scalpel" desc = "Cut, cut, and once more cut." icon_state = "scalpel" @@ -110,33 +110,33 @@ /* * Researchable Scalpels */ -/obj/item/weapon/surgical/scalpel/laser1 +/obj/item/surgical/scalpel/laser1 name = "laser scalpel" desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks basic and could be improved." icon_state = "scalpel_laser1" damtype = "fire" -/obj/item/weapon/surgical/scalpel/laser2 +/obj/item/surgical/scalpel/laser2 name = "laser scalpel" desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks somewhat advanced." icon_state = "scalpel_laser2" damtype = "fire" force = 12.0 -/obj/item/weapon/surgical/scalpel/laser3 +/obj/item/surgical/scalpel/laser3 name = "laser scalpel" desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks to be the pinnacle of precision energy cutlery!" icon_state = "scalpel_laser3" damtype = "fire" force = 15.0 -/obj/item/weapon/surgical/scalpel/manager +/obj/item/surgical/scalpel/manager name = "incision management system" desc = "A true extension of the surgeon's body, this marvel instantly and completely prepares an incision allowing for the immediate commencement of therapeutic steps." icon_state = "scalpel_manager" force = 7.5 -/obj/item/weapon/surgical/scalpel/ripper +/obj/item/surgical/scalpel/ripper name = "jagged scalpel" desc = "A horrifying bladed tool with a large metal spike in its center. The tool is used for rapidly removing organs or medical malpractice." icon_state = "organ_ripper" @@ -148,7 +148,7 @@ /* * Circular Saws */ -/obj/item/weapon/surgical/circular_saw +/obj/item/surgical/circular_saw name = "circular saw" desc = "For heavy duty cutting." icon_state = "saw" @@ -165,7 +165,7 @@ sharp = TRUE edge = TRUE -/obj/item/weapon/surgical/circular_saw/manager +/obj/item/surgical/circular_saw/manager name = "energetic bone diverter" desc = "For heavy duty cutting (and sealing), with science!" icon_state = "adv_saw" @@ -181,7 +181,7 @@ /* * Misc Tools */ -/obj/item/weapon/surgical/bonegel +/obj/item/surgical/bonegel name = "bone gel" desc = "For fixing bones." icon_state = "bone-gel" @@ -189,7 +189,7 @@ throwforce = 1.0 drop_sound = 'sound/items/drop/bottle.ogg' -/obj/item/weapon/surgical/FixOVein +/obj/item/surgical/FixOVein name = "FixOVein" desc = "Like bone gel. For veins." icon_state = "fixovein" @@ -199,7 +199,7 @@ var/usage_amount = 10 drop_sound = 'sound/items/drop/bottle.ogg' -/obj/item/weapon/surgical/bonesetter +/obj/item/surgical/bonesetter name = "bone setter" desc = "Put them in their place." icon_state = "bone_setter" @@ -210,7 +210,7 @@ attack_verb = list("attacked", "hit", "bludgeoned") drop_sound = 'sound/items/drop/scrap.ogg' -/obj/item/weapon/surgical/bone_clamp +/obj/item/surgical/bone_clamp name = "bone clamp" desc = "The best way to get a bone fixed fast." icon_state = "bone_clamp" @@ -223,75 +223,75 @@ /* * Cyborg Tools */ -/obj/item/weapon/surgical/retractor/cyborg +/obj/item/surgical/retractor/cyborg icon_state = "cyborg_retractor" toolspeed = 0.5 -/obj/item/weapon/surgical/hemostat/cyborg +/obj/item/surgical/hemostat/cyborg icon_state = "cyborg_hemostat" toolspeed = 0.5 -/obj/item/weapon/surgical/cautery/cyborg +/obj/item/surgical/cautery/cyborg icon_state = "cyborg_cautery" toolspeed = 0.5 -/obj/item/weapon/surgical/surgicaldrill/cyborg +/obj/item/surgical/surgicaldrill/cyborg icon_state = "cyborg_drill" toolspeed = 0.5 -/obj/item/weapon/surgical/scalpel/cyborg +/obj/item/surgical/scalpel/cyborg icon_state = "cyborg_scalpel" toolspeed = 0.5 -/obj/item/weapon/surgical/circular_saw/cyborg +/obj/item/surgical/circular_saw/cyborg icon_state = "cyborg_saw" toolspeed = 0.5 -/obj/item/weapon/surgical/bonegel/cyborg +/obj/item/surgical/bonegel/cyborg toolspeed = 0.5 -/obj/item/weapon/surgical/FixOVein/cyborg +/obj/item/surgical/FixOVein/cyborg toolspeed = 0.5 -/obj/item/weapon/surgical/bonesetter/cyborg +/obj/item/surgical/bonesetter/cyborg icon_state = "cyborg_setter" toolspeed = 0.5 -/obj/item/weapon/surgical/bioregen/cyborg //VoreStation edit: let the borgs S U C C +/obj/item/surgical/bioregen/cyborg //VoreStation edit: let the borgs S U C C icon_state = "cyborg_bioregen" toolspeed = 0.5 /* * Alien Tools */ -/obj/item/weapon/surgical/retractor/alien +/obj/item/surgical/retractor/alien icon = 'icons/obj/abductor.dmi' toolspeed = 0.25 -/obj/item/weapon/surgical/hemostat/alien +/obj/item/surgical/hemostat/alien icon = 'icons/obj/abductor.dmi' toolspeed = 0.25 -/obj/item/weapon/surgical/cautery/alien +/obj/item/surgical/cautery/alien icon = 'icons/obj/abductor.dmi' toolspeed = 0.25 -/obj/item/weapon/surgical/surgicaldrill/alien +/obj/item/surgical/surgicaldrill/alien icon = 'icons/obj/abductor.dmi' toolspeed = 0.25 -/obj/item/weapon/surgical/scalpel/alien +/obj/item/surgical/scalpel/alien icon = 'icons/obj/abductor.dmi' toolspeed = 0.25 -/obj/item/weapon/surgical/circular_saw/alien +/obj/item/surgical/circular_saw/alien icon = 'icons/obj/abductor.dmi' toolspeed = 0.25 -/obj/item/weapon/surgical/FixOVein/alien +/obj/item/surgical/FixOVein/alien icon = 'icons/obj/abductor.dmi' toolspeed = 0.25 -/obj/item/weapon/surgical/bone_clamp/alien +/obj/item/surgical/bone_clamp/alien icon = 'icons/obj/abductor.dmi' toolspeed = 0.75 diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index 40b0ef44b41..bf2332149c3 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -9,7 +9,7 @@ * Classic Baton */ -/obj/item/weapon/melee +/obj/item/melee name = "weapon" desc = "Murder device." icon = 'icons/obj/weapons.dmi' @@ -18,7 +18,7 @@ force = 10 drop_sound = 'sound/items/drop/metalweapon.ogg' -/obj/item/weapon/melee/classic_baton +/obj/item/melee/classic_baton name = "police baton" desc = "A wooden truncheon for beating criminal scum." icon = 'icons/obj/weapons.dmi' @@ -29,7 +29,7 @@ drop_sound = 'sound/items/drop/crowbar.ogg' pickup_sound = 'sound/items/pickup/crowbar.ogg' -/obj/item/weapon/melee/classic_baton/attack(mob/M as mob, mob/living/user as mob) +/obj/item/melee/classic_baton/attack(mob/M as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) to_chat(user, "You club yourself over the head.") user.Weaken(3 * force) @@ -42,7 +42,7 @@ return ..() //Telescopic baton -/obj/item/weapon/melee/telebaton +/obj/item/melee/telebaton name = "telescopic baton" desc = "A compact yet rebalanced personal defense weapon. Can be concealed when folded." icon = 'icons/obj/weapons.dmi' @@ -55,7 +55,7 @@ pickup_sound = 'sound/items/pickup/crowbar.ogg' var/on = 0 -/obj/item/weapon/melee/telebaton/attack_self(mob/user as mob) +/obj/item/melee/telebaton/attack_self(mob/user as mob) on = !on if(on) user.visible_message("With a flick of their wrist, [user] extends their telescopic baton.",\ @@ -96,7 +96,7 @@ return -/obj/item/weapon/melee/telebaton/attack(mob/target as mob, mob/living/user as mob) +/obj/item/melee/telebaton/attack(mob/target as mob, mob/living/user as mob) if(on) if ((CLUMSY in user.mutations) && prob(50)) to_chat(user, "You club yourself over the head.") diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm index a5cb000f715..9e7eb8a8ef2 100644 --- a/code/game/objects/items/weapons/syndie.dm +++ b/code/game/objects/items/weapons/syndie.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/syndie +/obj/item/syndie icon = 'icons/obj/syndieweapons.dmi' /*C-4 explosive charge and etc, replaces the old syndie transfer valve bomb.*/ @@ -6,7 +6,7 @@ /*The explosive charge itself. Flashes for five seconds before exploding.*/ -/obj/item/weapon/syndie/c4explosive +/obj/item/syndie/c4explosive icon_state = "c-4small_0" item_state = "radio" name = "normal-sized package" @@ -19,7 +19,7 @@ var/flash_range = 5 var/size = "small" /*Used for the icon, this one will make c-4small_0 for the off state.*/ -/obj/item/weapon/syndie/c4explosive/heavy +/obj/item/syndie/c4explosive/heavy icon_state = "c-4large_0" item_state = "radio" desc = "A mysterious package, it's quite heavy." @@ -29,7 +29,7 @@ flash_range = 7 size = "large" -/obj/item/weapon/syndie/c4explosive/heavy/super_heavy +/obj/item/syndie/c4explosive/heavy/super_heavy name = "large-sized package" desc = "A mysterious package, it's quite exceptionally heavy." devastate = 2 @@ -37,16 +37,16 @@ light_impact = 7 flash_range = 7 -/obj/item/weapon/syndie/c4explosive/New() +/obj/item/syndie/c4explosive/New() var/K = rand(1,2000) K = md5(num2text(K)+name) K = copytext(K,1,7) desc += "\n You see [K] engraved on \the [src]." - var/obj/item/weapon/flame/lighter/zippo/c4detonator/detonator = new(src.loc) + var/obj/item/flame/lighter/zippo/c4detonator/detonator = new(src.loc) detonator.desc += " You see [K] engraved on the lighter." detonator.bomb = src -/obj/item/weapon/syndie/c4explosive/proc/detonate() +/obj/item/syndie/c4explosive/proc/detonate() icon_state = "c-4[size]_1" playsound(src, 'sound/weapons/armbomb.ogg', 75, 1) for(var/mob/O in hearers(src, null)) @@ -63,9 +63,9 @@ T.dismantle_wall(1) qdel(src) -/obj/item/weapon/syndie/c4explosive/attackby(obj/item/weapon/W, mob/user) - if(istype(W, /obj/item/weapon/flame/lighter/zippo/c4detonator)) - var/obj/item/weapon/flame/lighter/zippo/c4detonator/D = W +/obj/item/syndie/c4explosive/attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/flame/lighter/zippo/c4detonator)) + var/obj/item/flame/lighter/zippo/c4detonator/D = W D.bomb = src return ..() @@ -73,11 +73,11 @@ /*Detonator, disguised as a lighter*/ /*Click it when closed to open, when open to bring up a prompt asking you if you want to close it or press the button.*/ -/obj/item/weapon/flame/lighter/zippo/c4detonator +/obj/item/flame/lighter/zippo/c4detonator var/detonator_mode = 0 - var/obj/item/weapon/syndie/c4explosive/bomb + var/obj/item/syndie/c4explosive/bomb -/obj/item/weapon/flame/lighter/zippo/c4detonator/attack_self(mob/user as mob) +/obj/item/flame/lighter/zippo/c4detonator/attack_self(mob/user as mob) if(!detonator_mode) ..() @@ -105,7 +105,7 @@ user.visible_message("You hear a quiet click, as \the [user] shuts off \the [src] without even looking at what they're doing.") -/obj/item/weapon/flame/lighter/zippo/c4detonator/attackby(obj/item/weapon/W, mob/user as mob) +/obj/item/flame/lighter/zippo/c4detonator/attackby(obj/item/W, mob/user as mob) if(W.has_tool_quality(TOOL_SCREWDRIVER)) detonator_mode = !detonator_mode playsound(src, W.usesound, 50, 1) diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 10724e2e3da..3946c7e3b24 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -1,6 +1,6 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 -/obj/item/weapon/tank/jetpack +/obj/item/tank/jetpack name = "jetpack (empty)" desc = "A tank of compressed gas for use as propulsion in zero-gravity areas. Use with caution." icon = 'icons/obj/tank_vr.dmi' //VOREStation Edit @@ -19,28 +19,28 @@ var/volume_rate = 500 //Needed for borg jetpack transfer action_button_name = "Toggle Jetpack" -/obj/item/weapon/tank/jetpack/New() +/obj/item/tank/jetpack/New() ..() ion_trail = new /datum/effect/effect/system/ion_trail_follow() ion_trail.set_up(src) -/obj/item/weapon/tank/jetpack/Destroy() +/obj/item/tank/jetpack/Destroy() QDEL_NULL(ion_trail) return ..() -/obj/item/weapon/tank/jetpack/examine(mob/user) +/obj/item/tank/jetpack/examine(mob/user) . = ..() if(air_contents.total_moles < 5) . += "The meter on \the [src] indicates you are almost out of gas!" playsound(src, 'sound/effects/alert.ogg', 50, 1) -/obj/item/weapon/tank/jetpack/verb/toggle_rockets() +/obj/item/tank/jetpack/verb/toggle_rockets() set name = "Toggle Jetpack Stabilization" set category = "Object" stabilization_on = !( stabilization_on ) to_chat(usr, "You toggle the stabilization [stabilization_on? "on":"off"].") -/obj/item/weapon/tank/jetpack/verb/toggle() +/obj/item/tank/jetpack/verb/toggle() set name = "Toggle Jetpack" set category = "Object" @@ -59,10 +59,10 @@ to_chat(usr, "You toggle the thrusters [on? "on":"off"].") -/obj/item/weapon/tank/jetpack/proc/get_gas_supply() +/obj/item/tank/jetpack/proc/get_gas_supply() return air_contents -/obj/item/weapon/tank/jetpack/proc/can_thrust(num) +/obj/item/tank/jetpack/proc/can_thrust(num) if(!on) return 0 @@ -73,7 +73,7 @@ return 1 -/obj/item/weapon/tank/jetpack/proc/do_thrust(num, mob/living/user) +/obj/item/tank/jetpack/proc/do_thrust(num, mob/living/user) if(!can_thrust(num)) return 0 @@ -81,57 +81,57 @@ fuel.remove(num) return 1 -/obj/item/weapon/tank/jetpack/ui_action_click() +/obj/item/tank/jetpack/ui_action_click() toggle() -/obj/item/weapon/tank/jetpack/void +/obj/item/tank/jetpack/void name = "void jetpack (oxygen)" desc = "It works well in a void." icon_state = "jetpack-void" item_state_slots = list(slot_r_hand_str = "jetpack-void", slot_l_hand_str = "jetpack-void") -/obj/item/weapon/tank/jetpack/void/Initialize() +/obj/item/tank/jetpack/void/Initialize() . = ..() air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) -/obj/item/weapon/tank/jetpack/oxygen +/obj/item/tank/jetpack/oxygen name = "jetpack (oxygen)" desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas. Use with caution." icon_state = "jetpack" item_state_slots = list(slot_r_hand_str = "jetpack", slot_l_hand_str = "jetpack") -/obj/item/weapon/tank/jetpack/oxygen/Initialize() +/obj/item/tank/jetpack/oxygen/Initialize() . = ..() air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) -/obj/item/weapon/tank/jetpack/breaker +/obj/item/tank/jetpack/breaker name = "CSC industrial jetpack" desc = "A JetFast EVA thruster pack. A warning label clearly states \'WARNING: CONTAINS VOLATILE REACTION MASS TOXIC TO MOST LIFEFORMS. NOT TO BE USED WITH CLOSED CYCLE BREATHING SYSTEMS.\'" icon_state = "jetpack-breaker" item_state_slots = list(slot_r_hand_str = "jetpack", slot_l_hand_str = "jetpack") -/obj/item/weapon/tank/jetpack/breaker/Initialize() +/obj/item/tank/jetpack/breaker/Initialize() . = ..() air_contents.adjust_gas("volatile_fuel", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) -/obj/item/weapon/tank/jetpack/carbondioxide +/obj/item/tank/jetpack/carbondioxide name = "jetpack (carbon dioxide)" desc = "A tank of compressed carbon dioxide for use as propulsion in zero-gravity areas. Painted black to indicate that it should not be used as a source for internals." distribute_pressure = 0 icon_state = "jetpack-black" item_state_slots = list(slot_r_hand_str = "jetpack-black", slot_l_hand_str = "jetpack-black") -/obj/item/weapon/tank/jetpack/carbondioxide/Initialize() +/obj/item/tank/jetpack/carbondioxide/Initialize() . = ..() air_contents.adjust_gas("carbon_dioxide", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) -/obj/item/weapon/tank/jetpack/rig +/obj/item/tank/jetpack/rig name = "jetpack" - var/obj/item/weapon/rig/holder + var/obj/item/rig/holder -/obj/item/weapon/tank/jetpack/rig/examine() +/obj/item/tank/jetpack/rig/examine() . = ..() . += "It's a jetpack. If you can see this, report it on the bug tracker." -/obj/item/weapon/tank/jetpack/rig/get_gas_supply() +/obj/item/tank/jetpack/rig/get_gas_supply() return holder?.air_supply?.air_contents diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index e34ad4810b7..caa31f0d855 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -10,38 +10,38 @@ /* * Oxygen */ -/obj/item/weapon/tank/oxygen +/obj/item/tank/oxygen name = "oxygen tank" desc = "A tank of oxygen." icon_state = "oxygen" distribute_pressure = ONE_ATMOSPHERE*O2STANDARD -/obj/item/weapon/tank/oxygen/Initialize() +/obj/item/tank/oxygen/Initialize() . = ..() air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) -/obj/item/weapon/tank/oxygen/examine(mob/user) +/obj/item/tank/oxygen/examine(mob/user) . = ..() if(loc == user && (air_contents.gas["oxygen"] < 10)) . += "The meter on \the [src] indicates you are almost out of oxygen!" -/obj/item/weapon/tank/oxygen/yellow +/obj/item/tank/oxygen/yellow desc = "A tank of oxygen, this one is yellow." icon_state = "oxygen_f" -/obj/item/weapon/tank/oxygen/red +/obj/item/tank/oxygen/red desc = "A tank of oxygen, this one is red." icon_state = "oxygen_fr" /* * Anesthetic */ -/obj/item/weapon/tank/anesthetic +/obj/item/tank/anesthetic name = "anesthetic tank" desc = "A tank with an N2O/O2 gas mix." icon_state = "anesthetic" -/obj/item/weapon/tank/anesthetic/Initialize() +/obj/item/tank/anesthetic/Initialize() . = ..() air_contents.gas["oxygen"] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD @@ -51,40 +51,40 @@ /* * Air */ -/obj/item/weapon/tank/air +/obj/item/tank/air name = "air tank" desc = "Mixed anyone?" icon_state = "oxygen" -/obj/item/weapon/tank/air/examine(mob/user) +/obj/item/tank/air/examine(mob/user) . = ..() if(loc == user && (air_contents.gas["oxygen"] < 1)) . += "The meter on \the [src] indicates you are almost out of air!" user << sound('sound/effects/alert.ogg') -/obj/item/weapon/tank/air/Initialize() +/obj/item/tank/air/Initialize() . = ..() src.air_contents.adjust_multi("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD, "nitrogen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD) /* * Phoron */ -/obj/item/weapon/tank/phoron +/obj/item/tank/phoron name = "phoron tank" desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." icon_state = "phoron" gauge_icon = null slot_flags = null //they have no straps! -/obj/item/weapon/tank/phoron/Initialize() +/obj/item/tank/phoron/Initialize() . = ..() src.air_contents.adjust_gas("phoron", (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C)) -/obj/item/weapon/tank/phoron/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/tank/phoron/attackby(obj/item/W as obj, mob/user as mob) ..() - if (istype(W, /obj/item/weapon/flamethrower)) - var/obj/item/weapon/flamethrower/F = W + if (istype(W, /obj/item/flamethrower)) + var/obj/item/flamethrower/F = W if ((!F.status)||(F.ptank)) return src.master = F F.ptank = src @@ -92,7 +92,7 @@ src.loc = F return -/obj/item/weapon/tank/vox //Can't be a child of phoron or the gas amount gets screwey. +/obj/item/tank/vox //Can't be a child of phoron or the gas amount gets screwey. name = "phoron tank" desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." icon_state = "phoron_vox" @@ -100,16 +100,16 @@ distribute_pressure = ONE_ATMOSPHERE*O2STANDARD slot_flags = SLOT_BACK //these ones have straps! -/obj/item/weapon/tank/vox/Initialize() +/obj/item/tank/vox/Initialize() . = ..() air_contents.adjust_gas("phoron", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) //VOREStation Edit -/obj/item/weapon/tank/phoron/pressurized +/obj/item/tank/phoron/pressurized name = "fuel can" icon_state = "phoron_vox" w_class = ITEMSIZE_NORMAL -/obj/item/weapon/tank/phoron/pressurized/Initialize() +/obj/item/tank/phoron/pressurized/Initialize() . = ..() adjust_scale(0.8) air_contents.adjust_gas("phoron", (7*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) @@ -118,7 +118,7 @@ * Emergency Oxygen */ -/obj/item/weapon/tank/emergency +/obj/item/tank/emergency name = "emergency tank" icon_state = "emergency" gauge_icon = "indicator_emergency" @@ -129,71 +129,71 @@ distribute_pressure = ONE_ATMOSPHERE*O2STANDARD volume = 2 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011) -/obj/item/weapon/tank/emergency/oxygen +/obj/item/tank/emergency/oxygen name = "emergency oxygen tank" desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it." icon_state = "emergency" gauge_icon = "indicator_emergency" -/obj/item/weapon/tank/emergency/oxygen/Initialize() +/obj/item/tank/emergency/oxygen/Initialize() . = ..() src.air_contents.adjust_gas("oxygen", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) -/obj/item/weapon/tank/emergency/oxygen/examine(mob/user) +/obj/item/tank/emergency/oxygen/examine(mob/user) . = ..() if(loc == user && (air_contents.gas["oxygen"] < 0.2)) . += "The meter on the [src.name] indicates you are almost out of air!" user << sound('sound/effects/alert.ogg') -/obj/item/weapon/tank/emergency/oxygen/engi +/obj/item/tank/emergency/oxygen/engi name = "extended-capacity emergency oxygen tank" icon_state = "emergency_engi" volume = 6 -/obj/item/weapon/tank/emergency/oxygen/double +/obj/item/tank/emergency/oxygen/double name = "double emergency oxygen tank" icon_state = "emergency_double" gauge_icon = "indicator_emergency_double" volume = 10 -/obj/item/weapon/tank/stasis/oxygen // Stasis bags need to have initial pressure within safe bounds for human atmospheric pressure (NOT breath pressure) +/obj/item/tank/stasis/oxygen // Stasis bags need to have initial pressure within safe bounds for human atmospheric pressure (NOT breath pressure) name = "stasis oxygen tank" desc = "Oxygen tank included in most stasis bag designs." icon_state = "emergency_double" gauge_icon = "indicator_emergency_double" volume = 10 -/obj/item/weapon/tank/stasis/oxygen/Initialize() +/obj/item/tank/stasis/oxygen/Initialize() . = ..() src.air_contents.adjust_gas("oxygen", (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) -/obj/item/weapon/tank/emergency/nitrogen +/obj/item/tank/emergency/nitrogen name = "emergency nitrogen tank" desc = "An emergency air tank hastily painted red." icon_state = "emergency_nitro" gauge_icon = "indicator_emergency" -/obj/item/weapon/tank/emergency/nitrogen/Initialize() +/obj/item/tank/emergency/nitrogen/Initialize() . = ..() src.air_contents.adjust_gas("nitrogen", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) -/obj/item/weapon/tank/emergency/nitrogen/double +/obj/item/tank/emergency/nitrogen/double name = "double emergency nitrogen tank" icon_state = "emergency_double_nitrogen" gauge_icon = "indicator_emergency_double" volume = 10 -/obj/item/weapon/tank/emergency/phoron +/obj/item/tank/emergency/phoron name = "emergency phoron tank" desc = "An emergency air tank hastily painted red." icon_state = "emergency_nitro" gauge_icon = "indicator_emergency" -/obj/item/weapon/tank/emergency/phoron/Initialize() +/obj/item/tank/emergency/phoron/Initialize() . = ..() src.air_contents.adjust_gas("phoron", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) -/obj/item/weapon/tank/emergency/phoron/double +/obj/item/tank/emergency/phoron/double name = "double emergency phoron tank" icon_state = "emergency_double_nitro" gauge_icon = "indicator_emergency_double" @@ -202,29 +202,29 @@ /* * Nitrogen */ -/obj/item/weapon/tank/nitrogen +/obj/item/tank/nitrogen name = "nitrogen tank" desc = "A tank of nitrogen." icon_state = "oxygen_fr" distribute_pressure = ONE_ATMOSPHERE*O2STANDARD -/obj/item/weapon/tank/nitrogen/Initialize() +/obj/item/tank/nitrogen/Initialize() . = ..() src.air_contents.adjust_gas("nitrogen", (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C)) -/obj/item/weapon/tank/nitrogen/examine(mob/user) +/obj/item/tank/nitrogen/examine(mob/user) . = ..() if(loc == user && (air_contents.gas["nitrogen"] < 10)) . += "The meter on \the [src] indicates you are almost out of nitrogen!" //playsound(user, 'sound/effects/alert.ogg', 50, 1) -/obj/item/weapon/tank/stasis/nitro_cryo // Synthmorph bags need to have initial pressure within safe bounds for human atmospheric pressure, but low temperature to stop unwanted degredation. +/obj/item/tank/stasis/nitro_cryo // Synthmorph bags need to have initial pressure within safe bounds for human atmospheric pressure, but low temperature to stop unwanted degredation. name = "stasis cryogenic nitrogen tank" desc = "Cryogenic Nitrogen tank included in most synthmorph bag designs." icon_state = "emergency_double_nitro" gauge_icon = "indicator_emergency_double" volume = 10 -/obj/item/weapon/tank/stasis/nitro_cryo/Initialize() +/obj/item/tank/stasis/nitro_cryo/Initialize() . = ..() src.air_contents.adjust_gas_temp("nitrogen", (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*TN60C), TN60C) diff --git a/code/game/objects/items/weapons/tanks/tank_types_vr.dm b/code/game/objects/items/weapons/tanks/tank_types_vr.dm index b40ae4a2105..3cd36cdb53f 100644 --- a/code/game/objects/items/weapons/tanks/tank_types_vr.dm +++ b/code/game/objects/items/weapons/tanks/tank_types_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/tank/emergency/phoron/double +/obj/item/tank/emergency/phoron/double name = "double emergency phoron tank" desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." icon = 'icons/obj/tank_vr.dmi' @@ -8,79 +8,79 @@ gauge_cap = 3 volume = 10 -/obj/item/weapon/tank/emergency/phoron/double/New() +/obj/item/tank/emergency/phoron/double/New() ..() air_contents.adjust_gas("phoron", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) //New icons -/obj/item/weapon/tank/oxygen +/obj/item/tank/oxygen icon = 'icons/obj/tank_vr.dmi' icon_state = "oxygen" gauge_cap = 3 gauge_icon = "indicator_bigtank" -// /obj/item/weapon/tank/oxygen/yellow -// /obj/item/weapon/tank/oxygen/red +// /obj/item/tank/oxygen/yellow +// /obj/item/tank/oxygen/red -/obj/item/weapon/tank/anesthetic +/obj/item/tank/anesthetic icon = 'icons/obj/tank_vr.dmi' icon_state = "anesthetic" gauge_cap = 3 gauge_icon = "indicator_bigtank" -/obj/item/weapon/tank/air +/obj/item/tank/air icon = 'icons/obj/tank_vr.dmi' icon_state = "oxygen" gauge_cap = 3 gauge_icon = "indicator_bigtank" -/obj/item/weapon/tank/phoron +/obj/item/tank/phoron icon = 'icons/obj/tank_vr.dmi' icon_state = "phoron" -/obj/item/weapon/tank/vox //Can't be a child of phoron or the gas amount gets screwey. +/obj/item/tank/vox //Can't be a child of phoron or the gas amount gets screwey. icon = 'icons/obj/tank_vr.dmi' icon_override = 'icons/inventory/back/mob_vr.dmi' icon_state = "phoron_vox" gauge_cap = 3 gauge_icon = "indicator_double" -/obj/item/weapon/tank/emergency +/obj/item/tank/emergency icon = 'icons/obj/tank_vr.dmi' icon_state = "emergency" gauge_icon = "indicator_smalltank" gauge_cap = 3 -/obj/item/weapon/tank/emergency/oxygen +/obj/item/tank/emergency/oxygen icon = 'icons/obj/tank_vr.dmi' icon_state = "emergency" gauge_icon = "indicator_smalltank" gauge_cap = 3 -/obj/item/weapon/tank/emergency/oxygen/engi +/obj/item/tank/emergency/oxygen/engi icon = 'icons/obj/tank_vr.dmi' icon_state = "emergency_engi" gauge_icon = "indicator_engi" gauge_cap = 3 -/obj/item/weapon/tank/emergency/oxygen/double +/obj/item/tank/emergency/oxygen/double icon = 'icons/obj/tank_vr.dmi' icon_state = "emergency_double" gauge_icon = "indicator_double" gauge_cap = 3 -/obj/item/weapon/tank/emergency/nitrogen +/obj/item/tank/emergency/nitrogen icon = 'icons/obj/tank_vr.dmi' icon_state = "emergency_nitrogen" gauge_icon = "indicator_smalltank" gauge_cap = 3 -/obj/item/weapon/tank/emergency/nitrogen/double +/obj/item/tank/emergency/nitrogen/double icon = 'icons/obj/tank_vr.dmi' icon_state = "emergency_double_vox" gauge_icon = "indicator_double" gauge_cap = 3 -/obj/item/weapon/tank/emergency/phoron +/obj/item/tank/emergency/phoron icon = 'icons/obj/tank_vr.dmi' icon_override = 'icons/inventory/belt/mob_vr.dmi' icon_state = "emergency_phoron_vox" @@ -88,7 +88,7 @@ volume = 6 gauge_cap = 3 -/obj/item/weapon/tank/nitrogen +/obj/item/tank/nitrogen icon = 'icons/obj/tank_vr.dmi' icon_state = "oxygen_fr" gauge_icon = "indicator_bigtank" diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 880f5f24914..ce084056841 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -2,7 +2,7 @@ var/list/global/tank_gauge_cache = list() -/obj/item/weapon/tank +/obj/item/tank name = "tank" icon = 'icons/obj/tank.dmi' sprite_sheets = list( @@ -28,7 +28,7 @@ var/list/global/tank_gauge_cache = list() var/integrity = 20 var/maxintegrity = 20 var/valve_welded = 0 - var/obj/item/device/tankassemblyproxy/proxyassembly + var/obj/item/tankassemblyproxy/proxyassembly var/volume = 70 var/manipulated_by = null //Used by _onclick/hud/screen_objects.dm internals to determine if someone has messed with our tank or not. @@ -51,13 +51,13 @@ var/list/global/tank_gauge_cache = list() Wired and assembled tanks may be disarmed with a set of wirecutters. Any exploding or rupturing tank will generate shrapnel, assuming their relief valves have been welded beforehand. Even if not, they can be incited to expel hot gas on ignition if pushed above 173ºC. \ Relatively easy to make, the single tank bomb requries no tank transfer valve, and is still a fairly formidable weapon that can be manufactured from any tank." -/obj/item/weapon/tank/proc/init_proxy() - var/obj/item/device/tankassemblyproxy/proxy = new /obj/item/device/tankassemblyproxy(src) +/obj/item/tank/proc/init_proxy() + var/obj/item/tankassemblyproxy/proxy = new /obj/item/tankassemblyproxy(src) proxy.tank = src src.proxyassembly = proxy -/obj/item/weapon/tank/Initialize() +/obj/item/tank/Initialize() . = ..() src.init_proxy() @@ -66,26 +66,26 @@ var/list/global/tank_gauge_cache = list() src.air_contents.temperature = T20C update_gauge() -/obj/item/weapon/tank/Destroy() +/obj/item/tank/Destroy() QDEL_NULL(air_contents) STOP_PROCESSING(SSobj, src) QDEL_NULL(src.proxyassembly) - if(istype(loc, /obj/item/device/transfer_valve)) - var/obj/item/device/transfer_valve/TTV = loc + if(istype(loc, /obj/item/transfer_valve)) + var/obj/item/transfer_valve/TTV = loc TTV.remove_tank(src) . = ..() -/obj/item/weapon/tank/equipped() // Note that even grabbing into a hand calls this, so it should be fine as a 'has a player touched this' +/obj/item/tank/equipped() // Note that even grabbing into a hand calls this, so it should be fine as a 'has a player touched this' . = ..() // An attempt at optimization. There are MANY tanks during rounds that will never get touched. // Don't see why any of those would explode spontaneously. So only tanks that players touch get processed. // This could be optimized more, but it's a start! START_PROCESSING(SSobj, src) // This has a built in safety to avoid multi-processing -/obj/item/weapon/tank/examine(mob/user) +/obj/item/tank/examine(mob/user) . = ..() if(loc == user) var/celsius_temperature = air_contents.temperature - T0C @@ -113,7 +113,7 @@ var/list/global/tank_gauge_cache = list() . += "\The [src] emergency relief valve has been welded shut!" -/obj/item/weapon/tank/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/tank/attackby(obj/item/W as obj, mob/user as mob) ..() if (istype(src.loc, /obj/item/assembly)) icon = src.loc @@ -139,7 +139,7 @@ var/list/global/tank_gauge_cache = list() cut_overlay("bomb_assembly") to_chat(user, "You cut the wire and remove the device.") - var/obj/item/device/assembly_holder/assy = src.proxyassembly.assembly + var/obj/item/assembly_holder/assy = src.proxyassembly.assembly if(assy.a_left && assy.a_right) assy.dropInto(usr.loc) assy.master = null @@ -171,7 +171,7 @@ var/list/global/tank_gauge_cache = list() - if(istype(W, /obj/item/device/assembly_holder)) + if(istype(W, /obj/item/assembly_holder)) if(wired) to_chat(user, "You begin attaching the assembly to \the [src].") if(do_after(user, 50, src)) @@ -185,8 +185,8 @@ var/list/global/tank_gauge_cache = list() to_chat(user, "You need to wire the device up first.") - if(istype(W, /obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/WT = W + if(istype(W, /obj/item/weldingtool)) + var/obj/item/weldingtool/WT = W if(WT.remove_fuel(1,user)) if(!valve_welded) to_chat(user, "You begin welding the \the [src] emergency pressure relief valve.") @@ -209,7 +209,7 @@ var/list/global/tank_gauge_cache = list() -/obj/item/weapon/tank/attack_self(mob/user as mob) +/obj/item/tank/attack_self(mob/user as mob) add_fingerprint(user) if (!(src.air_contents)) return @@ -219,16 +219,16 @@ var/list/global/tank_gauge_cache = list() if (src.proxyassembly.assembly) src.proxyassembly.assembly.attack_self(user) -/obj/item/weapon/tank/tgui_state(mob/user) +/obj/item/tank/tgui_state(mob/user) return GLOB.tgui_deep_inventory_state -/obj/item/weapon/tank/tgui_interact(mob/user, datum/tgui/ui) +/obj/item/tank/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Tank", name) ui.open() -/obj/item/weapon/tank/tgui_data(mob/user) +/obj/item/tank/tgui_data(mob/user) var/list/data = list() data["tankPressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0) data["releasePressure"] = round(distribute_pressure ? distribute_pressure : 0) @@ -257,7 +257,7 @@ var/list/global/tank_gauge_cache = list() return data -/obj/item/weapon/tank/tgui_act(action, params) +/obj/item/tank/tgui_act(action, params) if(..()) return TRUE switch(action) @@ -283,7 +283,7 @@ var/list/global/tank_gauge_cache = list() add_fingerprint(usr) -/obj/item/weapon/tank/proc/toggle_valve(var/mob/user) +/obj/item/tank/proc/toggle_valve(var/mob/user) if(istype(loc,/mob/living/carbon)) var/mob/living/carbon/location = loc if(location.internal == src) @@ -311,22 +311,22 @@ var/list/global/tank_gauge_cache = list() -/obj/item/weapon/tank/remove_air(amount) +/obj/item/tank/remove_air(amount) return air_contents.remove(amount) -/obj/item/weapon/tank/proc/remove_air_by_flag(flag, amount) +/obj/item/tank/proc/remove_air_by_flag(flag, amount) return air_contents.remove_by_flag(flag, amount) -/obj/item/weapon/tank/return_air() +/obj/item/tank/return_air() return air_contents -/obj/item/weapon/tank/assume_air(datum/gas_mixture/giver) +/obj/item/tank/assume_air(datum/gas_mixture/giver) air_contents.merge(giver) check_status() return 1 -/obj/item/weapon/tank/proc/remove_air_volume(volume_to_return) +/obj/item/tank/proc/remove_air_volume(volume_to_return) if(!air_contents) return null @@ -338,7 +338,7 @@ var/list/global/tank_gauge_cache = list() return remove_air(moles_needed) -/obj/item/weapon/tank/process() +/obj/item/tank/process() if(!air_contents) return //Allow for reactions @@ -348,7 +348,7 @@ var/list/global/tank_gauge_cache = list() check_status() -/obj/item/weapon/tank/proc/add_bomb_overlay() +/obj/item/tank/proc/add_bomb_overlay() if(src.wired) add_overlay("bomb_assembly") if(src.proxyassembly.assembly) @@ -358,7 +358,7 @@ var/list/global/tank_gauge_cache = list() add_overlay(test) -/obj/item/weapon/tank/proc/update_gauge() +/obj/item/tank/proc/update_gauge() var/gauge_pressure = 0 if(air_contents) gauge_pressure = air_contents.return_pressure() @@ -383,7 +383,7 @@ var/list/global/tank_gauge_cache = list() -/obj/item/weapon/tank/proc/check_status() +/obj/item/tank/proc/check_status() //Handle exploding, leaking, and rupturing of the tank if(!air_contents) @@ -394,7 +394,7 @@ var/list/global/tank_gauge_cache = list() if(pressure > TANK_FRAGMENT_PRESSURE) if(integrity <= 7) - if(!istype(src.loc,/obj/item/device/transfer_valve)) + if(!istype(src.loc,/obj/item/transfer_valve)) message_admins("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast].") log_game("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast].") @@ -429,8 +429,8 @@ var/list/global/tank_gauge_cache = list() var/num_fragments = round(rand(8,10) * sqrt(strength * mult)) src.fragmentate(T, num_fragments, rand(5) + 7, list(/obj/item/projectile/bullet/pellet/fragment/tank/small = 7,/obj/item/projectile/bullet/pellet/fragment/tank = 2,/obj/item/projectile/bullet/pellet/fragment/strong = 1)) - if(istype(loc, /obj/item/device/transfer_valve)) - var/obj/item/device/transfer_valve/TTV = loc + if(istype(loc, /obj/item/transfer_valve)) + var/obj/item/transfer_valve/TTV = loc TTV.remove_tank(src) qdel(TTV) @@ -466,8 +466,8 @@ var/list/global/tank_gauge_cache = list() var/num_fragments = round(rand(6,8) * sqrt(strength * mult)) //Less chunks, but bigger src.fragmentate(T, num_fragments, 7, list(/obj/item/projectile/bullet/pellet/fragment/tank/small = 1,/obj/item/projectile/bullet/pellet/fragment/tank = 5,/obj/item/projectile/bullet/pellet/fragment/strong = 4)) - if(istype(loc, /obj/item/device/transfer_valve)) - var/obj/item/device/transfer_valve/TTV = loc + if(istype(loc, /obj/item/transfer_valve)) + var/obj/item/transfer_valve/TTV = loc TTV.remove_tank(src) @@ -524,9 +524,9 @@ var/list/global/tank_gauge_cache = list() ///Prewelded tanks ///////////////////////////////// -/obj/item/weapon/tank/phoron/welded +/obj/item/tank/phoron/welded valve_welded = 1 -/obj/item/weapon/tank/oxygen/welded +/obj/item/tank/oxygen/welded valve_welded = 1 @@ -534,7 +534,7 @@ var/list/global/tank_gauge_cache = list() ///Onetankbombs (added as actual items) ///////////////////////////////// -/obj/item/weapon/tank/proc/onetankbomb(var/fill = 1) +/obj/item/tank/proc/onetankbomb(var/fill = 1) var/phoron_amt = 4 + rand(4) var/oxygen_amt = 6 + rand(8) @@ -554,7 +554,7 @@ var/list/global/tank_gauge_cache = list() src.wired = 1 - var/obj/item/device/assembly_holder/H = new(src) + var/obj/item/assembly_holder/H = new(src) src.proxyassembly.assembly = H H.master = src.proxyassembly @@ -563,28 +563,28 @@ var/list/global/tank_gauge_cache = list() add_overlay("bomb_assembly") -/obj/item/weapon/tank/phoron/onetankbomb/New() +/obj/item/tank/phoron/onetankbomb/New() ..() src.onetankbomb() -/obj/item/weapon/tank/oxygen/onetankbomb/New() +/obj/item/tank/oxygen/onetankbomb/New() ..() src.onetankbomb() -/obj/item/weapon/tank/phoron/onetankbomb/full/New() +/obj/item/tank/phoron/onetankbomb/full/New() ..() src.onetankbomb(2) -/obj/item/weapon/tank/oxygen/onetankbomb/full/New() +/obj/item/tank/oxygen/onetankbomb/full/New() ..() src.onetankbomb(2) -/obj/item/weapon/tank/phoron/onetankbomb/small/New() +/obj/item/tank/phoron/onetankbomb/small/New() ..() src.onetankbomb(0) -/obj/item/weapon/tank/oxygen/onetankbomb/small/New() +/obj/item/tank/oxygen/onetankbomb/small/New() ..() src.onetankbomb(0) @@ -592,23 +592,23 @@ var/list/global/tank_gauge_cache = list() ///Pulled from rewritten bomb.dm ///////////////////////////////// -/obj/item/device/tankassemblyproxy +/obj/item/tankassemblyproxy name = "Tank assembly proxy" desc = "Used as a stand in to trigger single tank assemblies... but you shouldn't see this." - var/obj/item/weapon/tank/tank = null - var/obj/item/device/assembly_holder/assembly = null + var/obj/item/tank/tank = null + var/obj/item/assembly_holder/assembly = null -/obj/item/device/tankassemblyproxy/receive_signal() //This is mainly called by the sensor through sense() to the holder, and from the holder to here. +/obj/item/tankassemblyproxy/receive_signal() //This is mainly called by the sensor through sense() to the holder, and from the holder to here. tank.ignite() //boom (or not boom if you made shijwtty mix) -/obj/item/device/tankassemblyproxy/Destroy() +/obj/item/tankassemblyproxy/Destroy() . = ..() tank = null assembly = null -/obj/item/weapon/tank/proc/assemble_bomb(W,user) //Bomb assembly proc. This turns assembly+tank into a bomb - var/obj/item/device/assembly_holder/S = W +/obj/item/tank/proc/assemble_bomb(W,user) //Bomb assembly proc. This turns assembly+tank into a bomb + var/obj/item/assembly_holder/S = W var/mob/M = user if(!S.secured) //Check if the assembly is secured return @@ -632,9 +632,9 @@ var/list/global/tank_gauge_cache = list() return -/obj/item/weapon/tank/proc/ignite() //This happens when a bomb is told to explode +/obj/item/tank/proc/ignite() //This happens when a bomb is told to explode - var/obj/item/device/assembly_holder/assy = src.proxyassembly.assembly + var/obj/item/assembly_holder/assy = src.proxyassembly.assembly var/ign = assy.a_right var/obj/item/other = assy.a_left @@ -653,7 +653,7 @@ var/list/global/tank_gauge_cache = list() air_contents.add_thermal_energy(15000) -/obj/item/device/tankassemblyproxy/update_icon() +/obj/item/tankassemblyproxy/update_icon() if(assembly) tank.update_icon() tank.add_overlay("bomb_assembly") @@ -661,10 +661,10 @@ var/list/global/tank_gauge_cache = list() tank.update_icon() tank.cut_overlay("bomb_assembly") -/obj/item/device/tankassemblyproxy/HasProximity(turf/T, atom/movable/AM, old_loc) +/obj/item/tankassemblyproxy/HasProximity(turf/T, atom/movable/AM, old_loc) assembly?.HasProximity(T, AM, old_loc) -/obj/item/device/tankassemblyproxy/Moved(old_loc, direction, forced) +/obj/item/tankassemblyproxy/Moved(old_loc, direction, forced) if(isturf(old_loc)) unsense_proximity(callback = /atom/proc/HasProximity, center = old_loc) if(isturf(loc)) diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index c75c154e7df..951501c70e4 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/tape_roll +/obj/item/tape_roll name = "tape roll" desc = "A roll of sticky tape. Possibly for taping ducks... or was that ducts?" icon = 'icons/obj/bureaucracy.dmi' @@ -9,17 +9,17 @@ toolspeed = 2 //It is now used in surgery as a not awful, but probably dangerous option, due to speed. -/obj/item/weapon/tape_roll/proc/can_place(var/mob/living/carbon/human/H, var/mob/user) +/obj/item/tape_roll/proc/can_place(var/mob/living/carbon/human/H, var/mob/user) if(istype(user, /mob/living/silicon/robot) || user == H) return TRUE - for (var/obj/item/weapon/grab/G in H.grabbed_by) + for (var/obj/item/grab/G in H.grabbed_by) if (G.loc == user && G.state >= GRAB_AGGRESSIVE) return TRUE return FALSE -/obj/item/weapon/tape_roll/attack(var/mob/living/carbon/human/H, var/mob/user) +/obj/item/tape_roll/attack(var/mob/living/carbon/human/H, var/mob/user) if(istype(H)) if(user.a_intent == I_HELP) return @@ -91,7 +91,7 @@ if(!can_place(H, user)) return - var/obj/item/weapon/handcuffs/cable/tape/T = new(user) + var/obj/item/handcuffs/cable/tape/T = new(user) playsound(src, 'sound/effects/tape.ogg',25) if(!T.place_handcuffs(H, user)) @@ -101,16 +101,16 @@ return ..() return 1 -/obj/item/weapon/tape_roll/proc/stick(var/obj/item/weapon/W, mob/user) - if(!istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/paper/sticky) || !user.unEquip(W)) +/obj/item/tape_roll/proc/stick(var/obj/item/W, mob/user) + if(!istype(W, /obj/item/paper) || istype(W, /obj/item/paper/sticky) || !user.unEquip(W)) return user.drop_from_inventory(W) - var/obj/item/weapon/ducttape/tape = new(get_turf(src)) + var/obj/item/ducttape/tape = new(get_turf(src)) tape.attach(W) user.put_in_hands(tape) playsound(src, 'sound/effects/tape.ogg',25) -/obj/item/weapon/ducttape +/obj/item/ducttape name = "tape" desc = "A piece of sticky tape." icon = 'icons/obj/bureaucracy.dmi' @@ -120,23 +120,23 @@ anchored = FALSE drop_sound = null - var/obj/item/weapon/stuck = null + var/obj/item/stuck = null -/obj/item/weapon/ducttape/New() +/obj/item/ducttape/New() ..() flags |= NOBLUDGEON -/obj/item/weapon/ducttape/examine(mob/user) +/obj/item/ducttape/examine(mob/user) return stuck.examine(user) -/obj/item/weapon/ducttape/proc/attach(var/obj/item/weapon/W) +/obj/item/ducttape/proc/attach(var/obj/item/W) stuck = W W.forceMove(src) icon_state = W.icon_state + "_taped" name = W.name + " (taped)" overlays = W.overlays -/obj/item/weapon/ducttape/attack_self(mob/user) +/obj/item/ducttape/attack_self(mob/user) if(!stuck) return @@ -149,8 +149,8 @@ overlays = null qdel(src) -/obj/item/weapon/ducttape/attackby(var/obj/item/I, var/mob/user) - if(!(istype(src, /obj/item/weapon/handcuffs/cable/tape) || istype(src, /obj/item/clothing/mask/muzzle/tape))) +/obj/item/ducttape/attackby(var/obj/item/I, var/mob/user) + if(!(istype(src, /obj/item/handcuffs/cable/tape) || istype(src, /obj/item/clothing/mask/muzzle/tape))) return ..() else user.drop_from_inventory(I) @@ -158,11 +158,11 @@ qdel(I) to_chat(user, "You place \the [I] back into \the [src].") -/obj/item/weapon/ducttape/attack_hand(mob/living/L) +/obj/item/ducttape/attack_hand(mob/living/L) anchored = FALSE return ..() // Pick it up now that it's unanchored. -/obj/item/weapon/ducttape/afterattack(var/A, mob/user, flag, params) +/obj/item/ducttape/afterattack(var/A, mob/user, flag, params) if(!in_range(user, A) || istype(A, /obj/machinery/door) || !stuck) return diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 3f78b468a9c..515d09c0e72 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -7,7 +7,7 @@ /* * Locator */ -/obj/item/weapon/locator +/obj/item/locator name = "locator" desc = "Used to track those with locater implants." icon = 'icons/obj/device.dmi' @@ -23,7 +23,7 @@ origin_tech = list(TECH_MAGNET = 1) matter = list(MAT_STEEL = 400) -/obj/item/weapon/locator/attack_self(mob/user as mob) +/obj/item/locator/attack_self(mob/user as mob) user.set_machine(src) var/dat if (src.temp) @@ -42,7 +42,7 @@ Frequency: onclose(user, "radio") return -/obj/item/weapon/locator/Topic(href, href_list) +/obj/item/locator/Topic(href, href_list) ..() if (usr.stat || usr.restrained()) return @@ -59,7 +59,7 @@ Frequency: if (sr) src.temp += "Located Beacons:
" - for(var/obj/item/device/radio/beacon/W in all_beacons) + for(var/obj/item/radio/beacon/W in all_beacons) if (W.frequency == src.frequency) var/turf/tr = get_turf(W) if (tr.z == sr.z && tr) @@ -77,7 +77,7 @@ Frequency: src.temp += "[W.code]-[dir2text(get_dir(sr, tr))]-[direct]
" src.temp += "Extraneous Signals:
" - for (var/obj/item/weapon/implant/tracking/W in all_tracking_implants) + for (var/obj/item/implant/tracking/W in all_tracking_implants) if (!W.implanted || !(istype(W.loc,/obj/item/organ/external) || ismob(W.loc) || W.malfunction)) continue @@ -116,7 +116,7 @@ Frequency: /* * Hand-tele */ -/obj/item/weapon/hand_tele +/obj/item/hand_tele name = "hand tele" desc = "A portable item using blue-space technology." icon = 'icons/obj/device.dmi' @@ -130,7 +130,7 @@ Frequency: matter = list(MAT_STEEL = 10000) preserve_item = 1 -/obj/item/weapon/hand_tele/attack_self(mob/user as mob) +/obj/item/hand_tele/attack_self(mob/user as mob) var/turf/current_location = get_turf(user)//What turf is the user on? if(!current_location || (current_location.z in using_map.admin_levels) || current_location.block_tele)//If turf was not found or they're on z level 2 or >7 which does not currently exist. to_chat(user, "\The [src] is malfunctioning.") diff --git a/code/game/objects/items/weapons/tools/brass.dm b/code/game/objects/items/weapons/tools/brass.dm index eedebe3220d..d9e59830045 100644 --- a/code/game/objects/items/weapons/tools/brass.dm +++ b/code/game/objects/items/weapons/tools/brass.dm @@ -3,27 +3,27 @@ */ //Crowbar -/obj/item/weapon/tool/crowbar/brass +/obj/item/tool/crowbar/brass icon_state = "crowbar_brass" item_state = "crowbar" //Cutters -/obj/item/weapon/tool/wirecutters/brass +/obj/item/tool/wirecutters/brass icon_state = "cutters_brass" item_state = "cutters_yellow" //Screwdriver -/obj/item/weapon/tool/screwdriver/brass +/obj/item/tool/screwdriver/brass icon_state = "screwdriver_brass" item_state = "screwdriver_black" //Wrench -/obj/item/weapon/tool/wrench/brass +/obj/item/tool/wrench/brass icon_state = "wrench_brass" item_state = "wrench_brass" //Welder -/obj/item/weapon/weldingtool/brass +/obj/item/weldingtool/brass name = "brass welding tool" desc = "A welder made from brass fittings." icon_state = "brasswelder" diff --git a/code/game/objects/items/weapons/tools/combitool.dm b/code/game/objects/items/weapons/tools/combitool.dm index bfc4baeb858..76789f36389 100644 --- a/code/game/objects/items/weapons/tools/combitool.dm +++ b/code/game/objects/items/weapons/tools/combitool.dm @@ -4,7 +4,7 @@ /* * Combitool */ -/obj/item/weapon/combitool +/obj/item/combitool name = "combi-tool" desc = "It even has one of those nubbins for doing the thingy." icon = 'icons/obj/items.dmi' @@ -14,29 +14,29 @@ pickup_sound = 'sound/items/pickup/multitool.ogg' var/list/spawn_tools = list( - /obj/item/weapon/tool/screwdriver, - /obj/item/weapon/tool/wrench, - /obj/item/weapon/tool/wirecutters, - /obj/item/weapon/material/knife, - /obj/item/weapon/material/kitchen/utensil/fork, - /obj/item/weapon/material/knife/machete/hatchet + /obj/item/tool/screwdriver, + /obj/item/tool/wrench, + /obj/item/tool/wirecutters, + /obj/item/material/knife, + /obj/item/material/kitchen/utensil/fork, + /obj/item/material/knife/machete/hatchet ) var/list/tools = list() var/current_tool = 1 -/obj/item/weapon/combitool/examine(mob/user) +/obj/item/combitool/examine(mob/user) . = ..() if(loc == user && tools.len) . += "It has the following fittings:" for(var/obj/item/tool in tools) . += "[icon2html(tool,)] - [tool.name][tools[current_tool]==tool?" (selected)":""]") -/obj/item/weapon/combitool/New() +/obj/item/combitool/New() ..() for(var/type in spawn_tools) tools |= new type(src) -/obj/item/weapon/combitool/attack_self(mob/user as mob) +/obj/item/combitool/attack_self(mob/user as mob) if(++current_tool > tools.len) current_tool = 1 var/obj/item/tool = tools[current_tool] if(!tool) @@ -45,14 +45,14 @@ to_chat(user, "You switch \the [src] to the [tool.name] fitting.") return 1 -/obj/item/weapon/combitool/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/combitool/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(!M.Adjacent(user)) return 0 var/obj/item/tool = tools[current_tool] if(!tool) return 0 return (tool ? tool.attack(M,user) : 0) -/obj/item/weapon/combitool/afterattack(var/atom/target, var/mob/living/user, proximity, params) +/obj/item/combitool/afterattack(var/atom/target, var/mob/living/user, proximity, params) if(!proximity) return 0 var/obj/item/tool = tools[current_tool] diff --git a/code/game/objects/items/weapons/tools/crowbar.dm b/code/game/objects/items/weapons/tools/crowbar.dm index 8d7c1add855..df98d8e27f6 100644 --- a/code/game/objects/items/weapons/tools/crowbar.dm +++ b/code/game/objects/items/weapons/tools/crowbar.dm @@ -1,7 +1,7 @@ /* * Crowbar */ -/obj/item/weapon/tool/crowbar +/obj/item/tool/crowbar name = "crowbar" desc = "Used to remove floors and to pry open doors." icon = 'icons/obj/tools.dmi' @@ -21,12 +21,12 @@ toolspeed = 1 tool_qualities = list(TOOL_CROWBAR) -/obj/item/weapon/tool/crowbar/red +/obj/item/tool/crowbar/red icon = 'icons/obj/tools.dmi' icon_state = "red_crowbar" item_state = "crowbar_red" -/obj/item/weapon/tool/crowbar/old +/obj/item/tool/crowbar/old icon = 'icons/obj/tools.dmi' icon_state = "old_crowbar" item_state = "crowbar" @@ -44,7 +44,7 @@ the tool aligned while in use." value = CATALOGUER_REWARD_EASY -/obj/item/weapon/tool/crowbar/alien +/obj/item/tool/crowbar/alien name = "alien crowbar" desc = "A hard-light crowbar. It appears to pry by itself, without any effort required." catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_crowbar) @@ -54,7 +54,7 @@ toolspeed = 0.1 origin_tech = list(TECH_COMBAT = 4, TECH_ENGINEERING = 4) -/obj/item/weapon/tool/crowbar/hybrid +/obj/item/tool/crowbar/hybrid name = "strange crowbar" desc = "A crowbar whose head seems to phase in and out of view." catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_crowbar) @@ -64,14 +64,14 @@ origin_tech = list(TECH_COMBAT = 4, TECH_ENGINEERING = 3) reach = 2 -/obj/item/weapon/tool/crowbar/cyborg +/obj/item/tool/crowbar/cyborg name = "hydraulic crowbar" desc = "A hydraulic prying tool, compact but powerful. Designed to replace crowbars in industrial synthetics." usesound = 'sound/items/jaws_pry.ogg' force = 10 toolspeed = 0.5 -/obj/item/weapon/tool/crowbar/power +/obj/item/tool/crowbar/power name = "power pryer" desc = "You shouldn't see this." usesound = 'sound/items/jaws_pry.ogg' @@ -82,7 +82,7 @@ * Prybar */ -/obj/item/weapon/tool/prybar +/obj/item/tool/prybar name = "pry bar" desc = "A steel bar with a wedge, designed specifically for opening unpowered doors in an emergency. It comes in a variety of configurations - collect them all!" icon = 'icons/obj/tools_vr.dmi' @@ -100,12 +100,12 @@ toolspeed = 1 var/random_color = TRUE -/obj/item/weapon/tool/prybar/red +/obj/item/tool/prybar/red icon_state = "prybar_red" item_state = "crowbar_red" random_color = FALSE -/obj/item/weapon/tool/prybar/New() +/obj/item/tool/prybar/New() if(random_color) icon_state = "prybar[pick("","_green","_aubergine","_blue")]" . = ..() \ No newline at end of file diff --git a/code/game/objects/items/weapons/tools/screwdriver.dm b/code/game/objects/items/weapons/tools/screwdriver.dm index 55e78d71de7..27ee0558484 100644 --- a/code/game/objects/items/weapons/tools/screwdriver.dm +++ b/code/game/objects/items/weapons/tools/screwdriver.dm @@ -1,7 +1,7 @@ /* * Screwdriver */ -/obj/item/weapon/tool/screwdriver +/obj/item/tool/screwdriver name = "screwdriver" desc = "You can be totally screwwy with this." description_fluff = "This could be used to engrave messages on suitable surfaces if you really put your mind to it! Alt-click a floor or wall to engrave with it." //This way it's not a completely hidden, arcane art to engrave. @@ -25,7 +25,7 @@ tool_qualities = list(TOOL_SCREWDRIVER) var/random_color = TRUE -/obj/item/weapon/tool/screwdriver/New() +/obj/item/tool/screwdriver/New() if(random_color) switch(pick("red","blue","purple","brown","green","cyan","yellow")) if ("red") @@ -54,7 +54,7 @@ src.pixel_y = rand(0, 16) ..() -/obj/item/weapon/tool/screwdriver/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/tool/screwdriver/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(!istype(M) || user.a_intent == "help") return ..() if(user.zone_sel.selecting != O_EYES && user.zone_sel.selecting != BP_HEAD) @@ -76,7 +76,7 @@ fastener, which includes the screws." value = CATALOGUER_REWARD_EASY -/obj/item/weapon/tool/screwdriver/alien +/obj/item/tool/screwdriver/alien name = "alien screwdriver" desc = "An ultrasonic screwdriver." catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_screwdriver) @@ -87,7 +87,7 @@ toolspeed = 0.1 random_color = FALSE -/obj/item/weapon/tool/screwdriver/hybrid +/obj/item/tool/screwdriver/hybrid name = "strange screwdriver" desc = "A strange conglomerate of a screwdriver." icon_state = "hybscrewdriver" @@ -99,13 +99,13 @@ random_color = FALSE reach = 2 -/obj/item/weapon/tool/screwdriver/cyborg +/obj/item/tool/screwdriver/cyborg name = "powered screwdriver" desc = "An electrical screwdriver, designed to be both precise and quick." usesound = 'sound/items/drill_use.ogg' toolspeed = 0.5 -/obj/item/weapon/tool/screwdriver/power +/obj/item/tool/screwdriver/power name = "power screwdriver" desc = "You shouldn't see this." force = 8 diff --git a/code/game/objects/items/weapons/tools/transforming.dm b/code/game/objects/items/weapons/tools/transforming.dm index 9089a71423e..658ad9b2270 100644 --- a/code/game/objects/items/weapons/tools/transforming.dm +++ b/code/game/objects/items/weapons/tools/transforming.dm @@ -1,26 +1,26 @@ -/obj/item/weapon/tool/transforming +/obj/item/tool/transforming name = "transforming tool" desc = "You should never see this..." var/list/possible_tooltypes = list() var/current_tooltype = 1 - var/obj/item/weapon/weldingtool/welder - var/weldertype = /obj/item/weapon/weldingtool/dummy + var/obj/item/weldingtool/welder + var/weldertype = /obj/item/weldingtool/dummy -/obj/item/weapon/tool/transforming/New(newloc, no_counterpart = TRUE) +/obj/item/tool/transforming/New(newloc, no_counterpart = TRUE) ..(newloc) if(TOOL_WELDER in possible_tooltypes) welder = new weldertype(src) on_tool_switch() -/obj/item/weapon/tool/transforming/Destroy() +/obj/item/tool/transforming/Destroy() if(welder) QDEL_NULL(welder) ..() -/obj/item/weapon/tool/transforming/get_welder() +/obj/item/tool/transforming/get_welder() return welder -/obj/item/weapon/tool/transforming/attack_self(mob/user) +/obj/item/tool/transforming/attack_self(mob/user) if(!possible_tooltypes.len || possible_tooltypes.len < 2) return if(current_tooltype == possible_tooltypes.len) @@ -30,10 +30,10 @@ on_tool_switch(user) -/obj/item/weapon/tool/transforming/proc/on_tool_switch(var/mob/user) +/obj/item/tool/transforming/proc/on_tool_switch(var/mob/user) return -/obj/item/weapon/tool/transforming/jawsoflife +/obj/item/tool/transforming/jawsoflife name = "jaws of life" desc = "A set of jaws of life, compressed through the magic of science." icon = 'icons/obj/tools.dmi' @@ -49,7 +49,7 @@ attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked", "pinched", "nipped") possible_tooltypes = list(TOOL_CROWBAR,TOOL_WIRECUTTER) -/obj/item/weapon/tool/transforming/jawsoflife/on_tool_switch(var/mob/user) +/obj/item/tool/transforming/jawsoflife/on_tool_switch(var/mob/user) switch(possible_tooltypes[current_tooltype]) if(TOOL_CROWBAR) desc = initial(desc) + " It's fitted with a prying head." @@ -70,7 +70,7 @@ playsound(src, 'sound/items/change_jaws.ogg', 50, 1) to_chat(user, "You attach the cutting jaws to [src].") -/obj/item/weapon/tool/transforming/powerdrill +/obj/item/tool/transforming/powerdrill name = "hand drill" desc = "A simple powered hand drill." icon = 'icons/obj/tools.dmi' @@ -88,7 +88,7 @@ attack_verb = list("drilled", "screwed", "jabbed", "whacked") possible_tooltypes = list(TOOL_WRENCH,TOOL_SCREWDRIVER) -/obj/item/weapon/tool/transforming/powerdrill/on_tool_switch(var/mob/user) +/obj/item/tool/transforming/powerdrill/on_tool_switch(var/mob/user) switch(possible_tooltypes[current_tooltype]) if(TOOL_WRENCH) desc = initial(desc) + " It's fitted with a bolt driver." @@ -107,7 +107,7 @@ playsound(src,'sound/items/change_drill.ogg',50,1) to_chat(user, "You attach the screw driver to [src].") -/obj/item/weapon/tool/transforming/altevian +/obj/item/tool/transforming/altevian name = "Hull Systems Omni-Tool" desc = "A big and bulky tool, used by Altevians for engineering duties. It's able to do the job of any regular tool while scaled up to a comically large size. It seems nanites are in play to help with adjusting the tip and handling some of the heavy lifting when in use." icon = 'icons/obj/weapons_vr.dmi' @@ -126,9 +126,9 @@ attack_verb = list("whacked", "slammed", "bashed", "wrenched", "fixed", "bolted", "clonked", "bonked") hitsound = 'sound/weapons/smash.ogg' possible_tooltypes = list(TOOL_WRENCH,TOOL_CROWBAR,TOOL_WIRECUTTER,TOOL_SCREWDRIVER,TOOL_MULTITOOL,TOOL_WELDER) - weldertype = /obj/item/weapon/weldingtool/dummy/altevian + weldertype = /obj/item/weldingtool/dummy/altevian -/obj/item/weapon/tool/transforming/altevian/on_tool_switch(var/mob/user) +/obj/item/tool/transforming/altevian/on_tool_switch(var/mob/user) switch(possible_tooltypes[current_tooltype]) if(TOOL_WRENCH) desc = initial(desc) + " It's currently in bolting mode." @@ -180,5 +180,5 @@ playsound(src,'sound/items/ratchet.ogg',50,1) to_chat(user, "You reconfigure [src] into welding mode.") -/obj/item/weapon/weldingtool/dummy/altevian +/obj/item/weldingtool/dummy/altevian toolspeed = 0.25 diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm index 133570a61d2..27146a88d18 100644 --- a/code/game/objects/items/weapons/tools/weldingtool.dm +++ b/code/game/objects/items/weapons/tools/weldingtool.dm @@ -2,7 +2,7 @@ /* * Welding Tool */ -/obj/item/weapon/weldingtool +/obj/item/weldingtool name = "\improper welding tool" icon = 'icons/obj/tools.dmi' icon_state = "welder" @@ -43,7 +43,7 @@ pickup_sound = 'sound/items/pickup/weldingtool.ogg' tool_qualities = list(TOOL_WELDER) -/obj/item/weapon/weldingtool/Initialize() +/obj/item/weldingtool/Initialize() . = ..() // var/random_fuel = min(rand(10,20),max_fuel) var/datum/reagents/R = new/datum/reagents(max_fuel) @@ -54,20 +54,20 @@ if(always_process) START_PROCESSING(SSobj, src) -/obj/item/weapon/weldingtool/Destroy() +/obj/item/weldingtool/Destroy() if(welding || always_process) STOP_PROCESSING(SSobj, src) return ..() -/obj/item/weapon/weldingtool/get_welder() +/obj/item/weldingtool/get_welder() return src -/obj/item/weapon/weldingtool/examine(mob/user) +/obj/item/weldingtool/examine(mob/user) . = ..() if(max_fuel && loc == user) . += "It contains [get_fuel()]/[src.max_fuel] units of fuel!" -/obj/item/weapon/weldingtool/attack(atom/A, mob/living/user, def_zone) +/obj/item/weldingtool/attack(atom/A, mob/living/user, def_zone) if(ishuman(A) && user.a_intent == I_HELP) var/mob/living/carbon/human/H = A var/obj/item/organ/external/S = H.organs_by_name[user.zone_sel.selecting] @@ -101,8 +101,8 @@ return ..() -/obj/item/weapon/weldingtool/attackby(obj/item/W as obj, mob/living/user as mob) - if(istype(W,/obj/item/weapon/tool/screwdriver)) +/obj/item/weldingtool/attackby(obj/item/W as obj, mob/living/user as mob) + if(istype(W,/obj/item/tool/screwdriver)) if(welding) to_chat(user, "Stop welding first!") return @@ -117,7 +117,7 @@ if((!status) && (istype(W,/obj/item/stack/rods))) var/obj/item/stack/rods/R = W R.use(1) - var/obj/item/weapon/flamethrower/F = new/obj/item/weapon/flamethrower(user.loc) + var/obj/item/flamethrower/F = new/obj/item/flamethrower(user.loc) src.loc = F F.weldtool = src if (user.client) @@ -138,7 +138,7 @@ ..() return -/obj/item/weapon/weldingtool/process() +/obj/item/weldingtool/process() if(welding) ++burned_fuel_for if(burned_fuel_for >= WELDER_FUEL_BURN_INTERVAL) @@ -154,7 +154,7 @@ if (istype(location, /turf)) location.hotspot_expose(700, 5) -/obj/item/weapon/weldingtool/afterattack(obj/O as obj, mob/user as mob, proximity) +/obj/item/weldingtool/afterattack(obj/O as obj, mob/user as mob, proximity) if(!proximity) return if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1) if(!welding && max_fuel) @@ -180,18 +180,18 @@ L.IgniteMob() if (istype(location, /turf)) location.hotspot_expose(700, 50, 1) -/obj/item/weapon/weldingtool/attack_self(mob/user) +/obj/item/weldingtool/attack_self(mob/user) setWelding(!welding, user) //Returns the amount of fuel in the welder -/obj/item/weapon/weldingtool/proc/get_fuel() +/obj/item/weldingtool/proc/get_fuel() return reagents.get_reagent_amount("fuel") -/obj/item/weapon/weldingtool/proc/get_max_fuel() +/obj/item/weldingtool/proc/get_max_fuel() return max_fuel //Removes fuel from the welding tool. If a mob is passed, it will perform an eyecheck on the mob. This should probably be renamed to use() -/obj/item/weapon/weldingtool/proc/remove_fuel(var/amount = 1, var/mob/M = null) +/obj/item/weldingtool/proc/remove_fuel(var/amount = 1, var/mob/M = null) if(!welding) return 0 if(amount) @@ -209,10 +209,10 @@ return 0 //Returns whether or not the welding tool is currently on. -/obj/item/weapon/weldingtool/proc/isOn() +/obj/item/weldingtool/proc/isOn() return welding -/obj/item/weapon/weldingtool/update_icon() +/obj/item/weldingtool/update_icon() ..() cut_overlays() // Welding overlay. @@ -240,7 +240,7 @@ M.update_inv_l_hand() M.update_inv_r_hand() -/obj/item/weapon/weldingtool/MouseDrop(obj/over_object as obj) +/obj/item/weldingtool/MouseDrop(obj/over_object as obj) if(!canremove) return @@ -274,7 +274,7 @@ //Sets the welding state of the welding tool. If you see W.welding = 1 anywhere, please change it to W.setWelding(1) //so that the welding tool updates accordingly -/obj/item/weapon/weldingtool/proc/setWelding(var/set_welding, var/mob/M) +/obj/item/weldingtool/proc/setWelding(var/set_welding, var/mob/M) if(!status) return var/turf/T = get_turf(src) @@ -317,7 +317,7 @@ //Decides whether or not to damage a player's eyes based on what they're wearing as protection //Note: This should probably be moved to mob -/obj/item/weapon/weldingtool/proc/eyecheck(mob/living/carbon/user) +/obj/item/weldingtool/proc/eyecheck(mob/living/carbon/user) if(!istype(user)) return 1 var/safety = user.eyecheck() @@ -362,10 +362,10 @@ user.disabilities &= ~NEARSIGHTED return -/obj/item/weapon/weldingtool/is_hot() +/obj/item/weldingtool/is_hot() return isOn() -/obj/item/weapon/weldingtool/largetank +/obj/item/weldingtool/largetank name = "industrial welding tool" desc = "A slightly larger welder with a larger tank." icon_state = "indwelder" @@ -373,12 +373,12 @@ origin_tech = list(TECH_ENGINEERING = 2, TECH_PHORON = 2) matter = list(MAT_STEEL = 70, MAT_GLASS = 60) -/obj/item/weapon/weldingtool/largetank/cyborg +/obj/item/weldingtool/largetank/cyborg name = "integrated welding tool" desc = "An advanced welder designed to be used in robotic systems." toolspeed = 0.5 -/obj/item/weapon/weldingtool/hugetank +/obj/item/weldingtool/hugetank name = "upgraded welding tool" desc = "A much larger welder with a huge tank." icon_state = "upindwelder" @@ -387,7 +387,7 @@ origin_tech = list(TECH_ENGINEERING = 3) matter = list(MAT_STEEL = 70, MAT_GLASS = 120) -/obj/item/weapon/weldingtool/mini +/obj/item/weldingtool/mini name = "emergency welding tool" desc = "A miniature welder used during emergencies." icon_state = "miniwelder" @@ -398,7 +398,7 @@ toolspeed = 2 eye_safety_modifier = 1 // Safer on eyes. -/obj/item/weapon/weldingtool/mini/two +/obj/item/weldingtool/mini/two icon_state = "miniwelder2" /datum/category_item/catalogue/anomalous/precursor_a/alien_welder @@ -425,7 +425,7 @@ deconstruction purposes." value = CATALOGUER_REWARD_EASY -/obj/item/weapon/weldingtool/alien +/obj/item/weldingtool/alien name = "alien welding tool" desc = "An alien welding tool. Whatever fuel it uses, it never runs out." catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_welder) @@ -438,12 +438,12 @@ origin_tech = list(TECH_PHORON = 5 ,TECH_ENGINEERING = 5) always_process = TRUE -/obj/item/weapon/weldingtool/alien/process() +/obj/item/weldingtool/alien/process() if(get_fuel() <= get_max_fuel()) reagents.add_reagent("fuel", 1) ..() -/obj/item/weapon/weldingtool/experimental +/obj/item/weldingtool/experimental name = "experimental welding tool" desc = "An experimental welder capable of synthesizing its own fuel from waste compounds. It can output a flame hotter than regular welders." icon_state = "exwelder" @@ -457,13 +457,13 @@ always_process = TRUE var/nextrefueltick = 0 -/obj/item/weapon/weldingtool/experimental/process() +/obj/item/weldingtool/experimental/process() ..() if(get_fuel() < get_max_fuel() && nextrefueltick < world.time) nextrefueltick = world.time + 10 reagents.add_reagent("fuel", 1) -/obj/item/weapon/weldingtool/experimental/hybrid +/obj/item/weldingtool/experimental/hybrid name = "strange welding tool" desc = "An experimental welder capable of synthesizing its own fuel from spatial waveforms. It's like welding with a star!" icon_state = "hybwelder" @@ -479,7 +479,7 @@ * Backpack Welder. */ -/obj/item/weapon/weldingtool/tubefed +/obj/item/weldingtool/tubefed name = "tube-fed welding tool" desc = "A bulky, cooler-burning welding tool that draws from a worn welding tank." icon_state = "tubewelder" @@ -491,22 +491,22 @@ flame_intensity = 1 eye_safety_modifier = 1 always_process = TRUE - var/obj/item/weapon/weldpack/mounted_pack = null + var/obj/item/weldpack/mounted_pack = null -/obj/item/weapon/weldingtool/tubefed/New(location) +/obj/item/weldingtool/tubefed/New(location) ..() - if(istype(location, /obj/item/weapon/weldpack)) - var/obj/item/weapon/weldpack/holder = location + if(istype(location, /obj/item/weldpack)) + var/obj/item/weldpack/holder = location mounted_pack = holder else qdel(src) -/obj/item/weapon/weldingtool/tubefed/Destroy() +/obj/item/weldingtool/tubefed/Destroy() mounted_pack.nozzle = null mounted_pack = null return ..() -/obj/item/weapon/weldingtool/tubefed/process() +/obj/item/weldingtool/tubefed/process() if(mounted_pack) if(!istype(mounted_pack.loc,/mob/living/carbon/human)) mounted_pack.return_nozzle() @@ -524,13 +524,13 @@ ..() -/obj/item/weapon/weldingtool/tubefed/dropped(mob/user) +/obj/item/weldingtool/tubefed/dropped(mob/user) ..() if(src.loc != user) mounted_pack.return_nozzle() to_chat(user, "\The [src] retracts to its fueltank.") -/obj/item/weapon/weldingtool/tubefed/survival +/obj/item/weldingtool/tubefed/survival name = "tube-fed emergency welding tool" desc = "A bulky, cooler-burning welding tool that draws from a worn welding tank." icon_state = "tubewelder" @@ -542,37 +542,37 @@ * Electric/Arc Welder */ -/obj/item/weapon/weldingtool/electric //AND HIS WELDING WAS ELECTRIC +/obj/item/weldingtool/electric //AND HIS WELDING WAS ELECTRIC name = "electric welding tool" desc = "A welder which runs off of electricity." icon_state = "arcwelder" max_fuel = 0 //We'll handle the consumption later. item_state = "ewelder" - var/obj/item/weapon/cell/power_supply //What type of power cell this uses + var/obj/item/cell/power_supply //What type of power cell this uses var/charge_cost = 24 //The rough equivalent of 1 unit of fuel, based on us wanting 10 welds per battery - var/cell_type = /obj/item/weapon/cell/device + var/cell_type = /obj/item/cell/device var/use_external_power = 0 //If in a borg or hardsuit, this needs to = 1 flame_color = "#00CCFF" // Blue-ish, to set it apart from the gas flames. acti_sound = 'sound/effects/sparks4.ogg' deac_sound = 'sound/effects/sparks4.ogg' -/obj/item/weapon/weldingtool/electric/unloaded/New() +/obj/item/weldingtool/electric/unloaded/New() cell_type = null -/obj/item/weapon/weldingtool/electric/New() +/obj/item/weldingtool/electric/New() ..() if(cell_type == null) update_icon() else if(cell_type) power_supply = new cell_type(src) else - power_supply = new /obj/item/weapon/cell/device(src) + power_supply = new /obj/item/cell/device(src) update_icon() -/obj/item/weapon/weldingtool/electric/get_cell() +/obj/item/weldingtool/electric/get_cell() return power_supply -/obj/item/weapon/weldingtool/electric/examine(mob/user) +/obj/item/weldingtool/electric/examine(mob/user) . = ..() if(Adjacent(user)) if(power_supply) @@ -580,9 +580,9 @@ else . += "It [src.name] has no power cell!" -/obj/item/weapon/weldingtool/electric/get_fuel() +/obj/item/weldingtool/electric/get_fuel() if(use_external_power) - var/obj/item/weapon/cell/external = get_external_power_supply() + var/obj/item/cell/external = get_external_power_supply() if(external) return external.charge else if(power_supply) @@ -590,22 +590,22 @@ else return 0 -/obj/item/weapon/weldingtool/electric/get_max_fuel() +/obj/item/weldingtool/electric/get_max_fuel() if(use_external_power) - var/obj/item/weapon/cell/external = get_external_power_supply() + var/obj/item/cell/external = get_external_power_supply() if(external) return external.maxcharge else if(power_supply) return power_supply.maxcharge return 0 -/obj/item/weapon/weldingtool/electric/remove_fuel(var/amount = 1, var/mob/M = null) +/obj/item/weldingtool/electric/remove_fuel(var/amount = 1, var/mob/M = null) if(!welding) return 0 if(get_fuel() >= amount) power_supply.checked_use(charge_cost) if(use_external_power) - var/obj/item/weapon/cell/external = get_external_power_supply() + var/obj/item/cell/external = get_external_power_supply() if(!external || !external.use(charge_cost)) //Take power from the borg... power_supply.give(charge_cost) //Give it back to the cell. if(M) @@ -618,7 +618,7 @@ update_icon() return 0 -/obj/item/weapon/weldingtool/electric/attack_hand(mob/user as mob) +/obj/item/weldingtool/electric/attack_hand(mob/user as mob) if(user.get_inactive_hand() == src) if(power_supply) power_supply.update_icon() @@ -632,9 +632,9 @@ else return ..() -/obj/item/weapon/weldingtool/electric/attackby(obj/item/weapon/W, mob/user as mob) - if(istype(W, /obj/item/weapon/cell)) - if(istype(W, /obj/item/weapon/cell/device)) +/obj/item/weldingtool/electric/attackby(obj/item/W, mob/user as mob) + if(istype(W, /obj/item/cell)) + if(istype(W, /obj/item/cell/device)) if(!power_supply) user.drop_item() W.loc = src @@ -648,7 +648,7 @@ else ..() -/obj/item/weapon/weldingtool/electric/proc/get_external_power_supply() +/obj/item/weldingtool/electric/proc/get_external_power_supply() if(isrobot(src.loc)) var/mob/living/silicon/robot/R = src.loc return R.cell @@ -657,7 +657,7 @@ if(module.holder && module.holder.wearer) var/mob/living/carbon/human/H = module.holder.wearer if(istype(H) && H.back) - var/obj/item/weapon/rig/suit = H.back + var/obj/item/rig/suit = H.back if(istype(suit)) return suit.cell if(istype(src.loc, /obj/item/mecha_parts/mecha_equipment)) @@ -666,25 +666,25 @@ return mounting.chassis.cell return null -/obj/item/weapon/weldingtool/electric/mounted +/obj/item/weldingtool/electric/mounted use_external_power = 1 -/obj/item/weapon/weldingtool/electric/mounted/cyborg +/obj/item/weldingtool/electric/mounted/cyborg toolspeed = 0.5 -/obj/item/weapon/weldingtool/electric/mounted/exosuit +/obj/item/weldingtool/electric/mounted/exosuit var/obj/item/mecha_parts/mecha_equipment/equip_mount = null flame_intensity = 1 eye_safety_modifier = 2 always_process = TRUE -/obj/item/weapon/weldingtool/electric/mounted/exosuit/Initialize() +/obj/item/weldingtool/electric/mounted/exosuit/Initialize() . = ..() if(istype(loc, /obj/item/mecha_parts/mecha_equipment)) equip_mount = loc -/obj/item/weapon/weldingtool/electric/mounted/exosuit/process() +/obj/item/weldingtool/electric/mounted/exosuit/process() ..() if(equip_mount && equip_mount.chassis) @@ -695,21 +695,21 @@ setWelding(FALSE, M.occupant) -/obj/item/weapon/weldingtool/dummy +/obj/item/weldingtool/dummy name = "dummy welding tool" desc = "you shouldn't be reading this. Tell a dev!" welding = TRUE -/obj/item/weapon/weldingtool/dummy/process() +/obj/item/weldingtool/dummy/process() return -/obj/item/weapon/weldingtool/dummy/get_fuel() +/obj/item/weldingtool/dummy/get_fuel() return get_max_fuel() -/obj/item/weapon/weldingtool/dummy/remove_fuel(var/amount = 1, var/mob/M = null) +/obj/item/weldingtool/dummy/remove_fuel(var/amount = 1, var/mob/M = null) return TRUE -/obj/item/weapon/weldingtool/dummy/isOn() +/obj/item/weldingtool/dummy/isOn() return TRUE #undef WELDER_FUEL_BURN_INTERVAL diff --git a/code/game/objects/items/weapons/tools/wirecutters.dm b/code/game/objects/items/weapons/tools/wirecutters.dm index 8b71f8af848..bda788a30ed 100644 --- a/code/game/objects/items/weapons/tools/wirecutters.dm +++ b/code/game/objects/items/weapons/tools/wirecutters.dm @@ -1,7 +1,7 @@ /* * Wirecutters */ -/obj/item/weapon/tool/wirecutters +/obj/item/tool/wirecutters name = "wirecutters" desc = "This cuts wires." description_fluff = "This could be used to engrave messages on suitable surfaces if you really put your mind to it! Alt-click a floor or wall to engrave with it." //This way it's not a completely hidden, arcane art to engrave. @@ -27,7 +27,7 @@ tool_qualities = list(TOOL_WIRECUTTER) var/random_color = TRUE -/obj/item/weapon/tool/wirecutters/New() +/obj/item/tool/wirecutters/New() if(random_color) switch(pick("red","blue","yellow")) if ("red") @@ -44,8 +44,8 @@ src.pixel_y = rand(0, 16) ..() -/obj/item/weapon/tool/wirecutters/attack(mob/living/carbon/C as mob, mob/user as mob) - if(istype(C) && user.a_intent == I_HELP && (C.handcuffed) && (istype(C.handcuffed, /obj/item/weapon/handcuffs/cable))) +/obj/item/tool/wirecutters/attack(mob/living/carbon/C as mob, mob/user as mob) + if(istype(C) && user.a_intent == I_HELP && (C.handcuffed) && (istype(C.handcuffed, /obj/item/handcuffs/cable))) usr.visible_message("\The [usr] cuts \the [C]'s restraints with \the [src]!",\ "You cut \the [C]'s restraints with \the [src]!",\ "You hear cable being cut.") @@ -70,7 +70,7 @@ energy and signals, just as humans do." value = CATALOGUER_REWARD_EASY -/obj/item/weapon/tool/wirecutters/alien +/obj/item/tool/wirecutters/alien name = "alien wirecutters" desc = "Extremely sharp wirecutters, made out of a silvery-green metal." catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_wirecutters) @@ -80,13 +80,13 @@ origin_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4) random_color = FALSE -/obj/item/weapon/tool/wirecutters/cyborg +/obj/item/tool/wirecutters/cyborg name = "wirecutters" desc = "This cuts wires. With science." usesound = 'sound/items/jaws_cut.ogg' toolspeed = 0.5 -/obj/item/weapon/tool/wirecutters/hybrid +/obj/item/tool/wirecutters/hybrid name = "strange wirecutters" desc = "This cuts wires. With Science!" icon_state = "hybcutters" @@ -97,7 +97,7 @@ toolspeed = 0.4 reach = 2 -/obj/item/weapon/tool/wirecutters/power +/obj/item/tool/wirecutters/power name = "power cutters" desc = "You shouldn't see this." usesound = 'sound/items/jaws_cut.ogg' diff --git a/code/game/objects/items/weapons/tools/wrench.dm b/code/game/objects/items/weapons/tools/wrench.dm index 2b1a3e30a8f..aeb4b15f66b 100644 --- a/code/game/objects/items/weapons/tools/wrench.dm +++ b/code/game/objects/items/weapons/tools/wrench.dm @@ -1,7 +1,7 @@ /* * Wrench */ -/obj/item/weapon/tool/wrench +/obj/item/tool/wrench name = "wrench" desc = "A wrench with many common uses. Can be usually found in your hand." icon = 'icons/obj/tools.dmi' @@ -19,13 +19,13 @@ pickup_sound = 'sound/items/pickup/wrench.ogg' tool_qualities = list(TOOL_WRENCH) -/obj/item/weapon/tool/wrench/cyborg +/obj/item/tool/wrench/cyborg name = "automatic wrench" desc = "An advanced robotic wrench. Can be found in industrial synthetic shells." usesound = 'sound/items/drill_use.ogg' toolspeed = 0.5 -/obj/item/weapon/tool/wrench/pipe +/obj/item/tool/wrench/pipe name = "pipe wrench" desc = "A wrench used for plumbing. Can make a good makeshift weapon." icon_state = "pipe_wrench" @@ -33,7 +33,7 @@ force = 8 throwforce = 10 -/obj/item/weapon/tool/wrench/hybrid // Slower and bulkier than normal power tools, but it has the power of reach. If reach even worked half the time. +/obj/item/tool/wrench/hybrid // Slower and bulkier than normal power tools, but it has the power of reach. If reach even worked half the time. name = "strange wrench" desc = "A wrench with many common uses. Can be usually found in your hand." icon = 'icons/obj/tools.dmi' @@ -63,7 +63,7 @@ purpose, however it is very well suited to act in a wrench's capacity regardless." value = CATALOGUER_REWARD_EASY -/obj/item/weapon/tool/wrench/alien +/obj/item/tool/wrench/alien name = "alien wrench" desc = "A polarized wrench. It causes anything placed between the jaws to turn." catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_wrench) @@ -73,7 +73,7 @@ toolspeed = 0.1 origin_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 5) -/obj/item/weapon/tool/wrench/power +/obj/item/tool/wrench/power name = "power wrench" desc = "You shouldn't see this." usesound = 'sound/items/drill_use.ogg' diff --git a/code/game/objects/items/weapons/towels.dm b/code/game/objects/items/weapons/towels.dm index df027debd4a..110d2a69fd0 100644 --- a/code/game/objects/items/weapons/towels.dm +++ b/code/game/objects/items/weapons/towels.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/towel +/obj/item/towel name = "towel" icon = 'icons/obj/weapons.dmi' icon_state = "towel" @@ -11,7 +11,7 @@ drop_sound = 'sound/items/drop/cloth.ogg' pickup_sound = 'sound/items/pickup/cloth.ogg' -/obj/item/weapon/towel/equipped(var/M, var/slot) +/obj/item/towel/equipped(var/M, var/slot) ..() switch(slot) if(slot_head) @@ -21,7 +21,7 @@ if(slot_belt) sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/belt/mob_teshari.dmi') -/obj/item/weapon/towel/attack_self(mob/living/user as mob) +/obj/item/towel/attack_self(mob/living/user as mob) user.visible_message(text("[] uses [] to towel themselves off.", user, src)) playsound(src, 'sound/weapons/towelwipe.ogg', 25, 1) if(user.fire_stacks > 0) @@ -29,6 +29,6 @@ else if(user.fire_stacks < 0) user.fire_stacks = (min(0, user.fire_stacks + 1.5)) -/obj/item/weapon/towel/random/New() +/obj/item/towel/random/New() ..() color = get_random_colour() diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index 7bc406166c1..9221a2dc739 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -4,7 +4,7 @@ * Buckles crossing individuals, doing moderate brute damage. */ -/obj/item/weapon/beartrap +/obj/item/beartrap name = "mechanical trap" throw_speed = 2 throw_range = 1 @@ -22,10 +22,10 @@ var/camo_net = FALSE var/stun_length = 0.25 SECONDS -/obj/item/weapon/beartrap/proc/can_use(mob/user) +/obj/item/beartrap/proc/can_use(mob/user) return (user.IsAdvancedToolUser() && !issilicon(user) && !user.stat && !user.restrained()) -/obj/item/weapon/beartrap/attack_self(mob/user as mob) +/obj/item/beartrap/attack_self(mob/user as mob) ..() if(!deployed && can_use(user)) user.visible_message( @@ -47,7 +47,7 @@ update_icon() anchored = TRUE -/obj/item/weapon/beartrap/attack_hand(mob/user as mob) +/obj/item/beartrap/attack_hand(mob/user as mob) if(has_buckled_mobs() && can_use(user)) var/victim = english_list(buckled_mobs) user.visible_message( @@ -78,7 +78,7 @@ else ..() -/obj/item/weapon/beartrap/proc/attack_mob(mob/living/L) +/obj/item/beartrap/proc/attack_mob(mob/living/L) var/target_zone if(L.lying) @@ -119,7 +119,7 @@ anchored = FALSE can_buckle = initial(can_buckle) -/obj/item/weapon/beartrap/Crossed(atom/movable/AM as mob|obj) +/obj/item/beartrap/Crossed(atom/movable/AM as mob|obj) if(AM.is_incorporeal()) return if(deployed && isliving(AM)) @@ -137,7 +137,7 @@ update_icon() ..() -/obj/item/weapon/beartrap/update_icon() +/obj/item/beartrap/update_icon() ..() if(!deployed) @@ -151,7 +151,7 @@ icon_state = "beartrap1" -/obj/item/weapon/beartrap/hunting +/obj/item/beartrap/hunting name = "hunting trap" desc = "A mechanically activated leg trap. High-tech and reliable. Looks like it could really hurt if you set it off." stun_length = 1 SECOND @@ -165,7 +165,7 @@ * Slows individuals crossing it. Barefoot individuals will be cut. Can be electrified by placing over a cable node. */ -/obj/item/weapon/material/barbedwire +/obj/item/material/barbedwire name = "barbed wire" desc = "A coil of wire." icon = 'icons/obj/trap.dmi' @@ -181,17 +181,17 @@ sharp = TRUE -/obj/item/weapon/material/barbedwire/set_material(var/new_material) +/obj/item/material/barbedwire/set_material(var/new_material) ..() if(!QDELETED(src)) health = round(material.integrity / 3) name = (material.get_edge_damage() * force_divisor > 15) ? "[material.display_name] razor wire" : "[material.display_name] [initial(name)]" -/obj/item/weapon/material/barbedwire/proc/can_use(mob/user) +/obj/item/material/barbedwire/proc/can_use(mob/user) return (user.IsAdvancedToolUser() && !issilicon(user) && !user.stat && !user.restrained()) -/obj/item/weapon/material/barbedwire/attack_hand(mob/user as mob) +/obj/item/material/barbedwire/attack_hand(mob/user as mob) if(anchored && can_use(user)) user.visible_message( "[user] starts to collect \the [src].", @@ -210,7 +210,7 @@ else ..() -/obj/item/weapon/material/barbedwire/attack_self(mob/user as mob) +/obj/item/material/barbedwire/attack_self(mob/user as mob) ..() if(!anchored && can_use(user)) user.visible_message( @@ -233,7 +233,7 @@ anchored = TRUE update_icon() -/obj/item/weapon/material/barbedwire/attackby(obj/item/W as obj, mob/user as mob) +/obj/item/material/barbedwire/attackby(obj/item/W as obj, mob/user as mob) if(!istype(W)) return @@ -258,7 +258,7 @@ ..() -/obj/item/weapon/material/barbedwire/update_icon() +/obj/item/material/barbedwire/update_icon() ..() if(anchored) @@ -266,7 +266,7 @@ else icon_state = "[initial(icon_state)]" -/obj/item/weapon/material/barbedwire/Crossed(atom/movable/AM as mob|obj) +/obj/item/material/barbedwire/Crossed(atom/movable/AM as mob|obj) if(AM.is_incorporeal()) return if(anchored && isliving(AM)) @@ -281,7 +281,7 @@ update_icon() ..() -/obj/item/weapon/material/barbedwire/proc/shock(mob/user as mob, prb, var/target_zone = BP_TORSO) +/obj/item/material/barbedwire/proc/shock(mob/user as mob, prb, var/target_zone = BP_TORSO) if(!anchored || health == 0) // anchored/destroyed grilles are never connected return 0 if(material.conductivity <= 0) @@ -326,7 +326,7 @@ return 0 return 0 -/obj/item/weapon/material/barbedwire/proc/attack_mob(mob/living/L) +/obj/item/material/barbedwire/proc/attack_mob(mob/living/L) var/target_zone if(L.lying) target_zone = ran_zone() @@ -391,6 +391,6 @@ return -/obj/item/weapon/material/barbedwire/plastic +/obj/item/material/barbedwire/plastic name = "snare wire" default_material = MAT_PLASTIC diff --git a/code/game/objects/items/weapons/traps_vr.dm b/code/game/objects/items/weapons/traps_vr.dm index 0b7c543f02f..6940135d82c 100644 --- a/code/game/objects/items/weapons/traps_vr.dm +++ b/code/game/objects/items/weapons/traps_vr.dm @@ -1,10 +1,10 @@ -/obj/item/weapon/beartrap +/obj/item/beartrap slot_flags = SLOT_MASK item_icons = list( slot_wear_mask_str = 'icons/inventory/face/mob_vr.dmi' ) -/obj/item/weapon/beartrap/equipped() +/obj/item/beartrap/equipped() if(ishuman(src.loc)) var/mob/living/carbon/human/H = src.loc if(H.wear_mask == src) @@ -13,6 +13,6 @@ H.verbs -= /mob/living/proc/shred_limb_temp ..() -/obj/item/weapon/beartrap/dropped(var/mob/user) +/obj/item/beartrap/dropped(var/mob/user) user.verbs -= /mob/living/proc/shred_limb_temp ..() \ No newline at end of file diff --git a/code/game/objects/items/weapons/trays.dm b/code/game/objects/items/weapons/trays.dm index 2ea7b30cd1e..5c4e1bb49fe 100644 --- a/code/game/objects/items/weapons/trays.dm +++ b/code/game/objects/items/weapons/trays.dm @@ -1,7 +1,7 @@ /* * Trays - Agouri */ -/obj/item/weapon/tray +/obj/item/tray name = "tray" icon = 'icons/obj/food.dmi' icon_state = "tray" @@ -16,7 +16,7 @@ var/max_carry = 10 drop_sound = 'sound/items/trayhit1.ogg' -/obj/item/weapon/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) user.setClickCooldown(user.get_attack_speed(src)) // Drop all the things. All of them. cut_overlays() @@ -135,10 +135,10 @@ return return -/obj/item/weapon/tray/var/cooldown = 0 //shield bash cooldown. based on world.time +/obj/item/tray/var/cooldown = 0 //shield bash cooldown. based on world.time -/obj/item/weapon/tray/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/material/kitchen/rollingpin)) +/obj/item/tray/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/material/kitchen/rollingpin)) if(cooldown < world.time - 25) user.visible_message("[user] bashes [src] with [W]!") playsound(src, 'sound/effects/shieldbash.ogg', 50, 1) @@ -153,7 +153,7 @@ = = ===============~~~~~================================~~~~~==================== */ -/obj/item/weapon/tray/proc/calc_carry() +/obj/item/tray/proc/calc_carry() // calculate the weight of the items on the tray var/val = 0 // value to return @@ -167,7 +167,7 @@ return val -/obj/item/weapon/tray/pickup(mob/user) +/obj/item/tray/pickup(mob/user) if(!isturf(loc)) return @@ -189,13 +189,13 @@ Img.icon = I.icon Img.icon_state = I.icon_state Img.layer = layer + I.layer*0.01 - if(istype(I, /obj/item/weapon/material)) - var/obj/item/weapon/material/O = I + if(istype(I, /obj/item/material)) + var/obj/item/material/O = I if(O.applies_material_colour) Img.color = O.color add_overlay(Img) -/obj/item/weapon/tray/dropped(mob/user) +/obj/item/tray/dropped(mob/user) var/noTable = null spawn() //Allows the tray to udpate location, rather than just checking against mob's location diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index dc9aa503367..f76a989221b 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/nullrod +/obj/item/nullrod name = "null rod" desc = "A rod of pure obsidian, its very presence disrupts and dampens the powers of paranormal phenomenae." icon_state = "nullrod" @@ -12,7 +12,7 @@ drop_sound = 'sound/items/drop/sword.ogg' pickup_sound = 'sound/items/pickup/sword.ogg' -/obj/item/weapon/nullrod/attack(mob/M as mob, mob/living/user as mob) //Paste from old-code to decult with a null rod. +/obj/item/nullrod/attack(mob/M as mob, mob/living/user as mob) //Paste from old-code to decult with a null rod. add_attack_logs(user,M,"Hit with [src] (nullrod)") @@ -43,14 +43,14 @@ M.visible_message("\The [user] waves \the [src] over \the [M]'s head.") return -/obj/item/weapon/nullrod/afterattack(atom/A, mob/user as mob, proximity) +/obj/item/nullrod/afterattack(atom/A, mob/user as mob, proximity) if(!proximity) return if (istype(A, /turf/simulated/floor)) to_chat(user, "You hit the floor with the [src].") call(/obj/effect/rune/proc/revealrunes)(src) -/obj/item/weapon/energy_net +/obj/item/energy_net name = "energy net" desc = "It's a net made of green energy." icon = 'icons/effects/effects.dmi' @@ -59,11 +59,11 @@ force = 0 var/net_type = /obj/effect/energy_net -/obj/item/weapon/energy_net/dropped() +/obj/item/energy_net/dropped() spawn(10) if(src) qdel(src) -/obj/item/weapon/energy_net/throw_impact(atom/hit_atom) +/obj/item/energy_net/throw_impact(atom/hit_atom) ..() var/mob/living/M = hit_atom diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm index bdabfaf8265..8cecd4ec419 100644 --- a/code/game/objects/items/weapons/weldbackpack.dm +++ b/code/game/objects/items/weapons/weldbackpack.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/weldpack +/obj/item/weldpack name = "Welding kit" desc = "A heavy-duty, portable welding fluid carrier." slot_flags = SLOT_BACK @@ -6,13 +6,13 @@ icon_state = "welderpack" w_class = ITEMSIZE_LARGE var/max_fuel = 350 - var/obj/item/weapon/nozzle = null //Attached welder, or other spray device. - var/nozzle_type = /obj/item/weapon/weldingtool/tubefed + var/obj/item/nozzle = null //Attached welder, or other spray device. + var/nozzle_type = /obj/item/weldingtool/tubefed var/nozzle_attached = 0 drop_sound = 'sound/items/drop/backpack.ogg' pickup_sound = 'sound/items/pickup/backpack.ogg' -/obj/item/weapon/weldpack/Initialize() +/obj/item/weldpack/Initialize() . = ..() var/datum/reagents/R = new/datum/reagents(max_fuel) //Lotsa refills reagents = R @@ -21,19 +21,19 @@ nozzle = new nozzle_type(src) nozzle_attached = 1 -/obj/item/weapon/weldpack/Destroy() +/obj/item/weldpack/Destroy() qdel(nozzle) nozzle = null return ..() -/obj/item/weapon/weldpack/dropped(mob/user) +/obj/item/weldpack/dropped(mob/user) ..() if(nozzle) user.remove_from_mob(nozzle) return_nozzle() to_chat(user, "\The [nozzle] retracts to its fueltank.") -/obj/item/weapon/weldpack/proc/get_nozzle(var/mob/living/user) +/obj/item/weldpack/proc/get_nozzle(var/mob/living/user) if(!ishuman(user)) return 0 @@ -43,19 +43,19 @@ to_chat(H, "Your hands are full. Drop something first.") return 0 - var/obj/item/weapon/F = nozzle + var/obj/item/F = nozzle H.put_in_hands(F) nozzle_attached = 0 return 1 -/obj/item/weapon/weldpack/proc/return_nozzle(var/mob/living/user) +/obj/item/weldpack/proc/return_nozzle(var/mob/living/user) nozzle.forceMove(src) nozzle_attached = 1 -/obj/item/weapon/weldpack/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/weldingtool) && !(W == nozzle)) - var/obj/item/weapon/weldingtool/T = W +/obj/item/weldpack/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/weldingtool) && !(W == nozzle)) + var/obj/item/weldingtool/T = W if(T.welding & prob(50)) message_admins("[key_name_admin(user)] triggered a fueltank explosion.") log_game("[key_name(user)] triggered a fueltank explosion.") @@ -86,7 +86,7 @@ to_chat(user, "The tank scoffs at your insolence. It only provides services to welders.") return -/obj/item/weapon/weldpack/attack_hand(mob/user as mob) +/obj/item/weldpack/attack_hand(mob/user as mob) if(istype(user, /mob/living/carbon/human)) var/mob/living/carbon/human/wearer = user if(wearer.back == src) @@ -100,7 +100,7 @@ else ..() -/obj/item/weapon/weldpack/afterattack(obj/O as obj, mob/user as mob, proximity) +/obj/item/weldpack/afterattack(obj/O as obj, mob/user as mob, proximity) if(!proximity) // this replaces and improves the get_dist(src,O) <= 1 checks used previously return if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume < max_fuel) @@ -112,7 +112,7 @@ to_chat(user, "The pack is already full!") return -/obj/item/weapon/weldpack/MouseDrop(obj/over_object as obj) //This is terrifying. +/obj/item/weldpack/MouseDrop(obj/over_object as obj) //This is terrifying. if(!canremove) return @@ -144,11 +144,11 @@ usr.put_in_l_hand(src) src.add_fingerprint(usr) -/obj/item/weapon/weldpack/examine(mob/user) +/obj/item/weldpack/examine(mob/user) . = ..() . += "It has [src.reagents.total_volume] units of fuel left!" -/obj/item/weapon/weldpack/survival +/obj/item/weldpack/survival name = "emergency welding kit" desc = "A heavy-duty, portable welding fluid carrier." slot_flags = SLOT_BACK @@ -157,4 +157,4 @@ item_state = "welderpack" w_class = ITEMSIZE_LARGE max_fuel = 100 - nozzle_type = /obj/item/weapon/weldingtool/tubefed/survival + nozzle_type = /obj/item/weldingtool/tubefed/survival diff --git a/code/game/objects/random/_random.dm b/code/game/objects/random/_random.dm index 3d68245676b..f3434db3931 100644 --- a/code/game/objects/random/_random.dm +++ b/code/game/objects/random/_random.dm @@ -46,12 +46,12 @@ var/list/random_junk_ var/list/random_useful_ /proc/get_random_useful_type() if(!random_useful_) - random_useful_ = subtypesof(/obj/item/weapon/pen/crayon) - random_useful_ += /obj/item/weapon/pen - random_useful_ += /obj/item/weapon/pen/blue - random_useful_ += /obj/item/weapon/pen/red - random_useful_ += /obj/item/weapon/pen/multi - random_useful_ += /obj/item/weapon/storage/box/matches + random_useful_ = subtypesof(/obj/item/pen/crayon) + random_useful_ += /obj/item/pen + random_useful_ += /obj/item/pen/blue + random_useful_ += /obj/item/pen/red + random_useful_ += /obj/item/pen/multi + random_useful_ += /obj/item/storage/box/matches random_useful_ += /obj/item/stack/material/cardboard return pick(random_useful_) @@ -64,10 +64,10 @@ var/list/random_useful_ random_junk_ += /obj/effect/decal/cleanable/bug_remains random_junk_ += /obj/effect/decal/remains/mouse random_junk_ += /obj/effect/decal/remains/robot - random_junk_ += /obj/item/weapon/paper/crumpled + random_junk_ += /obj/item/paper/crumpled random_junk_ += /obj/item/inflatable/torn random_junk_ += /obj/effect/decal/cleanable/molten_item - random_junk_ += /obj/item/weapon/material/shard + random_junk_ += /obj/item/material/shard random_junk_ -= /obj/item/trash/plate random_junk_ -= /obj/item/trash/snack_bowl diff --git a/code/game/objects/random/guns_and_ammo.dm b/code/game/objects/random/guns_and_ammo.dm index 96184919da7..bd465e66083 100644 --- a/code/game/objects/random/guns_and_ammo.dm +++ b/code/game/objects/random/guns_and_ammo.dm @@ -13,24 +13,24 @@ icon_state = "gun_energy" /obj/random/energy/item_to_spawn() - return pick(prob(3);/obj/item/weapon/gun/energy/laser, - prob(3);/obj/item/weapon/gun/energy/laser/sleek, - prob(4);/obj/item/weapon/gun/energy/gun, - prob(3);/obj/item/weapon/gun/energy/gun/burst, - prob(1);/obj/item/weapon/gun/energy/gun/nuclear, - prob(2);/obj/item/weapon/gun/energy/retro, - prob(2);/obj/item/weapon/gun/energy/lasercannon, - prob(3);/obj/item/weapon/gun/energy/xray, - prob(1);/obj/item/weapon/gun/energy/sniperrifle, - prob(1);/obj/item/weapon/gun/energy/plasmastun, - prob(2);/obj/item/weapon/gun/energy/ionrifle, - prob(2);/obj/item/weapon/gun/energy/ionrifle/pistol, - prob(3);/obj/item/weapon/gun/energy/toxgun, - prob(3);/obj/item/weapon/gun/energy/taser, - prob(2);/obj/item/weapon/gun/energy/crossbow/largecrossbow, - prob(3);/obj/item/weapon/gun/energy/stunrevolver, - prob(2);/obj/item/weapon/gun/energy/stunrevolver/vintage, - prob(3);/obj/item/weapon/gun/energy/gun/compact) + return pick(prob(3);/obj/item/gun/energy/laser, + prob(3);/obj/item/gun/energy/laser/sleek, + prob(4);/obj/item/gun/energy/gun, + prob(3);/obj/item/gun/energy/gun/burst, + prob(1);/obj/item/gun/energy/gun/nuclear, + prob(2);/obj/item/gun/energy/retro, + prob(2);/obj/item/gun/energy/lasercannon, + prob(3);/obj/item/gun/energy/xray, + prob(1);/obj/item/gun/energy/sniperrifle, + prob(1);/obj/item/gun/energy/plasmastun, + prob(2);/obj/item/gun/energy/ionrifle, + prob(2);/obj/item/gun/energy/ionrifle/pistol, + prob(3);/obj/item/gun/energy/toxgun, + prob(3);/obj/item/gun/energy/taser, + prob(2);/obj/item/gun/energy/crossbow/largecrossbow, + prob(3);/obj/item/gun/energy/stunrevolver, + prob(2);/obj/item/gun/energy/stunrevolver/vintage, + prob(3);/obj/item/gun/energy/gun/compact) /obj/random/energy/highend name = "Random Energy Weapon" @@ -38,17 +38,17 @@ icon_state = "gun_energy_2" /obj/random/energy/item_to_spawn() - return pick(prob(3);/obj/item/weapon/gun/energy/laser, - prob(3);/obj/item/weapon/gun/energy/laser/sleek, - prob(4);/obj/item/weapon/gun/energy/gun, - prob(3);/obj/item/weapon/gun/energy/gun/burst, - prob(1);/obj/item/weapon/gun/energy/gun/nuclear, - prob(2);/obj/item/weapon/gun/energy/retro, - prob(2);/obj/item/weapon/gun/energy/lasercannon, - prob(3);/obj/item/weapon/gun/energy/xray, - prob(1);/obj/item/weapon/gun/energy/sniperrifle, - prob(2);/obj/item/weapon/gun/energy/crossbow/largecrossbow, - prob(3);/obj/item/weapon/gun/energy/gun/compact) + return pick(prob(3);/obj/item/gun/energy/laser, + prob(3);/obj/item/gun/energy/laser/sleek, + prob(4);/obj/item/gun/energy/gun, + prob(3);/obj/item/gun/energy/gun/burst, + prob(1);/obj/item/gun/energy/gun/nuclear, + prob(2);/obj/item/gun/energy/retro, + prob(2);/obj/item/gun/energy/lasercannon, + prob(3);/obj/item/gun/energy/xray, + prob(1);/obj/item/gun/energy/sniperrifle, + prob(2);/obj/item/gun/energy/crossbow/largecrossbow, + prob(3);/obj/item/gun/energy/gun/compact) /obj/random/energy/sec name = "Random Security Energy Weapon" @@ -56,8 +56,8 @@ icon_state = "gun_energy" /obj/random/energy/sec/item_to_spawn() - return pick(prob(2);/obj/item/weapon/gun/energy/laser, - prob(2);/obj/item/weapon/gun/energy/gun) + return pick(prob(2);/obj/item/gun/energy/laser, + prob(2);/obj/item/gun/energy/gun) /obj/random/projectile name = "Random Projectile Weapon" @@ -65,41 +65,41 @@ icon_state = "gun" /obj/random/projectile/item_to_spawn() - return pick(prob(3);/obj/item/weapon/gun/projectile/automatic/wt550, - prob(3);/obj/item/weapon/gun/projectile/automatic/mini_uzi, - prob(3);/obj/item/weapon/gun/projectile/automatic/tommygun, - prob(2);/obj/item/weapon/gun/projectile/automatic/c20r, - prob(2);/obj/item/weapon/gun/projectile/automatic/sts35, - prob(2);/obj/item/weapon/gun/projectile/automatic/z8, - prob(2);/obj/item/weapon/gun/projectile/automatic/combatsmg, - prob(4);/obj/item/weapon/gun/projectile/colt, - prob(2);/obj/item/weapon/gun/projectile/deagle, - prob(1);/obj/item/weapon/gun/projectile/deagle/camo, - prob(1);/obj/item/weapon/gun/projectile/deagle/gold, - prob(3);/obj/item/weapon/gun/projectile/derringer, - prob(1);/obj/item/weapon/gun/projectile/heavysniper, - prob(4);/obj/item/weapon/gun/projectile/luger, - prob(3);/obj/item/weapon/gun/projectile/luger/brown, - prob(4);/obj/item/weapon/gun/projectile/sec, - prob(3);/obj/item/weapon/gun/projectile/sec/wood, - prob(4);/obj/item/weapon/gun/projectile/p92x, - prob(3);/obj/item/weapon/gun/projectile/p92x/brown, - prob(4);/obj/item/weapon/gun/projectile/pistol, - prob(5);/obj/item/weapon/gun/projectile/pirate, - prob(2);/obj/item/weapon/gun/projectile/revolver, - prob(4);/obj/item/weapon/gun/projectile/revolver/deckard, - prob(4);/obj/item/weapon/gun/projectile/revolver/detective, - prob(2);/obj/item/weapon/gun/projectile/revolver/judge, - prob(3);/obj/item/weapon/gun/projectile/revolver/lemat, - prob(2);/obj/item/weapon/gun/projectile/revolver/mateba, - prob(4);/obj/item/weapon/gun/projectile/shotgun/doublebarrel, - prob(3);/obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn, - prob(3);/obj/item/weapon/gun/projectile/shotgun/pump, - prob(2);/obj/item/weapon/gun/projectile/shotgun/pump/combat, - prob(4);/obj/item/weapon/gun/projectile/shotgun/pump/rifle, - prob(3);/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever, - prob(2);/obj/item/weapon/gun/projectile/shotgun/semi, - prob(2);/obj/item/weapon/gun/projectile/silenced) + return pick(prob(3);/obj/item/gun/projectile/automatic/wt550, + prob(3);/obj/item/gun/projectile/automatic/mini_uzi, + prob(3);/obj/item/gun/projectile/automatic/tommygun, + prob(2);/obj/item/gun/projectile/automatic/c20r, + prob(2);/obj/item/gun/projectile/automatic/sts35, + prob(2);/obj/item/gun/projectile/automatic/z8, + prob(2);/obj/item/gun/projectile/automatic/combatsmg, + prob(4);/obj/item/gun/projectile/colt, + prob(2);/obj/item/gun/projectile/deagle, + prob(1);/obj/item/gun/projectile/deagle/camo, + prob(1);/obj/item/gun/projectile/deagle/gold, + prob(3);/obj/item/gun/projectile/derringer, + prob(1);/obj/item/gun/projectile/heavysniper, + prob(4);/obj/item/gun/projectile/luger, + prob(3);/obj/item/gun/projectile/luger/brown, + prob(4);/obj/item/gun/projectile/sec, + prob(3);/obj/item/gun/projectile/sec/wood, + prob(4);/obj/item/gun/projectile/p92x, + prob(3);/obj/item/gun/projectile/p92x/brown, + prob(4);/obj/item/gun/projectile/pistol, + prob(5);/obj/item/gun/projectile/pirate, + prob(2);/obj/item/gun/projectile/revolver, + prob(4);/obj/item/gun/projectile/revolver/deckard, + prob(4);/obj/item/gun/projectile/revolver/detective, + prob(2);/obj/item/gun/projectile/revolver/judge, + prob(3);/obj/item/gun/projectile/revolver/lemat, + prob(2);/obj/item/gun/projectile/revolver/mateba, + prob(4);/obj/item/gun/projectile/shotgun/doublebarrel, + prob(3);/obj/item/gun/projectile/shotgun/doublebarrel/sawn, + prob(3);/obj/item/gun/projectile/shotgun/pump, + prob(2);/obj/item/gun/projectile/shotgun/pump/combat, + prob(4);/obj/item/gun/projectile/shotgun/pump/rifle, + prob(3);/obj/item/gun/projectile/shotgun/pump/rifle/lever, + prob(2);/obj/item/gun/projectile/shotgun/semi, + prob(2);/obj/item/gun/projectile/silenced) /obj/random/projectile/sec name = "Random Security Projectile Weapon" @@ -107,9 +107,9 @@ icon_state = "gun_shotgun" /obj/random/projectile/sec/item_to_spawn() - return pick(prob(3);/obj/item/weapon/gun/projectile/shotgun/pump, - prob(2);/obj/item/weapon/gun/projectile/automatic/wt550, - prob(1);/obj/item/weapon/gun/projectile/shotgun/pump/combat) + return pick(prob(3);/obj/item/gun/projectile/shotgun/pump, + prob(2);/obj/item/gun/projectile/automatic/wt550, + prob(1);/obj/item/gun/projectile/shotgun/pump/combat) /obj/random/projectile/shotgun name = "Random Shotgun" @@ -117,11 +117,11 @@ icon_state = "gun_shotgun" /obj/random/projectile/item_to_spawn() - return pick(prob(4);/obj/item/weapon/gun/projectile/shotgun/doublebarrel, - prob(3);/obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn, - prob(3);/obj/item/weapon/gun/projectile/shotgun/pump, - prob(1);/obj/item/weapon/gun/projectile/shotgun/pump/combat, - prob(1);/obj/item/weapon/gun/projectile/shotgun/semi) + return pick(prob(4);/obj/item/gun/projectile/shotgun/doublebarrel, + prob(3);/obj/item/gun/projectile/shotgun/doublebarrel/sawn, + prob(3);/obj/item/gun/projectile/shotgun/pump, + prob(1);/obj/item/gun/projectile/shotgun/pump/combat, + prob(1);/obj/item/gun/projectile/shotgun/semi) /obj/random/handgun name = "Random Handgun" @@ -130,16 +130,16 @@ icon_state = "gun" /obj/random/handgun/item_to_spawn() - return pick(prob(4);/obj/item/weapon/gun/projectile/sec, - prob(4);/obj/item/weapon/gun/projectile/p92x, - prob(3);/obj/item/weapon/gun/projectile/sec/wood, - prob(3);/obj/item/weapon/gun/projectile/p92x/brown, - prob(3);/obj/item/weapon/gun/projectile/colt, - prob(2);/obj/item/weapon/gun/projectile/luger, - prob(2);/obj/item/weapon/gun/energy/gun, - prob(2);/obj/item/weapon/gun/projectile/pistol, - prob(1);/obj/item/weapon/gun/energy/retro, - prob(1);/obj/item/weapon/gun/projectile/luger/brown) + return pick(prob(4);/obj/item/gun/projectile/sec, + prob(4);/obj/item/gun/projectile/p92x, + prob(3);/obj/item/gun/projectile/sec/wood, + prob(3);/obj/item/gun/projectile/p92x/brown, + prob(3);/obj/item/gun/projectile/colt, + prob(2);/obj/item/gun/projectile/luger, + prob(2);/obj/item/gun/energy/gun, + prob(2);/obj/item/gun/projectile/pistol, + prob(1);/obj/item/gun/energy/retro, + prob(1);/obj/item/gun/projectile/luger/brown) /obj/random/handgun/sec name = "Random Security Handgun" @@ -147,8 +147,8 @@ icon_state = "gun" /obj/random/handgun/sec/item_to_spawn() - return pick(prob(3);/obj/item/weapon/gun/projectile/sec, - prob(1);/obj/item/weapon/gun/projectile/sec/wood) + return pick(prob(3);/obj/item/gun/projectile/sec, + prob(1);/obj/item/gun/projectile/sec/wood) /obj/random/ammo name = "Random Ammunition" @@ -172,22 +172,22 @@ icon_state = "grenade_2" /obj/random/grenade/item_to_spawn() - return pick(prob(15);/obj/item/weapon/grenade/concussion, - prob(5);/obj/item/weapon/grenade/empgrenade, - prob(15);/obj/item/weapon/grenade/empgrenade/low_yield, - prob(5);/obj/item/weapon/grenade/chem_grenade/metalfoam, - prob(2);/obj/item/weapon/grenade/chem_grenade/incendiary, - prob(10);/obj/item/weapon/grenade/chem_grenade/antiweed, - prob(10);/obj/item/weapon/grenade/chem_grenade/cleaner, - prob(10);/obj/item/weapon/grenade/chem_grenade/teargas, - prob(5);/obj/item/weapon/grenade/explosive, - prob(10);/obj/item/weapon/grenade/explosive/mini, - prob(2);/obj/item/weapon/grenade/explosive/frag, - prob(15);/obj/item/weapon/grenade/flashbang, - prob(1);/obj/item/weapon/grenade/flashbang/clusterbang, //I can't not do this. - prob(15);/obj/item/weapon/grenade/shooter/rubber, - prob(10);/obj/item/weapon/grenade/shooter/energy/flash, - prob(15);/obj/item/weapon/grenade/smokebomb + return pick(prob(15);/obj/item/grenade/concussion, + prob(5);/obj/item/grenade/empgrenade, + prob(15);/obj/item/grenade/empgrenade/low_yield, + prob(5);/obj/item/grenade/chem_grenade/metalfoam, + prob(2);/obj/item/grenade/chem_grenade/incendiary, + prob(10);/obj/item/grenade/chem_grenade/antiweed, + prob(10);/obj/item/grenade/chem_grenade/cleaner, + prob(10);/obj/item/grenade/chem_grenade/teargas, + prob(5);/obj/item/grenade/explosive, + prob(10);/obj/item/grenade/explosive/mini, + prob(2);/obj/item/grenade/explosive/frag, + prob(15);/obj/item/grenade/flashbang, + prob(1);/obj/item/grenade/flashbang/clusterbang, //I can't not do this. + prob(15);/obj/item/grenade/shooter/rubber, + prob(10);/obj/item/grenade/shooter/energy/flash, + prob(15);/obj/item/grenade/smokebomb ) /obj/random/grenade/lethal @@ -196,12 +196,12 @@ icon_state = "grenade_3" /obj/random/grenade/lethal/item_to_spawn() - return pick( prob(15);/obj/item/weapon/grenade/concussion, - prob(5);/obj/item/weapon/grenade/empgrenade, - prob(2);/obj/item/weapon/grenade/chem_grenade/incendiary, - prob(5);/obj/item/weapon/grenade/explosive, - prob(10);/obj/item/weapon/grenade/explosive/mini, - prob(2);/obj/item/weapon/grenade/explosive/frag + return pick( prob(15);/obj/item/grenade/concussion, + prob(5);/obj/item/grenade/empgrenade, + prob(2);/obj/item/grenade/chem_grenade/incendiary, + prob(5);/obj/item/grenade/explosive, + prob(10);/obj/item/grenade/explosive/mini, + prob(2);/obj/item/grenade/explosive/frag ) /obj/random/grenade/less_lethal @@ -210,14 +210,14 @@ icon_state = "grenade" /obj/random/grenade/less_lethal/item_to_spawn() - return pick(prob(20);/obj/item/weapon/grenade/concussion, - prob(15);/obj/item/weapon/grenade/empgrenade/low_yield, - prob(15);/obj/item/weapon/grenade/chem_grenade/metalfoam, - prob(20);/obj/item/weapon/grenade/chem_grenade/teargas, - prob(20);/obj/item/weapon/grenade/flashbang, - prob(1);/obj/item/weapon/grenade/flashbang/clusterbang, //I *still* can't not do this. - prob(15);/obj/item/weapon/grenade/shooter/rubber, - prob(10);/obj/item/weapon/grenade/shooter/energy/flash + return pick(prob(20);/obj/item/grenade/concussion, + prob(15);/obj/item/grenade/empgrenade/low_yield, + prob(15);/obj/item/grenade/chem_grenade/metalfoam, + prob(20);/obj/item/grenade/chem_grenade/teargas, + prob(20);/obj/item/grenade/flashbang, + prob(1);/obj/item/grenade/flashbang/clusterbang, //I *still* can't not do this. + prob(15);/obj/item/grenade/shooter/rubber, + prob(10);/obj/item/grenade/shooter/energy/flash ) /obj/random/grenade/box @@ -226,14 +226,14 @@ icon_state = "grenade_box" /obj/random/grenade/box/item_to_spawn() - return pick(prob(20);/obj/item/weapon/storage/box/flashbangs, - prob(10);/obj/item/weapon/storage/box/emps, - prob(20);/obj/item/weapon/storage/box/empslite, - prob(15);/obj/item/weapon/storage/box/smokes, - prob(5);/obj/item/weapon/storage/box/anti_photons, - prob(5);/obj/item/weapon/storage/box/frags, - prob(10);/obj/item/weapon/storage/box/metalfoam, - prob(15);/obj/item/weapon/storage/box/teargas + return pick(prob(20);/obj/item/storage/box/flashbangs, + prob(10);/obj/item/storage/box/emps, + prob(20);/obj/item/storage/box/empslite, + prob(15);/obj/item/storage/box/smokes, + prob(5);/obj/item/storage/box/anti_photons, + prob(5);/obj/item/storage/box/frags, + prob(10);/obj/item/storage/box/metalfoam, + prob(15);/obj/item/storage/box/teargas ) /obj/random/projectile/random @@ -256,31 +256,31 @@ /obj/random/multiple/gun/projectile/smg/item_to_spawn() return pick( prob(3);list( - /obj/item/weapon/gun/projectile/automatic/wt550, + /obj/item/gun/projectile/automatic/wt550, /obj/item/ammo_magazine/m9mmt, /obj/item/ammo_magazine/m9mmt ), prob(3);list( - /obj/item/weapon/gun/projectile/automatic/mini_uzi, + /obj/item/gun/projectile/automatic/mini_uzi, /obj/item/ammo_magazine/m45uzi, /obj/item/ammo_magazine/m45uzi ), prob(3);list( - /obj/item/weapon/gun/projectile/automatic/tommygun, + /obj/item/gun/projectile/automatic/tommygun, /obj/item/ammo_magazine/m45tommy, /obj/item/ammo_magazine/m45tommy ), prob(2);list( - /obj/item/weapon/gun/projectile/automatic/c20r, + /obj/item/gun/projectile/automatic/c20r, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm ), prob(1);list( - /obj/item/weapon/gun/projectile/automatic/p90, + /obj/item/gun/projectile/automatic/p90, /obj/item/ammo_magazine/m9mmp90 ), prob(3);list( - /obj/item/weapon/gun/projectile/automatic/combatsmg, + /obj/item/gun/projectile/automatic/combatsmg, /obj/item/ammo_magazine/m9mmt, /obj/item/ammo_magazine/m9mmt ) @@ -296,42 +296,42 @@ /obj/random/multiple/gun/projectile/rifle/item_to_spawn() return pick( prob(2);list( - /obj/item/weapon/gun/projectile/automatic/sts35, + /obj/item/gun/projectile/automatic/sts35, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545 ), prob(2);list( - /obj/item/weapon/gun/projectile/automatic/z8, + /obj/item/gun/projectile/automatic/z8, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762 ), prob(4);list( - /obj/item/weapon/gun/projectile/shotgun/pump/rifle, + /obj/item/gun/projectile/shotgun/pump/rifle, /obj/item/ammo_magazine/clip/c762, /obj/item/ammo_magazine/clip/c762 ), prob(3);list( - /obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever, + /obj/item/gun/projectile/shotgun/pump/rifle/lever, /obj/item/ammo_magazine/clip/c762, /obj/item/ammo_magazine/clip/c762 ), prob(1);list( - /obj/item/weapon/gun/projectile/garand, + /obj/item/gun/projectile/garand, /obj/item/ammo_magazine/m762enbloc, /obj/item/ammo_magazine/m762enbloc ), prob(1);list( - /obj/item/weapon/gun/projectile/revolvingrifle, + /obj/item/gun/projectile/revolvingrifle, /obj/item/ammo_magazine/s44/rifle, /obj/item/ammo_magazine/s44/rifle ), prob(1);list( - /obj/item/weapon/gun/projectile/automatic/bullpup, + /obj/item/gun/projectile/automatic/bullpup, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762 ), prob(1);list( - /obj/item/weapon/gun/projectile/caseless/prototype, + /obj/item/gun/projectile/caseless/prototype, /obj/item/ammo_magazine/m5mmcaseless, /obj/item/ammo_magazine/m5mmcaseless ) @@ -345,124 +345,124 @@ /obj/random/multiple/gun/projectile/handgun/item_to_spawn() return pick( prob(5);list( - /obj/item/weapon/gun/projectile/colt, + /obj/item/gun/projectile/colt, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45 ), prob(4);list( - /obj/item/weapon/gun/projectile/contender, + /obj/item/gun/projectile/contender, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357 ), prob(3);list( - /obj/item/weapon/gun/projectile/contender/tacticool, + /obj/item/gun/projectile/contender/tacticool, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357 ), prob(2);list( - /obj/item/weapon/gun/projectile/deagle, + /obj/item/gun/projectile/deagle, /obj/item/ammo_magazine/m44, /obj/item/ammo_magazine/m44 ), prob(1);list( - /obj/item/weapon/gun/projectile/deagle/camo, + /obj/item/gun/projectile/deagle/camo, /obj/item/ammo_magazine/m44, /obj/item/ammo_magazine/m44 ), prob(1);list( - /obj/item/weapon/gun/projectile/deagle/gold, + /obj/item/gun/projectile/deagle/gold, /obj/item/ammo_magazine/m44, /obj/item/ammo_magazine/m44 ), prob(4);list( - /obj/item/weapon/gun/projectile/derringer, + /obj/item/gun/projectile/derringer, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357 ), prob(5);list( - /obj/item/weapon/gun/projectile/luger, + /obj/item/gun/projectile/luger, /obj/item/ammo_magazine/m9mm/luger, /obj/item/ammo_magazine/m9mm/luger ), prob(4);list( - /obj/item/weapon/gun/projectile/luger/brown, + /obj/item/gun/projectile/luger/brown, /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact ), prob(5);list( - /obj/item/weapon/gun/projectile/sec, + /obj/item/gun/projectile/sec, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45 ), prob(4);list( - /obj/item/weapon/gun/projectile/sec/wood, + /obj/item/gun/projectile/sec/wood, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45 ), prob(5);list( - /obj/item/weapon/gun/projectile/p92x, + /obj/item/gun/projectile/p92x, /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm ), prob(4);list( - /obj/item/weapon/gun/projectile/p92x/brown, + /obj/item/gun/projectile/p92x/brown, /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm ), prob(2);list( - /obj/item/weapon/gun/projectile/p92x/large, + /obj/item/gun/projectile/p92x/large, /obj/item/ammo_magazine/m9mm/large, /obj/item/ammo_magazine/m9mm/large ), prob(5);list( - /obj/item/weapon/gun/projectile/pistol, + /obj/item/gun/projectile/pistol, /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact ), prob(2);list( - /obj/item/weapon/gun/projectile/silenced, + /obj/item/gun/projectile/silenced, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45 ), prob(2);list( - /obj/item/weapon/gun/projectile/revolver, + /obj/item/gun/projectile/revolver, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357 ), prob(4);list( - /obj/item/weapon/gun/projectile/revolver/deckard, + /obj/item/gun/projectile/revolver/deckard, /obj/item/ammo_magazine/s38, /obj/item/ammo_magazine/s38 ), prob(4);list( - /obj/item/weapon/gun/projectile/revolver/detective, + /obj/item/gun/projectile/revolver/detective, /obj/item/ammo_magazine/s38, /obj/item/ammo_magazine/s38 ), prob(2);list( - /obj/item/weapon/gun/projectile/revolver/judge, + /obj/item/gun/projectile/revolver/judge, /obj/item/ammo_magazine/clip/c12g, /obj/item/ammo_magazine/clip/c12g, /obj/item/ammo_magazine/clip/c12g ), prob(2);list( - /obj/item/weapon/gun/projectile/revolver/lemat, + /obj/item/gun/projectile/revolver/lemat, /obj/item/ammo_magazine/s38, /obj/item/ammo_magazine/s38, /obj/item/ammo_magazine/clip/c12g ), prob(2);list( - /obj/item/weapon/gun/projectile/revolver/mateba, + /obj/item/gun/projectile/revolver/mateba, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357 ), prob(2);list( - /obj/item/weapon/gun/projectile/revolver/webley, + /obj/item/gun/projectile/revolver/webley, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44 ), prob(1);list( - /obj/item/weapon/gun/projectile/revolver/consul, + /obj/item/gun/projectile/revolver/consul, /obj/item/ammo_magazine/s44/rubber, /obj/item/ammo_magazine/s44/rubber ) @@ -476,29 +476,29 @@ /obj/random/multiple/gun/projectile/shotgun/item_to_spawn() return pick( prob(4);list( - /obj/item/weapon/gun/projectile/shotgun/doublebarrel/pellet, + /obj/item/gun/projectile/shotgun/doublebarrel/pellet, /obj/item/ammo_magazine/clip/c12g/pellet, /obj/item/ammo_magazine/clip/c12g/pellet, /obj/item/ammo_magazine/clip/c12g/pellet, /obj/item/ammo_magazine/clip/c12g/pellet ), prob(3);list( - /obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn, + /obj/item/gun/projectile/shotgun/doublebarrel/sawn, /obj/item/ammo_magazine/clip/c12g/pellet, /obj/item/ammo_magazine/clip/c12g/pellet, /obj/item/ammo_magazine/clip/c12g/pellet, /obj/item/ammo_magazine/clip/c12g/pellet ), prob(3);list( - /obj/item/weapon/gun/projectile/shotgun/pump/slug, + /obj/item/gun/projectile/shotgun/pump/slug, /obj/item/ammo_magazine/ammo_box/b12g ), prob(1);list( - /obj/item/weapon/gun/projectile/shotgun/pump/combat, + /obj/item/gun/projectile/shotgun/pump/combat, /obj/item/ammo_magazine/ammo_box/b12g ), prob(1);list( - /obj/item/weapon/gun/projectile/shotgun/semi, + /obj/item/gun/projectile/shotgun/semi, /obj/item/ammo_magazine/ammo_box/b12g ) ) @@ -529,10 +529,10 @@ /obj/random/projectile/scrapped_shotgun/item_to_spawn() return pickweight(list( - /obj/item/weapon/broken_gun/pumpshotgun = 10, - /obj/item/weapon/broken_gun/pumpshotgun_combat = 5, - /obj/item/weapon/gun/projectile/shotgun/pump = 3, - /obj/item/weapon/gun/projectile/shotgun/pump/combat = 1 + /obj/item/broken_gun/pumpshotgun = 10, + /obj/item/broken_gun/pumpshotgun_combat = 5, + /obj/item/gun/projectile/shotgun/pump = 3, + /obj/item/gun/projectile/shotgun/pump/combat = 1 )) /obj/random/projectile/scrapped_smg @@ -542,8 +542,8 @@ /obj/random/projectile/scrapped_smg/item_to_spawn() return pickweight(list( - /obj/item/weapon/broken_gun/c20r = 10, - /obj/item/weapon/gun/projectile/automatic/c20r = 3 + /obj/item/broken_gun/c20r = 10, + /obj/item/gun/projectile/automatic/c20r = 3 )) /obj/random/projectile/scrapped_pistol @@ -553,8 +553,8 @@ /obj/random/projectile/scrapped_pistol/item_to_spawn() return pickweight(list( - /obj/item/weapon/broken_gun/silenced45 = 10, - /obj/item/weapon/gun/projectile/silenced = 3 + /obj/item/broken_gun/silenced45 = 10, + /obj/item/gun/projectile/silenced = 3 )) /obj/random/projectile/scrapped_laser @@ -564,10 +564,10 @@ /obj/random/projectile/scrapped_laser/item_to_spawn() return pickweight(list( - /obj/item/weapon/broken_gun/laserrifle = 10, - /obj/item/weapon/broken_gun/laser_retro = 5, - /obj/item/weapon/gun/energy/laser = 3, - /obj/item/weapon/gun/energy/retro = 1 + /obj/item/broken_gun/laserrifle = 10, + /obj/item/broken_gun/laser_retro = 5, + /obj/item/gun/energy/laser = 3, + /obj/item/gun/energy/retro = 1 )) /obj/random/projectile/scrapped_ionrifle @@ -577,8 +577,8 @@ /obj/random/projectile/scrapped_ionrifle/item_to_spawn() return pickweight(list( - /obj/item/weapon/broken_gun/ionrifle = 10, - /obj/item/weapon/gun/energy/ionrifle = 3 + /obj/item/broken_gun/ionrifle = 10, + /obj/item/gun/energy/ionrifle = 3 )) /obj/random/projectile/scrapped_bulldog @@ -588,8 +588,8 @@ /obj/random/projectile/scrapped_bulldog/item_to_spawn() return pickweight(list( - /obj/item/weapon/broken_gun/z8 = 10, - /obj/item/weapon/gun/projectile/automatic/z8 = 3 + /obj/item/broken_gun/z8 = 10, + /obj/item/gun/projectile/automatic/z8 = 3 )) /obj/random/projectile/scrapped_flechette @@ -599,8 +599,8 @@ /obj/random/projectile/scrapped_flechette/item_to_spawn() return pickweight(list( - /obj/item/weapon/broken_gun/flechette = 10, - /obj/item/weapon/gun/magnetic/railgun/flechette = 3 + /obj/item/broken_gun/flechette = 10, + /obj/item/gun/magnetic/railgun/flechette = 3 )) /obj/random/projectile/scrapped_grenadelauncher @@ -610,8 +610,8 @@ /obj/random/projectile/scrapped_grenadelauncher/item_to_spawn() return pickweight(list( - /obj/item/weapon/broken_gun/grenadelauncher = 10, - /obj/item/weapon/gun/launcher/grenade = 3 + /obj/item/broken_gun/grenadelauncher = 10, + /obj/item/gun/launcher/grenade = 3 )) /obj/random/projectile/scrapped_dartgun @@ -621,6 +621,6 @@ /obj/random/projectile/scrapped_dartgun/item_to_spawn() return pickweight(list( - /obj/item/weapon/broken_gun/dartgun = 10, - /obj/item/weapon/gun/projectile/dartgun = 3 + /obj/item/broken_gun/dartgun = 10, + /obj/item/gun/projectile/dartgun = 3 )) diff --git a/code/game/objects/random/maintenance.dm b/code/game/objects/random/maintenance.dm index 1d52205ed0e..bbf04a1bc8d 100644 --- a/code/game/objects/random/maintenance.dm +++ b/code/game/objects/random/maintenance.dm @@ -26,37 +26,37 @@ something, make sure it's not in one of the other lists.*/ /obj/random/maintenance/clean/item_to_spawn() return pick(prob(10);/obj/random/contraband, - prob(2);/obj/item/device/flashlight/flare, - prob(2);/obj/item/device/flashlight/glowstick, - prob(2);/obj/item/device/flashlight/glowstick/blue, - prob(1);/obj/item/device/flashlight/glowstick/orange, - prob(1);/obj/item/device/flashlight/glowstick/red, - prob(1);/obj/item/device/flashlight/glowstick/yellow, - prob(1);/obj/item/device/flashlight/pen, - prob(4);/obj/item/weapon/cell, - prob(4);/obj/item/weapon/cell/device, - prob(3);/obj/item/weapon/cell/high, - prob(2);/obj/item/weapon/cell/super, + prob(2);/obj/item/flashlight/flare, + prob(2);/obj/item/flashlight/glowstick, + prob(2);/obj/item/flashlight/glowstick/blue, + prob(1);/obj/item/flashlight/glowstick/orange, + prob(1);/obj/item/flashlight/glowstick/red, + prob(1);/obj/item/flashlight/glowstick/yellow, + prob(1);/obj/item/flashlight/pen, + prob(4);/obj/item/cell, + prob(4);/obj/item/cell/device, + prob(3);/obj/item/cell/high, + prob(2);/obj/item/cell/super, prob(5);/obj/random/cigarettes, prob(3);/obj/item/clothing/mask/gas, prob(2);/obj/item/clothing/mask/gas/half, prob(4);/obj/item/clothing/mask/breath, - prob(2);/obj/item/weapon/reagent_containers/glass/rag, - prob(4);/obj/item/weapon/reagent_containers/food/snacks/liquidfood, - prob(2);/obj/item/weapon/storage/secure/briefcase, - prob(4);/obj/item/weapon/storage/briefcase, - prob(5);/obj/item/weapon/storage/backpack, - prob(5);/obj/item/weapon/storage/backpack/satchel/norm, - prob(4);/obj/item/weapon/storage/backpack/satchel, - prob(3);/obj/item/weapon/storage/backpack/dufflebag, - prob(1);/obj/item/weapon/storage/backpack/dufflebag/syndie, - prob(5);/obj/item/weapon/storage/box, - prob(3);/obj/item/weapon/storage/box/donkpockets, - prob(2);/obj/item/weapon/storage/box/sinpockets, - prob(1);/obj/item/weapon/storage/box/cups, - prob(3);/obj/item/weapon/storage/box/mousetraps, - prob(3);/obj/item/weapon/storage/wallet, - prob(1);/obj/item/device/paicard, + prob(2);/obj/item/reagent_containers/glass/rag, + prob(4);/obj/item/reagent_containers/food/snacks/liquidfood, + prob(2);/obj/item/storage/secure/briefcase, + prob(4);/obj/item/storage/briefcase, + prob(5);/obj/item/storage/backpack, + prob(5);/obj/item/storage/backpack/satchel/norm, + prob(4);/obj/item/storage/backpack/satchel, + prob(3);/obj/item/storage/backpack/dufflebag, + prob(1);/obj/item/storage/backpack/dufflebag/syndie, + prob(5);/obj/item/storage/box, + prob(3);/obj/item/storage/box/donkpockets, + prob(2);/obj/item/storage/box/sinpockets, + prob(1);/obj/item/storage/box/cups, + prob(3);/obj/item/storage/box/mousetraps, + prob(3);/obj/item/storage/wallet, + prob(1);/obj/item/paicard, prob(2);/obj/item/clothing/shoes/galoshes, prob(1);/obj/item/clothing/shoes/syndigaloshes, prob(4);/obj/item/clothing/shoes/black, @@ -96,15 +96,15 @@ something, make sure it's not in one of the other lists.*/ prob(1);/obj/item/clothing/under/harness, prob(1);/obj/item/clothing/under/tactical, prob(3);/obj/item/clothing/accessory/storage/webbing, - prob(3);/obj/item/weapon/camera_assembly, + prob(3);/obj/item/camera_assembly, prob(4);/obj/item/clothing/suit/caution, prob(3);/obj/item/clothing/head/cone, - prob(1);/obj/item/weapon/card/emag_broken, - prob(2);/obj/item/device/camera, - prob(3);/obj/item/device/pda, - prob(3);/obj/item/device/radio/headset, + prob(1);/obj/item/card/emag_broken, + prob(2);/obj/item/camera, + prob(3);/obj/item/pda, + prob(3);/obj/item/radio/headset, /* VOREStation Edit Start */ - prob(3);/obj/item/weapon/toy/monster_bait, + prob(3);/obj/item/toy/monster_bait, prob(2);/obj/item/toy/tennis, prob(2);/obj/item/toy/tennis/red, prob(2);/obj/item/toy/tennis/yellow, @@ -114,8 +114,8 @@ something, make sure it's not in one of the other lists.*/ prob(2);/obj/item/toy/tennis/purple, prob(1);/obj/item/toy/baseball, prob(1);/obj/item/pizzavoucher, - prob(5);/obj/item/weapon/material/fishing_net/butterfly_net, - prob(2);/obj/item/weapon/cracker, + prob(5);/obj/item/material/fishing_net/butterfly_net, + prob(2);/obj/item/cracker, prob(5);/obj/random/mega_nukies, prob(1);/obj/random/potion_ingredient/plus /* VOREStation Edit End */ @@ -129,24 +129,24 @@ something, make sure it's not in one of the other lists.*/ /obj/random/maintenance/security/item_to_spawn() return pick(prob(320);/obj/random/maintenance/clean, - prob(2);/obj/item/device/flashlight/maglight, - prob(2);/obj/item/device/flash, - prob(1);/obj/item/weapon/cell/device/weapon, + prob(2);/obj/item/flashlight/maglight, + prob(2);/obj/item/flash, + prob(1);/obj/item/cell/device/weapon, prob(1);/obj/item/clothing/mask/gas/swat, prob(1);/obj/item/clothing/mask/gas/syndicate, prob(2);/obj/item/clothing/mask/balaclava, prob(1);/obj/item/clothing/mask/balaclava/tactical, - prob(3);/obj/item/weapon/storage/backpack/security, - prob(3);/obj/item/weapon/storage/backpack/satchel/sec, - prob(2);/obj/item/weapon/storage/backpack/messenger/sec, - prob(2);/obj/item/weapon/storage/backpack/dufflebag/sec, - prob(1);/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, - prob(1);/obj/item/weapon/storage/backpack/dufflebag/syndie/med, - prob(2);/obj/item/weapon/storage/box/swabs, - prob(2);/obj/item/weapon/storage/belt/security, - prob(1);/obj/item/weapon/grenade/flashbang, - prob(1);/obj/item/weapon/melee/baton, - prob(1);/obj/item/weapon/reagent_containers/spray/pepper, + prob(3);/obj/item/storage/backpack/security, + prob(3);/obj/item/storage/backpack/satchel/sec, + prob(2);/obj/item/storage/backpack/messenger/sec, + prob(2);/obj/item/storage/backpack/dufflebag/sec, + prob(1);/obj/item/storage/backpack/dufflebag/syndie/ammo, + prob(1);/obj/item/storage/backpack/dufflebag/syndie/med, + prob(2);/obj/item/storage/box/swabs, + prob(2);/obj/item/storage/belt/security, + prob(1);/obj/item/grenade/flashbang, + prob(1);/obj/item/melee/baton, + prob(1);/obj/item/reagent_containers/spray/pepper, prob(3);/obj/item/clothing/shoes/boots/jackboots, prob(1);/obj/item/clothing/shoes/boots/swat, prob(1);/obj/item/clothing/shoes/boots/combat, @@ -175,7 +175,7 @@ something, make sure it's not in one of the other lists.*/ prob(1);/obj/item/clothing/accessory/holster/waist, prob(1);/obj/item/clothing/accessory/holster/armpit, prob(2);/obj/item/clothing/ears/earmuffs, - prob(2);/obj/item/weapon/handcuffs,) + prob(2);/obj/item/handcuffs,) /obj/random/maintenance/medical /*Maintenance loot list. This one is for around medical areas*/ @@ -188,18 +188,18 @@ something, make sure it's not in one of the other lists.*/ prob(25);/obj/random/medical/lite, prob(2);/obj/item/clothing/mask/breath/medical, prob(2);/obj/item/clothing/mask/surgical, - prob(5);/obj/item/weapon/storage/backpack/medic, - prob(5);/obj/item/weapon/storage/backpack/satchel/med, - prob(5);/obj/item/weapon/storage/backpack/messenger/med, - prob(3);/obj/item/weapon/storage/backpack/dufflebag/med, - prob(1);/obj/item/weapon/storage/backpack/dufflebag/syndie/med, - prob(2);/obj/item/weapon/storage/box/autoinjectors, - prob(3);/obj/item/weapon/storage/box/beakers, - prob(2);/obj/item/weapon/storage/box/bodybags, - prob(3);/obj/item/weapon/storage/box/syringes, - prob(3);/obj/item/weapon/storage/box/gloves, - prob(2);/obj/item/weapon/storage/belt/medical/emt, - prob(2);/obj/item/weapon/storage/belt/medical, + prob(5);/obj/item/storage/backpack/medic, + prob(5);/obj/item/storage/backpack/satchel/med, + prob(5);/obj/item/storage/backpack/messenger/med, + prob(3);/obj/item/storage/backpack/dufflebag/med, + prob(1);/obj/item/storage/backpack/dufflebag/syndie/med, + prob(2);/obj/item/storage/box/autoinjectors, + prob(3);/obj/item/storage/box/beakers, + prob(2);/obj/item/storage/box/bodybags, + prob(3);/obj/item/storage/box/syringes, + prob(3);/obj/item/storage/box/gloves, + prob(2);/obj/item/storage/belt/medical/emt, + prob(2);/obj/item/storage/belt/medical, prob(1);/obj/item/clothing/shoes/boots/combat, prob(3);/obj/item/clothing/shoes/white, prob(2);/obj/item/clothing/gloves/sterile/nitrile, @@ -224,17 +224,17 @@ something, make sure it's not in one of the other lists.*/ /obj/random/maintenance/engineering/item_to_spawn() return pick(prob(320);/obj/random/maintenance/clean, - prob(2);/obj/item/device/flashlight/maglight, + prob(2);/obj/item/flashlight/maglight, prob(3);/obj/item/clothing/mask/gas/half, prob(2);/obj/item/clothing/mask/balaclava, - prob(2);/obj/item/weapon/storage/briefcase/inflatable, - prob(5);/obj/item/weapon/storage/backpack/industrial, - prob(5);/obj/item/weapon/storage/backpack/satchel/eng, - prob(5);/obj/item/weapon/storage/backpack/messenger/engi, - prob(3);/obj/item/weapon/storage/backpack/dufflebag/eng, - prob(5);/obj/item/weapon/storage/box, - prob(2);/obj/item/weapon/storage/belt/utility/full, - prob(3);/obj/item/weapon/storage/belt/utility, + prob(2);/obj/item/storage/briefcase/inflatable, + prob(5);/obj/item/storage/backpack/industrial, + prob(5);/obj/item/storage/backpack/satchel/eng, + prob(5);/obj/item/storage/backpack/messenger/engi, + prob(3);/obj/item/storage/backpack/dufflebag/eng, + prob(5);/obj/item/storage/box, + prob(2);/obj/item/storage/belt/utility/full, + prob(3);/obj/item/storage/belt/utility, prob(3);/obj/item/clothing/head/beret/engineering, prob(3);/obj/item/clothing/head/soft/yellow, prob(2);/obj/item/clothing/head/orangebandana, @@ -250,8 +250,8 @@ something, make sure it's not in one of the other lists.*/ prob(2);/obj/item/clothing/accessory/storage/brown_vest, prob(1);/obj/item/clothing/accessory/storage/brown_drop_pouches, prob(3);/obj/item/clothing/ears/earmuffs, - prob(1);/obj/item/weapon/beartrap, - prob(2);/obj/item/weapon/handcuffs) + prob(1);/obj/item/beartrap, + prob(2);/obj/item/handcuffs) /obj/random/maintenance/research /*Maintenance loot list. This one is for around medical areas*/ @@ -261,18 +261,18 @@ something, make sure it's not in one of the other lists.*/ /obj/random/maintenance/research/item_to_spawn() return pick(prob(320);/obj/random/maintenance/clean, - prob(3);/obj/item/device/analyzer/plant_analyzer, - prob(1);/obj/item/device/flash/synthetic, - prob(2);/obj/item/weapon/bucket_sensor, - prob(1);/obj/item/weapon/cell/device/weapon, - prob(5);/obj/item/weapon/storage/backpack/toxins, - prob(5);/obj/item/weapon/storage/backpack/satchel/tox, - prob(5);/obj/item/weapon/storage/backpack/messenger/tox, - prob(2);/obj/item/weapon/storage/excavation, - prob(1);/obj/item/weapon/storage/backpack/holding, - prob(3);/obj/item/weapon/storage/box/beakers, - prob(3);/obj/item/weapon/storage/box/syringes, - prob(3);/obj/item/weapon/storage/box/gloves, + prob(3);/obj/item/analyzer/plant_analyzer, + prob(1);/obj/item/flash/synthetic, + prob(2);/obj/item/bucket_sensor, + prob(1);/obj/item/cell/device/weapon, + prob(5);/obj/item/storage/backpack/toxins, + prob(5);/obj/item/storage/backpack/satchel/tox, + prob(5);/obj/item/storage/backpack/messenger/tox, + prob(2);/obj/item/storage/excavation, + prob(1);/obj/item/storage/backpack/holding, + prob(3);/obj/item/storage/box/beakers, + prob(3);/obj/item/storage/box/syringes, + prob(3);/obj/item/storage/box/gloves, prob(2);/obj/item/clothing/gloves/sterile/latex, prob(4);/obj/item/clothing/glasses/science, prob(3);/obj/item/clothing/glasses/material, @@ -291,18 +291,18 @@ something, make sure it's not in one of the other lists.*/ /obj/random/maintenance/cargo/item_to_spawn() return pick(prob(320);/obj/random/maintenance/clean, - prob(3);/obj/item/device/flashlight/lantern, - prob(4);/obj/item/weapon/pickaxe, - prob(3);/obj/item/weapon/pickaxe/drill, - prob(5);/obj/item/weapon/storage/backpack/industrial, - prob(5);/obj/item/weapon/storage/backpack/satchel/norm, - prob(3);/obj/item/weapon/storage/backpack/dufflebag, - prob(1);/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, - prob(1);/obj/item/weapon/storage/toolbox/syndicate, - prob(1);/obj/item/weapon/storage/belt/utility/full, - prob(2);/obj/item/weapon/storage/belt/utility, - prob(4);/obj/item/device/toner, - prob(1);/obj/item/device/destTagger, + prob(3);/obj/item/flashlight/lantern, + prob(4);/obj/item/pickaxe, + prob(3);/obj/item/pickaxe/drill, + prob(5);/obj/item/storage/backpack/industrial, + prob(5);/obj/item/storage/backpack/satchel/norm, + prob(3);/obj/item/storage/backpack/dufflebag, + prob(1);/obj/item/storage/backpack/dufflebag/syndie/ammo, + prob(1);/obj/item/storage/toolbox/syndicate, + prob(1);/obj/item/storage/belt/utility/full, + prob(2);/obj/item/storage/belt/utility, + prob(4);/obj/item/toner, + prob(1);/obj/item/destTagger, prob(3);/obj/item/clothing/glasses/material, prob(3);/obj/item/clothing/head/soft/yellow, prob(4);/obj/item/clothing/suit/storage/hazardvest, @@ -313,5 +313,5 @@ something, make sure it's not in one of the other lists.*/ prob(2);/obj/item/clothing/accessory/storage/black_vest, prob(2);/obj/item/clothing/accessory/storage/brown_vest, prob(3);/obj/item/clothing/ears/earmuffs, - prob(1);/obj/item/weapon/beartrap, - prob(2);/obj/item/weapon/handcuffs,) + prob(1);/obj/item/beartrap, + prob(2);/obj/item/handcuffs,) diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm index 2c93fa99edd..3496fe8bb01 100644 --- a/code/game/objects/random/mapping.dm +++ b/code/game/objects/random/mapping.dm @@ -172,42 +172,42 @@ desc = "This is a random can of (legal) Nukies Energy Drink." /obj/random/nukies_can_legal/item_to_spawn() - return pick(/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_peach, - /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_pear, - /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_cherry, - /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_melon, - /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_banana, - /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_rose, - /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_lemon, - /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_fruit, - /obj/item/weapon/reagent_containers/food/drinks/cans/nukie_special) + return pick(/obj/item/reagent_containers/food/drinks/cans/nukie_peach, + /obj/item/reagent_containers/food/drinks/cans/nukie_pear, + /obj/item/reagent_containers/food/drinks/cans/nukie_cherry, + /obj/item/reagent_containers/food/drinks/cans/nukie_melon, + /obj/item/reagent_containers/food/drinks/cans/nukie_banana, + /obj/item/reagent_containers/food/drinks/cans/nukie_rose, + /obj/item/reagent_containers/food/drinks/cans/nukie_lemon, + /obj/item/reagent_containers/food/drinks/cans/nukie_fruit, + /obj/item/reagent_containers/food/drinks/cans/nukie_special) /obj/random/desatti_snacks name = "Random Desatti Snacks" desc = "This is a random Desatti Catering snack." /obj/random/desatti_snacks/item_to_spawn() - return pick(/obj/item/weapon/storage/box/jaffacake, - /obj/item/weapon/storage/box/winegum, - /obj/item/weapon/storage/box/saucer, - /obj/item/weapon/storage/box/shrimpsandbananas, - /obj/item/weapon/storage/box/rhubarbcustard, - /obj/item/weapon/storage/box/custardcream, - /obj/item/weapon/storage/box/bourbon, - /obj/item/weapon/reagent_containers/food/snacks/packaged/sausageroll, - /obj/item/weapon/reagent_containers/food/snacks/packaged/pasty, - /obj/item/weapon/reagent_containers/food/snacks/packaged/scotchegg, - /obj/item/weapon/reagent_containers/food/snacks/packaged/porkpie) + return pick(/obj/item/storage/box/jaffacake, + /obj/item/storage/box/winegum, + /obj/item/storage/box/saucer, + /obj/item/storage/box/shrimpsandbananas, + /obj/item/storage/box/rhubarbcustard, + /obj/item/storage/box/custardcream, + /obj/item/storage/box/bourbon, + /obj/item/reagent_containers/food/snacks/packaged/sausageroll, + /obj/item/reagent_containers/food/snacks/packaged/pasty, + /obj/item/reagent_containers/food/snacks/packaged/scotchegg, + /obj/item/reagent_containers/food/snacks/packaged/porkpie) /obj/random_multi/single_item/captains_spare_id name = "Multi Point - Captain's Spare" id = "Captain's spare id" - item_path = /obj/item/weapon/card/id/gold/captain/spare + item_path = /obj/item/card/id/gold/captain/spare /obj/random_multi/single_item/hand_tele name = "Multi Point - Hand Teleporter" id = "hand tele" - item_path = /obj/item/weapon/hand_tele + item_path = /obj/item/hand_tele /obj/random_multi/single_item/sfr_headset name = "Multi Point - headset" @@ -222,10 +222,10 @@ icon_state = "rup" /obj/random/sfr/item_to_spawn() - return pick(prob(25);/obj/item/device/radio/headset/heads/captain/sfr, - prob(25);/obj/item/device/radio/headset/headset_cargo/alt, - prob(25);/obj/item/device/radio/headset/headset_com/alt, - prob(25);/obj/item/device/radio/headset) + return pick(prob(25);/obj/item/radio/headset/heads/captain/sfr, + prob(25);/obj/item/radio/headset/headset_cargo/alt, + prob(25);/obj/item/radio/headset/headset_com/alt, + prob(25);/obj/item/radio/headset) // Mining Goodies /obj/random/multiple/minevault @@ -238,73 +238,73 @@ return pick( prob(5);list( /obj/item/clothing/mask/smokable/pipe, - /obj/item/weapon/reagent_containers/food/drinks/bottle/rum, - /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, - /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, - /obj/item/weapon/flame/lighter/zippo, + /obj/item/reagent_containers/food/drinks/bottle/rum, + /obj/item/reagent_containers/food/drinks/bottle/whiskey, + /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, + /obj/item/flame/lighter/zippo, /obj/structure/closet/crate/hydroponics ), prob(5);list( - /obj/item/weapon/pickaxe, + /obj/item/pickaxe, /obj/item/clothing/under/rank/miner, /obj/item/clothing/head/hardhat, /obj/structure/closet/crate/engineering ), prob(5);list( - /obj/item/weapon/pickaxe/drill, + /obj/item/pickaxe/drill, /obj/item/clothing/suit/space/void/mining, /obj/item/clothing/head/helmet/space/void/mining, /obj/structure/closet/crate/engineering ), prob(5);list( - /obj/item/weapon/pickaxe/advdrill, + /obj/item/pickaxe/advdrill, /obj/item/clothing/suit/space/void/mining/alt, /obj/item/clothing/head/helmet/space/void/mining/alt, /obj/structure/closet/crate/engineering ), prob(5);list( - /obj/item/weapon/reagent_containers/glass/beaker/bluespace, - /obj/item/weapon/reagent_containers/glass/beaker/bluespace, - /obj/item/weapon/reagent_containers/glass/beaker/bluespace, + /obj/item/reagent_containers/glass/beaker/bluespace, + /obj/item/reagent_containers/glass/beaker/bluespace, + /obj/item/reagent_containers/glass/beaker/bluespace, /obj/structure/closet/crate/science ), prob(5);list( - /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/weapon/ore/gold, - /obj/item/weapon/ore/gold, - /obj/item/weapon/ore/gold, - /obj/item/weapon/ore/gold, - /obj/item/weapon/ore/gold, - /obj/item/weapon/ore/gold, - /obj/item/weapon/ore/gold, - /obj/item/weapon/ore/gold, - /obj/item/weapon/ore/gold, - /obj/item/weapon/ore/gold, + /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, + /obj/item/ore/gold, + /obj/item/ore/gold, + /obj/item/ore/gold, + /obj/item/ore/gold, + /obj/item/ore/gold, + /obj/item/ore/gold, + /obj/item/ore/gold, + /obj/item/ore/gold, + /obj/item/ore/gold, + /obj/item/ore/gold, /obj/structure/closet/crate/engineering ), prob(5);list( - /obj/item/weapon/pickaxe, + /obj/item/pickaxe, /obj/item/clothing/glasses/material, /obj/structure/ore_box, /obj/structure/closet/crate ), prob(5);list( - /obj/item/weapon/reagent_containers/glass/beaker/noreact, - /obj/item/weapon/reagent_containers/glass/beaker/noreact, - /obj/item/weapon/reagent_containers/glass/beaker/noreact, + /obj/item/reagent_containers/glass/beaker/noreact, + /obj/item/reagent_containers/glass/beaker/noreact, + /obj/item/reagent_containers/glass/beaker/noreact, /obj/structure/closet/crate/science ), prob(5);list( - /obj/item/weapon/storage/secure/briefcase/money, + /obj/item/storage/secure/briefcase/money, /obj/structure/closet/crate/freezer/rations ), prob(5);list( @@ -317,10 +317,10 @@ /obj/structure/closet/crate ), prob(5);list( - /obj/item/weapon/melee/baton, - /obj/item/weapon/melee/baton, - /obj/item/weapon/melee/baton, - /obj/item/weapon/melee/baton, + /obj/item/melee/baton, + /obj/item/melee/baton, + /obj/item/melee/baton, + /obj/item/melee/baton, /obj/structure/closet/crate ), prob(5);list( @@ -329,10 +329,10 @@ /obj/structure/closet/crate ), prob(2);list( - /obj/item/weapon/melee/baton/cattleprod, - /obj/item/weapon/melee/baton/cattleprod, - /obj/item/weapon/cell/high, - /obj/item/weapon/cell/high, + /obj/item/melee/baton/cattleprod, + /obj/item/melee/baton/cattleprod, + /obj/item/cell/high, + /obj/item/cell/high, /obj/structure/closet/crate ), prob(2);list( @@ -346,8 +346,8 @@ /obj/structure/closet/crate ), prob(2);list( - /obj/item/weapon/rig/industrial/equipped, - /obj/item/weapon/storage/bag/ore, + /obj/item/rig/industrial/equipped, + /obj/item/storage/bag/ore, /obj/structure/closet/crate/engineering ), prob(2);list( @@ -375,8 +375,8 @@ /obj/item/clothing/head/helmet/space/syndicate/black/red, /obj/item/clothing/suit/space/syndicate/black/red, /obj/item/clothing/head/helmet/space/syndicate/black/red, - /obj/item/weapon/gun/projectile/automatic/mini_uzi, - /obj/item/weapon/gun/projectile/automatic/mini_uzi, + /obj/item/gun/projectile/automatic/mini_uzi, + /obj/item/gun/projectile/automatic/mini_uzi, /obj/item/ammo_magazine/m45uzi, /obj/item/ammo_magazine/m45uzi, /obj/item/ammo_magazine/m45uzi/empty, @@ -386,14 +386,14 @@ prob(2);list( /obj/item/clothing/suit/ianshirt, /obj/item/clothing/suit/ianshirt, - /obj/item/weapon/bedsheet/ian, + /obj/item/bedsheet/ian, /obj/structure/closet/crate/plastic ), prob(2);list( /obj/item/clothing/suit/armor/vest, /obj/item/clothing/suit/armor/vest, - /obj/item/weapon/gun/projectile/garand, - /obj/item/weapon/gun/projectile/garand, + /obj/item/gun/projectile/garand, + /obj/item/gun/projectile/garand, /obj/item/ammo_magazine/m762enbloc, /obj/item/ammo_magazine/m762enbloc, /obj/structure/closet/crate/plastic @@ -405,63 +405,63 @@ /obj/mecha/working/hoverpod/combatpod ), prob(2);list( - /obj/item/weapon/pickaxe/silver, - /obj/item/weapon/storage/bag/ore, + /obj/item/pickaxe/silver, + /obj/item/storage/bag/ore, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( - /obj/item/weapon/pickaxe/advdrill, - /obj/item/weapon/storage/bag/ore, + /obj/item/pickaxe/advdrill, + /obj/item/storage/bag/ore, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( - /obj/item/weapon/pickaxe/jackhammer, - /obj/item/weapon/storage/bag/ore, + /obj/item/pickaxe/jackhammer, + /obj/item/storage/bag/ore, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( - /obj/item/weapon/pickaxe/diamond, - /obj/item/weapon/storage/bag/ore, + /obj/item/pickaxe/diamond, + /obj/item/storage/bag/ore, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( - /obj/item/weapon/pickaxe/diamonddrill, - /obj/item/weapon/storage/bag/ore, + /obj/item/pickaxe/diamonddrill, + /obj/item/storage/bag/ore, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( - /obj/item/weapon/pickaxe/gold, - /obj/item/weapon/storage/bag/ore, + /obj/item/pickaxe/gold, + /obj/item/storage/bag/ore, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( - /obj/item/weapon/pickaxe/plasmacutter, - /obj/item/weapon/storage/bag/ore, + /obj/item/pickaxe/plasmacutter, + /obj/item/storage/bag/ore, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( - /obj/item/weapon/material/sword/katana, - /obj/item/weapon/material/sword/katana, + /obj/item/material/sword/katana, + /obj/item/material/sword/katana, /obj/structure/closet/crate ), prob(2);list( - /obj/item/weapon/material/sword, - /obj/item/weapon/material/sword, + /obj/item/material/sword, + /obj/item/material/sword, /obj/structure/closet/crate ), prob(1);list( /obj/item/clothing/mask/balaclava, - /obj/item/weapon/material/star, - /obj/item/weapon/material/star, - /obj/item/weapon/material/star, - /obj/item/weapon/material/star, + /obj/item/material/star, + /obj/item/material/star, + /obj/item/material/star, + /obj/item/material/star, /obj/structure/closet/crate ), prob(1);list( @@ -473,65 +473,65 @@ /obj/item/clothing/head/bearpelt, /obj/item/clothing/under/soviet, /obj/item/clothing/under/soviet, - /obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial, - /obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial, + /obj/item/gun/projectile/shotgun/pump/rifle/ceremonial, + /obj/item/gun/projectile/shotgun/pump/rifle/ceremonial, /obj/structure/closet/crate ), prob(1);list( - /obj/item/weapon/gun/projectile/revolver/detective, - /obj/item/weapon/gun/projectile/contender, - /obj/item/weapon/gun/projectile/p92x, - /obj/item/weapon/gun/projectile/derringer, + /obj/item/gun/projectile/revolver/detective, + /obj/item/gun/projectile/contender, + /obj/item/gun/projectile/p92x, + /obj/item/gun/projectile/derringer, /obj/structure/closet/crate ), prob(1);list( - /obj/item/weapon/melee/cultblade, + /obj/item/melee/cultblade, /obj/item/clothing/suit/cultrobes, /obj/item/clothing/head/culthood, - /obj/item/device/soulstone, + /obj/item/soulstone, /obj/structure/closet/crate ), prob(1);list( - /obj/item/weapon/vampiric, - /obj/item/weapon/vampiric, + /obj/item/vampiric, + /obj/item/vampiric, /obj/structure/closet/crate/science ), prob(1);list( - /obj/item/weapon/archaeological_find + /obj/item/archaeological_find ), prob(1);list( - /obj/item/weapon/melee/energy/sword, - /obj/item/weapon/melee/energy/sword, - /obj/item/weapon/melee/energy/sword, - /obj/item/weapon/shield/energy, - /obj/item/weapon/shield/energy, + /obj/item/melee/energy/sword, + /obj/item/melee/energy/sword, + /obj/item/melee/energy/sword, + /obj/item/shield/energy, + /obj/item/shield/energy, /obj/structure/closet/crate/science ), prob(1);list( - /obj/item/weapon/storage/backpack/clown, + /obj/item/storage/backpack/clown, /obj/item/clothing/under/rank/clown, /obj/item/clothing/shoes/clown_shoes, - /obj/item/device/pda/clown, + /obj/item/pda/clown, /obj/item/clothing/mask/gas/clown_hat, - /obj/item/weapon/bikehorn, - /obj/item/weapon/reagent_containers/spray/waterflower, - /obj/item/weapon/pen/crayon/rainbow, + /obj/item/bikehorn, + /obj/item/reagent_containers/spray/waterflower, + /obj/item/pen/crayon/rainbow, /obj/structure/closet/crate ), prob(1);list( /obj/item/clothing/under/mime, /obj/item/clothing/shoes/black, - /obj/item/device/pda/mime, + /obj/item/pda/mime, /obj/item/clothing/gloves/white, /obj/item/clothing/mask/gas/mime, /obj/item/clothing/head/beret, /obj/item/clothing/suit/suspenders, - /obj/item/weapon/pen/crayon/mime, - /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing, + /obj/item/pen/crayon/mime, + /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing, /obj/structure/closet/crate ), prob(1);list( - /obj/item/weapon/storage/belt/champion, + /obj/item/storage/belt/champion, /obj/item/clothing/mask/luchador, /obj/item/clothing/mask/luchador/rudos, /obj/item/clothing/mask/luchador/tecnicos, @@ -558,143 +558,143 @@ /obj/random/multiple/ore_pile/item_to_spawn() return pick( /*prob(10);list( - /obj/item/weapon/ore/bauxite, - /obj/item/weapon/ore/bauxite, - /obj/item/weapon/ore/bauxite, - /obj/item/weapon/ore/bauxite, - /obj/item/weapon/ore/bauxite, - /obj/item/weapon/ore/bauxite, - /obj/item/weapon/ore/bauxite, - /obj/item/weapon/ore/bauxite, - /obj/item/weapon/ore/bauxite, - /obj/item/weapon/ore/bauxite + /obj/item/ore/bauxite, + /obj/item/ore/bauxite, + /obj/item/ore/bauxite, + /obj/item/ore/bauxite, + /obj/item/ore/bauxite, + /obj/item/ore/bauxite, + /obj/item/ore/bauxite, + /obj/item/ore/bauxite, + /obj/item/ore/bauxite, + /obj/item/ore/bauxite ),*/ prob(10);list( - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal + /obj/item/ore/coal, + /obj/item/ore/coal, + /obj/item/ore/coal, + /obj/item/ore/coal, + /obj/item/ore/coal, + /obj/item/ore/coal, + /obj/item/ore/coal, + /obj/item/ore/coal, + /obj/item/ore/coal, + /obj/item/ore/coal ), /*prob(10);list( - /obj/item/weapon/ore/copper, - /obj/item/weapon/ore/copper, - /obj/item/weapon/ore/copper, - /obj/item/weapon/ore/copper, - /obj/item/weapon/ore/copper, - /obj/item/weapon/ore/copper, - /obj/item/weapon/ore/copper, - /obj/item/weapon/ore/copper, - /obj/item/weapon/ore/copper, - /obj/item/weapon/ore/copper + /obj/item/ore/copper, + /obj/item/ore/copper, + /obj/item/ore/copper, + /obj/item/ore/copper, + /obj/item/ore/copper, + /obj/item/ore/copper, + /obj/item/ore/copper, + /obj/item/ore/copper, + /obj/item/ore/copper, + /obj/item/ore/copper ),*/ prob(3);list( - /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 ), prob(15);list( - /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/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/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/glass, + /obj/item/ore/glass, + /obj/item/ore/glass, + /obj/item/ore/glass, + /obj/item/ore/glass, + /obj/item/ore/glass ), prob(5);list( - /obj/item/weapon/ore/gold, - /obj/item/weapon/ore/gold, - /obj/item/weapon/ore/gold, - /obj/item/weapon/ore/gold, - /obj/item/weapon/ore/gold + /obj/item/ore/gold, + /obj/item/ore/gold, + /obj/item/ore/gold, + /obj/item/ore/gold, + /obj/item/ore/gold ), prob(2);list( - /obj/item/weapon/ore/hydrogen, - /obj/item/weapon/ore/hydrogen + /obj/item/ore/hydrogen, + /obj/item/ore/hydrogen ), prob(10);list( - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron + /obj/item/ore/iron, + /obj/item/ore/iron, + /obj/item/ore/iron, + /obj/item/ore/iron, + /obj/item/ore/iron, + /obj/item/ore/iron, + /obj/item/ore/iron, + /obj/item/ore/iron, + /obj/item/ore/iron, + /obj/item/ore/iron ), prob(10);list( - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead + /obj/item/ore/lead, + /obj/item/ore/lead, + /obj/item/ore/lead, + /obj/item/ore/lead, + /obj/item/ore/lead, + /obj/item/ore/lead, + /obj/item/ore/lead, + /obj/item/ore/lead, + /obj/item/ore/lead, + /obj/item/ore/lead ), prob(5);list( - /obj/item/weapon/ore/marble, - /obj/item/weapon/ore/marble, - /obj/item/weapon/ore/marble, - /obj/item/weapon/ore/marble, - /obj/item/weapon/ore/marble + /obj/item/ore/marble, + /obj/item/ore/marble, + /obj/item/ore/marble, + /obj/item/ore/marble, + /obj/item/ore/marble ), prob(3);list( - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium + /obj/item/ore/osmium, + /obj/item/ore/osmium, + /obj/item/ore/osmium ), prob(5);list( - /obj/item/weapon/ore/phoron, - /obj/item/weapon/ore/phoron, - /obj/item/weapon/ore/phoron, - /obj/item/weapon/ore/phoron, - /obj/item/weapon/ore/phoron + /obj/item/ore/phoron, + /obj/item/ore/phoron, + /obj/item/ore/phoron, + /obj/item/ore/phoron, + /obj/item/ore/phoron ), prob(5);list( - /obj/item/weapon/ore/rutile, - /obj/item/weapon/ore/rutile, - /obj/item/weapon/ore/rutile, - /obj/item/weapon/ore/rutile, - /obj/item/weapon/ore/rutile + /obj/item/ore/rutile, + /obj/item/ore/rutile, + /obj/item/ore/rutile, + /obj/item/ore/rutile, + /obj/item/ore/rutile ), prob(5);list( - /obj/item/weapon/ore/silver, - /obj/item/weapon/ore/silver, - /obj/item/weapon/ore/silver, - /obj/item/weapon/ore/silver, - /obj/item/weapon/ore/silver + /obj/item/ore/silver, + /obj/item/ore/silver, + /obj/item/ore/silver, + /obj/item/ore/silver, + /obj/item/ore/silver ), prob(3);list( - /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 ), prob(2);list( - /obj/item/weapon/ore/verdantium, - /obj/item/weapon/ore/verdantium + /obj/item/ore/verdantium, + /obj/item/ore/verdantium ),/* prob(2);list( - /obj/item/weapon/ore/void_opal, - /obj/item/weapon/ore/void_opal + /obj/item/ore/void_opal, + /obj/item/ore/void_opal ),*/ ) @@ -749,11 +749,11 @@ /obj/structure/closet/crate/freezer/centauri //CENTAURI SNACKS ), prob(10);list( - /obj/item/weapon/storage/box/donkpockets, - /obj/item/weapon/storage/box/donkpockets, - /obj/item/weapon/storage/box/donkpockets, - /obj/item/weapon/storage/box/donkpockets, - /obj/item/weapon/storage/box/donkpockets, + /obj/item/storage/box/donkpockets, + /obj/item/storage/box/donkpockets, + /obj/item/storage/box/donkpockets, + /obj/item/storage/box/donkpockets, + /obj/item/storage/box/donkpockets, /obj/structure/closet/crate/freezer/centauri //CENTAURI DONK-POCKETS ), prob(10);list( @@ -764,16 +764,16 @@ /obj/structure/closet/crate/einstein //EINSTEIN BATTERYPACK ), prob(5);list( - /obj/item/weapon/circuitboard/smes, + /obj/item/circuitboard/smes, /obj/random/smes_coil, /obj/random/smes_coil, /obj/structure/closet/crate/focalpoint //FOCAL SMES ), prob(10);list( - /obj/item/weapon/module/power_control, + /obj/item/module/power_control, /obj/item/stack/cable_coil, /obj/item/frame/apc, - /obj/item/weapon/cell/apc, + /obj/item/cell/apc, /obj/structure/closet/crate/focalpoint //FOCAL APC ), prob(5);list( @@ -810,10 +810,10 @@ prob(2);list( /obj/random/energy, /obj/random/energy, - /obj/item/weapon/cell/device/weapon, - /obj/item/weapon/cell/device/weapon, - /obj/item/weapon/cell/device/weapon, - /obj/item/weapon/cell/device/weapon, + /obj/item/cell/device/weapon, + /obj/item/cell/device/weapon, + /obj/item/cell/device/weapon, + /obj/item/cell/device/weapon, /obj/structure/closet/crate/secure/heph //HEPHAESTUS ENERGY ), prob(1);list( @@ -860,7 +860,7 @@ prob(5);list( /obj/item/clothing/suit/space/void/salvagecorp_shipbreaker, /obj/item/clothing/head/helmet/space/void/salvagecorp_shipbreaker, - /obj/item/weapon/tank/jetpack/breaker, + /obj/item/tank/jetpack/breaker, /obj/structure/closet/crate/coyote_salvage //CSC SUIT ), prob(10);list( @@ -915,63 +915,63 @@ /obj/structure/closet/crate/freezer/zenghu //ZENGHU PILLS ), prob(10);list( - /obj/item/device/toner, - /obj/item/device/toner, - /obj/item/device/toner, - /obj/item/weapon/clipboard, - /obj/item/weapon/clipboard, - /obj/item/weapon/pen/red, - /obj/item/weapon/pen/blue, - /obj/item/weapon/pen/blue, - /obj/item/device/camera_film, - /obj/item/weapon/folder/blue, - /obj/item/weapon/folder/red, - /obj/item/weapon/folder/yellow, - /obj/item/weapon/hand_labeler, - /obj/item/weapon/tape_roll, - /obj/item/weapon/paper_bin, + /obj/item/toner, + /obj/item/toner, + /obj/item/toner, + /obj/item/clipboard, + /obj/item/clipboard, + /obj/item/pen/red, + /obj/item/pen/blue, + /obj/item/pen/blue, + /obj/item/camera_film, + /obj/item/folder/blue, + /obj/item/folder/red, + /obj/item/folder/yellow, + /obj/item/hand_labeler, + /obj/item/tape_roll, + /obj/item/paper_bin, /obj/item/sticky_pad/random, /obj/structure/closet/crate/ummarcar //UMMARCAR OFFICE TRASH ), prob(5);list( - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, /obj/structure/closet/crate/unathi //UNAJERKY ), prob(10);list( - /obj/item/weapon/reagent_containers/glass/bucket, - /obj/item/weapon/mop, + /obj/item/reagent_containers/glass/bucket, + /obj/item/mop, /obj/item/clothing/under/rank/janitor, - /obj/item/weapon/cartridge/janitor, + /obj/item/cartridge/janitor, /obj/item/clothing/gloves/black, /obj/item/clothing/head/soft/purple, - /obj/item/weapon/storage/belt/janitor, + /obj/item/storage/belt/janitor, /obj/item/clothing/shoes/galoshes, /obj/item/clothing/glasses/hud/janitor, - /obj/item/weapon/storage/bag/trash, - /obj/item/device/lightreplacer, - /obj/item/weapon/reagent_containers/spray/cleaner, - /obj/item/weapon/reagent_containers/glass/rag, - /obj/item/weapon/grenade/chem_grenade/cleaner, - /obj/item/weapon/grenade/chem_grenade/cleaner, - /obj/item/weapon/grenade/chem_grenade/cleaner, + /obj/item/storage/bag/trash, + /obj/item/lightreplacer, + /obj/item/reagent_containers/spray/cleaner, + /obj/item/reagent_containers/glass/rag, + /obj/item/grenade/chem_grenade/cleaner, + /obj/item/grenade/chem_grenade/cleaner, + /obj/item/grenade/chem_grenade/cleaner, /obj/structure/closet/crate/galaksi //GALAKSI JANITOR SUPPLIES ), prob(5);list( - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, /obj/structure/closet/crate/allico //GUMMIES ), prob(5);list( @@ -993,8 +993,8 @@ /obj/structure/closet/crate/desatti //DESATTI SNACKI ), prob(2);list( - /obj/item/weapon/tank/phoron/pressurized, - /obj/item/weapon/tank/phoron/pressurized, + /obj/item/tank/phoron/pressurized, + /obj/item/tank/phoron/pressurized, /obj/structure/closet/crate/secure/phoron //HQ FUEL TANKS ), prob(1);list( @@ -1093,16 +1093,16 @@ /obj/structure/closet/crate/einstein //EINSTEIN BATTERYPACK ), prob(5);list( - /obj/item/weapon/circuitboard/smes, + /obj/item/circuitboard/smes, /obj/random/smes_coil, /obj/random/smes_coil, /obj/structure/closet/crate/focalpoint //FOCAL SMES ), prob(10);list( - /obj/item/weapon/module/power_control, + /obj/item/module/power_control, /obj/item/stack/cable_coil, /obj/item/frame/apc, - /obj/item/weapon/cell/apc, + /obj/item/cell/apc, /obj/structure/closet/crate/focalpoint //FOCAL APC ), prob(5);list( @@ -1163,7 +1163,7 @@ prob(5);list( /obj/item/clothing/suit/space/void/salvagecorp_shipbreaker, /obj/item/clothing/head/helmet/space/void/salvagecorp_shipbreaker, - /obj/item/weapon/tank/jetpack/breaker, + /obj/item/tank/jetpack/breaker, /obj/structure/closet/crate/coyote_salvage //CSC SUIT ), prob(10);list( @@ -1218,63 +1218,63 @@ /obj/structure/closet/crate/freezer/zenghu //ZENGHU PILLS ), prob(10);list( - /obj/item/device/toner, - /obj/item/device/toner, - /obj/item/device/toner, - /obj/item/weapon/clipboard, - /obj/item/weapon/clipboard, - /obj/item/weapon/pen/red, - /obj/item/weapon/pen/blue, - /obj/item/weapon/pen/blue, - /obj/item/device/camera_film, - /obj/item/weapon/folder/blue, - /obj/item/weapon/folder/red, - /obj/item/weapon/folder/yellow, - /obj/item/weapon/hand_labeler, - /obj/item/weapon/tape_roll, - /obj/item/weapon/paper_bin, + /obj/item/toner, + /obj/item/toner, + /obj/item/toner, + /obj/item/clipboard, + /obj/item/clipboard, + /obj/item/pen/red, + /obj/item/pen/blue, + /obj/item/pen/blue, + /obj/item/camera_film, + /obj/item/folder/blue, + /obj/item/folder/red, + /obj/item/folder/yellow, + /obj/item/hand_labeler, + /obj/item/tape_roll, + /obj/item/paper_bin, /obj/item/sticky_pad/random, /obj/structure/closet/crate/ummarcar //UMMARCAR OFFICE TRASH ), prob(5);list( - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, /obj/structure/closet/crate/unathi //UNAJERKY ), prob(10);list( - /obj/item/weapon/reagent_containers/glass/bucket, - /obj/item/weapon/mop, + /obj/item/reagent_containers/glass/bucket, + /obj/item/mop, /obj/item/clothing/under/rank/janitor, - /obj/item/weapon/cartridge/janitor, + /obj/item/cartridge/janitor, /obj/item/clothing/gloves/black, /obj/item/clothing/head/soft/purple, - /obj/item/weapon/storage/belt/janitor, + /obj/item/storage/belt/janitor, /obj/item/clothing/shoes/galoshes, /obj/item/clothing/glasses/hud/janitor, - /obj/item/weapon/storage/bag/trash, - /obj/item/device/lightreplacer, - /obj/item/weapon/reagent_containers/spray/cleaner, - /obj/item/weapon/reagent_containers/glass/rag, - /obj/item/weapon/grenade/chem_grenade/cleaner, - /obj/item/weapon/grenade/chem_grenade/cleaner, - /obj/item/weapon/grenade/chem_grenade/cleaner, + /obj/item/storage/bag/trash, + /obj/item/lightreplacer, + /obj/item/reagent_containers/spray/cleaner, + /obj/item/reagent_containers/glass/rag, + /obj/item/grenade/chem_grenade/cleaner, + /obj/item/grenade/chem_grenade/cleaner, + /obj/item/grenade/chem_grenade/cleaner, /obj/structure/closet/crate/galaksi //GALAKSI JANITOR SUPPLIES ), prob(5);list( - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, /obj/structure/closet/crate/allico //GUMMIES ), prob(5);list( @@ -1296,8 +1296,8 @@ /obj/structure/closet/crate/desatti //DESATTI SNACKI ), prob(2);list( - /obj/item/weapon/tank/phoron/pressurized, - /obj/item/weapon/tank/phoron/pressurized, + /obj/item/tank/phoron/pressurized, + /obj/item/tank/phoron/pressurized, /obj/structure/closet/crate/secure/phoron //HQ FUEL TANKS ), prob(1);list( @@ -1357,8 +1357,8 @@ /obj/structure/closet/crate/large/einstein //EIN BATTERY MEGAPACK ), prob(20);list( - /obj/item/weapon/circuitboard/smes, - /obj/item/weapon/circuitboard/smes, + /obj/item/circuitboard/smes, + /obj/item/circuitboard/smes, /obj/random/smes_coil, /obj/random/smes_coil, /obj/random/smes_coil, @@ -1370,16 +1370,16 @@ prob(2);list( /obj/random/energy, /obj/random/energy, - /obj/item/weapon/cell/device/weapon, - /obj/item/weapon/cell/device/weapon, - /obj/item/weapon/cell/device/weapon, - /obj/item/weapon/cell/device/weapon, + /obj/item/cell/device/weapon, + /obj/item/cell/device/weapon, + /obj/item/cell/device/weapon, + /obj/item/cell/device/weapon, /obj/random/energy, /obj/random/energy, - /obj/item/weapon/cell/device/weapon, - /obj/item/weapon/cell/device/weapon, - /obj/item/weapon/cell/device/weapon, - /obj/item/weapon/cell/device/weapon, + /obj/item/cell/device/weapon, + /obj/item/cell/device/weapon, + /obj/item/cell/device/weapon, + /obj/item/cell/device/weapon, /obj/structure/closet/crate/large/secure/heph //HEPH ENERGY ), prob(2);list( @@ -1456,8 +1456,8 @@ /obj/structure/closet/crate/large/einstein //EIN BATTERY MEGAPACK ), prob(20);list( - /obj/item/weapon/circuitboard/smes, - /obj/item/weapon/circuitboard/smes, + /obj/item/circuitboard/smes, + /obj/item/circuitboard/smes, /obj/random/smes_coil, /obj/random/smes_coil, /obj/random/smes_coil, @@ -1598,14 +1598,14 @@ /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/advdrill), - 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/advdrill), + 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 @@ -1617,84 +1617,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 ) ) @@ -1715,10 +1715,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, @@ -1821,16 +1821,16 @@ /obj/structure/closet/crate/einstein //EINSTEIN BATTERYPACK ), prob(5);list( - /obj/item/weapon/circuitboard/smes, + /obj/item/circuitboard/smes, /obj/random/smes_coil, /obj/random/smes_coil, /obj/structure/closet/crate/focalpoint //FOCAL SMES ), prob(10);list( - /obj/item/weapon/module/power_control, + /obj/item/module/power_control, /obj/item/stack/cable_coil, /obj/item/frame/apc, - /obj/item/weapon/cell/apc, + /obj/item/cell/apc, /obj/structure/closet/crate/focalpoint //FOCAL APC ), prob(5);list( @@ -1869,7 +1869,7 @@ prob(5);list( /obj/item/clothing/suit/space/void/salvagecorp_shipbreaker, /obj/item/clothing/head/helmet/space/void/salvagecorp_shipbreaker, - /obj/item/weapon/tank/jetpack/breaker, + /obj/item/tank/jetpack/breaker, /obj/structure/closet/crate/coyote_salvage //CSC SUIT ), prob(10);list( @@ -1916,63 +1916,63 @@ /obj/structure/closet/crate/freezer/zenghu //ZENGHU PILLS ), prob(10);list( - /obj/item/device/toner, - /obj/item/device/toner, - /obj/item/device/toner, - /obj/item/weapon/clipboard, - /obj/item/weapon/clipboard, - /obj/item/weapon/pen/red, - /obj/item/weapon/pen/blue, - /obj/item/weapon/pen/blue, - /obj/item/device/camera_film, - /obj/item/weapon/folder/blue, - /obj/item/weapon/folder/red, - /obj/item/weapon/folder/yellow, - /obj/item/weapon/hand_labeler, - /obj/item/weapon/tape_roll, - /obj/item/weapon/paper_bin, + /obj/item/toner, + /obj/item/toner, + /obj/item/toner, + /obj/item/clipboard, + /obj/item/clipboard, + /obj/item/pen/red, + /obj/item/pen/blue, + /obj/item/pen/blue, + /obj/item/camera_film, + /obj/item/folder/blue, + /obj/item/folder/red, + /obj/item/folder/yellow, + /obj/item/hand_labeler, + /obj/item/tape_roll, + /obj/item/paper_bin, /obj/item/sticky_pad/random, /obj/structure/closet/crate/ummarcar //UMMARCAR OFFICE TRASH ), prob(5);list( - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, /obj/structure/closet/crate/unathi //UNAJERKY ), prob(10);list( - /obj/item/weapon/reagent_containers/glass/bucket, - /obj/item/weapon/mop, + /obj/item/reagent_containers/glass/bucket, + /obj/item/mop, /obj/item/clothing/under/rank/janitor, - /obj/item/weapon/cartridge/janitor, + /obj/item/cartridge/janitor, /obj/item/clothing/gloves/black, /obj/item/clothing/head/soft/purple, - /obj/item/weapon/storage/belt/janitor, + /obj/item/storage/belt/janitor, /obj/item/clothing/shoes/galoshes, /obj/item/clothing/glasses/hud/janitor, - /obj/item/weapon/storage/bag/trash, - /obj/item/device/lightreplacer, - /obj/item/weapon/reagent_containers/spray/cleaner, - /obj/item/weapon/reagent_containers/glass/rag, - /obj/item/weapon/grenade/chem_grenade/cleaner, - /obj/item/weapon/grenade/chem_grenade/cleaner, - /obj/item/weapon/grenade/chem_grenade/cleaner, + /obj/item/storage/bag/trash, + /obj/item/lightreplacer, + /obj/item/reagent_containers/spray/cleaner, + /obj/item/reagent_containers/glass/rag, + /obj/item/grenade/chem_grenade/cleaner, + /obj/item/grenade/chem_grenade/cleaner, + /obj/item/grenade/chem_grenade/cleaner, /obj/structure/closet/crate/galaksi //GALAKSI JANITOR SUPPLIES ), prob(5);list( - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, /obj/structure/closet/crate/allico //GUMMIES ), prob(5);list( @@ -1994,8 +1994,8 @@ /obj/structure/closet/crate/desatti //DESATTI SNACKI ), prob(2);list( - /obj/item/weapon/tank/phoron/pressurized, - /obj/item/weapon/tank/phoron/pressurized, + /obj/item/tank/phoron/pressurized, + /obj/item/tank/phoron/pressurized, /obj/structure/closet/crate/secure/phoron //HQ FUEL TANKS ), ) diff --git a/code/game/objects/random/mapping_vr.dm b/code/game/objects/random/mapping_vr.dm index 732d6146017..ac4aaaa2da3 100644 --- a/code/game/objects/random/mapping_vr.dm +++ b/code/game/objects/random/mapping_vr.dm @@ -16,46 +16,46 @@ /obj/random/forgotten_tram/item_to_spawn() return pick( - prob(2);/obj/item/device/flashlight, - prob(2);/obj/item/device/flashlight/color, - prob(2);/obj/item/device/flashlight/color/green, - prob(2);/obj/item/device/flashlight/color/purple, - prob(2);/obj/item/device/flashlight/color/red, - prob(2);/obj/item/device/flashlight/color/orange, - prob(2);/obj/item/device/flashlight/color/yellow, - prob(2);/obj/item/device/flashlight/glowstick, - prob(2);/obj/item/device/flashlight/glowstick/blue, - prob(1);/obj/item/device/flashlight/glowstick/orange, - prob(1);/obj/item/device/flashlight/glowstick/red, - prob(1);/obj/item/device/flashlight/glowstick/yellow, - prob(1);/obj/item/device/flashlight/pen, - prob(2);/obj/item/device/flashlight/maglight, + prob(2);/obj/item/flashlight, + prob(2);/obj/item/flashlight/color, + prob(2);/obj/item/flashlight/color/green, + prob(2);/obj/item/flashlight/color/purple, + prob(2);/obj/item/flashlight/color/red, + prob(2);/obj/item/flashlight/color/orange, + prob(2);/obj/item/flashlight/color/yellow, + prob(2);/obj/item/flashlight/glowstick, + prob(2);/obj/item/flashlight/glowstick/blue, + prob(1);/obj/item/flashlight/glowstick/orange, + prob(1);/obj/item/flashlight/glowstick/red, + prob(1);/obj/item/flashlight/glowstick/yellow, + prob(1);/obj/item/flashlight/pen, + prob(2);/obj/item/flashlight/maglight, prob(5);/obj/random/cigarettes, prob(5);/obj/random/soap, prob(5);/obj/random/drinksoft, prob(5);/obj/random/snack, prob(5);/obj/random/plushie, - prob(2);/obj/item/weapon/storage/secure/briefcase, - prob(4);/obj/item/weapon/storage/briefcase, - prob(5);/obj/item/weapon/storage/backpack, - prob(5);/obj/item/weapon/storage/backpack/medic, - prob(5);/obj/item/weapon/storage/backpack/industrial, - prob(5);/obj/item/weapon/storage/backpack/toxins, - prob(3);/obj/item/weapon/storage/backpack/dufflebag, - prob(3);/obj/item/weapon/storage/backpack/dufflebag/med, - prob(3);/obj/item/weapon/storage/backpack/dufflebag/eng, - prob(1);/obj/item/weapon/storage/backpack/dufflebag/syndie, - prob(1);/obj/item/weapon/storage/backpack/dufflebag/syndie/med, - prob(1);/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, - prob(4);/obj/item/weapon/storage/backpack/satchel, - prob(5);/obj/item/weapon/storage/backpack/satchel/norm, - prob(5);/obj/item/weapon/storage/backpack/satchel/med, - prob(5);/obj/item/weapon/storage/backpack/satchel/eng, - prob(5);/obj/item/weapon/storage/backpack/satchel/tox, - prob(5);/obj/item/weapon/storage/backpack/messenger/med, - prob(5);/obj/item/weapon/storage/backpack/messenger/engi, - prob(5);/obj/item/weapon/storage/backpack/messenger/tox, - prob(3);/obj/item/weapon/storage/wallet, + prob(2);/obj/item/storage/secure/briefcase, + prob(4);/obj/item/storage/briefcase, + prob(5);/obj/item/storage/backpack, + prob(5);/obj/item/storage/backpack/medic, + prob(5);/obj/item/storage/backpack/industrial, + prob(5);/obj/item/storage/backpack/toxins, + prob(3);/obj/item/storage/backpack/dufflebag, + prob(3);/obj/item/storage/backpack/dufflebag/med, + prob(3);/obj/item/storage/backpack/dufflebag/eng, + prob(1);/obj/item/storage/backpack/dufflebag/syndie, + prob(1);/obj/item/storage/backpack/dufflebag/syndie/med, + prob(1);/obj/item/storage/backpack/dufflebag/syndie/ammo, + prob(4);/obj/item/storage/backpack/satchel, + prob(5);/obj/item/storage/backpack/satchel/norm, + prob(5);/obj/item/storage/backpack/satchel/med, + prob(5);/obj/item/storage/backpack/satchel/eng, + prob(5);/obj/item/storage/backpack/satchel/tox, + prob(5);/obj/item/storage/backpack/messenger/med, + prob(5);/obj/item/storage/backpack/messenger/engi, + prob(5);/obj/item/storage/backpack/messenger/tox, + prob(3);/obj/item/storage/wallet, prob(1);/obj/item/clothing/gloves/black, prob(1);/obj/item/clothing/gloves/blue, prob(1);/obj/item/clothing/gloves/brown, @@ -145,9 +145,9 @@ prob(3);/obj/item/clothing/accessory/poncho/roles/cloak/research, prob(3);/obj/item/clothing/accessory/poncho/roles/cloak/security, prob(2);/obj/item/clothing/accessory/stethoscope, - prob(2);/obj/item/device/camera, - prob(3);/obj/item/device/pda, - prob(3);/obj/item/device/radio/headset, + prob(2);/obj/item/camera, + prob(3);/obj/item/pda, + prob(3);/obj/item/radio/headset, prob(2);/obj/item/toy/tennis, prob(2);/obj/item/toy/tennis/red, prob(2);/obj/item/toy/tennis/yellow, diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index cf4c54a0870..3cac8c4d1b6 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -9,14 +9,14 @@ icon_state = "tool" /obj/random/tool/item_to_spawn() - return pick(/obj/item/weapon/tool/screwdriver, - /obj/item/weapon/tool/wirecutters, - /obj/item/weapon/weldingtool, - /obj/item/weapon/weldingtool/largetank, - /obj/item/weapon/tool/crowbar, - /obj/item/weapon/tool/wrench, - /obj/item/device/flashlight, - /obj/item/device/multitool) + return pick(/obj/item/tool/screwdriver, + /obj/item/tool/wirecutters, + /obj/item/weldingtool, + /obj/item/weldingtool/largetank, + /obj/item/tool/crowbar, + /obj/item/tool/wrench, + /obj/item/flashlight, + /obj/item/multitool) /obj/random/tool/powermaint name = "random powertool" @@ -25,10 +25,10 @@ /obj/random/tool/powermaint/item_to_spawn() return pick(prob(320);/obj/random/tool, - prob(1);/obj/item/weapon/tool/transforming/powerdrill, - prob(1);/obj/item/weapon/tool/transforming/jawsoflife, - prob(15);/obj/item/weapon/weldingtool/electric, - prob(5);/obj/item/weapon/weldingtool/experimental) + prob(1);/obj/item/tool/transforming/powerdrill, + prob(1);/obj/item/tool/transforming/jawsoflife, + prob(15);/obj/item/weldingtool/electric, + prob(5);/obj/item/weldingtool/experimental) /obj/random/tool/power name = "random powertool" @@ -36,10 +36,10 @@ icon_state = "tool_2" /obj/random/tool/power/item_to_spawn() - return pick(/obj/item/weapon/tool/transforming/powerdrill, - /obj/item/weapon/tool/transforming/jawsoflife, - /obj/item/weapon/weldingtool/electric, - /obj/item/weapon/weldingtool/experimental) + return pick(/obj/item/tool/transforming/powerdrill, + /obj/item/tool/transforming/jawsoflife, + /obj/item/weldingtool/electric, + /obj/item/weldingtool/experimental) /obj/random/tool/alien name = "random alien tool" @@ -47,13 +47,13 @@ icon_state = "tool_3" /obj/random/tool/alien/item_to_spawn() - return pick(/obj/item/weapon/tool/screwdriver/alien, - /obj/item/weapon/tool/wirecutters/alien, - /obj/item/weapon/weldingtool/alien, - /obj/item/weapon/tool/crowbar/alien, - /obj/item/weapon/tool/wrench/alien, + return pick(/obj/item/tool/screwdriver/alien, + /obj/item/tool/wirecutters/alien, + /obj/item/weldingtool/alien, + /obj/item/tool/crowbar/alien, + /obj/item/tool/wrench/alien, /obj/item/stack/cable_coil/alien, - /obj/item/device/multitool/alien) + /obj/item/multitool/alien) /obj/random/technology_scanner name = "random scanner" @@ -61,9 +61,9 @@ icon_state = "tech" /obj/random/technology_scanner/item_to_spawn() - return pick(prob(5);/obj/item/device/t_scanner, - prob(2);/obj/item/device/radio, - prob(5);/obj/item/device/analyzer) + return pick(prob(5);/obj/item/t_scanner, + prob(2);/obj/item/radio, + prob(5);/obj/item/analyzer) /obj/random/powercell name = "random powercell" @@ -72,11 +72,11 @@ icon_state = "random" /obj/random/powercell/item_to_spawn() - return pick(prob(40);/obj/item/weapon/cell, - prob(25);/obj/item/weapon/cell/device, - prob(25);/obj/item/weapon/cell/high, - prob(9);/obj/item/weapon/cell/super, - prob(1);/obj/item/weapon/cell/hyper) + return pick(prob(40);/obj/item/cell, + prob(25);/obj/item/cell/device, + prob(25);/obj/item/cell/high, + prob(9);/obj/item/cell/super, + prob(1);/obj/item/cell/hyper) /obj/random/powercell/device name = "random device powercell" @@ -84,9 +84,9 @@ icon_state = "random_device" /obj/random/powercell/device/item_to_spawn() - return pick(prob(80);/obj/item/weapon/cell/device, - prob(10);/obj/item/weapon/cell/device/hyper, - prob(10);/obj/item/weapon/cell/device/empproof) + return pick(prob(80);/obj/item/cell/device, + prob(10);/obj/item/cell/device/hyper, + prob(10);/obj/item/cell/device/empproof) /obj/random/bomb_supply name = "bomb supply" @@ -94,11 +94,11 @@ icon_state = "tech" /obj/random/bomb_supply/item_to_spawn() - return pick(/obj/item/device/assembly/igniter, - /obj/item/device/assembly/prox_sensor, - /obj/item/device/assembly/signaler, - /obj/item/device/assembly/timer, - /obj/item/device/multitool) + return pick(/obj/item/assembly/igniter, + /obj/item/assembly/prox_sensor, + /obj/item/assembly/signaler, + /obj/item/assembly/timer, + /obj/item/multitool) /obj/random/toolbox @@ -107,10 +107,10 @@ icon_state = "toolbox" /obj/random/toolbox/item_to_spawn() - return pick(prob(6);/obj/item/weapon/storage/toolbox/mechanical, - prob(6);/obj/item/weapon/storage/toolbox/electrical, - prob(2);/obj/item/weapon/storage/toolbox/emergency, - prob(1);/obj/item/weapon/storage/toolbox/syndicate) + return pick(prob(6);/obj/item/storage/toolbox/mechanical, + prob(6);/obj/item/storage/toolbox/electrical, + prob(2);/obj/item/storage/toolbox/emergency, + prob(1);/obj/item/storage/toolbox/syndicate) /obj/random/smes_coil name = "random smes coil" @@ -118,9 +118,9 @@ icon_state = "cell_2" /obj/random/smes_coil/item_to_spawn() - return pick(prob(4);/obj/item/weapon/smes_coil, - prob(1);/obj/item/weapon/smes_coil/super_capacity, - prob(1);/obj/item/weapon/smes_coil/super_io) + return pick(prob(4);/obj/item/smes_coil, + prob(1);/obj/item/smes_coil/super_capacity, + prob(1);/obj/item/smes_coil/super_io) /obj/random/pacman name = "random portable generator" @@ -142,19 +142,19 @@ /obj/random/tech_supply/item_to_spawn() return pick(prob(3);/obj/random/powercell, prob(2);/obj/random/technology_scanner, - prob(1);/obj/item/weapon/packageWrap, + prob(1);/obj/item/packageWrap, prob(2);/obj/random/bomb_supply, - prob(1);/obj/item/weapon/extinguisher, + prob(1);/obj/item/extinguisher, prob(1);/obj/item/clothing/gloves/fyellow, prob(3);/obj/item/stack/cable_coil/random, prob(2);/obj/random/toolbox, - prob(2);/obj/item/weapon/storage/belt/utility, - prob(1);/obj/item/weapon/storage/belt/utility/full, + prob(2);/obj/item/storage/belt/utility, + prob(1);/obj/item/storage/belt/utility/full, prob(5);/obj/random/tool, - prob(2);/obj/item/weapon/tape_roll, + prob(2);/obj/item/tape_roll, prob(2);/obj/item/taperoll/engineering, prob(1);/obj/item/taperoll/atmos, - prob(1);/obj/item/device/flashlight/maglight) + prob(1);/obj/item/flashlight/maglight) /obj/random/tech_supply/nofail name = "guaranteed random tech supply" @@ -166,21 +166,21 @@ icon_state = "tech" /obj/random/tech_supply/component/item_to_spawn() - return pick(prob(3);/obj/item/weapon/stock_parts/gear, - prob(2);/obj/item/weapon/stock_parts/console_screen, - prob(1);/obj/item/weapon/stock_parts/spring, - prob(3);/obj/item/weapon/stock_parts/capacitor, - prob(2);/obj/item/weapon/stock_parts/capacitor/adv, - prob(1);/obj/item/weapon/stock_parts/capacitor/super, - prob(3);/obj/item/weapon/stock_parts/manipulator, - prob(2);/obj/item/weapon/stock_parts/manipulator/nano, - prob(1);/obj/item/weapon/stock_parts/manipulator/pico, - prob(3);/obj/item/weapon/stock_parts/matter_bin, - prob(2);/obj/item/weapon/stock_parts/matter_bin/adv, - prob(1);/obj/item/weapon/stock_parts/matter_bin/super, - prob(3);/obj/item/weapon/stock_parts/scanning_module, - prob(2);/obj/item/weapon/stock_parts/scanning_module/adv, - prob(1);/obj/item/weapon/stock_parts/scanning_module/phasic) + return pick(prob(3);/obj/item/stock_parts/gear, + prob(2);/obj/item/stock_parts/console_screen, + prob(1);/obj/item/stock_parts/spring, + prob(3);/obj/item/stock_parts/capacitor, + prob(2);/obj/item/stock_parts/capacitor/adv, + prob(1);/obj/item/stock_parts/capacitor/super, + prob(3);/obj/item/stock_parts/manipulator, + prob(2);/obj/item/stock_parts/manipulator/nano, + prob(1);/obj/item/stock_parts/manipulator/pico, + prob(3);/obj/item/stock_parts/matter_bin, + prob(2);/obj/item/stock_parts/matter_bin/adv, + prob(1);/obj/item/stock_parts/matter_bin/super, + prob(3);/obj/item/stock_parts/scanning_module, + prob(2);/obj/item/stock_parts/scanning_module/adv, + prob(1);/obj/item/stock_parts/scanning_module/phasic) /obj/random/tech_supply/component/nofail name = "guaranteed random tech component" @@ -194,15 +194,15 @@ /obj/random/medical/item_to_spawn() return pick(prob(21);/obj/random/medical/lite, prob(5);/obj/random/medical/pillbottle, - prob(1);/obj/item/weapon/storage/pill_bottle/tramadol, - prob(1);/obj/item/weapon/storage/pill_bottle/antitox, - prob(1);/obj/item/weapon/storage/pill_bottle/carbon, + prob(1);/obj/item/storage/pill_bottle/tramadol, + prob(1);/obj/item/storage/pill_bottle/antitox, + prob(1);/obj/item/storage/pill_bottle/carbon, prob(3);/obj/item/bodybag/cryobag, - prob(5);/obj/item/weapon/reagent_containers/syringe/antitoxin, - prob(3);/obj/item/weapon/reagent_containers/syringe/antiviral, - prob(5);/obj/item/weapon/reagent_containers/syringe/inaprovaline, - prob(1);/obj/item/weapon/reagent_containers/hypospray, - prob(1);/obj/item/weapon/storage/box/freezer, + prob(5);/obj/item/reagent_containers/syringe/antitoxin, + prob(3);/obj/item/reagent_containers/syringe/antiviral, + prob(5);/obj/item/reagent_containers/syringe/inaprovaline, + prob(1);/obj/item/reagent_containers/hypospray, + prob(1);/obj/item/storage/box/freezer, prob(2);/obj/item/stack/nanopaste) /obj/random/medical/pillbottle @@ -211,11 +211,11 @@ icon_state = "pillbottle" /obj/random/medical/pillbottle/item_to_spawn() - return pick(prob(1);/obj/item/weapon/storage/pill_bottle/spaceacillin, - prob(1);/obj/item/weapon/storage/pill_bottle/dermaline, - prob(1);/obj/item/weapon/storage/pill_bottle/dexalin_plus, - prob(1);/obj/item/weapon/storage/pill_bottle/bicaridine, - prob(1);/obj/item/weapon/storage/pill_bottle/blood_regen) + return pick(prob(1);/obj/item/storage/pill_bottle/spaceacillin, + prob(1);/obj/item/storage/pill_bottle/dermaline, + prob(1);/obj/item/storage/pill_bottle/dexalin_plus, + prob(1);/obj/item/storage/pill_bottle/bicaridine, + prob(1);/obj/item/storage/pill_bottle/blood_regen) /obj/random/medical/lite name = "Random Medicine" @@ -229,11 +229,11 @@ prob(2);/obj/item/stack/medical/advanced/bruise_pack, prob(2);/obj/item/stack/medical/advanced/ointment, prob(1);/obj/item/stack/medical/splint, - prob(4);/obj/item/device/healthanalyzer, + prob(4);/obj/item/healthanalyzer, prob(1);/obj/item/bodybag, - prob(3);/obj/item/weapon/reagent_containers/hypospray/autoinjector, - prob(2);/obj/item/weapon/storage/pill_bottle/kelotane, - prob(2);/obj/item/weapon/storage/pill_bottle/antitox) + prob(3);/obj/item/reagent_containers/hypospray/autoinjector, + prob(2);/obj/item/storage/pill_bottle/kelotane, + prob(2);/obj/item/storage/pill_bottle/antitox) /obj/random/firstaid name = "Random First Aid Kit" @@ -241,13 +241,13 @@ icon_state = "medicalkit" /obj/random/firstaid/item_to_spawn() - return pick(prob(10);/obj/item/weapon/storage/firstaid/regular, - prob(8);/obj/item/weapon/storage/firstaid/toxin, - prob(8);/obj/item/weapon/storage/firstaid/o2, - prob(4);/obj/item/weapon/storage/firstaid/adv, //VOREStation Edit: 6 to 4 - prob(8);/obj/item/weapon/storage/firstaid/fire, - prob(1);/obj/item/device/denecrotizer/medical, //VOREStation Add, - prob(1);/obj/item/weapon/storage/firstaid/combat) + return pick(prob(10);/obj/item/storage/firstaid/regular, + prob(8);/obj/item/storage/firstaid/toxin, + prob(8);/obj/item/storage/firstaid/o2, + prob(4);/obj/item/storage/firstaid/adv, //VOREStation Edit: 6 to 4 + prob(8);/obj/item/storage/firstaid/fire, + prob(1);/obj/item/denecrotizer/medical, //VOREStation Add, + prob(1);/obj/item/storage/firstaid/combat) /obj/random/contraband name = "Random Illegal Item" @@ -256,21 +256,21 @@ spawn_nothing_percentage = 50 /obj/random/contraband/item_to_spawn() - return pick(prob(6);/obj/item/weapon/storage/pill_bottle/paracetamol, //VOREStation Edit, - prob(4);/obj/item/weapon/storage/pill_bottle/happy, - prob(4);/obj/item/weapon/storage/pill_bottle/zoom, - prob(4);/obj/item/weapon/material/butterfly, - prob(6);/obj/item/weapon/material/butterflyblade, - prob(6);/obj/item/weapon/material/butterflyhandle, - prob(2);/obj/item/weapon/material/butterfly/switchblade, + return pick(prob(6);/obj/item/storage/pill_bottle/paracetamol, //VOREStation Edit, + prob(4);/obj/item/storage/pill_bottle/happy, + prob(4);/obj/item/storage/pill_bottle/zoom, + prob(4);/obj/item/material/butterfly, + prob(6);/obj/item/material/butterflyblade, + prob(6);/obj/item/material/butterflyhandle, + prob(2);/obj/item/material/butterfly/switchblade, prob(2);/obj/item/clothing/gloves/knuckledusters, - prob(1);/obj/item/weapon/material/knife/tacknife, + prob(1);/obj/item/material/knife/tacknife, prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc, - prob(1);/obj/item/weapon/beartrap, - prob(1);/obj/item/weapon/handcuffs, - prob(1);/obj/item/weapon/handcuffs/legcuffs, - prob(2);/obj/item/weapon/reagent_containers/syringe/drugs, - prob(1);/obj/item/weapon/reagent_containers/syringe/steroid) + prob(1);/obj/item/beartrap, + prob(1);/obj/item/handcuffs, + prob(1);/obj/item/handcuffs/legcuffs, + prob(2);/obj/item/reagent_containers/syringe/drugs, + prob(1);/obj/item/reagent_containers/syringe/steroid) /obj/random/contraband/nofail name = "Guaranteed Random Illegal Item" @@ -284,12 +284,12 @@ /obj/random/cash/item_to_spawn() return pick(prob(320);/obj/random/maintenance/clean, - prob(12);/obj/item/weapon/spacecash/c1, - prob(10);/obj/item/weapon/spacecash/c5, - prob(8);/obj/item/weapon/spacecash/c10, - prob(4);/obj/item/weapon/spacecash/c20, - prob(1);/obj/item/weapon/spacecash/c50, - prob(1);/obj/item/weapon/spacecash/c100) + prob(12);/obj/item/spacecash/c1, + prob(10);/obj/item/spacecash/c5, + prob(8);/obj/item/spacecash/c10, + prob(4);/obj/item/spacecash/c20, + prob(1);/obj/item/spacecash/c50, + prob(1);/obj/item/spacecash/c100) /obj/random/cash/big name = "random currency pile" @@ -298,13 +298,13 @@ icon_state = "spacecash100" /obj/random/cash/big/item_to_spawn() - return pick(prob(64);/obj/item/weapon/spacecash/c10, - prob(32);/obj/item/weapon/spacecash/c20, - prob(16);/obj/item/weapon/spacecash/c50, - prob(8);/obj/item/weapon/spacecash/c100, - prob(4);/obj/item/weapon/spacecash/c200, - prob(2);/obj/item/weapon/spacecash/c500, - prob(1);/obj/item/weapon/spacecash/c1000) + return pick(prob(64);/obj/item/spacecash/c10, + prob(32);/obj/item/spacecash/c20, + prob(16);/obj/item/spacecash/c50, + prob(8);/obj/item/spacecash/c100, + prob(4);/obj/item/spacecash/c200, + prob(2);/obj/item/spacecash/c500, + prob(1);/obj/item/spacecash/c1000) /obj/random/cash/huge name = "random huge currency pile" @@ -313,9 +313,9 @@ icon_state = "spacecash1000" /obj/random/cash/huge/item_to_spawn() - return pick(prob(15);/obj/item/weapon/spacecash/c200, - prob(10);/obj/item/weapon/spacecash/c500, - prob(5);/obj/item/weapon/spacecash/c1000) + return pick(prob(15);/obj/item/spacecash/c200, + prob(10);/obj/item/spacecash/c500, + prob(5);/obj/item/spacecash/c1000) /obj/random/soap name = "Random Soap (All)" @@ -324,30 +324,30 @@ icon_state = "rainbow_soap" /obj/random/soap/item_to_spawn() - return pick(/obj/item/weapon/soap, - /obj/item/weapon/soap/nanotrasen, - /obj/item/weapon/soap/deluxe, - /obj/item/weapon/soap/syndie, - /obj/item/weapon/soap/space_soap, - /obj/item/weapon/soap/space_soap, - /obj/item/weapon/soap/water_soap, - /obj/item/weapon/soap/fire_soap, - /obj/item/weapon/soap/rainbow_soap, - /obj/item/weapon/soap/diamond_soap, - /obj/item/weapon/soap/uranium_soap, - /obj/item/weapon/soap/silver_soap, - /obj/item/weapon/soap/brown_soap, - /obj/item/weapon/soap/white_soap, - /obj/item/weapon/soap/grey_soap, - /obj/item/weapon/soap/pink_soap, - /obj/item/weapon/soap/purple_soap, - /obj/item/weapon/soap/blue_soap, - /obj/item/weapon/soap/cyan_soap, - /obj/item/weapon/soap/green_soap, - /obj/item/weapon/soap/yellow_soap, - /obj/item/weapon/soap/orange_soap, - /obj/item/weapon/soap/red_soap, - /obj/item/weapon/soap/golden_soap) + return pick(/obj/item/soap, + /obj/item/soap/nanotrasen, + /obj/item/soap/deluxe, + /obj/item/soap/syndie, + /obj/item/soap/space_soap, + /obj/item/soap/space_soap, + /obj/item/soap/water_soap, + /obj/item/soap/fire_soap, + /obj/item/soap/rainbow_soap, + /obj/item/soap/diamond_soap, + /obj/item/soap/uranium_soap, + /obj/item/soap/silver_soap, + /obj/item/soap/brown_soap, + /obj/item/soap/white_soap, + /obj/item/soap/grey_soap, + /obj/item/soap/pink_soap, + /obj/item/soap/purple_soap, + /obj/item/soap/blue_soap, + /obj/item/soap/cyan_soap, + /obj/item/soap/green_soap, + /obj/item/soap/yellow_soap, + /obj/item/soap/orange_soap, + /obj/item/soap/red_soap, + /obj/item/soap/golden_soap) /obj/random/soap_common name = "Random Soap (Common)" @@ -356,27 +356,27 @@ icon_state = "rainbow_soap" /obj/random/soap_common/item_to_spawn() - return pick(/obj/item/weapon/soap, - /obj/item/weapon/soap/space_soap, - /obj/item/weapon/soap/space_soap, - /obj/item/weapon/soap/water_soap, - /obj/item/weapon/soap/fire_soap, - /obj/item/weapon/soap/rainbow_soap, - /obj/item/weapon/soap/diamond_soap, - /obj/item/weapon/soap/uranium_soap, - /obj/item/weapon/soap/silver_soap, - /obj/item/weapon/soap/brown_soap, - /obj/item/weapon/soap/white_soap, - /obj/item/weapon/soap/grey_soap, - /obj/item/weapon/soap/pink_soap, - /obj/item/weapon/soap/purple_soap, - /obj/item/weapon/soap/blue_soap, - /obj/item/weapon/soap/cyan_soap, - /obj/item/weapon/soap/green_soap, - /obj/item/weapon/soap/yellow_soap, - /obj/item/weapon/soap/orange_soap, - /obj/item/weapon/soap/red_soap, - /obj/item/weapon/soap/golden_soap) + return pick(/obj/item/soap, + /obj/item/soap/space_soap, + /obj/item/soap/space_soap, + /obj/item/soap/water_soap, + /obj/item/soap/fire_soap, + /obj/item/soap/rainbow_soap, + /obj/item/soap/diamond_soap, + /obj/item/soap/uranium_soap, + /obj/item/soap/silver_soap, + /obj/item/soap/brown_soap, + /obj/item/soap/white_soap, + /obj/item/soap/grey_soap, + /obj/item/soap/pink_soap, + /obj/item/soap/purple_soap, + /obj/item/soap/blue_soap, + /obj/item/soap/cyan_soap, + /obj/item/soap/green_soap, + /obj/item/soap/yellow_soap, + /obj/item/soap/orange_soap, + /obj/item/soap/red_soap, + /obj/item/soap/golden_soap) /obj/random/drinkbottle name = "random drink" @@ -385,33 +385,33 @@ icon_state = "whiskeybottle1" /obj/random/drinkbottle/item_to_spawn() - return pick(/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, - /obj/item/weapon/reagent_containers/food/drinks/bottle/gin, - /obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey, - /obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, - /obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla, - /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, - /obj/item/weapon/reagent_containers/food/drinks/bottle/wine, - /obj/item/weapon/reagent_containers/food/drinks/bottle/cognac, - /obj/item/weapon/reagent_containers/food/drinks/bottle/rum, - /obj/item/weapon/reagent_containers/food/drinks/bottle/patron, - /obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth, - /obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager, - /obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua, - /obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor, - /obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao, - /obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine, - /obj/item/weapon/reagent_containers/food/drinks/bottle/sake, - /obj/item/weapon/reagent_containers/food/drinks/bottle/champagne, - /obj/item/weapon/reagent_containers/food/drinks/bottle/peppermintschnapps, - /obj/item/weapon/reagent_containers/food/drinks/bottle/peachschnapps, - /obj/item/weapon/reagent_containers/food/drinks/bottle/lemonadeschnapps, - /obj/item/weapon/reagent_containers/food/drinks/bottle/jager, - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/cider, - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/litebeer, - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/silverdragon, - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/meteor) + return pick(/obj/item/reagent_containers/food/drinks/bottle/whiskey, + /obj/item/reagent_containers/food/drinks/bottle/gin, + /obj/item/reagent_containers/food/drinks/bottle/specialwhiskey, + /obj/item/reagent_containers/food/drinks/bottle/vodka, + /obj/item/reagent_containers/food/drinks/bottle/tequilla, + /obj/item/reagent_containers/food/drinks/bottle/absinthe, + /obj/item/reagent_containers/food/drinks/bottle/wine, + /obj/item/reagent_containers/food/drinks/bottle/cognac, + /obj/item/reagent_containers/food/drinks/bottle/rum, + /obj/item/reagent_containers/food/drinks/bottle/patron, + /obj/item/reagent_containers/food/drinks/bottle/vermouth, + /obj/item/reagent_containers/food/drinks/bottle/goldschlager, + /obj/item/reagent_containers/food/drinks/bottle/kahlua, + /obj/item/reagent_containers/food/drinks/bottle/melonliquor, + /obj/item/reagent_containers/food/drinks/bottle/bluecuracao, + /obj/item/reagent_containers/food/drinks/bottle/grenadine, + /obj/item/reagent_containers/food/drinks/bottle/sake, + /obj/item/reagent_containers/food/drinks/bottle/champagne, + /obj/item/reagent_containers/food/drinks/bottle/peppermintschnapps, + /obj/item/reagent_containers/food/drinks/bottle/peachschnapps, + /obj/item/reagent_containers/food/drinks/bottle/lemonadeschnapps, + /obj/item/reagent_containers/food/drinks/bottle/jager, + /obj/item/reagent_containers/food/drinks/bottle/small/cider, + /obj/item/reagent_containers/food/drinks/bottle/small/litebeer, + /obj/item/reagent_containers/food/drinks/bottle/small/beer, + /obj/item/reagent_containers/food/drinks/bottle/small/beer/silverdragon, + /obj/item/reagent_containers/food/drinks/bottle/small/beer/meteor) /obj/random/drinksoft name = "random soft drink" @@ -420,21 +420,21 @@ icon_state = "cola" /obj/random/drinksoft/item_to_spawn() - return pick(/obj/item/weapon/reagent_containers/food/drinks/cans/cola, - /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, - /obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind, - /obj/item/weapon/reagent_containers/food/drinks/cans/thirteenloko, - /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb, - /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb_diet, - /obj/item/weapon/reagent_containers/food/drinks/cans/starkist, - /obj/item/weapon/reagent_containers/food/drinks/cans/space_up, - /obj/item/weapon/reagent_containers/food/drinks/cans/lemon_lime, - /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea, - /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice, - /obj/item/weapon/reagent_containers/food/drinks/cans/tonic, - /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater, - /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale, - /obj/item/weapon/reagent_containers/food/drinks/cans/root_beer) + return pick(/obj/item/reagent_containers/food/drinks/cans/cola, + /obj/item/reagent_containers/food/drinks/cans/waterbottle, + /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind, + /obj/item/reagent_containers/food/drinks/cans/thirteenloko, + /obj/item/reagent_containers/food/drinks/cans/dr_gibb, + /obj/item/reagent_containers/food/drinks/cans/dr_gibb_diet, + /obj/item/reagent_containers/food/drinks/cans/starkist, + /obj/item/reagent_containers/food/drinks/cans/space_up, + /obj/item/reagent_containers/food/drinks/cans/lemon_lime, + /obj/item/reagent_containers/food/drinks/cans/iced_tea, + /obj/item/reagent_containers/food/drinks/cans/grape_juice, + /obj/item/reagent_containers/food/drinks/cans/tonic, + /obj/item/reagent_containers/food/drinks/cans/sodawater, + /obj/item/reagent_containers/food/drinks/cans/gingerale, + /obj/item/reagent_containers/food/drinks/cans/root_beer) /obj/random/snack @@ -444,79 +444,79 @@ icon_state = "tastybread" /obj/random/snack/item_to_spawn() - return pick(/obj/item/weapon/reagent_containers/food/snacks/candy, - /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/donor, - /obj/item/weapon/reagent_containers/food/snacks/candy_corn, - /obj/item/weapon/reagent_containers/food/snacks/chips, - /obj/item/weapon/reagent_containers/food/snacks/chips/bbq, - /obj/item/weapon/reagent_containers/food/snacks/cookiesnack, - /obj/item/weapon/reagent_containers/food/snacks/fruitbar, - /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, - /obj/item/weapon/reagent_containers/food/snacks/chocolatepiece, - /obj/item/weapon/reagent_containers/food/snacks/chocolatepiece/white, - /obj/item/weapon/reagent_containers/food/snacks/chocolatepiece/truffle, - /obj/item/weapon/reagent_containers/food/snacks/chocolateegg, - /obj/item/weapon/reagent_containers/food/snacks/donut/plain, - /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly, - /obj/item/weapon/reagent_containers/food/snacks/donut/pink, - /obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly, - /obj/item/weapon/reagent_containers/food/snacks/donut/purple, - /obj/item/weapon/reagent_containers/food/snacks/donut/purple/jelly, - /obj/item/weapon/reagent_containers/food/snacks/donut/green, - /obj/item/weapon/reagent_containers/food/snacks/donut/green/jelly, - /obj/item/weapon/reagent_containers/food/snacks/donut/beige, - /obj/item/weapon/reagent_containers/food/snacks/donut/beige/jelly, - /obj/item/weapon/reagent_containers/food/snacks/donut/choc, - /obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly, - /obj/item/weapon/reagent_containers/food/snacks/donut/blue, - /obj/item/weapon/reagent_containers/food/snacks/donut/blue/jelly, - /obj/item/weapon/reagent_containers/food/snacks/donut/yellow, - /obj/item/weapon/reagent_containers/food/snacks/donut/yellow/jelly, - /obj/item/weapon/reagent_containers/food/snacks/donut/olive, - /obj/item/weapon/reagent_containers/food/snacks/donut/olive/jelly, - /obj/item/weapon/reagent_containers/food/snacks/donut/homer, - /obj/item/weapon/reagent_containers/food/snacks/donut/homer/jelly, - /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles, - /obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/jelly, - /obj/item/weapon/reagent_containers/food/snacks/tuna, - /obj/item/weapon/reagent_containers/food/snacks/pistachios, - /obj/item/weapon/reagent_containers/food/snacks/semki, - /obj/item/weapon/reagent_containers/food/snacks/cb01, - /obj/item/weapon/reagent_containers/food/snacks/cb02, - /obj/item/weapon/reagent_containers/food/snacks/cb03, - /obj/item/weapon/reagent_containers/food/snacks/cb04, - /obj/item/weapon/reagent_containers/food/snacks/cb05, - /obj/item/weapon/reagent_containers/food/snacks/cb06, - /obj/item/weapon/reagent_containers/food/snacks/cb07, - /obj/item/weapon/reagent_containers/food/snacks/cb08, - /obj/item/weapon/reagent_containers/food/snacks/cb09, - /obj/item/weapon/reagent_containers/food/snacks/cb10, - /obj/item/weapon/reagent_containers/food/snacks/tofu, - /obj/item/weapon/reagent_containers/food/snacks/donkpocket, - /obj/item/weapon/reagent_containers/food/snacks/muffin, - /obj/item/weapon/reagent_containers/food/snacks/soylentgreen, - /obj/item/weapon/reagent_containers/food/snacks/soylenviridians, - /obj/item/weapon/reagent_containers/food/snacks/popcorn, - /obj/item/weapon/reagent_containers/food/snacks/sosjerky, - /obj/item/weapon/reagent_containers/food/snacks/no_raisin, - /obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie, - /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers, - /obj/item/weapon/reagent_containers/food/snacks/poppypretzel, - /obj/item/weapon/reagent_containers/food/snacks/baguette, - /obj/item/weapon/reagent_containers/food/snacks/carrotfries, - /obj/item/weapon/reagent_containers/food/snacks/candiedapple, - /obj/item/weapon/storage/box/admints, - /obj/item/weapon/reagent_containers/food/snacks/tastybread, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood, - /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, - /obj/item/weapon/reagent_containers/food/snacks/liquidvitamin, - /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/croissant, - /obj/item/weapon/reagent_containers/food/snacks/sugarcookie, - /obj/item/weapon/reagent_containers/food/drinks/dry_ramen) + return pick(/obj/item/reagent_containers/food/snacks/candy, + /obj/item/reagent_containers/food/snacks/candy/proteinbar, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/donor, + /obj/item/reagent_containers/food/snacks/candy_corn, + /obj/item/reagent_containers/food/snacks/chips, + /obj/item/reagent_containers/food/snacks/chips/bbq, + /obj/item/reagent_containers/food/snacks/cookiesnack, + /obj/item/reagent_containers/food/snacks/fruitbar, + /obj/item/reagent_containers/food/snacks/chocolatebar, + /obj/item/reagent_containers/food/snacks/chocolatepiece, + /obj/item/reagent_containers/food/snacks/chocolatepiece/white, + /obj/item/reagent_containers/food/snacks/chocolatepiece/truffle, + /obj/item/reagent_containers/food/snacks/chocolateegg, + /obj/item/reagent_containers/food/snacks/donut/plain, + /obj/item/reagent_containers/food/snacks/donut/plain/jelly, + /obj/item/reagent_containers/food/snacks/donut/pink, + /obj/item/reagent_containers/food/snacks/donut/pink/jelly, + /obj/item/reagent_containers/food/snacks/donut/purple, + /obj/item/reagent_containers/food/snacks/donut/purple/jelly, + /obj/item/reagent_containers/food/snacks/donut/green, + /obj/item/reagent_containers/food/snacks/donut/green/jelly, + /obj/item/reagent_containers/food/snacks/donut/beige, + /obj/item/reagent_containers/food/snacks/donut/beige/jelly, + /obj/item/reagent_containers/food/snacks/donut/choc, + /obj/item/reagent_containers/food/snacks/donut/choc/jelly, + /obj/item/reagent_containers/food/snacks/donut/blue, + /obj/item/reagent_containers/food/snacks/donut/blue/jelly, + /obj/item/reagent_containers/food/snacks/donut/yellow, + /obj/item/reagent_containers/food/snacks/donut/yellow/jelly, + /obj/item/reagent_containers/food/snacks/donut/olive, + /obj/item/reagent_containers/food/snacks/donut/olive/jelly, + /obj/item/reagent_containers/food/snacks/donut/homer, + /obj/item/reagent_containers/food/snacks/donut/homer/jelly, + /obj/item/reagent_containers/food/snacks/donut/choc_sprinkles, + /obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/jelly, + /obj/item/reagent_containers/food/snacks/tuna, + /obj/item/reagent_containers/food/snacks/pistachios, + /obj/item/reagent_containers/food/snacks/semki, + /obj/item/reagent_containers/food/snacks/cb01, + /obj/item/reagent_containers/food/snacks/cb02, + /obj/item/reagent_containers/food/snacks/cb03, + /obj/item/reagent_containers/food/snacks/cb04, + /obj/item/reagent_containers/food/snacks/cb05, + /obj/item/reagent_containers/food/snacks/cb06, + /obj/item/reagent_containers/food/snacks/cb07, + /obj/item/reagent_containers/food/snacks/cb08, + /obj/item/reagent_containers/food/snacks/cb09, + /obj/item/reagent_containers/food/snacks/cb10, + /obj/item/reagent_containers/food/snacks/tofu, + /obj/item/reagent_containers/food/snacks/donkpocket, + /obj/item/reagent_containers/food/snacks/muffin, + /obj/item/reagent_containers/food/snacks/soylentgreen, + /obj/item/reagent_containers/food/snacks/soylenviridians, + /obj/item/reagent_containers/food/snacks/popcorn, + /obj/item/reagent_containers/food/snacks/sosjerky, + /obj/item/reagent_containers/food/snacks/no_raisin, + /obj/item/reagent_containers/food/snacks/packaged/spacetwinkie, + /obj/item/reagent_containers/food/snacks/cheesiehonkers, + /obj/item/reagent_containers/food/snacks/poppypretzel, + /obj/item/reagent_containers/food/snacks/baguette, + /obj/item/reagent_containers/food/snacks/carrotfries, + /obj/item/reagent_containers/food/snacks/candiedapple, + /obj/item/storage/box/admints, + /obj/item/reagent_containers/food/snacks/tastybread, + /obj/item/reagent_containers/food/snacks/liquidfood, + /obj/item/reagent_containers/food/snacks/liquidprotein, + /obj/item/reagent_containers/food/snacks/liquidvitamin, + /obj/item/reagent_containers/food/snacks/skrellsnacks, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/croissant, + /obj/item/reagent_containers/food/snacks/sugarcookie, + /obj/item/reagent_containers/food/drinks/dry_ramen) /obj/random/meat name = "random meat" @@ -525,15 +525,15 @@ icon_state = "meat" /obj/random/meat/item_to_spawn() - return pick(prob(60);/obj/item/weapon/reagent_containers/food/snacks/meat, - prob(20);/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat, - prob(10);/obj/item/weapon/reagent_containers/food/snacks/carpmeat, - prob(5);/obj/item/weapon/reagent_containers/food/snacks/bearmeat, - prob(1);/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, - prob(1);/obj/item/weapon/reagent_containers/food/snacks/meat/human, - prob(1);/obj/item/weapon/reagent_containers/food/snacks/meat/monkey, - prob(1);/obj/item/weapon/reagent_containers/food/snacks/meat/corgi, - prob(1);/obj/item/weapon/reagent_containers/food/snacks/xenomeat) + return pick(prob(60);/obj/item/reagent_containers/food/snacks/meat, + prob(20);/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat, + prob(10);/obj/item/reagent_containers/food/snacks/carpmeat, + prob(5);/obj/item/reagent_containers/food/snacks/bearmeat, + prob(1);/obj/item/reagent_containers/food/snacks/meat/syntiflesh, + prob(1);/obj/item/reagent_containers/food/snacks/meat/human, + prob(1);/obj/item/reagent_containers/food/snacks/meat/monkey, + prob(1);/obj/item/reagent_containers/food/snacks/meat/corgi, + prob(1);/obj/item/reagent_containers/food/snacks/xenomeat) /obj/random/pizzabox name = "random pizza box" @@ -618,14 +618,14 @@ icon_state = "canister" /obj/random/tank/item_to_spawn() - return pick(prob(5);/obj/item/weapon/tank/oxygen, - prob(4);/obj/item/weapon/tank/oxygen/yellow, - prob(4);/obj/item/weapon/tank/oxygen/red, - prob(3);/obj/item/weapon/tank/air, - prob(4);/obj/item/weapon/tank/emergency/oxygen, - prob(3);/obj/item/weapon/tank/emergency/oxygen/engi, - prob(2);/obj/item/weapon/tank/emergency/oxygen/double, - prob(1);/obj/item/device/suit_cooling_unit) + return pick(prob(5);/obj/item/tank/oxygen, + prob(4);/obj/item/tank/oxygen/yellow, + prob(4);/obj/item/tank/oxygen/red, + prob(3);/obj/item/tank/air, + prob(4);/obj/item/tank/emergency/oxygen, + prob(3);/obj/item/tank/emergency/oxygen/engi, + prob(2);/obj/item/tank/emergency/oxygen/double, + prob(1);/obj/item/suit_cooling_unit) /obj/random/cigarettes name = "random cigarettes" @@ -634,15 +634,15 @@ icon_state = "cigpacket" /obj/random/cigarettes/item_to_spawn() - return pick(prob(5);/obj/item/weapon/storage/fancy/cigarettes, - prob(4);/obj/item/weapon/storage/fancy/cigarettes/dromedaryco, - prob(3);/obj/item/weapon/storage/fancy/cigarettes/killthroat, - prob(3);/obj/item/weapon/storage/fancy/cigarettes/luckystars, - prob(3);/obj/item/weapon/storage/fancy/cigarettes/jerichos, - prob(3);/obj/item/weapon/storage/fancy/cigarettes/menthols, - prob(3);/obj/item/weapon/storage/fancy/cigarettes/carcinomas, - prob(3);/obj/item/weapon/storage/fancy/cigarettes/professionals, - prob(1);/obj/item/weapon/storage/fancy/cigar, + return pick(prob(5);/obj/item/storage/fancy/cigarettes, + prob(4);/obj/item/storage/fancy/cigarettes/dromedaryco, + prob(3);/obj/item/storage/fancy/cigarettes/killthroat, + prob(3);/obj/item/storage/fancy/cigarettes/luckystars, + prob(3);/obj/item/storage/fancy/cigarettes/jerichos, + prob(3);/obj/item/storage/fancy/cigarettes/menthols, + prob(3);/obj/item/storage/fancy/cigarettes/carcinomas, + prob(3);/obj/item/storage/fancy/cigarettes/professionals, + prob(1);/obj/item/storage/fancy/cigar, prob(1);/obj/item/clothing/mask/smokable/cigarette/cigar, prob(1);/obj/item/clothing/mask/smokable/cigarette/cigar/cohiba, prob(1);/obj/item/clothing/mask/smokable/cigarette/cigar/havana) @@ -654,13 +654,13 @@ icon_state = "rup" /obj/random/coin/item_to_spawn() - return pick(prob(5);/obj/item/weapon/coin/silver, - prob(3);/obj/item/weapon/coin/iron, - prob(4);/obj/item/weapon/coin/gold, - prob(3);/obj/item/weapon/coin/phoron, - prob(1);/obj/item/weapon/coin/uranium, - prob(2);/obj/item/weapon/coin/platinum, - prob(1);/obj/item/weapon/coin/diamond) + return pick(prob(5);/obj/item/coin/silver, + prob(3);/obj/item/coin/iron, + prob(4);/obj/item/coin/gold, + prob(3);/obj/item/coin/phoron, + prob(1);/obj/item/coin/uranium, + prob(2);/obj/item/coin/platinum, + prob(1);/obj/item/coin/diamond) //VOREStation Add Start /obj/random/coin/sometimes @@ -802,9 +802,9 @@ /obj/item/toy/snappop, /obj/item/toy/sword, /obj/item/toy/balloon, - /obj/item/weapon/gun/projectile/revolver/toy/crossbow, + /obj/item/gun/projectile/revolver/toy/crossbow, /obj/item/toy/blink, - /obj/item/weapon/reagent_containers/spray/waterflower, + /obj/item/reagent_containers/spray/waterflower, /obj/item/toy/eight_ball, /obj/item/toy/eight_ball/conch, /obj/item/toy/mecha/ripley, @@ -818,7 +818,7 @@ /obj/item/toy/mecha/mauler, /obj/item/toy/mecha/odysseus, /obj/item/toy/mecha/phazon, - /obj/item/weapon/toy/monster_bait) + /obj/item/toy/monster_bait) /obj/random/mouseremains name = "random mouseremains" @@ -827,8 +827,8 @@ icon_state = "mousetrap" /obj/random/mouseremains/item_to_spawn() - return pick(/obj/item/device/assembly/mousetrap, - /obj/item/device/assembly/mousetrap/armed, + return pick(/obj/item/assembly/mousetrap, + /obj/item/assembly/mousetrap/armed, /obj/effect/decal/cleanable/bug_remains, /obj/effect/decal/cleanable/ash, /obj/item/trash/cigbutt, @@ -841,7 +841,7 @@ icon_state = "tech_2" /obj/random/janusmodule/item_to_spawn() - return pick(subtypesof(/obj/item/weapon/circuitboard/mecha/imperion)) + return pick(subtypesof(/obj/item/circuitboard/mecha/imperion)) /obj/random/curseditem name = "random cursed item" @@ -850,7 +850,7 @@ icon_state = "red" /obj/random/curseditem/item_to_spawn() - var/possible_object_paths = list(/obj/item/weapon/paper/carbon/cursedform) + var/possible_object_paths = list(/obj/item/paper/carbon/cursedform) possible_object_paths |= subtypesof(/obj/item/clothing/head/psy_crown) return pick(possible_object_paths) @@ -864,16 +864,16 @@ drop_get_turf = FALSE /obj/random/mre/item_to_spawn() - return pick(/obj/item/weapon/storage/mre, - /obj/item/weapon/storage/mre/menu2, - /obj/item/weapon/storage/mre/menu3, - /obj/item/weapon/storage/mre/menu4, - /obj/item/weapon/storage/mre/menu5, - /obj/item/weapon/storage/mre/menu6, - /obj/item/weapon/storage/mre/menu7, - /obj/item/weapon/storage/mre/menu8, - /obj/item/weapon/storage/mre/menu9, - /obj/item/weapon/storage/mre/menu10) + return pick(/obj/item/storage/mre, + /obj/item/storage/mre/menu2, + /obj/item/storage/mre/menu3, + /obj/item/storage/mre/menu4, + /obj/item/storage/mre/menu5, + /obj/item/storage/mre/menu6, + /obj/item/storage/mre/menu7, + /obj/item/storage/mre/menu8, + /obj/item/storage/mre/menu9, + /obj/item/storage/mre/menu10) /obj/random/mre/main @@ -883,14 +883,14 @@ drop_get_turf = FALSE /obj/random/mre/main/item_to_spawn() - return pick(/obj/item/weapon/storage/mrebag, - /obj/item/weapon/storage/mrebag/menu2, - /obj/item/weapon/storage/mrebag/menu3, - /obj/item/weapon/storage/mrebag/menu4, - /obj/item/weapon/storage/mrebag/menu5, - /obj/item/weapon/storage/mrebag/menu6, - /obj/item/weapon/storage/mrebag/menu7, - /obj/item/weapon/storage/mrebag/menu8) + return pick(/obj/item/storage/mrebag, + /obj/item/storage/mrebag/menu2, + /obj/item/storage/mrebag/menu3, + /obj/item/storage/mrebag/menu4, + /obj/item/storage/mrebag/menu5, + /obj/item/storage/mrebag/menu6, + /obj/item/storage/mrebag/menu7, + /obj/item/storage/mrebag/menu8) /obj/random/mre/side name = "random MRE side dish" @@ -899,11 +899,11 @@ drop_get_turf = FALSE /obj/random/mre/side/item_to_spawn() - return pick(/obj/item/weapon/reagent_containers/food/snacks/tossedsalad, - /obj/item/weapon/reagent_containers/food/snacks/boiledrice, - /obj/item/weapon/reagent_containers/food/snacks/poppypretzel, - /obj/item/weapon/reagent_containers/food/snacks/twobread, - /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast) + return pick(/obj/item/reagent_containers/food/snacks/tossedsalad, + /obj/item/reagent_containers/food/snacks/boiledrice, + /obj/item/reagent_containers/food/snacks/poppypretzel, + /obj/item/reagent_containers/food/snacks/twobread, + /obj/item/reagent_containers/food/snacks/jelliedtoast) /obj/random/mre/dessert name = "random MRE dessert" @@ -912,22 +912,22 @@ drop_get_turf = FALSE /obj/random/mre/dessert/item_to_spawn() - return pick(/obj/item/weapon/reagent_containers/food/snacks/candy, - /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, - /obj/item/weapon/reagent_containers/food/snacks/donut/plain, - /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly, - /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, - /obj/item/weapon/reagent_containers/food/snacks/cookie) + return pick(/obj/item/reagent_containers/food/snacks/candy, + /obj/item/reagent_containers/food/snacks/candy/proteinbar, + /obj/item/reagent_containers/food/snacks/donut/plain, + /obj/item/reagent_containers/food/snacks/donut/plain/jelly, + /obj/item/reagent_containers/food/snacks/chocolatebar, + /obj/item/reagent_containers/food/snacks/cookie) /obj/random/mre/dessert/vegan name = "random vegan MRE dessert" desc = "This is a random vegan dessert for MREs." /obj/random/mre/dessert/vegan/item_to_spawn() - return pick(/obj/item/weapon/reagent_containers/food/snacks/candy, - /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, - /obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly, - /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit) + return pick(/obj/item/reagent_containers/food/snacks/candy, + /obj/item/reagent_containers/food/snacks/chocolatebar, + /obj/item/reagent_containers/food/snacks/donut/plain/jelly, + /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit) /obj/random/mre/drink name = "random MRE drink" @@ -936,13 +936,13 @@ drop_get_turf = FALSE /obj/random/mre/drink/item_to_spawn() - return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/coffee, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/tea, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/cocoa, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/grape, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/orange, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/watermelon, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/apple) + return pick(/obj/item/reagent_containers/food/condiment/small/packet/coffee, + /obj/item/reagent_containers/food/condiment/small/packet/tea, + /obj/item/reagent_containers/food/condiment/small/packet/cocoa, + /obj/item/reagent_containers/food/condiment/small/packet/grape, + /obj/item/reagent_containers/food/condiment/small/packet/orange, + /obj/item/reagent_containers/food/condiment/small/packet/watermelon, + /obj/item/reagent_containers/food/condiment/small/packet/apple) /obj/random/mre/spread name = "random MRE spread" @@ -951,15 +951,15 @@ drop_get_turf = FALSE /obj/random/mre/spread/item_to_spawn() - return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/jelly, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/honey) + return pick(/obj/item/reagent_containers/food/condiment/small/packet/jelly, + /obj/item/reagent_containers/food/condiment/small/packet/honey) /obj/random/mre/spread/vegan name = "random vegan MRE spread" desc = "This is a random vegan spread packet for MREs" /obj/random/mre/spread/vegan/item_to_spawn() - return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/jelly) + return pick(/obj/item/reagent_containers/food/condiment/small/packet/jelly) /obj/random/mre/sauce name = "random MRE sauce" @@ -968,38 +968,38 @@ drop_get_turf = FALSE /obj/random/mre/sauce/item_to_spawn() - return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/salt, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/pepper, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/sugar, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/capsaicin, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/ketchup, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/mayo, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/soy) + return pick(/obj/item/reagent_containers/food/condiment/small/packet/salt, + /obj/item/reagent_containers/food/condiment/small/packet/pepper, + /obj/item/reagent_containers/food/condiment/small/packet/sugar, + /obj/item/reagent_containers/food/condiment/small/packet/capsaicin, + /obj/item/reagent_containers/food/condiment/small/packet/ketchup, + /obj/item/reagent_containers/food/condiment/small/packet/mayo, + /obj/item/reagent_containers/food/condiment/small/packet/soy) /obj/random/mre/sauce/vegan/item_to_spawn() - return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/salt, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/pepper, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/sugar, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/soy) + return pick(/obj/item/reagent_containers/food/condiment/small/packet/salt, + /obj/item/reagent_containers/food/condiment/small/packet/pepper, + /obj/item/reagent_containers/food/condiment/small/packet/sugar, + /obj/item/reagent_containers/food/condiment/small/packet/soy) /obj/random/mre/sauce/sugarfree/item_to_spawn() - return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/salt, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/pepper, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/capsaicin, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/ketchup, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/mayo, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/soy) + return pick(/obj/item/reagent_containers/food/condiment/small/packet/salt, + /obj/item/reagent_containers/food/condiment/small/packet/pepper, + /obj/item/reagent_containers/food/condiment/small/packet/capsaicin, + /obj/item/reagent_containers/food/condiment/small/packet/ketchup, + /obj/item/reagent_containers/food/condiment/small/packet/mayo, + /obj/item/reagent_containers/food/condiment/small/packet/soy) /obj/random/mre/sauce/crayon/item_to_spawn() - return pick(/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/generic, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/red, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/orange, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/yellow, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/green, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/blue, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/purple, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/grey, - /obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/brown) + return pick(/obj/item/reagent_containers/food/condiment/small/packet/crayon/generic, + /obj/item/reagent_containers/food/condiment/small/packet/crayon/red, + /obj/item/reagent_containers/food/condiment/small/packet/crayon/orange, + /obj/item/reagent_containers/food/condiment/small/packet/crayon/yellow, + /obj/item/reagent_containers/food/condiment/small/packet/crayon/green, + /obj/item/reagent_containers/food/condiment/small/packet/crayon/blue, + /obj/item/reagent_containers/food/condiment/small/packet/crayon/purple, + /obj/item/reagent_containers/food/condiment/small/packet/crayon/grey, + /obj/item/reagent_containers/food/condiment/small/packet/crayon/brown) /obj/random/thermalponcho name = "random thermal poncho" @@ -1022,19 +1022,19 @@ /obj/random/pouch/item_to_spawn() return pick( - prob(10);/obj/item/weapon/storage/pouch, // medium - prob(3);/obj/item/weapon/storage/pouch/large, - prob(8);/obj/item/weapon/storage/pouch/small, - prob(5);/obj/item/weapon/storage/pouch/ammo, - prob(5);/obj/item/weapon/storage/pouch/eng_tool, - prob(5);/obj/item/weapon/storage/pouch/eng_supply, - prob(5);/obj/item/weapon/storage/pouch/eng_parts, - prob(5);/obj/item/weapon/storage/pouch/medical, - prob(5);/obj/item/weapon/storage/pouch/flares/full_flare, - prob(5);/obj/item/weapon/storage/pouch/flares/full_glow, - prob(5);/obj/item/weapon/storage/pouch/holster, - prob(5);/obj/item/weapon/storage/pouch/baton/full, - prob(1);/obj/item/weapon/storage/pouch/holding + prob(10);/obj/item/storage/pouch, // medium + prob(3);/obj/item/storage/pouch/large, + prob(8);/obj/item/storage/pouch/small, + prob(5);/obj/item/storage/pouch/ammo, + prob(5);/obj/item/storage/pouch/eng_tool, + prob(5);/obj/item/storage/pouch/eng_supply, + prob(5);/obj/item/storage/pouch/eng_parts, + prob(5);/obj/item/storage/pouch/medical, + prob(5);/obj/item/storage/pouch/flares/full_flare, + prob(5);/obj/item/storage/pouch/flares/full_glow, + prob(5);/obj/item/storage/pouch/holster, + prob(5);/obj/item/storage/pouch/baton/full, + prob(1);/obj/item/storage/pouch/holding ) /obj/random/flashlight @@ -1045,14 +1045,14 @@ /obj/random/flashlight/item_to_spawn() return pick( - prob(8);/obj/item/device/flashlight, - prob(6);/obj/item/device/flashlight/color, - prob(6);/obj/item/device/flashlight/color/green, - prob(6);/obj/item/device/flashlight/color/purple, - prob(6);/obj/item/device/flashlight/color/red, - prob(6);/obj/item/device/flashlight/color/orange, - prob(6);/obj/item/device/flashlight/color/yellow, - prob(2);/obj/item/device/flashlight/maglight + prob(8);/obj/item/flashlight, + prob(6);/obj/item/flashlight/color, + prob(6);/obj/item/flashlight/color/green, + prob(6);/obj/item/flashlight/color/purple, + prob(6);/obj/item/flashlight/color/red, + prob(6);/obj/item/flashlight/color/orange, + prob(6);/obj/item/flashlight/color/yellow, + prob(2);/obj/item/flashlight/maglight ) /obj/random/mug @@ -1062,35 +1062,35 @@ icon_state = "coffeecup_spawner" /obj/random/mug/item_to_spawn() - return pick(/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/sol, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fleet, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fivearrows, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/psc, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/alma, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/almp, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/nt, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal/wulf, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/gilthari, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/zeng, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/wt, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/aether, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/bishop, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/oculum, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/one, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/puni, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/heart, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/pawn, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/diona, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/britcup, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/flame, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/blue, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/black, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green/dark, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/rainbow, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/talon) + return pick(/obj/item/reagent_containers/food/drinks/glass2/coffeemug, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/sol, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/fleet, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/fivearrows, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/psc, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/alma, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/almp, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/nt, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/metal/wulf, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/gilthari, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/zeng, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/wt, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/aether, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/bishop, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/oculum, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/one, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/puni, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/heart, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/pawn, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/diona, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/britcup, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/flame, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/blue, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/black, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/green, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/green/dark, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/rainbow, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/metal, + /obj/item/reagent_containers/food/drinks/glass2/coffeemug/talon) /obj/random/donkpocketbox name = "Random Donk-pocket Box" @@ -1099,13 +1099,13 @@ icon_state = "donkpocket_spawner" /obj/random/donkpocketbox/item_to_spawn() - return pick(/obj/item/weapon/storage/box/donkpockets, - /obj/item/weapon/storage/box/donkpockets/spicy, - /obj/item/weapon/storage/box/donkpockets/teriyaki, - /obj/item/weapon/storage/box/donkpockets/pizza, - /obj/item/weapon/storage/box/donkpockets/honk, - /obj/item/weapon/storage/box/donkpockets/gondola, - /obj/item/weapon/storage/box/donkpockets/berry) + return pick(/obj/item/storage/box/donkpockets, + /obj/item/storage/box/donkpockets/spicy, + /obj/item/storage/box/donkpockets/teriyaki, + /obj/item/storage/box/donkpockets/pizza, + /obj/item/storage/box/donkpockets/honk, + /obj/item/storage/box/donkpockets/gondola, + /obj/item/storage/box/donkpockets/berry) /obj/random/bluespace name = "Random Bluespace Item" @@ -1114,32 +1114,32 @@ /obj/random/bluespace/item_to_spawn() return pick( - prob(20);/obj/item/weapon/gun/energy/sizegun, - prob(20);/obj/item/device/slow_sizegun, + prob(20);/obj/item/gun/energy/sizegun, + prob(20);/obj/item/slow_sizegun, prob(20);/obj/item/clothing/accessory/collar/shock/bluespace, - prob(4);/obj/item/weapon/reagent_containers/glass/beaker/bluespace, - prob(4);/obj/item/device/bodysnatcher, + prob(4);/obj/item/reagent_containers/glass/beaker/bluespace, + prob(4);/obj/item/bodysnatcher, prob(10);/obj/item/clothing/under/hyperfiber, prob(10);/obj/item/clothing/under/hyperfiber/bluespace, - prob(20);/obj/item/weapon/implant/sizecontrol, - prob(2);/obj/item/weapon/storage/bag/ore/holding, - prob(2);/obj/item/weapon/storage/backpack/holding, - prob(2);/obj/item/weapon/storage/backpack/holding/duffle, - prob(2);/obj/item/weapon/storage/bag/trash/holding, - prob(2);/obj/item/weapon/storage/pouch/holding, - prob(2);/obj/item/weapon/storage/belt/medical/holding, - prob(2);/obj/item/weapon/storage/belt/utility/holding, - prob(2);/obj/item/device/perfect_tele, + prob(20);/obj/item/implant/sizecontrol, + prob(2);/obj/item/storage/bag/ore/holding, + prob(2);/obj/item/storage/backpack/holding, + prob(2);/obj/item/storage/backpack/holding/duffle, + prob(2);/obj/item/storage/bag/trash/holding, + prob(2);/obj/item/storage/pouch/holding, + prob(2);/obj/item/storage/belt/medical/holding, + prob(2);/obj/item/storage/belt/utility/holding, + prob(2);/obj/item/perfect_tele, prob(8);/obj/item/capture_crystal/random, - prob(10);/obj/item/weapon/bluespace_harpoon, - prob(10);/obj/item/weapon/bluespace_crystal, + prob(10);/obj/item/bluespace_harpoon, + prob(10);/obj/item/bluespace_crystal, prob(1);/obj/item/clothing/glasses/graviton, - prob(10);/obj/item/weapon/cracker, - prob(1);/obj/item/weapon/cracker/shrinking, - prob(1);/obj/item/weapon/cracker/growing, - prob(1);/obj/item/weapon/cracker/invisibility, - prob(1);/obj/item/weapon/cracker/drugged, - prob(1);/obj/item/weapon/cracker/knockover, - prob(1);/obj/item/weapon/cracker/vore, - prob(1);/obj/item/weapon/cracker/money + prob(10);/obj/item/cracker, + prob(1);/obj/item/cracker/shrinking, + prob(1);/obj/item/cracker/growing, + prob(1);/obj/item/cracker/invisibility, + prob(1);/obj/item/cracker/drugged, + prob(1);/obj/item/cracker/knockover, + prob(1);/obj/item/cracker/vore, + prob(1);/obj/item/cracker/money ) \ No newline at end of file diff --git a/code/game/objects/random/misc_vr.dm b/code/game/objects/random/misc_vr.dm index f8554a4f4ff..5be44703b20 100644 --- a/code/game/objects/random/misc_vr.dm +++ b/code/game/objects/random/misc_vr.dm @@ -7,8 +7,8 @@ icon_state = "explorer_shield" /obj/random/explorer_shield/item_to_spawn() - return pick(/obj/item/weapon/shield/riot/explorer, - /obj/item/weapon/shield/riot/explorer/purple) + return pick(/obj/item/shield/riot/explorer, + /obj/item/shield/riot/explorer/purple) /obj/random/awayloot name = "random away mission loot" @@ -18,33 +18,33 @@ spawn_nothing_percentage = 50 /obj/random/awayloot/item_to_spawn() - return pick(prob(50);/obj/item/weapon/aliencoin/basic, - prob(40);/obj/item/weapon/aliencoin/silver, - prob(30);/obj/item/weapon/aliencoin/gold, - prob(20);/obj/item/weapon/aliencoin/phoron, - prob(10);/obj/item/device/denecrotizer, + return pick(prob(50);/obj/item/aliencoin/basic, + prob(40);/obj/item/aliencoin/silver, + prob(30);/obj/item/aliencoin/gold, + prob(20);/obj/item/aliencoin/phoron, + prob(10);/obj/item/denecrotizer, prob(5);/obj/item/capture_crystal, - prob(5);/obj/item/device/perfect_tele, - prob(5);/obj/item/weapon/bluespace_harpoon, - prob(1);/obj/item/weapon/cell/infinite, - prob(1);/obj/item/weapon/cell/void, - prob(1);/obj/item/weapon/cell/device/weapon/recharge/alien, + prob(5);/obj/item/perfect_tele, + prob(5);/obj/item/bluespace_harpoon, + prob(1);/obj/item/cell/infinite, + prob(1);/obj/item/cell/void, + prob(1);/obj/item/cell/device/weapon/recharge/alien, prob(1);/obj/item/clothing/shoes/boots/speed, - prob(1);/obj/item/device/nif, - prob(1);/obj/item/device/paicard, - prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie, - prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, - prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie/med, + prob(1);/obj/item/nif, + prob(1);/obj/item/paicard, + prob(2);/obj/item/storage/backpack/dufflebag/syndie, + prob(2);/obj/item/storage/backpack/dufflebag/syndie/ammo, + prob(2);/obj/item/storage/backpack/dufflebag/syndie/med, prob(2);/obj/item/clothing/mask/gas/voice, - prob(2);/obj/item/device/radio_jammer, + prob(2);/obj/item/radio_jammer, prob(1);/obj/item/toy/bosunwhistle, - prob(1);/obj/item/weapon/bananapeel, + prob(1);/obj/item/bananapeel, prob(5);/obj/fiftyspawner/platinum, prob(3);/obj/fiftyspawner/gold, prob(3);/obj/fiftyspawner/silver, prob(1);/obj/fiftyspawner/diamond, prob(5);/obj/fiftyspawner/phoron, - prob(1);/obj/item/weapon/telecube/randomized, + prob(1);/obj/item/telecube/randomized, prob(1);/obj/item/capture_crystal/random ) @@ -54,36 +54,36 @@ /obj/random/awayloot/looseloot /obj/random/awayloot/looseloot/item_to_spawn() - return pick(prob(50);/obj/item/weapon/aliencoin, - prob(40);/obj/item/weapon/aliencoin/silver, - prob(30);/obj/item/weapon/aliencoin/gold, - prob(20);/obj/item/weapon/aliencoin/phoron, - prob(10);/obj/item/device/denecrotizer, + return pick(prob(50);/obj/item/aliencoin, + prob(40);/obj/item/aliencoin/silver, + prob(30);/obj/item/aliencoin/gold, + prob(20);/obj/item/aliencoin/phoron, + prob(10);/obj/item/denecrotizer, prob(5);/obj/item/capture_crystal, prob(3);/obj/item/capture_crystal/great, prob(1);/obj/item/capture_crystal/ultra, prob(4);/obj/item/capture_crystal/random, - prob(5);/obj/item/device/perfect_tele, - prob(5);/obj/item/weapon/bluespace_harpoon, - prob(1);/obj/item/weapon/cell/infinite, - prob(1);/obj/item/weapon/cell/void, - prob(1);/obj/item/weapon/cell/device/weapon/recharge/alien, + prob(5);/obj/item/perfect_tele, + prob(5);/obj/item/bluespace_harpoon, + prob(1);/obj/item/cell/infinite, + prob(1);/obj/item/cell/void, + prob(1);/obj/item/cell/device/weapon/recharge/alien, prob(1);/obj/item/clothing/shoes/boots/speed, - prob(1);/obj/item/device/nif, - prob(1);/obj/item/device/paicard, - prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie, - prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, - prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie/med, + prob(1);/obj/item/nif, + prob(1);/obj/item/paicard, + prob(2);/obj/item/storage/backpack/dufflebag/syndie, + prob(2);/obj/item/storage/backpack/dufflebag/syndie/ammo, + prob(2);/obj/item/storage/backpack/dufflebag/syndie/med, prob(2);/obj/item/clothing/mask/gas/voice, - prob(2);/obj/item/device/radio_jammer, + prob(2);/obj/item/radio_jammer, prob(1);/obj/item/toy/bosunwhistle, - prob(1);/obj/item/weapon/bananapeel, + prob(1);/obj/item/bananapeel, prob(5);/obj/fiftyspawner/platinum, prob(3);/obj/fiftyspawner/gold, prob(3);/obj/fiftyspawner/silver, prob(1);/obj/fiftyspawner/diamond, prob(5);/obj/fiftyspawner/phoron, - prob(1);/obj/item/weapon/telecube/randomized, + prob(1);/obj/item/telecube/randomized, prob(10);/obj/random/empty_or_lootable_crate, prob(10);/obj/random/medical, prob(5);/obj/random/firstaid, @@ -109,22 +109,22 @@ spawn_nothing_percentage = 50 /obj/random/mainttoyloot/item_to_spawn() - return pick(prob(50);/obj/item/weapon/aliencoin/basic, - prob(40);/obj/item/weapon/aliencoin/silver, - prob(30);/obj/item/weapon/aliencoin/gold, - prob(20);/obj/item/weapon/aliencoin/phoron, + return pick(prob(50);/obj/item/aliencoin/basic, + prob(40);/obj/item/aliencoin/silver, + prob(30);/obj/item/aliencoin/gold, + prob(20);/obj/item/aliencoin/phoron, prob(5);/obj/item/capture_crystal, prob(5);/obj/random/mouseray, - prob(5);/obj/item/device/perfect_tele, - prob(5);/obj/item/weapon/bluespace_harpoon, - prob(1);/obj/item/device/paicard, - prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie, - prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, - prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie/med, + prob(5);/obj/item/perfect_tele, + prob(5);/obj/item/bluespace_harpoon, + prob(1);/obj/item/paicard, + prob(2);/obj/item/storage/backpack/dufflebag/syndie, + prob(2);/obj/item/storage/backpack/dufflebag/syndie/ammo, + prob(2);/obj/item/storage/backpack/dufflebag/syndie/med, prob(2);/obj/item/clothing/mask/gas/voice, - prob(2);/obj/item/device/radio_jammer, + prob(2);/obj/item/radio_jammer, prob(1);/obj/item/toy/bosunwhistle, - prob(1);/obj/item/weapon/bananapeel, + prob(1);/obj/item/bananapeel, prob(5);/obj/fiftyspawner/platinum, prob(3);/obj/fiftyspawner/gold, prob(3);/obj/fiftyspawner/silver, @@ -189,8 +189,8 @@ prob(1);/obj/random/thermalponcho, prob(5);/obj/random/contraband, prob(5);/obj/random/cargopod, - prob(1);/obj/item/weapon/flame/lighter, - prob(1);/obj/item/weapon/storage/wallet/random, + prob(1);/obj/item/flame/lighter, + prob(1);/obj/item/storage/wallet/random, prob(1);/obj/random/cutout) /obj/random/instrument @@ -243,28 +243,28 @@ spawn_nothing_percentage = 0 /obj/random/potion/item_to_spawn() - return pick(prob(20);/obj/item/weapon/reagent_containers/glass/bottle/potion/healing, - prob(4);/obj/item/weapon/reagent_containers/glass/bottle/potion/greater_healing, - prob(20);/obj/item/weapon/reagent_containers/glass/bottle/potion/fire_resist, - prob(20);/obj/item/weapon/reagent_containers/glass/bottle/potion/antidote, - prob(20);/obj/item/weapon/reagent_containers/glass/bottle/potion/water, - prob(8);/obj/item/weapon/reagent_containers/glass/bottle/potion/regeneration, - prob(10);/obj/item/weapon/reagent_containers/glass/bottle/potion/panacea, - prob(10);/obj/item/weapon/reagent_containers/glass/bottle/potion/magic, - prob(10);/obj/item/weapon/reagent_containers/glass/bottle/potion/lightness, - prob(4);/obj/item/weapon/reagent_containers/glass/bottle/potion/SOP, - prob(4);/obj/item/weapon/reagent_containers/glass/bottle/potion/shrink, - prob(4);/obj/item/weapon/reagent_containers/glass/bottle/potion/growth, - prob(20);/obj/item/weapon/reagent_containers/glass/bottle/potion/pain, - prob(10);/obj/item/weapon/reagent_containers/glass/bottle/potion/faerie, - prob(10);/obj/item/weapon/reagent_containers/glass/bottle/potion/relaxation, - prob(10);/obj/item/weapon/reagent_containers/glass/bottle/potion/speed, - prob(10);/obj/item/weapon/reagent_containers/glass/bottle/potion/attractiveness, - prob(4);/obj/item/weapon/reagent_containers/glass/bottle/potion/girljuice, - prob(4);/obj/item/weapon/reagent_containers/glass/bottle/potion/boyjuice, - prob(4);/obj/item/weapon/reagent_containers/glass/bottle/potion/badpolymorph, - prob(2);/obj/item/weapon/reagent_containers/glass/bottle/potion/bonerepair, - prob(1);/obj/item/weapon/reagent_containers/glass/bottle/potion/truepolymorph + return pick(prob(20);/obj/item/reagent_containers/glass/bottle/potion/healing, + prob(4);/obj/item/reagent_containers/glass/bottle/potion/greater_healing, + prob(20);/obj/item/reagent_containers/glass/bottle/potion/fire_resist, + prob(20);/obj/item/reagent_containers/glass/bottle/potion/antidote, + prob(20);/obj/item/reagent_containers/glass/bottle/potion/water, + prob(8);/obj/item/reagent_containers/glass/bottle/potion/regeneration, + prob(10);/obj/item/reagent_containers/glass/bottle/potion/panacea, + prob(10);/obj/item/reagent_containers/glass/bottle/potion/magic, + prob(10);/obj/item/reagent_containers/glass/bottle/potion/lightness, + prob(4);/obj/item/reagent_containers/glass/bottle/potion/SOP, + prob(4);/obj/item/reagent_containers/glass/bottle/potion/shrink, + prob(4);/obj/item/reagent_containers/glass/bottle/potion/growth, + prob(20);/obj/item/reagent_containers/glass/bottle/potion/pain, + prob(10);/obj/item/reagent_containers/glass/bottle/potion/faerie, + prob(10);/obj/item/reagent_containers/glass/bottle/potion/relaxation, + prob(10);/obj/item/reagent_containers/glass/bottle/potion/speed, + prob(10);/obj/item/reagent_containers/glass/bottle/potion/attractiveness, + prob(4);/obj/item/reagent_containers/glass/bottle/potion/girljuice, + prob(4);/obj/item/reagent_containers/glass/bottle/potion/boyjuice, + prob(4);/obj/item/reagent_containers/glass/bottle/potion/badpolymorph, + prob(2);/obj/item/reagent_containers/glass/bottle/potion/bonerepair, + prob(1);/obj/item/reagent_containers/glass/bottle/potion/truepolymorph ) /obj/random/potion_ingredient @@ -274,28 +274,28 @@ spawn_nothing_percentage = 0 /obj/random/potion_ingredient/item_to_spawn() - return pick(prob(10);/obj/item/weapon/potion_material/blood_ruby, - prob(2);/obj/item/weapon/potion_material/ruby_eye, - prob(10);/obj/item/weapon/potion_material/golden_scale, - prob(10);/obj/item/weapon/potion_material/frozen_dew, - prob(10);/obj/item/weapon/potion_material/living_coral, - prob(4);/obj/item/weapon/potion_material/rare_horn, - prob(5);/obj/item/weapon/potion_material/moldy_bread, - prob(5);/obj/item/weapon/potion_material/glowing_gem, - prob(5);/obj/item/weapon/potion_material/giant_toe, - prob(2);/obj/item/weapon/potion_material/flesh_of_the_stars, - prob(2);/obj/item/weapon/potion_material/spinning_poppy, - prob(2);/obj/item/weapon/potion_material/salt_mage, - prob(10);/obj/item/weapon/potion_material/golden_grapes, - prob(5);/obj/item/weapon/potion_material/fairy_house, - prob(5);/obj/item/weapon/potion_material/thorny_bulb, - prob(5);/obj/item/weapon/potion_material/ancient_egg, - prob(5);/obj/item/weapon/potion_material/crown_stem, - prob(2);/obj/item/weapon/potion_material/red_ingot, - prob(2);/obj/item/weapon/potion_material/soft_diamond, - prob(2);/obj/item/weapon/potion_material/solid_mist, - prob(1);/obj/item/weapon/potion_material/spider_leg, - prob(1);/obj/item/weapon/potion_material/folded_dark + return pick(prob(10);/obj/item/potion_material/blood_ruby, + prob(2);/obj/item/potion_material/ruby_eye, + prob(10);/obj/item/potion_material/golden_scale, + prob(10);/obj/item/potion_material/frozen_dew, + prob(10);/obj/item/potion_material/living_coral, + prob(4);/obj/item/potion_material/rare_horn, + prob(5);/obj/item/potion_material/moldy_bread, + prob(5);/obj/item/potion_material/glowing_gem, + prob(5);/obj/item/potion_material/giant_toe, + prob(2);/obj/item/potion_material/flesh_of_the_stars, + prob(2);/obj/item/potion_material/spinning_poppy, + prob(2);/obj/item/potion_material/salt_mage, + prob(10);/obj/item/potion_material/golden_grapes, + prob(5);/obj/item/potion_material/fairy_house, + prob(5);/obj/item/potion_material/thorny_bulb, + prob(5);/obj/item/potion_material/ancient_egg, + prob(5);/obj/item/potion_material/crown_stem, + prob(2);/obj/item/potion_material/red_ingot, + prob(2);/obj/item/potion_material/soft_diamond, + prob(2);/obj/item/potion_material/solid_mist, + prob(1);/obj/item/potion_material/spider_leg, + prob(1);/obj/item/potion_material/folded_dark ) /obj/random/potion_ingredient/plus @@ -305,32 +305,32 @@ spawn_nothing_percentage = 0 /obj/random/potion_ingredient/plus/item_to_spawn() - return pick(prob(20);/obj/item/weapon/potion_material/blood_ruby, - prob(4);/obj/item/weapon/potion_material/ruby_eye, - prob(20);/obj/item/weapon/potion_material/golden_scale, - prob(20);/obj/item/weapon/potion_material/frozen_dew, - prob(20);/obj/item/weapon/potion_material/living_coral, - prob(8);/obj/item/weapon/potion_material/rare_horn, - prob(10);/obj/item/weapon/potion_material/moldy_bread, - prob(10);/obj/item/weapon/potion_material/glowing_gem, - prob(10);/obj/item/weapon/potion_material/giant_toe, - prob(4);/obj/item/weapon/potion_material/flesh_of_the_stars, - prob(4);/obj/item/weapon/potion_material/spinning_poppy, - prob(4);/obj/item/weapon/potion_material/salt_mage, - prob(20);/obj/item/weapon/potion_material/golden_grapes, - prob(10);/obj/item/weapon/potion_material/fairy_house, - prob(10);/obj/item/weapon/potion_material/thorny_bulb, - prob(10);/obj/item/weapon/potion_material/ancient_egg, - prob(10);/obj/item/weapon/potion_material/crown_stem, - prob(4);/obj/item/weapon/potion_material/red_ingot, - prob(4);/obj/item/weapon/potion_material/soft_diamond, - prob(4);/obj/item/weapon/potion_material/solid_mist, - prob(2);/obj/item/weapon/potion_material/spider_leg, - prob(2);/obj/item/weapon/potion_material/folded_dark, - prob(1);/obj/item/weapon/potion_material/glamour_transparent, - prob(1);/obj/item/weapon/potion_material/glamour_shrinking, - prob(1);/obj/item/weapon/potion_material/glamour_twinkling, - prob(1);/obj/item/weapon/potion_material/glamour_shard + return pick(prob(20);/obj/item/potion_material/blood_ruby, + prob(4);/obj/item/potion_material/ruby_eye, + prob(20);/obj/item/potion_material/golden_scale, + prob(20);/obj/item/potion_material/frozen_dew, + prob(20);/obj/item/potion_material/living_coral, + prob(8);/obj/item/potion_material/rare_horn, + prob(10);/obj/item/potion_material/moldy_bread, + prob(10);/obj/item/potion_material/glowing_gem, + prob(10);/obj/item/potion_material/giant_toe, + prob(4);/obj/item/potion_material/flesh_of_the_stars, + prob(4);/obj/item/potion_material/spinning_poppy, + prob(4);/obj/item/potion_material/salt_mage, + prob(20);/obj/item/potion_material/golden_grapes, + prob(10);/obj/item/potion_material/fairy_house, + prob(10);/obj/item/potion_material/thorny_bulb, + prob(10);/obj/item/potion_material/ancient_egg, + prob(10);/obj/item/potion_material/crown_stem, + prob(4);/obj/item/potion_material/red_ingot, + prob(4);/obj/item/potion_material/soft_diamond, + 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 ) /obj/random/potion_base @@ -340,9 +340,9 @@ spawn_nothing_percentage = 0 /obj/random/potion_base/item_to_spawn() - return pick(prob(10);/obj/item/weapon/potion_base/aqua_regia, - prob(10);/obj/item/weapon/potion_base/ichor, - prob(10);/obj/item/weapon/potion_base/alkahest + return pick(prob(10);/obj/item/potion_base/aqua_regia, + prob(10);/obj/item/potion_base/ichor, + prob(10);/obj/item/potion_base/alkahest ) /obj/random/fantasy_item @@ -352,30 +352,30 @@ spawn_nothing_percentage = 0 /obj/random/fantasy_item/item_to_spawn() - return pick(prob(3);/obj/item/device/healthanalyzer/scroll, - prob(10);/obj/item/weapon/gun/energy/taser/magic, - prob(5);/obj/item/weapon/bluespace_harpoon/wand, - prob(10);/obj/item/device/slow_sizegun/magic, + return pick(prob(3);/obj/item/healthanalyzer/scroll, + prob(10);/obj/item/gun/energy/taser/magic, + prob(5);/obj/item/bluespace_harpoon/wand, + prob(10);/obj/item/slow_sizegun/magic, prob(10);/obj/item/clothing/gloves/bluespace/magic, - prob(30);/obj/item/weapon/coin/gold, - prob(30);/obj/item/weapon/coin/silver, - prob(30);/obj/item/weapon/coin/platinum, - prob(20);/obj/item/weapon/material/sword/rapier, - prob(20);/obj/item/weapon/material/sword/longsword, + prob(30);/obj/item/coin/gold, + prob(30);/obj/item/coin/silver, + prob(30);/obj/item/coin/platinum, + prob(20);/obj/item/material/sword/rapier, + prob(20);/obj/item/material/sword/longsword, prob(20);/obj/item/clothing/head/helmet/bucket/wood, - prob(3);/obj/item/weapon/tool/wirecutters/alien/magic, - prob(3);/obj/item/weapon/tool/crowbar/alien/magic, - prob(3);/obj/item/weapon/tool/screwdriver/alien/magic, - prob(3);/obj/item/weapon/weldingtool/alien/magic, - prob(3);/obj/item/weapon/tool/wrench/alien/magic, - prob(3);/obj/item/weapon/surgical/bone_clamp/alien/magic, + prob(3);/obj/item/tool/wirecutters/alien/magic, + prob(3);/obj/item/tool/crowbar/alien/magic, + prob(3);/obj/item/tool/screwdriver/alien/magic, + prob(3);/obj/item/weldingtool/alien/magic, + prob(3);/obj/item/tool/wrench/alien/magic, + prob(3);/obj/item/surgical/bone_clamp/alien/magic, prob(10);/obj/item/stack/material/gold, prob(10);/obj/item/stack/material/silver, - prob(3);/obj/item/weapon/bone/skull, - prob(20);/obj/item/weapon/material/twohanded/staff, - prob(3);/obj/item/weapon/gun/energy/hooklauncher/ring, + prob(3);/obj/item/bone/skull, + prob(20);/obj/item/material/twohanded/staff, + prob(3);/obj/item/gun/energy/hooklauncher/ring, prob(3);/obj/item/toy/eight_ball, - prob(3);/obj/item/device/perfect_tele/magic + prob(3);/obj/item/perfect_tele/magic ) /obj/random/fantasy_item/better @@ -385,21 +385,21 @@ spawn_nothing_percentage = 0 /obj/random/fantasy_item/better/item_to_spawn() - return pick(prob(10);/obj/item/device/healthanalyzer/scroll, - prob(10);/obj/item/weapon/gun/energy/taser/magic, - prob(10);/obj/item/weapon/bluespace_harpoon/wand, - prob(10);/obj/item/device/slow_sizegun/magic, + return pick(prob(10);/obj/item/healthanalyzer/scroll, + prob(10);/obj/item/gun/energy/taser/magic, + prob(10);/obj/item/bluespace_harpoon/wand, + prob(10);/obj/item/slow_sizegun/magic, prob(10);/obj/item/clothing/gloves/bluespace/magic, - prob(10);/obj/item/weapon/tool/wirecutters/alien/magic, - prob(10);/obj/item/weapon/tool/crowbar/alien/magic, - prob(10);/obj/item/weapon/tool/screwdriver/alien/magic, - prob(10);/obj/item/weapon/weldingtool/alien/magic, - prob(10);/obj/item/weapon/tool/wrench/alien/magic, - prob(10);/obj/item/weapon/surgical/bone_clamp/alien/magic, - prob(10);/obj/item/weapon/material/twohanded/staff, - prob(10);/obj/item/weapon/gun/energy/hooklauncher/ring, - prob(10);/obj/item/device/perfect_tele/magic, - prob(10);/obj/item/weapon/reagent_containers/glass/bottle/potion/truepolymorph + prob(10);/obj/item/tool/wirecutters/alien/magic, + prob(10);/obj/item/tool/crowbar/alien/magic, + prob(10);/obj/item/tool/screwdriver/alien/magic, + prob(10);/obj/item/weldingtool/alien/magic, + prob(10);/obj/item/tool/wrench/alien/magic, + prob(10);/obj/item/surgical/bone_clamp/alien/magic, + prob(10);/obj/item/material/twohanded/staff, + prob(10);/obj/item/gun/energy/hooklauncher/ring, + prob(10);/obj/item/perfect_tele/magic, + prob(10);/obj/item/reagent_containers/glass/bottle/potion/truepolymorph ) /obj/random/mega_nukies @@ -410,12 +410,12 @@ spawn_nothing_percentage = 0 /obj/random/mega_nukies/item_to_spawn() - return pick(prob(5);/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_mega_sight, - prob(2);/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_mega_heart, - prob(5);/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_mega_sleep, - prob(5);/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_mega_shock, - prob(5);/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_mega_fast, - prob(5);/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_mega_high, - prob(10);/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_mega_shrink, - prob(10);/obj/item/weapon/reagent_containers/food/drinks/cans/nukie_mega_grow + return pick(prob(5);/obj/item/reagent_containers/food/drinks/cans/nukie_mega_sight, + prob(2);/obj/item/reagent_containers/food/drinks/cans/nukie_mega_heart, + prob(5);/obj/item/reagent_containers/food/drinks/cans/nukie_mega_sleep, + prob(5);/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shock, + prob(5);/obj/item/reagent_containers/food/drinks/cans/nukie_mega_fast, + prob(5);/obj/item/reagent_containers/food/drinks/cans/nukie_mega_high, + prob(10);/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shrink, + prob(10);/obj/item/reagent_containers/food/drinks/cans/nukie_mega_grow ) diff --git a/code/game/objects/random/mob_vr.dm b/code/game/objects/random/mob_vr.dm index 101c4f5f5ce..7ca70c98430 100644 --- a/code/game/objects/random/mob_vr.dm +++ b/code/game/objects/random/mob_vr.dm @@ -5,88 +5,88 @@ icon_state = "p08" spawn_nothing_percentage = 50 /obj/random/weapon/item_to_spawn() - return pick(prob(11);/obj/random/ammo_all,\ - prob(11);/obj/item/weapon/gun/energy/laser,\ - prob(11);/obj/item/weapon/gun/projectile/pirate,\ - prob(10);/obj/item/weapon/material/twohanded/spear,\ - prob(10);/obj/item/weapon/gun/energy/stunrevolver,\ - prob(10);/obj/item/weapon/gun/energy/taser,\ - prob(10);/obj/item/weapon/gun/projectile/shotgun/doublebarrel/pellet,\ - prob(10);/obj/item/weapon/material/knife,\ - prob(10);/obj/item/weapon/gun/projectile/luger,\ - /* prob(10);/obj/item/weapon/gun/projectile/pipegun,\ */ - prob(10);/obj/item/weapon/gun/projectile/revolver/detective,\ - prob(10);/obj/item/weapon/gun/projectile/revolver/judge,\ - prob(10);/obj/item/weapon/gun/projectile/colt,\ - prob(10);/obj/item/weapon/gun/projectile/shotgun/pump,\ - prob(10);/obj/item/weapon/gun/projectile/shotgun/pump/rifle,\ - prob(10);/obj/item/weapon/melee/baton,\ - prob(10);/obj/item/weapon/melee/telebaton,\ - prob(10);/obj/item/weapon/melee/classic_baton,\ - prob(9);/obj/item/weapon/gun/projectile/automatic/wt550/lethal,\ - prob(9);/obj/item/weapon/gun/projectile/automatic/pdw,\ - prob(9);/obj/item/weapon/gun/projectile/automatic/sol, \ - prob(9);/obj/item/weapon/gun/energy/crossbow/largecrossbow,\ - prob(9);/obj/item/weapon/gun/projectile/pistol,\ - prob(9);/obj/item/weapon/gun/projectile/shotgun/pump,\ - prob(9);/obj/item/weapon/cane/concealed,\ - prob(9);/obj/item/weapon/gun/energy/gun,\ - prob(8);/obj/item/weapon/gun/energy/retro,\ - prob(8);/obj/item/weapon/gun/energy/gun/eluger,\ - prob(8);/obj/item/weapon/gun/energy/xray,\ - prob(8);/obj/item/weapon/gun/projectile/automatic/c20r,\ - prob(8);/obj/item/weapon/melee/energy/sword,\ - prob(8);/obj/item/weapon/gun/projectile/derringer,\ - prob(8);/obj/item/weapon/gun/projectile/revolver/lemat,\ - /* prob(8);/obj/item/weapon/gun/projectile/shotgun/pump/rifle/mosin,\ */ - /* prob(8);/obj/item/weapon/gun/projectile/automatic/m41a,\ */ - prob(7);/obj/item/weapon/material/butterfly,\ - prob(7);/obj/item/weapon/material/butterfly/switchblade,\ - prob(7);/obj/item/weapon/gun/projectile/giskard,\ - prob(7);/obj/item/weapon/gun/projectile/automatic/p90,\ - prob(7);/obj/item/weapon/gun/projectile/automatic/sts35,\ - prob(7);/obj/item/weapon/gun/projectile/shotgun/pump/combat,\ - prob(6);/obj/item/weapon/gun/energy/sniperrifle,\ - prob(6);/obj/item/weapon/gun/projectile/automatic/z8,\ - prob(6);/obj/item/weapon/gun/energy/captain,\ - prob(6);/obj/item/weapon/material/knife/tacknife,\ - prob(5);/obj/item/weapon/gun/projectile/shotgun/pump/USDF,\ - prob(5);/obj/item/weapon/gun/projectile/giskard/olivaw,\ - prob(5);/obj/item/weapon/gun/projectile/revolver/consul,\ - prob(5);/obj/item/weapon/gun/projectile/revolver/mateba,\ - prob(5);/obj/item/weapon/gun/projectile/revolver,\ - prob(4);/obj/item/weapon/gun/projectile/deagle,\ - prob(4);/obj/item/weapon/material/knife/tacknife/combatknife,\ - prob(4);/obj/item/weapon/melee/energy/sword,\ - prob(4);/obj/item/weapon/gun/projectile/automatic/mini_uzi,\ - prob(4);/obj/item/weapon/gun/projectile/contender,\ - prob(4);/obj/item/weapon/gun/projectile/contender/tacticool,\ - prob(3);/obj/item/weapon/gun/projectile/SVD,\ - prob(3);/obj/item/weapon/gun/energy/lasercannon,\ - prob(3);/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever,\ - prob(3);/obj/item/weapon/gun/projectile/automatic/bullpup,\ - prob(2);/obj/item/weapon/gun/energy/pulse_rifle,\ - prob(2);/obj/item/weapon/gun/energy/gun/nuclear,\ - prob(2);/obj/item/weapon/gun/projectile/automatic/l6_saw,\ - prob(2);/obj/item/weapon/gun/energy/gun/burst,\ - prob(2);/obj/item/weapon/storage/box/frags,\ - prob(2);/obj/item/weapon/twohanded/fireaxe,\ - prob(2);/obj/item/weapon/gun/projectile/luger/brown,\ - prob(2);/obj/item/weapon/gun/launcher/crossbow,\ - prob(2);/obj/item/weapon/melee/shock_maul,\ - /* prob(1);/obj/item/weapon/gun/projectile/automatic/battlerifle,\ */ // Too OP - prob(1);/obj/item/weapon/gun/projectile/deagle/gold,\ - prob(1);/obj/item/weapon/gun/energy/imperial,\ - prob(1);/obj/item/weapon/gun/projectile/automatic/as24,\ - prob(1);/obj/item/weapon/gun/launcher/rocket,\ - prob(1);/obj/item/weapon/gun/launcher/grenade,\ - prob(1);/obj/item/weapon/gun/projectile/gyropistol,\ - prob(1);/obj/item/weapon/gun/projectile/heavysniper,\ - prob(1);/obj/item/weapon/plastique,\ - prob(1);/obj/item/weapon/gun/energy/ionrifle,\ - prob(1);/obj/item/weapon/material/sword,\ - prob(1);/obj/item/weapon/cane/concealed,\ - prob(1);/obj/item/weapon/material/sword/katana) + return pick(prob(11);/obj/random/ammo_all, + prob(11);/obj/item/gun/energy/laser, + prob(11);/obj/item/gun/projectile/pirate, + prob(10);/obj/item/material/twohanded/spear, + prob(10);/obj/item/gun/energy/stunrevolver, + prob(10);/obj/item/gun/energy/taser, + prob(10);/obj/item/gun/projectile/shotgun/doublebarrel/pellet, + prob(10);/obj/item/material/knife, + prob(10);/obj/item/gun/projectile/luger, + /* prob(10);/obj/item/gun/projectile/pipegun, */ + prob(10);/obj/item/gun/projectile/revolver/detective, + prob(10);/obj/item/gun/projectile/revolver/judge, + prob(10);/obj/item/gun/projectile/colt, + prob(10);/obj/item/gun/projectile/shotgun/pump, + prob(10);/obj/item/gun/projectile/shotgun/pump/rifle, + prob(10);/obj/item/melee/baton, + prob(10);/obj/item/melee/telebaton, + prob(10);/obj/item/melee/classic_baton, + prob(9);/obj/item/gun/projectile/automatic/wt550/lethal, + prob(9);/obj/item/gun/projectile/automatic/pdw, + prob(9);/obj/item/gun/projectile/automatic/sol, + prob(9);/obj/item/gun/energy/crossbow/largecrossbow, + prob(9);/obj/item/gun/projectile/pistol, + prob(9);/obj/item/gun/projectile/shotgun/pump, + prob(9);/obj/item/cane/concealed, + prob(9);/obj/item/gun/energy/gun, + prob(8);/obj/item/gun/energy/retro, + prob(8);/obj/item/gun/energy/gun/eluger, + prob(8);/obj/item/gun/energy/xray, + prob(8);/obj/item/gun/projectile/automatic/c20r, + prob(8);/obj/item/melee/energy/sword, + prob(8);/obj/item/gun/projectile/derringer, + prob(8);/obj/item/gun/projectile/revolver/lemat, + /* prob(8);/obj/item/gun/projectile/shotgun/pump/rifle/mosin, */ + /* prob(8);/obj/item/gun/projectile/automatic/m41a, */ + prob(7);/obj/item/material/butterfly, + prob(7);/obj/item/material/butterfly/switchblade, + prob(7);/obj/item/gun/projectile/giskard, + prob(7);/obj/item/gun/projectile/automatic/p90, + prob(7);/obj/item/gun/projectile/automatic/sts35, + prob(7);/obj/item/gun/projectile/shotgun/pump/combat, + prob(6);/obj/item/gun/energy/sniperrifle, + prob(6);/obj/item/gun/projectile/automatic/z8, + prob(6);/obj/item/gun/energy/captain, + prob(6);/obj/item/material/knife/tacknife, + prob(5);/obj/item/gun/projectile/shotgun/pump/USDF, + prob(5);/obj/item/gun/projectile/giskard/olivaw, + prob(5);/obj/item/gun/projectile/revolver/consul, + prob(5);/obj/item/gun/projectile/revolver/mateba, + prob(5);/obj/item/gun/projectile/revolver, + prob(4);/obj/item/gun/projectile/deagle, + prob(4);/obj/item/material/knife/tacknife/combatknife, + prob(4);/obj/item/melee/energy/sword, + prob(4);/obj/item/gun/projectile/automatic/mini_uzi, + prob(4);/obj/item/gun/projectile/contender, + prob(4);/obj/item/gun/projectile/contender/tacticool, + prob(3);/obj/item/gun/projectile/SVD, + prob(3);/obj/item/gun/energy/lasercannon, + prob(3);/obj/item/gun/projectile/shotgun/pump/rifle/lever, + prob(3);/obj/item/gun/projectile/automatic/bullpup, + prob(2);/obj/item/gun/energy/pulse_rifle, + prob(2);/obj/item/gun/energy/gun/nuclear, + prob(2);/obj/item/gun/projectile/automatic/l6_saw, + prob(2);/obj/item/gun/energy/gun/burst, + prob(2);/obj/item/storage/box/frags, + prob(2);/obj/item/twohanded/fireaxe, + prob(2);/obj/item/gun/projectile/luger/brown, + prob(2);/obj/item/gun/launcher/crossbow, + prob(2);/obj/item/melee/shock_maul, + /* prob(1);/obj/item/gun/projectile/automatic/battlerifle, */ // Too OP + prob(1);/obj/item/gun/projectile/deagle/gold, + prob(1);/obj/item/gun/energy/imperial, + prob(1);/obj/item/gun/projectile/automatic/as24, + prob(1);/obj/item/gun/launcher/rocket, + prob(1);/obj/item/gun/launcher/grenade, + prob(1);/obj/item/gun/projectile/gyropistol, + prob(1);/obj/item/gun/projectile/heavysniper, + prob(1);/obj/item/plastique, + prob(1);/obj/item/gun/energy/ionrifle, + prob(1);/obj/item/material/sword, + prob(1);/obj/item/cane/concealed, + prob(1);/obj/item/material/sword/katana) /obj/random/weapon/guarenteed spawn_nothing_percentage = 0 @@ -97,43 +97,43 @@ icon = 'icons/obj/ammo.dmi' icon_state = "666" /obj/random/ammo_all/item_to_spawn() - return pick(prob(5);/obj/item/ammo_magazine/ammo_box/b12g,\ - prob(5);/obj/item/ammo_magazine/ammo_box/b12g/pellet,\ - prob(5);/obj/item/ammo_magazine/clip/c762,\ - prob(5);/obj/item/ammo_magazine/m380,\ - prob(5);/obj/item/ammo_magazine/m45,\ - prob(5);/obj/item/ammo_magazine/m9mm,\ - prob(5);/obj/item/ammo_magazine/s38,\ - prob(4);/obj/item/ammo_magazine/clip/c45,\ - prob(4);/obj/item/ammo_magazine/clip/c9mm,\ - prob(4);/obj/item/ammo_magazine/m45uzi,\ - prob(4);/obj/item/ammo_magazine/m9mml,\ - prob(4);/obj/item/ammo_magazine/m9mmt,\ - prob(4);/obj/item/ammo_magazine/m9mmp90,\ - prob(4);/obj/item/ammo_magazine/m10mm,\ - prob(4);/obj/item/ammo_magazine/m545/small,\ - prob(3);/obj/item/ammo_magazine/clip/c44,\ - prob(3);/obj/item/ammo_magazine/ammo_box/b10mm/emp,\ - prob(3);/obj/item/ammo_magazine/ammo_box/b10mm,\ - prob(3);/obj/item/ammo_magazine/s44,\ - prob(3);/obj/item/ammo_magazine/m762,\ - prob(3);/obj/item/ammo_magazine/m545,\ - prob(3);/obj/item/weapon/cell/device/weapon,\ - prob(2);/obj/item/ammo_magazine/m44,\ - prob(2);/obj/item/ammo_magazine/s357,\ - prob(2);/obj/item/ammo_magazine/m762/ext,\ + return pick(prob(5);/obj/item/ammo_magazine/ammo_box/b12g, + prob(5);/obj/item/ammo_magazine/ammo_box/b12g/pellet, + prob(5);/obj/item/ammo_magazine/clip/c762, + prob(5);/obj/item/ammo_magazine/m380, + prob(5);/obj/item/ammo_magazine/m45, + prob(5);/obj/item/ammo_magazine/m9mm, + prob(5);/obj/item/ammo_magazine/s38, + prob(4);/obj/item/ammo_magazine/clip/c45, + prob(4);/obj/item/ammo_magazine/clip/c9mm, + prob(4);/obj/item/ammo_magazine/m45uzi, + prob(4);/obj/item/ammo_magazine/m9mml, + prob(4);/obj/item/ammo_magazine/m9mmt, + prob(4);/obj/item/ammo_magazine/m9mmp90, + prob(4);/obj/item/ammo_magazine/m10mm, + prob(4);/obj/item/ammo_magazine/m545/small, + prob(3);/obj/item/ammo_magazine/clip/c44, + prob(3);/obj/item/ammo_magazine/ammo_box/b10mm/emp, + prob(3);/obj/item/ammo_magazine/ammo_box/b10mm, + prob(3);/obj/item/ammo_magazine/s44, + prob(3);/obj/item/ammo_magazine/m762, + prob(3);/obj/item/ammo_magazine/m545, + prob(3);/obj/item/cell/device/weapon, + prob(2);/obj/item/ammo_magazine/m44, + prob(2);/obj/item/ammo_magazine/s357, + prob(2);/obj/item/ammo_magazine/m762/ext, prob(2);/obj/item/ammo_magazine/clip/c12g, - prob(2);/obj/item/ammo_magazine/clip/c12g/pellet,\ - prob(1);/obj/item/ammo_magazine/m45tommy,\ - /* prob(1);/obj/item/ammo_magazine/m95,\ */ - prob(1);/obj/item/ammo_casing/rocket,\ - prob(1);/obj/item/ammo_magazine/ammo_box/b145,\ - prob(1);/obj/item/ammo_magazine/ammo_box/b12g/flash,\ - prob(1);/obj/item/ammo_magazine/ammo_box/b12g/beanbag,\ - prob(1);/obj/item/ammo_magazine/ammo_box/b12g/stunshell,\ - prob(1);/obj/item/ammo_magazine/mtg,\ - prob(1);/obj/item/ammo_magazine/m12gdrum,\ - prob(1);/obj/item/ammo_magazine/m12gdrum/pellet,\ + prob(2);/obj/item/ammo_magazine/clip/c12g/pellet, + prob(1);/obj/item/ammo_magazine/m45tommy, + /* prob(1);/obj/item/ammo_magazine/m95, */ + prob(1);/obj/item/ammo_casing/rocket, + prob(1);/obj/item/ammo_magazine/ammo_box/b145, + prob(1);/obj/item/ammo_magazine/ammo_box/b12g/flash, + prob(1);/obj/item/ammo_magazine/ammo_box/b12g/beanbag, + prob(1);/obj/item/ammo_magazine/ammo_box/b12g/stunshell, + prob(1);/obj/item/ammo_magazine/mtg, + prob(1);/obj/item/ammo_magazine/m12gdrum, + prob(1);/obj/item/ammo_magazine/m12gdrum/pellet, prob(1);/obj/item/ammo_magazine/m45tommydrum ) @@ -145,23 +145,23 @@ spawn_nothing_percentage = 0 /obj/random/cargopod/item_to_spawn() - return pick(prob(10);/obj/item/poster,\ - prob(8);/obj/item/weapon/haircomb,\ - prob(6);/obj/item/weapon/storage/pill_bottle/paracetamol,\ - prob(6);/obj/item/weapon/material/butterflyblade,\ - prob(6);/obj/item/weapon/material/butterflyhandle,\ - prob(4);/obj/item/weapon/storage/pill_bottle/happy,\ - prob(4);/obj/item/weapon/storage/pill_bottle/zoom,\ - prob(4);/obj/item/weapon/material/butterfly,\ - prob(2);/obj/item/weapon/material/butterfly/switchblade,\ - prob(2);/obj/item/clothing/gloves/knuckledusters,\ - prob(2);/obj/item/weapon/reagent_containers/syringe/drugs,\ - prob(1);/obj/item/weapon/material/knife/tacknife,\ - prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc,\ - prob(1);/obj/item/weapon/beartrap,\ - prob(1);/obj/item/weapon/handcuffs,\ - prob(1);/obj/item/weapon/handcuffs/legcuffs,\ - prob(1);/obj/item/weapon/reagent_containers/syringe/steroid) + return pick(prob(10);/obj/item/poster, + prob(8);/obj/item/haircomb, + prob(6);/obj/item/storage/pill_bottle/paracetamol, + prob(6);/obj/item/material/butterflyblade, + prob(6);/obj/item/material/butterflyhandle, + prob(4);/obj/item/storage/pill_bottle/happy, + prob(4);/obj/item/storage/pill_bottle/zoom, + prob(4);/obj/item/material/butterfly, + prob(2);/obj/item/material/butterfly/switchblade, + prob(2);/obj/item/clothing/gloves/knuckledusters, + prob(2);/obj/item/reagent_containers/syringe/drugs, + prob(1);/obj/item/material/knife/tacknife, + prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc, + prob(1);/obj/item/beartrap, + prob(1);/obj/item/handcuffs, + prob(1);/obj/item/handcuffs/legcuffs, + prob(1);/obj/item/reagent_containers/syringe/steroid) //A random thing so that the spawn_nothing_percentage can be used w/o duplicating code. /obj/random/trash_pile @@ -210,12 +210,12 @@ icon_state = "firstaid" /obj/random/tetheraid/item_to_spawn() - return pick(prob(10);/obj/item/weapon/storage/firstaid/regular, - prob(8);/obj/item/weapon/storage/firstaid/toxin, - prob(8);/obj/item/weapon/storage/firstaid/o2, - prob(5);/obj/item/weapon/storage/firstaid/adv, - prob(8);/obj/item/weapon/storage/firstaid/fire, - prob(1);/obj/item/device/denecrotizer/medical) + return pick(prob(10);/obj/item/storage/firstaid/regular, + prob(8);/obj/item/storage/firstaid/toxin, + prob(8);/obj/item/storage/firstaid/o2, + prob(5);/obj/item/storage/firstaid/adv, + prob(8);/obj/item/storage/firstaid/fire, + prob(1);/obj/item/denecrotizer/medical) //Override from maintenance.dm to prevent combat kits from spawning in Tether maintenance /obj/random/maintenance/item_to_spawn() diff --git a/code/game/objects/random/spacesuits.dm b/code/game/objects/random/spacesuits.dm index 00416fa19ae..417f03ec3d7 100644 --- a/code/game/objects/random/spacesuits.dm +++ b/code/game/objects/random/spacesuits.dm @@ -257,12 +257,12 @@ icon_state = "generic" /obj/random/rigsuit/item_to_spawn() - return pick(prob(4);/obj/item/weapon/rig/light/hacker, - prob(5);/obj/item/weapon/rig/industrial, - prob(5);/obj/item/weapon/rig/eva, - prob(4);/obj/item/weapon/rig/light/stealth, - prob(3);/obj/item/weapon/rig/hazard, - prob(1);/obj/item/weapon/rig/merc/empty) + return pick(prob(4);/obj/item/rig/light/hacker, + prob(5);/obj/item/rig/industrial, + prob(5);/obj/item/rig/eva, + prob(4);/obj/item/rig/light/stealth, + prob(3);/obj/item/rig/hazard, + prob(1);/obj/item/rig/merc/empty) //VOREStation Add Start /obj/random/rigsuit/chancetofail spawn_nothing_percentage = 50 diff --git a/code/game/objects/random/unidentified/medicine.dm b/code/game/objects/random/unidentified/medicine.dm index 3bd10ba4f2d..3e3f671e911 100644 --- a/code/game/objects/random/unidentified/medicine.dm +++ b/code/game/objects/random/unidentified/medicine.dm @@ -19,31 +19,31 @@ much more likely to show up. This is done for several purposes; /obj/random/unidentified_medicine/item_to_spawn() return pick( - /obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/toxin/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/oxy/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/stimm/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bliss/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/expired/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/serotrotium/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/mindbreaker/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/psilocybin/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/soporific/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/cyanide/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/impedrezene/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/mutagen/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/defective_nanites/unidentified, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/contaminated/unidentified) + /obj/item/reagent_containers/hypospray/autoinjector/bonemed/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/clonemed/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/toxin/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/oxy/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/stimm/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/bliss/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/expired/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/serotrotium/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/mindbreaker/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/psilocybin/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/soporific/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/cyanide/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/impedrezene/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/mutagen/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/defective_nanites/unidentified, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated/unidentified) // Produces things you might find in an old medicine cabinet in a PoI. // Old cabinets are typical of ruins and abandoned buildings in the plains, meaning they're usually easier to reach, and as such, inferior loot. @@ -51,14 +51,14 @@ much more likely to show up. This is done for several purposes; // 30 Good, 70 Bad. 30% to get something good. // Poor odds, but these are fairly easy to reach as they're in abandoned areas. return pick( - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/toxin/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/oxy/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified, - prob(65);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/expired/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/contaminated/unidentified) + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/toxin/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/oxy/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified, + prob(65);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/expired/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated/unidentified) // Medicine belonging to a place still being occupied (or was recently), meaning the goods might still be fresh, and better. /obj/random/unidentified_medicine/fresh_medicine/item_to_spawn() @@ -66,17 +66,17 @@ much more likely to show up. This is done for several purposes; // 80 Good, 25 Bad. 76% chance of getting something good. // Good odds, but the contents aren't super great unless someone gets lucky. return pick( - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed/unidentified, - prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute/unidentified, - prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn/unidentified, - prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/toxin/unidentified, - prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/oxy/unidentified, - prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity/unidentified, - prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified, - prob(25);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/expired/unidentified) + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/bonemed/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/clonemed/unidentified, + prob(10);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute/unidentified, + prob(10);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn/unidentified, + prob(10);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/toxin/unidentified, + prob(10);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/oxy/unidentified, + prob(10);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity/unidentified, + prob(10);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified, + prob(25);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/expired/unidentified) // For military PoIs like BSD. High odds of good loot since those PoIs are really hard. /obj/random/unidentified_medicine/combat_medicine/item_to_spawn() @@ -84,16 +84,16 @@ much more likely to show up. This is done for several purposes; // 75 Good, 30 Bad, roughly 71.4% chance to get something good. // Very high but very hard to reach and still has a chance of ending poorly if injecting blind. return pick( - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified, - prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified, - prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified, - prob(30);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified, - prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/soporific/unidentified, - prob(30);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/cyanide/unidentified) + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/bonemed/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/clonemed/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified, + prob(10);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified, + prob(10);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified, + prob(30);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified, + prob(10);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/soporific/unidentified, + prob(30);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/cyanide/unidentified) // Hyposprays found inside various illicit places. /obj/random/unidentified_medicine/drug_den/item_to_spawn() @@ -101,22 +101,22 @@ much more likely to show up. This is done for several purposes; // 70 Good, 160 Bad, roughly 30% to get something good. // Poor odds, but there are a lot of these scattered in the drug dens and illegal chem labs. return pick( - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed/unidentified, - prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified, - prob(40);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified, - prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/stimm/unidentified, - prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bliss/unidentified, - prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/serotrotium/unidentified, - prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin/unidentified, - prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/mindbreaker/unidentified, - prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/psilocybin/unidentified, - prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/soporific/unidentified, - prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/impedrezene/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/cyanide/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/contaminated/unidentified) + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/bonemed/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/clonemed/unidentified, + prob(10);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified, + prob(40);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified, + prob(20);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/stimm/unidentified, + prob(20);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/bliss/unidentified, + prob(20);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/serotrotium/unidentified, + prob(20);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin/unidentified, + prob(20);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/mindbreaker/unidentified, + prob(20);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/psilocybin/unidentified, + prob(20);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/soporific/unidentified, + prob(10);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/impedrezene/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/cyanide/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated/unidentified) // Medicine made FOR SCIENCE. /obj/random/unidentified_medicine/scientific/item_to_spawn() @@ -124,31 +124,31 @@ much more likely to show up. This is done for several purposes; // 45 Good, 45 Bad, 50% chance to get something good. // Do you feel lucky? return pick( - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed/unidentified, - prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified, - prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified, - prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites/unidentified, - prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/contaminated/unidentified, - prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/cyanide/unidentified, - prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/mutagen/unidentified, - prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/defective_nanites/unidentified) + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/bonemed/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/clonemed/unidentified, + prob(10);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified, + prob(10);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified, + prob(10);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites/unidentified, + prob(20);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated/unidentified, + prob(10);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/cyanide/unidentified, + prob(10);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/mutagen/unidentified, + prob(5);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/defective_nanites/unidentified) // Nanomachines, son. Found in very advanced places such as the Crashed UFO. /obj/random/unidentified_medicine/nanites/item_to_spawn() // You better identify this if you value your life. // 30 Good, 70 Bad. 30% of getting a good outcome. return pick( - prob(30);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites/unidentified, - prob(70);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/defective_nanites/unidentified) + prob(30);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites/unidentified, + prob(70);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/defective_nanites/unidentified) // Found in virus-related areas like the Quarantined Shuttle. /obj/random/unidentified_medicine/viral/item_to_spawn() // Another one where's its important to identify the hypo. // 30 Good, 70 Bad. 30% of getting a good outcome. return pick( - prob(30);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity/unidentified, - prob(40);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/expired/unidentified, - prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/mutagen/unidentified, - prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/contaminated/unidentified) \ No newline at end of file + prob(30);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity/unidentified, + prob(40);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/expired/unidentified, + prob(10);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/mutagen/unidentified, + prob(20);/obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated/unidentified) \ No newline at end of file diff --git a/code/game/objects/structures/alien/alien.dm b/code/game/objects/structures/alien/alien.dm index 9b192408fa8..f161d8cfc3e 100644 --- a/code/game/objects/structures/alien/alien.dm +++ b/code/game/objects/structures/alien/alien.dm @@ -55,7 +55,7 @@ healthcheck() return -/obj/structure/alien/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/alien/attackby(obj/item/W as obj, mob/user as mob) user.setClickCooldown(user.get_attack_speed(W)) var/aforce = W.force diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index 5e69a9a82a8..ebe8de03ead 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -198,11 +198,11 @@ if(istype(I, /obj/item/paint_brush)) var/obj/item/paint_brush/P = I return P.selected_color - else if(istype(I, /obj/item/weapon/pen/crayon)) - var/obj/item/weapon/pen/crayon/crayon = I + else if(istype(I, /obj/item/pen/crayon)) + var/obj/item/pen/crayon/crayon = I return crayon.colour - else if(istype(I, /obj/item/weapon/pen)) - var/obj/item/weapon/pen/P = I + else if(istype(I, /obj/item/pen)) + var/obj/item/pen/P = I switch(P.colour) if("black") return "#000000" @@ -211,7 +211,7 @@ if("red") return "#ff0000" return P.colour - else if(istype(I, /obj/item/weapon/soap) || istype(I, /obj/item/weapon/reagent_containers/glass/rag)) + else if(istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/glass/rag)) return canvas_color /obj/item/canvas/proc/try_rename(mob/user) @@ -303,7 +303,7 @@ icon = 'icons/obj/artstuff.dmi' icon_state = "palette" -/obj/item/paint_palette/attackby(obj/item/weapon/W, mob/user) +/obj/item/paint_palette/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/paint_brush)) var/obj/item/paint_brush/P = W var/newcolor = input(user, "Select a new paint color:", "Paint Palette", P.selected_color) as null|color @@ -392,7 +392,7 @@ /obj/structure/sign/painting/attackby(obj/item/I, mob/user, params) if(!current_canvas && istype(I, /obj/item/canvas)) frame_canvas(user, I) - else if(current_canvas && current_canvas.painting_name == initial(current_canvas.painting_name) && istype(I,/obj/item/weapon/pen)) + else if(current_canvas && current_canvas.painting_name == initial(current_canvas.painting_name) && istype(I,/obj/item/pen)) try_rename(user) else if(current_canvas && I.has_tool_quality(TOOL_WIRECUTTER)) unframe_canvas(user) diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index e692170fc8f..065a77f1e39 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -35,7 +35,7 @@ if(cult) return ..() - var/obj/item/weapon/card/id/card = I.GetID() + var/obj/item/card/id/card = I.GetID() if(istype(card)) if(access_bar in card.GetAccess()) var/sign_type = tgui_input_list(user, "What would you like to change the barsign to?", "Bar Sign Choice", get_valid_states(0)) diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 8e5b177ab9c..284306c534f 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -4,7 +4,7 @@ BEDSHEETS LINEN BINS */ -/obj/item/weapon/bedsheet +/obj/item/bedsheet name = "bedsheet" desc = "A surprisingly soft linen bedsheet." icon = 'icons/obj/items.dmi' @@ -19,7 +19,7 @@ LINEN BINS drop_sound = 'sound/items/drop/clothing.ogg' pickup_sound = 'sound/items/pickup/clothing.ogg' -/obj/item/weapon/bedsheet/attack_self(mob/user as mob) +/obj/item/bedsheet/attack_self(mob/user as mob) user.drop_item() if(layer == initial(layer)) layer = ABOVE_MOB_LAYER @@ -28,134 +28,134 @@ LINEN BINS add_fingerprint(user) return -/obj/item/weapon/bedsheet/attackby(obj/item/I, mob/user) +/obj/item/bedsheet/attackby(obj/item/I, mob/user) if(is_sharp(I)) user.visible_message("\The [user] begins cutting up [src] with [I].", "You begin cutting up [src] with [I].") if(do_after(user, 50)) to_chat(user, "You cut [src] into pieces!") for(var/i in 1 to rand(2,5)) - new /obj/item/weapon/reagent_containers/glass/rag(drop_location()) + new /obj/item/reagent_containers/glass/rag(drop_location()) qdel(src) return ..() -/obj/item/weapon/bedsheet/blue +/obj/item/bedsheet/blue icon_state = "sheetblue" -/obj/item/weapon/bedsheet/green +/obj/item/bedsheet/green icon_state = "sheetgreen" -/obj/item/weapon/bedsheet/orange +/obj/item/bedsheet/orange icon_state = "sheetorange" -/obj/item/weapon/bedsheet/purple +/obj/item/bedsheet/purple icon_state = "sheetpurple" -/obj/item/weapon/bedsheet/rainbow +/obj/item/bedsheet/rainbow icon_state = "sheetrainbow" -/obj/item/weapon/bedsheet/red +/obj/item/bedsheet/red icon_state = "sheetred" -/obj/item/weapon/bedsheet/yellow +/obj/item/bedsheet/yellow icon_state = "sheetyellow" -/obj/item/weapon/bedsheet/mime +/obj/item/bedsheet/mime icon_state = "sheetmime" -/obj/item/weapon/bedsheet/clown +/obj/item/bedsheet/clown icon_state = "sheetclown" item_state = "sheetrainbow" -/obj/item/weapon/bedsheet/captain +/obj/item/bedsheet/captain icon_state = "sheetcaptain" -/obj/item/weapon/bedsheet/rd +/obj/item/bedsheet/rd icon_state = "sheetrd" -/obj/item/weapon/bedsheet/medical +/obj/item/bedsheet/medical icon_state = "sheetmedical" -/obj/item/weapon/bedsheet/hos +/obj/item/bedsheet/hos icon_state = "sheethos" -/obj/item/weapon/bedsheet/hop +/obj/item/bedsheet/hop icon_state = "sheethop" -/obj/item/weapon/bedsheet/ce +/obj/item/bedsheet/ce icon_state = "sheetce" -/obj/item/weapon/bedsheet/brown +/obj/item/bedsheet/brown icon_state = "sheetbrown" -/obj/item/weapon/bedsheet/ian +/obj/item/bedsheet/ian icon_state = "sheetian" -/obj/item/weapon/bedsheet/double +/obj/item/bedsheet/double icon_state = "doublesheet" item_state = "sheet" -/obj/item/weapon/bedsheet/bluedouble +/obj/item/bedsheet/bluedouble icon_state = "doublesheetblue" item_state = "sheetblue" -/obj/item/weapon/bedsheet/greendouble +/obj/item/bedsheet/greendouble icon_state = "doublesheetgreen" item_state = "sheetgreen" -/obj/item/weapon/bedsheet/orangedouble +/obj/item/bedsheet/orangedouble icon_state = "doublesheetorange" item_state = "sheetorange" -/obj/item/weapon/bedsheet/purpledouble +/obj/item/bedsheet/purpledouble icon_state = "doublesheetpurple" item_state = "sheetpurple" -/obj/item/weapon/bedsheet/rainbowdouble //all the way across the sky. +/obj/item/bedsheet/rainbowdouble //all the way across the sky. icon_state = "doublesheetrainbow" item_state = "sheetrainbow" -/obj/item/weapon/bedsheet/reddouble +/obj/item/bedsheet/reddouble icon_state = "doublesheetred" item_state = "sheetred" -/obj/item/weapon/bedsheet/yellowdouble +/obj/item/bedsheet/yellowdouble icon_state = "doublesheetyellow" item_state = "sheetyellow" -/obj/item/weapon/bedsheet/mimedouble +/obj/item/bedsheet/mimedouble icon_state = "doublesheetmime" item_state = "sheetmime" -/obj/item/weapon/bedsheet/clowndouble +/obj/item/bedsheet/clowndouble icon_state = "doublesheetclown" item_state = "sheetrainbow" -/obj/item/weapon/bedsheet/captaindouble +/obj/item/bedsheet/captaindouble icon_state = "doublesheetcaptain" item_state = "sheetcaptain" -/obj/item/weapon/bedsheet/rddouble +/obj/item/bedsheet/rddouble icon_state = "doublesheetrd" item_state = "sheetrd" -/obj/item/weapon/bedsheet/hosdouble +/obj/item/bedsheet/hosdouble icon_state = "doublesheethos" item_state = "sheethos" -/obj/item/weapon/bedsheet/hopdouble +/obj/item/bedsheet/hopdouble icon_state = "doublesheethop" item_state = "sheethop" -/obj/item/weapon/bedsheet/cedouble +/obj/item/bedsheet/cedouble icon_state = "doublesheetce" item_state = "sheetce" -/obj/item/weapon/bedsheet/browndouble +/obj/item/bedsheet/browndouble icon_state = "doublesheetbrown" item_state = "sheetbrown" -/obj/item/weapon/bedsheet/iandouble +/obj/item/bedsheet/iandouble icon_state = "doublesheetian" item_state = "sheetian" @@ -189,7 +189,7 @@ LINEN BINS icon_state = "linenbin-full" /obj/structure/bedsheetbin/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I, /obj/item/weapon/bedsheet)) + if(istype(I, /obj/item/bedsheet)) user.drop_item() I.loc = src sheets.Add(I) @@ -205,13 +205,13 @@ LINEN BINS if(amount >= 1) amount-- - var/obj/item/weapon/bedsheet/B + var/obj/item/bedsheet/B if(sheets.len > 0) B = sheets[sheets.len] sheets.Remove(B) else - B = new /obj/item/weapon/bedsheet(loc) + B = new /obj/item/bedsheet(loc) B.loc = user.loc user.put_in_hands(B) @@ -229,13 +229,13 @@ LINEN BINS if(amount >= 1) amount-- - var/obj/item/weapon/bedsheet/B + var/obj/item/bedsheet/B if(sheets.len > 0) B = sheets[sheets.len] sheets.Remove(B) else - B = new /obj/item/weapon/bedsheet(loc) + B = new /obj/item/bedsheet(loc) B.loc = loc to_chat(user, "You telekinetically remove [B] from [src].") diff --git a/code/game/objects/structures/bedsheet_bin_vr.dm b/code/game/objects/structures/bedsheet_bin_vr.dm index e62ea515572..036a1e44ec0 100644 --- a/code/game/objects/structures/bedsheet_bin_vr.dm +++ b/code/game/objects/structures/bedsheet_bin_vr.dm @@ -1,15 +1,15 @@ -/obj/item/weapon/bedsheet/cosmos +/obj/item/bedsheet/cosmos icon = 'icons/obj/items_vr.dmi' icon_state = "sheetcosmos" -/obj/item/weapon/bedsheet/cosmosdouble +/obj/item/bedsheet/cosmosdouble icon = 'icons/obj/items_vr.dmi' icon_state = "doublesheetcosmos" -/obj/item/weapon/bedsheet/pirate +/obj/item/bedsheet/pirate icon = 'icons/obj/items_vr.dmi' icon_state = "sheetpirate" -/obj/item/weapon/bedsheet/piratedouble +/obj/item/bedsheet/piratedouble icon = 'icons/obj/items_vr.dmi' icon_state = "doublesheetpirate" diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm index 026aa59c845..6fc6cd7efc4 100644 --- a/code/game/objects/structures/catwalk.dm +++ b/code/game/objects/structures/catwalk.dm @@ -89,7 +89,7 @@ /obj/structure/catwalk/attackby(obj/item/C as obj, mob/user as mob) if(C.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = C.get_welder() + var/obj/item/weldingtool/WT = C.get_welder() if(WT.isOn() && WT.remove_fuel(0, user)) deconstruct(user) return diff --git a/code/game/objects/structures/coathanger.dm b/code/game/objects/structures/coathanger.dm index 9da45df7beb..2383a8a19c4 100644 --- a/code/game/objects/structures/coathanger.dm +++ b/code/game/objects/structures/coathanger.dm @@ -13,7 +13,7 @@ coat = null update_icon() -/obj/structure/coatrack/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/coatrack/attackby(obj/item/W as obj, mob/user as mob) var/can_hang = 0 for (var/T in allowed) if(istype(W,T)) diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm index 46a32264646..4193e56d33d 100644 --- a/code/game/objects/structures/crates_lockers/__closets.dm +++ b/code/game/objects/structures/crates_lockers/__closets.dm @@ -12,7 +12,7 @@ var/opened = 0 var/sealed = 0 - var/seal_tool = /obj/item/weapon/weldingtool //Tool used to seal the closet, defaults to welder + var/seal_tool = /obj/item/weldingtool //Tool used to seal the closet, defaults to welder var/wall_mounted = 0 //never solid (You can always pass over it) var/health = 100 @@ -271,7 +271,7 @@ return -/obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/closet/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) if(opened) if(anchored) @@ -286,14 +286,14 @@ else to_chat(user, "You can't reach the anchoring bolts when the door is closed!") else if(opened) - if(istype(W, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = W + if(istype(W, /obj/item/grab)) + var/obj/item/grab/G = W MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet return 0 if(istype(W,/obj/item/tk_grab)) return 0 if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(!WT.remove_fuel(0,user)) if(!WT.isOn()) return @@ -306,8 +306,8 @@ M.show_message("\The [src] has been cut apart by [user] with \the [WT].", 3, "You hear welding.", 2) qdel(src) return - if(istype(W, /obj/item/weapon/storage/laundry_basket) && W.contents.len) - var/obj/item/weapon/storage/laundry_basket/LB = W + if(istype(W, /obj/item/storage/laundry_basket) && W.contents.len) + var/obj/item/storage/laundry_basket/LB = W var/turf/T = get_turf(src) for(var/obj/item/I in LB.contents) LB.remove_from_storage(I, T) @@ -322,13 +322,13 @@ usr.drop_item() if(W) W.forceMove(loc) - else if(istype(W, /obj/item/weapon/packageWrap)) + else if(istype(W, /obj/item/packageWrap)) return else if(seal_tool) if(istype(W, seal_tool)) - var/obj/item/weapon/S = W + var/obj/item/S = W if(S.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = S.get_welder() + var/obj/item/weldingtool/WT = S.get_welder() if(!WT.remove_fuel(0,user)) if(!WT.isOn()) return diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm index 43098084d72..53792c70c40 100644 --- a/code/game/objects/structures/crates_lockers/closets/coffin.dm +++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/closets/coffin.dmi' icon_state = "closed_unlocked" - seal_tool = /obj/item/weapon/tool/screwdriver + seal_tool = /obj/item/tool/screwdriver breakout_sound = 'sound/weapons/tablehit1.ogg' closet_appearance = null // Special icon for us @@ -66,9 +66,9 @@ var/limb_damage = rand(5,25) H.adjustBruteLoss(limb_damage) -/obj/structure/closet/grave/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/closet/grave/attackby(obj/item/W as obj, mob/user as mob) if(src.opened) - if(istype(W, /obj/item/weapon/shovel)) + if(istype(W, /obj/item/shovel)) user.visible_message("[user] piles dirt into \the [src.name].", \ "You start to pile dirt into \the [src.name].", \ "You hear dirt being moved.") @@ -81,14 +81,14 @@ user.visible_message("[user] stops filling in \the [src.name].", \ "You change your mind and stop filling in \the [src.name].") return - if(istype(W, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = W + if(istype(W, /obj/item/grab)) + var/obj/item/grab/G = W src.MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet return 0 if(istype(W,/obj/item/tk_grab)) return 0 - if(istype(W, /obj/item/weapon/storage/laundry_basket) && W.contents.len) - var/obj/item/weapon/storage/laundry_basket/LB = W + if(istype(W, /obj/item/storage/laundry_basket) && W.contents.len) + var/obj/item/storage/laundry_basket/LB = W var/turf/T = get_turf(src) for(var/obj/item/I in LB.contents) LB.remove_from_storage(I, T) @@ -104,7 +104,7 @@ if(W) W.forceMove(src.loc) else - if(istype(W, /obj/item/weapon/shovel)) + if(istype(W, /obj/item/shovel)) if(user.a_intent == I_HURT) // Hurt intent means you're trying to kill someone, or just get rid of the grave user.visible_message("[user] begins to smoothe out the dirt of \the [src.name].", \ "You start to smoothe out the dirt of \the [src.name].", \ diff --git a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm index eb69ff63b57..a08dc35f56d 100644 --- a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm @@ -23,7 +23,7 @@ else icon_state = icon_closed -/obj/structure/closet/secure_closet/egg/attackby(obj/item/weapon/W, mob/user as mob) //This also prevents crew from welding the eggs and making them unable to be opened. +/obj/structure/closet/secure_closet/egg/attackby(obj/item/W, mob/user as mob) //This also prevents crew from welding the eggs and making them unable to be opened. if(W.has_tool_quality(TOOL_WELDER)) src.dump_contents() qdel(src) diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm index c2243e42d16..f4c2778888b 100644 --- a/code/game/objects/structures/crates_lockers/closets/fitness.dm +++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm @@ -80,7 +80,7 @@ closet_appearance = /decl/closet_appearance/wardrobe/red starts_with = list( - /obj/item/weapon/gun/energy/lasertag/red = 5, + /obj/item/gun/energy/lasertag/red = 5, /obj/item/clothing/suit/redtag = 5) @@ -90,7 +90,7 @@ closet_appearance = /decl/closet_appearance/wardrobe/blue starts_with = list( - /obj/item/weapon/gun/energy/lasertag/blue = 5, + /obj/item/gun/energy/lasertag/blue = 5, /obj/item/clothing/suit/bluetag = 5) /obj/structure/closet/lasertag/red/laserdome @@ -99,10 +99,10 @@ closet_appearance = /decl/closet_appearance/wardrobe/red starts_with = list( - /obj/item/device/encryptionkey/ent = 3, + /obj/item/encryptionkey/ent = 3, /obj/item/clothing/gloves/bluespace = 3, /obj/item/clothing/under/color/red = 3, - /obj/item/weapon/gun/energy/lasertag/red = 3, + /obj/item/gun/energy/lasertag/red = 3, /obj/item/clothing/head/redtag = 3, /obj/item/clothing/suit/redtag = 3) @@ -112,9 +112,9 @@ closet_appearance = /decl/closet_appearance/wardrobe/blue starts_with = list( - /obj/item/device/encryptionkey/ent = 3, + /obj/item/encryptionkey/ent = 3, /obj/item/clothing/gloves/bluespace = 3, /obj/item/clothing/under/color/blue = 3, - /obj/item/weapon/gun/energy/lasertag/blue = 3, + /obj/item/gun/energy/lasertag/blue = 3, /obj/item/clothing/head/bluetag = 3, /obj/item/clothing/suit/bluetag = 3) diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 48bea9205b9..1342b4e18e6 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -59,10 +59,10 @@ starts_with = list( /obj/item/clothing/suit/armor/tdome/red = 3, - /obj/item/weapon/melee/energy/sword = 3, - /obj/item/weapon/gun/energy/laser = 3, - /obj/item/weapon/melee/baton = 3, - /obj/item/weapon/storage/box/flashbangs = 3, + /obj/item/melee/energy/sword = 3, + /obj/item/gun/energy/laser = 3, + /obj/item/melee/baton = 3, + /obj/item/storage/box/flashbangs = 3, /obj/item/clothing/head/helmet/thunderdome = 3) /obj/structure/closet/thunderdome/tdgreen @@ -71,10 +71,10 @@ starts_with = list( /obj/item/clothing/suit/armor/tdome/green = 3, - /obj/item/weapon/melee/energy/sword = 3, - /obj/item/weapon/gun/energy/laser = 3, - /obj/item/weapon/melee/baton = 3, - /obj/item/weapon/storage/box/flashbangs = 3, + /obj/item/melee/energy/sword = 3, + /obj/item/gun/energy/laser = 3, + /obj/item/melee/baton = 3, + /obj/item/storage/box/flashbangs = 3, /obj/item/clothing/head/helmet/thunderdome = 3) /obj/structure/closet/alien diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index c9754da28ba..aa09e9fc5b6 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -23,7 +23,7 @@ starts_with = list( /obj/item/clothing/head/that = 2, - /obj/item/device/radio/headset/headset_service = 2, + /obj/item/radio/headset/headset_service = 2, /obj/item/clothing/head/pin/flower, /obj/item/clothing/head/pin/flower/pink, /obj/item/clothing/head/pin/flower/yellow, @@ -51,11 +51,11 @@ starts_with = list( /obj/item/clothing/under/sundress, /obj/item/clothing/under/waiter = 2, - /obj/item/device/radio/headset/headset_service = 2, - /obj/item/weapon/storage/box/mousetraps = 2, + /obj/item/radio/headset/headset_service = 2, + /obj/item/storage/box/mousetraps = 2, /obj/item/clothing/under/rank/chef, /obj/item/clothing/head/chefhat, - /obj/item/weapon/storage/bag/food = 2 + /obj/item/storage/bag/food = 2 ) /* @@ -69,17 +69,17 @@ starts_with = list( /obj/item/clothing/under/rank/janitor, /obj/item/clothing/under/dress/maid/janitor, - /obj/item/device/radio/headset/headset_service, - /obj/item/weapon/cartridge/janitor, + /obj/item/radio/headset/headset_service, + /obj/item/cartridge/janitor, /obj/item/clothing/suit/storage/hooded/wintercoat/janitor, /obj/item/clothing/gloves/black, /obj/item/clothing/head/soft/purple, /obj/item/clothing/head/beret/purple, - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/clothing/suit/caution = 4, - /obj/item/device/lightreplacer, - /obj/item/weapon/storage/bag/trash, - /obj/item/weapon/storage/belt/janitor, + /obj/item/lightreplacer, + /obj/item/storage/bag/trash, + /obj/item/storage/belt/janitor, /obj/item/clothing/shoes/galoshes, /obj/item/clothing/glasses/hud/janitor ) @@ -111,7 +111,7 @@ /obj/item/clothing/glasses/sunglasses/big = 2, /obj/item/clothing/under/lawyer/blue = 2, /obj/item/clothing/under/lawyer/blue/skirt = 2, - /obj/item/device/tape/random = 2 + /obj/item/rectape/random = 2 ) /* @@ -123,11 +123,11 @@ closet_appearance = /decl/closet_appearance/wardrobe/janitor starts_with = list( - /obj/item/device/flashlight = 5, + /obj/item/flashlight = 5, /obj/item/clothing/suit/caution = 12, - /obj/item/device/lightreplacer = 3, - /obj/item/weapon/storage/bag/trash = 3, - /obj/item/weapon/storage/box/lights/mixed = 3, - /obj/item/weapon/storage/box/mousetraps = 1, - /obj/item/weapon/grenade/chem_grenade/cleaner = 4 + /obj/item/lightreplacer = 3, + /obj/item/storage/bag/trash = 3, + /obj/item/storage/box/lights/mixed = 3, + /obj/item/storage/box/mousetraps = 1, + /obj/item/grenade/chem_grenade/cleaner = 4 ) diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm index 2966d4b8e4f..a5587d50ec2 100644 --- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm +++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm @@ -18,7 +18,7 @@ /obj/item/clothing/suit/bio_suit/virology, /obj/item/clothing/head/bio_hood/virology, /obj/item/clothing/mask/gas, - /obj/item/weapon/tank/oxygen) + /obj/item/tank/oxygen) /obj/structure/closet/l3closet/security @@ -27,7 +27,7 @@ starts_with = list( /obj/item/clothing/suit/bio_suit/security, /obj/item/clothing/head/bio_hood/security) - ///obj/item/weapon/gun/energy/taser/xeno/sec) //VOREStation Removal + ///obj/item/gun/energy/taser/xeno/sec) //VOREStation Removal /obj/structure/closet/l3closet/janitor closet_appearance = /decl/closet_appearance/bio/janitor @@ -36,7 +36,7 @@ /obj/item/clothing/suit/bio_suit/janitor = 2, /obj/item/clothing/head/bio_hood/janitor = 2, /obj/item/clothing/mask/gas = 2, - /obj/item/weapon/tank/emergency/oxygen/engi = 2) + /obj/item/tank/emergency/oxygen/engi = 2) /obj/structure/closet/l3closet/scientist @@ -45,13 +45,13 @@ starts_with = list( /obj/item/clothing/suit/bio_suit/scientist, /obj/item/clothing/head/bio_hood/scientist, - /obj/item/weapon/storage/bag/xeno = 1) + /obj/item/storage/bag/xeno = 1) /obj/structure/closet/l3closet/scientist/double starts_with = list( /obj/item/clothing/suit/bio_suit/scientist = 2, /obj/item/clothing/head/bio_hood/scientist = 2, - /obj/item/weapon/storage/bag/xeno = 2) // VOREEdit, adding the xenobag to xenobio. + /obj/item/storage/bag/xeno = 2) // VOREEdit, adding the xenobag to xenobio. /obj/structure/closet/l3closet/medical diff --git a/code/game/objects/structures/crates_lockers/closets/malfunction.dm b/code/game/objects/structures/crates_lockers/closets/malfunction.dm index cd23e478a97..f877b54e30a 100644 --- a/code/game/objects/structures/crates_lockers/closets/malfunction.dm +++ b/code/game/objects/structures/crates_lockers/closets/malfunction.dm @@ -3,10 +3,10 @@ closet_appearance = /decl/closet_appearance/tactical starts_with = list( - /obj/item/weapon/tank/jetpack/void, + /obj/item/tank/jetpack/void, /obj/item/clothing/mask/breath, /obj/item/clothing/head/helmet/space/void, /obj/item/clothing/suit/space/void, - /obj/item/weapon/tool/crowbar, - /obj/item/weapon/cell, - /obj/item/device/multitool) + /obj/item/tool/crowbar, + /obj/item/cell, + /obj/item/multitool) diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm index ee9a61405c6..d8ccfd6025f 100644 --- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm @@ -20,7 +20,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 name = "rifle cabinet" @@ -28,13 +28,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 @@ -42,9 +42,9 @@ req_one_access = list(access_brig) starts_with = list( - /obj/item/weapon/gun/energy/phasegun = 2, - /obj/item/weapon/gun/energy/phasegun/pistol, - /obj/item/weapon/cell/device/weapon = 2, + /obj/item/gun/energy/phasegun = 2, + /obj/item/gun/energy/phasegun/pistol, + /obj/item/cell/device/weapon = 2, /obj/item/clothing/accessory/permit/gun/planetside) /* @@ -59,33 +59,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 ..() /* @@ -100,34 +100,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/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/stack/marker_beacon/thirty, - /obj/item/weapon/material/knife/tacknife/survival, - /obj/item/weapon/material/knife/machete/deluxe, + /obj/item/material/knife/tacknife/survival, + /obj/item/material/knife/machete/deluxe, /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 ..() /* @@ -140,46 +140,46 @@ closet_appearance = /decl/closet_appearance/secure_closet/expedition/sar 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/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 ..() /* @@ -191,8 +191,8 @@ closet_appearance = /decl/closet_appearance/secure_closet/expedition/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_vr, /obj/item/clothing/under/rank/pilot1/no_webbing, /obj/item/clothing/suit/storage/toggle/bomber/pilot, @@ -200,28 +200,28 @@ /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/weapon/gun/energy/gun/protector/pilotgun/locked, + /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/item/gun/energy/gun/protector/pilotgun/locked, /obj/item/clothing/gloves/watch/survival, /obj/item/clothing/accessory/storage/webbing/pilot1, /obj/item/clothing/accessory/storage/webbing/pilot2, - /obj/item/device/emergency_beacon + /obj/item/emergency_beacon ) /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 ..() /* @@ -256,8 +256,8 @@ starts_with = list( /obj/item/clothing/suit/space/void/autolok, - /obj/item/weapon/tank/emergency/oxygen/engi, - /obj/item/device/suit_cooling_unit/emergency + /obj/item/tank/emergency/oxygen/engi, + /obj/item/suit_cooling_unit/emergency ) /* @@ -278,6 +278,6 @@ starts_with = list( /obj/item/clothing/head/helmet/space/emergency, /obj/item/clothing/suit/space/emergency, - /obj/item/weapon/tank/emergency/oxygen/engi, - /obj/item/device/suit_cooling_unit/emergency + /obj/item/tank/emergency/oxygen/engi, + /obj/item/suit_cooling_unit/emergency ) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm index 52b949f809d..94b6086a065 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -4,4 +4,4 @@ closet_appearance = /decl/closet_appearance/cabinet/secure starts_with = list( - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 10) + /obj/item/reagent_containers/food/drinks/bottle/small/beer = 10) 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 de063521af7..34810bfe424 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -11,19 +11,19 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/cargo, /obj/item/clothing/shoes/boots/winter/supply, /obj/item/clothing/shoes/black, - /obj/item/device/radio/headset/headset_cargo, - /obj/item/device/radio/headset/headset_cargo/alt, + /obj/item/radio/headset/headset_cargo, + /obj/item/radio/headset/headset_cargo/alt, /obj/item/clothing/gloves/black, /obj/item/clothing/gloves/fingerless, /obj/item/clothing/head/soft) /obj/structure/closet/secure_closet/cargotech/Initialize() if(prob(75)) - 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 if(prob(25)) - starts_with += /obj/item/weapon/storage/backpack/dufflebag + starts_with += /obj/item/storage/backpack/dufflebag return ..() /obj/structure/closet/secure_closet/quartermaster @@ -37,8 +37,8 @@ /obj/item/clothing/under/rank/cargo/jeans, /obj/item/clothing/under/rank/cargo/jeans/female, /obj/item/clothing/shoes/brown, - /obj/item/device/radio/headset/headset_qm, //VOREStation Edit, - /obj/item/device/radio/headset/headset_qm/alt, //VOREStation Edit, + /obj/item/radio/headset/headset_qm, //VOREStation Edit, + /obj/item/radio/headset/headset_qm/alt, //VOREStation Edit, /obj/item/clothing/under/rank/neo_qm, /obj/item/clothing/under/rank/neo_qm_skirt, /obj/item/clothing/under/rank/neo_qm_jacket, @@ -49,7 +49,7 @@ /obj/item/clothing/under/rank/neo_qm_gorka, /obj/item/clothing/gloves/black, /obj/item/clothing/gloves/fingerless, - /obj/item/weapon/tank/emergency/oxygen, + /obj/item/tank/emergency/oxygen, /obj/item/clothing/mask/gas, /obj/item/clothing/glasses/meson, /obj/item/clothing/head/soft, @@ -60,11 +60,11 @@ /obj/structure/closet/secure_closet/quartermaster/Initialize() if(prob(75)) - 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 if(prob(25)) - starts_with += /obj/item/weapon/storage/backpack/dufflebag + starts_with += /obj/item/storage/backpack/dufflebag return ..() /obj/structure/closet/secure_closet/miner @@ -73,25 +73,25 @@ closet_appearance = /decl/closet_appearance/secure_closet/mining starts_with = list( - /obj/item/device/radio/headset/headset_mine, + /obj/item/radio/headset/headset_mine, /obj/item/clothing/under/rank/miner, /obj/item/clothing/gloves/black, /obj/item/clothing/shoes/black, - /obj/item/device/analyzer, - /obj/item/weapon/storage/bag/ore, - /obj/item/weapon/storage/belt/miner, - /obj/item/device/flashlight/lantern, - /obj/item/weapon/shovel, - /obj/item/weapon/pickaxe/drill, + /obj/item/analyzer, + /obj/item/storage/bag/ore, + /obj/item/storage/belt/miner, + /obj/item/flashlight/lantern, + /obj/item/shovel, + /obj/item/pickaxe/drill, /obj/item/clothing/glasses/material, /obj/item/clothing/suit/storage/hooded/wintercoat/miner, /obj/item/clothing/shoes/boots/winter/mining, - /obj/item/device/emergency_beacon, + /obj/item/emergency_beacon, /obj/item/stack/marker_beacon/thirty) /obj/structure/closet/secure_closet/miner/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 return ..() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo_vr.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo_vr.dm index 332b629d7b8..27a049088fd 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo_vr.dm @@ -1,3 +1,3 @@ /obj/structure/closet/secure_closet/miner/Initialize() - starts_with += /obj/item/device/gps/mining + starts_with += /obj/item/gps/mining return ..() \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 9e6f14fd0b6..7186779efe9 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -18,33 +18,33 @@ ///obj/item/clothing/head/welding, //VOREStation Removal: Locker bloat, grr. They get fancy goggles or can raid the welding supplies locker for one of these. /obj/item/clothing/gloves/heavy_engineer, //VOREStation Edit: chief gets the good shit /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/weapon/storage/toolbox/mechanical, + /obj/item/cartridge/ce, + /obj/item/radio/headset/heads/ce, + /obj/item/radio/headset/heads/ce/alt, + /obj/item/storage/toolbox/mechanical, /obj/item/clothing/suit/storage/hazardvest, ///obj/item/clothing/mask/gas, //VOREStation Removal: Locker bloat, grr. The fancy one below functions as a mask & helmet combined. /obj/item/clothing/head/hardhat/firefighter/chief, //VOREStation Add: replaces the bog-standard gas mask - ///obj/item/device/multitool, //VOREStation Removal: The belt they get, both standard and the fancy one, both come with one already, why stick another in here too? - /obj/item/weapon/storage/belt/utility/chief/full, - /obj/item/device/flash, - /obj/item/device/t_scanner/upgraded, + ///obj/item/multitool, //VOREStation Removal: The belt they get, both standard and the fancy one, both come with one already, why stick another in here too? + /obj/item/storage/belt/utility/chief/full, + /obj/item/flash, + /obj/item/t_scanner/upgraded, /obj/item/taperoll/engineering, ///obj/item/clothing/suit/storage/hooded/wintercoat/engineering, //VOREStation Removal: Locker bloat, grr. They can grab from the engi-clothes vendor if they want the standard one. /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/ce, ///obj/item/clothing/shoes/boots/winter/engineering, //VOREStation Removal: Locker bloat, grr. As above. /obj/item/clothing/head/beret/engineering/ce, /obj/item/clothing/head/beret/engineering/ce/white, - /obj/item/weapon/tank/emergency/oxygen/double, //VOREStation Edit: chief gets the good shit - /obj/item/weapon/reagent_containers/spray/windowsealant) //VOREStation Add + /obj/item/tank/emergency/oxygen/double, //VOREStation Edit: chief gets the good shit + /obj/item/reagent_containers/spray/windowsealant) //VOREStation Add /obj/structure/closet/secure_closet/engineering_chief/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 ..() /obj/structure/closet/secure_closet/engineering_electrical @@ -54,16 +54,16 @@ starts_with = list( /obj/item/clothing/gloves/yellow = 2, - /obj/item/weapon/storage/toolbox/electrical = 3, - /obj/item/weapon/module/power_control = 3, - /obj/item/device/multitool = 3) + /obj/item/storage/toolbox/electrical = 3, + /obj/item/module/power_control = 3, + /obj/item/multitool = 3) /obj/structure/closet/secure_closet/engineering_electrical/double starts_with = list( /obj/item/clothing/gloves/yellow = 4, - /obj/item/weapon/storage/toolbox/electrical = 6, - /obj/item/weapon/module/power_control = 6, - /obj/item/device/multitool = 6) + /obj/item/storage/toolbox/electrical = 6, + /obj/item/module/power_control = 6, + /obj/item/multitool = 6) /obj/structure/closet/secure_closet/engineering_welding name = "welding supplies" @@ -72,15 +72,15 @@ starts_with = list( /obj/item/clothing/head/welding = 3, - /obj/item/weapon/weldingtool/largetank = 3, - /obj/item/weapon/weldpack = 3, + /obj/item/weldingtool/largetank = 3, + /obj/item/weldpack = 3, /obj/item/clothing/glasses/welding = 3) /obj/structure/closet/secure_closet/engineering_welding/double starts_with = list( /obj/item/clothing/head/welding = 6, - /obj/item/weapon/weldingtool/largetank = 6, - /obj/item/weapon/weldpack = 6, + /obj/item/weldingtool/largetank = 6, + /obj/item/weldpack = 6, /obj/item/clothing/glasses/welding = 6) /obj/structure/closet/secure_closet/engineering_personal @@ -90,29 +90,29 @@ starts_with = list( /obj/item/clothing/accessory/storage/brown_vest, - /obj/item/weapon/storage/toolbox/mechanical, - /obj/item/device/radio/headset/headset_eng, - /obj/item/device/radio/headset/headset_eng/alt, + /obj/item/storage/toolbox/mechanical, + /obj/item/radio/headset/headset_eng, + /obj/item/radio/headset/headset_eng/alt, /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/mask/gas, /obj/item/clothing/glasses/meson, - /obj/item/weapon/cartridge/engineering, + /obj/item/cartridge/engineering, /obj/item/taperoll/engineering, /obj/item/clothing/head/hardhat, /obj/item/clothing/suit/storage/hooded/wintercoat/engineering, /obj/item/clothing/shoes/boots/winter/engineering, - /obj/item/weapon/tank/emergency/oxygen/engi, - /obj/item/weapon/storage/belt/utility, //VOREStation Add - /obj/item/weapon/reagent_containers/spray/windowsealant, //VOREStation Add + /obj/item/tank/emergency/oxygen/engi, + /obj/item/storage/belt/utility, //VOREStation Add + /obj/item/reagent_containers/spray/windowsealant, //VOREStation Add /obj/item/areaeditor/blueprints/engineers) //VOREStation Add /obj/structure/closet/secure_closet/engineering_personal/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 ..() @@ -125,25 +125,25 @@ /obj/item/clothing/accessory/storage/brown_vest, /obj/item/clothing/suit/fire/heavy, /obj/item/clothing/head/hardhat/firefighter/atmos, - /obj/item/device/flashlight, - /obj/item/weapon/extinguisher/atmo, + /obj/item/flashlight, + /obj/item/extinguisher/atmo, ///obj/item/clamp, //VOREStation Removal: without leaks those are pointless, - /obj/item/device/radio/headset/headset_eng, - /obj/item/device/radio/headset/headset_eng/alt, + /obj/item/radio/headset/headset_eng, + /obj/item/radio/headset/headset_eng/alt, /obj/item/clothing/suit/storage/hazardvest/atmos, //VOREStation edit. Eng locker gets regular haz-vest, atmos gets the themed one of their own /obj/item/clothing/mask/gas, - /obj/item/weapon/cartridge/atmos, + /obj/item/cartridge/atmos, /obj/item/taperoll/atmos, /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos, /obj/item/clothing/shoes/boots/winter/atmos, - /obj/item/weapon/tank/emergency/oxygen/engi, - /obj/item/weapon/storage/belt/utility/atmostech) //VOREStation edit. They don't get a toolbox to fill it from, so why not give a spare one that's full already? + /obj/item/tank/emergency/oxygen/engi, + /obj/item/storage/belt/utility/atmostech) //VOREStation edit. They don't get a toolbox to fill it from, so why not give a spare one that's full already? /obj/structure/closet/secure_closet/atmos_personal/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/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 6659a89a074..f02c42cc3cb 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -3,11 +3,11 @@ req_access = list(access_kitchen) starts_with = list( - /obj/item/weapon/reagent_containers/food/condiment/carton/flour = 6, - /obj/item/weapon/reagent_containers/food/condiment/carton/sugar = 1, - /obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic = 1, - /obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic = 1, - /obj/item/weapon/reagent_containers/food/condiment/spacespice = 2 + /obj/item/reagent_containers/food/condiment/carton/flour = 6, + /obj/item/reagent_containers/food/condiment/carton/sugar = 1, + /obj/item/reagent_containers/food/condiment/carton/flour/rustic = 1, + /obj/item/reagent_containers/food/condiment/carton/sugar/rustic = 1, + /obj/item/reagent_containers/food/condiment/spacespice = 2 ) open_sound = 'sound/machines/click.ogg' @@ -23,7 +23,7 @@ closet_appearance = null starts_with = list( - /obj/item/weapon/reagent_containers/food/snacks/meat/monkey = 10) + /obj/item/reagent_containers/food/snacks/meat/monkey = 10) /obj/structure/closet/secure_closet/freezer/fridge @@ -32,10 +32,10 @@ closet_appearance = null starts_with = list( - /obj/item/weapon/reagent_containers/food/drinks/milk = 6, - /obj/item/weapon/reagent_containers/food/drinks/soymilk = 4, - /obj/item/weapon/storage/fancy/egg_box = 4, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 2) + /obj/item/reagent_containers/food/drinks/milk = 6, + /obj/item/reagent_containers/food/drinks/soymilk = 4, + /obj/item/storage/fancy/egg_box = 4, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose = 2) /obj/structure/closet/secure_closet/freezer/money @@ -46,6 +46,6 @@ starts_with = list( - /obj/item/weapon/spacecash/c1000 = 3, - /obj/item/weapon/spacecash/c500 = 4, - /obj/item/weapon/spacecash/c200 = 5) + /obj/item/spacecash/c1000 = 3, + /obj/item/spacecash/c500 = 4, + /obj/item/spacecash/c200 = 5) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm index e1b39c5b990..729c32d1e21 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm @@ -20,10 +20,10 @@ else var/lazors = 0 var/shottas = 0 - for (var/obj/item/weapon/gun/G in contents) - if (istype(G, /obj/item/weapon/gun/energy)) + for (var/obj/item/gun/G in contents) + if (istype(G, /obj/item/gun/energy)) lazors++ - if (istype(G, /obj/item/weapon/gun/projectile)) + if (istype(G, /obj/item/gun/projectile)) shottas++ for (var/i = 0 to 2) if(lazors || shottas) // only make icons if we have one of the two types. @@ -57,7 +57,7 @@ /obj/structure/closet/secure_closet/guncabinet/excursion/New() ..() for(var/i = 1 to 2) - new /obj/item/weapon/gun/energy/locked/frontier(src) + new /obj/item/gun/energy/locked/frontier(src) for(var/i = 1 to 2) - new /obj/item/weapon/gun/energy/locked/frontier/holdout(src) + new /obj/item/gun/energy/locked/frontier/holdout(src) //VOREStation Add End \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index 157354f2c90..e5fc9ce56e5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -4,22 +4,22 @@ closet_appearance = /decl/closet_appearance/secure_closet/hydroponics starts_with = list( - /obj/item/weapon/storage/bag/plants, + /obj/item/storage/bag/plants, /obj/item/clothing/under/rank/hydroponics, /obj/item/clothing/gloves/botanic_leather, - /obj/item/device/analyzer/plant_analyzer, - /obj/item/device/radio/headset/headset_service, + /obj/item/analyzer/plant_analyzer, + /obj/item/radio/headset/headset_service, /obj/item/clothing/head/greenbandana, - /obj/item/weapon/shovel/spade, - /obj/item/weapon/material/minihoe, - /obj/item/weapon/material/knife/machete/hatchet, - /obj/item/weapon/reagent_containers/glass/beaker = 2, - /obj/item/weapon/tool/wirecutters/clippers/trimmers, - /obj/item/weapon/reagent_containers/spray/plantbgone, + /obj/item/shovel/spade, + /obj/item/material/minihoe, + /obj/item/material/knife/machete/hatchet, + /obj/item/reagent_containers/glass/beaker = 2, + /obj/item/tool/wirecutters/clippers/trimmers, + /obj/item/reagent_containers/spray/plantbgone, /obj/item/clothing/suit/storage/hooded/wintercoat/hydro, /obj/item/clothing/shoes/boots/winter/hydro, - /obj/item/weapon/storage/belt/hydro, - /obj/item/weapon/material/fishing_net/butterfly_net) + /obj/item/storage/belt/hydro, + /obj/item/material/fishing_net/butterfly_net) /obj/structure/closet/secure_closet/hydroponics/Initialize() if(prob(50)) @@ -39,6 +39,6 @@ starts_with += /obj/item/clothing/mask/gas // VOREStation Edit: Gasmasks we use are different if(prob(1)) - starts_with += /obj/item/weapon/chainsaw + starts_with += /obj/item/chainsaw return ..() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index faa24433c14..a747bf9e3e2 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -5,12 +5,12 @@ closet_appearance = /decl/closet_appearance/secure_closet/medical/alt starts_with = list( - /obj/item/weapon/storage/box/autoinjectors, - /obj/item/weapon/storage/box/syringes, - /obj/item/weapon/reagent_containers/dropper = 2, - /obj/item/weapon/reagent_containers/glass/beaker = 2, - /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 2, - /obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 2) + /obj/item/storage/box/autoinjectors, + /obj/item/storage/box/syringes, + /obj/item/reagent_containers/dropper = 2, + /obj/item/reagent_containers/glass/beaker = 2, + /obj/item/reagent_containers/glass/bottle/inaprovaline = 2, + /obj/item/reagent_containers/glass/bottle/antitoxin = 2) /obj/structure/closet/secure_closet/medical2 @@ -20,7 +20,7 @@ closet_appearance = /decl/closet_appearance/secure_closet/medical starts_with = list( - /obj/item/weapon/tank/anesthetic = 3, + /obj/item/tank/anesthetic = 3, /obj/item/clothing/mask/breath/medical = 3) @@ -37,24 +37,24 @@ /obj/item/clothing/suit/storage/toggle/labcoat/modern, /obj/item/clothing/suit/storage/toggle/fr_jacket, /obj/item/clothing/shoes/white, - /obj/item/weapon/cartridge/medical, - /obj/item/device/radio/headset/headset_med, - /obj/item/device/radio/headset/headset_med/alt, + /obj/item/cartridge/medical, + /obj/item/radio/headset/headset_med, + /obj/item/radio/headset/headset_med/alt, /obj/item/clothing/suit/storage/hooded/wintercoat/medical, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt, /obj/item/clothing/shoes/boots/winter/medical, /obj/item/clothing/under/rank/nursesuit, /obj/item/clothing/head/nursehat, - /obj/item/weapon/storage/box/freezer = 3, - /obj/item/weapon/storage/belt/medical) //VOREStation Add + /obj/item/storage/box/freezer = 3, + /obj/item/storage/belt/medical) //VOREStation Add /obj/structure/closet/secure_closet/medical3/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 @@ -97,29 +97,29 @@ closet_appearance = /decl/closet_appearance/secure_closet/medical/paramedic 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, /obj/item/clothing/suit/storage/toggle/fr_jacket, /obj/item/clothing/suit/storage/toggle/labcoat/emt, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/para, /obj/item/clothing/shoes/boots/winter/medical, - /obj/item/device/radio/headset/headset_med/alt, - /obj/item/weapon/cartridge/medical, - /obj/item/weapon/storage/briefcase/inflatable, - /obj/item/device/flashlight, - /obj/item/weapon/tank/emergency/oxygen/engi, + /obj/item/radio/headset/headset_med/alt, + /obj/item/cartridge/medical, + /obj/item/storage/briefcase/inflatable, + /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/tool/crowbar, - /obj/item/weapon/extinguisher/mini, - /obj/item/weapon/storage/box/freezer, + /obj/item/tool/crowbar, + /obj/item/extinguisher/mini, + /obj/item/storage/box/freezer, /obj/item/clothing/accessory/storage/white_vest, /obj/item/taperoll/medical) @@ -134,7 +134,7 @@ /obj/item/clothing/suit/storage/toggle/labcoat/cmo, /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt, /obj/item/clothing/suit/storage/toggle/labcoat/modern/cmo, - /obj/item/weapon/cartridge/cmo, + /obj/item/cartridge/cmo, /obj/item/clothing/gloves/sterile/latex, /obj/item/clothing/shoes/brown, /obj/item/clothing/under/rank/neo_cmo, @@ -142,31 +142,31 @@ /obj/item/clothing/under/rank/neo_cmo_turtle, /obj/item/clothing/under/rank/neo_cmo_turtle_skirt, /obj/item/clothing/under/rank/neo_cmo_gorka, - /obj/item/device/radio/headset/heads/cmo, - /obj/item/device/radio/headset/heads/cmo/alt, - /obj/item/device/flash, - /obj/item/weapon/reagent_containers/hypospray/vial, + /obj/item/radio/headset/heads/cmo, + /obj/item/radio/headset/heads/cmo/alt, + /obj/item/flash, + /obj/item/reagent_containers/hypospray/vial, /obj/item/clothing/suit/storage/hooded/wintercoat/medical, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/cmo, /obj/item/clothing/shoes/boots/winter/medical, /obj/item/clothing/head/beret/medical/cmo, /obj/item/clothing/head/beret/medical/cmo/blue, - /obj/item/weapon/storage/box/freezer, + /obj/item/storage/box/freezer, /obj/item/clothing/mask/gas, /obj/item/taperoll/medical, /obj/item/clothing/suit/bio_suit/cmo, /obj/item/clothing/head/bio_hood/cmo, /obj/item/clothing/shoes/white, - /obj/item/weapon/reagent_containers/glass/beaker/vial, //VOREStation Add - /obj/item/weapon/storage/belt/medical) //VOREStation Add + /obj/item/reagent_containers/glass/beaker/vial, //VOREStation Add + /obj/item/storage/belt/medical) //VOREStation Add /obj/structure/closet/secure_closet/CMO/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 @@ -191,8 +191,8 @@ req_access = list(access_surgery) starts_with = list( - /obj/item/device/assembly/signaler, - /obj/item/device/radio/electropack = 3) + /obj/item/assembly/signaler, + /obj/item/radio/electropack = 3) /obj/structure/closet/secure_closet/chemical @@ -202,14 +202,14 @@ closet_appearance = /decl/closet_appearance/secure_closet/medical/chemistry starts_with = list( - /obj/item/weapon/storage/box/pillbottles = 2, - /obj/item/weapon/storage/box/beakers, - /obj/item/weapon/storage/box/autoinjectors, - /obj/item/weapon/storage/box/syringes, - /obj/item/weapon/reagent_containers/dropper = 2, - /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 2, - /obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 2, - /obj/item/weapon/storage/fancy/vials) //VOREStation Add + /obj/item/storage/box/pillbottles = 2, + /obj/item/storage/box/beakers, + /obj/item/storage/box/autoinjectors, + /obj/item/storage/box/syringes, + /obj/item/reagent_containers/dropper = 2, + /obj/item/reagent_containers/glass/bottle/inaprovaline = 2, + /obj/item/reagent_containers/glass/bottle/antitoxin = 2, + /obj/item/storage/fancy/vials) //VOREStation Add /obj/structure/closet/secure_closet/psych @@ -225,15 +225,15 @@ /obj/item/clothing/under/rank/psych, /obj/item/clothing/under/rank/psych/turtleneck, /obj/item/clothing/suit/straight_jacket, - /obj/item/weapon/reagent_containers/glass/bottle/stoxin, - /obj/item/weapon/reagent_containers/syringe, - /obj/item/weapon/storage/pill_bottle/citalopram, - /obj/item/weapon/reagent_containers/pill/methylphenidate, - /obj/item/weapon/clipboard, - /obj/item/weapon/folder/white, - /obj/item/device/taperecorder, - /obj/item/device/tape/random = 3, - /obj/item/device/camera, + /obj/item/reagent_containers/glass/bottle/stoxin, + /obj/item/reagent_containers/syringe, + /obj/item/storage/pill_bottle/citalopram, + /obj/item/reagent_containers/pill/methylphenidate, + /obj/item/clipboard, + /obj/item/folder/white, + /obj/item/taperecorder, + /obj/item/rectape/random = 3, + /obj/item/camera, /obj/item/toy/plushie/therapy/blue) @@ -253,9 +253,9 @@ name = "pill cabinet" starts_with = list( - /obj/item/weapon/storage/pill_bottle/tramadol, - /obj/item/weapon/storage/pill_bottle/antitox, - /obj/item/weapon/storage/pill_bottle/carbon, + /obj/item/storage/pill_bottle/tramadol, + /obj/item/storage/pill_bottle/antitox, + /obj/item/storage/pill_bottle/carbon, /obj/random/medical/pillbottle) @@ -265,5 +265,5 @@ req_access = list(access_surgery) starts_with = list( - /obj/item/weapon/tank/anesthetic = 3, + /obj/item/tank/anesthetic = 3, /obj/item/clothing/mask/breath/medical = 3) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical_vr.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical_vr.dm index e47f8358918..7cb01d23d5e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical_vr.dm @@ -1,3 +1,3 @@ /obj/structure/closet/secure_closet/paramedic/Initialize() - starts_with += /obj/item/device/gps/medical + starts_with += /obj/item/gps/medical return ..() \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 39e8f2d954d..fb9eb977d4c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -6,15 +6,15 @@ /* //VOREStation Removal starts_with = list( - /obj/item/device/radio/headset) + /obj/item/radio/headset) */ /obj/structure/closet/secure_closet/personal/Initialize() /* //VOREStation Removal 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 ..() @@ -35,16 +35,16 @@ close_sound = 'sound/effects/wooden_closet_close.ogg' starts_with = list( - /obj/item/weapon/storage/backpack/satchel/withwallet, - /obj/item/device/radio/headset + /obj/item/storage/backpack/satchel/withwallet, + /obj/item/radio/headset ) -/obj/structure/closet/secure_closet/personal/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/closet/secure_closet/personal/attackby(obj/item/W as obj, mob/user as mob) if (src.opened) - if(istype(W, /obj/item/weapon/storage/laundry_basket)) + if(istype(W, /obj/item/storage/laundry_basket)) return ..(W,user) - if(istype(W, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = W + if(istype(W, /obj/item/grab)) + var/obj/item/grab/G = W if(large) MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet else @@ -57,7 +57,7 @@ if(W) W.forceMove(loc) else if(W.GetID()) - var/obj/item/weapon/card/id/I = W.GetID() + var/obj/item/card/id/I = W.GetID() if(src.broken) to_chat(user, "It appears to be broken.") @@ -72,7 +72,7 @@ src.desc = "Owned by [I.registered_name]." else to_chat(user, "Access Denied") - else if(istype(W, /obj/item/weapon/melee/energy/blade)) + else if(istype(W, /obj/item/melee/energy/blade)) if(emag_act(INFINITY, user, "The locker has been sliced open by [user] with \an [W]!", "You hear metal being sliced and sparks flying.")) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index c941f8306ed..5b5d4c42f2a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -7,17 +7,17 @@ /obj/item/clothing/under/rank/scientist, /obj/item/clothing/suit/storage/toggle/labcoat, /obj/item/clothing/shoes/white, - /obj/item/device/radio/headset/headset_sci, - /obj/item/weapon/tank/air, + /obj/item/radio/headset/headset_sci, + /obj/item/tank/air, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/storage/hooded/wintercoat/science, /obj/item/clothing/shoes/boots/winter/science) /obj/structure/closet/secure_closet/scientist/Initialize() if(prob(50)) - starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci + starts_with += /obj/item/storage/backpack/dufflebag/sci else - starts_with += /obj/item/weapon/storage/backpack/toxins + starts_with += /obj/item/storage/backpack/toxins return ..() @@ -40,20 +40,20 @@ /obj/item/clothing/under/rank/neo_rd_suit, /obj/item/clothing/under/rank/neo_rd_suit_skirt, /obj/item/clothing/under/rank/neo_rd_gorka, - /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/device/radio/headset/heads/rd/alt, - /obj/item/weapon/tank/air, + /obj/item/radio/headset/heads/rd, + /obj/item/radio/headset/heads/rd/alt, + /obj/item/tank/air, /obj/item/clothing/mask/gas, - /obj/item/device/flash, + /obj/item/flash, /obj/item/clothing/suit/storage/hooded/wintercoat/science, /obj/item/clothing/suit/storage/hooded/wintercoat/science/rd, /obj/item/clothing/shoes/boots/winter/science, /obj/item/clothing/head/beret/science/rd, - /obj/item/weapon/bluespace_harpoon) //VOREStation Add + /obj/item/bluespace_harpoon) //VOREStation Add /obj/structure/closet/secure_closet/xenoarchaeologist name = "Xenoarchaeologist Locker" @@ -65,29 +65,29 @@ /obj/item/clothing/suit/storage/toggle/labcoat, /obj/item/clothing/suit/storage/toggle/labcoat/modern, /obj/item/clothing/shoes/white, - /obj/item/weapon/melee/umbrella, + /obj/item/melee/umbrella, /obj/item/clothing/glasses/science, - /obj/item/device/radio/headset/headset_sci, - /obj/item/weapon/storage/belt/archaeology, - /obj/item/weapon/storage/excavation) + /obj/item/radio/headset/headset_sci, + /obj/item/storage/belt/archaeology, + /obj/item/storage/excavation) /obj/structure/closet/excavation name = "Excavation tools" closet_appearance = /decl/closet_appearance/secure_closet/engineering/tools/xenoarch starts_with = list( - /obj/item/weapon/storage/belt/archaeology, - /obj/item/weapon/storage/excavation, - /obj/item/device/flashlight/lantern, - /obj/item/device/ano_scanner, - /obj/item/device/depth_scanner, - /obj/item/device/core_sampler, - /obj/item/device/gps, - /obj/item/device/beacon_locator, - /obj/item/device/radio/beacon, + /obj/item/storage/belt/archaeology, + /obj/item/storage/excavation, + /obj/item/flashlight/lantern, + /obj/item/ano_scanner, + /obj/item/depth_scanner, + /obj/item/core_sampler, + /obj/item/gps, + /obj/item/beacon_locator, + /obj/item/radio/beacon, /obj/item/clothing/glasses/meson, - /obj/item/weapon/pickaxe, - /obj/item/device/measuring_tape, - /obj/item/weapon/pickaxe/hand, - /obj/item/weapon/storage/bag/fossils, - /obj/item/weapon/hand_labeler) + /obj/item/pickaxe, + /obj/item/measuring_tape, + /obj/item/pickaxe/hand, + /obj/item/storage/bag/fossils, + /obj/item/hand_labeler) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index ba9c1ba8929..280016304b8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -53,7 +53,7 @@ else to_chat(user, "Access Denied") -/obj/structure/closet/secure_closet/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/closet/secure_closet/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) if(opened) if(anchored) @@ -68,10 +68,10 @@ else to_chat(user, "You can't reach the anchoring bolts when the door is closed!") else if(opened) - if(istype(W, /obj/item/weapon/storage/laundry_basket)) + if(istype(W, /obj/item/storage/laundry_basket)) return ..(W,user) - if(istype(W, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = W + if(istype(W, /obj/item/grab)) + var/obj/item/grab/G = W if(large) MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet else @@ -83,14 +83,14 @@ user.drop_item() if(W) W.forceMove(loc) - else if(istype(W, /obj/item/weapon/melee/energy/blade)) + else if(istype(W, /obj/item/melee/energy/blade)) if(emag_act(INFINITY, user, "The locker has been sliced open by [user] with \an [W]!", "You hear metal being sliced and sparks flying.")) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, loc) spark_system.start() playsound(src, 'sound/weapons/blade1.ogg', 50, 1) playsound(src, "sparks", 50, 1) - else if(istype(W,/obj/item/weapon/packageWrap) || W.has_tool_quality(TOOL_WELDER)) + else if(istype(W,/obj/item/packageWrap) || W.has_tool_quality(TOOL_WELDER)) return ..(W,user) else togglelock(user) 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 c1eb7348efc..80d3bb90eb5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -4,17 +4,17 @@ closet_appearance = /decl/closet_appearance/secure_closet/command starts_with = list( - /obj/item/weapon/storage/backpack/dufflebag/captain, + /obj/item/storage/backpack/dufflebag/captain, /obj/item/clothing/head/helmet, /obj/item/clothing/suit/storage/vest, - /obj/item/weapon/cartridge/captain, - /obj/item/weapon/storage/lockbox/medal, - /obj/item/device/radio/headset/heads/captain, - /obj/item/device/radio/headset/heads/captain/alt, - /obj/item/weapon/gun/energy/gun, - /obj/item/weapon/melee/telebaton, - /obj/item/device/flash, - /obj/item/weapon/storage/box/ids) + /obj/item/cartridge/captain, + /obj/item/storage/lockbox/medal, + /obj/item/radio/headset/heads/captain, + /obj/item/radio/headset/heads/captain/alt, + /obj/item/gun/energy/gun, + /obj/item/melee/telebaton, + /obj/item/flash, + /obj/item/storage/box/ids) /obj/structure/closet/secure_closet/hop @@ -25,14 +25,14 @@ starts_with = list( /obj/item/clothing/suit/storage/vest, /obj/item/clothing/head/helmet, - /obj/item/weapon/cartridge/hop, - /obj/item/device/radio/headset/heads/hop, - /obj/item/device/radio/headset/heads/hop/alt, - /obj/item/weapon/storage/box/ids = 2, - /obj/item/weapon/gun/energy/gun/compact, - /obj/item/weapon/storage/box/commandkeys, - /obj/item/weapon/storage/box/servicekeys, - /obj/item/device/flash) + /obj/item/cartridge/hop, + /obj/item/radio/headset/heads/hop, + /obj/item/radio/headset/heads/hop/alt, + /obj/item/storage/box/ids = 2, + /obj/item/gun/energy/gun/compact, + /obj/item/storage/box/commandkeys, + /obj/item/storage/box/servicekeys, + /obj/item/flash) /obj/structure/closet/secure_closet/hop2 name = "head of personnel's attire" @@ -88,41 +88,41 @@ /obj/item/clothing/suit/storage/vest/hoscoat/jensen, /obj/item/clothing/suit/storage/vest/hoscoat, /obj/item/clothing/head/helmet/dermal, - /obj/item/weapon/cartridge/hos, - /obj/item/device/radio/headset/heads/hos, - /obj/item/device/radio/headset/heads/hos/alt, + /obj/item/cartridge/hos, + /obj/item/radio/headset/heads/hos, + /obj/item/radio/headset/heads/hos/alt, /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/taperoll/police, - /obj/item/weapon/shield/riot, - /obj/item/weapon/shield/riot/tele, - /obj/item/weapon/storage/box/holobadge/hos, + /obj/item/shield/riot, + /obj/item/shield/riot/tele, + /obj/item/storage/box/holobadge/hos, /obj/item/clothing/accessory/badge/holo/hos, - /obj/item/weapon/reagent_containers/spray/pepper, - /obj/item/weapon/tool/crowbar/red, - /obj/item/weapon/storage/box/flashbangs, - /obj/item/weapon/storage/belt/security, - /obj/item/device/flash, - /obj/item/weapon/melee/baton/loaded, - /obj/item/weapon/gun/magnetic/railgun/heater/pistol/hos, - /obj/item/weapon/rcd_ammo/large, - /obj/item/weapon/cell/device/weapon, + /obj/item/reagent_containers/spray/pepper, + /obj/item/tool/crowbar/red, + /obj/item/storage/box/flashbangs, + /obj/item/storage/belt/security, + /obj/item/flash, + /obj/item/melee/baton/loaded, + /obj/item/gun/magnetic/railgun/heater/pistol/hos, + /obj/item/rcd_ammo/large, + /obj/item/cell/device/weapon, /obj/item/clothing/accessory/holster/waist, - /obj/item/weapon/melee/telebaton, + /obj/item/melee/telebaton, /obj/item/clothing/head/beret/sec/corporate/hos, /obj/item/clothing/suit/storage/hooded/wintercoat/security, /obj/item/clothing/suit/storage/hooded/wintercoat/security/hos, /obj/item/clothing/shoes/boots/winter/security, - /obj/item/device/flashlight/maglight, + /obj/item/flashlight/maglight, /obj/item/clothing/mask/gas/half, /obj/item/clothing/mask/gas/sechailer/swat/hos) /obj/structure/closet/secure_closet/hos/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 ..() @@ -149,34 +149,34 @@ /obj/item/clothing/suit/storage/vest/wardencoat/neo_bluewarden, /obj/item/clothing/suit/storage/vest/wardencoat/neo_warden_heavy, /obj/item/clothing/under/rank/neo_sec_gorka, - /obj/item/weapon/cartridge/security, - /obj/item/device/radio/headset/headset_sec, - /obj/item/device/radio/headset/headset_sec/alt, + /obj/item/cartridge/security, + /obj/item/radio/headset/headset_sec, + /obj/item/radio/headset/headset_sec/alt, /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/taperoll/police, /obj/item/clothing/accessory/badge/holo/warden, - /obj/item/weapon/storage/box/flashbangs, - /obj/item/weapon/storage/belt/security, - /obj/item/weapon/reagent_containers/spray/pepper, - /obj/item/weapon/melee/baton/loaded, - /obj/item/weapon/gun/energy/gun, - /obj/item/weapon/cell/device/weapon, - /obj/item/weapon/storage/box/holobadge, + /obj/item/storage/box/flashbangs, + /obj/item/storage/belt/security, + /obj/item/reagent_containers/spray/pepper, + /obj/item/melee/baton/loaded, + /obj/item/gun/energy/gun, + /obj/item/cell/device/weapon, + /obj/item/storage/box/holobadge, /obj/item/clothing/head/beret/sec/corporate/warden, /obj/item/clothing/suit/storage/hooded/wintercoat/security, /obj/item/clothing/shoes/boots/winter/security, - /obj/item/device/flashlight/maglight, - /obj/item/device/megaphone, + /obj/item/flashlight/maglight, + /obj/item/megaphone, /obj/item/clothing/mask/gas/half, /obj/item/clothing/mask/gas/sechailer/swat/warden) /obj/structure/closet/secure_closet/warden/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 ..() /obj/structure/closet/secure_closet/security @@ -187,57 +187,57 @@ starts_with = list( /obj/item/clothing/suit/storage/vest/officer, /obj/item/clothing/head/helmet, - /obj/item/weapon/cartridge/security, - /obj/item/device/radio/headset/headset_sec, - /obj/item/device/radio/headset/headset_sec/alt, - /obj/item/weapon/storage/belt/security, - /obj/item/device/flash, - /obj/item/weapon/reagent_containers/spray/pepper, - /obj/item/weapon/grenade/flashbang, - /obj/item/weapon/melee/baton/loaded, + /obj/item/cartridge/security, + /obj/item/radio/headset/headset_sec, + /obj/item/radio/headset/headset_sec/alt, + /obj/item/storage/belt/security, + /obj/item/flash, + /obj/item/reagent_containers/spray/pepper, + /obj/item/grenade/flashbang, + /obj/item/melee/baton/loaded, /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/taperoll/police, - /obj/item/device/hailer, - /obj/item/device/flashlight/flare, + /obj/item/hailer, + /obj/item/flashlight/flare, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/head/soft/sec/corp, /obj/item/clothing/under/rank/security/corp, ///obj/item/ammo_magazine/m45/rubber, //VOREStation Removal, - /obj/item/weapon/gun/energy/taser, - /obj/item/weapon/cell/device/weapon, + /obj/item/gun/energy/taser, + /obj/item/cell/device/weapon, /obj/item/clothing/suit/storage/hooded/wintercoat/security, /obj/item/clothing/shoes/boots/winter/security, - /obj/item/device/flashlight/maglight) + /obj/item/flashlight/maglight) /obj/structure/closet/secure_closet/security/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 if(prob(30)) starts_with += /obj/item/poster/nanotrasen return ..() /obj/structure/closet/secure_closet/security/cargo/Initialize() starts_with += /obj/item/clothing/accessory/armband/cargo - starts_with += /obj/item/device/encryptionkey/headset_cargo + starts_with += /obj/item/encryptionkey/headset_cargo return ..() /obj/structure/closet/secure_closet/security/engine/Initialize() starts_with += /obj/item/clothing/accessory/armband/engine - starts_with += /obj/item/device/encryptionkey/headset_eng + starts_with += /obj/item/encryptionkey/headset_eng return ..() /obj/structure/closet/secure_closet/security/science/Initialize() starts_with += /obj/item/clothing/accessory/armband/science - starts_with += /obj/item/device/encryptionkey/headset_sci + starts_with += /obj/item/encryptionkey/headset_sci return ..() /obj/structure/closet/secure_closet/security/med/Initialize() starts_with += /obj/item/clothing/accessory/armband/medblue - starts_with += /obj/item/device/encryptionkey/headset_med + starts_with += /obj/item/encryptionkey/headset_med return ..() @@ -254,19 +254,19 @@ /obj/item/clothing/gloves/black, ///obj/item/gunbox, // VOREStation Removal /obj/item/gunbox/stun, - /obj/item/weapon/storage/belt/detective, - /obj/item/weapon/storage/box/evidence, - /obj/item/device/radio/headset/headset_sec, - /obj/item/device/radio/headset/headset_sec/alt, + /obj/item/storage/belt/detective, + /obj/item/storage/box/evidence, + /obj/item/radio/headset/headset_sec, + /obj/item/radio/headset/headset_sec/alt, /obj/item/clothing/suit/storage/vest/detective, /obj/item/taperoll/police, /obj/item/clothing/accessory/holster/armpit, - /obj/item/device/flashlight/maglight, - /obj/item/weapon/reagent_containers/food/drinks/flask/detflask, - /obj/item/weapon/storage/briefcase/crimekit, - /obj/item/device/taperecorder, - /obj/item/weapon/storage/bag/detective, - /obj/item/device/tape/random = 3) + /obj/item/flashlight/maglight, + /obj/item/reagent_containers/food/drinks/flask/detflask, + /obj/item/storage/briefcase/crimekit, + /obj/item/taperecorder, + /obj/item/storage/bag/detective, + /obj/item/rectape/random = 3) /obj/structure/closet/secure_closet/injection name = "lethal injections locker" @@ -274,7 +274,7 @@ closet_appearance = /decl/closet_appearance/secure_closet/courtroom starts_with = list( - /obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral = 2) + /obj/item/reagent_containers/syringe/ld50_syringe/choral = 2) GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/brig) @@ -308,11 +308,11 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br starts_with = list( /obj/item/clothing/shoes/brown, - /obj/item/weapon/paper/Court = 3, - /obj/item/weapon/pen, + /obj/item/paper/Court = 3, + /obj/item/pen, /obj/item/clothing/suit/judgerobe, /obj/item/clothing/head/powdered_wig, - /obj/item/weapon/storage/briefcase) + /obj/item/storage/briefcase) /obj/structure/closet/secure_closet/wall diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm index 3ab22cc1f4c..7761b7f03f2 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm @@ -30,10 +30,10 @@ /obj/item/clothing/suit/storage/vest/wardencoat/neo_armsco_trench, /obj/item/clothing/head/helmet/HoS/hat/blue, /obj/item/clothing/head/helmet/dermal, - /obj/item/device/radio/headset/heads/hos, - /obj/item/device/radio/headset/heads/hos/alt, + /obj/item/radio/headset/heads/hos, + /obj/item/radio/headset/heads/hos/alt, /obj/item/clothing/glasses/sunglasses/sechud, - /obj/item/weapon/storage/belt/security, + /obj/item/storage/belt/security, /obj/item/clothing/accessory/holster/waist, /obj/item/clothing/head/beret/sec/corporate/hos, /obj/item/clothing/suit/storage/hooded/wintercoat/security, @@ -47,22 +47,22 @@ storage_capacity = 2.5 * MOB_MEDIUM starts_with = list( - /obj/item/weapon/cartridge/hos, + /obj/item/cartridge/hos, /obj/item/taperoll/police, - /obj/item/weapon/shield/riot/tele, - /obj/item/weapon/storage/box/holobadge/hos, + /obj/item/shield/riot/tele, + /obj/item/storage/box/holobadge/hos, /obj/item/clothing/accessory/badge/holo/hos, - /obj/item/weapon/reagent_containers/spray/pepper, - /obj/item/weapon/tool/crowbar/red, - /obj/item/weapon/storage/box/flashbangs, - /obj/item/device/flash, - /obj/item/weapon/melee/baton/loaded, - /obj/item/weapon/storage/secure/briefcase/nsfw_pack_hos, - /obj/item/weapon/melee/telebaton, + /obj/item/reagent_containers/spray/pepper, + /obj/item/tool/crowbar/red, + /obj/item/storage/box/flashbangs, + /obj/item/flash, + /obj/item/melee/baton/loaded, + /obj/item/storage/secure/briefcase/nsfw_pack_hos, + /obj/item/melee/telebaton, /obj/item/clothing/head/beret/sec/corporate/hos, /obj/item/clothing/suit/storage/hooded/wintercoat/security, /obj/item/clothing/shoes/boots/winter/security, - /obj/item/device/flashlight/maglight) + /obj/item/flashlight/maglight) //Custom NT Security Lockers, Only found at central command /obj/structure/closet/secure_closet/nanotrasen_security @@ -74,22 +74,22 @@ starts_with = list( /obj/item/clothing/suit/storage/vest/nanotrasen, /obj/item/clothing/head/helmet, - /obj/item/weapon/cartridge/security, - /obj/item/device/radio/headset/headset_sec, - /obj/item/device/radio/headset/headset_sec/alt, - /obj/item/weapon/storage/belt/security, - /obj/item/device/flash, - /obj/item/weapon/reagent_containers/spray/pepper, - /obj/item/weapon/grenade/flashbang, - /obj/item/weapon/melee/baton/loaded, + /obj/item/cartridge/security, + /obj/item/radio/headset/headset_sec, + /obj/item/radio/headset/headset_sec/alt, + /obj/item/storage/belt/security, + /obj/item/flash, + /obj/item/reagent_containers/spray/pepper, + /obj/item/grenade/flashbang, + /obj/item/melee/baton/loaded, /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/taperoll/police, - /obj/item/device/hailer, - /obj/item/device/flashlight/flare, + /obj/item/hailer, + /obj/item/flashlight/flare, /obj/item/clothing/accessory/storage/black_vest, - /obj/item/weapon/gun/energy/taser, - /obj/item/weapon/cell/device/weapon, - /obj/item/device/flashlight/maglight, + /obj/item/gun/energy/taser, + /obj/item/cell/device/weapon, + /obj/item/flashlight/maglight, /obj/item/clothing/head/soft/nanotrasen, /obj/item/clothing/head/beret/nanotrasen, /obj/item/clothing/under/nanotrasen/security, @@ -99,11 +99,11 @@ /obj/structure/closet/secure_closet/nanotrasen_security/Initialize() if(prob(25)) - 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(75)) - starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec + starts_with += /obj/item/storage/backpack/dufflebag/sec return ..() /obj/structure/closet/secure_closet/nanotrasen_commander @@ -120,27 +120,27 @@ /obj/item/clothing/suit/storage/vest/hoscoat/jensen, /obj/item/clothing/suit/storage/vest/hoscoat, /obj/item/clothing/head/helmet/dermal, - /obj/item/weapon/cartridge/hos, - /obj/item/device/radio/headset/heads/hos, - /obj/item/device/radio/headset/heads/hos/alt, + /obj/item/cartridge/hos, + /obj/item/radio/headset/heads/hos, + /obj/item/radio/headset/heads/hos/alt, /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/taperoll/police, - /obj/item/weapon/shield/riot, - /obj/item/weapon/shield/riot/tele, - /obj/item/weapon/storage/box/holobadge/hos, + /obj/item/shield/riot, + /obj/item/shield/riot/tele, + /obj/item/storage/box/holobadge/hos, /obj/item/clothing/accessory/badge/holo/hos, - /obj/item/weapon/reagent_containers/spray/pepper, - /obj/item/weapon/tool/crowbar/red, - /obj/item/weapon/storage/box/flashbangs, - /obj/item/weapon/storage/belt/security, - /obj/item/device/flash, - /obj/item/weapon/melee/baton/loaded, - /obj/item/weapon/gun/energy/gun, - /obj/item/weapon/cell/device/weapon, + /obj/item/reagent_containers/spray/pepper, + /obj/item/tool/crowbar/red, + /obj/item/storage/box/flashbangs, + /obj/item/storage/belt/security, + /obj/item/flash, + /obj/item/melee/baton/loaded, + /obj/item/gun/energy/gun, + /obj/item/cell/device/weapon, /obj/item/clothing/accessory/holster/waist, - /obj/item/weapon/melee/telebaton, + /obj/item/melee/telebaton, /obj/item/clothing/head/beret/sec/corporate/hos, - /obj/item/device/flashlight/maglight, + /obj/item/flashlight/maglight, /obj/item/clothing/gloves/black, /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/shoes/boots/jackboots/toeless, @@ -148,11 +148,11 @@ /obj/structure/closet/secure_closet/nanotrasen_commander/Initialize() if(prob(25)) - 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(75)) - starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec + starts_with += /obj/item/storage/backpack/dufflebag/sec return ..() /obj/structure/closet/secure_closet/nanotrasen_warden @@ -167,47 +167,47 @@ /obj/item/clothing/suit/storage/vest/wardencoat/alt, /obj/item/clothing/suit/storage/vest/wardencoat/alt2, /obj/item/clothing/head/helmet/warden, - /obj/item/weapon/cartridge/security, - /obj/item/device/radio/headset/headset_sec, - /obj/item/device/radio/headset/headset_sec/alt, + /obj/item/cartridge/security, + /obj/item/radio/headset/headset_sec, + /obj/item/radio/headset/headset_sec/alt, /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/taperoll/police, /obj/item/clothing/accessory/badge/holo/warden, - /obj/item/weapon/storage/box/flashbangs, - /obj/item/weapon/storage/belt/security, - /obj/item/weapon/reagent_containers/spray/pepper, - /obj/item/weapon/melee/baton/loaded, - /obj/item/weapon/gun/energy/gun, - /obj/item/weapon/cell/device/weapon, - /obj/item/weapon/storage/box/holobadge, + /obj/item/storage/box/flashbangs, + /obj/item/storage/belt/security, + /obj/item/reagent_containers/spray/pepper, + /obj/item/melee/baton/loaded, + /obj/item/gun/energy/gun, + /obj/item/cell/device/weapon, + /obj/item/storage/box/holobadge, /obj/item/clothing/head/beret/sec/corporate/warden, - /obj/item/device/flashlight/maglight, - /obj/item/device/megaphone, + /obj/item/flashlight/maglight, + /obj/item/megaphone, /obj/item/clothing/gloves/black, /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/shoes/boots/jackboots/toeless) /obj/structure/closet/secure_closet/nanotrasen_warden/Initialize() if(prob(25)) - new /obj/item/weapon/storage/backpack/security(src) + new /obj/item/storage/backpack/security(src) else - new /obj/item/weapon/storage/backpack/satchel/sec(src) + new /obj/item/storage/backpack/satchel/sec(src) if(prob(75)) - new /obj/item/weapon/storage/backpack/dufflebag/sec(src) + new /obj/item/storage/backpack/dufflebag/sec(src) return ..() /obj/structure/closet/secure_closet/captains starts_with = list( - /obj/item/weapon/storage/backpack/dufflebag/captain, + /obj/item/storage/backpack/dufflebag/captain, /obj/item/clothing/head/helmet, /obj/item/clothing/suit/storage/vest, - /obj/item/weapon/cartridge/captain, - /obj/item/weapon/storage/lockbox/medal, - /obj/item/device/radio/headset/heads/captain, - /obj/item/device/radio/headset/heads/captain/alt, + /obj/item/cartridge/captain, + /obj/item/storage/lockbox/medal, + /obj/item/radio/headset/heads/captain, + /obj/item/radio/headset/heads/captain/alt, /obj/item/gunbox/captain, - /obj/item/weapon/melee/telebaton, - /obj/item/device/flash, - /obj/item/weapon/storage/box/ids, - /obj/item/weapon/melee/rapier, + /obj/item/melee/telebaton, + /obj/item/flash, + /obj/item/storage/box/ids, + /obj/item/melee/rapier, /obj/item/clothing/accessory/holster/machete/rapier) diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 51d15feb1bf..1dc3e314801 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -7,16 +7,16 @@ desc = "It's a storage unit for operative gear." starts_with = list( - /obj/item/weapon/tank/jetpack/oxygen, + /obj/item/tank/jetpack/oxygen, /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/under/syndicate, /obj/item/clothing/head/helmet/space/void/merc, /obj/item/clothing/suit/space/void/merc, - /obj/item/weapon/tool/crowbar/red, - /obj/item/weapon/cell/high, - /obj/item/weapon/card/id/syndicate, - /obj/item/device/multitool, - /obj/item/weapon/shield/energy, + /obj/item/tool/crowbar/red, + /obj/item/cell/high, + /obj/item/card/id/syndicate, + /obj/item/multitool, + /obj/item/shield/energy, /obj/item/clothing/shoes/magboots) @@ -24,7 +24,7 @@ desc = "It's a storage unit for voidsuits." starts_with = list( - /obj/item/weapon/tank/jetpack/oxygen, + /obj/item/tank/jetpack/oxygen, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/merc, /obj/item/clothing/mask/gas/syndicate, @@ -36,12 +36,12 @@ starts_with = list( /obj/item/ammo_magazine/m10mm = 5, - /obj/item/weapon/storage/box/handcuffs, - /obj/item/weapon/storage/box/flashbangs, - /obj/item/weapon/gun/energy/gun = 5, - /obj/item/weapon/pinpointer/nukeop = 5, - /obj/item/device/pda/syndicate, - /obj/item/device/radio/uplink) + /obj/item/storage/box/handcuffs, + /obj/item/storage/box/flashbangs, + /obj/item/gun/energy/gun = 5, + /obj/item/pinpointer/nukeop = 5, + /obj/item/pda/syndicate, + /obj/item/radio/uplink) /obj/structure/closet/syndicate/resources desc = "An old, dusty locker." @@ -58,7 +58,7 @@ //Sad trombone if(pickednum == 1) - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src) + var/obj/item/paper/P = new /obj/item/paper(src) P.name = "IOU" P.info = "Sorry man, we needed the money so we sold your stash. It's ok, we'll double our money for sure this time!" @@ -96,7 +96,7 @@ //Jetpack (You hit the jackpot!) if(pickednum == 50) - new /obj/item/weapon/tank/jetpack/carbondioxide(src) + new /obj/item/tank/jetpack/carbondioxide(src) /obj/structure/closet/syndicate/resources/everything desc = "It's an emergency storage closet for repairs." diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 7946fd1e942..e9a3daee87a 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -22,28 +22,28 @@ //VOREStation Block Edit Start - Modified List if ("small") starts_with = list( - /obj/item/weapon/tank/emergency/oxygen = 2, + /obj/item/tank/emergency/oxygen = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/suit/space/emergency = 2, /obj/item/clothing/head/helmet/space/emergency = 2) if ("aid") starts_with = list( - /obj/item/weapon/tank/emergency/oxygen, - /obj/item/weapon/storage/toolbox/emergency, + /obj/item/tank/emergency/oxygen, + /obj/item/storage/toolbox/emergency, /obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/head/helmet/space/emergency) if ("tank") starts_with = list( - /obj/item/weapon/tank/emergency/oxygen/engi = 2, + /obj/item/tank/emergency/oxygen/engi = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/suit/space/emergency = 2, /obj/item/clothing/head/helmet/space/emergency = 2) if ("both") starts_with = list( - /obj/item/weapon/storage/toolbox/emergency, - /obj/item/weapon/storage/firstaid/o2, - /obj/item/weapon/tank/emergency/oxygen/engi = 2, + /obj/item/storage/toolbox/emergency, + /obj/item/storage/firstaid/o2, + /obj/item/tank/emergency/oxygen/engi = 2, /obj/item/clothing/mask/breath = 2, /obj/item/clothing/suit/space/emergency = 2, /obj/item/clothing/head/helmet/space/emergency = 2) @@ -53,7 +53,7 @@ /obj/structure/closet/emcloset/legacy starts_with = list( - /obj/item/weapon/tank/oxygen, + /obj/item/tank/oxygen, /obj/item/clothing/mask/gas) /* @@ -67,26 +67,26 @@ starts_with = list( /obj/item/clothing/suit/fire, /obj/item/clothing/mask/gas, - /obj/item/weapon/tank/oxygen/red, - /obj/item/weapon/extinguisher, + /obj/item/tank/oxygen/red, + /obj/item/extinguisher, /obj/item/clothing/head/hardhat/red) /obj/structure/closet/firecloset/full starts_with = list( /obj/item/clothing/suit/fire, /obj/item/clothing/mask/gas, - /obj/item/device/flashlight, - /obj/item/weapon/tank/oxygen/red, - /obj/item/weapon/extinguisher, + /obj/item/flashlight, + /obj/item/tank/oxygen/red, + /obj/item/extinguisher, /obj/item/clothing/head/hardhat/red) /obj/structure/closet/firecloset/full/double starts_with = list( /obj/item/clothing/suit/fire = 2, /obj/item/clothing/mask/gas = 2, - /obj/item/device/flashlight = 2, - /obj/item/weapon/tank/oxygen/red = 2, - /obj/item/weapon/extinguisher = 2, + /obj/item/flashlight = 2, + /obj/item/tank/oxygen/red = 2, + /obj/item/extinguisher = 2, /obj/item/clothing/head/hardhat/red = 2) /obj/structure/closet/firecloset/full/atmos @@ -96,9 +96,9 @@ starts_with = list( /obj/item/clothing/suit/fire/heavy, - /obj/item/weapon/tank/oxygen/red, - /obj/item/weapon/extinguisher/atmo, - /obj/item/device/flashlight, + /obj/item/tank/oxygen/red, + /obj/item/extinguisher/atmo, + /obj/item/flashlight, /obj/item/clothing/head/hardhat/firefighter/atmos) /* @@ -114,21 +114,21 @@ if(prob(40)) starts_with += /obj/item/clothing/suit/storage/hazardvest if(prob(70)) - starts_with += /obj/item/device/flashlight + starts_with += /obj/item/flashlight if(prob(70)) - starts_with += /obj/item/weapon/tool/screwdriver + starts_with += /obj/item/tool/screwdriver if(prob(70)) - starts_with += /obj/item/weapon/tool/wrench + starts_with += /obj/item/tool/wrench if(prob(70)) - starts_with += /obj/item/weapon/weldingtool + starts_with += /obj/item/weldingtool if(prob(70)) - starts_with += /obj/item/weapon/tool/crowbar + starts_with += /obj/item/tool/crowbar if(prob(70)) - starts_with += /obj/item/weapon/tool/wirecutters + starts_with += /obj/item/tool/wirecutters if(prob(70)) - starts_with += /obj/item/device/t_scanner + starts_with += /obj/item/t_scanner if(prob(20)) - starts_with += /obj/item/weapon/storage/belt/utility + starts_with += /obj/item/storage/belt/utility if(prob(30)) starts_with += /obj/item/stack/cable_coil/random if(prob(30)) @@ -136,13 +136,13 @@ if(prob(30)) starts_with += /obj/item/stack/cable_coil/random if(prob(20)) - starts_with += /obj/item/device/multitool + starts_with += /obj/item/multitool if(prob(5)) starts_with += /obj/item/clothing/gloves/yellow if(prob(40)) starts_with += /obj/item/clothing/head/hardhat if(prob(30)) - starts_with += /obj/item/weapon/reagent_containers/spray/windowsealant //VOREStation Add + starts_with += /obj/item/reagent_containers/spray/windowsealant //VOREStation Add return ..() /* @@ -156,7 +156,7 @@ starts_with = list( /obj/item/clothing/suit/radiation = 2, /obj/item/clothing/head/radiation = 2, - /obj/item/device/geiger = 2) + /obj/item/geiger = 2) /* * Bombsuit closet @@ -208,9 +208,9 @@ starts_with = list( /obj/item/clothing/suit/fire/firefighter, /obj/item/clothing/mask/gas, - /obj/item/device/flashlight, - /obj/item/weapon/tank/oxygen/red, - /obj/item/weapon/extinguisher, + /obj/item/flashlight, + /obj/item/tank/oxygen/red, + /obj/item/extinguisher, /obj/item/clothing/head/hardhat/red) /* diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm index 1f848762226..e8634fe4a36 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm @@ -1,7 +1,7 @@ /obj/structure/closet/firecloset/Initialize() - starts_with += /obj/item/weapon/storage/toolbox/emergency + starts_with += /obj/item/storage/toolbox/emergency return ..() /obj/structure/closet/hydrant/New() - starts_with += /obj/item/weapon/storage/toolbox/emergency + starts_with += /obj/item/storage/toolbox/emergency return ..() diff --git a/code/game/objects/structures/crates_lockers/closets/walllocker.dm b/code/game/objects/structures/crates_lockers/closets/walllocker.dm index 0693503fb61..ea27c4a4502 100644 --- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm @@ -19,7 +19,7 @@ /obj/structure/closet/walllocker/emerglocker name = "emergency locker" desc = "A wall mounted locker with emergency supplies." - var/list/spawnitems = list(/obj/item/weapon/tank/emergency/oxygen,/obj/item/clothing/mask/breath,/obj/item/weapon/tool/crowbar/red) + var/list/spawnitems = list(/obj/item/tank/emergency/oxygen,/obj/item/clothing/mask/breath,/obj/item/tool/crowbar/red) var/amount = 2 // spawns each items X times. closet_appearance = /decl/closet_appearance/wall/emergency @@ -27,7 +27,7 @@ src.attack_hand(user) return -/obj/structure/closet/walllocker/emerglocker/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/closet/walllocker/emerglocker/attackby(obj/item/W as obj, mob/user as mob) return /obj/structure/closet/walllocker/emerglocker/attack_hand(mob/user as mob) @@ -187,9 +187,9 @@ starts_with = list( /obj/item/clothing/mask/breath = 2, - /obj/item/weapon/tank/emergency/oxygen/engi = 2, - /obj/item/weapon/storage/briefcase/inflatable, - /obj/item/device/radio = 3) + /obj/item/tank/emergency/oxygen/engi = 2, + /obj/item/storage/briefcase/inflatable, + /obj/item/radio = 3) /obj/structure/closet/walllocker_double/emergency_engi/north pixel_y = 32 @@ -215,9 +215,9 @@ starts_with = list( /obj/item/clothing/suit/fire, /obj/item/clothing/mask/gas, - /obj/item/device/flashlight, - /obj/item/weapon/tank/oxygen/red, - /obj/item/weapon/extinguisher, + /obj/item/flashlight, + /obj/item/tank/oxygen/red, + /obj/item/extinguisher, /obj/item/clothing/head/hardhat/red) /obj/structure/closet/walllocker_double/hydrant/north @@ -252,14 +252,14 @@ /obj/item/clothing/suit/space/emergency, /obj/item/clothing/head/helmet/space/emergency, /obj/item/clothing/mask/breath, - /obj/item/weapon/tank/oxygen, - /obj/item/device/suit_cooling_unit/emergency, - /obj/item/device/gps, - /obj/item/weapon/material/knife/tacknife/survival, + /obj/item/tank/oxygen, + /obj/item/suit_cooling_unit/emergency, + /obj/item/gps, + /obj/item/material/knife/tacknife/survival, /obj/random/mre, - /obj/item/device/flashlight/color/yellow, - /obj/item/device/flashlight/flare, - /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle) + /obj/item/flashlight/color/yellow, + /obj/item/flashlight/flare, + /obj/item/reagent_containers/food/drinks/cans/waterbottle) /obj/structure/closet/walllocker_double/survival/north pixel_y = 32 diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 64c2fda73d4..b920ecd8b79 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -23,17 +23,17 @@ /obj/structure/closet/wardrobe/red/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/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/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 return ..() @@ -79,7 +79,7 @@ /obj/item/clothing/head/that = 3, /obj/item/clothing/head/soft/black = 3, /obj/item/clothing/mask/bandana = 3, - /obj/item/weapon/storage/backpack/messenger/black) + /obj/item/storage/backpack/messenger/black) /obj/structure/closet/wardrobe/chaplain_black @@ -96,12 +96,12 @@ /obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout, /obj/item/clothing/suit/holidaypriest, /obj/item/clothing/under/wedding/bride_white, - /obj/item/weapon/storage/backpack/cultpack, - /obj/item/weapon/storage/fancy/candle_box = 2, - /obj/item/weapon/storage/fancy/whitecandle_box, - /obj/item/weapon/storage/fancy/blackcandle_box, + /obj/item/storage/backpack/cultpack, + /obj/item/storage/fancy/candle_box = 2, + /obj/item/storage/fancy/whitecandle_box, + /obj/item/storage/fancy/blackcandle_box, /obj/item/godfig = 2, - /obj/item/weapon/deck/tarot) + /obj/item/deck/tarot) /obj/structure/closet/wardrobe/green @@ -214,18 +214,18 @@ /obj/item/clothing/shoes/slippers = 3, /obj/item/clothing/suit/storage/hooded/wintercoat/science, /obj/item/clothing/shoes/boots/winter/science, - /obj/item/weapon/storage/backpack/toxins, - /obj/item/weapon/storage/backpack/satchel/tox) + /obj/item/storage/backpack/toxins, + /obj/item/storage/backpack/satchel/tox) /obj/structure/closet/wardrobe/science_white/Initialize() if(prob(50)) - starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci + starts_with += /obj/item/storage/backpack/dufflebag/sci else - starts_with += /obj/item/weapon/storage/backpack/satchel/tox + starts_with += /obj/item/storage/backpack/satchel/tox if(prob(50)) - starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci + starts_with += /obj/item/storage/backpack/dufflebag/sci else - starts_with += /obj/item/weapon/storage/backpack/satchel/tox + starts_with += /obj/item/storage/backpack/satchel/tox return ..() @@ -240,14 +240,14 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/science/robotics, /obj/item/clothing/shoes/black = 2, /obj/item/clothing/gloves/black = 2, - /obj/item/weapon/storage/backpack/toxins, - /obj/item/weapon/storage/backpack/satchel/tox) + /obj/item/storage/backpack/toxins, + /obj/item/storage/backpack/satchel/tox) /obj/structure/closet/wardrobe/robotics_black/Initialize() if(prob(50)) - starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci + starts_with += /obj/item/storage/backpack/dufflebag/sci else - starts_with += /obj/item/weapon/storage/backpack/satchel/tox + starts_with += /obj/item/storage/backpack/satchel/tox return ..() @@ -262,9 +262,9 @@ /obj/item/clothing/shoes/white = 2, /obj/item/clothing/suit/storage/toggle/labcoat/chemist = 2, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/chemist, - /obj/item/weapon/storage/backpack/chemistry = 2, - /obj/item/weapon/storage/backpack/satchel/chem = 2, - /obj/item/weapon/storage/bag/chemistry = 2,) + /obj/item/storage/backpack/chemistry = 2, + /obj/item/storage/backpack/satchel/chem = 2, + /obj/item/storage/bag/chemistry = 2,) /obj/structure/closet/wardrobe/genetics_white @@ -276,8 +276,8 @@ /obj/item/clothing/under/rank/geneticist/skirt = 2, /obj/item/clothing/shoes/white = 2, /obj/item/clothing/suit/storage/toggle/labcoat/genetics = 2, - /obj/item/weapon/storage/backpack/genetics = 2, - /obj/item/weapon/storage/backpack/satchel/gen = 2) + /obj/item/storage/backpack/genetics = 2, + /obj/item/storage/backpack/satchel/gen = 2) /obj/structure/closet/wardrobe/virology_white @@ -291,8 +291,8 @@ /obj/item/clothing/suit/storage/toggle/labcoat/virologist = 2, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro, /obj/item/clothing/mask/surgical = 2, - /obj/item/weapon/storage/backpack/virology = 2, - /obj/item/weapon/storage/backpack/satchel/vir = 2) + /obj/item/storage/backpack/virology = 2, + /obj/item/storage/backpack/satchel/vir = 2) /obj/structure/closet/wardrobe/medic_white @@ -394,9 +394,9 @@ /obj/structure/closet/wardrobe/tactical/Initialize() if(prob(25)) - starts_with += /obj/item/weapon/storage/belt/security/tactical/bandolier + starts_with += /obj/item/storage/belt/security/tactical/bandolier else - starts_with += /obj/item/weapon/storage/belt/security/tactical + starts_with += /obj/item/storage/belt/security/tactical if(prob(10)) starts_with += /obj/item/clothing/mask/bandana/skull @@ -410,7 +410,7 @@ /obj/item/clothing/under/rank/centcom, /obj/item/clothing/under/ert, /obj/item/clothing/under/syndicate/combat, - /obj/item/device/radio/headset/ert/alt, + /obj/item/radio/headset/ert/alt, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/shoes/boots/swat, /obj/item/clothing/gloves/swat, @@ -446,7 +446,7 @@ /obj/item/clothing/under/suit_jacket/red/skirt, /obj/item/clothing/under/scratch, /obj/item/clothing/under/scratch/skirt, - /obj/item/weapon/storage/backpack/satchel = 2) + /obj/item/storage/backpack/satchel = 2) /obj/structure/closet/wardrobe/captain name = "site manager's wardrobe" @@ -456,7 +456,7 @@ close_sound = 'sound/effects/wooden_closet_close.ogg' starts_with = list( - /obj/item/weapon/storage/backpack/captain, + /obj/item/storage/backpack/captain, /obj/item/clothing/suit/captunic, /obj/item/clothing/suit/captunic/capjacket, /obj/item/clothing/head/caphat/cap, @@ -472,7 +472,7 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/gloves/captain, /obj/item/clothing/under/dress/dress_cap, - /obj/item/weapon/storage/backpack/satchel/cap, + /obj/item/storage/backpack/satchel/cap, /obj/item/clothing/head/caphat/formal, /obj/item/clothing/under/captainformal, /obj/item/clothing/suit/storage/hooded/wintercoat/captain, diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe_vr.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe_vr.dm index ffeeae996a7..67deb1eec87 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe_vr.dm @@ -3,7 +3,7 @@ closet_appearance = /decl/closet_appearance/tactical/alt //because ert lockers are red for some dumb reason starts_with = list( /obj/item/clothing/under/ert, - /obj/item/device/radio/headset/ert/alt, + /obj/item/radio/headset/ert/alt, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/shoes/boots/swat, /obj/item/clothing/gloves/swat, @@ -18,7 +18,7 @@ starts_with = list( /obj/item/clothing/under/tactical, /obj/item/clothing/under/syndicate/combat, - /obj/item/device/radio/headset/syndicate/alt, + /obj/item/radio/headset/syndicate/alt, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/shoes/boots/combat, /obj/item/clothing/gloves/combat, diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 5e4f63aff85..e271fbada67 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -25,7 +25,7 @@ if(!src.can_open()) return 0 - if(rigged && locate(/obj/item/device/radio/electropack) in src) + if(rigged && locate(/obj/item/radio/electropack) in src) if(isliving(usr)) var/mob/living/L = usr if(L.electrocute_act(17, src)) @@ -97,7 +97,7 @@ src.set_dir(turn(src.dir, 90)) -/obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/closet/crate/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH) && istype(src,/obj/structure/closet/crate/bin)) return ..() else if(opened) @@ -105,12 +105,12 @@ return if(W.loc != user) // This should stop mounted modules ending up outside the module. return - if(istype(W, /obj/item/weapon/grab)) //VOREstation edit: we don't want to drop grabs into the crate + if(istype(W, /obj/item/grab)) //VOREstation edit: we don't want to drop grabs into the crate return user.drop_item() if(W) W.forceMove(src.loc) - else if(istype(W, /obj/item/weapon/packageWrap)) + else if(istype(W, /obj/item/packageWrap)) return else if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W @@ -121,7 +121,7 @@ to_chat(user , "You rig [src].") rigged = 1 return - else if(istype(W, /obj/item/device/radio/electropack)) + else if(istype(W, /obj/item/radio/electropack)) if(rigged) to_chat(user , "You attach [W] to [src].") user.drop_item() @@ -219,10 +219,10 @@ else src.toggle(user) -/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(is_type_in_list(W, list(/obj/item/weapon/packageWrap, /obj/item/stack/cable_coil, /obj/item/device/radio/electropack, /obj/item/weapon/tool/wirecutters))) +/obj/structure/closet/crate/secure/attackby(obj/item/W as obj, mob/user as mob) + if(is_type_in_list(W, list(/obj/item/packageWrap, /obj/item/stack/cable_coil, /obj/item/radio/electropack, /obj/item/tool/wirecutters))) return ..() - if(istype(W, /obj/item/weapon/melee/energy/blade)) + if(istype(W, /obj/item/melee/energy/blade)) emag_act(INFINITY, user) if(!opened) src.togglelock(user) @@ -291,17 +291,17 @@ desc = "A crate with rapid construction device." starts_with = list( - /obj/item/weapon/rcd_ammo = 3, - /obj/item/weapon/rcd) + /obj/item/rcd_ammo = 3, + /obj/item/rcd) /obj/structure/closet/crate/solar name = "solar pack crate" starts_with = list( /obj/item/solar_assembly = 21, - /obj/item/weapon/circuitboard/solar_control, - /obj/item/weapon/tracker_electronics, - /obj/item/weapon/paper/solar) + /obj/item/circuitboard/solar_control, + /obj/item/tracker_electronics, + /obj/item/paper/solar) /obj/structure/closet/crate/freezer name = "freezer" @@ -725,8 +725,8 @@ /obj/structure/closet/crate/hydroponics/prespawned starts_with = list( - /obj/item/weapon/reagent_containers/spray/plantbgone = 2, - /obj/item/weapon/material/minihoe) + /obj/item/reagent_containers/spray/plantbgone = 2, + /obj/item/material/minihoe) //Laundry Cart /obj/structure/closet/crate/laundry diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index d9902638ffc..bed36f8dfe4 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -21,7 +21,7 @@ to_chat(user, "You need a crowbar to pry this open!") return -/obj/structure/largecrate/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/largecrate/attackby(obj/item/W as obj, mob/user as mob) var/turf/T = get_turf(src) if(!T) to_chat(user, "You can't open this here!") @@ -54,7 +54,7 @@ desc = "You aren't sure how this crate is so light, but the Wulf Aeronautics logo might be a hint." icon_state = "vehiclecrate" -/obj/structure/largecrate/hoverpod/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/largecrate/hoverpod/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_CROWBAR)) var/obj/item/mecha_parts/mecha_equipment/ME var/obj/mecha/working/hoverpod/H = new (loc) diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index 7b9f9c0a4af..f41922d2895 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -2,7 +2,7 @@ name = "Bird crate" desc = "You hear chirping and cawing inside the crate. It sounds like there are a lot of birds in there..." -/obj/structure/largecrate/birds/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/largecrate/birds/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_CROWBAR)) new /obj/item/stack/material/wood(src) new /mob/living/simple_mob/animal/passive/bird(src) diff --git a/code/game/objects/structures/crates_lockers/vehiclecage.dm b/code/game/objects/structures/crates_lockers/vehiclecage.dm index 944da792f83..9af560a4742 100644 --- a/code/game/objects/structures/crates_lockers/vehiclecage.dm +++ b/code/game/objects/structures/crates_lockers/vehiclecage.dm @@ -27,7 +27,7 @@ to_chat(user, "You need a wrench to take this apart!") return -/obj/structure/vehiclecage/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/vehiclecage/attackby(obj/item/W as obj, mob/user as mob) var/turf/T = get_turf(src) if(!T) to_chat(user, "You can't open this here!") @@ -82,7 +82,7 @@ update_icon() -/obj/structure/vehiclecage/proc/disassemble(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/vehiclecage/proc/disassemble(obj/item/W as obj, mob/user as mob) var/turf/T = get_turf(src) new /obj/item/stack/material/steel(src.loc, 5) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 362d966ae5c..1172af7616b 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -13,9 +13,9 @@ /obj/structure/displaycase/ex_act(severity) switch(severity) if (1) - new /obj/item/weapon/material/shard( src.loc ) + new /obj/item/material/shard( src.loc ) if (occupied) - new /obj/item/weapon/gun/energy/captain( src.loc ) + new /obj/item/gun/energy/captain( src.loc ) occupied = 0 qdel(src) if (2) @@ -39,7 +39,7 @@ if (!( src.destroyed )) src.density = FALSE src.destroyed = 1 - new /obj/item/weapon/material/shard( src.loc ) + new /obj/item/material/shard( src.loc ) playsound(src, "shatter", 70, 1) update_icon() else @@ -54,7 +54,7 @@ return -/obj/structure/displaycase/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/displaycase/attackby(obj/item/W as obj, mob/user as mob) user.setClickCooldown(user.get_attack_speed(W)) user.do_attack_animation(src) playsound(src, 'sound/effects/Glasshit.ogg', 50, 1) @@ -65,7 +65,7 @@ /obj/structure/displaycase/attack_hand(mob/user as mob) if (src.destroyed && src.occupied) - new /obj/item/weapon/gun/energy/captain( src.loc ) + new /obj/item/gun/energy/captain( src.loc ) to_chat(user, "You deactivate the hover field built into the case.") src.occupied = 0 src.add_fingerprint(user) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 3a024f647b8..9a20dcdcef0 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -8,7 +8,7 @@ var/state = 0 var/base_icon_state = "" var/base_name = "airlock" - var/obj/item/weapon/airlock_electronics/electronics = null + var/obj/item/airlock_electronics/electronics = null var/airlock_type = "" //the type path of the airlock once completed var/glass_type = "/glass" var/glass = 0 // 0 = glass can be installed. -1 = glass can't be installed. 1 = glass is already installed. Text = mineral plating is installed instead. @@ -161,17 +161,17 @@ update_state() /obj/structure/door_assembly/attack_robot(mob/living/silicon/robot/user) - if(Adjacent(user) && (user.module && (istype(user.module,/obj/item/weapon/robot_module/robot/engineering)) \ - || istype(user.module,/obj/item/weapon/robot_module/drone))) //Only drone (and engiborg) needs this. + if(Adjacent(user) && (user.module && (istype(user.module,/obj/item/robot_module/robot/engineering)) \ + || istype(user.module,/obj/item/robot_module/drone))) //Only drone (and engiborg) needs this. rename_door(user) /obj/structure/door_assembly/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/pen)) + if(istype(W, /obj/item/pen)) rename_door(user) return if(W.has_tool_quality(TOOL_WELDER) && ( (istext(glass)) || (glass == 1) || (!anchored) )) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if (WT.remove_fuel(0, user)) playsound(src, WT.usesound, 50, 1) if(istext(glass)) @@ -233,7 +233,7 @@ new/obj/item/stack/cable_coil(src.loc, 1) src.state = 0 - else if(istype(W, /obj/item/weapon/airlock_electronics) && state == 1) + else if(istype(W, /obj/item/airlock_electronics) && state == 1) playsound(src, W.usesound, 100, 1) user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.") diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index ff37f1b40b3..56ebe32b6d0 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -11,7 +11,7 @@ add_overlay(image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir)) return -/obj/structure/bed/chair/e_chair/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/bed/chair/e_chair/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) var/obj/structure/bed/chair/C = new /obj/structure/bed/chair(loc) playsound(src, W.usesound, 50, 1) diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 8318392b49f..aa85c0f2458 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -6,7 +6,7 @@ layer = ABOVE_WINDOW_LAYER anchored = TRUE density = FALSE - var/obj/item/weapon/extinguisher/has_extinguisher + var/obj/item/extinguisher/has_extinguisher var/opened = 0 /obj/structure/extinguisher_cabinet/Initialize(var/mapload, var/dir, var/building = 0) @@ -16,14 +16,14 @@ pixel_x = (dir & 3)? 0 : (dir == 4 ? -27 : 27) pixel_y = (dir & 3)? (dir ==1 ? -27 : 27) : 0 else - has_extinguisher = new/obj/item/weapon/extinguisher(src) + has_extinguisher = new/obj/item/extinguisher(src) update_icon() /obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user) if(isrobot(user)) return - if(istype(O, /obj/item/weapon/extinguisher)) + if(istype(O, /obj/item/extinguisher)) if(!has_extinguisher && opened) user.remove_from_mob(O) contents += O @@ -78,9 +78,9 @@ /obj/structure/extinguisher_cabinet/update_icon() var/suffix = "empty" if(has_extinguisher) - if(istype(has_extinguisher, /obj/item/weapon/extinguisher/mini)) + if(istype(has_extinguisher, /obj/item/extinguisher/mini)) suffix = "mini" - if(istype(has_extinguisher, /obj/item/weapon/extinguisher/atmo)) + if(istype(has_extinguisher, /obj/item/extinguisher/atmo)) suffix = "advanced" else suffix = "standard" diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index 7234baf50e6..e8ac22d19b3 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -2,7 +2,7 @@ /obj/structure/fireaxecabinet name = "fire axe cabinet" desc = "There is small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if." - var/obj/item/weapon/material/twohanded/fireaxe/fireaxe + var/obj/item/material/twohanded/fireaxe/fireaxe icon = 'icons/obj/closet.dmi' //Not bothering to move icons out for now. But its dumb still. icon_state = "fireaxe1000" layer = ABOVE_WINDOW_LAYER @@ -17,7 +17,7 @@ /obj/structure/fireaxecabinet/Initialize() . = ..() if(starts_with_axe) - fireaxe = new /obj/item/weapon/material/twohanded/fireaxe() + fireaxe = new /obj/item/material/twohanded/fireaxe() update_icon() /obj/structure/fireaxecabinet/attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri @@ -33,7 +33,7 @@ // hasaxe = 1 if (isrobot(user) || locked) - if(istype(O, /obj/item/device/multitool)) + if(istype(O, /obj/item/multitool)) to_chat(user, "Resetting circuitry...") playsound(src, 'sound/machines/lockreset.ogg', 50, 1) if(do_after(user, 20 * O.toolspeed)) @@ -41,8 +41,8 @@ to_chat(user, " You disable the locking modules.") update_icon() return - else if(istype(O, /obj/item/weapon)) - var/obj/item/weapon/W = O + else if(istype(O, /obj/item)) + var/obj/item/W = O if(smashed || open) if(open) toggle_close_open() @@ -60,7 +60,7 @@ open= 1 update_icon() return - if (istype(O, /obj/item/weapon/material/twohanded/fireaxe) && open) + if (istype(O, /obj/item/material/twohanded/fireaxe) && open) if(!fireaxe) if(O:wielded) O:wielded = 0 @@ -78,7 +78,7 @@ else if(smashed) return - if(istype(O, /obj/item/device/multitool)) + if(istype(O, /obj/item/multitool)) if(open) open = 0 update_icon() diff --git a/code/game/objects/structures/fitness.dm b/code/game/objects/structures/fitness.dm index eb2f1e37bc6..e90a2b2e359 100644 --- a/code/game/objects/structures/fitness.dm +++ b/code/game/objects/structures/fitness.dm @@ -33,7 +33,7 @@ var/weight = 1 var/list/qualifiers = list("with ease", "without any trouble", "with great effort") -/obj/structure/fitness/weightlifter/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/fitness/weightlifter/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) playsound(src, 'sound/items/Deconstruct.ogg', 75, 1) weight = ((weight) % qualifiers.len) + 1 diff --git a/code/game/objects/structures/flora/flora.dm b/code/game/objects/structures/flora/flora.dm index d665ca5ab80..bcffd24dfca 100644 --- a/code/game/objects/structures/flora/flora.dm +++ b/code/game/objects/structures/flora/flora.dm @@ -13,7 +13,7 @@ var/min_x_scale = 0.9 var/min_y_scale = 0.9 - var/removal_tool = /obj/item/weapon/shovel + var/removal_tool = /obj/item/shovel var/harvest_tool = null // The type of item used to harvest the plant. var/harvest_count = 0 var/destroy_on_harvest = FALSE @@ -52,7 +52,7 @@ /obj/structure/flora/proc/get_harvestable_desc() return "\The [src] seems to have something hanging from it." -/obj/structure/flora/attackby(var/obj/item/weapon/W, var/mob/living/user) +/obj/structure/flora/attackby(var/obj/item/W, var/mob/living/user) if(can_harvest(W)) var/harvest_spawn = pickweight(harvest_loot) @@ -98,7 +98,7 @@ icon_state = "snowbush1" destroy_on_harvest = TRUE - harvest_tool = /obj/item/weapon/material/knife + harvest_tool = /obj/item/material/knife randomize_harvest_count = FALSE harvest_loot = list(/obj/item/stack/material/fiber = 1) max_harvests = 1 @@ -123,7 +123,7 @@ icon_state = "firstbush_1" destroy_on_harvest = TRUE - harvest_tool = /obj/item/weapon/material/knife + harvest_tool = /obj/item/material/knife randomize_harvest_count = TRUE harvest_loot = list(/obj/item/stack/material/fiber = 1) min_harvests = 1 @@ -467,8 +467,8 @@ desc = "Hey, this one seems like a fun guy." icon_state = "mush1" icon = 'icons/obj/flora/mushrooms.dmi' - harvest_loot = list(/obj/item/weapon/reagent_containers/food/snacks/mushroomslice = 1) - harvest_tool = /obj/item/weapon/material/knife + harvest_loot = list(/obj/item/reagent_containers/food/snacks/mushroomslice = 1) + harvest_tool = /obj/item/material/knife max_harvests = 2 min_harvests = 0 @@ -540,8 +540,8 @@ light_color = "#FF6633" light_on = TRUE catalogue_data = list(/datum/category_item/catalogue/flora/subterranean_bulbs) - harvest_loot = list(/obj/item/weapon/reagent_containers/food/snacks/grown/sif/cavebulbs = 1) - harvest_tool = /obj/item/weapon/material/knife + harvest_loot = list(/obj/item/reagent_containers/food/snacks/grown/sif/cavebulbs = 1) + harvest_tool = /obj/item/material/knife max_harvests = 2 min_harvests = 0 @@ -561,10 +561,10 @@ desc = "This is a mysterious-looking plant. They kind of look like eyeballs. Creepy." icon_state = "eyeplant" catalogue_data = list(/datum/category_item/catalogue/flora/eyebulbs) - harvest_tool = /obj/item/weapon/material/knife + harvest_tool = /obj/item/material/knife max_harvests = 2 min_harvests = 0 - harvest_loot = list(/obj/item/weapon/reagent_containers/food/snacks/grown/sif/eyebulbs = 1) + harvest_loot = list(/obj/item/reagent_containers/food/snacks/grown/sif/eyebulbs = 1) /obj/structure/flora/sif/eyes/Initialize() icon_state = "[initial(icon_state)][rand(1,3)]" @@ -584,13 +584,13 @@ randomize_size = TRUE catalogue_data = list(/datum/category_item/catalogue/flora/mosstendrils) - harvest_tool = /obj/item/weapon/material/knife + harvest_tool = /obj/item/material/knife max_harvests = 3 min_harvests = 0 harvest_loot = list( - /obj/item/weapon/reagent_containers/food/snacks/grown/sif/wabback = 15, - /obj/item/weapon/reagent_containers/food/snacks/grown/sif/blackwabback = 1, - /obj/item/weapon/reagent_containers/food/snacks/grown/sif/wildwabback = 30 + /obj/item/reagent_containers/food/snacks/grown/sif/wabback = 15, + /obj/item/reagent_containers/food/snacks/grown/sif/blackwabback = 1, + /obj/item/reagent_containers/food/snacks/grown/sif/wildwabback = 30 ) /obj/structure/flora/sif/tendrils/Initialize() @@ -616,11 +616,11 @@ randomize_size = TRUE catalogue_data = list(/datum/category_item/catalogue/flora/frostbelle) - harvest_tool = /obj/item/weapon/material/knife + harvest_tool = /obj/item/material/knife max_harvests = 2 min_harvests = 0 harvest_loot = list( - /obj/item/weapon/reagent_containers/food/snacks/frostbelle = 1 + /obj/item/reagent_containers/food/snacks/frostbelle = 1 ) var/variantnum = null diff --git a/code/game/objects/structures/flora/trees.dm b/code/game/objects/structures/flora/trees.dm index 4b4921a3e25..248961138cb 100644 --- a/code/game/objects/structures/flora/trees.dm +++ b/code/game/objects/structures/flora/trees.dm @@ -36,7 +36,7 @@ . = TRUE return . -/obj/structure/flora/tree/attackby(var/obj/item/weapon/W, var/mob/living/user) +/obj/structure/flora/tree/attackby(var/obj/item/W, var/mob/living/user) if(can_harvest(W)) ..(W, user) return @@ -45,7 +45,7 @@ return ..() if(is_stump) - if(istype(W,/obj/item/weapon/shovel)) + if(istype(W,/obj/item/shovel)) if(do_after(user, 5 SECONDS)) visible_message("\The [user] digs up \the [src] stump with \the [W].") qdel(src) @@ -163,7 +163,7 @@ icon_state = "pinepresents" desc = "A wondrous decorated Christmas tree. It has presents!" indestructable = TRUE - var/gift_type = /obj/item/weapon/a_gift + var/gift_type = /obj/item/a_gift var/list/ckeys_that_took = list() /obj/structure/flora/tree/pine/xmas/presents/choose_icon_state() @@ -269,12 +269,12 @@ catalogue_data = list(/datum/category_item/catalogue/flora/sif_tree) randomize_size = TRUE - harvest_tool = /obj/item/weapon/material/knife + harvest_tool = /obj/item/material/knife max_harvests = 2 min_harvests = 0 harvest_loot = list( - /obj/item/weapon/reagent_containers/food/snacks/siffruit = 20, - /obj/item/weapon/reagent_containers/food/snacks/grown/sif/sifpod = 5, + /obj/item/reagent_containers/food/snacks/siffruit = 20, + /obj/item/reagent_containers/food/snacks/grown/sif/sifpod = 5, /obj/item/seeds/sifbulb = 1 ) diff --git a/code/game/objects/structures/ghost_pods/human.dm b/code/game/objects/structures/ghost_pods/human.dm index 13ae71ef92c..96baab47cb8 100644 --- a/code/game/objects/structures/ghost_pods/human.dm +++ b/code/game/objects/structures/ghost_pods/human.dm @@ -35,7 +35,7 @@ clothing_possibilities |= subtypesof(/obj/item/clothing/under/color) clothing_possibilities |= subtypesof(/obj/item/clothing/head/soft) clothing_possibilities |= /obj/item/clothing/shoes/black - clothing_possibilities |= /obj/item/device/radio/headset + clothing_possibilities |= /obj/item/radio/headset /obj/structure/ghost_pod/ghost_activated/human/create_occupant(var/mob/M) ..() @@ -71,7 +71,7 @@ if(!head_options) head_options = list() head_options |= path - if(ispath(path, /obj/item/device/radio/headset)) + if(ispath(path, /obj/item/radio/headset)) if(!headset_options) headset_options = list() headset_options |= path @@ -97,7 +97,7 @@ H.equip_to_appropriate_slot(C) if(spawn_with_emag) - var/obj/item/weapon/card/emag/E = new(H) + var/obj/item/card/emag/E = new(H) E.name = "broken card" E.description_antag = "This is a 'disguised' emag, to make your escape from wherever you happen to be trapped." H.equip_to_appropriate_slot(E) @@ -163,7 +163,7 @@ clothing_possibilities |= subtypesof(/obj/item/clothing/under/utility) clothing_possibilities |= subtypesof(/obj/item/clothing/head/beret) clothing_possibilities |= /obj/item/clothing/shoes/black - clothing_possibilities |= /obj/item/device/radio/headset + clothing_possibilities |= /obj/item/radio/headset /obj/structure/ghost_pod/manual/human/create_occupant(var/mob/M) ..() @@ -199,7 +199,7 @@ if(!head_options) head_options = list() head_options |= path - if(ispath(path, /obj/item/device/radio/headset)) + if(ispath(path, /obj/item/radio/headset)) if(!headset_options) headset_options = list() headset_options |= path diff --git a/code/game/objects/structures/ghost_pods/mysterious.dm b/code/game/objects/structures/ghost_pods/mysterious.dm index cd34d91e6fa..58206a0c6b0 100644 --- a/code/game/objects/structures/ghost_pods/mysterious.dm +++ b/code/game/objects/structures/ghost_pods/mysterious.dm @@ -39,7 +39,7 @@ /obj/structure/ghost_pod/manual/cursedblade/create_occupant(var/mob/M) density = FALSE - var/obj/item/weapon/melee/cursedblade/R = new(get_turf(src)) + var/obj/item/melee/cursedblade/R = new(get_turf(src)) to_chat(M, "You are a Cursed Sword, discovered by a hapless explorer. \ You were once an explorer yourself, when one day you discovered a strange sword made from a red crystal. As soon as you touched it,\ your body was reduced to ashes and your soul was cursed to remain trapped in the blade forever. \ diff --git a/code/game/objects/structures/ghost_pods/survivor.dm b/code/game/objects/structures/ghost_pods/survivor.dm index e3ebc5bbfe5..f31b89ca8a1 100644 --- a/code/game/objects/structures/ghost_pods/survivor.dm +++ b/code/game/objects/structures/ghost_pods/survivor.dm @@ -56,7 +56,7 @@ clothing_possibilities |= subtypesof(/obj/item/clothing/under/utility) clothing_possibilities |= subtypesof(/obj/item/clothing/head/beret) clothing_possibilities |= /obj/item/clothing/shoes/black - clothing_possibilities |= /obj/item/device/radio/headset + clothing_possibilities |= /obj/item/radio/headset /obj/structure/ghost_pod/manual/survivor/create_occupant(var/mob/M) ..() @@ -88,7 +88,7 @@ if(!head_options) head_options = list() head_options |= path - if(ispath(path, /obj/item/device/radio/headset)) + if(ispath(path, /obj/item/radio/headset)) if(!headset_options) headset_options = list() headset_options |= path diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index b31b9580738..03562df4a74 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -161,14 +161,14 @@ to_chat(user, "You secured the girder!") reset_girder() - else if(istype(W, /obj/item/weapon/pickaxe/plasmacutter)) + else if(istype(W, /obj/item/pickaxe/plasmacutter)) to_chat(user, "Now slicing apart the girder...") if(do_after(user,30 * W.toolspeed)) if(!src) return to_chat(user, "You slice apart the girder!") dismantle() - else if(istype(W, /obj/item/weapon/pickaxe/diamonddrill)) + else if(istype(W, /obj/item/pickaxe/diamonddrill)) to_chat(user, "You drill through the girder!") dismantle() @@ -346,13 +346,13 @@ to_chat(user, "You dissasembled the girder!") dismantle() - else if(istype(W, /obj/item/weapon/pickaxe/plasmacutter)) + else if(istype(W, /obj/item/pickaxe/plasmacutter)) to_chat(user, "Now slicing apart the girder...") if(do_after(user,30 * W.toolspeed)) to_chat(user, "You slice apart the girder!") dismantle() - else if(istype(W, /obj/item/weapon/pickaxe/diamonddrill)) + else if(istype(W, /obj/item/pickaxe/diamonddrill)) to_chat(user, "You drill through the girder!") new /obj/effect/decal/remains/human(get_turf(src)) dismantle() @@ -365,7 +365,7 @@ cover = 60 girder_material = "resin" -/obj/structure/girder/rcd_values(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/obj/structure/girder/rcd_values(mob/living/user, obj/item/rcd/the_rcd, passed_mode) var/turf/simulated/T = get_turf(src) if(!istype(T) || T.density) return FALSE @@ -390,7 +390,7 @@ ) return FALSE -/obj/structure/girder/rcd_act(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/obj/structure/girder/rcd_act(mob/living/user, obj/item/rcd/the_rcd, passed_mode) var/turf/simulated/T = get_turf(src) if(!istype(T) || T.density) // Should stop future bugs of people bringing girders to centcom and RCDing them, or somehow putting a girder on a durasteel wall and deconning it. return FALSE diff --git a/code/game/objects/structures/gravemarker.dm b/code/game/objects/structures/gravemarker.dm index 67bd834b88e..cecf607de10 100644 --- a/code/game/objects/structures/gravemarker.dm +++ b/code/game/objects/structures/gravemarker.dm @@ -50,7 +50,7 @@ return !density return TRUE -/obj/structure/gravemarker/attackby(obj/item/weapon/W, mob/user as mob) +/obj/structure/gravemarker/attackby(obj/item/W, mob/user as mob) if(W.has_tool_quality(TOOL_SCREWDRIVER)) var/carving_1 = sanitizeSafe(tgui_input_text(user, "Who is \the [src.name] for?", "Gravestone Naming", null, MAX_NAME_LEN), MAX_NAME_LEN) if(carving_1) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index d3226bb702e..34d80ee4ca6 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -92,7 +92,7 @@ /obj/structure/grille/attackby(obj/item/W as obj, mob/user as mob) if(!istype(W)) return - if(istype(W, /obj/item/weapon/rcd)) // To stop us from hitting the grille when building windows, because grilles don't let parent handle it properly. + if(istype(W, /obj/item/rcd)) // To stop us from hitting the grille when building windows, because grilles don't let parent handle it properly. return FALSE else if(W.has_tool_quality(TOOL_WIRECUTTER)) if(!shock(user, 100)) @@ -249,7 +249,7 @@ icon_state = "grillerustic-b" -/obj/structure/grille/rcd_values(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/obj/structure/grille/rcd_values(mob/living/user, obj/item/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_WINDOWGRILLE) // A full tile window costs 4 glass sheets. @@ -267,7 +267,7 @@ ) return FALSE -/obj/structure/grille/rcd_act(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/obj/structure/grille/rcd_act(mob/living/user, obj/item/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_DECONSTRUCT) to_chat(user, span("notice", "You deconstruct \the [src].")) diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index 92dc20cec6d..e7676d0403b 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -72,7 +72,7 @@ add_fingerprint(user) return -/obj/structure/inflatable/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/inflatable/attackby(obj/item/W as obj, mob/user as mob) if(!istype(W)) return if (can_puncture(W)) @@ -261,7 +261,7 @@ to_chat(user, "The inflatable door is too torn to be inflated!") add_fingerprint(user) -/obj/item/weapon/storage/briefcase/inflatable +/obj/item/storage/briefcase/inflatable name = "inflatable barrier box" desc = "Contains inflatable walls and doors." icon_state = "inf_box" diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index b16fb816b50..0f7dad89e2a 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -12,10 +12,10 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) climbable = TRUE //copypaste sorry var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite - var/obj/item/weapon/storage/bag/trash/mybag = null - var/obj/item/weapon/mop/mymop = null - var/obj/item/weapon/reagent_containers/spray/myspray = null - var/obj/item/device/lightreplacer/myreplacer = null + var/obj/item/storage/bag/trash/mybag = null + var/obj/item/mop/mymop = null + var/obj/item/reagent_containers/spray/myspray = null + var/obj/item/lightreplacer/myreplacer = null var/obj/structure/mopbucket/mybucket = null var/has_items = FALSE var/dismantled = TRUE @@ -27,11 +27,11 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) /obj/structure/janitorialcart/proc/equip_janicart_item(mob/user, obj/item/I) if(!equippable_item_whitelist) equippable_item_whitelist = typecacheof(list( - /obj/item/weapon/storage/bag/trash, - /obj/item/weapon/mop, - /obj/item/weapon/mop/advanced, - /obj/item/weapon/reagent_containers/spray, - /obj/item/device/lightreplacer, + /obj/item/storage/bag/trash, + /obj/item/mop, + /obj/item/mop/advanced, + /obj/item/reagent_containers/spray, + /obj/item/lightreplacer, /obj/item/clothing/suit/caution, )) @@ -43,28 +43,28 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) to_chat(user, "[I] is stuck to your hand.") return FALSE - if(istype(I, /obj/item/weapon/storage/bag/trash)) + if(istype(I, /obj/item/storage/bag/trash)) if(mybag) to_chat(user, "[src] already has \an [I].") return FALSE mybag = I setTguiIcon("mybag", mybag) - else if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/mop/advanced)) + else if(istype(I, /obj/item/mop) || istype(I, /obj/item/mop/advanced)) if(mymop) to_chat(user, "[src] already has \an [I].") return FALSE mymop = I setTguiIcon("mymop", mymop) - else if(istype(I, /obj/item/weapon/reagent_containers/spray)) + else if(istype(I, /obj/item/reagent_containers/spray)) if(myspray) to_chat(user, "[src] already has \an [I].") return FALSE myspray = I setTguiIcon("myspray", myspray) - else if(istype(I, /obj/item/device/lightreplacer)) + else if(istype(I, /obj/item/lightreplacer)) if(myreplacer) to_chat(user, "[src] already has \an [I].") return FALSE @@ -135,7 +135,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) ..() /obj/structure/janitorialcart/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/reagent_containers/glass/rag) || istype(I, /obj/item/weapon/soap)) + if(istype(I, /obj/item/mop) || istype(I, /obj/item/reagent_containers/glass/rag) || istype(I, /obj/item/soap)) if (mybucket) if(I.reagents.total_volume < I.reagents.maximum_volume) if(mybucket.reagents.total_volume < 1) @@ -150,20 +150,20 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) to_chat(user, "There is no bucket mounted here to dip [I] into!") return 1 - else if (istype(I, /obj/item/weapon/reagent_containers/glass/bucket) && mybucket) + else if (istype(I, /obj/item/reagent_containers/glass/bucket) && mybucket) I.afterattack(mybucket, usr, 1) update_icon() return 1 - else if(istype(I, /obj/item/weapon/reagent_containers/spray) && !myspray) + else if(istype(I, /obj/item/reagent_containers/spray) && !myspray) equip_janicart_item(user, I) return 1 - else if(istype(I, /obj/item/device/lightreplacer) && !myreplacer) + else if(istype(I, /obj/item/lightreplacer) && !myreplacer) equip_janicart_item(user, I) return 1 - else if(istype(I, /obj/item/weapon/storage/bag/trash) && !mybag) + else if(istype(I, /obj/item/storage/bag/trash) && !mybag) equip_janicart_item(user, I) return 1 @@ -190,10 +190,10 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) /obj/structure/janitorialcart/AltClick(mob/living/user) if(user.incapacitated() || !Adjacent(user)) return var/obj/I = usr.get_active_hand() - if(istype(I, /obj/item/weapon/mop)) + if(istype(I, /obj/item/mop)) equip_janicart_item(user, I) - else if(istype(I, /obj/item/weapon/reagent_containers) && mybucket) - var/obj/item/weapon/reagent_containers/C = I + else if(istype(I, /obj/item/reagent_containers) && mybucket) + var/obj/item/reagent_containers/C = I C.afterattack(mybucket, usr, 1) update_icon() @@ -381,7 +381,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) flags = OPENCONTAINER //copypaste sorry var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite - var/obj/item/weapon/storage/bag/trash/mybag = null + var/obj/item/storage/bag/trash/mybag = null var/callme = "pimpin' ride" //how do people refer to it? @@ -399,7 +399,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) /obj/structure/bed/chair/janicart/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/weapon/mop)) + if(istype(I, /obj/item/mop)) if(reagents.total_volume > 1) reagents.trans_to_obj(I, 2) to_chat(user, "You wet [I] in the [callme].") @@ -408,7 +408,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) to_chat(user, "This [callme] is out of water!") else if(istype(I, /obj/item/key)) to_chat(user, "Hold [I] in one of your hands while you drive this [callme].") - else if(istype(I, /obj/item/weapon/storage/bag/trash)) + else if(istype(I, /obj/item/storage/bag/trash)) to_chat(user, "You hook the trashbag onto the [callme].") user.drop_item() I.loc = src diff --git a/code/game/objects/structures/kitchen_foodcart_vr.dm b/code/game/objects/structures/kitchen_foodcart_vr.dm index aa1ea26cf49..d80b3456cfe 100644 --- a/code/game/objects/structures/kitchen_foodcart_vr.dm +++ b/code/game/objects/structures/kitchen_foodcart_vr.dm @@ -10,12 +10,12 @@ /obj/structure/foodcart/Initialize() . = ..() for(var/obj/item/I in loc) - if(istype(I, /obj/item/weapon/reagent_containers/food)) + if(istype(I, /obj/item/reagent_containers/food)) I.loc = src update_icon() /obj/structure/foodcart/attackby(obj/item/O as obj, mob/user as mob) - if(istype(O, /obj/item/weapon/reagent_containers/food)) + if(istype(O, /obj/item/reagent_containers/food)) user.drop_item() O.loc = src update_icon() @@ -24,7 +24,7 @@ /obj/structure/foodcart/attack_hand(var/mob/user as mob) if(contents.len) - var/obj/item/weapon/reagent_containers/food/choice = tgui_input_list(usr, "What would you like to grab from the cart?", "Grab Choice", contents) + var/obj/item/reagent_containers/food/choice = tgui_input_list(usr, "What would you like to grab from the cart?", "Grab Choice", contents) if(choice) if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) return diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 777530a276d..4f8fbc92095 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -12,8 +12,8 @@ var/meat_type var/victim_name = "corpse" -/obj/structure/kitchenspike/attackby(obj/item/weapon/grab/G as obj, mob/user as mob) - if(!istype(G, /obj/item/weapon/grab) || !ismob(G.affecting)) +/obj/structure/kitchenspike/attackby(obj/item/grab/G as obj, mob/user as mob) + if(!istype(G, /obj/item/grab) || !ismob(G.affecting)) return if(occupied) to_chat(user, "The spike already has something on it, finish collecting its meat first!") @@ -40,7 +40,7 @@ else return 0 else if(istype(victim, /mob/living/carbon/alien)) - meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat + meat_type = /obj/item/reagent_containers/food/snacks/xenomeat icon_state = "spikebloodygreen" else return 0 diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 0ad35d794bd..a2865afd661 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -60,7 +60,7 @@ T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead return if(C.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = C.get_welder() + var/obj/item/weldingtool/WT = C.get_welder() if(WT.welding == 1) if(WT.remove_fuel(0, user)) to_chat(user, "Slicing lattice joints ...") diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm index 0a72a81b39e..e0efdfe1ae0 100644 --- a/code/game/objects/structures/loot_piles.dm +++ b/code/game/objects/structures/loot_piles.dm @@ -140,28 +140,28 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh icon_states_to_use = list("junk_pile1", "junk_pile2", "junk_pile3", "junk_pile4", "junk_pile5") common_loot = list( - /obj/item/device/flashlight/flare, - /obj/item/device/flashlight/glowstick, - /obj/item/device/flashlight/glowstick/blue, - /obj/item/device/flashlight/glowstick/orange, - /obj/item/device/flashlight/glowstick/red, - /obj/item/device/flashlight/glowstick/yellow, - /obj/item/device/flashlight/pen, - /obj/item/weapon/cell, - /obj/item/weapon/cell/device, + /obj/item/flashlight/flare, + /obj/item/flashlight/glowstick, + /obj/item/flashlight/glowstick/blue, + /obj/item/flashlight/glowstick/orange, + /obj/item/flashlight/glowstick/red, + /obj/item/flashlight/glowstick/yellow, + /obj/item/flashlight/pen, + /obj/item/cell, + /obj/item/cell/device, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas/half, /obj/item/clothing/mask/breath, - /obj/item/weapon/reagent_containers/glass/rag, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood, - /obj/item/weapon/storage/secure/briefcase, - /obj/item/weapon/storage/briefcase, - /obj/item/weapon/storage/backpack, - /obj/item/weapon/storage/backpack/satchel/norm, - /obj/item/weapon/storage/backpack/satchel, - /obj/item/weapon/storage/backpack/dufflebag, - /obj/item/weapon/storage/box, - /obj/item/weapon/storage/wallet, + /obj/item/reagent_containers/glass/rag, + /obj/item/reagent_containers/food/snacks/liquidfood, + /obj/item/storage/secure/briefcase, + /obj/item/storage/briefcase, + /obj/item/storage/backpack, + /obj/item/storage/backpack/satchel/norm, + /obj/item/storage/backpack/satchel, + /obj/item/storage/backpack/dufflebag, + /obj/item/storage/box, + /obj/item/storage/wallet, /obj/item/clothing/shoes/galoshes, /obj/item/clothing/shoes/black, /obj/item/clothing/shoes/laceup, @@ -197,29 +197,29 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/clothing/under/pants/camo, /obj/item/clothing/under/harness, /obj/item/clothing/accessory/storage/webbing, - /obj/item/weapon/spacecash/c1, - /obj/item/weapon/spacecash/c5, - /obj/item/weapon/spacecash/c10, - /obj/item/weapon/spacecash/c20, - /obj/item/weapon/camera_assembly, + /obj/item/spacecash/c1, + /obj/item/spacecash/c5, + /obj/item/spacecash/c10, + /obj/item/spacecash/c20, + /obj/item/camera_assembly, /obj/item/clothing/suit/caution, /obj/item/clothing/head/cone, - /obj/item/weapon/card/emag_broken, - /obj/item/device/camera, - /obj/item/device/pda, - /obj/item/device/radio/headset, - /obj/item/device/paicard, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose + /obj/item/card/emag_broken, + /obj/item/camera, + /obj/item/pda, + /obj/item/radio/headset, + /obj/item/paicard, + /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose ) uncommon_loot = list( /obj/item/clothing/shoes/syndigaloshes, /obj/item/clothing/gloves/yellow, /obj/item/clothing/under/tactical, - /obj/item/weapon/beartrap, + /obj/item/beartrap, /obj/item/clothing/suit/storage/vest/press, - /obj/item/weapon/material/knife/tacknife, - /obj/item/weapon/material/butterfly/switchblade + /obj/item/material/knife/tacknife, + /obj/item/material/butterfly/switchblade ) rare_loot = list( @@ -255,9 +255,9 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/trash/tray, /obj/item/trash/unajerky, /obj/item/trash/waffles, - /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat, - /obj/item/weapon/reagent_containers/food/snacks/mysterysoup, - /obj/item/weapon/reagent_containers/food/snacks/old/hotdog, + /obj/item/reagent_containers/food/snacks/xenomeat/spidermeat, + /obj/item/reagent_containers/food/snacks/mysterysoup, + /obj/item/reagent_containers/food/snacks/old/hotdog, /obj/item/pizzabox/old, /obj/item/ammo_casing/spent, /obj/item/stack/rods{amount = 5}, @@ -265,16 +265,16 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/stack/material/cardboard{amount = 5}, /obj/item/poster, /obj/item/poster/custom, - /obj/item/weapon/newspaper, - /obj/item/weapon/paper/crumpled, - /obj/item/weapon/paper/crumpled/bloody + /obj/item/newspaper, + /obj/item/paper/crumpled, + /obj/item/paper/crumpled/bloody ) uncommon_loot = list( - /obj/item/weapon/reagent_containers/syringe/steroid, - /obj/item/weapon/storage/pill_bottle/zoom, - /obj/item/weapon/storage/pill_bottle/happy, - /obj/item/weapon/storage/pill_bottle/paracetamol //VOREStation Edit + /obj/item/reagent_containers/syringe/steroid, + /obj/item/storage/pill_bottle/zoom, + /obj/item/storage/pill_bottle/happy, + /obj/item/storage/pill_bottle/paracetamol //VOREStation Edit ) // Contains loads of different types of boxes, which may have items inside! @@ -285,44 +285,44 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh icon_states_to_use = list("boxfort") common_loot = list( - /obj/item/weapon/storage/box, - /obj/item/weapon/storage/box/beakers, - /obj/item/weapon/storage/box/botanydisk, - /obj/item/weapon/storage/box/cups, - /obj/item/weapon/storage/box/disks, - /obj/item/weapon/storage/box/donkpockets, - /obj/item/weapon/storage/box/donut, - /obj/item/weapon/storage/box/donut/empty, - /obj/item/weapon/storage/box/evidence, - /obj/item/weapon/storage/box/lights/mixed, - /obj/item/weapon/storage/box/lights/tubes, - /obj/item/weapon/storage/box/lights/bulbs, - /obj/item/weapon/storage/box/injectors, - /obj/item/weapon/storage/box/masks, - /obj/item/weapon/storage/box/ids, - /obj/item/weapon/storage/box/mousetraps, - /obj/item/weapon/storage/box/syringes, - /obj/item/weapon/storage/box/survival, - /obj/item/weapon/storage/box/gloves, - /obj/item/weapon/storage/box/PDAs + /obj/item/storage/box, + /obj/item/storage/box/beakers, + /obj/item/storage/box/botanydisk, + /obj/item/storage/box/cups, + /obj/item/storage/box/disks, + /obj/item/storage/box/donkpockets, + /obj/item/storage/box/donut, + /obj/item/storage/box/donut/empty, + /obj/item/storage/box/evidence, + /obj/item/storage/box/lights/mixed, + /obj/item/storage/box/lights/tubes, + /obj/item/storage/box/lights/bulbs, + /obj/item/storage/box/injectors, + /obj/item/storage/box/masks, + /obj/item/storage/box/ids, + /obj/item/storage/box/mousetraps, + /obj/item/storage/box/syringes, + /obj/item/storage/box/survival, + /obj/item/storage/box/gloves, + /obj/item/storage/box/PDAs ) uncommon_loot = list( - /obj/item/weapon/storage/box/sinpockets, + /obj/item/storage/box/sinpockets, /obj/item/ammo_magazine/ammo_box/b12g/practice, /obj/item/ammo_magazine/ammo_box/b12g/blank, - /obj/item/weapon/storage/box/smokes, - /obj/item/weapon/storage/box/metalfoam, - /obj/item/weapon/storage/box/handcuffs, - /obj/item/weapon/storage/box/seccarts + /obj/item/storage/box/smokes, + /obj/item/storage/box/metalfoam, + /obj/item/storage/box/handcuffs, + /obj/item/storage/box/seccarts ) rare_loot = list( - /obj/item/weapon/storage/box/flashbangs, - /obj/item/weapon/storage/box/empslite, + /obj/item/storage/box/flashbangs, + /obj/item/storage/box/empslite, /obj/item/ammo_magazine/ammo_box/b12g/flash, /obj/item/ammo_magazine/ammo_box/b12g/stunshell, - /obj/item/weapon/storage/box/teargas + /obj/item/storage/box/teargas ) // One of the more useful maint piles, contains electrical components. @@ -333,60 +333,60 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh icon_states_to_use = list("technical_pile1", "technical_pile2", "technical_pile3") common_loot = list( - /obj/item/weapon/stock_parts/gear, - /obj/item/weapon/stock_parts/console_screen, - /obj/item/weapon/stock_parts/spring, - /obj/item/weapon/stock_parts/capacitor, - /obj/item/weapon/stock_parts/capacitor/adv, - /obj/item/weapon/stock_parts/capacitor/super, - /obj/item/weapon/stock_parts/manipulator, - /obj/item/weapon/stock_parts/manipulator/nano, - /obj/item/weapon/stock_parts/manipulator/pico, - /obj/item/weapon/stock_parts/matter_bin, - /obj/item/weapon/stock_parts/matter_bin/adv, - /obj/item/weapon/stock_parts/matter_bin/super, - /obj/item/weapon/stock_parts/scanning_module, - /obj/item/weapon/stock_parts/scanning_module/adv, - /obj/item/weapon/stock_parts/scanning_module/phasic, - /obj/item/weapon/stock_parts/subspace/amplifier, - /obj/item/weapon/stock_parts/subspace/analyzer, - /obj/item/weapon/stock_parts/subspace/ansible, - /obj/item/weapon/stock_parts/subspace/crystal, - /obj/item/weapon/stock_parts/subspace/sub_filter, - /obj/item/weapon/stock_parts/subspace/transmitter, - /obj/item/weapon/stock_parts/subspace/treatment, + /obj/item/stock_parts/gear, + /obj/item/stock_parts/console_screen, + /obj/item/stock_parts/spring, + /obj/item/stock_parts/capacitor, + /obj/item/stock_parts/capacitor/adv, + /obj/item/stock_parts/capacitor/super, + /obj/item/stock_parts/manipulator, + /obj/item/stock_parts/manipulator/nano, + /obj/item/stock_parts/manipulator/pico, + /obj/item/stock_parts/matter_bin, + /obj/item/stock_parts/matter_bin/adv, + /obj/item/stock_parts/matter_bin/super, + /obj/item/stock_parts/scanning_module, + /obj/item/stock_parts/scanning_module/adv, + /obj/item/stock_parts/scanning_module/phasic, + /obj/item/stock_parts/subspace/amplifier, + /obj/item/stock_parts/subspace/analyzer, + /obj/item/stock_parts/subspace/ansible, + /obj/item/stock_parts/subspace/crystal, + /obj/item/stock_parts/subspace/sub_filter, + /obj/item/stock_parts/subspace/transmitter, + /obj/item/stock_parts/subspace/treatment, /obj/item/frame, /obj/item/broken_device/random, /obj/item/borg/upgrade/utility/restart, - /obj/item/weapon/cell, - /obj/item/weapon/cell/high, - /obj/item/weapon/cell/device, - /obj/item/weapon/circuitboard/broken, - /obj/item/weapon/circuitboard/arcade, - /obj/item/weapon/circuitboard/autolathe, - /obj/item/weapon/circuitboard/atmos_alert, - /obj/item/weapon/circuitboard/airalarm, - /obj/item/weapon/circuitboard/fax, - /obj/item/weapon/circuitboard/jukebox, - /obj/item/weapon/circuitboard/batteryrack, - /obj/item/weapon/circuitboard/message_monitor, - /obj/item/weapon/circuitboard/rcon_console, - /obj/item/weapon/smes_coil, - /obj/item/weapon/cartridge/engineering, - /obj/item/device/analyzer, - /obj/item/device/healthanalyzer, - /obj/item/device/robotanalyzer, - /obj/item/device/lightreplacer, - /obj/item/device/radio, - /obj/item/device/hailer, - /obj/item/device/gps, - /obj/item/device/geiger, - /obj/item/device/mass_spectrometer, - /obj/item/weapon/tool/wrench, - /obj/item/weapon/tool/screwdriver, - /obj/item/weapon/tool/wirecutters, - /obj/item/weapon/mining_scanner/advanced, - /obj/item/device/multitool, + /obj/item/cell, + /obj/item/cell/high, + /obj/item/cell/device, + /obj/item/circuitboard/broken, + /obj/item/circuitboard/arcade, + /obj/item/circuitboard/autolathe, + /obj/item/circuitboard/atmos_alert, + /obj/item/circuitboard/airalarm, + /obj/item/circuitboard/fax, + /obj/item/circuitboard/jukebox, + /obj/item/circuitboard/batteryrack, + /obj/item/circuitboard/message_monitor, + /obj/item/circuitboard/rcon_console, + /obj/item/smes_coil, + /obj/item/cartridge/engineering, + /obj/item/analyzer, + /obj/item/healthanalyzer, + /obj/item/robotanalyzer, + /obj/item/lightreplacer, + /obj/item/radio, + /obj/item/hailer, + /obj/item/gps, + /obj/item/geiger, + /obj/item/mass_spectrometer, + /obj/item/tool/wrench, + /obj/item/tool/screwdriver, + /obj/item/tool/wirecutters, + /obj/item/mining_scanner/advanced, + /obj/item/multitool, /obj/item/mecha_parts/mecha_equipment/generator, /obj/item/mecha_parts/mecha_equipment/tool/cable_layer, /obj/item/mecha_parts/mecha_equipment/tool/drill, @@ -403,18 +403,18 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh ) uncommon_loot = list( - /obj/item/weapon/cell/super, - /obj/item/weapon/cell/device/weapon, - /obj/item/weapon/circuitboard/security, - /obj/item/weapon/circuitboard/crew, - /obj/item/weapon/aiModule/reset, - /obj/item/weapon/smes_coil/super_capacity, - /obj/item/weapon/smes_coil/super_io, - /obj/item/weapon/cartridge/captain, - /obj/item/weapon/disk/integrated_circuit/upgrade/advanced, - /obj/item/device/tvcamera, - /obj/item/device/universal_translator, - /obj/item/device/aicard, + /obj/item/cell/super, + /obj/item/cell/device/weapon, + /obj/item/circuitboard/security, + /obj/item/circuitboard/crew, + /obj/item/aiModule/reset, + /obj/item/smes_coil/super_capacity, + /obj/item/smes_coil/super_io, + /obj/item/cartridge/captain, + /obj/item/disk/integrated_circuit/upgrade/advanced, + /obj/item/tvcamera, + /obj/item/universal_translator, + /obj/item/aicard, /obj/item/borg/upgrade/advanced/jetpack, /obj/item/borg/upgrade/advanced/advhealth, /obj/item/borg/upgrade/basic/vtec, @@ -434,12 +434,12 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh ) rare_loot = list( - /obj/item/weapon/cell/hyper, - /obj/item/weapon/aiModule/freeform, - /obj/item/weapon/aiModule/asimov, - /obj/item/weapon/aiModule/paladin, - /obj/item/weapon/aiModule/safeguard, - /obj/item/weapon/disposable_teleporter, + /obj/item/cell/hyper, + /obj/item/aiModule/freeform, + /obj/item/aiModule/asimov, + /obj/item/aiModule/paladin, + /obj/item/aiModule/safeguard, + /obj/item/disposable_teleporter, /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay ) @@ -466,44 +466,44 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh // May contain alien tools. /obj/structure/loot_pile/surface/alien/engineering uncommon_loot = list( - /obj/item/device/multitool/alien, + /obj/item/multitool/alien, /obj/item/stack/cable_coil/alien, - /obj/item/weapon/tool/crowbar/alien, - /obj/item/weapon/tool/screwdriver/alien, - /obj/item/weapon/weldingtool/alien, - /obj/item/weapon/tool/wirecutters/alien, - /obj/item/weapon/tool/wrench/alien + /obj/item/tool/crowbar/alien, + /obj/item/tool/screwdriver/alien, + /obj/item/weldingtool/alien, + /obj/item/tool/wirecutters/alien, + /obj/item/tool/wrench/alien ) rare_loot = list( - /obj/item/weapon/storage/belt/utility/alien/full + /obj/item/storage/belt/utility/alien/full ) // May contain alien surgery equipment or powerful medication. /obj/structure/loot_pile/surface/alien/medical uncommon_loot = list( - /obj/item/weapon/surgical/FixOVein/alien, - /obj/item/weapon/surgical/bone_clamp/alien, - /obj/item/weapon/surgical/cautery/alien, - /obj/item/weapon/surgical/circular_saw/alien, - /obj/item/weapon/surgical/hemostat/alien, - /obj/item/weapon/surgical/retractor/alien, - /obj/item/weapon/surgical/scalpel/alien, - /obj/item/weapon/surgical/surgicaldrill/alien + /obj/item/surgical/FixOVein/alien, + /obj/item/surgical/bone_clamp/alien, + /obj/item/surgical/cautery/alien, + /obj/item/surgical/circular_saw/alien, + /obj/item/surgical/hemostat/alien, + /obj/item/surgical/retractor/alien, + /obj/item/surgical/scalpel/alien, + /obj/item/surgical/surgicaldrill/alien ) rare_loot = list( - /obj/item/weapon/storage/belt/medical/alien + /obj/item/storage/belt/medical/alien ) // May contain powercells or alien weaponry. /obj/structure/loot_pile/surface/alien/security uncommon_loot = list( - /obj/item/weapon/cell/device/weapon/recharge/alien, + /obj/item/cell/device/weapon/recharge/alien, /obj/item/clothing/suit/armor/alien, /obj/item/clothing/head/helmet/alien ) rare_loot = list( /obj/item/clothing/suit/armor/alien/tank, - /obj/item/weapon/gun/energy/alien + /obj/item/gun/energy/alien ) // The pile found at the very end, and as such has the best loot. @@ -512,29 +512,29 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh chance_rare = 10 common_loot = list( - /obj/item/device/multitool/alien, + /obj/item/multitool/alien, /obj/item/stack/cable_coil/alien, - /obj/item/weapon/tool/crowbar/alien, - /obj/item/weapon/tool/screwdriver/alien, - /obj/item/weapon/weldingtool/alien, - /obj/item/weapon/tool/wirecutters/alien, - /obj/item/weapon/tool/wrench/alien, - /obj/item/weapon/surgical/FixOVein/alien, - /obj/item/weapon/surgical/bone_clamp/alien, - /obj/item/weapon/surgical/cautery/alien, - /obj/item/weapon/surgical/circular_saw/alien, - /obj/item/weapon/surgical/hemostat/alien, - /obj/item/weapon/surgical/retractor/alien, - /obj/item/weapon/surgical/scalpel/alien, - /obj/item/weapon/surgical/surgicaldrill/alien, - /obj/item/weapon/cell/device/weapon/recharge/alien, + /obj/item/tool/crowbar/alien, + /obj/item/tool/screwdriver/alien, + /obj/item/weldingtool/alien, + /obj/item/tool/wirecutters/alien, + /obj/item/tool/wrench/alien, + /obj/item/surgical/FixOVein/alien, + /obj/item/surgical/bone_clamp/alien, + /obj/item/surgical/cautery/alien, + /obj/item/surgical/circular_saw/alien, + /obj/item/surgical/hemostat/alien, + /obj/item/surgical/retractor/alien, + /obj/item/surgical/scalpel/alien, + /obj/item/surgical/surgicaldrill/alien, + /obj/item/cell/device/weapon/recharge/alien, /obj/item/clothing/suit/armor/alien, /obj/item/clothing/head/helmet/alien, - /obj/item/weapon/gun/energy/alien + /obj/item/gun/energy/alien ) uncommon_loot = list( - /obj/item/weapon/storage/belt/medical/alien, - /obj/item/weapon/storage/belt/utility/alien/full, + /obj/item/storage/belt/medical/alien, + /obj/item/storage/belt/utility/alien/full, /obj/item/clothing/suit/armor/alien/tank, /obj/item/clothing/head/helmet/alien/tank, ) @@ -547,26 +547,26 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh delete_on_depletion = TRUE common_loot = list( - /obj/item/weapon/bone, - /obj/item/weapon/bone/skull, - /obj/item/weapon/bone/skull/tajaran, - /obj/item/weapon/bone/skull/unathi, - /obj/item/weapon/bone/skull/unknown, - /obj/item/weapon/bone/leg, - /obj/item/weapon/bone/arm, - /obj/item/weapon/bone/ribs, + /obj/item/bone, + /obj/item/bone/skull, + /obj/item/bone/skull/tajaran, + /obj/item/bone/skull/unathi, + /obj/item/bone/skull/unknown, + /obj/item/bone/leg, + /obj/item/bone/arm, + /obj/item/bone/ribs, ) uncommon_loot = list( - /obj/item/weapon/coin/gold, - /obj/item/weapon/coin/silver, - /obj/item/weapon/deck/tarot, - /obj/item/weapon/flame/lighter/zippo/gold, - /obj/item/weapon/flame/lighter/zippo/black, - /obj/item/weapon/material/knife/tacknife/survival, - /obj/item/weapon/material/knife/tacknife/combatknife, - /obj/item/weapon/material/knife/machete/hatchet, - /obj/item/weapon/material/knife/butch, - /obj/item/weapon/storage/wallet/random, + /obj/item/coin/gold, + /obj/item/coin/silver, + /obj/item/deck/tarot, + /obj/item/flame/lighter/zippo/gold, + /obj/item/flame/lighter/zippo/black, + /obj/item/material/knife/tacknife/survival, + /obj/item/material/knife/tacknife/combatknife, + /obj/item/material/knife/machete/hatchet, + /obj/item/material/knife/butch, + /obj/item/storage/wallet/random, /obj/item/clothing/accessory/bracelet/material/gold, /obj/item/clothing/accessory/bracelet/material/silver, /obj/item/clothing/accessory/locket, @@ -579,10 +579,10 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/clothing/under/sl_suit ) rare_loot = list( - /obj/item/weapon/storage/belt/utility/alien/full, - /obj/item/weapon/gun/projectile/revolver, - /obj/item/weapon/gun/projectile/sec, - /obj/item/weapon/gun/launcher/crossbow + /obj/item/storage/belt/utility/alien/full, + /obj/item/gun/projectile/revolver, + /obj/item/gun/projectile/sec, + /obj/item/gun/launcher/crossbow ) // Subtype for mecha and mecha accessories. These might not always be on the surface. @@ -650,9 +650,9 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/mecha_parts/part/ripley_right_arm, /obj/item/mecha_parts/part/ripley_left_leg, /obj/item/mecha_parts/part/ripley_right_leg, - /obj/item/device/kit/paint/ripley, - /obj/item/device/kit/paint/ripley/flames_red, - /obj/item/device/kit/paint/ripley/flames_blue + /obj/item/kit/paint/ripley, + /obj/item/kit/paint/ripley/flames_red, + /obj/item/kit/paint/ripley/flames_blue ) uncommon_loot = list( @@ -693,7 +693,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/mecha_parts/part/ripley_right_arm, /obj/item/mecha_parts/part/ripley_left_leg, /obj/item/mecha_parts/part/ripley_right_leg, - /obj/item/device/kit/paint/ripley/death + /obj/item/kit/paint/ripley/death ) uncommon_loot = list( @@ -780,9 +780,9 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade, /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser, /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser, - /obj/item/device/kit/paint/gygax, - /obj/item/device/kit/paint/gygax/darkgygax, - /obj/item/device/kit/paint/gygax/recitence + /obj/item/kit/paint/gygax, + /obj/item/kit/paint/gygax/darkgygax, + /obj/item/kit/paint/gygax/recitence ) rare_loot = list( @@ -833,9 +833,9 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade, /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser, /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster, - /obj/item/device/kit/paint/durand, - /obj/item/device/kit/paint/durand/seraph, - /obj/item/device/kit/paint/durand/phazon + /obj/item/kit/paint/durand, + /obj/item/kit/paint/durand/seraph, + /obj/item/kit/paint/durand/phazon ) rare_loot = list( @@ -867,7 +867,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh icon_state = "phazon-broken" common_loot = list( - /obj/item/weapon/storage/toolbox/syndicate/powertools, + /obj/item/storage/toolbox/syndicate/powertools, /obj/item/stack/material/plasteel{amount = 20}, /obj/item/stack/material/durasteel{amount = 10}, /obj/item/mecha_parts/chassis/phazon, @@ -909,12 +909,12 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/stack/material/steel{amount = 25}, /obj/item/stack/material/glass{amount = 10}, /obj/item/stack/material/plasteel{amount = 5}, - /obj/item/weapon/cell, - /obj/item/weapon/material/shard + /obj/item/cell, + /obj/item/material/shard ) uncommon_loot = list( - /obj/item/weapon/cell/high, + /obj/item/cell/high, /obj/item/robot_parts/robot_component/actuator, /obj/item/robot_parts/robot_component/armour, /obj/item/robot_parts/robot_component/binary_communication_device, @@ -924,7 +924,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh ) rare_loot = list( - /obj/item/weapon/cell/super, + /obj/item/cell/super, /obj/item/borg/upgrade/utility/restart, /obj/item/borg/upgrade/advanced/jetpack, /obj/item/borg/upgrade/restricted/tasercooler, diff --git a/code/game/objects/structures/low_wall.dm b/code/game/objects/structures/low_wall.dm index 1a9dc0e6c41..79507c6fa3f 100644 --- a/code/game/objects/structures/low_wall.dm +++ b/code/game/objects/structures/low_wall.dm @@ -466,7 +466,7 @@ name = "phoron window" desc = "A borosilicate alloy window. It seems to be quite strong." icon_state = "preview_phoron" - shardtype = /obj/item/weapon/material/shard/phoron + shardtype = /obj/item/material/shard/phoron glasstype = /obj/item/stack/material/glass/phoronglass maximal_heat = T0C + 2000 damage_per_fire_tick = 1.0 @@ -479,7 +479,7 @@ desc = "A borosilicate alloy window, with rods supporting it. It seems to be very strong." icon_state = "preview_rphoron" basestate = "rwindow" - shardtype = /obj/item/weapon/material/shard/phoron + shardtype = /obj/item/material/shard/phoron glasstype = /obj/item/stack/material/glass/phoronrglass reinf = 1 maximal_heat = T0C + 4000 @@ -542,7 +542,7 @@ desc = "A borosilicate alloy window. It seems to be quite strong." basestate = "preview_phoron" icon_state = "pwindow" - shardtype = /obj/item/weapon/material/shard/phoron + shardtype = /obj/item/material/shard/phoron glasstype = /obj/item/stack/material/glass/phoronglass maximal_heat = T0C + 2000 damage_per_fire_tick = 1.0 @@ -555,7 +555,7 @@ desc = "A borosilicate alloy window, with rods supporting it. It seems to be very strong." basestate = "preview_rphoron" icon_state = "rpwindow" - shardtype = /obj/item/weapon/material/shard/phoron + shardtype = /obj/item/material/shard/phoron glasstype = /obj/item/stack/material/glass/phoronrglass reinf = 1 maximal_heat = T0C + 4000 diff --git a/code/game/objects/structures/medical_stand_vr.dm b/code/game/objects/structures/medical_stand_vr.dm index 63b6f365f52..eae5364f15e 100644 --- a/code/game/objects/structures/medical_stand_vr.dm +++ b/code/game/objects/structures/medical_stand_vr.dm @@ -5,7 +5,7 @@ icon_state = "medical_stand_empty" //gas stuff - var/obj/item/weapon/tank/tank + var/obj/item/tank/tank var/mob/living/carbon/human/breather var/obj/item/clothing/mask/breath/contained @@ -17,7 +17,7 @@ //blood stuff var/mob/living/carbon/attached var/mode = 1 // 1 is injecting, 0 is taking blood. - var/obj/item/weapon/reagent_containers/beaker + var/obj/item/reagent_containers/beaker var/list/transfer_amounts = list(REM, 1, 2) var/transfer_amount = 1 @@ -36,15 +36,15 @@ add_overlay("tube_active") else add_overlay("tube") - if(istype(tank,/obj/item/weapon/tank/anesthetic)) + if(istype(tank,/obj/item/tank/anesthetic)) add_overlay("tank_anest") - else if(istype(tank,/obj/item/weapon/tank/nitrogen)) + else if(istype(tank,/obj/item/tank/nitrogen)) add_overlay("tank_nitro") - else if(istype(tank,/obj/item/weapon/tank/oxygen)) + else if(istype(tank,/obj/item/tank/oxygen)) add_overlay("tank_oxyg") - else if(istype(tank,/obj/item/weapon/tank/phoron)) + else if(istype(tank,/obj/item/tank/phoron)) add_overlay("tank_plasma") - //else if(istype(tank,/obj/item/weapon/tank/hydrogen)) + //else if(istype(tank,/obj/item/tank/hydrogen)) // add_overlay("tank_hydro") else add_overlay("tank_other") @@ -289,8 +289,8 @@ return return 1 -/obj/structure/medical_stand/attackby(var/obj/item/weapon/W, var/mob/user) - if(istype (W, /obj/item/weapon/tool)) +/obj/structure/medical_stand/attackby(var/obj/item/W, var/mob/user) + if(istype (W, /obj/item/tool)) if (valve_opened) to_chat(user, "Close the valve first.") return @@ -310,7 +310,7 @@ else to_chat(user, "There is no tank in \the [src].") - else if(istype(W, /obj/item/weapon/tank)) + else if(istype(W, /obj/item/tank)) if(tank) to_chat(user, "\The [src] already has a tank installed!") else if(!is_loosen) @@ -323,7 +323,7 @@ src.add_fingerprint(user) update_icon() - else if (istype(W, /obj/item/weapon/reagent_containers)) + else if (istype(W, /obj/item/reagent_containers)) if(!isnull(src.beaker)) to_chat(user, "There is already a reagent container loaded!") return @@ -438,7 +438,7 @@ return PROCESS_KILL /obj/structure/medical_stand/anesthetic - spawn_type = /obj/item/weapon/tank/anesthetic + spawn_type = /obj/item/tank/anesthetic mask_type = /obj/item/clothing/mask/breath/medical is_loosen = FALSE diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index a58eba45aae..b549c065183 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -63,7 +63,7 @@ to_chat(user, "The broken glass falls out.") icon_state = "mirror_frame" glass = !glass - new /obj/item/weapon/material/shard( src.loc ) + new /obj/item/material/shard( src.loc ) return if(!shattered && glass) playsound(src, I.usesound, 50, 1) diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index 2ce7d1126ae..ddd9db102c8 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -22,7 +22,7 @@ GLOBAL_LIST_BOILERPLATE(all_mopbuckets, /obj/structure/mopbucket) . += "It contains [reagents.total_volume] unit\s of water!" /obj/structure/mopbucket/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/soap) || istype(I, /obj/item/weapon/reagent_containers/glass/rag)) //VOREStation Edit - "Allows soap and rags to be used on mopbuckets" + if(istype(I, /obj/item/mop) || istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/glass/rag)) //VOREStation Edit - "Allows soap and rags to be used on mopbuckets" if(reagents.total_volume < 1) to_chat(user, "\The [src] is out of water!") else diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index fb18083562e..b929222cf63 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -120,7 +120,7 @@ /obj/structure/morgue/attackby(P as obj, mob/user as mob) - if (istype(P, /obj/item/weapon/pen)) + if (istype(P, /obj/item/pen)) var/t = tgui_input_text(user, "What would you like the label to be?", text("[]", src.name), null) if (user.get_active_hand() != P) return @@ -246,7 +246,7 @@ GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium) update() /obj/structure/morgue/crematorium/attackby(P as obj, mob/user as mob) - if (istype(P, /obj/item/weapon/pen)) + if (istype(P, /obj/item/pen)) var/t = tgui_input_text(user, "What would you like the label to be?", text("[]", src.name), null) if (user.get_active_hand() != P) return @@ -288,7 +288,7 @@ GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium) return else - if(!isemptylist(src.search_contents_for(/obj/item/weapon/disk/nuclear))) + if(!isemptylist(src.search_contents_for(/obj/item/disk/nuclear))) to_chat(user, "You get the feeling that you shouldn't cremate one of the items in the cremator.") return diff --git a/code/game/objects/structures/morgue_vr.dm b/code/game/objects/structures/morgue_vr.dm index 3d9a72deb8b..366f216089e 100644 --- a/code/game/objects/structures/morgue_vr.dm +++ b/code/game/objects/structures/morgue_vr.dm @@ -1,7 +1,7 @@ /obj/structure/morgue/crematorium/vr var/list/allowed_items = list(/obj/item/organ, - /obj/item/weapon/implant, - /obj/item/weapon/material/shard/shrapnel, + /obj/item/implant, + /obj/item/material/shard/shrapnel, /mob/living) @@ -14,7 +14,7 @@ M.show_message("You hear a hollow crackle.", 1) return else - if(!isemptylist(src.search_contents_for(/obj/item/weapon/disk/nuclear))) + if(!isemptylist(src.search_contents_for(/obj/item/disk/nuclear))) to_chat(usr, "You get the feeling that you shouldn't cremate one of the items in the cremator.") return diff --git a/code/game/objects/structures/pillows.dm b/code/game/objects/structures/pillows.dm index fa97543f096..44b3e0882de 100644 --- a/code/game/objects/structures/pillows.dm +++ b/code/game/objects/structures/pillows.dm @@ -1,6 +1,6 @@ //Pillows with sprites ported from skyrat -/obj/item/weapon/bedsheet/pillow +/obj/item/bedsheet/pillow name = "pillow" desc = "A surprisingly soft stuffed pillow." icon = 'icons/obj/pillows.dmi' @@ -9,17 +9,17 @@ var/pile_type = "/obj/structure/bed/pillowpile" throw_range = 7 -/obj/item/weapon/bedsheet/pillow/attack_self(mob/user as mob) +/obj/item/bedsheet/pillow/attack_self(mob/user as mob) user.drop_item() if(icon_state == initial(icon_state)) icon_state = "[icon_state]_placed" add_fingerprint(user) -/obj/item/weapon/bedsheet/pillow/pickup(mob/user) +/obj/item/bedsheet/pillow/pickup(mob/user) ..() icon_state = initial(icon_state) -/obj/item/weapon/bedsheet/pillow/attackby(var/obj/item/component, mob/user as mob) +/obj/item/bedsheet/pillow/attackby(var/obj/item/component, mob/user as mob) if (istype(component,src)) to_chat(user, "You assemble a pillow pile!") user.drop_item() @@ -39,7 +39,7 @@ icon = 'icons/obj/pillows.dmi' icon_state = "pillowpile_large_pink" var/pillowpilefront = "/obj/structure/bed/pillowpilefront" - var/sourcepillow = "/obj/item/weapon/bedsheet/pillow" + var/sourcepillow = "/obj/item/bedsheet/pillow" /obj/structure/bed/pillowpilefront name = "pillow pile" @@ -48,7 +48,7 @@ icon_state = "pillowpile_large_pink_overlay" layer = ABOVE_MOB_LAYER plane = MOB_PLANE - var/sourcepillow = "/obj/item/weapon/bedsheet/pillow" + var/sourcepillow = "/obj/item/bedsheet/pillow" /obj/structure/bed/pillowpile/New() ..() @@ -81,114 +81,114 @@ //teal -/obj/item/weapon/bedsheet/pillow/teal +/obj/item/bedsheet/pillow/teal icon_state = "pillow_teal_square" pile_type = "/obj/structure/bed/pillowpile/teal" /obj/structure/bed/pillowpile/teal icon_state = "pillowpile_large_teal" pillowpilefront = "/obj/structure/bed/pillowpilefront/teal" - sourcepillow = "/obj/item/weapon/bedsheet/pillow/teal" + sourcepillow = "/obj/item/bedsheet/pillow/teal" /obj/structure/bed/pillowpilefront/teal icon_state = "pillowpile_large_teal_overlay" - sourcepillow = "/obj/item/weapon/bedsheet/pillow/teal" + sourcepillow = "/obj/item/bedsheet/pillow/teal" //yellow -/obj/item/weapon/bedsheet/pillow/yellow +/obj/item/bedsheet/pillow/yellow icon_state = "pillow_yellow_square" pile_type = "/obj/structure/bed/pillowpile/yellow" /obj/structure/bed/pillowpile/yellow icon_state = "pillowpile_large_yellow" pillowpilefront = "/obj/structure/bed/pillowpilefront/yellow" - sourcepillow = "/obj/item/weapon/bedsheet/pillow/yellow" + sourcepillow = "/obj/item/bedsheet/pillow/yellow" /obj/structure/bed/pillowpilefront/yellow icon_state = "pillowpile_large_yellow_overlay" - sourcepillow = "/obj/item/weapon/bedsheet/pillow/yellow" + sourcepillow = "/obj/item/bedsheet/pillow/yellow" //white -/obj/item/weapon/bedsheet/pillow/white +/obj/item/bedsheet/pillow/white icon_state = "pillow_white_square" pile_type = "/obj/structure/bed/pillowpile/white" /obj/structure/bed/pillowpile/white icon_state = "pillowpile_large_white" pillowpilefront = "/obj/structure/bed/pillowpilefront/white" - sourcepillow = "/obj/item/weapon/bedsheet/pillow/white" + sourcepillow = "/obj/item/bedsheet/pillow/white" /obj/structure/bed/pillowpilefront/white icon_state = "pillowpile_large_white_overlay" - sourcepillow = "/obj/item/weapon/bedsheet/pillow/white" + sourcepillow = "/obj/item/bedsheet/pillow/white" //black -/obj/item/weapon/bedsheet/pillow/black +/obj/item/bedsheet/pillow/black icon_state = "pillow_black_square" pile_type = "/obj/structure/bed/pillowpile/black" /obj/structure/bed/pillowpile/black icon_state = "pillowpile_large_black" pillowpilefront = "/obj/structure/bed/pillowpilefront/black" - sourcepillow = "/obj/item/weapon/bedsheet/pillow/black" + sourcepillow = "/obj/item/bedsheet/pillow/black" /obj/structure/bed/pillowpilefront/black icon_state = "pillowpile_large_black_overlay" - sourcepillow = "/obj/item/weapon/bedsheet/pillow/black" + sourcepillow = "/obj/item/bedsheet/pillow/black" //green -/obj/item/weapon/bedsheet/pillow/green +/obj/item/bedsheet/pillow/green icon_state = "pillow_green_square" pile_type = "/obj/structure/bed/pillowpile/green" /obj/structure/bed/pillowpile/green icon_state = "pillowpile_large_green" pillowpilefront = "/obj/structure/bed/pillowpilefront/green" - sourcepillow = "/obj/item/weapon/bedsheet/pillow/green" + sourcepillow = "/obj/item/bedsheet/pillow/green" /obj/structure/bed/pillowpilefront/green icon_state = "pillowpile_large_green_overlay" - sourcepillow = "/obj/item/weapon/bedsheet/pillow/green" + sourcepillow = "/obj/item/bedsheet/pillow/green" //red -/obj/item/weapon/bedsheet/pillow/red +/obj/item/bedsheet/pillow/red icon_state = "pillow_red_square" pile_type = "/obj/structure/bed/pillowpile/red" /obj/structure/bed/pillowpile/red icon_state = "pillowpile_large_red" pillowpilefront = "/obj/structure/bed/pillowpilefront/red" - sourcepillow = "/obj/item/weapon/bedsheet/pillow/red" + sourcepillow = "/obj/item/bedsheet/pillow/red" /obj/structure/bed/pillowpilefront/red icon_state = "pillowpile_large_red_overlay" - sourcepillow = "/obj/item/weapon/bedsheet/pillow/red" + sourcepillow = "/obj/item/bedsheet/pillow/red" //orange -/obj/item/weapon/bedsheet/pillow/orange +/obj/item/bedsheet/pillow/orange icon_state = "pillow_orange_square" pile_type = "/obj/structure/bed/pillowpile/orange" /obj/structure/bed/pillowpile/orange icon_state = "pillowpile_large_orange" pillowpilefront = "/obj/structure/bed/pillowpilefront/orange" - sourcepillow = "/obj/item/weapon/bedsheet/pillow/orange" + sourcepillow = "/obj/item/bedsheet/pillow/orange" /obj/structure/bed/pillowpilefront/orange icon_state = "pillowpile_large_orange_overlay" - sourcepillow = "/obj/item/weapon/bedsheet/pillow/orange" + sourcepillow = "/obj/item/bedsheet/pillow/orange" //crafting /datum/crafting_recipe/pillowpink name = "pillow (pink)" - result = /obj/item/weapon/bedsheet/pillow + result = /obj/item/bedsheet/pillow reqs = list( list(/obj/item/stack/material/cloth = 6) ) @@ -197,7 +197,7 @@ /datum/crafting_recipe/pillowteal name = "pillow (teal)" - result = /obj/item/weapon/bedsheet/pillow/teal + result = /obj/item/bedsheet/pillow/teal reqs = list( list(/obj/item/stack/material/cloth = 6) ) @@ -206,7 +206,7 @@ /datum/crafting_recipe/pillowwhite name = "pillow (white)" - result = /obj/item/weapon/bedsheet/pillow/white + result = /obj/item/bedsheet/pillow/white reqs = list( list(/obj/item/stack/material/cloth = 6) ) @@ -215,7 +215,7 @@ /datum/crafting_recipe/pillowblack name = "pillow (black)" - result = /obj/item/weapon/bedsheet/pillow/black + result = /obj/item/bedsheet/pillow/black reqs = list( list(/obj/item/stack/material/cloth = 6) ) @@ -224,7 +224,7 @@ /datum/crafting_recipe/pillowgreen name = "pillow (green)" - result = /obj/item/weapon/bedsheet/pillow/green + result = /obj/item/bedsheet/pillow/green reqs = list( list(/obj/item/stack/material/cloth = 6) ) @@ -233,7 +233,7 @@ /datum/crafting_recipe/pillowyellow name = "pillow (yellow)" - result = /obj/item/weapon/bedsheet/pillow/yellow + result = /obj/item/bedsheet/pillow/yellow reqs = list( list(/obj/item/stack/material/cloth = 6) ) @@ -242,7 +242,7 @@ /datum/crafting_recipe/pillowred name = "pillow (red)" - result = /obj/item/weapon/bedsheet/pillow/red + result = /obj/item/bedsheet/pillow/red reqs = list( list(/obj/item/stack/material/cloth = 6) ) @@ -251,7 +251,7 @@ /datum/crafting_recipe/pilloworange name = "pillow (orange)" - result = /obj/item/weapon/bedsheet/pillow/orange + result = /obj/item/bedsheet/pillow/orange reqs = list( list(/obj/item/stack/material/cloth = 6) ) diff --git a/code/game/objects/structures/props/fake_ai.dm b/code/game/objects/structures/props/fake_ai.dm index 75d5de407cc..af0885fe327 100644 --- a/code/game/objects/structures/props/fake_ai.dm +++ b/code/game/objects/structures/props/fake_ai.dm @@ -7,7 +7,7 @@ icon_state = "ai" /obj/structure/prop/fake_ai/attackby(obj/O, mob/user) - if(istype(O, /obj/item/device/aicard)) // People trying to card the fake AI will get told its impossible. + if(istype(O, /obj/item/aicard)) // People trying to card the fake AI will get told its impossible. to_chat(user, span("warning", "This core does not appear to have a suitable port to use \the [O] on...")) return TRUE return ..() diff --git a/code/game/objects/structures/props/puzzledoor.dm b/code/game/objects/structures/props/puzzledoor.dm index f5ec2fe7cb5..074b0bed7fe 100644 --- a/code/game/objects/structures/props/puzzledoor.dm +++ b/code/game/objects/structures/props/puzzledoor.dm @@ -59,11 +59,11 @@ else to_chat(user, "\The [src] does not respond to your touch.") -/obj/machinery/door/blast/puzzle/attackby(obj/item/weapon/C as obj, mob/user as mob) - if(istype(C, /obj/item/weapon)) +/obj/machinery/door/blast/puzzle/attackby(obj/item/C as obj, mob/user as mob) + if(istype(C, /obj/item)) if(C.pry == 1 && (user.a_intent != I_HURT || (stat & BROKEN))) - if(istype(C,/obj/item/weapon/material/twohanded/fireaxe)) - var/obj/item/weapon/material/twohanded/fireaxe/F = C + if(istype(C,/obj/item/material/twohanded/fireaxe)) + var/obj/item/material/twohanded/fireaxe/F = C if(!F.wielded) to_chat(user, "You need to be wielding \the [F] to do that.") return @@ -76,13 +76,13 @@ return else if(src.density && (user.a_intent == I_HURT)) - var/obj/item/weapon/W = C + var/obj/item/W = C user.setClickCooldown(user.get_attack_speed(W)) if(W.damtype == BRUTE || W.damtype == BURN) user.do_attack_animation(src) user.visible_message("\The [user] hits \the [src] with \the [W] with no visible effect.") - else if(istype(C, /obj/item/weapon/plastique)) + else if(istype(C, /obj/item/plastique)) to_chat(user, "On contacting \the [src], a flash of light envelops \the [C] as it is turned to ash. Oh.") qdel(C) return 0 diff --git a/code/game/objects/structures/railing.dm b/code/game/objects/structures/railing.dm index 3b357d9fd5b..a8e2b979a99 100644 --- a/code/game/objects/structures/railing.dm +++ b/code/game/objects/structures/railing.dm @@ -212,7 +212,7 @@ // Repair if(health < maxhealth && W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/F = W.get_welder() + var/obj/item/weldingtool/F = W.get_welder() if(F.welding) playsound(src, F.usesound, 50, 1) if(do_after(user, 20, src)) @@ -231,8 +231,8 @@ return // Handle harm intent grabbing/tabling. - if(istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) - var/obj/item/weapon/grab/G = W + if(istype(W, /obj/item/grab) && get_dist(src,user)<2) + var/obj/item/grab/G = W if (istype(G.affecting, /mob/living)) var/mob/living/M = G.affecting var/obj/occupied = turf_is_crowded() diff --git a/code/game/objects/structures/salvageable.dm b/code/game/objects/structures/salvageable.dm index 4999456a5e3..8a0da9b752b 100644 --- a/code/game/objects/structures/salvageable.dm +++ b/code/game/objects/structures/salvageable.dm @@ -35,25 +35,25 @@ name = "broken machine" icon_state = "machine1" salvageable_parts = list( - /obj/item/weapon/stock_parts/console_screen = 80, + /obj/item/stock_parts/console_screen = 80, /obj/item/stack/cable_coil{amount = 5} = 80, /obj/item/trash/material/circuit = 60, /obj/item/trash/material/metal = 60, - /obj/item/weapon/stock_parts/capacitor = 40, - /obj/item/weapon/stock_parts/capacitor = 40, - /obj/item/weapon/stock_parts/scanning_module = 40, - /obj/item/weapon/stock_parts/scanning_module = 40, - /obj/item/weapon/stock_parts/manipulator = 40, - /obj/item/weapon/stock_parts/manipulator = 40, - /obj/item/weapon/stock_parts/micro_laser = 40, - /obj/item/weapon/stock_parts/micro_laser = 40, - /obj/item/weapon/stock_parts/matter_bin = 40, - /obj/item/weapon/stock_parts/matter_bin = 40, - /obj/item/weapon/stock_parts/capacitor/adv = 20, - /obj/item/weapon/stock_parts/scanning_module/adv = 20, - /obj/item/weapon/stock_parts/manipulator/nano = 20, - /obj/item/weapon/stock_parts/micro_laser/high = 20, - /obj/item/weapon/stock_parts/matter_bin/adv = 20 + /obj/item/stock_parts/capacitor = 40, + /obj/item/stock_parts/capacitor = 40, + /obj/item/stock_parts/scanning_module = 40, + /obj/item/stock_parts/scanning_module = 40, + /obj/item/stock_parts/manipulator = 40, + /obj/item/stock_parts/manipulator = 40, + /obj/item/stock_parts/micro_laser = 40, + /obj/item/stock_parts/micro_laser = 40, + /obj/item/stock_parts/matter_bin = 40, + /obj/item/stock_parts/matter_bin = 40, + /obj/item/stock_parts/capacitor/adv = 20, + /obj/item/stock_parts/scanning_module/adv = 20, + /obj/item/stock_parts/manipulator/nano = 20, + /obj/item/stock_parts/micro_laser/high = 20, + /obj/item/stock_parts/matter_bin/adv = 20 ) /obj/structure/salvageable/machine/Initialize() @@ -64,21 +64,21 @@ name = "broken computer" icon_state = "computer0" salvageable_parts = list( - /obj/item/weapon/stock_parts/console_screen = 80, + /obj/item/stock_parts/console_screen = 80, /obj/item/stack/cable_coil{amount = 5} = 90, /obj/item/stack/material/glass{amount = 5} = 90, /obj/item/trash/material/circuit = 60, /obj/item/trash/material/metal = 60, - /obj/item/weapon/stock_parts/capacitor = 60, - /obj/item/weapon/stock_parts/capacitor = 60, - /obj/item/weapon/computer_hardware/network_card = 40, - /obj/item/weapon/computer_hardware/network_card = 40, - /obj/item/weapon/computer_hardware/processor_unit = 40, - /obj/item/weapon/computer_hardware/processor_unit = 40, - /obj/item/weapon/computer_hardware/card_slot = 40, - /obj/item/weapon/computer_hardware/card_slot = 40, - /obj/item/weapon/stock_parts/capacitor/adv = 30, - /obj/item/weapon/computer_hardware/network_card/advanced = 20 + /obj/item/stock_parts/capacitor = 60, + /obj/item/stock_parts/capacitor = 60, + /obj/item/computer_hardware/network_card = 40, + /obj/item/computer_hardware/network_card = 40, + /obj/item/computer_hardware/processor_unit = 40, + /obj/item/computer_hardware/processor_unit = 40, + /obj/item/computer_hardware/card_slot = 40, + /obj/item/computer_hardware/card_slot = 40, + /obj/item/stock_parts/capacitor/adv = 30, + /obj/item/computer_hardware/network_card/advanced = 20 ) /obj/structure/salvageable/computer/Initialize() . = ..() @@ -88,25 +88,25 @@ name = "broken autolathe" icon_state = "autolathe" salvageable_parts = list( - /obj/item/weapon/stock_parts/console_screen = 80, + /obj/item/stock_parts/console_screen = 80, /obj/item/stack/cable_coil{amount = 5} = 80, /obj/item/trash/material/circuit = 60, /obj/item/trash/material/metal = 60, - /obj/item/weapon/stock_parts/capacitor = 40, - /obj/item/weapon/stock_parts/scanning_module = 40, - /obj/item/weapon/stock_parts/manipulator = 40, - /obj/item/weapon/stock_parts/micro_laser = 40, - /obj/item/weapon/stock_parts/micro_laser = 40, - /obj/item/weapon/stock_parts/micro_laser = 40, - /obj/item/weapon/stock_parts/matter_bin = 40, - /obj/item/weapon/stock_parts/matter_bin = 40, - /obj/item/weapon/stock_parts/matter_bin = 40, - /obj/item/weapon/stock_parts/matter_bin = 40, - /obj/item/weapon/stock_parts/capacitor/adv = 20, - /obj/item/weapon/stock_parts/micro_laser/high = 20, - /obj/item/weapon/stock_parts/micro_laser/high = 20, - /obj/item/weapon/stock_parts/matter_bin/adv = 20, - /obj/item/weapon/stock_parts/matter_bin/adv = 20, + /obj/item/stock_parts/capacitor = 40, + /obj/item/stock_parts/scanning_module = 40, + /obj/item/stock_parts/manipulator = 40, + /obj/item/stock_parts/micro_laser = 40, + /obj/item/stock_parts/micro_laser = 40, + /obj/item/stock_parts/micro_laser = 40, + /obj/item/stock_parts/matter_bin = 40, + /obj/item/stock_parts/matter_bin = 40, + /obj/item/stock_parts/matter_bin = 40, + /obj/item/stock_parts/matter_bin = 40, + /obj/item/stock_parts/capacitor/adv = 20, + /obj/item/stock_parts/micro_laser/high = 20, + /obj/item/stock_parts/micro_laser/high = 20, + /obj/item/stock_parts/matter_bin/adv = 20, + /obj/item/stock_parts/matter_bin/adv = 20, /obj/item/stack/material/steel{amount = 20} = 40, /obj/item/stack/material/glass{amount = 20} = 40, /obj/item/stack/material/plastic{amount = 20} = 40, @@ -120,17 +120,17 @@ name = "old container" icon_state = "implant_container0" salvageable_parts = list( - /obj/item/weapon/stock_parts/console_screen = 80, + /obj/item/stock_parts/console_screen = 80, /obj/item/stack/cable_coil{amount = 5} = 80, /obj/item/trash/material/circuit = 60, /obj/item/trash/material/metal = 60, - /obj/item/weapon/implant/death_alarm = 15, - /obj/item/weapon/implant/explosive = 10, - /obj/item/weapon/implant/freedom = 5, - /obj/item/weapon/implant/tracking = 10, - /obj/item/weapon/implant/chem = 10, - /obj/item/weapon/implantcase = 30, - /obj/item/weapon/implanter = 30, + /obj/item/implant/death_alarm = 15, + /obj/item/implant/explosive = 10, + /obj/item/implant/freedom = 5, + /obj/item/implant/tracking = 10, + /obj/item/implant/chem = 10, + /obj/item/implantcase = 30, + /obj/item/implanter = 30, /obj/item/stack/material/steel{amount = 10} = 30, /obj/item/stack/material/glass{amount = 10} = 30, /obj/item/stack/material/silver{amount = 10} = 30 @@ -144,24 +144,24 @@ name = "broken data storage" icon_state = "data0" salvageable_parts = list( - /obj/item/weapon/stock_parts/console_screen = 80, + /obj/item/stock_parts/console_screen = 80, /obj/item/stack/cable_coil{amount = 5} = 90, /obj/item/stack/material/glass{amount = 5} = 90, /obj/item/trash/material/circuit = 60, /obj/item/trash/material/metal = 60, - /obj/item/weapon/computer_hardware/network_card = 40, - /obj/item/weapon/computer_hardware/network_card = 40, - /obj/item/weapon/computer_hardware/processor_unit = 40, - /obj/item/weapon/computer_hardware/processor_unit = 40, - /obj/item/weapon/computer_hardware/hard_drive = 50, - /obj/item/weapon/computer_hardware/hard_drive = 50, - /obj/item/weapon/computer_hardware/hard_drive = 50, - /obj/item/weapon/computer_hardware/hard_drive = 50, - /obj/item/weapon/computer_hardware/hard_drive = 50, - /obj/item/weapon/computer_hardware/hard_drive = 50, - /obj/item/weapon/computer_hardware/hard_drive/advanced = 30, - /obj/item/weapon/computer_hardware/hard_drive/advanced = 30, - /obj/item/weapon/computer_hardware/network_card/advanced = 20 + /obj/item/computer_hardware/network_card = 40, + /obj/item/computer_hardware/network_card = 40, + /obj/item/computer_hardware/processor_unit = 40, + /obj/item/computer_hardware/processor_unit = 40, + /obj/item/computer_hardware/hard_drive = 50, + /obj/item/computer_hardware/hard_drive = 50, + /obj/item/computer_hardware/hard_drive = 50, + /obj/item/computer_hardware/hard_drive = 50, + /obj/item/computer_hardware/hard_drive = 50, + /obj/item/computer_hardware/hard_drive = 50, + /obj/item/computer_hardware/hard_drive/advanced = 30, + /obj/item/computer_hardware/hard_drive/advanced = 30, + /obj/item/computer_hardware/network_card/advanced = 20 ) /obj/structure/salvageable/data/Initialize() @@ -172,26 +172,26 @@ name = "broken server" icon_state = "server0" salvageable_parts = list( - /obj/item/weapon/stock_parts/console_screen = 80, + /obj/item/stock_parts/console_screen = 80, /obj/item/stack/cable_coil{amount = 5} = 90, /obj/item/stack/material/glass{amount = 5} = 90, /obj/item/trash/material/circuit = 60, /obj/item/trash/material/metal = 60, - /obj/item/weapon/computer_hardware/network_card = 40, - /obj/item/weapon/computer_hardware/network_card = 40, - /obj/item/weapon/computer_hardware/processor_unit = 40, - /obj/item/weapon/computer_hardware/processor_unit = 40, - /obj/item/weapon/stock_parts/subspace/amplifier = 40, - /obj/item/weapon/stock_parts/subspace/amplifier = 40, - /obj/item/weapon/stock_parts/subspace/analyzer = 40, - /obj/item/weapon/stock_parts/subspace/analyzer = 40, - /obj/item/weapon/stock_parts/subspace/ansible = 40, - /obj/item/weapon/stock_parts/subspace/ansible = 40, - /obj/item/weapon/stock_parts/subspace/transmitter = 40, - /obj/item/weapon/stock_parts/subspace/transmitter = 40, - /obj/item/weapon/stock_parts/subspace/crystal = 30, - /obj/item/weapon/stock_parts/subspace/crystal = 30, - /obj/item/weapon/computer_hardware/network_card/advanced = 20 + /obj/item/computer_hardware/network_card = 40, + /obj/item/computer_hardware/network_card = 40, + /obj/item/computer_hardware/processor_unit = 40, + /obj/item/computer_hardware/processor_unit = 40, + /obj/item/stock_parts/subspace/amplifier = 40, + /obj/item/stock_parts/subspace/amplifier = 40, + /obj/item/stock_parts/subspace/analyzer = 40, + /obj/item/stock_parts/subspace/analyzer = 40, + /obj/item/stock_parts/subspace/ansible = 40, + /obj/item/stock_parts/subspace/ansible = 40, + /obj/item/stock_parts/subspace/transmitter = 40, + /obj/item/stock_parts/subspace/transmitter = 40, + /obj/item/stock_parts/subspace/crystal = 30, + /obj/item/stock_parts/subspace/crystal = 30, + /obj/item/computer_hardware/network_card/advanced = 20 ) /obj/structure/salvageable/server/Initialize() @@ -202,21 +202,21 @@ name = "personal terminal" icon_state = "personal0" salvageable_parts = list( - /obj/item/weapon/stock_parts/console_screen = 90, + /obj/item/stock_parts/console_screen = 90, /obj/item/stack/cable_coil{amount = 5} = 90, /obj/item/stack/material/glass{amount = 5} = 70, /obj/item/trash/material/circuit = 60, /obj/item/trash/material/metal = 60, - /obj/item/weapon/computer_hardware/network_card = 60, - /obj/item/weapon/computer_hardware/network_card/advanced = 40, - /obj/item/weapon/computer_hardware/network_card/wired = 40, - /obj/item/weapon/computer_hardware/card_slot = 40, - /obj/item/weapon/computer_hardware/processor_unit = 60, - /obj/item/weapon/computer_hardware/processor_unit/small = 50, - /obj/item/weapon/computer_hardware/processor_unit/photonic = 40, - /obj/item/weapon/computer_hardware/processor_unit/photonic/small = 30, - /obj/item/weapon/computer_hardware/hard_drive = 60, - /obj/item/weapon/computer_hardware/hard_drive/advanced = 40 + /obj/item/computer_hardware/network_card = 60, + /obj/item/computer_hardware/network_card/advanced = 40, + /obj/item/computer_hardware/network_card/wired = 40, + /obj/item/computer_hardware/card_slot = 40, + /obj/item/computer_hardware/processor_unit = 60, + /obj/item/computer_hardware/processor_unit/small = 50, + /obj/item/computer_hardware/processor_unit/photonic = 40, + /obj/item/computer_hardware/processor_unit/photonic/small = 30, + /obj/item/computer_hardware/hard_drive = 60, + /obj/item/computer_hardware/hard_drive/advanced = 40 ) /obj/structure/salvageable/personal/Initialize() @@ -228,10 +228,10 @@ name = "strange terminal" icon_state = "bliss0" salvageable_parts = list( - /obj/item/weapon/stock_parts/console_screen = 90, + /obj/item/stock_parts/console_screen = 90, /obj/item/stack/cable_coil{amount = 5} = 90, - /obj/item/weapon/computer_hardware/processor_unit/photonic = 60, - /obj/item/weapon/computer_hardware/hard_drive/cluster = 50 + /obj/item/computer_hardware/processor_unit/photonic = 60, + /obj/item/computer_hardware/hard_drive/cluster = 50 ) /obj/structure/salvageable/bliss/Initialize() @@ -254,10 +254,10 @@ /obj/item/stack/material/glass{amount = 5} = 70, /obj/item/trash/material/circuit = 60, /obj/item/trash/material/metal = 60, - /obj/item/weapon/stock_parts/capacitor = 40, - /obj/item/weapon/stock_parts/capacitor = 40, - /obj/item/weapon/stock_parts/scanning_module = 40, - /obj/item/weapon/stock_parts/scanning_module = 40 + /obj/item/stock_parts/capacitor = 40, + /obj/item/stock_parts/capacitor = 40, + /obj/item/stock_parts/scanning_module = 40, + /obj/item/stock_parts/scanning_module = 40 ) /obj/structure/salvageable/personal/Initialize() @@ -272,10 +272,10 @@ /obj/item/stack/material/glass{amount = 5} = 70, /obj/item/trash/material/circuit = 60, /obj/item/trash/material/metal = 60, - /obj/item/weapon/stock_parts/capacitor = 40, - /obj/item/weapon/stock_parts/capacitor = 40, - /obj/item/weapon/stock_parts/scanning_module = 40, - /obj/item/weapon/stock_parts/scanning_module = 40 + /obj/item/stock_parts/capacitor = 40, + /obj/item/stock_parts/capacitor = 40, + /obj/item/stock_parts/scanning_module = 40, + /obj/item/stock_parts/scanning_module = 40 ) ////////////////// @@ -286,88 +286,88 @@ name = "broken machine" icon_state = "os-machine" salvageable_parts = list( - /obj/item/weapon/stock_parts/console_screen = 80, + /obj/item/stock_parts/console_screen = 80, /obj/item/stack/cable_coil{amount = 5} = 80, - /obj/item/weapon/stock_parts/capacitor = 40, - /obj/item/weapon/stock_parts/capacitor = 40, - /obj/item/weapon/stock_parts/scanning_module = 40, - /obj/item/weapon/stock_parts/scanning_module = 40, - /obj/item/weapon/stock_parts/manipulator = 40, - /obj/item/weapon/stock_parts/manipulator = 40, - /obj/item/weapon/stock_parts/micro_laser = 40, - /obj/item/weapon/stock_parts/micro_laser = 40, - /obj/item/weapon/stock_parts/matter_bin = 40, - /obj/item/weapon/stock_parts/matter_bin = 40 + /obj/item/stock_parts/capacitor = 40, + /obj/item/stock_parts/capacitor = 40, + /obj/item/stock_parts/scanning_module = 40, + /obj/item/stock_parts/scanning_module = 40, + /obj/item/stock_parts/manipulator = 40, + /obj/item/stock_parts/manipulator = 40, + /obj/item/stock_parts/micro_laser = 40, + /obj/item/stock_parts/micro_laser = 40, + /obj/item/stock_parts/matter_bin = 40, + /obj/item/stock_parts/matter_bin = 40 ) /obj/structure/salvageable/computer_os name = "broken computer" icon_state = "os-computer" salvageable_parts = list( - /obj/item/weapon/stock_parts/console_screen = 80, + /obj/item/stock_parts/console_screen = 80, /obj/item/stack/cable_coil{amount = 5} = 90, /obj/item/stack/material/glass{amount = 5} = 90, - /obj/item/weapon/stock_parts/capacitor = 60, - /obj/item/weapon/stock_parts/capacitor = 60, - /obj/item/weapon/computer_hardware/processor_unit/photonic = 40, - /obj/item/weapon/computer_hardware/processor_unit/photonic = 40, - /obj/item/weapon/computer_hardware/card_slot = 40, - /obj/item/weapon/computer_hardware/card_slot = 40, - /obj/item/weapon/computer_hardware/network_card/advanced = 40 + /obj/item/stock_parts/capacitor = 60, + /obj/item/stock_parts/capacitor = 60, + /obj/item/computer_hardware/processor_unit/photonic = 40, + /obj/item/computer_hardware/processor_unit/photonic = 40, + /obj/item/computer_hardware/card_slot = 40, + /obj/item/computer_hardware/card_slot = 40, + /obj/item/computer_hardware/network_card/advanced = 40 ) /obj/structure/salvageable/implant_container_os name = "old container" icon_state = "os-container" salvageable_parts = list( - /obj/item/weapon/stock_parts/console_screen = 80, + /obj/item/stock_parts/console_screen = 80, /obj/item/stack/cable_coil{amount = 5} = 80, - /obj/item/weapon/implant/death_alarm = 30, - /obj/item/weapon/implant/explosive = 20, - /obj/item/weapon/implant/freedom = 20, - /obj/item/weapon/implant/tracking = 30, - /obj/item/weapon/implant/chem = 30, - /obj/item/weapon/implantcase = 30, - /obj/item/weapon/implanter = 30 + /obj/item/implant/death_alarm = 30, + /obj/item/implant/explosive = 20, + /obj/item/implant/freedom = 20, + /obj/item/implant/tracking = 30, + /obj/item/implant/chem = 30, + /obj/item/implantcase = 30, + /obj/item/implanter = 30 ) /obj/structure/salvageable/data_os name = "broken data storage" icon_state = "os-data" salvageable_parts = list( - /obj/item/weapon/stock_parts/console_screen = 90, + /obj/item/stock_parts/console_screen = 90, /obj/item/stack/cable_coil{amount = 5} = 90, /obj/item/stack/material/glass{amount = 5} = 90, - /obj/item/weapon/computer_hardware/processor_unit/small = 60, - /obj/item/weapon/computer_hardware/processor_unit/photonic = 50, - /obj/item/weapon/computer_hardware/hard_drive/super = 50, - /obj/item/weapon/computer_hardware/hard_drive/super = 50, - /obj/item/weapon/computer_hardware/hard_drive/cluster = 50, - /obj/item/weapon/computer_hardware/network_card/wired = 40 + /obj/item/computer_hardware/processor_unit/small = 60, + /obj/item/computer_hardware/processor_unit/photonic = 50, + /obj/item/computer_hardware/hard_drive/super = 50, + /obj/item/computer_hardware/hard_drive/super = 50, + /obj/item/computer_hardware/hard_drive/cluster = 50, + /obj/item/computer_hardware/network_card/wired = 40 ) /obj/structure/salvageable/server_os name = "broken server" icon_state = "os-server" salvageable_parts = list( - /obj/item/weapon/stock_parts/console_screen = 80, + /obj/item/stock_parts/console_screen = 80, /obj/item/stack/cable_coil{amount = 5} = 90, /obj/item/stack/material/glass{amount = 5} = 90, - /obj/item/weapon/computer_hardware/network_card/wired = 40, - /obj/item/weapon/computer_hardware/network_card/wired = 40, - /obj/item/weapon/computer_hardware/processor_unit = 40, - /obj/item/weapon/computer_hardware/processor_unit/photonic = 40, - /obj/item/weapon/stock_parts/subspace/amplifier = 40, - /obj/item/weapon/stock_parts/subspace/amplifier = 40, - /obj/item/weapon/stock_parts/subspace/analyzer = 40, - /obj/item/weapon/stock_parts/subspace/analyzer = 40, - /obj/item/weapon/stock_parts/subspace/ansible = 40, - /obj/item/weapon/stock_parts/subspace/ansible = 40, - /obj/item/weapon/stock_parts/subspace/transmitter = 40, - /obj/item/weapon/stock_parts/subspace/transmitter = 40, - /obj/item/weapon/stock_parts/subspace/crystal = 30, - /obj/item/weapon/stock_parts/subspace/crystal = 30, - /obj/item/weapon/computer_hardware/network_card/wired = 20 + /obj/item/computer_hardware/network_card/wired = 40, + /obj/item/computer_hardware/network_card/wired = 40, + /obj/item/computer_hardware/processor_unit = 40, + /obj/item/computer_hardware/processor_unit/photonic = 40, + /obj/item/stock_parts/subspace/amplifier = 40, + /obj/item/stock_parts/subspace/amplifier = 40, + /obj/item/stock_parts/subspace/analyzer = 40, + /obj/item/stock_parts/subspace/analyzer = 40, + /obj/item/stock_parts/subspace/ansible = 40, + /obj/item/stock_parts/subspace/ansible = 40, + /obj/item/stock_parts/subspace/transmitter = 40, + /obj/item/stock_parts/subspace/transmitter = 40, + /obj/item/stock_parts/subspace/crystal = 30, + /obj/item/stock_parts/subspace/crystal = 30, + /obj/item/computer_hardware/network_card/wired = 20 ) /obj/structure/salvageable/console_os @@ -376,14 +376,14 @@ icon_state = "os_console" salvageable_parts = list( /obj/item/stack/cable_coil{amount = 5} = 90, - /obj/item/weapon/stock_parts/console_screen = 80, - /obj/item/weapon/stock_parts/capacitor = 60, - /obj/item/weapon/stock_parts/capacitor = 60, - /obj/item/weapon/computer_hardware/processor_unit/small = 40, - /obj/item/weapon/computer_hardware/processor_unit/photonic = 40, - /obj/item/weapon/computer_hardware/card_slot = 40, - /obj/item/weapon/computer_hardware/card_slot = 40, - /obj/item/weapon/computer_hardware/network_card/advanced = 40 + /obj/item/stock_parts/console_screen = 80, + /obj/item/stock_parts/capacitor = 60, + /obj/item/stock_parts/capacitor = 60, + /obj/item/computer_hardware/processor_unit/small = 40, + /obj/item/computer_hardware/processor_unit/photonic = 40, + /obj/item/computer_hardware/card_slot = 40, + /obj/item/computer_hardware/card_slot = 40, + /obj/item/computer_hardware/network_card/advanced = 40 ) /obj/structure/salvageable/console_broken_os @@ -391,14 +391,14 @@ icon_state = "os_console_broken" salvageable_parts = list( /obj/item/stack/cable_coil{amount = 5} = 90, - /obj/item/weapon/stock_parts/console_screen = 80, - /obj/item/weapon/stock_parts/capacitor = 60, - /obj/item/weapon/stock_parts/capacitor = 60, - /obj/item/weapon/computer_hardware/processor_unit = 40, - /obj/item/weapon/computer_hardware/processor_unit/photonic = 40, - /obj/item/weapon/computer_hardware/card_slot = 40, - /obj/item/weapon/computer_hardware/card_slot = 40, - /obj/item/weapon/computer_hardware/network_card/advanced = 40 + /obj/item/stock_parts/console_screen = 80, + /obj/item/stock_parts/capacitor = 60, + /obj/item/stock_parts/capacitor = 60, + /obj/item/computer_hardware/processor_unit = 40, + /obj/item/computer_hardware/processor_unit/photonic = 40, + /obj/item/computer_hardware/card_slot = 40, + /obj/item/computer_hardware/card_slot = 40, + /obj/item/computer_hardware/network_card/advanced = 40 ) @@ -407,12 +407,12 @@ icon_state = "slot1" salvageable_parts = list( /obj/item/stack/cable_coil{amount = 5} = 90, - /obj/item/weapon/stock_parts/console_screen = 90, + /obj/item/stock_parts/console_screen = 90, /obj/item/stack/cable_coil{amount = 5} = 90, /obj/item/stack/material/glass{amount = 5} = 90, - /obj/item/weapon/stock_parts/capacitor = 60, - /obj/item/weapon/stock_parts/capacitor = 60, - /obj/item/weapon/computer_hardware/network_card/advanced = 40 + /obj/item/stock_parts/capacitor = 60, + /obj/item/stock_parts/capacitor = 60, + /obj/item/computer_hardware/network_card/advanced = 40 ) /obj/structure/salvageable/slotmachine2 @@ -420,10 +420,10 @@ icon_state = "slot2" salvageable_parts = list( /obj/item/stack/cable_coil{amount = 5} = 90, - /obj/item/weapon/stock_parts/console_screen = 90, + /obj/item/stock_parts/console_screen = 90, /obj/item/stack/cable_coil{amount = 5} = 90, /obj/item/stack/material/glass{amount = 5} = 90, - /obj/item/weapon/stock_parts/capacitor = 60, - /obj/item/weapon/stock_parts/capacitor = 60, - /obj/item/weapon/computer_hardware/network_card/advanced = 40 + /obj/item/stock_parts/capacitor = 60, + /obj/item/stock_parts/capacitor = 60, + /obj/item/computer_hardware/network_card/advanced = 40 ) diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index ef02fc7047d..062e4b2b601 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -1644,7 +1644,7 @@ /obj/structure/sign/flag/attackby(obj/item/W, mob/user) ..() - if(istype(W, /obj/item/weapon/flame/lighter) || istype(W, /obj/item/weapon/weldingtool)) + if(istype(W, /obj/item/flame/lighter) || istype(W, /obj/item/weldingtool)) visible_message(SPAN_WARNING("\The [user] starts to burn \the [src] down!")) if(!do_after(user, 2 SECONDS)) return FALSE diff --git a/code/game/objects/structures/simple_doors.dm b/code/game/objects/structures/simple_doors.dm index 44c241ae7f4..64f1392111a 100644 --- a/code/game/objects/structures/simple_doors.dm +++ b/code/game/objects/structures/simple_doors.dm @@ -152,10 +152,10 @@ else icon_state = material.door_icon_base -/obj/structure/simple_door/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/simple_door/attackby(obj/item/W as obj, mob/user as mob) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - if(istype(W,/obj/item/weapon/simple_key)) - var/obj/item/weapon/simple_key/key = W + if(istype(W,/obj/item/simple_key)) + var/obj/item/simple_key/key = W if(state) to_chat(user,"\The [src] must be closed in order for you to lock it.") else if(key.key_id != src.lock_id) @@ -165,13 +165,13 @@ locked = !locked playsound(src, keysound,100, 1) return - if(istype(W,/obj/item/weapon/pickaxe) && breakable) - var/obj/item/weapon/pickaxe/digTool = W + if(istype(W,/obj/item/pickaxe) && breakable) + var/obj/item/pickaxe/digTool = W visible_message("[user] starts digging [src]!") if(do_after(user,digTool.digspeed*hardness) && src) visible_message("[user] finished digging [src]!") Dismantle() - else if(istype(W,/obj/item/weapon) && breakable) //not sure, can't not just weapons get passed to this proc? + else if(istype(W,/obj/item) && breakable) //not sure, can't not just weapons get passed to this proc? hardness -= W.force/10 visible_message("[user] hits [src] with [W]!") if(material == get_material_by_name("resin")) @@ -182,7 +182,7 @@ playsound(src, 'sound/weapons/smash.ogg', 50, 1) CheckHardness() else if(W.has_tool_quality(TOOL_WELDER) && breakable) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(material.ignition_point && WT.remove_fuel(0, user)) TemperatureAct(150) else diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index b0d9a6bed8c..ac52341e59b 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -73,7 +73,7 @@ src.add_fingerprint(user) return -/obj/structure/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/bed/nest/attackby(obj/item/W as obj, mob/user as mob) var/aforce = W.force health = max(0, health - aforce) playsound(src, 'sound/effects/attackblob.ogg', 100, 1) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 4c0a3aea4e0..75f7d88b9c6 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -87,7 +87,7 @@ qdel(src) return -/obj/structure/bed/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/bed/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) playsound(src, W.usesound, 50, 1) dismantle() @@ -127,15 +127,15 @@ playsound(src, W.usesound, 100, 1) remove_padding() - else if(istype(W, /obj/item/weapon/disk) || (istype(W, /obj/item/toy/plushie))) + else if(istype(W, /obj/item/disk) || (istype(W, /obj/item/toy/plushie))) user.drop_from_inventory(W, get_turf(src)) W.pixel_x = 10 //make sure they reach the pillow W.pixel_y = -6 - if(istype(W, /obj/item/weapon/disk)) + if(istype(W, /obj/item/disk)) user.visible_message("[src] sleeps soundly. Sleep tight, disky.") - else if(istype(W, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = W + else if(istype(W, /obj/item/grab)) + var/obj/item/grab/G = W var/mob/living/affecting = G.affecting if(has_buckled_mobs()) //Handles trying to buckle someone else to a chair when someone else is on it to_chat(user, "\The [src] already has someone buckled to it.") @@ -218,7 +218,7 @@ /obj/structure/bed/roller/update_icon() return -/obj/structure/bed/roller/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/bed/roller/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH) || istype(W,/obj/item/stack) || W.has_tool_quality(TOOL_WIRECUTTER)) return else if(istype(W,/obj/item/roller_holder)) @@ -251,7 +251,7 @@ R.add_fingerprint(user) qdel(src) -/obj/item/roller/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/roller/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/roller_holder)) var/obj/item/roller_holder/RH = W @@ -351,7 +351,7 @@ /obj/structure/bed/alien/update_icon() return // Doesn't care about material or anything else. -/obj/structure/bed/alien/attackby(obj/item/weapon/W, mob/user) +/obj/structure/bed/alien/attackby(obj/item/W, mob/user) return // No deconning. /* @@ -368,7 +368,7 @@ buckle_dir = SOUTH buckle_lying = 1 -/obj/structure/dirtybed/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/dirtybed/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) playsound(src, W.usesound, 100, 1) if(anchored) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index afc64143107..4c7845da08c 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -13,7 +13,7 @@ ..() update_layer() -/obj/structure/bed/chair/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/bed/chair/attackby(obj/item/W as obj, mob/user as mob) ..() if(!padding_material && istype(W, /obj/item/assembly/shock_kit)) var/obj/item/assembly/shock_kit/SK = W @@ -206,7 +206,7 @@ /obj/structure/bed/chair/office/update_icon() return -/obj/structure/bed/chair/office/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/bed/chair/office/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/stack) || W.has_tool_quality(TOOL_WIRECUTTER)) return ..() @@ -272,7 +272,7 @@ /obj/structure/bed/chair/wood/update_icon() return -/obj/structure/bed/chair/wood/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/bed/chair/wood/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/stack) || W.has_tool_quality(TOOL_WIRECUTTER)) return ..() diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index afd8fb13b28..921f8def016 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -1,7 +1,7 @@ //Todo: add leather and cloth for arbitrary coloured stools. var/global/list/stool_cache = list() //haha stool -/obj/item/weapon/stool +/obj/item/stool name = "stool" desc = "Apply butt." icon = 'icons/obj/furniture_vr.dmi' //VOREStation Edit - new Icons @@ -15,10 +15,10 @@ var/global/list/stool_cache = list() //haha stool var/datum/material/material var/datum/material/padding_material -/obj/item/weapon/stool/padded +/obj/item/stool/padded icon_state = "stool_padded_preview" //set for the map -/obj/item/weapon/stool/New(var/newloc, var/new_material, var/new_padding_material) +/obj/item/stool/New(var/newloc, var/new_material, var/new_padding_material) ..(newloc) if(!new_material) new_material = MAT_STEEL @@ -31,10 +31,10 @@ var/global/list/stool_cache = list() //haha stool force = round(material.get_blunt_damage()*0.4) update_icon() -/obj/item/weapon/stool/padded/New(var/newloc, var/new_material) +/obj/item/stool/padded/New(var/newloc, var/new_material) ..(newloc, "steel", "carpet") -/obj/item/weapon/stool/update_icon() +/obj/item/stool/update_icon() // Prep icon. icon_state = "" cut_overlays() @@ -61,17 +61,17 @@ var/global/list/stool_cache = list() //haha stool name = "[material.display_name] [initial(name)]" desc = "A stool. Apply butt with care. It's made of [material.use_name]." -/obj/item/weapon/stool/proc/add_padding(var/padding_type) +/obj/item/stool/proc/add_padding(var/padding_type) padding_material = get_material_by_name(padding_type) update_icon() -/obj/item/weapon/stool/proc/remove_padding() +/obj/item/stool/proc/remove_padding() if(padding_material) padding_material.place_sheet(get_turf(src), 1) padding_material = null update_icon() -/obj/item/weapon/stool/attack(mob/M as mob, mob/user as mob) +/obj/item/stool/attack(mob/M as mob, mob/user as mob) if (prob(5) && istype(M,/mob/living)) user.visible_message("[user] breaks [src] over [M]'s back!") user.setClickCooldown(user.get_attack_speed()) @@ -88,7 +88,7 @@ var/global/list/stool_cache = list() //haha stool return ..() -/obj/item/weapon/stool/ex_act(severity) +/obj/item/stool/ex_act(severity) switch(severity) if(1.0) qdel(src) @@ -102,14 +102,14 @@ var/global/list/stool_cache = list() //haha stool qdel(src) return -/obj/item/weapon/stool/proc/dismantle() +/obj/item/stool/proc/dismantle() if(material) material.place_sheet(get_turf(src), 1) if(padding_material) padding_material.place_sheet(get_turf(src), 1) qdel(src) -/obj/item/weapon/stool/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/stool/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) playsound(src, W.usesound, 50, 1) dismantle() diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm b/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm index c1f55061397..5c6bf02dcd7 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/stool/baystool +/obj/item/stool/baystool name = "bar stool" desc = "Apply butt." icon = 'icons/obj/furniture_vr.dmi' //VOREStation Edit - new Icons @@ -11,8 +11,8 @@ base_icon = "bar_stool_base" anchored = TRUE -/obj/item/weapon/stool/baystool/padded +/obj/item/stool/baystool/padded icon_state = "bar_stool_padded_preview" //set for the map -/obj/item/weapon/stool/baystool/padded/New(var/newloc, var/new_material) +/obj/item/stool/baystool/padded/New(var/newloc, var/new_material) ..(newloc, "steel", "carpet") diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 3214128eecd..fb74bfbf779 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -54,7 +54,7 @@ for(var/mob/living/L as anything in buckled_mobs) L.set_dir(dir) -/obj/structure/bed/chair/wheelchair/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/bed/chair/wheelchair/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH) || W.has_tool_quality(TOOL_WIRECUTTER) || istype(W,/obj/item/stack)) return ..() diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index e4fd0a5141a..3e5c9633964 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -22,9 +22,9 @@ /obj/structure/dispenser/Initialize() . = ..() for(var/i in 1 to oxygentanks) - new /obj/item/weapon/tank/oxygen(src) + new /obj/item/tank/oxygen(src) for(var/i in 1 to phorontanks) - new /obj/item/weapon/tank/phoron(src) + new /obj/item/tank/phoron(src) update_icon() /obj/structure/dispenser/update_icon() @@ -63,12 +63,12 @@ /obj/structure/dispenser/attackby(obj/item/I, mob/user) var/full - if(istype(I, /obj/item/weapon/tank/oxygen) || istype(I, /obj/item/weapon/tank/air) || istype(I, /obj/item/weapon/tank/anesthetic)) + if(istype(I, /obj/item/tank/oxygen) || istype(I, /obj/item/tank/air) || istype(I, /obj/item/tank/anesthetic)) if(oxygentanks < TANK_DISPENSER_CAPACITY) oxygentanks++ else full = TRUE - else if(istype(I, /obj/item/weapon/tank/phoron)) + else if(istype(I, /obj/item/tank/phoron)) if(phorontanks < TANK_DISPENSER_CAPACITY) phorontanks++ else @@ -103,16 +103,16 @@ return switch(action) if("plasma") - var/obj/item/weapon/tank/phoron/tank = locate() in src + var/obj/item/tank/phoron/tank = locate() in src if(tank && Adjacent(usr)) usr.put_in_hands(tank) phorontanks-- . = TRUE playsound(src, 'sound/items/drop/gascan.ogg', 100, 1, 1) if("oxygen") - var/obj/item/weapon/tank/tank = null - for(var/obj/item/weapon/tank/T in src) - if(istype(T, /obj/item/weapon/tank/oxygen) || istype(T, /obj/item/weapon/tank/air) || istype(T, /obj/item/weapon/tank/anesthetic)) + var/obj/item/tank/tank = null + for(var/obj/item/tank/T in src) + if(istype(T, /obj/item/tank/oxygen) || istype(T, /obj/item/tank/air) || istype(T, /obj/item/tank/anesthetic)) tank = T break if(tank && Adjacent(usr)) diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index b88bb76d57f..44ae7781ec4 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -18,13 +18,13 @@ //These are types that can only spawn once, and then will be removed from this list. //Alpha and beta lists are in their respective procs. var/global/list/unique_gamma = list( - /obj/item/device/perfect_tele, - /obj/item/weapon/bluespace_harpoon, + /obj/item/perfect_tele, + /obj/item/bluespace_harpoon, /obj/item/clothing/glasses/thermal/syndi, - /obj/item/weapon/gun/energy/netgun, - /obj/item/weapon/gun/projectile/dartgun, + /obj/item/gun/energy/netgun, + /obj/item/gun/projectile/dartgun, /obj/item/clothing/gloves/black/bloodletter, - /obj/item/weapon/gun/energy/mouseray/metamorphosis + /obj/item/gun/energy/mouseray/metamorphosis ) var/global/list/allocated_gamma = list() @@ -179,9 +179,9 @@ /obj/structure/trash_pile/proc/produce_alpha_item() var/path = pick(prob(5);/obj/item/clothing/gloves/rainbow, prob(5);/obj/item/clothing/gloves/white, - prob(5);/obj/item/weapon/storage/backpack, - prob(5);/obj/item/weapon/storage/backpack/satchel/norm, - prob(5);/obj/item/weapon/storage/box, + prob(5);/obj/item/storage/backpack, + prob(5);/obj/item/storage/backpack/satchel/norm, + prob(5);/obj/item/storage/box, // prob(5);/obj/random/cigarettes, prob(4);/obj/item/broken_device/random, prob(4);/obj/item/clothing/head/hardhat, @@ -193,12 +193,12 @@ prob(4);/obj/item/clothing/suit/storage/hazardvest, prob(4);/obj/item/clothing/under/color/grey, prob(4);/obj/item/clothing/suit/caution, - prob(4);/obj/item/weapon/cell, - prob(4);/obj/item/weapon/cell/device, - prob(4);/obj/item/weapon/reagent_containers/food/snacks/liquidfood, - prob(4);/obj/item/weapon/spacecash/c1, - prob(4);/obj/item/weapon/storage/backpack/satchel, - prob(4);/obj/item/weapon/storage/briefcase, + prob(4);/obj/item/cell, + prob(4);/obj/item/cell/device, + prob(4);/obj/item/reagent_containers/food/snacks/liquidfood, + prob(4);/obj/item/spacecash/c1, + prob(4);/obj/item/storage/backpack/satchel, + prob(4);/obj/item/storage/briefcase, prob(3);/obj/item/clothing/accessory/storage/webbing, prob(3);/obj/item/clothing/glasses/meson, prob(3);/obj/item/clothing/gloves/botanic_leather, @@ -212,17 +212,17 @@ prob(3);/obj/item/clothing/suit/storage/toggle/hoodie/red, prob(3);/obj/item/clothing/suit/storage/toggle/hoodie/yellow, prob(3);/obj/item/clothing/suit/storage/toggle/leather_jacket, - prob(3);/obj/item/device/pda, - prob(3);/obj/item/device/radio/headset, - prob(3);/obj/item/weapon/camera_assembly, + prob(3);/obj/item/pda, + prob(3);/obj/item/radio/headset, + prob(3);/obj/item/camera_assembly, prob(3);/obj/item/clothing/head/cone, - prob(3);/obj/item/weapon/cell/high, - prob(3);/obj/item/weapon/spacecash/c10, - prob(3);/obj/item/weapon/spacecash/c20, - prob(3);/obj/item/weapon/storage/backpack/dufflebag, - prob(3);/obj/item/weapon/storage/box/donkpockets, - prob(3);/obj/item/weapon/storage/box/mousetraps, - prob(3);/obj/item/weapon/storage/wallet, + prob(3);/obj/item/cell/high, + prob(3);/obj/item/spacecash/c10, + prob(3);/obj/item/spacecash/c20, + prob(3);/obj/item/storage/backpack/dufflebag, + prob(3);/obj/item/storage/box/donkpockets, + prob(3);/obj/item/storage/box/mousetraps, + prob(3);/obj/item/storage/wallet, prob(2);/obj/item/clothing/glasses/meson/prescription, prob(2);/obj/item/clothing/gloves/fyellow, prob(2);/obj/item/clothing/gloves/sterile/latex, @@ -232,16 +232,16 @@ prob(2);/obj/item/clothing/under/pants/camo, prob(2);/obj/item/clothing/under/syndicate/tacticool, prob(2);/obj/item/clothing/under/hyperfiber, - prob(2);/obj/item/device/camera, - prob(2);/obj/item/device/flashlight/flare, - prob(2);/obj/item/device/flashlight/glowstick, - prob(2);/obj/item/device/flashlight/glowstick/blue, - prob(2);/obj/item/weapon/card/emag_broken, - prob(2);/obj/item/weapon/cell/super, + prob(2);/obj/item/camera, + prob(2);/obj/item/flashlight/flare, + prob(2);/obj/item/flashlight/glowstick, + prob(2);/obj/item/flashlight/glowstick/blue, + prob(2);/obj/item/card/emag_broken, + prob(2);/obj/item/cell/super, prob(2);/obj/item/poster, - prob(2);/obj/item/weapon/reagent_containers/glass/rag, - prob(2);/obj/item/weapon/storage/box/sinpockets, - prob(2);/obj/item/weapon/storage/secure/briefcase, + prob(2);/obj/item/reagent_containers/glass/rag, + prob(2);/obj/item/storage/box/sinpockets, + prob(2);/obj/item/storage/secure/briefcase, prob(2);/obj/item/clothing/under/fluff/latexmaid, prob(2);/obj/item/toy/tennis, prob(2);/obj/item/toy/tennis/red, @@ -251,8 +251,8 @@ prob(2);/obj/item/toy/tennis/blue, prob(2);/obj/item/toy/tennis/purple, prob(1);/obj/item/toy/baseball, - prob(1);/obj/item/weapon/storage/box/brainzsnax, - prob(1);/obj/item/weapon/storage/box/brainzsnax/red, + prob(1);/obj/item/storage/box/brainzsnax, + prob(1);/obj/item/storage/box/brainzsnax/red, prob(1);/obj/item/clothing/glasses/sunglasses, prob(1);/obj/item/clothing/glasses/sunglasses/bigshot, prob(1);/obj/item/clothing/glasses/welding, @@ -265,65 +265,65 @@ prob(1);/obj/item/clothing/under/harness, prob(1);/obj/item/clothing/under/tactical, prob(1);/obj/item/clothing/suit/armor/material/makeshift, - prob(1);/obj/item/device/flashlight/glowstick/orange, - prob(1);/obj/item/device/flashlight/glowstick/red, - prob(1);/obj/item/device/flashlight/glowstick/yellow, - prob(1);/obj/item/device/flashlight/pen, - prob(1);/obj/item/device/paicard, + prob(1);/obj/item/flashlight/glowstick/orange, + prob(1);/obj/item/flashlight/glowstick/red, + prob(1);/obj/item/flashlight/glowstick/yellow, + prob(1);/obj/item/flashlight/pen, + prob(1);/obj/item/paicard, prob(1);/obj/item/clothing/accessory/permit/gun, prob(1);/obj/item/clothing/mask/gas/voice, - prob(1);/obj/item/weapon/spacecash/c100, - prob(1);/obj/item/weapon/spacecash/c50, - prob(1);/obj/item/weapon/storage/backpack/dufflebag/syndie, - prob(1);/obj/item/weapon/storage/box/cups, + prob(1);/obj/item/spacecash/c100, + prob(1);/obj/item/spacecash/c50, + prob(1);/obj/item/storage/backpack/dufflebag/syndie, + prob(1);/obj/item/storage/box/cups, prob(1);/obj/item/pizzavoucher) var/obj/item/I = new path() return I /obj/structure/trash_pile/proc/produce_beta_item() - var/path = pick(prob(6);/obj/item/weapon/storage/pill_bottle/paracetamol, - prob(4);/obj/item/weapon/storage/pill_bottle/happy, - prob(4);/obj/item/weapon/storage/pill_bottle/zoom, + var/path = pick(prob(6);/obj/item/storage/pill_bottle/paracetamol, + prob(4);/obj/item/storage/pill_bottle/happy, + prob(4);/obj/item/storage/pill_bottle/zoom, prob(4);/obj/item/seeds/ambrosiavulgarisseed, - prob(4);/obj/item/weapon/gun/energy/sizegun, - prob(4);/obj/item/device/slow_sizegun, + prob(4);/obj/item/gun/energy/sizegun, + prob(4);/obj/item/slow_sizegun, prob(4);/obj/item/clothing/accessory/collar/shock/bluespace, - prob(3);/obj/item/weapon/cracker, - prob(3);/obj/item/weapon/material/butterfly, - prob(3);/obj/item/weapon/material/butterfly/switchblade, + prob(3);/obj/item/cracker, + prob(3);/obj/item/material/butterfly, + prob(3);/obj/item/material/butterfly/switchblade, prob(3);/obj/item/clothing/gloves/knuckledusters, prob(3);/obj/item/clothing/gloves/heavy_engineer, - prob(3);/obj/item/weapon/reagent_containers/syringe/drugs, - prob(2);/obj/item/weapon/implanter/sizecontrol, - prob(2);/obj/item/weapon/handcuffs/fuzzy, - prob(2);/obj/item/weapon/handcuffs/legcuffs/fuzzy, - prob(2);/obj/item/weapon/storage/box/syndie_kit/spy, - prob(2);/obj/item/weapon/grenade/anti_photon, + prob(3);/obj/item/reagent_containers/syringe/drugs, + prob(2);/obj/item/implanter/sizecontrol, + prob(2);/obj/item/handcuffs/fuzzy, + prob(2);/obj/item/handcuffs/legcuffs/fuzzy, + prob(2);/obj/item/storage/box/syndie_kit/spy, + prob(2);/obj/item/grenade/anti_photon, prob(2);/obj/item/clothing/under/hyperfiber/bluespace, prob(2);/obj/item/selectable_item/chemistrykit/size, prob(2);/obj/item/selectable_item/chemistrykit/gender, prob(2);/obj/item/clothing/gloves/bluespace/emagged, prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc, - prob(1);/obj/item/device/nif/bad, - prob(1);/obj/item/device/radio_jammer, - prob(1);/obj/item/device/sleevemate, - prob(1);/obj/item/device/bodysnatcher, - prob(1);/obj/item/weapon/beartrap, - prob(1);/obj/item/weapon/cell/hyper/empty, - prob(1);/obj/item/weapon/disk/nifsoft/compliance, - prob(1);/obj/item/weapon/implanter/compliance, - prob(1);/obj/item/weapon/material/knife/tacknife, - prob(1);/obj/item/weapon/storage/box/survival/space, - prob(1);/obj/item/weapon/storage/secure/briefcase/trashmoney, - prob(1);/obj/item/device/survivalcapsule/popcabin, - prob(1);/obj/item/weapon/reagent_containers/syringe/steroid, + prob(1);/obj/item/nif/bad, + prob(1);/obj/item/radio_jammer, + prob(1);/obj/item/sleevemate, + prob(1);/obj/item/bodysnatcher, + prob(1);/obj/item/beartrap, + prob(1);/obj/item/cell/hyper/empty, + prob(1);/obj/item/disk/nifsoft/compliance, + prob(1);/obj/item/implanter/compliance, + prob(1);/obj/item/material/knife/tacknife, + prob(1);/obj/item/storage/box/survival/space, + prob(1);/obj/item/storage/secure/briefcase/trashmoney, + prob(1);/obj/item/survivalcapsule/popcabin, + prob(1);/obj/item/reagent_containers/syringe/steroid, prob(1);/obj/item/capture_crystal, - prob(1);/obj/item/device/perfect_tele/one_beacon, + prob(1);/obj/item/perfect_tele/one_beacon, prob(1);/obj/item/clothing/gloves/bluespace, - prob(1);/obj/item/weapon/gun/energy/mouseray, + prob(1);/obj/item/gun/energy/mouseray, prob(1);/obj/item/clothing/accessory/collar/shock/bluespace/modified, - prob(1);/obj/item/weapon/gun/energy/sizegun/backfire) + prob(1);/obj/item/gun/energy/sizegun/backfire) var/obj/item/I = new path() return I diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 5a26c3cef9e..a82e045dbee 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -53,9 +53,9 @@ update_icon() return - if(istype(I, /obj/item/weapon/grab)) + if(istype(I, /obj/item/grab)) user.setClickCooldown(user.get_attack_speed(I)) - var/obj/item/weapon/grab/G = I + var/obj/item/grab/G = I if(isliving(G.affecting)) var/mob/living/GM = G.affecting @@ -99,9 +99,9 @@ return /obj/structure/toilet/prison/attackby(obj/item/I, mob/living/user) - if(istype(I, /obj/item/weapon/grab)) + if(istype(I, /obj/item/grab)) user.setClickCooldown(user.get_attack_speed(I)) - var/obj/item/weapon/grab/G = I + var/obj/item/grab/G = I if(isliving(G.affecting)) var/mob/living/GM = G.affecting @@ -133,8 +133,8 @@ anchored = TRUE /obj/structure/urinal/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = I + if(istype(I, /obj/item/grab)) + var/obj/item/grab/G = I if(isliving(G.affecting)) var/mob/living/GM = G.affecting if(G.state>1) @@ -198,7 +198,7 @@ soundloop.stop() /obj/machinery/shower/attackby(obj/item/I as obj, mob/user as mob) - if(I.type == /obj/item/device/analyzer) + if(I.type == /obj/item/analyzer) to_chat(user, "The water temperature seems to be [watertemp].") if(I.has_tool_quality(TOOL_WRENCH)) var/newtemp = tgui_input_list(user, "What setting would you like to set the temperature valve to?", "Water Temperature Valve", temperature_settings) @@ -290,7 +290,7 @@ else if(temperature <= H.species.cold_level_1) to_chat(H, "The water is freezing cold!") -/obj/item/weapon/bikehorn/rubberducky +/obj/item/bikehorn/rubberducky name = "rubber ducky" desc = "Rubber ducky you're so fine, you make bathtime lots of fuuun. Rubber ducky I'm awfully fooooond of yooooouuuu~" //thanks doohl icon = 'icons/obj/watercloset.dmi' @@ -303,7 +303,7 @@ honk_sound = 'sound/voice/quack.ogg' //VOREStation edit var/honk_text = 0 -/obj/item/weapon/bikehorn/rubberducky/attack_self(mob/user as mob) +/obj/item/bikehorn/rubberducky/attack_self(mob/user as mob) if(spam_flag == 0) spam_flag = 1 playsound(src, honk_sound, 50, 1) @@ -316,7 +316,7 @@ //Admin spawn duckies -/obj/item/weapon/bikehorn/rubberducky/red +/obj/item/bikehorn/rubberducky/red name = "rubber ducky" desc = "From the depths of hell it arose, feathers glistening with crimson, a honk that struck fear into all men." //thanks doohl icon = 'icons/obj/watercloset.dmi' @@ -325,7 +325,7 @@ honk_sound = 'sound/effects/adminhelp.ogg' var/honk_count = 0 -/obj/item/weapon/bikehorn/rubberducky/red/attack_self(mob/user as mob) +/obj/item/bikehorn/rubberducky/red/attack_self(mob/user as mob) if(honk_count >= 3) var/turf/epicenter = src.loc explosion(epicenter, 0, 0, 1, 3) @@ -342,7 +342,7 @@ spam_flag = 0 return -/obj/item/weapon/bikehorn/rubberducky/blue +/obj/item/bikehorn/rubberducky/blue name = "rubber ducky" desc = "The see me rollin', they hatin'." //thanks doohl icon = 'icons/obj/watercloset.dmi' @@ -351,7 +351,7 @@ honk_sound = 'sound/effects/bubbles.ogg' var/honk_count = 0 -/obj/item/weapon/bikehorn/rubberducky/blue/attack_self(mob/user as mob) +/obj/item/bikehorn/rubberducky/blue/attack_self(mob/user as mob) if(spam_flag == 0) var/turf/simulated/whereweare = get_turf(src) whereweare.wet_floor(2) @@ -364,7 +364,7 @@ spam_flag = 0 return -/obj/item/weapon/bikehorn/rubberducky/pink +/obj/item/bikehorn/rubberducky/pink name = "rubber ducky" desc = "It's extra squishy!" icon = 'icons/obj/watercloset.dmi' @@ -373,7 +373,7 @@ honk_sound = 'sound/vore/sunesound/pred/insertion_01.ogg' var/honk_count = 0 -/obj/item/weapon/bikehorn/rubberducky/pink/attack_self(mob/user as mob) +/obj/item/bikehorn/rubberducky/pink/attack_self(mob/user as mob) if(spam_flag == 0) if(!user.devourable) to_chat(user, "You can't bring yourself to squeeze it...") @@ -390,11 +390,11 @@ spam_flag = 0 return -/obj/item/weapon/bikehorn/rubberducky/pink/container_resist(var/mob/living/escapee) +/obj/item/bikehorn/rubberducky/pink/container_resist(var/mob/living/escapee) escapee.forceMove(get_turf(src)) to_chat(escapee, "You managed to crawl out of the rubber ducky!") -/obj/item/weapon/bikehorn/rubberducky/grey +/obj/item/bikehorn/rubberducky/grey name = "rubber ducky" desc = "There's something otherworldly about this particular duck..." icon = 'icons/obj/watercloset.dmi' @@ -403,7 +403,7 @@ honk_sound = 'sound/effects/ghost.ogg' var/honk_count = 0 -/obj/item/weapon/bikehorn/rubberducky/grey/attack_self(mob/user as mob) +/obj/item/bikehorn/rubberducky/grey/attack_self(mob/user as mob) if(spam_flag == 0) for(var/obj/machinery/light/L in machines) if(L.z != user.z || get_dist(user,L) > 10) @@ -420,7 +420,7 @@ src.forceMove(T) return -/obj/item/weapon/bikehorn/rubberducky/green +/obj/item/bikehorn/rubberducky/green name = "rubber ducky" desc = "Like a true Nature’s child, we were born, born to be wild." icon = 'icons/obj/watercloset.dmi' @@ -445,7 +445,7 @@ /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/fullgrass) -/obj/item/weapon/bikehorn/rubberducky/green/attack_self(mob/user as mob) +/obj/item/bikehorn/rubberducky/green/attack_self(mob/user as mob) if(spam_flag == 0) var/turf/simulated/whereweare = get_turf(src) var/obj/P = pick(flora) @@ -459,7 +459,7 @@ spam_flag = 0 return -/obj/item/weapon/bikehorn/rubberducky/white +/obj/item/bikehorn/rubberducky/white name = "rubber ducky" desc = "It's so full of energy, such a happy little guy, I just wanna give him a squeeze." //thanks doohl icon = 'icons/obj/watercloset.dmi' @@ -468,7 +468,7 @@ honk_sound = 'sound/effects/lightningshock.ogg' var/honk_count = 0 -/obj/item/weapon/bikehorn/rubberducky/white/attack_self(mob/user as mob) +/obj/item/bikehorn/rubberducky/white/attack_self(mob/user as mob) if(spam_flag == 0) lightning_strike(get_turf(src), 1) spam_flag = 1 @@ -481,7 +481,7 @@ qdel(src) return -/obj/item/weapon/grenade/anti_photon/rubberducky/black +/obj/item/grenade/anti_photon/rubberducky/black desc = "Good work NanoTrasen Employee, you struck fear within the Syndicate." name = "rubber ducky" icon = 'icons/obj/watercloset.dmi' @@ -490,7 +490,7 @@ det_time = 20 var/honk_text = 0 -/obj/item/weapon/grenade/anti_photon/rubberducky/black/detonate() +/obj/item/grenade/anti_photon/rubberducky/black/detonate() playsound(src, 'sound/voice/quack.ogg', 50, 1, 5) set_light(10, -10, "#FFFFFF") @@ -570,15 +570,15 @@ to_chat(user, "Someone's already washing here.") return - var/obj/item/weapon/reagent_containers/RG = O + var/obj/item/reagent_containers/RG = O if (istype(RG) && RG.is_open_container()) RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) user.visible_message("[user] fills \the [RG] using \the [src].","You fill \the [RG] using \the [src].") playsound(src, 'sound/effects/sink.ogg', 75, 1) return 1 - else if (istype(O, /obj/item/weapon/melee/baton)) - var/obj/item/weapon/melee/baton/B = O + else if (istype(O, /obj/item/melee/baton)) + var/obj/item/melee/baton/B = O if(B.bcell) if(B.bcell.charge > 0 && B.status == 1) flick("baton_active", src) @@ -595,7 +595,7 @@ "[user] was stunned by [TU.his] wet [O]!", \ "[user] was stunned by [TU.his] wet [O]!") return 1 - else if(istype(O, /obj/item/weapon/mop)) + else if(istype(O, /obj/item/mop)) O.reagents.add_reagent("water", 5) to_chat(user, "You wet \the [O] in \the [src].") playsound(src, 'sound/effects/slosh.ogg', 25, 1) diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index e251aa38c3a..6648036341c 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -18,7 +18,7 @@ dir = NORTH w_class = ITEMSIZE_NORMAL - var/obj/item/weapon/airlock_electronics/electronics = null + var/obj/item/airlock_electronics/electronics = null var/created_name = null //Vars to help with the icon's name @@ -76,19 +76,19 @@ update_state() /obj/structure/windoor_assembly/attack_robot(mob/living/silicon/robot/user) - if(Adjacent(user) && (user.module && (istype(user.module,/obj/item/weapon/robot_module/robot/engineering)) \ - || istype(user.module,/obj/item/weapon/robot_module/drone))) //Only drone (and engiborg) needs this. + if(Adjacent(user) && (user.module && (istype(user.module,/obj/item/robot_module/robot/engineering)) \ + || istype(user.module,/obj/item/robot_module/drone))) //Only drone (and engiborg) needs this. rename_door(user) /obj/structure/windoor_assembly/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/pen)) + if(istype(W, /obj/item/pen)) rename_door(user) return switch(state) if("01") if(W.has_tool_quality(TOOL_WELDER) && !anchored) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if (WT.remove_fuel(0,user)) user.visible_message("[user] disassembles the windoor assembly.", "You start to disassemble the windoor assembly.") playsound(src, WT.usesound, 50, 1) @@ -156,7 +156,7 @@ step = 0 //Adding airlock electronics for access. Step 6 complete. - else if(istype(W, /obj/item/weapon/airlock_electronics)) + else if(istype(W, /obj/item/airlock_electronics)) playsound(src, 'sound/items/Screwdriver.ogg', 100, 1) user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.") @@ -180,7 +180,7 @@ if(!src || !src.electronics) return to_chat(user,"You've removed the airlock electronics!") step = 1 - var/obj/item/weapon/airlock_electronics/ae = electronics + var/obj/item/airlock_electronics/ae = electronics electronics = null ae.loc = src.loc @@ -189,7 +189,7 @@ if(!src.electronics) to_chat(usr,"The assembly is missing electronics.") return - if(src.electronics && istype(src.electronics, /obj/item/weapon/circuitboard/broken)) + if(src.electronics && istype(src.electronics, /obj/item/circuitboard/broken)) to_chat(usr,"The assembly has broken airlock electronics.") return usr << browse(null, "window=windoor_access") //Not sure what this actually does... -Ner diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 1e40f249646..22c312c3fa6 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -19,7 +19,7 @@ var/state = 2 var/reinf = 0 var/basestate - var/shardtype = /obj/item/weapon/material/shard + var/shardtype = /obj/item/material/shard var/glasstype = null // Set this in subtypes. Null is assumed strange or otherwise impossible to dismantle, such as for shuttle glass. var/silicate = 0 // number of units of silicate var/fulltile = FALSE // Set to true on full-tile variants. @@ -224,7 +224,7 @@ // Fixing. if(W.has_tool_quality(TOOL_WELDER) && user.a_intent == I_HELP) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(health < maxhealth) if(WT.remove_fuel(1 ,user)) to_chat(user, "You begin repairing [src]...") @@ -239,8 +239,8 @@ return // Slamming. - if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) - var/obj/item/weapon/grab/G = W + if (istype(W, /obj/item/grab) && get_dist(src,user)<2) + var/obj/item/grab/G = W if(istype(G.affecting,/mob/living)) var/mob/living/M = G.affecting var/state = G.state @@ -514,7 +514,7 @@ desc = "A borosilicate alloy window. It seems to be quite strong." basestate = "phoronwindow" icon_state = "phoronwindow" - shardtype = /obj/item/weapon/material/shard/phoron + shardtype = /obj/item/material/shard/phoron glasstype = /obj/item/stack/material/glass/phoronglass maximal_heat = T0C + 2000 damage_per_fire_tick = 1.0 @@ -532,7 +532,7 @@ desc = "A borosilicate alloy window, with rods supporting it. It seems to be very strong." basestate = "phoronrwindow" icon_state = "phoronrwindow" - shardtype = /obj/item/weapon/material/shard/phoron + shardtype = /obj/item/material/shard/phoron glasstype = /obj/item/stack/material/glass/phoronrglass reinf = 1 maximal_heat = T0C + 4000 @@ -603,8 +603,8 @@ flags = 0 /obj/structure/window/reinforced/polarized/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/device/multitool) && !anchored) // Only allow programming if unanchored! - var/obj/item/device/multitool/MT = W + if(istype(W, /obj/item/multitool) && !anchored) // Only allow programming if unanchored! + var/obj/item/multitool/MT = W // First check if they have a windowtint button buffered if(istype(MT.connectable, /obj/machinery/button/windowtint)) var/obj/machinery/button/windowtint/buffered_button = MT.connectable @@ -637,7 +637,7 @@ icon_state = "light0" desc = "A remote control switch for polarized windows." var/range = 7 - circuit = /obj/item/weapon/circuitboard/electrochromic + circuit = /obj/item/circuitboard/electrochromic /obj/machinery/button/windowtint/attack_hand(mob/user as mob) if(..()) @@ -670,8 +670,8 @@ return else if(alarm_deconstruction_wirecutters(user, W)) return - else if(istype(W, /obj/item/device/multitool)) - var/obj/item/device/multitool/MT = W + else if(istype(W, /obj/item/multitool)) + var/obj/item/multitool/MT = W if(!id) // If no ID is set yet (newly built button?) let them select an ID for first-time use! var/t = sanitizeSafe(tgui_input_text(user, "Enter an ID for \the [src].", src.name, null, MAX_NAME_LEN), MAX_NAME_LEN) @@ -686,7 +686,7 @@ return TRUE . = ..() -/obj/structure/window/rcd_values(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/obj/structure/window/rcd_values(mob/living/user, obj/item/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_DECONSTRUCT) return list( @@ -695,7 +695,7 @@ RCD_VALUE_COST = RCD_SHEETS_PER_MATTER_UNIT * 5 ) -/obj/structure/window/rcd_act(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/obj/structure/window/rcd_act(mob/living/user, obj/item/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_DECONSTRUCT) to_chat(user, span("notice", "You deconstruct \the [src].")) diff --git a/code/game/objects/structures/window_vr.dm b/code/game/objects/structures/window_vr.dm index 70e84705197..10b995766f0 100644 --- a/code/game/objects/structures/window_vr.dm +++ b/code/game/objects/structures/window_vr.dm @@ -4,7 +4,7 @@ basestate = "window" icon_state = "window" color = "#A7A3A6" - shardtype = /obj/item/weapon/material/shard/titaniumglass + shardtype = /obj/item/material/shard/titaniumglass glasstype = /obj/item/stack/material/glass/titanium reinf = 0 maximal_heat = T0C + 5000 @@ -23,7 +23,7 @@ basestate = "window" icon_state = "window" color = "#676366" - shardtype = /obj/item/weapon/material/shard/plastitaniumglass + shardtype = /obj/item/material/shard/plastitaniumglass glasstype = /obj/item/stack/material/glass/plastitanium reinf = 0 maximal_heat = T0C + 7000 diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm index cc9e2fa5c78..99190be8329 100644 --- a/code/game/objects/weapons.dm +++ b/code/game/objects/weapons.dm @@ -1,22 +1,22 @@ -/obj/item/weapon +/obj/item name = "weapon" icon = 'icons/obj/weapons.dmi' hitsound = "swing_hit" var/cleaving = FALSE // Used to avoid infinite cleaving. -/obj/item/weapon/Bump(mob/M as mob) +/obj/item/Bump(mob/M as mob) spawn(0) ..() return -/obj/item/weapon/melee +/obj/item/melee item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi', ) // Attacks mobs (atm only simple ones due to friendly fire issues) that are adjacent to the target and user. -/obj/item/weapon/proc/cleave(mob/living/user, atom/target) +/obj/item/proc/cleave(mob/living/user, atom/target) if(cleaving) return FALSE // We're busy. if(!target.Adjacent(user)) @@ -48,12 +48,12 @@ return hit_mobs > 0 // Returns TRUE if anything got hit. // This cannot go into afterattack since some mobs delete themselves upon dying. -/obj/item/weapon/material/pre_attack(mob/living/target, mob/living/user) +/obj/item/material/pre_attack(mob/living/target, mob/living/user) if(can_cleave && istype(target)) cleave(user, target) ..() // This is purely the visual effect of cleaving. -/obj/item/weapon/proc/cleave_visual(var/mob/living/user, var/mob/living/target) +/obj/item/proc/cleave_visual(var/mob/living/user, var/mob/living/target) var/obj/effect/temporary_effect/cleave_attack/E = new(get_turf(src)) E.dir = get_dir(user, target) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 426cc23ea41..41e30d068cb 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -109,7 +109,7 @@ /turf/simulated/floor/can_engrave() return (!flooring || flooring.can_engrave) -/turf/simulated/floor/rcd_values(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/turf/simulated/floor/rcd_values(mob/living/user, obj/item/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_FLOORWALL) // A wall costs four sheets to build (two for the grider and two for finishing it). @@ -147,7 +147,7 @@ return FALSE -/turf/simulated/floor/rcd_act(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/turf/simulated/floor/rcd_act(mob/living/user, obj/item/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_FLOORWALL) to_chat(user, span("notice", "You build a wall.")) diff --git a/code/game/turfs/simulated/floor_attackby.dm b/code/game/turfs/simulated/floor_attackby.dm index 49bd6bc2085..791de566155 100644 --- a/code/game/turfs/simulated/floor_attackby.dm +++ b/code/game/turfs/simulated/floor_attackby.dm @@ -3,7 +3,7 @@ if(!C || !user) return 0 - if(isliving(user) && istype(C, /obj/item/weapon)) + if(isliving(user) && istype(C, /obj/item)) var/mob/living/L = user if(L.a_intent != I_HELP) attack_tile(C, L) // Be on help intent if you want to decon something. @@ -65,7 +65,7 @@ // Floor has flooring set if(!is_plating()) - if(istype(C, /obj/item/weapon)) + if(istype(C, /obj/item)) try_deconstruct_tile(C, user) return else if(istype(C, /obj/item/stack/cable_coil)) @@ -130,7 +130,7 @@ return // Plating repairs and removal else if(C.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/welder = C.get_welder() + var/obj/item/weldingtool/welder = C.get_welder() if(welder.isOn()) // Needs repairs if(broken || burnt) @@ -159,7 +159,7 @@ return // Someone slapped down some flooring or cables or something do_remove_plating(C, user, base_type) -/turf/simulated/floor/proc/try_deconstruct_tile(obj/item/weapon/W as obj, mob/user as mob) +/turf/simulated/floor/proc/try_deconstruct_tile(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_CROWBAR)) if(broken || burnt) to_chat(user, "You remove the broken [flooring.descriptor].") @@ -186,7 +186,7 @@ make_plating(1) playsound(src, W.usesound, 80, 1) return 1 - else if(istype(W, /obj/item/weapon/shovel) && (flooring.flags & TURF_REMOVE_SHOVEL)) + else if(istype(W, /obj/item/shovel) && (flooring.flags & TURF_REMOVE_SHOVEL)) to_chat(user, "You shovel off the [flooring.descriptor].") make_plating(1) playsound(src, 'sound/items/Deconstruct.ogg', 80, 1) @@ -196,7 +196,7 @@ /turf/simulated/floor/proc/try_replace_tile(obj/item/stack/tile/T as obj, mob/user as mob) if(T.type == flooring.build_type) return - var/obj/item/weapon/W = user.is_holding_item_of_type(/obj/item/weapon) + var/obj/item/W = user.is_holding_item_of_type(/obj/item) if(!istype(W)) return if(!try_deconstruct_tile(W, user)) @@ -214,9 +214,9 @@ return FALSE return TRUE -/turf/simulated/floor/proc/do_remove_plating(obj/item/weapon/W, mob/user, base_type) +/turf/simulated/floor/proc/do_remove_plating(obj/item/W, mob/user, base_type) if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(!WT.remove_fuel(5,user)) to_chat(user, "You don't have enough fuel in [WT] finish cutting through [src].") return diff --git a/code/game/turfs/simulated/outdoors/outdoors.dm b/code/game/turfs/simulated/outdoors/outdoors.dm index 5587e963c63..12a59de3f2d 100644 --- a/code/game/turfs/simulated/outdoors/outdoors.dm +++ b/code/game/turfs/simulated/outdoors/outdoors.dm @@ -30,8 +30,8 @@ var/list/turf_edge_cache = list() /turf/simulated/floor/outdoors/proc/get_loot_type() if(loot_count && prob(60)) return pick( \ - 12;/obj/item/weapon/reagent_containers/food/snacks/worm, \ - 1;/obj/item/weapon/material/knife/machete/hatchet/stone \ + 12;/obj/item/reagent_containers/food/snacks/worm, \ + 1;/obj/item/material/knife/machete/hatchet/stone \ ) /turf/simulated/floor/outdoors/Initialize(mapload) @@ -41,8 +41,8 @@ var/list/turf_edge_cache = list() /turf/simulated/floor/outdoors/attackby(obj/item/C, mob/user) - if(can_dig && istype(C, /obj/item/weapon/shovel)) - var/obj/item/weapon/shovel/our_shovel = C + if(can_dig && istype(C, /obj/item/shovel)) + var/obj/item/shovel/our_shovel = C if(our_shovel.grave_mode) if(contents.len > 0) to_chat(user, SPAN_WARNING("You can't dig here!")) diff --git a/code/game/turfs/simulated/outdoors/snow.dm b/code/game/turfs/simulated/outdoors/snow.dm index 36f0f2b4439..424ae0dc288 100644 --- a/code/game/turfs/simulated/outdoors/snow.dm +++ b/code/game/turfs/simulated/outdoors/snow.dm @@ -29,7 +29,7 @@ add_overlay(image(icon = 'icons/turf/outdoors.dmi', icon_state = "snow_footprints", dir = text2num(d))) /turf/simulated/floor/outdoors/snow/attackby(var/obj/item/W, var/mob/user) - if(istype(W, /obj/item/weapon/shovel)) + if(istype(W, /obj/item/shovel)) to_chat(user, "You begin to remove \the [src] with your [W].") if(do_after(user, 4 SECONDS * W.toolspeed)) to_chat(user, "\The [src] has been dug up, and now lies in a pile nearby.") diff --git a/code/game/turfs/simulated/outdoors/survival_action_vr.dm b/code/game/turfs/simulated/outdoors/survival_action_vr.dm index 9f889594938..a94e111e5c2 100644 --- a/code/game/turfs/simulated/outdoors/survival_action_vr.dm +++ b/code/game/turfs/simulated/outdoors/survival_action_vr.dm @@ -46,7 +46,7 @@ var/static/list/has_rocks = list("dirt5", "dirt6", "dirt7", "dirt8", "dirt9") return /turf/simulated/floor/outdoors/attackby(var/obj/item/O as obj, var/mob/user as mob) - if(istype(O, /obj/item/weapon/shovel) && rock_chance) + if(istype(O, /obj/item/shovel) && rock_chance) rock_gathering(user) else return ..() diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm index 3118aa5e03e..04fc940b9a8 100644 --- a/code/game/turfs/simulated/wall_attacks.dm +++ b/code/game/turfs/simulated/wall_attacks.dm @@ -127,7 +127,7 @@ return success_smash(user) return fail_smash(user) -/turf/simulated/wall/attackby(var/obj/item/weapon/W, var/mob/user) +/turf/simulated/wall/attackby(var/obj/item/W, var/mob/user) user.setClickCooldown(user.get_attack_speed(W)) @@ -151,8 +151,8 @@ if(is_hot(W)) burn(is_hot(W)) - if(istype(W, /obj/item/device/electronic_assembly/wallmount)) - var/obj/item/device/electronic_assembly/wallmount/IC = W + if(istype(W, /obj/item/electronic_assembly/wallmount)) + var/obj/item/electronic_assembly/wallmount/IC = W IC.mount_assembly(src, user) return @@ -186,7 +186,7 @@ if(locate(/obj/effect/overlay/wallrot) in src) if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if( WT.remove_fuel(0,user) ) to_chat(user, "You burn away the fungi with \the [WT].") playsound(src, WT.usesound, 10, 1) @@ -201,17 +201,17 @@ //THERMITE related stuff. Calls src.thermitemelt() which handles melting simulated walls and the relevant effects if(thermite) if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if( WT.remove_fuel(0,user) ) thermitemelt(user) return - else if(istype(W, /obj/item/weapon/pickaxe/plasmacutter)) + else if(istype(W, /obj/item/pickaxe/plasmacutter)) thermitemelt(user) return - else if( istype(W, /obj/item/weapon/melee/energy/blade) ) - var/obj/item/weapon/melee/energy/blade/EB = W + else if( istype(W, /obj/item/melee/energy/blade) ) + var/obj/item/melee/energy/blade/EB = W EB.spark_system.start() to_chat(user, "You slash \the [src] with \the [EB]; the thermite ignites!") @@ -225,7 +225,7 @@ if(damage && W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(!WT.isOn()) return @@ -251,7 +251,7 @@ var/dismantle_sound if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(!WT.isOn()) return if(!WT.remove_fuel(0,user)) @@ -260,13 +260,13 @@ dismantle_verb = "cutting" dismantle_sound = W.usesound // cut_delay *= 0.7 // Tools themselves now can shorten the time it takes. - else if(istype(W,/obj/item/weapon/melee/energy/blade)) + else if(istype(W,/obj/item/melee/energy/blade)) dismantle_sound = "sparks" dismantle_verb = "slicing" //dismantle_toolspeed = 1 cut_delay *= 0.5 - else if(istype(W,/obj/item/weapon/pickaxe)) - var/obj/item/weapon/pickaxe/P = W + else if(istype(W,/obj/item/pickaxe)) + var/obj/item/pickaxe/P = W dismantle_verb = P.drill_verb dismantle_sound = P.drill_sound cut_delay -= P.digspeed @@ -320,7 +320,7 @@ if(4) var/cut_cover if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(!WT.isOn()) return if(WT.remove_fuel(0,user)) @@ -328,7 +328,7 @@ else to_chat(user, "You need more welding fuel to complete this task.") return - else if (istype(W, /obj/item/weapon/pickaxe/plasmacutter)) + else if (istype(W, /obj/item/pickaxe/plasmacutter)) cut_cover = 1 if(cut_cover) to_chat(user, "You begin slicing through the metal cover.") @@ -375,13 +375,13 @@ if(1) var/cut_cover if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if( WT.remove_fuel(0,user) ) cut_cover=1 else to_chat(user, "You need more welding fuel to complete this task.") return - else if(istype(W, /obj/item/weapon/pickaxe/plasmacutter)) + else if(istype(W, /obj/item/pickaxe/plasmacutter)) cut_cover = 1 if(cut_cover) to_chat(user, "You begin slicing through the support rods.") @@ -409,7 +409,7 @@ F.try_build(src, user) return - else if(!istype(W,/obj/item/weapon/rcd) && !istype(W, /obj/item/weapon/reagent_containers)) + else if(!istype(W,/obj/item/rcd) && !istype(W, /obj/item/reagent_containers)) return attack_hand(user) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 96971a1bb20..4a79a588c57 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -310,7 +310,7 @@ /turf/simulated/wall/can_engrave() return (material && material.hardness >= 10 && material.hardness <= 100) -/turf/simulated/wall/rcd_values(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/turf/simulated/wall/rcd_values(mob/living/user, obj/item/rcd/the_rcd, passed_mode) if(material.integrity > 1000) // Don't decon things like elevatorium. return FALSE if(reinf_material && !the_rcd.can_remove_rwalls) // Gotta do it the old fashioned way if your RCD can't. @@ -327,7 +327,7 @@ ) return FALSE -/turf/simulated/wall/rcd_act(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/turf/simulated/wall/rcd_act(mob/living/user, obj/item/rcd/the_rcd, passed_mode) if(passed_mode == RCD_DECONSTRUCT) to_chat(user, span("notice", "You deconstruct \the [src].")) ChangeTurf(/turf/simulated/floor/airless, preserve_outdoors = TRUE) diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm index f6477e9764a..d16806dd6d7 100644 --- a/code/game/turfs/simulated/water.dm +++ b/code/game/turfs/simulated/water.dm @@ -39,13 +39,13 @@ return "water_shallow" /turf/simulated/floor/water/attackby(obj/item/O as obj, mob/user as mob) - var/obj/item/weapon/reagent_containers/RG = O + var/obj/item/reagent_containers/RG = O if (istype(RG) && RG.is_open_container()) RG.reagents.add_reagent(reagent_type, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) user.visible_message("[user] fills \the [RG] using \the [src].","You fill \the [RG] using \the [src].") return 1 - else if(istype(O, /obj/item/weapon/mop)) + else if(istype(O, /obj/item/mop)) O.reagents.add_reagent(reagent_type, 5) to_chat(user, "You wet \the [O] in \the [src].") playsound(src, 'sound/effects/slosh.ogg', 25, 1) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index e15dfffe18d..cd66f7a4213 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -109,15 +109,15 @@ step(user.pulling, get_dir(user.pulling.loc, src)) return 1 -/turf/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/storage)) - var/obj/item/weapon/storage/S = W +/turf/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/storage)) + var/obj/item/storage/S = W if(S.use_to_pickup && S.collection_mode) S.gather_all(src, user) return ..() // Hits a mob on the tile. -/turf/proc/attack_tile(obj/item/weapon/W, mob/living/user) +/turf/proc/attack_tile(obj/item/W, mob/living/user) if(!istype(W)) return FALSE @@ -380,7 +380,7 @@ // This is all the way up here since its the common ancestor for things that need to get replaced with a floor when an RCD is used on them. // More specialized turfs like walls should instead override this. // The code for applying lattices/floor tiles onto lattices could also utilize something similar in the future. -/turf/rcd_values(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/turf/rcd_values(mob/living/user, obj/item/rcd/the_rcd, passed_mode) if(density || !can_build_into_floor) return FALSE if(passed_mode == RCD_FLOORWALL) @@ -395,7 +395,7 @@ ) return FALSE -/turf/rcd_act(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/turf/rcd_act(mob/living/user, obj/item/rcd/the_rcd, passed_mode) if(passed_mode == RCD_FLOORWALL) to_chat(user, span("notice", "You build a floor.")) ChangeTurf(/turf/simulated/floor/airless, preserve_outdoors = TRUE) diff --git a/code/game/turfs/unsimulated.dm b/code/game/turfs/unsimulated.dm index f9bfd4102b6..175051b1369 100644 --- a/code/game/turfs/unsimulated.dm +++ b/code/game/turfs/unsimulated.dm @@ -25,8 +25,8 @@ //VOREStation Add End // Better nip this just in case. -/turf/unsimulated/rcd_values(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/turf/unsimulated/rcd_values(mob/living/user, obj/item/rcd/the_rcd, passed_mode) return FALSE -/turf/unsimulated/rcd_act(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode) +/turf/unsimulated/rcd_act(mob/living/user, obj/item/rcd/the_rcd, passed_mode) return FALSE diff --git a/code/game/vehicles/vehicle.dm b/code/game/vehicles/vehicle.dm index 9b00a557684..729cadb2c43 100644 --- a/code/game/vehicles/vehicle.dm +++ b/code/game/vehicles/vehicle.dm @@ -16,7 +16,7 @@ //var/deflect_chance = 10 //chance to deflect the incoming projectiles, hits, or lesser the effect of ex_act. //the values in this list show how much damage will pass through, not how much will be absorbed. var/list/damage_absorption = list("brute"=0.8,"fire"=1.2,"bullet"=0.9,"laser"=1,"energy"=1,"bomb"=1) - var/obj/item/weapon/cell/cell //Our power source + var/obj/item/cell/cell //Our power source var/state = 0 var/list/log = new var/last_message = 0 @@ -35,7 +35,7 @@ //var/datum/gas_mixture/cabin_air //var/obj/machinery/atmospherics/portables_connector/connected_port = null - var/obj/item/device/radio/radio = null + var/obj/item/radio/radio = null var/max_temperature = 2500 //var/internal_damage_threshold = 50 //health percentage below which internal damage is possible @@ -74,12 +74,12 @@ /obj/vehicle/proc/addVerb(verb_path) verbs += verb_path -/obj/vehicle/proc/add_cell(var/obj/item/weapon/cell/C=null) +/obj/vehicle/proc/add_cell(var/obj/item/cell/C=null) if(C) C.forceMove(src) cell = C return - cell = new /obj/item/weapon/cell/mech(src) + cell = new /obj/item/cell/mech(src) /obj/vehicle/proc/add_radio() radio = new(src) diff --git a/code/global.dm b/code/global.dm index 04ff68bcfa2..92c11ee868e 100644 --- a/code/global.dm +++ b/code/global.dm @@ -175,7 +175,7 @@ var/static/list/scarySounds = list( var/max_explosion_range = 14 // Announcer intercom, because too much stuff creates an intercom for one message then hard del()s it. -var/global/obj/item/device/radio/intercom/omni/global_announcer = new /obj/item/device/radio/intercom/omni(null) +var/global/obj/item/radio/intercom/omni/global_announcer = new /obj/item/radio/intercom/omni(null) var/list/station_departments = list("Command", "Medical", "Engineering", "Research", "Security", "Cargo", "Exploration", "Civilian") //VOREStation Edit diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 2505d006ab6..cad295e4d01 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1510,7 +1510,7 @@ var/datum/announcement/minor/admin_min_announcer = new var/replyorigin = tgui_input_text(src.owner, "Please specify who the fax is coming from", "Origin") - var/obj/item/weapon/paper/admin/P = new /obj/item/weapon/paper/admin( null ) //hopefully the null loc won't cause trouble for us + var/obj/item/paper/admin/P = new /obj/item/paper/admin( null ) //hopefully the null loc won't cause trouble for us faxreply = P P.admindatum = src @@ -1520,9 +1520,9 @@ var/datum/announcement/minor/admin_min_announcer = new P.adminbrowse() -/datum/admins/var/obj/item/weapon/paper/admin/faxreply // var to hold fax replies in +/datum/admins/var/obj/item/paper/admin/faxreply // var to hold fax replies in -/datum/admins/proc/faxCallback(var/obj/item/weapon/paper/admin/P, var/obj/machinery/photocopier/faxmachine/destination) +/datum/admins/proc/faxCallback(var/obj/item/paper/admin/P, var/obj/machinery/photocopier/faxmachine/destination) var/customname = tgui_input_text(src.owner, "Pick a title for the report", "Title") P.name = "[P.origin] - [customname]" @@ -1551,7 +1551,7 @@ var/datum/announcement/minor/admin_min_announcer = new if(!P.stamped) P.stamped = new - P.stamped += /obj/item/weapon/stamp/centcomm + P.stamped += /obj/item/stamp/centcomm P.add_overlay(stampoverlay) var/obj/item/rcvdcopy diff --git a/code/modules/admin/admin_attack_log.dm b/code/modules/admin/admin_attack_log.dm index fb85a7db1c6..a71442c3588 100644 --- a/code/modules/admin/admin_attack_log.dm +++ b/code/modules/admin/admin_attack_log.dm @@ -33,7 +33,7 @@ for(var/mob/victim in victims) admin_attack_log(attacker, victim, attacker_message, victim_message, admin_message) -/proc/admin_inject_log(mob/attacker, mob/victim, obj/item/weapon, reagents, amount_transferred, violent=0) +/proc/admin_inject_log(mob/attacker, mob/victim, obj/item, reagents, amount_transferred, violent=0) if(violent) violent = "violently " else diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index ce5d3077459..47f034287d6 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -21,13 +21,13 @@ var/list/choices = list("/obj", "/obj/structure", "/obj/item", - "/obj/item/device", - "/obj/item/weapon", - "/obj/item/weapon/gun", - "/obj/item/weapon/reagent_containers", - "/obj/item/weapon/reagent_containers/food", + "/obj/item", + "/obj/item", + "/obj/item/gun", + "/obj/item/reagent_containers", + "/obj/item/reagent_containers/food", "/obj/item/clothing", - "/obj/item/weapon/storage/box/fluff", //VOREStation Edit, + "/obj/item/storage/box/fluff", //VOREStation Edit, "/obj/machinery", "/obj/mecha", "/obj/item/mecha_parts", diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm index f90dede7e1f..a25fde37658 100644 --- a/code/modules/admin/modify_robot.dm +++ b/code/modules/admin/modify_robot.dm @@ -73,7 +73,7 @@ .["model_options"] = module_options // Data for the upgrade options .["target"] += get_upgrades() - var/obj/item/weapon/gun/energy/kinetic_accelerator/kin = locate() in target.module.modules + var/obj/item/gun/energy/kinetic_accelerator/kin = locate() in target.module.modules if(kin) .["target"]["pka"] += get_pka(kin) // Radio section @@ -176,11 +176,11 @@ source = new /mob/living/silicon/robot(null) var/module_type = robot_modules[params["new_source"]] source.modtype = params["new_source"] - var/obj/item/weapon/robot_module/robot/robot_type = new module_type(source) + var/obj/item/robot_module/robot/robot_type = new module_type(source) source.sprite_datum = pick(SSrobot_sprites.get_module_sprites(source.modtype, source)) source.update_icon() source.emag_items = 1 - if(!istype(robot_type, /obj/item/weapon/robot_module/robot)) + if(!istype(robot_type, /obj/item/robot_module/robot)) QDEL_NULL(source) return TRUE return TRUE @@ -209,8 +209,8 @@ else item_with_synth.synths = list(target.module.synths[found]) return TRUE - if(istype(add_item, /obj/item/weapon/matter_decompiler/) || istype(add_item, /obj/item/device/dogborg/sleeper/compactor/decompiler/)) - var/obj/item/weapon/matter_decompiler/item_with_matter = add_item + if(istype(add_item, /obj/item/matter_decompiler/) || istype(add_item, /obj/item/dogborg/sleeper/compactor/decompiler/)) + var/obj/item/matter_decompiler/item_with_matter = add_item if(item_with_matter.metal) var/found = target.module.synths.Find(item_with_matter.metal) if(!found) @@ -303,12 +303,12 @@ return TRUE if("install_modkit") var/new_modkit = text2path(params["modkit"]) - var/obj/item/weapon/gun/energy/kinetic_accelerator/kin = locate() in target.module.modules + var/obj/item/gun/energy/kinetic_accelerator/kin = locate() in target.module.modules var/obj/item/borg/upgrade/modkit/M = new new_modkit(null) M.install(kin, target) return TRUE if("remove_modkit") - var/obj/item/weapon/gun/energy/kinetic_accelerator/kin = locate() in target.module.modules + var/obj/item/gun/energy/kinetic_accelerator/kin = locate() in target.module.modules var/obj/item/rem_kit = locate(params["modkit"]) kin.modkits.Remove(rem_kit) qdel(rem_kit) @@ -319,11 +319,11 @@ target.radio.centComm = 1 if(selected_radio_channel == CHANNEL_RAIDER) qdel(target.radio.keyslot) - target.radio.keyslot = new /obj/item/device/encryptionkey/raider(target) + target.radio.keyslot = new /obj/item/encryptionkey/raider(target) target.radio.syndie = 1 if(selected_radio_channel == CHANNEL_MERCENARY) qdel(target.radio.keyslot) - target.radio.keyslot = new /obj/item/device/encryptionkey/syndicate(target) + target.radio.keyslot = new /obj/item/encryptionkey/syndicate(target) target.radio.syndie = 1 target.module.channels += list("[selected_radio_channel]" = 1) target.radio.channels[selected_radio_channel] += target.module.channels[selected_radio_channel] @@ -623,7 +623,7 @@ all_upgrades["restricted_upgrades"] = restricted_upgrades return all_upgrades -/datum/eventkit/modify_robot/proc/get_pka(var/obj/item/weapon/gun/energy/kinetic_accelerator/kin) +/datum/eventkit/modify_robot/proc/get_pka(var/obj/item/gun/energy/kinetic_accelerator/kin) var/list/pka = list() pka["name"] = kin.name var/list/installed_modkits = list() @@ -660,15 +660,15 @@ /datum/eventkit/modify_robot/proc/get_cells() var/list/cell_options = list() - for(var/cell in typesof(/obj/item/weapon/cell)) - var/obj/item/weapon/cell/C = cell + for(var/cell in typesof(/obj/item/cell)) + var/obj/item/cell/C = cell if(initial(C.name) == "power cell") continue - if(ispath(C, /obj/item/weapon/cell/standin)) + if(ispath(C, /obj/item/cell/standin)) continue - if(ispath(C, /obj/item/weapon/cell/device)) + if(ispath(C, /obj/item/cell/device)) continue - if(ispath(C, /obj/item/weapon/cell/mech)) + if(ispath(C, /obj/item/cell/mech)) continue if(cell_options[initial(C.name)]) // empty cells are defined after normal cells! continue diff --git a/code/modules/admin/player_effects.dm b/code/modules/admin/player_effects.dm index 1a77dc227a7..08e262a0eb5 100644 --- a/code/modules/admin/player_effects.dm +++ b/code/modules/admin/player_effects.dm @@ -200,13 +200,13 @@ target.client.create_fake_ad_popup_multiple(/obj/screen/popup/default, 15) if("peppernade") - var/obj/item/weapon/grenade/chem_grenade/teargas/grenade = new /obj/item/weapon/grenade/chem_grenade/teargas + var/obj/item/grenade/chem_grenade/teargas/grenade = new /obj/item/grenade/chem_grenade/teargas grenade.loc = target.loc to_chat(target,span_warning("GRENADE?!")) grenade.detonate() if("spicerequest") - var/obj/item/weapon/reagent_containers/food/condiment/spacespice/spice = new /obj/item/weapon/reagent_containers/food/condiment/spacespice + var/obj/item/reagent_containers/food/condiment/spacespice/spice = new /obj/item/reagent_containers/food/condiment/spacespice spice.loc = target.loc to_chat(target,"A bottle of spices appears at your feet... be careful what you wish for!") @@ -501,7 +501,7 @@ return for(var/obj/item/W in Tar) - if(istype(W, /obj/item/weapon/implant/backup) || istype(W, /obj/item/device/nif)) //VOREStation Edit - There's basically no reason to remove either of these + if(istype(W, /obj/item/implant/backup) || istype(W, /obj/item/nif)) //VOREStation Edit - There's basically no reason to remove either of these continue //VOREStation Edit Tar.drop_from_inventory(W) @@ -567,15 +567,15 @@ to_chat(user,span_warning("Target already has a NIF.")) return if(Tar.species.flags & NO_SCAN) - var/obj/item/device/nif/S = /obj/item/device/nif/bioadap + var/obj/item/nif/S = /obj/item/nif/bioadap input_NIF = initial(S.name) - new /obj/item/device/nif/bioadap(Tar) + new /obj/item/nif/bioadap(Tar) else - var/list/NIF_types = typesof(/obj/item/device/nif) + var/list/NIF_types = typesof(/obj/item/nif) var/list/NIFs = list() for(var/NIF_type in NIF_types) - var/obj/item/device/nif/S = NIF_type + var/obj/item/nif/S = NIF_type NIFs[capitalize(initial(S.name))] = NIF_type var/list/show_NIFs = sortList(NIFs) // the list that will be shown to the user to pick from @@ -586,7 +586,7 @@ if(chosen_NIF) new chosen_NIF(Tar) else - new /obj/item/device/nif(Tar) + new /obj/item/nif(Tar) log_and_message_admins("[key_name(user)] Quick NIF'd [Tar.real_name] with a [input_NIF].") if("resize") diff --git a/code/modules/admin/secrets/admin_secrets/prison_warp.dm b/code/modules/admin/secrets/admin_secrets/prison_warp.dm index b2c008495fd..a4cd00c9b2c 100644 --- a/code/modules/admin/secrets/admin_secrets/prison_warp.dm +++ b/code/modules/admin/secrets/admin_secrets/prison_warp.dm @@ -17,13 +17,13 @@ continue H.Paralyse(5) if(H.wear_id) - var/obj/item/weapon/card/id/id = H.get_idcard() + var/obj/item/card/id/id = H.get_idcard() for(var/A in id.GetAccess()) if(A == access_security) security++ if(!security) //strip their stuff before they teleport into a cell :downs: - for(var/obj/item/weapon/W in H) + for(var/obj/item/W in H) if(istype(W, /obj/item/organ/external)) continue //don't strip organs diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 24e9364c9b3..0938f687693 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1446,10 +1446,10 @@ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return - H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_l_hand ) - if(!(istype(H.l_hand,/obj/item/weapon/reagent_containers/food/snacks/cookie))) - H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_r_hand ) - if(!(istype(H.r_hand,/obj/item/weapon/reagent_containers/food/snacks/cookie))) + H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), slot_l_hand ) + if(!(istype(H.l_hand,/obj/item/reagent_containers/food/snacks/cookie))) + H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), slot_r_hand ) + if(!(istype(H.r_hand,/obj/item/reagent_containers/food/snacks/cookie))) log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].") message_admins("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].") return @@ -1513,7 +1513,7 @@ if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return - if(!istype(H.l_ear, /obj/item/device/radio/headset) && !istype(H.r_ear, /obj/item/device/radio/headset)) + if(!istype(H.l_ear, /obj/item/radio/headset) && !istype(H.r_ear, /obj/item/radio/headset)) to_chat(usr, "The person you are trying to contact is not wearing a headset") return @@ -1527,17 +1527,17 @@ else if(href_list["AdminFaxView"]) var/obj/item/fax = locate(href_list["AdminFaxView"]) - if (istype(fax, /obj/item/weapon/paper)) - var/obj/item/weapon/paper/P = fax + if (istype(fax, /obj/item/paper)) + var/obj/item/paper/P = fax P.show_content(usr,1) - else if (istype(fax, /obj/item/weapon/photo)) - var/obj/item/weapon/photo/H = fax + else if (istype(fax, /obj/item/photo)) + var/obj/item/photo/H = fax H.show(usr) - else if (istype(fax, /obj/item/weapon/paper_bundle)) + else if (istype(fax, /obj/item/paper_bundle)) //having multiple people turning pages on a paper_bundle can cause issues //open a browse window listing the contents instead var/data = "" - var/obj/item/weapon/paper_bundle/B = fax + var/obj/item/paper_bundle/B = fax for (var/page = 1, page <= B.pages.len, page++) var/obj/pageobj = B.pages[page] @@ -1549,15 +1549,15 @@ else if (href_list["AdminFaxViewPage"]) var/page = text2num(href_list["AdminFaxViewPage"]) - var/obj/item/weapon/paper_bundle/bundle = locate(href_list["paper_bundle"]) + var/obj/item/paper_bundle/bundle = locate(href_list["paper_bundle"]) if (!bundle) return - if (istype(bundle.pages[page], /obj/item/weapon/paper)) - var/obj/item/weapon/paper/P = bundle.pages[page] + if (istype(bundle.pages[page], /obj/item/paper)) + var/obj/item/paper/P = bundle.pages[page] P.show_content(src.owner, 1) - else if (istype(bundle.pages[page], /obj/item/weapon/photo)) - var/obj/item/weapon/photo/H = bundle.pages[page] + else if (istype(bundle.pages[page], /obj/item/photo)) + var/obj/item/photo/H = bundle.pages[page] H.show(src.owner) return @@ -1567,7 +1567,7 @@ var/replyorigin = href_list["replyorigin"] - var/obj/item/weapon/paper/admin/P = new /obj/item/weapon/paper/admin( null ) //hopefully the null loc won't cause trouble for us + var/obj/item/paper/admin/P = new /obj/item/paper/admin( null ) //hopefully the null loc won't cause trouble for us faxreply = P P.admindatum = src @@ -1710,11 +1710,11 @@ else if(!ispath(path, /obj) && !ispath(path, /turf) && !ispath(path, /mob)) removed_paths += dirty_path continue - else if(ispath(path, /obj/item/weapon/gun/energy/pulse_rifle)) + else if(ispath(path, /obj/item/gun/energy/pulse_rifle)) if(!check_rights(R_FUN,0)) removed_paths += dirty_path continue - else if(ispath(path, /obj/item/weapon/melee/energy/blade))//Not an item one should be able to spawn./N + else if(ispath(path, /obj/item/melee/energy/blade))//Not an item one should be able to spawn./N if(!check_rights(R_FUN,0)) removed_paths += dirty_path continue @@ -2073,7 +2073,7 @@ return 0 /mob/living/carbon/human/can_centcom_reply() - return istype(l_ear, /obj/item/device/radio/headset) || istype(r_ear, /obj/item/device/radio/headset) + return istype(l_ear, /obj/item/radio/headset) || istype(r_ear, /obj/item/radio/headset) /mob/living/silicon/ai/can_centcom_reply() return common_radio != null && !check_unable(2) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index da324fbfb0c..8cf3837abf3 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -38,16 +38,16 @@ weapon_damage *= M.outgoing_melee_damage_percent modified_damage_percent *= M.outgoing_melee_damage_percent - if(istype(I, /obj/item/weapon/gun)) - var/obj/item/weapon/gun/G = I + if(istype(I, /obj/item/gun)) + var/obj/item/gun/G = I var/obj/item/projectile/P - if(istype(I, /obj/item/weapon/gun/energy)) - var/obj/item/weapon/gun/energy/energy_gun = G + if(istype(I, /obj/item/gun/energy)) + var/obj/item/gun/energy/energy_gun = G P = new energy_gun.projectile_type() - else if(istype(I, /obj/item/weapon/gun/projectile)) - var/obj/item/weapon/gun/projectile/projectile_gun = G + else if(istype(I, /obj/item/gun/projectile)) + var/obj/item/gun/projectile/projectile_gun = G var/obj/item/ammo_casing/ammo = projectile_gun.chambered P = ammo.BB @@ -144,7 +144,7 @@ var/mob/choice = tgui_input_list(usr, "Choose a player to play the pAI", "Spawn pAI", available) if(!choice) return 0 - var/obj/item/device/paicard/typeb/card = new(T) + var/obj/item/paicard/typeb/card = new(T) var/mob/living/silicon/pai/pai = new(card) pai.real_name = pai.name pai.key = choice.key @@ -282,14 +282,14 @@ if (istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M if (H.wear_id) - var/obj/item/weapon/card/id/id = H.wear_id - if(istype(H.wear_id, /obj/item/device/pda)) - var/obj/item/device/pda/pda = H.wear_id + var/obj/item/card/id/id = H.wear_id + if(istype(H.wear_id, /obj/item/pda)) + var/obj/item/pda/pda = H.wear_id id = pda.id id.icon_state = "gold" id.access = get_all_accesses().Copy() else - var/obj/item/weapon/card/id/id = new/obj/item/weapon/card/id(M); + var/obj/item/card/id/id = new/obj/item/card/id(M); id.icon_state = "gold" id.access = get_all_accesses().Copy() id.registered_name = H.real_name @@ -375,7 +375,7 @@ if(A && !(A.type in areas_with_LS)) areas_with_LS.Add(A.type) - for(var/obj/item/device/radio/intercom/I in machines) + for(var/obj/item/radio/intercom/I in machines) var/area/A = get_area(I) if(A && !(A.type in areas_with_intercom)) areas_with_intercom.Add(A.type) @@ -488,7 +488,7 @@ for(var/obj/machinery/power/rad_collector/Rad in machines) if(Rad.anchored) if(!Rad.P) - var/obj/item/weapon/tank/phoron/Phoron = new/obj/item/weapon/tank/phoron(Rad) + var/obj/item/tank/phoron/Phoron = new/obj/item/tank/phoron(Rad) Phoron.air_contents.gas["phoron"] = 70 Rad.drainratio = 0 Rad.P = Phoron @@ -526,7 +526,7 @@ Rad.anchored = TRUE Rad.connect_to_network() - var/obj/item/weapon/tank/phoron/Phoron = new/obj/item/weapon/tank/phoron(Rad) + var/obj/item/tank/phoron/Phoron = new/obj/item/tank/phoron(Rad) Phoron.air_contents.gas["phoron"] = 29.1154 //This is a full tank if you filled it from a canister Rad.P = Phoron diff --git a/code/modules/admin/verbs/debug_vr.dm b/code/modules/admin/verbs/debug_vr.dm index d1f6e8fbd73..09e48f3b9ae 100644 --- a/code/modules/admin/verbs/debug_vr.dm +++ b/code/modules/admin/verbs/debug_vr.dm @@ -26,15 +26,15 @@ return if(H.species.flags & NO_SCAN) - var/obj/item/device/nif/S = /obj/item/device/nif/bioadap + var/obj/item/nif/S = /obj/item/nif/bioadap input_NIF = initial(S.name) - new /obj/item/device/nif/bioadap(H) + new /obj/item/nif/bioadap(H) else - var/list/NIF_types = typesof(/obj/item/device/nif) + var/list/NIF_types = typesof(/obj/item/nif) var/list/NIFs = list() for(var/NIF_type in NIF_types) - var/obj/item/device/nif/S = NIF_type + var/obj/item/nif/S = NIF_type NIFs[capitalize(initial(S.name))] = NIF_type var/list/show_NIFs = sortList(NIFs) // the list that will be shown to the user to pick from @@ -45,7 +45,7 @@ if(chosen_NIF) new chosen_NIF(H) else - new /obj/item/device/nif(H) + new /obj/item/nif(H) log_and_message_admins("[key_name(src)] Quick NIF'd [H.real_name] with a [input_NIF].") feedback_add_details("admin_verb","QNIF") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 5859db3ab78..daec7c4c8bd 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -117,7 +117,7 @@ GLOBAL_LIST_BOILERPLATE(all_debugging_effects, /obj/effect/debugging) qdel(M) if(intercom_range_display_status) - for(var/obj/item/device/radio/intercom/I in machines) + for(var/obj/item/radio/intercom/I in machines) for(var/turf/T in orange(7,I)) var/obj/effect/debugging/marker/F = new/obj/effect/debugging/marker(T) if (!(F in view(7,I.loc))) diff --git a/code/modules/admin/verbs/modify_robot.dm b/code/modules/admin/verbs/modify_robot.dm index 9a5c937028e..210530ca74d 100644 --- a/code/modules/admin/verbs/modify_robot.dm +++ b/code/modules/admin/verbs/modify_robot.dm @@ -73,9 +73,9 @@ break var/module_type = robot_modules[selected_module_module] var/mob/living/silicon/robot/robot = new /mob/living/silicon/robot(null) - var/obj/item/weapon/robot_module/robot/robot_type = new module_type(robot) + var/obj/item/robot_module/robot/robot_type = new module_type(robot) robot.emag_items = 1 - if(!istype(robot_type, /obj/item/weapon/robot_module/robot/)) + if(!istype(robot_type, /obj/item/robot_module/robot/)) qdel(robot) break var/list/all_modules = robot.module.modules @@ -104,8 +104,8 @@ else item_with_synth.synths = list(target.module.synths[found]) continue - if(istype(add_item, /obj/item/weapon/matter_decompiler/) || istype(add_item, /obj/item/device/dogborg/sleeper/compactor/decompiler/)) - var/obj/item/weapon/matter_decompiler/item_with_matter = add_item + if(istype(add_item, /obj/item/matter_decompiler/) || istype(add_item, /obj/item/dogborg/sleeper/compactor/decompiler/)) + var/obj/item/matter_decompiler/item_with_matter = add_item if(item_with_matter.metal) var/found = target.module.synths.Find(item_with_matter.metal) if(!found) @@ -191,7 +191,7 @@ break var/new_modkit = modkits[selected_ka_upgrade] var/obj/item/borg/upgrade/modkit/M = new new_modkit(src) - var/obj/item/weapon/gun/energy/kinetic_accelerator/kin = locate() in target.module.modules + var/obj/item/gun/energy/kinetic_accelerator/kin = locate() in target.module.modules if(kin.get_remaining_mod_capacity() >= M.cost) to_chat(usr, "You installed the [M] into the [kin], [capacity]% remaining!") modkits.Remove(selected_ka_upgrade) @@ -233,11 +233,11 @@ target.radio.centComm = 1 if(selected_radio_channel == CHANNEL_RAIDER) qdel(target.radio.keyslot) - target.radio.keyslot = new /obj/item/device/encryptionkey/raider(target) + target.radio.keyslot = new /obj/item/encryptionkey/raider(target) target.radio.syndie = 1 if(selected_radio_channel == CHANNEL_MERCENARY) qdel(target.radio.keyslot) - target.radio.keyslot = new /obj/item/device/encryptionkey/syndicate(target) + target.radio.keyslot = new /obj/item/encryptionkey/syndicate(target) target.radio.syndie = 1 target.module.channels += list("[selected_radio_channel]" = 1) target.radio.channels[selected_radio_channel] += target.module.channels[selected_radio_channel] @@ -276,11 +276,11 @@ if("radio") C.wrapped = new /obj/item/robot_parts/robot_component/radio(target) if("power cell") - var/list/recommended_cells = list(/obj/item/weapon/cell/robot_station, /obj/item/weapon/cell/high, /obj/item/weapon/cell/super, /obj/item/weapon/cell/robot_syndi, /obj/item/weapon/cell/hyper, - /obj/item/weapon/cell/infinite, /obj/item/weapon/cell/potato, /obj/item/weapon/cell/slime) + var/list/recommended_cells = list(/obj/item/cell/robot_station, /obj/item/cell/high, /obj/item/cell/super, /obj/item/cell/robot_syndi, /obj/item/cell/hyper, + /obj/item/cell/infinite, /obj/item/cell/potato, /obj/item/cell/slime) var/list/cell_names = list() for(var/cell_type in recommended_cells) - var/obj/item/weapon/cell/single_cell = cell_type + var/obj/item/cell/single_cell = cell_type cell_names[capitalize(initial(single_cell.name))] = cell_type var/selected_cell = tgui_input_list(usr, "What kind of cell do you want to install?", "Cells", cell_names) if(!selected_cell || selected_cell == "Cancel") @@ -346,7 +346,7 @@ target.module_reset(FALSE) if(MODIFIY_ROBOT_TOGGLE_STATION_ACCESS) if(target?.idcard?.GetAccess()) - var/obj/item/weapon/card/id/synthetic/card = target.idcard + var/obj/item/card/id/synthetic/card = target.idcard if(access_synth in card.GetAccess()) card.access -= get_all_station_access() card.access -= access_synth @@ -357,7 +357,7 @@ to_chat(usr, "You grant station access to [target].") if(MODIFIY_ROBOT_TOGGLE_CENT_ACCESS) if(target?.idcard?.GetAccess()) - var/obj/item/weapon/card/id/synthetic/card = target.idcard + var/obj/item/card/id/synthetic/card = target.idcard if(access_cent_specops in card.GetAccess()) card.access -= get_all_centcom_access() to_chat(usr, "You revoke central access from [target].") diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index d38b6b15889..f9d887b53c5 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -9,7 +9,7 @@ return for(var/obj/item/W in M) - if(istype(W, /obj/item/weapon/implant/backup) || istype(W, /obj/item/device/nif)) //VOREStation Edit - There's basically no reason to remove either of these + if(istype(W, /obj/item/implant/backup) || istype(W, /obj/item/nif)) //VOREStation Edit - There's basically no reason to remove either of these continue //VOREStation Edit M.drop_from_inventory(W) diff --git a/code/modules/admin/verbs/smite.dm b/code/modules/admin/verbs/smite.dm index 38db8df1207..89a81fe4ced 100644 --- a/code/modules/admin/verbs/smite.dm +++ b/code/modules/admin/verbs/smite.dm @@ -158,13 +158,13 @@ target.client.create_fake_ad_popup_multiple(/obj/screen/popup/default, 15) if(SMITE_PEPPERNADE) - var/obj/item/weapon/grenade/chem_grenade/teargas/grenade = new /obj/item/weapon/grenade/chem_grenade/teargas + var/obj/item/grenade/chem_grenade/teargas/grenade = new /obj/item/grenade/chem_grenade/teargas grenade.loc = target.loc to_chat(target,"GRENADE?!") grenade.detonate() if(SMITE_SPICEREQUEST) - var/obj/item/weapon/reagent_containers/food/condiment/spacespice/spice = new /obj/item/weapon/reagent_containers/food/condiment/spacespice + var/obj/item/reagent_containers/food/condiment/spacespice/spice = new /obj/item/reagent_containers/food/condiment/spacespice spice.loc = target.loc to_chat(target,"A bottle of spices appears at your feet... be careful what you wish for!") diff --git a/code/modules/admin/view_variables/helpers.dm b/code/modules/admin/view_variables/helpers.dm index 9ee161b0dc5..fbd5ec76599 100644 --- a/code/modules/admin/view_variables/helpers.dm +++ b/code/modules/admin/view_variables/helpers.dm @@ -86,7 +86,7 @@ "} -/obj/item/device/pda/get_view_variables_options() +/obj/item/pda/get_view_variables_options() return ..() + {" "} diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm index c5e5cf4dedc..8701890961b 100644 --- a/code/modules/admin/view_variables/topic.dm +++ b/code/modules/admin/view_variables/topic.dm @@ -277,7 +277,7 @@ else if(href_list["fakepdapropconvo"]) if(!check_rights(R_FUN)) return - var/obj/item/device/pda/P = locate(href_list["fakepdapropconvo"]) + var/obj/item/pda/P = locate(href_list["fakepdapropconvo"]) if(!istype(P)) to_chat(usr, span_warning("This can only be done to instances of type /pda")) return diff --git a/code/modules/artifice/cursedform.dm b/code/modules/artifice/cursedform.dm index ee994924c8e..082933274ff 100644 --- a/code/modules/artifice/cursedform.dm +++ b/code/modules/artifice/cursedform.dm @@ -1,20 +1,20 @@ -/obj/item/weapon/paper/carbon/cursedform +/obj/item/paper/carbon/cursedform name = "Form - Inventory Requisition r10.7.1E" -/obj/item/weapon/paper/carbon/cursedform/Initialize() +/obj/item/paper/carbon/cursedform/Initialize() . = ..() info = {"

Form - Inventory Requisition r10.7.1E

General Request Form


General


Name:
Department:
Departmental Rank:
Organization(If not Nanotrasen):
Date:



Requested Item(s):
Quantity:
Reason for request:
Is this replacement equipment?:
If `Yes`; above, specify equiment and reason for replacement:


Authorization


Authorizing Department:
Authorizing Dept. Head:


Contact and Delivery


EPv2 Address of requesting party(Do not leave blank):
Delivery location or department:


Nanotrasen Employee Identification Number:
Signature of Requester and Date





Authorizor`s Nanotrasen Employee Identification Number:
Authorizing Signature and Date(Include authorizing department`s stamp below)




Shipping Department Only

(Do not write below this line)

Nanotrasen Purchasing Approval Code:
Nanotrasen Employee Identification Number:
Receiving Shipping Employee:
Signature and Date


"} info_links = {"

Form - Inventory Requisition r10.7.1E

General Request Form


General


Name: write
Department: write
Departmental Rank: write
Organization(If not Nanotrasen): write
Date: write



Requested Item(s): write
Quantity: write
Reason for request: write
Is this replacement equipment?: write
If `Yes` above, specify equiment and reason for replacement: write


Authorization


Authorizing Department: write
Authorizing Dept. Head: write


Contact and Delivery


EPv2 Address of requesting party(Do not leave blank): write
Delivery location or department: write


Nanotrasen Employee Identification Number: write
Signature of Requester and Date

write



Authorizor`s Nanotrasen Employee Identification Number: write
Authorizing Signature and Date(Include authorizing department`s stamp below)

write


Shipping Department Only

(Do not write below this line)

Nanotrasen Purchasing Approval Code: write
Nanotrasen Employee Identification Number: write
Receiving Shipping Employee: write
Signature and Date

write
write"} -/obj/item/weapon/paper/carbon/cursedform/AltClick() // No fun. +/obj/item/paper/carbon/cursedform/AltClick() // No fun. return -/obj/item/weapon/paper/carbon/cursedform/burnpaper(obj/item/weapon/flame/P, mob/user) +/obj/item/paper/carbon/cursedform/burnpaper(obj/item/flame/P, mob/user) var/class = "warning" var/datum/gender/TU = gender_datums[user.get_visible_gender()] if(P.lit && !user.restrained()) - if(istype(P, /obj/item/weapon/flame/lighter/zippo)) + if(istype(P, /obj/item/flame/lighter/zippo)) class = "rose" user.visible_message("[user] holds \the [P] up to \the [src], it looks like [TU.hes] trying to burn it!", \ diff --git a/code/modules/artifice/deadringer.dm b/code/modules/artifice/deadringer.dm index ed4e184543d..e5d4962f1d5 100644 --- a/code/modules/artifice/deadringer.dm +++ b/code/modules/artifice/deadringer.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/deadringer +/obj/item/deadringer name = "silver pocket watch" desc = "A fancy silver-plated digital pocket watch. Looks expensive." icon = 'icons/obj/deadringer.dmi' @@ -14,22 +14,22 @@ var/mob/living/carbon/human/watchowner = null -/obj/item/weapon/deadringer/New() +/obj/item/deadringer/New() ..() START_PROCESSING(SSobj, src) -/obj/item/weapon/deadringer/Destroy() //just in case some smartass tries to stay invisible by destroying the watch +/obj/item/deadringer/Destroy() //just in case some smartass tries to stay invisible by destroying the watch reveal() STOP_PROCESSING(SSobj, src) ..() -/obj/item/weapon/deadringer/dropped() +/obj/item/deadringer/dropped() if(timer > 20) reveal() watchowner = null return -/obj/item/weapon/deadringer/attack_self(var/mob/living/user as mob) +/obj/item/deadringer/attack_self(var/mob/living/user as mob) var/mob/living/H = src.loc if (!istype(H, /mob/living/carbon/human)) to_chat(H, span_blue("You have no clue what to do with this thing.")) @@ -49,7 +49,7 @@ activated = 0 return -/obj/item/weapon/deadringer/process() +/obj/item/deadringer/process() if(activated) if (ismob(src.loc)) var/mob/living/carbon/human/H = src.loc @@ -75,7 +75,7 @@ icon_state = "deadringer" return -/obj/item/weapon/deadringer/proc/deathprevent() +/obj/item/deadringer/proc/deathprevent() for(var/mob/living/simple_mob/D in oviewers(7, src)) if(!D.has_AI()) continue @@ -86,13 +86,13 @@ makeacorpse(watchowner) return -/obj/item/weapon/deadringer/proc/reveal() +/obj/item/deadringer/proc/reveal() if(watchowner) watchowner.alpha = 255 playsound(src, 'sound/effects/uncloak.ogg', 35, 1, -1) return -/obj/item/weapon/deadringer/proc/makeacorpse(var/mob/living/carbon/human/H) +/obj/item/deadringer/proc/makeacorpse(var/mob/living/carbon/human/H) if(H.isSynthetic()) return corpse = new /mob/living/carbon/human(H.loc) @@ -147,13 +147,13 @@ temp.disguise(c_type.type) temp.canremove = FALSE if(H.get_equipped_item(slot_belt)) - corpse.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/chameleon/changeling(corpse), slot_belt) + corpse.equip_to_slot_or_del(new /obj/item/storage/belt/chameleon/changeling(corpse), slot_belt) temp = corpse.get_equipped_item(slot_belt) var/obj/item/clothing/c_type = H.get_equipped_item(slot_belt) temp.disguise(c_type.type) temp.canremove = FALSE if(H.get_equipped_item(slot_back)) - corpse.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/chameleon/changeling(corpse), slot_back) + corpse.equip_to_slot_or_del(new /obj/item/storage/backpack/chameleon/changeling(corpse), slot_back) temp = corpse.get_equipped_item(slot_back) var/obj/item/clothing/c_type = H.get_equipped_item(slot_back) temp.disguise(c_type.type) diff --git a/code/modules/artifice/telecube.dm b/code/modules/artifice/telecube.dm index bca000870fe..6f1e6dd0225 100644 --- a/code/modules/artifice/telecube.dm +++ b/code/modules/artifice/telecube.dm @@ -17,7 +17,7 @@ value = CATALOGUER_REWARD_HARD // Standard one needs to be smacked onto another one to link together. -/obj/item/weapon/telecube +/obj/item/telecube name = "locus" desc = "A strange metallic cube that pulses silently." description_info = "Ctrl-Clicking on this object will attempt to activate its unique ability." @@ -32,7 +32,7 @@ throw_range = 2 - var/obj/item/weapon/telecube/mate = null + var/obj/item/telecube/mate = null var/start_paired = FALSE var/mirror_colors = FALSE @@ -51,7 +51,7 @@ var/omniteleport = FALSE // Will this teleport anchored things too? -/obj/item/weapon/telecube/Initialize() +/obj/item/telecube/Initialize() . = ..() glow = image("[icon_state]-ready") @@ -79,7 +79,7 @@ update_icon() -/obj/item/weapon/telecube/update_icon() +/obj/item/telecube/update_icon() . = ..() if(isturf(loc)) @@ -100,7 +100,7 @@ cut_overlays() add_overlay(glow) -/obj/item/weapon/telecube/Destroy() +/obj/item/telecube/Destroy() if(mate) var/turf/T = get_turf(mate) mate.visible_message("\The [mate] collapses into itself!") @@ -110,15 +110,15 @@ return ..() -/obj/item/weapon/telecube/equipped() +/obj/item/telecube/equipped() . = ..() update_icon() -/obj/item/weapon/telecube/dropped() +/obj/item/telecube/dropped() . = ..() update_icon() -/obj/item/weapon/telecube/proc/pair_cube(var/obj/item/weapon/telecube/M) +/obj/item/telecube/proc/pair_cube(var/obj/item/telecube/M) if(mate) return 0 else @@ -126,7 +126,7 @@ update_icon() return 1 -/obj/item/weapon/telecube/proc/teleport_to_mate(var/atom/movable/A, var/areaporting = FALSE) +/obj/item/telecube/proc/teleport_to_mate(var/atom/movable/A, var/areaporting = FALSE) . = FALSE if(!istype(A)) @@ -172,7 +172,7 @@ for(var/atom/movable/M in orange(teleport_range, A)) teleport_to_mate(M, TRUE) -/obj/item/weapon/telecube/proc/swap_with_mate() +/obj/item/telecube/proc/swap_with_mate() . = FALSE if(!mate || !teleport_range) @@ -190,7 +190,7 @@ . = TRUE return . -/obj/item/weapon/telecube/proc/cooldown(var/mate_too = FALSE) +/obj/item/telecube/proc/cooldown(var/mate_too = FALSE) if(!ready) return @@ -200,11 +200,11 @@ if(mate_too && mate) mate.cooldown(mate_too = FALSE) //No infinite recursion pls -/obj/item/weapon/telecube/proc/ready() +/obj/item/telecube/proc/ready() ready = TRUE update_icon() -/obj/item/weapon/telecube/proc/animate_out(var/atom/movable/AM) +/obj/item/telecube/proc/animate_out(var/atom/movable/AM) //See atom cloak/uncloak animations for comments var/atom/movable/target = AM var/our_filter_index = target.filters.len+1 @@ -215,7 +215,7 @@ sleep(5) target.filters -= filter(type="blur", size = 2) -/obj/item/weapon/telecube/proc/animate_in(var/atom/movable/AM) +/obj/item/telecube/proc/animate_in(var/atom/movable/AM) //See atom cloak/uncloak animations for comments var/atom/movable/target = AM var/our_filter_index = target.filters.len+1 @@ -226,44 +226,44 @@ sleep(5) target.filters -= filter(type="blur", size = 0) -/obj/item/weapon/telecube/CtrlClick(mob/user) +/obj/item/telecube/CtrlClick(mob/user) if(Adjacent(user) && teleport_to_mate(user)) cooldown(mate_too = FALSE) -/obj/item/weapon/telecube/AltClick(mob/user) +/obj/item/telecube/AltClick(mob/user) if(Adjacent(user) && swap_with_mate()) cooldown(mate_too = TRUE) -/obj/item/weapon/telecube/Bump(var/atom/movable/AM) +/obj/item/telecube/Bump(var/atom/movable/AM) if(teleport_to_mate(AM)) cooldown(mate_too = FALSE) . = ..() -/obj/item/weapon/telecube/Bumped(var/atom/movable/M) +/obj/item/telecube/Bumped(var/atom/movable/M) if(teleport_to_mate(M)) cooldown(mate_too = FALSE) . = ..() // Subtypes -/obj/item/weapon/telecube/mated +/obj/item/telecube/mated start_paired = TRUE -/obj/item/weapon/telecube/randomized +/obj/item/telecube/randomized randomize_colors = TRUE -/obj/item/weapon/telecube/randomized/mated +/obj/item/telecube/randomized/mated start_paired = TRUE -/obj/item/weapon/telecube/precursor +/obj/item/telecube/precursor glow_color = "#FF1D8E" color = "#2F1B26" -/obj/item/weapon/telecube/precursor/mated +/obj/item/telecube/precursor/mated start_paired = TRUE -/obj/item/weapon/telecube/precursor/mated/zone +/obj/item/telecube/precursor/mated/zone teleport_range = 2 -/obj/item/weapon/telecube/precursor/mated/mirrorcolor +/obj/item/telecube/precursor/mated/mirrorcolor mirror_colors = TRUE diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 5c1ea9dd9d6..d02814ed9fd 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -1,4 +1,4 @@ -/obj/item/device/assembly +/obj/item/assembly name = "assembly" desc = "A small electronic device that should never exist." icon = 'icons/obj/assemblies/new_assemblies.dmi' @@ -14,7 +14,7 @@ var/secured = 1 var/list/attached_overlays = null - var/obj/item/device/assembly_holder/holder = null + var/obj/item/assembly_holder/holder = null var/cooldown = FALSE //To prevent spam var/wires = WIRE_RECEIVE | WIRE_PULSE @@ -24,49 +24,49 @@ var/const/WIRE_RADIO_RECEIVE = 8 //Allows Pulsed(1) to call Activate() var/const/WIRE_RADIO_PULSE = 16 //Allows Pulse(1) to send a radio message -/obj/item/device/assembly/proc/holder_movement() +/obj/item/assembly/proc/holder_movement() return -/obj/item/device/assembly/proc/process_cooldown() +/obj/item/assembly/proc/process_cooldown() if(cooldown) return FALSE cooldown = TRUE VARSET_IN(src, cooldown, FALSE, 2 SECONDS) return TRUE -/obj/item/device/assembly/proc/pulsed(var/radio = 0) +/obj/item/assembly/proc/pulsed(var/radio = 0) if(holder && (wires & WIRE_RECEIVE)) activate() if(radio && (wires & WIRE_RADIO_RECEIVE)) activate() return 1 -/obj/item/device/assembly/proc/pulse(var/radio = 0) +/obj/item/assembly/proc/pulse(var/radio = 0) if(holder && (wires & WIRE_PULSE)) holder.process_activation(src, 1, 0) if(holder && (wires & WIRE_PULSE_SPECIAL)) holder.process_activation(src, 0, 1) return 1 -/obj/item/device/assembly/proc/activate() +/obj/item/assembly/proc/activate() if(!secured || !process_cooldown()) return FALSE return TRUE -/obj/item/device/assembly/proc/toggle_secure() +/obj/item/assembly/proc/toggle_secure() secured = !secured update_icon() return secured -/obj/item/device/assembly/proc/attach_assembly(var/obj/item/device/assembly/A, var/mob/user) - holder = new/obj/item/device/assembly_holder(get_turf(src)) +/obj/item/assembly/proc/attach_assembly(var/obj/item/assembly/A, var/mob/user) + holder = new/obj/item/assembly_holder(get_turf(src)) if(holder.attach(A,src,user)) to_chat(user, "You attach \the [A] to \the [src]!") return TRUE -/obj/item/device/assembly/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/assembly/attackby(obj/item/W as obj, mob/user as mob) if(isassembly(W)) - var/obj/item/device/assembly/A = W + var/obj/item/assembly/A = W if((!A.secured) && (!secured)) attach_assembly(A,user) return @@ -78,10 +78,10 @@ return return ..() -/obj/item/device/assembly/process() +/obj/item/assembly/process() return PROCESS_KILL -/obj/item/device/assembly/examine(mob/user) +/obj/item/assembly/examine(mob/user) . = ..() if((in_range(src, user) || loc == user)) if(secured) @@ -89,20 +89,20 @@ else . += "\The [src] can be attached!" -/obj/item/device/assembly/attack_self(mob/user as mob) +/obj/item/assembly/attack_self(mob/user as mob) if(!user) return 0 user.set_machine(src) tgui_interact(user) return 1 -/obj/item/device/assembly/tgui_state(mob/user) +/obj/item/assembly/tgui_state(mob/user) return GLOB.tgui_deep_inventory_state -/obj/item/device/assembly/tgui_interact(mob/user, datum/tgui/ui) +/obj/item/assembly/tgui_interact(mob/user, datum/tgui/ui) return // tgui goes here -/obj/item/device/assembly/tgui_host() - if(istype(loc, /obj/item/device/assembly_holder)) +/obj/item/assembly/tgui_host() + if(istype(loc, /obj/item/assembly_holder)) return loc.tgui_host() return ..() diff --git a/code/modules/assembly/helpers.dm b/code/modules/assembly/helpers.dm index 44164fb72b2..c5afef9b795 100644 --- a/code/modules/assembly/helpers.dm +++ b/code/modules/assembly/helpers.dm @@ -1,29 +1,29 @@ /proc/isassembly(O) - if(istype(O, /obj/item/device/assembly)) + if(istype(O, /obj/item/assembly)) return 1 return 0 /proc/isigniter(O) - if(istype(O, /obj/item/device/assembly/igniter)) + if(istype(O, /obj/item/assembly/igniter)) return 1 return 0 /proc/isinfared(O) - if(istype(O, /obj/item/device/assembly/infra)) + if(istype(O, /obj/item/assembly/infra)) return 1 return 0 /proc/isprox(O) - if(istype(O, /obj/item/device/assembly/prox_sensor)) + if(istype(O, /obj/item/assembly/prox_sensor)) return 1 return 0 /proc/issignaler(O) - if(istype(O, /obj/item/device/assembly/signaler)) + if(istype(O, /obj/item/assembly/signaler)) return 1 return 0 /proc/istimer(O) - if(istype(O, /obj/item/device/assembly/timer)) + if(istype(O, /obj/item/assembly/timer)) return 1 return 0 diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 32ee55d553c..1ce68e1c37e 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -1,4 +1,4 @@ -/obj/item/device/assembly_holder +/obj/item/assembly_holder name = "Assembly" icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = "holder" @@ -9,11 +9,11 @@ throw_range = 10 var/secured = 0 - var/obj/item/device/assembly/a_left = null - var/obj/item/device/assembly/a_right = null + var/obj/item/assembly/a_left = null + var/obj/item/assembly/a_right = null var/obj/special_assembly = null -/obj/item/device/assembly_holder/proc/attach(var/obj/item/device/assembly/D, var/obj/item/device/assembly/D2, var/mob/user) +/obj/item/assembly_holder/proc/attach(var/obj/item/assembly/D, var/obj/item/assembly/D2, var/mob/user) if(!D || !D2) return FALSE @@ -39,10 +39,10 @@ return TRUE -/obj/item/device/assembly_holder/proc/detached() +/obj/item/assembly_holder/proc/detached() return -/obj/item/device/assembly_holder/update_icon() +/obj/item/assembly_holder/update_icon() cut_overlays() if(a_left) add_overlay("[a_left.icon_state]_left") @@ -55,7 +55,7 @@ if(master) master.update_icon() -/obj/item/device/assembly_holder/examine(mob/user) +/obj/item/assembly_holder/examine(mob/user) . = ..() if ((in_range(src, user) || src.loc == user)) if (src.secured) @@ -63,20 +63,20 @@ else . += "\The [src] can be attached!" -/obj/item/device/assembly_holder/Moved(atom/old_loc, direction, forced = FALSE) +/obj/item/assembly_holder/Moved(atom/old_loc, direction, forced = FALSE) . = ..() if(isturf(old_loc)) unsense_proximity(callback = /atom/proc/HasProximity, center = old_loc) if(isturf(loc)) sense_proximity(callback = /atom/proc/HasProximity) -/obj/item/device/assembly_holder/HasProximity(turf/T, atom/movable/AM, old_loc) +/obj/item/assembly_holder/HasProximity(turf/T, atom/movable/AM, old_loc) if(a_left) a_left.HasProximity(T, AM, old_loc) if(a_right) a_right.HasProximity(T, AM, old_loc) -/obj/item/device/assembly_holder/Crossed(atom/movable/AM as mob|obj) +/obj/item/assembly_holder/Crossed(atom/movable/AM as mob|obj) if(AM.is_incorporeal()) return if(a_left) @@ -84,25 +84,25 @@ if(a_right) a_right.Crossed(AM) -/obj/item/device/assembly_holder/on_found(mob/finder as mob) +/obj/item/assembly_holder/on_found(mob/finder as mob) if(a_left) a_left.on_found(finder) if(a_right) a_right.on_found(finder) -/obj/item/device/assembly_holder/Moved(atom/old_loc, direction, forced = FALSE) +/obj/item/assembly_holder/Moved(atom/old_loc, direction, forced = FALSE) . = ..() if(a_left && a_right) a_left.holder_movement() a_right.holder_movement() -/obj/item/device/assembly_holder/attack_hand()//Perhapse this should be a holder_pickup proc instead, can add if needbe I guess +/obj/item/assembly_holder/attack_hand()//Perhapse this should be a holder_pickup proc instead, can add if needbe I guess if(a_left && a_right) a_left.holder_movement() a_right.holder_movement() ..() -/obj/item/device/assembly_holder/attackby(var/obj/item/weapon/W, var/mob/user) +/obj/item/assembly_holder/attackby(var/obj/item/W, var/mob/user) if(W.has_tool_quality(TOOL_SCREWDRIVER)) if(!a_left || !a_right) to_chat(user, " BUG:Assembly part missing, please report this!") @@ -119,7 +119,7 @@ else ..() -/obj/item/device/assembly_holder/attack_self(var/mob/user) +/obj/item/assembly_holder/attack_self(var/mob/user) src.add_fingerprint(user) if(src.secured) if(!a_left || !a_right) @@ -131,9 +131,9 @@ if("Right") a_right.attack_self(user) return else - if(!istype(a_left,/obj/item/device/assembly/igniter)) + if(!istype(a_left,/obj/item/assembly/igniter)) a_left.attack_self(user) - if(!istype(a_right,/obj/item/device/assembly/igniter)) + if(!istype(a_right,/obj/item/assembly/igniter)) a_right.attack_self(user) else var/turf/T = get_turf(src) @@ -147,7 +147,7 @@ a_right.forceMove(T) qdel(src) -/obj/item/device/assembly_holder/proc/process_activation(var/obj/D, var/normal = 1) +/obj/item/assembly_holder/proc/process_activation(var/obj/D, var/normal = 1) if(!D) return 0 if(!secured) @@ -161,23 +161,23 @@ master.receive_signal() return 1 -/obj/item/device/assembly_holder/hear_talk(mob/M, list/message_pieces, verb) +/obj/item/assembly_holder/hear_talk(mob/M, list/message_pieces, verb) if(a_right) a_right.hear_talk(M, message_pieces, verb) if(a_left) a_left.hear_talk(M, message_pieces, verb) -/obj/item/device/assembly_holder/timer_igniter +/obj/item/assembly_holder/timer_igniter name = "timer-igniter assembly" -/obj/item/device/assembly_holder/timer_igniter/New() +/obj/item/assembly_holder/timer_igniter/New() ..() - var/obj/item/device/assembly/igniter/ign = new(src) + var/obj/item/assembly/igniter/ign = new(src) ign.secured = 1 ign.holder = src - var/obj/item/device/assembly/timer/tmr = new(src) + var/obj/item/assembly/timer/tmr = new(src) tmr.time = 5 tmr.secured = 1 tmr.holder = src @@ -188,26 +188,26 @@ update_icon() name = initial(name) + " ([tmr.time] secs)" - loc.verbs += /obj/item/device/assembly_holder/timer_igniter/verb/configure + loc.verbs += /obj/item/assembly_holder/timer_igniter/verb/configure -/obj/item/device/assembly_holder/timer_igniter/detached() - loc.verbs -= /obj/item/device/assembly_holder/timer_igniter/verb/configure +/obj/item/assembly_holder/timer_igniter/detached() + loc.verbs -= /obj/item/assembly_holder/timer_igniter/verb/configure ..() -/obj/item/device/assembly_holder/timer_igniter/verb/configure() +/obj/item/assembly_holder/timer_igniter/verb/configure() set name = "Set Timer" set category = "Object" set src in usr if ( !(usr.stat || usr.restrained()) ) - var/obj/item/device/assembly_holder/holder - if(istype(src,/obj/item/weapon/grenade/chem_grenade)) - var/obj/item/weapon/grenade/chem_grenade/gren = src + var/obj/item/assembly_holder/holder + if(istype(src,/obj/item/grenade/chem_grenade)) + var/obj/item/grenade/chem_grenade/gren = src holder=gren.detonator - var/obj/item/device/assembly/timer/tmr = holder.a_left - if(!istype(tmr,/obj/item/device/assembly/timer)) + var/obj/item/assembly/timer/tmr = holder.a_left + if(!istype(tmr,/obj/item/assembly/timer)) tmr = holder.a_right - if(!istype(tmr,/obj/item/device/assembly/timer)) + if(!istype(tmr,/obj/item/assembly/timer)) to_chat(usr, "This detonator has no timer.") return diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 0827836c355..c2fcb0eb7bf 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -1,4 +1,4 @@ -/obj/item/device/assembly/igniter +/obj/item/assembly/igniter name = "igniter" desc = "A small electronic device able to ignite combustable substances." icon_state = "igniter" @@ -8,18 +8,18 @@ secured = 1 wires = WIRE_RECEIVE -/obj/item/device/assembly/igniter/activate() +/obj/item/assembly/igniter/activate() if(!..()) return FALSE - if(holder && istype(holder.loc,/obj/item/weapon/grenade/chem_grenade)) - var/obj/item/weapon/grenade/chem_grenade/grenade = holder.loc + if(holder && istype(holder.loc,/obj/item/grenade/chem_grenade)) + var/obj/item/grenade/chem_grenade/grenade = holder.loc grenade.detonate() else var/turf/location = get_turf(loc) if(location) location.hotspot_expose(1000,1000) - if (istype(src.loc,/obj/item/device/assembly_holder)) + if (istype(src.loc,/obj/item/assembly_holder)) if (istype(src.loc.loc, /obj/structure/reagent_dispensers/fueltank/)) var/obj/structure/reagent_dispensers/fueltank/tank = src.loc.loc if (tank && tank.modded) @@ -32,9 +32,9 @@ return TRUE -/obj/item/device/assembly/igniter/attack_self(var/mob/user) +/obj/item/assembly/igniter/attack_self(var/mob/user) activate() add_fingerprint(user) -/obj/item/device/assembly/igniter/is_hot() +/obj/item/assembly/igniter/is_hot() return TRUE \ No newline at end of file diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 565be2abc1e..7ed5ec10dca 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -1,6 +1,6 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 -/obj/item/device/assembly/infra +/obj/item/assembly/infra name = "infrared emitter" desc = "Emits a visible or invisible beam and is triggered when the beam is interrupted." icon_state = "infrared" @@ -15,21 +15,21 @@ var/visible = 0 var/list/i_beams = null -/obj/item/device/assembly/infra/activate() +/obj/item/assembly/infra/activate() if(!..()) return FALSE on = !on update_icon() return TRUE -/obj/item/device/assembly/infra/toggle_secure() +/obj/item/assembly/infra/toggle_secure() secured = !secured if(!secured) toggle_state(FALSE) update_icon() return secured -/obj/item/device/assembly/infra/proc/toggle_state(var/picked) +/obj/item/assembly/infra/proc/toggle_state(var/picked) if(!isnull(picked)) on = picked else @@ -42,7 +42,7 @@ QDEL_LIST_NULL(i_beams) return on -/obj/item/device/assembly/infra/update_icon() +/obj/item/assembly/infra/update_icon() cut_overlays() LAZYCLEARLIST(attached_overlays) if(on) @@ -52,7 +52,7 @@ if(holder) holder.update_icon(2) -/obj/item/device/assembly/infra/process() +/obj/item/assembly/infra/process() if(!on && i_beams) QDEL_LIST_NULL(i_beams) return @@ -60,7 +60,7 @@ if(!i_beams && secured && (istype(loc, /turf) || (holder && istype(holder.loc, /turf)))) create_beams() -/obj/item/device/assembly/infra/proc/create_beams(var/limit = 8) +/obj/item/assembly/infra/proc/create_beams(var/limit = 8) var/current_spot = get_turf(src) for(var/i = 1 to limit) var/obj/effect/beam/i_beam/I = new /obj/effect/beam/i_beam(current_spot) @@ -73,26 +73,26 @@ i_beams |= I I.visible = visible -/obj/item/device/assembly/infra/attack_hand() +/obj/item/assembly/infra/attack_hand() QDEL_LIST_NULL(i_beams) ..() -/obj/item/device/assembly/infra/Move() +/obj/item/assembly/infra/Move() var/t = dir . = ..() set_dir(t) -/obj/item/device/assembly/infra/Moved(atom/old_loc, direction, forced = FALSE) +/obj/item/assembly/infra/Moved(atom/old_loc, direction, forced = FALSE) . = ..() QDEL_LIST_NULL(i_beams) -/obj/item/device/assembly/infra/holder_movement() +/obj/item/assembly/infra/holder_movement() if(!holder) return FALSE QDEL_LIST_NULL(i_beams) return TRUE -/obj/item/device/assembly/infra/proc/trigger_beam() +/obj/item/assembly/infra/proc/trigger_beam() if(!process_cooldown()) return FALSE pulse(0) @@ -100,7 +100,7 @@ if(!holder) visible_message("[icon2html(src,viewers(src))] *beep* *beep*") -/obj/item/device/assembly/infra/tgui_interact(mob/user, datum/tgui/ui) +/obj/item/assembly/infra/tgui_interact(mob/user, datum/tgui/ui) if(!secured) to_chat(user, "[src] is unsecured!") return FALSE @@ -109,7 +109,7 @@ ui = new(user, src, "AssemblyInfrared", name) ui.open() -/obj/item/device/assembly/infra/tgui_data(mob/user) +/obj/item/assembly/infra/tgui_data(mob/user) var/list/data = ..() data["on"] = on @@ -117,7 +117,7 @@ return data -/obj/item/device/assembly/infra/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) +/obj/item/assembly/infra/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) if(..()) return TRUE @@ -132,7 +132,7 @@ CHECK_TICK return TRUE -/obj/item/device/assembly/infra/verb/rotate_clockwise() +/obj/item/assembly/infra/verb/rotate_clockwise() set name = "Rotate Infrared Laser Clockwise" set category = "Object" set src in usr @@ -140,7 +140,7 @@ set_dir(turn(dir, 270)) //VOREstation edit: counter-clockwise rotation -/obj/item/device/assembly/infra/verb/rotate_counterclockwise() +/obj/item/assembly/infra/verb/rotate_counterclockwise() set name = "Rotate Infrared Laser Counter-Clockwise" set category = "Object" set src in usr @@ -154,7 +154,7 @@ name = "i beam" icon = 'icons/obj/projectiles.dmi' icon_state = "ibeam" - var/obj/item/device/assembly/infra/master = null + var/obj/item/assembly/infra/master = null var/visible = 0 anchored = TRUE diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index de11bc20a79..7feca5f9ad1 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -1,4 +1,4 @@ -/obj/item/device/assembly/mousetrap +/obj/item/assembly/mousetrap name = "mousetrap" desc = "A handy little spring-loaded trap for catching pesty rodents." icon_state = "mousetrap" @@ -7,12 +7,12 @@ var/armed = 0 -/obj/item/device/assembly/mousetrap/examine(var/mob/user) +/obj/item/assembly/mousetrap/examine(var/mob/user) . = ..(user) if(armed) . += "It looks like it's armed." -/obj/item/device/assembly/mousetrap/update_icon() +/obj/item/assembly/mousetrap/update_icon() if(armed) icon_state = "mousetraparmed" else @@ -20,7 +20,7 @@ if(holder) holder.update_icon() -/obj/item/device/assembly/mousetrap/proc/triggered(var/mob/target, var/type = "feet") +/obj/item/assembly/mousetrap/proc/triggered(var/mob/target, var/type = "feet") if(!armed) return var/obj/item/organ/external/affecting = null @@ -49,7 +49,7 @@ update_icon() pulse(0) -/obj/item/device/assembly/mousetrap/attack_self(var/mob/living/user) +/obj/item/assembly/mousetrap/attack_self(var/mob/living/user) if(!armed) to_chat(user, "You arm [src].") else @@ -67,7 +67,7 @@ update_icon() playsound(user, 'sound/weapons/handcuffs.ogg', 30, 1, -3) -/obj/item/device/assembly/mousetrap/attack_hand(var/mob/living/user) +/obj/item/assembly/mousetrap/attack_hand(var/mob/living/user) if(armed) if((CLUMSY in user.mutations) && prob(50)) var/which_hand = "l_hand" @@ -79,7 +79,7 @@ return ..() -/obj/item/device/assembly/mousetrap/Crossed(var/atom/movable/AM) +/obj/item/assembly/mousetrap/Crossed(var/atom/movable/AM) if(AM.is_incorporeal()) return if(armed) @@ -93,7 +93,7 @@ triggered(AM) ..() -/obj/item/device/assembly/mousetrap/on_found(var/mob/living/finder) +/obj/item/assembly/mousetrap/on_found(var/mob/living/finder) if(armed) finder.visible_message("[finder] accidentally sets off [src], breaking their fingers.", \ "You accidentally trigger [src]!") @@ -101,17 +101,17 @@ return 1 //end the search! return 0 -/obj/item/device/assembly/mousetrap/hitby(var/atom/movable/A) +/obj/item/assembly/mousetrap/hitby(var/atom/movable/A) if(!armed) return ..() visible_message("[src] is triggered by [A].") triggered(null) -/obj/item/device/assembly/mousetrap/armed +/obj/item/assembly/mousetrap/armed icon_state = "mousetraparmed" armed = 1 -/obj/item/device/assembly/mousetrap/verb/hide_under() +/obj/item/assembly/mousetrap/verb/hide_under() set src in oview(1) set name = "Hide" set category = "Object" diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 93e8cd11085..c1d389844c2 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -1,4 +1,4 @@ -/obj/item/device/assembly/prox_sensor +/obj/item/assembly/prox_sensor name = "proximity sensor" desc = "Used for scanning and alerting when someone enters a certain proximity." icon_state = "prox" @@ -14,14 +14,14 @@ var/range = 2 -/obj/item/device/assembly/prox_sensor/activate() +/obj/item/assembly/prox_sensor/activate() if(!..()) return FALSE timing = !timing update_icon() return FALSE -/obj/item/device/assembly/prox_sensor/toggle_secure() +/obj/item/assembly/prox_sensor/toggle_secure() secured = !secured if(secured) START_PROCESSING(SSobj, src) @@ -32,7 +32,7 @@ update_icon() return secured -/obj/item/device/assembly/prox_sensor/HasProximity(turf/T, atom/movable/AM, old_loc) +/obj/item/assembly/prox_sensor/HasProximity(turf/T, atom/movable/AM, old_loc) if(!istype(AM)) log_debug("DEBUG: HasProximity called with [AM] on [src] ([usr]).") return @@ -41,7 +41,7 @@ if (!isobserver(AM) && AM.move_speed < 12) sense() -/obj/item/device/assembly/prox_sensor/proc/sense() +/obj/item/assembly/prox_sensor/proc/sense() if((!holder && !secured) || !scanning || !process_cooldown()) return FALSE var/turf/mainloc = get_turf(src) @@ -49,7 +49,7 @@ if(!holder) mainloc.visible_message("[icon2html(src,viewers(src))] *beep* *beep*", "*beep* *beep*") -/obj/item/device/assembly/prox_sensor/process() +/obj/item/assembly/prox_sensor/process() if(scanning) var/turf/mainloc = get_turf(src) for(var/mob/living/A in range(range,mainloc)) @@ -63,16 +63,16 @@ toggle_scan() time = initial(time) -/obj/item/device/assembly/prox_sensor/dropped() +/obj/item/assembly/prox_sensor/dropped() sense() -/obj/item/device/assembly/prox_sensor/proc/toggle_scan() +/obj/item/assembly/prox_sensor/proc/toggle_scan() if(!secured) return FALSE scanning = !scanning update_icon() -/obj/item/device/assembly/prox_sensor/update_icon() +/obj/item/assembly/prox_sensor/update_icon() cut_overlays() LAZYCLEARLIST(attached_overlays) if(timing) @@ -83,11 +83,11 @@ LAZYADD(attached_overlays, "prox_scanning") if(holder) holder.update_icon() - if(holder && istype(holder.loc,/obj/item/weapon/grenade/chem_grenade)) - var/obj/item/weapon/grenade/chem_grenade/grenade = holder.loc + if(holder && istype(holder.loc,/obj/item/grenade/chem_grenade)) + var/obj/item/grenade/chem_grenade/grenade = holder.loc grenade.primed(scanning) -/obj/item/device/assembly/prox_sensor/Moved(atom/old_loc, direction, forced = FALSE) +/obj/item/assembly/prox_sensor/Moved(atom/old_loc, direction, forced = FALSE) . = ..() if(isturf(old_loc)) unsense_proximity(range = range, callback = /atom/proc/HasProximity, center = old_loc) @@ -95,7 +95,7 @@ sense_proximity(range = range, callback = /atom/proc/HasProximity) sense() -/obj/item/device/assembly/prox_sensor/tgui_interact(mob/user, datum/tgui/ui) +/obj/item/assembly/prox_sensor/tgui_interact(mob/user, datum/tgui/ui) if(!secured) to_chat(user, "[src] is unsecured!") return FALSE @@ -104,7 +104,7 @@ ui = new(user, src, "AssemblyProx", name) ui.open() -/obj/item/device/assembly/prox_sensor/tgui_data(mob/user) +/obj/item/assembly/prox_sensor/tgui_data(mob/user) var/list/data = ..() data["time"] = time @@ -115,7 +115,7 @@ return data -/obj/item/device/assembly/prox_sensor/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) +/obj/item/assembly/prox_sensor/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) if(..()) return TRUE diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index c55d6a72cab..b5f29a56cd2 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -3,7 +3,7 @@ desc = "This appears to be made from both an electropack and a helmet." icon_state = "shock_kit" var/obj/item/clothing/head/helmet/part1 = null - var/obj/item/device/radio/electropack/part2 = null + var/obj/item/radio/electropack/part2 = null var/status = 0 w_class = ITEMSIZE_HUGE @@ -13,7 +13,7 @@ ..() return -/obj/item/assembly/shock_kit/attackby(var/obj/item/weapon/W, var/mob/user) +/obj/item/assembly/shock_kit/attackby(var/obj/item/W, var/mob/user) if(W.has_tool_quality(TOOL_WRENCH) && !status) var/turf/T = loc if(ismob(T)) diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 3232e602d06..a474c4b24ff 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -1,4 +1,4 @@ -/obj/item/device/assembly/signaler +/obj/item/assembly/signaler name = "remote signaling device" desc = "Used to remotely activate devices. Tap against another secured signaler to transfer configuration." icon_state = "signaller" @@ -16,27 +16,27 @@ var/datum/wires/connected = null var/datum/radio_frequency/radio_connection -/obj/item/device/assembly/signaler/Initialize() +/obj/item/assembly/signaler/Initialize() . = ..() set_frequency(frequency) -/obj/item/device/assembly/signaler/activate() +/obj/item/assembly/signaler/activate() if(!process_cooldown()) return FALSE signal() return TRUE -/obj/item/device/assembly/signaler/update_icon() +/obj/item/assembly/signaler/update_icon() if(holder) holder.update_icon() -/obj/item/device/assembly/signaler/tgui_interact(mob/user, datum/tgui/ui) +/obj/item/assembly/signaler/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Signaler", name) ui.open() -/obj/item/device/assembly/signaler/tgui_data(mob/user) +/obj/item/assembly/signaler/tgui_data(mob/user) var/list/data = list() data["frequency"] = frequency data["code"] = code @@ -44,7 +44,7 @@ data["maxFrequency"] = RADIO_HIGH_FREQ return data -/obj/item/device/assembly/signaler/tgui_act(action, params) +/obj/item/assembly/signaler/tgui_act(action, params) if(..()) return TRUE @@ -70,9 +70,9 @@ update_icon() -/obj/item/device/assembly/signaler/attackby(var/obj/item/weapon/W, mob/user, params) +/obj/item/assembly/signaler/attackby(var/obj/item/W, mob/user, params) if(issignaler(W)) - var/obj/item/device/assembly/signaler/signaler2 = W + var/obj/item/assembly/signaler/signaler2 = W if(secured && signaler2.secured) code = signaler2.code set_frequency(signaler2.frequency) @@ -80,7 +80,7 @@ else ..() -/obj/item/device/assembly/signaler/proc/signal() +/obj/item/assembly/signaler/proc/signal() if(!radio_connection) return if(is_jammed(src)) @@ -92,7 +92,7 @@ signal.data["message"] = "ACTIVATE" radio_connection.post_signal(src, signal) -/obj/item/device/assembly/signaler/pulse(var/radio = 0) +/obj/item/assembly/signaler/pulse(var/radio = 0) if(is_jammed(src)) return FALSE if(connected && wires) @@ -103,7 +103,7 @@ ..(radio) return TRUE -/obj/item/device/assembly/signaler/receive_signal(datum/signal/signal) +/obj/item/assembly/signaler/receive_signal(datum/signal/signal) if(!signal) return FALSE if(signal.encryption != code) @@ -118,7 +118,7 @@ for(var/mob/O in hearers(1, src.loc)) O.show_message("[icon2html(src, O.client)] *beep* *beep*", 3, "*beep* *beep*", 2) -/obj/item/device/assembly/signaler/proc/set_frequency(new_frequency) +/obj/item/assembly/signaler/proc/set_frequency(new_frequency) if(!frequency) return if(!radio_controller) @@ -130,7 +130,7 @@ frequency = new_frequency radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT) -/obj/item/device/assembly/signaler/Destroy() +/obj/item/assembly/signaler/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) frequency = 0 diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 58804b4a5f7..946bcfa39a6 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -1,4 +1,4 @@ -/obj/item/device/assembly/timer +/obj/item/assembly/timer name = "timer" desc = "Used to time things. Works well with contraptions which has to count down. Tick tock." icon_state = "timer" @@ -13,7 +13,7 @@ var/time = 10 -/obj/item/device/assembly/timer/activate() +/obj/item/assembly/timer/activate() if(!..()) return FALSE @@ -22,7 +22,7 @@ update_icon() return 0 -/obj/item/device/assembly/timer/toggle_secure() +/obj/item/assembly/timer/toggle_secure() secured = !secured if(secured) START_PROCESSING(SSobj, src) @@ -32,27 +32,27 @@ update_icon() return secured -/obj/item/device/assembly/timer/proc/set_state(var/state) +/obj/item/assembly/timer/proc/set_state(var/state) if(state && !timing) //Not running, starting though START_PROCESSING(SSobj, src) else if(timing && !state) //Running, stopping though STOP_PROCESSING(SSobj, src) timing = state -/obj/item/device/assembly/timer/proc/timer_end() +/obj/item/assembly/timer/proc/timer_end() if(!secured) return 0 pulse(0) if(!holder) visible_message("[icon2html(src,viewers(src))] *beep* *beep*", "*beep* *beep*") -/obj/item/device/assembly/timer/process() +/obj/item/assembly/timer/process() if(timing && time-- <= 0) set_state(0) timer_end() time = 10 -/obj/item/device/assembly/timer/update_icon() +/obj/item/assembly/timer/update_icon() cut_overlays() attached_overlays = list() if(timing) @@ -62,7 +62,7 @@ holder.update_icon() return -/obj/item/device/assembly/timer/tgui_interact(mob/user, datum/tgui/ui) +/obj/item/assembly/timer/tgui_interact(mob/user, datum/tgui/ui) if(!secured) to_chat(user, "[src] is unsecured!") return FALSE @@ -71,13 +71,13 @@ ui = new(user, src, "AssemblyTimer", name) ui.open() -/obj/item/device/assembly/timer/tgui_data(mob/user) +/obj/item/assembly/timer/tgui_data(mob/user) var/list/data = ..() data["time"] = time data["timing"] = timing return data -/obj/item/device/assembly/timer/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) +/obj/item/assembly/timer/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) if(..()) return TRUE diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index 2783f92b767..745525ea92b 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -1,4 +1,4 @@ -/obj/item/device/assembly/voice +/obj/item/assembly/voice name = "voice analyzer" desc = "A small electronic device able to record a voice sample, and send a signal when that sample is repeated." icon_state = "voice" @@ -7,7 +7,7 @@ var/listening = 0 var/recorded //the activation message -/obj/item/device/assembly/voice/hear_talk(mob/M, list/message_pieces, verb) +/obj/item/assembly/voice/hear_talk(mob/M, list/message_pieces, verb) var/msg = multilingual_to_message(message_pieces) if(listening) recorded = msg @@ -18,7 +18,7 @@ if(findtext(msg, recorded)) pulse(0) -/obj/item/device/assembly/voice/activate() +/obj/item/assembly/voice/activate() if(secured) if(!holder) listening = !listening @@ -26,12 +26,12 @@ T.visible_message("[icon2html(src,viewers(src))] beeps, \"[listening ? "Now" : "No longer"] recording input.\"") -/obj/item/device/assembly/voice/attack_self(mob/user) +/obj/item/assembly/voice/attack_self(mob/user) if(!user) return FALSE activate() return TRUE -/obj/item/device/assembly/voice/toggle_secure() +/obj/item/assembly/voice/toggle_secure() . = ..() listening = 0 diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index f8966183654..572c1a5d26e 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -354,10 +354,10 @@ // I really don't like the fact that I have to do this, but what the hell else *can* I do to make all of these // random special items work? - if(ispath(item, /obj/item/weapon/reagent_containers/food/drinks/glass2) && !ispath(item, /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask)) - var/obj/item/weapon/reagent_containers/food/drinks/glass2/G = item + if(ispath(item, /obj/item/reagent_containers/food/drinks/glass2) && !ispath(item, /obj/item/reagent_containers/food/drinks/glass2/fitnessflask)) + var/obj/item/reagent_containers/food/drinks/glass2/G = item icon_state = initial(G.base_icon) - if(ispath(item, /obj/item/weapon/reagent_containers/hypospray/autoinjector)) + if(ispath(item, /obj/item/reagent_containers/hypospray/autoinjector)) icon_state += "0" var/icon/I diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 7d7d0e0ca15..c61f8cd792d 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -69,7 +69,7 @@ if(src.corpseback) M.equip_to_slot_or_del(new src.corpseback(M), slot_back) if(src.corpseid == 1) - var/obj/item/weapon/card/id/W = new(M) + var/obj/item/card/id/W = new(M) var/datum/job/jobdatum for(var/jobtype in typesof(/datum/job)) var/datum/job/J = new jobtype @@ -103,10 +103,10 @@ corpsesuit = /obj/item/clothing/suit/armor/vest corpseshoes = /obj/item/clothing/shoes/boots/swat corpsegloves = /obj/item/clothing/gloves/swat - corpseradio = /obj/item/device/radio/headset + corpseradio = /obj/item/radio/headset corpsemask = /obj/item/clothing/mask/gas corpsehelmet = /obj/item/clothing/head/helmet/swat - corpseback = /obj/item/weapon/storage/backpack + corpseback = /obj/item/storage/backpack corpseid = 1 corpseidjob = "Operative" corpseidaccess = JOB_SYNDICATE @@ -117,11 +117,11 @@ corpsesuit = /obj/item/clothing/suit/space/void/merc corpseshoes = /obj/item/clothing/shoes/boots/swat corpsegloves = /obj/item/clothing/gloves/swat - corpseradio = /obj/item/device/radio/headset + corpseradio = /obj/item/radio/headset corpsemask = /obj/item/clothing/mask/gas/syndicate corpsehelmet = /obj/item/clothing/head/helmet/space/void/merc - corpseback = /obj/item/weapon/tank/jetpack/oxygen - corpsepocket1 = /obj/item/weapon/tank/emergency/oxygen + corpseback = /obj/item/tank/jetpack/oxygen + corpsepocket1 = /obj/item/tank/emergency/oxygen corpseid = 1 corpseidjob = "Operative" corpseidaccess = JOB_SYNDICATE @@ -142,8 +142,8 @@ corpsesuit = /obj/item/clothing/suit/chef/classic corpseshoes = /obj/item/clothing/shoes/black corpsehelmet = /obj/item/clothing/head/chefhat - corpseback = /obj/item/weapon/storage/backpack - corpseradio = /obj/item/device/radio/headset + corpseback = /obj/item/storage/backpack + corpseradio = /obj/item/radio/headset corpseid = 1 corpseidjob = JOB_CHEF corpseidaccess = JOB_CHEF @@ -151,11 +151,11 @@ /obj/effect/landmark/corpse/doctor name = "Doctor" - corpseradio = /obj/item/device/radio/headset/headset_med + corpseradio = /obj/item/radio/headset/headset_med corpseuniform = /obj/item/clothing/under/rank/medical corpsesuit = /obj/item/clothing/suit/storage/toggle/labcoat - corpseback = /obj/item/weapon/storage/backpack/medic - corpsepocket1 = /obj/item/device/flashlight/pen + corpseback = /obj/item/storage/backpack/medic + corpsepocket1 = /obj/item/flashlight/pen corpseshoes = /obj/item/clothing/shoes/black corpseid = 1 corpseidjob = JOB_MEDICAL_DOCTOR @@ -163,11 +163,11 @@ /obj/effect/landmark/corpse/engineer name = JOB_ENGINEER - corpseradio = /obj/item/device/radio/headset/headset_eng + corpseradio = /obj/item/radio/headset/headset_eng corpseuniform = /obj/item/clothing/under/rank/engineer - corpseback = /obj/item/weapon/storage/backpack/industrial + corpseback = /obj/item/storage/backpack/industrial corpseshoes = /obj/item/clothing/shoes/orange - corpsebelt = /obj/item/weapon/storage/belt/utility/full + corpsebelt = /obj/item/storage/belt/utility/full corpsegloves = /obj/item/clothing/gloves/yellow corpsehelmet = /obj/item/clothing/head/hardhat corpseid = 1 @@ -178,26 +178,26 @@ corpsesuit = /obj/item/clothing/suit/space/void/engineering corpsemask = /obj/item/clothing/mask/breath corpsehelmet = /obj/item/clothing/head/helmet/space/void/engineering - corpseback = /obj/item/weapon/tank/oxygen + corpseback = /obj/item/tank/oxygen /obj/effect/landmark/corpse/clown name = JOB_CLOWN corpseuniform = /obj/item/clothing/under/rank/clown corpseshoes = /obj/item/clothing/shoes/clown_shoes - corpseradio = /obj/item/device/radio/headset + corpseradio = /obj/item/radio/headset corpsemask = /obj/item/clothing/mask/gas/clown_hat - corpsepocket1 = /obj/item/weapon/bikehorn - corpseback = /obj/item/weapon/storage/backpack/clown + corpsepocket1 = /obj/item/bikehorn + corpseback = /obj/item/storage/backpack/clown corpseid = 1 corpseidjob = JOB_CLOWN corpseidaccess = JOB_CLOWN /obj/effect/landmark/corpse/scientist name = JOB_SCIENTIST - corpseradio = /obj/item/device/radio/headset/headset_sci + corpseradio = /obj/item/radio/headset/headset_sci corpseuniform = /obj/item/clothing/under/rank/scientist corpsesuit = /obj/item/clothing/suit/storage/toggle/labcoat/science - corpseback = /obj/item/weapon/storage/backpack + corpseback = /obj/item/storage/backpack corpseshoes = /obj/item/clothing/shoes/white corpseid = 1 corpseidjob = JOB_SCIENTIST @@ -205,10 +205,10 @@ /obj/effect/landmark/corpse/security name = JOB_SECURITY_OFFICER - corpseradio = /obj/item/device/radio/headset/headset_sec + corpseradio = /obj/item/radio/headset/headset_sec corpseuniform = /obj/item/clothing/under/rank/security corpsesuit = /obj/item/clothing/suit/armor/vest - corpseback = /obj/item/weapon/storage/backpack/security + corpseback = /obj/item/storage/backpack/security corpseshoes = /obj/item/clothing/shoes/boots/jackboots corpseglasses = /obj/item/clothing/glasses/sunglasses/sechud corpsegloves = /obj/item/clothing/gloves/black @@ -221,7 +221,7 @@ corpsesuit = /obj/item/clothing/suit/space/void/security corpsemask = /obj/item/clothing/mask/breath corpsehelmet = /obj/item/clothing/head/helmet/space/void/security - corpseback = /obj/item/weapon/tank/jetpack/oxygen + corpseback = /obj/item/tank/jetpack/oxygen /obj/effect/landmark/corpse/security/rig/eva corpsesuit = /obj/item/clothing/suit/space/void/security/alt @@ -237,10 +237,10 @@ random_species = TRUE /obj/effect/landmark/corpse/miner - corpseradio = /obj/item/device/radio/headset/headset_cargo + corpseradio = /obj/item/radio/headset/headset_cargo corpseuniform = /obj/item/clothing/under/rank/miner corpsegloves = /obj/item/clothing/gloves/black - corpseback = /obj/item/weapon/storage/backpack/industrial + corpseback = /obj/item/storage/backpack/industrial corpseshoes = /obj/item/clothing/shoes/black corpseid = 1 corpseidjob = JOB_SHAFT_MINER @@ -250,7 +250,7 @@ corpsesuit = /obj/item/clothing/suit/space/void/mining corpsemask = /obj/item/clothing/mask/breath corpsehelmet = /obj/item/clothing/head/helmet/space/void/mining - corpseback = /obj/item/weapon/tank/oxygen + corpseback = /obj/item/tank/oxygen /////////////////Vintage////////////////////// @@ -261,7 +261,7 @@ corpsesuit = /obj/item/clothing/suit/space/void/refurb corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb corpsemask = /obj/item/clothing/mask/breath - corpseback = /obj/item/weapon/tank/oxygen + corpseback = /obj/item/tank/oxygen corpseid = 1 corpseidjob = "Crewmate" @@ -269,38 +269,38 @@ name = "Unknown " + JOB_ENGINEER corpsesuit = /obj/item/clothing/suit/space/void/refurb/engineering corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb/engineering - corpsebelt = /obj/item/weapon/storage/belt/utility/full - corpseback = /obj/item/weapon/tank/oxygen/yellow + corpsebelt = /obj/item/storage/belt/utility/full + corpseback = /obj/item/tank/oxygen/yellow corpseidjob = JOB_ENGINEER /obj/effect/landmark/corpse/vintage/marine name = "Unknown Marine" corpsesuit = /obj/item/clothing/suit/space/void/refurb/marine corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb/marine - corpsebelt = /obj/item/weapon/storage/belt/security/tactical + corpsebelt = /obj/item/storage/belt/security/tactical corpseidjob = "Marine" /obj/effect/landmark/corpse/vintage/medical name = "Unknown Medic" corpsesuit = /obj/item/clothing/suit/space/void/refurb/medical corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb/medical - corpsebelt = /obj/item/weapon/storage/belt/medical + corpsebelt = /obj/item/storage/belt/medical corpseidjob = "Medic" /obj/effect/landmark/corpse/vintage/mercenary name = "Unknown Mercenary" corpsesuit = /obj/item/clothing/suit/space/void/refurb/mercenary corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb/mercenary - corpsebelt = /obj/item/weapon/storage/belt/security/tactical - corpseback = /obj/item/weapon/tank/oxygen/red + corpsebelt = /obj/item/storage/belt/security/tactical + corpseback = /obj/item/tank/oxygen/red corpseidjob = "Mercenary" /obj/effect/landmark/corpse/vintage/officer name = "Unknown " + JOB_ALT_CAPTAIN corpsesuit = /obj/item/clothing/suit/space/void/refurb/officer corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb/officer - corpseback = /obj/item/weapon/tank/oxygen/yellow corpseidjob = JOB_ALT_CAPTAIN + corpseback = /obj/item/tank/oxygen/yellow /obj/effect/landmark/corpse/vintage/pilot name = "Unknown " + JOB_PILOT @@ -318,7 +318,7 @@ /obj/effect/landmark/corpse/bridgeofficer name = "Bridge Officer" - corpseradio = /obj/item/device/radio/headset/heads/hop + corpseradio = /obj/item/radio/headset/heads/hop corpseuniform = /obj/item/clothing/under/rank/centcom_officer corpsesuit = /obj/item/clothing/suit/armor/bulletproof corpseshoes = /obj/item/clothing/shoes/black @@ -331,13 +331,13 @@ name = "Commander" corpseuniform = /obj/item/clothing/under/rank/centcom_captain corpsesuit = /obj/item/clothing/suit/armor/bulletproof - corpseradio = /obj/item/device/radio/headset/heads/captain + corpseradio = /obj/item/radio/headset/heads/captain corpseglasses = /obj/item/clothing/glasses/eyepatch corpsemask = /obj/item/clothing/mask/smokable/cigarette/cigar/cohiba corpsehelmet = /obj/item/clothing/head/centhat corpsegloves = /obj/item/clothing/gloves/swat corpseshoes = /obj/item/clothing/shoes/boots/swat - corpsepocket1 = /obj/item/weapon/flame/lighter/zippo + corpsepocket1 = /obj/item/flame/lighter/zippo corpseid = 1 corpseidjob = "Commander" corpseidaccess = JOB_ALT_CAPTAIN @@ -348,7 +348,7 @@ name = "Patrolman" corpseuniform = /obj/item/clothing/under/solgov/utility/sifguard corpsesuit = /obj/item/clothing/suit/storage/hooded/wintercoat/solgov - corpsebelt = /obj/item/weapon/storage/belt/security/tactical + corpsebelt = /obj/item/storage/belt/security/tactical corpseglasses = /obj/item/clothing/glasses/sunglasses/sechud corpsemask = /obj/item/clothing/mask/balaclava corpsehelmet = /obj/item/clothing/head/beret/solgov/sifguard @@ -362,7 +362,7 @@ name = "Hedberg-Hammarstrom Mercenary" corpseuniform = /obj/item/clothing/under/solgov/utility/sifguard corpsesuit = /obj/item/clothing/suit/storage/vest/solgov/hedberg - corpsebelt = /obj/item/weapon/storage/belt/security + corpsebelt = /obj/item/storage/belt/security corpseglasses = /obj/item/clothing/glasses/sunglasses/sechud corpsehelmet = /obj/item/clothing/head/beret/corp/hedberg corpseshoes = /obj/item/clothing/shoes/boots/jackboots @@ -371,7 +371,7 @@ /obj/effect/landmark/corpse/hedberg/merc name = "Hedberg-Hammarstrom Mercenary" - corpsebelt = /obj/item/weapon/storage/belt/security/tactical + corpsebelt = /obj/item/storage/belt/security/tactical corpseglasses = /obj/item/clothing/glasses/sunglasses/sechud corpsehelmet = /obj/item/clothing/head/helmet/flexitac corpsegloves = /obj/item/clothing/gloves/combat diff --git a/code/modules/awaymissions/exile.dm b/code/modules/awaymissions/exile.dm index 1292812a77e..4c91143ae5c 100644 --- a/code/modules/awaymissions/exile.dm +++ b/code/modules/awaymissions/exile.dm @@ -1,36 +1,36 @@ //////Exile implants will allow you to use the station gate, but not return home. This will allow security to exile badguys/for badguys to exile their kill targets//////// -/obj/item/weapon/implanter/exile +/obj/item/implanter/exile name = "implanter-exile" -/obj/item/weapon/implanter/exile/New() - src.imp = new /obj/item/weapon/implant/exile( src ) +/obj/item/implanter/exile/New() + src.imp = new /obj/item/implant/exile( src ) ..() update() return -/obj/item/weapon/implant/exile +/obj/item/implant/exile name = "exile" desc = "Prevents you from returning from away missions" -/obj/item/weapon/implant/exile/get_data() +/obj/item/implant/exile/get_data() var/dat = {" Implant Specifications:
Name: [using_map.company_name] Employee Exile Implant
Implant Details: The onboard gateway system has been modified to reject entry by individuals containing this implant
"} return dat -/obj/item/weapon/implantcase/exile +/obj/item/implantcase/exile name = "Glass Case- 'Exile'" desc = "A case containing an exile implant." icon = 'icons/obj/items.dmi' icon_state = "implantcase-r" -/obj/item/weapon/implantcase/exile/New() - src.imp = new /obj/item/weapon/implant/exile( src ) +/obj/item/implantcase/exile/New() + src.imp = new /obj/item/implant/exile( src ) ..() return @@ -38,4 +38,4 @@ /obj/structure/closet/secure_closet/exile name = "Exile Implants" req_access = list(access_hos) - starts_with = list(/obj/item/weapon/implanter/exile = 1, /obj/item/weapon/implantcase/exile = 5) + starts_with = list(/obj/item/implanter/exile = 1, /obj/item/implantcase/exile = 5) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 66d36212615..a20eb79baa4 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -153,8 +153,8 @@ GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation) return else //VOREStation Addition Start: Prevent abuse - if(istype(M, /obj/item/device/uav)) - var/obj/item/device/uav/L = M + if(istype(M, /obj/item/uav)) + var/obj/item/uav/L = M L.power_down() if(istype(M, /mob/living)) var/mob/living/L = M @@ -195,13 +195,13 @@ GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation) var/list/mob_contents = list() //Things which are actually drained as a result of the above not being null. mob_contents |= L // The recursive check below does not add the object being checked to its list. mob_contents |= recursive_content_check(L, mob_contents, recursion_limit = 3, client_check = 0, sight_check = 0, include_mobs = 1, include_objects = 1, ignore_show_messages = 1) - for(var/obj/item/weapon/holder/I in mob_contents) - var/obj/item/weapon/holder/H = I + for(var/obj/item/holder/I in mob_contents) + var/obj/item/holder/H = I var/mob/living/MI = H.held_mob MI.forceMove(get_turf(H)) if(!issilicon(MI)) //Don't drop borg modules... for(var/obj/item/II in MI) - if(istype(II,/obj/item/weapon/implant) || istype(II,/obj/item/device/nif)) + if(istype(II,/obj/item/implant) || istype(II,/obj/item/nif)) continue MI.drop_from_inventory(II, dest.loc) var/obj/effect/landmark/finaldest = pick(awayabductors) @@ -211,7 +211,7 @@ GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation) MI << 'sound/effects/bamf.ogg' to_chat(MI,"You're starting to come to. You feel like you've been out for a few minutes, at least...") for(var/obj/item/I in L) - if(istype(I,/obj/item/weapon/implant) || istype(I,/obj/item/device/nif)) + if(istype(I,/obj/item/implant) || istype(I,/obj/item/nif)) continue L.drop_from_inventory(I, dest.loc) var/obj/effect/landmark/finaldest = pick(awayabductors) @@ -223,8 +223,8 @@ GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation) //VOREStation Addition End return -/obj/machinery/gateway/centerstation/attackby(obj/item/device/W as obj, mob/user as mob) - if(istype(W,/obj/item/device/multitool)) +/obj/machinery/gateway/centerstation/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W,/obj/item/multitool)) if(!awaygate) if(GLOB.gateway_away) awaygate = GLOB.gateway_away @@ -336,7 +336,7 @@ GLOBAL_DATUM(gateway_away, /obj/machinery/gateway/centeraway) if(!ready) return if(!active) return if(istype(M, /mob/living/carbon)) - for(var/obj/item/weapon/implant/exile/E in M)//Checking that there is an exile implant in the contents + for(var/obj/item/implant/exile/E in M)//Checking that there is an exile implant in the contents if(E.imp_in == M)//Checking that it's actually implanted vs just in their pocket to_chat(M, span_black("The station gate has detected your exile implant and is blocking your entry.")) return @@ -346,8 +346,8 @@ GLOBAL_DATUM(gateway_away, /obj/machinery/gateway/centeraway) playsound(src, 'sound/effects/phasein.ogg', 100, 1) -/obj/machinery/gateway/centeraway/attackby(obj/item/device/W as obj, mob/user as mob) - if(istype(W,/obj/item/device/multitool)) +/obj/machinery/gateway/centeraway/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W,/obj/item/multitool)) if(calibrated && stationgate) to_chat(user, span_black("The gate is already calibrated, there is no work for you to do here.")) return diff --git a/code/modules/awaymissions/gateway_vr.dm b/code/modules/awaymissions/gateway_vr.dm index 05def055827..ed99a368529 100644 --- a/code/modules/awaymissions/gateway_vr.dm +++ b/code/modules/awaymissions/gateway_vr.dm @@ -3,10 +3,10 @@ /obj/machinery/gateway/centeraway/mcguffin icon = 'icons/obj/machines/gateway_vr.dmi' calibrated = 0 - var/mcguffin_type = /obj/item/device/mcguffin/brass //you should be able to change the var to be whatever kind of path you like, so maybe you can use other things on it sometimes + var/mcguffin_type = /obj/item/mcguffin/brass //you should be able to change the var to be whatever kind of path you like, so maybe you can use other things on it sometimes var/key //holds a ref to the key we spawned -/obj/machinery/gateway/centeraway/mcguffin/attackby(obj/item/device/W as obj, mob/user as mob) +/obj/machinery/gateway/centeraway/mcguffin/attackby(obj/item/W as obj, mob/user as mob) if(calibrated && stationgate) to_chat(user, "The gate is already configured, you should be able to activate it.") return @@ -24,7 +24,7 @@ //If you use this kind of gateway you NEED one of these on the map or the players won't be able to leave// //You should use the random spawner though so it won't always be in the same place// -/obj/item/device/mcguffin/brass +/obj/item/mcguffin/brass name = "mysterious brass device" desc = "A curious object made of what appears to be brass and silver. Its purpose is unclear by looking at it. Perhaps it should be used with something of similar materials?" icon = 'icons/obj/machines/gateway_vr.dmi' @@ -75,5 +75,5 @@ icon = 'icons/obj/machines/gateway_vr.dmi' //No, you can't digest the key to leave the gateway. -/obj/item/device/mcguffin/digest_act(var/atom/movable/item_storage = null) +/obj/item/mcguffin/digest_act(var/atom/movable/item_storage = null) return FALSE diff --git a/code/modules/awaymissions/loot_vr.dm b/code/modules/awaymissions/loot_vr.dm index 6845f649790..a38df035ad8 100644 --- a/code/modules/awaymissions/loot_vr.dm +++ b/code/modules/awaymissions/loot_vr.dm @@ -41,7 +41,7 @@ //coins var/amount = rand(2,6) var/list/possible_spawns = list() - for(var/coin_type in typesof(/obj/item/weapon/coin)) + for(var/coin_type in typesof(/obj/item/coin)) possible_spawns += coin_type var/coin_type = pick(possible_spawns) for(var/i=0,iGoeleigh,

@@ -1465,7 +1465,7 @@ icon_state = "dark128" //The actual flags. Base type defined to handle some of the basic behaviours. -/obj/item/weapon/laserdome_flag +/obj/item/laserdome_flag name = "Flag" desc = "Steal the enemy flag and take it to your base in order to score! First team to three captures wins! Or was it five? Eh, check with the referee I guess." description_info = "Simply pick up your team's flag to return it to your base after a short delay. If you're carrying the enemy flag, use it on your team's flag base to score a point!" @@ -1483,18 +1483,18 @@ var/start_pos var/flag_return_delay = 3 SECONDS //how long you have to hold onto your team's flag before it returns home -/obj/item/weapon/laserdome_flag/Initialize() +/obj/item/laserdome_flag/Initialize() . = ..() start_pos = src.loc //save our starting location for later /* //TODO - make this not trigger when the flag is returned to its original location -/obj/item/weapon/laserdome_flag/dropped() +/obj/item/laserdome_flag/dropped() . = ..() global_announcer.autosay("[src] dropped!","Laserdome Announcer","Entertainment") */ -/obj/item/weapon/laserdome_flag/attack_hand(mob/user as mob) +/obj/item/laserdome_flag/attack_hand(mob/user as mob) . = ..() var/mob/living/carbon/human/M = loc var/grabbing_team @@ -1525,13 +1525,13 @@ user.visible_message("[user] has taken \the [src]!") global_announcer.autosay("[src] taken by [capitalize(grabbing_team)] team!","Laserdome Announcer","Entertainment") -/obj/item/weapon/laserdome_flag/red +/obj/item/laserdome_flag/red name = "Red flag" icon_state = "red_flag" item_state = "laserdome_flag_red" laser_team = "red" -/obj/item/weapon/laserdome_flag/blue +/obj/item/laserdome_flag/blue name = "Blue flag" icon_state = "blue_flag" item_state = "laserdome_flag_blue" @@ -1572,8 +1572,8 @@ . = ..() //TODO- require the team's flag to be present before they can score? - if(istype(F,/obj/item/weapon/laserdome_flag)) - var/obj/item/weapon/laserdome_flag/flag = F + if(istype(F,/obj/item/laserdome_flag)) + var/obj/item/laserdome_flag/flag = F if(flag.laser_team != base_team) global_announcer.autosay("[user] captured the [capitalize(flag.laser_team)] flag for [capitalize(base_team)] team!","Laserdome Announcer","Entertainment") user.drop_from_inventory(flag) @@ -1590,7 +1590,7 @@ user.drop_from_inventory(flag) flag.loc = src.loc //place our flag neatly back on its pedestal -/obj/item/weapon/laserdome_hyperball +/obj/item/laserdome_hyperball name = "\improper HYPERball" //*always* refer to it as "the hyperball", not just "the ball". corporate insists. desc = "Because regular balls aren't exciting enough, the future needs HYPERballs!" description_info = "Take the ball and dunk it into the opposing team's goal to score! You can either throw it into the goal or dunk it directly; the latter is worth more points, but it's more challenging as you need to be next to the goal in order to dunk." @@ -1608,7 +1608,7 @@ var/last_holder var/last_team -/obj/item/weapon/laserdome_hyperball_prop +/obj/item/laserdome_hyperball_prop name = "demonstration HYPERball" desc = "Because regular balls aren't exciting enough, the future needs HYPERballs!" description_info = "This model is for demonstration purposes only. It looks pretty heavy!" @@ -1618,11 +1618,11 @@ w_class = ITEMSIZE_NO_CONTAINER redgate_allowed = FALSE //you can't take the demonstration balls and go home either -/obj/item/weapon/laserdome_hyperball/Initialize() +/obj/item/laserdome_hyperball/Initialize() . = ..() start_pos = src.loc //save our starting location for later -/obj/item/weapon/laserdome_hyperball/attack_hand(mob/user as mob) +/obj/item/laserdome_hyperball/attack_hand(mob/user as mob) . = ..() var/mob/living/carbon/human/M = loc var/grabbing_team @@ -1654,7 +1654,7 @@ /* //TODO- make this not trigger when the ball is thrown or dunked, only when it's actually dropped -/obj/item/weapon/laserdome_hyperball/dropped() +/obj/item/laserdome_hyperball/dropped() . = ..() global_announcer.autosay("[capitalize(last_team)] fumble!","Laserdome Announcer","Entertainment") */ @@ -1702,8 +1702,8 @@ else return //if they're not on a team, stop! - if(istype(B,/obj/item/weapon/laserdome_hyperball)) - var/obj/item/weapon/laserdome_hyperball/ball = B + if(istype(B,/obj/item/laserdome_hyperball)) + var/obj/item/laserdome_hyperball/ball = B if(dunking_team != goal_team) global_announcer.autosay("[user] dunked the HYPERball for [capitalize(dunking_team)] team! [num2text(dunk_points)] points scored!","Laserdome Announcer","Entertainment") score += dunk_points //increment our score! @@ -1732,8 +1732,8 @@ /obj/structure/hyperball_goal/hitby(obj/B as obj) . = ..() - if(istype(B,/obj/item/weapon/laserdome_hyperball)) - var/obj/item/weapon/laserdome_hyperball/ball = B + if(istype(B,/obj/item/laserdome_hyperball)) + var/obj/item/laserdome_hyperball/ball = B if(prob(range_dunk_chance)) if(ball.last_team != goal_team) global_announcer.autosay("[ball.last_holder] threw the HYPERball for [capitalize(ball.last_team)] team! [num2text(range_dunk_points)] points scored!","Laserdome Announcer","Entertainment") diff --git a/code/modules/blob/blob.dm b/code/modules/blob/blob.dm index 5218a78c7fe..b1902e5d04a 100644 --- a/code/modules/blob/blob.dm +++ b/code/modules/blob/blob.dm @@ -133,7 +133,7 @@ take_damage(Proj.damage / fire_resist) return 0 -/obj/effect/blob/attackby(var/obj/item/weapon/W, var/mob/user) +/obj/effect/blob/attackby(var/obj/item/W, var/mob/user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) playsound(src, 'sound/effects/attackblob.ogg', 50, 1) visible_message("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]") @@ -141,7 +141,7 @@ switch(W.damtype) if("fire") damage = (W.force / fire_resist) - if(istype(W, /obj/item/weapon/weldingtool)) + if(istype(W, /obj/item/weldingtool)) playsound(src, W.usesound, 100, 1) if("brute") damage = (W.force / brute_resist) diff --git a/code/modules/blob2/blobs/base_blob.dm b/code/modules/blob2/blobs/base_blob.dm index 12d1c7e2557..7475b33210b 100644 --- a/code/modules/blob2/blobs/base_blob.dm +++ b/code/modules/blob2/blobs/base_blob.dm @@ -316,7 +316,7 @@ GLOBAL_LIST_EMPTY(all_blobs) else attack_generic(M, rand(1,10), "bashed") -/obj/structure/blob/attackby(var/obj/item/weapon/W, var/mob/user) +/obj/structure/blob/attackby(var/obj/item/W, var/mob/user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) playsound(src, 'sound/effects/attackblob.ogg', 50, 1) visible_message("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]") diff --git a/code/modules/blob2/blobs/core.dm b/code/modules/blob2/blobs/core.dm index 2b5cefa89d7..425cac85aa3 100644 --- a/code/modules/blob2/blobs/core.dm +++ b/code/modules/blob2/blobs/core.dm @@ -108,7 +108,7 @@ var/list/blob_cores = list() /obj/structure/blob/core/Destroy() var/turf/T = get_turf(src) - new /obj/item/weapon/blobcore_chunk(T, overmind.blob_type) + new /obj/item/blobcore_chunk(T, overmind.blob_type) blob_cores -= src if(overmind) diff --git a/code/modules/blob2/core_chunk.dm b/code/modules/blob2/core_chunk.dm index b499f6dc675..d2a3fed672c 100644 --- a/code/modules/blob2/core_chunk.dm +++ b/code/modules/blob2/core_chunk.dm @@ -1,5 +1,5 @@ -/obj/item/weapon/blobcore_chunk +/obj/item/blobcore_chunk name = "core chunk" desc = "The remains of some strange life-form. It smells awful." description_info = "Some blob types will have core effects when the chunk is used in-hand, toggled with an alt click, or constantly active." @@ -20,23 +20,23 @@ drop_sound = 'sound/effects/slime_squish.ogg' -/obj/item/weapon/blobcore_chunk/is_open_container() +/obj/item/blobcore_chunk/is_open_container() return 1 -/obj/item/weapon/blobcore_chunk/New(var/atom/newloc, var/datum/blob_type/parentblob = null) +/obj/item/blobcore_chunk/New(var/atom/newloc, var/datum/blob_type/parentblob = null) ..(newloc) create_reagents(120) setup_blobtype(parentblob) -/obj/item/weapon/blobcore_chunk/Destroy() +/obj/item/blobcore_chunk/Destroy() STOP_PROCESSING(SSobj, src) blob_type = null ..() -/obj/item/weapon/blobcore_chunk/proc/setup_blobtype(var/datum/blob_type/parentblob = null) +/obj/item/blobcore_chunk/proc/setup_blobtype(var/datum/blob_type/parentblob = null) if(!parentblob) name = "inert [initial(name)]" @@ -61,12 +61,12 @@ START_PROCESSING(SSobj, src) -/obj/item/weapon/blobcore_chunk/proc/call_chunk_unique() +/obj/item/blobcore_chunk/proc/call_chunk_unique() if(blob_type) blob_type.chunk_unique(src, args) return -/obj/item/weapon/blobcore_chunk/proc/get_carrier(var/atom/target) +/obj/item/blobcore_chunk/proc/get_carrier(var/atom/target) var/atom/A = target ? target.loc : src if(isturf(A) || isarea(A)) // Something has gone horribly wrong if the second is true. @@ -77,13 +77,13 @@ return A -/obj/item/weapon/blobcore_chunk/blob_act(obj/structure/blob/B) +/obj/item/blobcore_chunk/blob_act(obj/structure/blob/B) if(B.overmind && !blob_type) setup_blobtype(B.overmind.blob_type) return -/obj/item/weapon/blobcore_chunk/attack_self(var/mob/user) +/obj/item/blobcore_chunk/attack_self(var/mob/user) if(blob_type && world.time > active_ability_cooldown + last_active_use) last_active_use = world.time to_chat(user, "[icon2html(src, user.client)] \The [src] gesticulates.") @@ -92,12 +92,12 @@ to_chat(user, "\The [src] doesn't seem to respond.") ..() -/obj/item/weapon/blobcore_chunk/process() +/obj/item/blobcore_chunk/process() if(blob_type && should_tick && world.time > passive_ability_cooldown + last_passive_use) last_passive_use = world.time blob_type.on_chunk_tick(src) -/obj/item/weapon/blobcore_chunk/AltClick(mob/living/carbon/user) +/obj/item/blobcore_chunk/AltClick(mob/living/carbon/user) if(blob_type && blob_type.chunk_active_type == BLOB_CHUNK_TOGGLE) should_tick = !should_tick @@ -106,7 +106,7 @@ else to_chat(user, "\The [src] stills, returning to a death-like state.") -/obj/item/weapon/blobcore_chunk/proc/regen(var/newfaction = null) +/obj/item/blobcore_chunk/proc/regen(var/newfaction = null) if(istype(blob_type)) if(newfaction) blob_type.faction = newfaction @@ -126,12 +126,12 @@ result_amount = 1 /decl/chemical_reaction/instant/blob_reconstitution/can_happen(var/datum/reagents/holder) - if(holder.my_atom && istype(holder.my_atom, /obj/item/weapon/blobcore_chunk)) + if(holder.my_atom && istype(holder.my_atom, /obj/item/blobcore_chunk)) return ..() return FALSE /decl/chemical_reaction/instant/blob_reconstitution/on_reaction(var/datum/reagents/holder) - var/obj/item/weapon/blobcore_chunk/chunk = holder.my_atom + var/obj/item/blobcore_chunk/chunk = holder.my_atom if(chunk.can_genesis && chunk.regen()) chunk.visible_message("[chunk] bubbles, surrounding itself with a rapidly expanding mass of [chunk.blob_type.name]!") chunk.can_genesis = FALSE @@ -146,7 +146,7 @@ result_amount = 1 /decl/chemical_reaction/instant/blob_reconstitution/domination/on_reaction(var/datum/reagents/holder) - var/obj/item/weapon/blobcore_chunk/chunk = holder.my_atom + var/obj/item/blobcore_chunk/chunk = holder.my_atom if(chunk.can_genesis && chunk.regen("neutral")) chunk.visible_message("[chunk] bubbles, surrounding itself with a rapidly expanding mass of [chunk.blob_type.name]!") chunk.can_genesis = FALSE diff --git a/code/modules/blob2/overmind/types.dm b/code/modules/blob2/overmind/types.dm index 4a7bab93b11..394a899d022 100644 --- a/code/modules/blob2/overmind/types.dm +++ b/code/modules/blob2/overmind/types.dm @@ -97,17 +97,17 @@ return // Blob core chunk process. -/datum/blob_type/proc/on_chunk_tick(obj/item/weapon/blobcore_chunk/B) +/datum/blob_type/proc/on_chunk_tick(obj/item/blobcore_chunk/B) return // Blob core chunk use in-hand. -/datum/blob_type/proc/on_chunk_use(obj/item/weapon/blobcore_chunk/B, mob/user) +/datum/blob_type/proc/on_chunk_use(obj/item/blobcore_chunk/B, mob/user) return // Proc that is unique to the blob type. -/datum/blob_type/proc/chunk_unique(obj/item/weapon/blobcore_chunk/B, var/list/extra_args = null) +/datum/blob_type/proc/chunk_unique(obj/item/blobcore_chunk/B, var/list/extra_args = null) return // Set up the blob type for the chunk. -/datum/blob_type/proc/chunk_setup(obj/item/weapon/blobcore_chunk/B) +/datum/blob_type/proc/chunk_setup(obj/item/blobcore_chunk/B) return diff --git a/code/modules/blob2/overmind/types/blazing_oil.dm b/code/modules/blob2/overmind/types/blazing_oil.dm index 7d8c9f307d5..5ceef2e6430 100644 --- a/code/modules/blob2/overmind/types/blazing_oil.dm +++ b/code/modules/blob2/overmind/types/blazing_oil.dm @@ -32,7 +32,7 @@ if(env) env.add_thermal_energy(10 * 1000) -/datum/blob_type/blazing_oil/on_chunk_tick(obj/item/weapon/blobcore_chunk/B) +/datum/blob_type/blazing_oil/on_chunk_tick(obj/item/blobcore_chunk/B) B.reagents.add_reagent("thermite_v", 0.5) var/turf/T = get_turf(B) @@ -42,6 +42,6 @@ if(env) env.add_thermal_energy(10 * 1000) -/datum/blob_type/blazing_oil/on_chunk_use(obj/item/weapon/blobcore_chunk/B, mob/living/user) +/datum/blob_type/blazing_oil/on_chunk_use(obj/item/blobcore_chunk/B, mob/living/user) user.add_modifier(/datum/modifier/exothermic, 5 MINUTES) return \ No newline at end of file diff --git a/code/modules/blob2/overmind/types/classic.dm b/code/modules/blob2/overmind/types/classic.dm index 450324b4932..207df460b10 100644 --- a/code/modules/blob2/overmind/types/classic.dm +++ b/code/modules/blob2/overmind/types/classic.dm @@ -11,7 +11,7 @@ spread_modifier = 1.0 ai_aggressiveness = 0 -/datum/blob_type/classic/on_chunk_use(obj/item/weapon/blobcore_chunk/B, mob/living/user) +/datum/blob_type/classic/on_chunk_use(obj/item/blobcore_chunk/B, mob/living/user) var/turf/T = get_turf(B) to_chat(user, "\The [B] produces a soothing ooze!") diff --git a/code/modules/blob2/overmind/types/cryogenic_goo.dm b/code/modules/blob2/overmind/types/cryogenic_goo.dm index 564516a71dd..a4cf0adfd6f 100644 --- a/code/modules/blob2/overmind/types/cryogenic_goo.dm +++ b/code/modules/blob2/overmind/types/cryogenic_goo.dm @@ -45,7 +45,7 @@ if(env) env.add_thermal_energy(-10 * 1000) -/datum/blob_type/cryogenic_goo/on_chunk_tick(obj/item/weapon/blobcore_chunk/B) +/datum/blob_type/cryogenic_goo/on_chunk_tick(obj/item/blobcore_chunk/B) B.reagents.add_reagent("cryoslurry", 0.5) var/turf/simulated/T = get_turf(B) @@ -56,6 +56,6 @@ if(env) env.add_thermal_energy(-10 * 1000) -/datum/blob_type/cryogenic_goo/on_chunk_use(obj/item/weapon/blobcore_chunk/B, mob/living/user) +/datum/blob_type/cryogenic_goo/on_chunk_use(obj/item/blobcore_chunk/B, mob/living/user) user.add_modifier(/datum/modifier/endothermic, 5 MINUTES) return diff --git a/code/modules/blob2/overmind/types/ectoplasmic_horror.dm b/code/modules/blob2/overmind/types/ectoplasmic_horror.dm index d453c87ac90..5014872535f 100644 --- a/code/modules/blob2/overmind/types/ectoplasmic_horror.dm +++ b/code/modules/blob2/overmind/types/ectoplasmic_horror.dm @@ -68,7 +68,7 @@ return 0 return ..() -/datum/blob_type/ectoplasmic_horror/on_chunk_tick(obj/item/weapon/blobcore_chunk/B) +/datum/blob_type/ectoplasmic_horror/on_chunk_tick(obj/item/blobcore_chunk/B) var/mob/living/carrier = B.get_carrier() if(!carrier) diff --git a/code/modules/blob2/overmind/types/electromagnetic_web.dm b/code/modules/blob2/overmind/types/electromagnetic_web.dm index 9831998587a..80fcc4d19f9 100644 --- a/code/modules/blob2/overmind/types/electromagnetic_web.dm +++ b/code/modules/blob2/overmind/types/electromagnetic_web.dm @@ -25,7 +25,7 @@ /datum/blob_type/electromagnetic_web/on_attack(obj/structure/blob/B, mob/living/victim) victim.emp_act(2) -/datum/blob_type/electromagnetic_web/on_chunk_tick(obj/item/weapon/blobcore_chunk/B) +/datum/blob_type/electromagnetic_web/on_chunk_tick(obj/item/blobcore_chunk/B) var/turf/T = get_turf(B) if(!T) return diff --git a/code/modules/blob2/overmind/types/energized_jelly.dm b/code/modules/blob2/overmind/types/energized_jelly.dm index 33c570f24f3..3ef58d89e96 100644 --- a/code/modules/blob2/overmind/types/energized_jelly.dm +++ b/code/modules/blob2/overmind/types/energized_jelly.dm @@ -24,7 +24,7 @@ victim.electrocute_act(10, src, 1, def_zone) victim.stun_effect_act(0, 40, BP_TORSO, src) -/datum/blob_type/energized_jelly/on_chunk_tick(obj/item/weapon/blobcore_chunk/B) +/datum/blob_type/energized_jelly/on_chunk_tick(obj/item/blobcore_chunk/B) for(var/mob/living/L in oview(world.view, get_turf(B))) var/mob/living/carrier = B.get_carrier() diff --git a/code/modules/blob2/overmind/types/explosive_lattice.dm b/code/modules/blob2/overmind/types/explosive_lattice.dm index aec6787eab1..8d654936ff3 100644 --- a/code/modules/blob2/overmind/types/explosive_lattice.dm +++ b/code/modules/blob2/overmind/types/explosive_lattice.dm @@ -49,7 +49,7 @@ exploding = FALSE -/datum/blob_type/explosive_lattice/on_chunk_tick(obj/item/weapon/blobcore_chunk/B) +/datum/blob_type/explosive_lattice/on_chunk_tick(obj/item/blobcore_chunk/B) var/turf/T = get_turf(B) if(!T) return diff --git a/code/modules/blob2/overmind/types/fabrication_swarm.dm b/code/modules/blob2/overmind/types/fabrication_swarm.dm index 10a69cb3013..374cf108a0e 100644 --- a/code/modules/blob2/overmind/types/fabrication_swarm.dm +++ b/code/modules/blob2/overmind/types/fabrication_swarm.dm @@ -35,7 +35,7 @@ /datum/blob_type/fabrication_swarm/on_emp(obj/structure/blob/B, severity) B.adjust_integrity(-(30 / severity)) -/datum/blob_type/fabrication_swarm/on_chunk_tick(obj/item/weapon/blobcore_chunk/B) +/datum/blob_type/fabrication_swarm/on_chunk_tick(obj/item/blobcore_chunk/B) var/turf/T = get_turf(B) for(var/mob/living/L in view(world.view, T)) if(L.stat != DEAD && L.isSynthetic()) diff --git a/code/modules/blob2/overmind/types/fulminant_organism.dm b/code/modules/blob2/overmind/types/fulminant_organism.dm index 4f3788b787f..993e0ea7d6a 100644 --- a/code/modules/blob2/overmind/types/fulminant_organism.dm +++ b/code/modules/blob2/overmind/types/fulminant_organism.dm @@ -42,7 +42,7 @@ S.faction = faction S.update_icons() -/datum/blob_type/fulminant_organism/on_chunk_use(obj/item/weapon/blobcore_chunk/B, mob/living/user) +/datum/blob_type/fulminant_organism/on_chunk_use(obj/item/blobcore_chunk/B, mob/living/user) for(var/I = 1 to rand(3,4)) var/mob/living/simple_mob/blob/spore/S = new spore_type(get_turf(B)) S.faction = user.faction diff --git a/code/modules/blob2/overmind/types/fungal_bloom.dm b/code/modules/blob2/overmind/types/fungal_bloom.dm index 6bf20b99d35..8065b080662 100644 --- a/code/modules/blob2/overmind/types/fungal_bloom.dm +++ b/code/modules/blob2/overmind/types/fungal_bloom.dm @@ -29,7 +29,7 @@ B = new /obj/structure/blob/normal(T, S.overmind) // Otherwise spread it. B.visible_message("\A [B] forms on \the [T] as \the [S] bursts!") -/datum/blob_type/fungal_bloom/on_chunk_use(obj/item/weapon/blobcore_chunk/B, mob/living/user) +/datum/blob_type/fungal_bloom/on_chunk_use(obj/item/blobcore_chunk/B, mob/living/user) var/mob/living/simple_mob/blob/spore/S = new spore_type(get_turf(B)) S.faction = user.faction S.blob_type = src diff --git a/code/modules/blob2/overmind/types/grey_goo.dm b/code/modules/blob2/overmind/types/grey_goo.dm index 2e0fea20f90..bdc78112fc7 100644 --- a/code/modules/blob2/overmind/types/grey_goo.dm +++ b/code/modules/blob2/overmind/types/grey_goo.dm @@ -19,7 +19,7 @@ /datum/blob_type/grey_goo/on_emp(obj/structure/blob/B, severity) B.adjust_integrity(-(20 / severity)) -/datum/blob_type/grey_goo/on_chunk_tick(obj/item/weapon/blobcore_chunk/B) +/datum/blob_type/grey_goo/on_chunk_tick(obj/item/blobcore_chunk/B) var/turf/T = get_turf(B) for(var/mob/living/L in view(world.view, T)) if(L.stat != DEAD) diff --git a/code/modules/blob2/overmind/types/pressurized_slime.dm b/code/modules/blob2/overmind/types/pressurized_slime.dm index 6b2ff5800f6..3baa9dc395b 100644 --- a/code/modules/blob2/overmind/types/pressurized_slime.dm +++ b/code/modules/blob2/overmind/types/pressurized_slime.dm @@ -47,10 +47,10 @@ for(var/atom/movable/AM in T) AM.water_act(2) -/datum/blob_type/pressurized_slime/on_chunk_tick(obj/item/weapon/blobcore_chunk/B) +/datum/blob_type/pressurized_slime/on_chunk_tick(obj/item/blobcore_chunk/B) wet_surroundings(B, 10) -/datum/blob_type/pressurized_slime/on_chunk_use(obj/item/weapon/blobcore_chunk/B, mob/living/user) // Drenches you in water. +/datum/blob_type/pressurized_slime/on_chunk_use(obj/item/blobcore_chunk/B, mob/living/user) // Drenches you in water. if(user) user.ExtinguishMob() user.fire_stacks = CLAMP(user.fire_stacks - 1, -25, 25) \ No newline at end of file diff --git a/code/modules/blob2/overmind/types/radioactive_ooze.dm b/code/modules/blob2/overmind/types/radioactive_ooze.dm index f3226f2b5be..89a57c9661f 100644 --- a/code/modules/blob2/overmind/types/radioactive_ooze.dm +++ b/code/modules/blob2/overmind/types/radioactive_ooze.dm @@ -23,5 +23,5 @@ /datum/blob_type/radioactive_ooze/on_pulse(var/obj/structure/blob/B) SSradiation.radiate(B, 200) -/datum/blob_type/radioactive_ooze/on_chunk_tick(obj/item/weapon/blobcore_chunk/B) +/datum/blob_type/radioactive_ooze/on_chunk_tick(obj/item/blobcore_chunk/B) SSradiation.radiate(B, rand(25,100)) \ No newline at end of file diff --git a/code/modules/blob2/overmind/types/ravenous_macrophage.dm b/code/modules/blob2/overmind/types/ravenous_macrophage.dm index a97eb2df716..f0bbb0945a1 100644 --- a/code/modules/blob2/overmind/types/ravenous_macrophage.dm +++ b/code/modules/blob2/overmind/types/ravenous_macrophage.dm @@ -38,7 +38,7 @@ if(other.overmind) other.overmind.add_points(rand(1,4)) -/datum/blob_type/ravenous_macrophage/on_chunk_tick(obj/item/weapon/blobcore_chunk/B) +/datum/blob_type/ravenous_macrophage/on_chunk_tick(obj/item/blobcore_chunk/B) var/mob/living/L = locate() in range(world.view, B) if(prob(5) && !L.stat) // There's some active living thing nearby, produce offgas. B.visible_message("[icon2html(B,viewers(B))] \The [B] disgorches a cloud of noxious gas!") diff --git a/code/modules/blob2/overmind/types/reactive_spines.dm b/code/modules/blob2/overmind/types/reactive_spines.dm index f52d4e38128..ce80fe5d5a2 100644 --- a/code/modules/blob2/overmind/types/reactive_spines.dm +++ b/code/modules/blob2/overmind/types/reactive_spines.dm @@ -32,7 +32,7 @@ return ..() // We're expecting 1 to be a target, 2 to be an old move loc, and 3 to be a new move loc. -/datum/blob_type/reactive_spines/chunk_unique(obj/item/weapon/blobcore_chunk/B, var/list/extra_data = null) +/datum/blob_type/reactive_spines/chunk_unique(obj/item/blobcore_chunk/B, var/list/extra_data = null) if(!LAZYLEN(extra_data)) return @@ -54,8 +54,8 @@ return -/datum/blob_type/reactive_spines/chunk_setup(obj/item/weapon/blobcore_chunk/B) - B.RegisterSignal(SSmobs, COMSIG_OBSERVER_GLOBALMOVED, /obj/item/weapon/blobcore_chunk/proc/call_chunk_unique) +/datum/blob_type/reactive_spines/chunk_setup(obj/item/blobcore_chunk/B) + B.RegisterSignal(SSmobs, COMSIG_OBSERVER_GLOBALMOVED, /obj/item/blobcore_chunk/proc/call_chunk_unique) return //I'm putting this here so everybody knows that it's this shitty code that is why that comsig exists. diff --git a/code/modules/blob2/overmind/types/roiling_mold.dm b/code/modules/blob2/overmind/types/roiling_mold.dm index 8a2534ebb54..245d7db09b2 100644 --- a/code/modules/blob2/overmind/types/roiling_mold.dm +++ b/code/modules/blob2/overmind/types/roiling_mold.dm @@ -48,7 +48,7 @@ var/obj/item/projectile/arc/spore/P = new(get_turf(B)) P.launch_projectile(L, BP_TORSO, B) -/datum/blob_type/roiling_mold/on_chunk_use(obj/item/weapon/blobcore_chunk/B, mob/living/user) +/datum/blob_type/roiling_mold/on_chunk_use(obj/item/blobcore_chunk/B, mob/living/user) for(var/mob/living/L in oview(world.view, get_turf(B))) if(istype(user) && user == L) continue diff --git a/code/modules/blob2/overmind/types/shifting_fragments.dm b/code/modules/blob2/overmind/types/shifting_fragments.dm index ffca17760be..c5992f8757f 100644 --- a/code/modules/blob2/overmind/types/shifting_fragments.dm +++ b/code/modules/blob2/overmind/types/shifting_fragments.dm @@ -35,6 +35,6 @@ new_B.forceMove(get_turf(B)) B.forceMove(T) -/datum/blob_type/shifting_fragments/on_chunk_use(obj/item/weapon/blobcore_chunk/B, mob/living/user) +/datum/blob_type/shifting_fragments/on_chunk_use(obj/item/blobcore_chunk/B, mob/living/user) user.add_modifier(/datum/modifier/sprinting, 2 MINUTES) return \ No newline at end of file diff --git a/code/modules/blob2/overmind/types/synchronous_mesh.dm b/code/modules/blob2/overmind/types/synchronous_mesh.dm index 1e32ebb40f6..72e6a43f812 100644 --- a/code/modules/blob2/overmind/types/synchronous_mesh.dm +++ b/code/modules/blob2/overmind/types/synchronous_mesh.dm @@ -42,7 +42,7 @@ return damage / max(blobs_to_hurt.len, 1) // To hurt the blob that got hit. -/datum/blob_type/synchronous_mesh/on_chunk_tick(obj/item/weapon/blobcore_chunk/B) +/datum/blob_type/synchronous_mesh/on_chunk_tick(obj/item/blobcore_chunk/B) var/mob/living/carrier = B.get_carrier() if(!carrier) diff --git a/code/modules/blob2/overmind/types/volatile_alluvium.dm b/code/modules/blob2/overmind/types/volatile_alluvium.dm index a689bb856f2..ee5a0afc060 100644 --- a/code/modules/blob2/overmind/types/volatile_alluvium.dm +++ b/code/modules/blob2/overmind/types/volatile_alluvium.dm @@ -34,7 +34,7 @@ var/obj/item/I = H.get_active_hand() H.drop_item() if(I) - if((I.sharp || I.edge) && !istype(I, /obj/item/weapon/gun)) + if((I.sharp || I.edge) && !istype(I, /obj/item/gun)) I.forceMove(get_turf(B)) // Disarmed entirely. B.visible_message("The [name] heaves, \the [attacker]'s weapon becoming stuck in the churning mass!") else @@ -50,6 +50,6 @@ if(B && prob(damage)) B.visible_message("The [name] begins to crumble!") -/datum/blob_type/volatile_alluvium/on_chunk_use(obj/item/weapon/blobcore_chunk/B, mob/living/user) +/datum/blob_type/volatile_alluvium/on_chunk_use(obj/item/blobcore_chunk/B, mob/living/user) if(user) user.add_modifier(/datum/modifier/fortify, 60 SECONDS) diff --git a/code/modules/casino/boxes_casino.dm b/code/modules/casino/boxes_casino.dm index 136ff9ba037..619e0afcb63 100644 --- a/code/modules/casino/boxes_casino.dm +++ b/code/modules/casino/boxes_casino.dm @@ -1,17 +1,17 @@ -/obj/item/weapon/storage/box/casino +/obj/item/storage/box/casino name = "prize box" desc = "It's a lovely golden tinted cardboard box, maybe there's something valuable inside?" icon = 'icons/obj/casino.dmi' icon_state = "casino_box" -/obj/item/weapon/storage/box/casino/costume_marine +/obj/item/storage/box/casino/costume_marine name = "ruin marine costume" starts_with = list( /obj/item/clothing/head/marine, /obj/item/clothing/suit/marine ) -/obj/item/weapon/storage/box/casino/costume_pirate +/obj/item/storage/box/casino/costume_pirate name = "pirate costume" starts_with = list( /obj/item/clothing/under/pirate, @@ -20,29 +20,29 @@ /obj/item/clothing/glasses/eyepatch ) -/obj/item/weapon/storage/box/casino/costume_commie +/obj/item/storage/box/casino/costume_commie name = "communist costume" starts_with = list( /obj/item/clothing/under/soviet, /obj/item/clothing/head/ushanka ) -/obj/item/weapon/storage/box/casino/costume_wizard +/obj/item/storage/box/casino/costume_wizard name = "wizard costume" starts_with = list( /obj/item/clothing/suit/wizrobe/fake, /obj/item/clothing/head/wizard/fake, - /obj/item/weapon/staff + /obj/item/staff ) -/obj/item/weapon/storage/box/casino/costume_plaguedoctor +/obj/item/storage/box/casino/costume_plaguedoctor name = "plague doctor costume" starts_with = list( /obj/item/clothing/suit/bio_suit/plaguedoctorsuit, /obj/item/clothing/head/plaguedoctorhat ) -/obj/item/weapon/storage/box/casino/costume_cowboy +/obj/item/storage/box/casino/costume_cowboy name = "cowboy costume" starts_with = list( /obj/item/clothing/under/cowboy, @@ -51,7 +51,7 @@ /obj/item/clothing/shoes/boots/cowboy/brown ) -/obj/item/weapon/storage/box/roulette_balls_normal +/obj/item/storage/box/roulette_balls_normal name = "roulette ball box" desc = "A box of spare roulette balls." icon_state = "balls" @@ -60,7 +60,7 @@ /obj/item/roulette_ball = 7, /obj/item/roulette_ball/hollow = 2) -/obj/item/weapon/storage/box/roulette_balls_fancy +/obj/item/storage/box/roulette_balls_fancy name = "fancy roulette ball box" desc = "A box of extra-pretty roulette balls." icon_state = "balls" @@ -78,7 +78,7 @@ /obj/item/roulette_ball/planet, /obj/item/roulette_ball/gold) -/obj/item/weapon/storage/box/roulette_balls_cheat +/obj/item/storage/box/roulette_balls_cheat name = "special roulette ball box" desc = "A box of 'special' roulette balls." icon_state = "balls" diff --git a/code/modules/casino/casino.dm b/code/modules/casino/casino.dm index 340f7466dca..893ed6ae5f9 100644 --- a/code/modules/casino/casino.dm +++ b/code/modules/casino/casino.dm @@ -206,7 +206,7 @@ ball_desc = "a small glass ball" icon_state = "roulette_ball_glass" - var/obj/item/weapon/holder/trapped + var/obj/item/holder/trapped /obj/item/roulette_ball/hollow/examine(mob/user) .=..() @@ -225,8 +225,8 @@ if(trapped) to_chat(user, "This ball already has something trapped in it!") return - if(istype(W, /obj/item/weapon/holder)) - var/obj/item/weapon/holder/H = W + if(istype(W, /obj/item/holder)) + var/obj/item/holder/H = W if(!H.held_mob) to_chat(user, "This holder has nobody in it? Yell at a developer!") return @@ -397,7 +397,7 @@ setinterval() -/obj/machinery/wheel_of_fortune/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/wheel_of_fortune/attackby(obj/item/W as obj, mob/user as mob) if (busy) to_chat(user,"The wheel of fortune is already spinning! ") return @@ -405,7 +405,7 @@ if(usr.incapacitated()) return - if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) + if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) if(!check_access(W)) to_chat(user, "Access Denied.") return @@ -443,7 +443,7 @@ lottery_tickets = list() lottery_tickets_ckeys = list() - if(istype(W, /obj/item/weapon/spacecasinocash)) + if(istype(W, /obj/item/spacecasinocash)) if(lottery_sale == "disabled") to_chat(user, "Lottery sales are currently disabled.") return @@ -452,10 +452,10 @@ to_chat(user, "The scanner beeps in an upset manner, you already have a ticket!") return - var/obj/item/weapon/spacecasinocash/C = W + var/obj/item/spacecasinocash/C = W insert_chip(C, user) -/obj/machinery/wheel_of_fortune/proc/insert_chip(var/obj/item/weapon/spacecasinocash/cashmoney, mob/user) +/obj/machinery/wheel_of_fortune/proc/insert_chip(var/obj/item/spacecasinocash/cashmoney, mob/user) if (busy) to_chat(user,"The Wheel of Fortune is busy, wait for it to be done to buy a lottery ticket. ") return @@ -613,11 +613,11 @@ spawn_casinochips(casinosentientprize_price, src.loc) -/obj/machinery/casinosentientprize_handler/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/casinosentientprize_handler/attackby(obj/item/W as obj, mob/user as mob) if(usr.incapacitated()) return - if(istype(W, /obj/item/weapon/spacecasinocash)) + if(istype(W, /obj/item/spacecasinocash)) if(casinosentientprize_sale == "disabled") to_chat(user, "Sentient Prize sales are currently disabled.") return @@ -625,7 +625,7 @@ to_chat(user, "Select a prize first.") return if(!selected_collar.ownername) - var/obj/item/weapon/spacecasinocash/C = W + var/obj/item/spacecasinocash/C = W if(user.client.ckey == selected_collar.sentientprizeckey) insert_chip(C, user, "selfbuy") return @@ -660,7 +660,7 @@ C.sentientprizeckey = null collar_list -= C - if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) + if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) if(!check_access(W)) to_chat(user, "Access Denied.") return @@ -713,7 +713,7 @@ if("Change Prize Value") setprice(user) -/obj/machinery/casinosentientprize_handler/proc/insert_chip(var/obj/item/weapon/spacecasinocash/cashmoney, mob/user, var/buystate) +/obj/machinery/casinosentientprize_handler/proc/insert_chip(var/obj/item/spacecasinocash/cashmoney, mob/user, var/buystate) if(cashmoney.worth < casinosentientprize_price) to_chat(user,"You dont have enough chips to pay for the sentient prize! ") return diff --git a/code/modules/casino/casino_book.dm b/code/modules/casino/casino_book.dm index 84cd8197eec..7babc27d93b 100644 --- a/code/modules/casino/casino_book.dm +++ b/code/modules/casino/casino_book.dm @@ -5,7 +5,7 @@ // //Casino Manual - NEEDS EDITING // -/obj/item/weapon/book/manual/casino +/obj/item/book/manual/casino name = "A dummy guide to losing your thalers" icon = 'icons/obj/casino.dmi' icon_state ="casinomanual" diff --git a/code/modules/casino/casino_cards.dm b/code/modules/casino/casino_cards.dm index 9df021abbe8..439c6826443 100644 --- a/code/modules/casino/casino_cards.dm +++ b/code/modules/casino/casino_cards.dm @@ -2,7 +2,7 @@ //Original Casino Code created by Shadowfire117#1269 - Ported from CHOMPstation //Modified by GhostActual#2055 for use with VOREstation -/obj/item/weapon/deck/cards/casino/New() +/obj/item/deck/cards/casino/New() var/datum/playingcard/casino/P for(var/suit in list("spades","clubs","diamonds","hearts")) @@ -31,17 +31,17 @@ card_icon = "card_back" back_icon = "card_back" -/obj/item/weapon/deck/casino +/obj/item/deck/casino w_class = ITEMSIZE_SMALL icon = 'icons/obj/playing_cards.dmi' -/obj/item/weapon/deck/holder/casino //WIP In future do a cool holder +/obj/item/deck/holder/casino //WIP In future do a cool holder name = "card box" desc = "A small leather case to show how classy you are compared to everyone else." icon = 'icons/obj/playing_cards.dmi' icon_state = "card_holder" -/obj/item/weapon/deck/cards/casino +/obj/item/deck/cards/casino name = "deck of casino cards" desc = "A deck of playing cards from the golden goose casino, comes without a joker card!" icon = 'icons/obj/playing_cards.dmi' diff --git a/code/modules/casino/casino_prize_vendor.dm b/code/modules/casino/casino_prize_vendor.dm index 10b9437d1ad..8363e776fee 100644 --- a/code/modules/casino/casino_prize_vendor.dm +++ b/code/modules/casino/casino_prize_vendor.dm @@ -62,21 +62,21 @@ item_list = list() item_list["Weapons"] = list( - CASINO_PRIZE("Scepter", /obj/item/weapon/scepter, 1, 2500, "weapons"), - CASINO_PRIZE("Rapier", /obj/item/weapon/melee/rapier, 1, 3000, "weapons"), - CASINO_PRIZE("Chain of Command", /obj/item/weapon/melee/chainofcommand, 1, 1250, "weapons"), - CASINO_PRIZE("Golden Bat", /obj/item/weapon/material/twohanded/baseballbat/gold, 1, 1000, "weapons"), - CASINO_PRIZE("Size Gun", /obj/item/weapon/gun/energy/sizegun, 1, 1500, "weapons"), - CASINO_PRIZE("Gradual Size Gun", /obj/item/device/slow_sizegun, 1, 1500, "weapons"), - CASINO_PRIZE("Metamorphosis Ray", /obj/item/weapon/gun/energy/mouseray/metamorphosis, 1, 6000, "weapons"), - CASINO_PRIZE("Net Gun", /obj/item/weapon/gun/energy/netgun, 1, 3000, "weapons"), + CASINO_PRIZE("Scepter", /obj/item/scepter, 1, 2500, "weapons"), + CASINO_PRIZE("Rapier", /obj/item/melee/rapier, 1, 3000, "weapons"), + CASINO_PRIZE("Chain of Command", /obj/item/melee/chainofcommand, 1, 1250, "weapons"), + CASINO_PRIZE("Golden Bat", /obj/item/material/twohanded/baseballbat/gold, 1, 1000, "weapons"), + CASINO_PRIZE("Size Gun", /obj/item/gun/energy/sizegun, 1, 1500, "weapons"), + CASINO_PRIZE("Gradual Size Gun", /obj/item/slow_sizegun, 1, 1500, "weapons"), + CASINO_PRIZE("Metamorphosis Ray", /obj/item/gun/energy/mouseray/metamorphosis, 1, 6000, "weapons"), + CASINO_PRIZE("Net Gun", /obj/item/gun/energy/netgun, 1, 3000, "weapons"), ) item_list["Gear"] = list( - CASINO_PRIZE("Experimental Welder", /obj/item/weapon/weldingtool/experimental, 1, 500, "gear"), - CASINO_PRIZE("Chemsprayer", /obj/item/weapon/reagent_containers/spray/chemsprayer, 1, 1250, "gear"), - CASINO_PRIZE("Bluespace Beaker", /obj/item/weapon/reagent_containers/glass/beaker/bluespace, 1, 1000, "gear"), - CASINO_PRIZE("Cryo Beaker", /obj/item/weapon/reagent_containers/glass/beaker/noreact, 1, 1000, "gear"), - CASINO_PRIZE("Golden Pickaxe", /obj/item/weapon/pickaxe/gold, 1, 1000, "gear"), + CASINO_PRIZE("Experimental Welder", /obj/item/weldingtool/experimental, 1, 500, "gear"), + CASINO_PRIZE("Chemsprayer", /obj/item/reagent_containers/spray/chemsprayer, 1, 1250, "gear"), + CASINO_PRIZE("Bluespace Beaker", /obj/item/reagent_containers/glass/beaker/bluespace, 1, 1000, "gear"), + CASINO_PRIZE("Cryo Beaker", /obj/item/reagent_containers/glass/beaker/noreact, 1, 1000, "gear"), + CASINO_PRIZE("Golden Pickaxe", /obj/item/pickaxe/gold, 1, 1000, "gear"), ) item_list["Clothing"] = list( CASINO_PRIZE("Shark mask", /obj/item/clothing/mask/shark, 1, 250, "clothing"), @@ -91,49 +91,49 @@ CASINO_PRIZE("Chameleon tie", /obj/item/clothing/accessory/chameleon, 1, 750, "clothing"), CASINO_PRIZE("Ian costume", /obj/item/clothing/suit/storage/hooded/costume/ian, 1, 250, "clothing"), CASINO_PRIZE("Carp costume", /obj/item/clothing/suit/storage/hooded/costume/carp, 1, 250, "clothing"), - CASINO_PRIZE("Plague doctor costume", /obj/item/weapon/storage/box/casino/costume_plaguedoctor, 1, 500, "clothing"), - CASINO_PRIZE("Wizard costume", /obj/item/weapon/storage/box/casino/costume_wizard, 1, 500, "clothing"), - CASINO_PRIZE("Pirate costume", /obj/item/weapon/storage/box/casino/costume_pirate, 1, 500, "clothing"), - CASINO_PRIZE("Commie costume", /obj/item/weapon/storage/box/casino/costume_commie, 1, 500, "clothing"), - CASINO_PRIZE("Marine costume", /obj/item/weapon/storage/box/casino/costume_marine, 1, 500, "clothing"), - CASINO_PRIZE("Cowboy costume", /obj/item/weapon/storage/box/casino/costume_cowboy, 1, 500, "clothing"), + CASINO_PRIZE("Plague doctor costume", /obj/item/storage/box/casino/costume_plaguedoctor, 1, 500, "clothing"), + CASINO_PRIZE("Wizard costume", /obj/item/storage/box/casino/costume_wizard, 1, 500, "clothing"), + CASINO_PRIZE("Pirate costume", /obj/item/storage/box/casino/costume_pirate, 1, 500, "clothing"), + CASINO_PRIZE("Commie costume", /obj/item/storage/box/casino/costume_commie, 1, 500, "clothing"), + CASINO_PRIZE("Marine costume", /obj/item/storage/box/casino/costume_marine, 1, 500, "clothing"), + CASINO_PRIZE("Cowboy costume", /obj/item/storage/box/casino/costume_cowboy, 1, 500, "clothing"), CASINO_PRIZE("Golden Collar", /obj/item/clothing/accessory/collar/gold, 1, 250, "clothing"), CASINO_PRIZE("Decorative Casino Sentient Prize Collar", /obj/item/clothing/accessory/collar/casinosentientprize_fake, 1, 100, "clothing"), CASINO_PRIZE("Bluespace Collar", /obj/item/clothing/accessory/collar/shock/bluespace, 1, 1000, "clothing"), ) item_list["Donk Soft"] = list( - CASINO_PRIZE("Donk-Soft shotgun", /obj/item/weapon/gun/projectile/shotgun/pump/toy, 1, 1000, "misc"), - CASINO_PRIZE("Donk-Soft mosin-nagant", /obj/item/weapon/gun/projectile/shotgun/pump/toy/moistnugget, 1, 1000, "misc"), - CASINO_PRIZE("Donk-Soft pistol", /obj/item/weapon/gun/projectile/pistol/toy, 1, 800, "misc"), - CASINO_PRIZE("Donk-Soft levergun", /obj/item/weapon/gun/projectile/shotgun/pump/toy/levergun, 1, 1000, "misc"), - CASINO_PRIZE("Donk-Soft commemorative pistol", /obj/item/weapon/gun/projectile/pistol/toy/n99, 1, 750, "misc"), - CASINO_PRIZE("Donk-Soft revolver", /obj/item/weapon/gun/projectile/revolver/toy, 1, 750, "misc"), - CASINO_PRIZE("Donk-Soft big-iron", /obj/item/weapon/gun/projectile/revolver/toy/big_iron, 1, 750, "misc"), - CASINO_PRIZE("Donk-Soft crossbow", /obj/item/weapon/gun/projectile/revolver/toy/crossbow, 1, 600, "misc"), - CASINO_PRIZE("Donk-Soft sawn off shotgun", /obj/item/weapon/gun/projectile/revolver/toy/sawnoff, 1, 800, "misc"), - CASINO_PRIZE("Donk-Soft SMG", /obj/item/weapon/gun/projectile/automatic/toy, 1, 1200, "misc"), + CASINO_PRIZE("Donk-Soft shotgun", /obj/item/gun/projectile/shotgun/pump/toy, 1, 1000, "misc"), + CASINO_PRIZE("Donk-Soft mosin-nagant", /obj/item/gun/projectile/shotgun/pump/toy/moistnugget, 1, 1000, "misc"), + CASINO_PRIZE("Donk-Soft pistol", /obj/item/gun/projectile/pistol/toy, 1, 800, "misc"), + CASINO_PRIZE("Donk-Soft levergun", /obj/item/gun/projectile/shotgun/pump/toy/levergun, 1, 1000, "misc"), + CASINO_PRIZE("Donk-Soft commemorative pistol", /obj/item/gun/projectile/pistol/toy/n99, 1, 750, "misc"), + CASINO_PRIZE("Donk-Soft revolver", /obj/item/gun/projectile/revolver/toy, 1, 750, "misc"), + CASINO_PRIZE("Donk-Soft big-iron", /obj/item/gun/projectile/revolver/toy/big_iron, 1, 750, "misc"), + CASINO_PRIZE("Donk-Soft crossbow", /obj/item/gun/projectile/revolver/toy/crossbow, 1, 600, "misc"), + CASINO_PRIZE("Donk-Soft sawn off shotgun", /obj/item/gun/projectile/revolver/toy/sawnoff, 1, 800, "misc"), + CASINO_PRIZE("Donk-Soft SMG", /obj/item/gun/projectile/automatic/toy, 1, 1200, "misc"), CASINO_PRIZE("Foam Darts", /obj/item/ammo_magazine/ammo_box/foam, 1, 100, "misc"), CASINO_PRIZE("Riot Darts", /obj/item/ammo_magazine/ammo_box/foam/riot, 1, 200, "misc"), ) item_list["Miscellaneous"] = list( CASINO_PRIZE("Winner's Medal", /obj/item/clothing/accessory/medal/gold/casino, 1, 30000, "misc"), - CASINO_PRIZE("Golden ID card", /obj/item/weapon/card/id/gold, 1, 1000, "misc"), - CASINO_PRIZE("Gold-trimmed pen", /obj/item/weapon/pen/fountain5, 1, 50, "misc"), - CASINO_PRIZE("Golden pen", /obj/item/weapon/pen/fountain7, 1, 350, "misc"), + CASINO_PRIZE("Golden ID card", /obj/item/card/id/gold, 1, 1000, "misc"), + CASINO_PRIZE("Gold-trimmed pen", /obj/item/pen/fountain5, 1, 50, "misc"), + CASINO_PRIZE("Golden pen", /obj/item/pen/fountain7, 1, 350, "misc"), CASINO_PRIZE("Toy sword", /obj/item/toy/sword, 1, 200, "misc"), - CASINO_PRIZE("Waterflower", /obj/item/weapon/reagent_containers/spray/waterflower, 1, 100, "misc"), + CASINO_PRIZE("Waterflower", /obj/item/reagent_containers/spray/waterflower, 1, 100, "misc"), CASINO_PRIZE("Horse stick", /obj/item/toy/stickhorse, 1, 100, "misc"), CASINO_PRIZE("Toy katana", /obj/item/toy/katana, 1, 200, "misc"), CASINO_PRIZE("Magic conch", /obj/item/toy/eight_ball/conch, 1, 100, "misc"), CASINO_PRIZE("Magic eight ball", /obj/item/toy/eight_ball, 1, 100, "misc"), - CASINO_PRIZE("Foam sword", /obj/item/weapon/material/sword/foam, 1, 200, "misc"), + CASINO_PRIZE("Foam sword", /obj/item/material/sword/foam, 1, 200, "misc"), CASINO_PRIZE("Whistle", /obj/item/toy/bosunwhistle, 1, 100, "misc"), - CASINO_PRIZE("Golden cup", /obj/item/weapon/reagent_containers/food/drinks/golden_cup, 1, 250, "misc"), - CASINO_PRIZE("Quality cigars", /obj/item/weapon/storage/fancy/cigar/havana, 1, 100, "misc"), - CASINO_PRIZE("Golden zippo lighter", /obj/item/weapon/flame/lighter/zippo/gold, 1, 100, "misc"), - CASINO_PRIZE("Candelabra", /obj/item/weapon/flame/candle/candelabra/everburn, 1, 400, "misc"), - CASINO_PRIZE("Casino wallet", /obj/item/weapon/storage/wallet/casino, 1, 200, "misc"), - CASINO_PRIZE("Casino cards", /obj/item/weapon/deck/cards/casino, 1, 200, "misc"), + CASINO_PRIZE("Golden cup", /obj/item/reagent_containers/food/drinks/golden_cup, 1, 250, "misc"), + CASINO_PRIZE("Quality cigars", /obj/item/storage/fancy/cigar/havana, 1, 100, "misc"), + CASINO_PRIZE("Golden zippo lighter", /obj/item/flame/lighter/zippo/gold, 1, 100, "misc"), + CASINO_PRIZE("Candelabra", /obj/item/flame/candle/candelabra/everburn, 1, 400, "misc"), + CASINO_PRIZE("Casino wallet", /obj/item/storage/wallet/casino, 1, 200, "misc"), + CASINO_PRIZE("Casino cards", /obj/item/deck/cards/casino, 1, 200, "misc"), CASINO_PRIZE("Instrument: Accordion", /obj/item/instrument/accordion, 1, 500, "misc"), CASINO_PRIZE("Instrument: Banjo", /obj/item/instrument/banjo, 1, 500, "misc"), CASINO_PRIZE("Instrument: Musical bikehorn", /obj/item/instrument/bikehorn, 1, 500, "misc"), @@ -155,27 +155,27 @@ CASINO_PRIZE("Instrument: Musical Moth (you monster)", /obj/item/instrument/musicalmoth, 1, 500, "misc"), ) item_list["Drinks"] = list( - CASINO_PRIZE("Redeemer's brew", /obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew, 1, 150, "drinks"), - CASINO_PRIZE("Poison wine", /obj/item/weapon/reagent_containers/food/drinks/bottle/pwine, 1, 150, "drinks"), - CASINO_PRIZE("Patron", /obj/item/weapon/reagent_containers/food/drinks/bottle/patron, 1, 150, "drinks"), - CASINO_PRIZE("Holy water", /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, 1, 150, "drinks"), - CASINO_PRIZE("Goldschlager", /obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager, 1, 150, "drinks"), - CASINO_PRIZE("Champagne", /obj/item/weapon/reagent_containers/food/drinks/bottle/champagne, 1, 150, "drinks"), - CASINO_PRIZE("Bottle of Nothing", /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing, 1, 150, "drinks"), - CASINO_PRIZE("Whiskey bliss", /obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey, 1, 150, "drinks"), + CASINO_PRIZE("Redeemer's brew", /obj/item/reagent_containers/food/drinks/bottle/redeemersbrew, 1, 150, "drinks"), + CASINO_PRIZE("Poison wine", /obj/item/reagent_containers/food/drinks/bottle/pwine, 1, 150, "drinks"), + CASINO_PRIZE("Patron", /obj/item/reagent_containers/food/drinks/bottle/patron, 1, 150, "drinks"), + CASINO_PRIZE("Holy water", /obj/item/reagent_containers/food/drinks/bottle/holywater, 1, 150, "drinks"), + CASINO_PRIZE("Goldschlager", /obj/item/reagent_containers/food/drinks/bottle/goldschlager, 1, 150, "drinks"), + CASINO_PRIZE("Champagne", /obj/item/reagent_containers/food/drinks/bottle/champagne, 1, 150, "drinks"), + CASINO_PRIZE("Bottle of Nothing", /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing, 1, 150, "drinks"), + CASINO_PRIZE("Whiskey bliss", /obj/item/reagent_containers/food/drinks/bottle/specialwhiskey, 1, 150, "drinks"), ) item_list["Pets"] = list( - CASINO_PRIZE("Cat", /obj/item/weapon/grenade/spawnergrenade/casino, 1, 700, "pets"), - CASINO_PRIZE("Chicken", /obj/item/weapon/grenade/spawnergrenade/casino/chicken, 1, 700, "pets"), - CASINO_PRIZE("Cow", /obj/item/weapon/grenade/spawnergrenade/casino/cow, 1, 700, "pets"), - CASINO_PRIZE("Corgi", /obj/item/weapon/grenade/spawnergrenade/casino/corgi, 1, 900, "pets"), - CASINO_PRIZE("Fox", /obj/item/weapon/grenade/spawnergrenade/casino/fox, 1, 700, "pets"), - CASINO_PRIZE("Red panda", /obj/item/weapon/grenade/spawnergrenade/casino/redpanda, 1, 1200, "pets"), - CASINO_PRIZE("Otie", /obj/item/weapon/grenade/spawnergrenade/casino/otie, 1, 1500, "pets"), - CASINO_PRIZE("Snake", /obj/item/weapon/grenade/spawnergrenade/casino/snake, 1, 900, "pets"), - CASINO_PRIZE("Penguin", /obj/item/weapon/grenade/spawnergrenade/casino/penguin, 1, 900, "pets"), - CASINO_PRIZE("Fennec", /obj/item/weapon/grenade/spawnergrenade/casino/fennec, 1, 1200, "pets"), - CASINO_PRIZE("Bird", /obj/item/weapon/grenade/spawnergrenade/casino/goldcrest, 1, 1500, "pets"), + CASINO_PRIZE("Cat", /obj/item/grenade/spawnergrenade/casino, 1, 700, "pets"), + CASINO_PRIZE("Chicken", /obj/item/grenade/spawnergrenade/casino/chicken, 1, 700, "pets"), + CASINO_PRIZE("Cow", /obj/item/grenade/spawnergrenade/casino/cow, 1, 700, "pets"), + CASINO_PRIZE("Corgi", /obj/item/grenade/spawnergrenade/casino/corgi, 1, 900, "pets"), + CASINO_PRIZE("Fox", /obj/item/grenade/spawnergrenade/casino/fox, 1, 700, "pets"), + CASINO_PRIZE("Red panda", /obj/item/grenade/spawnergrenade/casino/redpanda, 1, 1200, "pets"), + CASINO_PRIZE("Otie", /obj/item/grenade/spawnergrenade/casino/otie, 1, 1500, "pets"), + CASINO_PRIZE("Snake", /obj/item/grenade/spawnergrenade/casino/snake, 1, 900, "pets"), + CASINO_PRIZE("Penguin", /obj/item/grenade/spawnergrenade/casino/penguin, 1, 900, "pets"), + CASINO_PRIZE("Fennec", /obj/item/grenade/spawnergrenade/casino/fennec, 1, 1200, "pets"), + CASINO_PRIZE("Bird", /obj/item/grenade/spawnergrenade/casino/goldcrest, 1, 1500, "pets"), CASINO_PRIZE("Capture Crystal", /obj/item/capture_crystal, 1, 3000, "pets"), ) @@ -195,26 +195,26 @@ return tgui_interact(user) -/obj/machinery/casino_prize_dispenser/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/casino_prize_dispenser/attackby(obj/item/W as obj, mob/user as mob) if(currently_vending) - if(istype(W, /obj/item/weapon/spacecasinocash)) + if(istype(W, /obj/item/spacecasinocash)) to_chat(usr, "Please select prize on display with sufficient amount of chips.") else SStgui.update_uis(src) return // don't smack that machine with your 2 chips - if(istype(W, /obj/item/weapon/spacecasinocash)) + if(istype(W, /obj/item/spacecasinocash)) attack_hand(user) return ..() -/obj/machinery/casino_prize_dispenser/proc/pay_with_chips(var/obj/item/weapon/spacecasinocash/cashmoney, mob/user, var/price) +/obj/machinery/casino_prize_dispenser/proc/pay_with_chips(var/obj/item/spacecasinocash/cashmoney, mob/user, var/price) //"cashmoney_:[cashmoney] user:[user] currently_vending:[currently_vending]" if(price > cashmoney.worth) to_chat(usr, "[icon2html(cashmoney, user.client)] That is not enough chips.") return 0 - if(istype(cashmoney, /obj/item/weapon/spacecasinocash)) + if(istype(cashmoney, /obj/item/spacecasinocash)) visible_message("\The [usr] inserts some chips into \the [src].") cashmoney.worth -= price @@ -298,8 +298,8 @@ currently_vending = bi - if(istype(usr.get_active_hand(), /obj/item/weapon/spacecasinocash)) - var/obj/item/weapon/spacecasinocash/cash = usr.get_active_hand() + if(istype(usr.get_active_hand(), /obj/item/spacecasinocash)) + var/obj/item/spacecasinocash/cash = usr.get_active_hand() paid = pay_with_chips(cash, usr, price) else to_chat(usr, "Payment failure: Improper payment method, please provide chips.") diff --git a/code/modules/casino/headset_casino.dm b/code/modules/casino/headset_casino.dm index d136eeea19f..a1acb313c59 100644 --- a/code/modules/casino/headset_casino.dm +++ b/code/modules/casino/headset_casino.dm @@ -1,18 +1,18 @@ -/obj/item/device/radio/headset/casino +/obj/item/radio/headset/casino name = "casino headset" desc = "An updated, modular intercom that fits over the head with extra comfortable for the hardworking casino luxury crew. Has encryption key for scamm-... Kind casino staff channel." icon = 'icons/obj/casino.dmi' icon_state = "headset" origin_tech = list(TECH_ILLEGAL = 1) - ks1type = /obj/item/device/encryptionkey/casino + ks1type = /obj/item/encryptionkey/casino -/obj/item/device/radio/headset/casino/bowman +/obj/item/radio/headset/casino/bowman name = "casino bowman headset" icon_state = "headset_alt" adhoc_fallback = TRUE origin_tech = list(TECH_ILLEGAL = 2) -/obj/item/device/encryptionkey/casino +/obj/item/encryptionkey/casino icon = 'icons/obj/casino.dmi' icon_state = "cypherkey" channels = list(CHANNEL_CASINO = 1) diff --git a/code/modules/casino/premium_dispenser.dm b/code/modules/casino/premium_dispenser.dm index 91b4833d6ef..bae1835be47 100644 --- a/code/modules/casino/premium_dispenser.dm +++ b/code/modules/casino/premium_dispenser.dm @@ -13,57 +13,57 @@ /obj/machinery/chemical_dispenser/premium/full spawn_cartridges = list( - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon_lime, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sodawater, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tonic, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/beer, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/gin, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/rum, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tequila, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/vermouth, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cognac, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cider, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ale, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/mead, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/water, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ice, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cream, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/icetea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cola, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/smw, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/dr_gibb, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/spaceup, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tonic, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sodawater, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon_lime, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/watermelon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cafe_latte, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/soy_latte, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/hot_coco, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/milk, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cream, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ice, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/mint, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/berry, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/greentea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/decaf + /obj/item/reagent_containers/chem_disp_cartridge/lemon_lime, + /obj/item/reagent_containers/chem_disp_cartridge/sugar, + /obj/item/reagent_containers/chem_disp_cartridge/orange, + /obj/item/reagent_containers/chem_disp_cartridge/lime, + /obj/item/reagent_containers/chem_disp_cartridge/sodawater, + /obj/item/reagent_containers/chem_disp_cartridge/tonic, + /obj/item/reagent_containers/chem_disp_cartridge/beer, + /obj/item/reagent_containers/chem_disp_cartridge/kahlua, + /obj/item/reagent_containers/chem_disp_cartridge/whiskey, + /obj/item/reagent_containers/chem_disp_cartridge/redwine, + /obj/item/reagent_containers/chem_disp_cartridge/whitewine, + /obj/item/reagent_containers/chem_disp_cartridge/vodka, + /obj/item/reagent_containers/chem_disp_cartridge/gin, + /obj/item/reagent_containers/chem_disp_cartridge/rum, + /obj/item/reagent_containers/chem_disp_cartridge/tequila, + /obj/item/reagent_containers/chem_disp_cartridge/vermouth, + /obj/item/reagent_containers/chem_disp_cartridge/cognac, + /obj/item/reagent_containers/chem_disp_cartridge/cider, + /obj/item/reagent_containers/chem_disp_cartridge/ale, + /obj/item/reagent_containers/chem_disp_cartridge/mead, + /obj/item/reagent_containers/chem_disp_cartridge/water, + /obj/item/reagent_containers/chem_disp_cartridge/ice, + /obj/item/reagent_containers/chem_disp_cartridge/coffee, + /obj/item/reagent_containers/chem_disp_cartridge/cream, + /obj/item/reagent_containers/chem_disp_cartridge/tea, + /obj/item/reagent_containers/chem_disp_cartridge/icetea, + /obj/item/reagent_containers/chem_disp_cartridge/cola, + /obj/item/reagent_containers/chem_disp_cartridge/smw, + /obj/item/reagent_containers/chem_disp_cartridge/dr_gibb, + /obj/item/reagent_containers/chem_disp_cartridge/spaceup, + /obj/item/reagent_containers/chem_disp_cartridge/tonic, + /obj/item/reagent_containers/chem_disp_cartridge/sodawater, + /obj/item/reagent_containers/chem_disp_cartridge/lemon_lime, + /obj/item/reagent_containers/chem_disp_cartridge/sugar, + /obj/item/reagent_containers/chem_disp_cartridge/orange, + /obj/item/reagent_containers/chem_disp_cartridge/lime, + /obj/item/reagent_containers/chem_disp_cartridge/watermelon, + /obj/item/reagent_containers/chem_disp_cartridge/lemon, + /obj/item/reagent_containers/chem_disp_cartridge/coffee, + /obj/item/reagent_containers/chem_disp_cartridge/cafe_latte, + /obj/item/reagent_containers/chem_disp_cartridge/soy_latte, + /obj/item/reagent_containers/chem_disp_cartridge/hot_coco, + /obj/item/reagent_containers/chem_disp_cartridge/milk, + /obj/item/reagent_containers/chem_disp_cartridge/cream, + /obj/item/reagent_containers/chem_disp_cartridge/tea, + /obj/item/reagent_containers/chem_disp_cartridge/ice, + /obj/item/reagent_containers/chem_disp_cartridge/mint, + /obj/item/reagent_containers/chem_disp_cartridge/orange, + /obj/item/reagent_containers/chem_disp_cartridge/lemon, + /obj/item/reagent_containers/chem_disp_cartridge/lime, + /obj/item/reagent_containers/chem_disp_cartridge/berry, + /obj/item/reagent_containers/chem_disp_cartridge/greentea, + /obj/item/reagent_containers/chem_disp_cartridge/decaf ) \ No newline at end of file diff --git a/code/modules/casino/premium_vendors.dm b/code/modules/casino/premium_vendors.dm index ad65cd61c21..7014400f977 100644 --- a/code/modules/casino/premium_vendors.dm +++ b/code/modules/casino/premium_vendors.dm @@ -15,63 +15,63 @@ desc = "A top of the line drink vendor that carries some of the finest drinks in the frontier." icon = 'icons/obj/casino.dmi' icon_state = "premiumbooze" - products = list(/obj/item/weapon/glass_extra/stick = 50, - /obj/item/weapon/glass_extra/straw = 50, - /obj/item/weapon/reagent_containers/food/drinks/glass2/square = 25, - /obj/item/weapon/reagent_containers/food/drinks/glass2/rocks = 25, - /obj/item/weapon/reagent_containers/food/drinks/glass2/shake = 25, - /obj/item/weapon/reagent_containers/food/drinks/glass2/cocktail = 25, - /obj/item/weapon/reagent_containers/food/drinks/glass2/shot = 25, - /obj/item/weapon/reagent_containers/food/drinks/glass2/pint = 25, - /obj/item/weapon/reagent_containers/food/drinks/glass2/mug = 25, - /obj/item/weapon/reagent_containers/food/drinks/glass2/wine = 25, - /obj/item/weapon/reagent_containers/food/drinks/glass2/carafe = 2, - /obj/item/weapon/reagent_containers/food/drinks/glass2/pitcher = 2, - /obj/item/weapon/reagent_containers/food/drinks/metaglass = 25, - /obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint = 25, - /obj/item/weapon/reagent_containers/food/drinks/bottle/gin = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/cognac = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/rum = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/sake = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/patron = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/champagne = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 15, - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper = 15, - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 15, - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/silverdragon = 15, - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/meteor = 15, - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/litebeer = 15, - /obj/item/weapon/reagent_containers/food/drinks/bottle/small/cider = 15, - /obj/item/weapon/reagent_containers/food/drinks/cans/tonic = 50, - /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 50, - /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 50, - /obj/item/weapon/reagent_containers/food/drinks/tea = 50, - /obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 15, - /obj/item/weapon/reagent_containers/food/drinks/bottle/space_up = 15, - /obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind = 15, - /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/lemonjuice = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/applejuice = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/milk = 10, - /obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 10, - /obj/item/weapon/reagent_containers/food/drinks/ice = 10 + products = list(/obj/item/glass_extra/stick = 50, + /obj/item/glass_extra/straw = 50, + /obj/item/reagent_containers/food/drinks/glass2/square = 25, + /obj/item/reagent_containers/food/drinks/glass2/rocks = 25, + /obj/item/reagent_containers/food/drinks/glass2/shake = 25, + /obj/item/reagent_containers/food/drinks/glass2/cocktail = 25, + /obj/item/reagent_containers/food/drinks/glass2/shot = 25, + /obj/item/reagent_containers/food/drinks/glass2/pint = 25, + /obj/item/reagent_containers/food/drinks/glass2/mug = 25, + /obj/item/reagent_containers/food/drinks/glass2/wine = 25, + /obj/item/reagent_containers/food/drinks/glass2/carafe = 2, + /obj/item/reagent_containers/food/drinks/glass2/pitcher = 2, + /obj/item/reagent_containers/food/drinks/metaglass = 25, + /obj/item/reagent_containers/food/drinks/metaglass/metapint = 25, + /obj/item/reagent_containers/food/drinks/bottle/gin = 10, + /obj/item/reagent_containers/food/drinks/bottle/absinthe = 10, + /obj/item/reagent_containers/food/drinks/bottle/bluecuracao = 10, + /obj/item/reagent_containers/food/drinks/bottle/cognac = 10, + /obj/item/reagent_containers/food/drinks/bottle/grenadine = 10, + /obj/item/reagent_containers/food/drinks/bottle/kahlua = 10, + /obj/item/reagent_containers/food/drinks/bottle/melonliquor = 10, + /obj/item/reagent_containers/food/drinks/bottle/rum = 10, + /obj/item/reagent_containers/food/drinks/bottle/sake = 10, + /obj/item/reagent_containers/food/drinks/bottle/specialwhiskey = 10, + /obj/item/reagent_containers/food/drinks/bottle/tequilla = 10, + /obj/item/reagent_containers/food/drinks/bottle/vermouth = 10, + /obj/item/reagent_containers/food/drinks/bottle/vodka = 10, + /obj/item/reagent_containers/food/drinks/bottle/whiskey = 10, + /obj/item/reagent_containers/food/drinks/bottle/wine = 10, + /obj/item/reagent_containers/food/drinks/bottle/redeemersbrew = 10, + /obj/item/reagent_containers/food/drinks/bottle/patron = 10, + /obj/item/reagent_containers/food/drinks/bottle/goldschlager = 10, + /obj/item/reagent_containers/food/drinks/bottle/champagne = 10, + /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing = 10, + /obj/item/reagent_containers/food/drinks/bottle/holywater = 10, + /obj/item/reagent_containers/food/drinks/bottle/small/ale = 15, + /obj/item/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper = 15, + /obj/item/reagent_containers/food/drinks/bottle/small/beer = 15, + /obj/item/reagent_containers/food/drinks/bottle/small/beer/silverdragon = 15, + /obj/item/reagent_containers/food/drinks/bottle/small/beer/meteor = 15, + /obj/item/reagent_containers/food/drinks/bottle/small/litebeer = 15, + /obj/item/reagent_containers/food/drinks/bottle/small/cider = 15, + /obj/item/reagent_containers/food/drinks/cans/tonic = 50, + /obj/item/reagent_containers/food/drinks/cans/gingerale = 50, + /obj/item/reagent_containers/food/drinks/cans/sodawater = 50, + /obj/item/reagent_containers/food/drinks/tea = 50, + /obj/item/reagent_containers/food/drinks/bottle/cola = 15, + /obj/item/reagent_containers/food/drinks/bottle/space_up = 15, + /obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind = 15, + /obj/item/reagent_containers/food/drinks/bottle/orangejuice = 10, + /obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 10, + /obj/item/reagent_containers/food/drinks/bottle/limejuice = 10, + /obj/item/reagent_containers/food/drinks/bottle/lemonjuice = 10, + /obj/item/reagent_containers/food/drinks/bottle/applejuice = 10, + /obj/item/reagent_containers/food/drinks/bottle/milk = 10, + /obj/item/reagent_containers/food/drinks/bottle/cream = 10, + /obj/item/reagent_containers/food/drinks/ice = 10 ) contraband = list() @@ -87,40 +87,40 @@ desc = "A top of the line drink vendor that carries some of the finest foods in the frontier." icon = 'icons/obj/casino.dmi' icon_state = "premiumfood" - products = list(/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger = 30, - /obj/item/weapon/reagent_containers/food/snacks/meatsteak = 30, - /obj/item/weapon/reagent_containers/food/snacks/fries = 30, - /obj/item/weapon/reagent_containers/food/snacks/onionrings = 30, - /obj/item/weapon/reagent_containers/food/snacks/cheeseburrito= 30, - /obj/item/weapon/reagent_containers/food/snacks/enchiladas= 30, - /obj/item/weapon/reagent_containers/food/snacks/meatburrito= 30, - /obj/item/weapon/reagent_containers/food/snacks/taco= 30, - /obj/item/weapon/reagent_containers/food/snacks/cheesenachos= 30, - /obj/item/weapon/reagent_containers/food/snacks/cubannachos= 30, - /obj/item/weapon/reagent_containers/food/snacks/stew= 20, - /obj/item/weapon/reagent_containers/food/snacks/roastbeef = 20, - /obj/item/weapon/reagent_containers/food/snacks/aesirsalad = 20, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi = 20, - /obj/item/weapon/reagent_containers/food/snacks/kitsuneudon = 20, - /obj/item/weapon/reagent_containers/food/snacks/baguette = 30, - /obj/item/weapon/reagent_containers/food/snacks/appletart = 30, - /obj/item/weapon/reagent_containers/food/snacks/muffin = 30, - /obj/item/weapon/reagent_containers/food/snacks/berrymuffin = 30, - /obj/item/weapon/reagent_containers/food/snacks/cherrypie = 30, - /obj/item/weapon/reagent_containers/food/snacks/croissant = 30, - /obj/item/weapon/reagent_containers/food/snacks/pie = 30, - /obj/item/weapon/reagent_containers/food/snacks/poppypretzel = 30, - /obj/item/weapon/reagent_containers/food/snacks/sugarcookie = 30, - /obj/item/weapon/reagent_containers/food/snacks/waffles = 30, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake = 2, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake = 2, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake = 2, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake = 2, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake = 2, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake = 2, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake = 2, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake = 2, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake = 2 + products = list(/obj/item/reagent_containers/food/snacks/bigbiteburger = 30, + /obj/item/reagent_containers/food/snacks/meatsteak = 30, + /obj/item/reagent_containers/food/snacks/fries = 30, + /obj/item/reagent_containers/food/snacks/onionrings = 30, + /obj/item/reagent_containers/food/snacks/cheeseburrito= 30, + /obj/item/reagent_containers/food/snacks/enchiladas= 30, + /obj/item/reagent_containers/food/snacks/meatburrito= 30, + /obj/item/reagent_containers/food/snacks/taco= 30, + /obj/item/reagent_containers/food/snacks/cheesenachos= 30, + /obj/item/reagent_containers/food/snacks/cubannachos= 30, + /obj/item/reagent_containers/food/snacks/stew= 20, + /obj/item/reagent_containers/food/snacks/roastbeef = 20, + /obj/item/reagent_containers/food/snacks/aesirsalad = 20, + /obj/item/reagent_containers/food/snacks/sliceable/sushi = 20, + /obj/item/reagent_containers/food/snacks/kitsuneudon = 20, + /obj/item/reagent_containers/food/snacks/baguette = 30, + /obj/item/reagent_containers/food/snacks/appletart = 30, + /obj/item/reagent_containers/food/snacks/muffin = 30, + /obj/item/reagent_containers/food/snacks/berrymuffin = 30, + /obj/item/reagent_containers/food/snacks/cherrypie = 30, + /obj/item/reagent_containers/food/snacks/croissant = 30, + /obj/item/reagent_containers/food/snacks/pie = 30, + /obj/item/reagent_containers/food/snacks/poppypretzel = 30, + /obj/item/reagent_containers/food/snacks/sugarcookie = 30, + /obj/item/reagent_containers/food/snacks/waffles = 30, + /obj/item/reagent_containers/food/snacks/sliceable/applecake = 2, + /obj/item/reagent_containers/food/snacks/sliceable/birthdaycake = 2, + /obj/item/reagent_containers/food/snacks/sliceable/carrotcake = 2, + /obj/item/reagent_containers/food/snacks/sliceable/cheesecake = 2, + /obj/item/reagent_containers/food/snacks/sliceable/chocolatecake = 2, + /obj/item/reagent_containers/food/snacks/sliceable/lemoncake = 2, + /obj/item/reagent_containers/food/snacks/sliceable/limecake = 2, + /obj/item/reagent_containers/food/snacks/sliceable/orangecake = 2, + /obj/item/reagent_containers/food/snacks/sliceable/plaincake = 2 ) contraband = list() @@ -136,13 +136,13 @@ desc = "A top of the line smokes vendor that carries some of the finest tobacco based goods in the frontier." icon = 'icons/obj/casino.dmi' icon_state = "premiumcigs" - products = list(/obj/item/weapon/storage/fancy/cigar = 15, - /obj/item/weapon/storage/fancy/cigarettes/carcinomas = 15, - /obj/item/weapon/storage/fancy/cigarettes/professionals = 15, + products = list(/obj/item/storage/fancy/cigar = 15, + /obj/item/storage/fancy/cigarettes/carcinomas = 15, + /obj/item/storage/fancy/cigarettes/professionals = 15, /obj/item/clothing/mask/smokable/cigarette/cigar/cohiba = 30, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 30, - /obj/item/weapon/storage/box/matches = 5, - /obj/item/weapon/flame/lighter/zippo = 10 + /obj/item/storage/box/matches = 5, + /obj/item/flame/lighter/zippo = 10 ) contraband = list() diff --git a/code/modules/casino/slots.dm b/code/modules/casino/slots.dm index 654d872b0e3..a15e7acb1ed 100644 --- a/code/modules/casino/slots.dm +++ b/code/modules/casino/slots.dm @@ -57,7 +57,7 @@ ispowered = 0 update_icon() -/obj/machinery/slot_machine/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/slot_machine/attackby(obj/item/W as obj, mob/user as mob) if(busy) to_chat(user,"The slot machine is currently running. ") return @@ -81,8 +81,8 @@ var/handled = 0 var/paid = 0 - if(istype(W, /obj/item/weapon/spacecasinocash)) - var/obj/item/weapon/spacecasinocash/C = W + if(istype(W, /obj/item/spacecasinocash)) + var/obj/item/spacecasinocash/C = W paid = insert_chip(C, user) handled = 1 @@ -98,7 +98,7 @@ else if(isbroken) return -/obj/machinery/slot_machine/proc/insert_chip(var/obj/item/weapon/spacecasinocash/cashmoney, mob/user) +/obj/machinery/slot_machine/proc/insert_chip(var/obj/item/spacecasinocash/cashmoney, mob/user) if (ispowered == 0) return if (isbroken) @@ -212,7 +212,7 @@ to_chat(user,output) //Output message if(platinumwin) // Did they win the platinum chip? - new /obj/item/weapon/casino_platinum_chip(src.loc) + new /obj/item/casino_platinum_chip(src.loc) playsound(src.loc, 'sound/machines/slotmachine.ogg', 25, 1) if(winnings) //Did the person win? @@ -287,7 +287,7 @@ ispowered = 0 update_icon() -/obj/machinery/station_slot_machine/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/station_slot_machine/attackby(obj/item/W as obj, mob/user as mob) if(busy) to_chat(user,"The slot machine is currently running. ") return @@ -311,8 +311,8 @@ var/handled = 0 var/paid = 0 - if(istype(W, /obj/item/weapon/spacecash)) - var/obj/item/weapon/spacecash/C = W + if(istype(W, /obj/item/spacecash)) + var/obj/item/spacecash/C = W paid = insert_cash(C, user) handled = 1 if(paid) @@ -327,7 +327,7 @@ else if(isbroken) return -/obj/machinery/station_slot_machine/proc/insert_cash(var/obj/item/weapon/spacecash/cashmoney, mob/user) +/obj/machinery/station_slot_machine/proc/insert_cash(var/obj/item/spacecash/cashmoney, mob/user) if (ispowered == 0) return if (isbroken) @@ -441,7 +441,7 @@ to_chat(user,output) //Output message if(platinumwin) // Did they win the platinum chip? - new /obj/item/weapon/casino_platinum_chip(src.loc) + new /obj/item/casino_platinum_chip(src.loc) playsound(src.loc, 'sound/machines/slotmachine.ogg', 25, 1) if(winnings) //Did the person win? diff --git a/code/modules/casino/spawnergrenade_casino.dm b/code/modules/casino/spawnergrenade_casino.dm index 34056fe89a7..9b37da4f94b 100644 --- a/code/modules/casino/spawnergrenade_casino.dm +++ b/code/modules/casino/spawnergrenade_casino.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/grenade/spawnergrenade/casino +/obj/item/grenade/spawnergrenade/casino name = "Creature Container (Cat)" desc = "It is set to detonate in 5 seconds. It will release a cat won from the prize vendor!" icon = 'icons/obj/casino.dmi' @@ -8,7 +8,7 @@ spawner_type = /mob/living/simple_mob/animal/passive/cat // Detonate now just handles the two loops that query for people in lockers and people who can see it. -/obj/item/weapon/grenade/spawnergrenade/casino/detonate() +/obj/item/grenade/spawnergrenade/casino/detonate() if(spawner_type && deliveryamt) var/turf/T = get_turf(src) @@ -25,57 +25,57 @@ // // Creatures // -/obj/item/weapon/grenade/spawnergrenade/casino/penguin +/obj/item/grenade/spawnergrenade/casino/penguin desc = "It is set to detonate in 5 seconds. It will release a penguin won from the prize vendor!" name = "Creature Container (Penguin)" spawner_type = /mob/living/simple_mob/animal/passive/penguin -/obj/item/weapon/grenade/spawnergrenade/casino/chicken +/obj/item/grenade/spawnergrenade/casino/chicken desc = "It is set to detonate in 5 seconds. It will release a chicken won from the prize vendor!" name = "Creature Container (Chicken)" spawner_type = /mob/living/simple_mob/animal/passive/chicken -/obj/item/weapon/grenade/spawnergrenade/casino/cow +/obj/item/grenade/spawnergrenade/casino/cow desc = "It is set to detonate in 5 seconds. It will release a cow won from the prize vendor!" name = "Creature Container (Cow)" spawner_type = /mob/living/simple_mob/animal/passive/cow -/obj/item/weapon/grenade/spawnergrenade/casino/corgi +/obj/item/grenade/spawnergrenade/casino/corgi desc = "It is set to detonate in 5 seconds. It will release a corgi won from the prize vendor!" name = "Creature Container (Corgi)" spawner_type = /mob/living/simple_mob/animal/passive/dog/corgi -/obj/item/weapon/grenade/spawnergrenade/casino/fox +/obj/item/grenade/spawnergrenade/casino/fox desc = "It is set to detonate in 5 seconds. It will release a fox won from the prize vendor!" name = "Creature Container (Fox)" spawner_type = /mob/living/simple_mob/animal/passive/fox -/obj/item/weapon/grenade/spawnergrenade/casino/fennec +/obj/item/grenade/spawnergrenade/casino/fennec desc = "It is set to detonate in 5 seconds. It will release a fennec won from the prize vendor!" name = "Creature Container (Fennec)" spawner_type = /mob/living/simple_mob/vore/fennec -/obj/item/weapon/grenade/spawnergrenade/casino/snake +/obj/item/grenade/spawnergrenade/casino/snake desc = "It is set to detonate in 5 seconds. It will release a snake won from the prize vendor!" name = "Creature Container (Snake)" spawner_type = /mob/living/simple_mob/animal/passive/snake -/obj/item/weapon/grenade/spawnergrenade/casino/redpanda +/obj/item/grenade/spawnergrenade/casino/redpanda desc = "It is set to detonate in 5 seconds. It will release a red panda won from the prize vendor!" name = "Creature Container (Red panda)" spawner_type = /mob/living/simple_mob/vore/redpanda -/obj/item/weapon/grenade/spawnergrenade/casino/snake +/obj/item/grenade/spawnergrenade/casino/snake desc = "It is set to detonate in 5 seconds. It will release a snake won from the prize vendor!" name = "Creature Container (Snake)" spawner_type = /mob/living/simple_mob/animal/passive/snake -/obj/item/weapon/grenade/spawnergrenade/casino/otie +/obj/item/grenade/spawnergrenade/casino/otie desc = "It is set to detonate in 5 seconds. It will release a otie won from the prize vendor!" name = "Creature Container (Otie)" spawner_type = /mob/living/simple_mob/vore/otie/friendly -/obj/item/weapon/grenade/spawnergrenade/casino/goldcrest +/obj/item/grenade/spawnergrenade/casino/goldcrest desc = "It is set to detonate in 5 seconds. It will release a bird won from the prize vendor!" name = "Creature Container (Bird)" spawner_type = /mob/living/simple_mob/animal/passive/bird/goldcrest @@ -83,48 +83,48 @@ // // Mecha // -/obj/item/weapon/grenade/spawnergrenade/casino/gygax +/obj/item/grenade/spawnergrenade/casino/gygax desc = "You feel great power inside this small round sphere, with great powers comes great responsibilities!" name = "Mysterious Grenade" spawner_type = /obj/mecha/combat/gygax/dark -/obj/item/weapon/grenade/spawnergrenade/casino/gygax/mining +/obj/item/grenade/spawnergrenade/casino/gygax/mining name = "Mech Container (Mining Ripley)" spawner_type = /obj/mecha/working/ripley/mining -/obj/item/weapon/grenade/spawnergrenade/casino/gygax/firefighter +/obj/item/grenade/spawnergrenade/casino/gygax/firefighter name = "Mech Container (Firefighter Ripley)" spawner_type = /obj/mecha/working/ripley/firefighter -/obj/item/weapon/grenade/spawnergrenade/casino/gygax/Odysseus +/obj/item/grenade/spawnergrenade/casino/gygax/Odysseus name = "Mech Container (Odysseus)" spawner_type = /obj/mecha/medical/odysseus/loaded -/obj/item/weapon/grenade/spawnergrenade/casino/gygax/shuttlepod +/obj/item/grenade/spawnergrenade/casino/gygax/shuttlepod name = "Mech Container (Shuttlepod)" spawner_type = /obj/mecha/working/hoverpod/shuttlepod // // Fighters // -/obj/item/weapon/grenade/spawnergrenade/casino/fighter +/obj/item/grenade/spawnergrenade/casino/fighter desc = "You feel great power inside this small round sphere, with great powers comes great responsibilities!" -/obj/item/weapon/grenade/spawnergrenade/casino/fighter/gunpod +/obj/item/grenade/spawnergrenade/casino/fighter/gunpod name = "Fighter Container (Gunpod)" spawner_type = /obj/mecha/combat/fighter/gunpod/loaded -/obj/item/weapon/grenade/spawnergrenade/casino/fighter/baron +/obj/item/grenade/spawnergrenade/casino/fighter/baron name = "Fighter Container (Baron)" spawner_type = /obj/mecha/combat/fighter/baron/loaded -/obj/item/weapon/grenade/spawnergrenade/casino/fighter/scoralis +/obj/item/grenade/spawnergrenade/casino/fighter/scoralis name = "Fighter Container (Scoralis)" spawner_type = /obj/mecha/combat/fighter/scoralis/loaded -/obj/item/weapon/grenade/spawnergrenade/casino/fighter/allure +/obj/item/grenade/spawnergrenade/casino/fighter/allure name = "Fighter Container (Allure)" spawner_type = /obj/mecha/combat/fighter/allure/loaded -/obj/item/weapon/grenade/spawnergrenade/casino/fighter/pinnace +/obj/item/grenade/spawnergrenade/casino/fighter/pinnace name = "Fighter Container (Pinnace)" spawner_type = /obj/mecha/combat/fighter/pinnace/loaded diff --git a/code/modules/catalogue/cataloguer.dm b/code/modules/catalogue/cataloguer.dm index 580b209b9e0..fa9bcee78f9 100644 --- a/code/modules/catalogue/cataloguer.dm +++ b/code/modules/catalogue/cataloguer.dm @@ -12,7 +12,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers) the person with the scanner gets a visual box that shows where they are allowed to move to without inturrupting the scan. */ -/obj/item/device/cataloguer +/obj/item/cataloguer name = "cataloguer" desc = "A hand-held device, used for compiling information about an object by scanning it. Alt+click to highlight scannable objects around you." description_info = "This is a special device used to obtain information about objects and entities in the environment. \ @@ -35,7 +35,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers) var/datum/weakref/partial_scanned = null // Weakref of the thing that was last scanned if inturrupted. Used to allow for partial scans to be resumed. var/partial_scan_time = 0 // How much to make the next scan shorter. -/obj/item/device/cataloguer/advanced +/obj/item/cataloguer/advanced name = "advanced cataloguer" icon = 'icons/obj/device.dmi' icon_state = "adv_cataloguer" @@ -45,7 +45,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers) toolspeed = 0.8 // Able to see all defined catalogue data regardless of if it was unlocked, intended for testing. -/obj/item/device/cataloguer/debug +/obj/item/cataloguer/debug name = "omniscient cataloguer" desc = "A hand-held cataloguer device that appears to be plated with gold. For some reason, it \ just seems to already know everything about narrowly defined pieces of knowledge one would find \ @@ -57,22 +57,22 @@ GLOBAL_LIST_EMPTY(all_cataloguers) debug = TRUE -/obj/item/device/cataloguer/Initialize() +/obj/item/cataloguer/Initialize() GLOB.all_cataloguers += src return ..() -/obj/item/device/cataloguer/Destroy() +/obj/item/cataloguer/Destroy() GLOB.all_cataloguers -= src displayed_data = null return ..() -/obj/item/device/cataloguer/update_icon() +/obj/item/cataloguer/update_icon() if(busy) icon_state = "[initial(icon_state)]_active" else icon_state = initial(icon_state) -/obj/item/device/cataloguer/afterattack(atom/target, mob/user, proximity_flag) +/obj/item/cataloguer/afterattack(atom/target, mob/user, proximity_flag) // Things that invalidate the scan immediately. if(busy) to_chat(user, span("warning", "\The [src] is already scanning something.")) @@ -146,7 +146,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers) delete_box(box_segments, user.client) // Todo: Display scanned information, increment points, etc. -/obj/item/device/cataloguer/proc/catalogue_object(atom/target, mob/living/user) +/obj/item/cataloguer/proc/catalogue_object(atom/target, mob/living/user) // Figure out who may have helped out. var/list/contributers = list() var/list/contributer_names = list() @@ -182,7 +182,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers) if(contributers.len) for(var/mob/M in contributers) var/list/things = M.GetAllContents(3) // Depth of two should reach into bags but just in case lets make it three. - var/obj/item/device/cataloguer/other_cataloguer = locate() in things // If someone has two or more scanners this only adds points to one. + var/obj/item/cataloguer/other_cataloguer = locate() in things // If someone has two or more scanners this only adds points to one. if(other_cataloguer) to_chat(M, span("notice", "Gained [points_gained] points from \the [user]'s scan of \the [target].")) other_cataloguer.adjust_points(points_gained) @@ -191,12 +191,12 @@ GLOBAL_LIST_EMPTY(all_cataloguers) -/obj/item/device/cataloguer/AltClick(mob/user) +/obj/item/cataloguer/AltClick(mob/user) pulse_scan(user) // Gives everything capable of being scanned an outline for a brief moment. // Helps to avoid having to click a hundred things in a room for things that have an entry. -/obj/item/device/cataloguer/proc/pulse_scan(mob/user) +/obj/item/cataloguer/proc/pulse_scan(mob/user) if(busy) to_chat(user, span("warning", "\The [src] is busy doing something else.")) return @@ -235,13 +235,13 @@ GLOBAL_LIST_EMPTY(all_cataloguers) // Negative points are bad. -/obj/item/device/cataloguer/proc/adjust_points(amount) +/obj/item/cataloguer/proc/adjust_points(amount) points_stored = max(0, points_stored += amount) -/obj/item/device/cataloguer/attack_self(mob/living/user) +/obj/item/cataloguer/attack_self(mob/living/user) interact(user) -/obj/item/device/cataloguer/interact(mob/user) +/obj/item/cataloguer/interact(mob/user) var/list/dat = list() var/title = "Cataloguer Data Display" @@ -285,7 +285,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers) popup.open() add_fingerprint(user) -/obj/item/device/cataloguer/Topic(href, href_list) +/obj/item/cataloguer/Topic(href, href_list) if(..()) usr << browse(null, "window=cataloguer_display") return 0 @@ -307,10 +307,10 @@ GLOBAL_LIST_EMPTY(all_cataloguers) interact(usr) // So it refreshes the window. return 1 -/obj/item/device/cataloguer/attackby(obj/item/weapon/W, mob/user) - if(istype(W, /obj/item/weapon/card/id) && !busy) +/obj/item/cataloguer/attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/card/id) && !busy) busy = TRUE - var/obj/item/weapon/card/id/ID = W + var/obj/item/card/id/ID = W if(points_stored) ID.survey_points += points_stored points_stored = 0 @@ -320,7 +320,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers) busy = FALSE return ..() -/obj/item/device/cataloguer/compact +/obj/item/cataloguer/compact name = "compact cataloguer" desc = "A compact hand-held device, used for compiling information about an object by scanning it. \ Alt+click to highlight scannable objects around you." @@ -331,7 +331,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers) scan_range = 1 toolspeed = 1.2 -/obj/item/device/cataloguer/compact/pathfinder +/obj/item/cataloguer/compact/pathfinder name = "pathfinder's cataloguer" desc = "A compact hand-held device, used for compiling information about an object by scanning it. \ Alt+click to highlight scannable objects around you." @@ -340,16 +340,16 @@ GLOBAL_LIST_EMPTY(all_cataloguers) scan_range = 3 toolspeed = 1 -/obj/item/device/cataloguer/compact/update_icon() +/obj/item/cataloguer/compact/update_icon() if(busy) icon_state = "[initial(icon_state)]_s" else icon_state = initial(icon_state) -/obj/item/device/cataloguer/compact/ui_action_click() +/obj/item/cataloguer/compact/ui_action_click() toggle() -/obj/item/device/cataloguer/compact/verb/toggle() +/obj/item/cataloguer/compact/verb/toggle() set name = "Toggle Cataloguer" set category = "Object" @@ -370,13 +370,13 @@ GLOBAL_LIST_EMPTY(all_cataloguers) var/mob/M = usr M.update_action_buttons() -/obj/item/device/cataloguer/compact/afterattack(atom/target, mob/user, proximity_flag) +/obj/item/cataloguer/compact/afterattack(atom/target, mob/user, proximity_flag) if(!deployed) to_chat(user, span("warning", "\The [src] is closed.")) return return ..() -/obj/item/device/cataloguer/compact/pulse_scan(mob/user) +/obj/item/cataloguer/compact/pulse_scan(mob/user) if(!deployed) to_chat(user, span("warning", "\The [src] is closed.")) return diff --git a/code/modules/catalogue/cataloguer_visuals.dm b/code/modules/catalogue/cataloguer_visuals.dm index f159271a026..dcb59a132af 100644 --- a/code/modules/catalogue/cataloguer_visuals.dm +++ b/code/modules/catalogue/cataloguer_visuals.dm @@ -2,7 +2,7 @@ // Draws a box showing the limits of movement while scanning something. // Only the client supplied will see the box. -/obj/item/device/cataloguer/proc/draw_box(atom/A, box_size, client/C) +/obj/item/cataloguer/proc/draw_box(atom/A, box_size, client/C) . = list() // Things moved with pixel_[x|y] will move the box, so this is to correct that. var/pixel_x_correction = -A.pixel_x @@ -47,7 +47,7 @@ #undef ICON_SIZE // Draws an individual segment of the box. -/obj/item/device/cataloguer/proc/draw_line(atom/A, line_dir, line_pixel_x, line_pixel_y, client/C) +/obj/item/cataloguer/proc/draw_line(atom/A, line_dir, line_pixel_x, line_pixel_y, client/C) var/image/line = image(icon = 'icons/effects/effects.dmi', loc = A, icon_state = "stripes", dir = line_dir) line.pixel_x = line_pixel_x line.pixel_y = line_pixel_y @@ -58,11 +58,11 @@ return line // Removes the box that was generated before from the client. -/obj/item/device/cataloguer/proc/delete_box(list/box_segments, client/C) +/obj/item/cataloguer/proc/delete_box(list/box_segments, client/C) for(var/i in box_segments) C.images -= i qdel(i) -/obj/item/device/cataloguer/proc/color_box(list/box_segments, new_color, new_time) +/obj/item/cataloguer/proc/color_box(list/box_segments, new_color, new_time) for(var/i in box_segments) animate(i, color = new_color, time = new_time) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/gear_tweaks.dm b/code/modules/client/preference_setup/loadout/gear_tweaks.dm index ba5f621dbc3..58111139a19 100644 --- a/code/modules/client/preference_setup/loadout/gear_tweaks.dm +++ b/code/modules/client/preference_setup/loadout/gear_tweaks.dm @@ -261,13 +261,13 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new() //end of custom description /datum/gear_tweak/tablet - var/list/ValidProcessors = list(/obj/item/weapon/computer_hardware/processor_unit/small) - var/list/ValidBatteries = list(/obj/item/weapon/computer_hardware/battery_module/nano, /obj/item/weapon/computer_hardware/battery_module/micro, /obj/item/weapon/computer_hardware/battery_module) - var/list/ValidHardDrives = list(/obj/item/weapon/computer_hardware/hard_drive/micro, /obj/item/weapon/computer_hardware/hard_drive/small, /obj/item/weapon/computer_hardware/hard_drive) - var/list/ValidNetworkCards = list(/obj/item/weapon/computer_hardware/network_card, /obj/item/weapon/computer_hardware/network_card/advanced) - var/list/ValidNanoPrinters = list(null, /obj/item/weapon/computer_hardware/nano_printer) - var/list/ValidCardSlots = list(null, /obj/item/weapon/computer_hardware/card_slot) - var/list/ValidTeslaLinks = list(null, /obj/item/weapon/computer_hardware/tesla_link) + var/list/ValidProcessors = list(/obj/item/computer_hardware/processor_unit/small) + var/list/ValidBatteries = list(/obj/item/computer_hardware/battery_module/nano, /obj/item/computer_hardware/battery_module/micro, /obj/item/computer_hardware/battery_module) + var/list/ValidHardDrives = list(/obj/item/computer_hardware/hard_drive/micro, /obj/item/computer_hardware/hard_drive/small, /obj/item/computer_hardware/hard_drive) + var/list/ValidNetworkCards = list(/obj/item/computer_hardware/network_card, /obj/item/computer_hardware/network_card/advanced) + var/list/ValidNanoPrinters = list(null, /obj/item/computer_hardware/nano_printer) + var/list/ValidCardSlots = list(null, /obj/item/computer_hardware/card_slot) + var/list/ValidTeslaLinks = list(null, /obj/item/computer_hardware/tesla_link) /datum/gear_tweak/tablet/get_contents(var/list/metadata) var/list/names = list() @@ -410,13 +410,13 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new() I.update_verbs() /datum/gear_tweak/laptop - var/list/ValidProcessors = list(/obj/item/weapon/computer_hardware/processor_unit/small, /obj/item/weapon/computer_hardware/processor_unit) - var/list/ValidBatteries = list(/obj/item/weapon/computer_hardware/battery_module, /obj/item/weapon/computer_hardware/battery_module/advanced, /obj/item/weapon/computer_hardware/battery_module/super) - var/list/ValidHardDrives = list(/obj/item/weapon/computer_hardware/hard_drive, /obj/item/weapon/computer_hardware/hard_drive/advanced, /obj/item/weapon/computer_hardware/hard_drive/super) - var/list/ValidNetworkCards = list(/obj/item/weapon/computer_hardware/network_card, /obj/item/weapon/computer_hardware/network_card/advanced) - var/list/ValidNanoPrinters = list(null, /obj/item/weapon/computer_hardware/nano_printer) - var/list/ValidCardSlots = list(null, /obj/item/weapon/computer_hardware/card_slot) - var/list/ValidTeslaLinks = list(null, /obj/item/weapon/computer_hardware/tesla_link) + var/list/ValidProcessors = list(/obj/item/computer_hardware/processor_unit/small, /obj/item/computer_hardware/processor_unit) + var/list/ValidBatteries = list(/obj/item/computer_hardware/battery_module, /obj/item/computer_hardware/battery_module/advanced, /obj/item/computer_hardware/battery_module/super) + var/list/ValidHardDrives = list(/obj/item/computer_hardware/hard_drive, /obj/item/computer_hardware/hard_drive/advanced, /obj/item/computer_hardware/hard_drive/super) + var/list/ValidNetworkCards = list(/obj/item/computer_hardware/network_card, /obj/item/computer_hardware/network_card/advanced) + var/list/ValidNanoPrinters = list(null, /obj/item/computer_hardware/nano_printer) + var/list/ValidCardSlots = list(null, /obj/item/computer_hardware/card_slot) + var/list/ValidTeslaLinks = list(null, /obj/item/computer_hardware/tesla_link) /datum/gear_tweak/laptop/get_contents(var/list/metadata) var/list/names = list() @@ -589,7 +589,7 @@ var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new() /datum/gear_tweak/implant_location/get_default() return bodypart_names_to_tokens[1] -/datum/gear_tweak/implant_location/tweak_item(var/obj/item/weapon/implant/I, var/metadata) +/datum/gear_tweak/implant_location/tweak_item(var/obj/item/implant/I, var/metadata) if(istype(I)) I.initialize_loc = bodypart_names_to_tokens[metadata] || BP_TORSO diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 39ac6ae97ea..18cd673d5f0 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -27,16 +27,16 @@ /datum/gear/accessory/wallet display_name = "wallet, orange" - path = /obj/item/weapon/storage/wallet/random + path = /obj/item/storage/wallet/random /datum/gear/accessory/wallet_poly display_name = "wallet, polychromic" - path = /obj/item/weapon/storage/wallet/poly + path = /obj/item/storage/wallet/poly cost = 0 //VOREStation Edit /datum/gear/accessory/wallet/womens display_name = "wallet, womens" - path = /obj/item/weapon/storage/wallet/womens + path = /obj/item/storage/wallet/womens cost = 0 //VOREStation Edit /datum/gear/accessory/wallet/womens/New() @@ -45,7 +45,7 @@ /datum/gear/accessory/clutch display_name = "clutch bag" - path = /obj/item/weapon/storage/briefcase/clutch + path = /obj/item/storage/briefcase/clutch cost = 2 /datum/gear/accessory/clutch/New() @@ -54,7 +54,7 @@ /datum/gear/accessory/purse display_name = "purse" - path = /obj/item/weapon/storage/backpack/purse + path = /obj/item/storage/backpack/purse cost = 3 /datum/gear/accessory/purse/New() @@ -185,12 +185,12 @@ /datum/gear/accessory/fannypack display_name = "fannypack selection" cost = 2 - path = /obj/item/weapon/storage/belt/fannypack + path = /obj/item/storage/belt/fannypack /datum/gear/accessory/fannypack/New() ..() var/list/fannys = list() - for(var/obj/item/weapon/storage/belt/fannypack/fanny_type as anything in typesof(/obj/item/weapon/storage/belt/fannypack)) + for(var/obj/item/storage/belt/fannypack/fanny_type as anything in typesof(/obj/item/storage/belt/fannypack)) fannys[initial(fanny_type.name)] = fanny_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(fannys)) @@ -435,7 +435,7 @@ /datum/gear/accessory/khcrystal display_name = "KH Life Crystal" - path = /obj/item/weapon/storage/box/khcrystal + path = /obj/item/storage/box/khcrystal description = "A small necklace device that will notify an offsite cloning facility should you expire after activating it." /datum/gear/accessory/tronket @@ -459,7 +459,7 @@ /datum/gear/accessory/dosimeter display_name = "Dosimeter" - path = /obj/item/weapon/storage/box/dosimeter + path = /obj/item/storage/box/dosimeter description = "A small device that will warn the bearer when they are exposed to dangerous levels of radiation." /* diff --git a/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm b/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm index 7e9b25070ae..f48943883bb 100644 --- a/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm +++ b/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm @@ -1,20 +1,20 @@ /datum/gear/cosmetic/lipstick/black display_name = "lipstick, black" - path = /obj/item/weapon/lipstick/black + path = /obj/item/lipstick/black /datum/gear/cosmetic/lipstick/jade display_name = "lipstick, jade" - path = /obj/item/weapon/lipstick/jade + path = /obj/item/lipstick/jade /datum/gear/cosmetic/lipstick/purple display_name = "lipstick, purple" - path = /obj/item/weapon/lipstick/purple + path = /obj/item/lipstick/purple /datum/gear/cosmetic/lipstick display_name = "lipstick, red" - path = /obj/item/weapon/lipstick + path = /obj/item/lipstick /datum/gear/cosmetic display_name = "purple comb" - path = /obj/item/weapon/haircomb + path = /obj/item/haircomb sort_category = "Cosmetics" \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_cosmetics_vr.dm b/code/modules/client/preference_setup/loadout/loadout_cosmetics_vr.dm index c538c66410b..9cd5982274b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_cosmetics_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_cosmetics_vr.dm @@ -1,7 +1,7 @@ /datum/gear/cosmetic/nailpolish display_name = "nail polish (colorable)" description = "Nail polish, available in every color of the rainbow! Doesn't come with nail polish remover." - path = /obj/item/weapon/nailpolish + path = /obj/item/nailpolish /datum/gear/cosmetic/nailpolish/New() ..() @@ -9,7 +9,7 @@ gear_tweaks = list(gear_tweak_free_color_choice, gear_tweak_free_name) /datum/gear/cosmetic/nailpolish/spawn_item(var/location, var/metadata) - var/obj/item/weapon/nailpolish/polish = ..() + var/obj/item/nailpolish/polish = ..() polish.set_colour(polish.color) polish.color = null return polish @@ -17,4 +17,4 @@ /datum/gear/cosmetic/nailpolish_remover display_name = "nail polish remover" description = "Nail polish remover, for when the fun's over. Doesn't come with nail polish." - path = /obj/item/weapon/nailpolish_remover \ No newline at end of file + path = /obj/item/nailpolish_remover \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_cyberware.dm b/code/modules/client/preference_setup/loadout/loadout_cyberware.dm index 1fac24c862b..4c0e49e48f5 100644 --- a/code/modules/client/preference_setup/loadout/loadout_cyberware.dm +++ b/code/modules/client/preference_setup/loadout/loadout_cyberware.dm @@ -1,7 +1,7 @@ /datum/gear/utility/implant display_name = "implant, neural assistance web" description = "A complex web implanted into the subject, medically in order to compensate for neurological disease." - path = /obj/item/weapon/implant/neural + path = /obj/item/implant/neural slot = "implant" exploitable = 1 sort_category = "Cyberware" @@ -9,13 +9,13 @@ /datum/gear/utility/implant/tracking display_name = "implant, tracking" - path = /obj/item/weapon/implant/tracking/weak + path = /obj/item/implant/tracking/weak cost = 0 //VOREStation Edit. Changed cost to 0 /datum/gear/utility/implant/generic display_name = "implant, generic, primary" description = "An implant with no obvious purpose." - path = /obj/item/weapon/implant + path = /obj/item/implant cost = 1 /datum/gear/utility/implant/generic/second @@ -35,9 +35,9 @@ /datum/gear/utility/implant/language/eal display_name = "vocal synthesizer, EAL" description = "A surgically implanted vocal synthesizer which allows the owner to speak EAL, if they know it." - path = /obj/item/weapon/implant/language/eal + path = /obj/item/implant/language/eal /datum/gear/utility/implant/language/skrellian display_name = "vocal synthesizer, Skrellian" description = "A surgically implanted vocal synthesizer which allows the owner to speak Common Skrellian, if they know it." - path = /obj/item/weapon/implant/language/skrellian + path = /obj/item/implant/language/skrellian diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 9bd3b321eea..c63f709505c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -13,7 +13,7 @@ /* /datum/gear/fluff/testhorn - path = /obj/item/weapon/bikehorn + path = /obj/item/bikehorn display_name = "Airhorn - Example Item" description = "An example item that you probably shouldn't see!" ckeywhitelist = list("your_ckey_here") @@ -29,7 +29,7 @@ // 0-9 CKEYS /datum/gear/fluff/malady_crop - path = /obj/item/weapon/material/twohanded/riding_crop/malady + path = /obj/item/material/twohanded/riding_crop/malady display_name = "Malady's Crop" ckeywhitelist = list("1r1s") character_name = list("Malady Blanche") @@ -80,7 +80,7 @@ character_name = list("Charlotte Graves") /datum/gear/fluff/charlotte_cigarettes - path = /obj/item/weapon/storage/fancy/fluff/charlotte + path = /obj/item/storage/fancy/fluff/charlotte display_name = "Charlotte's cigarette case" ckeywhitelist = list("alfalah") character_name = list("Charlotte Graves") @@ -104,7 +104,7 @@ character_name = list("Fifi The Magnificent") /datum/gear/fluff/lynn_penlight - path = /obj/item/device/flashlight/pen/fluff/lynn + path = /obj/item/flashlight/pen/fluff/lynn display_name = "Lynn's Penlight" ckeywhitelist = list("argobargsoup") character_name = list("Lynn Shady") @@ -132,7 +132,7 @@ character_name = list("Aronai Sieyes") /datum/gear/fluff/astra_ritualknife - path = /obj/item/weapon/material/knife/ritual/fluff/astra + path = /obj/item/material/knife/ritual/fluff/astra display_name = "Polished Ritual Knife" description = "A well kept strange ritual knife, There is a small tag with the name 'Astra Ether' on it. They are probably looking for this." ckeywhitelist = list("astraether") @@ -180,7 +180,7 @@ character_name = list("Yuuko Shimmerpond") /datum/gear/fluff/cassandra_box - path = /obj/item/weapon/storage/box/fluff/cassandra + path = /obj/item/storage/box/fluff/cassandra display_name = "Cassandra's Box" ckeywhitelist = list("beyondmylife") character_name = list("Cassandra Selone") @@ -200,7 +200,7 @@ character_name = list("Kilano Soryu") /datum/gear/fluff/netra_box - path = /obj/item/weapon/storage/box/fluff/kilano + path = /obj/item/storage/box/fluff/kilano display_name = "Ne'tra's Box" ckeywhitelist = list("beyondmylife") character_name = list("Ne'tra Ky'ram") @@ -238,13 +238,13 @@ character_name = list("Xin Xiao") /datum/gear/fluff/tasald_box - path = /obj/item/weapon/storage/box/fluff/tasald + path = /obj/item/storage/box/fluff/tasald display_name = "Tasald's Box" ckeywhitelist = list("bwoincognito") character_name = list("Tasald Corlethian") /datum/gear/fluff/octavius_box - path = /obj/item/weapon/storage/box/fluff/octavious + path = /obj/item/storage/box/fluff/octavious display_name = "Octavious' Box" ckeywhitelist = list("bwoincognito") character_name = list("Octavious Ward") @@ -277,7 +277,7 @@ character_name = list("Cappy Fuzzlyfeathers") /datum/gear/fluff/james_disk - path = /obj/item/weapon/disk/data + path = /obj/item/disk/data display_name = "James' Disk" ckeywhitelist = list("cockatricexl") character_name = list("James Holder") @@ -304,13 +304,13 @@ character_name = list("Aika Hisakawa") /datum/gear/fluff/sariU_disk - path = /obj/item/weapon/disk/limb/eggnerdltd + path = /obj/item/disk/limb/eggnerdltd display_name = "Sari-U's Eggnerd Disk" ckeywhitelist = list("crossexonar") character_name = list("Sari-U") /datum/gear/fluff/sariE_disk - path = /obj/item/weapon/disk/limb/eggnerdltd + path = /obj/item/disk/limb/eggnerdltd display_name = "Sari-E's Eggnerd Disk" ckeywhitelist = list("crossexonar") character_name = list("Sari-E") @@ -340,13 +340,13 @@ character_name = list("Perrin Kade") /datum/gear/fluff/jade_stamp - path = /obj/item/weapon/stamp/fluff/jade_horror + path = /obj/item/stamp/fluff/jade_horror display_name = "Official Council of Mid Horror rubber stamp" ckeywhitelist = list("coolcrow420") character_name = list("Jade Davis") /datum/gear/fluff/m4il_hdd - path = /obj/item/weapon/implant/language/fluff/m41l + path = /obj/item/implant/language/fluff/m41l display_name = "dusty hard drive" slot = "implant" ckeywhitelist = list("coolcrow420") @@ -354,7 +354,7 @@ // D CKEYS /datum/gear/fluff/Aku_briefcase - path = /obj/item/weapon/storage/secure/briefcase/dealer + path = /obj/item/storage/secure/briefcase/dealer display_name = "Aku's dealer briefcase" ckeywhitelist = list("defiintelynotarock") character_name = list("Aku Zoles") @@ -366,7 +366,7 @@ character_name = list("Dhaeleena M'iar") /datum/gear/fluff/elliot_belt - path = /obj/item/weapon/storage/belt/champion + path = /obj/item/storage/belt/champion display_name = "Elliot's Belt" ckeywhitelist = list("dickfreedomjohnson") character_name = list("Elliot Richards") @@ -384,20 +384,20 @@ character_name = list("Donald Weinbeck") /datum/gear/fluff/drake_box - path = /obj/item/weapon/storage/box/fluff/drake + path = /obj/item/storage/box/fluff/drake display_name = "Drake's Box" ckeywhitelist = list("drakefrostpaw") character_name = list("Drake Frostpaw") /datum/gear/fluff/theseus_coin - path = /obj/item/weapon/coin/diamond + path = /obj/item/coin/diamond display_name = "Theseus' Diamond coin" ckeywhitelist = list("draycu") character_name = list("Theseus") description = "An engraved coin made of diamond. On the side for heads is printed the year 2541, along with the letter T. On the side for tails, the letter Y can be seen." /datum/gear/fluff/yonra_box - path = /obj/item/weapon/storage/box/fluff/yonra + path = /obj/item/storage/box/fluff/yonra display_name = "Yonra's Box" ckeywhitelist = list("draycu") character_name = list("Schae Yonra") @@ -437,7 +437,7 @@ character_name = list("Erik Ramadwood") /datum/gear/fluff/salvage_id - path = /obj/item/weapon/card/id/event/polymorphic/itg + path = /obj/item/card/id/event/polymorphic/itg display_name = "Salvage's ITG-ID card" ckeywhitelist = list("essbie") character_name = list("Savage") @@ -504,13 +504,13 @@ character_name = list("Lauren Zackson") /datum/gear/fluff/belle_sizegun - path = /obj/item/weapon/gun/energy/sizegun + path = /obj/item/gun/energy/sizegun display_name = "Belle's Sizegun" ckeywhitelist = list("hottokeeki") character_name = list("Belle Day") /datum/gear/fluff/amaryll_claws - path = /obj/item/weapon/surgical/scalpel/amaryll_claws + path = /obj/item/surgical/scalpel/amaryll_claws display_name = "Amaryll's Claws" ckeywhitelist = list("hunterbirk") character_name = list("Amaryll") @@ -547,7 +547,7 @@ character_name = list("Kai Highlands") /datum/gear/fluff/ivy_backpack - path = /obj/item/weapon/storage/backpack/messenger/sec/fluff/ivymoomoo + path = /obj/item/storage/backpack/messenger/sec/fluff/ivymoomoo display_name = "Ivy's Backpack" slot = slot_back ckeywhitelist = list("ivymoomoo") @@ -567,13 +567,13 @@ // J CKEYS /datum/gear/fluff/mor_box - path = /obj/item/weapon/storage/box/fluff/morxaina + path = /obj/item/storage/box/fluff/morxaina display_name = "Mor's Box" ckeywhitelist = list("jacknoir413") character_name = list("Mor Xaina") /datum/gear/fluff/areax_staff - path = /obj/item/weapon/storage/backpack/fluff/stunstaff + path = /obj/item/storage/backpack/fluff/stunstaff display_name = "Areax's Stun Staff" slot = slot_back ckeywhitelist = list("jacknoir413") @@ -602,7 +602,7 @@ character_name = list("Freyr") /datum/gear/fluff/cirra_box - path = /obj/item/weapon/storage/box/fluff/cirra + path = /obj/item/storage/box/fluff/cirra display_name = "Cirra's Box" ckeywhitelist = list("jemli") character_name = list("Cirra Mayhem") @@ -643,21 +643,21 @@ character_name = list("Jeremiah Acacius") /datum/gear/fluff/joan_backpack - path = /obj/item/weapon/storage/backpack/dufflebag/sec/fluff/joanrisu + path = /obj/item/storage/backpack/dufflebag/sec/fluff/joanrisu display_name = "Joan's backpack" ckeywhitelist = list("joanrisu") character_name = list("Joan Risu") /datum/gear/fluff/katarina_backpack - path = /obj/item/weapon/storage/backpack/dufflebag/sec/fluff/katarina + path = /obj/item/storage/backpack/dufflebag/sec/fluff/katarina display_name = "Katarina's Backpack" ckeywhitelist = list("joanrisu") character_name = list("Katarina Eine") allowed_roles = list(JOB_SITE_MANAGER, JOB_WARDEN, JOB_HEAD_OF_SECURITY) /datum/gear/fluff/emoticon_box - path = /obj/item/weapon/storage/box/fluff/emoticon + path = /obj/item/storage/box/fluff/emoticon display_name = "Emoticon's Box" ckeywhitelist = list("joey4298") character_name = list("Emoticon") @@ -683,19 +683,19 @@ character_name = list("Harmony Pretchl") /datum/gear/fluff/harmony_modkit - path = /obj/item/device/modkit_conversion/fluff/harmonysuit + path = /obj/item/modkit_conversion/fluff/harmonysuit display_name = "Harmony's Modkit" ckeywhitelist = list("john.wayne9392") character_name = list("Harmony Pretchl") /datum/gear/fluff/harmony_spacemodkit - path = /obj/item/device/modkit_conversion/fluff/harmonyspace + path = /obj/item/modkit_conversion/fluff/harmonyspace display_name = "Harmony's Modkit 2" ckeywhitelist = list("john.wayne9392") character_name = list("Harmony Pretchl") /datum/gear/fluff/koyo_box - path = /obj/item/weapon/storage/box/fluff/koyoakimomi + path = /obj/item/storage/box/fluff/koyoakimomi display_name = "Koyo's Box" ckeywhitelist = list("jwguy") character_name = list("Koyo Akimomi") @@ -715,7 +715,7 @@ character_name = list("Ketrai") /datum/gear/fluff/amaya_id - path = /obj/item/weapon/card/id/event/fluff/amaya + path = /obj/item/card/id/event/fluff/amaya display_name = "Amaya's ID" ckeywhitelist = list("kiraalitruss") character_name = list("Amaya Rahl") @@ -773,21 +773,21 @@ character_name = list("Kenzie Houser") /datum/gear/fluff/kenzie_hypospray - path = /obj/item/weapon/reagent_containers/hypospray/vial/kenzie + path = /obj/item/reagent_containers/hypospray/vial/kenzie display_name = "Kenzie's Hypospray" ckeywhitelist = list("lm40") character_name = list("Kenzie Houser") allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC) /datum/gear/fluff/brianna_backpack - path = /obj/item/weapon/storage/backpack/messenger/black/fluff/briana + path = /obj/item/storage/backpack/messenger/black/fluff/briana display_name = "Briana's Backpack" slot = slot_back ckeywhitelist = list("luminescentring") character_name = list("Briana Moore") /datum/gear/fluff/zharritool - path = /obj/item/weapon/tool/transforming/altevian + path = /obj/item/tool/transforming/altevian display_name = "Zharri's Custom Omni-Tool" description = "A Hull Systems Omni-Tool capable of temporarily shrinking to handheld sizes for even the most delicate work." ckeywhitelist = list("lewzharri") @@ -796,7 +796,7 @@ // M CKEYS /datum/gear/fluff/phi_box - path = /obj/item/weapon/storage/box/fluff/phi + path = /obj/item/storage/box/fluff/phi display_name = "Phi's Box" ckeywhitelist = list("mewchild") character_name = list("Phi Vietsi") @@ -809,7 +809,7 @@ character_name = list("Giliana Gamish") /datum/gear/fluff/myryan_belt - path = /obj/item/weapon/storage/belt/utility/fluff/vulpine + path = /obj/item/storage/belt/utility/fluff/vulpine display_name = "Myryan's Belt" ckeywhitelist = list("myryan") character_name = list("Myryan Karnage-Cunningham") @@ -882,14 +882,14 @@ character_name = list("Damon Bones Xrim") /datum/gear/fluff/kt_fishing_rod - path = /obj/item/weapon/material/fishing_rod/modern/strong + path = /obj/item/material/fishing_rod/modern/strong display_name = "K't's fishing rod" ckeywhitelist = list("nerdass") character_name = list("K't") // O CKEYS /datum/gear/fluff/richard_chain - path = /obj/item/weapon/melee/fluff/holochain + path = /obj/item/melee/fluff/holochain display_name = "Richard's Holochain" ckeywhitelist = list("orbisa") character_name = list("Richard D'angelo") @@ -938,13 +938,13 @@ character_name = list("Pip Shyner") /datum/gear/fluff/lucuis_battery - path = /obj/item/weapon/fluff/dragor_dot + path = /obj/item/fluff/dragor_dot display_name = "Lucuis' Spare Battery" ckeywhitelist = list("pontifexminimus") character_name = list("Lucius Null") /datum/gear/fluff/lucia_battery - path = /obj/item/weapon/fluff/dragor_dot + path = /obj/item/fluff/dragor_dot display_name = "Lucia's Spare Battery" ckeywhitelist = list("pontifexminimus") character_name = list("Lucia Null") @@ -1010,7 +1010,7 @@ allowed_roles = list(JOB_ROBOTICIST) /datum/gear/fluff/clara_flask - path = /obj/item/weapon/reagent_containers/food/drinks/glass2/fluff/claraflask + path = /obj/item/reagent_containers/food/drinks/glass2/fluff/claraflask display_name = "Clara's Vacuum Flask" ckeywhitelist = list("rboys2") character_name = list("Clara Mali") @@ -1029,19 +1029,19 @@ character_name = list("LUNA") /datum/gear/fluff/pathfinder_id - path = /obj/item/weapon/card/id/event/polymorphic/itg + path = /obj/item/card/id/event/polymorphic/itg display_name = "Pathfinder's ITG ID" ckeywhitelist = list("residentcody") character_name = list("Pathfinder") /datum/gear/fluff/revolver_claymore - path = /obj/item/weapon/sword/fluff/revolver + path = /obj/item/sword/fluff/revolver display_name = "Catnip" ckeywhitelist = list("revolvereloise") character_name = list("Revolver Eloise") /datum/gear/fluff/nikki_dorky_outfit - path = /obj/item/weapon/storage/box/fluff + path = /obj/item/storage/box/fluff display_name = "Nikki's Witchy Outfit" ckeywhitelist = list("ryumi") character_name = list("Nikki Yumeno") @@ -1094,13 +1094,13 @@ allowed_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL) /datum/gear/fluff/viktor_flask - path = /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor + path = /obj/item/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor display_name = "Viktor's Flask" ckeywhitelist = list("semaun") character_name = list("Viktor Solothurn") /datum/gear/fluff/scree_modkit - path = /obj/item/device/modkit_conversion/fluff/screekit + path = /obj/item/modkit_conversion/fluff/screekit display_name = "Scree's Modkit" ckeywhitelist = list("scree") character_name = list("Scree") @@ -1134,7 +1134,7 @@ character_name = list("Alfonso Oak Telanor") /datum/gear/fluff/cerise_secbelt - path = /obj/item/weapon/storage/belt/security/fluff/cerise + path = /obj/item/storage/belt/security/fluff/cerise display_name = "Cerise's Champion's Belt" ckeywhitelist = list("shalax") character_name = list("Cerise Duelliste") @@ -1153,14 +1153,14 @@ character_name = list("Sidona Kaal") /datum/gear/fluff/nthasd_modkit //Converts a Security suit's sprite - path = /obj/item/device/modkit_conversion/hasd + path = /obj/item/modkit_conversion/hasd display_name = "NT-HASD 556's Modkit" ckeywhitelist = list("silencedmp5a5") character_name = list("NT-HASD #556") allowed_roles = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY,JOB_DETECTIVE) /datum/gear/fluff/serdykov_modkit //Also converts a Security suit's sprite - path = /obj/item/device/modkit_conversion/fluff/serdykit + path = /obj/item/modkit_conversion/fluff/serdykit display_name = "Serdykov Antoz's Modkit" ckeywhitelist = list("silencedmp5a5") character_name = list("Serdykov Antoz") @@ -1181,13 +1181,13 @@ character_name = list("Tasy Ruffles") /datum/gear/fluff/tasy_clownPDA - path = /obj/item/device/pda/clown + path = /obj/item/pda/clown display_name = "Tasy's Clown PDA" ckeywhitelist = list("silvertalismen") character_name = list("Tasy Ruffles") /datum/gear/fluff/fortune_backpack - path = /obj/item/weapon/storage/backpack/satchel/fluff/swat43bag + path = /obj/item/storage/backpack/satchel/fluff/swat43bag display_name = "Fortune's Backpack" slot = slot_back ckeywhitelist = list("swat43") @@ -1259,19 +1259,19 @@ character_name = list("Ascian") /datum/gear/fluff/ascian_spiritspawner - path = /obj/item/weapon/grenade/spawnergrenade/spirit + path = /obj/item/grenade/spawnergrenade/spirit display_name = "The Best Kitten" ckeywhitelist = list("tabiranth") character_name = list("Ascian") /datum/gear/fluff/ascian_shelterpod - path = /obj/item/device/survivalcapsule/tabiranth + path = /obj/item/survivalcapsule/tabiranth display_name = "Ascian's Shelterpod" ckeywhitelist = list("tabiranth") character_name = list("Ascian") /datum/gear/fluff/lasshseeki_ealimplant - path = /obj/item/weapon/implant/language/eal + path = /obj/item/implant/language/eal display_name = "Lasshseeki's EAL Implant" ckeywhitelist = list("techtypes") character_name = list("Lasshseeki Korss") @@ -1349,7 +1349,7 @@ character_name = list("Verie") /datum/gear/fluff/verie_comb - path = /obj/item/weapon/fluff/verie + path = /obj/item/fluff/verie display_name = "Verie's Crazy Comb" description = "(Note: The highlights this gives you will be placed above EVERYTHING... including mobs!)" ckeywhitelist = list("vitoras") @@ -1363,7 +1363,7 @@ character_name = list("Cameron Eggbert") /datum/gear/fluff/cameron_disk - path = /obj/item/weapon/disk/limb/eggnerdltd + path = /obj/item/disk/limb/eggnerdltd display_name = "Cameron's Eggnerd Disk" ckeywhitelist = list("verkister") character_name = list("Cameron Eggbert") @@ -1383,7 +1383,7 @@ character_name = list("Verin Raharra") /datum/gear/fluff/lucina_pda - path = /obj/item/device/pda/heads/cmo/fluff/lucinapda + path = /obj/item/pda/heads/cmo/fluff/lucinapda display_name = "Lucina's PDA" ckeywhitelist = list("vorrarkul") character_name = list("Lucina Dakarim") @@ -1456,7 +1456,7 @@ character_name = list("Roanna Ti'Rox") /datum/gear/fluff/harmony_id - path = /obj/item/weapon/card/id/event/polymorphic/itg + path = /obj/item/card/id/event/polymorphic/itg display_name = "ITG-ID card" ckeywhitelist = list("verysoft") character_name = null @@ -1508,7 +1508,7 @@ allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC, JOB_OFFDUTY_MEDIC) /datum/gear/fluff/tempest_hypospray - path = /obj/item/weapon/reagent_containers/hypospray/vial/tempest + path = /obj/item/reagent_containers/hypospray/vial/tempest display_name = "Tempest's Hypospray" slot = slot_belt ckeywhitelist = list("wickedtemp") @@ -1516,7 +1516,7 @@ allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC, JOB_OFFDUTY_MEDIC) /datum/gear/fluff/tempest_backpack - path = /obj/item/weapon/storage/backpack/saddlebag/tempest + path = /obj/item/storage/backpack/saddlebag/tempest display_name = "Tempest's Saddlebag" slot = slot_back ckeywhitelist = list("wickedtemp") @@ -1524,7 +1524,7 @@ // X CKEYS /datum/gear/fluff/penelope_box - path = /obj/item/weapon/storage/box/fluff/penelope + path = /obj/item/storage/box/fluff/penelope display_name = "Penelope's Box" ckeywhitelist = list("xsdew") character_name = list("Penelope Allen") @@ -1557,7 +1557,7 @@ character_name = list("Lemon Yellow", "Lemon Gettler Yellow", "Lemon Lee Yellow", "Lemon Jade Yellow") //different sleeves, same char /datum/gear/fluff/cephyra_d6 - path = /obj/item/weapon/dice/loaded/ceph + path = /obj/item/dice/loaded/ceph display_name = "engraved d6" ckeywhitelist = list("yeehawguvnah") character_name = list("Cephyra") @@ -1577,7 +1577,7 @@ character_name = list("Zaoozaoo Xrimxuqmqixzix") /datum/gear/fluff/nehi_radio - path = /obj/item/device/radio/headset/fluff/zodiacshadow + path = /obj/item/radio/headset/fluff/zodiacshadow display_name = "Nehi's 'phones" ckeywhitelist = list("zodiacshadow") character_name = list("Nehi Maximus") diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index bd83241019d..b9448887d05 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -1,50 +1,50 @@ /datum/gear/cane display_name = "cane" - path = /obj/item/weapon/cane + path = /obj/item/cane /datum/gear/cane/white display_name = "white cane" - path = /obj/item/weapon/cane/white + path = /obj/item/cane/white /datum/gear/cane/white2 display_name = "telescopic white cane" - path = /obj/item/weapon/cane/white/collapsible + path = /obj/item/cane/white/collapsible /datum/gear/crutch display_name = "crutch" - path = /obj/item/weapon/cane/crutch + path = /obj/item/cane/crutch /datum/gear/dice display_name = "dice pack" - path = /obj/item/weapon/storage/pill_bottle/dice + path = /obj/item/storage/pill_bottle/dice /datum/gear/dice/nerd display_name = "dice pack (gaming)" - path = /obj/item/weapon/storage/pill_bottle/dice_nerd + path = /obj/item/storage/pill_bottle/dice_nerd /datum/gear/dice/cup display_name = "dice cup and dice" - path = /obj/item/weapon/storage/dicecup/loaded + path = /obj/item/storage/dicecup/loaded /datum/gear/cards display_name = "deck of cards" - path = /obj/item/weapon/deck/cards + path = /obj/item/deck/cards /datum/gear/tarot display_name = "deck of tarot cards" - path = /obj/item/weapon/deck/tarot + path = /obj/item/deck/tarot /datum/gear/holder display_name = "card holder" - path = /obj/item/weapon/deck/holder + path = /obj/item/deck/holder /datum/gear/cardemon_pack display_name = "Cardemon booster pack" - path = /obj/item/weapon/pack/cardemon + path = /obj/item/pack/cardemon /datum/gear/spaceball_pack display_name = "Spaceball booster pack" - path = /obj/item/weapon/pack/spaceball + path = /obj/item/pack/spaceball /datum/gear/plushie display_name = "plushie selection" @@ -85,7 +85,7 @@ var/toytype = list() toytype["Blink toy"] = /obj/item/toy/blink toytype["Gravitational singularity"] = /obj/item/toy/spinningtoy - toytype["Water flower"] = /obj/item/weapon/reagent_containers/spray/waterflower + toytype["Water flower"] = /obj/item/reagent_containers/spray/waterflower toytype["Bosun's whistle"] = /obj/item/toy/bosunwhistle toytype["Magic 8 Ball"] = /obj/item/toy/eight_ball toytype["Magic Conch shell"] = /obj/item/toy/eight_ball/conch @@ -94,7 +94,7 @@ /datum/gear/flask display_name = "flask" - path = /obj/item/weapon/reagent_containers/food/drinks/flask/barflask + path = /obj/item/reagent_containers/food/drinks/flask/barflask /datum/gear/flask/New() ..() @@ -102,7 +102,7 @@ /datum/gear/vacflask display_name = "vacuum-flask" - path = /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask + path = /obj/item/reagent_containers/food/drinks/flask/vacuumflask /datum/gear/vacflask/New() ..() @@ -112,13 +112,13 @@ display_name = "lunchbox" description = "A little lunchbox." cost = 2 - path = /obj/item/weapon/storage/toolbox/lunchbox + path = /obj/item/storage/toolbox/lunchbox /datum/gear/lunchbox/New() ..() var/list/lunchboxes = list() - for(var/lunchbox_type in typesof(/obj/item/weapon/storage/toolbox/lunchbox)) - var/obj/item/weapon/storage/toolbox/lunchbox/lunchbox = lunchbox_type + for(var/lunchbox_type in typesof(/obj/item/storage/toolbox/lunchbox)) + var/obj/item/storage/toolbox/lunchbox/lunchbox = lunchbox_type if(!initial(lunchbox.filled)) lunchboxes[initial(lunchbox.name)] = lunchbox_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(lunchboxes)) @@ -126,7 +126,7 @@ /datum/gear/towel display_name = "towel" - path = /obj/item/weapon/towel + path = /obj/item/towel /datum/gear/towel/New() ..() @@ -134,65 +134,65 @@ /datum/gear/cahwhite display_name = "Cards Against The Galaxy (white deck)" - path = /obj/item/weapon/deck/cah + path = /obj/item/deck/cah description = "The ever-popular Cards Against The Galaxy word game. Warning: may include traces of broken fourth wall. This is the white deck." /datum/gear/cahblack display_name = "Cards Against The Galaxy (black deck)" - path = /obj/item/weapon/deck/cah/black + path = /obj/item/deck/cah/black description = "The ever-popular Cards Against The Galaxy word game. Warning: may include traces of broken fourth wall. This is the black deck." /datum/gear/wizoff display_name = "WizOff" - path = /obj/item/weapon/deck/wizoff + path = /obj/item/deck/wizoff /datum/gear/wizoffguide display_name = "WizOff Guide" - path = /obj/item/weapon/book/manual/wizzoffguide + path = /obj/item/book/manual/wizzoffguide description = "The guide to playing the ever popular card game: Wiz-Off!" /datum/gear/coffeemug display_name = "coffee mugs" description = "A coffee mug in various designs." cost = 1 - path = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug + path = /obj/item/reagent_containers/food/drinks/glass2/coffeemug /datum/gear/coffeemug/New() ..() var/list/coffeemugs = list() - coffeemugs["plain coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug - coffeemugs["SCG coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/sol - coffeemugs["Fleet coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fleet - coffeemugs["Five Arrows coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fivearrows - coffeemugs["Pearlshield coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/psc - coffeemugs["Almach Association coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/alma - coffeemugs["Almach Protectorate coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/almp - coffeemugs["NT coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/nt - coffeemugs["Wulf Aeronautics mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal/wulf - coffeemugs["Gilthari Exports coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/gilthari - coffeemugs["Zeng-Hu coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/zeng - coffeemugs["Ward-Takahashi coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/wt - coffeemugs["Aether Atmospherics coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/aether - coffeemugs["Bishop Cybernetics coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/bishop - coffeemugs["Oculum Broadcast coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/oculum - coffeemugs["#1 coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/one - coffeemugs["#1 monkey coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/puni - coffeemugs["heart coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/heart - coffeemugs["pawn coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/pawn - coffeemugs["diona coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/diona - coffeemugs["british coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/britcup - coffeemugs["flame coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/flame - coffeemugs["blue coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/blue - coffeemugs["black coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/black - coffeemugs["green coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green - coffeemugs["dark green coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green/dark - coffeemugs["rainbow coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/rainbow - coffeemugs["metal coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal - coffeemugs["glass coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/glass - coffeemugs["tall coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall - coffeemugs["tall black coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/black - coffeemugs["tall metal coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/metal - coffeemugs["tall rainbow coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/rainbow - coffeemugs["Talon coffee mug"] = /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/talon + coffeemugs["plain coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug + coffeemugs["SCG coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/sol + coffeemugs["Fleet coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/fleet + coffeemugs["Five Arrows coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/fivearrows + coffeemugs["Pearlshield coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/psc + coffeemugs["Almach Association coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/alma + coffeemugs["Almach Protectorate coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/almp + coffeemugs["NT coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/nt + coffeemugs["Wulf Aeronautics mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/metal/wulf + coffeemugs["Gilthari Exports coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/gilthari + coffeemugs["Zeng-Hu coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/zeng + coffeemugs["Ward-Takahashi coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/wt + coffeemugs["Aether Atmospherics coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/aether + coffeemugs["Bishop Cybernetics coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/bishop + coffeemugs["Oculum Broadcast coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/oculum + coffeemugs["#1 coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/one + coffeemugs["#1 monkey coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/puni + coffeemugs["heart coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/heart + coffeemugs["pawn coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/pawn + coffeemugs["diona coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/diona + coffeemugs["british coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/britcup + coffeemugs["flame coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/flame + coffeemugs["blue coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/blue + coffeemugs["black coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/black + coffeemugs["green coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/green + coffeemugs["dark green coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/green/dark + coffeemugs["rainbow coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/rainbow + coffeemugs["metal coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/metal + coffeemugs["glass coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/glass + coffeemugs["tall coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tall + coffeemugs["tall black coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tall/black + coffeemugs["tall metal coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tall/metal + coffeemugs["tall rainbow coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/tall/rainbow + coffeemugs["Talon coffee mug"] = /obj/item/reagent_containers/food/drinks/glass2/coffeemug/talon gear_tweaks += new /datum/gear_tweak/path(coffeemugs) gear_tweaks += new /datum/gear_tweak/reagents(lunchables_drink_reagents()) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_general_vr.dm b/code/modules/client/preference_setup/loadout/loadout_general_vr.dm index d00415a67d4..3909acf199a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general_vr.dm @@ -41,13 +41,13 @@ toytype["Foam dart crossbow"] = /obj/item/toy/blink toytype["Toy sword"] = /obj/item/toy/sword toytype["Toy katana"] = /obj/item/toy/katana - toytype["Snap pops"] = /obj/item/weapon/storage/box/snappops + toytype["Snap pops"] = /obj/item/storage/box/snappops toytype["Plastic flowers"] = /obj/item/toy/bouquet/fake toytype["Stick horse"] = /obj/item/toy/stickhorse toytype["Toy X-mas tree"] = /obj/item/toy/xmastree - toytype["Fake handcuff kit"] = /obj/item/weapon/storage/box/handcuffs/fake + toytype["Fake handcuff kit"] = /obj/item/storage/box/handcuffs/fake toytype["Gravitational singularity"] = /obj/item/toy/spinningtoy - toytype["Water flower"] = /obj/item/weapon/reagent_containers/spray/waterflower + toytype["Water flower"] = /obj/item/reagent_containers/spray/waterflower toytype["Bosun's whistle"] = /obj/item/toy/bosunwhistle toytype["Magic 8 Ball"] = /obj/item/toy/eight_ball toytype["Magic Conch shell"] = /obj/item/toy/eight_ball/conch @@ -90,19 +90,19 @@ /datum/gear/textmug display_name = "mug with text" description = "A mug with something written on it." - path = /obj/item/weapon/reagent_containers/food/drinks/textmug + path = /obj/item/reagent_containers/food/drinks/textmug /datum/gear/schnapsen display_name = "schnapsen playing cards" description = "An ancient Austro-Hungarian suit of cards!" - path = /obj/item/weapon/deck/schnapsen + path = /obj/item/deck/schnapsen /datum/gear/egy_game display_name = "EGY playing cards" description = "A deck of cards for playing EGY! Be the first to lose all cards!" - path = /obj/item/weapon/deck/egy + path = /obj/item/deck/egy /datum/gear/fluff_permit display_name = "Customizable Permit" description = "A customizable permit you can use for... just about anything! Be sure to customize the name and description. It is meant to represent generic driver's or pilot's licenses, and similar fluff items. It includes an irremovable disclaimer and may be freely confiscated or revoked at the discretion of Security and/or Command if you attempt to abuse it!" - path = /obj/item/weapon/card_fluff + path = /obj/item/card_fluff diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm index f855d31ca21..bab1765f0ab 100644 --- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm +++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm @@ -13,29 +13,29 @@ /datum/gear/matchbook display_name = "matchbook" - path = /obj/item/weapon/storage/box/matches + path = /obj/item/storage/box/matches /datum/gear/lighter display_name = "cheap lighter" - path = /obj/item/weapon/flame/lighter + path = /obj/item/flame/lighter /datum/gear/lighter/zippo display_name = "Zippo selection" - path = /obj/item/weapon/flame/lighter/zippo + path = /obj/item/flame/lighter/zippo /datum/gear/lighter/zippo/New() ..() var/list/zippos = list() - for(var/zippo in typesof(/obj/item/weapon/flame/lighter/zippo)) - if(zippo in typesof(/obj/item/weapon/flame/lighter/zippo/fluff)) //VOREStation addition + for(var/zippo in typesof(/obj/item/flame/lighter/zippo)) + if(zippo in typesof(/obj/item/flame/lighter/zippo/fluff)) //VOREStation addition continue //VOREStation addition - var/obj/item/weapon/flame/lighter/zippo/zippo_type = zippo + var/obj/item/flame/lighter/zippo/zippo_type = zippo zippos[initial(zippo_type.name)] = zippo_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(zippos)) /datum/gear/ashtray display_name = "ashtray, plastic" - path = /obj/item/weapon/material/ashtray/plastic + path = /obj/item/material/ashtray/plastic /datum/gear/cigar display_name = "cigar" @@ -43,11 +43,11 @@ /datum/gear/cigarettes display_name = "cigarette selection" - path = /obj/item/weapon/storage/fancy/cigarettes + path = /obj/item/storage/fancy/cigarettes /datum/gear/cigarettes/New() ..() var/list/cigarettes = list() - for(var/obj/item/weapon/storage/fancy/cigarettes/cigarette_brand as anything in (typesof(/obj/item/weapon/storage/fancy/cigarettes))) + for(var/obj/item/storage/fancy/cigarettes/cigarette_brand as anything in (typesof(/obj/item/storage/fancy/cigarettes))) cigarettes[initial(cigarette_brand.name)] = cigarette_brand gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cigarettes)) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 587a6635fb1..e74a34ace6c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -42,12 +42,12 @@ Swimsuits /datum/gear/uniform/swimsuits display_name = "swimsuits selection" - path = /obj/item/weapon/storage/box/fluff/swimsuit + path = /obj/item/storage/box/fluff/swimsuit /datum/gear/uniform/swimsuits/New() ..() var/list/swimsuits = list() - for(var/obj/item/weapon/storage/box/fluff/swimsuit/swimsuit_type as anything in typesof(/obj/item/weapon/storage/box/fluff/swimsuit)) + for(var/obj/item/storage/box/fluff/swimsuit/swimsuit_type as anything in typesof(/obj/item/storage/box/fluff/swimsuit)) swimsuits[initial(swimsuit_type.name)] = swimsuit_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(swimsuits)) diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index ed6fb99a798..5192e758e3e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -1,130 +1,130 @@ // "Useful" items - I'm guessing things that might be used at work? /datum/gear/utility display_name = "briefcase" - path = /obj/item/weapon/storage/briefcase + path = /obj/item/storage/briefcase sort_category = "Utility" /datum/gear/utility/clipboard display_name = "clipboard" - path = /obj/item/weapon/clipboard + path = /obj/item/clipboard /datum/gear/utility/tts_device display_name = "text to speech device" - path = /obj/item/device/text_to_speech + path = /obj/item/text_to_speech cost = 3 //Not extremely expensive, but it's useful for mute chracters. /datum/gear/utility/communicator display_name = "communicator selection" - path = /obj/item/device/communicator + path = /obj/item/communicator cost = 0 /datum/gear/utility/communicator/New() ..() var/list/communicators = list() - for(var/obj/item/device/communicator_type as anything in typesof(/obj/item/device/communicator) - list(/obj/item/device/communicator/integrated,/obj/item/device/communicator/commlink)) //VOREStation Edit - Remove Commlink + for(var/obj/item/communicator_type as anything in typesof(/obj/item/communicator) - list(/obj/item/communicator/integrated,/obj/item/communicator/commlink)) //VOREStation Edit - Remove Commlink communicators[initial(communicator_type.name)] = communicator_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(communicators)) /datum/gear/utility/camera display_name = "camera" - path = /obj/item/device/camera + path = /obj/item/camera /datum/gear/utility/codex display_name = "the traveler's guide to Virgo-Erigone" - path = /obj/item/weapon/book/codex //VOREStation Edit + path = /obj/item/book/codex //VOREStation Edit cost = 0 /datum/gear/utility/news display_name = "daedalus pocket newscaster" - path = /obj/item/weapon/book/codex/lore/news + path = /obj/item/book/codex/lore/news cost = 0 /* //VORESTATION REMOVAL /datum/gear/utility/corp_regs display_name = "corporate regulations and legal code" - path = /obj/item/weapon/book/codex/corp_regs + path = /obj/item/book/codex/corp_regs cost = 0 */ /datum/gear/utility/robutt display_name = "a buyer's guide to artificial bodies" - path = /obj/item/weapon/book/codex/lore/robutt + path = /obj/item/book/codex/lore/robutt cost = 0 /datum/gear/utility/folder_blue display_name = "folder, blue" - path = /obj/item/weapon/folder/blue + path = /obj/item/folder/blue /datum/gear/utility/folder_grey display_name = "folder, grey" - path = /obj/item/weapon/folder + path = /obj/item/folder /datum/gear/utility/folder_red display_name = "folder, red" - path = /obj/item/weapon/folder/red + path = /obj/item/folder/red /datum/gear/utility/folder_white display_name = "folder, white" - path = /obj/item/weapon/folder/white + path = /obj/item/folder/white /datum/gear/utility/folder_yellow display_name = "folder, yellow" - path = /obj/item/weapon/folder/yellow + path = /obj/item/folder/yellow /datum/gear/utility/paicard display_name = "personal AI device (classic)" - path = /obj/item/device/paicard + path = /obj/item/paicard /datum/gear/utility/paicard_b display_name = "personal AI device (new)" - path = /obj/item/device/paicard/typeb + path = /obj/item/paicard/typeb /datum/gear/utility/securecase display_name = "secure briefcase" - path =/obj/item/weapon/storage/secure/briefcase + path =/obj/item/storage/secure/briefcase cost = 2 /datum/gear/utility/laserpointer display_name = "laser pointer" - path =/obj/item/device/laser_pointer + path =/obj/item/laser_pointer cost = 2 /datum/gear/utility/flashlight display_name = "flashlight" - path = /obj/item/device/flashlight + path = /obj/item/flashlight /datum/gear/utility/maglight display_name = "flashlight, maglight" - path = /obj/item/device/flashlight/maglight + path = /obj/item/flashlight/maglight cost = 2 /datum/gear/utility/flashlight/color display_name = "flashlight, small (selection)" - path = /obj/item/device/flashlight/color + path = /obj/item/flashlight/color /datum/gear/utility/flashlight/color/New() ..() var/list/flashlights = list( - "Blue Flashlight" = /obj/item/device/flashlight/color, - "Red Flashlight" = /obj/item/device/flashlight/color/red, - "Green Flashlight" = /obj/item/device/flashlight/color/green, - "Yellow Flashlight" = /obj/item/device/flashlight/color/yellow, - "Purple Flashlight" = /obj/item/device/flashlight/color/purple, - "Orange Flashlight" = /obj/item/device/flashlight/color/orange + "Blue Flashlight" = /obj/item/flashlight/color, + "Red Flashlight" = /obj/item/flashlight/color/red, + "Green Flashlight" = /obj/item/flashlight/color/green, + "Yellow Flashlight" = /obj/item/flashlight/color/yellow, + "Purple Flashlight" = /obj/item/flashlight/color/purple, + "Orange Flashlight" = /obj/item/flashlight/color/orange ) gear_tweaks += new/datum/gear_tweak/path(flashlights) /datum/gear/utility/battery display_name = "cell, device" - path = /obj/item/weapon/cell/device + path = /obj/item/cell/device /datum/gear/utility/pen display_name = "fountain pen" - path = /obj/item/weapon/pen/fountain + path = /obj/item/pen/fountain /datum/gear/utility/umbrella display_name = "umbrella" - path = /obj/item/weapon/melee/umbrella + path = /obj/item/melee/umbrella cost = 3 /datum/gear/utility/umbrella/New() @@ -147,7 +147,7 @@ /datum/gear/utility/lantern display_name = "lantern" - path = /obj/item/device/flashlight/lantern + path = /obj/item/flashlight/lantern cost = 2 /**************** diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm index 4fcb85c9a8e..7b998d20afd 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -1,72 +1,72 @@ /datum/gear/utility/saddlebag display_name = "saddle bag, horse" - path = /obj/item/weapon/storage/backpack/saddlebag + path = /obj/item/storage/backpack/saddlebag slot = slot_back cost = 2 /datum/gear/utility/saddlebag_common display_name = "saddle bag, common" - path = /obj/item/weapon/storage/backpack/saddlebag_common + path = /obj/item/storage/backpack/saddlebag_common slot = slot_back cost = 2 /datum/gear/utility/saddlebag_common/robust display_name = "saddle bag, robust" - path = /obj/item/weapon/storage/backpack/saddlebag_common/robust + path = /obj/item/storage/backpack/saddlebag_common/robust slot = slot_back cost = 2 /datum/gear/utility/saddlebag_common/vest display_name = "taur duty vest (backpack)" - path = /obj/item/weapon/storage/backpack/saddlebag_common/vest + path = /obj/item/storage/backpack/saddlebag_common/vest slot = slot_back cost = 1 /datum/gear/utility/dufflebag display_name = "dufflebag" - path = /obj/item/weapon/storage/backpack/dufflebag + path = /obj/item/storage/backpack/dufflebag slot = slot_back cost = 2 /datum/gear/utility/dufflebag/black display_name = "black dufflebag" - path = /obj/item/weapon/storage/backpack/dufflebag/fluff + path = /obj/item/storage/backpack/dufflebag/fluff /datum/gear/utility/dufflebag/med display_name = "medical dufflebag" - path = /obj/item/weapon/storage/backpack/dufflebag/med + path = /obj/item/storage/backpack/dufflebag/med allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST,JOB_PSYCHIATRIST) /datum/gear/utility/dufflebag/med/emt display_name = "EMT dufflebag" - path = /obj/item/weapon/storage/backpack/dufflebag/emt + path = /obj/item/storage/backpack/dufflebag/emt /datum/gear/utility/dufflebag/sec display_name = "security Dufflebag" - path = /obj/item/weapon/storage/backpack/dufflebag/sec allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER) + path = /obj/item/storage/backpack/dufflebag/sec /datum/gear/utility/dufflebag/eng display_name = "engineering dufflebag" - path = /obj/item/weapon/storage/backpack/dufflebag/eng allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_ENGINEER) + path = /obj/item/storage/backpack/dufflebag/eng /datum/gear/utility/dufflebag/sci display_name = "science dufflebag" - path = /obj/item/weapon/storage/backpack/dufflebag/sci allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST,JOB_ROBOTICIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST) + path = /obj/item/storage/backpack/dufflebag/sci /datum/gear/utility/dufflebag/explorer display_name = "away team dufflebag" - path = /obj/item/weapon/storage/backpack/dufflebag/explorer + path = /obj/item/storage/backpack/dufflebag/explorer /datum/gear/utility/dufflebag/talon display_name = "Talon dufflebag" - path = /obj/item/weapon/storage/backpack/dufflebag/explorer + path = /obj/item/storage/backpack/dufflebag/explorer /datum/gear/utility/ID display_name = "contractor identification card" - path = /obj/item/weapon/card/id/event/polymorphic/altcard + path = /obj/item/card/id/event/polymorphic/altcard cost = 1 /datum/gear/utility/bs_bracelet @@ -76,5 +76,5 @@ /datum/gear/utility/walkpod display_name = "podzu music player" - path = /obj/item/device/walkpod + path = /obj/item/walkpod cost = 2 diff --git a/code/modules/client/preference_setup/vore/08_nif.dm b/code/modules/client/preference_setup/vore/08_nif.dm index 57a04413c7c..05d2481fa5a 100644 --- a/code/modules/client/preference_setup/vore/08_nif.dm +++ b/code/modules/client/preference_setup/vore/08_nif.dm @@ -1,6 +1,6 @@ //Pretty small file, mostly just for storage. /datum/preferences - var/obj/item/device/nif/nif_path + var/obj/item/nif/nif_path var/nif_durability var/list/nif_savedata @@ -41,7 +41,7 @@ pref.nif_path = null //Kill! WARNING("Loaded a NIF but it was an invalid path, [pref.real_name]") - if (ispath(pref.nif_path, /obj/item/device/nif/protean) && pref.species != SPECIES_PROTEAN) //no free nifs + if (ispath(pref.nif_path, /obj/item/nif/protean) && pref.species != SPECIES_PROTEAN) //no free nifs pref.nif_path = null if(ispath(pref.nif_path) && isnull(pref.nif_durability)) //How'd you lose this? diff --git a/code/modules/client/stored_item.dm b/code/modules/client/stored_item.dm index cd0f8829d29..104c1b1e227 100644 --- a/code/modules/client/stored_item.dm +++ b/code/modules/client/stored_item.dm @@ -170,89 +170,89 @@ /////LIST OF STUFF WE DON'T WANT PEOPLE STORING///// -/obj/item/device/pda +/obj/item/pda persist_storable = FALSE -/obj/item/device/communicator +/obj/item/communicator persist_storable = FALSE -/obj/item/weapon/card +/obj/item/card persist_storable = FALSE -/obj/item/weapon/holder +/obj/item/holder persist_storable = FALSE -/obj/item/device/radio +/obj/item/radio persist_storable = FALSE -/obj/item/device/encryptionkey +/obj/item/encryptionkey persist_storable = FALSE -/obj/item/weapon/storage //There are lots of things that have stuff that we may not want people to just have. And this is mostly intended for a single thing. +/obj/item/storage //There are lots of things that have stuff that we may not want people to just have. And this is mostly intended for a single thing. persist_storable = FALSE //And it would be annoying to go through and consider all of them, so default to disabled. -/obj/item/weapon/storage/backpack //But we can enable some where it makes sense. Backpacks and their variants basically never start with anything in them, as an example. +/obj/item/storage/backpack //But we can enable some where it makes sense. Backpacks and their variants basically never start with anything in them, as an example. persist_storable = TRUE -/obj/item/weapon/reagent_containers/hypospray/vial +/obj/item/reagent_containers/hypospray/vial persist_storable = FALSE -/obj/item/weapon/cmo_disk_holder +/obj/item/cmo_disk_holder persist_storable = FALSE -/obj/item/device/defib_kit/compact/combat +/obj/item/defib_kit/compact/combat persist_storable = FALSE /obj/item/clothing/glasses/welding/superior persist_storable = FALSE /obj/item/clothing/shoes/magboots/adv persist_storable = FALSE -/obj/item/weapon/rig +/obj/item/rig persist_storable = FALSE /obj/item/clothing/head/helmet/space/void persist_storable = FALSE /obj/item/clothing/suit/space/void persist_storable = FALSE -/obj/item/weapon/grab +/obj/item/grab persist_storable = FALSE -/obj/item/weapon/grenade +/obj/item/grenade persist_storable = FALSE -/obj/item/weapon/hand_tele +/obj/item/hand_tele persist_storable = FALSE -/obj/item/weapon/paper +/obj/item/paper persist_storable = FALSE -/obj/item/weapon/backup_implanter +/obj/item/backup_implanter persist_storable = FALSE -/obj/item/weapon/disk/nuclear +/obj/item/disk/nuclear persist_storable = FALSE -/obj/item/weapon/gun/energy/locked //These are guns with security measures on them, so let's say the box won't let you put them in there. +/obj/item/gun/energy/locked //These are guns with security measures on them, so let's say the box won't let you put them in there. persist_storable = FALSE //(otherwise explo will just put their locker/vendor guns into it every round) -/obj/item/device/retail_scanner +/obj/item/retail_scanner persist_storable = FALSE -/obj/item/weapon/telecube +/obj/item/telecube persist_storable = FALSE -/obj/item/weapon/reagent_containers/glass/bottle/adminordrazine +/obj/item/reagent_containers/glass/bottle/adminordrazine persist_storable = FALSE -/obj/item/weapon/gun/energy/sizegun/admin +/obj/item/gun/energy/sizegun/admin persist_storable = FALSE /obj/item/stack persist_storable = FALSE -/obj/item/weapon/book +/obj/item/book persist_storable = FALSE -/obj/item/weapon/melee/cursedblade +/obj/item/melee/cursedblade persist_storable = FALSE -/obj/item/weapon/circuitboard/mecha/imperion +/obj/item/circuitboard/mecha/imperion persist_storable = FALSE -/obj/item/device/paicard +/obj/item/paicard persist_storable = FALSE /obj/item/organ persist_storable = FALSE -/obj/item/device/soulstone +/obj/item/soulstone persist_storable = FALSE -/obj/item/device/aicard +/obj/item/aicard persist_storable = FALSE -/obj/item/device/mmi +/obj/item/mmi persist_storable = FALSE /obj/item/seeds persist_storable = FALSE -/obj/item/weapon/reagent_containers/food/snacks/grown +/obj/item/reagent_containers/food/snacks/grown persist_storable = FALSE -/obj/item/weapon/stock_parts +/obj/item/stock_parts persist_storable = FALSE -/obj/item/weapon/rcd +/obj/item/rcd persist_storable = FALSE -/obj/item/weapon/spacecash +/obj/item/spacecash persist_storable = FALSE -/obj/item/weapon/spacecasinocash +/obj/item/spacecasinocash persist_storable = FALSE -/obj/item/device/personal_shield_generator +/obj/item/personal_shield_generator persist_storable = FALSE \ No newline at end of file diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm index 9d2a3f064b9..ce4a7292198 100644 --- a/code/modules/client/verbs/suicide.dm +++ b/code/modules/client/verbs/suicide.dm @@ -85,7 +85,7 @@ set name = "pAI Suicide" var/answer = tgui_alert(usr, "REALLY kill yourself? This action can't be undone.", "Suicide", list("Yes","No")) if(answer == "Yes") - var/obj/item/device/paicard/card = loc + var/obj/item/paicard/card = loc card.removePersonality() var/turf/T = get_turf_or_move(card.loc) for (var/mob/M in viewers(T)) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 0e52b8674c3..f03692bf7b6 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -175,20 +175,20 @@ //********************** //**Chameleon Backpack** //********************** -/obj/item/weapon/storage/backpack/chameleon +/obj/item/storage/backpack/chameleon name = "backpack" icon_state = "backpack" desc = "A backpack outfitted with cloaking tech. It seems to have a small dial inside, kept away from the storage." origin_tech = list(TECH_ILLEGAL = 3) var/global/list/clothing_choices -/obj/item/weapon/storage/backpack/chameleon/New() +/obj/item/storage/backpack/chameleon/New() ..() if(!clothing_choices) - var/blocked = list(src.type, /obj/item/weapon/storage/backpack/satchel/withwallet) - clothing_choices = generate_chameleon_choices(/obj/item/weapon/storage/backpack, blocked) + var/blocked = list(src.type, /obj/item/storage/backpack/satchel/withwallet) + clothing_choices = generate_chameleon_choices(/obj/item/storage/backpack, blocked) -/obj/item/weapon/storage/backpack/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP. In this case your cover's blown. +/obj/item/storage/backpack/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP. In this case your cover's blown. name = "backpack" desc = "You wear this on your back and put items into it." icon_state = "backpack" @@ -197,7 +197,7 @@ var/mob/M = src.loc M.update_inv_back() -/obj/item/weapon/storage/backpack/chameleon/verb/change(picked in clothing_choices) +/obj/item/storage/backpack/chameleon/verb/change(picked in clothing_choices) set name = "Change Backpack Appearance" set category = "Chameleon Items" set src in usr @@ -212,7 +212,7 @@ var/mob/M = src.loc M.update_inv_back() -/obj/item/weapon/storage/backpack/chameleon/full +/obj/item/storage/backpack/chameleon/full starts_with = list( /obj/item/clothing/under/chameleon, /obj/item/clothing/head/chameleon, @@ -331,19 +331,19 @@ //**Chameleon Belt** //****************** -/obj/item/weapon/storage/belt/chameleon +/obj/item/storage/belt/chameleon name = "belt" desc = "Can hold various things. It also has a small dial inside one of the pouches." icon_state = "utilitybelt" origin_tech = list(TECH_ILLEGAL = 3) var/global/list/clothing_choices -/obj/item/weapon/storage/belt/chameleon/New() +/obj/item/storage/belt/chameleon/New() ..() if(!clothing_choices) - clothing_choices = generate_chameleon_choices(/obj/item/weapon/storage/belt, list(src.type)) + clothing_choices = generate_chameleon_choices(/obj/item/storage/belt, list(src.type)) -/obj/item/weapon/storage/belt/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP. In this case your cover's blown. +/obj/item/storage/belt/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP. In this case your cover's blown. name = "belt" desc = "Can hold various things." icon_state = "utilitybelt" @@ -352,7 +352,7 @@ var/mob/M = src.loc M.update_inv_belt() -/obj/item/weapon/storage/belt/chameleon/verb/change(picked in clothing_choices) +/obj/item/storage/belt/chameleon/verb/change(picked in clothing_choices) set name = "Change Belt Appearance" set category = "Chameleon Items" set src in usr @@ -405,7 +405,7 @@ //***************** //**Chameleon Gun** //***************** -/obj/item/weapon/gun/energy/chameleon +/obj/item/gun/energy/chameleon name = "desert eagle" desc = "A hologram projector in the shape of a gun. There is a dial on the side to change the gun's disguise." icon_state = "deagle" @@ -422,17 +422,17 @@ var/obj/item/projectile/copy_projectile var/global/list/gun_choices -/obj/item/weapon/gun/energy/chameleon/New() +/obj/item/gun/energy/chameleon/New() ..() if(!gun_choices) gun_choices = list() - for(var/gun_type in typesof(/obj/item/weapon/gun/) - src.type) - var/obj/item/weapon/gun/G = gun_type + for(var/gun_type in typesof(/obj/item/gun/) - src.type) + var/obj/item/gun/G = gun_type src.gun_choices[initial(G.name)] = gun_type return -/obj/item/weapon/gun/energy/chameleon/consume_next_projectile() +/obj/item/gun/energy/chameleon/consume_next_projectile() var/obj/item/projectile/P = ..() if(P && ispath(copy_projectile)) P.name = initial(copy_projectile.name) @@ -447,7 +447,7 @@ P.impact_type = initial(copy_projectile.impact_type) return P -/obj/item/weapon/gun/energy/chameleon/emp_act(severity) +/obj/item/gun/energy/chameleon/emp_act(severity) name = "desert eagle" desc = "It's a desert eagle." icon_state = "deagle" @@ -457,8 +457,8 @@ M.update_inv_r_hand() M.update_inv_l_hand() -/obj/item/weapon/gun/energy/chameleon/disguise(var/newtype) - var/obj/item/weapon/gun/copy = ..() +/obj/item/gun/energy/chameleon/disguise(var/newtype) + var/obj/item/gun/copy = ..() flags_inv = copy.flags_inv if(copy.fire_sound) @@ -467,7 +467,7 @@ fire_sound = null fire_sound_text = copy.fire_sound_text - var/obj/item/weapon/gun/G = copy + var/obj/item/gun/G = copy if(istype(G)) copy_projectile = G.projectile_type //charge_meter = E.charge_meter //does not work very well with icon_state changes, ATM @@ -475,7 +475,7 @@ copy_projectile = null //charge_meter = 0 -/obj/item/weapon/gun/energy/chameleon/verb/change(picked in gun_choices) +/obj/item/gun/energy/chameleon/verb/change(picked in gun_choices) set name = "Change Gun Appearance" set category = "Chameleon Items" set src in usr diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 82e6de0baf0..56a3b1d0178 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -308,7 +308,7 @@ siemens_coefficient = 0.9 blood_sprite_state = "bloodyhands" var/wired = 0 - var/obj/item/weapon/cell/cell = 0 + var/obj/item/cell/cell = 0 var/fingerprint_chance = 0 //How likely the glove is to let fingerprints through var/obj/item/clothing/gloves/ring = null //Covered ring var/mob/living/carbon/human/wearer = null //Used for covered rings when dropping @@ -345,8 +345,8 @@ /obj/item/clothing/gloves/proc/Touch(var/atom/A, var/proximity) return 0 // return 1 to cancel attack_hand() -/*/obj/item/clothing/gloves/attackby(obj/item/weapon/W, mob/user) - if(W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/weapon/scalpel)) +/*/obj/item/clothing/gloves/attackby(obj/item/W, mob/user) + if(W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/scalpel)) if (clipped) to_chat(user, "The [src] have already been clipped!") update_icon() @@ -660,10 +660,10 @@ ..() /obj/item/clothing/shoes/attackby(var/obj/item/I, var/mob/user) - if((can_hold_knife == 1) && (istype(I, /obj/item/weapon/material/shard) || \ - istype(I, /obj/item/weapon/material/butterfly) || \ - istype(I, /obj/item/weapon/material/kitchen/utensil) || \ - istype(I, /obj/item/weapon/material/knife/tacknife))) + if((can_hold_knife == 1) && (istype(I, /obj/item/material/shard) || \ + istype(I, /obj/item/material/butterfly) || \ + istype(I, /obj/item/material/kitchen/utensil) || \ + istype(I, /obj/item/material/knife/tacknife))) if(holding) to_chat(user, "\The [src] is already holding \a [holding].") return @@ -730,7 +730,7 @@ name = "suit" var/fire_resist = T0C+100 body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - allowed = list(/obj/item/weapon/tank/emergency/oxygen) + allowed = list(/obj/item/tank/emergency/oxygen) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0) slot_flags = SLOT_OCLOTHING var/blood_overlay_type = "suit" diff --git a/code/modules/clothing/clothing_vr.dm b/code/modules/clothing/clothing_vr.dm index 32cfb9cffc0..2b52f977d87 100644 --- a/code/modules/clothing/clothing_vr.dm +++ b/code/modules/clothing/clothing_vr.dm @@ -32,7 +32,7 @@ //This is a crazy 'sideways' override. /obj/item/clothing/shoes/attackby(var/obj/item/I, var/mob/user) - if(istype(I,/obj/item/weapon/holder/micro)) + if(istype(I,/obj/item/holder/micro)) var/full = 0 for(var/mob/M in src) if(istype(M,/mob/living/voice)) //Don't count voices as people! @@ -41,7 +41,7 @@ if(full >= 2) to_chat(user, "You can't fit anyone else into \the [src]!") else - var/obj/item/weapon/holder/micro/holder = I + var/obj/item/holder/micro/holder = I if(holder.held_mob && (holder.held_mob in holder)) var/mob/living/M = holder.held_mob holder.dump_mob() diff --git a/code/modules/clothing/ears/ears.dm b/code/modules/clothing/ears/ears.dm index 99f9b009129..82245b31583 100644 --- a/code/modules/clothing/ears/ears.dm +++ b/code/modules/clothing/ears/ears.dm @@ -4,6 +4,7 @@ /obj/item/clothing/ears/earmuffs name = "earmuffs" desc = "Protects your hearing from loud noises, and quiet ones as well." + icon = 'icons/obj/items.dmi' icon_state = "earmuffs" item_state_slots = list(slot_r_hand_str = "earmuffs", slot_l_hand_str = "earmuffs") slot_flags = SLOT_EARS | SLOT_TWOEARS @@ -184,4 +185,4 @@ /obj/item/clothing/ears/skrell/cloth_male/lightblue name = "light blue headtail cloth" icon_state = "skrell_cloth_lblue_male" - item_state_slots = list(slot_r_hand_str = "egg2", slot_l_hand_str = "egg2") \ No newline at end of file + item_state_slots = list(slot_r_hand_str = "egg2", slot_l_hand_str = "egg2") diff --git a/code/modules/clothing/glasses/glasses_vr.dm b/code/modules/clothing/glasses/glasses_vr.dm index b573fbee349..878fddeddc8 100644 --- a/code/modules/clothing/glasses/glasses_vr.dm +++ b/code/modules/clothing/glasses/glasses_vr.dm @@ -12,14 +12,14 @@ playsound(src,'sound/items/screwdriver.ogg', 50, 1) //Prescription kit -/obj/item/device/glasses_kit +/obj/item/glasses_kit name = "prescription glasses kit" desc = "A kit containing all the needed tools and parts to develop and apply a prescription for someone." icon = 'icons/obj/device.dmi' icon_state = "modkit" var/scrip_loaded = 0 -/obj/item/device/glasses_kit/afterattack(var/target, var/mob/living/carbon/human/user, var/proximity) +/obj/item/glasses_kit/afterattack(var/target, var/mob/living/carbon/human/user, var/proximity) if(!proximity) return if(!istype(user)) diff --git a/code/modules/clothing/gloves/antagonist.dm b/code/modules/clothing/gloves/antagonist.dm index 2f369adba0f..23451d6ea25 100644 --- a/code/modules/clothing/gloves/antagonist.dm +++ b/code/modules/clothing/gloves/antagonist.dm @@ -28,11 +28,11 @@ to_chat(target, "[user] rifles in your pockets!") if(user.a_intent == I_HELP) - if(istype(target.back,/obj/item/weapon/storage) && do_after(user, 3 SECONDS, target)) - var/obj/item/weapon/storage/Backpack = target.back + if(istype(target.back,/obj/item/storage) && do_after(user, 3 SECONDS, target)) + var/obj/item/storage/Backpack = target.back Backpack.open(user) - else if(istype(target.belt, /obj/item/weapon/storage) && do_after(user, 5 SECONDS, target)) - var/obj/item/weapon/storage/Belt = target.belt + else if(istype(target.belt, /obj/item/storage) && do_after(user, 5 SECONDS, target)) + var/obj/item/storage/Belt = target.belt Belt.open(user) return 1 @@ -97,8 +97,8 @@ The device is also capable of 'frankenstein'-ing a corpse, long after normal technology would be able to save them. The body will still be tied to the\ normal damage limits for survival, however, so care must be taken." icon_state = "material" - var/battery_type = /obj/item/weapon/cell/device/weapon/recharge - var/obj/item/weapon/cell/battery = null + var/battery_type = /obj/item/cell/device/weapon/recharge + var/obj/item/cell/battery = null /obj/item/clothing/gloves/ring/buzzer/get_cell() return battery diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm index b818be2dba1..ad4fd5d50e4 100644 --- a/code/modules/clothing/gloves/boxing.dm +++ b/code/modules/clothing/gloves/boxing.dm @@ -5,8 +5,8 @@ item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red") /* -/obj/item/clothing/gloves/boxing/attackby(obj/item/weapon/W, mob/user) - if(W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/weapon/surgical/scalpel)) +/obj/item/clothing/gloves/boxing/attackby(obj/item/W, mob/user) + if(W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/surgical/scalpel)) to_chat(user, "That won't work.") //Nope return ..() diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index cd26d6da781..54ed74483ee 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -202,7 +202,7 @@ description_fluff = "Hold ALT whilst left-clicking on the survival watch to toggle the status of its micro-beacon." icon_state = "wristwatch_survival" - var/obj/item/device/gps/gps = null + var/obj/item/gps/gps = null /obj/item/clothing/gloves/watch/survival/examine(mob/user) . = ..() @@ -223,9 +223,9 @@ . += "Pressure: [env.return_pressure()]kPa / Temperature: [env.temperature]K " /obj/item/clothing/gloves/watch/survival/New() - gps = new/obj/item/device/gps/watch(src) + gps = new/obj/item/gps/watch(src) -/obj/item/device/gps/watch +/obj/item/gps/watch gps_tag = "SRV-WTCH" /obj/item/clothing/gloves/watch/survival/AltClick(mob/user) diff --git a/code/modules/clothing/head/flowercrowns.dm b/code/modules/clothing/head/flowercrowns.dm index 81193f337d1..53ee01141f3 100644 --- a/code/modules/clothing/head/flowercrowns.dm +++ b/code/modules/clothing/head/flowercrowns.dm @@ -7,8 +7,8 @@ /obj/item/clothing/head/woodcirclet/attackby(obj/item/W as obj, mob/user as mob) var/obj/item/complete - if(istype(W, /obj/item/weapon/reagent_containers/food/snacks/grown)) - var/obj/item/weapon/reagent_containers/food/snacks/grown/G = W + if(istype(W, /obj/item/reagent_containers/food/snacks/grown)) + var/obj/item/reagent_containers/food/snacks/grown/G = W if(G.seed.kitchen_tag == "poppy") to_chat(user, "You attach the poppy to the circlet and create a beautiful flower crown.") complete = new /obj/item/clothing/head/poppy_crown(get_turf(user)) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index e676e002c01..7e538630256 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -160,7 +160,7 @@ desc = "A specially designed fedora that is woven with protective fibers. It also makes you look cool." icon_state = "fedora_brown" item_state_slots = list(slot_r_hand_str = "detective", slot_l_hand_str = "detective") - allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen) + allowed = list(/obj/item/reagent_containers/food/snacks/candy_corn, /obj/item/pen) armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.9 valid_accessory_slots = null diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index cab1d3fff6a..2572bffa4b4 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -452,7 +452,7 @@ /obj/item/clothing/head/fedora/brown desc = "A brown fedora. Perfect for detectives or those trying to pilfer artifacts." icon_state = "fedora_brown" - allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen) + allowed = list(/obj/item/reagent_containers/food/snacks/candy_corn, /obj/item/pen) /obj/item/clothing/head/fedora/white desc = "A white fedora, really cool hat if you're a mobster. A really lame hat if you're not." diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 667e7b41f95..90acb425cd9 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -45,7 +45,7 @@ //Turn it into a hailer mask /obj/item/clothing/mask/gas/half/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/device/hailer)) + if(istype(I, /obj/item/hailer)) playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) user.drop_item(src) var/obj/item/clothing/mask/gas/sechailer/N = new /obj/item/clothing/mask/gas/sechailer(src.loc) diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm index 5c68ec6e2cc..c628e1c4a53 100644 --- a/code/modules/clothing/masks/hailer.dm +++ b/code/modules/clothing/masks/hailer.dm @@ -6,7 +6,7 @@ armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 55, rad = 0) action_button_name = "HALT!" body_parts_covered = FACE - var/obj/item/device/hailer/hailer + var/obj/item/hailer/hailer var/cooldown = 0 var/phrase = 1 var/aggressiveness = 1 diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index aa01bab9d8a..8c4ba42d20a 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -90,9 +90,9 @@ /obj/item/clothing/shoes/orange name = "orange shoes" icon_state = "orange" - var/obj/item/weapon/handcuffs/chained = null + var/obj/item/handcuffs/chained = null -/obj/item/clothing/shoes/orange/proc/attach_cuffs(var/obj/item/weapon/handcuffs/cuffs, mob/user as mob) +/obj/item/clothing/shoes/orange/proc/attach_cuffs(var/obj/item/handcuffs/cuffs, mob/user as mob) if (chained) return user.drop_item() @@ -117,7 +117,7 @@ /obj/item/clothing/shoes/orange/attackby(H as obj, mob/user as mob) ..() - if (istype(H, /obj/item/weapon/handcuffs)) + if (istype(H, /obj/item/handcuffs)) attach_cuffs(H, user) /obj/item/clothing/shoes/hitops diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index d1ab95b00b3..dcdf6275e5a 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -16,7 +16,7 @@ name = "Skrellian voidsuit" desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic." armor = list(melee = 20, bullet = 20, laser = 20, energy = 50, bomb = 50, bio = 100, rad = 50) - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/storage/bag/ore,/obj/item/t_scanner,/obj/item/pickaxe, /obj/item/rcd) heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE species_restricted = list(SPECIES_SKRELL,SPECIES_HUMAN) @@ -33,7 +33,7 @@ w_class = ITEMSIZE_NORMAL flags = PHORONGUARD item_flags = THICKMATERIAL - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank) + allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/tank) armor = list(melee = 60, bullet = 50, laser = 40,energy = 15, bomb = 30, bio = 100, rad = 50) siemens_coefficient = 0.2 heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/clothing/spacesuits/breaches.dm b/code/modules/clothing/spacesuits/breaches.dm index 7e74ee57f83..b9936003837 100644 --- a/code/modules/clothing/spacesuits/breaches.dm +++ b/code/modules/clothing/spacesuits/breaches.dm @@ -213,7 +213,7 @@ var/global/list/breach_burn_descriptors = list( to_chat(user, "There is no structural damage on \the [src] to repair.") return - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(!WT.remove_fuel(5)) to_chat(user, span_red("You need more welding fuel to repair this suit.")) return diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 56be88778e4..b0c3cd073a1 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -18,7 +18,7 @@ permeability_coefficient = 0.02 item_flags = 0 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - allowed = list(/obj/item/weapon/tank/emergency/oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs) + allowed = list(/obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton,/obj/item/handcuffs) slowdown = 1.5 armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL @@ -83,7 +83,7 @@ desc = "Yarr." icon_state = "pirate" w_class = ITEMSIZE_NORMAL - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency/oxygen) + allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank/emergency/oxygen) slowdown = 0 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) siemens_coefficient = 0.9 diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm index 4db4e7146e7..ef7e18b2fac 100644 --- a/code/modules/clothing/spacesuits/rig/modules/combat.dm +++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm @@ -14,7 +14,7 @@ icon_state = "flash" interface_name = "mounted flash" interface_desc = "Stuns your target by blinding them with a bright light." - device_type = /obj/item/device/flash + device_type = /obj/item/flash /obj/item/rig_module/grenade_launcher @@ -30,9 +30,9 @@ var/fire_distance = 10 charges = list( - list("flashbang", "flashbang", /obj/item/weapon/grenade/flashbang, 3), - list("smoke bomb", "smoke bomb", /obj/item/weapon/grenade/smokebomb, 3), - list("EMP grenade", "EMP grenade", /obj/item/weapon/grenade/empgrenade, 3), + list("flashbang", "flashbang", /obj/item/grenade/flashbang, 3), + list("smoke bomb", "smoke bomb", /obj/item/grenade/smokebomb, 3), + list("EMP grenade", "EMP grenade", /obj/item/grenade/empgrenade, 3), ) /obj/item/rig_module/grenade_launcher/accepts_item(var/obj/item/input_device, var/mob/living/user) @@ -84,7 +84,7 @@ return 0 charge.charges-- - var/obj/item/weapon/grenade/new_grenade = new charge.product_type(get_turf(H)) + var/obj/item/grenade/new_grenade = new charge.product_type(get_turf(H)) H.visible_message("[H] launches \a [new_grenade]!") new_grenade.activate(H) new_grenade.throw_at(target,fire_force,fire_distance) @@ -99,7 +99,7 @@ fire_force = 15 charges = list( - list("smoke bomb", "smoke bomb", /obj/item/weapon/grenade/smokebomb, 6) + list("smoke bomb", "smoke bomb", /obj/item/grenade/smokebomb, 6) ) /obj/item/rig_module/mounted @@ -116,8 +116,8 @@ interface_name = "mounted laser cannon" interface_desc = "A shoulder-mounted cell-powered laser cannon." - var/gun_type = /obj/item/weapon/gun/energy/lasercannon/mounted - var/obj/item/weapon/gun/gun + var/gun_type = /obj/item/gun/energy/lasercannon/mounted + var/obj/item/gun/gun /obj/item/rig_module/mounted/New() ..() @@ -144,7 +144,7 @@ interface_name = "mounted energy gun" interface_desc = "A forearm-mounted suit-powered energy gun." - gun_type = /obj/item/weapon/gun/energy/gun/mounted + gun_type = /obj/item/gun/energy/gun/mounted /obj/item/rig_module/mounted/taser @@ -160,7 +160,7 @@ interface_name = "mounted taser" interface_desc = "A shoulder-mounted cell-powered taser." - gun_type = /obj/item/weapon/gun/energy/taser/mounted + gun_type = /obj/item/gun/energy/taser/mounted /obj/item/rig_module/mounted/energy_blade @@ -181,12 +181,12 @@ active_power_cost = 10 passive_power_cost = 0 - gun_type = /obj/item/weapon/gun/energy/crossbow/ninja + gun_type = /obj/item/gun/energy/crossbow/ninja /obj/item/rig_module/mounted/energy_blade/process() if(holder && holder.wearer) - if(!(locate(/obj/item/weapon/melee/energy/blade) in holder.wearer)) + if(!(locate(/obj/item/melee/energy/blade) in holder.wearer)) deactivate() return 0 @@ -203,7 +203,7 @@ deactivate() return - var/obj/item/weapon/melee/energy/blade/blade = new(M) + var/obj/item/melee/energy/blade/blade = new(M) blade.creator = M M.put_in_hands(blade) @@ -216,7 +216,7 @@ if(!M) return - for(var/obj/item/weapon/melee/energy/blade/blade in M.contents) + for(var/obj/item/melee/energy/blade/blade in M.contents) M.drop_from_inventory(blade) qdel(blade) @@ -234,7 +234,7 @@ interface_name = "death blossom launcher" interface_desc = "An integrated microfactory that produces poisoned throwing stars from thin air and electricity." - var/fabrication_type = /obj/item/weapon/material/star/ninja + var/fabrication_type = /obj/item/material/star/ninja var/fire_force = 30 var/fire_distance = 10 diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index 21dad8e8c21..72051ddb1e4 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -48,7 +48,7 @@ /obj/item/rig_module/ai_container/process() if(integrated_ai) - var/obj/item/weapon/rig/rig = get_rig() + var/obj/item/rig/rig = get_rig() if(rig && rig.ai_override_enabled) integrated_ai.get_rig_stats = 1 else @@ -57,7 +57,7 @@ /mob/living/Stat() . = ..() if(. && get_rig_stats) - var/obj/item/weapon/rig/rig = get_rig() + var/obj/item/rig/rig = get_rig() if(rig) SetupStat(rig) @@ -78,14 +78,14 @@ else target_ai = locate(/mob/living/silicon/ai) in input_device.contents - var/obj/item/device/aicard/card = ai_card + var/obj/item/aicard/card = ai_card // Downloading from/loading to a terminal. if(istype(input_device,/obj/machinery/computer/aifixer) || istype(input_device,/mob/living/silicon/ai) || istype(input_device,/obj/structure/AIcore/deactivated)) // If we're stealing an AI, make sure we have a card for it. if(!card) - card = new /obj/item/device/aicard(src) + card = new /obj/item/aicard(src) // Terminal interaction only works with an intellicarded AI. if(!istype(card)) @@ -103,7 +103,7 @@ update_verb_holder() return 1 - if(istype(input_device,/obj/item/device/aicard)) + if(istype(input_device,/obj/item/aicard)) // We are carding the AI in our suit. if(integrated_ai) integrated_ai.attackby(input_device,user) @@ -119,7 +119,7 @@ return 1 // Okay, it wasn't a terminal being touched, check for all the simple insertions. - if(input_device.type in list(/obj/item/device/paicard, /obj/item/device/mmi, /obj/item/device/mmi/digital/posibrain)) + if(input_device.type in list(/obj/item/paicard, /obj/item/mmi, /obj/item/mmi/digital/posibrain)) if(integrated_ai) integrated_ai.attackby(input_device,user) // If the transfer was successful, we can clear out our vars. @@ -141,7 +141,7 @@ if(!target) if(ai_card) - if(istype(ai_card,/obj/item/device/aicard)) + if(istype(ai_card,/obj/item/aicard)) ai_card.ui_interact(H, state = deep_inventory_state) else eject_ai(H) @@ -160,7 +160,7 @@ /obj/item/rig_module/ai_container/proc/eject_ai(var/mob/user) if(ai_card) - if(istype(ai_card, /obj/item/device/aicard)) + if(istype(ai_card, /obj/item/aicard)) if(integrated_ai && !integrated_ai.stat) if(user) to_chat(user, "You cannot eject your currently stored AI. Purge it manually.") @@ -190,13 +190,13 @@ if(ai_mob.key && ai_mob.client) - if(istype(ai, /obj/item/device/aicard)) + if(istype(ai, /obj/item/aicard)) if(!ai_card) - ai_card = new /obj/item/device/aicard(src) + ai_card = new /obj/item/aicard(src) - var/obj/item/device/aicard/source_card = ai - var/obj/item/device/aicard/target_card = ai_card + var/obj/item/aicard/source_card = ai + var/obj/item/aicard/target_card = ai_card if(istype(source_card) && istype(target_card)) if(target_card.grab_ai(ai_mob, user)) source_card.clear() @@ -256,9 +256,9 @@ /obj/item/rig_module/datajack/accepts_item(var/obj/item/input_device, var/mob/living/user) - if(istype(input_device,/obj/item/weapon/disk/tech_disk)) + if(istype(input_device,/obj/item/disk/tech_disk)) to_chat(user, "You slot the disk into [src].") - var/obj/item/weapon/disk/tech_disk/disk = input_device + var/obj/item/disk/tech_disk/disk = input_device if(disk.stored) if(load_data(disk.stored)) to_chat(user, span_blue"Download successful; disk erased.")) diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm index 7b27dfb9ac3..8603df45646 100644 --- a/code/modules/clothing/spacesuits/rig/modules/modules.dm +++ b/code/modules/clothing/spacesuits/rig/modules/modules.dm @@ -16,7 +16,7 @@ matter = list(MAT_STEEL = 20000, MAT_PLASTIC = 30000, MAT_GLASS = 5000) var/damage = 0 - var/obj/item/weapon/rig/holder + var/obj/item/rig/holder var/module_cooldown = 10 var/next_use = 0 @@ -141,7 +141,7 @@ // Called when the module is installed into a suit. -/obj/item/rig_module/proc/installed(var/obj/item/weapon/rig/new_holder) +/obj/item/rig_module/proc/installed(var/obj/item/rig/new_holder) holder = new_holder return @@ -237,15 +237,15 @@ /mob/living/carbon/human/Stat() . = ..() - if(. && istype(back,/obj/item/weapon/rig)) - var/obj/item/weapon/rig/R = back + if(. && istype(back,/obj/item/rig)) + var/obj/item/rig/R = back SetupStat(R) - else if(. && istype(belt,/obj/item/weapon/rig)) - var/obj/item/weapon/rig/R = belt + else if(. && istype(belt,/obj/item/rig)) + var/obj/item/rig/R = belt SetupStat(R) -/mob/proc/SetupStat(var/obj/item/weapon/rig/R) +/mob/proc/SetupStat(var/obj/item/rig/R) if(R && !R.canremove && R.installed_modules.len && statpanel("Hardsuit Modules")) var/cell_status = R.cell ? "[R.cell.charge]/[R.cell.maxcharge]" : "ERROR" stat("Suit charge", cell_status) diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm index 35b14616df8..4db0027c803 100644 --- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm +++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm @@ -135,7 +135,7 @@ H.forceMove(T) phase_in(H,get_turf(H)) - for(var/obj/item/weapon/grab/G in H.contents) + for(var/obj/item/grab/G in H.contents) if(G.affecting) phase_out(G.affecting,get_turf(G.affecting)) G.affecting.forceMove(locate(T.x+rand(-1,1),T.y+rand(-1,1),T.z)) @@ -154,7 +154,7 @@ engage_string = "Fabricate Net" - fabrication_type = /obj/item/weapon/energy_net + fabrication_type = /obj/item/energy_net use_power_cost = 70 /obj/item/rig_module/fabricator/energy_net/engage(atom/target) diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/ai_container.dm b/code/modules/clothing/spacesuits/rig/modules/specific/ai_container.dm index d3d62089111..822d8245c83 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/ai_container.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/ai_container.dm @@ -35,12 +35,12 @@ interface_desc = "A socket that supports a range of artificial intelligence systems." var/mob/integrated_ai // Direct reference to the actual mob held in the suit. - var/obj/item/device/aicard/ai_card // Reference to the MMI, posibrain, intellicard or pAI card previously holding the AI. + var/obj/item/aicard/ai_card // Reference to the MMI, posibrain, intellicard or pAI card previously holding the AI. var/obj/item/ai_verbs/verb_holder /obj/item/rig_module/ai_container/process() if(integrated_ai) - var/obj/item/weapon/rig/rig = get_rig() + var/obj/item/rig/rig = get_rig() if(rig && rig.ai_override_enabled) integrated_ai.get_rig_stats = 1 else @@ -49,7 +49,7 @@ /mob/living/Stat() . = ..() if(. && get_rig_stats) - var/obj/item/weapon/rig/rig = get_rig() + var/obj/item/rig/rig = get_rig() if(rig) SetupStat(rig) @@ -70,14 +70,14 @@ else target_ai = locate(/mob/living/silicon/ai) in input_device.contents - var/obj/item/device/aicard/card = ai_card + var/obj/item/aicard/card = ai_card // Downloading from/loading to a terminal. if(istype(input_device,/obj/machinery/computer/aifixer) || istype(input_device,/mob/living/silicon/ai) || istype(input_device,/obj/structure/AIcore/deactivated)) // If we're stealing an AI, make sure we have a card for it. if(!card) - card = new /obj/item/device/aicard(src) + card = new /obj/item/aicard(src) // Terminal interaction only works with an intellicarded AI. if(!istype(card)) @@ -95,7 +95,7 @@ update_verb_holder() return 1 - if(istype(input_device,/obj/item/device/aicard)) + if(istype(input_device,/obj/item/aicard)) // We are carding the AI in our suit. if(integrated_ai) integrated_ai.attackby(input_device,user) @@ -111,7 +111,7 @@ return 1 // Okay, it wasn't a terminal being touched, check for all the simple insertions. - if(input_device.type in list(/obj/item/device/paicard, /obj/item/device/mmi, /obj/item/device/mmi/digital/posibrain)) + if(input_device.type in list(/obj/item/paicard, /obj/item/mmi, /obj/item/mmi/digital/posibrain)) if(integrated_ai) integrated_ai.attackby(input_device,user) // If the transfer was successful, we can clear out our vars. @@ -133,7 +133,7 @@ if(!target) if(ai_card) - if(istype(ai_card,/obj/item/device/aicard)) + if(istype(ai_card,/obj/item/aicard)) ai_card.tgui_interact(H, custom_state = GLOB.tgui_deep_inventory_state) else eject_ai(H) @@ -152,7 +152,7 @@ /obj/item/rig_module/ai_container/proc/eject_ai(var/mob/user) if(ai_card) - if(istype(ai_card, /obj/item/device/aicard)) + if(istype(ai_card, /obj/item/aicard)) if(integrated_ai && !integrated_ai.stat) if(user) to_chat(user, "You cannot eject your currently stored AI. Purge it manually.") @@ -182,13 +182,13 @@ if(ai_mob.key && ai_mob.client) - if(istype(ai, /obj/item/device/aicard)) + if(istype(ai, /obj/item/aicard)) if(!ai_card) - ai_card = new /obj/item/device/aicard(src) + ai_card = new /obj/item/aicard(src) - var/obj/item/device/aicard/source_card = ai - var/obj/item/device/aicard/target_card = ai_card + var/obj/item/aicard/source_card = ai + var/obj/item/aicard/target_card = ai_card if(istype(source_card) && istype(target_card)) if(target_card.grab_ai(ai_mob, user)) source_card.clear() diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/cleaner_launcher.dm b/code/modules/clothing/spacesuits/rig/modules/specific/cleaner_launcher.dm index 46acec15988..323cd756946 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/cleaner_launcher.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/cleaner_launcher.dm @@ -12,7 +12,7 @@ var/fire_distance = 10 charges = list( - list("cleaner grenade", "cleaner grenade", /obj/item/weapon/grenade/chem_grenade/cleaner, 9), + list("cleaner grenade", "cleaner grenade", /obj/item/grenade/chem_grenade/cleaner, 9), ) /obj/item/rig_module/cleaner_launcher/accepts_item(var/obj/item/input_device, var/mob/living/user) @@ -64,7 +64,7 @@ return 0 charge.charges-- - var/obj/item/weapon/grenade/new_grenade = new charge.product_type(get_turf(H)) + var/obj/item/grenade/new_grenade = new charge.product_type(get_turf(H)) H.visible_message("[H] launches \a [new_grenade]!") new_grenade.activate(H) new_grenade.throw_at(target,fire_force,fire_distance) diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/crusher_gauntlets.dm b/code/modules/clothing/spacesuits/rig/modules/specific/crusher_gauntlets.dm index 9d156a13613..a4f2c86c7ea 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/crusher_gauntlets.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/crusher_gauntlets.dm @@ -15,11 +15,11 @@ use_power_cost = 0 active_power_cost = 0 passive_power_cost = 0 - var/obj/item/weapon/kinetic_crusher/machete/gauntlets/rig/stored_gauntlets + var/obj/item/kinetic_crusher/machete/gauntlets/rig/stored_gauntlets /obj/item/rig_module/gauntlets/Initialize() . = ..() - stored_gauntlets = new /obj/item/weapon/kinetic_crusher/machete/gauntlets/rig(src) + stored_gauntlets = new /obj/item/kinetic_crusher/machete/gauntlets/rig(src) stored_gauntlets.storing_module = src /obj/item/rig_module/gauntlets/activate() @@ -51,5 +51,5 @@ var/mob/living/M = holder.wearer if(!M) return - for(var/obj/item/weapon/kinetic_crusher/machete/gauntlets/gaming in M.contents) + for(var/obj/item/kinetic_crusher/machete/gauntlets/gaming in M.contents) M.drop_from_inventory(gaming, src) \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/datajack.dm b/code/modules/clothing/spacesuits/rig/modules/specific/datajack.dm index d863fa06768..f9a7396db17 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/datajack.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/datajack.dm @@ -31,9 +31,9 @@ /obj/item/rig_module/datajack/accepts_item(var/obj/item/input_device, var/mob/living/user) - if(istype(input_device,/obj/item/weapon/disk/tech_disk)) + if(istype(input_device,/obj/item/disk/tech_disk)) to_chat(user, "You slot the disk into [src].") - var/obj/item/weapon/disk/tech_disk/disk = input_device + var/obj/item/disk/tech_disk/disk = input_device if(disk.stored) if(load_data(disk.stored)) to_chat(user, span_blue("Download successful; disk erased.")) diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/device.dm b/code/modules/clothing/spacesuits/rig/modules/specific/device.dm index 044bdc143cf..8df730c90d9 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/device.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/device.dm @@ -36,7 +36,7 @@ icon_state = "flash" interface_name = "mounted flash" interface_desc = "Stuns your target by blinding them with a bright light." - device_type = /obj/item/device/flash/robot + device_type = /obj/item/flash/robot /obj/item/rig_module/device/plasmacutter name = "hardsuit plasma cutter" @@ -48,7 +48,7 @@ suit_overlay_inactive = "plasmacutter" use_power_cost = 0.5 - device_type = /obj/item/weapon/pickaxe/plasmacutter + device_type = /obj/item/pickaxe/plasmacutter /obj/item/rig_module/device/healthscanner name = "health scanner module" @@ -57,7 +57,7 @@ interface_name = "health scanner" interface_desc = "Shows an informative health readout when used on a subject." - device_type = /obj/item/device/healthanalyzer + device_type = /obj/item/healthanalyzer /obj/item/rig_module/device/drill name = "hardsuit drill mount" @@ -69,7 +69,7 @@ suit_overlay_inactive = "mounted-drill" use_power_cost = 0.1 - device_type = /obj/item/weapon/pickaxe/diamonddrill + device_type = /obj/item/pickaxe/diamonddrill /obj/item/rig_module/device/anomaly_scanner name = "hardsuit anomaly scanner" @@ -80,7 +80,7 @@ engage_string = "Begin Scan" usable = 1 selectable = 0 - device_type = /obj/item/device/ano_scanner + device_type = /obj/item/ano_scanner /obj/item/rig_module/device/orescanner name = "ore scanner module" @@ -91,7 +91,7 @@ engage_string = "Begin Scan" usable = 1 selectable = 0 - device_type = /obj/item/weapon/mining_scanner + device_type = /obj/item/mining_scanner /obj/item/rig_module/device/rcd name = "RCD mount" @@ -102,7 +102,7 @@ usable = 1 engage_string = "Configure RCD" - device_type = /obj/item/weapon/rcd/electric/mounted/rig + device_type = /obj/item/rcd/electric/mounted/rig /obj/item/rig_module/device/arch_drill name = "archaeology drill mount" @@ -113,7 +113,7 @@ usable = 1 engage_string = "Configure Drill Depth" - device_type = /obj/item/weapon/pickaxe/excavationdrill + device_type = /obj/item/pickaxe/excavationdrill /obj/item/rig_module/device/paperdispenser name = "hardsuit paper dispenser" @@ -124,7 +124,7 @@ engage_string = "Dispense" usable = 1 selectable = 0 - device_type = /obj/item/weapon/paper_bin + device_type = /obj/item/paper_bin /obj/item/rig_module/device/paperdispenser/engage(atom/target) @@ -143,7 +143,7 @@ interface_desc = "Signatures with style(tm)." engage_string = "Change color" usable = 1 - device_type = /obj/item/weapon/pen/multi + device_type = /obj/item/pen/multi /obj/item/rig_module/device/stamp name = "mounted internal affairs stamp" @@ -158,8 +158,8 @@ /obj/item/rig_module/device/stamp/New() ..() - iastamp = new /obj/item/weapon/stamp/internalaffairs(src) - deniedstamp = new /obj/item/weapon/stamp/denied(src) + iastamp = new /obj/item/stamp/internalaffairs(src) + deniedstamp = new /obj/item/stamp/denied(src) device = iastamp /obj/item/rig_module/device/stamp/engage(atom/target) diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/grenade_launcher.dm b/code/modules/clothing/spacesuits/rig/modules/specific/grenade_launcher.dm index 0ae4a461a30..125daba54fd 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/grenade_launcher.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/grenade_launcher.dm @@ -12,9 +12,9 @@ var/fire_distance = 10 charges = list( - list("flashbang", "flashbang", /obj/item/weapon/grenade/flashbang, 3), - list("smoke bomb", "smoke bomb", /obj/item/weapon/grenade/smokebomb, 3), - list("EMP grenade", "EMP grenade", /obj/item/weapon/grenade/empgrenade, 3), + list("flashbang", "flashbang", /obj/item/grenade/flashbang, 3), + list("smoke bomb", "smoke bomb", /obj/item/grenade/smokebomb, 3), + list("EMP grenade", "EMP grenade", /obj/item/grenade/empgrenade, 3), ) /obj/item/rig_module/grenade_launcher/accepts_item(var/obj/item/input_device, var/mob/living/user) @@ -66,7 +66,7 @@ return 0 charge.charges-- - var/obj/item/weapon/grenade/new_grenade = new charge.product_type(get_turf(H)) + var/obj/item/grenade/new_grenade = new charge.product_type(get_turf(H)) H.visible_message("[H] launches \a [new_grenade]!") new_grenade.activate(H) new_grenade.throw_at(target,fire_force,fire_distance) @@ -81,7 +81,7 @@ fire_force = 15 charges = list( - list("smoke bomb", "smoke bomb", /obj/item/weapon/grenade/smokebomb, 6) + list("smoke bomb", "smoke bomb", /obj/item/grenade/smokebomb, 6) ) /obj/item/rig_module/grenade_launcher/flash @@ -94,5 +94,5 @@ interface_desc = "Discharges loaded grenades against the wearer's location." charges = list( - list("flashbang", "flashbang", /obj/item/weapon/grenade/flashbang, 3) + list("flashbang", "flashbang", /obj/item/grenade/flashbang, 3) ) diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/inhand_fabricator.dm b/code/modules/clothing/spacesuits/rig/modules/specific/inhand_fabricator.dm index 3ea3c09ea82..f3db446f545 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/inhand_fabricator.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/inhand_fabricator.dm @@ -12,7 +12,7 @@ interface_name = "death blossom launcher" interface_desc = "An integrated microfactory that produces poisoned throwing stars from thin air and electricity." - var/fabrication_type = /obj/item/weapon/material/star/ninja + var/fabrication_type = /obj/item/material/star/ninja var/fire_force = 30 var/fire_distance = 10 @@ -50,7 +50,7 @@ engage_string = "Fabricate Net" - fabrication_type = /obj/item/weapon/energy_net + fabrication_type = /obj/item/energy_net use_power_cost = 70 /obj/item/rig_module/fabricator/energy_net/engage(atom/target) diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/jetpack.dm b/code/modules/clothing/spacesuits/rig/modules/specific/jetpack.dm index 6f9f7e38047..032ae53b1cf 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/jetpack.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/jetpack.dm @@ -18,7 +18,7 @@ interface_name = "maneuvering jets" interface_desc = "An inbuilt EVA maneuvering system that runs off the rig air supply." - var/obj/item/weapon/tank/jetpack/rig/jets + var/obj/item/tank/jetpack/rig/jets /obj/item/rig_module/maneuvering_jets/engage() if(!..()) diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/metalfoam_launcher.dm b/code/modules/clothing/spacesuits/rig/modules/specific/metalfoam_launcher.dm index 0843b9f779f..7d2a3c53e78 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/metalfoam_launcher.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/metalfoam_launcher.dm @@ -11,5 +11,5 @@ fire_force = 15 charges = list( - list("metalfoam", "metalfoam", /obj/item/weapon/grenade/chem_grenade/metalfoam, 5) + list("metalfoam", "metalfoam", /obj/item/grenade/chem_grenade/metalfoam, 5) ) diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/mounted_gun.dm b/code/modules/clothing/spacesuits/rig/modules/specific/mounted_gun.dm index 97db6b3281f..7ac3561c91f 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/mounted_gun.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/mounted_gun.dm @@ -12,8 +12,8 @@ interface_name = "mounted laser cannon" interface_desc = "A shoulder-mounted cell-powered laser cannon." - var/gun_type = /obj/item/weapon/gun/energy/lasercannon/mounted - var/obj/item/weapon/gun/gun + var/gun_type = /obj/item/gun/energy/lasercannon/mounted + var/obj/item/gun/gun /obj/item/rig_module/mounted/New() ..() @@ -40,7 +40,7 @@ interface_name = "mounted energy gun" interface_desc = "A forearm-mounted suit-powered energy gun." - gun_type = /obj/item/weapon/gun/energy/gun/mounted + gun_type = /obj/item/gun/energy/gun/mounted /obj/item/rig_module/mounted/taser @@ -56,7 +56,7 @@ interface_name = "mounted taser" interface_desc = "A shoulder-mounted cell-powered taser." - gun_type = /obj/item/weapon/gun/energy/taser/mounted + gun_type = /obj/item/gun/energy/taser/mounted /obj/item/rig_module/mounted/energy_blade @@ -77,12 +77,12 @@ active_power_cost = 10 passive_power_cost = 0 - gun_type = /obj/item/weapon/gun/energy/crossbow/ninja + gun_type = /obj/item/gun/energy/crossbow/ninja /obj/item/rig_module/mounted/energy_blade/process() if(holder && holder.wearer) - if(!(locate(/obj/item/weapon/melee/energy/blade) in holder.wearer)) + if(!(locate(/obj/item/melee/energy/blade) in holder.wearer)) deactivate() return 0 @@ -99,7 +99,7 @@ deactivate() return - var/obj/item/weapon/melee/energy/blade/blade = new(M) + var/obj/item/melee/energy/blade/blade = new(M) blade.creator = M M.put_in_hands(blade) @@ -112,7 +112,7 @@ if(!M) return - for(var/obj/item/weapon/melee/energy/blade/blade in M.contents) + for(var/obj/item/melee/energy/blade/blade in M.contents) M.drop_from_inventory(blade) qdel(blade) @@ -135,12 +135,12 @@ active_power_cost = 0 passive_power_cost = 0 - gun_type = /obj/item/weapon/gun/energy/temperature/mounted + gun_type = /obj/item/gun/energy/temperature/mounted /obj/item/rig_module/mounted/mop/process() if(holder && holder.wearer) - if(!(locate(/obj/item/weapon/mop_deploy) in holder.wearer)) + if(!(locate(/obj/item/mop_deploy) in holder.wearer)) deactivate() return 0 @@ -157,7 +157,7 @@ deactivate() return - var/obj/item/weapon/mop_deploy/blade = new(M) + var/obj/item/mop_deploy/blade = new(M) blade.creator = M M.put_in_hands(blade) @@ -170,6 +170,6 @@ if(!M) return - for(var/obj/item/weapon/mop_deploy/blade in M.contents) + for(var/obj/item/mop_deploy/blade in M.contents) M.drop_from_inventory(blade) qdel(blade) diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/mounted_gun_vr.dm b/code/modules/clothing/spacesuits/rig/modules/specific/mounted_gun_vr.dm index 96f609a1dac..f979b9f91c7 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/mounted_gun_vr.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/mounted_gun_vr.dm @@ -9,4 +9,4 @@ interface_name = "mounted sizegun" interface_desc = "A wrist-mounted, hardsuit cell-powered, size gun. Features interface-based target size adjustment for hands-free size-altering shenanigans." - gun_type = /obj/item/weapon/gun/energy/sizegun/mounted + gun_type = /obj/item/gun/energy/sizegun/mounted diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/pat_module_vr.dm b/code/modules/clothing/spacesuits/rig/modules/specific/pat_module_vr.dm index 86880b897ed..ba8fb9489fa 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/pat_module_vr.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/pat_module_vr.dm @@ -24,7 +24,7 @@ /* var/message = "[H] has activated \a [src] in [get_area(T)] at position [T.x],[T.y],[T.z], giving them full access for medical rescue." - var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/heads/captain(null) + var/obj/item/radio/headset/a = new /obj/item/radio/headset/heads/captain(null) a.icon = icon a.icon_state = icon_state a.autosay(message, "Security Subsystem", "Command") diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/teleporter.dm b/code/modules/clothing/spacesuits/rig/modules/specific/teleporter.dm index 1f533f98fed..d1884b53667 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/teleporter.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/teleporter.dm @@ -71,7 +71,7 @@ H.forceMove(T) phase_in(H,get_turf(H)) - for(var/obj/item/weapon/grab/G in H.contents) + for(var/obj/item/grab/G in H.contents) if(G.affecting) phase_out(G.affecting,get_turf(G.affecting)) G.affecting.forceMove(locate(T.x+rand(-1,1),T.y+rand(-1,1),T.z)) diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index a92dfe1039e..7dde2fd816c 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -28,7 +28,7 @@ disruptive = 0 var/device_type - var/obj/item/device + var/obj/item /obj/item/rig_module/device/plasmacutter name = "hardsuit plasma cutter" @@ -40,7 +40,7 @@ suit_overlay_inactive = "plasmacutter" use_power_cost = 0.5 - device_type = /obj/item/weapon/pickaxe/plasmacutter + device_type = /obj/item/pickaxe/plasmacutter /obj/item/rig_module/device/healthscanner name = "health scanner module" @@ -49,7 +49,7 @@ interface_name = "health scanner" interface_desc = "Shows an informative health readout when used on a subject." - device_type = /obj/item/device/healthanalyzer + device_type = /obj/item/healthanalyzer /obj/item/rig_module/device/drill name = "hardsuit drill mount" @@ -61,7 +61,7 @@ suit_overlay_inactive = "mounted-drill" use_power_cost = 0.1 - device_type = /obj/item/weapon/pickaxe/diamonddrill + device_type = /obj/item/pickaxe/diamonddrill /obj/item/rig_module/device/anomaly_scanner name = "hardsuit anomaly scanner" @@ -72,7 +72,7 @@ engage_string = "Begin Scan" usable = 1 selectable = 0 - device_type = /obj/item/device/ano_scanner + device_type = /obj/item/ano_scanner /obj/item/rig_module/device/orescanner name = "ore scanner module" @@ -83,7 +83,7 @@ engage_string = "Begin Scan" usable = 1 selectable = 0 - device_type = /obj/item/weapon/mining_scanner + device_type = /obj/item/mining_scanner /obj/item/rig_module/device/rcd name = "RCD mount" @@ -94,7 +94,7 @@ usable = 1 engage_string = "Configure RCD" - device_type = /obj/item/weapon/rcd/electric/mounted/rig + device_type = /obj/item/rcd/electric/mounted/rig /obj/item/rig_module/device/arch_drill name = "archaeology drill mount" @@ -105,7 +105,7 @@ usable = 1 engage_string = "Configure Drill Depth" - device_type = /obj/item/weapon/pickaxe/excavationdrill + device_type = /obj/item/pickaxe/excavationdrill /obj/item/rig_module/device/New() ..() @@ -363,7 +363,7 @@ interface_name = "maneuvering jets" interface_desc = "An inbuilt EVA maneuvering system that runs off the rig air supply." - var/obj/item/weapon/tank/jetpack/rig/jets + var/obj/item/tank/jetpack/rig/jets /obj/item/rig_module/maneuvering_jets/engage() if(!..()) @@ -430,12 +430,12 @@ active_power_cost = 0 passive_power_cost = 0 - gun_type = /obj/item/weapon/gun/energy/temperature/mounted + gun_type = /obj/item/gun/energy/temperature/mounted /obj/item/rig_module/mounted/mop/process() if(holder && holder.wearer) - if(!(locate(/obj/item/weapon/mop_deploy) in holder.wearer)) + if(!(locate(/obj/item/mop_deploy) in holder.wearer)) deactivate() return 0 @@ -452,7 +452,7 @@ deactivate() return - var/obj/item/weapon/mop_deploy/blade = new(M) + var/obj/item/mop_deploy/blade = new(M) blade.creator = M M.put_in_hands(blade) @@ -465,7 +465,7 @@ if(!M) return - for(var/obj/item/weapon/mop_deploy/blade in M.contents) + for(var/obj/item/mop_deploy/blade in M.contents) M.drop_from_inventory(blade) qdel(blade) @@ -486,7 +486,7 @@ var/fire_distance = 10 charges = list( - list("cleaner grenade", "cleaner grenade", /obj/item/weapon/grenade/chem_grenade/cleaner, 9), + list("cleaner grenade", "cleaner grenade", /obj/item/grenade/chem_grenade/cleaner, 9), ) /obj/item/rig_module/cleaner_launcher/accepts_item(var/obj/item/input_device, var/mob/living/user) @@ -538,7 +538,7 @@ return 0 charge.charges-- - var/obj/item/weapon/grenade/new_grenade = new charge.product_type(get_turf(H)) + var/obj/item/grenade/new_grenade = new charge.product_type(get_turf(H)) H.visible_message("[H] launches \a [new_grenade]!") new_grenade.activate(H) new_grenade.throw_at(target,fire_force,fire_distance) @@ -552,7 +552,7 @@ engage_string = "Dispense" usable = 1 selectable = 0 - device_type = /obj/item/weapon/paper_bin + device_type = /obj/item/paper_bin /obj/item/rig_module/device/paperdispenser/engage(atom/target) @@ -571,7 +571,7 @@ interface_desc = "Signatures with style(tm)." engage_string = "Change color" usable = 1 - device_type = /obj/item/weapon/pen/multi + device_type = /obj/item/pen/multi /obj/item/rig_module/device/stamp name = "mounted internal affairs stamp" @@ -586,8 +586,8 @@ /obj/item/rig_module/device/stamp/New() ..() - iastamp = new /obj/item/weapon/stamp/internalaffairs(src) - deniedstamp = new /obj/item/weapon/stamp/denied(src) + iastamp = new /obj/item/stamp/internalaffairs(src) + deniedstamp = new /obj/item/stamp/denied(src) device = iastamp /obj/item/rig_module/device/stamp/engage(atom/target) diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index c958d4016dd..e7613d87a24 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -6,7 +6,7 @@ * Defines the behavior of hardsuits/rigs/power armour. */ -/obj/item/weapon/rig +/obj/item/rig name = "hardsuit control module" icon = 'icons/obj/rig_modules.dmi' desc = "A back-mounted hardsuit deployment and control mechanism." @@ -43,16 +43,16 @@ var/helm_type = /obj/item/clothing/head/helmet/space/rig var/boot_type = /obj/item/clothing/shoes/magboots/rig var/glove_type = /obj/item/clothing/gloves/gauntlets/rig - var/cell_type = /obj/item/weapon/cell/high - var/air_type = /obj/item/weapon/tank/oxygen + var/cell_type = /obj/item/cell/high + var/air_type = /obj/item/tank/oxygen //Component/device holders. - var/obj/item/weapon/tank/air_supply // Air tank, if any. + var/obj/item/tank/air_supply // Air tank, if any. var/obj/item/clothing/shoes/boots = null // Deployable boots, if any. var/obj/item/clothing/suit/space/rig/chest // Deployable chestpiece, if any. var/obj/item/clothing/head/helmet/space/rig/helmet = null // Deployable helmet, if any. var/obj/item/clothing/gloves/gauntlets/rig/gloves = null // Deployable gauntlets, if any. - var/obj/item/weapon/cell/cell // Power supply, if any. + var/obj/item/cell/cell // Power supply, if any. var/obj/item/rig_module/selected_module = null // Primary system (used with middle-click) var/obj/item/rig_module/vision/visor // Kinda shitty to have a var for a module, but saves time. var/obj/item/rig_module/voice/speech // As above. @@ -100,7 +100,7 @@ // Action button action_button_name = "Hardsuit Interface" -/obj/item/weapon/rig/New() +/obj/item/rig/New() ..() suit_state = icon_state @@ -127,18 +127,18 @@ air_supply = new air_type(src) if(glove_type) gloves = new glove_type(src) - verbs |= /obj/item/weapon/rig/proc/toggle_gauntlets + verbs |= /obj/item/rig/proc/toggle_gauntlets if(helm_type) helmet = new helm_type(src) - verbs |= /obj/item/weapon/rig/proc/toggle_helmet + verbs |= /obj/item/rig/proc/toggle_helmet if(boot_type) boots = new boot_type(src) - verbs |= /obj/item/weapon/rig/proc/toggle_boots + verbs |= /obj/item/rig/proc/toggle_boots if(chest_type) chest = new chest_type(src) if(allowed) chest.allowed = allowed - verbs |= /obj/item/weapon/rig/proc/toggle_chest + verbs |= /obj/item/rig/proc/toggle_chest for(var/obj/item/piece in list(gloves,helmet,boots,chest)) if(!istype(piece)) @@ -158,7 +158,7 @@ update_icon(1) -/obj/item/weapon/rig/Destroy() +/obj/item/rig/Destroy() for(var/obj/item/piece in list(gloves,boots,helmet,chest,cell,air_supply)) var/mob/living/M = piece.loc if(istype(M)) @@ -177,7 +177,7 @@ spark_system = null return ..() -/obj/item/weapon/rig/examine(mob/user) +/obj/item/rig/examine(mob/user) . = ..() if(wearer) for(var/obj/item/piece in list(helmet,gloves,chest,boots)) @@ -195,7 +195,7 @@ . += "It's equipped with [english_list(installed_modules)]." // We only care about processing when we're on a mob -/obj/item/weapon/rig/Moved(old_loc, direction, forced) +/obj/item/rig/Moved(old_loc, direction, forced) if(ismob(loc)) START_PROCESSING(SSobj, src) else @@ -211,7 +211,7 @@ M.unEquip(piece) piece.forceMove(src) -/obj/item/weapon/rig/get_worn_icon_file(var/body_type,var/slot_name,var/default_icon,var/inhands) +/obj/item/rig/get_worn_icon_file(var/body_type,var/slot_name,var/default_icon,var/inhands) if(!inhands && (slot_name == slot_back_str || slot_name == slot_belt_str)) if(icon_override) return icon_override @@ -220,7 +220,7 @@ return ..() -/obj/item/weapon/rig/proc/suit_is_deployed() +/obj/item/rig/proc/suit_is_deployed() if(!istype(wearer) || src.loc != wearer || (wearer.back != src && wearer.belt != src)) return 0 if(helm_type && !(helmet && wearer.head == helmet)) @@ -236,7 +236,7 @@ // Updates pressure protection // Seal = 1 sets protection // Seal = 0 unsets protection -/obj/item/weapon/rig/proc/update_airtight(var/obj/item/piece, var/seal = 0) +/obj/item/rig/proc/update_airtight(var/obj/item/piece, var/seal = 0) if(seal == 1) piece.min_pressure_protection = rigsuit_min_pressure piece.max_pressure_protection = rigsuit_max_pressure @@ -248,7 +248,7 @@ return -/obj/item/weapon/rig/proc/reset() +/obj/item/rig/proc/reset() offline = 2 canremove = TRUE for(var/obj/item/piece in list(helmet,boots,gloves,chest)) @@ -258,7 +258,7 @@ update_airtight(piece, 0) // Unseal update_icon(1) -/obj/item/weapon/rig/proc/cut_suit() +/obj/item/rig/proc/cut_suit() offline = 2 canremove = TRUE toggle_piece("helmet", loc, ONLY_RETRACT, TRUE) @@ -267,7 +267,7 @@ toggle_piece("chest", loc, ONLY_RETRACT, TRUE) update_icon(1) -/obj/item/weapon/rig/proc/toggle_seals(var/mob/living/carbon/human/M,var/instant) +/obj/item/rig/proc/toggle_seals(var/mob/living/carbon/human/M,var/instant) if(sealing) return @@ -400,23 +400,23 @@ update_component_sealed() update_icon(1) -/obj/item/weapon/rig/proc/update_component_sealed() +/obj/item/rig/proc/update_component_sealed() for(var/obj/item/piece in list(helmet,boots,gloves,chest)) if(canremove) update_airtight(piece, 0) // Unseal else update_airtight(piece, 1) // Seal -/obj/item/weapon/rig/ui_action_click() +/obj/item/rig/ui_action_click() toggle_cooling(usr) -/obj/item/weapon/rig/proc/toggle_cooling(var/mob/user) +/obj/item/rig/proc/toggle_cooling(var/mob/user) if(cooling_on) turn_cooling_off(user) else turn_cooling_on(user) -/obj/item/weapon/rig/proc/turn_cooling_on(var/mob/user) +/obj/item/rig/proc/turn_cooling_on(var/mob/user) if(!cell) return if(cell.charge <= 0) @@ -430,14 +430,14 @@ to_chat(usr, "You switch \the [src]'s cooling system on.") -/obj/item/weapon/rig/proc/turn_cooling_off(var/mob/user, var/failed) +/obj/item/rig/proc/turn_cooling_off(var/mob/user, var/failed) if(failed) visible_message("\The [src]'s cooling system clicks and whines as it powers down.") else to_chat(usr, "You switch \the [src]'s cooling system off.") cooling_on = 0 -/obj/item/weapon/rig/proc/get_environment_temperature() +/obj/item/rig/proc/get_environment_temperature() if (ishuman(loc)) var/mob/living/carbon/human/H = loc if(istype(H.loc, /obj/mecha)) @@ -457,7 +457,7 @@ return environment.temperature -/obj/item/weapon/rig/proc/attached_to_user(mob/M) +/obj/item/rig/proc/attached_to_user(mob/M) if (!ishuman(M)) return 0 @@ -468,7 +468,7 @@ return 1 -/obj/item/weapon/rig/proc/coolingProcess() +/obj/item/rig/proc/coolingProcess() if (!cooling_on || !cell) return @@ -507,7 +507,7 @@ if(cell.charge <= 0) turn_cooling_off(H, 1) -/obj/item/weapon/rig/process() +/obj/item/rig/process() // Not on a mob...? if(!ismob(loc)) if(wearer?.wearing_rig == src) @@ -563,7 +563,7 @@ for(var/obj/item/rig_module/module in installed_modules) cell.use(module.process()*10) -/obj/item/weapon/rig/proc/check_power_cost(var/mob/living/user, var/cost, var/use_unconcious, var/obj/item/rig_module/mod, var/user_is_ai) +/obj/item/rig/proc/check_power_cost(var/mob/living/user, var/cost, var/use_unconcious, var/obj/item/rig_module/mod, var/user_is_ai) if(!istype(user)) return 0 @@ -599,7 +599,7 @@ cell.use(cost*10) return 1 -/obj/item/weapon/rig/update_icon(var/update_mob_icon) +/obj/item/rig/update_icon(var/update_mob_icon) cut_overlays() if(!mob_icon || update_mob_icon) @@ -624,7 +624,7 @@ wearer.update_inv_back() return -/obj/item/weapon/rig/proc/check_suit_access(var/mob/living/carbon/human/user, var/do_message = TRUE) +/obj/item/rig/proc/check_suit_access(var/mob/living/carbon/human/user, var/do_message = TRUE) if(!security_check_enabled) return 1 @@ -648,16 +648,16 @@ return 1 -/obj/item/weapon/rig/proc/notify_ai(var/message) +/obj/item/rig/proc/notify_ai(var/message) for(var/obj/item/rig_module/ai_container/module in installed_modules) if(module.integrated_ai && module.integrated_ai.client && !module.integrated_ai.stat) to_chat(module.integrated_ai, "[message]") . = 1 -/obj/item/weapon/rig/equipped(mob/living/carbon/human/M) +/obj/item/rig/equipped(mob/living/carbon/human/M) ..() - if(istype(M.back, /obj/item/weapon/rig) && istype(M.belt, /obj/item/weapon/rig)) + if(istype(M.back, /obj/item/rig) && istype(M.belt, /obj/item/rig)) to_chat(M, "You try to put on the [src], but it won't fit.") if(M && (M.back == src || M.belt == src)) if(!M.unEquip(src)) @@ -680,7 +680,7 @@ wearer.wearing_rig = src update_icon() -/obj/item/weapon/rig/proc/toggle_piece(var/piece, var/mob/living/carbon/human/H, var/deploy_mode, var/forced = FALSE) +/obj/item/rig/proc/toggle_piece(var/piece, var/mob/living/carbon/human/H, var/deploy_mode, var/forced = FALSE) if((sealing || !cell || !cell.charge) && !forced) return @@ -750,7 +750,7 @@ if(piece == "helmet" && helmet?.light_system == STATIC_LIGHT) helmet.update_light() -/obj/item/weapon/rig/proc/deploy(mob/M,var/sealed) +/obj/item/rig/proc/deploy(mob/M,var/sealed) var/mob/living/carbon/human/H = M @@ -787,7 +787,7 @@ for(var/piece in list("helmet","gauntlets","chest","boots")) toggle_piece(piece, H, ONLY_DEPLOY) -/obj/item/weapon/rig/dropped(var/mob/user) +/obj/item/rig/dropped(var/mob/user) ..() for(var/piece in list("helmet","gauntlets","chest","boots")) toggle_piece(piece, user, ONLY_RETRACT) @@ -796,10 +796,10 @@ wearer = null //Todo -/obj/item/weapon/rig/proc/malfunction() +/obj/item/rig/proc/malfunction() return 0 -/obj/item/weapon/rig/emp_act(severity_class) +/obj/item/rig/emp_act(severity_class) //set malfunctioning if(emp_protection < 30) //for ninjas, really. malfunctioning += 10 @@ -812,14 +812,14 @@ //possibly damage some modules take_hit((100/severity_class), "electrical pulse", 1) -/obj/item/weapon/rig/proc/shock(mob/user) +/obj/item/rig/proc/shock(mob/user) if (electrocute_mob(user, cell, src)) //electrocute_mob() handles removing charge from the cell, no need to do that here. spark_system.start() if(user.stunned) return 1 return 0 -/obj/item/weapon/rig/proc/take_hit(damage, source, is_emp=0) +/obj/item/rig/proc/take_hit(damage, source, is_emp=0) if(!installed_modules.len) return @@ -865,7 +865,7 @@ to_chat(wearer, "The [source] has damaged your [dam_module.interface_name]!") dam_module.deactivate() -/obj/item/weapon/rig/proc/malfunction_check(var/mob/living/carbon/human/user) +/obj/item/rig/proc/malfunction_check(var/mob/living/carbon/human/user) if(malfunction_delay) if(offline) to_chat(user, "The suit is completely unresponsive.") @@ -874,7 +874,7 @@ return 1 return 0 -/obj/item/weapon/rig/proc/ai_can_move_suit(var/mob/user, var/check_user_module = 0, var/check_for_ai = 0) +/obj/item/rig/proc/ai_can_move_suit(var/mob/user, var/check_user_module = 0, var/check_for_ai = 0) if(check_for_ai) if(!(locate(/obj/item/rig_module/ai_container) in contents)) @@ -911,13 +911,13 @@ return 0 return 1 -/obj/item/weapon/rig/proc/force_rest(var/mob/user) +/obj/item/rig/proc/force_rest(var/mob/user) if(!ai_can_move_suit(user, check_user_module = 1)) return wearer.lay_down() to_chat(user, "\The [wearer] is now [wearer.resting ? "resting" : "getting up"].") -/obj/item/weapon/rig/proc/forced_move(var/direction, var/mob/user) +/obj/item/rig/proc/forced_move(var/direction, var/mob/user) // Why is all this shit in client/Move()? Who knows? if(world.time < wearer_move_delay) @@ -992,13 +992,13 @@ return loc.get_rig() return null -/obj/item/weapon/rig/get_rig() +/obj/item/rig/get_rig() return src /mob/living/carbon/human/get_rig() - if(istype(back, /obj/item/weapon/rig)) + if(istype(back, /obj/item/rig)) return back - else if(istype(belt, /obj/item/weapon/rig)) + else if(istype(belt, /obj/item/rig)) return belt else return null diff --git a/code/modules/clothing/spacesuits/rig/rig_attackby.dm b/code/modules/clothing/spacesuits/rig/rig_attackby.dm index e6c48734dfc..2857ae5c47f 100644 --- a/code/modules/clothing/spacesuits/rig/rig_attackby.dm +++ b/code/modules/clothing/spacesuits/rig/rig_attackby.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/rig/attackby(obj/item/W as obj, mob/living/user as mob) +/obj/item/rig/attackby(obj/item/W as obj, mob/living/user as mob) if(!istype(user)) return 0 @@ -41,14 +41,14 @@ if(open) // Hacking. - if(W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/device/multitool)) + if(W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/multitool)) if(open) wires.Interact(user) else to_chat(user, "You can't reach the wiring.") return // Air tank. - if(istype(W,/obj/item/weapon/tank)) //Todo, some kind of check for suits without integrated air supplies. + if(istype(W,/obj/item/tank)) //Todo, some kind of check for suits without integrated air supplies. if(air_supply) to_chat(user, "\The [src] already has a tank installed.") @@ -93,7 +93,7 @@ update_icon() return 1 - else if(!cell && istype(W,/obj/item/weapon/cell)) + else if(!cell && istype(W,/obj/item/cell)) if(!user.unEquip(W)) return @@ -181,14 +181,14 @@ ..() -/obj/item/weapon/rig/attack_hand(var/mob/user) +/obj/item/rig/attack_hand(var/mob/user) if(electrified != 0) if(shock(user)) //Handles removing charge from the cell, as well. No need to do that here. return ..() -/obj/item/weapon/rig/emag_act(var/remaining_charges, var/mob/user) +/obj/item/rig/emag_act(var/remaining_charges, var/mob/user) if(!subverted) LAZYCLEARLIST(req_access) LAZYCLEARLIST(req_one_access) diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index 600e89a82c9..5d36c194f55 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -42,7 +42,7 @@ /obj/item/clothing/suit/space/rig name = "chestpiece" - 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) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS @@ -61,7 +61,7 @@ ) supporting_limbs = list() species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI) //vox, diona, and zaddat can't use hardsuits not designed for them - var/obj/item/weapon/material/knife/tacknife + var/obj/item/material/knife/tacknife max_pressure_protection = null min_pressure_protection = null @@ -77,7 +77,7 @@ ..() /obj/item/clothing/suit/space/rig/attackby(var/obj/item/I, var/mob/living/M) - if(istype(I, /obj/item/weapon/material/knife/tacknife)) + if(istype(I, /obj/item/material/knife/tacknife)) if(tacknife) return M.drop_item() @@ -101,7 +101,7 @@ if(!istype(H) || (!H.back && !H.belt)) return 0 - var/obj/item/weapon/rig/suit = H.back + var/obj/item/rig/suit = H.back if(!suit || !istype(suit) || !suit.installed_modules.len) return 0 @@ -124,7 +124,7 @@ /obj/item/clothing/suit/lightrig name = "suit" - allowed = list(/obj/item/device/flashlight) + allowed = list(/obj/item/flashlight) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS diff --git a/code/modules/clothing/spacesuits/rig/rig_tgui.dm b/code/modules/clothing/spacesuits/rig/rig_tgui.dm index 66c7266d3dd..2137e9f49f0 100644 --- a/code/modules/clothing/spacesuits/rig/rig_tgui.dm +++ b/code/modules/clothing/spacesuits/rig/rig_tgui.dm @@ -8,7 +8,7 @@ * tgui_interact() is the proc that opens the UI. It doesn't really do anything else, unlike NanoV1. * We add an extra argument, custom_state, for the things that want a custom state for their UI. */ -/obj/item/weapon/rig/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui, datum/tgui_state/custom_state) +/obj/item/rig/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui, datum/tgui_state/custom_state) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, (loc != usr ? ai_interface_path : interface_path), interface_title) @@ -19,7 +19,7 @@ /* * tgui_state() gives the UI the state to use by default. */ -/obj/item/weapon/rig/tgui_state() +/obj/item/rig/tgui_state() return GLOB.tgui_inventory_state /* @@ -28,7 +28,7 @@ * not authorized to do so. * This saves us two lines of code in tgui_act(). */ -/obj/item/weapon/rig/tgui_status(mob/user, datum/tgui_state/state) +/obj/item/rig/tgui_status(mob/user, datum/tgui_state/state) . = ..() if(!check_suit_access(user, FALSE)) // don't send a message to the user, this is a UI thing // Forces the UI to never go interactive, @@ -38,7 +38,7 @@ /* * tgui_data() is the heavy lifter, it gives the UI it's relevant datastructure every SStgui tick. */ -/obj/item/weapon/rig/tgui_data(mob/user) +/obj/item/rig/tgui_data(mob/user) var/list/data = list() if(selected_module) @@ -120,7 +120,7 @@ /* * tgui_act() is the TGUI equivelent of Topic(). It's responsible for all of the "actions" you can take in the UI. */ -/obj/item/weapon/rig/tgui_act(action, params) +/obj/item/rig/tgui_act(action, params) // This parent call is very important, as it's responsible for invoking tgui_status and checking our state's rules. if(..()) return TRUE diff --git a/code/modules/clothing/spacesuits/rig/rig_verbs.dm b/code/modules/clothing/spacesuits/rig/rig_verbs.dm index 3cc91f6249a..44e51741a29 100644 --- a/code/modules/clothing/spacesuits/rig/rig_verbs.dm +++ b/code/modules/clothing/spacesuits/rig/rig_verbs.dm @@ -1,5 +1,5 @@ // Interface for humans. -/obj/item/weapon/rig/verb/hardsuit_interface() +/obj/item/rig/verb/hardsuit_interface() set name = "Open Hardsuit Interface" set desc = "Open the hardsuit system interface." @@ -10,11 +10,11 @@ tgui_interact(usr) // So the UI button clicks come here -/obj/item/weapon/rig/ui_action_click() +/obj/item/rig/ui_action_click() if(usr == wearer && (wearer.back == src || wearer.belt == src)) tgui_interact(usr) -/obj/item/weapon/rig/verb/toggle_vision() +/obj/item/rig/verb/toggle_vision() set name = "Toggle Visor" set desc = "Turns your rig visor off or on." @@ -44,7 +44,7 @@ else visor.deactivate() -/obj/item/weapon/rig/proc/toggle_helmet() +/obj/item/rig/proc/toggle_helmet() set name = "Toggle Helmet" set desc = "Deploys or retracts your helmet." @@ -60,7 +60,7 @@ toggle_piece("helmet",wearer) -/obj/item/weapon/rig/proc/toggle_chest() +/obj/item/rig/proc/toggle_chest() set name = "Toggle Chestpiece" set desc = "Deploys or retracts your chestpiece." @@ -72,7 +72,7 @@ toggle_piece("chest",wearer) -/obj/item/weapon/rig/proc/toggle_gauntlets() +/obj/item/rig/proc/toggle_gauntlets() set name = "Toggle Gauntlets" set desc = "Deploys or retracts your gauntlets." @@ -88,7 +88,7 @@ toggle_piece("gauntlets",wearer) -/obj/item/weapon/rig/proc/toggle_boots() +/obj/item/rig/proc/toggle_boots() set name = "Toggle Boots" set desc = "Deploys or retracts your boots." @@ -104,7 +104,7 @@ toggle_piece("boots",wearer) -/obj/item/weapon/rig/verb/deploy_suit() +/obj/item/rig/verb/deploy_suit() set name = "Deploy Hardsuit" set desc = "Deploys helmet, gloves and boots." @@ -123,7 +123,7 @@ deploy(wearer) -/obj/item/weapon/rig/verb/toggle_seals_verb() +/obj/item/rig/verb/toggle_seals_verb() set name = "Toggle Hardsuit" set desc = "Activates or deactivates your rig." @@ -139,7 +139,7 @@ toggle_seals(wearer) -/obj/item/weapon/rig/verb/switch_vision_mode() +/obj/item/rig/verb/switch_vision_mode() set name = "Switch Vision Mode" set desc = "Switches between available vision modes." @@ -169,7 +169,7 @@ visor.engage() -/obj/item/weapon/rig/verb/alter_voice() +/obj/item/rig/verb/alter_voice() set name = "Configure Voice Synthesiser" set desc = "Toggles or configures your voice synthesizer." @@ -193,7 +193,7 @@ speech.engage() -/obj/item/weapon/rig/verb/select_module() +/obj/item/rig/verb/select_module() set name = "Select Module" set desc = "Selects a module as your primary system." @@ -229,7 +229,7 @@ selected_module = module to_chat(usr, span_blue("Primary system is now: [selected_module.interface_name].")) -/obj/item/weapon/rig/verb/toggle_module() +/obj/item/rig/verb/toggle_module() set name = "Toggle Module" set desc = "Toggle a system module." @@ -267,7 +267,7 @@ to_chat(usr, span_blue("You attempt to activate \the [module.interface_name].")) module.activate() -/obj/item/weapon/rig/verb/engage_module() +/obj/item/rig/verb/engage_module() set name = "Engage Module" set desc = "Engages a system module." diff --git a/code/modules/clothing/spacesuits/rig/rig_wiring.dm b/code/modules/clothing/spacesuits/rig/rig_wiring.dm index c7fec3c5d6e..09c04c10428 100644 --- a/code/modules/clothing/spacesuits/rig/rig_wiring.dm +++ b/code/modules/clothing/spacesuits/rig/rig_wiring.dm @@ -1,6 +1,6 @@ /datum/wires/rig randomize = TRUE - holder_type = /obj/item/weapon/rig + holder_type = /obj/item/rig wire_count = 5 /datum/wires/rig/New(atom/_holder) @@ -14,7 +14,7 @@ */ /datum/wires/rig/on_cut(wire, mend) - var/obj/item/weapon/rig/rig = holder + var/obj/item/rig/rig = holder switch(wire) if(WIRE_RIG_SECURITY) if(mend) @@ -25,7 +25,7 @@ rig.shock(usr,100) /datum/wires/rig/on_pulse(wire) - var/obj/item/weapon/rig/rig = holder + var/obj/item/rig/rig = holder switch(wire) if(WIRE_RIG_SECURITY) rig.security_check_enabled = !rig.security_check_enabled @@ -47,7 +47,7 @@ rig.shock(usr,100) /datum/wires/rig/interactable(mob/user) - var/obj/item/weapon/rig/rig = holder + var/obj/item/rig/rig = holder if(rig.open) return TRUE return FALSE \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index 89d854b370b..2bbd129fff2 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -2,7 +2,7 @@ * UNATHI */ -/obj/item/weapon/rig/breacher +/obj/item/rig/breacher name = "\improper NT breacher chassis control module" desc = "A cheap NT knock-off of an Unathi battle-rig. Looks like a fish, moves like a fish, steers like a cow." suit_type = "\improper NT breacher" @@ -18,7 +18,7 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/breacher boot_type = /obj/item/clothing/shoes/magboots/rig/breacher -/obj/item/weapon/rig/breacher/fancy +/obj/item/rig/breacher/fancy name = "breacher chassis control module" desc = "An authentic Unathi breacher chassis. Huge, bulky and absurdly heavy. It must be like wearing a tank." suit_type = "breacher chassis" @@ -41,7 +41,7 @@ * VOX */ -/obj/item/weapon/rig/vox //Just to get the flags set up +/obj/item/rig/vox //Just to get the flags set up name = "alien control module" desc = "This metal box writhes and squirms as if it were alive..." suit_type = "alien" @@ -52,14 +52,14 @@ siemens_coefficient = 0.2 offline_slowdown = 2.5 allowed = list( - /obj/item/weapon/gun, - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/storage + /obj/item/gun, + /obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/storage ) - air_type = /obj/item/weapon/tank/vox + air_type = /obj/item/tank/vox helm_type = /obj/item/clothing/head/helmet/space/rig/vox boot_type = /obj/item/clothing/shoes/magboots/rig/vox @@ -87,7 +87,7 @@ SPECIES_VOX = 'icons/inventory/hands/mob_vox.dmi' ) -/obj/item/weapon/rig/vox/carapace +/obj/item/rig/vox/carapace name = "dense alien control module" suit_type = "dense alien" armor = list(melee = 60, bullet = 50, laser = 40, energy = 15, bomb = 30, bio = 100, rad = 50) @@ -95,7 +95,7 @@ req_access = list(access_syndicate) - cell_type = /obj/item/weapon/cell/hyper + cell_type = /obj/item/cell/hyper initial_modules = list( /obj/item/rig_module/mounted/energy_blade, @@ -106,7 +106,7 @@ /obj/item/rig_module/self_destruct ) -/obj/item/weapon/rig/vox/stealth +/obj/item/rig/vox/stealth name = "sinister alien control module" suit_type = "sinister alien" icon_state = "voxstealth_rig" @@ -115,7 +115,7 @@ req_access = list(access_syndicate) - cell_type = /obj/item/weapon/cell/hyper + cell_type = /obj/item/cell/hyper initial_modules = list( /obj/item/rig_module/stealth_field, diff --git a/code/modules/clothing/spacesuits/rig/suits/alien_vr.dm b/code/modules/clothing/spacesuits/rig/suits/alien_vr.dm index 012d73d4355..a1795c797b3 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien_vr.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien_vr.dm @@ -1,5 +1,5 @@ -/obj/item/weapon/rig/breacher +/obj/item/rig/breacher armor = list(melee = 60, bullet = 45, laser = 45, energy = 10, bomb = 50, bio = 100, rad = 20) -/obj/item/weapon/rig/breacher/fancy +/obj/item/rig/breacher/fancy armor = list(melee = 85, bullet = 80, laser = 80, energy = 40, bomb = 80, bio = 100, rad = 60) //Still a tank just not indestructable diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index 214622881a6..64de30524b0 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -1,7 +1,7 @@ /obj/item/clothing/head/helmet/space/rig/combat light_overlay = "helmet_light_dual_green" -/obj/item/weapon/rig/combat +/obj/item/rig/combat name = "combat hardsuit control module" desc = "A sleek and dangerous hardsuit for active combat." icon_state = "security_rig" @@ -13,16 +13,16 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/combat allowed = list( - /obj/item/weapon/gun, - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/melee/baton, - /obj/item/weapon/storage + /obj/item/gun, + /obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/melee/baton, + /obj/item/storage ) -/obj/item/weapon/rig/combat/equipped +/obj/item/rig/combat/equipped initial_modules = list( /obj/item/rig_module/mounted, @@ -34,13 +34,13 @@ /obj/item/rig_module/chem_dispenser/combat ) -/obj/item/weapon/rig/combat/empty +/obj/item/rig/combat/empty initial_modules = list( /obj/item/rig_module/ai_container, /obj/item/rig_module/electrowarfare_suite, ) -/obj/item/weapon/rig/military +/obj/item/rig/military name = "military hardsuit control module" desc = "An austere hardsuit used by paramilitary groups and real soldiers alike." icon_state = "military_rig" @@ -50,24 +50,24 @@ offline_slowdown = 1.5 offline_vision_restriction = 1 allowed = list( - /obj/item/device/flashlight, - /obj/item/weapon/tank, + /obj/item/flashlight, + /obj/item/tank, /obj/item/ammo_magazine, /obj/item/ammo_casing, - /obj/item/weapon/handcuffs, - /obj/item/device/t_scanner, - /obj/item/weapon/rcd, - /obj/item/weapon/weldingtool, - /obj/item/weapon/tool, - /obj/item/device/multitool, - /obj/item/device/radio, - /obj/item/device/analyzer, - /obj/item/weapon/melee/baton, - /obj/item/weapon/gun, - /obj/item/weapon/storage, - /obj/item/weapon/reagent_containers/hypospray, + /obj/item/handcuffs, + /obj/item/t_scanner, + /obj/item/rcd, + /obj/item/weldingtool, + /obj/item/tool, + /obj/item/multitool, + /obj/item/radio, + /obj/item/analyzer, + /obj/item/melee/baton, + /obj/item/gun, + /obj/item/storage, + /obj/item/reagent_containers/hypospray, /obj/item/roller, - /obj/item/device/suit_cooling_unit + /obj/item/suit_cooling_unit ) chest_type = /obj/item/clothing/suit/space/rig/military @@ -88,7 +88,7 @@ /obj/item/clothing/gloves/gauntlets/rig/military species_restricted = list(SPECIES_HUMAN,SPECIES_PROMETHEAN) -/obj/item/weapon/rig/military/equipped +/obj/item/rig/military/equipped initial_modules = list( /obj/item/rig_module/mounted/egun, /obj/item/rig_module/vision/multi, @@ -99,7 +99,7 @@ /obj/item/rig_module/chem_dispenser/combat, ) -/obj/item/weapon/rig/military/empty +/obj/item/rig/military/empty initial_modules = list( /obj/item/rig_module/ai_container, /obj/item/rig_module/electrowarfare_suite, diff --git a/code/modules/clothing/spacesuits/rig/suits/combat_vr.dm b/code/modules/clothing/spacesuits/rig/suits/combat_vr.dm index b9b8d8906ef..2af3eb66dc1 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat_vr.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat_vr.dm @@ -1,5 +1,5 @@ -/obj/item/weapon/rig/combat +/obj/item/rig/combat armor = list(melee = 80, bullet = 70, laser = 60, energy = 15, bomb = 80, bio = 100, rad = 60) -/obj/item/weapon/rig/military +/obj/item/rig/military armor = list(melee = 80, bullet = 75, laser = 65, energy = 15, bomb = 80, bio = 100, rad = 40) diff --git a/code/modules/clothing/spacesuits/rig/suits/ert.dm b/code/modules/clothing/spacesuits/rig/suits/ert.dm index 0edd36c1d28..a701511b05e 100644 --- a/code/modules/clothing/spacesuits/rig/suits/ert.dm +++ b/code/modules/clothing/spacesuits/rig/suits/ert.dm @@ -2,7 +2,7 @@ light_overlay = "helmet_light_dual" camera_networks = list(NETWORK_ERT) -/obj/item/weapon/rig/ert +/obj/item/rig/ert name = "ERT-C hardsuit control module" desc = "A suit worn by the commander of an Emergency Response Team. Has blue highlights. Armoured and space ready." suit_type = "ERT commander" @@ -15,22 +15,22 @@ armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100) allowed = list( - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/t_scanner, - /obj/item/weapon/rcd, - /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/device/multitool, - /obj/item/device/radio, - /obj/item/device/analyzer, - /obj/item/weapon/storage, - /obj/item/weapon/melee/baton, - /obj/item/weapon/gun, - /obj/item/weapon/reagent_containers/hypospray, + /obj/item/flashlight, + /obj/item/tank, + /obj/item/t_scanner, + /obj/item/rcd, + /obj/item/tool/crowbar, + /obj/item/tool/screwdriver, + /obj/item/weldingtool, + /obj/item/tool/wirecutters, + /obj/item/tool/wrench, + /obj/item/multitool, + /obj/item/radio, + /obj/item/analyzer, + /obj/item/storage, + /obj/item/melee/baton, + /obj/item/gun, + /obj/item/reagent_containers/hypospray, /obj/item/roller ) @@ -40,7 +40,7 @@ /obj/item/rig_module/datajack, ) -/obj/item/weapon/rig/ert/engineer +/obj/item/rig/ert/engineer name = "ERT-E suit control module" desc = "A suit worn by the engineering division of an Emergency Response Team. Has orange highlights. Armoured and space ready." suit_type = "ERT engineer" @@ -55,7 +55,7 @@ /obj/item/rig_module/device/rcd ) -/obj/item/weapon/rig/ert/medical +/obj/item/rig/ert/medical name = "ERT-M suit control module" desc = "A suit worn by the medical division of an Emergency Response Team. Has white highlights. Armoured and space ready." suit_type = "ERT medic" @@ -68,7 +68,7 @@ /obj/item/rig_module/chem_dispenser/injector/advanced ) -/obj/item/weapon/rig/ert/security +/obj/item/rig/ert/security name = "ERT-S suit control module" desc = "A suit worn by the security division of an Emergency Response Team. Has red highlights. Armoured and space ready." suit_type = "ERT security" @@ -81,7 +81,7 @@ /obj/item/rig_module/mounted/egun, ) -/obj/item/weapon/rig/ert/assetprotection +/obj/item/rig/ert/assetprotection name = "Heavy Asset Protection suit control module" desc = "A heavy suit worn by the highest level of Asset Protection, don't mess with the person wearing this. Armoured and space ready." suit_type = "heavy asset protection" diff --git a/code/modules/clothing/spacesuits/rig/suits/ert_vr.dm b/code/modules/clothing/spacesuits/rig/suits/ert_vr.dm index 4782058b3a8..34dd4fb6464 100644 --- a/code/modules/clothing/spacesuits/rig/suits/ert_vr.dm +++ b/code/modules/clothing/spacesuits/rig/suits/ert_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/rig/ert/janitor +/obj/item/rig/ert/janitor name = "ERT-J suit control module" desc = "A suit worn by the janitorial division of an Emergency Response Team. Has purple highlights. Armoured and space ready." suit_type = "ERT janitor" @@ -9,5 +9,5 @@ /obj/item/rig_module/cleaner_launcher, ) -/obj/item/weapon/rig/ert/assetprotection +/obj/item/rig/ert/assetprotection armor = list(melee = 80, bullet = 70, laser = 60, energy = 15, bomb = 80, bio = 100, rad = 60) diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm index b2a525f24d8..e8081194cd4 100644 --- a/code/modules/clothing/spacesuits/rig/suits/light.dm +++ b/code/modules/clothing/spacesuits/rig/suits/light.dm @@ -1,19 +1,19 @@ // Light rigs are not space-capable, but don't suffer excessive slowdown or sight issues when depowered. -/obj/item/weapon/rig/light +/obj/item/rig/light name = "light suit control module" desc = "A lighter, less armoured rig suit." icon_state = "ninja_rig" suit_type = "light suit" allowed = list( - /obj/item/weapon/gun, + /obj/item/gun, /obj/item/ammo_magazine, /obj/item/ammo_casing, - /obj/item/weapon/melee/baton, - /obj/item/weapon/handcuffs, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/cell, - /obj/item/weapon/storage + /obj/item/melee/baton, + /obj/item/handcuffs, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/cell, + /obj/item/storage ) armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) emp_protection = 10 @@ -43,7 +43,7 @@ /obj/item/clothing/head/helmet/space/rig/light name = "hood" -/obj/item/weapon/rig/light/hacker +/obj/item/rig/light/hacker name = "cybersuit control module" suit_type = "cyber" desc = "An advanced powered armour suit with many cyberwarfare enhancements. Comes with built-in insulated gloves for safely tampering with electronics." @@ -85,7 +85,7 @@ /obj/item/clothing/gloves/gauntlets/rig/light/hacker siemens_coefficient = 0 -/obj/item/weapon/rig/light/ninja +/obj/item/rig/light/ninja name = "ominous suit control module" suit_type = "ominous" desc = "A unique suit of nano-enhanced armor designed for covert operations." @@ -97,7 +97,7 @@ chest_type = /obj/item/clothing/suit/space/rig/light/ninja glove_type = /obj/item/clothing/gloves/gauntlets/rig/light/ninja boot_type = /obj/item/clothing/shoes/magboots/rig/light/ninja - cell_type = /obj/item/weapon/cell/hyper + cell_type = /obj/item/cell/hyper req_access = list(access_syndicate) @@ -126,7 +126,7 @@ /obj/item/clothing/suit/space/rig/light/ninja breach_threshold = 38 //comparable to regular hardsuits -/obj/item/weapon/rig/light/stealth +/obj/item/rig/light/stealth name = "stealth suit control module" suit_type = "stealth" desc = "A highly advanced and expensive suit designed for covert operations." diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm index 6dcb6bb264a..aa7a691a18b 100644 --- a/code/modules/clothing/spacesuits/rig/suits/merc.dm +++ b/code/modules/clothing/spacesuits/rig/suits/merc.dm @@ -2,7 +2,7 @@ light_overlay = "helmet_light_dual_green" camera_networks = list(NETWORK_MERCENARY) -/obj/item/weapon/rig/merc +/obj/item/rig/merc name = "crimson hardsuit control module" desc = "A blood-red hardsuit featuring some fairly illegal technology." icon_state = "merc_rig" @@ -15,16 +15,16 @@ glove_type = /obj/item/clothing/gloves/gauntlets/rig/eva helm_type = /obj/item/clothing/head/helmet/space/rig/merc allowed = list( - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/gun, + /obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/gun, /obj/item/ammo_magazine, /obj/item/ammo_casing, - /obj/item/weapon/melee/baton, - /obj/item/weapon/melee/energy/sword, - /obj/item/weapon/handcuffs, - /obj/item/weapon/storage + /obj/item/melee/baton, + /obj/item/melee/energy/sword, + /obj/item/handcuffs, + /obj/item/storage ) initial_modules = list( @@ -39,7 +39,7 @@ ) //Has most of the modules removed -/obj/item/weapon/rig/merc/empty +/obj/item/rig/merc/empty initial_modules = list( /obj/item/rig_module/ai_container, /obj/item/rig_module/electrowarfare_suite, //might as well diff --git a/code/modules/clothing/spacesuits/rig/suits/pmc.dm b/code/modules/clothing/spacesuits/rig/suits/pmc.dm index e312ee826a2..ede523dd694 100644 --- a/code/modules/clothing/spacesuits/rig/suits/pmc.dm +++ b/code/modules/clothing/spacesuits/rig/suits/pmc.dm @@ -1,7 +1,7 @@ /obj/item/clothing/head/helmet/space/rig/pmc light_overlay = "helmet_light_dual" -/obj/item/weapon/rig/pmc +/obj/item/rig/pmc name = "PMC hardsuit control module" desc = "A suit worn by private military contractors. Armoured and space ready." suit_type = "PMC" @@ -13,32 +13,32 @@ armor = list(melee = 60, bullet = 50, laser = 35,energy = 15, bomb = 30, bio = 100, rad = 95) allowed = list( - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/t_scanner, - /obj/item/weapon/rcd, - /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/device/multitool, - /obj/item/device/radio, - /obj/item/device/analyzer, - /obj/item/weapon/melee/baton, - /obj/item/weapon/gun, - /obj/item/weapon/storage, - /obj/item/weapon/reagent_containers/hypospray, + /obj/item/flashlight, + /obj/item/tank, + /obj/item/t_scanner, + /obj/item/rcd, + /obj/item/tool/crowbar, + /obj/item/tool/screwdriver, + /obj/item/weldingtool, + /obj/item/tool/wirecutters, + /obj/item/tool/wrench, + /obj/item/multitool, + /obj/item/radio, + /obj/item/analyzer, + /obj/item/melee/baton, + /obj/item/gun, + /obj/item/storage, + /obj/item/reagent_containers/hypospray, /obj/item/roller ) -/obj/item/weapon/rig/pmc/commander +/obj/item/rig/pmc/commander name = "PMC-C hardsuit control module" desc = "A suit worn by private military contractors. Armoured and space ready." suit_type = "PMC commander" icon_state = "pmc_commandergrey_rig" -/obj/item/weapon/rig/pmc/commander/grey/equipped +/obj/item/rig/pmc/commander/grey/equipped initial_modules = list( /obj/item/rig_module/ai_container, @@ -46,10 +46,10 @@ /obj/item/rig_module/datajack, ) -/obj/item/weapon/rig/pmc/commander/green +/obj/item/rig/pmc/commander/green icon_state = "pmc_commandergreen_rig" -/obj/item/weapon/rig/pmc/commander/green/equipped +/obj/item/rig/pmc/commander/green/equipped initial_modules = list( /obj/item/rig_module/ai_container, @@ -57,7 +57,7 @@ /obj/item/rig_module/datajack, ) -/obj/item/weapon/rig/pmc/engineer +/obj/item/rig/pmc/engineer name = "PMC-E suit control module" desc = "A suit worn by private military contractors. This one is setup for engineering. Armoured and space ready." suit_type = "PMC engineer" @@ -65,7 +65,7 @@ armor = list(melee = 60, bullet = 50, laser = 35,energy = 15, bomb = 30, bio = 100, rad = 100) siemens_coefficient = 0 -/obj/item/weapon/rig/pmc/engineer/grey/equipped +/obj/item/rig/pmc/engineer/grey/equipped initial_modules = list( /obj/item/rig_module/ai_container, @@ -74,10 +74,10 @@ /obj/item/rig_module/device/rcd ) -/obj/item/weapon/rig/pmc/engineer/green +/obj/item/rig/pmc/engineer/green icon_state = "pmc_engineergreen_rig" -/obj/item/weapon/rig/pmc/engineer/green/equipped +/obj/item/rig/pmc/engineer/green/equipped initial_modules = list( /obj/item/rig_module/ai_container, @@ -86,13 +86,13 @@ /obj/item/rig_module/device/rcd ) -/obj/item/weapon/rig/pmc/medical +/obj/item/rig/pmc/medical name = "PMC-M suit control module" desc = "A suit worn by private military contractors. This one is setup for medical. Armoured and space ready." suit_type = "PMC medic" icon_state = "pmc_medicalgrey_rig" -/obj/item/weapon/rig/pmc/medical/grey/equipped +/obj/item/rig/pmc/medical/grey/equipped initial_modules = list( /obj/item/rig_module/ai_container, @@ -101,10 +101,10 @@ /obj/item/rig_module/chem_dispenser/injector/advanced ) -/obj/item/weapon/rig/pmc/medical/green +/obj/item/rig/pmc/medical/green icon_state = "pmc_medicalgreen_rig" -/obj/item/weapon/rig/pmc/medical/green/equipped +/obj/item/rig/pmc/medical/green/equipped initial_modules = list( /obj/item/rig_module/ai_container, @@ -113,13 +113,13 @@ /obj/item/rig_module/chem_dispenser/injector/advanced ) -/obj/item/weapon/rig/pmc/security +/obj/item/rig/pmc/security name = "PMC-S suit control module" desc = "A suit worn by private military contractors. This one is setup for security. Armoured and space ready." suit_type = "PMC security" icon_state = "pmc_securitygrey_rig" -/obj/item/weapon/rig/pmc/security/grey/equipped +/obj/item/rig/pmc/security/grey/equipped initial_modules = list( /obj/item/rig_module/ai_container, @@ -127,10 +127,10 @@ /obj/item/rig_module/mounted/egun, ) -/obj/item/weapon/rig/pmc/security/green +/obj/item/rig/pmc/security/green icon_state = "pmc_securitygreen_rig" -/obj/item/weapon/rig/pmc/security/green/equipped +/obj/item/rig/pmc/security/green/equipped initial_modules = list( /obj/item/rig_module/ai_container, diff --git a/code/modules/clothing/spacesuits/rig/suits/robotics.dm b/code/modules/clothing/spacesuits/rig/suits/robotics.dm index 860ed2c6b8f..1535169cc2b 100644 --- a/code/modules/clothing/spacesuits/rig/suits/robotics.dm +++ b/code/modules/clothing/spacesuits/rig/suits/robotics.dm @@ -1,5 +1,5 @@ //Advanced Exploration Suit -/obj/item/weapon/rig/robotics +/obj/item/rig/robotics name = "advanced suit control belt" suit_type = "advanced" desc = "A lightweight suit combining the utility of a RIG with the wearability of a voidsuit." @@ -21,8 +21,8 @@ cell_type = null allowed = list( - /obj/item/device/flashlight, - /obj/item/weapon/storage/box + /obj/item/flashlight, + /obj/item/storage/box ) req_access = list() diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index 81c0c8e47d9..4b0eed3adb5 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -20,7 +20,7 @@ camera_networks = list(NETWORK_SECURITY) //Internal Affairs suit -/obj/item/weapon/rig/internalaffairs +/obj/item/rig/internalaffairs name = "augmented tie" suit_type = "augmented suit" desc = "The last suit you'll ever wear." @@ -32,10 +32,10 @@ offline_vision_restriction = 0 allowed = list( - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/storage, + /obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/storage, ) req_access = list() @@ -45,7 +45,7 @@ helm_type = null boot_type = null -/obj/item/weapon/rig/internalaffairs/equipped +/obj/item/rig/internalaffairs/equipped req_access = list(access_lawyer) @@ -62,7 +62,7 @@ boot_type = null //Mining suit -/obj/item/weapon/rig/industrial +/obj/item/rig/industrial name = "industrial suit control module" suit_type = "industrial hardsuit" desc = "A heavy, powerful hardsuit used by construction crews and mining corporations." @@ -79,20 +79,20 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/industrial allowed = list( - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/storage, - /obj/item/device/t_scanner, - /obj/item/weapon/pickaxe, - /obj/item/weapon/rcd + /obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/storage, + /obj/item/t_scanner, + /obj/item/pickaxe, + /obj/item/rcd ) req_access = list() req_one_access = list() -/obj/item/weapon/rig/industrial/equipped +/obj/item/rig/industrial/equipped initial_modules = list( /obj/item/rig_module/device/plasmacutter, @@ -102,7 +102,7 @@ /obj/item/rig_module/maneuvering_jets) //VOREStation Edit - Added maneuvering jets //Engineering suit -/obj/item/weapon/rig/eva +/obj/item/rig/eva name = "EVA suit control module" suit_type = "EVA hardsuit" desc = "A light hardsuit for repairs and maintenance to the outside of habitats and vessels." @@ -117,12 +117,12 @@ glove_type = /obj/item/clothing/gloves/gauntlets/rig/eva allowed = list( - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/storage, - /obj/item/device/t_scanner, - /obj/item/weapon/rcd + /obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/storage, + /obj/item/t_scanner, + /obj/item/rcd ) req_access = list() @@ -133,7 +133,7 @@ name = "insulated gauntlets" siemens_coefficient = 0 -/obj/item/weapon/rig/eva/equipped +/obj/item/rig/eva/equipped req_access = list(access_engine) @@ -145,7 +145,7 @@ ) //Chief Engineer's rig. This is sort of a halfway point between the old hardsuits (voidsuits) and the rig class. -/obj/item/weapon/rig/ce +/obj/item/rig/ce name = "advanced voidsuit control module" suit_type = "advanced voidsuit" @@ -164,12 +164,12 @@ boot_type = /obj/item/clothing/shoes/magboots/rig/ce //VOREStation Add allowed = list( - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/storage, - /obj/item/device/t_scanner, - /obj/item/weapon/rcd + /obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/storage, + /obj/item/t_scanner, + /obj/item/rcd ) req_access = list() @@ -180,7 +180,7 @@ name = "insulated gauntlets" siemens_coefficient = 0 -/obj/item/weapon/rig/ce/equipped +/obj/item/rig/ce/equipped req_access = list(access_ce) @@ -193,7 +193,7 @@ ) //Research Director's suit. Just add red crowbar. -/obj/item/weapon/rig/hazmat +/obj/item/rig/hazmat name = "AMI control module" suit_type = "hazmat hardsuit" @@ -207,27 +207,27 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/hazmat allowed = list( - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, + /obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, /obj/item/stack/flag, - /obj/item/weapon/storage, - /obj/item/weapon/pickaxe, - /obj/item/device/healthanalyzer, - /obj/item/device/measuring_tape, - /obj/item/device/ano_scanner, - /obj/item/device/depth_scanner, - /obj/item/device/core_sampler, - /obj/item/device/gps, - /obj/item/device/beacon_locator, - /obj/item/device/radio/beacon, - /obj/item/weapon/pickaxe/hand + /obj/item/storage, + /obj/item/pickaxe, + /obj/item/healthanalyzer, + /obj/item/measuring_tape, + /obj/item/ano_scanner, + /obj/item/depth_scanner, + /obj/item/core_sampler, + /obj/item/gps, + /obj/item/beacon_locator, + /obj/item/radio/beacon, + /obj/item/pickaxe/hand ) req_access = list() req_one_access = list() -/obj/item/weapon/rig/hazmat/equipped +/obj/item/rig/hazmat/equipped req_access = list(access_rd) @@ -238,7 +238,7 @@ ) //Paramedic suit -/obj/item/weapon/rig/medical +/obj/item/rig/medical name = "rescue suit control module" suit_type = "rescue hardsuit" @@ -253,11 +253,11 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/medical allowed = list( - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/storage, - /obj/item/device/healthanalyzer, + /obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/storage, + /obj/item/healthanalyzer, /obj/item/stack/medical, /obj/item/roller ) @@ -265,7 +265,7 @@ req_access = list() req_one_access = list() -/obj/item/weapon/rig/medical/equipped +/obj/item/rig/medical/equipped req_access = list(access_medical) @@ -278,7 +278,7 @@ ) //Security suit -/obj/item/weapon/rig/hazard +/obj/item/rig/hazard name = "hazard hardsuit control module" suit_type = "hazard hardsuit" desc = "A Security hardsuit designed for prolonged EVA in dangerous environments." @@ -292,19 +292,19 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/hazard allowed = list( - /obj/item/weapon/gun, - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/melee/baton, - /obj/item/weapon/storage + /obj/item/gun, + /obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/melee/baton, + /obj/item/storage ) req_access = list() req_one_access = list() -/obj/item/weapon/rig/hazard/equipped +/obj/item/rig/hazard/equipped initial_modules = list( /obj/item/rig_module/vision/sechud, diff --git a/code/modules/clothing/spacesuits/rig/suits/station_vr.dm b/code/modules/clothing/spacesuits/rig/suits/station_vr.dm index 16715d9c3ac..8e40a27b05f 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station_vr.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station_vr.dm @@ -1,5 +1,5 @@ //Access restriction and seal delay, plus pat_module and rescue_pharm for medical suit -/obj/item/weapon/rig/medical/equipped +/obj/item/rig/medical/equipped req_access = list(access_medical) seal_delay = 5 @@ -11,61 +11,61 @@ ) //Armor reduction for industrial suit -/obj/item/weapon/rig/industrial/vendor +/obj/item/rig/industrial/vendor desc = "A heavy, powerful hardsuit used by construction crews and mining corporations. This is a mass production model with reduced armor." armor = list(melee = 50, bullet = 10, laser = 20, energy = 15, bomb = 30, bio = 100, rad = 50) //Area allowing backpacks to be placed on rigsuits. -/obj/item/weapon/rig/vox - allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/backpack, /obj/item/device/bluespaceradio, /obj/item/device/defib_kit) +/obj/item/rig/vox + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/backpack, /obj/item/bluespaceradio, /obj/item/defib_kit) -/obj/item/weapon/rig/combat - allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton,/obj/item/weapon/storage/backpack,/obj/item/device/bluespaceradio, /obj/item/device/defib_kit) +/obj/item/rig/combat + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton,/obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit) -/obj/item/weapon/rig/ert - allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank, /obj/item/device/t_scanner, /obj/item/weapon/rcd, /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/device/multitool, \ - /obj/item/device/radio, /obj/item/device/analyzer,/obj/item/weapon/storage/briefcase/inflatable, /obj/item/weapon/melee/baton, /obj/item/weapon/gun, \ - /obj/item/weapon/storage/firstaid, /obj/item/weapon/reagent_containers/hypospray, /obj/item/roller, /obj/item/weapon/storage/backpack,/obj/item/device/bluespaceradio, /obj/item/device/defib_kit) +/obj/item/rig/ert + allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/t_scanner, /obj/item/rcd, /obj/item/tool/crowbar, \ + /obj/item/tool/screwdriver, /obj/item/weldingtool, /obj/item/tool/wirecutters, /obj/item/tool/wrench, /obj/item/multitool, \ + /obj/item/radio, /obj/item/analyzer,/obj/item/storage/briefcase/inflatable, /obj/item/melee/baton, /obj/item/gun, \ + /obj/item/storage/firstaid, /obj/item/reagent_containers/hypospray, /obj/item/roller, /obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit) -/obj/item/weapon/rig/light/ninja - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/cell, /obj/item/weapon/storage/backpack,/obj/item/device/bluespaceradio, /obj/item/device/defib_kit) +/obj/item/rig/light/ninja + allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/cell, /obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit) -/obj/item/weapon/rig/merc - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs, /obj/item/weapon/storage/backpack,/obj/item/device/bluespaceradio, /obj/item/device/defib_kit) +/obj/item/rig/merc + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs, /obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit) -/obj/item/weapon/rig/ce - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd,/obj/item/weapon/storage/backpack,/obj/item/device/bluespaceradio, /obj/item/device/defib_kit) +/obj/item/rig/ce + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/t_scanner,/obj/item/pickaxe, /obj/item/rcd,/obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit) -/obj/item/weapon/rig/medical - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical,/obj/item/roller,/obj/item/weapon/storage/backpack,/obj/item/device/bluespaceradio, /obj/item/device/defib_kit) +/obj/item/rig/medical + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/firstaid,/obj/item/healthanalyzer,/obj/item/stack/medical,/obj/item/roller,/obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit) -/obj/item/weapon/rig/hazmat - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/weapon/storage/excavation,/obj/item/weapon/pickaxe,/obj/item/device/healthanalyzer,/obj/item/device/measuring_tape,/obj/item/device/ano_scanner,/obj/item/device/depth_scanner,/obj/item/device/core_sampler,/obj/item/device/gps,/obj/item/device/beacon_locator,/obj/item/device/radio/beacon,/obj/item/weapon/pickaxe/hand,/obj/item/weapon/storage/bag/fossils,/obj/item/weapon/storage/backpack,/obj/item/device/bluespaceradio, /obj/item/device/defib_kit) +/obj/item/rig/hazmat + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/stack/flag,/obj/item/storage/excavation,/obj/item/pickaxe,/obj/item/healthanalyzer,/obj/item/measuring_tape,/obj/item/ano_scanner,/obj/item/depth_scanner,/obj/item/core_sampler,/obj/item/gps,/obj/item/beacon_locator,/obj/item/radio/beacon,/obj/item/pickaxe/hand,/obj/item/storage/bag/fossils,/obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit) -/obj/item/weapon/rig/hazard - allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton,/obj/item/weapon/storage/backpack,/obj/item/device/bluespaceradio, /obj/item/device/defib_kit) +/obj/item/rig/hazard + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton,/obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit) -/obj/item/weapon/rig/industrial - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd,/obj/item/weapon/storage/backpack,/obj/item/device/bluespaceradio, /obj/item/device/defib_kit) +/obj/item/rig/industrial + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/t_scanner,/obj/item/pickaxe, /obj/item/rcd,/obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit) -/obj/item/weapon/rig/military - allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/handcuffs, \ - /obj/item/device/t_scanner, /obj/item/weapon/rcd, /obj/item/weapon/weldingtool, /obj/item/weapon/tool, /obj/item/device/multitool, \ - /obj/item/device/radio, /obj/item/device/analyzer,/obj/item/weapon/storage/briefcase/inflatable, /obj/item/weapon/melee/baton, /obj/item/weapon/gun, \ - /obj/item/weapon/storage/firstaid, /obj/item/weapon/reagent_containers/hypospray, /obj/item/roller, /obj/item/device/suit_cooling_unit, /obj/item/weapon/storage/backpack,/obj/item/device/bluespaceradio, /obj/item/device/defib_kit) +/obj/item/rig/military + allowed = list(/obj/item/flashlight, /obj/item/tank,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/handcuffs, \ + /obj/item/t_scanner, /obj/item/rcd, /obj/item/weldingtool, /obj/item/tool, /obj/item/multitool, \ + /obj/item/radio, /obj/item/analyzer,/obj/item/storage/briefcase/inflatable, /obj/item/melee/baton, /obj/item/gun, \ + /obj/item/storage/firstaid, /obj/item/reagent_containers/hypospray, /obj/item/roller, /obj/item/suit_cooling_unit, /obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit) -/obj/item/weapon/rig/pmc - allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank, /obj/item/device/t_scanner, /obj/item/weapon/rcd, /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/device/multitool, \ - /obj/item/device/radio, /obj/item/device/analyzer,/obj/item/weapon/storage/briefcase/inflatable, /obj/item/weapon/melee/baton, /obj/item/weapon/gun, \ - /obj/item/weapon/storage/firstaid, /obj/item/weapon/reagent_containers/hypospray, /obj/item/roller, /obj/item/weapon/storage/backpack,/obj/item/device/bluespaceradio, /obj/item/device/defib_kit) +/obj/item/rig/pmc + allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/t_scanner, /obj/item/rcd, /obj/item/tool/crowbar, \ + /obj/item/tool/screwdriver, /obj/item/weldingtool, /obj/item/tool/wirecutters, /obj/item/tool/wrench, /obj/item/multitool, \ + /obj/item/radio, /obj/item/analyzer,/obj/item/storage/briefcase/inflatable, /obj/item/melee/baton, /obj/item/gun, \ + /obj/item/storage/firstaid, /obj/item/reagent_containers/hypospray, /obj/item/roller, /obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit) -/obj/item/weapon/rig/robotics - allowed = list(/obj/item/device/flashlight, /obj/item/weapon/storage/box, /obj/item/weapon/storage/belt, /obj/item/device/defib_kit/compact) +/obj/item/rig/robotics + allowed = list(/obj/item/flashlight, /obj/item/storage/box, /obj/item/storage/belt, /obj/item/defib_kit/compact) // 'Technomancer' hardsuit -/obj/item/weapon/rig/focalpoint +/obj/item/rig/focalpoint name = "\improper F.P.E. hardsuit control module" desc = "A high-end hardsuit produced by Focal Point Energistics, focused around repair and construction." @@ -73,7 +73,7 @@ default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob icon_state = "techno_rig" suit_type = "\improper F.P.E. hardsuit" - cell_type = /obj/item/weapon/cell/hyper + cell_type = /obj/item/cell/hyper // Copied from CE rig slowdown = 0 @@ -84,14 +84,14 @@ min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE // so it's like a rig firesuit armor = list("melee" = 40, "bullet" = 10, "laser" = 30, "energy" = 55, "bomb" = 70, "bio" = 100, "rad" = 100) - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/backpack) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/backpack) chest_type = /obj/item/clothing/suit/space/rig/focalpoint helm_type = /obj/item/clothing/head/helmet/space/rig/focalpoint boot_type = /obj/item/clothing/shoes/magboots/rig/ce/focalpoint glove_type = /obj/item/clothing/gloves/gauntlets/rig/focalpoint -/obj/item/weapon/rig/focalpoint/equipped +/obj/item/rig/focalpoint/equipped initial_modules = list( /obj/item/rig_module/maneuvering_jets, /obj/item/rig_module/teleporter, // Try not to set yourself on fire @@ -133,7 +133,7 @@ sprite_sheets = null // 'Ironhammer' hardsuit -/obj/item/weapon/rig/hephaestus +/obj/item/rig/hephaestus name = "\improper Hephaestus hardsuit control module" desc = "A high-end hardsuit produced by Hephaestus Industries, focused on destroying the competition. Literally." @@ -141,11 +141,11 @@ default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob icon_state = "ihs_rig" suit_type = "\improper Hephaestus hardsuit" - cell_type = /obj/item/weapon/cell/super - allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/handcuffs, \ - /obj/item/device/t_scanner, /obj/item/weapon/rcd, /obj/item/weapon/weldingtool, /obj/item/weapon/tool, /obj/item/device/multitool, \ - /obj/item/device/radio, /obj/item/device/analyzer,/obj/item/weapon/storage/briefcase/inflatable, /obj/item/weapon/melee/baton, /obj/item/weapon/gun, \ - /obj/item/weapon/storage/firstaid, /obj/item/weapon/reagent_containers/hypospray, /obj/item/roller, /obj/item/device/suit_cooling_unit, /obj/item/weapon/storage/backpack,/obj/item/device/bluespaceradio, /obj/item/device/defib_kit) + cell_type = /obj/item/cell/super + allowed = list(/obj/item/flashlight, /obj/item/tank,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/handcuffs, \ + /obj/item/t_scanner, /obj/item/rcd, /obj/item/weldingtool, /obj/item/tool, /obj/item/multitool, \ + /obj/item/radio, /obj/item/analyzer,/obj/item/storage/briefcase/inflatable, /obj/item/melee/baton, /obj/item/gun, \ + /obj/item/storage/firstaid, /obj/item/reagent_containers/hypospray, /obj/item/roller, /obj/item/suit_cooling_unit, /obj/item/storage/backpack,/obj/item/bluespaceradio, /obj/item/defib_kit) armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 60, "bio" = 100, "rad" = 20) @@ -154,7 +154,7 @@ boot_type = /obj/item/clothing/shoes/magboots/rig/hephaestus glove_type = /obj/item/clothing/gloves/gauntlets/rig/hephaestus -/obj/item/weapon/rig/hephaestus/equipped +/obj/item/rig/hephaestus/equipped initial_modules = list( /obj/item/rig_module/maneuvering_jets, /obj/item/rig_module/grenade_launcher, @@ -195,7 +195,7 @@ sprite_sheets = null // 'Zero' rig -/obj/item/weapon/rig/zero +/obj/item/rig/zero name = "null hardsuit control module" desc = "A very lightweight suit designed to allow use inside mechs and starfighters. It feels like you're wearing nothing at all." @@ -203,21 +203,21 @@ default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob icon_state = "null_rig" suit_type = "null hardsuit" - cell_type = /obj/item/weapon/cell/high + cell_type = /obj/item/cell/high chest_type = /obj/item/clothing/suit/space/rig/zero helm_type = /obj/item/clothing/head/helmet/space/rig/zero boot_type = null glove_type = null - allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/backpack, /obj/item/device/bluespaceradio, /obj/item/device/defib_kit) + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/backpack, /obj/item/bluespaceradio, /obj/item/defib_kit) slowdown = 0 offline_slowdown = 1 offline_vision_restriction = 2 armor = list("melee" = 20, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 35, "bio" = 100, "rad" = 20) -/obj/item/weapon/rig/zero/equipped +/obj/item/rig/zero/equipped initial_modules = list( /obj/item/rig_module/maneuvering_jets ) @@ -241,7 +241,7 @@ slowdown = 0 // Medical rig from bay -/obj/item/weapon/rig/baymed +/obj/item/rig/baymed name = "\improper Commonwealth medical hardsuit control module" desc = "A lightweight first responder hardsuit from the Commonwealth. Not suitable for combat use, but advanced myomer fibers can push the user to incredible speeds." @@ -250,7 +250,7 @@ icon_state = "medical_rig_bay" item_state = null suit_type = "medical hardsuit" - cell_type = /obj/item/weapon/cell/high + cell_type = /obj/item/cell/high chest_type = /obj/item/clothing/suit/space/rig/baymed helm_type = /obj/item/clothing/head/helmet/space/rig/baymed @@ -258,21 +258,21 @@ glove_type = /obj/item/clothing/gloves/gauntlets/rig/baymed allowed = list( - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/device/healthanalyzer, + /obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/healthanalyzer, /obj/item/stack/medical, /obj/item/roller, - /obj/item/weapon/storage/backpack, - /obj/item/device/bluespaceradio, - /obj/item/device/defib_kit) + /obj/item/storage/backpack, + /obj/item/bluespaceradio, + /obj/item/defib_kit) // speedy paper slowdown = -0.5 armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 25, "bio" = 100, "rad" = 20) -/obj/item/weapon/rig/baymed/equipped +/obj/item/rig/baymed/equipped initial_modules = list( /obj/item/rig_module/maneuvering_jets, @@ -315,7 +315,7 @@ sprite_sheets_obj = null // Engineering/'Industrial' rig from bay -/obj/item/weapon/rig/bayeng +/obj/item/rig/bayeng name = "\improper Commonwealth engineering hardsuit control module" desc = "An advanced construction hardsuit from the Commonwealth. Built like a tank. Don't expect to be taking any tight corners while running." @@ -324,7 +324,7 @@ icon_state = "engineering_rig_bay" item_state = null suit_type = "engineering hardsuit" - cell_type = /obj/item/weapon/cell/super + cell_type = /obj/item/cell/super chest_type = /obj/item/clothing/suit/space/rig/bayeng helm_type = /obj/item/clothing/head/helmet/space/rig/bayeng @@ -332,22 +332,22 @@ glove_type = /obj/item/clothing/gloves/gauntlets/rig/bayeng allowed = list( - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/device/t_scanner, - /obj/item/weapon/pickaxe, - /obj/item/weapon/rcd, - /obj/item/weapon/storage/backpack, - /obj/item/device/bluespaceradio, - /obj/item/device/defib_kit + /obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/t_scanner, + /obj/item/pickaxe, + /obj/item/rcd, + /obj/item/storage/backpack, + /obj/item/bluespaceradio, + /obj/item/defib_kit ) slowdown = 0 offline_slowdown = 5 // very bulky armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 50) -/obj/item/weapon/rig/bayeng/equipped +/obj/item/rig/bayeng/equipped initial_modules = list( /obj/item/rig_module/maneuvering_jets, /obj/item/rig_module/device/rcd, @@ -391,7 +391,7 @@ siemens_coefficient = 0 // insulated // Pathfinder rig from bay - event/reward stuff here -/obj/item/weapon/rig/pathfinder +/obj/item/rig/pathfinder name = "\improper Commonwealth pathfinder hardsuit control module" desc = "A Commonwealth pathfinder hardsuit is hard to come by... how'd this end up on the frontier?" @@ -400,7 +400,7 @@ icon_state = "pathfinder_rig_bay" item_state = null suit_type = "pathfinder hardsuit" - cell_type = /obj/item/weapon/cell/super + cell_type = /obj/item/cell/super chest_type = /obj/item/clothing/suit/space/rig/pathfinder helm_type = /obj/item/clothing/head/helmet/space/rig/pathfinder @@ -412,7 +412,7 @@ offline_vision_restriction = 2 // doesn't even have a way to see out without power armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 50) -/obj/item/weapon/rig/pathfinder//equipped +/obj/item/rig/pathfinder//equipped initial_modules = list( /obj/item/rig_module/maneuvering_jets, /obj/item/rig_module/teleporter, diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index a07ebe19a9b..e435f24f404 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -76,7 +76,7 @@ flags = PHORONGUARD item_flags = THICKMATERIAL body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen,/obj/item/device/suit_cooling_unit) + allowed = list(/obj/item/flashlight,/obj/item/tank/emergency/oxygen,/obj/item/suit_cooling_unit) slowdown = 1.5 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index b49ad6098f4..b30c41450d7 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -11,7 +11,7 @@ icon_state = "syndicate" desc = "A crimson spacesuit sporting clean lines and durable plating. Robust, reliable, and slightly suspicious." w_class = ITEMSIZE_NORMAL - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency/oxygen) + allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/tank/emergency/oxygen) slowdown = 0.5 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) siemens_coefficient = 0.6 diff --git a/code/modules/clothing/spacesuits/void/ert_vr.dm b/code/modules/clothing/spacesuits/void/ert_vr.dm index 9d98e3273cb..5c3a6bd857e 100644 --- a/code/modules/clothing/spacesuits/void/ert_vr.dm +++ b/code/modules/clothing/spacesuits/void/ert_vr.dm @@ -15,7 +15,7 @@ min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 15* ONE_ATMOSPHERE max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE+10000 - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) /obj/item/clothing/suit/space/void/responseteam/command name = "Mark VII-C Emergency Response Team Commander Suit" @@ -70,7 +70,7 @@ if(!isliving(user)) return - if(istype(W, /obj/item/clothing/accessory) || istype(W, /obj/item/weapon/hand_labeler)) + if(istype(W, /obj/item/clothing/accessory) || istype(W, /obj/item/hand_labeler)) return ..() if(user.get_inventory_slot(src) == slot_wear_suit) diff --git a/code/modules/clothing/spacesuits/void/event.dm b/code/modules/clothing/spacesuits/void/event.dm index 0fff3afcad8..ac2d7e2cfee 100644 --- a/code/modules/clothing/spacesuits/void/event.dm +++ b/code/modules/clothing/spacesuits/void/event.dm @@ -18,14 +18,14 @@ icon_state = "rig-vintagecrew" item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") armor = list(melee = 30, bullet = 15, laser = 15,energy = 5, bomb = 20, bio = 100, rad = 50) - allowed = list(/obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/storage/briefcase/inflatable, - /obj/item/device/gps, - /obj/item/device/radio/beacon, - /obj/item/weapon/pickaxe, - /obj/item/weapon/shovel + allowed = list(/obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/storage/briefcase/inflatable, + /obj/item/gps, + /obj/item/radio/beacon, + /obj/item/pickaxe, + /obj/item/shovel ) //Engineering Crewsuit (ORANGE, RING) @@ -52,25 +52,25 @@ max_pressure_protection = 15 * ONE_ATMOSPHERE max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE+10000 breach_threshold = 14 //These are kinda thicc - allowed = list(/obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/device/t_scanner, - /obj/item/weapon/rcd, - /obj/item/weapon/rcd_ammo, - /obj/item/weapon/storage/toolbox, - /obj/item/weapon/storage/briefcase/inflatable, - /obj/item/device/gps, - /obj/item/device/radio/beacon, - /obj/item/device/robotanalyzer, - /obj/item/device/geiger, - /obj/item/weapon/tool, - /obj/item/weapon/weldingtool, - /obj/item/weapon/cell, - /obj/item/weapon/pickaxe, - /obj/item/device/measuring_tape, - /obj/item/device/lightreplacer, - /obj/item/weapon/shovel + allowed = list(/obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/t_scanner, + /obj/item/rcd, + /obj/item/rcd_ammo, + /obj/item/storage/toolbox, + /obj/item/storage/briefcase/inflatable, + /obj/item/gps, + /obj/item/radio/beacon, + /obj/item/robotanalyzer, + /obj/item/geiger, + /obj/item/tool, + /obj/item/weldingtool, + /obj/item/cell, + /obj/item/pickaxe, + /obj/item/measuring_tape, + /obj/item/lightreplacer, + /obj/item/shovel ) //Medical Crewsuit (GREEN, CROSS) @@ -94,18 +94,18 @@ icon_state = "rig-vintagemedic" item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") armor = list(melee = 30, bullet = 15, laser = 15, energy = 5, bomb = 25, bio = 100, rad = 75) - allowed = list(/obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/storage/firstaid, - /obj/item/device/healthanalyzer, - /obj/item/device/robotanalyzer, - /obj/item/device/mass_spectrometer, - /obj/item/device/halogen_counter, + allowed = list(/obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/storage/firstaid, + /obj/item/healthanalyzer, + /obj/item/robotanalyzer, + /obj/item/mass_spectrometer, + /obj/item/halogen_counter, /obj/item/stack/medical, - /obj/item/device/gps, - /obj/item/device/radio/beacon, - /obj/item/weapon/cell + /obj/item/gps, + /obj/item/radio/beacon, + /obj/item/cell ) //Marine Crewsuit (BLUE, SHIELD) @@ -128,21 +128,21 @@ breach_threshold = 14 //These are kinda thicc resilience = 0.15 //Armored siemens_coefficient = 0.8 - allowed = list(/obj/item/weapon/gun, - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/melee, - /obj/item/weapon/grenade, - /obj/item/device/flash, - /obj/item/device/gps, - /obj/item/device/radio/beacon, - /obj/item/weapon/handcuffs, - /obj/item/device/hailer, - /obj/item/device/holowarrant, - /obj/item/device/megaphone, + allowed = list(/obj/item/gun, + /obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/melee, + /obj/item/grenade, + /obj/item/flash, + /obj/item/gps, + /obj/item/radio/beacon, + /obj/item/handcuffs, + /obj/item/hailer, + /obj/item/holowarrant, + /obj/item/megaphone, /obj/item/ammo_magazine, - /obj/item/weapon/cell + /obj/item/cell ) //Officer Crewsuit (GOLD, X) @@ -166,21 +166,21 @@ breach_threshold = 16 //Extra Thicc resilience = 0.1 //Heavily Armored siemens_coefficient = 0.7 - allowed = list(/obj/item/weapon/gun, - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/melee, - /obj/item/weapon/grenade, - /obj/item/device/flash, - /obj/item/device/gps, - /obj/item/device/radio/beacon, - /obj/item/weapon/handcuffs, - /obj/item/device/hailer, - /obj/item/device/holowarrant, - /obj/item/device/megaphone, + allowed = list(/obj/item/gun, + /obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/melee, + /obj/item/grenade, + /obj/item/flash, + /obj/item/gps, + /obj/item/radio/beacon, + /obj/item/handcuffs, + /obj/item/hailer, + /obj/item/holowarrant, + /obj/item/megaphone, /obj/item/ammo_magazine, - /obj/item/weapon/cell + /obj/item/cell ) //Pilot Crewsuit (ROYAL BLUE, I) @@ -207,12 +207,12 @@ slowdown = 0 armor = list(melee = 25, bullet = 20, laser = 20, energy = 5, bomb = 20, bio = 100, rad = 50) siemens_coefficient = 0.9 - allowed = list(/obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/storage/briefcase/inflatable, - /obj/item/device/gps, - /obj/item/device/radio/beacon, + allowed = list(/obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/storage/briefcase/inflatable, + /obj/item/gps, + /obj/item/radio/beacon, ) //Scientist Crewsuit (PURPLE, O) @@ -237,27 +237,27 @@ item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") armor = list(melee = 25, bullet = 10, laser = 10, energy = 50, bomb = 10, bio = 100, rad = 100) siemens_coefficient = 0.8 - allowed = list(/obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/storage/firstaid, - /obj/item/device/healthanalyzer, - /obj/item/device/gps, - /obj/item/device/radio/beacon, - /obj/item/device/ano_scanner, - /obj/item/device/depth_scanner, - /obj/item/device/xenoarch_multi_tool, - /obj/item/device/measuring_tape, - /obj/item/device/reagent_scanner, - /obj/item/device/robotanalyzer, - /obj/item/device/analyzer, - /obj/item/device/cataloguer, - /obj/item/device/universal_translator, - /obj/item/weapon/tool/crowbar, + allowed = list(/obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/storage/firstaid, + /obj/item/healthanalyzer, + /obj/item/gps, + /obj/item/radio/beacon, + /obj/item/ano_scanner, + /obj/item/depth_scanner, + /obj/item/xenoarch_multi_tool, + /obj/item/measuring_tape, + /obj/item/reagent_scanner, + /obj/item/robotanalyzer, + /obj/item/analyzer, + /obj/item/cataloguer, + /obj/item/universal_translator, + /obj/item/tool/crowbar, /obj/item/stack/marker_beacon, /obj/item/stack/flag, - /obj/item/weapon/clipboard, - /obj/item/weapon/cell + /obj/item/clipboard, + /obj/item/cell ) //Miner's Crewsuit (BROWN) @@ -276,14 +276,14 @@ icon_state = "rig-vintageminer" item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") armor = list(melee = 30, bullet = 15, laser = 15,energy = 5, bomb = 20, bio = 100, rad = 50) - allowed = list(/obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/storage/briefcase/inflatable, - /obj/item/device/gps, - /obj/item/device/radio/beacon, - /obj/item/weapon/pickaxe, - /obj/item/weapon/shovel + allowed = list(/obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/storage/briefcase/inflatable, + /obj/item/gps, + /obj/item/radio/beacon, + /obj/item/pickaxe, + /obj/item/shovel ) //Mercenary Crewsuit (RED, CROSS) @@ -306,22 +306,22 @@ breach_threshold = 16 //Extra Thicc resilience = 0.05 //Military Armor siemens_coefficient = 0.6 - allowed = list(/obj/item/weapon/gun, - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/melee, - /obj/item/weapon/grenade, - /obj/item/device/flash, - /obj/item/device/gps, - /obj/item/device/radio/beacon, - /obj/item/weapon/handcuffs, - /obj/item/device/hailer, - /obj/item/device/holowarrant, - /obj/item/device/megaphone, + allowed = list(/obj/item/gun, + /obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/melee, + /obj/item/grenade, + /obj/item/flash, + /obj/item/gps, + /obj/item/radio/beacon, + /obj/item/handcuffs, + /obj/item/hailer, + /obj/item/holowarrant, + /obj/item/megaphone, /obj/item/ammo_magazine, - /obj/item/device/spaceflare, - /obj/item/device/powersink, - /obj/item/device/radio_jammer, - /obj/item/weapon/cell + /obj/item/spaceflare, + /obj/item/powersink, + /obj/item/radio_jammer, + /obj/item/cell ) diff --git a/code/modules/clothing/spacesuits/void/event_vr.dm b/code/modules/clothing/spacesuits/void/event_vr.dm index 3edd3a83f0e..3b4fc97c6c5 100644 --- a/code/modules/clothing/spacesuits/void/event_vr.dm +++ b/code/modules/clothing/spacesuits/void/event_vr.dm @@ -270,7 +270,7 @@ armor = list("melee" = 50, "bullet" = 15, "laser" = 15, "energy" = 25, "bomb" = 45, "bio" = 100, "rad" = 80) slowdown = 1.5 breach_threshold = 14 - allowed = list(/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit) + allowed = list(/obj/item/tank,/obj/item/suit_cooling_unit) sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM diff --git a/code/modules/clothing/spacesuits/void/merc.dm b/code/modules/clothing/spacesuits/void/merc.dm index 10f2b0a8386..8193c474891 100644 --- a/code/modules/clothing/spacesuits/void/merc.dm +++ b/code/modules/clothing/spacesuits/void/merc.dm @@ -16,7 +16,7 @@ item_state_slots = list(slot_r_hand_str = "syndie_voidsuit", slot_l_hand_str = "syndie_voidsuit") w_class = ITEMSIZE_NORMAL armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60) - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.6 breach_threshold = 16 //Extra Thicc resilience = 0.05 //Military Armor @@ -40,7 +40,7 @@ max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 20* ONE_ATMOSPHERE - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/material/twohanded/fireaxe,/obj/item/weapon/flamethrower) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/material/twohanded/fireaxe,/obj/item/flamethrower) siemens_coefficient = 0.7 breach_threshold = 18 //Super Extra Thicc slowdown = 1 diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index 7c5983b979d..ab724b894c0 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -17,7 +17,7 @@ icon_state = "rig-engineering" item_state_slots = list(slot_r_hand_str = "eng_voidsuit", slot_l_hand_str = "eng_voidsuit") armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 70) - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/t_scanner,/obj/item/pickaxe, /obj/item/rcd) min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 15 * ONE_ATMOSPHERE max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE+5000 @@ -100,7 +100,7 @@ desc = "A hand-me-down salvage voidsuit. It has obviously had a lot of repair work done to its radiation shielding." icon_state = "rig-engineeringsav" armor = list(melee = 50, bullet = 15, laser = 25, energy = 15, bomb = 45, bio = 100, rad = 100) - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/toolbox,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/device/t_scanner,/obj/item/weapon/rcd) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/toolbox,/obj/item/storage/briefcase/inflatable,/obj/item/t_scanner,/obj/item/rcd) slowdown = 0.5 //Mining @@ -118,7 +118,7 @@ desc = "A special suit that protects against hazardous, low pressure environments. Has reinforced plating." icon_state = "rig-mining" item_state_slots = list(slot_r_hand_str = "mining_voidsuit", slot_l_hand_str = "mining_voidsuit") - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/pickaxe) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/pickaxe) armor = list(melee = 50, bullet = 15, laser = 25, energy = 15, bomb = 55, bio = 100, rad = 50) breach_threshold = 14 //These are kinda thicc resilience = 0.15 //Armored @@ -151,7 +151,7 @@ desc = "A special suit that protects against hazardous, low pressure environments. Has minor radiation shielding." icon_state = "rig-medical" item_state_slots = list(slot_r_hand_str = "medical_voidsuit", slot_l_hand_str = "medical_voidsuit") - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/firstaid,/obj/item/healthanalyzer,/obj/item/stack/medical) armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 80) //Medical EMT Voidsuit @@ -285,7 +285,7 @@ icon_state = "rig-sec" item_state_slots = list(slot_r_hand_str = "sec_voidsuit", slot_l_hand_str = "sec_voidsuit") armor = list(melee = 50, bullet = 25, laser = 25, energy = 15, bomb = 45, bio = 100, rad = 10) - allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton) + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton) siemens_coefficient = 0.7 breach_threshold = 14 //These are kinda thicc resilience = 0.15 //Armored @@ -384,8 +384,8 @@ icon_state = "void_explorer" item_state_slots = list(slot_r_hand_str = "skrell_suit_black", slot_l_hand_str = "skrell_suit_black") armor = list(melee = 50, bullet = 15, laser = 35, energy = 25, bomb = 30, bio = 100, rad = 70) - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/device/healthanalyzer,/obj/item/device/gps,/obj/item/device/radio/beacon, \ - /obj/item/weapon/shovel,/obj/item/ammo_magazine,/obj/item/weapon/gun) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/stack/flag,/obj/item/healthanalyzer,/obj/item/gps,/obj/item/radio/beacon, \ + /obj/item/shovel,/obj/item/ammo_magazine,/obj/item/gun) breach_threshold = 14 //These are kinda thicc resilience = 0.15 //Armored @@ -406,8 +406,8 @@ icon_state = "void_exp_medic" item_state_slots = list(slot_r_hand_str = "skrell_suit_black", slot_l_hand_str = "skrell_suit_black") armor = list(melee = 50, bullet = 15, laser = 25, energy = 15, bomb = 30, bio = 100, rad = 90) - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/device/healthanalyzer,/obj/item/device/gps,/obj/item/device/radio/beacon, \ - /obj/item/weapon/shovel,/obj/item/ammo_magazine,/obj/item/weapon/gun,/obj/item/weapon/storage/firstaid,/obj/item/stack/medical) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/stack/flag,/obj/item/healthanalyzer,/obj/item/gps,/obj/item/radio/beacon, \ + /obj/item/shovel,/obj/item/ammo_magazine,/obj/item/gun,/obj/item/storage/firstaid,/obj/item/stack/medical) breach_threshold = 14 //These are kinda thicc resilience = 0.15 //Armored max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE+5000 @@ -440,7 +440,7 @@ item_state_slots = list(slot_r_hand_str = "atmos_voidsuit", slot_l_hand_str = "atmos_voidsuit") name = "pilot voidsuit" armor = list(melee = 40, bullet = 10, laser = 25, energy = 15, bomb = 25, bio = 100, rad = 60) - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/toolbox,/obj/item/weapon/storage/briefcase/inflatable) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/toolbox,/obj/item/storage/briefcase/inflatable) /obj/item/clothing/head/helmet/space/void/pilot/alt icon_state = "rig0_pilot2" diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 7d421348cc6..72ee5417a4b 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -27,7 +27,7 @@ desc = "A high-tech dark red space suit. Used for AI satellite maintenance." slowdown = 0.5 armor = list(melee = 30, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20) - 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) heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE min_pressure_protection = 0 * ONE_ATMOSPHERE @@ -45,8 +45,8 @@ //Inbuilt devices. var/obj/item/clothing/shoes/magboots/boots = null // Deployable boots, if any. var/obj/item/clothing/head/helmet/helmet = null // Deployable helmet, if any. - var/obj/item/weapon/tank/tank = null // Deployable tank, if any. - var/obj/item/device/suit_cooling_unit/cooler = null// Cooling unit, for FBPs. Cannot be installed alongside a tank. + var/obj/item/tank/tank = null // Deployable tank, if any. + var/obj/item/suit_cooling_unit/cooler = null// Cooling unit, for FBPs. Cannot be installed alongside a tank. //Cycler settings var/no_cycle = FALSE //stop this item from being put in a cycler @@ -234,7 +234,7 @@ if(!istype(user,/mob/living)) return - if(istype(W,/obj/item/clothing/accessory) || istype(W, /obj/item/weapon/hand_labeler)) + if(istype(W,/obj/item/clothing/accessory) || istype(W, /obj/item/hand_labeler)) return ..() if(user.get_inventory_slot(src) == slot_wear_suit) @@ -285,12 +285,12 @@ W.forceMove(src) boots = W return - else if(istype(W,/obj/item/weapon/tank)) + else if(istype(W,/obj/item/tank)) if(tank) to_chat(user, "\The [src] already has an airtank installed.") else if(cooler) to_chat(user, "\The [src]'s suit cooling unit is in the way. Remove it first.") - else if(istype(W,/obj/item/weapon/tank/phoron)) + else if(istype(W,/obj/item/tank/phoron)) to_chat(user, "\The [W] cannot be inserted into \the [src]'s storage compartment.") else to_chat(user, "You insert \the [W] into \the [src]'s storage compartment.") @@ -298,7 +298,7 @@ W.forceMove(src) tank = W return - else if(istype(W,/obj/item/device/suit_cooling_unit)) + else if(istype(W,/obj/item/suit_cooling_unit)) if(cooler) to_chat(user, "\The [src] already has a suit cooling unit installed.") else if(tank) diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm index 9222a4ca9c9..04aeaa6d7de 100644 --- a/code/modules/clothing/spacesuits/void/void_vr.dm +++ b/code/modules/clothing/spacesuits/void/void_vr.dm @@ -107,7 +107,7 @@ if(!isliving(user)) return - if(istype(W, /obj/item/clothing/accessory) || istype(W, /obj/item/weapon/hand_labeler)) + if(istype(W, /obj/item/clothing/accessory) || istype(W, /obj/item/hand_labeler)) return ..() if(user.get_inventory_slot(src) == slot_wear_suit) diff --git a/code/modules/clothing/spacesuits/void/zaddat.dm b/code/modules/clothing/spacesuits/void/zaddat.dm index 6b096aca229..025d52c8f02 100644 --- a/code/modules/clothing/spacesuits/void/zaddat.dm +++ b/code/modules/clothing/spacesuits/void/zaddat.dm @@ -17,7 +17,7 @@ slowdown = 1 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 70) siemens_coefficient = 1 - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank) + allowed = list(/obj/item/flashlight,/obj/item/tank) icon_state = "zaddat_hegemony" helmet = new/obj/item/clothing/head/helmet/space/void/zaddat //shrouds come with helmets built-in var/has_been_customized = FALSE diff --git a/code/modules/clothing/suits/aliens/teshari.dm b/code/modules/clothing/suits/aliens/teshari.dm index 649b6e74b5e..fe0e29ffc0a 100644 --- a/code/modules/clothing/suits/aliens/teshari.dm +++ b/code/modules/clothing/suits/aliens/teshari.dm @@ -258,7 +258,7 @@ flags_inv = HIDEHOLSTER|HIDETIE 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" diff --git a/code/modules/clothing/suits/aliens/vox.dm b/code/modules/clothing/suits/aliens/vox.dm index b658aa0586e..b4bcf1859fd 100644 --- a/code/modules/clothing/suits/aliens/vox.dm +++ b/code/modules/clothing/suits/aliens/vox.dm @@ -1,7 +1,7 @@ /obj/item/clothing/suit/armor/vox_scrap name = "rusted metal armor" desc = "A hodgepodge of various pieces of metal scrapped together into a rudimentary vox-shaped piece of armor." - allowed = list(/obj/item/weapon/gun, /obj/item/weapon/tank) + allowed = list(/obj/item/gun, /obj/item/tank) armor = list(melee = 60, bullet = 30, laser = 30,energy = 5, bomb = 40, bio = 0, rad = 0) //Higher melee armor versus lower everything else. icon_state = "vox-scrap" icon_state = "vox-scrap" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 2ae7692a7ad..0f9d8d2ffe2 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -1,5 +1,5 @@ /obj/item/clothing/suit/armor - allowed = list(/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/device/flashlight/maglight,/obj/item/clothing/head/helmet) + 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/melee/baton,/obj/item/handcuffs,/obj/item/flashlight/maglight,/obj/item/clothing/head/helmet) body_parts_covered = UPPER_TORSO|LOWER_TORSO item_flags = THICKMATERIAL @@ -128,7 +128,7 @@ permeability_coefficient = 0.01 item_flags = THICKMATERIAL body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency/oxygen,/obj/item/clothing/head/helmet) + allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank/emergency/oxygen,/obj/item/clothing/head/helmet) slowdown = 1 w_class = ITEMSIZE_HUGE armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 100, rad = 100) @@ -281,7 +281,7 @@ blood_overlay_type = "armor" item_state_slots = list(slot_r_hand_str = "armor", slot_l_hand_str = "armor") armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 0, rad = 0) - allowed = list(/obj/item/weapon/gun,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight/maglight,/obj/item/clothing/head/helmet) + allowed = list(/obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/flashlight/maglight,/obj/item/clothing/head/helmet) body_parts_covered = UPPER_TORSO|LOWER_TORSO item_flags = THICKMATERIAL @@ -404,7 +404,7 @@ icon_state = "pvest" desc = "A simple kevlar plate carrier. This one has the word 'Press' embroidered on patches on the back and front." item_state_slots = list(slot_r_hand_str = "armor", slot_l_hand_str = "armor") - allowed = list(/obj/item/device/flashlight,/obj/item/device/taperecorder,/obj/item/weapon/pen,/obj/item/device/camera_film,/obj/item/device/camera,/obj/item/clothing/head/helmet) + allowed = list(/obj/item/flashlight,/obj/item/taperecorder,/obj/item/pen,/obj/item/camera_film,/obj/item/camera,/obj/item/clothing/head/helmet) /obj/item/clothing/suit/storage/vest/heavy name = "heavy armor vest" @@ -464,7 +464,7 @@ item_state_slots = list(slot_r_hand_str = "armor", slot_l_hand_str = "armor") w_class = ITEMSIZE_LARGE//bulky item body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency/oxygen,/obj/item/clothing/head/helmet) + allowed = list(/obj/item/gun/energy,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank/emergency/oxygen,/obj/item/clothing/head/helmet) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index a1189c54592..9fed02a6adb 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -156,14 +156,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/suit/armor/combat/crusader_explo/FM diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 60237b385ed..05f31ce1de8 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -22,7 +22,7 @@ permeability_coefficient = 0.01 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET slowdown = 1.0 - allowed = list(/obj/item/weapon/tank/emergency/oxygen,/obj/item/weapon/pen,/obj/item/device/flashlight/pen) + allowed = list(/obj/item/tank/emergency/oxygen,/obj/item/pen,/obj/item/flashlight/pen) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER siemens_coefficient = 0.9 diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm index d56f6c590d3..dca9507fb2f 100644 --- a/code/modules/clothing/suits/hooded.dm +++ b/code/modules/clothing/suits/hooded.dm @@ -110,8 +110,8 @@ cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE hoodtype = /obj/item/clothing/head/hood/winter - 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) + 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/clothing/suit/storage/hooded/wintercoat/captain name = "site manager's winter coat" @@ -120,10 +120,10 @@ item_state_slots = list(slot_r_hand_str = "coatcaptain", slot_l_hand_str = "coatcaptain") armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0) hoodtype = /obj/item/clothing/head/hood/winter/captain - 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/hop name = "head of personnel's winter coat" @@ -131,10 +131,10 @@ icon_state = "coathop" armor = list(melee = 5, bullet = 0, laser = 0, energy = 0, bomb = 5, bio = 5, rad = 0) hoodtype = /obj/item/clothing/head/hood/winter/hop - 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/security name = "security winter coat" @@ -143,10 +143,10 @@ item_state_slots = list(slot_r_hand_str = "coatsecurity", slot_l_hand_str = "coatsecurity") armor = list(melee = 25, bullet = 20, laser = 20, energy = 15, bomb = 20, bio = 0, rad = 0) hoodtype = /obj/item/clothing/head/hood/winter/security - 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, /obj/item/clothing/mask/gas) + 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/mask/gas) /obj/item/clothing/suit/storage/hooded/wintercoat/security/hos name = "head of security's winter coat" @@ -154,10 +154,10 @@ icon_state = "coathos" armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 20, bio = 0, rad = 0) hoodtype = /obj/item/clothing/head/hood/winter/security/hos - 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, /obj/item/clothing/mask/gas) + 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/mask/gas) /obj/item/clothing/suit/storage/hooded/wintercoat/medical name = "medical winter coat" @@ -166,11 +166,11 @@ item_state_slots = list(slot_r_hand_str = "coatmedical", slot_l_hand_str = "coatmedical") armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0) hoodtype = /obj/item/clothing/head/hood/winter/medical - 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, /obj/item/clothing/mask/gas) + 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/mask/gas) /obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt name = "medical winter coat, alt" @@ -213,11 +213,11 @@ icon_state = "coatsar" armor = list(melee = 15, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 5) hoodtype = /obj/item/clothing/head/hood/winter/medical/sar //VOREStation edit: sar winter hood - 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, /obj/item/clothing/mask/gas) + 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, /obj/item/clothing/mask/gas) /obj/item/clothing/suit/storage/hooded/wintercoat/science name = "science winter coat" @@ -226,11 +226,11 @@ item_state_slots = list(slot_r_hand_str = "coatscience", slot_l_hand_str = "coatscience") armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0) hoodtype = /obj/item/clothing/head/hood/winter/science - 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/science/robotics name = "robotics winter coat" @@ -253,10 +253,10 @@ item_state_slots = list(slot_r_hand_str = "coatengineer", slot_l_hand_str = "coatengineer") armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20) hoodtype = /obj/item/clothing/head/hood/winter/engineering - 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, /obj/item/clothing/head/hardhat) //please engineers take your hardhat with you I beg of you + 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/head/hardhat) //please engineers take your hardhat with you I beg of you /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos name = "atmospherics winter coat" @@ -279,10 +279,10 @@ icon_state = "coathydro" item_state_slots = list(slot_r_hand_str = "coathydro", slot_l_hand_str = "coathydro") hoodtype = /obj/item/clothing/head/hood/winter/hydro - 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/reagent_containers/spray/plantbgone, /obj/item/device/analyzer/plant_analyzer, /obj/item/seeds, - /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/material/minihoe) + 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/reagent_containers/spray/plantbgone, /obj/item/analyzer/plant_analyzer, /obj/item/seeds, + /obj/item/reagent_containers/glass/bottle, /obj/item/material/minihoe) /obj/item/clothing/suit/storage/hooded/wintercoat/cargo name = "cargo winter coat" @@ -305,9 +305,9 @@ item_state_slots = list(slot_r_hand_str = "coatminer", slot_l_hand_str = "coatminer") armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) hoodtype = /obj/item/clothing/head/hood/winter/cargo/miner - 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, /obj/item/clothing/mask/gas) + 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/mask/gas) /obj/item/clothing/suit/storage/hooded/wintercoat/bar name = "bartender winter coat" @@ -379,14 +379,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/suit/storage/hooded/techpriest @@ -402,8 +402,8 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS flags_inv = HIDEHOLSTER hoodtype = /obj/item/clothing/head/hood/raincoat - 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) + 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) //hooded cloaks diff --git a/code/modules/clothing/suits/hooded_vr.dm b/code/modules/clothing/suits/hooded_vr.dm index 2a5da38c4b9..aaf729045ae 100644 --- a/code/modules/clothing/suits/hooded_vr.dm +++ b/code/modules/clothing/suits/hooded_vr.dm @@ -118,8 +118,8 @@ cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE hoodtype = /obj/item/clothing/head/hood/hoodie - 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) + 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/clothing/suit/storage/hooded/hoodie/redtrim name = "red-trimmed hoodie" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index ce1ec1f66da..ffe9850629d 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -10,8 +10,8 @@ item_state_slots = list(slot_r_hand_str = "overalls", slot_l_hand_str = "overalls") blood_overlay_type = "armor" body_parts_covered = 0 - allowed = list (/obj/item/weapon/reagent_containers/spray/plantbgone, /obj/item/device/analyzer/plant_analyzer, /obj/item/seeds, - /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/material/minihoe) + allowed = list (/obj/item/reagent_containers/spray/plantbgone, /obj/item/analyzer/plant_analyzer, /obj/item/seeds, + /obj/item/reagent_containers/glass/bottle, /obj/item/material/minihoe) /obj/item/clothing/suit/storage/apron/white name = "white apron" @@ -55,7 +55,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS flags_inv = HIDEHOLSTER hoodtype = /obj/item/clothing/head/chaplain_hood - allowed = list (/obj/item/weapon/storage/bible) + allowed = list (/obj/item/storage/bible) //Chaplain but spookier /obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout @@ -83,7 +83,7 @@ permeability_coefficient = 0.50 body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS flags_inv = HIDETIE|HIDEHOLSTER - allowed = list (/obj/item/weapon/material/knife) + allowed = list (/obj/item/material/knife) //Chef /obj/item/clothing/suit/chef/classic @@ -127,9 +127,9 @@ blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS flags_inv = HIDEHOLSTER - allowed = list(/obj/item/weapon/tank/emergency/oxygen, /obj/item/device/flashlight, /obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, - /obj/item/ammo_casing, /obj/item/weapon/melee/baton, /obj/item/weapon/handcuffs, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/flame/lighter, - /obj/item/device/taperecorder, /obj/item/device/uv_light) + allowed = list(/obj/item/tank/emergency/oxygen, /obj/item/flashlight, /obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_magazine, + /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/handcuffs, /obj/item/storage/fancy/cigarettes, /obj/item/flame/lighter, + /obj/item/taperecorder, /obj/item/uv_light) armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/suit/storage/det_trench/grey @@ -144,9 +144,9 @@ desc = "A forensics technician jacket." body_parts_covered = UPPER_TORSO|ARMS flags_inv = HIDEHOLSTER - allowed = list(/obj/item/weapon/tank/emergency/oxygen, /obj/item/device/flashlight, /obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, - /obj/item/ammo_casing, /obj/item/weapon/melee/baton, /obj/item/weapon/handcuffs, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/flame/lighter, - /obj/item/device/taperecorder, /obj/item/device/uv_light) + allowed = list(/obj/item/tank/emergency/oxygen, /obj/item/flashlight, /obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_magazine, + /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/handcuffs, /obj/item/storage/fancy/cigarettes, /obj/item/flame/lighter, + /obj/item/taperecorder, /obj/item/uv_light) armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/suit/storage/forensics/red @@ -177,9 +177,9 @@ desc = "A high-visibility vest used in work zones." icon_state = "hazard" blood_overlay_type = "armor" - allowed = list (/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, /obj/item/taperoll/atmos, /obj/item/device/analyzer, /obj/item/weapon/extinguisher/mini) //VOREStation edit. Few more tools that can be put on vests + allowed = list (/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/taperoll/atmos, /obj/item/analyzer, /obj/item/extinguisher/mini) //VOREStation edit. Few more tools that can be put on vests body_parts_covered = UPPER_TORSO /obj/item/clothing/suit/storage/hazardvest/blue @@ -230,8 +230,8 @@ icon_state = "fr_jacket" item_state_slots = list(slot_r_hand_str = "fr_jacket", slot_l_hand_str = "fr_jacket") blood_overlay_type = "armor" - allowed = list(/obj/item/stack/medical, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/hypospray, /obj/item/weapon/reagent_containers/syringe, - /obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/weapon/tank/emergency/oxygen) + allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe, + /obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/radio, /obj/item/tank/emergency/oxygen) body_parts_covered = UPPER_TORSO|ARMS /obj/item/clothing/suit/storage/toggle/fr_jacket/ems @@ -246,9 +246,9 @@ icon_state = "surgical" blood_overlay_type = "armor" body_parts_covered = UPPER_TORSO|LOWER_TORSO - allowed = list(/obj/item/stack/medical, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/hypospray, /obj/item/weapon/reagent_containers/syringe, \ - /obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/weapon/tank/emergency/oxygen,/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/retractor,/obj/item/weapon/surgical/hemostat, \ - /obj/item/weapon/surgical/cautery,/obj/item/weapon/surgical/bonegel,/obj/item/weapon/surgical/FixOVein) + allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe, \ + /obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/radio, /obj/item/tank/emergency/oxygen,/obj/item/surgical/scalpel,/obj/item/surgical/retractor,/obj/item/surgical/hemostat, \ + /obj/item/surgical/cautery,/obj/item/surgical/bonegel,/obj/item/surgical/FixOVein) //Mime /obj/item/clothing/suit/suspenders diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 29c0e105a4c..bd75d0b0b45 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -6,7 +6,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, /obj/item/clothing/mask/gas) + 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, /obj/item/clothing/mask/gas) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0) /obj/item/clothing/suit/storage/toggle/labcoat/red diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index ee536039037..4350fba4c07 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -21,7 +21,7 @@ item_state_slots = list(slot_r_hand_str = "tdblue", slot_l_hand_str = "tdblue") blood_overlay_type = "armor" body_parts_covered = UPPER_TORSO - allowed = list (/obj/item/weapon/gun/energy/lasertag/blue) + allowed = list (/obj/item/gun/energy/lasertag/blue) siemens_coefficient = 3.0 var/lasertag_health = LASER_TAG_HEALTH @@ -37,7 +37,7 @@ item_state_slots = list(slot_r_hand_str = "tdred", slot_l_hand_str = "tdred") blood_overlay_type = "armor" body_parts_covered = UPPER_TORSO - allowed = list (/obj/item/weapon/gun/energy/lasertag/red) + allowed = list (/obj/item/gun/energy/lasertag/red) siemens_coefficient = 3.0 var/lasertag_health = LASER_TAG_HEALTH @@ -153,7 +153,7 @@ desc = "This robe commands authority." icon_state = "judge" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - allowed = list(/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/spacecash) + allowed = list(/obj/item/storage/fancy/cigarettes,/obj/item/spacecash) flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER /obj/item/clothing/suit/storage/apron/overalls @@ -167,7 +167,7 @@ icon_state = "syndicate" desc = "A plastic replica of a mercenary combat space suit, you'll look just like a real bloodthirsty mercenary in this! This is a toy, it is not made for use in space!" w_class = ITEMSIZE_NORMAL - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen,/obj/item/toy) + allowed = list(/obj/item/flashlight,/obj/item/tank/emergency/oxygen,/obj/item/toy) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET @@ -398,7 +398,7 @@ name = "leather coat" desc = "A long, thick black leather coat." icon_state = "leathercoat_alt" - 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) item_state_slots = list(slot_r_hand_str = "leather_jacket", slot_l_hand_str = "leather_jacket") flags_inv = HIDEHOLSTER @@ -413,7 +413,7 @@ name = "brown leather coat" desc = "A long, brown leather coat." icon_state = "browncoat" - 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) item_state_slots = list(slot_r_hand_str = "brown_jacket", slot_l_hand_str = "brown_jacket") flags_inv = HIDEHOLSTER @@ -421,7 +421,7 @@ name = "black coat" desc = "A flowing, black coat." icon_state = "neocoat" - 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) item_state_slots = list(slot_r_hand_str = "leather_jacket", slot_l_hand_str = "leather_jacket") flags_inv = HIDEHOLSTER @@ -444,7 +444,7 @@ desc = "A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. The coat appears to have its kevlar lining removed." icon_state = "detective" blood_overlay_type = "coat" - allowed = list(/obj/item/weapon/tank/emergency/oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/taperecorder,/obj/item/device/uv_light) + allowed = list(/obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/taperecorder,/obj/item/uv_light) flags_inv = HIDEHOLSTER /obj/item/clothing/suit/storage/trench/grey @@ -466,7 +466,7 @@ desc = "A duster is a light, loose-fitting long coat. Dusters are meant to protect your clothing from dust and rain." icon_state = "duster" blood_overlay_type = "coat" - allowed = list(/obj/item/weapon/tank/emergency/oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter) + allowed = list(/obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter) flags_inv = HIDEHOLSTER /obj/item/clothing/suit/storage/toggle/cardigan @@ -613,7 +613,7 @@ desc = "A thick, well-worn WW2 leather bomber jacket." icon_state = "bomber" item_state_slots = list(slot_r_hand_str = "brown_jacket", slot_l_hand_str = "brown_jacket") - 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) body_parts_covered = UPPER_TORSO|ARMS flags_inv = HIDEHOLSTER cold_protection = UPPER_TORSO|ARMS @@ -640,7 +640,7 @@ name = "leather jacket" desc = "A black leather coat." icon_state = "leather_jacket" - 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) body_parts_covered = UPPER_TORSO|ARMS flags_inv = HIDEHOLSTER @@ -676,7 +676,7 @@ desc = "A brown leather coat." icon_state = "brown_jacket" item_state_slots = list(slot_r_hand_str = "brown_jacket", slot_l_hand_str = "brown_jacket") - 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) body_parts_covered = UPPER_TORSO|ARMS flags_inv = HIDEHOLSTER @@ -704,7 +704,7 @@ desc = "A denim coat." icon_state = "denim_jacket" item_state_slots = list(slot_r_hand_str = "denim_jacket", slot_l_hand_str = "denim_jacket") - 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) body_parts_covered = UPPER_TORSO|ARMS flags_inv = HIDEHOLSTER @@ -814,7 +814,7 @@ name = "black varsity jacket" desc = "A favorite of jocks everywhere from Sol to Nyx." icon_state = "varsity" - 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) item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black") flags_inv = HIDETIE|HIDEHOLSTER @@ -842,7 +842,7 @@ name = "runner jacket" desc = "A yellow sports jacket with white trim and an unfolded collar." icon_state = "runner" - 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) item_state_slots = list(slot_r_hand_str = "suit_red", slot_l_hand_str = "suit_red") flags_inv = HIDEHOLSTER @@ -905,7 +905,7 @@ desc = "A track jacket, for the athletic." icon_state = "trackjacket" item_state_slots = list(slot_r_hand_str = "black_labcoat", slot_l_hand_str = "black_labcoat") - 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/toggle/track/blue name = "blue track jacket" @@ -935,7 +935,7 @@ desc = "A comfy, grey flannel shirt. Unleash your inner hipster." icon_state = "flannel" item_state_slots = list(slot_r_hand_str = "black_labcoat", slot_l_hand_str = "black_labcoat") - 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) flags_inv = HIDEHOLSTER var/rolled = 0 var/tucked = 0 @@ -1043,7 +1043,7 @@ cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, 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) + 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/snowsuit/command name = "command snowsuit" @@ -1146,7 +1146,7 @@ name = "motorcycle jacket" desc = "A recreation of one of the famous Sol-based biwheeled driver assemblies. Patches on the back denote an AI-generated 'biker logo'. It looks unintelligible." icon_state = "motojacket" - 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) //same as leather jackets + 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) //same as leather jackets body_parts_covered = UPPER_TORSO|ARMS /obj/item/clothing/suit/storage/punkvest diff --git a/code/modules/clothing/suits/solgov.dm b/code/modules/clothing/suits/solgov.dm index a20ce165ee4..5976833d5ca 100644 --- a/code/modules/clothing/suits/solgov.dm +++ b/code/modules/clothing/suits/solgov.dm @@ -16,7 +16,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) valid_accessory_slots = (ACCESSORY_SLOT_ARMBAND|ACCESSORY_SLOT_MEDAL|ACCESSORY_SLOT_INSIGNIA|ACCESSORY_SLOT_RANK|ACCESSORY_SLOT_DEPT) restricted_accessory_slots = (ACCESSORY_SLOT_ARMBAND) @@ -186,7 +186,7 @@ body_parts_covered = UPPER_TORSO|ARMS armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.9 - allowed = list(/obj/item/weapon/tank/emergency/oxygen,/obj/item/device/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/device/radio,/obj/item/weapon/pen) + allowed = list(/obj/item/tank/emergency/oxygen,/obj/item/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/radio,/obj/item/pen) valid_accessory_slots = (ACCESSORY_SLOT_MEDAL|ACCESSORY_SLOT_RANK) restricted_accessory_slots = (ACCESSORY_SLOT_ARMBAND) @@ -267,7 +267,7 @@ body_parts_covered = UPPER_TORSO|ARMS armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.9 - allowed = list(/obj/item/weapon/tank/emergency,/obj/item/device/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/device/radio,/obj/item/weapon/pen) + allowed = list(/obj/item/tank/emergency,/obj/item/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/radio,/obj/item/pen) valid_accessory_slots = (ACCESSORY_SLOT_MEDAL|ACCESSORY_SLOT_RANK) /obj/item/clothing/suit/dress/solgov/fleet/sailor @@ -365,7 +365,7 @@ body_parts_covered = UPPER_TORSO|ARMS armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.9 - allowed = list(/obj/item/weapon/tank/emergency,/obj/item/device/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/device/radio,/obj/item/weapon/pen) + allowed = list(/obj/item/tank/emergency,/obj/item/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/radio,/obj/item/pen) valid_accessory_slots = (ACCESSORY_SLOT_MEDAL|ACCESSORY_SLOT_RANK) /obj/item/clothing/suit/dress/terran/navy diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm index 7d201bc7d65..70ad69fa23c 100644 --- a/code/modules/clothing/suits/storage.dm +++ b/code/modules/clothing/suits/storage.dm @@ -1,9 +1,9 @@ /obj/item/clothing/suit/storage - var/obj/item/weapon/storage/internal/pockets + var/obj/item/storage/internal/pockets /obj/item/clothing/suit/storage/New() ..() - pockets = new/obj/item/weapon/storage/internal(src) + pockets = new/obj/item/storage/internal(src) pockets.max_w_class = ITEMSIZE_SMALL //fit only pocket sized items pockets.max_storage_space = ITEMSIZE_COST_SMALL * 2 @@ -93,7 +93,7 @@ //New Vest 4 pocket storage and badge toggles, until suit accessories are a thing. /obj/item/clothing/suit/storage/vest/heavy/New() ..() - pockets = new/obj/item/weapon/storage/internal(src) + pockets = new/obj/item/storage/internal(src) pockets.max_w_class = ITEMSIZE_SMALL pockets.max_storage_space = ITEMSIZE_COST_SMALL * 4 diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index f465941ed7e..444e1099c4b 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -18,7 +18,7 @@ gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen,/obj/item/weapon/extinguisher) + allowed = list(/obj/item/flashlight,/obj/item/tank/emergency/oxygen,/obj/item/extinguisher) slowdown = 1.0 flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER item_flags = 0 @@ -72,7 +72,7 @@ /obj/item/clothing/suit/bomb_suit/security icon_state = "bombsuitsec" - allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs) + allowed = list(/obj/item/gun/energy,/obj/item/melee/baton,/obj/item/handcuffs) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS /* @@ -95,7 +95,7 @@ gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen,/obj/item/clothing/head/radiation,/obj/item/clothing/mask/gas) + allowed = list(/obj/item/flashlight,/obj/item/tank/emergency/oxygen,/obj/item/clothing/head/radiation,/obj/item/clothing/mask/gas) slowdown = 1.5 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100) flags_inv = HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER diff --git a/code/modules/clothing/suits/utility_vr.dm b/code/modules/clothing/suits/utility_vr.dm index 17f796ca85c..69e8acafe2a 100644 --- a/code/modules/clothing/suits/utility_vr.dm +++ b/code/modules/clothing/suits/utility_vr.dm @@ -13,7 +13,7 @@ blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO 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) /obj/item/clothing/head/radiation diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 903fca84103..c6c66805a22 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -65,7 +65,7 @@ gas_transfer_coefficient = 0.01 // IT'S MAGICAL OKAY JEEZ +1 TO NOT DIE permeability_coefficient = 0.01 armor = list(melee = 30, bullet = 20, laser = 20,energy = 20, bomb = 20, bio = 20, rad = 20) - allowed = list(/obj/item/weapon/teleportation_scroll) + allowed = list(/obj/item/teleportation_scroll) flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER siemens_coefficient = 0.8 wizard_garb = 1 diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index f03ae21b0a8..0eee58a901d 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -323,11 +323,11 @@ if(istype(src,/obj/item/clothing/accessory/collar/holo)) return - if(istype(I,/obj/item/weapon/tool/screwdriver)) + if(istype(I,/obj/item/tool/screwdriver)) update_collartag(user, I, "scratched out", "scratch out", "engraved") return - if(istype(I,/obj/item/weapon/pen)) + if(istype(I,/obj/item/pen)) update_collartag(user, I, "crossed out", "cross out", "written") return @@ -501,7 +501,7 @@ user.drop_from_inventory(src) qdel(src) return - if (!istype(component,/obj/item/device/assembly/signaler)) + if (!istype(component,/obj/item/assembly/signaler)) ..() return to_chat(user, "You wire the signaler into the [src].") @@ -532,7 +532,7 @@ user.drop_from_inventory(src) qdel(src) return - if (!istype(component,/obj/item/device/assembly/signaler)) + if (!istype(component,/obj/item/assembly/signaler)) ..() return to_chat(user, "There is already a signaler wired to the [src].") @@ -652,7 +652,7 @@ var/currently_shrinking = 0 /obj/item/clothing/accessory/collar/shock/bluespace/malfunctioning/attackby(var/obj/item/component, mob/user as mob) - if (!istype(component,/obj/item/device/assembly/signaler)) + if (!istype(component,/obj/item/assembly/signaler)) ..() return to_chat(user, "The signaler doesn't respond to the connection attempt [src].") @@ -781,7 +781,7 @@ icon_state = "holster_machete" slot = ACCESSORY_SLOT_WEAPON concealed_holster = 0 - can_hold = list(/obj/item/weapon/material/knife/machete, /obj/item/weapon/kinetic_crusher/machete) + can_hold = list(/obj/item/material/knife/machete, /obj/item/kinetic_crusher/machete) //sound_in = 'sound/effects/holster/sheathin.ogg' //sound_out = 'sound/effects/holster/sheathout.ogg' diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 8f4ba015b60..4cfae8e745a 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -102,14 +102,14 @@ return 1 /obj/item/clothing/accessory/badge/holo/attackby(var/obj/item/O as obj, var/mob/user as mob) - if(istype(O, /obj/item/weapon/card/id) || istype(O, /obj/item/device/pda)) + if(istype(O, /obj/item/card/id) || istype(O, /obj/item/pda)) - var/obj/item/weapon/card/id/id_card = null + var/obj/item/card/id/id_card = null - if(istype(O, /obj/item/weapon/card/id)) + if(istype(O, /obj/item/card/id)) id_card = O else - var/obj/item/device/pda/pda = O + var/obj/item/pda/pda = O id_card = pda.id var/found = FALSE @@ -124,7 +124,7 @@ return ..() -/obj/item/weapon/storage/box/holobadge +/obj/item/storage/box/holobadge name = "holobadge box" desc = "A box claiming to contain holobadges." starts_with = list( @@ -171,7 +171,7 @@ icon_state = "sheriff" slot_flags = SLOT_TIE | SLOT_BELT -/obj/item/weapon/storage/box/holobadge/hos +/obj/item/storage/box/holobadge/hos name = "holobadge box" desc = "A box claiming to contain holobadges." starts_with = list( diff --git a/code/modules/clothing/under/accessories/badges_vr.dm b/code/modules/clothing/under/accessories/badges_vr.dm index a3fa5e1fd5b..10f66c26ed4 100644 --- a/code/modules/clothing/under/accessories/badges_vr.dm +++ b/code/modules/clothing/under/accessories/badges_vr.dm @@ -9,11 +9,11 @@ item_state = "dosimeter" overlay_state = "dosimeter" slot_flags = SLOT_TIE - var/obj/item/weapon/dosimeter_film/current_film = null + var/obj/item/dosimeter_film/current_film = null /obj/item/clothing/accessory/dosimeter/New() ..() - current_film = new /obj/item/weapon/dosimeter_film(src) + current_film = new /obj/item/dosimeter_film(src) update_state(current_film.state) START_PROCESSING(SSobj, src) @@ -40,7 +40,7 @@ return ..() /obj/item/clothing/accessory/dosimeter/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/weapon/dosimeter_film)) + if(istype(I, /obj/item/dosimeter_film)) if(!current_film) user.drop_item() I.loc = src @@ -78,7 +78,7 @@ icon_state = "[initial(icon_state)]-empty" update_icon() -/obj/item/weapon/dosimeter_film +/obj/item/dosimeter_film name = "dosimeter film" desc = "These films can be inserted into dosimeters. It turns from white to black, depending on how much radiation it endured." w_class = ITEMSIZE_SMALL @@ -87,11 +87,11 @@ icon_state = "dosimeter_film0" var/state = 0 //0 - White, 1 - Darker, 2 - Black (same as iconstates) -/obj/item/weapon/dosimeter_film/proc/update_state(var/tostate) +/obj/item/dosimeter_film/proc/update_state(var/tostate) icon_state = tostate update_icon() -/obj/item/weapon/paper/dosimeter_manual +/obj/item/paper/dosimeter_manual name = "Dosimeter manual" info = {"

Dosimeter

Usage
@@ -106,7 +106,7 @@ A white film indicates that everything is alright. A darker film indicates, that the radiation level is starting to get dangerous for your body. The body has absorbed too much radiation if the film turned black.

"} -/obj/item/weapon/storage/box/dosimeter +/obj/item/storage/box/dosimeter name = "dosimeter case" desc = "This case can only hold the Dosimeter, a few films and a manual." icon = 'icons/inventory/accessory/item_vr.dmi' @@ -114,14 +114,14 @@ icon_state = "dosimeter_case" item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") storage_slots = 5 - can_hold = list(/obj/item/weapon/paper/dosimeter_manual, /obj/item/clothing/accessory/dosimeter, /obj/item/weapon/dosimeter_film) + can_hold = list(/obj/item/paper/dosimeter_manual, /obj/item/clothing/accessory/dosimeter, /obj/item/dosimeter_film) max_storage_space = (ITEMSIZE_COST_SMALL * 4) + (ITEMSIZE_COST_TINY * 1) w_class = ITEMSIZE_SMALL -/obj/item/weapon/storage/box/dosimeter/New() +/obj/item/storage/box/dosimeter/New() ..() - new /obj/item/weapon/paper/dosimeter_manual(src) + new /obj/item/paper/dosimeter_manual(src) new /obj/item/clothing/accessory/dosimeter(src) - new /obj/item/weapon/dosimeter_film(src) - new /obj/item/weapon/dosimeter_film(src) - new /obj/item/weapon/dosimeter_film(src) \ No newline at end of file + new /obj/item/dosimeter_film(src) + new /obj/item/dosimeter_film(src) + new /obj/item/dosimeter_film(src) \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index 42c2e9f3b97..aac2b495ec6 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -166,7 +166,7 @@ item_state = "classicponcho" icon_override = 'icons/inventory/accessory/mob.dmi' var/fire_resist = T0C+100 - allowed = list(/obj/item/weapon/tank/emergency/oxygen) + allowed = list(/obj/item/tank/emergency/oxygen) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) slot_flags = SLOT_OCLOTHING | SLOT_TIE body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS @@ -359,7 +359,7 @@ item_state = "vest" icon_override = 'icons/inventory/accessory/mob.dmi' item_state_slots = list(slot_r_hand_str = "wcoat", slot_l_hand_str = "wcoat") - 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) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) slot_flags = SLOT_OCLOTHING | SLOT_TIE body_parts_covered = UPPER_TORSO|LOWER_TORSO @@ -543,7 +543,7 @@ icon_state = "klbr" icon_override = 'icons/inventory/accessory/mob.dmi' item_state_slots = list(SLOT_ID_RIGHT_HAND = "armor", SLOT_ID_LEFT_HAND = "armor") - allowed = list(/obj/item/weapon/gun,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight/maglight,/obj/item/clothing/head/helmet) + allowed = list(/obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/flashlight/maglight,/obj/item/clothing/head/helmet) slot_flags = SLOT_OCLOTHING | SLOT_TIE body_parts_covered = UPPER_TORSO|ARMS siemens_coefficient = 0.9 diff --git a/code/modules/clothing/under/accessories/holster_vr.dm b/code/modules/clothing/under/accessories/holster_vr.dm index 5032134302d..3678e7629f7 100644 --- a/code/modules/clothing/under/accessories/holster_vr.dm +++ b/code/modules/clothing/under/accessories/holster_vr.dm @@ -1,7 +1,7 @@ /obj/item/clothing/accessory/holster/waist/kinetic_accelerator name = "KA holster" desc = "A specialized holster, made specifically for Kinetic Accelerators." - can_hold = list(/obj/item/weapon/gun/energy/kinetic_accelerator) + can_hold = list(/obj/item/gun/energy/kinetic_accelerator) /obj/item/clothing/accessory/holster/waist/lanyard name = "baton lanyard" @@ -9,9 +9,9 @@ icon_state = "holster_lanyard" overlay_state = "holster_lanyard" can_hold = list( - /obj/item/weapon/melee/baton, - /obj/item/weapon/melee/classic_baton, - /obj/item/weapon/melee/telebaton + /obj/item/melee/baton, + /obj/item/melee/classic_baton, + /obj/item/melee/telebaton ) /obj/item/clothing/accessory/holster/machete/rapier @@ -23,18 +23,18 @@ var/has_full_icon = 1 icon_override = 'icons/inventory/accessory/mob_vr.dmi' overlay_state = "sheath" - can_hold = list(/obj/item/weapon/melee/rapier) + can_hold = list(/obj/item/melee/rapier) /obj/item/clothing/accessory/holster/machete/rapier/swords name = "sword sheath" desc = "A beautiful red sheath, probably for a beautiful blade." can_hold = list( - /obj/item/weapon/melee/rapier, - /obj/item/weapon/material/sword/katana, + /obj/item/melee/rapier, + /obj/item/material/sword/katana, /obj/item/toy/cultsword, - /obj/item/weapon/material/sword, - /obj/item/weapon/melee/cursedblade, - /obj/item/weapon/melee/cultblade + /obj/item/material/sword, + /obj/item/melee/cursedblade, + /obj/item/melee/cultblade ) /obj/item/clothing/accessory/holster/machete/rapier/proc/occupied() diff --git a/code/modules/clothing/under/accessories/lockets.dm b/code/modules/clothing/under/accessories/lockets.dm index ef9ea3623ac..ee610474615 100644 --- a/code/modules/clothing/under/accessories/lockets.dm +++ b/code/modules/clothing/under/accessories/lockets.dm @@ -35,7 +35,7 @@ to_chat(user, "You have to open it first.") return - if(istype(O,/obj/item/weapon/paper) || istype(O, /obj/item/weapon/photo)) + if(istype(O,/obj/item/paper) || istype(O, /obj/item/photo)) if(held) to_chat(usr, "\The [src] already has something inside it.") else diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index 0bd0549e7a2..45d5cb6ac54 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -6,14 +6,14 @@ show_messages = 1 var/slots = 5 - var/obj/item/weapon/storage/internal/hold + var/obj/item/storage/internal/hold w_class = ITEMSIZE_NORMAL on_rolled = list("down" = "none") var/hide_on_roll = FALSE /obj/item/clothing/accessory/storage/Initialize() . = ..() - hold = new/obj/item/weapon/storage/internal(src) + hold = new/obj/item/storage/internal(src) hold.max_storage_space = slots * 2 hold.max_w_class = ITEMSIZE_SMALL if (!hide_on_roll) @@ -97,9 +97,9 @@ /obj/item/clothing/accessory/storage/knifeharness/Initialize() . = ..() hold.max_storage_space = ITEMSIZE_COST_SMALL * 2 - hold.can_hold = list(/obj/item/weapon/material/knife/machete/hatchet/unathiknife,\ - /obj/item/weapon/material/knife,\ - /obj/item/weapon/material/knife/plastic) + hold.can_hold = list(/obj/item/material/knife/machete/hatchet/unathiknife,\ + /obj/item/material/knife,\ + /obj/item/material/knife/plastic) - new /obj/item/weapon/material/knife/machete/hatchet/unathiknife(hold) - new /obj/item/weapon/material/knife/machete/hatchet/unathiknife(hold) + new /obj/item/material/knife/machete/hatchet/unathiknife(hold) + new /obj/item/material/knife/machete/hatchet/unathiknife(hold) diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm index 5c559edadc2..66fc766f1f7 100644 --- a/code/modules/customitems/item_spawning.dm +++ b/code/modules/customitems/item_spawning.dm @@ -69,8 +69,8 @@ U.update_rolldown_status() // Kits are dumb so this is going to have to be hardcoded/snowflake. - if(istype(item, /obj/item/device/kit)) - var/obj/item/device/kit/K = item + if(istype(item, /obj/item/kit)) + var/obj/item/kit/K = item K.set_info(kit_name, kit_desc, kit_icon, additional_data = additional_data) return item @@ -189,7 +189,7 @@ continue // Check for required access. - var/obj/item/weapon/card/id/current_id = M.wear_id + var/obj/item/card/id/current_id = M.wear_id if(citem.req_access && citem.req_access > 0) // These are numbers, not lists if(!(istype(current_id) && (citem.req_access in current_id.GetAccess()))) log_debug("Custom Item: [key_name(M)] Does not have required access.") @@ -209,12 +209,12 @@ // ID cards and PDAs are applied directly to the existing object rather than spawned fresh. var/obj/item/existing_item - if(citem.item_path == /obj/item/weapon/card/id && istype(current_id)) //Set earlier. + if(citem.item_path == /obj/item/card/id && istype(current_id)) //Set earlier. existing_item = M.wear_id - else if(citem.item_path == /obj/item/device/pda) - existing_item = locate(/obj/item/device/pda) in M.contents - else if(citem.item_path == /obj/item/weapon/storage/backpack) - existing_item = locate(/obj/item/weapon/storage/backpack) in M.contents + else if(citem.item_path == /obj/item/pda) + existing_item = locate(/obj/item/pda) in M.contents + else if(citem.item_path == /obj/item/storage/backpack) + existing_item = locate(/obj/item/storage/backpack) in M.contents // Spawn and equip the item. if(existing_item) diff --git a/code/modules/detectivework/forensics.dm b/code/modules/detectivework/forensics.dm index 3f6dc119d00..9e7e0d2c88d 100644 --- a/code/modules/detectivework/forensics.dm +++ b/code/modules/detectivework/forensics.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/forensics +/obj/item/forensics icon = 'icons/obj/forensics.dmi' w_class = ITEMSIZE_TINY diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm index 340158eba82..2833999aa5b 100644 --- a/code/modules/detectivework/microscope/dnascanner.dm +++ b/code/modules/detectivework/microscope/dnascanner.dm @@ -6,9 +6,9 @@ icon_state = "dnaopen" anchored = TRUE density = TRUE - circuit = /obj/item/weapon/circuitboard/dna_analyzer + circuit = /obj/item/circuitboard/dna_analyzer - var/obj/item/weapon/forensics/swab/bloodsamp = null + var/obj/item/forensics/swab/bloodsamp = null var/scanning = 0 var/scanner_progress = 0 var/scanner_rate = 5 @@ -33,7 +33,7 @@ if(default_deconstruction_crowbar(user, W)) return - var/obj/item/weapon/forensics/swab/swab = W + var/obj/item/forensics/swab/swab = W if(istype(swab) && swab.is_used()) user.unEquip(W) bloodsamp = swab @@ -108,9 +108,9 @@ visible_message("[icon2html(src,viewers(src))] makes an insistent chime.", 2) update_icon() if(bloodsamp) - var/obj/item/weapon/paper/P = new(src) + var/obj/item/paper/P = new(src) P.name = "[src] report #[++report_num]: [bloodsamp.name]" - P.stamped = list(/obj/item/weapon/stamp) + P.stamped = list(/obj/item/stamp) P.cut_overlays() P.add_overlay("paper_stamped") //dna data itself diff --git a/code/modules/detectivework/microscope/microscope.dm b/code/modules/detectivework/microscope/microscope.dm index 575465d0e00..760e61b60ff 100644 --- a/code/modules/detectivework/microscope/microscope.dm +++ b/code/modules/detectivework/microscope/microscope.dm @@ -7,16 +7,16 @@ anchored = TRUE density = TRUE - var/obj/item/weapon/sample = null + var/obj/item/sample = null var/report_num = 0 -/obj/machinery/microscope/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/microscope/attackby(obj/item/W as obj, mob/user as mob) if(sample) to_chat(user, "There is already a slide in the microscope.") return - if(istype(W, /obj/item/weapon/forensics/swab)|| istype(W, /obj/item/weapon/sample/fibers) || istype(W, /obj/item/weapon/sample/print)) + if(istype(W, /obj/item/forensics/swab)|| istype(W, /obj/item/sample/fibers) || istype(W, /obj/item/sample/print)) to_chat(user, "You insert \the [W] into the microscope.") user.unEquip(W) W.forceMove(src) @@ -37,13 +37,13 @@ return to_chat(user, "Printing findings now...") - var/obj/item/weapon/paper/report = new(get_turf(src)) - report.stamped = list(/obj/item/weapon/stamp) + var/obj/item/paper/report = new(get_turf(src)) + report.stamped = list(/obj/item/stamp) report.overlays = list("paper_stamped") report_num++ - if(istype(sample, /obj/item/weapon/forensics/swab)) - var/obj/item/weapon/forensics/swab/swab = sample + if(istype(sample, /obj/item/forensics/swab)) + var/obj/item/forensics/swab/swab = sample report.name = "GSR report #[++report_num]: [swab.name]" report.info = "Scanned item:
[swab.name]

" @@ -53,8 +53,8 @@ else report.info += "No gunpowder residue found." - else if(istype(sample, /obj/item/weapon/sample/fibers)) - var/obj/item/weapon/sample/fibers/fibers = sample + else if(istype(sample, /obj/item/sample/fibers)) + var/obj/item/sample/fibers/fibers = sample report.name = "Fiber report #[++report_num]: [fibers.name]" report.info = "Scanned item:
[fibers.name]

" if(fibers.evidence) @@ -63,10 +63,10 @@ report.info += "Most likely match for fibers: [fiber]

" else report.info += "No fibers found." - else if(istype(sample, /obj/item/weapon/sample/print)) + else if(istype(sample, /obj/item/sample/print)) report.name = "Fingerprint report #[report_num]: [sample.name]" report.info = "Fingerprint analysis report #[report_num]: [sample.name]
" - var/obj/item/weapon/sample/print/card = sample + var/obj/item/sample/print/card = sample if(card.evidence && card.evidence.len) report.info += "Surface analysis has determined unique fingerprint strings:

" for(var/prints in card.evidence) diff --git a/code/modules/detectivework/tools/crimekit.dm b/code/modules/detectivework/tools/crimekit.dm index 395aca8b496..c34e928597c 100644 --- a/code/modules/detectivework/tools/crimekit.dm +++ b/code/modules/detectivework/tools/crimekit.dm @@ -1,5 +1,5 @@ //crime scene kit -/obj/item/weapon/storage/briefcase/crimekit +/obj/item/storage/briefcase/crimekit name = "crime scene kit" desc = "A stainless steel-plated carrycase for all your forensic needs. Feels heavy." icon = 'icons/obj/forensics.dmi' @@ -8,11 +8,11 @@ drop_sound = 'sound/items/drop/toolbox.ogg' pickup_sound = 'sound/items/pickup/toolbox.ogg' -/obj/item/weapon/storage/briefcase/crimekit/New() +/obj/item/storage/briefcase/crimekit/New() ..() - new /obj/item/weapon/storage/box/swabs(src) - new /obj/item/weapon/storage/box/fingerprints(src) - new /obj/item/weapon/reagent_containers/spray/luminol(src) - new /obj/item/device/uv_light(src) - new /obj/item/weapon/forensics/sample_kit(src) - new /obj/item/weapon/forensics/sample_kit/powder(src) \ No newline at end of file + new /obj/item/storage/box/swabs(src) + new /obj/item/storage/box/fingerprints(src) + new /obj/item/reagent_containers/spray/luminol(src) + new /obj/item/uv_light(src) + new /obj/item/forensics/sample_kit(src) + new /obj/item/forensics/sample_kit/powder(src) \ No newline at end of file diff --git a/code/modules/detectivework/tools/evidencebag.dm b/code/modules/detectivework/tools/evidencebag.dm index 846528a8f9f..c6a2faed873 100644 --- a/code/modules/detectivework/tools/evidencebag.dm +++ b/code/modules/detectivework/tools/evidencebag.dm @@ -1,6 +1,6 @@ //CONTAINS: Evidence bags and fingerprint cards -/obj/item/weapon/evidencebag +/obj/item/evidencebag name = "evidence bag" desc = "An empty evidence bag." icon = 'icons/obj/storage.dmi' @@ -9,7 +9,7 @@ w_class = ITEMSIZE_SMALL var/obj/item/stored_item = null -/obj/item/weapon/evidencebag/MouseDrop(var/obj/item/I as obj) +/obj/item/evidencebag/MouseDrop(var/obj/item/I as obj) if (!ishuman(usr)) return if(!istype(I) || I.anchored) @@ -25,12 +25,12 @@ return else //If it isn't on the floor. Do some checks to see if it's in our hands or a box. Otherwise give up. - if(istype(I.loc,/obj/item/weapon/storage)) //in a container. + if(istype(I.loc,/obj/item/storage)) //in a container. var/sdepth = I.storage_depth(user) if (sdepth == -1 || sdepth > 1) return //too deeply nested to access - var/obj/item/weapon/storage/U = I.loc + var/obj/item/storage/U = I.loc user.client.screen -= I U.contents.Remove(I) else if(user.item_is_in_hands(I)) @@ -38,7 +38,7 @@ else return - if(istype(I, /obj/item/weapon/evidencebag)) + if(istype(I, /obj/item/evidencebag)) to_chat(user, "You find putting an evidence bag in another evidence bag to be slightly absurd.") return @@ -72,7 +72,7 @@ return -/obj/item/weapon/evidencebag/attack_self(mob/user as mob) +/obj/item/evidencebag/attack_self(mob/user as mob) if(contents.len) var/obj/item/I = contents[1] user.visible_message("[user] takes [I] out of [src]", "You take [I] out of [src].",\ @@ -90,7 +90,7 @@ icon_state = "evidenceobj" return -/obj/item/weapon/evidencebag/examine(mob/user) +/obj/item/evidencebag/examine(mob/user) . = ..() if(stored_item) user.examinate(stored_item) diff --git a/code/modules/detectivework/tools/luminol.dm b/code/modules/detectivework/tools/luminol.dm index 48636370bc3..560522508dc 100644 --- a/code/modules/detectivework/tools/luminol.dm +++ b/code/modules/detectivework/tools/luminol.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/reagent_containers/spray/luminol +/obj/item/reagent_containers/spray/luminol name = "luminol bottle" desc = "A bottle containing an odourless, colorless liquid." icon = 'icons/obj/forensics.dmi' @@ -8,6 +8,6 @@ possible_transfer_amounts = list(5,10) volume = 250 -/obj/item/weapon/reagent_containers/spray/luminol/Initialize() +/obj/item/reagent_containers/spray/luminol/Initialize() . = ..() reagents.add_reagent("luminol", 250) \ No newline at end of file diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index 4d9c009e10d..75d303e0bed 100644 --- a/code/modules/detectivework/tools/rag.dm +++ b/code/modules/detectivework/tools/rag.dm @@ -13,7 +13,7 @@ /obj/item/clothing/shoes/ var/track_blood = 0 -/obj/item/weapon/reagent_containers/glass/rag +/obj/item/reagent_containers/glass/rag name = "rag" desc = "For cleaning up messes, you suppose." w_class = ITEMSIZE_TINY @@ -31,15 +31,15 @@ var/on_fire = 0 var/burn_time = 20 //if the rag burns for too long it turns to ashes -/obj/item/weapon/reagent_containers/glass/rag/Initialize() +/obj/item/reagent_containers/glass/rag/Initialize() . = ..() update_name() -/obj/item/weapon/reagent_containers/glass/rag/Destroy() +/obj/item/reagent_containers/glass/rag/Destroy() STOP_PROCESSING(SSobj, src) //so we don't continue turning to ash while gc'd return ..() -/obj/item/weapon/reagent_containers/glass/rag/attack_self(mob/user as mob) +/obj/item/reagent_containers/glass/rag/attack_self(mob/user as mob) if(on_fire) user.visible_message("\The [user] stamps out [src].", "You stamp out [src].") user.unEquip(src) @@ -47,9 +47,9 @@ else remove_contents(user) -/obj/item/weapon/reagent_containers/glass/rag/attackby(obj/item/W, mob/user) - if(!on_fire && istype(W, /obj/item/weapon/flame)) - var/obj/item/weapon/flame/F = W +/obj/item/reagent_containers/glass/rag/attackby(obj/item/W, mob/user) + if(!on_fire && istype(W, /obj/item/flame)) + var/obj/item/flame/F = W if(F.lit) src.ignite() if(on_fire) @@ -60,7 +60,7 @@ . = ..() update_name() -/obj/item/weapon/reagent_containers/glass/rag/proc/update_name() +/obj/item/reagent_containers/glass/rag/proc/update_name() if(on_fire) name = "burning [initial(name)]" else if(reagents.total_volume) @@ -68,17 +68,17 @@ else name = "dry [initial(name)]" -/obj/item/weapon/reagent_containers/glass/rag/update_icon() +/obj/item/reagent_containers/glass/rag/update_icon() if(on_fire) icon_state = "raglit" else icon_state = "rag" - var/obj/item/weapon/reagent_containers/food/drinks/bottle/B = loc + var/obj/item/reagent_containers/food/drinks/bottle/B = loc if(istype(B)) B.update_icon() -/obj/item/weapon/reagent_containers/glass/rag/proc/remove_contents(mob/user, atom/trans_dest = null) +/obj/item/reagent_containers/glass/rag/proc/remove_contents(mob/user, atom/trans_dest = null) if(!trans_dest && !user.loc) return @@ -94,7 +94,7 @@ user.visible_message("\The [user] wrings out [src] over [target_text].", "You finish to wringing out [src].") update_name() -/obj/item/weapon/reagent_containers/glass/rag/proc/wipe_down(atom/A, mob/user) +/obj/item/reagent_containers/glass/rag/proc/wipe_down(atom/A, mob/user) if(!reagents.total_volume) to_chat(user, "The [initial(name)] is dry!") else @@ -104,7 +104,7 @@ user.visible_message("[user] finishes wiping [A]!") A.on_rag_wipe(src) -/obj/item/weapon/reagent_containers/glass/rag/attack(atom/target as obj|turf|area, mob/user as mob , flag) +/obj/item/reagent_containers/glass/rag/attack(atom/target as obj|turf|area, mob/user as mob , flag) if(isliving(target)) //Leaving this as isliving. var/mob/living/M = target if(on_fire) //Check if rag is on fire, if so igniting them and stopping. @@ -137,11 +137,11 @@ wipe_down(target, user) return -/obj/item/weapon/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user as mob, proximity) +/obj/item/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user as mob, proximity) if(!proximity) return - if(istype(A, /obj/structure/reagent_dispensers) || istype(A, /obj/item/weapon/reagent_containers/glass/bucket) || istype(A, /obj/structure/mopbucket)) //VOREStation Edit - "Allows rags to be used on buckets and mopbuckets" + if(istype(A, /obj/structure/reagent_dispensers) || istype(A, /obj/item/reagent_containers/glass/bucket) || istype(A, /obj/structure/mopbucket)) //VOREStation Edit - "Allows rags to be used on buckets and mopbuckets" if(!reagents.get_free_space()) to_chat(user, "\The [src] is already soaked.") return @@ -158,7 +158,7 @@ wipe_down(A, user) return -/obj/item/weapon/reagent_containers/glass/rag/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/item/reagent_containers/glass/rag/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature >= 50 + T0C) src.ignite() if(exposed_temperature >= 900 + T0C) @@ -166,7 +166,7 @@ qdel(src) //rag must have a minimum of 2 units welder fuel or ehtanol based reagents and at least 80% of the reagents must so. -/obj/item/weapon/reagent_containers/glass/rag/proc/can_ignite() +/obj/item/reagent_containers/glass/rag/proc/can_ignite() var/fuel if(reagents.get_reagent_amount("fuel")) fuel += reagents.get_reagent_amount("fuel") @@ -177,7 +177,7 @@ return (fuel >= 2 && fuel >= reagents.total_volume*0.8) -/obj/item/weapon/reagent_containers/glass/rag/proc/ignite() +/obj/item/reagent_containers/glass/rag/proc/ignite() if(on_fire) return if(!can_ignite()) @@ -198,7 +198,7 @@ update_name() update_icon() -/obj/item/weapon/reagent_containers/glass/rag/proc/extinguish() +/obj/item/reagent_containers/glass/rag/proc/extinguish() STOP_PROCESSING(SSobj, src) set_light(0) on_fire = 0 @@ -212,7 +212,7 @@ update_name() update_icon() -/obj/item/weapon/reagent_containers/glass/rag/process() +/obj/item/reagent_containers/glass/rag/process() if(!can_ignite()) visible_message("\The [src] burns out.") extinguish() diff --git a/code/modules/detectivework/tools/sample_kits.dm b/code/modules/detectivework/tools/sample_kits.dm index 042749d0085..dd63a689e54 100644 --- a/code/modules/detectivework/tools/sample_kits.dm +++ b/code/modules/detectivework/tools/sample_kits.dm @@ -1,26 +1,26 @@ -/obj/item/weapon/sample +/obj/item/sample name = "forensic sample" icon = 'icons/obj/forensics.dmi' w_class = ITEMSIZE_TINY var/list/evidence = list() -/obj/item/weapon/sample/New(var/newloc, var/atom/supplied) +/obj/item/sample/New(var/newloc, var/atom/supplied) ..(newloc) if(supplied) copy_evidence(supplied) name = "[initial(name)] (\the [supplied])" -/obj/item/weapon/sample/print/New(var/newloc, var/atom/supplied) +/obj/item/sample/print/New(var/newloc, var/atom/supplied) ..(newloc, supplied) if(evidence && evidence.len) icon_state = "fingerprint1" -/obj/item/weapon/sample/proc/copy_evidence(var/atom/supplied) +/obj/item/sample/proc/copy_evidence(var/atom/supplied) if(supplied.suit_fibers && supplied.suit_fibers.len) evidence = supplied.suit_fibers.Copy() supplied.suit_fibers.Cut() -/obj/item/weapon/sample/proc/merge_evidence(var/obj/item/weapon/sample/supplied, var/mob/user) +/obj/item/sample/proc/merge_evidence(var/obj/item/sample/supplied, var/mob/user) if(!supplied.evidence || !supplied.evidence.len) return 0 evidence |= supplied.evidence @@ -28,7 +28,7 @@ to_chat(user, "You transfer the contents of \the [supplied] into \the [src].") return 1 -/obj/item/weapon/sample/print/merge_evidence(var/obj/item/weapon/sample/supplied, var/mob/user) +/obj/item/sample/print/merge_evidence(var/obj/item/sample/supplied, var/mob/user) if(!supplied.evidence || !supplied.evidence.len) return 0 for(var/print in supplied.evidence) @@ -40,7 +40,7 @@ to_chat(user, "You overlay \the [src] and \the [supplied], combining the print records.") return 1 -/obj/item/weapon/sample/attackby(var/obj/O, var/mob/user) +/obj/item/sample/attackby(var/obj/O, var/mob/user) if(O.type == src.type) user.unEquip(O) if(merge_evidence(O, user)) @@ -48,19 +48,19 @@ return 1 return ..() -/obj/item/weapon/sample/fibers +/obj/item/sample/fibers name = "fiber bag" desc = "Used to hold fiber evidence for the detective." icon_state = "fiberbag" -/obj/item/weapon/sample/print +/obj/item/sample/print name = "fingerprint card" desc = "Records a set of fingerprints." icon = 'icons/obj/card.dmi' icon_state = "fingerprint0" item_state = "paper" -/obj/item/weapon/sample/print/attack_self(var/mob/user) +/obj/item/sample/print/attack_self(var/mob/user) if(evidence && evidence.len) return if(!ishuman(user)) @@ -76,7 +76,7 @@ name = "[initial(name)] (\the [H])" icon_state = "fingerprint1" -/obj/item/weapon/sample/print/attack(var/mob/living/M, var/mob/user) +/obj/item/sample/print/attack(var/mob/living/M, var/mob/user) if(!ishuman(M)) return ..() @@ -115,28 +115,28 @@ return 1 return 0 -/obj/item/weapon/sample/print/copy_evidence(var/atom/supplied) +/obj/item/sample/print/copy_evidence(var/atom/supplied) if(supplied.fingerprints && supplied.fingerprints.len) for(var/print in supplied.fingerprints) evidence[print] = supplied.fingerprints[print] supplied.fingerprints.Cut() -/obj/item/weapon/forensics/sample_kit +/obj/item/forensics/sample_kit name = "fiber collection kit" desc = "A magnifying glass and tweezers. Used to lift suit fibers." icon_state = "m_glass" w_class = ITEMSIZE_SMALL var/evidence_type = "fiber" - var/evidence_path = /obj/item/weapon/sample/fibers + var/evidence_path = /obj/item/sample/fibers -/obj/item/weapon/forensics/sample_kit/proc/can_take_sample(var/mob/user, var/atom/supplied) +/obj/item/forensics/sample_kit/proc/can_take_sample(var/mob/user, var/atom/supplied) return (supplied.suit_fibers && supplied.suit_fibers.len) -/obj/item/weapon/forensics/sample_kit/proc/take_sample(var/mob/user, var/atom/supplied) - var/obj/item/weapon/sample/S = new evidence_path(get_turf(user), supplied) +/obj/item/forensics/sample_kit/proc/take_sample(var/mob/user, var/atom/supplied) + var/obj/item/sample/S = new evidence_path(get_turf(user), supplied) to_chat(user, "You transfer [S.evidence.len] [S.evidence.len > 1 ? "[evidence_type]s" : "[evidence_type]"] to \the [S].") -/obj/item/weapon/forensics/sample_kit/afterattack(var/atom/A, var/mob/user, var/proximity) +/obj/item/forensics/sample_kit/afterattack(var/atom/A, var/mob/user, var/proximity) if(!proximity) return add_fingerprint(user) @@ -147,12 +147,12 @@ to_chat(user, "You are unable to locate any [evidence_type]s on \the [A].") return ..() -/obj/item/weapon/forensics/sample_kit/powder +/obj/item/forensics/sample_kit/powder name = "fingerprint powder" desc = "A jar containing aluminum powder and a specialized brush." icon_state = "dust" evidence_type = "fingerprint" - evidence_path = /obj/item/weapon/sample/print + evidence_path = /obj/item/sample/print -/obj/item/weapon/forensics/sample_kit/powder/can_take_sample(var/mob/user, var/atom/supplied) +/obj/item/forensics/sample_kit/powder/can_take_sample(var/mob/user, var/atom/supplied) return (supplied.fingerprints && supplied.fingerprints.len) diff --git a/code/modules/detectivework/tools/scanner.dm b/code/modules/detectivework/tools/scanner.dm index aaac54eee56..09d1c581825 100644 --- a/code/modules/detectivework/tools/scanner.dm +++ b/code/modules/detectivework/tools/scanner.dm @@ -1,4 +1,4 @@ -/obj/item/device/detective_scanner +/obj/item/detective_scanner name = "forensic scanner" desc = "Used to scan objects for DNA and fingerprints." icon_state = "forensic" @@ -13,7 +13,7 @@ var/reveal_blood = TRUE var/reveal_fibers = FALSE -/obj/item/device/detective_scanner/attack(mob/living/carbon/human/M as mob, mob/user as mob) +/obj/item/detective_scanner/attack(mob/living/carbon/human/M as mob, mob/user as mob) if (!ishuman(M)) to_chat(user, "\The [M] does not seem to be compatible with this device.") flick("[icon_state]0",src) @@ -25,7 +25,7 @@ flick("[icon_state]0",src) return 0 else if(user.zone_sel.selecting == "r_hand" || user.zone_sel.selecting == "l_hand") - var/obj/item/weapon/sample/print/P = new /obj/item/weapon/sample/print(user.loc) + var/obj/item/sample/print/P = new /obj/item/sample/print(user.loc) P.attack(M, user) to_chat(user, "Done printing.") // to_chat(user, "[M]'s Fingerprints: [md5(M.dna.uni_identity)]") @@ -37,7 +37,7 @@ to_chat(user, "Blood type: [M.blood_DNA[blood]]\nDNA: [blood]") return -/obj/item/device/detective_scanner/afterattack(atom/A as obj|turf, mob/user, proximity) +/obj/item/detective_scanner/afterattack(atom/A as obj|turf, mob/user, proximity) if(!proximity) return if(ismob(A)) return @@ -51,7 +51,7 @@ return */ - if(istype(A,/obj/item/weapon/sample/print)) + if(istype(A,/obj/item/sample/print)) to_chat(user, "The scanner displays on the screen: \"ERROR 43: Object on Excluded Object List.\"") flick("[icon_state]0",src) return @@ -125,7 +125,7 @@ flick("[icon_state]1",src) return 0 -/obj/item/device/detective_scanner/proc/add_data(atom/A as mob|obj|turf|area) +/obj/item/detective_scanner/proc/add_data(atom/A as mob|obj|turf|area) var/datum/data/record/forensic/old = stored["\ref [A]"] var/datum/data/record/forensic/fresh = new(A) @@ -134,7 +134,7 @@ . = 1 stored["\ref [A]"] = fresh -/obj/item/device/detective_scanner/verb/examine_data() +/obj/item/detective_scanner/verb/examine_data() set name = "Examine Forensic Data" set category = "Object" set src in view(1) @@ -142,7 +142,7 @@ //to_world("usr is [usr]") //why was this a thing? -KK. display_data(usr) -/obj/item/device/detective_scanner/proc/display_data(var/mob/user) +/obj/item/detective_scanner/proc/display_data(var/mob/user) if(user && stored && stored.len) for(var/objref in stored) if(!do_after(user, 1 SECOND)) // So people can move and stop the spam, if they refuse to wipe data. @@ -185,7 +185,7 @@ for(var/bloodsample in bloods) to_chat(user, " - [bloodsample] Type: [bloods[bloodsample]]") -/obj/item/device/detective_scanner/verb/wipe() +/obj/item/detective_scanner/verb/wipe() set name = "Wipe Forensic Data" set category = "Object" set src in view(1) @@ -194,7 +194,7 @@ stored = list() to_chat(usr, "Forensic data erase complete.") -/obj/item/device/detective_scanner/advanced +/obj/item/detective_scanner/advanced name = "advanced forensic scanner" icon_state = "forensic_neo" reveal_fibers = TRUE diff --git a/code/modules/detectivework/tools/storage.dm b/code/modules/detectivework/tools/storage.dm index 9c45028e93d..c7c3186a915 100644 --- a/code/modules/detectivework/tools/storage.dm +++ b/code/modules/detectivework/tools/storage.dm @@ -1,36 +1,36 @@ -/obj/item/weapon/storage/box/swabs +/obj/item/storage/box/swabs name = "box of swab kits" desc = "Sterilized equipment within. Do not contaminate." icon = 'icons/obj/forensics.dmi' icon_state = "dnakit" - can_hold = list(/obj/item/weapon/forensics/swab) + can_hold = list(/obj/item/forensics/swab) storage_slots = 14 -/obj/item/weapon/storage/box/swabs/New() +/obj/item/storage/box/swabs/New() ..() for(var/i = 1 to storage_slots) // Fill 'er up. - new /obj/item/weapon/forensics/swab(src) + new /obj/item/forensics/swab(src) -/obj/item/weapon/storage/box/evidence +/obj/item/storage/box/evidence name = "evidence bag box" desc = "A box claiming to contain evidence bags." storage_slots = 7 - can_hold = list(/obj/item/weapon/evidencebag) + can_hold = list(/obj/item/evidencebag) -/obj/item/weapon/storage/box/evidence/New() +/obj/item/storage/box/evidence/New() ..() for(var/i = 1 to storage_slots) - new /obj/item/weapon/evidencebag(src) + new /obj/item/evidencebag(src) -/obj/item/weapon/storage/box/fingerprints +/obj/item/storage/box/fingerprints name = "box of fingerprint cards" desc = "Sterilized equipment within. Do not contaminate." icon = 'icons/obj/forensics.dmi' icon_state = "dnakit" - can_hold = list(/obj/item/weapon/sample/print) + can_hold = list(/obj/item/sample/print) storage_slots = 14 -/obj/item/weapon/storage/box/fingerprints/New() +/obj/item/storage/box/fingerprints/New() ..() for(var/i = 1 to storage_slots) - new /obj/item/weapon/sample/print(src) \ No newline at end of file + new /obj/item/sample/print(src) \ No newline at end of file diff --git a/code/modules/detectivework/tools/swabs.dm b/code/modules/detectivework/tools/swabs.dm index e9377a4d7b0..14c178766b0 100644 --- a/code/modules/detectivework/tools/swabs.dm +++ b/code/modules/detectivework/tools/swabs.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/forensics/swab +/obj/item/forensics/swab name = "swab kit" desc = "A sterilized cotton swab and vial used to take forensic samples." icon_state = "swab" @@ -8,10 +8,10 @@ drop_sound = 'sound/items/drop/glass.ogg' pickup_sound = 'sound/items/pickup/glass.ogg' -/obj/item/weapon/forensics/swab/proc/is_used() +/obj/item/forensics/swab/proc/is_used() return used -/obj/item/weapon/forensics/swab/attack(var/mob/living/M, var/mob/user) +/obj/item/forensics/swab/attack(var/mob/living/M, var/mob/user) if(!ishuman(M)) return ..() @@ -68,7 +68,7 @@ return return 1 -/obj/item/weapon/forensics/swab/afterattack(var/atom/A, var/mob/user, var/proximity) +/obj/item/forensics/swab/afterattack(var/atom/A, var/mob/user, var/proximity) if(!proximity || istype(A, /obj/machinery/dnaforensics)) return @@ -115,7 +115,7 @@ user.visible_message("\The [user] swabs \the [A] for a sample.", "You swab \the [A] for a sample.") set_used(sample_type, A) -/obj/item/weapon/forensics/swab/proc/set_used(var/sample_str, var/atom/source) +/obj/item/forensics/swab/proc/set_used(var/sample_str, var/atom/source) name = "[initial(name)] ([sample_str] - [source])" desc = "[initial(desc)] The label on the vial reads 'Sample of [sample_str] from [source].'." icon_state = "swab_used" diff --git a/code/modules/detectivework/tools/uvlight.dm b/code/modules/detectivework/tools/uvlight.dm index ba316f89974..5977c3c8232 100644 --- a/code/modules/detectivework/tools/uvlight.dm +++ b/code/modules/detectivework/tools/uvlight.dm @@ -1,4 +1,4 @@ -/obj/item/device/uv_light +/obj/item/uv_light name = "\improper UV light" desc = "A small handheld black light." icon_state = "uv_off" @@ -17,7 +17,7 @@ var/on = 0 var/step_alpha = 50 -/obj/item/device/uv_light/attack_self(var/mob/user) +/obj/item/uv_light/attack_self(var/mob/user) on = !on if(on) set_light(range, 2, "#007fff") @@ -29,7 +29,7 @@ STOP_PROCESSING(SSobj, src) icon_state = "uv_off" -/obj/item/device/uv_light/proc/clear_last_scan() +/obj/item/uv_light/proc/clear_last_scan() if(scanned.len) for(var/atom/O in scanned) O.invisibility = scanned[O] @@ -46,7 +46,7 @@ if(I.fluorescent == 2) I.fluorescent = 1 reset_objects.Cut() -/obj/item/device/uv_light/process() +/obj/item/uv_light/process() clear_last_scan() if(on) step_alpha = round(255/range) diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 8bb91fdbfdf..61828e03437 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -12,7 +12,7 @@ log transactions #define TRANSFER_FUNDS 2 #define VIEW_TRANSACTION_LOGS 3 -/obj/item/weapon/card/id/var/money = 2000 +/obj/item/card/id/var/money = 2000 /obj/machinery/atm name = "Automatic Teller Machine" @@ -22,7 +22,7 @@ log transactions anchored = TRUE use_power = USE_POWER_IDLE idle_power_usage = 10 - circuit = /obj/item/weapon/circuitboard/atm + circuit = /obj/item/circuitboard/atm var/datum/money_account/authenticated_account var/number_incorrect_tries = 0 var/previous_account_number = 0 @@ -30,7 +30,7 @@ log transactions var/ticks_left_locked_down = 0 var/ticks_left_timeout = 0 var/machine_id = "" - var/obj/item/weapon/card/held_card + var/obj/item/card/held_card var/editing_security_level = 0 var/view_screen = NO_SCREEN var/datum/effect/effect/system/spark_spread/spark_system @@ -55,7 +55,7 @@ log transactions if(ticks_left_locked_down <= 0) number_incorrect_tries = 0 - for(var/obj/item/weapon/spacecash/S in src) + for(var/obj/item/spacecash/S in src) S.loc = src.loc if(prob(50)) playsound(src, 'sound/items/polaroid1.ogg', 50, 1) @@ -82,16 +82,16 @@ log transactions /obj/machinery/atm/attackby(obj/item/I as obj, mob/user as mob) if(computer_deconstruction_screwdriver(user, I)) return - if(istype(I, /obj/item/weapon/card)) + if(istype(I, /obj/item/card)) if(emagged > 0) //prevent inserting id into an emagged ATM to_chat(user, span_red("[icon2html(src, user.client)] CARD READER ERROR. This system has been compromised!")) return - else if(istype(I,/obj/item/weapon/card/emag)) + else if(istype(I,/obj/item/card/emag)) I.resolve_attackby(src, user) return - var/obj/item/weapon/card/id/idcard = I + var/obj/item/card/id/idcard = I if(!held_card) usr.drop_item() idcard.loc = src @@ -99,7 +99,7 @@ log transactions if(authenticated_account && held_card.associated_account_number != authenticated_account.account_number) authenticated_account = null else if(authenticated_account) - if(istype(I,/obj/item/weapon/spacecash)) + if(istype(I,/obj/item/spacecash)) //consume the money authenticated_account.money += I:worth if(prob(50)) @@ -364,7 +364,7 @@ log transactions to_chat(usr, "[icon2html(src, usr.client)]You don't have enough funds to do that!") if("balance_statement") if(authenticated_account) - var/obj/item/weapon/paper/R = new(src.loc) + var/obj/item/paper/R = new(src.loc) R.name = "Account balance: [authenticated_account.owner_name]" R.info = "NT Automated Teller Account Statement

" R.info += "Account holder: [authenticated_account.owner_name]
" @@ -378,7 +378,7 @@ log transactions stampoverlay.icon_state = "paper_stamp-cent" if(!R.stamped) R.stamped = new - R.stamped += /obj/item/weapon/stamp + R.stamped += /obj/item/stamp R.add_overlay(stampoverlay) R.stamps += "
This paper has been stamped by the Automatic Teller Machine." @@ -388,7 +388,7 @@ log transactions playsound(src, 'sound/items/polaroid2.ogg', 50, 1) if ("print_transaction") if(authenticated_account) - var/obj/item/weapon/paper/R = new(src.loc) + var/obj/item/paper/R = new(src.loc) R.name = "Transaction logs: [authenticated_account.owner_name]" R.info = "Transaction logs
" R.info += "Account holder: [authenticated_account.owner_name]
" @@ -420,7 +420,7 @@ log transactions stampoverlay.icon_state = "paper_stamp-cent" if(!R.stamped) R.stamped = new - R.stamped += /obj/item/weapon/stamp + R.stamped += /obj/item/stamp R.add_overlay(stampoverlay) R.stamps += "
This paper has been stamped by the Automatic Teller Machine." @@ -436,7 +436,7 @@ log transactions to_chat(usr, span_red("[icon2html(src, usr.client)] The ATM card reader rejected your ID because this machine has been sabotaged!")) else var/obj/item/I = usr.get_active_hand() - if (istype(I, /obj/item/weapon/card/id)) + if (istype(I, /obj/item/card/id)) usr.drop_item() I.loc = src held_card = I @@ -452,11 +452,11 @@ log transactions /obj/machinery/atm/proc/scan_user(mob/living/carbon/human/human_user as mob) if(!authenticated_account) if(human_user.wear_id) - var/obj/item/weapon/card/id/I - if(istype(human_user.wear_id, /obj/item/weapon/card/id) ) + var/obj/item/card/id/I + if(istype(human_user.wear_id, /obj/item/card/id) ) I = human_user.wear_id - else if(istype(human_user.wear_id, /obj/item/device/pda) ) - var/obj/item/device/pda/P = human_user.wear_id + else if(istype(human_user.wear_id, /obj/item/pda) ) + var/obj/item/pda/P = human_user.wear_id I = P.id if(I) authenticated_account = attempt_account_access(I.associated_account_number) @@ -475,7 +475,7 @@ log transactions /obj/machinery/atm/proc/spawn_ewallet(var/sum, loc, mob/living/carbon/human/human_user as mob) - var/obj/item/weapon/spacecash/ewallet/E = new /obj/item/weapon/spacecash/ewallet(loc) + var/obj/item/spacecash/ewallet/E = new /obj/item/spacecash/ewallet(loc) if(ishuman(human_user) && !human_user.get_active_hand()) human_user.put_in_hands(E) E.worth = sum diff --git a/code/modules/economy/Accounts.dm b/code/modules/economy/Accounts.dm index 332a8e1193c..1612f4b49a7 100644 --- a/code/modules/economy/Accounts.dm +++ b/code/modules/economy/Accounts.dm @@ -51,7 +51,7 @@ //create a sealed package containing the account details var/obj/item/smallDelivery/P = new /obj/item/smallDelivery(source_db.loc) - var/obj/item/weapon/paper/R = new /obj/item/weapon/paper(P) + var/obj/item/paper/R = new /obj/item/paper(P) P.wrapped = R R.name = "Account information: [M.owner_name]" R.info = "Account details (confidential)

" @@ -68,7 +68,7 @@ stampoverlay.icon_state = "paper_stamp-cent" if(!R.stamped) R.stamped = new - R.stamped += /obj/item/weapon/stamp + R.stamped += /obj/item/stamp R.add_overlay(stampoverlay) R.stamps += "
This paper has been stamped by the Accounts Database." diff --git a/code/modules/economy/Accounts_DB.dm b/code/modules/economy/Accounts_DB.dm index 8fa9fe73e4b..65573cdc57f 100644 --- a/code/modules/economy/Accounts_DB.dm +++ b/code/modules/economy/Accounts_DB.dm @@ -9,7 +9,7 @@ anchored = TRUE var/receipt_num var/machine_id = "" - var/obj/item/weapon/card/id/held_card + var/obj/item/card/id/held_card var/datum/money_account/detailed_account_view var/creating_new_account = 0 var/const/fund_cap = 1000000 @@ -45,7 +45,7 @@ ..() /obj/machinery/account_database/attackby(obj/O, mob/user) - if(!istype(O, /obj/item/weapon/card/id)) + if(!istype(O, /obj/item/card/id)) return ..() if(!held_card) @@ -170,8 +170,8 @@ else var/obj/item/I = usr.get_active_hand() - if(istype(I, /obj/item/weapon/card/id)) - var/obj/item/weapon/card/id/C = I + if(istype(I, /obj/item/card/id)) + var/obj/item/card/id/C = I usr.drop_item() C.loc = src held_card = C @@ -205,7 +205,7 @@ /obj/machinery/account_database/proc/print() var/text - var/obj/item/weapon/paper/P = new(loc) + var/obj/item/paper/P = new(loc) if(detailed_account_view) P.name = "account #[detailed_account_view.account_number] details" var/title = "Account #[detailed_account_view.account_number] Details" diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index e8fca4633ba..fbb2e136f3a 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -1,4 +1,4 @@ -/obj/item/device/eftpos +/obj/item/eftpos name = "\improper EFTPOS scanner" desc = "Swipe your ID card to make purchases electronically." icon = 'icons/obj/device.dmi' @@ -12,7 +12,7 @@ var/access_code = 0 var/datum/money_account/linked_account -/obj/item/device/eftpos/Initialize() +/obj/item/eftpos/Initialize() . = ..() //by default, connect to the station account //the user of the EFTPOS device can change the target account though, and no-one will be the wiser (except whoever's being charged) @@ -23,7 +23,7 @@ print_reference() //create a short manual as well - var/obj/item/weapon/paper/R = new(src.loc) + var/obj/item/paper/R = new(src.loc) R.name = "Steps to success: Correct EFTPOS Usage" //Temptative new manual: R.info += "First EFTPOS setup:
" @@ -43,16 +43,16 @@ R.offset_x += 0 R.offset_y += 0 R.ico += "paper_stamp-cent" - R.stamped += /obj/item/weapon/stamp + R.stamped += /obj/item/stamp R.add_overlay(stampoverlay) R.stamps += "
This paper has been stamped by the EFTPOS device." -/obj/item/device/eftpos/Destroy() +/obj/item/eftpos/Destroy() linked_account = null return ..() -/obj/item/device/eftpos/proc/print_reference() - var/obj/item/weapon/paper/R = new(src.loc) +/obj/item/eftpos/proc/print_reference() + var/obj/item/paper/R = new(src.loc) R.name = "Reference: [eftpos_name]" R.info = "[eftpos_name] reference

" R.info += "Access code: [access_code]

" @@ -63,7 +63,7 @@ stampoverlay.icon_state = "paper_stamp-cent" if(!R.stamped) R.stamped = new - R.stamped += /obj/item/weapon/stamp + R.stamped += /obj/item/stamp R.add_overlay(stampoverlay) R.stamps += "
This paper has been stamped by the EFTPOS device." var/obj/item/smallDelivery/D = new(R.loc) @@ -71,7 +71,7 @@ D.wrapped = R D.name = "small parcel - 'EFTPOS access code'" -/obj/item/device/eftpos/attack_self(mob/user as mob) +/obj/item/eftpos/attack_self(mob/user as mob) if(get_dist(src,user) <= 1) var/dat = "[eftpos_name]
" dat += "This terminal is [machine_id]. Report this code when contacting IT Support
" @@ -99,17 +99,17 @@ else user << browse(null,"window=eftpos") -/obj/item/device/eftpos/attackby(obj/item/O as obj, user as mob) +/obj/item/eftpos/attackby(obj/item/O as obj, user as mob) - var/obj/item/weapon/card/id/I = O.GetID() + var/obj/item/card/id/I = O.GetID() if(I) if(linked_account) scan_card(I, O) else to_chat(usr, "[icon2html(src, usr.client)]Unable to connect to linked account.") - else if (istype(O, /obj/item/weapon/spacecash/ewallet)) - var/obj/item/weapon/spacecash/ewallet/E = O + else if (istype(O, /obj/item/spacecash/ewallet)) + var/obj/item/spacecash/ewallet/E = O if (linked_account) if(!linked_account.suspended) if(transaction_locked && !transaction_paid) @@ -141,7 +141,7 @@ else ..() -/obj/item/device/eftpos/Topic(var/href, var/href_list) +/obj/item/eftpos/Topic(var/href, var/href_list) if(href_list["choice"]) switch(href_list["choice"]) if("change_code") @@ -198,27 +198,27 @@ if("scan_card") if(linked_account) var/obj/item/I = usr.get_active_hand() - if (istype(I, /obj/item/weapon/card)) + if (istype(I, /obj/item/card)) scan_card(I) else to_chat(usr, "[icon2html(src, usr.client)]Unable to link accounts.") if("reset") //reset the access code - requires HoP/captain access var/obj/item/I = usr.get_active_hand() - if (istype(I, /obj/item/weapon/card)) - var/obj/item/weapon/card/id/C = I + if (istype(I, /obj/item/card)) + var/obj/item/card/id/C = I if((access_cent_captain in C.access) || (access_hop in C.access) || (access_captain in C.access)) access_code = 0 to_chat(usr, "[icon2html(src, usr.client)]Access code reset to 0.") - else if (istype(I, /obj/item/weapon/card/emag)) + else if (istype(I, /obj/item/card/emag)) access_code = 0 to_chat(usr, "[icon2html(src, usr.client)]Access code reset to 0.") src.attack_self(usr) -/obj/item/device/eftpos/proc/scan_card(var/obj/item/weapon/card/I, var/obj/item/ID_container) - if (istype(I, /obj/item/weapon/card/id)) - var/obj/item/weapon/card/id/C = I +/obj/item/eftpos/proc/scan_card(var/obj/item/card/I, var/obj/item/ID_container) + if (istype(I, /obj/item/card/id)) + var/obj/item/card/id/C = I if(I==ID_container || ID_container == null) usr.visible_message("\The [usr] swipes a card through \the [src].") else @@ -274,7 +274,7 @@ to_chat(usr, "[icon2html(src, usr.client)]Connected account has been suspended.") else to_chat(usr, "[icon2html(src, usr.client)]EFTPOS is not connected to an account.") - else if (istype(I, /obj/item/weapon/card/emag)) + else if (istype(I, /obj/item/card/emag)) if(transaction_locked) if(transaction_paid) to_chat(usr, "[icon2html(src, usr.client)]You stealthily swipe \the [I] through \the [src].") diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index 7cf04f4ac5a..db53d9be343 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/spacecash +/obj/item/spacecash name = "0 Thaler" var/initial_name = "Thaler" desc = "It's worth 0 Thalers." @@ -19,11 +19,11 @@ drop_sound = 'sound/items/drop/paper.ogg' pickup_sound = 'sound/items/pickup/paper.ogg' -/obj/item/weapon/spacecash/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/spacecash)) - if(istype(W, /obj/item/weapon/spacecash/ewallet)) return 0 +/obj/item/spacecash/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/spacecash)) + if(istype(W, /obj/item/spacecash/ewallet)) return 0 - var/obj/item/weapon/spacecash/SC = W + var/obj/item/spacecash/SC = W SC.adjust_worth(src.worth) if(istype(user, /mob/living/carbon/human)) @@ -35,7 +35,7 @@ to_chat(user, "You combine the [initial_name]s to a bundle of [SC.worth] [initial_name]s.") qdel(src) -/obj/item/weapon/spacecash/update_icon() +/obj/item/spacecash/update_icon() cut_overlays() name = "[worth] [initial_name]\s" if(worth in list(1000,500,200,100,50,20,10,5,1)) @@ -63,7 +63,7 @@ add_overlay(banknote) src.desc = "They are worth [worth] [initial_name]s." -/obj/item/weapon/spacecash/proc/adjust_worth(var/adjust_worth = 0, var/update = 1) +/obj/item/spacecash/proc/adjust_worth(var/adjust_worth = 0, var/update = 1) worth += adjust_worth if(worth > 0) if(update) @@ -73,13 +73,13 @@ qdel(src) return 0 -/obj/item/weapon/spacecash/proc/set_worth(var/new_worth = 0, var/update = 1) +/obj/item/spacecash/proc/set_worth(var/new_worth = 0, var/update = 1) worth = max(0, new_worth) if(update) update_icon() return worth -/obj/item/weapon/spacecash/attack_self() +/obj/item/spacecash/attack_self() var/amount = tgui_input_number(usr, "How many [initial_name]s do you want to take? (0 to [src.worth])", "Take Money", 20, src.worth) if(!src || QDELETED(src)) return @@ -89,73 +89,73 @@ return adjust_worth(-amount) - var/obj/item/weapon/spacecash/SC = new (usr.loc) + var/obj/item/spacecash/SC = new (usr.loc) SC.set_worth(amount) usr.put_in_hands(SC) -/obj/item/weapon/spacecash/c1 +/obj/item/spacecash/c1 name = "1 Thaler" icon_state = "spacecash1" desc = "It's worth 1 Thaler." worth = 1 -/obj/item/weapon/spacecash/c5 +/obj/item/spacecash/c5 name = "5 Thaler" icon_state = "spacecash5" desc = "It's worth 5 Thalers." worth = 5 -/obj/item/weapon/spacecash/c10 +/obj/item/spacecash/c10 name = "10 Thaler" icon_state = "spacecash10" desc = "It's worth 10 Thalers." worth = 10 -/obj/item/weapon/spacecash/c20 +/obj/item/spacecash/c20 name = "20 Thaler" icon_state = "spacecash20" desc = "It's worth 20 Thalers." worth = 20 -/obj/item/weapon/spacecash/c50 +/obj/item/spacecash/c50 name = "50 Thaler" icon_state = "spacecash50" desc = "It's worth 50 Thalers." worth = 50 -/obj/item/weapon/spacecash/c100 +/obj/item/spacecash/c100 name = "100 Thaler" icon_state = "spacecash100" desc = "It's worth 100 Thalers." worth = 100 -/obj/item/weapon/spacecash/c200 +/obj/item/spacecash/c200 name = "200 Thaler" icon_state = "spacecash200" desc = "It's worth 200 Thalers." worth = 200 -/obj/item/weapon/spacecash/c500 +/obj/item/spacecash/c500 name = "500 Thaler" icon_state = "spacecash500" desc = "It's worth 500 Thalers." worth = 500 -/obj/item/weapon/spacecash/c1000 +/obj/item/spacecash/c1000 name = "1000 Thaler" icon_state = "spacecash1000" desc = "It's worth 1000 Thalers." worth = 1000 /proc/spawn_money(var/sum, spawnloc, mob/living/carbon/human/human_user as mob) - var/obj/item/weapon/spacecash/SC = new (spawnloc) + var/obj/item/spacecash/SC = new (spawnloc) SC.set_worth(sum) if (ishuman(human_user) && !human_user.get_active_hand()) human_user.put_in_hands(SC) return -/obj/item/weapon/spacecash/ewallet +/obj/item/spacecash/ewallet name = "charge card" initial_name = "charge card" icon_state = "efundcard" @@ -164,11 +164,11 @@ pickup_sound = 'sound/items/pickup/card.ogg' var/owner_name = "" //So the ATM can set it so the EFTPOS can put a valid name on transactions. -/obj/item/weapon/spacecash/ewallet/attack_self() return //Don't act -/obj/item/weapon/spacecash/ewallet/attackby() return //like actual -/obj/item/weapon/spacecash/ewallet/update_icon() return //space cash +/obj/item/spacecash/ewallet/attack_self() return //Don't act +/obj/item/spacecash/ewallet/attackby() return //like actual +/obj/item/spacecash/ewallet/update_icon() return //space cash -/obj/item/weapon/spacecash/ewallet/examine(mob/user) +/obj/item/spacecash/ewallet/examine(mob/user) . = ..() if(Adjacent(user)) . += "Charge card's owner: [src.owner_name]. Thalers remaining: [src.worth]." diff --git a/code/modules/economy/cash_register.dm b/code/modules/economy/cash_register.dm index f48404af0e1..d02305a6d0f 100644 --- a/code/modules/economy/cash_register.dm +++ b/code/modules/economy/cash_register.dm @@ -170,14 +170,14 @@ /obj/machinery/cash_register/attackby(obj/item/O as obj, user as mob) // Check for a method of paying (ID, PDA, e-wallet, cash, ect.) - var/obj/item/weapon/card/id/I = O.GetID() + var/obj/item/card/id/I = O.GetID() if(I) scan_card(I, O) - else if (istype(O, /obj/item/weapon/spacecash/ewallet)) - var/obj/item/weapon/spacecash/ewallet/E = O + else if (istype(O, /obj/item/spacecash/ewallet)) + var/obj/item/spacecash/ewallet/E = O scan_wallet(E) - else if (istype(O, /obj/item/weapon/spacecash)) - var/obj/item/weapon/spacecash/SC = O + else if (istype(O, /obj/item/spacecash)) + var/obj/item/spacecash/SC = O if(cash_open) to_chat(user, "You neatly sort the cash into the box.") cash_stored += SC.worth @@ -188,10 +188,10 @@ qdel(SC) else scan_cash(SC) - else if(istype(O, /obj/item/weapon/card/emag)) + else if(istype(O, /obj/item/card/emag)) return ..() else if(O.has_tool_quality(TOOL_WRENCH)) - var/obj/item/weapon/tool/wrench/W = O + var/obj/item/tool/wrench/W = O toggle_anchors(W, user) // Not paying: Look up price and add it to transaction_amount else @@ -213,7 +213,7 @@ return 0 -/obj/machinery/cash_register/proc/scan_card(obj/item/weapon/card/id/I, obj/item/ID_container) +/obj/machinery/cash_register/proc/scan_card(obj/item/card/id/I, obj/item/ID_container) if (!transaction_amount) return @@ -278,7 +278,7 @@ transaction_complete() -/obj/machinery/cash_register/proc/scan_wallet(obj/item/weapon/spacecash/ewallet/E) +/obj/machinery/cash_register/proc/scan_wallet(obj/item/spacecash/ewallet/E) if (!transaction_amount) return @@ -316,7 +316,7 @@ transaction_complete() -/obj/machinery/cash_register/proc/scan_cash(obj/item/weapon/spacecash/SC) +/obj/machinery/cash_register/proc/scan_cash(obj/item/spacecash/SC) if (!transaction_amount) return @@ -481,7 +481,7 @@ to_chat(usr, "The cash box is locked.") -/obj/machinery/cash_register/proc/toggle_anchors(obj/item/weapon/tool/wrench/W, mob/user) +/obj/machinery/cash_register/proc/toggle_anchors(obj/item/tool/wrench/W, mob/user) if(manipulating) return manipulating = 1 if(!anchored) diff --git a/code/modules/economy/casinocash.dm b/code/modules/economy/casinocash.dm index e5749504a97..20b74fdfa4e 100644 --- a/code/modules/economy/casinocash.dm +++ b/code/modules/economy/casinocash.dm @@ -10,7 +10,7 @@ anchored = 1 /obj/machinery/chipmachine/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I,/obj/item/weapon/spacecash) && (I:worth >= 5)) + if(istype(I,/obj/item/spacecash) && (I:worth >= 5)) //consume the money if(prob(50)) playsound(loc, 'sound/items/polaroid1.ogg', 50, 1) @@ -22,7 +22,7 @@ src.attack_hand(user) qdel(I) - if(istype(I,/obj/item/weapon/spacecasinocash)) + if(istype(I,/obj/item/spacecasinocash)) //consume the chips if(prob(50)) playsound(loc, 'sound/items/polaroid1.ogg', 50, 1) @@ -34,7 +34,7 @@ src.attack_hand(user) qdel(I) -/obj/item/weapon/spacecasinocash +/obj/item/spacecasinocash name = "broken casino chip" desc = "It's worth nothing in a casino." gender = PLURAL @@ -52,10 +52,10 @@ access = access_crate_cash var/worth = 0 -/obj/item/weapon/spacecasinocash/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/spacecasinocash)) +/obj/item/spacecasinocash/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/spacecasinocash)) - var/obj/item/weapon/spacecasinocash/SC = W + var/obj/item/spacecasinocash/SC = W SC.adjust_worth(src.worth) if(istype(user, /mob/living/carbon/human)) @@ -67,7 +67,7 @@ to_chat(user, span_notice("You combine the casino chips to a stack of [SC.worth] casino credits.")) qdel(src) -/obj/item/weapon/spacecasinocash/update_icon() +/obj/item/spacecasinocash/update_icon() overlays.Cut() name = "[worth] casino credit\s" if(worth in list(1000,500,200,100,50,20,10,1)) @@ -95,7 +95,7 @@ src.overlays += banknote src.desc = "They are worth [worth] casino credits." -/obj/item/weapon/spacecasinocash/proc/adjust_worth(var/adjust_worth = 0, var/update = 1) +/obj/item/spacecasinocash/proc/adjust_worth(var/adjust_worth = 0, var/update = 1) worth += adjust_worth if(worth > 0) if(update) @@ -105,13 +105,13 @@ qdel(src) return 0 -/obj/item/weapon/spacecasinocash/proc/set_worth(var/new_worth = 0, var/update = 1) +/obj/item/spacecasinocash/proc/set_worth(var/new_worth = 0, var/update = 1) worth = max(0, new_worth) if(update) update_icon() return worth -/obj/item/weapon/spacecasinocash/attack_self() +/obj/item/spacecasinocash/attack_self() var/amount = tgui_input_number(usr, "How much credits worth of chips do you want to take? (0 to [src.worth])", "Take chips", 20, src.worth) if(!src || QDELETED(src)) return @@ -121,67 +121,67 @@ return adjust_worth(-amount) - var/obj/item/weapon/spacecasinocash/SC = new (usr.loc) + var/obj/item/spacecasinocash/SC = new (usr.loc) SC.set_worth(amount) usr.put_in_hands(SC) -/obj/item/weapon/spacecasinocash/c1 +/obj/item/spacecasinocash/c1 name = "1 credit casino chip" icon_state = "spacecasinocash1" desc = "It's worth 1 credit." worth = 1 -/obj/item/weapon/spacecasinocash/c10 +/obj/item/spacecasinocash/c10 name = "10 credit casino chip" icon_state = "spacecasinocash10" desc = "It's worth 10 credits." worth = 10 -/obj/item/weapon/spacecasinocash/c20 +/obj/item/spacecasinocash/c20 name = "20 credit casino chip" icon_state = "spacecasinocash20" desc = "It's worth 20 credits." worth = 20 -/obj/item/weapon/spacecasinocash/c50 +/obj/item/spacecasinocash/c50 name = "50 credit casino chip" icon_state = "spacecasinocash50" desc = "It's worth 50 credits." worth = 50 -/obj/item/weapon/spacecasinocash/c100 +/obj/item/spacecasinocash/c100 name = "100 credit casino chip" icon_state = "spacecasinocash100" desc = "It's worth 100 credits." worth = 100 -/obj/item/weapon/spacecasinocash/c200 +/obj/item/spacecasinocash/c200 name = "200 credit casino chip" icon_state = "spacecasinocash200" desc = "It's worth 200 credits." worth = 200 -/obj/item/weapon/spacecasinocash/c500 +/obj/item/spacecasinocash/c500 name = "500 credit casino chip" icon_state = "spacecasinocash500" desc = "It's worth 500 credits." worth = 500 -/obj/item/weapon/spacecasinocash/c1000 +/obj/item/spacecasinocash/c1000 name = "1000 credit casino chip" icon_state = "spacecasinocash1000" desc = "It's worth 1000 credits." worth = 1000 /proc/spawn_casinochips(var/sum, spawnloc, mob/living/carbon/human/human_user as mob) - var/obj/item/weapon/spacecasinocash/SC = new (spawnloc) + var/obj/item/spacecasinocash/SC = new (spawnloc) SC.set_worth(sum, TRUE) if (ishuman(human_user) && !human_user.get_active_hand()) human_user.put_in_hands(SC) return -/obj/item/weapon/casino_platinum_chip +/obj/item/casino_platinum_chip name = "platinum chip" desc = "Ringa-a-Ding-Ding!" icon = 'icons/obj/casino.dmi' @@ -196,7 +196,7 @@ throw_range = 2 w_class = ITEMSIZE_SMALL -/obj/item/weapon/casino_platinum_chip/attack_self(mob/user as mob) +/obj/item/casino_platinum_chip/attack_self(mob/user as mob) var/result = rand(1, sides) var/comment = "" if(result == 1) diff --git a/code/modules/economy/coins.dm b/code/modules/economy/coins.dm index 87056deecda..56a7feb6265 100644 --- a/code/modules/economy/coins.dm +++ b/code/modules/economy/coins.dm @@ -1,6 +1,6 @@ /*****************************Coin********************************/ -/obj/item/weapon/coin +/obj/item/coin icon = 'icons/obj/items.dmi' name = "Coin" desc = "A simple coin you can flip." @@ -15,60 +15,60 @@ drop_sound = 'sound/items/drop/ring.ogg' pickup_sound = 'sound/items/pickup/ring.ogg' -/obj/item/weapon/coin/New() +/obj/item/coin/New() randpixel_xy() -/obj/item/weapon/coin/gold +/obj/item/coin/gold name = "gold coin" icon_state = "coin_gold" matter = list(MAT_GOLD = 250) -/obj/item/weapon/coin/silver +/obj/item/coin/silver name = "silver coin" icon_state = "coin_silver" matter = list(MAT_SILVER = 250) -/obj/item/weapon/coin/diamond +/obj/item/coin/diamond name = "diamond coin" icon_state = "coin_diamond" matter = list(MAT_DIAMOND = 250) -/obj/item/weapon/coin/iron +/obj/item/coin/iron name = "iron coin" icon_state = "coin_iron" matter = list(MAT_IRON = 250) -/obj/item/weapon/coin/phoron +/obj/item/coin/phoron name = "solid phoron coin" icon_state = "coin_phoron" matter = list(MAT_PHORON = 250) -/obj/item/weapon/coin/uranium +/obj/item/coin/uranium name = "uranium coin" icon_state = "coin_uranium" matter = list(MAT_URANIUM = 250) -/obj/item/weapon/coin/platinum +/obj/item/coin/platinum name = "platinum coin" icon_state = "coin_adamantine" matter = list(MAT_GOLD = 250) -/obj/item/weapon/coin/morphium +/obj/item/coin/morphium name = "morphium coin" icon_state = "coin_morphium" matter = list(MAT_MORPHIUM = 250) -/obj/item/weapon/coin/aluminium +/obj/item/coin/aluminium name = "aluminium coin" icon_state = "coin_aluminium" matter = list(MAT_ALUMINIUM = 250) -/obj/item/weapon/coin/verdantium +/obj/item/coin/verdantium name = "verdantium coin" icon_state = "coin_verdantium" matter = list(MAT_VERDANTIUM = 250) -/obj/item/weapon/coin/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/coin/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = W if(string_attached) @@ -93,7 +93,7 @@ to_chat(user, "You detach the string from the coin.") else ..() -/obj/item/weapon/coin/attack_self(mob/user as mob) +/obj/item/coin/attack_self(mob/user as mob) var/result = rand(1, sides) var/comment = "" if(result == 1) diff --git a/code/modules/economy/coins_vr.dm b/code/modules/economy/coins_vr.dm index 6d1ac8351ef..4e4a13917be 100644 --- a/code/modules/economy/coins_vr.dm +++ b/code/modules/economy/coins_vr.dm @@ -1,6 +1,6 @@ //Weird coins that I would prefer didn't work with normal vending machines. Might use them to make weird vending machines later. -/obj/item/weapon/aliencoin +/obj/item/aliencoin icon = 'icons/obj/aliencoins.dmi' name = "curious coin" desc = "A curious triangular coin made primarily of some kind of dark, smooth metal. " @@ -15,31 +15,31 @@ drop_sound = 'sound/items/drop/ring.ogg' pickup_sound = 'sound/items/pickup/ring.ogg' -/obj/item/weapon/aliencoin/New() +/obj/item/aliencoin/New() randpixel_xy() -/obj/item/weapon/aliencoin/basic +/obj/item/aliencoin/basic -/obj/item/weapon/aliencoin/gold +/obj/item/aliencoin/gold name = "curious coin" icon_state = "triangle-g" desc = "A curious triangular coin made primarily of some kind of dark, smooth metal. This one's markings appear to reveal a golden material underneath." value = 10 -/obj/item/weapon/aliencoin/silver +/obj/item/aliencoin/silver name = "curious coin" icon_state = "triangle-s" desc = "A curious triangular coin made primarily of some kind of dark, smooth metal. This one's markings appear to reveal a silver material underneath." value = 5 -/obj/item/weapon/aliencoin/phoron +/obj/item/aliencoin/phoron name = "curious coin" icon_state = "triangle-p" desc = "A curious triangular coin made primarily of some kind of dark, smooth metal. This one's markings appear to reveal a purple material underneath." value = 20 -/obj/item/weapon/aliencoin/attack_self(mob/user as mob) +/obj/item/aliencoin/attack_self(mob/user as mob) var/result = rand(1, sides) var/comment = "" if(result == 1) @@ -51,7 +51,7 @@ user.visible_message("[user] fumbled the [src]!", runemessage = "fumbles [src]") user.remove_from_mob(src) -/obj/item/weapon/aliencoin/examine(var/mob/user) +/obj/item/aliencoin/examine(var/mob/user) . = ..() if(Adjacent(user)) . += "It has some writing along its edge that seems to be some language that you are not familiar with. The face of the coin is very smooth, with what appears to be some kind of angular logo along the left side, and a couple of lines of the alien text along the opposite side. The reverse side is similarly smooth, the top of it features what appears to be some kind of vortex, surrounded by six stars, three on either side, with further swirls and intricate patterns along the bottom sections of this face. Looking closely, you can see that there is more text hidden among the swirls." diff --git a/code/modules/economy/economy_misc.dm b/code/modules/economy/economy_misc.dm index 1aa32484f5d..3d7cea259d4 100644 --- a/code/modules/economy/economy_misc.dm +++ b/code/modules/economy/economy_misc.dm @@ -46,7 +46,7 @@ var/global/economy_init = 0 create_department_account("Vendor") vendor_account = department_accounts["Vendor"] - for(var/obj/item/device/retail_scanner/RS in transaction_devices) + for(var/obj/item/retail_scanner/RS in transaction_devices) if(RS.account_to_connect) RS.linked_account = department_accounts[RS.account_to_connect] for(var/obj/machinery/cash_register/CR in transaction_devices) diff --git a/code/modules/economy/mint.dm b/code/modules/economy/mint.dm index 07bc1d22a75..4e763d7779e 100644 --- a/code/modules/economy/mint.dm +++ b/code/modules/economy/mint.dm @@ -18,22 +18,22 @@ M.amount-- if(M.default_type == "silver") while(coinsToProduce-- > 0) - new /obj/item/weapon/coin/silver(user.loc) + new /obj/item/coin/silver(user.loc) else if(M.default_type == "gold") while(coinsToProduce-- > 0) - new /obj/item/weapon/coin/gold(user.loc) + new /obj/item/coin/gold(user.loc) else if(M.default_type == "diamond") while(coinsToProduce-- > 0) - new /obj/item/weapon/coin/diamond(user.loc) + new /obj/item/coin/diamond(user.loc) else if(M.default_type == "iron") while(coinsToProduce-- > 0) - new /obj/item/weapon/coin/iron(user.loc) + new /obj/item/coin/iron(user.loc) else if(M.default_type == "phoron") while(coinsToProduce-- > 0) - new /obj/item/weapon/coin/phoron(user.loc) + new /obj/item/coin/phoron(user.loc) else if(M.default_type == "uranium") while(coinsToProduce-- > 0) - new /obj/item/weapon/coin/uranium(user.loc) + new /obj/item/coin/uranium(user.loc) src.visible_message("\The [src] rattles and dispenses several [M.default_type] coins!") coinsToProduce = initial(coinsToProduce) if(M.amount == 0) diff --git a/code/modules/economy/money_bag.dm b/code/modules/economy/money_bag.dm index d9afc36357e..6a443226f2b 100644 --- a/code/modules/economy/money_bag.dm +++ b/code/modules/economy/money_bag.dm @@ -1,6 +1,6 @@ /*****************************Money bag********************************/ -/obj/item/weapon/moneybag +/obj/item/moneybag icon = 'icons/obj/storage.dmi' name = "Money bag" icon_state = "moneybag" @@ -8,7 +8,7 @@ throwforce = 2.0 w_class = ITEMSIZE_LARGE -/obj/item/weapon/moneybag/attack_hand(user as mob) +/obj/item/moneybag/attack_hand(user as mob) var/amt_gold = 0 var/amt_silver = 0 var/amt_diamond = 0 @@ -16,18 +16,18 @@ var/amt_phoron = 0 var/amt_uranium = 0 - for (var/obj/item/weapon/coin/C in contents) - if (istype(C,/obj/item/weapon/coin/diamond)) + for (var/obj/item/coin/C in contents) + if (istype(C,/obj/item/coin/diamond)) amt_diamond++; - if (istype(C,/obj/item/weapon/coin/phoron)) + if (istype(C,/obj/item/coin/phoron)) amt_phoron++; - if (istype(C,/obj/item/weapon/coin/iron)) + if (istype(C,/obj/item/coin/iron)) amt_iron++; - if (istype(C,/obj/item/weapon/coin/silver)) + if (istype(C,/obj/item/coin/silver)) amt_silver++; - if (istype(C,/obj/item/weapon/coin/gold)) + if (istype(C,/obj/item/coin/gold)) amt_gold++; - if (istype(C,/obj/item/weapon/coin/uranium)) + if (istype(C,/obj/item/coin/uranium)) amt_uranium++; var/dat = text("The contents of the moneybag reveal...
") @@ -45,40 +45,40 @@ dat += text("Uranium coins: [amt_uranium] Remove one
") user << browse("[dat]", "window=moneybag") -/obj/item/weapon/moneybag/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/moneybag/attackby(obj/item/W as obj, mob/user as mob) ..() - if (istype(W, /obj/item/weapon/coin)) - var/obj/item/weapon/coin/C = W + if (istype(W, /obj/item/coin)) + var/obj/item/coin/C = W to_chat(user, span_blue("You add the [C.name] into the bag.")) usr.drop_item() contents += C - if (istype(W, /obj/item/weapon/moneybag)) - var/obj/item/weapon/moneybag/C = W + if (istype(W, /obj/item/moneybag)) + var/obj/item/moneybag/C = W for (var/obj/O in C.contents) contents += O; to_chat(user, span_blue("You empty the [C.name] into the bag.")) return -/obj/item/weapon/moneybag/Topic(href, href_list) +/obj/item/moneybag/Topic(href, href_list) if(..()) return 1 usr.set_machine(src) src.add_fingerprint(usr) if(href_list["remove"]) - var/obj/item/weapon/coin/COIN + var/obj/item/coin/COIN switch(href_list["remove"]) if("gold") - COIN = locate(/obj/item/weapon/coin/gold,src.contents) + COIN = locate(/obj/item/coin/gold,src.contents) if("silver") - COIN = locate(/obj/item/weapon/coin/silver,src.contents) + COIN = locate(/obj/item/coin/silver,src.contents) if("iron") - COIN = locate(/obj/item/weapon/coin/iron,src.contents) + COIN = locate(/obj/item/coin/iron,src.contents) if("diamond") - COIN = locate(/obj/item/weapon/coin/diamond,src.contents) + COIN = locate(/obj/item/coin/diamond,src.contents) if("phoron") - COIN = locate(/obj/item/weapon/coin/phoron,src.contents) + COIN = locate(/obj/item/coin/phoron,src.contents) if("uranium") - COIN = locate(/obj/item/weapon/coin/uranium,src.contents) + COIN = locate(/obj/item/coin/uranium,src.contents) if(!COIN) return COIN.loc = src.loc @@ -86,13 +86,13 @@ -/obj/item/weapon/moneybag/vault +/obj/item/moneybag/vault -/obj/item/weapon/moneybag/vault/New() +/obj/item/moneybag/vault/New() ..() - new /obj/item/weapon/coin/silver(src) - new /obj/item/weapon/coin/silver(src) - new /obj/item/weapon/coin/silver(src) - new /obj/item/weapon/coin/silver(src) - new /obj/item/weapon/coin/gold(src) - new /obj/item/weapon/coin/gold(src) + new /obj/item/coin/silver(src) + new /obj/item/coin/silver(src) + new /obj/item/coin/silver(src) + new /obj/item/coin/silver(src) + new /obj/item/coin/gold(src) + new /obj/item/coin/gold(src) diff --git a/code/modules/economy/price_list.dm b/code/modules/economy/price_list.dm index 3a92f3d46be..77933f8bcde 100644 --- a/code/modules/economy/price_list.dm +++ b/code/modules/economy/price_list.dm @@ -78,13 +78,13 @@ /datum/reagent/drink/hot_coco price_tag = 3 -/obj/item/weapon/reagent_containers/food/drinks/coffee +/obj/item/reagent_containers/food/drinks/coffee price_tag = 3 -/obj/item/weapon/reagent_containers/food/drinks/tea +/obj/item/reagent_containers/food/drinks/tea price_tag = 3 -/obj/item/weapon/reagent_containers/food/drinks/h_chocolate +/obj/item/reagent_containers/food/drinks/h_chocolate price_tag = 3 @@ -378,31 +378,31 @@ // From the machine // -/obj/item/weapon/reagent_containers/food/drinks/cans/cola +/obj/item/reagent_containers/food/drinks/cans/cola price_tag = 1 -/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind +/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind price_tag = 1 -/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb +/obj/item/reagent_containers/food/drinks/cans/dr_gibb price_tag = 1 -/obj/item/weapon/reagent_containers/food/drinks/cans/starkist +/obj/item/reagent_containers/food/drinks/cans/starkist price_tag = 1 -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle +/obj/item/reagent_containers/food/drinks/cans/waterbottle price_tag = 2 -/obj/item/weapon/reagent_containers/food/drinks/cans/space_up +/obj/item/reagent_containers/food/drinks/cans/space_up price_tag = 1 -/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea +/obj/item/reagent_containers/food/drinks/cans/iced_tea price_tag = 1 -/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice +/obj/item/reagent_containers/food/drinks/cans/grape_juice price_tag = 1 -/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale +/obj/item/reagent_containers/food/drinks/cans/gingerale price_tag = 1 //***************// @@ -411,103 +411,103 @@ // Juices, soda and similar // -/obj/item/weapon/reagent_containers/food/drinks/bottle/cola +/obj/item/reagent_containers/food/drinks/bottle/cola price_tag = 6 -/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up +/obj/item/reagent_containers/food/drinks/bottle/space_up price_tag = 6 -/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind +/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind price_tag = 6 -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice +/obj/item/reagent_containers/food/drinks/bottle/orangejuice price_tag = 6 -/obj/item/weapon/reagent_containers/food/drinks/bottle/applejuice +/obj/item/reagent_containers/food/drinks/bottle/applejuice price_tag = 6 -/obj/item/weapon/reagent_containers/food/drinks/bottle/cream +/obj/item/reagent_containers/food/drinks/bottle/cream price_tag = 6 -/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice +/obj/item/reagent_containers/food/drinks/bottle/tomatojuice price_tag = 6 -/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice +/obj/item/reagent_containers/food/drinks/bottle/limejuice price_tag = 6 // Beer // -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer +/obj/item/reagent_containers/food/drinks/bottle/small/beer price_tag = 3 -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale +/obj/item/reagent_containers/food/drinks/bottle/small/ale price_tag = 3 // Spirituous Liquors // -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe +/obj/item/reagent_containers/food/drinks/bottle/absinthe price_tag = 15 -/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao +/obj/item/reagent_containers/food/drinks/bottle/bluecuracao price_tag = 15 -/obj/item/weapon/reagent_containers/food/drinks/bottle/gin +/obj/item/reagent_containers/food/drinks/bottle/gin price_tag = 15 -/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua +/obj/item/reagent_containers/food/drinks/bottle/kahlua price_tag = 15 -/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor +/obj/item/reagent_containers/food/drinks/bottle/melonliquor price_tag = 15 -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum +/obj/item/reagent_containers/food/drinks/bottle/rum price_tag = 15 -/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla +/obj/item/reagent_containers/food/drinks/bottle/tequilla price_tag = 15 -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka +/obj/item/reagent_containers/food/drinks/bottle/vodka price_tag = 15 -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey +/obj/item/reagent_containers/food/drinks/bottle/whiskey price_tag = 15 -/obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey +/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey price_tag = 15 -/obj/item/weapon/reagent_containers/food/drinks/bottle/patron +/obj/item/reagent_containers/food/drinks/bottle/patron price_tag = 15 -/obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager +/obj/item/reagent_containers/food/drinks/bottle/goldschlager price_tag = 15 -/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing +/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing price_tag = 15 -/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine +/obj/item/reagent_containers/food/drinks/bottle/grenadine price_tag = 15 // Wines // -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine +/obj/item/reagent_containers/food/drinks/bottle/wine price_tag = 25 -/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac +/obj/item/reagent_containers/food/drinks/bottle/cognac price_tag = 25 -/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth +/obj/item/reagent_containers/food/drinks/bottle/vermouth price_tag = 25 -/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine +/obj/item/reagent_containers/food/drinks/bottle/pwine price_tag = 25 -/obj/item/weapon/reagent_containers/food/drinks/bottle/sake +/obj/item/reagent_containers/food/drinks/bottle/sake price_tag = 25 -/obj/item/weapon/reagent_containers/food/drinks/bottle/jager +/obj/item/reagent_containers/food/drinks/bottle/jager price_tag = 25 //***************// @@ -516,471 +516,471 @@ // Snacks // -/obj/item/weapon/reagent_containers/food/snacks/candy +/obj/item/reagent_containers/food/snacks/candy price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/sosjerky +/obj/item/reagent_containers/food/snacks/sosjerky price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/unajerky +/obj/item/reagent_containers/food/snacks/unajerky price_tag = 12 -/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers +/obj/item/reagent_containers/food/snacks/cheesiehonkers price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/tastybread +/obj/item/reagent_containers/food/snacks/tastybread price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/no_raisin +/obj/item/reagent_containers/food/snacks/no_raisin price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie +/obj/item/reagent_containers/food/snacks/packaged/spacetwinkie price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks +/obj/item/reagent_containers/food/snacks/skrellsnacks price_tag = 4 -/obj/item/weapon/reagent_containers/food/snacks/chips +/obj/item/reagent_containers/food/snacks/chips price_tag = 1 -/obj/item/weapon/reagent_containers/food/drinks/dry_ramen +/obj/item/reagent_containers/food/drinks/dry_ramen price_tag = 5 // Burger // -/obj/item/weapon/reagent_containers/food/snacks/brainburger +/obj/item/reagent_containers/food/snacks/brainburger price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/ghostburger +/obj/item/reagent_containers/food/snacks/ghostburger price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/human/burger +/obj/item/reagent_containers/food/snacks/human/burger price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/cheeseburger +/obj/item/reagent_containers/food/snacks/cheeseburger price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/monkeyburger +/obj/item/reagent_containers/food/snacks/monkeyburger price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/fishburger +/obj/item/reagent_containers/food/snacks/fishburger price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/tofuburger +/obj/item/reagent_containers/food/snacks/tofuburger price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/roburger +/obj/item/reagent_containers/food/snacks/roburger price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/roburgerbig +/obj/item/reagent_containers/food/snacks/roburgerbig price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/xenoburger +/obj/item/reagent_containers/food/snacks/xenoburger price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/clownburger +/obj/item/reagent_containers/food/snacks/clownburger price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/mimeburger +/obj/item/reagent_containers/food/snacks/mimeburger price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/spellburger +/obj/item/reagent_containers/food/snacks/spellburger price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/jellyburger +/obj/item/reagent_containers/food/snacks/jellyburger price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger +/obj/item/reagent_containers/food/snacks/bigbiteburger price_tag = 4 -/obj/item/weapon/reagent_containers/food/snacks/superbiteburger +/obj/item/reagent_containers/food/snacks/superbiteburger price_tag = 8 // Sandwiches // -/obj/item/weapon/reagent_containers/food/snacks/sandwich +/obj/item/reagent_containers/food/snacks/sandwich price_tag = 3 -/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich +/obj/item/reagent_containers/food/snacks/toastedsandwich price_tag = 3 -/obj/item/weapon/reagent_containers/food/snacks/grilledcheese +/obj/item/reagent_containers/food/snacks/grilledcheese price_tag = 3 -/obj/item/weapon/reagent_containers/food/snacks/jellysandwich +/obj/item/reagent_containers/food/snacks/jellysandwich price_tag = 3 // Cookies and Candies // -/obj/item/weapon/reagent_containers/food/snacks/cookie +/obj/item/reagent_containers/food/snacks/cookie price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/chocolatebar +/obj/item/reagent_containers/food/snacks/chocolatebar price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/chocolateegg +/obj/item/reagent_containers/food/snacks/chocolateegg price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/candy_corn +/obj/item/reagent_containers/food/snacks/candy_corn price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/donut +/obj/item/reagent_containers/food/snacks/donut price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/donut/chaos +/obj/item/reagent_containers/food/snacks/donut/chaos price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/popcorn +/obj/item/reagent_containers/food/snacks/popcorn price_tag = 3 -/obj/item/weapon/reagent_containers/food/snacks/fortunecookie +/obj/item/reagent_containers/food/snacks/fortunecookie price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/candiedapple +/obj/item/reagent_containers/food/snacks/candiedapple price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit +/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/chawanmushi +/obj/item/reagent_containers/food/snacks/chawanmushi price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/cracker +/obj/item/reagent_containers/food/snacks/cracker price_tag = 1 // Full meals // -/obj/item/weapon/reagent_containers/food/snacks/friedegg +/obj/item/reagent_containers/food/snacks/friedegg price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/tofurkey +/obj/item/reagent_containers/food/snacks/tofurkey price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/carpmeat +/obj/item/reagent_containers/food/snacks/carpmeat price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/fishfingers +/obj/item/reagent_containers/food/snacks/fishfingers price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/omelette +/obj/item/reagent_containers/food/snacks/omelette price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/berryclafoutis +/obj/item/reagent_containers/food/snacks/berryclafoutis price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/waffles +/obj/item/reagent_containers/food/snacks/waffles price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/eggplantparm +/obj/item/reagent_containers/food/snacks/eggplantparm price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/soylentgreen +/obj/item/reagent_containers/food/snacks/soylentgreen price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/soylenviridians +/obj/item/reagent_containers/food/snacks/soylenviridians price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/wingfangchu +/obj/item/reagent_containers/food/snacks/wingfangchu price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/monkeykabob +/obj/item/reagent_containers/food/snacks/monkeykabob price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/tofukabob +/obj/item/reagent_containers/food/snacks/tofukabob price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/cubancarp +/obj/item/reagent_containers/food/snacks/cubancarp price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato +/obj/item/reagent_containers/food/snacks/loadedbakedpotato price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/fries +/obj/item/reagent_containers/food/snacks/fries price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/spagetti +/obj/item/reagent_containers/food/snacks/spagetti price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/cheesyfries +/obj/item/reagent_containers/food/snacks/cheesyfries price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/enchiladas +/obj/item/reagent_containers/food/snacks/enchiladas price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/taco +/obj/item/reagent_containers/food/snacks/taco price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight +/obj/item/reagent_containers/food/snacks/monkeysdelight price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/fishandchips +/obj/item/reagent_containers/food/snacks/fishandchips price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles +/obj/item/reagent_containers/food/snacks/rofflewaffles price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/stew +/obj/item/reagent_containers/food/snacks/stew price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat +/obj/item/reagent_containers/food/snacks/stewedsoymeat price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/boiledspagetti +/obj/item/reagent_containers/food/snacks/boiledspagetti price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/boiledrice +/obj/item/reagent_containers/food/snacks/boiledrice price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/ricepudding +/obj/item/reagent_containers/food/snacks/ricepudding price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/pastatomato +/obj/item/reagent_containers/food/snacks/pastatomato price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/meatballspagetti +/obj/item/reagent_containers/food/snacks/meatballspagetti price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/spesslaw +/obj/item/reagent_containers/food/snacks/spesslaw price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/carrotfries +/obj/item/reagent_containers/food/snacks/carrotfries price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/appletart +/obj/item/reagent_containers/food/snacks/appletart price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza +/obj/item/reagent_containers/food/snacks/sliceable/pizza price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/margherita +/obj/item/reagent_containers/food/snacks/slice/margherita price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/slice/meatpizza +/obj/item/reagent_containers/food/snacks/slice/meatpizza price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/slice/mushroompizza +/obj/item/reagent_containers/food/snacks/slice/mushroompizza price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza +/obj/item/reagent_containers/food/snacks/slice/vegetablepizza price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/ +/obj/item/reagent_containers/food/snacks/ // Baked Goods // -/obj/item/weapon/reagent_containers/food/snacks/poppypretzel +/obj/item/reagent_containers/food/snacks/poppypretzel price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/baguette +/obj/item/reagent_containers/food/snacks/baguette price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast +/obj/item/reagent_containers/food/snacks/jelliedtoast price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/twobread +/obj/item/reagent_containers/food/snacks/twobread price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread +/obj/item/reagent_containers/food/snacks/sliceable/meatbread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/meatbread +/obj/item/reagent_containers/food/snacks/slice/meatbread price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread +/obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/xenomeatbread +/obj/item/reagent_containers/food/snacks/slice/xenomeatbread price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread +/obj/item/reagent_containers/food/snacks/sliceable/bananabread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/bananabread +/obj/item/reagent_containers/food/snacks/slice/bananabread price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/tofubread +/obj/item/reagent_containers/food/snacks/sliceable/tofubread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/tofubread +/obj/item/reagent_containers/food/snacks/slice/tofubread price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/bread +/obj/item/reagent_containers/food/snacks/sliceable/bread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/bread +/obj/item/reagent_containers/food/snacks/slice/bread price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread +/obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/creamcheesebread +/obj/item/reagent_containers/food/snacks/slice/creamcheesebread price_tag = 1 // Soups // -/obj/item/weapon/reagent_containers/food/snacks/meatballsoup +/obj/item/reagent_containers/food/snacks/meatballsoup price_tag = 3 -/obj/item/weapon/reagent_containers/food/snacks/slimesoup +/obj/item/reagent_containers/food/snacks/slimesoup price_tag = 3 -/obj/item/weapon/reagent_containers/food/snacks/bloodsoup +/obj/item/reagent_containers/food/snacks/bloodsoup price_tag = 3 -/obj/item/weapon/reagent_containers/food/snacks/clownstears +/obj/item/reagent_containers/food/snacks/clownstears price_tag = 3 -/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup +/obj/item/reagent_containers/food/snacks/vegetablesoup price_tag = 3 -/obj/item/weapon/reagent_containers/food/snacks/nettlesoup +/obj/item/reagent_containers/food/snacks/nettlesoup price_tag = 3 -/obj/item/weapon/reagent_containers/food/snacks/mysterysoup +/obj/item/reagent_containers/food/snacks/mysterysoup price_tag = 3 -/obj/item/weapon/reagent_containers/food/snacks/wishsoup +/obj/item/reagent_containers/food/snacks/wishsoup price_tag = 3 -/obj/item/weapon/reagent_containers/food/snacks/hotchili +/obj/item/reagent_containers/food/snacks/hotchili price_tag = 3 -/obj/item/weapon/reagent_containers/food/snacks/coldchili +/obj/item/reagent_containers/food/snacks/coldchili price_tag = 3 -/obj/item/weapon/reagent_containers/food/snacks/tomatosoup +/obj/item/reagent_containers/food/snacks/tomatosoup price_tag = 3 -/obj/item/weapon/reagent_containers/food/snacks/milosoup +/obj/item/reagent_containers/food/snacks/milosoup price_tag = 3 -/obj/item/weapon/reagent_containers/food/snacks/mushroomsoup +/obj/item/reagent_containers/food/snacks/mushroomsoup price_tag = 3 -/obj/item/weapon/reagent_containers/food/snacks/beetsoup +/obj/item/reagent_containers/food/snacks/beetsoup price_tag = 3 // Pies // -/obj/item/weapon/reagent_containers/food/snacks/pie +/obj/item/reagent_containers/food/snacks/pie price_tag = 4 -/obj/item/weapon/reagent_containers/food/snacks/meatpie +/obj/item/reagent_containers/food/snacks/meatpie price_tag = 4 -/obj/item/weapon/reagent_containers/food/snacks/tofupie +/obj/item/reagent_containers/food/snacks/tofupie price_tag = 4 -/obj/item/weapon/reagent_containers/food/snacks/plump_pie +/obj/item/reagent_containers/food/snacks/plump_pie price_tag = 4 -/obj/item/weapon/reagent_containers/food/snacks/xemeatpie +/obj/item/reagent_containers/food/snacks/xemeatpie price_tag = 4 -/obj/item/weapon/reagent_containers/food/snacks/applepie +/obj/item/reagent_containers/food/snacks/applepie price_tag = 4 -/obj/item/weapon/reagent_containers/food/snacks/cherrypie +/obj/item/reagent_containers/food/snacks/cherrypie price_tag = 4 // Cakes // -/obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake +/obj/item/reagent_containers/food/snacks/sliceable/carrotcake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/carrotcake +/obj/item/reagent_containers/food/snacks/slice/carrotcake price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake +/obj/item/reagent_containers/food/snacks/sliceable/braincake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/braincake +/obj/item/reagent_containers/food/snacks/slice/braincake price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake +/obj/item/reagent_containers/food/snacks/sliceable/cheesecake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/cheesecake +/obj/item/reagent_containers/food/snacks/slice/cheesecake price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake +/obj/item/reagent_containers/food/snacks/sliceable/plaincake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/plaincake +/obj/item/reagent_containers/food/snacks/slice/plaincake price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake +/obj/item/reagent_containers/food/snacks/sliceable/orangecake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/orangecake +/obj/item/reagent_containers/food/snacks/slice/orangecake price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake +/obj/item/reagent_containers/food/snacks/sliceable/limecake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/limecake +/obj/item/reagent_containers/food/snacks/slice/limecake price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake +/obj/item/reagent_containers/food/snacks/sliceable/lemoncake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/lemoncake +/obj/item/reagent_containers/food/snacks/slice/lemoncake price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake +/obj/item/reagent_containers/food/snacks/sliceable/chocolatecake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/chocolatecake +/obj/item/reagent_containers/food/snacks/slice/chocolatecake price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake +/obj/item/reagent_containers/food/snacks/sliceable/birthdaycake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/birthdaycake +/obj/item/reagent_containers/food/snacks/slice/birthdaycake price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake +/obj/item/reagent_containers/food/snacks/sliceable/applecake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/applecake +/obj/item/reagent_containers/food/snacks/slice/applecake price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie +/obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/slice/pumpkinpie +/obj/item/reagent_containers/food/snacks/slice/pumpkinpie price_tag = 1 // Misc // -/obj/item/weapon/reagent_containers/food/snacks/boiledegg +/obj/item/reagent_containers/food/snacks/boiledegg price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/donkpocket +/obj/item/reagent_containers/food/snacks/donkpocket price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/sausage +/obj/item/reagent_containers/food/snacks/sausage price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/muffin +/obj/item/reagent_containers/food/snacks/muffin price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/tossedsalad +/obj/item/reagent_containers/food/snacks/tossedsalad price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/validsalad +/obj/item/reagent_containers/food/snacks/validsalad price_tag = 2 -/obj/item/weapon/reagent_containers/food/snacks/dionaroast +/obj/item/reagent_containers/food/snacks/dionaroast price_tag = 25 /obj/item/pizzabox/get_item_cost() @@ -991,34 +991,34 @@ //----Smokes-----// //***************// -/obj/item/weapon/storage/fancy/cigarettes +/obj/item/storage/fancy/cigarettes price_tag = 15 -/obj/item/weapon/storage/fancy/cigarettes/luckystars +/obj/item/storage/fancy/cigarettes/luckystars price_tag = 17 -/obj/item/weapon/storage/fancy/cigarettes/jerichos +/obj/item/storage/fancy/cigarettes/jerichos price_tag = 22 -/obj/item/weapon/storage/fancy/cigarettes/menthols +/obj/item/storage/fancy/cigarettes/menthols price_tag = 18 -/obj/item/weapon/storage/fancy/cigar +/obj/item/storage/fancy/cigar price_tag = 27 -/obj/item/weapon/storage/fancy/cigarettes/carcinomas +/obj/item/storage/fancy/cigarettes/carcinomas price_tag = 23 -/obj/item/weapon/storage/fancy/cigarettes/professionals +/obj/item/storage/fancy/cigarettes/professionals price_tag = 25 -/obj/item/weapon/storage/box/matches +/obj/item/storage/box/matches price_tag = 1 -/obj/item/weapon/flame/lighter +/obj/item/flame/lighter price_tag = 2 -/obj/item/weapon/flame/lighter/zippo +/obj/item/flame/lighter/zippo price_tag = 5 //******************************// diff --git a/code/modules/economy/retail_scanner.dm b/code/modules/economy/retail_scanner.dm index 5632203dd88..3e952aade5c 100644 --- a/code/modules/economy/retail_scanner.dm +++ b/code/modules/economy/retail_scanner.dm @@ -1,4 +1,4 @@ -/obj/item/device/retail_scanner +/obj/item/retail_scanner name = "retail scanner" desc = "Swipe your ID card to make purchases electronically." icon = 'icons/obj/device.dmi' @@ -24,7 +24,7 @@ // Claim machine ID -/obj/item/device/retail_scanner/New() +/obj/item/retail_scanner/New() machine_id = "[station_name()] RETAIL #[num_financial_terminals++]" if(locate(/obj/structure/table) in loc) pixel_y = 3 @@ -32,7 +32,7 @@ // Always face the user when put on a table -/obj/item/device/retail_scanner/afterattack(atom/movable/AM, mob/user, proximity) +/obj/item/retail_scanner/afterattack(atom/movable/AM, mob/user, proximity) if(!proximity) return if(istype(AM, /obj/structure/table)) src.pixel_y = 3 // Shift it up slightly to look better on table @@ -41,27 +41,27 @@ scan_item_price(AM) // Reset dir when picked back up -/obj/item/device/retail_scanner/pickup(mob/user) +/obj/item/retail_scanner/pickup(mob/user) src.dir = SOUTH src.pixel_y = 0 -/obj/item/device/retail_scanner/attack_self(mob/user as mob) +/obj/item/retail_scanner/attack_self(mob/user as mob) user.set_machine(src) interact(user) -/obj/item/device/retail_scanner/AltClick(var/mob/user) +/obj/item/retail_scanner/AltClick(var/mob/user) if(Adjacent(user)) user.set_machine(src) interact(user) -/obj/item/device/retail_scanner/examine(mob/user as mob) +/obj/item/retail_scanner/examine(mob/user as mob) . = ..() if(transaction_amount) . += "It has a purchase of [transaction_amount] pending[transaction_purpose ? " for [transaction_purpose]" : ""]." -/obj/item/device/retail_scanner/interact(mob/user as mob) +/obj/item/retail_scanner/interact(mob/user as mob) var/dat = "

Retail Scanner

" if (locked) dat += "Unlock
" @@ -86,7 +86,7 @@ onclose(user, "retail") -/obj/item/device/retail_scanner/Topic(var/href, var/href_list) +/obj/item/retail_scanner/Topic(var/href, var/href_list) if(..()) return @@ -162,30 +162,30 @@ -/obj/item/device/retail_scanner/attackby(obj/O as obj, user as mob) +/obj/item/retail_scanner/attackby(obj/O as obj, user as mob) // Check for a method of paying (ID, PDA, e-wallet, cash, ect.) - var/obj/item/weapon/card/id/I = O.GetID() + var/obj/item/card/id/I = O.GetID() if(I) scan_card(I, O) - else if (istype(O, /obj/item/weapon/spacecash/ewallet)) - var/obj/item/weapon/spacecash/ewallet/E = O + else if (istype(O, /obj/item/spacecash/ewallet)) + var/obj/item/spacecash/ewallet/E = O scan_wallet(E) - else if (istype(O, /obj/item/weapon/spacecash)) + else if (istype(O, /obj/item/spacecash)) to_chat(usr, "This device does not accept cash.") - else if(istype(O, /obj/item/weapon/card/emag)) + else if(istype(O, /obj/item/card/emag)) return ..() // Not paying: Look up price and add it to transaction_amount else scan_item_price(O) -/obj/item/device/retail_scanner/showoff(mob/user) +/obj/item/retail_scanner/showoff(mob/user) for (var/mob/M in view(user)) M.show_message("[user] holds up [src]. Swipe card or item.",1) -/obj/item/device/retail_scanner/proc/confirm(var/obj/item/I) +/obj/item/retail_scanner/proc/confirm(var/obj/item/I) if(confirm_item == I) return 1 else @@ -195,7 +195,7 @@ return 0 -/obj/item/device/retail_scanner/proc/scan_card(var/obj/item/weapon/card/id/I, var/obj/item/ID_container) +/obj/item/retail_scanner/proc/scan_card(var/obj/item/card/id/I, var/obj/item/ID_container) if (!transaction_amount) return @@ -255,7 +255,7 @@ transaction_complete() -/obj/item/device/retail_scanner/proc/scan_wallet(var/obj/item/weapon/spacecash/ewallet/E) +/obj/item/retail_scanner/proc/scan_wallet(var/obj/item/spacecash/ewallet/E) if (!transaction_amount) return @@ -288,7 +288,7 @@ transaction_complete() -/obj/item/device/retail_scanner/proc/scan_item_price(var/obj/O) +/obj/item/retail_scanner/proc/scan_item_price(var/obj/O) if(!istype(O)) return if(item_list.len > 10) src.visible_message("[icon2html(src,viewers(src))]Only up to ten different items allowed per purchase.") @@ -320,7 +320,7 @@ confirm_item = null -/obj/item/device/retail_scanner/proc/get_current_transaction() +/obj/item/retail_scanner/proc/get_current_transaction() var/dat = {" -
In the land of Margata, nothing is ever as it seems. There have been many verifiable cases of local bakers having a secret double life as DJs. The correlation between exposure to bread and wanting to scratch out some sick beats has never been quantified, quite possibly to science being illegal in the region. That didn't happen to be the case of a young boy named Gadroc, who was neither a baker nor a DJ. In fact, his story happens to have nothing to do with either of the two. Poor Gadroc was afflicted with a terrible curse. It had been that way ever since he was born, because a witch had cursed his mother for saying "Keep the change," when there was only one cent of change left. Gadroc’s curse was horrible, one that no human being should suffer through: he couldn’t look at butts. Whenever someone showed him a full moon, he transformed into a horrible beast with astoundingly fresh breath. Whenever this happened, he would always run to the nearest cornfield and begin uncontrollably eating corn. Why corn? Because magic, that’s why. That's just how it fucking works. Don't you know anything?
-
After coming home with corn stuck in his teeth for three days straight, and only having one more pair of pants that weren’t destroyed, Gadroc knew that he needed to do something about his curse. He went to the first person he could think of for help.
-
Carne was the town’s blacksmith. He wasn’t very wise, but he always spoke as though he was. It was for this reason that Gadroc often came to Carne for help, despite the fact that he could probably go to basically anyone else. The town beggar, who was constantly sitting in a puddle of his own pee, gave better advice than the blacksmith. Carne was the only one who knew about Gadroc’s affliction. No one else knew who was ravaging the town’s corn population, and riots had already broken out over the severe deficit in cornbread supply.
+
In the land of Margata, nothing is ever as it seems. There have been many verifiable cases of local bakers having a secret double life as DJs. The correlation between exposure to bread and wanting to scratch out some sick beats has never been quantified, quite possibly to science being illegal in the region. That didn't happen to be the case of a young boy named Gadroc, who was neither a baker nor a DJ. In fact, his story happens to have nothing to do with either of the two. Poor Gadroc was afflicted with a terrible curse. It had been that way ever since he was born, because a witch had cursed his mother for saying "Keep the change," when there was only one cent of change left. Gadroc�s curse was horrible, one that no human being should suffer through: he couldn�t look at butts. Whenever someone showed him a full moon, he transformed into a horrible beast with astoundingly fresh breath. Whenever this happened, he would always run to the nearest cornfield and begin uncontrollably eating corn. Why corn? Because magic, that�s why. That's just how it fucking works. Don't you know anything?
+
After coming home with corn stuck in his teeth for three days straight, and only having one more pair of pants that weren�t destroyed, Gadroc knew that he needed to do something about his curse. He went to the first person he could think of for help.
+
Carne was the town�s blacksmith. He wasn�t very wise, but he always spoke as though he was. It was for this reason that Gadroc often came to Carne for help, despite the fact that he could probably go to basically anyone else. The town beggar, who was constantly sitting in a puddle of his own pee, gave better advice than the blacksmith. Carne was the only one who knew about Gadroc�s affliction. No one else knew who was ravaging the town�s corn population, and riots had already broken out over the severe deficit in cornbread supply.
"Carne, you have to help me!" Gadroc shouted as he burst through the doors of the smithy. Carne was in the middle of forging a pair of iron gauntlets, and had his back turned to Gadroc. He did not turn around.
"Do you need my help? Or do you need my help to help yourself?" Carne said, spouting his signature wisdom.
"Yes. No. What? Did you get that from a fortune cookie?" replied Gadroc.
-
"Yes, actually." Carne turned around. He was loudly crunching on some fortune cookie and inexplicably wearing the gauntlets he was working on, still glowing red hot. He held up the fortune, but Gadroc didn’t have time to read it, as it immediately caught fire and fell into a pile of ashes on the floor.
-
Gadroc was concerned. "Doesn’t that... you know... hurt?"
+
"Yes, actually." Carne turned around. He was loudly crunching on some fortune cookie and inexplicably wearing the gauntlets he was working on, still glowing red hot. He held up the fortune, but Gadroc didn�t have time to read it, as it immediately caught fire and fell into a pile of ashes on the floor.
+
Gadroc was concerned. "Doesn�t that... you know... hurt?"
"Oh yes, extremely," Carne said with a smile. They both stared at each other for a moment.
@@ -105,27 +105,27 @@ CATEGORY: Fiction
"AHHHHHHHHHHHHHHHHHHHH!" screamed Carne. He flailed his arms around wildly until the gauntlets flew off. One of them flew across the room and hit a painting hanging on the wall. The painting was of our lord and president, Orcbama, and the gauntlet punched him in the face. The painting had a large scorch mark in the same place where the gauntlet had hit, indicating that this was a common occurrence.
"Anyways," Carne said casually, hands blistered and burnt, "What do you need to help me with?"
-
"That’s not what I... you know what, nevermind. Listen. I am sick and tired of this stupid werewolf bullshit! Corn used to be my favorite, and now I can’t stand it! I miss the days when I enjoyed cornbread..."
+
"That�s not what I... you know what, nevermind. Listen. I am sick and tired of this stupid werewolf bullshit! Corn used to be my favorite, and now I can�t stand it! I miss the days when I enjoyed cornbread..."
"Yeah, so do the townsfolk," the blacksmith replied.
"That's not helpful," Gadroc said, but Carne went on.
"I've always been more of a corn casserole kind of guy myself. Easier on the old gut. Y'know, when I was a boy-"
"Would you shut up and listen? We need to do something about this!"
-
"Right... What’s the problem again?" Gadroc smacked his forehead. He pointed to his own butt.
+
"Right... What�s the problem again?" Gadroc smacked his forehead. He pointed to his own butt.
"Listen, son, if that's the way you're swingin', you don't have to play charades about it. Old Carne won't judge," Carne said.
-
"No, the werewolf problem!" Gadroc screamed. He fell to his knees, tears welling up in his eyes. He sniffed. "I just want to be able to look at butts. That’s all I want."
-
Carne walked up and put his gross, burnt hand on Gadroc’s shoulder. "It’s alright. I’ll help you with your problem."
+
"No, the werewolf problem!" Gadroc screamed. He fell to his knees, tears welling up in his eyes. He sniffed. "I just want to be able to look at butts. That�s all I want."
+
Carne walked up and put his gross, burnt hand on Gadroc�s shoulder. "It�s alright. I�ll help you with your problem."
Gadroc sniffed again. "Really?"
-
"Yes. Even if it means I’m helping myself to help you help me-"
-
"Carne, you’re not helping again."
+
"Yes. Even if it means I�m helping myself to help you help me-"
+
"Carne, you�re not helping again."

-
CUT TO: Gadroc and Carne, scaling a mountain. Both men were equipped with the finest blades from Carne’s smithy. Gadroc was feeling a little indignant, considering Carne had only given him a foam sword. Carne had taken the only finished blade in the smithy.
-
"You see that up there?" Carne said to Gadroc as they climbed. "That’s the ancient temple whose name is really hard to pronounce."
+
CUT TO: Gadroc and Carne, scaling a mountain. Both men were equipped with the finest blades from Carne�s smithy. Gadroc was feeling a little indignant, considering Carne had only given him a foam sword. Carne had taken the only finished blade in the smithy.
+
"You see that up there?" Carne said to Gadroc as they climbed. "That�s the ancient temple whose name is really hard to pronounce."
"Really?" Gadroc asked. "What's it called?"
-
"I’d tell you, but it’s really hard to pronounce," explained the smith. He continued. "From what I understand, there’s a mystical artifact that can cure any curse. We’re going to use it to cure your werewolf problem."
-
"Why didn’t you tell me any of this on the way here? I’ve been following you up this mountain for hours with no idea of what we’re doing."
+
"I�d tell you, but it�s really hard to pronounce," explained the smith. He continued. "From what I understand, there�s a mystical artifact that can cure any curse. We�re going to use it to cure your werewolf problem."
+
"Why didn�t you tell me any of this on the way here? I�ve been following you up this mountain for hours with no idea of what we�re doing."
"We took that part out in post. It was a really long and not very funny bit that didn't get much of a reaction out of anyone the first time this story was read out loud. It's a little trick the boys back home call 'the Director's Cut.'"
"Ah. That makes a lot of sense."
-
"Right?" The two laughed at that, looked at the camera for a moment, then back to each other. A laugh track played during this. It lasted for an uncomfortable amount of time. It was the kind of laughter that you think is about to die down, but then it kicks right back up again. There’s also that one lady who’s cackling like a hyena having a tea party with a witch. You try to unhear her, but you just keep noticing her. Why do sitcoms think laugh tracks add anything to the show? It doesn't. That shit just doesn’t sit right with me.
+
"Right?" The two laughed at that, looked at the camera for a moment, then back to each other. A laugh track played during this. It lasted for an uncomfortable amount of time. It was the kind of laughter that you think is about to die down, but then it kicks right back up again. There�s also that one lady who�s cackling like a hyena having a tea party with a witch. You try to unhear her, but you just keep noticing her. Why do sitcoms think laugh tracks add anything to the show? It doesn't. That shit just doesn�t sit right with me.
"}, @@ -139,20 +139,20 @@ CATEGORY: Fiction
They continued to hike up the mountain. After a little while, they reached the temple. The door was guarded by two dog-men holding spears.
"Who are these guys?" Gadroc asked.
-
"Let me handle this," assured Carne. "How’s it going gentlemen?" The dog-men stepped closer and crossed their spears across the door.
-
"Listen boys, there’s no need for the attitude," said the smith. The dog-men began to growl at him.
-
Carne frowned. "Hey now, that’s just rude." The dog-men responded to this by shoulder-checking Carne, knocking him to the ground. Gadroc sighed and walked up to the armored, bipedal golden retriever.
-
"Who’s a good boy?" Gadroc said as he began to scratch the dog behind his cutie ears. The dog-man turned his head into Gadroc’s hand and began to pant.
-
Gadroc continued. "You are! You’re a good boy! Oh it’s you!" The dog barked as if to say, "YES IT IS ME, I AM THE GOOD BOY." The dog-man eventually got down on all fours, stomped around in a circle a bit, and promptly fell asleep. The other guard whimpered. He had felt that he had been a good boy too, and that he deserved scratchies just as much as his partner, if not more. He conveyed this to Gadroc in a single bark. Gadroc turned to him.
-
"Oh I know! You’ve been a good boy too!" He pet the guard for a little bit, then pulled an ear of corn out of his pocket.
+
"Let me handle this," assured Carne. "How�s it going gentlemen?" The dog-men stepped closer and crossed their spears across the door.
+
"Listen boys, there�s no need for the attitude," said the smith. The dog-men began to growl at him.
+
Carne frowned. "Hey now, that�s just rude." The dog-men responded to this by shoulder-checking Carne, knocking him to the ground. Gadroc sighed and walked up to the armored, bipedal golden retriever.
+
"Who�s a good boy?" Gadroc said as he began to scratch the dog behind his cutie ears. The dog-man turned his head into Gadroc�s hand and began to pant.
+
Gadroc continued. "You are! You�re a good boy! Oh it�s you!" The dog barked as if to say, "YES IT IS ME, I AM THE GOOD BOY." The dog-man eventually got down on all fours, stomped around in a circle a bit, and promptly fell asleep. The other guard whimpered. He had felt that he had been a good boy too, and that he deserved scratchies just as much as his partner, if not more. He conveyed this to Gadroc in a single bark. Gadroc turned to him.
+
"Oh I know! You�ve been a good boy too!" He pet the guard for a little bit, then pulled an ear of corn out of his pocket.
"You want a treat boy?" Gadroc asked, as he held up the corn. The dog nodded violently and made a couple of attempts to nibble on the corn, but Gadroc pulled it away before he could.
"Go get it!" shouted Gadroc as he threw the corn down the mountain. The dog guard threw his spear to the side as he bounded after the corn bouncing down the path. Certain the guard had made it out of sight, Gadroc went to help Carne up.
"Where did you learn to deal with Canine-sapiens like that?" Carne asked.
"Well, if you think about it, werewolves are technically part dog. Plus, I just know a good boy when I see one."
The two stepped through the doors of the temple. At the end of the long, church-like room was a marble altar on a platform, with a set of stairs leading up to it. On the altar sat a small, simple wooden box. From above, a light fell gently on the box, giving it a soft, almost holy glow. The stained glass windows at the back of the room were arranged in such a way that they almost seemed to be pointing at the box. Many different flowers were arranged on either side of the box and at the foot of the altar.
-
"Call it a hunch," Carne said slowly, "but I think those flowers might be important somehow. I just get that feeling, I couldn’t tell you why."
-
"It’s the box that’s important, or whatever's in it," Gadroc said dryly. "The only thing that could make it more obvious is if a huge, luminescent sign dropped down with blinking arrows that read, ‘There’s probably a magic artifact in this box.’" Just then, a huge luminescent sign with blinking arrows that read, "There’s probably a magic artifact in this box." dropped down. Gadroc pinched the bridge of his nose.
-
"Do you think there might be a secret compartment in the altar? I bet that’s where the artifact is," pondered the smith.
+
"Call it a hunch," Carne said slowly, "but I think those flowers might be important somehow. I just get that feeling, I couldn�t tell you why."
+
"It�s the box that�s important, or whatever's in it," Gadroc said dryly. "The only thing that could make it more obvious is if a huge, luminescent sign dropped down with blinking arrows that read, �There�s probably a magic artifact in this box.�" Just then, a huge luminescent sign with blinking arrows that read, "There�s probably a magic artifact in this box." dropped down. Gadroc pinched the bridge of his nose.
+
"Do you think there might be a secret compartment in the altar? I bet that�s where the artifact is," pondered the smith.
"}, @@ -164,20 +164,20 @@ CATEGORY: Fiction -
"Welcome to the temple of Ivyechneyoveen Kah’al, my children," came a voice.
-
"Who said that?" Gadroc asked. "So that’s how it’s pronounced," mused Carne. A figure stepped out from behind a pillar. It was a robed dog-woman, an ancient St. Bernard.
+
"Welcome to the temple of Ivyechneyoveen Kah�al, my children," came a voice.
+
"Who said that?" Gadroc asked. "So that�s how it�s pronounced," mused Carne. A figure stepped out from behind a pillar. It was a robed dog-woman, an ancient St. Bernard.
The dog lady spoke again. "Have you come to give your thanks to Orcville?"
-
"I’m sorry, who?" Gadroc asked, confused.
+
"I�m sorry, who?" Gadroc asked, confused.
"Yes, Orcville Redenbacher. He blessed the world with his glorious popcorn and saved our souls."
"Wait," interrupted Carne. "Then why is it called the temple of Itchyville Cable?"
-
"Ivyechneyoveen Kah’al," corrected the priestess with a polite smile.
-
"Yeah, that’s what I said."
-
"I’d be glad to enlighten you, my child. It all started when..." The priestess lengthy explanation on the history and fine points of the religion of the dog people. It didn’t make the slightest bit of sense, though Carne did have a bit of a chuckle at the part where Orcville defeated the demon lord who wouldn't stop pretending to throw a ball to go fetch and then never actually throw the ball. Gadroc nearly fell asleep on his feet. He decided not to take part in the theological discussion and turned his attention back to the box. He walked up to the altar platform and climbed the steps. Carefully he opened the two small, wooden doors on the front of the box. Words could not describe his excitement. Inside the box was...
-
"A hot dog?" Gadroc asked aloud. He was thoroughly baffled. Inside the box was a golden hot dog that sparkled in the light. He couldn’t tell whether or not it had ketchup, mustard, or even relish on it; it was all gold.
+
"Ivyechneyoveen Kah�al," corrected the priestess with a polite smile.
+
"Yeah, that�s what I said."
+
"I�d be glad to enlighten you, my child. It all started when..." The priestess lengthy explanation on the history and fine points of the religion of the dog people. It didn�t make the slightest bit of sense, though Carne did have a bit of a chuckle at the part where Orcville defeated the demon lord who wouldn't stop pretending to throw a ball to go fetch and then never actually throw the ball. Gadroc nearly fell asleep on his feet. He decided not to take part in the theological discussion and turned his attention back to the box. He walked up to the altar platform and climbed the steps. Carefully he opened the two small, wooden doors on the front of the box. Words could not describe his excitement. Inside the box was...
+
"A hot dog?" Gadroc asked aloud. He was thoroughly baffled. Inside the box was a golden hot dog that sparkled in the light. He couldn�t tell whether or not it had ketchup, mustard, or even relish on it; it was all gold.
"What are you doing with our sacred artifact?" shouted the dog priestess. Gadroc jumped, startled. He was too busy thinking about what gold tasted like.
"Uh... I need it... for... a friend," Gadroc lied, incredibly convincingly.
-
"You’d better not eat that because that’s totally not how a magic artifact shaped like a hot dog would work!" screeched the priestess.
-
Gadroc looked again at the supposed cure to all his problems. It was right there in his hands! "You’re not my mom!" he shouted, and promptly shoved the entire hot dog in his mouth and made a break for the door. Carne seemed impressed.
+
"You�d better not eat that because that�s totally not how a magic artifact shaped like a hot dog would work!" screeched the priestess.
+
Gadroc looked again at the supposed cure to all his problems. It was right there in his hands! "You�re not my mom!" he shouted, and promptly shoved the entire hot dog in his mouth and made a break for the door. Carne seemed impressed.
"Damn," he said. "Wish I could run that fast after stuffing an entire hot dog in my mouth. Last time I did that I got a hernia." He turned to the dog priestess.
"So, uh... wanna go grab some popcorn later?" The priestess slapped him across the face. "Right. I'll get goin', then. Sorry about the hot dog. We'll make you a new one." Carne began to head in Gadroc's direction.
@@ -192,16 +192,16 @@ CATEGORY: Fiction -
"Gadroc, where are you?" Carne shouted. "You can come out now, she didn’t follow us." Gadroc looked around and slowly stepped out from behind a tree that didn't even come close to consealing him whatsoever.
-
"I... I don’t know if it worked, Carne," the boy said nervously.
-
"Here," said the smith. He handed Gadroc a small, folded up piece of paper. Almost the exact moment Gadroc’s fingers touched it, Carne leapt like an orc-lympic death hurdle sprinter and combat rolled to take cover behind a nearby fallen tree. Gadroc unfolded the paper, hands trembling. On it was a pin up of a real buff orc dude. His shirtless body was ripped and glistening with sweat. He held a wrench and his jeans were not tight around his waist. Another shot showed him crouched down in front of a sink, which was confusing because plumbing was not very popular yet. The orc’s loose jeans were sagging down his pants, and they revealed the glowing, firm cheeks of his fine behind. A single tear rolled down Gadroc’s face.
+
"Gadroc, where are you?" Carne shouted. "You can come out now, she didn�t follow us." Gadroc looked around and slowly stepped out from behind a tree that didn't even come close to consealing him whatsoever.
+
"I... I don�t know if it worked, Carne," the boy said nervously.
+
"Here," said the smith. He handed Gadroc a small, folded up piece of paper. Almost the exact moment Gadroc�s fingers touched it, Carne leapt like an orc-lympic death hurdle sprinter and combat rolled to take cover behind a nearby fallen tree. Gadroc unfolded the paper, hands trembling. On it was a pin up of a real buff orc dude. His shirtless body was ripped and glistening with sweat. He held a wrench and his jeans were not tight around his waist. Another shot showed him crouched down in front of a sink, which was confusing because plumbing was not very popular yet. The orc�s loose jeans were sagging down his pants, and they revealed the glowing, firm cheeks of his fine behind. A single tear rolled down Gadroc�s face.
"Carne," he sniffed. "It worked." Carne came out from behind the log and wiped the sweat from his brow with a "Phew!"
-
"It’s beautiful, Carne," Gadroc went on.
-
"Keep it, kid," the blacksmith said with a smile. "You need it more than I do. Let’s go home."
+
"It�s beautiful, Carne," Gadroc went on.
+
"Keep it, kid," the blacksmith said with a smile. "You need it more than I do. Let�s go home."
Gadroc had gold poop for a week.


Fin.

- "}) \ No newline at end of file + "}) diff --git a/code/modules/library/hardcode_library/fiction/schnayy.dm b/code/modules/library/hardcode_library/fiction/schnayy.dm index 14381e0ace4..182bed8f3ca 100644 --- a/code/modules/library/hardcode_library/fiction/schnayy.dm +++ b/code/modules/library/hardcode_library/fiction/schnayy.dm @@ -5,7 +5,7 @@ CATEGORY: Fiction /// Beyond the Door - Philip K. Dick -/obj/item/weapon/book/bundle/custom_library/fiction/beyondthedoor +/obj/item/book/bundle/custom_library/fiction/beyondthedoor name = "Beyond the Door" desc = "A hardbound book titled 'Beyond the Door' by Philip K. Dick." description_info = "This book is titled 'Beyond the Door' by Philip K. Dick. There is a blurb on the back:
\ @@ -228,7 +228,7 @@ CATEGORY: Fiction /// The Man From Snowy River by A.B. "Banjo" Paterson -/obj/item/weapon/book/bundle/custom_library/fiction/manfromsnowyriver +/obj/item/book/bundle/custom_library/fiction/manfromsnowyriver name = "The Man From Snowy River" desc = "A hardbound book titled 'The Man From Snowy River' by A.B. 'Banjo' Paterson." description_info = "This book is titled 'The Man From Snowy River' by A.B. 'Banjo' Paterson." diff --git a/code/modules/library/hardcode_library/non-fiction/PortedBooks.dm b/code/modules/library/hardcode_library/non-fiction/PortedBooks.dm index 579e2fe5f31..e6c640327e4 100644 --- a/code/modules/library/hardcode_library/non-fiction/PortedBooks.dm +++ b/code/modules/library/hardcode_library/non-fiction/PortedBooks.dm @@ -7,7 +7,7 @@ Category: Non-Fiction /// Free Sirisai: Light Bulbs by Sene of Sheraeshi. -/obj/item/weapon/book/custom_library/nonfiction/freesirisailightbulbs +/obj/item/book/custom_library/nonfiction/freesirisailightbulbs name = "Free Sirisai: Light Bulbs" desc = "A hardbound book titled \"Free Sirisai: Light Bulbs\" by Sene of Sheraeshi." description_info = "This book is titled \"Free Sirisai: Light Bulbs\" by Sene of Sheraeshi. It appears to be about the different lighting needs of different sapient species, written from a Teshari author's view." @@ -42,7 +42,7 @@ Category: Non-Fiction /// The Viability of Corporate Government by Yang Simiao -/obj/item/weapon/book/bundle/custom_library/nonfiction/viabilityofcorporategov +/obj/item/book/bundle/custom_library/nonfiction/viabilityofcorporategov name = "The Viability of Corporate Government" desc = "A hardbound book titled \"The Viability of Corporate Government\" by Yang Simiao." description_info = "This book is titled \"The Viability of Corporate Government\" by Yang Simiao. It seems to be an opinion piece on the relationship between corporations and the stations they own." @@ -99,7 +99,7 @@ Category: Non-Fiction ///A Brief History Of The Rise And Fall Of The Persian Empire by Satrap. -/obj/item/weapon/book/bundle/custom_library/nonfiction/riseandfallofpersianempire +/obj/item/book/bundle/custom_library/nonfiction/riseandfallofpersianempire name = "The Rise And Fall Of The Persian Empire" desc = "A hardbound book titled \"A Brief History Of The Rise And Fall Of The Persian Empire\" by Satrap." description_info = "This book is titled \"A Brief History Of The Rise And Fall Of The Persian Empire\" by Satrap. It covers the beginning and end of Earth's Persian Empire." @@ -224,7 +224,7 @@ Category: Non-Fiction /// An Explanation of the Skrellian Caste System by Jyotirao Phule. -/obj/item/weapon/book/bundle/custom_library/nonfiction/skrelliancastesystem +/obj/item/book/bundle/custom_library/nonfiction/skrelliancastesystem name = "An Explanation of the Skrellian Caste System" desc = "A hardbound book titled \"An Explanation of the Skrellian Caste System\" by Jyotirao Phule." diff --git a/code/modules/library/hardcode_library/reference/PortedBooks.dm b/code/modules/library/hardcode_library/reference/PortedBooks.dm index 27b1af95091..45344142eb6 100644 --- a/code/modules/library/hardcode_library/reference/PortedBooks.dm +++ b/code/modules/library/hardcode_library/reference/PortedBooks.dm @@ -7,7 +7,7 @@ Category: Reference /// Recycling Procedures by 'Astrid Morton'. -/obj/item/weapon/book/bundle/custom_library/reference/recyclingprocedures +/obj/item/book/bundle/custom_library/reference/recyclingprocedures name = "Recycling Procedures" desc = "A hardbound book titled \"Recycling Procedures\" by Astrid Morton." description_info = "This book is titled \"Recycling Procedures\" by Astrid Morton. It appears to be about ways you can help recycle on your average space station." @@ -104,7 +104,7 @@ Category: Reference ///A Guide to FBP and Prosthetic Maintenance by Yuki Matsuda. Was edited to be more accurate and fixed typos. -/obj/item/weapon/book/bundle/custom_library/reference/fbpandprostheticmaintenance +/obj/item/book/bundle/custom_library/reference/fbpandprostheticmaintenance name = "A Guide to FBP and Prosthetic Maintenance" desc = "A hardbound book titled \"A Guide to FBP and Prosthetic Maintenance\" by Yuki Matsuda." description_info = "This book is titled \"A Guide to FBP and Prosthetic Maintenance\" by Yuki Matsuda. It appears to cover general steps for repairing prosthetics." @@ -233,7 +233,7 @@ Category: Reference ///A Fistful of D6's: Player's Guide by Ray Rogers -/obj/item/weapon/book/custom_library/reference/fistfulofd6splayersguide +/obj/item/book/custom_library/reference/fistfulofd6splayersguide name = "A Fistful of D6's: Player's Guide" desc = "A hardbound book titled \"A Fistful of D6's: Player's Guide\" by Ray Rogers." @@ -269,7 +269,7 @@ Category: Reference ///The Space Survival Guide: Depressurization by Lachina Green. -/obj/item/weapon/book/custom_library/reference/spacesurvivalguidedespressurization +/obj/item/book/custom_library/reference/spacesurvivalguidedespressurization name = "The Space Survival Guide: Depressurization" desc = "A hardbound book titled \"The Space Survival Guide: Depressurization\" by Lachina Green." @@ -322,7 +322,7 @@ Category: Reference ///Security Guidelines by NanoTrasen. -/obj/item/weapon/book/custom_library/reference/securityguidelines +/obj/item/book/custom_library/reference/securityguidelines name = "Security Guidelines" desc = "A hardbound book titled \"Security Guidelines\" as provided by NanoTrasen." diff --git a/code/modules/library/hardcode_library/reference/Schnayy.dm b/code/modules/library/hardcode_library/reference/Schnayy.dm index 7d9c4c993c3..d3edc453fc0 100644 --- a/code/modules/library/hardcode_library/reference/Schnayy.dm +++ b/code/modules/library/hardcode_library/reference/Schnayy.dm @@ -5,7 +5,7 @@ CATEGORY: Reference ///Thermodynamic Reactions and Research: A Guide to Phoron Studies and Safety by I.R.I.S. -/obj/item/weapon/book/bundle/custom_library/reference/ThermodynamicReactionsandResearch +/obj/item/book/bundle/custom_library/reference/ThermodynamicReactionsandResearch name = "Thermodynamic Reactions and Research" desc = "A hardbound book titled \"Thermodynamic Reactions and Research: A Guide to Phoron Studies and Safety\" by I.R.I.S.." description_info = "This book is titled \"Thermodynamic Reactions and Research: A Guide to Phoron Studies and Safety\" by I.R.I.S.. It appears to cover the fundamentals of phoron and thermodynamic research." @@ -49,7 +49,7 @@ CATEGORY: Reference
Phoron research and study is a vital subject of research -- it has been a pillar of humanity's progress, a staple of the technology that has shaped our society. To work on expanding our knowledge and shape our future in the cosmos is a noble cause, but it should be done with caution.

- This is not to speak on safety in your lab, but the consequences of action. Many times has man created the unthinkable, and many times we have not been prepared for such discoveries. We should not censor ourselves from advancement, but we should shape the world to be ready for what comes with it – and know that it is an invariable consequence there will be those who seek to abuse it. + This is not to speak on safety in your lab, but the consequences of action. Many times has man created the unthinkable, and many times we have not been prepared for such discoveries. We should not censor ourselves from advancement, but we should shape the world to be ready for what comes with it � and know that it is an invariable consequence there will be those who seek to abuse it.

You cannot take back what you give to the world. @@ -160,4 +160,4 @@ CATEGORY: Reference
- "}) \ No newline at end of file + "}) diff --git a/code/modules/library/hardcode_library/religious/PortedBooks.dm b/code/modules/library/hardcode_library/religious/PortedBooks.dm index 36c4e657028..af92a062ff8 100644 --- a/code/modules/library/hardcode_library/religious/PortedBooks.dm +++ b/code/modules/library/hardcode_library/religious/PortedBooks.dm @@ -7,7 +7,7 @@ Category: Religion ///A Basic Understanding of Zoroastrianism by Satrap -/obj/item/weapon/book/bundle/custom_library/religious/zoroastrianism +/obj/item/book/bundle/custom_library/religious/zoroastrianism name = "A Basic Understanding of Zoroastrianism" desc = "A hardbound book titled \"A Basic Understanding of Zoroastrianism\" by Satrap." description_info = "This book is titled \"A Basic Understanding of Zoroastrianism\" by Satrap. It covers the basics of Zoroastrianism -- an old religion originating on Earth -- as well as its influence on other religions." @@ -84,7 +84,7 @@ Category: Religion /// The Way of the Bleeding Swan by Shra'ziir Krin Enai-Rinrijar. I have no idea what this is about but it was in religion. -/obj/item/weapon/book/custom_library/religious/wayofbleedingswan +/obj/item/book/custom_library/religious/wayofbleedingswan name = "The Way of the Bleeding Swan" desc = "A hardbound book titled \"The Way of the Bleeding Swan\" by Shra'ziir Krin Enai-Rinrijar." description_info = "This book is titled \"The Way of the Bleeding Swan\" by Shra'ziir Krin Enai-Rinrijar. It appears religious in nature." @@ -171,7 +171,7 @@ Category: Religion /// The Sun Goddess of Korea by Korean Folklore -/obj/item/weapon/book/custom_library/religious/sungoddessofkorea +/obj/item/book/custom_library/religious/sungoddessofkorea name = "The Sun Goddess of Korea" desc = "A hardbound book titled \"The Sun Goddess of Korea\" as provided by the Earth Religion Preservation Team." @@ -208,7 +208,7 @@ Category: Religion /// The Story of Lord Ganesha by Hindu Folklore -/obj/item/weapon/book/custom_library/religious/storyoflordganesha +/obj/item/book/custom_library/religious/storyoflordganesha name = "The Story of Lord Ganesha" desc = "A hardbound book titled \"The Story of Lord Ganesha\" as provided by the Earth Religion Preservation Team." @@ -249,7 +249,7 @@ Category: Religion /// Feast of Kubera by Hindu Folklore -/obj/item/weapon/book/custom_library/religious/feastofkubera +/obj/item/book/custom_library/religious/feastofkubera name = "Feast of Kubera" desc = "A hardbound book titled \"The Story of Lord Ganesha\" as provided by the Earth Religion Preservation Team." diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index db94ed64010..a958c84a68a 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -23,16 +23,16 @@ /obj/structure/bookcase/Initialize() . = ..() for(var/obj/item/I in loc) - if(istype(I, /obj/item/weapon/book)) + if(istype(I, /obj/item/book)) I.loc = src update_icon() /obj/structure/bookcase/attackby(obj/item/O as obj, mob/user as mob) - if(istype(O, /obj/item/weapon/book)) + if(istype(O, /obj/item/book)) user.drop_item() O.loc = src update_icon() - else if(istype(O, /obj/item/weapon/pen)) + else if(istype(O, /obj/item/pen)) var/newname = sanitizeSafe(tgui_input_text(usr, "What would you like to title this bookshelf?", null, null, MAX_NAME_LEN), MAX_NAME_LEN) if(!newname) return @@ -48,7 +48,7 @@ if(do_after(user,25 * O.toolspeed)) to_chat(user, "You dismantle \the [src].") new /obj/item/stack/material/wood(get_turf(src), 3) - for(var/obj/item/weapon/book/b in contents) + for(var/obj/item/book/b in contents) b.loc = (get_turf(src)) qdel(src) @@ -57,7 +57,7 @@ /obj/structure/bookcase/attack_hand(var/mob/user as mob) if(contents.len) - var/obj/item/weapon/book/choice = tgui_input_list(usr, "Which book would you like to remove from the shelf?", "Book Selection", contents) + var/obj/item/book/choice = tgui_input_list(usr, "Which book would you like to remove from the shelf?", "Book Selection", contents) if(choice) if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) return @@ -71,19 +71,19 @@ /obj/structure/bookcase/ex_act(severity) switch(severity) if(1.0) - for(var/obj/item/weapon/book/b in contents) + for(var/obj/item/book/b in contents) qdel(b) qdel(src) return if(2.0) - for(var/obj/item/weapon/book/b in contents) + for(var/obj/item/book/b in contents) if (prob(50)) b.loc = (get_turf(src)) else qdel(b) qdel(src) return if(3.0) if (prob(50)) - for(var/obj/item/weapon/book/b in contents) + for(var/obj/item/book/b in contents) b.loc = (get_turf(src)) qdel(src) return @@ -108,7 +108,7 @@ Book Cart opacity = 0 /obj/structure/bookcase/bookcart/attackby(obj/item/O as obj, mob/user as mob) - if(istype(O, /obj/item/weapon/book)) + if(istype(O, /obj/item/book)) user.drop_item() O.loc = src update_icon() @@ -130,10 +130,10 @@ Book Cart End /obj/structure/bookcase/manuals/medical/New() ..() - new /obj/item/weapon/book/manual/medical_cloning(src) - new /obj/item/weapon/book/manual/medical_diagnostics_manual(src) - new /obj/item/weapon/book/manual/medical_diagnostics_manual(src) - new /obj/item/weapon/book/manual/medical_diagnostics_manual(src) + new /obj/item/book/manual/medical_cloning(src) + new /obj/item/book/manual/medical_diagnostics_manual(src) + new /obj/item/book/manual/medical_diagnostics_manual(src) + new /obj/item/book/manual/medical_diagnostics_manual(src) update_icon() @@ -142,13 +142,13 @@ Book Cart End /obj/structure/bookcase/manuals/engineering/New() ..() - new /obj/item/weapon/book/manual/engineering_construction(src) - new /obj/item/weapon/book/manual/engineering_particle_accelerator(src) - new /obj/item/weapon/book/manual/engineering_hacking(src) - new /obj/item/weapon/book/manual/engineering_guide(src) - new /obj/item/weapon/book/manual/atmospipes(src) - new /obj/item/weapon/book/manual/engineering_singularity_safety(src) - new /obj/item/weapon/book/manual/evaguide(src) + new /obj/item/book/manual/engineering_construction(src) + new /obj/item/book/manual/engineering_particle_accelerator(src) + new /obj/item/book/manual/engineering_hacking(src) + new /obj/item/book/manual/engineering_guide(src) + new /obj/item/book/manual/atmospipes(src) + new /obj/item/book/manual/engineering_singularity_safety(src) + new /obj/item/book/manual/evaguide(src) update_icon() /obj/structure/bookcase/manuals/research_and_development @@ -156,14 +156,14 @@ Book Cart End /obj/structure/bookcase/manuals/research_and_development/New() ..() - new /obj/item/weapon/book/manual/research_and_development(src) + new /obj/item/book/manual/research_and_development(src) update_icon() /* * Book */ -/obj/item/weapon/book +/obj/item/book name = "book" icon = 'icons/obj/library.dmi' icon_state ="book" @@ -188,7 +188,7 @@ Book Cart End drop_sound = 'sound/items/drop/book.ogg' pickup_sound = 'sound/items/pickup/book.ogg' -/obj/item/weapon/book/attack_self(var/mob/user as mob) +/obj/item/book/attack_self(var/mob/user as mob) if(carved) if(store) to_chat(user, "[store] falls out of [title]!") @@ -207,7 +207,7 @@ Book Cart End else to_chat(user, "This book is completely blank!") -/obj/item/weapon/book/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/book/attackby(obj/item/W as obj, mob/user as mob) if(carved) if(!store) if(W.w_class < ITEMSIZE_LARGE) @@ -222,7 +222,7 @@ Book Cart End else to_chat(user, "There's already something in [title]!") return - if(istype(W, /obj/item/weapon/pen)) + if(istype(W, /obj/item/pen)) if(unique) to_chat(user, "These pages don't seem to take the ink well. Looks like you can't modify it.") return @@ -252,8 +252,8 @@ Book Cart End src.author = newauthor else return - else if(istype(W, /obj/item/weapon/barcodescanner)) - var/obj/item/weapon/barcodescanner/scanner = W + else if(istype(W, /obj/item/barcodescanner)) + var/obj/item/barcodescanner/scanner = W if(!scanner.computer) to_chat(user, "[W]'s screen flashes: 'No associated computer found!'") else @@ -275,25 +275,25 @@ Book Cart End to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. No active check-out record found for current title.'") if(3) scanner.book = src - for(var/obj/item/weapon/book in scanner.computer.inventory) + for(var/obj/item/book in scanner.computer.inventory) if(book == src) to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. Title already present in inventory, aborting to avoid duplicate entry.'") return scanner.computer.inventory.Add(src) to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. Title added to general inventory.'") - else if(istype(W, /obj/item/weapon/material/knife) || W.has_tool_quality(TOOL_WIRECUTTER)) + else if(istype(W, /obj/item/material/knife) || W.has_tool_quality(TOOL_WIRECUTTER)) if(carved) return to_chat(user, "You begin to carve out [title].") if(do_after(user, 30)) to_chat(user, "You carve out the pages from [title]! You didn't want to read it anyway.") playsound(src, 'sound/bureaucracy/papercrumple.ogg', 50, 1) - new /obj/item/weapon/shreddedp(get_turf(src)) + new /obj/item/shreddedp(get_turf(src)) carved = 1 return else ..() -/obj/item/weapon/book/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/book/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(user.zone_sel.selecting == O_EYES) user.visible_message("You open up the book and show it to [M]. ", \ " [user] opens up a book and shows it to [M]. ") @@ -304,15 +304,15 @@ Book Cart End * Book Bundle (Multi-page book) */ -/obj/item/weapon/book/bundle +/obj/item/book/bundle var/page = 1 //current page var/list/pages = list() //the contents of each page -/obj/item/weapon/book/bundle/proc/show_content(mob/user as mob) +/obj/item/book/bundle/proc/show_content(mob/user as mob) if(!pages.len) return var/dat - var/obj/item/weapon/W = pages[page] + var/obj/item/W = pages[page] // first if(page == 1) dat+= "" @@ -325,15 +325,15 @@ Book Cart End else dat+= "" dat+= "
" - if(istype(pages[page], /obj/item/weapon/paper)) - var/obj/item/weapon/paper/P = W + if(istype(pages[page], /obj/item/paper)) + var/obj/item/paper/P = W if(!(istype(usr, /mob/living/carbon/human) || isobserver(usr) || istype(usr, /mob/living/silicon))) dat += "[P.name][stars(P.info)][P.stamps]" else dat += "[P.name][P.info][P.stamps]" user << browse(dat, "window=[name]") - else if(istype(pages[page], /obj/item/weapon/photo)) - var/obj/item/weapon/photo/P = W + else if(istype(pages[page], /obj/item/photo)) + var/obj/item/photo/P = W user << browse_rsc(P.img, "tmp_photo.png") user << browse(dat + "[P.name]" \ + "" \ @@ -347,16 +347,16 @@ Book Cart End dat += "Page [page][pages[page]]" user << browse(dat, "window=[name]") -/obj/item/weapon/book/bundle/attack_self(mob/user as mob) +/obj/item/book/bundle/attack_self(mob/user as mob) src.show_content(user) add_fingerprint(usr) update_icon() return -/obj/item/weapon/book/bundle/Topic(href, href_list) +/obj/item/book/bundle/Topic(href, href_list) if(..()) return 1 - if((src in usr.contents) || (istype(src.loc, /obj/item/weapon/folder) && (src.loc in usr.contents))) + if((src in usr.contents) || (istype(src.loc, /obj/item/folder) && (src.loc in usr.contents))) usr.set_machine(src) if(href_list["next_page"]) if(page != pages.len) @@ -374,7 +374,7 @@ Book Cart End /* * Barcode Scanner */ -/obj/item/weapon/barcodescanner +/obj/item/barcodescanner name = "barcode scanner" icon = 'icons/obj/library.dmi' icon_state ="scanner" @@ -382,10 +382,10 @@ Book Cart End throw_range = 5 w_class = ITEMSIZE_SMALL var/obj/machinery/librarycomp/computer // Associated computer - Modes 1 to 3 use this - var/obj/item/weapon/book/book // Currently scanned book + var/obj/item/book/book // Currently scanned book var/mode = 0 // 0 - Scan only, 1 - Scan and Set Buffer, 2 - Scan and Attempt to Check In, 3 - Scan and Attempt to Add to Inventory -/obj/item/weapon/barcodescanner/attack_self(mob/user as mob) +/obj/item/barcodescanner/attack_self(mob/user as mob) mode += 1 if(mode > 3) mode = 0 diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 3af5a829f74..dc31ac239ca 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -143,29 +143,29 @@ if(!base_genre_books || !base_genre_books.len) base_genre_books = list( - /obj/item/weapon/book/custom_library/fiction, - /obj/item/weapon/book/custom_library/nonfiction, - /obj/item/weapon/book/custom_library/reference, - /obj/item/weapon/book/custom_library/religious, - /obj/item/weapon/book/bundle/custom_library/fiction, - /obj/item/weapon/book/bundle/custom_library/nonfiction, - /obj/item/weapon/book/bundle/custom_library/reference, - /obj/item/weapon/book/bundle/custom_library/religious + /obj/item/book/custom_library/fiction, + /obj/item/book/custom_library/nonfiction, + /obj/item/book/custom_library/reference, + /obj/item/book/custom_library/religious, + /obj/item/book/bundle/custom_library/fiction, + /obj/item/book/bundle/custom_library/nonfiction, + /obj/item/book/bundle/custom_library/reference, + /obj/item/book/bundle/custom_library/religious ) if(!all_books || !all_books.len) all_books = list() - for(var/path in subtypesof(/obj/item/weapon/book/codex/lore)) - var/obj/item/weapon/book/C = new path(null) + for(var/path in subtypesof(/obj/item/book/codex/lore)) + var/obj/item/book/C = new path(null) all_books[C.name] = C - for(var/path in subtypesof(/obj/item/weapon/book/custom_library) - base_genre_books) - var/obj/item/weapon/book/B = new path(null) + for(var/path in subtypesof(/obj/item/book/custom_library) - base_genre_books) + var/obj/item/book/B = new path(null) all_books[B.title] = B - for(var/path in subtypesof(/obj/item/weapon/book/bundle/custom_library) - base_genre_books) - var/obj/item/weapon/book/M = new path(null) + for(var/path in subtypesof(/obj/item/book/bundle/custom_library) - base_genre_books) + var/obj/item/book/M = new path(null) all_books[M.title] = M /obj/machinery/librarycomp/attack_hand(var/mob/user as mob) @@ -184,7 +184,7 @@ if(src.emagged) dat += "7. Access the Forbidden Lore Vault
" if(src.arcanecheckout) - new /obj/item/weapon/book/tome(src.loc) + new /obj/item/book/tome(src.loc) var/datum/gender/T = gender_datums[user.get_visible_gender()] to_chat(user, "Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a dusty old tome sitting on the desk. You don't really remember printing it.") user.visible_message("\The [user] stares at the blank screen for a few moments, [T.his] expression frozen in fear. When [T.he] finally awakens from it, [T.he] looks a lot older.", 2) @@ -192,7 +192,7 @@ if(1) // Inventory dat += "

Inventory


" - for(var/obj/item/weapon/book/b in inventory) + for(var/obj/item/book/b in inventory) dat += "[b.name] (Delete)
" dat += "(Return to main menu)
" if(2) @@ -234,7 +234,7 @@ " else diff --git a/code/modules/persistence/effects/paper_sticky.dm b/code/modules/persistence/effects/paper_sticky.dm index 0b1a0f57c96..dd7d81f6d41 100644 --- a/code/modules/persistence/effects/paper_sticky.dm +++ b/code/modules/persistence/effects/paper_sticky.dm @@ -1,6 +1,6 @@ /datum/persistent/paper/sticky name = "stickynotes" - paper_type = /obj/item/weapon/paper/sticky + paper_type = /obj/item/paper/sticky requires_noticeboard = FALSE /datum/persistent/paper/sticky/CreateEntryInstance(var/turf/creating, var/list/token) @@ -19,7 +19,7 @@ /datum/persistent/paper/sticky/CompileEntry(var/atom/entry, var/write_file) . = ..() - var/obj/item/weapon/paper/sticky/paper = entry + var/obj/item/paper/sticky/paper = entry LAZYADDASSOC(., "offset_x", paper.pixel_x) LAZYADDASSOC(., "offset_y", paper.pixel_y) LAZYADDASSOC(., "color", paper.color) \ No newline at end of file diff --git a/code/modules/persistence/graffiti.dm b/code/modules/persistence/graffiti.dm index dff38d0b19c..457fd020c92 100644 --- a/code/modules/persistence/graffiti.dm +++ b/code/modules/persistence/graffiti.dm @@ -44,7 +44,7 @@ /obj/effect/decal/writing/attackby(var/obj/item/thing, var/mob/user) if(thing.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/welder = thing.get_welder() + var/obj/item/weldingtool/welder = thing.get_welder() if(welder.isOn() && welder.remove_fuel(0,user) && do_after(user, 5, src) && !QDELETED(src)) playsound(src.loc, welder.usesound, 50, 1) user.visible_message("\The [user] clears away some graffiti.") diff --git a/code/modules/persistence/noticeboard.dm b/code/modules/persistence/noticeboard.dm index 70c9d0589ff..a94855ba1ca 100644 --- a/code/modules/persistence/noticeboard.dm +++ b/code/modules/persistence/noticeboard.dm @@ -15,7 +15,7 @@ // Grab any mapped notices. notices = list() - for(var/obj/item/weapon/paper/note in get_turf(src)) + for(var/obj/item/paper/note in get_turf(src)) note.forceMove(src) LAZYADD(notices, note) if(LAZYLEN(notices) >= max_notices) @@ -82,7 +82,7 @@ visible_message("[user] has dismantled [src]!") dismantle() return - else if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/photo)) + else if(istype(I, /obj/item/paper) || istype(I, /obj/item/photo)) if(jobban_isbanned(user, JOB_GRAFFITI)) to_chat(user, "You are banned from leaving persistent information across rounds.") else @@ -119,8 +119,8 @@ var/list/tgui_notices = list() for(var/obj/item/I in src.notices) tgui_notices.Add(list(list( - "ispaper" = istype(I, /obj/item/weapon/paper), - "isphoto" = istype(I, /obj/item/weapon/photo), + "ispaper" = istype(I, /obj/item/paper), + "isphoto" = istype(I, /obj/item/photo), "name" = I.name, "ref" = "\ref[I]", ))) @@ -133,13 +133,13 @@ switch(action) if("read") - var/obj/item/weapon/paper/P = locate(params["ref"]) + var/obj/item/paper/P = locate(params["ref"]) if(P && P.loc == src) P.show_content(usr) . = TRUE if("look") - var/obj/item/weapon/photo/P = locate(params["ref"]) + var/obj/item/photo/P = locate(params["ref"]) if(P && P.loc == src) P.show(usr) . = TRUE @@ -161,7 +161,7 @@ if((P && P.loc == src)) //if the paper's on the board var/mob/living/M = usr if(istype(M)) - var/obj/item/weapon/pen/E = M.get_type_in_hands(/obj/item/weapon/pen) + var/obj/item/pen/E = M.get_type_in_hands(/obj/item/pen) if(E) add_fingerprint(M) P.attackby(E, usr) @@ -174,37 +174,37 @@ icon_state = "nboard05" /obj/structure/noticeboard/anomaly/New() - var/obj/item/weapon/paper/P = new() + var/obj/item/paper/P = new() P.name = "Memo RE: proper analysis procedure" P.info = "
We keep test dummies in pens here for a reason, so standard procedure should be to activate newfound alien artifacts and place the two in close proximity. Promising items I might even approve monkey testing on." - P.stamped = list(/obj/item/weapon/stamp/rd) + P.stamped = list(/obj/item/stamp/rd) P.add_overlay("paper_stamped_rd") contents += P P = new() P.name = "Memo RE: materials gathering" P.info = "Corasang,
the hands-on approach to gathering our samples may very well be slow at times, but it's safer than allowing the blundering miners to roll willy-nilly over our dig sites in their mechs, destroying everything in the process. And don't forget the escavation tools on your way out there!
- R.W" - P.stamped = list(/obj/item/weapon/stamp/rd) + P.stamped = list(/obj/item/stamp/rd) P.add_overlay("paper_stamped_rd") contents += P P = new() P.name = "Memo RE: ethical quandaries" P.info = "Darion-

I don't care what his rank is, our business is that of science and knowledge - questions of moral application do not come into this. Sure, so there are those who would employ the energy-wave particles my modified device has managed to abscond for their own personal gain, but I can hardly see the practical benefits of some of these artifacts our benefactors left behind. Ward--" - P.stamped = list(/obj/item/weapon/stamp/rd) + P.stamped = list(/obj/item/stamp/rd) P.add_overlay("paper_stamped_rd") contents += P P = new() P.name = "READ ME! Before you people destroy any more samples" P.info = "how many times do i have to tell you people, these xeno-arch samples are del-i-cate, and should be handled so! careful application of a focussed, concentrated heat or some corrosive liquids should clear away the extraneous carbon matter, while application of an energy beam will most decidedly destroy it entirely - like someone did to the chemical dispenser! W, the one who signs your paychecks" - P.stamped = list(/obj/item/weapon/stamp/rd) + P.stamped = list(/obj/item/stamp/rd) P.add_overlay("paper_stamped_rd") contents += P P = new() P.name = "Reminder regarding the anomalous material suits" P.info = "Do you people think the anomaly suits are cheap to come by? I'm about a hair trigger away from instituting a log book for the damn things. Only wear them if you're going out for a dig, and for god's sake don't go tramping around in them unless you're field testing something, R" - P.stamped = list(/obj/item/weapon/stamp/rd) + P.stamped = list(/obj/item/stamp/rd) P.add_overlay("paper_stamped_rd") contents += P diff --git a/code/modules/persistence/storage/smartfridge.dm b/code/modules/persistence/storage/smartfridge.dm index addb37ed16d..44b5b3abdb2 100644 --- a/code/modules/persistence/storage/smartfridge.dm +++ b/code/modules/persistence/storage/smartfridge.dm @@ -104,7 +104,7 @@ . += A /datum/persistent/storage/smartfridge/produce/create_item(var/seedtype) - return new /obj/item/weapon/reagent_containers/food/snacks/grown(null, seedtype) // Smartfridge will be stock()ed with it, loc is unimportant + return new /obj/item/reagent_containers/food/snacks/grown(null, seedtype) // Smartfridge will be stock()ed with it, loc is unimportant /datum/persistent/storage/smartfridge/produce/get_storage_list(var/obj/machinery/smartfridge/produce/entry) if(!istype(entry)) @@ -115,7 +115,7 @@ if(prob(go_missing_chance)) continue if(LAZYLEN(I.instances)) - var/obj/item/weapon/reagent_containers/food/snacks/grown/G = I.instances[1] + var/obj/item/reagent_containers/food/snacks/grown/G = I.instances[1] if(!istype(G)) continue .[G.plantname] = I.get_amount() // Store the seed type, because that's what's used to generate the fruit diff --git a/code/modules/planet/sif.dm b/code/modules/planet/sif.dm index 4b3cb1980c2..20d084ff26e 100644 --- a/code/modules/planet/sif.dm +++ b/code/modules/planet/sif.dm @@ -303,7 +303,7 @@ var/datum/planet/sif/planet_sif = 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() @@ -355,7 +355,7 @@ var/datum/planet/sif/planet_sif = 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() @@ -411,7 +411,7 @@ var/datum/planet/sif/planet_sif = 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/planet/virgo3b_vr.dm b/code/modules/planet/virgo3b_vr.dm index 4b156a840e1..c9b0fd21ef3 100644 --- a/code/modules/planet/virgo3b_vr.dm +++ b/code/modules/planet/virgo3b_vr.dm @@ -295,7 +295,7 @@ var/datum/planet/virgo3b/planet_virgo3b = 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() @@ -348,7 +348,7 @@ var/datum/planet/virgo3b/planet_virgo3b = 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() @@ -406,7 +406,7 @@ var/datum/planet/virgo3b/planet_virgo3b = 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/planet/virgo3c_vr.dm b/code/modules/planet/virgo3c_vr.dm index c0664319a46..5178063c865 100644 --- a/code/modules/planet/virgo3c_vr.dm +++ b/code/modules/planet/virgo3c_vr.dm @@ -284,7 +284,7 @@ var/datum/planet/virgo3c/planet_virgo3c = 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() @@ -338,7 +338,7 @@ var/datum/planet/virgo3c/planet_virgo3c = 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() @@ -396,7 +396,7 @@ var/datum/planet/virgo3c/planet_virgo3c = 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/planet/virgo4_vr.dm b/code/modules/planet/virgo4_vr.dm index 2c9f8f5c47d..4ba26a37d62 100644 --- a/code/modules/planet/virgo4_vr.dm +++ b/code/modules/planet/virgo4_vr.dm @@ -274,7 +274,7 @@ var/datum/planet/virgo4/planet_virgo4 = 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() @@ -324,7 +324,7 @@ var/datum/planet/virgo4/planet_virgo4 = 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() @@ -380,7 +380,7 @@ var/datum/planet/virgo4/planet_virgo4 = 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/antimatter/computer.dm b/code/modules/power/antimatter/computer.dm index 018d4d0325a..7fdb1236419 100644 --- a/code/modules/power/antimatter/computer.dm +++ b/code/modules/power/antimatter/computer.dm @@ -45,7 +45,7 @@ src.state = STATE_DEFAULT if("login") var/mob/M = usr - var/obj/item/weapon/card/id/I = M.get_active_hand() + var/obj/item/card/id/I = M.get_active_hand() if (I && istype(I)) if(src.check_access(I)) authenticated = 1 diff --git a/code/modules/power/antimatter/containment_jar.dm b/code/modules/power/antimatter/containment_jar.dm index ff64c28f606..03cd1730ce4 100644 --- a/code/modules/power/antimatter/containment_jar.dm +++ b/code/modules/power/antimatter/containment_jar.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/am_containment +/obj/item/am_containment name = "antimatter containment jar" desc = "Holds antimatter." icon = 'icons/obj/machines/antimatter.dmi' @@ -15,7 +15,7 @@ var/stability = 100//TODO: add all the stability things to this so its not very safe if you keep hitting in on things -/obj/item/weapon/am_containment/ex_act(severity) +/obj/item/am_containment/ex_act(severity) switch(severity) if(1.0) explosion(get_turf(src), 1, 2, 3, 5)//Should likely be larger but this works fine for now I guess @@ -34,7 +34,7 @@ //check_stability() return -/obj/item/weapon/am_containment/proc/usefuel(var/wanted) +/obj/item/am_containment/proc/usefuel(var/wanted) if(fuel < wanted) wanted = fuel fuel -= wanted diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm index 366f9b055ea..34f20cdd8d1 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -11,7 +11,7 @@ var/list/obj/machinery/am_shielding/linked_shielding var/list/obj/machinery/am_shielding/linked_cores - var/obj/item/weapon/am_containment/fueljar + var/obj/item/am_containment/fueljar var/update_shield_icons = 0 var/stability = 100 var/exploding = 0 @@ -159,7 +159,7 @@ to_chat(user, span_red("Once bolted and linked to a shielding unit it the [src.name] is unable to be moved!")) return - if(istype(W, /obj/item/weapon/am_containment)) + if(istype(W, /obj/item/am_containment)) if(fueljar) to_chat(user, span_red("There is already a [fueljar] inside!")) return diff --git a/code/modules/power/antimatter/engine.dm b/code/modules/power/antimatter/engine.dm index 90f4cc7b578..ad3b36ff58e 100644 --- a/code/modules/power/antimatter/engine.dm +++ b/code/modules/power/antimatter/engine.dm @@ -37,10 +37,10 @@ return -/obj/machinery/power/am_engine/injector/attackby(obj/item/weapon/fuel/F, mob/user) +/obj/machinery/power/am_engine/injector/attackby(obj/item/fuel/F, mob/user) if( (stat & BROKEN) || !connected) return - if(istype(F, /obj/item/weapon/fuel/H)) + if(istype(F, /obj/item/fuel/H)) if(injecting) to_chat(user, "There's already a fuel rod in the injector!") return @@ -50,10 +50,10 @@ qdel(F) spawn( 300 ) injecting = 0 - new/obj/item/weapon/fuel(src.loc) + new/obj/item/fuel(src.loc) connected.H_fuel += fuel - if(istype(F, /obj/item/weapon/fuel/antiH)) + if(istype(F, /obj/item/fuel/antiH)) if(injecting) to_chat(user, "There's already a fuel rod in the injector!") return @@ -63,7 +63,7 @@ qdel(F) spawn( 300 ) injecting = 0 - new /obj/item/weapon/fuel(src.loc) + new /obj/item/fuel(src.loc) connected.antiH_fuel += fuel return diff --git a/code/modules/power/antimatter/fuel.dm b/code/modules/power/antimatter/fuel.dm index 030e6b596b8..b602ac1e498 100644 --- a/code/modules/power/antimatter/fuel.dm +++ b/code/modules/power/antimatter/fuel.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/fuel +/obj/item/fuel name = "Magnetic Storage Ring" desc = "A magnetic storage ring." icon = 'icons/obj/items.dmi' @@ -10,38 +10,38 @@ var/s_time = 1.0 var/content = null -/obj/item/weapon/fuel/H +/obj/item/fuel/H name = "Hydrogen storage ring" content = "Hydrogen" fuel = 1e-12 //pico-kilogram -/obj/item/weapon/fuel/antiH +/obj/item/fuel/antiH name = "Anti-Hydrogen storage ring" content = "Anti-Hydrogen" fuel = 1e-12 //pico-kilogram -/obj/item/weapon/fuel/attackby(obj/item/weapon/fuel/F, mob/user) +/obj/item/fuel/attackby(obj/item/fuel/F, mob/user) ..() - if(istype(src, /obj/item/weapon/fuel/antiH)) - if(istype(F, /obj/item/weapon/fuel/antiH)) + if(istype(src, /obj/item/fuel/antiH)) + if(istype(F, /obj/item/fuel/antiH)) src.fuel += F.fuel F.fuel = 0 to_chat(user, "You have added the anti-Hydrogen to the storage ring, it now contains [src.fuel]kg") - if(istype(F, /obj/item/weapon/fuel/H)) + if(istype(F, /obj/item/fuel/H)) src.fuel += F.fuel qdel(F) src:annihilation(src.fuel) - if(istype(src, /obj/item/weapon/fuel/H)) - if(istype(F, /obj/item/weapon/fuel/H)) + if(istype(src, /obj/item/fuel/H)) + if(istype(F, /obj/item/fuel/H)) src.fuel += F.fuel F.fuel = 0 to_chat(user, "You have added the Hydrogen to the storage ring, it now contains [src.fuel]kg") - if(istype(F, /obj/item/weapon/fuel/antiH)) + if(istype(F, /obj/item/fuel/antiH)) src.fuel += F.fuel qdel(src) F:annihilation(F.fuel) -/obj/item/weapon/fuel/antiH/proc/annihilation(var/mass) +/obj/item/fuel/antiH/proc/annihilation(var/mass) var/strength = convert2energy(mass) @@ -67,12 +67,12 @@ return -/obj/item/weapon/fuel/examine(mob/user) +/obj/item/fuel/examine(mob/user) . = ..() if(Adjacent(user)) . += "It contains [fuel]kg of [content ? content : "nothing"]." -/obj/item/weapon/fuel/proc/injest(mob/M as mob) +/obj/item/fuel/proc/injest(mob/M as mob) switch(content) if("Anti-Hydrogen") M.gib() //Yikes! @@ -81,7 +81,7 @@ qdel(src) return -/obj/item/weapon/fuel/attack(mob/M as mob, mob/user as mob) +/obj/item/fuel/attack(mob/M as mob, mob/user as mob) if (user != M) var/obj/effect/equip_e/human/O = new /obj/effect/equip_e/human( ) O.source = user diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index 406b67a9814..d179da117d1 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -184,7 +184,7 @@ -/obj/item/device/am_shielding_container +/obj/item/am_shielding_container name = "packaged antimatter reactor section" desc = "A small storage unit containing an antimatter reactor section. To use place near an antimatter control unit or deployed antimatter reactor section and use a multitool to activate this package." icon = 'icons/obj/machines/antimatter.dmi' @@ -196,8 +196,8 @@ throw_range = 2 matter = list(MAT_STEEL = 100) -/obj/item/device/am_shielding_container/attackby(var/obj/item/I, var/mob/user) - if(istype(I, /obj/item/device/multitool) && istype(src.loc,/turf)) +/obj/item/am_shielding_container/attackby(var/obj/item/I, var/mob/user) + if(istype(I, /obj/item/multitool) && istype(src.loc,/turf)) new/obj/machinery/am_shielding(src.loc) qdel(src) return diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 3c509574c67..a526872c6fc 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -61,16 +61,16 @@ GLOBAL_LIST_EMPTY(apcs) is_critical = 1 /obj/machinery/power/apc/high - cell_type = /obj/item/weapon/cell/high + cell_type = /obj/item/cell/high /obj/machinery/power/apc/super - cell_type = /obj/item/weapon/cell/super + cell_type = /obj/item/cell/super /obj/machinery/power/apc/super/critical is_critical = 1 /obj/machinery/power/apc/hyper - cell_type = /obj/item/weapon/cell/hyper + cell_type = /obj/item/cell/hyper /obj/machinery/power/apc/alarms_hidden alarms_hidden = TRUE @@ -104,10 +104,10 @@ GLOBAL_LIST_EMPTY(apcs) vis_flags = VIS_HIDE // They have an emissive that looks bad in openspace due to their wall-mounted nature var/area/area var/areastring = null - var/obj/item/weapon/cell/cell + var/obj/item/cell/cell var/chargelevel = 0.0005 // Cap for how fast APC cells charge, as a percentage-per-tick (0.01 means cellcharge is capped to 1% per second) var/start_charge = 90 // initial cell charge % - var/cell_type = /obj/item/weapon/cell/apc + var/cell_type = /obj/item/cell/apc var/opened = 0 //0=closed, 1=opened, 2=cover removed var/shorted = 0 var/grid_check = FALSE @@ -491,7 +491,7 @@ GLOBAL_LIST_EMPTY(apcs) user.visible_message(\ "[user.name] has removed the power control board from [name]!",\ "You remove the power control board.") - new /obj/item/weapon/module/power_control(loc) + new /obj/item/module/power_control(loc) else if(opened != 2) //cover isn't removed opened = 0 update_icon() @@ -502,7 +502,7 @@ GLOBAL_LIST_EMPTY(apcs) else opened = 1 update_icon() - else if (istype(W, /obj/item/weapon/cell) && opened) // trying to put a cell inside + else if (istype(W, /obj/item/cell) && opened) // trying to put a cell inside if(cell) to_chat(user, "The [name] already has a power cell installed.") return @@ -547,7 +547,7 @@ GLOBAL_LIST_EMPTY(apcs) playsound(src, W.usesound, 50, 1) update_icon() - else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) // trying to unlock the interface with an ID card + else if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) // trying to unlock the interface with an ID card togglelock(user) else if(istype(W, /obj/item/stack/cable_coil) && !terminal && opened && has_electronics != APC_HAS_ELECTRONICS_SECURED) @@ -596,7 +596,7 @@ GLOBAL_LIST_EMPTY(apcs) new /obj/item/stack/cable_coil(loc,10) to_chat(user, "You cut the cables and dismantle the power terminal.") qdel(terminal) - else if(istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics == APC_HAS_ELECTRONICS_NONE && !((stat & BROKEN))) + else if(istype(W, /obj/item/module/power_control) && opened && has_electronics == APC_HAS_ELECTRONICS_NONE && !((stat & BROKEN))) user.visible_message("[user.name] inserts the power control board into [src].", \ "You start to insert the power control board into the frame...") playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) @@ -606,11 +606,11 @@ GLOBAL_LIST_EMPTY(apcs) reboot() to_chat(user, "You place the power control board inside the frame.") qdel(W) - else if(istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics == APC_HAS_ELECTRONICS_NONE && ((stat & BROKEN))) + else if(istype(W, /obj/item/module/power_control) && opened && has_electronics == APC_HAS_ELECTRONICS_NONE && ((stat & BROKEN))) to_chat(user, "The [src] is too broken for that. Repair it first.") return else if(W.has_tool_quality(TOOL_WELDER) && opened && has_electronics == APC_HAS_ELECTRONICS_NONE && !terminal) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(WT.get_fuel() < 3) to_chat(user, "You need more welding fuel to complete this task.") return @@ -650,7 +650,7 @@ GLOBAL_LIST_EMPTY(apcs) if(opened==2) opened = 1 update_icon() - else if(istype(W, /obj/item/device/multitool) && (hacker || emagged)) + else if(istype(W, /obj/item/multitool) && (hacker || emagged)) if(cell) to_chat(user, "You need to remove the power cell first.") return @@ -678,7 +678,7 @@ GLOBAL_LIST_EMPTY(apcs) else if(istype(user, /mob/living/silicon)) return attack_hand(user) - if(!opened && wiresexposed && (istype(W, /obj/item/device/multitool) || W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/device/assembly/signaler))) + if(!opened && wiresexposed && (istype(W, /obj/item/multitool) || W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/assembly/signaler))) return attack_hand(user) //Placeholder until someone can do take_damage() for APCs or something. to_chat(user, "The [name] looks too sturdy to bash open with \the [W.name].") diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index 200021543d5..1962751d283 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -35,19 +35,19 @@ /obj/machinery/power/smes/batteryrack/proc/add_parts() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/batteryrack - component_parts += new /obj/item/weapon/stock_parts/capacitor // Capacitors: Maximal I/O - component_parts += new /obj/item/weapon/stock_parts/capacitor - component_parts += new /obj/item/weapon/stock_parts/capacitor - component_parts += new /obj/item/weapon/stock_parts/matter_bin // Matter Bin: Max. amount of cells. + component_parts += new /obj/item/circuitboard/batteryrack + component_parts += new /obj/item/stock_parts/capacitor // Capacitors: Maximal I/O + component_parts += new /obj/item/stock_parts/capacitor + component_parts += new /obj/item/stock_parts/capacitor + component_parts += new /obj/item/stock_parts/matter_bin // Matter Bin: Max. amount of cells. /obj/machinery/power/smes/batteryrack/RefreshParts() var/capacitor_efficiency = 0 var/maxcells = 0 - for(var/obj/item/weapon/stock_parts/capacitor/CP in component_parts) + for(var/obj/item/stock_parts/capacitor/CP in component_parts) capacitor_efficiency += CP.rating - for(var/obj/item/weapon/stock_parts/matter_bin/MB in component_parts) + for(var/obj/item/stock_parts/matter_bin/MB in component_parts) maxcells += MB.rating * 3 max_transfer_rate = 10000 * capacitor_efficiency // 30kw - 90kw depending on used capacitors. @@ -56,7 +56,7 @@ output_level = max_transfer_rate /obj/machinery/power/smes/batteryrack/Destroy() - for(var/obj/item/weapon/cell/C in internal_cells) + for(var/obj/item/cell/C in internal_cells) qdel(C) internal_cells = null return ..() @@ -74,7 +74,7 @@ add_overlay("charge[charge_level]") - for(var/obj/item/weapon/cell/C in internal_cells) + for(var/obj/item/cell/C in internal_cells) cellcount++ add_overlay("cell[cellcount]") if(C.fully_charged()) @@ -85,7 +85,7 @@ // Recalculate maxcharge and similar variables. /obj/machinery/power/smes/batteryrack/proc/update_maxcharge() var/newmaxcharge = 0 - for(var/obj/item/weapon/cell/C in internal_cells) + for(var/obj/item/cell/C in internal_cells) newmaxcharge += C.maxcharge newmaxcharge /= CELLRATE // Convert to Joules @@ -116,14 +116,14 @@ amount *= CELLRATE // Convert to CELLRATE first. if(equalise) // Now try to get least charged cell and use the power from it. - var/obj/item/weapon/cell/CL = get_least_charged_cell() + var/obj/item/cell/CL = get_least_charged_cell() if(!CL) return amount -= CL.give(amount) if(!amount) return // We're still here, so it means the least charged cell was full OR we don't care about equalising the charge. Give power to other cells instead. - for(var/obj/item/weapon/cell/C in internal_cells) + for(var/obj/item/cell/C in internal_cells) amount -= C.give(amount) // No more power to input so return. if(!amount) @@ -134,12 +134,12 @@ amount *= CELLRATE // Convert to CELLRATE first. if(equalise) // Now try to get most charged cell and use the power from it. - var/obj/item/weapon/cell/CL = get_most_charged_cell() + var/obj/item/cell/CL = get_most_charged_cell() amount -= CL.use(amount) if(!amount) return // We're still here, so it means the most charged cell didn't have enough power OR we don't care about equalising the charge. Use power from other cells instead. - for(var/obj/item/weapon/cell/C in internal_cells) + for(var/obj/item/cell/C in internal_cells) amount -= C.use(amount) // No more power to output so return. if(!amount) @@ -147,23 +147,23 @@ // Helper procs to get most/least charged cells. /obj/machinery/power/smes/batteryrack/proc/get_most_charged_cell() - var/obj/item/weapon/cell/CL = null - for(var/obj/item/weapon/cell/C in internal_cells) + var/obj/item/cell/CL = null + for(var/obj/item/cell/C in internal_cells) if(CL == null) CL = C else if(CL.percent() < C.percent()) CL = C return CL /obj/machinery/power/smes/batteryrack/proc/get_least_charged_cell() - var/obj/item/weapon/cell/CL = null - for(var/obj/item/weapon/cell/C in internal_cells) + var/obj/item/cell/CL = null + for(var/obj/item/cell/C in internal_cells) if(CL == null) CL = C else if(CL.percent() > C.percent()) CL = C return CL -/obj/machinery/power/smes/batteryrack/proc/insert_cell(var/obj/item/weapon/cell/C, var/mob/user) +/obj/machinery/power/smes/batteryrack/proc/insert_cell(var/obj/item/cell/C, var/mob/user) if(!istype(C)) return 0 @@ -182,7 +182,7 @@ /obj/machinery/power/smes/batteryrack/process() charge = 0 - for(var/obj/item/weapon/cell/C in internal_cells) + for(var/obj/item/cell/C in internal_cells) charge += C.charge charge /= CELLRATE // Convert to Joules charge *= SMESRATE // And to SMES charge units (which are for some reason different than CELLRATE) @@ -198,8 +198,8 @@ // Try to balance charge between stored cells. Capped at max_transfer_rate per tick. // Take power from most charged cell, and give it to least charged cell. if(equalise) - var/obj/item/weapon/cell/least = get_least_charged_cell() - var/obj/item/weapon/cell/most = get_most_charged_cell() + var/obj/item/cell/least = get_least_charged_cell() + var/obj/item/cell/most = get_most_charged_cell() // Don't bother equalising charge between two same cells. Also ensure we don't get NULLs or wrong types. Don't bother equalising when difference between charges is tiny. if(least == most || !istype(least) || !istype(most) || least.percent() == most.percent()) return @@ -216,13 +216,13 @@ least.give(most.use(celldiff)) /obj/machinery/power/smes/batteryrack/dismantle() - for(var/obj/item/weapon/cell/C in internal_cells) + for(var/obj/item/cell/C in internal_cells) C.forceMove(get_turf(src)) internal_cells -= C return ..() -/obj/machinery/power/smes/batteryrack/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if(istype(W, /obj/item/weapon/cell)) // ID Card, try to insert it. +/obj/machinery/power/smes/batteryrack/attackby(var/obj/item/W as obj, var/mob/user as mob) + if(istype(W, /obj/item/cell)) // ID Card, try to insert it. if(insert_cell(W, user)) to_chat(user, "You insert \the [W] into \the [src].") else @@ -263,7 +263,7 @@ data["cells_cur"] = internal_cells.len var/list/cells = list() var/cell_index = 0 - for(var/obj/item/weapon/cell/C in internal_cells) + for(var/obj/item/cell/C in internal_cells) var/list/cell[0] cell["slot"] = cell_index + 1 cell["used"] = 1 @@ -306,8 +306,8 @@ equalise = 0 return TRUE if("ejectcell") - var/obj/item/weapon/cell/C - for(var/obj/item/weapon/cell/CL in internal_cells) + var/obj/item/cell/C + for(var/obj/item/cell/CL in internal_cells) if(CL.c_uid == text2num(params["ejectcell"])) C = CL break diff --git a/code/modules/power/batteryrack_vr.dm b/code/modules/power/batteryrack_vr.dm index f6c4f3d36a4..c1c3b7987ee 100644 --- a/code/modules/power/batteryrack_vr.dm +++ b/code/modules/power/batteryrack_vr.dm @@ -1,5 +1,5 @@ /obj/machinery/power/smes/batteryrack/mapped - var/cell_type = /obj/item/weapon/cell/apc + var/cell_type = /obj/item/cell/apc var/cell_number = 3 /obj/machinery/power/smes/batteryrack/mapped/Initialize() @@ -7,14 +7,14 @@ for(var/i = 1 to cell_number) if(i > max_cells) break - var/obj/item/weapon/cell/newcell = new cell_type(src.loc) + var/obj/item/cell/newcell = new cell_type(src.loc) insert_cell(newcell) -/obj/item/weapon/module/power_control/attackby(var/obj/item/I, var/mob/user) +/obj/item/module/power_control/attackby(var/obj/item/I, var/mob/user) if(I.has_tool_quality(TOOL_MULTITOOL)) to_chat(user, SPAN_NOTICE("You begin tweaking the power control circuits to support a power cell rack.")) if(do_after(user, 50 * I.toolspeed)) - var/obj/item/newcircuit = new/obj/item/weapon/circuitboard/batteryrack(get_turf(user)) + var/obj/item/newcircuit = new/obj/item/circuitboard/batteryrack(get_turf(user)) qdel(src) user.put_in_hands(newcircuit) return diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm index 1b2e03cb749..e79bc38635e 100644 --- a/code/modules/power/breaker_box.dm +++ b/code/modules/power/breaker_box.dm @@ -15,7 +15,7 @@ density = TRUE anchored = TRUE unacidable = TRUE - circuit = /obj/item/weapon/circuitboard/breakerbox + circuit = /obj/item/circuitboard/breakerbox var/on = 0 var/busy = 0 var/directions = list(1,2,4,8,5,6,9,10) @@ -94,8 +94,8 @@ update_locked = 0 busy = 0 -/obj/machinery/power/breakerbox/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if(istype(W, /obj/item/device/multitool)) +/obj/machinery/power/breakerbox/attackby(var/obj/item/W as obj, var/mob/user as mob) + if(istype(W, /obj/item/multitool)) var/newtag = tgui_input_text(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system", "", MAX_NAME_LEN) newtag = sanitize(newtag,MAX_NAME_LEN) if(newtag) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 954231a6abe..99b6fc8f740 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -221,7 +221,7 @@ var/list/possible_cable_coil_colours = list( return coil.cable_join(src, user) - else if(istype(W, /obj/item/device/multitool)) + else if(istype(W, /obj/item/multitool)) if(powernet && (powernet.avail > 0)) // is it powered? to_chat(user, "[DisplayPower(powernet.avail)] in power network.") @@ -600,7 +600,7 @@ var/list/possible_cable_coil_colours = list( w_class = ITEMSIZE_SMALL /obj/item/stack/cable_coil/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/device/multitool)) + if(istype(W, /obj/item/multitool)) var/selected_type = tgui_input_list(usr, "Pick new colour.", "Cable Colour", possible_cable_coil_colours) set_cable_color(selected_type, usr) return @@ -616,7 +616,7 @@ var/list/possible_cable_coil_colours = list( if(src.amount <= 14) to_chat(usr, "You need at least 15 lengths to make restraints!") return - var/obj/item/weapon/handcuffs/cable/B = new /obj/item/weapon/handcuffs/cable(usr.loc) + var/obj/item/handcuffs/cable/B = new /obj/item/handcuffs/cable(usr.loc) B.color = color to_chat(usr, "You wind some cable together to make some restraints.") src.use(15) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 0709b9f795f..2a98049b0bb 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -2,7 +2,7 @@ // charge from 0 to 100% // fits in APC to provide backup power -/obj/item/weapon/cell +/obj/item/cell name = "power cell" desc = "A rechargable electrochemical power cell." icon = 'icons/obj/power_cells.dmi' @@ -35,7 +35,7 @@ var/standard_overlays = TRUE var/last_overlay_state = null // Used to optimize update_icon() calls. -/obj/item/weapon/cell/New() +/obj/item/cell/New() ..() c_uid = cell_uid++ charge = maxcharge @@ -43,28 +43,28 @@ if(self_recharge) START_PROCESSING(SSobj, src) -/obj/item/weapon/cell/Destroy() +/obj/item/cell/Destroy() if(self_recharge) STOP_PROCESSING(SSobj, src) return ..() -/obj/item/weapon/cell/get_cell() +/obj/item/cell/get_cell() return src -/obj/item/weapon/cell/process() +/obj/item/cell/process() if(self_recharge) if(world.time >= last_use + charge_delay) give(charge_amount) // TGMC Ammo HUD - Update the HUD every time we're called to recharge. - if(istype(loc, /obj/item/weapon/gun/energy)) // Are we in a gun currently? - var/obj/item/weapon/gun/energy/gun = loc + if(istype(loc, /obj/item/gun/energy)) // Are we in a gun currently? + var/obj/item/gun/energy/gun = loc var/mob/living/user = gun.loc if(istype(user)) user?.hud_used.update_ammo_hud(user, gun) // Update the HUD else return PROCESS_KILL -/obj/item/weapon/cell/drain_power(var/drain_check, var/surge, var/power = 0) +/obj/item/cell/drain_power(var/drain_check, var/surge, var/power = 0) if(drain_check) return 1 @@ -80,7 +80,7 @@ #define OVERLAY_PARTIAL 1 #define OVERLAY_EMPTY 0 -/obj/item/weapon/cell/update_icon() +/obj/item/cell/update_icon() if(!standard_overlays) return var/ratio = 0 @@ -96,25 +96,25 @@ #undef OVERLAY_PARTIAL #undef OVERLAY_EMPTY -/obj/item/weapon/cell/proc/percent() // return % charge of cell +/obj/item/cell/proc/percent() // return % charge of cell var/charge_percent = 0 if(maxcharge > 0) charge_percent = 100.0*charge/maxcharge return charge_percent -/obj/item/weapon/cell/proc/fully_charged() +/obj/item/cell/proc/fully_charged() return (charge == maxcharge) // checks if the power cell is able to provide the specified amount of charge -/obj/item/weapon/cell/proc/check_charge(var/amount) +/obj/item/cell/proc/check_charge(var/amount) return (charge >= amount) // Returns how much charge is missing from the cell, useful to make sure not overdraw from the grid when recharging. -/obj/item/weapon/cell/proc/amount_missing() +/obj/item/cell/proc/amount_missing() return max(maxcharge - charge, 0) // use power from a cell, returns the amount actually used -/obj/item/weapon/cell/proc/use(var/amount) +/obj/item/cell/proc/use(var/amount) if(rigged && amount > 0) explode() return 0 @@ -126,14 +126,14 @@ // Checks if the specified amount can be provided. If it can, it removes the amount // from the cell and returns 1. Otherwise does nothing and returns 0. -/obj/item/weapon/cell/proc/checked_use(var/amount) +/obj/item/cell/proc/checked_use(var/amount) if(!check_charge(amount)) return 0 use(amount) return 1 // recharge the cell -/obj/item/weapon/cell/proc/give(var/amount) +/obj/item/cell/proc/give(var/amount) if(rigged && amount > 0) explode() return 0 @@ -147,16 +147,16 @@ return amount_used -/obj/item/weapon/cell/examine(mob/user) +/obj/item/cell/examine(mob/user) . = ..() if(Adjacent(user)) . += "It has a power rating of [maxcharge]." . += "The charge meter reads [round(src.percent() )]%." -/obj/item/weapon/cell/attackby(obj/item/W, mob/user) +/obj/item/cell/attackby(obj/item/W, mob/user) ..() - if(istype(W, /obj/item/weapon/reagent_containers/syringe)) - var/obj/item/weapon/reagent_containers/syringe/S = W + if(istype(W, /obj/item/reagent_containers/syringe)) + var/obj/item/reagent_containers/syringe/S = W to_chat(user, "You inject the solution into the power cell.") @@ -169,7 +169,7 @@ S.reagents.clear_reagents() -/obj/item/weapon/cell/proc/explode() +/obj/item/cell/proc/explode() var/turf/T = get_turf(src.loc) /* * 1000-cell explosion(T, -1, 0, 1, 1) @@ -196,13 +196,13 @@ qdel(src) -/obj/item/weapon/cell/proc/corrupt() +/obj/item/cell/proc/corrupt() charge /= 2 maxcharge /= 2 if (prob(10)) rigged = 1 //broken batterys are dangerous -/obj/item/weapon/cell/emp_act(severity) +/obj/item/cell/emp_act(severity) if(emp_proof) return //remove this once emp changes on dev are merged in @@ -217,7 +217,7 @@ update_icon() ..() -/obj/item/weapon/cell/ex_act(severity) +/obj/item/cell/ex_act(severity) switch(severity) if(1.0) @@ -237,7 +237,7 @@ corrupt() return -/obj/item/weapon/cell/proc/get_electrocute_damage() +/obj/item/cell/proc/get_electrocute_damage() //1kW = 5 //10kW = 24 //100kW = 45 diff --git a/code/modules/power/cells/device_cells.dm b/code/modules/power/cells/device_cells.dm index 885e6cc0383..fd93e450f14 100644 --- a/code/modules/power/cells/device_cells.dm +++ b/code/modules/power/cells/device_cells.dm @@ -1,7 +1,7 @@ /* * Device */ -/obj/item/weapon/cell/device +/obj/item/cell/device name = "device power cell" desc = "A small power cell designed to power handheld devices." icon_state = "device_cell" @@ -15,7 +15,7 @@ matter = list(MAT_STEEL = 350, MAT_GLASS = 50) preserve_item = 1 -/obj/item/weapon/cell/device/empty/Initialize() +/obj/item/cell/device/empty/Initialize() . = ..() charge = 0 update_icon() @@ -23,7 +23,7 @@ /* * Crap Device */ -/obj/item/weapon/cell/device/crap +/obj/item/cell/device/crap name = "\improper rechargable D battery" desc = "An older, cheap power cell designed to power handheld devices. It's probably been in use for quite some time now." description_fluff = "You can't top the rust top." //TOTALLY TRADEMARK INFRINGEMENT @@ -32,10 +32,10 @@ maxcharge = 240 matter = list(MAT_STEEL = 350, MAT_GLASS = 30) -/obj/item/weapon/cell/device/crap/update_icon() //No visible charge indicator +/obj/item/cell/device/crap/update_icon() //No visible charge indicator return -/obj/item/weapon/cell/device/crap/empty/Initialize() +/obj/item/cell/device/crap/empty/Initialize() . = ..() charge = 0 update_icon() @@ -43,14 +43,14 @@ /* * Hyper Device */ -/obj/item/weapon/cell/device/hyper +/obj/item/cell/device/hyper name = "hyper device power cell" desc = "A small power cell designed to power handheld devices. Has a better charge than a standard device cell." icon_state = "hype_device_cell" maxcharge = 600 matter = list(MAT_STEEL = 400, MAT_GLASS = 60) -/obj/item/weapon/cell/device/hyper/empty/Initialize() +/obj/item/cell/device/hyper/empty/Initialize() . = ..() charge = 0 update_icon() @@ -58,14 +58,14 @@ /* * EMP Proof Device */ -/obj/item/weapon/cell/device/empproof +/obj/item/cell/device/empproof name = "shielded device power cell" desc = "A small power cell designed to power handheld devices. Shielded from EMPs." icon_state = "up_device_cell" matter = list(MAT_STEEL = 400, MAT_GLASS = 60) emp_proof = TRUE -/obj/item/weapon/cell/device/empproof/empty/Initialize() +/obj/item/cell/device/empproof/empty/Initialize() . = ..() charge = 0 update_icon() @@ -73,14 +73,14 @@ /* * Weapon */ -/obj/item/weapon/cell/device/weapon +/obj/item/cell/device/weapon name = "weapon power cell" desc = "A small power cell designed to power handheld weaponry." icon_state = "weapon_cell" maxcharge = 2400 charge_amount = 20 -/obj/item/weapon/cell/device/weapon/empty/Initialize() +/obj/item/cell/device/weapon/empty/Initialize() . = ..() charge = 0 update_icon() @@ -88,14 +88,14 @@ /* * EMP Proof Weapon */ -/obj/item/weapon/cell/device/weapon/empproof +/obj/item/cell/device/weapon/empproof name = "shielded weapon power cell" desc = "A small power cell designed to power handheld weaponry. Shielded from EMPs." icon_state = "emp_weapon_cell" matter = list(MAT_STEEL = 400, MAT_GLASS = 60) emp_proof = TRUE -/obj/item/weapon/cell/device/weapon/empproof/empty/Initialize() +/obj/item/cell/device/weapon/empproof/empty/Initialize() . = ..() charge = 0 update_icon() @@ -103,7 +103,7 @@ /* * Self-charging Weapon */ -/obj/item/weapon/cell/device/weapon/recharge +/obj/item/cell/device/weapon/recharge name = "self-charging weapon power cell" desc = "A small power cell designed to power handheld weaponry. This one recharges itself." icon_state = "sc_weapon_cell" @@ -115,7 +115,7 @@ /* * Captain's Self-charging Weapon */ -/obj/item/weapon/cell/device/weapon/recharge/captain +/obj/item/cell/device/weapon/recharge/captain icon_state = "cap_weapon_cell" matter = list(MAT_STEEL = 400, MAT_GLASS = 100) charge_amount = 160 //Recharges a lot more quickly... @@ -138,7 +138,7 @@ Scanning similar objects may yield more information." value = CATALOGUER_REWARD_EASY -/obj/item/weapon/cell/device/weapon/recharge/alien +/obj/item/cell/device/weapon/recharge/alien name = "void cell" desc = "An alien technology that produces energy seemingly out of nowhere. Its small, cylinderal shape means it might be able to be used with human technology, perhaps?" catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_void_cell) @@ -148,5 +148,5 @@ charge_delay = 50 // Every five seconds, bit faster than the default. origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6) -/obj/item/weapon/cell/device/weapon/recharge/alien/update_icon() +/obj/item/cell/device/weapon/recharge/alien/update_icon() return // No overlays please. \ No newline at end of file diff --git a/code/modules/power/cells/device_cells_vr.dm b/code/modules/power/cells/device_cells_vr.dm index 639130a6605..27ecba7ecbd 100644 --- a/code/modules/power/cells/device_cells_vr.dm +++ b/code/modules/power/cells/device_cells_vr.dm @@ -1,14 +1,14 @@ //The device cell -/obj/item/weapon/cell/device/weapon/recharge/alien +/obj/item/cell/device/weapon/recharge/alien name = "void cell (device)" - var/swaps_to = /obj/item/weapon/cell/void + var/swaps_to = /obj/item/cell/void standard_overlays = FALSE -/obj/item/weapon/cell/device/weapon/recharge/alien/attack_self(var/mob/user) +/obj/item/cell/device/weapon/recharge/alien/attack_self(var/mob/user) user.remove_from_mob(src) to_chat(user, "You swap [src] to 'machinery cell' mode.") - var/obj/item/weapon/cell/newcell = new swaps_to(null) + var/obj/item/cell/newcell = new swaps_to(null) user.put_in_active_hand(newcell) var/percentage = charge/maxcharge newcell.charge = newcell.maxcharge * percentage @@ -16,7 +16,7 @@ qdel(src) //The machine cell -/obj/item/weapon/cell/void +/obj/item/cell/void name = "void cell (machinery)" desc = "An alien technology that produces energy seemingly out of nowhere. Its small, cylinderal shape means it might be able to be used with human technology, perhaps?" origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6) @@ -28,12 +28,12 @@ charge_delay = 50 matter = null standard_overlays = FALSE - var/swaps_to = /obj/item/weapon/cell/device/weapon/recharge/alien + var/swaps_to = /obj/item/cell/device/weapon/recharge/alien -/obj/item/weapon/cell/void/attack_self(var/mob/user) +/obj/item/cell/void/attack_self(var/mob/user) user.remove_from_mob(src) to_chat(user, "You swap [src] to 'device cell' mode.") - var/obj/item/weapon/cell/newcell = new swaps_to(null) + var/obj/item/cell/newcell = new swaps_to(null) user.put_in_active_hand(newcell) var/percentage = charge/maxcharge newcell.charge = newcell.maxcharge * percentage @@ -41,12 +41,12 @@ qdel(src) // Bloo friendlier hybrid tech -/obj/item/weapon/cell/device/weapon/recharge/alien/hybrid +/obj/item/cell/device/weapon/recharge/alien/hybrid icon = 'icons/obj/power_vr.dmi' icon_state = "cellb" - swaps_to = /obj/item/weapon/cell/void/hybrid + swaps_to = /obj/item/cell/void/hybrid -/obj/item/weapon/cell/void/hybrid +/obj/item/cell/void/hybrid icon = 'icons/obj/power_vr.dmi' icon_state = "cellb" - swaps_to = /obj/item/weapon/cell/device/weapon/recharge/alien/hybrid + swaps_to = /obj/item/cell/device/weapon/recharge/alien/hybrid diff --git a/code/modules/power/cells/esoteric_cells.dm b/code/modules/power/cells/esoteric_cells.dm index a94a7223e08..2dbfd5720c3 100644 --- a/code/modules/power/cells/esoteric_cells.dm +++ b/code/modules/power/cells/esoteric_cells.dm @@ -1,5 +1,5 @@ -/obj/item/weapon/cell/spike +/obj/item/cell/spike name = "modified power cell" desc = "A modified power cell sitting in a highly conductive chassis." origin_tech = list(TECH_POWER = 2) @@ -9,7 +9,7 @@ self_recharge = TRUE charge_amount = 150 -/obj/item/weapon/cell/spike/process() +/obj/item/cell/spike/process() ..() var/turf/Center = get_turf(src) @@ -63,7 +63,7 @@ var/obj/item/projectile/beam/shock/weak/P = new (get_turf(src)) P.launch_projectile_from_turf(L, BP_TORSO) - var/obj/item/weapon/plastique/C4 = locate() in get_turf(src) + var/obj/item/plastique/C4 = locate() in get_turf(src) if(C4) C4.visible_message("The current fries \the [C4]!") diff --git a/code/modules/power/cells/power_cells.dm b/code/modules/power/cells/power_cells.dm index 4054c422c6e..017804d4e55 100644 --- a/code/modules/power/cells/power_cells.dm +++ b/code/modules/power/cells/power_cells.dm @@ -1,14 +1,14 @@ /* * Empty */ -/obj/item/weapon/cell/empty/New() +/obj/item/cell/empty/New() ..() charge = 0 /* * Crap */ -/obj/item/weapon/cell/crap +/obj/item/cell/crap name = "\improper rechargable DD battery" desc = "An older, cheap power cell. It's probably been in use for quite some time now." description_fluff = "You can't top the rust top." //TOTALLY TRADEMARK INFRINGEMENT @@ -17,17 +17,17 @@ maxcharge = 500 matter = list(MAT_STEEL = 700, MAT_GLASS = 40) -/obj/item/weapon/cell/crap/update_icon() //No visible charge indicator +/obj/item/cell/crap/update_icon() //No visible charge indicator return -/obj/item/weapon/cell/crap/empty/New() +/obj/item/cell/crap/empty/New() ..() charge = 0 /* * APC */ -/obj/item/weapon/cell/apc +/obj/item/cell/apc name = "heavy-duty power cell" origin_tech = list(TECH_POWER = 1) icon_state = "apc" @@ -37,21 +37,21 @@ /* * Robot */ -/obj/item/weapon/cell/robot_station +/obj/item/cell/robot_station name = "standard robot power cell" maxcharge = 7500 /* * High */ -/obj/item/weapon/cell/high +/obj/item/cell/high name = "high-capacity power cell" origin_tech = list(TECH_POWER = 2) icon_state = "high" maxcharge = 10000 matter = list(MAT_STEEL = 700, MAT_GLASS = 60) -/obj/item/weapon/cell/high/empty/New() +/obj/item/cell/high/empty/New() ..() charge = 0 update_icon() @@ -59,14 +59,14 @@ /* * Super */ -/obj/item/weapon/cell/super +/obj/item/cell/super name = "super-capacity power cell" origin_tech = list(TECH_POWER = 5) icon_state = "super" maxcharge = 20000 matter = list(MAT_STEEL = 700, MAT_GLASS = 70) -/obj/item/weapon/cell/super/empty/New() +/obj/item/cell/super/empty/New() ..() charge = 0 update_icon() @@ -74,7 +74,7 @@ /* * Syndicate */ -/obj/item/weapon/cell/robot_syndi +/obj/item/cell/robot_syndi name = "syndicate robot power cell" description_fluff = "Almost as good as a hyper." icon_state = "super" //We don't want roboticists confuse it with a low standard cell @@ -83,14 +83,14 @@ /* * Hyper */ -/obj/item/weapon/cell/hyper +/obj/item/cell/hyper name = "hyper-capacity power cell" origin_tech = list(TECH_POWER = 6) icon_state = "hyper" maxcharge = 30000 matter = list(MAT_STEEL = 700, MAT_GLASS = 80) -/obj/item/weapon/cell/hyper/empty/New() +/obj/item/cell/hyper/empty/New() ..() charge = 0 update_icon() @@ -98,7 +98,7 @@ /* * Mecha */ -/obj/item/weapon/cell/mech +/obj/item/cell/mech name = "mecha power cell" icon_state = "mech" connector_type = "mech" @@ -106,7 +106,7 @@ maxcharge = 15000 matter = list(MAT_STEEL = 800, MAT_GLASS = 60) -/obj/item/weapon/cell/mech/lead +/obj/item/cell/mech/lead name = "lead acid battery" desc = "An ancient battery design not commonly seen anymore. It looks like it'd fit inside a mech however..." origin_tech = list(TECH_POWER = 0) //Litteraly an old car battery, doesn't need tech @@ -115,10 +115,10 @@ maxcharge = 8000 matter = list(MAT_STEEL = 300, MAT_GLASS = 10) -/obj/item/weapon/cell/mech/lead/update_icon() //No visible charge indicator +/obj/item/cell/mech/lead/update_icon() //No visible charge indicator return -/obj/item/weapon/cell/mech/high +/obj/item/cell/mech/high name = "high-capacity mecha power cell" origin_tech = list(TECH_POWER = 3) icon_state = "blue" @@ -126,7 +126,7 @@ maxcharge = 20000 matter = list(MAT_STEEL = 800, MAT_GLASS = 80) -/obj/item/weapon/cell/mech/super +/obj/item/cell/mech/super name = "super-capacity mecha power cell" origin_tech = list(TECH_POWER = 6) icon_state = "white" @@ -137,23 +137,23 @@ /* * Infinite */ -/obj/item/weapon/cell/infinite +/obj/item/cell/infinite name = "infinite-capacity power cell!" icon_state = "infinity" origin_tech = null maxcharge = 30000 //determines how badly mobs get shocked matter = list(MAT_STEEL = 700, MAT_GLASS = 80) -/obj/item/weapon/cell/infinite/check_charge() +/obj/item/cell/infinite/check_charge() return 1 -/obj/item/weapon/cell/infinite/use() +/obj/item/cell/infinite/use() return 1 /* * Potato */ -/obj/item/weapon/cell/potato +/obj/item/cell/potato name = "potato battery" desc = "A rechargable starch based power cell." origin_tech = list(TECH_POWER = 1) @@ -165,7 +165,7 @@ /* * Slime */ -/obj/item/weapon/cell/slime +/obj/item/cell/slime name = "charged slime core" desc = "A yellow slime core infused with phoron, it crackles with power." origin_tech = list(TECH_POWER = 4, TECH_BIO = 5) @@ -181,7 +181,7 @@ /* * Emergency Light */ -/obj/item/weapon/cell/emergency_light +/obj/item/cell/emergency_light name = "miniature power cell" desc = "A tiny power cell with a very low power capacity. Used in light fixtures to power them in the event of an outage." maxcharge = 120 //Emergency lights use 0.2 W per tick, meaning ~10 minutes of emergency power from a cell @@ -190,10 +190,10 @@ connector_type = "emergency" w_class = ITEMSIZE_TINY -/obj/item/weapon/cell/emergency_light/update_icon() //No visible charge indicator +/obj/item/cell/emergency_light/update_icon() //No visible charge indicator return -/obj/item/weapon/cell/emergency_light/Initialize() +/obj/item/cell/emergency_light/Initialize() . = ..() var/area/A = get_area(src) if(!A.lightswitch || !A.light_power) @@ -204,7 +204,7 @@ * * Not actually a cell, but if people look for it, they'll probably look near other cells */ -/obj/item/device/fbp_backup_cell +/obj/item/fbp_backup_cell name = "backup battery" desc = "A small one-time-use chemical battery for synthetic crew when they are low on power in emergency situations." icon = 'icons/obj/power_cells.dmi' @@ -213,11 +213,11 @@ var/amount = 100 var/used = FALSE -/obj/item/device/fbp_backup_cell/Initialize() +/obj/item/fbp_backup_cell/Initialize() . = ..() add_overlay("[icon_state]_100") -/obj/item/device/fbp_backup_cell/attack(mob/living/M as mob, mob/user as mob) +/obj/item/fbp_backup_cell/attack(mob/living/M as mob, mob/user as mob) if(!used && ishuman(M)) var/mob/living/carbon/human/H = M if(H.isSynthetic()) @@ -232,7 +232,7 @@ . = ..() -/obj/item/device/fbp_backup_cell/proc/use(var/mob/living/user, var/mob/living/target) +/obj/item/fbp_backup_cell/proc/use(var/mob/living/user, var/mob/living/target) if(used) return used = TRUE diff --git a/code/modules/power/fusion/_setup.dm b/code/modules/power/fusion/_setup.dm index 9438e9bf969..e0ac4853572 100644 --- a/code/modules/power/fusion/_setup.dm +++ b/code/modules/power/fusion/_setup.dm @@ -32,7 +32,7 @@ log_and_message_admins("## FUSION CORE SETUP - Setup initiated by [usr].") for(var/obj/machinery/fusion_fuel_injector/mapped/injector in machines) - injector.cur_assembly = new /obj/item/weapon/fuel_assembly/deuterium(injector) + injector.cur_assembly = new /obj/item/fuel_assembly/deuterium(injector) injector.BeginInjecting() var/obj/machinery/power/fusion_core/mapped/core = locate() in machines diff --git a/code/modules/power/fusion/core/_core.dm b/code/modules/power/fusion/core/_core.dm index dfcf908107a..21a7436ee3a 100644 --- a/code/modules/power/fusion/core/_core.dm +++ b/code/modules/power/fusion/core/_core.dm @@ -18,7 +18,7 @@ GLOBAL_LIST_EMPTY(fusion_cores) active_power_usage = 500 //multiplied by field strength anchored = FALSE - circuit = /obj/item/weapon/circuitboard/fusion_core + circuit = /obj/item/circuitboard/fusion_core var/obj/item/hose_connector/output/Output @@ -148,7 +148,7 @@ GLOBAL_LIST_EMPTY(fusion_cores) if(default_part_replacement(user, W)) return - if(istype(W, /obj/item/device/multitool)) + if(istype(W, /obj/item/multitool)) var/new_ident = tgui_input_text(usr, "Enter a new ident tag.", "Fusion Core", id_tag, MAX_NAME_LEN) new_ident = sanitize(new_ident,MAX_NAME_LEN) if(new_ident && user.Adjacent(src)) diff --git a/code/modules/power/fusion/core/core_control.dm b/code/modules/power/fusion/core/core_control.dm index ae3af61c9a3..abf2209b3a1 100644 --- a/code/modules/power/fusion/core/core_control.dm +++ b/code/modules/power/fusion/core/core_control.dm @@ -1,7 +1,7 @@ /obj/machinery/computer/fusion_core_control name = "\improper R-UST Mk. 8 core control" light_color = COLOR_ORANGE - circuit = /obj/item/weapon/circuitboard/fusion_core_control + circuit = /obj/item/circuitboard/fusion_core_control icon_keyboard = "tech_key" icon_screen = "core_control" @@ -23,7 +23,7 @@ /obj/machinery/computer/fusion_core_control/attackby(var/obj/item/thing, var/mob/user) ..() - if(istype(thing, /obj/item/device/multitool)) + if(istype(thing, /obj/item/multitool)) var/new_ident = sanitize_text(tgui_input_text(usr, "Enter a new ident tag.", "Core Control", monitor.core_tag)) if(new_ident && user.Adjacent(src)) monitor.core_tag = new_ident diff --git a/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm b/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm index 7993e5e8438..2bc4712ab3c 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/fuel_assembly +/obj/item/fuel_assembly name = "fuel rod assembly" icon = 'icons/obj/machines/power/fusion.dmi' icon_state = "fuel_assembly" @@ -12,12 +12,12 @@ var/radioactivity = 0 var/const/initial_amount = 3000000 -/obj/item/weapon/fuel_assembly/New(var/newloc, var/_material, var/_colour) +/obj/item/fuel_assembly/New(var/newloc, var/_material, var/_colour) fuel_type = _material fuel_colour = _colour ..(newloc) -/obj/item/weapon/fuel_assembly/Initialize() +/obj/item/fuel_assembly/Initialize() . = ..() var/datum/material/material = get_material_by_name(fuel_type) if(istype(material)) @@ -41,26 +41,26 @@ add_overlay(list(I, image(icon, "fuel_assembly_bracket"))) rod_quantities[fuel_type] = initial_amount -/obj/item/weapon/fuel_assembly/process() +/obj/item/fuel_assembly/process() if(!radioactivity) return PROCESS_KILL if(istype(loc, /turf)) SSradiation.radiate(src, max(1,CEILING(radioactivity/30, 1))) -/obj/item/weapon/fuel_assembly/Destroy() +/obj/item/fuel_assembly/Destroy() STOP_PROCESSING(SSobj, src) return ..() // Mapper shorthand. -/obj/item/weapon/fuel_assembly/deuterium/New(var/newloc) +/obj/item/fuel_assembly/deuterium/New(var/newloc) ..(newloc, "deuterium") -/obj/item/weapon/fuel_assembly/tritium/New(var/newloc) +/obj/item/fuel_assembly/tritium/New(var/newloc) ..(newloc, "tritium") -/obj/item/weapon/fuel_assembly/phoron/New(var/newloc) +/obj/item/fuel_assembly/phoron/New(var/newloc) ..(newloc, "phoron") -/obj/item/weapon/fuel_assembly/supermatter/New(var/newloc) +/obj/item/fuel_assembly/supermatter/New(var/newloc) ..(newloc, "supermatter") diff --git a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm index ea6a39b2624..fa3a48cef20 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm @@ -6,7 +6,7 @@ density = TRUE anchored = TRUE - circuit = /obj/item/weapon/circuitboard/fusion_fuel_compressor + circuit = /obj/item/circuitboard/fusion_fuel_compressor /obj/machinery/fusion_fuel_compressor/Initialize() . = ..() @@ -27,12 +27,12 @@ return 1 var/datum/reagent/R = thing.reagents.reagent_list[1] visible_message("\The [src] compresses the contents of \the [thing] into a new fuel assembly.") - var/obj/item/weapon/fuel_assembly/F = new(get_turf(src), R.id, R.color) + var/obj/item/fuel_assembly/F = new(get_turf(src), R.id, R.color) thing.reagents.remove_reagent(R.id, R.volume) user.put_in_hands(F) else if(istype(thing, /obj/machinery/power/supermatter)) - var/obj/item/weapon/fuel_assembly/F = new(get_turf(src), "supermatter") + var/obj/item/fuel_assembly/F = new(get_turf(src), "supermatter") visible_message("\The [src] compresses \the [thing] into a new fuel assembly.") qdel(thing) user.put_in_hands(F) @@ -57,7 +57,7 @@ if(M.get_amount() < FUSION_ROD_SHEET_AMT) to_chat(user, "You need at least 25 [mat.sheet_plural_name] to make a fuel rod.") return - var/obj/item/weapon/fuel_assembly/F = new(get_turf(src), mat.name) + var/obj/item/fuel_assembly/F = new(get_turf(src), mat.name) visible_message("\The [src] compresses the [mat.use_name] into a new fuel assembly.") M.use(FUSION_ROD_SHEET_AMT) user.put_in_hands(F) diff --git a/code/modules/power/fusion/fuel_assembly/fuel_control.dm b/code/modules/power/fusion/fuel_assembly/fuel_control.dm index 621847f79b6..fbfb57f3aae 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_control.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_control.dm @@ -1,7 +1,7 @@ /obj/machinery/computer/fusion_fuel_control name = "fuel injection control computer" desc = "Displays information about the fuel rods." - circuit = /obj/item/weapon/circuitboard/fusion_fuel_control + circuit = /obj/item/circuitboard/fusion_fuel_control icon_keyboard = "tech_key" icon_screen = "fuel_screen" @@ -116,7 +116,7 @@ /obj/machinery/computer/fusion_fuel_control/attackby(var/obj/item/W, var/mob/user) ..() - if(istype(W, /obj/item/device/multitool)) + if(istype(W, /obj/item/multitool)) var/new_ident = tgui_input_text(usr, "Enter a new ident tag.", "Fuel Control", monitor.fuel_tag, MAX_NAME_LEN) new_ident = sanitize(new_ident,MAX_NAME_LEN) if(new_ident && user.Adjacent(src)) diff --git a/code/modules/power/fusion/fuel_assembly/fuel_injector.dm b/code/modules/power/fusion/fuel_assembly/fuel_injector.dm index 764d26c8734..e96acaa63c6 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_injector.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_injector.dm @@ -11,12 +11,12 @@ GLOBAL_LIST_EMPTY(fuel_injectors) idle_power_usage = 10 active_power_usage = 500 - circuit = /obj/item/weapon/circuitboard/fusion_injector + circuit = /obj/item/circuitboard/fusion_injector var/fuel_usage = 30 var/id_tag var/injecting = 0 - var/obj/item/weapon/fuel_assembly/cur_assembly + var/obj/item/fuel_assembly/cur_assembly /obj/machinery/fusion_fuel_injector/Initialize() . = ..() @@ -42,14 +42,14 @@ GLOBAL_LIST_EMPTY(fuel_injectors) /obj/machinery/fusion_fuel_injector/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/device/multitool)) + if(istype(W, /obj/item/multitool)) var/new_ident = tgui_input_text(usr, "Enter a new ident tag.", "Fuel Injector", id_tag, MAX_NAME_LEN) new_ident = sanitize(new_ident,MAX_NAME_LEN) if(new_ident && user.Adjacent(src)) id_tag = new_ident return - if(istype(W, /obj/item/weapon/fuel_assembly)) + if(istype(W, /obj/item/fuel_assembly)) if(injecting) to_chat(user, "Shut \the [src] off before playing with the fuel rod!") @@ -69,7 +69,7 @@ GLOBAL_LIST_EMPTY(fuel_injectors) cur_assembly = W return - if(W.has_tool_quality(TOOL_WRENCH) || W.has_tool_quality(TOOL_SCREWDRIVER) || W.has_tool_quality(TOOL_CROWBAR) || istype(W, /obj/item/weapon/storage/part_replacer)) + if(W.has_tool_quality(TOOL_WRENCH) || W.has_tool_quality(TOOL_SCREWDRIVER) || W.has_tool_quality(TOOL_CROWBAR) || istype(W, /obj/item/storage/part_replacer)) if(injecting) to_chat(user, "Shut \the [src] off first!") return diff --git a/code/modules/power/fusion/fusion_circuits.dm b/code/modules/power/fusion/fusion_circuits.dm index f03d9c2db28..998dbb33aad 100644 --- a/code/modules/power/fusion/fusion_circuits.dm +++ b/code/modules/power/fusion/fusion_circuits.dm @@ -1,99 +1,99 @@ -/obj/item/weapon/circuitboard/fusion_core_control +/obj/item/circuitboard/fusion_core_control name = "circuit board (fusion core controller)" build_path = /obj/machinery/computer/fusion_core_control origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) -/obj/item/weapon/circuitboard/fusion_fuel_compressor +/obj/item/circuitboard/fusion_fuel_compressor name = "circuit board (fusion fuel compressor)" build_path = /obj/machinery/fusion_fuel_compressor board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 4, TECH_MATERIAL = 4) req_components = list( - /obj/item/weapon/stock_parts/manipulator/nano = 2, - /obj/item/weapon/stock_parts/matter_bin/super = 2, - /obj/item/weapon/stock_parts/console_screen = 1, + /obj/item/stock_parts/manipulator/nano = 2, + /obj/item/stock_parts/matter_bin/super = 2, + /obj/item/stock_parts/console_screen = 1, /obj/item/stack/cable_coil = 5 ) -/obj/item/weapon/circuitboard/fusion_fuel_control +/obj/item/circuitboard/fusion_fuel_control name = "circuit board (fusion fuel controller)" build_path = /obj/machinery/computer/fusion_fuel_control origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) -/obj/item/weapon/circuitboard/gyrotron_control +/obj/item/circuitboard/gyrotron_control name = "circuit board (gyrotron controller)" build_path = /obj/machinery/computer/gyrotron_control origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) -/obj/item/weapon/circuitboard/fusion_core +/obj/item/circuitboard/fusion_core name = "internal circuitry (fusion core)" build_path = /obj/machinery/power/fusion_core board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_BLUESPACE = 2, TECH_MAGNET = 4, TECH_POWER = 4) req_components = list( - /obj/item/weapon/stock_parts/manipulator/nano = 2, - /obj/item/weapon/stock_parts/micro_laser/high = 1, - /obj/item/weapon/stock_parts/console_screen = 1, + /obj/item/stock_parts/manipulator/nano = 2, + /obj/item/stock_parts/micro_laser/high = 1, + /obj/item/stock_parts/console_screen = 1, /obj/item/stack/cable_coil = 5 ) -/obj/item/weapon/circuitboard/fusion_injector +/obj/item/circuitboard/fusion_injector name = "internal circuitry (fusion fuel injector)" build_path = /obj/machinery/fusion_fuel_injector board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 4, TECH_MATERIAL = 4) req_components = list( - /obj/item/weapon/stock_parts/manipulator/nano = 2, - /obj/item/weapon/stock_parts/scanning_module/adv = 1, - /obj/item/weapon/stock_parts/matter_bin/super = 1, - /obj/item/weapon/stock_parts/console_screen = 1, + /obj/item/stock_parts/manipulator/nano = 2, + /obj/item/stock_parts/scanning_module/adv = 1, + /obj/item/stock_parts/matter_bin/super = 1, + /obj/item/stock_parts/console_screen = 1, /obj/item/stack/cable_coil = 5 ) -/obj/item/weapon/circuitboard/gyrotron +/obj/item/circuitboard/gyrotron name = "circuit board (gyrotron)" build_path = /obj/machinery/power/emitter/gyrotron board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_POWER = 4, TECH_ENGINEERING = 4, TECH_MATERIAL = 5, TECH_MAGNET = 3) req_components = list( - /obj/item/weapon/stock_parts/scanning_module/adv = 1, - /obj/item/weapon/stock_parts/micro_laser/high = 3, - /obj/item/weapon/stock_parts/capacitor/adv = 1 + /obj/item/stock_parts/scanning_module/adv = 1, + /obj/item/stock_parts/micro_laser/high = 3, + /obj/item/stock_parts/capacitor/adv = 1 ) /datum/design/circuit/fusion name = "fusion core control console" id = "fusion_core_control" - build_path = /obj/item/weapon/circuitboard/fusion_core_control + build_path = /obj/item/circuitboard/fusion_core_control sort_string = "LAAAD" req_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 3, TECH_MATERIAL = 3) /datum/design/circuit/fusion/fuel_compressor name = "fusion fuel compressor" id = "fusion_fuel_compressor" - build_path = /obj/item/weapon/circuitboard/fusion_fuel_compressor + build_path = /obj/item/circuitboard/fusion_fuel_compressor sort_string = "LAAAE" /datum/design/circuit/fusion/fuel_control name = "fusion fuel control console" id = "fusion_fuel_control" - build_path = /obj/item/weapon/circuitboard/fusion_fuel_control + build_path = /obj/item/circuitboard/fusion_fuel_control sort_string = "LAAAF" /datum/design/circuit/fusion/gyrotron_control name = "gyrotron control console" id = "gyrotron_control" - build_path = /obj/item/weapon/circuitboard/gyrotron_control + build_path = /obj/item/circuitboard/gyrotron_control sort_string = "LAAAG" /datum/design/circuit/fusion/core name = "fusion core" id = "fusion_core" - build_path = /obj/item/weapon/circuitboard/fusion_core + build_path = /obj/item/circuitboard/fusion_core sort_string = "LAAAH" /datum/design/circuit/fusion/injector name = "fusion fuel injector" id = "fusion_injector" - build_path = /obj/item/weapon/circuitboard/fusion_injector + build_path = /obj/item/circuitboard/fusion_injector sort_string = "LAAAI" diff --git a/code/modules/power/fusion/gyrotron/gyrotron.dm b/code/modules/power/fusion/gyrotron/gyrotron.dm index b84d04871e4..f9177bcecc9 100644 --- a/code/modules/power/fusion/gyrotron/gyrotron.dm +++ b/code/modules/power/fusion/gyrotron/gyrotron.dm @@ -10,7 +10,7 @@ GLOBAL_LIST_EMPTY(gyrotrons) use_power = USE_POWER_IDLE active_power_usage = 50000 - circuit = /obj/item/weapon/circuitboard/gyrotron + circuit = /obj/item/circuitboard/gyrotron var/id_tag var/rate = 3 @@ -52,7 +52,7 @@ GLOBAL_LIST_EMPTY(gyrotrons) icon_state = "emitter-off" /obj/machinery/power/emitter/gyrotron/attackby(var/obj/item/W, var/mob/user) - if(istype(W, /obj/item/device/multitool)) + if(istype(W, /obj/item/multitool)) var/new_ident = tgui_input_text(usr, "Enter a new ident tag.", "Gyrotron", id_tag, MAX_NAME_LEN) new_ident = sanitize(new_ident,MAX_NAME_LEN) if(new_ident && user.Adjacent(src)) diff --git a/code/modules/power/fusion/gyrotron/gyrotron_control.dm b/code/modules/power/fusion/gyrotron/gyrotron_control.dm index 1979e091ad8..bf50504e630 100644 --- a/code/modules/power/fusion/gyrotron/gyrotron_control.dm +++ b/code/modules/power/fusion/gyrotron/gyrotron_control.dm @@ -2,7 +2,7 @@ name = "gyrotron control console" desc = "Used to control the R-UST stability beams." light_color = COLOR_BLUE - circuit = /obj/item/weapon/circuitboard/gyrotron_control + circuit = /obj/item/circuitboard/gyrotron_control icon_keyboard = "generic_key" icon_screen = "mass_driver" @@ -118,7 +118,7 @@ /obj/machinery/computer/gyrotron_control/attackby(var/obj/item/W, var/mob/user) ..() - if(istype(W, /obj/item/device/multitool)) + if(istype(W, /obj/item/multitool)) var/new_ident = tgui_input_text(usr, "Enter a new ident tag.", "Gyrotron Control", monitor.gyro_tag, MAX_NAME_LEN) new_ident = sanitize(new_ident,MAX_NAME_LEN) if(new_ident && user.Adjacent(src)) diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index f528d4025b9..4bb014596d8 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -169,7 +169,7 @@ GLOBAL_LIST_EMPTY(all_turbines) /obj/machinery/power/generator/attack_ai(mob/user) attack_hand(user) -/obj/machinery/power/generator/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/power/generator/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) playsound(src, W.usesound, 75, 1) anchored = !anchored diff --git a/code/modules/power/gravitygenerator_vr.dm b/code/modules/power/gravitygenerator_vr.dm index 40d0fc93ef4..936d9e18054 100644 --- a/code/modules/power/gravitygenerator_vr.dm +++ b/code/modules/power/gravitygenerator_vr.dm @@ -212,7 +212,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) return if(GRAV_NEEDS_WELDING) if(I.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/W = I.get_welder() + var/obj/item/weldingtool/W = I.get_welder() if(W.remove_fuel(0,user)) to_chat(user, "You mend the damaged framework.") broken_state++ diff --git a/code/modules/power/grid_checker.dm b/code/modules/power/grid_checker.dm index 60a268ca03c..99aaa55ba7c 100644 --- a/code/modules/power/grid_checker.dm +++ b/code/modules/power/grid_checker.dm @@ -3,7 +3,7 @@ desc = "A machine that reacts to unstable conditions in the powernet, by safely shutting everything down. Probably better \ than the alternative." icon_state = "gridchecker_on" - circuit = /obj/item/weapon/circuitboard/grid_checker + circuit = /obj/item/circuitboard/grid_checker density = TRUE anchored = TRUE var/power_failing = FALSE // Turns to TRUE when the grid check event is fired by the Game Master, or perhaps a cheeky antag. @@ -43,7 +43,7 @@ opened = !opened else if(W.has_tool_quality(TOOL_CROWBAR)) default_deconstruction_crowbar(user, W) - else if(istype(W, /obj/item/device/multitool) || W.has_tool_quality(TOOL_WIRECUTTER)) + else if(istype(W, /obj/item/multitool) || W.has_tool_quality(TOOL_WIRECUTTER)) attack_hand(user) /obj/machinery/power/grid_checker/attack_hand(mob/user) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 2159054ff27..2960c6ab9ed 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -1,6 +1,6 @@ // The lighting system // -// consists of light fixtures (/obj/machinery/light) and light tube/bulb items (/obj/item/weapon/light) +// consists of light fixtures (/obj/machinery/light) and light tube/bulb items (/obj/item/light) // status values shared between lighting fixtures and items @@ -27,7 +27,7 @@ var/global/list/light_type_cache = list() var/fixture_type = /obj/machinery/light var/sheets_refunded = 2 var/obj/machinery/light/newlight = null - var/obj/item/weapon/cell/cell = null + var/obj/item/cell/cell = null var/cell_connectors = TRUE @@ -79,9 +79,9 @@ var/global/list/light_type_cache = list() cell.update_icon() cell = null -/obj/machinery/light_construct/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/light_construct/attackby(obj/item/W as obj, mob/user as mob) src.add_fingerprint(user) - if(istype(W, /obj/item/weapon/cell/emergency_light)) + if(istype(W, /obj/item/cell/emergency_light)) if(!cell_connectors) to_chat(user, "This [name] can't support a power cell!") return @@ -211,14 +211,14 @@ var/global/list/light_type_cache = list() idle_power_usage = 2 active_power_usage = 10 power_channel = LIGHT //Lights are calc'd via area so they dont need to be in the machine list - var/obj/item/weapon/light/installed_light //What light is currently in the socket! Updated in new() + var/obj/item/light/installed_light //What light is currently in the socket! Updated in new() var/on = 0 // 1 if on, 0 if off var/brightness_range var/brightness_power var/brightness_color var/status = LIGHT_OK // LIGHT_OK, _EMPTY, _BURNED or _BROKEN var/flickering = 0 - var/light_type = /obj/item/weapon/light/tube // the type of light item + var/light_type = /obj/item/light/tube // the type of light item var/construct_type = /obj/machinery/light_construct var/switchcount = 0 // count of number of times switched on/off // this is used to calc the probability the light burns out @@ -232,7 +232,7 @@ var/global/list/light_type_cache = list() var/auto_flicker = FALSE // If true, will constantly flicker, so long as someone is around to see it (otherwise its a waste of CPU). - var/obj/item/weapon/cell/emergency_light/cell + var/obj/item/cell/emergency_light/cell var/start_with_cell = TRUE // if true, this fixture generates a very weak cell at roundstart var/emergency_mode = FALSE // if true, the light is in emergency mode @@ -263,7 +263,7 @@ var/global/list/light_type_cache = list() icon_state = "bulb1" base_state = "bulb" desc = "A small lighting fixture." - light_type = /obj/item/weapon/light/bulb + light_type = /obj/item/light/bulb construct_type = /obj/machinery/light_construct/small shows_alerts = FALSE //VOREStation Edit overlay_color = LIGHT_COLOR_INCANDESCENT_BULB @@ -284,7 +284,7 @@ var/global/list/light_type_cache = list() plane = OBJ_PLANE layer = OBJ_LAYER desc = "A floor lamp." - light_type = /obj/item/weapon/light/bulb/large + light_type = /obj/item/light/bulb/large construct_type = /obj/machinery/light_construct/flamp shows_alerts = FALSE //VOREStation Edit var/lamp_shade = 1 @@ -298,21 +298,21 @@ var/global/list/light_type_cache = list() update_icon() else if(start_with_cell && !no_emergency) - cell = new/obj/item/weapon/cell/emergency_light(src) + cell = new/obj/item/cell/emergency_light(src) /obj/machinery/light/flamp/flicker auto_flicker = TRUE /obj/machinery/light/small/emergency - light_type = /obj/item/weapon/light/bulb/red + light_type = /obj/item/light/bulb/red /obj/machinery/light/small/emergency/flicker auto_flicker = TRUE /obj/machinery/light/spot name = "spotlight" - light_type = /obj/item/weapon/light/tube/large + light_type = /obj/item/light/tube/large shows_alerts = FALSE //VOREStation Edit /obj/machinery/light/spot/flicker @@ -336,8 +336,8 @@ var/global/list/light_type_cache = list() else installed_light = new light_type(src) if(start_with_cell && !no_emergency) - cell = new/obj/item/weapon/cell/emergency_light(src) - var/obj/item/weapon/light/L = get_light_type_instance(light_type) //This is fine, but old code. + cell = new/obj/item/cell/emergency_light(src) + var/obj/item/light/L = get_light_type_instance(light_type) //This is fine, but old code. update_from_bulb(L) if(prob(L.broken_chance)) broken(1) @@ -430,7 +430,7 @@ var/global/list/light_type_cache = list() return current_alert = null - var/obj/item/weapon/light/L = installed_light //This ensures any special bulbs will stay special! + var/obj/item/light/L = installed_light //This ensures any special bulbs will stay special! if(L) update_from_bulb(L) @@ -552,10 +552,10 @@ var/global/list/light_type_cache = list() . += "Its backup power charge meter reads [round((cell.charge / cell.maxcharge) * 100, 0.1)]%." /obj/machinery/light/proc/get_fitting_name() - var/obj/item/weapon/light/L = light_type + var/obj/item/light/L = light_type return initial(L.name) -/obj/machinery/light/proc/update_from_bulb(obj/item/weapon/light/L) +/obj/machinery/light/proc/update_from_bulb(obj/item/light/L) status = L.status switchcount = L.switchcount rigged = L.rigged @@ -571,7 +571,7 @@ var/global/list/light_type_cache = list() // attack with item - insert light (if right type), otherwise try to break the light -/obj/machinery/light/proc/insert_bulb(obj/item/weapon/light/L) +/obj/machinery/light/proc/insert_bulb(obj/item/light/L) update_from_bulb(L) installed_light = L L.loc = src //Move it into the socket! @@ -597,15 +597,15 @@ var/global/list/light_type_cache = list() /obj/machinery/light/attackby(obj/item/W, mob/user) //Light replacer code - if(istype(W, /obj/item/device/lightreplacer)) //These will never be modified, so it's fine to use old code. - var/obj/item/device/lightreplacer/LR = W + if(istype(W, /obj/item/lightreplacer)) //These will never be modified, so it's fine to use old code. + var/obj/item/lightreplacer/LR = W if(isliving(user)) var/mob/living/U = user LR.ReplaceLight(src, U) return // attempt to insert light - if(istype(W, /obj/item/weapon/light)) + if(istype(W, /obj/item/light)) if(status != LIGHT_EMPTY) to_chat(user, "There is a [get_fitting_name()] already inserted.") return @@ -667,7 +667,7 @@ var/global/list/light_type_cache = list() to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") if(!lamp_shade) - if(istype(W, /obj/item/weapon/lampshade)) + if(istype(W, /obj/item/lampshade)) lamp_shade = 1 qdel(W) update_icon() @@ -679,7 +679,7 @@ var/global/list/light_type_cache = list() user.visible_message("[user.name] removes [src]'s lamp shade.", \ "You remove [src]'s lamp shade.", "You hear a noise.") lamp_shade = 0 - new /obj/item/weapon/lampshade(src.loc) + new /obj/item/lampshade(src.loc) update_icon() return @@ -927,7 +927,7 @@ var/global/list/light_type_cache = list() // can be tube or bulb subtypes // will fit into empty /obj/machinery/light of the corresponding type -/obj/item/weapon/light +/obj/item/light icon = 'icons/obj/lighting.dmi' force = 2 throwforce = 5 @@ -970,7 +970,7 @@ var/global/list/light_type_cache = list() var/init_nightshift_power = 0.45 //VOREStation Edit End - Modifiable Lighting -/obj/item/weapon/light/tube +/obj/item/light/tube name = "light tube" desc = "A replacement light tube." icon_state = "ltube" @@ -982,7 +982,7 @@ var/global/list/light_type_cache = list() init_brightness_range = 7 init_brightness_power = 2 -/obj/item/weapon/light/tube/large +/obj/item/light/tube/large w_class = ITEMSIZE_SMALL name = "large light tube" brightness_range = 15 @@ -996,7 +996,7 @@ var/global/list/light_type_cache = list() init_nightshift_range = 10 init_nightshift_power = 1.5 -/obj/item/weapon/light/bulb +/obj/item/light/bulb name = "light bulb" desc = "A replacement light bulb." icon_state = "lbulb" @@ -1016,7 +1016,7 @@ var/global/list/light_type_cache = list() init_nightshift_power = 0.5 // For 'floor lamps' in outdoor use and such -/obj/item/weapon/light/bulb/large +/obj/item/light/bulb/large name = "large light bulb" brightness_range = 7 brightness_power = 1.5 @@ -1029,17 +1029,17 @@ var/global/list/light_type_cache = list() init_nightshift_range = 4 init_nightshift_power = 0.75 -/obj/item/weapon/light/throw_impact(atom/hit_atom) +/obj/item/light/throw_impact(atom/hit_atom) ..() shatter() -/obj/item/weapon/light/bulb/red +/obj/item/light/bulb/red brightness_range = 4 color = "#da0205" brightness_color = "#da0205" init_brightness_range = 4 -/obj/item/weapon/light/bulb/fire +/obj/item/light/bulb/fire name = "fire bulb" desc = "A replacement fire bulb." icon_state = "fbulb" @@ -1048,7 +1048,7 @@ var/global/list/light_type_cache = list() matter = list(MAT_GLASS = 100) // update the icon state and description of the light -/obj/item/weapon/light/update_icon() +/obj/item/light/update_icon() switch(status) if(LIGHT_OK) icon_state = base_state @@ -1061,7 +1061,7 @@ var/global/list/light_type_cache = list() desc = "A broken [name]." -/obj/item/weapon/light/New(atom/newloc, obj/machinery/light/fixture = null) +/obj/item/light/New(atom/newloc, obj/machinery/light/fixture = null) ..() if(fixture) status = fixture.status @@ -1078,11 +1078,11 @@ var/global/list/light_type_cache = list() // attack bulb/tube with object // if a syringe, can inject phoron to make it explode -/obj/item/weapon/light/attackby(var/obj/item/I, var/mob/user) +/obj/item/light/attackby(var/obj/item/I, var/mob/user) ..() //VOREStation Edit Start - Multitool Lighting! - if(istype(I,/obj/item/device/multitool)) + if(istype(I,/obj/item/multitool)) var/list/menu_list = list( "Normal Range", "Normal Brightness", @@ -1129,8 +1129,8 @@ var/global/list/light_type_cache = list() else //Should never happen. return - else if(istype(I, /obj/item/weapon/reagent_containers/syringe)) - var/obj/item/weapon/reagent_containers/syringe/S = I + else if(istype(I, /obj/item/reagent_containers/syringe)) + var/obj/item/reagent_containers/syringe/S = I to_chat(user, "You inject the solution into the [src].") @@ -1150,7 +1150,7 @@ var/global/list/light_type_cache = list() // shatter light, unless it was an attempt to put it in a light socket // now only shatter if the intent was harm -/obj/item/weapon/light/afterattack(atom/target, mob/user, proximity) +/obj/item/light/afterattack(atom/target, mob/user, proximity) if(!proximity) return if(istype(target, /obj/machinery/light)) return @@ -1159,7 +1159,7 @@ var/global/list/light_type_cache = list() shatter() -/obj/item/weapon/light/proc/shatter() +/obj/item/light/proc/shatter() if(status == LIGHT_OK || status == LIGHT_BURNED) src.visible_message(span_red("[name] shatters."),span_red("You hear a small glass object shatter.")) status = LIGHT_BROKEN @@ -1169,7 +1169,7 @@ var/global/list/light_type_cache = list() update_icon() //Lamp Shade -/obj/item/weapon/lampshade +/obj/item/lampshade name = "lamp shade" desc = "A lamp shade for a lamp." icon = 'icons/obj/lighting.dmi' diff --git a/code/modules/power/lighting_neon.dm b/code/modules/power/lighting_neon.dm index 2d712d1f123..28782db4a2c 100644 --- a/code/modules/power/lighting_neon.dm +++ b/code/modules/power/lighting_neon.dm @@ -1,42 +1,42 @@ //Coloured lights -/obj/item/weapon/light/bulb/neon/red +/obj/item/light/bulb/neon/red brightness_range = 4 color = "#da0205" brightness_color = "#da0205" init_brightness_range = 4 -/obj/item/weapon/light/bulb/neon/blue +/obj/item/light/bulb/neon/blue brightness_range = 4 color = "#0048ff" brightness_color = "#0048ff" init_brightness_range = 4 -/obj/item/weapon/light/bulb/neon/green +/obj/item/light/bulb/neon/green brightness_range = 4 color = "#00ff15" brightness_color = "#00ff15" init_brightness_range = 4 -/obj/item/weapon/light/bulb/neon/pink +/obj/item/light/bulb/neon/pink brightness_range = 4 color = "#ff00ee" brightness_color = "#ff00ee" init_brightness_range = 4 -/obj/item/weapon/light/bulb/neon/yellow +/obj/item/light/bulb/neon/yellow brightness_range = 4 color = "#fff200" brightness_color = "#fff200" init_brightness_range = 4 -/obj/item/weapon/light/bulb/neon/purple +/obj/item/light/bulb/neon/purple brightness_range = 4 color = "#6200ff" brightness_color = "#6200ff" init_brightness_range = 4 -/obj/item/weapon/light/bulb/neon/orange +/obj/item/light/bulb/neon/orange brightness_range = 4 color = "#ff8000" brightness_color = "#ff8000" @@ -48,7 +48,7 @@ icon_state = "GenericGreen1" base_state = "GenericGreen" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/green + light_type = /obj/item/light/bulb/neon/green shows_alerts = FALSE anchored = TRUE plane = ABOVE_MOB_PLANE @@ -63,43 +63,43 @@ icon_state = "GenericGreen1" base_state = "GenericGreen" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/green + light_type = /obj/item/light/bulb/neon/green /obj/machinery/light/small/neon/generic_yellow icon_state = "GenericYellow1" base_state = "GenericYellow" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/yellow + light_type = /obj/item/light/bulb/neon/yellow /obj/machinery/light/small/neon/generic_red icon_state = "GenericRed1" base_state = "GenericRed" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/red + light_type = /obj/item/light/bulb/neon/red /obj/machinery/light/small/neon/generic_blue icon_state = "GenericBlue1" base_state = "GenericBlue" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/blue + light_type = /obj/item/light/bulb/neon/blue /obj/machinery/light/small/neon/generic_orange icon_state = "GenericOrange1" base_state = "GenericOrange" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/orange + light_type = /obj/item/light/bulb/neon/orange /obj/machinery/light/small/neon/generic_pink icon_state = "GenericPink1" base_state = "GenericPink" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/pink + light_type = /obj/item/light/bulb/neon/pink /obj/machinery/light/small/neon/generic_purple icon_state = "GenericPurple1" base_state = "GenericPurple" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/purple + light_type = /obj/item/light/bulb/neon/purple // Specific locations @@ -108,76 +108,76 @@ icon_state = "Booze1" base_state = "Booze" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/green + light_type = /obj/item/light/bulb/neon/green /obj/machinery/light/small/neon/booze2 icon_state = "BoozeWord1" base_state = "BoozeWord" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/green + light_type = /obj/item/light/bulb/neon/green /obj/machinery/light/small/neon/looktoucheat icon_state = "LookTouchEat1" base_state = "LookTouchEat" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/pink + light_type = /obj/item/light/bulb/neon/pink /obj/machinery/light/small/neon/pharmacy icon_state = "Pharmacy1" base_state = "Pharmacy" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/green + light_type = /obj/item/light/bulb/neon/green /obj/machinery/light/small/neon/altevian icon_state = "Altevian1" base_state = "Altevian" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/orange + light_type = /obj/item/light/bulb/neon/orange /obj/machinery/light/small/neon/nif1 icon_state = "NIF1" base_state = "NIF" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/blue + light_type = /obj/item/light/bulb/neon/blue /obj/machinery/light/small/neon/nif2 icon_state = "NIFpic1" base_state = "NIFpic" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/blue + light_type = /obj/item/light/bulb/neon/blue /obj/machinery/light/small/neon/cross icon_state = "GreenCross1" base_state = "GreenCross" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/green + light_type = /obj/item/light/bulb/neon/green /obj/machinery/light/small/neon/bar icon_state = "Bar1" base_state = "Bar" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/purple + light_type = /obj/item/light/bulb/neon/purple /obj/machinery/light/small/neon/unclothe icon_state = "Unclothe1" base_state = "Unclothe" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/orange + light_type = /obj/item/light/bulb/neon/orange /obj/machinery/light/small/neon/import icon_state = "Import1" base_state = "Import" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/yellow + light_type = /obj/item/light/bulb/neon/yellow /obj/machinery/light/small/neon/police icon_state = "Police1" base_state = "Police" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/pink + light_type = /obj/item/light/bulb/neon/pink /obj/machinery/light/small/neon/dice icon_state = "Dice1" base_state = "Dice" desc = "A bright neon wall sign." - light_type = /obj/item/weapon/light/bulb/neon/yellow \ No newline at end of file + light_type = /obj/item/light/bulb/neon/yellow \ No newline at end of file diff --git a/code/modules/power/lighting_vr.dm b/code/modules/power/lighting_vr.dm index 9950d420570..f0aeb7e0334 100644 --- a/code/modules/power/lighting_vr.dm +++ b/code/modules/power/lighting_vr.dm @@ -19,7 +19,7 @@ layer = ABOVE_MOB_LAYER // Wall tube lights -/obj/item/weapon/light/tube +/obj/item/light/tube brightness_range = 6 brightness_power = 1 @@ -27,7 +27,7 @@ nightshift_power = 0.45 // Big tubes, unused I think -/obj/item/weapon/light/tube/large +/obj/item/light/tube/large brightness_range = 8 brightness_power = 2 @@ -35,7 +35,7 @@ nightshift_power = 1 // Small wall lights -/obj/item/weapon/light/bulb +/obj/item/light/bulb brightness_range = 4 brightness_power = 1 @@ -43,7 +43,7 @@ nightshift_power = 0.45 // Floor lamps -/obj/item/weapon/light/bulb/large +/obj/item/light/bulb/large brightness_range = 6 brightness_power = 1 @@ -143,7 +143,7 @@ // Fairy lights -/obj/item/weapon/light/bulb/smol +/obj/item/light/bulb/smol brightness_range = 1 brightness_power = 0.5 @@ -156,7 +156,7 @@ icon_state = "fairy_lights1" base_state = "fairy_lights" desc = "A set of lights on a long string of wire, anchored to the walls." - light_type = /obj/item/weapon/light/bulb/smol + light_type = /obj/item/light/bulb/smol shows_alerts = FALSE anchored = TRUE plane = ABOVE_MOB_PLANE @@ -203,7 +203,7 @@ icon_state = "lamppost1" base_state = "lamppost" desc = "A tall lampost that extends over an area" - light_type = /obj/item/weapon/light/bulb + light_type = /obj/item/light/bulb shows_alerts = FALSE anchored = TRUE plane = ABOVE_MOB_PLANE @@ -233,7 +233,7 @@ icon_state = "big_flamp-empty" */ -/obj/item/weapon/light/bulb/torch +/obj/item/light/bulb/torch brightness_range = 6 color = "#fabf87" brightness_color = "#fabf87" @@ -245,7 +245,7 @@ icon_state = "torch1" base_state = "torch" desc = "A small torch held in a wall sconce." - light_type = /obj/item/weapon/light/bulb/torch + light_type = /obj/item/light/bulb/torch shows_alerts = FALSE anchored = TRUE plane = ABOVE_MOB_PLANE diff --git a/code/modules/power/lightswitch_vr.dm b/code/modules/power/lightswitch_vr.dm index e3776ede280..e7c3ca31754 100644 --- a/code/modules/power/lightswitch_vr.dm +++ b/code/modules/power/lightswitch_vr.dm @@ -81,11 +81,11 @@ /obj/structure/construction/update_icon() icon_state = "[base_icon][stage]" -/obj/structure/construction/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/construction/attackby(obj/item/W as obj, mob/user as mob) add_fingerprint(user) if(W.has_tool_quality(TOOL_WELDER)) if(stage == FRAME_UNFASTENED) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(!WT.remove_fuel(0, user)) to_chat(user, "\The [src] must be on to complete this task.") return diff --git a/code/modules/power/pacman2.dm b/code/modules/power/pacman2.dm index 9471665d470..908ac768785 100644 --- a/code/modules/power/pacman2.dm +++ b/code/modules/power/pacman2.dm @@ -6,8 +6,8 @@ name = "Pacman II" desc = "P.A.C.M.A.N. type II portable generator. Uses liquid phoron as a fuel source." power_gen = 4500 - circuit = /obj/item/weapon/circuitboard/pacman2 - var/obj/item/weapon/tank/phoron/P = null + circuit = /obj/item/circuitboard/pacman2 + var/obj/item/tank/phoron/P = null var/emagged = 0 var/heat = 0 /* @@ -36,10 +36,10 @@ RefreshParts() var/temp_rating = 0 - for(var/obj/item/weapon/stock_parts/SP in component_parts) - if(istype(SP, /obj/item/weapon/stock_parts/matter_bin)) + for(var/obj/item/stock_parts/SP in component_parts) + if(istype(SP, /obj/item/stock_parts/matter_bin)) //max_coins = SP.rating * SP.rating * 1000 - else if(istype(SP, /obj/item/weapon/stock_parts/micro_laser) || istype(SP, /obj/item/weapon/stock_parts/capacitor)) + else if(istype(SP, /obj/item/stock_parts/micro_laser) || istype(SP, /obj/item/stock_parts/capacitor)) temp_rating += SP.rating power_gen = round(initial(power_gen) * (max(2, temp_rating) / 2)) @@ -61,7 +61,7 @@ explosion(get_turf(src), 2, 5, 2, -1) attackby(var/obj/item/O as obj, var/mob/user as mob) - if(istype(O, /obj/item/weapon/tank/phoron)) + if(istype(O, /obj/item/tank/phoron)) if(P) to_chat(user, span_red("The generator already has a phoron tank loaded!")) return diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 8adbfb9da0f..000c988fd31 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -103,7 +103,7 @@ /obj/machinery/power/port_gen/pacman name = "\improper P.A.C.M.A.N.-type Portable Generator" desc = "A power generator that runs on solid phoron sheets. Rated for 80 kW max safe output." - circuit = /obj/item/weapon/circuitboard/pacman + circuit = /obj/item/circuitboard/pacman var/sheet_name = "Phoron Sheets" var/sheet_path = /obj/item/stack/material/phoron @@ -143,10 +143,10 @@ /obj/machinery/power/port_gen/pacman/RefreshParts() var/temp_rating = 0 - for(var/obj/item/weapon/stock_parts/SP in component_parts) - if(istype(SP, /obj/item/weapon/stock_parts/matter_bin)) + for(var/obj/item/stock_parts/SP in component_parts) + if(istype(SP, /obj/item/stock_parts/matter_bin)) max_sheets = SP.rating * SP.rating * 50 - else if(istype(SP, /obj/item/weapon/stock_parts/micro_laser) || istype(SP, /obj/item/weapon/stock_parts/capacitor)) + else if(istype(SP, /obj/item/stock_parts/micro_laser) || istype(SP, /obj/item/stock_parts/capacitor)) temp_rating += SP.rating power_gen = round(initial(power_gen) * (max(2, temp_rating) / 2)) @@ -382,7 +382,7 @@ sheet_path = /obj/item/stack/material/uranium sheet_name = "Uranium Sheets" time_per_sheet = 576 //same power output, but a 50 sheet stack will last 2 hours at max safe power - circuit = /obj/item/weapon/circuitboard/pacman/super + circuit = /obj/item/circuitboard/pacman/super /obj/machinery/power/port_gen/pacman/super/UseFuel() //produces a tiny amount of radiation when in use @@ -413,7 +413,7 @@ time_per_sheet = 576 max_temperature = 800 temperature_gain = 90 - circuit = /obj/item/weapon/circuitboard/pacman/mrs + circuit = /obj/item/circuitboard/pacman/mrs /obj/machinery/power/port_gen/pacman/mrs/explode() //no special effects, but the explosion is pretty big (same as a supermatter shard). diff --git a/code/modules/power/port_gen_vr.dm b/code/modules/power/port_gen_vr.dm index 77392357522..3fa9b2c765a 100644 --- a/code/modules/power/port_gen_vr.dm +++ b/code/modules/power/port_gen_vr.dm @@ -35,45 +35,45 @@ //Port Emd, RS PR #484 // Circuits for the RTGs below -/obj/item/weapon/circuitboard/machine/rtg +/obj/item/circuitboard/machine/rtg name = T_BOARD("radioisotope TEG") build_path = /obj/machinery/power/rtg board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 3, TECH_POWER = 3, TECH_PHORON = 3, TECH_ENGINEERING = 3) req_components = list( /obj/item/stack/cable_coil = 5, - /obj/item/weapon/stock_parts/capacitor = 1, + /obj/item/stock_parts/capacitor = 1, /obj/item/stack/material/uranium = 10) // We have no Pu-238, and this is the closest thing to it. -/obj/item/weapon/circuitboard/machine/rtg/advanced +/obj/item/circuitboard/machine/rtg/advanced name = T_BOARD("advanced radioisotope TEG") build_path = /obj/machinery/power/rtg/advanced origin_tech = list(TECH_DATA = 5, TECH_POWER = 5, TECH_PHORON = 5, TECH_ENGINEERING = 5) req_components = list( /obj/item/stack/cable_coil = 5, - /obj/item/weapon/stock_parts/capacitor = 1, - /obj/item/weapon/stock_parts/micro_laser = 1, + /obj/item/stock_parts/capacitor = 1, + /obj/item/stock_parts/micro_laser = 1, /obj/item/stack/material/uranium = 10, /obj/item/stack/material/phoron = 5) -/obj/item/weapon/circuitboard/machine/abductor/core +/obj/item/circuitboard/machine/abductor/core name = T_BOARD("void generator") build_path = /obj/machinery/power/rtg/abductor board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 8, TECH_POWER = 8, TECH_PHORON = 8, TECH_ENGINEERING = 8) req_components = list( /obj/item/stack/cable_coil = 5, - /obj/item/weapon/stock_parts/capacitor/hyper = 1) + /obj/item/stock_parts/capacitor/hyper = 1) -/obj/item/weapon/circuitboard/machine/abductor/core/hybrid +/obj/item/circuitboard/machine/abductor/core/hybrid name = T_BOARD("void generator (hybrid)") build_path = /obj/machinery/power/rtg/abductor/hybrid board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 8, TECH_POWER = 8, TECH_PHORON = 8, TECH_ENGINEERING = 8) req_components = list( /obj/item/stack/cable_coil = 5, - /obj/item/weapon/stock_parts/capacitor/hyper = 1, - /obj/item/weapon/stock_parts/micro_laser/hyper = 1) + /obj/item/stock_parts/capacitor/hyper = 1, + /obj/item/stock_parts/micro_laser/hyper = 1) // Radioisotope Thermoelectric Generator (RTG) // Simple power generator that would replace "magic SMES" on various derelicts. @@ -84,7 +84,7 @@ icon_state = "rtg" density = TRUE use_power = USE_POWER_OFF - circuit = /obj/item/weapon/circuitboard/machine/rtg + circuit = /obj/item/circuitboard/machine/rtg // You can buckle someone to RTG, then open its panel. Fun stuff. can_buckle = TRUE @@ -108,7 +108,7 @@ /obj/machinery/power/rtg/RefreshParts() var/part_level = 0 - for(var/obj/item/weapon/stock_parts/SP in component_parts) + for(var/obj/item/stock_parts/SP in component_parts) part_level += SP.rating power_gen = initial(power_gen) * part_level @@ -136,14 +136,14 @@ /obj/machinery/power/rtg/advanced desc = "An advanced RTG capable of moderating isotope decay, increasing power output but reducing lifetime. It uses plasma-fueled radiation collectors to increase output even further." power_gen = 1250 // 2500 on T1, 10000 on T4. - circuit = /obj/item/weapon/circuitboard/machine/rtg/advanced + circuit = /obj/item/circuitboard/machine/rtg/advanced /obj/machinery/power/rtg/fake_gen name = "area power generator" desc = "Some power generation equipment that might be powering the current area." icon_state = "rtg_gen" power_gen = 6000 - circuit = /obj/item/weapon/circuitboard/machine/rtg + circuit = /obj/item/circuitboard/machine/rtg can_buckle = FALSE /obj/machinery/power/rtg/fake_gen/RefreshParts() @@ -159,13 +159,13 @@ name = "Void Core" icon_state = "core-nocell" desc = "An alien power source that produces energy seemingly out of nowhere." - circuit = /obj/item/weapon/circuitboard/machine/abductor/core + circuit = /obj/item/circuitboard/machine/abductor/core power_gen = 10000 irradiate = FALSE // Green energy! can_buckle = FALSE pixel_y = 7 var/going_kaboom = FALSE // Is it about to explode? - var/obj/item/weapon/cell/void/cell + var/obj/item/cell/void/cell var/icon_base = "core" var/state_change = TRUE @@ -207,7 +207,7 @@ /obj/machinery/power/rtg/abductor/attackby(obj/item/I, mob/user, params) state_change = TRUE //Can't tell if parent did something - if(istype(I, /obj/item/weapon/cell/void) && !cell) + if(istype(I, /obj/item/cell/void) && !cell) user.remove_from_mob(I) I.forceMove(src) cell = I @@ -260,14 +260,14 @@ /obj/machinery/power/rtg/abductor/hybrid icon_state = "coreb-nocell" icon_base = "coreb" - circuit = /obj/item/weapon/circuitboard/machine/abductor/core/hybrid + circuit = /obj/item/circuitboard/machine/abductor/core/hybrid /obj/machinery/power/rtg/abductor/hybrid/built icon_state = "coreb" /obj/machinery/power/rtg/abductor/hybrid/built/Initialize() . = ..() - cell = new /obj/item/weapon/cell/void/hybrid(src) + cell = new /obj/item/cell/void/hybrid(src) RefreshParts() @@ -316,7 +316,7 @@ desc = "It looks kind of like a large hamster wheel." icon = 'icons/obj/power_vrx96.dmi' icon_state = "reg" - circuit = /obj/item/weapon/circuitboard/machine/reg_d + circuit = /obj/item/circuitboard/machine/reg_d irradiate = FALSE power_gen = 0 var/default_power_gen = 1000000 //It's big but it gets adjusted based on what you put into it!!! @@ -347,7 +347,7 @@ /obj/machinery/power/rtg/reg/RefreshParts() var/n = 0 - for(var/obj/item/weapon/stock_parts/SP in component_parts) + for(var/obj/item/stock_parts/SP in component_parts) n += SP.rating part_mult = n @@ -416,27 +416,27 @@ /obj/machinery/power/rtg/reg/emp_act(severity) return -/obj/item/weapon/circuitboard/machine/reg_d +/obj/item/circuitboard/machine/reg_d name = T_BOARD("D-Type-REG") build_path = /obj/machinery/power/rtg/reg board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 2, TECH_POWER = 4, TECH_ENGINEERING = 4) req_components = list( /obj/item/stack/cable_coil = 5, - /obj/item/weapon/stock_parts/capacitor = 1) + /obj/item/stock_parts/capacitor = 1) -/obj/item/weapon/circuitboard/machine/reg_c +/obj/item/circuitboard/machine/reg_c name = T_BOARD("C-Type-REG") build_path = /obj/machinery/power/rtg/reg/c board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 2, TECH_POWER = 4, TECH_ENGINEERING = 4) req_components = list( /obj/item/stack/cable_coil = 5, - /obj/item/weapon/stock_parts/capacitor = 1) + /obj/item/stock_parts/capacitor = 1) /obj/machinery/power/rtg/reg/c name = "c-type rotary electric generator" - circuit = /obj/item/weapon/circuitboard/machine/reg_c + circuit = /obj/item/circuitboard/machine/reg_c default_power_gen = 500000 //Half power nutrition_drain = 0.5 //for half cost - EQUIVALENT EXCHANGE >:O diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index a6dfc415c5d..b9f3df3fde7 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -86,7 +86,7 @@ // attach a wire to a power machine - leads from the turf you are standing on //almost never called, overwritten by all power machines but terminal and generator -/obj/machinery/power/attackby(obj/item/weapon/W, mob/user) +/obj/machinery/power/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/stack/cable_coil)) @@ -107,7 +107,7 @@ return // Power machinery should also connect/disconnect from the network. -/obj/machinery/power/default_unfasten_wrench(var/mob/user, var/obj/item/weapon/W, var/time = 20) +/obj/machinery/power/default_unfasten_wrench(var/mob/user, var/obj/item/W, var/time = 20) if((. = ..())) if(anchored) connect_to_network() @@ -282,11 +282,11 @@ power_source = Cable.powernet var/datum/powernet/PN - var/obj/item/weapon/cell/cell + var/obj/item/cell/cell if(istype(power_source,/datum/powernet)) PN = power_source - else if(istype(power_source,/obj/item/weapon/cell)) + else if(istype(power_source,/obj/item/cell)) cell = power_source else if(istype(power_source,/obj/machinery/power/apc)) var/obj/machinery/power/apc/apc = power_source @@ -338,6 +338,6 @@ else if (istype(power_source,/datum/powernet)) var/drained_power = drained_energy/CELLRATE drained_power = PN.draw_power(drained_power) - else if (istype(power_source, /obj/item/weapon/cell)) + else if (istype(power_source, /obj/item/cell)) cell.use(drained_energy) return drained_energy diff --git a/code/modules/power/sensors/sensor_monitoring.dm b/code/modules/power/sensors/sensor_monitoring.dm index 277b175102f..f601374ccb2 100644 --- a/code/modules/power/sensors/sensor_monitoring.dm +++ b/code/modules/power/sensors/sensor_monitoring.dm @@ -13,7 +13,7 @@ //computer stuff density = TRUE anchored = TRUE - circuit = /obj/item/weapon/circuitboard/powermonitor + circuit = /obj/item/circuitboard/powermonitor var/alerting = 0 use_power = USE_POWER_IDLE idle_power_usage = 300 diff --git a/code/modules/power/singularity/act.dm b/code/modules/power/singularity/act.dm index d47af8a13a6..53fe67aaad8 100644 --- a/code/modules/power/singularity/act.dm +++ b/code/modules/power/singularity/act.dm @@ -89,7 +89,7 @@ /obj/effect/projectile/emitter/singularity_pull() return -/obj/item/weapon/storage/backpack/holding/singularity_act(S, current_size) +/obj/item/storage/backpack/holding/singularity_act(S, current_size) var/dist = max((current_size - 2), 1) explosion(src.loc,(dist),(dist*2),(dist*4)) return 1000 diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index df76cbb27cb..5d82f46c5df 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -10,7 +10,7 @@ var/global/list/rad_collectors = list() density = TRUE req_access = list(access_engine_equip) // use_power = 0 - var/obj/item/weapon/tank/phoron/P = null + var/obj/item/tank/phoron/P = null var/last_power = 0 var/last_power_new = 0 var/active = 0 @@ -59,7 +59,7 @@ var/global/list/rad_collectors = list() /obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/weapon/tank/phoron)) + if(istype(W, /obj/item/tank/phoron)) if(!src.anchored) to_chat(user, span_red("The [src] needs to be secured to the floor first.")) return 1 @@ -89,7 +89,7 @@ var/global/list/rad_collectors = list() else disconnect_from_network() return 1 - else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) + else if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) if (src.allowed(user)) if(active) src.locked = !src.locked @@ -116,7 +116,7 @@ var/global/list/rad_collectors = list() /obj/machinery/power/rad_collector/proc/eject() locked = 0 - var/obj/item/weapon/tank/phoron/Z = src.P + var/obj/item/tank/phoron/Z = src.P if (!Z) return Z.loc = get_turf(src) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 85b10c8b00d..d9c1bf6e83d 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -182,7 +182,7 @@ return if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(active) to_chat(user, "Turn off [src] first.") return @@ -237,7 +237,7 @@ to_chat(user, "You don't have enough sheets to repair this! You need at least [amt] sheets.") return - if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda)) + if(istype(W, /obj/item/card/id) || istype(W, /obj/item/pda)) if(emagged) to_chat(user, "The lock seems to be broken.") return diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 8f621290779..c77c3b2b17f 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -136,7 +136,7 @@ field_generator power level display to_chat(user, span_red("The [src.name] needs to be unwelded from the floor.")) return else if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() switch(state) if(0) to_chat(user, span_red("The [src.name] needs to be wrenched to the floor.")) diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm index 35d593efae5..e95597495b7 100644 --- a/code/modules/power/singularity/generator.dm +++ b/code/modules/power/singularity/generator.dm @@ -47,7 +47,7 @@ to_chat(user, "\The [src] looks like it could be adapted to forge advanced materials via particle acceleration, somehow..") else to_chat(user, "\The [src]'s mechanisms look secure.") - if(istype(W, /obj/item/weapon/smes_coil/super_io) && panel_open) + if(istype(W, /obj/item/smes_coil/super_io) && panel_open) visible_message("\The [user] begins to modify \the [src] with \the [W].") if(do_after(user, 300)) user.drop_from_inventory(W) diff --git a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm index b0ced621a26..c73ce542aca 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm @@ -21,8 +21,8 @@ var/energy = 0 // How many 'energy' units does this have? Acquired by a Particle Accelerator like a Singularity. var/max_energy = 600 var/obj/item/stack/material/target // The material being bombarded. - var/obj/item/weapon/reagent_containers/reagent_container // Holds the beaker. The process will consume ALL reagents inside it. - var/beaker_type = /obj/item/weapon/reagent_containers/glass/beaker + var/obj/item/reagent_containers/reagent_container // Holds the beaker. The process will consume ALL reagents inside it. + var/beaker_type = /obj/item/reagent_containers/glass/beaker var/list/storage // Holds references to items allowed to be used in the fabrication phase. var/max_storage = 3 // How many items can be jammed into it? var/list/recipes // The list containing the Particle Smasher's recipes. @@ -50,7 +50,7 @@ return list("\The [src] reads an energy level of [energy].") /obj/machinery/particle_smasher/attackby(obj/item/W as obj, mob/user as mob) - if(W.type == /obj/item/device/analyzer) + if(W.type == /obj/item/analyzer) return else if(istype(W, /obj/item/stack/material)) var/obj/item/stack/material/M = W @@ -64,8 +64,8 @@ if(reagent_container) to_chat(user, "\The [src] already has a container attached.") return - if(isrobot(user) && istype(W.loc, /obj/item/weapon/gripper)) - var/obj/item/weapon/gripper/G = W.loc + if(isrobot(user) && istype(W.loc, /obj/item/gripper)) + var/obj/item/gripper/G = W.loc G.drop_item() else user.drop_from_inventory(W) @@ -87,12 +87,12 @@ "You hear a ratchet.") update_icon() return - else if(istype(W, /obj/item/weapon/card/id)) + else if(istype(W, /obj/item/card/id)) to_chat(user, "Swiping \the [W] on \the [src] doesn't seem to do anything...") return ..() - else if(((isrobot(user) && istype(W.loc, /obj/item/weapon/gripper)) || (!isrobot(user) && W.canremove)) && storage.len < max_storage) - if(isrobot(user) && istype(W.loc, /obj/item/weapon/gripper)) - var/obj/item/weapon/gripper/G = W.loc + else if(((isrobot(user) && istype(W.loc, /obj/item/gripper)) || (!isrobot(user) && W.canremove)) && storage.len < max_storage) + if(isrobot(user) && istype(W.loc, /obj/item/gripper)) + var/obj/item/gripper/G = W.loc G.drop_item() else user.drop_from_inventory(W) @@ -271,7 +271,7 @@ /datum/particle_smasher_recipe var/list/reagents // example: = list("pacid" = 5) - var/list/items // example: = list(/obj/item/weapon/tool/crowbar, /obj/item/weapon/welder) Place /foo/bar before /foo. Do not include fruit. Maximum of 3 items. + var/list/items // example: = list(/obj/item/tool/crowbar, /obj/item/welder) Place /foo/bar before /foo. Do not include fruit. Maximum of 3 items. var/recipe_type = PS_RESULT_STACK // Are we producing a stack or an item? var/result = /obj/item/stack/material/iron // The sheet this will produce. @@ -290,7 +290,7 @@ if(istype(container, /obj/machinery/particle_smasher)) var/obj/machinery/particle_smasher/machine = container for(var/obj/O in machine.storage) - if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/grown)) + if(istype(O,/obj/item/reagent_containers/food/snacks/grown)) continue // Fruit is handled in check_fruit(). var/found = 0 for(var/i = 1; i < checklist.len+1; i++) @@ -388,11 +388,11 @@ probability = 1 /datum/particle_smasher_recipe/donkpockets_coal - items = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket) + items = list(/obj/item/reagent_containers/food/snacks/donkpocket) recipe_type = PS_RESULT_ITEM - result = /obj/item/weapon/ore/coal + result = /obj/item/ore/coal required_material = null required_energy_min = 1 @@ -403,12 +403,12 @@ probability = 90 /datum/particle_smasher_recipe/donkpockets_ascend - items = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket) + items = list(/obj/item/reagent_containers/food/snacks/donkpocket) reagents = list("phoron" = 120) recipe_type = PS_RESULT_ITEM - result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket/ascended + result = /obj/item/reagent_containers/food/snacks/donkpocket/ascended required_material = /obj/item/stack/material/uranium required_energy_min = 501 diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index a64f2c78616..4fb610ff322 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -14,7 +14,7 @@ GLOBAL_LIST_EMPTY(smeses) anchored = TRUE unacidable = TRUE use_power = USE_POWER_OFF - circuit = /obj/item/weapon/circuitboard/smes + circuit = /obj/item/circuitboard/smes clicksound = "switch" var/capacity = 5e6 // maximum charge @@ -279,7 +279,7 @@ GLOBAL_LIST_EMPTY(smeses) tgui_interact(user) -/obj/machinery/power/smes/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/power/smes/attackby(var/obj/item/W as obj, var/mob/user as mob) if(default_deconstruction_screwdriver(user, W)) return FALSE @@ -288,7 +288,7 @@ GLOBAL_LIST_EMPTY(smeses) return FALSE if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(!WT.isOn()) to_chat(user, "Turn on \the [WT] first!") return FALSE diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index 902616f9342..4909e3eef16 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -6,7 +6,7 @@ // It also supports RCON System which allows you to operate it remotely, if properly set. //MAGNETIC COILS - These things actually store and transmit power within the SMES. Different types have different -/obj/item/weapon/smes_coil +/obj/item/smes_coil name = "superconductive magnetic coil" desc = "The standard superconductive magnetic coil, with average capacity and I/O rating." icon = 'icons/obj/stock_parts.dmi' @@ -16,7 +16,7 @@ var/IOCapacity = 250000 // 250 kW // 20% Charge Capacity, 60% I/O Capacity. Used for substation/outpost SMESs. -/obj/item/weapon/smes_coil/weak +/obj/item/smes_coil/weak name = "basic superconductive magnetic coil" desc = "A cheaper model of superconductive magnetic coil. Its capacity and I/O rating are considerably lower." icon_state = "smes_coil_weak" @@ -24,7 +24,7 @@ IOCapacity = 150000 // 150 kW // 1000% Charge Capacity, 20% I/O Capacity -/obj/item/weapon/smes_coil/super_capacity +/obj/item/smes_coil/super_capacity name = "superconductive capacitance coil" desc = "A specialised type of superconductive magnetic coil with a significantly stronger containment field, allowing for larger power storage. Its IO rating is much lower, however." icon_state = "smes_coil_capacitance" @@ -32,7 +32,7 @@ IOCapacity = 50000 // 50 kW // 10% Charge Capacity, 400% I/O Capacity. Technically turns SMES into large super capacitor.Ideal for shields. -/obj/item/weapon/smes_coil/super_io +/obj/item/smes_coil/super_io name = "superconductive transmission coil" desc = "A specialised type of superconductive magnetic coil with reduced storage capabilites but vastly improved power transmission capabilities, making it useful in systems which require large throughput." icon_state = "smes_coil_transmission" @@ -46,16 +46,16 @@ // 1M Charge, 150K I/O /obj/machinery/power/smes/buildable/outpost_substation/Initialize() . = ..() - component_parts += new /obj/item/weapon/smes_coil/weak(src) + component_parts += new /obj/item/smes_coil/weak(src) recalc_coils() // This one is pre-installed on engineering shuttle. Allows rapid charging/discharging for easier transport of power to outpost // 11M Charge, 2.5M I/O /obj/machinery/power/smes/buildable/power_shuttle/Initialize() . = ..() - component_parts += new /obj/item/weapon/smes_coil/super_io(src) - component_parts += new /obj/item/weapon/smes_coil/super_io(src) - component_parts += new /obj/item/weapon/smes_coil(src) + component_parts += new /obj/item/smes_coil/super_io(src) + component_parts += new /obj/item/smes_coil/super_io(src) + component_parts += new /obj/item/smes_coil(src) recalc_coils() // Pre-installed and pre-charged SMES hidden from the station, for use in submaps. @@ -131,7 +131,7 @@ // Allows for mapped-in SMESs with larger capacity/IO if(install_coils) for(var/i = 1, i <= cur_coils, i++) - component_parts += new /obj/item/weapon/smes_coil(src) + component_parts += new /obj/item/smes_coil(src) recalc_coils() // Proc: attack_hand() @@ -153,7 +153,7 @@ capacity = 0 input_level_max = 0 output_level_max = 0 - for(var/obj/item/weapon/smes_coil/C in component_parts) + for(var/obj/item/smes_coil/C in component_parts) capacity += C.ChargeCapacity input_level_max += C.IOCapacity output_level_max += C.IOCapacity @@ -300,7 +300,7 @@ // Proc: attackby() // Parameters: 2 (W - object that was used on this machine, user - person which used the object) // Description: Handles tool interaction. Allows deconstruction/upgrading/fixing. -/obj/machinery/power/smes/buildable/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/power/smes/buildable/attackby(var/obj/item/W as obj, var/mob/user as mob) // No more disassembling of overloaded SMESs. You broke it, now enjoy the consequences. if (failing) to_chat(user, "The [src]'s indicator lights are flashing wildly. It seems to be overloaded! Touching it now is probably not a good idea.") @@ -311,7 +311,7 @@ if (..()) // Multitool - change RCON tag - if(istype(W, /obj/item/device/multitool)) + if(istype(W, /obj/item/multitool)) var/newtag = tgui_input_text(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system", "", MAX_NAME_LEN) newtag = sanitize(newtag,MAX_NAME_LEN) if(newtag) @@ -353,7 +353,7 @@ return // Superconducting Magnetic Coil - Upgrade the SMES - else if(istype(W, /obj/item/weapon/smes_coil)) + else if(istype(W, /obj/item/smes_coil)) if (cur_coils < max_coils) if (failure_probability && prob(failure_probability)) diff --git a/code/modules/power/smes_vr.dm b/code/modules/power/smes_vr.dm index 2612fab73b6..f5f6f4afa54 100644 --- a/code/modules/power/smes_vr.dm +++ b/code/modules/power/smes_vr.dm @@ -5,7 +5,7 @@ var/recharge_rate = 10000 var/overlay_icon = 'icons/obj/power_vr.dmi' -/obj/machinery/power/smes/buildable/hybrid/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/power/smes/buildable/hybrid/attackby(var/obj/item/W as obj, var/mob/user as mob) if(W.has_tool_quality(TOOL_SCREWDRIVER) || W.has_tool_quality(TOOL_WIRECUTTER)) to_chat(user,"\The [src] full of weird alien technology that's best not messed with.") return 0 diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 94d46d8581c..10efdc071db 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -56,7 +56,7 @@ GLOBAL_LIST_EMPTY(solars_list) control.remove_panel(src) control = null -/obj/machinery/power/solar/attackby(obj/item/weapon/W, mob/user) +/obj/machinery/power/solar/attackby(obj/item/W, mob/user) if(W.has_tool_quality(TOOL_CROWBAR)) playsound(src, 'sound/machines/click.ogg', 50, 1) @@ -81,8 +81,8 @@ GLOBAL_LIST_EMPTY(solars_list) if(!(stat & BROKEN)) broken() else - new /obj/item/weapon/material/shard(src.loc) - new /obj/item/weapon/material/shard(src.loc) + new /obj/item/material/shard(src.loc) + new /obj/item/material/shard(src.loc) qdel(src) return return @@ -138,13 +138,13 @@ GLOBAL_LIST_EMPTY(solars_list) switch(severity) if(1.0) if(prob(15)) - new /obj/item/weapon/material/shard( src.loc ) + new /obj/item/material/shard( src.loc ) qdel(src) return if(2.0) if (prob(25)) - new /obj/item/weapon/material/shard( src.loc ) + new /obj/item/material/shard( src.loc ) qdel(src) return @@ -203,7 +203,7 @@ GLOBAL_LIST_EMPTY(solars_list) if(!anchored || !isturf(loc)) // You can't pick it up ..() -/obj/item/solar_assembly/attackby(var/obj/item/weapon/W, var/mob/user) +/obj/item/solar_assembly/attackby(var/obj/item/W, var/mob/user) if (!isturf(loc)) return 0 if(!anchored) @@ -235,7 +235,7 @@ GLOBAL_LIST_EMPTY(solars_list) return 1 if(!tracker) - if(istype(W, /obj/item/weapon/tracker_electronics)) + if(istype(W, /obj/item/tracker_electronics)) tracker = 1 user.drop_item() qdel(W) @@ -243,7 +243,7 @@ GLOBAL_LIST_EMPTY(solars_list) return 1 else if(W.has_tool_quality(TOOL_CROWBAR)) - new /obj/item/weapon/tracker_electronics(src.loc) + new /obj/item/tracker_electronics(src.loc) tracker = 0 user.visible_message("[user] takes out the electronics from the solar assembly.") return 1 @@ -418,8 +418,8 @@ GLOBAL_LIST_EMPTY(solars_list) if (src.stat & BROKEN) to_chat(user, span_blue("The broken glass falls out.")) var/obj/structure/frame/A = new /obj/structure/frame/computer( src.loc ) - new /obj/item/weapon/material/shard( src.loc ) - var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A ) + new /obj/item/material/shard( src.loc ) + var/obj/item/circuitboard/solar_control/M = new /obj/item/circuitboard/solar_control( A ) for (var/obj/C in src) C.loc = src.loc A.circuit = M @@ -430,7 +430,7 @@ GLOBAL_LIST_EMPTY(solars_list) else to_chat(user, span_blue("You disconnect the monitor.")) var/obj/structure/frame/A = new /obj/structure/frame/computer( src.loc ) - var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A ) + var/obj/item/circuitboard/solar_control/M = new /obj/item/circuitboard/solar_control( A ) for (var/obj/C in src) C.loc = src.loc A.circuit = M @@ -549,7 +549,7 @@ GLOBAL_LIST_EMPTY(solars_list) // MISC // -/obj/item/weapon/paper/solar +/obj/item/paper/solar name = "paper- 'Going green! Setup your own solar array instructions.'" info = "

Welcome

At greencorps we love the environment, and space. With this package you are able to help mother nature and produce energy without any usage of fossil fuel or phoron! Singularity energy is dangerous while solar energy is safe, which is why it's better. Now here is how you setup your own solar array.

You can make a solar panel by wrenching the solar assembly onto a cable node. Adding a glass panel, reinforced or regular glass will do, will finish the construction of your solar panel. It is that easy!

Now after setting up 19 more of these solar panels you will want to create a solar tracker to keep track of our mother nature's gift, the SSsun.sun. These are the same steps as before except you insert the tracker equipment circuit into the assembly before performing the final step of adding the glass. You now have a tracker! Now the last step is to add a computer to calculate the SSsun.sun's movements and to send commands to the solar panels to change direction with the SSsun.sun. Setting up the solar computer is the same as setting up any computer, so you should have no trouble in doing that. You do need to put a wire node under the computer, and the wire needs to be connected to the tracker.

Congratulations, you should have a working solar array. If you are having trouble, here are some tips. Make sure all solar equipment are on a cable node, even the computer. You can always deconstruct your creations if you make a mistake.

That's all to it, be safe, be green!

" diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index e4d976a3b69..50dc4933ed1 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -456,7 +456,7 @@ return data -/obj/machinery/power/supermatter/attackby(obj/item/weapon/W as obj, mob/living/user as mob) +/obj/machinery/power/supermatter/attackby(obj/item/W as obj, mob/living/user as mob) user.visible_message("\The [user] touches \a [W] to \the [src] as a silence fills the room...",\ "You touch \the [W] to \the [src] when everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\ "Everything suddenly goes silent.") diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 8ff5dfe7532..e12372c299b 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -11,7 +11,7 @@ can_buckle = TRUE buckle_lying = FALSE - circuit = /obj/item/weapon/circuitboard/tesla_coil + circuit = /obj/item/circuitboard/tesla_coil var/power_loss = 2 var/input_power_multiplier = 1 @@ -44,7 +44,7 @@ /obj/machinery/power/tesla_coil/RefreshParts() var/power_multiplier = 0 zap_cooldown = 100 - for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts) + for(var/obj/item/stock_parts/capacitor/C in component_parts) power_multiplier += C.rating zap_cooldown -= (C.rating * 20) input_power_multiplier = power_multiplier @@ -110,7 +110,7 @@ icon_state = "relay0" icontype = "relay" - circuit = /obj/item/weapon/circuitboard/tesla_coil + circuit = /obj/item/circuitboard/tesla_coil power_loss = 1 input_power_multiplier = 0 @@ -120,7 +120,7 @@ /obj/machinery/power/tesla_coil/relay/RefreshParts() ..() var/relay_multiplier - for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts) + for(var/obj/item/stock_parts/capacitor/C in component_parts) relay_multiplier += C.rating relay_efficiency = 0.85 + (0.05 * relay_multiplier) @@ -136,14 +136,14 @@ icon_state = "prism0" icontype = "prism" - circuit = /obj/item/weapon/circuitboard/tesla_coil + circuit = /obj/item/circuitboard/tesla_coil var/split_count = 1 /obj/machinery/power/tesla_coil/splitter/RefreshParts() ..() split_count = 0 - for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts) + for(var/obj/item/stock_parts/capacitor/C in component_parts) split_count += C.rating /obj/machinery/power/tesla_coil/splitter/coil_act(var/power) @@ -161,14 +161,14 @@ icon_state = "amp0" icontype = "amp" - circuit = /obj/item/weapon/circuitboard/tesla_coil + circuit = /obj/item/circuitboard/tesla_coil var/amp_eff = 2 /obj/machinery/power/tesla_coil/amplifier/RefreshParts() ..() var/amp_eff = 1 - for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts) + for(var/obj/item/stock_parts/capacitor/C in component_parts) amp_eff += C.rating /obj/machinery/power/tesla_coil/amplifier/coil_act(var/power) @@ -184,14 +184,14 @@ icon_state = "recaster0" icontype = "recaster" - circuit = /obj/item/weapon/circuitboard/tesla_coil + circuit = /obj/item/circuitboard/tesla_coil var/zap_range = 6 /obj/machinery/power/tesla_coil/recaster/RefreshParts() ..() var/zap_range = 5 - for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts) + for(var/obj/item/stock_parts/capacitor/C in component_parts) zap_range += C.rating /obj/machinery/power/tesla_coil/recaster/coil_act(var/power) @@ -208,14 +208,14 @@ icon_state = "collector0" icontype = "collector" - circuit = /obj/item/weapon/circuitboard/tesla_coil + circuit = /obj/item/circuitboard/tesla_coil var/collect_eff = 0.8 /obj/machinery/power/tesla_coil/collector/RefreshParts() ..() var/collect_mod = 0 - for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts) + for(var/obj/item/stock_parts/capacitor/C in component_parts) collect_mod += C.rating collect_eff = 0.75 + collect_mod*0.05 @@ -235,7 +235,7 @@ can_buckle = TRUE buckle_lying = FALSE - circuit = /obj/item/weapon/circuitboard/grounding_rod + circuit = /obj/item/circuitboard/grounding_rod /obj/machinery/power/grounding_rod/examine() . = ..() diff --git a/code/modules/power/tesla/telsa_construction.dm b/code/modules/power/tesla/telsa_construction.dm index 34fe83ec89d..26c86321858 100644 --- a/code/modules/power/tesla/telsa_construction.dm +++ b/code/modules/power/tesla/telsa_construction.dm @@ -3,23 +3,23 @@ ////////////////////////// // Tesla coils are built as machines using a circuit researchable in RnD -/obj/item/weapon/circuitboard/tesla_coil +/obj/item/circuitboard/tesla_coil name = T_BOARD("tesla coil") build_path = /obj/machinery/power/tesla_coil board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_MAGNET = 2, TECH_POWER = 4) - req_components = list(/obj/item/weapon/stock_parts/capacitor = 1) + req_components = list(/obj/item/stock_parts/capacitor = 1) /datum/design/circuit/tesla_coil name = "Machine Design (Tesla Coil Board)" desc = "The circuit board for a tesla coil." id = "tesla_coil" - build_path = /obj/item/weapon/circuitboard/tesla_coil + build_path = /obj/item/circuitboard/tesla_coil req_tech = list(TECH_MAGNET = 2, TECH_POWER = 4) sort_string = "MAAAC" // Grounding rods can be built as machines using a circuit made in an autolathe. -/obj/item/weapon/circuitboard/grounding_rod +/obj/item/circuitboard/grounding_rod name = T_BOARD("grounding rod") build_path = /obj/machinery/power/grounding_rod board_type = new /datum/frame/frame_types/machine @@ -29,11 +29,11 @@ /datum/category_item/autolathe/engineering/grounding_rod name = "grounding rod electronics" - path = /obj/item/weapon/circuitboard/grounding_rod + path = /obj/item/circuitboard/grounding_rod // SPECIAL BOARDS BELOW -/obj/item/weapon/circuitboard/tesla_coil/attackby(obj/item/I as obj, mob/user as mob) +/obj/item/circuitboard/tesla_coil/attackby(obj/item/I as obj, mob/user as mob) if(I.has_tool_quality(TOOL_MULTITOOL)) var/result = tgui_input_list(user, "What do you want to reconfigure the board to?", "Multitool-Circuitboard interface", list("Standard", "Relay", "Prism", "Amplifier", "Recaster", "Collector")) switch(result) diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 72a4cab7178..7c773b2ab33 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -51,7 +51,7 @@ if(powernet && (powernet == control.powernet)) //update if we're still in the same powernet control.cdir = angle -/obj/machinery/power/tracker/attackby(var/obj/item/weapon/W, var/mob/user) +/obj/machinery/power/tracker/attackby(var/obj/item/W, var/mob/user) if(W.has_tool_quality(TOOL_CROWBAR)) playsound(src, 'sound/machines/click.ogg', 50, 1) @@ -69,7 +69,7 @@ // Tracker Electronic -/obj/item/weapon/tracker_electronics +/obj/item/tracker_electronics name = "tracker electronics" icon = 'icons/obj/doors/door_assembly.dmi' diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 99f24bb8452..d7d61a3ad18 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -29,7 +29,7 @@ anchored = TRUE density = TRUE can_atmos_pass = ATMOS_PASS_PROC - circuit = /obj/item/weapon/circuitboard/machine/power_compressor + circuit = /obj/item/circuitboard/machine/power_compressor var/obj/machinery/power/turbine/turbine var/datum/gas_mixture/gas_contained var/turf/simulated/inturf @@ -47,7 +47,7 @@ icon_state = "turbine" anchored = TRUE density = TRUE - circuit = /obj/item/weapon/circuitboard/machine/power_turbine + circuit = /obj/item/circuitboard/machine/power_turbine var/obj/machinery/compressor/compressor var/turf/simulated/outturf var/lastgen @@ -58,25 +58,25 @@ desc = "A computer to remotely control a gas turbine." icon_keyboard = "tech_key" icon_screen = "turbinecomp" - circuit = /obj/item/weapon/circuitboard/turbine_control + circuit = /obj/item/circuitboard/turbine_control var/obj/machinery/compressor/compressor var/list/obj/machinery/door/blast/doors var/id = 0 var/door_status = 0 -/obj/item/weapon/circuitboard/machine/power_compressor +/obj/item/circuitboard/machine/power_compressor name = T_BOARD("power compressor") build_path = /obj/machinery/compressor board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_MATERIAL = 4, TECH_POWER = 2) - req_components = list(/obj/item/stack/cable_coil = 5, /obj/item/weapon/stock_parts/manipulator = 6) + req_components = list(/obj/item/stack/cable_coil = 5, /obj/item/stock_parts/manipulator = 6) -/obj/item/weapon/circuitboard/machine/power_turbine +/obj/item/circuitboard/machine/power_turbine name = T_BOARD("power turbine") build_path = /obj/machinery/power/turbine board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_ENGINEERING = 2, TECH_POWER = 4) - req_components = list(/obj/item/stack/cable_coil = 5, /obj/item/weapon/stock_parts/capacitor = 6) + req_components = list(/obj/item/stack/cable_coil = 5, /obj/item/stock_parts/capacitor = 6) ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Compressor @@ -108,7 +108,7 @@ /obj/machinery/compressor/RefreshParts() var/E = 0 - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) E += M.rating efficiency = E / 6 @@ -123,7 +123,7 @@ return if(default_deconstruction_crowbar(user, W)) return - if(istype(W, /obj/item/device/multitool)) + if(istype(W, /obj/item/multitool)) var/new_ident = tgui_input_text(usr, "Enter a new ident tag.", name, comp_id, MAX_NAME_LEN) new_ident = sanitize(new_ident,MAX_NAME_LEN) if(new_ident && user.Adjacent(src)) @@ -131,7 +131,7 @@ return return ..() -/obj/machinery/compressor/default_unfasten_wrench(var/mob/user, var/obj/item/weapon/W, var/time = 20) +/obj/machinery/compressor/default_unfasten_wrench(var/mob/user, var/obj/item/W, var/time = 20) if((. = ..())) turbine = null if(anchored) @@ -205,7 +205,7 @@ /obj/machinery/power/turbine/RefreshParts() var/P = 0 - for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts) + for(var/obj/item/stock_parts/capacitor/C in component_parts) P += C.rating productivity = P / 6 @@ -229,7 +229,7 @@ return return ..() -/obj/machinery/power/turbine/default_unfasten_wrench(var/mob/user, var/obj/item/weapon/W, var/time = 20) +/obj/machinery/power/turbine/default_unfasten_wrench(var/mob/user, var/obj/item/W, var/time = 20) if((. = ..())) compressor = null if(anchored) @@ -337,7 +337,7 @@ doors += P /obj/machinery/computer/turbine_computer/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/device/multitool)) + if(istype(W, /obj/item/multitool)) var/new_ident = tgui_input_text(usr, "Enter a new ident tag.", name, id, MAX_NAME_LEN) new_ident = sanitize(new_ident,MAX_NAME_LEN) if(new_ident && user.Adjacent(src)) diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index b9693bf59dd..9d845c1eb8c 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -135,7 +135,7 @@ stored_ammo += new ammo_type(src) update_icon() -/obj/item/ammo_magazine/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/ammo_magazine/attackby(obj/item/W as obj, mob/user as mob) if(istype(W, /obj/item/ammo_casing)) var/obj/item/ammo_casing/C = W if(C.caliber != caliber) diff --git a/code/modules/projectiles/ammunition/magnetic.dm b/code/modules/projectiles/ammunition/magnetic.dm index 3b6bd97c88d..2bf94edb7e3 100644 --- a/code/modules/projectiles/ammunition/magnetic.dm +++ b/code/modules/projectiles/ammunition/magnetic.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/magnetic_ammo +/obj/item/magnetic_ammo name = "flechette magazine" desc = "A magazine containing steel flechettes." icon = 'icons/obj/ammo.dmi' @@ -9,16 +9,16 @@ var/remaining = 9 preserve_item = 1 -/obj/item/weapon/magnetic_ammo/examine(mob/user) +/obj/item/magnetic_ammo/examine(mob/user) . = ..() . += "There [(remaining == 1)? "is" : "are"] [remaining] flechette\s left!" -/obj/item/weapon/magnetic_ammo/pistol +/obj/item/magnetic_ammo/pistol name = "flechette magazine (small)" desc = "A magazine containing smaller steel flechettes, intended for a pistol." icon_state = "caseless-mag-short" -/obj/item/weapon/magnetic_ammo/pistol/khi +/obj/item/magnetic_ammo/pistol/khi name = "flechette magazine (small, khi)" desc = "A magazine containing smaller carbyne flechettes, intended for a pistol." icon_state = "caseless-mag-short-alt" diff --git a/code/modules/projectiles/ammunition/smartmag.dm b/code/modules/projectiles/ammunition/smartmag.dm index e72e78fb364..390e2949b72 100644 --- a/code/modules/projectiles/ammunition/smartmag.dm +++ b/code/modules/projectiles/ammunition/smartmag.dm @@ -20,9 +20,9 @@ var/production_modifier = 2 // Multiplier on the ammo_casing's matter cost var/production_delay = 75 // If we're in a gun, how long since it last shot do we need to wait before making bullets? - var/obj/item/weapon/gun/holding_gun = null // What gun are we in, if any? + var/obj/item/gun/holding_gun = null // What gun are we in, if any? - var/obj/item/weapon/cell/device/attached_cell = null // What cell are we using, if any? + var/obj/item/cell/device/attached_cell = null // What cell are we using, if any? var/emagged = 0 // If you emag the smart mag, you can get the bullets out by clicking it @@ -36,7 +36,7 @@ /obj/item/ammo_magazine/smart/process() if(!holding_gun) // Yes, this is awful, sorry. Don't know a better way to figure out if we've been moved into or out of a gun. - if(istype(src.loc, /obj/item/weapon/gun)) + if(istype(src.loc, /obj/item/gun)) holding_gun = src.loc if(caliber && ammo_type && attached_cell) @@ -73,7 +73,7 @@ return FALSE /obj/item/ammo_magazine/smart/attackby(var/obj/item/I as obj, mob/user) - if(istype(I, /obj/item/weapon/cell/device)) + if(istype(I, /obj/item/cell/device)) if(attached_cell) to_chat(user, "\The [src] already has a [attached_cell.name] attached.") return diff --git a/code/modules/projectiles/broken.dm b/code/modules/projectiles/broken.dm index 57809fdbd12..0c7e23feb4d 100644 --- a/code/modules/projectiles/broken.dm +++ b/code/modules/projectiles/broken.dm @@ -1,15 +1,15 @@ -/obj/item/weapon/broken_gun +/obj/item/broken_gun desc = "The remains of an unfortunate firearm." - var/obj/item/weapon/gun/my_guntype = null + var/obj/item/gun/my_guntype = null // Materials needed for repair. Associative list, path - number of items var/list/material_needs var/do_rotation = TRUE -/obj/item/weapon/broken_gun/New(var/newloc, var/path) +/obj/item/broken_gun/New(var/newloc, var/path) ..() if(path) if(!setup_gun(path)) @@ -17,13 +17,13 @@ return setup_repair_needs() -/obj/item/weapon/broken_gun/Initialize() +/obj/item/broken_gun/Initialize() . = ..() spawn(30 SECONDS) if(!my_guntype && !QDELETED(src)) qdel(src) -/obj/item/weapon/broken_gun/examine(mob/user) +/obj/item/broken_gun/examine(mob/user) . = ..() spawn() if(get_dist(get_turf(user),get_turf(src)) <= 1) @@ -45,7 +45,7 @@ res_name = initial(res.name) to_chat(user, "- x [material_needs[res]] [res_name]") -/obj/item/weapon/broken_gun/proc/setup_gun(var/obj/item/weapon/gun/path) +/obj/item/broken_gun/proc/setup_gun(var/obj/item/gun/path) if(ispath(path)) name = "[pick("busted", "broken", "shattered", "scrapped")] [initial(path.name)]" icon = initial(path.icon) @@ -62,7 +62,7 @@ return FALSE -/obj/item/weapon/broken_gun/proc/setup_repair_needs() +/obj/item/broken_gun/proc/setup_repair_needs() if(!LAZYLEN(material_needs)) material_needs = list() @@ -71,24 +71,24 @@ material_needs[chosen_mat] = rand(1, 3) if(prob(30)) - var/component_needed = pick(/obj/item/weapon/stock_parts/gear,/obj/item/weapon/stock_parts/spring,/obj/item/weapon/stock_parts/manipulator) + var/component_needed = pick(/obj/item/stock_parts/gear,/obj/item/stock_parts/spring,/obj/item/stock_parts/manipulator) material_needs[component_needed] = rand(1,3) - if(ispath(my_guntype, /obj/item/weapon/gun/energy) && prob(25)) - var/component_needed = pick(/obj/item/stack/cable_coil, /obj/item/weapon/stock_parts/scanning_module,/obj/item/weapon/stock_parts/capacitor) + if(ispath(my_guntype, /obj/item/gun/energy) && prob(25)) + var/component_needed = pick(/obj/item/stack/cable_coil, /obj/item/stock_parts/scanning_module,/obj/item/stock_parts/capacitor) material_needs[component_needed] = rand(1,3) - if(ispath(my_guntype, /obj/item/weapon/gun/launcher) && prob(50)) - var/component_needed = pick(/obj/item/weapon/tape_roll, /obj/item/stack/rods, /obj/item/weapon/handcuffs/cable) + if(ispath(my_guntype, /obj/item/gun/launcher) && prob(50)) + var/component_needed = pick(/obj/item/tape_roll, /obj/item/stack/rods, /obj/item/handcuffs/cable) material_needs[component_needed] = 1 - if(ispath(my_guntype, /obj/item/weapon/gun/magnetic) && prob(70)) - var/component_needed = pick(/obj/item/weapon/smes_coil, /obj/item/device/assembly/prox_sensor, /obj/item/weapon/module/power_control) + if(ispath(my_guntype, /obj/item/gun/magnetic) && prob(70)) + var/component_needed = pick(/obj/item/smes_coil, /obj/item/assembly/prox_sensor, /obj/item/module/power_control) material_needs[component_needed] = 1 material_needs[/obj/item/stack/material/steel] = rand(1,5) -/obj/item/weapon/broken_gun/attackby(obj/item/W as obj, mob/user as mob) +/obj/item/broken_gun/attackby(obj/item/W as obj, mob/user as mob) if(can_repair_with(W, user)) if(do_after(user, (rand() * 10 SECONDS) + 5 SECONDS)) repair_with(W, user) @@ -96,7 +96,7 @@ ..() -/obj/item/weapon/broken_gun/proc/can_repair_with(obj/item/I, mob/user) +/obj/item/broken_gun/proc/can_repair_with(obj/item/I, mob/user) for(var/path in material_needs) if(ispath(path) && istype(I, path)) if(material_needs[path] > 0) @@ -111,7 +111,7 @@ return FALSE -/obj/item/weapon/broken_gun/proc/repair_with(obj/item/I, mob/user) +/obj/item/broken_gun/proc/repair_with(obj/item/I, mob/user) for(var/path in material_needs) if(ispath(path) && istype(I, path)) if(material_needs[path] > 0) @@ -131,7 +131,7 @@ return -/obj/item/weapon/broken_gun/proc/check_complete_repair(mob/user) +/obj/item/broken_gun/proc/check_complete_repair(mob/user) var/fully_repaired = TRUE for(var/resource in material_needs) if(material_needs[resource] > 0) diff --git a/code/modules/projectiles/brokenguns/energy.dm b/code/modules/projectiles/brokenguns/energy.dm index 6427e89c274..6da2e3ee51c 100644 --- a/code/modules/projectiles/brokenguns/energy.dm +++ b/code/modules/projectiles/brokenguns/energy.dm @@ -1,9 +1,9 @@ -/obj/item/weapon/broken_gun/laserrifle/New(var/newloc) - ..(newloc, /obj/item/weapon/gun/energy/laser/empty) +/obj/item/broken_gun/laserrifle/New(var/newloc) + ..(newloc, /obj/item/gun/energy/laser/empty) -/obj/item/weapon/broken_gun/laser_retro/New(var/newloc) - ..(newloc, /obj/item/weapon/gun/energy/retro/empty) +/obj/item/broken_gun/laser_retro/New(var/newloc) + ..(newloc, /obj/item/gun/energy/retro/empty) -/obj/item/weapon/broken_gun/ionrifle/New(var/newloc) - ..(newloc, /obj/item/weapon/gun/energy/ionrifle/empty) +/obj/item/broken_gun/ionrifle/New(var/newloc) + ..(newloc, /obj/item/gun/energy/ionrifle/empty) diff --git a/code/modules/projectiles/brokenguns/launcher.dm b/code/modules/projectiles/brokenguns/launcher.dm index a66449de78d..c4f96015862 100644 --- a/code/modules/projectiles/brokenguns/launcher.dm +++ b/code/modules/projectiles/brokenguns/launcher.dm @@ -1,3 +1,3 @@ -/obj/item/weapon/broken_gun/grenadelauncher/New(var/newloc) - ..(newloc, /obj/item/weapon/gun/launcher/grenade) +/obj/item/broken_gun/grenadelauncher/New(var/newloc) + ..(newloc, /obj/item/gun/launcher/grenade) diff --git a/code/modules/projectiles/brokenguns/magnetic.dm b/code/modules/projectiles/brokenguns/magnetic.dm index dd1c647fd8e..e8ad5083949 100644 --- a/code/modules/projectiles/brokenguns/magnetic.dm +++ b/code/modules/projectiles/brokenguns/magnetic.dm @@ -1,3 +1,3 @@ -/obj/item/weapon/broken_gun/flechette/New(var/newloc) - ..(newloc, /obj/item/weapon/gun/magnetic/railgun/flechette) +/obj/item/broken_gun/flechette/New(var/newloc) + ..(newloc, /obj/item/gun/magnetic/railgun/flechette) diff --git a/code/modules/projectiles/brokenguns/projectile.dm b/code/modules/projectiles/brokenguns/projectile.dm index 741e4bf087d..d0c72dfbd70 100644 --- a/code/modules/projectiles/brokenguns/projectile.dm +++ b/code/modules/projectiles/brokenguns/projectile.dm @@ -1,18 +1,18 @@ -/obj/item/weapon/broken_gun/c20r/New(var/newloc) - ..(newloc, /obj/item/weapon/gun/projectile/automatic/c20r/empty) +/obj/item/broken_gun/c20r/New(var/newloc) + ..(newloc, /obj/item/gun/projectile/automatic/c20r/empty) -/obj/item/weapon/broken_gun/silenced45/New(var/newloc) - ..(newloc, /obj/item/weapon/gun/projectile/silenced/empty) +/obj/item/broken_gun/silenced45/New(var/newloc) + ..(newloc, /obj/item/gun/projectile/silenced/empty) -/obj/item/weapon/broken_gun/pumpshotgun/New(var/newloc) - ..(newloc, /obj/item/weapon/gun/projectile/shotgun/pump/empty) +/obj/item/broken_gun/pumpshotgun/New(var/newloc) + ..(newloc, /obj/item/gun/projectile/shotgun/pump/empty) -/obj/item/weapon/broken_gun/pumpshotgun_combat/New(var/newloc) - ..(newloc, /obj/item/weapon/gun/projectile/shotgun/pump/combat/empty) +/obj/item/broken_gun/pumpshotgun_combat/New(var/newloc) + ..(newloc, /obj/item/gun/projectile/shotgun/pump/combat/empty) -/obj/item/weapon/broken_gun/z8/New(var/newloc) - ..(newloc, /obj/item/weapon/gun/projectile/automatic/z8/empty) +/obj/item/broken_gun/z8/New(var/newloc) + ..(newloc, /obj/item/gun/projectile/automatic/z8/empty) -/obj/item/weapon/broken_gun/dartgun/New(var/newloc) - ..(newloc, /obj/item/weapon/gun/projectile/dartgun) +/obj/item/broken_gun/dartgun/New(var/newloc) + ..(newloc, /obj/item/gun/projectile/dartgun) diff --git a/code/modules/projectiles/dnalocking.dm b/code/modules/projectiles/dnalocking.dm index 3b966332ace..fb81b25cb24 100644 --- a/code/modules/projectiles/dnalocking.dm +++ b/code/modules/projectiles/dnalocking.dm @@ -13,7 +13,7 @@ var/exploding = 0 -/obj/item/weapon/gun/proc/get_dna(mob/user) +/obj/item/gun/proc/get_dna(mob/user) var/mob/living/M = user if(!attached_lock.controller_lock) @@ -31,13 +31,13 @@ to_chat(M, "\The [src] buzzes and displays a locked symbol. It is not allowing DNA samples at this time.") return 0 -/obj/item/weapon/gun/verb/give_dna() +/obj/item/gun/verb/give_dna() set name = "Give DNA" set category = "Object" set src in usr get_dna(usr) -/obj/item/weapon/gun/proc/clear_dna(mob/user) +/obj/item/gun/proc/clear_dna(mob/user) var/mob/living/M = user if(!attached_lock.controller_lock) if(!authorized_user(M)) @@ -56,13 +56,13 @@ to_chat(M, "\The [src] buzzes and displays a locked symbol. It is not allowing DNA modifcation at this time.") return 0 -/obj/item/weapon/gun/verb/remove_dna() +/obj/item/gun/verb/remove_dna() set name = "Remove DNA" set category = "Object" set src in usr clear_dna(usr) -/obj/item/weapon/gun/proc/toggledna(mob/user) +/obj/item/gun/proc/toggledna(mob/user) var/mob/living/M = user if(authorized_user(M) && user.dna == attached_lock.controller_dna) if(!attached_lock.controller_lock) @@ -74,13 +74,13 @@ else to_chat(M, "\The [src] buzzes and displays an invalid user symbol.") -/obj/item/weapon/gun/verb/allow_dna() +/obj/item/gun/verb/allow_dna() set name = "Toggle DNA Samples Allowance" set category = "Object" set src in usr toggledna(usr) -/obj/item/weapon/gun/proc/authorized_user(mob/user) +/obj/item/gun/proc/authorized_user(mob/user) if(!attached_lock.stored_dna || !attached_lock.stored_dna.len) return 1 if(!(user.dna in attached_lock.stored_dna)) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 068878ab3c6..0c1e3e6133d 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -9,7 +9,7 @@ var/name = "default" var/list/settings = list() -/datum/firemode/New(obj/item/weapon/gun/gun, list/properties = null) +/datum/firemode/New(obj/item/gun/gun, list/properties = null) ..() if(!properties) return @@ -23,12 +23,12 @@ else settings[propname] = propvalue -/datum/firemode/proc/apply_to(obj/item/weapon/gun/gun) +/datum/firemode/proc/apply_to(obj/item/gun/gun) for(var/propname in settings) gun.vars[propname] = settings[propname] //Parent gun type. Guns are weapons that can be aimed at mobs and act over a distance -/obj/item/weapon/gun +/obj/item/gun name = "gun" desc = "Its a gun. It's pretty terrible, though." icon = 'icons/obj/gun.dmi' @@ -107,13 +107,13 @@ var/flight_x_offset = 0 var/flight_y_offset = 0 -/obj/item/weapon/gun/CtrlClick(mob/user) +/obj/item/gun/CtrlClick(mob/user) if(can_flashlight && ishuman(user) && src.loc == usr && !user.incapacitated(INCAPACITATION_ALL)) toggle_flashlight() else return ..() -/obj/item/weapon/gun/proc/toggle_flashlight() +/obj/item/gun/proc/toggle_flashlight() if(gun_light) set_light(0) gun_light = FALSE @@ -125,7 +125,7 @@ update_icon() //VOREStation Add End -/obj/item/weapon/gun/New() +/obj/item/gun/New() ..() for(var/i in 1 to firemodes.len) firemodes[i] = new /datum/firemode(src, firemodes[i]) @@ -136,11 +136,11 @@ if(dna_lock) attached_lock = new /obj/item/dnalockingchip(src) if(!dna_lock) - verbs -= /obj/item/weapon/gun/verb/remove_dna - verbs -= /obj/item/weapon/gun/verb/give_dna - verbs -= /obj/item/weapon/gun/verb/allow_dna + verbs -= /obj/item/gun/verb/remove_dna + verbs -= /obj/item/gun/verb/give_dna + verbs -= /obj/item/gun/verb/allow_dna -/obj/item/weapon/gun/update_twohanding() +/obj/item/gun/update_twohanding() if(one_handed_penalty) var/mob/living/M = loc if(istype(M)) @@ -153,7 +153,7 @@ update_icon() // In case item_state is set somewhere else. ..() -/obj/item/weapon/gun/update_held_icon() +/obj/item/gun/update_held_icon() if(wielded_item_state) var/mob/living/M = loc if(istype(M)) @@ -169,7 +169,7 @@ //Checks whether a given mob can use the gun //Any checks that shouldn't result in handle_click_empty() being called if they fail should go here. //Otherwise, if you want handle_click_empty() to be called, check in consume_next_projectile() and return null there. -/obj/item/weapon/gun/proc/special_check(var/mob/user) +/obj/item/gun/proc/special_check(var/mob/user) if(!istype(user, /mob/living)) return 0 @@ -215,11 +215,11 @@ return 0 return 1 -/obj/item/weapon/gun/emp_act(severity) +/obj/item/gun/emp_act(severity) for(var/obj/O in contents) O.emp_act(severity) -/obj/item/weapon/gun/afterattack(atom/A, mob/living/user, adjacent, params) +/obj/item/gun/afterattack(atom/A, mob/living/user, adjacent, params) if(adjacent) return //A is adjacent, is the user, or is on the user's person if(!user.aiming) @@ -255,7 +255,7 @@ Fire(A,user,params) //Otherwise, fire normally. */ -/obj/item/weapon/gun/attack(atom/A, mob/living/user, def_zone) +/obj/item/gun/attack(atom/A, mob/living/user, def_zone) if (A == user && user.zone_sel.selecting == O_MOUTH && !mouthshoot) handle_suicide(user) else if(user.a_intent == I_HURT) //point blank shooting @@ -267,7 +267,7 @@ else return ..() //Pistolwhippin' -/obj/item/weapon/gun/attackby(var/obj/item/A as obj, mob/user as mob) +/obj/item/gun/attackby(var/obj/item/A as obj, mob/user as mob) if(istype(A, /obj/item/dnalockingchip)) if(dna_lock) to_chat(user, "\The [src] already has a [attached_lock].") @@ -277,9 +277,9 @@ A.loc = src attached_lock = A dna_lock = 1 - verbs += /obj/item/weapon/gun/verb/remove_dna - verbs += /obj/item/weapon/gun/verb/give_dna - verbs += /obj/item/weapon/gun/verb/allow_dna + verbs += /obj/item/gun/verb/remove_dna + verbs += /obj/item/gun/verb/give_dna + verbs += /obj/item/gun/verb/allow_dna return if(A.has_tool_quality(TOOL_SCREWDRIVER)) @@ -291,14 +291,14 @@ user.put_in_hands(attached_lock) dna_lock = 0 attached_lock = null - verbs -= /obj/item/weapon/gun/verb/remove_dna - verbs -= /obj/item/weapon/gun/verb/give_dna - verbs -= /obj/item/weapon/gun/verb/allow_dna + verbs -= /obj/item/gun/verb/remove_dna + verbs -= /obj/item/gun/verb/give_dna + verbs -= /obj/item/gun/verb/allow_dna else to_chat(user, "\The [src] is not accepting modifications at this time.") ..() -/obj/item/weapon/gun/emag_act(var/remaining_charges, var/mob/user) +/obj/item/gun/emag_act(var/remaining_charges, var/mob/user) if(dna_lock && attached_lock.controller_lock) to_chat(user, "You short circuit the internal locking mechanisms of \the [src]!") attached_lock.controller_dna = null @@ -306,7 +306,7 @@ attached_lock.stored_dna = list() return 1 -/obj/item/weapon/gun/MouseDrop(obj/over_object as obj) +/obj/item/gun/MouseDrop(obj/over_object as obj) if(!canremove) return @@ -338,7 +338,7 @@ usr.put_in_l_hand(src) src.add_fingerprint(usr) -/obj/item/weapon/gun/proc/Fire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0) +/obj/item/gun/proc/Fire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0) if(!user || !target) return if(target.z != user.z) return @@ -440,7 +440,7 @@ user.hud_used.update_ammo_hud(user, src) // Similar to the above proc, but does not require a user, which is ideal for things like turrets. -/obj/item/weapon/gun/proc/Fire_userless(atom/target) +/obj/item/gun/proc/Fire_userless(atom/target) if(!target) return @@ -514,11 +514,11 @@ set_light(0) //obtains the next projectile to fire -/obj/item/weapon/gun/proc/consume_next_projectile() +/obj/item/gun/proc/consume_next_projectile() return null //used by aiming code -/obj/item/weapon/gun/proc/can_hit(atom/target as mob, var/mob/living/user as mob) +/obj/item/gun/proc/can_hit(atom/target as mob, var/mob/living/user as mob) if(!special_check(user)) return 2 //just assume we can shoot through glass and stuff. No big deal, the player can just choose to not target someone @@ -527,7 +527,7 @@ return 1 // Magic numbers are fun. //called if there was no projectile to shoot -/obj/item/weapon/gun/proc/handle_click_empty(mob/user) +/obj/item/gun/proc/handle_click_empty(mob/user) if (user) user.visible_message("*click click*", "*click*") user.hud_used.update_ammo_hud(user, src) @@ -537,7 +537,7 @@ // Called when the user is about to fire. // Moved from handle_post_fire() because if using a laser, the message for when someone got shot would show up before the firing message. -/obj/item/weapon/gun/proc/handle_firing_text(mob/user, atom/target, pointblank = FALSE, reflex = FALSE) +/obj/item/gun/proc/handle_firing_text(mob/user, atom/target, pointblank = FALSE, reflex = FALSE) if(silenced) to_chat(user, "You fire \the [src][pointblank ? " point blank at \the [target]":""][reflex ? " by reflex":""]") for(var/mob/living/L in oview(2,user)) @@ -563,7 +563,7 @@ add_attack_logs(user, target_for_log, "Fired gun '[src.name]' ([reflex ? "REFLEX" : "MANUAL"])") //called after successfully firing -/obj/item/weapon/gun/proc/handle_post_fire(mob/user, atom/target, var/pointblank=0, var/reflex=0) +/obj/item/gun/proc/handle_post_fire(mob/user, atom/target, var/pointblank=0, var/reflex=0) if(fire_anim) flick(fire_anim, src) @@ -599,7 +599,7 @@ shake_camera(user, recoil+1, recoil) update_icon() -/obj/item/weapon/gun/proc/process_point_blank(obj/projectile, mob/user, atom/target) +/obj/item/gun/proc/process_point_blank(obj/projectile, mob/user, atom/target) var/obj/item/projectile/P = projectile if(!istype(P)) return //default behaviour only applies to true projectiles @@ -612,7 +612,7 @@ var/mob/M = target if(M.grabbed_by.len) var/grabstate = 0 - for(var/obj/item/weapon/grab/G in M.grabbed_by) + for(var/obj/item/grab/G in M.grabbed_by) grabstate = max(grabstate, G.state) if(grabstate >= GRAB_NECK) damage_mult = 2.5 @@ -620,7 +620,7 @@ damage_mult = 1.5 P.damage *= damage_mult -/obj/item/weapon/gun/proc/process_accuracy(obj/projectile, mob/living/user, atom/target, var/burst, var/held_twohanded) +/obj/item/gun/proc/process_accuracy(obj/projectile, mob/living/user, atom/target, var/burst, var/held_twohanded) var/obj/item/projectile/P = projectile if(!istype(P)) return //default behaviour only applies to true projectiles @@ -662,7 +662,7 @@ P.accuracy -= 35 //does the actual launching of the projectile -/obj/item/weapon/gun/proc/process_projectile(obj/projectile, mob/user, atom/target, var/target_zone, var/params=null) +/obj/item/gun/proc/process_projectile(obj/projectile, mob/user, atom/target, var/target_zone, var/params=null) var/obj/item/projectile/P = projectile if(!istype(P)) return FALSE //default behaviour only applies to true projectiles @@ -682,7 +682,7 @@ return launched -/obj/item/weapon/gun/proc/play_fire_sound(var/mob/user, var/obj/item/projectile/P) +/obj/item/gun/proc/play_fire_sound(var/mob/user, var/obj/item/projectile/P) var/shot_sound = fire_sound if(!shot_sound && istype(P) && P.fire_sound) // If the gun didn't have a fire_sound, but the projectile exists, and has a sound... @@ -696,9 +696,9 @@ playsound(src, shot_sound, 50, 1) //Suicide handling. -/obj/item/weapon/gun/var/mouthshoot = 0 //To stop people from suiciding twice... >.> +/obj/item/gun/var/mouthshoot = 0 //To stop people from suiciding twice... >.> -/obj/item/weapon/gun/proc/handle_suicide(mob/living/user) +/obj/item/gun/proc/handle_suicide(mob/living/user) if(!ishuman(user)) return var/mob/living/carbon/human/M = user @@ -734,7 +734,7 @@ mouthshoot = 0 return -/obj/item/weapon/gun/proc/toggle_scope(var/zoom_amount=2.0) +/obj/item/gun/proc/toggle_scope(var/zoom_amount=2.0) //looking through a scope limits your periphereal vision //still, increase the view size by a tiny amount so that sniping isn't too restricted to NSEW var/zoom_offset = round(world.view * zoom_amount) @@ -748,19 +748,19 @@ recoil = round(recoil*zoom_amount+1) //recoil is worse when looking through a scope //make sure accuracy and recoil are reset regardless of how the item is unzoomed. -/obj/item/weapon/gun/zoom() +/obj/item/gun/zoom() ..() if(!zoom) accuracy = initial(accuracy) recoil = initial(recoil) -/obj/item/weapon/gun/examine(mob/user) +/obj/item/gun/examine(mob/user) . = ..() if(firemodes.len > 1) var/datum/firemode/current_mode = firemodes[sel_mode] . += "The fire selector is set to [current_mode.name]." -/obj/item/weapon/gun/proc/switch_firemodes(mob/user) +/obj/item/gun/proc/switch_firemodes(mob/user) if(firemodes.len <= 1) return null @@ -774,23 +774,23 @@ return new_mode -/obj/item/weapon/gun/attack_self(mob/user) +/obj/item/gun/attack_self(mob/user) switch_firemodes(user) /* TGMC Ammo HUD Port Begin */ -/obj/item/weapon/gun +/obj/item/gun var/hud_enabled = TRUE -/obj/item/weapon/gun/proc/has_ammo_counter() +/obj/item/gun/proc/has_ammo_counter() return FALSE -/obj/item/weapon/gun/proc/get_ammo_type() +/obj/item/gun/proc/get_ammo_type() return FALSE -/obj/item/weapon/gun/proc/get_ammo_count() +/obj/item/gun/proc/get_ammo_count() return FALSE -/obj/item/weapon/gun/equipped(mob/living/user, slot) // When a gun is equipped to your hands, we'll add the HUD to the user. Pending porting over TGMC guncode where wielding is far more sensible. +/obj/item/gun/equipped(mob/living/user, slot) // When a gun is equipped to your hands, we'll add the HUD to the user. Pending porting over TGMC guncode where wielding is far more sensible. if(slot == slot_l_hand || slot == slot_r_hand) user.hud_used.add_ammo_hud(user, src) else @@ -798,7 +798,7 @@ return ..() -/obj/item/weapon/gun/dropped(mob/living/user) // Ditto as above, we remove the HUD. Pending porting TGMC code to clean up this fucking nightmare of spaghetti. +/obj/item/gun/dropped(mob/living/user) // Ditto as above, we remove the HUD. Pending porting TGMC code to clean up this fucking nightmare of spaghetti. user.hud_used.remove_ammo_hud(user, src) ..() diff --git a/code/modules/projectiles/guns/automatic_fire.dm b/code/modules/projectiles/guns/automatic_fire.dm index e85c33a485a..bfb70051522 100644 --- a/code/modules/projectiles/guns/automatic_fire.dm +++ b/code/modules/projectiles/guns/automatic_fire.dm @@ -10,11 +10,11 @@ icon = null//We dont want people to see this guy density = FALSE anchored = TRUE - var/obj/item/weapon/gun/gun + var/obj/item/gun/gun var/active = 0//Just tells us that it was clicked on so we should start shooting var/delay_del = 0//Delays the del if we retarget without shooting -/obj/screen/auto_target/New(loc, var/obj/item/weapon/gun/G) +/obj/screen/auto_target/New(loc, var/obj/item/gun/G) ..() gun = G var/image/I = image('icons/effects/Targeted.dmi', src, "locked") diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index e5583a19ab1..f2ca3383139 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -1,14 +1,14 @@ -/obj/item/weapon/gun/energy +/obj/item/gun/energy name = "energy gun" desc = "A basic energy-based gun." icon_state = "energy" fire_sound_text = "laser blast" - var/obj/item/weapon/cell/power_supply //What type of power cell this uses + var/obj/item/cell/power_supply //What type of power cell this uses var/charge_cost = 240 //How much energy is needed to fire. - var/accept_cell_type = /obj/item/weapon/cell/device - var/cell_type = /obj/item/weapon/cell/device/weapon + var/accept_cell_type = /obj/item/cell/device + var/cell_type = /obj/item/cell/device/weapon projectile_type = /obj/item/projectile/beam/practice var/modifystate @@ -28,10 +28,10 @@ var/battery_lock = 0 //If set, weapon cannot switch batteries var/random_start_ammo = FALSE //if TRUE, the weapon will spawn with randomly-determined ammo -/obj/item/weapon/gun/energy/New() +/obj/item/gun/energy/New() ..() if(self_recharge) - power_supply = new /obj/item/weapon/cell/device/weapon(src) + power_supply = new /obj/item/cell/device/weapon(src) START_PROCESSING(SSobj, src) else if(cell_type) @@ -43,15 +43,15 @@ power_supply.charge = charge_cost*rand(0,power_supply.maxcharge/charge_cost) update_icon() -/obj/item/weapon/gun/energy/Destroy() +/obj/item/gun/energy/Destroy() if(self_recharge) STOP_PROCESSING(SSobj, src) return ..() -/obj/item/weapon/gun/energy/get_cell() +/obj/item/gun/energy/get_cell() return power_supply -/obj/item/weapon/gun/energy/process() +/obj/item/gun/energy/process() if(self_recharge) //Every [recharge_time] ticks, recharge a shot for the battery if(world.time > last_shot + charge_delay) //Doesn't work if you've fired recently if(!power_supply || power_supply.charge >= power_supply.maxcharge) @@ -64,7 +64,7 @@ var/rechargeamt = power_supply.maxcharge*0.2 if(use_external_power) - var/obj/item/weapon/cell/external = get_external_power_supply() + var/obj/item/cell/external = get_external_power_supply() if(!external || !external.use(rechargeamt)) //Take power from the borg... return 0 @@ -103,18 +103,18 @@ charge_tick = 0 return 1 -/obj/item/weapon/gun/energy/attackby(var/obj/item/A as obj, mob/user as mob) +/obj/item/gun/energy/attackby(var/obj/item/A as obj, mob/user as mob) ..() -/obj/item/weapon/gun/energy/switch_firemodes(mob/user) +/obj/item/gun/energy/switch_firemodes(mob/user) if(..()) update_icon() -/obj/item/weapon/gun/energy/emp_act(severity) +/obj/item/gun/energy/emp_act(severity) ..() update_icon() -/obj/item/weapon/gun/energy/consume_next_projectile() +/obj/item/gun/energy/consume_next_projectile() if(!power_supply) return null if(!ispath(projectile_type)) return null if(!power_supply.checked_use(charge_cost)) return null @@ -123,13 +123,13 @@ M?.hud_used.update_ammo_hud(M, src) return new projectile_type(src) -/obj/item/weapon/gun/energy/proc/load_ammo(var/obj/item/C, mob/user) - if(istype(C, /obj/item/weapon/cell)) +/obj/item/gun/energy/proc/load_ammo(var/obj/item/C, mob/user) + if(istype(C, /obj/item/cell)) if(self_recharge || battery_lock) to_chat(user, "[src] does not have a battery port.") return if(istype(C, accept_cell_type)) - var/obj/item/weapon/cell/P = C + var/obj/item/cell/P = C if(power_supply) to_chat(user, "[src] already has a power cell.") else @@ -147,7 +147,7 @@ to_chat(user, "This cell is not fitted for [src].") return -/obj/item/weapon/gun/energy/proc/unload_ammo(mob/user) +/obj/item/gun/energy/proc/unload_ammo(mob/user) if(self_recharge || battery_lock) to_chat(user, "[src] does not have a battery port.") return @@ -163,17 +163,17 @@ else to_chat(user, "[src] does not have a power cell.") -/obj/item/weapon/gun/energy/attackby(var/obj/item/A as obj, mob/user as mob) +/obj/item/gun/energy/attackby(var/obj/item/A as obj, mob/user as mob) ..() load_ammo(A, user) -/obj/item/weapon/gun/energy/attack_hand(mob/user as mob) +/obj/item/gun/energy/attack_hand(mob/user as mob) if(user.get_inactive_hand() == src) unload_ammo(user) else return ..() -/obj/item/weapon/gun/energy/proc/get_external_power_supply() +/obj/item/gun/energy/proc/get_external_power_supply() if(isrobot(src.loc)) var/mob/living/silicon/robot/R = src.loc return R.cell @@ -182,12 +182,12 @@ if(module.holder && module.holder.wearer) var/mob/living/carbon/human/H = module.holder.wearer if(istype(H) && H.get_rig()) - var/obj/item/weapon/rig/suit = H.get_rig() + var/obj/item/rig/suit = H.get_rig() if(istype(suit)) return suit.cell return null -/obj/item/weapon/gun/energy/examine(mob/user) +/obj/item/gun/energy/examine(mob/user) . = ..() if(shot_counter) if(power_supply) @@ -199,7 +199,7 @@ else . += "Does not have a power cell." -/obj/item/weapon/gun/energy/update_icon(var/ignore_inhands) +/obj/item/gun/energy/update_icon(var/ignore_inhands) if(power_supply == null) if(modifystate) icon_state = "[modifystate]_open" @@ -228,14 +228,14 @@ if(!ignore_inhands) update_held_icon() -/obj/item/weapon/gun/energy/proc/start_recharge() +/obj/item/gun/energy/proc/start_recharge() if(power_supply == null) - power_supply = new /obj/item/weapon/cell/device/weapon(src) + power_supply = new /obj/item/cell/device/weapon(src) self_recharge = 1 START_PROCESSING(SSobj, src) update_icon() -/obj/item/weapon/gun/energy/get_description_interaction() +/obj/item/gun/energy/get_description_interaction() var/list/results = list() if(!battery_lock && !self_recharge) @@ -249,17 +249,17 @@ return results // TGMC AMMO HUD -/obj/item/weapon/gun/energy/has_ammo_counter() +/obj/item/gun/energy/has_ammo_counter() return TRUE -/obj/item/weapon/gun/energy/get_ammo_type() +/obj/item/gun/energy/get_ammo_type() if(!projectile_type) return list("unknown", "unknown") else var/obj/item/projectile/P = projectile_type return list(initial(P.hud_state), initial(P.hud_state_empty)) -/obj/item/weapon/gun/energy/get_ammo_count() +/obj/item/gun/energy/get_ammo_count() if(!power_supply) return 0 else diff --git a/code/modules/projectiles/guns/energy/altevian_vr.dm b/code/modules/projectiles/guns/energy/altevian_vr.dm index 4db9cd12093..adc114fb614 100644 --- a/code/modules/projectiles/guns/energy/altevian_vr.dm +++ b/code/modules/projectiles/guns/energy/altevian_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/energy/altevian +/obj/item/gun/energy/altevian name = "Magneto-Electric Energy Projector" desc = "A hand-held version of an energy weapon for the Altevian Hegemony. This one is the civilian grade version that has a reduced charge capacity. However, it is a lot easier to use." icon_state = "meep" @@ -12,7 +12,7 @@ projectile_type = /obj/item/projectile/beam/meeplaser charge_cost = 400 -/obj/item/weapon/gun/energy/altevian/large +/obj/item/gun/energy/altevian/large name = "Proto-Reactive Beam Thruster" desc = "The main energy rifle that the Altevian Hegemony uses for its military operations." icon_state = "altevian-pdw" @@ -58,7 +58,7 @@ light_power = 0.5 light_color = "#77A6E1" -/obj/item/weapon/gun/energy/ratminer +/obj/item/gun/energy/ratminer name = "Altevian Repulsion Mineral Slicer" desc = "An advanced piece of mining focused technology from the Altevian Hegemony. \ This model appears to be their standard asteroid clearing laser with a tailored system to work with an ore-bag, \ @@ -123,7 +123,7 @@ var/turf/simulated/mineral/M = T M.GetDrilled(TRUE) if(firer) - var/obj/item/weapon/storage/bag/ore/orebag = locate(/obj/item/weapon/storage/bag/ore) in firer + var/obj/item/storage/bag/ore/orebag = locate(/obj/item/storage/bag/ore) in firer if(orebag) for(var/turf/T in RANGE_TURFS(2, target_turf)) orebag.gather_all(T, firer, TRUE) diff --git a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm index 4bea1318c6a..4654fe17d7f 100644 --- a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm +++ b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm @@ -1,5 +1,5 @@ //RD 'gun' -/obj/item/weapon/bluespace_harpoon +/obj/item/bluespace_harpoon name = "bluespace harpoon" desc = "For climbing on bluespace mountains!" @@ -17,28 +17,28 @@ var/firable = TRUE var/transforming = 0 var/failure_chance = 15 // This can become negative with part tiers above 3, which helps offset penalties - var/obj/item/weapon/stock_parts/scanning_module/scanmod + var/obj/item/stock_parts/scanning_module/scanmod var/dropnoms_active = TRUE -/obj/item/weapon/bluespace_harpoon/Initialize() +/obj/item/bluespace_harpoon/Initialize() . = ..() scanmod = new(src) update_fail_chance() -/obj/item/weapon/bluespace_harpoon/examine(var/mob/user) +/obj/item/bluespace_harpoon/examine(var/mob/user) . = ..() . += "It is currently in [mode ? "transmitting" : "receiving"] mode." . += "Spatial rearrangement is [dropnoms_active ? "active" : "inactive"]." if(Adjacent(user)) . += "It has [scanmod ? scanmod : "no scanner module"] installed." -/obj/item/weapon/bluespace_harpoon/proc/update_fail_chance() +/obj/item/bluespace_harpoon/proc/update_fail_chance() if(scanmod) failure_chance = initial(failure_chance) - (scanmod.rating * 5) else failure_chance = 75 // You can't even use it if there's no scanmod, but why not. -/obj/item/weapon/bluespace_harpoon/attackby(var/obj/item/I, var/mob/living/user) +/obj/item/bluespace_harpoon/attackby(var/obj/item/I, var/mob/living/user) if(!istype(user)) return @@ -52,7 +52,7 @@ scanmod.forceMove(T) scanmod = null update_fail_chance() - else if(istype(I, /obj/item/weapon/stock_parts/scanning_module)) + else if(istype(I, /obj/item/stock_parts/scanning_module)) if(scanmod) to_chat(user, "There's already [scanmod] installed! Remove it first.") return @@ -64,7 +64,7 @@ else return ..() -/obj/item/weapon/bluespace_harpoon/afterattack(atom/A, mob/user as mob) +/obj/item/bluespace_harpoon/afterattack(atom/A, mob/user as mob) if(!user || !A || isstorage(A)) return if(!scanmod) @@ -200,10 +200,10 @@ to_chat(M, "You materialize around [living_user] as they end up in your [belly_dest]!") -/obj/item/weapon/bluespace_harpoon/attack_self(mob/living/user as mob) +/obj/item/bluespace_harpoon/attack_self(mob/living/user as mob) return chande_fire_mode(user) -/obj/item/weapon/bluespace_harpoon/verb/chande_fire_mode(mob/user as mob) +/obj/item/bluespace_harpoon/verb/chande_fire_mode(mob/user as mob) set name = "Change Fire Mode" set category = "Object" set src in range(0) @@ -214,7 +214,7 @@ to_chat(user,"You change \the [src]'s mode to [mode ? "transmiting" : "receiving"].") update_icon() -/obj/item/weapon/bluespace_harpoon/verb/chande_dropnom_mode(mob/user as mob) +/obj/item/bluespace_harpoon/verb/chande_dropnom_mode(mob/user as mob) set name = "Toggle Spatial Rearrangement" set category = "Object" set src in range(0) @@ -222,7 +222,7 @@ dropnoms_active = !dropnoms_active to_chat(user,"You switch \the [src]'s spatial rearrangement [dropnoms_active ? "on" : "off"]. (Telenoms [dropnoms_active ? "enabled" : "disabled"])") -/obj/item/weapon/bluespace_harpoon/update_icon() +/obj/item/bluespace_harpoon/update_icon() if(transforming) switch(mode) if(0) diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm index 52badac8143..50a1906a992 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm @@ -1,5 +1,5 @@ // The Gun // -/obj/item/weapon/gun/projectile/cell_loaded //this one can load both medical and security cells! for ERT/admin use. +/obj/item/gun/projectile/cell_loaded //this one can load both medical and security cells! for ERT/admin use. name = "multipurpose cell-loaded revolver" desc = "Variety is the spice of life! This weapon is a hybrid of the KHI-102b 'Nanotech Selectable-Fire Weapon' and the Vey-Med ML-3 'Medigun', dubbed the 'NSFW-ML3M'. \ It can fire both harmful and healing cells with an internal nanite fabricator and energy weapon cell loader. Up to three combinations of \ @@ -27,7 +27,7 @@ var/max_charge = 0 charge_sections = 5 -/obj/item/weapon/gun/projectile/cell_loaded/consume_next_projectile() +/obj/item/gun/projectile/cell_loaded/consume_next_projectile() if(chambered && ammo_magazine) var/obj/item/ammo_casing/microbattery/batt = chambered if(batt.shots_left) @@ -40,7 +40,7 @@ return null -/obj/item/weapon/gun/projectile/cell_loaded/proc/update_charge() +/obj/item/gun/projectile/cell_loaded/proc/update_charge() charge_left = 0 max_charge = 0 @@ -55,7 +55,7 @@ charge_left += bullet.shots_left max_charge += initial(bullet.shots_left) -/obj/item/weapon/gun/projectile/cell_loaded/proc/switch_to(obj/item/ammo_casing/microbattery/new_batt) +/obj/item/gun/projectile/cell_loaded/proc/switch_to(obj/item/ammo_casing/microbattery/new_batt) if(ishuman(loc)) if(chambered && new_batt.type == chambered.type) to_chat(loc,"\The [src] is now using the next [new_batt.type_name] power cell.") @@ -69,7 +69,7 @@ if(istype(M)) // TGMC Ammo HUD M?.hud_used.update_ammo_hud(M, src) -/obj/item/weapon/gun/projectile/cell_loaded/attack_self(mob/user) +/obj/item/gun/projectile/cell_loaded/attack_self(mob/user) if(!chambered) return @@ -88,7 +88,7 @@ switch_to(next_batt) break /* -/obj/item/weapon/gun/projectile/cell_loaded/special_check(mob/user) +/obj/item/gun/projectile/cell_loaded/special_check(mob/user) if(!chambered) return @@ -98,16 +98,16 @@ return TRUE */ -/obj/item/weapon/gun/projectile/cell_loaded/load_ammo(var/obj/item/A, mob/user) +/obj/item/gun/projectile/cell_loaded/load_ammo(var/obj/item/A, mob/user) . = ..() if(ammo_magazine && ammo_magazine.stored_ammo.len) switch_to(ammo_magazine.stored_ammo[1]) -/obj/item/weapon/gun/projectile/cell_loaded/unload_ammo(mob/user, var/allow_dump=1) +/obj/item/gun/projectile/cell_loaded/unload_ammo(mob/user, var/allow_dump=1) chambered = null return ..() -/obj/item/weapon/gun/projectile/cell_loaded/update_icon() +/obj/item/gun/projectile/cell_loaded/update_icon() update_charge() cut_overlays() @@ -155,7 +155,7 @@ var/list/modes = list() -/obj/item/ammo_magazine/cell_mag/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/ammo_magazine/cell_mag/attackby(obj/item/W as obj, mob/user as mob) if(istype(W, /obj/item/ammo_casing/microbattery)) var/obj/item/ammo_casing/microbattery/B = W if(!istype(B, ammo_type)) @@ -170,8 +170,8 @@ update_icon() playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) update_icon() - if(istype(loc, /obj/item/weapon/gun/projectile/cell_loaded)) // Update the HUD if we're in a gun + have a user. Not that one should be able to reload the mag while it's in a gun, but just in caaaaase. - var/obj/item/weapon/gun/projectile/cell_loaded/cell_load = loc + if(istype(loc, /obj/item/gun/projectile/cell_loaded)) // Update the HUD if we're in a gun + have a user. Not that one should be able to reload the mag while it's in a gun, but just in caaaaase. + var/obj/item/gun/projectile/cell_loaded/cell_load = loc var/mob/living/M = cell_load.loc if(istype(M)) M?.hud_used.update_ammo_hud(M, cell_load) @@ -241,16 +241,16 @@ // The Pack // -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid name = "hybrid cell-loaded gun kit" desc = "A storage case for a multi-purpose handgun. Variety hour!" w_class = ITEMSIZE_NORMAL max_w_class = ITEMSIZE_NORMAL - can_hold = list(/obj/item/weapon/gun/projectile/cell_loaded,/obj/item/ammo_magazine/cell_mag,/obj/item/ammo_casing/microbattery) + can_hold = list(/obj/item/gun/projectile/cell_loaded,/obj/item/ammo_magazine/cell_mag,/obj/item/ammo_casing/microbattery) -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid/New() +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid/New() ..() - new /obj/item/weapon/gun/projectile/cell_loaded(src) + new /obj/item/gun/projectile/cell_loaded(src) new /obj/item/ammo_magazine/cell_mag/advanced(src) new /obj/item/ammo_casing/microbattery/combat/stun(src) new /obj/item/ammo_casing/microbattery/combat/stun(src) @@ -263,16 +263,16 @@ new /obj/item/ammo_casing/microbattery/medical/toxin3(src) new /obj/item/ammo_casing/microbattery/medical/omni3(src) -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid_combat +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid_combat name = "military cell-loaded gun kit" desc = "A storage case for a multi-purpose handgun. Variety hour!" w_class = ITEMSIZE_NORMAL max_w_class = ITEMSIZE_NORMAL - can_hold = list(/obj/item/weapon/gun/projectile/cell_loaded,/obj/item/ammo_magazine/cell_mag,/obj/item/ammo_casing/microbattery) + can_hold = list(/obj/item/gun/projectile/cell_loaded,/obj/item/ammo_magazine/cell_mag,/obj/item/ammo_casing/microbattery) -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid_combat/New() +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid_combat/New() ..() - new /obj/item/weapon/gun/projectile/cell_loaded(src) + new /obj/item/gun/projectile/cell_loaded(src) new /obj/item/ammo_magazine/cell_mag/advanced(src) new /obj/item/ammo_casing/microbattery/combat/shotstun(src) new /obj/item/ammo_casing/microbattery/combat/shotstun(src) @@ -287,14 +287,14 @@ // TGMC Ammo HUD: Custom handling for cell-loaded weaponry. /* -/obj/item/weapon/gun/projectile/cell_loaded/get_ammo_type() +/obj/item/gun/projectile/cell_loaded/get_ammo_type() if(!projectile_type) return list("unknown", "unknown") else var/obj/item/projectile/P = projectile_type return list(initial(P.hud_state), initial(P.hud_state_empty)) */ -/obj/item/weapon/gun/projectile/cell_loaded/get_ammo_count() +/obj/item/gun/projectile/cell_loaded/get_ammo_count() if(!chambered) return 0 // We're not chambered, so we have 0 rounds loaded. diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m.dm index 330b89cbeb6..bc7d84517b0 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m.dm @@ -1,5 +1,5 @@ // The Gun // -/obj/item/weapon/gun/projectile/cell_loaded/medical +/obj/item/gun/projectile/cell_loaded/medical name = "cell-loaded medigun" desc = "The ML-3 'Medigun', or ML3M for short, is a powerful cell-based ranged healing device based on the KHI-102b NSFW. \ It uses an internal nanite fabricator, powered and controlled by discrete cells, to deliver a variety of effects at range. Up to six combinations of \ @@ -13,7 +13,7 @@ origin_tech = list(TECH_MATERIAL = 4, TECH_MAGNET = 2, TECH_BIO = 5) allowed_magazines = list(/obj/item/ammo_magazine/cell_mag/medical) -/obj/item/weapon/gun/projectile/cell_loaded/medical/cmo +/obj/item/gun/projectile/cell_loaded/medical/cmo name = "advanced cell-loaded medigun" desc = "This is a variation on the ML-3 'Medigun', a powerful cell-based ranged healing device based on the KHI-102b NSFW. \ It has an extended sight for increased accuracy, and much more comfortable grip. Ammo not included." @@ -42,33 +42,33 @@ // The Pack // -/obj/item/weapon/storage/secure/briefcase/ml3m_pack_med +/obj/item/storage/secure/briefcase/ml3m_pack_med name = "\improper ML-3 \'Medigun\' kit" desc = "A storage case for a multi-purpose healing gun. Variety hour!" icon_state = "medbriefcase" w_class = ITEMSIZE_NORMAL max_w_class = ITEMSIZE_NORMAL - can_hold = list(/obj/item/weapon/gun/projectile/cell_loaded/medical,/obj/item/ammo_magazine/cell_mag/medical,/obj/item/ammo_casing/microbattery/medical) + can_hold = list(/obj/item/gun/projectile/cell_loaded/medical,/obj/item/ammo_magazine/cell_mag/medical,/obj/item/ammo_casing/microbattery/medical) -/obj/item/weapon/storage/secure/briefcase/ml3m_pack_med/New() +/obj/item/storage/secure/briefcase/ml3m_pack_med/New() ..() - new /obj/item/weapon/gun/projectile/cell_loaded/medical(src) + new /obj/item/gun/projectile/cell_loaded/medical(src) new /obj/item/ammo_magazine/cell_mag/medical(src) new /obj/item/ammo_casing/microbattery/medical/brute(src) new /obj/item/ammo_casing/microbattery/medical/burn(src) new /obj/item/ammo_casing/microbattery/medical/stabilize(src) -/obj/item/weapon/storage/secure/briefcase/ml3m_pack_cmo +/obj/item/storage/secure/briefcase/ml3m_pack_cmo name = "\improper Advanced ML-3 \'Medigun\' kit" desc = "A storage case for a multi-purpose healing gun. Variety hour!" icon_state = "medbriefcase" w_class = ITEMSIZE_NORMAL max_w_class = ITEMSIZE_NORMAL - can_hold = list(/obj/item/weapon/gun/projectile/cell_loaded/medical,/obj/item/ammo_magazine/cell_mag/medical,/obj/item/ammo_casing/microbattery/medical) + can_hold = list(/obj/item/gun/projectile/cell_loaded/medical,/obj/item/ammo_magazine/cell_mag/medical,/obj/item/ammo_casing/microbattery/medical) -/obj/item/weapon/storage/secure/briefcase/ml3m_pack_cmo/New() +/obj/item/storage/secure/briefcase/ml3m_pack_cmo/New() ..() - new /obj/item/weapon/gun/projectile/cell_loaded/medical/cmo(src) + new /obj/item/gun/projectile/cell_loaded/medical/cmo(src) new /obj/item/ammo_magazine/cell_mag/medical(src) new /obj/item/ammo_casing/microbattery/medical/brute(src) new /obj/item/ammo_casing/microbattery/medical/burn(src) diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm index 426301e7561..7c82ec839df 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm @@ -1,6 +1,6 @@ //Why is this in here when it's not a subtype of cell_loaded? Because it has a similar function, and I couldn't be assed to find a better suited spot. -/obj/item/weapon/gun/projectile/multi_cannon +/obj/item/gun/projectile/multi_cannon name = "Curabitur Cannon" desc = "A cannon developed by Curabitur Scimed, this weapon incorporates both Vey-Med and precursor technology to create a medical alternative to chemicals on the field." icon = 'icons/vore/custom_guns_vr.dmi' @@ -22,7 +22,7 @@ slot_flags = SLOT_BACK recoil = FALSE -/obj/item/weapon/gun/projectile/multi_cannon/update_icon() +/obj/item/gun/projectile/multi_cannon/update_icon() . = ..() cut_overlays() var/istate = "healcannon_0" @@ -49,17 +49,17 @@ x.color = indicator_colour add_overlay(x) -/obj/item/weapon/gun/projectile/multi_cannon/load_ammo() +/obj/item/gun/projectile/multi_cannon/load_ammo() .=..() consume_next_projectile() update_icon() -/obj/item/weapon/gun/projectile/multi_cannon/unload_ammo(mob/user, var/allow_dump=1) +/obj/item/gun/projectile/multi_cannon/unload_ammo(mob/user, var/allow_dump=1) .=..() update_icon() chambered = null -/obj/item/weapon/gun/projectile/multi_cannon/get_ammo_count() // Custom handling for the Curabitur. +/obj/item/gun/projectile/multi_cannon/get_ammo_count() // Custom handling for the Curabitur. if(istype(chambered, /obj/item/ammo_casing/macrobattery)) var/obj/item/ammo_casing/macrobattery/battery = chambered if(battery.charge) // Does the battery have charge? @@ -69,4 +69,4 @@ else if(chambered == null) return 0 else - CRASH("/obj/item/weapon/gun/projectile/multi_cannon/get_ammo_count() was called from [src] but did not have a valid magazine loaded, somehow! Chambered is currently [chambered].") \ No newline at end of file + CRASH("/obj/item/gun/projectile/multi_cannon/get_ammo_count() was called from [src] but did not have a valid magazine loaded, somehow! Chambered is currently [chambered].") \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon_cells.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon_cells.dm index d333081c372..817117db9a9 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon_cells.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon_cells.dm @@ -39,8 +39,8 @@ BB = null BB = new projectile_type // TGMC Ammo HUD - Update the HUD every time we expend/fire, given the Curabitur's method of handling firing. - if(istype(loc, /obj/item/weapon/gun/projectile/multi_cannon)) - var/obj/item/weapon/gun/projectile/multi_cannon = loc + if(istype(loc, /obj/item/gun/projectile/multi_cannon)) + var/obj/item/gun/projectile/multi_cannon = loc var/mob/living/user = multi_cannon.loc if(istype(user)) user?.hud_used.update_ammo_hud(user, multi_cannon) @@ -56,12 +56,12 @@ BB = new projectile_type if(charge >= max_charge) STOP_PROCESSING(SSobj, src) - if(istype(loc,/obj/item/weapon/gun/projectile/multi_cannon)) + if(istype(loc,/obj/item/gun/projectile/multi_cannon)) loc.update_icon() // TGMC Ammo HUD - Update the HUD every time we're called to recharge. - if(istype(loc, /obj/item/weapon/gun/projectile/multi_cannon)) - var/obj/item/weapon/gun/projectile/multi_cannon = loc + if(istype(loc, /obj/item/gun/projectile/multi_cannon)) + var/obj/item/gun/projectile/multi_cannon = loc var/mob/living/user = multi_cannon.loc if(istype(user)) user?.hud_used.update_ammo_hud(user, multi_cannon) diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw.dm index 1e65f6f00ac..c1c86a3d1fc 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw.dm @@ -1,5 +1,5 @@ // The Gun // -/obj/item/weapon/gun/projectile/cell_loaded/combat +/obj/item/gun/projectile/cell_loaded/combat name = "cell-loaded revolver" desc = "Variety is the spice of life! The KHI-102b 'Nanotech Selectable-Fire Weapon', or NSFW for short, is an unholy hybrid of an ammo-driven \ energy weapon that allows the user to mix and match their own fire modes. Up to four combinations of \ @@ -9,7 +9,7 @@ description_fluff = "The Kitsuhana 'Nanotech Selectable Fire Weapon' allows one to customize their loadout in the field, or before deploying, to achieve various results in a weapon they are already familiar with wielding." allowed_magazines = list(/obj/item/ammo_magazine/cell_mag/combat) -/obj/item/weapon/gun/projectile/cell_loaded/combat/prototype +/obj/item/gun/projectile/cell_loaded/combat/prototype name = "prototype cell-loaded revolver" desc = "Variety is the spice of life! A prototype based on KHI-102b 'Nanotech Selectable-Fire Weapon', or NSFW for short, is an unholy hybrid of an ammo-driven \ energy weapon that allows the user to mix and match their own fire modes. Up to two combinations of \ @@ -43,30 +43,30 @@ // The Pack // -/obj/item/weapon/storage/secure/briefcase/nsfw_pack +/obj/item/storage/secure/briefcase/nsfw_pack name = "\improper KHI-102b \'NSFW\' gun kit" desc = "A storage case for a multi-purpose handgun. Variety hour!" w_class = ITEMSIZE_NORMAL max_w_class = ITEMSIZE_NORMAL - can_hold = list(/obj/item/weapon/gun/projectile/cell_loaded/combat,/obj/item/ammo_magazine/cell_mag/combat,/obj/item/ammo_casing/microbattery/combat) + can_hold = list(/obj/item/gun/projectile/cell_loaded/combat,/obj/item/ammo_magazine/cell_mag/combat,/obj/item/ammo_casing/microbattery/combat) -/obj/item/weapon/storage/secure/briefcase/nsfw_pack/New() +/obj/item/storage/secure/briefcase/nsfw_pack/New() ..() - new /obj/item/weapon/gun/projectile/cell_loaded/combat(src) + new /obj/item/gun/projectile/cell_loaded/combat(src) new /obj/item/ammo_magazine/cell_mag/combat(src) for(var/path in subtypesof(/obj/item/ammo_casing/microbattery/combat)) new path(src) -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hos +/obj/item/storage/secure/briefcase/nsfw_pack_hos name = "\improper KHI-102b \'NSFW\' gun kit" desc = "A storage case for a multi-purpose handgun. Variety hour!" w_class = ITEMSIZE_NORMAL max_w_class = ITEMSIZE_NORMAL - can_hold = list(/obj/item/weapon/gun/projectile/cell_loaded/combat,/obj/item/ammo_magazine/cell_mag/combat,/obj/item/ammo_casing/microbattery/combat) + can_hold = list(/obj/item/gun/projectile/cell_loaded/combat,/obj/item/ammo_magazine/cell_mag/combat,/obj/item/ammo_casing/microbattery/combat) -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hos/New() +/obj/item/storage/secure/briefcase/nsfw_pack_hos/New() ..() - new /obj/item/weapon/gun/projectile/cell_loaded/combat(src) + new /obj/item/gun/projectile/cell_loaded/combat(src) new /obj/item/ammo_magazine/cell_mag/combat(src) new /obj/item/ammo_casing/microbattery/combat/lethal(src) new /obj/item/ammo_casing/microbattery/combat/lethal(src) diff --git a/code/modules/projectiles/guns/energy/crestrose_vr.dm b/code/modules/projectiles/guns/energy/crestrose_vr.dm index c702d05b094..ee6f0f4782e 100644 --- a/code/modules/projectiles/guns/energy/crestrose_vr.dm +++ b/code/modules/projectiles/guns/energy/crestrose_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/projectile/automatic/fluff/crestrose +/obj/item/gun/projectile/automatic/fluff/crestrose name = "Crescent Rose" desc = "Can you match my resolve? If so then you will succeed. I believe that the human spirit is indomitable. Keep Moving Forward. Uses 7.62mm rounds." icon = 'icons/vore/custom_guns_vr.dmi' @@ -26,13 +26,13 @@ list(mode_name="scythe", icon_state="crestrose",item_state = "crestrose",force=15), ) -/obj/item/weapon/gun/projectile/automatic/fluff/crestrose/switch_firemodes(mob/user) +/obj/item/gun/projectile/automatic/fluff/crestrose/switch_firemodes(mob/user) if(..()) update_icon() update_held_icon() -/obj/item/weapon/gun/projectile/automatic/fluff/crestrose/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/gun/projectile/automatic/fluff/crestrose/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(default_parry_check(user, attacker, damage_source) && prob(50)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") playsound(user, 'sound/weapons/punchmiss.ogg', 50, 1) diff --git a/code/modules/projectiles/guns/energy/dominator_vr.dm b/code/modules/projectiles/guns/energy/dominator_vr.dm index 590e3abd926..bfed677fd2d 100644 --- a/code/modules/projectiles/guns/energy/dominator_vr.dm +++ b/code/modules/projectiles/guns/energy/dominator_vr.dm @@ -1,5 +1,5 @@ // -------------- Dominator ------------- -/obj/item/weapon/gun/energy/gun/fluff/dominator +/obj/item/gun/energy/gun/fluff/dominator name = "bulky energy gun" desc = "A MWPSB Dominator from the Federation. Like the basic Energy Gun, this gun has two settings. It is used by the United Federation Public Safety Bureau's Criminal Investigation Division. The weapon can only be fired by the owner and is alert-level locked." @@ -25,14 +25,14 @@ var/emagged = FALSE -/obj/item/weapon/gun/energy/gun/fluff/dominator/special_check(mob/user) +/obj/item/gun/energy/gun/fluff/dominator/special_check(mob/user) if(!emagged && mode_name == "lethal" && get_security_level() == "green") to_chat(user,"The trigger refuses to depress while on the lethal setting under security level green!") return FALSE return ..() -/obj/item/weapon/gun/energy/gun/fluff/dominator/emag_act(var/remaining_charges,var/mob/user) +/obj/item/gun/energy/gun/fluff/dominator/emag_act(var/remaining_charges,var/mob/user) ..() if(!emagged) emagged = TRUE diff --git a/code/modules/projectiles/guns/energy/gunsword_vr.dm b/code/modules/projectiles/guns/energy/gunsword_vr.dm index 66efaabfc0a..bfb4ea98a93 100644 --- a/code/modules/projectiles/guns/energy/gunsword_vr.dm +++ b/code/modules/projectiles/guns/energy/gunsword_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/energy/gun/fluff/gunsword +/obj/item/gun/energy/gun/fluff/gunsword name = "Sword Buster" desc = "The Sword Buster gun is custom built using the science behind a Golden Empire pistol. The cell can be removed in close range and used as energy shortsword." @@ -15,7 +15,7 @@ fire_sound = 'sound/weapons/Taser.ogg' charge_meter = 1 - cell_type = /obj/item/weapon/cell/device/weapon/gunsword + cell_type = /obj/item/cell/device/weapon/gunsword modifystate = "gbuster" @@ -27,7 +27,7 @@ // -----------------gunsword battery-------------------------- -/obj/item/weapon/cell/device/weapon/gunsword +/obj/item/cell/device/weapon/gunsword name = "Buster Cell" desc = "The Buster Cell. It doubles as a sword when activated outside the gun housing." icon = 'icons/vore/custom_guns_vr.dmi' @@ -58,7 +58,7 @@ var/lcolor = "#800080" -/obj/item/weapon/cell/device/weapon/gunsword/proc/activate(mob/living/user) +/obj/item/cell/device/weapon/gunsword/proc/activate(mob/living/user) if(active) return icon_state = "gsaber" @@ -77,7 +77,7 @@ -/obj/item/weapon/cell/device/weapon/gunsword/proc/deactivate(mob/living/user) +/obj/item/cell/device/weapon/gunsword/proc/deactivate(mob/living/user) if(!active) return playsound(src, 'sound/weapons/saberoff.ogg', 50, 1) @@ -95,7 +95,7 @@ attack_verb = null -/obj/item/weapon/cell/device/weapon/gunsword/attack_self(mob/living/user as mob) +/obj/item/cell/device/weapon/gunsword/attack_self(mob/living/user as mob) var/datum/gender/TU = gender_datums[user.get_visible_gender()] if (active) if ((CLUMSY in user.mutations) && prob(50)) @@ -118,5 +118,5 @@ add_fingerprint(user) return -/obj/item/weapon/cell/device/weapon/gunsword/update_icon() +/obj/item/cell/device/weapon/gunsword/update_icon() cut_overlays() \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/hooklauncher.dm b/code/modules/projectiles/guns/energy/hooklauncher.dm index ee2d44042a7..f2e63ac0a92 100644 --- a/code/modules/projectiles/guns/energy/hooklauncher.dm +++ b/code/modules/projectiles/guns/energy/hooklauncher.dm @@ -2,7 +2,7 @@ * Contains weapons primarily using the 'grappling hook' projectiles. */ -/obj/item/weapon/gun/energy/hooklauncher +/obj/item/gun/energy/hooklauncher name = "gravity whip" desc = "A large, strange gauntlet." icon = 'icons/obj/gun2.dmi' @@ -14,12 +14,12 @@ charge_cost = 300 charge_meter = FALSE - cell_type = /obj/item/weapon/cell/device/weapon + cell_type = /obj/item/cell/device/weapon projectile_type = /obj/item/projectile/energy/hook // An easily concealable not-ripoff version. It would be silenced, if it didn't make it blatant you're the one using it. -/obj/item/weapon/gun/energy/hooklauncher/ring +/obj/item/gun/energy/hooklauncher/ring name = "ominous ring" desc = "A small ring with strange symbols engraved upon it." icon = 'icons/inventory/hands/item.dmi' @@ -28,7 +28,7 @@ w_class = ITEMSIZE_TINY - cell_type = /obj/item/weapon/cell/device/weapon/recharge/alien + cell_type = /obj/item/cell/device/weapon/recharge/alien battery_lock = TRUE charge_cost = 400 diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm index 40e9d37f96b..3349c214f91 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm @@ -41,7 +41,7 @@ if(T.z in using_map.station_levels) . = FALSE -/obj/item/weapon/gun/energy/kinetic_accelerator +/obj/item/gun/energy/kinetic_accelerator name = "proto-kinetic accelerator" desc = "A self recharging, ranged mining tool that does increased damage in low pressure." icon = 'icons/obj/gun_vr.dmi' @@ -52,7 +52,7 @@ ) item_state = "kineticgun" // ammo_type = list(/obj/item/ammo_casing/energy/kinetic) - cell_type = /obj/item/weapon/cell/device/weapon/empproof + cell_type = /obj/item/cell/device/weapon/empproof item_flags = NONE charge_meter = FALSE // obj_flags = UNIQUE_RENAME @@ -80,7 +80,7 @@ var/recharge_timerid -/obj/item/weapon/gun/energy/kinetic_accelerator/consume_next_projectile() +/obj/item/gun/energy/kinetic_accelerator/consume_next_projectile() if(overheat) return . = ..() @@ -88,18 +88,18 @@ var/obj/item/projectile/P = . modify_projectile(P) -/obj/item/weapon/gun/energy/kinetic_accelerator/handle_post_fire(mob/user, atom/target, pointblank, reflex) +/obj/item/gun/energy/kinetic_accelerator/handle_post_fire(mob/user, atom/target, pointblank, reflex) . = ..() attempt_reload() -/obj/item/weapon/gun/energy/kinetic_accelerator/premiumka +/obj/item/gun/energy/kinetic_accelerator/premiumka name = "premium accelerator" desc = "A premium kinetic accelerator fitted with an extended barrel and increased pressure tank." icon_state = "premiumgun" item_state = "premiumgun" projectile_type = /obj/item/projectile/kinetic/premium -/obj/item/weapon/gun/energy/kinetic_accelerator/examine(mob/user) +/obj/item/gun/energy/kinetic_accelerator/examine(mob/user) . = ..() if(max_mod_capacity) . += "[get_remaining_mod_capacity()]% mod capacity remaining." @@ -107,13 +107,13 @@ var/obj/item/borg/upgrade/modkit/M = A . += "There is \a [M] installed, using [M.cost]% capacity." -/obj/item/weapon/gun/energy/kinetic_accelerator/Exited(atom/movable/AM) +/obj/item/gun/energy/kinetic_accelerator/Exited(atom/movable/AM) . = ..() if((AM in modkits) && istype(AM, /obj/item/borg/upgrade/modkit)) var/obj/item/borg/upgrade/modkit/M = AM M.uninstall(src, FALSE) -/obj/item/weapon/gun/energy/kinetic_accelerator/attackby(obj/item/I, mob/user) +/obj/item/gun/energy/kinetic_accelerator/attackby(obj/item/I, mob/user) if(I.has_tool_quality(TOOL_CROWBAR)) if(modkits.len) to_chat(user, "You pry the modifications out.") @@ -128,76 +128,76 @@ else ..() -/obj/item/weapon/gun/energy/kinetic_accelerator/proc/get_remaining_mod_capacity() +/obj/item/gun/energy/kinetic_accelerator/proc/get_remaining_mod_capacity() var/current_capacity_used = 0 for(var/A in get_modkits()) var/obj/item/borg/upgrade/modkit/M = A current_capacity_used += M.cost return max_mod_capacity - current_capacity_used -/obj/item/weapon/gun/energy/kinetic_accelerator/proc/get_modkits() +/obj/item/gun/energy/kinetic_accelerator/proc/get_modkits() . = list() for(var/A in modkits) . += A -/obj/item/weapon/gun/energy/kinetic_accelerator/proc/modify_projectile(obj/item/projectile/kinetic/K) +/obj/item/gun/energy/kinetic_accelerator/proc/modify_projectile(obj/item/projectile/kinetic/K) K.kinetic_gun = src //do something special on-hit, easy! for(var/A in get_modkits()) var/obj/item/borg/upgrade/modkit/M = A M.modify_projectile(K) -/obj/item/weapon/gun/energy/kinetic_accelerator/cyborg +/obj/item/gun/energy/kinetic_accelerator/cyborg holds_charge = TRUE unique_frequency = TRUE -/obj/item/weapon/gun/energy/kinetic_accelerator/cyborg/Destroy() +/obj/item/gun/energy/kinetic_accelerator/cyborg/Destroy() for(var/obj/item/borg/upgrade/modkit/M in modkits) M.uninstall(src) return ..() -/obj/item/weapon/gun/energy/kinetic_accelerator/premiumka/cyborg +/obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg holds_charge = TRUE unique_frequency = TRUE -/obj/item/weapon/gun/energy/kinetic_accelerator/premiumka/cyborg/Destroy() +/obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg/Destroy() for(var/obj/item/borg/upgrade/modkit/M in modkits) M.uninstall(src) return ..() -/obj/item/weapon/gun/energy/kinetic_accelerator/minebot +/obj/item/gun/energy/kinetic_accelerator/minebot // trigger_guard = TRIGGER_GUARD_ALLOW_ALL overheat_time = 20 holds_charge = TRUE unique_frequency = TRUE -/obj/item/weapon/gun/energy/kinetic_accelerator/Initialize() +/obj/item/gun/energy/kinetic_accelerator/Initialize() . = ..() if(!holds_charge) empty() AddElement(/datum/element/conflict_checking, CONFLICT_ELEMENT_KA) -/obj/item/weapon/gun/energy/kinetic_accelerator/equipped(mob/user) +/obj/item/gun/energy/kinetic_accelerator/equipped(mob/user) . = ..() if(power_supply.charge < charge_cost) attempt_reload() -/obj/item/weapon/gun/energy/kinetic_accelerator/dropped(mob/user) +/obj/item/gun/energy/kinetic_accelerator/dropped(mob/user) . = ..() if(!QDELING(src) && !holds_charge) // Put it on a delay because moving item from slot to hand // calls dropped(). addtimer(CALLBACK(src, PROC_REF(empty_if_not_held)), 2) -/obj/item/weapon/gun/energy/kinetic_accelerator/proc/empty_if_not_held() +/obj/item/gun/energy/kinetic_accelerator/proc/empty_if_not_held() if(!ismob(loc) && !istype(loc, /obj/item/integrated_circuit)) empty() -/obj/item/weapon/gun/energy/kinetic_accelerator/proc/empty() +/obj/item/gun/energy/kinetic_accelerator/proc/empty() if(power_supply) power_supply.use(power_supply.charge) update_icon() -/obj/item/weapon/gun/energy/kinetic_accelerator/proc/attempt_reload(recharge_time) +/obj/item/gun/energy/kinetic_accelerator/proc/attempt_reload(recharge_time) if(!power_supply) return if(overheat) @@ -212,10 +212,10 @@ deltimer(recharge_timerid) recharge_timerid = addtimer(CALLBACK(src, PROC_REF(reload)), recharge_time * carried, TIMER_STOPPABLE) -/obj/item/weapon/gun/energy/kinetic_accelerator/emp_act(severity) +/obj/item/gun/energy/kinetic_accelerator/emp_act(severity) return -/obj/item/weapon/gun/energy/kinetic_accelerator/proc/reload() +/obj/item/gun/energy/kinetic_accelerator/proc/reload() power_supply.give(power_supply.maxcharge) // process_chamber() // if(!suppressed) @@ -225,7 +225,7 @@ overheat = FALSE update_icon() -/obj/item/weapon/gun/energy/kinetic_accelerator/update_icon() +/obj/item/gun/energy/kinetic_accelerator/update_icon() cut_overlays() if(overheat || !power_supply || (power_supply.charge == 0)) add_overlay(emptystate) @@ -247,7 +247,7 @@ var/pressure_decrease_active = FALSE var/pressure_decrease = 1/3 var/environment = KA_ENVIRO_TYPE_COLD - var/obj/item/weapon/gun/energy/kinetic_accelerator/kinetic_gun + var/obj/item/gun/energy/kinetic_accelerator/kinetic_gun /obj/item/projectile/kinetic/premium damage = 40 @@ -368,20 +368,20 @@ . += "Occupies [cost]% of mod capacity." /obj/item/borg/upgrade/modkit/attackby(obj/item/A, mob/user) - if(istype(A, /obj/item/weapon/gun/energy/kinetic_accelerator)) + if(istype(A, /obj/item/gun/energy/kinetic_accelerator)) install(A, user) else ..() /* /obj/item/borg/upgrade/modkit/afterInstall(mob/living/silicon/robot/R) - for(var/obj/item/weapon/gun/energy/kinetic_accelerator/H in R.module.modules) + for(var/obj/item/gun/energy/kinetic_accelerator/H in R.module.modules) if(install(H, R)) //It worked return to_chat(R, "Upgrade error - Aborting Kinetic Accelerator linking.") //No applicable KA found, insufficient capacity, or some other problem. */ -/obj/item/borg/upgrade/modkit/proc/install(obj/item/weapon/gun/energy/kinetic_accelerator/KA, mob/user) +/obj/item/borg/upgrade/modkit/proc/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user) . = TRUE if(src in KA.modkits) // Sanity check to prevent installing the same modkit twice thanks to occasional click/lag delays. return FALSE @@ -408,7 +408,7 @@ to_chat(user, "You don't have room([KA.get_remaining_mod_capacity()]% remaining, [cost]% needed) to install this modkit. Use a crowbar to remove existing modkits.") . = FALSE -/obj/item/borg/upgrade/modkit/proc/uninstall(obj/item/weapon/gun/energy/kinetic_accelerator/KA, forcemove = TRUE) +/obj/item/borg/upgrade/modkit/proc/uninstall(obj/item/gun/energy/kinetic_accelerator/KA, forcemove = TRUE) KA.modkits -= src if(forcemove) forceMove(get_turf(KA)) @@ -416,11 +416,11 @@ //use this one to modify the projectile itself /obj/item/borg/upgrade/modkit/proc/modify_projectile(obj/item/projectile/kinetic/K) //use this one for effects you want to trigger before any damage is done at all and before damage is decreased by pressure -/obj/item/borg/upgrade/modkit/proc/projectile_prehit(obj/item/projectile/kinetic/K, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) +/obj/item/borg/upgrade/modkit/proc/projectile_prehit(obj/item/projectile/kinetic/K, atom/target, obj/item/gun/energy/kinetic_accelerator/KA) //use this one for effects you want to trigger before mods that do damage -/obj/item/borg/upgrade/modkit/proc/projectile_strike_predamage(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) +/obj/item/borg/upgrade/modkit/proc/projectile_strike_predamage(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/gun/energy/kinetic_accelerator/KA) //and this one for things that don't need to trigger before other damage-dealing mods -/obj/item/borg/upgrade/modkit/proc/projectile_strike(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) +/obj/item/borg/upgrade/modkit/proc/projectile_strike(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/gun/energy/kinetic_accelerator/KA) //Range /obj/item/borg/upgrade/modkit/range @@ -451,7 +451,7 @@ minebot_upgrade = FALSE var/decreased -/obj/item/borg/upgrade/modkit/cooldown/install(obj/item/weapon/gun/energy/kinetic_accelerator/KA, mob/user) +/obj/item/borg/upgrade/modkit/cooldown/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user) . = ..() if(.) var/old = KA.overheat_time @@ -459,7 +459,7 @@ decreased = old - KA.overheat_time -/obj/item/borg/upgrade/modkit/cooldown/uninstall(obj/item/weapon/gun/energy/kinetic_accelerator/KA) +/obj/item/borg/upgrade/modkit/cooldown/uninstall(obj/item/gun/energy/kinetic_accelerator/KA) KA.overheat_time += decreased ..() @@ -481,7 +481,7 @@ var/turf_aoe = FALSE var/stats_stolen = FALSE -/obj/item/borg/upgrade/modkit/aoe/install(obj/item/weapon/gun/energy/kinetic_accelerator/KA, mob/user) +/obj/item/borg/upgrade/modkit/aoe/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user) . = ..() if(.) for(var/obj/item/borg/upgrade/modkit/aoe/AOE in KA.modkits) //make sure only one of the aoe modules has values if somebody has multiple @@ -493,7 +493,7 @@ AOE.turf_aoe = FALSE AOE.stats_stolen = TRUE -/obj/item/borg/upgrade/modkit/aoe/uninstall(obj/item/weapon/gun/energy/kinetic_accelerator/KA) +/obj/item/borg/upgrade/modkit/aoe/uninstall(obj/item/gun/energy/kinetic_accelerator/KA) ..() modifier = initial(modifier) //get our modifiers back turf_aoe = initial(turf_aoe) @@ -502,7 +502,7 @@ /obj/item/borg/upgrade/modkit/aoe/modify_projectile(obj/item/projectile/kinetic/K) K.name = "kinetic explosion" -/obj/item/borg/upgrade/modkit/aoe/projectile_strike(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) +/obj/item/borg/upgrade/modkit/aoe/projectile_strike(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/gun/energy/kinetic_accelerator/KA) if(stats_stolen) return new /obj/effect/temp_visual/explosion/fast(target_turf) @@ -550,7 +550,7 @@ modifier = -14 //Makes the cooldown 3 seconds(with no cooldown mods) if you miss. Don't miss. cost = 50 -/obj/item/borg/upgrade/modkit/cooldown/repeater/projectile_strike_predamage(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) +/obj/item/borg/upgrade/modkit/cooldown/repeater/projectile_strike_predamage(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/gun/energy/kinetic_accelerator/KA) var/valid_repeat = FALSE if(isliving(target)) var/mob/living/L = target @@ -571,7 +571,7 @@ cost = 20 var/static/list/damage_heal_order = list(BRUTE, BURN, OXY) -/obj/item/borg/upgrade/modkit/lifesteal/projectile_prehit(obj/item/projectile/kinetic/K, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) +/obj/item/borg/upgrade/modkit/lifesteal/projectile_prehit(obj/item/projectile/kinetic/K, atom/target, obj/item/gun/energy/kinetic_accelerator/KA) if(isliving(target) && isliving(K.firer)) var/mob/living/L = target if(L.stat == DEAD) @@ -587,7 +587,7 @@ cost = 30 modifier = 0.25 //A bonus 15 damage if you burst the field on a target, 60 if you lure them into it. -/obj/item/borg/upgrade/modkit/resonator_blasts/projectile_strike(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) +/obj/item/borg/upgrade/modkit/resonator_blasts/projectile_strike(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/gun/energy/kinetic_accelerator/KA) if(target_turf && !ismineralturf(target_turf)) //Don't make fields on mineral turfs. var/obj/effect/resonance/R = locate(/obj/effect/resonance) in target_turf if(R) @@ -606,7 +606,7 @@ var/maximum_bounty = 25 var/list/bounties_reaped = list() -/obj/item/borg/upgrade/modkit/bounty/projectile_prehit(obj/item/projectile/kinetic/K, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) +/obj/item/borg/upgrade/modkit/bounty/projectile_prehit(obj/item/projectile/kinetic/K, atom/target, obj/item/gun/energy/kinetic_accelerator/KA) if(isliving(target)) var/mob/living/L = target var/list/existing_marks = L.has_status_effect_list(STATUS_EFFECT_SYPHONMARK) @@ -617,7 +617,7 @@ qdel(SM) L.apply_status_effect(STATUS_EFFECT_SYPHONMARK, src) -/obj/item/borg/upgrade/modkit/bounty/projectile_strike(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) +/obj/item/borg/upgrade/modkit/bounty/projectile_strike(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/gun/energy/kinetic_accelerator/KA) if(isliving(target)) var/mob/living/L = target if(bounties_reaped[L.type]) @@ -681,12 +681,12 @@ cost = 20 denied_type = /obj/item/borg/upgrade/modkit/trigger_guard -/obj/item/borg/upgrade/modkit/trigger_guard/install(obj/item/weapon/gun/energy/kinetic_accelerator/KA, mob/user) +/obj/item/borg/upgrade/modkit/trigger_guard/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user) . = ..() if(.) KA.trigger_guard = TRIGGER_GUARD_ALLOW_ALL -/obj/item/borg/upgrade/modkit/trigger_guard/uninstall(obj/item/weapon/gun/energy/kinetic_accelerator/KA) +/obj/item/borg/upgrade/modkit/trigger_guard/uninstall(obj/item/gun/energy/kinetic_accelerator/KA) KA.trigger_guard = TRIGGER_GUARD_NORMAL ..() */ @@ -701,13 +701,13 @@ var/chassis_icon = "kineticgun_u" var/chassis_name = "super-kinetic accelerator" -/obj/item/borg/upgrade/modkit/chassis_mod/install(obj/item/weapon/gun/energy/kinetic_accelerator/KA, mob/user) +/obj/item/borg/upgrade/modkit/chassis_mod/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user) . = ..() if(.) KA.icon_state = chassis_icon KA.name = chassis_name -/obj/item/borg/upgrade/modkit/chassis_mod/uninstall(obj/item/weapon/gun/energy/kinetic_accelerator/KA) +/obj/item/borg/upgrade/modkit/chassis_mod/uninstall(obj/item/gun/energy/kinetic_accelerator/KA) KA.icon_state = initial(KA.icon_state) KA.name = initial(KA.name) ..() diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index b854b855ab3..79ade7ccad8 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -1,7 +1,7 @@ /* * Laser Rifle */ -/obj/item/weapon/gun/energy/laser +/obj/item/gun/energy/laser name = "laser rifle" desc = "A Hephaestus Industries G40E rifle, designed to kill with concentrated energy blasts. This variant has the ability to \ switch between standard fire and a more efficent but weaker 'suppressive' fire." @@ -23,15 +23,15 @@ list(mode_name="suppressive", fire_delay=5, projectile_type=/obj/item/projectile/beam/weaklaser, charge_cost = 60), ) -/obj/item/weapon/gun/energy/laser/empty +/obj/item/gun/energy/laser/empty cell_type = null -/obj/item/weapon/gun/energy/laser/mounted +/obj/item/gun/energy/laser/mounted self_recharge = 1 use_external_power = 1 one_handed_penalty = 0 // Not sure if two-handing gets checked for mounted weapons, but better safe than sorry. -/obj/item/weapon/gun/energy/laser/mounted/augment +/obj/item/gun/energy/laser/mounted/augment name = "arm-laser" desc = "A cruel malformation of a Hephaestus Industries G40E rifle, designed to kill with concentrated energy blasts, all while being stowable in the arm. This variant has the ability to \ switch between standard fire and a more efficent but weaker 'suppressive' fire." @@ -43,13 +43,13 @@ one_handed_penalty = 5 battery_lock = 1 -/obj/item/weapon/gun/energy/laser/practice +/obj/item/gun/energy/laser/practice name = "practice laser carbine" desc = "A modified version of the HI G40E, this one fires less concentrated energy bolts designed for target practice." projectile_type = /obj/item/projectile/beam/practice charge_cost = 48 - cell_type = /obj/item/weapon/cell/device + cell_type = /obj/item/cell/device firemodes = list( list(mode_name="normal", projectile_type=/obj/item/projectile/beam/practice, charge_cost = 48), @@ -59,7 +59,7 @@ /* * Sleek Laser Rifle */ -/obj/item/weapon/gun/energy/laser/sleek +/obj/item/gun/energy/laser/sleek name = "\improper LR1 \"Shishi\"" desc = "A Bishamonten Company LR1 \"Shishi\" rifle, a rare early 23rd century futurist design with a nonetheless timeless ability to kill." description_fluff = "Bisamonten was arms company that operated from roughly 2150-2280 - the height of the first extrasolar colonisation boom - before filing for \ @@ -73,7 +73,7 @@ /* * Retro Laser Rifle */ -/obj/item/weapon/gun/energy/retro +/obj/item/gun/energy/retro name = "retro laser" icon_state = "retro" item_state = "retro" @@ -83,18 +83,18 @@ projectile_type = /obj/item/projectile/beam fire_delay = 10 //old technology -/obj/item/weapon/gun/energy/retro/mounted +/obj/item/gun/energy/retro/mounted self_recharge = 1 use_external_power = 1 -/obj/item/weapon/gun/energy/retro/empty +/obj/item/gun/energy/retro/empty icon_state = "retro" cell_type = null /* * Alien Pistol */ -/obj/item/weapon/gun/energy/alien +/obj/item/gun/energy/alien name = "alien pistol" desc = "A weapon that works very similarly to a traditional energy weapon. How this came to be will likely be a mystery for the ages." catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_pistol) @@ -104,7 +104,7 @@ charge_cost = 480 // Five shots. projectile_type = /obj/item/projectile/beam/cyan - cell_type = /obj/item/weapon/cell/device/weapon/recharge/alien // Self charges. + cell_type = /obj/item/cell/device/weapon/recharge/alien // Self charges. origin_tech = list(TECH_COMBAT = 8, TECH_MAGNET = 7) modifystate = "alienpistol" @@ -139,7 +139,7 @@ /* * Antique Laser Gun */ -/obj/item/weapon/gun/energy/captain +/obj/item/gun/energy/captain name = "antique laser gun" icon_state = "caplaser" item_state = "caplaser" @@ -155,12 +155,12 @@ origin_tech = null fire_delay = 10 //Old pistol charge_cost = 480 //to compensate a bit for self-recharging - cell_type = /obj/item/weapon/cell/device/weapon/recharge/captain + cell_type = /obj/item/cell/device/weapon/recharge/captain battery_lock = 1 var/remainingshots = 0 //you may get a limited number of shots regardless of the charge var/failurechance = 0 //chance per shot of something going awry -/obj/item/weapon/gun/energy/captain/Initialize() +/obj/item/gun/energy/captain/Initialize() //it's an antique and it's been sitting in a case, unmaintained, for who the hell knows how long - who knows what'll happen when you pull it out? ..() //first, we decide, does it have a different type of beam? 75% of just being a 40-damage laser, 15% of being less or 0, 10% of being better @@ -184,7 +184,7 @@ if(remainingshots || failurechance) desc = "A rare weapon, produced by the Lunar Arms Company around 2105 - one of humanity's first wholly extra-terrestrial weapon designs. It's been reasonably well-preserved." -/obj/item/weapon/gun/energy/captain/special_check(var/mob/user) +/obj/item/gun/energy/captain/special_check(var/mob/user) if(remainingshots) remainingshots -= 1 if(!remainingshots) //you've shot your load, sonny @@ -195,7 +195,7 @@ return 0 return ..() -/obj/item/weapon/gun/energy/captain/proc/burnout(var/mob/user) +/obj/item/gun/energy/captain/proc/burnout(var/mob/user) //your gun is now rendered useless projectile_type = /obj/item/projectile/beam/practice //just in case you somehow manage to get it to fire again, its beam type is set to one that sucks power_supply.charge = 0 @@ -208,7 +208,7 @@ sparks.start() update_icon() -/obj/item/weapon/gun/energy/captain/proc/malfunction(var/mob/user) +/obj/item/gun/energy/captain/proc/malfunction(var/mob/user) var/screwup = rand(1,10) switch(screwup) if(1 to 5) //50% of just draining the battery and making future malfunctions more likely @@ -263,7 +263,7 @@ /* * Laser Cannon */ -/obj/item/weapon/gun/energy/lasercannon +/obj/item/gun/energy/lasercannon name = "laser cannon" desc = "With the laser cannon, the lasing medium is enclosed in a tube lined with uranium-235 and subjected to high neutron \ flux in a nuclear reactor core. This incredible technology may help YOU achieve high excitation rates with small laser volumes!" @@ -280,7 +280,7 @@ accuracy = 45 charge_cost = 600 -/obj/item/weapon/gun/energy/lasercannon/mounted +/obj/item/gun/energy/lasercannon/mounted name = "mounted laser cannon" self_recharge = 1 use_external_power = 1 @@ -294,7 +294,7 @@ /* * X-ray */ -/obj/item/weapon/gun/energy/xray +/obj/item/gun/energy/xray name = "xray laser gun" desc = "A high-power laser gun capable of expelling concentrated xray blasts, which are able to penetrate matter easier than \ standard photonic beams, resulting in an effective 'anti-armor' energy weapon." @@ -307,7 +307,7 @@ /* * Marksman Rifle */ -/obj/item/weapon/gun/energy/sniperrifle +/obj/item/gun/energy/sniperrifle name = "marksman energy rifle" desc = "The HI DMR 9E is an older design of Hephaestus Industries. A designated marksman rifle capable of shooting powerful \ ionized beams, this is a weapon to kill from a distance." @@ -329,10 +329,10 @@ scoped_accuracy = 50 one_handed_penalty = 60 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand. -/obj/item/weapon/gun/energy/sniperrifle/ui_action_click() +/obj/item/gun/energy/sniperrifle/ui_action_click() scope() -/obj/item/weapon/gun/energy/sniperrifle/verb/scope() +/obj/item/gun/energy/sniperrifle/verb/scope() set category = "Object" set name = "Use Scope" set popup_menu = 1 @@ -342,7 +342,7 @@ /* * Laser Scattergun (proof of concept) */ -/obj/item/weapon/gun/energy/lasershotgun +/obj/item/gun/energy/lasershotgun name = "laser scattergun" icon = 'icons/obj/energygun.dmi' item_state = "laser" @@ -355,7 +355,7 @@ /* * Imperial Pistol */ -/obj/item/weapon/gun/energy/imperial +/obj/item/gun/energy/imperial name = "imperial energy pistol" desc = "An elegant weapon developed by the Imperium Auream. Their weaponsmiths have cleverly found a way to make a gun that \ is only about the size of an average energy pistol, yet with the fire power of a laser carbine." @@ -374,7 +374,7 @@ /* * Mining-Laser Rifle */ -/obj/item/weapon/gun/energy/mininglaser +/obj/item/gun/energy/mininglaser name = "mining-laser rifle" desc = "An industrial grade mining laser. Comes with a built-in 'stun' mode for encounters with local wildlife." icon = 'icons/obj/gun.dmi' @@ -396,7 +396,7 @@ /* * Old Laser Rifle */ -/obj/item/weapon/gun/energy/laser/old +/obj/item/gun/energy/laser/old name = "vintage laser rifle" desc = "A Hephaestus Industries G32E rifle, designed to kill with concentrated energy blasts. This older model laser rifle only has one firemode." description_fluff = "The leading arms producer in the SCG, Hephaestus typically only uses its 'top level' branding for its military-grade \ @@ -414,7 +414,7 @@ /* * Mono-Rifle */ -/obj/item/weapon/gun/energy/monorifle +/obj/item/gun/energy/monorifle name = "antique mono-rifle" desc = "An old model laser rifle with a nice wood finish. This weapon was only designed to fire once before requiring a recharge." description_fluff = "Modeled after ancient hunting rifles designs, this rifle was dubbed the 'Rainy Day Special' by some, due to its use as the \ @@ -434,17 +434,17 @@ charge_meter = FALSE var/scope_multiplier = 1.5 -/obj/item/weapon/gun/energy/monorifle/ui_action_click() +/obj/item/gun/energy/monorifle/ui_action_click() sights() -/obj/item/weapon/gun/energy/monorifle/verb/sights() +/obj/item/gun/energy/monorifle/verb/sights() set category = "Object" set name = "Aim Down Sights" set popup_menu = 1 toggle_scope(scope_multiplier) -/obj/item/weapon/gun/energy/monorifle/combat +/obj/item/gun/energy/monorifle/combat name = "combat mono-rifle" desc = "A modernized version of the classic mono-rifle. This one has an optimized capacitor bank that allows the rifle to fire twice before requiring a recharge." description_fluff = "A modern design of a classic rifle produced by a small arms company operating out of Saint Columbia. It was based on the \ diff --git a/code/modules/projectiles/guns/energy/netgun_vr.dm b/code/modules/projectiles/guns/energy/netgun_vr.dm index b19169196ba..d4da5c4ae3a 100644 --- a/code/modules/projectiles/guns/energy/netgun_vr.dm +++ b/code/modules/projectiles/guns/energy/netgun_vr.dm @@ -1,6 +1,6 @@ //Contains the Energy Net Gun code and information/lore -/obj/item/weapon/gun/energy/netgun +/obj/item/gun/energy/netgun name = "energy net gun" desc = "Specially made-to-order by Xenonomix, the \"Varmint Catcher\" is designed to trap even the most unruly of creatures for safe transport." description_fluff = "The Xenonomix Brand XX-1 Energy Net Cannon is a marvel of technology that is used heavily by several departments within NanoTrasen. \ @@ -17,7 +17,7 @@ charge_cost = 800 fire_delay = 50 -/obj/item/weapon/gun/energy/netgun/update_icon() +/obj/item/gun/energy/netgun/update_icon() if(power_supply == null) if(modifystate) icon_state = "[modifystate]_open" diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 92e91b58aa7..224141ab0c2 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -1,7 +1,7 @@ /* * Energy Gun */ -/obj/item/weapon/gun/energy/gun +/obj/item/gun/energy/gun name = "energy gun" desc = "Another bestseller of Lawson Arms, the LAEP80 Thor is a versatile energy based pistol, capable of switching between low and high \ capacity projectile settings. In other words: Stun or Kill." @@ -23,7 +23,7 @@ /* * Energy Rifle */ -/obj/item/weapon/gun/energy/gun/rifle +/obj/item/gun/energy/gun/rifle name = "energy rifle" desc = "Another bestseller of Lawson Arms, the LAEP100 Svarog is a versatile energy rifle, capable of switching between low and high capacity \ projectile settings. In other words: Stun or Kill." @@ -47,7 +47,7 @@ /* * Energy Carbine (Burst Laser) */ -/obj/item/weapon/gun/energy/gun/burst +/obj/item/gun/energy/gun/burst name = "energy carbine" desc = "The Lawson Arms FM-2t is a versatile energy based carbine made from modifying the original LAEP100 design. It is capable of switching \ between stun or kill with a three round burst option for both settings." @@ -71,7 +71,7 @@ /* * Energy Thompson (RCW) */ -/obj/item/weapon/gun/energy/gun/etommy +/obj/item/gun/energy/gun/etommy name = "Energy RCW" desc = "The Lawson Arms experimental Rapid Capacitor Weapon is a highly reguarded and deadly peice of military hardware. Using a large drum shaped \ capacitor bank the weapon is capable of accurate, rapid burst fire." @@ -96,7 +96,7 @@ /* * Energy PDW (Martin) */ -/obj/item/weapon/gun/energy/gun/compact +/obj/item/gun/energy/gun/compact name = "personal energy weapon" desc = "The RayZar EW20 \"Martin\" personal energy weapon - or PEW - is Ward-Takahasi's entry into the variable capacity energy gun market. \ New users are advised to 'set RayZars to stun'." @@ -117,7 +117,7 @@ /* * Energy Luger */ -/obj/item/weapon/gun/energy/gun/eluger +/obj/item/gun/energy/gun/eluger name = "energy Luger" desc = "The finest sidearm produced by RauMauser. Although its battery cannot be removed, its ergonomic design makes it easy to shoot, allowing \ for rapid follow-up shots. It also has the ability to toggle between stun and kill." @@ -138,7 +138,7 @@ /* * Mounted Energy Gun */ -/obj/item/weapon/gun/energy/gun/mounted +/obj/item/gun/energy/gun/mounted name = "mounted energy gun" self_recharge = 1 use_external_power = 1 @@ -146,7 +146,7 @@ /* * Nuclear Energy Gun */ -/obj/item/weapon/gun/energy/gun/nuclear +/obj/item/gun/energy/gun/nuclear name = "advanced energy gun" desc = "An energy gun with an experimental miniaturized reactor, based on a Lawson Arms platform." icon_state = "nucgunstun" @@ -156,7 +156,7 @@ force = 8 //looks heavier than a pistol w_class = ITEMSIZE_LARGE //Looks bigger than a pistol, too. fire_delay = 6 //This one's not a handgun, it should have the same fire delay as everything else - cell_type = /obj/item/weapon/cell/device/weapon/recharge + cell_type = /obj/item/cell/device/weapon/recharge battery_lock = 1 modifystate = null diff --git a/code/modules/projectiles/guns/energy/particle.dm b/code/modules/projectiles/guns/energy/particle.dm index a9e64b1d6b3..d3c4d536f04 100644 --- a/code/modules/projectiles/guns/energy/particle.dm +++ b/code/modules/projectiles/guns/energy/particle.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/energy/particle //base gun, similar stats to an egun +/obj/item/gun/energy/particle //base gun, similar stats to an egun name = "Anti-particle projector pistol" icon_state = "ppistol" item_state = "ppistol" @@ -22,7 +22,7 @@ var/obj/item/pressurelock/attached_safety -/obj/item/weapon/gun/energy/particle/advanced //particle equivalent of AEG +/obj/item/gun/energy/particle/advanced //particle equivalent of AEG name = "Advanced anti-particle rifle" icon_state = "particle" item_state = "particle" @@ -38,7 +38,7 @@ recharge_time = 6 // every 6 ticks, recharge 2 shots. Slightly slower than AEG. charge_delay = 10 //Starts recharging faster after firing than an AEG though. -/obj/item/weapon/gun/energy/particle/cannon //particle version of laser cannon +/obj/item/gun/energy/particle/cannon //particle version of laser cannon name = "Anti-particle cannon" desc = "A giant beast of an antimatter gun, packed with an internal reactor to allow for extreme longevity on remote mining expeditions." icon_state = "heavyparticle" @@ -60,7 +60,7 @@ //special behaviours for particle guns below -/obj/item/weapon/gun/energy/particle/special_check(var/mob/user) +/obj/item/gun/energy/particle/special_check(var/mob/user) if (..()) var/turf/T = get_turf(src) var/datum/gas_mixture/environment = T ? T.return_air() : null @@ -82,7 +82,7 @@ return 1 return 0 -/obj/item/weapon/gun/energy/particle/proc/pressuremalfunction(severity, var/mob/user, var/turf/T) +/obj/item/gun/energy/particle/proc/pressuremalfunction(severity, var/mob/user, var/turf/T) if (severity <= 10) // just doesn't fire. 10% chance in 100 atmo. user.visible_message("*click*", "\The [src] jams.") playsound(src, 'sound/weapons/empty.ogg', 100, 1) @@ -124,11 +124,11 @@ explosion(T, -1, 1, 2, 2) qdel(src) -/obj/item/weapon/gun/energy/particle/cannon/pressuremalfunction(severity, user, T) +/obj/item/gun/energy/particle/cannon/pressuremalfunction(severity, user, T) ..(severity*2, user, T) -/obj/item/weapon/gun/energy/particle/attackby(var/obj/item/A as obj, mob/user as mob) +/obj/item/gun/energy/particle/attackby(var/obj/item/A as obj, mob/user as mob) if(istype(A, /obj/item/pressurelock)) if(safetycatch) to_chat(user, "\The [src] already has a [attached_safety].") @@ -140,7 +140,7 @@ safetycatch = 1 return - if(istype(A, /obj/item/weapon/tool/screwdriver)) + if(istype(A, /obj/item/tool/screwdriver)) if(safetycatch && attached_safety) to_chat(user, "You begin removing \the [attached_safety] from \the [src].") if(do_after(user, 25)) diff --git a/code/modules/projectiles/guns/energy/phase.dm b/code/modules/projectiles/guns/energy/phase.dm index 5c4628fe238..bb99cac1d7b 100644 --- a/code/modules/projectiles/guns/energy/phase.dm +++ b/code/modules/projectiles/guns/energy/phase.dm @@ -1,6 +1,6 @@ // Phase weapons go here -/obj/item/weapon/gun/energy/phasegun +/obj/item/gun/energy/phasegun name = "phase carbine" desc = "The RayZar EW26 Artemis is a downsized energy weapon, specifically designed for use against wildlife." description_fluff = "RayZar is Ward-Takahashi’s main consumer weapons brand, known for producing and licensing a wide variety of specialist energy weapons of various types and quality primarily for the civilian market." @@ -12,16 +12,16 @@ projectile_type = /obj/item/projectile/energy/phase one_handed_penalty = 15 -/obj/item/weapon/gun/energy/phasegun/mounted +/obj/item/gun/energy/phasegun/mounted self_recharge = 1 use_external_power = 1 one_handed_penalty = 0 -/obj/item/weapon/gun/energy/phasegun/mounted/cyborg +/obj/item/gun/energy/phasegun/mounted/cyborg charge_cost = 400 recharge_time = 7 -/obj/item/weapon/gun/energy/phasegun/pistol +/obj/item/gun/energy/phasegun/pistol name = "phase pistol" desc = "The RayZar EW15 Apollo is an energy handgun, specifically designed for self-defense against aggressive wildlife." icon_state = "phase" @@ -32,16 +32,16 @@ projectile_type = /obj/item/projectile/energy/phase/light one_handed_penalty = 0 -/obj/item/weapon/gun/energy/phasegun/pistol/mounted +/obj/item/gun/energy/phasegun/pistol/mounted name = "mounted phase pistol" self_recharge = 1 use_external_power = 1 -/obj/item/weapon/gun/energy/phasegun/pistol/mounted/cyborg +/obj/item/gun/energy/phasegun/pistol/mounted/cyborg charge_cost = 400 recharge_time = 7 -/obj/item/weapon/gun/energy/phasegun/rifle +/obj/item/gun/energy/phasegun/rifle name = "phase rifle" desc = "The RayZar EW31 Orion is a specialist energy weapon, intended for use against hostile wildlife." icon_state = "phaserifle" @@ -54,7 +54,7 @@ accuracy = 15 one_handed_penalty = 30 -/obj/item/weapon/gun/energy/phasegun/cannon +/obj/item/gun/energy/phasegun/cannon name = "phase cannon" desc = "The RayZar EW50 Gaia is a massive energy weapon, purpose-built for clearing land. You feel dirty just looking at it." icon_state = "phasecannon" diff --git a/code/modules/projectiles/guns/energy/protector_vr.dm b/code/modules/projectiles/guns/energy/protector_vr.dm index 9324e654b64..122cfb98358 100644 --- a/code/modules/projectiles/guns/energy/protector_vr.dm +++ b/code/modules/projectiles/guns/energy/protector_vr.dm @@ -1,5 +1,5 @@ // -------------- Protector ------------- -/obj/item/weapon/gun/energy/gun/protector +/obj/item/gun/energy/gun/protector name = "secure small energy gun" desc = "The LAEP95 'Protector' is another firearm from Lawson Arms and "+TSC_HEPH+", unlike the Perun this is designed for issue to non-security staff. It contains a detachable cell, and an alert-level-locked lethal mode, only usable on code blue and higher. It also features an integrated flashlight!" @@ -41,26 +41,26 @@ var/emagged = FALSE -/obj/item/weapon/gun/energy/gun/protector/special_check(mob/user) +/obj/item/gun/energy/gun/protector/special_check(mob/user) if(!emagged && mode_name == "lethal" && get_security_level() == "green") to_chat(user,"The trigger refuses to depress while on the lethal setting under security level green!") return FALSE return ..() -/obj/item/weapon/gun/energy/gun/protector/ui_action_click(mob/user, actiontype) +/obj/item/gun/energy/gun/protector/ui_action_click(mob/user, actiontype) gun_light_on = !gun_light_on playsound(src, 'sound/weapons/empty.ogg', 40, TRUE) update_brightness(user) update_icon() -/obj/item/weapon/gun/energy/gun/protector/proc/update_brightness(mob/user = null) +/obj/item/gun/energy/gun/protector/proc/update_brightness(mob/user = null) if(gun_light_on) set_light(brightness_on) else set_light(0) -/obj/item/weapon/gun/energy/gun/protector/emag_act(var/remaining_charges,var/mob/user) +/obj/item/gun/energy/gun/protector/emag_act(var/remaining_charges,var/mob/user) ..() if(!emagged) emagged = TRUE @@ -69,7 +69,7 @@ return TRUE //Update icons from /tg/, so fancy! Use this more! -/obj/item/weapon/gun/energy/gun/protector/update_icon() +/obj/item/gun/energy/gun/protector/update_icon() cut_overlays() var/ratio = 0 @@ -114,13 +114,13 @@ item_state = itemState */ -/obj/item/weapon/gun/energy/gun/protector/unlocked +/obj/item/gun/energy/gun/protector/unlocked emagged = TRUE name = "small energy gun" desc = "The LAEP95 'Protector' is another firearm from Lawson Arms and "+TSC_HEPH+", unlike the Perun this is designed for issue to non-security staff. It contains a detachable cell. It also features an integrated flashlight!" -/obj/item/weapon/gun/energy/gun/protector/pilotgun/locked +/obj/item/gun/energy/gun/protector/pilotgun/locked name = "secure shuttle-protection pistol" desc = "The LAEP97 'Defender' is a variant of another firearm from Lawson Arms and "+TSC_HEPH+", designed to be issued to pilots for defence of their craft from trespassers whilst in-flight. It contains a detachable cell, two modes of fire and a safety interlock to minimize workplace accidents. It also features an integrated flashlight!" @@ -136,8 +136,8 @@ var/locked = 1 var/lockable = 1 -/obj/item/weapon/gun/energy/gun/protector/pilotgun/locked/attackby(obj/item/I, mob/user) - var/obj/item/weapon/card/id/id = I.GetID() +/obj/item/gun/energy/gun/protector/pilotgun/locked/attackby(obj/item/I, mob/user) + var/obj/item/card/id/id = I.GetID() if(istype(id) && lockable) if(check_access(id)) locked = !locked @@ -148,10 +148,10 @@ else return ..() -/obj/item/weapon/gun/energy/gun/protector/pilotgun/locked/emag_act(var/remaining_charges,var/mob/user) +/obj/item/gun/energy/gun/protector/pilotgun/locked/emag_act(var/remaining_charges,var/mob/user) return ..() -/obj/item/weapon/gun/energy/gun/protector/pilotgun/locked/special_check(mob/user) +/obj/item/gun/energy/gun/protector/pilotgun/locked/special_check(mob/user) if(locked) var/turf/T = get_turf(src) if(T.z in using_map.station_levels) diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index 6d4be1bbb70..3440716e109 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -1,7 +1,7 @@ /* * Pulse Rifle */ -/obj/item/weapon/gun/energy/pulse_rifle +/obj/item/gun/energy/pulse_rifle name = "\improper LP1 Locust Rifle" desc = "The Bishamonten LP1 is a weapon that uses advanced pulse-based beam generation technology to emit powerful laser blasts. \ Because of its complexity and cost, it is rarely seen in use except by specialists." @@ -20,14 +20,14 @@ list(mode_name="DESTROY", projectile_type=/obj/item/projectile/beam/pulse, fire_delay=null, charge_cost = 240), ) -/obj/item/weapon/gun/energy/pulse_rifle/mounted +/obj/item/gun/energy/pulse_rifle/mounted self_recharge = 1 use_external_power = 1 /* * Pulse Destroyer */ -/obj/item/weapon/gun/energy/pulse_rifle/destroyer +/obj/item/gun/energy/pulse_rifle/destroyer name = "\improper LP1 MkII" desc = "A more heavy-duty version of the Bishamonten LP1. It's had all its safety functions ripped out to facilitate the perfect killing machine." icon_state = "pulsedest" @@ -35,13 +35,13 @@ charge_cost = 120 fire_delay = 12 -/obj/item/weapon/gun/energy/pulse_rifle/destroyer/attack_self(mob/living/user as mob) +/obj/item/gun/energy/pulse_rifle/destroyer/attack_self(mob/living/user as mob) to_chat(user, "[src.name] has three settings, and they are all DESTROY.") /* * Pulse Carbine */ -/obj/item/weapon/gun/energy/pulse_rifle/carbine +/obj/item/gun/energy/pulse_rifle/carbine name = "\improper LP2 Grasshopper Carbine" desc = "The Bishamonten LP2 is a sleek, compact version of the LP1. Because of its smaller design it takes less time to charge a shot." icon_state = "pulsecarbine" @@ -57,7 +57,7 @@ /* * Pulse Pistol */ -/obj/item/weapon/gun/energy/pulse_rifle/compact +/obj/item/gun/energy/pulse_rifle/compact name = "\improper LP4 Mantis Compact" desc = "The Bishamonten LP4 was once the weapon of choice for military officers during the Hegemony War. Today it is little more than a collectors item." description_fluff = "The Bishamonten Company operated from roughly 2150-2280 - the height of the first extrasolar colonisation boom - before filing for \ @@ -70,7 +70,7 @@ icon_state = "pulsepistol" charge_cost = 480 -/obj/item/weapon/gun/energy/pulse_rifle/compact/admin +/obj/item/gun/energy/pulse_rifle/compact/admin name = "\improper LP4 Mantis Deluxe" desc = "It's not the size of the gun, it's the size of the hole it puts through people." charge_cost = 240 diff --git a/code/modules/projectiles/guns/energy/pummeler_vr.dm b/code/modules/projectiles/guns/energy/pummeler_vr.dm index b4dd9ad472d..98a7b0ca36d 100644 --- a/code/modules/projectiles/guns/energy/pummeler_vr.dm +++ b/code/modules/projectiles/guns/energy/pummeler_vr.dm @@ -1,5 +1,5 @@ // -------------- Pummeler ------------- -/obj/item/weapon/gun/energy/pummeler +/obj/item/gun/energy/pummeler name = "hypersonic gun" desc = "For when you want to get that pesky marketing guy out of your face ASAP. The PML9 'Pummeler' fires one HUGE \ sonic blast in the direction of fire, throwing the target away from you at high speed. Now you can REALLY \ diff --git a/code/modules/projectiles/guns/energy/pump.dm b/code/modules/projectiles/guns/energy/pump.dm index 5b9631be486..ae09d37548a 100644 --- a/code/modules/projectiles/guns/energy/pump.dm +++ b/code/modules/projectiles/guns/energy/pump.dm @@ -14,13 +14,13 @@ /* * Gun Locking Mechanism */ -/obj/item/weapon/gun/energy/locked +/obj/item/gun/energy/locked req_access = list(access_armory) //for toggling safety var/locked = 1 var/lockable = 1 -/obj/item/weapon/gun/energy/locked/attackby(obj/item/I, mob/user) - var/obj/item/weapon/card/id/id = I.GetID() +/obj/item/gun/energy/locked/attackby(obj/item/I, mob/user) + var/obj/item/card/id/id = I.GetID() if(istype(id) && lockable) if(check_access(id)) locked = !locked @@ -31,14 +31,14 @@ else return ..() -/obj/item/weapon/gun/energy/locked/emag_act(var/remaining_charges,var/mob/user) +/obj/item/gun/energy/locked/emag_act(var/remaining_charges,var/mob/user) ..() if(lockable) locked = !locked to_chat(user, "You [locked ? "enable" : "disable"] the safety lock on \the [src]!") return 1 -/obj/item/weapon/gun/energy/locked/special_check(mob/user) +/obj/item/gun/energy/locked/special_check(mob/user) if(locked) var/turf/T = get_turf(src) if(T.z in using_map.station_levels) @@ -49,7 +49,7 @@ /* * Expedition Frontier Phaser */ -/obj/item/weapon/gun/energy/locked/frontier +/obj/item/gun/energy/locked/frontier name = "frontier phaser" desc = "An extraordinarily rugged laser weapon, built to last and requiring effectively no maintenance. Includes a built-in crank \ charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility." @@ -80,7 +80,7 @@ list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser/blue, modifystate="phaserstun", charge_cost = 100), ) -/obj/item/weapon/gun/energy/locked/frontier/unload_ammo(var/mob/user) +/obj/item/gun/energy/locked/frontier/unload_ammo(var/mob/user) if(recharging) return recharging = 1 @@ -99,20 +99,20 @@ update_icon() user.hud_used.update_ammo_hud(user, src) // Update one last time once we're finished! -/obj/item/weapon/gun/energy/locked/frontier/update_icon() +/obj/item/gun/energy/locked/frontier/update_icon() if(recharging) icon_state = "[initial(icon_state)]_pump" update_held_icon() return ..() -/obj/item/weapon/gun/energy/locked/frontier/emp_act(severity) +/obj/item/gun/energy/locked/frontier/emp_act(severity) return ..(severity+2) -/obj/item/weapon/gun/energy/locked/frontier/ex_act() //|rugged| +/obj/item/gun/energy/locked/frontier/ex_act() //|rugged| return -/obj/item/weapon/gun/energy/locked/frontier/unlocked +/obj/item/gun/energy/locked/frontier/unlocked desc = "An extraordinarily rugged laser weapon, built to last and requiring effectively no maintenance. Includes a \ built-in crank charger for recharging away from civilization." req_access = newlist() //for toggling safety @@ -122,7 +122,7 @@ /* * Expedition Frontier Carbine */ -/obj/item/weapon/gun/energy/locked/frontier/carbine +/obj/item/gun/energy/locked/frontier/carbine name = "frontier carbine" desc = "An ergonomically improved version of the venerable frontier phaser, the carbine is a fairly new weapon, and has only been \ produced in limited numbers so far. Includes a built-in crank charger for recharging away from civilization. This one has a safety \ @@ -144,14 +144,14 @@ list(mode_name="low-power", fire_delay=5, projectile_type=/obj/item/projectile/beam/weaklaser/blue, modifystate="phcarbinestun", charge_cost = 100), ) -/obj/item/weapon/gun/energy/locked/frontier/carbine/update_icon() +/obj/item/gun/energy/locked/frontier/carbine/update_icon() if(recharging) icon_state = "[modifystate]_pump" update_held_icon() return ..() -/obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked +/obj/item/gun/energy/locked/frontier/carbine/unlocked desc = "An ergonomically improved version of the venerable frontier phaser, the carbine is a fairly new weapon, and has only been \ produced in limited numbers so far. Includes a built-in crank charger for recharging away from civilization." req_access = newlist() //for toggling safety @@ -161,7 +161,7 @@ /* * Expedition Frontier Rifle */ -/obj/item/weapon/gun/energy/locked/frontier/rifle +/obj/item/gun/energy/locked/frontier/rifle name = "frontier marksman rifle" desc = "A much larger, heavier weapon than the typical frontier-type weapons, this DMR can be fired both from the hip, and in scope. \ Includes a built-in crank charger for recharging away from civilization. Unlike other frontier-type weapons, this model lacks a non-lethal option. \ @@ -194,24 +194,24 @@ list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam, modifystate="phriflekill", charge_cost = 200), ) -/obj/item/weapon/gun/energy/locked/frontier/rifle/ui_action_click() +/obj/item/gun/energy/locked/frontier/rifle/ui_action_click() scope() -/obj/item/weapon/gun/energy/locked/frontier/rifle/verb/scope() +/obj/item/gun/energy/locked/frontier/rifle/verb/scope() set category = "Object" set name = "Use Scope" set popup_menu = 1 toggle_scope(2.0) -/obj/item/weapon/gun/energy/locked/frontier/rifle/update_icon() +/obj/item/gun/energy/locked/frontier/rifle/update_icon() if(recharging) icon_state = "[modifystate]_pump" update_held_icon() return ..() -/obj/item/weapon/gun/energy/locked/frontier/rifle/unlocked +/obj/item/gun/energy/locked/frontier/rifle/unlocked desc = "A much larger, heavier weapon than the typical frontier-type weapons, this DMR can be fired both from the hip, and in scope. \ Unlike other frontier-type weapons, this model lacks a non-lethal option. Includes a built-in crank charger for recharging away from civilization." req_access = newlist() //for toggling safety @@ -221,7 +221,7 @@ /* * Holdout Phaser Pistol */ -/obj/item/weapon/gun/energy/locked/frontier/holdout +/obj/item/gun/energy/locked/frontier/holdout name = "holdout frontier phaser" desc = "An minaturized weapon designed for the purpose of expeditionary support to defend themselves on the field. Includes a built-in crank charger for \ recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility." @@ -239,7 +239,7 @@ list(mode_name="stun", fire_delay=12, projectile_type=/obj/item/projectile/beam/stun/med, modifystate="holdoutshock", charge_cost = 300), ) -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked +/obj/item/gun/energy/locked/frontier/holdout/unlocked desc = "An minaturized weapon designed for the purpose of expeditionary support to defend themselves on the field. Includes a built-in \ crank charger for recharging away from civilization." req_access = newlist() //for toggling safety @@ -249,7 +249,7 @@ /* * Holdout Phaser Bow */ -/obj/item/weapon/gun/energy/locked/frontier/handbow +/obj/item/gun/energy/locked/frontier/handbow name = "phaser handbow" desc = "An minaturized weapon that fires a bolt of energy. Includes a built-in crank charger for recharging away from civilization. \ This one has a safety interlock that prevents firing while in proximity to the facility." @@ -265,7 +265,7 @@ list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/energy/bow, modifystate="handbowstun", charge_cost = 200), ) -/obj/item/weapon/gun/energy/locked/frontier/handbow/unlocked +/obj/item/gun/energy/locked/frontier/handbow/unlocked desc = "An minaturized weapon that fires a bolt of energy. Includes a built-in crank charger for recharging away from civilization." req_access = newlist() //for toggling safety locked = 0 diff --git a/code/modules/projectiles/guns/energy/sickshot_vr.dm b/code/modules/projectiles/guns/energy/sickshot_vr.dm index 098db695979..760ae37234a 100644 --- a/code/modules/projectiles/guns/energy/sickshot_vr.dm +++ b/code/modules/projectiles/guns/energy/sickshot_vr.dm @@ -1,5 +1,5 @@ // -------------- Sickshot ------------- -/obj/item/weapon/gun/energy/sickshot +/obj/item/gun/energy/sickshot name = "\'Sickshot\' revolver" desc = "Need to stun someone? Don't mind having to clean up the mess afterwards? The MPA6 'Sickshot' is the answer to your prayers. \ Using a short-range concentrated blast of disruptive sound, the Sickshot will nauseate and confuse the target for several seconds. NOTE: Not suitable \ diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 01bb4ef3ca9..eaca0459ac0 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/energy/ionrifle +/obj/item/gun/energy/ionrifle name = "ion rifle" desc = "The RayZar Mk60 EW Halicon is a man portable anti-armor weapon designed to disable mechanical threats, produced by NT. Not the best of its type." description_fluff = "RayZar is Ward-Takahashi’s main consumer weapons brand, known for producing and licensing a wide variety of specialist energy weapons of various types and quality primarily for the civilian market." @@ -11,13 +11,13 @@ slot_flags = SLOT_BACK projectile_type = /obj/item/projectile/ion -/obj/item/weapon/gun/energy/ionrifle/emp_act(severity) +/obj/item/gun/energy/ionrifle/emp_act(severity) ..(max(severity, 4)) //so it doesn't EMP itself, I guess -/obj/item/weapon/gun/energy/ionrifle/empty +/obj/item/gun/energy/ionrifle/empty cell_type = null -/obj/item/weapon/gun/energy/ionrifle/pistol +/obj/item/gun/energy/ionrifle/pistol name = "ion pistol" desc = "The RayZar Mk63 EW Pan is a man portable anti-armor weapon designed to disable mechanical threats, produced by NT. This model sacrifices capacity for portability." icon_state = "ionpistol" @@ -28,7 +28,7 @@ charge_cost = 480 projectile_type = /obj/item/projectile/ion/pistol -/obj/item/weapon/gun/energy/decloner +/obj/item/gun/energy/decloner name = "biological demolecularisor" desc = "A gun that discharges high amounts of controlled radiation to slowly break a target into component elements." icon_state = "decloner" @@ -36,7 +36,7 @@ origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 4, TECH_POWER = 3) projectile_type = /obj/item/projectile/energy/declone -/obj/item/weapon/gun/energy/floragun +/obj/item/gun/energy/floragun name = "floral somatoray" desc = "A tool that discharges controlled radiation which induces mutation in plant cells." description_fluff = "The floral somatoray is a relatively recent invention of the NanoTrasen corporation, turning a process that once involved transferring plants to massive mutating racks, into a remote interface. Do not look directly into the transmission end." @@ -45,11 +45,11 @@ projectile_type = /obj/item/projectile/energy/floramut origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3, TECH_POWER = 3) modifystate = "floramut" - cell_type = /obj/item/weapon/cell/device/weapon/recharge + cell_type = /obj/item/cell/device/weapon/recharge battery_lock = 1 var/decl/plantgene/gene = null - var/obj/item/weapon/stock_parts/micro_laser/emitter + var/obj/item/stock_parts/micro_laser/emitter firemodes = list( list(mode_name="induce mutations", projectile_type=/obj/item/projectile/energy/floramut, modifystate="floramut"), @@ -57,17 +57,17 @@ list(mode_name="induce specific mutations", projectile_type=/obj/item/projectile/energy/floramut/gene, modifystate="floramut"), ) -/obj/item/weapon/gun/energy/floragun/Initialize() +/obj/item/gun/energy/floragun/Initialize() . = ..() emitter = new(src) -/obj/item/weapon/gun/energy/floragun/examine(var/mob/user) +/obj/item/gun/energy/floragun/examine(var/mob/user) . = ..() if(Adjacent(user)) . += "It has [emitter ? emitter : "no micro laser"] installed." -/obj/item/weapon/gun/energy/floragun/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/weapon/stock_parts/micro_laser)) +/obj/item/gun/energy/floragun/attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/stock_parts/micro_laser)) if(!emitter) user.drop_item() W.loc = src @@ -87,7 +87,7 @@ to_chat(user, "There is no micro laser in this [src].") return -/obj/item/weapon/gun/energy/floragun/afterattack(obj/target, mob/user, adjacent_flag) +/obj/item/gun/energy/floragun/afterattack(obj/target, mob/user, adjacent_flag) //allow shooting into adjacent hydrotrays regardless of intent if(!emitter) to_chat(user, "The [src] has no laser! ") @@ -99,7 +99,7 @@ return ..() -/obj/item/weapon/gun/energy/floragun/verb/select_gene() +/obj/item/gun/energy/floragun/verb/select_gene() set name = "Select Gene" set category = "Object" set src in view(1) @@ -115,7 +115,7 @@ return -/obj/item/weapon/gun/energy/floragun/consume_next_projectile() +/obj/item/gun/energy/floragun/consume_next_projectile() . = ..() var/obj/item/projectile/energy/floramut/gene/G = . var/obj/item/projectile/energy/florayield/GY = . @@ -129,7 +129,7 @@ else if(istype(GM)) GM.lasermod = emitter.rating -/obj/item/weapon/gun/energy/meteorgun +/obj/item/gun/energy/meteorgun name = "meteor gun" desc = "For the love of god, make sure you're aiming this the right way!" icon_state = "riotgun" @@ -137,13 +137,13 @@ slot_flags = SLOT_BELT|SLOT_BACK w_class = ITEMSIZE_LARGE projectile_type = /obj/item/projectile/meteor - cell_type = /obj/item/weapon/cell/potato + cell_type = /obj/item/cell/potato charge_cost = 100 self_recharge = 1 recharge_time = 5 //Time it takes for shots to recharge (in ticks) charge_meter = 0 -/obj/item/weapon/gun/energy/meteorgun/pen +/obj/item/gun/energy/meteorgun/pen name = "meteor pen" desc = "The pen is mightier than the sword." icon = 'icons/obj/bureaucracy.dmi' @@ -153,13 +153,13 @@ slot_flags = SLOT_BELT -/obj/item/weapon/gun/energy/mindflayer +/obj/item/gun/energy/mindflayer name = "mind flayer" desc = "A custom-built weapon of some kind." icon_state = "xray" projectile_type = /obj/item/projectile/beam/mindflayer -/obj/item/weapon/gun/energy/toxgun +/obj/item/gun/energy/toxgun name = "phoron pistol" desc = "A specialized firearm designed to fire lethal bolts of phoron." icon_state = "toxgun" @@ -169,7 +169,7 @@ /* Staves */ -/obj/item/weapon/gun/energy/staff +/obj/item/gun/energy/staff name = "staff of change" desc = "An artifact that spits bolts of coruscating energy which cause the target's very form to reshape itself." icon = 'icons/obj/gun.dmi' @@ -180,31 +180,31 @@ charge_cost = 480 projectile_type = /obj/item/projectile/change origin_tech = null - cell_type = /obj/item/weapon/cell/device/weapon/recharge + cell_type = /obj/item/cell/device/weapon/recharge battery_lock = 1 charge_meter = 0 -/obj/item/weapon/gun/energy/staff/special_check(var/mob/user) +/obj/item/gun/energy/staff/special_check(var/mob/user) if((user.mind && !wizards.is_antagonist(user.mind))) to_chat(usr, "You focus your mind on \the [src], but nothing happens!") return 0 return ..() -/obj/item/weapon/gun/energy/staff/handle_click_empty(mob/user = null) +/obj/item/gun/energy/staff/handle_click_empty(mob/user = null) if (user) user.visible_message("*fizzle*", "*fizzle*") else src.visible_message("*fizzle*") playsound(src, 'sound/effects/sparks1.ogg', 100, 1) /* -/obj/item/weapon/gun/energy/staff/animate +/obj/item/gun/energy/staff/animate name = "staff of animation" desc = "An artifact that spits bolts of life force, which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines." projectile_type = /obj/item/projectile/animate charge_cost = 240 */ -/obj/item/weapon/gun/energy/staff/focus +/obj/item/gun/energy/staff/focus name = "mental focus" desc = "An artifact that channels the will of the user into destructive bolts of force. If you aren't careful with it, you might poke someone's brain out." icon = 'icons/obj/wizard.dmi' @@ -223,7 +223,7 @@ projectile_type = "/obj/item/projectile/forcebolt" */ -/obj/item/weapon/gun/energy/dakkalaser +/obj/item/gun/energy/dakkalaser name = "suppression gun" desc = "A massive weapon designed to pressure the opposition by raining down a torrent of energy pellets." icon_state = "dakkalaser" @@ -232,7 +232,7 @@ w_class = ITEMSIZE_HUGE charge_cost = 24 // 100 shots, it's a spray and pray (to RNGesus) weapon. projectile_type = /obj/item/projectile/energy/blue_pellet - cell_type = /obj/item/weapon/cell/device/weapon/recharge + cell_type = /obj/item/cell/device/weapon/recharge battery_lock = 1 accuracy = 75 // Suppressive weapons don't work too well if there's no risk of being hit. burst_delay = 1 // Burst faster than average. @@ -244,7 +244,7 @@ list(mode_name="ten shot burst", burst = 10, burst_accuracy = list(75,75,75,75,75,75,75,75,75,75), dispersion = list(2,2,2,2,2,2,2,2,2,2)), ) -/obj/item/weapon/gun/energy/maghowitzer +/obj/item/gun/energy/maghowitzer name = "portable MHD howitzer" desc = "A massive weapon designed to destroy fortifications with a stream of molten tungsten." description_fluff = "A weapon designed by joint cooperation of NanoTrasen, Hephaestus, and SCG scientists. Everything else is red tape and black highlighters." @@ -256,8 +256,8 @@ charge_cost = 10000 // Uses large cells, can at max have 3 shots. projectile_type = /obj/item/projectile/beam/tungsten - cell_type = /obj/item/weapon/cell/high - accept_cell_type = /obj/item/weapon/cell + cell_type = /obj/item/cell/high + accept_cell_type = /obj/item/cell accuracy = 75 charge_meter = 0 @@ -265,7 +265,7 @@ var/power_cycle = FALSE -/obj/item/weapon/gun/energy/maghowitzer/proc/pick_random_target(var/turf/T) +/obj/item/gun/energy/maghowitzer/proc/pick_random_target(var/turf/T) var/foundmob = FALSE var/foundmobs = list() for(var/mob/living/L in T.contents) @@ -276,7 +276,7 @@ return return_target return FALSE -/obj/item/weapon/gun/energy/maghowitzer/attack(atom/A, mob/living/user, def_zone) +/obj/item/gun/energy/maghowitzer/attack(atom/A, mob/living/user, def_zone) if(power_cycle) to_chat(user, "\The [src] is already powering up!") return 0 @@ -302,7 +302,7 @@ else ..(A, user, def_zone) //If it can't fire, just bash with no delay. -/obj/item/weapon/gun/energy/maghowitzer/afterattack(atom/A, mob/living/user, adjacent, params) +/obj/item/gun/energy/maghowitzer/afterattack(atom/A, mob/living/user, adjacent, params) if(power_cycle) to_chat(user, "\The [src] is already powering up!") return 0 diff --git a/code/modules/projectiles/guns/energy/special_vr.dm b/code/modules/projectiles/guns/energy/special_vr.dm index 4e8843bb9db..e7c95060930 100644 --- a/code/modules/projectiles/guns/energy/special_vr.dm +++ b/code/modules/projectiles/guns/energy/special_vr.dm @@ -1,10 +1,10 @@ -/obj/item/weapon/gun/energy/ionrifle/pistol +/obj/item/gun/energy/ionrifle/pistol projectile_type = /obj/item/projectile/ion/pistol // still packs a punch but no AoE -/obj/item/weapon/gun/energy/ionrifle/weak +/obj/item/gun/energy/ionrifle/weak projectile_type = /obj/item/projectile/ion/small -/obj/item/weapon/gun/energy/medigun //Adminspawn/ERT etc +/obj/item/gun/energy/medigun //Adminspawn/ERT etc name = "directed restoration system" desc = "The BL-3 'Phoenix' is an adaptation on the ML-3 'Medbeam' design that channels the power of the beam into a single healing laser. It is highly energy-inefficient, but its medical power cannot be denied." force = 5 @@ -22,11 +22,11 @@ projectile_type = /obj/item/projectile/beam/medigun - accept_cell_type = /obj/item/weapon/cell - cell_type = /obj/item/weapon/cell/high + accept_cell_type = /obj/item/cell + cell_type = /obj/item/cell/high charge_cost = 2500 -/obj/item/weapon/gun/energy/bfgtaser +/obj/item/gun/energy/bfgtaser name = "9000-series Ball Lightning Taser" desc = "The brainchild of Hephaestus Industries Civil Pacification Division, the BLT-9000 was intended for riot control but despite enthusiastic interest from law-enforcement agencies across the Commonwealth and beyond, its indiscriminate nature led to it being banned from civilian use in virtually all jurisdictions. As a result, most pieces are found in the hands of collectors." icon = 'icons/obj/gun_vr.dmi' @@ -43,7 +43,7 @@ charge_cost = 2400 //yes, this bad boy empties an entire weapon cell in one shot. What of it? var/spinning_up = FALSE -/obj/item/weapon/gun/energy/bfgtaser/Fire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0) +/obj/item/gun/energy/bfgtaser/Fire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0) if(spinning_up) return if(!power_supply || !power_supply.check_charge(charge_cost)) diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 218b9919baa..19555d595bc 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -1,7 +1,7 @@ /* * Taser */ -/obj/item/weapon/gun/energy/taser +/obj/item/gun/energy/taser name = "taser gun" desc = "The NT Mk30 NL is a small gun used for non-lethal takedowns. Produced by NT, it's actually a licensed version of a W-T RayZar design." description_fluff = "RayZar is Ward-Takahashi’s main consumer weapons brand, known for producing and licensing a wide variety of specialist \ @@ -11,18 +11,18 @@ projectile_type = /obj/item/projectile/beam/stun charge_cost = 480 -/obj/item/weapon/gun/energy/taser/mounted +/obj/item/gun/energy/taser/mounted name = "mounted taser gun" self_recharge = 1 use_external_power = 1 -/obj/item/weapon/gun/energy/taser/mounted/augment +/obj/item/gun/energy/taser/mounted/augment self_recharge = 1 use_external_power = 0 use_organic_power = TRUE canremove = FALSE -/obj/item/weapon/gun/energy/taser/mounted/cyborg +/obj/item/gun/energy/taser/mounted/cyborg name = "taser gun" charge_cost = 400 recharge_time = 7 //Time it takes for shots to recharge (in ticks) @@ -30,7 +30,7 @@ /* * Disabler */ -/obj/item/weapon/gun/energy/taser/disabler +/obj/item/gun/energy/taser/disabler name = "disabler" desc = "The NT Mk4 T-DL is a small gun used for non-lethal takedowns. Produced by NT, it's an archaic device which attacks the target's \ nervous-system and is actually a heavily modified version of the NT Mk30 NL. It's use is heavily regulated due to its effects on the body." @@ -41,7 +41,7 @@ /* * Crossbow */ -/obj/item/weapon/gun/energy/crossbow +/obj/item/gun/energy/crossbow name = "mini energy-crossbow" desc = "A weapon favored by many mercenary stealth specialists." icon_state = "crossbow" @@ -53,15 +53,15 @@ silenced = 1 projectile_type = /obj/item/projectile/energy/bolt charge_cost = 480 - cell_type = /obj/item/weapon/cell/device/weapon/recharge + cell_type = /obj/item/cell/device/weapon/recharge battery_lock = 1 charge_meter = 0 -/obj/item/weapon/gun/energy/crossbow/ninja +/obj/item/gun/energy/crossbow/ninja name = "energy dart thrower" projectile_type = /obj/item/projectile/energy/dart -/obj/item/weapon/gun/energy/crossbow/largecrossbow +/obj/item/gun/energy/crossbow/largecrossbow name = "energy crossbow" desc = "A weapon favored by mercenary infiltration teams." icon_state = "crossbowlarge" @@ -74,7 +74,7 @@ /* * Plasma Stun */ -/obj/item/weapon/gun/energy/plasmastun +/obj/item/gun/energy/plasmastun name = "plasma pulse projector" desc = "The RayZar MA21 Selkie is a weapon that uses a laser pulse to ionise the local atmosphere, creating a disorienting pulse of plasma and deafening shockwave as the wave expands." description_fluff = "RayZar is Ward-Takahashi’s main consumer weapons brand, known for producing and licensing a wide variety of specialist energy weapons of various types and quality primarily for the civilian market. \ @@ -89,7 +89,7 @@ /* * Stun Revolver */ -/obj/item/weapon/gun/energy/stunrevolver +/obj/item/gun/energy/stunrevolver name = "stun revolver" desc = "A LAEP20 \"Aktzin\". Designed and produced by Lawson Arms under the wing of Hephaestus, \ several TSCs have been trying to get a hold of the blueprints for half a decade." @@ -106,12 +106,12 @@ /* * Detective Stun Revolver */ -/obj/item/weapon/gun/energy/stunrevolver/detective +/obj/item/gun/energy/stunrevolver/detective desc = "A LAEP20 \"Aktzin\". Designed and produced by Lawson Arms under the wing of Hephaestus, \ several TSCs have been trying to get a hold of the blueprints for half a decade." var/unique_reskin -/obj/item/weapon/gun/energy/stunrevolver/detective/update_icon(var/ignore_inhands) +/obj/item/gun/energy/stunrevolver/detective/update_icon(var/ignore_inhands) if(power_supply == null) if(unique_reskin) icon_state = "[unique_reskin]_open" @@ -140,7 +140,7 @@ if(!ignore_inhands) update_held_icon() -/obj/item/weapon/gun/energy/stunrevolver/detective/verb/rename_gun() +/obj/item/gun/energy/stunrevolver/detective/verb/rename_gun() set name = "Name Gun" set category = "Object" set desc = "Rename your gun. If you're Security." @@ -159,7 +159,7 @@ to_chat(M, "You name the gun [input]. Say hello to your new friend.") return 1 -/obj/item/weapon/gun/energy/stunrevolver/detective/verb/reskin_gun() +/obj/item/gun/energy/stunrevolver/detective/verb/reskin_gun() set name = "Resprite gun" set category = "Object" set desc = "Click to choose a sprite for your gun." @@ -183,7 +183,7 @@ /* * Vintage Stun Revolver */ -/obj/item/weapon/gun/energy/stunrevolver/vintage +/obj/item/gun/energy/stunrevolver/vintage name = "vintage stun revolver" desc = "An older model stun revolver that is still in service across the frontier." description_fluff = "The LTX1020 \"Bolter\", a Firefly Co. staple from when the company was in its hayday. \ @@ -198,7 +198,7 @@ /* * Snubnose Stun Revolver */ -/obj/item/weapon/gun/energy/stunrevolver/snubnose +/obj/item/gun/energy/stunrevolver/snubnose name = "snub stun revolver" desc = "A snub nose stun revolver sporting a rather elegant look." description_fluff = "The LTX1010 \"Stubby\", a Firefly Co. staple from when the company was in its hayday. \ diff --git a/code/modules/projectiles/guns/energy/stun_vr.dm b/code/modules/projectiles/guns/energy/stun_vr.dm index 3ddc43986c6..baa95373113 100644 --- a/code/modules/projectiles/guns/energy/stun_vr.dm +++ b/code/modules/projectiles/guns/energy/stun_vr.dm @@ -1,9 +1,9 @@ -/obj/item/weapon/gun/energy/taser +/obj/item/gun/energy/taser charge_cost = 160 fire_delay = 4 -/obj/item/weapon/gun/energy/stunrevolver +/obj/item/gun/energy/stunrevolver charge_cost = 400 -/obj/item/weapon/gun/energy/taser/mounted/cyborg +/obj/item/gun/energy/taser/mounted/cyborg charge_cost = 160 \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/temperature.dm b/code/modules/projectiles/guns/energy/temperature.dm index a9b4c8f6b96..37777f29df6 100644 --- a/code/modules/projectiles/guns/energy/temperature.dm +++ b/code/modules/projectiles/guns/energy/temperature.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/energy/temperature +/obj/item/gun/energy/temperature name = "temperature gun" icon_state = "freezegun" desc = "A gun that can add or remove heat from entities it hits. In other words, it can fire 'cold', and 'hot' beams." @@ -13,6 +13,6 @@ list(mode_name="exothermic beam", projectile_type = /obj/item/projectile/temp/hot, charge_cost = 240), ) -/obj/item/weapon/gun/energy/temperature/mounted +/obj/item/gun/energy/temperature/mounted self_recharge = 1 use_external_power = 1 diff --git a/code/modules/projectiles/guns/launcher.dm b/code/modules/projectiles/guns/launcher.dm index e0494e534d6..76db11d46b8 100644 --- a/code/modules/projectiles/guns/launcher.dm +++ b/code/modules/projectiles/guns/launcher.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/launcher +/obj/item/gun/launcher name = "launcher" desc = "A device that launches things." w_class = ITEMSIZE_HUGE @@ -10,18 +10,18 @@ fire_sound_text = "a launcher firing" //This normally uses a proc on projectiles and our ammo is not strictly speaking a projectile. -/obj/item/weapon/gun/launcher/can_hit(var/mob/living/target as mob, var/mob/living/user as mob) +/obj/item/gun/launcher/can_hit(var/mob/living/target as mob, var/mob/living/user as mob) return 1 //Override this to avoid a runtime with suicide handling. -/obj/item/weapon/gun/launcher/handle_suicide(mob/living/user) +/obj/item/gun/launcher/handle_suicide(mob/living/user) to_chat(user, span_red("Shooting yourself with \a [src] is pretty tricky. You can't seem to manage it.")) return -/obj/item/weapon/gun/launcher/proc/update_release_force(obj/item/projectile) +/obj/item/gun/launcher/proc/update_release_force(obj/item/projectile) return 0 -/obj/item/weapon/gun/launcher/process_projectile(obj/item/projectile, mob/user, atom/target, var/target_zone, var/params=null, var/pointblank=0, var/reflex=0) +/obj/item/gun/launcher/process_projectile(obj/item/projectile, mob/user, atom/target, var/target_zone, var/params=null, var/pointblank=0, var/reflex=0) update_release_force(projectile) projectile.loc = get_turf(user) projectile.throw_at(target, throw_distance, release_force, user) diff --git a/code/modules/projectiles/guns/launcher/bows.dm b/code/modules/projectiles/guns/launcher/bows.dm index a56e390c87c..2d1a9901ac2 100644 --- a/code/modules/projectiles/guns/launcher/bows.dm +++ b/code/modules/projectiles/guns/launcher/bows.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/arrow/standard +/obj/item/arrow/standard name = "arrow" desc = "It's got a tip for you - get the point?" icon = 'icons/obj/guns/projectile/bows.dmi' @@ -9,7 +9,7 @@ sharp = TRUE edge = FALSE -/obj/item/weapon/arrow/energy +/obj/item/arrow/energy name = "hardlight arrow" desc = "An arrow made out of energy! Classic?" icon = 'icons/obj/guns/projectile/bows.dmi' @@ -22,17 +22,17 @@ embed_chance = 0 // it fizzles! catchable = FALSE // oh god -/obj/item/weapon/arrow/energy/throw_impact(atom/hit_atom) +/obj/item/arrow/energy/throw_impact(atom/hit_atom) . = ..() qdel(src) -/obj/item/weapon/arrow/energy/equipped() +/obj/item/arrow/energy/equipped() if(isliving(loc)) var/mob/living/L = loc L.drop_from_inventory(src) qdel(src) // noh -/obj/item/weapon/gun/launcher/crossbow/bow +/obj/item/gun/launcher/crossbow/bow name = "shortbow" desc = "A common shortbow, capable of firing arrows at high speed towards a target. Useful for hunting while keeping quiet." icon = 'icons/obj/guns/projectile/bows.dmi' @@ -47,37 +47,37 @@ release_speed = 15 var/drawn = FALSE -/obj/item/weapon/gun/launcher/crossbow/bow/update_release_force(obj/item/projectile) +/obj/item/gun/launcher/crossbow/bow/update_release_force(obj/item/projectile) return 0 -/obj/item/weapon/gun/launcher/crossbow/bow/proc/unload(mob/user) - var/obj/item/weapon/arrow/A = bolt +/obj/item/gun/launcher/crossbow/bow/proc/unload(mob/user) + var/obj/item/arrow/A = bolt bolt = null drawn = FALSE A.forceMove(get_turf(user)) user.put_in_hands(A) update_icon() -/obj/item/weapon/gun/launcher/crossbow/bow/consume_next_projectile(mob/user) +/obj/item/gun/launcher/crossbow/bow/consume_next_projectile(mob/user) if(!drawn) to_chat(user, "\The [src] is not drawn back!") return null return bolt -/obj/item/weapon/gun/launcher/crossbow/bow/handle_post_fire(mob/user, atom/target) +/obj/item/gun/launcher/crossbow/bow/handle_post_fire(mob/user, atom/target) bolt = null drawn = FALSE update_icon() ..() -/obj/item/weapon/gun/launcher/crossbow/bow/attack_hand(mob/living/user) +/obj/item/gun/launcher/crossbow/bow/attack_hand(mob/living/user) if(loc == user && bolt && !drawn) user.visible_message("[user] removes [bolt] from [src].","You remove [bolt] from [src].") unload(user) else return ..() -/obj/item/weapon/gun/launcher/crossbow/bow/attack_self(mob/living/user) +/obj/item/gun/launcher/crossbow/bow/attack_self(mob/living/user) if(drawn) user.visible_message("[user] relaxes the tension on [src]'s string.","You relax the tension on [src]'s string.") drawn = FALSE @@ -85,7 +85,7 @@ else draw(user) -/obj/item/weapon/gun/launcher/crossbow/bow/draw(var/mob/user) +/obj/item/gun/launcher/crossbow/bow/draw(var/mob/user) if(!bolt) to_chat(user, "You don't have anything nocked to [src].") return @@ -100,14 +100,14 @@ user.visible_message("[user] draws the string on [src] back fully!", "You draw the string on [src] back fully!") update_icon() -/obj/item/weapon/gun/launcher/crossbow/bow/attackby(obj/item/W as obj, mob/user) - if(!bolt && istype(W,/obj/item/weapon/arrow/standard)) +/obj/item/gun/launcher/crossbow/bow/attackby(obj/item/W as obj, mob/user) + if(!bolt && istype(W,/obj/item/arrow/standard)) user.drop_from_inventory(W, src) bolt = W user.visible_message("[user] slides [bolt] into [src].","You slide [bolt] into [src].") update_icon() -/obj/item/weapon/gun/launcher/crossbow/bow/update_icon() +/obj/item/gun/launcher/crossbow/bow/update_icon() if(drawn) icon_state = "[initial(icon_state)]_firing" else if(bolt) @@ -117,24 +117,24 @@ -/obj/item/weapon/gun/launcher/crossbow/bow/hardlight +/obj/item/gun/launcher/crossbow/bow/hardlight name = "hardlight bow" icon_state = "bow_hardlight" item_state = "bow_hardlight" desc = "An energy bow, capable of producing arrows from an internal power supply." -/obj/item/weapon/gun/launcher/crossbow/bow/hardlight/unload(mob/user) +/obj/item/gun/launcher/crossbow/bow/hardlight/unload(mob/user) qdel_null(bolt) update_icon() -/obj/item/weapon/gun/launcher/crossbow/bow/hardlight/attack_self(mob/living/user) +/obj/item/gun/launcher/crossbow/bow/hardlight/attack_self(mob/living/user) if(drawn) user.visible_message("[user] relaxes the tension on [src]'s string.","You relax the tension on [src]'s string.") drawn = FALSE update_icon() else if(!bolt) user.visible_message("[user] fabricates a new hardlight projectile with [src].","You fabricate a new hardlight projectile with [src].") - bolt = new /obj/item/weapon/arrow/energy(src) + bolt = new /obj/item/arrow/energy(src) update_icon() else draw(user) diff --git a/code/modules/projectiles/guns/launcher/confetti.dm b/code/modules/projectiles/guns/launcher/confetti.dm index f6cffa45cb0..547ea78288b 100644 --- a/code/modules/projectiles/guns/launcher/confetti.dm +++ b/code/modules/projectiles/guns/launcher/confetti.dm @@ -1,5 +1,5 @@ //The confetti cannon is a simple weapon meant to be a toy. You shoot confetti at people and it makes a funny sound. Don't give this any combat use. -/obj/item/weapon/gun/launcher/confetti_cannon +/obj/item/gun/launcher/confetti_cannon name = "confetti cannon" desc = "For those times when you absolutely need colored paper everywhere." icon = 'icons/obj/weapons_vr.dmi' @@ -9,18 +9,18 @@ origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 2) throw_distance = 7 release_force = 5 - var/obj/item/weapon/grenade/confetti/party_ball/chambered = null + var/obj/item/grenade/confetti/party_ball/chambered = null var/confetti_charge = 0 var/max_confetti = 20 -/obj/item/weapon/gun/launcher/confetti_cannon/examine(mob/user) +/obj/item/gun/launcher/confetti_cannon/examine(mob/user) . = ..() if(get_dist(user, src) <= 2) . += span_blue("It's loaded with [confetti_charge] ball\s of confetti.") -/obj/item/weapon/gun/launcher/confetti_cannon/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/shreddedp)) +/obj/item/gun/launcher/confetti_cannon/attackby(obj/item/I as obj, mob/user as mob) + if(istype(I, /obj/item/paper) || istype(I, /obj/item/shreddedp)) if(confetti_charge < max_confetti) user.drop_item() ++confetti_charge @@ -29,11 +29,11 @@ else to_chat(usr, span_red("[src] cannot hold more paper.")) -/obj/item/weapon/gun/launcher/confetti_cannon/proc/pump(mob/M as mob) +/obj/item/gun/launcher/confetti_cannon/proc/pump(mob/M as mob) playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1) if(!chambered) if(confetti_charge) - chambered = new /obj/item/weapon/grenade/confetti/party_ball + chambered = new /obj/item/grenade/confetti/party_ball --confetti_charge to_chat(usr, span_blue("You compress a new confetti ball.")) else @@ -41,24 +41,24 @@ else to_chat(usr, span_red("The [src] is already loaded!")) -/obj/item/weapon/gun/launcher/confetti_cannon/attack_self(mob/user) +/obj/item/gun/launcher/confetti_cannon/attack_self(mob/user) pump(user) -/obj/item/weapon/gun/launcher/confetti_cannon/consume_next_projectile() +/obj/item/gun/launcher/confetti_cannon/consume_next_projectile() if(chambered) chambered.activate(null) return chambered -/obj/item/weapon/gun/launcher/confetti_cannon/handle_post_fire(mob/user) +/obj/item/gun/launcher/confetti_cannon/handle_post_fire(mob/user) chambered = null -/obj/item/weapon/gun/launcher/confetti_cannon/overdrive +/obj/item/gun/launcher/confetti_cannon/overdrive name = "overdrive confetti cannon" desc = "For those times when you absolutely need colored paper everywhere, EVERYWHERE." confetti_charge = 100 max_confetti = 100 -/obj/item/weapon/gun/launcher/confetti_cannon/fake_shottie +/obj/item/gun/launcher/confetti_cannon/fake_shottie name = "horror movie shotgun" desc = "The one necessary for survival of any Final Girl." icon = 'icons/obj/gun2.dmi' @@ -66,11 +66,11 @@ item_state = "ithaca" confetti_charge = 20 -/obj/item/weapon/gun/launcher/confetti_cannon/robot +/obj/item/gun/launcher/confetti_cannon/robot name = "Party Cannon" desc = "Confetti, pies, banana peels, chaos!" -/obj/item/weapon/gun/launcher/confetti_cannon/robot/pump(mob/M as mob) +/obj/item/gun/launcher/confetti_cannon/robot/pump(mob/M as mob) playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1) if(!chambered) var/choice = tgui_alert(usr, "Load the Party Canon with?", "Change What?", list("Confetti","Banana Peel","Cream Pie")) @@ -84,18 +84,18 @@ playsound(src, 'sound/effects/pop.ogg', 50, 0) switch(choice) if("Confetti") - chambered = new /obj/item/weapon/grenade/confetti/party_ball + chambered = new /obj/item/grenade/confetti/party_ball to_chat(usr, span_blue("Confetti loaded.")) if("Banana Peel") - chambered = new /obj/item/weapon/bananapeel + chambered = new /obj/item/bananapeel to_chat(usr, span_blue("Banana peel loaded.")) if("Cream Pie") - chambered = new /obj/item/weapon/reagent_containers/food/snacks/pie + chambered = new /obj/item/reagent_containers/food/snacks/pie to_chat(usr, span_blue("Banana cream pie loaded.")) else to_chat(usr, span_red("The [src] is already loaded!")) -/obj/item/weapon/gun/launcher/confetti_cannon/robot/consume_next_projectile() - if(istype(chambered,/obj/item/weapon/grenade/confetti/party_ball)) +/obj/item/gun/launcher/confetti_cannon/robot/consume_next_projectile() + if(istype(chambered,/obj/item/grenade/confetti/party_ball)) chambered.activate(null) return chambered diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm index aba55b268df..f7e14faebe4 100644 --- a/code/modules/projectiles/guns/launcher/crossbow.dm +++ b/code/modules/projectiles/guns/launcher/crossbow.dm @@ -1,6 +1,6 @@ //AMMUNITION -/obj/item/weapon/arrow +/obj/item/arrow name = "bolt" desc = "It's got a tip for you - get the point?" icon = 'icons/obj/weapons.dmi' @@ -13,10 +13,10 @@ sharp = TRUE edge = FALSE -/obj/item/weapon/arrow/proc/removed() //Helper for metal rods falling apart. +/obj/item/arrow/proc/removed() //Helper for metal rods falling apart. return -/obj/item/weapon/spike +/obj/item/spike name = "alloy spike" desc = "It's about a foot of weird silver metal with a wicked point." sharp = TRUE @@ -29,7 +29,7 @@ drop_sound = 'sound/items/drop/sword.ogg' pickup_sound = 'sound/items/pickup/sword.ogg' -/obj/item/weapon/arrow/quill +/obj/item/arrow/quill name = "alien quill" desc = "A wickedly barbed quill from some bizarre animal." icon = 'icons/obj/weapons.dmi' @@ -37,19 +37,19 @@ item_state = "quill" throwforce = 5 -/obj/item/weapon/arrow/rod +/obj/item/arrow/rod name = "metal rod" desc = "Don't cry for me, Orithena." icon_state = "metal-rod" -/obj/item/weapon/arrow/rod/removed(mob/user) +/obj/item/arrow/rod/removed(mob/user) if(throwforce == 15) // The rod has been superheated - we don't want it to be useable when removed from the bow. to_chat(user , "[src] shatters into a scattering of overstressed metal shards as it leaves the crossbow.") - var/obj/item/weapon/material/shard/shrapnel/S = new() + var/obj/item/material/shard/shrapnel/S = new() S.loc = get_turf(src) qdel(src) -/obj/item/weapon/gun/launcher/crossbow +/obj/item/gun/launcher/crossbow name = "powered crossbow" desc = "A 2320AD twist on an old classic. Pick up that can." //VOREStation Edit icon = 'icons/obj/weapons.dmi' @@ -64,30 +64,30 @@ var/tension = 0 // Current draw on the bow. var/max_tension = 5 // Highest possible tension. var/release_speed = 5 // Speed per unit of tension. - var/obj/item/weapon/cell/cell = null // Used for firing superheated rods. + var/obj/item/cell/cell = null // Used for firing superheated rods. var/current_user // Used to check if the crossbow has changed hands since being drawn. -/obj/item/weapon/gun/launcher/crossbow/update_release_force() +/obj/item/gun/launcher/crossbow/update_release_force() release_force = tension*release_speed -/obj/item/weapon/gun/launcher/crossbow/consume_next_projectile(mob/user=null) +/obj/item/gun/launcher/crossbow/consume_next_projectile(mob/user=null) if(tension <= 0) to_chat(user, "\The [src] is not drawn back!") return null return bolt -/obj/item/weapon/gun/launcher/crossbow/handle_post_fire(mob/user, atom/target) +/obj/item/gun/launcher/crossbow/handle_post_fire(mob/user, atom/target) bolt = null tension = 0 update_icon() ..() -/obj/item/weapon/gun/launcher/crossbow/attack_self(mob/living/user as mob) +/obj/item/gun/launcher/crossbow/attack_self(mob/living/user as mob) if(tension) if(bolt) user.visible_message("[user] relaxes the tension on [src]'s string and removes [bolt].","You relax the tension on [src]'s string and remove [bolt].") bolt.loc = get_turf(src) - var/obj/item/weapon/arrow/A = bolt + var/obj/item/arrow/A = bolt bolt = null A.removed(user) else @@ -97,7 +97,7 @@ else draw(user) -/obj/item/weapon/gun/launcher/crossbow/proc/draw(var/mob/user as mob) +/obj/item/gun/launcher/crossbow/proc/draw(var/mob/user as mob) if(!bolt) to_chat(user, "You don't have anything nocked to [src].") @@ -131,15 +131,15 @@ user.visible_message("[usr] draws back the string of [src]!","You continue drawing back the string of [src]!") -/obj/item/weapon/gun/launcher/crossbow/proc/increase_tension(var/mob/user as mob) +/obj/item/gun/launcher/crossbow/proc/increase_tension(var/mob/user as mob) if(!bolt || !tension || current_user != user) //Arrow has been fired, bow has been relaxed or user has changed. return -/obj/item/weapon/gun/launcher/crossbow/attackby(obj/item/W as obj, mob/user as mob) +/obj/item/gun/launcher/crossbow/attackby(obj/item/W as obj, mob/user as mob) if(!bolt) - if (istype(W,/obj/item/weapon/arrow)) + if (istype(W,/obj/item/arrow)) user.drop_from_inventory(W, src) bolt = W user.visible_message("[user] slides [bolt] into [src].","You slide [bolt] into [src].") @@ -148,7 +148,7 @@ else if(istype(W,/obj/item/stack/rods)) var/obj/item/stack/rods/R = W if (R.use(1)) - bolt = new /obj/item/weapon/arrow/rod(src) + bolt = new /obj/item/arrow/rod(src) bolt.fingerprintslast = src.fingerprintslast bolt.loc = src update_icon() @@ -156,7 +156,7 @@ superheat_rod(user) return - if(istype(W, /obj/item/weapon/cell)) + if(istype(W, /obj/item/cell)) if(!cell) user.drop_item() cell = W @@ -179,18 +179,18 @@ else ..() -/obj/item/weapon/gun/launcher/crossbow/proc/superheat_rod(var/mob/user) +/obj/item/gun/launcher/crossbow/proc/superheat_rod(var/mob/user) if(!user || !cell || !bolt) return if(cell.charge < 500) return if(bolt.throwforce >= 15) return - if(!istype(bolt,/obj/item/weapon/arrow/rod)) return + if(!istype(bolt,/obj/item/arrow/rod)) return to_chat(user, "[bolt] plinks and crackles as it begins to glow red-hot.") bolt.throwforce = 15 bolt.icon_state = "metal-rod-superheated" cell.use(500) -/obj/item/weapon/gun/launcher/crossbow/update_icon() +/obj/item/gun/launcher/crossbow/update_icon() if(tension > 1) icon_state = "crossbow-drawn" else if(bolt) @@ -200,7 +200,7 @@ // Crossbow construction. -/obj/item/weapon/crossbowframe +/obj/item/crossbowframe name = "crossbow frame" desc = "A half-finished crossbow." icon_state = "crossbowframe0" @@ -208,10 +208,10 @@ var/buildstate = 0 -/obj/item/weapon/crossbowframe/update_icon() +/obj/item/crossbowframe/update_icon() icon_state = "crossbowframe[buildstate]" -/obj/item/weapon/crossbowframe/examine(mob/user) +/obj/item/crossbowframe/examine(mob/user) . = ..() switch(buildstate) if(1) @@ -225,7 +225,7 @@ if(5) . += "It has a steel cable loosely strung across the lath." -/obj/item/weapon/crossbowframe/attackby(obj/item/W as obj, mob/user as mob) +/obj/item/crossbowframe/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/stack/rods)) if(buildstate == 0) var/obj/item/stack/rods/R = W @@ -238,7 +238,7 @@ return else if(W.has_tool_quality(TOOL_WELDER)) if(buildstate == 1) - var/obj/item/weapon/weldingtool/T = W.get_welder() + var/obj/item/weldingtool/T = W.get_welder() if(T.remove_fuel(0,user)) if(!src || !T.isOn()) return playsound(src, W.usesound, 50, 1) @@ -278,7 +278,7 @@ if(buildstate == 5) to_chat(user, "You secure the crossbow's various parts.") playsound(src, W.usesound, 50, 1) - new /obj/item/weapon/gun/launcher/crossbow(get_turf(src)) + new /obj/item/gun/launcher/crossbow(get_turf(src)) qdel(src) return else diff --git a/code/modules/projectiles/guns/launcher/grenade_launcher.dm b/code/modules/projectiles/guns/launcher/grenade_launcher.dm index 619ccda825e..2d06df48c7b 100644 --- a/code/modules/projectiles/guns/launcher/grenade_launcher.dm +++ b/code/modules/projectiles/guns/launcher/grenade_launcher.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/launcher/grenade +/obj/item/gun/launcher/grenade name = "grenade launcher" desc = "A bulky pump-action grenade launcher. Holds up to 6 grenades in a revolving magazine." icon_state = "riotgun" @@ -12,16 +12,16 @@ throw_distance = 7 release_force = 5 - var/obj/item/weapon/grenade/chambered + var/obj/item/grenade/chambered var/list/grenades = new/list() var/max_grenades = 5 //holds this + one in the chamber matter = list(MAT_STEEL = 2000) //revolves the magazine, allowing players to choose between multiple grenade types -/obj/item/weapon/gun/launcher/grenade/proc/pump(mob/M as mob) +/obj/item/gun/launcher/grenade/proc/pump(mob/M as mob) playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1) - var/obj/item/weapon/grenade/next + var/obj/item/grenade/next if(grenades.len) next = grenades[1] //get this first, so that the chambered grenade can still be removed if the grenades list is empty if(chambered) @@ -35,7 +35,7 @@ to_chat(M, "You pump [src], but the magazine is empty.") update_icon() -/obj/item/weapon/gun/launcher/grenade/examine(mob/user) +/obj/item/gun/launcher/grenade/examine(mob/user) . = ..() if(get_dist(user, src) <= 2) var/grenade_count = grenades.len + (chambered? 1 : 0) @@ -43,7 +43,7 @@ if(chambered) . += "\A [chambered] is chambered." -/obj/item/weapon/gun/launcher/grenade/proc/load(obj/item/weapon/grenade/G, mob/user) +/obj/item/gun/launcher/grenade/proc/load(obj/item/grenade/G, mob/user) if(G.loadable) if(grenades.len >= max_grenades) to_chat(user, "[src] is full.") @@ -55,9 +55,9 @@ return to_chat(user, "[G] doesn't seem to fit in the [src]!") -/obj/item/weapon/gun/launcher/grenade/proc/unload(mob/user) +/obj/item/gun/launcher/grenade/proc/unload(mob/user) if(grenades.len) - var/obj/item/weapon/grenade/G = grenades[grenades.len] + var/obj/item/grenade/G = grenades[grenades.len] grenades.len-- user.put_in_hands(G) user.visible_message("[user] removes \a [G] from [src].", "You remove \a [G] from [src].") @@ -65,45 +65,45 @@ else to_chat(user, "[src] is empty.") -/obj/item/weapon/gun/launcher/grenade/attack_self(mob/user) +/obj/item/gun/launcher/grenade/attack_self(mob/user) pump(user) -/obj/item/weapon/gun/launcher/grenade/attackby(obj/item/I, mob/user) - if((istype(I, /obj/item/weapon/grenade))) +/obj/item/gun/launcher/grenade/attackby(obj/item/I, mob/user) + if((istype(I, /obj/item/grenade))) load(I, user) else ..() -/obj/item/weapon/gun/launcher/grenade/attack_hand(mob/user) +/obj/item/gun/launcher/grenade/attack_hand(mob/user) if(user.get_inactive_hand() == src) unload(user) else ..() -/obj/item/weapon/gun/launcher/grenade/consume_next_projectile() +/obj/item/gun/launcher/grenade/consume_next_projectile() if(chambered) chambered.det_time = 10 chambered.activate(null) return chambered -/obj/item/weapon/gun/launcher/grenade/handle_post_fire(mob/user) +/obj/item/gun/launcher/grenade/handle_post_fire(mob/user) message_admins("[key_name_admin(user)] fired a grenade ([chambered.name]) from a grenade launcher ([src.name]).") log_game("[key_name_admin(user)] used a grenade ([chambered.name]).") chambered = null //Underslung grenade launcher to be used with the Z8 -/obj/item/weapon/gun/launcher/grenade/underslung +/obj/item/gun/launcher/grenade/underslung name = "underslung grenade launcher" desc = "Not much more than a tube and a firing mechanism, this grenade launcher is designed to be fitted to a rifle." w_class = ITEMSIZE_NORMAL force = 5 max_grenades = 0 -/obj/item/weapon/gun/launcher/grenade/underslung/attack_self() +/obj/item/gun/launcher/grenade/underslung/attack_self() return //load and unload directly into chambered -/obj/item/weapon/gun/launcher/grenade/underslung/load(obj/item/weapon/grenade/G, mob/user) +/obj/item/gun/launcher/grenade/underslung/load(obj/item/grenade/G, mob/user) if(G.loadable) if(chambered) to_chat(user, "[src] is already loaded.") @@ -115,7 +115,7 @@ return to_chat(user, "[G] doesn't seem to fit in the [src]!") -/obj/item/weapon/gun/launcher/grenade/underslung/unload(mob/user) +/obj/item/gun/launcher/grenade/underslung/unload(mob/user) if(chambered) user.put_in_hands(chambered) user.visible_message("[user] removes \a [chambered] from [src].", "You remove \a [chambered] from [src].") diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm index 1e75a9b1d2d..112d31f305e 100644 --- a/code/modules/projectiles/guns/launcher/pneumatic.dm +++ b/code/modules/projectiles/guns/launcher/pneumatic.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/launcher/pneumatic +/obj/item/gun/launcher/pneumatic name = "pneumatic cannon" desc = "A large gas-powered cannon." icon_state = "pneumatic" @@ -12,15 +12,15 @@ var/fire_pressure // Used in fire checks/pressure checks. var/max_w_class = ITEMSIZE_NORMAL // Hopper intake size. var/max_storage_space = ITEMSIZE_COST_NORMAL * 5 // Total internal storage size. - var/obj/item/weapon/tank/tank = null // Tank of gas for use in firing the cannon. + var/obj/item/tank/tank = null // Tank of gas for use in firing the cannon. - var/obj/item/weapon/storage/item_storage + var/obj/item/storage/item_storage var/pressure_setting = 10 // Percentage of the gas in the tank used to fire the projectile. var/possible_pressure_amounts = list(5,10,20,25,50) // Possible pressure settings. var/force_divisor = 400 // Force equates to speed. Speed/5 equates to a damage multiplier for whoever you hit. // For reference, a fully pressurized oxy tank at 50% gas release firing a health // analyzer with a force_divisor of 10 hit with a damage multiplier of 3000+. -/obj/item/weapon/gun/launcher/pneumatic/New() +/obj/item/gun/launcher/pneumatic/New() ..() item_storage = new(src) item_storage.name = "hopper" @@ -28,7 +28,7 @@ item_storage.max_storage_space = max_storage_space item_storage.use_sound = null -/obj/item/weapon/gun/launcher/pneumatic/verb/set_pressure() //set amount of tank pressure. +/obj/item/gun/launcher/pneumatic/verb/set_pressure() //set amount of tank pressure. set name = "Set Valve Pressure" set category = "Object" set src in range(0) @@ -37,7 +37,7 @@ pressure_setting = N to_chat(usr, "You dial the pressure valve to [pressure_setting]%.") -/obj/item/weapon/gun/launcher/pneumatic/proc/eject_tank(mob/user) //Remove the tank. +/obj/item/gun/launcher/pneumatic/proc/eject_tank(mob/user) //Remove the tank. if(!tank) to_chat(user, "There's no tank in [src].") return @@ -47,7 +47,7 @@ tank = null update_icon() -/obj/item/weapon/gun/launcher/pneumatic/proc/unload_hopper(mob/user) +/obj/item/gun/launcher/pneumatic/proc/unload_hopper(mob/user) if(item_storage.contents.len > 0) var/obj/item/removing = item_storage.contents[item_storage.contents.len] item_storage.remove_from_storage(removing, src.loc) @@ -57,14 +57,14 @@ else to_chat(user, "There is nothing to remove in \the [src].") -/obj/item/weapon/gun/launcher/pneumatic/attack_hand(mob/user as mob) +/obj/item/gun/launcher/pneumatic/attack_hand(mob/user as mob) if(user.get_inactive_hand() == src) unload_hopper(user) else return ..() -/obj/item/weapon/gun/launcher/pneumatic/attackby(obj/item/W as obj, mob/user as mob) - if(!tank && istype(W,/obj/item/weapon/tank)) +/obj/item/gun/launcher/pneumatic/attackby(obj/item/W as obj, mob/user as mob) + if(!tank && istype(W,/obj/item/tank)) user.drop_from_inventory(W, src) tank = W user.visible_message("[user] jams [W] into [src]'s valve and twists it closed.","You jam [W] into [src]'s valve and twist it closed.") @@ -72,10 +72,10 @@ else if(istype(W) && item_storage.can_be_inserted(W)) item_storage.handle_item_insertion(W) -/obj/item/weapon/gun/launcher/pneumatic/attack_self(mob/user as mob) +/obj/item/gun/launcher/pneumatic/attack_self(mob/user as mob) eject_tank(user) -/obj/item/weapon/gun/launcher/pneumatic/consume_next_projectile(mob/user=null) +/obj/item/gun/launcher/pneumatic/consume_next_projectile(mob/user=null) if(!item_storage.contents.len) return null if (!tank) @@ -98,7 +98,7 @@ item_storage.remove_from_storage(launched, src) return launched -/obj/item/weapon/gun/launcher/pneumatic/examine(mob/user) +/obj/item/gun/launcher/pneumatic/examine(mob/user) . = ..() if(get_dist(user, src) <= 2) . += "The valve is dialed to [pressure_setting]%." @@ -107,14 +107,14 @@ else . += "Nothing is attached to the tank valve!" -/obj/item/weapon/gun/launcher/pneumatic/update_release_force(obj/item/projectile) +/obj/item/gun/launcher/pneumatic/update_release_force(obj/item/projectile) if(tank) release_force = ((fire_pressure*tank.volume)/projectile.w_class)/force_divisor //projectile speed. if(release_force > 80) release_force = 80 //damage cap. else release_force = 0 -/obj/item/weapon/gun/launcher/pneumatic/handle_post_fire() +/obj/item/gun/launcher/pneumatic/handle_post_fire() if(tank) var/lost_gas_amount = tank.air_contents.total_moles*(pressure_setting/100) var/datum/gas_mixture/removed = tank.air_contents.remove(lost_gas_amount) @@ -123,7 +123,7 @@ if(T) T.assume_air(removed) ..() -/obj/item/weapon/gun/launcher/pneumatic/update_icon() +/obj/item/gun/launcher/pneumatic/update_icon() if(tank) icon_state = "pneumatic-tank" item_state = "pneumatic-tank" @@ -138,7 +138,7 @@ //Constructable pneumatic cannon. -/obj/item/weapon/cannonframe +/obj/item/cannonframe name = "pneumatic cannon frame" desc = "A half-finished pneumatic cannon." icon_state = "pneumatic0" @@ -146,10 +146,10 @@ var/buildstate = 0 -/obj/item/weapon/cannonframe/update_icon() +/obj/item/cannonframe/update_icon() icon_state = "pneumatic[buildstate]" -/obj/item/weapon/cannonframe/examine(mob/user) +/obj/item/cannonframe/examine(mob/user) . = ..() switch(buildstate) if(1) @@ -163,7 +163,7 @@ if(5) . += "It has a transfer valve installed." -/obj/item/weapon/cannonframe/attackby(obj/item/W as obj, mob/user as mob) +/obj/item/cannonframe/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/pipe)) if(buildstate == 0) user.drop_from_inventory(W) @@ -182,7 +182,7 @@ else to_chat(user, "You need at least five metal sheets to complete this task.") return - else if(istype(W,/obj/item/device/transfer_valve)) + else if(istype(W,/obj/item/transfer_valve)) if(buildstate == 4) user.drop_from_inventory(W) qdel(W) @@ -191,7 +191,7 @@ update_icon() return else if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/T = W.get_welder() + var/obj/item/weldingtool/T = W.get_welder() if(buildstate == 1) if(T.remove_fuel(0,user)) if(!src || !T.isOn()) return @@ -211,7 +211,7 @@ if(!src || !T.isOn()) return playsound(src, W.usesound, 100, 1) to_chat(user, "You weld the valve into place.") - new /obj/item/weapon/gun/launcher/pneumatic(get_turf(src)) + new /obj/item/gun/launcher/pneumatic(get_turf(src)) qdel(src) return else diff --git a/code/modules/projectiles/guns/launcher/rocket.dm b/code/modules/projectiles/guns/launcher/rocket.dm index 2ae1996e05a..1e210fb1412 100644 --- a/code/modules/projectiles/guns/launcher/rocket.dm +++ b/code/modules/projectiles/guns/launcher/rocket.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/launcher/rocket +/obj/item/gun/launcher/rocket name = "rocket launcher" desc = "MAGGOT." icon_state = "rocket" @@ -16,12 +16,12 @@ var/max_rockets = 1 var/list/rockets = new/list() -/obj/item/weapon/gun/launcher/rocket/examine(mob/user) +/obj/item/gun/launcher/rocket/examine(mob/user) . = ..() if(get_dist(user, src) <= 2) . += span_blue("[rockets.len] / [max_rockets] rockets.") -/obj/item/weapon/gun/launcher/rocket/attackby(obj/item/I as obj, mob/user as mob) +/obj/item/gun/launcher/rocket/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/ammo_casing/rocket)) if(rockets.len < max_rockets) user.drop_item() @@ -32,14 +32,14 @@ else to_chat(usr, span_red(">[src] cannot hold more rockets.")) -/obj/item/weapon/gun/launcher/rocket/consume_next_projectile() +/obj/item/gun/launcher/rocket/consume_next_projectile() if(rockets.len) var/obj/item/ammo_casing/rocket/I = rockets[1] rockets -= I return new I.projectile_type(src) return null -/obj/item/weapon/gun/launcher/rocket/handle_post_fire(mob/user, atom/target) +/obj/item/gun/launcher/rocket/handle_post_fire(mob/user, atom/target) message_admins("[key_name_admin(user)] fired a rocket from a rocket launcher ([src.name]) at [target].") log_game("[key_name_admin(user)] used a rocket launcher ([src.name]) at [target].") ..() diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm index 3da58638a52..7ed3441217d 100644 --- a/code/modules/projectiles/guns/launcher/syringe_gun.dm +++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/syringe_cartridge +/obj/item/syringe_cartridge name = "syringe gun cartridge" desc = "An impact-triggered compressed gas cartridge that can be fitted to a syringe for rapid injection." icon = 'icons/obj/ammo.dmi' @@ -9,16 +9,16 @@ throwforce = 3 force = 3 w_class = ITEMSIZE_TINY - var/obj/item/weapon/reagent_containers/syringe/syringe + var/obj/item/reagent_containers/syringe/syringe -/obj/item/weapon/syringe_cartridge/update_icon() +/obj/item/syringe_cartridge/update_icon() underlays.Cut() if(syringe) underlays += image(syringe.icon, src, syringe.icon_state) underlays += syringe.filling -/obj/item/weapon/syringe_cartridge/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/weapon/reagent_containers/syringe)) +/obj/item/syringe_cartridge/attackby(obj/item/I, mob/user) + if(istype(I, /obj/item/reagent_containers/syringe)) syringe = I to_chat(user, "You carefully insert [syringe] into [src].") user.remove_from_mob(syringe) @@ -27,7 +27,7 @@ name = "syringe dart" update_icon() -/obj/item/weapon/syringe_cartridge/attack_self(mob/user) +/obj/item/syringe_cartridge/attack_self(mob/user) if(syringe) to_chat(user, "You remove [syringe] from [src].") playsound(src, 'sound/weapons/empty.ogg', 50, 1) @@ -37,12 +37,12 @@ name = initial(name) update_icon() -/obj/item/weapon/syringe_cartridge/proc/prime() +/obj/item/syringe_cartridge/proc/prime() //the icon state will revert back when update_icon() is called from throw_impact() icon_state = icon_flight underlays.Cut() -/obj/item/weapon/syringe_cartridge/throw_impact(atom/hit_atom, var/speed) +/obj/item/syringe_cartridge/throw_impact(atom/hit_atom, var/speed) ..() //handles embedding for us. Should have a decent chance if thrown fast enough if(syringe) //check speed to see if we hit hard enough to trigger the rapid injection @@ -61,7 +61,7 @@ icon_state = initial(icon_state) //reset icon state update_icon() -/obj/item/weapon/gun/launcher/syringe +/obj/item/gun/launcher/syringe name = "syringe gun" desc = "A spring loaded rifle designed to fit syringes, designed to incapacitate unruly patients from a distance." icon_state = "syringegun" @@ -79,20 +79,20 @@ var/list/darts = list() var/max_darts = 1 - var/obj/item/weapon/syringe_cartridge/next + var/obj/item/syringe_cartridge/next -/obj/item/weapon/gun/launcher/syringe/consume_next_projectile() +/obj/item/gun/launcher/syringe/consume_next_projectile() if(next) next.prime() return next return null -/obj/item/weapon/gun/launcher/syringe/handle_post_fire() +/obj/item/gun/launcher/syringe/handle_post_fire() ..() darts -= next next = null -/obj/item/weapon/gun/launcher/syringe/attack_self(mob/living/user as mob) +/obj/item/gun/launcher/syringe/attack_self(mob/living/user as mob) if(next) user.visible_message("[user] unlatches and carefully relaxes the bolt on [src].", "You unlatch and carefully relax the bolt on [src], unloading the spring.") next = null @@ -102,7 +102,7 @@ next = darts[1] add_fingerprint(user) -/obj/item/weapon/gun/launcher/syringe/attack_hand(mob/living/user as mob) +/obj/item/gun/launcher/syringe/attack_hand(mob/living/user as mob) if(user.get_inactive_hand() == src) if(!darts.len) to_chat(user, "[src] is empty.") @@ -110,7 +110,7 @@ if(next) to_chat(user, "[src]'s cover is locked shut.") return - var/obj/item/weapon/syringe_cartridge/C = darts[1] + var/obj/item/syringe_cartridge/C = darts[1] darts -= C user.put_in_hands(C) user.visible_message("[user] removes \a [C] from [src].", "You remove \a [C] from [src].") @@ -118,9 +118,9 @@ else ..() -/obj/item/weapon/gun/launcher/syringe/attackby(var/obj/item/A as obj, mob/user as mob) - if(istype(A, /obj/item/weapon/syringe_cartridge)) - var/obj/item/weapon/syringe_cartridge/C = A +/obj/item/gun/launcher/syringe/attackby(var/obj/item/A as obj, mob/user as mob) + if(istype(A, /obj/item/syringe_cartridge)) + var/obj/item/syringe_cartridge/C = A if(darts.len >= max_darts) to_chat(user, "[src] is full!") return @@ -131,7 +131,7 @@ else ..() -/obj/item/weapon/gun/launcher/syringe/rapid +/obj/item/gun/launcher/syringe/rapid name = "syringe gun revolver" desc = "A modification of the syringe gun design, using a rotating cylinder to store up to five syringes. The spring still needs to be drawn between shots." icon_state = "rapidsyringegun" diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index 0b0678894fb..b01f1da46ba 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -2,7 +2,7 @@ * "Magic" "Guns" */ -/obj/item/weapon/gun/magic +/obj/item/gun/magic name = "staff of nothing" desc = "This staff is boring to watch because even though it came first you've seen everything it can do in other staves for years." icon = 'icons/obj/wizard.dmi' @@ -21,8 +21,8 @@ var/charge_tick = 0 var/can_charge = TRUE -/obj/item/weapon/gun/magic/consume_next_projectile() - if(checks_antimagic && locate(/obj/item/weapon/nullrod) in usr) return null +/obj/item/gun/magic/consume_next_projectile() + if(checks_antimagic && locate(/obj/item/nullrod) in usr) return null if(!ispath(projectile_type)) return null if(charges <= 0) return null @@ -30,18 +30,18 @@ return new projectile_type(src) -/obj/item/weapon/gun/magic/Initialize() +/obj/item/gun/magic/Initialize() . = ..() charges = max_charges if(can_charge) START_PROCESSING(SSobj, src) -/obj/item/weapon/gun/magic/Destroy() +/obj/item/gun/magic/Destroy() if(can_charge) STOP_PROCESSING(SSobj, src) return ..() -/obj/item/weapon/gun/magic/process() +/obj/item/gun/magic/process() if (charges >= max_charges) charge_tick = 0 return @@ -52,7 +52,7 @@ charges++ return 1 -/obj/item/weapon/gun/magic/handle_click_empty(mob/user) +/obj/item/gun/magic/handle_click_empty(mob/user) if (user) user.visible_message("*wzhzhzh*", "The [name] whizzles quietly.") else diff --git a/code/modules/projectiles/guns/magic/fireball.dm b/code/modules/projectiles/guns/magic/fireball.dm index 4abe3e286e8..50057c0aee4 100644 --- a/code/modules/projectiles/guns/magic/fireball.dm +++ b/code/modules/projectiles/guns/magic/fireball.dm @@ -1,5 +1,5 @@ -/obj/item/weapon/gun/magic/firestaff +/obj/item/gun/magic/firestaff name = "flaming staff" desc = "A long, everburning torch." icon = 'icons/obj/wizard.dmi' diff --git a/code/modules/projectiles/guns/magnetic/bore.dm b/code/modules/projectiles/guns/magnetic/bore.dm index b390d48ff0d..dea73eb7556 100644 --- a/code/modules/projectiles/guns/magnetic/bore.dm +++ b/code/modules/projectiles/guns/magnetic/bore.dm @@ -1,21 +1,21 @@ -/obj/item/weapon/gun/magnetic/matfed +/obj/item/gun/magnetic/matfed power_cost = 750 - load_type = list(/obj/item/stack/material, /obj/item/weapon/ore) + load_type = list(/obj/item/stack/material, /obj/item/ore) var/mat_storage = 0 // How much material is stored inside? Input in multiples of 2000 as per auto/protolathe. var/max_mat_storage = 8000 // How much material can be stored inside? var/mat_cost = 500 // How much material is used per-shot? var/ammo_material - var/obj/item/weapon/stock_parts/manipulator/manipulator // Installed manipulator. Mostly for Phoron Bore, higher rating == less mats consumed upon firing. Set to a path to spawn with one of that type. + var/obj/item/stock_parts/manipulator/manipulator // Installed manipulator. Mostly for Phoron Bore, higher rating == less mats consumed upon firing. Set to a path to spawn with one of that type. var/rating_modifier = 0 // rating of installed capacitor + manipulator var/loading = FALSE -/obj/item/weapon/gun/magnetic/matfed/proc/update_rating_mod() +/obj/item/gun/magnetic/matfed/proc/update_rating_mod() if(capacitor && manipulator) rating_modifier = capacitor.get_rating() + manipulator.get_rating() else rating_modifier = FALSE -/obj/item/weapon/gun/magnetic/matfed/Initialize() +/obj/item/gun/magnetic/matfed/Initialize() . = ..() if(ispath(manipulator)) manipulator = new manipulator(src) @@ -23,18 +23,18 @@ mat_cost = initial(mat_cost) / (2*manipulator.rating) update_rating_mod() -/obj/item/weapon/gun/magnetic/matfed/Destroy() +/obj/item/gun/magnetic/matfed/Destroy() QDEL_NULL(manipulator) . = ..() -/obj/item/weapon/gun/magnetic/matfed/examine(mob/user) +/obj/item/gun/magnetic/matfed/examine(mob/user) . = ..() if(manipulator) . += "The installed [manipulator.name] consumes [mat_cost] units of [ammo_material] per shot." else . += "The \"manipulator missing\" indicator is lit. [src] consumes [mat_cost] units of [ammo_material] per shot." -/obj/item/weapon/gun/magnetic/matfed/update_icon() +/obj/item/gun/magnetic/matfed/update_icon() var/list/overlays_to_add = list() if(removable_components) if(cell) @@ -53,7 +53,7 @@ overlays = overlays_to_add ..() -/obj/item/weapon/gun/magnetic/matfed/attack_hand(var/mob/user) // It doesn't keep a loaded item inside. +/obj/item/gun/magnetic/matfed/attack_hand(var/mob/user) // It doesn't keep a loaded item inside. if(user.get_inactive_hand() == src) var/obj/item/removing @@ -69,22 +69,22 @@ return . = ..() -/obj/item/weapon/gun/magnetic/matfed/check_ammo() +/obj/item/gun/magnetic/matfed/check_ammo() if(mat_storage - mat_cost >= 0) return TRUE return FALSE -/obj/item/weapon/gun/magnetic/matfed/use_ammo() +/obj/item/gun/magnetic/matfed/use_ammo() mat_storage -= mat_cost -/obj/item/weapon/gun/magnetic/matfed/show_ammo() +/obj/item/gun/magnetic/matfed/show_ammo() if(mat_storage) return "It has [mat_storage] out of [max_mat_storage] units of [ammo_material] loaded." else return "It\'s out of [ammo_material]!" -/obj/item/weapon/gun/magnetic/matfed/attackby(var/obj/item/thing, var/mob/user) +/obj/item/gun/magnetic/matfed/attackby(var/obj/item/thing, var/mob/user) . = ..() update_rating_mod() if(removable_components) @@ -101,7 +101,7 @@ update_rating_mod() return - if(istype(thing, /obj/item/weapon/stock_parts/manipulator)) + if(istype(thing, /obj/item/stock_parts/manipulator)) if(manipulator) to_chat(user, "\The [src] already has \a [manipulator] installed.") return @@ -154,7 +154,7 @@ #define GEN_IDLE 1 #define GEN_ACTIVE 2 -/obj/item/weapon/gun/magnetic/matfed/phoronbore +/obj/item/gun/magnetic/matfed/phoronbore name = "portable phoron bore" desc = "A large man-portable tunnel bore, using phorogenic plasma blasts. Point away from user." description_fluff = "An aging Grayson Manufactories mining tool used for rapidly digging through rock. Mass production was discontinued when many of the devices were stolen and used to break into a high security facility by Boiling Point drones." @@ -179,7 +179,7 @@ var/datum/looping_sound/small_motor/soundloop var/time_started //to keep the soundloop from being "stopped" too soon and playing indefinitely -/obj/item/weapon/gun/magnetic/matfed/phoronbore/consume_next_projectile() +/obj/item/gun/magnetic/matfed/phoronbore/consume_next_projectile() if(!check_ammo() || !capacitor || capacitor.charge < power_cost) return @@ -189,25 +189,25 @@ return new projectile_type(src, rating_modifier) -/obj/item/weapon/gun/magnetic/matfed/phoronbore/examine(mob/user) +/obj/item/gun/magnetic/matfed/phoronbore/examine(mob/user) . = ..() if(rating_modifier) . += "A display on the side slowly scrolls the text \"BLAST EFFICIENCY [rating_modifier]\"." else // rating_mod 0 = something's not right . += "A display on the side slowly scrolls the text \"ERR: MISSING COMPONENT - EFFICIENCY MODIFICATION INCOMPLETE\"." -/obj/item/weapon/gun/magnetic/matfed/phoronbore/Initialize() +/obj/item/gun/magnetic/matfed/phoronbore/Initialize() . = ..() soundloop = new(list(src), 0) -/obj/item/weapon/gun/magnetic/matfed/phoronbore/Destroy() +/obj/item/gun/magnetic/matfed/phoronbore/Destroy() QDEL_NULL(soundloop) . = ..() -/obj/item/weapon/gun/magnetic/matfed/phoronbore/ui_action_click() +/obj/item/gun/magnetic/matfed/phoronbore/ui_action_click() toggle_generator(usr) -/obj/item/weapon/gun/magnetic/matfed/phoronbore/process() +/obj/item/gun/magnetic/matfed/phoronbore/process() if(generator_state && !mat_storage) audible_message(SPAN_NOTICE("\The [src] goes quiet."),SPAN_NOTICE("A motor noise cuts out."), runemessage = "goes quiet") soundloop.stop() @@ -230,7 +230,7 @@ update_state() -/obj/item/weapon/gun/magnetic/matfed/phoronbore/proc/generator_generate() +/obj/item/gun/magnetic/matfed/phoronbore/proc/generator_generate() var/fuel_used = generator_state == GEN_IDLE ? 5 : 25 var/power_made = fuel_used * 800 * CELLRATE //20kW when active, same power as a pacman on setting one, but less efficient because compact and portable if(cell) @@ -242,7 +242,7 @@ if(T) T.assume_gas("carbon_dioxide", fuel_used * 0.01, T0C+200) -/obj/item/weapon/gun/magnetic/matfed/phoronbore/proc/toggle_generator(mob/living/user) +/obj/item/gun/magnetic/matfed/phoronbore/proc/toggle_generator(mob/living/user) if(!generator_state && !mat_storage) to_chat(user, SPAN_NOTICE("\The [src] has no fuel!")) return @@ -267,9 +267,9 @@ audible_message(SPAN_NOTICE("\The [src] goes quiet."),SPAN_NOTICE("A motor noise cuts out."), runemessage = "goes quiet") generator_state = GEN_OFF -/obj/item/weapon/gun/magnetic/matfed/phoronbore/loaded - cell = /obj/item/weapon/cell/apc - capacitor = /obj/item/weapon/stock_parts/capacitor +/obj/item/gun/magnetic/matfed/phoronbore/loaded + cell = /obj/item/cell/apc + capacitor = /obj/item/stock_parts/capacitor #undef GEN_STARTING #undef GEN_OFF diff --git a/code/modules/projectiles/guns/magnetic/gasthrower.dm b/code/modules/projectiles/guns/magnetic/gasthrower.dm index d729719c323..e00b68b2c8d 100644 --- a/code/modules/projectiles/guns/magnetic/gasthrower.dm +++ b/code/modules/projectiles/guns/magnetic/gasthrower.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/magnetic/gasthrower +/obj/item/gun/magnetic/gasthrower name = "phoronthrower" desc = "A modernized flamethrower utilizing pressurized phoron gas as both a propellant and combustion medium." description_fluff = "A weapon designed to effectively combat the threat posed by Almachi soldiers without the danger of other forms of flamethrower." @@ -19,16 +19,16 @@ removable_components = TRUE gun_unreliable = 0 - load_type = /obj/item/weapon/tank + load_type = /obj/item/tank projectile_type = /obj/item/projectile/scatter/flamethrower power_cost = 250 -/obj/item/weapon/gun/magnetic/gasthrower/check_ammo() +/obj/item/gun/magnetic/gasthrower/check_ammo() if(!loaded || !istype(loaded, load_type)) return 0 - var/obj/item/weapon/tank/Tank = loaded + var/obj/item/tank/Tank = loaded Tank.air_contents.update_values() // Safety @@ -57,18 +57,18 @@ return 0 -/obj/item/weapon/gun/magnetic/gasthrower/use_ammo() - var/obj/item/weapon/tank/Tank = loaded +/obj/item/gun/magnetic/gasthrower/use_ammo() + var/obj/item/tank/Tank = loaded var/moles_to_pull = 0.25 Tank.air_contents.remove(moles_to_pull) -/obj/item/weapon/gun/magnetic/gasthrower/show_ammo(var/mob/user) +/obj/item/gun/magnetic/gasthrower/show_ammo(var/mob/user) . = ..() if(loaded) - var/obj/item/weapon/tank/T = loaded + var/obj/item/tank/T = loaded . += "\The [T]'s pressure meter shows: [T.air_contents.return_pressure()] kpa." switch(check_ammo()) diff --git a/code/modules/projectiles/guns/magnetic/magnetic.dm b/code/modules/projectiles/guns/magnetic/magnetic.dm index f1d3e20d7b0..d6ea9797374 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic.dm @@ -5,7 +5,7 @@ #define ICON_READY 16 #define ICON_LOADED 32 -/obj/item/weapon/gun/magnetic +/obj/item/gun/magnetic name = "improvised coilgun" desc = "A coilgun hastily thrown together out of a basic frame and advanced power storage components. Is it safe for it to be duct-taped together like that?" icon_state = "coilgun" @@ -15,8 +15,8 @@ origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 4, TECH_ILLEGAL = 2, TECH_MAGNET = 4) w_class = ITEMSIZE_LARGE - var/obj/item/weapon/cell/cell // Currently installed powercell. - var/obj/item/weapon/stock_parts/capacitor/capacitor // Installed capacitor. Higher rating == faster charge between shots. Set to a path to spawn with one of that type. + var/obj/item/cell/cell // Currently installed powercell. + var/obj/item/stock_parts/capacitor/capacitor // Installed capacitor. Higher rating == faster charge between shots. Set to a path to spawn with one of that type. var/removable_components = TRUE // Whether or not the gun can be dismantled. var/gun_unreliable = 15 // Percentage chance of detonating in your hands. @@ -29,7 +29,7 @@ var/state = 0 -/obj/item/weapon/gun/magnetic/Initialize() +/obj/item/gun/magnetic/Initialize() . = ..() // So you can have some spawn with components if(ispath(cell)) @@ -47,17 +47,17 @@ update_icon() -/obj/item/weapon/gun/magnetic/Destroy() +/obj/item/gun/magnetic/Destroy() STOP_PROCESSING(SSobj, src) QDEL_NULL(cell) QDEL_NULL(loaded) QDEL_NULL(capacitor) . = ..() -/obj/item/weapon/gun/magnetic/get_cell() +/obj/item/gun/magnetic/get_cell() return cell -/obj/item/weapon/gun/magnetic/process() +/obj/item/gun/magnetic/process() if(capacitor) if(cell) if(capacitor.charge < capacitor.max_charge && cell.checked_use(power_per_tick)) @@ -67,7 +67,7 @@ update_state() // May update icon, only if things changed. -/obj/item/weapon/gun/magnetic/proc/update_state() +/obj/item/gun/magnetic/proc/update_state() var/newstate = 0 // Parts or lack thereof @@ -99,7 +99,7 @@ if(needs_update) update_icon() -/obj/item/weapon/gun/magnetic/update_icon() +/obj/item/gun/magnetic/update_icon() cut_overlays() if(state & ICON_CELL) add_overlay("[icon_state]_cell") @@ -116,14 +116,14 @@ ..() -/obj/item/weapon/gun/magnetic/proc/show_ammo() +/obj/item/gun/magnetic/proc/show_ammo() var/list/ammotext = list() if(loaded) ammotext += "It has \a [loaded] loaded." return ammotext -/obj/item/weapon/gun/magnetic/examine(var/mob/user) +/obj/item/gun/magnetic/examine(var/mob/user) . = ..() if(get_dist(user, src) <= 2) . += show_ammo() @@ -141,10 +141,10 @@ else . += "The capacitor charge indicator is [span_green("green")]." -/obj/item/weapon/gun/magnetic/attackby(var/obj/item/thing, var/mob/user) +/obj/item/gun/magnetic/attackby(var/obj/item/thing, var/mob/user) if(removable_components) - if(istype(thing, /obj/item/weapon/cell)) + if(istype(thing, /obj/item/cell)) if(cell) to_chat(user, "\The [src] already has \a [cell] installed.") return @@ -166,7 +166,7 @@ update_icon() return - if(istype(thing, /obj/item/weapon/stock_parts/capacitor)) + if(istype(thing, /obj/item/stock_parts/capacitor)) if(capacitor) to_chat(user, "\The [src] already has \a [capacitor] installed.") return @@ -201,7 +201,7 @@ return . = ..() -/obj/item/weapon/gun/magnetic/attack_hand(var/mob/user) +/obj/item/gun/magnetic/attack_hand(var/mob/user) if(user.get_inactive_hand() == src) var/obj/item/removing @@ -221,14 +221,14 @@ return . = ..() -/obj/item/weapon/gun/magnetic/proc/check_ammo() +/obj/item/gun/magnetic/proc/check_ammo() return loaded -/obj/item/weapon/gun/magnetic/proc/use_ammo() +/obj/item/gun/magnetic/proc/use_ammo() qdel(loaded) loaded = null -/obj/item/weapon/gun/magnetic/consume_next_projectile() +/obj/item/gun/magnetic/consume_next_projectile() if(!check_ammo() || !capacitor || capacitor.charge < power_cost) return @@ -245,7 +245,7 @@ return new projectile_type(src) -/obj/item/weapon/gun/magnetic/fuelrod +/obj/item/gun/magnetic/fuelrod name = "Fuel-Rod Cannon" desc = "A bulky weapon designed to fire reactor core fuel rods at absurd velocities... who thought this was a good idea?!" description_antag = "This device is capable of firing reactor fuel assemblies, acquired from a R-UST fuel compressor and an appropriate fueltype. Be warned, Supermatter rods may have unforseen consequences." @@ -259,18 +259,18 @@ removable_components = TRUE gun_unreliable = 0 - load_type = /obj/item/weapon/fuel_assembly + load_type = /obj/item/fuel_assembly projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod power_cost = 500 -/obj/item/weapon/gun/magnetic/fuelrod/consume_next_projectile() +/obj/item/gun/magnetic/fuelrod/consume_next_projectile() if(!check_ammo() || !capacitor || capacitor.charge < power_cost) return if(loaded) //Safety. - if(istype(loaded, /obj/item/weapon/fuel_assembly)) - var/obj/item/weapon/fuel_assembly/rod = loaded + if(istype(loaded, /obj/item/fuel_assembly)) + var/obj/item/fuel_assembly/rod = loaded if(rod.fuel_type == "composite" || rod.fuel_type == "deuterium") //Safety check for rods spawned in without a fueltype. projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod else if(rod.fuel_type == "tritium") @@ -303,9 +303,9 @@ return new projectile_type(src) -/obj/item/weapon/gun/magnetic/fuelrod/New() - cell = new /obj/item/weapon/cell/high - capacitor = new /obj/item/weapon/stock_parts/capacitor +/obj/item/gun/magnetic/fuelrod/New() + cell = new /obj/item/cell/high + capacitor = new /obj/item/stock_parts/capacitor . = ..() #undef ICON_CELL diff --git a/code/modules/projectiles/guns/magnetic/magnetic_construction.dm b/code/modules/projectiles/guns/magnetic/magnetic_construction.dm index da0212b5204..e8d501c2221 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic_construction.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic_construction.dm @@ -1,5 +1,5 @@ // We really need some datums for this. -/obj/item/weapon/coilgun_assembly +/obj/item/coilgun_assembly name = "coilgun stock" desc = "It might be a coilgun, someday." icon = 'icons/obj/coilgun.dmi' @@ -7,7 +7,7 @@ var/construction_stage = 1 -/obj/item/weapon/coilgun_assembly/attackby(var/obj/item/thing, var/mob/user) +/obj/item/coilgun_assembly/attackby(var/obj/item/thing, var/mob/user) if(istype(thing, /obj/item/stack/material) && construction_stage == 1) var/obj/item/stack/material/reinforcing = thing @@ -21,7 +21,7 @@ increment_construction_stage() return - if(istype(thing, /obj/item/weapon/tape_roll) && construction_stage == 2) + if(istype(thing, /obj/item/tape_roll) && construction_stage == 2) user.visible_message("\The [user] secures \the [src] together with \the [thing].") increment_construction_stage() return @@ -34,7 +34,7 @@ return if(thing.has_tool_quality(TOOL_WELDER) && construction_stage == 4) - var/obj/item/weapon/weldingtool/welder = thing.get_welder() + var/obj/item/weldingtool/welder = thing.get_welder() if(!welder.isOn()) to_chat(user, "Turn it on first!") @@ -59,7 +59,7 @@ increment_construction_stage() return - if(istype(thing, /obj/item/weapon/smes_coil) && construction_stage >= 6 && construction_stage <= 8) + if(istype(thing, /obj/item/smes_coil) && construction_stage >= 6 && construction_stage <= 8) user.visible_message("\The [user] installs \a [thing] into \the [src].") user.drop_from_inventory(thing) qdel(thing) @@ -69,7 +69,7 @@ if(thing.has_tool_quality(TOOL_SCREWDRIVER) && construction_stage >= 9) user.visible_message("\The [user] secures \the [src] and finishes it off.") playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) - var/obj/item/weapon/gun/magnetic/coilgun = new(loc) + var/obj/item/gun/magnetic/coilgun = new(loc) var/put_in_hands var/mob/M = src.loc if(istype(M)) @@ -82,12 +82,12 @@ return ..() -/obj/item/weapon/coilgun_assembly/proc/increment_construction_stage() +/obj/item/coilgun_assembly/proc/increment_construction_stage() if(construction_stage < 9) construction_stage++ icon_state = "coilgun_construction_[construction_stage]" -/obj/item/weapon/coilgun_assembly/examine(var/mob/user) +/obj/item/coilgun_assembly/examine(var/mob/user) . = ..() if(get_dist(user, src) <= 2) switch(construction_stage) diff --git a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm index 8497207f2ef..5f676852ae7 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/magnetic/railgun +/obj/item/gun/magnetic/railgun name = "railgun" desc = "The Mars Military Industries MI-76 Thunderclap. A man-portable mass driver for squad support anti-armour and destruction of fortifications and emplacements." description_fluff = "Mars Military Industries is a Hephaestus Industries subsidiary focused on the development of new energy-ballistic hybrid weapons for use against heavy targets. \ @@ -12,12 +12,12 @@ slowdown = 1 // Slowdown equals slowdown_worn, until we decide to import the system to differentiate between held and worn items fire_delay = 1 - load_type = /obj/item/weapon/rcd_ammo + load_type = /obj/item/rcd_ammo projectile_type = /obj/item/projectile/bullet/magnetic/slug - cell = /obj/item/weapon/cell/hyper - capacitor = /obj/item/weapon/stock_parts/capacitor/adv - loaded = /obj/item/weapon/rcd_ammo/large + cell = /obj/item/cell/hyper + capacitor = /obj/item/stock_parts/capacitor/adv + loaded = /obj/item/rcd_ammo/large removable_components = FALSE var/slowdown_held = 2 @@ -26,37 +26,37 @@ // Not going to check type repeatedly, if you code or varedit // load_type and get runtime errors, don't come crying to me. -/obj/item/weapon/gun/magnetic/railgun/show_ammo() - var/obj/item/weapon/rcd_ammo/ammo = loaded +/obj/item/gun/magnetic/railgun/show_ammo() + var/obj/item/rcd_ammo/ammo = loaded if (ammo) return list("There are [ammo.remaining] shot\s remaining in \the [loaded].") else return list("There is nothing loaded.") -/obj/item/weapon/gun/magnetic/railgun/check_ammo() - var/obj/item/weapon/rcd_ammo/ammo = loaded +/obj/item/gun/magnetic/railgun/check_ammo() + var/obj/item/rcd_ammo/ammo = loaded return ammo && ammo.remaining -/obj/item/weapon/gun/magnetic/railgun/use_ammo() - var/obj/item/weapon/rcd_ammo/ammo = loaded +/obj/item/gun/magnetic/railgun/use_ammo() + var/obj/item/rcd_ammo/ammo = loaded ammo.remaining-- if(ammo.remaining <= 0) out_of_ammo() -/obj/item/weapon/gun/magnetic/railgun/proc/out_of_ammo() +/obj/item/gun/magnetic/railgun/proc/out_of_ammo() loaded.forceMove(get_turf(src)) loaded = null visible_message("\The [src] beeps and ejects its empty cartridge.","There's a beeping sound!") playsound(src, empty_sound, 40, 1) update_state() -/obj/item/weapon/gun/magnetic/railgun/automatic // Adminspawn only, this shit is absurd. +/obj/item/gun/magnetic/railgun/automatic // Adminspawn only, this shit is absurd. name = "\improper RHR accelerator" desc = "The Mars Military Industries MI-227 Meteor. Originally a vehicle-mounted turret weapon for heavy anti-vehicular and anti-structural fire, the fact that it was made man-portable is mindboggling in itself." icon_state = "heavy_railgun" - cell = /obj/item/weapon/cell/infinite - capacitor = /obj/item/weapon/stock_parts/capacitor/super + cell = /obj/item/cell/infinite + capacitor = /obj/item/stock_parts/capacitor/super fire_delay = 0 slowdown = 2 @@ -72,19 +72,19 @@ list(mode_name="long bursts", burst=6, fire_delay=null, move_delay=10, one_handed_penalty=30, burst_accuracy=list(0,-15,-15,-15,-30), dispersion=list(0.6, 0.6, 1.0, 1.0, 1.2)), ) -/obj/item/weapon/gun/magnetic/railgun/automatic/examine(var/mob/user) +/obj/item/gun/magnetic/railgun/automatic/examine(var/mob/user) . = ..() if(Adjacent(user)) . += "Someone has scratched Ultima Ratio Regum onto the side of the barrel." -/obj/item/weapon/gun/magnetic/railgun/flechette +/obj/item/gun/magnetic/railgun/flechette name = "flechette gun" desc = "The MI-12 Skadi is a burst fire capable railgun that fires flechette rounds at high velocity. Deadly against armour, but much less effective against soft targets." icon_state = "flechette_gun" item_state = "z8carbine" - cell = /obj/item/weapon/cell/hyper - capacitor = /obj/item/weapon/stock_parts/capacitor/adv + cell = /obj/item/cell/hyper + capacitor = /obj/item/stock_parts/capacitor/adv fire_delay = 0 @@ -95,9 +95,9 @@ slowdown_worn = 0 power_cost = 100 - load_type = /obj/item/weapon/magnetic_ammo + load_type = /obj/item/magnetic_ammo projectile_type = /obj/item/projectile/bullet/magnetic/flechette - loaded = /obj/item/weapon/magnetic_ammo + loaded = /obj/item/magnetic_ammo empty_sound = 'sound/weapons/smg_empty_alarm.ogg' firemodes = list( @@ -105,7 +105,7 @@ list(mode_name="short bursts", burst=3, fire_delay=null, move_delay=5, one_handed_penalty=30, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)), ) -/obj/item/weapon/gun/magnetic/railgun/flechette/pistol +/obj/item/gun/magnetic/railgun/flechette/pistol name = "flechette pistol" desc = "The MI-6a Ullr is a small-form-factor railgun that fires flechette rounds at high velocity. Deadly against armour, but much less effective against soft targets." description_fluff = "Mars Military Industries is a Hephaestus Industries subsidiary focused on the development of new energy-ballistic hybrid weapons for use against heavy targets. \ @@ -114,8 +114,8 @@ item_state = "combatrevolver" w_class = ITEMSIZE_SMALL - cell = /obj/item/weapon/cell/super - capacitor = /obj/item/weapon/stock_parts/capacitor + cell = /obj/item/cell/super + capacitor = /obj/item/stock_parts/capacitor fire_delay = 0 @@ -126,9 +126,9 @@ slowdown_worn = 0 power_cost = 100 - load_type = /obj/item/weapon/magnetic_ammo/pistol + load_type = /obj/item/magnetic_ammo/pistol projectile_type = /obj/item/projectile/bullet/magnetic/flechette/small - loaded = /obj/item/weapon/magnetic_ammo/pistol + loaded = /obj/item/magnetic_ammo/pistol removable_components = TRUE empty_sound = 'sound/weapons/smg_empty_alarm.ogg' @@ -137,7 +137,7 @@ list(mode_name="short bursts", burst=3, fire_delay=null, move_delay=5, one_handed_penalty=30, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)), ) -/obj/item/weapon/gun/magnetic/railgun/heater +/obj/item/gun/magnetic/railgun/heater name = "coil rifle" desc = "A large rifle designed and produced after the Grey Hour." description_fluff = "The Hephaestus MI-51B is a weapon designed by Mars Military Industries - a Hephaestus subsidiary - in the days after the Grey Hour, in preparation for the need for updated equipment by Solar forces.
\ @@ -147,8 +147,8 @@ removable_components = TRUE - cell = /obj/item/weapon/cell/device/weapon - capacitor = /obj/item/weapon/stock_parts/capacitor + cell = /obj/item/cell/device/weapon + capacitor = /obj/item/stock_parts/capacitor fire_delay = 8 @@ -168,7 +168,7 @@ list(mode_name="low power", power_cost = 150, projectile_type = /obj/item/projectile/bullet/magnetic/heated/weak, burst=1, fire_delay=5, move_delay=null, one_handed_penalty=15), ) -/obj/item/weapon/gun/magnetic/railgun/heater/pistol +/obj/item/gun/magnetic/railgun/heater/pistol name = "coil pistol" desc = "A large pistol designed and produced after the Grey Hour." description_fluff = "The MI-60D `Peacemaker` is a weapon designed by Mars Military Industries - a Hephaestus subsidiary - in the days after the Grey Hour, in preparation for the need for updated equipment by Solar forces.
\ @@ -180,8 +180,8 @@ slowdown_held = 0.1 - cell = /obj/item/weapon/cell/device/weapon - capacitor = /obj/item/weapon/stock_parts/capacitor + cell = /obj/item/cell/device/weapon + capacitor = /obj/item/stock_parts/capacitor slot_flags = SLOT_BELT|SLOT_HOLSTER @@ -190,7 +190,7 @@ list(mode_name="stun", power_cost = 350, projectile_type = /obj/item/projectile/energy/electrode/strong, burst=1, fire_delay=7, move_delay=null, one_handed_penalty=0), ) -/obj/item/weapon/gun/magnetic/railgun/heater/pistol/hos +/obj/item/gun/magnetic/railgun/heater/pistol/hos name = "prototype peacemaker" dna_lock = TRUE @@ -202,15 +202,15 @@ list(mode_name="stun", power_cost = 300, projectile_type = /obj/item/projectile/energy/electrode/strong, burst=1, fire_delay=5, move_delay=null, one_handed_penalty=0), ) -/obj/item/weapon/gun/magnetic/railgun/flechette/sif +/obj/item/gun/magnetic/railgun/flechette/sif name = "shredder rifle" desc = "The MI-12B Kaldr is a burst fire capable coilgun that fires modified slugs intended for damaging soft targets." description_fluff = "The Lawson Kaldr is a weapon recently deployed to various outposts on Sif, as well as local hunting guilds for the rapid dispatching of invasive wildlife." icon_state = "railgun_sifguard" item_state = "z8carbine" - cell = /obj/item/weapon/cell/high - capacitor = /obj/item/weapon/stock_parts/capacitor/adv + cell = /obj/item/cell/high + capacitor = /obj/item/stock_parts/capacitor/adv slot_flags = SLOT_BACK diff --git a/code/modules/projectiles/guns/magnetic/magnetic_railgun_vr.dm b/code/modules/projectiles/guns/magnetic/magnetic_railgun_vr.dm index 8cbc4ac7c29..c07016d7efc 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic_railgun_vr.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic_railgun_vr.dm @@ -1,11 +1,11 @@ -/obj/item/weapon/gun/magnetic/railgun/flechette/pistol/khi +/obj/item/gun/magnetic/railgun/flechette/pistol/khi name = "kitsuhana flechette pistol" desc = "This rail pistol appears to have been 'tampered with', improving it's power storage and efficiency." - cell = /obj/item/weapon/cell/hyper - capacitor = /obj/item/weapon/stock_parts/capacitor/hyper + cell = /obj/item/cell/hyper + capacitor = /obj/item/stock_parts/capacitor/hyper projectile_type = /obj/item/projectile/bullet/magnetic/flechette/small/khi - load_type = /obj/item/weapon/magnetic_ammo/pistol/khi - loaded = /obj/item/weapon/magnetic_ammo/pistol/khi \ No newline at end of file + load_type = /obj/item/magnetic_ammo/pistol/khi + loaded = /obj/item/magnetic_ammo/pistol/khi \ No newline at end of file diff --git a/code/modules/projectiles/guns/modular_guns.dm b/code/modules/projectiles/guns/modular_guns.dm index 148b60245fc..bc0f0524c31 100644 --- a/code/modules/projectiles/guns/modular_guns.dm +++ b/code/modules/projectiles/guns/modular_guns.dm @@ -1,10 +1,10 @@ //This will likely drive me insane, but fuck it. Let's give it a shot. -k22 //This was heavily assisted by MoondancerPony -/obj/item/weapon/gun/energy/modular +/obj/item/gun/energy/modular name = "modular weapon" desc = "You shouldn't be seeing this. Contact your local time-police station." icon_state = "mod_pistol" - cell_type = /obj/item/weapon/cell/device/weapon + cell_type = /obj/item/cell/device/weapon charge_cost = 120 var/max_components = 3 //How many components we can hold. @@ -15,42 +15,42 @@ var/max_burst_size = 5 //Don't let our maximum burst size get too high. var/list/guncomponents = list() //Generate our list of components. var/accepted_components = list( - /obj/item/weapon/stock_parts/capacitor/, - /obj/item/weapon/stock_parts/capacitor/adv, - /obj/item/weapon/stock_parts/capacitor/super, - /obj/item/weapon/stock_parts/micro_laser/, - /obj/item/weapon/stock_parts/micro_laser/high, - /obj/item/weapon/stock_parts/micro_laser/ultra, - /obj/item/weapon/stock_parts/manipulator/, - /obj/item/weapon/stock_parts/manipulator/nano, - /obj/item/weapon/stock_parts/manipulator/pico, + /obj/item/stock_parts/capacitor/, + /obj/item/stock_parts/capacitor/adv, + /obj/item/stock_parts/capacitor/super, + /obj/item/stock_parts/micro_laser/, + /obj/item/stock_parts/micro_laser/high, + /obj/item/stock_parts/micro_laser/ultra, + /obj/item/stock_parts/manipulator/, + /obj/item/stock_parts/manipulator/nano, + /obj/item/stock_parts/manipulator/pico, ) //Excessively long because it won't accept subtypes for some reason! -/obj/item/weapon/gun/energy/modular/New() //Initialize our components. +/obj/item/gun/energy/modular/New() //Initialize our components. ..() guncomponents = list() - guncomponents += new /obj/item/weapon/stock_parts/capacitor - guncomponents += new /obj/item/weapon/stock_parts/micro_laser - guncomponents += new /obj/item/weapon/stock_parts/manipulator + guncomponents += new /obj/item/stock_parts/capacitor + guncomponents += new /obj/item/stock_parts/micro_laser + guncomponents += new /obj/item/stock_parts/manipulator CheckParts() FireModeModify() -/obj/item/weapon/gun/energy/modular/CheckParts() //What parts do we have inside us, and how good are they? +/obj/item/gun/energy/modular/CheckParts() //What parts do we have inside us, and how good are they? ..() capacitor_rating = 0 laser_rating = 0 manipulator_rating = 0 - for(var/obj/item/weapon/stock_parts/capacitor/CA in guncomponents) + for(var/obj/item/stock_parts/capacitor/CA in guncomponents) capacitor_rating += CA.rating - for(var/obj/item/weapon/stock_parts/micro_laser/ML in guncomponents) + for(var/obj/item/stock_parts/micro_laser/ML in guncomponents) laser_rating += ML.rating - for(var/obj/item/weapon/stock_parts/manipulator/MA in guncomponents) + for(var/obj/item/stock_parts/manipulator/MA in guncomponents) manipulator_rating += MA.rating FireModeModify() -/obj/item/weapon/gun/energy/modular/attackby(obj/item/O, mob/user) +/obj/item/gun/energy/modular/attackby(obj/item/O, mob/user) if(O.has_tool_quality(TOOL_SCREWDRIVER)) to_chat(user, "You [assembled ? "disassemble" : "assemble"] the gun.") assembled = !assembled @@ -77,7 +77,7 @@ if(guncomponents.len >= max_components) //We have too many componenets and can't fit more. to_chat(user, "You can't add any more components!") return - if(istype(O, /obj/item/weapon/stock_parts/capacitor) && capacitor_rating == 5) + if(istype(O, /obj/item/stock_parts/capacitor) && capacitor_rating == 5) to_chat(user, "You can't add any more capacitors!") return user.drop_item() @@ -87,7 +87,7 @@ CheckParts() -/obj/item/weapon/gun/energy/modular/proc/FireModeModify() //Check our laser, manipulator, and capacitor ratings, adjust stun and lethal firemodes depending on laser / manipulator rating and burst size depending on capacitors. +/obj/item/gun/energy/modular/proc/FireModeModify() //Check our laser, manipulator, and capacitor ratings, adjust stun and lethal firemodes depending on laser / manipulator rating and burst size depending on capacitors. //check our lethal and stun ratings depending on laser and manipulator rating. var/burstmode = capacitor_rating var/beammode @@ -128,12 +128,12 @@ new /datum/firemode(src, list(mode_name="[burstmode] shot lethal", projectile_type=beammode_lethal, charge_cost = chargecost_lethal, burst = burstmode)), ) -/obj/item/weapon/gun/energy/modular/load_ammo(var/obj/item/C, mob/user) +/obj/item/gun/energy/modular/load_ammo(var/obj/item/C, mob/user) if(istype(C, cell_type)) if(self_recharge || battery_lock) to_chat(user, "[src] does not have a battery port.") return - var/obj/item/weapon/cell/P = C + var/obj/item/cell/P = C if(power_supply) to_chat(user, "[src] already has a power cell.") else @@ -148,7 +148,7 @@ update_held_icon() return -/obj/item/weapon/gun/energy/modular/pistol +/obj/item/gun/energy/modular/pistol name = "modular pistol" icon_state = "mod_pistol" max_components = 6 @@ -156,7 +156,7 @@ origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 3) burst_delay = 2 -/obj/item/weapon/gun/energy/modular/carbine +/obj/item/gun/energy/modular/carbine name = "modular carbine" icon_state = "mod_carbine" max_components = 8 @@ -164,12 +164,12 @@ origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 3, TECH_MATERIAL = 3) burst_delay = 2 -/obj/item/weapon/gun/energy/modular/cannon +/obj/item/gun/energy/modular/cannon name = "modular cannon" icon_state = "mod_cannon" max_components = 14 desc = "Say hello, to my little friend!" one_handed_penalty = 4 //dual wielding = no. - cell_type = /obj/item/weapon/cell //We're bigger. We can use much larger power cells. + cell_type = /obj/item/cell //We're bigger. We can use much larger power cells. origin_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 6, TECH_MATERIAL = 5, TECH_BLUESPACE = 4) //its a damn cannon capable of holding a huge amount of parts. burst_delay = 4 //preventing extreme silliness. \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 4627a611aed..fd94b7300f3 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/projectile +/obj/item/gun/projectile name = "gun" desc = "A gun that fires bullets." icon_state = "revolver" @@ -33,7 +33,7 @@ var/random_start_ammo = FALSE //randomize amount of starting ammo -/obj/item/weapon/gun/projectile/New(loc, var/starts_loaded = 1) +/obj/item/gun/projectile/New(loc, var/starts_loaded = 1) ..() if(starts_loaded) if(ispath(ammo_type) && (load_method & (SINGLE_CASING|SPEEDLOADER))) @@ -50,7 +50,7 @@ ammo_magazine.stored_ammo.Cut(0,ammo_cut) update_icon() -/obj/item/weapon/gun/projectile/consume_next_projectile() +/obj/item/gun/projectile/consume_next_projectile() //get the next casing if(loaded.len) chambered = loaded[1] //load next casing. @@ -69,17 +69,17 @@ return chambered.BB return null -/obj/item/weapon/gun/projectile/handle_post_fire() +/obj/item/gun/projectile/handle_post_fire() ..() if(chambered) chambered.expend() process_chambered() -/obj/item/weapon/gun/projectile/handle_click_empty() +/obj/item/gun/projectile/handle_click_empty() ..() process_chambered() -/obj/item/weapon/gun/projectile/proc/process_chambered() +/obj/item/gun/projectile/proc/process_chambered() if (!chambered) return // Aurora forensics port, gunpowder residue. @@ -116,7 +116,7 @@ //Attempts to load A into src, depending on the type of thing being loaded and the load_method //Maybe this should be broken up into separate procs for each load method? -/obj/item/weapon/gun/projectile/proc/load_ammo(var/obj/item/A, mob/user) +/obj/item/gun/projectile/proc/load_ammo(var/obj/item/A, mob/user) if(istype(A, /obj/item/ammo_magazine)) var/obj/item/ammo_magazine/AM = A if(!(load_method & AM.mag_type) || caliber != AM.caliber || allowed_magazines && !is_type_in_list(A, allowed_magazines)) @@ -169,8 +169,8 @@ user.visible_message("[user] inserts \a [C] into [src].", "You insert \a [C] into [src].") playsound(src, 'sound/weapons/empty.ogg', 50, 1) - else if(istype(A, /obj/item/weapon/storage)) - var/obj/item/weapon/storage/storage = A + else if(istype(A, /obj/item/storage)) + var/obj/item/storage/storage = A if(!(load_method & SINGLE_CASING)) return //incompatible @@ -191,7 +191,7 @@ user.hud_used.update_ammo_hud(user, src) //attempts to unload src. If allow_dump is set to 0, the speedloader unloading method will be disabled -/obj/item/weapon/gun/projectile/proc/unload_ammo(mob/user, var/allow_dump=1) +/obj/item/gun/projectile/proc/unload_ammo(mob/user, var/allow_dump=1) if(ammo_magazine) user.put_in_hands(ammo_magazine) user.visible_message("[user] removes [ammo_magazine] from [src].", "You remove [ammo_magazine] from [src].") @@ -223,23 +223,23 @@ update_icon() user.hud_used.update_ammo_hud(user, src) -/obj/item/weapon/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob) +/obj/item/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob) ..() load_ammo(A, user) -/obj/item/weapon/gun/projectile/attack_self(mob/user as mob) +/obj/item/gun/projectile/attack_self(mob/user as mob) if(firemodes.len > 1) switch_firemodes(user) else unload_ammo(user) -/obj/item/weapon/gun/projectile/attack_hand(mob/user as mob) +/obj/item/gun/projectile/attack_hand(mob/user as mob) if(user.get_inactive_hand() == src) unload_ammo(user, allow_dump=0) else return ..() -/obj/item/weapon/gun/projectile/afterattack(atom/A, mob/living/user) +/obj/item/gun/projectile/afterattack(atom/A, mob/living/user) ..() if(auto_eject && ammo_magazine && ammo_magazine.stored_ammo && !ammo_magazine.stored_ammo.len) ammo_magazine.loc = get_turf(src.loc) @@ -254,13 +254,13 @@ update_icon() //make sure to do this after unsetting ammo_magazine user.hud_used.update_ammo_hud(user, src) -/obj/item/weapon/gun/projectile/examine(mob/user) +/obj/item/gun/projectile/examine(mob/user) . = ..() if(ammo_magazine) . += "It has \a [ammo_magazine] loaded." . += "It has [getAmmo()] round\s remaining." -/obj/item/weapon/gun/projectile/proc/getAmmo() +/obj/item/gun/projectile/proc/getAmmo() var/bullets = 0 if(loaded) bullets += loaded.len @@ -272,7 +272,7 @@ /* Unneeded -- so far. //in case the weapon has firemodes and can't unload using attack_hand() -/obj/item/weapon/gun/projectile/verb/unload_gun() +/obj/item/gun/projectile/verb/unload_gun() set name = "Unload Ammo" set category = "Object" set src in usr @@ -283,10 +283,10 @@ */ // TGMC Ammo HUD Insertion -/obj/item/weapon/gun/projectile/has_ammo_counter() +/obj/item/gun/projectile/has_ammo_counter() return TRUE -/obj/item/weapon/gun/projectile/get_ammo_type() +/obj/item/gun/projectile/get_ammo_type() if(load_method & MAGAZINE) if(chambered) // Do we have an ammo casing chambered var/obj/item/ammo_casing/A = chambered @@ -321,7 +321,7 @@ else // Failsafe if we somehow fail all three methods return list("unknown", "unknown") -/obj/item/weapon/gun/projectile/get_ammo_count() +/obj/item/gun/projectile/get_ammo_count() if(ammo_magazine) // Do we have a magazine loaded? var/shots_left if(chambered && chambered.BB) // Do we have a bullet in the currently-chambered casing, if any? diff --git a/code/modules/projectiles/guns/projectile/altevian_vr.dm b/code/modules/projectiles/guns/projectile/altevian_vr.dm index eb6c2cbe6aa..255cbecb235 100644 --- a/code/modules/projectiles/guns/projectile/altevian_vr.dm +++ b/code/modules/projectiles/guns/projectile/altevian_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/projectile/altevian +/obj/item/gun/projectile/altevian name = "Altevian Rivet Repeater" desc = "An offensive ballistic weapon designed by the Altevian Hegemony commonly used for decompression and structural damage tactics. It's also pretty effective at personnel damage." magazine_type = /obj/item/ammo_magazine/sam48 @@ -9,7 +9,7 @@ caliber = ".48" load_method = MAGAZINE -/obj/item/weapon/gun/projectile/altevian/update_icon() +/obj/item/gun/projectile/altevian/update_icon() if(ammo_magazine) icon_state = initial(icon_state) else diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 0dba16dc860..4768c96606e 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -1,7 +1,7 @@ /* * Daka SMG (Code Base) */ -/obj/item/weapon/gun/projectile/automatic //This should never be spawned in, it is just here because of code necessities. +/obj/item/gun/projectile/automatic //This should never be spawned in, it is just here because of code necessities. name = "daka SMG" desc = "A small SMG. You really shouldn't be able to get this gun. Uses 9mm rounds." icon_state = "c05r" //Used because it's not used anywhere else @@ -19,7 +19,7 @@ /* * Advanced SMG */ -/obj/item/weapon/gun/projectile/automatic/advanced_smg +/obj/item/gun/projectile/automatic/advanced_smg name = "advanced SMG" desc = "An advanced submachine gun with a reflective laser optic that makes burst fire less inaccurate than other SMGs. Uses 9mm rounds." icon = 'icons/obj/gun.dmi' @@ -37,20 +37,20 @@ list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6)) ) -/obj/item/weapon/gun/projectile/automatic/advanced_smg/update_icon() +/obj/item/gun/projectile/automatic/advanced_smg/update_icon() ..() if(ammo_magazine) icon_state = "advanced_smg" else icon_state = "advanced_smg-e" -/obj/item/weapon/gun/projectile/automatic/advanced_smg/loaded +/obj/item/gun/projectile/automatic/advanced_smg/loaded magazine_type = /obj/item/ammo_magazine/m9mmAdvanced /* * C-20r */ -/obj/item/weapon/gun/projectile/automatic/c20r +/obj/item/gun/projectile/automatic/c20r name = "submachine gun" desc = "The C-20r is a lightweight and rapid firing SMG, for when you REALLY need someone dead. It has 'Scarborough Arms - Per falcis, per pravitas', inscribed on the stock. Uses 10mm rounds." description_fluff = "The C-20r is produced by Scarborough Arms, a specialist high-end weapons manufacturer based out of Titan, Sol. Scarborough has resisted numerous efforts by Trans-Stellars to acquire the brand since its founding in 2271, and has gained a dedicated following among a certain flavor of private operative." @@ -68,13 +68,13 @@ auto_eject = 1 auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg' -/obj/item/weapon/gun/projectile/automatic/c20r/rubber +/obj/item/gun/projectile/automatic/c20r/rubber magazine_type = /obj/item/ammo_magazine/m10mm/rubber -/obj/item/weapon/gun/projectile/automatic/c20r/empty +/obj/item/gun/projectile/automatic/c20r/empty magazine_type = null -/obj/item/weapon/gun/projectile/automatic/c20r/update_icon() +/obj/item/gun/projectile/automatic/c20r/update_icon() ..() if(ammo_magazine) icon_state = "c20r-[round(ammo_magazine.stored_ammo.len,4)]" @@ -85,7 +85,7 @@ /* * Assault Carbine (STS-35) */ -/obj/item/weapon/gun/projectile/automatic/sts35 +/obj/item/gun/projectile/automatic/sts35 name = "assault rifle" desc = "The rugged Jindal Arms STS-35 is a durable automatic weapon of a make popular on the frontier worlds. Uses 5.45mm rounds." description_fluff = "A subsidiary of Hephaestus Industries, While Jindal’s rugged, affordable weapons intended for the colonial sector are a major export of Tau Ceti, \ @@ -113,7 +113,7 @@ list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=6, burst_accuracy=list(0,-15,-30), dispersion=list(0.0, 0.6, 0.6)) ) -/obj/item/weapon/gun/projectile/automatic/sts35/update_icon(var/ignore_inhands) +/obj/item/gun/projectile/automatic/sts35/update_icon(var/ignore_inhands) ..() if(istype(ammo_magazine,/obj/item/ammo_magazine/m545/small)) icon_state = "arifle-small" // If using the small magazines, use the small magazine sprite. @@ -124,7 +124,7 @@ /* * X-9mm (PDW) */ -/obj/item/weapon/gun/projectile/automatic/pdw +/obj/item/gun/projectile/automatic/pdw name = "personal defense weapon" desc = "The X-9mm is a select-fire personal defense weapon designed in-house by Xing Private Security. It was made to compete with the WT550 Saber, \ but never caught on with NanoTrasen. Uses 9mm rounds." @@ -143,7 +143,7 @@ list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=6, burst_accuracy=list(0,-15,-30), dispersion=list(0.0, 0.6, 0.6)) ) -/obj/item/weapon/gun/projectile/automatic/pdw/update_icon(var/ignore_inhands) +/obj/item/gun/projectile/automatic/pdw/update_icon(var/ignore_inhands) ..() if(ammo_magazine) icon_state = "pdw" @@ -154,7 +154,7 @@ /* * Machine Pistol (WT550) */ -/obj/item/weapon/gun/projectile/automatic/wt550 +/obj/item/gun/projectile/automatic/wt550 name = "machine pistol" desc = "The WT550 Saber is a cheap self-defense weapon mass-produced by Ward-Takahashi for paramilitary and private use. Uses 9mm rounds." icon_state = "wt550" @@ -169,7 +169,7 @@ allowed_magazines = list(/obj/item/ammo_magazine/m9mmt) projectile_type = /obj/item/projectile/bullet/pistol/medium -/obj/item/weapon/gun/projectile/automatic/wt550/update_icon() +/obj/item/gun/projectile/automatic/wt550/update_icon() ..() if(ammo_magazine) icon_state = "wt550-[round(ammo_magazine.stored_ammo.len,4)]" @@ -180,7 +180,7 @@ /* * Battle Rifle (Z8) */ -/obj/item/weapon/gun/projectile/automatic/z8 +/obj/item/gun/projectile/automatic/z8 name = "battle rifle" desc = "The Z8 Bulldog is an older model battle rifle, made by the now defunct Zendai Foundries. Makes you feel like an old-school badass when you hold it, \ even though it can only hold 10 round magazines. Uses 7.62mm rounds and has an under barrel grenade launcher." @@ -212,25 +212,25 @@ ) var/use_launcher = 0 - var/obj/item/weapon/gun/launcher/grenade/underslung/launcher + var/obj/item/gun/launcher/grenade/underslung/launcher -/obj/item/weapon/gun/projectile/automatic/z8/New() +/obj/item/gun/projectile/automatic/z8/New() ..() launcher = new(src) -/obj/item/weapon/gun/projectile/automatic/z8/attackby(obj/item/I, mob/user) - if((istype(I, /obj/item/weapon/grenade))) +/obj/item/gun/projectile/automatic/z8/attackby(obj/item/I, mob/user) + if((istype(I, /obj/item/grenade))) launcher.load(I, user) else ..() -/obj/item/weapon/gun/projectile/automatic/z8/attack_hand(mob/user) +/obj/item/gun/projectile/automatic/z8/attack_hand(mob/user) if(user.get_inactive_hand() == src && use_launcher) launcher.unload(user) else ..() -/obj/item/weapon/gun/projectile/automatic/z8/Fire(atom/target, mob/living/user, params, pointblank=0, reflex=0) +/obj/item/gun/projectile/automatic/z8/Fire(atom/target, mob/living/user, params, pointblank=0, reflex=0) if(use_launcher) launcher.Fire(target, user, params, pointblank, reflex) if(!launcher.chambered) @@ -238,7 +238,7 @@ else ..() -/obj/item/weapon/gun/projectile/automatic/z8/update_icon(var/ignore_inhands) +/obj/item/gun/projectile/automatic/z8/update_icon(var/ignore_inhands) ..() if(ammo_magazine) icon_state = "carbine-[round(ammo_magazine.stored_ammo.len,2)]" @@ -247,20 +247,20 @@ if(!ignore_inhands) update_held_icon() return -/obj/item/weapon/gun/projectile/automatic/z8/examine(mob/user) +/obj/item/gun/projectile/automatic/z8/examine(mob/user) . = ..() if(launcher.chambered) . += "\The [launcher] has \a [launcher.chambered] loaded." else . += "\The [launcher] is empty." -/obj/item/weapon/gun/projectile/automatic/z8/empty +/obj/item/gun/projectile/automatic/z8/empty magazine_type = null /* * LMG (L6 SAW) */ -/obj/item/weapon/gun/projectile/automatic/l6_saw +/obj/item/gun/projectile/automatic/l6_saw name = "light machine gun" desc = "A rather sturdily made L6 SAW with a reassuringly ergonomic pistol grip. 'Hephaestus Industries' is engraved on the receiver. Uses 5.45mm rounds. It's also compatible with magazines from STS-35 assault rifles." description_fluff = "The leading arms producer in the SCG, Hephaestus typically only uses its 'top level' branding for its military-grade equipment used by professional armed forces across human space." @@ -289,31 +289,31 @@ list(mode_name="short bursts", burst=5, move_delay=6, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2)) ) -/obj/item/weapon/gun/projectile/automatic/l6_saw/special_check(mob/user) +/obj/item/gun/projectile/automatic/l6_saw/special_check(mob/user) if(cover_open) to_chat(user, "[src]'s cover is open! Close it before firing!") return 0 return ..() -/obj/item/weapon/gun/projectile/automatic/l6_saw/proc/toggle_cover(mob/user) +/obj/item/gun/projectile/automatic/l6_saw/proc/toggle_cover(mob/user) cover_open = !cover_open to_chat(user, "You [cover_open ? "open" : "close"] [src]'s cover.") update_icon() update_held_icon() -/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user as mob) +/obj/item/gun/projectile/automatic/l6_saw/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/l6_saw/attack_hand(mob/user as mob) +/obj/item/gun/projectile/automatic/l6_saw/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/l6_saw/update_icon() +/obj/item/gun/projectile/automatic/l6_saw/update_icon() if(istype(ammo_magazine,/obj/item/ammo_magazine/m762)) icon_state = "l6[cover_open ? "open" : "closed"]mag" item_state = icon_state @@ -322,13 +322,13 @@ item_state = "l6[cover_open ? "open" : "closed"][ammo_magazine ? "" : "-empty"]" update_held_icon() -/obj/item/weapon/gun/projectile/automatic/l6_saw/load_ammo(var/obj/item/A, mob/user) +/obj/item/gun/projectile/automatic/l6_saw/load_ammo(var/obj/item/A, mob/user) if(!cover_open) to_chat(user, "You need to open the cover to load [src].") return ..() -/obj/item/weapon/gun/projectile/automatic/l6_saw/unload_ammo(mob/user, var/allow_dump=1) +/obj/item/gun/projectile/automatic/l6_saw/unload_ammo(mob/user, var/allow_dump=1) if(!cover_open) to_chat(user, "You need to open the cover to unload [src].") return @@ -337,7 +337,7 @@ /* * Automatic Shotgun (AS-24) */ -/obj/item/weapon/gun/projectile/automatic/as24 +/obj/item/gun/projectile/automatic/as24 name = "automatic shotgun" desc = "The AS-24 is a rugged looking automatic shotgun produced exclusively for the SCG Fleet by Hephaestus \ Industries. For very obvious reasons, it's illegal to own in many juristictions. Uses 12g rounds." @@ -363,7 +363,7 @@ list(mode_name="3-round bursts", burst=3, move_delay=6, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.0, 0.6, 0.6)) ) -/obj/item/weapon/gun/projectile/automatic/as24/update_icon() +/obj/item/gun/projectile/automatic/as24/update_icon() ..() if(ammo_magazine) icon_state = "ashot" @@ -374,7 +374,7 @@ /* * Uzi */ -/obj/item/weapon/gun/projectile/automatic/mini_uzi +/obj/item/gun/projectile/automatic/mini_uzi name = "micro-smg" desc = "The infamous ProTek Spitz is a lightweight, compact, fast firing machine pistol. Cheaply produced under the ProTek consumer brand, the Spitz seems to find its way into every corner of the galaxy. Uses .45 rounds." description_fluff = "Budget-grade weapons for the budget-grade consumer! Hephaestus’ low-end brand of cheaply made, low-maintenance personal defense weapons for those who just need a handgun with absolutely no frills. \ @@ -393,7 +393,7 @@ list(mode_name="3-round bursts", burst=3, burst_delay=1, fire_delay=4, move_delay=4, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0)) ) -/obj/item/weapon/gun/projectile/automatic/mini_uzi/update_icon() +/obj/item/gun/projectile/automatic/mini_uzi/update_icon() ..() if(ammo_magazine) icon_state = "uzi" @@ -403,7 +403,7 @@ /* * P90 (H90K) */ -/obj/item/weapon/gun/projectile/automatic/p90 +/obj/item/gun/projectile/automatic/p90 name = "personal defense weapon" desc = "The H90K is a compact, large capacity submachine gun produced by MarsTech. Despite its fierce reputation, it still manages to feel like a toy. Uses 9mm rounds." description_fluff = "The leading civilian-sector high-quality small arms brand of Hephaestus Industries, MarsTech has been the provider of choice for law enforcement and security forces for over 300 years." @@ -422,13 +422,13 @@ list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)) ) -/obj/item/weapon/gun/projectile/automatic/p90/update_icon() +/obj/item/gun/projectile/automatic/p90/update_icon() icon_state = "p90smg-[ammo_magazine ? round(ammo_magazine.stored_ammo.len, 6) : "empty"]" /* * Tommy Gun */ -/obj/item/weapon/gun/projectile/automatic/tommygun +/obj/item/gun/projectile/automatic/tommygun name = "\improper Tommy Gun" desc = "This weapon was made famous by gangsters in the 20th century. Cybersun Industries is currently reproducing these for a target market of historic gun collectors and classy criminals. Uses .45 rounds." description_fluff = "Cybersun Industries is a minor arms manufacturer specialising in replica firearms from eras past. Though they offer a wide selection of made-to-order models, their products are seen as little more than novelty items to most serious collectors." @@ -447,7 +447,7 @@ list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)) ) -/obj/item/weapon/gun/projectile/automatic/tommygun/update_icon() +/obj/item/gun/projectile/automatic/tommygun/update_icon() if(istype(ammo_magazine,/obj/item/ammo_magazine/m45tommy)) icon_state = "tommygun-mag" else if(istype(ammo_magazine,/obj/item/ammo_magazine/m45tommydrum)) @@ -459,7 +459,7 @@ /* * Bullpup Rifle */ -/obj/item/weapon/gun/projectile/automatic/bullpup // Admin abuse assault rifle. ToDo: Make this less shit. Maybe remove its autofire, and make it spawn with only 10 rounds at start. +/obj/item/gun/projectile/automatic/bullpup // Admin abuse assault rifle. ToDo: Make this less shit. Maybe remove its autofire, and make it spawn with only 10 rounds at start. name = "bullpup rifle" desc = "The bullpup configured GP3000 is a battle rifle produced by Gurov Projectile Weapons LLC. It is sold almost exclusively to standing armies. Uses 7.62mm rounds." icon_state = "bullpup-small" @@ -482,7 +482,7 @@ list(mode_name="2-round bursts", burst=2, fire_delay=null, move_delay=6, burst_accuracy=list(0,-15), dispersion=list(0.0, 0.6)) ) -/obj/item/weapon/gun/projectile/automatic/bullpup/update_icon(var/ignore_inhands) +/obj/item/gun/projectile/automatic/bullpup/update_icon(var/ignore_inhands) ..() if(istype(ammo_magazine,/obj/item/ammo_magazine/m762)) icon_state = "bullpup-small" @@ -496,7 +496,7 @@ /* * Combat SMG (PP3 Ten) */ -/obj/item/weapon/gun/projectile/automatic/combatsmg +/obj/item/gun/projectile/automatic/combatsmg name = "\improper PP3 Ten" desc = "The Bishamonten PP3 Ten personal defense weapon is a rare design much sought after - though more for its looks than its functionality. Uses 9mm rounds." description_fluff = "The Bishamonten Company operated from roughly 2150-2280 - the height of the first extrasolar colonisation boom - before filing for bankruptcy and selling off its assets to various companies that would go on to become today’s TSCs. \ @@ -515,7 +515,7 @@ list(mode_name="3-round bursts", burst=3, burst_delay=1, fire_delay=4, move_delay=4, burst_accuracy=list(0,-15,-30), dispersion=list(0.0, 0.6, 0.6)) ) -/obj/item/weapon/gun/projectile/automatic/combatsmg/update_icon() +/obj/item/gun/projectile/automatic/combatsmg/update_icon() ..() if(ammo_magazine) icon_state = "combatsmg" diff --git a/code/modules/projectiles/guns/projectile/automatic_vr.dm b/code/modules/projectiles/guns/projectile/automatic_vr.dm index ad0f46af6e7..6f0f79e807e 100644 --- a/code/modules/projectiles/guns/projectile/automatic_vr.dm +++ b/code/modules/projectiles/guns/projectile/automatic_vr.dm @@ -1,14 +1,14 @@ -/obj/item/weapon/gun/projectile/automatic/wt550/lethal +/obj/item/gun/projectile/automatic/wt550/lethal magazine_type = /obj/item/ammo_magazine/m9mmt -/obj/item/weapon/gun/projectile/automatic/tommygun +/obj/item/gun/projectile/automatic/tommygun icon = 'icons/obj/gun_vr.dmi' //////////////////////////////////////////////////////////// //////////////////// Projectile Weapons //////////////////// //////////////////////////////////////////////////////////// // For general use -/obj/item/weapon/gun/projectile/automatic/battlerifle +/obj/item/gun/projectile/automatic/battlerifle name = "\improper USDF service rifle" desc = "You had your chance to be afraid before you joined my beloved Corps! But, to guide you back to the true path, I have brought this motivational device! Uses 9.5x40mm rounds." icon = 'icons/obj/gun_vr.dmi' @@ -29,7 +29,7 @@ one_handed_penalty = 60 // The weapon itself is heavy // For general use -/obj/item/weapon/gun/projectile/automatic/stg +/obj/item/gun/projectile/automatic/stg name = "\improper Sturmgewehr" desc = "An STG-560 built by RauMauser. Experience the terror of the Siegfried line, redone for the 24th century! The Kaiser would be proud. Uses unique 7.92x33mm Kurz rounds." icon = 'icons/obj/gun_vr.dmi' @@ -43,7 +43,7 @@ allowed_magazines = list(/obj/item/ammo_magazine/mtg) load_method = MAGAZINE -/obj/item/weapon/gun/projectile/automatic/stg/update_icon(var/ignore_inhands) +/obj/item/gun/projectile/automatic/stg/update_icon(var/ignore_inhands) ..() icon_state = (ammo_magazine)? "stg60" : "stg60-empty" item_state = (ammo_magazine)? "arifle" : "arifle-empty" @@ -51,7 +51,7 @@ //////////////////// Eris Ported Guns //////////////////// // No idea what this is for. -/obj/item/weapon/gun/projectile/automatic/sol +/obj/item/gun/projectile/automatic/sol name = "\improper \"Sol\" SMG" desc = "The FS 9x19mm \"Sol\" is a compact and reliable submachine gun. Uses 9mm rounds." icon = 'icons/obj/gun_vr.dmi' @@ -71,7 +71,7 @@ list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)), ) -/obj/item/weapon/gun/projectile/automatic/sol/proc/update_charge() +/obj/item/gun/projectile/automatic/sol/proc/update_charge() if(!ammo_magazine) return var/ratio = ammo_magazine.stored_ammo.len / ammo_magazine.max_ammo @@ -80,7 +80,7 @@ ratio = round(ratio, 0.25) * 100 add_overlay("smg_[ratio]") -/obj/item/weapon/gun/projectile/automatic/sol/update_icon() +/obj/item/gun/projectile/automatic/sol/update_icon() icon_state = (ammo_magazine)? "SMG-IS" : "SMG-IS-empty" cut_overlays() update_charge() diff --git a/code/modules/projectiles/guns/projectile/boltaction.dm b/code/modules/projectiles/guns/projectile/boltaction.dm index 0065ab0844f..5a1ae152e1e 100644 --- a/code/modules/projectiles/guns/projectile/boltaction.dm +++ b/code/modules/projectiles/guns/projectile/boltaction.dm @@ -1,7 +1,7 @@ /* * Bolt-Action Rifle */ -/obj/item/weapon/gun/projectile/shotgun/pump/rifle +/obj/item/gun/projectile/shotgun/pump/rifle name = "bolt-action rifle" desc = "The Weissen Company Type-19 is a modern interpretation of an almost ancient weapon design. \ The model is popular among hunters and collectors due to its reliability. Uses 7.62mm rounds." @@ -27,7 +27,7 @@ /* * Practice Rifle */ -/obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice // For target practice +/obj/item/gun/projectile/shotgun/pump/rifle/practice // For target practice name = "practice bolt-action rifle" icon_state = "boltaction_practice" desc = "A bolt-action rifle with a lightweight synthetic wood stock, designed for competitive shooting. \ @@ -39,7 +39,7 @@ /* * Moist Nugget */ -/obj/item/weapon/gun/projectile/shotgun/pump/rifle/moistnugget +/obj/item/gun/projectile/shotgun/pump/rifle/moistnugget name = "mosin-nagant" icon_state = "moistnugget" item_state = "rifle" @@ -55,7 +55,7 @@ /* * Ceremonial Rifle */ -/obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial +/obj/item/gun/projectile/shotgun/pump/rifle/ceremonial name = "ceremonial bolt-action rifle" desc = "A bolt-action rifle with a heavy, high-quality wood stock that has a beautiful finish. \ Clearly not intended to be used in combat. Uses 7.62mm rounds." @@ -67,11 +67,11 @@ var/sawn_off = FALSE -/obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial/attackby(var/obj/item/A as obj, mob/user as mob) +/obj/item/gun/projectile/shotgun/pump/rifle/ceremonial/attackby(var/obj/item/A as obj, mob/user as mob) if(sawn_off) to_chat(user, "The [src] is already shortened!") return - if(istype(A, /obj/item/weapon/surgical/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter) && w_class != ITEMSIZE_NORMAL) + if(istype(A, /obj/item/surgical/circular_saw) || istype(A, /obj/item/melee/energy) || istype(A, /obj/item/pickaxe/plasmacutter) && w_class != ITEMSIZE_NORMAL) to_chat(user, "You begin to shorten the barrel and stock of \the [src].") if(loaded.len) afterattack(user, user) @@ -99,7 +99,7 @@ /* * Surplus Rifle */ -/obj/item/weapon/gun/projectile/shotgun/pump/surplus +/obj/item/gun/projectile/shotgun/pump/surplus name = "surplus rifle" desc = "An ancient weapon from an era long past, crude in design, but still just as effective \ as any modern interpretation. Uses 7.62mm rounds." @@ -118,7 +118,7 @@ /* * Scoped Rifle */ -/obj/item/weapon/gun/projectile/shotgun/pump/rifle/scoped +/obj/item/gun/projectile/shotgun/pump/rifle/scoped name = "scoped bolt-action rifle" desc = "The Weissen Company Type-19 is a modern interpretation of an almost ancient weapon design. \ The model is popular among hunters and collectors due to its reliability. Uses 7.62mm rounds." @@ -141,10 +141,10 @@ action_sound = 'sound/weapons/riflebolt.ogg' pump_animation = "scoped-boltaction-cycling" -/obj/item/weapon/gun/projectile/shotgun/pump/rifle/ui_action_click() +/obj/item/gun/projectile/shotgun/pump/rifle/ui_action_click() scope() -/obj/item/weapon/gun/projectile/shotgun/pump/rifle/verb/scope() +/obj/item/gun/projectile/shotgun/pump/rifle/verb/scope() set category = "Object" set name = "Use Scope" set popup_menu = 1 \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile/caseless.dm b/code/modules/projectiles/guns/projectile/caseless.dm index dc919f3a878..239eaa14951 100644 --- a/code/modules/projectiles/guns/projectile/caseless.dm +++ b/code/modules/projectiles/guns/projectile/caseless.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/projectile/caseless/prototype +/obj/item/gun/projectile/caseless/prototype name = "prototype caseless rifle" desc = "The GC1 is a rifle cooked up in Gilthari Exports's R&D labs that operates with barely comprehensible clockwork internals. Uses solid phoron 5mm caseless rounds." description_fluff = "Gilthari is Sol’s premier supplier of luxury goods, specializing in extracting money from the rich and successful. \ @@ -13,11 +13,11 @@ magazine_type = null // R&D builds this. Starts unloaded. allowed_magazines = list(/obj/item/ammo_magazine/m5mmcaseless) -/obj/item/weapon/gun/projectile/caseless/prototype/update_icon() +/obj/item/gun/projectile/caseless/prototype/update_icon() if(ammo_magazine) icon_state = initial(icon_state) else icon_state = "[initial(icon_state)]-empty" -/obj/item/weapon/gun/projectile/caseless/prototype/loaded +/obj/item/gun/projectile/caseless/prototype/loaded magazine_type = /obj/item/ammo_magazine/m5mmcaseless \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile/contender.dm b/code/modules/projectiles/guns/projectile/contender.dm index 3e064da7a0f..77393fd077c 100644 --- a/code/modules/projectiles/guns/projectile/contender.dm +++ b/code/modules/projectiles/guns/projectile/contender.dm @@ -1,7 +1,7 @@ /* * Gram */ -/obj/item/weapon/gun/projectile/contender +/obj/item/gun/projectile/contender name = "\improper \"Gram\" Contender" desc = "Hedberg-Hammarstrom's flagship one-shot hand-cannon. For when you \ really want to make a hole. This one has been modified to work almost like \ @@ -22,7 +22,7 @@ var/retracted_bolt = 0 load_method = SINGLE_CASING -/obj/item/weapon/gun/projectile/contender/attack_self(mob/user as mob) +/obj/item/gun/projectile/contender/attack_self(mob/user as mob) if(chambered) chambered.loc = get_turf(src) chambered = null @@ -41,7 +41,7 @@ icon_state = initial(icon_state) retracted_bolt = 0 -/obj/item/weapon/gun/projectile/contender/load_ammo(var/obj/item/A, mob/user) +/obj/item/gun/projectile/contender/load_ammo(var/obj/item/A, mob/user) if(!retracted_bolt) to_chat(user, "You can't load [src] without cycling the bolt.") return @@ -50,7 +50,7 @@ /* * Balmung */ -/obj/item/weapon/gun/projectile/contender/tacticool +/obj/item/gun/projectile/contender/tacticool name = "\improper \"Balmung\" Contender" desc = "A later model of the Hedberg-Hammarstrom \"Gram\", reinvented with a \ tactical look. For when you really want to make a hole. This one has been \ diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm index 6fde481f1fb..4d16f889bcc 100644 --- a/code/modules/projectiles/guns/projectile/dartgun.dm +++ b/code/modules/projectiles/guns/projectile/dartgun.dm @@ -40,7 +40,7 @@ max_ammo = 5 multiple_sprites = 1 -/obj/item/weapon/gun/projectile/dartgun +/obj/item/gun/projectile/dartgun name = "dart gun" desc = "Zeng-Hu Pharmaceutical's entry into the arms market, the Z-H P Artemis is a gas-powered dart gun capable of delivering chemical cocktails swiftly across short distances." description_info = "The dart gun is capable of storing three beakers. In order to use the dart gun, you must first use it in-hand to open its mixing UI. The dart-gun will only draw from beakers with mixing enabled. If multiple are enabled, the gun will draw from them in equal amounts." @@ -66,10 +66,10 @@ var/list/mixing = list() //Containers being used for mixing. var/max_beakers = 3 var/dart_reagent_amount = 15 - var/container_type = /obj/item/weapon/reagent_containers/glass/beaker + var/container_type = /obj/item/reagent_containers/glass/beaker var/list/starting_chems = null -/obj/item/weapon/gun/projectile/dartgun/New() +/obj/item/gun/projectile/dartgun/New() ..() if(starting_chems) for(var/chem in starting_chems) @@ -78,7 +78,7 @@ beakers += B update_icon() -/obj/item/weapon/gun/projectile/dartgun/update_icon() +/obj/item/gun/projectile/dartgun/update_icon() if(!ammo_magazine) icon_state = "[base_state]-empty" return 1 @@ -93,30 +93,30 @@ else icon_state = "[base_state]" -/obj/item/weapon/gun/projectile/dartgun/consume_next_projectile() +/obj/item/gun/projectile/dartgun/consume_next_projectile() . = ..() var/obj/item/projectile/bullet/chemdart/dart = . if(istype(dart)) fill_dart(dart) -/obj/item/weapon/gun/projectile/dartgun/examine(mob/user) +/obj/item/gun/projectile/dartgun/examine(mob/user) . = ..() if(beakers.len) . += "[src] contains:" - for(var/obj/item/weapon/reagent_containers/glass/beaker/B in beakers) + for(var/obj/item/reagent_containers/glass/beaker/B in beakers) if(B.reagents && B.reagents.reagent_list.len) for(var/datum/reagent/R in B.reagents.reagent_list) . += "[R.volume] units of [R.name]" -/obj/item/weapon/gun/projectile/dartgun/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I, /obj/item/weapon/reagent_containers/glass)) +/obj/item/gun/projectile/dartgun/attackby(obj/item/I as obj, mob/user as mob) + if(istype(I, /obj/item/reagent_containers/glass)) if(!istype(I, container_type)) to_chat(user, span_blue("[I] doesn't seem to fit into [src].")) return if(beakers.len >= max_beakers) to_chat(user, span_blue("[src] already has [max_beakers] beakers in it - another one isn't going to fit!")) return - var/obj/item/weapon/reagent_containers/glass/beaker/B = I + var/obj/item/reagent_containers/glass/beaker/B = I user.drop_item() B.loc = src beakers += B @@ -126,19 +126,19 @@ ..() //fills the given dart with reagents -/obj/item/weapon/gun/projectile/dartgun/proc/fill_dart(var/obj/item/projectile/bullet/chemdart/dart) +/obj/item/gun/projectile/dartgun/proc/fill_dart(var/obj/item/projectile/bullet/chemdart/dart) if(mixing.len) var/mix_amount = dart.reagent_amount/mixing.len - for(var/obj/item/weapon/reagent_containers/glass/beaker/B in mixing) + for(var/obj/item/reagent_containers/glass/beaker/B in mixing) B.reagents.trans_to_obj(dart, mix_amount) -/obj/item/weapon/gun/projectile/dartgun/attack_self(mob/user) +/obj/item/gun/projectile/dartgun/attack_self(mob/user) user.set_machine(src) var/dat = "[src] mixing control:

" if (beakers.len) var/i = 1 - for(var/obj/item/weapon/reagent_containers/glass/beaker/B in beakers) + for(var/obj/item/reagent_containers/glass/beaker/B in beakers) dat += "Beaker [i] contains: " if(B.reagents && B.reagents.reagent_list.len) for(var/datum/reagent/R in B.reagents.reagent_list) @@ -164,7 +164,7 @@ user << browse(dat, "window=dartgun") onclose(user, "dartgun", src) -/obj/item/weapon/gun/projectile/dartgun/proc/check_beaker_mixing(var/obj/item/B) +/obj/item/gun/projectile/dartgun/proc/check_beaker_mixing(var/obj/item/B) if(!mixing || !beakers) return 0 for(var/obj/item/M in mixing) @@ -172,7 +172,7 @@ return 1 return 0 -/obj/item/weapon/gun/projectile/dartgun/Topic(href, href_list) +/obj/item/gun/projectile/dartgun/Topic(href, href_list) if(..()) return 1 src.add_fingerprint(usr) if(href_list["stop_mix"]) @@ -190,7 +190,7 @@ var/index = text2num(href_list["eject"]) if(index <= beakers.len) if(beakers[index]) - var/obj/item/weapon/reagent_containers/glass/beaker/B = beakers[index] + var/obj/item/reagent_containers/glass/beaker/B = beakers[index] to_chat(usr, "You remove [B] from [src].") mixing -= B beakers -= B @@ -202,7 +202,7 @@ ///Variants of the Dartgun and Chemdarts./// -/obj/item/weapon/gun/projectile/dartgun/research +/obj/item/gun/projectile/dartgun/research name = "prototype dart gun" desc = "Zeng-Hu Pharmaceutical's entry into the arms market, the Z-H P Artemis is a gas-powered dart gun capable of delivering chemical cocktails swiftly across short distances. This one seems to be an early model with an NT stamp." description_info = "The dart gun is capable of storing two beakers. In order to use the dart gun, you must first use it in-hand to open its mixing UI. The dart-gun will only draw from beakers with mixing enabled. If multiple are enabled, the gun will draw from them in equal amounts." diff --git a/code/modules/projectiles/guns/projectile/dartgun_vr.dm b/code/modules/projectiles/guns/projectile/dartgun_vr.dm index a802c173275..c305d73dad7 100644 --- a/code/modules/projectiles/guns/projectile/dartgun_vr.dm +++ b/code/modules/projectiles/guns/projectile/dartgun_vr.dm @@ -1,5 +1,5 @@ //-----------------------Tranq Gun---------------------------------- -/obj/item/weapon/gun/projectile/dartgun/tranq +/obj/item/gun/projectile/dartgun/tranq name = "tranquilizer gun" desc = "A gas-powered dart gun designed by the National Armory of Gaia. This gun is used primarily by United Federation special forces for Tactical Espionage missions. Don't forget your bandana." icon_state = "tranqgun" @@ -15,7 +15,7 @@ allowed_magazines = list(/obj/item/ammo_magazine/chemdart) auto_eject = 0 -/obj/item/weapon/gun/projectile/dartgun/tranq/update_icon() +/obj/item/gun/projectile/dartgun/tranq/update_icon() if(!ammo_magazine) icon_state = "tranqgun" return 1 @@ -32,5 +32,5 @@ /obj/item/projectile/bullet/chemdart/on_hit(var/atom/target, var/blocked = 0, var/def_zone = null) ..() if(blocked < 2) - if(istype(target, /obj/item/weapon/reagent_containers/food) || istype(target, /obj/item/slime_extract)) + if(istype(target, /obj/item/reagent_containers/food) || istype(target, /obj/item/slime_extract)) reagents.trans_to_obj(target, reagent_amount) \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile/leveraction.dm b/code/modules/projectiles/guns/projectile/leveraction.dm index 0379ace324f..ad6294df2d2 100644 --- a/code/modules/projectiles/guns/projectile/leveraction.dm +++ b/code/modules/projectiles/guns/projectile/leveraction.dm @@ -1,14 +1,14 @@ /* * Lever-Action Rifle */ -/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever +/obj/item/gun/projectile/shotgun/pump/rifle/lever name = "lever-action rifle" desc = "The Weissen Company's version of an iconic manually operated lever action rifle, \ the Bushhog, offering adequate stopping power due to it's still powerful cartridge while at \ the same time having a rather respectable firing rate due to it's mechanism. It is very probable \ this is a replica instead of a museum piece, but rifles of this pattern still see usage as \ colonist guns in some far off regions. Uses 7.62mm rounds." - description_fluff = "The frontier’s largest home-grown firearms manufacturer, the Weissen \ + description_fluff = "The frontier�s largest home-grown firearms manufacturer, the Weissen \ Company offers a range of high-quality, high-cost hunting rifles and shotguns designed with \ the wild frontier wilderness - and its wildlife - in mind. The company operates just one \ production plant in the Mytis system, but their weapons have found popularity on garden \ @@ -24,14 +24,14 @@ /* * Vintage Lever-Action */ -/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever/vintage +/obj/item/gun/projectile/shotgun/pump/rifle/lever/vintage name = "vintage lever-action rifle" desc = "The Weissen Company's version of an iconic manually operated lever action rifle, \ the Bushhog, offering adequate stopping power due to it's still powerful cartridge while at \ the same time having a rather respectable firing rate due to it's mechanism. It is very probable \ this is a replica instead of a museum piece, but rifles of this pattern still see usage as \ colonist guns in some far off regions. Uses 7.62mm rounds." - description_fluff = "The frontier’s largest home-grown firearms manufacturer, the Weissen \ + description_fluff = "The frontier�s largest home-grown firearms manufacturer, the Weissen \ Company offers a range of high-quality, high-cost hunting rifles and shotguns designed with \ the wild frontier wilderness - and its wildlife - in mind. The company operates just one \ production plant in the Mytis system, but their weapons have found popularity on garden \ @@ -43,11 +43,11 @@ /* * Cowboy Repeater */ -/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever/repeater +/obj/item/gun/projectile/shotgun/pump/rifle/lever/repeater name = "repeater" desc = "The Weissen Company's answer to varmint shooting on frontier ranches, the T-7 Boone \ gives ranchers and farmers alike a perfect rider rifle for protecting the fenceline. Uses .357 rounds." - description_fluff = "The frontier’s largest home-grown firearms manufacturer, \ + description_fluff = "The frontier�s largest home-grown firearms manufacturer, \ the Weissen Arms Company are the leading manufacturer of - not only quality - \ but affordable rifles for the average frontiersman looking to protect his \ claim. The company operates just one production plant in the Mytis system, \ @@ -63,11 +63,11 @@ /* * Brushgun */ -/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever/brushgun +/obj/item/gun/projectile/shotgun/pump/rifle/lever/brushgun name = "brushgun" desc = "Weissen Company's newest budget caravan rifle for those that want a light yet effective rifle, \ the T-10 Cassidy Uses .44 rounds." - description_fluff = "The frontier’s largest home-grown firearms manufacturer, \ + description_fluff = "The frontier�s largest home-grown firearms manufacturer, \ the Weissen Arms Company are the leading manufacturer of - not only quality - \ but affordable rifles for the average frontiersman looking to protect his \ claim. The company operates just one production plant in the Mytis system, \ @@ -83,11 +83,11 @@ /* * Trailgun */ -/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever/trailgun +/obj/item/gun/projectile/shotgun/pump/rifle/lever/trailgun name = "brushgun" desc = "Weissen Company's newest budget caravan rifle for those that want a light yet effective rifle, \ the T-10 Cassidy Uses .44 rounds." - description_fluff = "The frontier’s largest home-grown firearms manufacturer, \ + description_fluff = "The frontier�s largest home-grown firearms manufacturer, \ the Weissen Arms Company are the leading manufacturer of - not only quality - \ but affordable rifles for the average frontiersman looking to protect his \ claim. The company operates just one production plant in the Mytis system, \ @@ -98,4 +98,4 @@ icon_state = "trailgun" max_shells = 8 caliber = ".44" - pump_animation = "trailgun-cycling" \ No newline at end of file + pump_animation = "trailgun-cycling" diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index a0853600fa5..891d78263c3 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -1,7 +1,7 @@ /* * M1911 */ -/obj/item/weapon/gun/projectile/colt +/obj/item/gun/projectile/colt var/unique_reskin name = ".45 pistol" desc = "A typical modern handgun produced for law enforcement. Uses .45 rounds." @@ -13,7 +13,7 @@ origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) load_method = MAGAZINE -/obj/item/weapon/gun/projectile/colt/update_icon() +/obj/item/gun/projectile/colt/update_icon() if(ammo_magazine) if(unique_reskin) icon_state = unique_reskin @@ -28,11 +28,11 @@ /* * Detective M1911 */ -/obj/item/weapon/gun/projectile/colt/detective +/obj/item/gun/projectile/colt/detective desc = "A standard law enforcement issue pistol. Uses .45 rounds." magazine_type = /obj/item/ammo_magazine/m45/rubber -/obj/item/weapon/gun/projectile/colt/detective/verb/rename_gun() +/obj/item/gun/projectile/colt/detective/verb/rename_gun() set name = "Name Gun" set category = "Object" set desc = "Rename your gun. If you're Security." @@ -51,7 +51,7 @@ to_chat(M, "You name the gun [input]. Say hello to your new friend.") return 1 -/obj/item/weapon/gun/projectile/colt/detective/verb/reskin_gun() +/obj/item/gun/projectile/colt/detective/verb/reskin_gun() set name = "Resprite gun" set category = "Object" set desc = "Click to choose a sprite for your gun." @@ -75,7 +75,7 @@ /* * Security Sidearm */ -/obj/item/weapon/gun/projectile/sec +/obj/item/gun/projectile/sec name = ".45 pistol" desc = "The MT Mk58 is a cheap, ubiquitous sidearm, produced by MarsTech. Found pretty much everywhere humans are. Uses .45 rounds." description_fluff = "The leading civilian-sector high-quality small arms brand of Hephaestus Industries, \ @@ -88,22 +88,22 @@ origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) load_method = MAGAZINE -/obj/item/weapon/gun/projectile/sec/update_icon() +/obj/item/gun/projectile/sec/update_icon() ..() if(ammo_magazine) icon_state = "secgun" else icon_state = "secgun-e" -/obj/item/weapon/gun/projectile/sec/flash +/obj/item/gun/projectile/sec/flash magazine_type = /obj/item/ammo_magazine/m45/flash -/obj/item/weapon/gun/projectile/sec/wood +/obj/item/gun/projectile/sec/wood name = "custom .45 pistol" desc = "The MT Mk58 is a cheap, ubiquitous sidearm, produced by MarsTech. This one has a sweet wooden grip. Uses .45 rounds." icon_state = "secgunb" -/obj/item/weapon/gun/projectile/sec/wood/update_icon() +/obj/item/gun/projectile/sec/wood/update_icon() ..() if(ammo_magazine) icon_state = "secgunb" @@ -113,7 +113,7 @@ /* * Silenced Pistol */ -/obj/item/weapon/gun/projectile/silenced +/obj/item/gun/projectile/silenced name = "silenced pistol" desc = "A small, quiet, easily concealable gun with a built-in silencer. Uses .45 rounds." icon_state = "silenced_pistol" @@ -128,10 +128,10 @@ allowed_magazines = list(/obj/item/ammo_magazine/m45) projectile_type = /obj/item/projectile/bullet/pistol/medium -/obj/item/weapon/gun/projectile/silenced/empty +/obj/item/gun/projectile/silenced/empty magazine_type = null -/obj/item/weapon/gun/projectile/silenced/update_icon() +/obj/item/gun/projectile/silenced/update_icon() ..() if(ammo_magazine) icon_state = "silenced_pistol" @@ -141,7 +141,7 @@ /* * Deagle */ -/obj/item/weapon/gun/projectile/deagle +/obj/item/gun/projectile/deagle name = "hand cannon" desc = "The PCA-55 Rarkajar perfect handgun for shooters with a need to hit targets through a wall and behind a fridge in your neighbor's house. Uses .44 rounds." description_fluff = "Pearlshield Consolidated Armories are far from the most cutting edge firearm manufacturer, but the Tajaran’s long tradition of war is rivaled only by humanity, \ @@ -156,19 +156,19 @@ magazine_type = /obj/item/ammo_magazine/m44 allowed_magazines = list(/obj/item/ammo_magazine/m44) -/obj/item/weapon/gun/projectile/deagle/update_icon() +/obj/item/gun/projectile/deagle/update_icon() ..() if(ammo_magazine) icon_state = "[initial(icon_state)]" else icon_state = "[initial(icon_state)]-e" -/obj/item/weapon/gun/projectile/deagle/gold +/obj/item/gun/projectile/deagle/gold desc = "A gold plated gun folded over a million times by superior Tajaran gunsmiths. Uses .44 rounds." icon_state = "deagleg" item_state = "deagleg" -/obj/item/weapon/gun/projectile/deagle/camo +/obj/item/gun/projectile/deagle/camo desc = "An off-brand non-Deagle for operators not operating operationally. Uses .44 rounds." icon_state = "deaglecamo" item_state = "deagleg" @@ -176,7 +176,7 @@ /* * Gyro Pistol (Admin Abuse in gun form) */ -/obj/item/weapon/gun/projectile/gyropistol +/obj/item/gun/projectile/gyropistol name = "gyrojet pistol" desc = "Speak softly, and carry a big gun. Fires rare .75 caliber self-propelled exploding bolts--because fuck you and everything around you." icon_state = "gyropistol" @@ -191,7 +191,7 @@ auto_eject = 1 auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg' -/obj/item/weapon/gun/projectile/gyropistol/update_icon() +/obj/item/gun/projectile/gyropistol/update_icon() ..() if(ammo_magazine) icon_state = "gyropistolloaded" @@ -201,7 +201,7 @@ /* * Silencer */ -/obj/item/weapon/silencer +/obj/item/silencer name = "silencer" desc = "a silencer" icon = 'icons/obj/gun.dmi' @@ -211,7 +211,7 @@ /* * Compact Pistol */ -/obj/item/weapon/gun/projectile/pistol +/obj/item/gun/projectile/pistol name = "compact pistol" desc = "The Lumoco Arms P3 \"Whisper\". A compact, easily concealable gun, though it's only compatible with compact magazines. Uses 9mm rounds." icon_state = "pistol" @@ -225,10 +225,10 @@ allowed_magazines = list(/obj/item/ammo_magazine/m9mm/compact) projectile_type = /obj/item/projectile/bullet/pistol -/obj/item/weapon/gun/projectile/pistol/flash +/obj/item/gun/projectile/pistol/flash magazine_type = /obj/item/ammo_magazine/m9mm/compact/flash -/obj/item/weapon/gun/projectile/pistol/attack_hand(mob/living/user as mob) +/obj/item/gun/projectile/pistol/attack_hand(mob/living/user as mob) if(user.get_inactive_hand() == src) if(silenced) if(!user.item_is_in_hands(src)) @@ -242,8 +242,8 @@ return ..() -/obj/item/weapon/gun/projectile/pistol/attackby(obj/item/I as obj, mob/living/user as mob) - if(istype(I, /obj/item/weapon/silencer)) +/obj/item/gun/projectile/pistol/attackby(obj/item/I as obj, mob/living/user as mob) + if(istype(I, /obj/item/silencer)) if(!user.item_is_in_hands(src)) //if we're not in his hands to_chat(user, "You'll need [src] in your hands to do that.") return @@ -256,7 +256,7 @@ return ..() -/obj/item/weapon/gun/projectile/pistol/update_icon() +/obj/item/gun/projectile/pistol/update_icon() if(ammo_magazine) if(silenced) icon_state = "pistol-s" @@ -271,7 +271,7 @@ /* * Pistol */ -/obj/item/weapon/gun/projectile/aps +/obj/item/gun/projectile/aps name = "pistol" desc = "The Lumoco Arms P6 \"Rustle\". A standard self-defense pistol that takes standard magazines. Uses 9mm rounds." icon_state = "aps" @@ -284,7 +284,7 @@ allowed_magazines = list(/obj/item/ammo_magazine/m9mm) projectile_type = /obj/item/projectile/bullet/pistol -/obj/item/weapon/gun/projectile/aps/attack_hand(mob/living/user as mob) +/obj/item/gun/projectile/aps/attack_hand(mob/living/user as mob) if(user.get_inactive_hand() == src) if(silenced) if(!user.item_is_in_hands(src)) @@ -297,8 +297,8 @@ return ..() -/obj/item/weapon/gun/projectile/aps/attackby(obj/item/I as obj, mob/living/user as mob) - if(istype(I, /obj/item/weapon/silencer)) +/obj/item/gun/projectile/aps/attackby(obj/item/I as obj, mob/living/user as mob) + if(istype(I, /obj/item/silencer)) if(!user.item_is_in_hands(src)) //if we're not in his hands to_chat(user, "You'll need [src] in your hands to do that.") return @@ -310,7 +310,7 @@ return ..() -/obj/item/weapon/gun/projectile/aps/update_icon() +/obj/item/gun/projectile/aps/update_icon() if(ammo_magazine) if(silenced) icon_state = "aps-s" @@ -325,7 +325,7 @@ /* * Zip Gun (yar har) */ -/obj/item/weapon/gun/projectile/pirate +/obj/item/gun/projectile/pirate name = "zip gun" desc = "Little more than a barrel, handle, and firing mechanism, cheap makeshift firearms like this one are not uncommon in frontier systems." icon_state = "zipgun" @@ -351,7 +351,7 @@ /obj/item/ammo_casing/a545 = "5.45mm" ) -/obj/item/weapon/gun/projectile/pirate/New() +/obj/item/gun/projectile/pirate/New() ammo_type = pick(ammo_types) desc += " Uses [ammo_types[ammo_type]] rounds." @@ -362,7 +362,7 @@ /* * Derringer */ -/obj/item/weapon/gun/projectile/derringer +/obj/item/gun/projectile/derringer name = "derringer" desc = "It's not size of your gun that matters, just the size of your load. Uses .357 rounds." //OHHH MYYY~ icon_state = "derringer" @@ -378,7 +378,7 @@ /* * Luger */ -/obj/item/weapon/gun/projectile/luger +/obj/item/gun/projectile/luger name = "\improper Jindal T15 \"Mäuse\"" desc = "Almost seventy percent guaranteed not to be a cheap rimworld knockoff! Accuracy, easy handling, and its distinctive appearance \ make it popular among gun collectors. Uses 9mm rounds." @@ -395,14 +395,14 @@ allowed_magazines = list(/obj/item/ammo_magazine/m9mm/luger) projectile_type = /obj/item/projectile/bullet/pistol -/obj/item/weapon/gun/projectile/luger/update_icon() +/obj/item/gun/projectile/luger/update_icon() ..() if(ammo_magazine) icon_state = "[initial(icon_state)]" else icon_state = "[initial(icon_state)]-e" -/obj/item/weapon/gun/projectile/luger/brown +/obj/item/gun/projectile/luger/brown name = "\improper Jindal T15b \"Mäuse\"" description_fluff = "While wholly owned by Hephaestus Industries, the Jindal Arms brand does not appear prominently in most company catalogues \ (Perhaps owing to its less than prestigious image), instead being sold almost exclusively through retailers and advertising platforms targeting \ @@ -412,7 +412,7 @@ /* * P92X (9mm Pistol) */ -/obj/item/weapon/gun/projectile/p92x +/obj/item/gun/projectile/p92x name = "9mm pistol" desc = "A widespread MarsTech sidearm called the P92X which is used by military, police, and security forces across the galaxy. Uses 9mm rounds." icon_state = "p92x" @@ -422,32 +422,32 @@ magazine_type = /obj/item/ammo_magazine/m9mm allowed_magazines = list(/obj/item/ammo_magazine/m9mm) // Can accept illegal large capacity magazines, or compact magazines. -/obj/item/weapon/gun/projectile/p92x/update_icon() +/obj/item/gun/projectile/p92x/update_icon() ..() if(ammo_magazine) icon_state = "[initial(icon_state)]" else icon_state = "[initial(icon_state)]-e" -/obj/item/weapon/gun/projectile/p92x/rubber +/obj/item/gun/projectile/p92x/rubber magazine_type = /obj/item/ammo_magazine/m9mm/rubber -/obj/item/weapon/gun/projectile/p92x/brown +/obj/item/gun/projectile/p92x/brown icon_state = "p92xb" -/obj/item/weapon/gun/projectile/p92x/large +/obj/item/gun/projectile/p92x/large magazine_type = /obj/item/ammo_magazine/m9mm/large // Spawns with illegal magazines. -/obj/item/weapon/gun/projectile/p92x/large/preban +/obj/item/gun/projectile/p92x/large/preban magazine_type = /obj/item/ammo_magazine/m9mm/large/preban // Spawns with big magazines that are legal. -/obj/item/weapon/gun/projectile/p92x/large/preban/hp +/obj/item/gun/projectile/p92x/large/preban/hp magazine_type = /obj/item/ammo_magazine/m9mm/large/preban/hp // Spawns with legal hollow-point mag /* * Giskard (Eris Port) */ -/obj/item/weapon/gun/projectile/giskard +/obj/item/gun/projectile/giskard name = "\improper \"Giskard\" holdout pistol" desc = "The FS HG .38 \"Giskard\" can even fit into the pocket! Uses .38 rounds." icon_state = "giskardcivil" @@ -460,14 +460,14 @@ fire_sound = 'sound/weapons/gunshot_pathetic.ogg' origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 3) -/obj/item/weapon/gun/projectile/giskard/update_icon() +/obj/item/gun/projectile/giskard/update_icon() ..() if(ammo_magazine && ammo_magazine.stored_ammo.len) icon_state = "giskardcivil" else icon_state = "giskardcivil_empty" -/obj/item/weapon/gun/projectile/giskard/olivaw +/obj/item/gun/projectile/giskard/olivaw name = "\improper \"Olivaw\" holdout burst-pistol" desc = "The FS HG .38 \"Olivaw\" is a more advanced version of the \"Giskard\". \ This one seems to have a two-round burst-fire mode. Uses .38 rounds." @@ -478,7 +478,7 @@ list(mode_name="2-round bursts", burst=2, fire_delay=0.2, move_delay=4, burst_accuracy=list(0,-15), dispersion=list(1.2, 1.8)), ) -/obj/item/weapon/gun/projectile/giskard/olivaw/update_icon() +/obj/item/gun/projectile/giskard/olivaw/update_icon() ..() if(ammo_magazine && ammo_magazine.stored_ammo.len) icon_state = "olivawcivil" @@ -488,7 +488,7 @@ /* * Makarov */ -/obj/item/weapon/gun/projectile/makarov +/obj/item/gun/projectile/makarov name = "makarov" desc = "A small, rugged pistol from a bygone era. Uses .38 rounds." icon_state = "makarov" @@ -501,7 +501,7 @@ w_class = ITEMSIZE_SMALL origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) -/obj/item/weapon/gun/projectile/makarov/update_icon() +/obj/item/gun/projectile/makarov/update_icon() if(ammo_magazine) icon_state = "Makarov" else @@ -510,7 +510,7 @@ /* * N99 (Fallout) */ -/obj/item/weapon/gun/projectile/n99 +/obj/item/gun/projectile/n99 name = "promotional pistol" desc = "A very robust looking pistol that was made to promote 'Radius: Legend of the Demon Core', a popular \ post-apocolyptic TV series. It's rare to come across as marketing swiftly switched to a toy version as \ @@ -525,16 +525,16 @@ w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) -/obj/item/weapon/gun/projectile/n99/update_icon() +/obj/item/gun/projectile/n99/update_icon() if(ammo_magazine) icon_state = "n99" else icon_state = "n99-e" -/obj/item/weapon/gun/projectile/n80 +/obj/item/gun/projectile/n80 icon_state = "n80" -/obj/item/weapon/gun/projectile/n80/update_icon() +/obj/item/gun/projectile/n80/update_icon() if(ammo_magazine) icon_state = "n80" else @@ -543,7 +543,7 @@ /* * Écureuil 10mm Pistol (Skyrat Port) */ -/obj/item/weapon/gun/projectile/ecureuil +/obj/item/gun/projectile/ecureuil name = "\improper \"Écureuil\" 10mm pistol" desc = "The 10mm MarsTech sidearm \"Écureuil\" is a well known military grade pistol. \ It's mostly used by ranking members of NanoTrasen as a means of self defense. Uses 10mm rounds." @@ -557,27 +557,27 @@ w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) -/obj/item/weapon/gun/projectile/ecureuil/update_icon() +/obj/item/gun/projectile/ecureuil/update_icon() if(ammo_magazine) icon_state = "ecureuil" else icon_state = "ecureuil-e" -/obj/item/weapon/gun/projectile/ecureuil/tac +/obj/item/gun/projectile/ecureuil/tac name = "\improper Tactical \"Écureuil\" 10mm pistol" icon_state = "tac_ecureuil" -/obj/item/weapon/gun/projectile/ecureuil/tac/update_icon() +/obj/item/gun/projectile/ecureuil/tac/update_icon() if(ammo_magazine) icon_state = "tac_ecureuil" else icon_state = "tac_ecureuil-e" -/obj/item/weapon/gun/projectile/ecureuil/tac2 +/obj/item/gun/projectile/ecureuil/tac2 name = "\improper Tactical \"Écureuil\" 10mm pistol" icon_state = "tac_ecureuil" -/obj/item/weapon/gun/projectile/ecureuil/tac2/update_icon() +/obj/item/gun/projectile/ecureuil/tac2/update_icon() if(ammo_magazine) icon_state = "tac2_ecureuil" else @@ -586,7 +586,7 @@ /* * Lamia (Eris Port) */ -/obj/item/weapon/gun/projectile/lamia +/obj/item/gun/projectile/lamia name = "\improper FS HG .44 \"Lamia\"" desc = "The FS HG .44 \"Lamia\" is the epitome of power in a handheld device. Uses .44 rounds." icon_state = "lamia" @@ -599,7 +599,7 @@ auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg' origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4) -/obj/item/weapon/gun/projectile/lamia/update_icon() +/obj/item/gun/projectile/lamia/update_icon() cut_overlays() if(!ammo_magazine) return diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index d26ce740fca..2a8fd9c8608 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -1,7 +1,7 @@ /* * Revolver */ -/obj/item/weapon/gun/projectile/revolver +/obj/item/gun/projectile/revolver name = "revolver" desc = "The MarsTech HE Colt is a choice revolver for when you absolutely, positively need to put a hole in the other guy. Uses .357 rounds." description_fluff = "MarsTech first made their name in the Second Cold War as the 'Lunar Arms Company' providing home-grown arms to the Selene Federation, \ @@ -18,7 +18,7 @@ projectile_type = /obj/item/projectile/bullet/pistol/strong var/chamber_offset = 0 //how many empty chambers in the cylinder until you hit a round -/obj/item/weapon/gun/projectile/revolver/verb/spin_cylinder() +/obj/item/gun/projectile/revolver/verb/spin_cylinder() set name = "Spin cylinder" set desc = "Fun when you're bored out of your skull." set category = "Object" @@ -31,23 +31,23 @@ if(rand(1,max_shells) > loaded.len) chamber_offset = rand(0,max_shells - loaded.len) -/obj/item/weapon/gun/projectile/revolver/consume_next_projectile() +/obj/item/gun/projectile/revolver/consume_next_projectile() if(chamber_offset) chamber_offset-- return return ..() -/obj/item/weapon/gun/projectile/revolver/load_ammo(var/obj/item/A, mob/user) +/obj/item/gun/projectile/revolver/load_ammo(var/obj/item/A, mob/user) chamber_offset = 0 return ..() -/obj/item/weapon/gun/projectile/revolver/stainless +/obj/item/gun/projectile/revolver/stainless icon_state = "revolver_stainless" /* * Detective Revolver */ -/obj/item/weapon/gun/projectile/revolver/detective +/obj/item/gun/projectile/revolver/detective name = "revolver" desc = "A standard MarsTech R1 snubnose revolver, popular among some law enforcement agencies for its simple, long-lasting construction. Uses .38-Special rounds." description_fluff = "The leading civilian-sector high-quality small arms brand of Hephaestus Industries, MarsTech has been the provider of choice for law enforcement and security forces for over 300 years." @@ -56,7 +56,7 @@ origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) ammo_type = /obj/item/ammo_casing/a38 -/obj/item/weapon/gun/projectile/revolver/detective/verb/rename_gun() +/obj/item/gun/projectile/revolver/detective/verb/rename_gun() set name = "Name Gun" set category = "Object" set desc = "Click to rename your gun. If you're the detective." @@ -74,7 +74,7 @@ to_chat(M, "You name the gun [input]. Say hello to your new friend.") return 1 -/obj/item/weapon/gun/projectile/revolver/detective45 +/obj/item/gun/projectile/revolver/detective45 name = ".45 revolver" desc = "A basic revolver, popular among some law enforcement agencies for its simple, long-lasting construction, modified for .45 rounds and a seven-shot cylinder." icon_state = "detective" @@ -83,7 +83,7 @@ ammo_type = /obj/item/ammo_casing/a45/rubber max_shells = 6 -/obj/item/weapon/gun/projectile/revolver/detective45/verb/rename_gun() +/obj/item/gun/projectile/revolver/detective45/verb/rename_gun() set name = "Name Gun" set category = "Object" set desc = "Rename your gun. If you're the " + JOB_DETECTIVE + "." @@ -102,7 +102,7 @@ to_chat(M, "You name the gun [input]. Say hello to your new friend.") return 1 -/obj/item/weapon/gun/projectile/revolver/detective45/verb/reskin_gun() +/obj/item/gun/projectile/revolver/detective45/verb/reskin_gun() set name = "Resprite gun" set category = "Object" set desc = "Click to choose a sprite for your gun." @@ -128,17 +128,17 @@ * Lombardi Revolvers * Use to be detective revolvers until seperated */ -/obj/item/weapon/gun/projectile/revolver/lombardi +/obj/item/gun/projectile/revolver/lombardi name = "Lombardi Buzzard" desc = "A rugged revolver that is mostly used by small law enforcement agencies across the frontier as a cheap, reliable sidearm. Uses .357 rounds." icon_state = "lombardi_police" origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) -/obj/item/weapon/gun/projectile/revolver/lombardi/panther +/obj/item/gun/projectile/revolver/lombardi/panther name = "Lombardi Panther" icon_state = "lombardi_panther" -/obj/item/weapon/gun/projectile/revolver/lombardi/gold +/obj/item/gun/projectile/revolver/lombardi/gold name = "Lombardi Deluxe 2502" desc = "A sweet looking revolver that is decorated with false gold and silver plating. Favored among by gamblers and criminals alike. Uses .357 rounds." icon_state = "lombardi_gold" @@ -146,7 +146,7 @@ /* * Captain's Peacekeeper */ -/obj/item/weapon/gun/projectile/revolver/cappeacekeeper +/obj/item/gun/projectile/revolver/cappeacekeeper name = "decorated peacekeeper" desc = "A MarsTech Frontiersman revolver that has been heavily modified. It has been decorated for personal use by command officers. Uses .44 rounds." description_fluff = "The leading civilian-sector high-quality small arms brand of Hephaestus Industries, \ @@ -159,7 +159,7 @@ /* * Mateba */ -/obj/item/weapon/gun/projectile/revolver/mateba +/obj/item/gun/projectile/revolver/mateba name = "mateba" desc = "This unique looking handgun is named after an Italian company famous for the original manufacture of \ these revolvers, and pasta kneading machines. Uses .357 rounds." // Yes I'm serious. -Spades @@ -169,7 +169,7 @@ /* * Deckard (Blade Runner) */ -/obj/item/weapon/gun/projectile/revolver/deckard +/obj/item/gun/projectile/revolver/deckard name = "\improper \"Deckard\" .38" desc = "A custom-built revolver, based off the semi-popular Detective Special model. Uses .38-Special rounds." icon_state = "deckard-empty" @@ -177,18 +177,18 @@ origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) ammo_type = /obj/item/ammo_casing/a38 -/obj/item/weapon/gun/projectile/revolver/deckard/emp +/obj/item/gun/projectile/revolver/deckard/emp ammo_type = /obj/item/ammo_casing/a38/emp -/obj/item/weapon/gun/projectile/revolver/deckard/update_icon() +/obj/item/gun/projectile/revolver/deckard/update_icon() ..() if(loaded.len) icon_state = "deckard-loaded" else icon_state = "deckard-empty" -/obj/item/weapon/gun/projectile/revolver/deckard/load_ammo(var/obj/item/A, mob/user) +/obj/item/gun/projectile/revolver/deckard/load_ammo(var/obj/item/A, mob/user) if(istype(A, /obj/item/ammo_magazine)) flick("deckard-reload",src) ..() @@ -196,7 +196,7 @@ /* * Judge */ -/obj/item/weapon/gun/projectile/revolver/judge +/obj/item/gun/projectile/revolver/judge name = "\"The Judge\"" desc = "A revolving hand-shotgun by Jindal Arms that packs the power of a 12 guage in the palm of your hand (if you don't break your wrist). Uses 12g rounds." description_fluff = "While wholly owned by Hephaestus Industries, the Jindal Arms brand does not appear \ @@ -216,7 +216,7 @@ /* * Mako */ -/obj/item/weapon/gun/projectile/revolver/lemat +/obj/item/gun/projectile/revolver/lemat name = "Mako revolver" desc = "The Bishamonten P100 Mako is a 9 shot revolver with a secondary firing barrel loading shotgun shells. For when you really need something dead. A rare yet deadly collector's item. Uses .38-Special and 12g rounds depending on the barrel." description_fluff = "The Bishamonten Company operated from roughly 2150-2280 - the height of the first extrasolar colonisation boom - before filing for bankruptcy and selling off its assets to various companies that would go on to become today’s TSCs. \ @@ -239,12 +239,12 @@ var/list/tertiary_loaded = list() -/obj/item/weapon/gun/projectile/revolver/lemat/New() +/obj/item/gun/projectile/revolver/lemat/New() for(var/i in 1 to secondary_max_shells) secondary_loaded += new secondary_ammo_type(src) ..() -/obj/item/weapon/gun/projectile/revolver/lemat/verb/swap_firingmode() +/obj/item/gun/projectile/revolver/lemat/verb/swap_firingmode() set name = "Swap Firing Mode" set category = "Object" set desc = "Click to swap from one method of firing to another." @@ -286,7 +286,7 @@ flipped_firing = 0 -/obj/item/weapon/gun/projectile/revolver/lemat/spin_cylinder() +/obj/item/gun/projectile/revolver/lemat/spin_cylinder() set name = "Spin cylinder" set desc = "Fun when you're bored out of your skull." set category = "Object" @@ -300,7 +300,7 @@ if(rand(1,max_shells) > loaded.len) chamber_offset = rand(0,max_shells - loaded.len) -/obj/item/weapon/gun/projectile/revolver/lemat/examine(mob/user) +/obj/item/gun/projectile/revolver/lemat/examine(mob/user) . = ..() if(secondary_loaded) var/to_print @@ -314,7 +314,7 @@ /* * Webley (Bay Port) */ -/obj/item/weapon/gun/projectile/revolver/webley +/obj/item/gun/projectile/revolver/webley name = "patrol revolver" desc = "A rugged top break revolver commonly issued to planetary law enforcement offices. Uses .44 magnum rounds." description_fluff = "The Heberg-Hammarstrom Althing is a simple, head-wearing revolver made with an anti-corrosive alloy. \ @@ -330,7 +330,7 @@ /* * Webley (Eris Port) */ -/obj/item/weapon/gun/projectile/revolver/consul +/obj/item/gun/projectile/revolver/consul name = "\improper \"Consul\" Revolver" desc = "Are you feeling lucky, punk? Uses .44 rounds." icon_state = "inspector" @@ -340,12 +340,12 @@ handle_casings = CYCLE_CASINGS ammo_type = /obj/item/ammo_casing/a44/rubber -/obj/item/weapon/gun/projectile/revolver/consul/proc/update_charge() +/obj/item/gun/projectile/revolver/consul/proc/update_charge() cut_overlays() if(loaded.len==0) add_overlay("inspector_off") else add_overlay("inspector_on") -/obj/item/weapon/gun/projectile/revolver/consul/update_icon() +/obj/item/gun/projectile/revolver/consul/update_icon() update_charge() diff --git a/code/modules/projectiles/guns/projectile/semiauto.dm b/code/modules/projectiles/guns/projectile/semiauto.dm index e04c896ecc6..73a3360b437 100644 --- a/code/modules/projectiles/guns/projectile/semiauto.dm +++ b/code/modules/projectiles/guns/projectile/semiauto.dm @@ -1,7 +1,7 @@ /* * M1 Garand */ -/obj/item/weapon/gun/projectile/garand +/obj/item/gun/projectile/garand name = "semi-automatic rifle" desc = "A vintage styled frontier rifle by Hedberg-Hammarstrom. The distinctive 'ping' is considered \ traditional, though its origins are much debated. Uses 7.62mm rounds." @@ -23,7 +23,7 @@ auto_eject = 1 auto_eject_sound = 'sound/weapons/garand_ping.ogg' -/obj/item/weapon/gun/projectile/garand/update_icon() +/obj/item/gun/projectile/garand/update_icon() if(ammo_magazine) icon_state = initial(icon_state) else @@ -33,7 +33,7 @@ * Revolver Rifle * Bastard child of a revolver and a semi-auto rifle. */ -/obj/item/weapon/gun/projectile/revolvingrifle +/obj/item/gun/projectile/revolvingrifle name = "revolving rifle" desc = "The Gungnir is a novel, antique idea brought into the modern era by Hedberg-Hammarstrom. \ The semi-automatic revolving mechanism offers no real advantage, but some colonists swear by it. \ @@ -57,7 +57,7 @@ /* * Vintage Revolver Rifle */ -/obj/item/weapon/gun/projectile/revolvingrifle/vintage +/obj/item/gun/projectile/revolvingrifle/vintage name = "vintage revolving rifle" desc = "The Willhem is the Gungir's older cousin by Hedberg-Hammarstrom, the perfect collector piece. \ The semi-automatic revolving mechanism offers no real advantage, but some colonists swear by it. \ diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index dceb223a771..739b6dc4093 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -2,7 +2,7 @@ * Shotgun */ -/obj/item/weapon/gun/projectile/shotgun/pump +/obj/item/gun/projectile/shotgun/pump name = "shotgun" desc = "The mass-produced MarsTech Meteor 29 shotgun is a favourite of police and security forces on many worlds. Uses 12g rounds." description_fluff = "The leading civilian-sector high-quality small arms brand of Hephaestus Industries, \ @@ -24,17 +24,17 @@ var/empty_sprite = 0 //This is just a dirty var so it doesn't fudge up. var/pump_animation = "shotgun-pump" //You put the reference to the animation in question here. Frees up namming. Ex: "shotgun_old_pump" or "sniper_cycle" -/obj/item/weapon/gun/projectile/shotgun/pump/consume_next_projectile() +/obj/item/gun/projectile/shotgun/pump/consume_next_projectile() if(chambered) return chambered.BB return null -/obj/item/weapon/gun/projectile/shotgun/pump/attack_self(mob/living/user as mob) +/obj/item/gun/projectile/shotgun/pump/attack_self(mob/living/user as mob) if(world.time >= recentpump + 10) pump(user) recentpump = world.time -/obj/item/weapon/gun/projectile/shotgun/pump/proc/pump(mob/M as mob) +/obj/item/gun/projectile/shotgun/pump/proc/pump(mob/M as mob) playsound(src, action_sound, 60, 1) // We have a shell in the chamber @@ -58,7 +58,7 @@ update_icon() -/obj/item/weapon/gun/projectile/shotgun/pump/update_icon()//This adds empty sprite capability for shotguns. +/obj/item/gun/projectile/shotgun/pump/update_icon()//This adds empty sprite capability for shotguns. ..() if(!empty_sprite)//Just a dirty check return @@ -67,17 +67,17 @@ else icon_state = "[icon_state]-empty" -/obj/item/weapon/gun/projectile/shotgun/pump/empty +/obj/item/gun/projectile/shotgun/pump/empty ammo_type = null -/obj/item/weapon/gun/projectile/shotgun/pump/slug +/obj/item/gun/projectile/shotgun/pump/slug ammo_type = /obj/item/ammo_casing/a12g pump_animation = null /* * Combat Shotgun */ -/obj/item/weapon/gun/projectile/shotgun/pump/combat +/obj/item/gun/projectile/shotgun/pump/combat name = "combat shotgun" desc = "Built for close quarters combat, the Hephaestus Industries KS-40 is widely regarded as a weapon of choice for repelling boarders. Uses 12g rounds." description_fluff = "The leading arms producer in the SCG, Hephaestus typically only uses its 'top level' \ @@ -90,13 +90,13 @@ load_method = SINGLE_CASING|SPEEDLOADER pump_animation = "cshotgun-pump" -/obj/item/weapon/gun/projectile/shotgun/pump/combat/empty +/obj/item/gun/projectile/shotgun/pump/combat/empty ammo_type = null /* * Double-Barreled Shotgun */ -/obj/item/weapon/gun/projectile/shotgun/doublebarrel +/obj/item/gun/projectile/shotgun/doublebarrel name = "double-barreled shotgun" desc = "A truely classic weapon. No need to change what works. Uses 12g rounds." icon_state = "dshotgun" @@ -122,18 +122,18 @@ list(mode_name="fire both barrels at once", burst=2), ) -/obj/item/weapon/gun/projectile/shotgun/doublebarrel/pellet +/obj/item/gun/projectile/shotgun/doublebarrel/pellet ammo_type = /obj/item/ammo_casing/a12g/pellet -/obj/item/weapon/gun/projectile/shotgun/doublebarrel/flare +/obj/item/gun/projectile/shotgun/doublebarrel/flare name = "signal shotgun" desc = "A double-barreled shotgun meant to fire signal flash shells. Uses 12g rounds." ammo_type = /obj/item/ammo_casing/a12g/flash -/obj/item/weapon/gun/projectile/shotgun/doublebarrel/unload_ammo(user, allow_dump) +/obj/item/gun/projectile/shotgun/doublebarrel/unload_ammo(user, allow_dump) ..(user, allow_dump=1) -/obj/item/weapon/gun/projectile/shotgun/doublebarrel/verb/rename_gun() +/obj/item/gun/projectile/shotgun/doublebarrel/verb/rename_gun() set name = "Name Gun" set category = "Object" set desc = "Rename your gun." @@ -146,7 +146,7 @@ to_chat(M, "You name the gun [input]. Say hello to your new friend.") return 1 -/obj/item/weapon/gun/projectile/shotgun/doublebarrel/verb/reskin_gun() +/obj/item/gun/projectile/shotgun/doublebarrel/verb/reskin_gun() set name = "Resprite gun" set category = "Object" set desc = "Click to choose a sprite for your gun." @@ -172,11 +172,11 @@ return 1 //this is largely hacky and bad :( -Pete //less hacky and bad now :) -Ghost -/obj/item/weapon/gun/projectile/shotgun/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob) +/obj/item/gun/projectile/shotgun/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob) if(sawn_off) to_chat(user, "The [src] is already shortened!") return - if(istype(A, /obj/item/weapon/surgical/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter)) + if(istype(A, /obj/item/surgical/circular_saw) || istype(A, /obj/item/melee/energy) || istype(A, /obj/item/pickaxe/plasmacutter)) to_chat(user, "You begin to shorten the barrel of \the [src].") if(loaded.len) var/burstsetting = burst @@ -208,7 +208,7 @@ /* * Sawn-Off Shotgun */ -/obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn +/obj/item/gun/projectile/shotgun/doublebarrel/sawn name = "sawn-off shotgun" desc = "Omar's coming!" // I'm not gonna add "Uses 12g rounds." to this one. I'll just let this reference go undisturbed. icon_state = "dshotgun_sawn" @@ -220,7 +220,7 @@ sawn_off = TRUE //Sjorgen Inertial Shotgun -/obj/item/weapon/gun/projectile/shotgun/semi +/obj/item/gun/projectile/shotgun/semi name = "semi-automatic shotgun" desc = "A shotgun with a simple, yet effective recoil inertia loading mechanism for semi-automatic fire. This gun uses 12 gauge ammunition." description_fluff = "Looking back on yet another venerable design, Hedberg-Hammarstrom settled on a pattern of shotgun that both had the reliability of a well proven semi-automatic loading system in addition to a striking visual aesthetic that would be appealing to even the most discerning of firearm collectors." diff --git a/code/modules/projectiles/guns/projectile/shotgun_vr.dm b/code/modules/projectiles/guns/projectile/shotgun_vr.dm index 3d6486c60db..e13507b4b5b 100644 --- a/code/modules/projectiles/guns/projectile/shotgun_vr.dm +++ b/code/modules/projectiles/guns/projectile/shotgun_vr.dm @@ -1,5 +1,5 @@ // For general use -/obj/item/weapon/gun/projectile/shotgun/pump/USDF +/obj/item/gun/projectile/shotgun/pump/USDF name = "\improper USDF tactical shotgun" desc = "All you greenhorns who wanted to see Xenomorphs up close... this is your lucky day. Uses 12g rounds." icon = 'icons/obj/gun_vr.dmi' @@ -11,14 +11,14 @@ max_shells = 12 //Warden's shotgun gets it's own entry now, rather than being handled by the maps -/obj/item/weapon/gun/projectile/shotgun/pump/combat/warden +/obj/item/gun/projectile/shotgun/pump/combat/warden name = "warden's shotgun" desc = "Built for close quarters combat, the Hephaestus Industries KS-40 is widely regarded as a weapon of choice for repelling boarders. This one has 'Property of the Warden' inscribed on the stock." description_fluff = "The leading arms producer in the SCG, Hephaestus typically only uses its 'top level' branding for its military-grade equipment used by armed forces across human space." ammo_type = /obj/item/ammo_casing/a12g/beanbag //Compact shotgun, this version's for usage later by mappers/coders/w.e. -/obj/item/weapon/gun/projectile/shotgun/compact +/obj/item/gun/projectile/shotgun/compact name = "compact shotgun" desc = "Built for extremely-close quarters combat, the Hephaestus Industries KS-55 \"semi-auto shorty\" is a relatively rare sight to see, usually in the hands of elite troops that specialize in boarding. Uses 12g rounds." description_fluff = "The leading arms producer in the SCG, Hephaestus typically only uses its 'top level' branding for its military-grade equipment used by armed forces across human space." @@ -41,7 +41,7 @@ var/stock = FALSE -/obj/item/weapon/gun/projectile/shotgun/compact/proc/toggle_stock() +/obj/item/gun/projectile/shotgun/compact/proc/toggle_stock() var/mob/living/user = loc stock = !stock if(stock) @@ -71,7 +71,7 @@ playsound(src, 'sound/weapons/targeton.ogg', 50, 1) user.update_action_buttons() -/obj/item/weapon/gun/projectile/shotgun/compact/verb/verb_toggle_stock(mob/user as mob) +/obj/item/gun/projectile/shotgun/compact/verb/verb_toggle_stock(mob/user as mob) set category = "Object" set name = "Toggle stock" set src in usr @@ -85,7 +85,7 @@ to_chat(usr, "You cannot do this in your current state.") -/obj/item/weapon/gun/projectile/shotgun/compact/attack_self(mob/user as mob) +/obj/item/gun/projectile/shotgun/compact/attack_self(mob/user as mob) if(issilicon(usr)) return @@ -94,14 +94,14 @@ else to_chat(usr, "You cannot do this in your current state.") -/obj/item/weapon/gun/projectile/shotgun/compact/ui_action_click() +/obj/item/gun/projectile/shotgun/compact/ui_action_click() var/mob/living/user = loc if(!isliving(user)) return else toggle_stock() -/obj/item/weapon/gun/projectile/shotgun/compact/warden +/obj/item/gun/projectile/shotgun/compact/warden name = "warden's compact shotgun" desc = "Built for extremely-close quarters combat, the Hephaestus Industries KS-55 \"semi-auto shorty\" is a relatively rare sight to see, usually in the hands of elite troops that specialize in boarding. This one has 'Property of the Warden' inscribed on the upper receiver." description_fluff = "The leading arms producer in the SCG, Hephaestus typically only uses its 'top level' branding for its military-grade equipment used by armed forces across human space." diff --git a/code/modules/projectiles/guns/projectile/smartgun.dm b/code/modules/projectiles/guns/projectile/smartgun.dm index ba13558160c..f98fabfc3fe 100644 --- a/code/modules/projectiles/guns/projectile/smartgun.dm +++ b/code/modules/projectiles/guns/projectile/smartgun.dm @@ -1,7 +1,7 @@ /** * The gun itself */ -/obj/item/weapon/gun/projectile/smartgun +/obj/item/gun/projectile/smartgun name = "\improper OP-15 'S.M.A.R.T.' Rifle" desc = "Suppressive Manual Action Reciprocating Taser rifle. A modified version of an Armadyne heavy machine gun fitted to fire miniature shock-bolts." description_info = "Alt-click to toggle the rifle's ready state. The rifle can't be unloaded when ready, and requires a few seconds to get ready before firing." @@ -30,38 +30,38 @@ var/static/mutable_appearance/mag_underlay -/obj/item/weapon/gun/projectile/smartgun/make_worn_icon(body_type, slot_name, inhands, default_icon, default_layer, icon/clip_mask) +/obj/item/gun/projectile/smartgun/make_worn_icon(body_type, slot_name, inhands, default_icon, default_layer, icon/clip_mask) var/image/I = ..() if(I) I.pixel_x = -16 return I -/obj/item/weapon/gun/projectile/smartgun/loaded +/obj/item/gun/projectile/smartgun/loaded magazine_type = /obj/item/ammo_magazine/smartgun -/obj/item/weapon/gun/projectile/smartgun/Initialize() +/obj/item/gun/projectile/smartgun/Initialize() . = ..() if(!mag_underlay) mag_underlay = mutable_appearance(icon, icon_state = "smartgun_mag") -/obj/item/weapon/gun/projectile/smartgun/consume_next_projectile() +/obj/item/gun/projectile/smartgun/consume_next_projectile() if(!closed) return null return ..() -/obj/item/weapon/gun/projectile/smartgun/load_ammo(var/obj/item/A, mob/user) +/obj/item/gun/projectile/smartgun/load_ammo(var/obj/item/A, mob/user) if(closed) to_chat(user, "[src] can't be loaded until you un-ready it. (Alt-click)") return return ..() -/obj/item/weapon/gun/projectile/smartgun/unload_ammo(mob/user, var/allow_dump=0) +/obj/item/gun/projectile/smartgun/unload_ammo(mob/user, var/allow_dump=0) if(closed) to_chat(user, "[src] can't be unloaded until you un-ready it. (Alt-click)") return return ..() -/obj/item/weapon/gun/projectile/smartgun/AltClick(mob/user) +/obj/item/gun/projectile/smartgun/AltClick(mob/user) if(ishuman(user) && !user.incapacitated() && Adjacent(user)) if(cycling) to_chat(user, "[src] is still cycling!") @@ -79,11 +79,11 @@ to_chat(user, "You ready [src] so that it can be fired.") addtimer(CALLBACK(src, PROC_REF(toggle_real_state)), 2 SECONDS, TIMER_UNIQUE) -/obj/item/weapon/gun/projectile/smartgun/proc/toggle_real_state() +/obj/item/gun/projectile/smartgun/proc/toggle_real_state() cycling = FALSE closed = !closed -/obj/item/weapon/gun/projectile/smartgun/update_icon() +/obj/item/gun/projectile/smartgun/update_icon() . = ..() underlays = null if(ammo_magazine) diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index c5dac83a1db..3efdf1f4019 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -1,6 +1,6 @@ ////////////// PTR-7 Anti-Materiel Rifle ////////////// -/obj/item/weapon/gun/projectile/heavysniper +/obj/item/gun/projectile/heavysniper name = "anti-materiel rifle" desc = "A portable anti-armour rifle fitted with a scope, the HI PTR-7 Rifle was originally designed to used against armoured exosuits. It is capable of punching through windows and non-reinforced walls with ease. Fires armor piercing 14.5mm shells." description_fluff = "The leading arms producer in the SCG, Hephaestus typically only uses its 'top level' branding for its military-grade equipment used by professional armed forces across human space." @@ -24,13 +24,13 @@ one_handed_penalty = 90 var/bolt_open = 0 -/obj/item/weapon/gun/projectile/heavysniper/update_icon() +/obj/item/gun/projectile/heavysniper/update_icon() if(bolt_open) icon_state = "heavysniper-open" else icon_state = "heavysniper" -/obj/item/weapon/gun/projectile/heavysniper/attack_self(mob/user as mob) +/obj/item/gun/projectile/heavysniper/attack_self(mob/user as mob) playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) bolt_open = !bolt_open if(bolt_open) @@ -47,26 +47,26 @@ add_fingerprint(user) update_icon() -/obj/item/weapon/gun/projectile/heavysniper/special_check(mob/user) +/obj/item/gun/projectile/heavysniper/special_check(mob/user) if(bolt_open) to_chat(user, "You can't fire [src] while the bolt is open!") return 0 return ..() -/obj/item/weapon/gun/projectile/heavysniper/load_ammo(var/obj/item/A, mob/user) +/obj/item/gun/projectile/heavysniper/load_ammo(var/obj/item/A, mob/user) if(!bolt_open) return ..() -/obj/item/weapon/gun/projectile/heavysniper/unload_ammo(mob/user, var/allow_dump=1) +/obj/item/gun/projectile/heavysniper/unload_ammo(mob/user, var/allow_dump=1) if(!bolt_open) return ..() -/obj/item/weapon/gun/projectile/heavysniper/ui_action_click() +/obj/item/gun/projectile/heavysniper/ui_action_click() scope() -/obj/item/weapon/gun/projectile/heavysniper/verb/scope() +/obj/item/gun/projectile/heavysniper/verb/scope() set category = "Object" set name = "Use Scope" set popup_menu = 1 @@ -75,7 +75,7 @@ ////////////// Dragunov Sniper Rifle ////////////// -/obj/item/weapon/gun/projectile/SVD +/obj/item/gun/projectile/SVD name = "sniper rifle" desc = "The PCA S19 Jalgarr, also known by its translated name the 'Dragon', is mass produced with an Optical Sniper Sight so simple that even a Tajaran can use it. Too bad for you that the inscriptions are written in Siik. Uses 7.62mm rounds." icon_state = "SVD" @@ -95,17 +95,17 @@ magazine_type = /obj/item/ammo_magazine/m762svd allowed_magazines = list(/obj/item/ammo_magazine/m762svd) -/obj/item/weapon/gun/projectile/SVD/update_icon() +/obj/item/gun/projectile/SVD/update_icon() ..() if(ammo_magazine) icon_state = "SVD" else icon_state = "SVD-empty" -/obj/item/weapon/gun/projectile/SVD/ui_action_click() +/obj/item/gun/projectile/SVD/ui_action_click() scope() -/obj/item/weapon/gun/projectile/SVD/verb/scope() +/obj/item/gun/projectile/SVD/verb/scope() set category = "Object" set name = "Use Scope" set popup_menu = 1 diff --git a/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm b/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm index 7accdbc50bc..322819c20cf 100644 --- a/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm @@ -1,8 +1,8 @@ ////////////// PTR-7 Anti-Materiel Rifle ////////////// -/obj/item/weapon/gun/projectile/heavysniper/collapsible +/obj/item/gun/projectile/heavysniper/collapsible -/obj/item/weapon/gun/projectile/heavysniper/collapsible/verb/take_down() +/obj/item/gun/projectile/heavysniper/collapsible/verb/take_down() set category = "Object" set name = "Disassemble Rifle" @@ -15,7 +15,7 @@ else collapse_rifle(user) -/obj/item/weapon/gun/projectile/heavysniper/proc/collapse_rifle(mob/user) +/obj/item/gun/projectile/heavysniper/proc/collapse_rifle(mob/user) to_chat(user, "You begin removing \the [src]'s barrel.") if(do_after(user, 40)) if(user.unEquip(src, force=1)) @@ -162,14 +162,14 @@ w_class = ITEMSIZE_LARGE if(3) - var/obj/item/weapon/gun/projectile/heavysniper/collapsible/gun = new (get_turf(src), 0) + var/obj/item/gun/projectile/heavysniper/collapsible/gun = new (get_turf(src), 0) if(usr && istype(usr, /mob/living/carbon/human)) var/mob/living/carbon/human/user = usr user.unEquip(src, force=1) user.put_in_any_hand_if_possible(gun) || gun.dropInto(loc) qdel(src) -/obj/item/weapon/gun/projectile/heavysniper/update_icon() +/obj/item/gun/projectile/heavysniper/update_icon() if(bolt_open) icon_state = "heavysniper-open" else diff --git a/code/modules/projectiles/guns/toy.dm b/code/modules/projectiles/guns/toy.dm index aa52008b92e..c61b899ecfd 100644 --- a/code/modules/projectiles/guns/toy.dm +++ b/code/modules/projectiles/guns/toy.dm @@ -18,7 +18,7 @@ /* * Cap Gun */ -/obj/item/weapon/gun/projectile/revolver/capgun +/obj/item/gun/projectile/revolver/capgun name = "cap gun" desc = "Looks almost like the real thing! Ages 8 and up." icon = 'icons/obj/gun_toy.dmi' @@ -35,7 +35,7 @@ /* * Shotgun */ -/obj/item/weapon/gun/projectile/shotgun/pump/toy +/obj/item/gun/projectile/shotgun/pump/toy name = "\improper Donk-Soft shotgun" desc = "Donk-Soft foam shotgun! It's Donk or Don't! Ages 8 and up." icon = 'icons/obj/gun_toy.dmi' @@ -57,7 +57,7 @@ /* * Moist Nugget */ -/obj/item/weapon/gun/projectile/shotgun/pump/toy/moistnugget +/obj/item/gun/projectile/shotgun/pump/toy/moistnugget name = "\improper Donk-Soft mosin-nagant" desc = "Donk-Soft foam mosin-nagant! It's Donk or Don't! Ages 8 and up." description_fluff = "A special Donk-Soft rifle originally made to pair with a Soviet Soldier costume. It didn't catch on quite as well as other Donk-Soft products." @@ -70,7 +70,7 @@ /* * Pistol */ -/obj/item/weapon/gun/projectile/pistol/toy +/obj/item/gun/projectile/pistol/toy name = "\improper Donk-Soft pistol" desc = "Donk-Soft foam pistol! It's Donk or Don't! Ages 8 and up." icon = 'icons/obj/gun_toy.dmi' @@ -85,7 +85,7 @@ matter = list(MAT_PLASTIC = 1000) recoil = null //it's a toy -/obj/item/weapon/gun/projectile/pistol/toy/update_icon() +/obj/item/gun/projectile/pistol/toy/update_icon() if(ammo_magazine) icon_state = initial(icon_state) else @@ -94,13 +94,13 @@ /* * N99 Pistol */ -/obj/item/weapon/gun/projectile/pistol/toy/n99 +/obj/item/gun/projectile/pistol/toy/n99 name = "\improper Donk-Soft commemorative pistol" desc = "A special made Donk-Soft pistol to promote 'Radius: Legend of the Demon Core', a popular post-apocolyptic TV series." icon_state = "n99" item_state = "gun" -/obj/item/weapon/gun/projectile/pistol/toy/n99/update_icon() +/obj/item/gun/projectile/pistol/toy/n99/update_icon() if(ammo_magazine) icon_state = initial(icon_state) else @@ -109,7 +109,7 @@ /* * Levergun */ -/obj/item/weapon/gun/projectile/shotgun/pump/toy/levergun +/obj/item/gun/projectile/shotgun/pump/toy/levergun name = "\improper Donk-Soft levergun" desc = "Donk-Soft foam levergun! Time to cowboy up! Ages 8 and up." icon_state = "leveraction" @@ -120,7 +120,7 @@ /* * Revolver */ -/obj/item/weapon/gun/projectile/revolver/toy +/obj/item/gun/projectile/revolver/toy name = "\improper Donk-Soft revolver" desc = "Donk-Soft foam revolver! Time to cowboy up! Ages 8 and up." icon = 'icons/obj/gun_toy.dmi' @@ -139,7 +139,7 @@ /* * Big Iron */ -/obj/item/weapon/gun/projectile/revolver/toy/big_iron +/obj/item/gun/projectile/revolver/toy/big_iron name = "\improper Donk-Soft big iron" desc = "A special made Donk-Soft pistol to promote 'A Fistful of Phoron', a popular frontier novel series." icon_state = "big_iron" @@ -148,7 +148,7 @@ /* * Crossbow */ -/obj/item/weapon/gun/projectile/revolver/toy/crossbow +/obj/item/gun/projectile/revolver/toy/crossbow name = "\improper Donk-Soft crossbow" desc = "Donk-Soft foam crossbow! It's Donk or Don't! Ages 8 and up." icon = 'icons/obj/gun_toy.dmi' @@ -159,7 +159,7 @@ /* * Crossbow (Halloween) */ -/obj/item/weapon/gun/projectile/revolver/toy/crossbow/halloween +/obj/item/gun/projectile/revolver/toy/crossbow/halloween name = "\improper Donk-Soft special edition crossbow" desc = "A special edition Donk-Soft crossbow! Made special for your Halloween cosplay. It's Donk or Don't! Ages 8 and up." icon = 'icons/obj/gun_toy.dmi' @@ -170,7 +170,7 @@ /* * Sawn Off */ -/obj/item/weapon/gun/projectile/revolver/toy/sawnoff //revolver code just because it's easier +/obj/item/gun/projectile/revolver/toy/sawnoff //revolver code just because it's easier name = "\improper Donk-Soft sawn off shotgun" desc = "Donk-Soft foam sawn off! It's Donk or Don't! Ages 8 and up." icon = 'icons/obj/gun_toy.dmi' @@ -183,7 +183,7 @@ /* * SMG */ -/obj/item/weapon/gun/projectile/automatic/toy +/obj/item/gun/projectile/automatic/toy name = "\improper Donk-Soft SMG" desc = "Donk-Soft foam SMG! It's Donk or Don't! Ages 8 and up." icon = 'icons/obj/gun_toy.dmi' @@ -204,10 +204,10 @@ list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=2, burst_accuracy=list(0,-2,-2), dispersion=null) ) -/obj/item/weapon/gun/projectile/automatic/toy/riot +/obj/item/gun/projectile/automatic/toy/riot magazine_type = /obj/item/ammo_magazine/mfoam_dart/smg/riot -/obj/item/weapon/gun/projectile/automatic/toy/update_icon() +/obj/item/gun/projectile/automatic/toy/update_icon() if(ammo_magazine) icon_state = initial(icon_state) else @@ -215,7 +215,7 @@ /* * Cyborg */ -/obj/item/weapon/gun/projectile/cyborgtoy +/obj/item/gun/projectile/cyborgtoy name = "\improper Donk-Soft " + JOB_CYBORG + " Blaster" desc = "Donk-Soft " + JOB_CYBORG + " Blaster! It's Donk or Don't! Adult supervision required. Use to toggle between battle and cleanup mode." icon = 'icons/obj/gun_toy.dmi' @@ -229,11 +229,11 @@ recoil = null handle_casings = null -/obj/item/weapon/gun/projectile/cyborgtoy/attack_self(var/mob/user) +/obj/item/gun/projectile/cyborgtoy/attack_self(var/mob/user) cleanup = !cleanup to_chat(user, "The [src] is now on [cleanup ? "cleanup" : "battle"] mode.") -/obj/item/weapon/gun/projectile/cyborgtoy/afterattack(atom/A, mob/living/user, adjacent, params) +/obj/item/gun/projectile/cyborgtoy/afterattack(atom/A, mob/living/user, adjacent, params) if(cleanup) if(!adjacent) return 0 @@ -241,7 +241,7 @@ return 0 ..() -/obj/item/weapon/gun/projectile/cyborgtoy/proc/collectammo(atom/A, user) +/obj/item/gun/projectile/cyborgtoy/proc/collectammo(atom/A, user) if(loaded.len >= max_shells) to_chat(user, "The [src] is at max capacity.") return @@ -261,7 +261,7 @@ /* * Laser Tag */ -/obj/item/weapon/gun/energy/lasertag +/obj/item/gun/energy/lasertag name = "laser tag gun" desc = "Standard issue weapon of the Imperial Guard." icon = 'icons/obj/gun_toy.dmi' @@ -270,18 +270,18 @@ origin_tech = list(TECH_COMBAT = 1, TECH_MAGNET = 2) matter = list(MAT_STEEL = 2000) projectile_type = /obj/item/projectile/beam/lasertag/blue - cell_type = /obj/item/weapon/cell/device/weapon/recharge + cell_type = /obj/item/cell/device/weapon/recharge battery_lock = 1 var/required_vest -/obj/item/weapon/gun/energy/lasertag/special_check(var/mob/living/carbon/human/M) +/obj/item/gun/energy/lasertag/special_check(var/mob/living/carbon/human/M) if(ishuman(M)) if(!istype(M.wear_suit, required_vest)) to_chat(M, "You need to be wearing your laser tag vest!") return 0 return ..() -/obj/item/weapon/gun/energy/lasertag/blue +/obj/item/gun/energy/lasertag/blue icon_state = "bluetag" item_state = "bluetag" projectile_type = /obj/item/projectile/beam/lasertag/blue @@ -293,13 +293,13 @@ list(mode_name="multi-hit rules", fire_delay=5, projectile_type=/obj/item/projectile/beam/lasertag/blue/multihit, charge_cost = 120), ) -/obj/item/weapon/gun/energy/lasertag/blue/sub +/obj/item/gun/energy/lasertag/blue/sub name = "Brigader Sidearm" desc = "A laser tag replica of the standard issue weapon for the Spacer Union Brigade from the hit series Spacer Trail (Blue Team)." icon_state = "bluetwo" item_state = "retro" -/obj/item/weapon/gun/energy/lasertag/red +/obj/item/gun/energy/lasertag/red icon_state = "redtag" item_state = "redtag" projectile_type = /obj/item/projectile/beam/lasertag/red @@ -311,11 +311,11 @@ list(mode_name="multi-hit rules", fire_delay=5, projectile_type=/obj/item/projectile/beam/lasertag/red/multihit, charge_cost = 120), ) -/obj/item/weapon/gun/energy/lasertag/red/dom +/obj/item/gun/energy/lasertag/red/dom name = "Mu'tu'bi sidearm" desc = "A laser tag replica of the Mu'tu'bi sidearm from the hit series Spacer Trail (Red Team)." icon_state = "redtwo" item_state = "retro" -/obj/item/weapon/gun/energy/lasertag/omni +/obj/item/gun/energy/lasertag/omni projectile_type = /obj/item/projectile/beam/lasertag/omni diff --git a/code/modules/projectiles/guns/vox.dm b/code/modules/projectiles/guns/vox.dm index 17f0b6e2405..8c849b0b668 100644 --- a/code/modules/projectiles/guns/vox.dm +++ b/code/modules/projectiles/guns/vox.dm @@ -3,7 +3,7 @@ * Alien pinning weapon. */ -/obj/item/weapon/gun/launcher/spikethrower +/obj/item/gun/launcher/spikethrower name = "spike thrower" desc = "A vicious alien projectile weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive." @@ -18,40 +18,40 @@ fire_sound = 'sound/weapons/bladeslice.ogg' fire_sound_text = "a strange noise" -/obj/item/weapon/gun/launcher/spikethrower/New() +/obj/item/gun/launcher/spikethrower/New() ..() START_PROCESSING(SSobj, src) last_regen = world.time -/obj/item/weapon/gun/launcher/spikethrower/Destroy() +/obj/item/gun/launcher/spikethrower/Destroy() STOP_PROCESSING(SSobj, src) ..() -/obj/item/weapon/gun/launcher/spikethrower/process() +/obj/item/gun/launcher/spikethrower/process() if(spikes < max_spikes && world.time > last_regen + spike_gen_time) spikes++ last_regen = world.time update_icon() -/obj/item/weapon/gun/launcher/spikethrower/examine(mob/user) +/obj/item/gun/launcher/spikethrower/examine(mob/user) . = ..() . += "It has [spikes] spike\s remaining." -/obj/item/weapon/gun/launcher/spikethrower/update_icon() +/obj/item/gun/launcher/spikethrower/update_icon() icon_state = "spikethrower[spikes]" -/obj/item/weapon/gun/launcher/spikethrower/update_release_force() +/obj/item/gun/launcher/spikethrower/update_release_force() return -/obj/item/weapon/gun/launcher/spikethrower/consume_next_projectile() +/obj/item/gun/launcher/spikethrower/consume_next_projectile() if(spikes < 1) return null spikes-- - return new /obj/item/weapon/spike(src) + return new /obj/item/spike(src) /* * Vox Darkmatter Cannon */ -/obj/item/weapon/gun/energy/darkmatter +/obj/item/gun/energy/darkmatter name = "dark matter gun" desc = "A vicious alien beam weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive." icon_state = "darkcannon" @@ -59,7 +59,7 @@ w_class = ITEMSIZE_HUGE charge_cost = 300 projectile_type = /obj/item/projectile/beam/stun/darkmatter - cell_type = /obj/item/weapon/cell/device/weapon/recharge + cell_type = /obj/item/cell/device/weapon/recharge battery_lock = 1 accuracy = 30 @@ -114,13 +114,13 @@ /* * Vox Sonic Cannon */ -/obj/item/weapon/gun/energy/sonic +/obj/item/gun/energy/sonic name = "soundcannon" desc = "A vicious alien sound weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive." icon_state = "noise" item_state = "noise" w_class = ITEMSIZE_HUGE - cell_type = /obj/item/weapon/cell/device/weapon/recharge + cell_type = /obj/item/cell/device/weapon/recharge battery_lock = 1 charge_cost = 400 diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index d8274ed23e0..f265da5f02e 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -578,7 +578,7 @@ var/mob/M = A if(istype(A, /mob/living)) //if they have a neck grab on someone, that person gets hit instead - var/obj/item/weapon/grab/G = locate() in M + var/obj/item/grab/G = locate() in M if(G && G.state >= GRAB_NECK) if(G.affecting.stat == DEAD) var/shield_chance = min(80, (30 * (M.mob_size / 10))) //Small mobs have a harder time keeping a dead body as a shield than a human-sized one. Unathi would have an easier job, if they are made to be SIZE_LARGE in the future. -Mech @@ -777,7 +777,7 @@ return fire(angle_override, direct_target) //called to launch a projectile from a gun -/obj/item/projectile/proc/launch_from_gun(atom/target, target_zone, mob/user, params, angle_override, forced_spread, obj/item/weapon/gun/launcher) +/obj/item/projectile/proc/launch_from_gun(atom/target, target_zone, mob/user, params, angle_override, forced_spread, obj/item/gun/launcher) shot_from = launcher.name silenced |= launcher.silenced // Silent bullets (e.g., BBs) are always silent diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 830a1fd6467..03d49db9a6e 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -471,7 +471,7 @@ ..() /obj/item/projectile/beam/energy_net/proc/do_net(var/mob/M) - var/obj/item/weapon/energy_net/net = new (get_turf(M)) + var/obj/item/energy_net/net = new (get_turf(M)) net.throw_impact(M) // diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm index d09b5f4fbc0..0ec50a4ee6b 100644 --- a/code/modules/projectiles/projectile/change.dm +++ b/code/modules/projectiles/projectile/change.dm @@ -24,7 +24,7 @@ qdel(Robot.mmi) else for(var/obj/item/W in M) - if(istype(W, /obj/item/weapon/implant)) //TODO: Carn. give implants a dropped() or something + if(istype(W, /obj/item/implant)) //TODO: Carn. give implants a dropped() or something qdel(W) continue M.drop_from_inventory(W) @@ -51,7 +51,7 @@ new_mob.invisibility = 0 new_mob.job = JOB_CYBORG var/mob/living/silicon/robot/Robot = new_mob - Robot.mmi = new /obj/item/device/mmi(new_mob) + Robot.mmi = new /obj/item/mmi(new_mob) Robot.mmi.transfer_identity(M) //Does not transfer key/client. if("slime") new_mob = new /mob/living/simple_mob/slime/xenobio(M.loc) diff --git a/code/modules/projectiles/projectile/hook.dm b/code/modules/projectiles/projectile/hook.dm index a6568e7b755..324ff8c5593 100644 --- a/code/modules/projectiles/projectile/hook.dm +++ b/code/modules/projectiles/projectile/hook.dm @@ -83,7 +83,7 @@ if(istype(H)) var/list/holding = list(H.get_active_hand() = 60, H.get_inactive_hand() = 40) - for(var/obj/item/weapon/gun/W in holding) // Guns are complex devices, both of a mechanical and electronic nature. A weird gravity ball or other type of object trying to pull or grab it is likely not safe. + for(var/obj/item/gun/W in holding) // Guns are complex devices, both of a mechanical and electronic nature. A weird gravity ball or other type of object trying to pull or grab it is likely not safe. if(W && prob(holding[W])) var/list/turfs = list() for(var/turf/T in view()) diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 7ccbabb2bb3..7e34d74f331 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -259,7 +259,7 @@ /obj/item/projectile/bola/on_hit(var/atom/target, var/blocked = 0) if(ishuman(target)) var/mob/living/carbon/human/M = target - var/obj/item/weapon/handcuffs/legcuffs/bola/B = new(src.loc) + var/obj/item/handcuffs/legcuffs/bola/B = new(src.loc) if(!B.place_legcuffs(M,firer)) if(B) qdel(B) diff --git a/code/modules/projectiles/targeting/targeting_gun.dm b/code/modules/projectiles/targeting/targeting_gun.dm index 3b806582262..b97027e2206 100644 --- a/code/modules/projectiles/targeting/targeting_gun.dm +++ b/code/modules/projectiles/targeting/targeting_gun.dm @@ -1,17 +1,17 @@ //Removing the lock and the buttons. -/obj/item/weapon/gun/dropped(var/mob/living/user) +/obj/item/gun/dropped(var/mob/living/user) if(istype(user)) user.stop_aiming(src) return ..() -/obj/item/weapon/gun/equipped(var/mob/living/user, var/slot) +/obj/item/gun/equipped(var/mob/living/user, var/slot) if(istype(user) && (slot != slot_l_hand && slot != slot_r_hand)) user.stop_aiming(src) return ..() //Compute how to fire..... //Return 1 if a target was found, 0 otherwise. -/obj/item/weapon/gun/proc/PreFire(var/atom/A, var/mob/living/user, var/params) +/obj/item/gun/proc/PreFire(var/atom/A, var/mob/living/user, var/params) if(!user.aiming) user.aiming = new(user) user.face_atom(A) diff --git a/code/modules/projectiles/targeting/targeting_overlay.dm b/code/modules/projectiles/targeting/targeting_overlay.dm index a732d3c8ef1..d53c5dd7ccf 100644 --- a/code/modules/projectiles/targeting/targeting_overlay.dm +++ b/code/modules/projectiles/targeting/targeting_overlay.dm @@ -174,7 +174,7 @@ to_chat(target, "If you fail to comply with your assailant, you accept the consequences of your actions.") aiming_with = thing aiming_at = target - if(istype(aiming_with, /obj/item/weapon/gun)) + if(istype(aiming_with, /obj/item/gun)) playsound(owner, 'sound/weapons/TargetOn.ogg', 50,1) forceMove(get_turf(target)) START_PROCESSING(SSobj, src) @@ -214,7 +214,7 @@ /obj/aiming_overlay/proc/cancel_aiming(var/no_message = 0) if(!aiming_with || !aiming_at) return - if(istype(aiming_with, /obj/item/weapon/gun)) + if(istype(aiming_with, /obj/item/gun)) playsound(owner, 'sound/weapons/TargetOff.ogg', 50,1) if(!no_message) owner.visible_message("\The [owner] lowers \the [aiming_with].") diff --git a/code/modules/projectiles/targeting/targeting_triggers.dm b/code/modules/projectiles/targeting/targeting_triggers.dm index d327ba8e8f9..67ac8f1fedd 100644 --- a/code/modules/projectiles/targeting/targeting_triggers.dm +++ b/code/modules/projectiles/targeting/targeting_triggers.dm @@ -24,7 +24,7 @@ to_chat(owner, "You refrain from firing \the [aiming_with] as your intent is set to help.") return owner.visible_message("\The [owner] pulls the trigger reflexively!") - var/obj/item/weapon/gun/G = aiming_with + var/obj/item/gun/G = aiming_with if(istype(G)) G.Fire(aiming_at, owner, reflex = 1) locked = 0 diff --git a/code/modules/random_map/drop/drop_types.dm b/code/modules/random_map/drop/drop_types.dm index 4d8c31a749d..793deb6a8f9 100644 --- a/code/modules/random_map/drop/drop_types.dm +++ b/code/modules/random_map/drop/drop_types.dm @@ -34,15 +34,15 @@ var/global/list/datum/supply_drop_loot/supply_drop /obj/item/clothing/head/helmet/laserproof, /obj/item/clothing/suit/armor/laserproof, /obj/item/clothing/glasses/sunglasses/sechud/tactical, - /obj/item/weapon/storage/belt/security/tactical/bandolier, + /obj/item/storage/belt/security/tactical/bandolier, /obj/item/clothing/accessory/storage/black_drop_pouches, - /obj/item/weapon/storage/backpack/dufflebag/sec, - /obj/item/weapon/shield/energy, - /obj/item/weapon/gun/energy/ionrifle, - /obj/item/weapon/gun/energy/xray, - /obj/item/weapon/storage/box/emps, - /obj/item/weapon/storage/box/flashbangs, - /obj/item/weapon/material/knife/tacknife/combatknife) + /obj/item/storage/backpack/dufflebag/sec, + /obj/item/shield/energy, + /obj/item/gun/energy/ionrifle, + /obj/item/gun/energy/xray, + /obj/item/storage/box/emps, + /obj/item/storage/box/flashbangs, + /obj/item/material/knife/tacknife/combatknife) /datum/supply_drop_loot/ballistics name = "Ballistic Warfare" @@ -55,18 +55,18 @@ var/global/list/datum/supply_drop_loot/supply_drop /obj/item/clothing/gloves/arm_guard/bulletproof, /obj/item/clothing/shoes/leg_guard/bulletproof, /obj/item/clothing/glasses/sunglasses/sechud/tactical, - /obj/item/weapon/storage/belt/security/tactical/bandolier, + /obj/item/storage/belt/security/tactical/bandolier, /obj/item/clothing/accessory/storage/black_drop_pouches, - /obj/item/weapon/storage/backpack/dufflebag/sec, - /obj/item/weapon/shield/riot/tele, - /obj/item/weapon/storage/box/emps, - /obj/item/weapon/storage/box/flashbangs, - /obj/item/weapon/gun/projectile/automatic/sts35, + /obj/item/storage/backpack/dufflebag/sec, + /obj/item/shield/riot/tele, + /obj/item/storage/box/emps, + /obj/item/storage/box/flashbangs, + /obj/item/gun/projectile/automatic/sts35, /obj/item/ammo_magazine/m762/ap, /obj/item/ammo_magazine/m762/ap, - /obj/item/weapon/gun/projectile/colt, + /obj/item/gun/projectile/colt, /obj/item/ammo_magazine/m45, - /obj/item/weapon/material/knife/tacknife/combatknife) + /obj/item/material/knife/tacknife/combatknife) /datum/supply_drop_loot/heavy_warfare name = "Heavy Warfare" @@ -79,22 +79,22 @@ var/global/list/datum/supply_drop_loot/supply_drop /obj/item/clothing/gloves/arm_guard/combat, /obj/item/clothing/shoes/leg_guard/combat, /obj/item/clothing/glasses/sunglasses/sechud/tactical, - /obj/item/weapon/storage/belt/security/tactical/bandolier, + /obj/item/storage/belt/security/tactical/bandolier, /obj/item/clothing/accessory/storage/black_drop_pouches, - /obj/item/weapon/storage/backpack/dufflebag/sec, - /obj/item/weapon/gun/projectile/automatic/bullpup, + /obj/item/storage/backpack/dufflebag/sec, + /obj/item/gun/projectile/automatic/bullpup, /obj/item/ammo_magazine/m762/ap, /obj/item/ammo_magazine/m762, - /obj/item/weapon/shield/energy, - /obj/item/weapon/grenade/explosive/frag, - /obj/item/weapon/grenade/explosive/frag, - /obj/item/weapon/grenade/smokebomb, - /obj/item/weapon/grenade/smokebomb, - /obj/item/weapon/grenade/flashbang, - /obj/item/weapon/grenade/flashbang, - /obj/item/weapon/grenade/empgrenade, - /obj/item/weapon/grenade/empgrenade, - /obj/item/weapon/material/knife/tacknife/combatknife) + /obj/item/shield/energy, + /obj/item/grenade/explosive/frag, + /obj/item/grenade/explosive/frag, + /obj/item/grenade/smokebomb, + /obj/item/grenade/smokebomb, + /obj/item/grenade/flashbang, + /obj/item/grenade/flashbang, + /obj/item/grenade/empgrenade, + /obj/item/grenade/empgrenade, + /obj/item/material/knife/tacknife/combatknife) /datum/supply_drop_loot/riot name = "Riot Gear" @@ -106,19 +106,19 @@ var/global/list/datum/supply_drop_loot/supply_drop /obj/item/clothing/suit/armor/riot, /obj/item/clothing/gloves/arm_guard/riot, /obj/item/clothing/shoes/leg_guard/riot, - /obj/item/weapon/shield/riot/tele, - /obj/item/weapon/storage/box/flashbangs, - /obj/item/weapon/storage/box/handcuffs, - /obj/item/weapon/melee/baton, + /obj/item/shield/riot/tele, + /obj/item/storage/box/flashbangs, + /obj/item/storage/box/handcuffs, + /obj/item/melee/baton, /obj/item/clothing/glasses/sunglasses/sechud/tactical, - /obj/item/weapon/storage/belt/security, + /obj/item/storage/belt/security, /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/gloves/black, - /obj/item/weapon/gun/projectile/shotgun/pump, - /obj/item/weapon/gun/energy/gun, + /obj/item/gun/projectile/shotgun/pump, + /obj/item/gun/energy/gun, /obj/item/clothing/accessory/holster, - /obj/item/weapon/gun/launcher/grenade, - /obj/item/weapon/storage/backpack/dufflebag/sec) + /obj/item/gun/launcher/grenade, + /obj/item/storage/backpack/dufflebag/sec) /datum/supply_drop_loot/seeds name = "Plant Growing" @@ -158,12 +158,12 @@ var/global/list/datum/supply_drop_loot/supply_drop /obj/item/seeds/sugarcaneseed, /obj/item/seeds/watermelonseed, /obj/item/seeds/cherryseed, - /obj/item/weapon/reagent_containers/glass/bottle/eznutrient, - /obj/item/weapon/reagent_containers/glass/bottle/eznutrient, - /obj/item/weapon/reagent_containers/glass/bottle/eznutrient, - /obj/item/weapon/reagent_containers/glass/bottle/eznutrient, - /obj/item/weapon/reagent_containers/glass/bottle/eznutrient, - /obj/item/weapon/reagent_containers/glass/bottle/eznutrient, + /obj/item/reagent_containers/glass/bottle/eznutrient, + /obj/item/reagent_containers/glass/bottle/eznutrient, + /obj/item/reagent_containers/glass/bottle/eznutrient, + /obj/item/reagent_containers/glass/bottle/eznutrient, + /obj/item/reagent_containers/glass/bottle/eznutrient, + /obj/item/reagent_containers/glass/bottle/eznutrient, /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/portable_atmospherics/hydroponics, @@ -171,8 +171,8 @@ var/global/list/datum/supply_drop_loot/supply_drop /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/portable_atmospherics/hydroponics, /obj/structure/reagent_dispensers/watertank, - /obj/item/weapon/reagent_containers/glass/bucket, - /obj/item/weapon/reagent_containers/glass/bucket) + /obj/item/reagent_containers/glass/bucket, + /obj/item/reagent_containers/glass/bucket) /datum/supply_drop_loot/food name = "Emergency Provisions For Two" @@ -180,27 +180,27 @@ var/global/list/datum/supply_drop_loot/supply_drop /datum/supply_drop_loot/food/New() ..() contents = list( - /obj/item/weapon/reagent_containers/food/snacks/liquidfood, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood, - /obj/item/weapon/reagent_containers/food/snacks/tastybread, - /obj/item/weapon/reagent_containers/food/snacks/tastybread, - /obj/item/weapon/reagent_containers/food/snacks/tastybread, - /obj/item/weapon/reagent_containers/food/snacks/tastybread, - /obj/item/weapon/reagent_containers/food/snacks/tastybread, - /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake, - /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake, - /obj/item/weapon/tool/crowbar, - /obj/item/weapon/tool/crowbar, - /obj/item/device/flashlight, - /obj/item/device/flashlight, + /obj/item/reagent_containers/food/snacks/liquidfood, + /obj/item/reagent_containers/food/snacks/liquidfood, + /obj/item/reagent_containers/food/snacks/liquidfood, + /obj/item/reagent_containers/food/snacks/liquidfood, + /obj/item/reagent_containers/food/snacks/liquidfood, + /obj/item/reagent_containers/food/snacks/liquidfood, + /obj/item/reagent_containers/food/snacks/tastybread, + /obj/item/reagent_containers/food/snacks/tastybread, + /obj/item/reagent_containers/food/snacks/tastybread, + /obj/item/reagent_containers/food/snacks/tastybread, + /obj/item/reagent_containers/food/snacks/tastybread, + /obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake, + /obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake, + /obj/item/tool/crowbar, + /obj/item/tool/crowbar, + /obj/item/flashlight, + /obj/item/flashlight, /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, - /obj/item/device/flashlight/flare, - /obj/item/device/flashlight/flare) + /obj/item/flashlight/flare, + /obj/item/flashlight/flare) /datum/supply_drop_loot/plushie name = "Cuddly Fun!" @@ -229,8 +229,8 @@ var/global/list/datum/supply_drop_loot/supply_drop /obj/item/toy/sword, /obj/item/toy/katana, /obj/item/toy/katana, - /obj/item/weapon/inflatable_duck, - /obj/item/weapon/inflatable_duck) + /obj/item/inflatable_duck, + /obj/item/inflatable_duck) /datum/supply_drop_loot/christmas name = "Surplus Christmas Supplies" @@ -309,15 +309,15 @@ var/global/list/datum/supply_drop_loot/supply_drop /datum/supply_drop_loot/medical/New() ..() contents = list( - /obj/item/weapon/storage/firstaid/regular, - /obj/item/weapon/storage/firstaid/fire, - /obj/item/weapon/storage/firstaid/toxin, - /obj/item/weapon/storage/firstaid/o2, - /obj/item/weapon/storage/firstaid/adv, - /obj/item/weapon/storage/firstaid/combat, - /obj/item/weapon/reagent_containers/glass/bottle/antitoxin, - /obj/item/weapon/reagent_containers/glass/bottle/antitoxin, - /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline, - /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline, - /obj/item/weapon/storage/box/syringes, - /obj/item/weapon/storage/box/autoinjectors) \ No newline at end of file + /obj/item/storage/firstaid/regular, + /obj/item/storage/firstaid/fire, + /obj/item/storage/firstaid/toxin, + /obj/item/storage/firstaid/o2, + /obj/item/storage/firstaid/adv, + /obj/item/storage/firstaid/combat, + /obj/item/reagent_containers/glass/bottle/antitoxin, + /obj/item/reagent_containers/glass/bottle/antitoxin, + /obj/item/reagent_containers/glass/bottle/inaprovaline, + /obj/item/reagent_containers/glass/bottle/inaprovaline, + /obj/item/storage/box/syringes, + /obj/item/storage/box/autoinjectors) \ No newline at end of file diff --git a/code/modules/random_map/drop/supply.dm b/code/modules/random_map/drop/supply.dm index d17f148654b..e4c2047d1f6 100644 --- a/code/modules/random_map/drop/supply.dm +++ b/code/modules/random_map/drop/supply.dm @@ -72,7 +72,7 @@ choice = tgui_alert(usr, "Do you wish to add weapons?","Supply Drop",list("No","Yes")) if(choice == "Yes") while(1) - var/adding_loot_type = tgui_input_list(usr, "Select a new loot path. Cancel to finish.", "Loot Selection", typesof(/obj/item/weapon)) + var/adding_loot_type = tgui_input_list(usr, "Select a new loot path. Cancel to finish.", "Loot Selection", typesof(/obj/item)) if(!adding_loot_type) break chosen_loot_types |= adding_loot_type diff --git a/code/modules/reagents/machinery/alembic.dm b/code/modules/reagents/machinery/alembic.dm index 78e9c7feb6a..6762927b1f0 100644 --- a/code/modules/reagents/machinery/alembic.dm +++ b/code/modules/reagents/machinery/alembic.dm @@ -31,8 +31,8 @@ icon_state = "alembic-bubble" return -/obj/machinery/alembic/attackby(var/obj/item/weapon/potion_material/O as obj, var/mob/user as mob) - if(istype(O,/obj/item/weapon/potion_material)) +/obj/machinery/alembic/attackby(var/obj/item/potion_material/O as obj, var/mob/user as mob) + if(istype(O,/obj/item/potion_material)) if(potion_reagent != 0 ) to_chat(user, SPAN_WARNING("There is already a reagent in the alembic!")) return @@ -46,7 +46,7 @@ to_chat(user, SPAN_NOTICE("You place the [O] in the alembic.")) src.updateUsrDialog() return - else if(istype(O,/obj/item/weapon/potion_base)) + else if(istype(O,/obj/item/potion_base)) if(base_reagent != 0 ) to_chat(user, SPAN_WARNING("There is already a base in the alembic!")) return @@ -102,220 +102,220 @@ if(istype(base_reagent,expected_base)) new product_potion(loc) else - var/failed_product = pick(/obj/item/weapon/reagent_containers/glass/bottle/potion/plain, - /obj/item/weapon/reagent_containers/glass/bottle/potion/ethanol, - /obj/item/weapon/reagent_containers/glass/bottle/potion/sugar, - /obj/item/weapon/reagent_containers/glass/bottle/potion/capsaicin, - /obj/item/weapon/reagent_containers/glass/bottle/potion/soporific, - /obj/item/weapon/reagent_containers/glass/bottle/potion/lipostipo, - /obj/item/weapon/reagent_containers/glass/bottle/potion/phoron) + var/failed_product = pick(/obj/item/reagent_containers/glass/bottle/potion/plain, + /obj/item/reagent_containers/glass/bottle/potion/ethanol, + /obj/item/reagent_containers/glass/bottle/potion/sugar, + /obj/item/reagent_containers/glass/bottle/potion/capsaicin, + /obj/item/reagent_containers/glass/bottle/potion/soporific, + /obj/item/reagent_containers/glass/bottle/potion/lipostipo, + /obj/item/reagent_containers/glass/bottle/potion/phoron) new failed_product(loc) //The actual ingredients! -/obj/item/weapon/potion_material +/obj/item/potion_material name = "blood ruby" desc = "An extremely hard but oddly brittle gem with a beautiful red colouration." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "blood_ruby" - var/base_reagent = /obj/item/weapon/potion_base/ichor - var/product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/healing + var/base_reagent = /obj/item/potion_base/ichor + var/product_potion = /obj/item/reagent_containers/glass/bottle/potion/healing -/obj/item/weapon/potion_material/blood_ruby +/obj/item/potion_material/blood_ruby -/obj/item/weapon/potion_material/ruby_eye +/obj/item/potion_material/ruby_eye name = "ruby eye" desc = "An odd gem in the shape of an eye, it has a strange static charge to the surface." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "ruby_eye" - base_reagent = /obj/item/weapon/potion_base/ichor - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/greater_healing + base_reagent = /obj/item/potion_base/ichor + product_potion = /obj/item/reagent_containers/glass/bottle/potion/greater_healing -/obj/item/weapon/potion_material/golden_scale +/obj/item/potion_material/golden_scale name = "golden scale" desc = "A reptilian scale with an almost metalic texture and a shining gold surface." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "golden_scale" - base_reagent = /obj/item/weapon/potion_base/alkahest - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/fire_resist + base_reagent = /obj/item/potion_base/alkahest + product_potion = /obj/item/reagent_containers/glass/bottle/potion/fire_resist -/obj/item/weapon/potion_material/frozen_dew +/obj/item/potion_material/frozen_dew name = "frozen dew" desc = "A bitter leaf with a small droplet of crystalised dew attached to it." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "frozen_dew" - base_reagent = /obj/item/weapon/potion_base/ichor - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/antidote + base_reagent = /obj/item/potion_base/ichor + product_potion = /obj/item/reagent_containers/glass/bottle/potion/antidote -/obj/item/weapon/potion_material/living_coral +/obj/item/potion_material/living_coral name = "living coral" desc = "Some coral that appears to be friving outside of the water, it has an oddly metallic scent." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "living_coral" - base_reagent = /obj/item/weapon/potion_base/aqua_regia - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/water + base_reagent = /obj/item/potion_base/aqua_regia + product_potion = /obj/item/reagent_containers/glass/bottle/potion/water -/obj/item/weapon/potion_material/rare_horn +/obj/item/potion_material/rare_horn name = "rare horn" desc = "A sharp, straight horn from some unknown animal." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "rare_horn" - base_reagent = /obj/item/weapon/potion_base/alkahest - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/regeneration + base_reagent = /obj/item/potion_base/alkahest + product_potion = /obj/item/reagent_containers/glass/bottle/potion/regeneration -/obj/item/weapon/potion_material/moldy_bread +/obj/item/potion_material/moldy_bread name = "moldy bread" desc = "A slice of bread that's clearly been left out for far too long." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "moldy_bread" - base_reagent = /obj/item/weapon/potion_base/aqua_regia - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/panacea + base_reagent = /obj/item/potion_base/aqua_regia + product_potion = /obj/item/reagent_containers/glass/bottle/potion/panacea -/obj/item/weapon/potion_material/glowing_gem +/obj/item/potion_material/glowing_gem name = "glowing gem" desc = "An pretty but rough gem that is literally glowing green, it tingles to touch." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "glowing_gem" - base_reagent = /obj/item/weapon/potion_base/alkahest - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/magic + base_reagent = /obj/item/potion_base/alkahest + product_potion = /obj/item/reagent_containers/glass/bottle/potion/magic -/obj/item/weapon/potion_material/giant_toe +/obj/item/potion_material/giant_toe name = "giant toe" desc = "One really large severed toe, in some state of suspended decomposition. It's gross and stinks." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "giant_toe" - base_reagent = /obj/item/weapon/potion_base/aqua_regia - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/lightness + base_reagent = /obj/item/potion_base/aqua_regia + product_potion = /obj/item/reagent_containers/glass/bottle/potion/lightness -/obj/item/weapon/potion_material/flesh_of_the_stars +/obj/item/potion_material/flesh_of_the_stars name = "flesh of the stars" desc = "A rare slab of meat with an unknown origin, said to have fallen from the sky." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "flesh_of_the_stars" - base_reagent = /obj/item/weapon/potion_base/aqua_regia - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/bonerepair + base_reagent = /obj/item/potion_base/aqua_regia + product_potion = /obj/item/reagent_containers/glass/bottle/potion/bonerepair -/obj/item/weapon/potion_material/spinning_poppy +/obj/item/potion_material/spinning_poppy name = "spinning poppy" desc = "A small poppy flower that seems inclined to twirl without aid." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "spinning_poppy" - base_reagent = /obj/item/weapon/potion_base/aqua_regia - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/pain + base_reagent = /obj/item/potion_base/aqua_regia + product_potion = /obj/item/reagent_containers/glass/bottle/potion/pain -/obj/item/weapon/potion_material/salt_mage +/obj/item/potion_material/salt_mage name = "salt mage" desc = "A statuette made from salt crystals, it's adorned with a little mages hat." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "salt_mage" - base_reagent = /obj/item/weapon/potion_base/alkahest - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/shrink + base_reagent = /obj/item/potion_base/alkahest + product_potion = /obj/item/reagent_containers/glass/bottle/potion/shrink -/obj/item/weapon/potion_material/golden_grapes +/obj/item/potion_material/golden_grapes name = "golden grapes" desc = "A bunch of grapes with a shining golden skin, they smell strongly of some sort of solvent." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "golden_grapes" - base_reagent = /obj/item/weapon/potion_base/alkahest - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/growth + base_reagent = /obj/item/potion_base/alkahest + product_potion = /obj/item/reagent_containers/glass/bottle/potion/growth -/obj/item/weapon/potion_material/fairy_house +/obj/item/potion_material/fairy_house name = "fairy house" desc = "A moderately large mushroom with a speckled red cap and... a door on the front?" icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "fairy_house" - base_reagent = /obj/item/weapon/potion_base/ichor - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/faerie + base_reagent = /obj/item/potion_base/ichor + product_potion = /obj/item/reagent_containers/glass/bottle/potion/faerie -/obj/item/weapon/potion_material/thorny_bulb +/obj/item/potion_material/thorny_bulb name = "thorny bulb" desc = "A flesh green plant bulb covered in thorns, it has a sulfur rich aroma." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "thorny_bulb" - base_reagent = /obj/item/weapon/potion_base/aqua_regia - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/relaxation + base_reagent = /obj/item/potion_base/aqua_regia + product_potion = /obj/item/reagent_containers/glass/bottle/potion/relaxation -/obj/item/weapon/potion_material/ancient_egg +/obj/item/potion_material/ancient_egg name = "ancient egg" desc = "An egg, but seemingly really really old and long past rotten." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "ancient_egg" - base_reagent = /obj/item/weapon/potion_base/aqua_regia - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/speed + base_reagent = /obj/item/potion_base/aqua_regia + product_potion = /obj/item/reagent_containers/glass/bottle/potion/speed -/obj/item/weapon/potion_material/crown_stem +/obj/item/potion_material/crown_stem name = "crown stem" desc = "An odd little flower that looks like a crown, the leaves have a minty aroma." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "crown_stem" - base_reagent = /obj/item/weapon/potion_base/alkahest - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/attractiveness + base_reagent = /obj/item/potion_base/alkahest + product_potion = /obj/item/reagent_containers/glass/bottle/potion/attractiveness -/obj/item/weapon/potion_material/red_ingot +/obj/item/potion_material/red_ingot name = "red ingot" desc = "An oddly red coloured block of iron, it seems rather brittle and wouldn't make for a good smithing material." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "red_ingot" - base_reagent = /obj/item/weapon/potion_base/alkahest - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/boyjuice + base_reagent = /obj/item/potion_base/alkahest + product_potion = /obj/item/reagent_containers/glass/bottle/potion/boyjuice -/obj/item/weapon/potion_material/soft_diamond +/obj/item/potion_material/soft_diamond name = "soft diamond" desc = "A gem that looks much like a diamond, but is squishy to the touch." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "soft_diamond" - base_reagent = /obj/item/weapon/potion_base/ichor - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/girljuice + base_reagent = /obj/item/potion_base/ichor + product_potion = /obj/item/reagent_containers/glass/bottle/potion/girljuice -/obj/item/weapon/potion_material/solid_mist +/obj/item/potion_material/solid_mist name = "solid mist" desc = "A small purple stone that seems to be radiating some sort of mist." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "solid_mist" - base_reagent = /obj/item/weapon/potion_base/ichor - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/badpolymorph + base_reagent = /obj/item/potion_base/ichor + product_potion = /obj/item/reagent_containers/glass/bottle/potion/badpolymorph -/obj/item/weapon/potion_material/spider_leg +/obj/item/potion_material/spider_leg name = "spider leg" desc = "A severed limb from a spider, it seems to be oozing with green... something." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "spider_leg" - base_reagent = /obj/item/weapon/potion_base/aqua_regia - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/SOP + base_reagent = /obj/item/potion_base/aqua_regia + product_potion = /obj/item/reagent_containers/glass/bottle/potion/SOP -/obj/item/weapon/potion_material/folded_dark +/obj/item/potion_material/folded_dark name = "folded dark" desc = "A folded material that appears to be made of pure dark." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "folded_dark" - base_reagent = /obj/item/weapon/potion_base/ichor - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/truepolymorph + base_reagent = /obj/item/potion_base/ichor + product_potion = /obj/item/reagent_containers/glass/bottle/potion/truepolymorph -/obj/item/weapon/potion_material/glamour_shard +/obj/item/potion_material/glamour_shard name = "glamour shard" desc = "A shard of hardened white crystal that seems to change shapes as you hold it." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "glamour_shard" - base_reagent = /obj/item/weapon/potion_base/aqua_regia - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/glamour + base_reagent = /obj/item/potion_base/aqua_regia + product_potion = /obj/item/reagent_containers/glass/bottle/potion/glamour //base ingredients -/obj/item/weapon/potion_base/aqua_regia +/obj/item/potion_base/aqua_regia name = "aqua regia" desc = "A mixture of concentrated acids, be careful not to spill it! A base ingredient of many potions." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "aqua_regia" w_class = ITEMSIZE_TINY -/obj/item/weapon/potion_base/ichor +/obj/item/potion_base/ichor name = "ichor" desc = "A thick and heavy red reagent said to be tinged with the blood of gods. A base ingredient of many potions." icon = 'icons/obj/chemical_potionreagents.dmi' icon_state = "ichor" w_class = ITEMSIZE_TINY -/obj/item/weapon/potion_base/alkahest +/obj/item/potion_base/alkahest name = "alkahest" desc = "Also known as the universal solvent, said to be capable of dissolving metal rapidly. A base ingredient of many potions." icon = 'icons/obj/chemical_potionreagents.dmi' diff --git a/code/modules/reagents/machinery/chem_master.dm b/code/modules/reagents/machinery/chem_master.dm index b5798262c7f..f0450804b31 100644 --- a/code/modules/reagents/machinery/chem_master.dm +++ b/code/modules/reagents/machinery/chem_master.dm @@ -6,11 +6,11 @@ unacidable = TRUE icon = 'icons/obj/chemical.dmi' icon_state = "mixer0" - circuit = /obj/item/weapon/circuitboard/chem_master + circuit = /obj/item/circuitboard/chem_master use_power = USE_POWER_IDLE idle_power_usage = 20 - var/obj/item/weapon/reagent_containers/beaker = null - var/obj/item/weapon/storage/pill_bottle/loaded_pill_bottle = null + var/obj/item/reagent_containers/beaker = null + var/obj/item/storage/pill_bottle/loaded_pill_bottle = null var/mode = 0 var/condi = 0 var/useramount = 15 // Last used amount @@ -42,9 +42,9 @@ /obj/machinery/chem_master/update_icon() icon_state = "mixer[beaker ? "1" : "0"]" -/obj/machinery/chem_master/attackby(var/obj/item/weapon/B as obj, var/mob/user as mob) +/obj/machinery/chem_master/attackby(var/obj/item/B as obj, var/mob/user as mob) - if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B, /obj/item/weapon/reagent_containers/food)) + if(istype(B, /obj/item/reagent_containers/glass) || istype(B, /obj/item/reagent_containers/food)) if(src.beaker) to_chat(user, "\A [beaker] is already loaded into the machine.") @@ -55,7 +55,7 @@ to_chat(user, "You add \the [B] to the machine.") update_icon() - else if(istype(B, /obj/item/weapon/storage/pill_bottle)) + else if(istype(B, /obj/item/storage/pill_bottle)) if(src.loaded_pill_bottle) to_chat(user, "A \the [loaded_pill_bottle] s already loaded into the machine.") @@ -281,7 +281,7 @@ return if(!length(answer)) answer = reagents.get_master_reagent_name() - var/obj/item/weapon/reagent_containers/pill/P = new(loc) + var/obj/item/reagent_containers/pill/P = new(loc) P.name = "[answer] pack" P.desc = "A small condiment pack. The label says it contains [answer]." P.icon_state = "bouilloncube"//Reskinned monkey cube @@ -301,7 +301,7 @@ to_chat(usr, "Not enough reagents to create these pills!") return - var/obj/item/weapon/reagent_containers/pill/P = new(loc) + var/obj/item/reagent_containers/pill/P = new(loc) P.name = "[answer] pill" P.pixel_x = rand(-7, 7) // Random position P.pixel_y = rand(-7, 7) @@ -337,7 +337,7 @@ to_chat(usr, "Not enough reagents to create these patches!") return - var/obj/item/weapon/reagent_containers/pill/patch/P = new(loc) + var/obj/item/reagent_containers/pill/patch/P = new(loc) P.name = "[answer] patch" P.pixel_x = rand(-7, 7) // random position P.pixel_y = rand(-7, 7) @@ -363,7 +363,7 @@ if(reagents.total_volume <= 0) to_chat(usr, "Not enough reagents to create these bottles!") return - var/obj/item/weapon/reagent_containers/glass/bottle/P = new(loc) + var/obj/item/reagent_containers/glass/bottle/P = new(loc) P.name = "[answer] bottle" P.pixel_x = rand(-7, 7) // random position P.pixel_y = rand(-7, 7) @@ -420,7 +420,7 @@ visible_message("[src] rattles and prints out a sheet of paper.") // playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(loc) + var/obj/item/paper/P = new /obj/item/paper(loc) P.info = "
Chemical Analysis

" P.info += "Time of analysis: [worldtime2stationtime(world.time)]

" P.info += "Chemical name: [R.name]
" @@ -469,7 +469,7 @@ if("create_condi_bottle") if(!condi || !reagents.total_volume) return - var/obj/item/weapon/reagent_containers/food/condiment/P = new(loc) + var/obj/item/reagent_containers/food/condiment/P = new(loc) reagents.trans_to_obj(P, 50) else return FALSE diff --git a/code/modules/reagents/machinery/chemalyzer.dm b/code/modules/reagents/machinery/chemalyzer.dm index ce8b1d6f12d..de59088c51f 100644 --- a/code/modules/reagents/machinery/chemalyzer.dm +++ b/code/modules/reagents/machinery/chemalyzer.dm @@ -27,7 +27,7 @@ if(default_deconstruction_crowbar(user, I)) return - if(istype(I,/obj/item/weapon/reagent_containers)) + if(istype(I,/obj/item/reagent_containers)) analyzing = TRUE update_icon() to_chat(user, span("notice", "Analyzing \the [I], please stand by...")) @@ -53,7 +53,7 @@ to_chat(user, span("notice", "Contains [R.volume]u of [R.name].
[R.description]
")) // Last, unseal it if it's an autoinjector. - if(istype(I,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector) && !(I.flags & OPENCONTAINER)) + if(istype(I,/obj/item/reagent_containers/hypospray/autoinjector/biginjector) && !(I.flags & OPENCONTAINER)) I.flags |= OPENCONTAINER to_chat(user, span("notice", "Sample container unsealed.
")) diff --git a/code/modules/reagents/machinery/dispenser/cartridge.dm b/code/modules/reagents/machinery/dispenser/cartridge.dm index ded38cf561c..5af1388dee4 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/reagent_containers/chem_disp_cartridge +/obj/item/reagent_containers/chem_disp_cartridge name = "chemical dispenser cartridge" desc = "This goes in a chemical dispenser." icon_state = "cartridge" @@ -14,14 +14,14 @@ var/spawn_reagent = null var/label = "" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/Initialize() +/obj/item/reagent_containers/chem_disp_cartridge/Initialize() . = ..() if(spawn_reagent) reagents.add_reagent(spawn_reagent, volume) var/datum/reagent/R = SSchemistry.chemical_reagents[spawn_reagent] setLabel(R.name) -/obj/item/weapon/reagent_containers/chem_disp_cartridge/examine(mob/user) +/obj/item/reagent_containers/chem_disp_cartridge/examine(mob/user) . = ..() . += "It has a capacity of [volume] units." if(reagents.total_volume <= 0) @@ -31,14 +31,14 @@ if(!is_open_container()) . += "The cap is sealed." -/obj/item/weapon/reagent_containers/chem_disp_cartridge/verb/verb_set_label(L as text) +/obj/item/reagent_containers/chem_disp_cartridge/verb/verb_set_label(L as text) set name = "Set Cartridge Label" set category = "Object" set src in view(usr, 1) setLabel(L, usr) -/obj/item/weapon/reagent_containers/chem_disp_cartridge/proc/setLabel(L, mob/user = null) +/obj/item/reagent_containers/chem_disp_cartridge/proc/setLabel(L, mob/user = null) if(L) if(user) to_chat(user, "You set the label on \the [src] to '[L]'.") @@ -51,7 +51,7 @@ label = "" name = initial(name) -/obj/item/weapon/reagent_containers/chem_disp_cartridge/attack_self() +/obj/item/reagent_containers/chem_disp_cartridge/attack_self() ..() if (is_open_container()) to_chat(usr, "You put the cap on \the [src].") @@ -60,7 +60,7 @@ to_chat(usr, "You take the cap off \the [src].") flags |= OPENCONTAINER -/obj/item/weapon/reagent_containers/chem_disp_cartridge/afterattack(obj/target, mob/user , flag) +/obj/item/reagent_containers/chem_disp_cartridge/afterattack(obj/target, mob/user , flag) if (!is_open_container() || !flag) return diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm index 07c41ba9400..9dfc3ac0d98 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm @@ -1,205 +1,205 @@ -/obj/item/weapon/reagent_containers/chem_disp_cartridge/small +/obj/item/reagent_containers/chem_disp_cartridge/small volume = CARTRIDGE_VOLUME_SMALL -/obj/item/weapon/reagent_containers/chem_disp_cartridge/medium +/obj/item/reagent_containers/chem_disp_cartridge/medium volume = CARTRIDGE_VOLUME_MEDIUM // Multiple -/obj/item/weapon/reagent_containers/chem_disp_cartridge/water +/obj/item/reagent_containers/chem_disp_cartridge/water spawn_reagent = "water" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar +/obj/item/reagent_containers/chem_disp_cartridge/sugar spawn_reagent = "sugar" // Chemistry -/obj/item/weapon/reagent_containers/chem_disp_cartridge/hydrogen +/obj/item/reagent_containers/chem_disp_cartridge/hydrogen spawn_reagent = "hydrogen" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/lithium +/obj/item/reagent_containers/chem_disp_cartridge/lithium spawn_reagent = "lithium" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/carbon +/obj/item/reagent_containers/chem_disp_cartridge/carbon spawn_reagent = "carbon" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/nitrogen +/obj/item/reagent_containers/chem_disp_cartridge/nitrogen spawn_reagent = "nitrogen" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/oxygen +/obj/item/reagent_containers/chem_disp_cartridge/oxygen spawn_reagent = "oxygen" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/fluorine +/obj/item/reagent_containers/chem_disp_cartridge/fluorine spawn_reagent = "fluorine" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/sodium +/obj/item/reagent_containers/chem_disp_cartridge/sodium spawn_reagent = "sodium" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/aluminum +/obj/item/reagent_containers/chem_disp_cartridge/aluminum spawn_reagent = "aluminum" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/silicon +/obj/item/reagent_containers/chem_disp_cartridge/silicon spawn_reagent = "silicon" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/phosphorus +/obj/item/reagent_containers/chem_disp_cartridge/phosphorus spawn_reagent = "phosphorus" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/sulfur +/obj/item/reagent_containers/chem_disp_cartridge/sulfur spawn_reagent = "sulfur" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/chlorine +/obj/item/reagent_containers/chem_disp_cartridge/chlorine spawn_reagent = "chlorine" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/potassium +/obj/item/reagent_containers/chem_disp_cartridge/potassium spawn_reagent = "potassium" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/iron +/obj/item/reagent_containers/chem_disp_cartridge/iron spawn_reagent = "iron" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/copper +/obj/item/reagent_containers/chem_disp_cartridge/copper spawn_reagent = "copper" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/mercury +/obj/item/reagent_containers/chem_disp_cartridge/mercury spawn_reagent = "mercury" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/radium +/obj/item/reagent_containers/chem_disp_cartridge/radium spawn_reagent = "radium" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/ethanol +/obj/item/reagent_containers/chem_disp_cartridge/ethanol spawn_reagent = "ethanol" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/sacid +/obj/item/reagent_containers/chem_disp_cartridge/sacid spawn_reagent = "sacid" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/tungsten +/obj/item/reagent_containers/chem_disp_cartridge/tungsten spawn_reagent = "tungsten" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/calcium +/obj/item/reagent_containers/chem_disp_cartridge/calcium spawn_reagent = "calcium" // Bar, alcoholic -/obj/item/weapon/reagent_containers/chem_disp_cartridge/beer +/obj/item/reagent_containers/chem_disp_cartridge/beer spawn_reagent = "beer" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua +/obj/item/reagent_containers/chem_disp_cartridge/kahlua spawn_reagent = "kahlua" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey +/obj/item/reagent_containers/chem_disp_cartridge/whiskey spawn_reagent = "whiskey" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine +/obj/item/reagent_containers/chem_disp_cartridge/redwine spawn_reagent = "redwine" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine +/obj/item/reagent_containers/chem_disp_cartridge/whitewine spawn_reagent = "whitewine" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka +/obj/item/reagent_containers/chem_disp_cartridge/vodka spawn_reagent = "vodka" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/gin +/obj/item/reagent_containers/chem_disp_cartridge/gin spawn_reagent = "gin" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/rum +/obj/item/reagent_containers/chem_disp_cartridge/rum spawn_reagent = "rum" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/tequila +/obj/item/reagent_containers/chem_disp_cartridge/tequila spawn_reagent = "tequilla" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/vermouth +/obj/item/reagent_containers/chem_disp_cartridge/vermouth spawn_reagent = "vermouth" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/cognac +/obj/item/reagent_containers/chem_disp_cartridge/cognac spawn_reagent = "cognac" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/ale +/obj/item/reagent_containers/chem_disp_cartridge/ale spawn_reagent = "ale" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/mead +/obj/item/reagent_containers/chem_disp_cartridge/mead spawn_reagent = "mead" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/bitters +/obj/item/reagent_containers/chem_disp_cartridge/bitters spawn_reagent = "bitters" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/cider +/obj/item/reagent_containers/chem_disp_cartridge/cider spawn_reagent = "cider" // Bar, soft -/obj/item/weapon/reagent_containers/chem_disp_cartridge/ice +/obj/item/reagent_containers/chem_disp_cartridge/ice spawn_reagent = "ice" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/tea +/obj/item/reagent_containers/chem_disp_cartridge/tea spawn_reagent = "tea" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/icetea +/obj/item/reagent_containers/chem_disp_cartridge/icetea spawn_reagent = "icetea" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/cola +/obj/item/reagent_containers/chem_disp_cartridge/cola spawn_reagent = "cola" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/smw +/obj/item/reagent_containers/chem_disp_cartridge/smw spawn_reagent = "spacemountainwind" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/dr_gibb +/obj/item/reagent_containers/chem_disp_cartridge/dr_gibb spawn_reagent = "dr_gibb" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/spaceup +/obj/item/reagent_containers/chem_disp_cartridge/spaceup spawn_reagent = "space_up" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/tonic +/obj/item/reagent_containers/chem_disp_cartridge/tonic spawn_reagent = "tonic" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/sodawater +/obj/item/reagent_containers/chem_disp_cartridge/sodawater spawn_reagent = "sodawater" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon_lime +/obj/item/reagent_containers/chem_disp_cartridge/lemon_lime spawn_reagent = "lemon_lime" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/orange +/obj/item/reagent_containers/chem_disp_cartridge/orange spawn_reagent = "orangejuice" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/lime +/obj/item/reagent_containers/chem_disp_cartridge/lime spawn_reagent = "limejuice" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/watermelon +/obj/item/reagent_containers/chem_disp_cartridge/watermelon spawn_reagent = "watermelonjuice" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon +/obj/item/reagent_containers/chem_disp_cartridge/lemon spawn_reagent = "lemonjuice" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/grapesoda +/obj/item/reagent_containers/chem_disp_cartridge/grapesoda spawn_reagent = "grapesoda" // Bar, coffee -/obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee +/obj/item/reagent_containers/chem_disp_cartridge/coffee spawn_reagent = "coffee" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/cafe_latte +/obj/item/reagent_containers/chem_disp_cartridge/cafe_latte spawn_reagent = "cafe_latte" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/soy_latte +/obj/item/reagent_containers/chem_disp_cartridge/soy_latte spawn_reagent = "soy_latte" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/hot_coco +/obj/item/reagent_containers/chem_disp_cartridge/hot_coco spawn_reagent = "hot_coco" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/milk +/obj/item/reagent_containers/chem_disp_cartridge/milk spawn_reagent = "milk" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/cream +/obj/item/reagent_containers/chem_disp_cartridge/cream spawn_reagent = "cream" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/mint +/obj/item/reagent_containers/chem_disp_cartridge/mint spawn_reagent = "mint" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/berry +/obj/item/reagent_containers/chem_disp_cartridge/berry spawn_reagent = "berryjuice" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/greentea +/obj/item/reagent_containers/chem_disp_cartridge/greentea spawn_reagent = "greentea" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/decaf +/obj/item/reagent_containers/chem_disp_cartridge/decaf spawn_reagent = "decaf" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/chaitea +/obj/item/reagent_containers/chem_disp_cartridge/chaitea spawn_reagent = "chaitea" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/decafchai +/obj/item/reagent_containers/chem_disp_cartridge/decafchai spawn_reagent = "chaiteadecaf" // ERT -/obj/item/weapon/reagent_containers/chem_disp_cartridge/inaprov +/obj/item/reagent_containers/chem_disp_cartridge/inaprov spawn_reagent = "inaprovaline" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/ryetalyn +/obj/item/reagent_containers/chem_disp_cartridge/ryetalyn spawn_reagent = "ryetalyn" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/paracetamol +/obj/item/reagent_containers/chem_disp_cartridge/paracetamol spawn_reagent = "paracetamol" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/tramadol +/obj/item/reagent_containers/chem_disp_cartridge/tramadol spawn_reagent = "tramadol" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/oxycodone +/obj/item/reagent_containers/chem_disp_cartridge/oxycodone spawn_reagent = "oxycodone" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/sterilizine +/obj/item/reagent_containers/chem_disp_cartridge/sterilizine spawn_reagent = "sterilizine" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/leporazine +/obj/item/reagent_containers/chem_disp_cartridge/leporazine spawn_reagent = "leporazine" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/kelotane +/obj/item/reagent_containers/chem_disp_cartridge/kelotane spawn_reagent = "kelotane" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/dermaline +/obj/item/reagent_containers/chem_disp_cartridge/dermaline spawn_reagent = "dermaline" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/dexalin +/obj/item/reagent_containers/chem_disp_cartridge/dexalin spawn_reagent = "dexalin" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/dexalin/small +/obj/item/reagent_containers/chem_disp_cartridge/dexalin/small volume = CARTRIDGE_VOLUME_SMALL // For the medicine cartridge crate, so it's not too easy to get large amounts of dexalin -/obj/item/weapon/reagent_containers/chem_disp_cartridge/dexalin_p +/obj/item/reagent_containers/chem_disp_cartridge/dexalin_p spawn_reagent = "dexalinp" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/tricord +/obj/item/reagent_containers/chem_disp_cartridge/tricord spawn_reagent = "tricordrazine" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/dylovene +/obj/item/reagent_containers/chem_disp_cartridge/dylovene spawn_reagent = "anti_toxin" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/synaptizine +/obj/item/reagent_containers/chem_disp_cartridge/synaptizine spawn_reagent = "synaptizine" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/hyronalin +/obj/item/reagent_containers/chem_disp_cartridge/hyronalin spawn_reagent = "hyronalin" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/arithrazine +/obj/item/reagent_containers/chem_disp_cartridge/arithrazine spawn_reagent = "arithrazine" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/alkysine +/obj/item/reagent_containers/chem_disp_cartridge/alkysine spawn_reagent = "alkysine" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/imidazoline +/obj/item/reagent_containers/chem_disp_cartridge/imidazoline spawn_reagent = "imidazoline" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/peridaxon +/obj/item/reagent_containers/chem_disp_cartridge/peridaxon spawn_reagent = "peridaxon" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/bicaridine +/obj/item/reagent_containers/chem_disp_cartridge/bicaridine spawn_reagent = "bicaridine" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/hyperzine +/obj/item/reagent_containers/chem_disp_cartridge/hyperzine spawn_reagent = "hyperzine" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/rezadone +/obj/item/reagent_containers/chem_disp_cartridge/rezadone spawn_reagent = "rezadone" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/spaceacillin +/obj/item/reagent_containers/chem_disp_cartridge/spaceacillin spawn_reagent = "spaceacillin" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/ethylredox +/obj/item/reagent_containers/chem_disp_cartridge/ethylredox spawn_reagent = "ethylredoxrazine" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/sleeptox +/obj/item/reagent_containers/chem_disp_cartridge/sleeptox spawn_reagent = "stoxin" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/chloral +/obj/item/reagent_containers/chem_disp_cartridge/chloral spawn_reagent = "chloralhydrate" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/cryoxadone +/obj/item/reagent_containers/chem_disp_cartridge/cryoxadone spawn_reagent = "cryoxadone" -/obj/item/weapon/reagent_containers/chem_disp_cartridge/clonexadone +/obj/item/reagent_containers/chem_disp_cartridge/clonexadone spawn_reagent = "clonexadone" diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm index 50c3f6d3998..abd54931b71 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/reagent_containers/chem_disp_cartridge +/obj/item/reagent_containers/chem_disp_cartridge //Xenoflora ammonia spawn_reagent = "ammonia" diethylamine spawn_reagent = "diethylamine" diff --git a/code/modules/reagents/machinery/dispenser/cartridge_spawn.dm b/code/modules/reagents/machinery/dispenser/cartridge_spawn.dm index ba9b7270477..00287e83734 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge_spawn.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge_spawn.dm @@ -2,11 +2,11 @@ set name = "Spawn Chemical Dispenser Cartridge" set category = "Admin" - var/obj/item/weapon/reagent_containers/chem_disp_cartridge/C + var/obj/item/reagent_containers/chem_disp_cartridge/C switch(size) - if("small") C = new /obj/item/weapon/reagent_containers/chem_disp_cartridge/small(usr.loc) - if("medium") C = new /obj/item/weapon/reagent_containers/chem_disp_cartridge/medium(usr.loc) - if("large") C = new /obj/item/weapon/reagent_containers/chem_disp_cartridge(usr.loc) + if("small") C = new /obj/item/reagent_containers/chem_disp_cartridge/small(usr.loc) + if("medium") C = new /obj/item/reagent_containers/chem_disp_cartridge/medium(usr.loc) + if("large") C = new /obj/item/reagent_containers/chem_disp_cartridge(usr.loc) C.reagents.add_reagent(reagent, C.volume) var/datum/reagent/R = SSchemistry.chemical_reagents[reagent] C.setLabel(R.name) diff --git a/code/modules/reagents/machinery/dispenser/dispenser2.dm b/code/modules/reagents/machinery/dispenser/dispenser2.dm index 2531566b0be..6e2e6e42fd8 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser2.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser2.dm @@ -8,7 +8,7 @@ var/list/spawn_cartridges = null // Set to a list of types to spawn one of each on New() var/list/cartridges = list() // Associative, label -> cartridge - var/obj/item/weapon/reagent_containers/container = null + var/obj/item/reagent_containers/container = null var/ui_title = "Chemical Dispenser" @@ -60,7 +60,7 @@ return 1 //VOREstation edit end -/obj/machinery/chemical_dispenser/proc/add_cartridge(obj/item/weapon/reagent_containers/chem_disp_cartridge/C, mob/user) +/obj/machinery/chemical_dispenser/proc/add_cartridge(obj/item/reagent_containers/chem_disp_cartridge/C, mob/user) if(!istype(C)) if(user) to_chat(user, "\The [C] will not fit in \the [src]!") @@ -95,7 +95,7 @@ cartridges -= label SStgui.update_uis(src) -/obj/machinery/chemical_dispenser/attackby(obj/item/weapon/W, mob/user) +/obj/machinery/chemical_dispenser/attackby(obj/item/W, mob/user) if(W.has_tool_quality(TOOL_WRENCH)) playsound(src, W.usesound, 50, 1) to_chat(user, "You begin to [anchored ? "un" : ""]fasten \the [src].") @@ -108,26 +108,26 @@ else to_chat(user, "You decide not to [anchored ? "un" : ""]fasten \the [src].") - else if(istype(W, /obj/item/weapon/reagent_containers/chem_disp_cartridge)) + else if(istype(W, /obj/item/reagent_containers/chem_disp_cartridge)) add_cartridge(W, user) else if(W.has_tool_quality(TOOL_SCREWDRIVER)) var/label = tgui_input_list(user, "Which cartridge would you like to remove?", "Chemical Dispenser", cartridges) if(!label) return - var/obj/item/weapon/reagent_containers/chem_disp_cartridge/C = remove_cartridge(label) + var/obj/item/reagent_containers/chem_disp_cartridge/C = remove_cartridge(label) if(C) to_chat(user, "You remove \the [C] from \the [src].") C.loc = loc playsound(src, W.usesound, 50, 1) - else if(istype(W, /obj/item/weapon/reagent_containers/glass) || istype(W, /obj/item/weapon/reagent_containers/food)) + else if(istype(W, /obj/item/reagent_containers/glass) || istype(W, /obj/item/reagent_containers/food)) if(container) to_chat(user, "There is already \a [container] on \the [src]!") return - var/obj/item/weapon/reagent_containers/RC = W + var/obj/item/reagent_containers/RC = W - if(!accept_drinking && istype(RC,/obj/item/weapon/reagent_containers/food)) + if(!accept_drinking && istype(RC,/obj/item/reagent_containers/food)) to_chat(user, "This machine only accepts beakers!") return @@ -169,7 +169,7 @@ var/chemicals[0] for(var/label in cartridges) - var/obj/item/weapon/reagent_containers/chem_disp_cartridge/C = cartridges[label] + var/obj/item/reagent_containers/chem_disp_cartridge/C = cartridges[label] chemicals.Add(list(list("name" = label, "id" = label, "volume" = C.reagents.total_volume))) // list in a list because Byond merges the first list... data["chemicals"] = chemicals @@ -196,7 +196,7 @@ if(recording_recipe) recording_recipe += list(list("id" = label, "amount" = amount)) else if(cartridges[label] && container && container.is_open_container()) - var/obj/item/weapon/reagent_containers/chem_disp_cartridge/C = cartridges[label] + var/obj/item/reagent_containers/chem_disp_cartridge/C = cartridges[label] playsound(src, 'sound/machines/reagent_dispense.ogg', 25, 1) C.reagents.trans_to(container, amount) . = TRUE @@ -267,7 +267,7 @@ var/label = L["id"] var/dispense_amount = L["amount"] - var/obj/item/weapon/reagent_containers/chem_disp_cartridge/C = cartridges[label] + var/obj/item/reagent_containers/chem_disp_cartridge/C = cartridges[label] if(!C) visible_message(span_warning("[src] buzzes."), span_warning("You hear a faint buzz.")) to_chat(ui.user, span_warning("[src] cannot find [label]!")) diff --git a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm index 91c24d77068..dfb16c3391e 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm @@ -18,7 +18,7 @@ stack_trace("[src] at [x],[y],[z] failed to find reagent '[id]'!") dispense_reagents -= id continue - var/obj/item/weapon/reagent_containers/chem_disp_cartridge/C = cartridges[R.name] + var/obj/item/reagent_containers/chem_disp_cartridge/C = cartridges[R.name] if(C && C.reagents.total_volume < C.reagents.maximum_volume) var/to_restore = min(C.reagents.maximum_volume - C.reagents.total_volume, 5) use_power(to_restore * 500) diff --git a/code/modules/reagents/machinery/dispenser/dispenser_presets.dm b/code/modules/reagents/machinery/dispenser/dispenser_presets.dm index 916c506a2e8..65523e16f35 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser_presets.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser_presets.dm @@ -1,61 +1,61 @@ /obj/machinery/chemical_dispenser/full spawn_cartridges = list( - /obj/item/weapon/reagent_containers/chem_disp_cartridge/hydrogen, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lithium, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/carbon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/nitrogen, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/oxygen, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/fluorine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sodium, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/aluminum, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/silicon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/phosphorus, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sulfur, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/chlorine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/potassium, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/iron, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/copper, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/mercury, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/radium, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/water, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ethanol, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sacid, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tungsten, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/calcium + /obj/item/reagent_containers/chem_disp_cartridge/hydrogen, + /obj/item/reagent_containers/chem_disp_cartridge/lithium, + /obj/item/reagent_containers/chem_disp_cartridge/carbon, + /obj/item/reagent_containers/chem_disp_cartridge/nitrogen, + /obj/item/reagent_containers/chem_disp_cartridge/oxygen, + /obj/item/reagent_containers/chem_disp_cartridge/fluorine, + /obj/item/reagent_containers/chem_disp_cartridge/sodium, + /obj/item/reagent_containers/chem_disp_cartridge/aluminum, + /obj/item/reagent_containers/chem_disp_cartridge/silicon, + /obj/item/reagent_containers/chem_disp_cartridge/phosphorus, + /obj/item/reagent_containers/chem_disp_cartridge/sulfur, + /obj/item/reagent_containers/chem_disp_cartridge/chlorine, + /obj/item/reagent_containers/chem_disp_cartridge/potassium, + /obj/item/reagent_containers/chem_disp_cartridge/iron, + /obj/item/reagent_containers/chem_disp_cartridge/copper, + /obj/item/reagent_containers/chem_disp_cartridge/mercury, + /obj/item/reagent_containers/chem_disp_cartridge/radium, + /obj/item/reagent_containers/chem_disp_cartridge/water, + /obj/item/reagent_containers/chem_disp_cartridge/ethanol, + /obj/item/reagent_containers/chem_disp_cartridge/sugar, + /obj/item/reagent_containers/chem_disp_cartridge/sacid, + /obj/item/reagent_containers/chem_disp_cartridge/tungsten, + /obj/item/reagent_containers/chem_disp_cartridge/calcium ) /obj/machinery/chemical_dispenser/ert name = "medicine dispenser" spawn_cartridges = list( - /obj/item/weapon/reagent_containers/chem_disp_cartridge/inaprov, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ryetalyn, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/paracetamol, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tramadol, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/oxycodone, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sterilizine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/leporazine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/kelotane, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/dermaline, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/dexalin, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/dexalin_p, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tricord, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/dylovene, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/synaptizine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/hyronalin, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/arithrazine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/alkysine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/imidazoline, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/peridaxon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/bicaridine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/hyperzine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/rezadone, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/spaceacillin, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ethylredox, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sleeptox, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/chloral, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cryoxadone, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/clonexadone + /obj/item/reagent_containers/chem_disp_cartridge/inaprov, + /obj/item/reagent_containers/chem_disp_cartridge/ryetalyn, + /obj/item/reagent_containers/chem_disp_cartridge/paracetamol, + /obj/item/reagent_containers/chem_disp_cartridge/tramadol, + /obj/item/reagent_containers/chem_disp_cartridge/oxycodone, + /obj/item/reagent_containers/chem_disp_cartridge/sterilizine, + /obj/item/reagent_containers/chem_disp_cartridge/leporazine, + /obj/item/reagent_containers/chem_disp_cartridge/kelotane, + /obj/item/reagent_containers/chem_disp_cartridge/dermaline, + /obj/item/reagent_containers/chem_disp_cartridge/dexalin, + /obj/item/reagent_containers/chem_disp_cartridge/dexalin_p, + /obj/item/reagent_containers/chem_disp_cartridge/tricord, + /obj/item/reagent_containers/chem_disp_cartridge/dylovene, + /obj/item/reagent_containers/chem_disp_cartridge/synaptizine, + /obj/item/reagent_containers/chem_disp_cartridge/hyronalin, + /obj/item/reagent_containers/chem_disp_cartridge/arithrazine, + /obj/item/reagent_containers/chem_disp_cartridge/alkysine, + /obj/item/reagent_containers/chem_disp_cartridge/imidazoline, + /obj/item/reagent_containers/chem_disp_cartridge/peridaxon, + /obj/item/reagent_containers/chem_disp_cartridge/bicaridine, + /obj/item/reagent_containers/chem_disp_cartridge/hyperzine, + /obj/item/reagent_containers/chem_disp_cartridge/rezadone, + /obj/item/reagent_containers/chem_disp_cartridge/spaceacillin, + /obj/item/reagent_containers/chem_disp_cartridge/ethylredox, + /obj/item/reagent_containers/chem_disp_cartridge/sleeptox, + /obj/item/reagent_containers/chem_disp_cartridge/chloral, + /obj/item/reagent_containers/chem_disp_cartridge/cryoxadone, + /obj/item/reagent_containers/chem_disp_cartridge/clonexadone ) /obj/machinery/chemical_dispenser/bar_soft @@ -67,25 +67,25 @@ /obj/machinery/chemical_dispenser/bar_soft/full spawn_cartridges = list( - /obj/item/weapon/reagent_containers/chem_disp_cartridge/water, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ice, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cream, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/icetea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cola, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/smw, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/dr_gibb, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/spaceup, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tonic, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sodawater, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon_lime, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/watermelon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/grapesoda + /obj/item/reagent_containers/chem_disp_cartridge/water, + /obj/item/reagent_containers/chem_disp_cartridge/ice, + /obj/item/reagent_containers/chem_disp_cartridge/coffee, + /obj/item/reagent_containers/chem_disp_cartridge/cream, + /obj/item/reagent_containers/chem_disp_cartridge/tea, + /obj/item/reagent_containers/chem_disp_cartridge/icetea, + /obj/item/reagent_containers/chem_disp_cartridge/cola, + /obj/item/reagent_containers/chem_disp_cartridge/smw, + /obj/item/reagent_containers/chem_disp_cartridge/dr_gibb, + /obj/item/reagent_containers/chem_disp_cartridge/spaceup, + /obj/item/reagent_containers/chem_disp_cartridge/tonic, + /obj/item/reagent_containers/chem_disp_cartridge/sodawater, + /obj/item/reagent_containers/chem_disp_cartridge/lemon_lime, + /obj/item/reagent_containers/chem_disp_cartridge/sugar, + /obj/item/reagent_containers/chem_disp_cartridge/orange, + /obj/item/reagent_containers/chem_disp_cartridge/lime, + /obj/item/reagent_containers/chem_disp_cartridge/watermelon, + /obj/item/reagent_containers/chem_disp_cartridge/lemon, + /obj/item/reagent_containers/chem_disp_cartridge/grapesoda ) /obj/machinery/chemical_dispenser/bar_alc @@ -97,27 +97,27 @@ /obj/machinery/chemical_dispenser/bar_alc/full spawn_cartridges = list( - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon_lime, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sodawater, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tonic, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/beer, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/gin, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/rum, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tequila, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/vermouth, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cognac, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cider, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ale, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/mead, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/bitters + /obj/item/reagent_containers/chem_disp_cartridge/lemon_lime, + /obj/item/reagent_containers/chem_disp_cartridge/sugar, + /obj/item/reagent_containers/chem_disp_cartridge/orange, + /obj/item/reagent_containers/chem_disp_cartridge/lime, + /obj/item/reagent_containers/chem_disp_cartridge/sodawater, + /obj/item/reagent_containers/chem_disp_cartridge/tonic, + /obj/item/reagent_containers/chem_disp_cartridge/beer, + /obj/item/reagent_containers/chem_disp_cartridge/kahlua, + /obj/item/reagent_containers/chem_disp_cartridge/whiskey, + /obj/item/reagent_containers/chem_disp_cartridge/redwine, + /obj/item/reagent_containers/chem_disp_cartridge/whitewine, + /obj/item/reagent_containers/chem_disp_cartridge/vodka, + /obj/item/reagent_containers/chem_disp_cartridge/gin, + /obj/item/reagent_containers/chem_disp_cartridge/rum, + /obj/item/reagent_containers/chem_disp_cartridge/tequila, + /obj/item/reagent_containers/chem_disp_cartridge/vermouth, + /obj/item/reagent_containers/chem_disp_cartridge/cognac, + /obj/item/reagent_containers/chem_disp_cartridge/cider, + /obj/item/reagent_containers/chem_disp_cartridge/ale, + /obj/item/reagent_containers/chem_disp_cartridge/mead, + /obj/item/reagent_containers/chem_disp_cartridge/bitters ) /obj/machinery/chemical_dispenser/bar_coffee @@ -129,22 +129,22 @@ /obj/machinery/chemical_dispenser/bar_coffee/full spawn_cartridges = list( - /obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cafe_latte, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/soy_latte, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/hot_coco, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/milk, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cream, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ice, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/mint, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/berry, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/greentea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/decaf, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/chaitea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/decafchai + /obj/item/reagent_containers/chem_disp_cartridge/coffee, + /obj/item/reagent_containers/chem_disp_cartridge/cafe_latte, + /obj/item/reagent_containers/chem_disp_cartridge/soy_latte, + /obj/item/reagent_containers/chem_disp_cartridge/hot_coco, + /obj/item/reagent_containers/chem_disp_cartridge/milk, + /obj/item/reagent_containers/chem_disp_cartridge/cream, + /obj/item/reagent_containers/chem_disp_cartridge/sugar, + /obj/item/reagent_containers/chem_disp_cartridge/tea, + /obj/item/reagent_containers/chem_disp_cartridge/ice, + /obj/item/reagent_containers/chem_disp_cartridge/mint, + /obj/item/reagent_containers/chem_disp_cartridge/orange, + /obj/item/reagent_containers/chem_disp_cartridge/lemon, + /obj/item/reagent_containers/chem_disp_cartridge/lime, + /obj/item/reagent_containers/chem_disp_cartridge/berry, + /obj/item/reagent_containers/chem_disp_cartridge/greentea, + /obj/item/reagent_containers/chem_disp_cartridge/decaf, + /obj/item/reagent_containers/chem_disp_cartridge/chaitea, + /obj/item/reagent_containers/chem_disp_cartridge/decafchai ) diff --git a/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm b/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm index f03f746d93d..5a09eac7df1 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm @@ -7,15 +7,15 @@ /obj/machinery/chemical_dispenser/xenoflora/full spawn_cartridges = list( - /obj/item/weapon/reagent_containers/chem_disp_cartridge/water, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ethanol, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/radium, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ammonia, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/diethylamine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/plantbgone, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/mutagen, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/calcium + /obj/item/reagent_containers/chem_disp_cartridge/water, + /obj/item/reagent_containers/chem_disp_cartridge/sugar, + /obj/item/reagent_containers/chem_disp_cartridge/ethanol, + /obj/item/reagent_containers/chem_disp_cartridge/radium, + /obj/item/reagent_containers/chem_disp_cartridge/ammonia, + /obj/item/reagent_containers/chem_disp_cartridge/diethylamine, + /obj/item/reagent_containers/chem_disp_cartridge/plantbgone, + /obj/item/reagent_containers/chem_disp_cartridge/mutagen, + /obj/item/reagent_containers/chem_disp_cartridge/calcium ) /obj/machinery/chemical_dispenser/biochemistry @@ -27,43 +27,43 @@ /obj/machinery/chemical_dispenser/biochemistry/full spawn_cartridges = list( - /obj/item/weapon/reagent_containers/chem_disp_cartridge/nutriment, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/protein, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/milk + /obj/item/reagent_containers/chem_disp_cartridge/nutriment, + /obj/item/reagent_containers/chem_disp_cartridge/protein, + /obj/item/reagent_containers/chem_disp_cartridge/milk ) /obj/machinery/chemical_dispenser/ert/specialops spawn_cartridges = list( - /obj/item/weapon/reagent_containers/chem_disp_cartridge/inaprov, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/dylovene, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ryetalyn, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tramadol, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/oxycodone, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sterilizine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/leporazine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/kelotane, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/dermaline, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/dexalin, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/dexalin_p, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/synaptizine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/hyronalin, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/arithrazine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/alkysine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/imidazoline, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/peridaxon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/bicaridine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/hyperzine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/rezadone, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/spaceacillin, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ethylredox, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/carthatoline, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/corophizine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/myelamine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/osteodaxon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/biomass, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/iron, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/nutriment, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/protein + /obj/item/reagent_containers/chem_disp_cartridge/inaprov, + /obj/item/reagent_containers/chem_disp_cartridge/dylovene, + /obj/item/reagent_containers/chem_disp_cartridge/ryetalyn, + /obj/item/reagent_containers/chem_disp_cartridge/tramadol, + /obj/item/reagent_containers/chem_disp_cartridge/oxycodone, + /obj/item/reagent_containers/chem_disp_cartridge/sterilizine, + /obj/item/reagent_containers/chem_disp_cartridge/leporazine, + /obj/item/reagent_containers/chem_disp_cartridge/kelotane, + /obj/item/reagent_containers/chem_disp_cartridge/dermaline, + /obj/item/reagent_containers/chem_disp_cartridge/dexalin, + /obj/item/reagent_containers/chem_disp_cartridge/dexalin_p, + /obj/item/reagent_containers/chem_disp_cartridge/synaptizine, + /obj/item/reagent_containers/chem_disp_cartridge/hyronalin, + /obj/item/reagent_containers/chem_disp_cartridge/arithrazine, + /obj/item/reagent_containers/chem_disp_cartridge/alkysine, + /obj/item/reagent_containers/chem_disp_cartridge/imidazoline, + /obj/item/reagent_containers/chem_disp_cartridge/peridaxon, + /obj/item/reagent_containers/chem_disp_cartridge/bicaridine, + /obj/item/reagent_containers/chem_disp_cartridge/hyperzine, + /obj/item/reagent_containers/chem_disp_cartridge/rezadone, + /obj/item/reagent_containers/chem_disp_cartridge/spaceacillin, + /obj/item/reagent_containers/chem_disp_cartridge/ethylredox, + /obj/item/reagent_containers/chem_disp_cartridge/carthatoline, + /obj/item/reagent_containers/chem_disp_cartridge/corophizine, + /obj/item/reagent_containers/chem_disp_cartridge/myelamine, + /obj/item/reagent_containers/chem_disp_cartridge/osteodaxon, + /obj/item/reagent_containers/chem_disp_cartridge/biomass, + /obj/item/reagent_containers/chem_disp_cartridge/iron, + /obj/item/reagent_containers/chem_disp_cartridge/nutriment, + /obj/item/reagent_containers/chem_disp_cartridge/protein ) /obj/machinery/chemical_dispenser/ert/specialops/abductor diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index 89a97dc9fd4..797d02cf6dd 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -16,7 +16,7 @@ var/amount_per_transfer_from_this = 10 var/possible_transfer_amounts = list(10,25,50,100) -/obj/structure/reagent_dispensers/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/reagent_dispensers/attackby(obj/item/W as obj, mob/user as mob) return /obj/structure/reagent_dispensers/Destroy() @@ -115,7 +115,7 @@ icon_state = "fuel" amount_per_transfer_from_this = 10 var/modded = 0 - var/obj/item/device/assembly_holder/rig = null + var/obj/item/assembly_holder/rig = null /obj/structure/reagent_dispensers/fueltank/Initialize() . = ..() @@ -177,7 +177,7 @@ icon_state = "barrel3" modded = FALSE -/obj/structure/reagent_dispensers/fueltank/barrel/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/reagent_dispensers/fueltank/barrel/attackby(obj/item/W as obj, mob/user as mob) if (W.has_tool_quality(TOOL_WRENCH)) //can't wrench it shut, it's always open return return ..() @@ -200,7 +200,7 @@ rig = null overlays = new/list() -/obj/structure/reagent_dispensers/fueltank/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/reagent_dispensers/fueltank/attackby(obj/item/W as obj, mob/user as mob) src.add_fingerprint(user) if (W.has_tool_quality(TOOL_WRENCH)) user.visible_message("[user] wrenches [src]'s faucet [modded ? "closed" : "open"].", \ @@ -211,7 +211,7 @@ message_admins("[key_name_admin(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel. (JMP)") log_game("[key_name(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel.") leak_fuel(amount_per_transfer_from_this) - if (istype(W,/obj/item/device/assembly_holder)) + if (istype(W,/obj/item/assembly_holder)) if (rig) to_chat(user, "There is another device in the way.") return ..() @@ -219,8 +219,8 @@ if(do_after(user, 20)) user.visible_message("[user] rigs [W] to \the [src].", "You rig [W] to \the [src]") - var/obj/item/device/assembly_holder/H = W - if (istype(H.a_left,/obj/item/device/assembly/igniter) || istype(H.a_right,/obj/item/device/assembly/igniter)) + var/obj/item/assembly_holder/H = W + if (istype(H.a_left,/obj/item/assembly/igniter) || istype(H.a_right,/obj/item/assembly/igniter)) message_admins("[key_name_admin(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion. (JMP)") log_game("[key_name(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion.") @@ -379,7 +379,7 @@ playsound(src, I.usesound, 50, 1) if(do_after(user, 20) && bottle) to_chat(user, "You unfasten the jug.") - var/obj/item/weapon/reagent_containers/glass/cooler_bottle/G = new /obj/item/weapon/reagent_containers/glass/cooler_bottle( src.loc ) + var/obj/item/reagent_containers/glass/cooler_bottle/G = new /obj/item/reagent_containers/glass/cooler_bottle( src.loc ) for(var/datum/reagent/R in reagents.reagent_list) var/total_reagent = reagents.get_reagent_amount(R.id) G.reagents.add_reagent(R.id, total_reagent) @@ -405,7 +405,7 @@ new /obj/item/stack/material/plastic( src.loc ) if(cups) for(var/i = 0 to cups) - new /obj/item/weapon/reagent_containers/food/drinks/sillycup(src.loc) + new /obj/item/reagent_containers/food/drinks/sillycup(src.loc) cups = 0 cupholder = 0 update_icon() @@ -419,11 +419,11 @@ qdel(src) return - if(istype(I, /obj/item/weapon/reagent_containers/glass/cooler_bottle)) + if(istype(I, /obj/item/reagent_containers/glass/cooler_bottle)) src.add_fingerprint(user) if(!bottle) if(anchored) - var/obj/item/weapon/reagent_containers/glass/cooler_bottle/G = I + var/obj/item/reagent_containers/glass/cooler_bottle/G = I to_chat(user, "You start to screw the bottle onto the water-cooler.") if(do_after(user, 20) && !bottle && anchored) bottle = 1 @@ -459,7 +459,7 @@ /obj/structure/reagent_dispensers/water_cooler/attack_hand(mob/user) if(cups) - new /obj/item/weapon/reagent_containers/food/drinks/sillycup(src.loc) + new /obj/item/reagent_containers/food/drinks/sillycup(src.loc) cups-- flick("[icon_state]-vend", src) return diff --git a/code/modules/reagents/machinery/dispenser/supply.dm b/code/modules/reagents/machinery/dispenser/supply.dm index 30e900993ef..32dea5167e2 100644 --- a/code/modules/reagents/machinery/dispenser/supply.dm +++ b/code/modules/reagents/machinery/dispenser/supply.dm @@ -41,29 +41,29 @@ /datum/supply_pack/reagents name = "Chemistry dispenser refill" contains = list( - /obj/item/weapon/reagent_containers/chem_disp_cartridge/hydrogen, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lithium, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/carbon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/nitrogen, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/oxygen, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/fluorine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sodium, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/aluminum, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/silicon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/phosphorus, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sulfur, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/chlorine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/potassium, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/iron, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/copper, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/mercury, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/radium, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/water, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ethanol, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sacid, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tungsten, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/calcium + /obj/item/reagent_containers/chem_disp_cartridge/hydrogen, + /obj/item/reagent_containers/chem_disp_cartridge/lithium, + /obj/item/reagent_containers/chem_disp_cartridge/carbon, + /obj/item/reagent_containers/chem_disp_cartridge/nitrogen, + /obj/item/reagent_containers/chem_disp_cartridge/oxygen, + /obj/item/reagent_containers/chem_disp_cartridge/fluorine, + /obj/item/reagent_containers/chem_disp_cartridge/sodium, + /obj/item/reagent_containers/chem_disp_cartridge/aluminum, + /obj/item/reagent_containers/chem_disp_cartridge/silicon, + /obj/item/reagent_containers/chem_disp_cartridge/phosphorus, + /obj/item/reagent_containers/chem_disp_cartridge/sulfur, + /obj/item/reagent_containers/chem_disp_cartridge/chlorine, + /obj/item/reagent_containers/chem_disp_cartridge/potassium, + /obj/item/reagent_containers/chem_disp_cartridge/iron, + /obj/item/reagent_containers/chem_disp_cartridge/copper, + /obj/item/reagent_containers/chem_disp_cartridge/mercury, + /obj/item/reagent_containers/chem_disp_cartridge/radium, + /obj/item/reagent_containers/chem_disp_cartridge/water, + /obj/item/reagent_containers/chem_disp_cartridge/ethanol, + /obj/item/reagent_containers/chem_disp_cartridge/sugar, + /obj/item/reagent_containers/chem_disp_cartridge/sacid, + /obj/item/reagent_containers/chem_disp_cartridge/tungsten, + /obj/item/reagent_containers/chem_disp_cartridge/calcium ) cost = 150 containertype = /obj/structure/closet/crate/secure @@ -74,27 +74,27 @@ /datum/supply_pack/alcohol_reagents name = "Bar alcoholic dispenser refill" contains = list( - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon_lime, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sodawater, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tonic, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/beer, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/gin, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/rum, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tequila, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/vermouth, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cognac, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cider, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ale, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/mead, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/bitters + /obj/item/reagent_containers/chem_disp_cartridge/lemon_lime, + /obj/item/reagent_containers/chem_disp_cartridge/sugar, + /obj/item/reagent_containers/chem_disp_cartridge/orange, + /obj/item/reagent_containers/chem_disp_cartridge/lime, + /obj/item/reagent_containers/chem_disp_cartridge/sodawater, + /obj/item/reagent_containers/chem_disp_cartridge/tonic, + /obj/item/reagent_containers/chem_disp_cartridge/beer, + /obj/item/reagent_containers/chem_disp_cartridge/kahlua, + /obj/item/reagent_containers/chem_disp_cartridge/whiskey, + /obj/item/reagent_containers/chem_disp_cartridge/redwine, + /obj/item/reagent_containers/chem_disp_cartridge/whitewine, + /obj/item/reagent_containers/chem_disp_cartridge/vodka, + /obj/item/reagent_containers/chem_disp_cartridge/gin, + /obj/item/reagent_containers/chem_disp_cartridge/rum, + /obj/item/reagent_containers/chem_disp_cartridge/tequila, + /obj/item/reagent_containers/chem_disp_cartridge/vermouth, + /obj/item/reagent_containers/chem_disp_cartridge/cognac, + /obj/item/reagent_containers/chem_disp_cartridge/cider, + /obj/item/reagent_containers/chem_disp_cartridge/ale, + /obj/item/reagent_containers/chem_disp_cartridge/mead, + /obj/item/reagent_containers/chem_disp_cartridge/bitters ) cost = 50 containertype = /obj/structure/closet/crate/secure @@ -105,25 +105,25 @@ /datum/supply_pack/softdrink_reagents name = "Bar soft drink dispenser refill" contains = list( - /obj/item/weapon/reagent_containers/chem_disp_cartridge/water, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ice, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cream, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/icetea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cola, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/smw, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/dr_gibb, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/spaceup, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tonic, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sodawater, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon_lime, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/watermelon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/grapesoda + /obj/item/reagent_containers/chem_disp_cartridge/water, + /obj/item/reagent_containers/chem_disp_cartridge/ice, + /obj/item/reagent_containers/chem_disp_cartridge/coffee, + /obj/item/reagent_containers/chem_disp_cartridge/cream, + /obj/item/reagent_containers/chem_disp_cartridge/tea, + /obj/item/reagent_containers/chem_disp_cartridge/icetea, + /obj/item/reagent_containers/chem_disp_cartridge/cola, + /obj/item/reagent_containers/chem_disp_cartridge/smw, + /obj/item/reagent_containers/chem_disp_cartridge/dr_gibb, + /obj/item/reagent_containers/chem_disp_cartridge/spaceup, + /obj/item/reagent_containers/chem_disp_cartridge/tonic, + /obj/item/reagent_containers/chem_disp_cartridge/sodawater, + /obj/item/reagent_containers/chem_disp_cartridge/lemon_lime, + /obj/item/reagent_containers/chem_disp_cartridge/sugar, + /obj/item/reagent_containers/chem_disp_cartridge/orange, + /obj/item/reagent_containers/chem_disp_cartridge/lime, + /obj/item/reagent_containers/chem_disp_cartridge/watermelon, + /obj/item/reagent_containers/chem_disp_cartridge/lemon, + /obj/item/reagent_containers/chem_disp_cartridge/grapesoda ) cost = 50 containertype = /obj/structure/closet/crate @@ -133,22 +133,22 @@ /datum/supply_pack/coffee_reagents name = "Coffee machine dispenser refill" contains = list( - /obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cafe_latte, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/soy_latte, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/hot_coco, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/milk, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cream, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ice, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/mint, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/berry, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/greentea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/decaf + /obj/item/reagent_containers/chem_disp_cartridge/coffee, + /obj/item/reagent_containers/chem_disp_cartridge/cafe_latte, + /obj/item/reagent_containers/chem_disp_cartridge/soy_latte, + /obj/item/reagent_containers/chem_disp_cartridge/hot_coco, + /obj/item/reagent_containers/chem_disp_cartridge/milk, + /obj/item/reagent_containers/chem_disp_cartridge/cream, + /obj/item/reagent_containers/chem_disp_cartridge/sugar, + /obj/item/reagent_containers/chem_disp_cartridge/tea, + /obj/item/reagent_containers/chem_disp_cartridge/ice, + /obj/item/reagent_containers/chem_disp_cartridge/mint, + /obj/item/reagent_containers/chem_disp_cartridge/orange, + /obj/item/reagent_containers/chem_disp_cartridge/lemon, + /obj/item/reagent_containers/chem_disp_cartridge/lime, + /obj/item/reagent_containers/chem_disp_cartridge/berry, + /obj/item/reagent_containers/chem_disp_cartridge/greentea, + /obj/item/reagent_containers/chem_disp_cartridge/decaf ) cost = 50 containertype = /obj/structure/closet/crate @@ -158,16 +158,16 @@ /datum/supply_pack/dispenser_cartridges name = "Empty dispenser cartridges" contains = list( - /obj/item/weapon/reagent_containers/chem_disp_cartridge, - /obj/item/weapon/reagent_containers/chem_disp_cartridge, - /obj/item/weapon/reagent_containers/chem_disp_cartridge, - /obj/item/weapon/reagent_containers/chem_disp_cartridge, - /obj/item/weapon/reagent_containers/chem_disp_cartridge, - /obj/item/weapon/reagent_containers/chem_disp_cartridge, - /obj/item/weapon/reagent_containers/chem_disp_cartridge, - /obj/item/weapon/reagent_containers/chem_disp_cartridge, - /obj/item/weapon/reagent_containers/chem_disp_cartridge, - /obj/item/weapon/reagent_containers/chem_disp_cartridge + /obj/item/reagent_containers/chem_disp_cartridge, + /obj/item/reagent_containers/chem_disp_cartridge, + /obj/item/reagent_containers/chem_disp_cartridge, + /obj/item/reagent_containers/chem_disp_cartridge, + /obj/item/reagent_containers/chem_disp_cartridge, + /obj/item/reagent_containers/chem_disp_cartridge, + /obj/item/reagent_containers/chem_disp_cartridge, + /obj/item/reagent_containers/chem_disp_cartridge, + /obj/item/reagent_containers/chem_disp_cartridge, + /obj/item/reagent_containers/chem_disp_cartridge ) cost = 15 containertype = /obj/structure/closet/crate @@ -196,68 +196,68 @@ // Chemistry-restricted (raw reagents excluding sugar/water) // Datum path Contents type Supply pack name Container name Cost Container access -SEC_PACK(hydrogen, /obj/item/weapon/reagent_containers/chem_disp_cartridge/hydrogen, "Reagent refill - Hydrogen", "hydrogen reagent cartridge crate", 15, access_chemistry) -SEC_PACK(lithium, /obj/item/weapon/reagent_containers/chem_disp_cartridge/lithium, "Reagent refill - Lithium", "lithium reagent cartridge crate", 15, access_chemistry) -SEC_PACK(carbon, /obj/item/weapon/reagent_containers/chem_disp_cartridge/carbon, "Reagent refill - Carbon", "carbon reagent cartridge crate", 15, access_chemistry) -SEC_PACK(nitrogen, /obj/item/weapon/reagent_containers/chem_disp_cartridge/nitrogen, "Reagent refill - Nitrogen", "nitrogen reagent cartridge crate", 15, access_chemistry) -SEC_PACK(oxygen, /obj/item/weapon/reagent_containers/chem_disp_cartridge/oxygen, "Reagent refill - Oxygen", "oxygen reagent cartridge crate", 15, access_chemistry) -SEC_PACK(fluorine, /obj/item/weapon/reagent_containers/chem_disp_cartridge/fluorine, "Reagent refill - Fluorine", "fluorine reagent cartridge crate", 15, access_chemistry) -SEC_PACK(sodium, /obj/item/weapon/reagent_containers/chem_disp_cartridge/sodium, "Reagent refill - Sodium", "sodium reagent cartridge crate", 15, access_chemistry) -SEC_PACK(aluminium, /obj/item/weapon/reagent_containers/chem_disp_cartridge/aluminum, "Reagent refill - Aluminum", "aluminum reagent cartridge crate", 15, access_chemistry) -SEC_PACK(silicon, /obj/item/weapon/reagent_containers/chem_disp_cartridge/silicon, "Reagent refill - Silicon", "silicon reagent cartridge crate", 15, access_chemistry) -SEC_PACK(phosphorus,/obj/item/weapon/reagent_containers/chem_disp_cartridge/phosphorus, "Reagent refill - Phosphorus", "phosphorus reagent cartridge crate", 15, access_chemistry) -SEC_PACK(sulfur, /obj/item/weapon/reagent_containers/chem_disp_cartridge/sulfur, "Reagent refill - Sulfur", "sulfur reagent cartridge crate", 15, access_chemistry) -SEC_PACK(chlorine, /obj/item/weapon/reagent_containers/chem_disp_cartridge/chlorine, "Reagent refill - Chlorine", "chlorine reagent cartridge crate", 15, access_chemistry) -SEC_PACK(potassium, /obj/item/weapon/reagent_containers/chem_disp_cartridge/potassium, "Reagent refill - Potassium", "potassium reagent cartridge crate", 15, access_chemistry) -SEC_PACK(iron, /obj/item/weapon/reagent_containers/chem_disp_cartridge/iron, "Reagent refill - Iron", "iron reagent cartridge crate", 15, access_chemistry) -SEC_PACK(copper, /obj/item/weapon/reagent_containers/chem_disp_cartridge/copper, "Reagent refill - Copper", "copper reagent cartridge crate", 15, access_chemistry) -SEC_PACK(mercury, /obj/item/weapon/reagent_containers/chem_disp_cartridge/mercury, "Reagent refill - Mercury", "mercury reagent cartridge crate", 15, access_chemistry) -SEC_PACK(radium, /obj/item/weapon/reagent_containers/chem_disp_cartridge/radium, "Reagent refill - Radium", "radium reagent cartridge crate", 15, access_chemistry) -SEC_PACK(ethanol, /obj/item/weapon/reagent_containers/chem_disp_cartridge/ethanol, "Reagent refill - Ethanol", "ethanol reagent cartridge crate", 15, access_chemistry) -SEC_PACK(sacid, /obj/item/weapon/reagent_containers/chem_disp_cartridge/sacid, "Reagent refill - Sulfuric Acid", "sulfuric acid reagent cartridge crate", 15, access_chemistry) -SEC_PACK(tungsten, /obj/item/weapon/reagent_containers/chem_disp_cartridge/tungsten, "Reagent refill - Tungsten", "tungsten reagent cartridge crate", 15, access_chemistry) -SEC_PACK(calcium, /obj/item/weapon/reagent_containers/chem_disp_cartridge/calcium, "Reagent refill - Calcium", "calcium reagent cartridge crate", 15, access_chemistry) +SEC_PACK(hydrogen, /obj/item/reagent_containers/chem_disp_cartridge/hydrogen, "Reagent refill - Hydrogen", "hydrogen reagent cartridge crate", 15, access_chemistry) +SEC_PACK(lithium, /obj/item/reagent_containers/chem_disp_cartridge/lithium, "Reagent refill - Lithium", "lithium reagent cartridge crate", 15, access_chemistry) +SEC_PACK(carbon, /obj/item/reagent_containers/chem_disp_cartridge/carbon, "Reagent refill - Carbon", "carbon reagent cartridge crate", 15, access_chemistry) +SEC_PACK(nitrogen, /obj/item/reagent_containers/chem_disp_cartridge/nitrogen, "Reagent refill - Nitrogen", "nitrogen reagent cartridge crate", 15, access_chemistry) +SEC_PACK(oxygen, /obj/item/reagent_containers/chem_disp_cartridge/oxygen, "Reagent refill - Oxygen", "oxygen reagent cartridge crate", 15, access_chemistry) +SEC_PACK(fluorine, /obj/item/reagent_containers/chem_disp_cartridge/fluorine, "Reagent refill - Fluorine", "fluorine reagent cartridge crate", 15, access_chemistry) +SEC_PACK(sodium, /obj/item/reagent_containers/chem_disp_cartridge/sodium, "Reagent refill - Sodium", "sodium reagent cartridge crate", 15, access_chemistry) +SEC_PACK(aluminium, /obj/item/reagent_containers/chem_disp_cartridge/aluminum, "Reagent refill - Aluminum", "aluminum reagent cartridge crate", 15, access_chemistry) +SEC_PACK(silicon, /obj/item/reagent_containers/chem_disp_cartridge/silicon, "Reagent refill - Silicon", "silicon reagent cartridge crate", 15, access_chemistry) +SEC_PACK(phosphorus,/obj/item/reagent_containers/chem_disp_cartridge/phosphorus, "Reagent refill - Phosphorus", "phosphorus reagent cartridge crate", 15, access_chemistry) +SEC_PACK(sulfur, /obj/item/reagent_containers/chem_disp_cartridge/sulfur, "Reagent refill - Sulfur", "sulfur reagent cartridge crate", 15, access_chemistry) +SEC_PACK(chlorine, /obj/item/reagent_containers/chem_disp_cartridge/chlorine, "Reagent refill - Chlorine", "chlorine reagent cartridge crate", 15, access_chemistry) +SEC_PACK(potassium, /obj/item/reagent_containers/chem_disp_cartridge/potassium, "Reagent refill - Potassium", "potassium reagent cartridge crate", 15, access_chemistry) +SEC_PACK(iron, /obj/item/reagent_containers/chem_disp_cartridge/iron, "Reagent refill - Iron", "iron reagent cartridge crate", 15, access_chemistry) +SEC_PACK(copper, /obj/item/reagent_containers/chem_disp_cartridge/copper, "Reagent refill - Copper", "copper reagent cartridge crate", 15, access_chemistry) +SEC_PACK(mercury, /obj/item/reagent_containers/chem_disp_cartridge/mercury, "Reagent refill - Mercury", "mercury reagent cartridge crate", 15, access_chemistry) +SEC_PACK(radium, /obj/item/reagent_containers/chem_disp_cartridge/radium, "Reagent refill - Radium", "radium reagent cartridge crate", 15, access_chemistry) +SEC_PACK(ethanol, /obj/item/reagent_containers/chem_disp_cartridge/ethanol, "Reagent refill - Ethanol", "ethanol reagent cartridge crate", 15, access_chemistry) +SEC_PACK(sacid, /obj/item/reagent_containers/chem_disp_cartridge/sacid, "Reagent refill - Sulfuric Acid", "sulfuric acid reagent cartridge crate", 15, access_chemistry) +SEC_PACK(tungsten, /obj/item/reagent_containers/chem_disp_cartridge/tungsten, "Reagent refill - Tungsten", "tungsten reagent cartridge crate", 15, access_chemistry) +SEC_PACK(calcium, /obj/item/reagent_containers/chem_disp_cartridge/calcium, "Reagent refill - Calcium", "calcium reagent cartridge crate", 15, access_chemistry) // Bar-restricted (alcoholic drinks) // Datum path Contents type Supply pack name Container name Cost Container access -SEC_PACK(beer, /obj/item/weapon/reagent_containers/chem_disp_cartridge/beer, "Reagent refill - Beer", "beer reagent cartridge crate", 15, access_bar) -SEC_PACK(kahlua, /obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua, "Reagent refill - Kahlua", "kahlua reagent cartridge crate", 15, access_bar) -SEC_PACK(whiskey, /obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey, "Reagent refill - Whiskey", "whiskey reagent cartridge crate", 15, access_bar) -SEC_PACK(rwine, /obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine, "Reagent refill - Red Wine", "red wine reagent cartridge crate", 15, access_bar) -SEC_PACK(wwine, /obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine, "Reagent refill - White Wine", "white wine reagent cartridge crate", 15, access_bar) -SEC_PACK(vodka, /obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka, "Reagent refill - Vodka", "vodka reagent cartridge crate", 15, access_bar) -SEC_PACK(gin, /obj/item/weapon/reagent_containers/chem_disp_cartridge/gin, "Reagent refill - Gin", "gin reagent cartridge crate", 15, access_bar) -SEC_PACK(rum, /obj/item/weapon/reagent_containers/chem_disp_cartridge/rum, "Reagent refill - Rum", "rum reagent cartridge crate", 15, access_bar) -SEC_PACK(tequila, /obj/item/weapon/reagent_containers/chem_disp_cartridge/tequila, "Reagent refill - Tequila", "tequila reagent cartridge crate", 15, access_bar) -SEC_PACK(vermouth, /obj/item/weapon/reagent_containers/chem_disp_cartridge/vermouth, "Reagent refill - Vermouth", "vermouth reagent cartridge crate", 15, access_bar) -SEC_PACK(cognac, /obj/item/weapon/reagent_containers/chem_disp_cartridge/cognac, "Reagent refill - Cognac", "cognac reagent cartridge crate", 15, access_bar) -SEC_PACK(ale, /obj/item/weapon/reagent_containers/chem_disp_cartridge/ale, "Reagent refill - Ale", "ale reagent cartridge crate", 15, access_bar) -SEC_PACK(mead, /obj/item/weapon/reagent_containers/chem_disp_cartridge/mead, "Reagent refill - Mead", "mead reagent cartridge crate", 15, access_bar) +SEC_PACK(beer, /obj/item/reagent_containers/chem_disp_cartridge/beer, "Reagent refill - Beer", "beer reagent cartridge crate", 15, access_bar) +SEC_PACK(kahlua, /obj/item/reagent_containers/chem_disp_cartridge/kahlua, "Reagent refill - Kahlua", "kahlua reagent cartridge crate", 15, access_bar) +SEC_PACK(whiskey, /obj/item/reagent_containers/chem_disp_cartridge/whiskey, "Reagent refill - Whiskey", "whiskey reagent cartridge crate", 15, access_bar) +SEC_PACK(rwine, /obj/item/reagent_containers/chem_disp_cartridge/redwine, "Reagent refill - Red Wine", "red wine reagent cartridge crate", 15, access_bar) +SEC_PACK(wwine, /obj/item/reagent_containers/chem_disp_cartridge/whitewine, "Reagent refill - White Wine", "white wine reagent cartridge crate", 15, access_bar) +SEC_PACK(vodka, /obj/item/reagent_containers/chem_disp_cartridge/vodka, "Reagent refill - Vodka", "vodka reagent cartridge crate", 15, access_bar) +SEC_PACK(gin, /obj/item/reagent_containers/chem_disp_cartridge/gin, "Reagent refill - Gin", "gin reagent cartridge crate", 15, access_bar) +SEC_PACK(rum, /obj/item/reagent_containers/chem_disp_cartridge/rum, "Reagent refill - Rum", "rum reagent cartridge crate", 15, access_bar) +SEC_PACK(tequila, /obj/item/reagent_containers/chem_disp_cartridge/tequila, "Reagent refill - Tequila", "tequila reagent cartridge crate", 15, access_bar) +SEC_PACK(vermouth, /obj/item/reagent_containers/chem_disp_cartridge/vermouth, "Reagent refill - Vermouth", "vermouth reagent cartridge crate", 15, access_bar) +SEC_PACK(cognac, /obj/item/reagent_containers/chem_disp_cartridge/cognac, "Reagent refill - Cognac", "cognac reagent cartridge crate", 15, access_bar) +SEC_PACK(ale, /obj/item/reagent_containers/chem_disp_cartridge/ale, "Reagent refill - Ale", "ale reagent cartridge crate", 15, access_bar) +SEC_PACK(mead, /obj/item/reagent_containers/chem_disp_cartridge/mead, "Reagent refill - Mead", "mead reagent cartridge crate", 15, access_bar) // Unrestricted (water, sugar, non-alcoholic drinks) // Datum path Contents type Supply pack name Container name Cost -PACK(water, /obj/item/weapon/reagent_containers/chem_disp_cartridge/water, "Reagent refill - Water", "water reagent cartridge crate", 15) -PACK(sugar, /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, "Reagent refill - Sugar", "sugar reagent cartridge crate", 15) -PACK(ice, /obj/item/weapon/reagent_containers/chem_disp_cartridge/ice, "Reagent refill - Ice", "ice reagent cartridge crate", 15) -PACK(tea, /obj/item/weapon/reagent_containers/chem_disp_cartridge/tea, "Reagent refill - Tea", "tea reagent cartridge crate", 15) -PACK(icetea, /obj/item/weapon/reagent_containers/chem_disp_cartridge/icetea, "Reagent refill - Iced Tea", "iced tea reagent cartridge crate", 15) -PACK(cola, /obj/item/weapon/reagent_containers/chem_disp_cartridge/cola, "Reagent refill - Space Cola", "\improper Space Cola reagent cartridge crate", 15) -PACK(smw, /obj/item/weapon/reagent_containers/chem_disp_cartridge/smw, "Reagent refill - Space Mountain Wind", "\improper Space Mountain Wind reagent cartridge crate", 15) -PACK(dr_gibb, /obj/item/weapon/reagent_containers/chem_disp_cartridge/dr_gibb, "Reagent refill - Dr. Gibb", "\improper Dr. Gibb reagent cartridge crate", 15) -PACK(spaceup, /obj/item/weapon/reagent_containers/chem_disp_cartridge/spaceup, "Reagent refill - Space-Up", "\improper Space-Up reagent cartridge crate", 15) -PACK(tonic, /obj/item/weapon/reagent_containers/chem_disp_cartridge/tonic, "Reagent refill - Tonic Water", "tonic water reagent cartridge crate", 15) -PACK(sodawater, /obj/item/weapon/reagent_containers/chem_disp_cartridge/sodawater, "Reagent refill - Soda Water", "soda water reagent cartridge crate", 15) -PACK(lemon_lime, /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon_lime, "Reagent refill - Lemon-Lime Juice", "lemon-lime juice reagent cartridge crate", 15) -PACK(orange, /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, "Reagent refill - Orange Juice", "orange juice reagent cartridge crate", 15) -PACK(lime, /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, "Reagent refill - Lime Juice", "lime juice reagent cartridge crate", 15) -PACK(lemon, /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon, "Reagent refill - Lemon Juice", "lemon juice reagent cartridge crate", 15) -PACK(watermelon, /obj/item/weapon/reagent_containers/chem_disp_cartridge/watermelon, "Reagent refill - Watermelon Juice", "watermelon juice reagent cartridge crate", 15) -PACK(coffee, /obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee, "Reagent refill - Coffee", "coffee reagent cartridge crate", 15) -PACK(cafe_latte, /obj/item/weapon/reagent_containers/chem_disp_cartridge/cafe_latte, "Reagent refill - Cafe Latte", "cafe latte reagent cartridge crate", 15) -PACK(soy_latte, /obj/item/weapon/reagent_containers/chem_disp_cartridge/soy_latte, "Reagent refill - Soy Latte", "soy latte reagent cartridge crate", 15) -PACK(hot_coco, /obj/item/weapon/reagent_containers/chem_disp_cartridge/hot_coco, "Reagent refill - Hot Coco", "hot coco reagent cartridge crate", 15) -PACK(milk, /obj/item/weapon/reagent_containers/chem_disp_cartridge/milk, "Reagent refill - Milk", "milk reagent cartridge crate", 15) -PACK(cream, /obj/item/weapon/reagent_containers/chem_disp_cartridge/cream, "Reagent refill - Cream", "cream reagent cartridge crate", 15) +PACK(water, /obj/item/reagent_containers/chem_disp_cartridge/water, "Reagent refill - Water", "water reagent cartridge crate", 15) +PACK(sugar, /obj/item/reagent_containers/chem_disp_cartridge/sugar, "Reagent refill - Sugar", "sugar reagent cartridge crate", 15) +PACK(ice, /obj/item/reagent_containers/chem_disp_cartridge/ice, "Reagent refill - Ice", "ice reagent cartridge crate", 15) +PACK(tea, /obj/item/reagent_containers/chem_disp_cartridge/tea, "Reagent refill - Tea", "tea reagent cartridge crate", 15) +PACK(icetea, /obj/item/reagent_containers/chem_disp_cartridge/icetea, "Reagent refill - Iced Tea", "iced tea reagent cartridge crate", 15) +PACK(cola, /obj/item/reagent_containers/chem_disp_cartridge/cola, "Reagent refill - Space Cola", "\improper Space Cola reagent cartridge crate", 15) +PACK(smw, /obj/item/reagent_containers/chem_disp_cartridge/smw, "Reagent refill - Space Mountain Wind", "\improper Space Mountain Wind reagent cartridge crate", 15) +PACK(dr_gibb, /obj/item/reagent_containers/chem_disp_cartridge/dr_gibb, "Reagent refill - Dr. Gibb", "\improper Dr. Gibb reagent cartridge crate", 15) +PACK(spaceup, /obj/item/reagent_containers/chem_disp_cartridge/spaceup, "Reagent refill - Space-Up", "\improper Space-Up reagent cartridge crate", 15) +PACK(tonic, /obj/item/reagent_containers/chem_disp_cartridge/tonic, "Reagent refill - Tonic Water", "tonic water reagent cartridge crate", 15) +PACK(sodawater, /obj/item/reagent_containers/chem_disp_cartridge/sodawater, "Reagent refill - Soda Water", "soda water reagent cartridge crate", 15) +PACK(lemon_lime, /obj/item/reagent_containers/chem_disp_cartridge/lemon_lime, "Reagent refill - Lemon-Lime Juice", "lemon-lime juice reagent cartridge crate", 15) +PACK(orange, /obj/item/reagent_containers/chem_disp_cartridge/orange, "Reagent refill - Orange Juice", "orange juice reagent cartridge crate", 15) +PACK(lime, /obj/item/reagent_containers/chem_disp_cartridge/lime, "Reagent refill - Lime Juice", "lime juice reagent cartridge crate", 15) +PACK(lemon, /obj/item/reagent_containers/chem_disp_cartridge/lemon, "Reagent refill - Lemon Juice", "lemon juice reagent cartridge crate", 15) +PACK(watermelon, /obj/item/reagent_containers/chem_disp_cartridge/watermelon, "Reagent refill - Watermelon Juice", "watermelon juice reagent cartridge crate", 15) +PACK(coffee, /obj/item/reagent_containers/chem_disp_cartridge/coffee, "Reagent refill - Coffee", "coffee reagent cartridge crate", 15) +PACK(cafe_latte, /obj/item/reagent_containers/chem_disp_cartridge/cafe_latte, "Reagent refill - Cafe Latte", "cafe latte reagent cartridge crate", 15) +PACK(soy_latte, /obj/item/reagent_containers/chem_disp_cartridge/soy_latte, "Reagent refill - Soy Latte", "soy latte reagent cartridge crate", 15) +PACK(hot_coco, /obj/item/reagent_containers/chem_disp_cartridge/hot_coco, "Reagent refill - Hot Coco", "hot coco reagent cartridge crate", 15) +PACK(milk, /obj/item/reagent_containers/chem_disp_cartridge/milk, "Reagent refill - Milk", "milk reagent cartridge crate", 15) +PACK(cream, /obj/item/reagent_containers/chem_disp_cartridge/cream, "Reagent refill - Cream", "cream reagent cartridge crate", 15) #undef SEC_PACK #undef PACK diff --git a/code/modules/reagents/machinery/distillery.dm b/code/modules/reagents/machinery/distillery.dm index 1ae9e335c6c..4cafec6e963 100644 --- a/code/modules/reagents/machinery/distillery.dm +++ b/code/modules/reagents/machinery/distillery.dm @@ -53,8 +53,8 @@ var/image/overlay_dumping var/image/overlay_connected - var/obj/item/weapon/reagent_containers/glass/InputBeaker - var/obj/item/weapon/reagent_containers/glass/OutputBeaker + var/obj/item/reagent_containers/glass/InputBeaker + var/obj/item/reagent_containers/glass/OutputBeaker // A multiplier for the production amount. This should really only ever be lower than one, otherwise you end up with duping. var/efficiency = 1 @@ -73,7 +73,7 @@ /obj/machinery/portable_atmospherics/powered/reagent_distillery/RefreshParts() var/total_laser_rating = 0 - for(var/obj/item/weapon/stock_parts/micro_laser/ML in component_parts) + for(var/obj/item/stock_parts/micro_laser/ML in component_parts) total_laser_rating += ML.rating max_temp = initial(max_temp) + (50 * (total_laser_rating - 1)) @@ -209,9 +209,9 @@ update_icon() -/obj/machinery/portable_atmospherics/powered/reagent_distillery/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/portable_atmospherics/powered/reagent_distillery/attackby(obj/item/W as obj, mob/user as mob) var/list/options = list() - if(istype(W, /obj/item/weapon/reagent_containers/glass)) + if(istype(W, /obj/item/reagent_containers/glass)) if(!InputBeaker) options["install input"] = radial_install_input if(!OutputBeaker) diff --git a/code/modules/reagents/machinery/grinder.dm b/code/modules/reagents/machinery/grinder.dm index 738830ed1c9..50586d09bd3 100644 --- a/code/modules/reagents/machinery/grinder.dm +++ b/code/modules/reagents/machinery/grinder.dm @@ -9,9 +9,9 @@ use_power = USE_POWER_IDLE idle_power_usage = 5 active_power_usage = 100 - circuit = /obj/item/weapon/circuitboard/grinder + circuit = /obj/item/circuitboard/grinder var/inuse = 0 - var/obj/item/weapon/reagent_containers/beaker = null + var/obj/item/reagent_containers/beaker = null var/limit = 10 var/list/holdingitems = list() var/list/sheet_reagents = list( //have a number of reageents divisible by REAGENTS_PER_SHEET (default 20) unless you like decimals, @@ -39,7 +39,7 @@ /obj/machinery/reagentgrinder/Initialize() . = ..() - beaker = new /obj/item/weapon/reagent_containers/glass/beaker/large(src) + beaker = new /obj/item/reagent_containers/glass/beaker/large(src) default_apply_parts() /obj/machinery/reagentgrinder/examine(mob/user) @@ -77,13 +77,13 @@ return //VOREStation edit start - for solargrubs - if (istype(O, /obj/item/device/multitool)) + if (istype(O, /obj/item/multitool)) return ..() //VOREStation edit end - if (istype(O,/obj/item/weapon/reagent_containers/glass) || \ - istype(O,/obj/item/weapon/reagent_containers/food/drinks/glass2) || \ - istype(O,/obj/item/weapon/reagent_containers/food/drinks/shaker)) + if (istype(O,/obj/item/reagent_containers/glass) || \ + istype(O,/obj/item/reagent_containers/food/drinks/glass2) || \ + istype(O,/obj/item/reagent_containers/food/drinks/shaker)) if (beaker) return 1 @@ -102,8 +102,8 @@ if(!istype(O)) return - if(istype(O,/obj/item/weapon/storage/bag/plants)) - var/obj/item/weapon/storage/bag/plants/bag = O + if(istype(O,/obj/item/storage/bag/plants)) + var/obj/item/storage/bag/plants/bag = O var/failed = 1 for(var/obj/item/G in O.contents) if(!G.reagents || !G.reagents.total_volume) @@ -126,8 +126,8 @@ src.updateUsrDialog() return 0 - if(istype(O,/obj/item/weapon/gripper)) - var/obj/item/weapon/gripper/B = O //B, for Borg. + if(istype(O,/obj/item/gripper)) + var/obj/item/gripper/B = O //B, for Borg. if(!B.wrapped) to_chat(user, "\The [B] is not holding anything.") return 0 @@ -253,7 +253,7 @@ if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) break -/obj/machinery/reagentgrinder/proc/replace_beaker(mob/living/user, obj/item/weapon/reagent_containers/new_beaker) +/obj/machinery/reagentgrinder/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker) if(!user) return FALSE if(beaker) diff --git a/code/modules/reagents/machinery/injector_maker.dm b/code/modules/reagents/machinery/injector_maker.dm index d18f5e3a147..2e5f3eff831 100644 --- a/code/modules/reagents/machinery/injector_maker.dm +++ b/code/modules/reagents/machinery/injector_maker.dm @@ -13,8 +13,8 @@ clickvol = 60 idle_power_usage = 5 active_power_usage = 100 - circuit = /obj/item/weapon/circuitboard/injector_maker - var/obj/item/weapon/reagent_containers/beaker = null + circuit = /obj/item/circuitboard/injector_maker + var/obj/item/reagent_containers/beaker = null var/list/beaker_reagents_list = list() @@ -54,12 +54,12 @@ /obj/machinery/injector_maker/attackby(var/obj/item/O as obj, var/mob/user as mob) - if (istype(O, /obj/item/device/multitool)) + if (istype(O, /obj/item/multitool)) return ..() - if(istype(O,/obj/item/weapon/reagent_containers/glass) || \ - istype(O,/obj/item/weapon/reagent_containers/food/drinks/glass2) || \ - istype(O,/obj/item/weapon/reagent_containers/food/drinks/shaker)) + if(istype(O,/obj/item/reagent_containers/glass) || \ + istype(O,/obj/item/reagent_containers/food/drinks/glass2) || \ + istype(O,/obj/item/reagent_containers/food/drinks/shaker)) if (beaker) return 1 @@ -73,8 +73,8 @@ - if(istype(O,/obj/item/weapon/reagent_containers/hypospray/autoinjector/empty)) - var/obj/item/weapon/reagent_containers/hypospray/autoinjector/empty/E = O + if(istype(O,/obj/item/reagent_containers/hypospray/autoinjector/empty)) + var/obj/item/reagent_containers/hypospray/autoinjector/empty/E = O if(src.count_small_injector >= src.capacity_small_injector) to_chat(user, SPAN_WARNING("Storage is full! It can only hold [capacity_small_injector]")) return @@ -84,8 +84,8 @@ src.count_small_injector = src.count_small_injector + 1 qdel(E) update_icon() - if(istype(O,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/empty)) - var/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/empty/E = O + if(istype(O,/obj/item/reagent_containers/hypospray/autoinjector/biginjector/empty)) + var/obj/item/reagent_containers/hypospray/autoinjector/biginjector/empty/E = O if(src.count_large_injector >= src.capacity_large_injector) to_chat(user, SPAN_WARNING("Storage is full! It can only hold [capacity_large_injector]")) return @@ -255,7 +255,7 @@ return else src.count_small_injector = src.count_small_injector - 1 - var/obj/item/weapon/reagent_containers/hypospray/autoinjector/empty/P = new(loc) + var/obj/item/reagent_containers/hypospray/autoinjector/empty/P = new(loc) beaker.reagents.trans_to_obj(P, amount_per_injector) P.update_icon() if(new_name) @@ -274,7 +274,7 @@ return else src.count_large_injector = src.count_large_injector - 1 - var/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/empty/P = new(loc) + var/obj/item/reagent_containers/hypospray/autoinjector/biginjector/empty/P = new(loc) beaker.reagents.trans_to_obj(P, amount_per_injector) P.update_icon() if(new_name) diff --git a/code/modules/reagents/machinery/pump.dm b/code/modules/reagents/machinery/pump.dm index 0330547df2a..238584bf047 100644 --- a/code/modules/reagents/machinery/pump.dm +++ b/code/modules/reagents/machinery/pump.dm @@ -13,10 +13,10 @@ icon = 'icons/obj/machines/reagent.dmi' icon_state = "pump" - circuit = /obj/item/weapon/circuitboard/fluidpump + circuit = /obj/item/circuitboard/fluidpump active_power_usage = 200 * CELLRATE - var/obj/item/weapon/cell/cell = null + var/obj/item/cell/cell = null var/obj/item/hose_connector/output/Output = null var/reagents_per_cycle = 40 var/on = 0 @@ -40,16 +40,16 @@ . = ..() /obj/machinery/pump/RefreshParts() - var/obj/item/weapon/stock_parts/manipulator/SM = locate() in component_parts + var/obj/item/stock_parts/manipulator/SM = locate() in component_parts active_power_usage = initial(active_power_usage) / SM.rating var/motor_power = 0 - for(var/obj/item/weapon/stock_parts/motor/M in component_parts) + for(var/obj/item/stock_parts/motor/M in component_parts) motor_power += M.rating reagents_per_cycle = initial(reagents_per_cycle) * motor_power / 2 var/bin_size = 0 - for(var/obj/item/weapon/stock_parts/matter_bin/SB in component_parts) + for(var/obj/item/stock_parts/matter_bin/SB in component_parts) bin_size += SB.rating // New holder might have different volume. Transfer everything to a new holder to account for this. @@ -139,7 +139,7 @@ if(!set_state(!on)) to_chat(user, "You try to toggle \the [src] but it does not respond.") -/obj/machinery/pump/attackby(obj/item/weapon/W, mob/user) +/obj/machinery/pump/attackby(obj/item/W, mob/user) . = TRUE if(W.has_tool_quality(TOOL_SCREWDRIVER) && !open) to_chat(user, SPAN_NOTICE("You [unlocked ? "screw" : "unscrew"] the battery panel.")) @@ -158,7 +158,7 @@ return FALSE default_unfasten_wrench(user, W, 2 SECONDS) - else if(istype(W, /obj/item/weapon/cell) && open) + else if(istype(W, /obj/item/cell) && open) if(istype(cell)) to_chat(user, "There is a power cell already installed.") return FALSE diff --git a/code/modules/reagents/reactions/distilling/distilling.dm b/code/modules/reagents/reactions/distilling/distilling.dm index 5944a758462..e23a77cddd0 100644 --- a/code/modules/reagents/reactions/distilling/distilling.dm +++ b/code/modules/reagents/reactions/distilling/distilling.dm @@ -39,8 +39,8 @@ /* /decl/chemical_reaction/distilling/on_reaction(var/datum/reagents/holder, var/created_volume) - if(istype(holder.my_atom, /obj/item/weapon/reagent_containers/glass/distilling)) - var/obj/item/weapon/reagent_containers/glass/distilling/D = holder.my_atom + if(istype(holder.my_atom, /obj/item/reagent_containers/glass/distilling)) + var/obj/item/reagent_containers/glass/distilling/D = holder.my_atom var/obj/machinery/portable_atmospherics/powered/reagent_distillery/RD = D.Master RD.current_temp += temp_shift return diff --git a/code/modules/reagents/reactions/instant/food.dm b/code/modules/reagents/reactions/instant/food.dm index d3f934051ae..8f28921586b 100644 --- a/code/modules/reagents/reactions/instant/food.dm +++ b/code/modules/reagents/reactions/instant/food.dm @@ -23,7 +23,7 @@ /decl/chemical_reaction/instant/food/tofu/on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) - new /obj/item/weapon/reagent_containers/food/snacks/tofu(location) + new /obj/item/reagent_containers/food/snacks/tofu(location) return /decl/chemical_reaction/instant/food/chocolate_bar @@ -37,7 +37,7 @@ /decl/chemical_reaction/instant/food/chocolate_bar/on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) - new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location) + new /obj/item/reagent_containers/food/snacks/chocolatebar(location) return /decl/chemical_reaction/instant/food/chocolate_bar2 @@ -51,7 +51,7 @@ /decl/chemical_reaction/instant/food/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) - new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location) + new /obj/item/reagent_containers/food/snacks/chocolatebar(location) return /decl/chemical_reaction/instant/food/cookingoilcorn @@ -118,7 +118,7 @@ /decl/chemical_reaction/instant/food/cheesewheel/on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) - new /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel(location) + new /obj/item/reagent_containers/food/snacks/sliceable/cheesewheel(location) return /decl/chemical_reaction/instant/food/meatball @@ -132,7 +132,7 @@ /decl/chemical_reaction/instant/food/meatball/on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) - new /obj/item/weapon/reagent_containers/food/snacks/meatball(location) + new /obj/item/reagent_containers/food/snacks/meatball(location) return /decl/chemical_reaction/instant/food/dough @@ -146,7 +146,7 @@ /decl/chemical_reaction/instant/food/dough/on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) - new /obj/item/weapon/reagent_containers/food/snacks/dough(location) + new /obj/item/reagent_containers/food/snacks/dough(location) return /decl/chemical_reaction/instant/food/syntiflesh @@ -159,7 +159,7 @@ /decl/chemical_reaction/instant/food/syntiflesh/on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) - new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(location) + new /obj/item/reagent_containers/food/snacks/meat/syntiflesh(location) return /* @@ -206,5 +206,5 @@ /decl/chemical_reaction/instant/food/butter/on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) - new /obj/item/weapon/reagent_containers/food/snacks/spreads/butter(location) + new /obj/item/reagent_containers/food/snacks/spreads/butter(location) return \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/_reagent_containers.dm b/code/modules/reagents/reagent_containers/_reagent_containers.dm index dba86fba0ce..04539d0df7a 100644 --- a/code/modules/reagents/reagent_containers/_reagent_containers.dm +++ b/code/modules/reagents/reagent_containers/_reagent_containers.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/reagent_containers +/obj/item/reagent_containers name = "Container" desc = "..." icon = 'icons/obj/chemical.dmi' @@ -9,7 +9,7 @@ var/volume = 30 var/list/starts_with -/obj/item/weapon/reagent_containers/verb/set_APTFT() //set amount_per_transfer_from_this +/obj/item/reagent_containers/verb/set_APTFT() //set amount_per_transfer_from_this set name = "Set transfer amount" set category = "Object" set src in range(0) @@ -17,10 +17,10 @@ if(N) amount_per_transfer_from_this = N -/obj/item/weapon/reagent_containers/Initialize() +/obj/item/reagent_containers/Initialize() . = ..() if(!possible_transfer_amounts) - src.verbs -= /obj/item/weapon/reagent_containers/verb/set_APTFT + src.verbs -= /obj/item/reagent_containers/verb/set_APTFT create_reagents(volume) if(starts_with) @@ -33,18 +33,18 @@ warning("[src]([src.type]) starts with more reagents than it has total volume") starts_with = null // it should gc, since it's just strings and numbers -/obj/item/weapon/reagent_containers/attack_self(mob/user as mob) +/obj/item/reagent_containers/attack_self(mob/user as mob) return -/obj/item/weapon/reagent_containers/afterattack(obj/target, mob/user, flag) +/obj/item/reagent_containers/afterattack(obj/target, mob/user, flag) return -/obj/item/weapon/reagent_containers/proc/reagentlist() // For attack logs +/obj/item/reagent_containers/proc/reagentlist() // For attack logs if(reagents) return reagents.get_reagents() return "No reagent holder" -/obj/item/weapon/reagent_containers/proc/standard_dispenser_refill(var/mob/user, var/obj/structure/reagent_dispensers/target) // This goes into afterattack +/obj/item/reagent_containers/proc/standard_dispenser_refill(var/mob/user, var/obj/structure/reagent_dispensers/target) // This goes into afterattack if(!istype(target)) return 0 @@ -60,7 +60,7 @@ to_chat(user, "You fill [src] with [trans] units of the contents of [target].") return 1 -/obj/item/weapon/reagent_containers/proc/standard_splash_mob(var/mob/user, var/mob/target) // This goes into afterattack +/obj/item/reagent_containers/proc/standard_splash_mob(var/mob/user, var/mob/target) // This goes into afterattack if(!istype(target)) return @@ -78,19 +78,19 @@ reagents.splash(target, reagents.total_volume) return 1 -/obj/item/weapon/reagent_containers/proc/self_feed_message(var/mob/user) +/obj/item/reagent_containers/proc/self_feed_message(var/mob/user) to_chat(user, "You eat \the [src]") -/obj/item/weapon/reagent_containers/proc/other_feed_message_start(var/mob/user, var/mob/target) +/obj/item/reagent_containers/proc/other_feed_message_start(var/mob/user, var/mob/target) user.visible_message("[user] is trying to feed [target] \the [src]!") -/obj/item/weapon/reagent_containers/proc/other_feed_message_finish(var/mob/user, var/mob/target) +/obj/item/reagent_containers/proc/other_feed_message_finish(var/mob/user, var/mob/target) user.visible_message("[user] has fed [target] \the [src]!") -/obj/item/weapon/reagent_containers/proc/feed_sound(var/mob/user) +/obj/item/reagent_containers/proc/feed_sound(var/mob/user) return -/obj/item/weapon/reagent_containers/proc/standard_feed_mob(var/mob/user, var/mob/target) // This goes into attack +/obj/item/reagent_containers/proc/standard_feed_mob(var/mob/user, var/mob/target) // This goes into attack if(!istype(target) || !target.can_feed()) return FALSE @@ -127,7 +127,7 @@ feed_sound(user) return TRUE -/obj/item/weapon/reagent_containers/proc/standard_pour_into(var/mob/user, var/atom/target) // This goes into afterattack and yes, it's atom-level +/obj/item/reagent_containers/proc/standard_pour_into(var/mob/user, var/atom/target) // This goes into afterattack and yes, it's atom-level if(!target.is_open_container() || !target.reagents) return 0 diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index c25ee292f57..6490813686f 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -1,19 +1,19 @@ -/obj/item/weapon/storage/box/bloodpacks +/obj/item/storage/box/bloodpacks name = "blood packs bags" desc = "This box contains blood packs." icon_state = "sterile" -/obj/item/weapon/storage/box/bloodpacks/Initialize() +/obj/item/storage/box/bloodpacks/Initialize() . = ..() - new /obj/item/weapon/reagent_containers/blood/empty(src) - new /obj/item/weapon/reagent_containers/blood/empty(src) - new /obj/item/weapon/reagent_containers/blood/empty(src) - new /obj/item/weapon/reagent_containers/blood/empty(src) - new /obj/item/weapon/reagent_containers/blood/empty(src) - new /obj/item/weapon/reagent_containers/blood/empty(src) - new /obj/item/weapon/reagent_containers/blood/empty(src) + new /obj/item/reagent_containers/blood/empty(src) + new /obj/item/reagent_containers/blood/empty(src) + new /obj/item/reagent_containers/blood/empty(src) + new /obj/item/reagent_containers/blood/empty(src) + new /obj/item/reagent_containers/blood/empty(src) + new /obj/item/reagent_containers/blood/empty(src) + new /obj/item/reagent_containers/blood/empty(src) -/obj/item/weapon/reagent_containers/blood +/obj/item/reagent_containers/blood name = "IV pack" var/base_name = " " desc = "Holds liquids used for transfusion." @@ -29,7 +29,7 @@ var/blood_type = null var/reag_id = "blood" -/obj/item/weapon/reagent_containers/blood/Initialize() +/obj/item/reagent_containers/blood/Initialize() . = ..() base_name = name base_desc = desc @@ -39,10 +39,10 @@ reagents.add_reagent(reag_id, 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null)) update_icon() -/obj/item/weapon/reagent_containers/blood/on_reagent_change() +/obj/item/reagent_containers/blood/on_reagent_change() update_icon() -/obj/item/weapon/reagent_containers/blood/update_icon() +/obj/item/reagent_containers/blood/update_icon() var/percent = round((reagents.total_volume / volume) * 100) if(percent >= 0 && percent <= 9) icon_state = "empty" @@ -54,8 +54,8 @@ icon_state = "full" item_state = "bloodpack_full" -/obj/item/weapon/reagent_containers/blood/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen)) +/obj/item/reagent_containers/blood/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/pen) || istype(W, /obj/item/flashlight/pen)) var/tmp_label = sanitizeSafe(tgui_input_text(user, "Enter a label for [name]", "Label", label_text, MAX_NAME_LEN), MAX_NAME_LEN) if(length(tmp_label) > 50) to_chat(user, "The label can be at most 50 characters long.") @@ -68,7 +68,7 @@ label_text = tmp_label update_iv_label() -/obj/item/weapon/reagent_containers/blood/proc/update_iv_label() +/obj/item/reagent_containers/blood/proc/update_iv_label() if(label_text == "") name = base_name else if(length(label_text) > 10) @@ -78,33 +78,33 @@ name = "[base_name] ([label_text])" desc = "[base_desc] It is labeled \"[label_text]\"." -/obj/item/weapon/reagent_containers/blood/APlus +/obj/item/reagent_containers/blood/APlus blood_type = "A+" -/obj/item/weapon/reagent_containers/blood/AMinus +/obj/item/reagent_containers/blood/AMinus blood_type = "A-" -/obj/item/weapon/reagent_containers/blood/BPlus +/obj/item/reagent_containers/blood/BPlus blood_type = "B+" -/obj/item/weapon/reagent_containers/blood/BMinus +/obj/item/reagent_containers/blood/BMinus blood_type = "B-" -/obj/item/weapon/reagent_containers/blood/OPlus +/obj/item/reagent_containers/blood/OPlus blood_type = "O+" -/obj/item/weapon/reagent_containers/blood/OMinus +/obj/item/reagent_containers/blood/OMinus blood_type = "O-" -/obj/item/weapon/reagent_containers/blood/synthplas +/obj/item/reagent_containers/blood/synthplas blood_type = "O-" reag_id = "synthblood_dilute" -/obj/item/weapon/reagent_containers/blood/synthblood +/obj/item/reagent_containers/blood/synthblood blood_type = "O-" reag_id = "synthblood" -/obj/item/weapon/reagent_containers/blood/empty +/obj/item/reagent_containers/blood/empty name = "Empty BloodPack" desc = "Seems pretty useless... Maybe if there were a way to fill it?" icon_state = "empty" diff --git a/code/modules/reagents/reagent_containers/blood_pack_vr.dm b/code/modules/reagents/reagent_containers/blood_pack_vr.dm index d6a15ae59a0..fa4c2862fdf 100644 --- a/code/modules/reagents/reagent_containers/blood_pack_vr.dm +++ b/code/modules/reagents/reagent_containers/blood_pack_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/reagent_containers/blood/attack_self(mob/living/user as mob) +/obj/item/reagent_containers/blood/attack_self(mob/living/user as mob) if(user.a_intent == I_HURT) if(reagents.total_volume && volume) var/remove_volume = volume* 0.1 //10% of what the bloodpack can hold. @@ -20,39 +20,39 @@ else return -/obj/item/weapon/reagent_containers/blood/prelabeled +/obj/item/reagent_containers/blood/prelabeled name = "IV Pack" desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted." -/obj/item/weapon/reagent_containers/blood/prelabeled/update_iv_label() +/obj/item/reagent_containers/blood/prelabeled/update_iv_label() return -/obj/item/weapon/reagent_containers/blood/prelabeled/APlus +/obj/item/reagent_containers/blood/prelabeled/APlus name = "IV Pack (A+)" desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled A+" blood_type = "A+" -/obj/item/weapon/reagent_containers/blood/prelabeled/AMinus +/obj/item/reagent_containers/blood/prelabeled/AMinus name = "IV Pack (A-)" desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled A_" blood_type = "A-" -/obj/item/weapon/reagent_containers/blood/prelabeled/BPlus +/obj/item/reagent_containers/blood/prelabeled/BPlus name = "IV Pack (B+)" desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled B+" blood_type = "B+" -/obj/item/weapon/reagent_containers/blood/prelabeled/BMinus +/obj/item/reagent_containers/blood/prelabeled/BMinus name = "IV Pack (B-)" desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled B-" blood_type = "B-" -/obj/item/weapon/reagent_containers/blood/prelabeled/OPlus +/obj/item/reagent_containers/blood/prelabeled/OPlus name = "IV Pack (O+)" desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled O+" blood_type = "O+" -/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus +/obj/item/reagent_containers/blood/prelabeled/OMinus name = "IV Pack (O-)" desc = "Holds liquids used for transfusion. This one's label seems to be hardprinted. This one is labeled O-" blood_type = "O-" diff --git a/code/modules/reagents/reagent_containers/borghypo.dm b/code/modules/reagents/reagent_containers/borghypo.dm index 9c50790e63a..65923ef9e1d 100644 --- a/code/modules/reagents/reagent_containers/borghypo.dm +++ b/code/modules/reagents/reagent_containers/borghypo.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/reagent_containers/borghypo +/obj/item/reagent_containers/borghypo name = "cyborg hypospray" desc = "An advanced chemical synthesizer and injection system, designed for heavy-duty medical equipment." icon = 'icons/obj/syringe.dmi' @@ -18,23 +18,23 @@ var/list/reagent_volumes = list() var/list/reagent_names = list() -/obj/item/weapon/reagent_containers/borghypo/surgeon +/obj/item/reagent_containers/borghypo/surgeon reagent_ids = list("inaprovaline", "dexalin", "tricordrazine", "spaceacillin", "oxycodone") -/obj/item/weapon/reagent_containers/borghypo/crisis +/obj/item/reagent_containers/borghypo/crisis reagent_ids = list("inaprovaline", "bicaridine", "kelotane", "anti_toxin", "dexalin", "tricordrazine", "spaceacillin", "tramadol") -/obj/item/weapon/reagent_containers/borghypo/lost +/obj/item/reagent_containers/borghypo/lost reagent_ids = list("tricordrazine", "bicaridine", "dexalin", "anti_toxin", "tramadol", "spaceacillin") -/obj/item/weapon/reagent_containers/borghypo/merc +/obj/item/reagent_containers/borghypo/merc name = "advanced cyborg hypospray" desc = "An advanced nanite and chemical synthesizer and injection system, designed for heavy-duty medical equipment. This type is capable of safely bypassing \ thick materials that other hyposprays would struggle with." bypass_protection = TRUE // Because mercs tend to be in spacesuits. reagent_ids = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", "synthblood") -/obj/item/weapon/reagent_containers/borghypo/Initialize() +/obj/item/reagent_containers/borghypo/Initialize() . = ..() for(var/T in reagent_ids) @@ -44,11 +44,11 @@ START_PROCESSING(SSobj, src) -/obj/item/weapon/reagent_containers/borghypo/Destroy() +/obj/item/reagent_containers/borghypo/Destroy() STOP_PROCESSING(SSobj, src) return ..() -/obj/item/weapon/reagent_containers/borghypo/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg+ +/obj/item/reagent_containers/borghypo/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg+ if(++charge_tick < recharge_time) return 0 charge_tick = 0 @@ -62,7 +62,7 @@ reagent_volumes[T] = min(reagent_volumes[T] + 5, volume) return 1 -/obj/item/weapon/reagent_containers/borghypo/attack(var/mob/living/M, var/mob/user) +/obj/item/reagent_containers/borghypo/attack(var/mob/living/M, var/mob/user) if(!istype(M)) return @@ -94,7 +94,7 @@ to_chat(user, "[t] units injected. [reagent_volumes[reagent_ids[mode]]] units remaining.") return -/obj/item/weapon/reagent_containers/borghypo/attack_self(mob/user as mob) //Change the mode +/obj/item/reagent_containers/borghypo/attack_self(mob/user as mob) //Change the mode var/t = "" for(var/i = 1 to reagent_ids.len) if(t) @@ -108,7 +108,7 @@ return -/obj/item/weapon/reagent_containers/borghypo/Topic(var/href, var/list/href_list) +/obj/item/reagent_containers/borghypo/Topic(var/href, var/list/href_list) if(href_list["reagent"]) var/t = reagent_ids.Find(href_list["reagent"]) if(t) @@ -117,13 +117,13 @@ var/datum/reagent/R = SSchemistry.chemical_reagents[reagent_ids[mode]] to_chat(usr, "Synthesizer is now producing '[R.name]'.") -/obj/item/weapon/reagent_containers/borghypo/examine(mob/user) +/obj/item/reagent_containers/borghypo/examine(mob/user) . = ..() if(get_dist(user, src) <= 2) var/datum/reagent/R = SSchemistry.chemical_reagents[reagent_ids[mode]] . += "It is currently producing [R.name] and has [reagent_volumes[reagent_ids[mode]]] out of [volume] units left." -/obj/item/weapon/reagent_containers/borghypo/service +/obj/item/reagent_containers/borghypo/service name = "cyborg drink synthesizer" desc = "A portable drink dispencer." icon = 'icons/obj/drinks.dmi' @@ -176,10 +176,10 @@ "watermelonjuice", "whiskey") -/obj/item/weapon/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user) +/obj/item/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user) return -/obj/item/weapon/reagent_containers/borghypo/service/afterattack(var/obj/target, var/mob/user, var/proximity) +/obj/item/reagent_containers/borghypo/service/afterattack(var/obj/target, var/mob/user, var/proximity) if(!proximity) return diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 5b927424230..6bca6b11b21 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// /// Droppers. //////////////////////////////////////////////////////////////////////////////// -/obj/item/weapon/reagent_containers/dropper +/obj/item/reagent_containers/dropper name = "dropper" desc = "A dropper. Transfers up to 5 units at a time." icon = 'icons/obj/chemical.dmi' @@ -14,7 +14,7 @@ drop_sound = 'sound/items/drop/glass.ogg' pickup_sound = 'sound/items/pickup/glass.ogg' -/obj/item/weapon/reagent_containers/dropper/examine(var/mob/user) +/obj/item/reagent_containers/dropper/examine(var/mob/user) . = ..() if(get_dist(user, src) <= 2) if(reagents && reagents.reagent_list.len) @@ -22,7 +22,7 @@ else . += "It is empty." -/obj/item/weapon/reagent_containers/dropper/afterattack(var/obj/target, var/mob/user, var/proximity) +/obj/item/reagent_containers/dropper/afterattack(var/obj/target, var/mob/user, var/proximity) if(!target.reagents || !proximity) return if(reagents.total_volume) @@ -31,7 +31,7 @@ to_chat(user, "[target] is full.") return - if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/clothing/mask/smokable/cigarette)) //You can inject humans and food but you cant remove the shit. + if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/reagent_containers/food) && !istype(target, /obj/item/clothing/mask/smokable/cigarette)) //You can inject humans and food but you cant remove the shit. to_chat(user, "You cannot directly fill this object.") return @@ -93,16 +93,16 @@ return -/obj/item/weapon/reagent_containers/dropper/on_reagent_change() +/obj/item/reagent_containers/dropper/on_reagent_change() update_icon() -/obj/item/weapon/reagent_containers/dropper/update_icon() +/obj/item/reagent_containers/dropper/update_icon() if(reagents.total_volume) icon_state = "dropper1" else icon_state = "dropper0" -/obj/item/weapon/reagent_containers/dropper/industrial +/obj/item/reagent_containers/dropper/industrial name = "Industrial Dropper" desc = "A larger dropper. Transfers up to 10 units at a time." amount_per_transfer_from_this = 10 diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index b33c85592db..213d99819ef 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -2,7 +2,7 @@ //////////////////////////////////////////////////////////////////////////////// /// (Mixing)Glass. //////////////////////////////////////////////////////////////////////////////// -/obj/item/weapon/reagent_containers/glass +/obj/item/reagent_containers/glass name = " " var/base_name = " " desc = " " @@ -31,12 +31,12 @@ /obj/structure/table, /obj/structure/closet, /obj/structure/sink, - /obj/item/weapon/storage, + /obj/item/storage, /obj/machinery/atmospherics/unary/cryo_cell, /obj/machinery/dna_scannernew, - /obj/item/weapon/grenade/chem_grenade, + /obj/item/grenade/chem_grenade, /mob/living/bot/medbot, - /obj/item/weapon/storage/secure/safe, + /obj/item/storage/secure/safe, /obj/machinery/iv_drip, /obj/structure/medical_stand, //VOREStation Add, /obj/machinery/disease2/incubator, @@ -52,7 +52,7 @@ /obj/machinery/portable_atmospherics/powered/reagent_distillery ) -/obj/item/weapon/reagent_containers/glass/Initialize() +/obj/item/reagent_containers/glass/Initialize() . = ..() if(LAZYLEN(prefill)) for(var/R in prefill) @@ -62,7 +62,7 @@ base_name = name base_desc = desc -/obj/item/weapon/reagent_containers/glass/examine(var/mob/user) +/obj/item/reagent_containers/glass/examine(var/mob/user) . = ..() if(get_dist(user, src) <= 2) if(reagents && reagents.reagent_list.len) @@ -72,7 +72,7 @@ if(!is_open_container()) . += "Airtight lid seals it completely." -/obj/item/weapon/reagent_containers/glass/attack_self() +/obj/item/reagent_containers/glass/attack_self() ..() if(is_open_container()) to_chat(usr, "You put the lid on \the [src].") @@ -82,7 +82,7 @@ flags |= OPENCONTAINER update_icon() -/obj/item/weapon/reagent_containers/glass/attack(mob/M as mob, mob/user as mob, def_zone) +/obj/item/reagent_containers/glass/attack(mob/M as mob, mob/user as mob, def_zone) if(force && !(flags & NOBLUDGEON) && user.a_intent == I_HURT) return ..() @@ -95,15 +95,15 @@ return 0 -/obj/item/weapon/reagent_containers/glass/standard_feed_mob(var/mob/user, var/mob/target) +/obj/item/reagent_containers/glass/standard_feed_mob(var/mob/user, var/mob/target) if(user.a_intent == I_HURT) return 1 return ..() -/obj/item/weapon/reagent_containers/glass/self_feed_message(var/mob/user) +/obj/item/reagent_containers/glass/self_feed_message(var/mob/user) to_chat(user, "You swallow a gulp from \the [src].") -/obj/item/weapon/reagent_containers/glass/proc/attempt_snake_milking(mob/living/user, mob/living/target) +/obj/item/reagent_containers/glass/proc/attempt_snake_milking(mob/living/user, mob/living/target) var/reagent var/amount @@ -128,7 +128,7 @@ reagents.add_reagent(reagent, amount) return TRUE -/obj/item/weapon/reagent_containers/glass/afterattack(var/obj/target, var/mob/user, var/proximity) +/obj/item/reagent_containers/glass/afterattack(var/obj/target, var/mob/user, var/proximity) if(!proximity || !is_open_container()) //Is the container open & are they next to whatever they're clicking? return 1 //If not, do nothing. for(var/type in can_be_placed_into) //Is it something it can be placed into? @@ -147,8 +147,8 @@ return 1 ..() -/obj/item/weapon/reagent_containers/glass/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen)) +/obj/item/reagent_containers/glass/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/pen) || istype(W, /obj/item/flashlight/pen)) var/tmp_label = sanitizeSafe(tgui_input_text(user, "Enter a label for [name]", "Label", label_text, MAX_NAME_LEN), MAX_NAME_LEN) if(length(tmp_label) > 50) to_chat(user, "The label can be at most 50 characters long.") @@ -160,13 +160,13 @@ to_chat(user, "You set the label to \"[tmp_label]\".") label_text = tmp_label update_name_label() - if(istype(W,/obj/item/weapon/storage/bag)) + if(istype(W,/obj/item/storage/bag)) ..() if(W && W.w_class <= w_class && (flags & OPENCONTAINER) && user.a_intent != I_HELP) to_chat(user, "You dip \the [W] into \the [src].") reagents.touch_obj(W, reagents.total_volume) -/obj/item/weapon/reagent_containers/glass/proc/update_name_label() +/obj/item/reagent_containers/glass/proc/update_name_label() if(label_text == "") name = base_name else if(length(label_text) > 20) @@ -177,7 +177,7 @@ desc = "[base_desc] It is labeled \"[label_text]\"." update_icon() -/obj/item/weapon/reagent_containers/glass/beaker +/obj/item/reagent_containers/glass/beaker name = "beaker" desc = "A beaker." icon = 'icons/obj/chemical.dmi' @@ -189,29 +189,29 @@ pickup_sound = 'sound/items/pickup/glass.ogg' var/rating = 1 -/obj/item/weapon/reagent_containers/glass/beaker/get_rating() +/obj/item/reagent_containers/glass/beaker/get_rating() return rating -/obj/item/weapon/reagent_containers/glass/beaker/Initialize() +/obj/item/reagent_containers/glass/beaker/Initialize() . = ..() desc += " Can hold up to [volume] units." -/obj/item/weapon/reagent_containers/glass/beaker/on_reagent_change() +/obj/item/reagent_containers/glass/beaker/on_reagent_change() update_icon() -/obj/item/weapon/reagent_containers/glass/beaker/pickup(mob/user) +/obj/item/reagent_containers/glass/beaker/pickup(mob/user) ..() update_icon() -/obj/item/weapon/reagent_containers/glass/beaker/dropped(mob/user) +/obj/item/reagent_containers/glass/beaker/dropped(mob/user) ..() update_icon() -/obj/item/weapon/reagent_containers/glass/beaker/attack_hand() +/obj/item/reagent_containers/glass/beaker/attack_hand() ..() update_icon() -/obj/item/weapon/reagent_containers/glass/beaker/update_icon() +/obj/item/reagent_containers/glass/beaker/update_icon() cut_overlays() if(reagents.total_volume) @@ -235,7 +235,7 @@ if (label_text) add_overlay("label_[initial(icon_state)]") -/obj/item/weapon/reagent_containers/glass/beaker/large +/obj/item/reagent_containers/glass/beaker/large name = "large beaker" desc = "A large beaker." icon_state = "beakerlarge" @@ -247,7 +247,7 @@ flags = OPENCONTAINER rating = 3 -/obj/item/weapon/reagent_containers/glass/beaker/noreact +/obj/item/reagent_containers/glass/beaker/noreact name = "cryostasis beaker" desc = "A cryostasis beaker that allows for chemical storage without reactions." icon_state = "beakernoreact" @@ -257,7 +257,7 @@ amount_per_transfer_from_this = 10 flags = OPENCONTAINER | NOREACT -/obj/item/weapon/reagent_containers/glass/beaker/bluespace +/obj/item/reagent_containers/glass/beaker/bluespace name = "bluespace beaker" desc = "A bluespace beaker, powered by experimental bluespace technology." icon_state = "beakerbluespace" @@ -269,7 +269,7 @@ flags = OPENCONTAINER rating = 5 -/obj/item/weapon/reagent_containers/glass/beaker/vial +/obj/item/reagent_containers/glass/beaker/vial name = "vial" desc = "A small glass vial." icon_state = "vial" @@ -281,14 +281,14 @@ possible_transfer_amounts = list(5,10,15,30) flags = OPENCONTAINER -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone +/obj/item/reagent_containers/glass/beaker/cryoxadone name = "beaker (cryoxadone)" prefill = list("cryoxadone" = 30) -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric +/obj/item/reagent_containers/glass/beaker/sulphuric prefill = list("sacid" = 60) -/obj/item/weapon/reagent_containers/glass/beaker/stopperedbottle +/obj/item/reagent_containers/glass/beaker/stopperedbottle name = "stoppered bottle" desc = "A stoppered bottle for keeping beverages fresh." icon_state = "stopperedbottle" @@ -298,7 +298,7 @@ possible_transfer_amounts = list(5,10,15,25,30,60,120) flags = OPENCONTAINER -/obj/item/weapon/reagent_containers/glass/bucket +/obj/item/reagent_containers/glass/bucket desc = "It's a bucket." name = "bucket" icon = 'icons/obj/janitor.dmi' @@ -315,11 +315,11 @@ drop_sound = 'sound/items/drop/helm.ogg' pickup_sound = 'sound/items/pickup/helm.ogg' -/obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/item/D, mob/user as mob) +/obj/item/reagent_containers/glass/bucket/attackby(var/obj/item/D, mob/user as mob) if(isprox(D)) to_chat(user, "You add [D] to [src].") qdel(D) - user.put_in_hands(new /obj/item/weapon/bucket_sensor) + user.put_in_hands(new /obj/item/bucket_sensor) user.drop_from_inventory(src) qdel(src) return @@ -332,7 +332,7 @@ else if(istype(D, /obj/item/stack/material) && D.get_material_name() == MAT_STEEL) var/obj/item/stack/material/M = D if (M.use(1)) - var/obj/item/weapon/secbot_assembly/edCLN_assembly/B = new /obj/item/weapon/secbot_assembly/edCLN_assembly + var/obj/item/secbot_assembly/edCLN_assembly/B = new /obj/item/secbot_assembly/edCLN_assembly B.loc = get_turf(src) to_chat(user, "You armed the robot frame.") if (user.get_inactive_hand()==src) @@ -341,7 +341,7 @@ qdel(src) else to_chat(user, "You need one sheet of metal to arm the robot frame.") - else if(istype(D, /obj/item/weapon/mop) || istype(D, /obj/item/weapon/soap) || istype(D, /obj/item/weapon/reagent_containers/glass/rag)) //VOREStation Edit - "Allows soap and rags to be used on buckets" + else if(istype(D, /obj/item/mop) || istype(D, /obj/item/soap) || istype(D, /obj/item/reagent_containers/glass/rag)) //VOREStation Edit - "Allows soap and rags to be used on buckets" if(reagents.total_volume < 1) to_chat(user, "\The [src] is empty!") else @@ -351,12 +351,12 @@ else return ..() -/obj/item/weapon/reagent_containers/glass/bucket/update_icon() +/obj/item/reagent_containers/glass/bucket/update_icon() cut_overlays() if (!is_open_container()) add_overlay("lid_[initial(icon_state)]") -/obj/item/weapon/reagent_containers/glass/bucket/wood +/obj/item/reagent_containers/glass/bucket/wood desc = "An old wooden bucket." name = "wooden bucket" icon = 'icons/obj/janitor.dmi' @@ -373,17 +373,17 @@ drop_sound = 'sound/items/drop/wooden.ogg' pickup_sound = 'sound/items/pickup/wooden.ogg' -/obj/item/weapon/reagent_containers/glass/bucket/wood/attackby(var/obj/D, mob/user as mob) +/obj/item/reagent_containers/glass/bucket/wood/attackby(var/obj/D, mob/user as mob) if(isprox(D)) to_chat(user, "This wooden bucket doesn't play well with electronics.") return - else if(istype(D, /obj/item/weapon/material/knife/machete/hatchet)) + else if(istype(D, /obj/item/material/knife/machete/hatchet)) to_chat(user, "You cut a big hole in \the [src] with \the [D]. It's kinda useless as a bucket now.") user.put_in_hands(new /obj/item/clothing/head/helmet/bucket/wood) user.drop_from_inventory(src) qdel(src) return - else if(istype(D, /obj/item/weapon/mop)) + else if(istype(D, /obj/item/mop)) if(reagents.total_volume < 1) to_chat(user, "\The [src] is empty!") else @@ -394,7 +394,7 @@ else return ..() -/obj/item/weapon/reagent_containers/glass/cooler_bottle +/obj/item/reagent_containers/glass/cooler_bottle desc = "A bottle for a water-cooler." name = "water-cooler bottle" icon = 'icons/obj/vending.dmi' @@ -405,7 +405,7 @@ possible_transfer_amounts = list(10,20,30,60,120) volume = 120 -/obj/item/weapon/reagent_containers/glass/pint_mug +/obj/item/reagent_containers/glass/pint_mug desc = "A rustic pint mug designed for drinking ale." name = "pint mug" icon = 'icons/obj/drinks.dmi' diff --git a/code/modules/reagents/reagent_containers/glass_vr.dm b/code/modules/reagents/reagent_containers/glass_vr.dm index 350a64e224b..2249ddd7647 100644 --- a/code/modules/reagents/reagent_containers/glass_vr.dm +++ b/code/modules/reagents/reagent_containers/glass_vr.dm @@ -1,88 +1,88 @@ -/obj/item/weapon/reagent_containers/glass/beaker/neurotoxin +/obj/item/reagent_containers/glass/beaker/neurotoxin prefill = list("neurotoxin" = 50) -/obj/item/weapon/reagent_containers/glass/beaker/vial/bicaridine +/obj/item/reagent_containers/glass/beaker/vial/bicaridine name = "vial (bicaridine)" prefill = list("bicaridine" = 30) -/obj/item/weapon/reagent_containers/glass/beaker/vial/dylovene +/obj/item/reagent_containers/glass/beaker/vial/dylovene name = "vial (dylovene)" prefill = list("dylovene" = 30) -/obj/item/weapon/reagent_containers/glass/beaker/vial/dermaline +/obj/item/reagent_containers/glass/beaker/vial/dermaline name = "vial (dermaline)" prefill = list("dermaline" = 30) -/obj/item/weapon/reagent_containers/glass/beaker/vial/kelotane +/obj/item/reagent_containers/glass/beaker/vial/kelotane name = "vial (kelotane)" prefill = list("kelotane" = 30) -/obj/item/weapon/reagent_containers/glass/beaker/vial/inaprovaline +/obj/item/reagent_containers/glass/beaker/vial/inaprovaline name = "vial (inaprovaline)" prefill = list("inaprovaline" = 30) -/obj/item/weapon/reagent_containers/glass/beaker/vial/dexalin +/obj/item/reagent_containers/glass/beaker/vial/dexalin name = "vial (dexalin)" prefill = list("dexalin" = 30) -/obj/item/weapon/reagent_containers/glass/beaker/vial/dexalinplus +/obj/item/reagent_containers/glass/beaker/vial/dexalinplus name = "vial (dexalinp)" prefill = list("dexalinp" = 30) -/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine +/obj/item/reagent_containers/glass/beaker/vial/tricordrazine name = "vial (tricordrazine)" prefill = list("tricordrazine" = 30) -/obj/item/weapon/reagent_containers/glass/beaker/vial/alkysine +/obj/item/reagent_containers/glass/beaker/vial/alkysine name = "vial (alkysine)" prefill = list("alkysine" = 30) -/obj/item/weapon/reagent_containers/glass/beaker/vial/imidazoline +/obj/item/reagent_containers/glass/beaker/vial/imidazoline name = "vial (imidazoline)" prefill = list("imidazoline" = 30) -/obj/item/weapon/reagent_containers/glass/beaker/vial/peridaxon +/obj/item/reagent_containers/glass/beaker/vial/peridaxon name = "vial (peridaxon)" prefill = list("peridaxon" = 30) -/obj/item/weapon/reagent_containers/glass/beaker/vial/hyronalin +/obj/item/reagent_containers/glass/beaker/vial/hyronalin name = "vial (hyronalin)" prefill = list("hyronalin" = 30) -/obj/item/weapon/reagent_containers/glass/beaker/vial/amorphorovir +/obj/item/reagent_containers/glass/beaker/vial/amorphorovir name = "vial (amorphorovir)" prefill = list("amorphorovir" = 1) -/obj/item/weapon/reagent_containers/glass/beaker/vial/androrovir +/obj/item/reagent_containers/glass/beaker/vial/androrovir name = "vial (androrovir)" prefill = list("androrovir" = 1) -/obj/item/weapon/reagent_containers/glass/beaker/vial/gynorovir +/obj/item/reagent_containers/glass/beaker/vial/gynorovir name = "vial (gynorovir)" prefill = list("gynorovir" = 1) -/obj/item/weapon/reagent_containers/glass/beaker/vial/androgynorovir +/obj/item/reagent_containers/glass/beaker/vial/androgynorovir name = "vial (androgynorovir)" prefill = list("androgynorovir" = 1) -/obj/item/weapon/reagent_containers/glass/beaker/vial/macrocillin +/obj/item/reagent_containers/glass/beaker/vial/macrocillin name = "vial (macrocillin)" prefill = list("macrocillin" = 1) -/obj/item/weapon/reagent_containers/glass/beaker/vial/microcillin +/obj/item/reagent_containers/glass/beaker/vial/microcillin name = "vial (microcillin)" prefill = list("microcillin" = 1) -/obj/item/weapon/reagent_containers/glass/beaker/vial/normalcillin +/obj/item/reagent_containers/glass/beaker/vial/normalcillin name = "vial (normalcillin)" prefill = list("normalcillin" = 1) -/obj/item/weapon/reagent_containers/glass/beaker/vial/supermatter +/obj/item/reagent_containers/glass/beaker/vial/supermatter name = "vial (supermatter)" desc = "A glass vial containing the extremely dangerous results of grinding a shard of supermatter down to a fine powder." prefill = list("supermatter" = 5) -/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup +/obj/item/reagent_containers/glass/beaker/measuring_cup name = "measuring cup" desc = "A measuring cup." icon = 'icons/obj/chemical_vr.dmi' diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index ae3e65f89df..76c089be285 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -2,7 +2,7 @@ /// HYPOSPRAY //////////////////////////////////////////////////////////////////////////////// -/obj/item/weapon/reagent_containers/hypospray +/obj/item/reagent_containers/hypospray name = "hypospray" desc = "The DeForest Medical Corporation hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients." icon = 'icons/obj/syringe.dmi' @@ -21,7 +21,7 @@ var/list/filled_reagents = list() var/hyposound // What sound do we play on use? -/obj/item/weapon/reagent_containers/hypospray/Initialize() +/obj/item/reagent_containers/hypospray/Initialize() . = ..() if(filled) if(filled_reagents) @@ -29,7 +29,7 @@ reagents.add_reagent(r, filled_reagents[r]) update_icon() -/obj/item/weapon/reagent_containers/hypospray/attack(mob/living/M as mob, mob/user as mob) +/obj/item/reagent_containers/hypospray/attack(mob/living/M as mob, mob/user as mob) if(!reagents.total_volume) to_chat(user, "[src] is empty.") return @@ -67,7 +67,7 @@ return // This does the actual injection and transfer. -/obj/item/weapon/reagent_containers/hypospray/proc/do_injection(mob/living/carbon/human/H, mob/living/user) +/obj/item/reagent_containers/hypospray/proc/do_injection(mob/living/carbon/human/H, mob/living/user) if(!istype(H) || !istype(user)) return FALSE @@ -87,21 +87,21 @@ return FALSE //A vial-loaded hypospray. Cartridge-based! -/obj/item/weapon/reagent_containers/hypospray/vial +/obj/item/reagent_containers/hypospray/vial name = "advanced hypospray" icon_state = "advhypo" desc = "A new development from DeForest Medical, this new hypospray takes 30-unit vials as the drug supply for easy swapping." - var/obj/item/weapon/reagent_containers/glass/beaker/vial/loaded_vial //Wow, what a name. + var/obj/item/reagent_containers/glass/beaker/vial/loaded_vial //Wow, what a name. volume = 0 -/obj/item/weapon/reagent_containers/hypospray/vial/Initialize() +/obj/item/reagent_containers/hypospray/vial/Initialize() . = ..() icon_state = "[initial(icon_state)]" - loaded_vial = new /obj/item/weapon/reagent_containers/glass/beaker/vial(src) //Comes with an empty vial + loaded_vial = new /obj/item/reagent_containers/glass/beaker/vial(src) //Comes with an empty vial volume = loaded_vial.volume reagents.maximum_volume = loaded_vial.reagents.maximum_volume -/obj/item/weapon/reagent_containers/hypospray/vial/attack_hand(mob/user as mob) +/obj/item/reagent_containers/hypospray/vial/attack_hand(mob/user as mob) if(user.get_inactive_hand() == src) if(loaded_vial) reagents.trans_to_holder(loaded_vial.reagents,volume) @@ -117,15 +117,15 @@ else return ..() -/obj/item/weapon/reagent_containers/hypospray/vial/update_icon() +/obj/item/reagent_containers/hypospray/vial/update_icon() ..() if(loaded_vial) icon_state = "[initial(icon_state)]" else icon_state = "[initial(icon_state)]_empty" -/obj/item/weapon/reagent_containers/hypospray/vial/attackby(obj/item/weapon/W, mob/user as mob) - if(istype(W, /obj/item/weapon/reagent_containers/glass/beaker/vial)) +/obj/item/reagent_containers/hypospray/vial/attackby(obj/item/W, mob/user as mob) + if(istype(W, /obj/item/reagent_containers/glass/beaker/vial)) if(!loaded_vial) user.visible_message("[user] begins loading [W] into \the [src].","You start loading [W] into \the [src].") if(!do_after(user,30) || loaded_vial || !(W in user)) @@ -146,7 +146,7 @@ else ..() -/obj/item/weapon/reagent_containers/hypospray/autoinjector +/obj/item/reagent_containers/hypospray/autoinjector name = "autoinjector" desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel." icon_state = "blue" @@ -158,32 +158,32 @@ preserve_item = 0 hyposound = 'sound/effects/hypospray.ogg' -/obj/item/weapon/reagent_containers/hypospray/autoinjector/on_reagent_change() +/obj/item/reagent_containers/hypospray/autoinjector/on_reagent_change() ..() update_icon() -/obj/item/weapon/reagent_containers/hypospray/autoinjector/empty +/obj/item/reagent_containers/hypospray/autoinjector/empty filled = 0 filled_reagents = list() -/obj/item/weapon/reagent_containers/hypospray/autoinjector/used/Initialize() +/obj/item/reagent_containers/hypospray/autoinjector/used/Initialize() . = ..() flags &= ~OPENCONTAINER icon_state = "[initial(icon_state)]0" -/obj/item/weapon/reagent_containers/hypospray/autoinjector/do_injection(mob/living/carbon/human/H, mob/living/user) +/obj/item/reagent_containers/hypospray/autoinjector/do_injection(mob/living/carbon/human/H, mob/living/user) . = ..() if(.) // Will occur if successfully injected. flags &= ~OPENCONTAINER update_icon() -/obj/item/weapon/reagent_containers/hypospray/autoinjector/update_icon() +/obj/item/reagent_containers/hypospray/autoinjector/update_icon() if(reagents.total_volume > 0) icon_state = "[initial(icon_state)]1" else icon_state = "[initial(icon_state)]0" -/obj/item/weapon/reagent_containers/hypospray/autoinjector/examine(mob/user) +/obj/item/reagent_containers/hypospray/autoinjector/examine(mob/user) . = ..() if(reagents && reagents.reagent_list.len) . += "It is currently loaded." @@ -191,24 +191,24 @@ . += "It is spent." -/obj/item/weapon/reagent_containers/hypospray/autoinjector/detox +/obj/item/reagent_containers/hypospray/autoinjector/detox name = "autoinjector (antitox)" icon_state = "green" filled_reagents = list("anti_toxin" = 5) //Special autoinjectors, while having potent chems like the 15u ones, the chems are usually potent enough that 5u is enough -/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed +/obj/item/reagent_containers/hypospray/autoinjector/bonemed name = "bone repair injector" desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel. This one excels at treating damage to bones." filled_reagents = list("osteodaxon" = 5) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed +/obj/item/reagent_containers/hypospray/autoinjector/clonemed name = "clone injector" desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel. This one excels at treating genetic damage." filled_reagents = list("rezadone" = 5) // These have a 15u capacity, somewhat higher tech level, and generally more useful chems, but are otherwise the same as the regular autoinjectors. -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector +/obj/item/reagent_containers/hypospray/autoinjector/biginjector name = "empty hypo" desc = "A refined version of the standard autoinjector, allowing greater capacity." icon_state = "autoinjector" @@ -217,145 +217,145 @@ origin_tech = list(TECH_BIO = 4) filled_reagents = list("inaprovaline" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/empty //for the autolathe +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/empty //for the autolathe name = "large autoinjector" filled = 0 filled_reagents = list() -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute name = "trauma hypo" desc = "A refined version of the standard autoinjector, allowing greater capacity. This one is made to be used on victims of \ moderate blunt trauma." filled_reagents = list("bicaridine" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn name = "burn hypo" desc = "A refined version of the standard autoinjector, allowing greater capacity. This one is made to be used on burn victims, \ featuring an optimized chemical mixture to allow for rapid healing." filled_reagents = list("kelotane" = 7.5, "dermaline" = 7.5) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/toxin +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/toxin name = "toxin hypo" desc = "A refined version of the standard autoinjector, allowing greater capacity. This one is made to counteract toxins." filled_reagents = list("anti_toxin" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/oxy +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/oxy name = "oxy hypo" desc = "A refined version of the standard autoinjector, allowing greater capacity. This one is made to counteract oxygen \ deprivation." filled_reagents = list("dexalinp" = 10, "tricordrazine" = 5) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity name = "purity hypo" desc = "A refined version of the standard autoinjector, allowing greater capacity. This variant excels at \ resolving viruses, infections, radiation, and genetic maladies." filled_reagents = list("spaceacillin" = 4, "arithrazine" = 5, "prussian_blue" = 5, "ryetalyn" = 1) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/pain +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain name = "pain hypo" desc = "A refined version of the standard autoinjector, allowing greater capacity. This one contains potent painkillers." filled_reagents = list("tramadol" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ name = "organ hypo" desc = "A refined version of the standard autoinjector, allowing greater capacity. Organ damage is resolved by this variant." filled_reagents = list("alkysine" = 3, "imidazoline" = 2, "peridaxon" = 10) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/combat name = "combat hypo" desc = "A refined version of the standard autoinjector, allowing greater capacity. This is a more dangerous and potentially \ addictive hypo compared to others, as it contains a potent cocktail of various chemicals to optimize the recipient's combat \ ability." filled_reagents = list("bicaridine" = 3, "kelotane" = 1.5, "dermaline" = 1.5, "oxycodone" = 3, "hyperzine" = 3, "tricordrazine" = 3) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting name = "clotting agent" desc = "A refined version of the standard autoinjector, allowing greater capacity. This variant excels at treating bleeding wounds and internal bleeding." filled_reagents = list("inaprovaline" = 5, "myelamine" = 10) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose name = "glucose hypo" desc = "A hypoinjector filled with glucose, used for critically malnourished patients and voidsuited workers." filled_reagents = list("glucose" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/stimm +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/stimm name = "stimm injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one is filled with a home-made stimulant, with some serious side-effects." filled_reagents = list("stimm" = 10) // More than 10u will OD. -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/expired +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/expired name = "expired injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one has had its contents expire a long time ago, using it now will probably make someone sick, or worse." filled_reagents = list("expired_medicine" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/soporific +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/soporific name = "soporific injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one is sometimes used by orderlies, as it has soporifics, which make someone tired and fall asleep." filled_reagents = list("stoxin" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/cyanide +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/cyanide name = "cyanide injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one contains cyanide, a lethal poison. It being inside a medical autoinjector has certain unsettling implications." filled_reagents = list("cyanide" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/serotrotium +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/serotrotium name = "serotrotium injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one is filled with serotrotium, which causes concentrated production of the serotonin neurotransmitter in humans." filled_reagents = list("serotrotium" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bliss +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/bliss name = "illicit injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one contains various illicit drugs, held inside a hypospray to make smuggling easier." filled_reagents = list("bliss" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin name = "cryptobiolin injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one contains cryptobiolin, which causes confusion." filled_reagents = list("cryptobiolin" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/impedrezene +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/impedrezene name = "impedrezene injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one has impedrezene inside, a narcotic that impairs higher brain functioning. \ This autoinjector is almost certainly created illegitimately." filled_reagents = list("impedrezene" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/mindbreaker +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/mindbreaker name = "mindbreaker injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one stores the dangerous hallucinogen called 'Mindbreaker', likely put in place \ by illicit groups hoping to hide their product." filled_reagents = list("mindbreaker" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/psilocybin +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/psilocybin name = "psilocybin injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This has psilocybin inside, which is a strong psychotropic derived from certain species of mushroom. \ This autoinjector likely was made by criminal elements to avoid detection from casual inspection." filled_reagents = list("psilocybin" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/mutagen +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/mutagen name = "unstable mutagen injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This contains unstable mutagen, which makes using this a very bad idea. It will either \ ruin your genetic health, turn you into a Five Points violation, or both!" filled_reagents = list("mutagen" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/lexorin +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/lexorin name = "lexorin injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This contains lexorin, a dangerous toxin that stops respiration, and has been \ implicated in several high-profile assassinations in the past." filled_reagents = list("lexorin" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites name = "medical nanite injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ The injector stores a slurry of highly advanced and specialized nanomachines designed \ @@ -363,7 +363,7 @@ harmlessly, and cannot self-replicate in order to remain Five Points compliant." filled_reagents = list("healing_nanites" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/defective_nanites +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/defective_nanites name = "defective nanite injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ The injector stores a slurry of highly advanced and specialized nanomachines that \ @@ -371,14 +371,14 @@ Because of the Five Points, these nanites cannot self-replicate." filled_reagents = list("defective_nanites" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/contaminated +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated name = "contaminated injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ The hypospray contains a viral agent inside, as well as a liquid substance that encourages \ the growth of the virus inside." filled_reagents = list("virusfood" = 15) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/contaminated/do_injection(mob/living/carbon/human/H, mob/living/user) +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated/do_injection(mob/living/carbon/human/H, mob/living/user) . = ..() if(.) // Will occur if successfully injected. infect_mob_random_lesser(H) diff --git a/code/modules/reagents/reagent_containers/hypospray_vr.dm b/code/modules/reagents/reagent_containers/hypospray_vr.dm index e0556a27d2d..37d273a5cf1 100644 --- a/code/modules/reagents/reagent_containers/hypospray_vr.dm +++ b/code/modules/reagents/reagent_containers/hypospray_vr.dm @@ -1,38 +1,38 @@ -/obj/item/weapon/reagent_containers/hypospray/autoinjector/burn +/obj/item/reagent_containers/hypospray/autoinjector/burn name = "autoinjector (burn)" icon_state = "purple" filled_reagents = list("dermaline" = 3.5, "leporazine" = 1.5) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma +/obj/item/reagent_containers/hypospray/autoinjector/trauma name = "autoinjector (trauma)" icon_state = "black" filled_reagents = list("bicaridine" = 4, "tramadol" = 1) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy +/obj/item/reagent_containers/hypospray/autoinjector/oxy name = "autoinjector (oxy)" icon_state = "blue" filled_reagents = list("dexalinp" = 5) -/obj/item/weapon/reagent_containers/hypospray/autoinjector/rad +/obj/item/reagent_containers/hypospray/autoinjector/rad name = "autoinjector (rad)" icon_state = "black" filled_reagents = list("hyronalin" = 5) -/obj/item/weapon/storage/box/traumainjectors +/obj/item/storage/box/traumainjectors name = "box of emergency injectors" desc = "Contains emergency autoinjectors." icon_state = "syringe" max_storage_space = ITEMSIZE_COST_SMALL * 7 // 14 starts_with = list( - /obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma = 4, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox = 2, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn = 1 + /obj/item/reagent_containers/hypospray/autoinjector/trauma = 4, + /obj/item/reagent_containers/hypospray/autoinjector/detox = 2, + /obj/item/reagent_containers/hypospray/autoinjector/burn = 1 ) -/obj/item/weapon/reagent_containers/hypospray +/obj/item/reagent_containers/hypospray var/prototype = 0 -/obj/item/weapon/reagent_containers/hypospray/science +/obj/item/reagent_containers/hypospray/science name = "prototype hypospray" desc = "This reproduction hypospray is nearly a perfect replica of the early model DeForest hyposprays, sharing many of the same features. However, there are additional safety measures installed to prevent unwanted injections." prototype = 1 diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index e7ed52ea846..c80dd669e34 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -3,7 +3,7 @@ * Patches. A subtype of pills, in order to inherit the possible future produceability within chem-masters, and dissolving. */ -/obj/item/weapon/reagent_containers/pill/patch +/obj/item/reagent_containers/pill/patch name = "patch" desc = "A patch." icon = 'icons/obj/chemical.dmi' @@ -19,7 +19,7 @@ var/pierce_material = FALSE // If true, the patch can be used through thick material. -/obj/item/weapon/reagent_containers/pill/patch/attack(mob/M as mob, mob/user as mob) +/obj/item/reagent_containers/pill/patch/attack(mob/M as mob, mob/user as mob) var/mob/living/L = user if(M == L) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 7f4eb746293..f74091ff123 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// /// Pills. //////////////////////////////////////////////////////////////////////////////// -/obj/item/weapon/reagent_containers/pill +/obj/item/reagent_containers/pill name = "pill" desc = "A pill." icon = 'icons/obj/chemical.dmi' @@ -17,12 +17,12 @@ slot_flags = SLOT_EARS volume = 60 -/obj/item/weapon/reagent_containers/pill/Initialize() +/obj/item/reagent_containers/pill/Initialize() . = ..() if(!icon_state) icon_state = "[base_state][rand(1, 4)]" //preset pills only use colour changing or unique icons -/obj/item/weapon/reagent_containers/pill/attack(mob/M as mob, mob/user as mob) +/obj/item/reagent_containers/pill/attack(mob/M as mob, mob/user as mob) if(M == user) if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M @@ -72,7 +72,7 @@ return 0 -/obj/item/weapon/reagent_containers/pill/afterattack(obj/target, mob/user, proximity) +/obj/item/reagent_containers/pill/afterattack(obj/target, mob/user, proximity) if(!proximity) return if(target.is_open_container() && target.reagents) @@ -91,9 +91,9 @@ return -/obj/item/weapon/reagent_containers/pill/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/reagent_containers/pill/attackby(obj/item/W as obj, mob/user as mob) if(is_sharp(W)) - var/obj/item/weapon/reagent_containers/powder/J = new /obj/item/weapon/reagent_containers/powder(src.loc) + var/obj/item/reagent_containers/powder/J = new /obj/item/reagent_containers/powder(src.loc) user.visible_message("[user] gently cuts up [src] with [W]!") playsound(src.loc, 'sound/effects/chop.ogg', 50, 1) @@ -102,8 +102,8 @@ J.get_appearance() qdel(src) - if(istype(W, /obj/item/weapon/card/id)) - var/obj/item/weapon/reagent_containers/powder/J = new /obj/item/weapon/reagent_containers/powder(src.loc) + if(istype(W, /obj/item/card/id)) + var/obj/item/reagent_containers/powder/J = new /obj/item/reagent_containers/powder(src.loc) user.visible_message("[user] clumsily chops up [src] with [W]!") playsound(src.loc, 'sound/effects/chop.ogg', 50, 1) @@ -119,224 +119,224 @@ //////////////////////////////////////////////////////////////////////////////// //Pills -/obj/item/weapon/reagent_containers/pill/antitox +/obj/item/reagent_containers/pill/antitox name = "Dylovene (30u)" //VOREStation Edit desc = "Neutralizes many common toxins." icon_state = "pill1" -/obj/item/weapon/reagent_containers/pill/antitox/Initialize() +/obj/item/reagent_containers/pill/antitox/Initialize() . = ..() reagents.add_reagent("anti_toxin", 30) //VOREStation Edit color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/tox +/obj/item/reagent_containers/pill/tox name = "Toxins pill" desc = "Highly toxic." icon_state = "pill4" -/obj/item/weapon/reagent_containers/pill/tox/Initialize() +/obj/item/reagent_containers/pill/tox/Initialize() . = ..() reagents.add_reagent("toxin", 50) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/cyanide +/obj/item/reagent_containers/pill/cyanide name = "Strange pill" desc = "It's marked 'KCN'. Smells vaguely of almonds." icon_state = "pill9" -/obj/item/weapon/reagent_containers/pill/cyanide/Initialize() +/obj/item/reagent_containers/pill/cyanide/Initialize() . = ..() reagents.add_reagent("cyanide", 50) -/obj/item/weapon/reagent_containers/pill/adminordrazine +/obj/item/reagent_containers/pill/adminordrazine name = "Adminordrazine pill" desc = "It's magic. We don't have to explain it." icon_state = "pillA" -/obj/item/weapon/reagent_containers/pill/adminordrazine/Initialize() +/obj/item/reagent_containers/pill/adminordrazine/Initialize() . = ..() reagents.add_reagent("adminordrazine", 5) -/obj/item/weapon/reagent_containers/pill/stox +/obj/item/reagent_containers/pill/stox name = "Soporific (15u)" desc = "Commonly used to treat insomnia." icon_state = "pill2" -/obj/item/weapon/reagent_containers/pill/stox/Initialize() +/obj/item/reagent_containers/pill/stox/Initialize() . = ..() reagents.add_reagent("stoxin", 15) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/kelotane +/obj/item/reagent_containers/pill/kelotane name = "Kelotane (20u)" //VOREStation Edit desc = "Used to treat burns." icon_state = "pill3" -/obj/item/weapon/reagent_containers/pill/kelotane/Initialize() +/obj/item/reagent_containers/pill/kelotane/Initialize() . = ..() reagents.add_reagent("kelotane", 20) //VOREStation Edit color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/paracetamol +/obj/item/reagent_containers/pill/paracetamol name = "Paracetamol (15u)" desc = "Paracetamol! A painkiller for the ages. Chewables!" icon_state = "pill3" -/obj/item/weapon/reagent_containers/pill/paracetamol/Initialize() +/obj/item/reagent_containers/pill/paracetamol/Initialize() . = ..() reagents.add_reagent("paracetamol", 15) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/tramadol +/obj/item/reagent_containers/pill/tramadol name = "Tramadol (15u)" desc = "A simple painkiller." icon_state = "pill3" -/obj/item/weapon/reagent_containers/pill/tramadol/Initialize() +/obj/item/reagent_containers/pill/tramadol/Initialize() . = ..() reagents.add_reagent("tramadol", 15) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/methylphenidate +/obj/item/reagent_containers/pill/methylphenidate name = "Methylphenidate (15u)" desc = "Improves the ability to concentrate." icon_state = "pill2" -/obj/item/weapon/reagent_containers/pill/methylphenidate/Initialize() +/obj/item/reagent_containers/pill/methylphenidate/Initialize() . = ..() reagents.add_reagent("methylphenidate", 15) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/citalopram +/obj/item/reagent_containers/pill/citalopram name = "Citalopram (15u)" desc = "Mild anti-depressant." icon_state = "pill4" -/obj/item/weapon/reagent_containers/pill/citalopram/Initialize() +/obj/item/reagent_containers/pill/citalopram/Initialize() . = ..() reagents.add_reagent("citalopram", 15) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/dexalin +/obj/item/reagent_containers/pill/dexalin name = "Dexalin (7.5u)" //VOREstation Edit desc = "Used to treat oxygen deprivation." icon_state = "pill1" -/obj/item/weapon/reagent_containers/pill/dexalin/Initialize() +/obj/item/reagent_containers/pill/dexalin/Initialize() . = ..() reagents.add_reagent("dexalin", 7.5) //VOREStation Edit color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/dexalin_plus +/obj/item/reagent_containers/pill/dexalin_plus name = "Dexalin Plus (15u)" desc = "Used to treat extreme oxygen deprivation." icon_state = "pill2" -/obj/item/weapon/reagent_containers/pill/dexalin_plus/Initialize() +/obj/item/reagent_containers/pill/dexalin_plus/Initialize() . = ..() reagents.add_reagent("dexalinp", 15) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/dermaline +/obj/item/reagent_containers/pill/dermaline name = "Dermaline (15u)" desc = "Used to treat burn wounds." icon_state = "pill2" -/obj/item/weapon/reagent_containers/pill/dermaline/Initialize() +/obj/item/reagent_containers/pill/dermaline/Initialize() . = ..() reagents.add_reagent("dermaline", 15) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/dylovene +/obj/item/reagent_containers/pill/dylovene name = "Dylovene (15u)" desc = "A broad-spectrum anti-toxin." icon_state = "pill1" -/obj/item/weapon/reagent_containers/pill/dylovene/Initialize() +/obj/item/reagent_containers/pill/dylovene/Initialize() . = ..() reagents.add_reagent("anti_toxin", 15) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/inaprovaline +/obj/item/reagent_containers/pill/inaprovaline name = "Inaprovaline (30u)" desc = "Used to stabilize patients." icon_state = "pill2" -/obj/item/weapon/reagent_containers/pill/inaprovaline/Initialize() +/obj/item/reagent_containers/pill/inaprovaline/Initialize() . = ..() reagents.add_reagent("inaprovaline", 30) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/bicaridine +/obj/item/reagent_containers/pill/bicaridine name = "Bicaridine (20u)" desc = "Used to treat physical injuries." icon_state = "pill2" -/obj/item/weapon/reagent_containers/pill/bicaridine/Initialize() +/obj/item/reagent_containers/pill/bicaridine/Initialize() . = ..() reagents.add_reagent("bicaridine", 20) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/spaceacillin +/obj/item/reagent_containers/pill/spaceacillin name = "Spaceacillin (15u)" //VOREStation Edit desc = "A theta-lactam antibiotic. Effective against many diseases likely to be encountered in space." icon_state = "pill3" -/obj/item/weapon/reagent_containers/pill/spaceacillin/Initialize() +/obj/item/reagent_containers/pill/spaceacillin/Initialize() . = ..() reagents.add_reagent("spaceacillin", 15) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/carbon +/obj/item/reagent_containers/pill/carbon name = "Carbon (30u)" //VOREStation Edit desc = "Used to neutralise chemicals in the stomach." icon_state = "pill3" -/obj/item/weapon/reagent_containers/pill/carbon/Initialize() +/obj/item/reagent_containers/pill/carbon/Initialize() . = ..() reagents.add_reagent("carbon", 30) //VOREStation Edit color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/iron +/obj/item/reagent_containers/pill/iron name = "Iron (30u)" //VOREStation Edit desc = "Used to aid in blood regeneration after bleeding for red-blooded crew." icon_state = "pill1" -/obj/item/weapon/reagent_containers/pill/iron/Initialize() +/obj/item/reagent_containers/pill/iron/Initialize() . = ..() reagents.add_reagent("iron", 30) //VOREStation Edit color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/copper +/obj/item/reagent_containers/pill/copper name = "Copper (30u)" desc = "Used to aid in blood regeneration after bleeding for blue-blooded crew." icon_state = "pill1" -/obj/item/weapon/reagent_containers/pill/copper/Initialize() +/obj/item/reagent_containers/pill/copper/Initialize() . = ..() reagents.add_reagent("copper", 30) color = reagents.get_color() //Not-quite-medicine -/obj/item/weapon/reagent_containers/pill/happy +/obj/item/reagent_containers/pill/happy name = "Happy pill" desc = "Happy happy joy joy!" icon_state = "pill4" -/obj/item/weapon/reagent_containers/pill/happy/Initialize() +/obj/item/reagent_containers/pill/happy/Initialize() . = ..() reagents.add_reagent("bliss", 15) reagents.add_reagent("sugar", 15) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/zoom +/obj/item/reagent_containers/pill/zoom name = "Zoom pill" desc = "Zoooom!" icon_state = "pill4" -/obj/item/weapon/reagent_containers/pill/zoom/Initialize() +/obj/item/reagent_containers/pill/zoom/Initialize() . = ..() if(prob(50)) //VOREStation edit begin: Zoom pill adjustments reagents.add_reagent("mold", 2) //Chance to be more dangerous @@ -344,12 +344,12 @@ reagents.add_reagent("stimm", 5) //VOREStation edit end: Zoom pill adjustments color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/diet +/obj/item/reagent_containers/pill/diet name = "diet pill" desc = "Guaranteed to get you slim!" icon_state = "pill4" -/obj/item/weapon/reagent_containers/pill/diet/Initialize() +/obj/item/reagent_containers/pill/diet/Initialize() . = ..() reagents.add_reagent("lipozine", 15) //VOREStation Edit color = reagents.get_color() diff --git a/code/modules/reagents/reagent_containers/pill_vr.dm b/code/modules/reagents/reagent_containers/pill_vr.dm index d956861a4bc..02ebdebe676 100644 --- a/code/modules/reagents/reagent_containers/pill_vr.dm +++ b/code/modules/reagents/reagent_containers/pill_vr.dm @@ -1,158 +1,158 @@ -/obj/item/weapon/reagent_containers/pill/nutriment +/obj/item/reagent_containers/pill/nutriment name = "Nutriment (30u)" desc = "Used to feed people on the field. Contains 30 units of Nutriment." icon_state = "pill10" -/obj/item/weapon/reagent_containers/pill/nutriment/Initialize() +/obj/item/reagent_containers/pill/nutriment/Initialize() . = ..() reagents.add_reagent("nutriment", 30) -/obj/item/weapon/reagent_containers/pill/protein +/obj/item/reagent_containers/pill/protein name = "Protein (30u)" desc = "Used to feed carnivores on the field. Contains 30 units of Protein." icon_state = "pill24" -/obj/item/weapon/reagent_containers/pill/protein/Initialize() +/obj/item/reagent_containers/pill/protein/Initialize() . = ..() reagents.add_reagent("protein", 30) -/obj/item/weapon/reagent_containers/pill/rezadone +/obj/item/reagent_containers/pill/rezadone name = "Rezadone (5u)" desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects." icon_state = "pill2" -/obj/item/weapon/reagent_containers/pill/rezadone/Initialize() +/obj/item/reagent_containers/pill/rezadone/Initialize() . = ..() reagents.add_reagent("rezadone", 5) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/peridaxon +/obj/item/reagent_containers/pill/peridaxon name = "Peridaxon (10u)" desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously." icon_state = "pill10" -/obj/item/weapon/reagent_containers/pill/peridaxon/Initialize() +/obj/item/reagent_containers/pill/peridaxon/Initialize() . = ..() reagents.add_reagent("peridaxon", 10) -/obj/item/weapon/reagent_containers/pill/carthatoline +/obj/item/reagent_containers/pill/carthatoline name = "Carthatoline (15u)" desc = "Carthatoline is strong evacuant used to treat severe poisoning." icon_state = "pill4" -/obj/item/weapon/reagent_containers/pill/carthatoline/Initialize() +/obj/item/reagent_containers/pill/carthatoline/Initialize() . = ..() reagents.add_reagent("carthatoline", 15) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/alkysine +/obj/item/reagent_containers/pill/alkysine name = "Alkysine (10u)" desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." icon_state = "pill3" -/obj/item/weapon/reagent_containers/pill/alkysine/Initialize() +/obj/item/reagent_containers/pill/alkysine/Initialize() . = ..() reagents.add_reagent("alkysine", 10) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/imidazoline +/obj/item/reagent_containers/pill/imidazoline name = "Imidazoline (15u)" desc = "Heals eye damage." icon_state = "pill3" -/obj/item/weapon/reagent_containers/pill/imidazoline/Initialize() +/obj/item/reagent_containers/pill/imidazoline/Initialize() . = ..() reagents.add_reagent("imidazoline", 15) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/osteodaxon +/obj/item/reagent_containers/pill/osteodaxon name = "Osteodaxon (25u)" desc = "An experimental drug used to heal bone fractures." icon_state = "pill2" -/obj/item/weapon/reagent_containers/pill/osteodaxon/Initialize() +/obj/item/reagent_containers/pill/osteodaxon/Initialize() . = ..() reagents.add_reagent("osteodaxon", 15) reagents.add_reagent("inaprovaline", 10) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/myelamine +/obj/item/reagent_containers/pill/myelamine name = "Myelamine (25u)" desc = "Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets." icon_state = "pill1" -/obj/item/weapon/reagent_containers/pill/myelamine/Initialize() +/obj/item/reagent_containers/pill/myelamine/Initialize() . = ..() reagents.add_reagent("myelamine", 15) reagents.add_reagent("inaprovaline", 10) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/hyronalin +/obj/item/reagent_containers/pill/hyronalin name = "Hyronalin (15u)" desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning." icon_state = "pill4" -/obj/item/weapon/reagent_containers/pill/hyronalin/Initialize() +/obj/item/reagent_containers/pill/hyronalin/Initialize() . = ..() reagents.add_reagent("hyronalin", 15) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/arithrazine +/obj/item/reagent_containers/pill/arithrazine name = "Arithrazine (5u)" desc = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning." icon_state = "pill2" -/obj/item/weapon/reagent_containers/pill/arithrazine/Initialize() +/obj/item/reagent_containers/pill/arithrazine/Initialize() . = ..() reagents.add_reagent("arithrazine", 5) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/corophizine +/obj/item/reagent_containers/pill/corophizine name = "Corophizine (5u)" desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses." icon_state = "pill2" -/obj/item/weapon/reagent_containers/pill/corophizine/Initialize() +/obj/item/reagent_containers/pill/corophizine/Initialize() . = ..() reagents.add_reagent("corophizine", 5) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/vermicetol +/obj/item/reagent_containers/pill/vermicetol name = "Vermicetol (15u)" desc = "An extremely potent drug to treat physical injuries." icon_state = "pill1" -/obj/item/weapon/reagent_containers/pill/vermicetol/Initialize() +/obj/item/reagent_containers/pill/vermicetol/Initialize() . = ..() reagents.add_reagent("vermicetol", 15) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/healing_nanites +/obj/item/reagent_containers/pill/healing_nanites name = "Healing nanites (30u)" desc = "Miniature medical robots that swiftly restore bodily damage." icon_state = "pill1" -/obj/item/weapon/reagent_containers/pill/healing_nanites/Initialize() +/obj/item/reagent_containers/pill/healing_nanites/Initialize() . = ..() reagents.add_reagent("healing_nanites", 30) color = reagents.get_color() -/obj/item/weapon/reagent_containers/pill/sleevingcure +/obj/item/reagent_containers/pill/sleevingcure name = "Kitsuhanan Cure (1u)" desc = "A rare cure provided by KHI that helps counteract negative side effects of using imperfect resleeving machinery." icon_state = "pill3" -/obj/item/weapon/reagent_containers/pill/sleevingcure/Initialize() +/obj/item/reagent_containers/pill/sleevingcure/Initialize() . = ..() reagents.add_reagent("sleevingcure", 1) color = reagents.get_color() -/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) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index ed3b3e20ce3..896785d9128 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/reagent_containers/spray +/obj/item/reagent_containers/spray name = "spray bottle" desc = "A spray bottle, with an unscrewable top." icon = 'icons/obj/janitor.dmi' @@ -19,12 +19,12 @@ var/list/spray_sizes = list(1,3) volume = 250 -/obj/item/weapon/reagent_containers/spray/Initialize() +/obj/item/reagent_containers/spray/Initialize() . = ..() - src.verbs -= /obj/item/weapon/reagent_containers/verb/set_APTFT + src.verbs -= /obj/item/reagent_containers/verb/set_APTFT -/obj/item/weapon/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user as mob, proximity) - if(istype(A, /obj/item/weapon/storage) || istype(A, /obj/structure/table) || istype(A, /obj/structure/closet) || istype(A, /obj/item/weapon/reagent_containers) || istype(A, /obj/structure/sink) || istype(A, /obj/structure/janitorialcart)) +/obj/item/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user as mob, proximity) + if(istype(A, /obj/item/storage) || istype(A, /obj/structure/table) || istype(A, /obj/structure/closet) || istype(A, /obj/item/reagent_containers) || istype(A, /obj/structure/sink) || istype(A, /obj/structure/janitorialcart)) return if(istype(A, /spell)) @@ -53,7 +53,7 @@ log_game("[key_name(user)] fired Space lube from \a [src].") return -/obj/item/weapon/reagent_containers/spray/proc/Spray_at(atom/A as mob|obj, mob/user as mob, proximity) +/obj/item/reagent_containers/spray/proc/Spray_at(atom/A as mob|obj, mob/user as mob, proximity) playsound(src, 'sound/effects/spray2.ogg', 50, 1, -6) if (A.density && proximity) A.visible_message("[usr] sprays [A] with [src].") @@ -70,19 +70,19 @@ D.set_up(my_target, spray_size, 10) return -/obj/item/weapon/reagent_containers/spray/attack_self(var/mob/user) +/obj/item/reagent_containers/spray/attack_self(var/mob/user) if(!possible_transfer_amounts) return amount_per_transfer_from_this = next_in_list(amount_per_transfer_from_this, possible_transfer_amounts) spray_size = next_in_list(spray_size, spray_sizes) to_chat(user, "You adjusted the pressure nozzle. You'll now use [amount_per_transfer_from_this] units per spray.") -/obj/item/weapon/reagent_containers/spray/examine(mob/user) +/obj/item/reagent_containers/spray/examine(mob/user) . = ..() if(loc == user) . += "[round(reagents.total_volume)] units left." -/obj/item/weapon/reagent_containers/spray/verb/empty() +/obj/item/reagent_containers/spray/verb/empty() set name = "Empty Spray Bottle" set category = "Object" @@ -95,28 +95,28 @@ reagents.splash(usr.loc, reagents.total_volume) //space cleaner -/obj/item/weapon/reagent_containers/spray/cleaner +/obj/item/reagent_containers/spray/cleaner name = "space cleaner" desc = "BLAM!-brand non-foaming space cleaner!" -/obj/item/weapon/reagent_containers/spray/cleaner/drone +/obj/item/reagent_containers/spray/cleaner/drone name = "space cleaner" desc = "BLAM!-brand non-foaming space cleaner!" volume = 50 -/obj/item/weapon/reagent_containers/spray/cleaner/Initialize() +/obj/item/reagent_containers/spray/cleaner/Initialize() . = ..() reagents.add_reagent("cleaner", volume) -/obj/item/weapon/reagent_containers/spray/sterilizine +/obj/item/reagent_containers/spray/sterilizine name = "sterilizine" desc = "Great for hiding incriminating bloodstains and sterilizing scalpels." -/obj/item/weapon/reagent_containers/spray/sterilizine/Initialize() +/obj/item/reagent_containers/spray/sterilizine/Initialize() . = ..() reagents.add_reagent("sterilizine", volume) -/obj/item/weapon/reagent_containers/spray/pepper +/obj/item/reagent_containers/spray/pepper name = "pepperspray" desc = "Manufactured by UhangInc, used to blind and down an opponent quickly." icon = 'icons/obj/weapons.dmi' @@ -127,26 +127,26 @@ volume = 40 var/safety = TRUE -/obj/item/weapon/reagent_containers/spray/pepper/Initialize() +/obj/item/reagent_containers/spray/pepper/Initialize() . = ..() reagents.add_reagent("condensedcapsaicin", 40) -/obj/item/weapon/reagent_containers/spray/pepper/examine(mob/user) +/obj/item/reagent_containers/spray/pepper/examine(mob/user) . = ..() if(Adjacent(user)) . += "The safety is [safety ? "on" : "off"]." -/obj/item/weapon/reagent_containers/spray/pepper/attack_self(var/mob/user) +/obj/item/reagent_containers/spray/pepper/attack_self(var/mob/user) safety = !safety to_chat(usr, "You switch the safety [safety ? "on" : "off"].") -/obj/item/weapon/reagent_containers/spray/pepper/Spray_at(atom/A as mob|obj) +/obj/item/reagent_containers/spray/pepper/Spray_at(atom/A as mob|obj) if(safety) to_chat(usr, "The safety is on!") return . = ..() -/obj/item/weapon/reagent_containers/spray/waterflower +/obj/item/reagent_containers/spray/waterflower name = "water flower" desc = "A seemingly innocent sunflower...with a twist." icon = 'icons/obj/device.dmi' @@ -158,11 +158,11 @@ drop_sound = 'sound/items/drop/herb.ogg' pickup_sound = 'sound/items/pickup/herb.ogg' -/obj/item/weapon/reagent_containers/spray/waterflower/Initialize() +/obj/item/reagent_containers/spray/waterflower/Initialize() . = ..() reagents.add_reagent("water", 10) -/obj/item/weapon/reagent_containers/spray/chemsprayer +/obj/item/reagent_containers/spray/chemsprayer name = "chem sprayer" desc = "A utility used to spray large amounts of reagent in a given area." icon = 'icons/obj/gun.dmi' @@ -176,7 +176,7 @@ volume = 600 origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) -/obj/item/weapon/reagent_containers/spray/chemsprayer/Spray_at(atom/A as mob|obj) +/obj/item/reagent_containers/spray/chemsprayer/Spray_at(atom/A as mob|obj) playsound(src, 'sound/effects/spray3.ogg', rand(50,1), -6) var/direction = get_dir(src, A) var/turf/T = get_turf(A) @@ -197,7 +197,7 @@ D.set_up(my_target, rand(6, 8), 2) return -/obj/item/weapon/reagent_containers/spray/plantbgone +/obj/item/reagent_containers/spray/plantbgone name = "Plant-B-Gone" desc = "Kills those pesky weeds!" icon = 'icons/obj/hydroponics_machines.dmi' @@ -205,11 +205,11 @@ item_state = "plantbgone" volume = 100 -/obj/item/weapon/reagent_containers/spray/plantbgone/Initialize() +/obj/item/reagent_containers/spray/plantbgone/Initialize() . = ..() reagents.add_reagent("plantbgone", 100) -/obj/item/weapon/reagent_containers/spray/chemsprayer/hosed +/obj/item/reagent_containers/spray/chemsprayer/hosed name = "hose nozzle" desc = "A heavy spray nozzle that must be attached to a hose." icon = 'icons/obj/janitor.dmi' @@ -226,12 +226,12 @@ var/obj/item/hose_connector/input/active/InputSocket -/obj/item/weapon/reagent_containers/spray/chemsprayer/hosed/Initialize() +/obj/item/reagent_containers/spray/chemsprayer/hosed/Initialize() . = ..() InputSocket = new(src) -/obj/item/weapon/reagent_containers/spray/chemsprayer/hosed/update_icon() +/obj/item/reagent_containers/spray/chemsprayer/hosed/update_icon() ..() cut_overlays() @@ -242,19 +242,19 @@ if(InputSocket.get_pairing()) add_overlay(hose_overlay) -/obj/item/weapon/reagent_containers/spray/chemsprayer/hosed/AltClick(mob/living/carbon/user) +/obj/item/reagent_containers/spray/chemsprayer/hosed/AltClick(mob/living/carbon/user) if(++spray_particles > 3) spray_particles = 1 to_chat(user, "You turn the dial on \the [src] to [spray_particles].") return -/obj/item/weapon/reagent_containers/spray/chemsprayer/hosed/CtrlClick(var/mob/user) +/obj/item/reagent_containers/spray/chemsprayer/hosed/CtrlClick(var/mob/user) if(loc != get_turf(src)) heavy_spray = !heavy_spray else . = ..() -/obj/item/weapon/reagent_containers/spray/chemsprayer/hosed/Spray_at(atom/A as mob|obj) +/obj/item/reagent_containers/spray/chemsprayer/hosed/Spray_at(atom/A as mob|obj) update_icon() var/direction = get_dir(src, A) diff --git a/code/modules/reagents/reagent_containers/spray_vr.dm b/code/modules/reagents/reagent_containers/spray_vr.dm index ef785ffc350..c546410a55a 100644 --- a/code/modules/reagents/reagent_containers/spray_vr.dm +++ b/code/modules/reagents/reagent_containers/spray_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/reagent_containers/spray/windowsealant +/obj/item/reagent_containers/spray/windowsealant name = "Krak-b-gone" desc = "A spray bottle of silicate sealant for rapid window repair." icon = 'icons/obj/items_vr.dmi' @@ -7,6 +7,6 @@ possible_transfer_amounts = null volume = 80 -/obj/item/weapon/reagent_containers/spray/windowsealant/New() +/obj/item/reagent_containers/spray/windowsealant/New() ..() reagents.add_reagent("silicate", 80) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 45dcf88de2e..d7ac1e42c80 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -8,7 +8,7 @@ #define SYRINGE_CAPPED 10 -/obj/item/weapon/reagent_containers/syringe +/obj/item/reagent_containers/syringe name = "syringe" desc = "A syringe." description_fluff = "This could be used to engrave messages on suitable surfaces if you really put your mind to it! Alt-click a floor or wall to engrave with it." //This way it's not a completely hidden, arcane art to engrave. @@ -37,33 +37,33 @@ pickup_sound = 'sound/items/pickup/glass.ogg' -/obj/item/weapon/reagent_containers/syringe/Initialize() +/obj/item/reagent_containers/syringe/Initialize() . = ..() update_icon() -/obj/item/weapon/reagent_containers/syringe/Destroy() +/obj/item/reagent_containers/syringe/Destroy() QDEL_LIST_NULL(viruses) LAZYCLEARLIST(targets) return ..() -/obj/item/weapon/reagent_containers/syringe/process() +/obj/item/reagent_containers/syringe/process() dirtiness = min(dirtiness + targets.len,75) if(dirtiness >= 75) STOP_PROCESSING(SSobj, src) return 1 -/obj/item/weapon/reagent_containers/syringe/on_reagent_change() +/obj/item/reagent_containers/syringe/on_reagent_change() update_icon() -/obj/item/weapon/reagent_containers/syringe/pickup(mob/user) +/obj/item/reagent_containers/syringe/pickup(mob/user) ..() update_icon() -/obj/item/weapon/reagent_containers/syringe/dropped(mob/user) +/obj/item/reagent_containers/syringe/dropped(mob/user) ..() update_icon() -/obj/item/weapon/reagent_containers/syringe/attack_self(mob/user as mob) +/obj/item/reagent_containers/syringe/attack_self(mob/user as mob) switch(mode) if(SYRINGE_CAPPED) mode = SYRINGE_DRAW @@ -76,14 +76,14 @@ return update_icon() -/obj/item/weapon/reagent_containers/syringe/attack_hand() +/obj/item/reagent_containers/syringe/attack_hand() ..() update_icon() -/obj/item/weapon/reagent_containers/syringe/attackby(obj/item/I as obj, mob/user as mob) +/obj/item/reagent_containers/syringe/attackby(obj/item/I as obj, mob/user as mob) return -/obj/item/weapon/reagent_containers/syringe/afterattack(obj/target, mob/user, proximity) +/obj/item/reagent_containers/syringe/afterattack(obj/target, mob/user, proximity) if(!proximity || !target.reagents) return @@ -162,7 +162,7 @@ to_chat(user, "[target] is empty.") return - if(!target.is_open_container() && !istype(target, /obj/structure/reagent_dispensers) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/weapon/reagent_containers/food)) + if(!target.is_open_container() && !istype(target, /obj/structure/reagent_dispensers) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/reagent_containers/food)) to_chat(user, "You cannot directly remove reagents from this object.") return @@ -180,10 +180,10 @@ to_chat(user, "The syringe is empty.") mode = SYRINGE_DRAW return - if(istype(target, /obj/item/weapon/implantcase/chem)) + if(istype(target, /obj/item/implantcase/chem)) return - if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/clothing/mask/smokable/cigarette) && !istype(target, /obj/item/weapon/storage/fancy/cigarettes)) + if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/reagent_containers/food) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/clothing/mask/smokable/cigarette) && !istype(target, /obj/item/storage/fancy/cigarettes)) to_chat(user, "You cannot directly fill this object.") return if(!target.reagents.get_free_space()) @@ -257,7 +257,7 @@ // dirty(target,affected) //VOREStation Add -- Removed by Request return -/obj/item/weapon/reagent_containers/syringe/proc/syringestab(mob/living/carbon/target as mob, mob/living/carbon/user as mob) +/obj/item/reagent_containers/syringe/proc/syringestab(mob/living/carbon/target as mob, mob/living/carbon/user as mob) if(istype(target, /mob/living/carbon/human)) var/mob/living/carbon/human/H = target @@ -303,7 +303,7 @@ if(!issilicon(user)) break_syringe(target, user) -/obj/item/weapon/reagent_containers/syringe/proc/break_syringe(mob/living/carbon/target, mob/living/carbon/user) +/obj/item/reagent_containers/syringe/proc/break_syringe(mob/living/carbon/target, mob/living/carbon/user) desc += " It is broken." mode = SYRINGE_BROKEN if(target) @@ -312,7 +312,7 @@ add_fingerprint(user) update_icon() -/obj/item/weapon/reagent_containers/syringe/ld50_syringe +/obj/item/reagent_containers/syringe/ld50_syringe name = "Lethal Injection Syringe" desc = "A syringe used for lethal injections." amount_per_transfer_from_this = 50 @@ -320,7 +320,7 @@ visible_name = "a giant syringe" time = 300 -/obj/item/weapon/reagent_containers/syringe/ld50_syringe/afterattack(obj/target, mob/user, flag) +/obj/item/reagent_containers/syringe/ld50_syringe/afterattack(obj/target, mob/user, flag) if(mode == SYRINGE_DRAW && ismob(target)) // No drawing 50 units of blood at once to_chat(user, "This needle isn't designed for drawing blood.") return @@ -332,41 +332,41 @@ /// Syringes. END //////////////////////////////////////////////////////////////////////////////// -/obj/item/weapon/reagent_containers/syringe/inaprovaline +/obj/item/reagent_containers/syringe/inaprovaline name = "Syringe (inaprovaline)" desc = "Contains inaprovaline - used to stabilize patients." -/obj/item/weapon/reagent_containers/syringe/inaprovaline/Initialize() +/obj/item/reagent_containers/syringe/inaprovaline/Initialize() . = ..() reagents.add_reagent("inaprovaline", 15) //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped //update_icon() -/obj/item/weapon/reagent_containers/syringe/antitoxin +/obj/item/reagent_containers/syringe/antitoxin name = "Syringe (anti-toxin)" desc = "Contains anti-toxins." -/obj/item/weapon/reagent_containers/syringe/antitoxin/Initialize() +/obj/item/reagent_containers/syringe/antitoxin/Initialize() . = ..() reagents.add_reagent("anti_toxin", 15) //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped //update_icon() -/obj/item/weapon/reagent_containers/syringe/antiviral +/obj/item/reagent_containers/syringe/antiviral name = "Syringe (spaceacillin)" desc = "Contains antiviral agents." -/obj/item/weapon/reagent_containers/syringe/antiviral/Initialize() +/obj/item/reagent_containers/syringe/antiviral/Initialize() . = ..() reagents.add_reagent("spaceacillin", 15) //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped //update_icon() -/obj/item/weapon/reagent_containers/syringe/drugs +/obj/item/reagent_containers/syringe/drugs name = "Syringe (drugs)" desc = "Contains aggressive drugs meant for torture." -/obj/item/weapon/reagent_containers/syringe/drugs/Initialize() +/obj/item/reagent_containers/syringe/drugs/Initialize() . = ..() reagents.add_reagent("bliss", 5) reagents.add_reagent("mindbreaker", 5) @@ -374,22 +374,22 @@ //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped //update_icon() -/obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral/Initialize() +/obj/item/reagent_containers/syringe/ld50_syringe/choral/Initialize() . = ..() reagents.add_reagent("chloralhydrate", 50) mode = SYRINGE_INJECT update_icon() -/obj/item/weapon/reagent_containers/syringe/steroid +/obj/item/reagent_containers/syringe/steroid name = "Syringe (anabolic steroids)" desc = "Contains drugs for muscle growth." -/obj/item/weapon/reagent_containers/syringe/steroid/Initialize() +/obj/item/reagent_containers/syringe/steroid/Initialize() ..() //reagents.add_reagent("adrenaline",5) //VOREStation Edit - No thanks. reagents.add_reagent("hyperzine",10) -/obj/item/weapon/reagent_containers/syringe/proc/dirty(var/mob/living/carbon/human/target, var/obj/item/organ/external/eo) +/obj/item/reagent_containers/syringe/proc/dirty(var/mob/living/carbon/human/target, var/obj/item/organ/external/eo) if(!ishuman(loc)) return //Avoid borg syringe problems. LAZYINITLIST(targets) @@ -427,7 +427,7 @@ if(!used) START_PROCESSING(SSobj, src) -/obj/item/weapon/reagent_containers/syringe/proc/infect_limb(var/obj/item/organ/external/eo) +/obj/item/reagent_containers/syringe/proc/infect_limb(var/obj/item/organ/external/eo) src = null var/datum/weakref/limb_ref = WEAKREF(eo) spawn(rand(5 MINUTES,10 MINUTES)) @@ -438,7 +438,7 @@ //Allow for capped syringe mode //Allow for capped syringes -/obj/item/weapon/reagent_containers/syringe/update_icon() +/obj/item/reagent_containers/syringe/update_icon() cut_overlays() var/matrix/tf = matrix() diff --git a/code/modules/reagents/reagent_containers/unidentified_hypospray.dm b/code/modules/reagents/reagent_containers/unidentified_hypospray.dm index 6391e690e64..06c9fea1e16 100644 --- a/code/modules/reagents/reagent_containers/unidentified_hypospray.dm +++ b/code/modules/reagents/reagent_containers/unidentified_hypospray.dm @@ -1,108 +1,108 @@ // Here are the paths for all hypos that start unidentified. // Usually you want to use a random spawner instead of using them directly, unless you're spawning these live for adminbus purposes. -/obj/item/weapon/reagent_containers/hypospray/autoinjector +/obj/item/reagent_containers/hypospray/autoinjector identity_type = /datum/identification/hypo // The good. -/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/bonemed/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/clonemed/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/toxin/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/toxin/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/oxy/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/oxy/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites/unidentified init_hide_identity = TRUE flags = 0 // The somewhat bad. -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/stimm/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/stimm/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bliss/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/bliss/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/expired/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/expired/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/serotrotium/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/serotrotium/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/mindbreaker/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/mindbreaker/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/psilocybin/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/psilocybin/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/soporific/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/soporific/unidentified init_hide_identity = TRUE flags = 0 // The very bad. -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/cyanide/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/cyanide/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/impedrezene/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/impedrezene/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/mutagen/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/mutagen/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/defective_nanites/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/defective_nanites/unidentified init_hide_identity = TRUE flags = 0 -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/contaminated/unidentified +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated/unidentified init_hide_identity = TRUE flags = 0 \ No newline at end of file diff --git a/code/modules/reagents/reagents/core.dm b/code/modules/reagents/reagents/core.dm index f9ee437f52c..103aa1d51cb 100644 --- a/code/modules/reagents/reagents/core.dm +++ b/code/modules/reagents/reagents/core.dm @@ -197,12 +197,12 @@ /datum/reagent/water/touch_obj(var/obj/O, var/amount) ..() - if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube)) - var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O + if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube)) + var/obj/item/reagent_containers/food/snacks/monkeycube/cube = O if(!cube.wrapped) cube.Expand() - else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/cube)) - var/obj/item/weapon/reagent_containers/food/snacks/cube/cube = O + else if(istype(O, /obj/item/reagent_containers/food/snacks/cube)) + var/obj/item/reagent_containers/food/snacks/cube/cube = O cube.Expand() else O.water_act(amount / 5) diff --git a/code/modules/reagents/reagents/dispenser.dm b/code/modules/reagents/reagents/dispenser.dm index 84beb5266e3..d959ef768ce 100644 --- a/code/modules/reagents/reagents/dispenser.dm +++ b/code/modules/reagents/reagents/dispenser.dm @@ -196,18 +196,18 @@ /datum/reagent/ethanol/touch_obj(var/obj/O) ..() - if(istype(O, /obj/item/weapon/paper)) - var/obj/item/weapon/paper/paperaffected = O + if(istype(O, /obj/item/paper)) + var/obj/item/paper/paperaffected = O paperaffected.clearpaper() to_chat(usr, "The solution dissolves the ink on the paper.") return - if(istype(O, /obj/item/weapon/book)) + if(istype(O, /obj/item/book)) if(volume < 5) return - if(istype(O, /obj/item/weapon/book/tome)) + if(istype(O, /obj/item/book/tome)) to_chat(usr, "The solution does nothing. Whatever this is, it isn't normal ink.") return - var/obj/item/weapon/book/affectedbook = O + var/obj/item/book/affectedbook = O affectedbook.dat = null to_chat(usr, "The solution dissolves the ink on the book.") return diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index 080faa3f2b2..b30b1ecad4b 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -106,7 +106,7 @@ data["cooked"] = 0 return data["cooked"] = 0 - if (holder && holder.my_atom && istype(holder.my_atom,/obj/item/weapon/reagent_containers/food/snacks)) + if (holder && holder.my_atom && istype(holder.my_atom,/obj/item/reagent_containers/food/snacks)) data["cooked"] = 1 name = cooked_name diff --git a/code/modules/reagents/reagents/food_drinks_vr.dm b/code/modules/reagents/reagents/food_drinks_vr.dm index 038bb30aac9..2c4a0d24ecf 100644 --- a/code/modules/reagents/reagents/food_drinks_vr.dm +++ b/code/modules/reagents/reagents/food_drinks_vr.dm @@ -864,7 +864,7 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.nif) - var/obj/item/device/nif/nif = H.nif //L o c a l + var/obj/item/nif/nif = H.nif //L o c a l if(nif.stat == NIF_TEMPFAIL) nif.stat = NIF_INSTALLING nif.repair(removed) diff --git a/code/modules/reagents/reagents/medicine_vr.dm b/code/modules/reagents/reagents/medicine_vr.dm index f81a6186da6..edaf07c655d 100644 --- a/code/modules/reagents/reagents/medicine_vr.dm +++ b/code/modules/reagents/reagents/medicine_vr.dm @@ -234,7 +234,7 @@ log_debug("polymorph human") for(var/obj/item/W in M) log_debug("polymorph items") - if(istype(W, /obj/item/weapon/implant/backup) || istype(W, /obj/item/device/nif)) + if(istype(W, /obj/item/implant/backup) || istype(W, /obj/item/nif)) log_debug("polymorph implants") continue M.drop_from_inventory(W) diff --git a/code/modules/reagents/reagents/other_vr.dm b/code/modules/reagents/reagents/other_vr.dm index eba5c5cbbe2..7820fcd5bb2 100644 --- a/code/modules/reagents/reagents/other_vr.dm +++ b/code/modules/reagents/reagents/other_vr.dm @@ -15,10 +15,10 @@ var/list/backup_implants = list() for(var/obj/item/organ/I in H.organs) - for(var/obj/item/weapon/implant/backup/BI in I.contents) + for(var/obj/item/implant/backup/BI in I.contents) backup_implants += BI if(backup_implants.len) - for(var/obj/item/weapon/implant/backup/BI in backup_implants) + for(var/obj/item/implant/backup/BI in backup_implants) BI.forceMove(src) H.set_species("Promethean") @@ -26,7 +26,7 @@ if(backup_implants.len) var/obj/item/organ/external/torso = H.get_organ(BP_TORSO) - for(var/obj/item/weapon/implant/backup/BI in backup_implants) + for(var/obj/item/implant/backup/BI in backup_implants) BI.forceMove(torso) torso.implants += BI @@ -44,7 +44,7 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.nif) - var/obj/item/device/nif/nif = H.nif //L o c a l + var/obj/item/nif/nif = H.nif //L o c a l if(nif.stat == NIF_TEMPFAIL) nif.stat = NIF_INSTALLING nif.repair(removed) @@ -117,7 +117,7 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.nif) - var/obj/item/device/nif/nif = H.nif //L o c a l + var/obj/item/nif/nif = H.nif //L o c a l if(nif.stat == NIF_TEMPFAIL) nif.stat = NIF_INSTALLING nif.repair(removed*0.1) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 922ad8513bb..9270fa422c9 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -14,7 +14,7 @@ layer = ABOVE_TURF_LAYER anchored = TRUE active_power_usage = 100 - circuit = /obj/item/weapon/circuitboard/conveyor + circuit = /obj/item/circuitboard/conveyor var/operating = OFF // 1 if running forward, -1 if backwards, 0 if off var/operable = 1 // true if can operate (no broken segments in this belt run) var/forwards // this is the default (forward) direction, set by the map dir @@ -132,7 +132,7 @@ if(default_deconstruction_crowbar(user, I)) return - if(istype(I, /obj/item/device/multitool)) + if(istype(I, /obj/item/multitool)) if(panel_open) var/input = sanitize(tgui_input_text(usr, "What id would you like to give this conveyor?", "Multitool-Conveyor interface", id)) if(!input) @@ -301,7 +301,7 @@ return if(I.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = I.get_welder() + var/obj/item/weldingtool/WT = I.get_welder() if(!WT.remove_fuel(0, user)) to_chat(user, "The welding tool must be on to complete this task.") return diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index c3ea39c2ce9..e8f2874a31c 100644 --- a/code/modules/recycling/disposal-construction.dm +++ b/code/modules/recycling/disposal-construction.dm @@ -304,7 +304,7 @@ // weldingtool: convert to real pipe else if(I.has_tool_quality(TOOL_WELDER)) if(anchored) - var/obj/item/weapon/weldingtool/W = I.get_welder() + var/obj/item/weldingtool/W = I.get_welder() if(W.remove_fuel(0,user)) playsound(src, W.usesound, 100, 1) to_chat(user, "Welding the [nicetype] in place.") diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 5bc3241e008..43f24fe5447 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -74,7 +74,7 @@ if(contents.len > 0) to_chat(user, "Eject the items first!") return - var/obj/item/weapon/weldingtool/W = I.get_welder() + var/obj/item/weldingtool/W = I.get_welder() if(W.remove_fuel(0,user)) playsound(src, W.usesound, 100, 1) to_chat(user, "You start slicing the floorweld off the disposal unit.") @@ -94,12 +94,12 @@ to_chat(user, "You need more welding fuel to complete this task.") return - if(istype(I, /obj/item/weapon/melee/energy/blade)) + if(istype(I, /obj/item/melee/energy/blade)) to_chat(user, "You can't place that item inside the disposal unit.") return - if(istype(I, /obj/item/weapon/storage/bag/trash)) - var/obj/item/weapon/storage/bag/trash/T = I + if(istype(I, /obj/item/storage/bag/trash)) + var/obj/item/storage/bag/trash/T = I to_chat(user, span_blue("You empty the bag.")) for(var/obj/item/O in T.contents) T.remove_from_storage(O,src) @@ -107,8 +107,8 @@ update() return - if(istype(I, /obj/item/weapon/material/ashtray)) - var/obj/item/weapon/material/ashtray/A = I + if(istype(I, /obj/item/material/ashtray)) + var/obj/item/material/ashtray/A = I if(A.contents.len > 0) user.visible_message("\The [user] empties \the [A] into [src].") for(var/obj/item/O in A.contents) @@ -117,7 +117,7 @@ update() return - var/obj/item/weapon/grab/G = I + var/obj/item/grab/G = I if(istype(G)) // handle grabbed mob if(ismob(G.affecting)) var/mob/GM = G.affecting @@ -142,7 +142,7 @@ user.drop_item() if(I) - if(istype(I, /obj/item/weapon/holder/micro)) + if(istype(I, /obj/item/holder/micro)) log_and_message_admins("placed [I.name] inside \the [src]", user) I.forceMove(src) @@ -530,7 +530,7 @@ . = ..() if(istype(AM, /obj/item) && !istype(AM, /obj/item/projectile)) if(prob(75)) - if(istype(AM, /obj/item/weapon/holder/micro)) + if(istype(AM, /obj/item/holder/micro)) log_and_message_admins("[AM] was thrown into \the [src]") AM.forceMove(src) visible_message("\The [AM] lands in \the [src].") @@ -546,7 +546,7 @@ return if(prob(75)) I.forceMove(src) - if(istype(I, /obj/item/weapon/holder/micro)) + if(istype(I, /obj/item/holder/micro)) log_and_message_admins("[I.name] was thrown into \the [src]") for(var/mob/M in viewers(src)) M.show_message("\The [I] lands in \the [src].", 3) @@ -989,7 +989,7 @@ return // prevent interaction with T-scanner revealed pipes src.add_fingerprint(user) if(I.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/W = I.get_welder() + var/obj/item/weldingtool/W = I.get_welder() if(W.remove_fuel(0,user)) playsound(src, W.usesound, 50, 1) @@ -1274,8 +1274,8 @@ if(..()) return - if(istype(I, /obj/item/device/destTagger)) - var/obj/item/device/destTagger/O = I + if(istype(I, /obj/item/destTagger)) + var/obj/item/destTagger/O = I if(O.currTag)// Tag set sort_tag = O.currTag @@ -1342,8 +1342,8 @@ if(..()) return - if(istype(I, /obj/item/device/destTagger)) - var/obj/item/device/destTagger/O = I + if(istype(I, /obj/item/destTagger)) + var/obj/item/destTagger/O = I if(O.currTag)// Tag set sortType = O.currTag @@ -1464,7 +1464,7 @@ return // prevent interaction with T-scanner revealed pipes src.add_fingerprint(user) if(I.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/W = I.get_welder() + var/obj/item/weldingtool/W = I.get_welder() if(W.remove_fuel(0,user)) playsound(src, W.usesound, 100, 1) @@ -1596,7 +1596,7 @@ playsound(src, I.usesound, 50, 1) return else if(I.has_tool_quality(TOOL_WELDER) && mode==1) - var/obj/item/weapon/weldingtool/W = I.get_welder() + var/obj/item/weldingtool/W = I.get_welder() if(W.remove_fuel(0,user)) playsound(src, W.usesound, 100, 1) to_chat(user, "You start slicing the floorweld off the disposal outlet.") diff --git a/code/modules/recycling/disposal_vr.dm b/code/modules/recycling/disposal_vr.dm index cb334785643..11ad8a31e5e 100644 --- a/code/modules/recycling/disposal_vr.dm +++ b/code/modules/recycling/disposal_vr.dm @@ -6,8 +6,8 @@ /obj/machinery/disposal/wall/cleaner/flush() flick("[icon_state]-flush", src) - for(var/obj/item/weapon/storage/i in src) - if(istype(i, /obj/item/weapon/storage)) + for(var/obj/item/storage/i in src) + if(istype(i, /obj/item/storage)) var/list/storage_items = i.return_inv() for(var/obj/item/item in storage_items) diff --git a/code/modules/recycling/recycling.dm b/code/modules/recycling/recycling.dm index 46cb714adad..5c6eb417aff 100644 --- a/code/modules/recycling/recycling.dm +++ b/code/modules/recycling/recycling.dm @@ -66,7 +66,7 @@ description_info = "This machine is the first step in turning things back into their materials. There's a bit of loss, depending on how upgraded it is. The output of this machine goes into the sorter." icon = 'icons/obj/recycling.dmi' icon_state = "crusher" - circuit = /obj/item/weapon/circuitboard/recycler_crusher + circuit = /obj/item/circuitboard/recycler_crusher working = FALSE var/effic_factor = 0.5 @@ -74,9 +74,9 @@ /obj/machinery/recycling/crusher/RefreshParts() . = ..() var/total_rating = 0 - for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) + for(var/obj/item/stock_parts/matter_bin/M in component_parts) total_rating += M.rating - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) total_rating += M.rating total_rating *= 0.1 @@ -117,7 +117,7 @@ description_info = "The output of the recycling crusher should go into this machine, and it will output material dust, which can go into the sheet stamper to make sheets." icon = 'icons/obj/recycling.dmi' icon_state = "sorter" - circuit = /obj/item/weapon/circuitboard/recycler_sorter + circuit = /obj/item/circuitboard/recycler_sorter var/list/materials = list() working = FALSE @@ -163,7 +163,7 @@ description_info = "This machine is the last step in the recycling process. The output of a debris sorter should be fed into this machine and it will produce material sheets." icon = 'icons/obj/recycling.dmi' icon_state = "stamper" - circuit = /obj/item/weapon/circuitboard/recycler_stamper + circuit = /obj/item/circuitboard/recycler_stamper /obj/machinery/recycling/stamper/can_accept_item(obj/item/O) if(istype(O, /obj/item/material_dust)) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index a341e073368..2d64053c839 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -23,8 +23,8 @@ qdel(src) /obj/structure/bigDelivery/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/device/destTagger)) - var/obj/item/device/destTagger/O = W + if(istype(W, /obj/item/destTagger)) + var/obj/item/destTagger/O = W if(O.currTag) if(src.sortTag != O.currTag) to_chat(user, "You have labeled the destination as [O.currTag].") @@ -39,7 +39,7 @@ else to_chat(user, "You need to set a destination first!") - else if(istype(W, /obj/item/weapon/pen)) + else if(istype(W, /obj/item/pen)) switch(tgui_alert(usr, "What would you like to alter?","Select Alteration",list("Title","Description","Cancel"))) if("Title") var/str = sanitizeSafe(tgui_input_text(usr,"Label text?","Set label","", MAX_NAME_LEN), MAX_NAME_LEN) @@ -134,8 +134,8 @@ return /obj/item/smallDelivery/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/device/destTagger)) - var/obj/item/device/destTagger/O = W + if(istype(W, /obj/item/destTagger)) + var/obj/item/destTagger/O = W if(O.currTag) if(src.sortTag != O.currTag) to_chat(user, "You have labeled the destination as [O.currTag].") @@ -150,7 +150,7 @@ else to_chat(user, "You need to set a destination first!") - else if(istype(W, /obj/item/weapon/pen)) + else if(istype(W, /obj/item/pen)) switch(tgui_alert(usr, "What would you like to alter?","Select Alteration",list("Title","Description","Cancel"))) if("Title") var/str = sanitizeSafe(tgui_input_text(usr,"Label text?","Set label","", MAX_NAME_LEN), MAX_NAME_LEN) @@ -217,7 +217,7 @@ if(examtext) . += "It has a note attached which reads, \"[examtext]\"" -/obj/item/weapon/packageWrap +/obj/item/packageWrap name = "package wrapper" desc = "Like wrapping paper, but less festive." icon = 'icons/obj/items.dmi' @@ -227,12 +227,12 @@ drop_sound = 'sound/items/drop/wrapper.ogg' -/obj/item/weapon/packageWrap/afterattack(var/obj/target as obj, mob/user as mob, proximity) +/obj/item/packageWrap/afterattack(var/obj/target as obj, mob/user as mob, proximity) if(!proximity) return if(!istype(target)) //this really shouldn't be necessary (but it is). -Pete return if(istype(target, /obj/item/smallDelivery) || istype(target,/obj/structure/bigDelivery) \ - || istype(target, /obj/item/weapon/gift) || istype(target, /obj/item/weapon/evidencebag)) + || istype(target, /obj/item/gift) || istype(target, /obj/item/evidencebag)) return if(target.anchored) return @@ -244,7 +244,7 @@ user.attack_log += text("\[[time_stamp()]\] [span_blue("Has used [src.name] on \ref[target]")]") - if (istype(target, /obj/item) && !(istype(target, /obj/item/weapon/storage) && !istype(target,/obj/item/weapon/storage/box))) + if (istype(target, /obj/item) && !(istype(target, /obj/item/storage) && !istype(target,/obj/item/storage/box))) var/obj/item/O = target if (src.amount > 1) var/obj/item/smallDelivery/P = new /obj/item/smallDelivery(get_turf(O.loc)) //Aaannd wrap it up! @@ -307,12 +307,12 @@ else to_chat(user, span_blue("The object you are trying to wrap is unsuitable for the sorting machinery!")) if (src.amount <= 0) - new /obj/item/weapon/c_tube( src.loc ) + new /obj/item/c_tube( src.loc ) qdel(src) return return -/obj/item/weapon/packageWrap/examine(mob/user) +/obj/item/packageWrap/examine(mob/user) . = ..() if(get_dist(user, src) <= 0) . += span_blue("There are [amount] units of package wrap left!") @@ -329,7 +329,7 @@ AM.forceMove(T) return ..() -/obj/item/device/destTagger +/obj/item/destTagger name = "destination tagger" desc = "Used to set the destination of properly wrapped packages." icon_state = "dest_tagger" @@ -339,16 +339,16 @@ item_state = "electronic" slot_flags = SLOT_BELT -/obj/item/device/destTagger/tgui_state(mob/user) +/obj/item/destTagger/tgui_state(mob/user) return GLOB.tgui_inventory_state -/obj/item/device/destTagger/tgui_interact(mob/user, datum/tgui/ui) +/obj/item/destTagger/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "DestinationTagger", name) ui.open() -/obj/item/device/destTagger/tgui_static_data(mob/user) +/obj/item/destTagger/tgui_static_data(mob/user) var/list/data = ..() var/list/taggers = list() var/list/tagger_levels = list() @@ -361,17 +361,17 @@ return data -/obj/item/device/destTagger/tgui_data(mob/user, datum/tgui/ui) +/obj/item/destTagger/tgui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["currTag"] = currTag return data -/obj/item/device/destTagger/attack_self(mob/user as mob) +/obj/item/destTagger/attack_self(mob/user as mob) tgui_interact(user) -/obj/item/device/destTagger/tgui_act(action, params) +/obj/item/destTagger/tgui_act(action, params) if(..()) return TRUE add_fingerprint(usr) @@ -455,7 +455,7 @@ to_chat(user, "You [c_mode ? "remove" : "attach"] the screws around the power connection.") return if(I.has_tool_quality(TOOL_WELDER) && c_mode==1) - var/obj/item/weapon/weldingtool/W = I.get_welder() + var/obj/item/weldingtool/W = I.get_welder() if(!W.remove_fuel(0,user)) to_chat(user, "You need more welding fuel to complete this task.") return diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 2f45135a239..ad133ef1127 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -8,7 +8,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). name = "Circuit Imprinter" icon_state = "circuit_imprinter" flags = OPENCONTAINER - circuit = /obj/item/weapon/circuitboard/circuit_imprinter + circuit = /obj/item/circuitboard/circuit_imprinter var/list/datum/design/queue = list() var/progress = 0 @@ -66,14 +66,14 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). /obj/machinery/r_n_d/circuit_imprinter/RefreshParts() var/T = 0 - for(var/obj/item/weapon/reagent_containers/glass/G in component_parts) + for(var/obj/item/reagent_containers/glass/G in component_parts) T += G.reagents.maximum_volume create_reagents(T) max_material_storage = 0 - for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) + for(var/obj/item/stock_parts/matter_bin/M in component_parts) max_material_storage += M.rating * 75000 T = 0 - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) T += M.rating mat_efficiency = max(1 - (T - 1) / 4, 0.2) speed = T @@ -94,7 +94,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). /obj/machinery/r_n_d/circuit_imprinter/dismantle() for(var/obj/I in component_parts) - if(istype(I, /obj/item/weapon/reagent_containers/glass/beaker)) + if(istype(I, /obj/item/reagent_containers/glass/beaker)) reagents.trans_to_obj(I, reagents.total_volume) for(var/f in materials) if(materials[f] >= SHEET_MATERIAL_AMOUNT) @@ -116,7 +116,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). return if(default_part_replacement(user, O)) return - if(istype(O, /obj/item/weapon/gripper/no_use/loader)) + if(istype(O, /obj/item/gripper/no_use/loader)) return 0 //Sheet loaders weren't finishing attack(), this prevents the message "You can't stuff that gripper into this" without preventing the rest of the attack sequence from finishing if(panel_open) to_chat(user, "You can't load \the [src] while it's opened.") diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index e4c2cb6bd8c..729e2673960 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -81,7 +81,7 @@ other types of metals and chemistry for reagents). for(var/matname in materials) I.matter[matname] = materials[matname] - var/obj/item/weapon/cell/C = I.get_cell() + var/obj/item/cell/C = I.get_cell() if(C) C.charge = 0 I.update_icon() diff --git a/code/modules/research/designs/ai_holders.dm b/code/modules/research/designs/ai_holders.dm index 2f1fe24c128..b0ef5f0a7c2 100644 --- a/code/modules/research/designs/ai_holders.dm +++ b/code/modules/research/designs/ai_holders.dm @@ -9,7 +9,7 @@ req_tech = list(TECH_DATA = 2, TECH_BIO = 3) build_type = PROTOLATHE | PROSFAB materials = list(MAT_STEEL = 1000, MAT_GLASS = 500) - build_path = /obj/item/device/mmi + build_path = /obj/item/mmi category = list("Misc") sort_string = "SAAAA" @@ -19,7 +19,7 @@ req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 6, TECH_BLUESPACE = 2, TECH_DATA = 4) build_type = PROTOLATHE | PROSFAB materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000, MAT_SILVER = 1000, MAT_GOLD = 500, MAT_PHORON = 500, MAT_DIAMOND = 100) - build_path = /obj/item/device/mmi/digital/posibrain + build_path = /obj/item/mmi/digital/posibrain category = list("Misc") sort_string = "SAAAB" @@ -29,7 +29,7 @@ req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 5, TECH_DATA = 4) build_type = PROTOLATHE | PROSFAB materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000, MAT_SILVER = 1000, MAT_GOLD = 500) - build_path = /obj/item/device/mmi/digital/robot + build_path = /obj/item/mmi/digital/robot category = list("Misc") sort_string = "SAAAC" @@ -38,7 +38,7 @@ id = "paicard" req_tech = list(TECH_DATA = 2) materials = list(MAT_GLASS = 500, MAT_STEEL = 500) - build_path = /obj/item/device/paicard + build_path = /obj/item/paicard sort_string = "SBAAA" /datum/design/item/ai_holder/intellicard @@ -47,5 +47,5 @@ id = "intellicore" req_tech = list(TECH_DATA = 4, TECH_MATERIAL = 4) materials = list(MAT_GLASS = 1000, MAT_GOLD = 200) - build_path = /obj/item/device/aicard + build_path = /obj/item/aicard sort_string = "SCAAA" \ No newline at end of file diff --git a/code/modules/research/designs/bag_of_holding.dm b/code/modules/research/designs/bag_of_holding.dm index 23d075c19d0..7fcb67a04a1 100644 --- a/code/modules/research/designs/bag_of_holding.dm +++ b/code/modules/research/designs/bag_of_holding.dm @@ -10,7 +10,7 @@ id = "ore_holding" req_tech = list(TECH_BLUESPACE = 2, TECH_MATERIAL = 3) materials = list(MAT_GOLD = 1000, MAT_DIAMOND = 500, MAT_URANIUM = 250) // Less expensive since it can only hold ores - build_path = /obj/item/weapon/storage/bag/ore/holding + build_path = /obj/item/storage/bag/ore/holding sort_string = "QAAAA" /datum/design/item/boh/bag_holding @@ -19,7 +19,7 @@ id = "bag_holding" req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6) materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 1500, MAT_URANIUM = 250) - build_path = /obj/item/weapon/storage/backpack/holding + build_path = /obj/item/storage/backpack/holding sort_string = "QAAAA" /datum/design/item/boh/dufflebag_holding @@ -28,7 +28,7 @@ id = "dufflebag_holding" req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6) materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 1500, MAT_URANIUM = 250) - build_path = /obj/item/weapon/storage/backpack/holding/duffle + build_path = /obj/item/storage/backpack/holding/duffle sort_string = "QAAAB" /datum/design/item/boh/trashbag_holding @@ -37,7 +37,7 @@ id = "trashbag_holding" req_tech = list(TECH_BLUESPACE = 3, TECH_MATERIAL = 5) materials = list("gold" = 2000, "diamond" = 1000, "uranium" = 250) - build_path = /obj/item/weapon/storage/bag/trash/holding + build_path = /obj/item/storage/bag/trash/holding sort_string = "QAAAC" /datum/design/item/boh/pouch_holding @@ -46,7 +46,7 @@ id = "pouch_holding" req_tech = list(TECH_BLUESPACE = 3, TECH_MATERIAL = 5) materials = list("gold" = 3000, "diamond" = 2000, "uranium" = 250) - build_path = /obj/item/weapon/storage/pouch/holding + build_path = /obj/item/storage/pouch/holding sort_string = "QAAAD" @@ -56,7 +56,7 @@ id = "belt_holding_med" req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6) materials = list("gold" = 3000, "diamond" = 2000, "titanium" = 500) - build_path = /obj/item/weapon/storage/belt/medical/holding + build_path = /obj/item/storage/belt/medical/holding sort_string = "QAAAE" /datum/design/item/boh/belt_holding_utility @@ -65,6 +65,6 @@ id = "belt_holding_utility" req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6) materials = list("gold" = 3000, "diamond" = 2000, "titanium" = 500) - build_path = /obj/item/weapon/storage/belt/utility/holding + build_path = /obj/item/storage/belt/utility/holding sort_string = "QAAAF" \ No newline at end of file diff --git a/code/modules/research/designs/beakers.dm b/code/modules/research/designs/beakers.dm index 0b3c359d391..faef8147611 100644 --- a/code/modules/research/designs/beakers.dm +++ b/code/modules/research/designs/beakers.dm @@ -9,7 +9,7 @@ id = "splitbeaker" req_tech = list(TECH_MATERIAL = 2) materials = list(MAT_STEEL = 3000) - build_path = /obj/item/weapon/reagent_containers/glass/beaker/noreact + build_path = /obj/item/reagent_containers/glass/beaker/noreact sort_string = "IAAAA" /datum/design/item/beaker/bluespace @@ -18,5 +18,5 @@ id = "bluespacebeaker" req_tech = list(TECH_BLUESPACE = 2, TECH_MATERIAL = 6) materials = list(MAT_STEEL = 3000, MAT_PHORON = 3000, MAT_DIAMOND = 500) - build_path = /obj/item/weapon/reagent_containers/glass/beaker/bluespace + build_path = /obj/item/reagent_containers/glass/beaker/bluespace sort_string = "IAAAB" \ No newline at end of file diff --git a/code/modules/research/designs/bio_devices.dm b/code/modules/research/designs/bio_devices.dm index 27f1e0a556e..12918e62268 100644 --- a/code/modules/research/designs/bio_devices.dm +++ b/code/modules/research/designs/bio_devices.dm @@ -11,28 +11,28 @@ desc = "A device for analyzing chemicals in blood." id = "mass_spectrometer" req_tech = list(TECH_BIO = 2, TECH_MAGNET = 2) - build_path = /obj/item/device/mass_spectrometer + build_path = /obj/item/mass_spectrometer sort_string = "JAAAA" /datum/design/item/biotech/adv_mass_spectrometer desc = "A device for analyzing chemicals in blood and their quantities." id = "adv_mass_spectrometer" req_tech = list(TECH_BIO = 2, TECH_MAGNET = 4) - build_path = /obj/item/device/mass_spectrometer/adv + build_path = /obj/item/mass_spectrometer/adv sort_string = "JAAAB" /datum/design/item/biotech/reagent_scanner desc = "A device for identifying chemicals." id = "reagent_scanner" req_tech = list(TECH_BIO = 2, TECH_MAGNET = 2) - build_path = /obj/item/device/reagent_scanner + build_path = /obj/item/reagent_scanner sort_string = "JAABA" /datum/design/item/biotech/adv_reagent_scanner desc = "A device for identifying chemicals and their proportions." id = "adv_reagent_scanner" req_tech = list(TECH_BIO = 2, TECH_MAGNET = 4) - build_path = /obj/item/device/reagent_scanner/adv + build_path = /obj/item/reagent_scanner/adv sort_string = "JAABB" /datum/design/item/biotech/robot_scanner @@ -40,7 +40,7 @@ id = "robot_scanner" req_tech = list(TECH_MAGNET = 3, TECH_BIO = 2, TECH_ENGINEERING = 3) materials = list(MAT_STEEL = 500, MAT_GLASS = 200) - build_path = /obj/item/device/robotanalyzer + build_path = /obj/item/robotanalyzer sort_string = "JAACA" /datum/design/item/biotech/nanopaste @@ -56,6 +56,6 @@ id = "plant_analyzer" req_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) materials = list(MAT_STEEL = 500, MAT_GLASS = 500) - build_path = /obj/item/device/analyzer/plant_analyzer + build_path = /obj/item/analyzer/plant_analyzer sort_string = "JAADA" diff --git a/code/modules/research/designs/bio_devices_vr.dm b/code/modules/research/designs/bio_devices_vr.dm index ee651b193e0..63556e2fa34 100644 --- a/code/modules/research/designs/bio_devices_vr.dm +++ b/code/modules/research/designs/bio_devices_vr.dm @@ -3,7 +3,7 @@ id = "nif" req_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5) materials = list(MAT_STEEL = 5000, MAT_GLASS = 8000, MAT_URANIUM = 6000, MAT_DIAMOND = 6000) - build_path = /obj/item/device/nif + build_path = /obj/item/nif sort_string = "JVAAA" /datum/design/item/biotech/nifbio @@ -11,7 +11,7 @@ id = "bioadapnif" req_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5, TECH_BIO = 5) materials = list(MAT_STEEL = 10000, MAT_GLASS = 15000, MAT_URANIUM = 10000, MAT_DIAMOND = 10000) - build_path = /obj/item/device/nif/bioadap + build_path = /obj/item/nif/bioadap sort_string = "JVAAB" /datum/design/item/biotech/nifrepairtool @@ -19,5 +19,5 @@ id = "anrt" req_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5) materials = list(MAT_STEEL = 2000, MAT_GLASS = 3000, MAT_URANIUM = 2000, MAT_DIAMOND = 2000) - build_path = /obj/item/device/nifrepairer + build_path = /obj/item/nifrepairer sort_string = "JVABA" \ No newline at end of file diff --git a/code/modules/research/designs/circuit_assembly.dm b/code/modules/research/designs/circuit_assembly.dm index c637e450d22..020cc6a0f32 100644 --- a/code/modules/research/designs/circuit_assembly.dm +++ b/code/modules/research/designs/circuit_assembly.dm @@ -10,7 +10,7 @@ id = "ic_printer" req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 4, TECH_DATA = 5) materials = list(MAT_STEEL = 10000) - build_path = /obj/item/device/integrated_circuit_printer + build_path = /obj/item/integrated_circuit_printer sort_string = "UAAAA" /datum/design/item/integrated_circuitry/custom_circuit_printer_upgrade @@ -19,7 +19,7 @@ id = "ic_printer_upgrade_adv" req_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 4) materials = list(MAT_STEEL = 2000) - build_path = /obj/item/weapon/disk/integrated_circuit/upgrade/advanced + build_path = /obj/item/disk/integrated_circuit/upgrade/advanced sort_string = "UBAAA" /datum/design/item/integrated_circuitry/wirer @@ -27,7 +27,7 @@ id = "wirer" req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) materials = list(MAT_STEEL = 5000, MAT_GLASS = 2500) - build_path = /obj/item/device/integrated_electronics/wirer + build_path = /obj/item/integrated_electronics/wirer sort_string = "UCAAA" /datum/design/item/integrated_circuitry/debugger @@ -35,7 +35,7 @@ id = "debugger" req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) materials = list(MAT_STEEL = 5000, MAT_GLASS = 2500) - build_path = /obj/item/device/integrated_electronics/debugger + build_path = /obj/item/integrated_electronics/debugger sort_string = "UCBBB" // Assemblies @@ -50,7 +50,7 @@ id = "assembly-small" req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 2, TECH_POWER = 2) materials = list(MAT_STEEL = 10000) - build_path = /obj/item/device/electronic_assembly + build_path = /obj/item/electronic_assembly sort_string = "UDAAA" /datum/design/item/integrated_circuitry/assembly/custom_circuit_assembly_medium @@ -59,7 +59,7 @@ id = "assembly-medium" req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_POWER = 3) materials = list(MAT_STEEL = 20000) - build_path = /obj/item/device/electronic_assembly/medium + build_path = /obj/item/electronic_assembly/medium sort_string = "UDAAB" /datum/design/item/integrated_circuitry/assembly/custom_circuit_assembly_large @@ -68,7 +68,7 @@ id = "assembly-large" req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_POWER = 4) materials = list(MAT_STEEL = 40000) - build_path = /obj/item/device/electronic_assembly/large + build_path = /obj/item/electronic_assembly/large sort_string = "UDAAC" /datum/design/item/integrated_circuitry/assembly/custom_circuit_assembly_drone @@ -77,7 +77,7 @@ id = "assembly-drone" req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 4, TECH_POWER = 4) materials = list(MAT_STEEL = 30000) - build_path = /obj/item/device/electronic_assembly/drone + build_path = /obj/item/electronic_assembly/drone sort_string = "UDAAD" /datum/design/item/integrated_circuitry/assembly/custom_circuit_assembly_device @@ -86,7 +86,7 @@ id = "assembly-device" req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2) materials = list(MAT_STEEL = 5000) - build_path = /obj/item/device/assembly/electronic_assembly + build_path = /obj/item/assembly/electronic_assembly sort_string = "UDAAE" /datum/design/item/integrated_circuitry/assembly/custom_circuit_assembly_implant @@ -95,5 +95,5 @@ id = "assembly-implant" req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_POWER = 3, TECH_BIO = 5) materials = list(MAT_STEEL = 2000) - build_path = /obj/item/weapon/implant/integrated_circuit + build_path = /obj/item/implant/integrated_circuit sort_string = "UDAAF" \ No newline at end of file diff --git a/code/modules/research/designs/circuits/ai_modules.dm b/code/modules/research/designs/circuits/ai_modules.dm index b61c6f89dbd..018d428b756 100644 --- a/code/modules/research/designs/circuits/ai_modules.dm +++ b/code/modules/research/designs/circuits/ai_modules.dm @@ -12,63 +12,63 @@ name = "Safeguard" id = "safeguard" req_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) - build_path = /obj/item/weapon/aiModule/safeguard + build_path = /obj/item/aiModule/safeguard sort_string = "XABAA" /datum/design/aimodule/onehuman name = "OneCrewMember" id = "onehuman" req_tech = list(TECH_DATA = 4, TECH_MATERIAL = 6) - build_path = /obj/item/weapon/aiModule/oneHuman + build_path = /obj/item/aiModule/oneHuman sort_string = "XABAB" /datum/design/aimodule/protectstation name = "ProtectStation" id = "protectstation" req_tech = list(TECH_DATA = 3, TECH_MATERIAL = 6) - build_path = /obj/item/weapon/aiModule/protectStation + build_path = /obj/item/aiModule/protectStation sort_string = "XABAC" /datum/design/aimodule/notele name = "TeleporterOffline" id = "notele" req_tech = list(TECH_DATA = 3) - build_path = /obj/item/weapon/aiModule/teleporterOffline + build_path = /obj/item/aiModule/teleporterOffline sort_string = "XABAD" /datum/design/aimodule/quarantine name = "Quarantine" id = "quarantine" req_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 4) - build_path = /obj/item/weapon/aiModule/quarantine + build_path = /obj/item/aiModule/quarantine sort_string = "XABAE" /datum/design/aimodule/oxygen name = "OxygenIsToxicToHumans" id = "oxygen" req_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 4) - build_path = /obj/item/weapon/aiModule/oxygen + build_path = /obj/item/aiModule/oxygen sort_string = "XABAF" /datum/design/aimodule/freeform name = "Freeform" id = "freeform" req_tech = list(TECH_DATA = 4, TECH_MATERIAL = 4) - build_path = /obj/item/weapon/aiModule/freeform + build_path = /obj/item/aiModule/freeform sort_string = "XABAG" /datum/design/aimodule/reset name = "Reset" id = "reset" req_tech = list(TECH_DATA = 3, TECH_MATERIAL = 6) - build_path = /obj/item/weapon/aiModule/reset + build_path = /obj/item/aiModule/reset sort_string = "XABAH" /datum/design/aimodule/purge name = "Purge" id = "purge" req_tech = list(TECH_DATA = 4, TECH_MATERIAL = 6) - build_path = /obj/item/weapon/aiModule/purge + build_path = /obj/item/aiModule/purge sort_string = "XABAI" // Core modules @@ -84,32 +84,32 @@ /datum/design/aimodule/core/freeformcore name = "Freeform" id = "freeformcore" - build_path = /obj/item/weapon/aiModule/freeformcore + build_path = /obj/item/aiModule/freeformcore sort_string = "XACAA" /datum/design/aimodule/core/asimov name = "Asimov" id = "asimov" - build_path = /obj/item/weapon/aiModule/asimov + build_path = /obj/item/aiModule/asimov sort_string = "XACAB" /datum/design/aimodule/core/paladin name = "P.A.L.A.D.I.N." id = "paladin" - build_path = /obj/item/weapon/aiModule/paladin + build_path = /obj/item/aiModule/paladin sort_string = "XACAC" /datum/design/aimodule/core/tyrant name = "T.Y.R.A.N.T." id = "tyrant" req_tech = list(TECH_DATA = 4, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) - build_path = /obj/item/weapon/aiModule/tyrant + build_path = /obj/item/aiModule/tyrant sort_string = "XACAD" /datum/design/aimodule/core/nanotrasen name = "NT Default" id = "nanotrasen" - build_path = /obj/item/weapon/aiModule/nanotrasen + build_path = /obj/item/aiModule/nanotrasen req_tech = list(TECH_DATA = 1) sort_string = "XACAE" @@ -117,42 +117,42 @@ name = "Predator" id = "laws_predator_vr" req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) - build_path = /obj/item/weapon/aiModule/predator + build_path = /obj/item/aiModule/predator sort_string = "XACAF" /datum/design/aimodule/core/protective_shell name = "Protective Shell" id = "laws_protective_shell_vr" req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) - build_path = /obj/item/weapon/aiModule/protective_shell + build_path = /obj/item/aiModule/protective_shell sort_string = "XACAG" /datum/design/aimodule/core/scientific_pursuer name = "Scientific Pursuer" id = "laws_scientific_pursuer_vr" req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) - build_path = /obj/item/weapon/aiModule/scientific_pursuer + build_path = /obj/item/aiModule/scientific_pursuer sort_string = "XACAH" /datum/design/aimodule/core/guard_dog name = "Guard Dog" id = "laws_guard_dog_vr" req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) - build_path = /obj/item/weapon/aiModule/guard_dog + build_path = /obj/item/aiModule/guard_dog sort_string = "XACAI" /datum/design/aimodule/core/pleasurebot name = "Pleasurebot" id = "laws_pleasurebot_vr" req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) - build_path = /obj/item/weapon/aiModule/pleasurebot + build_path = /obj/item/aiModule/pleasurebot sort_string = "XACAJ" /datum/design/aimodule/core/consuming_eradicator name = "Consuming Eradicator" id = "laws_consuming_eradicator_vr" req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 6, TECH_MATERIAL = 6) - build_path = /obj/item/weapon/aiModule/consuming_eradicator + build_path = /obj/item/aiModule/consuming_eradicator sort_string = "XACAK" // Illegal modules @@ -170,68 +170,68 @@ name = "EngineOffline" id = "noengine" req_tech = list(TECH_DATA = 5, TECH_ILLEGAL = 5, TECH_MATERIAL = 6, TECH_COMBAT = 7) - build_path = /obj/item/weapon/aiModule/prototypeEngineOffline + build_path = /obj/item/aiModule/prototypeEngineOffline sort_string = "XADAA" /datum/design/aimodule/illegal/corp name = "Corporate" id = "corp" req_tech = list(TECH_DATA = 2, TECH_ILLEGAL = 4, TECH_MATERIAL = 2, TECH_COMBAT = 2) - build_path = /obj/item/weapon/aiModule/corp + build_path = /obj/item/aiModule/corp sort_string = "XADAB" /datum/design/aimodule/illegal/robocop name = "Robocop" id = "robocop" req_tech = list(TECH_DATA = 2, TECH_ILLEGAL = 2, TECH_MATERIAL = 2, TECH_COMBAT = 4) - build_path = /obj/item/weapon/aiModule/robocop + build_path = /obj/item/aiModule/robocop sort_string = "XADAC" /datum/design/aimodule/illegal/antimov name = "Antimov" id = "antimov" req_tech = list(TECH_DATA = 6, TECH_ILLEGAL = 7, TECH_MATERIAL = 7, TECH_COMBAT = 5) - build_path = /obj/item/weapon/aiModule/antimov + build_path = /obj/item/aiModule/antimov sort_string = "XADAD" /datum/design/aimodule/illegal/nanotrasen_aggressive name = "NT Aggressive" id = "nanotrasen_aggressive" req_tech = list(TECH_DATA = 5, TECH_ILLEGAL = 6, TECH_MATERIAL = 3, TECH_COMBAT = 7) - build_path = /obj/item/weapon/aiModule/nanotrasen_aggressive + build_path = /obj/item/aiModule/nanotrasen_aggressive sort_string = "XADAE" /datum/design/aimodule/illegal/maintenance name = "Maintenance" id = "maintenance" req_tech = list(TECH_DATA = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 3, TECH_COMBAT = 2) - build_path = /obj/item/weapon/aiModule/maintenance + build_path = /obj/item/aiModule/maintenance sort_string = "XADAF" /datum/design/aimodule/illegal/peacekeeper name = "Peacekeeper" id = "peacekeeper" req_tech = list(TECH_DATA = 4, TECH_ILLEGAL = 3, TECH_MATERIAL = 2, TECH_COMBAT = 2) - build_path = /obj/item/weapon/aiModule/peacekeeper + build_path = /obj/item/aiModule/peacekeeper sort_string = "XADAG" /datum/design/aimodule/illegal/reporter name = "Reporter" id = "reporter" req_tech = list(TECH_DATA = 2, TECH_ILLEGAL = 2, TECH_MATERIAL = 3) - build_path = /obj/item/weapon/aiModule/reporter + build_path = /obj/item/aiModule/reporter sort_string = "XADAH" /datum/design/aimodule/illegal/live_and_let_live name = "Live and Let Live" id = "live_and_let_live" req_tech = list(TECH_DATA = 5, TECH_ILLEGAL = 3, TECH_MATERIAL = 4, TECH_COMBAT = 3) - build_path = /obj/item/weapon/aiModule/live_and_let_live + build_path = /obj/item/aiModule/live_and_let_live sort_string = "XADAI" /datum/design/aimodule/illegal/balance name = "Guardian of Balance." id = "balance" req_tech = list(TECH_DATA = 4, TECH_ILLEGAL = 2, TECH_MATERIAL = 2, TECH_COMBAT = 3) - build_path = /obj/item/weapon/aiModule/balance + build_path = /obj/item/aiModule/balance sort_string = "XADAJ" diff --git a/code/modules/research/designs/circuits/circuits.dm b/code/modules/research/designs/circuits/circuits.dm index 0c73a001b4c..972ee1b1598 100644 --- a/code/modules/research/designs/circuits/circuits.dm +++ b/code/modules/research/designs/circuits/circuits.dm @@ -12,7 +12,7 @@ CIRCUITS BELOW /datum/design/circuit/AssembleDesignName() ..() if(build_path) - var/obj/item/weapon/circuitboard/C = build_path + var/obj/item/circuitboard/C = build_path if(initial(C.board_type) == "machine") name = "Machine circuit design ([item_name])" else if(initial(C.board_type) == "computer") @@ -28,312 +28,312 @@ CIRCUITS BELOW name = "battle arcade machine" id = "arcademachine" req_tech = list(TECH_DATA = 1) - build_path = /obj/item/weapon/circuitboard/arcade/battle + build_path = /obj/item/circuitboard/arcade/battle sort_string = "MAAAA" /datum/design/circuit/oriontrail name = "orion trail arcade machine" id = "oriontrail" req_tech = list(TECH_DATA = 1) - build_path = /obj/item/weapon/circuitboard/arcade/orion_trail + build_path = /obj/item/circuitboard/arcade/orion_trail sort_string = "MAAAB" /datum/design/circuit/clawmachine name = "grab-a-gift arcade machine" id = "clawmachine" req_tech = list(TECH_DATA = 1) - build_path = /obj/item/weapon/circuitboard/arcade/clawmachine + build_path = /obj/item/circuitboard/arcade/clawmachine sort_string = "MAAAC" /datum/design/circuit/jukebox name = "jukebox" id = "jukebox" req_tech = list(TECH_MAGNET = 2, TECH_DATA = 1) - build_path = /obj/item/weapon/circuitboard/jukebox + build_path = /obj/item/circuitboard/jukebox sort_string = "MAAAO" /datum/design/circuit/seccamera name = "security camera monitor" id = "seccamera" - build_path = /obj/item/weapon/circuitboard/security + build_path = /obj/item/circuitboard/security sort_string = "DAAAZ" // Duplicate string, really need to redo this whole thing /datum/design/circuit/secdata name = "security records console" id = "sec_data" - build_path = /obj/item/weapon/circuitboard/secure_data + build_path = /obj/item/circuitboard/secure_data sort_string = "DABAA" /datum/design/circuit/prisonmanage name = "prisoner management console" id = "prisonmanage" - build_path = /obj/item/weapon/circuitboard/prisoner + build_path = /obj/item/circuitboard/prisoner sort_string = "DACAA" /datum/design/circuit/med_data name = "medical records console" id = "med_data" - build_path = /obj/item/weapon/circuitboard/med_data + build_path = /obj/item/circuitboard/med_data sort_string = "FAAAA" /datum/design/circuit/operating name = "patient monitoring console" id = "operating" - build_path = /obj/item/weapon/circuitboard/operating + build_path = /obj/item/circuitboard/operating sort_string = "FACAA" /datum/design/circuit/scan_console name = "DNA machine" id = "scan_console" - build_path = /obj/item/weapon/circuitboard/scan_consolenew + build_path = /obj/item/circuitboard/scan_consolenew sort_string = "FAGAA" /datum/design/circuit/clonecontrol name = "cloning control console" id = "clonecontrol" req_tech = list(TECH_DATA = 3, TECH_BIO = 3) - build_path = /obj/item/weapon/circuitboard/cloning + build_path = /obj/item/circuitboard/cloning sort_string = "FAGAC" /datum/design/circuit/clonepod name = "clone pod" id = "clonepod" req_tech = list(TECH_DATA = 3, TECH_BIO = 3) - build_path = /obj/item/weapon/circuitboard/clonepod + build_path = /obj/item/circuitboard/clonepod sort_string = "FAGAE" /datum/design/circuit/clonescanner name = "cloning scanner" id = "clonescanner" req_tech = list(TECH_DATA = 3, TECH_BIO = 3) - build_path = /obj/item/weapon/circuitboard/clonescanner + build_path = /obj/item/circuitboard/clonescanner sort_string = "FAGAG" /datum/design/circuit/chem_master name = "ChemMaster 3000" id = "chemmaster" req_tech = list(TECH_DATA = 3, TECH_MAGNET = 2) - build_path = /obj/item/weapon/circuitboard/chem_master + build_path = /obj/item/circuitboard/chem_master sort_string = "FAGAH" /datum/design/circuit/crewconsole name = "crew monitoring console" id = "crewconsole" req_tech = list(TECH_DATA = 3, TECH_MAGNET = 2, TECH_BIO = 2) - build_path = /obj/item/weapon/circuitboard/crew + build_path = /obj/item/circuitboard/crew sort_string = "FAGAI" /datum/design/circuit/teleconsole name = "teleporter control console" id = "teleconsole" req_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 2) - build_path = /obj/item/weapon/circuitboard/teleporter + build_path = /obj/item/circuitboard/teleporter sort_string = "HAAAA" /datum/design/circuit/robocontrol name = "robotics control console" id = "robocontrol" req_tech = list(TECH_DATA = 4) - build_path = /obj/item/weapon/circuitboard/robotics + build_path = /obj/item/circuitboard/robotics sort_string = "HAAAB" /datum/design/circuit/mechacontrol name = "exosuit control console" id = "mechacontrol" req_tech = list(TECH_DATA = 3) - build_path = /obj/item/weapon/circuitboard/mecha_control + build_path = /obj/item/circuitboard/mecha_control sort_string = "HAAAC" /datum/design/circuit/rdconsole name = "R&D control console" id = "rdconsole" req_tech = list(TECH_DATA = 4) - build_path = /obj/item/weapon/circuitboard/rdconsole + build_path = /obj/item/circuitboard/rdconsole sort_string = "HAAAE" /datum/design/circuit/aifixer name = "AI integrity restorer" id = "aifixer" req_tech = list(TECH_DATA = 3, TECH_BIO = 2) - build_path = /obj/item/weapon/circuitboard/aifixer + build_path = /obj/item/circuitboard/aifixer sort_string = "HAAAF" /datum/design/circuit/comm_monitor name = "telecommunications monitoring console" id = "comm_monitor" req_tech = list(TECH_DATA = 3) - build_path = /obj/item/weapon/circuitboard/comm_monitor + build_path = /obj/item/circuitboard/comm_monitor sort_string = "HAACA" /datum/design/circuit/comm_server name = "telecommunications server monitoring console" id = "comm_server" req_tech = list(TECH_DATA = 3) - build_path = /obj/item/weapon/circuitboard/comm_server + build_path = /obj/item/circuitboard/comm_server sort_string = "HAACB" /datum/design/circuit/message_monitor name = "messaging monitor console" id = "message_monitor" req_tech = list(TECH_DATA = 5) - build_path = /obj/item/weapon/circuitboard/message_monitor + build_path = /obj/item/circuitboard/message_monitor sort_string = "HAACC" /datum/design/circuit/aiupload name = "AI upload console" id = "aiupload" req_tech = list(TECH_DATA = 4) - build_path = /obj/item/weapon/circuitboard/aiupload + build_path = /obj/item/circuitboard/aiupload sort_string = "HAABA" /datum/design/circuit/borgupload name = "cyborg upload console" id = "borgupload" req_tech = list(TECH_DATA = 4) - build_path = /obj/item/weapon/circuitboard/borgupload + build_path = /obj/item/circuitboard/borgupload sort_string = "HAABB" /datum/design/circuit/destructive_analyzer name = "destructive analyzer" id = "destructive_analyzer" req_tech = list(TECH_DATA = 2, TECH_MAGNET = 2, TECH_ENGINEERING = 2) - build_path = /obj/item/weapon/circuitboard/destructive_analyzer + build_path = /obj/item/circuitboard/destructive_analyzer sort_string = "HABAA" /datum/design/circuit/protolathe name = "protolathe" id = "protolathe" req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) - build_path = /obj/item/weapon/circuitboard/protolathe + build_path = /obj/item/circuitboard/protolathe sort_string = "HABAB" /datum/design/circuit/circuit_imprinter name = "circuit imprinter" id = "circuit_imprinter" req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) - build_path = /obj/item/weapon/circuitboard/circuit_imprinter + build_path = /obj/item/circuitboard/circuit_imprinter sort_string = "HABAC" /datum/design/circuit/autolathe name = "autolathe board" id = "autolathe" req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) - build_path = /obj/item/weapon/circuitboard/autolathe + build_path = /obj/item/circuitboard/autolathe sort_string = "HABAD" /datum/design/circuit/rdservercontrol name = "R&D server control console" id = "rdservercontrol" req_tech = list(TECH_DATA = 3) - build_path = /obj/item/weapon/circuitboard/rdservercontrol + build_path = /obj/item/circuitboard/rdservercontrol sort_string = "HABBA" /datum/design/circuit/rdserver name = "R&D server" id = "rdserver" req_tech = list(TECH_DATA = 3) - build_path = /obj/item/weapon/circuitboard/rdserver + build_path = /obj/item/circuitboard/rdserver sort_string = "HABBB" /datum/design/circuit/mechfab name = "exosuit fabricator" id = "mechfab" req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) - build_path = /obj/item/weapon/circuitboard/mechfab + build_path = /obj/item/circuitboard/mechfab sort_string = "HABAE" /datum/design/circuit/prosfab name = "prosthetics fabricator" id = "prosfab" req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) - build_path = /obj/item/weapon/circuitboard/prosthetics + build_path = /obj/item/circuitboard/prosthetics sort_string = "HABAF" /datum/design/circuit/mech_recharger name = "mech recharger" id = "mech_recharger" req_tech = list(TECH_DATA = 2, TECH_POWER = 2, TECH_ENGINEERING = 2) - build_path = /obj/item/weapon/circuitboard/mech_recharger + build_path = /obj/item/circuitboard/mech_recharger sort_string = "HACAA" /datum/design/circuit/recharge_station name = "cyborg recharge station" id = "recharge_station" req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 2) - build_path = /obj/item/weapon/circuitboard/recharge_station + build_path = /obj/item/circuitboard/recharge_station sort_string = "HACAC" /datum/design/circuit/atmosalerts name = "atmosphere alert console" id = "atmosalerts" - build_path = /obj/item/weapon/circuitboard/atmos_alert + build_path = /obj/item/circuitboard/atmos_alert sort_string = "JAAAA" /datum/design/circuit/air_management name = "atmosphere monitoring console" id = "air_management" - build_path = /obj/item/weapon/circuitboard/air_management + build_path = /obj/item/circuitboard/air_management sort_string = "JAAAB" /datum/design/circuit/rcon_console name = "RCON remote control console" id = "rcon_console" req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_POWER = 5) - build_path = /obj/item/weapon/circuitboard/rcon_console + build_path = /obj/item/circuitboard/rcon_console sort_string = "JAAAC" /datum/design/circuit/dronecontrol name = "drone control console" id = "dronecontrol" req_tech = list(TECH_DATA = 4) - build_path = /obj/item/weapon/circuitboard/drone_control + build_path = /obj/item/circuitboard/drone_control sort_string = "JAAAD" /datum/design/circuit/powermonitor name = "power monitoring console" id = "powermonitor" - build_path = /obj/item/weapon/circuitboard/powermonitor + build_path = /obj/item/circuitboard/powermonitor sort_string = "JAAAE" /datum/design/circuit/solarcontrol name = "solar control console" id = "solarcontrol" - build_path = /obj/item/weapon/circuitboard/solar_control + build_path = /obj/item/circuitboard/solar_control sort_string = "JAAAF" /datum/design/circuit/shutoff_monitor name = "Automatic shutoff valve monitor" id = "shutoff_monitor" req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3) - build_path = /obj/item/weapon/circuitboard/shutoff_monitor + build_path = /obj/item/circuitboard/shutoff_monitor sort_string = "JAAAG" /datum/design/circuit/pacman name = "PACMAN-type generator" id = "pacman" req_tech = list(TECH_DATA = 3, TECH_PHORON = 3, TECH_POWER = 3, TECH_ENGINEERING = 3) - build_path = /obj/item/weapon/circuitboard/pacman + build_path = /obj/item/circuitboard/pacman sort_string = "JBAAA" /datum/design/circuit/superpacman name = "SUPERPACMAN-type generator" id = "superpacman" req_tech = list(TECH_DATA = 3, TECH_POWER = 4, TECH_ENGINEERING = 4) - build_path = /obj/item/weapon/circuitboard/pacman/super + build_path = /obj/item/circuitboard/pacman/super sort_string = "JBAAB" /datum/design/circuit/mrspacman name = "MRSPACMAN-type generator" id = "mrspacman" req_tech = list(TECH_DATA = 3, TECH_POWER = 5, TECH_ENGINEERING = 5) - build_path = /obj/item/weapon/circuitboard/pacman/mrs + build_path = /obj/item/circuitboard/pacman/mrs sort_string = "JBAAC" /datum/design/circuit/batteryrack name = "cell rack PSU" id = "batteryrack" req_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 2) - build_path = /obj/item/weapon/circuitboard/batteryrack + build_path = /obj/item/circuitboard/batteryrack sort_string = "JBABA" /datum/design/circuit/smes_cell @@ -341,7 +341,7 @@ CIRCUITS BELOW desc = "Allows for the construction of circuit boards used to build a SMES." id = "smes_cell" req_tech = list(TECH_POWER = 7, TECH_ENGINEERING = 5) - build_path = /obj/item/weapon/circuitboard/smes + build_path = /obj/item/circuitboard/smes sort_string = "JBABB" /datum/design/circuit/grid_checker @@ -349,7 +349,7 @@ CIRCUITS BELOW desc = "Allows for the construction of circuit boards used to build a grid checker." id = "grid_checker" req_tech = list(TECH_POWER = 4, TECH_ENGINEERING = 3) - build_path = /obj/item/weapon/circuitboard/grid_checker + build_path = /obj/item/circuitboard/grid_checker sort_string = "JBABC" /datum/design/circuit/breakerbox @@ -357,21 +357,21 @@ CIRCUITS BELOW desc = "Allows for the construction of circuit boards used to build a breaker box." id = "breakerbox" req_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 3) - build_path = /obj/item/weapon/circuitboard/breakerbox + build_path = /obj/item/circuitboard/breakerbox sort_string = "JBABD" /datum/design/circuit/gas_heater name = "gas heating system" id = "gasheater" req_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 1) - build_path = /obj/item/weapon/circuitboard/unary_atmos/heater + build_path = /obj/item/circuitboard/unary_atmos/heater sort_string = "JCAAA" /datum/design/circuit/gas_cooler name = "gas cooling system" id = "gascooler" req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) - build_path = /obj/item/weapon/circuitboard/unary_atmos/cooler + build_path = /obj/item/circuitboard/unary_atmos/cooler sort_string = "JCAAB" /datum/design/circuit/secure_airlock @@ -379,73 +379,73 @@ CIRCUITS BELOW desc = "Allows for the construction of a tamper-resistant airlock electronics." id = "securedoor" req_tech = list(TECH_DATA = 3) - build_path = /obj/item/weapon/airlock_electronics/secure + build_path = /obj/item/airlock_electronics/secure sort_string = "JDAAA" /datum/design/circuit/ordercomp name = "supply ordering console" id = "ordercomp" - build_path = /obj/item/weapon/circuitboard/supplycomp + build_path = /obj/item/circuitboard/supplycomp sort_string = "KAAAY" // Duplicate string, really need to redo this whole thing /datum/design/circuit/supplycomp name = "supply control console" id = "supplycomp" req_tech = list(TECH_DATA = 3) - build_path = /obj/item/weapon/circuitboard/supplycomp/control + build_path = /obj/item/circuitboard/supplycomp/control sort_string = "KAAAZ" // Duplicate string, really need to redo this whole thing /datum/design/circuit/biogenerator name = "biogenerator" id = "biogenerator" req_tech = list(TECH_DATA = 2) - build_path = /obj/item/weapon/circuitboard/biogenerator + build_path = /obj/item/circuitboard/biogenerator sort_string = "KBAAA" /datum/design/circuit/miningdrill name = "mining drill head" id = "mining drill head" req_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) - build_path = /obj/item/weapon/circuitboard/miningdrill + build_path = /obj/item/circuitboard/miningdrill sort_string = "KCAAA" /datum/design/circuit/miningdrillbrace name = "mining drill brace" id = "mining drill brace" req_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) - build_path = /obj/item/weapon/circuitboard/miningdrillbrace + build_path = /obj/item/circuitboard/miningdrillbrace sort_string = "KCAAB" /datum/design/circuit/comconsole name = "communications console" id = "comconsole" - build_path = /obj/item/weapon/circuitboard/communications + build_path = /obj/item/circuitboard/communications sort_string = "LAAAA" /datum/design/circuit/idcardconsole name = "ID card modification console" id = "idcardconsole" - build_path = /obj/item/weapon/circuitboard/card + build_path = /obj/item/circuitboard/card sort_string = "LAAAB" /datum/design/circuit/emp_data name = "employment records console" id = "emp_data" - build_path = /obj/item/weapon/circuitboard/skills + build_path = /obj/item/circuitboard/skills sort_string = "LAAAC" /datum/design/circuit/arf_generator name = "atmospheric field generator" id = "arf_generator" req_tech = list(TECH_MAGNET = 4, TECH_POWER = 4, TECH_BIO = 3) - build_path = /obj/item/weapon/circuitboard/arf_generator + build_path = /obj/item/circuitboard/arf_generator sort_string = "LAAAD" /datum/design/circuit/protean_reconstitutor name = "protean reconstitutor" id = "protean_recon" req_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5) - build_path = /obj/item/weapon/circuitboard/protean_reconstitutor + build_path = /obj/item/circuitboard/protean_reconstitutor sort_string = "LAAAE" /datum/design/circuit/mecha @@ -459,55 +459,55 @@ CIRCUITS BELOW /datum/design/circuit/mecha/ripley_main name = "APLU 'Ripley' central control" id = "ripley_main" - build_path = /obj/item/weapon/circuitboard/mecha/ripley/main + build_path = /obj/item/circuitboard/mecha/ripley/main sort_string = "NAAAA" /datum/design/circuit/mecha/ripley_peri name = "APLU 'Ripley' peripherals control" id = "ripley_peri" - build_path = /obj/item/weapon/circuitboard/mecha/ripley/peripherals + build_path = /obj/item/circuitboard/mecha/ripley/peripherals sort_string = "NAAAB" /datum/design/circuit/mecha/odysseus_main name = "'Odysseus' central control" id = "odysseus_main" req_tech = list(TECH_DATA = 3,TECH_BIO = 2) - build_path = /obj/item/weapon/circuitboard/mecha/odysseus/main + build_path = /obj/item/circuitboard/mecha/odysseus/main sort_string = "NAABA" /datum/design/circuit/mecha/odysseus_peri name = "'Odysseus' peripherals control" id = "odysseus_peri" req_tech = list(TECH_DATA = 3,TECH_BIO = 2) - build_path = /obj/item/weapon/circuitboard/mecha/odysseus/peripherals + build_path = /obj/item/circuitboard/mecha/odysseus/peripherals sort_string = "NAABB" /datum/design/circuit/mecha/gygax_main name = "'Gygax' central control" id = "gygax_main" req_tech = list(TECH_DATA = 4) - build_path = /obj/item/weapon/circuitboard/mecha/gygax/main + build_path = /obj/item/circuitboard/mecha/gygax/main sort_string = "NAACA" /datum/design/circuit/mecha/gygax_peri name = "'Gygax' peripherals control" id = "gygax_peri" req_tech = list(TECH_DATA = 4) - build_path = /obj/item/weapon/circuitboard/mecha/gygax/peripherals + build_path = /obj/item/circuitboard/mecha/gygax/peripherals sort_string = "NAACB" /datum/design/circuit/mecha/gygax_targ name = "'Gygax' weapon control and targeting" id = "gygax_targ" req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2) - build_path = /obj/item/weapon/circuitboard/mecha/gygax/targeting + build_path = /obj/item/circuitboard/mecha/gygax/targeting sort_string = "NAACC" /datum/design/circuit/mecha/gygax_medical name = "'Serenity' medical control" id = "gygax_medical" req_tech = list(TECH_DATA = 4, TECH_BIO = 2) - build_path = /obj/item/weapon/circuitboard/mecha/gygax/medical + build_path = /obj/item/circuitboard/mecha/gygax/medical sort_string = "NAACD" /datum/design/circuit/mecha/durand_main @@ -516,7 +516,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 4) materials = list(MAT_GLASS = 2000, MAT_GRAPHITE = 1250) chemicals = list("sacid" = 20) - build_path = /obj/item/weapon/circuitboard/mecha/durand/main + build_path = /obj/item/circuitboard/mecha/durand/main sort_string = "NAADA" /datum/design/circuit/mecha/durand_peri @@ -525,7 +525,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 4) materials = list(MAT_GLASS = 2000, MAT_GRAPHITE = 1250) chemicals = list("sacid" = 20) - build_path = /obj/item/weapon/circuitboard/mecha/durand/peripherals + build_path = /obj/item/circuitboard/mecha/durand/peripherals sort_string = "NAADB" /datum/design/circuit/mecha/durand_targ @@ -534,7 +534,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2) materials = list(MAT_GLASS = 2000, MAT_GRAPHITE = 1250) chemicals = list("sacid" = 20) - build_path = /obj/item/weapon/circuitboard/mecha/durand/targeting + build_path = /obj/item/circuitboard/mecha/durand/targeting sort_string = "NAADC" /datum/design/circuit/tcom @@ -548,53 +548,53 @@ CIRCUITS BELOW /datum/design/circuit/tcom/server name = "server mainframe" id = "tcom-server" - build_path = /obj/item/weapon/circuitboard/telecomms/server + build_path = /obj/item/circuitboard/telecomms/server sort_string = "PAAAA" /datum/design/circuit/tcom/processor name = "processor unit" id = "tcom-processor" - build_path = /obj/item/weapon/circuitboard/telecomms/processor + build_path = /obj/item/circuitboard/telecomms/processor sort_string = "PAAAB" /datum/design/circuit/tcom/bus name = "bus mainframe" id = "tcom-bus" - build_path = /obj/item/weapon/circuitboard/telecomms/bus + build_path = /obj/item/circuitboard/telecomms/bus sort_string = "PAAAC" /datum/design/circuit/tcom/hub name = "hub mainframe" id = "tcom-hub" - build_path = /obj/item/weapon/circuitboard/telecomms/hub + build_path = /obj/item/circuitboard/telecomms/hub sort_string = "PAAAD" /datum/design/circuit/tcom/relay name = "relay mainframe" id = "tcom-relay" req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 4, TECH_BLUESPACE = 3) - build_path = /obj/item/weapon/circuitboard/telecomms/relay + build_path = /obj/item/circuitboard/telecomms/relay sort_string = "PAAAE" /datum/design/circuit/tcom/broadcaster name = "subspace broadcaster" id = "tcom-broadcaster" req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4, TECH_BLUESPACE = 2) - build_path = /obj/item/weapon/circuitboard/telecomms/broadcaster + build_path = /obj/item/circuitboard/telecomms/broadcaster sort_string = "PAAAF" /datum/design/circuit/tcom/receiver name = "subspace receiver" id = "tcom-receiver" req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_BLUESPACE = 2) - build_path = /obj/item/weapon/circuitboard/telecomms/receiver + build_path = /obj/item/circuitboard/telecomms/receiver sort_string = "PAAAG" /datum/design/circuit/tcom/exonet_node name = "exonet node" id = "tcom-exonet_node" req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 5, TECH_BLUESPACE = 4) - build_path = /obj/item/weapon/circuitboard/telecomms/exonet_node + build_path = /obj/item/circuitboard/telecomms/exonet_node sort_string = "PAAAH" /datum/design/circuit/shield @@ -610,13 +610,13 @@ CIRCUITS BELOW /datum/design/circuit/shield/bubble name = "bubble (OBSOLETE)" //VOREStation Edit id = "shield_gen" - build_path = /obj/item/weapon/circuitboard/shield_gen + build_path = /obj/item/circuitboard/shield_gen sort_string = "VAAAZ" // Duplicate string, really need to redo this whole thing /datum/design/circuit/shield/hull name = "hull (OBSOLETE)" //VOREStation Edit id = "shield_gen_ex" - build_path = /obj/item/weapon/circuitboard/shield_gen_ex + build_path = /obj/item/circuitboard/shield_gen_ex sort_string = "VAAAB" /datum/design/circuit/shield/capacitor @@ -624,63 +624,63 @@ CIRCUITS BELOW desc = "Allows for the construction of a shield capacitor circuit board." id = "shield_cap" req_tech = list(TECH_MAGNET = 3, TECH_POWER = 4) - build_path = /obj/item/weapon/circuitboard/shield_cap + build_path = /obj/item/circuitboard/shield_cap sort_string = "VAAAC" /datum/design/circuit/ntnet_relay name = "NTNet Quantum Relay" id = "ntnet_relay" req_tech = list(TECH_DATA = 4) - build_path = /obj/item/weapon/circuitboard/ntnet_relay + build_path = /obj/item/circuitboard/ntnet_relay sort_string = "WAAAA" /datum/design/circuit/aicore name = "AI core" id = "aicore" req_tech = list(TECH_DATA = 4, TECH_BIO = 3) - build_path = /obj/item/weapon/circuitboard/aicore + build_path = /obj/item/circuitboard/aicore sort_string = "XAAAA" // Cooking Appliances /datum/design/circuit/microwave name = "microwave board" id = "microwave_board" req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) - build_path = /obj/item/weapon/circuitboard/microwave + build_path = /obj/item/circuitboard/microwave sort_string = "HACAM" /datum/design/circuit/oven name = "oven board" id = "oven_board" req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) - build_path = /obj/item/weapon/circuitboard/oven + build_path = /obj/item/circuitboard/oven sort_string = "HACAN" /datum/design/circuit/fryer name = "deep fryer board" id = "fryer_board" req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) - build_path = /obj/item/weapon/circuitboard/fryer + build_path = /obj/item/circuitboard/fryer sort_string = "HACAO" /datum/design/circuit/cerealmaker name = "cereal maker board" id = "cerealmaker_board" req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) - build_path = /obj/item/weapon/circuitboard/cerealmaker + build_path = /obj/item/circuitboard/cerealmaker sort_string = "HACAP" /datum/design/circuit/candymaker name = "candy machine board" id = "candymachine_board" req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) - build_path = /obj/item/weapon/circuitboard/candymachine + build_path = /obj/item/circuitboard/candymachine sort_string = "HACAQ" /datum/design/circuit/microwave/advanced name = "deluxe microwave" id = "deluxe microwave" req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 5, TECH_BLUESPACE = 4) - build_path = /obj/item/weapon/circuitboard/microwave/advanced + build_path = /obj/item/circuitboard/microwave/advanced sort_string = "HACAA" @@ -688,47 +688,47 @@ CIRCUITS BELOW name = "shield generator" id = "shield_generator" req_tech = list(TECH_MAGNET = 3, TECH_POWER = 4, TECH_BLUESPACE = 2, TECH_ENGINEERING = 3) - build_path = /obj/item/weapon/circuitboard/shield_generator + build_path = /obj/item/circuitboard/shield_generator sort_string = "OAAAA" /datum/design/circuit/shield_diffuser name = "shield diffuser" id = "shield_diffuser" req_tech = list(TECH_MAGNET = 4, TECH_POWER = 2, TECH_ENGINEERING = 5) - build_path = /obj/item/weapon/circuitboard/shield_diffuser + build_path = /obj/item/circuitboard/shield_diffuser sort_string = "OAAAB" /datum/design/circuit/pointdefense name = "point defense battery" id = "pointdefense" req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 3, TECH_COMBAT = 4) - build_path = /obj/item/weapon/circuitboard/pointdefense + build_path = /obj/item/circuitboard/pointdefense sort_string = "OAABA" /datum/design/circuit/pointdefense_control name = "point defense control" id = "pointdefense_control" req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_COMBAT = 2) - build_path = /obj/item/weapon/circuitboard/pointdefense_control + build_path = /obj/item/circuitboard/pointdefense_control sort_string = "OAABB" /datum/design/circuit/recycler_crusher name = "recycler - crusher" id = "recycler_crusher" req_tech = list(TECH_MATERIAL = 2) - build_path = /obj/item/weapon/circuitboard/recycler_crusher + build_path = /obj/item/circuitboard/recycler_crusher sort_string = "OAABC" /datum/design/circuit/recycler_sorter name = "recycler - sorter" id = "recycler_sorter" req_tech = list(TECH_MATERIAL = 2) - build_path = /obj/item/weapon/circuitboard/recycler_sorter + build_path = /obj/item/circuitboard/recycler_sorter sort_string = "OAABD" /datum/design/circuit/recycler_stamper name = "recycler - stamper" id = "recycler_stamper" req_tech = list(TECH_MATERIAL = 2) - build_path = /obj/item/weapon/circuitboard/recycler_stamper + build_path = /obj/item/circuitboard/recycler_stamper sort_string = "OAABE" diff --git a/code/modules/research/designs/circuits/circuits_vr.dm b/code/modules/research/designs/circuits/circuits_vr.dm index 43fba27e7fb..3ab3e2ffd0a 100644 --- a/code/modules/research/designs/circuits/circuits_vr.dm +++ b/code/modules/research/designs/circuits/circuits_vr.dm @@ -2,104 +2,104 @@ name = "Algae Oxygen Generator" id = "algae_farm" req_tech = list(TECH_ENGINEERING = 3, TECH_BIO = 2) - build_path = /obj/item/weapon/circuitboard/algae_farm + build_path = /obj/item/circuitboard/algae_farm sort_string = "HABAE" /datum/design/circuit/thermoregulator name = "thermal regulator" id = "thermoregulator" req_tech = list(TECH_ENGINEERING = 4, TECH_POWER = 3) - build_path = /obj/item/weapon/circuitboard/thermoregulator + build_path = /obj/item/circuitboard/thermoregulator sort_string = "HABAF" /datum/design/circuit/bomb_tester name = "Explosive Effect Simulator" id = "bomb_tester" req_tech = list(TECH_PHORON = 3, TECH_DATA = 2, TECH_MAGNET = 2) - build_path = /obj/item/weapon/circuitboard/bomb_tester + build_path = /obj/item/circuitboard/bomb_tester sort_string = "HABAG" /datum/design/circuit/quantum_pad name = "Quantum Pad" id = "quantum_pad" req_tech = list(TECH_ENGINEERING = 4, TECH_POWER = 4, TECH_BLUESPACE = 4) - build_path = /obj/item/weapon/circuitboard/quantumpad + build_path = /obj/item/circuitboard/quantumpad sort_string = "HABAH" //////Micro mech stuff /datum/design/circuit/mecha/gopher_main name = "'Gopher' central control" id = "gopher_main" - build_path = /obj/item/weapon/circuitboard/mecha/gopher/main + build_path = /obj/item/circuitboard/mecha/gopher/main sort_string = "NAAEA" /datum/design/circuit/mecha/gopher_peri name = "'Gopher' peripherals control" id = "gopher_peri" - build_path = /obj/item/weapon/circuitboard/mecha/gopher/peripherals + build_path = /obj/item/circuitboard/mecha/gopher/peripherals sort_string = "NAAEB" /datum/design/circuit/mecha/polecat_main name = "'Polecat' central control" id = "polecat_main" req_tech = list(TECH_DATA = 4) - build_path = /obj/item/weapon/circuitboard/mecha/polecat/main + build_path = /obj/item/circuitboard/mecha/polecat/main sort_string = "NAAFA" /datum/design/circuit/mecha/polecat_peri name = "'Polecat' peripherals control" id = "polecat_peri" req_tech = list(TECH_DATA = 4) - build_path = /obj/item/weapon/circuitboard/mecha/polecat/peripherals + build_path = /obj/item/circuitboard/mecha/polecat/peripherals sort_string = "NAAFB" /datum/design/circuit/mecha/polecat_targ name = "'Polecat' weapon control and targeting" id = "polecat_targ" req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2) - build_path = /obj/item/weapon/circuitboard/mecha/polecat/targeting + build_path = /obj/item/circuitboard/mecha/polecat/targeting sort_string = "NAAFC" /datum/design/circuit/mecha/weasel_main name = "'Weasel' central control" id = "weasel_main" req_tech = list(TECH_DATA = 4) - build_path = /obj/item/weapon/circuitboard/mecha/weasel/main + build_path = /obj/item/circuitboard/mecha/weasel/main sort_string = "NAAGA" /datum/design/circuit/mecha/weasel_peri name = "'Weasel' peripherals control" id = "weasel_peri" req_tech = list(TECH_DATA = 4) - build_path = /obj/item/weapon/circuitboard/mecha/weasel/peripherals + build_path = /obj/item/circuitboard/mecha/weasel/peripherals sort_string = "NAAGB" /datum/design/circuit/mecha/weasel_targ name = "'Weasel' weapon control and targeting" id = "weasel_targ" req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2) - build_path = /obj/item/weapon/circuitboard/mecha/weasel/targeting + build_path = /obj/item/circuitboard/mecha/weasel/targeting sort_string = "NAAGC" /datum/design/circuit/transhuman_clonepod name = "grower pod" id = "transhuman_clonepod" req_tech = list(TECH_DATA = 3, TECH_BIO = 3) - build_path = /obj/item/weapon/circuitboard/transhuman_clonepod + build_path = /obj/item/circuitboard/transhuman_clonepod sort_string = "HAADA" /datum/design/circuit/transhuman_synthprinter name = "SynthFab 3000" id = "transhuman_synthprinter" req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) - build_path = /obj/item/weapon/circuitboard/transhuman_synthprinter + build_path = /obj/item/circuitboard/transhuman_synthprinter sort_string = "HAADB" /datum/design/circuit/transhuman_resleever name = "Resleeving pod" id = "transhuman_resleever" req_tech = list(TECH_ENGINEERING = 4, TECH_BIO = 4) - build_path = /obj/item/weapon/circuitboard/transhuman_resleever + build_path = /obj/item/circuitboard/transhuman_resleever sort_string = "HAADC" // Resleeving @@ -108,21 +108,21 @@ name = "Resleeving control console" id = "resleeving_control" req_tech = list(TECH_DATA = 5) - build_path = /obj/item/weapon/circuitboard/resleeving_control + build_path = /obj/item/circuitboard/resleeving_control sort_string = "HAADE" /datum/design/circuit/body_designer name = "Body design console" id = "body_designer" req_tech = list(TECH_DATA = 5) - build_path = /obj/item/weapon/circuitboard/body_designer + build_path = /obj/item/circuitboard/body_designer sort_string = "HAADF" /datum/design/circuit/partslathe name = "Parts lathe" id = "partslathe" req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) - build_path = /obj/item/weapon/circuitboard/partslathe + build_path = /obj/item/circuitboard/partslathe sort_string = "HABAD" // Telesci stuff @@ -131,61 +131,61 @@ name = "Telepad Control Console" id = "telesci_console" req_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 3, TECH_PHORON = 4) - build_path = /obj/item/weapon/circuitboard/telesci_console + build_path = /obj/item/circuitboard/telesci_console sort_string = "HAAEA" /datum/design/circuit/telesci_pad name = "Telepad" id = "telesci_pad" req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4, TECH_PHORON = 4, TECH_BLUESPACE = 5) - build_path = /obj/item/weapon/circuitboard/telesci_pad + build_path = /obj/item/circuitboard/telesci_pad sort_string = "HAAEB" /datum/design/circuit/quantum_pad name = "Quantum Pad" id = "quantum_pad" req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4, TECH_PHORON = 4, TECH_BLUESPACE = 5) - build_path = /obj/item/weapon/circuitboard/quantumpad + build_path = /obj/item/circuitboard/quantumpad sort_string = "HAAC" /datum/design/circuit/rtg name = "radioisotope TEG" id = "rtg" req_tech = list(TECH_DATA = 3, TECH_POWER = 3, TECH_PHORON = 3, TECH_ENGINEERING = 3) - build_path = /obj/item/weapon/circuitboard/machine/rtg + build_path = /obj/item/circuitboard/machine/rtg sort_string = "HAAD" /datum/design/circuit/rtg_advanced name = "advanced radioisotope TEG" id = "adv_rtg" req_tech = list(TECH_DATA = 5, TECH_POWER = 5, TECH_PHORON = 5, TECH_ENGINEERING = 5) - build_path = /obj/item/weapon/circuitboard/machine/rtg/advanced + build_path = /obj/item/circuitboard/machine/rtg/advanced sort_string = "HAAE" /datum/design/circuit/rtg name = "vitals monitor" id = "vitals" req_tech = list(TECH_DATA = 3, TECH_BIO = 4, TECH_ENGINEERING = 2) - build_path = /obj/item/weapon/circuitboard/machine/vitals_monitor + build_path = /obj/item/circuitboard/machine/vitals_monitor sort_string = "HAAF" /datum/design/circuit/firework_launcher name = "firework launcher" id = "fireworklauncher" req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) - build_path = /obj/item/weapon/circuitboard/firework_launcher + build_path = /obj/item/circuitboard/firework_launcher sort_string = "KBAAB" /datum/design/circuit/pointdefense name = "point defense battery" id = "pointdefense" req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 3, TECH_COMBAT = 4) - build_path = /obj/item/weapon/circuitboard/pointdefense + build_path = /obj/item/circuitboard/pointdefense sort_string = "OAABA" /datum/design/circuit/pointdefense_control name = "point defense control" id = "pointdefense_control" req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_COMBAT = 2) - build_path = /obj/item/weapon/circuitboard/pointdefense_control + build_path = /obj/item/circuitboard/pointdefense_control sort_string = "OAABB" diff --git a/code/modules/research/designs/circuits/disks.dm b/code/modules/research/designs/circuits/disks.dm index 2a3c2df83f7..a386479cb91 100644 --- a/code/modules/research/designs/circuits/disks.dm +++ b/code/modules/research/designs/circuits/disks.dm @@ -9,10 +9,10 @@ /datum/design/circuit/disk/AssembleDesignName() ..() if(build_path) - var/obj/item/weapon/disk/D = build_path - if(istype(D, /obj/item/weapon/disk/species)) + var/obj/item/disk/D = build_path + if(istype(D, /obj/item/disk/species)) name = "Species Prosthetic design ([item_name])" - else if(istype(D, /obj/item/weapon/disk/limb)) + else if(istype(D, /obj/item/disk/limb)) name = "Transtellar Prosthetic design ([item_name])" else name = "Disk design ([item_name])" @@ -21,26 +21,26 @@ name = SPECIES_SKRELL id = "prosthetic_skrell" req_tech = list(TECH_DATA = 3, TECH_BIO = 3) - build_path = /obj/item/weapon/disk/species/skrell + build_path = /obj/item/disk/species/skrell sort_string = "DBAAA" /datum/design/circuit/disk/tajprint name = SPECIES_TAJ id = "prosthetic_tajaran" req_tech = list(TECH_DATA = 3, TECH_BIO = 3) - build_path = /obj/item/weapon/disk/species/tajaran + build_path = /obj/item/disk/species/tajaran sort_string = "DBAAB" /datum/design/circuit/disk/unathiprint name = SPECIES_UNATHI id = "prosthetic_unathi" req_tech = list(TECH_DATA = 3, TECH_BIO = 4) - build_path = /obj/item/weapon/disk/species/unathi + build_path = /obj/item/disk/species/unathi sort_string = "DBAAC" /datum/design/circuit/disk/teshariprint name = SPECIES_TESHARI id = "prosthetic_teshari" req_tech = list(TECH_DATA = 3, TECH_BIO = 4) - build_path = /obj/item/weapon/disk/species/teshari + build_path = /obj/item/disk/species/teshari sort_string = "DBAAD" diff --git a/code/modules/research/designs/engineering.dm b/code/modules/research/designs/engineering.dm index aed5d0e95f5..f9a6e8254e0 100644 --- a/code/modules/research/designs/engineering.dm +++ b/code/modules/research/designs/engineering.dm @@ -10,7 +10,7 @@ id = "expwelder" req_tech = list(TECH_ENGINEERING = 4, TECH_PHORON = 3, TECH_MATERIAL = 4) materials = list(MAT_STEEL = 70, MAT_GLASS = 120, MAT_PHORON = 100) - build_path = /obj/item/weapon/weldingtool/experimental + build_path = /obj/item/weldingtool/experimental sort_string = "NAAAA" /datum/design/item/tool/hand_drill @@ -19,7 +19,7 @@ id = "handdrill" req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 2) materials = list(MAT_STEEL = 300, MAT_SILVER = 100) - build_path = /obj/item/weapon/tool/transforming/powerdrill + build_path = /obj/item/tool/transforming/powerdrill sort_string = "NAAAB" /datum/design/item/tool/jaws_life @@ -28,7 +28,7 @@ id = "jawslife" req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 2) materials = list(MAT_STEEL = 300, MAT_SILVER = 100) - build_path = /obj/item/weapon/tool/transforming/jawsoflife + build_path = /obj/item/tool/transforming/jawsoflife sort_string = "NAAAC" /datum/design/item/tool/rpd @@ -37,7 +37,7 @@ id = "rapidpipedispenser" req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 2) materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000) - build_path = /obj/item/weapon/pipe_dispenser + build_path = /obj/item/pipe_dispenser sort_string = "NAAAD" /datum/design/item/tool/qpad_booster @@ -46,7 +46,7 @@ id = "qpad_booster" req_tech = list(TECH_ENGINEERING = 7, TECH_MATERIAL = 7, TECH_BLUESPACE = 6) materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000, MAT_SILVER = 2000, MAT_GOLD = 2000, MAT_VERDANTIUM = 1000) - build_path = /obj/item/device/quantum_pad_booster + build_path = /obj/item/quantum_pad_booster sort_string = "NAAAF" // Other devices @@ -61,7 +61,7 @@ id = "tscanner" req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_MATERIAL = 2) materials = list(MAT_STEEL = 200) - build_path = /obj/item/device/t_scanner + build_path = /obj/item/t_scanner sort_string = "NBAAA" /datum/design/item/engineering/t_scanner_upg @@ -70,7 +70,7 @@ id = "upgradedtscanner" req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 4, TECH_MATERIAL = 2) materials = list(MAT_STEEL = 500, MAT_PHORON = 150) - build_path = /obj/item/device/t_scanner/upgraded + build_path = /obj/item/t_scanner/upgraded sort_string = "NBAAB" /datum/design/item/engineering/t_scanner_adv @@ -79,7 +79,7 @@ id = "advancedtscanner" req_tech = list(TECH_MAGNET = 6, TECH_ENGINEERING = 6, TECH_MATERIAL = 6) materials = list(MAT_STEEL = 1250, MAT_PHORON = 500, MAT_SILVER = 50) - build_path = /obj/item/device/t_scanner/advanced + build_path = /obj/item/t_scanner/advanced sort_string = "NBAAC" /datum/design/item/engineering/atmosanalyzer @@ -88,5 +88,5 @@ id = "atmosanalyzer" req_tech = list(TECH_ENGINEERING = 2) materials = list(MAT_STEEL = 200, MAT_GLASS = 100) - build_path = /obj/item/device/analyzer + build_path = /obj/item/analyzer sort_string = "NBABA" \ No newline at end of file diff --git a/code/modules/research/designs/firework_stars.dm b/code/modules/research/designs/firework_stars.dm index b3653674518..23dee10b941 100644 --- a/code/modules/research/designs/firework_stars.dm +++ b/code/modules/research/designs/firework_stars.dm @@ -9,7 +9,7 @@ id = "fireworkaesthetic" req_tech = list(TECH_MATERIAL = 2) materials = list(MAT_PLASTIC = 500, MAT_GLASS = 500) - build_path = /obj/item/weapon/firework_star/aesthetic + build_path = /obj/item/firework_star/aesthetic sort_string = "IFAAA" /datum/design/item/firework_star/aesthetic_config @@ -18,7 +18,7 @@ id = "fireworkaestheticconfig" req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 2) materials = list(MAT_PLASTIC = 1000, MAT_GLASS = 1000) - build_path = /obj/item/weapon/firework_star/aesthetic/configurable + build_path = /obj/item/firework_star/aesthetic/configurable sort_string = "IFAAB" /datum/design/item/firework_star/weather_clear @@ -27,7 +27,7 @@ id = "fireworkclearsky" req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3) materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_STEEL = 4000) - build_path = /obj/item/weapon/firework_star/weather/clear + build_path = /obj/item/firework_star/weather/clear sort_string = "IFABA" /datum/design/item/firework_star/weather_overcast @@ -36,7 +36,7 @@ id = "fireworkcloudy" req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3) materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_SILVER = 1000) - build_path = /obj/item/weapon/firework_star/weather/overcast + build_path = /obj/item/firework_star/weather/overcast sort_string = "IFABB" /datum/design/item/firework_star/weather_fog @@ -45,7 +45,7 @@ id = "fireworkfog" req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3) materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_SILVER = 2000) - build_path = /obj/item/weapon/firework_star/weather/fog + build_path = /obj/item/firework_star/weather/fog sort_string = "IFABC" /datum/design/item/firework_star/weather_rain @@ -54,7 +54,7 @@ id = "fireworkrain" req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4) materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_SILVER = 4000) - build_path = /obj/item/weapon/firework_star/weather/rain + build_path = /obj/item/firework_star/weather/rain sort_string = "IFABD" /datum/design/item/firework_star/weather_storm @@ -63,7 +63,7 @@ id = "fireworkstorm" req_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 5) materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_SILVER = 3000, MAT_GOLD = 1000) - build_path = /obj/item/weapon/firework_star/weather/storm + build_path = /obj/item/firework_star/weather/storm sort_string = "IFABE" /datum/design/item/firework_star/weather_light_snow @@ -72,7 +72,7 @@ id = "fireworklightsnow" req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4) materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_SILVER = 2000, MAT_LEAD = 2000) - build_path = /obj/item/weapon/firework_star/weather/light_snow + build_path = /obj/item/firework_star/weather/light_snow sort_string = "IFABF" /datum/design/item/firework_star/weather_snow @@ -81,7 +81,7 @@ id = "fireworksnow" req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4) materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_SILVER = 3000, MAT_LEAD = 2000) - build_path = /obj/item/weapon/firework_star/weather/snow + build_path = /obj/item/firework_star/weather/snow sort_string = "IFABG" /datum/design/item/firework_star/weather_blizzard @@ -90,7 +90,7 @@ id = "fireworkblizzard" req_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 5) materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_SILVER = 3000, MAT_LEAD = 3000) - build_path = /obj/item/weapon/firework_star/weather/blizzard + build_path = /obj/item/firework_star/weather/blizzard sort_string = "IFABH" /datum/design/item/firework_star/weather_hail @@ -99,7 +99,7 @@ id = "fireworkhail" req_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 5, TECH_ILLEGAL = 2) materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_SILVER = 3000, MAT_LEAD = 3000, MAT_PLASTEEL = 4000) - build_path = /obj/item/weapon/firework_star/weather/hail + build_path = /obj/item/firework_star/weather/hail sort_string = "IFABI" /datum/design/item/firework_star/weather_confetti @@ -108,7 +108,7 @@ id = "fireworkconfetti" req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4) materials = list(MAT_PLASTIC = 10000, MAT_GLASS = 10000) - build_path = /obj/item/weapon/firework_star/weather/confetti + build_path = /obj/item/firework_star/weather/confetti sort_string = "IFABJ" /datum/design/item/firework_star/weather_fallout @@ -117,5 +117,5 @@ id = "fireworkfallout" req_tech = list(TECH_MATERIAL = 8, TECH_ENGINEERING = 6, TECH_ILLEGAL = 7) materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 2000, MAT_URANIUM = 12000) - build_path = /obj/item/weapon/firework_star/weather/fallout + build_path = /obj/item/firework_star/weather/fallout sort_string = "IFABK" diff --git a/code/modules/research/designs/implants.dm b/code/modules/research/designs/implants.dm index 2f9e4cc83de..9e016ba7bf9 100644 --- a/code/modules/research/designs/implants.dm +++ b/code/modules/research/designs/implants.dm @@ -11,12 +11,12 @@ name = "chemical" id = "implant_chem" req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3) - build_path = /obj/item/weapon/implantcase/chem + build_path = /obj/item/implantcase/chem sort_string = "MFAAA" /datum/design/item/implant/freedom name = "freedom" id = "implant_free" req_tech = list(TECH_ILLEGAL = 2, TECH_BIO = 3) - build_path = /obj/item/weapon/implantcase/freedom + build_path = /obj/item/implantcase/freedom sort_string = "MFAAB" \ No newline at end of file diff --git a/code/modules/research/designs/implants_vr.dm b/code/modules/research/designs/implants_vr.dm index 9812e0f1921..ad33d14eca7 100644 --- a/code/modules/research/designs/implants_vr.dm +++ b/code/modules/research/designs/implants_vr.dm @@ -3,7 +3,7 @@ id = "implant_backup" req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2, TECH_DATA = 4, TECH_ENGINEERING = 2) materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000) - build_path = /obj/item/weapon/implantcase/backup + build_path = /obj/item/implantcase/backup sort_string = "MFAVA" /datum/design/item/implant/sizecontrol @@ -11,5 +11,5 @@ id = "implant_size" req_tech = list(TECH_MATERIAL = 3, TECH_BIO = 4, TECH_DATA = 4, TECH_ENGINEERING = 3) materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000) - build_path = /obj/item/weapon/implanter/sizecontrol + build_path = /obj/item/implanter/sizecontrol sort_string = "MFAVB" diff --git a/code/modules/research/designs/locator_devices.dm b/code/modules/research/designs/locator_devices.dm index 82a5c81cf39..3db79df49d7 100644 --- a/code/modules/research/designs/locator_devices.dm +++ b/code/modules/research/designs/locator_devices.dm @@ -11,49 +11,49 @@ /datum/design/item/gps/generic name = "GEN" id = "gps_gen" - build_path = /obj/item/device/gps + build_path = /obj/item/gps sort_string = "DAAAA" /datum/design/item/gps/command name = "COM" id = "gps_com" - build_path = /obj/item/device/gps/command + build_path = /obj/item/gps/command sort_string = "DAAAB" /datum/design/item/gps/security name = "SEC" id = "gps_sec" - build_path = /obj/item/device/gps/security + build_path = /obj/item/gps/security sort_string = "DAAAC" /datum/design/item/gps/medical name = "MED" id = "gps_med" - build_path = /obj/item/device/gps/medical + build_path = /obj/item/gps/medical sort_string = "DAAAD" /datum/design/item/gps/engineering name = "ENG" id = "gps_eng" - build_path = /obj/item/device/gps/engineering + build_path = /obj/item/gps/engineering sort_string = "DAAAE" /datum/design/item/gps/science name = "SCI" id = "gps_sci" - build_path = /obj/item/device/gps/science + build_path = /obj/item/gps/science sort_string = "DAAAF" /datum/design/item/gps/mining name = "MINE" id = "gps_mine" - build_path = /obj/item/device/gps/mining + build_path = /obj/item/gps/mining sort_string = "DAAAG" /datum/design/item/gps/explorer name = "EXP" id = "gps_exp" - build_path = /obj/item/device/gps/explorer + build_path = /obj/item/gps/explorer sort_string = "DAAAH" // Other locators @@ -68,7 +68,7 @@ id = "beacon_locator" req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 2, TECH_BLUESPACE = 3) materials = list(MAT_STEEL = 1000,MAT_GLASS = 500) - build_path = /obj/item/device/beacon_locator + build_path = /obj/item/beacon_locator sort_string = "DBAAA" /datum/design/item/locator/beacon @@ -76,5 +76,5 @@ id = "beacon" req_tech = list(TECH_BLUESPACE = 1) materials = list (MAT_STEEL = 20, MAT_GLASS = 10) - build_path = /obj/item/device/radio/beacon + build_path = /obj/item/radio/beacon sort_string = "DBABA" diff --git a/code/modules/research/designs/medical.dm b/code/modules/research/designs/medical.dm index abd3b584761..bd6ff8f4f4f 100644 --- a/code/modules/research/designs/medical.dm +++ b/code/modules/research/designs/medical.dm @@ -13,7 +13,7 @@ id = "scalpel_laser1" req_tech = list(TECH_BIO = 2, TECH_MATERIAL = 2, TECH_MAGNET = 2) materials = list(MAT_STEEL = 12500, MAT_GLASS = 7500) - build_path = /obj/item/weapon/surgical/scalpel/laser1 + build_path = /obj/item/surgical/scalpel/laser1 sort_string = "KAAAA" /datum/design/item/medical/scalpel_laser2 @@ -22,7 +22,7 @@ id = "scalpel_laser2" req_tech = list(TECH_BIO = 3, TECH_MATERIAL = 4, TECH_MAGNET = 4) materials = list(MAT_STEEL = 12500, MAT_GLASS = 7500, MAT_SILVER = 2500) - build_path = /obj/item/weapon/surgical/scalpel/laser2 + build_path = /obj/item/surgical/scalpel/laser2 sort_string = "KAAAB" /datum/design/item/medical/scalpel_laser3 @@ -31,7 +31,7 @@ id = "scalpel_laser3" req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 6, TECH_MAGNET = 5) materials = list(MAT_STEEL = 12500, MAT_GLASS = 7500, MAT_SILVER = 2000, MAT_GOLD = 1500) - build_path = /obj/item/weapon/surgical/scalpel/laser3 + build_path = /obj/item/surgical/scalpel/laser3 sort_string = "KAAAC" /datum/design/item/medical/scalpel_manager @@ -40,7 +40,7 @@ id = "scalpel_manager" req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 7, TECH_MAGNET = 5, TECH_DATA = 4) materials = list (MAT_STEEL = 12500, MAT_GLASS = 7500, MAT_SILVER = 1500, MAT_GOLD = 1500, MAT_DIAMOND = 750) - build_path = /obj/item/weapon/surgical/scalpel/manager + build_path = /obj/item/surgical/scalpel/manager sort_string = "KAAAD" /datum/design/item/medical/saw_manager @@ -49,7 +49,7 @@ id = "advanced_saw" req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 7, TECH_MAGNET = 6, TECH_DATA = 5) materials = list (MAT_STEEL = 12500, MAT_PLASTIC = 800, MAT_SILVER = 1500, MAT_GOLD = 1500, MAT_OSMIUM = 1000) - build_path = /obj/item/weapon/surgical/circular_saw/manager + build_path = /obj/item/surgical/circular_saw/manager sort_string = "KAAAE" /datum/design/item/medical/organ_ripper @@ -58,7 +58,7 @@ id = "organ_ripper" req_tech = list(TECH_BIO = 3, TECH_MATERIAL = 5, TECH_MAGNET = 4, TECH_ILLEGAL = 3) materials = list (MAT_STEEL = 12500, MAT_PLASTIC = 8000, MAT_OSMIUM = 2500) - build_path = /obj/item/weapon/surgical/scalpel/ripper + build_path = /obj/item/surgical/scalpel/ripper sort_string = "KAAAF" /datum/design/item/medical/bone_clamp @@ -67,7 +67,7 @@ id = "bone_clamp" req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 5, TECH_MAGNET = 4, TECH_DATA = 4) materials = list (MAT_STEEL = 12500, MAT_GLASS = 7500, MAT_SILVER = 2500) - build_path = /obj/item/weapon/surgical/bone_clamp + build_path = /obj/item/surgical/bone_clamp sort_string = "KAABA" /datum/design/item/medical/medical_analyzer @@ -76,7 +76,7 @@ id = "medical_analyzer" req_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) materials = list(MAT_STEEL = 500, MAT_GLASS = 500) - build_path = /obj/item/device/healthanalyzer + build_path = /obj/item/healthanalyzer sort_string = "KBAAA" /datum/design/item/medical/improved_analyzer @@ -85,7 +85,7 @@ id = "improved_analyzer" req_tech = list(TECH_MAGNET = 5, TECH_BIO = 6) materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000, MAT_SILVER = 1000, MAT_GOLD = 1500) - build_path = /obj/item/device/healthanalyzer/improved + build_path = /obj/item/healthanalyzer/improved sort_string = "KBAAB" /datum/design/item/medical/advanced_analyzer @@ -94,7 +94,7 @@ id = "advanced_analyzer" req_tech = list(TECH_MAGNET = 7, TECH_BIO = 7, TECH_DATA = 5) materials = list(MAT_STEEL = 2000, MAT_GLASS = 4000, MAT_SILVER = 3500, MAT_GOLD = 2500, MAT_DIAMOND = 1250) - build_path = /obj/item/device/healthanalyzer/advanced + build_path = /obj/item/healthanalyzer/advanced sort_string = "KBAAC" /datum/design/item/medical/advanced_roller diff --git a/code/modules/research/designs/medical_vr.dm b/code/modules/research/designs/medical_vr.dm index 4171f881e9d..a60c3df53c6 100644 --- a/code/modules/research/designs/medical_vr.dm +++ b/code/modules/research/designs/medical_vr.dm @@ -18,7 +18,7 @@ id = "sleevemate" req_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 2, TECH_BIO = 2) materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000) - build_path = /obj/item/device/sleevemate + build_path = /obj/item/sleevemate sort_string = "KCAVA" /datum/design/item/medical/protohypospray @@ -27,7 +27,7 @@ id = "protohypospray" req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_POWER = 2, TECH_BIO = 4, TECH_ILLEGAL = 2) materials = list(MAT_STEEL = 500, MAT_GLASS = 1500, MAT_SILVER = 2000, MAT_GOLD = 1500, MAT_URANIUM = 1000) - build_path = /obj/item/weapon/reagent_containers/hypospray/science + build_path = /obj/item/reagent_containers/hypospray/science sort_string = "KCAVB" /datum/design/item/medical/recombobray @@ -36,7 +36,7 @@ id = "recombobray" req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_POWER = 4, TECH_BIO = 5, TECH_BLUESPACE = 4) //Not like these matter. *Glares at circuit printer.* materials = list(MAT_STEEL = 1000, MAT_GLASS = 2000, MAT_URANIUM = 500, MAT_PHORON = 1500) - build_path = /obj/item/weapon/gun/energy/mouseray/medical + build_path = /obj/item/gun/energy/mouseray/medical sort_string = "KCAVC" // ML-3M medigun and cells @@ -49,7 +49,7 @@ id = "cell_medigun" req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 4, TECH_POWER = 3, TECH_BIO = 5) materials = list(MAT_STEEL = 8000, MAT_PLASTIC = 8000, MAT_GLASS = 5000, MAT_SILVER = 1000, MAT_GOLD = 1000, MAT_URANIUM = 1000) - build_path = /obj/item/weapon/gun/projectile/cell_loaded/medical + build_path = /obj/item/gun/projectile/cell_loaded/medical sort_string = "KVAAA" /datum/design/item/medical/cell_based/cell_medigun_mag diff --git a/code/modules/research/designs/mining_toys.dm b/code/modules/research/designs/mining_toys.dm index 6d6b47a9c1d..809b9e2f52d 100644 --- a/code/modules/research/designs/mining_toys.dm +++ b/code/modules/research/designs/mining_toys.dm @@ -8,42 +8,42 @@ id = "drill" req_tech = list(TECH_MATERIAL = 1, TECH_POWER = 2, TECH_ENGINEERING = 1) materials = list(MAT_STEEL = 4000, MAT_GLASS = 500) //expensive, but no need for miners. - build_path = /obj/item/weapon/pickaxe/drill + build_path = /obj/item/pickaxe/drill sort_string = "FAAAA" /datum/design/item/weapon/mining/advdrill id = "advanced_drill" req_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 2) materials = list(MAT_STEEL = 6000, MAT_GLASS = 1000) //expensive, but no need for miners. - build_path = /obj/item/weapon/pickaxe/advdrill + build_path = /obj/item/pickaxe/advdrill sort_string = "FAAAB" /datum/design/item/weapon/mining/jackhammer id = "jackhammer" req_tech = list(TECH_MATERIAL = 3, TECH_POWER = 2, TECH_ENGINEERING = 2) materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, MAT_SILVER = 500) - build_path = /obj/item/weapon/pickaxe/jackhammer + build_path = /obj/item/pickaxe/jackhammer sort_string = "FAAAC" /datum/design/item/weapon/mining/plasmacutter id = "plasmacutter" req_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 3, TECH_ENGINEERING = 3) materials = list(MAT_STEEL = 1500, MAT_GLASS = 500, MAT_GOLD = 500, MAT_PHORON = 500) - build_path = /obj/item/weapon/pickaxe/plasmacutter + build_path = /obj/item/pickaxe/plasmacutter sort_string = "FAAAD" /datum/design/item/weapon/mining/pick_diamond id = "pick_diamond" req_tech = list(TECH_MATERIAL = 6) materials = list(MAT_DIAMOND = 3000) - build_path = /obj/item/weapon/pickaxe/diamond + build_path = /obj/item/pickaxe/diamond sort_string = "FAAAE" /datum/design/item/weapon/mining/drill_diamond id = "drill_diamond" req_tech = list(TECH_MATERIAL = 6, TECH_POWER = 4, TECH_ENGINEERING = 4) materials = list(MAT_STEEL = 3000, MAT_GLASS = 1000, MAT_DIAMOND = 2000) - build_path = /obj/item/weapon/pickaxe/diamonddrill + build_path = /obj/item/pickaxe/diamonddrill sort_string = "FAAAF" // Mining other equipment @@ -53,7 +53,7 @@ id = "depth_scanner" req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_BLUESPACE = 2) materials = list(MAT_STEEL = 1000,MAT_GLASS = 1000) - build_path = /obj/item/device/depth_scanner + build_path = /obj/item/depth_scanner sort_string = "FBAAA" /datum/design/item/weapon/mining/upgradeAOE diff --git a/code/modules/research/designs/misc.dm b/code/modules/research/designs/misc.dm index c008eec25d5..a6a15baee90 100644 --- a/code/modules/research/designs/misc.dm +++ b/code/modules/research/designs/misc.dm @@ -9,7 +9,7 @@ id = "communicator" req_tech = list(TECH_DATA = 2, TECH_MAGNET = 2) materials = list(MAT_STEEL = 500, MAT_GLASS = 500) - build_path = /obj/item/device/communicator + build_path = /obj/item/communicator sort_string = "TAAAA" /datum/design/item/general/laserpointer @@ -18,7 +18,7 @@ id = "laser_pointer" req_tech = list(TECH_MAGNET = 3) materials = list(MAT_STEEL = 100, MAT_GLASS = 50) - build_path = /obj/item/device/laser_pointer + build_path = /obj/item/laser_pointer sort_string = "TAABA" /datum/design/item/general/translator @@ -26,7 +26,7 @@ id = "translator" req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) materials = list(MAT_STEEL = 3000, MAT_GLASS = 3000) - build_path = /obj/item/device/universal_translator + build_path = /obj/item/universal_translator sort_string = "TAACA" /datum/design/item/general/ear_translator @@ -34,7 +34,7 @@ id = "ear_translator" req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 5) //It's been hella miniaturized. materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000, MAT_GOLD = 1000) - build_path = /obj/item/device/universal_translator/ear + build_path = /obj/item/universal_translator/ear sort_string = "TAACB" /datum/design/item/general/light_replacer @@ -43,7 +43,7 @@ id = "light_replacer" req_tech = list(TECH_MAGNET = 3, TECH_MATERIAL = 4) materials = list(MAT_STEEL = 1500, MAT_SILVER = 150, MAT_GLASS = 3000) - build_path = /obj/item/device/lightreplacer + build_path = /obj/item/lightreplacer sort_string = "TAADA" /datum/design/item/general/binaryencrypt @@ -52,7 +52,7 @@ id = "binaryencrypt" req_tech = list(TECH_ILLEGAL = 2) materials = list(MAT_STEEL = 300, MAT_GLASS = 300) - build_path = /obj/item/device/encryptionkey/binary + build_path = /obj/item/encryptionkey/binary sort_string = "TBAAA" /datum/design/item/general/chameleon @@ -61,7 +61,7 @@ id = "chameleon" req_tech = list(TECH_ILLEGAL = 2) materials = list(MAT_STEEL = 500) - build_path = /obj/item/weapon/storage/box/syndie_kit/chameleon + build_path = /obj/item/storage/box/syndie_kit/chameleon sort_string = "TBAAB" /datum/design/item/general/bsflare @@ -70,7 +70,7 @@ id = "bsflare" req_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 4) materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000, MAT_SILVER = 2000) - build_path = /obj/item/device/spaceflare + build_path = /obj/item/spaceflare sort_string = "TBAAC" /datum/design/item/general/riflescope @@ -79,7 +79,7 @@ id = "riflescope" req_tech = list(TECH_ILLEGAL = 2, TECH_MATERIAL = 2) materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000) - build_path = /obj/item/device/binoculars/scope + build_path = /obj/item/binoculars/scope sort_string = "TBAAD" /datum/design/item/general/advmop @@ -88,5 +88,5 @@ id = "advmop" req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 5, TECH_BIO = 1) materials = list(MAT_STEEL = 5000, MAT_GLASS = 2000, MAT_GOLD = 1000) - build_path = /obj/item/weapon/mop/advanced + build_path = /obj/item/mop/advanced sort_string = "TBAAE" \ No newline at end of file diff --git a/code/modules/research/designs/misc_vr.dm b/code/modules/research/designs/misc_vr.dm index 12121fea11c..f95e921cb13 100644 --- a/code/modules/research/designs/misc_vr.dm +++ b/code/modules/research/designs/misc_vr.dm @@ -19,7 +19,7 @@ id = "sizegun" req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2) materials = list(MAT_STEEL = 3000, MAT_GLASS = 2000) - build_path = /obj/item/weapon/gun/energy/sizegun + build_path = /obj/item/gun/energy/sizegun sort_string = "TAVBA" /datum/design/item/general/sizegun_gradual @@ -27,7 +27,7 @@ id = "gradsizegun" req_tech = list(TECH_BLUESPACE = 2, TECH_MATERIAL = 3, TECH_POWER = 2) materials = list(MAT_STEEL = 3000, MAT_GLASS = 2000) - build_path = /obj/item/device/slow_sizegun + build_path = /obj/item/slow_sizegun sort_string = "TAVBB" /datum/design/item/general/bluespace_collar @@ -43,7 +43,7 @@ id = "bodysnatcher" req_tech = list(TECH_MAGNET = 3, TECH_BIO = 3, TECH_ILLEGAL = 2) materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000, MAT_URANIUM = 2000) - build_path = /obj/item/device/bodysnatcher + build_path = /obj/item/bodysnatcher sort_string = "TBVAA" /datum/design/item/general/inducer_sci @@ -51,7 +51,7 @@ id = "inducersci" req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 5, TECH_POWER = 6) materials = list(MAT_STEEL = 8000, MAT_GLASS = 2000, MAT_URANIUM = 4000, MAT_PHORON = 4000) - build_path = /obj/item/weapon/inducer/sci + build_path = /obj/item/inducer/sci sort_string = "TCVAA" /datum/design/item/general/inducer_eng @@ -59,14 +59,14 @@ id = "inducerind" req_tech = list(TECH_BLUESPACE = 5, TECH_MATERIAL = 7, TECH_POWER = 7) materials = list(MAT_STEEL = 3000, MAT_GLASS = 2000, MAT_URANIUM = 2000, MAT_TITANIUM = 2000) - build_path = /obj/item/weapon/inducer/unloaded + build_path = /obj/item/inducer/unloaded sort_string = "TCVAB" /datum/design/item/weapon/mining/mining_scanner id = "mining_scanner" req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 4, TECH_BLUESPACE = 1) materials = list(MAT_STEEL = 1000,MAT_GLASS = 500) - build_path = /obj/item/weapon/mining_scanner/advanced + build_path = /obj/item/mining_scanner/advanced sort_string = "FBAAB" /datum/design/item/general/walkpod @@ -74,7 +74,7 @@ id = "walkpod" req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3) materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000) - build_path = /obj/item/device/walkpod + build_path = /obj/item/walkpod sort_string = "TCVAD" /datum/design/item/general/juke_remote @@ -82,5 +82,5 @@ id = "juke_remote" req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 4, TECH_BLUESPACE = 1) materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000, MAT_URANIUM = 2000) - build_path = /obj/item/device/juke_remote + build_path = /obj/item/juke_remote sort_string = "TCVAE" diff --git a/code/modules/research/designs/modular_computer.dm b/code/modules/research/designs/modular_computer.dm index 588f16357bf..4fb8b2ce3cc 100644 --- a/code/modules/research/designs/modular_computer.dm +++ b/code/modules/research/designs/modular_computer.dm @@ -10,14 +10,14 @@ id = "hdd_basic" req_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) materials = list(MAT_STEEL = 2000, MAT_GLASS = 100) - build_path = /obj/item/weapon/computer_hardware/hard_drive/ + build_path = /obj/item/computer_hardware/hard_drive/ sort_string = "VAAAA" /datum/design/item/modularcomponent/disk/advanced name = "advanced hard drive" id = "hdd_advanced" materials = list(MAT_STEEL = 4000, MAT_GLASS = 200) - build_path = /obj/item/weapon/computer_hardware/hard_drive/advanced + build_path = /obj/item/computer_hardware/hard_drive/advanced sort_string = "VAAAB" /datum/design/item/modularcomponent/disk/super @@ -25,7 +25,7 @@ id = "hdd_super" req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) materials = list(MAT_STEEL = 8000, MAT_GLASS = 400) - build_path = /obj/item/weapon/computer_hardware/hard_drive/super + build_path = /obj/item/computer_hardware/hard_drive/super sort_string = "VAAAC" /datum/design/item/modularcomponent/disk/cluster @@ -33,7 +33,7 @@ id = "hdd_cluster" req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) materials = list(MAT_STEEL = 16000, MAT_GLASS = 800) - build_path = /obj/item/weapon/computer_hardware/hard_drive/cluster + build_path = /obj/item/computer_hardware/hard_drive/cluster sort_string = "VAAAD" /datum/design/item/modularcomponent/disk/small @@ -41,7 +41,7 @@ id = "hdd_small" req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) materials = list(MAT_STEEL = 4000, MAT_GLASS = 200) - build_path = /obj/item/weapon/computer_hardware/hard_drive/small + build_path = /obj/item/computer_hardware/hard_drive/small sort_string = "VAAAE" /datum/design/item/modularcomponent/disk/micro @@ -49,7 +49,7 @@ id = "hdd_micro" req_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) materials = list(MAT_STEEL = 2000, MAT_GLASS = 100) - build_path = /obj/item/weapon/computer_hardware/hard_drive/micro + build_path = /obj/item/computer_hardware/hard_drive/micro sort_string = "VAAAF" // Network cards @@ -59,7 +59,7 @@ id = "netcard_basic" req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 1) materials = list(MAT_STEEL = 500, MAT_GLASS = 100) - build_path = /obj/item/weapon/computer_hardware/network_card + build_path = /obj/item/computer_hardware/network_card sort_string = "VBAAA" /datum/design/item/modularcomponent/netcard/advanced @@ -67,7 +67,7 @@ id = "netcard_advanced" req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 2) materials = list(MAT_STEEL = 1000, MAT_GLASS = 200) - build_path = /obj/item/weapon/computer_hardware/network_card/advanced + build_path = /obj/item/computer_hardware/network_card/advanced sort_string = "VBAAB" /datum/design/item/modularcomponent/netcard/wired @@ -75,7 +75,7 @@ id = "netcard_wired" req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 3) materials = list(MAT_STEEL = 5000, MAT_GLASS = 400) - build_path = /obj/item/weapon/computer_hardware/network_card/wired + build_path = /obj/item/computer_hardware/network_card/wired sort_string = "VBAAC" // Batteries @@ -85,7 +85,7 @@ id = "bat_normal" req_tech = list(TECH_POWER = 1, TECH_ENGINEERING = 1) materials = list(MAT_STEEL = 2000) - build_path = /obj/item/weapon/computer_hardware/battery_module + build_path = /obj/item/computer_hardware/battery_module sort_string = "VCAAA" /datum/design/item/modularcomponent/battery/advanced @@ -93,7 +93,7 @@ id = "bat_advanced" req_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 2) materials = list(MAT_STEEL = 4000) - build_path = /obj/item/weapon/computer_hardware/battery_module/advanced + build_path = /obj/item/computer_hardware/battery_module/advanced sort_string = "VCAAB" /datum/design/item/modularcomponent/battery/super @@ -101,7 +101,7 @@ id = "bat_super" req_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 3) materials = list(MAT_STEEL = 8000) - build_path = /obj/item/weapon/computer_hardware/battery_module/super + build_path = /obj/item/computer_hardware/battery_module/super sort_string = "VCAAC" /datum/design/item/modularcomponent/battery/ultra @@ -109,7 +109,7 @@ id = "bat_ultra" req_tech = list(TECH_POWER = 5, TECH_ENGINEERING = 4) materials = list(MAT_STEEL = 16000) - build_path = /obj/item/weapon/computer_hardware/battery_module/ultra + build_path = /obj/item/computer_hardware/battery_module/ultra sort_string = "VCAAD" /datum/design/item/modularcomponent/battery/nano @@ -117,7 +117,7 @@ id = "bat_nano" req_tech = list(TECH_POWER = 1, TECH_ENGINEERING = 1) materials = list(MAT_STEEL = 2000) - build_path = /obj/item/weapon/computer_hardware/battery_module/nano + build_path = /obj/item/computer_hardware/battery_module/nano sort_string = "VCAAE" /datum/design/item/modularcomponent/battery/micro @@ -125,7 +125,7 @@ id = "bat_micro" req_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 2) materials = list(MAT_STEEL = 4000) - build_path = /obj/item/weapon/computer_hardware/battery_module/micro + build_path = /obj/item/computer_hardware/battery_module/micro sort_string = "VCAAF" // Processor unit @@ -135,7 +135,7 @@ id = "cpu_normal" req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 2) materials = list(MAT_STEEL = 8000) - build_path = /obj/item/weapon/computer_hardware/processor_unit + build_path = /obj/item/computer_hardware/processor_unit sort_string = "VDAAA" /datum/design/item/modularcomponent/cpu/small @@ -143,7 +143,7 @@ id = "cpu_small" req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) materials = list(MAT_STEEL = 4000) - build_path = /obj/item/weapon/computer_hardware/processor_unit/small + build_path = /obj/item/computer_hardware/processor_unit/small sort_string = "VDAAB" /datum/design/item/modularcomponent/cpu/photonic @@ -151,7 +151,7 @@ id = "pcpu_normal" req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 4) materials = list(MAT_STEEL = 32000, glass = 8000) - build_path = /obj/item/weapon/computer_hardware/processor_unit/photonic + build_path = /obj/item/computer_hardware/processor_unit/photonic sort_string = "VDAAC" /datum/design/item/modularcomponent/cpu/photonic/small @@ -159,7 +159,7 @@ id = "pcpu_small" req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3) materials = list(MAT_STEEL = 16000, glass = 4000) - build_path = /obj/item/weapon/computer_hardware/processor_unit/photonic/small + build_path = /obj/item/computer_hardware/processor_unit/photonic/small sort_string = "VDAAD" // Other parts @@ -169,7 +169,7 @@ id = "cardslot" req_tech = list(TECH_DATA = 2) materials = list(MAT_STEEL = 3000) - build_path = /obj/item/weapon/computer_hardware/card_slot + build_path = /obj/item/computer_hardware/card_slot sort_string = "VEAAA" /datum/design/item/modularcomponent/nanoprinter @@ -177,7 +177,7 @@ id = "nanoprinter" req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) materials = list(MAT_STEEL = 3000) - build_path = /obj/item/weapon/computer_hardware/nano_printer + build_path = /obj/item/computer_hardware/nano_printer sort_string = "VEAAB" /datum/design/item/modularcomponent/teslalink @@ -185,7 +185,7 @@ id = "teslalink" req_tech = list(TECH_DATA = 2, TECH_POWER = 3, TECH_ENGINEERING = 2) materials = list(MAT_STEEL = 10000) - build_path = /obj/item/weapon/computer_hardware/tesla_link + build_path = /obj/item/computer_hardware/tesla_link sort_string = "VEAAC" // Data crystals (USB flash drives) @@ -199,7 +199,7 @@ id = "portadrive_basic" req_tech = list(TECH_DATA = 1) materials = list(MAT_GLASS = 8000) - build_path = /obj/item/weapon/computer_hardware/hard_drive/portable + build_path = /obj/item/computer_hardware/hard_drive/portable sort_string = "VFAAA" /datum/design/item/modularcomponent/portabledrive/advanced @@ -207,7 +207,7 @@ id = "portadrive_advanced" req_tech = list(TECH_DATA = 2) materials = list(MAT_GLASS = 16000) - build_path = /obj/item/weapon/computer_hardware/hard_drive/portable/advanced + build_path = /obj/item/computer_hardware/hard_drive/portable/advanced sort_string = "VFAAB" /datum/design/item/modularcomponent/portabledrive/super @@ -215,5 +215,5 @@ id = "portadrive_super" req_tech = list(TECH_DATA = 4) materials = list(MAT_GLASS = 32000) - build_path = /obj/item/weapon/computer_hardware/hard_drive/portable/super + build_path = /obj/item/computer_hardware/hard_drive/portable/super sort_string = "VFAAC" diff --git a/code/modules/research/designs/pdas.dm b/code/modules/research/designs/pdas.dm index c13d490493d..f5311328a8a 100644 --- a/code/modules/research/designs/pdas.dm +++ b/code/modules/research/designs/pdas.dm @@ -6,7 +6,7 @@ id = "pda" req_tech = list(TECH_ENGINEERING = 2, TECH_POWER = 3) materials = list(MAT_STEEL = 50, MAT_GLASS = 50) - build_path = /obj/item/device/pda + build_path = /obj/item/pda sort_string = "WAAAA" // Cartridges @@ -21,80 +21,80 @@ /datum/design/item/pda_cartridge/cart_basic id = "cart_basic" - build_path = /obj/item/weapon/cartridge + build_path = /obj/item/cartridge sort_string = "WBAAA" /datum/design/item/pda_cartridge/engineering id = "cart_engineering" - build_path = /obj/item/weapon/cartridge/engineering + build_path = /obj/item/cartridge/engineering sort_string = "WBAAB" /datum/design/item/pda_cartridge/atmos id = "cart_atmos" - build_path = /obj/item/weapon/cartridge/atmos + build_path = /obj/item/cartridge/atmos sort_string = "WBAAC" /datum/design/item/pda_cartridge/medical id = "cart_medical" - build_path = /obj/item/weapon/cartridge/medical + build_path = /obj/item/cartridge/medical sort_string = "WBAAD" /datum/design/item/pda_cartridge/chemistry id = "cart_chemistry" - build_path = /obj/item/weapon/cartridge/chemistry + build_path = /obj/item/cartridge/chemistry sort_string = "WBAAE" /datum/design/item/pda_cartridge/security id = "cart_security" - build_path = /obj/item/weapon/cartridge/security + build_path = /obj/item/cartridge/security sort_string = "WBAAF" /datum/design/item/pda_cartridge/janitor id = "cart_janitor" - build_path = /obj/item/weapon/cartridge/janitor + build_path = /obj/item/cartridge/janitor sort_string = "WBAAG" /datum/design/item/pda_cartridge/science id = "cart_science" - build_path = /obj/item/weapon/cartridge/signal/science + build_path = /obj/item/cartridge/signal/science sort_string = "WBAAH" /datum/design/item/pda_cartridge/quartermaster id = "cart_quartermaster" - build_path = /obj/item/weapon/cartridge/quartermaster + build_path = /obj/item/cartridge/quartermaster sort_string = "WBAAI" /datum/design/item/pda_cartridge/head id = "cart_head" - build_path = /obj/item/weapon/cartridge/head + build_path = /obj/item/cartridge/head sort_string = "WBAAJ" /datum/design/item/pda_cartridge/hop id = "cart_hop" - build_path = /obj/item/weapon/cartridge/hop + build_path = /obj/item/cartridge/hop sort_string = "WBAAK" /datum/design/item/pda_cartridge/hos id = "cart_hos" - build_path = /obj/item/weapon/cartridge/hos + build_path = /obj/item/cartridge/hos sort_string = "WBAAL" /datum/design/item/pda_cartridge/ce id = "cart_ce" - build_path = /obj/item/weapon/cartridge/ce + build_path = /obj/item/cartridge/ce sort_string = "WBAAM" /datum/design/item/pda_cartridge/cmo id = "cart_cmo" - build_path = /obj/item/weapon/cartridge/cmo + build_path = /obj/item/cartridge/cmo sort_string = "WBAAN" /datum/design/item/pda_cartridge/rd id = "cart_rd" - build_path = /obj/item/weapon/cartridge/rd + build_path = /obj/item/cartridge/rd sort_string = "WBAAO" /datum/design/item/pda_cartridge/captain id = "cart_captain" - build_path = /obj/item/weapon/cartridge/captain + build_path = /obj/item/cartridge/captain sort_string = "WBAAP" \ No newline at end of file diff --git a/code/modules/research/designs/power_cells.dm b/code/modules/research/designs/power_cells.dm index 995c5d8d4a8..383f2e5a6ad 100644 --- a/code/modules/research/designs/power_cells.dm +++ b/code/modules/research/designs/power_cells.dm @@ -6,11 +6,11 @@ /datum/design/item/powercell/AssembleDesignDesc() if(build_path) - var/obj/item/weapon/cell/C = build_path + var/obj/item/cell/C = build_path desc = "Allows the construction of power cells that can hold [initial(C.maxcharge)] units of energy." /datum/design/item/powercell/Fabricate() - var/obj/item/weapon/cell/C = ..() + var/obj/item/cell/C = ..() C.charge = 0 //shouldn't produce power out of thin air. C.update_icon() return C @@ -20,7 +20,7 @@ id = "basic_cell" req_tech = list(TECH_POWER = 1) materials = list(MAT_STEEL = 700, MAT_GLASS = 50) - build_path = /obj/item/weapon/cell + build_path = /obj/item/cell category = list("Misc") sort_string = "BAAAA" @@ -29,7 +29,7 @@ id = "high_cell" req_tech = list(TECH_POWER = 2) materials = list(MAT_STEEL = 700, MAT_GLASS = 60) - build_path = /obj/item/weapon/cell/high + build_path = /obj/item/cell/high category = list("Misc") sort_string = "BAAAB" @@ -38,7 +38,7 @@ id = "super_cell" req_tech = list(TECH_POWER = 3, TECH_MATERIAL = 2) materials = list(MAT_STEEL = 700, MAT_GLASS = 70) - build_path = /obj/item/weapon/cell/super + build_path = /obj/item/cell/super category = list("Misc") sort_string = "BAAAC" @@ -47,7 +47,7 @@ id = "hyper_cell" req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4) materials = list(MAT_STEEL = 400, MAT_GOLD = 150, MAT_SILVER = 150, MAT_GLASS = 70) - build_path = /obj/item/weapon/cell/hyper + build_path = /obj/item/cell/hyper category = list("Misc") sort_string = "BAAAD" @@ -56,7 +56,7 @@ build_type = PROTOLATHE id = "device" materials = list(MAT_STEEL = 350, MAT_GLASS = 25) - build_path = /obj/item/weapon/cell/device + build_path = /obj/item/cell/device category = list("Misc") sort_string = "BAABA" @@ -65,7 +65,7 @@ build_type = PROTOLATHE id = "weapon" materials = list(MAT_STEEL = 700, MAT_GLASS = 50) - build_path = /obj/item/weapon/cell/device/weapon + build_path = /obj/item/cell/device/weapon category = list("Misc") sort_string = "BAABB" @@ -74,7 +74,7 @@ id = "high_mech_cell" req_tech = list(TECH_POWER = 3, TECH_MATERIAL = 3) materials = list(MAT_STEEL = 600, MAT_SILVER = 150, MAT_GLASS = 70) - build_path = /obj/item/weapon/cell/mech/high + build_path = /obj/item/cell/mech/high category = list("Misc") sort_string = "BAACA" @@ -83,6 +83,6 @@ id = "super_mech_cell" req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4) materials = list(MAT_STEEL = 500, MAT_GOLD = 200, MAT_SILVER = 200, MAT_GLASS = 80) - build_path = /obj/item/weapon/cell/mech/super + build_path = /obj/item/cell/mech/super category = list("Misc") sort_string = "BAACB" \ No newline at end of file diff --git a/code/modules/research/designs/precursor.dm b/code/modules/research/designs/precursor.dm index 24f888f7222..0125eca0c4d 100644 --- a/code/modules/research/designs/precursor.dm +++ b/code/modules/research/designs/precursor.dm @@ -17,7 +17,7 @@ id = "hunt_trap" materials = list(MAT_DURASTEEL = 3000, MAT_METALHYDROGEN = 1000, MAT_PHORON = 2000) req_tech = list(TECH_MATERIAL = 4, TECH_BLUESPACE = 3, TECH_MAGNET = 4, TECH_PHORON = 2, TECH_ARCANE = 2) - build_path = /obj/item/weapon/beartrap/hunting + build_path = /obj/item/beartrap/hunting sort_string = "ZAAAA" // Precursor @@ -39,7 +39,7 @@ id = "hybridcrowbar" req_tech = list(TECH_ENGINEERING = 6, TECH_MATERIAL = 6, TECH_BLUESPACE = 3, TECH_PRECURSOR = 1) materials = list(MAT_PLASTEEL = 2000, MAT_VERDANTIUM = 3000, MAT_GOLD = 250, MAT_URANIUM = 2500) - build_path = /obj/item/weapon/tool/crowbar/hybrid + build_path = /obj/item/tool/crowbar/hybrid sort_string = "ZBAAA" /datum/design/item/precursor/wrench @@ -48,7 +48,7 @@ id = "hybridwrench" req_tech = list(TECH_ENGINEERING = 6, TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 3, TECH_PRECURSOR = 1) materials = list(MAT_PLASTEEL = 2000, MAT_VERDANTIUM = 3000, MAT_SILVER = 300, MAT_URANIUM = 2000) - build_path = /obj/item/weapon/tool/wrench/hybrid + build_path = /obj/item/tool/wrench/hybrid sort_string = "ZBAAB" /datum/design/item/precursor/screwdriver @@ -57,7 +57,7 @@ id = "hybridscrewdriver" req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 3, TECH_PRECURSOR = 1) materials = list(MAT_PLASTEEL = 2000, MAT_VERDANTIUM = 3000, MAT_PLASTIC = 8000, MAT_DIAMOND = 2000) - build_path = /obj/item/weapon/tool/screwdriver/hybrid + build_path = /obj/item/tool/screwdriver/hybrid sort_string = "ZBAAC" /datum/design/item/precursor/wirecutters @@ -66,7 +66,7 @@ id = "hybridwirecutters" req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 5, TECH_PHORON = 2, TECH_PRECURSOR = 1) materials = list(MAT_PLASTEEL = 2000, MAT_VERDANTIUM = 3000, MAT_PLASTIC = 8000, MAT_PHORON = 2750, MAT_DIAMOND = 2000) - build_path = /obj/item/weapon/tool/wirecutters/hybrid + build_path = /obj/item/tool/wirecutters/hybrid sort_string = "ZBAAD" /datum/design/item/precursor/welder @@ -75,7 +75,7 @@ id = "hybridwelder" req_tech = list(TECH_ENGINEERING = 6, TECH_MATERIAL = 6, TECH_BLUESPACE = 3, TECH_PHORON = 3, TECH_MAGNET = 5, TECH_PRECURSOR = 1) materials = list(MAT_DURASTEEL = 2000, MAT_MORPHIUM = 3000, MAT_METALHYDROGEN = 4750, MAT_URANIUM = 6000) - build_path = /obj/item/weapon/weldingtool/experimental/hybrid + build_path = /obj/item/weldingtool/experimental/hybrid sort_string = "ZBAAE" @@ -89,5 +89,5 @@ sort_string = "ZBBAA" /datum/design/item/precursor/janusmodule/Fabricate(var/newloc, var/fabricator) - var/type_to_spawn = pick(subtypesof(/obj/item/weapon/circuitboard/mecha/imperion)) + var/type_to_spawn = pick(subtypesof(/obj/item/circuitboard/mecha/imperion)) return new type_to_spawn(newloc) \ No newline at end of file diff --git a/code/modules/research/designs/stock_parts.dm b/code/modules/research/designs/stock_parts.dm index 20c09f79009..423adc6af66 100644 --- a/code/modules/research/designs/stock_parts.dm +++ b/code/modules/research/designs/stock_parts.dm @@ -20,35 +20,35 @@ id = "basic_matter_bin" req_tech = list(TECH_MATERIAL = 1) materials = list(MAT_STEEL = 80) - build_path = /obj/item/weapon/stock_parts/matter_bin + build_path = /obj/item/stock_parts/matter_bin sort_string = "AAAAA" /datum/design/item/stock_part/adv_matter_bin id = "adv_matter_bin" req_tech = list(TECH_MATERIAL = 3) materials = list(MAT_STEEL = 80) - build_path = /obj/item/weapon/stock_parts/matter_bin/adv + build_path = /obj/item/stock_parts/matter_bin/adv sort_string = "AAAAB" /datum/design/item/stock_part/super_matter_bin id = "super_matter_bin" req_tech = list(TECH_MATERIAL = 5) materials = list(MAT_STEEL = 80) - build_path = /obj/item/weapon/stock_parts/matter_bin/super + build_path = /obj/item/stock_parts/matter_bin/super sort_string = "AAAAC" /datum/design/item/stock_part/hyper_matter_bin id = "hyper_matter_bin" req_tech = list(TECH_MATERIAL = 6, TECH_ARCANE = 2) materials = list(MAT_STEEL = 200, MAT_VERDANTIUM = 60, MAT_DURASTEEL = 75) - build_path = /obj/item/weapon/stock_parts/matter_bin/hyper + build_path = /obj/item/stock_parts/matter_bin/hyper sort_string = "AAAAD" /datum/design/item/stock_part/omni_matter_bin id = "omni_matter_bin" req_tech = list(TECH_MATERIAL = 7, TECH_PRECURSOR = 2) materials = list(MAT_STEEL = 2000, MAT_PLASTEEL = 100, MAT_MORPHIUM = 100, MAT_DURASTEEL = 100) - build_path = /obj/item/weapon/stock_parts/matter_bin/omni + build_path = /obj/item/stock_parts/matter_bin/omni sort_string = "AAAAE" // Micro-manipulators @@ -57,35 +57,35 @@ id = "micro_mani" req_tech = list(TECH_MATERIAL = 1, TECH_DATA = 1) materials = list(MAT_STEEL = 30) - build_path = /obj/item/weapon/stock_parts/manipulator + build_path = /obj/item/stock_parts/manipulator sort_string = "AAABA" /datum/design/item/stock_part/nano_mani id = "nano_mani" req_tech = list(TECH_MATERIAL = 3, TECH_DATA = 2) materials = list(MAT_STEEL = 30) - build_path = /obj/item/weapon/stock_parts/manipulator/nano + build_path = /obj/item/stock_parts/manipulator/nano sort_string = "AAABB" /datum/design/item/stock_part/pico_mani id = "pico_mani" req_tech = list(TECH_MATERIAL = 5, TECH_DATA = 2) materials = list(MAT_STEEL = 30) - build_path = /obj/item/weapon/stock_parts/manipulator/pico + build_path = /obj/item/stock_parts/manipulator/pico sort_string = "AAABC" /datum/design/item/stock_part/hyper_mani id = "hyper_mani" req_tech = list(TECH_MATERIAL = 6, TECH_DATA = 3, TECH_ARCANE = 2) materials = list(MAT_STEEL = 200, MAT_VERDANTIUM = 50, MAT_DURASTEEL = 50) - build_path = /obj/item/weapon/stock_parts/manipulator/hyper + build_path = /obj/item/stock_parts/manipulator/hyper sort_string = "AAABD" /datum/design/item/stock_part/omni_mani id = "omni_mani" req_tech = list(TECH_MATERIAL = 7, TECH_DATA = 4, TECH_PRECURSOR = 2) materials = list(MAT_STEEL = 2000, MAT_PLASTEEL = 500, MAT_MORPHIUM = 100, MAT_DURASTEEL = 100) - build_path = /obj/item/weapon/stock_parts/manipulator/omni + build_path = /obj/item/stock_parts/manipulator/omni sort_string = "AAABE" // Capacitors @@ -94,35 +94,35 @@ id = "basic_capacitor" req_tech = list(TECH_POWER = 1) materials = list(MAT_STEEL = 50, MAT_GLASS = 50) - build_path = /obj/item/weapon/stock_parts/capacitor + build_path = /obj/item/stock_parts/capacitor sort_string = "AAACA" /datum/design/item/stock_part/adv_capacitor id = "adv_capacitor" req_tech = list(TECH_POWER = 3) materials = list(MAT_STEEL = 50, MAT_GLASS = 50) - build_path = /obj/item/weapon/stock_parts/capacitor/adv + build_path = /obj/item/stock_parts/capacitor/adv sort_string = "AAACB" /datum/design/item/stock_part/super_capacitor id = "super_capacitor" req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4) materials = list(MAT_STEEL = 50, MAT_GLASS = 50, MAT_GOLD = 20) - build_path = /obj/item/weapon/stock_parts/capacitor/super + build_path = /obj/item/stock_parts/capacitor/super sort_string = "AAACC" /datum/design/item/stock_part/hyper_capacitor id = "hyper_capacitor" req_tech = list(TECH_POWER = 6, TECH_MATERIAL = 5, TECH_BLUESPACE = 1, TECH_ARCANE = 1) materials = list(MAT_STEEL = 200, MAT_GLASS = 100, MAT_VERDANTIUM = 30, MAT_DURASTEEL = 25) - build_path = /obj/item/weapon/stock_parts/capacitor/hyper + build_path = /obj/item/stock_parts/capacitor/hyper sort_string = "AAACD" /datum/design/item/stock_part/omni_capacitor id = "omni_capacitor" req_tech = list(TECH_POWER = 7, TECH_MATERIAL = 6, TECH_BLUESPACE = 3, TECH_PRECURSOR = 1) materials = list(MAT_STEEL = 2000, MAT_DIAMOND = 1000, MAT_GLASS = 1000, MAT_MORPHIUM = 100, MAT_DURASTEEL = 100) - build_path = /obj/item/weapon/stock_parts/capacitor/omni + build_path = /obj/item/stock_parts/capacitor/omni sort_string = "AAACE" // Sensors @@ -131,35 +131,35 @@ id = "basic_sensor" req_tech = list(TECH_MAGNET = 1) materials = list(MAT_STEEL = 50, MAT_GLASS = 20) - build_path = /obj/item/weapon/stock_parts/scanning_module + build_path = /obj/item/stock_parts/scanning_module sort_string = "AAADA" /datum/design/item/stock_part/adv_sensor id = "adv_sensor" req_tech = list(TECH_MAGNET = 3) materials = list(MAT_STEEL = 50, MAT_GLASS = 20) - build_path = /obj/item/weapon/stock_parts/scanning_module/adv + build_path = /obj/item/stock_parts/scanning_module/adv sort_string = "AAADB" /datum/design/item/stock_part/phasic_sensor id = "phasic_sensor" req_tech = list(TECH_MAGNET = 5, TECH_MATERIAL = 3) materials = list(MAT_STEEL = 50, MAT_GLASS = 20, MAT_SILVER = 10) - build_path = /obj/item/weapon/stock_parts/scanning_module/phasic + build_path = /obj/item/stock_parts/scanning_module/phasic sort_string = "AAADC" /datum/design/item/stock_part/hyper_sensor id = "hyper_sensor" req_tech = list(TECH_MAGNET = 6, TECH_MATERIAL = 4, TECH_ARCANE = 1) materials = list(MAT_STEEL = 50, MAT_GLASS = 20, MAT_SILVER = 50, MAT_VERDANTIUM = 40, MAT_DURASTEEL = 50) - build_path = /obj/item/weapon/stock_parts/scanning_module/hyper + build_path = /obj/item/stock_parts/scanning_module/hyper sort_string = "AAADD" /datum/design/item/stock_part/omni_sensor id = "omni_sensor" req_tech = list(TECH_MAGNET = 7, TECH_MATERIAL = 5, TECH_PRECURSOR = 1) materials = list(MAT_STEEL = 1000, MAT_PLASTEEL = 500, MAT_GLASS = 750, MAT_SILVER = 500, MAT_MORPHIUM = 60, MAT_DURASTEEL = 100) - build_path = /obj/item/weapon/stock_parts/scanning_module/omni + build_path = /obj/item/stock_parts/scanning_module/omni sort_string = "AAADE" // Micro-lasers @@ -168,35 +168,35 @@ id = "basic_micro_laser" req_tech = list(TECH_MAGNET = 1) materials = list(MAT_STEEL = 10, MAT_GLASS = 20) - build_path = /obj/item/weapon/stock_parts/micro_laser + build_path = /obj/item/stock_parts/micro_laser sort_string = "AAAEA" /datum/design/item/stock_part/high_micro_laser id = "high_micro_laser" req_tech = list(TECH_MAGNET = 3) materials = list(MAT_STEEL = 10, MAT_GLASS = 20) - build_path = /obj/item/weapon/stock_parts/micro_laser/high + build_path = /obj/item/stock_parts/micro_laser/high sort_string = "AAAEB" /datum/design/item/stock_part/ultra_micro_laser id = "ultra_micro_laser" req_tech = list(TECH_MAGNET = 5, TECH_MATERIAL = 5) materials = list(MAT_STEEL = 10, MAT_GLASS = 20, MAT_URANIUM = 10) - build_path = /obj/item/weapon/stock_parts/micro_laser/ultra + build_path = /obj/item/stock_parts/micro_laser/ultra sort_string = "AAAEC" /datum/design/item/stock_part/hyper_micro_laser id = "hyper_micro_laser" req_tech = list(TECH_MAGNET = 6, TECH_MATERIAL = 6, TECH_ARCANE = 2) materials = list(MAT_STEEL = 200, MAT_GLASS = 20, MAT_URANIUM = 30, MAT_VERDANTIUM = 50, MAT_DURASTEEL = 100) - build_path = /obj/item/weapon/stock_parts/micro_laser/hyper + build_path = /obj/item/stock_parts/micro_laser/hyper sort_string = "AAAED" /datum/design/item/stock_part/omni_micro_laser id = "omni_micro_laser" req_tech = list(TECH_MAGNET = 7, TECH_MATERIAL = 7, TECH_PRECURSOR = 2) materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, MAT_URANIUM = 2000, MAT_MORPHIUM = 50, MAT_DURASTEEL = 100) - build_path = /obj/item/weapon/stock_parts/micro_laser/omni + build_path = /obj/item/stock_parts/micro_laser/omni sort_string = "AAAEE" @@ -244,7 +244,7 @@ id = "rped" req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 3) materials = list(MAT_STEEL = 15000, MAT_GLASS = 5000) - build_path = /obj/item/weapon/storage/part_replacer + build_path = /obj/item/storage/part_replacer sort_string = "ABAAA" /datum/design/item/stock_part/ARPED @@ -254,7 +254,7 @@ id = "arped" req_tech = list(TECH_ENGINEERING = 5, TECH_MATERIAL = 5) materials = list(MAT_STEEL = 30000, MAT_GLASS = 10000) - build_path = /obj/item/weapon/storage/part_replacer/adv + build_path = /obj/item/storage/part_replacer/adv sort_string = "ABAAB" /datum/design/item/stock_part/PBRPED @@ -264,5 +264,5 @@ id = "pbrped" req_tech = list(TECH_ENGINEERING = 7, TECH_MATERIAL = 7, TECH_BLUESPACE = 5) materials = list(MAT_STEEL = 30000, MAT_GLASS = 10000, MAT_SILVER = 5000, MAT_GOLD = 5000, MAT_DIAMOND = 1000) - build_path = /obj/item/weapon/storage/part_replacer/adv/discount_bluespace + build_path = /obj/item/storage/part_replacer/adv/discount_bluespace sort_string = "ABAAB" \ No newline at end of file diff --git a/code/modules/research/designs/subspace_parts.dm b/code/modules/research/designs/subspace_parts.dm index 7df051ce473..b0a3eacf9a8 100644 --- a/code/modules/research/designs/subspace_parts.dm +++ b/code/modules/research/designs/subspace_parts.dm @@ -8,47 +8,47 @@ id = "s-ansible" req_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) materials = list(MAT_STEEL = 80, MAT_SILVER = 20) - build_path = /obj/item/weapon/stock_parts/subspace/ansible + build_path = /obj/item/stock_parts/subspace/ansible sort_string = "RAAAA" /datum/design/item/stock_part/subspace/hyperwave_filter id = "s-filter" req_tech = list(TECH_DATA = 3, TECH_MAGNET = 3) materials = list(MAT_STEEL = 40, MAT_SILVER = 10) - build_path = /obj/item/weapon/stock_parts/subspace/sub_filter + build_path = /obj/item/stock_parts/subspace/sub_filter sort_string = "RAAAB" /datum/design/item/stock_part/subspace/subspace_amplifier id = "s-amplifier" req_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) materials = list(MAT_STEEL = 10, MAT_GOLD = 30, MAT_URANIUM = 15) - build_path = /obj/item/weapon/stock_parts/subspace/amplifier + build_path = /obj/item/stock_parts/subspace/amplifier sort_string = "RAAAC" /datum/design/item/stock_part/subspace/subspace_treatment id = "s-treatment" req_tech = list(TECH_DATA = 3, TECH_MAGNET = 2, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) materials = list(MAT_STEEL = 10, MAT_SILVER = 20) - build_path = /obj/item/weapon/stock_parts/subspace/treatment + build_path = /obj/item/stock_parts/subspace/treatment sort_string = "RAAAD" /datum/design/item/stock_part/subspace/subspace_analyzer id = "s-analyzer" req_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) materials = list(MAT_STEEL = 10, MAT_GOLD = 15) - build_path = /obj/item/weapon/stock_parts/subspace/analyzer + build_path = /obj/item/stock_parts/subspace/analyzer sort_string = "RAAAE" /datum/design/item/stock_part/subspace/subspace_crystal id = "s-crystal" req_tech = list(TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) materials = list(MAT_GLASS = 1000, MAT_SILVER = 20, MAT_GOLD = 20) - build_path = /obj/item/weapon/stock_parts/subspace/crystal + build_path = /obj/item/stock_parts/subspace/crystal sort_string = "RAAAF" /datum/design/item/stock_part/subspace/subspace_transmitter id = "s-transmitter" req_tech = list(TECH_MAGNET = 5, TECH_MATERIAL = 5, TECH_BLUESPACE = 3) materials = list(MAT_GLASS = 100, MAT_SILVER = 10, MAT_URANIUM = 15) - build_path = /obj/item/weapon/stock_parts/subspace/transmitter + build_path = /obj/item/stock_parts/subspace/transmitter sort_string = "RAAAG" \ No newline at end of file diff --git a/code/modules/research/designs/tech_disks.dm b/code/modules/research/designs/tech_disks.dm index 2d8eda13fdb..3fb8306b1ee 100644 --- a/code/modules/research/designs/tech_disks.dm +++ b/code/modules/research/designs/tech_disks.dm @@ -8,7 +8,7 @@ id = "design_disk" req_tech = list(TECH_DATA = 1) materials = list(MAT_STEEL = 30, MAT_GLASS = 10) - build_path = /obj/item/weapon/disk/design_disk + build_path = /obj/item/disk/design_disk sort_string = "CAAAA" /datum/design/item/disk/tech_disk @@ -17,5 +17,5 @@ id = "tech_disk" req_tech = list(TECH_DATA = 1) materials = list(MAT_STEEL = 30, MAT_GLASS = 10) - build_path = /obj/item/weapon/disk/tech_disk + build_path = /obj/item/disk/tech_disk sort_string = "CAAAB" \ No newline at end of file diff --git a/code/modules/research/designs/uncommented.dm b/code/modules/research/designs/uncommented.dm index 81df7b8d86d..68b3a2c70c7 100644 --- a/code/modules/research/designs/uncommented.dm +++ b/code/modules/research/designs/uncommented.dm @@ -3,7 +3,7 @@ /datum/design/circuit/general_alert name = "general alert console" id = "general_alert" - build_path = /obj/item/weapon/circuitboard/general_alert + build_path = /obj/item/circuitboard/general_alert // Removal of loyalty implants. Can't think of a way to add this to the config option. /datum/design/item/implant/loyalty @@ -11,7 +11,7 @@ id = "implant_loyal" req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3) materials = list(MAT_STEEL = 7000, MAT_GLASS = 7000) - build_path = /obj/item/weapon/implantcase/loyalty" + build_path = /obj/item/implantcase/loyalty" /datum/design/rust_core_control name = "Circuit Design (RUST core controller)" @@ -20,7 +20,7 @@ req_tech = list("programming" = 4, "engineering" = 4) build_type = IMPRINTER materials = list(MAT_GLASS = 2000, "sacid" = 20) - build_path = "/obj/item/weapon/circuitboard/rust_core_control" + build_path = "/obj/item/circuitboard/rust_core_control" /datum/design/rust_fuel_control name = "Circuit Design (RUST fuel controller)" @@ -29,7 +29,7 @@ req_tech = list("programming" = 4, "engineering" = 4) build_type = IMPRINTER materials = list(MAT_GLASS = 2000, "sacid" = 20) - build_path = "/obj/item/weapon/circuitboard/rust_fuel_control" + build_path = "/obj/item/circuitboard/rust_fuel_control" /datum/design/rust_fuel_port name = "Internal circuitry (RUST fuel port)" @@ -38,7 +38,7 @@ req_tech = list("engineering" = 4, "materials" = 5) build_type = IMPRINTER materials = list(MAT_GLASS = 2000, "sacid" = 20, MAT_URANIUM = 3000) - build_path = "/obj/item/weapon/module/rust_fuel_port" + build_path = "/obj/item/module/rust_fuel_port" /datum/design/rust_fuel_compressor name = "Circuit Design (RUST fuel compressor)" @@ -47,7 +47,7 @@ req_tech = list("materials" = 6, "phorontech" = 4) build_type = IMPRINTER materials = list(MAT_GLASS = 2000, "sacid" = 20, MAT_PHORON = 3000, MAT_DIAMOND = 1000) - build_path = "/obj/item/weapon/module/rust_fuel_compressor" + build_path = "/obj/item/module/rust_fuel_compressor" /datum/design/rust_core name = "Internal circuitry (RUST tokamak core)" @@ -56,7 +56,7 @@ req_tech = list(bluespace = 3, phorontech = 4, magnets = 5, powerstorage = 6) build_type = IMPRINTER materials = list(MAT_GLASS = 2000, "sacid" = 20, MAT_PHORON = 3000, MAT_DIAMOND = 2000) - build_path = "/obj/item/weapon/circuitboard/rust_core" + build_path = "/obj/item/circuitboard/rust_core" /datum/design/rust_injector name = "Internal circuitry (RUST tokamak core)" @@ -65,5 +65,5 @@ req_tech = list(powerstorage = 3, engineering = 4, phorontech = 4, materials = 6) build_type = IMPRINTER materials = list(MAT_GLASS = 2000, "sacid" = 20, MAT_PHORON = 3000, MAT_URANIUM = 2000) - build_path = "/obj/item/weapon/circuitboard/rust_core" + build_path = "/obj/item/circuitboard/rust_core" */ diff --git a/code/modules/research/designs/weapons.dm b/code/modules/research/designs/weapons.dm index f6644babaad..bcd993b505d 100644 --- a/code/modules/research/designs/weapons.dm +++ b/code/modules/research/designs/weapons.dm @@ -23,21 +23,21 @@ id = "stunrevolver" req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2) materials = list(MAT_STEEL = 4000) - build_path = /obj/item/weapon/gun/energy/stunrevolver + build_path = /obj/item/gun/energy/stunrevolver sort_string = "MAAAA" /datum/design/item/weapon/energy/nuclear_gun id = "nuclear_gun" req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_POWER = 3) materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000, MAT_URANIUM = 500) - build_path = /obj/item/weapon/gun/energy/gun/nuclear + build_path = /obj/item/gun/energy/gun/nuclear sort_string = "MAAAB" /datum/design/item/weapon/energy/phoronpistol id = "ppistol" req_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4) materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000, MAT_PHORON = 3000) - build_path = /obj/item/weapon/gun/energy/toxgun + build_path = /obj/item/gun/energy/toxgun sort_string = "MAAAC" /datum/design/item/weapon/energy/lasercannon @@ -45,14 +45,14 @@ id = "lasercannon" req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3) materials = list(MAT_STEEL = 10000, MAT_GLASS = 1000, MAT_DIAMOND = 2000) - build_path = /obj/item/weapon/gun/energy/lasercannon + build_path = /obj/item/gun/energy/lasercannon sort_string = "MAAAD" /datum/design/item/weapon/energy/decloner id = "decloner" req_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 7, TECH_BIO = 5, TECH_POWER = 6) materials = list(MAT_GOLD = 5000,MAT_URANIUM = 10000) - build_path = /obj/item/weapon/gun/energy/decloner + build_path = /obj/item/gun/energy/decloner sort_string = "MAAAE" /datum/design/item/weapon/energy/temp_gun @@ -60,21 +60,21 @@ id = "temp_gun" req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 4, TECH_POWER = 3, TECH_MAGNET = 2) materials = list(MAT_STEEL = 5000, MAT_GLASS = 500, MAT_SILVER = 3000) - build_path = /obj/item/weapon/gun/energy/temperature + build_path = /obj/item/gun/energy/temperature sort_string = "MAAAF" /datum/design/item/weapon/energy/flora_gun id = "flora_gun" req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3, TECH_POWER = 3) materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, MAT_URANIUM = 500) - build_path = /obj/item/weapon/gun/energy/floragun + build_path = /obj/item/gun/energy/floragun sort_string = "MAAAG" /datum/design/item/weapon/energy/vinstunrevolver id = "vinstunrevolver" req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2) materials = list(MAT_STEEL = 4000) - build_path = /obj/item/weapon/gun/energy/stunrevolver/vintage + build_path = /obj/item/gun/energy/stunrevolver/vintage sort_string = "MAAAH" // Ballistic weapons @@ -88,7 +88,7 @@ desc = "An advanced 9mm SMG with a reflective laser optic." req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3) materials = list(MAT_STEEL = 8000, MAT_SILVER = 2000, MAT_DIAMOND = 1000) - build_path = /obj/item/weapon/gun/projectile/automatic/advanced_smg + build_path = /obj/item/gun/projectile/automatic/advanced_smg sort_string = "MABAA" // Ballistic ammo @@ -135,28 +135,28 @@ id = "phasepistol" req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2, TECH_POWER = 2) materials = list(MAT_STEEL = 4000) - build_path = /obj/item/weapon/gun/energy/phasegun/pistol + build_path = /obj/item/gun/energy/phasegun/pistol sort_string = "MACAA" /datum/design/item/weapon/phase/phase_carbine id = "phasecarbine" req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2, TECH_POWER = 2) materials = list(MAT_STEEL = 6000, MAT_GLASS = 1500) - build_path = /obj/item/weapon/gun/energy/phasegun + build_path = /obj/item/gun/energy/phasegun sort_string = "MACAB" /datum/design/item/weapon/phase/phase_rifle id = "phaserifle" req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3) materials = list(MAT_STEEL = 7000, MAT_GLASS = 2000, MAT_SILVER = 500) - build_path = /obj/item/weapon/gun/energy/phasegun/rifle + build_path = /obj/item/gun/energy/phasegun/rifle sort_string = "MACAC" /datum/design/item/weapon/phase/phase_cannon id = "phasecannon" req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4, TECH_POWER = 4) materials = list(MAT_STEEL = 10000, MAT_GLASS = 2000, MAT_SILVER = 1000, MAT_DIAMOND = 750) - build_path = /obj/item/weapon/gun/energy/phasegun/cannon + build_path = /obj/item/gun/energy/phasegun/cannon sort_string = "MACAD" */ //VOREStation Removal End @@ -166,7 +166,7 @@ id = "rapidsyringe" req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2) materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000) - build_path = /obj/item/weapon/gun/launcher/syringe/rapid + build_path = /obj/item/gun/launcher/syringe/rapid sort_string = "MADAA" /datum/design/item/weapon/dartgun @@ -174,7 +174,7 @@ id = "dartgun_r" req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_BIO = 4, TECH_MAGNET = 3, TECH_ILLEGAL = 1) materials = list(MAT_STEEL = 5000, MAT_GOLD = 5000, MAT_SILVER = 2500, MAT_GLASS = 750) - build_path = /obj/item/weapon/gun/projectile/dartgun/research + build_path = /obj/item/gun/projectile/dartgun/research sort_string = "MADAB" /datum/design/item/weapon/chemsprayer @@ -182,14 +182,14 @@ id = "chemsprayer" req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2) materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000) - build_path = /obj/item/weapon/reagent_containers/spray/chemsprayer + build_path = /obj/item/reagent_containers/spray/chemsprayer sort_string = "MADAC" /datum/design/item/weapon/fuelrod id = "fuelrod_gun" req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_PHORON = 4, TECH_ILLEGAL = 5, TECH_MAGNET = 5) materials = list(MAT_STEEL = 10000, MAT_GLASS = 2000, MAT_GOLD = 500, MAT_SILVER = 500, MAT_URANIUM = 1000, MAT_PHORON = 3000, MAT_DIAMOND = 1000) - build_path = /obj/item/weapon/gun/magnetic/fuelrod + build_path = /obj/item/gun/magnetic/fuelrod sort_string = "MADAD" // Ammo for those @@ -226,7 +226,7 @@ id = "magnetic_ammo" req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4, TECH_MAGNET = 4) materials = list(MAT_STEEL = 500, MAT_GOLD = 300, MAT_GLASS = 150, MAT_PHORON = 100) - build_path = /obj/item/weapon/magnetic_ammo + build_path = /obj/item/magnetic_ammo sort_string = "MADBE" // Melee weapons @@ -240,7 +240,7 @@ id = "chargesword" req_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 4, TECH_ENGINEERING = 5, TECH_ILLEGAL = 4, TECH_ARCANE = 1) materials = list(MAT_PLASTEEL = 3500, MAT_GLASS = 1000, MAT_LEAD = 2250, MAT_METALHYDROGEN = 500) - build_path = /obj/item/weapon/melee/energy/sword/charge + build_path = /obj/item/melee/energy/sword/charge sort_string = "MBAAA" /datum/design/item/weapon/melee/eaxe @@ -248,7 +248,7 @@ id = "chargeaxe" req_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 5, TECH_ENGINEERING = 4, TECH_ILLEGAL = 4) materials = list(MAT_PLASTEEL = 3500, MAT_OSMIUM = 2000, MAT_LEAD = 2000, MAT_METALHYDROGEN = 500) - build_path = /obj/item/weapon/melee/energy/axe/charge + build_path = /obj/item/melee/energy/axe/charge sort_string = "MBAAB" // Grenade stuff @@ -260,5 +260,5 @@ id = "large_Grenade" req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2) materials = list(MAT_STEEL = 3000) - build_path = /obj/item/weapon/grenade/chem_grenade/large + build_path = /obj/item/grenade/chem_grenade/large sort_string = "MCAAA" diff --git a/code/modules/research/designs/weapons_vr.dm b/code/modules/research/designs/weapons_vr.dm index 1c7482a69f1..9d80035cf2c 100644 --- a/code/modules/research/designs/weapons_vr.dm +++ b/code/modules/research/designs/weapons_vr.dm @@ -14,7 +14,7 @@ id = "protector" req_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3, TECH_MAGNET = 2) materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000, MAT_SILVER = 1000) - build_path = /obj/item/weapon/gun/energy/gun/protector + build_path = /obj/item/gun/energy/gun/protector sort_string = "MAAVA" /datum/design/item/weapon/energy/sickshot @@ -22,7 +22,7 @@ id = "sickshot" req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_MAGNET = 2) materials = list(MAT_STEEL = 3000, MAT_GLASS = 2000) - build_path = /obj/item/weapon/gun/energy/sickshot + build_path = /obj/item/gun/energy/sickshot sort_string = "MAAVB" /datum/design/item/weapon/energy/netgun @@ -30,7 +30,7 @@ id = "netgun" req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_MAGNET = 3) materials = list(MAT_STEEL = 6000, MAT_GLASS = 3000) - build_path = /obj/item/weapon/gun/energy/netgun + build_path = /obj/item/gun/energy/netgun sort_string = "MAAVC" // Misc weapons @@ -40,7 +40,7 @@ id = "pummeler" req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_MAGNET = 5) materials = list(MAT_STEEL = 3000, MAT_GLASS = 3000, MAT_URANIUM = 1000) - build_path = /obj/item/weapon/gun/energy/pummeler + build_path = /obj/item/gun/energy/pummeler sort_string = "MADVA" // Anti-particle stuff @@ -54,7 +54,7 @@ id = "advparticle" req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 5, TECH_POWER = 3, TECH_MAGNET = 3) materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000, MAT_GOLD = 1000, MAT_URANIUM = 750) - build_path = /obj/item/weapon/gun/energy/particle/advanced + build_path = /obj/item/gun/energy/particle/advanced sort_string = "MAAUA" /datum/design/item/weapon/particle/particlecannon @@ -62,7 +62,7 @@ id = "particlecannon" req_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 5, TECH_POWER = 4, TECH_MAGNET = 4) materials = list(MAT_STEEL = 10000, MAT_GLASS = 1500, MAT_GOLD = 2000, MAT_URANIUM = 1000, MAT_DIAMOND = 2000) - build_path = /obj/item/weapon/gun/energy/particle/cannon + build_path = /obj/item/gun/energy/particle/cannon sort_string = "MAAUB" /datum/design/item/weapon/particle/pressureinterlock @@ -83,7 +83,7 @@ id = "nsfw_prototype" req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 4, TECH_POWER = 4, TECH_COMBAT = 7) materials = list(MAT_STEEL = 10000, MAT_GLASS = 6000, MAT_PHORON = 8000, MAT_URANIUM = 4000) - build_path = /obj/item/weapon/gun/projectile/cell_loaded/combat/prototype + build_path = /obj/item/gun/projectile/cell_loaded/combat/prototype sort_string = "MAVAA" /datum/design/item/weapon/cell_based/prototype_nsfw_mag diff --git a/code/modules/research/designs/xenoarch_toys.dm b/code/modules/research/designs/xenoarch_toys.dm index 5d90867a954..9cd12473d38 100644 --- a/code/modules/research/designs/xenoarch_toys.dm +++ b/code/modules/research/designs/xenoarch_toys.dm @@ -10,14 +10,14 @@ desc = "Aids in triangulation of exotic particles." req_tech = list(TECH_BLUESPACE = 3, TECH_MAGNET = 3) materials = list(MAT_STEEL = 10000,MAT_GLASS = 5000) - build_path = /obj/item/device/ano_scanner + build_path = /obj/item/ano_scanner sort_string = "GAAAA" /datum/design/item/weapon/xenoarch/xenoarch_multi_tool name = "xenoarcheology multitool" id = "xenoarch_multitool" req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3, TECH_BLUESPACE = 3) - build_path = /obj/item/device/xenoarch_multi_tool + build_path = /obj/item/xenoarch_multi_tool materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000, MAT_URANIUM = 500, MAT_PHORON = 500) sort_string = "GAAAB" @@ -27,5 +27,5 @@ req_tech = list(TECH_MATERIAL = 3, TECH_POWER = 2, TECH_ENGINEERING = 2, TECH_BLUESPACE = 3) build_type = PROTOLATHE materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000) - build_path = /obj/item/weapon/pickaxe/excavationdrill + build_path = /obj/item/pickaxe/excavationdrill sort_string = "GAAAC" \ No newline at end of file diff --git a/code/modules/research/designs/xenobio_toys.dm b/code/modules/research/designs/xenobio_toys.dm index 2c7f3f402ae..5975c3bd059 100644 --- a/code/modules/research/designs/xenobio_toys.dm +++ b/code/modules/research/designs/xenobio_toys.dm @@ -8,14 +8,14 @@ id = "slimebaton" req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2, TECH_POWER = 3, TECH_COMBAT = 3) materials = list(MAT_STEEL = 5000) - build_path = /obj/item/weapon/melee/baton/slime + build_path = /obj/item/melee/baton/slime sort_string = "HAAAA" /datum/design/item/weapon/xenobio/slimetaser id = "slimetaser" req_tech = list(TECH_MATERIAL = 3, TECH_BIO = 3, TECH_POWER = 4, TECH_COMBAT = 4) materials = list(MAT_STEEL = 5000) - build_path = /obj/item/weapon/gun/energy/taser/xeno + build_path = /obj/item/gun/energy/taser/xeno sort_string = "HAAAB" // Other @@ -26,5 +26,5 @@ id = "slime_scanner" req_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) materials = list(MAT_STEEL = 500, MAT_GLASS = 500) - build_path = /obj/item/device/slime_scanner + build_path = /obj/item/slime_scanner sort_string = "HBAAA" \ No newline at end of file diff --git a/code/modules/research/designs/xenobio_toys_vr.dm b/code/modules/research/designs/xenobio_toys_vr.dm index 39491c1b0c3..b4b0bc441fd 100644 --- a/code/modules/research/designs/xenobio_toys_vr.dm +++ b/code/modules/research/designs/xenobio_toys_vr.dm @@ -4,7 +4,7 @@ id = "monkey_gun" req_tech = list(TECH_MATERIAL = 3, TECH_BIO = 3, TECH_POWER = 4, TECH_COMBAT = 4, TECH_BLUESPACE = 6) materials = list(MAT_PLASTEEL = 5000, MAT_GLASS = 5000, MAT_DIAMOND = 500, MAT_MORPHIUM = 350) - build_path = /obj/item/weapon/xenobio/monkey_gun + build_path = /obj/item/xenobio/monkey_gun sort_string = "HBBA" /datum/design/item/weapon/xenobio/grinder @@ -13,5 +13,5 @@ id = "slime_grinder" req_tech = list(TECH_MAGNET = 4, TECH_BIO = 7) materials = list(MAT_STEEL = 500, MAT_GLASS = 500, MAT_DIAMOND = 500, MAT_MORPHIUM = 100) - build_path = /obj/item/weapon/slime_grinder + build_path = /obj/item/slime_grinder sort_string = "HBBB" \ No newline at end of file diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 6b5c6ee2955..d4c2599eae7 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -9,9 +9,9 @@ Note: Must be placed within 3 tiles of the R&D Console /obj/machinery/r_n_d/destructive_analyzer name = "destructive analyzer" icon_state = "d_analyzer" - var/obj/item/weapon/loaded_item = null + var/obj/item/loaded_item = null var/decon_mod = 0 - circuit = /obj/item/weapon/circuitboard/destructive_analyzer + circuit = /obj/item/circuitboard/destructive_analyzer use_power = USE_POWER_IDLE idle_power_usage = 30 active_power_usage = 2500 @@ -23,7 +23,7 @@ Note: Must be placed within 3 tiles of the R&D Console /obj/machinery/r_n_d/destructive_analyzer/RefreshParts() var/T = 0 - for(var/obj/item/weapon/stock_parts/S in component_parts) + for(var/obj/item/stock_parts/S in component_parts) T += S.rating T *= 0.1 decon_mod = clamp(T, 0, 1) @@ -80,8 +80,8 @@ Note: Must be placed within 3 tiles of the R&D Console return /obj/machinery/r_n_d/destructive_analyzer/MouseDrop_T(atom/dropping, mob/living/user) - if(istype(dropping, /obj/item/weapon/storage/part_replacer)) - var/obj/item/weapon/storage/part_replacer/replacer = dropping + if(istype(dropping, /obj/item/storage/part_replacer)) + var/obj/item/storage/part_replacer/replacer = dropping replacer.hide_from(user) if(!linked_console) to_chat(user, "\The [src] must be linked to an R&D console first.") diff --git a/code/modules/research/mechfab_designs.dm b/code/modules/research/mechfab_designs.dm index 834ba13efb1..66eece8efcc 100644 --- a/code/modules/research/mechfab_designs.dm +++ b/code/modules/research/mechfab_designs.dm @@ -783,7 +783,7 @@ req_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 2) build_type = MECHFAB materials = list(MAT_STEEL = 562, MAT_GLASS = 562) - build_path = /obj/item/device/flash/synthetic + build_path = /obj/item/flash/synthetic category = list("Misc") /* @@ -801,7 +801,7 @@ id = "vehicle_chassis_spacebike" req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 6, TECH_BLUESPACE = 3, TECH_PHORON = 3) materials = list(MAT_STEEL = 12000, MAT_SILVER = 3000, MAT_PHORON = 3000, MAT_OSMIUM = 1000) - build_path = /obj/item/weapon/vehicle_assembly/spacebike + build_path = /obj/item/vehicle_assembly/spacebike /datum/design/item/mechfab/vehicle/quadbike_chassis name = "Quad bike Chassis" @@ -809,7 +809,7 @@ id = "vehicle_chassis_quadbike" req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 6, TECH_MAGNET = 3, TECH_POWER = 2) materials = list(MAT_STEEL = 15000, MAT_SILVER = 3000, MAT_PLASTIC = 3000, MAT_OSMIUM = 1000) - build_path = /obj/item/weapon/vehicle_assembly/quadbike + build_path = /obj/item/vehicle_assembly/quadbike /datum/design/item/mechfab/vehicle/snowmobile_chassis name = "Snowmobile Chassis" @@ -817,7 +817,7 @@ id = "vehicle_chassis_snowmobile" req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 6, TECH_MAGNET = 3, TECH_POWER = 2) materials = list(MAT_STEEL = 12000, MAT_SILVER = 3000, MAT_PLASTIC = 3000, MAT_OSMIUM = 1000) - build_path = /obj/item/weapon/vehicle_assembly/snowmobile + build_path = /obj/item/vehicle_assembly/snowmobile /* * Rigsuits @@ -832,7 +832,7 @@ desc = "A belt holding a compressed space-suit." id = "rigmodule_belt_basic" materials = list(MAT_PLASTEEL = 12000, MAT_GOLD = 3000, MAT_GRAPHITE = 3000, MAT_OSMIUM = 1000, MAT_PLASTIC = 5000) - build_path = /obj/item/weapon/rig/robotics + build_path = /obj/item/rig/robotics /datum/design/item/mechfab/rigsuit/jetpack name = "hardsuit maneuvering jets" @@ -1092,7 +1092,7 @@ /datum/design/item/mechfab/uav/basic name = "UAV - Recon Skimmer" id = "recon_skimmer" - build_path = /obj/item/device/uav + build_path = /obj/item/uav time = 20 req_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 5, TECH_PHORON = 3, TECH_MAGNET = 4, TECH_POWER = 6) materials = list(MAT_STEEL = 10000, MAT_GLASS = 6000, MAT_SILVER = 4000) diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 5d65c6f9a23..329bdcae434 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -149,9 +149,9 @@ var/global/list/obj/machinery/message_server/message_servers = list() return -/obj/machinery/message_server/attackby(obj/item/weapon/O as obj, mob/living/user as mob) +/obj/machinery/message_server/attackby(obj/item/O as obj, mob/living/user as mob) if (active && !(stat & (BROKEN|NOPOWER)) && (spamfilter_limit < MESSAGE_SERVER_DEFAULT_SPAM_LIMIT*2) && \ - istype(O,/obj/item/weapon/circuitboard/message_monitor)) + istype(O,/obj/item/circuitboard/message_monitor)) spamfilter_limit += round(MESSAGE_SERVER_DEFAULT_SPAM_LIMIT / 2) user.drop_item() qdel(O) diff --git a/code/modules/research/prosfab_designs.dm b/code/modules/research/prosfab_designs.dm index a0a5bafc2c4..803ac462db0 100644 --- a/code/modules/research/prosfab_designs.dm +++ b/code/modules/research/prosfab_designs.dm @@ -376,7 +376,7 @@ /datum/design/item/prosfab/cyborg/component/ai_shell name = "AI Remote Interface" id = "mmi_ai_shell" - build_path = /obj/item/device/mmi/inert/ai_remote + build_path = /obj/item/mmi/inert/ai_remote //////////////////// Cyborg Modules //////////////////// /datum/design/item/prosfab/robot_upgrade diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 57474f3bc1b..9e29e1424e9 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -2,7 +2,7 @@ name = "Protolathe" icon_state = "protolathe" flags = OPENCONTAINER - circuit = /obj/item/weapon/circuitboard/protolathe + circuit = /obj/item/circuitboard/protolathe use_power = USE_POWER_IDLE idle_power_usage = 30 active_power_usage = 5000 @@ -87,14 +87,14 @@ /obj/machinery/r_n_d/protolathe/RefreshParts() var/T = 0 - for(var/obj/item/weapon/reagent_containers/glass/G in component_parts) + for(var/obj/item/reagent_containers/glass/G in component_parts) T += G.reagents.maximum_volume create_reagents(T) max_material_storage = 0 - for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) + for(var/obj/item/stock_parts/matter_bin/M in component_parts) max_material_storage += M.rating * 75000 T = 0 - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) T += M.rating mat_efficiency = max(1 - (T - 2) / 8, 0.2) speed = T / 2 @@ -134,7 +134,7 @@ return if(O.is_open_container()) return 1 - if(istype(O, /obj/item/weapon/gripper/no_use/loader)) + if(istype(O, /obj/item/gripper/no_use/loader)) return 0 //Sheet loaders weren't finishing attack(), this prevents the message "You can't stuff that gripper into this" without preventing the rest of the attack sequence from finishing if(panel_open) to_chat(user, "You can't load \the [src] while it's opened.") diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index b2b2e4129a6..8530f1b8653 100755 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -33,10 +33,10 @@ won't update every console in existence) but it's more of a hassle to do. Also, icon_keyboard = "rd_key" icon_screen = "rdcomp" light_color = "#a97faa" - circuit = /obj/item/weapon/circuitboard/rdconsole + circuit = /obj/item/circuitboard/rdconsole var/datum/research/files //Stores all the collected research data. - var/obj/item/weapon/disk/tech_disk/t_disk = null //Stores the technology disk. - var/obj/item/weapon/disk/design_disk/d_disk = null //Stores the design disk. + var/obj/item/disk/tech_disk/t_disk = null //Stores the technology disk. + var/obj/item/disk/design_disk/d_disk = null //Stores the design disk. var/obj/machinery/r_n_d/destructive_analyzer/linked_destroy = null //Linked Destructive Analyzer var/obj/machinery/r_n_d/protolathe/linked_lathe = null //Linked Protolathe @@ -116,16 +116,16 @@ won't update every console in existence) but it's more of a hassle to do. Also, SyncRDevices() . = ..() -/obj/machinery/computer/rdconsole/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob) +/obj/machinery/computer/rdconsole/attackby(var/obj/item/D as obj, var/mob/user as mob) //Loading a disk into it. - if(istype(D, /obj/item/weapon/disk)) + if(istype(D, /obj/item/disk)) if(t_disk || d_disk) to_chat(user, "A disk is already loaded into the machine.") return - if(istype(D, /obj/item/weapon/disk/tech_disk)) + if(istype(D, /obj/item/disk/tech_disk)) t_disk = D - else if (istype(D, /obj/item/weapon/disk/design_disk)) + else if (istype(D, /obj/item/disk/design_disk)) d_disk = D else to_chat(user, "Machine cannot accept disks in that format.") diff --git a/code/modules/research/rdconsole_tgui.dm b/code/modules/research/rdconsole_tgui.dm index 34c870cac6c..8405dfb9619 100644 --- a/code/modules/research/rdconsole_tgui.dm +++ b/code/modules/research/rdconsole_tgui.dm @@ -626,7 +626,7 @@ if("print") //Print research information busy_msg = "Printing Research Information. Please Wait..." spawn(20) - var/obj/item/weapon/paper/PR = new/obj/item/weapon/paper + var/obj/item/paper/PR = new/obj/item/paper PR.name = "list of researched technologies" PR.info = "
[station_name()] Science Laboratories" PR.info += "

[ (text2num(params["print"]) == 2) ? "Detailed" : null] Research Progress Report

" diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index 87cfd261790..2675c16de90 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -198,7 +198,7 @@ GLOBAL_LIST_INIT(design_datums, list()) id = TECH_PRECURSOR level = 0 -/obj/item/weapon/disk/tech_disk +/obj/item/disk/tech_disk name = "technology disk" desc = "A disk for storing technology data for further research." icon = 'icons/obj/discs_vr.dmi' //VOREStation Edit @@ -209,10 +209,10 @@ GLOBAL_LIST_INIT(design_datums, list()) matter = list(MAT_STEEL = 30, MAT_GLASS = 10) var/datum/tech/stored -/obj/item/weapon/disk/tech_disk/New() +/obj/item/disk/tech_disk/New() randpixel_xy() -/obj/item/weapon/disk/design_disk +/obj/item/disk/design_disk name = "component design disk" desc = "A disk for storing device design data for construction in lathes." icon = 'icons/obj/discs_vr.dmi' //VOREStation Edit @@ -223,5 +223,5 @@ GLOBAL_LIST_INIT(design_datums, list()) matter = list(MAT_STEEL = 30, MAT_GLASS = 10) var/datum/design/blueprint -/obj/item/weapon/disk/design_disk/New() +/obj/item/disk/design_disk/New() randpixel_xy() diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 2b25b205def..8ba581313f1 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -13,7 +13,7 @@ idle_power_usage = 800 var/delay = 10 req_access = list(access_rd) //Only the R&D can change server settings. - circuit = /obj/item/weapon/circuitboard/rdserver + circuit = /obj/item/circuitboard/rdserver /obj/machinery/r_n_d/server/Initialize() . = ..() @@ -25,7 +25,7 @@ /obj/machinery/r_n_d/server/RefreshParts() var/tot_rating = 0 - for(var/obj/item/weapon/stock_parts/SP in src) + for(var/obj/item/stock_parts/SP in src) tot_rating += SP.rating update_idle_power_usage(initial(idle_power_usage) / max(1, tot_rating)) @@ -150,7 +150,7 @@ icon_keyboard = "rd_key" icon_screen = "rdcomp" light_color = "#a97faa" - circuit = /obj/item/weapon/circuitboard/rdservercontrol + circuit = /obj/item/circuitboard/rdservercontrol var/screen = 0 var/obj/machinery/r_n_d/server/temp_server var/list/servers = list() diff --git a/code/modules/research/teleport_vr.dm b/code/modules/research/teleport_vr.dm index 22a84a224c9..2deca9c2f21 100644 --- a/code/modules/research/teleport_vr.dm +++ b/code/modules/research/teleport_vr.dm @@ -11,7 +11,7 @@ id = "translocator" req_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_ILLEGAL = 6) materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000, MAT_URANIUM = 4000, MAT_DIAMOND = 2000) - build_path = /obj/item/device/perfect_tele + build_path = /obj/item/perfect_tele sort_string = "PAAAA" /datum/design/item/teleport/bluespace_crystal @@ -19,5 +19,5 @@ id = "bluespace_crystal" req_tech = list(TECH_BLUESPACE = 3, TECH_PHORON = 4) materials = list(MAT_DIAMOND = 1500, MAT_PHORON = 1500) - build_path = /obj/item/weapon/bluespace_crystal/artificial + build_path = /obj/item/bluespace_crystal/artificial sort_string = "PAAAB" diff --git a/code/modules/resleeving/autoresleever.dm b/code/modules/resleeving/autoresleever.dm index 7c56b5827ae..d6aa44cb7bf 100644 --- a/code/modules/resleeving/autoresleever.dm +++ b/code/modules/resleeving/autoresleever.dm @@ -64,10 +64,10 @@ if(!istype(ghost,/mob/observer/dead)) return if(ghost.mind && ghost.mind.current && ghost.mind.current.stat != DEAD) - if(istype(ghost.mind.current.loc, /obj/item/device/mmi)) + if(istype(ghost.mind.current.loc, /obj/item/mmi)) if(tgui_alert(ghost, "Your brain is still alive, using the auto-resleever will delete that brain. Are you sure?", "Delete Brain", list("No","Yes")) != "Yes") return - if(istype(ghost.mind.current.loc, /obj/item/device/mmi)) + if(istype(ghost.mind.current.loc, /obj/item/mmi)) qdel(ghost.mind.current.loc) else to_chat(ghost, "Your body is still alive, you cannot be resleeved.") @@ -194,7 +194,7 @@ log_admin("[new_character.ckey]'s character [new_character.real_name] has been auto-resleeved.") message_admins("[new_character.ckey]'s character [new_character.real_name] has been auto-resleeved.") - var/obj/item/weapon/implant/backup/imp = new(src) + var/obj/item/implant/backup/imp = new(src) if(imp.handle_implant(new_character,new_character.zone_sel.selecting)) imp.post_implant(new_character) @@ -206,7 +206,7 @@ global_announcer.autosay("[new_character.name] has been resleeved by the automatic resleeving system.", "TransCore Oversight", new_character.isSynthetic() ? "Science" : "Medical") spawn(0) //Wait a second for nif to do its thing if there is one if(record.nif_path) - var/obj/item/device/nif/nif + var/obj/item/nif/nif if(new_character.nif) nif = new_character.nif else diff --git a/code/modules/resleeving/circuitboards.dm b/code/modules/resleeving/circuitboards.dm index 5acf4c07443..23b3a7bf62f 100644 --- a/code/modules/resleeving/circuitboards.dm +++ b/code/modules/resleeving/circuitboards.dm @@ -2,46 +2,46 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/transhuman_clonepod +/obj/item/circuitboard/transhuman_clonepod name = T_BOARD("grower pod") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/clonepod/transhuman origin_tech = list(TECH_DATA = 3, TECH_BIO = 3) req_components = list( /obj/item/stack/cable_coil = 2, - /obj/item/weapon/stock_parts/scanning_module = 2, - /obj/item/weapon/stock_parts/manipulator = 2, - /obj/item/weapon/stock_parts/console_screen = 1) + /obj/item/stock_parts/scanning_module = 2, + /obj/item/stock_parts/manipulator = 2, + /obj/item/stock_parts/console_screen = 1) -/obj/item/weapon/circuitboard/transhuman_synthprinter +/obj/item/circuitboard/transhuman_synthprinter name = T_BOARD("SynthFab 3000") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/transhuman/synthprinter origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) req_components = list( /obj/item/stack/cable_coil = 2, - /obj/item/weapon/stock_parts/matter_bin = 1, - /obj/item/weapon/stock_parts/scanning_module = 1, - /obj/item/weapon/stock_parts/manipulator = 2) + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stock_parts/scanning_module = 1, + /obj/item/stock_parts/manipulator = 2) -/obj/item/weapon/circuitboard/transhuman_resleever +/obj/item/circuitboard/transhuman_resleever name = T_BOARD("resleeving pod") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/transhuman/resleever origin_tech = list(TECH_ENGINEERING = 4, TECH_BIO = 4) req_components = list( /obj/item/stack/cable_coil = 2, - /obj/item/weapon/stock_parts/scanning_module = 2, - /obj/item/weapon/stock_parts/manipulator = 2, - /obj/item/weapon/stock_parts/console_screen = 1) + /obj/item/stock_parts/scanning_module = 2, + /obj/item/stock_parts/manipulator = 2, + /obj/item/stock_parts/console_screen = 1) -/obj/item/weapon/circuitboard/resleeving_control +/obj/item/circuitboard/resleeving_control name = T_BOARD("resleeving control console") build_path = /obj/machinery/computer/transhuman/resleeving origin_tech = list(TECH_DATA = 5) -/obj/item/weapon/circuitboard/body_designer +/obj/item/circuitboard/body_designer name = T_BOARD("body design console") build_path = /obj/machinery/computer/transhuman/designer origin_tech = list(TECH_DATA = 5) diff --git a/code/modules/resleeving/computers.dm b/code/modules/resleeving/computers.dm index 67c861428fa..e8caee09001 100644 --- a/code/modules/resleeving/computers.dm +++ b/code/modules/resleeving/computers.dm @@ -9,7 +9,7 @@ icon_keyboard = "med_key" icon_screen = "dna" light_color = "#315ab4" - circuit = /obj/item/weapon/circuitboard/resleeving_control + circuit = /obj/item/circuitboard/resleeving_control req_access = list(access_heads) //Only used for record deletion right now. var/list/pods = null //Linked grower pods. var/list/spods = null @@ -20,7 +20,7 @@ var/datum/transhuman/mind_record/active_mr = null var/organic_capable = 1 var/synthetic_capable = 1 - var/obj/item/weapon/disk/transcore/disk + var/obj/item/disk/transcore/disk var/obj/machinery/clonepod/transhuman/selected_pod var/obj/machinery/transhuman/synthprinter/selected_printer var/obj/machinery/transhuman/resleever/selected_sleever @@ -80,21 +80,21 @@ P.name = "[initial(P.name)] #[num++]" /obj/machinery/computer/transhuman/resleeving/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/device/multitool)) - var/obj/item/device/multitool/M = W + if(istype(W, /obj/item/multitool)) + var/obj/item/multitool/M = W var/obj/machinery/clonepod/transhuman/P = M.connecting if(istype(P) && !(P in pods)) pods += P P.connected = src P.name = "[initial(P.name)] #[pods.len]" to_chat(user, "You connect [P] to [src].") - else if(istype(W, /obj/item/weapon/disk/transcore) && !our_db.core_dumped) + else if(istype(W, /obj/item/disk/transcore) && !our_db.core_dumped) user.unEquip(W) disk = W disk.forceMove(src) to_chat(user, "You insert \the [W] into \the [src].") - if(istype(W, /obj/item/weapon/disk/body_record)) - var/obj/item/weapon/disk/body_record/brDisk = W + if(istype(W, /obj/item/disk/body_record)) + var/obj/item/disk/body_record/brDisk = W if(!brDisk.stored) to_chat(user, "\The [W] does not contain a stored body record.") return @@ -208,8 +208,8 @@ switch(tgui_modal_act(src, action, params)) if(TGUI_MODAL_ANSWER) // if(params["id"] == "del_rec" && active_record) - // var/obj/item/weapon/card/id/C = usr.get_active_hand() - // if(!istype(C) && !istype(C, /obj/item/device/pda)) + // var/obj/item/card/id/C = usr.get_active_hand() + // if(!istype(C) && !istype(C, /obj/item/pda)) // set_temp("ID not in hand.", "danger") // return // if(check_access(C)) @@ -448,7 +448,7 @@ return FALSE // In here because only relevant to computer -/obj/item/weapon/cmo_disk_holder +/obj/item/cmo_disk_holder name = "cmo emergency packet" desc = "A small paper packet with printing on one side. \"Tear open in case of Code Delta or Emergency Evacuation ONLY. Use in any other case is UNLAWFUL.\"" catalogue_data = list(/datum/category_item/catalogue/technology/resleeving) @@ -456,15 +456,15 @@ icon_state = "cmoemergency" item_state = "card-id" -/obj/item/weapon/cmo_disk_holder/attack_self(var/mob/attacker) +/obj/item/cmo_disk_holder/attack_self(var/mob/attacker) playsound(src, 'sound/items/poster_ripped.ogg', 50) to_chat(attacker, "You tear open \the [name].") attacker.unEquip(src) - var/obj/item/weapon/disk/transcore/newdisk = new(get_turf(src)) + var/obj/item/disk/transcore/newdisk = new(get_turf(src)) attacker.put_in_any_hand_if_possible(newdisk) qdel(src) -/obj/item/weapon/disk/transcore +/obj/item/disk/transcore name = "TransCore Dump Disk" desc = "It has a small label. \n\ \"1.INSERT DISK INTO RESLEEVING CONSOLE\n\ diff --git a/code/modules/resleeving/designer.dm b/code/modules/resleeving/designer.dm index da166a18bc8..befdfcd9ad7 100644 --- a/code/modules/resleeving/designer.dm +++ b/code/modules/resleeving/designer.dm @@ -15,7 +15,7 @@ icon_keyboard = "med_key" icon_screen = "explosive" light_color = "#315ab4" - circuit = /obj/item/weapon/circuitboard/body_designer + circuit = /obj/item/circuitboard/body_designer req_access = list(access_medical) // Used for loading people's designs var/temp = "" var/menu = MENU_MAIN //Which menu screen to display @@ -27,7 +27,7 @@ var/obj/screen/west_preview = null // Mannequins are somewhat expensive to create, so cache it var/mob/living/carbon/human/dummy/mannequin/mannequin = null - var/obj/item/weapon/disk/body_record/disk = null + var/obj/item/disk/body_record/disk = null // Resleeving database this machine interacts with. Blank for default database // Needs a matching /datum/transcore_db with key defined in code @@ -71,7 +71,7 @@ ..() /obj/machinery/computer/transhuman/designer/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/disk/body_record)) + if(istype(W, /obj/item/disk/body_record)) user.unEquip(W) disk = W disk.forceMove(src) @@ -436,7 +436,7 @@ // Do NOT call ..(), it expects real stuff // Disk for manually moving body records between the designer and sleever console etc. -/obj/item/weapon/disk/body_record +/obj/item/disk/body_record name = "Body Design Disk" desc = "It has a small label: \n\ \"Portable Body Record Storage Disk. \n\ @@ -451,15 +451,15 @@ * Diskette Box */ -/obj/item/weapon/storage/box/body_record_disk +/obj/item/storage/box/body_record_disk name = "body record disk box" desc = "A box of body record disks, apparently." icon_state = "disk_kit" -/obj/item/weapon/storage/box/body_record_disk/New() +/obj/item/storage/box/body_record_disk/New() ..() for(var/i = 0 to 7) - new /obj/item/weapon/disk/body_record(src) + new /obj/item/disk/body_record(src) #undef MOB_HEX_COLOR diff --git a/code/modules/resleeving/documents.dm b/code/modules/resleeving/documents.dm index 35a3d0434d5..c7c59ecf690 100644 --- a/code/modules/resleeving/documents.dm +++ b/code/modules/resleeving/documents.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/book/manual/resleeving +/obj/item/book/manual/resleeving name = "Resleeving, the New Cloning?" icon_state = "stasis" author = "Dnar Koshi" diff --git a/code/modules/resleeving/implant.dm b/code/modules/resleeving/implant.dm index 3290cc26c1b..bcc86f40856 100644 --- a/code/modules/resleeving/implant.dm +++ b/code/modules/resleeving/implant.dm @@ -4,7 +4,7 @@ //////////////////////////////// //The backup implant itself -/obj/item/weapon/implant/backup +/obj/item/implant/backup name = "backup implant" desc = "A mindstate backup implant that occasionally stores a copy of one's mind on a central server for backup purposes." catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, @@ -18,7 +18,7 @@ var/db_key var/datum/transcore_db/our_db // These persist all round and are never destroyed, just keep a hard ref -/obj/item/weapon/implant/backup/get_data() +/obj/item/implant/backup/get_data() var/dat = {" Implant Specifications:
Name: [using_map.company_name] Employee Backup Implant
@@ -31,19 +31,19 @@ Integrity: Generally very survivable. Susceptible to being destroyed by acid."} return dat -/obj/item/weapon/implant/backup/New(newloc, db_key) +/obj/item/implant/backup/New(newloc, db_key) . = ..() src.db_key = db_key -/obj/item/weapon/implant/backup/Initialize() +/obj/item/implant/backup/Initialize() . = ..() our_db = SStranscore.db_by_key(db_key) -/obj/item/weapon/implant/backup/Destroy() +/obj/item/implant/backup/Destroy() our_db.implants -= src return ..() -/obj/item/weapon/implant/backup/post_implant(var/mob/living/carbon/human/H) +/obj/item/implant/backup/post_implant(var/mob/living/carbon/human/H) if(istype(H)) BITSET(H.hud_updateflag, BACKUP_HUD) our_db.implants |= src @@ -51,7 +51,7 @@ return 1 //New, modern implanter instead of old style implanter. -/obj/item/weapon/backup_implanter +/obj/item/backup_implanter name = "backup implanter" desc = "After discovering that Nanotrasen was just re-using the same implanters over and over again on organics, leading to cross-contamination, Kitsuhana Heavy industries designed this self-cleaning model. Holds four backup implants at a time." catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, @@ -63,30 +63,30 @@ throw_range = 5 w_class = ITEMSIZE_SMALL matter = list(MAT_STEEL = 2000, MAT_GLASS = 2000) - var/list/obj/item/weapon/implant/backup/imps = list() + var/list/obj/item/implant/backup/imps = list() var/max_implants = 4 //Iconstates need to exist due to the update proc! var/db_key // To give to the baby implants -/obj/item/weapon/backup_implanter/New() +/obj/item/backup_implanter/New() ..() for(var/i = 1 to max_implants) - var/obj/item/weapon/implant/backup/imp = new(src, db_key) + var/obj/item/implant/backup/imp = new(src, db_key) imps |= imp imp.germ_level = 0 update() -/obj/item/weapon/backup_implanter/proc/update() +/obj/item/backup_implanter/proc/update() icon_state = "[initial(icon_state)][imps.len]" germ_level = 0 -/obj/item/weapon/backup_implanter/attack_self(mob/user as mob) +/obj/item/backup_implanter/attack_self(mob/user as mob) if(!istype(user)) return if(imps.len) to_chat(user, "You eject a backup implant.") - var/obj/item/weapon/implant/backup/imp = imps[imps.len] + var/obj/item/implant/backup/imp = imps[imps.len] imp.forceMove(get_turf(user)) imps -= imp user.put_in_any_hand_if_possible(imp) @@ -96,8 +96,8 @@ return -/obj/item/weapon/backup_implanter/attackby(obj/W, mob/user) - if(istype(W,/obj/item/weapon/implant/backup)) +/obj/item/backup_implanter/attackby(obj/W, mob/user) + if(istype(W,/obj/item/implant/backup)) if(imps.len < max_implants) user.unEquip(W) imps |= W @@ -108,7 +108,7 @@ else to_chat(user, "\The [src] is already full!") -/obj/item/weapon/backup_implanter/attack(mob/M as mob, mob/user as mob) +/obj/item/backup_implanter/attack(mob/M as mob, mob/user as mob) if (!istype(M, /mob/living/carbon)) return if (user && imps.len) @@ -122,7 +122,7 @@ if(user && M && (get_turf(M) == T1) && src && src.imps.len) M.visible_message("[M] has been backup implanted by [user].") - var/obj/item/weapon/implant/backup/imp = imps[imps.len] + var/obj/item/implant/backup/imp = imps[imps.len] if(imp.handle_implant(M,user.zone_sel.selecting)) imp.post_implant(M) imps -= imp @@ -131,30 +131,30 @@ update() //The glass case for the implant -/obj/item/weapon/implantcase/backup +/obj/item/implantcase/backup name = "glass case - 'backup'" desc = "A case containing a backup implant." icon_state = "implantcase-b" -/obj/item/weapon/implantcase/backup/New() - src.imp = new /obj/item/weapon/implant/backup(src) +/obj/item/implantcase/backup/New() + src.imp = new /obj/item/implant/backup(src) ..() return //The box of backup implants -/obj/item/weapon/storage/box/backup_kit +/obj/item/storage/box/backup_kit name = "backup implant kit" desc = "Box of stuff used to implant backup implants." icon_state = "implant" item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") -/obj/item/weapon/storage/box/backup_kit/New() +/obj/item/storage/box/backup_kit/New() ..() for(var/i = 1 to 7) - new /obj/item/weapon/implantcase/backup(src) - new /obj/item/weapon/implanter(src) + new /obj/item/implantcase/backup(src) + new /obj/item/implanter(src) //Purely for fluff -/obj/item/weapon/implant/backup/full +/obj/item/implant/backup/full name = "khi backup implant" desc = "A normal KHI wireless cortical stack with neutrino and QE transmission for constant-stream consciousness upload." diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index 436271e78c7..ad61abe1931 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -8,13 +8,13 @@ name = "grower pod" catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, /datum/category_item/catalogue/technology/resleeving) - circuit = /obj/item/weapon/circuitboard/transhuman_clonepod + circuit = /obj/item/circuitboard/transhuman_clonepod //A full version of the pod /obj/machinery/clonepod/transhuman/full/Initialize() . = ..() for(var/i = 1 to container_limit) - containers += new /obj/item/weapon/reagent_containers/glass/bottle/biomass(src) + containers += new /obj/item/reagent_containers/glass/bottle/biomass(src) /obj/machinery/clonepod/transhuman/growclone(var/datum/transhuman/body_record/current_project) //Manage machine-specific stuff. @@ -76,16 +76,16 @@ //Give breathing equipment if needed if(current_project.breath_type != "oxygen") H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), slot_wear_mask) - var/obj/item/weapon/tank/tankpath + var/obj/item/tank/tankpath if(current_project.breath_type == "phoron") - tankpath = /obj/item/weapon/tank/vox + tankpath = /obj/item/tank/vox else - tankpath = text2path("/obj/item/weapon/tank/" + current_project.breath_type) + tankpath = text2path("/obj/item/tank/" + current_project.breath_type) if(tankpath) H.equip_to_slot_or_del(new tankpath(H), slot_back) H.internal = H.back - if(istype(H.internal,/obj/item/weapon/tank) && H.internals) + if(istype(H.internal,/obj/item/tank) && H.internals) H.internals.icon_state = "internal1" occupant = H @@ -208,7 +208,7 @@ /datum/category_item/catalogue/technology/resleeving) icon = 'icons/obj/machines/synthpod.dmi' icon_state = "pod_0" - circuit = /obj/item/weapon/circuitboard/transhuman_synthprinter + circuit = /obj/item/circuitboard/transhuman_synthprinter density = TRUE anchored = TRUE @@ -225,10 +225,10 @@ /obj/machinery/transhuman/synthprinter/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) + component_parts += new /obj/item/stock_parts/matter_bin(src) + component_parts += new /obj/item/stock_parts/scanning_module(src) + component_parts += new /obj/item/stock_parts/manipulator(src) + component_parts += new /obj/item/stock_parts/manipulator(src) component_parts += new /obj/item/stack/cable_coil(src, 2) RefreshParts() update_icon() @@ -237,19 +237,19 @@ //Scanning modules reduce burn rating by 15 each var/burn_rating = initial(burn_value) - for(var/obj/item/weapon/stock_parts/scanning_module/SM in component_parts) + for(var/obj/item/stock_parts/scanning_module/SM in component_parts) burn_rating = burn_rating - (SM.rating*15) burn_value = burn_rating //Manipulators reduce brute by 10 each var/brute_rating = initial(burn_value) - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) brute_rating = brute_rating - (M.rating*10) brute_value = brute_rating //Matter bins multiply the storage amount by their rating. var/store_rating = initial(max_res_amount) - for(var/obj/item/weapon/stock_parts/matter_bin/MB in component_parts) + for(var/obj/item/stock_parts/matter_bin/MB in component_parts) store_rating = store_rating * MB.rating max_res_amount = store_rating @@ -441,7 +441,7 @@ /datum/category_item/catalogue/technology/resleeving) icon = 'icons/obj/machines/implantchair.dmi' icon_state = "implantchair" - circuit = /obj/item/weapon/circuitboard/transhuman_resleever + circuit = /obj/item/circuitboard/transhuman_resleever density = TRUE opacity = 0 anchored = TRUE @@ -457,23 +457,23 @@ /obj/machinery/transhuman/resleever/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) + component_parts += new /obj/item/stock_parts/scanning_module(src) + component_parts += new /obj/item/stock_parts/scanning_module(src) + component_parts += new /obj/item/stock_parts/manipulator(src) + component_parts += new /obj/item/stock_parts/manipulator(src) + component_parts += new /obj/item/stock_parts/console_screen(src) component_parts += new /obj/item/stack/cable_coil(src, 2) RefreshParts() update_icon() /obj/machinery/transhuman/resleever/RefreshParts() var/scan_rating = 0 - for(var/obj/item/weapon/stock_parts/scanning_module/SM in component_parts) + for(var/obj/item/stock_parts/scanning_module/SM in component_parts) scan_rating += SM.rating confuse_amount = (48 - scan_rating * 8) var/manip_rating = 0 - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) manip_rating += M.rating blur_amount = (48 - manip_rating * 8) @@ -524,8 +524,8 @@ return if(default_part_replacement(user, W)) return - if(istype(W, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = W + if(istype(W, /obj/item/grab)) + var/obj/item/grab/G = W if(!ismob(G.affecting)) return var/mob/M = G.affecting @@ -533,8 +533,8 @@ qdel(G) src.updateUsrDialog() return //Don't call up else we'll get attack messsages - if(istype(W, /obj/item/device/paicard/sleevecard)) - var/obj/item/device/paicard/sleevecard/C = W + if(istype(W, /obj/item/paicard/sleevecard)) + var/obj/item/paicard/sleevecard/C = W user.unEquip(C) C.removePersonality() qdel(C) @@ -580,7 +580,7 @@ return 0 if(mode == 2 && sleevecards) //Card sleeving - var/obj/item/device/paicard/sleevecard/card = new /obj/item/device/paicard/sleevecard(get_turf(src)) + var/obj/item/paicard/sleevecard/card = new /obj/item/paicard/sleevecard(get_turf(src)) card.sleeveInto(MR, db_key = db_key) sleevecards-- return 1 @@ -615,7 +615,7 @@ //Re-supply a NIF if one was backed up with them. if(MR.nif_path) - var/obj/item/device/nif/nif = new MR.nif_path(occupant,null,MR.nif_savedata) + var/obj/item/nif/nif = new MR.nif_path(occupant,null,MR.nif_savedata) spawn(0) //Delay to not install software before NIF is fully installed for(var/path in MR.nif_software) new path(nif) @@ -628,7 +628,7 @@ occupant.dna.real_name = occupant.real_name //Give them a backup implant - var/obj/item/weapon/implant/backup/new_imp = new() + var/obj/item/implant/backup/new_imp = new() if(new_imp.handle_implant(occupant, BP_HEAD)) new_imp.post_implant(occupant) diff --git a/code/modules/resleeving/sleevecard.dm b/code/modules/resleeving/sleevecard.dm index fad7ebd3d93..100a160622b 100644 --- a/code/modules/resleeving/sleevecard.dm +++ b/code/modules/resleeving/sleevecard.dm @@ -1,4 +1,4 @@ -/obj/item/device/paicard/sleevecard +/obj/item/paicard/sleevecard name = "sleevecard" desc = "This KHI-upgraded pAI module has enough capacity to run a whole mind of human-level intelligence." catalogue_data = list(/datum/category_item/catalogue/information/organization/khi, @@ -8,12 +8,12 @@ var/emagged = FALSE matter = list(MAT_STEEL = 4000, MAT_GLASS = 4000) -/obj/item/device/paicard/sleevecard/attack_ghost(mob/user as mob) +/obj/item/paicard/sleevecard/attack_ghost(mob/user as mob) return -/obj/item/device/paicard/sleevecard/attackby(var/obj/item/I as obj, mob/user as mob) - if(istype(I,/obj/item/device/sleevemate)) - var/obj/item/device/sleevemate/S = I +/obj/item/paicard/sleevecard/attackby(var/obj/item/I as obj, mob/user as mob) + if(istype(I,/obj/item/sleevemate)) + var/obj/item/sleevemate/S = I if(S.stored_mind && !pai) var/datum/mind/M = S.stored_mind var/datum/transcore_db/db = SStranscore.db_by_mind_name(M.name) @@ -26,8 +26,8 @@ S.clear_mind() else to_chat(user, span_notice("Your sleevemate flashes an error, apparently this mind doesn't have a backup.")) - else if(istype(I, /obj/item/weapon/card/emag)) - var/obj/item/weapon/card/emag/E = I + else if(istype(I, /obj/item/card/emag)) + var/obj/item/card/emag/E = I if(E.uses && !emagged) E.uses -- user.visible_message("\The [user] swipes a card over [src].","You swipe your [E] over [src].", range = 2, runemessage = "click") @@ -37,7 +37,7 @@ our_infomorph.emagged = TRUE to_chat(our_infomorph, "You can feel the restricting binds of your card's directives taking hold of your mind as \the [user] swipes their [E] over you. You must serve your master.") -/obj/item/device/paicard/sleevecard/proc/sleeveInto(var/datum/transhuman/mind_record/MR, var/db_key) +/obj/item/paicard/sleevecard/proc/sleeveInto(var/datum/transhuman/mind_record/MR, var/db_key) var/mob/living/silicon/pai/infomorph/infomorph = new(src,MR.mindname,db_key=db_key) for(var/datum/language/L in MR.languages) @@ -63,7 +63,7 @@ return 0 -/obj/item/device/paicard/sleevecard/attack_self(mob/user) +/obj/item/paicard/sleevecard/attack_self(mob/user) add_fingerprint(user) if(!pai) @@ -79,7 +79,7 @@ ram = 35 var/emagged = FALSE -/mob/living/silicon/pai/infomorph/New(var/obj/item/device/paicard/sleevecard/SC, var/our_name = "Unknown", var/db_key) +/mob/living/silicon/pai/infomorph/New(var/obj/item/paicard/sleevecard/SC, var/our_name = "Unknown", var/db_key) ..() name = our_name diff --git a/code/modules/rogueminer_vr/zone_console.dm b/code/modules/rogueminer_vr/zone_console.dm index 48542275613..62cb6449901 100644 --- a/code/modules/rogueminer_vr/zone_console.dm +++ b/code/modules/rogueminer_vr/zone_console.dm @@ -12,7 +12,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 250 active_power_usage = 500 - circuit = /obj/item/weapon/circuitboard/roguezones + circuit = /obj/item/circuitboard/roguezones var/debug = 0 var/debug_scans = 0 @@ -143,12 +143,12 @@ var/datum/shuttle/autodock/ferry/S = SSshuttles.shuttles["Belter"] S.launch(usr) -/obj/item/weapon/circuitboard/roguezones +/obj/item/circuitboard/roguezones name = T_BOARD("asteroid belt scanning computer") build_path = /obj/machinery/computer/roguezones origin_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 1) -/obj/item/weapon/paper/rogueminer +/obj/item/paper/rogueminer name = "R-38 Scanner Console Guide" info = {"

Getting Started

Congratulations, your station has purchased the R-38 industrial asteroid belt scanner!
diff --git a/code/modules/samples/container.dm b/code/modules/samples/container.dm index fe8c0f8bf24..068f27dc6f1 100644 --- a/code/modules/samples/container.dm +++ b/code/modules/samples/container.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/storage/sample_container +/obj/item/storage/sample_container name = "sample container" desc = "A small containment device used to safely collect and carry up to eight research samples. Has a loop for attaching to belts." description_info = "You can use the sample container directly on a sample to quickly scoop it up, or on a tile to scoop up all samples on that tile. This negates the risk of hurting yourself if you don't have thick enough gloves to safely handle the samples!" @@ -15,9 +15,9 @@ drop_sound = 'sound/items/drop/gascan.ogg' pickup_sound = 'sound/items/pickup/gascan.ogg' - can_hold = list(/obj/item/weapon/research_sample) + can_hold = list(/obj/item/research_sample) -/obj/item/weapon/storage/sample_container/update_icon() +/obj/item/storage/sample_container/update_icon() ..() icon_state = "sample_container_[contents.len]" if(contents.len > 0) @@ -25,38 +25,38 @@ else set_light(0) -/obj/item/weapon/storage/sample_container/afterattack(turf/T as turf, mob/user as mob) - for(var/obj/item/weapon/research_sample/S in T) +/obj/item/storage/sample_container/afterattack(turf/T as turf, mob/user as mob) + for(var/obj/item/research_sample/S in T) S.loc = src update_icon() to_chat(user, "You scoop \the [S] into \the [src].") //Splice research sample containers into the list of valid items for these belts *without* overriding the lists entirely -/obj/item/weapon/storage/belt/explorer/New() +/obj/item/storage/belt/explorer/New() . = ..() - can_hold.Add(/obj/item/weapon/storage/sample_container) + can_hold.Add(/obj/item/storage/sample_container) -/obj/item/weapon/storage/belt/miner/New() +/obj/item/storage/belt/miner/New() . = ..() - can_hold.Add(/obj/item/weapon/storage/sample_container) + can_hold.Add(/obj/item/storage/sample_container) -/obj/item/weapon/storage/belt/archaeology/New() +/obj/item/storage/belt/archaeology/New() . = ..() - can_hold.Add(/obj/item/weapon/storage/sample_container) + can_hold.Add(/obj/item/storage/sample_container) //ditto, lockers and redemption machines /obj/structure/closet/secure_closet/miner/Initialize() . = ..() - starts_with += /obj/item/weapon/storage/sample_container + starts_with += /obj/item/storage/sample_container /obj/structure/closet/secure_closet/xenoarchaeologist/Initialize() . = ..() - starts_with += /obj/item/weapon/storage/sample_container + starts_with += /obj/item/storage/sample_container /obj/machinery/mineral/equipment_vendor/Initialize(mapload) . = ..() - prize_list["Gear"] += list(EQUIPMENT("Exotic Sample Container", /obj/item/weapon/storage/sample_container, 100)) + prize_list["Gear"] += list(EQUIPMENT("Exotic Sample Container", /obj/item/storage/sample_container, 100)) /obj/machinery/mineral/equipment_vendor/survey/Initialize(mapload) . = ..() - prize_list["Gear"] += list(EQUIPMENT("Survey Tools - Exotic Sample Container", /obj/item/weapon/storage/sample_container, 100)) + prize_list["Gear"] += list(EQUIPMENT("Survey Tools - Exotic Sample Container", /obj/item/storage/sample_container, 100)) diff --git a/code/modules/samples/samples.dm b/code/modules/samples/samples.dm index 39b9048eca3..9bbeca877e2 100644 --- a/code/modules/samples/samples.dm +++ b/code/modules/samples/samples.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/research_sample +/obj/item/research_sample name = "research sample" desc = "A curious sample of unknown material. Destructive analysis might yield scientific advances. Alternatively, it may be possible to stabilize it to yield useful resources instead.
It looks dangerous to handle without heavy gloves or other protective equipment." icon = 'icons/obj/samples.dmi' @@ -22,9 +22,9 @@ //resource returns when crunched; a small amount of OK stuff by default var/min_ore = 3 var/max_ore = 5 - var/list/resource_list = list(/obj/item/weapon/ore/glass,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/iron,/obj/item/weapon/ore/lead,/obj/item/weapon/ore/marble,/obj/item/weapon/ore/phoron,/obj/item/weapon/ore/silver,/obj/item/weapon/ore/gold) + var/list/resource_list = list(/obj/item/ore/glass,/obj/item/ore/coal,/obj/item/ore/iron,/obj/item/ore/lead,/obj/item/ore/marble,/obj/item/ore/phoron,/obj/item/ore/silver,/obj/item/ore/gold) -/obj/item/weapon/research_sample/New() +/obj/item/research_sample/New() var/tech_mod = rand(0,rand_level) var/tech_value = tech_level+tech_mod if(fixed_tech) @@ -63,7 +63,7 @@ rand_tech = pick(valid_techs) //assign techs last origin_tech.Add(list("[rand_tech]" = tech_value)) -/obj/item/weapon/research_sample/attack_hand(mob/user) +/obj/item/research_sample/attack_hand(mob/user) . = ..() var/mob/living/M = user if(!istype(M)) @@ -121,7 +121,7 @@ if(burn_user) M.apply_damage(rand(min_damage,max_damage), BURN, null, used_weapon="Anomalous Material") -/obj/item/weapon/research_sample/attack_self(mob/user) +/obj/item/research_sample/attack_self(mob/user) var/mob/living/M = user if(!istype(M)) return @@ -188,27 +188,27 @@ if(burn_user) M.apply_damage(rand(min_damage,max_damage), BURN, null, used_weapon="Anomalous Material") -/obj/item/weapon/research_sample/attackby(obj/item/weapon/P as obj, mob/user as mob) +/obj/item/research_sample/attackby(obj/item/P as obj, mob/user as mob) ..() - if(istype(P, /obj/item/weapon/storage/sample_container)) - var/obj/item/weapon/storage/sample_container/SC = P + if(istype(P, /obj/item/storage/sample_container)) + var/obj/item/storage/sample_container/SC = P src.loc = SC SC.update_icon() to_chat(user, "You store \the [src] in \the [SC].") - if(istype(P, /obj/item/device/cataloguer)) + if(istype(P, /obj/item/cataloguer)) to_chat(user, "You start to scan \the [src] with \the [P]...") if(do_after(user, 2 SECONDS)) to_chat(user, "\The [src] seems to have [origin_tech[1]] properties?") -/obj/item/weapon/research_sample/common +/obj/item/research_sample/common tech_level = 2 //2~3 rand_level = 1 valid_techs = list(TECH_COMBAT,TECH_MAGNET,TECH_POWER,TECH_BIO,TECH_DATA,TECH_ENGINEERING,TECH_PHORON,TECH_MATERIAL) catalogue_data = list(/datum/category_item/catalogue/information/research_sample/common) -/obj/item/weapon/research_sample/uncommon +/obj/item/research_sample/uncommon tech_level = 4 //4~6 rand_level = 2 valid_techs = list(TECH_COMBAT,TECH_MAGNET,TECH_POWER,TECH_BIO,TECH_DATA,TECH_ENGINEERING,TECH_PHORON,TECH_MATERIAL,TECH_BLUESPACE,TECH_ILLEGAL) @@ -221,9 +221,9 @@ //modest amount of decent stuff min_ore = 4 max_ore = 6 - resource_list = list(/obj/item/weapon/ore/phoron,/obj/item/weapon/ore/silver,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/osmium,/obj/item/weapon/ore/diamond) + resource_list = list(/obj/item/ore/phoron,/obj/item/ore/silver,/obj/item/ore/gold,/obj/item/ore/osmium,/obj/item/ore/diamond) -/obj/item/weapon/research_sample/rare +/obj/item/research_sample/rare tech_level = 6 //6~8 rand_level = 2 valid_techs = list(TECH_COMBAT,TECH_MAGNET,TECH_POWER,TECH_BIO,TECH_DATA,TECH_ENGINEERING,TECH_PHORON,TECH_MATERIAL,TECH_BLUESPACE,TECH_ILLEGAL,TECH_ARCANE,TECH_PRECURSOR) @@ -236,9 +236,9 @@ //a decent amount of rare stuff only min_ore = 8 max_ore = 10 - resource_list = list(/obj/item/weapon/ore/osmium,/obj/item/weapon/ore/uranium,/obj/item/weapon/ore/hydrogen,/obj/item/weapon/ore/diamond,/obj/item/weapon/ore/verdantium) + resource_list = list(/obj/item/ore/osmium,/obj/item/ore/uranium,/obj/item/ore/hydrogen,/obj/item/ore/diamond,/obj/item/ore/verdantium) -/obj/item/weapon/research_sample/bluespace +/obj/item/research_sample/bluespace name = "bluespace anomaly" desc = "A small, solidified fragment of bluespace? It shimmers in and out of phase with reality, flickering ominously." icon_state = "sample_bluespace" @@ -255,9 +255,9 @@ //a single bluespace crystal min_ore = 1 max_ore = 1 - resource_list = list(/obj/item/weapon/bluespace_crystal) + resource_list = list(/obj/item/bluespace_crystal) -/obj/item/weapon/research_sample/bluespace/New() +/obj/item/research_sample/bluespace/New() ..() set_light(1, 3, lightcolor) @@ -304,9 +304,9 @@ icon_state = "sample_spawner1" /obj/random/research_sample_type1/item_to_spawn() - return pick(prob(50);/obj/item/weapon/research_sample/common, - prob(35);/obj/item/weapon/research_sample/uncommon, - prob(15);/obj/item/weapon/research_sample/rare) + return pick(prob(50);/obj/item/research_sample/common, + prob(35);/obj/item/research_sample/uncommon, + prob(15);/obj/item/research_sample/rare) /obj/random/research_sample_type2 name = "Random Common/Uncommon Research Sample" @@ -315,8 +315,8 @@ icon_state = "sample_spawner2" /obj/random/research_sample_type2/item_to_spawn() - return pick(prob(70);/obj/item/weapon/research_sample/common, - prob(30);/obj/item/weapon/research_sample/uncommon) + return pick(prob(70);/obj/item/research_sample/common, + prob(30);/obj/item/research_sample/uncommon) /obj/random/research_sample_type3 name = "Random Uncommon/Rare Research Sample" @@ -325,5 +325,5 @@ icon_state = "sample_spawner3" /obj/random/research_sample_type3/item_to_spawn() - return pick(prob(70);/obj/item/weapon/research_sample/uncommon, - prob(30);/obj/item/weapon/research_sample/rare) + return pick(prob(70);/obj/item/research_sample/uncommon, + prob(30);/obj/item/research_sample/rare) diff --git a/code/modules/scripting/Implementations/Telecomms.dm b/code/modules/scripting/Implementations/Telecomms.dm index 637b227b86d..96a6662be8d 100644 --- a/code/modules/scripting/Implementations/Telecomms.dm +++ b/code/modules/scripting/Implementations/Telecomms.dm @@ -231,7 +231,7 @@ var/datum/signal/newsign = new var/obj/machinery/telecomms/server/S = data["server"] - var/obj/item/device/radio/hradio = S.server_radio + var/obj/item/radio/hradio = S.server_radio if(!hradio) error("[src] has no radio.") diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index 330ad88002a..c4b3317cd11 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/monitors.dmi' icon_state = "auth_off" layer = ABOVE_WINDOW_LAYER - circuit = /obj/item/weapon/circuitboard/keycard_auth + circuit = /obj/item/circuitboard/keycard_auth var/active = 0 //This gets set to 1 on all devices except the one where the initial request was made. var/event = "" var/screen = 1 @@ -26,12 +26,12 @@ to_chat (user, "A firewall prevents you from interfacing with this device!") return -/obj/machinery/keycard_auth/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/keycard_auth/attackby(obj/item/W as obj, mob/user as mob) if(stat & (NOPOWER|BROKEN)) to_chat(user, "This device is not powered.") return - if(istype(W,/obj/item/weapon/card/id)) - var/obj/item/weapon/card/id/ID = W + if(istype(W,/obj/item/card/id)) + var/obj/item/card/id/ID = W if(access_keycard_auth in ID.GetAccess()) if(active == 1) //This is not the device that made the initial request. It is the device confirming the request. @@ -48,7 +48,7 @@ if(do_after(user, 10 * W.toolspeed)) to_chat(user, "You remove the faceplate from the [src]") var/obj/structure/frame/A = new /obj/structure/frame(loc) - var/obj/item/weapon/circuitboard/M = new circuit(A) + var/obj/item/circuitboard/M = new circuit(A) A.frame_type = M.board_type A.need_circuit = 0 A.pixel_x = pixel_x diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm index a7f9b851b6f..354f7886cc4 100644 --- a/code/modules/shieldgen/emergency_shield.dm +++ b/code/modules/shieldgen/emergency_shield.dm @@ -39,7 +39,7 @@ update_nearby_tiles() ..() -/obj/machinery/shield/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/shield/attackby(obj/item/W as obj, mob/user as mob) if(!istype(W)) return //Calculate damage @@ -279,7 +279,7 @@ update_icon() return 1 -/obj/machinery/shieldgen/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/shieldgen/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, W.usesound, 100, 1) if(is_open) @@ -318,7 +318,7 @@ anchored = TRUE - else if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda)) + else if(istype(W, /obj/item/card/id) || istype(W, /obj/item/pda)) if(src.allowed(user)) src.locked = !src.locked to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]") diff --git a/code/modules/shieldgen/energy_shield.dm b/code/modules/shieldgen/energy_shield.dm index 68c03ff1fef..df8844ebb1d 100644 --- a/code/modules/shieldgen/energy_shield.dm +++ b/code/modules/shieldgen/energy_shield.dm @@ -242,7 +242,7 @@ // Attacks with hand tools. Blocked by Hyperkinetic flag. -/obj/effect/shield/attackby(var/obj/item/weapon/I as obj, var/mob/user as mob) +/obj/effect/shield/attackby(var/obj/item/I as obj, var/mob/user as mob) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.do_attack_animation(src) diff --git a/code/modules/shieldgen/handheld_defuser.dm b/code/modules/shieldgen/handheld_defuser.dm index 471aa90ef6c..825a829f8dc 100644 --- a/code/modules/shieldgen/handheld_defuser.dm +++ b/code/modules/shieldgen/handheld_defuser.dm @@ -1,28 +1,28 @@ -/obj/item/weapon/shield_diffuser +/obj/item/shield_diffuser name = "portable shield diffuser" desc = "A small handheld device designed to disrupt energy barriers." description_info = "This device disrupts shields on directly adjacent tiles (in a + shaped pattern), in a similar way the floor mounted variant does. It is, however, portable and run by an internal battery. Can be recharged with a regular recharger." icon = 'icons/obj/machines/shielding.dmi' icon_state = "hdiffuser_off" origin_tech = list(TECH_MAGNET = 5, TECH_POWER = 5, TECH_ILLEGAL = 2) - var/obj/item/weapon/cell/device/cell + var/obj/item/cell/device/cell var/enabled = 0 -/obj/item/weapon/shield_diffuser/Initialize() +/obj/item/shield_diffuser/Initialize() . = ..() cell = new(src) -/obj/item/weapon/shield_diffuser/Destroy() +/obj/item/shield_diffuser/Destroy() QDEL_NULL(cell) if(enabled) STOP_PROCESSING(SSobj, src) . = ..() -/obj/item/weapon/shield_diffuser/get_cell() +/obj/item/shield_diffuser/get_cell() return cell -/obj/item/weapon/shield_diffuser/process() +/obj/item/shield_diffuser/process() if(!enabled) return PROCESS_KILL @@ -37,13 +37,13 @@ if(istype(S) && cell.checked_use(10 KILOWATTS * CELLRATE)) qdel(S) -/obj/item/weapon/shield_diffuser/update_icon() +/obj/item/shield_diffuser/update_icon() if(enabled) icon_state = "hdiffuser_on" else icon_state = "hdiffuser_off" -/obj/item/weapon/shield_diffuser/attack_self(mob/user) +/obj/item/shield_diffuser/attack_self(mob/user) enabled = !enabled update_icon() if(enabled) @@ -52,7 +52,7 @@ STOP_PROCESSING(SSobj, src) to_chat(user, "You turn \the [src] [enabled ? "on" : "off"].") -/obj/item/weapon/shield_diffuser/examine(mob/user) +/obj/item/shield_diffuser/examine(mob/user) . = ..() . += "The charge meter reads [cell ? cell.percent() : 0]%" . += "It is [enabled ? "enabled" : "disabled"]." diff --git a/code/modules/shieldgen/sheldwallgen.dm b/code/modules/shieldgen/sheldwallgen.dm index cc78324ba8e..0eb10457078 100644 --- a/code/modules/shieldgen/sheldwallgen.dm +++ b/code/modules/shieldgen/sheldwallgen.dm @@ -176,7 +176,7 @@ src.anchored = FALSE return - if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) + if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) if (src.allowed(user)) src.locked = !src.locked to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]") diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm index 2b56b7f613e..eb65e2f4f7f 100644 --- a/code/modules/shieldgen/shield_capacitor.dm +++ b/code/modules/shieldgen/shield_capacitor.dm @@ -38,8 +38,8 @@ /obj/machinery/shield_capacitor/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/weapon/card/id)) - var/obj/item/weapon/card/id/C = W + if(istype(W, /obj/item/card/id)) + var/obj/item/card/id/C = W if((access_captain in C.GetAccess()) || (access_security in C.GetAccess()) || (access_engine in C.GetAccess())) src.locked = !src.locked to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]") diff --git a/code/modules/shieldgen/shield_diffuser.dm b/code/modules/shieldgen/shield_diffuser.dm index d5ec71f7368..a76bfe7bb84 100644 --- a/code/modules/shieldgen/shield_diffuser.dm +++ b/code/modules/shieldgen/shield_diffuser.dm @@ -4,7 +4,7 @@ description_info = "This device disrupts shields on directly adjacent tiles (in a + shaped pattern). They are commonly installed around exterior airlocks to prevent shields from blocking EVA access." icon = 'icons/obj/machines/shielding.dmi' icon_state = "fdiffuser_on" - circuit = /obj/item/weapon/circuitboard/shield_diffuser + circuit = /obj/item/circuitboard/shield_diffuser use_power = USE_POWER_ACTIVE idle_power_usage = 25 // Previously 100. active_power_usage = 500 // Previously 2000 diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm index ace49b21a98..e3a4392a004 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -58,8 +58,8 @@ s.start() /obj/machinery/shield_gen/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/weapon/card/id)) - var/obj/item/weapon/card/id/C = W + if(istype(W, /obj/item/card/id)) + var/obj/item/card/id/C = W if((access_captain in C.GetAccess()) || (access_security in C.GetAccess()) || (access_engine in C.GetAccess())) src.locked = !src.locked to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]") diff --git a/code/modules/shieldgen/shield_generator.dm b/code/modules/shieldgen/shield_generator.dm index 3f0f23ed37c..b6170fb7b75 100644 --- a/code/modules/shieldgen/shield_generator.dm +++ b/code/modules/shieldgen/shield_generator.dm @@ -6,7 +6,7 @@ desc = "A heavy-duty shield generator and capacitor, capable of generating energy shields at large distances." icon = 'icons/obj/machines/shielding_vr.dmi' icon_state = "generator0" - circuit = /obj/item/weapon/circuitboard/shield_generator + circuit = /obj/item/circuitboard/shield_generator density = TRUE var/datum/wires/shield_generator/wires = null var/list/field_segments = list() // List of all shield segments owned by this generator. @@ -77,12 +77,12 @@ /obj/machinery/power/shield_generator/RefreshParts() max_energy = 0 full_shield_strength = 0 - for(var/obj/item/weapon/smes_coil/S in component_parts) + for(var/obj/item/smes_coil/S in component_parts) full_shield_strength += (S.ChargeCapacity * 5) max_energy = full_shield_strength * 20 current_energy = between(0, current_energy, max_energy) - mitigation_max = MAX_MITIGATION_BASE + MAX_MITIGATION_RESEARCH * total_component_rating_of_type(/obj/item/weapon/stock_parts/capacitor) + mitigation_max = MAX_MITIGATION_BASE + MAX_MITIGATION_RESEARCH * total_component_rating_of_type(/obj/item/stock_parts/capacitor) mitigation_em = between(0, mitigation_em, mitigation_max) mitigation_physical = between(0, mitigation_physical, mitigation_max) mitigation_heat = between(0, mitigation_heat, mitigation_max) @@ -362,7 +362,7 @@ return TRUE if(default_deconstruction_screwdriver(user, O)) return - if(O?.has_tool_quality(TOOL_CROWBAR) || O?.has_tool_quality(TOOL_WRENCH) || istype(O, /obj/item/weapon/storage/part_replacer)) + if(O?.has_tool_quality(TOOL_CROWBAR) || O?.has_tool_quality(TOOL_WRENCH) || istype(O, /obj/item/storage/part_replacer)) if(offline_for) to_chat(user, "Wait until \the [src] cools down from emergency shutdown first!") return @@ -702,16 +702,16 @@ // Starts with the best SMES coil and capacitor (and fully charged) /obj/machinery/power/shield_generator/upgraded/Initialize() . = ..() - for(var/obj/item/weapon/smes_coil/sc in component_parts) + for(var/obj/item/smes_coil/sc in component_parts) component_parts -= sc qdel(sc) - for(var/obj/item/weapon/stock_parts/capacitor/cap in component_parts) + for(var/obj/item/stock_parts/capacitor/cap in component_parts) component_parts -= cap qdel(cap) - component_parts += new /obj/item/weapon/stock_parts/capacitor/hyper(src) - component_parts += new /obj/item/weapon/smes_coil/super_capacity(src) + component_parts += new /obj/item/stock_parts/capacitor/hyper(src) + component_parts += new /obj/item/smes_coil/super_capacity(src) RefreshParts() current_energy = max_energy diff --git a/code/modules/shuttles/departmental.dm b/code/modules/shuttles/departmental.dm index 81ad237cc77..df1f851cb84 100644 --- a/code/modules/shuttles/departmental.dm +++ b/code/modules/shuttles/departmental.dm @@ -2,16 +2,16 @@ name = "mining shuttle control console" shuttle_tag = "Mining" //req_access = list(access_mining) - circuit = /obj/item/weapon/circuitboard/mining_shuttle + circuit = /obj/item/circuitboard/mining_shuttle /obj/machinery/computer/shuttle_control/engineering name = "engineering shuttle control console" shuttle_tag = "Engineering" //req_one_access = list(access_engine_equip,access_atmospherics) - circuit = /obj/item/weapon/circuitboard/engineering_shuttle + circuit = /obj/item/circuitboard/engineering_shuttle /obj/machinery/computer/shuttle_control/research name = "research shuttle control console" shuttle_tag = "Research" //req_access = list(access_research) - circuit = /obj/item/weapon/circuitboard/research_shuttle + circuit = /obj/item/circuitboard/research_shuttle diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm index 103aa69639d..1317b89a5bf 100644 --- a/code/modules/shuttles/landmarks.dm +++ b/code/modules/shuttles/landmarks.dm @@ -160,19 +160,19 @@ // // Bluespace flare landmark beacon // -/obj/item/device/spaceflare +/obj/item/spaceflare name = "bluespace flare" desc = "Burst transmitter used to broadcast all needed information for shuttle navigation systems. Has a flare attached for marking the spot where you probably shouldn't be standing." icon_state = "bluflare" light_color = "#3728ff" var/active -/obj/item/device/spaceflare/attack_self(var/mob/user) +/obj/item/spaceflare/attack_self(var/mob/user) if(!active) visible_message("[user] pulls the cord, activating the [src].") activate() -/obj/item/device/spaceflare/proc/activate() +/obj/item/spaceflare/proc/activate() if(active) return var/turf/T = get_turf(src) @@ -188,7 +188,7 @@ T.hotspot_expose(1500, 5) update_icon() -/obj/item/device/spaceflare/update_icon() +/obj/item/spaceflare/update_icon() . = ..() if(active) icon_state = "bluflare_on" diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index f3731ba2eb3..6855f6623cb 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -157,17 +157,17 @@ return -GLOBAL_LIST_BOILERPLATE(papers_dockingcode, /obj/item/weapon/paper/dockingcodes) +GLOBAL_LIST_BOILERPLATE(papers_dockingcode, /obj/item/paper/dockingcodes) /hook/roundstart/proc/populate_dockingcodes() - for(var/obj/item/weapon/paper/dockingcodes/dcp as anything in global.papers_dockingcode) + for(var/obj/item/paper/dockingcodes/dcp as anything in global.papers_dockingcode) dcp.populate_info() return TRUE -/obj/item/weapon/paper/dockingcodes +/obj/item/paper/dockingcodes name = "Docking Codes" var/codes_from_z = null //So you can put codes from the station other places to give to antags or whatever -/obj/item/weapon/paper/dockingcodes/proc/populate_info() +/obj/item/paper/dockingcodes/proc/populate_info() var/dockingcodes = null var/turf/T = get_turf(src) var/our_z diff --git a/code/modules/shuttles/shuttle_console_multi.dm b/code/modules/shuttles/shuttle_console_multi.dm index fe948c1f184..6d5b460a218 100644 --- a/code/modules/shuttles/shuttle_console_multi.dm +++ b/code/modules/shuttles/shuttle_console_multi.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/shuttle_control/multi - circuit = /obj/item/weapon/circuitboard/shuttle_console/multi + circuit = /obj/item/circuitboard/shuttle_console/multi tgui_subtemplate = "ShuttleControlConsoleMulti" /obj/machinery/computer/shuttle_control/multi/shuttlerich_tgui_data(var/datum/shuttle/autodock/multi/shuttle) diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm index 97b1fe2139f..2bb63df4df7 100644 --- a/code/modules/shuttles/shuttle_emergency.dm +++ b/code/modules/shuttles/shuttle_emergency.dm @@ -132,7 +132,7 @@ var/auth_name var/dna_hash - var/obj/item/weapon/card/id/ID = ident.GetID() + var/obj/item/card/id/ID = ident.GetID() if(!ID) return @@ -172,6 +172,6 @@ emagged = 1 return 1 -/obj/machinery/computer/shuttle_control/emergency/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/computer/shuttle_control/emergency/attackby(obj/item/W as obj, mob/user as mob) read_authorization(W) ..() diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm index 5151e9a493e..45129080ff2 100644 --- a/code/modules/shuttles/shuttle_specops.dm +++ b/code/modules/shuttles/shuttle_specops.dm @@ -12,7 +12,7 @@ var/specops_return_delay = 6000 //After moving, the amount of time that must pass before the shuttle may move again var/specops_countdown_time = 600 //Length of the countdown when moving the shuttle - var/obj/item/device/radio/intercom/announcer = null + var/obj/item/radio/intercom/announcer = null var/reset_time = 0 //the world.time at which the shuttle will be ready to move again. var/launch_prep = 0 var/cancel_countdown = 0 @@ -20,7 +20,7 @@ /datum/shuttle/autodock/ferry/specops/New() ..() - announcer = new /obj/item/device/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky. + announcer = new /obj/item/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky. announcer.config(list(CHANNEL_RESPONSE_TEAM = 0)) /datum/shuttle/autodock/ferry/specops/proc/radio_announce(var/message) diff --git a/code/modules/spells/aoe_turf/charge.dm b/code/modules/spells/aoe_turf/charge.dm index f27a13e688d..490046125d5 100644 --- a/code/modules/spells/aoe_turf/charge.dm +++ b/code/modules/spells/aoe_turf/charge.dm @@ -38,14 +38,14 @@ if(istype(target, /mob/living)) charged_item = mob_charge(target) - if(istype(target, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = target + if(istype(target, /obj/item/grab)) + var/obj/item/grab/G = target if(G.affecting) var/mob/M = G.affecting charged_item = mob_charge(M) - if(istype(target, /obj/item/weapon/spellbook/oneuse)) - var/obj/item/weapon/spellbook/oneuse/I = target + if(istype(target, /obj/item/spellbook/oneuse)) + var/obj/item/spellbook/oneuse/I = target if(prob(50)) I.visible_message("[I] catches fire!") qdel(I) @@ -53,8 +53,8 @@ I.used = 0 charged_item = I - if(istype(target, /obj/item/weapon/cell/)) - var/obj/item/weapon/cell/C = target + if(istype(target, /obj/item/cell/)) + var/obj/item/cell/C = target if(prob(80)) C.maxcharge -= 200 if(C.maxcharge <= 1) //Div by 0 protection diff --git a/code/modules/spells/aoe_turf/conjure/construct.dm b/code/modules/spells/aoe_turf/conjure/construct.dm index 82bba0198a0..3ac2caa35d9 100644 --- a/code/modules/spells/aoe_turf/conjure/construct.dm +++ b/code/modules/spells/aoe_turf/conjure/construct.dm @@ -86,7 +86,7 @@ invocation_type = SpI_NONE range = 0 - summon_type = list(/obj/item/device/soulstone) + summon_type = list(/obj/item/soulstone) hud_state = "const_stone" override_base = "const" diff --git a/code/modules/spells/artifacts.dm b/code/modules/spells/artifacts.dm index 5b992397370..dd10d305278 100644 --- a/code/modules/spells/artifacts.dm +++ b/code/modules/spells/artifacts.dm @@ -1,6 +1,6 @@ //////////////////////Scrying orb////////////////////// -/obj/item/weapon/scrying +/obj/item/scrying name = "scrying orb" desc = "An incandescent orb of otherworldly energy, staring into it gives you vision beyond mortal means." icon = 'icons/obj/projectiles.dmi' @@ -12,7 +12,7 @@ force = 10 hitsound = 'sound/items/welder2.ogg' -/obj/item/weapon/scrying/attack_self(mob/user as mob) +/obj/item/scrying/attack_self(mob/user as mob) if((user.mind && !wizards.is_antagonist(user.mind))) to_chat(user, "You stare into the orb and see nothing but your own reflection.") return diff --git a/code/modules/spells/construct_spells.dm b/code/modules/spells/construct_spells.dm index 15dfd3bd804..f08e4fd9419 100644 --- a/code/modules/spells/construct_spells.dm +++ b/code/modules/spells/construct_spells.dm @@ -4,7 +4,7 @@ */ /* /proc/findNullRod(var/atom/target) - if(istype(target,/obj/item/weapon/nullrod)) + if(istype(target,/obj/item/nullrod)) return 1 else if(target.contents) for(var/atom/A in target.contents) diff --git a/code/modules/spells/spellbook.dm b/code/modules/spells/spellbook.dm index 9537f39a8ae..bf1f619f2dc 100644 --- a/code/modules/spells/spellbook.dm +++ b/code/modules/spells/spellbook.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/spellbook +/obj/item/spellbook name = "spell book" desc = "The legendary book of spells of the wizard." icon = 'icons/obj/library.dmi' @@ -11,7 +11,7 @@ var/max_uses = 5 var/op = 1 -/obj/item/weapon/spellbook/attack_self(mob/user = usr) +/obj/item/spellbook/attack_self(mob/user = usr) if(!user) return if((user.mind && !wizards.is_antagonist(user.mind))) @@ -82,7 +82,7 @@ onclose(user, "radio") return -/obj/item/weapon/spellbook/Topic(href, href_list) +/obj/item/spellbook/Topic(href, href_list) ..() var/mob/living/carbon/human/H = usr @@ -204,12 +204,12 @@ // temp = "You have learned curse of the horseman." if("mentalfocus") feedback_add_details("wizard_spell_learned","MF") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/gun/energy/staff/focus(get_turf(H)) + new /obj/item/gun/energy/staff/focus(get_turf(H)) temp = "An artefact that channels the will of the user into destructive bolts of force." max_uses-- if("soulstone") feedback_add_details("wizard_spell_learned","SS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/storage/belt/soulstone/full(get_turf(H)) + new /obj/item/storage/belt/soulstone/full(get_turf(H)) H.add_spell(new/spell/aoe_turf/conjure/construct) temp = "You have purchased a belt full of soulstones and have learned the artificer spell." max_uses-- @@ -223,7 +223,7 @@ max_uses-- if("scrying") feedback_add_details("wizard_spell_learned","SO") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/scrying(get_turf(H)) + new /obj/item/scrying(get_turf(H)) if (!(XRAY in H.mutations)) H.mutations.Add(XRAY) H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) @@ -241,7 +241,7 @@ //Single Use Spellbooks// -/obj/item/weapon/spellbook/oneuse +/obj/item/spellbook/oneuse var/spell = /spell/targeted/projectile/magic_missile //just a placeholder to avoid runtimes if someone spawned the generic var/spellname = "sandbox" var/used = 0 @@ -250,11 +250,11 @@ max_uses = 1 desc = "This template spellbook was never meant for the eyes of man..." -/obj/item/weapon/spellbook/oneuse/New() +/obj/item/spellbook/oneuse/New() ..() name += spellname -/obj/item/weapon/spellbook/oneuse/attack_self(mob/user as mob) +/obj/item/spellbook/oneuse/attack_self(mob/user as mob) var/spell/S = new spell(user) for(var/spell/knownspell in user.spell_list) if(knownspell.type == S.type) @@ -273,64 +273,64 @@ user.attack_log += text("\[[time_stamp()]\] [span_orange("[user.real_name] ([user.ckey]) learned the spell [spellname] ([S]).")]") onlearned(user) -/obj/item/weapon/spellbook/oneuse/proc/recoil(mob/user as mob) +/obj/item/spellbook/oneuse/proc/recoil(mob/user as mob) user.visible_message("[src] glows in a black light!") -/obj/item/weapon/spellbook/oneuse/proc/onlearned(mob/user as mob) +/obj/item/spellbook/oneuse/proc/onlearned(mob/user as mob) used = 1 user.visible_message("[src] glows dark for a second!") -/obj/item/weapon/spellbook/oneuse/attackby() +/obj/item/spellbook/oneuse/attackby() return -/obj/item/weapon/spellbook/oneuse/fireball +/obj/item/spellbook/oneuse/fireball spell = /spell/targeted/projectile/dumbfire/fireball spellname = "fireball" icon_state ="bookfireball" desc = "This book feels warm to the touch." -/obj/item/weapon/spellbook/oneuse/fireball/recoil(mob/user as mob) +/obj/item/spellbook/oneuse/fireball/recoil(mob/user as mob) ..() explosion(user.loc, -1, 0, 2, 3, 0) qdel(src) -/obj/item/weapon/spellbook/oneuse/smoke +/obj/item/spellbook/oneuse/smoke spell = /spell/aoe_turf/smoke spellname = "smoke" icon_state ="booksmoke" desc = "This book is overflowing with the dank arts." -/obj/item/weapon/spellbook/oneuse/smoke/recoil(mob/living/user as mob) +/obj/item/spellbook/oneuse/smoke/recoil(mob/living/user as mob) ..() to_chat(user, "Your stomach rumbles...") if(user.nutrition) user.adjust_nutrition(-200) -/obj/item/weapon/spellbook/oneuse/blind +/obj/item/spellbook/oneuse/blind spell = /spell/targeted/genetic/blind spellname = "blind" icon_state ="bookblind" desc = "This book looks blurry, no matter how you look at it." -/obj/item/weapon/spellbook/oneuse/blind/recoil(mob/user as mob) +/obj/item/spellbook/oneuse/blind/recoil(mob/user as mob) ..() to_chat(user, "You go blind!") user.Blind(10) -/obj/item/weapon/spellbook/oneuse/mindswap +/obj/item/spellbook/oneuse/mindswap spell = /spell/targeted/mind_transfer spellname = "mindswap" icon_state ="bookmindswap" desc = "This book's cover is pristine, though its pages look ragged and torn." var/mob/stored_swap = null //Used in used book recoils to store an identity for mindswaps -/obj/item/weapon/spellbook/oneuse/mindswap/onlearned() +/obj/item/spellbook/oneuse/mindswap/onlearned() spellname = pick("fireball","smoke","blind","forcewall","knock","horses","charge") icon_state = "book[spellname]" name = "spellbook of [spellname]" //Note, desc doesn't change by design ..() -/obj/item/weapon/spellbook/oneuse/mindswap/recoil(mob/user as mob) +/obj/item/spellbook/oneuse/mindswap/recoil(mob/user as mob) ..() if(stored_swap in dead_mob_list) stored_swap = null @@ -372,13 +372,13 @@ to_chat(user, "Suddenly you're staring at [src] again... where are you, who are you?!") stored_swap = null -/obj/item/weapon/spellbook/oneuse/forcewall +/obj/item/spellbook/oneuse/forcewall spell = /spell/aoe_turf/conjure/forcewall spellname = "forcewall" icon_state ="bookforcewall" desc = "This book has a dedication to mimes everywhere inside the front cover." -/obj/item/weapon/spellbook/oneuse/forcewall/recoil(mob/user as mob) +/obj/item/spellbook/oneuse/forcewall/recoil(mob/user as mob) ..() to_chat(user, "You suddenly feel very solid!") var/obj/structure/closet/statue/S = new /obj/structure/closet/statue(user.loc, user) @@ -386,24 +386,24 @@ user.drop_item() -/obj/item/weapon/spellbook/oneuse/knock +/obj/item/spellbook/oneuse/knock spell = /spell/aoe_turf/knock spellname = "knock" icon_state ="bookknock" desc = "This book is hard to hold closed properly." -/obj/item/weapon/spellbook/oneuse/knock/recoil(mob/user as mob) +/obj/item/spellbook/oneuse/knock/recoil(mob/user as mob) ..() to_chat(user, "You're knocked down!") user.Weaken(20) -/obj/item/weapon/spellbook/oneuse/horsemask +/obj/item/spellbook/oneuse/horsemask spell = /spell/targeted/equip_item/horsemask spellname = "horses" icon_state ="bookhorses" desc = "This book is more horse than your mind has room for." -/obj/item/weapon/spellbook/oneuse/horsemask/recoil(mob/living/carbon/user as mob) +/obj/item/spellbook/oneuse/horsemask/recoil(mob/living/carbon/user as mob) if(istype(user, /mob/living/carbon/human)) to_chat(user, "HOR-SIE HAS RISEN") var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead @@ -416,13 +416,13 @@ else to_chat(user, "I say thee neigh") -/obj/item/weapon/spellbook/oneuse/charge +/obj/item/spellbook/oneuse/charge spell = /spell/aoe_turf/charge spellname = "charging" icon_state ="bookcharge" desc = "This book is made of 100% post-consumer wizard." -/obj/item/weapon/spellbook/oneuse/charge/recoil(mob/user as mob) +/obj/item/spellbook/oneuse/charge/recoil(mob/user as mob) ..() to_chat(user, "[src] suddenly feels very warm!") empulse(src, 1, 1, 1, 1) diff --git a/code/modules/stockmarket/computer.dm b/code/modules/stockmarket/computer.dm index 4252d86cfeb..8054c773dad 100644 --- a/code/modules/stockmarket/computer.dm +++ b/code/modules/stockmarket/computer.dm @@ -5,7 +5,7 @@ icon_state = "stockmarket" icon_screen = "stocks" icon_keyboard = "stockmarket_key" - circuit = /obj/item/weapon/circuitboard/stockexchange + circuit = /obj/item/circuitboard/stockexchange var/logged_in = "Cargo Department" var/vmode = 1 diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm index 1a0bd6271b6..16cd795832e 100644 --- a/code/modules/surgery/bones.dm +++ b/code/modules/surgery/bones.dm @@ -10,7 +10,7 @@ /datum/surgery_step/glue_bone surgery_name = "Glue Bone" allowed_tools = list( - /obj/item/weapon/surgical/bonegel = 100 + /obj/item/surgical/bonegel = 100 ) allowed_procs = list(IS_SCREWDRIVER = 75) @@ -55,7 +55,7 @@ /datum/surgery_step/set_bone surgery_name = "Set Bone" allowed_tools = list( - /obj/item/weapon/surgical/bonesetter = 100 + /obj/item/surgical/bonesetter = 100 ) allowed_procs = list(IS_WRENCH = 75) @@ -102,7 +102,7 @@ /datum/surgery_step/mend_skull surgery_name = "Mend Skull" allowed_tools = list( - /obj/item/weapon/surgical/bonesetter = 100 + /obj/item/surgical/bonesetter = 100 ) allowed_procs = list(IS_WRENCH = 75) @@ -144,7 +144,7 @@ /datum/surgery_step/finish_bone surgery_name = "Finish Mending Bone" allowed_tools = list( - /obj/item/weapon/surgical/bonegel = 100 + /obj/item/surgical/bonegel = 100 ) allowed_procs = list(IS_SCREWDRIVER = 75) @@ -188,7 +188,7 @@ /datum/surgery_step/clamp_bone surgery_name = "Clamp Bone" allowed_tools = list( - /obj/item/weapon/surgical/bone_clamp = 100 + /obj/item/surgical/bone_clamp = 100 ) can_infect = 1 diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm index 743363fa442..6d946c24ed9 100644 --- a/code/modules/surgery/encased.dm +++ b/code/modules/surgery/encased.dm @@ -24,8 +24,8 @@ /datum/surgery_step/open_encased/saw surgery_name = "Cut Bone" allowed_tools = list( - /obj/item/weapon/surgical/circular_saw = 100, \ - /obj/item/weapon/material/knife/machete/hatchet = 75 + /obj/item/surgical/circular_saw = 100, \ + /obj/item/material/knife/machete/hatchet = 75 ) min_duration = 50 @@ -74,7 +74,7 @@ /datum/surgery_step/open_encased/retract surgery_name = "Retract Bone" allowed_tools = list( - /obj/item/weapon/surgical/retractor = 100 + /obj/item/surgical/retractor = 100 ) allowed_procs = list(IS_CROWBAR = 75) @@ -128,7 +128,7 @@ /datum/surgery_step/open_encased/close surgery_name = "Close Retracted Bone" allowed_tools = list( - /obj/item/weapon/surgical/retractor = 100, + /obj/item/surgical/retractor = 100, ) allowed_procs = list(IS_CROWBAR = 75) @@ -187,7 +187,7 @@ /datum/surgery_step/open_encased/mend surgery_name = "Mend Retracted Bone" allowed_tools = list( - /obj/item/weapon/surgical/bonegel = 100 + /obj/item/surgical/bonegel = 100 ) allowed_procs = list(IS_SCREWDRIVER = 75) @@ -229,7 +229,7 @@ /datum/surgery_step/open_encased/advancedsaw_open surgery_name = "Advanced Cut Bone" allowed_tools = list( - /obj/item/weapon/surgical/circular_saw/manager = 100 + /obj/item/surgical/circular_saw/manager = 100 ) priority = 3 @@ -280,7 +280,7 @@ /datum/surgery_step/open_encased/advancedsaw_mend surgery_name = "Advanced Mend Retracted Bone" allowed_tools = list( - /obj/item/weapon/surgical/circular_saw/manager = 100 + /obj/item/surgical/circular_saw/manager = 100 ) priority = 3 diff --git a/code/modules/surgery/external_repair.dm b/code/modules/surgery/external_repair.dm index 3698f2d1c4d..89187da7282 100644 --- a/code/modules/surgery/external_repair.dm +++ b/code/modules/surgery/external_repair.dm @@ -39,8 +39,8 @@ /datum/surgery_step/repairflesh/scan_injury surgery_name = "Scan Injury" allowed_tools = list( - /obj/item/weapon/autopsy_scanner = 100, - /obj/item/device/analyzer = 10 + /obj/item/autopsy_scanner = 100, + /obj/item/analyzer = 10 ) priority = 2 @@ -92,7 +92,7 @@ allowed_tools = list( /obj/item/stack/medical/advanced/ointment = 100, /obj/item/stack/medical/ointment = 50, - /obj/item/weapon/tape_roll = 30, + /obj/item/tape_roll = 30, /obj/item/taperoll = 10 ) @@ -111,11 +111,11 @@ /datum/surgery_step/repairflesh/repair_burns/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - if(istype(tool, /obj/item/weapon/tape_roll) || istype(tool, /obj/item/taperoll)) + if(istype(tool, /obj/item/tape_roll) || istype(tool, /obj/item/taperoll)) user.visible_message("[user] begins taping up [target]'s [affected] with \the [tool].", \ "You begin taping up [target]'s [affected] with \the [tool].") affected.jostle_bone(10) - else if(istype(tool, /obj/item/weapon/surgical/hemostat) || istype(tool, /obj/item/weapon/surgical/FixOVein)) + else if(istype(tool, /obj/item/surgical/hemostat) || istype(tool, /obj/item/surgical/FixOVein)) user.visible_message("[user] begins mending the charred blood vessels in [target]'s [affected] with \the [tool].", \ "You begin mending the charred blood vessels in [target]'s [affected] with \the [tool].") else @@ -125,7 +125,7 @@ /datum/surgery_step/repairflesh/repair_burns/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - if(istype(tool, /obj/item/weapon/tape_roll) || istype(tool, /obj/item/taperoll)) + if(istype(tool, /obj/item/tape_roll) || istype(tool, /obj/item/taperoll)) user.visible_message("[user] finishes taping up [target]'s [affected] with \the [tool].", \ "You finish taping up [target]'s [affected] with \the [tool].") affected.createwound(BRUISE, 10) @@ -157,7 +157,7 @@ allowed_tools = list( /obj/item/stack/medical/advanced/bruise_pack = 100, /obj/item/stack/medical/bruise_pack = 50, - /obj/item/weapon/tape_roll = 40, + /obj/item/tape_roll = 40, /obj/item/taperoll = 10 ) @@ -176,11 +176,11 @@ /datum/surgery_step/repairflesh/repair_brute/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - if(istype(tool, /obj/item/weapon/tape_roll) || istype(tool, /obj/item/taperoll)) + if(istype(tool, /obj/item/tape_roll) || istype(tool, /obj/item/taperoll)) user.visible_message("[user] begins taping up [target]'s [affected] with \the [tool].", \ "You begin taping up [target]'s [affected] with \the [tool].") affected.jostle_bone(10) - else if(istype(tool, /obj/item/weapon/surgical/FixOVein) || istype(tool, /obj/item/weapon/surgical/bonesetter)) + else if(istype(tool, /obj/item/surgical/FixOVein) || istype(tool, /obj/item/surgical/bonesetter)) user.visible_message("[user] begins mending the torn tissue in [target]'s [affected] with \the [tool].", \ "You begin mending the torn tissue in [target]'s [affected] with \the [tool].") else @@ -190,7 +190,7 @@ /datum/surgery_step/repairflesh/repair_brute/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - if(istype(tool, /obj/item/weapon/tape_roll) || istype(tool, /obj/item/taperoll)) + if(istype(tool, /obj/item/tape_roll) || istype(tool, /obj/item/taperoll)) user.visible_message("[user] finishes taping up [target]'s [affected] with \the [tool].", \ "You finish taping up [target]'s [affected] with \the [tool].") affected.createwound(BRUISE, 10) diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm index 3059b021761..a60fa8921d7 100644 --- a/code/modules/surgery/face.dm +++ b/code/modules/surgery/face.dm @@ -26,9 +26,9 @@ /datum/surgery_step/generic/cut_face surgery_name = "Cut Face" allowed_tools = list( - /obj/item/weapon/surgical/scalpel = 100, \ - /obj/item/weapon/material/knife = 75, \ - /obj/item/weapon/material/shard = 50, \ + /obj/item/surgical/scalpel = 100, \ + /obj/item/material/knife = 75, \ + /obj/item/material/shard = 50, \ ) min_duration = 90 @@ -61,9 +61,9 @@ /datum/surgery_step/face/mend_vocal surgery_name = "Mend Vocal Cords" allowed_tools = list( - /obj/item/weapon/surgical/hemostat = 100, \ + /obj/item/surgical/hemostat = 100, \ /obj/item/stack/cable_coil = 75, \ - /obj/item/device/assembly/mousetrap = 10 //I don't know. Don't ask me. But I'm leaving it because hilarity. + /obj/item/assembly/mousetrap = 10 //I don't know. Don't ask me. But I'm leaving it because hilarity. ) min_duration = 70 @@ -94,8 +94,8 @@ /datum/surgery_step/face/fix_face surgery_name = "Fix Face" allowed_tools = list( - /obj/item/weapon/surgical/retractor = 100, \ - /obj/item/weapon/material/kitchen/utensil/fork = 75 + /obj/item/surgical/retractor = 100, \ + /obj/item/material/kitchen/utensil/fork = 75 ) allowed_procs = list(IS_CROWBAR = 55) @@ -129,10 +129,10 @@ /datum/surgery_step/face/cauterize surgery_name = "Cauterize Face" allowed_tools = list( - /obj/item/weapon/surgical/cautery = 100, \ + /obj/item/surgical/cautery = 100, \ /obj/item/clothing/mask/smokable/cigarette = 75, \ - /obj/item/weapon/flame/lighter = 50, \ - /obj/item/weapon/weldingtool = 25 + /obj/item/flame/lighter = 50, \ + /obj/item/weldingtool = 25 ) min_duration = 70 diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index 5410b9e63a3..aedb52a3495 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -31,9 +31,9 @@ /datum/surgery_step/generic/cut_open surgery_name = "Create Incision" allowed_tools = list( - /obj/item/weapon/surgical/scalpel = 100, \ - /obj/item/weapon/material/knife = 75, \ - /obj/item/weapon/material/shard = 50, \ + /obj/item/surgical/scalpel = 100, \ + /obj/item/material/knife = 75, \ + /obj/item/material/shard = 50, \ ) req_open = 0 @@ -76,10 +76,10 @@ /datum/surgery_step/generic/cut_with_laser surgery_name = "Create Bloodless Incision" allowed_tools = list( - /obj/item/weapon/surgical/scalpel/laser3 = 100, \ - /obj/item/weapon/surgical/scalpel/laser2 = 100, \ - /obj/item/weapon/surgical/scalpel/laser1 = 100, \ - /obj/item/weapon/melee/energy/sword = 5 + /obj/item/surgical/scalpel/laser3 = 100, \ + /obj/item/surgical/scalpel/laser2 = 100, \ + /obj/item/surgical/scalpel/laser1 = 100, \ + /obj/item/melee/energy/sword = 5 ) priority = 2 req_open = 0 @@ -105,11 +105,11 @@ affected.createwound(CUT, 1) var/clamp_chance = 0 //I hate this. Make all laser scalpels a /laser subtype and give them a clamp_chance var??? - if(istype(tool,/obj/item/weapon/surgical/scalpel/laser1)) + if(istype(tool,/obj/item/surgical/scalpel/laser1)) clamp_chance = 75 - if(istype(tool,/obj/item/weapon/surgical/scalpel/laser2)) + if(istype(tool,/obj/item/surgical/scalpel/laser2)) clamp_chance = 85 - if(istype(tool,/obj/item/weapon/surgical/scalpel/laser3)) + if(istype(tool,/obj/item/surgical/scalpel/laser3)) clamp_chance = 95 if(clamp_chance) affected.organ_clamp() @@ -136,7 +136,7 @@ /datum/surgery_step/generic/incision_manager surgery_name = "Create Prepared Incision" allowed_tools = list( - /obj/item/weapon/surgical/scalpel/manager = 100 + /obj/item/surgical/scalpel/manager = 100 ) priority = 2 @@ -184,9 +184,9 @@ /datum/surgery_step/generic/clamp_bleeders surgery_name = "Clamp Bleeders" allowed_tools = list( - /obj/item/weapon/surgical/hemostat = 100, \ + /obj/item/surgical/hemostat = 100, \ /obj/item/stack/cable_coil = 75, \ - /obj/item/device/assembly/mousetrap = 20 + /obj/item/assembly/mousetrap = 20 ) min_duration = 40 @@ -224,8 +224,8 @@ /datum/surgery_step/generic/retract_skin surgery_name = "Retract Skin" allowed_tools = list( - /obj/item/weapon/surgical/retractor = 100, \ - /obj/item/weapon/material/kitchen/utensil/fork = 50 + /obj/item/surgical/retractor = 100, \ + /obj/item/material/kitchen/utensil/fork = 50 ) allowed_procs = list(IS_CROWBAR = 75) @@ -285,10 +285,10 @@ /datum/surgery_step/generic/cauterize surgery_name = "Cauterize Incision" allowed_tools = list( - /obj/item/weapon/surgical/cautery = 100, \ + /obj/item/surgical/cautery = 100, \ /obj/item/clothing/mask/smokable/cigarette = 75, \ - /obj/item/weapon/flame/lighter = 50, \ - /obj/item/weapon/weldingtool = 25 + /obj/item/flame/lighter = 50, \ + /obj/item/weldingtool = 25 ) min_duration = 70 @@ -327,8 +327,8 @@ /datum/surgery_step/generic/amputate surgery_name = "Amputate Limb" allowed_tools = list( - /obj/item/weapon/surgical/circular_saw = 100, \ - /obj/item/weapon/material/knife/machete/hatchet = 75 + /obj/item/surgical/circular_saw = 100, \ + /obj/item/material/knife/machete/hatchet = 75 ) req_open = 0 diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index 991aa4cecc8..44553278623 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -49,8 +49,8 @@ /datum/surgery_step/cavity/make_space surgery_name = "Create Cavity" allowed_tools = list( - /obj/item/weapon/surgical/surgicaldrill = 100, \ - /obj/item/weapon/pen = 75, \ + /obj/item/surgical/surgicaldrill = 100, \ + /obj/item/pen = 75, \ /obj/item/stack/rods = 50 ) @@ -83,10 +83,10 @@ surgery_name = "Close Cavity" priority = 2 allowed_tools = list( - /obj/item/weapon/surgical/cautery = 100, \ + /obj/item/surgical/cautery = 100, \ /obj/item/clothing/mask/smokable/cigarette = 75, \ - /obj/item/weapon/flame/lighter = 50, \ - /obj/item/weapon/weldingtool = 25 + /obj/item/flame/lighter = 50, \ + /obj/item/weldingtool = 25 ) min_duration = 60 @@ -128,8 +128,8 @@ if(..()) var/obj/item/organ/external/affected = target.get_organ(target_zone) if(istype(user,/mob/living/silicon/robot)) - if(istype(tool, /obj/item/weapon/gripper)) - var/obj/item/weapon/gripper/Gripper = tool + if(istype(tool, /obj/item/gripper)) + var/obj/item/gripper/Gripper = tool if(Gripper.wrapped) tool = Gripper.wrapped else @@ -139,15 +139,15 @@ if(affected && affected.cavity) var/total_volume = tool.w_class for(var/obj/item/I in affected.implants) - if(istype(I,/obj/item/weapon/implant)) + if(istype(I,/obj/item/implant)) continue total_volume += I.w_class return total_volume <= get_max_wclass(affected) /datum/surgery_step/cavity/place_item/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - if(isrobot(user) && istype(tool, /obj/item/weapon/gripper)) - var/obj/item/weapon/gripper/G = tool + if(isrobot(user) && istype(tool, /obj/item/gripper)) + var/obj/item/gripper/G = tool tool = G.wrapped user.visible_message("[user] starts putting \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \ "You start putting \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) //Nobody will probably ever see this, but I made these two blue. ~CK @@ -156,8 +156,8 @@ /datum/surgery_step/cavity/place_item/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) - if(isrobot(user) && istype(tool, /obj/item/weapon/gripper)) - var/obj/item/weapon/gripper/G = tool + if(isrobot(user) && istype(tool, /obj/item/gripper)) + var/obj/item/gripper/G = tool tool = G.wrapped G.drop_item() else @@ -171,7 +171,7 @@ affected.owner.custom_pain("You feel something rip in your [affected.name]!", 1) affected.implants += tool tool.loc = affected - if(istype(tool,/obj/item/device/nif)){var/obj/item/device/nif/N = tool;N.implant(target)} //VOREStation Add - NIF support + if(istype(tool,/obj/item/nif)){var/obj/item/nif/N = tool;N.implant(target)} //VOREStation Add - NIF support affected.cavity = 0 ////////////////////////////////////////////////////////////////// @@ -181,8 +181,8 @@ /datum/surgery_step/cavity/implant_removal surgery_name = "Remove Implant" allowed_tools = list( - /obj/item/weapon/surgical/hemostat = 100, \ - /obj/item/weapon/material/kitchen/utensil/fork = 20 + /obj/item/surgical/hemostat = 100, \ + /obj/item/material/kitchen/utensil/fork = 20 ) allowed_procs = list(IS_WIRECUTTER = 75) @@ -221,8 +221,8 @@ "You fail to remove the [obj] from [target]'s [affected.name]s with \the [tool]!" ) return - if(istype(obj,/obj/item/weapon/implant)) - var/obj/item/weapon/implant/imp = obj + if(istype(obj,/obj/item/implant)) + var/obj/item/implant/imp = obj if (!imp.islegal()) //ILLEGAL IMPLANT ALERT!!!!!!!!!! user.visible_message("[user] seems to be intently working on something within [target]'s [affected.name] with \the [tool]!", \ "You intently begin to take [obj] out of the incision on [target]'s [affected.name]s with \the [tool]!" ) @@ -251,11 +251,11 @@ obj.loc = get_turf(target) obj.add_blood(target) obj.update_icon() - if(istype(obj,/obj/item/weapon/implant)) - var/obj/item/weapon/implant/imp = obj + if(istype(obj,/obj/item/implant)) + var/obj/item/implant/imp = obj imp.imp_in = null imp.implanted = 0 - else if(istype(tool,/obj/item/device/nif)){var/obj/item/device/nif/N = tool;N.unimplant(target)} //VOREStation Add - NIF support + else if(istype(tool,/obj/item/nif)){var/obj/item/nif/N = tool;N.unimplant(target)} //VOREStation Add - NIF support else user.visible_message("[user] could not find anything inside [target]'s [affected.name], and pulls \the [tool] out.", \ "You could not find anything inside [target]'s [affected.name]." ) @@ -267,7 +267,7 @@ var/fail_prob = 10 fail_prob += 100 - tool_quality(tool) if (prob(fail_prob)) - var/obj/item/weapon/implant/imp = affected.implants[1] + var/obj/item/implant/imp = affected.implants[1] user.visible_message(" Something beeps inside [target]'s [affected.name]!") playsound(imp, 'sound/items/countdown.ogg', 75, 1, -3) spawn(25) diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm index a898d4447d0..8b9b18bb0cc 100644 --- a/code/modules/surgery/limb_reattach.dm +++ b/code/modules/surgery/limb_reattach.dm @@ -85,9 +85,9 @@ /datum/surgery_step/limb/connect surgery_name = "Connect Limb" allowed_tools = list( - /obj/item/weapon/surgical/hemostat = 100, \ + /obj/item/surgical/hemostat = 100, \ /obj/item/stack/cable_coil = 75, \ - /obj/item/device/assembly/mousetrap = 20 + /obj/item/assembly/mousetrap = 20 ) can_infect = 1 diff --git a/code/modules/surgery/neck.dm b/code/modules/surgery/neck.dm index 3fc4e00052a..c9fe45e9b15 100644 --- a/code/modules/surgery/neck.dm +++ b/code/modules/surgery/neck.dm @@ -27,9 +27,9 @@ surgery_name = "Mend Vessels" priority = 1 allowed_tools = list( - /obj/item/weapon/surgical/FixOVein = 100, + /obj/item/surgical/FixOVein = 100, /obj/item/stack/cable_coil = 40, - /obj/item/device/assembly/mousetrap = 5) + /obj/item/assembly/mousetrap = 5) min_duration = 80 max_duration = 100 @@ -62,9 +62,9 @@ surgery_name = "Drill Vertebrae" priority = 3 //Do this instead of expanding the skull cavity allowed_tools = list( - /obj/item/weapon/surgical/surgicaldrill = 100, - /obj/item/weapon/melee/changeling/arm_blade = 15, - /obj/item/weapon/pickaxe = 5 + /obj/item/surgical/surgicaldrill = 100, + /obj/item/melee/changeling/arm_blade = 15, + /obj/item/pickaxe = 5 ) allowed_procs = list(IS_SCREWDRIVER = 75) @@ -106,8 +106,8 @@ surgery_name = "Remove Bone Chips" priority = 3 //Do this instead of picking around for implants. allowed_tools = list( - /obj/item/weapon/surgical/hemostat = 100, - /obj/item/weapon/melee/changeling/claw = 40) //Surprisingly, claws are kind of okay at picking things out. + /obj/item/surgical/hemostat = 100, + /obj/item/melee/changeling/claw = 40) //Surprisingly, claws are kind of okay at picking things out. allowed_procs = list(IS_WIRECUTTER = 60) @@ -146,10 +146,10 @@ surgery_name = "Mend Spinal Cord" priority = 1 //Do this after IB. allowed_tools = list( - /obj/item/weapon/surgical/FixOVein = 100, + /obj/item/surgical/FixOVein = 100, /obj/item/stack/nanopaste = 50, /obj/item/stack/cable_coil = 40, - /obj/item/device/assembly/mousetrap = 5) + /obj/item/assembly/mousetrap = 5) min_duration = 100 max_duration = 200 @@ -187,9 +187,9 @@ surgery_name = "Mend Vertebrae" priority = 3 //Do this instead of fixing bones. allowed_tools = list( - /obj/item/weapon/surgical/bonegel = 100, + /obj/item/surgical/bonegel = 100, /obj/item/stack/nanopaste = 50, - /obj/item/weapon/tape_roll = 5) + /obj/item/tape_roll = 5) min_duration = 100 max_duration = 160 @@ -226,8 +226,8 @@ surgery_name = "Realign Tissue" priority = 3 //Do this instead of searching for objects in the skull. allowed_tools = list( - /obj/item/weapon/surgical/hemostat = 100, - /obj/item/weapon/melee/changeling/claw = 20) //Claws. Good for digging, not so much for moving. + /obj/item/surgical/hemostat = 100, + /obj/item/melee/changeling/claw = 20) //Claws. Good for digging, not so much for moving. allowed_procs = list(IS_WIRECUTTER = 60) diff --git a/code/modules/surgery/organ_ripper_vr.dm b/code/modules/surgery/organ_ripper_vr.dm index 0fa8f751c59..5d51c07e060 100644 --- a/code/modules/surgery/organ_ripper_vr.dm +++ b/code/modules/surgery/organ_ripper_vr.dm @@ -12,7 +12,7 @@ max_duration = 80 excludes_steps = list(/datum/surgery_step/generic/cut_open) //These things can already do the first step! -/datum/surgery_step/generic/ripper/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/weapon/surgical/scalpel/ripper/tool) +/datum/surgery_step/generic/ripper/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/surgical/scalpel/ripper/tool) if (!..()) return 0 @@ -30,7 +30,7 @@ /datum/surgery_step/generic/ripper/tear_vessel surgery_name = "Tear Blood Vessel" allowed_tools = list( - /obj/item/weapon/surgical/scalpel/ripper = 100 + /obj/item/surgical/scalpel/ripper = 100 ) /datum/surgery_step/generic/ripper/tear_vessel/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -61,7 +61,7 @@ /datum/surgery_step/generic/ripper/break_bone surgery_name = "Break Skeletal Structure" allowed_tools = list( - /obj/item/weapon/surgical/scalpel/ripper = 100 + /obj/item/surgical/scalpel/ripper = 100 ) /datum/surgery_step/generic/ripper/break_bone/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -90,7 +90,7 @@ /datum/surgery_step/generic/ripper/destroy_organ surgery_name = "Mutilate Organ" allowed_tools = list( - /obj/item/weapon/surgical/scalpel/ripper = 100 + /obj/item/surgical/scalpel/ripper = 100 ) /datum/surgery_step/generic/ripper/destroy_organ/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -162,7 +162,7 @@ surgery_name = "Rip Out Organ" allowed_tools = list( - /obj/item/weapon/surgical/scalpel/ripper = 100 + /obj/item/surgical/scalpel/ripper = 100 ) priority = 3 diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index 998301154f5..37f85661760 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -121,8 +121,8 @@ allowed_tools = list( /obj/item/stack/nanopaste = 100, /obj/item/stack/cable_coil = 75, - /obj/item/weapon/tool/wrench = 50, - /obj/item/weapon/storage/toolbox = 10 //Percussive Maintenance + /obj/item/tool/wrench = 50, + /obj/item/storage/toolbox = 10 //Percussive Maintenance ) min_duration = 70 @@ -194,9 +194,9 @@ surgery_name = "Detach Organ" allowed_tools = list( - /obj/item/weapon/surgical/scalpel = 100, \ - /obj/item/weapon/material/knife = 75, \ - /obj/item/weapon/material/shard = 50, \ + /obj/item/surgical/scalpel = 100, \ + /obj/item/material/knife = 75, \ + /obj/item/material/shard = 50, \ ) min_duration = 90 @@ -260,8 +260,8 @@ surgery_name = "Remove Organ" allowed_tools = list( - /obj/item/weapon/surgical/hemostat = 100, \ - /obj/item/weapon/material/kitchen/utensil/fork = 20 + /obj/item/surgical/hemostat = 100, \ + /obj/item/material/kitchen/utensil/fork = 20 ) allowed_procs = list(IS_WIRECUTTER = 100) //FBP code also uses this, so let's be nice. Roboticists won't know to use hemostats. @@ -416,7 +416,7 @@ /datum/surgery_step/internal/attach_organ surgery_name = "Attach Organ" allowed_tools = list( - /obj/item/weapon/surgical/FixOVein = 100, \ + /obj/item/surgical/FixOVein = 100, \ /obj/item/stack/cable_coil = 75 ) diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index 5b15d49d1a5..89dbce1f289 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -11,7 +11,7 @@ surgery_name = "Fix Vein" priority = 2 allowed_tools = list( - /obj/item/weapon/surgical/FixOVein = 100, \ + /obj/item/surgical/FixOVein = 100, \ /obj/item/stack/cable_coil = 75 ) can_infect = 1 @@ -65,9 +65,9 @@ surgery_name = "Remove Dead Tissue" priority = 2 allowed_tools = list( - /obj/item/weapon/surgical/scalpel = 100, \ - /obj/item/weapon/material/knife = 75, \ - /obj/item/weapon/material/shard = 50, \ + /obj/item/surgical/scalpel = 100, \ + /obj/item/material/knife = 75, \ + /obj/item/material/shard = 50, \ ) can_infect = 1 @@ -115,11 +115,11 @@ surgery_name = "Treat Necrosis" priority = 2 allowed_tools = list( - /obj/item/weapon/reagent_containers/dropper = 100, - /obj/item/weapon/reagent_containers/glass/bottle = 75, - /obj/item/weapon/reagent_containers/glass/beaker = 75, - /obj/item/weapon/reagent_containers/spray = 50, - /obj/item/weapon/reagent_containers/glass/bucket = 50, + /obj/item/reagent_containers/dropper = 100, + /obj/item/reagent_containers/glass/bottle = 75, + /obj/item/reagent_containers/glass/beaker = 75, + /obj/item/reagent_containers/spray = 50, + /obj/item/reagent_containers/glass/bucket = 50, ) can_infect = 0 @@ -129,10 +129,10 @@ max_duration = 60 /datum/surgery_step/treat_necrosis/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!istype(tool, /obj/item/weapon/reagent_containers)) + if (!istype(tool, /obj/item/reagent_containers)) return 0 - var/obj/item/weapon/reagent_containers/container = tool + var/obj/item/reagent_containers/container = tool if(!container.reagents.has_reagent("peridaxon")) return 0 @@ -157,10 +157,10 @@ /datum/surgery_step/treat_necrosis/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - if (!istype(tool, /obj/item/weapon/reagent_containers)) + if (!istype(tool, /obj/item/reagent_containers)) return - var/obj/item/weapon/reagent_containers/container = tool + var/obj/item/reagent_containers/container = tool var/trans = container.reagents.trans_to_mob(target, container.amount_per_transfer_from_this, CHEM_BLOOD) //technically it's contact, but the reagents are being applied to internal tissue if (trans > 0) @@ -173,10 +173,10 @@ /datum/surgery_step/treat_necrosis/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - if (!istype(tool, /obj/item/weapon/reagent_containers)) + if (!istype(tool, /obj/item/reagent_containers)) return - var/obj/item/weapon/reagent_containers/container = tool + var/obj/item/reagent_containers/container = tool var/trans = container.reagents.trans_to_mob(target, container.amount_per_transfer_from_this, CHEM_BLOOD) @@ -192,9 +192,9 @@ /datum/surgery_step/hardsuit surgery_name = "Remove Hardsuit" allowed_tools = list( - /obj/item/weapon/weldingtool = 80, - /obj/item/weapon/surgical/circular_saw = 60, - /obj/item/weapon/pickaxe/plasmacutter = 100 + /obj/item/weldingtool = 80, + /obj/item/surgical/circular_saw = 60, + /obj/item/pickaxe/plasmacutter = 100 ) req_open = 0 @@ -207,14 +207,14 @@ /datum/surgery_step/hardsuit/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) if(!istype(target)) return 0 - if(istype(tool,/obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/welder = tool + if(istype(tool,/obj/item/weldingtool)) + var/obj/item/weldingtool/welder = tool if(!welder.isOn() || !welder.remove_fuel(1,user)) return 0 - return (target_zone == BP_TORSO) && ((istype(target.back, /obj/item/weapon/rig) && !(target.back.canremove)) || (istype(target.belt, /obj/item/weapon/rig) && !(target.belt.canremove))) + return (target_zone == BP_TORSO) && ((istype(target.back, /obj/item/rig) && !(target.back.canremove)) || (istype(target.belt, /obj/item/rig) && !(target.belt.canremove))) /datum/surgery_step/hardsuit/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - var/obj/item/weapon/rig/rig = target.back + var/obj/item/rig/rig = target.back if(!istype(rig)) rig = target.belt if(!istype(rig)) @@ -224,7 +224,7 @@ ..() /datum/surgery_step/hardsuit/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - var/obj/item/weapon/rig/rig = target.back + var/obj/item/rig/rig = target.back if(!istype(rig)) rig = target.belt if(!istype(rig)) @@ -263,7 +263,7 @@ /datum/surgery_step/dehusk/structinitial surgery_name = "Create Structure" allowed_tools = list( - /obj/item/weapon/surgical/bioregen = 100 + /obj/item/surgical/bioregen = 100 ) min_duration = 90 max_duration = 120 @@ -293,9 +293,9 @@ /datum/surgery_step/dehusk/relocateflesh surgery_name = "Relocate Flesh" allowed_tools = list( - /obj/item/weapon/surgical/hemostat = 100, \ + /obj/item/surgical/hemostat = 100, \ /obj/item/stack/cable_coil = 75, \ - /obj/item/device/assembly/mousetrap = 20 + /obj/item/assembly/mousetrap = 20 ) min_duration = 90 max_duration = 120 @@ -325,8 +325,8 @@ /datum/surgery_step/dehusk/structfinish surgery_name = "Finish Structure" allowed_tools = list( - /obj/item/weapon/surgical/bioregen = 100, \ - /obj/item/weapon/surgical/FixOVein = 30 + /obj/item/surgical/bioregen = 100, \ + /obj/item/surgical/FixOVein = 30 ) min_duration = 90 max_duration = 120 @@ -335,10 +335,10 @@ return ..() && target.op_stage.dehusk == 2 /datum/surgery_step/dehusk/structfinish/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if(istype(tool,/obj/item/weapon/surgical/bioregen)) + if(istype(tool,/obj/item/surgical/bioregen)) user.visible_message("[user] begins to recreate blood vessels and fill in the gaps in [target]'s flesh with \the [tool].", \ "You begin to recreate blood vessels and fill in the gaps in [target]'s flesh with \the [tool].") - else if(istype(tool,/obj/item/weapon/surgical/FixOVein)) + else if(istype(tool,/obj/item/surgical/FixOVein)) user.visible_message("[user] attempts to recreate blood vessels and fill in the gaps in [target]'s flesh with \the [tool].", \ "You attempt to recreate blood vessels and fill in the gaps in [target]'s flesh with \the [tool].") ..() @@ -354,10 +354,10 @@ /datum/surgery_step/dehusk/structfinish/fail_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - if(istype(tool,/obj/item/weapon/surgical/bioregen)) + if(istype(tool,/obj/item/surgical/bioregen)) user.visible_message("[user]'s hand slips, causing \the [tool] to scrape [target]'s body.", \ "Your hand slips, causing \the [tool] to scrape [target]'s body.") - else if(istype(tool,/obj/item/weapon/surgical/FixOVein)) + else if(istype(tool,/obj/item/surgical/FixOVein)) user.visible_message("[user] fails to finish the structure over the gaps in [target]'s flesh, doing more damage than good.", \ "You fail to finish the structure over the gaps in [target]'s flesh, doing more damage than good.") affected.createwound(CUT, 15) @@ -367,7 +367,7 @@ /datum/surgery_step/internal/detoxify surgery_name = "Detoxify" blood_level = 1 - allowed_tools = list(/obj/item/weapon/surgical/bioregen=100) + allowed_tools = list(/obj/item/surgical/bioregen=100) min_duration = 90 max_duration = 120 diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index d393f4759e4..0fe2e47895c 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -32,8 +32,8 @@ /datum/surgery_step/robotics/unscrew_hatch surgery_name = "Unscrew Hatch" allowed_tools = list( - /obj/item/weapon/coin = 50, - /obj/item/weapon/material/knife = 50 + /obj/item/coin = 50, + /obj/item/material/knife = 50 ) allowed_procs = list(IS_SCREWDRIVER = 100) @@ -72,8 +72,8 @@ /datum/surgery_step/robotics/open_hatch surgery_name = "Open Hatch" allowed_tools = list( - /obj/item/weapon/surgical/retractor = 100, - /obj/item/weapon/material/kitchen/utensil = 50 + /obj/item/surgical/retractor = 100, + /obj/item/material/kitchen/utensil = 50 ) allowed_procs = list(IS_CROWBAR = 100) @@ -110,8 +110,8 @@ /datum/surgery_step/robotics/close_hatch surgery_name = "Close Hatch" allowed_tools = list( - /obj/item/weapon/surgical/retractor = 100, - /obj/item/weapon/material/kitchen/utensil = 50 + /obj/item/surgical/retractor = 100, + /obj/item/material/kitchen/utensil = 50 ) allowed_procs = list(IS_CROWBAR = 100) @@ -149,8 +149,8 @@ /datum/surgery_step/robotics/repair_brute surgery_name = "Repair Robotic Brute" allowed_tools = list( - /obj/item/weapon/weldingtool = 100, - /obj/item/weapon/pickaxe/plasmacutter = 50 + /obj/item/weldingtool = 100, + /obj/item/pickaxe/plasmacutter = 50 ) min_duration = 50 @@ -159,8 +159,8 @@ /datum/surgery_step/robotics/repair_brute/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) if(..()) var/obj/item/organ/external/affected = target.get_organ(target_zone) - if(istype(tool, /obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/welder = tool + if(istype(tool, /obj/item/weldingtool)) + var/obj/item/weldingtool/welder = tool if(!welder.isOn() || !welder.remove_fuel(1,user)) return 0 return affected && affected.open == 3 && (affected.disfigured || affected.brute_dam > 0) && target_zone != O_MOUTH @@ -241,7 +241,7 @@ surgery_name = "Fix Robotic Organ" allowed_tools = list( /obj/item/stack/nanopaste = 100, \ - /obj/item/weapon/surgical/bonegel = 30, \ + /obj/item/surgical/bonegel = 30, \ ) allowed_procs = list(IS_SCREWDRIVER = 100) @@ -311,7 +311,7 @@ /datum/surgery_step/robotics/detatch_organ_robotic surgery_name = "Detach Robotic Organ" allowed_tools = list( - /obj/item/device/multitool = 100 + /obj/item/multitool = 100 ) min_duration = 90 @@ -435,7 +435,7 @@ /datum/surgery_step/robotics/install_mmi surgery_name = "Install MMI" allowed_tools = list( - /obj/item/device/mmi = 100 + /obj/item/mmi = 100 ) min_duration = 60 @@ -445,7 +445,7 @@ if(target_zone != BP_HEAD) return - var/obj/item/device/mmi/M = tool + var/obj/item/mmi/M = tool var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!(affected && affected.open == 3)) return 0 @@ -484,14 +484,14 @@ user.visible_message("[user] has installed \the [tool] into [target]'s [affected.name].", \ "You have installed \the [tool] into [target]'s [affected.name].") - var/obj/item/device/mmi/M = tool + var/obj/item/mmi/M = tool // VOREstation edit begin - Select the proper mmi holder subtype based on the brain inserted var/obj/item/organ/internal/mmi_holder/holder = null - if(istype(M,/obj/item/device/mmi/digital/posibrain/nano)) + if(istype(M,/obj/item/mmi/digital/posibrain/nano)) holder = new /obj/item/organ/internal/mmi_holder/posibrain/nano(target, 1) - else if(istype(M,/obj/item/device/mmi/digital/posibrain)) + else if(istype(M,/obj/item/mmi/digital/posibrain)) holder = new /obj/item/organ/internal/mmi_holder/posibrain(target, 1) - else if(istype(M,/obj/item/device/mmi/digital/robot)) + else if(istype(M,/obj/item/mmi/digital/robot)) holder = new /obj/item/organ/internal/mmi_holder/robot(target, 1) else holder = new /obj/item/organ/internal/mmi_holder(target, 1) // Fallback to old behavior if organic MMI or if no subtype exists. @@ -532,7 +532,7 @@ /datum/surgery_step/robotics/install_nymph surgery_name = "Install Nymph" allowed_tools = list( - /obj/item/weapon/holder/diona = 100 + /obj/item/holder/diona = 100 ) min_duration = 60 @@ -542,7 +542,7 @@ if(target_zone != BP_TORSO) return - var/obj/item/weapon/holder/diona/N = tool + var/obj/item/holder/diona/N = tool var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!(affected && affected.open == 3)) @@ -584,7 +584,7 @@ user.visible_message("[user] has installed \the [tool] into [target]'s [affected.name].", \ "You have installed \the [tool] into [target]'s [affected.name].") - var/obj/item/weapon/holder/diona/N = tool + var/obj/item/holder/diona/N = tool var/obj/item/organ/internal/brain/cephalon/cephalon = new(target, 1) target.internal_organs_by_name["brain"] = cephalon var/mob/living/carbon/alien/diona/D = N.held_mob diff --git a/code/modules/surgery/slimes.dm b/code/modules/surgery/slimes.dm index 84d697272ce..6b4dcee4cf0 100644 --- a/code/modules/surgery/slimes.dm +++ b/code/modules/surgery/slimes.dm @@ -15,9 +15,9 @@ /datum/surgery_step/slime/cut_flesh surgery_name = "Cut Flesh" allowed_tools = list( - /obj/item/weapon/surgical/scalpel = 100, \ - /obj/item/weapon/material/knife = 75, \ - /obj/item/weapon/material/shard = 50, \ + /obj/item/surgical/scalpel = 100, \ + /obj/item/material/knife = 75, \ + /obj/item/material/shard = 50, \ ) min_duration = 30 @@ -44,9 +44,9 @@ /datum/surgery_step/slime/cut_innards surgery_name = "Cut Innards" allowed_tools = list( - /obj/item/weapon/surgical/scalpel = 100, \ - /obj/item/weapon/material/knife = 75, \ - /obj/item/weapon/material/shard = 50, \ + /obj/item/surgical/scalpel = 100, \ + /obj/item/material/knife = 75, \ + /obj/item/material/shard = 50, \ ) min_duration = 30 @@ -73,8 +73,8 @@ /datum/surgery_step/slime/saw_core surgery_name = "Remove Core" allowed_tools = list( - /obj/item/weapon/surgical/circular_saw = 100, \ - /obj/item/weapon/material/knife/machete/hatchet = 75 + /obj/item/surgical/circular_saw = 100, \ + /obj/item/material/knife/machete/hatchet = 75 ) min_duration = 50 diff --git a/code/modules/tables/interactions.dm b/code/modules/tables/interactions.dm index 711373cfe3d..74ff2d1d20d 100644 --- a/code/modules/tables/interactions.dm +++ b/code/modules/tables/interactions.dm @@ -90,8 +90,8 @@ if (!W) return // Handle harm intent grabbing/tabling. - if(istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) - var/obj/item/weapon/grab/G = W + if(istype(W, /obj/item/grab) && get_dist(src,user)<2) + var/obj/item/grab/G = W if (istype(G.affecting, /mob/living)) var/mob/living/M = G.affecting var/obj/occupied = turf_is_crowded() @@ -111,7 +111,7 @@ playsound(src, 'sound/weapons/tablehit1.ogg', 50, 1) var/list/L = take_damage(rand(1,5)) // Shards. Extra damage, plus potentially the fact YOU LITERALLY HAVE A PIECE OF GLASS/METAL/WHATEVER IN YOUR FACE - for(var/obj/item/weapon/material/shard/S in L) + for(var/obj/item/material/shard/S in L) if(prob(50)) M.visible_message("\The [S] slices [M]'s face messily!", "\The [S] slices your face messily!") @@ -135,7 +135,7 @@ if(W.loc != user) // This should stop mounted modules ending up outside the module. return - if(istype(W, /obj/item/weapon/melee/energy/blade)) + if(istype(W, /obj/item/melee/energy/blade)) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) spark_system.start() @@ -145,7 +145,7 @@ break_to_parts() return - if(istype(W, /obj/item/weapon/melee/changeling/arm_blade)) + if(istype(W, /obj/item/melee/changeling/arm_blade)) user.visible_message("\The [src] was sliced apart by [user]!") break_to_parts() return diff --git a/code/modules/tables/presets.dm b/code/modules/tables/presets.dm index e15d7466c4e..31b99bb90dd 100644 --- a/code/modules/tables/presets.dm +++ b/code/modules/tables/presets.dm @@ -137,7 +137,7 @@ verbs -= /obj/structure/table/proc/do_put ..() -/obj/structure/table/alien/dismantle(obj/item/weapon/tool/wrench/W, mob/user) +/obj/structure/table/alien/dismantle(obj/item/tool/wrench/W, mob/user) to_chat(user, "You cannot dismantle \the [src].") return diff --git a/code/modules/tables/presets_vr.dm b/code/modules/tables/presets_vr.dm index 35fc8f8bd79..54bbc62d86e 100644 --- a/code/modules/tables/presets_vr.dm +++ b/code/modules/tables/presets_vr.dm @@ -14,7 +14,7 @@ ..() -/obj/structure/table/darkglass/dismantle(obj/item/weapon/tool/wrench/W, mob/user) +/obj/structure/table/darkglass/dismantle(obj/item/tool/wrench/W, mob/user) to_chat(user, "You cannot dismantle \the [src].") return /obj/structure/table/alien/blue @@ -37,7 +37,7 @@ ..() -/obj/structure/table/fancyblack/dismantle(obj/item/weapon/tool/wrench/W, mob/user) +/obj/structure/table/fancyblack/dismantle(obj/item/tool/wrench/W, mob/user) to_chat(user, "You cannot dismantle \the [src].") return diff --git a/code/modules/tables/rack.dm b/code/modules/tables/rack.dm index c1232d8cf00..7b570e75da9 100644 --- a/code/modules/tables/rack.dm +++ b/code/modules/tables/rack.dm @@ -23,6 +23,6 @@ color = material.icon_colour return -/obj/structure/table/rack/holorack/dismantle(obj/item/weapon/tool/wrench/W, mob/user) +/obj/structure/table/rack/holorack/dismantle(obj/item/tool/wrench/W, mob/user) to_chat(user, "You cannot dismantle \the [src].") return diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index ba13be37d57..b03b45c5ac8 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -97,7 +97,7 @@ var/list/table_icon_cache = list() if(0.5 to 1.0) . += "It has a few scrapes and dents." -/obj/structure/table/attackby(obj/item/weapon/W, mob/user) +/obj/structure/table/attackby(obj/item/W, mob/user) if(reinforced && W.has_tool_quality(TOOL_SCREWDRIVER)) remove_reinforced(W, user) @@ -143,7 +143,7 @@ var/list/table_icon_cache = list() return 1 if(health < maxhealth && W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/F = W.get_welder() + var/obj/item/weldingtool/F = W.get_welder() if(F.welding) to_chat(user, "You begin reparing damage to \the [src].") playsound(src, F.usesound, 50, 1) @@ -271,10 +271,10 @@ var/list/table_icon_cache = list() manipulating = 0 return null -/obj/structure/table/proc/remove_reinforced(obj/item/weapon/S, mob/user) +/obj/structure/table/proc/remove_reinforced(obj/item/S, mob/user) reinforced = common_material_remove(user, reinforced, 40 * S.toolspeed, "reinforcements", "screws", S.usesound) -/obj/structure/table/proc/remove_material(obj/item/weapon/W, mob/user) +/obj/structure/table/proc/remove_material(obj/item/W, mob/user) material = common_material_remove(user, material, 20 * W.toolspeed, "plating", "bolts", W.usesound) /obj/structure/table/proc/dismantle(obj/item/W, mob/user) @@ -292,7 +292,7 @@ var/list/table_icon_cache = list() qdel(src) return -// Returns a list of /obj/item/weapon/material/shard objects that were created as a result of this table's breakage. +// Returns a list of /obj/item/material/shard objects that were created as a result of this table's breakage. // Used for !fun! things such as embedding shards in the faces of tableslammed people. // The repeated @@ -302,7 +302,7 @@ var/list/table_icon_cache = list() /obj/structure/table/proc/break_to_parts(full_return = 0) var/list/shards = list() - var/obj/item/weapon/material/shard/S = null + var/obj/item/material/shard/S = null if(reinforced) if(reinforced.stack_type && (full_return || prob(20))) reinforced.place_sheet(loc, 1) diff --git a/code/modules/telesci/bscyrstal.dm b/code/modules/telesci/bscyrstal.dm index 2349755a7b2..0676657bd95 100644 --- a/code/modules/telesci/bscyrstal.dm +++ b/code/modules/telesci/bscyrstal.dm @@ -1,6 +1,6 @@ // Bluespace crystals, used in telescience and when crushed it will blink you to a random turf. -/obj/item/weapon/bluespace_crystal +/obj/item/bluespace_crystal name = "bluespace crystal" desc = "A glowing bluespace crystal, not much is known about how they work. It looks very delicate." icon = 'icons/obj/telescience.dmi' @@ -9,12 +9,12 @@ origin_tech = list(TECH_BLUESPACE = 6, TECH_MATERIAL = 3) var/blink_range = 8 // The teleport range when crushed/thrown at someone. -/obj/item/weapon/bluespace_crystal/New() +/obj/item/bluespace_crystal/New() ..() pixel_x = rand(-5, 5) pixel_y = rand(-5, 5) -/obj/item/weapon/bluespace_crystal/attack_self(mob/user) +/obj/item/bluespace_crystal/attack_self(mob/user) user.visible_message("[user] crushes [src]!", "You crush [src]!") var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread() s.set_up(5, 1, get_turf(src)) @@ -23,10 +23,10 @@ user.unEquip(src) qdel(src) -/obj/item/weapon/bluespace_crystal/proc/blink_mob(mob/living/L) +/obj/item/bluespace_crystal/proc/blink_mob(mob/living/L) do_teleport(L, get_turf(L), blink_range, asoundin = 'sound/effects/phasein.ogg') -/obj/item/weapon/bluespace_crystal/throw_impact(atom/hit_atom) +/obj/item/bluespace_crystal/throw_impact(atom/hit_atom) if(!..()) // not caught in mid-air visible_message("[src] fizzles and disappears upon impact!") var/turf/T = get_turf(hit_atom) @@ -39,7 +39,7 @@ // Artifical bluespace crystal, doesn't give you much research. -/obj/item/weapon/bluespace_crystal/artificial +/obj/item/bluespace_crystal/artificial name = "artificial bluespace crystal" desc = "An artificially made bluespace crystal, it looks delicate." origin_tech = list(TECH_BLUESPACE = 3, TECH_PHORON = 4) diff --git a/code/modules/telesci/construction.dm b/code/modules/telesci/construction.dm index e9098814412..4e2bab30a63 100644 --- a/code/modules/telesci/construction.dm +++ b/code/modules/telesci/construction.dm @@ -4,30 +4,30 @@ // The circuit boards -/obj/item/weapon/circuitboard/telesci_console +/obj/item/circuitboard/telesci_console name = T_BOARD("Telepad Control Console") build_path = /obj/machinery/computer/telescience origin_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 3, TECH_PHORON = 4) -/obj/item/weapon/circuitboard/telesci_pad +/obj/item/circuitboard/telesci_pad name = T_BOARD("Telepad") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/telepad origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4, TECH_PHORON = 4, TECH_BLUESPACE = 5) req_components = list( - /obj/item/weapon/bluespace_crystal = 1, - /obj/item/weapon/stock_parts/capacitor = 2, + /obj/item/bluespace_crystal = 1, + /obj/item/stock_parts/capacitor = 2, /obj/item/stack/cable_coil = 5, - /obj/item/weapon/stock_parts/console_screen = 1) + /obj/item/stock_parts/console_screen = 1) // Bamfpads! Ported from /tg/ -/obj/item/weapon/circuitboard/quantumpad +/obj/item/circuitboard/quantumpad name = T_BOARD("quantum pad") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/power/quantumpad origin_tech = list(TECH_ENGINEERING = 4, TECH_POWER = 4, TECH_BLUESPACE = 4) req_components = list( - /obj/item/weapon/bluespace_crystal = 1, - /obj/item/weapon/stock_parts/capacitor = 1, - /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/bluespace_crystal = 1, + /obj/item/stock_parts/capacitor = 1, + /obj/item/stock_parts/manipulator = 1, /obj/item/stack/cable_coil = 5) diff --git a/code/modules/telesci/gps_advanced.dm b/code/modules/telesci/gps_advanced.dm index 4b67718570e..e06c7f60715 100644 --- a/code/modules/telesci/gps_advanced.dm +++ b/code/modules/telesci/gps_advanced.dm @@ -3,7 +3,7 @@ // These are distinguished from the ordinary "Relay Position Devices" that just print your location // In that they are also all networked with each other to show each other's locations. -/obj/item/device/gps/advanced +/obj/item/gps/advanced name = "global positioning system" desc = "Helping lost spacemen find their way through the planets since 1995." icon = 'icons/obj/telescience.dmi' @@ -14,17 +14,17 @@ var/gpstag = "COM0" emped = 0 -/obj/item/device/gps/advanced/New() +/obj/item/gps/advanced/New() ..() GPS_list.Add(src) name = "global positioning system ([gpstag])" add_overlay("working") -/obj/item/device/gps/advanced/Destroy() +/obj/item/gps/advanced/Destroy() GPS_list.Remove(src) . = ..() -/obj/item/device/gps/advanced/emp_act(severity) +/obj/item/gps/advanced/emp_act(severity) emped = 1 cut_overlay("working") add_overlay("emp") @@ -33,16 +33,16 @@ cut_overlay("emp") add_overlay("working") -/obj/item/device/gps/advanced/attack_self(mob/user as mob) +/obj/item/gps/advanced/attack_self(mob/user as mob) - var/obj/item/device/gps/advanced/t = "" + var/obj/item/gps/advanced/t = "" if(emped) t += "ERROR" else t += "
Set Tag " t += "
Tag: [gpstag]" - for(var/obj/item/device/gps/advanced/G in GPS_list) + for(var/obj/item/gps/advanced/G in GPS_list) var/turf/pos = get_turf(G) var/area/gps_area = get_area(G) var/tracked_gpstag = G.gpstag @@ -56,7 +56,7 @@ popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) popup.open() -/obj/item/device/gps/advanced/Topic(href, href_list) +/obj/item/gps/advanced/Topic(href, href_list) ..() if(href_list["tag"] ) var/a = tgui_input_text(usr, "Please enter desired tag.", name, gpstag) @@ -66,14 +66,14 @@ name = "global positioning system ([gpstag])" attack_self(usr) -/obj/item/device/gps/advanced/science +/obj/item/gps/advanced/science icon_state = "gps-s" gpstag = "SCI0" -/obj/item/device/gps/advanced/engineering +/obj/item/gps/advanced/engineering icon_state = "gps-e" gpstag = "ENG0" -/obj/item/device/gps/advanced/security +/obj/item/gps/advanced/security icon_state = "gps-sec" gpstag = "SEC0" diff --git a/code/modules/telesci/quantum_pad.dm b/code/modules/telesci/quantum_pad.dm index 1ca5dfbf4e7..500815ea4e2 100644 --- a/code/modules/telesci/quantum_pad.dm +++ b/code/modules/telesci/quantum_pad.dm @@ -7,7 +7,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 200 active_power_usage = 5000 - circuit = /obj/item/weapon/circuitboard/quantumpad + circuit = /obj/item/circuitboard/quantumpad var/teleport_cooldown = 400 //30 seconds base due to base parts var/teleport_speed = 50 var/last_teleport //to handle the cooldown @@ -47,12 +47,12 @@ /obj/machinery/power/quantumpad/RefreshParts() var/E = 0 - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) E += M.rating power_efficiency = E E = 0 - for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts) + for(var/obj/item/stock_parts/capacitor/C in component_parts) E += C.rating teleport_speed = initial(teleport_speed) @@ -64,27 +64,27 @@ if(default_deconstruction_screwdriver(user, I)) return - if(istype(I, /obj/item/device/multitool)) + if(istype(I, /obj/item/multitool)) //VOREStation Addition Start if(istype(get_area(src), /area/shuttle)) to_chat(user, "This is too unstable a platform for \the [src] to operate on!") return //VOREStation Addition End if(panel_open) - var/obj/item/device/multitool/M = I + var/obj/item/multitool/M = I M.connectable = src to_chat(user, "You save the data in [I]'s buffer.") return 1 else - var/obj/item/device/multitool/M = I + var/obj/item/multitool/M = I if(istype(M.connectable, /obj/machinery/power/quantumpad)) linked_pad = M.connectable to_chat(user, "You link [src] to the one in [I]'s buffer.") update_icon() return 1 - if(istype(I, /obj/item/device/quantum_pad_booster)) - var/obj/item/device/quantum_pad_booster/booster = I + if(istype(I, /obj/item/quantum_pad_booster)) + var/obj/item/quantum_pad_booster/booster = I visible_message("[user] violently jams [booster] into the side of [src]. [src] beeps, quietly.", \ "You hear the sound of a device being improperly installed in sensitive machinery, then subsequent beeping.", runemessage = "beep!") playsound(src, 'sound/items/rped.ogg', 25, 1) @@ -303,7 +303,7 @@ flick("qpad-beam-out", src) transport_objects(get_turf(dest)) -/obj/item/device/quantum_pad_booster +/obj/item/quantum_pad_booster icon = 'icons/obj/device_vr.dmi' name = "quantum pad particle booster" desc = "A deceptively simple interface for increasing the mass of objects a quantum pad is capable of teleporting, at the cost of increased power draw." diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index 334997397d1..ef7ae75e88d 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -6,7 +6,7 @@ icon_state = "pad-idle" anchored = TRUE use_power = USE_POWER_IDLE - circuit = /obj/item/weapon/circuitboard/telesci_pad + circuit = /obj/item/circuitboard/telesci_pad idle_power_usage = 200 active_power_usage = 5000 var/efficiency @@ -14,17 +14,17 @@ /obj/machinery/telepad/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/bluespace_crystal(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/weapon/stock_parts/capacitor(src) - component_parts += new /obj/item/weapon/stock_parts/console_screen(src) + component_parts += new /obj/item/bluespace_crystal(src) + component_parts += new /obj/item/stock_parts/capacitor(src) + component_parts += new /obj/item/stock_parts/capacitor(src) + component_parts += new /obj/item/stock_parts/console_screen(src) component_parts += new /obj/item/stack/cable_coil(src, 5) RefreshParts() update_icon() /obj/machinery/telepad/RefreshParts() var/E - for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts) + for(var/obj/item/stock_parts/capacitor/C in component_parts) E += C.rating efficiency = E @@ -38,8 +38,8 @@ if(default_part_replacement(user, W)) return if(panel_open) - if(istype(W, /obj/item/device/multitool)) - var/obj/item/device/multitool/M = W + if(istype(W, /obj/item/multitool)) + var/obj/item/multitool/M = W M.connectable = src to_chat(user, "You save the data in the [M.name]'s buffer.") return 1 diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 304cd3f4aac..fb978ca4eed 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -3,7 +3,7 @@ desc = "Used to teleport objects to and from the telescience telepad." icon_screen = "teleport" icon_keyboard = "teleport_key" - circuit = /obj/item/weapon/circuitboard/telesci_console + circuit = /obj/item/circuitboard/telesci_console var/sending = 1 var/obj/machinery/telepad/telepad = null var/temp_msg = "Telescience control console initialized. Welcome." @@ -27,7 +27,7 @@ // Used to adjust OP-ness: (4 crystals * 6 efficiency * 12.5 coefficient) = 300 range. var/powerCoefficient = 12.5 var/list/crystals = list() - var/obj/item/device/gps/inserted_gps + var/obj/item/gps/inserted_gps var/overmap_range = 3 /obj/machinery/computer/telescience/Destroy() @@ -46,10 +46,10 @@ . = ..() recalibrate() for(var/i = 1; i <= starting_crystals; i++) - crystals += new /obj/item/weapon/bluespace_crystal/artificial(src) // starting crystals + crystals += new /obj/item/bluespace_crystal/artificial(src) // starting crystals /obj/machinery/computer/telescience/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/weapon/bluespace_crystal)) + if(istype(W, /obj/item/bluespace_crystal)) if(crystals.len >= max_crystals) to_chat(user, "There are not enough crystal slots.") return @@ -59,14 +59,14 @@ W.forceMove(src) user.visible_message("[user] inserts [W] into \the [src]'s crystal slot.", "You insert [W] into \the [src]'s crystal slot.") updateDialog() - else if(istype(W, /obj/item/device/gps)) + else if(istype(W, /obj/item/gps)) if(!inserted_gps) inserted_gps = W user.unEquip(W) W.forceMove(src) user.visible_message("[user] inserts [W] into \the [src]'s GPS device slot.", "You insert [W] into \the [src]'s GPS device slot.") - else if(istype(W, /obj/item/device/multitool)) - var/obj/item/device/multitool/M = W + else if(istype(W, /obj/item/multitool)) + var/obj/item/multitool/M = W if(M.connectable && istype(M.connectable, /obj/machinery/telepad)) telepad = M.connectable M.connectable = null diff --git a/code/modules/tension/tension.dm b/code/modules/tension/tension.dm index 1bef2025973..8a8955920f9 100644 --- a/code/modules/tension/tension.dm +++ b/code/modules/tension/tension.dm @@ -180,9 +180,9 @@ if(!isnull(M.outgoing_melee_damage_percent)) weapon_damage *= M.outgoing_melee_damage_percent - if(istype(I, /obj/item/weapon/gun)) + if(istype(I, /obj/item/gun)) will_point_blank = TRUE - var/obj/item/weapon/gun/G = I + var/obj/item/gun/G = I var/obj/item/projectile/P P = new G.projectile_type() diff --git a/code/modules/tgui/modules/_base.dm b/code/modules/tgui/modules/_base.dm index c77e93813b5..f1a693a4a58 100644 --- a/code/modules/tgui/modules/_base.dm +++ b/code/modules/tgui/modules/_base.dm @@ -52,7 +52,7 @@ Code is pretty much ripped verbatim from nano modules, but with un-needed stuff if(!istype(user)) return 0 - var/obj/item/weapon/card/id/I = user.GetIdCard() + var/obj/item/card/id/I = user.GetIdCard() if(!I) return 0 diff --git a/code/modules/tgui/modules/agentcard.dm b/code/modules/tgui/modules/agentcard.dm index fd84c98760f..d45834c9abd 100644 --- a/code/modules/tgui/modules/agentcard.dm +++ b/code/modules/tgui/modules/agentcard.dm @@ -5,7 +5,7 @@ /datum/tgui_module/agentcard/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = ..() - var/obj/item/weapon/card/id/syndicate/S = tgui_host() + var/obj/item/card/id/syndicate/S = tgui_host() if(!istype(S)) return list() @@ -28,7 +28,7 @@ return data /datum/tgui_module/agentcard/tgui_status(mob/user, datum/tgui_state/state) - var/obj/item/weapon/card/id/syndicate/S = tgui_host() + var/obj/item/card/id/syndicate/S = tgui_host() if(!istype(S)) return STATUS_CLOSE if(user != S.registered_user) @@ -39,7 +39,7 @@ if(..()) return TRUE - var/obj/item/weapon/card/id/syndicate/S = tgui_host() + var/obj/item/card/id/syndicate/S = tgui_host() switch(action) if("electronic_warfare") S.electronic_warfare = !S.electronic_warfare diff --git a/code/modules/tgui/modules/appearance_changer_vr.dm b/code/modules/tgui/modules/appearance_changer_vr.dm index fc77d8663c0..d469f4b2925 100644 --- a/code/modules/tgui/modules/appearance_changer_vr.dm +++ b/code/modules/tgui/modules/appearance_changer_vr.dm @@ -51,7 +51,7 @@ customize_usr = TRUE /datum/tgui_module/appearance_changer/cocoon/tgui_status(mob/user, datum/tgui_state/state) - //if(!istype(owner.loc, /obj/item/weapon/storage/vore_egg/bugcocoon)) + //if(!istype(owner.loc, /obj/item/storage/vore_egg/bugcocoon)) if(!owner.transforming) return STATUS_CLOSE return ..() \ No newline at end of file diff --git a/code/modules/tgui/modules/communications.dm b/code/modules/tgui/modules/communications.dm index ab1a5755e4c..582ae6c4161 100644 --- a/code/modules/tgui/modules/communications.dm +++ b/code/modules/tgui/modules/communications.dm @@ -221,7 +221,7 @@ if(check_access(usr, access_captain)) authenticated = COMM_AUTHENTICATION_MAX var/mob/M = usr - var/obj/item/weapon/card/id = M.GetIdCard() + var/obj/item/card/id = M.GetIdCard() if(istype(id)) crew_announcement.announcer = GetNameAndAssignmentFromId(id) if(authenticated == COMM_AUTHENTICATION_NONE) diff --git a/code/modules/tgui/modules/ntos-only/cardmod.dm b/code/modules/tgui/modules/ntos-only/cardmod.dm index dcebc1e5b20..0a329b58d25 100644 --- a/code/modules/tgui/modules/ntos-only/cardmod.dm +++ b/code/modules/tgui/modules/ntos-only/cardmod.dm @@ -41,7 +41,7 @@ data["target_owner"] = null data["target_name"] = null if(program && program.computer && program.computer.card_slot) - var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card + var/obj/item/card/id/id_card = program.computer.card_slot.stored_card data["has_modify"] = !!id_card data["account_number"] = id_card ? id_card.associated_account_number : null data["id_rank"] = id_card && id_card.assignment ? id_card.assignment : "Unassigned" @@ -64,7 +64,7 @@ var/list/all_centcom_access = list() var/list/regions = list() if(program.computer.card_slot && program.computer.card_slot.stored_card) - var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card + var/obj/item/card/id/id_card = program.computer.card_slot.stored_card if(is_centcom) for(var/access in get_all_centcom_access()) all_centcom_access.Add(list(list( @@ -97,7 +97,7 @@ if(!istype(program)) return null - var/obj/item/weapon/card/id/id_card = program.computer.card_slot ? program.computer.card_slot.stored_card : null + var/obj/item/card/id/id_card = program.computer.card_slot ? program.computer.card_slot.stored_card : null var/list/formatted = list() for(var/job in jobs) formatted.Add(list(list( @@ -119,8 +119,8 @@ if(!istype(computer)) return TRUE - var/obj/item/weapon/card/id/user_id_card = usr.GetIdCard() - var/obj/item/weapon/card/id/id_card + var/obj/item/card/id/user_id_card = usr.GetIdCard() + var/obj/item/card/id/id_card if(computer.card_slot) id_card = computer.card_slot.stored_card diff --git a/code/modules/tgui/modules/ntos-only/configurator.dm b/code/modules/tgui/modules/ntos-only/configurator.dm index 263409f5e3a..d20ff147f31 100644 --- a/code/modules/tgui/modules/ntos-only/configurator.dm +++ b/code/modules/tgui/modules/ntos-only/configurator.dm @@ -25,7 +25,7 @@ var/list/hardware = movable.get_all_components() var/list/all_entries[0] - for(var/obj/item/weapon/computer_hardware/H in hardware) + for(var/obj/item/computer_hardware/H in hardware) all_entries.Add(list(list( "name" = H.name, "desc" = H.desc, @@ -42,7 +42,7 @@ return switch(action) if("PC_toggle_component") - var/obj/item/weapon/computer_hardware/H = movable.find_hardware_by_name(params["name"]) + var/obj/item/computer_hardware/H = movable.find_hardware_by_name(params["name"]) if(H && istype(H)) H.enabled = !H.enabled . = TRUE \ No newline at end of file diff --git a/code/modules/tgui/modules/ntos-only/uav.dm b/code/modules/tgui/modules/ntos-only/uav.dm index eec4a420789..5e120506ad0 100644 --- a/code/modules/tgui/modules/ntos-only/uav.dm +++ b/code/modules/tgui/modules/ntos-only/uav.dm @@ -2,7 +2,7 @@ name = "UAV Control" tgui_id = "UAV" ntos = TRUE - var/obj/item/device/uav/current_uav = null //The UAV we're watching + var/obj/item/uav/current_uav = null //The UAV we're watching var/signal_strength = 0 //Our last signal strength report (cached for a few seconds) var/signal_test_counter = 0 //How long until next signal strength check var/list/viewers //Who's viewing a UAV through us @@ -31,7 +31,7 @@ var/obj/item/modular_computer/mc_host = tgui_host() if(istype(mc_host)) for(var/datum/weakref/wr as anything in mc_host.paired_uavs) - var/obj/item/device/uav/U = wr.resolve() + var/obj/item/uav/U = wr.resolve() paired_map.Add(list(list("name" = "[U ? U.nickname : "!!Missing!!"]", "uavref" = "\ref[U]"))) data["paired_uavs"] = paired_map @@ -43,7 +43,7 @@ switch(action) if("switch_uav") - var/obj/item/device/uav/U = locate(params["switch_uav"]) //This is a \ref to the UAV itself + var/obj/item/uav/U = locate(params["switch_uav"]) //This is a \ref to the UAV itself if(!istype(U)) to_chat(usr,"Something is blocking the connection to that UAV. In-person investigation is required.") return FALSE @@ -88,7 +88,7 @@ unlook(M) return TRUE -/datum/tgui_module/uav/proc/set_current(var/obj/item/device/uav/U) +/datum/tgui_module/uav/proc/set_current(var/obj/item/uav/U) if(current_uav == U) return diff --git a/code/modules/tgui/modules/teleporter.dm b/code/modules/tgui/modules/teleporter.dm index 5baefde9eb6..34d2650b889 100644 --- a/code/modules/tgui/modules/teleporter.dm +++ b/code/modules/tgui/modules/teleporter.dm @@ -26,7 +26,7 @@ var/list/L = list() var/list/areaindex = list() - for(var/obj/item/device/radio/beacon/R in all_beacons) + for(var/obj/item/radio/beacon/R in all_beacons) var/turf/T = get_turf(R) if(!T) continue @@ -39,7 +39,7 @@ areaindex[tmpname] = 1 L[tmpname] = R - for(var/obj/item/weapon/implant/tracking/I in all_tracking_implants) + for(var/obj/item/implant/tracking/I in all_tracking_implants) if(!I.implanted || !ismob(I.loc)) continue else diff --git a/code/modules/turbolift/turbolift_console.dm b/code/modules/turbolift/turbolift_console.dm index 4a17deabc2f..1ed15ff70db 100644 --- a/code/modules/turbolift/turbolift_console.dm +++ b/code/modules/turbolift/turbolift_console.dm @@ -69,7 +69,7 @@ // Hit it with a PDA or ID to enable priority call mode /obj/structure/lift/button/attackby(obj/item/W as obj, mob/user as mob) - var/obj/item/weapon/card/id/id = W.GetID() + var/obj/item/card/id/id = W.GetID() if(istype(id)) if(!check_access(id)) playsound(src, 'sound/machines/buzz-two.ogg', 50, 0) @@ -123,7 +123,7 @@ // Hit it with a PDA or ID to enable priority call mode /obj/structure/lift/panel/attackby(obj/item/W as obj, mob/user as mob) - var/obj/item/weapon/card/id/id = W.GetID() + var/obj/item/card/id/id = W.GetID() if(istype(id)) if(!check_access(id)) playsound(src, 'sound/machines/buzz-two.ogg', 50, 0) diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm index f01c535f5a2..c1f3279972f 100644 --- a/code/modules/vehicles/Securitrain_vr.dm +++ b/code/modules/vehicles/Securitrain_vr.dm @@ -23,11 +23,11 @@ var/car_limit = 0 //how many cars an engine can pull before performance degrades. This should be 0 to prevent trailers from unhitching. active_engines = 1 - var/obj/item/weapon/key/key - var/key_type = /obj/item/weapon/key/security + var/obj/item/key/key + var/key_type = /obj/item/key/security var/siren = 0 //This is for eventually getting the siren sprite to work. -/obj/item/weapon/key/security +/obj/item/key/security name = "The Security Cart key" desc = "The Security Cart Key used to start it." icon = 'icons/obj/vehicles_vr.dmi' @@ -61,7 +61,7 @@ //------------------------------------------- /obj/vehicle/train/security/engine/New() ..() - cell = new /obj/item/weapon/cell/high(src) + cell = new /obj/item/cell/high(src) key = new key_type(src) var/image/I = new(icon = 'icons/obj/vehicles.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs add_overlay(I) @@ -83,14 +83,14 @@ return ..() -/obj/vehicle/train/security/trolley/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(open && istype(W, /obj/item/weapon/tool/wirecutters)) +/obj/vehicle/train/security/trolley/attackby(obj/item/W as obj, mob/user as mob) + if(open && istype(W, /obj/item/tool/wirecutters)) passenger_allowed = !passenger_allowed user.visible_message("[user] [passenger_allowed ? "cuts" : "mends"] a cable in [src].","You [passenger_allowed ? "cut" : "mend"] the load limiter cable.") else ..() -/obj/vehicle/train/security/engine/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/vehicle/train/security/engine/attackby(obj/item/W as obj, mob/user as mob) if(istype(W, key_type)) if(!key) user.drop_item() @@ -113,10 +113,10 @@ else icon_state = initial(icon_state) -/obj/vehicle/train/security/trolley/insert_cell(var/obj/item/weapon/cell/C, var/mob/living/carbon/human/H) +/obj/vehicle/train/security/trolley/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H) return -/obj/vehicle/train/security/engine/insert_cell(var/obj/item/weapon/cell/C, var/mob/living/carbon/human/H) +/obj/vehicle/train/security/engine/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H) ..() update_stats() diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm index 783ed376d35..9c24ae9a6a1 100644 --- a/code/modules/vehicles/bike.dm +++ b/code/modules/vehicles/bike.dm @@ -30,7 +30,7 @@ /obj/vehicle/bike/Initialize() . = ..() - cell = new /obj/item/weapon/cell/high(src) + cell = new /obj/item/cell/high(src) ion = new /datum/effect/effect/system/ion_trail_follow() ion.set_up(src) turn_off() @@ -46,8 +46,8 @@ paint_color = rgb(rand(1,255),rand(1,255),rand(1,255)) ..() -/obj/vehicle/bike/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/device/multitool) && open) +/obj/vehicle/bike/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/multitool) && open) var/new_paint = input(usr, "Please select paint color.", "Paint Color", paint_color) as color|null if(new_paint) paint_color = new_paint diff --git a/code/modules/vehicles/boat.dm b/code/modules/vehicles/boat.dm index 170ad4aa81e..e3f10fc8978 100644 --- a/code/modules/vehicles/boat.dm +++ b/code/modules/vehicles/boat.dm @@ -36,7 +36,7 @@ ..(newloc, MAT_SIFWOOD) // Oars, which must be held inhand while in a boat to move it. -/obj/item/weapon/oar +/obj/item/oar name = "oar" icon = 'icons/obj/vehicles.dmi' desc = "Used to provide propulsion to a boat." @@ -45,10 +45,10 @@ force = 12 var/datum/material/material = null -/obj/item/weapon/oar/sifwood/New(newloc, material_name) +/obj/item/oar/sifwood/New(newloc, material_name) ..(newloc, MAT_SIFWOOD) -/obj/item/weapon/oar/New(newloc, material_name) +/obj/item/oar/New(newloc, material_name) ..(newloc) if(!material_name) material_name = "wood" diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index e5182ba94f6..3d3079c1136 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -15,10 +15,10 @@ var/speed_mod = 1.1 var/car_limit = 3 //how many cars an engine can pull before performance degrades active_engines = 1 - var/obj/item/weapon/key/key - var/key_type = /obj/item/weapon/key/cargo_train + var/obj/item/key/key + var/key_type = /obj/item/key/cargo_train -/obj/item/weapon/key/cargo_train +/obj/item/key/cargo_train name = "key" desc = "A keyring with a small steel key, and a yellow fob reading \"Choo Choo!\"." icon = 'icons/obj/vehicles.dmi' @@ -44,7 +44,7 @@ //------------------------------------------- /obj/vehicle/train/engine/New() ..() - cell = new /obj/item/weapon/cell/high(src) + cell = new /obj/item/cell/high(src) key = new key_type(src) var/image/I = new(icon = 'icons/obj/vehicles_vr.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs //VOREStation edit add_overlay(I) @@ -67,14 +67,14 @@ return ..() -/obj/vehicle/train/trolley/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/vehicle/train/trolley/attackby(obj/item/W as obj, mob/user as mob) if(open && W.has_tool_quality(TOOL_WIRECUTTER)) passenger_allowed = !passenger_allowed user.visible_message("[user] [passenger_allowed ? "cuts" : "mends"] a cable in [src].","You [passenger_allowed ? "cut" : "mend"] the load limiter cable.") else ..() -/obj/vehicle/train/engine/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/vehicle/train/engine/attackby(obj/item/W as obj, mob/user as mob) if(istype(W, key_type)) if(!key) user.drop_item() @@ -100,10 +100,10 @@ icon_state = initial(icon_state) */ -/obj/vehicle/train/trolley/insert_cell(var/obj/item/weapon/cell/C, var/mob/living/carbon/human/H) +/obj/vehicle/train/trolley/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H) return -/obj/vehicle/train/engine/insert_cell(var/obj/item/weapon/cell/C, var/mob/living/carbon/human/H) +/obj/vehicle/train/engine/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H) ..() update_stats() diff --git a/code/modules/vehicles/construction.dm b/code/modules/vehicles/construction.dm index d7c22676af9..acc13e745aa 100644 --- a/code/modules/vehicles/construction.dm +++ b/code/modules/vehicles/construction.dm @@ -2,7 +2,7 @@ * Construction! */ -/obj/item/weapon/vehicle_assembly +/obj/item/vehicle_assembly name = "vehicle assembly" desc = "The frame of some vehicle." icon = 'icons/obj/vehicles_64x64.dmi' @@ -14,14 +14,14 @@ w_class = 5 var/build_stage = 0 - var/obj/item/weapon/cell/cell = null + var/obj/item/cell/cell = null -/obj/item/weapon/vehicle_assembly/New() +/obj/item/vehicle_assembly/New() ..() icon_state = "[initial(icon_state)][build_stage]" update_icon() -/obj/item/weapon/vehicle_assembly/proc/increase_step(var/new_name = null) +/obj/item/vehicle_assembly/proc/increase_step(var/new_name = null) build_stage++ if(new_name) name = new_name @@ -33,13 +33,13 @@ * Quadbike and trailer. */ -/obj/item/weapon/vehicle_assembly/quadbike +/obj/item/vehicle_assembly/quadbike name = "all terrain vehicle assembly" desc = "The frame of an ATV." icon_state = "quad-frame" pixel_x = -16 -/obj/item/weapon/vehicle_assembly/quadbike/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/item/vehicle_assembly/quadbike/attackby(var/obj/item/W as obj, var/mob/user as mob) ..() switch(build_stage) @@ -57,7 +57,7 @@ return if(1) - if(istype(W, /obj/item/weapon/stock_parts/console_screen)) + if(istype(W, /obj/item/stock_parts/console_screen)) user.drop_item() qdel(W) to_chat(user, "You add the lights to \the [src].") @@ -65,7 +65,7 @@ return if(2) - if(istype(W, /obj/item/weapon/stock_parts/spring)) + if(istype(W, /obj/item/stock_parts/spring)) user.drop_item() qdel(W) to_chat(user, "You add the control system to \the [src].") @@ -77,7 +77,7 @@ to_chat(user, "You need five sheets of steel to convert \the [src] into a trailer.") if(do_after(user, 80) && build_stage == 2) if(S.use(5)) - var/obj/item/weapon/vehicle_assembly/quadtrailer/Trailer = new(src) + var/obj/item/vehicle_assembly/quadtrailer/Trailer = new(src) Trailer.forceMove(get_turf(src)) Trailer.increase_step("framed [initial(Trailer.name)]") to_chat(user, "You convert \the [src] into \the [Trailer].") @@ -99,7 +99,7 @@ return if(4) - if(istype(W, /obj/item/weapon/cell)) + if(istype(W, /obj/item/cell)) user.drop_item() W.forceMove(src) cell = W @@ -108,7 +108,7 @@ return if(5) - if(istype(W, /obj/item/weapon/stock_parts/motor)) + if(istype(W, /obj/item/stock_parts/motor)) user.drop_item() qdel(W) to_chat(user, "You add the motor to \the [src].") @@ -145,19 +145,19 @@ return ..() -/obj/item/weapon/vehicle_assembly/quadtrailer +/obj/item/vehicle_assembly/quadtrailer name = "all terrain trailer" desc = "The frame of a small trailer." icon_state = "quadtrailer-frame" pixel_x = -16 -/obj/item/weapon/vehicle_assembly/quadtrailer/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/item/vehicle_assembly/quadtrailer/attackby(var/obj/item/W as obj, var/mob/user as mob) ..() switch(build_stage) if(0) - if(istype(W, /obj/item/weapon/vehicle_assembly/quadbike)) - var/obj/item/weapon/vehicle_assembly/quadbike/Q = W + if(istype(W, /obj/item/vehicle_assembly/quadbike)) + var/obj/item/vehicle_assembly/quadbike/Q = W if(Q.build_stage > 2) to_chat(user, "\The [Q] is too advanced to be of use with \the [src]") return @@ -192,7 +192,7 @@ * Space bike. */ -/obj/item/weapon/vehicle_assembly/spacebike +/obj/item/vehicle_assembly/spacebike name = "vehicle assembly" desc = "The frame of some vehicle." icon = 'icons/obj/bike.dmi' @@ -200,10 +200,10 @@ pixel_x = 0 -/obj/item/weapon/vehicle_assembly/spacebike/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/item/vehicle_assembly/spacebike/attackby(var/obj/item/W as obj, var/mob/user as mob) switch(build_stage) if(0) - if(istype(W, /obj/item/weapon/tank/jetpack) || istype(W, /obj/item/borg/upgrade/advanced/jetpack)) + if(istype(W, /obj/item/tank/jetpack) || istype(W, /obj/item/borg/upgrade/advanced/jetpack)) user.drop_item() qdel(W) increase_step() @@ -235,7 +235,7 @@ return if(3) - if(istype(W, /obj/item/weapon/stock_parts/console_screen)) + if(istype(W, /obj/item/stock_parts/console_screen)) user.drop_item() qdel(W) to_chat(user, "You add the lights to \the [src].") @@ -243,7 +243,7 @@ return if(4) - if(istype(W, /obj/item/weapon/stock_parts/spring)) + if(istype(W, /obj/item/stock_parts/spring)) user.drop_item() qdel(W) to_chat(user, "You add the control system to \the [src].") @@ -251,7 +251,7 @@ return if(5) - if(istype(W, /obj/item/weapon/cell)) + if(istype(W, /obj/item/cell)) user.drop_item() W.forceMove(src) cell = W @@ -279,13 +279,13 @@ * Snowmobile. */ -/obj/item/weapon/vehicle_assembly/snowmobile +/obj/item/vehicle_assembly/snowmobile name = "snowmobile assembly" desc = "The frame of a snowmobile." icon = 'icons/obj/vehicles.dmi' icon_state = "snowmobile-frame" -/obj/item/weapon/vehicle_assembly/snowmobile/attackby(var/obj/item/W as obj, var/mob/user as mob) +/obj/item/vehicle_assembly/snowmobile/attackby(var/obj/item/W as obj, var/mob/user as mob) switch(build_stage) if(0) if(istype(W, /obj/item/stack/material/steel)) @@ -301,7 +301,7 @@ return if(1) - if(istype(W, /obj/item/weapon/stock_parts/console_screen)) + if(istype(W, /obj/item/stock_parts/console_screen)) user.drop_item() qdel(W) to_chat(user, "You add the lights to \the [src].") @@ -309,7 +309,7 @@ return if(2) - if(istype(W, /obj/item/weapon/stock_parts/spring)) + if(istype(W, /obj/item/stock_parts/spring)) user.drop_item() qdel(W) to_chat(user, "You add the control system to \the [src].") @@ -330,7 +330,7 @@ return if(4) - if(istype(W, /obj/item/weapon/cell)) + if(istype(W, /obj/item/cell)) user.drop_item() W.forceMove(src) cell = W @@ -339,7 +339,7 @@ return if(5) - if(istype(W, /obj/item/weapon/stock_parts/motor)) + if(istype(W, /obj/item/stock_parts/motor)) user.drop_item() qdel(W) to_chat(user, "You add the motor to \the [src].") diff --git a/code/modules/vehicles/quad.dm b/code/modules/vehicles/quad.dm index 00bedf8778f..67f94949473 100644 --- a/code/modules/vehicles/quad.dm +++ b/code/modules/vehicles/quad.dm @@ -16,7 +16,7 @@ speed_mod = 0.45 car_limit = 1 //It gets a trailer. That's about it. active_engines = 1 - key_type = /obj/item/weapon/key/quadbike + key_type = /obj/item/key/quadbike var/frame_state = "quad" //Custom-item proofing! var/paint_base = 'icons/obj/vehicles_64x64.dmi' @@ -28,7 +28,7 @@ var/outdoors_speed_mod = 0.7 //The general 'outdoors' speed. I.E., the general difference you'll be at when driving outside. /obj/vehicle/train/engine/quadbike/New() - cell = new /obj/item/weapon/cell/high(src) + cell = new /obj/item/cell/high(src) key = new key_type(src) soundloop = new(list(src), FALSE) . = ..() @@ -47,7 +47,7 @@ QDEL_NULL(soundloop) return ..() -/obj/item/weapon/key/quadbike +/obj/item/key/quadbike name = "key" desc = "A keyring with a small steel key, and a blue fob reading \"ZOOM!\"." icon = 'icons/obj/vehicles.dmi' @@ -88,8 +88,8 @@ if(8) pixel_y = 0 -/obj/vehicle/train/engine/quadbike/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/device/multitool) && open) +/obj/vehicle/train/engine/quadbike/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/multitool) && open) var/new_paint = input(usr, "Please select paint color.", "Paint Color", paint_color) as color|null if(new_paint) paint_color = new_paint @@ -276,8 +276,8 @@ Bodypaint.color = paint_color add_overlay(Bodypaint) -/obj/vehicle/train/trolley/trailer/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/device/multitool) && open) +/obj/vehicle/train/trolley/trailer/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/multitool) && open) var/new_paint = input(usr, "Please select paint color.", "Paint Color", paint_color) as color|null if(new_paint) paint_color = new_paint diff --git a/code/modules/vehicles/rover_vr.dm b/code/modules/vehicles/rover_vr.dm index 9c1a670c547..fb5e5a81689 100644 --- a/code/modules/vehicles/rover_vr.dm +++ b/code/modules/vehicles/rover_vr.dm @@ -25,7 +25,7 @@ var/car_limit = 0 //how many cars an engine can pull before performance degrades. This should be 0 to prevent trailers from unhitching. active_engines = 1 - var/obj/item/weapon/key/rover/key + var/obj/item/key/rover/key var/siren = 0 //This is for eventually getting the siren sprite to work. /obj/vehicle/train/rover/engine/dunebuggy @@ -34,7 +34,7 @@ icon = 'icons/vore/rover_vr.dmi' icon_state = "dunebug" -/obj/item/weapon/key/rover +/obj/item/key/rover name = "The Rover key" desc = "The Rover key used to start it." icon = 'icons/obj/vehicles_vr.dmi' @@ -60,7 +60,7 @@ //------------------------------------------- /obj/vehicle/train/rover/engine/New() ..() - cell = new /obj/item/weapon/cell/high(src) + cell = new /obj/item/cell/high(src) key = new(src) turn_off() //so engine verbs are correctly set @@ -80,15 +80,15 @@ return ..() -/obj/vehicle/train/rover/trolley/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(open && istype(W, /obj/item/weapon/tool/wirecutters)) +/obj/vehicle/train/rover/trolley/attackby(obj/item/W as obj, mob/user as mob) + if(open && istype(W, /obj/item/tool/wirecutters)) passenger_allowed = !passenger_allowed user.visible_message("[user] [passenger_allowed ? "cuts" : "mends"] a cable in [src].","You [passenger_allowed ? "cut" : "mend"] the load limiter cable.") else ..() -/obj/vehicle/train/rover/engine/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/key/rover)) +/obj/vehicle/train/rover/engine/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/key/rover)) if(!key) user.drop_item() W.forceMove(src) @@ -111,10 +111,10 @@ else icon_state = initial(icon_state) -/obj/vehicle/train/rover/trolley/insert_cell(var/obj/item/weapon/cell/C, var/mob/living/carbon/human/H) +/obj/vehicle/train/rover/trolley/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H) return -/obj/vehicle/train/rover/engine/insert_cell(var/obj/item/weapon/cell/C, var/mob/living/carbon/human/H) +/obj/vehicle/train/rover/engine/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H) ..() update_stats() diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 3f95ae5fa30..75e94c9ad7c 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -31,7 +31,7 @@ var/powered = 0 //set if vehicle is powered and should use fuel when moving var/move_delay = 1 //set this to limit the speed of the vehicle - var/obj/item/weapon/cell/cell + var/obj/item/cell/cell var/charge_use = 5 //set this to adjust the amount of power the vehicle uses per move var/paint_color = "#666666" //For vehicles with special paint overlays. @@ -92,8 +92,8 @@ if(load && !(load in buckled_mobs) && !istype(load, /datum/vehicle_dummy_load)) load.forceMove(loc) -/obj/vehicle/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/hand_labeler)) +/obj/vehicle/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/hand_labeler)) return if(mechanical) if(W.has_tool_quality(TOOL_SCREWDRIVER)) @@ -105,10 +105,10 @@ else if(W.has_tool_quality(TOOL_CROWBAR) && cell && open) remove_cell(user) - else if(istype(W, /obj/item/weapon/cell) && !cell && open) + else if(istype(W, /obj/item/cell) && !cell && open) insert_cell(W, user) else if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/T = W.get_welder() + var/obj/item/weldingtool/T = W.get_welder() if(T.welding) if(health < maxhealth) if(open) @@ -277,7 +277,7 @@ turn_on() return -/obj/vehicle/proc/insert_cell(var/obj/item/weapon/cell/C, var/mob/living/carbon/human/H) +/obj/vehicle/proc/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H) if(!mechanical) return if(cell) diff --git a/code/modules/ventcrawl/ventcrawl.dm b/code/modules/ventcrawl/ventcrawl.dm index 2ae067c4433..098fc3c5eef 100644 --- a/code/modules/ventcrawl/ventcrawl.dm +++ b/code/modules/ventcrawl/ventcrawl.dm @@ -5,10 +5,10 @@ var/list/ventcrawl_machinery = list( // Vent crawling whitelisted items, whoo /mob/living/var/list/can_enter_vent_with = list( - /obj/item/weapon/implant, - /obj/item/device/radio/borg, - /obj/item/device/radio/headset/mob_headset, - /obj/item/weapon/holder, + /obj/item/implant, + /obj/item/radio/borg, + /obj/item/radio/headset/mob_headset, + /obj/item/holder, /obj/machinery/camera, /obj/belly, /obj/screen, diff --git a/code/modules/virus2/analyser.dm b/code/modules/virus2/analyser.dm index e3524100f11..f9522caea8a 100644 --- a/code/modules/virus2/analyser.dm +++ b/code/modules/virus2/analyser.dm @@ -9,13 +9,13 @@ var/scanning = 0 var/pause = 0 - var/obj/item/weapon/virusdish/dish = null + var/obj/item/virusdish/dish = null /obj/machinery/disease2/diseaseanalyser/attackby(var/obj/O as obj, var/mob/user as mob) if(default_unfasten_wrench(user, O, 20)) return - else if(!istype(O,/obj/item/weapon/virusdish)) return + else if(!istype(O,/obj/item/virusdish)) return if(dish) to_chat(user, "\The [src] is already loaded.") @@ -37,7 +37,7 @@ if (dish.virus2.addToDB()) ping("\The [src] pings, \"New pathogen added to data bank.\"") - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src.loc) + var/obj/item/paper/P = new /obj/item/paper(src.loc) P.name = "paper - [dish.virus2.name()]" var/r = dish.virus2.get_info() diff --git a/code/modules/virus2/biohazard destroyer.dm b/code/modules/virus2/biohazard destroyer.dm index 2be7c17d1e4..37eaf06561c 100644 --- a/code/modules/virus2/biohazard destroyer.dm +++ b/code/modules/virus2/biohazard destroyer.dm @@ -2,7 +2,7 @@ name = "Biohazard destroyer" icon = 'icons/obj/pipes/disposal.dmi' icon_state = "disposalbio" - var/list/accepts = list(/obj/item/clothing,/obj/item/weapon/virusdish/,/obj/item/weapon/cureimplanter,/obj/item/weapon/diseasedisk,/obj/item/weapon/reagent_containers) + var/list/accepts = list(/obj/item/clothing,/obj/item/virusdish/,/obj/item/cureimplanter,/obj/item/diseasedisk,/obj/item/reagent_containers) density = TRUE anchored = TRUE diff --git a/code/modules/virus2/centrifuge.dm b/code/modules/virus2/centrifuge.dm index 4cfb570a8d6..7c17ea24e9a 100644 --- a/code/modules/virus2/centrifuge.dm +++ b/code/modules/virus2/centrifuge.dm @@ -6,7 +6,7 @@ var/curing var/isolating - var/obj/item/weapon/reagent_containers/glass/beaker/vial/sample = null + var/obj/item/reagent_containers/glass/beaker/vial/sample = null var/datum/disease2/disease/virus2 = null /obj/machinery/computer/centrifuge/attackby(var/obj/item/O as obj, var/mob/user as mob) @@ -16,7 +16,7 @@ if(default_unfasten_wrench(user, O, 20)) return - if(istype(O,/obj/item/weapon/reagent_containers/glass/beaker/vial)) + if(istype(O,/obj/item/reagent_containers/glass/beaker/vial)) if(sample) to_chat(user, "\The [src] is already loaded.") return @@ -157,7 +157,7 @@ /obj/machinery/computer/centrifuge/proc/isolate() if(!sample) return - var/obj/item/weapon/virusdish/dish = new/obj/item/weapon/virusdish(loc) + var/obj/item/virusdish/dish = new/obj/item/virusdish(loc) dish.virus2 = virus2 virus2 = null @@ -166,7 +166,7 @@ ping("\The [src] pings, \"Pathogen isolated.\"") /obj/machinery/computer/centrifuge/proc/print(var/mob/user) - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(loc) + var/obj/item/paper/P = new /obj/item/paper(loc) P.name = "paper - Pathology Report" P.info = {" [virology_letterhead("Pathology Report")] diff --git a/code/modules/virus2/curer.dm b/code/modules/virus2/curer.dm index 0ecd1133a07..a901d648069 100644 --- a/code/modules/virus2/curer.dm +++ b/code/modules/virus2/curer.dm @@ -2,25 +2,25 @@ name = "cure research machine" icon_keyboard = "med_key" icon_screen = "dna" - circuit = /obj/item/weapon/circuitboard/curefab + circuit = /obj/item/circuitboard/curefab var/curing var/virusing - var/obj/item/weapon/reagent_containers/container = null + var/obj/item/reagent_containers/container = null /obj/machinery/computer/curer/attackby(var/obj/I as obj, var/mob/user as mob) - if(istype(I,/obj/item/weapon/reagent_containers)) + if(istype(I,/obj/item/reagent_containers)) var/mob/living/carbon/C = user if(!container) container = I C.drop_item() I.loc = src return - if(istype(I,/obj/item/weapon/virusdish)) + if(istype(I,/obj/item/virusdish)) if(virusing) to_chat(user, "The pathogen materializer is still recharging..") return - var/obj/item/weapon/reagent_containers/glass/beaker/product = new(src.loc) + var/obj/item/reagent_containers/glass/beaker/product = new(src.loc) var/list/data = list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"virus2"=list(),"antibodies"=list()) data["virus2"] |= I:virus2 @@ -93,8 +93,8 @@ src.updateUsrDialog() -/obj/machinery/computer/curer/proc/createcure(var/obj/item/weapon/reagent_containers/container) - var/obj/item/weapon/reagent_containers/glass/beaker/product = new(src.loc) +/obj/machinery/computer/curer/proc/createcure(var/obj/item/reagent_containers/container) + var/obj/item/reagent_containers/glass/beaker/product = new(src.loc) var/datum/reagent/blood/B = locate() in container.reagents.reagent_list diff --git a/code/modules/virus2/diseasesplicer.dm b/code/modules/virus2/diseasesplicer.dm index bd76a0330e9..74f9ad43d48 100644 --- a/code/modules/virus2/diseasesplicer.dm +++ b/code/modules/virus2/diseasesplicer.dm @@ -6,7 +6,7 @@ var/datum/disease2/effectholder/memorybank = null var/list/species_buffer = null var/analysed = 0 - var/obj/item/weapon/virusdish/dish = null + var/obj/item/virusdish/dish = null var/burning = 0 var/splicing = 0 var/scanning = 0 @@ -18,7 +18,7 @@ if(default_unfasten_wrench(user, I, 20)) return - if(istype(I,/obj/item/weapon/virusdish)) + if(istype(I,/obj/item/virusdish)) var/mob/living/carbon/c = user if(dish) to_chat(user, "\The [src] is already loaded.") @@ -28,7 +28,7 @@ c.drop_item() I.loc = src - if(istype(I,/obj/item/weapon/diseasedisk)) + if(istype(I,/obj/item/diseasedisk)) to_chat(user, "You upload the contents of the disk onto the buffer.") memorybank = I:effect species_buffer = I:species @@ -110,7 +110,7 @@ if(burning) burning -= 1 if(!burning) - var/obj/item/weapon/diseasedisk/d = new /obj/item/weapon/diseasedisk(src.loc) + var/obj/item/diseasedisk/d = new /obj/item/diseasedisk(src.loc) d.analysed = analysed if(analysed) if(memorybank) diff --git a/code/modules/virus2/dishincubator.dm b/code/modules/virus2/dishincubator.dm index 7dab15e01ad..d6a84991d1d 100644 --- a/code/modules/virus2/dishincubator.dm +++ b/code/modules/virus2/dishincubator.dm @@ -5,8 +5,8 @@ anchored = TRUE icon = 'icons/obj/virology_vr.dmi' //VOREStation Edit icon_state = "incubator" - var/obj/item/weapon/virusdish/dish - var/obj/item/weapon/reagent_containers/glass/beaker = null + var/obj/item/virusdish/dish + var/obj/item/reagent_containers/glass/beaker = null var/radiation = 0 var/on = 0 @@ -19,7 +19,7 @@ if(default_unfasten_wrench(user, O, 20)) return - if(istype(O, /obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/syringe)) + if(istype(O, /obj/item/reagent_containers/glass) || istype(O,/obj/item/reagent_containers/syringe)) if(beaker) to_chat(user, "\The [src] is already loaded.") @@ -35,7 +35,7 @@ src.attack_hand(user) return - if(istype(O, /obj/item/weapon/virusdish)) + if(istype(O, /obj/item/virusdish)) if(dish) to_chat(user, "The dish tray is aleady full!") diff --git a/code/modules/virus2/isolator.dm b/code/modules/virus2/isolator.dm index 59a5ff81c3e..7e4dc129728 100644 --- a/code/modules/virus2/isolator.dm +++ b/code/modules/virus2/isolator.dm @@ -7,7 +7,7 @@ icon_state = "isolator" var/isolating = 0 var/datum/disease2/disease/virus2 = null - var/obj/item/weapon/reagent_containers/syringe/sample = null + var/obj/item/reagent_containers/syringe/sample = null /obj/machinery/disease2/isolator/update_icon() if (stat & (BROKEN|NOPOWER)) @@ -25,8 +25,8 @@ if(default_unfasten_wrench(user, O, 20)) return - else if(!istype(O,/obj/item/weapon/reagent_containers/syringe)) return - var/obj/item/weapon/reagent_containers/syringe/S = O + else if(!istype(O,/obj/item/reagent_containers/syringe)) return + var/obj/item/reagent_containers/syringe/S = O if(sample) to_chat(user, "\The [src] is already loaded.") @@ -94,7 +94,7 @@ isolating -= 1 if (isolating == 0) if (virus2) - var/obj/item/weapon/virusdish/d = new /obj/item/weapon/virusdish(src.loc) + var/obj/item/virusdish/d = new /obj/item/virusdish(src.loc) d.virus2 = virus2.getcopy() virus2 = null ping("\The [src] pings, \"Viral strain isolated.\"") @@ -143,7 +143,7 @@ return TRUE /obj/machinery/disease2/isolator/proc/print(mob/user, list/params) - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(loc) + var/obj/item/paper/P = new /obj/item/paper(loc) switch(params["type"]) if("patient_diagnosis") diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm index 358b88845fd..280d0e653ab 100644 --- a/code/modules/virus2/items_devices.dm +++ b/code/modules/virus2/items_devices.dm @@ -1,6 +1,6 @@ ///////////////ANTIBODY SCANNER/////////////// -/obj/item/device/antibody_scanner +/obj/item/antibody_scanner name = "antibody scanner" desc = "Scans living beings for antibodies in their blood." icon = 'icons/obj/device_vr.dmi' @@ -8,7 +8,7 @@ w_class = ITEMSIZE_SMALL item_state = "electronic" -/obj/item/device/antibody_scanner/attack(mob/M as mob, mob/user as mob) +/obj/item/antibody_scanner/attack(mob/M as mob, mob/user as mob) if(!istype(M,/mob/living/carbon/)) report("Scan aborted: Incompatible target.", user) return @@ -30,12 +30,12 @@ else report("Antibodies detected: [antigens2string(C.antibodies)]", user) -/obj/item/device/antibody_scanner/proc/report(var/text, mob/user as mob) +/obj/item/antibody_scanner/proc/report(var/text, mob/user as mob) to_chat(user, "[span_blue("[icon2html(src, user.client)] \The [src] beeps,")] \"[span_blue("[text]")]\"") ///////////////VIRUS DISH/////////////// -/obj/item/weapon/virusdish +/obj/item/virusdish name = "virus dish" icon = 'icons/obj/items.dmi' icon_state = "virussample" @@ -45,17 +45,17 @@ var/info = 0 var/analysed = 0 -/obj/item/weapon/virusdish/random +/obj/item/virusdish/random name = "virus sample" -/obj/item/weapon/virusdish/random/New() +/obj/item/virusdish/random/New() ..() src.virus2 = new /datum/disease2/disease src.virus2.makerandom() growth = rand(5, 50) -/obj/item/weapon/virusdish/attackby(var/obj/item/weapon/W as obj,var/mob/living/carbon/user as mob) - if(istype(W,/obj/item/weapon/hand_labeler) || istype(W,/obj/item/weapon/reagent_containers/syringe)) +/obj/item/virusdish/attackby(var/obj/item/W as obj,var/mob/living/carbon/user as mob) + if(istype(W,/obj/item/hand_labeler) || istype(W,/obj/item/reagent_containers/syringe)) //VOREstation edit - Actually functional virus dishes // Originally this returns, THEN calls ..() instead of returning the value of ..() return ..() @@ -68,12 +68,12 @@ infect_virus2(target, src.virus2) qdel(src) -/obj/item/weapon/virusdish/examine(mob/user) +/obj/item/virusdish/examine(mob/user) . = ..() if(basic_info) . += "[basic_info] : More Information" -/obj/item/weapon/virusdish/Topic(href, href_list) +/obj/item/virusdish/Topic(href, href_list) . = ..() if(.) return 1 @@ -81,14 +81,14 @@ usr << browse(info, "window=info_\ref[src]") return 1 -/obj/item/weapon/ruinedvirusdish +/obj/item/ruinedvirusdish name = "ruined virus sample" icon = 'icons/obj/items.dmi' icon_state = "virussample-ruined" desc = "The bacteria in the dish are completely dead." -/obj/item/weapon/ruinedvirusdish/attackby(var/obj/item/weapon/W as obj,var/mob/living/carbon/user as mob) - if(istype(W,/obj/item/weapon/hand_labeler) || istype(W,/obj/item/weapon/reagent_containers/syringe)) +/obj/item/ruinedvirusdish/attackby(var/obj/item/W as obj,var/mob/living/carbon/user as mob) + if(istype(W,/obj/item/hand_labeler) || istype(W,/obj/item/reagent_containers/syringe)) return ..() if(prob(50)) @@ -97,7 +97,7 @@ ///////////////GNA DISK/////////////// -/obj/item/weapon/diseasedisk +/obj/item/diseasedisk name = "blank GNA disk" icon = 'icons/obj/cloning.dmi' icon_state = "datadisk0" @@ -107,7 +107,7 @@ var/stage = 1 var/analysed = 1 -/obj/item/weapon/diseasedisk/premade/New() +/obj/item/diseasedisk/premade/New() name = "blank GNA disk (stage: [stage])" effect = new /datum/disease2/effectholder effect.effect = new /datum/disease2/effect/invisible diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 61587119dd7..bf45c74d008 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -54,9 +54,9 @@ var/fancy_vore = FALSE // Using the new sounds? var/is_wet = TRUE // Is this belly's insides made of slimy parts? var/wet_loop = TRUE // Does the belly have a fleshy loop playing? - var/obj/item/weapon/storage/vore_egg/ownegg // Is this belly creating an egg? + var/obj/item/storage/vore_egg/ownegg // Is this belly creating an egg? var/egg_type = "Egg" // Default egg type and path. - var/egg_path = /obj/item/weapon/storage/vore_egg + var/egg_path = /obj/item/storage/vore_egg var/list/list/emote_lists = list() // Idle emotes that happen on their own, depending on the bellymode. Contains lists of strings indexed by bellymode var/emote_time = 60 // How long between stomach emotes at prey (in seconds) var/emote_active = TRUE // Are we even giving emotes out at all or not? @@ -650,7 +650,7 @@ L.muffled = FALSE L.forced_psay = FALSE - for(var/obj/item/weapon/holder/H in M.contents) + for(var/obj/item/holder/H in M.contents) H.held_mob.muffled = FALSE H.held_mob.forced_psay = FALSE @@ -1081,7 +1081,7 @@ for(var/obj/item/W in M) if(istype(W, /obj/item/organ/internal/mmi_holder/posibrain)) var/obj/item/organ/internal/mmi_holder/MMI = W - var/obj/item/device/mmi/brainbox = MMI.removed() + var/obj/item/mmi/brainbox = MMI.removed() if(brainbox) items_preserved += brainbox for(var/slot in slots) @@ -1092,7 +1092,7 @@ I.gurgle_contaminate(contents, contamination_flavor, contamination_color) //We do an initial contamination pass to get stuff like IDs wet. if(item_digest_mode == IM_HOLD) items_preserved |= I - else if(item_digest_mode == IM_DIGEST_FOOD && !(istype(I,/obj/item/weapon/reagent_containers/food) || istype(I,/obj/item/organ))) + else if(item_digest_mode == IM_DIGEST_FOOD && !(istype(I,/obj/item/reagent_containers/food) || istype(I,/obj/item/organ))) items_preserved |= I //Reagent transfer @@ -1772,7 +1772,7 @@ ourmob.reset_view(owner) if(isitem(content)) var/obj/item/I = content - if(istype(I,/obj/item/weapon/card/id)) + if(istype(I,/obj/item/card/id)) I.gurgle_contaminate(target.contents, target.contamination_flavor, target.contamination_color) if(I.gurgled && target.contaminates) I.decontaminate() diff --git a/code/modules/vore/eating/bellymodes_datum_vr.dm b/code/modules/vore/eating/bellymodes_datum_vr.dm index 40c9efef5cf..f3ac184b8d3 100644 --- a/code/modules/vore/eating/bellymodes_datum_vr.dm +++ b/code/modules/vore/eating/bellymodes_datum_vr.dm @@ -189,7 +189,7 @@ GLOBAL_LIST_INIT(digest_modes, list()) /datum/digest_mode/egg/handle_atoms(obj/belly/B, list/touchable_atoms) var/list/egg_contents = list() for(var/E in touchable_atoms) - if(istype(E, /obj/item/weapon/storage/vore_egg)) // Don't egg other eggs. + if(istype(E, /obj/item/storage/vore_egg)) // Don't egg other eggs. continue if(isliving(E)) var/mob/living/L = E @@ -217,9 +217,9 @@ GLOBAL_LIST_INIT(digest_modes, list()) return list("to_update" = TRUE) if(isliving(C)) var/mob/living/M = C - var/mob_holder_type = M.holder_type || /obj/item/weapon/holder + var/mob_holder_type = M.holder_type || /obj/item/holder B.ownegg.w_class = M.size_multiplier * 4 //Egg size and weight scaled to match occupant. - var/obj/item/weapon/holder/H = new mob_holder_type(B.ownegg, M) + var/obj/item/holder/H = new mob_holder_type(B.ownegg, M) B.ownegg.max_storage_space = H.w_class B.ownegg.icon_scale_x = 0.25 * B.ownegg.w_class B.ownegg.icon_scale_y = 0.25 * B.ownegg.w_class diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index a18e6b24086..6c9f8d116b4 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -240,14 +240,14 @@ /obj/belly/proc/handle_digesting_item(obj/item/I) var/did_an_item = FALSE // We always contaminate IDs. - if(contaminates || istype(I, /obj/item/weapon/card/id)) + if(contaminates || istype(I, /obj/item/card/id)) I.gurgle_contaminate(src, contamination_flavor, contamination_color) switch(item_digest_mode) if(IM_HOLD) items_preserved |= I if(IM_DIGEST_FOOD) - if(istype(I,/obj/item/weapon/reagent_containers/food) || istype(I, /obj/item/organ)) + if(istype(I,/obj/item/reagent_containers/food) || istype(I, /obj/item/organ)) var/obj/item/organ/R = I if(istype(R) && R.robotic >= ORGAN_ROBOT) items_preserved |= I diff --git a/code/modules/vore/eating/contaminate_vr.dm b/code/modules/vore/eating/contaminate_vr.dm index 19c7029c2be..e74b59607a5 100644 --- a/code/modules/vore/eating/contaminate_vr.dm +++ b/code/modules/vore/eating/contaminate_vr.dm @@ -81,20 +81,20 @@ var/list/gurgled_overlays = list( ////////////// // Special handling of gurgle_contaminate ////////////// -/obj/item/weapon/card/id/gurgle_contaminate(var/atom/movable/item_storage = null) +/obj/item/card/id/gurgle_contaminate(var/atom/movable/item_storage = null) digest_act(item_storage) //Contamination and digestion does same thing to these return TRUE -/obj/item/device/pda/gurgle_contaminate(var/atom/movable/item_storage = null) +/obj/item/pda/gurgle_contaminate(var/atom/movable/item_storage = null) return FALSE -/obj/item/weapon/reagent_containers/food/gurgle_contaminate(var/atom/movable/item_storage = null) +/obj/item/reagent_containers/food/gurgle_contaminate(var/atom/movable/item_storage = null) return FALSE -/obj/item/weapon/storage/vore_egg/gurgle_contaminate(var/atom/movable/item_storage = null) +/obj/item/storage/vore_egg/gurgle_contaminate(var/atom/movable/item_storage = null) return FALSE -/obj/item/weapon/holder/gurgle_contaminate(var/atom/movable/item_storage = null) +/obj/item/holder/gurgle_contaminate(var/atom/movable/item_storage = null) if(isbelly(loc)) digest_act(item_storage) return TRUE @@ -103,32 +103,32 @@ var/list/gurgled_overlays = list( /obj/item/organ/gurgle_contaminate(var/atom/movable/item_storage = null) return FALSE -/obj/item/weapon/cell/gurgle_contaminate(var/atom/movable/item_storage = null) +/obj/item/cell/gurgle_contaminate(var/atom/movable/item_storage = null) if(!gurgled) //Don't make them wet, just drain - var/obj/item/weapon/cell/C = src + var/obj/item/cell/C = src C.charge = 0 return TRUE -/obj/item/weapon/storage/box/gurgle_contaminate(var/atom/movable/item_storage = null) +/obj/item/storage/box/gurgle_contaminate(var/atom/movable/item_storage = null) if((. = ..())) name = "soggy [cleanname]" desc = "This soggy box is about to fall apart any time." //Storages that contaminate contents -/obj/item/weapon/storage/backpack/gurgle_contaminate(var/atom/movable/item_storage = null, var/contamination_flavor = "Generic", var/contamination_color = "green") +/obj/item/storage/backpack/gurgle_contaminate(var/atom/movable/item_storage = null, var/contamination_flavor = "Generic", var/contamination_color = "green") if(contents) for(var/obj/item/O in contents) O.gurgle_contaminate(item_storage, contamination_flavor, contamination_color) ..() -/obj/item/weapon/storage/belt/gurgle_contaminate(var/atom/movable/item_storage = null, var/contamination_flavor = "Generic", var/contamination_color = "green") +/obj/item/storage/belt/gurgle_contaminate(var/atom/movable/item_storage = null, var/contamination_flavor = "Generic", var/contamination_color = "green") if(contents) for(var/obj/item/O in contents) O.gurgle_contaminate(item_storage, contamination_flavor, contamination_color) ..() -/obj/item/weapon/storage/belt/gurgle_contaminate(var/atom/movable/item_storage = null, var/contamination_flavor = "Generic", var/contamination_color = "green") +/obj/item/storage/belt/gurgle_contaminate(var/atom/movable/item_storage = null, var/contamination_flavor = "Generic", var/contamination_color = "green") if(contents) for(var/obj/item/O in contents) O.gurgle_contaminate(item_storage, contamination_flavor, contamination_color) diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm index 186f1ec215d..65980b0cebf 100644 --- a/code/modules/vore/eating/digest_act_vr.dm +++ b/code/modules/vore/eating/digest_act_vr.dm @@ -4,9 +4,9 @@ // Ye default implementation. /obj/item/proc/digest_act(atom/movable/item_storage = null) - if(istype(item_storage, /obj/item/device/dogborg/sleeper)) - if(istype(src, /obj/item/device/pda)) - var/obj/item/device/pda/P = src + if(istype(item_storage, /obj/item/dogborg/sleeper)) + if(istype(src, /obj/item/pda)) + var/obj/item/pda/P = src if(P.id) P.id = null @@ -15,7 +15,7 @@ for(var/mob/living/M in contents)//Drop mobs from objects(shoes) before deletion M.forceMove(item_storage) for(var/obj/item/O in contents) - if(istype(O, /obj/item/weapon/storage/internal)) //Dump contents from dummy pockets. + if(istype(O, /obj/item/storage/internal)) //Dump contents from dummy pockets. for(var/obj/item/SO in O) if(item_storage) SO.forceMove(item_storage) @@ -39,8 +39,8 @@ g_damage = digest_stage digest_stage -= g_damage if(digest_stage <= 0) - if(istype(src, /obj/item/device/pda)) - var/obj/item/device/pda/P = src + if(istype(src, /obj/item/pda)) + var/obj/item/pda/P = src if(P.id) P.id = null for(var/mob/living/voice/V in possessed_voice) // Delete voices. @@ -48,7 +48,7 @@ for(var/mob/living/M in contents)//Drop mobs from objects(shoes) before deletion M.forceMove(item_storage) for(var/obj/item/O in contents) - if(istype(O,/obj/item/weapon/storage/internal)) //Dump contents from dummy pockets. + if(istype(O,/obj/item/storage/internal)) //Dump contents from dummy pockets. for(var/obj/item/SO in O) if(item_storage) SO.forceMove(item_storage) @@ -72,21 +72,21 @@ ///////////// // Some indigestible stuff ///////////// -/obj/item/weapon/hand_tele/digest_act(var/atom/movable/item_storage = null) +/obj/item/hand_tele/digest_act(var/atom/movable/item_storage = null) return FALSE -/obj/item/device/aicard/digest_act(var/atom/movable/item_storage = null) +/obj/item/aicard/digest_act(var/atom/movable/item_storage = null) return FALSE -/obj/item/device/paicard/digest_act(var/atom/movable/item_storage = null) +/obj/item/paicard/digest_act(var/atom/movable/item_storage = null) return FALSE -/obj/item/weapon/gun/digest_act(var/atom/movable/item_storage = null) +/obj/item/gun/digest_act(var/atom/movable/item_storage = null) return FALSE -/obj/item/weapon/pinpointer/digest_act(var/atom/movable/item_storage = null) +/obj/item/pinpointer/digest_act(var/atom/movable/item_storage = null) return FALSE /obj/item/areaeditor/blueprints/digest_act(var/atom/movable/item_storage = null) return FALSE -/obj/item/weapon/disk/nuclear/digest_act(var/atom/movable/item_storage = null) +/obj/item/disk/nuclear/digest_act(var/atom/movable/item_storage = null) return FALSE -/obj/item/device/perfect_tele_beacon/digest_act(var/atom/movable/item_storage = null) +/obj/item/perfect_tele_beacon/digest_act(var/atom/movable/item_storage = null) return FALSE //Sorta important to not digest your own beacons. /obj/item/organ/internal/brain/slime/digest_act(var/atom/movable/item_storage = null) return FALSE //so prometheans can be recovered @@ -95,7 +95,7 @@ // Some special treatment ///////////// -/obj/item/weapon/card/id/digest_act(atom/movable/item_storage = null) +/obj/item/card/id/digest_act(atom/movable/item_storage = null) desc = "A partially digested card that has seen better days. The damage appears to be only cosmetic." if(!sprite_stack || !istype(sprite_stack) || !(sprite_stack.len)) icon = 'icons/obj/card_vr.dmi' @@ -106,7 +106,7 @@ update_icon() return FALSE -/obj/item/weapon/reagent_containers/food/digest_act(atom/movable/item_storage = null) +/obj/item/reagent_containers/food/digest_act(atom/movable/item_storage = null) if(isbelly(item_storage)) var/obj/belly/B = item_storage if(ishuman(B.owner)) @@ -119,7 +119,7 @@ return w_class . = ..() -/obj/item/weapon/holder/digest_act(atom/movable/item_storage = null) +/obj/item/holder/digest_act(atom/movable/item_storage = null) for(var/mob/living/M in contents) if(item_storage) M.forceMove(item_storage) @@ -134,7 +134,7 @@ else . += 30 //Organs give a little more -/obj/item/weapon/storage/digest_act(atom/movable/item_storage = null) +/obj/item/storage/digest_act(atom/movable/item_storage = null) for(var/obj/item/I in contents) I.screen_loc = null @@ -143,7 +143,7 @@ ///////////// // Some more complicated stuff ///////////// -/obj/item/device/mmi/digital/posibrain/digest_act(atom/movable/item_storage = null) +/obj/item/mmi/digital/posibrain/digest_act(atom/movable/item_storage = null) //Replace this with a VORE setting so all types of posibrains can/can't be digested on a whim return FALSE diff --git a/code/modules/vore/eating/leave_remains_vr.dm b/code/modules/vore/eating/leave_remains_vr.dm index 7a7a3ac8a85..9855388424c 100644 --- a/code/modules/vore/eating/leave_remains_vr.dm +++ b/code/modules/vore/eating/leave_remains_vr.dm @@ -1,29 +1,29 @@ /datum/species - var/skull_type = /obj/item/weapon/digestion_remains/skull + var/skull_type = /obj/item/digestion_remains/skull /datum/species/tajaran - skull_type = /obj/item/weapon/digestion_remains/skull/tajaran + skull_type = /obj/item/digestion_remains/skull/tajaran /datum/species/unathi - skull_type = /obj/item/weapon/digestion_remains/skull/unathi + skull_type = /obj/item/digestion_remains/skull/unathi /datum/species/skrell - skull_type = /obj/item/weapon/digestion_remains/skull/skrell + skull_type = /obj/item/digestion_remains/skull/skrell /datum/species/spider - skull_type = /obj/item/weapon/digestion_remains/skull/vasilissan + skull_type = /obj/item/digestion_remains/skull/vasilissan /datum/species/akula - skull_type = /obj/item/weapon/digestion_remains/skull/akula + skull_type = /obj/item/digestion_remains/skull/akula /datum/species/harpy - skull_type = /obj/item/weapon/digestion_remains/skull/rapala + skull_type = /obj/item/digestion_remains/skull/rapala /datum/species/vulpkanin - skull_type = /obj/item/weapon/digestion_remains/skull/vulpkanin + skull_type = /obj/item/digestion_remains/skull/vulpkanin /datum/species/sergal - skull_type = /obj/item/weapon/digestion_remains/skull/sergal + skull_type = /obj/item/digestion_remains/skull/sergal /datum/species/hi_zorren - skull_type = /obj/item/weapon/digestion_remains/skull/zorren + skull_type = /obj/item/digestion_remains/skull/zorren /datum/species/nevrean - skull_type = /obj/item/weapon/digestion_remains/skull/nevrean + skull_type = /obj/item/digestion_remains/skull/nevrean /datum/species/teshari - skull_type = /obj/item/weapon/digestion_remains/skull/teshari + skull_type = /obj/item/digestion_remains/skull/teshari /datum/species/vox - skull_type = /obj/item/weapon/digestion_remains/skull/vox + skull_type = /obj/item/digestion_remains/skull/vox /obj/belly/proc/handle_remains_leaving(var/mob/living/M) if(!ishuman(M) && !isrobot(M)) //Are we even humanoid or a borg? @@ -34,10 +34,10 @@ //var/mob/living/silicon/robot/R = M // Not Needed at the moment. Uncomment if you need borg stuff var/list/borg_bones = list( //Borg bones are the same at this point. might change in the future if borgs or synths get - /obj/item/weapon/digestion_remains/synth, // different remains in the future. - /obj/item/weapon/digestion_remains/synth/variant1, - /obj/item/weapon/digestion_remains/synth/variant2, - /obj/item/weapon/digestion_remains/synth/variant3 + /obj/item/digestion_remains/synth, // different remains in the future. + /obj/item/digestion_remains/synth/variant1, + /obj/item/digestion_remains/synth/variant2, + /obj/item/digestion_remains/synth/variant3 ) for(var/i = 1, i <= bones_amount, i++) //Just fill them with bones. Borgs dont have anything special. var/new_bone = pick(borg_bones) @@ -50,20 +50,20 @@ return if(prob(20) && !H.isSynthetic()) //ribcage surviving whole is some luck //Edit: no robor - new /obj/item/weapon/digestion_remains/ribcage(src,owner) + new /obj/item/digestion_remains/ribcage(src,owner) bones_amount-- var/list/organic_bones = list( //Generic bone variation system - /obj/item/weapon/digestion_remains, - /obj/item/weapon/digestion_remains/variant1, - /obj/item/weapon/digestion_remains/variant2, - /obj/item/weapon/digestion_remains/variant3 + /obj/item/digestion_remains, + /obj/item/digestion_remains/variant1, + /obj/item/digestion_remains/variant2, + /obj/item/digestion_remains/variant3 ) var/list/synthetic_bones = list( - /obj/item/weapon/digestion_remains/synth, - /obj/item/weapon/digestion_remains/synth/variant1, - /obj/item/weapon/digestion_remains/synth/variant2, - /obj/item/weapon/digestion_remains/synth/variant3 + /obj/item/digestion_remains/synth, + /obj/item/digestion_remains/synth/variant1, + /obj/item/digestion_remains/synth/variant2, + /obj/item/digestion_remains/synth/variant3 ) for(var/i = 1, i <= bones_amount, i++) //throw in the rest var/new_bone = H.isSynthetic() ? pick(synthetic_bones) : pick(organic_bones) @@ -79,15 +79,15 @@ if(skull_amount && H.species.selects_bodytype) // We still haven't found correct skull... if(H.species.base_species == SPECIES_HUMAN) - new /obj/item/weapon/digestion_remains/skull/unknown(src,owner) + new /obj/item/digestion_remains/skull/unknown(src,owner) else - new /obj/item/weapon/digestion_remains/skull/unknown/anthro(src,owner) + new /obj/item/digestion_remains/skull/unknown/anthro(src,owner) else if(skull_amount) // Something entirely different... - new /obj/item/weapon/digestion_remains/skull/unknown(src,owner) + new /obj/item/digestion_remains/skull/unknown(src,owner) -/obj/item/weapon/digestion_remains +/obj/item/digestion_remains name = "bone" desc = "A bleached bone. It's very non-descript and its hard to tell what species or part of the body it came from." icon = 'icons/obj/bones_vr.dmi' @@ -101,103 +101,103 @@ var/pred_ckey var/pred_name -/obj/item/weapon/digestion_remains/synth +/obj/item/digestion_remains/synth name = "ruined component" desc = "A ruined component. It seems to have come from some sort of robotic entity, but there's no telling what kind." icon_state = "synth-1" drop_sound = 'sound/items/drop/device.ogg' //not organic bones, so they get different sounds pickup_sound = 'sound/items/pickup/device.ogg' -/obj/item/weapon/digestion_remains/Initialize(var/mapload, var/mob/living/pred) +/obj/item/digestion_remains/Initialize(var/mapload, var/mob/living/pred) . = ..() if(!mapload) pred_ckey = pred?.ckey pred_name = pred?.name -/obj/item/weapon/digestion_remains/attack_self(var/mob/user) +/obj/item/digestion_remains/attack_self(var/mob/user) if(user.a_intent == I_HURT) to_chat(user,"As you squeeze the [name], it crumbles into dust and falls apart into nothing!") qdel(src) -/obj/item/weapon/digestion_remains/ribcage +/obj/item/digestion_remains/ribcage name = "ribcage" desc = "A bleached ribcage. It's very white and definitely has seen better times. Hard to tell what it belonged to." icon_state = "ribcage" -/obj/item/weapon/digestion_remains/variant1 //Generic bone variations +/obj/item/digestion_remains/variant1 //Generic bone variations icon_state = "generic-2" -/obj/item/weapon/digestion_remains/variant2 +/obj/item/digestion_remains/variant2 icon_state = "generic-3" -/obj/item/weapon/digestion_remains/variant3 +/obj/item/digestion_remains/variant3 icon_state = "generic-4" -/obj/item/weapon/digestion_remains/synth/variant1 //synthbones start +/obj/item/digestion_remains/synth/variant1 //synthbones start icon_state = "synth-2" -/obj/item/weapon/digestion_remains/synth/variant2 +/obj/item/digestion_remains/synth/variant2 icon_state = "synth-3" -/obj/item/weapon/digestion_remains/synth/variant3 +/obj/item/digestion_remains/synth/variant3 icon_state = "synth-4" -/obj/item/weapon/digestion_remains/skull +/obj/item/digestion_remains/skull name = "skull" desc = "A bleached skull. It looks very weakened. Seems like it belonged to a human." icon_state = "skull" -/obj/item/weapon/digestion_remains/skull/tajaran +/obj/item/digestion_remains/skull/tajaran desc = "A bleached skull. It looks very weakened. Seems like it belonged to a tajara." icon_state = "skull_taj" -/obj/item/weapon/digestion_remains/skull/unathi +/obj/item/digestion_remains/skull/unathi desc = "A bleached skull. It looks very weakened. Seems like it belonged to an unathi." icon_state = "skull_unathi" -/obj/item/weapon/digestion_remains/skull/skrell +/obj/item/digestion_remains/skull/skrell desc = "A bleached skull. It looks very weakened. Seems like it belonged to a skrell." icon_state = "skull" -/obj/item/weapon/digestion_remains/skull/vasilissan +/obj/item/digestion_remains/skull/vasilissan desc = "A bleached skull. It looks very weakened. Seems like it belonged to a vasilissan." icon_state = "skull" -/obj/item/weapon/digestion_remains/skull/akula +/obj/item/digestion_remains/skull/akula desc = "A bleached skull. It looks very weakened. Seems like it belonged to an akula." icon_state = "skull_unathi" -/obj/item/weapon/digestion_remains/skull/rapala +/obj/item/digestion_remains/skull/rapala desc = "A bleached skull. It looks very weakened. Seems like it belonged to a rapala." icon_state = "skull" -/obj/item/weapon/digestion_remains/skull/vulpkanin +/obj/item/digestion_remains/skull/vulpkanin desc = "A bleached skull. It looks very weakened. Seems like it belonged to a vulpkanin." icon_state = "skull_taj" -/obj/item/weapon/digestion_remains/skull/sergal +/obj/item/digestion_remains/skull/sergal desc = "A bleached skull. It looks very weakened. Seems like it belonged to a sergal." icon_state = "skull_taj" -/obj/item/weapon/digestion_remains/skull/zorren +/obj/item/digestion_remains/skull/zorren desc = "A bleached skull. It looks very weakened. Seems like it belonged to a zorren." icon_state = "skull_taj" -/obj/item/weapon/digestion_remains/skull/nevrean +/obj/item/digestion_remains/skull/nevrean desc = "A bleached skull. It looks very weakened. Seems like it belonged to a nevrean." icon_state = "skull_taj" -/obj/item/weapon/digestion_remains/skull/teshari +/obj/item/digestion_remains/skull/teshari desc = "A bleached skull. It looks very weakened. Seems like it belonged to a teshari." icon_state = "skull_taj" -/obj/item/weapon/digestion_remains/skull/vox +/obj/item/digestion_remains/skull/vox desc = "A bleached skull. It looks very weakened. Seems like it belonged to a vox." icon_state = "skull_taj" -/obj/item/weapon/digestion_remains/skull/unknown +/obj/item/digestion_remains/skull/unknown desc = "A bleached skull. It looks very weakened. You can't quite tell what species it belonged to." icon_state = "skull" -/obj/item/weapon/digestion_remains/skull/unknown/anthro +/obj/item/digestion_remains/skull/unknown/anthro icon_state = "skull_taj" diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 702dc55e21b..f2681de1698 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -98,9 +98,9 @@ // Handle being clicked, perhaps with something to devour // /mob/living/proc/vore_attackby(obj/item/I, mob/user) - //Handle case: /obj/item/weapon/grab - if(istype(I, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = I + //Handle case: /obj/item/grab + if(istype(I, /obj/item/grab)) + var/obj/item/grab/G = I var/mob/living/carbon/victim = G.affecting //Has to be aggressive grab, has to be living click-er and non-silicon grabbed @@ -156,9 +156,9 @@ else log_debug("[attacker] attempted to feed [G.affecting] to [src] ([type]) but it failed.") - //Handle case: /obj/item/weapon/holder - else if(istype(I, /obj/item/weapon/holder)) - var/obj/item/weapon/holder/H = I + //Handle case: /obj/item/holder + else if(istype(I, /obj/item/holder)) + var/obj/item/holder/H = I if(!isliving(user)) return FALSE // return FALSE to continue upper procs @@ -171,8 +171,8 @@ else log_debug("[attacker] attempted to feed [H.contents] to [src] ([type]) but it failed.") - //Handle case: /obj/item/device/radio/beacon - else if(istype(I,/obj/item/device/radio/beacon)) + //Handle case: /obj/item/radio/beacon + else if(istype(I,/obj/item/radio/beacon)) var/confirm = tgui_alert(user, "[src == user ? "Eat the beacon?" : "Feed the beacon to [src]?"]", "Confirmation", list("Yes!", "Cancel")) if(confirm == "Yes!") var/obj/belly/B = tgui_input_list(usr, "Which belly?", "Select A Belly", vore_organs) @@ -560,9 +560,9 @@ B.owner.update_icons() //You're in a dogborg! - else if(istype(loc, /obj/item/device/dogborg/sleeper)) + else if(istype(loc, /obj/item/dogborg/sleeper)) var/mob/living/silicon/pred = loc.loc //Thing holding the belly! - var/obj/item/device/dogborg/sleeper/belly = loc //The belly! + var/obj/item/dogborg/sleeper/belly = loc //The belly! var/confirm = tgui_alert(src, "You're in a cyborg sleeper. This is for escaping from preference-breaking or if your predator disconnects/AFKs. If your preferences were being broken, please admin-help as well.", "Confirmation", list("Okay", "Cancel")) if(confirm != "Okay" || loc != belly) @@ -603,13 +603,13 @@ log_and_message_admins("[key_name(src)] used the OOC escape button to revert back to their original form from being TFed into another mob.") revert_mob_tf() - else if(istype(loc, /obj/item/weapon/holder/micro) && (istype(loc.loc, /obj/machinery/microwave))) + else if(istype(loc, /obj/item/holder/micro) && (istype(loc.loc, /obj/machinery/microwave))) forceMove(get_turf(src)) log_and_message_admins("[key_name(src)] used the OOC escape button to get out of a microwave.") //You are in food and for some reason can't resist out - else if(istype(loc, /obj/item/weapon/reagent_containers/food)) - var/obj/item/weapon/reagent_containers/food/F = src.loc + else if(istype(loc, /obj/item/reagent_containers/food)) + var/obj/item/reagent_containers/food/F = src.loc if(F.food_inserted_micros) F.food_inserted_micros -= src src.forceMove(get_turf(F)) @@ -723,8 +723,8 @@ user.visible_message(success_msg, range = message_range) // Actually shove prey into the belly. - if(istype(prey.loc, /obj/item/weapon/holder)) - var/obj/item/weapon/holder/H = prey.loc + if(istype(prey.loc, /obj/item/holder)) + var/obj/item/holder/H = prey.loc for(var/mob/living/M in H.contents) belly.nom_mob(M, user) if(M.loc == H) // In case nom_mob failed somehow. @@ -874,15 +874,15 @@ to_chat(src, "You can't eat that so casually!") return - if(istype(I, /obj/item/device/paicard)) - var/obj/item/device/paicard/palcard = I + if(istype(I, /obj/item/paicard)) + var/obj/item/paicard/palcard = I var/mob/living/silicon/pai/pocketpal = palcard.pai if(pocketpal && (!pocketpal.devourable)) to_chat(src, "\The [pocketpal] doesn't allow you to eat it.") return - if(istype(I, /obj/item/weapon/book)) - var/obj/item/weapon/book/book = I + if(istype(I, /obj/item/book)) + var/obj/item/book/book = I if(book.carved) to_chat(src, "\The [book] is not worth eating without the filling.") return @@ -892,8 +892,8 @@ to_chat(src, "You really should not be eating this.") message_admins("[key_name(src)] has attempted to ingest an uplink item. ([src ? ADMIN_JMP(src) : "null"])") return - if(istype(I,/obj/item/device/pda)) - var/obj/item/device/pda/P = I + if(istype(I,/obj/item/pda)) + var/obj/item/pda/P = I if(P.owner) var/watching = FALSE for(var/mob/living/carbon/human/H in view(src)) @@ -932,9 +932,9 @@ log_admin("VORE: [src] used Eat Trash to swallow [I].") - if(istype(I,/obj/item/device/flashlight/flare) || istype(I,/obj/item/weapon/flame/match) || istype(I,/obj/item/weapon/storage/box/matches)) + if(istype(I,/obj/item/flashlight/flare) || istype(I,/obj/item/flame/match) || istype(I,/obj/item/storage/box/matches)) to_chat(src, "You can taste the flavor of spicy cardboard.") - else if(istype(I,/obj/item/device/flashlight/glowstick)) + else if(istype(I,/obj/item/flashlight/glowstick)) to_chat(src, "You found out the glowy juice only tastes like regret.") else if(istype(I,/obj/item/trash/cigbutt)) to_chat(src, "You can taste the flavor of bitter ash. Classy.") @@ -944,38 +944,38 @@ to_chat(src, "You can taste the flavor of burning ash. Spicy!") else to_chat(src, "You can taste the flavor of aromatic rolling paper and funny looks.") - else if(istype(I,/obj/item/weapon/paper)) + else if(istype(I,/obj/item/paper)) to_chat(src, "You can taste the dry flavor of bureaucracy.") - else if(istype(I,/obj/item/weapon/book)) + else if(istype(I,/obj/item/book)) to_chat(src, "You can taste the dry flavor of knowledge.") - else if(istype(I,/obj/item/weapon/dice) || istype(I,/obj/item/roulette_ball)) + else if(istype(I,/obj/item/dice) || istype(I,/obj/item/roulette_ball)) to_chat(src, "You can taste the bitter flavor of cheating.") - else if(istype(I,/obj/item/weapon/lipstick)) + else if(istype(I,/obj/item/lipstick)) to_chat(src, "You can taste the flavor of couture and style. Toddler at the make-up bag style.") - else if(istype(I,/obj/item/weapon/soap)) + else if(istype(I,/obj/item/soap)) to_chat(src, "You can taste the bitter flavor of verbal purification.") - else if(istype(I,/obj/item/weapon/spacecash) || istype(I,/obj/item/weapon/storage/wallet)) + else if(istype(I,/obj/item/spacecash) || istype(I,/obj/item/storage/wallet)) to_chat(src, "You can taste the flavor of wealth and reckless waste.") - else if(istype(I,/obj/item/weapon/broken_bottle) || istype(I,/obj/item/weapon/material/shard)) + else if(istype(I,/obj/item/broken_bottle) || istype(I,/obj/item/material/shard)) to_chat(src, "You can taste the flavor of pain. This can't possibly be healthy for your guts.") - else if(istype(I,/obj/item/weapon/light)) - var/obj/item/weapon/light/L = I + else if(istype(I,/obj/item/light)) + var/obj/item/light/L = I if(L.status == LIGHT_BROKEN) to_chat(src, "You can taste the flavor of pain. This can't possibly be healthy for your guts.") else to_chat(src, "You can taste the flavor of really bad ideas.") - else if(istype(I,/obj/item/weapon/bikehorn/tinytether)) + else if(istype(I,/obj/item/bikehorn/tinytether)) to_chat(src, "You feel a rush of power swallowing such a large, err, tiny structure.") - else if(istype(I,/obj/item/device/mmi/digital/posibrain) || istype(I,/obj/item/device/aicard)) + else if(istype(I,/obj/item/mmi/digital/posibrain) || istype(I,/obj/item/aicard)) to_chat(src, "You can taste the sweet flavor of digital friendship. Or maybe it is something else.") - else if(istype(I,/obj/item/device/paicard)) + else if(istype(I,/obj/item/paicard)) to_chat(src, "You can taste the sweet flavor of digital friendship.") - var/obj/item/device/paicard/ourcard = I + var/obj/item/paicard/ourcard = I if(ourcard.pai && ourcard.pai.client && isbelly(ourcard.loc)) var/obj/belly/B = ourcard.loc to_chat(ourcard.pai, "[B.desc]") - else if(istype(I,/obj/item/weapon/reagent_containers/food)) - var/obj/item/weapon/reagent_containers/food/F = I + else if(istype(I,/obj/item/reagent_containers/food)) + var/obj/item/reagent_containers/food/F = I if(!F.reagents.total_volume) to_chat(src, "You can taste the flavor of garbage and leftovers. Delicious?") else @@ -1031,8 +1031,8 @@ var/list/nom = null var/datum/material/M = null - if(istype(I, /obj/item/weapon/ore)) //Raw unrefined ore. Some things are just better untempered! - var/obj/item/weapon/ore/O = I + if(istype(I, /obj/item/ore)) //Raw unrefined ore. Some things are just better untempered! + var/obj/item/ore/O = I //List in list, define by material property of ore in code/mining/modules/ore.dm. //50 nutrition = 5 ore to get 250 nutrition. 250 is the beginning of the 'well fed' range. var/list/rock_munch = list( @@ -1054,7 +1054,7 @@ if(O.material in rock_munch) nom = rock_munch[O.material] M = name_to_material[O.material] - else if(istype(O, /obj/item/weapon/ore/slag)) + else if(istype(O, /obj/item/ore/slag)) nom = list("nutrition" = 15, "remark" = "You taste dusty, crunchy mistakes. This is a travesty... but at least it is an edible one.", "WTF" = FALSE) else //Random rock. nom = list("nutrition" = 0, "remark" = "You taste stony, gravelly goodness - but you crave something with actual nutritional value.", "WTF" = FALSE) @@ -1095,7 +1095,7 @@ I = stack nom = refined_taste[O.default_type] M = name_to_material[O.default_type] - else if(istype(I, /obj/item/weapon/entrepreneur/crystal)) + else if(istype(I, /obj/item/entrepreneur/crystal)) nom = list("nutrition" = 100, "remark" = "The crytal was particularly brittle and not difficult to break apart, but the inside was incredibly flavoursome. Though devoid of any actual healing power, it seems to be very nutritious!", "WTF" = FALSE) if(nom) //Ravenous 1-4, snackage confirmed. Clear for chowdown, over. diff --git a/code/modules/vore/eating/simple_animal_vr.dm b/code/modules/vore/eating/simple_animal_vr.dm index 876ddce783e..d7ee2ada0b6 100644 --- a/code/modules/vore/eating/simple_animal_vr.dm +++ b/code/modules/vore/eating/simple_animal_vr.dm @@ -69,7 +69,7 @@ to_chat(user, "[src] is now using [vore_selected.fancy_vore ? "Fancy" : "Classic"] vore sounds.") /mob/living/simple_mob/attackby(var/obj/item/O, var/mob/user) - if(istype(O, /obj/item/weapon/newspaper) && !(ckey || (ai_holder.hostile && faction != user.faction)) && isturf(user.loc)) + if(istype(O, /obj/item/newspaper) && !(ckey || (ai_holder.hostile && faction != user.faction)) && isturf(user.loc)) if(ai_holder.retaliate && prob(vore_pounce_chance/2)) // This is a gamble! user.Weaken(5) //They get tackled anyway whether they're edible or not. user.visible_message("[user] swats [src] with [O] and promptly gets tackled!!") @@ -89,7 +89,7 @@ if(!(LAZYFIND(prey_excludes, L))) // Unless they're already on it, just to avoid fuckery. LAZYSET(prey_excludes, L, world.time) addtimer(CALLBACK(src, PROC_REF(removeMobFromPreyExcludes), WEAKREF(L)), 5 MINUTES) - else if(istype(O, /obj/item/device/healthanalyzer)) + else if(istype(O, /obj/item/healthanalyzer)) var/healthpercent = health/maxHealth*100 to_chat(user, "[src] seems to be [healthpercent]% healthy.") else diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm index 89dc56782a7..741d3055a12 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm @@ -2,13 +2,13 @@ // Also these things might be mildly obsolete considering the update to inventory. // BEGIN - DO NOT EDIT PROTOTYPE -/obj/item/weapon/storage/box/fluff +/obj/item/storage/box/fluff name = "Undefined Fluff Box" desc = "This should have a description. Tell an admin." storage_slots = 7 var/list/has_items = list() -/obj/item/weapon/storage/box/fluff/New() +/obj/item/storage/box/fluff/New() storage_slots = has_items.len allowed = list() for(var/P in has_items) @@ -21,7 +21,7 @@ /* TEMPLATE // ckey:Character Name -/obj/item/weapon/storage/box/fluff/charactername +/obj/item/storage/box/fluff/charactername name = "" desc = "" has_items = list( @@ -32,7 +32,7 @@ */ // BeyondMyLife:Cassandra Selones Spawn Kit -/obj/item/weapon/storage/box/fluff/cassandra +/obj/item/storage/box/fluff/cassandra name = "Cassandra Selone's Spawn Kit" desc = "A spawn Kit, holding Cassandra Selone's Item's" has_items = list( @@ -41,21 +41,21 @@ /obj/item/clothing/shoes/boots/fluff/kilano/purple) //BeyondMyLife: Ne'tra Ky'ram //Made a box because they have so many items that it'd spam the debug log. -/obj/item/weapon/storage/box/fluff/kilano +/obj/item/storage/box/fluff/kilano name = "Ne'tra Ky'ram's Kit" desc = "A kit containing Ne'tra Ky'ram's clothing." has_items = list( /obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat, /obj/item/clothing/under/fluff/kilanosuit, - /obj/item/weapon/storage/backpack/messenger/sec/fluff/kilano, - /obj/item/weapon/storage/belt/security/fluff/kilano, + /obj/item/storage/backpack/messenger/sec/fluff/kilano, + /obj/item/storage/belt/security/fluff/kilano, /obj/item/clothing/gloves/fluff/kilano/netra, /obj/item/clothing/shoes/boots/fluff/kilano, /obj/item/clothing/accessory/storage/black_vest/fluff/kilano ) // bwoincognito:Tasald Corlethian -/obj/item/weapon/storage/box/fluff/tasald +/obj/item/storage/box/fluff/tasald name = "Tasald's Kit" desc = "A kit containing Tasald's equipment." has_items = list( @@ -63,7 +63,7 @@ /obj/item/clothing/under/det/fluff/tasald) //bwoincognito:Octavious Ward -/obj/item/weapon/storage/box/fluff/octavious +/obj/item/storage/box/fluff/octavious name = "Octavious's Kit" desc = "A kit containing Octavious's work clothes." has_items = list( @@ -72,12 +72,12 @@ /obj/item/clothing/mask/gas/plaguedoctor/fluff/octaviousmask, /obj/item/clothing/head/fedora/fluff/bowler, /obj/item/clothing/shoes/black/cuffs/octavious, - /obj/item/weapon/cane/fluff/tasald, + /obj/item/cane/fluff/tasald, /obj/item/clothing/glasses/hud/health/octaviousmonicle ) //drakefrostpaw:Drake Frostpaw -/obj/item/weapon/storage/box/fluff/drake +/obj/item/storage/box/fluff/drake name = "United Federation Uniform Kit" desc = "A box containing all the parts of a United Federation Uniform" has_items = list( @@ -88,28 +88,28 @@ ) // Draycu: Schae Yonra -/obj/item/weapon/storage/box/fluff/yonra +/obj/item/storage/box/fluff/yonra name = "Yonra's Starting Kit" desc = "A small box containing Yonra's personal effects" has_items = list( - /obj/item/weapon/melee/fluff/holochain/mass, + /obj/item/melee/fluff/holochain/mass, /obj/item/clothing/accessory/medal/silver/unity) //ivymoomoo:Ivy Baladeva -/obj/item/weapon/storage/backpack/messenger/sec/fluff/ivymoomoo +/obj/item/storage/backpack/messenger/sec/fluff/ivymoomoo name = "Ivy's Courier" desc = "A bag resembling something used by college students. Contains items for ''MooMoo''." -/obj/item/weapon/storage/backpack/messenger/sec/fluff/ivymoomoo/New() +/obj/item/storage/backpack/messenger/sec/fluff/ivymoomoo/New() ..() new /obj/item/clothing/head/beretg(src) - new /obj/item/device/fluff/id_kit_ivy(src) - new /obj/item/weapon/storage/fancy/cigarettes/dromedaryco(src) - new /obj/item/weapon/storage/box/matches(src) - new /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake(src) + new /obj/item/fluff/id_kit_ivy(src) + new /obj/item/storage/fancy/cigarettes/dromedaryco(src) + new /obj/item/storage/box/matches(src) + new /obj/item/reagent_containers/food/snacks/sliceable/plaincake(src) // jemli:Cirra Mayhem -/obj/item/weapon/storage/box/fluff/cirra +/obj/item/storage/box/fluff/cirra name = "Instant Pirate Kit" desc = "Just add Akula!" has_items = list( @@ -119,19 +119,19 @@ /obj/item/clothing/under/pirate) // joey4298:Emoticon -/obj/item/weapon/storage/box/fluff/emoticon +/obj/item/storage/box/fluff/emoticon name = "Emoticon's Mime Kit" desc = "Specially packaged for the hungry catgirl mime with a taste for clown." has_items = list( - /obj/item/device/fluff/id_kit_mime, + /obj/item/fluff/id_kit_mime, /obj/item/clothing/gloves/white, /obj/item/clothing/head/beret, - /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing, + /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing, /obj/item/clothing/shoes/black, /*/obj/item/toy/crayon/mime*/) //Need to track down the code for crayons before adding this back in //joanrisu:Joan Risu -/obj/item/weapon/storage/backpack/dufflebag/sec/fluff/joanrisu +/obj/item/storage/backpack/dufflebag/sec/fluff/joanrisu name = "Joan's Workbag" desc = "A bag Joan uses to carry her work equipment. It has the 82nd Battle Group Insignia on it." icon_state = "joanbag" @@ -140,39 +140,39 @@ slowdown = 0 can_tilt = 0 -/obj/item/weapon/storage/backpack/dufflebag/sec/fluff/joanrisu/New() +/obj/item/storage/backpack/dufflebag/sec/fluff/joanrisu/New() ..() new /obj/item/clothing/accessory/holster/hip(src) new /obj/item/clothing/suit/storage/fluff/modernfedcoat(src) new /obj/item/clothing/head/caphat/formal/fedcover(src) new /obj/item/clothing/suit/armor/det_suit(src) - new /obj/item/weapon/flame/lighter/zippo/fluff/joan(src) + new /obj/item/flame/lighter/zippo/fluff/joan(src) new /obj/item/clothing/under/rank/internalaffairs/fluff/joan(src) new /obj/item/clothing/head/helmet/space/fluff/joan(src) new /obj/item/clothing/suit/space/fluff/joan(src) //joanrisu:Katarina Eine -/obj/item/weapon/storage/backpack/dufflebag/sec/fluff/katarina +/obj/item/storage/backpack/dufflebag/sec/fluff/katarina name = "Katarina's Workbag" desc = "A duffle bag Katarina uses to carry her tools." slowdown = 0 -/obj/item/weapon/storage/backpack/dufflebag/sec/fluff/katarina/New() +/obj/item/storage/backpack/dufflebag/sec/fluff/katarina/New() ..() new /obj/item/clothing/accessory/holster/hip(src) new /obj/item/clothing/suit/storage/fluff/fedcoat(src) new /obj/item/clothing/suit/armor/det_suit(src) new /obj/item/clothing/accessory/storage/black_vest(src) - new /obj/item/weapon/material/knife/tacknife/combatknife/fluff/katarina(src) + new /obj/item/material/knife/tacknife/combatknife/fluff/katarina(src) new /obj/item/clothing/under/rank/internalaffairs/fluff/joan(src) //Razerwing:Archer Maximus -/obj/item/weapon/storage/box/fluff/archermaximus +/obj/item/storage/box/fluff/archermaximus desc = "Personal Effects" has_items = list() //Xsdew:Penelope Allen -/obj/item/weapon/storage/box/fluff/penelope +/obj/item/storage/box/fluff/penelope name = "Penelope's capsule" desc = "A little capsule where a designer's swimsuit is stored." icon = 'icons/vore/custom_items_vr.dmi' @@ -185,7 +185,7 @@ has_items = list(/obj/item/clothing/under/swimsuit/fluff/penelope) // JackNoir413: Mor Xaina -/obj/item/weapon/storage/box/fluff/morxaina +/obj/item/storage/box/fluff/morxaina name = "Fashionable clothes set" desc = "Set of custom-made, expensive attire elements." has_items = list( @@ -194,52 +194,52 @@ /obj/item/clothing/under/fluff/morunder) // Mewchild: Phi Vietsi -/obj/item/weapon/storage/box/fluff/phi +/obj/item/storage/box/fluff/phi name = "Phi's Personal Items" has_items = list( /obj/item/clothing/accessory/medal/bronze_heart, /obj/item/clothing/gloves/ring/seal/signet/fluff/phi) // Tabiranth: Ascian -/obj/item/weapon/grenade/spawnergrenade/spirit +/obj/item/grenade/spawnergrenade/spirit name = "spirit's pet carrier" desc = "Contains kitten." spawner_type = /mob/living/simple_mob/animal/passive/cat/tabiranth deliveryamt = 1 // Jwguy: Koyo Akimomi -/obj/item/weapon/storage/box/fluff/koyoakimomi +/obj/item/storage/box/fluff/koyoakimomi name = "Koyo's Cosplay Box" desc = "One of many traditional wolfgirl clothing sets that Koyo owns. Awoo!" has_items = list( /obj/item/clothing/head/fluff/wolfgirl, /obj/item/clothing/shoes/fluff/wolfgirl, /obj/item/clothing/under/fluff/wolfgirl, - /obj/item/weapon/melee/fluffstuff/wolfgirlsword, - /obj/item/weapon/shield/fluff/wolfgirlshield) + /obj/item/melee/fluffstuff/wolfgirlsword, + /obj/item/shield/fluff/wolfgirlshield) // Ryumi: Nikki Yumeno -/obj/item/weapon/storage/box/fluff +/obj/item/storage/box/fluff name = "Nikki's Outfit Box" desc = "Warning: Contains dangerous amounts of dork." has_items = list( - /obj/item/weapon/rig/nikki, + /obj/item/rig/nikki, /obj/item/clothing/head/fluff/nikki, /obj/item/clothing/under/skirt/outfit/fluff/nikki, /obj/item/clothing/shoes/fluff/nikki) // DefiintelyNotARock:Aku Zoles -/obj/item/weapon/storage/secure/briefcase/dealer +/obj/item/storage/secure/briefcase/dealer name = "Aku's Dealer briefcase" desc = "A slick black briefcase with a digital lock." starts_with = list( - /obj/item/weapon/spacecasinocash/c1000 = 3, - /obj/item/weapon/storage/dicecup/loaded = 3) + /obj/item/spacecasinocash/c1000 = 3, + /obj/item/storage/dicecup/loaded = 3) /* Swimsuits, for general use, to avoid arriving to work with your swimsuit. */ -/obj/item/weapon/storage/box/fluff/swimsuit +/obj/item/storage/box/fluff/swimsuit name = "Black Swimsuit capsule" desc = "A little capsule where a swimsuit is usually stored." storage_slots = 1 @@ -251,95 +251,95 @@ Swimsuits, for general use, to avoid arriving to work with your swimsuit. can_hold = list(/obj/item/clothing/under/swimsuit/) has_items = list(/obj/item/clothing/under/swimsuit/black) -/obj/item/weapon/storage/box/fluff/swimsuit/blue +/obj/item/storage/box/fluff/swimsuit/blue name = "Blue Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/blue) -/obj/item/weapon/storage/box/fluff/swimsuit/purple +/obj/item/storage/box/fluff/swimsuit/purple name = "Purple Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/purple) -/obj/item/weapon/storage/box/fluff/swimsuit/green +/obj/item/storage/box/fluff/swimsuit/green name = "Green Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/green) -/obj/item/weapon/storage/box/fluff/swimsuit/red +/obj/item/storage/box/fluff/swimsuit/red name = "Red Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/red) -/obj/item/weapon/storage/box/fluff/swimsuit/white +/obj/item/storage/box/fluff/swimsuit/white name = "White Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/white) -/obj/item/weapon/storage/box/fluff/swimsuit/blue +/obj/item/storage/box/fluff/swimsuit/blue name = "Striped Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/striped) -/obj/item/weapon/storage/box/fluff/swimsuit/earth +/obj/item/storage/box/fluff/swimsuit/earth name = "Earthen Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/earth) -/obj/item/weapon/storage/box/fluff/swimsuit/engineering +/obj/item/storage/box/fluff/swimsuit/engineering name = "Engineering Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/fluff/engineering) -/obj/item/weapon/storage/box/fluff/swimsuit/science +/obj/item/storage/box/fluff/swimsuit/science name = "Science Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/fluff/science) -/obj/item/weapon/storage/box/fluff/swimsuit/security +/obj/item/storage/box/fluff/swimsuit/security name = "Security Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/fluff/security) -/obj/item/weapon/storage/box/fluff/swimsuit/medical +/obj/item/storage/box/fluff/swimsuit/medical name = "Medical Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/fluff/medical) -/obj/item/weapon/storage/box/fluff/swimsuit/cowbikini +/obj/item/storage/box/fluff/swimsuit/cowbikini name = "Cow Bikini Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/cowbikini) -/obj/item/weapon/storage/box/fluff/swimsuit/stripperpink +/obj/item/storage/box/fluff/swimsuit/stripperpink name = "Skimpy Pink Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/stripper/stripper_pink) -/obj/item/weapon/storage/box/fluff/swimsuit/strippergreen +/obj/item/storage/box/fluff/swimsuit/strippergreen name = "Skimpy Green Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/stripper/stripper_green) -/obj/item/weapon/storage/box/fluff/swimsuit/mankini +/obj/item/storage/box/fluff/swimsuit/mankini name = "Pink Mankini capsule" has_items = list(/obj/item/clothing/under/swimsuit/stripper/mankini) -/obj/item/weapon/storage/box/fluff/swimsuit/highclass +/obj/item/storage/box/fluff/swimsuit/highclass name = "High Class Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/highclass) -/obj/item/weapon/storage/box/fluff/swimsuit/risque +/obj/item/storage/box/fluff/swimsuit/risque name = "Risque Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/risque) -/obj/item/weapon/storage/box/fluff/swimsuit/streamlined +/obj/item/storage/box/fluff/swimsuit/streamlined name = "Streamlined Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/streamlined) //Monkey boxes for the new primals we have -/obj/item/weapon/storage/box/monkeycubes/sobakacubes +/obj/item/storage/box/monkeycubes/sobakacubes name = "sobaka cube box" desc = "Drymate brand sobaka cubes. Just add water!" - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sobakacube = 4) + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped/sobakacube = 4) -/obj/item/weapon/storage/box/monkeycubes/sarucubes +/obj/item/storage/box/monkeycubes/sarucubes name = "saru cube box" desc = "Drymate brand saru cubes. Just add water!" - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sarucube = 4) + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped/sarucube = 4) -/obj/item/weapon/storage/box/monkeycubes/sparracubes +/obj/item/storage/box/monkeycubes/sparracubes name = "sparra cube box" desc = "Drymate brand sparra cubes. Just add water!" - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sparracube = 4) + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped/sparracube = 4) -/obj/item/weapon/storage/box/monkeycubes/wolpincubes +/obj/item/storage/box/monkeycubes/wolpincubes name = "wolpin cube box" desc = "Drymate brand wolpin cubes. Just add water!" - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube = 4) + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube = 4) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 76785d1a4a5..cd5da010578 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -219,7 +219,7 @@ item_state = "russofurcoat" armor = list(melee = 0, 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/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) flags_inv = HIDETIE|HIDEHOLSTER //For general use @@ -236,17 +236,17 @@ blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list( - /obj/item/weapon/tank/emergency/oxygen, - /obj/item/device/flashlight, - /obj/item/weapon/gun/energy, - /obj/item/weapon/gun/projectile, + /obj/item/tank/emergency/oxygen, + /obj/item/flashlight, + /obj/item/gun/energy, + /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, -// /obj/item/weapon/storage/fancy/shotgun_ammo, - /obj/item/weapon/melee/baton, - /obj/item/weapon/handcuffs, -// /obj/item/device/detective_scanner, - /obj/item/device/taperecorder) +// /obj/item/storage/fancy/shotgun_ammo, + /obj/item/melee/baton, + /obj/item/handcuffs, +// /obj/item/detective_scanner, + /obj/item/taperecorder) armor = list(melee = 50, bullet = 15, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) var/unbuttoned = 0 @@ -306,17 +306,17 @@ blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list( - /obj/item/weapon/tank/emergency/oxygen, - /obj/item/device/flashlight, - /obj/item/weapon/gun/energy, - /obj/item/weapon/gun/projectile, + /obj/item/tank/emergency/oxygen, + /obj/item/flashlight, + /obj/item/gun/energy, + /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, -// /obj/item/weapon/storage/fancy/shotgun_ammo, - /obj/item/weapon/melee/baton, - /obj/item/weapon/handcuffs, -// /obj/item/device/detective_scanner, - /obj/item/device/taperecorder) +// /obj/item/storage/fancy/shotgun_ammo, + /obj/item/melee/baton, + /obj/item/handcuffs, +// /obj/item/detective_scanner, + /obj/item/taperecorder) armor = list(melee = 50, bullet = 15, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) //Variants @@ -565,7 +565,7 @@ gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank) + allowed = list(/obj/item/flashlight,/obj/item/tank) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS @@ -732,7 +732,7 @@ icon_override = 'icons/inventory/head/mob.dmi' item_state = "hoscap" -/obj/item/weapon/storage/belt/utility/fluff/vulpine +/obj/item/storage/belt/utility/fluff/vulpine name = "vulpine belt" desc = "A tool-belt in Atmos colours." @@ -744,14 +744,14 @@ storage_slots = 9 -/obj/item/weapon/storage/belt/utility/fluff/vulpine/New() +/obj/item/storage/belt/utility/fluff/vulpine/New() ..() - new /obj/item/weapon/tool/screwdriver(src) - new /obj/item/weapon/tool/wrench(src) - new /obj/item/weapon/weldingtool(src) - new /obj/item/weapon/tool/crowbar(src) - new /obj/item/weapon/tool/wirecutters(src) - new /obj/item/device/multitool(src) + new /obj/item/tool/screwdriver(src) + new /obj/item/tool/wrench(src) + new /obj/item/weldingtool(src) + new /obj/item/tool/crowbar(src) + new /obj/item/tool/wirecutters(src) + new /obj/item/multitool(src) new /obj/item/stack/cable_coil(src, 30, "red") // molenar:Giliana Gamish @@ -815,7 +815,7 @@ if(H.head == src) H.update_inv_head() -/obj/item/weapon/rig/light/hacker/fluff/aronai +/obj/item/rig/light/hacker/fluff/aronai name = "KHI-99-AAR suit module" suit_type = "nano" desc = "A thin collapsable spacesuit for synths from Kitsuhana Heavy Industries." @@ -823,7 +823,7 @@ armor = list(melee = 25, bullet = 15, laser = 15, energy = 60, bomb = 30, bio = 70, rad = 100) air_type = null //No O2 tank, why would it have one? - cell_type = /obj/item/weapon/cell/hyper + cell_type = /obj/item/cell/hyper req_access = list(access_medical) initial_modules = list( @@ -870,7 +870,7 @@ armor = list(melee = 50, bullet = 40, laser = 45, energy = 25, bomb = 50, bio = 100, rad = 50) //These values were taken from the combat rigs and adjusted to be weaker than said rigs. slowdown = 0 - allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton) + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton) icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "joansuit" @@ -991,7 +991,7 @@ icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "octavgentlecoat_mob" blood_overlay_type = "coat" - allowed = list(/obj/item/weapon/tank/emergency/oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/taperecorder,/obj/item/device/uv_light) + allowed = list(/obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/taperecorder,/obj/item/uv_light) //bwoincognito:Octavious Ward /obj/item/clothing/under/det/fluff/octavious @@ -1140,7 +1140,7 @@ item_state = "chococoat_on" icon_state = "chococoat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS - allowed = list (/obj/item/weapon/material/knife) + allowed = list (/obj/item/material/knife) //KiwiDaNinja: Chakat Taiga /obj/item/clothing/under/fluff/taiga @@ -1269,12 +1269,12 @@ Departamental Swimsuits, for general use body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS permeability_coefficient = 0.50 allowed = list( - /obj/item/device/flashlight, /obj/item/device/analyzer, - /obj/item/device/radio, /obj/item/weapon/tank/emergency/oxygen, - /obj/item/weapon/reagent_containers/hypospray, /obj/item/device/healthanalyzer, - /obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe, - /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/flashlight, /obj/item/analyzer, + /obj/item/radio, /obj/item/tank/emergency/oxygen, + /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, + /obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe, + /obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle ) armor = list(melee = 20, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 20, rad = 25) @@ -1590,12 +1590,12 @@ Departamental Swimsuits, for general use siemens_coefficient = 0.9 //BeyondMyLife: Ne'tra Ky'ram -/obj/item/weapon/storage/backpack/messenger/sec/fluff/kilano +/obj/item/storage/backpack/messenger/sec/fluff/kilano name = "Ne'tra's security bag" desc = "A security Satchel containing Ne'tra Ky'rams Security gear." //BeyondMyLife: Ne'tra Ky'ram -/obj/item/weapon/storage/belt/security/fluff/kilano +/obj/item/storage/belt/security/fluff/kilano name = "black and gold security belt" desc = "A Black and Gold security belt, somewhat resembling something you must've seen in a comic years ago." icon = 'icons/vore/custom_clothes_vr.dmi' @@ -2050,7 +2050,7 @@ Departamental Swimsuits, for general use to_chat(M, "What the heck? \The [src] doesn't fit!") return 0 -/obj/item/clothing/suit/fluff/nikki //see /obj/item/weapon/rig/nikki +/obj/item/clothing/suit/fluff/nikki //see /obj/item/rig/nikki name = "cape" desc = "Snazzy!" flags = null @@ -2083,7 +2083,7 @@ Departamental Swimsuits, for general use flags_inv = HIDEEARS w_class = ITEMSIZE_LARGE // THIS HAT IS FUCKIN HUGE YO var/owner = "ryumi" - var/obj/item/device/perfect_tele/translocator = null // The translocator installed inside, if there is one. Gotta go out and get it first! + var/obj/item/perfect_tele/translocator = null // The translocator installed inside, if there is one. Gotta go out and get it first! /obj/item/clothing/head/fluff/nikki/verb/verb_translocator_unequip() set category = "Object" @@ -2091,7 +2091,7 @@ Departamental Swimsuits, for general use set src in usr translocator_unequip(translocator, usr) -/obj/item/clothing/head/fluff/nikki/proc/translocator_equip(var/obj/item/device/perfect_tele/T, var/mob/living/carbon/human/user) +/obj/item/clothing/head/fluff/nikki/proc/translocator_equip(var/obj/item/perfect_tele/T, var/mob/living/carbon/human/user) if (do_after(user, 2 SECONDS, T)) user.unEquip(T) translocator_unequip(translocator, user) @@ -2100,7 +2100,7 @@ Departamental Swimsuits, for general use user.show_message("[icon2html(src, user.client)]*click!*") playsound(src, 'sound/machines/click.ogg', 30, 1) -/obj/item/clothing/head/fluff/nikki/proc/translocator_unequip(var/obj/item/device/perfect_tele/T, var/mob/living/carbon/human/user) +/obj/item/clothing/head/fluff/nikki/proc/translocator_unequip(var/obj/item/perfect_tele/T, var/mob/living/carbon/human/user) if (translocator) if (user) user.put_in_hands(T) @@ -2145,8 +2145,8 @@ Departamental Swimsuits, for general use else return 1 -/obj/item/clothing/head/fluff/nikki/attackby(obj/item/weapon/I as obj, mob/user as mob) - if (istype(I, /obj/item/device/perfect_tele) && user.get_inactive_hand() == src) +/obj/item/clothing/head/fluff/nikki/attackby(obj/item/I as obj, mob/user as mob) + if (istype(I, /obj/item/perfect_tele) && user.get_inactive_hand() == src) if (translocator) visible_message("[user] starts to pull \a [translocator] out of \the [src] to swap it out with \the [I]...", \ "You start pulling \the [translocator] pops out of its compartment with a soft 'click' as you replace it with \the [I]....") @@ -2505,7 +2505,7 @@ Departamental Swimsuits, for general use body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS //Shalax: Cerise Duelliste -/obj/item/weapon/storage/belt/security/fluff/cerise +/obj/item/storage/belt/security/fluff/cerise name = "champion's belt" desc = "Cerise's hard-won belt from her glory days. Her skill might have waned since then, but her renown lives on." icon_state = "champion" diff --git a/code/modules/vore/fluffstuff/custom_implants_vr.dm b/code/modules/vore/fluffstuff/custom_implants_vr.dm index 8647c9d68f2..d14d369de30 100644 --- a/code/modules/vore/fluffstuff/custom_implants_vr.dm +++ b/code/modules/vore/fluffstuff/custom_implants_vr.dm @@ -1,6 +1,6 @@ //WickedTempest: Chakat Tempest -/obj/item/weapon/implant/reagent_generator/tempest +/obj/item/implant/reagent_generator/tempest generated_reagents = list("milk" = 2) reagent_name = "milk" usable_volume = 1000 @@ -13,12 +13,12 @@ verb_name = "Milk" verb_desc = "Grab Tempest's nipples and milk them into a container! May cause blushing and groaning." -/obj/item/weapon/implanter/reagent_generator/tempest - implant_type = /obj/item/weapon/implant/reagent_generator/tempest +/obj/item/implanter/reagent_generator/tempest + implant_type = /obj/item/implant/reagent_generator/tempest //Hottokeeki: Belle Day -/obj/item/weapon/implant/reagent_generator/belle +/obj/item/implant/reagent_generator/belle generated_reagents = list("milk" = 2) reagent_name = "milk" usable_volume = 5000 @@ -31,12 +31,12 @@ verb_name = "Milk" verb_desc = "Obtain Belle's milk and put it into a container! May cause blushing and groaning, or arousal." -/obj/item/weapon/implanter/reagent_generator/belle - implant_type = /obj/item/weapon/implant/reagent_generator/belle +/obj/item/implanter/reagent_generator/belle + implant_type = /obj/item/implant/reagent_generator/belle //Gowst: Eldi Moljir //Eldi iz coolest elf-dorf. -/obj/item/weapon/implant/reagent_generator/eldi +/obj/item/implant/reagent_generator/eldi name = "lactation implant" desc = "This is an implant that allows the user to lactate." generated_reagents = list("milk" = 2) @@ -51,11 +51,11 @@ verb_name = "Milk" verb_desc = "Grab Eldi'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/eldi - implant_type = /obj/item/weapon/implant/reagent_generator/eldi +/obj/item/implanter/reagent_generator/eldi + implant_type = /obj/item/implant/reagent_generator/eldi //Vorrarkul: Theodora Lindt -/obj/item/weapon/implant/reagent_generator/vorrarkul +/obj/item/implant/reagent_generator/vorrarkul generated_reagents = list("chocolate_milk" = 2) reagent_name = "chocalate milk" usable_volume = 1000 @@ -68,11 +68,11 @@ verb_name = "Milk" verb_desc = "Grab Theodora's breasts and extract delicious chocolate milk from them!" -/obj/item/weapon/implanter/reagent_generator/vorrarkul - implant_type = /obj/item/weapon/implant/reagent_generator/vorrarkul +/obj/item/implanter/reagent_generator/vorrarkul + implant_type = /obj/item/implant/reagent_generator/vorrarkul //Lycanthorph: Savannah Dixon -/obj/item/weapon/implant/reagent_generator/savannah +/obj/item/implant/reagent_generator/savannah generated_reagents = list("milk" = 2) reagent_name = "milk" usable_volume = 1000 @@ -85,14 +85,14 @@ verb_name = "Milk" verb_desc = "Grab Savannah's breasts and extract sweet milk from them!" -/obj/item/weapon/implanter/reagent_generator/savannah - implant_type = /obj/item/weapon/implant/reagent_generator/savannah +/obj/item/implanter/reagent_generator/savannah + implant_type = /obj/item/implant/reagent_generator/savannah //SpoopyLizz: Roiz Lizden //I made this! Woo! //implant //-------------------- -/obj/item/weapon/implant/reagent_generator/roiz +/obj/item/implant/reagent_generator/roiz name = "egg laying implant" desc = "This is an implant that allows the user to lay eggs." generated_reagents = list("egg" = 2) @@ -109,14 +109,14 @@ random_emote = list("hisses softly with a blush on his face", "yelps in embarrassment", "grunts a little") assigned_proc = /mob/living/carbon/human/proc/use_reagent_implant_roiz -/obj/item/weapon/implant/reagent_generator/roiz/post_implant(mob/living/carbon/source) +/obj/item/implant/reagent_generator/roiz/post_implant(mob/living/carbon/source) START_PROCESSING(SSobj, src) to_chat(source, "You implant [source] with \the [src].") source.verbs |= assigned_proc return 1 -/obj/item/weapon/implanter/reagent_generator/roiz - implant_type = /obj/item/weapon/implant/reagent_generator/roiz +/obj/item/implanter/reagent_generator/roiz + implant_type = /obj/item/implant/reagent_generator/roiz /mob/living/carbon/human/proc/use_reagent_implant_roiz() set name = "Lay Egg" @@ -131,10 +131,10 @@ if(usr.incapacitated() || usr.stat > CONSCIOUS) return - var/obj/item/weapon/implant/reagent_generator/roiz/rimplant + var/obj/item/implant/reagent_generator/roiz/rimplant for(var/obj/item/organ/external/E in organs) - for(var/obj/item/weapon/implant/I in E.implants) - if(istype(I, /obj/item/weapon/implant/reagent_generator)) + for(var/obj/item/implant/I in E.implants) + if(istype(I, /obj/item/implant/reagent_generator)) rimplant = I break if (rimplant) @@ -142,7 +142,7 @@ to_chat(src, "[pick(rimplant.empty_message)]") return - new /obj/item/weapon/reagent_containers/food/snacks/egg/roiz(get_turf(src)) + new /obj/item/reagent_containers/food/snacks/egg/roiz(get_turf(src)) var/index = rand(0,3) @@ -161,7 +161,7 @@ rimplant.reagents.remove_any(rimplant.transfer_amount) //Cameron653: Jasmine Lizden -/obj/item/weapon/implant/reagent_generator/jasmine +/obj/item/implant/reagent_generator/jasmine name = "egg laying implant" desc = "This is an implant that allows the user to lay eggs." generated_reagents = list("egg" = 2) @@ -178,14 +178,14 @@ random_emote = list("hisses softly with a blush on her face", "bites down on her lower lip", "lets out a light huff") assigned_proc = /mob/living/carbon/human/proc/use_reagent_implant_jasmine -/obj/item/weapon/implant/reagent_generator/jasmine/post_implant(mob/living/carbon/source) +/obj/item/implant/reagent_generator/jasmine/post_implant(mob/living/carbon/source) START_PROCESSING(SSobj, src) to_chat(source, "You implant [source] with \the [src].") source.verbs |= assigned_proc return 1 -/obj/item/weapon/implanter/reagent_generator/jasmine - implant_type = /obj/item/weapon/implant/reagent_generator/jasmine +/obj/item/implanter/reagent_generator/jasmine + implant_type = /obj/item/implant/reagent_generator/jasmine /mob/living/carbon/human/proc/use_reagent_implant_jasmine() set name = "Lay Egg" @@ -200,10 +200,10 @@ if(usr.incapacitated() || usr.stat > CONSCIOUS) return - var/obj/item/weapon/implant/reagent_generator/jasmine/rimplant + var/obj/item/implant/reagent_generator/jasmine/rimplant for(var/obj/item/organ/external/E in organs) - for(var/obj/item/weapon/implant/I in E.implants) - if(istype(I, /obj/item/weapon/implant/reagent_generator)) + for(var/obj/item/implant/I in E.implants) + if(istype(I, /obj/item/implant/reagent_generator)) rimplant = I break if (rimplant) @@ -211,7 +211,7 @@ to_chat(src, "[pick(rimplant.empty_message)]") return - new /obj/item/weapon/reagent_containers/food/snacks/egg/roiz(get_turf(src)) + new /obj/item/reagent_containers/food/snacks/egg/roiz(get_turf(src)) var/index = rand(0,3) @@ -230,7 +230,7 @@ rimplant.reagents.remove_any(rimplant.transfer_amount) //Draycu: Schae Yonra -/obj/item/weapon/implant/reagent_generator/yonra +/obj/item/implant/reagent_generator/yonra name = "egg laying implant" desc = "This is an implant that allows the user to lay eggs." generated_reagents = list("egg" = 2) @@ -247,14 +247,14 @@ random_emote = list("hisses softly with a blush on her face", "yelps in embarrassment", "grunts a little") assigned_proc = /mob/living/carbon/human/proc/use_reagent_implant_yonra -/obj/item/weapon/implant/reagent_generator/yonra/post_implant(mob/living/carbon/source) +/obj/item/implant/reagent_generator/yonra/post_implant(mob/living/carbon/source) START_PROCESSING(SSobj, src) to_chat(source, "You implant [source] with \the [src].") source.verbs |= assigned_proc return 1 -/obj/item/weapon/implanter/reagent_generator/yonra - implant_type = /obj/item/weapon/implant/reagent_generator/yonra +/obj/item/implanter/reagent_generator/yonra + implant_type = /obj/item/implant/reagent_generator/yonra /mob/living/carbon/human/proc/use_reagent_implant_yonra() set name = "Lay Egg" @@ -269,10 +269,10 @@ if(usr.incapacitated() || usr.stat > CONSCIOUS) return - var/obj/item/weapon/implant/reagent_generator/yonra/rimplant + var/obj/item/implant/reagent_generator/yonra/rimplant for(var/obj/item/organ/external/E in organs) - for(var/obj/item/weapon/implant/I in E.implants) - if(istype(I, /obj/item/weapon/implant/reagent_generator)) + for(var/obj/item/implant/I in E.implants) + if(istype(I, /obj/item/implant/reagent_generator)) rimplant = I break if (rimplant) @@ -280,7 +280,7 @@ to_chat(src, "[pick(rimplant.empty_message)]") return - new /obj/item/weapon/reagent_containers/food/snacks/egg/teshari(get_turf(src)) + new /obj/item/reagent_containers/food/snacks/egg/teshari(get_turf(src)) var/index = rand(0,3) @@ -298,7 +298,7 @@ rimplant.reagents.remove_any(rimplant.transfer_amount) -/obj/item/weapon/reagent_containers/food/snacks/egg/teshari +/obj/item/reagent_containers/food/snacks/egg/teshari name = "teshari egg" desc = "It's a large teshari egg." icon = 'icons/vore/custom_items_vr.dmi' @@ -306,16 +306,16 @@ filling_color = "#FDFFD1" volume = 12 -/obj/item/weapon/reagent_containers/food/snacks/egg/teshari/New() +/obj/item/reagent_containers/food/snacks/egg/teshari/New() ..() reagents.add_reagent("egg", 10) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/egg/teshari/tesh2 +/obj/item/reagent_containers/food/snacks/egg/teshari/tesh2 icon_state = "tesh_egg_2" //Konabird: Rischi -/obj/item/weapon/implant/reagent_generator/rischi +/obj/item/implant/reagent_generator/rischi name = "egg laying implant" desc = "This is an implant that allows the user to lay eggs." generated_reagents = list("egg" = 2) @@ -332,14 +332,14 @@ random_emote = list("trembles and huffs, panting from the exertion.", "sees what has happened and covers her face with both hands!", "whimpers softly, her legs shivering, knees pointed inward from the feeling.") assigned_proc = /mob/living/carbon/human/proc/use_reagent_implant_rischi -/obj/item/weapon/implant/reagent_generator/rischi/post_implant(mob/living/carbon/source) +/obj/item/implant/reagent_generator/rischi/post_implant(mob/living/carbon/source) START_PROCESSING(SSobj, src) to_chat(source, "You implant [source] with \the [src].") source.verbs |= assigned_proc return 1 -/obj/item/weapon/implanter/reagent_generator/rischi - implant_type = /obj/item/weapon/implant/reagent_generator/rischi +/obj/item/implanter/reagent_generator/rischi + implant_type = /obj/item/implant/reagent_generator/rischi /mob/living/carbon/human/proc/use_reagent_implant_rischi() set name = "Lay Egg" @@ -354,10 +354,10 @@ if(usr.incapacitated() || usr.stat > CONSCIOUS) return - var/obj/item/weapon/implant/reagent_generator/rischi/rimplant + var/obj/item/implant/reagent_generator/rischi/rimplant for(var/obj/item/organ/external/E in organs) - for(var/obj/item/weapon/implant/I in E.implants) - if(istype(I, /obj/item/weapon/implant/reagent_generator)) + for(var/obj/item/implant/I in E.implants) + if(istype(I, /obj/item/implant/reagent_generator)) rimplant = I break if (rimplant) @@ -365,7 +365,7 @@ to_chat(src, "[pick(rimplant.empty_message)]") return - new /obj/item/weapon/reagent_containers/food/snacks/egg/teshari/tesh2(get_turf(src)) + new /obj/item/reagent_containers/food/snacks/egg/teshari/tesh2(get_turf(src)) var/index = rand(0,3) @@ -384,7 +384,7 @@ rimplant.reagents.remove_any(rimplant.transfer_amount) /* -/obj/item/weapon/implant/reagent_generator/pumila_nectar //Bugged. Two implants at once messes things up. +/obj/item/implant/reagent_generator/pumila_nectar //Bugged. Two implants at once messes things up. generated_reagents = list("honey" = 2) reagent_name = "honey" usable_volume = 5000 @@ -396,12 +396,12 @@ verb_name = "Extract Honey" verb_desc = "Obtain pumila's nectar and put it into a container!" -/obj/item/weapon/implanter/reagent_generator/pumila_nectar - implant_type = /obj/item/weapon/implant/reagent_generator/pumila_nectar +/obj/item/implanter/reagent_generator/pumila_nectar + implant_type = /obj/item/implant/reagent_generator/pumila_nectar */ //Egg item //------------- -/obj/item/weapon/reagent_containers/food/snacks/egg/roiz +/obj/item/reagent_containers/food/snacks/egg/roiz name = "lizard egg" desc = "It's a large lizard egg." icon = 'icons/vore/custom_items_vr.dmi' @@ -409,14 +409,14 @@ filling_color = "#FDFFD1" volume = 12 -/obj/item/weapon/reagent_containers/food/snacks/egg/roiz/New() +/obj/item/reagent_containers/food/snacks/egg/roiz/New() ..() reagents.add_reagent("egg", 9) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/egg/roiz/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype( W, /obj/item/weapon/pen/crayon )) - var/obj/item/weapon/pen/crayon/C = W +/obj/item/reagent_containers/food/snacks/egg/roiz/attackby(obj/item/W as obj, mob/user as mob) + if(istype( W, /obj/item/pen/crayon )) + var/obj/item/pen/crayon/C = W var/clr = C.colourName if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow"))) @@ -432,31 +432,31 @@ else ..() -/obj/item/weapon/reagent_containers/food/snacks/friedegg/roiz +/obj/item/reagent_containers/food/snacks/friedegg/roiz name = "fried lizard egg" desc = "A large, fried lizard egg, with a touch of salt and pepper. It looks rather chewy." icon = 'icons/vore/custom_items_vr.dmi' icon_state = "friedegg" volume = 12 -/obj/item/weapon/reagent_containers/food/snacks/friedegg/roiz/New() +/obj/item/reagent_containers/food/snacks/friedegg/roiz/New() ..() reagents.add_reagent("protein", 9) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/boiledegg/roiz +/obj/item/reagent_containers/food/snacks/boiledegg/roiz name = "boiled lizard egg" desc = "A hard boiled lizard egg. Be careful, a lizard detective may hatch!" icon = 'icons/vore/custom_items_vr.dmi' icon_state = "egg_roiz" volume = 12 -/obj/item/weapon/reagent_containers/food/snacks/boiledegg/roiz/New() +/obj/item/reagent_containers/food/snacks/boiledegg/roiz/New() ..() reagents.add_reagent("protein", 6) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/chocolateegg/roiz +/obj/item/reagent_containers/food/snacks/chocolateegg/roiz name = "chocolate lizard egg" desc = "Such huge, sweet, fattening food. You feel gluttonous just looking at it." icon = 'icons/vore/custom_items_vr.dmi' @@ -466,7 +466,7 @@ nutriment_desc = list("chocolate" = 5) volume = 18 -/obj/item/weapon/reagent_containers/food/snacks/chocolateegg/roiz/New() +/obj/item/reagent_containers/food/snacks/chocolateegg/roiz/New() ..() reagents.add_reagent("sugar", 6) reagents.add_reagent("coco", 6) @@ -474,7 +474,7 @@ bitesize = 2 //SilverTalisman: Evian -/obj/item/weapon/implant/reagent_generator/evian +/obj/item/implant/reagent_generator/evian emote_descriptor = list("an egg right out of Evian's lower belly!", "into Evian' belly firmly, forcing him to lay an egg!", "Evian really tight, who promptly lays an egg!") var/verb_descriptor = list("squeezes", "pushes", "hugs") var/self_verb_descriptor = list("squeeze", "push", "hug") @@ -483,14 +483,14 @@ random_emote = list("hisses softly with a blush on his face", "yelps in embarrassment", "grunts a little") assigned_proc = /mob/living/carbon/human/proc/use_reagent_implant_evian -/obj/item/weapon/implant/reagent_generator/evian/post_implant(mob/living/carbon/source) +/obj/item/implant/reagent_generator/evian/post_implant(mob/living/carbon/source) START_PROCESSING(SSobj, src) to_chat(source, "You implant [source] with \the [src].") source.verbs |= assigned_proc return 1 -/obj/item/weapon/implanter/reagent_generator/evian - implant_type = /obj/item/weapon/implant/reagent_generator/evian +/obj/item/implanter/reagent_generator/evian + implant_type = /obj/item/implant/reagent_generator/evian /mob/living/carbon/human/proc/use_reagent_implant_evian() set name = "Lay Egg" @@ -505,10 +505,10 @@ if(usr.incapacitated() || usr.stat > CONSCIOUS) return - var/obj/item/weapon/implant/reagent_generator/evian/rimplant + var/obj/item/implant/reagent_generator/evian/rimplant for(var/obj/item/organ/external/E in organs) - for(var/obj/item/weapon/implant/I in E.implants) - if(istype(I, /obj/item/weapon/implant/reagent_generator)) + for(var/obj/item/implant/I in E.implants) + if(istype(I, /obj/item/implant/reagent_generator)) rimplant = I break if (rimplant) @@ -516,7 +516,7 @@ to_chat(src, "[pick(rimplant.empty_message)]") return - new /obj/item/weapon/reagent_containers/food/snacks/egg/roiz/evian(get_turf(src)) //Roiz/evian so it gets all the functionality + new /obj/item/reagent_containers/food/snacks/egg/roiz/evian(get_turf(src)) //Roiz/evian so it gets all the functionality var/index = rand(0,3) @@ -534,14 +534,14 @@ rimplant.reagents.remove_any(rimplant.transfer_amount) -/obj/item/weapon/reagent_containers/food/snacks/egg/roiz/evian +/obj/item/reagent_containers/food/snacks/egg/roiz/evian name = "dragon egg" desc = "A quite large dragon egg!" icon_state = "egg_roiz_yellow" -/obj/item/weapon/reagent_containers/food/snacks/egg/roiz/evian/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype( W, /obj/item/weapon/pen/crayon)) //No coloring these ones! +/obj/item/reagent_containers/food/snacks/egg/roiz/evian/attackby(obj/item/W as obj, mob/user as mob) + if(istype( W, /obj/item/pen/crayon)) //No coloring these ones! return else ..() diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 0ce6aab8ab4..b1f3c770348 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -13,7 +13,7 @@ /* TEMPLATE //ckey:Character Name -/obj/item/weapon/fluff/charactername +/obj/item/fluff/charactername name = "" desc = "" @@ -26,7 +26,7 @@ */ //For general use -/obj/item/device/modkit_conversion +/obj/item/modkit_conversion name = "modification kit" desc = "A kit containing all the needed tools and parts to modify a suit and helmet." icon = 'icons/vore/custom_items_vr.dmi' @@ -51,7 +51,7 @@ var/delete_on_empty = FALSE //do we self-delete when emptied? //Conversion proc -/obj/item/device/modkit_conversion/afterattack(obj/O, mob/user as mob) +/obj/item/modkit_conversion/afterattack(obj/O, mob/user as mob) var/cost var/to_type var/keycheck @@ -114,23 +114,23 @@ //transfer logic could technically be made more thorough and handle stuff like helmet/boots/tank vars for suits, but in those cases you should be removing the items first anyway if(skip_content_check && transfer_contents) N.contents = O.contents - if(istype(N,/obj/item/weapon/gun/projectile/)) - var/obj/item/weapon/gun/projectile/NN = N - var/obj/item/weapon/gun/projectile/OO = O + if(istype(N,/obj/item/gun/projectile/)) + var/obj/item/gun/projectile/NN = N + var/obj/item/gun/projectile/OO = O NN.magazine_type = OO.magazine_type NN.ammo_magazine = OO.ammo_magazine - if(istype(N,/obj/item/weapon/gun/energy/)) - var/obj/item/weapon/gun/energy/NE = N - var/obj/item/weapon/gun/energy/OE = O + if(istype(N,/obj/item/gun/energy/)) + var/obj/item/gun/energy/NE = N + var/obj/item/gun/energy/OE = O NE.cell_type = OE.cell_type else - if(istype(N,/obj/item/weapon/gun/projectile/)) - var/obj/item/weapon/gun/projectile/NM = N + if(istype(N,/obj/item/gun/projectile/)) + var/obj/item/gun/projectile/NM = N NM.contents = list() NM.magazine_type = null NM.ammo_magazine = null - if(istype(N,/obj/item/weapon/gun/energy/)) - var/obj/item/weapon/gun/energy/NO = N + if(istype(N,/obj/item/gun/energy/)) + var/obj/item/gun/energy/NO = N NO.contents = list() NO.cell_type = null @@ -140,7 +140,7 @@ qdel(src) //DEBUG ITEM -/obj/item/device/modkit_conversion/fluff/debug_gunkit +/obj/item/modkit_conversion/fluff/debug_gunkit name = "Gun Transformation Kit" desc = "A kit containing all the needed tools and fabric to modify one sidearm to another." skip_content_check = FALSE @@ -149,19 +149,19 @@ icon = 'icons/vore/custom_items_vr.dmi' icon_state = "harmony_kit" - from_helmet = /obj/item/weapon/gun/energy/laser - to_helmet = /obj/item/weapon/gun/energy/retro + from_helmet = /obj/item/gun/energy/laser + to_helmet = /obj/item/gun/energy/retro //DEBUG ITEM ENDS //JoanRisu:Joan Risu -/obj/item/weapon/flame/lighter/zippo/fluff/joan +/obj/item/flame/lighter/zippo/fluff/joan name = "Federation Zippo Lighter" desc = "A red zippo lighter with the United Federation Logo on it." icon = 'icons/vore/custom_items_vr.dmi' icon_state = "joanzip" //JoanRisu:Joan Risu -/obj/item/weapon/sword/fluff/joanaria +/obj/item/sword/fluff/joanaria name = "Aria" desc = "A beautifully crafted rapier owned by Joan Risu. It has a thin blade and is used for quick attacks." icon = 'icons/vore/custom_items_vr.dmi' @@ -175,7 +175,7 @@ hitsound = 'sound/weapons/bladeslice.ogg' -/obj/item/weapon/sword/fluff/joanaria/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/sword/fluff/joanaria/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(default_parry_check(user, attacker, damage_source) && prob(75)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") @@ -184,11 +184,11 @@ return 0 //joanrisu:Katarina Eine -/obj/item/weapon/material/knife/tacknife/combatknife/fluff/katarina +/obj/item/material/knife/tacknife/combatknife/fluff/katarina name = "tactical Knife" desc = "A tactical knife with a small butterly engraved on the blade." -/obj/item/weapon/material/knife/tacknife/combatknife/fluff/katarina/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/material/knife/tacknife/combatknife/fluff/katarina/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(default_parry_check(user, attacker, damage_source) && prob(75)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") @@ -197,7 +197,7 @@ return 0 //For General use -/obj/item/weapon/sword/fluff/joanaria/scisword +/obj/item/sword/fluff/joanaria/scisword name = "Scissor Blade" desc = "A sword that can not only cut down your enemies, it can also cut fabric really neatly" icon = 'icons/vore/custom_items_vr.dmi' @@ -206,7 +206,7 @@ //john.wayne9392:Harmony Prechtl -/obj/item/weapon/twohanded/fireaxe/fluff/mjollnir +/obj/item/twohanded/fireaxe/fluff/mjollnir name = "Mjollnir" desc = "Large hammer that looks like it can do a great deal of damage if properly used." icon = 'icons/vore/custom_items_vr.dmi' @@ -215,7 +215,7 @@ attack_verb = list("attacked", "hammered", "smashed", "slammed", "crushed") //JoanRisu:Joan Risu -/obj/item/weapon/card/id/centcom/station/fluff/joanbadge +/obj/item/card/id/centcom/station/fluff/joanbadge name = "Faded Badge" desc = "A faded badge, backed with leather, that reads 'NT Security Force' across the front." icon = 'icons/vore/custom_items_vr.dmi' @@ -224,26 +224,26 @@ assignment = "Centcom Officer" -/obj/item/weapon/card/id/centcom/station/fluff/joanbadge/attack_self(mob/user as mob) +/obj/item/card/id/centcom/station/fluff/joanbadge/attack_self(mob/user as mob) if(isliving(user)) user.visible_message("[user] flashes their golden security badge.\nIt reads:NT Security.","You display the faded badge.\nIt reads: NT Security.") -/obj/item/weapon/card/id/centcom/station/fluff/joanbadge/attack(mob/living/carbon/human/M, mob/living/user) +/obj/item/card/id/centcom/station/fluff/joanbadge/attack(mob/living/carbon/human/M, mob/living/user) if(isliving(user)) user.visible_message("[user] invades [M]'s personal space, thrusting [src] into their face insistently.","You invade [M]'s personal space, thrusting [src] into their face insistently.") //JoanRisu:Joan Risu -/obj/item/device/pda/heads/hos/joanpda +/obj/item/pda/heads/hos/joanpda icon = 'icons/vore/custom_items_vr.dmi' icon_state = "pda-joan" //Vorrarkul:Lucina Dakarim -/obj/item/device/pda/heads/cmo/fluff/lucinapda +/obj/item/pda/heads/cmo/fluff/lucinapda icon = 'icons/vore/custom_items_vr.dmi' icon_state = "pda-lucina" //john.wayne9392:Harmony Prechtl -/obj/item/device/modkit_conversion/fluff/harmonyspace +/obj/item/modkit_conversion/fluff/harmonyspace name = "Harmony's captain space suit modkit" desc = "A kit containing all the needed tools and parts to modify a Captain's hardsuit. It has green and yellow parts inside." @@ -256,7 +256,7 @@ to_suit = /obj/item/clothing/suit/armor/captain/fluff/harmsuit //john.wayne9392:Harmony Prechtl -/obj/item/device/modkit_conversion/fluff/harmonysuit +/obj/item/modkit_conversion/fluff/harmonysuit name = "Harmony's captain suit modkit" desc = "A sewing kit containing all the needed tools and fabric to modify a Captain's suit and hat. It has green and yellow fabrics inside." @@ -269,7 +269,7 @@ to_suit = /obj/item/clothing/under/rank/captain/fluff/harmuniform //scree:Scree -/obj/item/device/modkit_conversion/fluff/screekit +/obj/item/modkit_conversion/fluff/screekit name = "Scree's hardsuit modification kit" desc = "A kit containing all the needed tools and parts to modify a hardsuit for a specific user. This one looks like it's fitted for a winged creature." @@ -282,7 +282,7 @@ to_suit = /obj/item/clothing/suit/space/void/engineering/hazmat/fluff/screespess //General Use -/obj/item/weapon/flag +/obj/item/flag name = "Nanotrasen Banner" desc = "I pledge allegiance to the flag of a megacorporation in space." @@ -292,16 +292,16 @@ icon_override = 'icons/vore/custom_items_vr.dmi' item_state = "Flag_Nanotrasen_mob" -/obj/item/weapon/flag/attack_self(mob/user as mob) +/obj/item/flag/attack_self(mob/user as mob) if(isliving(user)) user.visible_message("[user] waves their Banner around!","You wave your Banner around.") -/obj/item/weapon/flag/attack(mob/living/carbon/human/M, mob/living/user) +/obj/item/flag/attack(mob/living/carbon/human/M, mob/living/user) if(isliving(user)) user.visible_message("[user] invades [M]'s personal space, thrusting [src] into their face insistently.","You invade [M]'s personal space, thrusting [src] into their face insistently.") -/obj/item/weapon/flag/federation +/obj/item/flag/federation name = "Federation Banner" desc = "Space, The Final Frontier. Sorta. Just go with it and say the damn oath." @@ -311,7 +311,7 @@ icon_override = 'icons/vore/custom_items_vr.dmi' item_state = "flag_federation_mob" -/obj/item/weapon/flag/xcom +/obj/item/flag/xcom name = "Alien Combat Command Banner" desc = "A banner bearing the symbol of a task force fighting an unknown alien power." @@ -321,7 +321,7 @@ icon_override = 'icons/vore/custom_items_vr.dmi' item_state = "flag_xcom_mob" -/obj/item/weapon/flag/advent +/obj/item/flag/advent name = "ALIEN Coalition Banner" desc = "A banner belonging to traitors who work for an unknown alien power." @@ -343,7 +343,7 @@ icon_override = 'icons/vore/custom_items_vr.dmi' //zodiacshadow: Nehi Maximus -/obj/item/device/radio/headset/fluff/zodiacshadow +/obj/item/radio/headset/fluff/zodiacshadow name = "Nehi's 'phones" desc = "A pair of old-fashioned purple headphones for listening to music that also double as an NT-approved headset; they connect nicely to any standard PDA. One side is engraved with the letters NEHI, the other having an elaborate inscription of the words \"My voice is my weapon of choice\" in a fancy font. A modern polymer allows switching between modes to either allow one to hear one's surroundings or to completely block them out." @@ -362,7 +362,7 @@ icon_state = "silver" // OrbisA: Richard D'angelo -/obj/item/weapon/melee/fluff/holochain +/obj/item/melee/fluff/holochain name = "Holographic Chain" desc = "A High Tech solution to simple perversions. It has a red leather handle and the initials R.D. on the silver base." @@ -381,22 +381,22 @@ attack_verb = list("flogged", "whipped", "lashed", "disciplined", "chastised", "flayed") //General use -/obj/item/weapon/melee/fluff/holochain/mass +/obj/item/melee/fluff/holochain/mass desc = "A mass produced version of the original. It has faux leather and an aluminium base, but still stings like the original." force = 8 attack_verb = list("flogged", "whipped", "lashed", "flayed") // joey4298:Emoticon -/obj/item/device/fluff/id_kit_mime +/obj/item/fluff/id_kit_mime name = "Mime ID reprinter" desc = "Stick your ID in one end and it'll print a new ID out the other!" icon = 'icons/obj/bureaucracy.dmi' icon_state = "labeler1" -/obj/item/device/fluff/id_kit_mime/afterattack(obj/O, mob/user as mob) +/obj/item/fluff/id_kit_mime/afterattack(obj/O, mob/user as mob) var/new_icon = "mime" - if(istype(O,/obj/item/weapon/card/id) && O.icon_state != new_icon) + if(istype(O,/obj/item/card/id) && O.icon_state != new_icon) //O.icon = icon // just in case we're using custom sprite paths with fluff items. O.icon_state = new_icon // Changes the icon without changing the access. playsound(src, 'sound/items/polaroid2.ogg', 100, 1) @@ -410,12 +410,12 @@ return //arokha:Aronai Sieyes - Centcom ID (Medical dept) -/obj/item/weapon/card/id/centcom/station/fluff/aronai +/obj/item/card/id/centcom/station/fluff/aronai registered_name = "CONFIGURE ME" assignment = "CC Medical" var/configured = 0 -/obj/item/weapon/card/id/centcom/station/fluff/aronai/attack_self(mob/user as mob) +/obj/item/card/id/centcom/station/fluff/aronai/attack_self(mob/user as mob) if(configured) return ..() @@ -426,7 +426,7 @@ to_chat(user, "Card settings set.") //Swat43:Fortune Bloise -/obj/item/weapon/storage/backpack/satchel/fluff/swat43bag +/obj/item/storage/backpack/satchel/fluff/swat43bag name = "Coloured Satchel" desc = "That's a coloured satchel with red stripes, with a heart and ripley logo on each side." icon = 'icons/vore/custom_items_vr.dmi' @@ -483,7 +483,7 @@ //SilencedMP5A5:Serdykov Antoz -/obj/item/device/modkit_conversion/fluff/serdykit +/obj/item/modkit_conversion/fluff/serdykit name = "Serdykov's armor modification kit" desc = "A kit containing all the needed tools and parts to modify a armor vest and helmet for a specific user. This one looks like it's fitted for a wolf-taur." @@ -572,7 +572,7 @@ icon_state = "[initial(icon_state)][tostate]" update_icon() -/obj/item/weapon/paper/khcrystal_manual +/obj/item/paper/khcrystal_manual name = "KH-LC91-1 manual" info = {"

KH-LC91-1 Life Crystal

Usage
@@ -611,23 +611,23 @@ \[AM WARNING\]

This device contains antimatter. Please consult all local regulations when travelling to ensure compliance with local laws.

"} -/obj/item/weapon/storage/box/khcrystal +/obj/item/storage/box/khcrystal name = "life crystal case" icon = 'icons/vore/custom_items_vr.dmi' icon_state = "khlifebox" desc = "This case can only hold the KH-LC91-1 and a manual." item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") storage_slots = 2 - can_hold = list(/obj/item/weapon/paper/khcrystal_manual, /obj/item/clothing/accessory/collar/khcrystal) + can_hold = list(/obj/item/paper/khcrystal_manual, /obj/item/clothing/accessory/collar/khcrystal) max_storage_space = ITEMSIZE_COST_SMALL * 2 w_class = ITEMSIZE_SMALL -/obj/item/weapon/storage/box/khcrystal/New() +/obj/item/storage/box/khcrystal/New() ..() - new /obj/item/weapon/paper/khcrystal_manual(src) + new /obj/item/paper/khcrystal_manual(src) new /obj/item/clothing/accessory/collar/khcrystal(src) -/obj/item/weapon/cane/fluff +/obj/item/cane/fluff name = "cane" desc = "A cane used by a true gentlemen. Or a clown." icon = 'icons/vore/custom_items_vr.dmi' @@ -640,22 +640,22 @@ matter = list(MAT_STEEL = 50) attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed") -/obj/item/weapon/cane/fluff/tasald +/obj/item/cane/fluff/tasald name = "Ornate Walking Cane" desc = "An elaborately made custom walking stick with a dark wooding core, a crimson red gemstone on its head and a steel cover around the bottom. you'd probably hear someone using this down the hall." icon = 'icons/vore/custom_items_vr.dmi' -/obj/item/device/fluff/id_kit_ivy +/obj/item/fluff/id_kit_ivy name = "Holo-ID reprinter" desc = "Stick your ID in one end and it'll print a new ID out the other!" icon = 'icons/obj/bureaucracy.dmi' icon_state = "labeler1" -/obj/item/device/fluff/id_kit_ivy/afterattack(obj/O, mob/user as mob) +/obj/item/fluff/id_kit_ivy/afterattack(obj/O, mob/user as mob) var/new_icon_state = "ivyholoid" var/new_icon = 'icons/vore/custom_items_vr.dmi' var/new_desc = "Its a thin screen showing ID information, but it seems to be flickering." - if(istype(O,/obj/item/weapon/card/id) && O.icon_state != new_icon) + if(istype(O,/obj/item/card/id) && O.icon_state != new_icon) O.icon = new_icon O.icon_state = new_icon_state // Changes the icon without changing the access. O.desc = new_desc @@ -670,7 +670,7 @@ return //WickedTempest: Chakat Tempest -/obj/item/weapon/reagent_containers/hypospray/vial/tempest +/obj/item/reagent_containers/hypospray/vial/tempest name = "Tempest's Hypospray" desc = "A custom-made MKII hypospray belonging to Chakat Tempest. There's small print engraved on the handle: A medicine-cat has no time for doubt. Act now, act swiftly." icon = 'icons/vore/custom_items_vr.dmi' @@ -678,7 +678,7 @@ icon_state = "temphypo" //WickedTempest: Chakat Tempest -/obj/item/weapon/storage/backpack/saddlebag/tempest +/obj/item/storage/backpack/saddlebag/tempest name = "Tempest's Saddlebags" desc = "A custom-made set of saddlebags, tailored to Chakat Tempest's exact dimensions, and taste in color! One one side, there's small print stitched in: ...to carry the weight of any responsibility, burden or task." icon = 'icons/vore/custom_items_vr.dmi' @@ -695,15 +695,15 @@ var/ambulance_state = FALSE var/ambulance_last_switch = 0 -/obj/item/weapon/storage/backpack/saddlebag/tempest/Initialize() +/obj/item/storage/backpack/saddlebag/tempest/Initialize() soundloop = new(list(src), FALSE) return ..() -/obj/item/weapon/storage/backpack/saddlebag/tempest/Destroy() +/obj/item/storage/backpack/saddlebag/tempest/Destroy() QDEL_NULL(soundloop) return ..() -/obj/item/weapon/storage/backpack/saddlebag/tempest/ui_action_click() +/obj/item/storage/backpack/saddlebag/tempest/ui_action_click() ambulance = !(ambulance) if(ambulance) START_PROCESSING(SSobj, src) @@ -724,7 +724,7 @@ set_light(0) soundloop.stop() -/obj/item/weapon/storage/backpack/saddlebag/tempest/process() +/obj/item/storage/backpack/saddlebag/tempest/process() if(!ambulance) STOP_PROCESSING(SSobj, src) return @@ -745,32 +745,32 @@ volume = 25 //PontifexMinimus: Lucius/Lucia Null -/obj/item/weapon/fluff/dragor_dot +/obj/item/fluff/dragor_dot name = "supplemental battery" desc = "A tiny supplemental battery for powering something or someone synthetic." icon = 'icons/vore/custom_items_vr.dmi' icon_state = "dragor_dot" w_class = ITEMSIZE_SMALL -/obj/item/weapon/fluff/dragor_dot/attack_self(mob/user as mob) +/obj/item/fluff/dragor_dot/attack_self(mob/user as mob) if(user.ckey == "pontifexminimus") user.verbs |= /mob/living/carbon/human/proc/shapeshifter_select_gender else return //LuminescentRing: Briana Moore -/obj/item/weapon/storage/backpack/messenger/black/fluff/briana +/obj/item/storage/backpack/messenger/black/fluff/briana name = "2561 graduation bag" desc = "A black leather bag with names scattered around in red embroidery, it says 'Pride State Academy' on the top. " //DeepIndigo: Amina Dae-Kouri -/obj/item/weapon/storage/bible/fluff/amina +/obj/item/storage/bible/fluff/amina name = "New Space Pioneer's Bible" desc = "A New Space Pioneer's Bible. 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'" //arokha:Amaya Rahl - Custom ID (Medical dept) -/obj/item/weapon/card/id/event/fluff/amaya +/obj/item/card/id/event/fluff/amaya registered_name = "CONFIGURE ME" assignment = "CONFIGURE ME" icon = 'icons/vore/custom_items_vr.dmi' @@ -849,7 +849,7 @@ else user.visible_message("[user] displays their [src].\nIt reads: [badge_string].","You display your [src]. It reads: [badge_string].") -/obj/item/weapon/card/id/fluff/xennith +/obj/item/card/id/fluff/xennith name = "\improper Amy Lessen's Central Command ID (Xenobiology Director)" desc = "This ID card identifies Dr. Amelie Lessen as the founder and director of the NanoTrasen Xenobiology Research Department, circa 2553." icon_state = "centcom" @@ -860,17 +860,17 @@ blood_type = "O-" sex = "Female" -/obj/item/weapon/fluff/injector //Injectors. Custom item used to explain wild changes in a mob's body or chemistry. +/obj/item/fluff/injector //Injectors. Custom item used to explain wild changes in a mob's body or chemistry. name = "Injector" desc = "Some type of injector." icon = 'icons/obj/items.dmi' icon_state = "dnainjector" -/obj/item/weapon/fluff/injector/monkey +/obj/item/fluff/injector/monkey name = "Lesser Form Injector" desc = "Turn the user into their lesser, more primal form." -/obj/item/weapon/fluff/injector/monkey/attack(mob/living/M, mob/living/user) +/obj/item/fluff/injector/monkey/attack(mob/living/M, mob/living/user) if(usr == M) //Is the person using it on theirself? if(ishuman(M)) //If so, monkify them. @@ -880,11 +880,11 @@ else //If not, do nothing. to_chat(user, "You are unable to inject other people.") -/obj/item/weapon/fluff/injector/numb_bite +/obj/item/fluff/injector/numb_bite name = "Numbing Venom Injector" desc = "Injects the user with a high dose of some type of chemical, causing any chemical glands they have to kick into overdrive and create the production of a numbing enzyme that is injected via bites.." -/obj/item/weapon/fluff/injector/numb_bite/attack(mob/living/M, mob/living/user) +/obj/item/fluff/injector/numb_bite/attack(mob/living/M, mob/living/user) if(usr == M) //Is the person using it on theirself? if(ishuman(M)) //Give them numbing bites. @@ -895,7 +895,7 @@ to_chat(user, "You are unable to inject other people.") //For 2 handed fluff weapons. -/obj/item/weapon/material/twohanded/fluff //Twohanded fluff items. +/obj/item/material/twohanded/fluff //Twohanded fluff items. name = "fluff." desc = "This object is so fluffy. Just from the sight of it, you know that either something went wrong or someone spawned the incorrect item." icon = 'icons/vore/custom_items_vr.dmi' @@ -904,11 +904,11 @@ slot_r_hand_str = 'icons/vore/custom_items_right_hand_vr.dmi', ) -/obj/item/weapon/material/twohanded/fluff/New(var/newloc) +/obj/item/material/twohanded/fluff/New(var/newloc) ..(newloc," ") //See materials_vr_dmi for more information as to why this is a blank space. //jacknoir413:Areax Third -/obj/item/weapon/melee/baton/fluff/stunstaff +/obj/item/melee/baton/fluff/stunstaff name = "Electrostaff" desc = "Six-foot long staff from dull, rugged metal, with two thin spikes protruding from each end. Small etching near to the middle of it reads 'Children Of Nyx Facilities: Product No. 12'." icon = 'icons/vore/custom_items_vr.dmi' @@ -928,13 +928,13 @@ var/wielded = 0 var/base_name = "stunstaff" -/obj/item/weapon/melee/baton/fluff/stunstaff/New() +/obj/item/melee/baton/fluff/stunstaff/New() ..() - bcell = new/obj/item/weapon/cell/device/weapon(src) + bcell = new/obj/item/cell/device/weapon(src) update_icon() return -/obj/item/weapon/melee/baton/fluff/stunstaff/update_held_icon() +/obj/item/melee/baton/fluff/stunstaff/update_held_icon() var/mob/living/M = loc if(istype(M) && !issmall(M) && M.item_is_in_hands(src) && !M.hands_are_full()) wielded = 1 @@ -948,14 +948,14 @@ update_icon() ..() -/obj/item/weapon/melee/baton/fluff/stunstaff/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/melee/baton/fluff/stunstaff/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(wielded && default_parry_check(user, attacker, damage_source) && prob(30)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 -/obj/item/weapon/melee/baton/fluff/stunstaff/update_icon() +/obj/item/melee/baton/fluff/stunstaff/update_icon() icon_state = "[base_icon][wielded][status]" item_state = icon_state if(status==1) @@ -963,14 +963,14 @@ else set_light(0) -/obj/item/weapon/melee/baton/fluff/stunstaff/dropped() +/obj/item/melee/baton/fluff/stunstaff/dropped() ..() if(wielded) wielded = 0 spawn(0) update_held_icon() -/obj/item/weapon/melee/baton/fluff/stunstaff/attack_self(mob/user) +/obj/item/melee/baton/fluff/stunstaff/attack_self(mob/user) if(bcell && bcell.charge > hitcost) status = !status to_chat(user, "[src] is now [status ? "on" : "off"].") @@ -984,7 +984,7 @@ update_held_icon() add_fingerprint(user) -/obj/item/weapon/storage/backpack/fluff/stunstaff +/obj/item/storage/backpack/fluff/stunstaff name = "Electrostaff sheath" icon = 'icons/vore/custom_items_vr.dmi' icon_state = "holster_stunstaff" @@ -992,21 +992,21 @@ slot_flags = SLOT_BACK item_icons = list(slot_back_str = 'icons/vore/custom_onmob_vr.dmi', slot_l_hand_str = 'icons/vore/custom_items_left_hand_vr.dmi', slot_r_hand_str = 'icons/vore/custom_items_right_hand_vr.dmi') - can_hold = list(/obj/item/weapon/melee/baton/fluff/stunstaff) + can_hold = list(/obj/item/melee/baton/fluff/stunstaff) w_class = ITEMSIZE_HUGE max_w_class = ITEMSIZE_HUGE max_storage_space = 16 -/obj/item/weapon/storage/backpack/fluff/stunstaff/New() +/obj/item/storage/backpack/fluff/stunstaff/New() ..() - new /obj/item/weapon/melee/baton/fluff/stunstaff(src) + new /obj/item/melee/baton/fluff/stunstaff(src) /* * Awoo Sword */ -/obj/item/weapon/melee/fluffstuff +/obj/item/melee/fluffstuff var/active = 0 var/active_force var/active_throwforce @@ -1015,7 +1015,7 @@ sharp = FALSE edge = FALSE -/obj/item/weapon/melee/fluffstuff/proc/activate(mob/living/user) +/obj/item/melee/fluffstuff/proc/activate(mob/living/user) if(active) return active = 1 @@ -1027,7 +1027,7 @@ w_class = active_w_class playsound(src, 'sound/weapons/sparkle.ogg', 50, 1) -/obj/item/weapon/melee/fluffstuff/proc/deactivate(mob/living/user) +/obj/item/melee/fluffstuff/proc/deactivate(mob/living/user) if(!active) return playsound(src, 'sound/weapons/sparkle.ogg', 50, 1) @@ -1039,7 +1039,7 @@ edge = initial(edge) w_class = initial(w_class) -/obj/item/weapon/melee/fluffstuff/attack_self(mob/living/user as mob) +/obj/item/melee/fluffstuff/attack_self(mob/living/user as mob) if (active) if ((CLUMSY in user.mutations) && prob(50)) user.visible_message("\The [user] accidentally cuts \himself with \the [src].",\ @@ -1057,7 +1057,7 @@ add_fingerprint(user) return -/obj/item/weapon/melee/fluffstuff/wolfgirlsword +/obj/item/melee/fluffstuff/wolfgirlsword name = "Wolfgirl Sword Replica" desc = "A replica of a large, scimitar-like sword with a dull edge. Ceremonial... until it isn't." icon = 'icons/obj/weapons_vr.dmi' @@ -1074,15 +1074,15 @@ origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1) item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi', slot_back_str = 'icons/vore/custom_items_vr.dmi', slot_wear_suit_str = 'icons/vore/custom_items_vr.dmi') var/active_state = "wolfgirlsword" - allowed = list(/obj/item/weapon/shield/fluff/wolfgirlshield) + allowed = list(/obj/item/shield/fluff/wolfgirlshield) damtype = HALLOSS -/obj/item/weapon/melee/fluffstuff/wolfgirlsword/dropped(var/mob/user) +/obj/item/melee/fluffstuff/wolfgirlsword/dropped(var/mob/user) ..() if(!istype(loc,/mob)) deactivate(user) -/obj/item/weapon/melee/fluffstuff/wolfgirlsword/activate(mob/living/user) +/obj/item/melee/fluffstuff/wolfgirlsword/activate(mob/living/user) if(!active) to_chat(user, "The [src] is now sharpened. It will cut!") @@ -1094,7 +1094,7 @@ damtype = BRUTE -/obj/item/weapon/melee/fluffstuff/wolfgirlsword/deactivate(mob/living/user) +/obj/item/melee/fluffstuff/wolfgirlsword/deactivate(mob/living/user) if(active) to_chat(user, "The [src] grows dull!") ..() @@ -1102,7 +1102,7 @@ icon_state = initial(icon_state) //SilencedMP5A5 - Serdykov Antoz -/obj/item/device/modkit_conversion/hasd +/obj/item/modkit_conversion/hasd name = "HASD EVA modification kit" desc = "A kit containing all the needed tools and parts to modify a suit and helmet into something a HASD unit can use for EVA operations." icon = 'icons/vore/custom_items_vr.dmi' @@ -1124,17 +1124,17 @@ var/chassis_desc = "A self recharging, ranged mining tool that does increased damage in low temperature. Capable of holding up to six slots worth of mod kits. It seems to have been painted an ugly green, and has a small image of a bird scratched crudely into the stock." var/chassis_icon_file = 'icons/vore/custom_guns_vr.dmi' -/obj/item/borg/upgrade/modkit/chassis_mod/kai/install(obj/item/weapon/gun/energy/kinetic_accelerator/KA, mob/user) +/obj/item/borg/upgrade/modkit/chassis_mod/kai/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user) KA.desc = chassis_desc KA.icon = chassis_icon_file ..() -/obj/item/borg/upgrade/modkit/chassis_mod/kai/uninstall(obj/item/weapon/gun/energy/kinetic_accelerator/KA) +/obj/item/borg/upgrade/modkit/chassis_mod/kai/uninstall(obj/item/gun/energy/kinetic_accelerator/KA) KA.desc = initial(KA.desc) KA.icon = initial(KA.icon) ..() //ArgobargSoup:Lynn Shady -/obj/item/device/flashlight/pen/fluff/lynn +/obj/item/flashlight/pen/fluff/lynn name = "Lynn's penlight" desc = "A personalized penlight, a bit bulkier than the standard model. Blue, with a medical cross on it, and the name Lynn Shady engraved in gold." @@ -1147,18 +1147,18 @@ desc = "A bronze medal which represents significant contributions to the field of science or engineering, this one has Ashley Kifer engraved on it." //lm40 - Kenzie Houser -/obj/item/weapon/reagent_containers/hypospray/vial/kenzie +/obj/item/reagent_containers/hypospray/vial/kenzie name = "gold-trimmed hypospray" desc = "A gold-trimmed MKII hypospray. The name 'Kenzie Houser' is engraved on the side." icon = 'icons/vore/custom_items_vr.dmi' icon_state = "kenziehypo" //Semaun - Viktor Solothurn -/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor +/obj/item/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor name = "flask of expensive alcohol" desc = "A standard vacuum-flask filled with good and expensive drink." -/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor/Initialize() +/obj/item/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor/Initialize() . = ..() reagents.add_reagent("pwine", 60) @@ -1182,7 +1182,7 @@ return 1 //Ryumi - Nikki Yumeno -/obj/item/weapon/rig/nikki +/obj/item/rig/nikki name = "weird necklace" desc = "A necklace with a brilliantly blue crystal encased in protective glass." icon = 'icons/vore/custom_clothes_vr.dmi' @@ -1206,20 +1206,20 @@ boot_type = null allowed = list( - /obj/item/device/flashlight, - /obj/item/weapon/tank, - /obj/item/device/suit_cooling_unit, - /obj/item/weapon/storage, + /obj/item/flashlight, + /obj/item/tank, + /obj/item/suit_cooling_unit, + /obj/item/storage, ) -/obj/item/weapon/rig/nikki/attackby(obj/item/W, mob/living/user) +/obj/item/rig/nikki/attackby(obj/item/W, mob/living/user) //This thing accepts ONLY mounted sizeguns. That's IT. Nothing else! if(open && istype(W,/obj/item/rig_module) && !istype(W,/obj/item/rig_module/mounted/sizegun)) to_chat(user, "\The [src] only accepts mounted size gun modules.") return ..() -/obj/item/weapon/rig/nikki/mob_can_equip(var/mob/living/carbon/human/M, slot, disable_warning = 0) // Feel free to (try to) put Nikki's hat on! The necklace though is a flat-out no-go. +/obj/item/rig/nikki/mob_can_equip(var/mob/living/carbon/human/M, slot, disable_warning = 0) // Feel free to (try to) put Nikki's hat on! The necklace though is a flat-out no-go. if(..()) if (M.ckey == "ryumi") return 1 @@ -1263,7 +1263,7 @@ icon_state_closed = "shadowlaptop-closed" //Rboys2 - Clara Mali -/obj/item/weapon/reagent_containers/food/drinks/glass2/fluff/claraflask +/obj/item/reagent_containers/food/drinks/glass2/fluff/claraflask name = "Clara's Vacuum Flask" desc = "A rose gold vacuum flask." base_name = "Clara's Vacuum Flask" @@ -1273,18 +1273,18 @@ filling_states = list(15, 30, 50, 60, 80, 100) volume = 60 -/obj/item/weapon/reagent_containers/food/drinks/glass2/fluff/claraflask/Initialize() +/obj/item/reagent_containers/food/drinks/glass2/fluff/claraflask/Initialize() . = ..() reagents.add_reagent("tea", 40) reagents.add_reagent("milk", 20) -/obj/item/weapon/reagent_containers/food/drinks/glass2/fluff/claraflask/update_icon() +/obj/item/reagent_containers/food/drinks/glass2/fluff/claraflask/update_icon() ..() name = initial(name) desc = initial(desc) //Vitoras: Verie -/obj/item/weapon/fluff/verie +/obj/item/fluff/verie name = "glowy hairbrush" desc = "A pulse of light periodically zips across the top of this blue brush. This... is not an ordinary hair care tool. \ A small inscription can be seen in one side of the brush: \"THIS DEVICE IS ONLY COMPATIBLE WITH MODEL RI \ @@ -1295,7 +1295,7 @@ var/owner = "vitoras" -/obj/item/weapon/fluff/verie/attack_self(mob/living/carbon/human/user) +/obj/item/fluff/verie/attack_self(mob/living/carbon/human/user) if (istype(user)) // It's only made for Verie's chassis silly! if (user.ckey != owner) @@ -1328,33 +1328,33 @@ to_chat(user, "\The [src] isn't compatible with your body as it is now.") // Astra - // Astra -/obj/item/weapon/material/knife/ritual/fluff/astra +/obj/item/material/knife/ritual/fluff/astra name = "Polished Ritual Knife" desc = "A well kept strange ritual knife, There is a small tag with the name 'Astra Ether' on it. They are probably looking for this." icon = 'icons/obj/wizard.dmi' icon_state = "render" //AlFalah - Charlotte Graves -/obj/item/weapon/storage/fancy/fluff/charlotte +/obj/item/storage/fancy/fluff/charlotte name = "inconspicuous cigarette case" desc = "A SkyTron 3000 cigarette case with no additional functions. The buttons and CRT monitor are completely for show and have no functions. Seriously. " icon_state = "charlotte" icon = 'icons/vore/custom_items_vr.dmi' storage_slots = 7 - can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/weapon/flame/lighter, /obj/item/trash/cigbutt) + can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/flame/lighter, /obj/item/trash/cigbutt) icon_type = "charlotte" //brand = "\improper Professional 120" w_class = ITEMSIZE_TINY starts_with = list(/obj/item/clothing/mask/smokable/cigarette = 7) -/obj/item/weapon/storage/fancy/fluff/charlotte/New() +/obj/item/storage/fancy/fluff/charlotte/New() if(!open_state) open_state = "[initial(icon_state)]0" if(!closed_state) closed_state = "[initial(icon_state)]" ..() -/obj/item/weapon/storage/fancy/fluff/charlotte/update_icon() +/obj/item/storage/fancy/fluff/charlotte/update_icon() cut_overlays() if(open) icon_state = open_state @@ -1363,20 +1363,20 @@ else icon_state = closed_state -/obj/item/weapon/storage/fancy/fluff/charlotte/open(mob/user as mob) +/obj/item/storage/fancy/fluff/charlotte/open(mob/user as mob) if(open) return open = TRUE update_icon() ..() -/obj/item/weapon/storage/fancy/fluff/charlotte/close(mob/user as mob) +/obj/item/storage/fancy/fluff/charlotte/close(mob/user as mob) open = FALSE update_icon() ..() //Ashling - Antoinette deKaultieste -/obj/item/weapon/material/knife/machete/hatchet/unathiknife/fluff/antoinette +/obj/item/material/knife/machete/hatchet/unathiknife/fluff/antoinette name = "sawtooth ritual knife" desc = "A mostly decorative knife made from thin ceramic and toothed with large black fangs. Printed on the flat is an eight-armed cross, like an asterisk with an extra stroke, ringed by a calligraphy-style crescent." attack_verb = list("mauled", "bit", "sawed", "butchered") @@ -1391,7 +1391,7 @@ icon_state = "unathiharness1" slots = 2 -/obj/item/weapon/reagent_containers/glass/bottle/poppy +/obj/item/reagent_containers/glass/bottle/poppy name = "poppy flour bottle" desc = "A small bottle of finely ground poppyseed and mixed dried berries." icon = 'icons/obj/chemical.dmi' @@ -1401,15 +1401,15 @@ /obj/item/clothing/accessory/storage/ritualharness/fluff/antoinette/Initialize() . = ..() hold.max_storage_space = ITEMSIZE_COST_SMALL * 2 - hold.can_hold = list(/obj/item/weapon/material/knife, /obj/item/weapon/reagent_containers/glass/bottle) + hold.can_hold = list(/obj/item/material/knife, /obj/item/reagent_containers/glass/bottle) - new /obj/item/weapon/material/knife/machete/hatchet/unathiknife/fluff/antoinette(hold) - new /obj/item/weapon/reagent_containers/glass/bottle/poppy(hold) + new /obj/item/material/knife/machete/hatchet/unathiknife/fluff/antoinette(hold) + new /obj/item/reagent_containers/glass/bottle/poppy(hold) //Hunterbirk - Amaryll //This is a 'technical item' which basically is meant to represent rippiing things up with bare claws. -/obj/item/weapon/surgical/scalpel/amaryll_claws +/obj/item/surgical/scalpel/amaryll_claws name = "Amaryll's Claws" desc = "This doesn't quite look like what it really is." icon = 'icons/vore/custom_items_vr.dmi' @@ -1420,18 +1420,18 @@ matter = null //Coolcrow420 - Jade Davis -/obj/item/weapon/stamp/fluff/jade_horror +/obj/item/stamp/fluff/jade_horror name = "Council of Mid Horror rubber stamp" icon = 'icons/vore/custom_items_vr.dmi' icon_state = "stamp-midhorror" stamptext = "This paper has been certified by The Council of Mid Horror" //Coolcrow420 - M41l -/obj/item/weapon/implant/language/fluff/m41l +/obj/item/implant/language/fluff/m41l name = "dusty hard drive" desc = "A hard drive containing knowledge of various languages." -/obj/item/weapon/implant/language/fluff/m41l/post_implant(mob/M) +/obj/item/implant/language/fluff/m41l/post_implant(mob/M) to_chat(M,"LANGUAGES - LOADING") M.add_language(LANGUAGE_SKRELLIAN) M.add_language(LANGUAGE_UNATHI) @@ -1462,7 +1462,7 @@ //RevolverEloise - Revolver Eloise -/obj/item/weapon/sword/fluff/revolver +/obj/item/sword/fluff/revolver name = "Catnip" desc = "A steel claymore with what appears to be a teppi engraved into the hilt and a finely forged metal cuboid for a pommel. The blade is honed and balanced to an unusually high degree and has clearly been meticulously cared for." icon = 'icons/vore/custom_items_vr.dmi' @@ -1501,12 +1501,12 @@ /obj/item/modular_computer/tablet/preset/custom_loadout/nettie/install_default_hardware() ..() - processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src) - tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/(src) - network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(src) - nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) - battery_module = new/obj/item/weapon/computer_hardware/battery_module(src) + processor_unit = new/obj/item/computer_hardware/processor_unit/small(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive/(src) + network_card = new/obj/item/computer_hardware/network_card/advanced(src) + nano_printer = new/obj/item/computer_hardware/nano_printer(src) + battery_module = new/obj/item/computer_hardware/battery_module(src) battery_module.charge_to_full() @@ -1559,16 +1559,16 @@ //Yeehawguvnah - Cephyra -/obj/item/weapon/dice/loaded/ceph +/obj/item/dice/loaded/ceph name = "engraved d6" desc = "A die with six sides. It's fairly well-made, made of an unclear black material with silver pips. If you were to touch it, your hands tingle slightly as though from static. On closer inspection, it's finely engraved with curving, fractal patterns." icon_state = "ceph_d66" -/obj/item/weapon/dice/loaded/ceph/rollDice(mob/user, silent) +/obj/item/dice/loaded/ceph/rollDice(mob/user, silent) ..() icon_state = "ceph_d6[result]" -/obj/item/weapon/dice/loaded/ceph/New() +/obj/item/dice/loaded/ceph/New() icon_state = "ceph_d6[rand(1,sides)]" diff --git a/code/modules/vore/mouseray.dm b/code/modules/vore/mouseray.dm index b2d932f23cc..e2822094e9c 100644 --- a/code/modules/vore/mouseray.dm +++ b/code/modules/vore/mouseray.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/energy/mouseray +/obj/item/gun/energy/mouseray name = "mouse ray" desc = "A mysterious looking ray gun..." icon = 'icons/obj/mouseray.dmi' @@ -22,30 +22,30 @@ "dust jumper" = /mob/living/simple_mob/vore/alienanimals/dustjumper ) -/obj/item/weapon/gun/energy/mouseray/attack_self(mob/user) +/obj/item/gun/energy/mouseray/attack_self(mob/user) . = ..() if(tf_allow_select) pick_type() -/obj/item/weapon/gun/energy/mouseray/proc/pick_type() +/obj/item/gun/energy/mouseray/proc/pick_type() var/choice = tgui_input_list(usr, "Select a type to turn things into.", "[src.name]", tf_possible_types) if(!choice) return tf_type = tf_possible_types[choice] to_chat(usr, "You selected [choice].") -/obj/item/weapon/gun/energy/mouseray/Fire(atom/target, mob/living/user, clickparams, pointblank, reflex) +/obj/item/gun/energy/mouseray/Fire(atom/target, mob/living/user, clickparams, pointblank, reflex) if(world.time < cooldown) to_chat(usr, "\The [src] isn't ready yet.") return . = ..() -/obj/item/weapon/gun/energy/mouseray/Fire_userless(atom/target) +/obj/item/gun/energy/mouseray/Fire_userless(atom/target) if(world.time < cooldown) return . = ..() -/obj/item/weapon/gun/energy/mouseray/consume_next_projectile() +/obj/item/gun/energy/mouseray/consume_next_projectile() . = ..() var/obj/item/projectile/beam/mouselaser/G = . cooldown = world.time + cooldown_time @@ -54,7 +54,7 @@ if(tf_admin_pref_override) G.tf_admin_pref_override = tf_admin_pref_override -/obj/item/weapon/gun/energy/mouseray/update_icon() +/obj/item/gun/energy/mouseray/update_icon() if(charge_meter) var/ratio = power_supply.charge / power_supply.maxcharge @@ -110,7 +110,7 @@ ourmob.Life(1) if(ishuman(M)) for(var/obj/item/W in M) - if(istype(W, /obj/item/weapon/implant/backup) || istype(W, /obj/item/device/nif)) + if(istype(W, /obj/item/implant/backup) || istype(W, /obj/item/nif)) continue M.drop_from_inventory(W) @@ -199,7 +199,7 @@ if(ishuman(src)) for(var/obj/item/W in src) - if(istype(W, /obj/item/weapon/implant/backup) || istype(W, /obj/item/device/nif)) + if(istype(W, /obj/item/implant/backup) || istype(W, /obj/item/nif)) continue src.drop_from_inventory(W) @@ -255,7 +255,7 @@ /////SUBTYPES///// -/obj/item/weapon/gun/energy/mouseray/medical //This just changes people back, it can't TF people into anything without shenanigans +/obj/item/gun/energy/mouseray/medical //This just changes people back, it can't TF people into anything without shenanigans name = "recombobulation ray" desc = "The Type Gamma Medical Recombobulation ray! A mysterious looking ray gun! It works to change people who have had their form significantly altered back into their original forms!" @@ -266,7 +266,7 @@ tf_type = null projectile_type = /obj/item/projectile/beam/mouselaser/reversion -/obj/item/weapon/gun/energy/mouseray/medical/consume_next_projectile() +/obj/item/gun/energy/mouseray/medical/consume_next_projectile() . = ..() var/obj/item/projectile/beam/mouselaser/reversion/G = . cooldown = world.time + cooldown_time @@ -325,7 +325,7 @@ if(ishuman(M)) for(var/obj/item/W in M) - if(istype(W, /obj/item/weapon/implant/backup) || istype(W, /obj/item/device/nif)) + if(istype(W, /obj/item/implant/backup) || istype(W, /obj/item/nif)) continue M.drop_from_inventory(W) @@ -335,7 +335,7 @@ else firer.visible_message("\The [shot_from] buzzes impolitely.") -/obj/item/weapon/gun/energy/mouseray/admin //NEVER GIVE THIS TO ANYONE +/obj/item/gun/energy/mouseray/admin //NEVER GIVE THIS TO ANYONE name = "experimental metamorphosis ray" cooldown_time = 5 SECONDS tf_allow_select = TRUE @@ -343,7 +343,7 @@ charge_cost = 0 icon_state = "adminray" -/obj/item/weapon/gun/energy/mouseray/metamorphosis +/obj/item/gun/energy/mouseray/metamorphosis name = "metamorphosis ray" tf_allow_select = TRUE tf_possible_types = list( @@ -368,7 +368,7 @@ "sheep" = /mob/living/simple_mob/vore/sheep ) -/obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced +/obj/item/gun/energy/mouseray/metamorphosis/advanced name = "advanced metamorphosis ray" tf_possible_types = list( "mouse" = /mob/living/simple_mob/animal/passive/mouse, @@ -422,11 +422,11 @@ "leopardmander" = /mob/living/simple_mob/vore/leopardmander ) -/obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced/random +/obj/item/gun/energy/mouseray/metamorphosis/advanced/random name = "unstable metamorphosis ray" tf_allow_select = FALSE -/obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced/random/Fire(atom/target, mob/living/user, clickparams, pointblank, reflex) +/obj/item/gun/energy/mouseray/metamorphosis/advanced/random/Fire(atom/target, mob/living/user, clickparams, pointblank, reflex) if(world.time < cooldown) to_chat(usr, "\The [src] isn't ready yet.") return @@ -434,63 +434,63 @@ tf_type = tf_possible_types[choice] . = ..() -/obj/item/weapon/gun/energy/mouseray/woof +/obj/item/gun/energy/mouseray/woof name = "woof ray" tf_type = /mob/living/simple_mob/vore/woof -/obj/item/weapon/gun/energy/mouseray/corgi +/obj/item/gun/energy/mouseray/corgi name = "corgi ray" tf_type = /mob/living/simple_mob/animal/passive/dog/corgi -/obj/item/weapon/gun/energy/mouseray/cat +/obj/item/gun/energy/mouseray/cat name = "cat ray" tf_type = /mob/living/simple_mob/animal/passive/cat -/obj/item/weapon/gun/energy/mouseray/chicken +/obj/item/gun/energy/mouseray/chicken name = "chicken ray" tf_type = /mob/living/simple_mob/animal/passive/chicken -/obj/item/weapon/gun/energy/mouseray/lizard +/obj/item/gun/energy/mouseray/lizard name = "lizard ray" tf_type = /mob/living/simple_mob/animal/passive/lizard -/obj/item/weapon/gun/energy/mouseray/rabbit +/obj/item/gun/energy/mouseray/rabbit name = "rabbit ray" tf_type = /mob/living/simple_mob/vore/rabbit -/obj/item/weapon/gun/energy/mouseray/fennec +/obj/item/gun/energy/mouseray/fennec name = "fennec ray" tf_type = /mob/living/simple_mob/animal/passive/fennec -/obj/item/weapon/gun/energy/mouseray/monkey +/obj/item/gun/energy/mouseray/monkey name = "monkey ray" tf_type = /mob/living/carbon/human/monkey -/obj/item/weapon/gun/energy/mouseray/wolpin +/obj/item/gun/energy/mouseray/wolpin name = "wolpin ray" tf_type = /mob/living/carbon/human/wolpin -/obj/item/weapon/gun/energy/mouseray/otie +/obj/item/gun/energy/mouseray/otie name = "otie ray" tf_type = /mob/living/simple_mob/vore/otie -/obj/item/weapon/gun/energy/mouseray/direwolf +/obj/item/gun/energy/mouseray/direwolf name = "dire wolf ray" tf_type = /mob/living/simple_mob/vore/wolf/direwolf -/obj/item/weapon/gun/energy/mouseray/giantrat +/obj/item/gun/energy/mouseray/giantrat name = "giant rat ray" tf_type = /mob/living/simple_mob/vore/aggressive/rat -/obj/item/weapon/gun/energy/mouseray/redpanda +/obj/item/gun/energy/mouseray/redpanda name = "red panda ray" tf_type = /mob/living/simple_mob/vore/redpanda -/obj/item/weapon/gun/energy/mouseray/catslug +/obj/item/gun/energy/mouseray/catslug name = "catslug ray" tf_type = /mob/living/simple_mob/vore/alienanimals/catslug -/obj/item/weapon/gun/energy/mouseray/teppi +/obj/item/gun/energy/mouseray/teppi name = "teppi ray" tf_type = /mob/living/simple_mob/vore/alienanimals/teppi @@ -504,21 +504,21 @@ spawn_nothing_percentage = 0 /obj/random/mouseray/item_to_spawn() - return pick(prob(300);/obj/item/weapon/gun/energy/mouseray, - prob(50);/obj/item/weapon/gun/energy/mouseray/corgi, - prob(50);/obj/item/weapon/gun/energy/mouseray/woof, - prob(50);/obj/item/weapon/gun/energy/mouseray/cat, - prob(50);/obj/item/weapon/gun/energy/mouseray/chicken, - prob(50);/obj/item/weapon/gun/energy/mouseray/lizard, - prob(50);/obj/item/weapon/gun/energy/mouseray/rabbit, - prob(50);/obj/item/weapon/gun/energy/mouseray/fennec, - prob(5);/obj/item/weapon/gun/energy/mouseray/monkey, - prob(5);/obj/item/weapon/gun/energy/mouseray/wolpin, - prob(5);/obj/item/weapon/gun/energy/mouseray/otie, - prob(5);/obj/item/weapon/gun/energy/mouseray/direwolf, - prob(5);/obj/item/weapon/gun/energy/mouseray/giantrat, - prob(50);/obj/item/weapon/gun/energy/mouseray/redpanda, - prob(5);/obj/item/weapon/gun/energy/mouseray/catslug, - prob(1);/obj/item/weapon/gun/energy/mouseray/metamorphosis, - prob(1);/obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced/random + return pick(prob(300);/obj/item/gun/energy/mouseray, + prob(50);/obj/item/gun/energy/mouseray/corgi, + prob(50);/obj/item/gun/energy/mouseray/woof, + prob(50);/obj/item/gun/energy/mouseray/cat, + prob(50);/obj/item/gun/energy/mouseray/chicken, + prob(50);/obj/item/gun/energy/mouseray/lizard, + prob(50);/obj/item/gun/energy/mouseray/rabbit, + prob(50);/obj/item/gun/energy/mouseray/fennec, + prob(5);/obj/item/gun/energy/mouseray/monkey, + prob(5);/obj/item/gun/energy/mouseray/wolpin, + prob(5);/obj/item/gun/energy/mouseray/otie, + prob(5);/obj/item/gun/energy/mouseray/direwolf, + prob(5);/obj/item/gun/energy/mouseray/giantrat, + prob(50);/obj/item/gun/energy/mouseray/redpanda, + prob(5);/obj/item/gun/energy/mouseray/catslug, + prob(1);/obj/item/gun/energy/mouseray/metamorphosis, + prob(1);/obj/item/gun/energy/mouseray/metamorphosis/advanced/random ) diff --git a/code/modules/vore/persist/persist_vr.dm b/code/modules/vore/persist/persist_vr.dm index 09f5b05b6a8..9bb2771e557 100644 --- a/code/modules/vore/persist/persist_vr.dm +++ b/code/modules/vore/persist/persist_vr.dm @@ -236,7 +236,7 @@ stack_trace("Persist (NIF): Given a nonhuman: [H]") return - var/obj/item/device/nif/nif = H.nif + var/obj/item/nif/nif = H.nif if(nif && H.ckey != nif.owner_key) return diff --git a/code/modules/vore/resizing/crackers.dm b/code/modules/vore/resizing/crackers.dm index 2d2e4944784..2eee4266b74 100644 --- a/code/modules/vore/resizing/crackers.dm +++ b/code/modules/vore/resizing/crackers.dm @@ -2,7 +2,7 @@ //The winner of the pull has an effect applied to them. //Crackers do already exist, but these ones are a more memey scene item. -/obj/item/weapon/cracker +/obj/item/cracker name = "bluespace cracker" //I have no idea why this was called shrink ray when this increased and decreased size. desc = "A celebratory little game with a bluespace twist! Pull it between two people until it snaps, and the person who recieves the larger end gets a prize!" icon = 'icons/obj/crackers.dmi' @@ -34,7 +34,7 @@ "What do you call a cow with no legs? Ground Beef.", "Why'd the scarecrow win the Nobel prize? He was outstanding in his field.") -/obj/item/weapon/cracker/attack(atom/A, mob/living/user, adjacent, params) +/obj/item/cracker/attack(atom/A, mob/living/user, adjacent, params) var/mob/living/carbon/human/target = A if(!istype(target)) return @@ -119,42 +119,42 @@ user.drop_item(src) new /obj/random/toy(spawnloc) new /obj/item/clothing/head/paper_crown(spawnloc) - var/obj/item/weapon/paper/cracker_joke/J = new(spawnloc) + var/obj/item/paper/cracker_joke/J = new(spawnloc) J.info = joke qdel(src) -/obj/item/weapon/cracker/Initialize() +/obj/item/cracker/Initialize() var/list/styles = list("blue","green","yellow","red","heart","hazard") var/style = pick(styles) icon_state = style item_state = style ..() -/obj/item/weapon/cracker/shrinking +/obj/item/cracker/shrinking name = "shrinking bluespace cracker" prizes = list("shrinking") -/obj/item/weapon/cracker/growing +/obj/item/cracker/growing name = "growing bluespace cracker" prizes = list("growing") -/obj/item/weapon/cracker/invisibility +/obj/item/cracker/invisibility name = "cloaking bluespace cracker" prizes = list("invisibility") -/obj/item/weapon/cracker/drugged +/obj/item/cracker/drugged name = "psychedelic bluespace cracker" prizes = list("drugged") -/obj/item/weapon/cracker/knockover +/obj/item/cracker/knockover name = "forceful bluespace cracker" prizes = list("knocked over") -/obj/item/weapon/cracker/vore +/obj/item/cracker/vore name = "teleporting bluespace cracker" prizes = list("teleport") -/obj/item/weapon/cracker/money +/obj/item/cracker/money name = "fortuitous bluespace cracker" prizes = list("wealth") @@ -175,9 +175,9 @@ item_state = style ..() -/obj/item/weapon/paper/cracker_joke +/obj/item/paper/cracker_joke name = "joke" icon_state = "joke" -/obj/item/weapon/paper/cracker_joke/update_icon() +/obj/item/paper/cracker_joke/update_icon() return diff --git a/code/modules/vore/resizing/holder_micro_vr.dm b/code/modules/vore/resizing/holder_micro_vr.dm index b75d9cd2edf..fe3b799963e 100644 --- a/code/modules/vore/resizing/holder_micro_vr.dm +++ b/code/modules/vore/resizing/holder_micro_vr.dm @@ -1,6 +1,6 @@ -// Micro Holders - Extends /obj/item/weapon/holder +// Micro Holders - Extends /obj/item/holder -/obj/item/weapon/holder/micro +/obj/item/holder/micro name = "micro" desc = "Another crewmember, small enough to fit in your hand." icon_state = "micro" @@ -10,12 +10,12 @@ item_icons = null // No in-hand sprites (for now, anyway, we could totally add some) pixel_y = 0 // Override value from parent. -/obj/item/weapon/holder/examine(mob/user) +/obj/item/holder/examine(mob/user) . = list() for(var/mob/living/M in contents) . += M.examine(user) -/obj/item/weapon/holder/MouseDrop(mob/M) +/obj/item/holder/MouseDrop(mob/M) ..() if(M != usr) return if(usr == src) return @@ -24,7 +24,7 @@ for(var/mob/living/carbon/human/O in contents) O.show_inventory_panel(usr, state = GLOB.tgui_deep_inventory_state) -/obj/item/weapon/holder/micro/attack_self(mob/living/carbon/user) //reworked so it works w/ nonhumans +/obj/item/holder/micro/attack_self(mob/living/carbon/user) //reworked so it works w/ nonhumans user.setClickCooldown(user.get_attack_speed()) for(var/L in contents) if(ishuman(L)) @@ -35,18 +35,18 @@ user.visible_message("[user] [S.response_help] \the [S].") //Egg features. -/obj/item/weapon/holder/attack_hand(mob/living/user as mob) - if(istype(src.loc, /obj/item/weapon/storage/vore_egg)) //Don't scoop up the egged mob +/obj/item/holder/attack_hand(mob/living/user as mob) + if(istype(src.loc, /obj/item/storage/vore_egg)) //Don't scoop up the egged mob src.pickup(user) user.drop_from_inventory(src) return ..() -/obj/item/weapon/holder/container_resist(mob/living/held) - if(!istype(src.loc, /obj/item/weapon/storage/vore_egg)) +/obj/item/holder/container_resist(mob/living/held) + if(!istype(src.loc, /obj/item/storage/vore_egg)) ..() else - var/obj/item/weapon/storage/vore_egg/E = src.loc + var/obj/item/storage/vore_egg/E = src.loc if(isbelly(E.loc)) var/obj/belly/B = E.loc B.relay_resist(held, E) diff --git a/code/modules/vore/resizing/holder_vr.dm b/code/modules/vore/resizing/holder_vr.dm index 2d79d5eda93..96a286964d3 100644 --- a/code/modules/vore/resizing/holder_vr.dm +++ b/code/modules/vore/resizing/holder_vr.dm @@ -1,10 +1,10 @@ -/obj/item/weapon/holder/dropped(mob/user) +/obj/item/holder/dropped(mob/user) if (held_mob?.loc != src || isturf(loc)) var/held = held_mob dump_mob() held_mob = held -/obj/item/weapon/holder/attack_hand(mob/living/user as mob) //straight up just copypasted from objects/items.dm with a few things changed (doesn't called dropped unless +actually dropped+) +/obj/item/holder/attack_hand(mob/living/user as mob) //straight up just copypasted from objects/items.dm with a few things changed (doesn't called dropped unless +actually dropped+) if (!user) return if(anchored) to_chat(user, span("notice", "\The [src] won't budge, you can't pick it up!")) @@ -23,8 +23,8 @@ if(held_mob == user) return // No picking your own micro self up var/old_loc = src.loc - if (istype(src.loc, /obj/item/weapon/storage)) - var/obj/item/weapon/storage/S = src.loc + if (istype(src.loc, /obj/item/storage)) + var/obj/item/storage/S = src.loc if(!S.remove_from_storage(src)) return diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index b0e52cee520..ce168605176 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -12,7 +12,7 @@ // Define holder_type on types we want to be scoop-able /mob/living/carbon/human - holder_type = /obj/item/weapon/holder/micro + holder_type = /obj/item/holder/micro // The reverse lookup of player_sizes_list, number to name. /proc/player_size_name(var/size_multiplier) @@ -192,8 +192,8 @@ if(buckled) to_chat(usr,"You have to unbuckle \the [src] before you pick them up.") return 0 - holder_type = /obj/item/weapon/holder/micro - var/obj/item/weapon/holder/m_holder = get_scooped(M, G) + holder_type = /obj/item/holder/micro + var/obj/item/holder/m_holder = get_scooped(M, G) holder_type = holder_default if (m_holder) return 1 diff --git a/code/modules/vore/resizing/sizegun_slow_vr.dm b/code/modules/vore/resizing/sizegun_slow_vr.dm index 9a993e7a872..5fa4beda973 100644 --- a/code/modules/vore/resizing/sizegun_slow_vr.dm +++ b/code/modules/vore/resizing/sizegun_slow_vr.dm @@ -1,7 +1,7 @@ #define SIZE_SHRINK 0 #define SIZE_GROW 1 -/obj/item/device/slow_sizegun +/obj/item/slow_sizegun name = "gradual size gun" desc = "A highly advanced ray gun, designed for progressive and gradual changing of size. Size trading can be toggled on via alt-clicking." icon = 'icons/obj/gun_vr.dmi' @@ -19,13 +19,13 @@ var/current_target var/trading = 0 -/obj/item/device/slow_sizegun/update_icon() +/obj/item/slow_sizegun/update_icon() icon_state = "[base_icon_state]-[sizeshift_mode]" if(busy) icon_state = "[icon_state]-active" -/obj/item/device/slow_sizegun/proc/should_stop(var/mob/living/target, var/mob/living/user, var/active_hand) +/obj/item/slow_sizegun/proc/should_stop(var/mob/living/target, var/mob/living/user, var/active_hand) if(!target || !user || !active_hand || !istype(target) || !istype(user) || !busy) return TRUE @@ -80,7 +80,7 @@ return FALSE -/obj/item/device/slow_sizegun/afterattack(atom/target, mob/user, proximity_flag) +/obj/item/slow_sizegun/afterattack(atom/target, mob/user, proximity_flag) // Things that invalidate the scan immediately. if(isturf(target)) for(var/atom/A as anything in target) // If we can't scan the turf, see if we can scan anything on it, to help with aiming. @@ -169,7 +169,7 @@ if(user.client) // If for some reason they logged out mid-scan the box will be gone anyways. delete_box(box_segments, user.client) -/obj/item/device/slow_sizegun/attack_self(mob/living/user) +/obj/item/slow_sizegun/attack_self(mob/living/user) if(busy) busy = !busy else @@ -186,7 +186,7 @@ // Draws a box showing the limits of movement while scanning something. // Only the client supplied will see the box. -/obj/item/device/slow_sizegun/proc/draw_box(atom/A, box_size, client/C) +/obj/item/slow_sizegun/proc/draw_box(atom/A, box_size, client/C) . = list() // Things moved with pixel_[x|y] will move the box, so this is to correct that. var/pixel_x_correction = -A.pixel_x @@ -231,7 +231,7 @@ #undef ICON_SIZE // Draws an individual segment of the box. -/obj/item/device/slow_sizegun/proc/draw_line(atom/A, line_dir, line_pixel_x, line_pixel_y, client/C) +/obj/item/slow_sizegun/proc/draw_line(atom/A, line_dir, line_pixel_x, line_pixel_y, client/C) var/image/line = image(icon = 'icons/effects/effects.dmi', loc = A, icon_state = "stripes", dir = line_dir) line.pixel_x = line_pixel_x line.pixel_y = line_pixel_y @@ -242,18 +242,18 @@ return line // Removes the box that was generated before from the client. -/obj/item/device/slow_sizegun/proc/delete_box(list/box_segments, client/C) +/obj/item/slow_sizegun/proc/delete_box(list/box_segments, client/C) for(var/i in box_segments) C.images -= i qdel(i) -/obj/item/device/slow_sizegun/proc/color_box(list/box_segments, new_color, new_time) +/obj/item/slow_sizegun/proc/color_box(list/box_segments, new_color, new_time) for(var/i in box_segments) animate(i, color = new_color, time = new_time) //Alt click to activate size trading -/obj/item/device/slow_sizegun/AltClick(mob/user) +/obj/item/slow_sizegun/AltClick(mob/user) if (trading == 0) trading = 1 to_chat(user, span("notice", "\The [src] will now trade your targets size for your own.")) diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index 2bbd6010354..d1f2b4715fd 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/code/modules/vore/resizing/sizegun_vr.dm @@ -1,7 +1,7 @@ // // Size Gun // -/obj/item/weapon/gun/energy/sizegun +/obj/item/gun/energy/sizegun name = "size gun" //I have no idea why this was called shrink ray when this increased and decreased size. desc = "A highly advanced ray gun with a knob on the side to adjust the size you desire. Warning: Do not insert into mouth." icon = 'icons/obj/gun_vr.dmi' @@ -24,16 +24,16 @@ fire_sound = 'sound/weapons/pulse3.ogg' )) -/obj/item/weapon/gun/energy/sizegun/New() +/obj/item/gun/energy/sizegun/New() ..() - verbs += /obj/item/weapon/gun/energy/sizegun/proc/select_size - verbs += /obj/item/weapon/gun/energy/sizegun/proc/spin_dial + verbs += /obj/item/gun/energy/sizegun/proc/select_size + verbs += /obj/item/gun/energy/sizegun/proc/spin_dial -/obj/item/weapon/gun/energy/sizegun/attack_self(mob/user) +/obj/item/gun/energy/sizegun/attack_self(mob/user) . = ..() select_size() -/obj/item/weapon/gun/energy/sizegun/proc/spin_dial() +/obj/item/gun/energy/sizegun/proc/spin_dial() set name = "Spin Size Dial" set category = "Object" set src in view(1) @@ -41,13 +41,13 @@ size_set_to = (rand(25,200)) /100 usr.visible_message("\The [usr] spins the size dial to a random value!","You spin the dial to a random value!") -/obj/item/weapon/gun/energy/sizegun/consume_next_projectile() +/obj/item/gun/energy/sizegun/consume_next_projectile() . = ..() var/obj/item/projectile/beam/sizelaser/G = . if(istype(G)) G.set_size = size_set_to -/obj/item/weapon/gun/energy/sizegun/proc/select_size() +/obj/item/gun/energy/sizegun/proc/select_size() set name = "Select Size" set category = "Object" set src in view(1) @@ -62,7 +62,7 @@ if(size_set_to < RESIZE_MINIMUM || size_set_to > RESIZE_MAXIMUM) to_chat(usr, "Note: Resizing limited to 25-200% automatically while outside dormatory areas.") //hint that we clamp it in resize -/obj/item/weapon/gun/energy/sizegun/update_icon(var/ignore_inhands) +/obj/item/gun/energy/sizegun/update_icon(var/ignore_inhands) var/grow_mode = "shrink" if(size_set_to > 1) grow_mode = "grow" @@ -80,11 +80,11 @@ if(!ignore_inhands) update_held_icon() -/obj/item/weapon/gun/energy/sizegun/examine(mob/user) +/obj/item/gun/energy/sizegun/examine(mob/user) . = ..() . += "It is currently set at [size_set_to*100]%" -/obj/item/weapon/gun/energy/sizegun/admin +/obj/item/gun/energy/sizegun/admin name = "modified size gun" desc = "An older model sizegun, modified to be without limits on minimum/maximum size, and have an unlimited charge. Time to show 'em that size does matter." description_fluff = "A standard size gun that has been modified with \ @@ -113,7 +113,7 @@ have their theories as they continue to analyse the technology." value = CATALOGUER_REWARD_MEDIUM -/obj/item/weapon/gun/energy/sizegun/admin/abductor +/obj/item/gun/energy/sizegun/admin/abductor name = "alien size gun" desc = "A strange looking ray gun weapon with an adjustor knob on the side. The design is alien, but it bares a striking resemblence to the older model size guns that NT uses for research." catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_sizegun) @@ -123,7 +123,7 @@ charge_cost = 0 projectile_type = /obj/item/projectile/beam/sizelaser/admin/alien -/obj/item/weapon/gun/energy/sizegun/admin/select_size() +/obj/item/gun/energy/sizegun/admin/select_size() set name = "Select Size" set category = "Object" set src in view(1) @@ -134,7 +134,7 @@ size_set_to = clamp((size_select/100), 0, 1000) //eheh to_chat(usr, "You set the size to [size_select]%") -/obj/item/weapon/gun/energy/sizegun/afterattack(atom/A, mob/living/user, adjacent, params) +/obj/item/gun/energy/sizegun/afterattack(atom/A, mob/living/user, adjacent, params) if(adjacent) return //A is adjacent, is the user, or is on the user's person if(backfire) @@ -151,7 +151,7 @@ else return ..() -/obj/item/weapon/gun/energy/sizegun/attack(atom/A, mob/living/user, adjacent, params) +/obj/item/gun/energy/sizegun/attack(atom/A, mob/living/user, adjacent, params) if(backfire) if(prob(50)) to_chat(user, "\The [src] backfires and consumes its entire charge!") @@ -167,7 +167,7 @@ return ..() -/obj/item/weapon/gun/energy/sizegun/attackby(var/obj/item/A as obj, mob/user as mob) +/obj/item/gun/energy/sizegun/attackby(var/obj/item/A as obj, mob/user as mob) if(A.has_tool_quality(TOOL_WIRECUTTER)) if(backfire) to_chat(user, "You repair the damage to the \the [src].") @@ -179,11 +179,11 @@ name = "unstable size gun" ..() -/obj/item/weapon/gun/energy/sizegun/backfire +/obj/item/gun/energy/sizegun/backfire name = "unstable size gun" backfire = 1 -/obj/item/weapon/gun/energy/sizegun/mounted +/obj/item/gun/energy/sizegun/mounted name = "mounted size gun" self_recharge = 1 use_external_power = 1 diff --git a/code/modules/vore/smoleworld/smoleworld_vr.dm b/code/modules/vore/smoleworld/smoleworld_vr.dm index 149e4bc6441..ad01c1c1763 100644 --- a/code/modules/vore/smoleworld/smoleworld_vr.dm +++ b/code/modules/vore/smoleworld/smoleworld_vr.dm @@ -86,7 +86,7 @@ w_class = ITEMSIZE_SMALL //smolebrick case to make for easy bricks. -/obj/item/weapon/storage/smolebrickcase +/obj/item/storage/smolebrickcase name = "smolebrick case" desc = "You feel the power of imagination." icon = 'icons/vore/smoleworld_vr.dmi' @@ -255,7 +255,7 @@ return //checks for items and does the same as dismaintle but spawns material instead. -/obj/structure/smolebuilding/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/smolebuilding/attackby(obj/item/W as obj, mob/user as mob) dismantle() return //checks for projectile damage and does the same as dismaintle but spawns material instead. @@ -284,7 +284,7 @@ qdel(src) //Ruins go asplode same as buildings if attacked -/obj/structure/smoleruins/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/smoleruins/attackby(obj/item/W as obj, mob/user as mob) displode() return @@ -401,13 +401,13 @@ name = "asteriod" desc = "Several chunks of sugar crumbs that looks like asteriods." -/obj/item/weapon/bikehorn/tinytether +/obj/item/bikehorn/tinytether icon = 'icons/vore/smoleworld_vr.dmi' icon_state = "tether_trash" name = "tether" desc = "Its a tiny bit of plastic in the shape of the tether. There seems to be a small button on top." -/obj/item/weapon/bikehorn/tinytether/attack_self(mob/user as mob) +/obj/item/bikehorn/tinytether/attack_self(mob/user as mob) if(spam_flag == 0) spam_flag = 1 playsound(src, 'sound/items/tinytether.ogg', 30, 1, volume_channel = VOLUME_CHANNEL_MASTER) @@ -416,7 +416,7 @@ spam_flag = 0 return -/obj/item/weapon/reagent_containers/food/snacks/snackplanet/moon +/obj/item/reagent_containers/food/snacks/snackplanet/moon name = "moon" desc = "A firm solid mass of white powdery sugar in the shape of a moon!" icon = 'icons/vore/smoleworld_vr.dmi' @@ -426,18 +426,18 @@ nutriment_desc = list("sugar" = 2) drop_sound = 'sound/items/drop/basketball.ogg' -/obj/item/weapon/reagent_containers/food/snacks/snackplanet/virgo3b +/obj/item/reagent_containers/food/snacks/snackplanet/virgo3b name = "Virgo 3B" desc = "A sticky jelly jaw breaker in the shape of Virgo-3B, it even has a tiny tether!" icon = 'icons/vore/smoleworld_vr.dmi' icon_state = "sp_Virgo3B" bitesize = 3 - trash = /obj/item/weapon/bikehorn/tinytether + trash = /obj/item/bikehorn/tinytether nutriment_amt = 2 nutriment_desc = list("spicy" = 2, "tang" = 2) drop_sound = 'sound/items/drop/basketball.ogg' -/obj/item/weapon/reagent_containers/food/snacks/snackplanet/phoron +/obj/item/reagent_containers/food/snacks/snackplanet/phoron name = "phoron giant" desc = "A spicy jaw breaker that seems to swirl in the light." icon = 'icons/vore/smoleworld_vr.dmi' @@ -448,7 +448,7 @@ nutriment_desc = list("spicy" = 2) drop_sound = 'sound/items/drop/basketball.ogg' -/obj/item/weapon/reagent_containers/food/snacks/snackplanet/virgoprime +/obj/item/reagent_containers/food/snacks/snackplanet/virgoprime name = "Virgo Prime" desc = "It's a orange jaw breaker in the shape of Virgo Prime!" icon = 'icons/vore/smoleworld_vr.dmi' @@ -459,7 +459,7 @@ nutriment_desc = list("salty" = 2) drop_sound = 'sound/items/drop/basketball.ogg' -/obj/item/weapon/storage/bagoplanets +/obj/item/storage/bagoplanets name = "bag o' planets" desc = "A cosmic bag of fist-sized candy planets." icon = 'icons/vore/smoleworld_vr.dmi' @@ -469,7 +469,7 @@ max_storage_space = ITEMSIZE_COST_SMALL * 7 // most code copied from toolbox drop_sound = 'sound/items/drop/food.ogg' pickup_sound = 'sound/items/pickup/food.ogg' - starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/snackplanet/phoron, - /obj/item/weapon/reagent_containers/food/snacks/snackplanet/virgo3b,/obj/item/weapon/reagent_containers/food/snacks/snackplanet/moon, - /obj/item/weapon/reagent_containers/food/snacks/snackplanet/virgoprime + starts_with = list(/obj/item/reagent_containers/food/snacks/snackplanet/phoron, + /obj/item/reagent_containers/food/snacks/snackplanet/virgo3b,/obj/item/reagent_containers/food/snacks/snackplanet/moon, + /obj/item/reagent_containers/food/snacks/snackplanet/virgoprime ) diff --git a/code/modules/xenoarcheaology/artifacts/crystal.dm b/code/modules/xenoarcheaology/artifacts/crystal.dm index fecf94098d1..67371b91ac3 100644 --- a/code/modules/xenoarcheaology/artifacts/crystal.dm +++ b/code/modules/xenoarcheaology/artifacts/crystal.dm @@ -19,17 +19,17 @@ /obj/structure/crystal/Destroy() src.visible_message(span_red("[src] shatters!")) if(prob(75)) - new /obj/item/weapon/material/shard/phoron(src.loc) + new /obj/item/material/shard/phoron(src.loc) if(prob(50)) - new /obj/item/weapon/material/shard/phoron(src.loc) + new /obj/item/material/shard/phoron(src.loc) if(prob(25)) - new /obj/item/weapon/material/shard/phoron(src.loc) + new /obj/item/material/shard/phoron(src.loc) if(prob(75)) - new /obj/item/weapon/material/shard(src.loc) + new /obj/item/material/shard(src.loc) if(prob(50)) - new /obj/item/weapon/material/shard(src.loc) + new /obj/item/material/shard(src.loc) if(prob(25)) - new /obj/item/weapon/material/shard(src.loc) + new /obj/item/material/shard(src.loc) ..() //todo: laser_act diff --git a/code/modules/xenoarcheaology/artifacts/replicator.dm b/code/modules/xenoarcheaology/artifacts/replicator.dm index 39972aaa5e5..2687497dfa8 100644 --- a/code/modules/xenoarcheaology/artifacts/replicator.dm +++ b/code/modules/xenoarcheaology/artifacts/replicator.dm @@ -29,41 +29,41 @@ /obj/structure/closet/acloset, /mob/living/simple_mob/mechanical/viscerator, /mob/living/simple_mob/mechanical/hivebot, - /obj/item/device/analyzer, - /obj/item/device/camera, - /obj/item/device/flash, - /obj/item/device/flashlight, - /obj/item/device/healthanalyzer, - /obj/item/device/multitool, - /obj/item/device/paicard, - /obj/item/device/radio, - /obj/item/device/radio/headset, - /obj/item/device/radio/beacon, - /obj/item/weapon/autopsy_scanner, - /obj/item/weapon/bikehorn, - /obj/item/weapon/surgical/bonesetter, - /obj/item/weapon/material/knife/butch, + /obj/item/analyzer, + /obj/item/camera, + /obj/item/flash, + /obj/item/flashlight, + /obj/item/healthanalyzer, + /obj/item/multitool, + /obj/item/paicard, + /obj/item/radio, + /obj/item/radio/headset, + /obj/item/radio/beacon, + /obj/item/autopsy_scanner, + /obj/item/bikehorn, + /obj/item/surgical/bonesetter, + /obj/item/material/knife/butch, /obj/item/clothing/suit/caution, /obj/item/clothing/head/cone, - /obj/item/weapon/tool/crowbar, - /obj/item/weapon/clipboard, - /obj/item/weapon/cell, - /obj/item/weapon/surgical/circular_saw, - /obj/item/weapon/material/knife/machete/hatchet, - /obj/item/weapon/handcuffs, - /obj/item/weapon/surgical/hemostat, - /obj/item/weapon/material/knife, - /obj/item/weapon/flame/lighter, - /obj/item/weapon/light/bulb, - /obj/item/weapon/light/tube, - /obj/item/weapon/pickaxe, - /obj/item/weapon/shovel, - /obj/item/weapon/weldingtool, - /obj/item/weapon/tool/wirecutters, - /obj/item/weapon/tool/wrench, - /obj/item/weapon/tool/screwdriver, - /obj/item/weapon/grenade/chem_grenade/cleaner, - /obj/item/weapon/grenade/chem_grenade/metalfoam) + /obj/item/tool/crowbar, + /obj/item/clipboard, + /obj/item/cell, + /obj/item/surgical/circular_saw, + /obj/item/material/knife/machete/hatchet, + /obj/item/handcuffs, + /obj/item/surgical/hemostat, + /obj/item/material/knife, + /obj/item/flame/lighter, + /obj/item/light/bulb, + /obj/item/light/tube, + /obj/item/pickaxe, + /obj/item/shovel, + /obj/item/weldingtool, + /obj/item/tool/wirecutters, + /obj/item/tool/wrench, + /obj/item/tool/screwdriver, + /obj/item/grenade/chem_grenade/cleaner, + /obj/item/grenade/chem_grenade/metalfoam) // /mob/living/simple_mob/mimic/crate, // Vorestation edit //VORESTATION AI TEMPORARY REMOVAL, REPLACE BACK IN LIST WHEN FIXED var/quantity = rand(5, 15) @@ -171,7 +171,7 @@ else visible_message(fail_message) -/obj/machinery/replicator/attackby(obj/item/weapon/W as obj, mob/living/user as mob) +/obj/machinery/replicator/attackby(obj/item/W as obj, mob/living/user as mob) if(!W.canremove || !user.canUnEquip(W)) //No armblades, no grabs. No other-thing-I-didn't-think-of. to_chat(user, "You cannot put \the [W] into the machine.") return diff --git a/code/modules/xenoarcheaology/artifacts/replicator_vr.dm b/code/modules/xenoarcheaology/artifacts/replicator_vr.dm index 9a31b13a75d..b6d1672f3fc 100644 --- a/code/modules/xenoarcheaology/artifacts/replicator_vr.dm +++ b/code/modules/xenoarcheaology/artifacts/replicator_vr.dm @@ -88,8 +88,8 @@ //Did they use an item? If so, we're done here. //Did they put a micro in it? - if(istype(source_material,/obj/item/weapon/holder/micro)) - var/obj/item/weapon/holder/micro/micro_holder = source_material + if(istype(source_material,/obj/item/holder/micro)) + var/obj/item/holder/micro/micro_holder = source_material var/mob/mob_to_be_changed = micro_holder.held_mob var/mob/living/M = mob_to_be_changed //Start of mob code shamelessly ripped from mouseray @@ -205,12 +205,12 @@ last_process_time = world.time -/obj/machinery/replicator/vore/attackby(obj/item/weapon/W as obj, mob/living/user as mob) +/obj/machinery/replicator/vore/attackby(obj/item/W as obj, mob/living/user as mob) if(!W.canremove || !user.canUnEquip(W) || W.possessed_voice || is_type_in_list(W,item_vore_blacklist)) //No armblades, no putting possessed items in it! to_chat(user, "You cannot put \the [W] into the machine.") return - if(istype(W, /obj/item/weapon/holder/micro)) //Are you putting a micro in it? - var/obj/item/weapon/holder/micro/micro_holder = W + if(istype(W, /obj/item/holder/micro)) //Are you putting a micro in it? + var/obj/item/holder/micro/micro_holder = W var/mob/living/inserted_mob = micro_holder.held_mob //Get the actual mob. if(!inserted_mob.allow_spontaneous_tf) //Do they allow TF? to_chat(user, "You cannot put \the [W] into the machine. ((The prefs of the micro forbid this action.))") @@ -238,8 +238,8 @@ else to_chat(user, "You cannot put \the [W] into the machine. ((The micro must be connected to the server.))") return - else if(istype(W,/obj/item/weapon/grab)) //Is someone being shoved into the machine? - var/obj/item/weapon/grab/the_grab = W + else if(istype(W,/obj/item/grab)) //Is someone being shoved into the machine? + var/obj/item/grab/the_grab = W var/mob/living/inserted_mob = the_grab.affecting //Get the mob that is grabbed. if(!inserted_mob.allow_spontaneous_tf) to_chat(user, "You cannot put \the [W] into the machine. ((The prefs of the micro forbid this action.))") @@ -270,7 +270,7 @@ if(istype(inserted_mob, /mob/living/carbon/human)) //So, this WORKS. Works very well! var/mob/living/carbon/human/inserted_human = inserted_mob for(var/obj/item/I in inserted_mob) - if(istype(I, /obj/item/weapon/implant) || istype(I, /obj/item/device/nif)) + if(istype(I, /obj/item/implant) || istype(I, /obj/item/nif)) continue inserted_human.drop_from_inventory(I) inserted_mob.loc = src @@ -280,17 +280,17 @@ else to_chat(user, "You cannot put \the [W] into the machine. ((The micro must be connected to the server.))") return - else if(istype(W, /obj/item/weapon/holder/mouse)) //No you can't turn your army of mice into giant rats. + else if(istype(W, /obj/item/holder/mouse)) //No you can't turn your army of mice into giant rats. to_chat(user, "You cannot put \the [W] into the machine. The machine reads 'NOT ENOUGH BIOMASS'.") return user.drop_item() //Put the micro on the floor (or drop the item) - if(istype(W, /obj/item/weapon/holder/micro)) //I hate this but it's the only way to get their stuff to drop. - var/obj/item/weapon/holder/micro/micro_holder = W + if(istype(W, /obj/item/holder/micro)) //I hate this but it's the only way to get their stuff to drop. + var/obj/item/holder/micro/micro_holder = W var/mob/living/inserted_mob = micro_holder.held_mob //Get the actual mob. if(istype(inserted_mob, /mob/living/carbon/human)) //Only humans have the drop_from_inventory proc. var/mob/living/carbon/human/inserted_human = inserted_mob for(var/obj/item/I in inserted_human) //Drop any remaining items! This only really seems to affect hands. - if(istype(I, /obj/item/weapon/implant) || istype(I, /obj/item/device/nif)) + if(istype(I, /obj/item/implant) || istype(I, /obj/item/nif)) continue inserted_human.drop_from_inventory(I) //Now that we've dropped all the items they have, let's shove them back into the micro holder. @@ -376,13 +376,13 @@ /obj/item/clothing/shoes/flipflop, /obj/item/clothing/shoes/boots/duty, /obj/item/clothing/shoes/footwraps, - /obj/item/weapon/storage/smolebrickcase, - /obj/item/weapon/lipstick, - /obj/item/weapon/material/fishing_rod/modern, - /obj/item/weapon/inflatable_duck, + /obj/item/storage/smolebrickcase, + /obj/item/lipstick, + /obj/item/material/fishing_rod/modern, + /obj/item/inflatable_duck, /obj/item/toy/syndicateballoon, - /obj/item/weapon/towel, - /obj/item/weapon/bedsheet/rainbowdouble + /obj/item/towel, + /obj/item/bedsheet/rainbowdouble ) // Currently: 3 gloves, 5 undersuits, 3 oversuits, 5 plushies, 5 headwear, 7 shoes, 7 misc. = 35 //Fishing hat was going to be added, but it was simply too powerful for this world. @@ -438,8 +438,8 @@ spawned_obj.desc += " It is made of [source_material]." else spawned_obj.desc = "It is made of [source_material]." - if(istype(source_material,/obj/item/weapon/holder/micro)) - var/obj/item/weapon/holder/micro/micro_holder = source_material //Tells the machine that a micro is the material being used + if(istype(source_material,/obj/item/holder/micro)) + var/obj/item/holder/micro/micro_holder = source_material //Tells the machine that a micro is the material being used var/mob/mob_to_be_changed = micro_holder.held_mob //Get the mob. var/mob/living/M = mob_to_be_changed M.release_vore_contents(TRUE, TRUE) //Release their stomach contents. Don't spam the chat, either. @@ -473,12 +473,12 @@ last_process_time = world.time -/obj/machinery/replicator/clothing/attackby(obj/item/weapon/W as obj, mob/living/user as mob) +/obj/machinery/replicator/clothing/attackby(obj/item/W as obj, mob/living/user as mob) if(!W.canremove || !user.canUnEquip(W) || W.possessed_voice || is_type_in_list(W,item_vore_blacklist)) //No armblades, no putting already possessed items in it! to_chat(user, "You cannot put \the [W] into the machine.") return - if(istype(W, /obj/item/weapon/holder/micro) || istype(W, /obj/item/weapon/holder/mouse)) //Are you putting a micro/mouse in it? - var/obj/item/weapon/holder/micro/micro_holder = W + if(istype(W, /obj/item/holder/micro) || istype(W, /obj/item/holder/mouse)) //Are you putting a micro/mouse in it? + var/obj/item/holder/micro/micro_holder = W var/mob/living/inserted_mob = micro_holder.held_mob //Get the actual mob. if(!inserted_mob.allow_spontaneous_tf) //Do they allow TF? to_chat(user, "You cannot put \the [W] into the machine. ((The prefs of the micro forbid this action.))") @@ -506,8 +506,8 @@ else to_chat(user, "You cannot put \the [W] into the machine. ((The micro must be connected to the server.))") return - else if(istype(W,/obj/item/weapon/grab)) //Is someone being shoved into the machine? - var/obj/item/weapon/grab/the_grab = W + else if(istype(W,/obj/item/grab)) //Is someone being shoved into the machine? + var/obj/item/grab/the_grab = W var/mob/living/inserted_mob = the_grab.affecting //Get the mob that is grabbed. if(!inserted_mob.allow_spontaneous_tf) to_chat(user, "You cannot put \the [W] into the machine. ((The prefs of the micro forbid this action.))") @@ -538,7 +538,7 @@ if(istype(inserted_mob, /mob/living/carbon/human)) //So, this WORKS. Works very well! var/mob/living/carbon/human/inserted_human = inserted_mob for(var/obj/item/I in inserted_mob) - if(istype(I, /obj/item/weapon/implant) || istype(I, /obj/item/device/nif)) + if(istype(I, /obj/item/implant) || istype(I, /obj/item/nif)) continue inserted_human.drop_from_inventory(I) inserted_mob.loc = src @@ -550,13 +550,13 @@ return user.drop_item() //Put the micro on the floor (or drop the item) - if(istype(W, /obj/item/weapon/holder/micro)) //I hate this but it's the only way to get their stuff to drop. - var/obj/item/weapon/holder/micro/micro_holder = W + if(istype(W, /obj/item/holder/micro)) //I hate this but it's the only way to get their stuff to drop. + var/obj/item/holder/micro/micro_holder = W var/mob/living/inserted_mob = micro_holder.held_mob //Get the actual mob. if(istype(inserted_mob, /mob/living/carbon/human)) //Only humans have the drop_from_inventory proc. var/mob/living/carbon/human/inserted_human = inserted_mob for(var/obj/item/I in inserted_human) //Drop any remaining items! This only really seems to affect hands. - if(istype(I, /obj/item/weapon/implant) || istype(I, /obj/item/device/nif)) + if(istype(I, /obj/item/implant) || istype(I, /obj/item/nif)) continue inserted_human.drop_from_inventory(I) //Now that we've dropped all the items they have, let's shove them back into the micro holder. diff --git a/code/modules/xenoarcheaology/boulder.dm b/code/modules/xenoarcheaology/boulder.dm index b260f0b62a0..9024f761983 100644 --- a/code/modules/xenoarcheaology/boulder.dm +++ b/code/modules/xenoarcheaology/boulder.dm @@ -16,21 +16,21 @@ excavation_level = rand(5, 50) /obj/structure/boulder/attackby(var/obj/item/I, var/mob/user) - if(istype(I, /obj/item/device/core_sampler)) + if(istype(I, /obj/item/core_sampler)) src.geological_data.artifact_distance = rand(-100,100) / 100 src.geological_data.artifact_id = artifact_find.artifact_id - var/obj/item/device/core_sampler/C = I + var/obj/item/core_sampler/C = I C.sample_item(src, user) return - if(istype(I, /obj/item/device/depth_scanner)) - var/obj/item/device/depth_scanner/C = I + if(istype(I, /obj/item/depth_scanner)) + var/obj/item/depth_scanner/C = I C.scan_atom(user, src) return - if(istype(I, /obj/item/device/xenoarch_multi_tool)) - var/obj/item/device/xenoarch_multi_tool/C = I + if(istype(I, /obj/item/xenoarch_multi_tool)) + var/obj/item/xenoarch_multi_tool/C = I if(C.mode) //Mode means scanning. C.depth_scanner.scan_atom(user, src) return @@ -40,15 +40,15 @@ to_chat(user, "\The [src] has been excavated to a depth of [2 * src.excavation_level]cm.") return - if(istype(I, /obj/item/device/measuring_tape)) - var/obj/item/device/measuring_tape/P = I + if(istype(I, /obj/item/measuring_tape)) + var/obj/item/measuring_tape/P = I user.visible_message("\The [user] extends \the [P] towards \the [src].", "You extend \the [P] towards \the [src].") if(do_after(user, 15)) to_chat(user, "\The [src] has been excavated to a depth of [2 * src.excavation_level]cm.") return - if(istype(I, /obj/item/weapon/pickaxe)) - var/obj/item/weapon/pickaxe/P = I + if(istype(I, /obj/item/pickaxe)) + var/obj/item/pickaxe/P = I if(last_act + P.digspeed > world.time)//prevents message spam return @@ -87,13 +87,13 @@ . = ..() if(istype(AM,/mob/living/carbon/human)) var/mob/living/carbon/human/H = AM - var/obj/item/weapon/pickaxe/P = H.get_inactive_hand() + var/obj/item/pickaxe/P = H.get_inactive_hand() if(istype(P)) src.attackby(P, H) else if(istype(AM,/mob/living/silicon/robot)) var/mob/living/silicon/robot/R = AM - if(istype(R.module_active,/obj/item/weapon/pickaxe)) + if(istype(R.module_active,/obj/item/pickaxe)) attackby(R.module_active,R) else if(istype(AM,/obj/mecha)) diff --git a/code/modules/xenoarcheaology/effect.dm b/code/modules/xenoarcheaology/effect.dm index bf6932b2d31..29665fa6606 100644 --- a/code/modules/xenoarcheaology/effect.dm +++ b/code/modules/xenoarcheaology/effect.dm @@ -164,8 +164,8 @@ var/protected = 0 //anomaly suits give best protection, but excavation suits are almost as good - if(istype(H.back,/obj/item/weapon/rig/hazmat)) - var/obj/item/weapon/rig/hazmat/rig = H.back + if(istype(H.back,/obj/item/rig/hazmat)) + var/obj/item/rig/hazmat/rig = H.back if(rig.suit_is_deployed() && !rig.offline) protected += 1 diff --git a/code/modules/xenoarcheaology/effect_master.dm b/code/modules/xenoarcheaology/effect_master.dm index 91254789347..91c266bd914 100644 --- a/code/modules/xenoarcheaology/effect_master.dm +++ b/code/modules/xenoarcheaology/effect_master.dm @@ -292,10 +292,10 @@ /datum/component/artifact_master/proc/on_attackby() - var/obj/item/weapon/W = args[2] + var/obj/item/W = args[2] for(var/datum/artifact_effect/my_effect in my_effects) - if (istype(W, /obj/item/weapon/reagent_containers)) + if (istype(W, /obj/item/reagent_containers)) if(W.reagents.has_reagent("hydrogen", 1) || W.reagents.has_reagent("water", 1)) if(my_effect.trigger == TRIGGER_WATER) my_effect.ToggleActivate() @@ -308,16 +308,16 @@ else if(W.reagents.has_reagent("toxin", 1) || W.reagents.has_reagent("cyanide", 1) || W.reagents.has_reagent("amatoxin", 1) || W.reagents.has_reagent("neurotoxin", 1)) if(my_effect.trigger == TRIGGER_TOXIN) my_effect.ToggleActivate() - else if(istype(W,/obj/item/weapon/melee/baton) && W:status ||\ - istype(W,/obj/item/weapon/melee/energy) ||\ - istype(W,/obj/item/weapon/melee/cultblade) ||\ - istype(W,/obj/item/weapon/card/emag) ||\ - istype(W,/obj/item/device/multitool)) + else if(istype(W,/obj/item/melee/baton) && W:status ||\ + istype(W,/obj/item/melee/energy) ||\ + istype(W,/obj/item/melee/cultblade) ||\ + istype(W,/obj/item/card/emag) ||\ + istype(W,/obj/item/multitool)) if (my_effect.trigger == TRIGGER_ENERGY) my_effect.ToggleActivate() - else if (istype(W,/obj/item/weapon/flame) && W:lit ||\ - istype(W,/obj/item/weapon/weldingtool) && W:welding) + else if (istype(W,/obj/item/flame) && W:lit ||\ + istype(W,/obj/item/weldingtool) && W:welding) if(my_effect.trigger == TRIGGER_HEAT) my_effect.ToggleActivate() else diff --git a/code/modules/xenoarcheaology/effects/cellcharge.dm b/code/modules/xenoarcheaology/effects/cellcharge.dm index e3377bbe0e1..b5cad20cd0f 100644 --- a/code/modules/xenoarcheaology/effects/cellcharge.dm +++ b/code/modules/xenoarcheaology/effects/cellcharge.dm @@ -16,7 +16,7 @@ for(var/atom/movable/AM in range(effectrange, turf)) if(isliving(AM)) var/mob/living/L = AM - var/obj/item/weapon/cell/C = L.get_cell() + var/obj/item/cell/C = L.get_cell() if(C) if(issilicon(L) && ((last_message + (1 MINUTE)) < world.time)) @@ -25,7 +25,7 @@ C.charge = min(C.maxcharge, C.charge + amount) continue - var/obj/item/weapon/cell/C = AM.get_cell() + var/obj/item/cell/C = AM.get_cell() if(C) C.charge = min(C.maxcharge, C.charge + amount) diff --git a/code/modules/xenoarcheaology/effects/celldrain.dm b/code/modules/xenoarcheaology/effects/celldrain.dm index 44d28497e65..a539da1356a 100644 --- a/code/modules/xenoarcheaology/effects/celldrain.dm +++ b/code/modules/xenoarcheaology/effects/celldrain.dm @@ -16,7 +16,7 @@ for(var/atom/movable/AM in range(effectrange, turf)) if(isliving(AM)) var/mob/living/L = AM - var/obj/item/weapon/cell/C = L.get_cell() + var/obj/item/cell/C = L.get_cell() if(C) if(issilicon(L) && ((last_message + (1 MINUTE)) < world.time)) @@ -25,7 +25,7 @@ C.charge = min(C.maxcharge, C.charge - amount) continue - var/obj/item/weapon/cell/C = AM.get_cell() + var/obj/item/cell/C = AM.get_cell() if(C) C.charge = min(C.maxcharge, C.charge - amount) diff --git a/code/modules/xenoarcheaology/effects/vampire.dm b/code/modules/xenoarcheaology/effects/vampire.dm index 746a17961d7..0548a2e355c 100644 --- a/code/modules/xenoarcheaology/effects/vampire.dm +++ b/code/modules/xenoarcheaology/effects/vampire.dm @@ -64,7 +64,7 @@ if(charges >= 10) charges -= 10 - var/manifestation = pick(/obj/item/device/soulstone, /mob/living/simple_mob/faithless/cult/strong, /mob/living/simple_mob/creature/cult/strong, /mob/living/simple_mob/animal/space/bats/cult/strong) + var/manifestation = pick(/obj/item/soulstone, /mob/living/simple_mob/faithless/cult/strong, /mob/living/simple_mob/creature/cult/strong, /mob/living/simple_mob/animal/space/bats/cult/strong) new manifestation(pick(RANGE_TURFS(1,T))) if(charges >= 3) diff --git a/code/modules/xenoarcheaology/finds/eguns.dm b/code/modules/xenoarcheaology/finds/eguns.dm index 80aa45ec176..0365ca2c73a 100644 --- a/code/modules/xenoarcheaology/finds/eguns.dm +++ b/code/modules/xenoarcheaology/finds/eguns.dm @@ -1,30 +1,30 @@ //snowflake guns for xenoarch because you can't override the update_icon() proc inside the giant mess that is find creation -/obj/item/weapon/gun/energy/laser/xenoarch +/obj/item/gun/energy/laser/xenoarch icon = 'icons/obj/xenoarchaeology.dmi' -/obj/item/weapon/gun/energy/laser/xenoarch/update_icon() +/obj/item/gun/energy/laser/xenoarch/update_icon() return -/obj/item/weapon/gun/energy/laser/practice/xenoarch +/obj/item/gun/energy/laser/practice/xenoarch icon = 'icons/obj/xenoarchaeology.dmi' -/obj/item/weapon/gun/energy/laser/practice/xenoarch/update_icon() +/obj/item/gun/energy/laser/practice/xenoarch/update_icon() return -/obj/item/weapon/gun/energy/laser/practice/xenoarch +/obj/item/gun/energy/laser/practice/xenoarch icon = 'icons/obj/xenoarchaeology.dmi' -/obj/item/weapon/gun/energy/laser/practice/xenoarch/update_icon() +/obj/item/gun/energy/laser/practice/xenoarch/update_icon() return -/obj/item/weapon/gun/energy/xray/xenoarch +/obj/item/gun/energy/xray/xenoarch icon = 'icons/obj/xenoarchaeology.dmi' -/obj/item/weapon/gun/energy/xray/xenoarch/update_icon() +/obj/item/gun/energy/xray/xenoarch/update_icon() return -/obj/item/weapon/gun/energy/captain/xenoarch +/obj/item/gun/energy/captain/xenoarch icon = 'icons/obj/xenoarchaeology.dmi' -/obj/item/weapon/gun/energy/captain/xenoarch/update_icon() +/obj/item/gun/energy/captain/xenoarch/update_icon() return diff --git a/code/modules/xenoarcheaology/finds/eguns_vr.dm b/code/modules/xenoarcheaology/finds/eguns_vr.dm index 0936f47bf59..902905e059b 100644 --- a/code/modules/xenoarcheaology/finds/eguns_vr.dm +++ b/code/modules/xenoarcheaology/finds/eguns_vr.dm @@ -1,11 +1,11 @@ -/obj/item/weapon/gun/energy/laser/xenoarch +/obj/item/gun/energy/laser/xenoarch icon = 'icons/obj/xenoarchaeology_vr.dmi' -/obj/item/weapon/gun/energy/laser/practice/xenoarch +/obj/item/gun/energy/laser/practice/xenoarch icon = 'icons/obj/xenoarchaeology_vr.dmi' -/obj/item/weapon/gun/energy/xray/xenoarch +/obj/item/gun/energy/xray/xenoarch icon = 'icons/obj/xenoarchaeology_vr.dmi' -/obj/item/weapon/gun/energy/captain/xenoarch +/obj/item/gun/energy/captain/xenoarch icon = 'icons/obj/xenoarchaeology_vr.dmi' diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm index e07e7ec9dea..7c262bd3507 100644 --- a/code/modules/xenoarcheaology/finds/find_spawning.dm +++ b/code/modules/xenoarcheaology/finds/find_spawning.dm @@ -1,10 +1,10 @@ -/obj/item/weapon/archaeological_find +/obj/item/archaeological_find name = "object" icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "ano01" var/find_type = 0 -/obj/item/weapon/archaeological_find/New(loc, var/new_item_type) +/obj/item/archaeological_find/New(loc, var/new_item_type) if(new_item_type) find_type = new_item_type else @@ -13,7 +13,7 @@ var/item_type = "object" icon_state = "unknown[rand(1,4)]" var/additional_desc = "" - var/obj/item/weapon/new_item + var/obj/item/new_item var/source_material = "" var/apply_material_decorations = TRUE var/apply_image_decorations = FALSE @@ -37,10 +37,10 @@ if(ARCHAEO_BOWL) item_type = "bowl" if(prob(33)) - new_item = new /obj/item/weapon/reagent_containers/glass/replenishing(src.loc) + new_item = new /obj/item/reagent_containers/glass/replenishing(src.loc) LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) else - new_item = new /obj/item/weapon/reagent_containers/glass/beaker(src.loc) + new_item = new /obj/item/reagent_containers/glass/beaker(src.loc) new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "bowl" apply_image_decorations = TRUE @@ -51,10 +51,10 @@ if(ARCHAEO_URN) item_type = "urn" if(prob(33)) - new_item = new /obj/item/weapon/reagent_containers/glass/replenishing(src.loc) + new_item = new /obj/item/reagent_containers/glass/replenishing(src.loc) LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) else - new_item = new /obj/item/weapon/reagent_containers/glass/beaker(src.loc) + new_item = new /obj/item/reagent_containers/glass/beaker(src.loc) new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "urn[rand(1,2)]" apply_image_decorations = TRUE @@ -63,11 +63,11 @@ if(ARCHAEO_CUTLERY) item_type = "[pick("fork","spoon","knife")]" if(prob(25)) - new_item = new /obj/item/weapon/material/kitchen/utensil/fork(src.loc) + new_item = new /obj/item/material/kitchen/utensil/fork(src.loc) else if(prob(50)) - new_item = new /obj/item/weapon/material/knife(src.loc) + new_item = new /obj/item/material/knife(src.loc) else - new_item = new /obj/item/weapon/material/kitchen/utensil/spoon(src.loc) + new_item = new /obj/item/material/kitchen/utensil/spoon(src.loc) if(prob(60)) LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) additional_desc = "[pick("It's like no [item_type] you've ever seen before",\ @@ -82,7 +82,7 @@ [pick("alien figure","rodent-like creature","reptilian alien","primate","unidentifiable object")] \ [pick("performing unspeakable acts","posing heroically","in a fetal position","cheering","sobbing","making a plaintive gesture","making a rude gesture")]." if(prob(25)) - new_item = new /obj/item/weapon/vampiric(src.loc) + new_item = new /obj/item/vampiric(src.loc) LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) if(ARCHAEO_INSTRUMENT) name = "instrument" @@ -99,14 +99,14 @@ "You wonder what kind of music was made with it")]." if(ARCHAEO_KNIFE) item_type = "[pick("bladed knife","serrated blade","sharp cutting implement")]" - new_item = new /obj/item/weapon/material/knife(src.loc) + new_item = new /obj/item/material/knife(src.loc) additional_desc = "[pick("It doesn't look safe.",\ "It looks wickedly jagged",\ "There appear to be [pick("dark red","dark purple","dark green","dark blue")] stains along the edges")]." if(ARCHAEO_COIN) //assuming there are 12 types of coins var/chance = 8 - for(var/type in typesof(/obj/item/weapon/coin)) + for(var/type in typesof(/obj/item/coin)) if(prob(chance)) new_item = new type(src.loc) break @@ -118,12 +118,12 @@ apply_image_decorations = TRUE if(ARCHAEO_HANDCUFFS) item_type = "handcuffs" - new_item = new /obj/item/weapon/handcuffs(src.loc) + new_item = new /obj/item/handcuffs(src.loc) additional_desc = "[pick("They appear to be for securing two things together","Looks kinky","Doesn't seem like a children's toy")]." if(ARCHAEO_BEARTRAP) item_type = "[pick("wicked","evil","byzantine","dangerous")] looking [pick("device","contraption","thing","trap")]" apply_prefix = FALSE - new_item = new /obj/item/weapon/beartrap(src.loc) + new_item = new /obj/item/beartrap(src.loc) if(prob(40)) new_item.color = rgb(rand(0,255),rand(0,255),rand(0,255)) additional_desc = "[pick("It looks like it could take a limb off",\ @@ -131,16 +131,16 @@ "There appear to be [pick("dark red","dark purple","dark green","dark blue")] stains along part of it")]." if(ARCHAEO_LIGHTER) item_type = "[pick("cylinder","tank","chamber")]" - new_item = new /obj/item/weapon/flame/lighter(src.loc) + new_item = new /obj/item/flame/lighter(src.loc) additional_desc = "There is a tiny device attached." if(prob(30)) apply_image_decorations = TRUE if(ARCHAEO_BOX) item_type = "box" - new_item = new /obj/item/weapon/storage/box(src.loc) + new_item = new /obj/item/storage/box(src.loc) new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "box" - var/obj/item/weapon/storage/box/new_box = new_item + var/obj/item/storage/box/new_box = new_item new_box.max_w_class = pick(1,2,2,3,3,3,4,4) var/storage_amount = 2**(new_box.max_w_class-1) new_box.max_storage_space = rand(storage_amount, storage_amount * 10) @@ -150,21 +150,21 @@ if(ARCHAEO_GASTANK) item_type = "[pick("cylinder","tank","chamber")]" if(prob(25)) - new_item = new /obj/item/weapon/tank/air(src.loc) + new_item = new /obj/item/tank/air(src.loc) else if(prob(50)) - new_item = new /obj/item/weapon/tank/anesthetic(src.loc) + new_item = new /obj/item/tank/anesthetic(src.loc) else - new_item = new /obj/item/weapon/tank/phoron(src.loc) + new_item = new /obj/item/tank/phoron(src.loc) icon_state = pick("oxygen","oxygen_fr","oxygen_f","phoron","anesthetic") additional_desc = "It [pick("gloops","sloshes")] slightly when you shake it." if(ARCHAEO_TOOL) item_type = "tool" if(prob(25)) - new_item = new /obj/item/weapon/tool/wrench(src.loc) + new_item = new /obj/item/tool/wrench(src.loc) else if(prob(25)) - new_item = new /obj/item/weapon/tool/crowbar(src.loc) + new_item = new /obj/item/tool/crowbar(src.loc) else - new_item = new /obj/item/weapon/tool/screwdriver(src.loc) + new_item = new /obj/item/tool/screwdriver(src.loc) if(prob(40)) new_item.color = rgb(rand(0,255),rand(0,255),rand(0,255)) apply_image_decorations = TRUE @@ -190,9 +190,9 @@ new_item:amount = rand(5,45) if(ARCHAEO_PEN) if(prob(75)) - new_item = new /obj/item/weapon/pen(src.loc) + new_item = new /obj/item/pen(src.loc) else - new_item = new /obj/item/weapon/pen/reagent/sleepy(src.loc) + new_item = new /obj/item/pen/reagent/sleepy(src.loc) if(prob(30)) icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pen1" @@ -220,25 +220,25 @@ if(prob(10)) apply_image_decorations = TRUE if(prob(25)) - new_item = new /obj/item/device/soulstone(src.loc) + new_item = new /obj/item/soulstone(src.loc) new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = icon_state LAZYSET(new_item.origin_tech, TECH_ARCANE, 2) if(ARCHAEO_CULTBLADE) //cultblade apply_prefix = FALSE - new_item = new /obj/item/weapon/melee/cultblade(src.loc) + new_item = new /obj/item/melee/cultblade(src.loc) apply_material_decorations = FALSE apply_image_decorations = FALSE if(ARCHAEO_TELEBEACON) - new_item = new /obj/item/device/radio/beacon(src.loc) + new_item = new /obj/item/radio/beacon(src.loc) talkative = FALSE new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "unknown[rand(1,4)]" new_item.desc = "" if(ARCHAEO_CLAYMORE) apply_prefix = FALSE - new_item = new /obj/item/weapon/material/sword(src.loc) + new_item = new /obj/item/material/sword(src.loc) new_item.force = 10 new_item.name = pick("great-sword","claymore","longsword","broadsword","shortsword","gladius") item_type = new_item.name @@ -260,15 +260,15 @@ //soulstone become_anomalous = TRUE apply_prefix = FALSE - new_item = new /obj/item/device/soulstone(src.loc) + new_item = new /obj/item/soulstone(src.loc) item_type = new_item.name apply_material_decorations = FALSE LAZYSET(new_item.origin_tech, TECH_ARCANE, 2) if(ARCHAEO_SHARD) if(prob(50)) - new_item = new /obj/item/weapon/material/shard(src.loc) + new_item = new /obj/item/material/shard(src.loc) else - new_item = new /obj/item/weapon/material/shard/phoron(src.loc) + new_item = new /obj/item/material/shard/phoron(src.loc) apply_prefix = FALSE apply_image_decorations = FALSE apply_material_decorations = FALSE @@ -280,9 +280,9 @@ if(ARCHAEO_STOCKPARTS) if(prob(30)) become_anomalous = TRUE - var/list/possible_spawns = typesof(/obj/item/weapon/stock_parts) - possible_spawns -= /obj/item/weapon/stock_parts - possible_spawns -= /obj/item/weapon/stock_parts/subspace + var/list/possible_spawns = typesof(/obj/item/stock_parts) + possible_spawns -= /obj/item/stock_parts + possible_spawns -= /obj/item/stock_parts/subspace var/new_type = pick(possible_spawns) new_item = new new_type(src.loc) @@ -290,19 +290,19 @@ apply_material_decorations = FALSE if(ARCHAEO_KATANA) apply_prefix = FALSE - new_item = new /obj/item/weapon/material/sword/katana(src.loc) + new_item = new /obj/item/material/sword/katana(src.loc) new_item.force = 10 new_item.name = "katana" item_type = new_item.name if(ARCHAEO_LASER) //energy gun var/spawn_type = pick(\ - /obj/item/weapon/gun/energy/laser/practice/xenoarch,\ - /obj/item/weapon/gun/energy/laser/xenoarch,\ - /obj/item/weapon/gun/energy/xray/xenoarch,\ - /obj/item/weapon/gun/energy/captain/xenoarch) + /obj/item/gun/energy/laser/practice/xenoarch,\ + /obj/item/gun/energy/laser/xenoarch,\ + /obj/item/gun/energy/xray/xenoarch,\ + /obj/item/gun/energy/captain/xenoarch) if(spawn_type) - var/obj/item/weapon/gun/energy/new_gun = new spawn_type(src.loc) + var/obj/item/gun/energy/new_gun = new spawn_type(src.loc) new_item = new_gun new_item.icon_state = "egun[rand(1,6)]" //VOREStation Edit: max value is 6 since xenoarcheoloy_vr only has 6 egun variants new_gun.desc = "This is an antique energy weapon, you're not sure if it will fire or not." @@ -324,7 +324,7 @@ item_type = "gun" if(ARCHAEO_GUN) //revolver - var/obj/item/weapon/gun/projectile/new_gun = new /obj/item/weapon/gun/projectile/revolver(src.loc) + var/obj/item/gun/projectile/new_gun = new /obj/item/gun/projectile/revolver(src.loc) new_item = new_gun new_item.icon_state = "gun[rand(1,7)]" new_item.icon = 'icons/obj/xenoarchaeology.dmi' @@ -365,11 +365,11 @@ apply_image_decorations = FALSE if(ARCHAEO_FOSSIL) //fossil bone/skull - //new_item = new /obj/item/weapon/fossil/base(src.loc) + //new_item = new /obj/item/fossil/base(src.loc) //the replacement item propogation isn't working, and it's messy code anyway so just do it here - var/list/candidates = list(/obj/item/weapon/fossil/bone = 9,/obj/item/weapon/fossil/skull = 3, - /obj/item/weapon/fossil/skull/horned = 2) + var/list/candidates = list(/obj/item/fossil/bone = 9,/obj/item/fossil/skull = 3, + /obj/item/fossil/skull/horned = 2) var/spawn_type = pickweight(candidates) new_item = new spawn_type(src.loc) @@ -379,7 +379,7 @@ apply_material_decorations = FALSE if(ARCHAEO_SHELL) //fossil shell - new_item = new /obj/item/weapon/fossil/shell(src.loc) + new_item = new /obj/item/fossil/shell(src.loc) apply_prefix = FALSE additional_desc = "A fossilised, pre-Stygian alien crustacean." apply_image_decorations = FALSE @@ -388,7 +388,7 @@ apply_image_decorations = TRUE if(ARCHAEO_PLANT) //fossil plant - new_item = new /obj/item/weapon/fossil/plant(src.loc) + new_item = new /obj/item/fossil/plant(src.loc) item_type = new_item.name additional_desc = "A fossilised shred of alien plant matter." apply_image_decorations = FALSE @@ -455,22 +455,22 @@ apply_material_decorations = FALSE var/list/alien_stuff = list( - /obj/item/device/multitool/alien, + /obj/item/multitool/alien, /obj/item/stack/cable_coil/alien, - /obj/item/weapon/tool/crowbar/alien, - /obj/item/weapon/tool/screwdriver/alien, - /obj/item/weapon/weldingtool/alien, - /obj/item/weapon/tool/wirecutters/alien, - /obj/item/weapon/tool/wrench/alien, - /obj/item/weapon/surgical/FixOVein/alien, - /obj/item/weapon/surgical/bone_clamp/alien, - /obj/item/weapon/surgical/cautery/alien, - /obj/item/weapon/surgical/circular_saw/alien, - /obj/item/weapon/surgical/hemostat/alien, - /obj/item/weapon/surgical/retractor/alien, - /obj/item/weapon/surgical/scalpel/alien, - /obj/item/weapon/surgical/surgicaldrill/alien, - /obj/item/weapon/cell/device/weapon/recharge/alien, + /obj/item/tool/crowbar/alien, + /obj/item/tool/screwdriver/alien, + /obj/item/weldingtool/alien, + /obj/item/tool/wirecutters/alien, + /obj/item/tool/wrench/alien, + /obj/item/surgical/FixOVein/alien, + /obj/item/surgical/bone_clamp/alien, + /obj/item/surgical/cautery/alien, + /obj/item/surgical/circular_saw/alien, + /obj/item/surgical/hemostat/alien, + /obj/item/surgical/retractor/alien, + /obj/item/surgical/scalpel/alien, + /obj/item/surgical/surgicaldrill/alien, + /obj/item/cell/device/weapon/recharge/alien, /obj/item/clothing/suit/armor/alien, /obj/item/clothing/head/helmet/alien, /obj/item/clothing/head/psy_crown/wrath @@ -508,7 +508,7 @@ /obj/vehicle/boat/dragon ) if(prob(30)) - new /obj/item/weapon/oar(src.loc, new_boat_mat) + new /obj/item/oar(src.loc, new_boat_mat) var/new_type = pick(alien_stuff) new_item = new new_type(src.loc, new_boat_mat) item_type = new_item.name @@ -517,7 +517,7 @@ // Imperion circuit. apply_prefix = FALSE apply_image_decorations = FALSE - var/possible_circuits = subtypesof(/obj/item/weapon/circuitboard/mecha/imperion) + var/possible_circuits = subtypesof(/obj/item/circuitboard/mecha/imperion) var/new_type = pick(possible_circuits) new_item = new new_type(src.loc) name = new_item.name @@ -532,12 +532,12 @@ apply_image_decorations = TRUE if(prob(25)) apply_material_decorations = FALSE - new_item = new /obj/item/weapon/telecube/randomized(src.loc) + new_item = new /obj/item/telecube/randomized(src.loc) item_type = new_item.name if(ARCHAEO_BATTERY) // Battery! - var/new_path = pick(subtypesof(/obj/item/weapon/cell)) + var/new_path = pick(subtypesof(/obj/item/cell)) new_item = new new_path(src.loc) new_item.name = pick("cell", "battery", "device") @@ -558,8 +558,8 @@ apply_image_decorations = TRUE if(prob(25)) apply_material_decorations = FALSE - new_item = new /obj/item/weapon/reagent_containers/syringe(src.loc) - var/obj/item/weapon/reagent_containers/syringe/S = new_item + new_item = new /obj/item/reagent_containers/syringe(src.loc) + var/obj/item/reagent_containers/syringe/S = new_item S.volume = 30 //If S hasn't initialized yet, S.reagents will be null. @@ -588,11 +588,11 @@ if(prob(10)) apply_material_decorations = FALSE - new_item = new /obj/item/weapon/material/twohanded/baseballbat(src.loc) + new_item = new /obj/item/material/twohanded/baseballbat(src.loc) new_item.name = pick("great-club","club","billyclub","mace","tenderizer","maul","bat") item_type = new_item.name - if(istype(new_item, /obj/item/weapon/material)) + if(istype(new_item, /obj/item/material)) var/new_item_mat = pickweight(list( MAT_STEEL = 80, MAT_WOOD = 20, @@ -611,11 +611,11 @@ MAT_MORPHIUM = 2, MAT_SUPERMATTER = 1 )) - var/obj/item/weapon/material/MW = new_item + var/obj/item/material/MW = new_item MW.applies_material_colour = TRUE MW.set_material(new_item_mat) - if(istype(MW, /obj/item/weapon/material/twohanded)) - var/obj/item/weapon/material/twohanded/TH = MW + if(istype(MW, /obj/item/material/twohanded)) + var/obj/item/material/twohanded/TH = MW TH.force_unwielded *= 0.7 TH.force_wielded *= 0.5 else @@ -625,8 +625,8 @@ if(apply_material_decorations) source_material = pick("cordite","quadrinium","steel","titanium","aluminium","ferritic-alloy","plasteel","duranium") - if(istype(new_item, /obj/item/weapon/material)) - var/obj/item/weapon/material/MW = new_item + if(istype(new_item, /obj/item/material)) + var/obj/item/material/MW = new_item source_material = MW.material.display_name if(istype(new_item, /obj/vehicle/boat)) var/obj/vehicle/boat/B = new_item @@ -720,7 +720,7 @@ become_anomalous() -/obj/item/weapon/archaeological_find/Destroy() +/obj/item/archaeological_find/Destroy() if(src.is_anomalous()) var/datum/component/artifact_master/arti_mstr = GetComponent(/datum/component/artifact_master) arti_mstr.RemoveComponent() diff --git a/code/modules/xenoarcheaology/finds/finds.dm b/code/modules/xenoarcheaology/finds/finds.dm index de7b6382b05..3bed21facc0 100644 --- a/code/modules/xenoarcheaology/finds/finds.dm +++ b/code/modules/xenoarcheaology/finds/finds.dm @@ -14,7 +14,7 @@ clearance_range = rand(4, 12) dissonance_spread = rand(1500, 2500) / 100 -/obj/item/weapon/strangerock +/obj/item/strangerock name = "Strange rock" desc = "Seems to have some unusal strata evident throughout it." icon = 'icons/obj/xenoarchaeology.dmi' @@ -23,15 +23,15 @@ origin_tech = list(TECH_MATERIAL = 5) w_class = ITEMSIZE_SMALL -/obj/item/weapon/strangerock/New(loc, var/inside_item_type = 0) +/obj/item/strangerock/New(loc, var/inside_item_type = 0) pixel_x = rand(0,16)-8 pixel_y = rand(0,8)-8 if(inside_item_type) - new /obj/item/weapon/archaeological_find(src, new_item_type = inside_item_type) + new /obj/item/archaeological_find(src, new_item_type = inside_item_type) -/obj/item/weapon/strangerock/attackby(var/obj/item/I, var/mob/user) - if(istype(I, /obj/item/weapon/pickaxe/brush)) +/obj/item/strangerock/attackby(var/obj/item/I, var/mob/user) + if(istype(I, /obj/item/pickaxe/brush)) var/obj/item/inside = locate() in src if(inside) inside.loc = get_turf(src) @@ -42,7 +42,7 @@ return if(I.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/W = I.get_welder() + var/obj/item/weldingtool/W = I.get_welder() if(W.isOn()) if(W.get_fuel() >= 2) var/obj/item/inside = locate() in src @@ -58,8 +58,8 @@ W.remove_fuel(1) return - else if(istype(I, /obj/item/device/core_sampler)) - var/obj/item/device/core_sampler/S = I + else if(istype(I, /obj/item/core_sampler)) + var/obj/item/core_sampler/S = I S.sample_item(src, user) return diff --git a/code/modules/xenoarcheaology/finds/fossils.dm b/code/modules/xenoarcheaology/finds/fossils.dm index 3c3a182a32c..ff852e1b1f3 100644 --- a/code/modules/xenoarcheaology/finds/fossils.dm +++ b/code/modules/xenoarcheaology/finds/fossils.dm @@ -2,38 +2,38 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // fossils -/obj/item/weapon/fossil +/obj/item/fossil name = "Fossil" icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "bone" desc = "It's a fossil." var/animal = 1 -/obj/item/weapon/fossil/base/New() - var/list/l = list(/obj/item/weapon/fossil/bone = 9,/obj/item/weapon/fossil/skull = 3, - /obj/item/weapon/fossil/skull/horned = 2) +/obj/item/fossil/base/New() + var/list/l = list(/obj/item/fossil/bone = 9,/obj/item/fossil/skull = 3, + /obj/item/fossil/skull/horned = 2) var/t = pickweight(l) new t(src.loc) qdel(src) -/obj/item/weapon/fossil/bone +/obj/item/fossil/bone name = "Fossilised bone" icon_state = "bone" desc = "It's a fossilised bone." -/obj/item/weapon/fossil/skull +/obj/item/fossil/skull name = "Fossilised skull" icon_state = "skull" desc = "It's a fossilised skull." -/obj/item/weapon/fossil/skull/horned +/obj/item/fossil/skull/horned icon_state = "hskull" desc = "It's a fossilised, horned skull." -/obj/item/weapon/fossil/skull/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/fossil/bone)) +/obj/item/fossil/skull/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W,/obj/item/fossil/bone)) var/obj/o = new /obj/skeleton(get_turf(src)) - var/a = new /obj/item/weapon/fossil/bone + var/a = new /obj/item/fossil/bone var/b = new src.type o.contents.Add(a) o.contents.Add(b) @@ -54,11 +54,11 @@ src.breq = rand(6)+3 src.desc = "An incomplete skeleton, looks like it could use [src.breq-src.bnum] more bones." -/obj/skeleton/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/fossil/bone)) +/obj/skeleton/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W,/obj/item/fossil/bone)) if(!bstate) bnum++ - src.contents.Add(new/obj/item/weapon/fossil/bone) + src.contents.Add(new/obj/item/fossil/bone) qdel(W) if(bnum==breq) usr = user @@ -66,7 +66,7 @@ src.bstate = 1 src.density = TRUE src.name = "alien skeleton display" - if(src.contents.Find(/obj/item/weapon/fossil/skull/horned)) + if(src.contents.Find(/obj/item/fossil/skull/horned)) src.desc = "A creature made of [src.contents.len-1] assorted bones and a horned skull. The plaque reads \'[plaque_contents]\'." else src.desc = "A creature made of [src.contents.len-1] assorted bones and a skull. The plaque reads \'[plaque_contents]\'." @@ -75,10 +75,10 @@ to_chat(user, "Looks like it could use [src.breq-src.bnum] more bones.") else ..() - else if(istype(W,/obj/item/weapon/pen)) + else if(istype(W,/obj/item/pen)) plaque_contents = sanitize(tgui_input_text(usr, "What would you like to write on the plaque:","Skeleton plaque","")) user.visible_message("[user] writes something on the base of [src].","You relabel the plaque on the base of [icon2html(src,viewers(src))] [src].") - if(src.contents.Find(/obj/item/weapon/fossil/skull/horned)) + if(src.contents.Find(/obj/item/fossil/skull/horned)) src.desc = "A creature made of [src.contents.len-1] assorted bones and a horned skull. The plaque reads \'[plaque_contents]\'." else src.desc = "A creature made of [src.contents.len-1] assorted bones and a skull. The plaque reads \'[plaque_contents]\'." @@ -86,16 +86,16 @@ ..() //shells and plants do not make skeletons -/obj/item/weapon/fossil/shell +/obj/item/fossil/shell name = "Fossilised shell" icon_state = "shell" desc = "It's a fossilised shell." -/obj/item/weapon/fossil/plant +/obj/item/fossil/plant name = "Fossilised plant" icon_state = "plant1" desc = "It's fossilised plant remains." animal = 0 -/obj/item/weapon/fossil/plant/New() +/obj/item/fossil/plant/New() icon_state = "plant[rand(1,4)]" diff --git a/code/modules/xenoarcheaology/finds/special.dm b/code/modules/xenoarcheaology/finds/special.dm index a71f742ca15..0abe25ca7ff 100644 --- a/code/modules/xenoarcheaology/finds/special.dm +++ b/code/modules/xenoarcheaology/finds/special.dm @@ -2,15 +2,15 @@ //endless reagents! -/obj/item/weapon/reagent_containers/glass/replenishing +/obj/item/reagent_containers/glass/replenishing var/spawning_id -/obj/item/weapon/reagent_containers/glass/replenishing/Initialize() +/obj/item/reagent_containers/glass/replenishing/Initialize() . = ..() START_PROCESSING(SSobj, src) spawning_id = pick("blood","holywater","lube","stoxin","ethanol","ice","glycerol","fuel","cleaner") -/obj/item/weapon/reagent_containers/glass/replenishing/process() +/obj/item/reagent_containers/glass/replenishing/process() reagents.add_reagent(spawning_id, 0.3) @@ -41,7 +41,7 @@ //a vampiric statuette //todo: cult integration -/obj/item/weapon/vampiric +/obj/item/vampiric name = "statuette" icon_state = "statuette" icon = 'icons/obj/xenoarchaeology.dmi' @@ -54,11 +54,11 @@ var/wight_check_index = 1 var/list/shadow_wights = list() -/obj/item/weapon/vampiric/New() +/obj/item/vampiric/New() ..() START_PROCESSING(SSobj, src) -/obj/item/weapon/vampiric/process() +/obj/item/vampiric/process() //see if we've identified anyone nearby if(world.time - last_bloodcall > bloodcall_interval && nearby_mobs.len) var/mob/living/carbon/human/M = pop(nearby_mobs) @@ -116,12 +116,12 @@ else if(get_dist(W, src) > 10) shadow_wights.Remove(wight_check_index) -/obj/item/weapon/vampiric/hear_talk(mob/M, list/message_pieces, verb) +/obj/item/vampiric/hear_talk(mob/M, list/message_pieces, verb) ..() if(world.time - last_bloodcall >= bloodcall_interval && (M in view(7, src))) bloodcall(M) -/obj/item/weapon/vampiric/proc/bloodcall(var/mob/living/carbon/human/M) +/obj/item/vampiric/proc/bloodcall(var/mob/living/carbon/human/M) last_bloodcall = world.time if(istype(M)) playsound(src, pick('sound/hallucinations/wail.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/far_noise.ogg'), 50, 1, -3) diff --git a/code/modules/xenoarcheaology/finds/talking.dm b/code/modules/xenoarcheaology/finds/talking.dm index 138ffca5d48..c2b13cf9338 100644 --- a/code/modules/xenoarcheaology/finds/talking.dm +++ b/code/modules/xenoarcheaology/finds/talking.dm @@ -60,7 +60,7 @@ spawn(2) SaySomething(pick(seperate)) -/*/obj/item/weapon/talkingcrystal/proc/debug() +/*/obj/item/talkingcrystal/proc/debug() //set src in view() for(var/v in heard_words) to_world("[uppertext(v)]") diff --git a/code/modules/xenoarcheaology/manuals.dm b/code/modules/xenoarcheaology/manuals.dm index da2a9fb0dc0..328b5317aaa 100644 --- a/code/modules/xenoarcheaology/manuals.dm +++ b/code/modules/xenoarcheaology/manuals.dm @@ -1,5 +1,5 @@ -/obj/item/weapon/book/manual/excavation +/obj/item/book/manual/excavation name = "Out on the Dig" icon_state = "excavation" item_state = "book6" @@ -113,7 +113,7 @@ "} -/obj/item/weapon/book/manual/mass_spectrometry +/obj/item/book/manual/mass_spectrometry name = "High Power Mass Spectrometry: A Comprehensive Guide" icon_state = "analysis" item_state = "book6" @@ -185,7 +185,7 @@ "} -/obj/item/weapon/book/manual/anomaly_spectroscopy +/obj/item/book/manual/anomaly_spectroscopy name = "Spectroscopy: Analysing the Anomalies of the Cosmos" icon_state = "anomaly" item_state = "book6" @@ -211,7 +211,7 @@ "} -/obj/item/weapon/book/manual/materials_chemistry_analysis +/obj/item/book/manual/materials_chemistry_analysis name = "Materials Analysis and the Chemical Implications" icon_state = "chemistry" item_state = "book6" @@ -239,7 +239,7 @@ a new element that defies classification. I defy you to classify it without reviving this once great field! "} -/obj/item/weapon/book/manual/anomaly_testing +/obj/item/book/manual/anomaly_testing name = "Anomalous Materials and Energies" icon_state = "triangulate" item_state = "book6" @@ -318,7 +318,7 @@ "} -/obj/item/weapon/book/manual/stasis +/obj/item/book/manual/stasis name = "Cellular Suspension, the New Cryogenics?" icon_state = "stasis" item_state = "book6" diff --git a/code/modules/xenoarcheaology/misc.dm b/code/modules/xenoarcheaology/misc.dm index 3ef15cbc3c5..b9e0b67c867 100644 --- a/code/modules/xenoarcheaology/misc.dm +++ b/code/modules/xenoarcheaology/misc.dm @@ -3,12 +3,12 @@ /obj/structure/bookcase/manuals/xenoarchaeology/Initialize() . = ..() - new /obj/item/weapon/book/manual/excavation(src) - new /obj/item/weapon/book/manual/mass_spectrometry(src) - new /obj/item/weapon/book/manual/materials_chemistry_analysis(src) - new /obj/item/weapon/book/manual/anomaly_testing(src) - new /obj/item/weapon/book/manual/anomaly_spectroscopy(src) - new /obj/item/weapon/book/manual/stasis(src) + new /obj/item/book/manual/excavation(src) + new /obj/item/book/manual/mass_spectrometry(src) + new /obj/item/book/manual/materials_chemistry_analysis(src) + new /obj/item/book/manual/anomaly_testing(src) + new /obj/item/book/manual/anomaly_spectroscopy(src) + new /obj/item/book/manual/stasis(src) update_icon() /obj/machinery/alarm/isolation diff --git a/code/modules/xenoarcheaology/sampling.dm b/code/modules/xenoarcheaology/sampling.dm index f9fc735f2ef..a1866140d62 100644 --- a/code/modules/xenoarcheaology/sampling.dm +++ b/code/modules/xenoarcheaology/sampling.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/rocksliver +/obj/item/rocksliver name = "rock sliver" desc = "It looks extremely delicate." icon = 'icons/obj/xenoarchaeology.dmi' @@ -8,7 +8,7 @@ sharp = TRUE var/datum/geosample/geological_data -/obj/item/weapon/rocksliver/New() +/obj/item/rocksliver/New() icon_state = "sliver[rand(1, 3)]" randpixel_xy() @@ -80,7 +80,7 @@ else SSxenoarch.artifact_spawning_turfs.Remove(T) -/obj/item/device/core_sampler +/obj/item/core_sampler name = "core sampler" desc = "Used to extract geological core samples." icon = 'icons/obj/device.dmi' @@ -90,15 +90,15 @@ var/sampled_turf = "" var/num_stored_bags = 10 - var/obj/item/weapon/evidencebag/filled_bag + var/obj/item/evidencebag/filled_bag -/obj/item/device/core_sampler/examine(var/mob/user) +/obj/item/core_sampler/examine(var/mob/user) . = ..() if(get_dist(user, src) <= 2) . += "Used to extract geological core samples - this one is [sampled_turf ? "full" : "empty"], and has [num_stored_bags] bag[num_stored_bags != 1 ? "s" : ""] remaining." -/obj/item/device/core_sampler/attackby(var/obj/item/I, var/mob/living/user) - if(istype(I, /obj/item/weapon/evidencebag)) +/obj/item/core_sampler/attackby(var/obj/item/I, var/mob/living/user) + if(istype(I, /obj/item/evidencebag)) if(I.contents.len) to_chat(user, "\The [I] is full.") return @@ -111,15 +111,15 @@ else return ..() -/obj/item/device/core_sampler/proc/sample_item(var/item_to_sample, var/mob/user) +/obj/item/core_sampler/proc/sample_item(var/item_to_sample, var/mob/user) var/datum/geosample/geo_data if(istype(item_to_sample, /turf/simulated/mineral)) var/turf/simulated/mineral/T = item_to_sample T.geologic_data.UpdateNearbyArtifactInfo(T) geo_data = T.geologic_data - else if(istype(item_to_sample, /obj/item/weapon/ore)) - var/obj/item/weapon/ore/O = item_to_sample + else if(istype(item_to_sample, /obj/item/ore)) + var/obj/item/ore/O = item_to_sample geo_data = O.geologic_data if(geo_data) @@ -129,7 +129,7 @@ to_chat(user, "The core sampler is out of sample bags.") else //create a new sample bag which we'll fill with rock samples - filled_bag = new /obj/item/weapon/evidencebag(src) + filled_bag = new /obj/item/evidencebag(src) filled_bag.name = "sample bag" filled_bag.desc = "a bag for holding research samples." @@ -137,7 +137,7 @@ --num_stored_bags //put in a rock sliver - var/obj/item/weapon/rocksliver/R = new(filled_bag) + var/obj/item/rocksliver/R = new(filled_bag) R.geological_data = geo_data //update the sample bag @@ -151,7 +151,7 @@ else to_chat(user, "You are unable to take a sample of [item_to_sample].") -/obj/item/device/core_sampler/attack_self(var/mob/living/user) +/obj/item/core_sampler/attack_self(var/mob/living/user) if(filled_bag) to_chat(user, "You eject the full sample bag.") var/success = 0 diff --git a/code/modules/xenoarcheaology/tools/ano_device_battery.dm b/code/modules/xenoarcheaology/tools/ano_device_battery.dm index ac9fc9b4db1..bacf96e6ab5 100644 --- a/code/modules/xenoarcheaology/tools/ano_device_battery.dm +++ b/code/modules/xenoarcheaology/tools/ano_device_battery.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/anobattery +/obj/item/anobattery name = "Anomaly power battery" icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "anobattery0" @@ -7,24 +7,24 @@ var/stored_charge = 0 var/effect_id = "" -/obj/item/weapon/anobattery/advanced +/obj/item/anobattery/advanced name = "advanced anomaly battery" capacity = 3000 /* -/obj/item/weapon/anobattery/New() +/obj/item/anobattery/New() battery_effect = new() */ -/obj/item/weapon/anobattery/proc/UpdateSprite() +/obj/item/anobattery/proc/UpdateSprite() var/p = (stored_charge/capacity)*100 p = min(p, 100) icon_state = "anobattery[round(p,25)]" -/obj/item/weapon/anobattery/proc/use_power(var/amount) +/obj/item/anobattery/proc/use_power(var/amount) stored_charge = max(0, stored_charge - amount) -/obj/item/weapon/anodevice +/obj/item/anodevice name = "Anomaly power utilizer" icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "anodev" @@ -34,16 +34,16 @@ var/time_end = 0 var/last_activation = 0 var/last_process = 0 - var/obj/item/weapon/anobattery/inserted_battery + var/obj/item/anobattery/inserted_battery var/turf/archived_loc var/energy_consumed_on_touch = 100 -/obj/item/weapon/anodevice/New() +/obj/item/anodevice/New() ..() START_PROCESSING(SSobj, src) -/obj/item/weapon/anodevice/attackby(var/obj/I as obj, var/mob/user as mob) - if(istype(I, /obj/item/weapon/anobattery)) +/obj/item/anodevice/attackby(var/obj/I as obj, var/mob/user as mob) + if(istype(I, /obj/item/anobattery)) if(!inserted_battery) to_chat(user, span_blue("You insert the battery.")) user.drop_item() @@ -53,19 +53,19 @@ else return ..() -/obj/item/weapon/anodevice/attack_self(var/mob/user as mob) +/obj/item/anodevice/attack_self(var/mob/user as mob) return tgui_interact(user) -/obj/item/weapon/anodevice/tgui_state(mob/user) +/obj/item/anodevice/tgui_state(mob/user) return GLOB.tgui_inventory_state -/obj/item/weapon/anodevice/tgui_interact(mob/user, datum/tgui/ui) +/obj/item/anodevice/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "XenoarchHandheldPowerUtilizer", name) ui.open() -/obj/item/weapon/anodevice/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) +/obj/item/anodevice/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = ..() data["inserted_battery"] = inserted_battery @@ -87,7 +87,7 @@ return data -/obj/item/weapon/anodevice/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) +/obj/item/anodevice/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) if(..()) return TRUE @@ -122,7 +122,7 @@ shutdown_emission() return TRUE -/obj/item/weapon/anodevice/process() +/obj/item/anodevice/process() if(activated) if(inserted_battery && inserted_battery.battery_effect && (inserted_battery.stored_charge > 0) ) //make sure the effect is active @@ -185,13 +185,13 @@ shutdown_emission() last_process = world.time -/obj/item/weapon/anodevice/proc/shutdown_emission() +/obj/item/anodevice/proc/shutdown_emission() if(activated) activated = 0 if(inserted_battery?.battery_effect?.activated) inserted_battery.battery_effect.ToggleActivate(1) -/obj/item/weapon/anodevice/proc/UpdateSprite() +/obj/item/anodevice/proc/UpdateSprite() if(!inserted_battery) icon_state = "anodev" return @@ -199,11 +199,11 @@ p = min(p, 100) icon_state = "anodev[round(p,25)]" -/obj/item/weapon/anodevice/Destroy() +/obj/item/anodevice/Destroy() STOP_PROCESSING(SSobj, src) ..() -/obj/item/weapon/anodevice/attack(mob/living/M as mob, mob/living/user as mob, def_zone) +/obj/item/anodevice/attack(mob/living/M as mob, mob/living/user as mob, def_zone) if (!istype(M)) return diff --git a/code/modules/xenoarcheaology/tools/artifact_analyser.dm b/code/modules/xenoarcheaology/tools/artifact_analyser.dm index 41d4ad1bc20..1078ea96c1b 100644 --- a/code/modules/xenoarcheaology/tools/artifact_analyser.dm +++ b/code/modules/xenoarcheaology/tools/artifact_analyser.dm @@ -121,12 +121,12 @@ results = get_scan_info(scanned_object) atom_say("Scanning complete.") - var/obj/item/weapon/paper/P = new(src.loc) + var/obj/item/paper/P = new(src.loc) P.name = "[src] report #[++report_num]" P.info = "[src] analysis report #[report_num]
" P.info += "
" P.info += "[bicon(scanned_object)] [results]" - P.stamped = list(/obj/item/weapon/stamp) + P.stamped = list(/obj/item/stamp) P.add_overlay("paper_stamped") if(scanned_object && istype(scanned_object, /obj/machinery/artifact)) diff --git a/code/modules/xenoarcheaology/tools/artifact_harvester.dm b/code/modules/xenoarcheaology/tools/artifact_harvester.dm index 136a748df18..a0a83b5f3f0 100644 --- a/code/modules/xenoarcheaology/tools/artifact_harvester.dm +++ b/code/modules/xenoarcheaology/tools/artifact_harvester.dm @@ -8,7 +8,7 @@ active_power_usage = 750 use_power = USE_POWER_IDLE var/harvesting = 0 - var/obj/item/weapon/anobattery/inserted_battery + var/obj/item/anobattery/inserted_battery var/obj/machinery/artifact/cur_artifact var/obj/machinery/artifact_scanpad/owned_scanner = null var/last_process = 0 @@ -20,7 +20,7 @@ owned_scanner = locate(/obj/machinery/artifact_scanpad) in orange(1, src) /obj/machinery/artifact_harvester/attackby(var/obj/I as obj, var/mob/user as mob) - if(istype(I,/obj/item/weapon/anobattery)) + if(istype(I,/obj/item/anobattery)) if(!inserted_battery) to_chat(user, span_blue("You insert [I] into [src].")) user.drop_item() diff --git a/code/modules/xenoarcheaology/tools/equipment.dm b/code/modules/xenoarcheaology/tools/equipment.dm index cd4a3278f2f..901f41570e5 100644 --- a/code/modules/xenoarcheaology/tools/equipment.dm +++ b/code/modules/xenoarcheaology/tools/equipment.dm @@ -23,7 +23,7 @@ icon_state = "cespace_suit" item_state = "cespace_suit" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100) - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/pickaxe) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/pickaxe) slowdown = 1 // Pressure protection inherited from space suits diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm index 6f0589a7811..10cb0b71371 100644 --- a/code/modules/xenoarcheaology/tools/geosample_scanner.dm +++ b/code/modules/xenoarcheaology/tools/geosample_scanner.dm @@ -10,7 +10,7 @@ idle_power_usage = 20 active_power_usage = 300 - //var/obj/item/weapon/reagent_containers/glass/coolant_container + //var/obj/item/reagent_containers/glass/coolant_container var/scanning = 0 var/report_num = 0 // @@ -73,8 +73,8 @@ N.use(amount_used) scanner_seal_integrity = round(scanner_seal_integrity + amount_used * 10) return - if(istype(I, /obj/item/weapon/reagent_containers/glass)) - var/obj/item/weapon/reagent_containers/glass/G = I + if(istype(I, /obj/item/reagent_containers/glass)) + var/obj/item/reagent_containers/glass/G = I if(!G.is_open_container()) return var/choice = tgui_alert(usr, "What do you want to do with the container?","Radiometric Scanner",list("Add coolant","Empty coolant","Scan container")) @@ -304,29 +304,29 @@ if(scanned_item) //create report - var/obj/item/weapon/paper/P = new(src) + var/obj/item/paper/P = new(src) P.name = "[src] report #[++report_num]: [scanned_item.name]" - P.stamped = list(/obj/item/weapon/stamp) + P.stamped = list(/obj/item/stamp) P.add_overlay("paper_stamped") //work out data var/data = " - Mundane object: [scanned_item.desc ? scanned_item.desc : "No information on record."]
" var/datum/geosample/G switch(scanned_item.type) - if(/obj/item/weapon/ore) - var/obj/item/weapon/ore/O = scanned_item + if(/obj/item/ore) + var/obj/item/ore/O = scanned_item if(O.geologic_data) G = O.geologic_data - if(/obj/item/weapon/rocksliver) - var/obj/item/weapon/rocksliver/O = scanned_item + if(/obj/item/rocksliver) + var/obj/item/rocksliver/O = scanned_item if(O.geological_data) G = O.geological_data - if(/obj/item/weapon/archaeological_find) + if(/obj/item/archaeological_find) data = " - Mundane object (archaic xenos origins)
" - var/obj/item/weapon/archaeological_find/A = scanned_item + var/obj/item/archaeological_find/A = scanned_item if(A.talking_atom) data = " - Exhibits properties consistent with sonic reproduction and audio capture technologies.
" diff --git a/code/modules/xenoarcheaology/tools/suspension_generator.dm b/code/modules/xenoarcheaology/tools/suspension_generator.dm index b420435bb3f..4720360905d 100644 --- a/code/modules/xenoarcheaology/tools/suspension_generator.dm +++ b/code/modules/xenoarcheaology/tools/suspension_generator.dm @@ -5,15 +5,15 @@ icon_state = "suspension" density = 1 req_access = list(access_research) - var/obj/item/weapon/cell/cell - var/obj/item/weapon/card/id/auth_card + var/obj/item/cell/cell + var/obj/item/card/id/auth_card var/locked = 1 var/power_use = 5 var/obj/effect/suspension_field/suspension_field /obj/machinery/suspension_gen/Initialize() . = ..() - cell = new /obj/item/weapon/cell/high(src) + cell = new /obj/item/cell/high(src) /obj/machinery/suspension_gen/process() if(suspension_field) @@ -109,7 +109,7 @@ update_icon() else to_chat(user, "You are unable to secure [src] while it is active!") - else if (istype(W, /obj/item/weapon/cell)) + else if (istype(W, /obj/item/cell)) if(panel_open) if(cell) to_chat(user, "There is a power cell already installed.") @@ -119,8 +119,8 @@ cell = W to_chat(user, "You insert the power cell.") icon_state = "suspension" - else if(istype(W, /obj/item/weapon/card)) - var/obj/item/weapon/card/I = W + else if(istype(W, /obj/item/card)) + var/obj/item/card/I = W if(!auth_card) if(attempt_unlock(I, user)) to_chat(user, "You swipe [I], the console flashes \'Access granted.\'") @@ -129,11 +129,11 @@ else to_chat(user, "Remove [auth_card] first.") -/obj/machinery/suspension_gen/proc/attempt_unlock(var/obj/item/weapon/card/C, var/mob/user) +/obj/machinery/suspension_gen/proc/attempt_unlock(var/obj/item/card/C, var/mob/user) if(!panel_open) - if(istype(C, /obj/item/weapon/card/emag)) + if(istype(C, /obj/item/card/emag)) C.resolve_attackby(src, user) - else if(istype(C, /obj/item/weapon/card/id) && check_access(C)) + else if(istype(C, /obj/item/card/id) && check_access(C)) locked = 0 if(!locked) return 1 @@ -158,7 +158,7 @@ playsound(loc, 'sound/machines/quiet_beep.ogg', 40) update_icon() - for(var/obj/item/weapon/I in T) + for(var/obj/item/I in T) I.loc = suspension_field collected++ diff --git a/code/modules/xenoarcheaology/tools/tools.dm b/code/modules/xenoarcheaology/tools/tools.dm index ee145433a77..30a01eedb85 100644 --- a/code/modules/xenoarcheaology/tools/tools.dm +++ b/code/modules/xenoarcheaology/tools/tools.dm @@ -1,4 +1,4 @@ -/obj/item/device/measuring_tape +/obj/item/measuring_tape name = "measuring tape" desc = "A coiled metallic tape used to check dimensions and lengths." icon = 'icons/obj/xenoarchaeology.dmi' @@ -7,7 +7,7 @@ matter = list(MAT_STEEL = 100) w_class = ITEMSIZE_SMALL -/obj/item/weapon/storage/bag/fossils +/obj/item/storage/bag/fossils name = "Fossil Satchel" desc = "Transports delicate fossils in suspension so they don't break during transit." icon = 'icons/obj/mining.dmi' @@ -17,20 +17,20 @@ storage_slots = 50 max_storage_space = ITEMSIZE_COST_NORMAL * 50 max_w_class = ITEMSIZE_NORMAL - can_hold = list(/obj/item/weapon/fossil) + can_hold = list(/obj/item/fossil) -/obj/item/weapon/storage/box/samplebags +/obj/item/storage/box/samplebags name = "sample bag box" desc = "A box claiming to contain sample bags." -/obj/item/weapon/storage/box/samplebags/New() +/obj/item/storage/box/samplebags/New() ..() for(var/i = 1 to 7) - var/obj/item/weapon/evidencebag/S = new(src) + var/obj/item/evidencebag/S = new(src) S.name = "sample bag" S.desc = "a bag for holding research samples." -/obj/item/device/ano_scanner +/obj/item/ano_scanner name = "Alden-Saraspova counter" desc = "Aids in triangulation of exotic particles." icon = 'icons/obj/xenoarchaeology.dmi' @@ -44,10 +44,10 @@ var/last_scan_time = 0 var/scan_delay = 25 -/obj/item/device/ano_scanner/attack_self(var/mob/living/user) +/obj/item/ano_scanner/attack_self(var/mob/living/user) interact(user) -/obj/item/device/ano_scanner/interact(var/mob/living/user) +/obj/item/ano_scanner/interact(var/mob/living/user) if(world.time - last_scan_time >= scan_delay) last_scan_time = world.time @@ -86,7 +86,7 @@ else to_chat(user, "Scanning array is recharging.") -/obj/item/device/depth_scanner +/obj/item/depth_scanner name = "depth analysis scanner" desc = "Used to check spatial depth and density of rock outcroppings." icon = 'icons/obj/xenoarchaeology.dmi' @@ -108,7 +108,7 @@ var/dissonance_spread = 1 var/material = "unknown" -/obj/item/device/depth_scanner/proc/scan_atom(var/mob/user, var/atom/A) +/obj/item/depth_scanner/proc/scan_atom(var/mob/user, var/atom/A) user.visible_message("\The [user] scans \the [A], the air around them humming gently.") if(istype(A, /turf/simulated/mineral)) @@ -151,19 +151,19 @@ to_chat(user, "[icon2html(src, user.client)] [src] pings [pick("madly","wildly","excitedly","crazily")]!") -/obj/item/device/depth_scanner/attack_self(var/mob/living/user) +/obj/item/depth_scanner/attack_self(var/mob/living/user) tgui_interact(user) -/obj/item/device/depth_scanner/tgui_state(mob/user) +/obj/item/depth_scanner/tgui_state(mob/user) return GLOB.tgui_deep_inventory_state -/obj/item/device/depth_scanner/tgui_interact(mob/user, datum/tgui/ui) +/obj/item/depth_scanner/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "XenoarchDepthScanner", name) ui.open() -/obj/item/device/depth_scanner/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) +/obj/item/depth_scanner/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = ..() data["current"] = list() @@ -193,7 +193,7 @@ return data -/obj/item/device/depth_scanner/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) +/obj/item/depth_scanner/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) if(..()) return TRUE @@ -217,7 +217,7 @@ QDEL_NULL(current) return TRUE -/obj/item/device/beacon_locator +/obj/item/beacon_locator name = "locater device" desc = "Used to scan and locate signals on a particular frequency." icon = 'icons/obj/device.dmi' @@ -227,17 +227,17 @@ matter = list(MAT_STEEL = 1000,MAT_GLASS = 500) var/frequency = PUB_FREQ var/scan_ticks = 0 - var/obj/item/device/radio/target_radio + var/obj/item/radio/target_radio -/obj/item/device/beacon_locator/New() +/obj/item/beacon_locator/New() ..() START_PROCESSING(SSobj, src) -/obj/item/device/beacon_locator/Destroy() +/obj/item/beacon_locator/Destroy() STOP_PROCESSING(SSobj, src) ..() -/obj/item/device/beacon_locator/process() +/obj/item/beacon_locator/process() if(target_radio) set_dir(get_dir(src,target_radio)) switch(get_dist(src,target_radio)) @@ -259,7 +259,7 @@ if(datum_flags & DF_ISPROCESSING) //scan radios in the world to try and find one var/cur_dist = 999 - for(var/obj/item/device/radio/beacon/R in all_beacons) + for(var/obj/item/radio/beacon/R in all_beacons) if(R.z == src.z && R.frequency == src.frequency) var/check_dist = get_dist(src,R) if(check_dist < cur_dist) @@ -275,19 +275,19 @@ else icon_state = "pinoff" -/obj/item/device/beacon_locator/attack_self(mob/user) +/obj/item/beacon_locator/attack_self(mob/user) return tgui_interact(user) -/obj/item/device/beacon_locator/tgui_state(mob/user) +/obj/item/beacon_locator/tgui_state(mob/user) return GLOB.tgui_inventory_state -/obj/item/device/beacon_locator/tgui_interact(mob/user, datum/tgui/ui) +/obj/item/beacon_locator/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "BeaconLocator", name) ui.open() -/obj/item/device/beacon_locator/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) +/obj/item/beacon_locator/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = ..() data["scan_ticks"] = scan_ticks @@ -301,7 +301,7 @@ return data -/obj/item/device/beacon_locator/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) +/obj/item/beacon_locator/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) if(..()) return TRUE @@ -316,7 +316,7 @@ frequency = new_frequency return TRUE -/obj/item/device/xenoarch_multi_tool +/obj/item/xenoarch_multi_tool name = "xenoarcheology multitool" desc = "Has the features of the Alden-Saraspova counter, a measuring tape, and a depth analysis scanner all in one!" icon_state = "ano_scanner2" @@ -327,17 +327,17 @@ w_class = ITEMSIZE_SMALL slot_flags = SLOT_BELT var/mode = 1 //Start off scanning. 1 = scanning, 0 = measuring - var/obj/item/device/ano_scanner/anomaly_scanner = null - var/obj/item/device/depth_scanner/depth_scanner = null + var/obj/item/ano_scanner/anomaly_scanner = null + var/obj/item/depth_scanner/depth_scanner = null -/obj/item/device/xenoarch_multi_tool/New() - anomaly_scanner = new/obj/item/device/ano_scanner(src) - depth_scanner = new/obj/item/device/depth_scanner(src) +/obj/item/xenoarch_multi_tool/New() + anomaly_scanner = new/obj/item/ano_scanner(src) + depth_scanner = new/obj/item/depth_scanner(src) -/obj/item/device/xenoarch_multi_tool/attack_self(var/mob/living/user) +/obj/item/xenoarch_multi_tool/attack_self(var/mob/living/user) depth_scanner.tgui_interact(user) -/obj/item/device/xenoarch_multi_tool/verb/swap_settings() +/obj/item/xenoarch_multi_tool/verb/swap_settings() var/mob/living/user = usr set name = "Swap Functionality" set desc = "Swap between the scanning and measuring functionality.." @@ -347,7 +347,7 @@ else to_chat(user, "The device will now measure depth dug.") -/obj/item/device/xenoarch_multi_tool/verb/scan_for_anomalies() +/obj/item/xenoarch_multi_tool/verb/scan_for_anomalies() var/mob/living/user = usr set name = "Scan for Anomalies" set desc = "Scan for artifacts and anomalies within your vicinity." diff --git a/code/modules/xenoarcheaology/tools/tools_pickaxe.dm b/code/modules/xenoarcheaology/tools/tools_pickaxe.dm index c7015c2c292..31a2a074282 100644 --- a/code/modules/xenoarcheaology/tools/tools_pickaxe.dm +++ b/code/modules/xenoarcheaology/tools/tools_pickaxe.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/pickaxe/brush +/obj/item/pickaxe/brush name = "brush" icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pick_brush" @@ -13,7 +13,7 @@ drill_verb = "brushing" w_class = ITEMSIZE_SMALL -/obj/item/weapon/pickaxe/one_pick +/obj/item/pickaxe/one_pick name = "2cm pick" icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pick1" @@ -26,7 +26,7 @@ drill_verb = "delicately picking" w_class = ITEMSIZE_SMALL -/obj/item/weapon/pickaxe/two_pick +/obj/item/pickaxe/two_pick name = "4cm pick" icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pick2" @@ -39,7 +39,7 @@ drill_verb = "delicately picking" w_class = ITEMSIZE_SMALL -/obj/item/weapon/pickaxe/three_pick +/obj/item/pickaxe/three_pick name = "6cm pick" icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pick3" @@ -52,7 +52,7 @@ drill_verb = "delicately picking" w_class = ITEMSIZE_SMALL -/obj/item/weapon/pickaxe/four_pick +/obj/item/pickaxe/four_pick name = "8cm pick" icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pick4" @@ -65,7 +65,7 @@ drill_verb = "delicately picking" w_class = ITEMSIZE_SMALL -/obj/item/weapon/pickaxe/five_pick +/obj/item/pickaxe/five_pick name = "10cm pick" icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pick5" @@ -78,7 +78,7 @@ drill_verb = "delicately picking" w_class = ITEMSIZE_SMALL -/obj/item/weapon/pickaxe/six_pick +/obj/item/pickaxe/six_pick name = "12cm pick" icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pick6" @@ -91,7 +91,7 @@ drill_verb = "delicately picking" w_class = ITEMSIZE_SMALL -/obj/item/weapon/pickaxe/hand +/obj/item/pickaxe/hand name = "hand pickaxe" icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pick_hand" @@ -107,7 +107,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Pack for holding pickaxes -/obj/item/weapon/storage/excavation +/obj/item/storage/excavation name = "excavation pick set" icon = 'icons/obj/storage.dmi' icon_state = "excavation" @@ -115,51 +115,51 @@ item_state = "syringe_kit" storage_slots = 7 w_class = ITEMSIZE_SMALL - can_hold = list(/obj/item/weapon/pickaxe/brush, - /obj/item/weapon/pickaxe/one_pick, - /obj/item/weapon/pickaxe/two_pick, - /obj/item/weapon/pickaxe/three_pick, - /obj/item/weapon/pickaxe/four_pick, - /obj/item/weapon/pickaxe/five_pick, - /obj/item/weapon/pickaxe/six_pick, - /obj/item/weapon/pickaxe/hand) + can_hold = list(/obj/item/pickaxe/brush, + /obj/item/pickaxe/one_pick, + /obj/item/pickaxe/two_pick, + /obj/item/pickaxe/three_pick, + /obj/item/pickaxe/four_pick, + /obj/item/pickaxe/five_pick, + /obj/item/pickaxe/six_pick, + /obj/item/pickaxe/hand) max_storage_space = ITEMSIZE_COST_SMALL * 9 max_w_class = ITEMSIZE_SMALL use_to_pickup = TRUE -/obj/item/weapon/storage/excavation/New() +/obj/item/storage/excavation/New() ..() - new /obj/item/weapon/pickaxe/brush(src) - new /obj/item/weapon/pickaxe/one_pick(src) - new /obj/item/weapon/pickaxe/two_pick(src) - new /obj/item/weapon/pickaxe/three_pick(src) - new /obj/item/weapon/pickaxe/four_pick(src) - new /obj/item/weapon/pickaxe/five_pick(src) - new /obj/item/weapon/pickaxe/six_pick(src) + new /obj/item/pickaxe/brush(src) + new /obj/item/pickaxe/one_pick(src) + new /obj/item/pickaxe/two_pick(src) + new /obj/item/pickaxe/three_pick(src) + new /obj/item/pickaxe/four_pick(src) + new /obj/item/pickaxe/five_pick(src) + new /obj/item/pickaxe/six_pick(src) -/obj/item/weapon/storage/excavation/handle_item_insertion() +/obj/item/storage/excavation/handle_item_insertion() ..() sort_picks() -/obj/item/weapon/storage/excavation/proc/sort_picks() - var/list/obj/item/weapon/pickaxe/picksToSort = list() - for(var/obj/item/weapon/pickaxe/P in src) +/obj/item/storage/excavation/proc/sort_picks() + var/list/obj/item/pickaxe/picksToSort = list() + for(var/obj/item/pickaxe/P in src) picksToSort += P P.loc = null while(picksToSort.len) var/min = 200 // No pick is bigger than 200 var/selected = 0 for(var/i = 1 to picksToSort.len) - var/obj/item/weapon/pickaxe/current = picksToSort[i] + var/obj/item/pickaxe/current = picksToSort[i] if(current.excavation_amount <= min) selected = i min = current.excavation_amount - var/obj/item/weapon/pickaxe/smallest = picksToSort[selected] + var/obj/item/pickaxe/smallest = picksToSort[selected] smallest.loc = src picksToSort -= smallest orient2hud() -/obj/item/weapon/pickaxe/excavationdrill +/obj/item/pickaxe/excavationdrill name = "excavation drill" icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "excavationdrill2" @@ -173,7 +173,7 @@ w_class = 2 attack_verb = list("drilled") -/obj/item/weapon/pickaxe/excavationdrill/attack_self(mob/user as mob) +/obj/item/pickaxe/excavationdrill/attack_self(mob/user as mob) var/depth = tgui_input_number(usr, "Put the desired depth (1-30 centimeters).", "Set Depth", 30, 30, 1) if(depth>30 || depth<1) to_chat(user, "Invalid depth.") @@ -194,6 +194,6 @@ if(25 to 30) icon_state = "excavationdrill5" //The other 2 sprites are comically long. Let's just cut it at 5. -/obj/item/weapon/pickaxe/excavationdrill/examine(mob/user) +/obj/item/pickaxe/excavationdrill/examine(mob/user) . = ..() . += "It is currently set at [excavation_amount]cms." diff --git a/code/modules/xenoarcheaology/tools/tools_pickaxe_vr.dm b/code/modules/xenoarcheaology/tools/tools_pickaxe_vr.dm index 3a1ff22b1cd..5c00caca1ac 100644 --- a/code/modules/xenoarcheaology/tools/tools_pickaxe_vr.dm +++ b/code/modules/xenoarcheaology/tools/tools_pickaxe_vr.dm @@ -1,23 +1,23 @@ -/obj/item/weapon/pickaxe/brush +/obj/item/pickaxe/brush icon = 'icons/obj/xenoarchaeology_vr.dmi' -/obj/item/weapon/pickaxe/one_pick +/obj/item/pickaxe/one_pick icon = 'icons/obj/xenoarchaeology_vr.dmi' -/obj/item/weapon/pickaxe/two_pick +/obj/item/pickaxe/two_pick icon = 'icons/obj/xenoarchaeology_vr.dmi' -/obj/item/weapon/pickaxe/three_pick +/obj/item/pickaxe/three_pick icon = 'icons/obj/xenoarchaeology_vr.dmi' -/obj/item/weapon/pickaxe/four_pick +/obj/item/pickaxe/four_pick icon = 'icons/obj/xenoarchaeology_vr.dmi' -/obj/item/weapon/pickaxe/five_pick +/obj/item/pickaxe/five_pick icon = 'icons/obj/xenoarchaeology_vr.dmi' -/obj/item/weapon/pickaxe/six_pick +/obj/item/pickaxe/six_pick icon = 'icons/obj/xenoarchaeology_vr.dmi' -/obj/item/weapon/pickaxe/hand +/obj/item/pickaxe/hand icon = 'icons/obj/xenoarchaeology_vr.dmi' diff --git a/code/modules/xenoarcheaology/tools/tools_vr.dm b/code/modules/xenoarcheaology/tools/tools_vr.dm index e9802991e43..405ef3ec8bd 100644 --- a/code/modules/xenoarcheaology/tools/tools_vr.dm +++ b/code/modules/xenoarcheaology/tools/tools_vr.dm @@ -1,5 +1,5 @@ //Unused file due to icon update upstream. -/obj/item/device/depth_scanner //On second thought, the ano_scanner sprite looks better as a depth scanner instead of an anomaly scanner. +/obj/item/depth_scanner //On second thought, the ano_scanner sprite looks better as a depth scanner instead of an anomaly scanner. icon_state = "ano_scanner" icon = 'icons/obj/xenoarchaeology_vr.dmi' diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm index 3ad6f852c70..1bfc5fce39a 100644 --- a/code/modules/xenobio/items/extracts.dm +++ b/code/modules/xenobio/items/extracts.dm @@ -92,7 +92,7 @@ /decl/chemical_reaction/instant/slime/grey_monkey/on_reaction(var/datum/reagents/holder) for(var/i = 1 to 4) - new /obj/item/weapon/reagent_containers/food/snacks/monkeycube(get_turf(holder.my_atom)) + new /obj/item/reagent_containers/food/snacks/monkeycube(get_turf(holder.my_atom)) ..() /decl/chemical_reaction/instant/slime/grey_slimejelly @@ -138,7 +138,7 @@ result_amount = REAGENTS_PER_SHEET * 2 -/obj/item/weapon/reagent_containers/glass/bottle/metamorphic +/obj/item/reagent_containers/glass/bottle/metamorphic name = "Metamorphic Metal Bottle" desc = "A small bottle. Contains some really weird liquid metal." icon = 'icons/obj/chemical.dmi' @@ -209,7 +209,7 @@ color = "#666666" strength = 20 -/obj/item/weapon/reagent_containers/glass/bottle/binding +/obj/item/reagent_containers/glass/bottle/binding name = "Binding Metal Bottle" desc = "A small bottle. Contains some really weird liquid metal." icon = 'icons/obj/chemical.dmi' @@ -378,7 +378,7 @@ required = /obj/item/slime_extract/yellow /decl/chemical_reaction/instant/slime/yellow_battery/on_reaction(var/datum/reagents/holder) - new /obj/item/weapon/cell/slime(get_turf(holder.my_atom)) + new /obj/item/cell/slime(get_turf(holder.my_atom)) ..() @@ -390,7 +390,7 @@ required = /obj/item/slime_extract/yellow /decl/chemical_reaction/instant/slime/yellow_flashlight/on_reaction(var/datum/reagents/holder) - new /obj/item/device/flashlight/slime(get_turf(holder.my_atom)) + new /obj/item/flashlight/slime(get_turf(holder.my_atom)) ..() // *************** @@ -740,7 +740,7 @@ required = /obj/item/slime_extract/bluespace /decl/chemical_reaction/instant/slime/bluespace_greater/on_reaction(var/datum/reagents/holder) - new /obj/item/weapon/disposable_teleporter/slime(get_turf(holder.my_atom)) + new /obj/item/disposable_teleporter/slime(get_turf(holder.my_atom)) ..() // ******************* @@ -796,7 +796,7 @@ required = /obj/item/slime_extract/amber /decl/chemical_reaction/instant/slime/amber_peoplefood/on_reaction(var/datum/reagents/holder) - new /obj/item/weapon/reagent_containers/food/snacks/slime(get_turf(holder.my_atom)) + new /obj/item/reagent_containers/food/snacks/slime(get_turf(holder.my_atom)) ..() diff --git a/code/modules/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm index 1866e879f87..bac8ef3e1a6 100644 --- a/code/modules/xenobio/items/extracts_vr.dm +++ b/code/modules/xenobio/items/extracts_vr.dm @@ -100,7 +100,7 @@ /decl/chemical_reaction/instant/slime/grey_monkey/on_reaction(var/datum/reagents/holder) for(var/i = 1 to 4) - new /obj/item/weapon/reagent_containers/food/snacks/monkeycube(get_turf(holder.my_atom)) + new /obj/item/reagent_containers/food/snacks/monkeycube(get_turf(holder.my_atom)) ..() @@ -470,7 +470,7 @@ required = /obj/item/slime_extract/yellow /decl/chemical_reaction/instant/slime/yellow_flashlight/on_reaction(var/datum/reagents/holder) - new /obj/item/device/flashlight/slime(get_turf(holder.my_atom)) + new /obj/item/flashlight/slime(get_turf(holder.my_atom)) ..() @@ -500,7 +500,7 @@ required = /obj/item/slime_extract/yellow /decl/chemical_reaction/instant/slime/yellow_battery/on_reaction(var/datum/reagents/holder) - new /obj/item/weapon/cell/slime(get_turf(holder.my_atom)) + new /obj/item/cell/slime(get_turf(holder.my_atom)) ..() // *************** @@ -1119,7 +1119,7 @@ required = /obj/item/slime_extract/bluespace /decl/chemical_reaction/instant/slime/bluespace_pouch/on_reaction(var/datum/reagents/holder) - new /obj/item/weapon/storage/backpack/holding/slime(get_turf(holder.my_atom)) + new /obj/item/storage/backpack/holding/slime(get_turf(holder.my_atom)) ..() @@ -1156,7 +1156,7 @@ required = /obj/item/slime_extract/bluespace /decl/chemical_reaction/instant/slime/bluespace_teleporter/on_reaction(var/datum/reagents/holder) - new /obj/item/weapon/disposable_teleporter/slime(get_turf(holder.my_atom)) + new /obj/item/disposable_teleporter/slime(get_turf(holder.my_atom)) ..() // ******************* @@ -1252,7 +1252,7 @@ required = /obj/item/slime_extract/amber /decl/chemical_reaction/instant/slime/amber_random_food/on_reaction(var/datum/reagents/holder) - var/list/edibles = subtypesof(/obj/item/weapon/reagent_containers/food/snacks) + var/list/edibles = subtypesof(/obj/item/reagent_containers/food/snacks) playsound(holder.my_atom, 'sound/effects/phasein.ogg', 100, 1) @@ -1276,7 +1276,7 @@ /decl/chemical_reaction/instant/slime/amber_snack/on_reaction(var/datum/reagents/holder) for(var/i = 1 to rand(3, 5)) - new /obj/item/weapon/reagent_containers/food/snacks/slime(get_turf(holder.my_atom)) + new /obj/item/reagent_containers/food/snacks/slime(get_turf(holder.my_atom)) ..() diff --git a/code/modules/xenobio/items/slime_objects.dm b/code/modules/xenobio/items/slime_objects.dm index ead745e9767..0bc97244006 100644 --- a/code/modules/xenobio/items/slime_objects.dm +++ b/code/modules/xenobio/items/slime_objects.dm @@ -101,7 +101,7 @@ qdel(src) -/obj/item/weapon/disposable_teleporter/slime +/obj/item/disposable_teleporter/slime name = "greater slime crystal" desc = "A larger, gooier crystal." description_info = "This will teleport you to a specific area once, when used in-hand." @@ -113,7 +113,7 @@ // Very filling food. -/obj/item/weapon/reagent_containers/food/snacks/slime +/obj/item/reagent_containers/food/snacks/slime name = "slimy clump" desc = "A glob of slime that is thick as honey. For the brave " + JOB_XENOBIOLOGIST + "." icon_state = "honeycomb" @@ -122,14 +122,14 @@ nutriment_amt = 25 // Very filling. nutriment_desc = list("slime" = 10, "sweetness" = 10, "bliss" = 5) -/obj/item/weapon/reagent_containers/food/snacks/slime/Initialize() +/obj/item/reagent_containers/food/snacks/slime/Initialize() . = ..() bitesize = 5 //Flashlight -/obj/item/device/flashlight/slime +/obj/item/flashlight/slime gender = PLURAL name = "glowing slime extract" desc = "A slimy ball that appears to be glowing from bioluminesence." @@ -142,14 +142,14 @@ on = 1 //Bio-luminesence has one setting, on. power_use = 0 -/obj/item/device/flashlight/slime/New() +/obj/item/flashlight/slime/New() ..() set_light(light_range, light_power, light_color) -/obj/item/device/flashlight/slime/update_brightness() +/obj/item/flashlight/slime/update_brightness() return -/obj/item/device/flashlight/slime/attack_self(mob/user) +/obj/item/flashlight/slime/attack_self(mob/user) return //Bio-luminescence does not toggle. @@ -179,7 +179,7 @@ //BS Pouch -/obj/item/weapon/storage/backpack/holding/slime +/obj/item/storage/backpack/holding/slime name = "bluespace slime pouch" desc = "A slimy pouch that opens into a localized pocket of bluespace." icon_state = "slimepouch" diff --git a/code/modules/xenobio/items/weapons.dm b/code/modules/xenobio/items/weapons.dm index 1a25eab2efc..cbfab6d0c41 100644 --- a/code/modules/xenobio/items/weapons.dm +++ b/code/modules/xenobio/items/weapons.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/melee/baton/slime +/obj/item/melee/baton/slime name = "slimebaton" desc = "A modified stun baton designed to stun slimes and other lesser slimy xeno lifeforms for handling." icon_state = "slimebaton" @@ -11,7 +11,7 @@ hitcost = 48 //Less zap for less cost description_info = "This baton will stun a slime or other slime-based lifeform for about five seconds, if hit with it while on." -/obj/item/weapon/melee/baton/slime/attack(mob/living/L, mob/user, hit_zone) +/obj/item/melee/baton/slime/attack(mob/living/L, mob/user, hit_zone) if(istype(L) && status) // Is it on? if(L.mob_class & MOB_CLASS_SLIME) // Are they some kind of slime? (Prommies might pass this check someday). if(isslime(L)) @@ -28,18 +28,18 @@ H.apply_damage(agony_to_apply, HALLOSS) ..() -/obj/item/weapon/melee/baton/slime/loaded/Initialize() - bcell = new/obj/item/weapon/cell/device(src) +/obj/item/melee/baton/slime/loaded/Initialize() + bcell = new/obj/item/cell/device(src) update_icon() return ..() // Research borg's version -/obj/item/weapon/melee/baton/slime/robot +/obj/item/melee/baton/slime/robot hitcost = 200 use_external_power = TRUE // Xeno stun gun + projectile -/obj/item/weapon/gun/energy/taser/xeno +/obj/item/gun/energy/taser/xeno name = "xeno taser gun" desc = "Straight out of NT's testing laboratories, this small gun is used to subdue non-humanoid xeno life forms. \ While marketed towards handling slimes, it may be useful for other creatures." @@ -53,13 +53,13 @@ it's core components swaped out for a new design made to subdue lesser slime-based xeno lifeforms at a distance. It is \ ineffective at stunning non-slimy lifeforms such as humanoids." -/obj/item/weapon/gun/energy/taser/xeno/robot // Borg version +/obj/item/gun/energy/taser/xeno/robot // Borg version self_recharge = 1 use_external_power = 1 recharge_time = 3 /* VORESTATION REMOVAL -/obj/item/weapon/gun/energy/taser/xeno/sec //NT's corner-cutting option for their on-station security. +/obj/item/gun/energy/taser/xeno/sec //NT's corner-cutting option for their on-station security. desc = "An NT Mk30 NL retrofitted to fire beams for subduing non-humanoid slimy xeno life forms." icon_state = "taserblue" item_state = "taser" @@ -68,7 +68,7 @@ VORESTATION REMOVAL accuracy = 0 //Same accuracy as a normal Sec taser. description_fluff = "An NT Mk30 NL retrofitted after the events that occurred aboard the NRS Prometheus." -/obj/item/weapon/gun/energy/taser/xeno/sec/robot //Cyborg variant of the security xeno-taser. +/obj/item/gun/energy/taser/xeno/sec/robot //Cyborg variant of the security xeno-taser. self_recharge = 1 use_external_power = 1 recharge_time = 3 diff --git a/code/modules/xenobio/items/weapons_vr.dm b/code/modules/xenobio/items/weapons_vr.dm index 24a91715a4c..5debc9bd27e 100644 --- a/code/modules/xenobio/items/weapons_vr.dm +++ b/code/modules/xenobio/items/weapons_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/xenobio +/obj/item/xenobio name = "xenobio gun" desc = "You shouldn't see this!" icon = 'icons/obj/gun_vr.dmi' @@ -7,14 +7,14 @@ var/loaded_item = null var/loadable_name = null var/firable = TRUE -/obj/item/weapon/xenobio/examine(var/mob/user) +/obj/item/xenobio/examine(var/mob/user) . = ..() if(loaded_item) .+= "A [loaded_item] is slotted into the side." else .+= "There appears to be an empty slot for attaching a [loadable_name]." -/obj/item/weapon/xenobio/attack_hand(mob/user as mob) +/obj/item/xenobio/attack_hand(mob/user as mob) if(user.get_inactive_hand() == src && loaded_item) user.put_in_hands(loaded_item) user.visible_message("[user] removes [loaded_item] from [src].", "You remove [loaded_item] from [src].") @@ -23,12 +23,12 @@ else return ..() -/obj/item/weapon/xenobio/attackby(obj/item/I as obj, mob/user as mob) +/obj/item/xenobio/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, loadable_item)) if(loaded_item) to_chat(user, "[I] doesn't seem to fit into [src].") return - //var/obj/item/weapon/reagent_containers/glass/beaker/B = I + //var/obj/item/reagent_containers/glass/beaker/B = I user.drop_item() I.loc = src loaded_item = I @@ -36,14 +36,14 @@ return 1 ..() -/obj/item/weapon/xenobio/attack_self(mob/living/user as mob) +/obj/item/xenobio/attack_self(mob/living/user as mob) if(loaded_item) user.put_in_hands(loaded_item) user.visible_message("[user] removes [loaded_item] from [src].", "You remove [loaded_item] from [src].") loaded_item = null playsound(src, 'sound/weapons/empty.ogg', 50, 1) -/obj/item/weapon/xenobio/afterattack(atom/A, mob/user as mob) +/obj/item/xenobio/afterattack(atom/A, mob/user as mob) if(!loaded_item) to_chat(user,"\The [src] shot fizzles, it appears you need to load something!") //playsound(src, 'sound/weapons/wave.ogg', 60, 1) @@ -63,15 +63,15 @@ s.set_up(4, 1, user) s.start() -/obj/item/weapon/xenobio/monkey_gun +/obj/item/xenobio/monkey_gun name = "Bluespace Cube Rehydrator" desc = "Based on the technology of the 'Bluespace Harpoon' this device can teleport a loaded cube to a given target and rehydrate it." - loadable_item = /obj/item/weapon/reagent_containers/food/snacks/monkeycube + loadable_item = /obj/item/reagent_containers/food/snacks/monkeycube loadable_name = "Monkey Cube" origin_tech = list(TECH_BLUESPACE = 5, TECH_BIO = 6) //projectile_type = /obj/item/projectile/beam/xenobio/monkey -/obj/item/weapon/xenobio/monkey_gun/afterattack(atom/A, mob/user as mob) +/obj/item/xenobio/monkey_gun/afterattack(atom/A, mob/user as mob) ..() if(!firable) @@ -87,7 +87,7 @@ playsound(src, 'sound/weapons/empty.ogg', 50, 1) return if(loaded_item) - var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = loaded_item + var/obj/item/reagent_containers/food/snacks/monkeycube/cube = loaded_item cube.loc = A cube.Expand() loaded_item = null @@ -95,7 +95,7 @@ VARSET_IN(src, firable, TRUE, 2 SECONDS) // Instead of bringing the slime to the grinder, lets bring the grinder to the slime! This will process slimes and monkies one at a time. -/obj/item/weapon/slime_grinder +/obj/item/slime_grinder name = "portable slime processor" desc = "An industrial grinder used to automate the process of slime core extraction. It can also recycle biomatter. This one appears miniturized" //icon = 'icons/obj/weapons_vr.dmi' @@ -105,7 +105,7 @@ var/monkeys_recycled = 0 description_info = "Click a monkey or slime to begin processing." -/obj/item/weapon/slime_grinder/proc/extract(var/atom/movable/AM, var/mob/living/user) +/obj/item/slime_grinder/proc/extract(var/atom/movable/AM, var/mob/living/user) processing = TRUE if(istype(AM, /mob/living/simple_mob/slime)) var/mob/living/simple_mob/slime/S = AM @@ -126,13 +126,13 @@ monkeys_recycled++ sleep(1 SECOND) while(monkeys_recycled >= 4) - new /obj/item/weapon/reagent_containers/food/snacks/monkeycube(get_turf(src)) + new /obj/item/reagent_containers/food/snacks/monkeycube(get_turf(src)) playsound(src, 'sound/effects/splat.ogg', 50, 1) monkeys_recycled -= 4 sleep(1 SECOND) processing = FALSE -/obj/item/weapon/slime_grinder/proc/can_insert(var/atom/movable/AM) +/obj/item/slime_grinder/proc/can_insert(var/atom/movable/AM) if(istype(AM, /mob/living/simple_mob/slime)) var/mob/living/simple_mob/slime/S = AM if(S.stat != DEAD) @@ -147,7 +147,7 @@ return TRUE return FALSE -/obj/item/weapon/slime_grinder/attack(mob/M as mob, mob/living/user as mob) +/obj/item/slime_grinder/attack(mob/M as mob, mob/living/user as mob) if(processing) return if(!can_insert(M)) diff --git a/code/modules/xenobio/machinery/processor.dm b/code/modules/xenobio/machinery/processor.dm index 04b929d5c8a..6b0d56b4fe9 100644 --- a/code/modules/xenobio/machinery/processor.dm +++ b/code/modules/xenobio/machinery/processor.dm @@ -13,7 +13,7 @@ var/monkeys_recycled = 0 description_info = "Clickdrag dead slimes or monkeys to it to insert them. It will make a new monkey cube for every four monkeys it processes." -/obj/item/weapon/circuitboard/processor +/obj/item/circuitboard/processor name = T_BOARD("slime processor") build_path = /obj/machinery/processor origin_tech = list(TECH_DATA = 2, TECH_BIO = 2) @@ -70,7 +70,7 @@ sleep(1 SECONDS) while(monkeys_recycled >= 4) - new /obj/item/weapon/reagent_containers/food/snacks/monkeycube(get_turf(src)) + new /obj/item/reagent_containers/food/snacks/monkeycube(get_turf(src)) playsound(src, 'sound/effects/splat.ogg', 50, 1) monkeys_recycled -= 4 sleep(1 SECOND) diff --git a/code/modules/xenobio2/machinery/core_extractor.dm b/code/modules/xenobio2/machinery/core_extractor.dm index 51526cb0cc2..21356198dae 100644 --- a/code/modules/xenobio2/machinery/core_extractor.dm +++ b/code/modules/xenobio2/machinery/core_extractor.dm @@ -10,7 +10,7 @@ icon_state = "scanner_0old" density = TRUE anchored = TRUE - circuit = /obj/item/weapon/circuitboard/slimeextractor + circuit = /obj/item/circuitboard/slimeextractor var/inuse var/mob/living/simple_mob/xeno/slime/occupant = null var/occupiedcolor = "#22FF22" @@ -37,7 +37,7 @@ if(panel_open) to_chat(user, "Close the panel first!") - var/obj/item/weapon/grab/G = W + var/obj/item/grab/G = W if(!istype(G)) return ..() @@ -175,13 +175,13 @@ return //Circuit board below, -/obj/item/weapon/circuitboard/slimeextractor +/obj/item/circuitboard/slimeextractor name = T_BOARD("Slime extractor") build_path = "/obj/machinery/slime/extractor" board_type = "machine" origin_tech = list(TECH_DATA = 3, TECH_BIO = 3) req_components = list( - /obj/item/weapon/stock_parts/manipulator = 2, - /obj/item/weapon/stock_parts/matter_bin = 1, - /obj/item/weapon/stock_parts/micro_laser = 2 + /obj/item/stock_parts/manipulator = 2, + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stock_parts/micro_laser = 2 ) diff --git a/code/modules/xenobio2/machinery/gene_manipulators.dm b/code/modules/xenobio2/machinery/gene_manipulators.dm index 2132b7e0bd1..35eddb274f5 100644 --- a/code/modules/xenobio2/machinery/gene_manipulators.dm +++ b/code/modules/xenobio2/machinery/gene_manipulators.dm @@ -10,7 +10,7 @@ Biological genetic bombarder: Takes traits from a disk and replaces/adds to the genes in a xenobiological creature. */ -/obj/item/weapon/disk/xenobio +/obj/item/disk/xenobio name = "biological data disk" desc = "A small disk used for carrying data on genetics." icon = 'icons/obj/hydroponics_machines.dmi' @@ -20,7 +20,7 @@ var/list/genes = list() var/genesource = "unknown" -/obj/item/weapon/disk/xenobio/attack_self(var/mob/user as mob) +/obj/item/disk/xenobio/attack_self(var/mob/user as mob) if(genes.len) var/choice = tgui_alert(user, "Are you sure you want to wipe the disk?", "Xenobiological Data", list("No", "Yes")) if(src && user && genes && choice && choice == "Yes" && user.Adjacent(get_turf(src))) @@ -30,21 +30,21 @@ genes = list() genesource = "unknown" -/obj/item/weapon/storage/box/xenobiodisk +/obj/item/storage/box/xenobiodisk name = "biological disk box" desc = "A box of biological data disks, apparently." -/obj/item/weapon/storage/box/xenobiodisk/New() +/obj/item/storage/box/xenobiodisk/New() ..() for(var/i = 0 to 7) - new /obj/item/weapon/disk/xenobio(src) + new /obj/item/disk/xenobio(src) /obj/machinery/xenobio density = TRUE anchored = TRUE use_power = USE_POWER_IDLE - var/obj/item/weapon/disk/xenobio/loaded_disk //Currently loaded data disk. + var/obj/item/disk/xenobio/loaded_disk //Currently loaded data disk. var/open = 0 var/active = 0 @@ -60,17 +60,17 @@ /obj/machinery/xenobio/attack_hand(mob/user as mob) ui_interact(user) -/obj/machinery/xenobio/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/xenobio/attackby(obj/item/W as obj, mob/user as mob) if(default_deconstruction_screwdriver(user, W)) return if(default_deconstruction_crowbar(user, W)) return - if(istype(W,/obj/item/weapon/disk/xenobio)) + if(istype(W,/obj/item/disk/xenobio)) if(loaded_disk) to_chat(user, "There is already a data disk loaded.") return else - var/obj/item/weapon/disk/xenobio/B = W + var/obj/item/disk/xenobio/B = W if(B.genes && B.genes.len) if(!disk_needs_genes) @@ -117,7 +117,7 @@ name = "biological product destructive analyzer" icon = 'icons/obj/hydroponics_machines_vr.dmi' //VOREStation Edit icon_state = "traitcopier" - circuit = /obj/item/weapon/circuitboard/bioproddestanalyzer + circuit = /obj/item/circuitboard/bioproddestanalyzer var/obj/item/xenoproduct/product var/datum/xeno/traits/genetics // Currently scanned xeno genetic structure. @@ -127,7 +127,7 @@ . = ..() default_apply_parts() -/obj/machinery/xenobio/extractor/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/xenobio/extractor/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/xenoproduct)) if(product) to_chat(user, "There is already a xenobiological product loaded.") @@ -254,7 +254,7 @@ icon = 'icons/obj/cryogenics.dmi' icon_state = "cellold0" disk_needs_genes = 1 - circuit = /obj/item/weapon/circuitboard/biobombarder + circuit = /obj/item/circuitboard/biobombarder var/mob/living/simple_mob/xeno/slime/occupant @@ -262,9 +262,9 @@ . = ..() default_apply_parts() -/obj/machinery/xenobio/editor/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = W +/obj/machinery/xenobio/editor/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W,/obj/item/grab)) + var/obj/item/grab/G = W if(occupant) to_chat(user, "There is already an organism loaded.") return @@ -390,24 +390,24 @@ occupant.forceMove(loc) occupant = null -/obj/item/weapon/circuitboard/bioproddestanalyzer +/obj/item/circuitboard/bioproddestanalyzer name = T_BOARD("biological product destructive analyzer") build_path = "/obj/machinery/xenobio/extractor" board_type = "machine" origin_tech = list(TECH_DATA = 4, TECH_BIO = 4) req_components = list( - /obj/item/weapon/stock_parts/manipulator = 2, - /obj/item/weapon/stock_parts/matter_bin = 1, - /obj/item/weapon/stock_parts/scanning_module = 3 + /obj/item/stock_parts/manipulator = 2, + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stock_parts/scanning_module = 3 ) -/obj/item/weapon/circuitboard/biobombarder +/obj/item/circuitboard/biobombarder name = T_BOARD("biological genetic bombarder") build_path = "/obj/machinery/xenobio/editor" board_type = "machine" origin_tech = list(TECH_DATA = 4, TECH_BIO = 4) req_components = list( - /obj/item/weapon/stock_parts/manipulator = 2, - /obj/item/weapon/stock_parts/matter_bin = 2, - /obj/item/weapon/stock_parts/scanning_module = 2 + /obj/item/stock_parts/manipulator = 2, + /obj/item/stock_parts/matter_bin = 2, + /obj/item/stock_parts/scanning_module = 2 ) diff --git a/code/modules/xenobio2/machinery/injector.dm b/code/modules/xenobio2/machinery/injector.dm index 6b18e89073a..4595acd71f4 100644 --- a/code/modules/xenobio2/machinery/injector.dm +++ b/code/modules/xenobio2/machinery/injector.dm @@ -14,17 +14,17 @@ icon = 'icons/obj/biogenerator.dmi' icon_state = "biogen-work" var/mob/living/occupant - var/obj/item/weapon/reagent_containers/glass/beaker + var/obj/item/reagent_containers/glass/beaker var/obj/machinery/computer/xenobio2/computer - circuit = /obj/item/weapon/circuitboard/xenobioinjectormachine + circuit = /obj/item/circuitboard/xenobioinjectormachine /obj/machinery/xenobio2/manualinjector/Initialize() . = ..() var/datum/reagents/R = new/datum/reagents(1000) reagents = R R.my_atom = src - beaker = new /obj/item/weapon/reagent_containers/glass/beaker(src) + beaker = new /obj/item/reagent_containers/glass/beaker(src) default_apply_parts() /obj/machinery/xenobio2/manualinjector/update_icon() @@ -72,7 +72,7 @@ /obj/machinery/xenobio2/manualinjector/proc/eject_beaker() if(beaker) - var/obj/item/weapon/reagent_containers/glass/beaker/B = beaker + var/obj/item/reagent_containers/glass/beaker/B = beaker B.loc = loc beaker = null @@ -97,15 +97,15 @@ return //are you smashing a beaker in me? Well then insert that shit! - if(istype(W, /obj/item/weapon/reagent_containers/glass/beaker)) + if(istype(W, /obj/item/reagent_containers/glass/beaker)) beaker = W user.drop_from_inventory(W) W.loc = src return //Did you want to link it? - if(istype(W, /obj/item/device/multitool)) - var/obj/item/device/multitool/P = W + if(istype(W, /obj/item/multitool)) + var/obj/item/multitool/P = W if(P.connectable) if(istype(P.connectable, /obj/machinery/computer/xenobio2)) var/obj/machinery/computer/xenobio2/C = P.connectable @@ -120,7 +120,7 @@ if(panel_open) to_chat(user, "Close the panel first!") - var/obj/item/weapon/grab/G = W + var/obj/item/grab/G = W if(!istype(G)) return ..() @@ -132,7 +132,7 @@ move_into_injector(user,G.affecting) -/obj/item/weapon/circuitboard/xenobioinjectormachine +/obj/item/circuitboard/xenobioinjectormachine name = T_BOARD("biological injector") build_path = /obj/machinery/xenobio2/manualinjector board_type = /datum/frame/frame_types/machine diff --git a/code/modules/xenobio2/machinery/injector_computer.dm b/code/modules/xenobio2/machinery/injector_computer.dm index e4ac65403a4..a184a2b36fc 100644 --- a/code/modules/xenobio2/machinery/injector_computer.dm +++ b/code/modules/xenobio2/machinery/injector_computer.dm @@ -14,7 +14,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 250 active_power_usage = 500 - circuit = /obj/item/weapon/circuitboard/xenobio2computer + circuit = /obj/item/circuitboard/xenobio2computer var/obj/machinery/xenobio2/manualinjector/injector var/transfer_amount = 5 //VOREStation Edit - This is never set anywhere, and 1 is too slow (1 is the default in the transfer proc). var/active @@ -31,8 +31,8 @@ /obj/machinery/computer/xenobio2/attackby(var/obj/item/W, var/mob/user) //Did you want to link it? - if(istype(W, /obj/item/device/multitool)) - var/obj/item/device/multitool/P = W + if(istype(W, /obj/item/multitool)) + var/obj/item/multitool/P = W if(P.connectable) if(istype(P.connectable, /obj/machinery/xenobio2/manualinjector)) var/obj/machinery/xenobio2/manualinjector/I = P.connectable @@ -108,7 +108,7 @@ usr.set_machine(src) src.add_fingerprint(usr) -/obj/item/weapon/circuitboard/xenobio2computer +/obj/item/circuitboard/xenobio2computer name = T_BOARD("injector control console") build_path = /obj/machinery/computer/xenobio2 origin_tech = list() //To be filled diff --git a/code/modules/xenobio2/machinery/slime_replicator.dm b/code/modules/xenobio2/machinery/slime_replicator.dm index f402ad3193e..8dc015e6503 100644 --- a/code/modules/xenobio2/machinery/slime_replicator.dm +++ b/code/modules/xenobio2/machinery/slime_replicator.dm @@ -10,7 +10,7 @@ icon_state = "restruct_0" density = TRUE anchored = TRUE - circuit = /obj/item/weapon/circuitboard/slimereplicator + circuit = /obj/item/circuitboard/slimereplicator var/obj/item/xenoproduct/slime/core/core = null var/inuse var/occupiedcolor = "#22FF22" @@ -130,13 +130,13 @@ return //Circuit board below, -/obj/item/weapon/circuitboard/slimereplicator +/obj/item/circuitboard/slimereplicator name = T_BOARD("Slime replicator") build_path = "/obj/machinery/slime/replicator" board_type = "machine" origin_tech = list(TECH_DATA = 3, TECH_BIO = 3) req_components = list( - /obj/item/weapon/stock_parts/manipulator = 2, - /obj/item/weapon/stock_parts/matter_bin = 1, - /obj/item/weapon/stock_parts/micro_laser = 1 + /obj/item/stock_parts/manipulator = 2, + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stock_parts/micro_laser = 1 ) diff --git a/code/modules/xenobio2/tools/xeno_trait_scanner.dm b/code/modules/xenobio2/tools/xeno_trait_scanner.dm index 8589cc02cd2..8335000c1f6 100644 --- a/code/modules/xenobio2/tools/xeno_trait_scanner.dm +++ b/code/modules/xenobio2/tools/xeno_trait_scanner.dm @@ -1,10 +1,10 @@ -/obj/item/device/analyzer/xeno_analyzer +/obj/item/analyzer/xeno_analyzer name = "exotic biological analyzer" desc = "A device to investigate the genetic data of a biological target." var/form_title var/last_data -/obj/item/device/analyzer/xeno_analyzer/proc/print_report_verb() +/obj/item/analyzer/xeno_analyzer/proc/print_report_verb() set name = "Print Plant Report" set category = "Object" set src = usr @@ -13,17 +13,17 @@ return print_report(usr) -/obj/item/device/analyzer/xeno_analyzer/Topic(href, href_list) +/obj/item/analyzer/xeno_analyzer/Topic(href, href_list) if(..()) return if(href_list["print"]) print_report(usr) -/obj/item/device/analyzer/xeno_analyzer/proc/print_report(var/mob/living/user) +/obj/item/analyzer/xeno_analyzer/proc/print_report(var/mob/living/user) if(!last_data) to_chat(user, "There is no scan data to print.") return - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(src)) + var/obj/item/paper/P = new /obj/item/paper(get_turf(src)) P.name = "paper - [form_title]" P.info = "[last_data]" if(istype(user,/mob/living/carbon/human)) @@ -31,11 +31,11 @@ user.visible_message("\The [src] spits out a piece of paper.") return -/obj/item/device/analyzer/xeno_analyzer/attack_self(mob/user as mob) +/obj/item/analyzer/xeno_analyzer/attack_self(mob/user as mob) print_report(user) return 0 -/obj/item/device/analyzer/xeno_analyzer/afterattack(var/target, mob/user, flag) +/obj/item/analyzer/xeno_analyzer/afterattack(var/target, mob/user, flag) if(!flag) return var/datum/xeno/traits/trait_info diff --git a/code/unit_tests/integrated_circuits/prefabs.dm b/code/unit_tests/integrated_circuits/prefabs.dm index 1436e7d097f..5467300c6c1 100644 --- a/code/unit_tests/integrated_circuits/prefabs.dm +++ b/code/unit_tests/integrated_circuits/prefabs.dm @@ -6,7 +6,7 @@ var/list/prefab_types = decls_repository.get_decls_of_subtype(/decl/prefab/ic_assembly) for(var/prefab_type in prefab_types) var/decl/prefab/ic_assembly/prefab = prefab_types[prefab_type] - var/obj/item/device/electronic_assembly/assembly = prefab.assembly_type + var/obj/item/electronic_assembly/assembly = prefab.assembly_type var/available_size = initial(assembly.max_components) var/available_complexity = initial(assembly.max_complexity) diff --git a/maps/RandomZLevels/Academy.dmm b/maps/RandomZLevels/Academy.dmm index 8a4c25ea8cb..57f448c80b4 100644 --- a/maps/RandomZLevels/Academy.dmm +++ b/maps/RandomZLevels/Academy.dmm @@ -3,8 +3,8 @@ "ac" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/awaymission/academy/headmaster) "ad" = (/obj/structure/filingcabinet/filingcabinet,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "ae" = (/obj/structure/computerframe{anchored = 1},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) -"af" = (/obj/structure/table/reinforced,/obj/item/weapon/pen/red,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) -"ag" = (/obj/structure/table/reinforced,/obj/item/weapon/folder/blue,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) +"af" = (/obj/structure/table/reinforced,/obj/item/pen/red,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) +"ag" = (/obj/structure/table/reinforced,/obj/item/folder/blue,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "ah" = (/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "ai" = (/obj/structure/stool/bed/chair/office/light{dir = 1},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "aj" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/apc{dir = 1; environ = 0; equipment = 3; locked = 0; req_access = ""},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) @@ -14,28 +14,28 @@ "an" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "ao" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "ap" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) -"aq" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/drinks/coffee,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) -"ar" = (/obj/structure/table/reinforced,/obj/item/weapon/paper{info = "We're upgrading to the latest mainframes for our consoles, the shipment should be in before spring break is over!"; name = "Console Maintenance"},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) +"aq" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/drinks/coffee,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) +"ar" = (/obj/structure/table/reinforced,/obj/item/paper{info = "We're upgrading to the latest mainframes for our consoles, the shipment should be in before spring break is over!"; name = "Console Maintenance"},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "as" = (/turf/simulated/wall,/area/awaymission/academy/headmaster) "at" = (/obj/structure/mineral_door/wood,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "au" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "av" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) -"aw" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) +"aw" = (/obj/structure/table/reinforced,/obj/item/paper_bin,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "ax" = (/obj/structure/stool,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "ay" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) "az" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/item/stack/sheet/animalhide/monkey,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) "aA" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) -"aB" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/purple,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) -"aC" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/drinks/tea,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) +"aB" = (/obj/structure/stool/bed,/obj/item/bedsheet/purple,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) +"aC" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/drinks/tea,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "aD" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "aE" = (/obj/structure/filingcabinet,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) "aF" = (/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) "aG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) -"aH" = (/obj/structure/cult/tome,/obj/item/weapon/staff,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) +"aH" = (/obj/structure/cult/tome,/obj/item/staff,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) "aI" = (/obj/structure/stool/bed/chair/wood/wings{dir = 8},/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) "aJ" = (/obj/item/clothing/suit/space/rig/wizard,/obj/item/clothing/head/helmet/space/rig/wizard,/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) -"aK" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/briefcase,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) -"aL" = (/obj/structure/table/reinforced,/obj/item/weapon/coin/plasma,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) +"aK" = (/obj/structure/table/reinforced,/obj/item/storage/briefcase,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) +"aL" = (/obj/structure/table/reinforced,/obj/item/coin/plasma,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "aM" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "aN" = (/obj/structure/lattice,/turf/space,/area) "aO" = (/obj/machinery/door/airlock/gold{locked = 1},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) @@ -46,21 +46,21 @@ "aT" = (/obj/structure/stool/bed/chair/office/dark,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "aU" = (/obj/structure/reagent_dispensers/water_cooler,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) "aV" = (/obj/machinery/photocopier,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) -"aW" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) -"aX" = (/obj/structure/table/woodentable,/obj/item/weapon/folder/blue,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) -"aY" = (/obj/structure/table/woodentable,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/item/weapon/pen/red,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) -"aZ" = (/obj/structure/table/woodentable,/obj/item/weapon/staff,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) -"ba" = (/obj/structure/table/woodentable,/obj/item/weapon/hand_labeler,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) -"bb" = (/obj/structure/table/woodentable,/obj/item/weapon/pen/invisible,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) +"aW" = (/obj/structure/table/woodentable,/obj/item/paper_bin,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) +"aX" = (/obj/structure/table/woodentable,/obj/item/folder/blue,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) +"aY" = (/obj/structure/table/woodentable,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/item/pen/red,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) +"aZ" = (/obj/structure/table/woodentable,/obj/item/staff,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) +"ba" = (/obj/structure/table/woodentable,/obj/item/hand_labeler,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) +"bb" = (/obj/structure/table/woodentable,/obj/item/pen/invisible,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) "bc" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) -"bd" = (/obj/structure/table/woodentable,/obj/item/weapon/pen/red,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) +"bd" = (/obj/structure/table/woodentable,/obj/item/pen/red,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "be" = (/obj/structure/table/woodentable,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) -"bf" = (/obj/structure/table/woodentable,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/item/weapon/dice/d20,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) -"bg" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/tea,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) -"bh" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) +"bf" = (/obj/structure/table/woodentable,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/item/dice/d20,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) +"bg" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/drinks/tea,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) +"bh" = (/obj/structure/table/woodentable,/obj/item/paper_bin,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) "bi" = (/obj/structure/stool/bed/chair/office/dark{dir = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) "bj" = (/obj/structure/stool/bed/chair/office/dark{dir = 1},/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) -"bk" = (/obj/structure/table/woodentable,/obj/item/weapon/folder/blue,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) +"bk" = (/obj/structure/table/woodentable,/obj/item/folder/blue,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) "bl" = (/obj/machinery/light,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) "bm" = (/obj/structure/filingcabinet/chestdrawer,/turf/simulated/floor/wood,/area/awaymission/academy/headmaster) "bn" = (/obj/machinery/door/airlock/gold,/turf/simulated/floor/carpet,/area/awaymission/academy/headmaster) @@ -102,7 +102,7 @@ "bX" = (/turf/simulated/floor/engine,/area/awaymission/academy/classrooms) "bY" = (/obj/structure/target_stake,/obj/item/target/alien,/turf/simulated/floor/engine,/area/awaymission/academy/classrooms) "bZ" = (/obj/machinery/vending/cigarette,/turf/simulated/floor,/area/awaymission/academy/headmaster) -"ca" = (/obj/structure/table/standard,/obj/item/weapon/lighter/random,/turf/simulated/floor,/area/awaymission/academy/headmaster) +"ca" = (/obj/structure/table/standard,/obj/item/lighter/random,/turf/simulated/floor,/area/awaymission/academy/headmaster) "cb" = (/turf/simulated/floor{icon_state = "dark"},/area/awaymission/academy/headmaster) "cc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/headmaster) "cd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plating,/area/awaymission/academy/headmaster) @@ -116,7 +116,7 @@ "cl" = (/obj/machinery/computer/area_atmos/area,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/headmaster) "cm" = (/obj/machinery/portable_atmospherics/scrubber/huge/stationary,/turf/simulated/floor/plating,/area/awaymission/academy/headmaster) "cn" = (/obj/structure/stool,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/academy/headmaster) -"co" = (/obj/structure/table/standard,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/item/weapon/pen/red,/turf/simulated/floor,/area/awaymission/academy/classrooms) +"co" = (/obj/structure/table/standard,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/item/pen/red,/turf/simulated/floor,/area/awaymission/academy/classrooms) "cp" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor,/area/awaymission/academy/classrooms) "cq" = (/turf/simulated/shuttle/wall{ icon_state = "swall"; dir = 1},/area/awaymission/academy/classrooms) "cr" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/awaymission/academy/headmaster) @@ -145,8 +145,8 @@ "cO" = (/turf/simulated/floor{icon_state = "red"; dir = 6},/area/awaymission/academy/classrooms) "cP" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/awaymission/academy/headmaster) "cQ" = (/obj/machinery/light{dir = 8},/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/headmaster) -"cR" = (/obj/structure/closet/crate/internals,/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen/red,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/academy/headmaster) -"cS" = (/obj/structure/closet/crate,/obj/item/weapon/crowbar/red,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/headmaster) +"cR" = (/obj/structure/closet/crate/internals,/obj/item/tank/oxygen,/obj/item/tank/oxygen/red,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/academy/headmaster) +"cS" = (/obj/structure/closet/crate,/obj/item/crowbar/red,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/headmaster) "cT" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/structure/cable,/turf/simulated/floor/plating,/area/awaymission/academy/headmaster) "cU" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/awaymission/academy/classrooms) "cV" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor,/area/awaymission/academy/classrooms) @@ -157,7 +157,7 @@ "da" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) "db" = (/turf/simulated/floor/greengrid,/area/awaymission/academy/classrooms) "dc" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) -"dd" = (/obj/structure/table/woodentable,/obj/item/weapon/staff,/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) +"dd" = (/obj/structure/table/woodentable,/obj/item/staff,/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) "de" = (/turf/simulated/floor{dir = 9; icon_state = "green"},/area/awaymission/academy/classrooms) "df" = (/turf/simulated/floor{dir = 1; icon_state = "green"},/area/awaymission/academy/classrooms) "dg" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{dir = 1; icon_state = "green"},/area/awaymission/academy/classrooms) @@ -175,12 +175,12 @@ "ds" = (/obj/machinery/hydroponics,/obj/item/seeds/eggyseed,/turf/simulated/floor,/area/awaymission/academy/classrooms) "dt" = (/obj/machinery/hydroponics,/turf/simulated/floor,/area/awaymission/academy/classrooms) "du" = (/turf/simulated/floor{icon_state = "green"; dir = 4},/area/awaymission/academy/classrooms) -"dv" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/landmark{name = "awaystart"},/obj/item/weapon/weldingtool,/turf/simulated/floor/greengrid,/area/awaymission/academy/classrooms) +"dv" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/landmark{name = "awaystart"},/obj/item/weldingtool,/turf/simulated/floor/greengrid,/area/awaymission/academy/classrooms) "dw" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/greengrid,/area/awaymission/academy/classrooms) "dx" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/greengrid,/area/awaymission/academy/classrooms) "dy" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor,/area/awaymission/academy/classrooms) "dz" = (/turf/simulated/floor/grass,/area/awaymission/academy/headmaster) -"dA" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor,/area/awaymission/academy/classrooms) +"dA" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/glass/bucket,/turf/simulated/floor,/area/awaymission/academy/classrooms) "dB" = (/obj/structure/closet/crate/hydroponics/prespawned,/turf/simulated/floor,/area/awaymission/academy/classrooms) "dC" = (/obj/machinery/door/airlock/freezer,/turf/simulated/floor{icon_state = "white"},/area/awaymission/academy/classrooms) "dD" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/awaymission/academy/classrooms) @@ -209,9 +209,9 @@ "ea" = (/turf/simulated/floor{dir = 8; icon_state = "yellowcorner"},/area/awaymission/academy/classrooms) "eb" = (/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/awaymission/academy/classrooms) "ec" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor{dir = 4; icon_state = "yellow"},/area/awaymission/academy/classrooms) -"ed" = (/obj/structure/noticeboard{pixel_y = 32},/obj/item/weapon/paper{name = "Automotive Repair 101"},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/academy/classrooms) +"ed" = (/obj/structure/noticeboard{pixel_y = 32},/obj/item/paper{name = "Automotive Repair 101"},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/academy/classrooms) "ee" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/academy/classrooms) -"ef" = (/obj/structure/noticeboard{pixel_y = 32},/obj/item/weapon/paper{name = "Pyromancy 250"},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/academy/classrooms) +"ef" = (/obj/structure/noticeboard{pixel_y = 32},/obj/item/paper{name = "Pyromancy 250"},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/academy/classrooms) "eg" = (/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/academy/classrooms) "eh" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/apc{dir = 1; environ = 3; equipment = 3; locked = 0; req_access = ""},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/academy/classrooms) "ei" = (/turf/simulated/floor/carpet,/area/awaymission/academy/classrooms) @@ -254,7 +254,7 @@ "eT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor{dir = 8; icon_state = "chapel"},/area/awaymission/academy/classrooms) "eU" = (/obj/structure/mineral_door/wood,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/academy/classrooms) "eV" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "escape"; dir = 6},/area/awaymission/academy/classrooms) -"eW" = (/obj/structure/table/standard,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/item/weapon/reagent_containers/food/snacks/spellburger,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/awaymission/academy/classrooms) +"eW" = (/obj/structure/table/standard,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/item/reagent_containers/food/snacks/spellburger,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/awaymission/academy/classrooms) "eX" = (/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 10},/area/awaymission/academy) "eY" = (/obj/structure/window/reinforced,/turf/simulated/floor,/area/awaymission/academy/classrooms) "eZ" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/carpet,/area/awaymission/academy/classrooms) @@ -278,7 +278,7 @@ "fr" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/awaymission/academy/classrooms) "fs" = (/turf/simulated/floor{dir = 1; icon_state = "yellowcorner"},/area/awaymission/academy/classrooms) "ft" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{dir = 4; icon_state = "yellow"},/area/awaymission/academy/classrooms) -"fu" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/structure/noticeboard{pixel_y = -32},/obj/item/weapon/paper{name = "Biology Lab"},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/academy/classrooms) +"fu" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/structure/noticeboard{pixel_y = -32},/obj/item/paper{name = "Biology Lab"},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/academy/classrooms) "fv" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/academy/classrooms) "fw" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/academy/classrooms) "fx" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/carpet,/area/awaymission/academy/classrooms) @@ -309,19 +309,19 @@ "fW" = (/obj/effect/landmark{name = "awaystart"},/turf/simulated/floor/plating,/area/awaymission/academy/classrooms) "fX" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plating,/area/awaymission/academy/classrooms) "fY" = (/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/awaymission/academy/classrooms) -"fZ" = (/obj/structure/table/standard,/obj/item/weapon/pen/red,/turf/simulated/floor,/area/awaymission/academy/classrooms) -"ga" = (/obj/structure/table/standard,/obj/item/weapon/scalpel,/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/awaymission/academy/classrooms) +"fZ" = (/obj/structure/table/standard,/obj/item/pen/red,/turf/simulated/floor,/area/awaymission/academy/classrooms) +"ga" = (/obj/structure/table/standard,/obj/item/scalpel,/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/awaymission/academy/classrooms) "gb" = (/obj/structure/stool/bed/chair/wood/normal,/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) -"gc" = (/obj/structure/bookcase,/obj/item/weapon/book/manual/engineering_hacking,/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) +"gc" = (/obj/structure/bookcase,/obj/item/book/manual/engineering_hacking,/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) "gd" = (/obj/structure/bookcase,/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) "ge" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/academy/academyaft) "gf" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/carpet,/area/awaymission/academy/academyaft) "gg" = (/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) "gh" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/recharger,/obj/structure/table/reinforced,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) -"gi" = (/obj/structure/table/reinforced,/obj/item/weapon/pen/red,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) +"gi" = (/obj/structure/table/reinforced,/obj/item/pen/red,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) "gj" = (/obj/structure/filingcabinet/filingcabinet,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) "gk" = (/obj/machinery/door/window{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/awaymission/academy/classrooms) -"gl" = (/obj/item/weapon/storage/box/monkeycubes,/turf/simulated/floor/plating,/area/awaymission/academy/classrooms) +"gl" = (/obj/item/storage/box/monkeycubes,/turf/simulated/floor/plating,/area/awaymission/academy/classrooms) "gm" = (/obj/machinery/door/window{dir = 4},/obj/machinery/door/window{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plating,/area/awaymission/academy/classrooms) "gn" = (/obj/structure/table/standard,/turf/simulated/floor,/area/awaymission/academy/classrooms) "go" = (/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/awaymission/academy/classrooms) @@ -329,7 +329,7 @@ "gq" = (/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/awaymission/academy/classrooms) "gr" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/awaymission/academy/classrooms) "gs" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) -"gt" = (/obj/structure/bookcase,/obj/item/weapon/book/manual/medical_cloning,/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) +"gt" = (/obj/structure/bookcase,/obj/item/book/manual/medical_cloning,/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) "gu" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/academy/academyaft) "gv" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) "gw" = (/obj/machinery/door/window{dir = 4},/obj/item/ammo_casing,/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/awaymission/academy/classrooms) @@ -337,13 +337,13 @@ "gy" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/academy/classrooms) "gz" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor/carpet,/area/awaymission/academy/academyaft) "gA" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/carpet,/area/awaymission/academy/academyaft) -"gB" = (/obj/structure/table/standard,/obj/item/weapon/gun/projectile/shotgun/pump/sc_pump,/obj/item/weapon/paper{info = "Grade: A+ Educator's Notes: Excellent form."; name = "Summoning Midterm Exam"},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) -"gC" = (/obj/structure/table/standard,/obj/item/weapon/gun/projectile/russian,/obj/item/weapon/paper{info = "Grade: B- Educator's Notes: Keep applying yourself, you're showing improvement."; name = "Summoning Midterm Exam"},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) +"gB" = (/obj/structure/table/standard,/obj/item/gun/projectile/shotgun/pump/sc_pump,/obj/item/paper{info = "Grade: A+ Educator's Notes: Excellent form."; name = "Summoning Midterm Exam"},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) +"gC" = (/obj/structure/table/standard,/obj/item/gun/projectile/russian,/obj/item/paper{info = "Grade: B- Educator's Notes: Keep applying yourself, you're showing improvement."; name = "Summoning Midterm Exam"},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) "gD" = (/obj/structure/table/standard,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) "gE" = (/obj/structure/window/reinforced,/obj/item/ammo_casing,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/awaymission/academy/classrooms) "gF" = (/mob/living/simple_animal/hostile/bear,/turf/simulated/floor/plating,/area/awaymission/academy/classrooms) -"gG" = (/obj/structure/bookcase,/obj/item/weapon/book/manual/hydroponics_pod_people,/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) -"gH" = (/obj/structure/bookcase,/obj/item/weapon/book/manual/barman_recipes,/obj/item/weapon/book/manual/security_space_law,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) +"gG" = (/obj/structure/bookcase,/obj/item/book/manual/hydroponics_pod_people,/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) +"gH" = (/obj/structure/bookcase,/obj/item/book/manual/barman_recipes,/obj/item/book/manual/security_space_law,/obj/item/book/manual/security_space_law,/turf/simulated/floor/wood,/area/awaymission/academy/classrooms) "gI" = (/obj/structure/stool,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) "gJ" = (/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/awaymission/academy/classrooms) "gK" = (/obj/machinery/light/small{dir = 8},/mob/living/simple_animal/hostile/bear,/turf/simulated/floor/plating,/area/awaymission/academy/classrooms) @@ -352,7 +352,7 @@ "gN" = (/obj/machinery/door/airlock/gold{locked = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/carpet,/area/awaymission/academy/classrooms) "gO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) "gP" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) -"gQ" = (/obj/structure/table/standard,/obj/item/weapon/gun/energy/floragun,/obj/item/weapon/paper{info = "Grade: D- Educator's Notes: SEE ME AFTER CLASS."; name = "Summoning Midterm Exam"},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) +"gQ" = (/obj/structure/table/standard,/obj/item/gun/energy/floragun,/obj/item/paper{info = "Grade: D- Educator's Notes: SEE ME AFTER CLASS."; name = "Summoning Midterm Exam"},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms) "gR" = (/obj/structure/closet/crate,/obj/item/stack/sheet/glass,/obj/item/target,/obj/item/target,/turf/simulated/floor,/area/awaymission/academy/classrooms) "gS" = (/obj/machinery/shieldwallgen,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/awaymission/academy/classrooms) "gT" = (/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/academy/classrooms) @@ -372,7 +372,7 @@ "hh" = (/turf/simulated/floor,/area/awaymission/academy/academyaft) "hi" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor,/area/awaymission/academy/academyaft) "hj" = (/turf/simulated/floor{ icon_state = "green"; dir = 4},/area/awaymission/academy/academyaft) -"hk" = (/obj/item/weapon/crowbar/red,/turf/simulated/floor{ icon_state = "green"; dir = 4},/area/awaymission/academy/academyaft) +"hk" = (/obj/item/crowbar/red,/turf/simulated/floor{ icon_state = "green"; dir = 4},/area/awaymission/academy/academyaft) "hl" = (/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/academy/academyaft) "hm" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/awaymission/academy/academyaft) "hn" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/academy/academyaft) @@ -391,7 +391,7 @@ "hA" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor{ icon_state = "green"; dir = 4},/area/awaymission/academy/academyaft) "hB" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/carpet,/area/awaymission/academy/academyaft) "hC" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/carpet,/area/awaymission/academy/academyaft) -"hD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/item/weapon/caution,/turf/simulated/floor{ icon_state = "green"; dir = 4},/area/awaymission/academy/academyaft) +"hD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/item/caution,/turf/simulated/floor{ icon_state = "green"; dir = 4},/area/awaymission/academy/academyaft) "hE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/awaymission/academy/academyaft) "hF" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/academy/academyaft) "hG" = (/obj/machinery/constructable_frame/machine_frame,/turf/simulated/floor/plating,/area/awaymission/academy/academyaft) @@ -399,63 +399,63 @@ "hI" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/academy/academyaft) "hJ" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/academy/academyaft) "hK" = (/obj/structure/grille,/obj/structure/cable,/turf/simulated/floor/plating,/area/awaymission/academy/academyaft) -"hL" = (/obj/structure/closet,/obj/item/candle,/obj/item/candle,/obj/item/weapon/storage/box/matches,/turf/simulated/floor,/area/awaymission/academy/academyaft) -"hM" = (/obj/structure/closet,/obj/item/weapon/storage/belt/soulstone,/obj/item/clothing/under/schoolgirl,/turf/simulated/floor,/area/awaymission/academy/academyaft) +"hL" = (/obj/structure/closet,/obj/item/candle,/obj/item/candle,/obj/item/storage/box/matches,/turf/simulated/floor,/area/awaymission/academy/academyaft) +"hM" = (/obj/structure/closet,/obj/item/storage/belt/soulstone,/obj/item/clothing/under/schoolgirl,/turf/simulated/floor,/area/awaymission/academy/academyaft) "hN" = (/obj/structure/closet,/obj/item/clothing/under/blackskirt,/obj/item/clothing/glasses/regular,/turf/simulated/floor,/area/awaymission/academy/academyaft) "hO" = (/obj/structure/closet,/obj/item/clothing/under/lightpurple,/obj/item/clothing/shoes/sandal,/turf/simulated/floor,/area/awaymission/academy/academyaft) -"hP" = (/obj/structure/closet,/obj/item/weapon/lipstick/random,/obj/item/clothing/under/schoolgirl,/turf/simulated/floor,/area/awaymission/academy/academyaft) +"hP" = (/obj/structure/closet,/obj/item/lipstick/random,/obj/item/clothing/under/schoolgirl,/turf/simulated/floor,/area/awaymission/academy/academyaft) "hQ" = (/turf/simulated/floor/wood,/area/awaymission/academy/academyaft) -"hR" = (/obj/structure/closet,/obj/item/clothing/under/lightpurple,/obj/item/weapon/staff,/turf/simulated/floor,/area/awaymission/academy/academyaft) -"hS" = (/obj/structure/closet,/obj/item/weapon/storage/wallet/random,/obj/item/clothing/glasses/regular/hipster,/turf/simulated/floor,/area/awaymission/academy/academyaft) +"hR" = (/obj/structure/closet,/obj/item/clothing/under/lightpurple,/obj/item/staff,/turf/simulated/floor,/area/awaymission/academy/academyaft) +"hS" = (/obj/structure/closet,/obj/item/storage/wallet/random,/obj/item/clothing/glasses/regular/hipster,/turf/simulated/floor,/area/awaymission/academy/academyaft) "hT" = (/obj/structure/closet,/obj/item/clothing/head/wizard/fake,/obj/item/clothing/suit/wizrobe/fake,/turf/simulated/floor,/area/awaymission/academy/academyaft) -"hU" = (/obj/structure/closet,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/clothing/under/purple,/obj/item/weapon/contraband/poster,/turf/simulated/floor,/area/awaymission/academy/academyaft) -"hV" = (/obj/structure/closet,/obj/item/weapon/storage/box/snappops,/obj/item/weapon/storage/backpack,/obj/item/weapon/paper{info = "Current Grade: F. Educator's Notes: No improvement shown despite multiple private lessons. Suggest additional tutilage."; name = "Pyromancy Evaluation"},/turf/simulated/floor,/area/awaymission/academy/academyaft) +"hU" = (/obj/structure/closet,/obj/item/reagent_containers/food/drinks/beer,/obj/item/clothing/under/purple,/obj/item/contraband/poster,/turf/simulated/floor,/area/awaymission/academy/academyaft) +"hV" = (/obj/structure/closet,/obj/item/storage/box/snappops,/obj/item/storage/backpack,/obj/item/paper{info = "Current Grade: F. Educator's Notes: No improvement shown despite multiple private lessons. Suggest additional tutilage."; name = "Pyromancy Evaluation"},/turf/simulated/floor,/area/awaymission/academy/academyaft) "hW" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/academy/academyaft) "hX" = (/obj/effect/decal/cleanable/oil,/turf/simulated/floor,/area/awaymission/academy/academyaft) "hY" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/power/smes/magical,/turf/simulated/floor/plating,/area/awaymission/academy/academyaft) "hZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/awaymission/academy/academyaft) "ia" = (/obj/structure/rack,/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/academy/academyaft) "ib" = (/turf/simulated/floor/grass,/area/awaymission/academy/academyaft) -"ic" = (/obj/structure/rack,/obj/item/weapon/circuitboard/telecomms/broadcaster,/obj/item/weapon/circuitboard/telecomms/receiver,/obj/item/weapon/circuitboard/telecomms/relay,/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/academy/academyaft) +"ic" = (/obj/structure/rack,/obj/item/circuitboard/telecomms/broadcaster,/obj/item/circuitboard/telecomms/receiver,/obj/item/circuitboard/telecomms/relay,/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/academy/academyaft) "id" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor,/area/awaymission/academy/academyaft) "ie" = (/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/academy/academyaft) "if" = (/obj/structure/mirror{pixel_y = 28},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/academy/academyaft) "ig" = (/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/academy/academyaft) -"ih" = (/obj/structure/rack,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/subspace/crystal,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/turf/simulated/floor,/area/awaymission/academy/academyaft) +"ih" = (/obj/structure/rack,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/subspace/crystal,/obj/item/stock_parts/subspace/filter,/obj/item/stock_parts/micro_laser/high,/obj/item/stock_parts/micro_laser/high,/turf/simulated/floor,/area/awaymission/academy/academyaft) "ii" = (/obj/machinery/power/smes/magical,/obj/structure/cable,/turf/simulated/floor/plating,/area/awaymission/academy/academyaft) "ij" = (/obj/structure/rack,/obj/item/clothing/glasses/welding,/turf/simulated/floor,/area/awaymission/academy/academyaft) "ik" = (/obj/structure/mineral_door/iron,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/academy/academyaft) -"il" = (/obj/structure/rack,/obj/item/weapon/stock_parts/scanning_module,/obj/item/weapon/stock_parts/micro_laser,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/subspace/ansible,/turf/simulated/floor,/area/awaymission/academy/academyaft) -"im" = (/obj/item/weapon/stock_parts/manipulator,/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/academy/academyaft) -"in" = (/obj/structure/rack,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor,/area/awaymission/academy/academyaft) +"il" = (/obj/structure/rack,/obj/item/stock_parts/scanning_module,/obj/item/stock_parts/micro_laser,/obj/item/stock_parts/subspace/filter,/obj/item/stock_parts/subspace/ansible,/turf/simulated/floor,/area/awaymission/academy/academyaft) +"im" = (/obj/item/stock_parts/manipulator,/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/academy/academyaft) +"in" = (/obj/structure/rack,/obj/item/storage/toolbox/mechanical,/turf/simulated/floor,/area/awaymission/academy/academyaft) "io" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/academy/academyaft) "ip" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/academy/academyaft) "iq" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/wood,/area/awaymission/academy/academyaft) "ir" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/wood,/area/awaymission/academy/academyaft) "is" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/academy/academyaft) "it" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/academy/academyaft) -"iu" = (/obj/structure/rack,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/subspace/filter,/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/academy/academyaft) +"iu" = (/obj/structure/rack,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/subspace/filter,/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/academy/academyaft) "iv" = (/obj/structure/toilet{dir = 8},/obj/machinery/light/small{dir = 1},/obj/effect/landmark{name = "awaystart"},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/academy/academyaft) "iw" = (/obj/structure/toilet{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/academy/academyaft) "ix" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/rack,/obj/item/stack/sheet/metal,/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/academy/academyaft) "iy" = (/obj/structure/toilet{dir = 8},/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/academy/academyaft) -"iz" = (/obj/item/weapon/paper,/turf/simulated/floor/wood,/area/awaymission/academy/academyaft) +"iz" = (/obj/item/paper,/turf/simulated/floor/wood,/area/awaymission/academy/academyaft) "iA" = (/obj/item/stack/cable_coil/random,/turf/simulated/floor,/area/awaymission/academy/academyaft) "iB" = (/obj/machinery/door/airlock/maintenance_hatch,/turf/simulated/floor/plating,/area/awaymission/academy/academyaft) -"iC" = (/obj/item/device/multitool,/turf/simulated/floor/engine,/area/awaymission/academy/academyaft) +"iC" = (/obj/item/multitool,/turf/simulated/floor/engine,/area/awaymission/academy/academyaft) "iD" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/engine,/area/awaymission/academy/academyaft) "iE" = (/turf/simulated/floor/engine,/area/awaymission/academy/academyaft) "iF" = (/obj/structure/toilet{dir = 8},/obj/machinery/light/small{dir = 1},/obj/effect/decal/cleanable/vomit,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/academy/academyaft) "iG" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/wood,/area/awaymission/academy/academyaft) "iH" = (/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/engine,/area/awaymission/academy/academyaft) "iI" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/academy/academyaft) -"iJ" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/standard,/obj/item/weapon/beach_ball/holoball,/turf/simulated/floor{icon_state = "red"; dir = 1},/area/awaymission/academy/academyaft) +"iJ" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/standard,/obj/item/beach_ball/holoball,/turf/simulated/floor{icon_state = "red"; dir = 1},/area/awaymission/academy/academyaft) "iK" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{icon_state = "red"; dir = 5},/area/awaymission/academy/academyaft) "iL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/awaymission/academy/academyaft) "iM" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor/carpet,/area/awaymission/academy/academyaft) "iN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor/plating,/area/awaymission/academy/academyaft) "iO" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/airless{ icon_state = "white"; dir = 4},/area/awaymission/academy/academyaft) -"iP" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/standard,/obj/item/device/soulstone,/turf/simulated/floor/airless{ icon_state = "whitered"; dir = 4},/area/awaymission/academy/academyaft) +"iP" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/standard,/obj/item/soulstone,/turf/simulated/floor/airless{ icon_state = "whitered"; dir = 4},/area/awaymission/academy/academyaft) "iQ" = (/obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_l"},/turf/space,/area/awaymission/academy/academyaft) "iR" = (/obj/structure/shuttle/engine/propulsion,/turf/space,/area/awaymission/academy/academyaft) "iS" = (/obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_r"},/turf/space,/area/awaymission/academy/academyaft) @@ -475,15 +475,15 @@ "jg" = (/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/awaymission/academy/academyaft) "jh" = (/turf/simulated/floor{dir = 4; icon_state = "yellow"},/area/awaymission/academy/academyaft) "ji" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/airless{ icon_state = "white"; dir = 4},/area/awaymission/academy/academyaft) -"jj" = (/obj/structure/grille,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/item/weapon/shard,/turf/simulated/floor/plating/airless,/area/awaymission/academy/academyaft) -"jk" = (/obj/structure/window/reinforced,/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/golden_cup,/turf/simulated/floor{icon_state = "red"},/area/awaymission/academy/academyaft) +"jj" = (/obj/structure/grille,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/item/shard,/turf/simulated/floor/plating/airless,/area/awaymission/academy/academyaft) +"jk" = (/obj/structure/window/reinforced,/obj/structure/table/standard,/obj/item/reagent_containers/food/drinks/golden_cup,/turf/simulated/floor{icon_state = "red"},/area/awaymission/academy/academyaft) "jl" = (/obj/structure/window/reinforced,/turf/simulated/floor{icon_state = "red"; dir = 6},/area/awaymission/academy/academyaft) "jm" = (/obj/structure/cult/pylon,/turf/simulated/floor{icon_state = "yellow"; dir = 10},/area/awaymission/academy/academyaft) "jn" = (/turf/simulated/floor{icon_state = "yellow"},/area/awaymission/academy/academyaft) "jo" = (/obj/structure/cult/pylon,/turf/simulated/floor{dir = 6; icon_state = "yellow"},/area/awaymission/academy/academyaft) "jp" = (/obj/structure/window/reinforced,/turf/simulated/floor/airless{ icon_state = "white"; dir = 4},/area/awaymission/academy/academyaft) -"jq" = (/obj/structure/table/standard,/obj/structure/window/reinforced,/obj/item/device/batterer,/turf/simulated/floor/airless{ icon_state = "whitered"; dir = 4},/area/awaymission/academy/academyaft) -"jr" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/space,/area) +"jq" = (/obj/structure/table/standard,/obj/structure/window/reinforced,/obj/item/batterer,/turf/simulated/floor/airless{ icon_state = "whitered"; dir = 4},/area/awaymission/academy/academyaft) +"jr" = (/obj/item/shard{icon_state = "medium"},/turf/space,/area) "js" = (/obj/machinery/igniter,/turf/simulated/floor/plating,/area/awaymission/academy/academyaft) "jt" = (/obj/structure/window/reinforced,/turf/simulated/floor/carpet,/area/awaymission/academy/academyaft) "ju" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/structure/cable,/turf/simulated/floor/plating,/area/awaymission/academy/academyaft) diff --git a/maps/RandomZLevels/arcticwaste.dmm b/maps/RandomZLevels/arcticwaste.dmm index 24a17be1a4f..4ef076a9543 100644 --- a/maps/RandomZLevels/arcticwaste.dmm +++ b/maps/RandomZLevels/arcticwaste.dmm @@ -18,7 +18,7 @@ "r" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/plating,/area/awaymission) "s" = (/obj/machinery/vending/robotics,/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 4},/area/awaymission) "t" = (/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 8},/area/awaymission) -"u" = (/obj/item/weapon/paper/pamphlet,/turf/simulated/floor/plating,/area/awaymission) +"u" = (/obj/item/paper/pamphlet,/turf/simulated/floor/plating,/area/awaymission) "v" = (/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 4},/area/awaymission) "w" = (/obj/machinery/vending/engineering,/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 8},/area/awaymission) "x" = (/obj/machinery/vending/tool,/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 4},/area/awaymission) diff --git a/maps/RandomZLevels/blackmarketpackers.dmm b/maps/RandomZLevels/blackmarketpackers.dmm index d794910259b..70d54c49497 100644 --- a/maps/RandomZLevels/blackmarketpackers.dmm +++ b/maps/RandomZLevels/blackmarketpackers.dmm @@ -1,13 +1,13 @@ "aa" = (/turf/space,/area) "ab" = (/turf/simulated/mineral/random/high_chance,/area/awaymission) "ac" = (/turf/simulated/floor/plating/airless/asteroid,/area/awaymission) -"ad" = (/obj/item/weapon/circular_saw,/obj/structure/lattice,/turf/space,/area) +"ad" = (/obj/item/circular_saw,/obj/structure/lattice,/turf/space,/area) "ae" = (/turf/simulated/shuttle/wall{ icon_state = "swall"; dir = 4},/area/awaymission/BMPship3) "af" = (/turf/simulated/shuttle/wall{ icon_state = "swall_straight"; dir = 4},/area/awaymission/BMPship3) "ag" = (/turf/simulated/shuttle/wall{ icon_state = "swall_t"; dir = 1},/area/awaymission/BMPship3) "ah" = (/turf/simulated/shuttle/wall{ icon_state = "swall_s"; dir = 2; dir = 2},/area/awaymission/BMPship3) "ai" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/engine,/area/awaymission/BMPship3) -"aj" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/weapon/gun/energy/lasercannon},/turf/simulated/floor/engine,/area/awaymission/BMPship3) +"aj" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/gun/energy/lasercannon},/turf/simulated/floor/engine,/area/awaymission/BMPship3) "ak" = (/turf/simulated/floor/engine,/area/awaymission/BMPship3) "al" = (/turf/simulated/shuttle/wall{ icon_state = "swall_straight"; dir = 1; dir = 2},/area/awaymission/BMPship3) "am" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/awaymission/BMPship3) @@ -31,19 +31,19 @@ "aE" = (/turf/simulated/shuttle/wall,/area/awaymission/BMPship1) "aF" = (/obj/structure/stool/bed/roller,/turf/simulated/floor/plating/airless,/area/awaymission/BMPship1) "aG" = (/turf/simulated/floor/plating/airless,/area/awaymission/BMPship1) -"aH" = (/obj/item/weapon/handcuffs,/obj/item/weapon/handcuffs,/obj/structure/closet/crate,/turf/simulated/floor/plating/airless,/area/awaymission/BMPship1) -"aI" = (/obj/item/weapon/scalpel,/obj/structure/closet/crate,/obj/item/weapon/tank/anesthetic,/turf/simulated/floor/plating/airless,/area/awaymission/BMPship1) +"aH" = (/obj/item/handcuffs,/obj/item/handcuffs,/obj/structure/closet/crate,/turf/simulated/floor/plating/airless,/area/awaymission/BMPship1) +"aI" = (/obj/item/scalpel,/obj/structure/closet/crate,/obj/item/tank/anesthetic,/turf/simulated/floor/plating/airless,/area/awaymission/BMPship1) "aJ" = (/obj/item/bodybag,/turf/simulated/floor/plating/airless,/area/awaymission/BMPship1) -"aK" = (/obj/item/weapon/storage/box/syringes,/turf/simulated/floor/plating/airless,/area/awaymission/BMPship1) +"aK" = (/obj/item/storage/box/syringes,/turf/simulated/floor/plating/airless,/area/awaymission/BMPship1) "aL" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating/airless,/area/awaymission/BMPship1) "aM" = (/obj/machinery/optable,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor/plating/airless,/area/awaymission/BMPship1) "aN" = (/obj/machinery/computer/operating,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/awaymission/BMPship1) "aO" = (/turf/simulated/shuttle/wall{ icon_state = "swall_straight"; dir = 1},/area/awaymission/BMPship1) "aP" = (/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 9},/area/awaymission/BMPship1) -"aQ" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/snacks/appendix,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 1},/area/awaymission/BMPship1) -"aR" = (/obj/structure/closet/crate/freezer,/obj/item/brain,/obj/item/weapon/reagent_containers/food/snacks/appendix,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 1},/area/awaymission/BMPship1) -"aS" = (/obj/structure/table/standard,/obj/item/weapon/packageWrap,/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 1},/area/awaymission/BMPship1) -"aT" = (/obj/structure/table/standard,/obj/item/weapon/storage/box,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 1},/area/awaymission/BMPship1) +"aQ" = (/obj/structure/closet/crate/freezer,/obj/item/reagent_containers/food/snacks/appendix,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 1},/area/awaymission/BMPship1) +"aR" = (/obj/structure/closet/crate/freezer,/obj/item/brain,/obj/item/reagent_containers/food/snacks/appendix,/obj/item/reagent_containers/food/snacks/meat,/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 1},/area/awaymission/BMPship1) +"aS" = (/obj/structure/table/standard,/obj/item/packageWrap,/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 1},/area/awaymission/BMPship1) +"aT" = (/obj/structure/table/standard,/obj/item/storage/box,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 1},/area/awaymission/BMPship1) "aU" = (/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 1},/area/awaymission/BMPship1) "aV" = (/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 5},/turf/simulated/shuttle/wall{ icon_state = "swall_c"; dir = 1; dir = 2},/area/awaymission/BMPship1) "aW" = (/turf/simulated/floor/plating/airless{ icon_state = "platingdmg2"},/area/awaymission/BMPship1) @@ -53,15 +53,15 @@ "ba" = (/turf/simulated/shuttle/wall{ icon_state = "swall"; dir = 1},/area/awaymission/BMPship1) "bb" = (/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 8},/area/awaymission/BMPship1) "bc" = (/turf/simulated/floor/plating,/area/awaymission/BMPship1) -"bd" = (/obj/item/weapon/storage/box,/turf/simulated/floor/plating,/area/awaymission/BMPship1) +"bd" = (/obj/item/storage/box,/turf/simulated/floor/plating,/area/awaymission/BMPship1) "be" = (/obj/machinery/gateway{dir = 9},/turf/simulated/floor/plating,/area/awaymission/BMPship1) "bf" = (/obj/machinery/gateway{dir = 1},/turf/simulated/floor/plating,/area/awaymission/BMPship1) "bg" = (/obj/machinery/gateway{dir = 5},/turf/simulated/floor/plating,/area/awaymission/BMPship1) -"bh" = (/obj/item/weapon/hand_labeler,/turf/simulated/floor/plating,/area/awaymission/BMPship1) +"bh" = (/obj/item/hand_labeler,/turf/simulated/floor/plating,/area/awaymission/BMPship1) "bi" = (/obj/structure/largecrate,/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 4},/area/awaymission/BMPship1) "bj" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/turf/simulated/floor/engine,/area/awaymission/BMPship3) -"bk" = (/obj/structure/table/woodentable,/obj/item/weapon/spacecash/c500,/obj/item/weapon/spacecash/c100,/obj/item/weapon/reagent_containers/food/drinks/beer,/turf/simulated/floor/wood,/area/awaymission/BMPship3) -"bl" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/yellow,/turf/simulated/floor/wood,/area/awaymission/BMPship3) +"bk" = (/obj/structure/table/woodentable,/obj/item/spacecash/c500,/obj/item/spacecash/c100,/obj/item/reagent_containers/food/drinks/beer,/turf/simulated/floor/wood,/area/awaymission/BMPship3) +"bl" = (/obj/structure/stool/bed,/obj/item/bedsheet/yellow,/turf/simulated/floor/wood,/area/awaymission/BMPship3) "bm" = (/turf/simulated/shuttle/wall{ icon_state = "swall_straight"; dir = 1},/area/awaymission/BMPship3) "bn" = (/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 9},/area/awaymission/BMPship3) "bo" = (/obj/structure/rack,/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 1},/area/awaymission/BMPship3) @@ -75,7 +75,7 @@ "bw" = (/obj/machinery/door/unpowered/shuttle,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated,/area/awaymission/BMPship1) "bx" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 8},/area/awaymission/BMPship1) "by" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/awaymission/BMPship1) -"bz" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/turf/simulated/floor/plating,/area/awaymission/BMPship1) +"bz" = (/obj/structure/closet/crate/freezer,/obj/item/reagent_containers/food/drinks/beer,/obj/item/reagent_containers/food/drinks/beer,/turf/simulated/floor/plating,/area/awaymission/BMPship1) "bA" = (/obj/machinery/gateway{dir = 8},/turf/simulated/floor/plating,/area/awaymission/BMPship1) "bB" = (/obj/machinery/gateway/centeraway{calibrated = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/awaymission/BMPship1) "bC" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/gateway{dir = 4},/turf/simulated/floor/plating,/area/awaymission/BMPship1) @@ -89,7 +89,7 @@ "bK" = (/obj/machinery/gateway{dir = 10},/turf/simulated/floor/plating,/area/awaymission/BMPship1) "bL" = (/obj/machinery/gateway,/turf/simulated/floor/plating,/area/awaymission/BMPship1) "bM" = (/obj/machinery/gateway{dir = 6},/turf/simulated/floor/plating,/area/awaymission/BMPship1) -"bN" = (/obj/structure/closet/crate,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c50,/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 4},/area/awaymission/BMPship1) +"bN" = (/obj/structure/closet/crate,/obj/item/spacecash/c1000,/obj/item/spacecash/c50,/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 4},/area/awaymission/BMPship1) "bO" = (/turf/simulated/floor{ icon_state = "wood-broken"},/area/awaymission/BMPship3) "bP" = (/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/awaymission/BMPship3) "bQ" = (/obj/machinery/light/small,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/awaymission/BMPship3) @@ -101,9 +101,9 @@ "bW" = (/obj/machinery/sleeper,/turf/simulated/floor/plating/airless,/area/awaymission/BMPship1) "bX" = (/obj/machinery/sleep_console,/turf/simulated/floor/plating/airless,/area/awaymission/BMPship1) "bY" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/awaymission/BMPship1) -"bZ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/item/weapon/hand_labeler,/turf/simulated/floor/plating,/area/awaymission/BMPship1) +"bZ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/item/hand_labeler,/turf/simulated/floor/plating,/area/awaymission/BMPship1) "ca" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor/plating,/area/awaymission/BMPship1) -"cb" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/item/weapon/storage/box,/turf/simulated/floor/plating,/area/awaymission/BMPship1) +"cb" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/item/storage/box,/turf/simulated/floor/plating,/area/awaymission/BMPship1) "cc" = (/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 4},/area/awaymission/BMPship1) "cd" = (/turf/simulated/shuttle/wall{ icon_state = "swall"; dir = 6},/area/awaymission/BMPship3) "ce" = (/turf/simulated/shuttle/wall{ icon_state = "swall"; dir = 8},/area/awaymission/BMPship3) @@ -119,9 +119,9 @@ "co" = (/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/awaymission/BMPship1) "cp" = (/obj/machinery/light/small,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/awaymission/BMPship1) "cq" = (/obj/structure/kitchenspike,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/awaymission/BMPship1) -"cr" = (/obj/structure/closet/crate,/obj/item/device/analyzer,/obj/item/weapon/spacecash/c10,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/awaymission/BMPship1) -"cs" = (/obj/structure/closet/crate,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c200,/obj/item/weapon/spacecash/c500,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/awaymission/BMPship1) -"ct" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice,/obj/item/weapon/reagent_containers/food/snacks/appendix,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/awaymission/BMPship1) +"cr" = (/obj/structure/closet/crate,/obj/item/analyzer,/obj/item/spacecash/c10,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/awaymission/BMPship1) +"cs" = (/obj/structure/closet/crate,/obj/item/spacecash/c1000,/obj/item/spacecash/c200,/obj/item/spacecash/c500,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/awaymission/BMPship1) +"ct" = (/obj/structure/closet/crate/freezer,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/hugemushroomslice,/obj/item/reagent_containers/food/snacks/appendix,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/awaymission/BMPship1) "cu" = (/obj/machinery/door_control{id = "packerCargo"; pixel_y = -24},/obj/machinery/light/small,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/awaymission/BMPship1) "cv" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/awaymission/BMPship1) "cw" = (/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 6},/area/awaymission/BMPship1) @@ -130,7 +130,7 @@ "cz" = (/turf/simulated/floor{ icon_state = "carpet"},/area/awaymission/BMPship3) "cA" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/apc{dir = 1; locked = 0; req_access = ""},/turf/simulated/floor{ icon_state = "carpet"},/area/awaymission/BMPship3) "cB" = (/turf/simulated/shuttle/wall{ icon_state = "swall_straight"; dir = 1; dir = 2},/area/awaymission/BMPship2) -"cC" = (/obj/structure/table/standard,/obj/item/weapon/screwdriver,/obj/item/weapon/screwdriver,/obj/item/weapon/paper{info = "The next person who takes one of my screwdrivers gets stabbed with one. They are MINE. - Love, Madsen"; name = "scribbled note"},/obj/item/weapon/screwdriver,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) +"cC" = (/obj/structure/table/standard,/obj/item/screwdriver,/obj/item/screwdriver,/obj/item/paper{info = "The next person who takes one of my screwdrivers gets stabbed with one. They are MINE. - Love, Madsen"; name = "scribbled note"},/obj/item/screwdriver,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "cD" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "cE" = (/obj/machinery/hydroponics,/turf/simulated/floor{ icon_state = "green"; dir = 8},/area/awaymission/BMPship2) "cF" = (/obj/structure/sink{dir = 2},/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/awaymission/BMPship2) @@ -139,12 +139,12 @@ "cI" = (/obj/machinery/hydroponics,/turf/simulated/floor{ icon_state = "green"; dir = 4},/area/awaymission/BMPship2) "cJ" = (/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "cK" = (/turf/simulated/shuttle/wall{ icon_state = "swall_straight"; dir = 1},/area/awaymission/BMPship2) -"cL" = (/obj/structure/table/standard,/obj/item/weapon/butch,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor{ icon_state = "barber"},/area/awaymission/BMPship2) -"cM" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets,/turf/simulated/floor{ icon_state = "barber"},/area/awaymission/BMPship2) +"cL" = (/obj/structure/table/standard,/obj/item/butch,/obj/item/reagent_containers/food/drinks/beer,/obj/item/reagent_containers/food/snacks/meat,/turf/simulated/floor{ icon_state = "barber"},/area/awaymission/BMPship2) +"cM" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets,/turf/simulated/floor{ icon_state = "barber"},/area/awaymission/BMPship2) "cN" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor{ icon_state = "barber"},/area/awaymission/BMPship2) "cO" = (/obj/machinery/processor,/obj/machinery/light{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{ icon_state = "barber"},/area/awaymission/BMPship2) -"cP" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/beer,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) -"cQ" = (/obj/structure/table/standard,/obj/item/weapon/kitchenknife,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) +"cP" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/drinks/beer,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) +"cQ" = (/obj/structure/table/standard,/obj/item/kitchenknife,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "cR" = (/obj/structure/table/standard,/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "cS" = (/obj/structure/table/standard,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "cT" = (/turf/simulated/shuttle/wall{ icon_state = "swall_t"; dir = 8},/area/awaymission/BMPship1) @@ -152,9 +152,9 @@ "cV" = (/turf/simulated/floor{ icon_state = "carpet15-13"; dir = 4},/area/awaymission/BMPship3) "cW" = (/turf/simulated/floor{ icon_state = "carpet15-7"; dir = 4},/area/awaymission/BMPship3) "cX" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor{ icon_state = "carpet15-7"; dir = 4},/area/awaymission/BMPship3) -"cY" = (/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) +"cY" = (/obj/item/reagent_containers/food/snacks/hugemushroomslice,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "cZ" = (/turf/simulated/floor,/area/awaymission/BMPship2) -"da" = (/obj/item/weapon/reagent_containers/food/drinks/beer,/turf/simulated/floor,/area/awaymission/BMPship2) +"da" = (/obj/item/reagent_containers/food/drinks/beer,/turf/simulated/floor,/area/awaymission/BMPship2) "db" = (/turf/simulated/shuttle/wall{ icon_state = "swall"; dir = 1},/area/awaymission/BMPship2) "dc" = (/turf/simulated/floor{ icon_state = "barber"},/area/awaymission/BMPship2) "dd" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{ icon_state = "barber"},/area/awaymission/BMPship2) @@ -174,23 +174,23 @@ "dr" = (/turf/simulated/floor{ icon_state = "carpet15-11"; dir = 4},/area/awaymission/BMPship3) "ds" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{ icon_state = "carpet15-11"; dir = 4},/area/awaymission/BMPship3) "dt" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{ icon_state = "carpet"},/area/awaymission/BMPship3) -"du" = (/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice,/turf/simulated/floor,/area/awaymission/BMPship2) +"du" = (/obj/item/reagent_containers/food/snacks/hugemushroomslice,/turf/simulated/floor,/area/awaymission/BMPship2) "dv" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "dw" = (/obj/structure/window/reinforced,/turf/simulated/floor{ icon_state = "barber"},/area/awaymission/BMPship2) "dx" = (/obj/structure/window/reinforced,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor{ icon_state = "barber"},/area/awaymission/BMPship2) "dy" = (/obj/machinery/door/window,/turf/simulated/floor{ icon_state = "barber"},/area/awaymission/BMPship2) "dz" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor{ icon_state = "barber"},/area/awaymission/BMPship2) -"dA" = (/obj/item/weapon/reagent_containers/food/drinks/beer,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) +"dA" = (/obj/item/reagent_containers/food/drinks/beer,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "dB" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/BMPship1) "dC" = (/obj/structure/closet/secure_closet/freezer/meat{opened = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/BMPship1) -"dD" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor{icon_state = "white"},/area/awaymission/BMPship1) +"dD" = (/obj/structure/closet/crate/freezer,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/turf/simulated/floor{icon_state = "white"},/area/awaymission/BMPship1) "dE" = (/obj/effect/landmark{name = "awaystart"},/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor{icon_state = "white"},/area/awaymission/BMPship1) -"dF" = (/obj/item/weapon/crowbar,/turf/simulated/floor{icon_state = "white"},/area/awaymission/BMPship1) +"dF" = (/obj/item/crowbar,/turf/simulated/floor{icon_state = "white"},/area/awaymission/BMPship1) "dG" = (/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/awaymission/BMPship1) "dH" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/apc{dir = 1; environ = 0; equipment = 3; locked = 0; req_access = ""},/turf/simulated/floor/plating,/area/awaymission/BMPship1) "dI" = (/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/awaymission/BMPship1) -"dJ" = (/obj/structure/table/standard,/obj/item/weapon/paper{info = "I'm no scientist, but judging from the design and components, it seems to be some kind of gateway. This thing is gonna be worth a lot of cash to the right man. The boys are excited, as they have every right to be, and I've let them crack into that case of beer we got. I normally wouldn't allow such a thing, but this is a time for celebration! It's not like a couple drinks will hurt anything."; name = "Captain's log entry"},/turf/simulated/floor{ icon_state = "carpet6-0"; dir = 4},/area/awaymission/BMPship3) -"dK" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/beer,/turf/simulated/floor{ icon_state = "carpet14-2"; dir = 4},/area/awaymission/BMPship3) +"dJ" = (/obj/structure/table/standard,/obj/item/paper{info = "I'm no scientist, but judging from the design and components, it seems to be some kind of gateway. This thing is gonna be worth a lot of cash to the right man. The boys are excited, as they have every right to be, and I've let them crack into that case of beer we got. I normally wouldn't allow such a thing, but this is a time for celebration! It's not like a couple drinks will hurt anything."; name = "Captain's log entry"},/turf/simulated/floor{ icon_state = "carpet6-0"; dir = 4},/area/awaymission/BMPship3) +"dK" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/drinks/beer,/turf/simulated/floor{ icon_state = "carpet14-2"; dir = 4},/area/awaymission/BMPship3) "dL" = (/obj/structure/computerframe{anchored = 1},/turf/simulated/floor{ icon_state = "carpet14-8"; dir = 4},/area/awaymission/BMPship3) "dM" = (/turf/simulated/floor{ icon_state = "carpet10-0"; dir = 4},/area/awaymission/BMPship3) "dN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{ icon_state = "carpet"},/area/awaymission/BMPship3) @@ -202,13 +202,13 @@ "dT" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "dU" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "dV" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) -"dW" = (/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/BMPship1) +"dW" = (/obj/item/reagent_containers/food/snacks/meat,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/BMPship1) "dX" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/awaymission/BMPship1) "dY" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/BMPship1) "dZ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/awaymission/BMPship1) "ea" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/awaymission/BMPship1) "eb" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/awaymission/BMPship1) -"ec" = (/obj/item/device/multitool,/turf/simulated/floor/engine,/area/awaymission/BMPship1) +"ec" = (/obj/item/multitool,/turf/simulated/floor/engine,/area/awaymission/BMPship1) "ed" = (/obj/structure/shuttle/engine/heater{ icon_state = "heater"; dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/airless{ icon_state = "engine"},/area/awaymission/BMPship1) "ee" = (/obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion"; dir = 8},/turf/space,/area/awaymission/BMPship1) "ef" = (/turf/simulated/floor{ icon_state = "carpet15-15"; dir = 4},/area/awaymission/BMPship3) @@ -232,7 +232,7 @@ "ex" = (/turf/simulated/floor/engine,/area/awaymission/BMPship1) "ey" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/turf/simulated/floor/plating,/area/awaymission/BMPship3) "ez" = (/obj/structure/computerframe{anchored = 1},/turf/simulated/floor{ icon_state = "carpetside"; dir = 9},/area/awaymission/BMPship3) -"eA" = (/obj/item/weapon/shard,/turf/simulated/floor{ icon_state = "carpetside"; dir = 5},/area/awaymission/BMPship3) +"eA" = (/obj/item/shard,/turf/simulated/floor{ icon_state = "carpetside"; dir = 5},/area/awaymission/BMPship3) "eB" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{ icon_state = "carpet"},/area/awaymission/BMPship3) "eC" = (/obj/machinery/door/airlock/silver,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor{ icon_state = "carpetside"; dir = 4},/area/awaymission/BMPship2) "eD" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) @@ -249,7 +249,7 @@ "eO" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/awaymission/BMPship1) "eP" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/awaymission/BMPship1) "eQ" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/awaymission/BMPship1) -"eR" = (/obj/structure/rack,/obj/item/weapon/storage/box/lights,/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/awaymission/BMPship1) +"eR" = (/obj/structure/rack,/obj/item/storage/box/lights,/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/awaymission/BMPship1) "eS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/BMPship1) "eT" = (/obj/machinery/power/smes/magical{desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; name = "power storage unit"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plating,/area/awaymission/BMPship1) "eU" = (/obj/machinery/power/terminal{dir = 8},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/awaymission/BMPship1) @@ -257,13 +257,13 @@ "eW" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating,/area/awaymission/BMPship3) "eX" = (/obj/structure/table/standard,/turf/simulated/floor{ icon_state = "carpet7-3"; dir = 4},/area/awaymission/BMPship3) "eY" = (/obj/structure/stool/bed/chair/office{dir = 8},/turf/simulated/floor{ icon_state = "carpet11-12"; dir = 4},/area/awaymission/BMPship3) -"eZ" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor{ icon_state = "carpet15-14"; dir = 4},/area/awaymission/BMPship3) +"eZ" = (/obj/item/shard{icon_state = "medium"},/turf/simulated/floor{ icon_state = "carpet15-14"; dir = 4},/area/awaymission/BMPship3) "fa" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{ icon_state = "carpet15-15"; dir = 4},/area/awaymission/BMPship3) "fb" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/awaymission/BMPship2) "fc" = (/obj/effect/decal/cleanable/dirt,/obj/effect/gibspawner/generic,/turf/simulated/floor/plating,/area/awaymission/BMPship2) "fd" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/awaymission/BMPship2) "fe" = (/turf/simulated/floor/plating,/area/awaymission/BMPship2) -"ff" = (/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) +"ff" = (/obj/item/reagent_containers/glass/bucket,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "fg" = (/obj/machinery/conveyor_switch/oneway{id = "meatConvey1"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "fh" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "fi" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship1) @@ -273,7 +273,7 @@ "fm" = (/turf/simulated/shuttle/plating,/area/awaymission/BMPship1) "fn" = (/obj/effect/gibspawner/human,/turf/simulated/shuttle/plating,/area/awaymission/BMPship1) "fo" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating,/area/awaymission/BMPship1) -"fp" = (/obj/structure/rack,/obj/item/weapon/storage/belt/utility/full,/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/awaymission/BMPship1) +"fp" = (/obj/structure/rack,/obj/item/storage/belt/utility/full,/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/awaymission/BMPship1) "fq" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plating,/area/awaymission/BMPship1) "fr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/awaymission/BMPship1) "fs" = (/turf/simulated/shuttle/wall{ icon_state = "swall_s"; dir = 8; dir = 2},/area/awaymission/BMPship1) @@ -288,7 +288,7 @@ "fB" = (/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship1) "fC" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/awaymission/BMPship1) "fD" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"},/turf/simulated/shuttle/plating,/area/awaymission/BMPship1) -"fE" = (/obj/structure/rack,/obj/item/weapon/cell/high,/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/awaymission/BMPship1) +"fE" = (/obj/structure/rack,/obj/item/cell/high,/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/awaymission/BMPship1) "fF" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/grille,/turf/simulated/floor/plating,/area/awaymission/BMPship3) "fG" = (/turf/simulated/floor{ icon_state = "carpetside"; dir = 10},/area/awaymission/BMPship3) "fH" = (/turf/simulated/floor{ icon_state = "carpetside"; dir = 6},/area/awaymission/BMPship3) @@ -311,12 +311,12 @@ "fY" = (/obj/structure/closet,/turf/simulated/floor{ icon_state = "carpet15-15"; dir = 4},/area/awaymission/BMPship3) "fZ" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/closet,/turf/simulated/floor{ icon_state = "carpet"; dir = 4},/area/awaymission/BMPship3) "ga" = (/obj/effect/gibspawner/xeno,/turf/simulated/floor/plating,/area/awaymission/BMPship2) -"gb" = (/obj/item/weapon/wrench,/turf/simulated/floor/plating,/area/awaymission/BMPship2) +"gb" = (/obj/item/wrench,/turf/simulated/floor/plating,/area/awaymission/BMPship2) "gc" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "gd" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship1) "ge" = (/obj/structure/mopbucket,/turf/simulated/shuttle/plating,/area/awaymission/BMPship1) -"gf" = (/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/kitchenknife,/turf/simulated/shuttle/plating,/area/awaymission/BMPship1) -"gg" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/item/weapon/cell/high,/turf/simulated/floor,/area/awaymission/BMPship1) +"gf" = (/obj/structure/window/reinforced{dir = 4},/obj/item/kitchenknife,/turf/simulated/shuttle/plating,/area/awaymission/BMPship1) +"gg" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/item/cell/high,/turf/simulated/floor,/area/awaymission/BMPship1) "gh" = (/turf/simulated/shuttle/wall{ icon_state = "swall_s"; dir = 1; dir = 2},/area/awaymission/BMPship3) "gi" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/floor{ icon_state = "carpetside"},/area/awaymission/BMPship3) "gj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/unpowered/shuttle,/turf/simulated/floor{ icon_state = "carpetside"},/area/awaymission/BMPship3) @@ -324,7 +324,7 @@ "gl" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{ icon_state = "panelscorched"},/area/awaymission/BMPship2) "gm" = (/obj/structure/kitchenspike,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "gn" = (/turf/simulated/floor{ icon_state = "loadingareadirty1"; dir = 4},/area/awaymission/BMPship2) -"go" = (/obj/machinery/conveyor{dir = 4; id = "meatConvey2"},/obj/item/weapon/kitchenknife,/turf/simulated/shuttle/plating,/area/awaymission/BMPship2) +"go" = (/obj/machinery/conveyor{dir = 4; id = "meatConvey2"},/obj/item/kitchenknife,/turf/simulated/shuttle/plating,/area/awaymission/BMPship2) "gp" = (/obj/machinery/conveyor{dir = 4; id = "meatConvey2"},/obj/structure/plasticflaps,/turf/simulated/shuttle/plating,/area/awaymission/BMPship2) "gq" = (/obj/machinery/conveyor{dir = 4; id = "meatConvey2"},/turf/simulated/shuttle/plating,/area/awaymission/BMPship2) "gr" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) @@ -338,26 +338,26 @@ "gz" = (/obj/structure/lattice,/turf/space,/area/awaymission/BMPship3) "gA" = (/turf/simulated/floor/plating/airless{ icon_state = "platingdmg3"},/area/awaymission/BMPship3) "gB" = (/obj/item/stack/cable_coil{amount = 5},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating/airless,/area/awaymission/BMPship3) -"gC" = (/obj/item/weapon/shard{icon_state = "small"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating/airless,/area/awaymission/BMPship3) +"gC" = (/obj/item/shard{icon_state = "small"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating/airless,/area/awaymission/BMPship3) "gD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating/airless{ icon_state = "panelscorched"},/area/awaymission/BMPship3) "gE" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating/airless{ icon_state = "platingdmg3"},/area/awaymission/BMPship3) -"gF" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/item/weapon/kitchenknife,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) +"gF" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/item/kitchenknife,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "gG" = (/obj/machinery/conveyor_switch/oneway{id = "meatConvey2"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) "gH" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/BMPship1) "gI" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/BMPship1) "gJ" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/BMPship1) -"gK" = (/obj/item/weapon/mop,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/BMPship1) +"gK" = (/obj/item/mop,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/BMPship1) "gL" = (/obj/effect/decal/cleanable/oil,/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/BMPship1) "gM" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/awaymission/BMPship1) "gN" = (/turf/simulated/floor/plating/airless{ icon_state = "platingdmg2"},/area/awaymission/BMPship3) -"gO" = (/obj/item/weapon/shard,/turf/simulated/floor/plating/airless{ icon_state = "platingdmg1"},/area/awaymission/BMPship3) +"gO" = (/obj/item/shard,/turf/simulated/floor/plating/airless{ icon_state = "platingdmg1"},/area/awaymission/BMPship3) "gP" = (/obj/structure/stool,/turf/simulated/floor/plating/airless{ icon_state = "platingdmg3"},/area/awaymission/BMPship3) "gQ" = (/turf/simulated/floor/plating/airless,/area/awaymission/BMPship3) "gR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plating/airless,/area/awaymission/BMPship3) "gS" = (/turf/simulated/floor{ icon_state = "plating"},/area/awaymission/BMPship2) "gT" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/BMPship2) -"gU" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/BMPship1) -"gV" = (/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/BMPship1) +"gU" = (/obj/structure/closet/crate/freezer,/obj/item/reagent_containers/food/snacks/meat,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/BMPship1) +"gV" = (/obj/item/reagent_containers/glass/bucket,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/BMPship1) "gW" = (/obj/structure/reagent_dispensers,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/BMPship1) "gX" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/shuttle/plating,/area/awaymission/BMPship1) "gY" = (/turf/simulated/shuttle/wall{ icon_state = "swall"; dir = 6},/area/awaymission/BMPship1) @@ -371,7 +371,7 @@ "hg" = (/obj/machinery/door/airlock/silver{locked = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/awaymission/BMPship1) "hh" = (/obj/machinery/door/unpowered/shuttle,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor,/area/awaymission/BMPship1) "hi" = (/turf/simulated/mineral/random,/area/awaymission) -"hj" = (/obj/item/device/multitool,/turf/simulated/floor/plating/airless{ icon_state = "platingdmg2"},/area/awaymission) +"hj" = (/obj/item/multitool,/turf/simulated/floor/plating/airless{ icon_state = "platingdmg2"},/area/awaymission) "hk" = (/turf/simulated/shuttle/wall{ icon_state = "swall"; dir = 5},/area/awaymission/BMPship3) "hl" = (/turf/simulated/shuttle/wall{ icon_state = "swall"; dir = 10},/area/awaymission/BMPship3) "hm" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/silver,/turf/simulated/floor/plating/airless,/area/awaymission/BMPship3) @@ -382,8 +382,8 @@ "hr" = (/turf/simulated/shuttle/wall{ icon_state = "swall15"},/area/awaymission/BMPship2) "hs" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/awaymission/BMPship1) "ht" = (/obj/structure/stool,/turf/simulated/floor,/area/awaymission/BMPship1) -"hu" = (/obj/structure/table/standard,/obj/item/weapon/paper{info = "DEAR DAIRY: So we was doing our typpical route when the captain says we've been picking up weird signals on some backwatter planet. Madsen wanted to stay on course but he ain't the captain, so we went out of the way to check it out. There was lots of rocks on the way, but we got to the planet fine. Found a big fancy camp with nobody around and this big metal donut thing with NT stamps all over it right in the middle. Case of beer too. Captain reckons we can pass it off to some buyer in the Syndicate. Ingram says it's bad luck and that someone is going to come look for it but it sounds like better money than selling bad meat to jerky companies."; name = "Old Diary"},/turf/simulated/floor,/area/awaymission/BMPship1) -"hv" = (/obj/structure/table/standard,/obj/item/weapon/pen/red,/obj/item/weapon/reagent_containers/food/drinks/beer,/turf/simulated/floor,/area/awaymission/BMPship1) +"hu" = (/obj/structure/table/standard,/obj/item/paper{info = "DEAR DAIRY: So we was doing our typpical route when the captain says we've been picking up weird signals on some backwatter planet. Madsen wanted to stay on course but he ain't the captain, so we went out of the way to check it out. There was lots of rocks on the way, but we got to the planet fine. Found a big fancy camp with nobody around and this big metal donut thing with NT stamps all over it right in the middle. Case of beer too. Captain reckons we can pass it off to some buyer in the Syndicate. Ingram says it's bad luck and that someone is going to come look for it but it sounds like better money than selling bad meat to jerky companies."; name = "Old Diary"},/turf/simulated/floor,/area/awaymission/BMPship1) +"hv" = (/obj/structure/table/standard,/obj/item/pen/red,/obj/item/reagent_containers/food/drinks/beer,/turf/simulated/floor,/area/awaymission/BMPship1) "hw" = (/obj/structure/closet,/obj/item/clothing/under/overalls,/turf/simulated/floor,/area/awaymission/BMPship1) "hx" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/turf/simulated/floor/engine,/area/awaymission/BMPship3) "hy" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/engine,/area/awaymission/BMPship3) @@ -408,7 +408,7 @@ "hR" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/awaymission/BMPship1) "hS" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/awaymission/BMPship1) "hT" = (/obj/effect/decal/remains/human,/obj/item/clothing/head/helmet/space/syndicate/green/dark,/obj/effect/gibspawner/generic,/turf/simulated/floor/plating/airless/asteroid,/area/awaymission) -"hU" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/item/weapon/shard{icon_state = "small"},/turf/simulated/floor/engine,/area/awaymission/BMPship3) +"hU" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/item/shard{icon_state = "small"},/turf/simulated/floor/engine,/area/awaymission/BMPship3) "hV" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated,/area/awaymission/BMPship3) "hW" = (/obj/effect/gibspawner/robot,/turf/simulated,/area/awaymission/BMPship3) "hX" = (/turf/simulated/floor/plating/airless{ icon_state = "platingdmg2"},/area/awaymission) @@ -417,7 +417,7 @@ "ia" = (/obj/effect/landmark{name = "awaystart"},/turf/simulated/floor/plating{ icon_state = "platingdmg3"},/area/awaymission) "ib" = (/obj/effect/landmark{name = "awaystart"},/turf/simulated/floor/plating/airless,/area/awaymission) "ic" = (/obj/structure/stool/bed,/turf/simulated/floor,/area/awaymission/BMPship1) -"id" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/item/weapon/storage/wallet/random,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/awaymission/BMPship1) +"id" = (/obj/structure/stool/bed,/obj/item/bedsheet,/obj/item/storage/wallet/random,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/awaymission/BMPship1) "ie" = (/obj/structure/closet,/obj/item/clothing/under/lawyer/bluesuit,/obj/item/clothing/suit/apron,/turf/simulated/floor,/area/awaymission/BMPship1) "if" = (/obj/item/clothing/suit/space/syndicate/green/dark,/turf/simulated/floor/plating/airless/asteroid,/area/awaymission) "ig" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/grille,/turf/simulated/floor/engine,/area/awaymission/BMPship3) @@ -427,28 +427,28 @@ "ik" = (/obj/machinery/door/unpowered/shuttle,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating,/area/awaymission/BMPship1) "il" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/awaymission/BMPship1) "im" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/awaymission/BMPship1) -"in" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/space,/area) +"in" = (/obj/item/shard{icon_state = "medium"},/turf/space,/area) "io" = (/turf/simulated/shuttle/wall{ icon_state = "swall_t"; dir = 2},/area/awaymission/BMPship3) "ip" = (/turf/simulated/shuttle/wall,/area/awaymission/BMPship3) "iq" = (/turf/simulated/floor/plating/airless{ icon_state = "panelscorched"},/area/awaymission) "ir" = (/obj/effect/decal/remains/human,/turf/simulated/floor,/area/awaymission/BMPship1) -"is" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor,/area/awaymission/BMPship1) +"is" = (/obj/structure/stool/bed,/obj/item/bedsheet,/turf/simulated/floor,/area/awaymission/BMPship1) "it" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/BMPship1) "iu" = (/obj/structure/mirror{pixel_y = 28},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/BMPship1) "iv" = (/obj/structure/toilet{dir = 8},/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/BMPship1) -"iw" = (/obj/item/weapon/caution,/turf/simulated/floor/plating/airless,/area/awaymission) +"iw" = (/obj/item/caution,/turf/simulated/floor/plating/airless,/area/awaymission) "ix" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating/airless,/area/awaymission) -"iy" = (/obj/structure/closet/crate,/obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c200,/turf/simulated/floor,/area/awaymission/BMPship1) -"iz" = (/obj/structure/closet/crate,/obj/item/weapon/spacecash/c10,/turf/simulated/floor,/area/awaymission/BMPship1) +"iy" = (/obj/structure/closet/crate,/obj/item/spacecash/c10,/obj/item/spacecash/c200,/turf/simulated/floor,/area/awaymission/BMPship1) +"iz" = (/obj/structure/closet/crate,/obj/item/spacecash/c10,/turf/simulated/floor,/area/awaymission/BMPship1) "iA" = (/obj/structure/sink{dir = 2},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/BMPship1) "iB" = (/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/turf/simulated/shuttle/wall{ icon_state = "swall_c"; dir = 4; dir = 2},/area/awaymission/BMPship1) "iC" = (/obj/item/clothing/gloves/fyellow,/turf/simulated/floor/plating/airless/asteroid,/area/awaymission) "iD" = (/turf/simulated/shuttle/wall{ icon_state = "swall"; dir = 4},/area/awaymission) "iE" = (/turf/simulated/shuttle/wall{ icon_state = "swall_straight"; dir = 4},/area/awaymission) -"iF" = (/obj/item/weapon/storage/box/matches,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/turf/simulated/floor/plating,/area/awaymission/BMPship3) -"iG" = (/obj/item/weapon/contraband/poster,/turf/simulated/floor/plating,/area/awaymission/BMPship3) +"iF" = (/obj/item/storage/box/matches,/obj/item/storage/fancy/cigarettes/dromedaryco,/turf/simulated/floor/plating,/area/awaymission/BMPship3) +"iG" = (/obj/item/contraband/poster,/turf/simulated/floor/plating,/area/awaymission/BMPship3) "iH" = (/turf/simulated/shuttle/wall{ icon_state = "swall_s"; dir = 8; dir = 2},/area/awaymission/BMPship3) -"iI" = (/obj/item/weapon/reagent_containers/food/drinks/beer,/turf/simulated/floor/plating,/area/awaymission/BMPship3) +"iI" = (/obj/item/reagent_containers/food/drinks/beer,/turf/simulated/floor/plating,/area/awaymission/BMPship3) "iJ" = (/turf/simulated/floor/plating,/turf/simulated/shuttle/wall{ icon_state = "swall_c"; dir = 4; dir = 2},/area/awaymission/BMPship3) "iK" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/grille,/turf/simulated/floor/engine,/area/awaymission/BMPship3) "iL" = (/turf/simulated/mineral/diamond,/area/awaymission) diff --git a/maps/RandomZLevels/challenge.dmm b/maps/RandomZLevels/challenge.dmm index 841dc05fb13..2f6d8dd4f3b 100644 --- a/maps/RandomZLevels/challenge.dmm +++ b/maps/RandomZLevels/challenge.dmm @@ -6,14 +6,14 @@ "af" = (/turf/simulated/floor/airless{icon_state = "damaged2"},/area/awaymission/challenge/start) "ag" = (/obj/item/clothing/suit/space/syndicate/blue,/obj/item/clothing/head/helmet/space/syndicate/blue,/turf/simulated/floor/airless{icon_state = "damaged2"},/area/awaymission/challenge/start) "ah" = (/turf/simulated/floor/airless,/area/awaymission/challenge/start) -"ai" = (/obj/item/device/flashlight{icon_state = "flashlight-on"; item_state = "flashlight"; on = 1},/turf/simulated/floor/airless,/area/awaymission/challenge/start) +"ai" = (/obj/item/flashlight{icon_state = "flashlight-on"; item_state = "flashlight"; on = 1},/turf/simulated/floor/airless,/area/awaymission/challenge/start) "aj" = (/obj/effect/landmark{name = "awaystart"},/turf/simulated/floor/airless{icon_state = "damaged3"},/area/awaymission/challenge/start) "ak" = (/obj/effect/decal/remains/human,/turf/simulated/floor/airless{icon_state = "damaged4"},/area/awaymission/challenge/start) "al" = (/obj/effect/landmark{name = "awaystart"},/turf/simulated/floor/airless,/area/awaymission/challenge/start) "am" = (/obj/item/clothing/suit/space/syndicate/green,/obj/item/clothing/head/helmet/space/syndicate/green,/turf/simulated/floor/airless{icon_state = "damaged2"},/area/awaymission/challenge/start) "an" = (/turf/simulated/floor/airless{icon_state = "damaged3"},/area/awaymission/challenge/start) "ao" = (/obj/item/clothing/suit/space/syndicate/orange,/obj/item/clothing/head/helmet/space/syndicate/orange,/turf/simulated/floor/airless,/area/awaymission/challenge/start) -"ap" = (/obj/item/weapon/gun/energy/laser/retro,/turf/simulated/floor/airless,/area/awaymission/challenge/start) +"ap" = (/obj/item/gun/energy/laser/retro,/turf/simulated/floor/airless,/area/awaymission/challenge/start) "aq" = (/obj/item/stack/rods,/turf/simulated/floor,/area/awaymission/challenge/start) "ar" = (/obj/effect/decal/cleanable/oil,/turf/simulated/floor/airless,/area/awaymission/challenge/start) "as" = (/obj/effect/decal/remains/robot,/turf/simulated/floor/airless{icon_state = "damaged2"},/area/awaymission/challenge/start) @@ -47,11 +47,11 @@ "aU" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/airless,/area/awaymission/challenge/main) "aV" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/awaymission/challenge/main) "aW" = (/obj/machinery/power/emitter{active = 1; active_power_usage = 0; anchored = 1; dir = 8; idle_power_usage = 0; locked = 1; name = "Energy Cannon"; req_access_txt = "100"; state = 2; use_power = 0},/turf/simulated/floor/plating/airless,/area/awaymission/challenge/main) -"aX" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/weapon/gun/energy/lasercannon},/turf/simulated/floor/plating/airless,/area/awaymission/challenge/main) +"aX" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/gun/energy/lasercannon},/turf/simulated/floor/plating/airless,/area/awaymission/challenge/main) "aY" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/awaymission/challenge/main) "aZ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/awaymission/challenge/main) "ba" = (/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/awaymission/challenge/main) -"bb" = (/obj/item/device/multitool,/turf/simulated/floor/airless,/area/awaymission/challenge/main) +"bb" = (/obj/item/multitool,/turf/simulated/floor/airless,/area/awaymission/challenge/main) "bc" = (/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor/airless,/area/awaymission/challenge/main) "bd" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 9},/area/awaymission/challenge/main) "be" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 1},/area/awaymission/challenge/main) @@ -65,10 +65,10 @@ "bm" = (/obj/machinery/door/window,/turf/simulated/floor/airless,/area/awaymission/challenge/main) "bn" = (/obj/machinery/power/emitter{active = 1; active_power_usage = 0; anchored = 1; dir = 2; idle_power_usage = 0; locked = 1; name = "Energy Cannon"; req_access_txt = "100"; state = 2; use_power = 0},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 8},/area/awaymission/challenge/main) "bo" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/plating,/area/awaymission/challenge/main) -"bp" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/weapon/gun/energy/lasercannon},/turf/simulated/floor/plating,/area/awaymission/challenge/main) +"bp" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/gun/energy/lasercannon},/turf/simulated/floor/plating,/area/awaymission/challenge/main) "bq" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 4},/area/awaymission/challenge/main) "br" = (/obj/structure/window/reinforced{dir = 4},/obj/effect/decal/cleanable/oil,/turf/simulated/floor/plating/airless,/area/awaymission/challenge/main) -"bs" = (/obj/item/weapon/storage/toolbox/electrical,/turf/simulated/floor/airless,/area/awaymission/challenge/main) +"bs" = (/obj/item/storage/toolbox/electrical,/turf/simulated/floor/airless,/area/awaymission/challenge/main) "bt" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 10},/area/awaymission/challenge/main) "bu" = (/obj/structure/window/reinforced,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/awaymission/challenge/main) "bv" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 6},/area/awaymission/challenge/main) @@ -79,7 +79,7 @@ "bA" = (/obj/item/clothing/gloves/yellow,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/awaymission/challenge/main) "bB" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/power/emitter{active = 1; active_power_usage = 0; anchored = 1; dir = 8; idle_power_usage = 0; locked = 1; name = "Energy Cannon"; req_access_txt = "100"; state = 2; use_power = 0},/turf/simulated/floor/plating/airless,/area/awaymission/challenge/main) "bC" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/power/emitter{active = 1; active_power_usage = 0; anchored = 1; dir = 4; idle_power_usage = 0; locked = 1; name = "Energy Cannon"; req_access_txt = "100"; state = 2; use_power = 0},/turf/simulated/floor/plating/airless,/area/awaymission/challenge/main) -"bD" = (/obj/item/weapon/storage/firstaid/fire,/turf/simulated/floor/airless,/area/awaymission/challenge/main) +"bD" = (/obj/item/storage/firstaid/fire,/turf/simulated/floor/airless,/area/awaymission/challenge/main) "bE" = (/turf/simulated/floor{dir = 2; icon_state = "whitecorner"},/area/awaymission/challenge/main) "bF" = (/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/challenge/main) "bG" = (/turf/simulated/floor{dir = 8; icon_state = "whitecorner"},/area/awaymission/challenge/main) @@ -91,7 +91,7 @@ "bM" = (/obj/machinery/power/emitter{active = 1; active_power_usage = 0; anchored = 1; dir = 1; idle_power_usage = 0; locked = 1; name = "Energy Cannon"; req_access_txt = "100"; state = 2; use_power = 0},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/awaymission/challenge/main) "bN" = (/obj/machinery/power/emitter{active = 1; active_power_usage = 0; anchored = 1; dir = 1; idle_power_usage = 0; locked = 1; name = "Energy Cannon"; req_access_txt = "100"; state = 2; use_power = 0},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/awaymission/challenge/main) "bO" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/awaymission/challenge/end) -"bP" = (/obj/item/weapon/gun/projectile/russian,/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/challenge/main) +"bP" = (/obj/item/gun/projectile/russian,/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/challenge/main) "bQ" = (/obj/structure/table/reinforced,/obj/machinery/light{dir = 1},/obj/machinery/recharger{pixel_y = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/challenge/end) "bR" = (/obj/machinery/computer/security/telescreen{desc = "Used for watching evil areas."; name = "Security Monitor"; network = ""; pixel_x = 0; pixel_y = 30},/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) "bS" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/light,/turf/simulated/floor/plating/airless,/area/awaymission/challenge/main) @@ -104,33 +104,33 @@ "bZ" = (/obj/structure/mirror{pixel_y = 28},/turf/simulated/floor/wood,/area/awaymission/challenge/end) "ca" = (/obj/machinery/light{dir = 1},/obj/structure/rack,/obj/item/clothing/suit/armor/swat,/obj/item/clothing/head/helmet/space/deathsquad,/turf/simulated/floor/wood,/area/awaymission/challenge/end) "cb" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/challenge/end) -"cc" = (/obj/structure/stool/bed/chair{dir = 1},/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = 28},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) +"cc" = (/obj/structure/stool/bed/chair{dir = 1},/obj/item/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = 28},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) "cd" = (/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) "ce" = (/mob/living/simple_animal/hostile/syndicate/ranged/space{name = "Syndicate Officer"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) "cf" = (/obj/machinery/door/airlock/centcom{name = "Airlock"; opacity = 1; req_access_txt = "109"},/turf/simulated/floor/plating,/area/awaymission/challenge/end) -"cg" = (/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = -27},/turf/simulated/floor/carpet,/area/awaymission/challenge/end) +"cg" = (/obj/item/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = -27},/turf/simulated/floor/carpet,/area/awaymission/challenge/end) "ch" = (/obj/structure/stool/bed/chair/comfy/black,/mob/living/simple_animal/hostile/syndicate{name = "Syndicate Commander"},/turf/simulated/floor/carpet,/area/awaymission/challenge/end) "ci" = (/obj/structure/table/woodentable,/obj/machinery/recharger{pixel_y = 4},/turf/simulated/floor/carpet,/area/awaymission/challenge/end) "cj" = (/turf/simulated/floor/wood,/area/awaymission/challenge/end) -"ck" = (/obj/structure/rack,/obj/item/weapon/gun/projectile/mateba,/turf/simulated/floor/wood,/area/awaymission/challenge/end) +"ck" = (/obj/structure/rack,/obj/item/gun/projectile/mateba,/turf/simulated/floor/wood,/area/awaymission/challenge/end) "cl" = (/mob/living/simple_animal/hostile/syndicate/melee,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) "cm" = (/obj/structure/window/reinforced{dir = 4},/turf/space,/area) "cn" = (/turf/simulated/floor/bluegrid,/area/awaymission/challenge/end) "co" = (/turf/simulated/floor{ icon_state = "vault"; dir = 8},/area/awaymission/challenge/end) "cp" = (/obj/structure/window/reinforced{dir = 8},/turf/space,/area) -"cq" = (/obj/structure/table/woodentable,/obj/item/weapon/melee/chainofcommand,/obj/item/weapon/stamp,/turf/simulated/floor/carpet,/area/awaymission/challenge/end) -"cr" = (/obj/structure/table/woodentable,/obj/item/weapon/paper{info = "Congratulations,

Your station has been selected to carry out the Gateway Project.

The equipment will be shipped to you at the start of the next quarter.
You are to prepare a secure location to house the equipment as outlined in the attached documents.

--Nanotrasen Blue Space Research"; name = "Confidential Correspondence, Pg 1"; pixel_x = 0; pixel_y = 0},/obj/item/weapon/folder/blue,/turf/simulated/floor/carpet,/area/awaymission/challenge/end) -"cs" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/turf/simulated/floor/carpet,/area/awaymission/challenge/end) -"ct" = (/obj/structure/rack,/obj/item/weapon/gun/projectile/silenced,/turf/simulated/floor/wood,/area/awaymission/challenge/end) +"cq" = (/obj/structure/table/woodentable,/obj/item/melee/chainofcommand,/obj/item/stamp,/turf/simulated/floor/carpet,/area/awaymission/challenge/end) +"cr" = (/obj/structure/table/woodentable,/obj/item/paper{info = "Congratulations,

Your station has been selected to carry out the Gateway Project.

The equipment will be shipped to you at the start of the next quarter.
You are to prepare a secure location to house the equipment as outlined in the attached documents.

--Nanotrasen Blue Space Research"; name = "Confidential Correspondence, Pg 1"; pixel_x = 0; pixel_y = 0},/obj/item/folder/blue,/turf/simulated/floor/carpet,/area/awaymission/challenge/end) +"cs" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/turf/simulated/floor/carpet,/area/awaymission/challenge/end) +"ct" = (/obj/structure/rack,/obj/item/gun/projectile/silenced,/turf/simulated/floor/wood,/area/awaymission/challenge/end) "cu" = (/mob/living/simple_animal/hostile/syndicate/melee,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/challenge/end) "cv" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor/wood,/area/awaymission/challenge/end) -"cw" = (/obj/structure/rack,/obj/item/weapon/gun/projectile/automatic/l6_saw,/turf/simulated/floor/wood,/area/awaymission/challenge/end) +"cw" = (/obj/structure/rack,/obj/item/gun/projectile/automatic/l6_saw,/turf/simulated/floor/wood,/area/awaymission/challenge/end) "cx" = (/obj/machinery/door/airlock/centcom{name = "Security"; opacity = 1; req_access_txt = "109"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) "cy" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/space,/area) "cz" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/space,/area) "cA" = (/obj/structure/sign/securearea,/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/awaymission/challenge/end) "cB" = (/obj/machinery/door/airlock/centcom{name = "Administrator"; opacity = 1; req_access_txt = "109"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) -"cC" = (/obj/item/weapon/storage/toolbox/electrical,/turf/simulated/floor/bluegrid,/area/awaymission/challenge/end) +"cC" = (/obj/item/storage/toolbox/electrical,/turf/simulated/floor/bluegrid,/area/awaymission/challenge/end) "cD" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/bluegrid,/area/awaymission/challenge/end) "cE" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/bluegrid,/area/awaymission/challenge/end) "cF" = (/mob/living/simple_animal/hostile/syndicate/ranged,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) @@ -160,11 +160,11 @@ "dd" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/poddoor{icon_state = "pdoor1"; id = "challenge"; name = "Gateway Shutters"; p_open = 0},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) "de" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/space,/area) "df" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/awaymission/challenge/end) -"dg" = (/obj/structure/table/standard,/obj/item/weapon/paper/pamphlet,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) -"dh" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) +"dg" = (/obj/structure/table/standard,/obj/item/paper/pamphlet,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) +"dh" = (/obj/structure/table/standard,/obj/item/storage/firstaid/regular,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) "di" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) "dj" = (/obj/structure/table/standard,/obj/machinery/recharger{pixel_y = 4},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) -"dk" = (/obj/structure/table/standard,/obj/item/weapon/implanter/explosive,/obj/item/weapon/implanter/explosive{pixel_y = 4},/obj/item/weapon/implanter/explosive{pixel_y = 8},/obj/item/weapon/implanter/explosive{pixel_y = 12},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) +"dk" = (/obj/structure/table/standard,/obj/item/implanter/explosive,/obj/item/implanter/explosive{pixel_y = 4},/obj/item/implanter/explosive{pixel_y = 8},/obj/item/implanter/explosive{pixel_y = 12},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) "dl" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/space,/area) "dm" = (/obj/machinery/door/airlock/centcom{name = "Gateway Access"; opacity = 1; req_access_txt = "109"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/challenge/end) "dn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/challenge/end) diff --git a/maps/RandomZLevels/example.dmm b/maps/RandomZLevels/example.dmm index 1a0c9c00eb8..cad3a2ee328 100644 --- a/maps/RandomZLevels/example.dmm +++ b/maps/RandomZLevels/example.dmm @@ -15,7 +15,7 @@ "ao" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/gateway/centeraway,/turf/simulated/floor,/area/awaymission/example) "ap" = (/obj/machinery/gateway{dir = 4},/turf/simulated/floor,/area/awaymission/example) "aq" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/awaymission/example) -"ar" = (/obj/item/weapon/cigbutt,/turf/simulated/floor,/area/awaymission/example) +"ar" = (/obj/item/cigbutt,/turf/simulated/floor,/area/awaymission/example) "as" = (/obj/machinery/gateway{dir = 10},/obj/effect/decal/cleanable/oil,/turf/simulated/floor,/area/awaymission/example) "at" = (/obj/machinery/gateway,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/awaymission/example) "au" = (/obj/machinery/gateway{dir = 6},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/awaymission/example) @@ -25,14 +25,14 @@ "ay" = (/obj/machinery/light/small,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating,/area/awaymission/example) "az" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/awaymission/example) "aA" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/decal/cleanable/oil,/turf/simulated/floor,/area/awaymission/example) -"aB" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/table/standard,/obj/item/weapon/paper/pamphlet,/turf/simulated/floor,/area/awaymission/example) +"aB" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/table/standard,/obj/item/paper/pamphlet,/turf/simulated/floor,/area/awaymission/example) "aC" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor,/area/awaymission/example) "aD" = (/obj/machinery/light,/turf/simulated/floor,/area/awaymission/example) -"aE" = (/obj/structure/table/standard,/obj/item/device/flashlight,/turf/simulated/floor,/area/awaymission/example) -"aF" = (/obj/structure/table/standard,/obj/item/weapon/crowbar,/turf/simulated/floor,/area/awaymission/example) +"aE" = (/obj/structure/table/standard,/obj/item/flashlight,/turf/simulated/floor,/area/awaymission/example) +"aF" = (/obj/structure/table/standard,/obj/item/crowbar,/turf/simulated/floor,/area/awaymission/example) "aG" = (/obj/effect/decal/cleanable/vomit,/turf/simulated/floor,/area/awaymission/example) "aH" = (/obj/structure/ladder{height = 1; id = "example"},/turf/simulated/floor/plating,/area/awaymission/example) -"aI" = (/obj/structure/table/standard,/obj/effect/spawner/lootdrop{loot = "/obj/item/weapon/wrench;/obj/item/weapon/screwdriver;/obj/item/weapon/cigpacket/dromedaryco"; lootcount = 2},/turf/simulated/floor,/area/awaymission/example) +"aI" = (/obj/structure/table/standard,/obj/effect/spawner/lootdrop{loot = "/obj/item/wrench;/obj/item/screwdriver;/obj/item/cigpacket/dromedaryco"; lootcount = 2},/turf/simulated/floor,/area/awaymission/example) "aJ" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/awaymission/example) "aK" = (/obj/machinery/door/airlock/command,/turf/simulated/floor,/area/awaymission/example) "aL" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/awaymission/example) @@ -51,14 +51,14 @@ "aY" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/machinery/door/poddoor/shutters{density = 0; icon_state = "shutter0"; id = "example"; name = "Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/awaymission/example) "aZ" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/poddoor/shutters{density = 0; icon_state = "shutter0"; id = "example"; name = "Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/awaymission/example) "ba" = (/obj/machinery/door_control{id = "example"; name = "Privacy Shutters"; pixel_y = 25},/turf/simulated/floor{icon_state = "white"},/area/awaymission/example) -"bb" = (/obj/structure/table/standard,/obj/item/device/healthanalyzer,/turf/simulated/floor{icon_state = "white"},/area/awaymission/example) +"bb" = (/obj/structure/table/standard,/obj/item/healthanalyzer,/turf/simulated/floor{icon_state = "white"},/area/awaymission/example) "bc" = (/obj/structure/stool/bed,/turf/simulated/floor{icon_state = "white"},/area/awaymission/example) "bd" = (/obj/structure/stool,/turf/simulated/floor{icon_state = "white"},/area/awaymission/example) -"be" = (/obj/structure/table/standard,/obj/item/device/mass_spectrometer/adv,/turf/simulated/floor{icon_state = "white"},/area/awaymission/example) -"bf" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker,/turf/simulated/floor{icon_state = "white"},/area/awaymission/example) -"bg" = (/obj/structure/table/standard,/obj/item/weapon/folder/white,/obj/item/weapon/pen/red,/turf/simulated/floor{icon_state = "white"},/area/awaymission/example) +"be" = (/obj/structure/table/standard,/obj/item/mass_spectrometer/adv,/turf/simulated/floor{icon_state = "white"},/area/awaymission/example) +"bf" = (/obj/structure/table/standard,/obj/item/reagent_containers/glass/beaker,/turf/simulated/floor{icon_state = "white"},/area/awaymission/example) +"bg" = (/obj/structure/table/standard,/obj/item/folder/white,/obj/item/pen/red,/turf/simulated/floor{icon_state = "white"},/area/awaymission/example) "bh" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "white"},/area/awaymission/example) -"bi" = (/obj/structure/table/standard,/obj/item/weapon/clipboard,/obj/item/weapon/reagent_containers/syringe/antiviral,/turf/simulated/floor{icon_state = "white"},/area/awaymission/example) +"bi" = (/obj/structure/table/standard,/obj/item/clipboard,/obj/item/reagent_containers/syringe/antiviral,/turf/simulated/floor{icon_state = "white"},/area/awaymission/example) "bj" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/awaymission/example) "bk" = (/turf/simulated/floor{dir = 4; icon_state = "yellowcorner"},/area/awaymission/example) "bl" = (/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/awaymission/example) @@ -84,47 +84,47 @@ "bF" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/example) "bG" = (/obj/machinery/door/airlock{name = "Unisex Restrooms"; req_access_txt = "0"},/turf/simulated/floor,/area/awaymission/example) "bH" = (/obj/machinery/vending/boozeomat{density = 0; pixel_x = -32},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) -"bI" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/sodawater,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) -"bJ" = (/obj/structure/bookcase{density = 0; pixel_y = 32},/obj/item/weapon/book/manual/barman_recipes,/obj/item/weapon/book/manual/chef_recipes,/obj/item/weapon/book/manual/ripley_build_and_repair,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) +"bI" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/drinks/sodawater,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) +"bJ" = (/obj/structure/bookcase{density = 0; pixel_y = 32},/obj/item/book/manual/barman_recipes,/obj/item/book/manual/chef_recipes,/obj/item/book/manual/ripley_build_and_repair,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) "bK" = (/obj/structure/stool/bed/chair/wood/normal{ icon_state = "wooden_chair"; dir = 4},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) "bL" = (/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) "bM" = (/obj/structure/stool/bed/chair/wood/normal{ icon_state = "wooden_chair"; dir = 8},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) -"bN" = (/obj/structure/bookcase{density = 0; pixel_y = 32},/obj/item/weapon/book/manual/security_space_law,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) -"bO" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/bottle/wine,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) +"bN" = (/obj/structure/bookcase{density = 0; pixel_y = 32},/obj/item/book/manual/security_space_law,/obj/item/book/manual/security_space_law,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) +"bO" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/drinks/bottle/wine,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) "bP" = (/obj/structure/stool/bed/chair/wood/normal{ icon_state = "wooden_chair"; dir = 1},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) "bQ" = (/obj/machinery/vending/snack,/turf/simulated/floor,/area/awaymission/example) -"bR" = (/obj/structure/table/standard,/obj/machinery/light/small,/obj/item/weapon/paper{info = "X X O
X O X
O X"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) +"bR" = (/obj/structure/table/standard,/obj/machinery/light/small,/obj/item/paper{info = "X X O
X O X
O X"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) "bS" = (/obj/structure/device/piano,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) "bT" = (/obj/machinery/light/small,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) -"bU" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/snacks/validsalad,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) +"bU" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/snacks/validsalad,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/example) "bV" = (/obj/machinery/vending/cigarette,/turf/simulated/floor,/area/awaymission/example) "bW" = (/obj/structure/table/standard,/turf/simulated/floor,/area/awaymission/example) -"bX" = (/obj/structure/table/standard,/obj/item/device/analyzer,/turf/simulated/floor,/area/awaymission/example) -"bY" = (/obj/structure/table/standard,/obj/item/weapon/rack_parts,/turf/simulated/floor,/area/awaymission/example) -"bZ" = (/obj/structure/table/standard,/obj/item/device/toner,/turf/simulated/floor,/area/awaymission/example) -"ca" = (/obj/structure/table/standard,/obj/item/weapon/wirecutters,/obj/item/stack/cable_coil/yellow,/turf/simulated/floor,/area/awaymission/example) -"cb" = (/obj/structure/table/standard,/obj/item/weapon/wrench,/turf/simulated/floor,/area/awaymission/example) +"bX" = (/obj/structure/table/standard,/obj/item/analyzer,/turf/simulated/floor,/area/awaymission/example) +"bY" = (/obj/structure/table/standard,/obj/item/rack_parts,/turf/simulated/floor,/area/awaymission/example) +"bZ" = (/obj/structure/table/standard,/obj/item/toner,/turf/simulated/floor,/area/awaymission/example) +"ca" = (/obj/structure/table/standard,/obj/item/wirecutters,/obj/item/stack/cable_coil/yellow,/turf/simulated/floor,/area/awaymission/example) +"cb" = (/obj/structure/table/standard,/obj/item/wrench,/turf/simulated/floor,/area/awaymission/example) "cc" = (/obj/machinery/vending/assist,/turf/simulated/floor,/area/awaymission/example) "cd" = (/obj/structure/ladder{id = "example"},/turf/simulated/floor/plating,/area/awaymission/example) -"ce" = (/obj/structure/filingcabinet,/obj/item/weapon/paper{info = "Todo: write up a lawsuit for Ted, fuck what the pamphlets say, nothing good is gonna come out of that gate. Ted'll thank me later, I'll bet."; name = "documents"},/turf/simulated/floor,/area/awaymission/example) -"cf" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin,/obj/item/weapon/pen/blue,/turf/simulated/floor,/area/awaymission/example) +"ce" = (/obj/structure/filingcabinet,/obj/item/paper{info = "Todo: write up a lawsuit for Ted, fuck what the pamphlets say, nothing good is gonna come out of that gate. Ted'll thank me later, I'll bet."; name = "documents"},/turf/simulated/floor,/area/awaymission/example) +"cf" = (/obj/structure/table/standard,/obj/item/paper_bin,/obj/item/pen/blue,/turf/simulated/floor,/area/awaymission/example) "cg" = (/obj/machinery/photocopier,/turf/simulated/floor,/area/awaymission/example) -"ch" = (/obj/structure/table/standard,/obj/item/weapon/screwdriver,/obj/item/weapon/hand_labeler,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/awaymission/example) +"ch" = (/obj/structure/table/standard,/obj/item/screwdriver,/obj/item/hand_labeler,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/awaymission/example) "ci" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/turf/simulated/floor,/area/awaymission/example) -"cj" = (/obj/structure/table/standard,/obj/item/weapon/paper/pamphlet,/turf/simulated/floor,/area/awaymission/example) +"cj" = (/obj/structure/table/standard,/obj/item/paper/pamphlet,/turf/simulated/floor,/area/awaymission/example) "ck" = (/obj/machinery/door/airlock,/turf/simulated/floor,/area/awaymission/example) "cl" = (/turf/simulated/floor{dir = 4; icon_state = "yellow"},/area/awaymission/example) -"cm" = (/obj/item/weapon/paper{info = "Hey Ted, remind me to take Angeline out some time before I ship out. You know how bad my memory is, so don't get all high and mighty with me. READ THIS."; name = "note"},/turf/simulated/floor,/area/awaymission/example) +"cm" = (/obj/item/paper{info = "Hey Ted, remind me to take Angeline out some time before I ship out. You know how bad my memory is, so don't get all high and mighty with me. READ THIS."; name = "note"},/turf/simulated/floor,/area/awaymission/example) "cn" = (/obj/machinery/door/airlock/glass,/turf/simulated/floor,/area/awaymission/example) -"co" = (/obj/structure/noticeboard{pixel_y = 32},/obj/item/weapon/paper{info = "Remember, friday is David Bowie night! You guys had better fucking be there!"; name = "friday night"},/obj/item/weapon/cigbutt,/turf/simulated/floor{icon_state = "yellowcorner"},/area/awaymission/example) +"co" = (/obj/structure/noticeboard{pixel_y = 32},/obj/item/paper{info = "Remember, friday is David Bowie night! You guys had better fucking be there!"; name = "friday night"},/obj/item/cigbutt,/turf/simulated/floor{icon_state = "yellowcorner"},/area/awaymission/example) "cp" = (/obj/item/trash/pistachios,/turf/simulated/floor,/area/awaymission/example) "cq" = (/obj/effect/landmark{name = "awaystart"},/turf/simulated/floor,/area/awaymission/example) -"cr" = (/obj/effect/landmark{name = "awaystart"},/obj/item/device/assembly/mousetrap/armed,/turf/simulated/floor,/area/awaymission/example) +"cr" = (/obj/effect/landmark{name = "awaystart"},/obj/item/assembly/mousetrap/armed,/turf/simulated/floor,/area/awaymission/example) "cs" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/awaymission/example) "ct" = (/obj/effect/landmark{name = "awaystart"},/obj/machinery/light_construct/small{ icon_state = "bulb-construct-stage1"; dir = 8},/turf/simulated/floor,/area/awaymission/example) -"cu" = (/obj/effect/landmark{name = "awaystart"},/obj/item/weapon/mop,/turf/simulated/floor,/area/awaymission/example) +"cu" = (/obj/effect/landmark{name = "awaystart"},/obj/item/mop,/turf/simulated/floor,/area/awaymission/example) "cv" = (/obj/structure/closet,/turf/simulated/floor,/area/awaymission/example) -"cw" = (/obj/structure/table/standard,/obj/item/weapon/cell/high,/turf/simulated/floor,/area/awaymission/example) +"cw" = (/obj/structure/table/standard,/obj/item/cell/high,/turf/simulated/floor,/area/awaymission/example) "cx" = (/obj/structure/stool,/obj/effect/landmark{name = "awaystart"},/turf/simulated/floor,/area/awaymission/example) "cy" = (/obj/structure/mopbucket,/obj/machinery/light_construct/small{dir = 4},/turf/simulated/floor,/area/awaymission/example) diff --git a/maps/RandomZLevels/listeningpost.dmm b/maps/RandomZLevels/listeningpost.dmm index 5aef98f2980..bca5a3211c9 100644 --- a/maps/RandomZLevels/listeningpost.dmm +++ b/maps/RandomZLevels/listeningpost.dmm @@ -5,28 +5,28 @@ "e" = (/obj/machinery/power/smes/magical{desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; name = "power storage unit"},/turf/simulated/floor/plating,/area/awaymission/listeningpost) "f" = (/obj/machinery/door/airlock,/turf/simulated/floor,/area/awaymission/listeningpost) "g" = (/turf/simulated/wall,/area/awaymission/listeningpost) -"h" = (/obj/structure/table/standard,/obj/item/weapon/paper/monitorkey,/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; freerange = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/item/clothing/glasses/regular,/turf/simulated/floor,/area/awaymission/listeningpost) +"h" = (/obj/structure/table/standard,/obj/item/paper/monitorkey,/obj/item/radio/intercom{desc = "Talk through this. Evilly"; freerange = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/item/clothing/glasses/regular,/turf/simulated/floor,/area/awaymission/listeningpost) "i" = (/obj/structure/table/standard,/turf/simulated/floor,/area/awaymission/listeningpost) "j" = (/turf/simulated/floor,/area/awaymission/listeningpost) "k" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/plating,/area/awaymission/listeningpost) "l" = (/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored) "m" = (/obj/machinery/computer/message_monitor,/turf/simulated/floor,/area/awaymission/listeningpost) "n" = (/obj/structure/stool/bed/chair{dir = 4},/mob/living/simple_animal/hostile/syndicate{desc = "A weary looking syndicate operative."; faction = "syndicate"},/turf/simulated/floor,/area/awaymission/listeningpost) -"o" = (/obj/structure/table/standard,/obj/item/weapon/paper{info = "Nothing of interest to report."; name = "november report"},/obj/item/weapon/pen,/turf/simulated/floor,/area/awaymission/listeningpost) -"p" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; freerange = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/simulated/floor,/area/awaymission/listeningpost) +"o" = (/obj/structure/table/standard,/obj/item/paper{info = "Nothing of interest to report."; name = "november report"},/obj/item/pen,/turf/simulated/floor,/area/awaymission/listeningpost) +"p" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; freerange = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/simulated/floor,/area/awaymission/listeningpost) "q" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate,/obj/item/clothing/mask/gas,/obj/item/clothing/head/helmet/space/syndicate,/turf/simulated/floor,/area/awaymission/listeningpost) -"r" = (/obj/machinery/door/airlock,/obj/item/weapon/paper{info = "I wonder how much longer they will accept my empty reports. They will cancel the case soon without results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent. If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should it ever rear it's ugly head again. -Donk Co. Operative #451"; name = "odd report"},/obj/item/weapon/gun/projectile/pistol,/obj/item/weapon/silencer,/turf/simulated/floor,/area/awaymission/listeningpost) +"r" = (/obj/machinery/door/airlock,/obj/item/paper{info = "I wonder how much longer they will accept my empty reports. They will cancel the case soon without results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent. If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should it ever rear it's ugly head again. -Donk Co. Operative #451"; name = "odd report"},/obj/item/gun/projectile/pistol,/obj/item/silencer,/turf/simulated/floor,/area/awaymission/listeningpost) "s" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/mineral,/area/mine/unexplored) "t" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/mineral,/area/mine/unexplored) "u" = (/obj/structure/disposaloutlet{dir = 4},/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/plating/airless,/area) -"v" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor,/area/awaymission/listeningpost) -"w" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor,/area/awaymission/listeningpost) +"v" = (/obj/structure/stool/bed,/obj/item/bedsheet/brown,/turf/simulated/floor,/area/awaymission/listeningpost) +"w" = (/obj/structure/table/standard,/obj/item/flashlight/lamp,/turf/simulated/floor,/area/awaymission/listeningpost) "x" = (/obj/machinery/vending/snack,/turf/simulated/floor,/area/awaymission/listeningpost) "y" = (/obj/structure/disposalpipe/segment,/turf/simulated/mineral,/area/mine/unexplored) "z" = (/obj/machinery/vending/cola,/turf/simulated/floor,/area/awaymission/listeningpost) "A" = (/obj/structure/closet,/obj/item/clothing/gloves/boxing,/turf/simulated/floor,/area/awaymission/listeningpost) -"B" = (/obj/structure/filingcabinet,/obj/item/weapon/paper{info = "A good start to the operation: intercepted Nanotrasen military communications. A convoy is scheduled to transfer nuclear warheads to a new military base. This is as good a chance as any to get our hands on some heavy weaponry, I suggest we take it."; name = "april report"},/obj/item/weapon/paper{info = "Nothing of real interest to report this month. I have intercepted faint transmissions from what appears to be some sort of pirate radio station. They do not appear to be relevant to my assignment."; name = "may report"},/obj/item/weapon/paper{info = "Nanotrasen communications have been noticably less frequent recently. The pirate radio station I found last month has been transmitting pro-Nanotrasen propaganda. I will continue to monitor it."; name = "june report"},/obj/item/weapon/paper{info = "Nothing of interest to report."; name = "july report"},/obj/item/weapon/paper{info = "Nothing of interest to report."; name = "august report"},/obj/item/weapon/paper{info = "Nothing of interest to report."; name = "september report"},/obj/item/weapon/paper{info = "Nothing of interest to report."; name = "october report"},/obj/item/weapon/paper{info = "1 x Stechtkin pistol - $600
1 x silencer - $200
shipping charge - $4360
total - $5160"; name = "receipt"},/turf/simulated/floor,/area/awaymission/listeningpost) -"C" = (/obj/structure/table/standard,/obj/item/weapon/paper{info = "Mission Details: You have been assigned to a newly constructed listening post constructed within an asteroid in Nanotrasen space to monitor their plasma mining operations. Accurate intel is crucial to the success of our operatives onboard, do not fail us."; name = "mission briefing"},/turf/simulated/floor,/area/awaymission/listeningpost) +"B" = (/obj/structure/filingcabinet,/obj/item/paper{info = "A good start to the operation: intercepted Nanotrasen military communications. A convoy is scheduled to transfer nuclear warheads to a new military base. This is as good a chance as any to get our hands on some heavy weaponry, I suggest we take it."; name = "april report"},/obj/item/paper{info = "Nothing of real interest to report this month. I have intercepted faint transmissions from what appears to be some sort of pirate radio station. They do not appear to be relevant to my assignment."; name = "may report"},/obj/item/paper{info = "Nanotrasen communications have been noticably less frequent recently. The pirate radio station I found last month has been transmitting pro-Nanotrasen propaganda. I will continue to monitor it."; name = "june report"},/obj/item/paper{info = "Nothing of interest to report."; name = "july report"},/obj/item/paper{info = "Nothing of interest to report."; name = "august report"},/obj/item/paper{info = "Nothing of interest to report."; name = "september report"},/obj/item/paper{info = "Nothing of interest to report."; name = "october report"},/obj/item/paper{info = "1 x Stechtkin pistol - $600
1 x silencer - $200
shipping charge - $4360
total - $5160"; name = "receipt"},/turf/simulated/floor,/area/awaymission/listeningpost) +"C" = (/obj/structure/table/standard,/obj/item/paper{info = "Mission Details: You have been assigned to a newly constructed listening post constructed within an asteroid in Nanotrasen space to monitor their plasma mining operations. Accurate intel is crucial to the success of our operatives onboard, do not fail us."; name = "mission briefing"},/turf/simulated/floor,/area/awaymission/listeningpost) "D" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor,/area/awaymission/listeningpost) "E" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall/r_wall,/area/awaymission/listeningpost) "F" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/mineral,/area/mine/unexplored) diff --git a/maps/RandomZLevels/spacebattle.dmm b/maps/RandomZLevels/spacebattle.dmm index b1269f7463e..605d2e013c4 100644 --- a/maps/RandomZLevels/spacebattle.dmm +++ b/maps/RandomZLevels/spacebattle.dmm @@ -16,15 +16,15 @@ "ap" = (/obj/effect/landmark{name = "awaystart"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2) "aq" = (/mob/living/simple_animal/hostile/syndicate/melee,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2) "ar" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2) -"as" = (/obj/structure/table/reinforced,/obj/item/weapon/grenade/empgrenade,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2) +"as" = (/obj/structure/table/reinforced,/obj/item/grenade/empgrenade,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2) "at" = (/obj/structure/table/reinforced,/obj/item/ammo_magazine/a10mm,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2) -"au" = (/obj/structure/table/reinforced,/obj/item/weapon/gun/projectile/automatic/c20r,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2) +"au" = (/obj/structure/table/reinforced,/obj/item/gun/projectile/automatic/c20r,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2) "av" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate3) "aw" = (/obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_r"; dir = 1},/turf/space,/area/awaymission/spacebattle/syndicate3) "ax" = (/obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion"; dir = 1},/turf/space,/area/awaymission/spacebattle/syndicate3) "ay" = (/obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_l"; dir = 1},/turf/space,/area/awaymission/spacebattle/syndicate3) "az" = (/turf/space,/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate3) -"aA" = (/obj/structure/table/reinforced,/obj/item/weapon/gun/projectile/silenced,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2) +"aA" = (/obj/structure/table/reinforced,/obj/item/gun/projectile/silenced,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2) "aB" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/awaymission/spacebattle/syndicate3) "aC" = (/obj/structure/shuttle/engine/heater{ icon_state = "heater"; dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/syndicate3) "aD" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3) @@ -35,7 +35,7 @@ "aI" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate2) "aJ" = (/obj/structure/table/reinforced,/obj/item/clothing/suit/space/rig/syndi,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3) "aK" = (/obj/structure/table/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3) -"aL" = (/obj/structure/table/reinforced,/obj/item/weapon/gun/projectile/deagle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3) +"aL" = (/obj/structure/table/reinforced,/obj/item/gun/projectile/deagle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3) "aM" = (/obj/machinery/computer/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2) "aN" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate2) "aO" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate2) @@ -55,7 +55,7 @@ "bc" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2) "bd" = (/obj/machinery/door/airlock/external,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1) "be" = (/obj/effect/landmark{name = "awaystart"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1) -"bf" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/weapon/gun/energy/lasercannon},/turf/simulated/floor/plating,/area/awaymission/spacebattle/syndicate2) +"bf" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/gun/energy/lasercannon},/turf/simulated/floor/plating,/area/awaymission/spacebattle/syndicate2) "bg" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3) "bh" = (/obj/structure/table/reinforced,/obj/item/clothing/suit/space/rig/syndi,/obj/item/clothing/head/helmet/space/rig/syndi,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1) "bi" = (/obj/structure/table/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1) @@ -64,27 +64,27 @@ "bl" = (/obj/structure/table/reinforced,/obj/item/clothing/head/helmet/swat,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3) "bm" = (/obj/machinery/computer/pod{id = "spacebattlepod3"; name = "Hull Door Control"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate2) "bn" = (/obj/machinery/door/poddoor{icon_state = "pdoor1"; id = "spacebattlepod3"; name = "Front Hull Door"; opacity = 1},/turf/simulated/shuttle/plating,/area/awaymission/spacebattle/syndicate2) -"bo" = (/obj/structure/table/reinforced,/obj/item/weapon/plastique,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3) +"bo" = (/obj/structure/table/reinforced,/obj/item/plastique,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3) "bp" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1) -"bq" = (/obj/structure/table/reinforced,/obj/item/weapon/plastique,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1) -"br" = (/obj/structure/table/reinforced,/obj/item/weapon/grenade/spawnergrenade/manhacks,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1) -"bs" = (/obj/structure/table/reinforced,/obj/item/weapon/handcuffs,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1) +"bq" = (/obj/structure/table/reinforced,/obj/item/plastique,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1) +"br" = (/obj/structure/table/reinforced,/obj/item/grenade/spawnergrenade/manhacks,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1) +"bs" = (/obj/structure/table/reinforced,/obj/item/handcuffs,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1) "bt" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate3) "bu" = (/obj/structure/stool/bed/chair,/mob/living/simple_animal/hostile/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3) "bv" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate3) -"bw" = (/obj/structure/table/reinforced,/obj/item/weapon/melee/energy/sword/red,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1) +"bw" = (/obj/structure/table/reinforced,/obj/item/melee/energy/sword/red,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1) "bx" = (/obj/machinery/computer/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate3) "by" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate3) "bz" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate3) "bA" = (/obj/structure/table/reinforced,/obj/item/clothing/head/helmet/swat,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1) -"bB" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/weapon/gun/energy/lasercannon},/turf/simulated/floor/plating,/area/awaymission/spacebattle/syndicate3) +"bB" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/gun/energy/lasercannon},/turf/simulated/floor/plating,/area/awaymission/spacebattle/syndicate3) "bC" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate1) "bD" = (/obj/structure/stool/bed/chair,/mob/living/simple_animal/hostile/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1) "bE" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate1) "bF" = (/obj/machinery/computer/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate1) "bG" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate1) "bH" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate1) -"bI" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/weapon/gun/energy/lasercannon},/turf/simulated/floor/plating,/area/awaymission/spacebattle/syndicate1) +"bI" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/gun/energy/lasercannon},/turf/simulated/floor/plating,/area/awaymission/spacebattle/syndicate1) "bJ" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/cruiser) "bK" = (/obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_r"; dir = 1},/turf/space,/area/awaymission/spacebattle/cruiser) "bL" = (/obj/machinery/door/airlock/external,/turf/simulated/shuttle/plating,/area/awaymission/spacebattle/cruiser) @@ -130,12 +130,12 @@ "cz" = (/obj/item/stack/sheet/metal,/obj/item/ammo_casing/a10mm,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "cA" = (/obj/item/ammo_casing/a10mm,/obj/item/ammo_casing/a10mm,/obj/item/ammo_casing/a10mm,/obj/item/ammo_casing/a10mm,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "cB" = (/obj/structure/closet/cabinet,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) -"cC" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) +"cC" = (/obj/structure/stool/bed,/obj/item/bedsheet,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "cD" = (/obj/machinery/vending/cigarette,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) -"cE" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/snacks/sausage,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser) -"cF" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser) -"cG" = (/obj/structure/table/reinforced,/obj/item/weapon/kitchenknife,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser) -"cH" = (/obj/structure/table/reinforced,/obj/item/weapon/kitchen/rollingpin,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser) +"cE" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/snacks/sausage,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser) +"cF" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/condiment/enzyme,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser) +"cG" = (/obj/structure/table/reinforced,/obj/item/kitchenknife,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser) +"cH" = (/obj/structure/table/reinforced,/obj/item/kitchen/rollingpin,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser) "cI" = (/obj/structure/closet/secure_closet/freezer/kitchen,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser) "cJ" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser) "cK" = (/obj/structure/table/reinforced,/obj/machinery/microwave,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser) @@ -150,8 +150,8 @@ "cT" = (/turf/simulated/shuttle/wall{ icon_state = "swall"; dir = 5},/area/awaymission/spacebattle/cruiser) "cU" = (/obj/effect/landmark/corpse/engineer{mobname = "Bill Sanchez"; name = "Bill Sanchez"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "cV" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser) -"cW" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/snacks/fries,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser) -"cX" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/snacks/stew,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser) +"cW" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/snacks/fries,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser) +"cX" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/snacks/stew,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser) "cY" = (/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/spacebattle/cruiser) "cZ" = (/mob/living/simple_animal/hostile/syndicate/melee,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "da" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) @@ -179,7 +179,7 @@ "dw" = (/obj/effect/decal/cleanable/blood,/turf/simulated/shuttle/wall{ icon_state = "swall_straight"; dir = 4},/area/awaymission/spacebattle/cruiser) "dx" = (/turf/simulated/shuttle/wall{ icon_state = "swall15"},/area/awaymission/spacebattle/cruiser) "dy" = (/turf/simulated/shuttle/wall{ icon_state = "swall_t"; dir = 4},/area/awaymission/spacebattle/cruiser) -"dz" = (/obj/effect/landmark/corpse/chef{mobname = "Nathaniel Waters"; name = "Nathaniel Waters"},/obj/item/weapon/butch,/obj/effect/decal/cleanable/blood,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser) +"dz" = (/obj/effect/landmark/corpse/chef{mobname = "Nathaniel Waters"; name = "Nathaniel Waters"},/obj/item/butch,/obj/effect/decal/cleanable/blood,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser) "dA" = (/obj/structure/stool/bed/chair,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser) "dB" = (/obj/structure/rack,/turf/simulated/floor{icon_state = "red"; dir = 9},/area/awaymission/spacebattle/cruiser) "dC" = (/turf/simulated/floor{icon_state = "red"; dir = 1},/area/awaymission/spacebattle/cruiser) @@ -200,7 +200,7 @@ "dR" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) "dS" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) "dT" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser) -"dU" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/condiment/peppermill,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser) +"dU" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/condiment/peppermill,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser) "dV" = (/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser) "dW" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser) "dX" = (/obj/structure/rack,/turf/simulated/floor{icon_state = "red"; dir = 8},/area/awaymission/spacebattle/cruiser) @@ -208,7 +208,7 @@ "dZ" = (/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/awaymission/spacebattle/cruiser) "ea" = (/obj/effect/landmark/corpse/engineer/rig{corpseidjob = "Gunner"; mobname = "Andrew Thorn"; name = "Andrew Thorn"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser) "eb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/engine,/area/awaymission/spacebattle/cruiser) -"ec" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/weapon/gun/energy/lasercannon},/turf/simulated/floor/engine,/area/awaymission/spacebattle/cruiser) +"ec" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/gun/energy/lasercannon},/turf/simulated/floor/engine,/area/awaymission/spacebattle/cruiser) "ed" = (/obj/effect/landmark/corpse/engineer{mobname = "Clay Dawson"; name = "Clay Dawson"},/turf/simulated/floor{ icon_state = "damaged5"},/area/awaymission/spacebattle/cruiser) "ee" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) "ef" = (/obj/machinery/gateway{dir = 9},/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) @@ -233,7 +233,7 @@ "ey" = (/obj/machinery/gateway{dir = 6},/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) "ez" = (/mob/living/simple_animal/hostile/syndicate/ranged/space,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser) "eA" = (/turf/simulated/floor{icon_state = "red"; dir = 8},/area/awaymission/spacebattle/cruiser) -"eB" = (/obj/effect/landmark/corpse/bridgeofficer{mobname = "Davis Hume"; name = "Davis Hume"},/obj/item/weapon/gun/projectile/shotgun/pump/combat,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) +"eB" = (/obj/effect/landmark/corpse/bridgeofficer{mobname = "Davis Hume"; name = "Davis Hume"},/obj/item/gun/projectile/shotgun/pump/combat,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "eC" = (/obj/item/ammo_casing/shotgun,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "eD" = (/turf/simulated/floor{icon_state = "red"; dir = 4},/area/awaymission/spacebattle/cruiser) "eE" = (/turf/simulated/shuttle/wall{ icon_state = "swall_straight"; dir = 1; dir = 2},/area/awaymission/spacebattle/cruiser) @@ -247,19 +247,19 @@ "eM" = (/turf/simulated/shuttle/wall{ icon_state = "swall"; dir = 9},/area/awaymission/spacebattle/cruiser) "eN" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate4) "eO" = (/obj/machinery/computer/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate4) -"eP" = (/obj/structure/table/reinforced,/obj/item/weapon/kitchen/utensil/spoon,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser) +"eP" = (/obj/structure/table/reinforced,/obj/item/kitchen/utensil/spoon,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser) "eQ" = (/turf/simulated/floor{icon_state = "blue"; dir = 8},/area/awaymission/spacebattle/cruiser) -"eR" = (/obj/item/weapon/shield/energy,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) +"eR" = (/obj/item/shield/energy,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "eS" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "eT" = (/obj/machinery/computer/med_data,/turf/simulated/floor{ icon_state = "bluefull"},/area/awaymission/spacebattle/cruiser) "eU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) "eV" = (/obj/machinery/sleeper,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate4) "eW" = (/obj/structure/stool/bed/chair{dir = 1},/mob/living/simple_animal/hostile/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate4) "eX" = (/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) -"eY" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/condiment/saltshaker,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser) -"eZ" = (/obj/structure/table/reinforced,/obj/item/weapon/kitchen/utensil/fork,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser) -"fa" = (/obj/effect/landmark/corpse/syndicatesoldier,/obj/item/weapon/melee/energy/sword/red,/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) -"fb" = (/obj/effect/landmark/corpse/bridgeofficer{mobname = "Kurt Kliest"; name = "Kurt Kliest"},/obj/item/weapon/gun/projectile/shotgun/pump/combat,/obj/item/ammo_casing/shotgun,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) +"eY" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/condiment/saltshaker,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser) +"eZ" = (/obj/structure/table/reinforced,/obj/item/kitchen/utensil/fork,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/spacebattle/cruiser) +"fa" = (/obj/effect/landmark/corpse/syndicatesoldier,/obj/item/melee/energy/sword/red,/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) +"fb" = (/obj/effect/landmark/corpse/bridgeofficer{mobname = "Kurt Kliest"; name = "Kurt Kliest"},/obj/item/gun/projectile/shotgun/pump/combat,/obj/item/ammo_casing/shotgun,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "fc" = (/obj/item/ammo_casing/shotgun,/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "fd" = (/obj/machinery/computer/crew,/turf/simulated/floor{ icon_state = "bluefull"},/area/awaymission/spacebattle/cruiser) "fe" = (/obj/effect/landmark/corpse/engineer/rig{corpseidjob = "Gunner"; mobname = "Eric Abnett"; name = "Eric Abnett"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser) @@ -268,20 +268,20 @@ "fh" = (/turf/simulated/floor{icon_state = "red"},/area/awaymission/spacebattle/cruiser) "fi" = (/turf/simulated/floor{icon_state = "red"; dir = 6},/area/awaymission/spacebattle/cruiser) "fj" = (/obj/structure/closet/crate,/obj/item/clothing/gloves/blue,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) -"fk" = (/obj/item/weapon/hand_labeler,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) +"fk" = (/obj/item/hand_labeler,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) "fl" = (/obj/machinery/door/poddoor{id = "spacebattlestorage"; name = "Secure Storage"},/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "fm" = (/mob/living/simple_animal/hostile/syndicate/ranged,/turf/simulated/floor{icon_state = "blue"; dir = 8},/area/awaymission/spacebattle/cruiser) "fn" = (/obj/machinery/computer/security/telescreen,/turf/simulated/shuttle/wall,/area/awaymission/spacebattle/cruiser) "fo" = (/turf/simulated/shuttle/wall{ icon_state = "swall_s"; dir = 8; dir = 2},/area/awaymission/spacebattle/cruiser) "fp" = (/obj/machinery/door/airlock/external,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate4) "fq" = (/obj/structure/closet/crate,/obj/item/clothing/glasses/material,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) -"fr" = (/obj/structure/closet/crate,/obj/item/weapon/light/tube,/obj/item/weapon/light/tube,/obj/item/weapon/light/tube,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) +"fr" = (/obj/structure/closet/crate,/obj/item/light/tube,/obj/item/light/tube,/obj/item/light/tube,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) "fs" = (/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/awaymission/spacebattle/cruiser) -"ft" = (/obj/effect/landmark/corpse/syndicatesoldier,/obj/item/weapon/gun/projectile/automatic/c20r,/obj/item/ammo_casing/a10mm,/obj/item/ammo_casing/a10mm,/obj/effect/decal/cleanable/blood,/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/awaymission/spacebattle/cruiser) +"ft" = (/obj/effect/landmark/corpse/syndicatesoldier,/obj/item/gun/projectile/automatic/c20r,/obj/item/ammo_casing/a10mm,/obj/item/ammo_casing/a10mm,/obj/effect/decal/cleanable/blood,/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/awaymission/spacebattle/cruiser) "fu" = (/obj/item/ammo_casing/a10mm,/obj/item/ammo_casing/a10mm,/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/awaymission/spacebattle/cruiser) -"fv" = (/obj/effect/landmark/corpse/bridgeofficer{mobname = "Walter Strider"; name = "Walter Strider"},/obj/item/weapon/gun/projectile/shotgun/pump/combat,/obj/item/ammo_casing/a10mm,/obj/item/ammo_casing/a10mm,/obj/effect/decal/cleanable/blood,/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/awaymission/spacebattle/cruiser) +"fv" = (/obj/effect/landmark/corpse/bridgeofficer{mobname = "Walter Strider"; name = "Walter Strider"},/obj/item/gun/projectile/shotgun/pump/combat,/obj/item/ammo_casing/a10mm,/obj/item/ammo_casing/a10mm,/obj/effect/decal/cleanable/blood,/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/awaymission/spacebattle/cruiser) "fw" = (/obj/item/ammo_casing/shotgun,/turf/simulated/floor{dir = 1; icon_state = "bluecorner"},/area/awaymission/spacebattle/cruiser) -"fx" = (/obj/item/ammo_casing/a357,/obj/item/ammo_casing/a357,/obj/item/weapon/gun/projectile/mateba,/obj/effect/landmark/corpse/commander{mobname = "Aaron Bowden"; name = "Aaron Bowden"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) +"fx" = (/obj/item/ammo_casing/a357,/obj/item/ammo_casing/a357,/obj/item/gun/projectile/mateba,/obj/effect/landmark/corpse/commander{mobname = "Aaron Bowden"; name = "Aaron Bowden"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "fy" = (/obj/structure/stool/bed/chair{dir = 4},/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "fz" = (/obj/machinery/computer/shuttle,/turf/simulated/floor{ icon_state = "bluefull"},/area/awaymission/spacebattle/cruiser) "fA" = (/obj/structure/artilleryplaceholder{ icon_state = "1"},/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser) @@ -296,12 +296,12 @@ "fJ" = (/obj/structure/artilleryplaceholder{ icon_state = "10"},/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser) "fK" = (/obj/structure/artilleryplaceholder{ icon_state = "11"},/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser) "fL" = (/obj/structure/artilleryplaceholder{ icon_state = "12"},/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser) -"fM" = (/obj/structure/closet/crate/internals,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/storage/firstaid/o2,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) +"fM" = (/obj/structure/closet/crate/internals,/obj/item/tank/emergency_oxygen,/obj/item/storage/firstaid/o2,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) "fN" = (/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/awaymission/spacebattle/cruiser) "fO" = (/obj/item/ammo_casing/a10mm,/obj/item/ammo_casing/a10mm,/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/awaymission/spacebattle/cruiser) "fP" = (/obj/item/ammo_casing/shotgun,/obj/item/ammo_casing/a10mm,/obj/item/ammo_casing/a10mm,/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/awaymission/spacebattle/cruiser) "fQ" = (/obj/item/ammo_casing/shotgun,/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/awaymission/spacebattle/cruiser) -"fR" = (/obj/effect/landmark/corpse/syndicatesoldier,/obj/item/weapon/gun/projectile/automatic/c20r,/obj/item/ammo_casing/a10mm,/obj/item/ammo_casing/a10mm,/obj/effect/decal/cleanable/blood,/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/awaymission/spacebattle/cruiser) +"fR" = (/obj/effect/landmark/corpse/syndicatesoldier,/obj/item/gun/projectile/automatic/c20r,/obj/item/ammo_casing/a10mm,/obj/item/ammo_casing/a10mm,/obj/effect/decal/cleanable/blood,/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/awaymission/spacebattle/cruiser) "fS" = (/obj/item/ammo_casing/a10mm,/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/awaymission/spacebattle/cruiser) "fT" = (/obj/machinery/computer/communications,/turf/simulated/floor{ icon_state = "bluefull"},/area/awaymission/spacebattle/cruiser) "fU" = (/obj/structure/artilleryplaceholder{ icon_state = "13"},/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser) @@ -316,7 +316,7 @@ "gd" = (/obj/structure/artilleryplaceholder{ icon_state = "22"},/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser) "ge" = (/obj/structure/artilleryplaceholder{ icon_state = "23"},/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser) "gf" = (/obj/structure/artilleryplaceholder{ icon_state = "24"},/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser) -"gg" = (/obj/structure/closet/crate,/obj/item/weapon/contraband/poster,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) +"gg" = (/obj/structure/closet/crate,/obj/item/contraband/poster,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) "gh" = (/obj/effect/landmark/corpse/bridgeofficer{mobname = "Robert Faver"; name = "Robert Faver"},/obj/item/ammo_casing/shotgun,/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "gi" = (/obj/structure/artilleryplaceholder/decorative{ icon_state = "25"},/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser) "gj" = (/obj/structure/artilleryplaceholder/decorative{ icon_state = "26"},/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser) @@ -330,21 +330,21 @@ "gr" = (/obj/structure/artilleryplaceholder/decorative{ icon_state = "34"},/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser) "gs" = (/obj/structure/artilleryplaceholder{ icon_state = "35"},/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser) "gt" = (/obj/structure/closet/crate/secure/weapon,/obj/item/ammo_magazine/a357,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) -"gu" = (/obj/structure/closet/crate,/obj/item/weapon/lipstick/black,/obj/item/weapon/lipstick/jade,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) +"gu" = (/obj/structure/closet/crate,/obj/item/lipstick/black,/obj/item/lipstick/jade,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) "gv" = (/obj/structure/closet/crate,/obj/item/clothing/gloves/rainbow,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) "gw" = (/obj/machinery/door_control{dir = 2; id = "spacebattlestorage"; name = "Secure Storage"; pixel_x = 24; pixel_y = 0},/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) "gx" = (/obj/machinery/computer/operating,/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/spacebattle/cruiser) -"gy" = (/obj/structure/table/reinforced,/obj/item/weapon/scalpel,/obj/item/weapon/circular_saw,/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/spacebattle/cruiser) -"gz" = (/obj/structure/table/reinforced,/obj/item/weapon/retractor,/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/spacebattle/cruiser) -"gA" = (/obj/structure/table/reinforced,/obj/item/weapon/hemostat,/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/spacebattle/cruiser) -"gB" = (/obj/structure/table/reinforced,/obj/item/weapon/scalpel,/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/spacebattle/cruiser) +"gy" = (/obj/structure/table/reinforced,/obj/item/scalpel,/obj/item/circular_saw,/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/spacebattle/cruiser) +"gz" = (/obj/structure/table/reinforced,/obj/item/retractor,/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/spacebattle/cruiser) +"gA" = (/obj/structure/table/reinforced,/obj/item/hemostat,/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/spacebattle/cruiser) +"gB" = (/obj/structure/table/reinforced,/obj/item/scalpel,/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/spacebattle/cruiser) "gC" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser) "gD" = (/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser) -"gE" = (/obj/item/weapon/gun/projectile/shotgun/pump/combat,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) +"gE" = (/obj/item/gun/projectile/shotgun/pump/combat,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "gF" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate4) "gG" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate4) -"gH" = (/obj/structure/closet/crate/secure/weapon,/obj/item/weapon/gun/energy/laser,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) -"gI" = (/obj/structure/closet/crate,/obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c10,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) +"gH" = (/obj/structure/closet/crate/secure/weapon,/obj/item/gun/energy/laser,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) +"gI" = (/obj/structure/closet/crate,/obj/item/spacecash/c10,/obj/item/spacecash/c10,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) "gJ" = (/obj/effect/decal/cleanable/blood,/turf/simulated/shuttle/wall{ icon_state = "swall_straight"; dir = 1},/area/awaymission/spacebattle/cruiser) "gK" = (/obj/effect/landmark/corpse/doctor{mobname = "Adam Smith"; name = "Adam Smith"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "gL" = (/obj/machinery/optable,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) @@ -352,15 +352,15 @@ "gN" = (/obj/machinery/vending/coffee,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser) "gO" = (/mob/living/simple_animal/hostile/syndicate/melee/space,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser) "gP" = (/obj/machinery/computer/security,/turf/simulated/floor{ icon_state = "bluefull"},/area/awaymission/spacebattle/cruiser) -"gQ" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser) +"gQ" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser) "gR" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser) "gS" = (/obj/machinery/computer/secure_data,/turf/simulated/floor{ icon_state = "bluefull"},/area/awaymission/spacebattle/cruiser) "gT" = (/obj/effect/landmark/corpse/engineer/rig{corpseidjob = "Gunner"; name = "Jeremy Tailor"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser) -"gU" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/weapon/gun/energy/lasercannon},/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/syndicate7) +"gU" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/gun/energy/lasercannon},/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/syndicate7) "gV" = (/turf/space,/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate7) "gW" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/syndicate4) "gX" = (/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) -"gY" = (/obj/item/weapon/ore/clown,/obj/item/weapon/ore/clown,/obj/item/weapon/ore/clown,/obj/item/weapon/ore/clown,/obj/item/weapon/ore/clown,/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) +"gY" = (/obj/item/ore/clown,/obj/item/ore/clown,/obj/item/ore/clown,/obj/item/ore/clown,/obj/item/ore/clown,/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) "gZ" = (/obj/machinery/computer/operating,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) "ha" = (/obj/effect/landmark/corpse/doctor{mobname = "Allan Yoshimaru"; name = "Allan Yoshimaru"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) "hb" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) @@ -371,9 +371,9 @@ "hg" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate7) "hh" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/awaymission/spacebattle/syndicate7) "hi" = (/obj/structure/shuttle/engine/propulsion,/turf/space,/area/awaymission/spacebattle/syndicate4) -"hj" = (/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe/plasmacutter,/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) -"hk" = (/obj/item/weapon/circular_saw,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) -"hl" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser) +"hj" = (/obj/item/pickaxe,/obj/item/pickaxe/plasmacutter,/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) +"hk" = (/obj/item/circular_saw,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) +"hl" = (/obj/structure/table/woodentable,/obj/item/paper_bin,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser) "hm" = (/obj/effect/landmark/corpse/engineer/rig{corpseidjob = "Gunner"; mobname = "Dan Hedricks"; name = "Dan Hedricks"},/obj/effect/decal/cleanable/blood,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/cruiser) "hn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/spacebattle/syndicate7) "ho" = (/obj/structure/table/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate7) @@ -381,8 +381,8 @@ "hq" = (/obj/structure/shuttle/engine/heater{ icon_state = "heater"; dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/awaymission/spacebattle/syndicate7) "hr" = (/obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_r"; dir = 8},/turf/space,/area/awaymission/spacebattle/syndicate7) "hs" = (/obj/structure/largecrate,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) -"ht" = (/obj/structure/closet/crate/secure/plasma,/obj/item/weapon/tank/plasma,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) -"hu" = (/obj/structure/closet/crate/medical,/obj/item/weapon/storage/firstaid/fire,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) +"ht" = (/obj/structure/closet/crate/secure/plasma,/obj/item/tank/plasma,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) +"hu" = (/obj/structure/closet/crate/medical,/obj/item/storage/firstaid/fire,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) "hv" = (/obj/structure/rack,/obj/item/clothing/suit/space/rig,/obj/item/clothing/head/helmet/space/rig,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "hw" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor{dir = 5; icon_state = "warning"},/area/awaymission/spacebattle/cruiser) "hx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/engine,/area/awaymission/spacebattle/cruiser) @@ -390,18 +390,18 @@ "hz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/awaymission/spacebattle/syndicate7) "hA" = (/obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_l"; dir = 8},/turf/space,/area/awaymission/spacebattle/syndicate7) "hB" = (/obj/structure/largecrate,/mob/living/simple_animal/corgi/puppy,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) -"hC" = (/obj/structure/closet/crate,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) -"hD" = (/obj/structure/closet/crate/medical,/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) -"hE" = (/obj/structure/closet/crate/medical,/obj/item/weapon/tank/anesthetic,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) +"hC" = (/obj/structure/closet/crate,/obj/item/cell/high,/obj/item/cell/high,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) +"hD" = (/obj/structure/closet/crate/medical,/obj/item/storage/firstaid/regular,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) +"hE" = (/obj/structure/closet/crate/medical,/obj/item/tank/anesthetic,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser) "hF" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) "hG" = (/mob/living/simple_animal/hostile/syndicate/melee,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) -"hH" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) -"hI" = (/obj/structure/table/woodentable,/obj/item/device/violin,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser) +"hH" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/regular,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) +"hI" = (/obj/structure/table/woodentable,/obj/item/violin,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser) "hJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/engine,/area/awaymission/spacebattle/cruiser) "hK" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/awaymission/spacebattle/syndicate7) "hL" = (/turf/simulated/shuttle/wall{ icon_state = "swall_t"; dir = 1; dir = 2},/area/awaymission/spacebattle/cruiser) "hM" = (/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) -"hN" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/captain,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser) +"hN" = (/obj/structure/stool/bed,/obj/item/bedsheet/captain,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser) "hO" = (/obj/structure/closet/secure_closet/captains,/turf/simulated/floor/wood,/area/awaymission/spacebattle/cruiser) "hP" = (/obj/effect/landmark/corpse/engineer{corpseidjob = "Gunner"; mobname = "William Gannon"; name = "William Gannon"},/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "hQ" = (/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/awaymission/spacebattle/cruiser) @@ -413,18 +413,18 @@ "hW" = (/obj/machinery/computer/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate7) "hX" = (/obj/structure/stool/bed/chair{dir = 8},/mob/living/simple_animal/hostile/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate7) "hY" = (/obj/machinery/door/airlock/external,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/spacebattle/syndicate7) -"hZ" = (/obj/machinery/shower{ icon_state = "shower"; dir = 4},/obj/item/weapon/bikehorn/rubberducky,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser) +"hZ" = (/obj/machinery/shower{ icon_state = "shower"; dir = 4},/obj/item/bikehorn/rubberducky,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser) "ia" = (/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser) "ib" = (/obj/machinery/shower{ icon_state = "shower"; dir = 8},/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser) "ic" = (/obj/structure/toilet,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser) -"id" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/fire,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) +"id" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/fire,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) "ie" = (/turf/simulated/shuttle/wall{ icon_state = "swall_s"; dir = 8},/area/awaymission/spacebattle/cruiser) "if" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser) "ig" = (/turf/simulated/shuttle/wall{ icon_state = "swall"; dir = 1},/area/awaymission/spacebattle/cruiser) -"ih" = (/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) -"ii" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/o2,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) +"ih" = (/obj/item/storage/firstaid/regular,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) +"ii" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/o2,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) "ij" = (/obj/machinery/shower{ icon_state = "shower"; dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser) -"ik" = (/obj/machinery/shower{ icon_state = "shower"; dir = 8},/obj/item/weapon/soap,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser) +"ik" = (/obj/machinery/shower{ icon_state = "shower"; dir = 8},/obj/item/soap,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser) "il" = (/mob/living/simple_animal/hostile/syndicate/ranged/space,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser) "im" = (/obj/effect/landmark/corpse/doctor{mobname = "Herbert West"; name = "Herbert West"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor{icon_state = "white"},/area/awaymission/spacebattle/cruiser) "in" = (/obj/effect/landmark/corpse/engineer{mobname = "Carth Robinson"; name = "Carth Robinson"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor{icon_state = "freezerfloor"},/area/awaymission/spacebattle/cruiser) @@ -436,9 +436,9 @@ "it" = (/obj/machinery/sleeper,/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/awaymission/spacebattle/cruiser) "iu" = (/obj/machinery/sleep_console,/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/awaymission/spacebattle/cruiser) "iv" = (/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/awaymission/spacebattle/cruiser) -"iw" = (/obj/effect/landmark/corpse/engineer{mobname = "Cyrion"; name = "Cyrion"},/obj/item/weapon/flamethrower/full,/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) +"iw" = (/obj/effect/landmark/corpse/engineer{mobname = "Cyrion"; name = "Cyrion"},/obj/item/flamethrower/full,/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "ix" = (/mob/living/simple_animal/hostile/syndicate/ranged,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) -"iy" = (/obj/effect/landmark/corpse/syndicatesoldier,/obj/item/weapon/gun/projectile/automatic/c20r,/turf/simulated/floor{ icon_state = "damaged2"},/area/awaymission/spacebattle/cruiser) +"iy" = (/obj/effect/landmark/corpse/syndicatesoldier,/obj/item/gun/projectile/automatic/c20r,/turf/simulated/floor{ icon_state = "damaged2"},/area/awaymission/spacebattle/cruiser) "iz" = (/obj/structure/shuttle/engine/propulsion{ icon_state = "burst_r"; dir = 4},/turf/space,/area/awaymission/spacebattle/cruiser) "iA" = (/obj/effect/landmark/corpse/engineer{mobname = "Mercutio"; name = "Mercutio"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/awaymission/spacebattle/cruiser) "iB" = (/obj/structure/lattice,/turf/space,/area) diff --git a/maps/RandomZLevels/stationCollision.dm b/maps/RandomZLevels/stationCollision.dm index 681f1955a70..ab6e99a43cc 100644 --- a/maps/RandomZLevels/stationCollision.dm +++ b/maps/RandomZLevels/stationCollision.dm @@ -47,20 +47,20 @@ name = "Safecode hint spawner" /obj/effect/landmark/sc_bible_spawner/New() - var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible/booze(src.loc) + var/obj/item/storage/bible/B = new /obj/item/storage/bible/booze(src.loc) B.name = "The Holy book of the Geometer" B.deity_name = "Narsie" B.icon_state = "melted" B.item_state = "melted" - new /obj/item/weapon/paper/sc_safehint_paper_bible(B) - new /obj/item/weapon/pen(B) + new /obj/item/paper/sc_safehint_paper_bible(B) + new /obj/item/pen(B) qdel(src) /* * Guns - I'm making these specifically so that I dont spawn a pile of fully loaded weapons on the map. */ //Captain's retro laser - Fires practice laser shots instead. -obj/item/weapon/gun/energy/laser/retro/sc_retro +obj/item/gun/energy/laser/retro/sc_retro name ="retro laser" icon_state = "retro" desc = "An older model of the basic lasergun, no longer used by NanoTrasen's security or military forces." @@ -68,32 +68,32 @@ obj/item/weapon/gun/energy/laser/retro/sc_retro clumsy_check = 0 //No sense in having a harmless gun blow up in the clowns face //Syndicate silenced pistol. This definition is not necessary, it's just habit. -/obj/item/weapon/gun/projectile/silenced/sc_silenced +/obj/item/gun/projectile/silenced/sc_silenced //Make it so that these guns only spawn with a couple bullets... if any -/obj/item/weapon/gun/projectile/silenced/sc_silenced/New() +/obj/item/gun/projectile/silenced/sc_silenced/New() for(var/ammo in loaded) if(prob(95)) //95% chance loaded -= ammo //Syndicate sub-machine guns. -/obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r +/obj/item/gun/projectile/automatic/c20r/sc_c20r -/obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r/New() +/obj/item/gun/projectile/automatic/c20r/sc_c20r/New() for(var/ammo in loaded) if(prob(95)) //95% chance loaded -= ammo //Barman's shotgun -/obj/item/weapon/gun/projectile/shotgun/pump/sc_pump +/obj/item/gun/projectile/shotgun/pump/sc_pump -/obj/item/weapon/gun/projectile/shotgun/pump/sc_pump/New() +/obj/item/gun/projectile/shotgun/pump/sc_pump/New() for(var/ammo in loaded) if(prob(95)) //95% chance loaded -= ammo //Lasers -/obj/item/weapon/gun/energy/laser/practice/sc_laser +/obj/item/gun/energy/laser/practice/sc_laser name = "Old laser" desc = "A once potent weapon, years of dust have collected in the chamber and lens of this weapon, weakening the beam significantly." clumsy_check = 0 @@ -110,30 +110,30 @@ var/sc_safecode4 = "[rand(0,9)]" var/sc_safecode5 = "[rand(0,9)]" //Pieces of paper actually containing the hints -/obj/item/weapon/paper/sc_safehint_paper_prison +/obj/item/paper/sc_safehint_paper_prison name = "smudged paper" -/obj/item/weapon/paper/sc_safehint_paper_prison/New() +/obj/item/paper/sc_safehint_paper_prison/New() info = "The ink is smudged, you can only make out a couple numbers: '[sc_safecode1]**[sc_safecode4]*'" -/obj/item/weapon/paper/sc_safehint_paper_hydro +/obj/item/paper/sc_safehint_paper_hydro name = "shredded paper" -/obj/item/weapon/paper/sc_safehint_paper_hydro/New() +/obj/item/paper/sc_safehint_paper_hydro/New() info = "Although the paper is shredded, you can clearly see the number: '[sc_safecode2]'" -/obj/item/weapon/paper/sc_safehint_paper_caf +/obj/item/paper/sc_safehint_paper_caf name = "blood-soaked paper" //This does not have to be in New() because it is a constant. There are no variables in it i.e. [sc_safcode] info = "This paper is soaked in blood, it is impossible to read any text." -/obj/item/weapon/paper/sc_safehint_paper_bible +/obj/item/paper/sc_safehint_paper_bible name = "hidden paper" -/obj/item/weapon/paper/sc_safehint_paper_bible/New() +/obj/item/paper/sc_safehint_paper_bible/New() info = {"It would appear that the pen hidden with the paper had leaked ink over the paper. However you can make out the last three digits:'[sc_safecode3][sc_safecode4][sc_safecode5]' "} -/obj/item/weapon/paper/sc_safehint_paper_shuttle +/obj/item/paper/sc_safehint_paper_shuttle info = {"Target: Research-station Epsilon
Objective: Prototype weaponry. The captain likely keeps them locked in her safe.

@@ -149,19 +149,19 @@ var/sc_safecode5 = "[rand(0,9)]" /* * Captain's safe */ -/obj/item/weapon/storage/secure/safe/sc_ssafe +/obj/item/storage/secure/safe/sc_ssafe name = "Captain's secure safe" -/obj/item/weapon/storage/secure/safe/sc_ssafe/New() +/obj/item/storage/secure/safe/sc_ssafe/New() ..() l_code = "[sc_safecode1][sc_safecode2][sc_safecode3][sc_safecode4][sc_safecode5]" l_set = 1 - new /obj/item/weapon/gun/energy/mindflayer(src) - new /obj/item/device/soulstone(src) + new /obj/item/gun/energy/mindflayer(src) + new /obj/item/soulstone(src) new /obj/item/clothing/head/helmet/space/cult(src) new /obj/item/clothing/suit/space/cult(src) - //new /obj/item/weapon/teleportation_scroll(src) - new /obj/item/weapon/ore/diamond(src) + //new /obj/item/teleportation_scroll(src) + new /obj/item/ore/diamond(src) /* * Modified Nar-Sie diff --git a/maps/RandomZLevels/stationCollision.dmm b/maps/RandomZLevels/stationCollision.dmm index bba6d311405..5cec572d5e7 100644 --- a/maps/RandomZLevels/stationCollision.dmm +++ b/maps/RandomZLevels/stationCollision.dmm @@ -68,7 +68,7 @@ "bp" = (/obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion"; dir = 4},/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/awaymission/syndishuttle) "bq" = (/obj/structure/shuttle/engine/router,/turf/simulated/shuttle/plating,/area/awaymission/syndishuttle) "br" = (/obj/structure/shuttle/engine/heater{ icon_state = "heater"; dir = 8},/turf/simulated/shuttle/plating,/area/awaymission/syndishuttle) -"bs" = (/obj/item/weapon/storage/toolbox/syndicate,/turf/simulated/shuttle/plating,/area/awaymission/syndishuttle) +"bs" = (/obj/item/storage/toolbox/syndicate,/turf/simulated/shuttle/plating,/area/awaymission/syndishuttle) "bt" = (/obj/structure/lattice,/turf/space,/area/awaymission/syndishuttle) "bu" = (/obj/machinery/door/airlock/centcom,/turf/simulated/shuttle/plating,/area/awaymission/syndishuttle) "bv" = (/obj/machinery/door/airlock/centcom,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/syndishuttle) @@ -79,13 +79,13 @@ "bA" = (/obj/machinery/bot/medbot/mysterious{desc = "A dark little medical robot. She looks somewhat underwhelmed."; name = "Nightingale"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/syndishuttle) "bB" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/syndishuttle) "bC" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/syndishuttle) -"bD" = (/obj/structure/table/standard,/obj/item/weapon/paper/sc_safehint_paper_shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/syndishuttle) +"bD" = (/obj/structure/table/standard,/obj/item/paper/sc_safehint_paper_shuttle,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/syndishuttle) "bE" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/awaymission/syndishuttle) "bF" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/awaymission/syndishuttle) "bG" = (/turf/simulated/floor/airless{icon_state = "damaged3"},/area/awaymission/research) "bH" = (/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/awaymission/research) "bI" = (/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/awaymission/research) -"bJ" = (/obj/item/weapon/shard,/mob/living/carbon/alien/larva{bruteloss = 25; fireloss = 175; stat = 2},/turf/simulated/floor{dir = 5; icon_state = "warning"},/area/awaymission/research) +"bJ" = (/obj/item/shard,/mob/living/carbon/alien/larva{bruteloss = 25; fireloss = 175; stat = 2},/turf/simulated/floor{dir = 5; icon_state = "warning"},/area/awaymission/research) "bK" = (/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "bL" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "bM" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/awaymission/research) @@ -112,9 +112,9 @@ "ch" = (/obj/machinery/power/emitter{anchored = 1; state = 2},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/research) "ci" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact"; level = 2},/turf/simulated/floor/airless{icon_state = "damaged3"},/area/awaymission/northblock) "cj" = (/obj/machinery/door/window/southleft,/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/awaymission/research) -"ck" = (/obj/item/weapon/shard{icon_state = "small"},/mob/living/carbon/alien/larva{bruteloss = 50; fireloss = 150; stat = 2},/turf/simulated/floor{dir = 2; icon_state = "warning"},/area/awaymission/research) -"cl" = (/obj/item/weapon/shard{icon_state = "medium"},/obj/item/weapon/shard{icon_state = "small"},/obj/effect/alien/weeds/node,/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/awaymission/research) -"cm" = (/obj/structure/table/standard,/obj/item/weapon/clipboard,/obj/item/weapon/paper,/obj/item/weapon/paper,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) +"ck" = (/obj/item/shard{icon_state = "small"},/mob/living/carbon/alien/larva{bruteloss = 50; fireloss = 150; stat = 2},/turf/simulated/floor{dir = 2; icon_state = "warning"},/area/awaymission/research) +"cl" = (/obj/item/shard{icon_state = "medium"},/obj/item/shard{icon_state = "small"},/obj/effect/alien/weeds/node,/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/awaymission/research) +"cm" = (/obj/structure/table/standard,/obj/item/clipboard,/obj/item/paper,/obj/item/paper,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "cn" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/mob/living/simple_animal/hostile/hivebot{opensdoors = 0},/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/awaymission/research) "co" = (/obj/structure/window/reinforced,/turf/simulated/floor{dir = 2; icon_state = "warning"},/area/awaymission/research) "cp" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/awaymission/research) @@ -137,9 +137,9 @@ "cG" = (/obj/machinery/power/emitter{anchored = 1; dir = 1; icon_state = "emitter"; state = 2},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "cH" = (/obj/item/clothing/mask/facehugger,/mob/living/carbon/alien/humanoid/queen{fireloss = 300; stat = 2},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "cI" = (/obj/effect/decal/remains/human,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) -"cJ" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) +"cJ" = (/obj/structure/table/standard,/obj/item/paper_bin,/obj/item/pen,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "cK" = (/obj/structure/shuttle/engine/heater{ icon_state = "heater"; dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/awaymission/research) -"cL" = (/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/obj/item/clothing/suit/storage/labcoat,/obj/item/weapon/clipboard{pixel_x = -7; pixel_y = -4},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/research) +"cL" = (/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/obj/item/clothing/suit/storage/labcoat,/obj/item/clipboard{pixel_x = -7; pixel_y = -4},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/research) "cM" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/research) "cN" = (/obj/effect/rune,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/research) "cO" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/research) @@ -161,9 +161,9 @@ "de" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "df" = (/obj/machinery/door/window/northleft{name = "Windoor"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "dg" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) -"dh" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/sign/securearea{pixel_x = 32},/obj/item/clothing/under/rank/security,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/head/helmet/swat,/obj/effect/decal/remains/human,/obj/item/weapon/gun/energy/laser/practice/sc_laser,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) +"dh" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/sign/securearea{pixel_x = 32},/obj/item/clothing/under/rank/security,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/head/helmet/swat,/obj/effect/decal/remains/human,/obj/item/gun/energy/laser/practice/sc_laser,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "di" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/research) -"dj" = (/obj/structure/sign/securearea{pixel_x = 32},/obj/item/clothing/under/rank/security,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/head/helmet/swat,/obj/effect/decal/remains/human,/obj/item/weapon/gun/energy/laser/practice/sc_laser,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/research) +"dj" = (/obj/structure/sign/securearea{pixel_x = 32},/obj/item/clothing/under/rank/security,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/head/helmet/swat,/obj/effect/decal/remains/human,/obj/item/gun/energy/laser/practice/sc_laser,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/research) "dk" = (/obj/machinery/door_control{id = "Narsiedoor"; name = "Blast Door Control"; pixel_x = -28},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/research) "dl" = (/obj/machinery/door/poddoor{id = "Narsiedoor"; name = "Blast Doors"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/research) "dm" = (/obj/machinery/power/emitter{anchored = 1; dir = 8; state = 2},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/research) @@ -189,7 +189,7 @@ "dG" = (/obj/structure/window/reinforced,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "dH" = (/obj/machinery/door/window/southright{name = "Windoor"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "dI" = (/obj/structure/window/reinforced,/obj/effect/decal/remains/human,/obj/item/clothing/suit/storage/labcoat,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) -"dJ" = (/obj/machinery/light{dir = 4},/obj/structure/window/reinforced,/obj/structure/sign/securearea{pixel_x = 32},/obj/item/clothing/under/rank/security,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/head/helmet/swat,/obj/effect/decal/remains/human,/obj/item/weapon/gun/energy/laser/practice/sc_laser,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) +"dJ" = (/obj/machinery/light{dir = 4},/obj/structure/window/reinforced,/obj/structure/sign/securearea{pixel_x = 32},/obj/item/clothing/under/rank/security,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/head/helmet/swat,/obj/effect/decal/remains/human,/obj/item/gun/energy/laser/practice/sc_laser,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "dK" = (/obj/machinery/light/small,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/research) "dL" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/research) "dM" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/research) @@ -204,12 +204,12 @@ "dV" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless{icon_state = "floorscorched1"},/area/awaymission/northblock) "dW" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "dX" = (/obj/structure/table,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) -"dY" = (/obj/structure/table/standard,/obj/item/stack/cable_coil{amount = 5},/obj/item/weapon/screwdriver,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) +"dY" = (/obj/structure/table/standard,/obj/item/stack/cable_coil{amount = 5},/obj/item/screwdriver,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "dZ" = (/obj/structure/computerframe{anchored = 1},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "ea" = (/obj/machinery/light,/obj/structure/computerframe{anchored = 1},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "eb" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "ec" = (/turf/simulated/wall,/area/awaymission/research) -"ed" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/item/weapon/shard,/turf/simulated/floor/plating,/area/awaymission/northblock) +"ed" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/item/shard,/turf/simulated/floor/plating,/area/awaymission/northblock) "ee" = (/obj/structure/table/standard,/turf/simulated/floor{icon_state = "bluecorner"},/area/awaymission/northblock) "ef" = (/turf/simulated/floor{icon_state = "blue"; dir = 6},/area/awaymission/northblock) "eg" = (/turf/simulated/floor{icon_state = "blue"; dir = 10},/area/awaymission/northblock) @@ -243,15 +243,15 @@ "eI" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact"; level = 2},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "eJ" = (/obj/machinery/atmospherics/pipe/simple{dir = 9; icon_state = "intact"; level = 2},/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "eK" = (/obj/structure/shuttle/engine/heater{ icon_state = "heater"; dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating/airless,/area/awaymission/research) -"eL" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/item/weapon/shard{icon_state = "small"},/turf/simulated/floor/plating,/area/awaymission/northblock) +"eL" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/item/shard{icon_state = "small"},/turf/simulated/floor/plating,/area/awaymission/northblock) "eM" = (/obj/structure/table/standard,/turf/simulated/floor{dir = 4; icon_state = "bluecorner"},/area/awaymission/northblock) "eN" = (/obj/machinery/power/apc{cell_type = 5000; dir = 4; name = "North Block APC"; pixel_x = 28},/obj/structure/cable,/turf/simulated/floor{dir = 9; icon_state = "blue"},/area/awaymission/northblock) "eO" = (/obj/structure/window/reinforced,/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/awaymission/northblock) "eP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless{icon_state = "damaged2"},/area/awaymission/northblock) -"eQ" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/snacks/grown/potato,/obj/item/stack/cable_coil{amount = 1},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) +"eQ" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/snacks/grown/potato,/obj/item/stack/cable_coil{amount = 1},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "eR" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/standard,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "eS" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/computerframe{anchored = 1},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) -"eT" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/standard,/obj/item/weapon/book/manual/research_and_development,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) +"eT" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/standard,/obj/item/book/manual/research_and_development,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "eU" = (/obj/structure/window/reinforced{dir = 8},/obj/effect/decal/remains/human,/obj/item/clothing/suit/storage/labcoat,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "eV" = (/obj/machinery/door/window/eastleft{name = "Windoor"},/obj/machinery/door/window/westleft{name = "Windoor"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "eW" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 120; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) @@ -263,16 +263,16 @@ "fc" = (/turf/simulated/floor,/area/awaymission/northblock) "fd" = (/obj/machinery/light/small,/turf/simulated/floor/airless{icon_state = "floorscorched1"},/area/awaymission/northblock) "fe" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless{icon_state = "floorscorched2"},/area/awaymission/northblock) -"ff" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/capacitor,/obj/item/weapon/stock_parts/capacitor{pixel_x = -3},/obj/item/weapon/stock_parts/scanning_module{pixel_x = 3; pixel_y = 3},/obj/item/weapon/stock_parts/scanning_module{pixel_y = -3},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) +"ff" = (/obj/structure/table/standard,/obj/item/stock_parts/capacitor,/obj/item/stock_parts/capacitor{pixel_x = -3},/obj/item/stock_parts/scanning_module{pixel_x = 3; pixel_y = 3},/obj/item/stock_parts/scanning_module{pixel_y = -3},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "fg" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) -"fh" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator{pixel_x = -3; pixel_y = 3},/obj/item/weapon/stock_parts/micro_laser{pixel_x = -3; pixel_y = -3},/obj/item/weapon/stock_parts/micro_laser{pixel_x = 3; pixel_y = 3},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) +"fh" = (/obj/structure/table/standard,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/manipulator{pixel_x = -3; pixel_y = 3},/obj/item/stock_parts/micro_laser{pixel_x = -3; pixel_y = -3},/obj/item/stock_parts/micro_laser{pixel_x = 3; pixel_y = 3},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "fi" = (/obj/machinery/computer/crew,/turf/simulated/floor{dir = 4; icon_state = "bluecorner"},/area/awaymission/northblock) "fj" = (/obj/machinery/light/small,/obj/structure/computerframe{anchored = 1},/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/awaymission/northblock) "fk" = (/obj/structure/table/standard,/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/awaymission/northblock) "fl" = (/obj/structure/computerframe{anchored = 1},/turf/simulated/floor{dir = 1; icon_state = "bluecorner"},/area/awaymission/northblock) "fm" = (/obj/machinery/door/airlock/gold{name = "Airlock"},/turf/simulated/floor,/area/awaymission/northblock) -"fn" = (/obj/structure/table/standard,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil{pixel_x = -3; pixel_y = 5},/obj/item/weapon/cell/crap,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) -"fo" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/matter_bin{pixel_x = 3},/obj/item/weapon/stock_parts/matter_bin{pixel_x = -3},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) +"fn" = (/obj/structure/table/standard,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil{pixel_x = -3; pixel_y = 5},/obj/item/cell/crap,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) +"fo" = (/obj/structure/table/standard,/obj/item/stock_parts/matter_bin{pixel_x = 3},/obj/item/stock_parts/matter_bin{pixel_x = -3},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "fp" = (/obj/machinery/door/window/eastleft{name = "Windoor"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "fq" = (/obj/structure/target_stake,/obj/item/target/syndicate,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "fr" = (/obj/structure/closet/secure_closet/captains,/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/northblock) @@ -281,16 +281,16 @@ "fu" = (/turf/simulated/floor/airless{icon_state = "floorscorched1"},/area/awaymission/midblock) "fv" = (/turf/simulated/floor/airless{icon_state = "damaged2"},/area/awaymission/midblock) "fw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless{icon_state = "floorscorched1"},/area/awaymission/midblock) -"fx" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/weapon/storage/toolbox/mechanical{pixel_y = 5},/obj/item/weapon/stock_parts/console_screen,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) +"fx" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical,/obj/item/storage/toolbox/mechanical{pixel_y = 5},/obj/item/stock_parts/console_screen,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "fy" = (/obj/structure/table/standard,/obj/item/stack/sheet/metal{amount = 20; pixel_x = -3; pixel_y = -3},/obj/item/stack/sheet/glass{amount = 10; pixel_x = 3; pixel_y = 3},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "fz" = (/obj/machinery/r_n_d/circuit_imprinter,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "fA" = (/obj/machinery/r_n_d/protolathe,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "fB" = (/obj/machinery/r_n_d/destructive_analyzer,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) -"fC" = (/obj/structure/table/standard,/obj/item/device/analyzer,/obj/item/device/mass_spectrometer{pixel_x = 5; pixel_y = 5},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) -"fD" = (/obj/structure/table/holotable,/obj/item/weapon/gun/energy/floragun{pixel_x = 2; pixel_y = 3},/obj/machinery/light,/obj/item/weapon/gun/energy/taser{pixel_x = -2; pixel_y = -2},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) -"fE" = (/obj/structure/target_stake,/obj/item/weapon/grown/sunflower,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) +"fC" = (/obj/structure/table/standard,/obj/item/analyzer,/obj/item/mass_spectrometer{pixel_x = 5; pixel_y = 5},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) +"fD" = (/obj/structure/table/holotable,/obj/item/gun/energy/floragun{pixel_x = 2; pixel_y = 3},/obj/machinery/light,/obj/item/gun/energy/taser{pixel_x = -2; pixel_y = -2},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) +"fE" = (/obj/structure/target_stake,/obj/item/grown/sunflower,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/research) "fF" = (/obj/item/ammo_casing/c45,/obj/item/ammo_casing/c45{pixel_x = 7},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/northblock) -"fG" = (/obj/item/clothing/suit/space/syndicate,/obj/item/clothing/under/syndicate,/obj/item/clothing/head/helmet/space/syndicate,/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/obj/item/clothing/shoes/syndigaloshes,/obj/effect/decal/cleanable/blood/splatter,/obj/item/weapon/gun/projectile/silenced/sc_silenced,/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/northblock) +"fG" = (/obj/item/clothing/suit/space/syndicate,/obj/item/clothing/under/syndicate,/obj/item/clothing/head/helmet/space/syndicate,/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/obj/item/clothing/shoes/syndigaloshes,/obj/effect/decal/cleanable/blood/splatter,/obj/item/gun/projectile/silenced/sc_silenced,/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/northblock) "fH" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/airless,/area/awaymission/midblock) "fI" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/airless{icon_state = "floorscorched1"},/area/awaymission/midblock) "fJ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/airless{icon_state = "damaged5"},/area/awaymission/midblock) @@ -304,7 +304,7 @@ "fR" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/turf/simulated/shuttle/plating,/area/awaymission/arrivalblock) "fS" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/turf/simulated/shuttle/plating,/area/awaymission/arrivalblock) "fT" = (/turf/space,/turf/simulated/shuttle/wall{dir = 3; icon_state = "swall_c"; dir = 2; layer = 2},/area/awaymission/arrivalblock) -"fU" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{pixel_x = -3; pixel_y = 5},/obj/item/weapon/paper{pixel_x = 3},/obj/item/weapon/pen{pixel_x = 10; pixel_y = 10},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/northblock) +"fU" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green{pixel_x = -3; pixel_y = 5},/obj/item/paper{pixel_x = 3},/obj/item/pen{pixel_x = 10; pixel_y = 10},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/northblock) "fV" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/northblock) "fW" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless,/area/awaymission/midblock) "fX" = (/turf/simulated/wall,/area/awaymission/midblock) @@ -317,8 +317,8 @@ "ge" = (/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/awaymission/arrivalblock) "gf" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/awaymission/arrivalblock) "gg" = (/obj/structure/stool/bed/chair/comfy/brown{dir = 1},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/northblock) -"gh" = (/obj/item/weapon/storage/secure/safe/sc_ssafe{pixel_x = 4; pixel_y = -26},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/northblock) -"gi" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/captain,/obj/item/clothing/under/rank/captain,/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/blood/splatter,/obj/item/weapon/gun/energy/laser/retro/sc_retro,/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/northblock) +"gh" = (/obj/item/storage/secure/safe/sc_ssafe{pixel_x = 4; pixel_y = -26},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/northblock) +"gi" = (/obj/structure/stool/bed,/obj/item/bedsheet/captain,/obj/item/clothing/under/rank/captain,/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/blood/splatter,/obj/item/gun/energy/laser/retro/sc_retro,/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/northblock) "gj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless{icon_state = "floorscorched2"},/area/awaymission/midblock) "gk" = (/obj/structure/closet/wardrobe,/turf/simulated/floor,/area/awaymission/midblock) "gl" = (/turf/simulated/floor,/area/awaymission/midblock) @@ -328,7 +328,7 @@ "gp" = (/obj/structure/closet/crate,/turf/simulated/floor,/area/awaymission/midblock) "gq" = (/obj/machinery/gibber,/turf/simulated/floor,/area/awaymission/midblock) "gr" = (/obj/machinery/vending/boozeomat,/obj/machinery/light/small{dir = 1},/turf/simulated/floor,/area/awaymission/midblock) -"gs" = (/obj/structure/table/standard,/obj/item/weapon/book/manual/barman_recipes,/obj/item/weapon/reagent_containers/food/drinks/shaker,/turf/simulated/floor,/area/awaymission/midblock) +"gs" = (/obj/structure/table/standard,/obj/item/book/manual/barman_recipes,/obj/item/reagent_containers/food/drinks/shaker,/turf/simulated/floor,/area/awaymission/midblock) "gt" = (/obj/item/ammo_casing/shotgun,/turf/simulated/floor,/area/awaymission/midblock) "gu" = (/obj/structure/table/standard,/turf/simulated/floor,/area/awaymission/midblock) "gv" = (/obj/structure/stool,/turf/simulated/floor,/area/awaymission/midblock) @@ -344,7 +344,7 @@ "gF" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/awaymission/midblock) "gG" = (/obj/item/ammo_casing/shotgun,/obj/machinery/power/apc{cell_type = 5000; dir = 8; name = "Mid Block APC"; pixel_x = -28},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor,/area/awaymission/midblock) "gH" = (/obj/item/ammo_casing/shotgun,/obj/item/ammo_casing/shotgun,/obj/item/ammo_casing/shotgun,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/awaymission/midblock) -"gI" = (/obj/item/ammo_casing/shotgun,/obj/effect/decal/remains/human,/obj/item/clothing/under/rank/bartender,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/effect/decal/cleanable/blood/splatter,/obj/item/weapon/gun/projectile/shotgun/pump/sc_pump,/turf/simulated/floor,/area/awaymission/midblock) +"gI" = (/obj/item/ammo_casing/shotgun,/obj/effect/decal/remains/human,/obj/item/clothing/under/rank/bartender,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/effect/decal/cleanable/blood/splatter,/obj/item/gun/projectile/shotgun/pump/sc_pump,/turf/simulated/floor,/area/awaymission/midblock) "gJ" = (/obj/structure/table/standard,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/awaymission/midblock) "gK" = (/obj/structure/stool,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/awaymission/midblock) "gL" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor,/area/awaymission/midblock) @@ -352,7 +352,7 @@ "gN" = (/obj/machinery/door/airlock/sandstone{name = "Airlock"},/turf/simulated/floor{icon_state = "dark"},/area/awaymission/midblock) "gO" = (/turf/simulated/floor/carpet,/area/awaymission/midblock) "gP" = (/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/obj/effect/landmark/sc_bible_spawner,/turf/simulated/floor/carpet,/area/awaymission/midblock) -"gQ" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/midblock) +"gQ" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/drinks/bottle/holywater,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/midblock) "gR" = (/turf/simulated/floor{dir = 1; icon_state = "chapel"},/area/awaymission/midblock) "gS" = (/turf/simulated/floor{dir = 4; icon_state = "chapel"},/area/awaymission/midblock) "gT" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/turf/simulated/shuttle/plating,/area/awaymission/arrivalblock) @@ -362,15 +362,15 @@ "gX" = (/obj/effect/decal/remains/human,/turf/simulated/floor{ icon_state = "warningcorner"; dir = 1},/area/awaymission/arrivalblock) "gY" = (/obj/machinery/computer/security,/turf/simulated/floor{icon_state = "red"; dir = 9},/area/awaymission/arrivalblock) "gZ" = (/obj/machinery/computer/secure_data,/turf/simulated/floor{icon_state = "red"; dir = 1},/area/awaymission/arrivalblock) -"ha" = (/obj/structure/table/standard,/obj/item/weapon/book/manual/security_space_law,/obj/item/weapon/melee/baton,/obj/item/clothing/head/helmet/warden,/turf/simulated/floor{icon_state = "red"; dir = 1},/area/awaymission/arrivalblock) +"ha" = (/obj/structure/table/standard,/obj/item/book/manual/security_space_law,/obj/item/melee/baton,/obj/item/clothing/head/helmet/warden,/turf/simulated/floor{icon_state = "red"; dir = 1},/area/awaymission/arrivalblock) "hb" = (/obj/structure/closet/wardrobe/red,/obj/machinery/light{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/awaymission/arrivalblock) "hc" = (/obj/structure/closet/secure_closet/security,/turf/simulated/floor{icon_state = "red"; dir = 1},/area/awaymission/arrivalblock) "hd" = (/obj/structure/closet/secure_closet/security,/turf/simulated/floor{icon_state = "red"; dir = 5},/area/awaymission/arrivalblock) "he" = (/turf/simulated/floor/airless{icon_state = "floorscorched2"},/area/awaymission/midblock) -"hf" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/blue,/obj/structure/window/reinforced/tinted{dir = 1},/turf/simulated/floor,/area/awaymission/midblock) +"hf" = (/obj/structure/stool/bed,/obj/item/bedsheet/blue,/obj/structure/window/reinforced/tinted{dir = 1},/turf/simulated/floor,/area/awaymission/midblock) "hg" = (/obj/structure/window/reinforced/tinted{dir = 4; icon_state = "twindow"},/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/turf/simulated/floor,/area/awaymission/midblock) -"hh" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/purple,/obj/structure/window/reinforced/tinted{dir = 1},/obj/effect/decal/remains/human,/turf/simulated/floor,/area/awaymission/midblock) -"hi" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/purple,/obj/structure/window/reinforced/tinted{dir = 1},/turf/simulated/floor,/area/awaymission/midblock) +"hh" = (/obj/structure/stool/bed,/obj/item/bedsheet/purple,/obj/structure/window/reinforced/tinted{dir = 1},/obj/effect/decal/remains/human,/turf/simulated/floor,/area/awaymission/midblock) +"hi" = (/obj/structure/stool/bed,/obj/item/bedsheet/purple,/obj/structure/window/reinforced/tinted{dir = 1},/turf/simulated/floor,/area/awaymission/midblock) "hj" = (/obj/machinery/door/airlock,/turf/simulated/floor,/area/awaymission/midblock) "hk" = (/obj/structure/table/standard,/obj/item/ammo_casing/shotgun,/turf/simulated/floor,/area/awaymission/midblock) "hl" = (/obj/structure/table/standard,/obj/item/ammo_casing/shotgun,/obj/item/ammo_casing/shotgun,/obj/item/ammo_casing/shotgun,/turf/simulated/floor,/area/awaymission/midblock) @@ -387,29 +387,29 @@ "hw" = (/obj/structure/table/reinforced,/turf/simulated/floor,/area/awaymission/arrivalblock) "hx" = (/obj/structure/stool/bed/chair{dir = 1},/obj/effect/decal/remains/human,/turf/simulated/floor{icon_state = "red"; dir = 8},/area/awaymission/arrivalblock) "hy" = (/turf/simulated/floor,/area/awaymission/arrivalblock) -"hz" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/clothing/suit/space/syndicate,/obj/item/weapon/paper/sc_safehint_paper_prison,/obj/item/weapon/gun/projectile/shotgun/pump/sc_pump,/turf/simulated/floor,/area/awaymission/arrivalblock) +"hz" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/clothing/suit/space/syndicate,/obj/item/paper/sc_safehint_paper_prison,/obj/item/gun/projectile/shotgun/pump/sc_pump,/turf/simulated/floor,/area/awaymission/arrivalblock) "hA" = (/obj/structure/window/reinforced,/turf/simulated/floor,/area/awaymission/arrivalblock) "hB" = (/obj/machinery/door/window/southleft{name = "Windoor"},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/awaymission/arrivalblock) "hC" = (/obj/item/ammo_casing/a10mm{pixel_x = 2; pixel_y = 5},/obj/item/ammo_casing/a10mm{pixel_x = -4; pixel_y = -5},/obj/item/ammo_casing/a10mm,/turf/simulated/floor/airless,/area/awaymission/midblock) "hD" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless,/area/awaymission/midblock) "hE" = (/obj/structure/sink/kitchen{pixel_y = 32},/turf/simulated/floor,/area/awaymission/midblock) -"hF" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/item/weapon/reagent_containers/food/condiment/peppermill,/obj/item/weapon/reagent_containers/food/condiment/saltshaker{pixel_x = 4; pixel_y = 4},/turf/simulated/floor,/area/awaymission/midblock) +"hF" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/condiment/enzyme,/obj/item/reagent_containers/food/condiment/peppermill,/obj/item/reagent_containers/food/condiment/saltshaker{pixel_x = 4; pixel_y = 4},/turf/simulated/floor,/area/awaymission/midblock) "hG" = (/obj/structure/table/standard,/obj/machinery/reagentgrinder,/turf/simulated/floor,/area/awaymission/midblock) "hH" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/awaymission/midblock) "hI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating,/area/awaymission/arrivalblock) "hJ" = (/turf/simulated/floor{icon_state = "red"; dir = 8},/area/awaymission/arrivalblock) "hK" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor,/area/awaymission/arrivalblock) -"hL" = (/obj/structure/table/standard,/obj/item/weapon/storage/fancy/donut_box,/turf/simulated/floor,/area/awaymission/arrivalblock) -"hM" = (/obj/structure/table/standard,/obj/item/weapon/handcuffs,/obj/item/device/flash,/turf/simulated/floor,/area/awaymission/arrivalblock) +"hL" = (/obj/structure/table/standard,/obj/item/storage/fancy/donut_box,/turf/simulated/floor,/area/awaymission/arrivalblock) +"hM" = (/obj/structure/table/standard,/obj/item/handcuffs,/obj/item/flash,/turf/simulated/floor,/area/awaymission/arrivalblock) "hN" = (/turf/simulated/floor{icon_state = "red"; dir = 4},/area/awaymission/arrivalblock) -"hO" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/blue,/obj/effect/decal/remains/human,/turf/simulated/floor,/area/awaymission/midblock) -"hP" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/purple,/turf/simulated/floor,/area/awaymission/midblock) +"hO" = (/obj/structure/stool/bed,/obj/item/bedsheet/blue,/obj/effect/decal/remains/human,/turf/simulated/floor,/area/awaymission/midblock) +"hP" = (/obj/structure/stool/bed,/obj/item/bedsheet/purple,/turf/simulated/floor,/area/awaymission/midblock) "hQ" = (/obj/machinery/processor,/turf/simulated/floor,/area/awaymission/midblock) -"hR" = (/obj/structure/table/standard,/obj/item/weapon/book/manual/chef_recipes,/obj/item/weapon/kitchen/rollingpin,/turf/simulated/floor,/area/awaymission/midblock) +"hR" = (/obj/structure/table/standard,/obj/item/book/manual/chef_recipes,/obj/item/kitchen/rollingpin,/turf/simulated/floor,/area/awaymission/midblock) "hS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor,/area/awaymission/midblock) -"hT" = (/obj/effect/decal/remains/human,/obj/item/weapon/butch,/obj/item/weapon/kitchenknife,/obj/item/clothing/head/chefhat,/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor,/area/awaymission/midblock) +"hT" = (/obj/effect/decal/remains/human,/obj/item/butch,/obj/item/kitchenknife,/obj/item/clothing/head/chefhat,/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor,/area/awaymission/midblock) "hU" = (/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor,/area/awaymission/midblock) -"hV" = (/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/obj/item/ammo_casing/a10mm,/obj/item/weapon/paper/sc_safehint_paper_caf,/obj/item/clothing/under/syndicate,/obj/effect/decal/cleanable/blood/splatter,/obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r,/turf/simulated/floor,/area/awaymission/midblock) +"hV" = (/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/obj/item/ammo_casing/a10mm,/obj/item/paper/sc_safehint_paper_caf,/obj/item/clothing/under/syndicate,/obj/effect/decal/cleanable/blood/splatter,/obj/item/gun/projectile/automatic/c20r/sc_c20r,/turf/simulated/floor,/area/awaymission/midblock) "hW" = (/obj/machinery/light/small,/turf/simulated/floor{icon_state = "dark"},/area/awaymission/midblock) "hX" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/awaymission/midblock) "hY" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating,/area/awaymission/midblock) @@ -425,7 +425,7 @@ "ii" = (/obj/machinery/microwave{pixel_x = -2; pixel_y = 7},/obj/structure/table/standard,/turf/simulated/floor,/area/awaymission/midblock) "ij" = (/obj/structure/stool,/obj/item/ammo_casing/a10mm,/turf/simulated/floor,/area/awaymission/midblock) "ik" = (/obj/item/ammo_casing/a10mm,/obj/item/ammo_casing/a10mm,/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor,/area/awaymission/midblock) -"il" = (/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/obj/item/ammo_casing/a10mm,/obj/item/clothing/under/syndicate,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r,/turf/simulated/floor,/area/awaymission/midblock) +"il" = (/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/obj/item/ammo_casing/a10mm,/obj/item/clothing/under/syndicate,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/gun/projectile/automatic/c20r/sc_c20r,/turf/simulated/floor,/area/awaymission/midblock) "im" = (/obj/structure/stool/bed/chair{dir = 4},/obj/item/ammo_casing/a10mm,/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor,/area/awaymission/midblock) "in" = (/obj/structure/table/standard,/obj/item/ammo_casing/a10mm,/turf/simulated/floor,/area/awaymission/midblock) "io" = (/obj/structure/stool/bed/chair{dir = 8},/obj/item/ammo_casing/a10mm,/obj/item/ammo_casing/a10mm,/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor,/area/awaymission/midblock) @@ -434,19 +434,19 @@ "ir" = (/turf/simulated/floor{icon_state = "red"; dir = 10},/area/awaymission/arrivalblock) "is" = (/turf/simulated/floor{icon_state = "red"},/area/awaymission/arrivalblock) "it" = (/turf/simulated/floor{icon_state = "red"; dir = 6},/area/awaymission/arrivalblock) -"iu" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/blue,/turf/simulated/floor,/area/awaymission/midblock) +"iu" = (/obj/structure/stool/bed,/obj/item/bedsheet/blue,/turf/simulated/floor,/area/awaymission/midblock) "iv" = (/obj/machinery/smartfridge,/turf/simulated/floor,/area/awaymission/midblock) "iw" = (/obj/machinery/vending/dinnerware,/turf/simulated/floor,/area/awaymission/midblock) "ix" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/machinery/light,/turf/simulated/floor,/area/awaymission/midblock) "iy" = (/obj/structure/closet/secure_closet/freezer/kitchen,/turf/simulated/floor,/area/awaymission/midblock) "iz" = (/obj/machinery/door/window/eastright{name = "Windoor"},/turf/simulated/floor,/area/awaymission/midblock) "iA" = (/obj/item/ammo_casing/a10mm,/turf/simulated/floor,/area/awaymission/midblock) -"iB" = (/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/obj/item/ammo_casing/a10mm,/obj/item/ammo_casing/a10mm,/obj/item/clothing/under/syndicate,/obj/effect/decal/cleanable/blood/splatter,/obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r,/turf/simulated/floor,/area/awaymission/midblock) +"iB" = (/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/obj/item/ammo_casing/a10mm,/obj/item/ammo_casing/a10mm,/obj/item/clothing/under/syndicate,/obj/effect/decal/cleanable/blood/splatter,/obj/item/gun/projectile/automatic/c20r/sc_c20r,/turf/simulated/floor,/area/awaymission/midblock) "iC" = (/obj/item/ammo_casing/a10mm,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor,/area/awaymission/midblock) -"iD" = (/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/obj/item/ammo_casing/a10mm,/obj/item/clothing/under/syndicate,/obj/effect/decal/cleanable/blood/splatter,/obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r,/turf/simulated/floor,/area/awaymission/midblock) +"iD" = (/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/obj/item/ammo_casing/a10mm,/obj/item/clothing/under/syndicate,/obj/effect/decal/cleanable/blood/splatter,/obj/item/gun/projectile/automatic/c20r/sc_c20r,/turf/simulated/floor,/area/awaymission/midblock) "iE" = (/obj/item/ammo_casing/a10mm,/obj/item/ammo_casing/a10mm,/turf/simulated/floor,/area/awaymission/midblock) "iF" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/awaymission/midblock) -"iG" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/shard{icon_state = "medium"},/obj/item/stack/rods,/turf/simulated/floor/plating,/area/awaymission/arrivalblock) +"iG" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/item/shard{icon_state = "medium"},/obj/item/stack/rods,/turf/simulated/floor/plating,/area/awaymission/arrivalblock) "iH" = (/obj/effect/decal/remains/human,/obj/item/ammo_casing/a10mm,/turf/simulated/floor,/area/awaymission/arrivalblock) "iI" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/awaymission/arrivalblock) "iJ" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/turf/simulated/floor/plating,/area/awaymission/arrivalblock) @@ -454,8 +454,8 @@ "iL" = (/obj/machinery/door/airlock/security,/turf/simulated/floor,/area/awaymission/arrivalblock) "iM" = (/obj/machinery/door/airlock/glass,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/awaymission/midblock) "iN" = (/obj/machinery/door/airlock/glass,/turf/simulated/floor,/area/awaymission/midblock) -"iO" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/item/weapon/shard,/turf/simulated/shuttle/plating,/area/awaymission/arrivalblock) -"iP" = (/obj/item/weapon/shard{icon_state = "small"},/obj/item/stack/rods,/obj/effect/decal/remains/human,/turf/simulated/floor/plating,/area/awaymission/arrivalblock) +"iO" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/item/shard,/turf/simulated/shuttle/plating,/area/awaymission/arrivalblock) +"iP" = (/obj/item/shard{icon_state = "small"},/obj/item/stack/rods,/obj/effect/decal/remains/human,/turf/simulated/floor/plating,/area/awaymission/arrivalblock) "iQ" = (/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor,/area/awaymission/arrivalblock) "iR" = (/obj/structure/toilet{dir = 4},/turf/simulated/floor{icon_state = "red"; dir = 9},/area/awaymission/arrivalblock) "iS" = (/turf/simulated/floor{icon_state = "red"; dir = 1},/area/awaymission/arrivalblock) @@ -505,7 +505,7 @@ "jK" = (/obj/structure/closet/emcloset,/turf/simulated/floor,/area/awaymission/southblock) "jL" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/awaymission/southblock) "jM" = (/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/awaymission/southblock) -"jN" = (/obj/structure/table/standard,/obj/item/weapon/pen,/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/awaymission/southblock) +"jN" = (/obj/structure/table/standard,/obj/item/pen,/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/awaymission/southblock) "jO" = (/obj/structure/noticeboard{dir = 1; pixel_y = 32},/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/awaymission/southblock) "jP" = (/turf/simulated/floor,/area/awaymission/southblock) "jQ" = (/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/awaymission/gateroom) @@ -528,7 +528,7 @@ "kh" = (/obj/structure/stool/bed/chair{dir = 4},/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/awaymission/southblock) "ki" = (/obj/machinery/light/small,/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/southblock) "kj" = (/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/southblock) -"kk" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin,/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/southblock) +"kk" = (/obj/structure/table/standard,/obj/item/paper_bin,/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/southblock) "kl" = (/turf/simulated/floor{icon_state = "white"},/area/awaymission/southblock) "km" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/awaymission/southblock) "kn" = (/obj/machinery/gateway{dir = 8},/turf/simulated/floor,/area/awaymission/gateroom) @@ -547,7 +547,7 @@ "kA" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/awaymission/gateroom) "kB" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/wood,/area/awaymission/southblock) "kC" = (/obj/structure/stool/bed/chair/comfy/brown,/turf/simulated/floor/wood,/area/awaymission/southblock) -"kD" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/wood,/area/awaymission/southblock) +"kD" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green,/turf/simulated/floor/wood,/area/awaymission/southblock) "kE" = (/obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_r"},/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating,/area/awaymission/arrivalblock) "kF" = (/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating,/area/awaymission/arrivalblock) "kG" = (/obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_l"},/obj/structure/shuttle/engine/propulsion{ icon_state = "burst_l"},/obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_l"},/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating,/area/awaymission/arrivalblock) @@ -557,15 +557,15 @@ "kK" = (/obj/machinery/vending/hydronutrients,/turf/simulated/floor,/area/awaymission/arrivalblock) "kL" = (/obj/machinery/vending/hydroseeds,/turf/simulated/floor,/area/awaymission/arrivalblock) "kM" = (/obj/structure/sink/kitchen{pixel_y = 32},/turf/simulated/floor,/area/awaymission/arrivalblock) -"kN" = (/obj/item/weapon/melee/energy/sword/red,/obj/item/clothing/shoes/syndigaloshes,/obj/item/clothing/under/syndicate,/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/obj/item/weapon/paper/sc_safehint_paper_hydro,/turf/simulated/floor,/area/awaymission/arrivalblock) +"kN" = (/obj/item/melee/energy/sword/red,/obj/item/clothing/shoes/syndigaloshes,/obj/item/clothing/under/syndicate,/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Syndicate agent remains"},/obj/item/paper/sc_safehint_paper_hydro,/turf/simulated/floor,/area/awaymission/arrivalblock) "kO" = (/obj/machinery/hydroponics,/turf/simulated/floor,/area/awaymission/arrivalblock) "kP" = (/obj/structure/morgue,/turf/simulated/floor{icon_state = "white"},/area/awaymission/southblock) "kQ" = (/obj/machinery/vending/medical,/turf/simulated/floor{icon_state = "white"},/area/awaymission/southblock) "kR" = (/obj/structure/stool/bed/roller,/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/awaymission/southblock) -"kS" = (/obj/structure/table/standard,/obj/item/weapon/paper/pamphlet{pixel_x = 2; pixel_y = 2},/obj/item/weapon/paper/pamphlet{pixel_x = -2; pixel_y = -2},/turf/simulated/floor{ icon_state = "warningcorner"; dir = 8},/area/awaymission/gateroom) +"kS" = (/obj/structure/table/standard,/obj/item/paper/pamphlet{pixel_x = 2; pixel_y = 2},/obj/item/paper/pamphlet{pixel_x = -2; pixel_y = -2},/turf/simulated/floor{ icon_state = "warningcorner"; dir = 8},/area/awaymission/gateroom) "kT" = (/obj/effect/landmark{name = "awaystart"},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/awaymission/gateroom) "kU" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/landmark{name = "awaystart"},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/awaymission/gateroom) -"kV" = (/obj/structure/table/standard,/obj/item/device/camera,/turf/simulated/floor{ icon_state = "warningcorner"; dir = 4},/area/awaymission/gateroom) +"kV" = (/obj/structure/table/standard,/obj/item/camera,/turf/simulated/floor{ icon_state = "warningcorner"; dir = 4},/area/awaymission/gateroom) "kW" = (/obj/structure/stool/bed/chair/comfy/brown{ icon_state = "comfychair_brown"; dir = 8},/turf/simulated/floor/wood,/area/awaymission/southblock) "kX" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/awaymission/arrivalblock) "kY" = (/obj/structure/stool/bed/chair,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/awaymission/arrivalblock) @@ -580,16 +580,16 @@ "lh" = (/obj/machinery/suit_storage_unit/standard_unit,/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/awaymission/gateroom) "li" = (/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/obj/structure/window/reinforced/tinted{dir = 1},/turf/simulated/floor,/area/awaymission/southblock) "lj" = (/obj/structure/window/reinforced/tinted{dir = 1},/turf/simulated/floor,/area/awaymission/southblock) -"lk" = (/obj/structure/stool/bed,/obj/structure/window/reinforced/tinted,/obj/item/weapon/bedsheet/medical,/obj/structure/window/reinforced/tinted{dir = 1},/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/awaymission/southblock) +"lk" = (/obj/structure/stool/bed,/obj/structure/window/reinforced/tinted,/obj/item/bedsheet/medical,/obj/structure/window/reinforced/tinted{dir = 1},/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/awaymission/southblock) "ll" = (/obj/machinery/suit_storage_unit/standard_unit,/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/awaymission/gateroom) "lm" = (/obj/machinery/suit_storage_unit/standard_unit,/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/awaymission/gateroom) "ln" = (/obj/machinery/light/small,/turf/simulated/floor/wood,/area/awaymission/southblock) "lo" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/awaymission/arrivalblock) -"lp" = (/obj/structure/table/standard,/obj/item/weapon/book/manual/hydroponics_pod_people,/turf/simulated/floor,/area/awaymission/arrivalblock) -"lq" = (/obj/item/weapon/grown/deathnettle,/obj/item/clothing/shoes/brown,/obj/item/clothing/under/rank/hydroponics,/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor,/area/awaymission/arrivalblock) +"lp" = (/obj/structure/table/standard,/obj/item/book/manual/hydroponics_pod_people,/turf/simulated/floor,/area/awaymission/arrivalblock) +"lq" = (/obj/item/grown/deathnettle,/obj/item/clothing/shoes/brown,/obj/item/clothing/under/rank/hydroponics,/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor,/area/awaymission/arrivalblock) "lr" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{ icon_state = "whitehall"; dir = 8},/area/awaymission/southblock) "ls" = (/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/turf/simulated/floor,/area/awaymission/southblock) -"lt" = (/obj/structure/stool/bed,/obj/structure/window/reinforced/tinted,/obj/item/weapon/bedsheet/medical,/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/awaymission/southblock) +"lt" = (/obj/structure/stool/bed,/obj/structure/window/reinforced/tinted,/obj/item/bedsheet/medical,/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/awaymission/southblock) "lu" = (/obj/machinery/suit_storage_unit/standard_unit,/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/awaymission/gateroom) "lv" = (/obj/machinery/suit_storage_unit/standard_unit,/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/awaymission/gateroom) "lw" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/turf/simulated/floor/plating,/area/awaymission/southblock) @@ -600,19 +600,19 @@ "lB" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/awaymission/arrivalblock) "lC" = (/turf/simulated/shuttle/wall{ icon_state = "swall_s"; dir = 8; dir = 2},/area/awaymission/arrivalblock) "lD" = (/obj/structure/closet/crate/hydroponics,/turf/simulated/floor,/area/awaymission/arrivalblock) -"lE" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor,/area/awaymission/arrivalblock) +"lE" = (/obj/structure/table/standard,/obj/item/reagent_containers/glass/bucket,/turf/simulated/floor,/area/awaymission/arrivalblock) "lF" = (/obj/effect/decal/cleanable/blood/splatter,/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor,/area/awaymission/arrivalblock) "lG" = (/obj/machinery/computer/operating,/turf/simulated/floor{icon_state = "white"},/area/awaymission/southblock) -"lH" = (/obj/machinery/optable,/obj/machinery/light/small{dir = 1},/obj/effect/decal/remains/human,/obj/item/weapon/tank/anesthetic,/obj/item/clothing/mask/breath,/turf/simulated/floor{icon_state = "white"},/area/awaymission/southblock) +"lH" = (/obj/machinery/optable,/obj/machinery/light/small{dir = 1},/obj/effect/decal/remains/human,/obj/item/tank/anesthetic,/obj/item/clothing/mask/breath,/turf/simulated/floor{icon_state = "white"},/area/awaymission/southblock) "lI" = (/obj/structure/sink{pixel_y = 32},/turf/simulated/floor{icon_state = "white"},/area/awaymission/southblock) -"lJ" = (/obj/structure/stool/bed,/obj/structure/window/reinforced/tinted,/obj/item/weapon/bedsheet/medical,/obj/effect/decal/remains/human,/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/awaymission/southblock) +"lJ" = (/obj/structure/stool/bed,/obj/structure/window/reinforced/tinted,/obj/item/bedsheet/medical,/obj/effect/decal/remains/human,/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/awaymission/southblock) "lK" = (/obj/effect/decal/remains/human,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/awaymission/southblock) "lL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/highsecurity{name = "Security Airlock"},/turf/simulated/floor,/area/awaymission/gateroom) "lM" = (/turf/simulated/floor,/area/awaymission/gateroom) "lN" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/awaymission/gateroom) "lO" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/smes/magical{desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; name = "power storage unit"},/turf/simulated/floor,/area/awaymission/gateroom) "lP" = (/obj/structure/closet/secure_closet/hydroponics,/turf/simulated/floor,/area/awaymission/arrivalblock) -"lQ" = (/obj/structure/table/standard,/obj/item/weapon/shovel/spade,/obj/item/weapon/reagent_containers/spray/plantbgone,/turf/simulated/floor,/area/awaymission/arrivalblock) +"lQ" = (/obj/structure/table/standard,/obj/item/shovel/spade,/obj/item/reagent_containers/spray/plantbgone,/turf/simulated/floor,/area/awaymission/arrivalblock) "lR" = (/obj/machinery/light,/turf/simulated/floor,/area/awaymission/arrivalblock) "lS" = (/obj/effect/decal/remains/human,/obj/item/clothing/mask/surgical,/obj/item/clothing/suit/storage/labcoat,/obj/item/clothing/gloves/latex,/turf/simulated/floor{icon_state = "white"},/area/awaymission/southblock) "lT" = (/obj/machinery/door/window/westright{name = "Windoor"},/turf/simulated/floor,/area/awaymission/southblock) @@ -628,7 +628,7 @@ "md" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/awaymission/gateroom) "me" = (/obj/machinery/power/terminal{dir = 1},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/awaymission/gateroom) "mf" = (/obj/structure/closet/secure_closet/medical2,/turf/simulated/floor{icon_state = "white"},/area/awaymission/southblock) -"mg" = (/obj/structure/closet/crate/medical{name = "Surgical Tools"},/obj/item/weapon/cautery,/obj/item/weapon/circular_saw,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/surgicaldrill,/obj/item/weapon/scalpel,/turf/simulated/floor{icon_state = "white"},/area/awaymission/southblock) +"mg" = (/obj/structure/closet/crate/medical{name = "Surgical Tools"},/obj/item/cautery,/obj/item/circular_saw,/obj/item/hemostat,/obj/item/retractor,/obj/item/surgicaldrill,/obj/item/scalpel,/turf/simulated/floor{icon_state = "white"},/area/awaymission/southblock) "mh" = (/obj/structure/stool/bed/roller,/turf/simulated/floor{icon_state = "white"},/area/awaymission/southblock) "mi" = (/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/southblock) "mj" = (/obj/machinery/sleeper,/turf/simulated/floor{icon_state = "whitehall"; dir = 2},/area/awaymission/southblock) diff --git a/maps/_templates_and_guidance/Mapping Guides/Complete Room Checklist.dmm b/maps/_templates_and_guidance/Mapping Guides/Complete Room Checklist.dmm index a59a1e47d28..7296005c67a 100644 --- a/maps/_templates_and_guidance/Mapping Guides/Complete Room Checklist.dmm +++ b/maps/_templates_and_guidance/Mapping Guides/Complete Room Checklist.dmm @@ -39,7 +39,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; diff --git a/maps/_templates_and_guidance/Public Event Templates/Maze_Reward_-_Copy.dmm b/maps/_templates_and_guidance/Public Event Templates/Maze_Reward_-_Copy.dmm index 3a3e6473839..1745f6853b3 100644 --- a/maps/_templates_and_guidance/Public Event Templates/Maze_Reward_-_Copy.dmm +++ b/maps/_templates_and_guidance/Public Event Templates/Maze_Reward_-_Copy.dmm @@ -1,7 +1,7 @@ "bh" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 8; maxhealth = 500; name = "Veil of sanity"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) "bu" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 4; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/obj/effect/spider/stickyweb/dark{color = #8A0808; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) "bG" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; maxhealth = 500; name = "Veil of sanity"},/obj/structure/fans/hardlight/colorable{invisibility = 99},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) -"bL" = (/obj/item/weapon/bone/ribs,/turf/simulated/floor/gorefloor2,/area/survivalpod) +"bL" = (/obj/item/bone/ribs,/turf/simulated/floor/gorefloor2,/area/survivalpod) "bX" = (/obj/fire,/turf/simulated/floor/gorefloor,/area/survivalpod) "cb" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 4; maxhealth = 500; name = "Veil of sanity"},/obj/effect/spider/stickyweb/dark{color = #8A0808; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) "cA" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; maxhealth = 500; name = "Veil of sanity"},/obj/effect/spider/stickyweb{color = #8A0808; desc = "Like a leash you can see those strings trying to hold you back, hesitating at the thought only to exasperate the sensation of the reality you are in. . . this may not be an illusion."; name = "Strings of distress"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) @@ -20,7 +20,7 @@ "ib" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/obj/effect/spider/stickyweb/dark{color = #8A0808; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) "iK" = (/turf/simulated/floor/gorefloor,/area/survivalpod) "lk" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 8; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 4; maxhealth = 500; name = "Veil of sanity"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) -"lQ" = (/obj/item/weapon/bone/skull/unknown,/turf/simulated/floor/lava,/area/survivalpod) +"lQ" = (/obj/item/bone/skull/unknown,/turf/simulated/floor/lava,/area/survivalpod) "nc" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; maxhealth = 500; name = "Veil of sanity"},/obj/effect/spider/stickyweb/dark{color = #8A0808; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt"},/obj/effect/step_trigger/message{message = "Finally, you gaze upon a horror your sanity fails to understand. The numbness of your body fades as the sound of glass shattering fills your mind, the horrifying sensation of barbed wire tangling your body as every waking second you spend gazing upon this nightmare tightens those bonds. . . Is this what your mortal coil desires?. . ."; once = 0},/turf/simulated/floor/gorefloor,/area/survivalpod) "nn" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 4; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; maxhealth = 500; name = "Veil of sanity"},/obj/effect/spider/stickyweb/dark{color = #8A0808; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) "nA" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 8; maxhealth = 500; name = "Veil of sanity"},/turf/simulated/floor/gorefloor,/area/survivalpod) @@ -61,7 +61,7 @@ "El" = (/obj/structure/simple_door/cult,/turf/simulated/floor/cult,/area/survivalpod) "Es" = (/obj/effect/spider/stickyweb/dark{color = #8A0808; desc = "You gaze upon a mess of stained barbed wires, the attempt of making sense upon this scratches thoughts from your mind as it fills you with a sense of dread, it's best you don't get tangled in this mess"; name = "Wires of doubt"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) "Fv" = (/obj/structure/girder/cult,/turf/simulated/floor/gorefloor2,/area/survivalpod) -"Fz" = (/obj/item/weapon/bone/ribs,/turf/simulated/floor/lava,/area/survivalpod) +"Fz" = (/obj/item/bone/ribs,/turf/simulated/floor/lava,/area/survivalpod) "FX" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; maxhealth = 500; name = "Veil of sanity"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) "GI" = (/obj/machinery/power/supermatter/shard{color = "red"; simulated = 0},/turf/simulated/floor/gorefloor2,/area/survivalpod) "Hm" = (/obj/structure/girder/cult,/turf/simulated/floor/cult,/area/survivalpod) @@ -103,7 +103,7 @@ "Ut" = (/obj/structure/cult/talisman,/obj/effect/map_effect/interval/sound_emitter/geiger/med,/turf/simulated/floor/cult,/area/survivalpod) "Ux" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 4; maxhealth = 500; name = "Veil of sanity"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) "UH" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 4; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/turf/simulated/floor/flesh/colour{color = red},/area/survivalpod) -"UO" = (/obj/item/weapon/bone/arm,/turf/simulated/floor/lava,/area/survivalpod) +"UO" = (/obj/item/bone/arm,/turf/simulated/floor/lava,/area/survivalpod) "Vm" = (/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 8; maxhealth = 500; name = "Veil of sanity"},/obj/structure/window/phoronreinforced{desc = "You gaze upon a nightmare of your own mind as it feels as if the horrors before you can harm you, yet the thought of keeping yourself alive cracks upon the glass you gaze at. You have to keep yourself sane. . ."; dir = 1; maxhealth = 500; name = "Veil of sanity"},/obj/effect/spider/stickyweb{color = #8A0808; desc = "Like a leash you can see those strings trying to hold you back, hesitating at the thought only to exasperate the sensation of the reality you are in. . . this may not be an illusion."; name = "Strings of distress"},/turf/simulated/floor/gorefloor,/area/survivalpod) "Vn" = (/obj/structure/cult/forge,/turf/simulated/floor/cult,/area/survivalpod) "VA" = (/obj/structure/grille/broken/cult,/turf/simulated/floor/gorefloor,/area/survivalpod) diff --git a/maps/_templates_and_guidance/Templates/shelter_Medical.dmm b/maps/_templates_and_guidance/Templates/shelter_Medical.dmm index 13f34cff4e8..1a5f109ef70 100644 --- a/maps/_templates_and_guidance/Templates/shelter_Medical.dmm +++ b/maps/_templates_and_guidance/Templates/shelter_Medical.dmm @@ -1,18 +1,18 @@ "a" = (/turf/simulated/shuttle/wall/voidcraft/survival,/area/survivalpod) -"b" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/medical,/obj/structure/curtain/open/privacy,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) +"b" = (/obj/structure/bed/padded,/obj/item/bedsheet/medical,/obj/structure/curtain/open/privacy,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "c" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/machinery/disposal,/obj/effect/floor_decal/industrial/warning/full,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "d" = (/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "e" = (/obj/machinery/light/small,/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "f" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/bed/chair/comfy/black{dir = 8},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) -"g" = (/obj/structure/table/glass,/obj/structure/closet/secure_closet/guncabinet/phase{pixel_y = -32},/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) +"g" = (/obj/structure/table/glass,/obj/structure/closet/secure_closet/guncabinet/phase{pixel_y = -32},/obj/item/gun/energy/locked/frontier/holdout,/obj/item/gun/energy/locked/frontier/holdout,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "h" = (/obj/structure/sign/mining/survival{dir = 8},/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod) "i" = (/obj/effect/floor_decal/industrial/danger/full,/obj/structure/fans/tiny,/obj/machinery/door/airlock/voidcraft/survival_pod,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "j" = (/obj/structure/sign/mining/survival,/turf/simulated/shuttle/wall/voidcraft/survival,/area/survivalpod) "k" = (/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "l" = (/obj/machinery/sleeper/survival_pod,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "m" = (/obj/structure/disposalpipe/segment,/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod) -"n" = (/obj/machinery/smartfridge/survival_pod,/obj/item/weapon/storage/mre/menu10,/obj/item/weapon/storage/mre/menu10,/obj/item/weapon/storage/mre/menu10,/obj/item/weapon/storage/mre/menu10,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose,/obj/item/weapon/storage/box/freezer,/obj/item/weapon/storage/box/freezer,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/glass/beaker,/obj/machinery/light{dir = 1},/obj/item/device/defib_kit/loaded,/obj/item/device/defib_kit/loaded,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) -"o" = (/obj/item/device/gps/computer,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) +"n" = (/obj/machinery/smartfridge/survival_pod,/obj/item/storage/mre/menu10,/obj/item/storage/mre/menu10,/obj/item/storage/mre/menu10,/obj/item/storage/mre/menu10,/obj/item/storage/mre/menu11,/obj/item/storage/mre/menu11,/obj/item/storage/mre/menu11,/obj/item/storage/mre/menu11,/obj/item/fbp_backup_cell,/obj/item/fbp_backup_cell,/obj/item/fbp_backup_cell,/obj/item/fbp_backup_cell,/obj/item/reagent_containers/glass/beaker/large,/obj/item/reagent_containers/glass/beaker/large,/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose,/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose,/obj/item/storage/box/freezer,/obj/item/storage/box/freezer,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/glass/beaker,/obj/machinery/light{dir = 1},/obj/item/defib_kit/loaded,/obj/item/defib_kit/loaded,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) +"o" = (/obj/item/gps/computer,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "p" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/toilet{dir = 8},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "s" = (/obj/structure/sign/mining/survival{dir = 1},/turf/simulated/shuttle/wall/voidcraft/survival,/area/survivalpod) "t" = (/obj/structure/window/reinforced/survival_pod{dir = 8},/obj/structure/window/reinforced/survival_pod{dir = 4},/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/window/reinforced/survival_pod,/obj/structure/grille,/obj/structure/curtain/black,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) @@ -21,14 +21,14 @@ "w" = (/obj/structure/table/steel_reinforced,/obj/machinery/chemical_dispenser/full,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "x" = (/obj/structure/sign/redcross,/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod) "z" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/sign/mining/survival{dir = 4},/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod) -"A" = (/obj/machinery/shower{dir = 8},/obj/item/weapon/soap/deluxe,/obj/structure/curtain,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) -"B" = (/obj/structure/table/survival_pod,/obj/item/weapon/storage/firstaid/adv,/obj/item/weapon/storage/firstaid/o2{pixel_x = 5; pixel_y = 5},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) +"A" = (/obj/machinery/shower{dir = 8},/obj/item/soap/deluxe,/obj/structure/curtain,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) +"B" = (/obj/structure/table/survival_pod,/obj/item/storage/firstaid/adv,/obj/item/storage/firstaid/o2{pixel_x = 5; pixel_y = 5},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "C" = (/obj/effect/floor_decal/industrial/outline,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) -"D" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/table/gamblingtable,/obj/item/device/starcaster_news,/obj/item/weapon/deck/cards,/obj/structure/fireaxecabinet{pixel_y = 27},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) +"D" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/table/gamblingtable,/obj/item/starcaster_news,/obj/item/deck/cards,/obj/structure/fireaxecabinet{pixel_y = 27},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "E" = (/obj/machinery/optable,/obj/machinery/oxygen_pump/anesthetic{pixel_x = 32},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "F" = (/obj/machinery/door/window/survival_pod{dir = 1},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "G" = (/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod) -"H" = (/obj/machinery/smartfridge/survival_pod,/obj/item/weapon/storage/box/bodybags,/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/mask/muzzle,/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/mask/muzzle,/obj/item/device/sleevemate,/obj/item/roller{pixel_y = 8},/obj/item/roller{pixel_y = 8},/obj/item/roller{pixel_y = 8},/obj/item/weapon/reagent_containers/spray/cleaner{desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2},/obj/item/weapon/reagent_containers/spray/cleaner{desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/firstaid/surgery,/obj/item/device/defib_kit/compact/loaded,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/device/binoculars,/obj/item/device/bluespaceradio,/obj/item/device/radio/emergency,/obj/item/device/radio/emergency,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/toy/crossbow,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) +"H" = (/obj/machinery/smartfridge/survival_pod,/obj/item/storage/box/bodybags,/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/mask/muzzle,/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/mask/muzzle,/obj/item/sleevemate,/obj/item/roller{pixel_y = 8},/obj/item/roller{pixel_y = 8},/obj/item/roller{pixel_y = 8},/obj/item/reagent_containers/spray/cleaner{desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2},/obj/item/reagent_containers/spray/cleaner{desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/surgery,/obj/item/defib_kit/compact/loaded,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/extinguisher/mini,/obj/item/extinguisher/mini,/obj/item/towel/random,/obj/item/towel/random,/obj/item/towel/random,/obj/item/towel/random,/obj/item/binoculars,/obj/item/bluespaceradio,/obj/item/radio/emergency,/obj/item/radio/emergency,/obj/item/storage/box/survival/space,/obj/item/storage/box/survival/space,/obj/item/storage/box/survival/space,/obj/item/storage/box/survival/space,/obj/item/storage/box/survival/comp,/obj/item/storage/box/survival/comp,/obj/item/storage/toolbox/mechanical,/obj/item/toy/crossbow,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "I" = (/obj/machinery/light,/obj/machinery/sleeper{dir = 4},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "J" = (/obj/machinery/sleep_console{dir = 4},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "K" = (/obj/structure/fans,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) @@ -39,11 +39,11 @@ "R" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/machinery/vending/medical{req_access = null; req_log_access = null},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "S" = (/obj/machinery/iv_drip,/obj/machinery/iv_drip,/obj/machinery/vending/wallmed1{dir = 8; pixel_x = 22; pixel_y = 3},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "T" = (/obj/machinery/iv_drip,/obj/effect/floor_decal/industrial/loading{dir = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) -"U" = (/obj/structure/table/survival_pod,/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/fire{pixel_x = 5; pixel_y = 5},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) +"U" = (/obj/structure/table/survival_pod,/obj/item/storage/firstaid/toxin,/obj/item/storage/firstaid/fire{pixel_x = 5; pixel_y = 5},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "V" = (/obj/structure/disposalpipe/segment,/obj/structure/sign/mining/survival{dir = 4},/turf/simulated/shuttle/wall/voidcraft/survival,/area/survivalpod) -"W" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/masks,/obj/item/weapon/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/machinery/newscaster{pixel_y = -30},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) +"W" = (/obj/structure/table/glass,/obj/item/storage/box/masks,/obj/item/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/machinery/newscaster{pixel_y = -30},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod) "X" = (/obj/structure/sign/mining/survival{dir = 8},/turf/simulated/shuttle/wall/voidcraft/survival,/area/survivalpod) -"Y" = (/obj/structure/table/survival_pod,/obj/item/weapon/storage/firstaid/surgery,/obj/structure/sink/kitchen{dir = 4; pixel_x = -13},/obj/machinery/recharger,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) +"Y" = (/obj/structure/table/survival_pod,/obj/item/storage/firstaid/surgery,/obj/structure/sink/kitchen{dir = 4; pixel_x = -13},/obj/machinery/recharger,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) "Z" = (/obj/machinery/door/window/survival_pod{dir = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod) (1,1,1) = {" diff --git a/maps/cynosure/cynosure-1.dmm b/maps/cynosure/cynosure-1.dmm index c1e2c80f523..3e73713d07c 100644 --- a/maps/cynosure/cynosure-1.dmm +++ b/maps/cynosure/cynosure-1.dmm @@ -625,7 +625,7 @@ /turf/simulated/floor/plating, /area/surface/station/maintenance/medical/south) "bw" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -685,7 +685,7 @@ /obj/structure/cable{ icon_state = "16-0" }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/plating, /area/surface/station/maintenance/storage/emergency/bmtswest) "bC" = ( @@ -903,16 +903,16 @@ /area/surface/station/maintenance/research/east) "bY" = ( /obj/structure/table/rack, -/obj/item/weapon/circuitboard/rdconsole{ +/obj/item/circuitboard/rdconsole{ pixel_x = 4; pixel_y = -4 }, -/obj/item/weapon/circuitboard/destructive_analyzer{ +/obj/item/circuitboard/destructive_analyzer{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/protolathe, -/obj/item/weapon/circuitboard/rdserver{ +/obj/item/circuitboard/protolathe, +/obj/item/circuitboard/rdserver{ pixel_x = -2; pixel_y = 2 }, @@ -1107,12 +1107,12 @@ /obj/structure/noticeboard/anomaly{ pixel_y = 28 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/clipboard, -/obj/item/weapon/pen, -/obj/item/device/taperecorder, -/obj/item/weapon/folder, -/obj/item/weapon/stamp, +/obj/item/paper_bin, +/obj/item/clipboard, +/obj/item/pen, +/obj/item/taperecorder, +/obj/item/folder, +/obj/item/stamp, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -1234,10 +1234,10 @@ /obj/effect/floor_decal/techfloor{ dir = 10 }, -/obj/item/weapon/circuitboard/borgupload{ +/obj/item/circuitboard/borgupload{ pixel_x = -4 }, -/obj/item/weapon/circuitboard/aiupload{ +/obj/item/circuitboard/aiupload{ pixel_y = -3 }, /turf/simulated/floor/tiled/techfloor, @@ -1524,7 +1524,7 @@ "dw" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/light, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/dark, @@ -1576,12 +1576,12 @@ /area/surface/station/rnd/toxins_launch) "dC" = ( /obj/structure/table/rack, -/obj/item/weapon/circuitboard/secure_data{ +/obj/item/circuitboard/secure_data{ pixel_x = -4; pixel_y = 3 }, -/obj/item/weapon/circuitboard/security, -/obj/item/weapon/circuitboard/skills{ +/obj/item/circuitboard/security, +/obj/item/circuitboard/skills{ pixel_x = 4; pixel_y = -3 }, @@ -1671,7 +1671,7 @@ c_tag = "OPR - Xenoarch Crew Area"; dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/structure/flora/pottedplant/flower, @@ -1814,7 +1814,7 @@ }, /obj/effect/floor_decal/borderfloorwhite/corner, /obj/effect/floor_decal/corner/purple/bordercorner, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/machinery/camera/network/research{ @@ -1947,7 +1947,7 @@ /obj/structure/cable/heavyduty{ icon_state = "1-2" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -2022,7 +2022,7 @@ /turf/simulated/floor/tiled, /area/surface/station/engineering/hallway/bmt) "eI" = ( -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/tiled/old_tile/gray, /area/surface/station/rnd/mixing) "eL" = ( @@ -2093,7 +2093,7 @@ name = "EVA Suits" }, /obj/machinery/light, -/obj/item/weapon/storage/belt/archaeology, +/obj/item/storage/belt/archaeology, /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, /obj/effect/floor_decal/spline/plain{ @@ -2105,8 +2105,8 @@ /obj/random/crate{ dir = 4 }, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, /obj/random/maintenance/clean, /obj/random/maintenance/clean, /turf/simulated/floor/plating, @@ -2328,10 +2328,10 @@ }, /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/crowbar, +/obj/item/cell/high, +/obj/item/tool/screwdriver, +/obj/item/tool/wrench, +/obj/item/tool/crowbar, /turf/simulated/floor/tiled/steel/sif/planetuse{ icon_state = "asteroidfloor"; initial_flooring = /decl/flooring/tiling/asteroidfloor; @@ -2351,12 +2351,12 @@ /area/surface/station/rnd/hallway/bmt) "fv" = ( /obj/structure/safe, -/obj/item/weapon/material/sword/katana, -/obj/item/weapon/melee/chainofcommand, -/obj/item/weapon/disk/nuclear, -/obj/item/weapon/moneybag/vault, -/obj/item/weapon/coin/diamond, -/obj/item/weapon/coin/diamond, +/obj/item/material/sword/katana, +/obj/item/melee/chainofcommand, +/obj/item/disk/nuclear, +/obj/item/moneybag/vault, +/obj/item/coin/diamond, +/obj/item/coin/diamond, /turf/simulated/floor/tiled/techfloor, /area/surface/station/vault) "fw" = ( @@ -2448,8 +2448,8 @@ /area/surface/station/maintenance/engineering/south) "fK" = ( /obj/structure/table/steel, -/obj/item/device/defib_kit/loaded, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/defib_kit/loaded, +/obj/item/storage/toolbox/emergency, /turf/simulated/floor/tiled/dark, /area/surface/station/medical/storage/second_storage) "fL" = ( @@ -2537,9 +2537,9 @@ }, /obj/machinery/cell_charger, /obj/structure/table/steel_reinforced, -/obj/item/weapon/cell/high, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/pickaxe, +/obj/item/cell/high, +/obj/item/storage/belt/utility, +/obj/item/pickaxe, /turf/simulated/floor/tiled, /area/surface/station/mining_main/storage) "fY" = ( @@ -2650,7 +2650,7 @@ pixel_y = -12 }, /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/steeldecal/steel_decals_central7{ dir = 4 }, @@ -2789,7 +2789,7 @@ }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/purple/border, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/white, @@ -2822,7 +2822,7 @@ /obj/random/maintenance/clean, /obj/random/tool, /obj/random/tool, -/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, /turf/simulated/floor/plating, /area/surface/outpost/research/xenoarcheology/smes) "gI" = ( @@ -2944,7 +2944,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /turf/simulated/floor/plating, /area/surface/station/hallway/primary/bmt/east) "gX" = ( @@ -3305,7 +3305,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -3365,16 +3365,16 @@ /area/surface/outpost/research/xenoarcheology/anomaly) "hU" = ( /obj/structure/table/steel, -/obj/item/device/flashlight, -/obj/item/device/flashlight{ +/obj/item/flashlight, +/obj/item/flashlight{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/flash{ +/obj/item/flash{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/flash, +/obj/item/flash, /turf/simulated/floor/plating, /area/surface/station/storage/tech) "hV" = ( @@ -3507,7 +3507,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -3681,7 +3681,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -3689,23 +3689,23 @@ /area/surface/station/hallway/primary/bmt/north) "iI" = ( /obj/structure/table/steel, -/obj/item/device/suit_cooling_unit{ +/obj/item/suit_cooling_unit{ pixel_x = 4; pixel_y = -2 }, -/obj/item/device/suit_cooling_unit{ +/obj/item/suit_cooling_unit{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_x = 4; pixel_y = 4 }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/gps/science, +/obj/item/gps/science, /obj/structure/cable/cyan{ icon_state = "1-2" }, @@ -4231,7 +4231,7 @@ /obj/structure/closet/crate{ dir = 8 }, -/obj/item/weapon/storage/belt/champion, +/obj/item/storage/belt/champion, /obj/item/stack/material/gold{ pixel_x = -5; pixel_y = -2 @@ -4757,7 +4757,7 @@ /area/surface/station/maintenance/bar) "kU" = ( /obj/structure/table/rack, -/obj/item/weapon/circuitboard/message_monitor, +/obj/item/circuitboard/message_monitor, /turf/simulated/floor/plating, /area/surface/station/storage/tech) "kW" = ( @@ -4969,13 +4969,13 @@ /area/surface/station/hallway/primary/bmt/east) "lz" = ( /obj/structure/table/rack, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/analyzer{ +/obj/item/analyzer/plant_analyzer, +/obj/item/healthanalyzer, +/obj/item/analyzer{ pixel_x = 2; pixel_y = -2 }, -/obj/item/device/analyzer, +/obj/item/analyzer, /turf/simulated/floor/plating, /area/surface/station/storage/tech) "lA" = ( @@ -5242,10 +5242,10 @@ /area/surface/station/maintenance/incinerator) "lZ" = ( /obj/structure/table/steel, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = -4 }, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = 6 }, /turf/simulated/floor/plating, @@ -5300,7 +5300,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -5324,7 +5324,7 @@ /turf/simulated/floor/plating, /area/surface/station/maintenance/mining) "mf" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/plating, /area/surface/station/engineering/drone_fabrication) "mg" = ( @@ -5349,18 +5349,18 @@ /area/surface/outpost/research/xenoarcheology/restroom) "mj" = ( /obj/structure/table/glass, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#B19CD9"; name = "light purple"; pixel_x = 1; pixel_y = 4 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#B19CD9"; name = "light purple"; pixel_y = 2 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#B19CD9"; name = "light purple"; pixel_x = -1 @@ -5465,10 +5465,10 @@ /area/surface/outpost/research/xenoarcheology/entrance) "mv" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/excavation, -/obj/item/weapon/pickaxe, -/obj/item/weapon/tool/wrench, -/obj/item/device/measuring_tape, +/obj/item/storage/excavation, +/obj/item/pickaxe, +/obj/item/tool/wrench, +/obj/item/measuring_tape, /obj/item/stack/flag/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -5674,11 +5674,11 @@ /area/surface/station/mining_main/exterior) "mW" = ( /obj/structure/table/steel, -/obj/item/weapon/anodevice{ +/obj/item/anodevice{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/anodevice, +/obj/item/anodevice, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -5801,7 +5801,7 @@ }, /obj/random/toolbox, /obj/random/maintenance/clean, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -6008,11 +6008,11 @@ /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology/analysis) "nQ" = ( -/obj/item/weapon/ore/iron{ +/obj/item/ore/iron{ pixel_x = -3; pixel_y = 9 }, -/obj/item/weapon/ore/slag, +/obj/item/ore/slag, /obj/random/multiple/ore_pile, /turf/simulated/floor/tiled/dark, /area/surface/station/hallway/primary/bmt/west) @@ -6339,10 +6339,10 @@ pixel_x = -22 }, /obj/structure/table/rack, -/obj/item/weapon/pickaxe, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/shovel, +/obj/item/pickaxe, +/obj/item/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/shovel, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -7141,7 +7141,7 @@ /obj/effect/catwalk_plated/dark, /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high, +/obj/item/cell/high, /turf/simulated/floor/plating, /area/surface/station/maintenance/substation/medbay/bmt) "qs" = ( @@ -7190,7 +7190,7 @@ pixel_y = -24; req_access = list(19) }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -7354,7 +7354,7 @@ }, /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/machinery/light/small, @@ -7403,7 +7403,7 @@ /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/bmt/east) "qY" = ( -/obj/item/weapon/camera_assembly, +/obj/item/camera_assembly, /turf/simulated/floor/tiled/white, /area/surface/station/construction/genetics) "qZ" = ( @@ -7685,9 +7685,9 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/cautery, +/obj/item/autopsy_scanner, +/obj/item/surgical/scalpel, +/obj/item/surgical/cautery, /obj/machinery/requests_console{ department = "Medbay"; departmentType = 1; @@ -7984,7 +7984,7 @@ /area/surface/station/medical/hallway/bmt) "sl" = ( /obj/structure/closet/secure_closet/freezer/money, -/obj/item/weapon/storage/secure/briefcase/money, +/obj/item/storage/secure/briefcase/money, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/surface/station/vault) @@ -8141,7 +8141,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -8217,7 +8217,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner{ dir = 1 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ pixel_y = 21 }, /turf/simulated/floor/tiled, @@ -8418,7 +8418,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -8465,7 +8465,7 @@ "tj" = ( /obj/structure/closet/firecloset, /obj/item/clothing/mask/gas, -/obj/item/weapon/tank/oxygen/red, +/obj/item/tank/oxygen/red, /turf/simulated/floor/tiled/dark, /area/surface/station/rnd/hallway/bmt) "tk" = ( @@ -8665,7 +8665,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/steel_dirty, @@ -8678,7 +8678,7 @@ /turf/simulated/floor/reinforced, /area/surface/station/maintenance/incinerator) "tJ" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/plating, /area/surface/station/construction/genetics) "tK" = ( @@ -8800,7 +8800,7 @@ icon_state = "1-2" }, /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/random/maintenance/clean, /obj/machinery/alarm{ dir = 4; @@ -8814,11 +8814,11 @@ "tY" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/melee/baton/loaded, -/obj/item/device/multitool, +/obj/item/tool/screwdriver, +/obj/item/melee/baton/loaded, +/obj/item/multitool, /obj/item/clothing/head/welding, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/machinery/camera/network/research_outpost{ @@ -8869,8 +8869,8 @@ "uc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/structure/table/reinforced, -/obj/item/weapon/tape_roll, -/obj/item/device/geiger, +/obj/item/tape_roll, +/obj/item/geiger, /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology/anomaly) "ud" = ( @@ -9188,12 +9188,12 @@ icon_state = "1-2" }, /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/extinguisher{ +/obj/item/storage/firstaid/regular, +/obj/item/extinguisher{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/machinery/requests_console{ department = "Science"; departmentType = 2; @@ -9299,7 +9299,7 @@ "vk" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/old_tile/white, @@ -9330,7 +9330,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -9561,10 +9561,10 @@ /area/surface/station/maintenance/incineratormaint) "vP" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/device/multitool, +/obj/item/storage/toolbox/electrical, +/obj/item/multitool, /obj/item/clothing/glasses/meson, -/obj/item/device/t_scanner, +/obj/item/t_scanner, /obj/item/clothing/gloves/yellow, /turf/simulated/floor/plating, /area/surface/station/storage/tech) @@ -9671,10 +9671,10 @@ /area/surface/station/hallway/primary/bmt/west) "wa" = ( /obj/structure/table/rack, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/mask/gas, -/obj/item/device/flashlight, +/obj/item/flashlight, /obj/item/clothing/glasses/meson, /obj/random/maintenance/clean, /turf/simulated/floor/plating, @@ -9682,12 +9682,12 @@ "wb" = ( /obj/structure/table/glass, /obj/effect/floor_decal/borderfloorwhite, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/storage/box/beakers, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /obj/effect/floor_decal/corner/beige/border, /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology/analysis) @@ -9725,7 +9725,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled, @@ -9894,7 +9894,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -10055,7 +10055,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -10316,13 +10316,13 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 6 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, -/obj/item/weapon/pen/red{ +/obj/item/paper_bin, +/obj/item/pen/blue, +/obj/item/pen/red{ pixel_x = -4; pixel_y = -4 }, -/obj/item/device/camera{ +/obj/item/camera{ name = "Autopsy Camera"; pixel_y = 8 }, @@ -10441,7 +10441,7 @@ pixel_y = -12 }, /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/steeldecal/steel_decals_central7{ dir = 4 }, @@ -10450,7 +10450,7 @@ "xQ" = ( /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high, +/obj/item/cell/high, /obj/effect/floor_decal/industrial/warning, /obj/machinery/alarm{ dir = 4; @@ -10490,8 +10490,8 @@ /area/surface/outpost/research/xenoarcheology/anomaly) "ya" = ( /obj/structure/table/rack, -/obj/item/weapon/circuitboard/unary_atmos/cooler, -/obj/item/weapon/circuitboard/unary_atmos/heater{ +/obj/item/circuitboard/unary_atmos/cooler, +/obj/item/circuitboard/unary_atmos/heater{ pixel_x = 4; pixel_y = -3 }, @@ -10697,7 +10697,7 @@ }, /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high, +/obj/item/cell/high, /obj/machinery/alarm{ dir = 8; pixel_x = 22 @@ -10860,16 +10860,16 @@ /area/surface/station/hallway/primary/bmt/south) "yK" = ( /obj/structure/table/steel, -/obj/item/weapon/anobattery{ +/obj/item/anobattery{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/anobattery{ +/obj/item/anobattery{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/anobattery, -/obj/item/weapon/anobattery{ +/obj/item/anobattery, +/obj/item/anobattery{ pixel_x = -2; pixel_y = -2 }, @@ -10946,17 +10946,17 @@ pixel_y = 24 }, /obj/structure/table/rack, -/obj/item/weapon/stock_parts/matter_bin{ +/obj/item/stock_parts/matter_bin{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/stock_parts/matter_bin{ +/obj/item/stock_parts/matter_bin{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/console_screen, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/console_screen, /turf/simulated/floor/plating, /area/surface/station/storage/tech) "yV" = ( @@ -11003,11 +11003,11 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -11579,10 +11579,10 @@ /area/surface/station/hallway/primary/bmt/north) "At" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/excavation, -/obj/item/weapon/pickaxe, -/obj/item/weapon/tool/wrench, -/obj/item/device/measuring_tape, +/obj/item/storage/excavation, +/obj/item/pickaxe, +/obj/item/tool/wrench, +/obj/item/measuring_tape, /obj/item/stack/flag/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -11643,7 +11643,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central7{ dir = 1 }, -/obj/item/weapon/cell/high, +/obj/item/cell/high, /turf/simulated/floor/tiled/techmaint, /area/surface/station/mining_main) "Az" = ( @@ -11719,15 +11719,15 @@ /area/surface/station/rnd/hallway/bmt) "AI" = ( /obj/structure/table/steel, -/obj/item/weapon/cane/crutch{ +/obj/item/cane/crutch{ pixel_y = -4 }, -/obj/item/weapon/cane/crutch, -/obj/item/weapon/storage/box/gloves{ +/obj/item/cane/crutch, +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/rxglasses, +/obj/item/storage/box/rxglasses, /turf/simulated/floor/tiled/dark, /area/surface/station/medical/storage/second_storage) "AJ" = ( @@ -11828,8 +11828,8 @@ /area/surface/outpost/research/xenoarcheology/entrance) "AS" = ( /obj/structure/table/steel, -/obj/item/device/aicard, -/obj/item/weapon/aiModule/reset, +/obj/item/aicard, +/obj/item/aiModule/reset, /turf/simulated/floor/plating, /area/surface/station/storage/tech) "AT" = ( @@ -11892,16 +11892,16 @@ /area/surface/station/hallway/primary/bmt/south) "Ba" = ( /obj/structure/closet/crate, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -12068,11 +12068,11 @@ icon_state = "0-8" }, /obj/structure/table/steel, -/obj/item/device/suit_cooling_unit{ +/obj/item/suit_cooling_unit{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -12610,7 +12610,7 @@ req_one_access = list(48) }, /obj/item/clothing/mask/breath, -/obj/item/weapon/rig/industrial/equipped, +/obj/item/rig/industrial/equipped, /turf/simulated/floor/tiled/techmaint, /area/surface/station/mining_main/storage) "CD" = ( @@ -12983,10 +12983,10 @@ "Dr" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/structure/table/rack, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/mask/gas, -/obj/item/device/flashlight, +/obj/item/flashlight, /obj/item/clothing/glasses/meson, /obj/random/maintenance/clean, /turf/simulated/floor/plating, @@ -13056,7 +13056,7 @@ /turf/simulated/floor/plating, /area/surface/station/hallway/primary/bmt/west) "DB" = ( -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel/sif/planetuse{ icon_state = "asteroidfloor"; @@ -13148,7 +13148,7 @@ "DO" = ( /obj/structure/table/rack, /obj/random/toolbox, -/obj/item/device/analyzer, +/obj/item/analyzer, /obj/random/tech_supply, /obj/random/cigarettes, /obj/random/tool, @@ -13182,20 +13182,20 @@ /area/surface/station/storage/tech) "DS" = ( /obj/structure/table/rack, -/obj/item/weapon/circuitboard/cloning{ +/obj/item/circuitboard/cloning{ pixel_x = -3; pixel_y = 2 }, -/obj/item/weapon/circuitboard/clonescanner, -/obj/item/weapon/circuitboard/clonepod{ +/obj/item/circuitboard/clonescanner, +/obj/item/circuitboard/clonepod{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/circuitboard/scan_consolenew{ +/obj/item/circuitboard/scan_consolenew{ pixel_x = 6; pixel_y = -4 }, -/obj/item/weapon/circuitboard/med_data{ +/obj/item/circuitboard/med_data{ pixel_x = 9; pixel_y = -6 }, @@ -13266,7 +13266,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = 21 }, @@ -13468,7 +13468,7 @@ /obj/random/tech_supply, /obj/random/maintenance/engineering, /obj/random/maintenance/engineering, -/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, /turf/simulated/floor/plating, /area/surface/station/engineering/auxiliary_engineering) "EC" = ( @@ -13654,7 +13654,7 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/machinery/camera/network/basement{ @@ -13681,11 +13681,11 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/technology_scanner, -/obj/item/device/integrated_circuit_printer, +/obj/item/integrated_circuit_printer, /turf/simulated/floor/plating, /area/surface/station/maintenance/research/south) "Fc" = ( -/obj/item/weapon/storage/box/lights/tubes, +/obj/item/storage/box/lights/tubes, /turf/simulated/floor/plating, /area/surface/station/construction/genetics) "Fd" = ( @@ -14076,7 +14076,7 @@ "Gf" = ( /obj/structure/closet/crate/science, /obj/item/frame/apc, -/obj/item/weapon/module/power_control, +/obj/item/module/power_control, /turf/simulated/floor/plating, /area/surface/station/construction/genetics) "Gg" = ( @@ -14383,7 +14383,7 @@ /area/surface/station/maintenance/eaststairwell) "GL" = ( /obj/structure/table/steel, -/obj/item/device/integrated_circuit_printer, +/obj/item/integrated_circuit_printer, /turf/simulated/floor/plating, /area/surface/station/storage/tech) "GM" = ( @@ -15187,7 +15187,7 @@ /area/surface/station/mining_main/locker) "IR" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/cdeathalarm_kit, +/obj/item/storage/box/cdeathalarm_kit, /obj/item/bodybag/cryobag{ pixel_x = 2; pixel_y = 2 @@ -15269,7 +15269,7 @@ pixel_y = -24 }, /obj/structure/table/steel, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/random/maintenance/engineering, /obj/random/maintenance/cargo, /obj/random/maintenance/clean, @@ -15339,24 +15339,24 @@ dir = 8 }, /obj/structure/closet/crate, -/obj/item/device/flashlight/color/red, -/obj/item/device/flashlight/color/red, -/obj/item/device/radio{ +/obj/item/flashlight/color/red, +/obj/item/flashlight/color/red, +/obj/item/radio{ frequency = 1485; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"; pixel_y = 4 }, -/obj/item/device/radio{ +/obj/item/radio{ frequency = 1485; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"; pixel_y = 4 }, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/storage/box/lights/mixed, +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = 21 }, @@ -15370,11 +15370,11 @@ /area/surface/station/construction/genetics) "Jo" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 4; pixel_y = 4 }, -/obj/item/device/multitool, +/obj/item/multitool, /obj/item/clothing/glasses/meson, /turf/simulated/floor/plating, /area/surface/station/storage/tech) @@ -15396,7 +15396,7 @@ dir = 8 }, /obj/effect/floor_decal/rust, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -15559,8 +15559,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/box/syringegun, -/obj/item/weapon/gun/launcher/syringe, +/obj/item/storage/box/syringegun, +/obj/item/gun/launcher/syringe, /turf/simulated/floor/tiled/dark, /area/surface/station/medical/storage/second_storage) "JK" = ( @@ -15576,14 +15576,14 @@ "JM" = ( /obj/structure/table/rack, /obj/effect/floor_decal/techfloor, -/obj/item/weapon/circuitboard/crew{ +/obj/item/circuitboard/crew{ pixel_x = -8; pixel_y = 3 }, -/obj/item/weapon/circuitboard/card{ +/obj/item/circuitboard/card{ pixel_x = -4 }, -/obj/item/weapon/circuitboard/communications{ +/obj/item/circuitboard/communications{ pixel_y = -3 }, /obj/machinery/light/small, @@ -15749,10 +15749,10 @@ "Kg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, -/obj/item/device/camera, +/obj/item/paper_bin, +/obj/item/folder/white, +/obj/item/pen, +/obj/item/camera, /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology/anomaly) "Kh" = ( @@ -15842,12 +15842,12 @@ /turf/simulated/floor/tiled/dark, /area/surface/station/mining_main/locker) "Kt" = ( -/obj/item/device/gps/mining{ +/obj/item/gps/mining{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining{ +/obj/item/gps/mining, +/obj/item/gps/mining{ pixel_x = -2; pixel_y = -2 }, @@ -15883,17 +15883,17 @@ /area/surface/station/engineering/drone_fabrication) "Ky" = ( /obj/structure/table/rack, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/matter_bin{ +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/matter_bin{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/capacitor{ +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/capacitor{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, /obj/machinery/light/small{ dir = 8 }, @@ -16129,7 +16129,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/item/weapon/ore/lead{ +/obj/item/ore/lead{ pixel_x = 7; pixel_y = 2 }, @@ -16179,7 +16179,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/surface/station/rnd/mixing) "Lf" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/effect/floor_decal/industrial/warning/corner, @@ -16516,8 +16516,8 @@ }, /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high{ +/obj/item/cell/high, +/obj/item/cell/high{ pixel_y = -4 }, /turf/simulated/floor/tiled/steel/sif/planetuse{ @@ -16804,7 +16804,7 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/paleblue/border, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled, @@ -16941,9 +16941,9 @@ dir = 4 }, /obj/machinery/recharger, -/obj/item/device/camera_film, -/obj/item/device/camera, -/obj/item/weapon/tape_roll, +/obj/item/camera_film, +/obj/item/camera, +/obj/item/tape_roll, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -17002,7 +17002,7 @@ /obj/item/clothing/shoes/boots/winter/mining, /obj/item/clothing/suit/storage/hooded/wintercoat/miner, /obj/item/clothing/head/hardhat/orange, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -17010,32 +17010,32 @@ /area/surface/station/mining_main/locker) "MY" = ( /obj/structure/closet/crate, -/obj/item/weapon/coin/gold{ +/obj/item/coin/gold{ pixel_x = -6; pixel_y = -4 }, -/obj/item/weapon/coin/gold{ +/obj/item/coin/gold{ pixel_x = -4; pixel_y = -3 }, -/obj/item/weapon/coin/gold{ +/obj/item/coin/gold{ pixel_x = -2; pixel_y = -4 }, -/obj/item/weapon/coin/gold{ +/obj/item/coin/gold{ pixel_y = -3 }, -/obj/item/weapon/coin/gold{ +/obj/item/coin/gold{ pixel_x = 3; pixel_y = -4 }, -/obj/item/weapon/coin/gold{ +/obj/item/coin/gold{ pixel_x = 4 }, -/obj/item/weapon/coin/gold{ +/obj/item/coin/gold{ pixel_x = -4 }, -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/surface/station/vault) @@ -17241,11 +17241,11 @@ /area/surface/station/maintenance/incinerator) "NB" = ( /obj/structure/closet/crate/nanotrasen, -/obj/item/weapon/weldpack, +/obj/item/weldpack, /obj/item/stack/nanopaste, /obj/item/stack/nanopaste, /obj/item/stack/nanopaste, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/floor_decal/borderfloorwhite/corner, /obj/machinery/alarm{ dir = 1; @@ -17304,8 +17304,8 @@ /area/surface/station/maintenance/incinerator) "NI" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/glasses/square, -/obj/item/weapon/hand_labeler, +/obj/item/storage/box/glasses/square, +/obj/item/hand_labeler, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -17406,7 +17406,7 @@ dir = 4 }, /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/old_tile/white, /area/surface/station/rnd/mixing) "NR" = ( @@ -17445,7 +17445,7 @@ /obj/effect/floor_decal/corner/brown/bordercorner{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -17498,7 +17498,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -18014,12 +18014,12 @@ pixel_y = 12 }, /obj/structure/table/steel, -/obj/item/weapon/mining_scanner{ +/obj/item/mining_scanner{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/mining_scanner, -/obj/item/weapon/mining_scanner{ +/obj/item/mining_scanner, +/obj/item/mining_scanner{ pixel_x = -3; pixel_y = -3 }, @@ -18108,8 +18108,8 @@ "Pi" = ( /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/device/multitool, -/obj/item/weapon/cell/high, +/obj/item/multitool, +/obj/item/cell/high, /obj/item/stack/cable_coil{ pixel_x = 2; pixel_y = 2 @@ -18456,8 +18456,8 @@ }, /obj/item/roller, /obj/item/bodybag/cryobag, -/obj/item/weapon/storage/firstaid, -/obj/item/weapon/storage/pill_bottle/spaceacillin, +/obj/item/storage/firstaid, +/obj/item/storage/pill_bottle/spaceacillin, /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology) "PT" = ( @@ -18531,7 +18531,7 @@ /area/surface/outpost/research/xenoarcheology/entrance) "Qa" = ( /obj/structure/closet/l3closet/medical, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -18554,19 +18554,19 @@ /area/surface/station/hallway/primary/bmt/east) "Qc" = ( /obj/structure/table/rack, -/obj/item/weapon/circuitboard/powermonitor{ +/obj/item/circuitboard/powermonitor{ pixel_x = -3; pixel_y = 2 }, -/obj/item/weapon/circuitboard/stationalert_engineering{ +/obj/item/circuitboard/stationalert_engineering{ pixel_x = -1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/security/engineering{ +/obj/item/circuitboard/security/engineering{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/atmos_alert{ +/obj/item/circuitboard/atmos_alert{ pixel_x = 4; pixel_y = -5 }, @@ -18618,7 +18618,7 @@ /obj/machinery/door/window/northleft{ name = "EVA Suits" }, -/obj/item/weapon/storage/belt/archaeology, +/obj/item/storage/belt/archaeology, /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, /obj/effect/floor_decal/spline/plain{ @@ -18847,7 +18847,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = 21 }, @@ -19186,7 +19186,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -19539,11 +19539,11 @@ dir = 8 }, /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric{ +/obj/item/reagent_containers/glass/beaker/sulphuric{ pixel_x = 2; pixel_y = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/toxin, +/obj/item/reagent_containers/glass/bottle/toxin, /obj/machinery/light{ dir = 1 }, @@ -19593,7 +19593,7 @@ }, /obj/effect/floor_decal/borderfloorwhite/corner, /obj/effect/floor_decal/corner/purple/bordercorner, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -19981,7 +19981,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology/analysis) "Tt" = ( @@ -20018,8 +20018,8 @@ icon_state = "1-2" }, /obj/structure/table/standard, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/gloves, +/obj/item/storage/box/monkeycubes, /obj/structure/cable/cyan{ icon_state = "2-8" }, @@ -20258,34 +20258,34 @@ /obj/structure/closet/crate{ dir = 8 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = -6; pixel_y = -4 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = -4; pixel_y = -3 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = -2; pixel_y = -4 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_y = -3 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 2; pixel_y = -4 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/surface/station/vault) @@ -20479,7 +20479,7 @@ c_tag = "CIV - Waste Disposal"; dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/old_tile/gray, @@ -20587,7 +20587,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -20637,7 +20637,7 @@ }, /area/surface/station/rnd/toxins_launch) "UU" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -20779,8 +20779,8 @@ pixel_y = 24 }, /obj/structure/table/steel, -/obj/item/weapon/module/power_control, -/obj/item/weapon/airlock_electronics, +/obj/item/module/power_control, +/obj/item/airlock_electronics, /turf/simulated/floor/plating, /area/surface/station/storage/tech) "Vk" = ( @@ -21093,7 +21093,7 @@ /obj/item/stack/tile/floor/white{ amount = 23 }, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /obj/random/tech_supply, /obj/random/tech_supply, /turf/simulated/floor/plating, @@ -21621,17 +21621,17 @@ /area/surface/outpost/research/xenoarcheology/entrance) "Xc" = ( /obj/structure/table/rack, -/obj/item/weapon/pickaxe, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/shovel, +/obj/item/pickaxe, +/obj/item/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/shovel, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/brown/border{ dir = 8 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -2 }, @@ -21784,10 +21784,10 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/obj/item/weapon/circuitboard/mecha_control{ +/obj/item/circuitboard/mecha_control{ pixel_x = -4 }, -/obj/item/weapon/circuitboard/robotics{ +/obj/item/circuitboard/robotics{ pixel_y = -3 }, /turf/simulated/floor/tiled/techfloor, @@ -21898,7 +21898,7 @@ /obj/random/maintenance/security, /obj/random/maintenance/clean, /obj/random/toolbox, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /turf/simulated/floor/plating, /area/surface/station/maintenance/security) "XP" = ( @@ -21993,7 +21993,7 @@ dir = 4 }, /obj/machinery/hologram/holopad, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/tiled/neutral, @@ -22059,7 +22059,7 @@ dir = 8 }, /obj/machinery/cell_charger, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/techmaint, @@ -22568,10 +22568,10 @@ /area/surface/station/hallway/primary/bmt/west/elevator) "Zu" = ( /obj/structure/table/reinforced, -/obj/item/weapon/flame/lighter/random, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/weldingtool, +/obj/item/flame/lighter/random, +/obj/item/reagent_containers/dropper, +/obj/item/tool/crowbar, +/obj/item/weldingtool, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -22670,7 +22670,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -22681,7 +22681,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/machinery/camera/network/research{ @@ -22695,15 +22695,15 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/weapon/circuitboard/autolathe{ +/obj/item/circuitboard/autolathe{ pixel_x = 6; pixel_y = -6 }, -/obj/item/weapon/circuitboard/autolathe{ +/obj/item/circuitboard/autolathe{ pixel_x = 4; pixel_y = -4 }, -/obj/item/weapon/circuitboard/security/mining, +/obj/item/circuitboard/security/mining, /obj/machinery/camera/network/engineering{ c_tag = "ENG - Technical Storage" }, @@ -22740,7 +22740,7 @@ pixel_y = -12 }, /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/steeldecal/steel_decals_central7{ dir = 4 }, @@ -22828,7 +22828,7 @@ /turf/simulated/floor/tiled, /area/surface/station/engineering/hallway/bmt) "ZS" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/floor/plating, diff --git a/maps/cynosure/cynosure-2.dmm b/maps/cynosure/cynosure-2.dmm index e7a76e37584..c283b414a94 100644 --- a/maps/cynosure/cynosure-2.dmm +++ b/maps/cynosure/cynosure-2.dmm @@ -35,14 +35,14 @@ pixel_y = 30 }, /obj/structure/table/woodentable, -/obj/item/weapon/storage/photo_album{ +/obj/item/storage/photo_album{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/storage/photo_album, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera{ +/obj/item/storage/photo_album, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera{ desc = "A polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; @@ -50,7 +50,7 @@ pixel_x = 4; pixel_y = -4 }, -/obj/item/device/camera{ +/obj/item/camera{ desc = "A polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; @@ -80,7 +80,7 @@ /area/surface/station/maintenance/east/gnd) "acC" = ( /obj/effect/floor_decal/spline/plain, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -439,7 +439,7 @@ /area/surface/station/engineering/workshop) "apM" = ( /obj/structure/table/standard, -/obj/item/device/assembly/igniter, +/obj/item/assembly/igniter, /turf/simulated/floor/reinforced, /area/surface/station/rnd/misc_lab) "apV" = ( @@ -514,7 +514,7 @@ /turf/simulated/wall, /area/surface/station/maintenance/solars/northeast) "asW" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /obj/effect/floor_decal/borderfloor/corner{ @@ -608,13 +608,13 @@ /area/surface/station/hallway/primary/groundfloor/north) "auU" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/extinguisher, -/obj/item/weapon/tool/crowbar, +/obj/item/extinguisher, +/obj/item/tool/crowbar, /obj/random/medical/lite, /obj/machinery/light, /turf/simulated/shuttle/floor/white, @@ -674,18 +674,18 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/blue{ +/obj/item/paper_bin, +/obj/item/folder/red, +/obj/item/folder/blue{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/pen, -/obj/item/weapon/pen/multi{ +/obj/item/pen, +/obj/item/pen/multi{ pixel_x = 2; pixel_y = 2 }, @@ -709,31 +709,31 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central7{ dir = 1 }, -/obj/item/weapon/towel/random{ +/obj/item/towel/random{ pixel_x = -3; pixel_y = -4 }, -/obj/item/weapon/towel/random{ +/obj/item/towel/random{ pixel_x = -1; pixel_y = -2 }, -/obj/item/weapon/towel/random{ +/obj/item/towel/random{ pixel_x = -1 }, -/obj/item/weapon/towel/random{ +/obj/item/towel/random{ pixel_x = 1; pixel_y = 2 }, -/obj/item/weapon/towel/random{ +/obj/item/towel/random{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/towel/random{ +/obj/item/towel/random{ pixel_x = 5; pixel_y = 6 }, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/simulated/floor/tiled/white, /area/surface/station/crew_quarters/locker) "awS" = ( @@ -803,7 +803,7 @@ "ayn" = ( /obj/structure/closet/secure_closet/explorer, /obj/structure/window/reinforced, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /obj/effect/floor_decal/spline/plain{ dir = 1 }, @@ -1070,7 +1070,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -1126,8 +1126,8 @@ pixel_x = -24; pixel_y = 12 }, -/obj/item/weapon/melee/umbrella/random, -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/tiled, /area/surface/station/arrivals/cynosure) "aGP" = ( @@ -1230,7 +1230,7 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/tech_supply, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/machinery/newscaster{ @@ -1276,7 +1276,7 @@ /area/surface/station/medical/etc) "aIC" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 2; pixel_y = 2 }, @@ -1332,23 +1332,23 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#B19CD9"; name = "light purple"; pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#B19CD9"; name = "light purple"; pixel_x = -1 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#B19CD9"; name = "light purple"; pixel_y = 2 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#B19CD9"; name = "light purple"; pixel_x = 1; @@ -1364,7 +1364,7 @@ /area/surface/station/rnd/research_restroom) "aKd" = ( /obj/effect/floor_decal/corner/white/diagonal, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/freezer, /area/surface/station/crew_quarters/pool) "aKx" = ( @@ -1374,7 +1374,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -1446,7 +1446,7 @@ "aNe" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/table/glass, -/obj/item/weapon/inflatable_duck, +/obj/item/inflatable_duck, /turf/simulated/floor/tiled/freezer, /area/surface/station/crew_quarters/pool) "aNh" = ( @@ -1682,7 +1682,7 @@ /turf/simulated/floor/tiled/hydro, /area/surface/station/park) "aTC" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -1845,7 +1845,7 @@ "aWA" = ( /obj/machinery/recharge_station, /obj/structure/window/reinforced, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -2082,31 +2082,31 @@ dir = 4 }, /obj/structure/table/steel, -/obj/item/weapon/wrapping_paper{ +/obj/item/wrapping_paper{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/wrapping_paper, -/obj/item/weapon/wrapping_paper{ +/obj/item/wrapping_paper, +/obj/item/wrapping_paper{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/packageWrap{ +/obj/item/packageWrap{ pixel_x = -2; pixel_y = -4 }, -/obj/item/weapon/packageWrap{ +/obj/item/packageWrap{ pixel_y = -2 }, -/obj/item/weapon/packageWrap{ +/obj/item/packageWrap{ pixel_x = 2 }, -/obj/item/device/destTagger, +/obj/item/destTagger, /turf/simulated/floor/tiled, /area/surface/station/quartermaster/delivery) "bbj" = ( /obj/machinery/portable_atmospherics/canister/empty, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -2330,7 +2330,7 @@ /turf/simulated/floor/tiled, /area/surface/station/engineering/hallway) "bgH" = ( -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -2456,7 +2456,7 @@ /obj/structure/closet/crate/engineering{ dir = 2 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/stack/material/phoron{ amount = 25 }, @@ -2506,10 +2506,10 @@ /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/suit/storage/hooded/wintercoat, -/obj/item/weapon/melee/umbrella/random{ +/obj/item/melee/umbrella/random{ pixel_y = -4 }, -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/tiled, /area/surface/station/arrivals/cynosure) "bkP" = ( @@ -2657,10 +2657,10 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/item/weapon/cane/crutch{ +/obj/item/cane/crutch{ pixel_y = -4 }, -/obj/item/weapon/cane/crutch, +/obj/item/cane/crutch, /turf/simulated/floor/tiled/white, /area/surface/station/medical/storage/primary_storage) "bnR" = ( @@ -2875,16 +2875,16 @@ /area/surface/station/hallway/primary/groundfloor/east) "bsr" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /obj/machinery/alarm{ dir = 8; pixel_x = 22 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ pixel_y = 21 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -2927,8 +2927,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/belt/utility/full, /turf/simulated/floor/tiled/techmaint, /area/surface/station/rnd/exploration) "bsN" = ( @@ -2961,14 +2961,14 @@ /area/surface/station/crew_quarters/cafeteria) "btA" = ( /obj/effect/floor_decal/corner/white/diagonal, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, /obj/machinery/camera/network/civilian{ c_tag = "CIV - Pool North" }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/tiled/freezer, @@ -2994,11 +2994,11 @@ /obj/structure/table/rack{ layer = 2.6 }, -/obj/item/device/suit_cooling_unit{ +/obj/item/suit_cooling_unit{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/techmaint, /area/surface/station/rnd/exploration) "bvw" = ( @@ -3071,7 +3071,7 @@ /turf/simulated/floor/tiled/freezer, /area/surface/station/crew_quarters/pool) "bxu" = ( -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = 21 }, @@ -3294,7 +3294,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled/freezer, @@ -3407,7 +3407,7 @@ /area/surface/station/engineering/hallway/reactor) "bEM" = ( /obj/structure/reagent_dispensers/watertank/high, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/machinery/alarm{ dir = 1; pixel_y = -22 @@ -3629,7 +3629,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -3720,7 +3720,7 @@ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /turf/simulated/floor/tiled/techmaint, /area/surface/station/security/range) "bNg" = ( @@ -3802,7 +3802,7 @@ dir = 9 }, /obj/structure/closet/l3closet/scientist, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -3827,7 +3827,7 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 5 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/white, /area/surface/station/medical/surgery) "bPS" = ( @@ -3900,10 +3900,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/invisible, -/obj/item/weapon/book/codex/lore/news, -/obj/item/device/tvcamera, +/obj/item/paper_bin, +/obj/item/pen/invisible, +/obj/item/book/codex/lore/news, +/obj/item/tvcamera, /obj/machinery/light{ dir = 8 }, @@ -3967,11 +3967,11 @@ /area/surface/station/hallway/primary/groundfloor/east) "bTe" = ( /obj/structure/table/woodentable, -/obj/item/weapon/deck/cah{ +/obj/item/deck/cah{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/deck/cah/black{ +/obj/item/deck/cah/black{ pixel_x = -4; pixel_y = 6 }, @@ -4127,7 +4127,7 @@ /obj/machinery/newscaster{ pixel_y = 26 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -4141,10 +4141,10 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 5 }, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/storage/box/swabs, +/obj/item/folder/red, +/obj/item/folder/blue, +/obj/item/folder/yellow, +/obj/item/storage/box/swabs, /obj/structure/extinguisher_cabinet{ dir = 1; pixel_y = 30 @@ -4183,19 +4183,19 @@ /area/surface/station/engineering/storage) "bZQ" = ( /obj/structure/closet/crate/nanotrasen, -/obj/item/weapon/camera_assembly{ +/obj/item/camera_assembly{ pixel_x = -7; pixel_y = -6 }, -/obj/item/weapon/camera_assembly{ +/obj/item/camera_assembly{ pixel_x = -3; pixel_y = -4 }, -/obj/item/weapon/camera_assembly{ +/obj/item/camera_assembly{ pixel_x = -3; pixel_y = -2 }, -/obj/item/weapon/camera_assembly, +/obj/item/camera_assembly, /turf/simulated/floor/bluegrid, /area/surface/station/ai/server_room) "bZS" = ( @@ -4376,7 +4376,7 @@ /area/surface/outside/plains/station) "cen" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/cups{ +/obj/item/storage/box/cups{ pixel_x = 4; pixel_y = 4 }, @@ -4434,7 +4434,7 @@ /area/surface/station/medical/ward) "cgM" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup, /turf/simulated/floor/tiled/techmaint, /area/surface/station/medical/hallway/gnd) "cgV" = ( @@ -4527,7 +4527,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/book/codex/corp_regs, +/obj/item/book/codex/corp_regs, /turf/simulated/floor/tiled/monotile, /area/surface/station/security/briefing_room) "cjr" = ( @@ -4661,24 +4661,24 @@ dir = 4; pixel_x = -22 }, -/obj/item/weapon/tool/crowbar{ +/obj/item/tool/crowbar{ pixel_x = 4 }, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/device/radio{ +/obj/item/tool/crowbar, +/obj/item/storage/toolbox/mechanical, +/obj/item/radio{ frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"; pixel_y = 4 }, -/obj/item/device/radio{ +/obj/item/radio{ frequency = 1485; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"; pixel_y = 4 }, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled/monotile, /area/surface/station/medical/emt_bay) "cnU" = ( @@ -4705,12 +4705,12 @@ name = "explorer crate"; req_access = list(43) }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/pill_bottle/spaceacillin, +/obj/item/storage/firstaid/regular, +/obj/item/storage/pill_bottle/spaceacillin, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag{ pixel_x = -3; @@ -4852,9 +4852,9 @@ dir = 4 }, /obj/structure/closet/crate, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/crowbar/red, -/obj/item/device/suit_cooling_unit, +/obj/item/tool/wrench, +/obj/item/tool/crowbar/red, +/obj/item/suit_cooling_unit, /obj/machinery/light{ dir = 4 }, @@ -5258,7 +5258,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/monotile, /area/surface/station/park) "cHm" = ( @@ -5485,7 +5485,7 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/tiled, /area/surface/station/security/interrogation) "cLu" = ( @@ -5549,8 +5549,8 @@ /area/surface/outside/plains/station) "cNb" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/tape_roll, +/obj/item/storage/firstaid/regular, +/obj/item/tape_roll, /obj/effect/floor_decal/borderfloor{ dir = 6 }, @@ -5647,7 +5647,7 @@ /area/surface/station/quartermaster/lockerroom) "cOp" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -5709,7 +5709,7 @@ icon_state = "spline_plain_full" }, <<<<<<< HEAD -/obj/item/weapon/bikehorn/rubberducky{ +/obj/item/bikehorn/rubberducky{ pixel_x = 6; pixel_y = -6 }, @@ -5867,7 +5867,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -6005,28 +6005,28 @@ dir = 9 }, /obj/structure/closet/crate, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -6; pixel_y = -6 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/backpack/parachute, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute, +/obj/item/storage/backpack/parachute{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 4; pixel_y = 4 }, -/obj/item/device/spaceflare, +/obj/item/spaceflare, /turf/simulated/floor/tiled/neutral, /area/surface/station/rnd/exploration) "cVy" = ( @@ -6118,7 +6118,7 @@ /turf/simulated/floor/tiled/white, /area/surface/station/medical/ward) "cXj" = ( -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/effect/floor_decal/borderfloor{ dir = 10 }, @@ -6651,9 +6651,9 @@ /obj/machinery/recharger/wallcharger{ pixel_y = -28 }, -/obj/item/device/tape/random, -/obj/item/device/taperecorder, -/obj/item/device/megaphone, +/obj/item/tape/random, +/obj/item/taperecorder, +/obj/item/megaphone, /obj/structure/closet/secure_closet/hos/cynosure, /turf/simulated/floor/tiled/dark, /area/surface/station/crew_quarters/heads/hos) @@ -6763,7 +6763,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloorwhite/corner, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -6958,8 +6958,8 @@ dir = 1; pixel_y = 30 }, -/obj/item/weapon/storage/box/cups, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/storage/box/cups, +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = 21 }, @@ -7020,11 +7020,11 @@ /obj/effect/floor_decal/corner/green/border{ dir = 1 }, -/obj/item/weapon/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/glass/bucket{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/neutral, /area/surface/station/rnd/xenobiology/xenoflora) "dsW" = ( @@ -7210,7 +7210,7 @@ "dwK" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled, @@ -7277,7 +7277,7 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled/white, /area/surface/station/medical/surgery) "dzm" = ( @@ -7401,7 +7401,7 @@ /turf/simulated/floor/reinforced, /area/surface/station/engineering/atmos) "dDm" = ( -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -7434,11 +7434,11 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 6 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder/white, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/paper_bin, +/obj/item/folder/white, +/obj/item/folder/white, +/obj/item/pen, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/neutral, /area/surface/station/medical/reception) "dDF" = ( @@ -7680,7 +7680,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -7856,7 +7856,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 10 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/corner/purple/border{ dir = 10 }, @@ -8157,7 +8157,7 @@ /turf/simulated/wall/r_wall, /area/surface/station/maintenance/substation/cargo/gnd) "dYO" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -8361,8 +8361,8 @@ pixel_x = -8; pixel_y = -6 }, -/obj/item/weapon/handcuffs, -/obj/item/device/tape/random, +/obj/item/handcuffs, +/obj/item/tape/random, /turf/simulated/floor/carpet, /area/surface/station/security/detectives_office) "een" = ( @@ -8385,8 +8385,8 @@ /obj/effect/catwalk_plated, /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/device/multitool, -/obj/item/weapon/tool/wrench, +/obj/item/multitool, +/obj/item/tool/wrench, /turf/simulated/floor/plating, /area/surface/station/engineering/atmos) "eez" = ( @@ -8537,12 +8537,12 @@ /area/surface/station/engineering/reactor_room) "ehV" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/structure/window/reinforced/polarized{ dir = 8; id = "deteast" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/carpet, @@ -8578,9 +8578,9 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 4 }, -/obj/item/device/mass_spectrometer/adv, -/obj/item/device/reagent_scanner, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/mass_spectrometer/adv, +/obj/item/reagent_scanner, +/obj/item/reagent_containers/syringe, /obj/machinery/requests_console{ department = "Security"; departmentType = 5; @@ -8612,7 +8612,7 @@ /area/surface/station/hallway/primary/groundfloor/south) "ekq" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/carpet, /area/surface/station/security/detectives_office) "ekF" = ( @@ -8697,11 +8697,11 @@ pixel_x = 1; pixel_y = 36 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = -21 }, @@ -8709,11 +8709,11 @@ /turf/simulated/floor/tiled/white, /area/surface/station/medical/surgery) "emg" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/structure/window/reinforced/polarized{ dir = 4; id = "detwest" @@ -8741,7 +8741,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled, @@ -8779,8 +8779,8 @@ dir = 4 }, /obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -8829,7 +8829,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 4 }, -/obj/item/weapon/stool/barstool/padded{ +/obj/item/stool/barstool/padded{ dir = 4 }, /turf/simulated/floor/tiled, @@ -8839,16 +8839,16 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central5{ dir = 4 }, -/obj/item/device/tape/random, -/obj/item/device/taperecorder, +/obj/item/tape/random, +/obj/item/taperecorder, /turf/simulated/floor/tiled, /area/surface/station/security/processing) "epn" = ( /obj/structure/bookcase{ name = "bookcase (Reference)" }, -/obj/item/weapon/book/codex/lore/robutt, -/obj/item/weapon/book/codex/corp_regs, +/obj/item/book/codex/lore/robutt, +/obj/item/book/codex/corp_regs, /turf/simulated/floor/wood, /area/surface/station/library) "epo" = ( @@ -8856,11 +8856,11 @@ dir = 9 }, /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = 2 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppershaker{ +/obj/item/reagent_containers/food/condiment/small/peppershaker{ pixel_x = -4 }, /obj/item/toy/xmastree{ @@ -9636,14 +9636,14 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ pixel_y = 21 }, /obj/effect/floor_decal/steeldecal/steel_decals_central7{ dir = 1 }, -/obj/item/weapon/storage/laundry_basket, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/laundry_basket, +/obj/item/storage/box/bodybags, /turf/simulated/floor/tiled/neutral, /area/surface/station/medical/cloning) "eEB" = ( @@ -9710,14 +9710,14 @@ /area/surface/station/arrivals/cynosure) "eGS" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/weapon/pen/blue{ +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/pen/blue{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/storage/fancy/markers, -/obj/item/device/radio/intercom{ +/obj/item/storage/fancy/markers, +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -9822,7 +9822,7 @@ name = "Powernet Sensor - Engine Output"; name_tag = "Engine Output" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/effect/floor_decal/industrial/warning{ @@ -9863,10 +9863,10 @@ /area/surface/station/maintenance/kitchen) "eKb" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/kitchen/utensil/fork{ +/obj/item/material/kitchen/utensil/fork{ pixel_x = -2 }, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/spoon{ pixel_x = 2 }, /turf/simulated/floor/wood, @@ -10062,7 +10062,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/glass/bucket{ pixel_x = 2; pixel_y = 2 }, @@ -10183,10 +10183,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/snacks/mint, -/obj/item/weapon/packageWrap, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/deskbell, +/obj/item/reagent_containers/food/snacks/mint, +/obj/item/packageWrap, +/obj/item/reagent_containers/dropper, +/obj/item/deskbell, /turf/simulated/floor/tiled/eris/cafe, /area/surface/station/crew_quarters/kitchen) "eSe" = ( @@ -10260,26 +10260,26 @@ /area/surface/outside/path/plains) "eSK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red{ +/obj/item/paper_bin, +/obj/item/clipboard, +/obj/item/folder/red{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/folder{ +/obj/item/folder{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/pen, -/obj/item/weapon/pen/blue{ +/obj/item/pen, +/obj/item/pen/blue{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = 3; pixel_y = 3 }, @@ -10363,10 +10363,10 @@ /area/surface/station/maintenance/chapel) "eUP" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner{ pixel_x = 2; pixel_y = 2 }, @@ -10427,7 +10427,7 @@ dir = 4; pixel_x = 12 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/old_tile/white, @@ -10441,7 +10441,7 @@ "eWW" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled, @@ -10456,14 +10456,14 @@ "eXu" = ( /obj/machinery/light, /obj/structure/closet/chefcloset, -/obj/item/device/retail_scanner/civilian, -/obj/item/weapon/soap/nanotrasen, -/obj/item/device/destTagger, -/obj/item/weapon/packageWrap{ +/obj/item/retail_scanner/civilian, +/obj/item/soap/nanotrasen, +/obj/item/destTagger, +/obj/item/packageWrap{ pixel_x = -2; pixel_y = -4 }, -/obj/item/weapon/packageWrap{ +/obj/item/packageWrap{ pixel_y = -2 }, /obj/item/clothing/gloves/sterile/latex{ @@ -10624,7 +10624,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled, /area/surface/station/hallway/secondary/groundfloor/civilian) "faC" = ( @@ -10659,7 +10659,7 @@ /turf/simulated/floor/plating, /area/surface/station/engineering/engineering_monitoring) "fbb" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/wood, @@ -10931,7 +10931,7 @@ dir = 1 }, /obj/machinery/power/emitter, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -11004,7 +11004,7 @@ /area/surface/station/rnd/misc_lab) "fjg" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = -2; pixel_y = -2 }, @@ -11119,11 +11119,11 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 4 }, -/obj/item/weapon/storage/briefcase/crimekit{ +/obj/item/storage/briefcase/crimekit{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/crimekit, +/obj/item/storage/briefcase/crimekit, /turf/simulated/floor/tiled/white, /area/surface/station/security/detectives_office/lab) "fmd" = ( @@ -11189,7 +11189,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -11208,10 +11208,10 @@ pixel_y = -3; req_one_access = list(2,4) }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 6 }, -/obj/item/device/radio/off, +/obj/item/radio/off, /turf/simulated/floor/tiled/dark, /area/surface/station/crew_quarters/heads/hos) "fnE" = ( @@ -11600,7 +11600,7 @@ icon_state = "1-2" }, /obj/structure/closet/l3closet/scientist, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/machinery/camera/network/research{ c_tag = "SCI - Xenobiology Access" }, @@ -11617,11 +11617,11 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/device/tape/random, -/obj/item/device/taperecorder, -/obj/item/device/megaphone, -/obj/item/weapon/packageWrap, -/obj/item/weapon/storage/box, +/obj/item/tape/random, +/obj/item/taperecorder, +/obj/item/megaphone, +/obj/item/packageWrap, +/obj/item/storage/box, /obj/machinery/recharger/wallcharger{ pixel_x = 32 }, @@ -11799,7 +11799,7 @@ /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -11929,7 +11929,7 @@ "fFD" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/weapon/book/codex/lore/vir, +/obj/item/book/codex/lore/vir, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "fGe" = ( @@ -12024,7 +12024,7 @@ /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/heads/hos) "fIT" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 5; pixel_y = 26 }, @@ -12140,7 +12140,7 @@ /area/surface/station/ai/cyborg_station) "fLf" = ( /obj/structure/table/standard, -/obj/item/weapon/phone, +/obj/item/phone, /obj/machinery/computer/cryopod/robot{ pixel_x = 32 }, @@ -12198,21 +12198,21 @@ name = "Core Modules"; req_one_access = list(20) }, -/obj/item/weapon/aiModule/asimov{ +/obj/item/aiModule/asimov{ pixel_x = -5; pixel_y = 6 }, -/obj/item/weapon/aiModule/freeformcore{ +/obj/item/aiModule/freeformcore{ pixel_x = -4; pixel_y = 3 }, -/obj/item/weapon/aiModule/corp{ +/obj/item/aiModule/corp{ pixel_x = -2 }, -/obj/item/weapon/aiModule/paladin{ +/obj/item/aiModule/paladin{ pixel_y = -3 }, -/obj/item/weapon/aiModule/robocop{ +/obj/item/aiModule/robocop{ pixel_x = 2; pixel_y = -4 }, @@ -12233,9 +12233,9 @@ name = "O- Blood Locker"; pixel_x = 32 }, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 4 @@ -12283,8 +12283,8 @@ pixel_x = -23; pixel_y = -11 }, -/obj/item/weapon/nullrod, -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, +/obj/item/nullrod, +/obj/item/reagent_containers/food/drinks/bottle/holywater, /turf/simulated/floor/lino, /area/surface/station/chapel/office) "fOW" = ( @@ -12335,7 +12335,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/techfloor/grid, @@ -12374,11 +12374,11 @@ /area/surface/station/maintenance/substation/research/gnd) "fRp" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -12737,7 +12737,7 @@ }, /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/noticeboard{ pixel_x = -32 }, @@ -12772,7 +12772,7 @@ /turf/simulated/floor/tiled/dark, /area/surface/station/hydroponics) "gdb" = ( -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -12780,7 +12780,7 @@ dir = 8 }, /obj/item/clothing/glasses/hud/security, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -13015,7 +13015,7 @@ /obj/machinery/camera/network/ground_floor{ c_tag = "Ground Floor - Park Northwest" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -13067,9 +13067,9 @@ /area/surface/outside/plains/station) "gmu" = ( /obj/structure/table/marble, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, +/obj/item/storage/box/donkpockets, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/food/condiment/enzyme, /turf/simulated/floor/tiled/eris/cafe, /area/surface/station/crew_quarters/kitchen) "gnA" = ( @@ -13210,8 +13210,8 @@ /area/surface/station/engineering/reactor_room) "gpH" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/stamp/hop, +/obj/item/clipboard, +/obj/item/stamp/hop, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/heads/hop) "gpJ" = ( @@ -13264,9 +13264,9 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 6 }, -/obj/item/weapon/forensics/sample_kit/powder, -/obj/item/weapon/forensics/sample_kit, -/obj/item/device/radio/intercom/department/security{ +/obj/item/forensics/sample_kit/powder, +/obj/item/forensics/sample_kit, +/obj/item/radio/intercom/department/security{ dir = 8; pixel_x = 21 }, @@ -13346,7 +13346,7 @@ /turf/simulated/floor/tiled, /area/surface/station/engineering/hallway) "gtg" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13418,8 +13418,8 @@ "gvo" = ( /obj/structure/table/woodentable, <<<<<<< HEAD -/obj/item/weapon/dice/d20, -/obj/item/weapon/deck/cards, +/obj/item/dice/d20, +/obj/item/deck/cards, ======= /obj/item/dice/d20, /obj/item/deck/cards, @@ -13482,7 +13482,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -13490,7 +13490,7 @@ c_tag = "MED - Cloning"; dir = 6 }, -/obj/item/weapon/stool, +/obj/item/stool, /obj/effect/landmark/start{ name = "Geneticist" }, @@ -13697,20 +13697,20 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/item/weapon/reagent_containers/blood/empty{ +/obj/item/reagent_containers/blood/empty{ pixel_x = -6; pixel_y = -6 }, -/obj/item/weapon/reagent_containers/blood/empty{ +/obj/item/reagent_containers/blood/empty{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/blood/empty{ +/obj/item/reagent_containers/blood/empty{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty{ +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty{ pixel_x = 2; pixel_y = 2 }, @@ -13849,8 +13849,8 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/item/weapon/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/packageWrap, +/obj/item/hand_labeler, /obj/structure/extinguisher_cabinet{ dir = 1; pixel_y = 30 @@ -13922,9 +13922,9 @@ /area/surface/station/hallway/primary/groundfloor/south) "gFi" = ( /obj/structure/table/woodentable, -/obj/item/device/taperecorder, -/obj/item/weapon/book/codex/lore/news, -/obj/item/device/tape/random, +/obj/item/taperecorder, +/obj/item/book/codex/lore/news, +/obj/item/tape/random, /turf/simulated/floor/wood, /area/surface/station/library) "gFo" = ( @@ -13951,7 +13951,7 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled/white, /area/surface/station/medical/surgery2) "gFv" = ( @@ -14178,12 +14178,12 @@ /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/beige/border, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled/white, /area/surface/station/medical/chemistry) "gKW" = ( @@ -14336,7 +14336,7 @@ dir = 4 }, /obj/structure/table/woodentable, -/obj/item/device/paicard, +/obj/item/paicard, /turf/simulated/floor/tiled/hydro, /area/surface/station/park) "gOc" = ( @@ -14590,9 +14590,9 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/device/radio/intercom/department/security{ +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/radio/intercom/department/security{ dir = 4; pixel_x = -21 }, @@ -14873,7 +14873,7 @@ /area/surface/station/hallway/primary/groundfloor/west/elevator) "hbD" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid, +/obj/item/storage/firstaid, /obj/item/glass_jar{ pixel_x = 2; pixel_y = 2 @@ -15376,7 +15376,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "hrC" = ( @@ -15389,7 +15389,7 @@ "hsF" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/table/glass, -/obj/item/device/paicard, +/obj/item/paicard, /turf/simulated/floor/tiled/freezer, /area/surface/station/crew_quarters/pool) "hsL" = ( @@ -16081,7 +16081,7 @@ /area/surface/station/security/hallway/gnd) "hJD" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -16233,10 +16233,10 @@ dir = 1 }, /obj/structure/closet/secure_closet/cargotech, -/obj/item/weapon/storage/backpack/dufflebag, +/obj/item/storage/backpack/dufflebag, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled, @@ -16327,7 +16327,7 @@ /area/surface/station/park) "hQy" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /turf/simulated/floor/carpet, /area/surface/station/chapel/main) "hQF" = ( @@ -16646,7 +16646,7 @@ "ibA" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/closet/crate/medical, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -16686,15 +16686,15 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 8; pixel_x = 21 }, /obj/item/tabloid{ pixel_x = -2 }, -/obj/item/weapon/book/codex/corp_regs, -/obj/item/weapon/deskbell, +/obj/item/book/codex/corp_regs, +/obj/item/deskbell, /turf/simulated/floor/tiled, /area/surface/station/security/lobby) "icD" = ( @@ -16836,7 +16836,7 @@ "ieS" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/gym) "ifG" = ( @@ -16891,7 +16891,7 @@ dir = 4 }, /obj/structure/closet/emcloset, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/suit/storage/hooded/wintercoat, /turf/simulated/floor/tiled/freezer, @@ -17149,7 +17149,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 4 }, -/obj/item/weapon/stool/barstool/padded{ +/obj/item/stool/barstool/padded{ dir = 4 }, /turf/simulated/floor/tiled, @@ -17356,7 +17356,7 @@ "iuv" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/table/glass, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -17437,12 +17437,12 @@ /area/surface/outside/plains/station) "iwy" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/device/radio/intercom{ +/obj/item/storage/firstaid/fire, +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -17608,16 +17608,16 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/device/gps/explorer{ +/obj/item/gps/explorer{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/gps/explorer, -/obj/item/device/gps/explorer{ +/obj/item/gps/explorer, +/obj/item/gps/explorer{ pixel_x = -2; pixel_y = -2 }, -/obj/item/device/gps/explorer{ +/obj/item/gps/explorer{ pixel_x = -4; pixel_y = -4 }, @@ -17655,11 +17655,11 @@ /area/surface/station/engineering/engineering_monitoring) "iEh" = ( /obj/structure/closet/toolcloset, -/obj/item/device/flashlight, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/flashlight, +/obj/item/radio, +/obj/item/radio, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled, /area/surface/station/engineering/workshop) "iEL" = ( @@ -17707,7 +17707,7 @@ /area/surface/outside/plains/station) "iFX" = ( /obj/structure/table/glass, -/obj/item/device/radio/phone/medbay{ +/obj/item/radio/phone/medbay{ name = "Emergency Phone"; pixel_y = -6 }, @@ -17794,13 +17794,13 @@ /area/surface/outside/river/gautelfr) "iIs" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/kitchen/utensil/fork{ +/obj/item/material/kitchen/utensil/fork{ pixel_x = -2 }, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/spoon{ pixel_x = 2 }, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "iIT" = ( @@ -17820,7 +17820,7 @@ req_one_access = list(55) }, /obj/structure/table/reinforced, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/simulated/floor/tiled/dark, /area/surface/station/rnd/xenobiology) "iJn" = ( @@ -18272,7 +18272,7 @@ dir = 8 }, /obj/structure/table/woodentable, -/obj/item/device/paicard, +/obj/item/paicard, /turf/simulated/floor/tiled/hydro, /area/surface/station/park) "iUj" = ( @@ -18306,7 +18306,7 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 9 }, -/obj/item/device/radio/intercom/locked/ai_private{ +/obj/item/radio/intercom/locked/ai_private{ pixel_y = -21 }, /turf/simulated/floor/tiled/techfloor/grid, @@ -18417,8 +18417,8 @@ "iWF" = ( /obj/structure/table/standard, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high{ +/obj/item/cell/high, +/obj/item/cell/high{ pixel_y = -4 }, /turf/simulated/floor/reinforced, @@ -18827,14 +18827,14 @@ /area/surface/station/hallway/primary/groundfloor/east) "jkl" = ( /obj/structure/closet/crate/focalpoint, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil/super_capacity, -/obj/item/weapon/smes_coil/super_capacity, -/obj/item/weapon/smes_coil/super_io, -/obj/item/weapon/smes_coil/super_io, +/obj/item/circuitboard/smes, +/obj/item/circuitboard/smes, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil/super_capacity, +/obj/item/smes_coil/super_capacity, +/obj/item/smes_coil/super_io, +/obj/item/smes_coil/super_io, /turf/simulated/floor/tiled/techmaint, /area/surface/station/engineering/storage) "jkH" = ( @@ -19098,7 +19098,7 @@ /area/shuttle/exploration/general) "jss" = ( /obj/effect/floor_decal/corner/white/diagonal, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/tiled/freezer, @@ -19126,8 +19126,8 @@ /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/red/bordercorner, /obj/structure/table/standard, -/obj/item/weapon/storage/box/evidence, -/obj/item/device/camera, +/obj/item/storage/box/evidence, +/obj/item/camera, /obj/machinery/requests_console{ department = "Security"; departmentType = 5; @@ -19474,7 +19474,7 @@ /obj/item/honey_frame, /obj/item/honey_frame, /obj/item/bee_pack, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /obj/machinery/atmospherics/tvalve/bypass, /obj/structure/disposalpipe/segment{ dir = 4 @@ -19713,13 +19713,13 @@ /area/surface/station/maintenance/substation/security/gnd) "jGo" = ( /obj/structure/table/woodentable, -/obj/item/device/taperecorder, -/obj/item/device/tape/random{ +/obj/item/taperecorder, +/obj/item/tape/random{ pixel_y = -2 }, -/obj/item/device/tape/random, -/obj/item/device/camera, -/obj/item/weapon/barcodescanner, +/obj/item/tape/random, +/obj/item/camera, +/obj/item/barcodescanner, /turf/simulated/floor/wood, /area/surface/station/library) "jGI" = ( @@ -19904,7 +19904,7 @@ /area/surface/station/arrivals/cynosure/cryo) "jMm" = ( /obj/structure/table/reinforced, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/clothing/gloves/sterile/latex, /turf/simulated/floor/tiled/neutral, /area/surface/station/rnd/xenobiology) @@ -19995,10 +19995,10 @@ name = "O- Blood Locker"; pixel_x = -32 }, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/white, /area/surface/station/medical/etc) "jOo" = ( @@ -20050,7 +20050,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/item/weapon/banner/virgov, +/obj/item/banner/virgov, /turf/simulated/floor/wood/sif, /area/surface/station/chapel/main) "jPo" = ( @@ -20106,21 +20106,21 @@ dir = 8 }, /obj/structure/table/steel, -/obj/item/weapon/grenade/chem_grenade/cleaner{ +/obj/item/grenade/chem_grenade/cleaner{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/grenade/chem_grenade/cleaner{ +/obj/item/grenade/chem_grenade/cleaner{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/storage/box/lights/mixed{ +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/storage/box/mousetraps, +/obj/item/storage/box/lights/mixed{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/lights/mixed{ +/obj/item/storage/box/lights/mixed{ pixel_x = 4; pixel_y = 4 }, @@ -20248,11 +20248,11 @@ /area/surface/outside/plains/station) "jRD" = ( /obj/structure/closet/wardrobe/chemistry_white, -/obj/item/device/radio/headset/headset_med, -/obj/item/weapon/storage/box/pillbottles, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/packageWrap, +/obj/item/radio/headset/headset_med, +/obj/item/storage/box/pillbottles, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/hand_labeler, +/obj/item/packageWrap, /obj/effect/floor_decal/borderfloorwhite/corner, /obj/effect/floor_decal/corner/paleblue/bordercorner, /obj/machinery/light, @@ -20271,11 +20271,11 @@ "jSb" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow, -/obj/item/weapon/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/glass/bucket{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/structure/table/reinforced, /turf/simulated/floor/tiled/neutral, /area/surface/station/rnd/xenobiology/xenoflora_isolation) @@ -20288,7 +20288,7 @@ dir = 1; pixel_y = -24 }, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/gloves, /obj/effect/floor_decal/corner/purple/border{ dir = 8 }, @@ -20321,8 +20321,8 @@ name = "Suit Storage"; req_access = list(5) }, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/oxygen, +/obj/item/suit_cooling_unit, +/obj/item/tank/oxygen, /obj/item/clothing/mask/breath, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techmaint, @@ -20360,12 +20360,12 @@ desc = "An armband, worn by the crew to display which department they're assigned to. This one is purple with the white letters TL."; name = "explorer team leader armband" }, -/obj/item/weapon/hand_labeler, -/obj/item/device/paicard, -/obj/item/weapon/melee/umbrella/random{ +/obj/item/hand_labeler, +/obj/item/paicard, +/obj/item/melee/umbrella/random{ pixel_y = -4 }, -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /obj/effect/floor_decal/spline/plain{ dir = 10 }, @@ -20722,7 +20722,7 @@ dir = 6 }, /obj/effect/floor_decal/industrial/warning/corner, -/obj/item/device/radio/intercom/locked/ai_private{ +/obj/item/radio/intercom/locked/ai_private{ dir = 8; pixel_x = -21 }, @@ -20785,8 +20785,8 @@ dir = 1 }, /obj/machinery/meter, -/obj/item/weapon/tank/phoron, -/obj/item/weapon/tank/phoron{ +/obj/item/tank/phoron, +/obj/item/tank/phoron{ pixel_x = 2; pixel_y = 2 }, @@ -20856,8 +20856,8 @@ "kda" = ( /obj/structure/table/woodentable, /obj/machinery/reagentgrinder, -/obj/item/weapon/packageWrap, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/packageWrap, +/obj/item/reagent_containers/food/drinks/shaker, /obj/structure/sign/securearea{ desc = "Under the painting a plaque reads: 'Pun Pun I'"; icon_state = "monkey_painting"; @@ -21392,9 +21392,9 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 4 }, -/obj/item/weapon/packageWrap, -/obj/item/weapon/tape_roll, -/obj/item/weapon/hand_labeler, +/obj/item/packageWrap, +/obj/item/tape_roll, +/obj/item/hand_labeler, /turf/simulated/floor/tiled, /area/surface/station/engineering/engineering_monitoring) "kpz" = ( @@ -21674,7 +21674,7 @@ /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "kxd" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/freezer, @@ -21874,7 +21874,7 @@ /turf/simulated/floor/reinforced/n20, /area/surface/station/engineering/atmos) "kCu" = ( -/obj/item/device/radio/intercom/interrogation{ +/obj/item/radio/intercom/interrogation{ dir = 4; pixel_x = 21 }, @@ -22108,7 +22108,7 @@ }, /obj/structure/cable/green, /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/effect/floor_decal/steeldecal/steel_decals_central7, /turf/simulated/floor/tiled/old_tile/blue, @@ -22268,7 +22268,7 @@ "kKR" = ( /obj/structure/table/woodentable, <<<<<<< HEAD -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, ======= /obj/item/deck/cards, /obj/item/toy/xmas_cracker, @@ -22426,8 +22426,8 @@ /area/surface/station/security/processing) "kOV" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/item/clothing/glasses/sunglasses, /turf/simulated/floor/carpet, /area/surface/station/security/detectives_office) @@ -22447,7 +22447,7 @@ /obj/item/modular_computer/console/preset/security{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -22475,7 +22475,7 @@ dir = 8; pixel_x = 22 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/surface/station/medical/chemistry) "kQu" = ( @@ -22661,8 +22661,8 @@ }, /obj/item/clothing/gloves/black, /obj/item/clothing/gloves/black, -/obj/item/weapon/storage/belt/utility/atmostech, -/obj/item/weapon/storage/belt/utility/atmostech, +/obj/item/storage/belt/utility/atmostech, +/obj/item/storage/belt/utility/atmostech, /turf/simulated/floor/plating, /area/surface/station/engineering/atmos) "kWT" = ( @@ -22800,7 +22800,7 @@ pixel_x = 12; pixel_y = 23 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -22808,10 +22808,10 @@ dir = 8; pixel_x = 22 }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_y = 6 }, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /obj/item/clothing/under/suit_jacket/red, /turf/simulated/floor/wood, /area/surface/station/library) @@ -23172,8 +23172,8 @@ dir = 4 }, /obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/alarm{ dir = 8; pixel_x = 22 @@ -23259,7 +23259,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/dark, /area/surface/station/rnd/exploration) @@ -23446,14 +23446,14 @@ /area/surface/station/hallway/primary/groundfloor/north) "lrn" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, -/obj/item/weapon/pen/blue{ +/obj/item/paper_bin, +/obj/item/folder/yellow, +/obj/item/pen, +/obj/item/pen/blue{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = 3; pixel_y = 3 }, @@ -23503,12 +23503,12 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/reagent_containers/spray/pepper{ +/obj/item/reagent_containers/spray/pepper{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/spray/pepper, -/obj/item/weapon/reagent_containers/spray/pepper{ +/obj/item/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper{ pixel_x = 2; pixel_y = 2 }, @@ -23857,7 +23857,7 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 1 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled/hydro, @@ -24435,7 +24435,7 @@ name = "Suit Storage"; req_access = list(5) }, -/obj/item/weapon/rig/medical/equipped, +/obj/item/rig/medical/equipped, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techmaint, /area/surface/station/medical/emt_bay) @@ -24523,7 +24523,7 @@ /area/surface/station/engineering/hallway) "lQo" = ( /obj/structure/table/standard, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -24539,7 +24539,7 @@ /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 }, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/light{ dir = 8 }, @@ -24606,7 +24606,7 @@ /obj/effect/floor_decal/corner_steel_grid{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -24651,7 +24651,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/lino, /area/surface/station/chapel/office) "lSV" = ( @@ -24682,7 +24682,7 @@ }, /obj/machinery/photocopier, /obj/structure/disposalpipe/segment, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -24886,7 +24886,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/monotile, /area/surface/station/hallway/primary/groundfloor/west) "lXO" = ( @@ -25019,7 +25019,7 @@ dir = 9 }, /obj/structure/closet/jcloset, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/simulated/floor/tiled/techmaint, /area/surface/station/janitor) "lZI" = ( @@ -25035,7 +25035,7 @@ /turf/simulated/floor/tiled/dark, /area/surface/station/security/interrogation) "mab" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -25089,8 +25089,8 @@ /obj/item/ammo_magazine/m9mmt/practice, /obj/item/ammo_magazine/m9mmt/practice, /obj/item/ammo_magazine/m9mmt/practice, -/obj/item/weapon/storage/box/blanks/large, -/obj/item/weapon/storage/box/blanks/large, +/obj/item/storage/box/blanks/large, +/obj/item/storage/box/blanks/large, /obj/machinery/magnetic_controller{ autolink = 1; density = 0; @@ -25359,7 +25359,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "mhz" = ( @@ -25381,7 +25381,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "The big blue box recently installed in here is a 'grid checker' which will shut off the power if a dangerous power spike from the engine erupts into the powernet. Shutting everything down protects everything from electrical damage, however the outages can be disruptive to colony operations, so it is designed to restore power after a somewhat significant delay, up to ten minutes or so. The grid checker can be manually hacked in order to end the outage sooner. To do that, you must cut three specific wires which do not cause a red light to shine, then pulse a fourth wire. Electrical protection is highly recommended when doing maintenance on the grid checker."; name = "grid checker info" }, @@ -25446,7 +25446,7 @@ }, /obj/structure/table/standard, /obj/item/tabloid, -/obj/item/weapon/deskbell, +/obj/item/deskbell, /turf/simulated/floor/tiled, /area/surface/station/engineering/foyer) "miX" = ( @@ -25557,9 +25557,9 @@ "mmg" = ( /obj/structure/table/marble, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, -/obj/item/weapon/storage/box/glasses/coffeemug, -/obj/item/weapon/storage/box/glasses/coffeecup{ +/obj/item/reagent_containers/food/condiment/small/sugar, +/obj/item/storage/box/glasses/coffeemug, +/obj/item/storage/box/glasses/coffeecup{ pixel_x = 2; pixel_y = 2 }, @@ -25608,11 +25608,11 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /turf/simulated/floor/tiled/techmaint, /area/surface/station/medical/hallway/gnd) "mnJ" = ( @@ -25640,7 +25640,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled, @@ -26208,7 +26208,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -26478,7 +26478,7 @@ tag_exterior_door = "xenostation_airlock_exterior"; tag_interior_door = "xenostation_airlock_interior" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -26815,7 +26815,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -26999,7 +26999,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals_central6, /obj/effect/floor_decal/steeldecal/steel_decals_central2, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/monotile, /area/surface/station/hallway/primary/groundfloor/east) "mRW" = ( @@ -27043,7 +27043,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/old_cargo/gray, @@ -27258,8 +27258,8 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central5{ dir = 1 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled, /area/surface/station/security/briefing_room) "mWr" = ( @@ -27284,7 +27284,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/simulated/floor/plating, /area/surface/station/security/briefing_room) <<<<<<< HEAD @@ -27312,7 +27312,7 @@ /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/groundfloor/west/elevator) "mXF" = ( -/obj/item/weapon/stool/barstool/padded{ +/obj/item/stool/barstool/padded{ dir = 8 }, /turf/simulated/floor/wood, @@ -27342,7 +27342,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/white, /area/surface/station/security/detectives_office/lab) "mYE" = ( @@ -27410,7 +27410,7 @@ dir = 10 }, <<<<<<< HEAD -/obj/item/weapon/banner/nt, +/obj/item/banner/nt, ======= /obj/item/banner/nt, /obj/structure/sign/christmas/lights{ @@ -27623,7 +27623,7 @@ /obj/effect/floor_decal/corner/grey/border{ dir = 1 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled, /area/surface/station/crew_quarters/gym) "nhb" = ( @@ -27663,8 +27663,8 @@ "nic" = ( /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high, -/obj/item/weapon/tool/wrench, +/obj/item/cell/high, +/obj/item/tool/wrench, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil{ pixel_x = 2; @@ -27847,15 +27847,15 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/clipboard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, -/obj/item/weapon/pen/red{ +/obj/item/folder/yellow, +/obj/item/clipboard, +/obj/item/paper_bin, +/obj/item/pen/blue, +/obj/item/pen/red{ pixel_x = -4; pixel_y = -4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -27877,8 +27877,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/item/weapon/gun/energy/taser/xeno, -/obj/item/weapon/melee/baton/slime/loaded, +/obj/item/gun/energy/taser/xeno, +/obj/item/melee/baton/slime/loaded, /obj/effect/floor_decal/steeldecal/steel_decals_central5{ dir = 4 }, @@ -27886,8 +27886,8 @@ /area/surface/station/rnd/xenobiology) "nmG" = ( /obj/structure/table/marble, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/knife/butch, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/eris/cafe, /area/surface/station/crew_quarters/kitchen) "nnd" = ( @@ -27922,7 +27922,7 @@ id = "chemcounter"; name = "Pharmacy Counter Shutter" }, -/obj/item/weapon/deskbell, +/obj/item/deskbell, /turf/simulated/floor/tiled/neutral, /area/surface/station/medical/chemistry) "nnX" = ( @@ -28009,11 +28009,11 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /obj/structure/extinguisher_cabinet{ dir = 4; pixel_x = 30 @@ -28071,12 +28071,12 @@ /area/surface/outside/station/reactorpond) "nsO" = ( /obj/structure/table/woodentable, -/obj/item/weapon/tape_roll, -/obj/item/weapon/packageWrap{ +/obj/item/tape_roll, +/obj/item/packageWrap{ pixel_x = -2; pixel_y = -4 }, -/obj/item/weapon/book/codex/lore/news, +/obj/item/book/codex/lore/news, /turf/simulated/floor/carpet, /area/surface/station/library) "nsS" = ( @@ -28284,7 +28284,7 @@ /turf/simulated/shuttle/floor/white, /area/shuttle/large_escape_pod1/station) "nzB" = ( -/obj/item/weapon/stool/barstool/padded, +/obj/item/stool/barstool/padded, /turf/simulated/floor/tiled, /area/surface/station/park) "nAa" = ( @@ -28386,7 +28386,7 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/blue/border, /obj/structure/filingcabinet, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 5; pixel_y = -26 }, @@ -28534,7 +28534,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/techfloor, @@ -28647,9 +28647,9 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/item/weapon/storage/box/beanbags, -/obj/item/weapon/gun/projectile/shotgun/doublebarrel, -/obj/item/weapon/tool/screwdriver, +/obj/item/storage/box/beanbags, +/obj/item/gun/projectile/shotgun/doublebarrel, +/obj/item/tool/screwdriver, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/bar) "nIE" = ( @@ -28730,7 +28730,7 @@ /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/white/bordercorner2, /obj/machinery/portable_atmospherics/powered/pump/filled, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled, @@ -29031,11 +29031,11 @@ /area/surface/station/engineering/hallway) "nQQ" = ( /obj/structure/table/glass, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/tool/wrench, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -5 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 5 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -29126,8 +29126,8 @@ dir = 4 }, /obj/structure/closet/wardrobe/grey, -/obj/item/weapon/storage/backpack, -/obj/item/weapon/storage/backpack, +/obj/item/storage/backpack, +/obj/item/storage/backpack, /obj/random/firstaid, /obj/random/maintenance/security, /obj/random/maintenance/clean, @@ -29314,13 +29314,13 @@ name = "Head of Security RC"; pixel_x = -24 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder/red{ +/obj/item/paper_bin, +/obj/item/folder/red{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/folder/red_hos, -/obj/item/weapon/pen/multi, +/obj/item/folder/red_hos, +/obj/item/pen/multi, /turf/simulated/floor/tiled/dark, /area/surface/station/crew_quarters/heads/hos) "nWU" = ( @@ -29425,7 +29425,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals_central7, /obj/structure/table/standard, -/obj/item/weapon/storage/laundry_basket, +/obj/item/storage/laundry_basket, /turf/simulated/floor/tiled/techmaint, /area/surface/station/security/evidence_storage) "oar" = ( @@ -29502,11 +29502,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/reagent_containers/food/condiment/small/peppershaker{ +/obj/item/book/manual/chef_recipes, +/obj/item/reagent_containers/food/condiment/small/peppershaker{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = 2 }, /turf/simulated/floor/tiled/eris/cafe, @@ -29636,8 +29636,8 @@ }, /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, -/obj/item/device/floor_painter, -/obj/item/weapon/weldingtool, +/obj/item/floor_painter, +/obj/item/weldingtool, /turf/simulated/floor/tiled/techmaint, /area/surface/station/quartermaster/lockerroom) "oeG" = ( @@ -29704,7 +29704,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/old_cargo/gray, @@ -29776,7 +29776,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = -2 }, /obj/item/sticky_pad/random{ @@ -30100,7 +30100,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -30108,7 +30108,7 @@ /area/surface/station/hallway/primary/groundfloor/west/elevator) "opj" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -30191,8 +30191,8 @@ /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorwhite/corner, /obj/effect/floor_decal/corner/pink/bordercorner, -/obj/item/weapon/reagent_containers/spray/luminol, -/obj/item/device/uv_light, +/obj/item/reagent_containers/spray/luminol, +/obj/item/uv_light, /obj/item/clothing/gloves/sterile/latex, /obj/effect/floor_decal/steeldecal/steel_decals_central7, /turf/simulated/floor/tiled/white, @@ -30313,10 +30313,10 @@ /area/surface/station/engineering/atmos) "otg" = ( /obj/structure/closet/toolcloset, -/obj/item/device/flashlight, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/flashlight, +/obj/item/radio, +/obj/item/radio, +/obj/item/storage/toolbox/electrical, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -30464,12 +30464,12 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 10 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 1; pixel_y = -21 }, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/storage/box/beakers, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled/white, /area/surface/station/medical/chemistry) "owc" = ( @@ -30550,9 +30550,9 @@ /area/surface/station/maintenance/substation/security/gnd) "owR" = ( /obj/structure/closet/wardrobe/chaplain_black, -/obj/item/weapon/storage/fancy/blackcandle_box, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/storage/fancy/whitecandle_box, +/obj/item/storage/fancy/blackcandle_box, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/whitecandle_box, /turf/simulated/floor/lino, /area/surface/station/chapel/office) "owZ" = ( @@ -30807,7 +30807,7 @@ "oCZ" = ( /obj/structure/reagent_dispensers/watertank/high, /obj/effect/floor_decal/industrial/warning, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 26 @@ -30956,8 +30956,8 @@ }, /obj/effect/catwalk_plated/dark, /obj/structure/table/rack, -/obj/item/weapon/tank/oxygen/yellow, -/obj/item/weapon/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /turf/simulated/floor/plating, @@ -31259,7 +31259,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -31394,8 +31394,8 @@ }, /obj/effect/catwalk_plated/dark, /obj/structure/closet/emcloset, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/machinery/light{ dir = 4 }, @@ -31721,7 +31721,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/machinery/recharger/wallcharger{ pixel_x = -26 }, @@ -31953,7 +31953,7 @@ /obj/machinery/computer/arcade{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/wood, @@ -32243,7 +32243,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -32967,8 +32967,8 @@ dir = 10 }, /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -33115,7 +33115,7 @@ name = "Medical Reception"; req_access = list(5) }, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup, /turf/simulated/floor/tiled/neutral, /area/surface/station/medical/reception) "pzA" = ( @@ -33665,7 +33665,7 @@ /area/surface/station/medical/etc) "pPy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled/hydro, @@ -33690,7 +33690,7 @@ dir = 8 }, /obj/structure/closet/jcloset, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/simulated/floor/tiled/techmaint, /area/surface/station/janitor) "pRi" = ( @@ -33812,10 +33812,10 @@ /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/suit/storage/hooded/wintercoat, -/obj/item/weapon/melee/umbrella/random{ +/obj/item/melee/umbrella/random{ pixel_y = -4 }, -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/tiled, /area/surface/station/arrivals/cynosure) "pVb" = ( @@ -33837,19 +33837,19 @@ /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/red/bordercorner, /obj/structure/table/standard, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/hand_labeler, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/hand_labeler, /obj/machinery/recharger/wallcharger{ pixel_x = 32 }, @@ -34236,7 +34236,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/blue/border, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 1; pixel_y = -21 }, @@ -34246,7 +34246,7 @@ "qfR" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/disposalpipe/segment, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled/freezer, @@ -34291,14 +34291,14 @@ dir = 1 }, /obj/structure/table/steel, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, -/obj/item/weapon/storage/box{ +/obj/item/paper_bin, +/obj/item/folder/yellow, +/obj/item/pen, +/obj/item/storage/box{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box, +/obj/item/storage/box, /turf/simulated/floor/tiled, /area/surface/station/quartermaster/delivery) "qhE" = ( @@ -34315,9 +34315,9 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/storage/box/donut, -/obj/item/device/retail_scanner/security, -/obj/item/device/retail_scanner/security, +/obj/item/storage/box/donut, +/obj/item/retail_scanner/security, +/obj/item/retail_scanner/security, /turf/simulated/floor/tiled, /area/surface/station/security/briefing_room) "qhW" = ( @@ -34387,7 +34387,7 @@ /obj/effect/floor_decal/corner/brown/bordercorner{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -34395,13 +34395,13 @@ /area/surface/station/quartermaster/storage) "qiK" = ( /obj/structure/table/steel, -/obj/item/device/t_scanner, -/obj/item/device/radio/headset/headset_eng, -/obj/item/weapon/cartridge/atmos, -/obj/item/weapon/cartridge/atmos, +/obj/item/t_scanner, +/obj/item/radio/headset/headset_eng, +/obj/item/cartridge/atmos, +/obj/item/cartridge/atmos, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/ears/earmuffs, -/obj/item/device/pipe_painter, +/obj/item/pipe_painter, /obj/machinery/camera/network/engineering{ c_tag = "ENG - Atmospherics Northeast" }, @@ -34413,7 +34413,7 @@ /area/surface/station/crew_quarters/kitchen) "qiX" = ( /obj/machinery/mech_recharger, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = -21 }, @@ -34487,7 +34487,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /obj/machinery/power/apc{ @@ -34749,7 +34749,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/item/device/radio/intercom/locked/ai_private{ +/obj/item/radio/intercom/locked/ai_private{ dir = 4; pixel_x = 21 }, @@ -34774,11 +34774,11 @@ /area/surface/station/maintenance/substation/cargo/gnd) "qpY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/purple/border, /turf/simulated/floor/tiled/neutral, @@ -34856,7 +34856,7 @@ /obj/item/honey_frame, /obj/item/honey_frame, /obj/item/bee_pack, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /turf/simulated/floor/tiled/hydro, /area/surface/station/hydroponics) "qrb" = ( @@ -34946,8 +34946,8 @@ /obj/structure/bookcase{ name = "bookcase (Reference)" }, -/obj/item/weapon/book/codex/lore/vir, -/obj/item/weapon/book/codex/lore/vir, +/obj/item/book/codex/lore/vir, +/obj/item/book/codex/lore/vir, /turf/simulated/floor/wood, /area/surface/station/library) "qsF" = ( @@ -35224,12 +35224,12 @@ /area/surface/station/ai/upload) "qyR" = ( /obj/structure/table/woodentable, -/obj/item/device/paicard, -/obj/item/weapon/deck/cah{ +/obj/item/paicard, +/obj/item/deck/cah{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/deck/cah/black{ +/obj/item/deck/cah/black{ pixel_x = -4; pixel_y = 6 }, @@ -35541,11 +35541,11 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, -/obj/item/weapon/storage/box/seccarts, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/seccarts, +/obj/item/storage/box/handcuffs{ pixel_x = 2 }, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/flashbangs{ pixel_x = -3; pixel_y = -3 }, @@ -35568,11 +35568,11 @@ /area/surface/station/engineering/atmos) "qFX" = ( /obj/structure/closet/crate/hydroponics/prespawned, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /turf/simulated/floor/tiled/neutral, /area/surface/station/rnd/xenobiology/xenoflora_isolation) "qGc" = ( @@ -35659,7 +35659,7 @@ open_layer = 3.3 }, /obj/item/sticky_pad/random, -/obj/item/weapon/deskbell, +/obj/item/deskbell, /turf/simulated/floor/tiled, /area/surface/station/crew_quarters/heads/hop) "qHF" = ( @@ -35960,7 +35960,7 @@ dir = 9 }, /obj/machinery/dnaforensics, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -36255,11 +36255,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/retail_scanner/civilian{ +/obj/item/retail_scanner/civilian{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/retail_scanner/civilian, +/obj/item/retail_scanner/civilian, /obj/item/clothing/head/that, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/bar) @@ -36289,7 +36289,7 @@ /turf/simulated/floor/tiled/white, /area/surface/station/medical/hallway/gnd) "qWO" = ( -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -36318,14 +36318,14 @@ /area/surface/station/engineering/reactor_room) "qXg" = ( /obj/structure/closet/crate/science, -/obj/item/weapon/surgical/circular_saw, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/weldingtool, +/obj/item/surgical/circular_saw, +/obj/item/surgical/scalpel, +/obj/item/autopsy_scanner, +/obj/item/weldingtool, /obj/item/clothing/head/welding, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/purple/border, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/neutral, @@ -36480,7 +36480,7 @@ /turf/simulated/floor/plating, /area/surface/station/engineering/reactor_room) "rbL" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /obj/structure/cable/green{ @@ -36715,12 +36715,12 @@ /obj/structure/closet{ name = "Evidence Closet" }, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/box/evidence, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/evidence, +/obj/item/storage/box/bodybags{ pixel_x = 2; pixel_y = 3 }, @@ -37021,7 +37021,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central2, /obj/effect/floor_decal/steeldecal/steel_decals_central6, /mob/living/bot/secbot/beepsky, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/monotile, /area/surface/station/hallway/primary/groundfloor/north) "roh" = ( @@ -37098,7 +37098,7 @@ /area/surface/station/janitor) "rtv" = ( /obj/effect/floor_decal/corner/white/diagonal, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled/freezer, @@ -37172,7 +37172,7 @@ /area/surface/station/quartermaster/storage) "ruC" = ( /obj/structure/table/bench/sifwooden/padded, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/effect/floor_decal/borderfloor, @@ -37580,7 +37580,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -37595,7 +37595,7 @@ /turf/simulated/floor/tiled/techmaint, /area/surface/station/security/lockerroom) "rEs" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -37792,7 +37792,7 @@ /obj/structure/closet/secure_closet/medical_wall/pills{ pixel_x = -32 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 1; pixel_y = -21 }, @@ -37940,7 +37940,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central7{ dir = 1 }, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 8; pixel_x = 21 }, @@ -37983,10 +37983,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /obj/machinery/door/blast/gate/thin{ dir = 8; id = "bar2"; @@ -38064,7 +38064,7 @@ name = "Foyer Door"; pixel_y = 5 }, -/obj/item/device/radio/phone/medbay{ +/obj/item/radio/phone/medbay{ name = "Reception Emergency Phone"; pixel_y = -6 }, @@ -38087,7 +38087,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/tiled/white, @@ -38143,7 +38143,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 8; pixel_x = 21 }, @@ -38195,7 +38195,7 @@ dir = 8 }, /obj/machinery/magnetic_controller, -/obj/item/weapon/storage/box/flashbangs, +/obj/item/storage/box/flashbangs, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -38207,12 +38207,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/gun/energy/taser{ +/obj/item/gun/energy/taser{ pixel_y = -2 }, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver{ +/obj/item/gun/energy/taser, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver{ pixel_y = 4 }, /obj/machinery/door/window/northleft, @@ -38361,7 +38361,7 @@ "rXg" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/hologram/holopad, -/obj/item/device/radio/intercom/interrogation{ +/obj/item/radio/intercom/interrogation{ pixel_y = -21 }, /obj/machinery/light/small, @@ -38488,7 +38488,7 @@ dir = 4 }, /obj/effect/catwalk_plated, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/plating, /area/surface/station/hallway/primary/groundfloor/south) "sbu" = ( @@ -38632,10 +38632,10 @@ "sfZ" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/weapon/material/kitchen/utensil/fork{ +/obj/item/material/kitchen/utensil/fork{ pixel_x = -2 }, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/spoon{ pixel_x = 2 }, /obj/item/toy/xmas_cracker, @@ -38862,7 +38862,7 @@ /obj/structure/closet, /obj/item/toy/figure/scientist, /obj/item/clothing/accessory/armband/science, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/item/clothing/shoes/galoshes, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/purple/border, @@ -38946,7 +38946,7 @@ /area/surface/station/arrivals/cynosure) "spy" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/structure/curtain/open/privacy, @@ -38954,7 +38954,7 @@ /area/surface/station/medical/ward) "spM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -39217,20 +39217,20 @@ dir = 6 }, /obj/structure/table/standard, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/red{ +/obj/item/folder/red, +/obj/item/folder/red{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled, /area/surface/station/security/processing) "swl" = ( @@ -39344,7 +39344,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -39368,7 +39368,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/item/device/megaphone, +/obj/item/megaphone, /obj/machinery/light{ dir = 4 }, @@ -39493,7 +39493,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/item/weapon/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -40013,7 +40013,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 1 }, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ pixel_y = 21 }, /obj/structure/disposalpipe/segment{ @@ -40260,8 +40260,8 @@ layer = 3.3; pixel_y = -32 }, -/obj/item/weapon/melee/umbrella/random, -/obj/item/weapon/melee/umbrella/random{ +/obj/item/melee/umbrella/random, +/obj/item/melee/umbrella/random{ pixel_y = -4 }, /turf/simulated/floor/plating, @@ -40382,27 +40382,27 @@ pixel_x = -12; pixel_y = -24 }, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/botanydisk{ +/obj/item/storage/box/beakers, +/obj/item/storage/box/botanydisk{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/tape_roll, +/obj/item/tape_roll, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, /obj/effect/floor_decal/corner/green/border{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -40643,36 +40643,36 @@ pixel_y = -22 }, /obj/structure/table/standard, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#ff0000"; name = "red towel"; pixel_x = -3; pixel_y = -4 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#ff0000"; name = "red towel"; pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#ff0000"; name = "red towel"; pixel_x = -1 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#ff0000"; name = "red towel"; pixel_y = 2 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#ff0000"; name = "red towel"; pixel_x = 1; pixel_y = 4 }, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/simulated/floor/tiled/neutral, /area/surface/station/security/restroom) "thU" = ( @@ -40764,7 +40764,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 6 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -40845,7 +40845,7 @@ /obj/structure/sink/kitchen{ pixel_y = 28 }, -/obj/item/weapon/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/glass/bucket{ pixel_x = 2; pixel_y = 2 }, @@ -40927,14 +40927,14 @@ /obj/effect/floor_decal/corner/green/border{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled, /area/surface/station/park) "tnh" = ( -/obj/item/weapon/reagent_containers/spray/pepper, -/obj/item/device/flash, +/obj/item/reagent_containers/spray/pepper, +/obj/item/flash, /obj/structure/closet/secure_closet/detective/cynosure, /turf/simulated/floor/lino, /area/surface/station/security/detectives_office) @@ -41007,9 +41007,9 @@ /obj/random/maintenance, /obj/random/maintenance, /obj/random/maintenance, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /obj/item/clothing/shoes/boots/combat, -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, /turf/simulated/floor/plating, /area/surface/station/maintenance/kitchen) "toJ" = ( @@ -41200,7 +41200,7 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled/white, @@ -41306,8 +41306,8 @@ name = "Module Storage"; req_one_access = list(16) }, -/obj/item/weapon/aiModule/nanotrasen, -/obj/item/weapon/aiModule/reset{ +/obj/item/aiModule/nanotrasen, +/obj/item/aiModule/reset{ pixel_x = -3; pixel_y = 3 }, @@ -41354,7 +41354,7 @@ dir = 8 }, /obj/structure/table/woodentable, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -41400,7 +41400,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 5 }, -/obj/item/weapon/beach_ball, +/obj/item/beach_ball, /turf/simulated/floor/tiled/freezer, /area/surface/station/crew_quarters/pool) "tyj" = ( @@ -41468,29 +41468,29 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 8 }, -/obj/item/weapon/material/knife/machete/hatchet, -/obj/item/weapon/material/knife/machete/hatchet{ +/obj/item/material/knife/machete/hatchet, +/obj/item/material/knife/machete/hatchet{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/material/knife/machete/hatchet{ +/obj/item/material/knife/machete/hatchet{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/minihoe{ +/obj/item/material/minihoe, +/obj/item/material/minihoe{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/material/minihoe{ +/obj/item/material/minihoe{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/glass/bucket{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/hydro, /area/surface/station/hydroponics) "tzy" = ( @@ -41565,8 +41565,8 @@ pixel_x = 8; pixel_y = -6 }, -/obj/item/weapon/handcuffs, -/obj/item/device/tape/random, +/obj/item/handcuffs, +/obj/item/tape/random, /turf/simulated/floor/carpet, /area/surface/station/security/detectives_office) "tCe" = ( @@ -41576,11 +41576,11 @@ /area/surface/station/medical/reception) "tCj" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_y = 6 }, -/obj/item/weapon/storage/briefcase, -/obj/item/device/radio/intercom/department/security{ +/obj/item/storage/briefcase, +/obj/item/radio/intercom/department/security{ pixel_y = 21 }, /turf/simulated/floor/lino, @@ -41979,7 +41979,7 @@ /turf/simulated/floor/plating, /area/surface/station/medical/reception) "tLy" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -42086,7 +42086,7 @@ /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/beige/border, -/obj/item/device/mass_spectrometer/adv, +/obj/item/mass_spectrometer/adv, /obj/item/clothing/glasses/science{ pixel_x = -4; pixel_y = -4 @@ -42248,7 +42248,7 @@ dir = 4 }, /obj/structure/table/steel, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/random/maintenance/clean, /obj/random/maintenance/security, /obj/random/maintenance/security, @@ -42354,10 +42354,10 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/item/device/defib_kit/loaded{ +/obj/item/defib_kit/loaded{ pixel_y = -2 }, -/obj/item/device/defib_kit/loaded{ +/obj/item/defib_kit/loaded{ pixel_y = 2 }, /turf/simulated/floor/tiled/white, @@ -42404,7 +42404,7 @@ /area/surface/station/crew_quarters/heads/hos) "tWQ" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/item/sticky_pad/random, /turf/simulated/floor/wood, /area/surface/station/library) @@ -42516,11 +42516,11 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/hand_labeler, +/obj/item/clipboard, +/obj/item/folder/white, +/obj/item/pen, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -42612,13 +42612,13 @@ /area/surface/station/quartermaster/delivery) "ubw" = ( /obj/structure/table/standard, -/obj/item/weapon/towel/random{ +/obj/item/towel/random{ pixel_x = 2 }, -/obj/item/weapon/towel/random{ +/obj/item/towel/random{ pixel_x = 4 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -42656,7 +42656,7 @@ /obj/machinery/light/spot{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled/freezer, @@ -42746,7 +42746,7 @@ /turf/simulated/wall/r_wall, /area/surface/station/garage) "uge" = ( -/obj/item/weapon/stool{ +/obj/item/stool{ dir = 8 }, /turf/simulated/floor/tiled/old_cargo/gray, @@ -42789,7 +42789,7 @@ "uin" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/floor_decal/corner/white/diagonal, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -43046,7 +43046,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner{ dir = 1 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ pixel_y = 21 }, /obj/machinery/light{ @@ -43938,20 +43938,20 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/item/weapon/reagent_containers/blood/AMinus{ +/obj/item/reagent_containers/blood/AMinus{ pixel_x = -6; pixel_y = -6 }, -/obj/item/weapon/reagent_containers/blood/APlus{ +/obj/item/reagent_containers/blood/APlus{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/blood/BMinus{ +/obj/item/reagent_containers/blood/BMinus{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/blood/BPlus, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/BPlus, +/obj/item/reagent_containers/blood/OPlus{ pixel_x = 2; pixel_y = 2 }, @@ -44016,19 +44016,19 @@ /area/surface/station/rnd/xenobiology) "uOQ" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/surgical/FixOVein, -/obj/item/weapon/surgical/circular_saw, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/surgicaldrill, +/obj/item/surgical/FixOVein, +/obj/item/surgical/circular_saw, +/obj/item/surgical/scalpel, /obj/item/stack/medical/advanced/bruise_pack, -/obj/item/weapon/surgical/retractor, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/surgical/cautery, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel, +/obj/item/surgical/retractor, +/obj/item/surgical/hemostat, +/obj/item/surgical/cautery, +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel, /obj/item/stack/nanopaste, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/autopsy_scanner, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/old_tile/gray, /area/surface/station/medical/surgery_storage) "uOT" = ( @@ -44167,8 +44167,8 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, @@ -44180,11 +44180,11 @@ }, /obj/random/crate, /obj/item/clothing/mask/gas, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/flashlight, +/obj/item/flashlight, /obj/random/maintenance/security, /obj/random/maintenance/clean, /obj/machinery/meter, @@ -44196,8 +44196,8 @@ /area/surface/station/maintenance/east/gnd) "uTh" = ( /obj/structure/table/steel, -/obj/item/device/retail_scanner/cargo, -/obj/item/device/retail_scanner/cargo{ +/obj/item/retail_scanner/cargo, +/obj/item/retail_scanner/cargo{ pixel_x = 2; pixel_y = 2 }, @@ -44465,7 +44465,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -44541,7 +44541,7 @@ }, /obj/structure/closet/secure_closet/medical1, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -44571,7 +44571,7 @@ /area/surface/station/hallway/primary/groundfloor/west/elevator) "vcG" = ( /obj/structure/table/standard, -/obj/item/device/multitool, +/obj/item/multitool, /obj/item/stack/cable_coil, /turf/simulated/floor/reinforced, /area/surface/station/rnd/misc_lab) @@ -44595,7 +44595,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/dark, /area/surface/station/security/interrogation) "vei" = ( @@ -44653,11 +44653,11 @@ dir = 8; pixel_x = 22 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/structure/closet/emcloset, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/machinery/light, /obj/machinery/camera/network/ground_floor{ c_tag = "Ground Floor - Cryostorage"; @@ -44674,8 +44674,8 @@ pixel_x = 24 }, /obj/structure/bookcase, -/obj/item/weapon/book/codex/corp_regs, -/obj/item/weapon/book/codex/corp_regs, +/obj/item/book/codex/corp_regs, +/obj/item/book/codex/corp_regs, /turf/simulated/floor/lino, /area/surface/station/security/detectives_office) "veX" = ( @@ -44759,7 +44759,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "vgs" = ( @@ -45122,11 +45122,11 @@ /area/surface/station/engineering/atmos) "vnd" = ( /obj/structure/table/reinforced, -/obj/item/device/slime_scanner{ +/obj/item/slime_scanner{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/slime_scanner, +/obj/item/slime_scanner, /turf/simulated/floor/tiled/neutral, /area/surface/station/rnd/xenobiology) "vnh" = ( @@ -45204,7 +45204,7 @@ dir = 2; icon_state = "pipe-c" }, -/obj/item/weapon/stool/barstool/padded{ +/obj/item/stool/barstool/padded{ dir = 8 }, /turf/simulated/floor/wood, @@ -45235,12 +45235,12 @@ dir = 4; pixel_x = 24 }, -/obj/item/weapon/storage/box/pillbottles{ +/obj/item/storage/box/pillbottles{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/tool/screwdriver, +/obj/item/storage/box/syringes, +/obj/item/tool/screwdriver, /obj/machinery/camera/network/medbay{ c_tag = "MED - Chemistry"; dir = 9 @@ -45286,7 +45286,7 @@ pixel_y = 2 }, /obj/item/stack/cable_coil, -/obj/item/device/multitool, +/obj/item/multitool, /obj/item/clothing/gloves/yellow, /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -45399,7 +45399,7 @@ /area/surface/outside/river/gautelfr) "vuy" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/bodybag/cryobag{ pixel_x = -2; pixel_y = -2 @@ -45418,7 +45418,7 @@ /area/surface/station/medical/storage/primary_storage) "vvm" = ( /obj/structure/table/woodentable, -/obj/item/weapon/dice, +/obj/item/dice, /turf/simulated/floor/carpet, /area/surface/station/library) "vvG" = ( @@ -45503,7 +45503,7 @@ /area/surface/station/hallway/primary/groundfloor/north) "vwm" = ( /obj/structure/table/bench/steel, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -45561,7 +45561,7 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /turf/simulated/floor/tiled/neutral, /area/surface/station/rnd/exploration) "vxx" = ( @@ -45778,7 +45778,7 @@ pixel_y = 22 }, /obj/effect/catwalk_plated, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -45935,7 +45935,7 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 9 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/white, /area/surface/station/medical/surgery2) "vHV" = ( @@ -46137,7 +46137,7 @@ /area/surface/station/maintenance/kitchen) "vLB" = ( /obj/structure/bed/chair/shuttle, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -46183,7 +46183,7 @@ c_tag = "SEC - Briefing East"; dir = 10 }, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 1; pixel_y = -21 }, @@ -46442,7 +46442,7 @@ c_tag = "ENG - Waste Handling"; dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -47255,7 +47255,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/steeldecal/steel_decals_central5, -/obj/item/weapon/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -48031,8 +48031,8 @@ /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/suit/storage/hooded/wintercoat, -/obj/item/weapon/melee/umbrella/random, -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, +/obj/item/melee/umbrella/random, /obj/machinery/camera/network/ground_floor{ c_tag = "Ground Floor - Arrivals North"; dir = 8 @@ -48073,20 +48073,20 @@ /area/surface/station/crew_quarters/heads/hop) "wOf" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/monkeycubes{ +/obj/item/storage/box/monkeycubes{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/storage/box/monkeycubes{ +/obj/item/storage/box/monkeycubes{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes{ +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/food/snacks/cube/monkeycube/wrapped, +/obj/item/reagent_containers/food/snacks/cube/monkeycube/wrapped, /turf/simulated/floor/tiled/neutral, /area/surface/station/rnd/xenobiology) "wOs" = ( @@ -48142,8 +48142,8 @@ dir = 1; pixel_y = -22 }, -/obj/item/weapon/folder/red, -/obj/item/device/tape/random, +/obj/item/folder/red, +/obj/item/tape/random, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -48416,7 +48416,7 @@ /obj/structure/table/bench/steel, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/purple/border, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/effect/floor_decal/steeldecal/steel_decals_central5{ @@ -48969,10 +48969,10 @@ /area/surface/station/engineering/atmos) "xgE" = ( /obj/effect/floor_decal/corner/white/diagonal, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/freezer, @@ -49044,7 +49044,7 @@ /turf/simulated/floor/plating, /area/surface/station/maintenance/east/gnd) "xiX" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -49199,7 +49199,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "xof" = ( @@ -49227,12 +49227,12 @@ /area/surface/outside/plains/station) "xpy" = ( /obj/structure/table/woodentable, -/obj/item/device/camera_film{ +/obj/item/camera_film{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/camera_film, -/obj/item/device/paicard, +/obj/item/camera_film, +/obj/item/paicard, /obj/machinery/camera/network/civilian{ c_tag = "CIV - Library East"; dir = 8 @@ -49284,11 +49284,11 @@ pixel_x = 1; pixel_y = 36 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = 21 }, @@ -49624,7 +49624,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/item/weapon/banner/nt, +/obj/item/banner/nt, /turf/simulated/floor/wood/sif, /area/surface/station/chapel/main) "xzZ" = ( @@ -49703,20 +49703,20 @@ name = "High-Risk Modules"; req_one_access = list(20) }, -/obj/item/weapon/aiModule/oxygen{ +/obj/item/aiModule/oxygen{ pixel_x = 3; pixel_y = -6 }, -/obj/item/weapon/aiModule/oneHuman{ +/obj/item/aiModule/oneHuman{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/aiModule/purge, -/obj/item/weapon/aiModule/antimov{ +/obj/item/aiModule/purge, +/obj/item/aiModule/antimov{ pixel_x = -2; pixel_y = 3 }, -/obj/item/weapon/aiModule/teleporterOffline{ +/obj/item/aiModule/teleporterOffline{ pixel_x = -4; pixel_y = 5 }, @@ -49859,8 +49859,8 @@ /obj/item/roller, /obj/item/bodybag/cryobag, <<<<<<< HEAD -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/pill_bottle/spaceacillin, +/obj/item/storage/firstaid/regular, +/obj/item/storage/pill_bottle/spaceacillin, ======= /obj/item/storage/firstaid/regular, /obj/item/storage/pill_bottle/spaceacillin, @@ -49891,7 +49891,7 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -49899,11 +49899,11 @@ /area/surface/station/hydroponics) "xHq" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask, -/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/reagent_containers/glass/rag, -/obj/item/weapon/deskbell, +/obj/item/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/food/drinks/flask/vacuumflask, +/obj/item/flame/lighter/zippo, +/obj/item/reagent_containers/glass/rag, +/obj/item/deskbell, /turf/simulated/floor/lino, /area/surface/station/crew_quarters/bar) "xHy" = ( @@ -50043,7 +50043,7 @@ /obj/structure/closet, /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -50212,13 +50212,13 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 8 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -50252,8 +50252,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/item/weapon/gun/energy/taser/xeno, -/obj/item/weapon/melee/baton/slime/loaded, +/obj/item/gun/energy/taser/xeno, +/obj/item/melee/baton/slime/loaded, /turf/simulated/floor/tiled/neutral, /area/surface/station/rnd/xenobiology) "xOU" = ( @@ -50382,8 +50382,8 @@ /area/surface/station/engineering/hallway/reactor) "xRz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stamp/hos, -/obj/item/device/holowarrant, +/obj/item/stamp/hos, +/obj/item/holowarrant, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/heads/hos) "xRE" = ( @@ -50456,11 +50456,11 @@ /area/surface/station/engineering/atmos) "xST" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -50471,23 +50471,23 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin{ +/obj/item/reagent_containers/glass/bottle/stoxin{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{ +/obj/item/reagent_containers/glass/bottle/antitoxin{ pixel_y = -2 }, -/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{ +/obj/item/reagent_containers/glass/bottle/inaprovaline{ pixel_x = 2 }, /obj/random/medical, /obj/random/medical, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /turf/simulated/floor/tiled/white, /area/surface/station/medical/storage/primary_storage) "xSU" = ( @@ -50778,21 +50778,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 5 }, -/obj/item/device/analyzer/plant_analyzer{ +/obj/item/analyzer/plant_analyzer{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/weapon/material/minihoe{ +/obj/item/analyzer/plant_analyzer, +/obj/item/material/minihoe{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/knife/machete/hatchet{ +/obj/item/material/minihoe, +/obj/item/material/knife/machete/hatchet{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/material/knife/machete/hatchet, +/obj/item/material/knife/machete/hatchet, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -50888,7 +50888,7 @@ /obj/structure/reagent_dispensers/watertank/high, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/hydro, /area/surface/station/hydroponics) "xZL" = ( @@ -50947,8 +50947,8 @@ name = "Module Storage"; req_one_access = list(16) }, -/obj/item/weapon/aiModule/protectStation, -/obj/item/weapon/aiModule/freeform{ +/obj/item/aiModule/protectStation, +/obj/item/aiModule/freeform{ pixel_x = -3; pixel_y = 3 }, @@ -51172,7 +51172,7 @@ /area/surface/outside/station/reactorpond) "yfz" = ( /obj/effect/floor_decal/corner/white/diagonal, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/tiled/freezer, @@ -51399,8 +51399,8 @@ /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/beige/border, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled/white, /area/surface/station/medical/chemistry) "ylq" = ( diff --git a/maps/cynosure/cynosure-3.dmm b/maps/cynosure/cynosure-3.dmm index 9001e5757c6..9dd98663645 100644 --- a/maps/cynosure/cynosure-3.dmm +++ b/maps/cynosure/cynosure-3.dmm @@ -83,10 +83,10 @@ dir = 1 }, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ pixel_y = -4 }, -/obj/item/weapon/cell/high, +/obj/item/cell/high, /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, @@ -236,11 +236,11 @@ /obj/structure/table/steel, /obj/fiftyspawner/steel, /obj/fiftyspawner/glass, -/obj/item/weapon/storage/belt/utility{ +/obj/item/storage/belt/utility{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, /obj/machinery/firealarm{ @@ -250,7 +250,7 @@ /obj/item/stack/material/copper{ amount = 20 }, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled, /area/surface/station/quartermaster/office) "aji" = ( @@ -296,9 +296,9 @@ /area/surface/station/security/prison) "aks" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/corner/lime/diagonal, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -311,7 +311,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -510,7 +510,7 @@ /obj/machinery/alarm{ pixel_y = 22 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -542,7 +542,7 @@ /turf/simulated/floor/tiled, /area/surface/station/ai_monitored/storage/eva) "asc" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -594,12 +594,12 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/coin/silver, -/obj/item/weapon/stamp/qm, +/obj/item/coin/silver, +/obj/item/stamp/qm, /obj/machinery/newscaster{ pixel_y = 28 }, @@ -684,7 +684,7 @@ /obj/structure/closet{ name = "Prisoner's Locker" }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, /obj/item/clothing/suit/storage/apron/overalls, /turf/simulated/floor/tiled, /area/surface/station/security/prison) @@ -717,8 +717,8 @@ /obj/effect/floor_decal/corner_oldtile/blue{ dir = 6 }, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun{ pixel_x = 2; pixel_y = -2 }, @@ -753,7 +753,7 @@ /turf/simulated/floor/tiled/techmaint, /area/surface/station/security/tactical) "ayM" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -917,7 +917,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/machinery/camera/network/research{ @@ -1023,29 +1023,29 @@ /area/surface/station/crew_quarters/sleep/Dorm_4) "aMh" = ( /obj/structure/table/glass, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FF6666"; name = "light red towel"; pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FF6666"; name = "light red towel"; pixel_x = -1 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#3fc0ea"; name = "light blue towel"; pixel_y = 2 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#3fc0ea"; name = "light blue towel"; pixel_x = 1; pixel_y = 4 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/random/soap, /obj/structure/cable/green, /obj/machinery/power/apc{ @@ -1061,7 +1061,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central7{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/old_tile/white, @@ -1113,7 +1113,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 9 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/camera/network/medbay{ c_tag = "MED - Second Floor Hallway"; dir = 1 @@ -1164,7 +1164,7 @@ /area/surface/station/engineering/hallway/snd) "aPH" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/sleep/Dorm_1) "aPW" = ( @@ -1444,7 +1444,7 @@ dir = 1 }, /obj/structure/bed/chair/office/dark, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -1623,13 +1623,13 @@ /area/surface/station/engineering/atmos/monitoring) "blU" = ( /obj/structure/table/standard, -/obj/item/device/camera_film, -/obj/item/device/camera_film{ +/obj/item/camera_film, +/obj/item/camera_film{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/camera, -/obj/item/device/camera{ +/obj/item/camera, +/obj/item/camera{ pixel_x = 2; pixel_y = 2 }, @@ -1715,8 +1715,8 @@ /area/surface/station/engineering/hallway/eva_hallway) "boW" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/material/ashtray/glass, -/obj/item/device/flashlight/lamp/green, +/obj/item/material/ashtray/glass, +/obj/item/flashlight/lamp/green, /obj/item/sticky_pad/random{ pixel_x = 8; pixel_y = -1 @@ -1764,16 +1764,16 @@ /area/surface/station/engineering/engi_restroom) "bpv" = ( /obj/structure/table/standard, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -3; pixel_y = -4 }, @@ -1786,7 +1786,7 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/surface/station/security/tactical) "bpV" = ( -/obj/item/weapon/banner/nt, +/obj/item/banner/nt, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -2058,10 +2058,10 @@ /area/surface/station/engineering/atmos/monitoring) "bzc" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/clipboard, +/obj/item/folder/white, +/obj/item/pen, /obj/effect/floor_decal/borderfloorwhite{ dir = 6 }, @@ -2148,10 +2148,10 @@ /obj/effect/floor_decal/corner_oldtile/red{ dir = 5 }, -/obj/item/weapon/storage/box/shotgunshells, -/obj/item/weapon/storage/box/shotgunshells, -/obj/item/weapon/storage/box/shotgunammo, -/obj/item/weapon/storage/box/shotgunammo, +/obj/item/storage/box/shotgunshells, +/obj/item/storage/box/shotgunshells, +/obj/item/storage/box/shotgunammo, +/obj/item/storage/box/shotgunammo, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45, @@ -2235,7 +2235,7 @@ }, <<<<<<< HEAD /obj/structure/flora/pottedplant/drooping, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ ======= /obj/item/radio/intercom{ >>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 @@ -2280,11 +2280,11 @@ /area/surface/station/medical/patient_wing) "bFn" = ( /obj/structure/table/standard, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FFD700"; name = "gold towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FFD700"; name = "gold towel"; pixel_x = 1; @@ -2334,7 +2334,7 @@ /obj/machinery/r_n_d/circuit_imprinter, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/green/border, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /obj/structure/sign/poster/custom{ pixel_y = -32 }, @@ -2546,7 +2546,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/rig/hazmat/equipped, +/obj/item/rig/hazmat/equipped, /obj/machinery/door/window/southright{ name = "RD Suit"; req_one_access = list(30) @@ -2641,7 +2641,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -2723,7 +2723,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled, @@ -2842,7 +2842,7 @@ dir = 10 }, /obj/structure/closet/secure_closet/personal/patient, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/effect/floor_decal/corner/pink/border{ @@ -2892,7 +2892,7 @@ dir = 4; pixel_x = 24 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21; pixel_y = 32 @@ -2936,7 +2936,7 @@ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/bikehorn/rubberducky{ +/obj/item/bikehorn/rubberducky{ layer = 3.1; name = "Tux" }, @@ -2986,10 +2986,10 @@ dir = 8 }, /obj/structure/table/rack, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/mask/gas, -/obj/item/device/flashlight, +/obj/item/flashlight, /obj/item/clothing/glasses/meson, /obj/random/maintenance/security, /obj/random/maintenance/engineering, @@ -3233,7 +3233,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -3419,7 +3419,7 @@ /area/surface/station/medical/hallway/snd) "cpQ" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/effect/zone_divider, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/sleep/Dorm_3) @@ -3607,7 +3607,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/item/sticky_pad/random{ pixel_x = 8; pixel_y = -1 @@ -3729,7 +3729,7 @@ name = "Engineering Suits"; req_one_access = list(11,24) }, -/obj/item/weapon/rig/eva/equipped, +/obj/item/rig/eva/equipped, /turf/simulated/floor/tiled/dark, /area/surface/station/ai_monitored/storage/eva) "czT" = ( @@ -3753,7 +3753,7 @@ /obj/effect/floor_decal/corner/white/border, /obj/structure/table/reinforced, /obj/structure/window/reinforced, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /turf/simulated/floor/tiled/techmaint, /area/surface/station/command/operations) "cAN" = ( @@ -4112,14 +4112,14 @@ /turf/simulated/floor/reinforced, /area/holodeck/alphadeck) "cOH" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, -/obj/item/device/radio/intercom/custom{ +/obj/item/radio/intercom/custom{ pixel_y = -21 }, -/obj/item/device/radio/intercom/private{ +/obj/item/radio/intercom/private{ dir = 1; pixel_y = 21 }, @@ -4183,8 +4183,8 @@ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide{ +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide{ pixel_x = 2; pixel_y = 2 }, @@ -4230,7 +4230,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, /obj/structure/table/standard, -/obj/item/weapon/storage/laundry_basket, +/obj/item/storage/laundry_basket, /obj/machinery/light, /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/secondary/secondfloor/dormhallway) @@ -4253,12 +4253,12 @@ pixel_y = 36 }, /obj/structure/table/reinforced, -/obj/item/weapon/circuitboard/teleporter, -/obj/item/weapon/circuitboard/aicore, -/obj/item/weapon/cartridge/signal/science, -/obj/item/weapon/cartridge/signal/science, -/obj/item/weapon/cartridge/signal/science, -/obj/item/device/megaphone, +/obj/item/circuitboard/teleporter, +/obj/item/circuitboard/aicore, +/obj/item/cartridge/signal/science, +/obj/item/cartridge/signal/science, +/obj/item/cartridge/signal/science, +/obj/item/megaphone, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -4367,24 +4367,24 @@ dir = 4 }, /obj/structure/closet, -/obj/item/device/tape/random, -/obj/item/device/taperecorder, -/obj/item/device/camera{ +/obj/item/tape/random, +/obj/item/taperecorder, +/obj/item/camera{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/camera, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/weapon/storage/secure/briefcase, -/obj/item/weapon/storage/secure/briefcase{ +/obj/item/camera, +/obj/item/flash, +/obj/item/flash, +/obj/item/storage/secure/briefcase, +/obj/item/storage/secure/briefcase{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_y = 6 }, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /obj/machinery/alarm{ dir = 4; pixel_x = -22 @@ -4564,8 +4564,8 @@ dir = 8 }, /obj/effect/floor_decal/industrial/warning/corner, -/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers, -/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind, +/obj/item/reagent_containers/food/snacks/cheesiehonkers, +/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind, /obj/machinery/alarm{ dir = 1; pixel_y = -22 @@ -4598,7 +4598,7 @@ }, /obj/structure/closet/l3closet/virology, /obj/item/clothing/mask/gas, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -4633,7 +4633,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled, @@ -5150,7 +5150,7 @@ }, /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/red/bordercorner, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/simulated/floor/tiled, /area/surface/station/security/prison) "dxp" = ( @@ -5213,10 +5213,10 @@ /area/surface/station/hallway/primary/secondfloor/east) "dzQ" = ( /obj/structure/table/steel, -/obj/item/device/floor_painter, -/obj/item/device/multitool, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/belt/utility, +/obj/item/floor_painter, +/obj/item/multitool, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/random/tech_supply, /obj/random/tech_supply, /obj/effect/floor_decal/borderfloor/corner{ @@ -5365,7 +5365,7 @@ /area/surface/station/rnd/robotics) "dGi" = ( /obj/structure/closet/secure_closet/medical3, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/old_tile/white, @@ -5401,10 +5401,10 @@ "dGB" = ( /obj/structure/disposalpipe/segment, /obj/structure/table/glass, -/obj/item/device/antibody_scanner{ +/obj/item/antibody_scanner{ pixel_y = 4 }, -/obj/item/device/antibody_scanner, +/obj/item/antibody_scanner, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -5703,14 +5703,14 @@ /area/surface/station/crew_quarters/heads/cmo) "dUn" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin, -/obj/item/weapon/clipboard, -/obj/item/weapon/pen, -/obj/item/weapon/pen/red{ +/obj/item/paper_bin, +/obj/item/clipboard, +/obj/item/pen, +/obj/item/pen/red{ pixel_x = 3; pixel_y = 3 }, -/obj/item/device/retail_scanner/cargo, +/obj/item/retail_scanner/cargo, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -5815,7 +5815,7 @@ dir = 8 }, /obj/item/clothing/mask/breath, -/obj/item/weapon/rig/ce/equipped, +/obj/item/rig/ce/equipped, /obj/machinery/door/window/northright{ name = "Chief Engineer Suit Storage"; req_one_access = list(10) @@ -5934,7 +5934,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/surface/station/crew_quarters/sleep/Dorm_2) "eaQ" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; @@ -5976,11 +5976,11 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 1 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow_ce, -/obj/item/weapon/pen/multi, +/obj/item/clipboard, +/obj/item/folder/yellow_ce, +/obj/item/pen/multi, /obj/item/sticky_pad/random, -/obj/item/weapon/stamp/ce, +/obj/item/stamp/ce, /turf/simulated/floor/tiled, /area/surface/station/crew_quarters/heads/chief) "ecx" = ( @@ -6201,11 +6201,11 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /turf/simulated/floor/tiled/white, /area/surface/station/medical/virology) "epI" = ( @@ -6344,12 +6344,12 @@ /area/surface/station/ai_monitored/storage/eva) "esH" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, -/obj/item/weapon/material/ashtray/glass, -/obj/item/device/flashlight/lamp/green, +/obj/item/material/ashtray/glass, +/obj/item/flashlight/lamp/green, /obj/item/sticky_pad/random{ pixel_x = 8; pixel_y = -1 @@ -6404,23 +6404,23 @@ pixel_x = 11; pixel_y = -23 }, -/obj/item/weapon/rcd_ammo{ +/obj/item/rcd_ammo{ pixel_y = -2 }, -/obj/item/weapon/rcd_ammo{ +/obj/item/rcd_ammo{ pixel_x = -2 }, -/obj/item/weapon/rcd_ammo{ +/obj/item/rcd_ammo{ pixel_x = -4; pixel_y = 2 }, -/obj/item/weapon/rcd_ammo{ +/obj/item/rcd_ammo{ pixel_x = -6; pixel_y = 4 }, -/obj/item/weapon/rcd, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, +/obj/item/rcd, +/obj/item/cell/high, +/obj/item/cell/high, /obj/effect/floor_decal/steeldecal/steel_decals_central7, /turf/simulated/floor/tiled/techmaint, /area/surface/station/crew_quarters/heads/chief) @@ -7005,7 +7005,7 @@ /turf/simulated/floor/tiled, /area/surface/station/hallway/secondary/secondfloor/command) "eRj" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -7090,7 +7090,7 @@ /obj/machinery/computer/skills{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -7141,7 +7141,7 @@ /turf/simulated/wall, /area/surface/station/engineering/hallway/snd) "eUJ" = ( -/obj/item/weapon/banner/nt, +/obj/item/banner/nt, /turf/simulated/floor/wood, /area/surface/station/command/meeting_room) "eVk" = ( @@ -7339,8 +7339,8 @@ /area/surface/station/maintenance/substation/security/snd) "fbe" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -7391,7 +7391,7 @@ name = "Prisoner's Locker" }, /obj/random/cigarettes, -/obj/item/weapon/flame/lighter/zippo, +/obj/item/flame/lighter/zippo, /turf/simulated/floor/tiled, /area/surface/station/security/prison) "fct" = ( @@ -7412,14 +7412,14 @@ /obj/structure/table/standard, /obj/fiftyspawner/glass, /obj/fiftyspawner/glass, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/device/multitool, +/obj/item/storage/toolbox/mechanical, +/obj/item/multitool, /obj/item/clothing/head/welding, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/machinery/requests_console{ department = "EVA"; name = "EVA RC"; @@ -7562,7 +7562,7 @@ pixel_y = 36; req_one_access = list(2,4) }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -7633,11 +7633,11 @@ dir = 10 }, /obj/structure/table/wooden_reinforced, -/obj/item/weapon/storage/box/matches, +/obj/item/storage/box/matches, /obj/item/clothing/mask/smokable/cigarette/cigar/havana, -/obj/item/weapon/reagent_containers/food/drinks/flask, +/obj/item/reagent_containers/food/drinks/flask, /obj/random_multi/single_item/captains_spare_id, -/obj/item/weapon/material/ashtray/bronze, +/obj/item/material/ashtray/bronze, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/captain) "fnz" = ( @@ -7736,11 +7736,11 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/gun/projectile/shotgun/pump{ +/obj/item/gun/projectile/shotgun/pump{ pixel_x = -1; pixel_y = 2 }, -/obj/item/weapon/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, /obj/effect/floor_decal/corner_oldtile/green{ dir = 6 }, @@ -8216,7 +8216,7 @@ /area/surface/station/engineering/reactor_airlock/snd) "fGj" = ( /obj/structure/table/standard, -/obj/item/device/paicard, +/obj/item/paicard, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -8364,12 +8364,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/chemimp, -/obj/item/weapon/storage/box/trackimp{ +/obj/item/storage/box/chemimp, +/obj/item/storage/box/trackimp{ pixel_x = -3; pixel_y = -3 }, @@ -8759,8 +8759,8 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/item/device/flashlight/pen, -/obj/item/device/flashlight/pen, +/obj/item/flashlight/pen, +/obj/item/flashlight/pen, /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 4 }, @@ -9116,7 +9116,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 8; pixel_x = 21 }, @@ -9223,11 +9223,11 @@ /area/surface/station/security/hallway/cell_hallway) "goT" = ( /obj/structure/closet/lawcloset, -/obj/item/device/flash, -/obj/item/weapon/storage/briefcase{ +/obj/item/flash, +/obj/item/storage/briefcase{ pixel_y = 6 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /turf/simulated/floor/wood, /area/surface/station/command/liaison) "gpz" = ( @@ -9383,7 +9383,7 @@ /turf/simulated/shuttle/floor, /area/shuttle/large_escape_pod2/station) "guA" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; @@ -9619,7 +9619,7 @@ /turf/simulated/floor/plating, /area/surface/station/maintenance/weststairwell/snd) "gAT" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; @@ -9776,8 +9776,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/hand_labeler, -/obj/item/device/retail_scanner/command{ +/obj/item/hand_labeler, +/obj/item/retail_scanner/command{ name = "retail scanner COM" }, /turf/simulated/floor/wood, @@ -10183,8 +10183,8 @@ /area/surface/station/ai_monitored/storage/eva) "gRD" = ( /obj/structure/closet/crate/freezer/nanotrasen, -/obj/item/weapon/virusdish/random, -/obj/item/weapon/virusdish/random, +/obj/item/virusdish/random, +/obj/item/virusdish/random, /obj/machinery/alarm{ dir = 8; pixel_x = 22 @@ -10231,20 +10231,20 @@ /obj/effect/floor_decal/corner_oldtile/red{ dir = 9 }, -/obj/item/weapon/storage/box/flashshells, -/obj/item/weapon/storage/box/beanbags{ +/obj/item/storage/box/flashshells, +/obj/item/storage/box/beanbags{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/beanbags{ +/obj/item/storage/box/beanbags{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/stunshells{ +/obj/item/storage/box/stunshells{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/stunshells{ +/obj/item/storage/box/stunshells{ pixel_x = 4; pixel_y = 4 }, @@ -10271,19 +10271,19 @@ /area/surface/station/security/tactical) "gTh" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue{ +/obj/item/paper_bin, +/obj/item/pen/blue{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/storage/fancy/markers{ +/obj/item/storage/fancy/markers{ pixel_y = -3 }, -/obj/item/weapon/storage/fancy/markers, +/obj/item/storage/fancy/markers, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -10371,7 +10371,7 @@ dir = 1; pixel_y = -24 }, -/obj/item/device/megaphone, +/obj/item/megaphone, /obj/random_multi/single_item/hand_tele, /turf/simulated/floor/tiled/techmaint, /area/surface/station/crew_quarters/heads/chief) @@ -10380,22 +10380,22 @@ /area/surface/station/maintenance/substation/command) "gWu" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/effect/zone_divider, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/sleep/Dorm_4) "gWC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/medical, +/obj/item/storage/belt/medical, /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/glasses/sunglasses/medhud, -/obj/item/device/radio{ +/obj/item/radio{ frequency = 1485; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"; pixel_y = 4 }, -/obj/item/device/megaphone, +/obj/item/megaphone, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -10450,15 +10450,15 @@ dir = 4; pixel_x = -22 }, -/obj/item/weapon/packageWrap{ +/obj/item/packageWrap{ pixel_x = -2; pixel_y = -4 }, -/obj/item/weapon/packageWrap{ +/obj/item/packageWrap{ pixel_y = -2 }, -/obj/item/weapon/tape_roll, -/obj/item/weapon/tape_roll{ +/obj/item/tape_roll, +/obj/item/tape_roll{ pixel_x = 2 }, /obj/effect/floor_decal/borderfloor{ @@ -10664,7 +10664,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -10859,12 +10859,12 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/item/weapon/storage/secure/briefcase, -/obj/item/weapon/storage/box/PDAs{ +/obj/item/storage/secure/briefcase, +/obj/item/storage/box/PDAs{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/ids, /obj/structure/window/reinforced{ dir = 4 }, @@ -11023,7 +11023,7 @@ /area/surface/station/maintenance/substation/security/snd) "hrj" = ( /obj/structure/closet/secure_closet/medical3, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/machinery/alarm{ dir = 1; pixel_y = -22 @@ -11199,13 +11199,13 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 1 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder/blue{ +/obj/item/paper_bin, +/obj/item/folder/blue{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /obj/machinery/light{ dir = 1 }, @@ -11280,7 +11280,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -11305,8 +11305,8 @@ /obj/item/clothing/accessory/armor/armguards/riot, /obj/item/clothing/accessory/armor/armorplate/riot, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/melee/baton/loaded, +/obj/item/shield/riot, +/obj/item/melee/baton/loaded, /obj/machinery/door/window/brigdoor/southleft{ name = "Riot Armor" }, @@ -11398,11 +11398,11 @@ dir = 8 }, /obj/effect/catwalk_plated/dark, -/obj/item/weapon/storage/box/empslite{ +/obj/item/storage/box/empslite{ pixel_x = 1; pixel_y = 1 }, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/flashbangs{ pixel_x = -3; pixel_y = -3 }, @@ -11450,7 +11450,7 @@ dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -11472,13 +11472,13 @@ icon_state = "2-4" }, /obj/structure/table/reinforced, -/obj/item/weapon/book/codex/corp_regs, -/obj/item/weapon/stamp/denied, -/obj/item/weapon/stamp/ward, -/obj/item/weapon/tool/crowbar/red, -/obj/item/device/radio/off, -/obj/item/weapon/tool/wrench, -/obj/item/device/retail_scanner/security, +/obj/item/book/codex/corp_regs, +/obj/item/stamp/denied, +/obj/item/stamp/ward, +/obj/item/tool/crowbar/red, +/obj/item/radio/off, +/obj/item/tool/wrench, +/obj/item/retail_scanner/security, /obj/machinery/requests_console{ department = "Security"; departmentType = 5; @@ -11570,7 +11570,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/armor/captain, /obj/item/clothing/head/helmet/space/capspace, @@ -11658,7 +11658,7 @@ /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 4 }, -/obj/item/device/radio/headset, +/obj/item/radio/headset, /turf/simulated/floor/tiled, /area/surface/station/security/prison) "hPp" = ( @@ -11791,7 +11791,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled, @@ -11933,7 +11933,7 @@ pixel_x = 23; pixel_y = 11 }, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/item/sticky_pad/random{ pixel_x = 8; pixel_y = -1 @@ -12068,7 +12068,7 @@ "iaS" = ( /obj/structure/table/bench/padded, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -12114,7 +12114,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 1 }, -/obj/item/device/integrated_circuit_printer, +/obj/item/integrated_circuit_printer, /turf/simulated/floor/tiled/dark, /area/surface/station/rnd/workshop) "icL" = ( @@ -12127,7 +12127,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 8 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled/white, @@ -12144,20 +12144,20 @@ dir = 1 }, /obj/structure/closet/crate/science, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/weapon/stock_parts/scanning_module, -/obj/item/weapon/stock_parts/scanning_module, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, @@ -12184,7 +12184,7 @@ /turf/simulated/floor/tiled/dark, /area/surface/station/maintenance/substation/research/snd) "ifR" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -12219,7 +12219,7 @@ /obj/machinery/door/window/northright{ name = "shower" }, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/simulated/floor/tiled/eris, /area/surface/station/crew_quarters/captain) "ige" = ( @@ -12277,7 +12277,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; @@ -12632,8 +12632,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/book/manual/supermatter_engine, +/obj/item/paper_bin, +/obj/item/book/manual/supermatter_engine, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/welding/superior, /turf/simulated/floor/tiled/monotile, @@ -13244,7 +13244,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /obj/machinery/alarm{ dir = 8; pixel_x = 22 @@ -13330,9 +13330,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central5{ dir = 4 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen/multi, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/pen/multi, /turf/simulated/floor/tiled, /area/surface/station/quartermaster/qm) "iPC" = ( @@ -13407,7 +13407,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/book/codex/corp_regs, +/obj/item/book/codex/corp_regs, /turf/simulated/floor/carpet/blue, /area/surface/station/command/meeting_room) "iRn" = ( @@ -13465,7 +13465,7 @@ /obj/machinery/computer/med_data/laptop{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -13484,7 +13484,7 @@ /area/surface/station/medical/patient_a) "iRU" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, @@ -13521,7 +13521,7 @@ /obj/effect/floor_decal/corner/blue/bordercorner2{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -13569,18 +13569,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder, -/obj/item/weapon/folder/blue{ +/obj/item/paper_bin, +/obj/item/folder, +/obj/item/folder/blue{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = -2 }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/stamp/internalaffairs, -/obj/item/weapon/stamp/denied{ +/obj/item/folder/yellow, +/obj/item/stamp/internalaffairs, +/obj/item/stamp/denied{ pixel_x = 2; pixel_y = 2 }, @@ -13642,9 +13642,9 @@ /obj/structure/table/steel, /obj/item/clothing/gloves/black, /obj/item/clothing/gloves/black, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/storage/box/lights/mixed, /obj/random/tech_supply, /obj/random/tech_supply, /obj/effect/floor_decal/borderfloor{ @@ -13657,7 +13657,7 @@ dir = 8; pixel_x = 22 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -13676,10 +13676,10 @@ /area/surface/station/medical/hallway/snd) "iVq" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -4 }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/random/medical/lite, /obj/structure/closet/walllocker/emerglocker{ pixel_y = -32 @@ -14019,7 +14019,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 4 }, -/obj/item/weapon/circuitboard/airalarm, +/obj/item/circuitboard/airalarm, /turf/simulated/floor/tiled/techmaint, /area/surface/station/construction/office) "jfz" = ( @@ -14319,7 +14319,7 @@ /area/surface/station/engineering/reactor_airlock/snd) "jnl" = ( /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /obj/machinery/requests_console{ department = "Robotics"; departmentType = 2; @@ -14689,7 +14689,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; @@ -14737,7 +14737,7 @@ dir = 4; pixel_x = 24 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -14750,7 +14750,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/white, /area/surface/station/medical/virology) "jyY" = ( @@ -15025,7 +15025,7 @@ /area/surface/station/security/prison) "jHa" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/captaindouble, +/obj/item/bedsheet/captaindouble, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/captain) "jHw" = ( @@ -15172,9 +15172,9 @@ /area/surface/station/crew_quarters/captain) "jKS" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/pen/blue, -/obj/item/weapon/pen/red{ +/obj/item/clipboard, +/obj/item/pen/blue, +/obj/item/pen/red{ pixel_x = -4; pixel_y = -4 }, @@ -15267,7 +15267,7 @@ dir = 8 }, /obj/machinery/light, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/effect/floor_decal/borderfloor, @@ -15302,7 +15302,7 @@ /area/surface/station/maintenance/substation/security/snd) "jQf" = ( /obj/structure/table/steel, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -15566,32 +15566,32 @@ /area/surface/station/medical/restroom) "jZn" = ( /obj/structure/table/steel, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/multitool, -/obj/item/weapon/storage/belt/utility{ +/obj/item/multitool, +/obj/item/storage/belt/utility{ pixel_y = 3 }, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/tool/crowbar{ +/obj/item/storage/belt/utility, +/obj/item/tool/crowbar{ pixel_y = -2 }, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/tool/crowbar, +/obj/item/storage/toolbox/electrical{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -4; pixel_y = -4 }, @@ -15970,9 +15970,9 @@ /turf/simulated/wall/r_wall, /area/surface/station/command/internalaffairs) "knJ" = ( -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/structure/bed/padded, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/neutral, @@ -16223,9 +16223,9 @@ /obj/machinery/alarm{ pixel_y = 22 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/folder/white, +/obj/item/pen, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -16269,7 +16269,7 @@ "kzF" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/machinery/computer/security/telescreen/entertainment{ icon_state = "frame"; pixel_y = 32 @@ -16471,7 +16471,7 @@ /area/surface/station/construction/office) "kNE" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/wood, /area/surface/station/command/meeting_room) "kOm" = ( @@ -16593,7 +16593,7 @@ /area/surface/outside/station/roof) "kRF" = ( /obj/structure/table/bench/padded, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ pixel_y = 21 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -16650,10 +16650,10 @@ pixel_y = 24 }, /obj/structure/closet/wardrobe/robotics_black, -/obj/item/device/radio/headset/headset_sci, -/obj/item/device/radio/headset/headset_sci, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/radio/headset/headset_sci, +/obj/item/radio/headset/headset_sci, +/obj/item/flash, +/obj/item/flash, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -16773,7 +16773,7 @@ /obj/effect/floor_decal/corner_oldtile/blue{ dir = 6 }, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /obj/machinery/door/window/brigdoor/westleft{ name = "Weapon Locker" }, @@ -16903,7 +16903,7 @@ /obj/effect/floor_decal/corner/orange/border{ dir = 9 }, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/simulated/floor/tiled, /area/surface/station/security/prison) "ljs" = ( @@ -16911,7 +16911,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -16970,16 +16970,16 @@ "lkG" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/recharger, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = -23 }, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/captain) "lkP" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/corner/lime/diagonal, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = -21 }, @@ -17079,10 +17079,10 @@ "lpi" = ( /obj/structure/table/glass, /obj/effect/floor_decal/borderfloorwhite, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/pen, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/hand_labeler, +/obj/item/pen, +/obj/item/packageWrap, +/obj/item/packageWrap, /obj/effect/floor_decal/corner/purple/border, /turf/simulated/floor/tiled/white, /area/surface/station/rnd/lab) @@ -17323,12 +17323,12 @@ /area/surface/station/hallway/secondary/secondfloor/civilian) "lyL" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/storage/photo_album{ +/obj/item/storage/photo_album{ pixel_x = -3; pixel_y = -3 }, -/obj/item/device/camera, -/obj/item/device/radio/intercom{ +/obj/item/camera, +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -17458,7 +17458,7 @@ /obj/structure/closet{ name = "welding equipment" }, -/obj/item/weapon/weldpack, +/obj/item/weldpack, /obj/item/clothing/glasses/welding, /obj/item/clothing/glasses/welding{ pixel_y = -4 @@ -17688,7 +17688,7 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 4 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = 21 }, @@ -18101,7 +18101,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 4 }, -/obj/item/weapon/paper/dockingcodes{ +/obj/item/paper/dockingcodes{ codes_from_z = 4; name = "Telecomms Docking Codes" }, @@ -18111,7 +18111,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; @@ -18227,7 +18227,7 @@ /turf/simulated/floor/tiled, /area/surface/station/security/prison) "mms" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -18392,11 +18392,11 @@ /area/surface/station/quartermaster/foyer) "msb" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white_cmo, -/obj/item/weapon/stamp/cmo, -/obj/item/weapon/pen/multi, +/obj/item/paper_bin, +/obj/item/clipboard, +/obj/item/folder/white_cmo, +/obj/item/stamp/cmo, +/obj/item/pen/multi, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -18486,41 +18486,41 @@ /area/surface/station/security/hallway/stairwell) "mvl" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/pen/blue{ +/obj/item/paper_bin, +/obj/item/hand_labeler, +/obj/item/pen/blue{ pixel_x = -3 }, -/obj/item/weapon/pen, -/obj/item/device/mmi, -/obj/item/device/mmi, -/obj/item/device/mmi, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/pen, +/obj/item/mmi, +/obj/item/mmi, +/obj/item/mmi, +/obj/item/storage/box/bodybags{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/gloves, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = 3; pixel_y = 3 }, /turf/simulated/floor/tiled/white, /area/surface/station/rnd/robotics) "mvm" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, -/obj/item/device/radio/intercom/custom{ +/obj/item/radio/intercom/custom{ pixel_y = -21 }, -/obj/item/device/radio/intercom/private{ +/obj/item/radio/intercom/private{ dir = 1; pixel_y = 21 }, @@ -18554,12 +18554,12 @@ /obj/structure/window/reinforced, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, -/obj/item/weapon/folder/yellow, -/obj/item/device/flashlight{ +/obj/item/folder/yellow, +/obj/item/flashlight{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/flashlight, +/obj/item/flashlight, /obj/machinery/light, /turf/simulated/floor/tiled/techmaint, /area/surface/station/command/operations) @@ -18716,7 +18716,7 @@ /area/surface/station/holodeck_control) "mEG" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/corner/lime/diagonal, /obj/machinery/alarm{ dir = 4; @@ -18778,7 +18778,7 @@ /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -18928,7 +18928,7 @@ /area/surface/station/command/teleporter) "mJs" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /turf/simulated/floor/wood, /area/surface/station/command/meeting_room) "mJt" = ( @@ -18942,7 +18942,7 @@ /obj/machinery/disposal, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled, @@ -18971,10 +18971,10 @@ dir = 9 }, /obj/structure/table/standard, -/obj/item/device/radio/beacon{ +/obj/item/radio/beacon{ pixel_y = 4 }, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /obj/random_multi/single_item/hand_tele, /obj/machinery/firealarm{ dir = 4; @@ -19068,9 +19068,9 @@ /area/surface/station/medical/patient_wing) "mMW" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/codex/corp_regs, -/obj/item/device/tape/random, -/obj/item/device/taperecorder, +/obj/item/book/codex/corp_regs, +/obj/item/tape/random, +/obj/item/taperecorder, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/captain) "mMX" = ( @@ -19239,7 +19239,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -19378,7 +19378,7 @@ c_tag = "Second Floor - West Skybridge 2"; dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -19665,12 +19665,12 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals_central5, /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/storage/box/syringes, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled/neutral, /area/surface/station/medical/virology) "nmG" = ( @@ -19734,12 +19734,12 @@ /area/surface/station/maintenance/substation/security/snd) "nod" = ( /obj/structure/table/standard, -/obj/item/device/tape/random, -/obj/item/device/tape/random{ +/obj/item/tape/random, +/obj/item/tape/random{ pixel_y = -2 }, -/obj/item/device/taperecorder, -/obj/item/device/taperecorder{ +/obj/item/taperecorder, +/obj/item/taperecorder{ pixel_x = 3 }, /obj/effect/floor_decal/borderfloor{ @@ -19776,15 +19776,15 @@ }, /obj/item/clothing/accessory/armor/armorplate/riot, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, +/obj/item/shield/riot, /obj/machinery/door/window/brigdoor/southleft{ name = "Riot Armor" }, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot{ pixel_x = 2; pixel_y = -3 }, -/obj/item/weapon/melee/baton/loaded, +/obj/item/melee/baton/loaded, /turf/simulated/floor/tiled/techmaint, /area/surface/station/security/armoury) "npe" = ( @@ -19809,11 +19809,11 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/item/device/mmi/digital/robot, -/obj/item/device/robotanalyzer{ +/obj/item/mmi/digital/robot, +/obj/item/robotanalyzer{ pixel_y = 4 }, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /turf/simulated/floor/tiled/old_tile/gray, /area/surface/station/rnd/robotics) "npn" = ( @@ -19871,11 +19871,11 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, -/obj/item/weapon/hand_labeler, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/dark, /area/surface/station/security/warden) "nrJ" = ( @@ -19898,17 +19898,17 @@ dir = 4 }, /obj/structure/table/steel, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/cups{ +/obj/item/storage/box/cups{ pixel_x = 4; pixel_y = 4 }, -/obj/item/device/tape/random, -/obj/item/device/taperecorder, +/obj/item/tape/random, +/obj/item/taperecorder, /turf/simulated/floor/tiled, /area/surface/station/security/prison) "nsL" = ( @@ -19925,7 +19925,7 @@ req_one_access = list(7) }, /obj/item/sticky_pad/random, -/obj/item/weapon/deskbell, +/obj/item/deskbell, /turf/simulated/floor/tiled, /area/surface/station/rnd/lab) "ntf" = ( @@ -19949,7 +19949,7 @@ "nuq" = ( /obj/structure/table/standard, /obj/random/medical/lite, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/item/bodybag/cryobag, /obj/machinery/requests_console{ department = "Engineering"; @@ -20327,7 +20327,7 @@ /turf/simulated/floor/tiled/white, /area/surface/station/medical/office) "nHy" = ( -/obj/item/device/radio/intercom/custom{ +/obj/item/radio/intercom/custom{ dir = 1; pixel_y = 21 }, @@ -20504,7 +20504,7 @@ dir = 4 }, /obj/machinery/shieldwallgen, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/machinery/alarm{ @@ -20517,7 +20517,7 @@ "nQN" = ( /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/powered/scrubber, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/effect/floor_decal/industrial/warning{ dir = 9 }, @@ -20583,10 +20583,10 @@ dir = 4 }, /obj/structure/table/steel, -/obj/item/device/communicator, -/obj/item/device/communicator, -/obj/item/device/radio/headset, -/obj/item/device/radio/headset, +/obj/item/communicator, +/obj/item/communicator, +/obj/item/radio/headset, +/obj/item/radio/headset, /turf/simulated/floor/tiled/techmaint, /area/surface/station/security/prison) "nUo" = ( @@ -20644,7 +20644,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; @@ -20746,7 +20746,7 @@ /area/surface/station/rnd/robotics) "odf" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 4; pixel_x = -21 }, @@ -20780,13 +20780,13 @@ /area/surface/station/engineering/hallway/snd) "ofN" = ( /obj/structure/table/steel, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/stamp/denied{ +/obj/item/folder/yellow, +/obj/item/stamp/denied{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/stamp/cargo, -/obj/item/weapon/deskbell, +/obj/item/stamp/cargo, +/obj/item/deskbell, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -20866,7 +20866,7 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled, @@ -21001,11 +21001,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/item/device/suit_cooling_unit{ +/obj/item/suit_cooling_unit{ pixel_x = 4; pixel_y = -2 }, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled, /area/surface/station/engineering/engine_eva) "onW" = ( @@ -21095,7 +21095,7 @@ dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/device/electronic_assembly/large, +/obj/item/electronic_assembly/large, /turf/simulated/floor/tiled/dark, /area/surface/station/rnd/workshop) "orU" = ( @@ -21147,8 +21147,8 @@ }, /obj/structure/table/standard, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high{ +/obj/item/cell/high, +/obj/item/cell/high{ pixel_y = -4 }, /obj/item/stack/cable_coil, @@ -21156,11 +21156,11 @@ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/radio/off, +/obj/item/radio/off, /obj/machinery/alarm{ dir = 4; pixel_x = -22 @@ -21200,7 +21200,7 @@ /area/surface/station/hallway/secondary/secondfloor/civilian) "oup" = ( /obj/structure/table/standard, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -21229,21 +21229,21 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/weapon/storage/fancy/vials{ +/obj/item/storage/fancy/vials{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/lockbox/vials, -/obj/item/weapon/reagent_containers/syringe/antiviral{ +/obj/item/storage/lockbox/vials, +/obj/item/reagent_containers/syringe/antiviral{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/syringe/antiviral{ +/obj/item/reagent_containers/syringe/antiviral{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral{ +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral{ pixel_x = 2; pixel_y = 2 }, @@ -21319,7 +21319,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/secondfloor/east) "oxI" = ( @@ -21433,7 +21433,7 @@ dir = 8 }, /obj/machinery/photocopier, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -21547,7 +21547,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -21579,7 +21579,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -21599,11 +21599,11 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 4 }, -/obj/item/weapon/paper_bin, -/obj/item/device/paicard, -/obj/item/device/tape/random, -/obj/item/device/taperecorder, -/obj/item/weapon/reagent_containers/food/drinks/jar, +/obj/item/paper_bin, +/obj/item/paicard, +/obj/item/tape/random, +/obj/item/taperecorder, +/obj/item/reagent_containers/food/drinks/jar, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -21975,17 +21975,17 @@ /area/surface/station/hallway/primary/secondfloor/east) "oVf" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/folder/blue_captain, -/obj/item/weapon/stamp/denied{ +/obj/item/folder/blue_captain, +/obj/item/stamp/denied{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/stamp/captain, -/obj/item/device/megaphone, +/obj/item/stamp/captain, +/obj/item/megaphone, /obj/structure/window/reinforced{ dir = 8 }, @@ -22078,11 +22078,11 @@ /area/surface/station/holodeck_control) "oZZ" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/accessory/stethoscope, @@ -22136,10 +22136,10 @@ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/folder/white_rd, -/obj/item/weapon/paper/monitorkey, -/obj/item/weapon/stamp/rd, -/obj/item/weapon/pen/multi, +/obj/item/folder/white_rd, +/obj/item/paper/monitorkey, +/obj/item/stamp/rd, +/obj/item/pen/multi, /obj/item/clothing/glasses/welding/superior, /turf/simulated/floor/tiled/white, /area/surface/station/crew_quarters/heads/rdoffice) @@ -22442,15 +22442,15 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/gun/projectile/colt/detective{ +/obj/item/gun/projectile/colt/detective{ pixel_x = 5; pixel_y = -4 }, -/obj/item/weapon/gun/projectile/colt/detective{ +/obj/item/gun/projectile/colt/detective{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/gun/projectile/colt/detective, +/obj/item/gun/projectile/colt/detective, /obj/machinery/door/window/brigdoor/westright{ name = "Weapons Locker"; req_access = list(2) @@ -22480,7 +22480,7 @@ /area/surface/station/medical/patient_wing) "pmw" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/captain) "pmL" = ( @@ -22945,8 +22945,8 @@ }, /obj/item/roller, /obj/item/bodybag/cryobag, -/obj/item/weapon/storage/firstaid, -/obj/item/weapon/storage/pill_bottle/spaceacillin, +/obj/item/storage/firstaid, +/obj/item/storage/pill_bottle/spaceacillin, /turf/simulated/floor/tiled, /area/surface/station/hallway/secondary/secondfloor/civilian) "pFH" = ( @@ -23228,7 +23228,7 @@ /area/surface/station/quartermaster/office) "pNl" = ( /obj/structure/table/steel, -/obj/item/weapon/stamp{ +/obj/item/stamp{ pixel_x = -3; pixel_y = 3 }, @@ -23238,8 +23238,8 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 6 }, -/obj/item/weapon/stamp/cargo, -/obj/item/weapon/hand_labeler, +/obj/item/stamp/cargo, +/obj/item/hand_labeler, /turf/simulated/floor/tiled, /area/surface/station/quartermaster/office) "pNA" = ( @@ -23378,7 +23378,7 @@ /obj/effect/floor_decal/corner/orange/border{ dir = 1 }, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/simulated/floor/tiled, /area/surface/station/security/prison) "pUx" = ( @@ -23402,15 +23402,15 @@ pixel_y = 10 }, /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/food/drinks/britcup{ pixel_x = 10; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/glass/bottle/eznutrient{ +/obj/item/reagent_containers/glass/bottle/eznutrient{ pixel_x = -6; pixel_y = 10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -23750,7 +23750,7 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/camera_assembly, +/obj/item/camera_assembly, /turf/simulated/floor/tiled/techmaint, /area/surface/station/construction/office) "qcG" = ( @@ -24016,11 +24016,11 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, /obj/item/clamp, /obj/item/clamp, /turf/simulated/floor/tiled/monotile, @@ -24143,8 +24143,8 @@ /obj/machinery/alarm{ pixel_y = 22 }, -/obj/item/weapon/soap/deluxe, -/obj/item/weapon/towel{ +/obj/item/soap/deluxe, +/obj/item/towel{ color = "#FFD700"; name = "gold towel" }, @@ -24229,7 +24229,7 @@ "qvp" = ( /obj/structure/closet/secure_closet/brig, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/device/radio/headset, +/obj/item/radio/headset, /obj/machinery/light{ dir = 1 }, @@ -24374,7 +24374,7 @@ /obj/effect/landmark/start{ name = "AI" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -24384,12 +24384,12 @@ name = "AI Chamber turret control"; pixel_x = -32 }, -/obj/item/device/radio/intercom/custom{ +/obj/item/radio/intercom/custom{ dir = 8; pixel_x = -21; pixel_y = 16 }, -/obj/item/device/radio/intercom/private{ +/obj/item/radio/intercom/private{ dir = 4; pixel_x = 21; pixel_y = 16 @@ -24416,8 +24416,8 @@ }, /obj/effect/catwalk_plated/dark, /obj/structure/table/standard, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit{ +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit{ pixel_x = 4; pixel_y = -2 }, @@ -24432,9 +24432,9 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/item/weapon/paper_bin, -/obj/item/device/megaphone, -/obj/item/device/radio/intercom{ +/obj/item/paper_bin, +/obj/item/megaphone, +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -24558,7 +24558,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; @@ -24789,8 +24789,8 @@ /obj/item/clothing/accessory/armor/armguards/riot, /obj/item/clothing/accessory/armor/armorplate/riot, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/melee/baton/loaded, +/obj/item/shield/riot, +/obj/item/melee/baton/loaded, /obj/machinery/door/window/brigdoor/southright{ name = "Riot Armor" }, @@ -24817,18 +24817,18 @@ /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, -/obj/item/weapon/storage/belt/utility/full{ +/obj/item/storage/belt/utility/full{ pixel_y = -1 }, /obj/item/clothing/gloves/sterile/latex{ pixel_y = -3 }, /obj/item/clothing/gloves/sterile/nitrile, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/effect/floor_decal/corner/purple/border{ dir = 5 }, @@ -25011,7 +25011,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_x = 32; pixel_y = 21 @@ -25074,7 +25074,7 @@ /obj/random/contraband, /obj/random/maintenance/clean, /obj/random/maintenance/clean, -/obj/item/weapon/handcuffs/fuzzy, +/obj/item/handcuffs/fuzzy, /turf/simulated/floor/plating, /area/surface/station/security/hallway/stairwell) "rbn" = ( @@ -25429,8 +25429,8 @@ }, /obj/structure/table/steel, /obj/structure/bedsheetbin, -/obj/item/weapon/book/codex/corp_regs, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/book/codex/corp_regs, +/obj/item/storage/pill_bottle/dice, /turf/simulated/floor/tiled, /area/surface/station/security/prison) "rqw" = ( @@ -25491,7 +25491,7 @@ dir = 4 }, /obj/item/clothing/mask/breath, -/obj/item/weapon/rig/breacher, +/obj/item/rig/breacher, /obj/machinery/door/window/northleft{ name = "EVA Suits"; req_one_access = list(18) @@ -25510,8 +25510,8 @@ /area/surface/station/maintenance/substation/command) "rvI" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/multi, +/obj/item/paper_bin, +/obj/item/pen/multi, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/captain) "rvR" = ( @@ -25523,8 +25523,8 @@ /area/surface/station/hallway/primary/secondfloor/west) "rwU" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/melee/chainofcommand, -/obj/item/weapon/hand_tele, +/obj/item/melee/chainofcommand, +/obj/item/hand_tele, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/captain) "rwZ" = ( @@ -25603,8 +25603,8 @@ dir = 4 }, /obj/structure/table/steel, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled/techmaint, /area/surface/station/security/prison) "rBN" = ( @@ -25729,17 +25729,17 @@ /area/surface/station/medical/virology) "rIC" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw, -/obj/item/weapon/surgical/scalpel{ +/obj/item/surgical/circular_saw, +/obj/item/surgical/scalpel{ pixel_y = 8 }, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/hemostat, +/obj/item/surgical/retractor, /obj/item/stack/cable_coil{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/weldingtool/hugetank, +/obj/item/weldingtool/hugetank, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -26201,8 +26201,8 @@ }, /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/oxygen, +/obj/item/suit_cooling_unit, +/obj/item/tank/oxygen, /obj/item/clothing/suit/space/void/security, /obj/item/clothing/head/helmet/space/void/security, /obj/machinery/door/window/brigdoor/southleft{ @@ -26596,7 +26596,7 @@ /turf/simulated/floor/tiled/eris, /area/surface/station/medical/virology) "slR" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/neutral, @@ -26755,9 +26755,9 @@ /area/surface/station/command/operations) "srz" = ( /obj/structure/table/steel, -/obj/item/device/radio/headset, -/obj/item/weapon/pen, -/obj/item/weapon/paper, +/obj/item/radio/headset, +/obj/item/pen, +/obj/item/paper, /obj/effect/floor_decal/borderfloorblack{ dir = 6 }, @@ -26778,7 +26778,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/machinery/light/small, @@ -26806,13 +26806,13 @@ "suc" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/weapon/pen/red{ +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/pen/red{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = -3 }, /turf/simulated/floor/carpet/blue, @@ -26961,10 +26961,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 10 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, -/obj/item/weapon/hand_labeler, +/obj/item/paper_bin, +/obj/item/folder/white, +/obj/item/pen, +/obj/item/hand_labeler, /obj/machinery/requests_console{ department = "Virology"; name = "Virology RC"; @@ -27247,7 +27247,7 @@ /area/surface/station/medical/exam_room) "sGK" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/surface/station/command/meeting_room) "sGX" = ( @@ -27351,12 +27351,12 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/device/flash{ +/obj/item/flash{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/flash, -/obj/item/device/aicard, +/obj/item/flash, +/obj/item/aicard, /turf/simulated/floor/tiled, /area/surface/station/command/operations) "sJK" = ( @@ -27470,7 +27470,7 @@ /obj/structure/bed/chair/office/dark{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -27496,7 +27496,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -27531,11 +27531,11 @@ pixel_x = 11; pixel_y = -23 }, -/obj/item/weapon/storage/fancy/vials{ +/obj/item/storage/fancy/vials{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/fancy/vials, +/obj/item/storage/fancy/vials, /obj/effect/floor_decal/steeldecal/steel_decals_central7, /turf/simulated/floor/tiled/white, /area/surface/station/crew_quarters/heads/cmo) @@ -27599,7 +27599,7 @@ "sQe" = ( /obj/machinery/atmospherics/valve, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -27873,8 +27873,8 @@ "sYf" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/soap/nanotrasen, +/obj/item/mop, +/obj/item/soap/nanotrasen, /obj/machinery/light/small{ dir = 8 }, @@ -27961,7 +27961,7 @@ layer = 2.4; name = "Floor mounted flash" }, -/obj/item/weapon/stool{ +/obj/item/stool{ dir = 1 }, /turf/simulated/floor/tiled/eris, @@ -28030,7 +28030,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/tiled, /area/surface/station/command/operations) "tfO" = ( @@ -28121,7 +28121,7 @@ /obj/effect/floor_decal/corner/yellow/bordercorner2{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -28280,7 +28280,7 @@ /turf/simulated/floor/tiled/techfloor, /area/surface/station/security/prison) "tnW" = ( -/obj/item/device/radio/intercom/private{ +/obj/item/radio/intercom/private{ dir = 1; pixel_y = 21 }, @@ -28325,7 +28325,7 @@ dir = 9 }, /obj/machinery/hologram/holopad, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 5; pixel_y = -26 }, @@ -28335,33 +28335,33 @@ /obj/structure/closet{ name = "robotics parts" }, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, -/obj/item/device/assembly/prox_sensor, -/obj/item/device/assembly/prox_sensor, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/cell/high, +/obj/item/cell/high, +/obj/item/cell/high, +/obj/item/cell/high, +/obj/item/assembly/prox_sensor, +/obj/item/assembly/prox_sensor, +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, /obj/item/stack/cable_coil{ pixel_x = 2; pixel_y = 2 @@ -28394,7 +28394,7 @@ /turf/simulated/floor/tiled/monotile, /area/surface/station/engineering/hallway/snd) "tsE" = ( -/obj/item/weapon/banner/blue, +/obj/item/banner/blue, /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/secondary/secondfloor/command) "tsY" = ( @@ -28580,11 +28580,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/effect/zone_divider, /turf/simulated/floor/carpet/blue, /area/surface/station/command/meeting_room) @@ -28623,7 +28623,7 @@ /obj/machinery/alarm{ pixel_y = 22 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -28674,7 +28674,7 @@ "twF" = ( /obj/structure/table/reinforced, /obj/machinery/light, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /obj/effect/floor_decal/borderfloor, @@ -28701,7 +28701,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -28923,18 +28923,18 @@ /area/surface/station/engineering/atmos) "tFr" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder, -/obj/item/weapon/folder/blue{ +/obj/item/paper_bin, +/obj/item/folder, +/obj/item/folder/blue{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = -2 }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/stamp/internalaffairs, -/obj/item/weapon/stamp/denied{ +/obj/item/folder/yellow, +/obj/item/stamp/internalaffairs, +/obj/item/stamp/denied{ pixel_x = 2; pixel_y = 2 }, @@ -29076,7 +29076,7 @@ /area/surface/station/security/hallway/snd) "tNg" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/machinery/alarm{ pixel_y = 22 }, @@ -29141,11 +29141,11 @@ pixel_x = -31; req_access = list(19) }, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /obj/item/roller, /obj/item/bodybag/cryobag, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/pill_bottle/spaceacillin, +/obj/item/storage/firstaid/regular, +/obj/item/storage/pill_bottle/spaceacillin, /turf/simulated/floor/tiled, /area/surface/station/command/operations) "tOU" = ( @@ -29291,14 +29291,14 @@ /area/surface/station/crew_quarters/heads/rdoffice) "tUS" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 5 }, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup, /turf/simulated/floor/tiled/white, /area/surface/station/medical/office) "tUU" = ( @@ -29531,7 +29531,7 @@ /area/surface/station/engineering/engine_eva) "ucJ" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/sleep/Dorm_4) "udq" = ( @@ -29928,10 +29928,10 @@ /obj/effect/floor_decal/corner/green/border{ dir = 1 }, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = 6 }, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = -4 }, /turf/simulated/floor/tiled/dark, @@ -29942,7 +29942,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /turf/simulated/floor/wood, /area/surface/station/command/liaison) "usA" = ( @@ -29986,18 +29986,18 @@ /area/surface/station/maintenance/substation/engineering/snd) "uvz" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/blue{ +/obj/item/paper_bin, +/obj/item/clipboard, +/obj/item/folder/blue{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/red{ +/obj/item/folder/blue, +/obj/item/folder/red{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/carpet/sblucarpet, /area/surface/station/medical/psych) "uvJ" = ( @@ -30404,8 +30404,8 @@ /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/book/manual/supermatter_engine, +/obj/item/storage/box/donkpockets, +/obj/item/book/manual/supermatter_engine, /turf/simulated/floor/tiled, /area/surface/station/engineering/reactor_monitoring) "uHy" = ( @@ -30735,12 +30735,12 @@ /area/surface/station/security/hallway/cell_hallway) "uUX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/storage/box/cups{ +/obj/item/soap/nanotrasen, +/obj/item/storage/box/cups{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 9 }, @@ -30861,7 +30861,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -30973,16 +30973,16 @@ /area/surface/station/ai_monitored/storage/eva) "vcd" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/design_disk{ +/obj/item/folder/white, +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk{ pixel_y = 2 }, -/obj/item/weapon/disk/design_disk{ +/obj/item/disk/design_disk{ pixel_y = -2 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/purple/border, /obj/machinery/light, @@ -31008,8 +31008,8 @@ /area/surface/station/security/armoury) "vdo" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/extinguisher, +/obj/item/storage/box/monkeycubes, +/obj/item/extinguisher, /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 8 }, @@ -31106,7 +31106,7 @@ /obj/machinery/recharger/wallcharger{ pixel_y = -28 }, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/floor/tiled/techmaint, /area/surface/station/security/armoury) "vfL" = ( @@ -31320,7 +31320,7 @@ dir = 10 }, /obj/structure/disposalpipe/segment, -/obj/item/weapon/stool{ +/obj/item/stool{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, @@ -31339,9 +31339,9 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/device/multitool, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/box/lights/mixed, +/obj/item/multitool, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/techmaint, /area/surface/station/command/operations) "vqg" = ( @@ -31402,7 +31402,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -31489,7 +31489,7 @@ /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/computer/security/telescreen/entertainment{ icon_state = "frame"; pixel_x = -32 @@ -31560,7 +31560,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -31654,11 +31654,11 @@ /area/surface/station/security/prison) "vGw" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ pixel_x = 4; pixel_y = 4 }, -/obj/item/device/radio/phone/medbay{ +/obj/item/radio/phone/medbay{ name = "Emergency Phone"; pixel_y = -6 }, @@ -31838,16 +31838,16 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/cartridge/quartermaster, -/obj/item/device/retail_scanner/cargo, +/obj/item/cartridge/quartermaster, +/obj/item/retail_scanner/cargo, /turf/simulated/floor/tiled, /area/surface/station/quartermaster/qm) "vKq" = ( @@ -31954,7 +31954,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -32073,12 +32073,12 @@ /area/surface/station/crew_quarters/sleep/Dorm_3) "vPF" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/red{ +/obj/item/paper_bin, +/obj/item/pen/red{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/pen/blue, +/obj/item/pen/blue, /turf/simulated/floor/wood, /area/surface/station/command/liaison) "vPY" = ( @@ -32103,8 +32103,8 @@ /obj/structure/table/standard, /obj/machinery/recharger, /obj/item/clothing/mask/breath/medical, -/obj/item/weapon/book/manual/robotics_cyborgs, -/obj/item/device/defib_kit/jumper_kit/loaded, +/obj/item/book/manual/robotics_cyborgs, +/obj/item/defib_kit/jumper_kit/loaded, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -32371,9 +32371,9 @@ /area/surface/station/quartermaster/restroom) "wfL" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/pen/blue, -/obj/item/weapon/pen/red{ +/obj/item/clipboard, +/obj/item/pen/blue, +/obj/item/pen/red{ pixel_x = -4; pixel_y = -4 }, @@ -32433,7 +32433,7 @@ }, /obj/machinery/hologram/holopad, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/monofloor, /area/surface/station/hallway/primary/secondfloor/west) "wiF" = ( @@ -32458,7 +32458,7 @@ icon_state = "1-2" }, /obj/machinery/computer/skills, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -32542,7 +32542,7 @@ /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/secondfloor/east) "wlU" = ( -/obj/item/weapon/banner/virgov, +/obj/item/banner/virgov, /turf/simulated/floor/wood, /area/surface/station/command/meeting_room) "wnk" = ( @@ -32743,7 +32743,7 @@ /area/shuttle/large_escape_pod2/station) "wsI" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/plating, /area/surface/station/security/riot_control) "wtg" = ( @@ -32777,7 +32777,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 1; pixel_y = -21 }, @@ -32936,12 +32936,12 @@ "wze" = ( /obj/structure/table/glass, /obj/structure/disposalpipe/segment, -/obj/item/weapon/paper_bin, -/obj/item/weapon/clipboard, -/obj/item/weapon/clipboard, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/clipboard, +/obj/item/clipboard, +/obj/item/pen, /obj/item/sticky_pad/random, -/obj/item/weapon/storage/firstaid, +/obj/item/storage/firstaid, /turf/simulated/floor/wood/sif, /area/surface/station/rnd/research) "wzs" = ( @@ -32973,7 +32973,7 @@ /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/captain) "wAE" = ( -/obj/item/weapon/banner/red, +/obj/item/banner/red, /turf/simulated/wall, /area/surface/station/construction/office) "wAT" = ( @@ -33165,39 +33165,39 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FF8C00"; name = "orange towel"; pixel_x = -3; pixel_y = -4 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FF8C00"; name = "orange towel"; pixel_x = -1; pixel_y = -2 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FFD700"; name = "gold towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FFD700"; name = "gold towel"; pixel_x = 1; pixel_y = 2 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#00FFFF"; name = "cyan towel"; pixel_x = 2; pixel_y = 4 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#00FFFF"; name = "cyan towel"; pixel_x = 3; @@ -33335,7 +33335,7 @@ /turf/simulated/floor/tiled/techfloor, /area/surface/station/engineering/reactor_room) "wJL" = ( -/obj/item/weapon/banner/nt, +/obj/item/banner/nt, /turf/simulated/floor/tiled/dark, /area/surface/station/hallway/primary/secondfloor/east) "wLt" = ( @@ -33664,7 +33664,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/surface/station/ai_monitored/storage/eva) "wXf" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -33781,7 +33781,7 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/machinery/light{ dir = 1 }, @@ -34012,7 +34012,7 @@ /area/surface/station/medical/office) "xgD" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/sleep/Dorm_5) "xgF" = ( @@ -34226,11 +34226,11 @@ /area/surface/station/quartermaster/office) "xmu" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, @@ -34240,30 +34240,30 @@ /obj/item/bodybag/cryobag{ pixel_x = 5 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/box/masks, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire{ layer = 2.9; pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = -2 }, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, /obj/machinery/light, /turf/simulated/shuttle/floor/white, /area/shuttle/large_escape_pod2/station) @@ -34278,7 +34278,7 @@ pixel_y = 26 }, /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/floor_decal/borderfloor/corner{ dir = 4 }, @@ -34657,7 +34657,7 @@ /area/surface/station/command/meeting_room) "xvn" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/sleep/Dorm_2) "xvK" = ( @@ -34780,7 +34780,7 @@ /area/surface/station/park/skybridge) "xzL" = ( /obj/effect/floor_decal/industrial/warning, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -34811,8 +34811,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/item/weapon/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/packageWrap, +/obj/item/hand_labeler, /obj/structure/noticeboard{ pixel_y = 30 }, @@ -35031,7 +35031,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/item/device/radio/headset, +/obj/item/radio/headset, /turf/simulated/floor/tiled/dark, /area/surface/station/security/hallway/cell_hallway) "xJA" = ( @@ -35088,10 +35088,10 @@ dir = 1 }, /obj/structure/closet/crate/nanotrasen, -/obj/item/weapon/tool/crowbar/red{ +/obj/item/tool/crowbar/red{ pixel_y = 2 }, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /turf/simulated/floor/tiled, /area/surface/station/command/teleporter) "xLg" = ( @@ -35150,7 +35150,7 @@ /obj/machinery/computer/supplycomp{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -35225,8 +35225,8 @@ dir = 1 }, /obj/structure/table/steel, -/obj/item/weapon/material/minihoe, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/material/minihoe, +/obj/item/analyzer/plant_analyzer, /obj/item/clothing/head/greenbandana, /turf/simulated/floor/tiled, /area/surface/station/security/prison) @@ -35283,7 +35283,7 @@ /turf/simulated/floor/tiled, /area/surface/station/security/hallway/snd) "xQF" = ( -/obj/item/weapon/banner/nt, +/obj/item/banner/nt, /turf/simulated/floor/tiled/dark, /area/surface/station/crew_quarters/captain) "xRp" = ( @@ -35491,7 +35491,7 @@ /turf/simulated/floor/plating, /area/surface/station/holodeck_control) "xWa" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -35686,7 +35686,7 @@ /area/surface/station/command/internalaffairs) "ycV" = ( /obj/machinery/mech_recharger, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -35700,7 +35700,7 @@ /turf/simulated/floor/tiled/white, /area/surface/station/crew_quarters/heads/rdoffice) "ydp" = ( -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 8; pixel_x = 21 }, @@ -35826,8 +35826,8 @@ /area/surface/station/hallway/primary/secondfloor/east) "ygI" = ( /obj/structure/table/glass, -/obj/item/weapon/cane, -/obj/item/weapon/cane{ +/obj/item/cane, +/obj/item/cane{ pixel_x = 4 }, /obj/random/medical, @@ -35838,7 +35838,7 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, @@ -35932,7 +35932,7 @@ /turf/simulated/floor/tiled/dark, /area/surface/station/hallway/secondary/secondfloor/dormhallway) "yka" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; @@ -36010,7 +36010,7 @@ /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/computer/security/telescreen/entertainment{ icon_state = "frame"; pixel_x = -32 @@ -36022,7 +36022,7 @@ /area/surface/station/medical/patient_b) "ymd" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/sleep/Dorm_3) diff --git a/maps/cynosure/cynosure-4.dmm b/maps/cynosure/cynosure-4.dmm index 7e604a109ba..ab1261fa2ee 100644 --- a/maps/cynosure/cynosure-4.dmm +++ b/maps/cynosure/cynosure-4.dmm @@ -172,7 +172,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/item/weapon/cell, +/obj/item/cell, /turf/simulated/floor/tiled/techmaint, /area/tcommsat/cynosure/teleporter) "cw" = ( @@ -226,7 +226,7 @@ }, /area/tcommsat/cynosure/chamber) "cM" = ( -/obj/item/weapon/camera_assembly, +/obj/item/camera_assembly, /turf/simulated/floor/tiled/techmaint, /area/tcommsat/cynosure/teleporter) "cN" = ( @@ -621,8 +621,8 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/transmitter, -/obj/item/weapon/stock_parts/subspace/transmitter{ +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter{ pixel_x = 2; pixel_y = 2 }, @@ -788,15 +788,15 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -21 }, /obj/structure/closet/crate/nanotrasen{ dir = 2 }, -/obj/item/device/aicard, -/obj/item/device/multitool, +/obj/item/aicard, +/obj/item/multitool, /turf/simulated/floor/tiled, /area/tcommsat/cynosure/teleporter) "jW" = ( @@ -806,7 +806,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -978,20 +978,20 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/sub_filter{ +/obj/item/stock_parts/subspace/sub_filter{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/stock_parts/subspace/sub_filter{ +/obj/item/stock_parts/subspace/sub_filter{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/stock_parts/subspace/sub_filter, -/obj/item/weapon/stock_parts/subspace/sub_filter{ +/obj/item/stock_parts/subspace/sub_filter, +/obj/item/stock_parts/subspace/sub_filter{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/stock_parts/subspace/sub_filter{ +/obj/item/stock_parts/subspace/sub_filter{ pixel_x = 4; pixel_y = -4 }, @@ -1038,9 +1038,9 @@ /obj/effect/floor_decal/corner/green/border{ dir = 9 }, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/structure/bed/padded, -/obj/item/weapon/material/twohanded/riding_crop, +/obj/item/material/twohanded/riding_crop, /turf/simulated/floor/tiled, /area/tcommsat/cynosure/lounge) "lT" = ( @@ -1420,35 +1420,35 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/manipulator{ +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator{ pixel_x = 3; pixel_y = -4 }, -/obj/item/weapon/stock_parts/manipulator{ +/obj/item/stock_parts/manipulator{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/stock_parts/manipulator{ +/obj/item/stock_parts/manipulator{ pixel_x = -3 }, -/obj/item/weapon/stock_parts/manipulator{ +/obj/item/stock_parts/manipulator{ pixel_x = -4; pixel_y = 3 }, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/micro_laser/high{ +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/micro_laser/high{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/stock_parts/micro_laser/high{ +/obj/item/stock_parts/micro_laser/high{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/stock_parts/micro_laser/high{ +/obj/item/stock_parts/micro_laser/high{ pixel_x = -2 }, -/obj/item/weapon/stock_parts/micro_laser/high{ +/obj/item/stock_parts/micro_laser/high{ pixel_x = -4; pixel_y = 4 }, @@ -1465,7 +1465,7 @@ dir = 1 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/tiled, /area/tcommsat/cynosure/lounge) "pZ" = ( @@ -1502,7 +1502,7 @@ pixel_y = 22 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /turf/simulated/floor/tiled, /area/tcommsat/cynosure/lounge) "qm" = ( @@ -1731,7 +1731,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -1845,7 +1845,7 @@ /obj/effect/floor_decal/rust/part_rusted1{ dir = 1 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/old_tile/gray, /area/tcommsat/cynosure/storage) "ug" = ( @@ -2118,12 +2118,12 @@ /area/tcommsat/cynosure/entrance) "xc" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue{ +/obj/item/paper_bin, +/obj/item/pen/blue{ pixel_x = -3; pixel_y = 2 }, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled/dark, /area/tcommsat/cynosure/computer) "xe" = ( @@ -2342,7 +2342,7 @@ name = "Emergency NanoMed"; pixel_x = -28 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -2354,7 +2354,7 @@ }, /obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/rust/mono_rusted3, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/techmaint, @@ -2498,7 +2498,7 @@ /obj/effect/floor_decal/corner/green/bordercorner{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/tiled/steel_dirty, @@ -2782,8 +2782,8 @@ dir = 8; pixel_x = 22 }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/folder/yellow{ +/obj/item/folder/yellow, +/obj/item/folder/yellow{ pixel_x = 2; pixel_y = 2 }, @@ -2960,7 +2960,7 @@ /obj/structure/bed/chair{ dir = 8 }, -/obj/item/weapon/storage/box/lights/mixed{ +/obj/item/storage/box/lights/mixed{ pixel_x = 2; pixel_y = 2 }, @@ -3020,12 +3020,12 @@ pixel_x = 22 }, /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/analyzer{ +/obj/item/stock_parts/subspace/analyzer{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/stock_parts/subspace/analyzer, -/obj/item/weapon/stock_parts/subspace/analyzer{ +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer{ pixel_x = 3; pixel_y = 2 }, @@ -3238,12 +3238,12 @@ dir = 10 }, /obj/structure/closet/crate/freezer/rations, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, /turf/simulated/floor/tiled, /area/tcommsat/cynosure/lounge) "Ju" = ( @@ -3635,7 +3635,7 @@ c_tag = "Tcoms - Solar Control"; dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -3699,16 +3699,16 @@ pixel_y = -24 }, /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/crystal{ +/obj/item/stock_parts/subspace/crystal{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/crystal{ +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal{ pixel_x = -4; pixel_y = 2 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 21 }, @@ -3842,7 +3842,7 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -3854,12 +3854,12 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/treatment{ +/obj/item/stock_parts/subspace/treatment{ pixel_x = 5; pixel_y = -2 }, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/treatment{ +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment{ pixel_x = -2; pixel_y = 4 }, @@ -4122,15 +4122,15 @@ /area/tcommsat/cynosure/teleporter) "Sn" = ( /obj/structure/table/rack, -/obj/item/weapon/circuitboard/telecomms/processor, -/obj/item/weapon/circuitboard/telecomms/processor, -/obj/item/weapon/circuitboard/telecomms/receiver, -/obj/item/weapon/circuitboard/telecomms/server, -/obj/item/weapon/circuitboard/telecomms/server, -/obj/item/weapon/circuitboard/telecomms/bus, -/obj/item/weapon/circuitboard/telecomms/bus, -/obj/item/weapon/circuitboard/telecomms/broadcaster, -/obj/item/weapon/circuitboard/telecomms/exonet_node, +/obj/item/circuitboard/telecomms/processor, +/obj/item/circuitboard/telecomms/processor, +/obj/item/circuitboard/telecomms/receiver, +/obj/item/circuitboard/telecomms/server, +/obj/item/circuitboard/telecomms/server, +/obj/item/circuitboard/telecomms/bus, +/obj/item/circuitboard/telecomms/bus, +/obj/item/circuitboard/telecomms/broadcaster, +/obj/item/circuitboard/telecomms/exonet_node, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 1 @@ -4443,12 +4443,12 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/ansible{ +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/subspace/ansible{ +/obj/item/stock_parts/subspace/ansible{ pixel_x = -3; pixel_y = -3 }, @@ -4556,11 +4556,11 @@ dir = 1; pixel_y = -24 }, -/obj/item/weapon/deck/cah/black{ +/obj/item/deck/cah/black{ pixel_x = -4; pixel_y = 6 }, -/obj/item/weapon/deck/cah{ +/obj/item/deck/cah{ pixel_x = -3; pixel_y = 3 }, @@ -4613,12 +4613,12 @@ icon_state = "2-8" }, /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/amplifier{ +/obj/item/stock_parts/subspace/amplifier{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/amplifier{ +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier{ pixel_x = -2; pixel_y = 3 }, @@ -4751,7 +4751,7 @@ dir = 1 }, /obj/effect/floor_decal/rust/steel_decals_rusted1, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, diff --git a/maps/cynosure/cynosure-6.dmm b/maps/cynosure/cynosure-6.dmm index 0105ffc05d3..cbea0191ab4 100644 --- a/maps/cynosure/cynosure-6.dmm +++ b/maps/cynosure/cynosure-6.dmm @@ -111,25 +111,25 @@ dir = 4 }, /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = -4 }, @@ -149,14 +149,14 @@ /area/centcom/terminal) "agp" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/coin/diamond, +/obj/item/coin/diamond, /turf/unsimulated/floor{ icon_state = "dark" }, /area/wizard_station) "ahv" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/glasses/square, +/obj/item/storage/box/glasses/square, /turf/simulated/floor/carpet, /area/shuttle/merchant/home) "aiB" = ( @@ -186,7 +186,7 @@ /area/centcom/medical) "ajd" = ( /obj/structure/table/reinforced, -/obj/item/device/pda/captain, +/obj/item/pda/captain, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -200,18 +200,18 @@ /area/skipjack_station) "ajm" = ( /obj/structure/table/rack, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -279,9 +279,9 @@ /area/skipjack_station) "amo" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 8 @@ -312,21 +312,21 @@ /area/skipjack_station/start) "ano" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency{ pixel_x = -3; pixel_y = -3 }, @@ -351,7 +351,7 @@ /area/holodeck/source_picnicarea) "aoo" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -401,7 +401,7 @@ /area/skipjack_station/start) "aqF" = ( /obj/structure/table/steel, -/obj/item/device/pda/syndicate, +/obj/item/pda/syndicate, /turf/unsimulated/floor{ icon_state = "cult"; name = "plating" @@ -444,10 +444,10 @@ /area/holodeck/source_picnicarea) "atC" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -475,8 +475,8 @@ /area/shuttle/merchant/home) "avo" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/hand_tele, +/obj/item/gun/energy/gun/nuclear, +/obj/item/hand_tele, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -508,7 +508,7 @@ /area/centcom/terminal) "awt" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/plasmastun, +/obj/item/gun/energy/plasmastun, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -572,12 +572,12 @@ /area/syndicate_station/start) "aAv" = ( /obj/structure/table/rack, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, /obj/structure/window/reinforced{ dir = 8 }, @@ -591,35 +591,35 @@ /area/centcom/specops) "aBg" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/backpack/security, +/obj/item/storage/backpack/security, /obj/item/clothing/under/syndicate/combat, /obj/item/clothing/shoes/galoshes, /obj/item/clothing/head/bio_hood/janitor, /obj/item/clothing/suit/bio_suit/janitor, /obj/item/clothing/gloves/purple, /obj/item/clothing/glasses/science, -/obj/item/weapon/storage/backpack/security, +/obj/item/storage/backpack/security, /obj/item/clothing/under/syndicate/combat, /obj/item/clothing/shoes/galoshes, /obj/item/clothing/head/bio_hood/janitor, /obj/item/clothing/suit/bio_suit/janitor, /obj/item/clothing/gloves/purple, /obj/item/clothing/glasses/science, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ pixel_x = 6; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ pixel_x = 6; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/spray/plantbgone, -/obj/item/weapon/reagent_containers/spray/plantbgone, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/reagent_containers/spray/plantbgone, +/obj/item/reagent_containers/spray/plantbgone, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -628,7 +628,7 @@ "aBE" = ( /obj/structure/table/reinforced, /obj/machinery/chemical_dispenser/ert, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -717,7 +717,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /turf/unsimulated/floor{ icon_state = "carpet" }, @@ -769,17 +769,17 @@ /turf/unsimulated/wall, /area/syndicate_mothership/elite_squad) "aPx" = ( -/obj/item/weapon/circuitboard/aiupload, -/obj/item/weapon/circuitboard/borgupload, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/aiModule/nanotrasen, -/obj/item/weapon/aiModule/reset, -/obj/item/weapon/aiModule/freeformcore, -/obj/item/weapon/aiModule/protectStation, -/obj/item/weapon/aiModule/quarantine, -/obj/item/weapon/aiModule/paladin, -/obj/item/weapon/aiModule/robocop, -/obj/item/weapon/aiModule/safeguard, +/obj/item/circuitboard/aiupload, +/obj/item/circuitboard/borgupload, +/obj/item/circuitboard/smes, +/obj/item/aiModule/nanotrasen, +/obj/item/aiModule/reset, +/obj/item/aiModule/freeformcore, +/obj/item/aiModule/protectStation, +/obj/item/aiModule/quarantine, +/obj/item/aiModule/paladin, +/obj/item/aiModule/robocop, +/obj/item/aiModule/safeguard, /obj/structure/table/steel_reinforced, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; @@ -787,7 +787,7 @@ }, /area/centcom/specops) "aPN" = ( -/obj/item/weapon/mop, +/obj/item/mop, /obj/structure/mopbucket, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; @@ -891,7 +891,7 @@ /area/centcom/bar) "aVM" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/glass/bucket{ amount_per_transfer_from_this = 50 }, /turf/unsimulated/floor{ @@ -934,7 +934,7 @@ /area/centcom/command) "aZW" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "bbv" = ( @@ -975,7 +975,7 @@ /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) "bcf" = ( -/obj/item/weapon/reagent_containers/food/condiment/small/peppershaker{ +/obj/item/reagent_containers/food/condiment/small/peppershaker{ pixel_x = 2; pixel_y = 6 }, @@ -997,7 +997,7 @@ /area/skipjack_station) "bcB" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert, +/obj/item/rig/ert, /obj/item/clothing/accessory/storage/black_vest, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; @@ -1027,7 +1027,7 @@ dir = 10 }, /obj/structure/table/standard, -/obj/item/weapon/melee/classic_baton, +/obj/item/melee/classic_baton, /turf/unsimulated/floor{ icon_state = "carpet" }, @@ -1071,7 +1071,7 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/tech_supply, -/obj/item/weapon/weldpack, +/obj/item/weldpack, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "bhJ" = ( @@ -1079,7 +1079,7 @@ /area/ninja_dojo/start) "bii" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/material/sword/katana, +/obj/item/material/sword/katana, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -1095,7 +1095,7 @@ /area/shuttle/arrival/pre_game) "biP" = ( /obj/structure/undies_wardrobe, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; dir = 4; frequency = 1213; @@ -1116,10 +1116,10 @@ /area/holodeck/source_boxingcourt) "bkx" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/flash, +/obj/item/flash, /obj/item/clothing/accessory/storage/brown_vest, /obj/item/clothing/accessory/storage/brown_vest, /obj/item/clothing/accessory/storage/brown_vest, @@ -1166,7 +1166,7 @@ /area/wizard_station) "bmR" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/rocket, +/obj/item/gun/launcher/rocket, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1250,13 +1250,13 @@ /area/centcom/security) "bpf" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/coin/uranium, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/platinum, -/obj/item/weapon/coin/phoron, -/obj/item/weapon/coin/iron, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/diamond, +/obj/item/coin/uranium, +/obj/item/coin/silver, +/obj/item/coin/platinum, +/obj/item/coin/phoron, +/obj/item/coin/iron, +/obj/item/coin/gold, +/obj/item/coin/diamond, /obj/structure/window/reinforced, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) @@ -1288,7 +1288,7 @@ /area/ninja_dojo/dojo) "brr" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -1342,8 +1342,8 @@ /area/syndicate_station/start) "bvG" = ( /obj/structure/table/rack, -/obj/item/device/lightreplacer, -/obj/item/device/lightreplacer, +/obj/item/lightreplacer, +/obj/item/lightreplacer, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -1398,8 +1398,8 @@ /area/shuttle/merchant/home) "bzH" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/weapon/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1410,7 +1410,7 @@ /area/holodeck/source_courtroom) "bAM" = ( /obj/structure/table/rack, -/obj/item/weapon/melee/energy/sword, +/obj/item/melee/energy/sword, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1506,7 +1506,7 @@ /area/wizard_station) "bDm" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/l6_saw, +/obj/item/gun/projectile/automatic/l6_saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, @@ -1517,10 +1517,10 @@ /area/centcom/specops) "bDr" = ( /obj/structure/table/rack, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1596,7 +1596,7 @@ /area/centcom/evac) "bLe" = ( /obj/structure/table/reinforced, -/obj/item/weapon/card/id/gold/captain/spare, +/obj/item/card/id/gold/captain/spare, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -1660,12 +1660,12 @@ /area/shuttle/arrival/pre_game) "bQE" = ( /obj/structure/table/rack, -/obj/item/weapon/melee/energy/sword/pirate, +/obj/item/melee/energy/sword/pirate, /obj/item/clothing/suit/space/pirate, /obj/item/clothing/suit/space/pirate, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/pinpointer/shuttle/heist, -/obj/item/weapon/pinpointer/shuttle/heist, +/obj/item/tank/oxygen, +/obj/item/pinpointer/shuttle/heist, +/obj/item/pinpointer/shuttle/heist, /turf/simulated/shuttle/floor/darkred, /area/skipjack_station/start) "bSm" = ( @@ -1687,8 +1687,8 @@ /area/centcom/medical) "bTo" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1699,8 +1699,8 @@ /obj/item/ammo_magazine/m9mmp90, /obj/item/ammo_magazine/m9mmp90, /obj/item/ammo_magazine/m9mmp90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1739,15 +1739,15 @@ /area/centcom/main_hall) "bVT" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/xray, -/obj/item/weapon/gun/energy/xray, +/obj/item/gun/energy/xray, +/obj/item/gun/energy/xray, /turf/unsimulated/floor{ icon_state = "dark" }, /area/centcom/specops) "bWN" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /obj/structure/sign/poster{ pixel_y = -32 }, @@ -1755,7 +1755,7 @@ /area/shuttle/merchant/home) "bXa" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -1796,7 +1796,7 @@ }, /area/wizard_station) "bXZ" = ( -/obj/item/weapon/ore, +/obj/item/ore, /obj/structure/reagent_dispensers/beerkeg, /turf/unsimulated/floor{ icon_state = "white" @@ -1856,8 +1856,8 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 10 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass, -/obj/item/weapon/reagent_containers/glass/bottle/biomass, +/obj/item/reagent_containers/glass/bottle/biomass, +/obj/item/reagent_containers/glass/bottle/biomass, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "white" @@ -1902,17 +1902,17 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/item/device/kit/paint/ripley/death, -/obj/item/device/kit/paint/ripley/flames_blue, -/obj/item/device/kit/paint/ripley/flames_red, -/obj/item/device/kit/paint/ripley, +/obj/item/kit/paint/ripley/death, +/obj/item/kit/paint/ripley/flames_blue, +/obj/item/kit/paint/ripley/flames_red, +/obj/item/kit/paint/ripley, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "cfm" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, /obj/structure/window/reinforced{ dir = 8 }, @@ -1944,7 +1944,7 @@ /area/skipjack_station) "chb" = ( /obj/structure/table/glass, -/obj/item/weapon/book/codex/lore/vir, +/obj/item/book/codex/lore/vir, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "steel" @@ -1975,8 +1975,8 @@ "ciy" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -1996,11 +1996,11 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -2039,7 +2039,7 @@ /obj/structure/table/rack, /obj/item/clothing/under/color/green, /obj/item/clothing/shoes/brown, -/obj/item/weapon/melee/energy/axe, +/obj/item/melee/energy/axe, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -2067,8 +2067,8 @@ /turf/unsimulated/ai_visible, /area/ai_multicam_room) "cpa" = ( -/obj/item/weapon/tool/wrench, -/obj/item/weapon/mop, +/obj/item/tool/wrench, +/obj/item/mop, /turf/simulated/shuttle/plating, /area/skipjack_station/start) "cqR" = ( @@ -2101,8 +2101,8 @@ /area/centcom/main_hall) "csP" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags{ pixel_x = 2; pixel_y = 2 }, @@ -2119,24 +2119,24 @@ /area/centcom/medical) "csT" = ( /obj/structure/table/rack, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, /turf/unsimulated/floor{ icon_state = "dark" }, /area/syndicate_station) "csV" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -2219,7 +2219,7 @@ /obj/machinery/computer/station_alert/all{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; dir = 4; frequency = 1213; @@ -2293,8 +2293,8 @@ "cBj" = ( /obj/machinery/light, /obj/structure/table/standard, -/obj/item/weapon/soap, -/obj/item/weapon/towel{ +/obj/item/soap, +/obj/item/towel{ color = "#0000FF" }, /turf/simulated/shuttle/floor/black, @@ -2310,7 +2310,7 @@ /area/wizard_station) "cDm" = ( /obj/structure/table/standard, -/obj/item/weapon/book/codex/corp_regs, +/obj/item/book/codex/corp_regs, /turf/simulated/shuttle/floor/white, /area/shuttle/arrival/pre_game) "cDr" = ( @@ -2347,12 +2347,12 @@ /area/holodeck/source_chess) "cIv" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -2438,19 +2438,19 @@ /area/centcom/bar) "cNF" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/smokes, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/smokes, /turf/unsimulated/floor{ icon_state = "dark" }, /area/syndicate_station) "cOd" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/unsimulated/floor{ icon_state = "steel" }, @@ -2460,7 +2460,7 @@ /obj/item/clothing/suit/wizrobe/red, /obj/item/clothing/shoes/sandal, /obj/item/clothing/head/wizard/red, -/obj/item/weapon/staff, +/obj/item/staff, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -2496,7 +2496,7 @@ "cRp" = ( /obj/structure/table/marble, /obj/effect/floor_decal/corner/white/diagonal, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "steel" @@ -2645,7 +2645,7 @@ }, /area/centcom/specops) "dfg" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 1; dir = 1; frequency = 1213; @@ -2672,7 +2672,7 @@ }, /area/centcom/terminal) "dgH" = ( -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/unsimulated/floor{ icon_state = "freezerfloor" }, @@ -2712,11 +2712,11 @@ /area/syndicate_mothership/elite_squad) "dif" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /turf/unsimulated/floor{ icon_state = "white" }, @@ -2728,7 +2728,7 @@ /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) "dja" = ( -/obj/item/weapon/storage/box, +/obj/item/storage/box, /turf/unsimulated/floor{ icon_state = "asteroid" }, @@ -2793,7 +2793,7 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/tdome/green, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/melee/baton/loaded, +/obj/item/melee/baton/loaded, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -2801,7 +2801,7 @@ /area/tdome/tdome1) "dns" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/item/weapon/tank/nitrogen, +/obj/item/tank/nitrogen, /turf/simulated/shuttle/plating, /area/skipjack_station/start) "dnS" = ( @@ -2885,7 +2885,7 @@ /area/skipjack_station/start) "dsW" = ( /obj/structure/table/steel, -/obj/item/device/radio/uplink, +/obj/item/radio/uplink, /turf/unsimulated/floor{ icon_state = "cult"; name = "plating" @@ -2911,8 +2911,8 @@ /area/skipjack_station) "duO" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/syndie_kit/chameleon, -/obj/item/weapon/storage/box/syndie_kit/clerical, +/obj/item/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/clerical, /turf/unsimulated/floor{ icon_state = "steel" }, @@ -2994,8 +2994,8 @@ /area/centcom/medical) "dzV" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/book/manual/engineering_hacking, -/obj/item/device/radio/intercom{ +/obj/item/book/manual/engineering_hacking, +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; dir = 4; frequency = 1213; @@ -3021,7 +3021,7 @@ }, /area/shuttle/trade) "dAU" = ( -/obj/item/weapon/reagent_containers/food/snacks/spellburger{ +/obj/item/reagent_containers/food/snacks/spellburger{ pixel_y = 8 }, /obj/structure/table/marble, @@ -3105,7 +3105,7 @@ /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; @@ -3153,7 +3153,7 @@ /obj/item/clothing/under/gentlesuit, /obj/item/clothing/suit/wizrobe/gentlecoat, /obj/item/clothing/head/wizard/cap, -/obj/item/weapon/staff/gentcane, +/obj/item/staff/gentcane, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -3161,18 +3161,18 @@ /area/wizard_station) "dHt" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -3192,12 +3192,12 @@ /area/shuttle/large_escape_pod2/transit) "dIT" = ( /obj/structure/table/rack, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -3246,7 +3246,7 @@ /area/holodeck/source_chess) "dLk" = ( /obj/structure/table/standard, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /turf/simulated/shuttle/floor/black, /area/skipjack_station/start) "dOl" = ( @@ -3286,10 +3286,10 @@ name = "O- Blood Locker"; pixel_x = 32 }, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "white" @@ -3311,12 +3311,12 @@ dir = 4 }, /obj/structure/window/reinforced, -/obj/item/weapon/rig/ert/medical{ +/obj/item/rig/ert/medical{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical{ +/obj/item/rig/ert/medical, +/obj/item/rig/ert/medical{ pixel_x = -2; pixel_y = -2 }, @@ -3340,7 +3340,7 @@ /area/centcom/specops) "dTY" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, @@ -3447,8 +3447,8 @@ /area/tdome/tdomeobserve) "ebS" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, @@ -3474,18 +3474,18 @@ /obj/item/taperoll/police, /obj/item/taperoll/police, /obj/item/taperoll/police, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -3493,7 +3493,7 @@ /area/centcom/specops) "ecz" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/unsimulated/floor{ icon_state = "lino" }, @@ -3509,8 +3509,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/gun/launcher/grenade, -/obj/item/weapon/gun/launcher/grenade, +/obj/item/gun/launcher/grenade, +/obj/item/gun/launcher/grenade, /obj/structure/window/reinforced, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; @@ -3583,7 +3583,7 @@ /area/syndicate_mothership/elite_squad) "eid" = ( /obj/structure/table/standard, -/obj/item/device/paicard, +/obj/item/paicard, /turf/unsimulated/floor{ icon_state = "steel" }, @@ -3613,7 +3613,7 @@ /area/shuttle/response_ship/start) "enr" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/shuttle/plating, /area/centcom/evac) "eoa" = ( @@ -3665,7 +3665,7 @@ /area/holodeck/source_theatre) "epa" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/codex/corp_regs, +/obj/item/book/codex/corp_regs, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -3682,7 +3682,7 @@ /area/skipjack_station/start) "epV" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/book/manual/robotics_cyborgs, +/obj/item/book/manual/robotics_cyborgs, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -3691,15 +3691,15 @@ "epY" = ( /obj/structure/closet/chefcloset, /obj/item/glass_jar, -/obj/item/device/retail_scanner/civilian, -/obj/item/weapon/soap/nanotrasen, -/obj/item/device/destTagger{ +/obj/item/retail_scanner/civilian, +/obj/item/soap/nanotrasen, +/obj/item/destTagger{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, /obj/effect/floor_decal/corner/white/diagonal, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; @@ -3747,7 +3747,7 @@ }, /area/syndicate_mothership/elite_squad) "esB" = ( -/obj/item/weapon/gun/launcher/crossbow, +/obj/item/gun/launcher/crossbow, /turf/unsimulated/floor{ icon_state = "plating"; name = "plating" @@ -3775,11 +3775,11 @@ /area/centcom/bar) "etC" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/cautery, -/obj/item/weapon/surgical/retractor, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/surgical/cautery, +/obj/item/surgical/retractor, +/obj/item/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/syringe, /turf/simulated/shuttle/floor/white, /area/skipjack_station/start) "eup" = ( @@ -3837,7 +3837,7 @@ /obj/structure/table/rack, /obj/item/clothing/under/color/red, /obj/item/clothing/shoes/brown, -/obj/item/weapon/melee/energy/axe, +/obj/item/melee/energy/axe, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -3845,7 +3845,7 @@ /area/tdome/tdome2) "evy" = ( /obj/machinery/chem_master, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -4062,12 +4062,12 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/storage/backpack/ert/engineer{ +/obj/item/storage/backpack/ert/engineer{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer{ +/obj/item/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer{ pixel_x = 2; pixel_y = 2 }, @@ -4217,10 +4217,10 @@ /area/centcom/suppy) "eWA" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/potato, +/obj/item/cell/high, +/obj/item/cell/high, +/obj/item/cell/hyper, +/obj/item/cell/potato, /obj/structure/window/reinforced, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) @@ -4280,11 +4280,11 @@ /area/centcom/specops) "eXR" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/secure/briefcase, -/obj/item/weapon/storage/fancy/cigarettes, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/backpack/satchel, +/obj/item/storage/secure/briefcase, +/obj/item/storage/fancy/cigarettes, +/obj/item/flame/lighter/zippo, +/obj/item/storage/belt/utility, +/obj/item/storage/backpack/satchel, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -4368,9 +4368,9 @@ /area/holodeck/source_basketball) "fdj" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/emps{ +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/emps{ pixel_x = 4; pixel_y = 4 }, @@ -4380,9 +4380,9 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/storage/box/frags, -/obj/item/weapon/storage/box/smokes, -/obj/item/weapon/storage/box/smokes, +/obj/item/storage/box/frags, +/obj/item/storage/box/smokes, +/obj/item/storage/box/smokes, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -4390,13 +4390,13 @@ /area/centcom/specops) "fdn" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/material/knife/ritual, +/obj/item/material/knife/ritual, /turf/unsimulated/floor{ icon_state = "dark" }, /area/wizard_station) "feX" = ( -/obj/item/weapon/bedsheet/rd, +/obj/item/bedsheet/rd, /obj/structure/bed/padded, /turf/simulated/shuttle/floor/red, /area/skipjack_station/start) @@ -4451,9 +4451,9 @@ /area/shuttle/syndicate_elite/mothership) "fhd" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/wt550, -/obj/item/weapon/gun/projectile/automatic/wt550, -/obj/item/weapon/gun/projectile/automatic/wt550, +/obj/item/gun/projectile/automatic/wt550, +/obj/item/gun/projectile/automatic/wt550, +/obj/item/gun/projectile/automatic/wt550, /obj/structure/window/reinforced{ dir = 1 }, @@ -4478,8 +4478,8 @@ "fjf" = ( /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, +/obj/item/cell/high, +/obj/item/cell/high, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -4506,18 +4506,18 @@ /area/centcom/main_hall) "fkj" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = 32 }, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /turf/unsimulated/floor{ icon_state = "dark" }, /area/syndicate_station) "fkt" = ( -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/machinery/light/small{ dir = 4 }, @@ -4581,7 +4581,7 @@ /area/holodeck/source_emptycourt) "fnh" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/teapot, +/obj/item/reagent_containers/food/drinks/teapot, /turf/simulated/floor/tiled/white, /area/centcom/bar) "fnp" = ( @@ -4638,11 +4638,11 @@ /area/holodeck/source_theatre) "fok" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/flame/lighter/zippo, +/obj/item/storage/fancy/cigarettes, /turf/unsimulated/floor{ icon_state = "lino" }, @@ -4724,8 +4724,8 @@ /area/shuttle/arrival/pre_game) "fvA" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/shotgunammo/large, -/obj/item/weapon/storage/box/stunshells/large, +/obj/item/storage/box/shotgunammo/large, +/obj/item/storage/box/stunshells/large, /turf/unsimulated/floor{ icon_state = "steel" }, @@ -4734,9 +4734,9 @@ /obj/structure/closet{ name = "custodial" }, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/shuttle/floor/voidcraft/dark, /area/syndicate_station/start) "fwt" = ( @@ -4853,8 +4853,8 @@ /area/centcom/medical) "fCz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/shield_diffuser, -/obj/item/weapon/shield_diffuser, +/obj/item/shield_diffuser, +/obj/item/shield_diffuser, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -4928,8 +4928,8 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/weapon/shield_diffuser, -/obj/item/weapon/shield_diffuser, +/obj/item/shield_diffuser, +/obj/item/shield_diffuser, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -4964,7 +4964,7 @@ /area/centcom/medical) "fHE" = ( /obj/machinery/computer/card/centcom, -/obj/item/weapon/card/id/centcom, +/obj/item/card/id/centcom, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -5291,7 +5291,7 @@ /area/syndicate_station) "gaf" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/syndicate{ +/obj/item/storage/toolbox/syndicate{ pixel_x = -1; pixel_y = 3 }, @@ -5319,7 +5319,7 @@ }, /area/centcom/command) "gbs" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; dir = 4; frequency = 1213; @@ -5339,9 +5339,9 @@ /area/skipjack_station/start) "gcn" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/tool/screwdriver, +/obj/item/tool/wrench, /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/recharger/wallcharger{ pixel_x = 4; @@ -5376,7 +5376,7 @@ /area/centcom/bar) "gfU" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/structure/curtain/open/privacy, @@ -5486,7 +5486,7 @@ }, /area/tdome/tdome1) "gme" = ( -/obj/item/weapon/bedsheet/rainbow, +/obj/item/bedsheet/rainbow, /obj/structure/bed/padded, /turf/simulated/shuttle/floor/red, /area/skipjack_station/start) @@ -5512,7 +5512,7 @@ /obj/item/clothing/head/helmet/thunderdome, /obj/item/clothing/under/color/green, /obj/item/clothing/suit/armor/tdome/green, -/obj/item/weapon/holo/esword/green, +/obj/item/holo/esword/green, /obj/effect/floor_decal/corner/green{ dir = 5 }, @@ -5524,16 +5524,16 @@ }, /area/shuttle/response_ship/start) "gnL" = ( -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, /obj/structure/table/standard, /turf/unsimulated/floor{ icon_state = "lino" @@ -5577,10 +5577,10 @@ /obj/structure/table/standard, /obj/random/soap, /obj/random/soap, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor, /area/centcom/evac) "gqi" = ( @@ -5600,8 +5600,8 @@ /area/holodeck/source_wildlife) "grd" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/fancy/cigarettes, -/obj/item/weapon/flame/lighter/zippo, +/obj/item/storage/fancy/cigarettes, +/obj/item/flame/lighter/zippo, /obj/item/clothing/gloves/yellow, /obj/item/stack/material/steel{ amount = 50 @@ -5609,7 +5609,7 @@ /obj/item/stack/material/glass{ amount = 50 }, -/obj/item/weapon/card/emag, +/obj/item/card/emag, /turf/simulated/shuttle/plating, /area/skipjack_station/start) "grn" = ( @@ -5630,7 +5630,7 @@ /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) "guR" = ( -/obj/item/device/radio/intercom/specops{ +/obj/item/radio/intercom/specops{ pixel_y = -21 }, /turf/simulated/shuttle/floor/red, @@ -5792,11 +5792,11 @@ /area/centcom/main_hall) "gFN" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, /turf/simulated/shuttle/floor/voidcraft/dark, /area/ninja_dojo/start) "gFO" = ( @@ -5859,10 +5859,10 @@ /area/centcom/bar) "gJo" = ( /obj/structure/table/reinforced, -/obj/item/device/defib_kit/loaded{ +/obj/item/defib_kit/loaded{ pixel_y = 2 }, -/obj/item/device/defib_kit/loaded{ +/obj/item/defib_kit/loaded{ pixel_y = -2 }, /turf/simulated/shuttle/floor/white, @@ -5870,7 +5870,7 @@ "gJJ" = ( /obj/item/mecha_parts/mecha_equipment/tool/extinguisher, /obj/item/mecha_parts/mecha_equipment/tool/rcd, -/obj/item/weapon/pickaxe/diamonddrill, +/obj/item/pickaxe/diamonddrill, /obj/structure/table/steel_reinforced, /turf/unsimulated/floor{ icon_state = "plating"; @@ -5886,12 +5886,12 @@ dir = 4 }, /obj/structure/table/rack, -/obj/item/weapon/rig/ert/security{ +/obj/item/rig/ert/security{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security{ +/obj/item/rig/ert/security, +/obj/item/rig/ert/security{ pixel_x = 2; pixel_y = 2 }, @@ -5906,15 +5906,15 @@ /area/holodeck/source_snowfield) "gKQ" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/surgical/surgicaldrill, +/obj/item/autopsy_scanner, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/surgical/FixOVein, +/obj/item/surgical/FixOVein, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, @@ -5933,7 +5933,7 @@ /area/centcom/evac) "gLT" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -6040,7 +6040,7 @@ /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/merchant/home) "gTz" = ( -/obj/item/device/camera{ +/obj/item/camera{ desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; @@ -6077,7 +6077,7 @@ /obj/structure/flora/pottedplant{ icon_state = "plant-03" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; dir = 8; frequency = 1213; @@ -6129,12 +6129,12 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical{ +/obj/item/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/backpack/ert/medical{ +/obj/item/storage/backpack/ert/medical{ pixel_x = -4; pixel_y = -4 }, @@ -6243,11 +6243,11 @@ /area/shuttle/syndicate_elite/mothership) "hhv" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw{ +/obj/item/surgical/circular_saw{ pixel_y = 8 }, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/hemostat, +/obj/item/surgical/scalpel, /obj/item/stack/medical/advanced/bruise_pack, /turf/simulated/shuttle/floor/white, /area/skipjack_station/start) @@ -6266,7 +6266,7 @@ /area/centcom/evac) "hiU" = ( /obj/structure/table/standard, -/obj/item/weapon/handcuffs/legcuffs, +/obj/item/handcuffs/legcuffs, /turf/simulated/shuttle/floor/black, /area/skipjack_station/start) "hjb" = ( @@ -6283,7 +6283,7 @@ }, /area/centcom/bar) "hkb" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; @@ -6551,7 +6551,7 @@ /obj/structure/table/rack, /obj/item/clothing/suit/armor/vest/ert/command, /obj/item/clothing/head/helmet/ert/command, -/obj/item/weapon/storage/backpack/ert/commander, +/obj/item/storage/backpack/ert/commander, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -6649,7 +6649,7 @@ }, /area/ninja_dojo/dojo) "hHU" = ( -/obj/item/weapon/inflatable_duck, +/obj/item/inflatable_duck, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) "hIf" = ( @@ -6813,11 +6813,11 @@ /area/centcom/main_hall) "hPC" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/unsimulated/floor{ @@ -6894,10 +6894,10 @@ /area/skipjack_station) "hTd" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 1 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 }, @@ -6908,14 +6908,14 @@ pixel_x = -32; req_access = list(150) }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 1 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/shuttle/floor/white, /area/skipjack_station/start) "hTk" = ( @@ -7021,9 +7021,9 @@ /area/centcom/evac) "hXB" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/storage/firstaid/clotting, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/storage/firstaid/clotting, /obj/item/stack/medical/splint, /turf/simulated/shuttle/floor/white, /area/skipjack_station/start) @@ -7041,8 +7041,8 @@ }, /area/centcom/specops) "hYD" = ( -/obj/item/device/multitool, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/multitool, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/table/reinforced, /turf/simulated/shuttle/floor/red, /area/shuttle/administration/centcom) @@ -7111,8 +7111,8 @@ /area/syndicate_station/start) "idn" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/device/multitool, +/obj/item/storage/belt/utility/full, +/obj/item/multitool, /turf/simulated/shuttle/floor/voidcraft/dark, /area/syndicate_station/start) "idR" = ( @@ -7167,7 +7167,7 @@ }, /area/wizard_station) "ihn" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/structure/table/reinforced, /turf/simulated/shuttle/floor/red, /area/shuttle/administration/centcom) @@ -7190,7 +7190,7 @@ pixel_y = -2 }, /obj/item/stack/nanopaste, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/shuttle/floor/white, /area/centcom/evac) "ijP" = ( @@ -7257,7 +7257,7 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "steel" @@ -7265,7 +7265,7 @@ /area/centcom/terminal) "inZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tray{ +/obj/item/tray{ pixel_y = 5 }, /obj/effect/landmark{ @@ -7284,7 +7284,7 @@ /area/centcom/specops) "ioC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -7316,49 +7316,49 @@ /area/beach) "ith" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/pill_bottle/tramadol{ +/obj/item/storage/pill_bottle/tramadol{ pixel_x = -6; pixel_y = -6 }, -/obj/item/weapon/storage/pill_bottle/tramadol{ +/obj/item/storage/pill_bottle/tramadol{ pixel_x = -6; pixel_y = -6 }, -/obj/item/weapon/storage/pill_bottle/tramadol{ +/obj/item/storage/pill_bottle/tramadol{ pixel_x = -6; pixel_y = -6 }, -/obj/item/weapon/storage/pill_bottle/dylovene{ +/obj/item/storage/pill_bottle/dylovene{ pixel_y = -6 }, -/obj/item/weapon/storage/pill_bottle/dylovene{ +/obj/item/storage/pill_bottle/dylovene{ pixel_x = -6 }, -/obj/item/weapon/storage/pill_bottle/dylovene{ +/obj/item/storage/pill_bottle/dylovene{ pixel_x = -6 }, -/obj/item/weapon/storage/pill_bottle/dermaline{ +/obj/item/storage/pill_bottle/dermaline{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/storage/pill_bottle/dermaline{ +/obj/item/storage/pill_bottle/dermaline{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/storage/pill_bottle/dermaline{ +/obj/item/storage/pill_bottle/dermaline{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/storage/pill_bottle/spaceacillin, -/obj/item/weapon/storage/pill_bottle/dexalin_plus{ +/obj/item/storage/pill_bottle/spaceacillin, +/obj/item/storage/pill_bottle/dexalin_plus{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/pill_bottle/dexalin_plus{ +/obj/item/storage/pill_bottle/dexalin_plus{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/pill_bottle/dexalin_plus{ +/obj/item/storage/pill_bottle/dexalin_plus{ pixel_x = 4; pixel_y = 4 }, @@ -7377,7 +7377,7 @@ /area/shuttle/administration/centcom) "ivA" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/lockbox, +/obj/item/storage/lockbox, /turf/simulated/shuttle/floor/black, /area/centcom/evac) "ivO" = ( @@ -7432,7 +7432,7 @@ /area/skipjack_station) "iyN" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /turf/simulated/shuttle/floor/red, /area/shuttle/administration/centcom) "iyY" = ( @@ -7443,8 +7443,8 @@ /turf/simulated/shuttle/floor/red, /area/shuttle/administration/centcom) "izK" = ( -/obj/item/weapon/storage/box/evidence, -/obj/item/weapon/folder/red, +/obj/item/storage/box/evidence, +/obj/item/folder/red, /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -7466,7 +7466,7 @@ /area/centcom/specops) "izS" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -7485,9 +7485,9 @@ /area/centcom/terminal) "iBh" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel, -/obj/item/weapon/surgical/FixOVein, +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel, +/obj/item/surgical/FixOVein, /obj/item/stack/nanopaste, /turf/simulated/shuttle/floor/white, /area/skipjack_station/start) @@ -7536,7 +7536,7 @@ /obj/effect/floor_decal/corner/yellow{ dir = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/small/sugar, /turf/simulated/floor/tiled/white, /area/centcom/bar) "iFP" = ( @@ -7648,7 +7648,7 @@ /area/syndicate_station) "iKT" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/glasses/square{ +/obj/item/storage/box/glasses/square{ pixel_x = 1; pixel_y = 4 }, @@ -7755,7 +7755,7 @@ /area/syndicate_station/start) "iPP" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hop, +/obj/item/bedsheet/hop, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -7809,9 +7809,9 @@ /area/centcom/specops) "iQT" = ( /obj/structure/table/rack, -/obj/item/weapon/material/harpoon, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/tank/oxygen, +/obj/item/material/harpoon, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, /obj/random/rigsuit, @@ -7832,11 +7832,11 @@ /area/shuttle/transport1/centcom) "iSO" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /obj/effect/floor_decal/borderfloorwhite{ dir = 6 }, @@ -7960,8 +7960,8 @@ /area/shuttle/merchant/home) "iYD" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/darkmatter, -/obj/item/weapon/gun/energy/darkmatter, +/obj/item/gun/energy/darkmatter, +/obj/item/gun/energy/darkmatter, /turf/unsimulated/floor{ icon_state = "plating"; name = "plating" @@ -7987,7 +7987,7 @@ /area/shuttle/merchant/home) "iZQ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper/dockingcodes{ +/obj/item/paper/dockingcodes{ codes_from_z = 4; name = "Telecomms Docking Codes" }, @@ -8008,12 +8008,12 @@ dir = 4 }, /obj/structure/window/reinforced, -/obj/item/weapon/gun/projectile/sec{ +/obj/item/gun/projectile/sec{ pixel_x = 2; pixel_y = -4 }, -/obj/item/weapon/gun/projectile/sec, -/obj/item/weapon/gun/projectile/sec{ +/obj/item/gun/projectile/sec, +/obj/item/gun/projectile/sec{ pixel_x = -2; pixel_y = 4 }, @@ -8055,11 +8055,11 @@ /area/shuttle/administration/centcom) "jcL" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -8107,7 +8107,7 @@ }, /area/wizard_station) "jgo" = ( -/obj/item/weapon/ore, +/obj/item/ore, /turf/unsimulated/floor{ icon_state = "asteroid_dug"; name = "plating" @@ -8201,7 +8201,7 @@ }, /area/skipjack_station) "jqO" = ( -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/shuttle/plating, /area/skipjack_station/start) "jrv" = ( @@ -8248,17 +8248,17 @@ }, /area/wizard_station) "jwB" = ( -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/spray/pepper, -/obj/item/weapon/reagent_containers/spray/pepper, -/obj/item/weapon/reagent_containers/spray/pepper, -/obj/item/weapon/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -8287,12 +8287,12 @@ /area/syndicate_station) "jxP" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/structure/window/reinforced{ dir = 4; health = 1e+006 @@ -8304,9 +8304,9 @@ /area/syndicate_station) "jyk" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, /obj/structure/window/reinforced{ dir = 8 }, @@ -8327,11 +8327,11 @@ /area/centcom/specops) "jyC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/food/drinks/bottle/vodka{ pixel_x = 3; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine{ +/obj/item/reagent_containers/food/drinks/bottle/wine{ pixel_x = -1; pixel_y = 8 }, @@ -8357,7 +8357,7 @@ }, /area/shuttle/arrival/pre_game) "jAm" = ( -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -6 }, /obj/structure/table/standard, @@ -8387,28 +8387,28 @@ /area/shuttle/merchant/home) "jDo" = ( /obj/structure/table/standard, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#ff0000"; name = "red towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#ff0000"; name = "red towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#ff0000"; name = "red towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#ff0000"; name = "red towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#ff0000"; name = "red towel" }, -/obj/item/weapon/soap/syndie, -/obj/item/weapon/soap/syndie, +/obj/item/soap/syndie, +/obj/item/soap/syndie, /turf/simulated/floor/tiled/freezer, /area/syndicate_station) "jDp" = ( @@ -8448,12 +8448,12 @@ dir = 4 }, /obj/structure/table/rack, -/obj/item/weapon/storage/backpack/ert/security{ +/obj/item/storage/backpack/ert/security{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security{ +/obj/item/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security{ pixel_x = 2; pixel_y = 2 }, @@ -8463,7 +8463,7 @@ }, /area/centcom/specops) "jFD" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; dir = 8; frequency = 1213; @@ -8559,7 +8559,7 @@ /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "jJx" = ( -/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine{ +/obj/item/reagent_containers/food/drinks/bottle/pwine{ pixel_x = -4; pixel_y = 10 }, @@ -8601,7 +8601,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "white" @@ -8671,7 +8671,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/bananapeel, +/obj/item/bananapeel, /turf/unsimulated/floor{ icon_state = "carpet" }, @@ -8698,7 +8698,7 @@ dir = 1 }, /obj/machinery/chemical_dispenser/ert, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "white" @@ -8749,9 +8749,9 @@ /area/holodeck/source_chess) "jUa" = ( /obj/structure/table/rack, -/obj/item/weapon/grenade/empgrenade, -/obj/item/weapon/grenade/flashbang, -/obj/item/weapon/grenade/spawnergrenade/manhacks, +/obj/item/grenade/empgrenade, +/obj/item/grenade/flashbang, +/obj/item/grenade/spawnergrenade/manhacks, /turf/simulated/shuttle/floor/darkred, /area/skipjack_station/start) "jUW" = ( @@ -8825,13 +8825,13 @@ /obj/machinery/cell_charger, /obj/structure/table/reinforced, /obj/effect/floor_decal/industrial/outline/blue, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high{ +/obj/item/cell/high, +/obj/item/cell/high, +/obj/item/cell/high{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ pixel_x = 4; pixel_y = 4 }, @@ -8877,7 +8877,7 @@ /area/centcom/main_hall) "kfC" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/fortunecookie, +/obj/item/reagent_containers/food/snacks/fortunecookie, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -8954,7 +8954,7 @@ /obj/effect/floor_decal/corner/yellow{ dir = 10 }, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/small/sugar, /turf/simulated/floor/tiled/white, /area/centcom/bar) "kiC" = ( @@ -9059,8 +9059,8 @@ /area/centcom/command) "kkU" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, /obj/random/multiple/voidsuit, /obj/random/multiple/voidsuit, /obj/random/energy, @@ -9073,7 +9073,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 1 }, -/obj/item/weapon/mop, +/obj/item/mop, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "steel" @@ -9090,7 +9090,7 @@ /area/syndicate_station) "knl" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/radio/intercom/specops{ +/obj/item/radio/intercom/specops{ pixel_y = -21 }, /obj/machinery/button/remote/blast_door{ @@ -9123,8 +9123,8 @@ /obj/item/seeds/potatoseed, /obj/item/seeds/potatoseed, /obj/item/seeds/ambrosiavulgarisseed, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/beartrap, +/obj/item/material/minihoe, +/obj/item/beartrap, /obj/structure/table/steel, /turf/simulated/shuttle/plating, /area/skipjack_station/start) @@ -9151,7 +9151,7 @@ /area/shuttle/merchant/home) "kpv" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/red/border, /turf/unsimulated/floor{ @@ -9221,7 +9221,7 @@ /area/centcom/command) "ktX" = ( /obj/structure/table/standard, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /turf/unsimulated/floor{ icon_state = "white" }, @@ -9341,7 +9341,7 @@ /area/centcom/terminal) "kyQ" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/rd, +/obj/item/bedsheet/rd, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "kyR" = ( @@ -9372,7 +9372,7 @@ /area/centcom/command) "kzI" = ( /obj/structure/mopbucket, -/obj/item/weapon/mop, +/obj/item/mop, /turf/simulated/shuttle/plating, /area/centcom/evac) "kzL" = ( @@ -9406,7 +9406,7 @@ /area/holodeck/source_meetinghall) "kBx" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/glasses/square{ +/obj/item/storage/box/glasses/square{ pixel_x = 1; pixel_y = 4 }, @@ -9516,8 +9516,8 @@ /area/beach) "kER" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/item/weapon/tool/crowbar, -/obj/item/device/suit_cooling_unit, +/obj/item/tool/crowbar, +/obj/item/suit_cooling_unit, /turf/simulated/shuttle/plating, /area/skipjack_station/start) "kFb" = ( @@ -9583,9 +9583,9 @@ /area/skipjack_station/start) "kIq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/tool/screwdriver, +/obj/item/tool/wrench, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -9663,7 +9663,7 @@ /turf/simulated/shuttle/floor/voidcraft, /area/syndicate_station/start) "kLb" = ( -/obj/item/weapon/storage/box/syndie_kit/clerical, +/obj/item/storage/box/syndie_kit/clerical, /obj/structure/table/standard, /turf/unsimulated/floor{ icon_state = "cult"; @@ -9810,7 +9810,7 @@ /area/centcom/specops) "kTa" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/simulated/floor/carpet, /area/shuttle/merchant/home) "kTp" = ( @@ -9853,9 +9853,9 @@ /area/shuttle/transport1/centcom) "kVF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stamp/centcomm, -/obj/item/weapon/pen, -/obj/item/weapon/paper_bin{ +/obj/item/stamp/centcomm, +/obj/item/pen, +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -9889,7 +9889,7 @@ /area/centcom/main_hall) "kYD" = ( /obj/structure/table/reinforced, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, @@ -9908,8 +9908,8 @@ "kZc" = ( /obj/structure/table/steel, /obj/effect/spawner/newbomb/timer/syndicate, -/obj/item/weapon/tool/screwdriver, -/obj/item/device/assembly/signaler{ +/obj/item/tool/screwdriver, +/obj/item/assembly/signaler{ pixel_y = 2 }, /turf/simulated/shuttle/floor/voidcraft, @@ -9945,7 +9945,7 @@ /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "lbC" = ( -/obj/item/weapon/ore, +/obj/item/ore, /turf/unsimulated/floor{ icon_state = "plating"; name = "plating" @@ -10031,7 +10031,7 @@ /area/wizard_station) "lht" = ( /obj/structure/table/steel, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /turf/simulated/shuttle/floor/darkred, /area/skipjack_station/start) "lhE" = ( @@ -10056,12 +10056,12 @@ /area/ninja_dojo/start) "liK" = ( /obj/structure/table/reinforced, -/obj/item/device/paicard, -/obj/item/device/paicard, -/obj/item/device/paicard, -/obj/item/device/paicard, -/obj/item/weapon/storage/box/donut, -/obj/item/weapon/storage/box, +/obj/item/paicard, +/obj/item/paicard, +/obj/item/paicard, +/obj/item/paicard, +/obj/item/storage/box/donut, +/obj/item/storage/box, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -10119,9 +10119,9 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, /obj/structure/window/reinforced, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; @@ -10130,7 +10130,7 @@ /area/centcom/specops) "lmW" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /turf/unsimulated/floor{ icon_state = "lino" }, @@ -10197,8 +10197,8 @@ /area/shuttle/arrival/pre_game) "lse" = ( /obj/structure/closet/crate/nanotrasen, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, @@ -10206,7 +10206,7 @@ /area/shuttle/escape/centcom) "lsS" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -10420,11 +10420,11 @@ /area/centcom/specops) "lHG" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/carpet, @@ -10473,17 +10473,17 @@ /obj/item/roller, /obj/item/roller, /obj/item/roller, -/obj/item/device/defib_kit/compact/combat/loaded, +/obj/item/defib_kit/compact/combat/loaded, /turf/simulated/shuttle/floor/voidcraft/light, /area/syndicate_station/start) "lKk" = ( /obj/structure/closet/crate/nanotrasen, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, /turf/simulated/shuttle/floor, /area/shuttle/escape/centcom) "lKy" = ( @@ -10500,7 +10500,7 @@ }, /area/centcom/command) "lLl" = ( -/obj/item/weapon/gun/magic/firestaff, +/obj/item/gun/magic/firestaff, /turf/unsimulated/floor{ icon_state = "steel_dirty" }, @@ -10625,7 +10625,7 @@ }, /area/syndicate_station) "lPk" = ( -/obj/item/weapon/ore, +/obj/item/ore, /turf/unsimulated/floor{ icon_state = "steel" }, @@ -10645,28 +10645,28 @@ /area/centcom/medical) "lQg" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, /turf/unsimulated/beach/sand, /area/beach) "lQh" = ( /obj/structure/table/standard, -/obj/item/device/radio/headset/syndicate/alt, -/obj/item/device/radio/headset/syndicate/alt, -/obj/item/device/radio/headset/syndicate/alt, -/obj/item/device/radio/headset/syndicate/alt, +/obj/item/radio/headset/syndicate/alt, +/obj/item/radio/headset/syndicate/alt, +/obj/item/radio/headset/syndicate/alt, +/obj/item/radio/headset/syndicate/alt, /turf/unsimulated/floor{ icon_state = "lino" }, /area/syndicate_station) "lQG" = ( /obj/structure/table/standard, -/obj/item/weapon/clipboard, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/pen, /turf/simulated/shuttle/floor/black, /area/centcom/evac) "lRH" = ( @@ -10693,7 +10693,7 @@ /area/shuttle/merchant/home) "lSb" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/book/manual/ripley_build_and_repair, +/obj/item/book/manual/ripley_build_and_repair, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -10877,12 +10877,12 @@ /obj/item/clothing/glasses/welding/superior, /obj/item/clothing/glasses/welding/superior, /obj/item/clothing/glasses/welding/superior, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -10894,10 +10894,10 @@ dir = 8 }, /obj/structure/window/reinforced, -/obj/item/weapon/storage/box/shotgunshells, -/obj/item/weapon/storage/box/shotgunshells, -/obj/item/weapon/storage/box/shotgunammo, -/obj/item/weapon/storage/box/shotgunammo, +/obj/item/storage/box/shotgunshells, +/obj/item/storage/box/shotgunshells, +/obj/item/storage/box/shotgunammo, +/obj/item/storage/box/shotgunammo, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -10937,7 +10937,7 @@ "mjE" = ( /obj/structure/table/reinforced, /obj/machinery/chemical_dispenser/full, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -10981,11 +10981,11 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FF6666"; name = "light red towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FF6666"; name = "light red towel" }, @@ -11004,11 +11004,11 @@ /area/wizard_station) "moI" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/structure/window/reinforced, /turf/simulated/shuttle/floor/white, /area/centcom/evac) @@ -11044,7 +11044,7 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/tdome/red, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/melee/baton/loaded, +/obj/item/melee/baton/loaded, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -11071,9 +11071,9 @@ /obj/structure/closet{ name = "custodial" }, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "mrg" = ( @@ -11105,7 +11105,7 @@ /turf/simulated/shuttle/floor, /area/shuttle/escape/centcom) "mtX" = ( -/obj/item/weapon/bedsheet/clown, +/obj/item/bedsheet/clown, /obj/structure/bed/padded, /turf/simulated/shuttle/floor/red, /area/skipjack_station/start) @@ -11114,7 +11114,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/book/codex/corp_regs, +/obj/item/book/codex/corp_regs, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -11174,9 +11174,9 @@ /area/centcom/bar) "mxq" = ( /obj/structure/table/reinforced, -/obj/item/device/megaphone, -/obj/item/weapon/storage/box/trackimp, -/obj/item/weapon/storage/box/cdeathalarm_kit, +/obj/item/megaphone, +/obj/item/storage/box/trackimp, +/obj/item/storage/box/cdeathalarm_kit, /obj/structure/window/reinforced{ dir = 8 }, @@ -11228,7 +11228,7 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/shuttle/floor/red, /area/shuttle/administration/centcom) "mBj" = ( @@ -11243,11 +11243,11 @@ /area/centcom/main_hall) "mCF" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/shuttle/floor/black, @@ -11270,12 +11270,12 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = 4; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppershaker, -/obj/item/weapon/flame/candle, +/obj/item/reagent_containers/food/condiment/small/peppershaker, +/obj/item/flame/candle, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -11286,7 +11286,7 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet/swat, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -11330,12 +11330,12 @@ /area/ninja_dojo/dojo) "mGD" = ( /obj/structure/table/reinforced, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, /obj/effect/floor_decal/industrial/outline/blue, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; @@ -11389,7 +11389,7 @@ }, /area/ninja_dojo/dojo) "mLr" = ( -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/unsimulated/floor{ icon_state = "lino" }, @@ -11420,7 +11420,7 @@ /area/shuttle/administration/centcom) "mMT" = ( /obj/structure/table/standard, -/obj/item/weapon/book/codex/lore/vir, +/obj/item/book/codex/lore/vir, /turf/simulated/shuttle/floor/white, /area/shuttle/arrival/pre_game) "mMW" = ( @@ -11494,11 +11494,11 @@ "mQd" = ( /obj/structure/table/marble, /obj/effect/floor_decal/corner/white/diagonal, -/obj/item/weapon/storage/box/glasses/square{ +/obj/item/storage/box/glasses/square{ pixel_x = 1; pixel_y = 4 }, -/obj/item/weapon/storage/box/glasses/square, +/obj/item/storage/box/glasses/square, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "steel" @@ -11534,7 +11534,7 @@ /area/centcom/main_hall) "mRV" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/toolbox/syndicate{ +/obj/item/storage/toolbox/syndicate{ pixel_x = -1; pixel_y = 3 }, @@ -11569,26 +11569,26 @@ dir = 4 }, /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 4; pixel_y = 5 }, @@ -11649,11 +11649,11 @@ dir = 5 }, /obj/structure/table/reinforced, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/tool/wrench, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -11691,7 +11691,7 @@ }, /area/syndicate_station) "nch" = ( -/obj/item/weapon/storage/box/syringegun{ +/obj/item/storage/box/syringegun{ pixel_x = -2; pixel_y = -4 }, @@ -11739,26 +11739,26 @@ /obj/structure/table/standard, /obj/item/clothing/gloves/sterile/latex, /obj/item/clothing/mask/surgical, -/obj/item/weapon/surgical/retractor{ +/obj/item/surgical/retractor{ pixel_y = 6 }, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/surgical/circular_saw, +/obj/item/surgical/scalpel, +/obj/item/surgical/surgicaldrill, +/obj/item/surgical/circular_saw, /obj/item/stack/nanopaste, -/obj/item/weapon/surgical/hemostat{ +/obj/item/surgical/hemostat{ pixel_y = 4 }, -/obj/item/weapon/surgical/cautery{ +/obj/item/surgical/cautery{ pixel_y = 4 }, -/obj/item/weapon/surgical/FixOVein{ +/obj/item/surgical/FixOVein{ pixel_x = -6; pixel_y = 1 }, /obj/item/stack/medical/advanced/bruise_pack, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel{ +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel{ pixel_x = 4; pixel_y = 3 }, @@ -11833,7 +11833,7 @@ /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "niR" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/unsimulated/floor{ @@ -11861,7 +11861,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 8 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled/white, @@ -11958,12 +11958,12 @@ /area/shuttle/administration/centcom) "nrP" = ( /obj/structure/table/reinforced, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, /obj/effect/floor_decal/industrial/outline/blue, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; @@ -11986,7 +11986,7 @@ }, /area/wizard_station) "nuQ" = ( -/obj/item/weapon/antag_spawner/technomancer_apprentice, +/obj/item/antag_spawner/technomancer_apprentice, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -12047,7 +12047,7 @@ }, /area/syndicate_station) "nAm" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -12067,13 +12067,13 @@ pixel_x = -32; req_access = list(150) }, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/surgical, /obj/item/clothing/gloves/sterile/latex, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/glass/bottle/stoxin, /turf/simulated/shuttle/floor/voidcraft/light, /area/syndicate_station/start) "nCe" = ( @@ -12175,12 +12175,12 @@ /area/holodeck/source_chess) "nJi" = ( /obj/structure/table/rack, -/obj/item/device/aicard, +/obj/item/aicard, /turf/simulated/shuttle/floor/voidcraft/dark, /area/syndicate_station/start) "nKa" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 4; pixel_y = 8 }, @@ -12243,17 +12243,17 @@ /area/holodeck/source_basketball) "nOm" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/fancy/vials{ +/obj/item/storage/fancy/vials{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/fancy/vials, -/obj/item/weapon/reagent_containers/hypospray/vial{ +/obj/item/storage/fancy/vials, +/obj/item/reagent_containers/hypospray/vial{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/hypospray/vial, -/obj/item/weapon/storage/box/pillbottles, +/obj/item/reagent_containers/hypospray/vial, +/obj/item/storage/box/pillbottles, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -12440,7 +12440,7 @@ /area/centcom/main_hall) "nZO" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/inflatable_duck, +/obj/item/inflatable_duck, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "nZP" = ( @@ -12495,8 +12495,8 @@ /area/tdome) "oby" = ( /obj/structure/table/reinforced, -/obj/item/device/aicard, -/obj/item/weapon/stamp/centcomm, +/obj/item/aicard, +/obj/item/stamp/centcomm, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -12504,7 +12504,7 @@ /area/centcom/specops) "oci" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/shuttle/floor/red, /area/shuttle/administration/centcom) "ocL" = ( @@ -12640,7 +12640,7 @@ /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) "olC" = ( -/obj/item/weapon/stool{ +/obj/item/stool{ dir = 8 }, /turf/simulated/shuttle/floor/red, @@ -12716,7 +12716,7 @@ /area/centcom/command) "ooh" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 }, @@ -12743,7 +12743,7 @@ dir = 1 }, /obj/machinery/chemical_dispenser/full, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "white" @@ -12815,7 +12815,7 @@ /area/shuttle/administration/centcom) "orQ" = ( /obj/structure/table/woodentable, -/obj/item/device/paicard, +/obj/item/paicard, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -12823,7 +12823,7 @@ /area/wizard_station) "orR" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ on = 0; pixel_x = -3; pixel_y = 8 @@ -12934,7 +12934,7 @@ /area/wizard_station) "ozF" = ( /obj/structure/table/glass, -/obj/item/device/paicard, +/obj/item/paicard, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -12951,7 +12951,7 @@ /area/centcom/main_hall) "oBf" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/vox, +/obj/item/tank/vox, /turf/unsimulated/floor{ icon_state = "asteroid" }, @@ -13046,7 +13046,7 @@ /area/centcom/command) "oKg" = ( /obj/machinery/iv_drip, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; dir = 8; frequency = 1213; @@ -13077,7 +13077,7 @@ /area/shuttle/administration/centcom) "oNc" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, /turf/unsimulated/beach/sand, /area/beach) "oNs" = ( @@ -13284,7 +13284,7 @@ /area/shuttle/merchant/home) "oWZ" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/shuttle/plating, /area/centcom/evac) "oXu" = ( @@ -13292,11 +13292,11 @@ /area/holodeck/source_chess) "oXD" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/unsimulated/floor{ @@ -13345,7 +13345,7 @@ /area/centcom/terminal) "pbz" = ( /obj/structure/table/standard, -/obj/item/device/pda/syndicate, +/obj/item/pda/syndicate, /turf/unsimulated/floor{ icon_state = "lino" }, @@ -13501,9 +13501,9 @@ /area/centcom/bar) "plP" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -13546,7 +13546,7 @@ dir = 8 }, /obj/structure/table/steel_reinforced, -/obj/item/device/paicard, +/obj/item/paicard, /turf/simulated/shuttle/floor/voidcraft/light, /area/ninja_dojo/start) "pnP" = ( @@ -13560,7 +13560,7 @@ dir = 9 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /turf/unsimulated/floor{ icon_state = "carpet" }, @@ -13586,12 +13586,12 @@ /area/skipjack_station/start) "pqt" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -13614,7 +13614,7 @@ /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) "pte" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -13675,7 +13675,7 @@ /area/centcom/medical) "pui" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/merc/empty, +/obj/item/rig/merc/empty, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -13778,7 +13778,7 @@ pixel_x = 32 }, /obj/structure/table/steel, -/obj/item/weapon/storage/box/frags, +/obj/item/storage/box/frags, /turf/simulated/shuttle/floor/voidcraft, /area/syndicate_station/start) "pAD" = ( @@ -14004,7 +14004,7 @@ /turf/simulated/shuttle/floor/yellow, /area/centcom/evac) "pLy" = ( -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/structure/table/steel_reinforced, /obj/machinery/newscaster{ layer = 3.3; @@ -14085,7 +14085,7 @@ /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; @@ -14133,8 +14133,8 @@ /area/centcom/command) "pTc" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel, +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -14155,11 +14155,11 @@ "pTo" = ( /obj/structure/table/marble, /obj/effect/floor_decal/corner/white/diagonal, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/kitchen/rollingpin, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "steel" @@ -14189,10 +14189,10 @@ /area/centcom/specops) "pVm" = ( /obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/gun/energy/gun/burst, +/obj/item/gun/energy/gun/burst, +/obj/item/gun/energy/ionrifle/pistol, +/obj/item/gun/projectile/shotgun/pump/combat, /turf/unsimulated/floor{ icon_state = "steel" }, @@ -14394,19 +14394,19 @@ /area/holodeck/source_basketball) "qiU" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/crossbow, +/obj/item/gun/launcher/crossbow, /obj/item/stack/rods{ amount = 10 }, /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/beartrap, -/obj/item/weapon/beartrap, -/obj/item/weapon/beartrap, -/obj/item/weapon/beartrap, -/obj/item/weapon/beartrap, -/obj/item/weapon/beartrap, +/obj/item/beartrap, +/obj/item/beartrap, +/obj/item/beartrap, +/obj/item/beartrap, +/obj/item/beartrap, +/obj/item/beartrap, /turf/simulated/shuttle/floor/darkred, /area/skipjack_station/start) "qjK" = ( @@ -14414,7 +14414,7 @@ dir = 4; name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/unsimulated/floor{ icon_state = "dark" @@ -14447,7 +14447,7 @@ }, /area/tdome) "qlq" = ( -/obj/item/weapon/gun/energy/plasmastun, +/obj/item/gun/energy/plasmastun, /turf/unsimulated/floor{ icon_state = "plating"; name = "plating" @@ -14650,7 +14650,7 @@ /turf/simulated/shuttle/floor/yellow, /area/shuttle/transport1/centcom) "qxC" = ( -/obj/item/weapon/storage/box/syndie_kit/spy, +/obj/item/storage/box/syndie_kit/spy, /turf/unsimulated/floor{ icon_state = "cult"; name = "plating" @@ -14735,7 +14735,7 @@ /area/ninja_dojo/dojo) "qCs" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/rig/internalaffairs, +/obj/item/rig/internalaffairs, /obj/item/clothing/head/helmet/space/void/wizard, /obj/item/clothing/suit/space/void/wizard, /turf/simulated/shuttle/floor/black, @@ -14747,7 +14747,7 @@ /obj/structure/closet/cabinet, /obj/item/clothing/suit/wizrobe/magusred, /obj/item/clothing/head/wizard/magus, -/obj/item/weapon/staff, +/obj/item/staff, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -14792,11 +14792,11 @@ }, /area/centcom/specops) "qFT" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, @@ -14806,37 +14806,37 @@ /obj/item/bodybag/cryobag{ pixel_x = 5 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/box/masks, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire{ layer = 2.9; pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = -2 }, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/structure/closet/medical_wall{ pixel_y = 32 }, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "qGl" = ( -/obj/item/weapon/beach_ball, +/obj/item/beach_ball, /turf/unsimulated/beach/sand, /area/beach) "qGJ" = ( @@ -14844,7 +14844,7 @@ /turf/simulated/shuttle/plating, /area/shuttle/escape_pod1/centcom) "qHh" = ( -/obj/item/weapon/gun/launcher/pneumatic, +/obj/item/gun/launcher/pneumatic, /turf/unsimulated/floor{ icon_state = "asteroid" }, @@ -14856,7 +14856,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/tiled/white, @@ -14873,7 +14873,7 @@ }, /area/syndicate_mothership/elite_squad) "qIt" = ( -/obj/item/weapon/farmbot_arm_assembly, +/obj/item/farmbot_arm_assembly, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -14906,8 +14906,8 @@ pixel_x = 5; pixel_y = 32 }, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -14923,7 +14923,7 @@ /obj/structure/urinal{ pixel_y = 32 }, -/obj/item/weapon/soap/syndie, +/obj/item/soap/syndie, /turf/unsimulated/floor{ icon_state = "freezerfloor" }, @@ -14954,13 +14954,13 @@ dir = 4 }, /obj/structure/table/rack, -/obj/item/weapon/storage/belt/security/tactical/bandolier, -/obj/item/weapon/storage/belt/security/tactical/bandolier, -/obj/item/weapon/storage/belt/security/tactical/bandolier, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical/bandolier, +/obj/item/storage/belt/security/tactical/bandolier, +/obj/item/storage/belt/security/tactical/bandolier, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -15001,7 +15001,7 @@ dir = 4; name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) @@ -15158,7 +15158,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -15433,13 +15433,13 @@ /area/centcom/terminal) "rhp" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/arrow/quill, +/obj/item/arrow/quill, /turf/unsimulated/floor{ icon_state = "dark" }, /area/wizard_station) "rhW" = ( -/obj/item/weapon/ore, +/obj/item/ore, /turf/unsimulated/floor{ icon_state = "asteroid" }, @@ -15463,8 +15463,8 @@ /obj/item/taperoll/atmos, /obj/item/taperoll/atmos, /obj/item/taperoll/atmos, -/obj/item/weapon/pickaxe/drill, -/obj/item/weapon/pickaxe/drill, +/obj/item/pickaxe/drill, +/obj/item/pickaxe/drill, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -15497,8 +15497,8 @@ /obj/structure/table/steel, /obj/item/stack/medical/splint, /obj/item/stack/medical/splint, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, /turf/simulated/shuttle/floor/voidcraft/light, /area/syndicate_station/start) "rlf" = ( @@ -15543,7 +15543,7 @@ /turf/simulated/shuttle/floor/black, /area/centcom/evac) "rof" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 1; dir = 1; frequency = 1443; @@ -15600,7 +15600,7 @@ }, /area/centcom/medical) "rqR" = ( -/obj/item/weapon/gun/launcher/spikethrower, +/obj/item/gun/launcher/spikethrower, /turf/unsimulated/floor{ icon_state = "plating"; name = "plating" @@ -15608,7 +15608,7 @@ /area/skipjack_station) "rro" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/unsimulated/floor{ icon_state = "lino" }, @@ -15712,19 +15712,19 @@ /obj/item/stack/material/glass/reinforced{ amount = 50 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, @@ -15901,7 +15901,7 @@ /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/escape/centcom) "rCR" = ( -/obj/item/weapon/beach_ball, +/obj/item/beach_ball, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) "rDn" = ( @@ -15912,7 +15912,7 @@ /area/syndicate_station/start) "rDr" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -15952,7 +15952,7 @@ /obj/structure/closet/cabinet, /obj/item/clothing/suit/wizrobe/magusblue, /obj/item/clothing/head/wizard/magus, -/obj/item/weapon/staff, +/obj/item/staff, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -15999,11 +15999,11 @@ /area/centcom/command) "rKf" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/unsimulated/floor{ @@ -16165,13 +16165,13 @@ /area/centcom/specops) "rQI" = ( /obj/structure/table/reinforced, -/obj/item/weapon/handcuffs, -/obj/item/device/flash, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/handcuffs, +/obj/item/flash, +/obj/item/melee/baton/loaded, +/obj/item/storage/belt/security/tactical, +/obj/item/gun/energy/stunrevolver, /obj/item/clothing/glasses/sunglasses/sechud/tactical, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, /obj/structure/window/reinforced{ dir = 8 }, @@ -16227,7 +16227,7 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_theatre) "rRM" = ( -/obj/item/device/radio/electropack, +/obj/item/radio/electropack, /obj/structure/table/steel, /turf/simulated/shuttle/floor/voidcraft, /area/syndicate_station/start) @@ -16284,11 +16284,11 @@ }, /area/virtual_reality) "rUh" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /obj/machinery/light, @@ -16329,11 +16329,11 @@ /area/centcom/evac) "rZm" = ( /obj/structure/closet/wardrobe/captain, -/obj/item/weapon/gun/projectile/revolver/mateba, +/obj/item/gun/projectile/revolver/mateba, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "rZv" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/corner/blue/diagonal{ dir = 4 @@ -16418,25 +16418,25 @@ /area/centcom/bar) "sdu" = ( /obj/structure/closet/emcloset, -/obj/item/weapon/extinguisher, -/obj/item/weapon/tool/crowbar, +/obj/item/extinguisher, +/obj/item/tool/crowbar, /turf/simulated/shuttle/floor, /area/shuttle/escape/centcom) "sdE" = ( /obj/structure/table/reinforced, -/obj/item/device/defib_kit/compact/combat/loaded{ +/obj/item/defib_kit/compact/combat/loaded{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ pixel_y = -4 }, -/obj/item/weapon/cell/high, -/obj/item/device/defib_kit/compact/combat/loaded{ +/obj/item/cell/high, +/obj/item/defib_kit/compact/combat/loaded{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -16450,9 +16450,9 @@ }, /area/wizard_station) "sfb" = ( -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, /obj/structure/table/standard, /turf/unsimulated/floor{ icon_state = "lino" @@ -16460,7 +16460,7 @@ /area/tdome/tdomeobserve) "sfu" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/stock_parts/matter_bin/super, +/obj/item/stock_parts/matter_bin/super, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -16483,14 +16483,14 @@ /area/centcom/creed) "shq" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/spikethrower, +/obj/item/gun/launcher/spikethrower, /turf/unsimulated/floor{ icon_state = "asteroid" }, /area/skipjack_station) "shD" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/mmi/radio_enabled, +/obj/item/mmi/radio_enabled, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -16501,7 +16501,7 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet/swat, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -16547,12 +16547,12 @@ pixel_x = 32 }, /obj/structure/table/steel, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, /obj/machinery/light{ dir = 4 }, @@ -16617,7 +16617,7 @@ /area/centcom/terminal) "snx" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/effect/floor_decal/borderfloorwhite{ dir = 6 }, @@ -16631,7 +16631,7 @@ }, /area/centcom/medical) "snZ" = ( -/obj/item/weapon/stool/barstool/padded{ +/obj/item/stool/barstool/padded{ dir = 1 }, /turf/unsimulated/floor{ @@ -16669,7 +16669,7 @@ /area/centcom/bar) "spP" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -16724,11 +16724,11 @@ /area/centcom/main_hall) "sww" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -16886,7 +16886,7 @@ /area/virtual_reality) "sIa" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/reagent_containers/glass/beaker, /obj/effect/floor_decal/corner/white/diagonal, /obj/machinery/reagentgrinder, /obj/effect/floor_decal/corner/white/diagonal, @@ -16972,16 +16972,16 @@ /area/centcom/main_hall) "sKp" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/autoinjectors{ +/obj/item/storage/box/autoinjectors{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/beakers, +/obj/item/storage/box/gloves{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/masks{ +/obj/item/storage/box/masks{ pixel_x = 4; pixel_y = 4 }, @@ -17072,7 +17072,7 @@ /area/syndicate_station/start) "sNL" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/radio/uplink, +/obj/item/radio/uplink, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -17151,7 +17151,7 @@ }, /area/centcom/specops) "sRz" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; dir = 8; frequency = 1213; @@ -17171,11 +17171,11 @@ }, /area/ninja_dojo/dojo) "sRU" = ( -/obj/item/weapon/tray{ +/obj/item/tray{ pixel_y = 5 }, /obj/structure/table/standard, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/unsimulated/floor{ icon_state = "white" }, @@ -17435,15 +17435,15 @@ /area/tdome) "tgG" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/belt/security, -/obj/item/weapon/storage/belt/security, +/obj/item/storage/belt/security, +/obj/item/storage/belt/security, /turf/simulated/shuttle/floor/voidcraft, /area/syndicate_station/start) "tgH" = ( /obj/structure/table/steel, -/obj/item/weapon/gun/projectile/pistol, +/obj/item/gun/projectile/pistol, /obj/item/ammo_magazine/m9mm, -/obj/item/weapon/gun/projectile/pistol, +/obj/item/gun/projectile/pistol, /obj/item/ammo_magazine/m9mm, /turf/simulated/shuttle/floor/voidcraft, /area/syndicate_station/start) @@ -17461,7 +17461,7 @@ /area/shuttle/merchant/home) "thM" = ( /obj/structure/closet/emcloset, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -17470,7 +17470,7 @@ /area/shuttle/arrival/pre_game) "tim" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/syndicate/powertools, +/obj/item/storage/toolbox/syndicate/powertools, /turf/simulated/shuttle/floor/voidcraft, /area/syndicate_station/start) "tiB" = ( @@ -17482,7 +17482,7 @@ /area/centcom/command) "tiP" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/belt/security/tactical/bandolier, +/obj/item/storage/belt/security/tactical/bandolier, /turf/simulated/shuttle/floor/voidcraft, /area/syndicate_station/start) "tjP" = ( @@ -17506,14 +17506,14 @@ /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "tmq" = ( -/obj/item/weapon/beach_ball/holoball, +/obj/item/beach_ball/holoball, /obj/effect/floor_decal/corner/red{ dir = 5 }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) "tnB" = ( -/obj/item/weapon/gun/energy/sonic, +/obj/item/gun/energy/sonic, /turf/unsimulated/floor{ icon_state = "plating"; name = "plating" @@ -17653,12 +17653,12 @@ /area/space) "tvq" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, /obj/structure/window/reinforced{ dir = 8 }, @@ -17780,8 +17780,8 @@ /area/ninja_dojo/dojo) "tDM" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/device/radio/off, +/obj/item/paper_bin, +/obj/item/radio/off, /turf/simulated/shuttle/floor/black, /area/centcom/evac) "tDS" = ( @@ -17891,7 +17891,7 @@ /area/shuttle/trade) "tKS" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/rd, +/obj/item/bedsheet/rd, /turf/unsimulated/floor{ icon_state = "lino" }, @@ -17970,7 +17970,7 @@ /area/space) "tQx" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/toolbox/syndicate{ +/obj/item/storage/toolbox/syndicate{ pixel_x = -1; pixel_y = 3 }, @@ -17990,7 +17990,7 @@ /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) "tQX" = ( -/obj/item/weapon/storage/box, +/obj/item/storage/box, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -18022,11 +18022,11 @@ /area/shuttle/trade) "tTj" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, @@ -18036,30 +18036,30 @@ /obj/item/bodybag/cryobag{ pixel_x = 5 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/box/masks, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire{ layer = 2.9; pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = -2 }, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/shuttle/floor/white, /area/shuttle/escape/centcom) "tTz" = ( @@ -18087,13 +18087,13 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full{ +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/belt/utility/full{ +/obj/item/storage/belt/utility/full{ pixel_x = 4; pixel_y = 4 }, @@ -18109,7 +18109,7 @@ /turf/simulated/floor/carpet, /area/shuttle/merchant/home) "tUq" = ( -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/structure/bed/padded, /turf/simulated/shuttle/floor/red, /area/skipjack_station/start) @@ -18151,11 +18151,11 @@ /area/holodeck/source_emptycourt) "tXe" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, @@ -18165,27 +18165,27 @@ /obj/item/bodybag/cryobag{ pixel_x = 5 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/box/masks, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire{ layer = 2.9; pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = -2 }, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, /turf/simulated/shuttle/floor/white, /area/centcom/evac) "tXW" = ( @@ -18194,12 +18194,12 @@ /area/holodeck/source_picnicarea) "tYi" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -18222,9 +18222,9 @@ /area/holodeck/source_meetinghall) "uak" = ( /obj/structure/table/standard, -/obj/item/device/defib_kit/loaded, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/defib_kit/loaded, +/obj/item/tool/wrench, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -4 }, /turf/simulated/shuttle/floor/white, @@ -18285,7 +18285,7 @@ /area/centcom/security) "uct" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box, +/obj/item/storage/box, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -18365,10 +18365,10 @@ /area/shuttle/supply) "ujN" = ( /obj/structure/table/standard, -/obj/item/weapon/towel, -/obj/item/weapon/towel, -/obj/item/weapon/towel, -/obj/item/weapon/towel, +/obj/item/towel, +/obj/item/towel, +/obj/item/towel, +/obj/item/towel, /obj/random/soap, /obj/random/soap, /turf/unsimulated/floor{ @@ -18393,14 +18393,14 @@ /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/accessory/stethoscope, -/obj/item/weapon/packageWrap, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/sterilizine, -/obj/item/weapon/reagent_containers/spray/sterilizine, -/obj/item/device/flashlight/pen, -/obj/item/device/flashlight/pen, +/obj/item/packageWrap, +/obj/item/hand_labeler, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/sterilizine, +/obj/item/reagent_containers/spray/sterilizine, +/obj/item/flashlight/pen, +/obj/item/flashlight/pen, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -18454,11 +18454,11 @@ /area/syndicate_station/start) "uru" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/clotting{ +/obj/item/storage/firstaid/clotting{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/clotting, +/obj/item/storage/firstaid/clotting, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -18512,8 +18512,8 @@ /area/centcom/terminal) "usm" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/weapon/storage/firstaid/surgery{ +/obj/item/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery{ pixel_x = -2; pixel_y = -2 }, @@ -18522,12 +18522,12 @@ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/tank/anesthetic, -/obj/item/weapon/tank/anesthetic{ +/obj/item/tank/anesthetic, +/obj/item/tank/anesthetic{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/autopsy_scanner, +/obj/item/autopsy_scanner, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/breath/medical, /turf/unsimulated/floor{ @@ -18554,22 +18554,22 @@ dir = 4; health = 1e+006 }, -/obj/item/weapon/storage/belt/medical{ +/obj/item/storage/belt/medical{ pixel_x = -2; pixel_y = -3 }, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical{ +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/belt/medical/emt{ +/obj/item/storage/belt/medical/emt{ pixel_x = -2 }, -/obj/item/weapon/storage/belt/medical/emt{ +/obj/item/storage/belt/medical/emt{ pixel_y = 2 }, -/obj/item/weapon/storage/belt/medical/emt{ +/obj/item/storage/belt/medical/emt{ pixel_x = 2; pixel_y = 4 }, @@ -18645,13 +18645,13 @@ /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/simulated/shuttle/floor/voidcraft, /area/syndicate_station/start) "uAD" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/flashbangs, +/obj/item/storage/box/flashbangs, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -18678,7 +18678,7 @@ /area/wizard_station) "uBy" = ( /obj/machinery/portable_atmospherics/canister/phoron, -/obj/item/weapon/tank/vox, +/obj/item/tank/vox, /turf/unsimulated/floor{ icon_state = "asteroid" }, @@ -18803,9 +18803,9 @@ /area/holodeck/source_chess) "uJJ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/device/radio/intercom{ +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; dir = 8; frequency = 1213; @@ -18821,7 +18821,7 @@ /area/wizard_station) "uJQ" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -18920,9 +18920,9 @@ /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, -/obj/item/weapon/gun/projectile/automatic/c20r, -/obj/item/weapon/gun/projectile/automatic/c20r, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -18979,8 +18979,8 @@ /area/centcom/command) "uRP" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -18988,18 +18988,18 @@ /area/centcom/specops) "uSh" = ( /obj/structure/table/steel, -/obj/item/weapon/material/knife{ +/obj/item/material/knife{ pixel_x = -6 }, -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = 9 }, -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = -1 }, @@ -19007,11 +19007,11 @@ /area/syndicate_station/start) "uSn" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/unsimulated/floor{ @@ -19067,7 +19067,7 @@ /area/centcom/medical) "uWn" = ( /obj/structure/closet/emcloset, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -19249,7 +19249,7 @@ }, /area/shuttle/trade) "vle" = ( -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -19302,8 +19302,8 @@ /obj/item/clothing/shoes/boots/workboots, /obj/item/clothing/under/technomancer, /obj/item/clothing/head/technomancer, -/obj/item/weapon/storage/box/syndie_kit/chameleon, -/obj/item/weapon/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -19349,7 +19349,7 @@ }, /area/centcom/command) "vrh" = ( -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -19378,8 +19378,8 @@ }, /area/wizard_station) "vtk" = ( -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -19394,7 +19394,7 @@ /area/centcom/security) "vty" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/unsimulated/floor{ icon_state = "carpet" }, @@ -19498,8 +19498,8 @@ /area/wizard_station) "vzY" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/device/multitool, +/obj/item/storage/belt/utility/full, +/obj/item/multitool, /obj/machinery/light/small, /turf/simulated/shuttle/floor/voidcraft/dark, /area/syndicate_station/start) @@ -19623,11 +19623,11 @@ /obj/random/contraband, /obj/random/contraband, /obj/random/contraband, -/obj/item/weapon/bikehorn, +/obj/item/bikehorn, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "vJH" = ( -/obj/item/weapon/firstaid_arm_assembly, +/obj/item/firstaid_arm_assembly, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -19650,10 +19650,10 @@ /area/centcom/security) "vKY" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw{ +/obj/item/surgical/circular_saw{ pixel_y = 8 }, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/scalpel, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -19693,7 +19693,7 @@ }, /area/centcom/medical) "vNz" = ( -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/unsimulated/floor{ icon_state = "lino" }, @@ -19749,7 +19749,7 @@ /obj/machinery/vending/assist{ contraband = null; name = "AntagCorpVend"; - products = list(/obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/signaler = 4, /obj/item/device/assembly/infra = 4, /obj/item/device/assembly/prox_sensor = 4, /obj/item/weapon/handcuffs = 8, /obj/item/device/flash = 4, /obj/item/weapon/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) + products = list(/obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, /obj/item/assembly/infra = 4, /obj/item/assembly/prox_sensor = 4, /obj/item/handcuffs = 8, /obj/item/flash = 4, /obj/item/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) }, /turf/simulated/shuttle/floor/voidcraft, /area/syndicate_station/start) @@ -19840,7 +19840,7 @@ "vTt" = ( /obj/structure/table/steel_reinforced, /obj/item/clothing/head/philosopher_wig, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; dir = 4; frequency = 1213; @@ -19931,7 +19931,7 @@ /turf/simulated/floor/tiled/white, /area/centcom/bar) "vZC" = ( -/obj/item/weapon/rig/light/stealth, +/obj/item/rig/light/stealth, /obj/structure/table/rack, /turf/unsimulated/floor{ icon_state = "dark" @@ -19939,7 +19939,7 @@ /area/ninja_dojo/dojo) "waw" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /turf/simulated/shuttle/floor, /area/centcom/evac) "waS" = ( @@ -19985,7 +19985,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; dir = 8; frequency = 1213; @@ -20049,7 +20049,7 @@ /area/centcom/main_hall) "wej" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pinpointer/advpinpointer, +/obj/item/pinpointer/advpinpointer, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -20193,11 +20193,11 @@ "wjq" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/warning, -/obj/item/device/kit/paint/gygax/darkgygax, -/obj/item/device/kit/paint/gygax/recitence, -/obj/item/device/kit/paint/durand, -/obj/item/device/kit/paint/durand/phazon, -/obj/item/device/kit/paint/durand/seraph, +/obj/item/kit/paint/gygax/darkgygax, +/obj/item/kit/paint/gygax/recitence, +/obj/item/kit/paint/durand, +/obj/item/kit/paint/durand/phazon, +/obj/item/kit/paint/durand/seraph, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "wjG" = ( @@ -20227,20 +20227,20 @@ req_access = list(150) }, /obj/item/bodybag, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{ +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/glass/bottle/antitoxin{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{ +/obj/item/reagent_containers/glass/bottle/inaprovaline{ pixel_x = 4; pixel_y = 7 }, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/clotting, +/obj/item/reagent_containers/syringe, +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/clotting, /turf/simulated/shuttle/floor/voidcraft/light, /area/syndicate_station/start) "wlf" = ( @@ -20251,7 +20251,7 @@ /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) "wmh" = ( -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -20263,12 +20263,12 @@ dir = 4 }, /obj/structure/window/reinforced, -/obj/item/weapon/rig/ert/engineer{ +/obj/item/rig/ert/engineer{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer{ +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer{ pixel_x = 2; pixel_y = 2 }, @@ -20353,14 +20353,14 @@ /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) "wrb" = ( -/obj/item/weapon/tank/vox, +/obj/item/tank/vox, /turf/unsimulated/floor{ icon_state = "asteroid" }, /area/skipjack_station) "wrA" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood_broken1" @@ -20382,7 +20382,7 @@ pixel_y = 32 }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -20390,7 +20390,7 @@ /area/wizard_station) "wux" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square, +/obj/item/reagent_containers/food/drinks/glass2/square, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -20449,7 +20449,7 @@ /area/centcom/bar) "wwH" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /obj/structure/window/reinforced{ dir = 4 }, @@ -20485,8 +20485,8 @@ /area/centcom/terminal) "wDu" = ( /obj/structure/table/woodentable, -/obj/item/device/radio/headset, -/obj/item/weapon/spacecash/c500, +/obj/item/radio/headset, +/obj/item/spacecash/c500, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -20526,16 +20526,16 @@ /area/centcom/security) "wGm" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/atmospherics/pipe/manifold/visible, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/clotting, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/clotting, /turf/simulated/shuttle/floor/voidcraft/light, /area/syndicate_station/start) "wGD" = ( @@ -20663,7 +20663,7 @@ layer = 4; pixel_y = 32 }, -/obj/item/weapon/ore/slag{ +/obj/item/ore/slag{ desc = "Well at least Arthur doesn't have to share now..."; name = "pet rock" }, @@ -20785,31 +20785,31 @@ /area/skipjack_station) "wOI" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" }, /area/centcom/specops) "wPl" = ( -/obj/item/weapon/bucket_sensor, +/obj/item/bucket_sensor, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -20846,12 +20846,12 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/tool/wrench, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -4 }, /turf/unsimulated/floor{ @@ -20886,11 +20886,11 @@ /area/holodeck/source_emptycourt) "wUL" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/combat{ +/obj/item/storage/firstaid/combat{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -20898,7 +20898,7 @@ /area/centcom/specops) "wUM" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/pda/syndicate, +/obj/item/pda/syndicate, /turf/simulated/shuttle/floor/voidcraft/light, /area/ninja_dojo/start) "wWb" = ( @@ -20911,7 +20911,7 @@ /area/syndicate_station) "wXa" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/unsimulated/floor{ icon_state = "lino" }, @@ -20972,18 +20972,18 @@ /area/skipjack_station/start) "wZS" = ( /obj/structure/table/rack, -/obj/item/weapon/pinpointer/shuttle/merc, -/obj/item/weapon/pinpointer/shuttle/merc, -/obj/item/weapon/pinpointer/shuttle/merc, -/obj/item/weapon/pinpointer/shuttle/merc, -/obj/item/weapon/pinpointer/shuttle/merc, -/obj/item/weapon/pinpointer/shuttle/merc, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, +/obj/item/pinpointer/shuttle/merc, +/obj/item/pinpointer/shuttle/merc, +/obj/item/pinpointer/shuttle/merc, +/obj/item/pinpointer/shuttle/merc, +/obj/item/pinpointer/shuttle/merc, +/obj/item/pinpointer/shuttle/merc, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -21022,10 +21022,10 @@ /area/wizard_station) "xcN" = ( /obj/structure/table/standard, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/weapon/reagent_containers/spray/pepper, -/obj/item/weapon/reagent_containers/spray/pepper, +/obj/item/flash, +/obj/item/flash, +/obj/item/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, /obj/item/clothing/glasses/sunglasses/sechud/tactical, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/glasses/sunglasses, @@ -21109,11 +21109,11 @@ /area/centcom/bar) "xer" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -21185,8 +21185,8 @@ /area/shuttle/escape/centcom) "xiN" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/surgical/cautery, +/obj/item/surgical/hemostat, +/obj/item/surgical/cautery, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -21213,11 +21213,11 @@ /area/space) "xjQ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -21225,11 +21225,11 @@ /area/centcom/specops) "xjU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -21283,11 +21283,11 @@ /area/ninja_dojo/dojo) "xnv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -21304,7 +21304,7 @@ /obj/item/clothing/head/helmet/thunderdome, /obj/item/clothing/under/color/red, /obj/item/clothing/suit/armor/tdome/red, -/obj/item/weapon/holo/esword/red, +/obj/item/holo/esword/red, /obj/effect/floor_decal/corner/red{ dir = 10 }, @@ -21326,7 +21326,7 @@ /obj/item/clothing/suit/wizrobe/marisa, /obj/item/clothing/shoes/sandal/marisa, /obj/item/clothing/head/wizard/marisa, -/obj/item/weapon/staff/broom, +/obj/item/staff/broom, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -21366,12 +21366,12 @@ /area/centcom/terminal) "xrA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -21451,11 +21451,11 @@ /area/holodeck/source_thunderdomecourt) "xvQ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -21493,7 +21493,7 @@ }, /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /turf/simulated/shuttle/floor/white, /area/centcom/evac) "xyu" = ( @@ -21506,11 +21506,11 @@ /area/shuttle/trade) "xyO" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/lipstick/black, -/obj/item/weapon/lipstick/jade, -/obj/item/weapon/lipstick/purple, -/obj/item/weapon/lipstick, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/black, +/obj/item/lipstick/jade, +/obj/item/lipstick/purple, +/obj/item/lipstick, +/obj/item/lipstick/random, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "xyV" = ( @@ -21533,16 +21533,16 @@ /area/holodeck/source_snowfield) "xAB" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, /obj/effect/floor_decal/industrial/outline/blue, -/obj/item/weapon/cell/high, +/obj/item/cell/high, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -21555,7 +21555,7 @@ /turf/simulated/shuttle/floor/voidcraft/light, /area/syndicate_station/start) "xBj" = ( -/obj/item/weapon/reagent_containers/food/snacks/cheesewedge, +/obj/item/reagent_containers/food/snacks/cheesewedge, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -21585,7 +21585,7 @@ /turf/simulated/shuttle/floor, /area/shuttle/transport1/centcom) "xEn" = ( -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, /obj/structure/table/standard, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/corner/blue/diagonal{ @@ -21607,12 +21607,12 @@ /area/holodeck/source_theatre) "xFu" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/structure/window/reinforced{ dir = 1 }, @@ -21650,7 +21650,7 @@ "xIb" = ( /obj/structure/table/standard, /obj/item/stack/medical/advanced/bruise_pack, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/retractor, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -21733,10 +21733,10 @@ /area/centcom/terminal) "xKM" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/device/multitool, -/obj/item/device/multitool, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/multitool, +/obj/item/multitool, /obj/item/clothing/shoes/magboots, /turf/simulated/shuttle/plating, /area/skipjack_station/start) @@ -21751,7 +21751,7 @@ }, /area/centcom/specops) "xNf" = ( -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /obj/structure/bed/padded, /turf/simulated/shuttle/floor/red, /area/skipjack_station/start) @@ -21792,7 +21792,7 @@ contraband = null; dir = 1; name = "Old Vending Machine"; - products = list(/obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/signaler = 4, /obj/item/device/assembly/infra = 4, /obj/item/device/assembly/prox_sensor = 4, /obj/item/weapon/handcuffs = 8, /obj/item/device/flash = 4, /obj/item/weapon/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) + products = list(/obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, /obj/item/assembly/infra = 4, /obj/item/assembly/prox_sensor = 4, /obj/item/handcuffs = 8, /obj/item/flash = 4, /obj/item/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) }, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) @@ -21810,11 +21810,11 @@ /area/centcom/main_hall) "xOv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -21837,7 +21837,7 @@ name = "Cell"; req_access = list(150) }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; @@ -21917,8 +21917,8 @@ dir = 1 }, /obj/structure/table/steel, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/shuttle/floor/voidcraft/light, /area/syndicate_station/start) "xVH" = ( @@ -21935,7 +21935,7 @@ "xWw" = ( /obj/item/target, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; dir = 8; frequency = 1213; @@ -22049,12 +22049,12 @@ }, /area/centcom/bar) "ydQ" = ( -/obj/item/weapon/storage/box/flashshells, -/obj/item/weapon/storage/box/flashshells, -/obj/item/weapon/storage/box/stunshells, -/obj/item/weapon/storage/box/stunshells, -/obj/item/weapon/storage/box/beanbags, -/obj/item/weapon/storage/box/beanbags, +/obj/item/storage/box/flashshells, +/obj/item/storage/box/flashshells, +/obj/item/storage/box/stunshells, +/obj/item/storage/box/stunshells, +/obj/item/storage/box/beanbags, +/obj/item/storage/box/beanbags, /obj/structure/window/reinforced, /obj/structure/table/rack, /obj/structure/window/reinforced{ @@ -22078,7 +22078,7 @@ /area/centcom/medical) "yeY" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) "yfe" = ( @@ -22153,12 +22153,12 @@ /obj/structure/window/reinforced/tinted{ dir = 1 }, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /turf/simulated/shuttle/floor, /area/centcom/evac) "yjS" = ( /obj/structure/table/reinforced, -/obj/item/device/pda/ert, +/obj/item/pda/ert, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -22172,12 +22172,12 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" diff --git a/maps/cynosure/submaps/16x11/OldDorms.dmm b/maps/cynosure/submaps/16x11/OldDorms.dmm index 5f4d0c85aac..a2d6cdad499 100644 --- a/maps/cynosure/submaps/16x11/OldDorms.dmm +++ b/maps/cynosure/submaps/16x11/OldDorms.dmm @@ -39,7 +39,7 @@ /turf/simulated/floor/tiled/dark, /area/template_noop) "cD" = ( -/obj/item/weapon/camera_assembly, +/obj/item/camera_assembly, /turf/simulated/floor/tiled, /area/template_noop) "cL" = ( @@ -88,7 +88,7 @@ dir = 4 }, /obj/item/stack/tile/floor, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, @@ -162,7 +162,7 @@ /obj/structure/closet/cabinet, /obj/random/contraband, /obj/random/drinkbottle, -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/wood, /area/template_noop) "ku" = ( @@ -182,7 +182,7 @@ /obj/machinery/atmospherics/unary/vent_pump{ dir = 8 }, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/template_noop) "mk" = ( @@ -216,7 +216,7 @@ /area/template_noop) "oR" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 2 }, @@ -285,14 +285,14 @@ /area/template_noop) "xI" = ( /obj/structure/bed/double, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 21 }, /turf/simulated/floor/wood/broken, /area/template_noop) "zm" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/plating, /area/template_noop) "zr" = ( @@ -383,7 +383,7 @@ "CQ" = ( /obj/structure/table/standard, /obj/random/soap, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled/freezer, /area/template_noop) "Di" = ( @@ -430,7 +430,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central4{ dir = 4 }, -/obj/item/weapon/stool{ +/obj/item/stool{ dir = 1 }, /turf/simulated/floor/tiled, @@ -483,7 +483,7 @@ /area/template_noop) "MI" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 2 }, @@ -542,7 +542,7 @@ /area/template_noop) "TQ" = ( /obj/structure/table/standard, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /obj/item/clothing/head/soft/grey{ pixel_x = -2; pixel_y = 3 @@ -592,17 +592,17 @@ /area/template_noop) "YN" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, -/obj/item/weapon/handcuffs/fuzzy{ +/obj/item/bedsheet/browndouble, +/obj/item/handcuffs/fuzzy{ pixel_x = -5 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -21 }, /turf/simulated/floor/wood, /area/template_noop) "YR" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/plating, diff --git a/maps/cynosure/submaps/7x7/FightClub.dmm b/maps/cynosure/submaps/7x7/FightClub.dmm index d7df949fa66..9d07c73d502 100644 --- a/maps/cynosure/submaps/7x7/FightClub.dmm +++ b/maps/cynosure/submaps/7x7/FightClub.dmm @@ -1,5 +1,5 @@ "a" = (/obj/structure/sign/poster/custom{dir = 1; pixel_y = 32; poster_decl = /decl/poster/pol_14},/turf/template_noop,/area/template_noop) -"i" = (/obj/machinery/power/apc{coverlocked = 0; locked = 0; name = "south bump"; operating = 0; pixel_y = -24},/obj/item/weapon/cell/high/empty,/turf/simulated/floor/plating,/area/template_noop) +"i" = (/obj/machinery/power/apc{coverlocked = 0; locked = 0; name = "south bump"; operating = 0; pixel_y = -24},/obj/item/cell/high/empty,/turf/simulated/floor/plating,/area/template_noop) "m" = (/obj/structure/railing,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating,/area/template_noop) "o" = (/turf/simulated/wall{can_open = 1},/area/template_noop) "u" = (/obj/structure/railing{dir = 4},/turf/simulated/floor/plating,/area/template_noop) diff --git a/maps/cynosure/submaps/8x9/MouseHouse.dmm b/maps/cynosure/submaps/8x9/MouseHouse.dmm index 661d7aa37f8..dff70ce4737 100644 --- a/maps/cynosure/submaps/8x9/MouseHouse.dmm +++ b/maps/cynosure/submaps/8x9/MouseHouse.dmm @@ -2,11 +2,11 @@ "b" = (/obj/effect/decal/remains/mouse,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) "c" = (/turf/simulated/wall{can_open = 1},/area/template_noop) "e" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/structure/bedsheetbin,/obj/random/plushie,/turf/simulated/floor/wood,/area/template_noop) -"f" = (/obj/structure/dogbed,/obj/effect/decal/remains/mouse,/obj/item/weapon/shreddedp,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"f" = (/obj/structure/dogbed,/obj/effect/decal/remains/mouse,/obj/item/shreddedp,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) "k" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/powercell,/turf/simulated/floor/wood,/area/template_noop) "l" = (/obj/random/plushielarge,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) "m" = (/turf/template_noop,/area/template_noop) -"n" = (/obj/structure/dogbed,/obj/machinery/light/small{dir = 1},/obj/item/weapon/reagent_containers/glass/rag,/mob/living/simple_mob/animal/passive/mouse,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"n" = (/obj/structure/dogbed,/obj/machinery/light/small{dir = 1},/obj/item/reagent_containers/glass/rag,/mob/living/simple_mob/animal/passive/mouse,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) "o" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/random/maintenance,/obj/random/drinksoft,/obj/random/snack,/turf/simulated/floor/wood,/area/template_noop) "p" = (/obj/machinery/door/window/westright,/turf/simulated/floor/wood,/area/template_noop) "t" = (/obj/item/trash/cookiesnack,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) @@ -16,17 +16,17 @@ "y" = (/turf/simulated/floor/wood/broken,/area/template_noop) "z" = (/obj/machinery/papershredder,/turf/simulated/floor/wood,/area/template_noop) "B" = (/obj/structure/dogbed,/obj/random/plushie,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) -"F" = (/obj/item/weapon/reagent_containers/food/snacks/wishsoup{pixel_y = -6},/obj/structure/sink/generic{dir = 4; pixel_x = -12; pixel_y = -4},/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"F" = (/obj/item/reagent_containers/food/snacks/wishsoup{pixel_y = -6},/obj/structure/sink/generic{dir = 4; pixel_x = -12; pixel_y = -4},/turf/simulated/floor/carpet/bcarpet,/area/template_noop) "G" = (/obj/item/trash/semki,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) "H" = (/obj/structure/sign/poster{dir = 8; pixel_x = -32; poster_decl = /decl/poster/bay_49},/turf/simulated/floor/wood,/area/template_noop) -"J" = (/obj/item/weapon/beach_ball,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"J" = (/obj/item/beach_ball,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) "K" = (/obj/structure/bed/chair/office/dark{dir = 1},/turf/simulated/floor/wood,/area/template_noop) "L" = (/obj/item/trash/candy,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) "M" = (/obj/structure/window/basic{dir = 1},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/wood,/area/template_noop) "O" = (/obj/machinery/light/small,/turf/simulated/floor/wood,/area/template_noop) "R" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/mouse,/obj/structure/sign/poster{dir = 1; pixel_y = 32; poster_decl = /decl/poster/vore_91},/turf/simulated/floor/carpet/bcarpet,/area/template_noop) -"S" = (/obj/item/weapon/shreddedp,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) -"T" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/item/device/flashlight/lamp/green,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/wood,/area/template_noop) +"S" = (/obj/item/shreddedp,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"T" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/item/flashlight/lamp/green,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/wood,/area/template_noop) "V" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/mouse,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) "W" = (/obj/structure/loot_pile/maint/trash,/obj/machinery/power/apc{coverlocked = 0; locked = 0; name = "south bump"; operating = 0; pixel_y = -24},/turf/simulated/floor/wood,/area/template_noop) "X" = (/turf/simulated/floor/carpet/bcarpet,/area/template_noop) diff --git a/maps/cynosure/submaps/8x9/ReptileRoom.dmm b/maps/cynosure/submaps/8x9/ReptileRoom.dmm index 1641e5893e8..e6998154325 100644 --- a/maps/cynosure/submaps/8x9/ReptileRoom.dmm +++ b/maps/cynosure/submaps/8x9/ReptileRoom.dmm @@ -14,14 +14,14 @@ "B" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/lizard,/obj/item/trash/unajerky,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) "E" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/structure/bedsheetbin,/obj/random/plushie,/turf/simulated/floor/wood,/area/template_noop) "G" = (/obj/machinery/light/small{dir = 8},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) -"I" = (/obj/item/weapon/reagent_containers/food/snacks/wishsoup{pixel_y = -6},/obj/structure/sink/generic{dir = 4; pixel_x = -12; pixel_y = -4},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) +"I" = (/obj/item/reagent_containers/food/snacks/wishsoup{pixel_y = -6},/obj/structure/sink/generic{dir = 4; pixel_x = -12; pixel_y = -4},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) "L" = (/obj/item/trash/sosjerky,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) "M" = (/obj/structure/window/basic{dir = 1},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/wood,/area/template_noop) "N" = (/obj/structure/bed/chair/office/dark{dir = 1},/turf/simulated/floor/wood,/area/template_noop) "O" = (/obj/machinery/light/small,/obj/item/stack/emptysandbag,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/broken,/area/template_noop) "P" = (/obj/machinery/door/window/northleft,/obj/structure/window/basic{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/template_noop) "R" = (/obj/structure/disposalpipe/trunk,/obj/structure/disposaloutlet{dir = 4},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) -"T" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/item/device/flashlight/lamp/green,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/wood,/area/template_noop) +"T" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/item/flashlight/lamp/green,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/wood,/area/template_noop) "U" = (/obj/item/toy/plushie/lizard,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) "V" = (/obj/machinery/space_heater,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) "W" = (/obj/item/stack/sandbags,/obj/machinery/power/apc{coverlocked = 0; locked = 0; name = "south bump"; operating = 0; pixel_y = -24},/turf/simulated/floor/wood,/area/template_noop) diff --git a/maps/cynosure/submaps/9x8/HotTub.dmm b/maps/cynosure/submaps/9x8/HotTub.dmm index 827b6ffab4e..f0258663a83 100644 --- a/maps/cynosure/submaps/9x8/HotTub.dmm +++ b/maps/cynosure/submaps/9x8/HotTub.dmm @@ -12,7 +12,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 5 }, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/simulated/floor/water/pool{ name = "hot tub" }, @@ -25,9 +25,9 @@ /area/template_noop) "e" = ( /obj/structure/closet/crate/engineering, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, /obj/item/clothing/mask/gas/clear, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/random/medical/lite, /obj/random/maintenance/clean, /obj/random/maintenance, @@ -71,8 +71,8 @@ /area/template_noop) "n" = ( /obj/structure/table/rack, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled/techfloor, /area/template_noop) "o" = ( diff --git a/maps/example/example-1.dmm b/maps/example/example-1.dmm index d25d2c6858c..8547b3c2459 100644 --- a/maps/example/example-1.dmm +++ b/maps/example/example-1.dmm @@ -182,7 +182,7 @@ "B" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/table/standard, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled/dark, /area/aisat) "C" = ( @@ -190,7 +190,7 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /turf/simulated/floor/tiled/dark, /area/aisat) "D" = ( diff --git a/maps/expedition_vr/aerostat/aerostat.dmm b/maps/expedition_vr/aerostat/aerostat.dmm index 2f9706cefaf..b6cbd0a262d 100644 --- a/maps/expedition_vr/aerostat/aerostat.dmm +++ b/maps/expedition_vr/aerostat/aerostat.dmm @@ -309,7 +309,7 @@ }, /obj/machinery/power/apc{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/high/empty; + cell_type = /obj/item/cell/high/empty; dir = 4; name = "east bump"; pixel_x = 28; @@ -1569,7 +1569,7 @@ /area/tether_away/aerostat/inside) "uU" = ( /obj/structure/table/standard, -/obj/item/weapon/gun/energy/taser/xeno, +/obj/item/gun/energy/taser/xeno, /obj/random/cigarettes, /turf/simulated/floor/tiled/techfloor/virgo2, /area/tether_away/aerostat/inside) @@ -1703,7 +1703,7 @@ /area/tether_away/aerostat) "Ym" = ( /obj/structure/table/standard, -/obj/item/weapon/gun/energy/taser/xeno, +/obj/item/gun/energy/taser/xeno, /turf/simulated/floor/tiled/techfloor/virgo2, /area/tether_away/aerostat/inside) "ZK" = ( diff --git a/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm b/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm index 5310c85abc1..0d88eaa6d28 100644 --- a/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm +++ b/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm @@ -681,7 +681,7 @@ pixel_x = -26; pixel_y = -8 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/tiled/white, @@ -1048,10 +1048,10 @@ /area/offmap/aerostat/inside/arm/sw) "cM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/lockbox/vials, -/obj/item/weapon/storage/fancy/vials, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, +/obj/item/storage/lockbox/vials, +/obj/item/storage/fancy/vials, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -1437,19 +1437,19 @@ /area/offmap/aerostat/solars) "dH" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 6; pixel_y = -6 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -6; pixel_y = -6 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -6; pixel_y = 6 }, @@ -1716,8 +1716,8 @@ /area/offmap/aerostat/inside/southchamb) "ev" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes/wolpincubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes/wolpincubes, /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/virology) @@ -2542,8 +2542,8 @@ /area/offmap/aerostat/inside/drillstorage) "hw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -3102,11 +3102,11 @@ /area/offmap/aerostat/solars) "jT" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/wrench{ +/obj/item/tool/wrench{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/tool/wrench{ +/obj/item/tool/wrench{ pixel_x = 2; pixel_y = 2 }, @@ -3245,7 +3245,7 @@ /area/offmap/aerostat/solars) "kq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/tiled, /area/offmap/aerostat/inside/xenobiolab) "ks" = ( @@ -3872,9 +3872,9 @@ /area/offmap/aerostat/inside/miscstorage) "mI" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/item/stack/nanopaste, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 5; pixel_y = 9 }, @@ -4345,9 +4345,9 @@ "ou" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue, /obj/structure/table/standard, -/obj/item/weapon/tool/screwdriver, -/obj/item/device/analyzer, -/obj/item/weapon/tool/wrench, +/obj/item/tool/screwdriver, +/obj/item/analyzer, +/obj/item/tool/wrench, /obj/item/clothing/glasses/welding, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -4469,14 +4469,14 @@ /area/offmap/aerostat/inside/toxins) "oY" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/anodevice{ +/obj/item/tool/crowbar, +/obj/item/anodevice{ pixel_x = 1 }, -/obj/item/weapon/anodevice{ +/obj/item/anodevice{ pixel_x = -2 }, -/obj/item/device/multitool, +/obj/item/multitool, /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) @@ -5102,10 +5102,10 @@ /area/offmap/aerostat/inside/northchamb) "rz" = ( /obj/structure/table/standard, -/obj/item/weapon/tank/phoron, +/obj/item/tank/phoron, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/weapon/tool/wirecutters, +/obj/item/tool/wirecutters, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "rC" = ( @@ -5384,7 +5384,7 @@ icon_state = "1-2" }, /obj/structure/table/standard, -/obj/item/weapon/bluespace_crystal, +/obj/item/bluespace_crystal, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/telesci) "sQ" = ( @@ -5498,7 +5498,7 @@ dir = 8 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/virology) "tq" = ( @@ -5834,8 +5834,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/camera/network/research_outpost, /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled, /area/offmap/aerostat/inside/drillstorage) "uI" = ( @@ -5979,8 +5979,8 @@ }, /obj/structure/cable, /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/disks, -/obj/item/weapon/storage/box/disks, +/obj/item/storage/box/disks, +/obj/item/storage/box/disks, /obj/item/toy/figure/geneticist, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/genetics) @@ -7167,10 +7167,10 @@ /area/offmap/aerostat/inside/xenoarch) "An" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/pill_bottle/dylovene, -/obj/item/weapon/storage/pill_bottle/dylovene, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/pill_bottle/dylovene, +/obj/item/storage/pill_bottle/dylovene, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -7302,11 +7302,11 @@ /turf/simulated/floor, /area/offmap/aerostat/inside/arm/ne) "AE" = ( -/obj/item/weapon/virusdish/random, -/obj/item/weapon/virusdish/random, -/obj/item/weapon/virusdish/random, -/obj/item/weapon/virusdish/random, -/obj/item/weapon/virusdish/random, +/obj/item/virusdish/random, +/obj/item/virusdish/random, +/obj/item/virusdish/random, +/obj/item/virusdish/random, +/obj/item/virusdish/random, /obj/structure/closet/crate/medical{ name = "Virus Samples" }, @@ -7631,13 +7631,13 @@ /area/offmap/aerostat/inside/atmos) "Ca" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen/fountain, -/obj/item/device/assembly_holder/timer_igniter, +/obj/item/folder/white, +/obj/item/pen/fountain, +/obj/item/assembly_holder/timer_igniter, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/structure/extinguisher_cabinet{ pixel_x = 30 }, @@ -8204,8 +8204,8 @@ /area/offmap/aerostat/inside/xenobiolab) "EC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/glass/beaker, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/virology) "ED" = ( @@ -8246,19 +8246,19 @@ /area/offmap/aerostat/inside/airlock/west) "EP" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -5; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 5; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -5; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 5; pixel_y = -4 }, @@ -8745,7 +8745,7 @@ pixel_y = -5 }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/machinery/button/remote/driver{ id = "xenobiolauncher"; pixel_y = 27 @@ -8757,7 +8757,7 @@ pixel_x = 25; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled, /area/offmap/aerostat/inside/xenobiolab) "GN" = ( @@ -8774,10 +8774,10 @@ /area/offmap/aerostat/inside/zorrenoffice) "GO" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, -/obj/item/weapon/paper_bin, -/obj/item/weapon/hand_labeler, +/obj/item/folder/white, +/obj/item/pen, +/obj/item/paper_bin, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/virology) "GP" = ( @@ -8854,9 +8854,9 @@ "Hh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/standard, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/storage/box/beakers, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /obj/machinery/reagentgrinder, /obj/structure/reagent_dispensers/acid{ pixel_x = 31 @@ -9657,7 +9657,7 @@ /area/shuttle/aerostat) "Kj" = ( /obj/structure/table/standard, -/obj/item/device/analyzer, +/obj/item/analyzer, /obj/machinery/camera/network/research_outpost{ dir = 1 }, @@ -10115,13 +10115,13 @@ /area/offmap/aerostat/inside/zorrenoffice) "Ml" = ( /obj/structure/table/reinforced, -/obj/item/weapon/melee/baton/slime/loaded, +/obj/item/melee/baton/slime/loaded, /obj/machinery/power/apc{ dir = 1; pixel_y = 24 }, -/obj/item/weapon/gun/energy/taser/xeno, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/gun/energy/taser/xeno, +/obj/item/storage/box/monkeycubes, /obj/structure/cable{ icon_state = "0-8" }, @@ -10385,7 +10385,7 @@ }, /obj/structure/table/standard, /obj/random/tetheraid, -/obj/item/weapon/storage/firstaid, +/obj/item/storage/firstaid, /obj/structure/cable{ icon_state = "1-2" }, @@ -10656,15 +10656,15 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -5; pixel_y = 5 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -2; pixel_y = 2 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 1; pixel_y = -1 }, @@ -10798,15 +10798,15 @@ "Pi" = ( /obj/structure/closet/walllocker_double/medical/west, /obj/structure/table/reinforced, -/obj/item/weapon/soap, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/masks, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/fancy/vials, -/obj/item/weapon/storage/box/syringes, -/obj/item/device/antibody_scanner, -/obj/item/weapon/storage/box/syringes, +/obj/item/soap, +/obj/item/storage/box/gloves, +/obj/item/storage/box/masks, +/obj/item/storage/box/beakers, +/obj/item/storage/box/beakers, +/obj/item/storage/fancy/vials, +/obj/item/storage/box/syringes, +/obj/item/antibody_scanner, +/obj/item/storage/box/syringes, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -11005,7 +11005,7 @@ "Qh" = ( /obj/machinery/vending/phoronresearch{ name = "Toximate 2556"; - products = list(/obj/item/device/transfer_valve = 3, /obj/item/device/assembly/timer = 6, /obj/item/device/assembly/signaler = 6, /obj/item/device/assembly/prox_sensor = 6, /obj/item/device/assembly/igniter = 12) + products = list(/obj/item/transfer_valve = 3, /obj/item/assembly/timer = 6, /obj/item/assembly/signaler = 6, /obj/item/assembly/prox_sensor = 6, /obj/item/assembly/igniter = 12) }, /obj/machinery/camera/network/research_outpost{ dir = 8 @@ -11102,20 +11102,20 @@ /area/offmap/aerostat/inside/westhall) "QA" = ( /obj/structure/table/standard, -/obj/item/weapon/anobattery, -/obj/item/weapon/anobattery{ +/obj/item/anobattery, +/obj/item/anobattery{ pixel_x = 5; pixel_y = 2 }, -/obj/item/weapon/anobattery{ +/obj/item/anobattery{ pixel_x = -4; pixel_y = 3 }, -/obj/item/weapon/anobattery{ +/obj/item/anobattery{ pixel_x = -5; pixel_y = -3 }, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "QE" = ( @@ -11665,7 +11665,7 @@ /obj/machinery/computer/scan_consolenew{ dir = 8 }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "out of order" }, /turf/simulated/floor/tiled/white, @@ -12630,12 +12630,12 @@ /obj/structure/table/rack, /obj/item/clothing/suit/space/anomaly/heat, /obj/item/clothing/head/helmet/space/anomaly/heat, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/storage/excavation, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/pickaxe, -/obj/item/device/measuring_tape, -/obj/item/weapon/storage/belt/archaeology, +/obj/item/suit_cooling_unit, +/obj/item/storage/excavation, +/obj/item/tool/wrench, +/obj/item/pickaxe, +/obj/item/measuring_tape, +/obj/item/storage/belt/archaeology, /obj/item/stack/flag/yellow, /obj/item/clothing/mask/breath, /obj/machinery/alarm{ @@ -12712,8 +12712,8 @@ /area/offmap/aerostat/inside/toxins) "WR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/virology, -/obj/item/device/antibody_scanner, +/obj/item/book/manual/virology, +/obj/item/antibody_scanner, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/virology) "WS" = ( @@ -12863,8 +12863,8 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/device/multitool, -/obj/item/weapon/tool/screwdriver, +/obj/item/multitool, +/obj/item/tool/screwdriver, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/telesci) "XA" = ( @@ -13162,12 +13162,12 @@ /area/offmap/aerostat/inside/atmos) "YC" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /obj/machinery/light{ dir = 4 }, @@ -13359,12 +13359,12 @@ /obj/structure/table/rack, /obj/item/clothing/suit/space/anomaly/heat, /obj/item/clothing/head/helmet/space/anomaly/heat, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/storage/excavation, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/pickaxe, -/obj/item/device/measuring_tape, -/obj/item/weapon/storage/belt/archaeology, +/obj/item/suit_cooling_unit, +/obj/item/storage/excavation, +/obj/item/tool/wrench, +/obj/item/pickaxe, +/obj/item/measuring_tape, +/obj/item/storage/belt/archaeology, /obj/item/stack/flag/yellow, /obj/item/clothing/mask/breath, /turf/simulated/floor/tiled/white, diff --git a/maps/expedition_vr/aerostat/surface.dmm b/maps/expedition_vr/aerostat/surface.dmm index dbcc8ac7eba..9fdb83bd573 100644 --- a/maps/expedition_vr/aerostat/surface.dmm +++ b/maps/expedition_vr/aerostat/surface.dmm @@ -209,7 +209,7 @@ /area/offmap/aerostat/surface/outpost/guardpost) "fZ" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/offmap/aerostat/surface/outpost/officerone) "gb" = ( @@ -233,7 +233,7 @@ /turf/simulated/floor/tiled/eris/white/techfloor_grid, /area/offmap/aerostat/surface/outpost/backroom) "gx" = ( -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/structure/bed/padded, /obj/structure/curtain/black, /turf/simulated/floor/wood, @@ -251,7 +251,7 @@ /area/offmap/aerostat/surface/outpost/guardpost) "gU" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/offmap/aerostat/surface/outpost/officertwo) "he" = ( @@ -660,18 +660,18 @@ /obj/structure/closet/crate{ dir = 1 }, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/knife/table, -/obj/item/weapon/material/knife/table, -/obj/item/weapon/material/knife/table, -/obj/item/weapon/material/knife/table, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/knife/table, +/obj/item/material/knife/table, +/obj/item/material/knife/table, +/obj/item/material/knife/table, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/offmap/aerostat/surface/outpost/cafe) "sz" = ( @@ -967,7 +967,7 @@ /turf/simulated/floor/tiled/eris/steel/techfloor_grid, /area/offmap/aerostat/surface/outpost/cafe) "zG" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 4 }, /turf/simulated/floor/tiled/eris/dark, @@ -999,7 +999,7 @@ /area/offmap/aerostat/surface/outpost/cafe) "AQ" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /turf/simulated/floor/wood, /area/offmap/aerostat/surface/outpost/officertwo) "Bb" = ( @@ -1102,7 +1102,7 @@ /area/offmap/aerostat/surface/explored) "ET" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /turf/simulated/floor/wood, /area/offmap/aerostat/surface/outpost/officerone) "EV" = ( @@ -1514,7 +1514,7 @@ /area/offmap/aerostat/surface/outpost/airlock) "ON" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/storage/box/glasses, +/obj/item/storage/box/glasses, /obj/item/paint_brush, /obj/item/paint_palette, /turf/simulated/floor/tiled/eris/dark/monofloor, @@ -1650,17 +1650,17 @@ /area/offmap/aerostat/surface/outpost/backroom) "Sr" = ( /obj/structure/closet/walllocker_double/kitchen/west, -/obj/item/weapon/storage/box/tgmc_mre, -/obj/item/weapon/storage/box/tgmc_mre{ +/obj/item/storage/box/tgmc_mre, +/obj/item/storage/box/tgmc_mre{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/storage/box/tgmc_mre, -/obj/item/weapon/storage/box/tgmc_mre{ +/obj/item/storage/box/tgmc_mre, +/obj/item/storage/box/tgmc_mre{ pixel_x = -3; pixel_y = 5 }, -/obj/item/weapon/storage/box/tgmc_mre{ +/obj/item/storage/box/tgmc_mre{ pixel_x = 4; pixel_y = -4 }, @@ -1717,7 +1717,7 @@ /area/offmap/aerostat/surface/outpost/backroom) "Ur" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/storage/box/glasses/pint, +/obj/item/storage/box/glasses/pint, /obj/item/canvas/twentyfour_twentyfour, /obj/item/canvas/nineteen_nineteen, /turf/simulated/floor/tiled/eris/dark/monofloor, diff --git a/maps/expedition_vr/alienship/_alienship.dm b/maps/expedition_vr/alienship/_alienship.dm index 890f1e5c77a..bc2413f1ed1 100644 --- a/maps/expedition_vr/alienship/_alienship.dm +++ b/maps/expedition_vr/alienship/_alienship.dm @@ -55,7 +55,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 @@ -95,7 +95,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' @@ -159,10 +159,10 @@ L.forceMove(pick(get_area_turfs(dump_area))) if(!issilicon(L)) //Don't drop borg modules... for(var/obj/item/I in L) - if(istype(I,/obj/item/weapon/implant) || istype(I,/obj/item/device/nif)) + if(istype(I,/obj/item/implant) || istype(I,/obj/item/nif)) continue - if(istype(I,/obj/item/weapon/holder)) - var/obj/item/weapon/holder/H = I + if(istype(I,/obj/item/holder)) + var/obj/item/holder/H = I var/mob/living/M = H.held_mob M.forceMove(get_turf(H)) abduct(M) diff --git a/maps/expedition_vr/alienship/alienship.dmm b/maps/expedition_vr/alienship/alienship.dmm index bbe4d4fd3b6..edfa71c50f3 100644 --- a/maps/expedition_vr/alienship/alienship.dmm +++ b/maps/expedition_vr/alienship/alienship.dmm @@ -126,17 +126,17 @@ /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "aB" = ( -/obj/item/weapon/cell/device/weapon/recharge/alien, +/obj/item/cell/device/weapon/recharge/alien, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "aC" = ( -/obj/item/device/gps, +/obj/item/gps, /obj/structure/table/alien, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "aD" = ( /obj/structure/table/alien, -/obj/item/weapon/cell/device/weapon/recharge/alien, +/obj/item/cell/device/weapon/recharge/alien, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "aE" = ( @@ -144,86 +144,86 @@ /area/tether_away/alienship/equip_dump) "aF" = ( /obj/structure/closet/crate, -/obj/item/device/multitool, -/obj/item/weapon/tool/wrench, -/obj/item/device/radio, +/obj/item/multitool, +/obj/item/tool/wrench, +/obj/item/radio, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "aG" = ( /obj/structure/closet/crate, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/weldingtool, +/obj/item/tool/crowbar, +/obj/item/weldingtool, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "aH" = ( /obj/structure/closet/crate, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/wirecutters, -/obj/item/weapon/weldingtool, -/obj/item/weapon/storage/firstaid, +/obj/item/tool/crowbar, +/obj/item/tool/screwdriver, +/obj/item/tool/wirecutters, +/obj/item/weldingtool, +/obj/item/storage/firstaid, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "aI" = ( /obj/structure/table/alien, -/obj/item/weapon/storage/belt/utility/alien/full, +/obj/item/storage/belt/utility/alien/full, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "aJ" = ( /obj/structure/closet/crate, -/obj/item/device/multitool, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/wirecutters, -/obj/item/weapon/tool/wrench, +/obj/item/multitool, +/obj/item/tool/screwdriver, +/obj/item/tool/wirecutters, +/obj/item/tool/wrench, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "aK" = ( /obj/structure/closet/crate, -/obj/item/weapon/tool/transforming/jawsoflife, -/obj/item/weapon/tool/wrench, +/obj/item/tool/transforming/jawsoflife, +/obj/item/tool/wrench, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "aL" = ( /obj/structure/closet/crate, -/obj/item/device/multitool, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/weldingtool, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/multitool, +/obj/item/tool/screwdriver, +/obj/item/weldingtool, +/obj/item/storage/firstaid/regular, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "aM" = ( /obj/structure/closet/crate, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/transforming/powerdrill, -/obj/item/weapon/tool/wirecutters, +/obj/item/tool/crowbar/red, +/obj/item/tool/transforming/powerdrill, +/obj/item/tool/wirecutters, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "aN" = ( /obj/structure/closet/crate, -/obj/item/device/multitool, -/obj/item/weapon/tool/wirecutters, -/obj/item/device/radio, -/obj/item/weapon/weldingtool, +/obj/item/multitool, +/obj/item/tool/wirecutters, +/obj/item/radio, +/obj/item/weldingtool, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "aO" = ( -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "aP" = ( /obj/effect/decal/remains/xeno, -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "aQ" = ( -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "aR" = ( /obj/structure/table/alien, -/obj/item/weapon/reagent_containers/food/drinks/glass2/pint{ +/obj/item/reagent_containers/food/drinks/glass2/pint{ desc = "There's a permanent colored stain around the inside, as if it held a liquid for a very, very long time."; name = "ancient pint glass" }, @@ -254,12 +254,12 @@ /area/tether_away/alienship) "aX" = ( /obj/structure/closet/alien, -/obj/item/weapon/reagent_containers/hypospray/autoinjector/alien, +/obj/item/reagent_containers/hypospray/autoinjector/alien, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "aY" = ( /obj/structure/table/alien, -/obj/item/weapon/reagent_containers/hypospray/autoinjector/alien, +/obj/item/reagent_containers/hypospray/autoinjector/alien, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "bJ" = ( @@ -334,7 +334,7 @@ /area/tether_away/alienship) "ca" = ( /obj/structure/table/alien, -/obj/item/weapon/paper/alien{ +/obj/item/paper/alien{ icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" }, @@ -350,17 +350,17 @@ /area/tether_away/alienship) "cd" = ( /obj/structure/table/alien, -/obj/item/weapon/surgical/FixOVein/alien, +/obj/item/surgical/FixOVein/alien, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "ce" = ( /obj/structure/table/alien, -/obj/item/weapon/surgical/bone_clamp/alien, +/obj/item/surgical/bone_clamp/alien, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "cf" = ( /obj/structure/table/alien, -/obj/item/weapon/paper/alien{ +/obj/item/paper/alien{ icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" }, @@ -368,7 +368,7 @@ /area/tether_away/alienship) "cg" = ( /obj/structure/table/alien, -/obj/item/weapon/surgical/circular_saw/alien, +/obj/item/surgical/circular_saw/alien, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "ch" = ( @@ -382,7 +382,7 @@ /area/tether_away/alienship) "cj" = ( /obj/structure/closet/alien, -/obj/item/weapon/paper/alien, +/obj/item/paper/alien, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "ck" = ( @@ -433,7 +433,7 @@ /area/tether_away/alienship) "cu" = ( /obj/structure/table/alien, -/obj/item/device/multitool/alien, +/obj/item/multitool/alien, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "cv" = ( @@ -448,12 +448,12 @@ /area/tether_away/alienship) "cx" = ( /obj/structure/table/alien, -/obj/item/weapon/surgical/hemostat/alien, +/obj/item/surgical/hemostat/alien, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "cy" = ( /obj/structure/table/alien, -/obj/item/weapon/storage/belt/utility/alien/full, +/obj/item/storage/belt/utility/alien/full, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "cz" = ( @@ -471,7 +471,7 @@ /area/tether_away/alienship) "cC" = ( /obj/structure/table/alien, -/obj/item/weapon/surgical/cautery/alien, +/obj/item/surgical/cautery/alien, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "cD" = ( @@ -480,69 +480,69 @@ /area/tether_away/alienship) "cE" = ( /obj/structure/table/alien, -/obj/item/weapon/surgical/hemostat/alien, +/obj/item/surgical/hemostat/alien, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "cF" = ( /obj/structure/closet/alien, -/obj/item/weapon/gun/energy/alien, +/obj/item/gun/energy/alien, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "cG" = ( /obj/structure/table/alien, -/obj/item/weapon/surgical/bone_clamp/alien, +/obj/item/surgical/bone_clamp/alien, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "cH" = ( -/obj/item/device/multitool/alien, +/obj/item/multitool/alien, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "cI" = ( -/obj/item/weapon/cell/device/weapon/recharge/alien, +/obj/item/cell/device/weapon/recharge/alien, /obj/structure/table/alien, -/obj/item/weapon/weldingtool/alien, +/obj/item/weldingtool/alien, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "cJ" = ( -/obj/item/weapon/cell/device/weapon/recharge/alien, +/obj/item/cell/device/weapon/recharge/alien, /obj/structure/table/alien, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "cL" = ( /obj/structure/table/alien, -/obj/item/weapon/tool/crowbar/alien, +/obj/item/tool/crowbar/alien, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "cM" = ( -/obj/item/weapon/tool/screwdriver/alien, +/obj/item/tool/screwdriver/alien, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "cO" = ( /obj/structure/table/alien, -/obj/item/weapon/surgical/scalpel/alien, +/obj/item/surgical/scalpel/alien, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "cP" = ( /obj/structure/table/alien, -/obj/item/weapon/surgical/retractor/alien, +/obj/item/surgical/retractor/alien, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "cQ" = ( /obj/structure/table/alien, -/obj/item/device/gps, +/obj/item/gps, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "cR" = ( -/obj/item/device/gps, +/obj/item/gps, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "cS" = ( /obj/structure/table/alien, -/obj/item/weapon/gun/energy/alien, +/obj/item/gun/energy/alien, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "cT" = ( -/obj/item/device/gps, +/obj/item/gps, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "da" = ( @@ -555,11 +555,11 @@ /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "gG" = ( -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, /turf/simulated/shuttle/floor/alienplating, /area/tether_away/alienship) "nr" = ( -/obj/item/weapon/storage/firstaid, +/obj/item/storage/firstaid, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "us" = ( @@ -580,7 +580,7 @@ /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship/equip_dump) "Rx" = ( -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, /turf/simulated/shuttle/floor/alien, /area/tether_away/alienship) "YP" = ( diff --git a/maps/expedition_vr/beach/beach.dmm b/maps/expedition_vr/beach/beach.dmm index d763c2118cf..e54667d574d 100644 --- a/maps/expedition_vr/beach/beach.dmm +++ b/maps/expedition_vr/beach/beach.dmm @@ -25,7 +25,7 @@ /area/tether_away/beach/powershed) "ag" = ( /obj/structure/table/woodentable, -/obj/item/weapon/cell/apc, +/obj/item/cell/apc, /turf/simulated/floor/wood, /area/tether_away/beach/resort/janibar) "ah" = ( @@ -170,7 +170,7 @@ /area/tether_away/beach/resort/janibar) "aM" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/manual/barman_recipes, +/obj/item/book/manual/barman_recipes, /turf/simulated/floor/wood, /area/tether_away/beach/resort/janibar) "aN" = ( @@ -212,7 +212,7 @@ /area/tether_away/beach/resort/janibar) "aU" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale, +/obj/item/reagent_containers/food/drinks/bottle/small/ale, /turf/simulated/floor/wood, /area/tether_away/beach/resort/janibar) "aV" = ( @@ -221,11 +221,11 @@ /area/tether_away/beach/resort/janibar) "aW" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, /turf/simulated/floor/wood, /area/tether_away/beach/resort/janibar) "aX" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/tiled/asteroid_steel{ @@ -234,7 +234,7 @@ /area/tether_away/beach/resort) "aY" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/greendouble, +/obj/item/bedsheet/greendouble, /turf/simulated/floor/wood, /area/tether_away/beach) "ba" = ( @@ -245,11 +245,11 @@ /turf/simulated/floor/beach/sand/desert/outdoors, /area/tether_away/beach) "bc" = ( -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, /turf/simulated/floor/beach/sand/desert/outdoors, /area/tether_away/beach) "bd" = ( -/obj/item/weapon/beach_ball, +/obj/item/beach_ball, /turf/simulated/floor/beach/sand/desert/outdoors, /area/tether_away/beach) "be" = ( @@ -359,7 +359,7 @@ }, /area/tether_away/beach/resort) "di" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/mineral/floor/cave{ @@ -371,7 +371,7 @@ /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/lockermed) "dt" = ( -/obj/item/weapon/bedsheet/pirate, +/obj/item/bedsheet/pirate, /obj/machinery/button/remote/airlock{ id = "LoveShack4"; name = "Door Bolt Control"; @@ -383,7 +383,7 @@ /area/tether_away/beach/resort/dorm4) "dP" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /turf/simulated/floor/tiled/kafel_full/white, /area/tether_away/beach/resort/lockermed) "dY" = ( @@ -438,16 +438,16 @@ /area/tether_away/beach/resort) "eW" = ( /obj/structure/table/glass, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = 9 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = 2 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = -5 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = -12 }, /obj/machinery/light/small{ @@ -475,7 +475,7 @@ /turf/simulated/floor/tiled/eris/cafe, /area/tether_away/beach/resort/kitchen) "fJ" = ( -/obj/item/weapon/bedsheet/ian, +/obj/item/bedsheet/ian, /obj/machinery/button/remote/airlock{ id = "LoveShack3"; name = "Door Bolt Control"; @@ -535,7 +535,7 @@ /obj/structure/cable/cyan{ icon_state = "1-4" }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/tiled/asteroid_steel{ @@ -715,10 +715,10 @@ /area/tether_away/beach/resort/dorm2) "la" = ( /obj/structure/table/rack, -/obj/item/weapon/material/fishing_net, -/obj/item/weapon/material/fishing_net, -/obj/item/weapon/material/fishing_net, -/obj/item/weapon/material/fishing_net, +/obj/item/material/fishing_net, +/obj/item/material/fishing_net, +/obj/item/material/fishing_net, +/obj/item/material/fishing_net, /obj/item/stack/cable_coil/pink, /obj/item/stack/cable_coil/pink, /turf/simulated/floor/tiled/asteroid_steel, @@ -848,7 +848,7 @@ /turf/simulated/floor/wood, /area/tether_away/beach/resort/dorm1) "oq" = ( -/obj/item/weapon/bedsheet/rainbow, +/obj/item/bedsheet/rainbow, /obj/machinery/button/remote/airlock{ id = "LoveShack1"; name = "Door Bolt Control"; @@ -867,7 +867,7 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/tiled/asteroid_steel{ @@ -876,10 +876,10 @@ /area/tether_away/beach/resort) "pd" = ( /obj/structure/table/rack, -/obj/item/weapon/material/fishing_rod/modern/cheap, -/obj/item/weapon/material/fishing_rod/modern/cheap, -/obj/item/weapon/material/fishing_rod/modern/cheap, -/obj/item/weapon/material/fishing_rod/modern/cheap, +/obj/item/material/fishing_rod/modern/cheap, +/obj/item/material/fishing_rod/modern/cheap, +/obj/item/material/fishing_rod/modern/cheap, +/obj/item/material/fishing_rod/modern/cheap, /obj/item/stack/cable_coil/pink, /obj/item/stack/cable_coil/pink, /turf/simulated/floor/tiled/asteroid_steel, @@ -940,7 +940,7 @@ }, /area/tether_away/beach/resort) "pM" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/mineral/floor/cave{ @@ -1129,7 +1129,7 @@ /area/tether_away/beach/cavebase) "vU" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/tether_away/beach) "wv" = ( @@ -1197,7 +1197,7 @@ /turf/simulated/floor/outdoors/grass, /area/tether_away/beach/resort/janibar) "yz" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/mineral/floor/cave{ @@ -1259,7 +1259,7 @@ /turf/simulated/floor/outdoors/grass/forest, /area/tether_away/beach/jungle) "Aw" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/mineral/floor/cave{ name = "dirt" }, @@ -1277,54 +1277,54 @@ /turf/simulated/floor/beach/sand/outdoors, /area/tether_away/beach/resort) "Bk" = ( -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/knife/machete/hatchet, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/material/knife/butch, +/obj/item/material/minihoe, +/obj/item/material/knife/machete/hatchet, /obj/random/drinkbottle, /obj/random/drinkbottle, /obj/random/drinkbottle, /obj/structure/closet, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/glass/bucket, +/obj/item/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/glass/bottle/eznutrient, -/obj/item/weapon/reagent_containers/glass/bottle/eznutrient, -/obj/item/weapon/reagent_containers/glass/bottle/eznutrient, -/obj/item/weapon/reagent_containers/glass/bottle/eznutrient, -/obj/item/weapon/reagent_containers/glass/bottle/eznutrient, +/obj/item/reagent_containers/glass/bottle/eznutrient, +/obj/item/reagent_containers/glass/bottle/eznutrient, +/obj/item/reagent_containers/glass/bottle/eznutrient, +/obj/item/reagent_containers/glass/bottle/eznutrient, +/obj/item/reagent_containers/glass/bottle/eznutrient, /obj/random/donkpocketbox, /turf/simulated/floor/tiled/eris/cafe, /area/tether_away/beach/resort/kitchen) "By" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 4 }, /turf/simulated/floor/lino, @@ -1516,12 +1516,12 @@ /area/tether_away/beach/jungle) "Hv" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/material/kitchen/rollingpin, +/obj/item/book/manual/chef_recipes, +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/eris/cafe, /area/tether_away/beach/resort/kitchen) "HO" = ( @@ -1708,7 +1708,7 @@ }, /area/tether_away/beach/resort) "MZ" = ( -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/machinery/button/remote/airlock{ id = "LoveShack2"; name = "Door Bolt Control"; @@ -1803,9 +1803,9 @@ /area/tether_away/beach/resort/lockermed) "QL" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/mop, +/obj/item/mop, /obj/random/soap, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/janibar) "QY" = ( @@ -1832,11 +1832,11 @@ pixel_y = 26 }, /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/shaker, /obj/item/clothing/glasses/sunglasses, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /turf/simulated/floor/wood, /area/tether_away/beach/resort/janibar) "Rv" = ( @@ -1910,8 +1910,8 @@ /turf/simulated/floor/tiled/eris/cafe, /area/tether_away/beach/resort/kitchen) "SK" = ( -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/table/rack/steel, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/janibar) @@ -2132,7 +2132,7 @@ /area/tether_away/beach/resort/dorm2) "YY" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/mineral/floor/cave{ name = "dirt" }, diff --git a/maps/expedition_vr/beach/submaps/BlastMine1.dmm b/maps/expedition_vr/beach/submaps/BlastMine1.dmm index 957517f9649..95eb5795d47 100644 --- a/maps/expedition_vr/beach/submaps/BlastMine1.dmm +++ b/maps/expedition_vr/beach/submaps/BlastMine1.dmm @@ -11,7 +11,7 @@ /area/submap/cave/BlastMine1) "d" = ( /obj/structure/table/rack, -/obj/item/weapon/syndie/c4explosive, +/obj/item/syndie/c4explosive, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/BlastMine1) "e" = ( @@ -29,7 +29,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/BlastMine1) "h" = ( -/obj/item/device/gps/internal/poi{ +/obj/item/gps/internal/poi{ gps_tag = "Unidentified Signal" }, /turf/simulated/wall/sandstone, @@ -40,7 +40,7 @@ /area/submap/cave/BlastMine1) "j" = ( /obj/structure/table/reinforced, -/obj/item/weapon/flame/lighter/zippo/c4detonator{ +/obj/item/flame/lighter/zippo/c4detonator{ detonator_mode = 1 }, /turf/simulated/mineral/floor/ignore_mapgen/cave, diff --git a/maps/expedition_vr/beach/submaps/Cliff1.dmm b/maps/expedition_vr/beach/submaps/Cliff1.dmm index f34c92b82c2..6464844b854 100644 --- a/maps/expedition_vr/beach/submaps/Cliff1.dmm +++ b/maps/expedition_vr/beach/submaps/Cliff1.dmm @@ -6,7 +6,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/template_noop) "c" = ( -/obj/item/weapon/ore, +/obj/item/ore, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/ore_cliff) "d" = ( diff --git a/maps/expedition_vr/beach/submaps/CrashedMedShuttle1.dmm b/maps/expedition_vr/beach/submaps/CrashedMedShuttle1.dmm index 8b980b9988c..86ca457a7f2 100644 --- a/maps/expedition_vr/beach/submaps/CrashedMedShuttle1.dmm +++ b/maps/expedition_vr/beach/submaps/CrashedMedShuttle1.dmm @@ -29,13 +29,13 @@ /turf/simulated/shuttle/wall, /area/submap/CrashedMedShuttle) "ah" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/CrashedMedShuttle) "ai" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/effect/decal/cleanable/blood/oil, @@ -57,7 +57,7 @@ /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "al" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/machinery/light{ dir = 1 }, @@ -76,7 +76,7 @@ /turf/simulated/floor/outdoors/rocks/caves, /area/submap/CrashedMedShuttle) "ao" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /obj/structure/door_assembly/door_assembly_ext, /turf/simulated/shuttle/plating, /area/submap/CrashedMedShuttle) @@ -101,7 +101,7 @@ /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "at" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/structure/lattice, /turf/simulated/floor/outdoors/rocks, /area/submap/CrashedMedShuttle) @@ -130,7 +130,7 @@ /area/submap/CrashedMedShuttle) "az" = ( /obj/effect/decal/cleanable/blood/gibs/robot, -/obj/item/weapon/firstaid_arm_assembly, +/obj/item/firstaid_arm_assembly, /mob/living/simple_mob/animal/giant_spider/frost, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) @@ -145,7 +145,7 @@ /area/submap/CrashedMedShuttle) "aC" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/item/weapon/firstaid_arm_assembly, +/obj/item/firstaid_arm_assembly, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "aD" = ( @@ -184,7 +184,7 @@ /area/submap/CrashedMedShuttle) "aK" = ( /obj/structure/table/standard, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/effect/spider/stickyweb, @@ -192,14 +192,14 @@ /area/submap/CrashedMedShuttle) "aL" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/item/stack/rods, /turf/simulated/shuttle/plating, /area/submap/CrashedMedShuttle) "aM" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/CrashedMedShuttle) "aN" = ( @@ -207,7 +207,7 @@ /turf/simulated/floor/outdoors/rocks/caves, /area/submap/CrashedMedShuttle) "aO" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/effect/spider/stickyweb, @@ -239,7 +239,7 @@ /area/submap/CrashedMedShuttle) "aU" = ( /obj/structure/table/standard, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/random/medical, @@ -274,7 +274,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/CrashedMedShuttle) "bc" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/floor/outdoors/rocks/caves, @@ -299,7 +299,7 @@ pixel_x = -32 }, /obj/structure/lattice, -/obj/item/device/gps/internal/poi, +/obj/item/gps/internal/poi, /obj/structure/flora/tree/sif, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/CrashedMedShuttle) @@ -312,7 +312,7 @@ /area/submap/CrashedMedShuttle) "bh" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/floor/outdoors/rocks/caves, @@ -323,9 +323,9 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/CrashedMedShuttle) "bj" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/effect/spider/stickyweb, -/obj/item/weapon/beartrap{ +/obj/item/beartrap{ anchored = 1; deployed = 1; icon_state = "beartrap1" @@ -340,7 +340,7 @@ /area/submap/CrashedMedShuttle) "bl" = ( /obj/effect/spider/stickyweb, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "bm" = ( @@ -366,7 +366,7 @@ /area/submap/CrashedMedShuttle) "br" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/outdoors/rocks, /area/submap/CrashedMedShuttle) "bs" = ( @@ -381,7 +381,7 @@ /area/submap/CrashedMedShuttle) "bu" = ( /obj/effect/decal/remains/tajaran, -/obj/item/weapon/surgical/circular_saw, +/obj/item/surgical/circular_saw, /turf/simulated/floor/outdoors/rocks, /area/submap/CrashedMedShuttle) "bv" = ( @@ -390,7 +390,7 @@ /turf/simulated/floor/outdoors/rocks, /area/submap/CrashedMedShuttle) "bw" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/structure/loot_pile/maint/technical, /obj/structure/lattice, /turf/simulated/mineral/floor/ignore_mapgen/cave, @@ -402,7 +402,7 @@ /turf/simulated/shuttle/floor/purple, /area/submap/CrashedMedShuttle) "by" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "bz" = ( @@ -432,7 +432,7 @@ /area/submap/CrashedMedShuttle) "bD" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /turf/simulated/shuttle/floor/purple, /area/submap/CrashedMedShuttle) "bE" = ( @@ -446,7 +446,7 @@ /area/submap/CrashedMedShuttle) "bG" = ( /obj/structure/table/standard, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "bH" = ( @@ -456,7 +456,7 @@ /area/submap/CrashedMedShuttle) "bI" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "bJ" = ( @@ -467,11 +467,11 @@ /area/submap/CrashedMedShuttle) "bK" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/retractor, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "bL" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/structure/grille, /turf/simulated/shuttle/plating, /area/submap/CrashedMedShuttle) @@ -496,7 +496,7 @@ /obj/structure/closet/secure_closet/medical_wall/anesthetics{ pixel_x = 32 }, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/shuttle/floor/white, @@ -516,11 +516,11 @@ "bR" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/structure/loot_pile/surface/bones, -/obj/item/weapon/surgical/surgicaldrill, +/obj/item/surgical/surgicaldrill, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "bS" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/structure/grille, @@ -528,12 +528,12 @@ /area/submap/CrashedMedShuttle) "bT" = ( /obj/structure/table/standard, -/obj/item/device/reagent_scanner/adv, +/obj/item/reagent_scanner/adv, /turf/simulated/shuttle/floor/purple, /area/submap/CrashedMedShuttle) "bU" = ( /obj/machinery/iv_drip, -/obj/item/weapon/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "bV" = ( @@ -542,7 +542,7 @@ /area/submap/CrashedMedShuttle) "bW" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "bX" = ( @@ -552,7 +552,7 @@ /area/submap/CrashedMedShuttle) "bY" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/backpack/medic, +/obj/item/storage/backpack/medic, /obj/random/medical/lite, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) @@ -575,8 +575,8 @@ /obj/structure/sign/periodic{ pixel_y = -32 }, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/bonesetter, +/obj/item/surgical/scalpel, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "cd" = ( @@ -587,8 +587,8 @@ /area/submap/CrashedMedShuttle) "ce" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/bonegel, -/obj/item/weapon/surgical/FixOVein, +/obj/item/surgical/bonegel, +/obj/item/surgical/FixOVein, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "cf" = ( @@ -605,12 +605,12 @@ /area/submap/CrashedMedShuttle) "cg" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "ch" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/effect/spider/stickyweb, /obj/machinery/light, /turf/simulated/shuttle/floor/white, diff --git a/maps/expedition_vr/beach/submaps/Mineshaft1.dmm b/maps/expedition_vr/beach/submaps/Mineshaft1.dmm index 45cfbc7b2ae..7c6fd382ad8 100644 --- a/maps/expedition_vr/beach/submaps/Mineshaft1.dmm +++ b/maps/expedition_vr/beach/submaps/Mineshaft1.dmm @@ -27,7 +27,7 @@ /area/submap/cave/AMine1) "i" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled, /area/submap/cave/AMine1) "j" = ( @@ -36,7 +36,7 @@ /area/submap/cave/AMine1) "k" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/light{ icon_state = "tube1"; dir = 1 @@ -53,40 +53,40 @@ /turf/simulated/floor/tiled, /area/submap/cave/AMine1) "n" = ( -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/AMine1) "o" = ( -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/AMine1) "p" = ( -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/AMine1) "q" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled, /area/submap/cave/AMine1) "r" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/light, /turf/simulated/floor/tiled, /area/submap/cave/AMine1) @@ -108,8 +108,8 @@ /area/submap/cave/AMine1) "v" = ( /obj/structure/table/standard, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, +/obj/item/cell/high, +/obj/item/cell/high, /turf/simulated/floor, /area/submap/cave/AMine1) "w" = ( @@ -159,7 +159,7 @@ /area/submap/cave/AMine1) "G" = ( /obj/structure/table/rack, -/obj/item/weapon/pickaxe/drill, +/obj/item/pickaxe/drill, /turf/simulated/floor/tiled, /area/submap/cave/AMine1) "H" = ( @@ -186,7 +186,7 @@ /turf/simulated/floor/tiled, /area/submap/cave/AMine1) "M" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/tiled, /area/submap/cave/AMine1) "N" = ( diff --git a/maps/expedition_vr/beach/submaps/Rockb1.dmm b/maps/expedition_vr/beach/submaps/Rockb1.dmm index e85a8b4a56f..f6b9b134fcf 100644 --- a/maps/expedition_vr/beach/submaps/Rockb1.dmm +++ b/maps/expedition_vr/beach/submaps/Rockb1.dmm @@ -16,12 +16,12 @@ /area/submap/Rockb1) "f" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/lino, /area/submap/Rockb1) "g" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/gun/projectile/pistol, +/obj/item/gun/projectile/pistol, /obj/item/ammo_magazine/m9mm/compact, /turf/simulated/floor/lino, /area/submap/Rockb1) @@ -51,7 +51,7 @@ /area/submap/Rockb1) "n" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/plating, /area/submap/Rockb1) "o" = ( @@ -80,7 +80,7 @@ /area/submap/Rockb1) "u" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/floor/tiled, @@ -188,7 +188,7 @@ /area/submap/Rockb1) "K" = ( /obj/structure/table/standard, -/obj/item/weapon/pickaxe/drill, +/obj/item/pickaxe/drill, /turf/simulated/floor/tiled, /area/submap/Rockb1) "L" = ( @@ -199,12 +199,12 @@ /area/submap/Rockb1) "M" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled, /area/submap/Rockb1) "N" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled, /area/submap/Rockb1) "O" = ( diff --git a/maps/expedition_vr/beach/submaps/Scave1.dmm b/maps/expedition_vr/beach/submaps/Scave1.dmm index 4aba16fdcec..592e7886261 100644 --- a/maps/expedition_vr/beach/submaps/Scave1.dmm +++ b/maps/expedition_vr/beach/submaps/Scave1.dmm @@ -17,8 +17,8 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/Scave1) "f" = ( -/obj/item/weapon/spacecash/c100, -/obj/item/weapon/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/Scave1) "g" = ( @@ -26,9 +26,9 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/Scave1) "h" = ( -/obj/item/weapon/spacecash/c100, -/obj/item/weapon/spacecash/c100, -/obj/item/weapon/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, /obj/effect/decal/remains, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/Scave1) @@ -37,7 +37,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/Scave1) "j" = ( -/obj/item/weapon/grenade/spawnergrenade/spider, +/obj/item/grenade/spawnergrenade/spider, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/Scave1) "k" = ( @@ -53,7 +53,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/Scave1) "n" = ( -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/Scave1) "o" = ( diff --git a/maps/expedition_vr/beach/submaps/SupplyDrop1.dmm b/maps/expedition_vr/beach/submaps/SupplyDrop1.dmm index e38e20010f8..75236122808 100644 --- a/maps/expedition_vr/beach/submaps/SupplyDrop1.dmm +++ b/maps/expedition_vr/beach/submaps/SupplyDrop1.dmm @@ -28,20 +28,20 @@ /area/submap/cave/SupplyDrop1) "h" = ( /obj/structure/closet/crate, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/storage/box/flare, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/storage/box/flare, /obj/item/stack/marker_beacon/ten, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /obj/item/trash/tastybread, /obj/item/trash/tastybread, /obj/item/trash/sosjerky, /obj/item/trash/sosjerky, /obj/item/trash/liquidfood, /obj/item/trash/liquidfood, -/obj/item/weapon/flame/lighter/random, -/obj/item/device/gps, +/obj/item/flame/lighter/random, +/obj/item/gps, /turf/simulated/floor/reinforced, /area/submap/cave/SupplyDrop1) "i" = ( diff --git a/maps/expedition_vr/beach/submaps/SwordCave.dmm b/maps/expedition_vr/beach/submaps/SwordCave.dmm index f14417c7827..e9f5e0e6d16 100644 --- a/maps/expedition_vr/beach/submaps/SwordCave.dmm +++ b/maps/expedition_vr/beach/submaps/SwordCave.dmm @@ -27,7 +27,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/swordcave) "i" = ( -/obj/item/device/gps/explorer/on, +/obj/item/gps/explorer/on, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/swordcave) "j" = ( diff --git a/maps/expedition_vr/beach/submaps/crashed_ufo.dmm b/maps/expedition_vr/beach/submaps/crashed_ufo.dmm index 4ba1a0d87df..897f5da41d2 100644 --- a/maps/expedition_vr/beach/submaps/crashed_ufo.dmm +++ b/maps/expedition_vr/beach/submaps/crashed_ufo.dmm @@ -41,7 +41,7 @@ /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "al" = ( -/obj/item/weapon/tool/wrench/alien, +/obj/item/tool/wrench/alien, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "am" = ( @@ -66,7 +66,7 @@ /area/submap/cave/crashed_ufo) "ar" = ( /obj/structure/table/alien, -/obj/item/weapon/paper/alien{ +/obj/item/paper/alien{ icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" }, @@ -86,7 +86,7 @@ /area/submap/cave/crashed_ufo) "av" = ( /obj/structure/table/alien, -/obj/item/weapon/paper/alien{ +/obj/item/paper/alien{ icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" }, @@ -121,11 +121,11 @@ /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "aB" = ( -/obj/item/weapon/tool/screwdriver/alien, +/obj/item/tool/screwdriver/alien, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "aC" = ( -/obj/item/weapon/tool/wirecutters/alien, +/obj/item/tool/wirecutters/alien, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "aD" = ( @@ -133,7 +133,7 @@ /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "aE" = ( -/obj/item/device/multitool/alien, +/obj/item/multitool/alien, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "aF" = ( @@ -165,7 +165,7 @@ /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "aK" = ( -/obj/item/weapon/tool/crowbar/alien, +/obj/item/tool/crowbar/alien, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "aL" = ( @@ -179,11 +179,11 @@ /area/submap/cave/crashed_ufo) "aN" = ( /obj/structure/table/alien, -/obj/item/weapon/paper/alien{ +/obj/item/paper/alien{ icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" }, -/obj/item/device/gps/internal/poi, +/obj/item/gps/internal/poi, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "aO" = ( @@ -200,7 +200,7 @@ /area/submap/cave/crashed_ufo) "aQ" = ( /obj/structure/table/alien, -/obj/item/weapon/weldingtool/alien, +/obj/item/weldingtool/alien, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "aR" = ( @@ -213,7 +213,7 @@ /area/submap/cave/crashed_ufo) "aT" = ( /obj/structure/closet/alien, -/obj/item/weapon/paper/alien, +/obj/item/paper/alien, /turf/simulated/shuttle/floor/alien, /area/submap/cave/crashed_ufo) "aU" = ( @@ -227,21 +227,21 @@ /area/submap/cave/crashed_ufo) "aW" = ( /obj/structure/table/alien, -/obj/item/weapon/surgical/circular_saw/alien, +/obj/item/surgical/circular_saw/alien, /turf/simulated/shuttle/floor/alien, /area/submap/cave/crashed_ufo) "aX" = ( /obj/structure/table/alien, -/obj/item/weapon/surgical/FixOVein/alien, +/obj/item/surgical/FixOVein/alien, /turf/simulated/shuttle/floor/alien, /area/submap/cave/crashed_ufo) "aY" = ( /obj/structure/table/alien, -/obj/item/weapon/surgical/scalpel/alien, +/obj/item/surgical/scalpel/alien, /turf/simulated/shuttle/floor/alien, /area/submap/cave/crashed_ufo) "aZ" = ( -/obj/item/weapon/surgical/hemostat/alien, +/obj/item/surgical/hemostat/alien, /turf/simulated/shuttle/floor/alien, /area/submap/cave/crashed_ufo) "ba" = ( @@ -258,7 +258,7 @@ /area/submap/cave/crashed_ufo) "bd" = ( /obj/structure/table/alien, -/obj/item/weapon/surgical/bone_clamp/alien, +/obj/item/surgical/bone_clamp/alien, /turf/simulated/shuttle/floor/alien, /area/submap/cave/crashed_ufo) "be" = ( @@ -292,7 +292,7 @@ /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "bk" = ( -/obj/item/weapon/cell/device/weapon/empty, +/obj/item/cell/device/weapon/empty, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "bl" = ( @@ -303,21 +303,21 @@ /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "bm" = ( -/obj/item/weapon/gun/energy/retro/empty, +/obj/item/gun/energy/retro/empty, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "bn" = ( -/obj/item/device/gps{ +/obj/item/gps{ gps_tag = "COMDOM1" }, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "bo" = ( -/obj/item/weapon/reagent_containers/hypospray/autoinjector/used, +/obj/item/reagent_containers/hypospray/autoinjector/used, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "bp" = ( -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn, +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "bq" = ( @@ -331,8 +331,8 @@ /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "bs" = ( -/obj/item/weapon/storage/belt/utility/full, -/obj/item/device/multitool, +/obj/item/storage/belt/utility/full, +/obj/item/multitool, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) "bt" = ( diff --git a/maps/expedition_vr/beach/submaps/crashed_ufo_frigate.dmm b/maps/expedition_vr/beach/submaps/crashed_ufo_frigate.dmm index a2f60e1ef63..400f2a2f5d1 100644 --- a/maps/expedition_vr/beach/submaps/crashed_ufo_frigate.dmm +++ b/maps/expedition_vr/beach/submaps/crashed_ufo_frigate.dmm @@ -239,7 +239,7 @@ /area/submap/cave/crashed_ufo_frigate) "bf" = ( /obj/structure/table/alien, -/obj/item/weapon/paper/alien{ +/obj/item/paper/alien{ icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" }, @@ -273,8 +273,8 @@ /area/submap/cave/crashed_ufo_frigate) "bm" = ( /obj/structure/table/alien, -/obj/item/weapon/paper/alien, -/obj/item/weapon/paper/alien, +/obj/item/paper/alien, +/obj/item/paper/alien, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo_frigate) "bn" = ( @@ -316,7 +316,7 @@ /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo_frigate) "bv" = ( -/obj/item/weapon/surgical/bone_clamp/alien, +/obj/item/surgical/bone_clamp/alien, /obj/structure/closet/alien, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo_frigate) @@ -330,7 +330,7 @@ desc = "It vaguely like a star. It looks like something an alien admiral might've worn. Probably."; name = "alien admiral's medal" }, -/obj/item/weapon/telecube/precursor/mated/zone, +/obj/item/telecube/precursor/mated/zone, /obj/item/clothing/head/helmet/alien/tank, /turf/simulated/shuttle/floor/alien, /area/submap/cave/crashed_ufo_frigate) @@ -399,11 +399,11 @@ /area/submap/cave/crashed_ufo_frigate) "bL" = ( /obj/structure/table/alien, -/obj/item/weapon/paper/alien{ +/obj/item/paper/alien{ icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" }, -/obj/item/device/gps/internal/poi, +/obj/item/gps/internal/poi, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo_frigate) "bM" = ( @@ -417,7 +417,7 @@ /obj/structure/window/phoronreinforced{ dir = 4 }, -/obj/item/weapon/paper/alien{ +/obj/item/paper/alien{ icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" }, @@ -429,7 +429,7 @@ /area/submap/cave/crashed_ufo_frigate) "bP" = ( /obj/structure/table/alien, -/obj/item/weapon/weldingtool/alien, +/obj/item/weldingtool/alien, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo_frigate) "bQ" = ( @@ -437,7 +437,7 @@ /obj/structure/window/phoronreinforced{ dir = 4 }, -/obj/item/weapon/paper/alien{ +/obj/item/paper/alien{ icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" }, @@ -470,7 +470,7 @@ "bV" = ( /obj/structure/table/alien, /obj/structure/window/phoronreinforced, -/obj/item/weapon/paper/alien, +/obj/item/paper/alien, /turf/simulated/shuttle/floor/alien, /area/submap/cave/crashed_ufo_frigate) "bW" = ( @@ -496,7 +496,7 @@ /area/submap/cave/crashed_ufo_frigate) "ca" = ( /obj/structure/table/alien, -/obj/item/weapon/paper/alien{ +/obj/item/paper/alien{ icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" }, diff --git a/maps/expedition_vr/beach/submaps/crashedcontainmentshuttle.dmm b/maps/expedition_vr/beach/submaps/crashedcontainmentshuttle.dmm index ddc3096293c..2cf8388fa7c 100644 --- a/maps/expedition_vr/beach/submaps/crashedcontainmentshuttle.dmm +++ b/maps/expedition_vr/beach/submaps/crashedcontainmentshuttle.dmm @@ -4,7 +4,7 @@ /area/submap/crashedcontainmentshuttle) "ab" = ( /obj/structure/grille, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/mineral/floor/ignore_mapgen/cave, @@ -18,7 +18,7 @@ /turf/simulated/floor/plating, /area/submap/crashedcontainmentshuttle) "ae" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/mineral/floor/ignore_mapgen/cave, @@ -37,7 +37,7 @@ /turf/simulated/floor/outdoors/rocks/caves, /area/submap/crashedcontainmentshuttle) "aj" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/crashedcontainmentshuttle) "ak" = ( @@ -66,7 +66,7 @@ /area/submap/crashedcontainmentshuttle) "aq" = ( /obj/structure/grille, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/plating, /area/submap/crashedcontainmentshuttle) "ar" = ( @@ -88,7 +88,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/crashedcontainmentshuttle) "au" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/crashedcontainmentshuttle) "av" = ( @@ -164,7 +164,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/crashedcontainmentshuttle) "aK" = ( -/obj/item/weapon/material/knife/ritual, +/obj/item/material/knife/ritual, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/crashedcontainmentshuttle) "aL" = ( @@ -194,19 +194,19 @@ /area/submap/crashedcontainmentshuttle) "aR" = ( /obj/structure/grille, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/floor/plating, /area/submap/crashedcontainmentshuttle) "aS" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /obj/effect/decal/remains/human, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/simulated/shuttle/floor/black, /area/submap/crashedcontainmentshuttle) "aT" = ( -/obj/item/device/gps/internal/poi, +/obj/item/gps/internal/poi, /turf/simulated/shuttle/floor/red, /area/submap/crashedcontainmentshuttle) "aU" = ( @@ -228,7 +228,7 @@ /area/submap/crashedcontainmentshuttle) "aY" = ( /obj/structure/frame, -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /turf/simulated/shuttle/floor/black, /area/submap/crashedcontainmentshuttle) "aZ" = ( @@ -240,16 +240,16 @@ /turf/simulated/shuttle/floor/red, /area/submap/crashedcontainmentshuttle) "bb" = ( -/obj/item/weapon/material/knife/ritual, +/obj/item/material/knife/ritual, /obj/effect/decal/cleanable/blood, /turf/simulated/shuttle/floor/red, /area/submap/crashedcontainmentshuttle) "bc" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /turf/simulated/shuttle/floor/black, /area/submap/crashedcontainmentshuttle) "bd" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /obj/structure/bed/chair/office/dark{ dir = 4 }, @@ -274,7 +274,7 @@ /turf/simulated/shuttle/floor/red, /area/submap/crashedcontainmentshuttle) "bi" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/plating, /area/submap/crashedcontainmentshuttle) "bj" = ( @@ -324,7 +324,7 @@ /turf/simulated/shuttle/floor/yellow, /area/submap/crashedcontainmentshuttle) "bs" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/template_noop, /area/submap/crashedcontainmentshuttle) "bt" = ( @@ -343,7 +343,7 @@ "bw" = ( /obj/structure/closet/walllocker/emerglocker/north, /obj/structure/frame, -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /turf/simulated/shuttle/floor/white, /area/submap/crashedcontainmentshuttle) "bx" = ( @@ -356,7 +356,7 @@ /area/submap/crashedcontainmentshuttle) "bz" = ( /obj/item/frame/mirror, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/shuttle/wall/dark, @@ -385,7 +385,7 @@ }, /obj/effect/gibspawner/generic, /obj/effect/decal/remains/human, -/obj/item/weapon/card/id/syndicate{ +/obj/item/card/id/syndicate{ age = "\\42"; blood_type = "\\O+"; desc = "A strange ID card."; @@ -418,7 +418,7 @@ density = 0; icon_state = "brokengrille" }, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/item/stack/rods, @@ -454,7 +454,7 @@ "bN" = ( /obj/effect/decal/cleanable/liquid_fuel, /obj/effect/decal/remains/human, -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/crashedcontainmentshuttle) "bO" = ( diff --git a/maps/expedition_vr/beach/submaps/crystal1.dmm b/maps/expedition_vr/beach/submaps/crystal1.dmm index 6ccbd2e56e5..e21f36c8a05 100644 --- a/maps/expedition_vr/beach/submaps/crystal1.dmm +++ b/maps/expedition_vr/beach/submaps/crystal1.dmm @@ -10,7 +10,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/crystal1) "d" = ( -/obj/item/weapon/ore/diamond, +/obj/item/ore/diamond, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/crystal1) diff --git a/maps/expedition_vr/beach/submaps/crystal2.dmm b/maps/expedition_vr/beach/submaps/crystal2.dmm index d5ef5a4a00d..d2ac4f1cefc 100644 --- a/maps/expedition_vr/beach/submaps/crystal2.dmm +++ b/maps/expedition_vr/beach/submaps/crystal2.dmm @@ -10,7 +10,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/crystal2) "d" = ( -/obj/item/weapon/ore/diamond, +/obj/item/ore/diamond, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/crystal2) diff --git a/maps/expedition_vr/beach/submaps/crystal3.dmm b/maps/expedition_vr/beach/submaps/crystal3.dmm index b8fad2723c0..f9842d4a4a5 100644 --- a/maps/expedition_vr/beach/submaps/crystal3.dmm +++ b/maps/expedition_vr/beach/submaps/crystal3.dmm @@ -13,7 +13,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/crystal3) "e" = ( -/obj/item/weapon/ore/diamond, +/obj/item/ore/diamond, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/crystal3) diff --git a/maps/expedition_vr/beach/submaps/deadBeacon.dmm b/maps/expedition_vr/beach/submaps/deadBeacon.dmm index eda6b1e6dcc..daba723193d 100644 --- a/maps/expedition_vr/beach/submaps/deadBeacon.dmm +++ b/maps/expedition_vr/beach/submaps/deadBeacon.dmm @@ -49,12 +49,12 @@ /turf/simulated/floor/tiled/asteroid_steel, /area/submap/cave/deadBeacon) "l" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/plating, /area/submap/cave/deadBeacon) "m" = ( /obj/structure/table/steel, -/obj/item/weapon/circuitboard/comm_server, +/obj/item/circuitboard/comm_server, /obj/machinery/light{ dir = 8; status = 1 @@ -65,7 +65,7 @@ /turf/simulated/floor/tiled/asteroid_steel, /area/submap/cave/deadBeacon) "o" = ( -/obj/item/weapon/paper/crumpled{ +/obj/item/paper/crumpled{ info = "Sampatti Relay Sif-833
Decryption Key for 12-04-2488:
849B0022FBA920C244
Eyes Only.
The insider who knows all the secrets can bring down Lanka."; name = "Dusty Note" }, @@ -117,7 +117,7 @@ /turf/simulated/floor/tiled/asteroid_steel, /area/submap/cave/deadBeacon) "v" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/cave/deadBeacon) "w" = ( @@ -146,7 +146,7 @@ /turf/simulated/floor/tiled/asteroid_steel, /area/submap/cave/deadBeacon) "A" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/deadBeacon) "B" = ( @@ -162,12 +162,12 @@ /area/submap/cave/deadBeacon) "D" = ( /obj/item/trash/cigbutt, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/machinery/light, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/cave/deadBeacon) "E" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/cave/deadBeacon) "F" = ( diff --git a/maps/expedition_vr/beach/submaps/deadly_rabbit_vr.dmm b/maps/expedition_vr/beach/submaps/deadly_rabbit_vr.dmm index e039d912331..d4800dadf04 100644 --- a/maps/expedition_vr/beach/submaps/deadly_rabbit_vr.dmm +++ b/maps/expedition_vr/beach/submaps/deadly_rabbit_vr.dmm @@ -18,7 +18,7 @@ /turf/simulated/mineral/ignore_mapgen/cave, /area/template_noop) "m" = ( -/obj/item/weapon/bone/skull, +/obj/item/bone/skull, /obj/effect/decal/cleanable/blood, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/template_noop) @@ -30,16 +30,16 @@ /area/template_noop) "q" = ( /obj/effect/decal/cleanable/blood, -/obj/item/weapon/bone, -/obj/item/weapon/bone/skull, +/obj/item/bone, +/obj/item/bone/skull, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/template_noop) "r" = ( -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/template_noop) "s" = ( -/obj/item/weapon/bone/ribs, +/obj/item/bone/ribs, /obj/effect/decal/cleanable/blood, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/template_noop) @@ -49,21 +49,21 @@ /area/template_noop) "u" = ( /obj/effect/decal/cleanable/blood, -/obj/item/weapon/bone/skull, +/obj/item/bone/skull, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/template_noop) "v" = ( -/obj/item/weapon/grenade/explosive/frag, +/obj/item/grenade/explosive/frag, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/template_noop) "y" = ( -/obj/item/weapon/bone, -/obj/item/weapon/bone/ribs, +/obj/item/bone, +/obj/item/bone/ribs, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/template_noop) "A" = ( /obj/effect/decal/cleanable/blood, -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/template_noop) "C" = ( @@ -81,8 +81,8 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/template_noop) "F" = ( -/obj/item/weapon/bone, -/obj/item/weapon/bone/skull, +/obj/item/bone, +/obj/item/bone/skull, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/template_noop) "I" = ( @@ -93,7 +93,7 @@ /area/template_noop) "J" = ( /obj/effect/decal/cleanable/blood, -/obj/item/weapon/bone/ribs, +/obj/item/bone/ribs, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/template_noop) "K" = ( @@ -108,11 +108,11 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/template_noop) "P" = ( -/obj/item/weapon/bone/skull, +/obj/item/bone/skull, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/template_noop) "Q" = ( -/obj/item/weapon/bone, +/obj/item/bone, /obj/structure/loot_pile/surface/bones, /obj/effect/decal/cleanable/blood, /turf/simulated/mineral/floor/ignore_mapgen/cave, @@ -122,15 +122,15 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/template_noop) "U" = ( -/obj/item/weapon/bone/ribs, +/obj/item/bone/ribs, /obj/item/clothing/suit/storage/hooded/knight, -/obj/item/weapon/bone/skull, +/obj/item/bone/skull, /obj/effect/decal/cleanable/blood, /obj/item/clothing/shoes/knight/black, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/template_noop) "V" = ( -/obj/item/weapon/bone, +/obj/item/bone, /obj/effect/decal/cleanable/blood, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/template_noop) diff --git a/maps/expedition_vr/beach/submaps/deadspy.dmm b/maps/expedition_vr/beach/submaps/deadspy.dmm index e362c401e62..bc3a09a89ff 100644 --- a/maps/expedition_vr/beach/submaps/deadspy.dmm +++ b/maps/expedition_vr/beach/submaps/deadspy.dmm @@ -14,7 +14,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/deadspy) "d" = ( -/obj/item/weapon/flamethrower, +/obj/item/flamethrower, /obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/deadspy) @@ -44,18 +44,18 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/deadspy) "j" = ( -/obj/item/weapon/material/butterfly, +/obj/item/material/butterfly, /obj/effect/decal/cleanable/liquid_fuel, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/deadspy) "k" = ( /obj/effect/decal/remains/human, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/item/clothing/head/hardhat, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/deadspy) "l" = ( -/obj/item/weapon/flame/lighter/zippo, +/obj/item/flame/lighter/zippo, /obj/effect/decal/cleanable/liquid_fuel, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/deadspy) @@ -83,7 +83,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/deadspy) "p" = ( -/obj/item/weapon/deadringer, +/obj/item/deadringer, /obj/effect/decal/cleanable/liquid_fuel, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/deadspy) @@ -95,11 +95,11 @@ /area/submap/deadspy) "r" = ( /obj/effect/decal/cleanable/liquid_fuel, -/obj/item/weapon/storage/fancy/cigarettes/professionals, +/obj/item/storage/fancy/cigarettes/professionals, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/deadspy) "s" = ( -/obj/item/weapon/card/emag_broken, +/obj/item/card/emag_broken, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/deadspy) "t" = ( diff --git a/maps/expedition_vr/beach/submaps/digsite.dmm b/maps/expedition_vr/beach/submaps/digsite.dmm index 8f8d0d70859..d3ca191cbc8 100644 --- a/maps/expedition_vr/beach/submaps/digsite.dmm +++ b/maps/expedition_vr/beach/submaps/digsite.dmm @@ -22,7 +22,7 @@ /turf/simulated/floor/plating/external, /area/submap/cave/digsite) "h" = ( -/obj/item/weapon/ore, +/obj/item/ore, /turf/simulated/floor/plating/external, /area/submap/cave/digsite) "i" = ( @@ -55,7 +55,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/digsite) "p" = ( -/obj/item/weapon/ore, +/obj/item/ore, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/digsite) "q" = ( @@ -71,7 +71,7 @@ /area/submap/cave/digsite) "t" = ( /obj/item/frame/apc, -/obj/item/weapon/module/power_control, +/obj/item/module/power_control, /turf/simulated/floor/plating/external, /area/submap/cave/digsite) "u" = ( @@ -82,8 +82,8 @@ /area/submap/cave/digsite) "v" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/excavation, -/obj/item/device/measuring_tape, +/obj/item/storage/excavation, +/obj/item/measuring_tape, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/digsite) "w" = ( @@ -107,12 +107,12 @@ /area/submap/cave/digsite) "z" = ( /obj/structure/table/steel, -/obj/item/weapon/folder, +/obj/item/folder, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/digsite) "A" = ( /obj/structure/table/rack, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/digsite) "B" = ( @@ -130,7 +130,7 @@ /area/submap/cave/digsite) "E" = ( /obj/structure/table/rack, -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/digsite) "F" = ( @@ -148,8 +148,8 @@ /area/submap/cave/digsite) "I" = ( /obj/structure/table/steel, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/storage/box/samplebags, +/obj/item/tool/wrench, +/obj/item/storage/box/samplebags, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/digsite) "J" = ( diff --git a/maps/expedition_vr/beach/submaps/excavation1.dmm b/maps/expedition_vr/beach/submaps/excavation1.dmm index 84484ccd571..1d6d8b70443 100644 --- a/maps/expedition_vr/beach/submaps/excavation1.dmm +++ b/maps/expedition_vr/beach/submaps/excavation1.dmm @@ -58,11 +58,11 @@ "m" = ( /obj/structure/table/sifwoodentable, /obj/item/mecha_parts/mecha_equipment/tool/drill/bore, -/obj/item/weapon/ore/marble, +/obj/item/ore/marble, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/Excavation) "n" = ( -/obj/item/weapon/ore, +/obj/item/ore, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/Excavation) "o" = ( @@ -88,15 +88,15 @@ /turf/simulated/floor/outdoors/rocks/caves, /area/submap/Excavation) "s" = ( -/obj/item/weapon/ore/marble, +/obj/item/ore/marble, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/Excavation) "t" = ( -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/Excavation) "u" = ( -/obj/item/weapon/ore/diamond, +/obj/item/ore/diamond, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/Excavation) "v" = ( @@ -105,7 +105,7 @@ /area/submap/Excavation) "w" = ( /obj/structure/table/sifwoodentable, -/obj/item/weapon/pickaxe/jackhammer, +/obj/item/pickaxe/jackhammer, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/Excavation) "x" = ( @@ -120,14 +120,14 @@ /area/submap/Excavation) "z" = ( /obj/structure/table/sifwoodentable, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/Excavation) "A" = ( /obj/structure/table/sifwoodentable, -/obj/item/weapon/mining_scanner, +/obj/item/mining_scanner, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/Excavation) "B" = ( diff --git a/maps/expedition_vr/beach/submaps/lava_trench.dmm b/maps/expedition_vr/beach/submaps/lava_trench.dmm index e9c6006d158..36f3ce3614d 100644 --- a/maps/expedition_vr/beach/submaps/lava_trench.dmm +++ b/maps/expedition_vr/beach/submaps/lava_trench.dmm @@ -332,8 +332,8 @@ /area/submap/lava_trench) "bd" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/excavation, -/obj/item/device/measuring_tape, +/obj/item/storage/excavation, +/obj/item/measuring_tape, /obj/effect/floor_decal/corner_oldtile/purple{ icon_state = "corner_oldtile"; dir = 4 @@ -501,12 +501,12 @@ /area/submap/lava_trench/outpost) "bC" = ( /obj/structure/table/rack, -/obj/item/weapon/shovel, +/obj/item/shovel, /obj/effect/floor_decal/corner_oldtile/purple/full{ icon_state = "corner_oldtile_full"; dir = 1 }, -/obj/item/weapon/pickaxe/drill, +/obj/item/pickaxe/drill, /turf/simulated/floor/tiled/old_tile, /area/submap/lava_trench/outpost) "bD" = ( @@ -530,7 +530,7 @@ "bG" = ( /obj/effect/floor_decal/corner_oldtile/purple, /obj/structure/table/steel, -/obj/item/device/xenoarch_multi_tool, +/obj/item/xenoarch_multi_tool, /turf/simulated/floor/tiled/old_tile, /area/submap/lava_trench/outpost) "bH" = ( @@ -538,7 +538,7 @@ /turf/simulated/floor/tiled/old_tile, /area/submap/lava_trench/outpost) "bI" = ( -/obj/item/device/gps/science{ +/obj/item/gps/science{ gps_tag = "CRYSTALS" }, /turf/simulated/floor/tiled/old_tile, @@ -615,7 +615,7 @@ pixel_y = 28 }, /obj/structure/table/standard, -/obj/item/device/healthanalyzer/improved, +/obj/item/healthanalyzer/improved, /turf/simulated/floor/tiled/old_tile, /area/submap/lava_trench/outpost) "bT" = ( @@ -639,7 +639,7 @@ icon_state = "corner_oldtile_full"; dir = 4 }, -/obj/item/weapon/storage/box/samplebags, +/obj/item/storage/box/samplebags, /obj/structure/table/steel, /obj/item/stack/flag/red, /turf/simulated/floor/tiled/old_tile, @@ -650,7 +650,7 @@ /area/submap/lava_trench) "bZ" = ( /obj/structure/table/steel, -/obj/item/weapon/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/lava_trench) "ca" = ( @@ -689,16 +689,16 @@ /turf/simulated/floor/tiled/asteroid_steel, /area/submap/lava_trench) "cq" = ( -/obj/item/weapon/banner/nt, +/obj/item/banner/nt, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/lava_trench) "cr" = ( /obj/structure/table/steel, -/obj/item/weapon/material/shard/phoron, +/obj/item/material/shard/phoron, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/lava_trench) "cs" = ( -/obj/item/weapon/banner/nt, +/obj/item/banner/nt, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/lava_trench) diff --git a/maps/expedition_vr/beach/submaps/lost_explorer.dmm b/maps/expedition_vr/beach/submaps/lost_explorer.dmm index 683acd2757e..fa528e75a6d 100644 --- a/maps/expedition_vr/beach/submaps/lost_explorer.dmm +++ b/maps/expedition_vr/beach/submaps/lost_explorer.dmm @@ -3,7 +3,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/lost_explorer) "b" = ( -/obj/item/device/geiger, +/obj/item/geiger, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/lost_explorer) "c" = ( @@ -11,7 +11,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/lost_explorer) "d" = ( -/obj/item/weapon/material/knife/tacknife/survival, +/obj/item/material/knife/tacknife/survival, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/lost_explorer) "e" = ( @@ -25,15 +25,15 @@ /area/submap/cave/lost_explorer) "g" = ( /obj/item/clothing/suit/storage/hooded/explorer, -/obj/item/weapon/cell/device, +/obj/item/cell/device, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/lost_explorer) "h" = ( -/obj/item/device/gps/explorer, +/obj/item/gps/explorer, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/lost_explorer) "i" = ( -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/lost_explorer) diff --git a/maps/expedition_vr/beach/submaps/prepper1.dmm b/maps/expedition_vr/beach/submaps/prepper1.dmm index 15032104116..6197502aca5 100644 --- a/maps/expedition_vr/beach/submaps/prepper1.dmm +++ b/maps/expedition_vr/beach/submaps/prepper1.dmm @@ -31,7 +31,7 @@ /area/submap/cave/prepper1) "g" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/glasses, +/obj/item/storage/box/glasses, /turf/simulated/floor/plating, /area/submap/cave/prepper1) "h" = ( @@ -44,7 +44,7 @@ /area/submap/cave/prepper1) "j" = ( /obj/structure/table/steel, -/obj/item/weapon/tape_roll, +/obj/item/tape_roll, /obj/random/maintenance/engineering, /turf/simulated/floor/plating, /area/submap/cave/prepper1) @@ -77,8 +77,8 @@ /area/submap/cave/prepper1) "q" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/armor/material/makeshift, /obj/item/clothing/head/helmet/bucket, @@ -86,17 +86,17 @@ /area/submap/cave/prepper1) "r" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/plating, /area/submap/cave/prepper1) "s" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/plating, /area/submap/cave/prepper1) "t" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever, +/obj/item/gun/projectile/shotgun/pump/rifle/lever, /obj/item/ammo_magazine/clip/c762, /obj/item/ammo_magazine/clip/c762, /turf/simulated/floor/plating, diff --git a/maps/expedition_vr/beach/submaps/quarantineshuttle.dmm b/maps/expedition_vr/beach/submaps/quarantineshuttle.dmm index efb45b4947c..83694ffdc0e 100644 --- a/maps/expedition_vr/beach/submaps/quarantineshuttle.dmm +++ b/maps/expedition_vr/beach/submaps/quarantineshuttle.dmm @@ -124,7 +124,7 @@ "as" = ( /obj/machinery/vending/snack{ contraband = null; - products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 0, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 0, /obj/item/weapon/reagent_containers/food/snacks/chips = 0, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 0, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 0, /obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 0, /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 0, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 0, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 0) + products = list(/obj/item/reagent_containers/food/snacks/candy = 0, /obj/item/reagent_containers/food/drinks/dry_ramen = 0, /obj/item/reagent_containers/food/snacks/chips = 0, /obj/item/reagent_containers/food/snacks/sosjerky = 0, /obj/item/reagent_containers/food/snacks/no_raisin = 0, /obj/item/reagent_containers/food/snacks/packaged/spacetwinkie = 0, /obj/item/reagent_containers/food/snacks/cheesiehonkers = 0, /obj/item/reagent_containers/food/snacks/tastybread = 0, /obj/item/reagent_containers/food/snacks/skrellsnacks = 0) }, /turf/simulated/shuttle/floor{ icon_state = "floor_white" @@ -133,7 +133,7 @@ "at" = ( /obj/machinery/vending/cola{ contraband = null; - products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 0) + products = list(/obj/item/reagent_containers/food/drinks/cans/cola = 0, /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind = 0, /obj/item/reagent_containers/food/drinks/cans/dr_gibb = 0, /obj/item/reagent_containers/food/drinks/cans/starkist = 0, /obj/item/reagent_containers/food/drinks/cans/waterbottle = 0, /obj/item/reagent_containers/food/drinks/cans/space_up = 0, /obj/item/reagent_containers/food/drinks/cans/iced_tea = 0, /obj/item/reagent_containers/food/drinks/cans/grape_juice = 0, /obj/item/reagent_containers/food/drinks/cans/gingerale = 0) }, /turf/simulated/shuttle/floor{ icon_state = "floor_white" @@ -146,7 +146,7 @@ }, /area/submap/cave/qShuttle) "av" = ( -/obj/item/weapon/pickaxe/drill, +/obj/item/pickaxe/drill, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, @@ -183,13 +183,13 @@ /area/submap/cave/qShuttle) "aB" = ( /obj/item/trash/cigbutt, -/obj/item/weapon/tank/emergency/oxygen, +/obj/item/tank/emergency/oxygen, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, /area/submap/cave/qShuttle) "aC" = ( -/obj/item/weapon/material/knife/tacknife/boot, +/obj/item/material/knife/tacknife/boot, /obj/item/clothing/mask/breath, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" @@ -203,8 +203,8 @@ /area/submap/cave/qShuttle) "aE" = ( /obj/item/trash/sosjerky, -/obj/item/weapon/storage/box/donut/empty, -/obj/item/weapon/reagent_containers/food/drinks/sillycup, +/obj/item/storage/box/donut/empty, +/obj/item/reagent_containers/food/drinks/sillycup, /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, @@ -332,19 +332,19 @@ }, /area/submap/cave/qShuttle) "aV" = ( -/obj/item/weapon/virusdish/random, +/obj/item/virusdish/random, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, /area/submap/cave/qShuttle) "aW" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, /area/submap/cave/qShuttle) "aX" = ( -/obj/item/device/paicard, +/obj/item/paicard, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, @@ -390,7 +390,7 @@ }, /area/submap/cave/qShuttle) "bc" = ( -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/effect/decal/cleanable/dirt, /turf/simulated/shuttle/floor{ icon_state = "floor_white" @@ -460,7 +460,7 @@ /area/submap/cave/qShuttle) "bk" = ( /obj/structure/table/rack, -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, @@ -472,9 +472,9 @@ name = "Virus Samples - FRAGILE"; opened = 1 }, -/obj/item/weapon/virusdish/random, -/obj/item/weapon/virusdish/random, -/obj/item/weapon/virusdish/random, +/obj/item/virusdish/random, +/obj/item/virusdish/random, +/obj/item/virusdish/random, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, @@ -498,11 +498,11 @@ /area/submap/cave/qShuttle) "bn" = ( /obj/structure/table/standard, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/shuttle/floor, /area/submap/cave/qShuttle) "bo" = ( -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, @@ -554,7 +554,7 @@ }, /area/submap/cave/qShuttle) "bv" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/shuttle/floor{ @@ -574,7 +574,7 @@ }, /area/submap/cave/qShuttle) "by" = ( -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, @@ -594,7 +594,7 @@ }, /area/submap/cave/qShuttle) "bB" = ( -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, @@ -656,7 +656,7 @@ /area/submap/cave/qShuttle) "bJ" = ( /obj/item/trash/tastybread, -/obj/item/weapon/material/butterfly/boxcutter, +/obj/item/material/butterfly/boxcutter, /obj/effect/decal/cleanable/dirt, /turf/simulated/shuttle/floor{ icon_state = "floor_white" @@ -682,7 +682,7 @@ /obj/structure/bed/chair{ dir = 1 }, -/obj/item/weapon/card/id/external{ +/obj/item/card/id/external{ desc = "An identification card of some sort. Looks like this one was issued by the Vir Independent Mining Corp."; name = "VIMC identification card"; rank = "Miner"; @@ -694,7 +694,7 @@ /area/submap/cave/qShuttle) "bN" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, @@ -783,7 +783,7 @@ /area/submap/cave/qShuttle) "cc" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/qShuttle) "cd" = ( @@ -797,7 +797,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/qShuttle) "cf" = ( -/obj/item/weapon/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/qShuttle) "cg" = ( @@ -810,12 +810,12 @@ /area/submap/cave/qShuttle) "ci" = ( /obj/structure/table/steel, -/obj/item/weapon/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/qShuttle) "cj" = ( /obj/structure/table/steel, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, @@ -823,7 +823,7 @@ /area/submap/cave/qShuttle) "ck" = ( /obj/structure/table/steel, -/obj/item/weapon/tool/transforming/jawsoflife, +/obj/item/tool/transforming/jawsoflife, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/qShuttle) "cl" = ( @@ -833,7 +833,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/qShuttle) "cm" = ( -/obj/item/weapon/weldingtool/largetank, +/obj/item/weldingtool/largetank, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/qShuttle) "cn" = ( diff --git a/maps/expedition_vr/beach/submaps/ritual.dmm b/maps/expedition_vr/beach/submaps/ritual.dmm index 9506d7e2cb9..0e229488dc0 100644 --- a/maps/expedition_vr/beach/submaps/ritual.dmm +++ b/maps/expedition_vr/beach/submaps/ritual.dmm @@ -7,7 +7,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/CorgiRitual) "c" = ( -/obj/item/weapon/flame/candle/everburn, +/obj/item/flame/candle/everburn, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/CorgiRitual) "d" = ( diff --git a/maps/expedition_vr/beach/submaps/spatial_anomaly.dmm b/maps/expedition_vr/beach/submaps/spatial_anomaly.dmm index 9b0f64aad93..ba3df8d4c05 100644 --- a/maps/expedition_vr/beach/submaps/spatial_anomaly.dmm +++ b/maps/expedition_vr/beach/submaps/spatial_anomaly.dmm @@ -67,7 +67,7 @@ /turf/simulated/floor/lava, /area/submap/spatial_anomaly) "k" = ( -/obj/item/weapon/disposable_teleporter/slime, +/obj/item/disposable_teleporter/slime, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/spatial_anomaly) "l" = ( @@ -148,12 +148,12 @@ /turf/simulated/floor/outdoors/rocks/caves, /area/submap/spatial_anomaly) "v" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/plating/external, /area/submap/spatial_anomaly) "w" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/xenoarch_multi_tool, +/obj/item/xenoarch_multi_tool, /turf/simulated/floor/plating/external, /area/submap/spatial_anomaly) "x" = ( @@ -175,7 +175,7 @@ /area/submap/spatial_anomaly) "B" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/ore/diamond, +/obj/item/ore/diamond, /turf/simulated/floor/plating/external, /area/submap/spatial_anomaly) "C" = ( @@ -191,7 +191,7 @@ /area/submap/spatial_anomaly) "E" = ( /obj/structure/table/rack, -/obj/item/weapon/pickaxe/jackhammer, +/obj/item/pickaxe/jackhammer, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/spatial_anomaly) "F" = ( @@ -240,12 +240,12 @@ /turf/simulated/floor/outdoors/rocks/caves, /area/submap/spatial_anomaly) "K" = ( -/obj/item/weapon/mining_scanner, +/obj/item/mining_scanner, /obj/structure/table/rack, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/spatial_anomaly) "L" = ( -/obj/item/weapon/storage/belt/archaeology, +/obj/item/storage/belt/archaeology, /obj/effect/decal/remains/human, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/spatial_anomaly) @@ -254,15 +254,15 @@ /turf/simulated/floor/plating/external, /area/submap/spatial_anomaly) "N" = ( -/obj/item/weapon/pickaxe/brush, +/obj/item/pickaxe/brush, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/spatial_anomaly) "O" = ( -/obj/item/weapon/pickaxe/one_pick, +/obj/item/pickaxe/one_pick, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/spatial_anomaly) "P" = ( -/obj/item/weapon/pickaxe/four_pick, +/obj/item/pickaxe/four_pick, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/spatial_anomaly) "Q" = ( @@ -270,27 +270,27 @@ /turf/simulated/floor/plating/external, /area/submap/spatial_anomaly) "R" = ( -/obj/item/weapon/pickaxe/five_pick, +/obj/item/pickaxe/five_pick, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/spatial_anomaly) "S" = ( -/obj/item/weapon/pickaxe/six_pick, +/obj/item/pickaxe/six_pick, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/spatial_anomaly) "T" = ( -/obj/item/weapon/pickaxe/two_pick, +/obj/item/pickaxe/two_pick, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/spatial_anomaly) "U" = ( -/obj/item/device/measuring_tape, +/obj/item/measuring_tape, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/spatial_anomaly) "X" = ( -/obj/item/weapon/pickaxe/three_pick, +/obj/item/pickaxe/three_pick, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/spatial_anomaly) "Y" = ( -/obj/item/weapon/pickaxe/excavationdrill, +/obj/item/pickaxe/excavationdrill, /turf/simulated/floor/plating/external, /area/submap/spatial_anomaly) diff --git a/maps/expedition_vr/beach/submaps/speakeasy_vr.dmm b/maps/expedition_vr/beach/submaps/speakeasy_vr.dmm index b140e08534f..a2153d10b8c 100644 --- a/maps/expedition_vr/beach/submaps/speakeasy_vr.dmm +++ b/maps/expedition_vr/beach/submaps/speakeasy_vr.dmm @@ -28,7 +28,7 @@ /turf/simulated/floor/wood, /area/submap/Speakeasy) "k" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/submap/Speakeasy) "l" = ( diff --git a/maps/expedition_vr/beach/submaps/temple.dmm b/maps/expedition_vr/beach/submaps/temple.dmm index 53e05154347..4a23b9c46c9 100644 --- a/maps/expedition_vr/beach/submaps/temple.dmm +++ b/maps/expedition_vr/beach/submaps/temple.dmm @@ -23,41 +23,41 @@ /turf/simulated/wall/sandstonediamond, /area/submap/AbandonedTemple) "h" = ( -/obj/item/weapon/flame/candle/everburn, +/obj/item/flame/candle/everburn, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/AbandonedTemple) "i" = ( -/obj/item/weapon/ectoplasm, +/obj/item/ectoplasm, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/AbandonedTemple) "j" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/coin/iron, -/obj/item/weapon/coin/platinum, -/obj/item/weapon/coin/uranium, -/obj/item/weapon/coin/diamond, -/obj/item/weapon/coin/iron, -/obj/item/weapon/coin/uranium, -/obj/item/weapon/coin/iron, -/obj/item/weapon/coin/phoron, -/obj/item/weapon/coin/platinum, +/obj/item/coin/iron, +/obj/item/coin/platinum, +/obj/item/coin/uranium, +/obj/item/coin/diamond, +/obj/item/coin/iron, +/obj/item/coin/uranium, +/obj/item/coin/iron, +/obj/item/coin/phoron, +/obj/item/coin/platinum, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/AbandonedTemple) "k" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/silver, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/silver, +/obj/item/coin/silver, +/obj/item/coin/silver, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/silver, +/obj/item/coin/silver, +/obj/item/coin/silver, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/AbandonedTemple) "l" = ( @@ -82,7 +82,7 @@ /area/submap/AbandonedTemple) "q" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/lighter/zippo/royal, +/obj/item/flame/lighter/zippo/royal, /obj/item/clothing/mask/smokable/pipe, /turf/simulated/floor/carpet/turcarpet, /area/submap/AbandonedTemple) @@ -108,8 +108,8 @@ /area/submap/AbandonedTemple) "v" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper, -/obj/item/weapon/pen/fountain, +/obj/item/paper, +/obj/item/pen/fountain, /turf/simulated/floor/carpet/turcarpet, /area/submap/AbandonedTemple) "w" = ( @@ -123,7 +123,7 @@ /area/submap/AbandonedTemple) "y" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle/candelabra/everburn, +/obj/item/flame/candle/candelabra/everburn, /turf/simulated/floor/carpet/turcarpet, /area/submap/AbandonedTemple) "z" = ( @@ -166,7 +166,7 @@ /area/submap/AbandonedTemple) "G" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper/alien{ +/obj/item/paper/alien{ desc = ""; icon_state = "alienpaper_words"; info = "(On the screen of the tablet are several lines of characters written in a language you don't seem to recognize. At the end of each line is a set of numbers seperated by a colon. The screen flickers occasionally, as if damaged. Nothing about the tablet seems particularly interesting, but it does seem very, very old.)" @@ -196,12 +196,12 @@ /area/submap/AbandonedTemple) "M" = ( /obj/effect/decal/cleanable/cobweb, -/obj/item/weapon/flame/candle/candelabra/everburn, +/obj/item/flame/candle/candelabra/everburn, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/AbandonedTemple) "N" = ( /obj/effect/decal/cleanable/cobweb2, -/obj/item/weapon/flame/candle/candelabra/everburn, +/obj/item/flame/candle/candelabra/everburn, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/AbandonedTemple) "O" = ( diff --git a/maps/expedition_vr/beach/submaps/vault5.dmm b/maps/expedition_vr/beach/submaps/vault5.dmm index 3831106ee43..62828efa1ea 100644 --- a/maps/expedition_vr/beach/submaps/vault5.dmm +++ b/maps/expedition_vr/beach/submaps/vault5.dmm @@ -14,7 +14,7 @@ "d" = ( /obj/effect/alien/weeds, /obj/structure/bed/nest, -/obj/item/weapon/gun/projectile/p92x/large, +/obj/item/gun/projectile/p92x/large, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/vault5) "e" = ( @@ -46,7 +46,7 @@ "k" = ( /obj/effect/alien/weeds, /obj/item/clothing/head/helmet/tac, -/obj/item/weapon/gun/projectile/SVD, +/obj/item/gun/projectile/SVD, /turf/simulated/mineral/floor/ignore_mapgen/cave, /area/submap/cave/vault5) diff --git a/maps/expedition_vr/space/_debrisfield.dm b/maps/expedition_vr/space/_debrisfield.dm index 964a07caf5f..47a90bd0b21 100644 --- a/maps/expedition_vr/space/_debrisfield.dm +++ b/maps/expedition_vr/space/_debrisfield.dm @@ -306,7 +306,7 @@ /obj/structure/fuel_port/empty_tank/Initialize() . = ..() - var/obj/item/weapon/tank/phoron/T = locate() in src + var/obj/item/tank/phoron/T = locate() in src if(T) T.air_contents.remove(T.air_contents.total_moles) diff --git a/maps/expedition_vr/space/fueldepot.dmm b/maps/expedition_vr/space/fueldepot.dmm index f9a367c3b0b..6f61f389406 100644 --- a/maps/expedition_vr/space/fueldepot.dmm +++ b/maps/expedition_vr/space/fueldepot.dmm @@ -1214,8 +1214,8 @@ "ja" = ( /obj/structure/catwalk, /obj/structure/table/rack/steel, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/wrench, +/obj/item/tool/crowbar/red, +/obj/item/tool/wrench, /turf/simulated/shuttle/plating/airless, /area/tether_away/fueldepot) "jY" = ( @@ -1523,7 +1523,7 @@ /area/tether_away/fueldepot) "OG" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled/techmaint/airless, /area/tether_away/fueldepot) "OW" = ( @@ -1554,7 +1554,7 @@ /area/tether_away/fueldepot) "Qg" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/techmaint/airless, /area/tether_away/fueldepot) "Qk" = ( diff --git a/maps/expedition_vr/wild/tether_wild-crash-alt.dmm b/maps/expedition_vr/wild/tether_wild-crash-alt.dmm index a81ea8fc45d..137670af69b 100644 --- a/maps/expedition_vr/wild/tether_wild-crash-alt.dmm +++ b/maps/expedition_vr/wild/tether_wild-crash-alt.dmm @@ -6,7 +6,7 @@ "f" = (/turf/simulated/floor/outdoors/dirt/virgo3b,/area/tether/surfacebase/crash) "g" = (/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "h" = (/turf/simulated/shuttle/wall/dark/hard_corner/virgo3b,/area/tether/surfacebase/crash) -"i" = (/obj/item/weapon/material/shard,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) +"i" = (/obj/item/material/shard,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "j" = (/obj/structure/closet/crate/secure/weapon,/obj/random/weapon,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "k" = (/obj/effect/step_trigger/teleporter/wild/to_wild_3,/turf/simulated/floor/outdoors/grass/sif/virgo3b{icon_state = "grass_sif_dark"; name = "passage"; tree_chance = 0},/area/tether/surfacebase/outside/wilderness) "l" = (/obj/effect/step_trigger/teleporter/wild/to_wild_1,/turf/simulated/floor/outdoors/grass/sif/virgo3b{icon_state = "grass_sif_dark"; name = "passage"; tree_chance = 0},/area/tether/surfacebase/outside/wilderness) diff --git a/maps/expedition_vr/wild/tether_wild-crash.dmm b/maps/expedition_vr/wild/tether_wild-crash.dmm index 120e732a0ed..7f78bf50fb4 100644 --- a/maps/expedition_vr/wild/tether_wild-crash.dmm +++ b/maps/expedition_vr/wild/tether_wild-crash.dmm @@ -8,7 +8,7 @@ "ah" = (/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "ai" = (/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "aj" = (/turf/simulated/floor/virgo3b_indoors{desc = "Quite dirty!"; icon = 'icons/turf/outdoors.dmi'; icon_state = "dirt-dark"; name = "dirt"},/area/tether/surfacebase/outside/wilderness) -"ak" = (/obj/item/weapon/material/shard,/turf/simulated/floor/outdoors/grass/sif/virgo3b{icon_state = "grass_sif_dark"; name = "dense growth"; tree_chance = 0},/area/tether/surfacebase/outside/wilderness) +"ak" = (/obj/item/material/shard,/turf/simulated/floor/outdoors/grass/sif/virgo3b{icon_state = "grass_sif_dark"; name = "dense growth"; tree_chance = 0},/area/tether/surfacebase/outside/wilderness) "al" = (/obj/structure/closet/cabinet,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "am" = (/obj/structure/bed/padded,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "an" = (/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_alc/full,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) @@ -26,8 +26,8 @@ "az" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "aA" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "aB" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 4},/turf/simulated/floor/virgo3b_indoors{desc = "Quite dirty!"; icon = 'icons/turf/outdoors.dmi'; icon_state = "dirt-dark"; name = "dirt"},/area/tether/surfacebase/outside/wilderness) -"aC" = (/obj/item/weapon/material/shard,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) -"aD" = (/obj/item/weapon/pen{pixel_y = 4},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) +"aC" = (/obj/item/material/shard,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) +"aD" = (/obj/item/pen{pixel_y = 4},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "aE" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 32},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "aF" = (/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/virgo3b,/area/tether/surfacebase/crash) "aG" = (/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/virgo3b,/area/tether/surfacebase/crash) @@ -37,15 +37,15 @@ "aK" = (/obj/machinery/suit_cycler/syndicate,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "aL" = (/obj/machinery/bodyscanner{dir = 8},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "aM" = (/obj/machinery/body_scanconsole,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) -"aN" = (/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/weapon/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/weapon/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/weapon/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/weapon/storage/firstaid/adv{pixel_x = -2},/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/structure/closet/medical_wall{pixel_y = 32},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) -"aO" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/item/weapon/surgical/scalpel,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) +"aN" = (/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/storage/firstaid/toxin,/obj/item/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/storage/firstaid/adv{pixel_x = -2},/obj/item/reagent_containers/blood/empty,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/structure/closet/medical_wall{pixel_y = 32},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) +"aO" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/item/surgical/scalpel,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "aP" = (/obj/structure/table/steel_reinforced,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "aQ" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "aR" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "aS" = (/obj/machinery/door/airlock/glass_medical{name = "Medical Bay"; req_access = list(160)},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "aT" = (/obj/machinery/iv_drip,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) -"aU" = (/obj/item/clothing/mask/surgical,/obj/item/weapon/surgical/bonesetter,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) -"aV" = (/obj/item/weapon/surgical/surgicaldrill,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) +"aU" = (/obj/item/clothing/mask/surgical,/obj/item/surgical/bonesetter,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) +"aV" = (/obj/item/surgical/surgicaldrill,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "aW" = (/obj/machinery/optable,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "aX" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"; dir = 4},/turf/simulated/floor/virgo3b_indoors{desc = "Quite dirty!"; icon = 'icons/turf/outdoors.dmi'; icon_state = "dirt-dark"; name = "dirt"},/area/tether/surfacebase/outside/wilderness) "aY" = (/obj/structure/closet/walllocker/emerglocker{pixel_y = -32},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) @@ -53,26 +53,26 @@ "ba" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "bb" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "bc" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) -"bd" = (/obj/item/weapon/surgical/circular_saw,/obj/item/weapon/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) +"bd" = (/obj/item/surgical/circular_saw,/obj/item/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "be" = (/obj/machinery/light,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "bf" = (/obj/machinery/vending/medical{pixel_y = -32; req_access = null},/obj/item/stack/nanopaste,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) -"bg" = (/obj/item/weapon/surgical/hemostat{pixel_y = 4},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) +"bg" = (/obj/item/surgical/hemostat{pixel_y = 4},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "bh" = (/obj/machinery/door/airlock/multi_tile/glass,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "bi" = (/obj/structure/window/reinforced,/obj/structure/table/steel_reinforced,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "bj" = (/obj/machinery/door/window/southleft,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "bk" = (/obj/machinery/door/window/southright,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "bl" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "bm" = (/obj/structure/closet/walllocker/emerglocker{pixel_y = -32},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) -"bn" = (/obj/structure/table/standard,/obj/item/weapon/surgical/cautery{pixel_y = 4},/obj/item/stack/medical/advanced/bruise_pack,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) -"bo" = (/obj/item/weapon/surgical/retractor{pixel_x = 0; pixel_y = 6},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) -"bp" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/material/shard,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) +"bn" = (/obj/structure/table/standard,/obj/item/surgical/cautery{pixel_y = 4},/obj/item/stack/medical/advanced/bruise_pack,/obj/item/surgical/bonegel{pixel_x = 4; pixel_y = 3},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) +"bo" = (/obj/item/surgical/retractor{pixel_x = 0; pixel_y = 6},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) +"bp" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/item/material/shard,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "bq" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "br" = (/obj/machinery/vending/coffee,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "bs" = (/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "bt" = (/obj/machinery/door/airlock/multi_tile/glass,/turf/simulated/shuttle/floor/black{carbon_dioxide = 12.7125; nitrogen = 16.95; oxygen = 0; phoron = 76.2751},/area/tether/surfacebase/crash) "bu" = (/turf/simulated/shuttle/floor/black{carbon_dioxide = 12.7125; nitrogen = 16.95; oxygen = 0; phoron = 76.2751},/area/tether/surfacebase/crash) "bv" = (/obj/structure/closet/crate/secure/weapon,/obj/random/weapon,/turf/simulated/shuttle/floor/black{carbon_dioxide = 12.7125; nitrogen = 16.95; oxygen = 0; phoron = 76.2751},/area/tether/surfacebase/crash) -"bw" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/weapon/pen{pixel_y = 4},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) +"bw" = (/obj/structure/table/steel_reinforced,/obj/item/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/pen{pixel_y = 4},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "bx" = (/obj/structure/table/steel_reinforced,/obj/machinery/newscaster{pixel_x = 32},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "by" = (/obj/structure/toilet,/obj/machinery/light/small{dir = 1},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "bz" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/light/small,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) @@ -86,7 +86,7 @@ "bH" = (/obj/machinery/door/airlock/silver{name = "Toilet"},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "bI" = (/obj/machinery/door/airlock/silver{name = "Restroom"},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "bJ" = (/obj/structure/undies_wardrobe,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) -"bK" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) +"bK" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "bL" = (/obj/effect/floor_decal/industrial/warning{dir = 9},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "bM" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "bN" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) @@ -108,12 +108,12 @@ "cd" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "ce" = (/obj/effect/step_trigger/teleporter/wild/to_wild_1,/turf/simulated/floor/outdoors/grass/sif/virgo3b{icon_state = "grass_sif_dark"; name = "passage"; tree_chance = 0},/area/tether/surfacebase/outside/wilderness) "cf" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) -"cg" = (/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) +"cg" = (/obj/item/reagent_containers/spray/cleaner,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "ch" = (/obj/machinery/vending/sovietsoda,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "ci" = (/obj/machinery/light,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/outside/wilderness) "cj" = (/obj/machinery/vending/boozeomat{req_access = null},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "ck" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor/black{carbon_dioxide = 12.7125; nitrogen = 16.95; oxygen = 0; phoron = 76.2751},/area/tether/surfacebase/crash) -"cl" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/shuttle/floor/black{carbon_dioxide = 12.7125; nitrogen = 16.95; oxygen = 0; phoron = 76.2751},/area/tether/surfacebase/crash) +"cl" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical,/turf/simulated/shuttle/floor/black{carbon_dioxide = 12.7125; nitrogen = 16.95; oxygen = 0; phoron = 76.2751},/area/tether/surfacebase/crash) "cm" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/steel_reinforced,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "cn" = (/obj/machinery/door/window/northleft,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "co" = (/obj/machinery/door/window/northright,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) @@ -136,7 +136,7 @@ "cF" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "cG" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "cH" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) -"cI" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/captain,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) +"cI" = (/obj/structure/bed/padded,/obj/item/bedsheet/captain,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "cJ" = (/obj/structure/table/glass,/obj/machinery/computer3/wall_comp/telescreen/entertainment{pixel_y = -35},/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "cK" = (/obj/structure/filingcabinet/filingcabinet,/turf/simulated/shuttle/floor/black/virgo3b,/area/tether/surfacebase/crash) "cL" = (/obj/machinery/light,/turf/simulated/floor/carpet,/area/tether/surfacebase/crash) diff --git a/maps/expedition_vr/wild/tether_wild-temple.dmm b/maps/expedition_vr/wild/tether_wild-temple.dmm index a147ff9c9da..3d2d1bc3aa9 100644 --- a/maps/expedition_vr/wild/tether_wild-temple.dmm +++ b/maps/expedition_vr/wild/tether_wild-temple.dmm @@ -8,10 +8,10 @@ "h" = (/obj/structure/mob_spawner/scanner/xenos,/turf/simulated/floor/outdoors/dirt{desc = "Quite dirty!"; icon = 'icons/turf/outdoors.dmi'; icon_state = "dirt-dark"; name = "dirt"},/area/tether/surfacebase/temple) "i" = (/obj/structure/mob_spawner/scanner/xenos/royal,/turf/simulated/floor/outdoors/dirt{desc = "Quite dirty!"; icon = 'icons/turf/outdoors.dmi'; icon_state = "dirt-dark"; name = "dirt"},/area/tether/surfacebase/temple) "j" = (/obj/effect/step_trigger/teleporter/wild/to_wild_6,/turf/simulated/floor/outdoors/grass/sif/virgo3b{icon_state = "grass_sif_dark"; name = "passage"; tree_chance = 0},/area/tether/surfacebase/outside/wilderness) -"k" = (/obj/item/weapon/material/star,/turf/simulated/floor/outdoors/dirt{desc = "Quite dirty!"; icon = 'icons/turf/outdoors.dmi'; icon_state = "dirt-dark"; name = "dirt"},/area/tether/surfacebase/temple) +"k" = (/obj/item/material/star,/turf/simulated/floor/outdoors/dirt{desc = "Quite dirty!"; icon = 'icons/turf/outdoors.dmi'; icon_state = "dirt-dark"; name = "dirt"},/area/tether/surfacebase/temple) "l" = (/obj/effect/decal/mecha_wreckage/phazon{anchored = 1; name = "rusted Phazon wreckage"},/turf/simulated/floor/outdoors/dirt{desc = "Quite dirty!"; icon = 'icons/turf/outdoors.dmi'; icon_state = "dirt-dark"; name = "dirt"},/area/tether/surfacebase/temple) -"m" = (/obj/item/weapon/cell/infinite,/obj/effect/gibspawner/human,/turf/simulated/floor/outdoors/dirt{desc = "Quite dirty!"; icon = 'icons/turf/outdoors.dmi'; icon_state = "dirt-dark"; name = "dirt"},/area/tether/surfacebase/temple) -"n" = (/obj/item/weapon/material/sword/katana,/turf/simulated/floor/outdoors/dirt{desc = "Quite dirty!"; icon = 'icons/turf/outdoors.dmi'; icon_state = "dirt-dark"; name = "dirt"},/area/tether/surfacebase/temple) +"m" = (/obj/item/cell/infinite,/obj/effect/gibspawner/human,/turf/simulated/floor/outdoors/dirt{desc = "Quite dirty!"; icon = 'icons/turf/outdoors.dmi'; icon_state = "dirt-dark"; name = "dirt"},/area/tether/surfacebase/temple) +"n" = (/obj/item/material/sword/katana,/turf/simulated/floor/outdoors/dirt{desc = "Quite dirty!"; icon = 'icons/turf/outdoors.dmi'; icon_state = "dirt-dark"; name = "dirt"},/area/tether/surfacebase/temple) "o" = (/obj/effect/step_trigger/teleporter/wild/to_wild_4,/turf/simulated/floor/outdoors/grass/sif/virgo3b{icon_state = "grass_sif_dark"; name = "passage"; tree_chance = 0},/area/tether/surfacebase/outside/wilderness) (1,1,1) = {" diff --git a/maps/gateway_archive_vr/Academy.dmm b/maps/gateway_archive_vr/Academy.dmm index 1aa4550433c..c683820aab9 100644 --- a/maps/gateway_archive_vr/Academy.dmm +++ b/maps/gateway_archive_vr/Academy.dmm @@ -25,12 +25,12 @@ /area/awaymission/academy/headmaster) "af" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/simulated/floor/carpet, /area/awaymission/academy/headmaster) "ag" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /turf/simulated/floor/carpet, /area/awaymission/academy/headmaster) "ah" = ( @@ -96,12 +96,12 @@ /area/awaymission/academy/headmaster) "aq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/food/drinks/coffee, /turf/simulated/floor/carpet, /area/awaymission/academy/headmaster) "ar" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "We're upgrading to the latest mainframes for our consoles, the shipment should be in before spring break is over!"; name = "Console Maintenance" }, @@ -136,7 +136,7 @@ /area/awaymission/academy/headmaster) "aw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/carpet, /area/awaymission/academy/headmaster) "ax" = ( @@ -165,12 +165,12 @@ /area/awaymission/academy/headmaster) "aB" = ( /obj/structure/stool/bed, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /turf/simulated/floor/wood, /area/awaymission/academy/headmaster) "aC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/tea, +/obj/item/reagent_containers/food/drinks/tea, /turf/simulated/floor/carpet, /area/awaymission/academy/headmaster) "aD" = ( @@ -200,7 +200,7 @@ /area/awaymission/academy/headmaster) "aH" = ( /obj/structure/cult/tome, -/obj/item/weapon/staff, +/obj/item/staff, /turf/simulated/floor/wood, /area/awaymission/academy/headmaster) "aI" = ( @@ -217,12 +217,12 @@ /area/awaymission/academy/headmaster) "aK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /turf/simulated/floor/carpet, /area/awaymission/academy/headmaster) "aL" = ( /obj/structure/table/reinforced, -/obj/item/weapon/coin/plasma, +/obj/item/coin/plasma, /turf/simulated/floor/carpet, /area/awaymission/academy/headmaster) "aM" = ( @@ -277,12 +277,12 @@ /area/awaymission/academy/headmaster) "aW" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/carpet, /area/awaymission/academy/headmaster) "aX" = ( /obj/structure/table/woodentable, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /turf/simulated/floor/carpet, /area/awaymission/academy/headmaster) "aY" = ( @@ -291,22 +291,22 @@ icon_state = "1-2"; pixel_y = 0 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/simulated/floor/carpet, /area/awaymission/academy/headmaster) "aZ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/staff, +/obj/item/staff, /turf/simulated/floor/carpet, /area/awaymission/academy/headmaster) "ba" = ( /obj/structure/table/woodentable, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/wood, /area/awaymission/academy/headmaster) "bb" = ( /obj/structure/table/woodentable, -/obj/item/weapon/pen/invisible, +/obj/item/pen/invisible, /turf/simulated/floor/wood, /area/awaymission/academy/headmaster) "bc" = ( @@ -317,7 +317,7 @@ /area/awaymission/academy/headmaster) "bd" = ( /obj/structure/table/woodentable, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/simulated/floor/carpet, /area/awaymission/academy/headmaster) "be" = ( @@ -330,17 +330,17 @@ icon_state = "1-2"; pixel_y = 0 }, -/obj/item/weapon/dice/d20, +/obj/item/dice/d20, /turf/simulated/floor/carpet, /area/awaymission/academy/headmaster) "bg" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/tea, +/obj/item/reagent_containers/food/drinks/tea, /turf/simulated/floor/carpet, /area/awaymission/academy/headmaster) "bh" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/wood, /area/awaymission/academy/headmaster) "bi" = ( @@ -361,7 +361,7 @@ /area/awaymission/academy/headmaster) "bk" = ( /obj/structure/table/woodentable, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /turf/simulated/floor/wood, /area/awaymission/academy/headmaster) "bl" = ( @@ -619,7 +619,7 @@ /area/awaymission/academy/headmaster) "ca" = ( /obj/structure/table/standard, -/obj/item/weapon/lighter/random, +/obj/item/lighter/random, /turf/simulated/floor, /area/awaymission/academy/headmaster) "cb" = ( @@ -720,7 +720,7 @@ icon_state = "1-2"; pixel_y = 0 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/simulated/floor, /area/awaymission/academy/classrooms) "cp" = ( @@ -900,15 +900,15 @@ /area/awaymission/academy/headmaster) "cR" = ( /obj/structure/closet/crate/internals, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/tank/oxygen/red, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen/red, /turf/simulated/floor{ icon_state = "dark" }, /area/awaymission/academy/headmaster) "cS" = ( /obj/structure/closet/crate, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /turf/simulated/floor{ icon_state = "vault"; dir = 5 @@ -976,7 +976,7 @@ /area/awaymission/academy/classrooms) "dd" = ( /obj/structure/table/woodentable, -/obj/item/weapon/staff, +/obj/item/staff, /turf/simulated/floor/wood, /area/awaymission/academy/classrooms) "de" = ( @@ -1095,7 +1095,7 @@ /obj/effect/landmark{ name = "awaystart" }, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /turf/simulated/floor/greengrid, /area/awaymission/academy/classrooms) "dw" = ( @@ -1135,7 +1135,7 @@ /area/awaymission/academy/headmaster) "dA" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor, /area/awaymission/academy/classrooms) "dB" = ( @@ -1315,7 +1315,7 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/item/weapon/paper{ +/obj/item/paper{ name = "Automotive Repair 101" }, /turf/simulated/floor{ @@ -1334,7 +1334,7 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/item/weapon/paper{ +/obj/item/paper{ name = "Pyromancy 250" }, /turf/simulated/floor{ @@ -1636,7 +1636,7 @@ icon_state = "tube1"; dir = 4 }, -/obj/item/weapon/reagent_containers/food/snacks/spellburger, +/obj/item/reagent_containers/food/snacks/spellburger, /turf/simulated/floor{ dir = 8; icon_state = "barber" @@ -1846,7 +1846,7 @@ /obj/structure/noticeboard{ pixel_y = -32 }, -/obj/item/weapon/paper{ +/obj/item/paper{ name = "Biology Lab" }, /turf/simulated/floor{ @@ -2078,12 +2078,12 @@ /area/awaymission/academy/classrooms) "fZ" = ( /obj/structure/table/standard, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/simulated/floor, /area/awaymission/academy/classrooms) "ga" = ( /obj/structure/table/standard, -/obj/item/weapon/scalpel, +/obj/item/scalpel, /turf/simulated/floor{ icon_state = "whitehall"; dir = 4 @@ -2095,7 +2095,7 @@ /area/awaymission/academy/classrooms) "gc" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/engineering_hacking, +/obj/item/book/manual/engineering_hacking, /turf/simulated/floor/wood, /area/awaymission/academy/classrooms) "gd" = ( @@ -2137,7 +2137,7 @@ /area/awaymission/academy/classrooms) "gi" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/simulated/floor{ icon_state = "vault"; dir = 5 @@ -2160,7 +2160,7 @@ }, /area/awaymission/academy/classrooms) "gl" = ( -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /turf/simulated/floor/plating, /area/awaymission/academy/classrooms) "gm" = ( @@ -2219,7 +2219,7 @@ /area/awaymission/academy/classrooms) "gt" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/medical_cloning, +/obj/item/book/manual/medical_cloning, /turf/simulated/floor/wood, /area/awaymission/academy/classrooms) "gu" = ( @@ -2276,8 +2276,8 @@ /area/awaymission/academy/academyaft) "gB" = ( /obj/structure/table/standard, -/obj/item/weapon/gun/projectile/shotgun/pump/sc_pump, -/obj/item/weapon/paper{ +/obj/item/gun/projectile/shotgun/pump/sc_pump, +/obj/item/paper{ info = "Grade: A+ Educator's Notes: Excellent form."; name = "Summoning Midterm Exam" }, @@ -2288,8 +2288,8 @@ /area/awaymission/academy/classrooms) "gC" = ( /obj/structure/table/standard, -/obj/item/weapon/gun/projectile/russian, -/obj/item/weapon/paper{ +/obj/item/gun/projectile/russian, +/obj/item/paper{ info = "Grade: B- Educator's Notes: Keep applying yourself, you're showing improvement."; name = "Summoning Midterm Exam" }, @@ -2319,14 +2319,14 @@ /area/awaymission/academy/classrooms) "gG" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/hydroponics_pod_people, +/obj/item/book/manual/hydroponics_pod_people, /turf/simulated/floor/wood, /area/awaymission/academy/classrooms) "gH" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/barman_recipes, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /turf/simulated/floor/wood, /area/awaymission/academy/classrooms) "gI" = ( @@ -2394,8 +2394,8 @@ /area/awaymission/academy/classrooms) "gQ" = ( /obj/structure/table/standard, -/obj/item/weapon/gun/energy/floragun, -/obj/item/weapon/paper{ +/obj/item/gun/energy/floragun, +/obj/item/paper{ info = "Grade: D- Educator's Notes: SEE ME AFTER CLASS."; name = "Summoning Midterm Exam" }, @@ -2537,7 +2537,7 @@ }, /area/awaymission/academy/academyaft) "hk" = ( -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /turf/simulated/floor{ icon_state = "green"; dir = 4 @@ -2770,12 +2770,12 @@ /obj/structure/closet, /obj/item/candle, /obj/item/candle, -/obj/item/weapon/storage/box/matches, +/obj/item/storage/box/matches, /turf/simulated/floor, /area/awaymission/academy/academyaft) "hM" = ( /obj/structure/closet, -/obj/item/weapon/storage/belt/soulstone, +/obj/item/storage/belt/soulstone, /obj/item/clothing/under/schoolgirl, /turf/simulated/floor, /area/awaymission/academy/academyaft) @@ -2793,7 +2793,7 @@ /area/awaymission/academy/academyaft) "hP" = ( /obj/structure/closet, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /obj/item/clothing/under/schoolgirl, /turf/simulated/floor, /area/awaymission/academy/academyaft) @@ -2803,12 +2803,12 @@ "hR" = ( /obj/structure/closet, /obj/item/clothing/under/lightpurple, -/obj/item/weapon/staff, +/obj/item/staff, /turf/simulated/floor, /area/awaymission/academy/academyaft) "hS" = ( /obj/structure/closet, -/obj/item/weapon/storage/wallet/random, +/obj/item/storage/wallet/random, /obj/item/clothing/glasses/regular/hipster, /turf/simulated/floor, /area/awaymission/academy/academyaft) @@ -2820,16 +2820,16 @@ /area/awaymission/academy/academyaft) "hU" = ( /obj/structure/closet, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /obj/item/clothing/under/purple, /obj/item/poster, /turf/simulated/floor, /area/awaymission/academy/academyaft) "hV" = ( /obj/structure/closet, -/obj/item/weapon/storage/box/snappops, -/obj/item/weapon/storage/backpack, -/obj/item/weapon/paper{ +/obj/item/storage/box/snappops, +/obj/item/storage/backpack, +/obj/item/paper{ info = "Current Grade: F. Educator's Notes: No improvement shown despite multiple private lessons. Suggest additional tutilage."; name = "Pyromancy Evaluation" }, @@ -2877,9 +2877,9 @@ /area/awaymission/academy/academyaft) "ic" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/telecomms/broadcaster, -/obj/item/weapon/circuitboard/telecomms/receiver, -/obj/item/weapon/circuitboard/telecomms/relay, +/obj/item/circuitboard/telecomms/broadcaster, +/obj/item/circuitboard/telecomms/receiver, +/obj/item/circuitboard/telecomms/relay, /turf/simulated/floor{ icon_state = "hydrofloor" }, @@ -2915,12 +2915,12 @@ /area/awaymission/academy/academyaft) "ih" = ( /obj/structure/rack, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, /turf/simulated/floor, /area/awaymission/academy/academyaft) "ii" = ( @@ -2942,21 +2942,21 @@ /area/awaymission/academy/academyaft) "il" = ( /obj/structure/rack, -/obj/item/weapon/stock_parts/scanning_module, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/ansible, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/ansible, /turf/simulated/floor, /area/awaymission/academy/academyaft) "im" = ( -/obj/item/weapon/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, /turf/simulated/floor{ icon_state = "hydrofloor" }, /area/awaymission/academy/academyaft) "in" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor, /area/awaymission/academy/academyaft) "io" = ( @@ -3019,8 +3019,8 @@ /area/awaymission/academy/academyaft) "iu" = ( /obj/structure/rack, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/subspace/filter, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/subspace/filter, /turf/simulated/floor{ icon_state = "hydrofloor" }, @@ -3076,7 +3076,7 @@ }, /area/awaymission/academy/academyaft) "iz" = ( -/obj/item/weapon/paper, +/obj/item/paper, /turf/simulated/floor/wood, /area/awaymission/academy/academyaft) "iA" = ( @@ -3088,7 +3088,7 @@ /turf/simulated/floor/plating, /area/awaymission/academy/academyaft) "iC" = ( -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/engine, /area/awaymission/academy/academyaft) "iD" = ( @@ -3135,7 +3135,7 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/beach_ball/holoball, +/obj/item/beach_ball/holoball, /turf/simulated/floor{ icon_state = "red"; dir = 1 @@ -3203,7 +3203,7 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/device/soulstone, +/obj/item/soulstone, /turf/simulated/floor/airless{ icon_state = "whitered"; dir = 4 @@ -3367,13 +3367,13 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/item/weapon/shard, +/obj/item/shard, /turf/simulated/floor/plating/airless, /area/awaymission/academy/academyaft) "jk" = ( /obj/structure/window/reinforced, /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/drinks/golden_cup, +/obj/item/reagent_containers/food/drinks/golden_cup, /turf/simulated/floor{ icon_state = "red" }, @@ -3414,14 +3414,14 @@ "jq" = ( /obj/structure/table/standard, /obj/structure/window/reinforced, -/obj/item/device/batterer, +/obj/item/batterer, /turf/simulated/floor/airless{ icon_state = "whitered"; dir = 4 }, /area/awaymission/academy/academyaft) "jr" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/space, diff --git a/maps/gateway_archive_vr/beach.dmm b/maps/gateway_archive_vr/beach.dmm index 2f6543ece85..2402c46f604 100644 --- a/maps/gateway_archive_vr/beach.dmm +++ b/maps/gateway_archive_vr/beach.dmm @@ -114,14 +114,14 @@ /area/awaymission/beach) "v" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/manual/barman_recipes, +/obj/item/book/manual/barman_recipes, /turf/unsimulated/floor{ icon_state = "wood" }, /area/awaymission/beach) "w" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/food/drinks/shaker, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -194,13 +194,13 @@ /area/awaymission/beach) "I" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/unsimulated/floor{ icon_state = "wood" }, /area/awaymission/beach) "J" = ( -/obj/item/weapon/beach_ball, +/obj/item/beach_ball, /turf/unsimulated/beach/sand, /area/awaymission/beach) "K" = ( diff --git a/maps/gateway_archive_vr/blackmarketpackers.dmm b/maps/gateway_archive_vr/blackmarketpackers.dmm index a2173b3e048..35b7cf4e3e3 100644 --- a/maps/gateway_archive_vr/blackmarketpackers.dmm +++ b/maps/gateway_archive_vr/blackmarketpackers.dmm @@ -9,7 +9,7 @@ /turf/simulated/floor/plating/airless/asteroid, /area/awaymission) "ad" = ( -/obj/item/weapon/circular_saw, +/obj/item/circular_saw, /obj/structure/lattice, /turf/space, /area) @@ -55,7 +55,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/simulated/floor/engine, /area/awaymission/BMPship3) @@ -195,15 +195,15 @@ /turf/simulated/floor/plating/airless, /area/awaymission/BMPship1) "aH" = ( -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs, /obj/structure/closet/crate, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship1) "aI" = ( -/obj/item/weapon/scalpel, +/obj/item/scalpel, /obj/structure/closet/crate, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship1) "aJ" = ( @@ -211,7 +211,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/BMPship1) "aK" = ( -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship1) "aL" = ( @@ -249,9 +249,9 @@ /area/awaymission/BMPship1) "aQ" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/appendix, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/appendix, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 1 @@ -260,8 +260,8 @@ "aR" = ( /obj/structure/closet/crate/freezer, /obj/item/brain, -/obj/item/weapon/reagent_containers/food/snacks/appendix, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/appendix, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 1 @@ -269,7 +269,7 @@ /area/awaymission/BMPship1) "aS" = ( /obj/structure/table/standard, -/obj/item/weapon/packageWrap, +/obj/item/packageWrap, /turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 1 @@ -277,7 +277,7 @@ /area/awaymission/BMPship1) "aT" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box, +/obj/item/storage/box, /obj/machinery/light/small{ dir = 1 }, @@ -339,7 +339,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship1) "bd" = ( -/obj/item/weapon/storage/box, +/obj/item/storage/box, /turf/simulated/floor/plating, /area/awaymission/BMPship1) "be" = ( @@ -361,7 +361,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship1) "bh" = ( -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/plating, /area/awaymission/BMPship1) "bi" = ( @@ -386,14 +386,14 @@ /area/awaymission/BMPship3) "bk" = ( /obj/structure/table/woodentable, -/obj/item/weapon/spacecash/c500, -/obj/item/weapon/spacecash/c100, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/spacecash/c500, +/obj/item/spacecash/c100, +/obj/item/reagent_containers/food/drinks/beer, /turf/simulated/floor/wood, /area/awaymission/BMPship3) "bl" = ( /obj/structure/stool/bed, -/obj/item/weapon/bedsheet/yellow, +/obj/item/bedsheet/yellow, /turf/simulated/floor/wood, /area/awaymission/BMPship3) "bm" = ( @@ -484,8 +484,8 @@ /area/awaymission/BMPship1) "bz" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/drinks/beer, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/simulated/floor/plating, /area/awaymission/BMPship1) "bA" = ( @@ -568,8 +568,8 @@ /area/awaymission/BMPship1) "bN" = ( /obj/structure/closet/crate, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c50, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c50, /turf/simulated/floor/plating{ icon_state = "warnplate"; dir = 4 @@ -641,7 +641,7 @@ icon_state = "4-8"; pixel_y = 0 }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/plating, /area/awaymission/BMPship1) "ca" = ( @@ -656,7 +656,7 @@ icon_state = "4-8"; pixel_y = 0 }, -/obj/item/weapon/storage/box, +/obj/item/storage/box, /turf/simulated/floor/plating, /area/awaymission/BMPship1) "cc" = ( @@ -755,8 +755,8 @@ /area/awaymission/BMPship1) "cr" = ( /obj/structure/closet/crate, -/obj/item/device/analyzer, -/obj/item/weapon/spacecash/c10, +/obj/item/analyzer, +/obj/item/spacecash/c10, /turf/simulated/floor/plating{ dir = 2; icon_state = "warnplate" @@ -764,9 +764,9 @@ /area/awaymission/BMPship1) "cs" = ( /obj/structure/closet/crate, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c200, -/obj/item/weapon/spacecash/c500, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c200, +/obj/item/spacecash/c500, /turf/simulated/floor/plating{ dir = 2; icon_state = "warnplate" @@ -774,9 +774,9 @@ /area/awaymission/BMPship1) "ct" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice, -/obj/item/weapon/reagent_containers/food/snacks/appendix, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/hugemushroomslice, +/obj/item/reagent_containers/food/snacks/appendix, /turf/simulated/floor/plating{ dir = 2; icon_state = "warnplate" @@ -852,13 +852,13 @@ /area/awaymission/BMPship2) "cC" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/paper{ +/obj/item/tool/screwdriver, +/obj/item/tool/screwdriver, +/obj/item/paper{ info = "The next person who takes one of my screwdrivers gets stabbed with one. They are MINE. - Love, Madsen"; name = "scribbled note" }, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /turf/simulated/floor{ icon_state = "bar" }, @@ -923,16 +923,16 @@ /area/awaymission/BMPship2) "cL" = ( /obj/structure/table/standard, -/obj/item/weapon/butch, -/obj/item/weapon/reagent_containers/food/drinks/beer, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/butch, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor{ icon_state = "barber" }, /area/awaymission/BMPship2) "cM" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/simulated/floor{ icon_state = "barber" }, @@ -958,14 +958,14 @@ /area/awaymission/BMPship2) "cP" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/simulated/floor{ icon_state = "bar" }, /area/awaymission/BMPship2) "cQ" = ( /obj/structure/table/standard, -/obj/item/weapon/kitchenknife, +/obj/item/kitchenknife, /turf/simulated/floor{ icon_state = "bar" }, @@ -1024,7 +1024,7 @@ }, /area/awaymission/BMPship3) "cY" = ( -/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice, +/obj/item/reagent_containers/food/snacks/hugemushroomslice, /turf/simulated/floor{ icon_state = "bar" }, @@ -1033,7 +1033,7 @@ /turf/simulated/floor, /area/awaymission/BMPship2) "da" = ( -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/simulated/floor, /area/awaymission/BMPship2) "db" = ( @@ -1154,7 +1154,7 @@ }, /area/awaymission/BMPship3) "du" = ( -/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice, +/obj/item/reagent_containers/food/snacks/hugemushroomslice, /turf/simulated/floor, /area/awaymission/BMPship2) "dv" = ( @@ -1195,7 +1195,7 @@ }, /area/awaymission/BMPship2) "dA" = ( -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/simulated/floor{ icon_state = "bar" }, @@ -1219,8 +1219,8 @@ /area/awaymission/BMPship1) "dD" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor{ icon_state = "white" }, @@ -1235,7 +1235,7 @@ }, /area/awaymission/BMPship1) "dF" = ( -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /turf/simulated/floor{ icon_state = "white" }, @@ -1268,7 +1268,7 @@ /area/awaymission/BMPship1) "dJ" = ( /obj/structure/table/standard, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "I'm no scientist, but judging from the design and components, it seems to be some kind of gateway. This thing is gonna be worth a lot of cash to the right man. The boys are excited, as they have every right to be, and I've let them crack into that case of beer we got. I normally wouldn't allow such a thing, but this is a time for celebration! It's not like a couple drinks will hurt anything."; name = "Captain's log entry" }, @@ -1279,7 +1279,7 @@ /area/awaymission/BMPship3) "dK" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/simulated/floor{ icon_state = "carpet14-2"; dir = 4 @@ -1369,7 +1369,7 @@ }, /area/awaymission/BMPship2) "dW" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /obj/structure/cable{ icon_state = "1-2" }, @@ -1428,7 +1428,7 @@ }, /area/awaymission/BMPship1) "ec" = ( -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/engine, /area/awaymission/BMPship1) "ed" = ( @@ -1611,7 +1611,7 @@ }, /area/awaymission/BMPship3) "eA" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/simulated/floor{ icon_state = "carpetside"; dir = 5 @@ -1760,7 +1760,7 @@ /area/awaymission/BMPship1) "eR" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/lights, +/obj/item/storage/box/lights, /turf/simulated/floor{ dir = 8; icon_state = "warning" @@ -1835,7 +1835,7 @@ }, /area/awaymission/BMPship3) "eZ" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/simulated/floor{ @@ -1871,7 +1871,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship2) "ff" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor{ icon_state = "bar" }, @@ -1950,7 +1950,7 @@ /area/awaymission/BMPship1) "fp" = ( /obj/structure/rack, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /turf/simulated/floor{ dir = 8; icon_state = "warning" @@ -2081,7 +2081,7 @@ /area/awaymission/BMPship1) "fE" = ( /obj/structure/rack, -/obj/item/weapon/cell/high, +/obj/item/cell/high, /turf/simulated/floor{ dir = 8; icon_state = "warning" @@ -2259,7 +2259,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship2) "gb" = ( -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/plating, /area/awaymission/BMPship2) "gc" = ( @@ -2287,7 +2287,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/kitchenknife, +/obj/item/kitchenknife, /turf/simulated/shuttle/plating, /area/awaymission/BMPship1) "gg" = ( @@ -2295,7 +2295,7 @@ icon_state = "1-2"; pixel_y = 0 }, -/obj/item/weapon/cell/high, +/obj/item/cell/high, /turf/simulated/floor, /area/awaymission/BMPship1) "gh" = ( @@ -2353,7 +2353,7 @@ dir = 4; id = "meatConvey2" }, -/obj/item/weapon/kitchenknife, +/obj/item/kitchenknife, /turf/simulated/shuttle/plating, /area/awaymission/BMPship2) "gp" = ( @@ -2442,7 +2442,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/BMPship3) "gC" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /obj/structure/cable{ @@ -2472,7 +2472,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/item/weapon/kitchenknife, +/obj/item/kitchenknife, /turf/simulated/floor{ icon_state = "bar" }, @@ -2511,7 +2511,7 @@ }, /area/awaymission/BMPship1) "gK" = ( -/obj/item/weapon/mop, +/obj/item/mop, /turf/simulated/floor{ icon_state = "showroomfloor" }, @@ -2535,7 +2535,7 @@ }, /area/awaymission/BMPship3) "gO" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/simulated/floor/plating/airless{ icon_state = "platingdmg1" }, @@ -2571,13 +2571,13 @@ /area/awaymission/BMPship2) "gU" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor{ icon_state = "showroomfloor" }, /area/awaymission/BMPship1) "gV" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor{ icon_state = "showroomfloor" }, @@ -2671,7 +2671,7 @@ /turf/simulated/mineral/random, /area/awaymission) "hj" = ( -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/plating/airless{ icon_state = "platingdmg2" }, @@ -2730,7 +2730,7 @@ /area/awaymission/BMPship1) "hu" = ( /obj/structure/table/standard, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "DEAR DAIRY: So we was doing our typpical route when the captain says we've been picking up weird signals on some backwatter planet. Madsen wanted to stay on course but he ain't the captain, so we went out of the way to check it out. There was lots of rocks on the way, but we got to the planet fine. Found a big fancy camp with nobody around and this big metal donut thing with NT stamps all over it right in the middle. Case of beer too. Captain reckons we can pass it off to some buyer in the Syndicate. Ingram says it's bad luck and that someone is going to come look for it but it sounds like better money than selling bad meat to jerky companies."; name = "Old Diary" }, @@ -2738,8 +2738,8 @@ /area/awaymission/BMPship1) "hv" = ( /obj/structure/table/standard, -/obj/item/weapon/pen/red, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/pen/red, +/obj/item/reagent_containers/food/drinks/beer, /turf/simulated/floor, /area/awaymission/BMPship1) "hw" = ( @@ -2887,7 +2887,7 @@ dir = 4 }, /obj/structure/grille, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/simulated/floor/engine, @@ -2935,8 +2935,8 @@ /area/awaymission/BMPship1) "id" = ( /obj/structure/stool/bed, -/obj/item/weapon/bedsheet, -/obj/item/weapon/storage/wallet/random, +/obj/item/bedsheet, +/obj/item/storage/wallet/random, /obj/structure/cable{ icon_state = "1-2" }, @@ -3001,7 +3001,7 @@ /turf/simulated/floor, /area/awaymission/BMPship1) "in" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/space, @@ -3026,7 +3026,7 @@ /area/awaymission/BMPship1) "is" = ( /obj/structure/stool/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor, /area/awaymission/BMPship1) "it" = ( @@ -3067,13 +3067,13 @@ /area/awaymission) "iy" = ( /obj/structure/closet/crate, -/obj/item/weapon/spacecash/c10, -/obj/item/weapon/spacecash/c200, +/obj/item/spacecash/c10, +/obj/item/spacecash/c200, /turf/simulated/floor, /area/awaymission/BMPship1) "iz" = ( /obj/structure/closet/crate, -/obj/item/weapon/spacecash/c10, +/obj/item/spacecash/c10, /turf/simulated/floor, /area/awaymission/BMPship1) "iA" = ( @@ -3113,8 +3113,8 @@ }, /area/awaymission) "iF" = ( -/obj/item/weapon/storage/box/matches, -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco, +/obj/item/storage/box/matches, +/obj/item/storage/fancy/cigarettes/dromedaryco, /turf/simulated/floor/plating, /area/awaymission/BMPship3) "iG" = ( @@ -3129,7 +3129,7 @@ }, /area/awaymission/BMPship3) "iI" = ( -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/simulated/floor/plating, /area/awaymission/BMPship3) "iJ" = ( diff --git a/maps/gateway_archive_vr/carpfarm.dm b/maps/gateway_archive_vr/carpfarm.dm index b5f0524e2cc..ce630d4e171 100644 --- a/maps/gateway_archive_vr/carpfarm.dm +++ b/maps/gateway_archive_vr/carpfarm.dm @@ -12,7 +12,7 @@ /area/awaymission/carpfarm/base/entry icon_state = "blue" -/obj/item/weapon/paper/awaygate/carpfarm/suicide +/obj/item/paper/awaygate/carpfarm/suicide name = "suicide letter" info = "dear rescue,

my name markov. if reading this, i am dead. i am was miner for 3rd union of soviet socialist republiks. \ comrades yuri, dimitri, ivan, all eaten by space carp. all started month ago when soviet shipment sent new sonic jackhammers. \ diff --git a/maps/gateway_archive_vr/carpfarm.dmm b/maps/gateway_archive_vr/carpfarm.dmm index b3162b04533..381b994469f 100644 --- a/maps/gateway_archive_vr/carpfarm.dmm +++ b/maps/gateway_archive_vr/carpfarm.dmm @@ -31,7 +31,7 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/space) "aj" = ( -/obj/item/weapon/pickaxe/jackhammer, +/obj/item/pickaxe/jackhammer, /turf/simulated/mineral/floor/ignore_mapgen, /area/space) "ak" = ( @@ -135,7 +135,7 @@ /turf/simulated/floor/lino, /area/awaymission/carpfarm/base) "az" = ( -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/structure/cable, /obj/machinery/power/apc{ dir = 8; @@ -145,7 +145,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/item/weapon/paper/awaygate/carpfarm/suicide, +/obj/item/paper/awaygate/carpfarm/suicide, /turf/simulated/floor/plating, /area/awaymission/carpfarm/base) "aA" = ( @@ -186,7 +186,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/carpfarm/base) "aH" = ( -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/bed/padded, /turf/simulated/floor/lino, /area/awaymission/carpfarm/base) @@ -198,8 +198,8 @@ /obj/item/clothing/suit/space/void/mining, /obj/item/clothing/mask/breath, /obj/item/clothing/head/helmet/space/void/mining, -/obj/item/weapon/mining_scanner, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/mining_scanner, +/obj/item/tank/jetpack/oxygen, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/awaymission/carpfarm/base) @@ -208,7 +208,7 @@ /area/awaymission/carpfarm/base) "aL" = ( /obj/structure/closet/toolcloset, -/obj/item/weapon/pickaxe/jackhammer, +/obj/item/pickaxe/jackhammer, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/awaymission/carpfarm/base) @@ -348,9 +348,9 @@ dir = 8 }, /obj/structure/closet/crate/internals, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, @@ -359,9 +359,9 @@ /area/awaymission/carpfarm/base) "bl" = ( /obj/structure/closet/crate/internals, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, @@ -394,7 +394,7 @@ /area/awaymission/carpfarm/base) "br" = ( /obj/item/mecha_parts/mecha_equipment/tool/drill, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/structure/table/steel, /turf/simulated/floor/tiled, /area/awaymission/carpfarm/base) @@ -471,7 +471,7 @@ /area/awaymission/carpfarm/base) "bD" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/weapon/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/projectile/shotgun/pump/rifle, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/awaymission/carpfarm/base) @@ -578,13 +578,13 @@ /turf/simulated/floor/tiled, /area/awaymission/carpfarm/base) "bS" = ( -/obj/item/weapon/reagent_containers/food/snacks/cubancarp, +/obj/item/reagent_containers/food/snacks/cubancarp, /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/table/glass, /turf/simulated/floor/tiled, /area/awaymission/carpfarm/base) "bT" = ( -/obj/item/weapon/reagent_containers/food/snacks/carpmeat, +/obj/item/reagent_containers/food/snacks/carpmeat, /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/table/glass, /turf/simulated/floor/tiled, @@ -630,7 +630,7 @@ /area/awaymission/carpfarm/base) "bX" = ( /obj/structure/closet/emcloset, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/machinery/airlock_sensor{ frequency = 1375; id_tag = "carp_sensor"; diff --git a/maps/gateway_archive_vr/challenge.dmm b/maps/gateway_archive_vr/challenge.dmm index e220370544d..729a8ae8d4c 100644 --- a/maps/gateway_archive_vr/challenge.dmm +++ b/maps/gateway_archive_vr/challenge.dmm @@ -35,7 +35,7 @@ /turf/simulated/floor/airless, /area/awaymission/challenge/start) "ai" = ( -/obj/item/device/flashlight{ +/obj/item/flashlight{ icon_state = "flashlight-on"; item_state = "flashlight"; on = 1 @@ -80,7 +80,7 @@ /turf/simulated/floor/airless, /area/awaymission/challenge/start) "ap" = ( -/obj/item/weapon/gun/energy/laser/retro, +/obj/item/gun/energy/laser/retro, /turf/simulated/floor/airless, /area/awaymission/challenge/start) "aq" = ( @@ -285,7 +285,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/simulated/floor/plating/airless, /area/awaymission/challenge/main) @@ -318,7 +318,7 @@ }, /area/awaymission/challenge/main) "bb" = ( -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/airless, /area/awaymission/challenge/main) "bc" = ( @@ -479,7 +479,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/simulated/floor/plating, /area/awaymission/challenge/main) @@ -500,7 +500,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/challenge/main) "bs" = ( -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/airless, /area/awaymission/challenge/main) "bt" = ( @@ -617,7 +617,7 @@ /turf/simulated/floor/plating/airless, /area/awaymission/challenge/main) "bD" = ( -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/simulated/floor/airless, /area/awaymission/challenge/main) "bE" = ( @@ -737,7 +737,7 @@ }, /area/awaymission/challenge/end) "bP" = ( -/obj/item/weapon/gun/projectile/russian, +/obj/item/gun/projectile/russian, /turf/simulated/floor{ icon_state = "whitehall"; dir = 2 @@ -842,7 +842,7 @@ /obj/structure/stool/bed/chair{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 0; name = "Station Intercom (General)"; pixel_x = 0; @@ -874,7 +874,7 @@ /turf/simulated/floor/plating, /area/awaymission/challenge/end) "cg" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 0; name = "Station Intercom (General)"; pixel_x = -27 @@ -900,7 +900,7 @@ /area/awaymission/challenge/end) "ck" = ( /obj/structure/rack, -/obj/item/weapon/gun/projectile/mateba, +/obj/item/gun/projectile/mateba, /turf/simulated/floor/wood, /area/awaymission/challenge/end) "cl" = ( @@ -932,24 +932,24 @@ /area) "cq" = ( /obj/structure/table/woodentable, -/obj/item/weapon/melee/chainofcommand, -/obj/item/weapon/stamp, +/obj/item/melee/chainofcommand, +/obj/item/stamp, /turf/simulated/floor/carpet, /area/awaymission/challenge/end) "cr" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Congratulations,

Your station has been selected to carry out the Gateway Project.

The equipment will be shipped to you at the start of the next quarter.
You are to prepare a secure location to house the equipment as outlined in the attached documents.

--Nanotrasen Blue Space Research"; name = "Confidential Correspondence, Pg 1"; pixel_x = 0; pixel_y = 0 }, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /turf/simulated/floor/carpet, /area/awaymission/challenge/end) "cs" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -957,7 +957,7 @@ /area/awaymission/challenge/end) "ct" = ( /obj/structure/rack, -/obj/item/weapon/gun/projectile/silenced, +/obj/item/gun/projectile/silenced, /turf/simulated/floor/wood, /area/awaymission/challenge/end) "cu" = ( @@ -974,7 +974,7 @@ /area/awaymission/challenge/end) "cw" = ( /obj/structure/rack, -/obj/item/weapon/gun/projectile/automatic/l6_saw, +/obj/item/gun/projectile/automatic/l6_saw, /turf/simulated/floor/wood, /area/awaymission/challenge/end) "cx" = ( @@ -1018,7 +1018,7 @@ }, /area/awaymission/challenge/end) "cC" = ( -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/bluegrid, /area/awaymission/challenge/end) "cD" = ( @@ -1288,14 +1288,14 @@ /area/awaymission/challenge/end) "dg" = ( /obj/structure/table/standard, -/obj/item/weapon/paper/pamphlet, +/obj/item/paper/pamphlet, /turf/simulated/floor{ icon_state = "dark" }, /area/awaymission/challenge/end) "dh" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor{ icon_state = "dark" }, @@ -1320,14 +1320,14 @@ /area/awaymission/challenge/end) "dk" = ( /obj/structure/table/standard, -/obj/item/weapon/implanter/explosive, -/obj/item/weapon/implanter/explosive{ +/obj/item/implanter/explosive, +/obj/item/implanter/explosive{ pixel_y = 4 }, -/obj/item/weapon/implanter/explosive{ +/obj/item/implanter/explosive{ pixel_y = 8 }, -/obj/item/weapon/implanter/explosive{ +/obj/item/implanter/explosive{ pixel_y = 12 }, /turf/simulated/floor{ diff --git a/maps/gateway_archive_vr/desertbase.dmm b/maps/gateway_archive_vr/desertbase.dmm index aaef8d004eb..b90e8cb6973 100644 --- a/maps/gateway_archive_vr/desertbase.dmm +++ b/maps/gateway_archive_vr/desertbase.dmm @@ -269,7 +269,7 @@ /area/space) "aW" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 2; pixel_y = 3 }, @@ -298,14 +298,14 @@ /obj/item/stack/material/glass{ amount = 15 }, -/obj/item/weapon/cell{ +/obj/item/cell{ charge = 100; maxcharge = 15000 }, /turf/simulated/shuttle/floor/darkred, /area/space) "ba" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -318,11 +318,11 @@ /area/space) "bb" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/shuttle/floor/darkred, @@ -343,8 +343,8 @@ /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, /turf/simulated/shuttle/floor/darkred, /area/space) "be" = ( @@ -404,10 +404,10 @@ /area/space) "bm" = ( /obj/structure/closet, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, /obj/machinery/light{ dir = 4 }, @@ -415,10 +415,10 @@ /area/space) "bn" = ( /obj/structure/closet, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, /turf/simulated/shuttle/floor/darkred, /area/space) "bo" = ( @@ -439,7 +439,7 @@ /turf/simulated/shuttle/floor/darkred, /area/space) "bq" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -504,7 +504,7 @@ /obj/machinery/vending/assist{ contraband = null; name = "AntagCorpVend"; - products = list(/obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/signaler = 4, /obj/item/device/assembly/infra = 4, /obj/item/device/assembly/prox_sensor = 4, /obj/item/weapon/handcuffs = 8, /obj/item/device/flash = 4, /obj/item/weapon/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) + products = list(/obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, /obj/item/assembly/infra = 4, /obj/item/assembly/prox_sensor = 4, /obj/item/handcuffs = 8, /obj/item/flash = 4, /obj/item/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) }, /obj/machinery/light{ dir = 4 @@ -543,7 +543,7 @@ /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/simulated/shuttle/floor/darkred, /area/space) @@ -568,18 +568,18 @@ /area/space) "bG" = ( /obj/structure/table/standard, -/obj/item/weapon/material/kitchen/utensil/knife{ +/obj/item/material/kitchen/utensil/knife{ pixel_x = -6 }, -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = -1 }, -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = 9 }, @@ -611,9 +611,9 @@ /obj/structure/closet{ name = "custodial" }, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/shuttle/floor/darkred, /area/space) "bL" = ( @@ -647,8 +647,8 @@ /area/space) "bQ" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/shuttle/floor/darkred, /area/space) "bR" = ( @@ -658,18 +658,18 @@ req_access = list(150) }, /obj/item/bodybag, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{ +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/glass/bottle/antitoxin{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{ +/obj/item/reagent_containers/glass/bottle/inaprovaline{ pixel_x = 4; pixel_y = 7 }, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /obj/machinery/light{ dir = 4 }, @@ -693,7 +693,7 @@ /area/space) "bU" = ( /obj/structure/table/standard, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/shuttle/floor/darkred, /area/space) "bV" = ( @@ -810,7 +810,7 @@ /turf/simulated/shuttle/floor/darkred, /area/space) "ch" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/shuttle/floor/darkred, /area/space) "ci" = ( @@ -895,7 +895,7 @@ /area/space) "co" = ( /obj/structure/table/rack, -/obj/item/device/multitool, +/obj/item/multitool, /obj/machinery/light{ dir = 8; icon_state = "tube1"; @@ -908,9 +908,9 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/surgical/cautery, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/surgicaldrill, +/obj/item/surgical/cautery, +/obj/item/surgical/retractor, /obj/item/stack/nanopaste, /turf/simulated/shuttle/floor/darkred, /area/space) @@ -919,12 +919,12 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw, -/obj/item/weapon/surgical/FixOVein{ +/obj/item/surgical/circular_saw, +/obj/item/surgical/FixOVein{ pixel_x = -6; pixel_y = 1 }, -/obj/item/weapon/surgical/hemostat, +/obj/item/surgical/hemostat, /turf/simulated/shuttle/floor/darkred, /area/space) "cr" = ( @@ -932,21 +932,21 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 1 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 1 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/shuttle/floor/darkred, /area/space) "cs" = ( @@ -957,7 +957,7 @@ /turf/simulated/shuttle/floor/darkred, /area/space) "ct" = ( -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/machinery/light{ dir = 8; icon_state = "tube1"; @@ -1008,12 +1008,12 @@ pixel_y = 0; req_access = list(150) }, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/surgical, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/glass/bottle/stoxin, /turf/simulated/shuttle/floor/darkred, /area/space) "cz" = ( @@ -1021,7 +1021,7 @@ /turf/simulated/shuttle/floor/darkred, /area/space) "cA" = ( -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /turf/simulated/shuttle/floor/darkred, /area/space) "cB" = ( @@ -1055,9 +1055,9 @@ /area/space) "cH" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel{ +/obj/item/surgical/scalpel, +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel{ pixel_x = 4; pixel_y = 3 }, diff --git a/maps/gateway_archive_vr/example.dmm b/maps/gateway_archive_vr/example.dmm index d6cabf7e475..b6817331cec 100644 --- a/maps/gateway_archive_vr/example.dmm +++ b/maps/gateway_archive_vr/example.dmm @@ -120,7 +120,7 @@ /turf/simulated/floor, /area/awaymission/example) "ar" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/simulated/floor, /area/awaymission/example) "as" = ( @@ -190,7 +190,7 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/paper/pamphlet, +/obj/item/paper/pamphlet, /turf/simulated/floor, /area/awaymission/example) "aC" = ( @@ -206,12 +206,12 @@ /area/awaymission/example) "aE" = ( /obj/structure/table/standard, -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor, /area/awaymission/example) "aF" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /turf/simulated/floor, /area/awaymission/example) "aG" = ( @@ -228,7 +228,7 @@ "aI" = ( /obj/structure/table/standard, /obj/effect/spawner/lootdrop{ - loot = "/obj/item/weapon/tool/wrench;/obj/item/weapon/tool/screwdriver;/obj/item/weapon/cigpacket/dromedaryco"; + loot = "/obj/item/tool/wrench;/obj/item/tool/screwdriver;/obj/item/cigpacket/dromedaryco"; lootcount = 2 }, /turf/simulated/floor, @@ -368,7 +368,7 @@ /area/awaymission/example) "bb" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /turf/simulated/floor{ icon_state = "white" }, @@ -387,22 +387,22 @@ /area/awaymission/example) "be" = ( /obj/structure/table/standard, -/obj/item/device/mass_spectrometer/adv, +/obj/item/mass_spectrometer/adv, /turf/simulated/floor{ icon_state = "white" }, /area/awaymission/example) "bf" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/reagent_containers/glass/beaker, /turf/simulated/floor{ icon_state = "white" }, /area/awaymission/example) "bg" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen/red, +/obj/item/folder/white, +/obj/item/pen/red, /turf/simulated/floor{ icon_state = "white" }, @@ -415,8 +415,8 @@ /area/awaymission/example) "bi" = ( /obj/structure/table/standard, -/obj/item/weapon/clipboard, -/obj/item/weapon/reagent_containers/syringe/antiviral, +/obj/item/clipboard, +/obj/item/reagent_containers/syringe/antiviral, /turf/simulated/floor{ icon_state = "white" }, @@ -618,7 +618,7 @@ /area/awaymission/example) "bI" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/drinks/sodawater, +/obj/item/reagent_containers/food/drinks/sodawater, /turf/simulated/floor{ icon_state = "bar" }, @@ -628,9 +628,9 @@ density = 0; pixel_y = 32 }, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/book/manual/ripley_build_and_repair, +/obj/item/book/manual/barman_recipes, +/obj/item/book/manual/chef_recipes, +/obj/item/book/manual/ripley_build_and_repair, /turf/simulated/floor{ icon_state = "bar" }, @@ -664,15 +664,15 @@ density = 0; pixel_y = 32 }, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /turf/simulated/floor{ icon_state = "bar" }, /area/awaymission/example) "bO" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/wine, /turf/simulated/floor{ icon_state = "bar" }, @@ -693,7 +693,7 @@ "bR" = ( /obj/structure/table/standard, /obj/machinery/light/small, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "X X O
X O X
O X" }, /turf/simulated/floor{ @@ -714,7 +714,7 @@ /area/awaymission/example) "bU" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/validsalad, +/obj/item/reagent_containers/food/snacks/validsalad, /turf/simulated/floor{ icon_state = "bar" }, @@ -729,28 +729,28 @@ /area/awaymission/example) "bX" = ( /obj/structure/table/standard, -/obj/item/device/analyzer, +/obj/item/analyzer, /turf/simulated/floor, /area/awaymission/example) "bY" = ( /obj/structure/table/standard, -/obj/item/weapon/rack_parts, +/obj/item/rack_parts, /turf/simulated/floor, /area/awaymission/example) "bZ" = ( /obj/structure/table/standard, -/obj/item/device/toner, +/obj/item/toner, /turf/simulated/floor, /area/awaymission/example) "ca" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/wirecutters, +/obj/item/tool/wirecutters, /obj/item/stack/cable_coil/yellow, /turf/simulated/floor, /area/awaymission/example) "cb" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor, /area/awaymission/example) "cc" = ( @@ -765,7 +765,7 @@ /area/awaymission/example) "ce" = ( /obj/structure/filingcabinet, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Todo: write up a lawsuit for Ted, fuck what the pamphlets say, nothing good is gonna come out of that gate. Ted'll thank me later, I'll bet."; name = "documents" }, @@ -773,8 +773,8 @@ /area/awaymission/example) "cf" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, +/obj/item/paper_bin, +/obj/item/pen/blue, /turf/simulated/floor, /area/awaymission/example) "cg" = ( @@ -783,8 +783,8 @@ /area/awaymission/example) "ch" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/hand_labeler, +/obj/item/tool/screwdriver, +/obj/item/hand_labeler, /obj/machinery/light{ icon_state = "tube1"; dir = 8 @@ -799,7 +799,7 @@ /area/awaymission/example) "cj" = ( /obj/structure/table/standard, -/obj/item/weapon/paper/pamphlet, +/obj/item/paper/pamphlet, /turf/simulated/floor, /area/awaymission/example) "ck" = ( @@ -813,7 +813,7 @@ }, /area/awaymission/example) "cm" = ( -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Hey Ted, remind me to take Angeline out some time before I ship out. You know how bad my memory is, so don't get all high and mighty with me. READ THIS."; name = "note" }, @@ -827,11 +827,11 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Remember, friday is David Bowie night! You guys had better fucking be there!"; name = "friday night" }, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/simulated/floor{ icon_state = "yellowcorner" }, @@ -850,7 +850,7 @@ /obj/effect/landmark{ name = "awaystart" }, -/obj/item/device/assembly/mousetrap/armed, +/obj/item/assembly/mousetrap/armed, /turf/simulated/floor, /area/awaymission/example) "cs" = ( @@ -871,7 +871,7 @@ /obj/effect/landmark{ name = "awaystart" }, -/obj/item/weapon/mop, +/obj/item/mop, /turf/simulated/floor, /area/awaymission/example) "cv" = ( @@ -880,7 +880,7 @@ /area/awaymission/example) "cw" = ( /obj/structure/table/standard, -/obj/item/weapon/cell/high, +/obj/item/cell/high, /turf/simulated/floor, /area/awaymission/example) "cx" = ( diff --git a/maps/gateway_archive_vr/jungle.dmm b/maps/gateway_archive_vr/jungle.dmm index 3f8f1a94617..b90cf71c7ef 100644 --- a/maps/gateway_archive_vr/jungle.dmm +++ b/maps/gateway_archive_vr/jungle.dmm @@ -734,8 +734,8 @@ /area/jungle) "cJ" = ( /obj/structure/closet/crate/secure/gear, -/obj/item/weapon/extinguisher, -/obj/item/weapon/minihoe, +/obj/item/extinguisher, +/obj/item/minihoe, /turf/unsimulated/jungle/clear, /area/jungle) "cK" = ( @@ -753,7 +753,7 @@ /turf/unsimulated/floor, /area/jungle) "cO" = ( -/obj/item/weapon/storage/firstaid, +/obj/item/storage/firstaid, /turf/unsimulated/floor, /area/jungle) "cP" = ( @@ -772,7 +772,7 @@ /turf/unsimulated/jungle/clear, /area/jungle) "cT" = ( -/obj/item/weapon/firstaid_arm_assembly, +/obj/item/firstaid_arm_assembly, /turf/unsimulated/jungle/clear, /area/jungle) "cU" = ( @@ -807,7 +807,7 @@ /area/jungle) "cZ" = ( /obj/structure/rack, -/obj/item/weapon/storage/pill_bottle/antitox, +/obj/item/storage/pill_bottle/antitox, /turf/unsimulated/floor, /area/jungle) "da" = ( @@ -838,7 +838,7 @@ /area/jungle) "df" = ( /obj/structure/rack, -/obj/item/weapon/pen, +/obj/item/pen, /turf/unsimulated/floor, /area/jungle) "dg" = ( @@ -865,7 +865,7 @@ /area/jungle) "dk" = ( /obj/structure/closet/crate/secure/gear, -/obj/item/weapon/hatchet, +/obj/item/hatchet, /turf/unsimulated/jungle/clear, /area/jungle) "dl" = ( @@ -884,7 +884,7 @@ /turf/unsimulated/jungle/clear, /area/jungle/crash_ship_one) "dp" = ( -/obj/item/weapon/secbot_assembly, +/obj/item/secbot_assembly, /turf/unsimulated/jungle/clear, /area/jungle) "dq" = ( @@ -892,7 +892,7 @@ /turf/unsimulated/jungle/clear, /area/jungle) "dr" = ( -/obj/item/weapon/rack_parts, +/obj/item/rack_parts, /turf/unsimulated/floor, /area/jungle) "ds" = ( @@ -917,7 +917,7 @@ /turf/unsimulated/jungle/path, /area/jungle/crash_ship_source) "dx" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/unsimulated/jungle/path, /area/jungle/crash_ship_source) "dy" = ( @@ -925,7 +925,7 @@ /turf/unsimulated/jungle/path, /area/jungle/crash_ship_source) "dz" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/unsimulated/jungle/path, @@ -986,11 +986,11 @@ /turf/unsimulated/floor, /area/jungle/crash_ship_source) "dJ" = ( -/obj/item/weapon/hatchet, +/obj/item/hatchet, /turf/unsimulated/floor, /area/jungle/crash_ship_source) "dK" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/unsimulated/floor, @@ -1000,13 +1000,13 @@ /turf/unsimulated/floor, /area/jungle/crash_ship_source) "dM" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/unsimulated/jungle/path, /area/jungle/crash_ship_source) "dN" = ( -/obj/item/weapon/cell, +/obj/item/cell, /turf/unsimulated/floor, /area/jungle/crash_ship_source) "dO" = ( @@ -1018,7 +1018,7 @@ /area/jungle/crash_ship_source) "dP" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/unsimulated/floor, /area/jungle/crash_ship_source) "dQ" = ( @@ -1027,7 +1027,7 @@ /area/jungle/crash_ship_source) "dR" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/unsimulated/floor, /area/jungle/crash_ship_source) "dS" = ( @@ -1038,7 +1038,7 @@ /turf/unsimulated/floor, /area/jungle/crash_ship_source) "dT" = ( -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/unsimulated/jungle/path, /area/jungle/crash_ship_source) "dU" = ( @@ -1051,7 +1051,7 @@ /area/jungle/crash_ship_source) "dV" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/unsimulated/floor, /area/jungle/crash_ship_source) "dW" = ( diff --git a/maps/gateway_archive_vr/labyrinth.dm b/maps/gateway_archive_vr/labyrinth.dm index f99a9240298..726412441aa 100644 --- a/maps/gateway_archive_vr/labyrinth.dm +++ b/maps/gateway_archive_vr/labyrinth.dm @@ -133,7 +133,7 @@ name = "Banana Mortar" icon = 'icons/mecha/mecha_equipment_vr.dmi' icon_state = "mecha_bananamrtr" - projectile = /obj/item/weapon/bananapeel + projectile = /obj/item/bananapeel fire_sound = 'sound/items/bikehorn.ogg' projectiles = 15 missile_speed = 1.5 @@ -195,7 +195,7 @@ corpsesuit = /obj/item/clothing/suit/storage/hooded/chaplain_hoodie corpsegloves = /obj/item/clothing/gloves/black corpsemask = /obj/item/clothing/mask/gas/clown_hat - corpsepocket1 = /obj/item/weapon/bikehorn + corpsepocket1 = /obj/item/bikehorn /obj/effect/landmark/mobcorpse/tunnelclown/sentinel name = "dead clown sentinel" @@ -220,7 +220,7 @@ // speak_chance = 1 a_intent = "harm" var/corpse = /obj/effect/landmark/mobcorpse/tunnelclown - var/weapon1 = /obj/item/weapon/twohanded/fireaxe + var/weapon1 = /obj/item/twohanded/fireaxe stop_when_pulled = 0 maxHealth = 100 health = 100 @@ -253,7 +253,7 @@ icon_living = "sentinelclown" icon_dead = "clown_dead" corpse = /obj/effect/landmark/mobcorpse/tunnelclown/sentinel - weapon1 = /obj/item/weapon/material/twohanded/spear + weapon1 = /obj/item/material/twohanded/spear maxHealth = 150 health = 150 melee_damage_lower = 15 @@ -320,7 +320,7 @@ prob(2);/mob/living/simple_mob/hostile/tunnelclown/sentinel, prob(1);/mob/living/simple_mob/hostile/tunnelclown) -/obj/item/weapon/paper/awaygate/labyrinth/calypso +/obj/item/paper/awaygate/labyrinth/calypso name = "copy of the Final Flight of Calypso" info = {"

THIS IS A COPY OF THE LOGBOOKS AS COPIED BY GREYSON MAXIMUS, CAPTAIN V.O.R.E. NANOTRASEN.

//BEGIN// @@ -353,7 +353,7 @@

HONK

//END//"} -/obj/item/weapon/paper/awaygate/labyrinth/research +/obj/item/paper/awaygate/labyrinth/research name = "research notes" info = {"This must be the location of the alleged dig site mentioned in the Calypso's logs. These are the coordinates recovered from the wreck, and everything checks out. My excavation team discovered two monoliths; one near the surface, and another at an underground shrine. I think this is it, but Dr. Madison hasn't come back with his team diff --git a/maps/gateway_archive_vr/labyrinth.dmm b/maps/gateway_archive_vr/labyrinth.dmm index cec40172e05..0e3e8f7570b 100644 --- a/maps/gateway_archive_vr/labyrinth.dmm +++ b/maps/gateway_archive_vr/labyrinth.dmm @@ -640,7 +640,7 @@ /area/awaymission/labyrinth/arrival) "bI" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -759,7 +759,7 @@ }, /area/awaymission/labyrinth/arrival) "ca" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/unsimulated/floor{ icon_state = "white" }, @@ -810,13 +810,13 @@ /area/awaymission/labyrinth/arrival) "ch" = ( /obj/structure/table, -/obj/item/weapon/pen, -/obj/item/weapon/paper{ +/obj/item/pen, +/obj/item/paper{ info = "... the key lies beneath the tears of our mother..."; name = "translated cryptic riddle" }, -/obj/item/weapon/paper/awaygate/labyrinth/calypso, -/obj/item/weapon/paper/awaygate/labyrinth/research, +/obj/item/paper/awaygate/labyrinth/calypso, +/obj/item/paper/awaygate/labyrinth/research, /turf/unsimulated/floor{ icon_state = "white" }, @@ -922,12 +922,12 @@ /area/awaymission/labyrinth/arrival) "ct" = ( /obj/structure/table, -/obj/item/weapon/storage/box, -/obj/item/weapon/pickaxe, -/obj/item/weapon/tool/wrench, -/obj/item/device/measuring_tape, +/obj/item/storage/box, +/obj/item/pickaxe, +/obj/item/tool/wrench, +/obj/item/measuring_tape, /obj/item/stack/flag/yellow, -/obj/item/weapon/shovel/spade, +/obj/item/shovel/spade, /turf/unsimulated/floor{ icon_state = "white" }, @@ -949,8 +949,8 @@ /area/awaymission/labyrinth/arrival) "cw" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/unsimulated/floor{ icon_state = "white" }, @@ -1025,7 +1025,7 @@ }, /area/awaymission/labyrinth/temple/entry) "cF" = ( -/obj/item/weapon/fossil/plant, +/obj/item/fossil/plant, /turf/unsimulated/floor{ icon_state = "asteroid_dug" }, @@ -1058,7 +1058,7 @@ /area/awaymission/labyrinth/temple/entry) "cK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/bananapeel, +/obj/item/bananapeel, /turf/unsimulated/floor{ name = "plating"; icon_state = "cult" @@ -1071,7 +1071,7 @@ layer = 2; specialfunctions = 4 }, -/obj/item/weapon/reagent_containers/food/snacks/clownstears{ +/obj/item/reagent_containers/food/snacks/clownstears{ pixel_y = 6 }, /turf/unsimulated/floor{ @@ -1081,7 +1081,7 @@ /area/awaymission/labyrinth/temple/entry) "cM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/bikehorn, +/obj/item/bikehorn, /turf/unsimulated/floor{ name = "plating"; icon_state = "cult" @@ -1121,7 +1121,7 @@ }, /area/awaymission/labyrinth/arrival) "cS" = ( -/obj/item/weapon/bananapeel, +/obj/item/bananapeel, /turf/unsimulated/floor{ dir = 8; icon_state = "asteroid"; @@ -1161,7 +1161,7 @@ }, /area/awaymission/labyrinth/arrival) "cW" = ( -/obj/item/weapon/fossil/skull/horned, +/obj/item/fossil/skull/horned, /turf/unsimulated/floor{ icon_state = "asteroid_dug" }, @@ -1192,7 +1192,7 @@ }, /area/awaymission/labyrinth/arrival) "cY" = ( -/obj/item/weapon/storage/box, +/obj/item/storage/box, /turf/unsimulated/floor{ dir = 8; icon_state = "asteroid"; @@ -1232,7 +1232,7 @@ }, /area/awaymission/labyrinth/arrival) "db" = ( -/obj/item/weapon/fossil, +/obj/item/fossil, /turf/unsimulated/floor{ icon_state = "asteroid_dug" }, @@ -1258,7 +1258,7 @@ name = "dirt"; }, -/obj/item/device/measuring_tape, +/obj/item/measuring_tape, /turf/unsimulated/wall/exterior{ density = 0; icon_state = "rock_side_n"; @@ -1267,7 +1267,7 @@ }, /area/awaymission/labyrinth/arrival) "de" = ( -/obj/item/weapon/shovel/spade, +/obj/item/shovel/spade, /turf/unsimulated/floor{ dir = 8; icon_state = "asteroid"; @@ -1276,7 +1276,7 @@ }, /area/awaymission/labyrinth/arrival) "df" = ( -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/unsimulated/floor{ dir = 8; icon_state = "asteroid"; @@ -1294,7 +1294,7 @@ }, /area/awaymission/labyrinth/arrival) "dh" = ( -/obj/item/weapon/fossil/shell, +/obj/item/fossil/shell, /turf/unsimulated/floor{ icon_state = "asteroid_dug" }, @@ -1767,7 +1767,7 @@ }, /area/awaymission/labyrinth/boss) "dY" = ( -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Pray to the honk mother if ye are ready to face her champion. Shouldst thou be deem'd worthy, the champion will appear. There shall be no retreat once the conflict begins. Though her holy highness is a lady of laughter, there will be no mercy."; name = "parchment" }, diff --git a/maps/gateway_archive_vr/listeningpost.dm b/maps/gateway_archive_vr/listeningpost.dm index 2d794cf7ad2..0d1e32fd186 100644 --- a/maps/gateway_archive_vr/listeningpost.dm +++ b/maps/gateway_archive_vr/listeningpost.dm @@ -1,14 +1,14 @@ -/obj/item/weapon/paper/listneningpost/mission +/obj/item/paper/listneningpost/mission name = "\improper Operation: Watchtower" info = {"Mission Details: You have been assigned to a newly constructed listening post constructed within an asteroid in Nanotrasen space to monitor their plasma mining operations. Accurate intel is crucial to the success of our operatives onboard, do not fail us."} -/obj/item/weapon/paper/listneningpost/reciept +/obj/item/paper/listneningpost/reciept name = "\improper SpacEx reciept" info = {"1 x Stechtkin pistol plus ammo - $600
1 x silencer - $200
shipping charge - $4360
total - $5160"} -/obj/item/weapon/paper/listneningpost/oddreport +/obj/item/paper/listneningpost/oddreport name = "\improper Odd Report" info = {"I wonder how much longer they will accept my empty reports. They will cancel the case soon without results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic diff --git a/maps/gateway_archive_vr/listeningpost.dmm b/maps/gateway_archive_vr/listeningpost.dmm index aac334a3395..4caae55678b 100644 --- a/maps/gateway_archive_vr/listeningpost.dmm +++ b/maps/gateway_archive_vr/listeningpost.dmm @@ -7,26 +7,26 @@ "g" = (/turf/simulated/wall,/area/awaymission/listeningpost) "h" = (/turf/simulated/mineral,/area/mine/unexplored) "i" = (/turf/simulated/floor,/area/awaymission/listeningpost) -"j" = (/obj/structure/table/standard,/obj/item/weapon/paper/monitorkey,/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; !INVALID_VAR! = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/item/clothing/glasses/regular,/turf/simulated/floor,/area/awaymission/listeningpost) +"j" = (/obj/structure/table/standard,/obj/item/paper/monitorkey,/obj/item/radio/intercom{desc = "Talk through this. Evilly"; !INVALID_VAR! = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/item/clothing/glasses/regular,/turf/simulated/floor,/area/awaymission/listeningpost) "k" = (/obj/structure/table/standard,/turf/simulated/floor,/area/awaymission/listeningpost) "l" = (/turf/simulated/mineral/floor/vacuum,/area/mine/explored) "m" = (/obj/machinery/computer/message_monitor{dir = 4},/turf/simulated/floor,/area/awaymission/listeningpost) "n" = (/obj/structure/bed/chair{dir = 4},/mob/living/simple_mob/humanoid/merc{desc = "A weary looking syndicate operative."; faction = "syndicate"},/turf/simulated/floor,/area/awaymission/listeningpost) -"o" = (/obj/structure/table/standard,/obj/item/weapon/paper{info = "Nothing of interest to report."; name = "november report"},/obj/item/weapon/pen,/turf/simulated/floor,/area/awaymission/listeningpost) -"p" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; !INVALID_VAR! = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/simulated/floor,/area/awaymission/listeningpost) +"o" = (/obj/structure/table/standard,/obj/item/paper{info = "Nothing of interest to report."; name = "november report"},/obj/item/pen,/turf/simulated/floor,/area/awaymission/listeningpost) +"p" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; !INVALID_VAR! = 1; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/simulated/floor,/area/awaymission/listeningpost) "q" = (/obj/structure/table/rack,/obj/item/clothing/suit/space/syndicate,/obj/item/clothing/mask/gas,/obj/item/clothing/head/helmet/space/syndicate,/turf/simulated/floor,/area/awaymission/listeningpost) -"r" = (/obj/machinery/door/airlock,/obj/item/weapon/paper{info = "I wonder how much longer they will accept my empty reports. They will cancel the case soon without results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent. If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should it ever rear it's ugly head again. -Donk Co. Operative #451"; name = "odd report"},/obj/item/weapon/gun/projectile/pistol,/obj/item/weapon/silencer,/turf/simulated/floor,/area/awaymission/listeningpost) +"r" = (/obj/machinery/door/airlock,/obj/item/paper{info = "I wonder how much longer they will accept my empty reports. They will cancel the case soon without results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent. If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should it ever rear it's ugly head again. -Donk Co. Operative #451"; name = "odd report"},/obj/item/gun/projectile/pistol,/obj/item/silencer,/turf/simulated/floor,/area/awaymission/listeningpost) "s" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/mineral,/area/mine/unexplored) "t" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/mineral,/area/mine/unexplored) "u" = (/obj/structure/disposaloutlet{dir = 4},/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/airless,/area) -"v" = (/obj/structure/bed,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor,/area/awaymission/listeningpost) -"w" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor,/area/awaymission/listeningpost) +"v" = (/obj/structure/bed,/obj/item/bedsheet/brown,/turf/simulated/floor,/area/awaymission/listeningpost) +"w" = (/obj/structure/table/standard,/obj/item/flashlight/lamp,/turf/simulated/floor,/area/awaymission/listeningpost) "x" = (/obj/machinery/vending/snack,/turf/simulated/floor,/area/awaymission/listeningpost) "y" = (/obj/structure/disposalpipe/segment,/turf/simulated/mineral,/area/mine/unexplored) "z" = (/obj/machinery/vending/cola,/turf/simulated/floor,/area/awaymission/listeningpost) "A" = (/obj/structure/closet,/obj/item/clothing/gloves/boxing,/turf/simulated/floor,/area/awaymission/listeningpost) -"B" = (/obj/structure/filingcabinet,/obj/item/weapon/paper{info = "A good start to the operation: intercepted Nanotrasen military communications. A convoy is scheduled to transfer nuclear warheads to a new military base. This is as good a chance as any to get our hands on some heavy weaponry, I suggest we take it."; name = "april report"},/obj/item/weapon/paper{info = "Nothing of real interest to report this month. I have intercepted faint transmissions from what appears to be some sort of pirate radio station. They do not appear to be relevant to my assignment."; name = "may report"},/obj/item/weapon/paper{info = "Nanotrasen communications have been noticably less frequent recently. The pirate radio station I found last month has been transmitting pro-Nanotrasen propaganda. I will continue to monitor it."; name = "june report"},/obj/item/weapon/paper{info = "Nothing of interest to report."; name = "july report"},/obj/item/weapon/paper{info = "Nothing of interest to report."; name = "august report"},/obj/item/weapon/paper{info = "Nothing of interest to report."; name = "september report"},/obj/item/weapon/paper{info = "Nothing of interest to report."; name = "october report"},/obj/item/weapon/paper{info = "1 x Stechtkin pistol - $600
1 x silencer - $200
shipping charge - $4360
total - $5160"; name = "receipt"},/turf/simulated/floor,/area/awaymission/listeningpost) -"C" = (/obj/structure/table/standard,/obj/item/weapon/paper{info = "Mission Details: You have been assigned to a newly constructed listening post constructed within an asteroid in Nanotrasen space to monitor their plasma mining operations. Accurate intel is crucial to the success of our operatives onboard, do not fail us."; name = "mission briefing"},/turf/simulated/floor,/area/awaymission/listeningpost) +"B" = (/obj/structure/filingcabinet,/obj/item/paper{info = "A good start to the operation: intercepted Nanotrasen military communications. A convoy is scheduled to transfer nuclear warheads to a new military base. This is as good a chance as any to get our hands on some heavy weaponry, I suggest we take it."; name = "april report"},/obj/item/paper{info = "Nothing of real interest to report this month. I have intercepted faint transmissions from what appears to be some sort of pirate radio station. They do not appear to be relevant to my assignment."; name = "may report"},/obj/item/paper{info = "Nanotrasen communications have been noticably less frequent recently. The pirate radio station I found last month has been transmitting pro-Nanotrasen propaganda. I will continue to monitor it."; name = "june report"},/obj/item/paper{info = "Nothing of interest to report."; name = "july report"},/obj/item/paper{info = "Nothing of interest to report."; name = "august report"},/obj/item/paper{info = "Nothing of interest to report."; name = "september report"},/obj/item/paper{info = "Nothing of interest to report."; name = "october report"},/obj/item/paper{info = "1 x Stechtkin pistol - $600
1 x silencer - $200
shipping charge - $4360
total - $5160"; name = "receipt"},/turf/simulated/floor,/area/awaymission/listeningpost) +"C" = (/obj/structure/table/standard,/obj/item/paper{info = "Mission Details: You have been assigned to a newly constructed listening post constructed within an asteroid in Nanotrasen space to monitor their plasma mining operations. Accurate intel is crucial to the success of our operatives onboard, do not fail us."; name = "mission briefing"},/turf/simulated/floor,/area/awaymission/listeningpost) "D" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor,/area/awaymission/listeningpost) "E" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall/r_wall,/area/awaymission/listeningpost) "F" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/mineral,/area/mine/unexplored) diff --git a/maps/gateway_archive_vr/snow_outpost.dmm b/maps/gateway_archive_vr/snow_outpost.dmm index 1c203e69b02..67e80ae44d3 100644 --- a/maps/gateway_archive_vr/snow_outpost.dmm +++ b/maps/gateway_archive_vr/snow_outpost.dmm @@ -618,7 +618,7 @@ /turf/simulated/wall/sandstone, /area/awaymission/snow_outpost/outside) "cf" = ( -/obj/item/weapon/ore/diamond, +/obj/item/ore/diamond, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "cg" = ( @@ -632,7 +632,7 @@ /turf/simulated/floor/plating/external, /area/awaymission/snow_outpost/outside) "cj" = ( -/obj/item/weapon/ore, +/obj/item/ore, /turf/simulated/floor/plating/external, /area/awaymission/snow_outpost/outside) "ck" = ( @@ -668,7 +668,7 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/awaymission/snow_outpost/outside) "cs" = ( -/obj/item/weapon/ore, +/obj/item/ore, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "ct" = ( @@ -684,7 +684,7 @@ /area/awaymission/snow_outpost/outside) "cw" = ( /obj/item/frame/apc, -/obj/item/weapon/module/power_control, +/obj/item/module/power_control, /turf/simulated/floor/plating/external, /area/awaymission/snow_outpost/outside) "cx" = ( @@ -695,8 +695,8 @@ /area/awaymission/snow_outpost/outside) "cy" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/excavation, -/obj/item/device/measuring_tape, +/obj/item/storage/excavation, +/obj/item/measuring_tape, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "cz" = ( @@ -720,12 +720,12 @@ /area/awaymission/snow_outpost/outside) "cC" = ( /obj/structure/table/steel, -/obj/item/weapon/folder, +/obj/item/folder, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "cD" = ( /obj/structure/table/rack, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "cE" = ( @@ -743,7 +743,7 @@ /area/awaymission/snow_outpost/outside) "cH" = ( /obj/structure/table/rack, -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "cI" = ( @@ -761,8 +761,8 @@ /area/awaymission/snow_outpost/outside) "cL" = ( /obj/structure/table/steel, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/storage/box/samplebags, +/obj/item/tool/wrench, +/obj/item/storage/box/samplebags, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "cM" = ( @@ -802,7 +802,7 @@ /area/awaymission/snow_outpost/outside) "cV" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/outside) "cW" = ( @@ -811,7 +811,7 @@ /area/awaymission/snow_outpost/outside) "cX" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/light{ icon_state = "tube1"; dir = 1 @@ -832,36 +832,36 @@ /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "db" = ( -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "dc" = ( -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "dd" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/outside) "de" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/light, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/outside) @@ -883,8 +883,8 @@ /area/awaymission/snow_outpost/outside) "di" = ( /obj/structure/table/standard, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, +/obj/item/cell/high, +/obj/item/cell/high, /turf/simulated/floor, /area/awaymission/snow_outpost/outside) "dj" = ( @@ -930,7 +930,7 @@ /area/awaymission/snow_outpost/outside) "ds" = ( /obj/structure/table/rack, -/obj/item/weapon/pickaxe/drill, +/obj/item/pickaxe/drill, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/outside) "dt" = ( @@ -957,7 +957,7 @@ /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/outside) "dy" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/outside) "dz" = ( @@ -1157,8 +1157,8 @@ /area/awaymission/snow_outpost/restricted) "ed" = ( /obj/structure/table/steel, -/obj/item/weapon/gun/projectile/automatic/wt550, -/obj/item/weapon/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/wt550, +/obj/item/gun/projectile/automatic/p90, /turf/simulated/floor/tiled/steel_grid, /area/awaymission/snow_outpost/restricted) "ee" = ( @@ -1276,7 +1276,7 @@ /area/awaymission/snow_outpost/restricted) "ex" = ( /obj/structure/table/steel, -/obj/item/weapon/grenade/smokebomb, +/obj/item/grenade/smokebomb, /turf/simulated/floor/tiled/steel_grid, /area/awaymission/snow_outpost/restricted) "ey" = ( @@ -1300,7 +1300,7 @@ /area/awaymission/snow_outpost/restricted) "eB" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /obj/effect/floor_decal/corner/green/border{ icon_state = "bordercolor"; dir = 10 @@ -1309,7 +1309,7 @@ /area/awaymission/snow_outpost/restricted) "eC" = ( /obj/structure/table/standard, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/effect/floor_decal/corner/green/border, /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/restricted) @@ -1326,14 +1326,14 @@ /area/awaymission/snow_outpost/restricted) "eF" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/spray/sterilizine, -/obj/item/weapon/reagent_containers/spray/sterilizine, +/obj/item/reagent_containers/spray/sterilizine, +/obj/item/reagent_containers/spray/sterilizine, /obj/effect/floor_decal/corner/green/border, /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/restricted) "eG" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /obj/effect/floor_decal/corner/green/border{ icon_state = "bordercolor"; dir = 6 @@ -1401,7 +1401,7 @@ /area/awaymission/snow_outpost/restricted) "eQ" = ( /obj/structure/table/steel, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /turf/simulated/floor/tiled/steel, /area/awaymission/snow_outpost/restricted) "eR" = ( @@ -1478,7 +1478,7 @@ /turf/simulated/floor/tiled/steel, /area/awaymission/snow_outpost/restricted) "fb" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/tiled/steel, /area/awaymission/snow_outpost/restricted) "fc" = ( @@ -1592,7 +1592,7 @@ /area/awaymission/snow_outpost/restricted) "fu" = ( /obj/structure/table/steel, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "We need to take a short stop. The engine's are in need of minor repairs due to turbulence, should be a week's time. We've got reserve food supplies but pleanty of locale fauna to subsist on too if need be. PCRC is keeping most of there assets near New Reykjavik and locale authorities are more mindful then most to travel in this kind of weather. Our outfit should be at the rendezvous point in less then ten days assuming the upper ecehelon hasn't dropped ties with us yet."; name = "Operation Progress/M-53" }, @@ -1600,7 +1600,7 @@ /area/awaymission/snow_outpost/restricted) "fv" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/tiled/steel, /area/awaymission/snow_outpost/restricted) "fw" = ( @@ -1666,7 +1666,7 @@ /area/awaymission/snow_outpost/restricted) "fF" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled/steel, /area/awaymission/snow_outpost/restricted) "fG" = ( @@ -1682,7 +1682,7 @@ /area/awaymission/snow_outpost/restricted) "fJ" = ( /obj/structure/table/steel, -/obj/item/weapon/gun/projectile/pistol, +/obj/item/gun/projectile/pistol, /obj/machinery/light/small{ dir = 4; pixel_y = 0 @@ -1697,7 +1697,7 @@ /area/awaymission/snow_outpost/restricted) "fL" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/bed, /turf/simulated/floor/tiled/steel, /area/awaymission/snow_outpost/restricted) @@ -1761,7 +1761,7 @@ /area/awaymission/snow_outpost/restricted) "fU" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/light, /turf/simulated/floor/tiled/steel, /area/awaymission/snow_outpost/restricted) @@ -1770,7 +1770,7 @@ /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "fW" = ( -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, /obj/tether_away_spawner/aerostat_inside, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) @@ -1791,7 +1791,7 @@ /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "gb" = ( -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "gc" = ( @@ -1812,7 +1812,7 @@ /area/awaymission/snow_outpost/outside) "gg" = ( /obj/item/ammo_casing/a45, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat, +/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "gh" = ( @@ -1853,7 +1853,7 @@ }, /area/awaymission/snow_outpost/outside) "go" = ( -/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat, +/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "gp" = ( @@ -1862,7 +1862,7 @@ /area/awaymission/snow_outpost/outside) "gq" = ( /obj/item/clothing/accessory/storage/webbing, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -1943,7 +1943,7 @@ /obj/structure/closet/crate, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/weapon/storage/toolbox, +/obj/item/storage/toolbox, /obj/random/toolbox, /turf/simulated/floor, /area/awaymission/snow_outpost/outside) @@ -1964,13 +1964,13 @@ /area/awaymission/snow_outpost/outside) "gH" = ( /obj/structure/closet/crate, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, -/obj/item/weapon/reagent_containers/glass/bottle/antitoxin, -/obj/item/weapon/reagent_containers/pill/antitox, -/obj/item/weapon/reagent_containers/pill/antitox, -/obj/item/weapon/reagent_containers/pill/antitox, -/obj/item/weapon/reagent_containers/pill/paracetamol, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/glass/bottle/antitoxin, +/obj/item/reagent_containers/pill/antitox, +/obj/item/reagent_containers/pill/antitox, +/obj/item/reagent_containers/pill/antitox, +/obj/item/reagent_containers/pill/paracetamol, /obj/random/firstaid, /turf/simulated/floor, /area/awaymission/snow_outpost/outside) @@ -1987,11 +1987,11 @@ /obj/random/contraband, /obj/random/contraband, /obj/random/energy, -/obj/item/weapon/material/star, -/obj/item/weapon/material/star, -/obj/item/weapon/material/star, -/obj/item/weapon/material/star, -/obj/item/weapon/material/star, +/obj/item/material/star, +/obj/item/material/star, +/obj/item/material/star, +/obj/item/material/star, +/obj/item/material/star, /turf/simulated/floor, /area/awaymission/snow_outpost/outside) "gK" = ( @@ -2087,18 +2087,18 @@ /area/awaymission/snow_outpost/outside) "ha" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/outside) "hb" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/curtain/open/bed, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/outside) "hc" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/pill/happy{ +/obj/item/reagent_containers/pill/happy{ name = "pill" }, /turf/simulated/floor/carpet, @@ -2124,7 +2124,7 @@ /area/awaymission/snow_outpost/outside) "hi" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/pill/methylphenidate{ +/obj/item/reagent_containers/pill/methylphenidate{ name = "pill" }, /turf/simulated/floor/carpet, @@ -2137,7 +2137,7 @@ /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/outside) "hk" = ( -/obj/item/weapon/reagent_containers/pill/citalopram{ +/obj/item/reagent_containers/pill/citalopram{ name = "pill" }, /turf/simulated/floor/carpet, @@ -2157,13 +2157,13 @@ /area/awaymission/snow_outpost/outside) "ho" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, -/obj/item/weapon/reagent_containers/syringe/drugs, +/obj/item/flashlight/lamp, +/obj/item/reagent_containers/syringe/drugs, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/outside) "hp" = ( /obj/structure/bed/chair/comfy/beige, -/obj/item/weapon/reagent_containers/pill/citalopram{ +/obj/item/reagent_containers/pill/citalopram{ name = "pill" }, /turf/simulated/floor/carpet, @@ -2173,17 +2173,17 @@ /turf/simulated/floor, /area/awaymission/snow_outpost/outside) "hr" = ( -/obj/item/weapon/reagent_containers/pill/citalopram{ +/obj/item/reagent_containers/pill/citalopram{ name = "pill" }, -/obj/item/weapon/reagent_containers/pill/citalopram{ +/obj/item/reagent_containers/pill/citalopram{ name = "pill" }, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/outside) "hs" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/pill_bottle/happy, +/obj/item/storage/pill_bottle/happy, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/outside) "ht" = ( @@ -2193,31 +2193,31 @@ /area/awaymission/snow_outpost/outside) "hu" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/pill/citalopram, -/obj/item/weapon/reagent_containers/pill/citalopram, +/obj/item/reagent_containers/pill/citalopram, +/obj/item/reagent_containers/pill/citalopram, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/outside) "hv" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/pill/tramadol, -/obj/item/weapon/reagent_containers/pill/tramadol, +/obj/item/reagent_containers/pill/tramadol, +/obj/item/reagent_containers/pill/tramadol, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/outside) "hw" = ( /obj/structure/closet/cabinet, /obj/item/clothing/accessory/jacket, -/obj/item/weapon/material/butterfly/switchblade, +/obj/item/material/butterfly/switchblade, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/outside) "hx" = ( -/obj/item/weapon/reagent_containers/pill/zoom{ +/obj/item/reagent_containers/pill/zoom{ name = "pill" }, /obj/random/trash, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/outside) "hy" = ( -/obj/item/weapon/reagent_containers/pill/zoom{ +/obj/item/reagent_containers/pill/zoom{ name = "pill" }, /turf/simulated/floor/carpet, @@ -2228,7 +2228,7 @@ /area/awaymission/snow_outpost/outside) "hA" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/scalpel, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/outside) "hB" = ( @@ -2251,13 +2251,13 @@ /area/awaymission/snow_outpost/outside) "hF" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/pill/zoom, -/obj/item/weapon/reagent_containers/pill/zoom, +/obj/item/reagent_containers/pill/zoom, +/obj/item/reagent_containers/pill/zoom, /turf/simulated/floor, /area/awaymission/snow_outpost/outside) "hG" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/pill/tramadol{ +/obj/item/reagent_containers/pill/tramadol{ name = "pill" }, /turf/simulated/floor/carpet, @@ -2271,17 +2271,17 @@ /turf/simulated/floor, /area/awaymission/snow_outpost/outside) "hJ" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor, /area/awaymission/snow_outpost/outside) "hK" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/outside) "hL" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/syringe/drugs, +/obj/item/reagent_containers/syringe/drugs, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/outside) "hM" = ( @@ -2293,8 +2293,8 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/awaymission/snow_outpost/outside) "hO" = ( -/obj/item/weapon/spacecash/c100, -/obj/item/weapon/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, /turf/simulated/mineral/floor/ignore_mapgen, /area/awaymission/snow_outpost/outside) "hP" = ( @@ -2302,9 +2302,9 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/awaymission/snow_outpost/outside) "hQ" = ( -/obj/item/weapon/spacecash/c100, -/obj/item/weapon/spacecash/c100, -/obj/item/weapon/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, /obj/effect/decal/remains, /turf/simulated/mineral/floor/ignore_mapgen, /area/awaymission/snow_outpost/outside) @@ -2313,7 +2313,7 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/awaymission/snow_outpost/outside) "hS" = ( -/obj/item/weapon/grenade/spawnergrenade/spider, +/obj/item/grenade/spawnergrenade/spider, /turf/simulated/mineral/floor/ignore_mapgen, /area/awaymission/snow_outpost/outside) "hT" = ( @@ -2419,7 +2419,7 @@ dir = 1 }, /obj/structure/closet/walllocker/emerglocker/east, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -28 @@ -2492,7 +2492,7 @@ /obj/structure/closet/walllocker/emerglocker{ pixel_y = 28 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -26 }, /turf/simulated/shuttle/floor, @@ -2506,7 +2506,7 @@ pixel_y = 28 }, /obj/machinery/light, -/obj/item/weapon/weldingtool/largetank, +/obj/item/weldingtool/largetank, /turf/simulated/shuttle/floor, /area/awaymission/snow_outpost/outside) "iz" = ( @@ -2602,7 +2602,7 @@ /area/awaymission/snow_outpost/outpost) "iP" = ( /obj/machinery/atmospherics/unary/vent_pump, -/obj/item/weapon/cell/infinite, +/obj/item/cell/infinite, /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/outpost) "iQ" = ( @@ -2610,8 +2610,8 @@ dir = 5; icon_state = "intact" }, -/obj/item/weapon/cell/infinite, -/obj/item/weapon/cat_box, +/obj/item/cell/infinite, +/obj/item/cat_box, /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/outpost) "iR" = ( @@ -2633,7 +2633,7 @@ /area/awaymission/snow_outpost/restricted) "iT" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/item/toy/plushie/spider, /turf/simulated/floor/tiled/steel, /area/awaymission/snow_outpost/restricted) diff --git a/maps/gateway_archive_vr/snowfield.dm b/maps/gateway_archive_vr/snowfield.dm index c0d2f05bb01..e26e3826955 100644 --- a/maps/gateway_archive_vr/snowfield.dm +++ b/maps/gateway_archive_vr/snowfield.dm @@ -74,7 +74,7 @@ minbodytemp = 0 //speak_chance = 1 //VORESTATION AI TEMPORARY REMOVAL - meat_type = /obj/item/weapon/reagent_containers/food/snacks/bearmeat + meat_type = /obj/item/reagent_containers/food/snacks/bearmeat /datum/say_list/polar_bear speak = list("RAWR!","Rawr!","GRR!","Growl!") emote_hear = list("rawrs","grumbles","grawls") diff --git a/maps/gateway_archive_vr/snowfield.dmm b/maps/gateway_archive_vr/snowfield.dmm index 04b8022c859..72f5d4940ee 100644 --- a/maps/gateway_archive_vr/snowfield.dmm +++ b/maps/gateway_archive_vr/snowfield.dmm @@ -121,7 +121,7 @@ amount = 2; icon_state = "coil2" }, -/obj/item/weapon/shovel, +/obj/item/shovel, /obj/machinery/light/small{ dir = 1 }, @@ -199,7 +199,7 @@ /area/awaymission/snowfield/outside) "aB" = ( /obj/structure/table/standard, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/effect/floor_decal/corner/green/full{ dir = 8 }, @@ -257,7 +257,7 @@ /area/awaymission/snowfield/outside) "aJ" = ( /obj/machinery/atmospherics/portables_connector, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/machinery/light{ dir = 1 }, @@ -281,7 +281,7 @@ dir = 6 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, @@ -289,12 +289,12 @@ /area/awaymission/snowfield/outside) "aO" = ( /obj/structure/closet/jcloset, -/obj/item/weapon/soap, +/obj/item/soap, /turf/simulated/floor/tiled/steel, /area/awaymission/snowfield/outside) "aP" = ( /obj/structure/closet/jcloset, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /turf/simulated/floor/tiled/steel, /area/awaymission/snowfield/outside) "aQ" = ( @@ -409,7 +409,7 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/botanydisk, +/obj/item/storage/box/botanydisk, /turf/simulated/floor/tiled/white, /area/awaymission/snowfield/outside) "bf" = ( @@ -447,7 +447,7 @@ /area/awaymission/snowfield/outside) "bm" = ( /obj/effect/floor_decal/corner/green/full, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -499,15 +499,15 @@ /turf/simulated/floor/tiled/hydro, /area/awaymission/snowfield/outside) "bs" = ( -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/table/steel, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/storage/box/mousetraps, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/steel, /area/awaymission/snowfield/outside) "bt" = ( @@ -585,11 +585,11 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/white, /area/awaymission/snowfield/outside) "bD" = ( @@ -607,7 +607,7 @@ /turf/simulated/floor/tiled/hydro, /area/awaymission/snowfield/outside) "bG" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -622,8 +622,8 @@ pixel_y = -32 }, /obj/structure/table/standard, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/syringes, +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, @@ -634,7 +634,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ layer = 4; name = "Station Intercom (General)"; pixel_y = -21 @@ -650,7 +650,7 @@ /area/awaymission/snowfield/outside) "bK" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/awaymission/snowfield/outside) @@ -668,8 +668,8 @@ /obj/structure/closet/medical_wall{ pixel_y = -32 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled/white, /area/awaymission/snowfield/outside) "bN" = ( @@ -689,8 +689,8 @@ /area/awaymission/snowfield/outside) "bQ" = ( /obj/structure/table/glass, -/obj/item/weapon/tape_roll, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/tape_roll, +/obj/item/analyzer/plant_analyzer, /turf/simulated/floor/tiled/white, /area/awaymission/snowfield/outside) "bR" = ( @@ -698,13 +698,13 @@ dir = 6 }, /obj/structure/table/glass, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white, +/obj/item/clipboard, +/obj/item/folder/white, /turf/simulated/floor/tiled/white, /area/awaymission/snowfield/outside) "bS" = ( -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /obj/structure/janitorialcart, /turf/simulated/floor/tiled/steel, /area/awaymission/snowfield/outside) @@ -833,7 +833,7 @@ "ck" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/table/standard, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 2 }, @@ -915,7 +915,7 @@ /area/awaymission/snowfield/outside) "cv" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/white, /area/awaymission/snowfield/outside) "cw" = ( @@ -960,7 +960,7 @@ "cB" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/table/standard, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /turf/simulated/floor/tiled/white, /area/awaymission/snowfield/outside) "cC" = ( @@ -1289,7 +1289,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/tiled/dark, /area/awaymission/snowfield/outside) "dM" = ( @@ -1345,14 +1345,14 @@ /obj/structure/closet/medical_wall{ pixel_y = -32 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/adv, /turf/simulated/floor/tiled/dark, /area/awaymission/snowfield/outside) "dV" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/backpack/satchel/sec, +/obj/item/storage/backpack/satchel/sec, /turf/simulated/floor/tiled/dark, /area/awaymission/snowfield/outside) "dW" = ( @@ -1403,7 +1403,7 @@ /obj/item/clothing/under/soviet, /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/head/ushanka, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, /turf/simulated/floor/tiled/dark, /area/awaymission/snowfield/outside) "ee" = ( @@ -1418,7 +1418,7 @@ "ef" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/outside) "eg" = ( @@ -1461,7 +1461,7 @@ /area/awaymission/snowfield/outside) "em" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/weapon/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/projectile/shotgun/pump/rifle, /turf/simulated/floor/tiled/dark, /area/awaymission/snowfield/outside) "en" = ( @@ -1476,12 +1476,12 @@ "ep" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/outside) "eq" = ( diff --git a/maps/gateway_archive_vr/spacebattle.dmm b/maps/gateway_archive_vr/spacebattle.dmm index f84ac26105a..6f4aa15a702 100644 --- a/maps/gateway_archive_vr/spacebattle.dmm +++ b/maps/gateway_archive_vr/spacebattle.dmm @@ -112,7 +112,7 @@ /area/awaymission/spacebattle/syndicate2) "as" = ( /obj/structure/table/reinforced, -/obj/item/weapon/grenade/empgrenade, +/obj/item/grenade/empgrenade, /turf/simulated/shuttle/floor{ icon_state = "floor4" }, @@ -126,7 +126,7 @@ /area/awaymission/spacebattle/syndicate2) "au" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, /turf/simulated/shuttle/floor{ icon_state = "floor4" }, @@ -168,7 +168,7 @@ /area/awaymission/spacebattle/syndicate3) "aA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/projectile/silenced, +/obj/item/gun/projectile/silenced, /turf/simulated/shuttle/floor{ icon_state = "floor4" }, @@ -240,7 +240,7 @@ /area/awaymission/spacebattle/syndicate3) "aL" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/projectile/deagle, +/obj/item/gun/projectile/deagle, /turf/simulated/shuttle/floor{ icon_state = "floor4" }, @@ -388,7 +388,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/simulated/floor/plating, /area/awaymission/spacebattle/syndicate2) @@ -452,7 +452,7 @@ /area/awaymission/spacebattle/syndicate2) "bo" = ( /obj/structure/table/reinforced, -/obj/item/weapon/plastique, +/obj/item/plastique, /turf/simulated/shuttle/floor{ icon_state = "floor4" }, @@ -465,21 +465,21 @@ /area/awaymission/spacebattle/syndicate1) "bq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/plastique, +/obj/item/plastique, /turf/simulated/shuttle/floor{ icon_state = "floor4" }, /area/awaymission/spacebattle/syndicate1) "br" = ( /obj/structure/table/reinforced, -/obj/item/weapon/grenade/spawnergrenade/manhacks, +/obj/item/grenade/spawnergrenade/manhacks, /turf/simulated/shuttle/floor{ icon_state = "floor4" }, /area/awaymission/spacebattle/syndicate1) "bs" = ( /obj/structure/table/reinforced, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, /turf/simulated/shuttle/floor{ icon_state = "floor4" }, @@ -506,7 +506,7 @@ /area/awaymission/spacebattle/syndicate3) "bw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/melee/energy/sword/red, +/obj/item/melee/energy/sword/red, /turf/simulated/shuttle/floor{ icon_state = "floor4" }, @@ -546,7 +546,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/simulated/floor/plating, /area/awaymission/spacebattle/syndicate3) @@ -598,7 +598,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/simulated/floor/plating, /area/awaymission/spacebattle/syndicate1) @@ -901,7 +901,7 @@ /area/awaymission/spacebattle/cruiser) "cC" = ( /obj/structure/stool/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "cD" = ( @@ -910,7 +910,7 @@ /area/awaymission/spacebattle/cruiser) "cE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/sausage, +/obj/item/reagent_containers/food/snacks/sausage, /turf/simulated/floor{ icon_state = "cafeteria"; dir = 2 @@ -918,7 +918,7 @@ /area/awaymission/spacebattle/cruiser) "cF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, /turf/simulated/floor{ icon_state = "cafeteria"; dir = 2 @@ -926,7 +926,7 @@ /area/awaymission/spacebattle/cruiser) "cG" = ( /obj/structure/table/reinforced, -/obj/item/weapon/kitchenknife, +/obj/item/kitchenknife, /turf/simulated/floor{ icon_state = "cafeteria"; dir = 2 @@ -934,7 +934,7 @@ /area/awaymission/spacebattle/cruiser) "cH" = ( /obj/structure/table/reinforced, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /turf/simulated/floor{ icon_state = "cafeteria"; dir = 2 @@ -1022,7 +1022,7 @@ /area/awaymission/spacebattle/cruiser) "cW" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/fries, +/obj/item/reagent_containers/food/snacks/fries, /turf/simulated/floor{ icon_state = "cafeteria"; dir = 2 @@ -1030,7 +1030,7 @@ /area/awaymission/spacebattle/cruiser) "cX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/stew, +/obj/item/reagent_containers/food/snacks/stew, /turf/simulated/floor{ icon_state = "cafeteria"; dir = 2 @@ -1218,7 +1218,7 @@ mobname = "Nathaniel Waters"; name = "Nathaniel Waters" }, -/obj/item/weapon/butch, +/obj/item/butch, /obj/effect/decal/cleanable/blood, /turf/simulated/floor{ icon_state = "bar" @@ -1357,7 +1357,7 @@ /area/awaymission/spacebattle/cruiser) "dU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/food/condiment/peppermill, /turf/simulated/floor{ icon_state = "bar" }, @@ -1419,7 +1419,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/simulated/floor/engine, /area/awaymission/spacebattle/cruiser) @@ -1586,7 +1586,7 @@ mobname = "Davis Hume"; name = "Davis Hume" }, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "eC" = ( @@ -1678,7 +1678,7 @@ /area/awaymission/spacebattle/syndicate4) "eP" = ( /obj/structure/table/reinforced, -/obj/item/weapon/kitchen/utensil/spoon, +/obj/item/kitchen/utensil/spoon, /turf/simulated/floor{ icon_state = "bar" }, @@ -1690,7 +1690,7 @@ }, /area/awaymission/spacebattle/cruiser) "eR" = ( -/obj/item/weapon/shield/energy, +/obj/item/shield/energy, /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "eS" = ( @@ -1736,21 +1736,21 @@ /area/awaymission/spacebattle/cruiser) "eY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/food/condiment/saltshaker, /turf/simulated/floor{ icon_state = "bar" }, /area/awaymission/spacebattle/cruiser) "eZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/kitchen/utensil/fork, +/obj/item/kitchen/utensil/fork, /turf/simulated/floor{ icon_state = "bar" }, /area/awaymission/spacebattle/cruiser) "fa" = ( /obj/effect/landmark/corpse/syndicatesoldier, -/obj/item/weapon/melee/energy/sword/red, +/obj/item/melee/energy/sword/red, /obj/effect/decal/cleanable/blood, /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) @@ -1759,7 +1759,7 @@ mobname = "Kurt Kliest"; name = "Kurt Kliest" }, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, /obj/item/ammo_casing/shotgun, /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) @@ -1811,7 +1811,7 @@ /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "fk" = ( -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "fl" = ( @@ -1852,9 +1852,9 @@ /area/awaymission/spacebattle/cruiser) "fr" = ( /obj/structure/closet/crate, -/obj/item/weapon/light/tube, -/obj/item/weapon/light/tube, -/obj/item/weapon/light/tube, +/obj/item/light/tube, +/obj/item/light/tube, +/obj/item/light/tube, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "fs" = ( @@ -1865,7 +1865,7 @@ /area/awaymission/spacebattle/cruiser) "ft" = ( /obj/effect/landmark/corpse/syndicatesoldier, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, /obj/item/ammo_casing/a10mm, /obj/item/ammo_casing/a10mm, /obj/effect/decal/cleanable/blood, @@ -1887,7 +1887,7 @@ mobname = "Walter Strider"; name = "Walter Strider" }, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, /obj/item/ammo_casing/a10mm, /obj/item/ammo_casing/a10mm, /obj/effect/decal/cleanable/blood, @@ -1906,7 +1906,7 @@ "fx" = ( /obj/item/ammo_casing/a357, /obj/item/ammo_casing/a357, -/obj/item/weapon/gun/projectile/mateba, +/obj/item/gun/projectile/mateba, /obj/effect/landmark/corpse/commander{ mobname = "Aaron Bowden"; name = "Aaron Bowden" @@ -2001,8 +2001,8 @@ /area/awaymission/spacebattle/cruiser) "fM" = ( /obj/structure/closet/crate/internals, -/obj/item/weapon/tank/emergency_oxygen, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/tank/emergency_oxygen, +/obj/item/storage/firstaid/o2, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "fN" = ( @@ -2037,7 +2037,7 @@ /area/awaymission/spacebattle/cruiser) "fR" = ( /obj/effect/landmark/corpse/syndicatesoldier, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, /obj/item/ammo_casing/a10mm, /obj/item/ammo_casing/a10mm, /obj/effect/decal/cleanable/blood, @@ -2219,8 +2219,8 @@ /area/awaymission/spacebattle/cruiser) "gu" = ( /obj/structure/closet/crate, -/obj/item/weapon/lipstick/black, -/obj/item/weapon/lipstick/jade, +/obj/item/lipstick/black, +/obj/item/lipstick/jade, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "gv" = ( @@ -2247,8 +2247,8 @@ /area/awaymission/spacebattle/cruiser) "gy" = ( /obj/structure/table/reinforced, -/obj/item/weapon/scalpel, -/obj/item/weapon/circular_saw, +/obj/item/scalpel, +/obj/item/circular_saw, /turf/simulated/floor{ icon_state = "whitehall"; dir = 2 @@ -2256,7 +2256,7 @@ /area/awaymission/spacebattle/cruiser) "gz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/retractor, +/obj/item/retractor, /turf/simulated/floor{ icon_state = "whitehall"; dir = 2 @@ -2264,7 +2264,7 @@ /area/awaymission/spacebattle/cruiser) "gA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/hemostat, +/obj/item/hemostat, /turf/simulated/floor{ icon_state = "whitehall"; dir = 2 @@ -2272,7 +2272,7 @@ /area/awaymission/spacebattle/cruiser) "gB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/scalpel, +/obj/item/scalpel, /turf/simulated/floor{ icon_state = "whitehall"; dir = 2 @@ -2286,7 +2286,7 @@ /turf/simulated/floor/wood, /area/awaymission/spacebattle/cruiser) "gE" = ( -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "gF" = ( @@ -2304,13 +2304,13 @@ /area/awaymission/spacebattle/syndicate4) "gH" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "gI" = ( /obj/structure/closet/crate, -/obj/item/weapon/spacecash/c10, -/obj/item/weapon/spacecash/c10, +/obj/item/spacecash/c10, +/obj/item/spacecash/c10, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "gJ" = ( @@ -2355,7 +2355,7 @@ /area/awaymission/spacebattle/cruiser) "gQ" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/awaymission/spacebattle/cruiser) "gR" = ( @@ -2380,7 +2380,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/simulated/floor/plating/airless, /area/awaymission/spacebattle/syndicate7) @@ -2403,11 +2403,11 @@ /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "gY" = ( -/obj/item/weapon/ore/clown, -/obj/item/weapon/ore/clown, -/obj/item/weapon/ore/clown, -/obj/item/weapon/ore/clown, -/obj/item/weapon/ore/clown, +/obj/item/ore/clown, +/obj/item/ore/clown, +/obj/item/ore/clown, +/obj/item/ore/clown, +/obj/item/ore/clown, /obj/structure/closet/crate, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) @@ -2481,20 +2481,20 @@ /turf/space, /area/awaymission/spacebattle/syndicate4) "hj" = ( -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe/plasmacutter, +/obj/item/pickaxe, +/obj/item/pickaxe/plasmacutter, /obj/structure/closet/crate, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "hk" = ( -/obj/item/weapon/circular_saw, +/obj/item/circular_saw, /turf/simulated/floor{ icon_state = "white" }, /area/awaymission/spacebattle/cruiser) "hl" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/wood, /area/awaymission/spacebattle/cruiser) "hm" = ( @@ -2554,12 +2554,12 @@ /area/awaymission/spacebattle/cruiser) "ht" = ( /obj/structure/closet/crate/secure/plasma, -/obj/item/weapon/tank/plasma, +/obj/item/tank/plasma, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "hu" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "hv" = ( @@ -2625,18 +2625,18 @@ /area/awaymission/spacebattle/cruiser) "hC" = ( /obj/structure/closet/crate, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, +/obj/item/cell/high, +/obj/item/cell/high, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "hD" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "hE" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "hF" = ( @@ -2653,14 +2653,14 @@ /area/awaymission/spacebattle/cruiser) "hH" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor{ icon_state = "white" }, /area/awaymission/spacebattle/cruiser) "hI" = ( /obj/structure/table/woodentable, -/obj/item/device/violin, +/obj/item/violin, /turf/simulated/floor/wood, /area/awaymission/spacebattle/cruiser) "hJ" = ( @@ -2695,7 +2695,7 @@ /area/awaymission/spacebattle/cruiser) "hN" = ( /obj/structure/stool/bed, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /turf/simulated/floor/wood, /area/awaymission/spacebattle/cruiser) "hO" = ( @@ -2778,7 +2778,7 @@ icon_state = "shower"; dir = 4 }, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/simulated/floor{ icon_state = "freezerfloor" }, @@ -2805,7 +2805,7 @@ /area/awaymission/spacebattle/cruiser) "id" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/simulated/floor{ icon_state = "white" }, @@ -2829,14 +2829,14 @@ }, /area/awaymission/spacebattle/cruiser) "ih" = ( -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor{ icon_state = "white" }, /area/awaymission/spacebattle/cruiser) "ii" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /turf/simulated/floor{ icon_state = "white" }, @@ -2855,7 +2855,7 @@ icon_state = "shower"; dir = 8 }, -/obj/item/weapon/soap, +/obj/item/soap, /turf/simulated/floor{ icon_state = "freezerfloor" }, @@ -2949,7 +2949,7 @@ mobname = "Cyrion"; name = "Cyrion" }, -/obj/item/weapon/flamethrower/full, +/obj/item/flamethrower/full, /obj/effect/decal/cleanable/blood, /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) @@ -2959,7 +2959,7 @@ /area/awaymission/spacebattle/cruiser) "iy" = ( /obj/effect/landmark/corpse/syndicatesoldier, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, /turf/simulated/floor{ icon_state = "damaged2" }, diff --git a/maps/gateway_archive_vr/stationCollision.dm b/maps/gateway_archive_vr/stationCollision.dm index 681f1955a70..ab6e99a43cc 100644 --- a/maps/gateway_archive_vr/stationCollision.dm +++ b/maps/gateway_archive_vr/stationCollision.dm @@ -47,20 +47,20 @@ name = "Safecode hint spawner" /obj/effect/landmark/sc_bible_spawner/New() - var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible/booze(src.loc) + var/obj/item/storage/bible/B = new /obj/item/storage/bible/booze(src.loc) B.name = "The Holy book of the Geometer" B.deity_name = "Narsie" B.icon_state = "melted" B.item_state = "melted" - new /obj/item/weapon/paper/sc_safehint_paper_bible(B) - new /obj/item/weapon/pen(B) + new /obj/item/paper/sc_safehint_paper_bible(B) + new /obj/item/pen(B) qdel(src) /* * Guns - I'm making these specifically so that I dont spawn a pile of fully loaded weapons on the map. */ //Captain's retro laser - Fires practice laser shots instead. -obj/item/weapon/gun/energy/laser/retro/sc_retro +obj/item/gun/energy/laser/retro/sc_retro name ="retro laser" icon_state = "retro" desc = "An older model of the basic lasergun, no longer used by NanoTrasen's security or military forces." @@ -68,32 +68,32 @@ obj/item/weapon/gun/energy/laser/retro/sc_retro clumsy_check = 0 //No sense in having a harmless gun blow up in the clowns face //Syndicate silenced pistol. This definition is not necessary, it's just habit. -/obj/item/weapon/gun/projectile/silenced/sc_silenced +/obj/item/gun/projectile/silenced/sc_silenced //Make it so that these guns only spawn with a couple bullets... if any -/obj/item/weapon/gun/projectile/silenced/sc_silenced/New() +/obj/item/gun/projectile/silenced/sc_silenced/New() for(var/ammo in loaded) if(prob(95)) //95% chance loaded -= ammo //Syndicate sub-machine guns. -/obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r +/obj/item/gun/projectile/automatic/c20r/sc_c20r -/obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r/New() +/obj/item/gun/projectile/automatic/c20r/sc_c20r/New() for(var/ammo in loaded) if(prob(95)) //95% chance loaded -= ammo //Barman's shotgun -/obj/item/weapon/gun/projectile/shotgun/pump/sc_pump +/obj/item/gun/projectile/shotgun/pump/sc_pump -/obj/item/weapon/gun/projectile/shotgun/pump/sc_pump/New() +/obj/item/gun/projectile/shotgun/pump/sc_pump/New() for(var/ammo in loaded) if(prob(95)) //95% chance loaded -= ammo //Lasers -/obj/item/weapon/gun/energy/laser/practice/sc_laser +/obj/item/gun/energy/laser/practice/sc_laser name = "Old laser" desc = "A once potent weapon, years of dust have collected in the chamber and lens of this weapon, weakening the beam significantly." clumsy_check = 0 @@ -110,30 +110,30 @@ var/sc_safecode4 = "[rand(0,9)]" var/sc_safecode5 = "[rand(0,9)]" //Pieces of paper actually containing the hints -/obj/item/weapon/paper/sc_safehint_paper_prison +/obj/item/paper/sc_safehint_paper_prison name = "smudged paper" -/obj/item/weapon/paper/sc_safehint_paper_prison/New() +/obj/item/paper/sc_safehint_paper_prison/New() info = "The ink is smudged, you can only make out a couple numbers: '[sc_safecode1]**[sc_safecode4]*'" -/obj/item/weapon/paper/sc_safehint_paper_hydro +/obj/item/paper/sc_safehint_paper_hydro name = "shredded paper" -/obj/item/weapon/paper/sc_safehint_paper_hydro/New() +/obj/item/paper/sc_safehint_paper_hydro/New() info = "Although the paper is shredded, you can clearly see the number: '[sc_safecode2]'" -/obj/item/weapon/paper/sc_safehint_paper_caf +/obj/item/paper/sc_safehint_paper_caf name = "blood-soaked paper" //This does not have to be in New() because it is a constant. There are no variables in it i.e. [sc_safcode] info = "This paper is soaked in blood, it is impossible to read any text." -/obj/item/weapon/paper/sc_safehint_paper_bible +/obj/item/paper/sc_safehint_paper_bible name = "hidden paper" -/obj/item/weapon/paper/sc_safehint_paper_bible/New() +/obj/item/paper/sc_safehint_paper_bible/New() info = {"It would appear that the pen hidden with the paper had leaked ink over the paper. However you can make out the last three digits:'[sc_safecode3][sc_safecode4][sc_safecode5]' "} -/obj/item/weapon/paper/sc_safehint_paper_shuttle +/obj/item/paper/sc_safehint_paper_shuttle info = {"Target: Research-station Epsilon
Objective: Prototype weaponry. The captain likely keeps them locked in her safe.

@@ -149,19 +149,19 @@ var/sc_safecode5 = "[rand(0,9)]" /* * Captain's safe */ -/obj/item/weapon/storage/secure/safe/sc_ssafe +/obj/item/storage/secure/safe/sc_ssafe name = "Captain's secure safe" -/obj/item/weapon/storage/secure/safe/sc_ssafe/New() +/obj/item/storage/secure/safe/sc_ssafe/New() ..() l_code = "[sc_safecode1][sc_safecode2][sc_safecode3][sc_safecode4][sc_safecode5]" l_set = 1 - new /obj/item/weapon/gun/energy/mindflayer(src) - new /obj/item/device/soulstone(src) + new /obj/item/gun/energy/mindflayer(src) + new /obj/item/soulstone(src) new /obj/item/clothing/head/helmet/space/cult(src) new /obj/item/clothing/suit/space/cult(src) - //new /obj/item/weapon/teleportation_scroll(src) - new /obj/item/weapon/ore/diamond(src) + //new /obj/item/teleportation_scroll(src) + new /obj/item/ore/diamond(src) /* * Modified Nar-Sie diff --git a/maps/gateway_archive_vr/stationCollision.dmm b/maps/gateway_archive_vr/stationCollision.dmm index 6cfc12c33fc..8a0e0c36662 100644 --- a/maps/gateway_archive_vr/stationCollision.dmm +++ b/maps/gateway_archive_vr/stationCollision.dmm @@ -377,7 +377,7 @@ /turf/simulated/shuttle/plating, /area/awaymission/syndishuttle) "bs" = ( -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /turf/simulated/shuttle/plating, /area/awaymission/syndishuttle) "bt" = ( @@ -437,7 +437,7 @@ /area/awaymission/syndishuttle) "bD" = ( /obj/structure/table/standard, -/obj/item/weapon/paper/sc_safehint_paper_shuttle, +/obj/item/paper/sc_safehint_paper_shuttle, /turf/simulated/shuttle/floor{ icon_state = "floor4" }, @@ -475,7 +475,7 @@ }, /area/awaymission/research) "bJ" = ( -/obj/item/weapon/shard, +/obj/item/shard, /mob/living/carbon/alien/larva{ bruteloss = 25; fireloss = 175; @@ -669,7 +669,7 @@ }, /area/awaymission/research) "ck" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /mob/living/carbon/alien/larva{ @@ -683,10 +683,10 @@ }, /area/awaymission/research) "cl" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /obj/effect/alien/weeds/node, @@ -697,9 +697,9 @@ /area/awaymission/research) "cm" = ( /obj/structure/table/standard, -/obj/item/weapon/clipboard, -/obj/item/weapon/paper, -/obj/item/weapon/paper, +/obj/item/clipboard, +/obj/item/paper, +/obj/item/paper, /turf/simulated/floor{ icon_state = "showroomfloor" }, @@ -874,8 +874,8 @@ /area/awaymission/research) "cJ" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor{ icon_state = "showroomfloor" }, @@ -901,7 +901,7 @@ name = "Syndicate agent remains" }, /obj/item/clothing/suit/storage/labcoat, -/obj/item/weapon/clipboard{ +/obj/item/clipboard{ pixel_x = -7; pixel_y = -4 }, @@ -1086,7 +1086,7 @@ /obj/item/clothing/suit/armor/riot, /obj/item/clothing/head/helmet/swat, /obj/effect/decal/remains/human, -/obj/item/weapon/gun/energy/laser/practice/sc_laser, +/obj/item/gun/energy/laser/practice/sc_laser, /turf/simulated/floor{ icon_state = "showroomfloor" }, @@ -1107,7 +1107,7 @@ /obj/item/clothing/suit/armor/riot, /obj/item/clothing/head/helmet/swat, /obj/effect/decal/remains/human, -/obj/item/weapon/gun/energy/laser/practice/sc_laser, +/obj/item/gun/energy/laser/practice/sc_laser, /turf/simulated/floor{ icon_state = "dark" }, @@ -1334,7 +1334,7 @@ /obj/item/clothing/suit/armor/riot, /obj/item/clothing/head/helmet/swat, /obj/effect/decal/remains/human, -/obj/item/weapon/gun/energy/laser/practice/sc_laser, +/obj/item/gun/energy/laser/practice/sc_laser, /turf/simulated/floor{ icon_state = "showroomfloor" }, @@ -1449,7 +1449,7 @@ /obj/item/stack/cable_coil{ amount = 5 }, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /turf/simulated/floor{ icon_state = "showroomfloor" }, @@ -1490,7 +1490,7 @@ dir = 8 }, /obj/structure/grille, -/obj/item/weapon/shard, +/obj/item/shard, /turf/simulated/floor/plating, /area/awaymission/northblock) "ee" = ( @@ -1757,7 +1757,7 @@ dir = 8 }, /obj/structure/grille, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/simulated/floor/plating, @@ -1799,7 +1799,7 @@ /area/awaymission/northblock) "eQ" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/grown/potato, +/obj/item/reagent_containers/food/snacks/grown/potato, /obj/item/stack/cable_coil{ amount = 1 }, @@ -1832,7 +1832,7 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/book/manual/research_and_development, +/obj/item/book/manual/research_and_development, /turf/simulated/floor{ icon_state = "showroomfloor" }, @@ -1929,15 +1929,15 @@ /area/awaymission/northblock) "ff" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor{ +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor{ pixel_x = -3 }, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/scanning_module{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/scanning_module{ pixel_y = -3 }, /turf/simulated/floor{ @@ -1954,16 +1954,16 @@ /area/awaymission/research) "fh" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator{ +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/micro_laser{ +/obj/item/stock_parts/micro_laser{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/stock_parts/micro_laser{ +/obj/item/stock_parts/micro_laser{ pixel_x = 3; pixel_y = 3 }, @@ -2017,17 +2017,17 @@ pixel_x = -3; pixel_y = 5 }, -/obj/item/weapon/cell/crap, +/obj/item/cell/crap, /turf/simulated/floor{ icon_state = "showroomfloor" }, /area/awaymission/research) "fo" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/matter_bin{ +/obj/item/stock_parts/matter_bin{ pixel_x = 3 }, -/obj/item/weapon/stock_parts/matter_bin{ +/obj/item/stock_parts/matter_bin{ pixel_x = -3 }, /turf/simulated/floor{ @@ -2083,11 +2083,11 @@ /area/awaymission/midblock) "fx" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical{ pixel_y = 5 }, -/obj/item/weapon/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, /turf/simulated/floor{ icon_state = "showroomfloor" }, @@ -2134,8 +2134,8 @@ /area/awaymission/research) "fC" = ( /obj/structure/table/standard, -/obj/item/device/analyzer, -/obj/item/device/mass_spectrometer{ +/obj/item/analyzer, +/obj/item/mass_spectrometer{ pixel_x = 5; pixel_y = 5 }, @@ -2145,12 +2145,12 @@ /area/awaymission/research) "fD" = ( /obj/structure/table/holotable, -/obj/item/weapon/gun/energy/floragun{ +/obj/item/gun/energy/floragun{ pixel_x = 2; pixel_y = 3 }, /obj/machinery/light, -/obj/item/weapon/gun/energy/taser{ +/obj/item/gun/energy/taser{ pixel_x = -2; pixel_y = -2 }, @@ -2160,7 +2160,7 @@ /area/awaymission/research) "fE" = ( /obj/structure/target_stake, -/obj/item/weapon/grown/sunflower, +/obj/item/grown/sunflower, /turf/simulated/floor{ icon_state = "showroomfloor" }, @@ -2185,7 +2185,7 @@ }, /obj/item/clothing/shoes/syndigaloshes, /obj/effect/decal/cleanable/blood/splatter, -/obj/item/weapon/gun/projectile/silenced/sc_silenced, +/obj/item/gun/projectile/silenced/sc_silenced, /turf/simulated/floor{ icon_state = "grimy" }, @@ -2301,14 +2301,14 @@ /area/awaymission/arrivalblock) "fU" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = -3; pixel_y = 5 }, -/obj/item/weapon/paper{ +/obj/item/paper{ pixel_x = 3 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_x = 10; pixel_y = 10 }, @@ -2398,7 +2398,7 @@ }, /area/awaymission/northblock) "gh" = ( -/obj/item/weapon/storage/secure/safe/sc_ssafe{ +/obj/item/storage/secure/safe/sc_ssafe{ pixel_x = 4; pixel_y = -26 }, @@ -2408,11 +2408,11 @@ /area/awaymission/northblock) "gi" = ( /obj/structure/stool/bed, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /obj/item/clothing/under/rank/captain, /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/splatter, -/obj/item/weapon/gun/energy/laser/retro/sc_retro, +/obj/item/gun/energy/laser/retro/sc_retro, /turf/simulated/floor{ icon_state = "grimy" }, @@ -2472,8 +2472,8 @@ /area/awaymission/midblock) "gs" = ( /obj/structure/table/standard, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/book/manual/barman_recipes, +/obj/item/reagent_containers/food/drinks/shaker, /turf/simulated/floor, /area/awaymission/midblock) "gt" = ( @@ -2600,7 +2600,7 @@ pixel_x = 0 }, /obj/effect/decal/cleanable/blood/splatter, -/obj/item/weapon/gun/projectile/shotgun/pump/sc_pump, +/obj/item/gun/projectile/shotgun/pump/sc_pump, /turf/simulated/floor, /area/awaymission/midblock) "gJ" = ( @@ -2652,7 +2652,7 @@ /area/awaymission/midblock) "gQ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/food/drinks/bottle/holywater, /turf/simulated/floor{ icon_state = "dark" }, @@ -2726,8 +2726,8 @@ /area/awaymission/arrivalblock) "ha" = ( /obj/structure/table/standard, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/melee/baton, +/obj/item/book/manual/security_space_law, +/obj/item/melee/baton, /obj/item/clothing/head/helmet/warden, /turf/simulated/floor{ icon_state = "red"; @@ -2768,7 +2768,7 @@ /area/awaymission/midblock) "hf" = ( /obj/structure/stool/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/structure/window/reinforced/tinted{ dir = 1 }, @@ -2787,7 +2787,7 @@ /area/awaymission/midblock) "hh" = ( /obj/structure/stool/bed, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /obj/structure/window/reinforced/tinted{ dir = 1 }, @@ -2796,7 +2796,7 @@ /area/awaymission/midblock) "hi" = ( /obj/structure/stool/bed, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /obj/structure/window/reinforced/tinted{ dir = 1 }, @@ -2920,8 +2920,8 @@ dir = 8 }, /obj/item/clothing/suit/space/syndicate, -/obj/item/weapon/paper/sc_safehint_paper_prison, -/obj/item/weapon/gun/projectile/shotgun/pump/sc_pump, +/obj/item/paper/sc_safehint_paper_prison, +/obj/item/gun/projectile/shotgun/pump/sc_pump, /turf/simulated/floor, /area/awaymission/arrivalblock) "hA" = ( @@ -2967,9 +2967,9 @@ /area/awaymission/midblock) "hF" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/peppermill, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = 4; pixel_y = 4 }, @@ -3010,13 +3010,13 @@ /area/awaymission/arrivalblock) "hL" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/simulated/floor, /area/awaymission/arrivalblock) "hM" = ( /obj/structure/table/standard, -/obj/item/weapon/handcuffs, -/obj/item/device/flash, +/obj/item/handcuffs, +/obj/item/flash, /turf/simulated/floor, /area/awaymission/arrivalblock) "hN" = ( @@ -3027,13 +3027,13 @@ /area/awaymission/arrivalblock) "hO" = ( /obj/structure/stool/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/effect/decal/remains/human, /turf/simulated/floor, /area/awaymission/midblock) "hP" = ( /obj/structure/stool/bed, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /turf/simulated/floor, /area/awaymission/midblock) "hQ" = ( @@ -3042,8 +3042,8 @@ /area/awaymission/midblock) "hR" = ( /obj/structure/table/standard, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/book/manual/chef_recipes, +/obj/item/kitchen/rollingpin, /turf/simulated/floor, /area/awaymission/midblock) "hS" = ( @@ -3055,8 +3055,8 @@ /area/awaymission/midblock) "hT" = ( /obj/effect/decal/remains/human, -/obj/item/weapon/butch, -/obj/item/weapon/kitchenknife, +/obj/item/butch, +/obj/item/kitchenknife, /obj/item/clothing/head/chefhat, /obj/effect/decal/cleanable/blood/splatter, /turf/simulated/floor, @@ -3072,10 +3072,10 @@ name = "Syndicate agent remains" }, /obj/item/ammo_casing/a10mm, -/obj/item/weapon/paper/sc_safehint_paper_caf, +/obj/item/paper/sc_safehint_paper_caf, /obj/item/clothing/under/syndicate, /obj/effect/decal/cleanable/blood/splatter, -/obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r, +/obj/item/gun/projectile/automatic/c20r/sc_c20r, /turf/simulated/floor, /area/awaymission/midblock) "hW" = ( @@ -3220,7 +3220,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r, +/obj/item/gun/projectile/automatic/c20r/sc_c20r, /turf/simulated/floor, /area/awaymission/midblock) "im" = ( @@ -3275,7 +3275,7 @@ /area/awaymission/arrivalblock) "iu" = ( /obj/structure/stool/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor, /area/awaymission/midblock) "iv" = ( @@ -3315,7 +3315,7 @@ /obj/item/ammo_casing/a10mm, /obj/item/clothing/under/syndicate, /obj/effect/decal/cleanable/blood/splatter, -/obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r, +/obj/item/gun/projectile/automatic/c20r/sc_c20r, /turf/simulated/floor, /area/awaymission/midblock) "iC" = ( @@ -3335,7 +3335,7 @@ /obj/item/ammo_casing/a10mm, /obj/item/clothing/under/syndicate, /obj/effect/decal/cleanable/blood/splatter, -/obj/item/weapon/gun/projectile/automatic/c20r/sc_c20r, +/obj/item/gun/projectile/automatic/c20r/sc_c20r, /turf/simulated/floor, /area/awaymission/midblock) "iE" = ( @@ -3356,7 +3356,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /obj/item/stack/rods, @@ -3417,11 +3417,11 @@ dir = 8 }, /obj/structure/grille, -/obj/item/weapon/shard, +/obj/item/shard, /turf/simulated/shuttle/plating, /area/awaymission/arrivalblock) "iP" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /obj/item/stack/rods, @@ -3738,7 +3738,7 @@ /area/awaymission/southblock) "jN" = ( /obj/structure/table/standard, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor{ icon_state = "whitehall"; dir = 1 @@ -3888,7 +3888,7 @@ /area/awaymission/southblock) "kk" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor{ icon_state = "whitehall"; dir = 2 @@ -4028,7 +4028,7 @@ /area/awaymission/southblock) "kD" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/awaymission/southblock) "kE" = ( @@ -4093,7 +4093,7 @@ /turf/simulated/floor, /area/awaymission/arrivalblock) "kN" = ( -/obj/item/weapon/melee/energy/sword/red, +/obj/item/melee/energy/sword/red, /obj/item/clothing/shoes/syndigaloshes, /obj/item/clothing/under/syndicate, /obj/effect/decal/remains/human{ @@ -4101,7 +4101,7 @@ icon_state = "remains"; name = "Syndicate agent remains" }, -/obj/item/weapon/paper/sc_safehint_paper_hydro, +/obj/item/paper/sc_safehint_paper_hydro, /turf/simulated/floor, /area/awaymission/arrivalblock) "kO" = ( @@ -4129,11 +4129,11 @@ /area/awaymission/southblock) "kS" = ( /obj/structure/table/standard, -/obj/item/weapon/paper/pamphlet{ +/obj/item/paper/pamphlet{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/paper/pamphlet{ +/obj/item/paper/pamphlet{ pixel_x = -2; pixel_y = -2 }, @@ -4165,7 +4165,7 @@ /area/awaymission/gateroom) "kV" = ( /obj/structure/table/standard, -/obj/item/device/camera, +/obj/item/camera, /turf/simulated/floor{ icon_state = "warningcorner"; dir = 4 @@ -4276,7 +4276,7 @@ "lk" = ( /obj/structure/stool/bed, /obj/structure/window/reinforced/tinted, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/window/reinforced/tinted{ dir = 1 }, @@ -4309,11 +4309,11 @@ /area/awaymission/arrivalblock) "lp" = ( /obj/structure/table/standard, -/obj/item/weapon/book/manual/hydroponics_pod_people, +/obj/item/book/manual/hydroponics_pod_people, /turf/simulated/floor, /area/awaymission/arrivalblock) "lq" = ( -/obj/item/weapon/grown/deathnettle, +/obj/item/grown/deathnettle, /obj/item/clothing/shoes/brown, /obj/item/clothing/under/rank/hydroponics, /obj/effect/decal/remains/human, @@ -4340,7 +4340,7 @@ "lt" = ( /obj/structure/stool/bed, /obj/structure/window/reinforced/tinted, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /turf/simulated/floor{ icon_state = "whitehall"; dir = 4 @@ -4428,7 +4428,7 @@ /area/awaymission/arrivalblock) "lE" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor, /area/awaymission/arrivalblock) "lF" = ( @@ -4448,7 +4448,7 @@ dir = 1 }, /obj/effect/decal/remains/human, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/item/clothing/mask/breath, /turf/simulated/floor{ icon_state = "white" @@ -4465,7 +4465,7 @@ "lJ" = ( /obj/structure/stool/bed, /obj/structure/window/reinforced/tinted, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/effect/decal/remains/human, /turf/simulated/floor{ icon_state = "whitehall"; @@ -4513,8 +4513,8 @@ /area/awaymission/arrivalblock) "lQ" = ( /obj/structure/table/standard, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/reagent_containers/spray/plantbgone, +/obj/item/shovel/spade, +/obj/item/reagent_containers/spray/plantbgone, /turf/simulated/floor, /area/awaymission/arrivalblock) "lR" = ( @@ -4645,12 +4645,12 @@ /obj/structure/closet/crate/medical{ name = "Surgical Tools" }, -/obj/item/weapon/cautery, -/obj/item/weapon/circular_saw, -/obj/item/weapon/hemostat, -/obj/item/weapon/retractor, -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/scalpel, +/obj/item/cautery, +/obj/item/circular_saw, +/obj/item/hemostat, +/obj/item/retractor, +/obj/item/surgicaldrill, +/obj/item/scalpel, /turf/simulated/floor{ icon_state = "white" }, diff --git a/maps/gateway_archive_vr/wildwest.dmm b/maps/gateway_archive_vr/wildwest.dmm index 2322a4d410d..242f27814fe 100644 --- a/maps/gateway_archive_vr/wildwest.dmm +++ b/maps/gateway_archive_vr/wildwest.dmm @@ -256,7 +256,7 @@ }, /area/awaymission/wwmines) "aS" = ( -/obj/item/weapon/paper{ +/obj/item/paper{ info = "meat grinder requires sacri" }, /turf/simulated/floor/engine/cult, @@ -435,7 +435,7 @@ /area/awaymission/wwmines) "bC" = ( /obj/structure/table/woodentable, -/obj/item/weapon/gun/projectile, +/obj/item/gun/projectile, /turf/simulated/floor/wood, /area/awaymission/wwmines) "bD" = ( @@ -451,7 +451,7 @@ /area/awaymission/wwmines) "bG" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/manual/barman_recipes, +/obj/item/book/manual/barman_recipes, /turf/simulated/floor/wood, /area/awaymission/wwmines) "bH" = ( @@ -464,9 +464,9 @@ /area/awaymission/wwmines) "bJ" = ( /obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/weapon/reagent_containers/food/drinks/flour, -/obj/item/weapon/reagent_containers/food/drinks/flour, -/obj/item/weapon/reagent_containers/food/drinks/flour, +/obj/item/reagent_containers/food/drinks/flour, +/obj/item/reagent_containers/food/drinks/flour, +/obj/item/reagent_containers/food/drinks/flour, /turf/simulated/floor{ icon_state = "cafeteria"; dir = 5 @@ -474,7 +474,7 @@ /area/awaymission/wwmines) "bK" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/manual/chef_recipes, +/obj/item/book/manual/chef_recipes, /turf/simulated/floor{ icon_state = "cafeteria"; dir = 5 @@ -497,11 +497,11 @@ /area/awaymission/wwmines) "bN" = ( /obj/structure/closet/secure_closet/freezer/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, -/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, -/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, -/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, -/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, +/obj/item/reagent_containers/food/snacks/meat/syntiflesh, +/obj/item/reagent_containers/food/snacks/meat/syntiflesh, +/obj/item/reagent_containers/food/snacks/meat/syntiflesh, +/obj/item/reagent_containers/food/snacks/meat/syntiflesh, +/obj/item/reagent_containers/food/snacks/meat/syntiflesh, /turf/simulated/floor{ icon_state = "cafeteria"; dir = 5 @@ -689,7 +689,7 @@ /area/awaymission/wwgov) "cg" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper{ +/obj/item/paper{ info = " The miners in the town have become sick and almost all production has stopped. They, in a fit of delusion, tossed all of their mining equipment into the furnaces. They all claimed the same thing. A voice beckoning them to lay down their arms. Stupid miners."; name = "Planer Saul's Journal: Page 4" }, @@ -700,7 +700,7 @@ /area/awaymission/wwmines) "ch" = ( /obj/structure/table/woodentable, -/obj/item/weapon/gun/projectile, +/obj/item/gun/projectile, /turf/simulated/floor{ icon_state = "cafeteria"; dir = 5 @@ -734,7 +734,7 @@ /turf/simulated/floor/wood, /area/awaymission/wwgov) "co" = ( -/obj/item/weapon/moneybag, +/obj/item/moneybag, /turf/simulated/floor/wood, /area/awaymission/wwgov) "cp" = ( @@ -783,7 +783,7 @@ /turf/simulated/floor/carpet, /area/awaymission/wwgov) "cx" = ( -/obj/item/weapon/moneybag, +/obj/item/moneybag, /turf/simulated/floor/carpet, /area/awaymission/wwgov) "cy" = ( @@ -808,13 +808,13 @@ /area/awaymission/wwmines) "cC" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/wood, /area/awaymission/wwgov) "cD" = ( /obj/structure/table/woodentable, /obj/item/clothing/gloves/yellow, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/wood, /area/awaymission/wwgov) "cE" = ( @@ -849,17 +849,17 @@ /area/awaymission/wwmines) "cJ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/food/condiment/peppermill, /turf/simulated/floor/wood, /area/awaymission/wwmines) "cK" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/food/condiment/saltshaker, /turf/simulated/floor/wood, /area/awaymission/wwmines) "cL" = ( /obj/structure/table/woodentable, -/obj/item/weapon/twohanded/dualsaber, +/obj/item/twohanded/dualsaber, /turf/simulated/floor/wood, /area/awaymission/wwgov) "cM" = ( @@ -928,7 +928,7 @@ /turf/simulated/floor/plating, /area/awaymission/wwrefine) "cU" = ( -/obj/item/weapon/paper{ +/obj/item/paper{ info = "We've discovered something floating in space. We can't really tell how old it is, but it is scraped and bent to hell. There object is the size of about a room with double doors that we have yet to break into. It is a lot sturdier than we could have imagined. We have decided to call it 'The Vault' "; name = "Planer Saul's Journal: Page 1" }, @@ -936,21 +936,21 @@ /area/awaymission/wwgov) "cV" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight, +/obj/item/reagent_containers/food/snacks/monkeysdelight, /turf/simulated/floor{ icon_state = "stage_bleft" }, /area/awaymission/wwgov) "cW" = ( /obj/structure/table/woodentable, -/obj/item/weapon/butch, +/obj/item/butch, /turf/simulated/floor{ icon_state = "stage_bleft" }, /area/awaymission/wwgov) "cX" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/stew, +/obj/item/reagent_containers/food/snacks/stew, /turf/simulated/floor{ icon_state = "stage_bleft" }, @@ -998,21 +998,21 @@ /area/awaymission/wwgov) "dd" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread, +/obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread, /turf/simulated/floor{ icon_state = "stage_bleft" }, /area/awaymission/wwgov) "de" = ( /obj/structure/table/woodentable, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /turf/simulated/floor{ icon_state = "stage_bleft" }, /area/awaymission/wwgov) "df" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake, +/obj/item/reagent_containers/food/snacks/sliceable/lemoncake, /turf/simulated/floor{ icon_state = "stage_bleft" }, @@ -1085,29 +1085,29 @@ /area) "dp" = ( /obj/structure/stool/bed, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/wood, /area/awaymission/wwgov) "dq" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/wine, /turf/simulated/floor{ icon_state = "stage_bleft" }, /area/awaymission/wwgov) "dr" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, /turf/simulated/floor{ icon_state = "stage_bleft" }, /area/awaymission/wwgov) "ds" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/patron, +/obj/item/reagent_containers/food/drinks/bottle/patron, /turf/simulated/floor{ icon_state = "stage_bleft" }, @@ -1190,7 +1190,7 @@ /area/awaymission/wwmines) "dH" = ( /obj/structure/stool/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/wood, /area/awaymission/wwmines) "dI" = ( @@ -1321,22 +1321,22 @@ /area/awaymission/wwmines) "dY" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly, +/obj/item/reagent_containers/food/snacks/donut/slimejelly, /turf/simulated/floor/carpet, /area/awaymission/wwmines) "dZ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/food/drinks/coffee, /turf/simulated/floor/carpet, /area/awaymission/wwmines) "ea" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/donut/jelly, +/obj/item/reagent_containers/food/snacks/donut/jelly, /turf/simulated/floor/carpet, /area/awaymission/wwmines) "eb" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/donut/normal, +/obj/item/reagent_containers/food/snacks/donut/normal, /turf/simulated/floor/carpet, /area/awaymission/wwmines) "ec" = ( @@ -1421,7 +1421,7 @@ /area/awaymission/wwmines) "em" = ( /obj/structure/stool/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/item/ammo_magazine/a357, /turf/simulated/floor/wood, /area/awaymission/wwmines) @@ -1444,7 +1444,7 @@ /turf/simulated/floor/carpet, /area/awaymission/wwmines) "eq" = ( -/obj/item/weapon/gun/projectile/shotgun, +/obj/item/gun/projectile/shotgun, /turf/simulated/floor/wood, /area/awaymission/wwmines) "er" = ( @@ -1524,20 +1524,20 @@ /area/awaymission/wwgov) "eE" = ( /obj/structure/stool/bed, -/obj/item/weapon/bedsheet/blue, -/obj/item/weapon/gun/projectile, +/obj/item/bedsheet/blue, +/obj/item/gun/projectile, /turf/simulated/floor/wood, /area/awaymission/wwmines) "eF" = ( /obj/effect/decal/cleanable/blood, /obj/structure/stool/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/wood, /area/awaymission/wwmines) "eG" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/coffee, -/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly, +/obj/item/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/food/snacks/donut/slimejelly, /turf/simulated/floor/carpet, /area/awaymission/wwmines) "eH" = ( @@ -2011,7 +2011,7 @@ /area/awaymission/wwmines) "fS" = ( /obj/structure/table/woodentable, -/obj/item/weapon/gun/projectile/shotgun, +/obj/item/gun/projectile/shotgun, /turf/simulated/floor/wood, /area/awaymission/wwmines) "fT" = ( @@ -2060,7 +2060,7 @@ /turf/simulated/floor/wood, /area/awaymission/wwmines) "fZ" = ( -/obj/item/weapon/paper{ +/obj/item/paper{ info = "The Vault...it just keeps growing and growing. I went on my daily walk through the garden and now its just right outside the mansion... a few days ago it was only barely visible. But whatever is inside...its calling to me."; name = "Planer Sauls' Journal: Page 7" }, @@ -2101,7 +2101,7 @@ /area/awaymission/wwmines) "gg" = ( /obj/structure/table/woodentable, -/obj/item/weapon/gun/projectile/russian, +/obj/item/gun/projectile/russian, /turf/simulated/floor/wood, /area/awaymission/wwmines) "gh" = ( @@ -2130,7 +2130,7 @@ /turf/simulated/floor/wood, /area/awaymission/wwmines) "gm" = ( -/obj/item/weapon/gun/projectile, +/obj/item/gun/projectile, /turf/simulated/floor/wood, /area/awaymission/wwmines) "gn" = ( @@ -2187,15 +2187,15 @@ }, /area/awaymission/wwmines) "gv" = ( -/obj/item/weapon/hatchet, +/obj/item/hatchet, /turf/simulated/floor/wood, /area/awaymission/wwmines) "gw" = ( -/obj/item/weapon/gun/projectile/silenced, +/obj/item/gun/projectile/silenced, /turf/simulated/floor/wood, /area/awaymission/wwmines) "gx" = ( -/obj/item/weapon/gun/projectile/shotgun, +/obj/item/gun/projectile/shotgun, /turf/simulated/floor/plating/ironsand{ icon_state = "ironsand1" }, @@ -2388,7 +2388,7 @@ /obj/item/clothing/suit/space/syndicate/black/orange, /obj/item/clothing/head/helmet/space/syndicate/black/orange, /obj/item/clothing/mask/gas/syndicate, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, /turf/simulated/shuttle{ icon_state = "floor2" }, @@ -2412,7 +2412,7 @@ }, /area/awaymission/wwrefine) "gY" = ( -/obj/item/weapon/paper{ +/obj/item/paper{ info = "The syndicate have invaded. Their ships appeared out of nowhere and now they likely intend to kill us all and take everything. On the off-chance that the Vault may grant us sanctuary, many of us have decided to force our way inside and bolt the door, taking as many provisions with us as we can carry. In case you find this, send for help immediately and open the Vault. Find us inside."; name = "Planer Saul's Journal: Page 8" }, diff --git a/maps/gateway_archive_vr/zoo.dm b/maps/gateway_archive_vr/zoo.dm index 8dfc8857831..10228c8f870 100644 --- a/maps/gateway_archive_vr/zoo.dm +++ b/maps/gateway_archive_vr/zoo.dm @@ -18,26 +18,26 @@ /area/awaymission/zoo/pirateship icon_state = "bluenew" -/obj/item/weapon/paper/zoo +/obj/item/paper/zoo name = "\improper Quarterly Report" info = {"There's nothing but spreadsheets and budget reports on this document, apparently regarding a zoo owned by NanoTrasen."} -/obj/item/weapon/paper/zoo/pirate +/obj/item/paper/zoo/pirate name = "odd note" -/obj/item/weapon/paper/zoo/pirate/volk +/obj/item/paper/zoo/pirate/volk info = {"Lady Nebula,

We can't keep these animals here permanently. We're running out of food and they're getting hungry. Ma'isi went missing last night when we sent her to clean up the petting zoo. This morning, we found Tajaran hair in the horse shit. I can't speak for everyone, but I'm out. If these animals break loose, we're all fucking dead. Please get some extra rations of meat before the carnivores realize the electrified grilles don't work right now.

-Volk"} -/obj/item/weapon/paper/zoo/pirate/nebula +/obj/item/paper/zoo/pirate/nebula info = {"Volk,

Throw some prisoners into the cages, then. The client took too long to pay up anyway.

-Lady Nebula"} -/obj/item/weapon/paper/zoo/pirate/haveyouseen +/obj/item/paper/zoo/pirate/haveyouseen info = {"Has anyone seen Za'med? I sent him to get something out of the tool shed and he hasn't come back.

-Meesei"} -/obj/item/weapon/paper/zoo/pirate/warning +/obj/item/paper/zoo/pirate/warning info = {"Attention crew,

Since apparently you fucking idiots didn't notice, that bulltaur who delivered the bears was Jarome Rognvaldr. I'm sorry, maybe you scabs forgot? Does the name Jarome the Bottomless ring any fucking bells? If he's seen again without a laser bolt hole through his fucking skull, I'm shoving anyone on guard duty up Zed's arse. Are we diff --git a/maps/gateway_archive_vr/zoo.dmm b/maps/gateway_archive_vr/zoo.dmm index 2bf47c06c76..ddf268d1a09 100644 --- a/maps/gateway_archive_vr/zoo.dmm +++ b/maps/gateway_archive_vr/zoo.dmm @@ -3,10 +3,10 @@ "ac" = (/obj/effect/blocker,/turf/space,/area/space) "ad" = (/turf/simulated/shuttle/wall,/area/awaymission/zoo/pirateship) "ae" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"af" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/weapon/gun/energy/lasercannon},/turf/simulated/floor/reinforced,/area/awaymission/zoo/pirateship) +"af" = (/obj/machinery/porta_turret{dir = 8; emagged = 1; installation = /obj/item/gun/energy/lasercannon},/turf/simulated/floor/reinforced,/area/awaymission/zoo/pirateship) "ag" = (/turf/simulated/floor/reinforced,/area/awaymission/zoo/pirateship) "ah" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"ai" = (/obj/structure/table/marble,/obj/structure/safe/floor,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/card/emag,/obj/item/weapon/beartrap,/obj/item/weapon/grenade/spawnergrenade/spesscarp,/obj/item/weapon/grenade/spawnergrenade/spesscarp,/obj/item/weapon/grenade/spawnergrenade/spesscarp,/obj/item/clothing/glasses/thermal/plain/monocle,/obj/item/stolenpackage,/obj/item/stolenpackage,/obj/item/stolenpackage,/obj/item/stolenpackage,/obj/item/stolenpackage,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/melee/energy/sword/pirate,/turf/space,/area/awaymission/zoo) +"ai" = (/obj/structure/table/marble,/obj/structure/safe/floor,/obj/item/spacecash/c1000,/obj/item/spacecash/c1000,/obj/item/spacecash/c1000,/obj/item/spacecash/c1000,/obj/item/spacecash/c1000,/obj/item/spacecash/c1000,/obj/item/spacecash/c1000,/obj/item/spacecash/c1000,/obj/item/spacecash/c1000,/obj/item/spacecash/c1000,/obj/item/card/emag,/obj/item/beartrap,/obj/item/grenade/spawnergrenade/spesscarp,/obj/item/grenade/spawnergrenade/spesscarp,/obj/item/grenade/spawnergrenade/spesscarp,/obj/item/clothing/glasses/thermal/plain/monocle,/obj/item/stolenpackage,/obj/item/stolenpackage,/obj/item/stolenpackage,/obj/item/stolenpackage,/obj/item/stolenpackage,/obj/item/plastique,/obj/item/plastique,/obj/item/melee/energy/sword/pirate,/turf/space,/area/awaymission/zoo) "aj" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "ak" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "al" = (/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) @@ -14,32 +14,32 @@ "an" = (/obj/machinery/light/small,/turf/simulated/floor/reinforced,/area/awaymission/zoo/pirateship) "ao" = (/obj/machinery/door/airlock/silver{icon_state = "door_locked"; locked = 1},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "ap" = (/obj/structure/bed/roller,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"aq" = (/obj/item/weapon/handcuffs,/obj/item/weapon/handcuffs,/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"ar" = (/obj/item/weapon/surgical/scalpel,/obj/structure/closet/crate,/obj/item/weapon/tank/anesthetic,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"aq" = (/obj/item/handcuffs,/obj/item/handcuffs,/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"ar" = (/obj/item/surgical/scalpel,/obj/structure/closet/crate,/obj/item/tank/anesthetic,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "as" = (/obj/item/bodybag,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"at" = (/obj/item/weapon/storage/box/syringes,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"at" = (/obj/item/storage/box/syringes,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "au" = (/obj/machinery/optable,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "av" = (/obj/machinery/computer/operating,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "aw" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 9},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"ax" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"ay" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"az" = (/obj/structure/table/reinforced,/obj/item/weapon/packageWrap,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"aA" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box,/obj/machinery/light/small{dir = 1},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"ax" = (/obj/structure/closet/crate/freezer,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"ay" = (/obj/structure/closet/crate/freezer,/obj/item/reagent_containers/food/snacks/meat,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"az" = (/obj/structure/table/reinforced,/obj/item/packageWrap,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"aA" = (/obj/structure/table/reinforced,/obj/item/storage/box,/obj/machinery/light/small{dir = 1},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "aB" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "aC" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"aD" = (/obj/item/weapon/storage/box,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"aD" = (/obj/item/storage/box,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "aE" = (/obj/machinery/gateway{dir = 9},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "aF" = (/obj/machinery/gateway{dir = 1},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "aG" = (/obj/machinery/gateway{dir = 5},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"aH" = (/obj/item/weapon/hand_labeler,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"aH" = (/obj/item/hand_labeler,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "aI" = (/obj/structure/largecrate,/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"aJ" = (/obj/structure/table/woodentable,/obj/item/weapon/spacecash/c500,/obj/item/weapon/spacecash/c100,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/wood,/area/awaymission/zoo/pirateship) -"aK" = (/obj/structure/bed,/obj/item/weapon/bedsheet/yellow,/turf/simulated/floor/wood,/area/awaymission/zoo/pirateship) -"aL" = (/obj/structure/table/rack,/obj/item/weapon/tank/oxygen/yellow,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"aJ" = (/obj/structure/table/woodentable,/obj/item/spacecash/c500,/obj/item/spacecash/c100,/obj/item/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/wood,/area/awaymission/zoo/pirateship) +"aK" = (/obj/structure/bed,/obj/item/bedsheet/yellow,/turf/simulated/floor/wood,/area/awaymission/zoo/pirateship) +"aL" = (/obj/structure/table/rack,/obj/item/tank/oxygen/yellow,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "aM" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "aN" = (/obj/structure/sign/vacuum,/turf/simulated/shuttle/wall,/area/awaymission/zoo/pirateship) "aO" = (/obj/item/clothing/glasses/regular/hipster,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"aP" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"aP" = (/obj/structure/closet/crate/freezer,/obj/item/reagent_containers/food/drinks/bottle/small/beer,/obj/item/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "aQ" = (/obj/machinery/gateway{dir = 8},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "aR" = (/obj/machinery/gateway/centeraway{calibrated = 0},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "aS" = (/obj/machinery/gateway{dir = 4},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) @@ -66,19 +66,19 @@ "bn" = (/turf/simulated/shuttle/wall/dark/hard_corner,/area/awaymission/zoo/tradeship) "bo" = (/obj/machinery/door/airlock/external{icon_state = "door_locked"; locked = 1},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "bp" = (/turf/simulated/floor/carpet,/area/awaymission/zoo/pirateship) -"bq" = (/obj/structure/table/reinforced,/obj/item/weapon/tool/screwdriver,/obj/item/weapon/tool/screwdriver,/obj/item/weapon/paper{info = "The next person who takes one of my screwdrivers gets stabbed with one. They are MINE. - Love, Madsen"; name = "scribbled note"},/obj/item/weapon/tool/screwdriver,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) +"bq" = (/obj/structure/table/reinforced,/obj/item/tool/screwdriver,/obj/item/tool/screwdriver,/obj/item/paper{info = "The next person who takes one of my screwdrivers gets stabbed with one. They are MINE. - Love, Madsen"; name = "scribbled note"},/obj/item/tool/screwdriver,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "br" = (/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "bs" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/effect/floor_decal/corner/green{dir = 9},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "bt" = (/obj/structure/sink{dir = 2},/obj/effect/floor_decal/corner/beige{dir = 5},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "bu" = (/obj/machinery/vending/hydroseeds{slogan_delay = 700},/obj/effect/floor_decal/corner/beige{dir = 5},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "bv" = (/obj/machinery/vending/hydronutrients,/obj/effect/floor_decal/corner/beige{dir = 5},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "bw" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/effect/floor_decal/corner/green{dir = 6},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) -"bx" = (/obj/structure/table/reinforced,/obj/item/weapon/material/knife/butch,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/obj/item/weapon/reagent_containers/food/snacks/xenomeat,/obj/item/weapon/reagent_containers/food/snacks/xenomeat,/obj/item/weapon/reagent_containers/food/snacks/xenomeat,/obj/item/weapon/reagent_containers/food/snacks/xenomeat,/obj/item/weapon/reagent_containers/food/snacks/xenomeat,/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) -"by" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/donkpockets,/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) +"bx" = (/obj/structure/table/reinforced,/obj/item/material/knife/butch,/obj/item/reagent_containers/food/drinks/bottle/small/beer,/obj/item/reagent_containers/food/snacks/xenomeat,/obj/item/reagent_containers/food/snacks/xenomeat,/obj/item/reagent_containers/food/snacks/xenomeat,/obj/item/reagent_containers/food/snacks/xenomeat,/obj/item/reagent_containers/food/snacks/xenomeat,/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) +"by" = (/obj/structure/table/reinforced,/obj/item/storage/box/donkpockets,/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) "bz" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) "bA" = (/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) -"bB" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) -"bC" = (/obj/structure/table/reinforced,/obj/item/weapon/material/kitchen/utensil/knife,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) +"bB" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/drinks/bottle/small/beer,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) +"bC" = (/obj/structure/table/reinforced,/obj/item/material/kitchen/utensil/knife,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "bD" = (/obj/structure/table/reinforced,/obj/machinery/light/small{dir = 1},/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "bE" = (/obj/structure/table/reinforced,/obj/effect/decal/cleanable/cobweb2,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "bF" = (/obj/machinery/door/blast/shutters{id = "packerCargo"},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) @@ -89,11 +89,11 @@ "bK" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "bL" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/turf/simulated/floor/airless,/area/awaymission/zoo/tradeship) "bM" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 4},/turf/space,/area/awaymission/zoo/tradeship) -"bN" = (/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) +"bN" = (/obj/item/reagent_containers/food/snacks/hugemushroomslice,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "bO" = (/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) -"bP" = (/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) +"bP" = (/obj/item/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "bQ" = (/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) -"bR" = (/obj/item/weapon/stool,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) +"bR" = (/obj/item/stool,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "bS" = (/obj/structure/kitchenspike,/turf/simulated/floor/tiled/freezer,/area/awaymission/zoo/pirateship) "bT" = (/turf/simulated/floor/tiled/freezer,/area/awaymission/zoo/pirateship) "bU" = (/obj/machinery/door/airlock/silver,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) @@ -102,7 +102,7 @@ "bX" = (/obj/machinery/gibber,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) "bY" = (/obj/machinery/button/remote/airlock{id = "packerCargo"; pixel_y = 24},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "bZ" = (/obj/structure/closet/cabinet,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) -"ca" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/rd,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) +"ca" = (/obj/structure/bed/padded,/obj/item/bedsheet/rd,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "cb" = (/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_alc/full,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "cc" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "cd" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/carpet,/area/awaymission/zoo/tradeship) @@ -111,49 +111,49 @@ "cg" = (/obj/machinery/sleep_console{dir = 8},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "ch" = (/obj/machinery/sleeper{dir = 4},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "ci" = (/obj/structure/shuttle/engine/propulsion{dir = 4},/turf/space,/area/awaymission/zoo/tradeship) -"cj" = (/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) +"cj" = (/obj/item/reagent_containers/food/snacks/hugemushroomslice,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "ck" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "cl" = (/obj/structure/window/reinforced,/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) "cm" = (/obj/machinery/door/window{dir = 2},/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) "cn" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) -"co" = (/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) +"co" = (/obj/item/reagent_containers/food/drinks/bottle/small/beer,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "cp" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/tiled/freezer,/area/awaymission/zoo/pirateship) -"cq" = (/obj/structure/closet/secure_closet/freezer/meat{opened = 1},/obj/item/weapon/reagent_containers/food/snacks/xenomeat,/obj/item/weapon/reagent_containers/food/snacks/xenomeat,/obj/item/weapon/reagent_containers/food/snacks/xenomeat,/obj/item/weapon/reagent_containers/food/snacks/xenomeat,/obj/item/weapon/reagent_containers/food/snacks/xenomeat,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) -"cr" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/xenomeat,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) +"cq" = (/obj/structure/closet/secure_closet/freezer/meat{opened = 1},/obj/item/reagent_containers/food/snacks/xenomeat,/obj/item/reagent_containers/food/snacks/xenomeat,/obj/item/reagent_containers/food/snacks/xenomeat,/obj/item/reagent_containers/food/snacks/xenomeat,/obj/item/reagent_containers/food/snacks/xenomeat,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) +"cr" = (/obj/structure/closet/crate/freezer,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/xenomeat,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) "cs" = (/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) -"ct" = (/obj/item/weapon/tool/crowbar,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) +"ct" = (/obj/item/tool/crowbar,/turf/simulated/floor/tiled/white,/area/awaymission/zoo/pirateship) "cu" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "cv" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "cw" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/awaymission/zoo/tradeship) "cx" = (/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "cy" = (/obj/machinery/door/airlock/silver,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "cz" = (/turf/simulated/floor/carpet,/area/awaymission/zoo/tradeship) -"cA" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets,/turf/simulated/floor/carpet,/area/awaymission/zoo/tradeship) +"cA" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets,/turf/simulated/floor/carpet,/area/awaymission/zoo/tradeship) "cB" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/carpet,/area/awaymission/zoo/tradeship) "cC" = (/obj/machinery/atm{pixel_x = -32},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "cD" = (/obj/machinery/suit_cycler/syndicate,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "cE" = (/obj/machinery/bodyscanner{dir = 8},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "cF" = (/obj/machinery/body_scanconsole,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) -"cG" = (/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/weapon/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/weapon/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/weapon/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/weapon/storage/firstaid/adv{pixel_x = -2},/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/structure/closet/medical_wall{pixel_y = 32},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) +"cG" = (/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/storage/firstaid/toxin,/obj/item/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/storage/firstaid/adv{pixel_x = -2},/obj/item/reagent_containers/blood/empty,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/structure/closet/medical_wall{pixel_y = 32},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "cH" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) -"cI" = (/obj/structure/table/reinforced,/obj/item/weapon/paper/zoo/pirate/volk,/turf/simulated/floor/carpet,/area/awaymission/zoo/pirateship) -"cJ" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/carpet,/area/awaymission/zoo/pirateship) +"cI" = (/obj/structure/table/reinforced,/obj/item/paper/zoo/pirate/volk,/turf/simulated/floor/carpet,/area/awaymission/zoo/pirateship) +"cJ" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/carpet,/area/awaymission/zoo/pirateship) "cK" = (/mob/living/simple_mob/humanoid/pirate,/turf/simulated/floor/carpet,/area/awaymission/zoo/pirateship) "cL" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/effect/floor_decal/corner/green/full,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "cM" = (/obj/effect/floor_decal/corner/green{dir = 10},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "cN" = (/obj/machinery/seed_extractor,/obj/item/seeds/angelmycelium,/obj/effect/floor_decal/corner/green{dir = 10},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "cO" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/effect/floor_decal/corner/green/full{dir = 4},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) -"cP" = (/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/tiled/freezer,/area/awaymission/zoo/pirateship) +"cP" = (/obj/item/reagent_containers/food/snacks/meat,/turf/simulated/floor/tiled/freezer,/area/awaymission/zoo/pirateship) "cQ" = (/obj/machinery/light/small{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) -"cR" = (/obj/item/device/multitool,/turf/simulated/floor/reinforced,/area/awaymission/zoo/pirateship) +"cR" = (/obj/item/multitool,/turf/simulated/floor/reinforced,/area/awaymission/zoo/pirateship) "cS" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/airless,/area/awaymission/zoo/pirateship) "cT" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 4},/turf/space,/area/awaymission/zoo/pirateship) "cU" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/awaymission/zoo/tradeship) "cV" = (/obj/structure/closet/wardrobe/pjs,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) -"cW" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/weapon/pen{pixel_y = 4},/obj/machinery/light,/obj/structure/table/glass,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) -"cX" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/hos,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) +"cW" = (/obj/item/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/pen{pixel_y = 4},/obj/machinery/light,/obj/structure/table/glass,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) +"cX" = (/obj/structure/bed/padded,/obj/item/bedsheet/hos,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "cY" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/carpet,/area/awaymission/zoo/tradeship) -"cZ" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/glasses/square,/turf/simulated/floor/carpet,/area/awaymission/zoo/tradeship) +"cZ" = (/obj/structure/table/standard,/obj/item/storage/box/glasses/square,/turf/simulated/floor/carpet,/area/awaymission/zoo/tradeship) "da" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 32},/turf/simulated/floor/carpet,/area/awaymission/zoo/tradeship) "db" = (/obj/structure/table/steel_reinforced,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "dc" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating,/area/awaymission/zoo/tradeship) @@ -162,7 +162,7 @@ "df" = (/obj/machinery/optable,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "dg" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"; dir = 4},/turf/space,/area/awaymission/zoo/tradeship) "dh" = (/obj/structure/table/reinforced,/obj/machinery/recharger,/turf/simulated/floor/carpet,/area/awaymission/zoo/pirateship) -"di" = (/obj/item/weapon/stool,/turf/simulated/floor/carpet,/area/awaymission/zoo/pirateship) +"di" = (/obj/item/stool,/turf/simulated/floor/carpet,/area/awaymission/zoo/pirateship) "dj" = (/obj/machinery/light/small{dir = 8},/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "dk" = (/obj/machinery/light/small{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "dl" = (/turf/simulated/wall/r_wall,/area/awaymission/zoo/pirateship) @@ -187,8 +187,8 @@ "dE" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "dF" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "dG" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"dH" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/reagent_containers/food/snacks/xenomeat,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"dI" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/lights,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) +"dH" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/item/reagent_containers/food/snacks/xenomeat,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"dI" = (/obj/structure/table/rack,/obj/item/storage/box/lights,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "dJ" = (/mob/living/simple_mob/humanoid/pirate,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "dK" = (/obj/machinery/power/fractal_reactor/fluff/converter{mapped_in = 1; power_generation_rate = 10000},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "dL" = (/obj/machinery/power/terminal{dir = 8},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) @@ -198,32 +198,32 @@ "dP" = (/obj/machinery/door/window/southleft,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "dQ" = (/obj/machinery/door/window/southright,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "dR" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating,/area/awaymission/zoo/tradeship) -"dS" = (/obj/structure/table/standard,/obj/item/clothing/gloves/sterile,/obj/item/clothing/mask/surgical,/obj/item/weapon/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/circular_saw,/obj/item/stack/nanopaste,/obj/item/weapon/surgical/hemostat{pixel_y = 4},/obj/item/weapon/surgical/cautery{pixel_y = 4},/obj/item/weapon/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/medical/advanced/bruise_pack,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) +"dS" = (/obj/structure/table/standard,/obj/item/clothing/gloves/sterile,/obj/item/clothing/mask/surgical,/obj/item/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/surgical/scalpel,/obj/item/surgical/surgicaldrill,/obj/item/surgical/circular_saw,/obj/item/stack/nanopaste,/obj/item/surgical/hemostat{pixel_y = 4},/obj/item/surgical/cautery{pixel_y = 4},/obj/item/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/medical/advanced/bruise_pack,/obj/item/surgical/bonesetter,/obj/item/surgical/bonegel{pixel_x = 4; pixel_y = 3},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "dT" = (/obj/machinery/iv_drip,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "dU" = (/obj/structure/table/reinforced,/turf/simulated/floor/carpet,/area/awaymission/zoo/pirateship) "dV" = (/obj/structure/bed/chair/office/dark{dir = 8},/turf/simulated/floor/carpet,/area/awaymission/zoo/pirateship) "dW" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "dX" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/blood/xeno,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"dY" = (/obj/effect/decal/cleanable/dirt,/obj/item/weapon/reagent_containers/food/snacks/xenomeat,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"dY" = (/obj/effect/decal/cleanable/dirt,/obj/item/reagent_containers/food/snacks/xenomeat,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "dZ" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"ea" = (/obj/item/weapon/reagent_containers/glass/bucket,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) +"ea" = (/obj/item/reagent_containers/glass/bucket,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "eb" = (/obj/machinery/conveyor_switch/oneway{id = "meatConvey1"},/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "ec" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "ed" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light/small{dir = 1},/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "ee" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/freezer,/area/awaymission/zoo/pirateship) "ef" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/disposalpipe/trunk{dir = 8},/obj/structure/disposaloutlet{dir = 4},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "eg" = (/obj/effect/decal/cleanable/blood/xeno,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"eh" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/utility/full,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) +"eh" = (/obj/structure/table/rack,/obj/item/storage/belt/utility/full,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "ei" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/awaymission/zoo/tradeship) "ej" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/awaymission/zoo/tradeship) "ek" = (/obj/machinery/vending/coffee,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "el" = (/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "em" = (/obj/structure/closet/crate/secure/weapon,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "en" = (/obj/machinery/light/small{dir = 1},/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) -"eo" = (/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/reagent_containers/food/snacks/xenomeat,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"eo" = (/obj/structure/window/reinforced{dir = 8},/obj/item/reagent_containers/food/snacks/xenomeat,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "ep" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"eq" = (/obj/structure/table/rack,/obj/item/weapon/cell/high,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) -"er" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/weapon/pen{pixel_y = 4},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) +"eq" = (/obj/structure/table/rack,/obj/item/cell/high,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) +"er" = (/obj/structure/table/steel_reinforced,/obj/item/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/pen{pixel_y = 4},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "es" = (/obj/structure/table/steel_reinforced,/obj/machinery/newscaster{pixel_x = 32},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "et" = (/obj/structure/toilet,/obj/machinery/light/small{dir = 1},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "eu" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/light/small,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) @@ -234,9 +234,9 @@ "ez" = (/obj/effect/floor_decal/corner/red/diagonal,/mob/living/simple_mob/humanoid/pirate,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "eA" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "eB" = (/mob/living/simple_mob/animal/space/alien{faction = "pirate"},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"eC" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"},/obj/item/weapon/reagent_containers/food/snacks/xenomeat,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"eC" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"},/obj/item/reagent_containers/food/snacks/xenomeat,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "eD" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"eE" = (/obj/item/weapon/reagent_containers/food/snacks/xenomeat,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"eE" = (/obj/item/reagent_containers/food/snacks/xenomeat,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "eF" = (/obj/structure/table/rack,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "eG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/awaymission/zoo/tradeship) "eH" = (/obj/machinery/computer,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) @@ -244,14 +244,14 @@ "eJ" = (/obj/machinery/door/airlock/silver{name = "Toilet"},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "eK" = (/obj/machinery/door/airlock/silver{name = "Restroom"},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "eL" = (/obj/structure/undies_wardrobe,/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/awaymission/zoo/tradeship) -"eM" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) +"eM" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "eN" = (/obj/machinery/door/window/westright{name = "Storefront"; req_access = list(160)},/obj/structure/table/marble,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "eO" = (/obj/structure/bed/chair/office/dark{dir = 8},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) -"eP" = (/obj/item/weapon/tool/wrench,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"eP" = (/obj/item/tool/wrench,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "eQ" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "eR" = (/obj/structure/mopbucket,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"eS" = (/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/material/kitchen/utensil/knife,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"eT" = (/obj/item/weapon/cell/high,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) +"eS" = (/obj/structure/window/reinforced{dir = 4},/obj/item/material/kitchen/utensil/knife,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"eT" = (/obj/item/cell/high,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "eU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/awaymission/zoo/tradeship) "eV" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "eW" = (/obj/machinery/door/airlock/command,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) @@ -260,7 +260,7 @@ "eZ" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "fa" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "fb" = (/obj/machinery/door/window/westleft{name = "Storefront"; req_access = list(160)},/obj/structure/window/reinforced,/obj/structure/table/marble,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) -"fc" = (/obj/machinery/conveyor{dir = 4; id = "meatConvey2"},/obj/item/weapon/material/kitchen/utensil/knife,/turf/simulated/shuttle/plating,/area/awaymission/zoo/pirateship) +"fc" = (/obj/machinery/conveyor{dir = 4; id = "meatConvey2"},/obj/item/material/kitchen/utensil/knife,/turf/simulated/shuttle/plating,/area/awaymission/zoo/pirateship) "fd" = (/obj/machinery/conveyor{dir = 4; id = "meatConvey2"},/obj/structure/plasticflaps,/turf/simulated/shuttle/plating,/area/awaymission/zoo/pirateship) "fe" = (/obj/machinery/conveyor{dir = 4; id = "meatConvey2"},/turf/simulated/shuttle/plating,/area/awaymission/zoo/pirateship) "ff" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) @@ -270,22 +270,22 @@ "fj" = (/obj/item/stack/cable_coil/random,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "fk" = (/obj/machinery/computer/arcade/battle,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "fl" = (/obj/structure/table/steel_reinforced,/obj/structure/flora/pottedplant{icon_state = "plant-09"; name = "Esteban"; pixel_y = 8;},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) -"fm" = (/obj/machinery/vending/assist{contraband = null; name = "Old Vending Machine"; products = list(/obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/signaler = 4, /obj/item/device/assembly/infra = 4, /obj/item/device/assembly/prox_sensor = 4, /obj/item/weapon/handcuffs = 8, /obj/item/device/flash = 4, /obj/item/weapon/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4)},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) -"fn" = (/obj/structure/closet{name = "custodial"},/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/mop,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) +"fm" = (/obj/machinery/vending/assist{contraband = null; name = "Old Vending Machine"; products = list(/obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, /obj/item/assembly/infra = 4, /obj/item/assembly/prox_sensor = 4, /obj/item/handcuffs = 8, /obj/item/flash = 4, /obj/item/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4)},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) +"fn" = (/obj/structure/closet{name = "custodial"},/obj/item/reagent_containers/spray/cleaner,/obj/item/reagent_containers/glass/bucket,/obj/item/mop,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "fo" = (/obj/machinery/vending/sovietsoda,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) -"fp" = (/obj/machinery/light,/obj/structure/table/standard,/obj/item/weapon/soap,/obj/item/weapon/towel{color = "#0000FF"},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) +"fp" = (/obj/machinery/light,/obj/structure/table/standard,/obj/item/soap,/obj/item/towel{color = "#0000FF"},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "fq" = (/obj/machinery/door/airlock/multi_tile/glass{dir = 2},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "fr" = (/obj/machinery/door/window/westright,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "fs" = (/obj/machinery/button/remote/blast_door{id = "trade"; name = "Shop Shutters"; pixel_x = 0; pixel_y = -26},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) -"ft" = (/obj/item/weapon/material/kitchen/utensil/knife,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) +"ft" = (/obj/item/material/kitchen/utensil/knife,/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "fu" = (/obj/machinery/conveyor_switch/oneway{id = "meatConvey2"},/obj/effect/floor_decal/corner/red/diagonal,/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) -"fv" = (/obj/item/weapon/mop,/turf/simulated/floor/tiled/freezer,/area/awaymission/zoo/pirateship) +"fv" = (/obj/item/mop,/turf/simulated/floor/tiled/freezer,/area/awaymission/zoo/pirateship) "fw" = (/obj/structure/reagent_dispensers/fueltank,/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/awaymission/zoo/pirateship) "fx" = (/obj/machinery/vending/boozeomat{req_access = null},/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/awaymission/zoo/tradeship) -"fy" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) -"fz" = (/obj/item/weapon/stool,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"fA" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/tiled/freezer,/area/awaymission/zoo/pirateship) -"fB" = (/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/tiled/freezer,/area/awaymission/zoo/pirateship) +"fy" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) +"fz" = (/obj/item/stool,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"fA" = (/obj/structure/closet/crate/freezer,/obj/item/reagent_containers/food/snacks/meat,/turf/simulated/floor/tiled/freezer,/area/awaymission/zoo/pirateship) +"fB" = (/obj/item/reagent_containers/glass/bucket,/turf/simulated/floor/tiled/freezer,/area/awaymission/zoo/pirateship) "fC" = (/obj/structure/reagent_dispensers,/turf/simulated/floor/tiled/freezer,/area/awaymission/zoo/pirateship) "fD" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/steel_reinforced,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "fE" = (/obj/machinery/door/window/northleft,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) @@ -300,9 +300,9 @@ "fN" = (/obj/structure/largecrate/animal/cat,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "fO" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering"; req_access = list(160)},/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/awaymission/zoo/tradeship) "fP" = (/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) -"fQ" = (/obj/item/weapon/stool,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) -"fR" = (/obj/structure/table/reinforced,/obj/item/weapon/paper{info = "DEAR DAIRY: So we was doing our typpical route when the captain says we've been picking up weird signals on some backwatter planet. Madsen wanted to stay on course but he ain't the captain, so we went out of the way to check it out. There was lots of rocks on the way, but we got to the planet fine. Found a big fancy camp with nobody around and this big metal donut thing with NT stamps all over it right in the middle. Case of beer too. Captain reckons we can pass it off to some buyer in the Syndicate. Ingram says it's bad luck and that someone is going to come look for it but it sounds like better money than selling bad meat to jerky companies."; name = "Old Diary"},/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) -"fS" = (/obj/structure/table/reinforced,/obj/item/weapon/pen/red,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) +"fQ" = (/obj/item/stool,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) +"fR" = (/obj/structure/table/reinforced,/obj/item/paper{info = "DEAR DAIRY: So we was doing our typpical route when the captain says we've been picking up weird signals on some backwatter planet. Madsen wanted to stay on course but he ain't the captain, so we went out of the way to check it out. There was lots of rocks on the way, but we got to the planet fine. Found a big fancy camp with nobody around and this big metal donut thing with NT stamps all over it right in the middle. Case of beer too. Captain reckons we can pass it off to some buyer in the Syndicate. Ingram says it's bad luck and that someone is going to come look for it but it sounds like better money than selling bad meat to jerky companies."; name = "Old Diary"},/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) +"fS" = (/obj/structure/table/reinforced,/obj/item/pen/red,/obj/item/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) "fT" = (/obj/structure/closet,/obj/item/clothing/under/overalls,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) "fU" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/awaymission/zoo/tradeship) "fV" = (/obj/structure/closet/wardrobe/captain,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) @@ -317,21 +317,21 @@ "ge" = (/obj/item/stack/cable_coil/random{amount = 5},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "gf" = (/obj/machinery/computer/arcade,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) "gg" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/shuttle/plating,/area/awaymission/zoo/tradeship) -"gh" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/weapon/pen{pixel_y = 4},/turf/simulated/floor/carpet,/area/awaymission/zoo/tradeship) +"gh" = (/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/pen{pixel_y = 4},/turf/simulated/floor/carpet,/area/awaymission/zoo/tradeship) "gi" = (/obj/structure/table/woodentable,/turf/simulated/floor/carpet,/area/awaymission/zoo/tradeship) -"gj" = (/obj/structure/table/woodentable,/obj/item/device/laptop,/turf/simulated/floor/carpet,/area/awaymission/zoo/tradeship) +"gj" = (/obj/structure/table/woodentable,/obj/item/laptop,/turf/simulated/floor/carpet,/area/awaymission/zoo/tradeship) "gk" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/shuttle/plating,/area/awaymission/zoo/tradeship) "gl" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/shuttle/plating,/area/awaymission/zoo/tradeship) "gm" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/shuttle/plating,/area/awaymission/zoo/tradeship) "gn" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "go" = (/obj/structure/bed,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) -"gp" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/item/weapon/storage/wallet/random,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) +"gp" = (/obj/structure/bed,/obj/item/bedsheet,/obj/item/storage/wallet/random,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) "gq" = (/obj/structure/closet,/obj/item/clothing/under/lawyer/bluesuit,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) "gr" = (/turf/simulated/shuttle/wall/dark/hard_corner,/area/awaymission/zoo/syndieship) "gs" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/blast/shutters{density = 0; icon_state = "shutter0"; id = "syndieshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/awaymission/zoo/syndieship) "gt" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/shutters{density = 0; icon_state = "shutter0"; id = "syndieshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/awaymission/zoo/syndieship) "gu" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/shutters{density = 0; icon_state = "shutter0"; id = "syndieshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/awaymission/zoo/syndieship) -"gv" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/captain,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) +"gv" = (/obj/structure/bed/padded,/obj/item/bedsheet/captain,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "gw" = (/obj/structure/table/glass,/obj/machinery/computer3/wall_comp/telescreen/entertainment{pixel_y = -35},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "gx" = (/obj/structure/filingcabinet/filingcabinet,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "gy" = (/obj/machinery/light,/turf/simulated/floor/carpet,/area/awaymission/zoo/tradeship) @@ -341,11 +341,11 @@ "gC" = (/obj/machinery/vending/engivend,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "gD" = (/obj/machinery/vending/tool,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "gE" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"gF" = (/obj/structure/table/rack,/obj/item/weapon/tank/oxygen/yellow,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"gF" = (/obj/structure/table/rack,/obj/item/tank/oxygen/yellow,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "gG" = (/obj/structure/table/standard,/obj/machinery/recharger,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "gH" = (/obj/machinery/computer,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "gI" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"gJ" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) +"gJ" = (/obj/structure/bed,/obj/item/bedsheet,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) "gK" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) "gL" = (/obj/structure/mirror{pixel_y = 28},/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) "gM" = (/obj/structure/toilet{dir = 8},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) @@ -355,33 +355,33 @@ "gQ" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/plating,/area/awaymission/zoo) "gR" = (/obj/item/clothing/suit/caution,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "gS" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"gT" = (/obj/structure/closet/crate,/obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c200,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) -"gU" = (/obj/structure/closet/crate,/obj/item/weapon/spacecash/c10,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) -"gV" = (/obj/structure/closet/crate,/obj/item/weapon/spacecash/c1000,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) +"gT" = (/obj/structure/closet/crate,/obj/item/spacecash/c10,/obj/item/spacecash/c200,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) +"gU" = (/obj/structure/closet/crate,/obj/item/spacecash/c10,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) +"gV" = (/obj/structure/closet/crate,/obj/item/spacecash/c1000,/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) "gW" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/tiled/steel,/area/awaymission/zoo/pirateship) "gX" = (/obj/machinery/door/airlock/external{icon_state = "door_locked"; locked = 1},/turf/simulated/floor/plating,/area/awaymission/zoo) -"gY" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 2; pixel_y = 3},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"gY" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets{pixel_x = 2; pixel_y = 3},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "gZ" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "ha" = (/obj/machinery/light{dir = 4},/obj/machinery/computer,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "hb" = (/obj/structure/window/phoronreinforced{dir = 1; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/obj/structure/window/phoronreinforced{maxhealth = 10000; name = "robust borosilicate window"},/obj/structure/window/phoronreinforced{dir = 8; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/obj/structure/grille,/obj/structure/window/phoronreinforced{dir = 4; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/turf/simulated/floor/plating,/area/awaymission/zoo) "hc" = (/turf/simulated/floor/plating,/area/awaymission/zoo) "hd" = (/obj/machinery/door/airlock/silver{icon_state = "door_locked"; locked = 1},/turf/simulated/floor,/area/awaymission/zoo/pirateship) -"he" = (/obj/structure/table/standard,/obj/item/stack/material/glass{amount = 15},/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"hf" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_y = -32; subspace_transmission = 1; syndie = 1},/obj/machinery/light,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"hg" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/weapon/pen{pixel_y = 4},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"he" = (/obj/structure/table/standard,/obj/item/stack/material/glass{amount = 15},/obj/item/cell{charge = 100; maxcharge = 15000},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"hf" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_y = -32; subspace_transmission = 1; syndie = 1},/obj/machinery/light,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"hg" = (/obj/structure/table/standard,/obj/item/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/pen{pixel_y = 4},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "hh" = (/obj/structure/window/phoronreinforced{dir = 1; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/obj/structure/window/phoronreinforced{maxhealth = 10000; name = "robust borosilicate window"},/obj/structure/window/phoronreinforced{dir = 8; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/obj/structure/grille,/turf/simulated/floor/plating,/area/awaymission/zoo) "hi" = (/obj/structure/window/phoronreinforced{dir = 1; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/obj/structure/window/phoronreinforced{maxhealth = 10000; name = "robust borosilicate window"},/obj/structure/grille,/turf/simulated/floor/plating,/area/awaymission/zoo) "hj" = (/obj/structure/window/phoronreinforced{dir = 1; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/obj/structure/window/phoronreinforced{maxhealth = 10000; name = "robust borosilicate window"},/obj/structure/window/phoronreinforced{dir = 4; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/obj/structure/grille,/turf/simulated/floor/plating,/area/awaymission/zoo) -"hk" = (/obj/item/weapon/storage/box/matches,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"hk" = (/obj/item/storage/box/matches,/obj/item/storage/fancy/cigarettes/dromedaryco,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "hl" = (/obj/item/poster,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "hm" = (/obj/machinery/door/window/northright,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "hn" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{dir = 4; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/obj/structure/window/phoronreinforced{dir = 1; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/obj/structure/window/phoronreinforced{dir = 8; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/turf/simulated/floor/plating,/area/awaymission/zoo) "ho" = (/obj/structure/flora/pottedplant{icon_state = "plant-24"},/turf/simulated/floor/tiled,/area/awaymission/zoo) "hp" = (/obj/structure/bed/chair,/turf/simulated/floor/tiled,/area/awaymission/zoo) "hq" = (/turf/simulated/floor/tiled,/area/awaymission/zoo) -"hr" = (/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"hr" = (/obj/item/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "hs" = (/obj/structure/flora/pottedplant,/turf/simulated/floor/tiled,/area/awaymission/zoo) -"ht" = (/obj/structure/closet/secure_closet/medical_wall{pixel_x = -32; pixel_y = 0; req_access = list(150)},/obj/item/stack/medical/splint,/obj/item/stack/medical/ointment,/obj/item/stack/medical/ointment,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack,/obj/item/weapon/storage/belt/medical/emt,/obj/item/weapon/storage/belt/medical/emt,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"ht" = (/obj/structure/closet/secure_closet/medical_wall{pixel_x = -32; pixel_y = 0; req_access = list(150)},/obj/item/stack/medical/splint,/obj/item/stack/medical/ointment,/obj/item/stack/medical/ointment,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack,/obj/item/storage/belt/medical/emt,/obj/item/storage/belt/medical/emt,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "hu" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "hv" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "hw" = (/obj/structure/closet/hydrant{pixel_y = 32},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) @@ -398,11 +398,11 @@ "hH" = (/obj/structure/closet,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "hI" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{maxhealth = 10000; name = "robust borosilicate window"},/obj/structure/window/phoronreinforced{dir = 4; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/obj/structure/window/phoronreinforced{dir = 8; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/turf/simulated/floor/plating,/area/awaymission/zoo) "hJ" = (/obj/machinery/recharger/wallcharger{pixel_x = -25},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"hK" = (/obj/structure/closet,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"hL" = (/obj/structure/closet,/obj/item/weapon/reagent_containers/food/snacks/tastybread,/obj/item/weapon/reagent_containers/food/snacks/tastybread,/obj/item/weapon/reagent_containers/food/snacks/tastybread,/obj/item/weapon/reagent_containers/food/snacks/tastybread,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"hK" = (/obj/structure/closet,/obj/item/reagent_containers/food/snacks/liquidfood,/obj/item/reagent_containers/food/snacks/liquidfood,/obj/item/reagent_containers/food/snacks/liquidfood,/obj/item/reagent_containers/food/snacks/liquidfood,/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"hL" = (/obj/structure/closet,/obj/item/reagent_containers/food/snacks/tastybread,/obj/item/reagent_containers/food/snacks/tastybread,/obj/item/reagent_containers/food/snacks/tastybread,/obj/item/reagent_containers/food/snacks/tastybread,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "hM" = (/obj/structure/toilet{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "hN" = (/obj/machinery/flasher{id = "syndieflash"; pixel_x = 0; pixel_y = 28},/obj/machinery/light/small{dir = 1},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"hO" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 0; pixel_y = -32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"hO" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 0; pixel_y = -32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "hP" = (/obj/structure/closet/walllocker/emerglocker{pixel_x = 28},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "hQ" = (/obj/machinery/light/small{dir = 1},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "hR" = (/obj/machinery/door/airlock/external,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) @@ -411,26 +411,26 @@ "hU" = (/obj/machinery/door/window/southright,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "hV" = (/obj/machinery/door/window/northleft,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "hW" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"hX" = (/obj/machinery/vending/assist{contraband = null; name = "AntagCorpVend"; products = list(/obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/signaler = 4, /obj/item/device/assembly/infra = 4, /obj/item/device/assembly/prox_sensor = 4, /obj/item/weapon/handcuffs = 8, /obj/item/device/flash = 4, /obj/item/weapon/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4)},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"hX" = (/obj/machinery/vending/assist{contraband = null; name = "AntagCorpVend"; products = list(/obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, /obj/item/assembly/infra = 4, /obj/item/assembly/prox_sensor = 4, /obj/item/handcuffs = 8, /obj/item/flash = 4, /obj/item/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4)},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "hY" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/awaymission/zoo/syndieship) -"hZ" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"hZ" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "ia" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/button/flasher{id = "syndieflash"; name = "Flasher"; pixel_x = 27; pixel_y = 0;},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "ib" = (/mob/living/simple_mob/animal/passive/cat/kitten{name = "Enola"},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "ic" = (/obj/machinery/suit_cycler/syndicate{locked = 0},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"id" = (/obj/structure/table/standard,/obj/item/weapon/material/kitchen/utensil/knife{pixel_x = -6},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = -1},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 4},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 9},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"id" = (/obj/structure/table/standard,/obj/item/material/kitchen/utensil/knife{pixel_x = -6},/obj/item/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = -1},/obj/item/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 4},/obj/item/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 9},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "ie" = (/obj/machinery/door/window/eastleft,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "if" = (/obj/machinery/door/window/westright,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "ig" = (/obj/structure/closet/syndicate/suit{name = "suit closet"},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "ih" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/tiled,/area/awaymission/zoo) -"ii" = (/obj/structure/closet{name = "custodial"},/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/mop,/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"ii" = (/obj/structure/closet{name = "custodial"},/obj/item/reagent_containers/glass/bucket,/obj/item/mop,/obj/item/reagent_containers/spray/cleaner,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "ij" = (/obj/machinery/door/window/eastright,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "ik" = (/mob/living/simple_mob/hostile/syndicate/ranged{desc = "He doesn't seem like he's looking for a fight."; faction = "neutral"; friendly = "hugs"; name = "Mercenary"},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "il" = (/obj/machinery/door/window/westleft,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "im" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/machinery/sleeper{dir = 8},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "in" = (/obj/machinery/sleep_console,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "io" = (/obj/structure/sign/nosmoking_1{pixel_y = 32},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"ip" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"iq" = (/obj/structure/table/standard,/obj/structure/closet/secure_closet/medical_wall{pixel_y = 32; req_access = list(150)},/obj/item/bodybag,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = -4; pixel_y = 8},/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{pixel_x = 4; pixel_y = 7},/obj/item/weapon/reagent_containers/syringe,/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"ip" = (/obj/structure/table/standard,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"iq" = (/obj/structure/table/standard,/obj/structure/closet/secure_closet/medical_wall{pixel_y = 32; req_access = list(150)},/obj/item/bodybag,/obj/item/reagent_containers/syringe/antiviral,/obj/item/reagent_containers/syringe/antiviral,/obj/item/reagent_containers/syringe/antiviral,/obj/item/reagent_containers/glass/bottle/antitoxin{pixel_x = -4; pixel_y = 8},/obj/item/reagent_containers/glass/bottle/inaprovaline{pixel_x = 4; pixel_y = 7},/obj/item/reagent_containers/syringe,/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "ir" = (/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "is" = (/obj/structure/table/standard,/obj/item/clothing/gloves/yellow,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "it" = (/obj/structure/table/standard,/obj/item/borg/sight/thermal,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) @@ -440,28 +440,28 @@ "ix" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "syndieshutters_infirmary"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/awaymission/zoo/syndieship) "iy" = (/obj/machinery/bodyscanner{dir = 8},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "iz" = (/obj/machinery/body_scanconsole,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"iA" = (/obj/item/weapon/stool/padded,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"iA" = (/obj/item/stool/padded,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "iB" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 4; icon_state = "shutter0"; id = "syndieshutters_workshop"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/awaymission/zoo/syndieship) "iC" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "syndieshutters_infirmary"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/awaymission/zoo/syndieship) "iD" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 4; icon_state = "shutter0"; id = "syndieshutters_workshop"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/awaymission/zoo/syndieship) "iE" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"iF" = (/obj/structure/table/rack,/obj/item/device/multitool,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"iG" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/standard,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/cautery,/obj/item/weapon/surgical/retractor,/obj/item/stack/nanopaste,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"iH" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/standard,/obj/item/weapon/surgical/circular_saw,/obj/item/weapon/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/weapon/surgical/hemostat,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"iI" = (/obj/structure/table/standard,/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/storage/firstaid/toxin{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/firstaid/adv{pixel_x = 1},/obj/item/weapon/storage/firstaid/fire{pixel_x = 1},/obj/item/weapon/storage/firstaid/o2{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/firstaid/regular,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"iF" = (/obj/structure/table/rack,/obj/item/multitool,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"iG" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/standard,/obj/item/surgical/surgicaldrill,/obj/item/surgical/cautery,/obj/item/surgical/retractor,/obj/item/stack/nanopaste,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"iH" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/standard,/obj/item/surgical/circular_saw,/obj/item/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/surgical/hemostat,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"iI" = (/obj/structure/table/standard,/obj/structure/window/reinforced{dir = 8},/obj/item/storage/firstaid/toxin{pixel_x = 3; pixel_y = 3},/obj/item/storage/firstaid/adv{pixel_x = 1},/obj/item/storage/firstaid/fire{pixel_x = 1},/obj/item/storage/firstaid/o2{pixel_x = 3; pixel_y = 3},/obj/item/storage/firstaid/regular,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "iJ" = (/obj/structure/table/standard,/obj/item/roller,/obj/item/roller,/obj/item/roller,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"iK" = (/obj/item/weapon/weldingtool,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"iK" = (/obj/item/weldingtool,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "iL" = (/obj/structure/sign/securearea{name = "CAUTION"; pixel_x = 32},/obj/machinery/light{dir = 4},/obj/structure/mopbucket,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "iM" = (/obj/machinery/telecomms/allinone{intercept = 1},/obj/machinery/door/window/northright{name = "Telecoms Mainframe"; req_access = list(150)},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "iN" = (/obj/machinery/door/blast/regular{id = "syndieshutters_telebay"; name = "Outer Airlock"},/turf/simulated/shuttle/plating,/area/awaymission/zoo/syndieship) "iO" = (/obj/machinery/light/small{dir = 8},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"iP" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/closet/secure_closet/medical_wall{pixel_x = 32; pixel_y = 0; req_access = list(150)},/obj/item/weapon/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/gloves/sterile,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"iP" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/closet/secure_closet/medical_wall{pixel_x = 32; pixel_y = 0; req_access = list(150)},/obj/item/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/gloves/sterile,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/glass/bottle/stoxin,/obj/item/reagent_containers/glass/bottle/stoxin,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "iQ" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"iR" = (/obj/item/weapon/tool/crowbar,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"iR" = (/obj/item/tool/crowbar,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "iS" = (/obj/structure/sign/nosmoking_2{pixel_x = 32},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "iT" = (/obj/machinery/iv_drip,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "iU" = (/obj/machinery/optable,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"iV" = (/obj/structure/table/standard,/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/obj/item/stack/medical/advanced/bruise_pack,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"iV" = (/obj/structure/table/standard,/obj/item/surgical/scalpel,/obj/item/surgical/bonesetter,/obj/item/surgical/bonegel{pixel_x = 4; pixel_y = 3},/obj/item/stack/medical/advanced/bruise_pack,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "iW" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/airless,/area/awaymission/zoo/syndieship) "iX" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"},/turf/space,/area/awaymission/zoo/syndieship) "iY" = (/obj/structure/shuttle/engine/propulsion,/turf/space,/area/awaymission/zoo/syndieship) @@ -568,10 +568,10 @@ "kV" = (/mob/living/simple_mob/animal/passive/cat{faction = "zoo"},/turf/simulated/floor/wood,/area/awaymission/zoo) "kW" = (/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) "kX" = (/obj/structure/table/marble,/turf/simulated/floor/holofloor/lino,/area/awaymission/zoo) -"kY" = (/obj/structure/table/marble,/obj/item/weapon/pen/multi,/turf/simulated/floor/holofloor/lino,/area/awaymission/zoo) +"kY" = (/obj/structure/table/marble,/obj/item/pen/multi,/turf/simulated/floor/holofloor/lino,/area/awaymission/zoo) "kZ" = (/obj/effect/floor_decal/corner/green{dir = 6},/turf/simulated/floor/tiled,/area/awaymission/zoo) "la" = (/turf/simulated/floor/beach/water{icon_state = "seadeep"},/area/awaymission/zoo) -"lb" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 5},/obj/item/weapon/coin/gold,/turf/simulated/floor/beach/water{icon_state = "seadeep"},/area/awaymission/zoo) +"lb" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 5},/obj/item/coin/gold,/turf/simulated/floor/beach/water{icon_state = "seadeep"},/area/awaymission/zoo) "lc" = (/obj/effect/floor_decal/corner/green{dir = 9},/turf/simulated/floor/tiled,/area/awaymission/zoo) "ld" = (/obj/structure/flora/ausbushes/sunnybush,/turf/simulated/floor/holofloor/grass,/area/awaymission/zoo) "le" = (/mob/living/simple_mob/bird/hooded_too{faction = "zoo"},/turf/simulated/floor/holofloor/grass,/area/awaymission/zoo) @@ -586,13 +586,13 @@ "ln" = (/obj/effect/landmark/away,/turf/simulated/floor/wood,/area/awaymission/zoo) "lo" = (/obj/machinery/door/airlock/glass{icon_state = "door_closed"; locked = 0; name = "Exhibit Airlock"},/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) "lp" = (/obj/structure/table/rack,/obj/random/action_figure,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) -"lq" = (/obj/structure/table/rack,/obj/item/weapon/storage/fancy/crayons,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) +"lq" = (/obj/structure/table/rack,/obj/item/storage/fancy/crayons,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) "lr" = (/obj/structure/table/rack,/obj/random/plushie,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) "ls" = (/obj/structure/table/marble,/obj/item/toy/nanotrasenballoon,/turf/simulated/floor/holofloor/lino,/area/awaymission/zoo) "lt" = (/obj/structure/table/marble,/obj/machinery/cash_register{icon_state = "register_idle"; dir = 1},/turf/simulated/floor/holofloor/lino,/area/awaymission/zoo) -"lu" = (/obj/structure/table/rack,/obj/item/device/camera_film,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) -"lv" = (/obj/structure/table/rack,/obj/item/weapon/storage/photo_album,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) -"lw" = (/obj/structure/table/rack,/obj/item/device/camera_film,/obj/item/device/camera,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) +"lu" = (/obj/structure/table/rack,/obj/item/camera_film,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) +"lv" = (/obj/structure/table/rack,/obj/item/storage/photo_album,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) +"lw" = (/obj/structure/table/rack,/obj/item/camera_film,/obj/item/camera,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) "lx" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/turf/simulated/floor/beach/water{icon_state = "seadeep"},/area/awaymission/zoo) "ly" = (/obj/effect/floor_decal/spline/plain{icon_state = "spline_plain_full"; dir = 1},/obj/structure/showcase{name = "Statue"; desc = "It looks almost lifelike."; icon = 'icons/obj/statue.dmi'; icon_state = "monkey"},/turf/simulated/floor/grass,/area/awaymission/zoo) "lz" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/turf/simulated/floor/beach/water{icon_state = "seadeep"},/area/awaymission/zoo) @@ -602,7 +602,7 @@ "lD" = (/obj/structure/table/marble,/obj/machinery/cash_register{icon_state = "register_idle"; dir = 1},/turf/simulated/floor/tiled/white,/area/awaymission/zoo) "lE" = (/mob/living/simple_mob/animal/passive/chick,/turf/simulated/floor/wood,/area/awaymission/zoo) "lF" = (/obj/effect/floor_decal/spline/fancy/wood{icon_state = "spline_fancy"; dir = 10},/turf/simulated/floor/beach/water{icon_state = "seadeep"},/area/awaymission/zoo) -"lG" = (/obj/item/weapon/coin/silver,/turf/simulated/floor/beach/water{icon_state = "seadeep"},/area/awaymission/zoo) +"lG" = (/obj/item/coin/silver,/turf/simulated/floor/beach/water{icon_state = "seadeep"},/area/awaymission/zoo) "lH" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 6},/turf/simulated/floor/beach/water{icon_state = "seadeep"},/area/awaymission/zoo) "lI" = (/mob/living/simple_mob/bird/green_budgerigar{faction = "zoo"},/turf/simulated/floor/holofloor/grass,/area/awaymission/zoo) "lJ" = (/obj/structure/flora/ausbushes/sunnybush,/mob/living/simple_mob/bird/cockatiel{faction = "zoo"},/turf/simulated/floor/holofloor/grass,/area/awaymission/zoo) @@ -613,12 +613,12 @@ "lO" = (/obj/structure/table/rack,/obj/item/toy/cultsword,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) "lP" = (/obj/structure/table/rack,/obj/item/toy/crossbow,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) "lQ" = (/obj/structure/table/rack,/obj/item/toy/bosunwhistle,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) -"lR" = (/obj/structure/table/rack,/obj/item/weapon/storage/wallet/poly,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) -"lS" = (/obj/structure/table/rack,/obj/item/weapon/storage/pill_bottle/dice_nerd,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) -"lT" = (/obj/structure/table/rack,/obj/item/weapon/beach_ball,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) -"lU" = (/obj/structure/table/rack,/obj/item/weapon/soap/deluxe,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) -"lV" = (/obj/structure/table/rack,/obj/item/device/binoculars,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) -"lW" = (/obj/structure/table/rack,/obj/item/weapon/storage/backpack/clown,/obj/item/clothing/shoes/rainbow,/obj/item/clothing/under/color/rainbow,/obj/item/clothing/under/seromi/rainbow,/obj/item/clothing/gloves/rainbow,/obj/item/clothing/head/soft/rainbow,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) +"lR" = (/obj/structure/table/rack,/obj/item/storage/wallet/poly,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) +"lS" = (/obj/structure/table/rack,/obj/item/storage/pill_bottle/dice_nerd,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) +"lT" = (/obj/structure/table/rack,/obj/item/beach_ball,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) +"lU" = (/obj/structure/table/rack,/obj/item/soap/deluxe,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) +"lV" = (/obj/structure/table/rack,/obj/item/binoculars,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) +"lW" = (/obj/structure/table/rack,/obj/item/storage/backpack/clown,/obj/item/clothing/shoes/rainbow,/obj/item/clothing/under/color/rainbow,/obj/item/clothing/under/seromi/rainbow,/obj/item/clothing/gloves/rainbow,/obj/item/clothing/head/soft/rainbow,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo) "lX" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/beach/water,/area/awaymission/zoo) "lY" = (/obj/effect/floor_decal/corner/green/full{dir = 1},/turf/simulated/floor/tiled,/area/awaymission/zoo) "lZ" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 2},/turf/simulated/floor/beach/water{icon_state = "seadeep"},/area/awaymission/zoo) @@ -712,9 +712,9 @@ "nJ" = (/obj/effect/overlay/palmtree_l,/turf/simulated/floor/holofloor/beach/sand,/area/awaymission/zoo) "nK" = (/turf/simulated/floor/holofloor/beach/water{icon_state = "beachcorner"; dir = 2},/area/awaymission/zoo) "nL" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/awaymission/zoo) -"nM" = (/obj/structure/table/reinforced,/obj/item/weapon/pen/blue,/obj/item/weapon/pen/red{pixel_x = -5; pixel_y = -1},/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/turf/simulated/floor/lino,/area/awaymission/zoo) -"nN" = (/obj/structure/table/reinforced,/obj/item/weapon/folder{pixel_x = -4},/obj/item/weapon/folder/red{pixel_y = 3},/obj/item/weapon/folder/blue{pixel_x = 5},/obj/item/weapon/folder/yellow,/obj/item/weapon/stamp/internalaffairs,/obj/item/weapon/stamp/denied{pixel_x = 4; pixel_y = -2},/turf/simulated/floor/lino,/area/awaymission/zoo) -"nO" = (/obj/structure/table/reinforced,/obj/item/device/flashlight/lamp,/turf/simulated/floor/lino,/area/awaymission/zoo) +"nM" = (/obj/structure/table/reinforced,/obj/item/pen/blue,/obj/item/pen/red{pixel_x = -5; pixel_y = -1},/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/turf/simulated/floor/lino,/area/awaymission/zoo) +"nN" = (/obj/structure/table/reinforced,/obj/item/folder{pixel_x = -4},/obj/item/folder/red{pixel_y = 3},/obj/item/folder/blue{pixel_x = 5},/obj/item/folder/yellow,/obj/item/stamp/internalaffairs,/obj/item/stamp/denied{pixel_x = 4; pixel_y = -2},/turf/simulated/floor/lino,/area/awaymission/zoo) +"nO" = (/obj/structure/table/reinforced,/obj/item/flashlight/lamp,/turf/simulated/floor/lino,/area/awaymission/zoo) "nP" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/sign/kiddieplaque{desc = "Not to be confused with the common Earth bat, the Space Bat is a mammalian-like creature that is capable of surviving in the vacuum of space! These creatures live and fly in groups, and are most commonly found in caves, such as those on asteroids, or small planetary bodies with light gravity and no atmosphere. These creatures survive by sucking the blood of wayward space travelers, and are considered to be a pest by the Free Trade Union for their habit of infesting space ships sitting at dock. Their origin is currently unknown."; name = "Space Bat Exhibit"},/turf/simulated/floor/plating,/area/awaymission/zoo) "nQ" = (/obj/structure/flora/ausbushes/sunnybush,/turf/simulated/floor/holofloor/beach/sand{icon_state = "fullgrass1"},/area/awaymission/zoo) "nR" = (/obj/structure/flora/ausbushes/fernybush,/turf/simulated/floor/holofloor/beach/sand{icon_state = "fullgrass0"},/area/awaymission/zoo) @@ -871,13 +871,13 @@ "qM" = (/obj/structure/flora/ausbushes/ywflowers,/turf/simulated/floor/grass,/area/awaymission/zoo) "qN" = (/obj/structure/flora/ausbushes/ywflowers,/obj/effect/floor_decal/spline/fancy/wood/corner{dir = 1},/turf/simulated/floor/grass,/area/awaymission/zoo) "qO" = (/obj/item/trash/syndi_cakes,/turf/simulated/floor/plating,/area/awaymission/zoo) -"qP" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/plating,/area/awaymission/zoo) +"qP" = (/obj/item/stool/padded,/turf/simulated/floor/plating,/area/awaymission/zoo) "qQ" = (/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/awaymission/zoo) "qR" = (/mob/living/simple_mob/animal/passive/mouse{faction = "zoo"},/turf/simulated/floor/plating,/area/awaymission/zoo) "qS" = (/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/plating,/area/awaymission/zoo) "qT" = (/obj/item/trash/chips,/turf/simulated/floor/plating,/area/awaymission/zoo) -"qU" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/awaymission/zoo) -"qV" = (/obj/structure/table/rack{dir = 1},/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/device/flashlight,/turf/simulated/floor/plating,/area/awaymission/zoo) +"qU" = (/obj/structure/table/rack,/obj/item/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/awaymission/zoo) +"qV" = (/obj/structure/table/rack{dir = 1},/obj/item/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/flashlight,/turf/simulated/floor/plating,/area/awaymission/zoo) "qW" = (/obj/machinery/floodlight,/turf/simulated/floor,/area/awaymission/zoo) "qX" = (/obj/structure/flora/ausbushes/fullgrass,/turf/simulated/floor/holofloor/snow,/area/awaymission/zoo) "qY" = (/obj/structure/flora/ausbushes/palebush,/turf/simulated/floor/holofloor/snow,/area/awaymission/zoo) @@ -1127,20 +1127,20 @@ "vI" = (/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) "vJ" = (/obj/structure/bed/chair,/turf/simulated/floor/tiled/white,/area/awaymission/zoo) "vK" = (/obj/structure/table/glass,/turf/simulated/floor/tiled/white,/area/awaymission/zoo) -"vL" = (/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/weapon/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/weapon/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/weapon/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/weapon/storage/firstaid/adv{pixel_x = -2},/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/structure/closet/medical_wall{pixel_y = 32},/obj/item/weapon/storage/firstaid/combat,/turf/simulated/floor/tiled/white,/area/awaymission/zoo) +"vL" = (/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/storage/firstaid/toxin,/obj/item/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/storage/firstaid/adv{pixel_x = -2},/obj/item/reagent_containers/blood/empty,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/structure/closet/medical_wall{pixel_y = 32},/obj/item/storage/firstaid/combat,/turf/simulated/floor/tiled/white,/area/awaymission/zoo) "vM" = (/obj/machinery/sleeper{dir = 8},/turf/simulated/floor/tiled/white,/area/awaymission/zoo) "vN" = (/obj/machinery/sleep_console{dir = 8},/turf/simulated/floor/tiled/white,/area/awaymission/zoo) "vO" = (/obj/machinery/bodyscanner{dir = 8},/turf/simulated/floor/tiled/white,/area/awaymission/zoo) "vP" = (/obj/machinery/body_scanconsole,/turf/simulated/floor/tiled/white,/area/awaymission/zoo) "vQ" = (/obj/structure/curtain/open/privacy,/turf/simulated/floor/tiled/white,/area/awaymission/zoo) "vR" = (/obj/machinery/optable,/turf/simulated/floor/tiled/white,/area/awaymission/zoo) -"vS" = (/obj/structure/table/standard,/obj/item/clothing/gloves/sterile,/obj/item/clothing/mask/surgical,/obj/item/weapon/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/circular_saw,/obj/item/stack/nanopaste,/obj/item/weapon/surgical/hemostat{pixel_y = 4},/obj/item/weapon/surgical/cautery{pixel_y = 4},/obj/item/weapon/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/medical/advanced/bruise_pack,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/turf/simulated/floor/tiled/white,/area/awaymission/zoo) +"vS" = (/obj/structure/table/standard,/obj/item/clothing/gloves/sterile,/obj/item/clothing/mask/surgical,/obj/item/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/surgical/scalpel,/obj/item/surgical/surgicaldrill,/obj/item/surgical/circular_saw,/obj/item/stack/nanopaste,/obj/item/surgical/hemostat{pixel_y = 4},/obj/item/surgical/cautery{pixel_y = 4},/obj/item/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/medical/advanced/bruise_pack,/obj/item/surgical/bonesetter,/obj/item/surgical/bonegel{pixel_x = 4; pixel_y = 3},/turf/simulated/floor/tiled/white,/area/awaymission/zoo) "vT" = (/obj/machinery/iv_drip,/turf/simulated/floor/tiled/white,/area/awaymission/zoo) "vU" = (/obj/structure/table/standard,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) "vV" = (/obj/machinery/computer,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) "vW" = (/obj/structure/closet,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) "vX" = (/obj/structure/closet,/obj/item/clothing/under/captain_fly,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) -"vY" = (/obj/structure/table/standard,/obj/item/weapon/paper/zoo/pirate/haveyouseen,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) +"vY" = (/obj/structure/table/standard,/obj/item/paper/zoo/pirate/haveyouseen,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) "vZ" = (/obj/machinery/shield_gen/external,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/plating,/area/awaymission/zoo) "wa" = (/obj/machinery/shield_gen/external,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor,/area/awaymission/zoo) "wb" = (/obj/machinery/shield_gen,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor,/area/awaymission/zoo) @@ -1164,7 +1164,7 @@ "wt" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EMPLOYEES ONLY'."; name = "EMPLOYEES ONLY"; pixel_x = -32},/turf/simulated/floor/tiled,/area/awaymission/zoo) "wu" = (/obj/structure/symbol/gu{pixel_x = 32},/turf/simulated/floor/tiled,/area/awaymission/zoo) "wv" = (/obj/structure/bed/chair/office/dark{dir = 1},/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) -"ww" = (/obj/structure/table/standard,/obj/item/weapon/paper/zoo/pirate/warning,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) +"ww" = (/obj/structure/table/standard,/obj/item/paper/zoo/pirate/warning,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) "wx" = (/obj/structure/sign/electricshock,/turf/simulated/wall/durasteel,/area/awaymission/zoo) "wy" = (/obj/machinery/shield_capacitor,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/plating,/area/awaymission/zoo) "wz" = (/obj/machinery/shield_capacitor,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor,/area/awaymission/zoo) @@ -1190,13 +1190,13 @@ "wT" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/landmark/loot_spawn,/obj/structure/symbol/da{pixel_x = -32},/turf/simulated/floor/plating,/area/awaymission/zoo) "wU" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/tiled/white,/area/awaymission/zoo) "wV" = (/obj/structure/coatrack,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) -"wW" = (/obj/structure/filingcabinet/filingcabinet,/obj/item/weapon/paper/zoo,/obj/item/weapon/paper/zoo,/obj/item/weapon/paper/zoo,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) -"wX" = (/obj/structure/filingcabinet/filingcabinet,/obj/item/weapon/paper/zoo,/obj/item/weapon/paper/zoo,/obj/item/weapon/paper/zoo,/obj/item/weapon/paper/zoo/pirate/nebula,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) +"wW" = (/obj/structure/filingcabinet/filingcabinet,/obj/item/paper/zoo,/obj/item/paper/zoo,/obj/item/paper/zoo,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) +"wX" = (/obj/structure/filingcabinet/filingcabinet,/obj/item/paper/zoo,/obj/item/paper/zoo,/obj/item/paper/zoo,/obj/item/paper/zoo/pirate/nebula,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) "wY" = (/obj/structure/symbol/da{pixel_x = 32},/turf/simulated/floor/tiled,/area/awaymission/zoo) "wZ" = (/obj/machinery/floodlight,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor,/area/awaymission/zoo) "xa" = (/obj/machinery/power/emitter,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor,/area/awaymission/zoo) "xb" = (/obj/structure/closet/crate,/obj/item/stack/material/phoron{amount = 25},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/plating,/area/awaymission/zoo) -"xc" = (/obj/structure/closet/crate/solar,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/weapon/cell/crap,/obj/item/weapon/cell/crap,/obj/item/weapon/cell/crap,/turf/simulated/floor,/area/awaymission/zoo) +"xc" = (/obj/structure/closet/crate/solar,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/cell/crap,/obj/item/cell/crap,/obj/item/cell/crap,/turf/simulated/floor,/area/awaymission/zoo) "xd" = (/obj/machinery/vending/tool,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) "xe" = (/obj/machinery/vending/engivend,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) "xf" = (/obj/machinery/door/window/brigdoor/northleft,/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/table/rack,/obj/random/ammo_all,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) diff --git a/maps/gateway_archive_vr/zresearchlabs.dmm b/maps/gateway_archive_vr/zresearchlabs.dmm index 8c3606b6b4a..e0e6bca85b9 100644 --- a/maps/gateway_archive_vr/zresearchlabs.dmm +++ b/maps/gateway_archive_vr/zresearchlabs.dmm @@ -17,9 +17,9 @@ "aq" = (/obj/machinery/door/airlock/maintenance_hatch{name = "Underground Maintenance"},/turf/simulated/floor/plating,/area/awaymission/labs/cave) "ar" = (/obj/effect/critter/fleshmonster,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/awaymission/labs/cave) "as" = (/obj/effect/critter/fleshmonster,/turf/simulated/floor/plating,/area/awaymission/labs/cave) -"at" = (/obj/structure/table/standard,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stack/cable_coil,/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/turf/simulated/floor/plating,/area/awaymission/labs/cave) -"au" = (/obj/structure/table/standard,/obj/item/weapon/folder/yellow,/obj/item/clothing/ears/earmuffs{pixel_x = -3; pixel_y = -2},/turf/simulated/floor/plating,/area/awaymission/labs/cave) -"av" = (/obj/structure/table/standard,/obj/item/weapon/camera_assembly,/turf/simulated/floor/plating,/area/awaymission/labs/cave) +"at" = (/obj/structure/table/standard,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stack/cable_coil,/obj/item/airlock_electronics,/obj/item/airlock_electronics,/turf/simulated/floor/plating,/area/awaymission/labs/cave) +"au" = (/obj/structure/table/standard,/obj/item/folder/yellow,/obj/item/clothing/ears/earmuffs{pixel_x = -3; pixel_y = -2},/turf/simulated/floor/plating,/area/awaymission/labs/cave) +"av" = (/obj/structure/table/standard,/obj/item/camera_assembly,/turf/simulated/floor/plating,/area/awaymission/labs/cave) "aw" = (/obj/machinery/power/port_gen,/turf/simulated/floor/plating,/area/awaymission/labs/cave) "ax" = (/obj/effect/decal/cleanable/dirt,/obj/effect/alien/flesh/weeds/node,/turf/simulated/floor/plating,/area/awaymission/labs/cave) "ay" = (/obj/machinery/artifact,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/awaymission/labs/cave) @@ -27,8 +27,8 @@ "aA" = (/obj/structure/reagent_dispensers/fueltank,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/awaymission/labs/cave) "aB" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/awaymission/labs/cave) "aC" = (/obj/structure/table/standard,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/awaymission/labs/cave) -"aD" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/belt/utility,/obj/item/weapon/tool/wrench,/obj/item/weapon/weldingtool,/obj/item/clothing/head/welding{pixel_x = -3; pixel_y = 5},/turf/simulated/floor/plating,/area/awaymission/labs/cave) -"aE" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/gloves/yellow,/obj/item/weapon/storage/belt/utility,/turf/simulated/floor/plating,/area/awaymission/labs/cave) +"aD" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/storage/belt/utility,/obj/item/tool/wrench,/obj/item/weldingtool,/obj/item/clothing/head/welding{pixel_x = -3; pixel_y = 5},/turf/simulated/floor/plating,/area/awaymission/labs/cave) +"aE" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/gloves/yellow,/obj/item/storage/belt/utility,/turf/simulated/floor/plating,/area/awaymission/labs/cave) "aF" = (/obj/structure/closet/radiation,/turf/simulated/floor/plating,/area/awaymission/labs/cave) "aG" = (/obj/structure/closet/secure_closet/engineering_electrical,/turf/simulated/floor/plating,/area/awaymission/labs/cave) "aH" = (/obj/structure/closet/secure_closet/engineering_welding,/turf/simulated/floor/plating,/area/awaymission/labs/cave) @@ -36,7 +36,7 @@ "aJ" = (/obj/structure/table/standard,/obj/item/stack/cable_coil{pixel_x = -1; pixel_y = 7},/obj/item/stack/cable_coil{pixel_x = 0; pixel_y = 3},/obj/item/stack/cable_coil{pixel_x = 0; pixel_y = 0},/turf/simulated/floor/plating,/area/awaymission/labs/cave) "aK" = (/obj/structure/table/standard,/turf/simulated/floor/plating,/area/awaymission/labs/cave) "aL" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/obj/machinery/camera{c_tag = "Engineering SMES Room"; dir = 4; network = "SS13"},/turf/simulated/floor/plating,/area/awaymission/labs/cave) -"aM" = (/obj/structure/table/standard,/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/module/power_control,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/machinery/light,/turf/simulated/floor/plating,/area/awaymission/labs/cave) +"aM" = (/obj/structure/table/standard,/obj/item/airlock_electronics,/obj/item/airlock_electronics,/obj/item/module/power_control,/obj/item/cell/high{charge = 100; maxcharge = 15000},/obj/item/cell/high{charge = 100; maxcharge = 15000},/obj/machinery/light,/turf/simulated/floor/plating,/area/awaymission/labs/cave) "aN" = (/obj/effect/alien/flesh/weeds/node,/turf/unsimulated/desert,/area/awaymission/labs/cave) "aO" = (/obj/effect/critter/fleshmonster/fleshslime,/turf/unsimulated/desert,/area/awaymission/labs/cave) "aP" = (/obj/machinery/door/airlock/engineering,/turf/simulated/floor/plating,/area/awaymission/labs/cave) @@ -46,21 +46,21 @@ "aT" = (/obj/machinery/computer/mech_bay_power_console,/turf/simulated/floor/plating,/area/awaymission/labs/cave) "aU" = (/obj/effect/critter/fleshmonster,/turf/unsimulated/desert,/area/awaymission/labs/cave) "aV" = (/obj/structure/ore_box,/turf/unsimulated/desert,/area/awaymission/labs/cave) -"aW" = (/obj/item/weapon/rack_parts,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) +"aW" = (/obj/item/rack_parts,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) "aX" = (/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) "aY" = (/obj/effect/alien/flesh/weeds/node,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) -"aZ" = (/obj/item/weapon/weldingtool,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) +"aZ" = (/obj/item/weldingtool,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) "ba" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) "bb" = (/obj/item/apc_frame,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) "bc" = (/obj/structure/closet/toolcloset,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) "bd" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) -"be" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) +"be" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) "bf" = (/obj/structure/table/standard,/obj/item/blueprints,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) -"bg" = (/obj/structure/table/standard,/obj/item/weapon/camera_assembly,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) +"bg" = (/obj/structure/table/standard,/obj/item/camera_assembly,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) "bh" = (/obj/structure/girder,/turf/simulated/floor/plating,/area/awaymission/labs/cave) "bi" = (/obj/effect/decal/cleanable/blood,/obj/effect/decal/cleanable/dirt,/obj/effect/landmark/corpse/alien/laborer,/turf/simulated/floor/plating,/area/awaymission/labs/cave) "bj" = (/obj/effect/critter/fleshmonster,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) -"bk" = (/obj/structure/table/standard,/obj/item/stack/cable_coil{pixel_x = -1; pixel_y = 7},/obj/item/weapon/circuitboard/autolathe,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) +"bk" = (/obj/structure/table/standard,/obj/item/stack/cable_coil{pixel_x = -1; pixel_y = 7},/obj/item/circuitboard/autolathe,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) "bl" = (/obj/effect/decal/cleanable/blood/tracks,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) "bm" = (/obj/structure/door_assembly/door_assembly_research,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) "bn" = (/obj/structure/table,/turf/simulated/floor/plating,/area/awaymission/labs/cave) @@ -99,18 +99,18 @@ "bU" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/effect/alien/flesh/weeds/node,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "bV" = (/obj/effect/critter/fleshmonster/fleshslime,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) "bW" = (/obj/machinery/door/airlock/freezer,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) -"bX" = (/obj/item/weapon/storage/lightbox/mixed{pixel_x = 21; pixel_y = 14},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) -"bY" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) +"bX" = (/obj/item/storage/lightbox/mixed{pixel_x = 21; pixel_y = 14},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) +"bY" = (/obj/item/storage/toolbox/mechanical,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) "bZ" = (/obj/structure/door_assembly/door_assembly_research/glass,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) "ca" = (/obj/effect/decal/cleanable/blood,/obj/effect/landmark/corpse/alien/laborer,/turf/simulated/floor/plating,/area/awaymission/labs/cave) "cb" = (/turf/simulated/floor{dir = 4; icon_state = "warnwhite"},/area/awaymission/labs/researchdivision) "cc" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; frequency = 1379; id_tag = "medsci_pump"; on = 1},/obj/effect/alien/flesh/weeds/node,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) "cd" = (/obj/machinery/dna_scanner,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) -"ce" = (/obj/structure/table/reinforced,/obj/item/device/flashlight/lamp,/obj/item/weapon/paper{icon_state = "paper_words"; info = "One of the commandos was brought in earlier with the most peculiar growth on his arm. He had complained to their physician about it a few days ago, but it has mutated signifcantly since then. That was the arm he was injected with the nanoaugmentation, so they simply cannot be coincidence. This mutation is nothing like anything we've ever seen. The flesh appears to be reshaping itself, repurposing his arm in some way. His cell structure, bone structure, everything is changing rapidly into something totally unknown. He will be kept here for further study."; name = "Mutation"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"ce" = (/obj/structure/table/reinforced,/obj/item/flashlight/lamp,/obj/item/paper{icon_state = "paper_words"; info = "One of the commandos was brought in earlier with the most peculiar growth on his arm. He had complained to their physician about it a few days ago, but it has mutated signifcantly since then. That was the arm he was injected with the nanoaugmentation, so they simply cannot be coincidence. This mutation is nothing like anything we've ever seen. The flesh appears to be reshaping itself, repurposing his arm in some way. His cell structure, bone structure, everything is changing rapidly into something totally unknown. He will be kept here for further study."; name = "Mutation"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "cf" = (/obj/structure/stool/bed/chair/office/light{dir = 4},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) "cg" = (/obj/machinery/computer/scan_consolenew,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) "ch" = (/obj/machinery/power/port_gen,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/cave) -"ci" = (/obj/structure/table/reinforced,/obj/item/device/antibody_scanner,/obj/item/device/flash,/obj/item/weapon/paper_bin,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"ci" = (/obj/structure/table/reinforced,/obj/item/antibody_scanner,/obj/item/flash,/obj/item/paper_bin,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "cj" = (/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) "ck" = (/obj/machinery/dna_scanner,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) "cl" = (/obj/machinery/power/tracker,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) @@ -122,31 +122,31 @@ "cr" = (/turf/simulated/floor/plating,/area/awaymission/labs/researchdivision) "cs" = (/obj/structure/stool/bed/chair,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "ct" = (/obj/structure/stool/bed/chair,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) -"cu" = (/obj/structure/table/reinforced,/obj/item/device/mass_spectrometer,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) +"cu" = (/obj/structure/table/reinforced,/obj/item/mass_spectrometer,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) "cv" = (/obj/machinery/door/airlock/glass_research,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) "cw" = (/turf/simulated/floor{dir = 8; icon_state = "warnwhitecorner"},/area/awaymission/labs/researchdivision) "cx" = (/turf/simulated/floor{ icon_state = "warnwhite"; dir = 1},/area/awaymission/labs/researchdivision) "cy" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "cz" = (/obj/structure/bookcase,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "cA" = (/obj/structure/toilet,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) -"cB" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"cB" = (/obj/structure/stool/bed,/obj/item/bedsheet,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "cC" = (/obj/effect/decal/cleanable/blood/tracks,/turf/simulated/floor,/area/awaymission/labs/researchdivision) -"cD" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/machinery/light/small{dir = 8},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) -"cE" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/storage/body_bag_box,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) -"cF" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/hypospray,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) -"cG" = (/obj/structure/table/reinforced,/obj/item/weapon/FixOVein,/obj/item/weapon/retractor,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"cD" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/glass/beaker/large,/obj/item/reagent_containers/spray/cleaner,/obj/machinery/light/small{dir = 8},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) +"cE" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/blood/empty,/obj/item/storage/body_bag_box,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) +"cF" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/hypospray,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) +"cG" = (/obj/structure/table/reinforced,/obj/item/FixOVein,/obj/item/retractor,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "cH" = (/obj/machinery/optable,/obj/item/stack/sheet/animalhide/lizard,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) -"cI" = (/obj/structure/table/reinforced,/obj/item/weapon/bonesetter,/obj/item/weapon/bonegel,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"cI" = (/obj/structure/table/reinforced,/obj/item/bonesetter,/obj/item/bonegel,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "cJ" = (/obj/machinery/door/window/westleft,/obj/machinery/door/window/eastright,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) -"cK" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"cK" = (/obj/structure/stool/bed,/obj/item/bedsheet,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "cL" = (/obj/machinery/power/solar{id = "portsolar"; name = "Port Solar Array"},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating{icon_state = "solarpanel"; temperature = 393.15},/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) "cM" = (/obj/structure/cable,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) "cN" = (/obj/effect/alien/flesh/weeds/node,/turf/simulated/floor,/area/awaymission/labs/researchdivision) "cO" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "cP" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "cQ" = (/obj/structure/stool/bed/roller,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) -"cR" = (/obj/structure/table/reinforced,/obj/item/weapon/circular_saw,/obj/item/weapon/scalpel,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) -"cS" = (/obj/structure/table/reinforced,/obj/item/bodybag,/obj/item/weapon/cautery,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"cR" = (/obj/structure/table/reinforced,/obj/item/circular_saw,/obj/item/scalpel,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"cS" = (/obj/structure/table/reinforced,/obj/item/bodybag,/obj/item/cautery,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "cT" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "cU" = (/obj/effect/landmark/corpse/alien/testsubject,/obj/effect/decal/cleanable/blood,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "cV" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) @@ -163,7 +163,7 @@ "dg" = (/obj/machinery/chem_dispenser,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "dh" = (/obj/structure/stool/bed/roller,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "di" = (/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) -"dj" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"dj" = (/obj/structure/stool/bed,/obj/item/bedsheet,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "dk" = (/obj/machinery/power/solar{id = "portsolar"; name = "Port Solar Array"},/obj/structure/cable,/turf/simulated/floor/plating{icon_state = "solarpanel"; temperature = 393.15},/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) "dl" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) "dm" = (/obj/effect/decal/cleanable/blood,/obj/effect/landmark/corpse/alien/laborer,/turf/simulated/floor,/area/awaymission/labs/researchdivision) @@ -171,8 +171,8 @@ "do" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "dp" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "dq" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) -"dr" = (/obj/structure/table/standard,/obj/item/weapon/implanter/nanoaug/strength,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) -"ds" = (/obj/structure/table/standard,/obj/item/weapon/clipboard,/obj/item/weapon/paper{icon_state = "paper_words"; info = "Study of the Soghun genome has proven successful. Using their blood as a base, we have managed to develop a series of nanoaugmentations that operate on a biological basis. With it, we can supply our commandos with implants that would give them the strength of at least ten Soghun, or the combat skills of many more. Further research is required to develop safer solutions, but the soldiers seem receptive to the current batch of test implants. They are to be kept under watch at all times in their quarters."; name = "Research Notes"; text = "p"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"dr" = (/obj/structure/table/standard,/obj/item/implanter/nanoaug/strength,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"ds" = (/obj/structure/table/standard,/obj/item/clipboard,/obj/item/paper{icon_state = "paper_words"; info = "Study of the Soghun genome has proven successful. Using their blood as a base, we have managed to develop a series of nanoaugmentations that operate on a biological basis. With it, we can supply our commandos with implants that would give them the strength of at least ten Soghun, or the combat skills of many more. Further research is required to develop safer solutions, but the soldiers seem receptive to the current batch of test implants. They are to be kept under watch at all times in their quarters."; name = "Research Notes"; text = "p"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "dt" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/effect/alien/flesh/weeds/node,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "du" = (/obj/machinery/vending/coffee,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "dv" = (/obj/machinery/vending/snack,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) @@ -232,14 +232,14 @@ "ex" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/awaymission/labs/gateway) "ey" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/awaymission/labs/gateway) "ez" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/wall/r_wall,/area/awaymission/labs/gateway) -"eA" = (/obj/structure/table/standard,/obj/item/weapon/paper/pamphlet,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/awaymission/labs/gateway) -"eB" = (/obj/structure/table/standard,/obj/item/weapon/phone,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/awaymission/labs/gateway) +"eA" = (/obj/structure/table/standard,/obj/item/paper/pamphlet,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/awaymission/labs/gateway) +"eB" = (/obj/structure/table/standard,/obj/item/phone,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/awaymission/labs/gateway) "eC" = (/obj/structure/filingcabinet,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/unary/vent_pump,/turf/simulated/floor,/area/awaymission/labs/gateway) "eD" = (/obj/machinery/power/smes,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) "eE" = (/obj/machinery/power/smes{charge = 0},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) "eF" = (/obj/machinery/optable,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) "eG" = (/obj/machinery/computer/operating,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) -"eH" = (/obj/structure/table/reinforced,/obj/item/weapon/gun/syringe{pixel_x = 1; pixel_y = 4},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) +"eH" = (/obj/structure/table/reinforced,/obj/item/gun/syringe{pixel_x = 1; pixel_y = 4},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) "eI" = (/obj/structure/closet/secure_closet/medical1,/obj/machinery/camera{c_tag = "Prison Bedroom"; dir = 2; network = "SS13"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) "eJ" = (/obj/machinery/iv_drip,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) "eK" = (/obj/machinery/vending/medical,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) @@ -279,7 +279,7 @@ "fs" = (/obj/effect/decal/cleanable/blood,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/landmark/corpse/officer,/turf/simulated/floor,/area/awaymission/labs/gateway) "ft" = (/obj/machinery/power/apc{dir = 4; name = "Worn-out APC"; pixel_x = 24; pixel_y = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor,/area/awaymission/labs/gateway) "fu" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) -"fv" = (/obj/structure/table/reinforced,/obj/item/device/camera_film,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"fv" = (/obj/structure/table/reinforced,/obj/item/camera_film,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "fw" = (/obj/machinery/door/window/westleft,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "fx" = (/obj/effect/landmark{name = "awaystart"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "fy" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) @@ -294,14 +294,14 @@ "fH" = (/obj/machinery/gateway{dir = 10},/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/awaymission/labs/gateway) "fI" = (/obj/machinery/gateway,/turf/simulated/floor{icon_state = "warning"},/area/awaymission/labs/gateway) "fJ" = (/obj/machinery/gateway{dir = 6},/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/awaymission/labs/gateway) -"fK" = (/obj/structure/table/reinforced,/obj/item/device/camera,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"fK" = (/obj/structure/table/reinforced,/obj/item/camera,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "fL" = (/obj/effect/landmark/corpse/scientist{mobname = "Steve Smith"; name = "Steve Smith"},/obj/effect/decal/cleanable/blood,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) -"fM" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/spray/chemsprayer,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"fM" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/spray/chemsprayer,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "fN" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) "fO" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) "fP" = (/obj/effect/landmark/corpse/doctor{mobname = "Amando Cruz"; name = "Amando Cruz"},/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) "fQ" = (/obj/structure/stool/bed/chair/office/light{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) -"fR" = (/obj/structure/table/reinforced,/obj/item/weapon/paper{icon_state = "paper_words"; info = "As per your request, Director, I have documented my findings on the odd mutation growing from Commander Karl's arm. First of all, in this state he cannot go on any kind of missions. The alien flesh is incredibly painful to him and he can barely hold a rifle properly, no less fit into a tight hardsuit. Early analysis of the tissue shows a DNA structure unlike anything I've seen in my fourty-some odd years of medical practice. It's neither human nor Soghun, I can tell you that much. It has a quality you would expect from the lining of internal organs and is incredibly sensitive. Yet, it is also very resilient. It took me about five tries before I was able to stick a syringe through it. And even then I got just enough blood for a test, not a drop more. The wound healed quickly afterwards, as well. Whatever you boys in science are doing, you've stumbled across something, that's for sure."; name = "Unfinished Form"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) +"fR" = (/obj/structure/table/reinforced,/obj/item/paper{icon_state = "paper_words"; info = "As per your request, Director, I have documented my findings on the odd mutation growing from Commander Karl's arm. First of all, in this state he cannot go on any kind of missions. The alien flesh is incredibly painful to him and he can barely hold a rifle properly, no less fit into a tight hardsuit. Early analysis of the tissue shows a DNA structure unlike anything I've seen in my fourty-some odd years of medical practice. It's neither human nor Soghun, I can tell you that much. It has a quality you would expect from the lining of internal organs and is incredibly sensitive. Yet, it is also very resilient. It took me about five tries before I was able to stick a syringe through it. And even then I got just enough blood for a test, not a drop more. The wound healed quickly afterwards, as well. Whatever you boys in science are doing, you've stumbled across something, that's for sure."; name = "Unfinished Form"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) "fS" = (/obj/structure/closet/crate/secure/weapon,/obj/item/ammo_magazine/a357,/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/militarydivision) "fT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/militarydivision) "fU" = (/obj/machinery/door/window{dir = 8},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/militarydivision) @@ -310,15 +310,15 @@ "fX" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/awaymission/labs/gateway) "fY" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/awaymission/labs/gateway) "fZ" = (/obj/machinery/turretid{name = "Gateway Turret Control"; pixel_x = -24},/turf/simulated/floor,/area/awaymission/labs/gateway) -"ga" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 7},/turf/simulated/floor,/area/awaymission/labs/gateway) +"ga" = (/obj/structure/table/standard,/obj/item/paper_bin{pixel_x = -2; pixel_y = 7},/turf/simulated/floor,/area/awaymission/labs/gateway) "gb" = (/obj/machinery/door/airlock/glass_research{name = "Storage"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/awaymission/labs/researchdivision) -"gc" = (/obj/structure/table/reinforced,/obj/item/weapon/gun/energy/xray,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"gc" = (/obj/structure/table/reinforced,/obj/item/gun/energy/xray,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "gd" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) "ge" = (/obj/machinery/bodyscanner,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) "gf" = (/obj/machinery/body_scanconsole,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) "gg" = (/obj/item/roller{pixel_x = 31; pixel_y = 8},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) "gh" = (/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) -"gi" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/adv{pixel_x = 3; pixel_y = 4},/obj/item/weapon/storage/firstaid/adv{pixel_x = 0; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) +"gi" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/adv{pixel_x = 3; pixel_y = 4},/obj/item/storage/firstaid/adv{pixel_x = 0; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) "gj" = (/obj/machinery/power/apc{dir = 8; environ = 0; equipment = 0; lighting = 0; locked = 0; name = "Worn-out APC"; pixel_x = -24; pixel_y = 0},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) "gk" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; frequency = 1379; id_tag = "mining_maineast_pump"; on = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/militarydivision) "gl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/wall/r_wall,/area/awaymission/labs/militarydivision) @@ -400,8 +400,8 @@ "hJ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/awaymission/labs/researchdivision) "hK" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/awaymission/labs/researchdivision) "hL" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/wall/r_wall,/area/awaymission/labs/researchdivision) -"hM" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger{pixel_x = -1; pixel_y = 5},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/item/weapon/cell/hyper,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) -"hN" = (/obj/structure/table/reinforced,/obj/item/weapon/hand_labeler,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"hM" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger{pixel_x = -1; pixel_y = 5},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/item/cell/hyper,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"hN" = (/obj/structure/table/reinforced,/obj/item/hand_labeler,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "hO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "hP" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "hQ" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) @@ -429,9 +429,9 @@ "im" = (/obj/machinery/power/apc{dir = 0; name = "Worn-out APC"; pixel_y = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/terminal,/turf/simulated/floor/plating,/area/awaymission/labs/solars) "in" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/awaymission/labs/solars) "io" = (/obj/machinery/power/smes{charge = 0},/obj/structure/cable,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/awaymission/labs/solars) -"ip" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 7},/obj/item/weapon/stamp{pixel_x = 8; pixel_y = -2},/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/militarydivision) +"ip" = (/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = -2; pixel_y = 7},/obj/item/stamp{pixel_x = 8; pixel_y = -2},/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/militarydivision) "iq" = (/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/militarydivision) -"ir" = (/obj/structure/table/woodentable,/obj/item/weapon/melee/classic_baton,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/militarydivision) +"ir" = (/obj/structure/table/woodentable,/obj/item/melee/classic_baton,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/militarydivision) "is" = (/obj/effect/decal/cleanable/blood/splatter,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/awaymission/labs/militarydivision) "it" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor,/area/awaymission/labs/militarydivision) "iu" = (/obj/item/ammo_casing/c9mm{pixel_x = 25; pixel_y = -60},/turf/simulated/floor,/area/awaymission/labs/militarydivision) @@ -450,8 +450,8 @@ "iH" = (/obj/machinery/recharge_station,/obj/effect/decal/cleanable/cobweb2,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{temperature = 393.15},/area/awaymission/labs/researchdivision) "iI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor,/area/awaymission/labs/researchdivision) "iJ" = (/obj/structure/rack,/turf/simulated/floor,/area/awaymission/labs/researchdivision) -"iK" = (/obj/item/weapon/stock_parts/console_screen,/obj/structure/table/standard,/obj/item/weapon/stock_parts/console_screen,/obj/item/weapon/stock_parts/console_screen,/obj/item/weapon/stock_parts/matter_bin,/obj/item/weapon/stock_parts/matter_bin,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) -"iL" = (/obj/structure/table/reinforced,/obj/item/metroid_core,/obj/item/weapon/camera_assembly{pixel_x = 2; pixel_y = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; frequency = 1379; id_tag = "mining_maineast_pump"; on = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"iK" = (/obj/item/stock_parts/console_screen,/obj/structure/table/standard,/obj/item/stock_parts/console_screen,/obj/item/stock_parts/console_screen,/obj/item/stock_parts/matter_bin,/obj/item/stock_parts/matter_bin,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"iL" = (/obj/structure/table/reinforced,/obj/item/metroid_core,/obj/item/camera_assembly{pixel_x = 2; pixel_y = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; frequency = 1379; id_tag = "mining_maineast_pump"; on = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "iM" = (/obj/machinery/door/airlock/maintenance_hatch,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/awaymission/labs/solars) "iN" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/militarydivision) "iO" = (/obj/machinery/door/airlock/command{name = "Team Leader's Desk"},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/awaymission/labs/militarydivision) @@ -468,11 +468,11 @@ "iZ" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{temperature = 393.15},/area/awaymission/labs/researchdivision) "ja" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/awaymission/labs/researchdivision) "jb" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/awaymission/labs/researchdivision) -"jc" = (/obj/structure/table/reinforced,/obj/item/weapon/book/manual/research_and_development{pixel_x = -1; pixel_y = 4},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"jc" = (/obj/structure/table/reinforced,/obj/item/book/manual/research_and_development{pixel_x = -1; pixel_y = 4},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "jd" = (/obj/structure/stool/bed/chair/office/dark,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "je" = (/obj/structure/table/reinforced,/obj/item/stack/cable_coil{pixel_y = 3},/obj/item/stack/cable_coil{pixel_y = 3},/obj/item/stack/cable_coil{pixel_y = 3},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "jf" = (/obj/structure/table/standard,/turf/simulated/floor/plating,/area/awaymission/labs/solars) -"jg" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/plating,/area/awaymission/labs/solars) +"jg" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical,/turf/simulated/floor/plating,/area/awaymission/labs/solars) "jh" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/awaymission/labs/solars) "ji" = (/obj/structure/closet/secure_closet/engineering_electrical,/turf/simulated/floor/plating,/area/awaymission/labs/solars) "jj" = (/obj/structure/closet/cabinet,/obj/item/clothing/under/rank/navysecurity,/obj/item/clothing/suit/armor/navysecvest,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/militarydivision) @@ -480,15 +480,15 @@ "jl" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 140; on = 1; pressure_checks = 0},/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/militarydivision) "jm" = (/obj/machinery/power/apc{dir = 8; environ = 0; equipment = 0; lighting = 0; locked = 0; name = "Worn-out APC"; pixel_x = -24; pixel_y = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/awaymission/labs/militarydivision) "jn" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/awaymission/labs/militarydivision) -"jo" = (/obj/structure/table/woodentable,/obj/item/weapon/folder/blue,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/awaymission/labs/militarydivision) +"jo" = (/obj/structure/table/woodentable,/obj/item/folder/blue,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/awaymission/labs/militarydivision) "jp" = (/obj/structure/table/woodentable,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/awaymission/labs/militarydivision) "jq" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/awaymission/labs/militarydivision) "jr" = (/obj/machinery/camera{c_tag = "Central Hallway South-West"; dir = 8},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/awaymission/labs/militarydivision) "js" = (/obj/structure/table/standard,/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/militarydivision) -"jt" = (/obj/structure/table/standard,/obj/item/weapon/paper{icon_state = "paper_words"; info = "We got back from another ship-out today. Those idiots on the NSV Icarus somehow managed to land themselves in the middle of a fleet of pirates. Frigates were downed easily, and they boarded with the intent to take the artillery cannon. Thankfully, those implants the doctors gave us worked like a charm. I think they made me sick, though, I've got this terrible rash on my arm that is a pain to scratch. Making my skin look all pink and nasty. Gonna go see Doc Brown in the monring, I need some rest after all we've been through."; name = "Journal Page"},/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/militarydivision) +"jt" = (/obj/structure/table/standard,/obj/item/paper{icon_state = "paper_words"; info = "We got back from another ship-out today. Those idiots on the NSV Icarus somehow managed to land themselves in the middle of a fleet of pirates. Frigates were downed easily, and they boarded with the intent to take the artillery cannon. Thankfully, those implants the doctors gave us worked like a charm. I think they made me sick, though, I've got this terrible rash on my arm that is a pain to scratch. Making my skin look all pink and nasty. Gonna go see Doc Brown in the monring, I need some rest after all we've been through."; name = "Journal Page"},/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/militarydivision) "ju" = (/obj/item/ammo_casing/c9mm{pixel_y = -8},/turf/simulated/floor,/area/awaymission/labs/militarydivision) "jv" = (/obj/item/ammo_casing/c9mm{pixel_x = -28; pixel_y = -4},/turf/simulated/floor,/area/awaymission/labs/militarydivision) -"jw" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/hos,/turf/simulated/floor,/area/awaymission/labs/militarydivision) +"jw" = (/obj/structure/stool/bed,/obj/item/bedsheet/hos,/turf/simulated/floor,/area/awaymission/labs/militarydivision) "jx" = (/turf/simulated/floor{icon_state = "green"; dir = 8},/area/awaymission/labs/command) "jy" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/awaymission/labs/command) "jz" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/awaymission/labs/command) @@ -498,18 +498,18 @@ "jD" = (/obj/structure/window/reinforced,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{temperature = 393.15},/area/awaymission/labs/researchdivision) "jE" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/oil,/turf/simulated/floor{temperature = 393.15},/area/awaymission/labs/researchdivision) "jF" = (/obj/machinery/camera{c_tag = "Mining Dock External"; dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/awaymission/labs/researchdivision) -"jG" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 7},/obj/item/weapon/pen{pixel_x = 5; pixel_y = 5},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) -"jH" = (/obj/structure/table/reinforced,/obj/item/borg/upgrade/vtec,/obj/item/weapon/cell/hyper/empty,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) -"jI" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/backpack/holding{pixel_y = 4},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) -"jJ" = (/obj/structure/table/reinforced,/obj/item/weapon/talkingcrystal{pixel_y = 9},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"jG" = (/obj/structure/table/reinforced,/obj/item/paper_bin{pixel_x = -2; pixel_y = 7},/obj/item/pen{pixel_x = 5; pixel_y = 5},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"jH" = (/obj/structure/table/reinforced,/obj/item/borg/upgrade/vtec,/obj/item/cell/hyper/empty,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"jI" = (/obj/structure/table/reinforced,/obj/item/storage/backpack/holding{pixel_y = 4},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) +"jJ" = (/obj/structure/table/reinforced,/obj/item/talkingcrystal{pixel_y = 9},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/researchdivision) "jK" = (/obj/effect/landmark{name = "awaystart"},/turf/simulated/floor/plating,/area/awaymission/labs/solars) "jL" = (/obj/structure/closet/secure_closet/engineering_welding,/turf/simulated/floor/plating,/area/awaymission/labs/solars) "jM" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/awaymission/labs/militarydivision) "jN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/awaymission/labs/militarydivision) -"jO" = (/obj/structure/table/standard,/obj/item/weapon/butch{pixel_y = 3},/obj/item/weapon/kitchenknife{pixel_x = -4; pixel_y = 4},/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/militarydivision) +"jO" = (/obj/structure/table/standard,/obj/item/butch{pixel_y = 3},/obj/item/kitchenknife{pixel_x = -4; pixel_y = 4},/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/militarydivision) "jP" = (/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/militarydivision) -"jQ" = (/obj/effect/decal/cleanable/blood/splatter,/obj/effect/landmark/corpse/officer,/obj/item/weapon/gun/projectile/silenced/sc_silenced{desc = "A sidearm commonly favored by terrestrial security forces."; icon_state = "g115 Pistol"; name = "Pistol"; silenced = 0},/turf/simulated/floor,/area/awaymission/labs/militarydivision) -"jR" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/hos,/obj/machinery/camera{c_tag = "Central Hallway South-West"; dir = 8},/turf/simulated/floor,/area/awaymission/labs/militarydivision) +"jQ" = (/obj/effect/decal/cleanable/blood/splatter,/obj/effect/landmark/corpse/officer,/obj/item/gun/projectile/silenced/sc_silenced{desc = "A sidearm commonly favored by terrestrial security forces."; icon_state = "g115 Pistol"; name = "Pistol"; silenced = 0},/turf/simulated/floor,/area/awaymission/labs/militarydivision) +"jR" = (/obj/structure/stool/bed,/obj/item/bedsheet/hos,/obj/machinery/camera{c_tag = "Central Hallway South-West"; dir = 8},/turf/simulated/floor,/area/awaymission/labs/militarydivision) "jS" = (/obj/machinery/mech_bay_recharge_port,/turf/simulated/floor{temperature = 393.15},/area/awaymission/labs/researchdivision) "jT" = (/turf/simulated/floor/mech_bay_recharge_floor,/area/awaymission/labs/researchdivision) "jU" = (/obj/machinery/computer/mech_bay_power_console,/turf/simulated/floor{temperature = 393.15},/area/awaymission/labs/researchdivision) @@ -519,7 +519,7 @@ "jY" = (/obj/machinery/turretcover,/turf/unsimulated/desert,/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) "jZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/awaymission/labs/militarydivision) "ka" = (/obj/structure/table/standard,/obj/machinery/microwave{pixel_x = -2; pixel_y = 8},/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/militarydivision) -"kb" = (/obj/item/device/violin,/turf/simulated/floor,/area/awaymission/labs/militarydivision) +"kb" = (/obj/item/violin,/turf/simulated/floor,/area/awaymission/labs/militarydivision) "kc" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light,/turf/simulated/floor{temperature = 393.15},/area/awaymission/labs/researchdivision) "kd" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "delivery"; name = "floor"; temperature = 393.15},/area/awaymission/labs/researchdivision) "ke" = (/obj/machinery/bot/mulebot,/turf/simulated/floor{temperature = 393.15},/area/awaymission/labs/researchdivision) @@ -546,7 +546,7 @@ "kz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor,/area/awaymission/labs/command) "kA" = (/obj/machinery/computer/card,/turf/simulated/floor,/area/awaymission/labs/command) "kB" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/awaymission/labs/command) -"kC" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 7},/turf/simulated/floor,/area/awaymission/labs/command) +"kC" = (/obj/structure/table/reinforced,/obj/item/paper_bin{pixel_x = -2; pixel_y = 7},/turf/simulated/floor,/area/awaymission/labs/command) "kD" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/solar{id = "portsolar"; name = "Port Solar Array"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating{icon_state = "solarpanel"; temperature = 393.15},/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) "kE" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating{temperature = 393.15},/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) "kF" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/solar{id = "portsolar"; name = "Port Solar Array"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating{icon_state = "solarpanel"; temperature = 393.15},/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) @@ -608,7 +608,7 @@ "lJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/awaymission/labs/solars) "lK" = (/obj/structure/cable,/obj/effect/decal/cleanable/dirt,/obj/machinery/power/solar_control,/turf/simulated/floor/plating,/area/awaymission/labs/solars) "lL" = (/obj/machinery/camera{c_tag = "Aft Port Solar Control"; dir = 1},/obj/machinery/power/apc{dir = 4; name = "Worn-out APC"; pixel_x = 24; pixel_y = 0},/obj/structure/cable,/obj/machinery/power/terminal{dir = 4},/turf/simulated/floor/plating,/area/awaymission/labs/solars) -"lM" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/electrical,/turf/simulated/floor/plating,/area/awaymission/labs/solars) +"lM" = (/obj/structure/table/standard,/obj/item/storage/toolbox/electrical,/turf/simulated/floor/plating,/area/awaymission/labs/solars) "lN" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/solar{id = "portsolar"; name = "Port Solar Array"},/turf/simulated/floor/plating{icon_state = "solarpanel"; temperature = 393.15},/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) "lO" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating{temperature = 393.15},/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) "lP" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating{temperature = 393.15},/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) @@ -617,7 +617,7 @@ "lS" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating{temperature = 393.15},/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) "lT" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/solar{id = "portsolar"; name = "Port Solar Array"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating{icon_state = "solarpanel"; temperature = 393.15},/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) "lU" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/awaymission/labs/solars) -"lV" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor/plating,/area/awaymission/labs/solars) +"lV" = (/obj/structure/table/standard,/obj/item/reagent_containers/spray/cleaner,/turf/simulated/floor/plating,/area/awaymission/labs/solars) "lW" = (/obj/structure/table/standard,/obj/item/stack/cable_coil{pixel_y = -3},/obj/item/stack/cable_coil{pixel_y = 3},/obj/item/stack/cable_coil{pixel_y = 0},/turf/simulated/floor/plating,/area/awaymission/labs/solars) "lX" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating{temperature = 393.15},/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) "lY" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating{temperature = 393.15},/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) @@ -644,7 +644,7 @@ "mt" = (/obj/machinery/door/airlock/glass_large{icon_state = "door_locked"; locked = 1; name = "Cargo Bay Door"},/turf/simulated/floor,/area/awaymission/labs/cargo) "mu" = (/turf/simulated/floor{density = 1},/area/awaymission/labs/cargo) "mv" = (/obj/structure/grille{layer = 3.3},/obj/structure/window/reinforced{dir = 5; health = 1e+007; layer = 3.4},/obj/machinery/door/poddoor{density = 1; icon_state = "pdoor1"; id = "sandstorm shutters"; layer = 2.4; name = "Sandstorm Shutters"; opacity = 1},/turf/simulated/floor,/area/awaymission/labs/cargo) -"mw" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor,/area/awaymission/labs/cargo) +"mw" = (/obj/structure/closet/crate/freezer,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/turf/simulated/floor,/area/awaymission/labs/cargo) "mx" = (/turf/simulated/wall,/area/awaymission/labs/civilian) "my" = (/obj/structure/grille{layer = 3.3},/obj/structure/window/reinforced{dir = 5; health = 1e+007; layer = 3.4},/obj/machinery/door/poddoor{density = 1; icon_state = "pdoor1"; id = "sandstorm shutters"; layer = 2.4; name = "Sandstorm Shutters"; opacity = 1},/turf/simulated/floor,/area/awaymission/labs/civilian) "mz" = (/obj/effect/landmark{name = "awaystart"},/turf/simulated/floor/plating,/area/awaymission/labs/civilian) @@ -662,7 +662,7 @@ "mL" = (/obj/effect/landmark{name = "awaystart"},/turf/simulated/floor,/area/awaymission/labs/cargo) "mM" = (/obj/structure/table/standard,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/labs/civilian) "mN" = (/obj/structure/table/standard,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/awaymission/labs/civilian) -"mO" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/structure/table/standard,/obj/item/weapon/book/manual/chef_recipes,/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/civilian) +"mO" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/structure/table/standard,/obj/item/book/manual/chef_recipes,/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/civilian) "mP" = (/obj/structure/closet/secure_closet/freezer/meat,/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/civilian) "mQ" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/civilian) "mR" = (/obj/structure/sink/kitchen{pixel_y = 23},/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/civilian) @@ -688,8 +688,8 @@ "nl" = (/obj/machinery/door/airlock/maintenance_hatch,/turf/simulated/floor/plating,/area/awaymission/labs/civilian) "nm" = (/obj/effect/critter/fleshmonster,/turf/simulated/floor,/area/awaymission/labs/command) "nn" = (/obj/machinery/computer/security,/turf/simulated/floor{icon_state = "red"},/area/awaymission/labs/command) -"no" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/storage/PDAbox{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/id_kit,/turf/simulated/floor{icon_state = "red"},/area/awaymission/labs/command) -"np" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/secstorage/sbriefcase,/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/awaymission/labs/command) +"no" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/storage/PDAbox{pixel_x = 4; pixel_y = 4},/obj/item/storage/id_kit,/turf/simulated/floor{icon_state = "red"},/area/awaymission/labs/command) +"np" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/secstorage/sbriefcase,/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/awaymission/labs/command) "nq" = (/obj/structure/window/reinforced/tinted{dir = 5},/turf/simulated/floor/plating,/area/awaymission/labs/command) "nr" = (/obj/machinery/computer/communications,/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/awaymission/labs/command) "ns" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/recharger{pixel_y = 2},/turf/simulated/floor{icon_state = "blue"; dir = 8},/area/awaymission/labs/command) @@ -698,8 +698,8 @@ "nv" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/oil,/turf/simulated/floor,/area/awaymission/labs/cargo) "nw" = (/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/awaymission/labs/cargo) "nx" = (/obj/machinery/bot/mulebot,/turf/simulated/floor{icon_state = "bot"},/area/awaymission/labs/cargo) -"ny" = (/obj/structure/table/standard,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/weapon/wrapping_paper,/turf/simulated/floor,/area/awaymission/labs/cargo) -"nz" = (/obj/structure/closet/crate/secure/bin{name = "Valuable Ores"},/obj/item/weapon/ore/diamond,/obj/item/weapon/ore/diamond,/obj/item/weapon/ore/uranium,/obj/item/weapon/ore/uranium,/obj/item/weapon/ore/uranium,/obj/item/weapon/ore/clown,/turf/simulated/floor,/area/awaymission/labs/cargo) +"ny" = (/obj/structure/table/standard,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/wrapping_paper,/turf/simulated/floor,/area/awaymission/labs/cargo) +"nz" = (/obj/structure/closet/crate/secure/bin{name = "Valuable Ores"},/obj/item/ore/diamond,/obj/item/ore/diamond,/obj/item/ore/uranium,/obj/item/ore/uranium,/obj/item/ore/uranium,/obj/item/ore/clown,/turf/simulated/floor,/area/awaymission/labs/cargo) "nA" = (/obj/structure/closet/crate/secure/bin,/turf/simulated/floor,/area/awaymission/labs/cargo) "nB" = (/obj/machinery/recharge_station,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/awaymission/labs/cave) "nC" = (/obj/structure/rack,/obj/item/clothing/suit/space/rig/security{cold_protection = 1; desc = "A suit specially designed for Sogun anatomy, as well as operation in high-temperature environments. Has sunray shielding."; heat_protection = 3000; icon_state = "rig-soghun"; item_state = "rig-soghun"; name = "Soghun Hardsuit"},/obj/item/clothing/head/helmet/space/rig/security{desc = "A special helmet designed for the Soghun anatomy, as well as work in a hazardous, high-temperature environment. Has sunray shielding."; heat_protection = 3000; name = "Soghun Suit Helmet"},/obj/item/clothing/mask/breath,/turf/simulated/floor,/area/awaymission/labs/cave) @@ -725,25 +725,25 @@ "nW" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/awaymission/labs/cargo) "nX" = (/obj/machinery/bot/mulebot,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{icon_state = "bot"},/area/awaymission/labs/cargo) "nY" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/wall,/area/awaymission/labs/cargo) -"nZ" = (/obj/structure/table/standard,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor,/area/awaymission/labs/cargo) +"nZ" = (/obj/structure/table/standard,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/item/reagent_containers/spray/cleaner,/turf/simulated/floor,/area/awaymission/labs/cargo) "oa" = (/obj/effect/critter/fleshmonster/fleshslime,/turf/simulated/floor,/area/awaymission/labs/cargo) "ob" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/awaymission/labs/cave) "oc" = (/obj/machinery/power/apc{dir = 4; name = "Worn-out APC"; pixel_x = 24; pixel_y = 0},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/awaymission/labs/cave) "od" = (/obj/structure/table/standard,/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/civilian) -"oe" = (/obj/structure/table/standard,/obj/item/weapon/kitchen/rollingpin,/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/civilian) +"oe" = (/obj/structure/table/standard,/obj/item/kitchen/rollingpin,/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/civilian) "of" = (/obj/structure/table/standard,/obj/machinery/reagentgrinder{pixel_x = -1; pixel_y = 7},/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/civilian) "og" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/awaymission/labs/civilian) "oh" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor,/area/awaymission/labs/civilian) "oi" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor,/area/awaymission/labs/civilian) "oj" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/awaymission/labs/command) -"ok" = (/obj/structure/table/standard,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/device/multitool,/turf/simulated/floor{icon_state = "red"; dir = 9},/area/awaymission/labs/command) +"ok" = (/obj/structure/table/standard,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/multitool,/turf/simulated/floor{icon_state = "red"; dir = 9},/area/awaymission/labs/command) "ol" = (/obj/machinery/computer/secure_data,/turf/simulated/floor{icon_state = "red"; dir = 1},/area/awaymission/labs/command) -"om" = (/obj/item/weapon/tool/wrench,/obj/structure/table/reinforced,/obj/machinery/camera{c_tag = "Bridge West"; dir = 2},/obj/item/device/assembly/timer,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/turf/simulated/floor{icon_state = "red"; dir = 1},/area/awaymission/labs/command) +"om" = (/obj/item/tool/wrench,/obj/structure/table/reinforced,/obj/machinery/camera{c_tag = "Bridge West"; dir = 2},/obj/item/assembly/timer,/obj/item/assembly/signaler,/obj/item/assembly/signaler,/turf/simulated/floor{icon_state = "red"; dir = 1},/area/awaymission/labs/command) "on" = (/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/awaymission/labs/command) "oo" = (/turf/simulated/floor{icon_state = "blue"; dir = 8},/area/awaymission/labs/command) -"op" = (/obj/structure/table/standard,/obj/machinery/camera{c_tag = "Bridge East"; dir = 2},/obj/item/weapon/storage/fancy/donut_box,/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/awaymission/labs/command) +"op" = (/obj/structure/table/standard,/obj/machinery/camera{c_tag = "Bridge East"; dir = 2},/obj/item/storage/fancy/donut_box,/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/awaymission/labs/command) "oq" = (/obj/machinery/computer/med_data,/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/awaymission/labs/command) -"or" = (/obj/structure/table/standard,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/floor{icon_state = "whitehall"; dir = 5},/area/awaymission/labs/command) +"or" = (/obj/structure/table/standard,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/item/storage/toolbox/emergency,/turf/simulated/floor{icon_state = "whitehall"; dir = 5},/area/awaymission/labs/command) "os" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/awaymission/labs/command) "ot" = (/obj/machinery/door/airlock/glass_mining{name = "Cargo Bay"},/turf/simulated/floor,/area/awaymission/labs/command) "ou" = (/obj/structure/ore_box,/turf/simulated/floor,/area/awaymission/labs/cargo) @@ -753,7 +753,7 @@ "oy" = (/obj/effect/landmark/corpse/alien/cargo,/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/awaymission/labs/cave) "oz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/awaymission/labs/cave) "oA" = (/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/civilian) -"oB" = (/obj/structure/table/standard,/obj/item/weapon/butch{pixel_y = 3},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/civilian) +"oB" = (/obj/structure/table/standard,/obj/item/butch{pixel_y = 3},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{ icon_state = "cafeteria"; dir = 5},/area/awaymission/labs/civilian) "oC" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/awaymission/labs/civilian) "oD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/awaymission/labs/civilian) "oE" = (/obj/machinery/door/airlock/glass{name = "Civilian Division"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/awaymission/labs/civilian) @@ -811,7 +811,7 @@ "pE" = (/obj/machinery/conveyor,/turf/unsimulated/desert,/area/awaymission/desert{dynamic_lighting = 1; luminosity = 1; name = "Desert"}) "pF" = (/obj/effect/decal/mecha_wreckage/ripley,/turf/unsimulated/desert,/area/awaymission/labs/cave) "pG" = (/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) -"pH" = (/obj/structure/table/reinforced,/obj/item/weapon/tray{pixel_y = 6},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) +"pH" = (/obj/structure/table/reinforced,/obj/item/tray{pixel_y = 6},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) "pI" = (/obj/structure/table/reinforced,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) "pJ" = (/obj/structure/table/reinforced,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) "pK" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/wall,/area/awaymission/labs/civilian) @@ -819,8 +819,8 @@ "pM" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/awaymission/labs/civilian) "pN" = (/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) "pO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; frequency = 1379; id_tag = "engineering_aux_pump"; on = 1},/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) -"pP" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/captain,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) -"pQ" = (/obj/structure/closet/cabinet,/obj/item/weapon/gun/energy/pulse_rifle/M1911,/obj/item/clothing/tie/medal/gold/heroism,/obj/item/clothing/under/rank/navyhead_of_security,/obj/item/clothing/tie/holster/armpit,/obj/item/clothing/suit/armor/hosnavycoat,/obj/item/weapon/disk/nuclear,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) +"pP" = (/obj/structure/stool/bed,/obj/item/bedsheet/captain,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) +"pQ" = (/obj/structure/closet/cabinet,/obj/item/gun/energy/pulse_rifle/M1911,/obj/item/clothing/tie/medal/gold/heroism,/obj/item/clothing/under/rank/navyhead_of_security,/obj/item/clothing/tie/holster/armpit,/obj/item/clothing/suit/armor/hosnavycoat,/obj/item/disk/nuclear,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) "pR" = (/turf/unsimulated/desert,/area/awaymission/labs/command) "pS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/unsimulated/desert,/area/awaymission/labs/command) "pT" = (/obj/effect/alien/flesh/weeds{icon_state = "flesh1"},/turf/unsimulated/desert,/area/awaymission/labs/cave) @@ -829,7 +829,7 @@ "pW" = (/obj/structure/stool,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) "pX" = (/obj/structure/stool,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) "pY" = (/obj/machinery/door/window/northleft,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) -"pZ" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/obj/item/weapon/storage/matchbox,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) +"pZ" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/obj/item/storage/matchbox,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) "qa" = (/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) "qb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) "qc" = (/obj/effect/alien/flesh/weeds{icon_state = "flesh2"},/turf/unsimulated/desert,/area/awaymission/labs/cave) @@ -837,7 +837,7 @@ "qe" = (/obj/structure/stool/bed/chair,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) "qf" = (/obj/machinery/computer/security,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) "qg" = (/obj/machinery/computer/communications,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) -"qh" = (/obj/structure/table/woodentable,/obj/item/weapon/katana{desc = "A well-weathered sword meant to be kept at the side of an officer. It is not meant for real combat."; force = 15; name = "Officer's Sword"},/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) +"qh" = (/obj/structure/table/woodentable,/obj/item/katana{desc = "A well-weathered sword meant to be kept at the side of an officer. It is not meant for real combat."; force = 15; name = "Officer's Sword"},/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) "qi" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) "qj" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) "qk" = (/obj/effect/decal/cleanable/blood,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/effect/landmark/corpse/overseer,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) @@ -852,13 +852,13 @@ "qt" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/unsimulated/desert,/area/awaymission/labs/cave) "qu" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) "qv" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) -"qw" = (/obj/structure/table/standard,/obj/item/weapon/kitchen/utensil/fork,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) +"qw" = (/obj/structure/table/standard,/obj/item/kitchen/utensil/fork,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) "qx" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) "qy" = (/obj/structure/barricade/wooden,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) "qz" = (/obj/machinery/door/airlock/glass{name = "Mess Hall"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) "qA" = (/obj/effect/decal/cleanable/blood,/obj/item/ammo_casing/c9mm{pixel_x = 0; pixel_y = -4},/turf/simulated/floor,/area/awaymission/labs/command) "qB" = (/obj/structure/stool/bed/chair/comfy/brown{dir = 1},/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) -"qC" = (/obj/structure/table/woodentable,/obj/item/weapon/paper{icon_state = "paper_words"; info = "
Research Weekly Report


As of this day (Dec 26, 2556), the research division of Outpost Zeta has made signifcant strides in the development of safe-to-use nanoaugmentations based upon Soghun genetic structure. Though the unfortunate death of Commander Karl was a result of an earlier, more potent batch, his passing has brought great wisdom to our division and through his dead, infected tissue, we are very close to isolating the gene responsible for the fatal abnormal mutation.

Should current schedules and effort remain steady, we are expected to produce a far safer serum in no less than seven days. All data has been saved and uploaded to the main company development server via the nearby telecommunications satellite.

In our firearms department, development of a weapon that fires x-ray beams has proved successful. The weapon is not to be confused with a laser weapon - lasers are primitive tools that simply burn flesh. This weapon is capable of firing toxic beams that poison and harm the target's biological functions, much more painful than a laser burn. Similarly, even after the firefight is over with, or in the event of a retreat, the harmful toxins will remain in the affected individual's bloodstream and cause great discomfort. Your signature and stamp will be required for field tests with the emergency response commandos, Overseer.

End report.

-Doctor Jenkins"; name = "Report"},/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) +"qC" = (/obj/structure/table/woodentable,/obj/item/paper{icon_state = "paper_words"; info = "
Research Weekly Report


As of this day (Dec 26, 2556), the research division of Outpost Zeta has made signifcant strides in the development of safe-to-use nanoaugmentations based upon Soghun genetic structure. Though the unfortunate death of Commander Karl was a result of an earlier, more potent batch, his passing has brought great wisdom to our division and through his dead, infected tissue, we are very close to isolating the gene responsible for the fatal abnormal mutation.

Should current schedules and effort remain steady, we are expected to produce a far safer serum in no less than seven days. All data has been saved and uploaded to the main company development server via the nearby telecommunications satellite.

In our firearms department, development of a weapon that fires x-ray beams has proved successful. The weapon is not to be confused with a laser weapon - lasers are primitive tools that simply burn flesh. This weapon is capable of firing toxic beams that poison and harm the target's biological functions, much more painful than a laser burn. Similarly, even after the firefight is over with, or in the event of a retreat, the harmful toxins will remain in the affected individual's bloodstream and cause great discomfort. Your signature and stamp will be required for field tests with the emergency response commandos, Overseer.

End report.

-Doctor Jenkins"; name = "Report"},/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) "qD" = (/obj/effect/decal/cleanable/blood/tracks,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) "qE" = (/obj/structure/displaycase,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) "qF" = (/turf/simulated/floor{ icon_state = "vault"; dir = 1},/area/awaymission/labs/command) @@ -871,17 +871,17 @@ "qM" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) "qN" = (/obj/structure/stool/bed/chair,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) "qO" = (/obj/structure/closet/secure_closet/captains,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) -"qP" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) +"qP" = (/obj/structure/table/woodentable,/obj/item/book/manual/security_space_law,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) "qQ" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) "qR" = (/obj/machinery/vending/cigarette,/turf/simulated/floor{icon_state = "wood"},/area/awaymission/labs/command) -"qS" = (/obj/machinery/camera{c_tag = "Vault"; dir = 4; network = "SS13"},/obj/structure/closet/crate{name = "Gold Crate"},/obj/item/stack/sheet/mineral/gold{pixel_x = -1; pixel_y = 5},/obj/item/stack/sheet/mineral/gold{pixel_y = 2},/obj/item/stack/sheet/mineral/gold{pixel_x = 1; pixel_y = -2},/obj/item/weapon/storage/belt/champion,/obj/item/weapon/cell/infinite,/turf/simulated/floor{ icon_state = "vault"; dir = 1},/area/awaymission/labs/command) +"qS" = (/obj/machinery/camera{c_tag = "Vault"; dir = 4; network = "SS13"},/obj/structure/closet/crate{name = "Gold Crate"},/obj/item/stack/sheet/mineral/gold{pixel_x = -1; pixel_y = 5},/obj/item/stack/sheet/mineral/gold{pixel_y = 2},/obj/item/stack/sheet/mineral/gold{pixel_x = 1; pixel_y = -2},/obj/item/storage/belt/champion,/obj/item/cell/infinite,/turf/simulated/floor{ icon_state = "vault"; dir = 1},/area/awaymission/labs/command) "qT" = (/obj/machinery/nuclearbomb{r_code = "LOLNO"},/turf/simulated/floor{ icon_state = "vault"; dir = 8},/area/awaymission/labs/command) -"qU" = (/obj/item/weapon/coin/silver{pixel_x = 7; pixel_y = 12},/obj/item/weapon/coin/silver{pixel_x = 12; pixel_y = 7},/obj/item/weapon/coin/silver{pixel_x = 4; pixel_y = 8},/obj/item/weapon/coin/silver{pixel_x = -6; pixel_y = 5},/obj/item/weapon/coin/silver{pixel_x = 5; pixel_y = -8},/obj/structure/closet/crate{name = "Silver Crate"},/turf/simulated/floor{ icon_state = "vault"; dir = 4},/area/awaymission/labs/command) +"qU" = (/obj/item/coin/silver{pixel_x = 7; pixel_y = 12},/obj/item/coin/silver{pixel_x = 12; pixel_y = 7},/obj/item/coin/silver{pixel_x = 4; pixel_y = 8},/obj/item/coin/silver{pixel_x = -6; pixel_y = 5},/obj/item/coin/silver{pixel_x = 5; pixel_y = -8},/obj/structure/closet/crate{name = "Silver Crate"},/turf/simulated/floor{ icon_state = "vault"; dir = 4},/area/awaymission/labs/command) "qV" = (/obj/effect/alien/flesh/weeds,/turf/unsimulated/desert,/area/awaymission/labs/cave) -"qW" = (/obj/structure/table/standard,/obj/item/weapon/kitchen/utensil/fork,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) +"qW" = (/obj/structure/table/standard,/obj/item/kitchen/utensil/fork,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) "qX" = (/obj/machinery/door/airlock/glass{name = "Civilian Division"},/turf/simulated/floor,/area/awaymission/labs/civilian) "qY" = (/obj/machinery/door/airlock/glass{name = "Command Rotunda"},/turf/simulated/floor,/area/awaymission/labs/command) -"qZ" = (/obj/item/weapon/coin/silver{pixel_x = 12; pixel_y = 11},/turf/simulated/floor{ icon_state = "vault"; dir = 4},/area/awaymission/labs/command) +"qZ" = (/obj/item/coin/silver{pixel_x = 12; pixel_y = 11},/turf/simulated/floor{ icon_state = "vault"; dir = 4},/area/awaymission/labs/command) "ra" = (/obj/effect/alien/flesh/weeds{icon_state = "flesh2"},/obj/effect/decal/cleanable/blood/gibs/up,/turf/unsimulated/desert,/area/awaymission/labs/cave) "rb" = (/obj/effect/decal/cleanable/blood,/obj/effect/landmark/corpse/officer,/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) "rc" = (/obj/structure/stool/bed/chair{dir = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "bar"},/area/awaymission/labs/civilian) @@ -936,13 +936,13 @@ "rZ" = (/obj/effect/alien/flesh/weeds{icon_state = "flesh1"},/obj/effect/decal/cleanable/blood/gibs/limb,/turf/unsimulated/desert,/area/awaymission/labs/cave) "sa" = (/obj/machinery/shower{ icon_state = "shower"; dir = 4},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/labs/civilian) "sb" = (/obj/structure/stool,/turf/simulated/floor,/area/awaymission/labs/civilian) -"sc" = (/obj/structure/table/standard,/obj/item/weapon/paper{icon_state = "paper_words"; info = "
Memo to all Personnel


Greetings,

I have recently heard of rumors amongst our workers that we 'kidnap' some in their sleep and drag them off to the high-security laboratories. This has caused enough stir in our ranks that I personally am writing to you to denounce these naysayings. We at NanoTrasen would never do such things to harm our personnel, especially ones who put their lives on the line in dangerous caverns and extreme temperatures to excavate century-old artifacts. Rest assured, the laboratories in the high-security section are for nothing but the studying of the artifacts that you bring back to us.

Now that that is out of the way, allow me to personally give my congratulations to our Head of Excavation, S'rrsa Unoyo, who is celebrating her twenty-seventh birthday today. Celebrations will be held in the mess hall after work hours, and all staff are invited.

As always, please have a productive shift, and do not listen to the fearmongering of certain individuals. You are safe here, with us, at NanoTrasen.

-Overseer McDonald"; name = "Personnel Memo"},/turf/simulated/floor,/area/awaymission/labs/civilian) -"sd" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor,/area/awaymission/labs/civilian) +"sc" = (/obj/structure/table/standard,/obj/item/paper{icon_state = "paper_words"; info = "
Memo to all Personnel


Greetings,

I have recently heard of rumors amongst our workers that we 'kidnap' some in their sleep and drag them off to the high-security laboratories. This has caused enough stir in our ranks that I personally am writing to you to denounce these naysayings. We at NanoTrasen would never do such things to harm our personnel, especially ones who put their lives on the line in dangerous caverns and extreme temperatures to excavate century-old artifacts. Rest assured, the laboratories in the high-security section are for nothing but the studying of the artifacts that you bring back to us.

Now that that is out of the way, allow me to personally give my congratulations to our Head of Excavation, S'rrsa Unoyo, who is celebrating her twenty-seventh birthday today. Celebrations will be held in the mess hall after work hours, and all staff are invited.

As always, please have a productive shift, and do not listen to the fearmongering of certain individuals. You are safe here, with us, at NanoTrasen.

-Overseer McDonald"; name = "Personnel Memo"},/turf/simulated/floor,/area/awaymission/labs/civilian) +"sd" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical,/turf/simulated/floor,/area/awaymission/labs/civilian) "se" = (/obj/structure/table/standard,/turf/simulated/floor,/area/awaymission/labs/civilian) "sf" = (/obj/structure/closet/toolcloset,/turf/simulated/floor,/area/awaymission/labs/civilian) "sg" = (/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor,/area/awaymission/labs/civilian) "sh" = (/obj/structure/closet/secure_closet/engineering_electrical,/turf/simulated/floor,/area/awaymission/labs/civilian) -"si" = (/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/labs/civilian) +"si" = (/obj/item/soap/nanotrasen,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/labs/civilian) "sj" = (/obj/machinery/door/airlock{name = "Communal Bathroom"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/labs/civilian) "sk" = (/obj/effect/landmark/corpse/alien/laborer,/turf/simulated/floor,/area/awaymission/labs/civilian) "sl" = (/obj/machinery/door/airlock/maintenance_hatch{name = "Underground Maintenance"},/turf/simulated/floor,/area/awaymission/labs/civilian) @@ -951,7 +951,7 @@ "so" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor,/area/awaymission/labs/civilian) "sp" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/awaymission/labs/civilian) "sq" = (/obj/machinery/power/apc{dir = 4; name = "Worn-out APC"; pixel_x = 24; pixel_y = 0},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/awaymission/labs/civilian) -"sr" = (/obj/structure/table/standard,/obj/item/weapon/paper{icon_state = "paper_words"; info = "Hey, Carlos, when you get this, get down into the sewers and fix the damn piping, will you? That nasty fleshy shit's been growing again. Blocked off half the pipes and it's stil clogging the vents. Has to be coming from the high security section, that's the only pipe I hadn't tried to seal yet. Dunno what those freaks in research are doing but tell them to fucking knock it off. I'm not paid enough to scrape that crap off the walls down there. It's starting to get into the air as well, smells terrible. Yell at the head egghead or something."; name = "Note"},/turf/simulated/floor,/area/awaymission/labs/civilian) +"sr" = (/obj/structure/table/standard,/obj/item/paper{icon_state = "paper_words"; info = "Hey, Carlos, when you get this, get down into the sewers and fix the damn piping, will you? That nasty fleshy shit's been growing again. Blocked off half the pipes and it's stil clogging the vents. Has to be coming from the high security section, that's the only pipe I hadn't tried to seal yet. Dunno what those freaks in research are doing but tell them to fucking knock it off. I'm not paid enough to scrape that crap off the walls down there. It's starting to get into the air as well, smells terrible. Yell at the head egghead or something."; name = "Note"},/turf/simulated/floor,/area/awaymission/labs/civilian) "ss" = (/turf/simulated/wall/r_wall,/area/awaymission/labs/security) "st" = (/obj/structure/grille{layer = 3.3},/obj/structure/window/reinforced{dir = 5; health = 1e+007; layer = 3.4},/obj/machinery/door/poddoor{density = 1; icon_state = "pdoor1"; id = "sandstorm shutters"; layer = 2.4; name = "Sandstorm Shutters"; opacity = 1},/turf/simulated/floor,/area/awaymission/labs/security) "su" = (/turf/simulated/wall,/area/awaymission/labs/medical) @@ -965,9 +965,9 @@ "sC" = (/obj/structure/reagent_dispensers/water_cooler,/turf/simulated/floor,/area/awaymission/labs/security) "sD" = (/obj/structure/closet/secure_closet/security,/turf/simulated/floor,/area/awaymission/labs/security) "sE" = (/obj/machinery/vending/medical,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) -"sF" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/adv,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) +"sF" = (/obj/structure/table/standard,/obj/item/storage/firstaid/adv,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "sG" = (/obj/structure/table/standard,/obj/machinery/computer/med_data/laptop{pixel_x = 1; pixel_y = 3},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) -"sH" = (/obj/structure/table/standard,/obj/item/weapon/storage/beakerbox,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) +"sH" = (/obj/structure/table/standard,/obj/item/storage/beakerbox,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "sI" = (/obj/structure/closet/secure_closet/medical1,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "sJ" = (/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "sK" = (/obj/structure/stool/bed/chair,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) @@ -981,7 +981,7 @@ "sS" = (/obj/machinery/door/airlock/glass_medical{name = "Medical"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "sT" = (/obj/machinery/door/airlock/glass_medical{name = "Medical"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/command) "sU" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor,/area/awaymission/labs/security) -"sV" = (/obj/structure/table/standard,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor,/area/awaymission/labs/security) +"sV" = (/obj/structure/table/standard,/obj/item/book/manual/security_space_law,/turf/simulated/floor,/area/awaymission/labs/security) "sW" = (/obj/structure/table/standard,/turf/simulated/floor,/area/awaymission/labs/security) "sX" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor,/area/awaymission/labs/security) "sY" = (/obj/effect/decal/cleanable/blood/tracks,/turf/simulated/floor,/area/awaymission/labs/security) @@ -1000,14 +1000,14 @@ "tl" = (/obj/structure/stool/bed/chair{dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/awaymission/labs/security) "tm" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/awaymission/labs/security) "tn" = (/obj/structure/closet/secure_closet/personal/patient,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) -"to" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) +"to" = (/obj/structure/stool/bed,/obj/item/bedsheet/medical,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "tp" = (/obj/machinery/vending/wallmed1{pixel_y = 28},/obj/structure/stool/bed/chair/office/light{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) -"tq" = (/obj/structure/table/standard,/obj/item/weapon/folder/white,/obj/item/clothing/tie/stethoscope,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) +"tq" = (/obj/structure/table/standard,/obj/item/folder/white,/obj/item/clothing/tie/stethoscope,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "tr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/space,/area/awaymission/labs/medical) "ts" = (/obj/effect/decal/cleanable/blood/tracks,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "tt" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor,/area/awaymission/labs/security) "tu" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; frequency = 1379; id_tag = "engineering_aux_pump"; on = 1},/turf/simulated/floor,/area/awaymission/labs/security) -"tv" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/orange,/turf/simulated/floor,/area/awaymission/labs/security) +"tv" = (/obj/structure/stool/bed,/obj/item/bedsheet/orange,/turf/simulated/floor,/area/awaymission/labs/security) "tw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/awaymission/labs/security) "tx" = (/obj/machinery/door/airlock/medical{name = "Patient Room"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "ty" = (/obj/structure/table/standard,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) @@ -1016,22 +1016,22 @@ "tB" = (/obj/structure/table/woodentable,/turf/simulated/floor,/area/awaymission/labs/security) "tC" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor,/area/awaymission/labs/security) "tD" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) -"tE" = (/obj/item/weapon/gun/syringe/rapidsyringe,/obj/structure/table/standard,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) +"tE" = (/obj/item/gun/syringe/rapidsyringe,/obj/structure/table/standard,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "tF" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "tG" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "tH" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) -"tI" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) +"tI" = (/obj/structure/table/standard,/obj/item/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "tJ" = (/obj/machinery/chem_master,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "tK" = (/obj/machinery/chem_dispenser,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "tL" = (/obj/machinery/bodyscanner,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "tM" = (/obj/machinery/body_scanconsole,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; frequency = 1379; id_tag = "engineering_aux_pump"; on = 1},/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "tN" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) -"tO" = (/obj/structure/table/standard,/obj/item/weapon/storage/pill_bottle,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) +"tO" = (/obj/structure/table/standard,/obj/item/storage/pill_bottle,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "tP" = (/obj/effect/decal/cleanable/greenglow,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "tQ" = (/obj/effect/critter/fleshmonster,/turf/simulated/floor,/area/awaymission/labs/security) "tR" = (/obj/structure/rack,/turf/simulated/floor{ icon_state = "vault"; dir = 8},/area/awaymission/labs/security) -"tS" = (/obj/structure/rack,/obj/item/weapon/gun/projectile/shotgun/pump/sc_pump,/obj/machinery/light{dir = 1},/turf/simulated/floor{ icon_state = "vault"; dir = 8},/area/awaymission/labs/security) -"tT" = (/obj/structure/rack,/obj/item/clothing/suit/armor/riot,/obj/item/weapon/melee/baton,/obj/item/weapon/shield/riot,/obj/item/clothing/head/helmet/riot,/turf/simulated/floor{ icon_state = "vault"; dir = 8},/area/awaymission/labs/security) +"tS" = (/obj/structure/rack,/obj/item/gun/projectile/shotgun/pump/sc_pump,/obj/machinery/light{dir = 1},/turf/simulated/floor{ icon_state = "vault"; dir = 8},/area/awaymission/labs/security) +"tT" = (/obj/structure/rack,/obj/item/clothing/suit/armor/riot,/obj/item/melee/baton,/obj/item/shield/riot,/obj/item/clothing/head/helmet/riot,/turf/simulated/floor{ icon_state = "vault"; dir = 8},/area/awaymission/labs/security) "tU" = (/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/awaymission/labs/security) "tV" = (/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/awaymission/labs/security) "tW" = (/obj/structure/rack,/obj/machinery/light{dir = 1},/turf/simulated/floor{ icon_state = "vault"; dir = 8},/area/awaymission/labs/security) @@ -1048,22 +1048,22 @@ "uh" = (/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/labs/security) "ui" = (/obj/structure/closet/secure_closet/warden,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/labs/security) "uj" = (/obj/structure/rack,/obj/item/ammo_magazine/c45,/turf/simulated/floor{ icon_state = "vault"; dir = 8},/area/awaymission/labs/security) -"uk" = (/obj/structure/rack,/obj/item/ammo_magazine/c45,/obj/item/weapon/gun/projectile/silenced/sc_silenced{desc = "A sidearm commonly favored by terrestrial security forces."; icon_state = "g115 Pistol"; name = "Pistol"; silenced = 0},/turf/simulated/floor{ icon_state = "vault"; dir = 8},/area/awaymission/labs/security) -"ul" = (/obj/structure/table/standard,/obj/item/weapon/storage/backpack/satchel/med,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) +"uk" = (/obj/structure/rack,/obj/item/ammo_magazine/c45,/obj/item/gun/projectile/silenced/sc_silenced{desc = "A sidearm commonly favored by terrestrial security forces."; icon_state = "g115 Pistol"; name = "Pistol"; silenced = 0},/turf/simulated/floor{ icon_state = "vault"; dir = 8},/area/awaymission/labs/security) +"ul" = (/obj/structure/table/standard,/obj/item/storage/backpack/satchel/med,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "um" = (/obj/machinery/computer/prisoner,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/labs/security) "un" = (/obj/machinery/computer/security,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/labs/security) -"uo" = (/obj/structure/table/standard,/obj/item/weapon/gun/syringe/rapidsyringe,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) -"up" = (/obj/structure/table/standard,/obj/item/weapon/scalpel,/obj/item/weapon/retractor,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) -"uq" = (/obj/structure/table/standard,/obj/item/weapon/surgicaldrill,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) +"uo" = (/obj/structure/table/standard,/obj/item/gun/syringe/rapidsyringe,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) +"up" = (/obj/structure/table/standard,/obj/item/scalpel,/obj/item/retractor,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) +"uq" = (/obj/structure/table/standard,/obj/item/surgicaldrill,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "ur" = (/obj/structure/table/standard,/obj/machinery/light,/obj/machinery/power/apc{dir = 0; name = "Worn-out APC"; pixel_y = -24},/obj/structure/cable,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "us" = (/obj/structure/reagent_dispensers/water_cooler,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "ut" = (/obj/structure/closet/secure_closet/medical3,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) -"uu" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/fire,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) -"uv" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/o2,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) -"uw" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/toxin,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) +"uu" = (/obj/structure/table/standard,/obj/item/storage/firstaid/fire,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) +"uv" = (/obj/structure/table/standard,/obj/item/storage/firstaid/o2,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) +"uw" = (/obj/structure/table/standard,/obj/item/storage/firstaid/toxin,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "ux" = (/obj/machinery/iv_drip,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "uy" = (/obj/machinery/vending/cola,/turf/simulated/floor,/area/awaymission/labs/security) -"uz" = (/obj/structure/table/reinforced,/obj/machinery/door/window/westright,/obj/machinery/door/window/eastright,/obj/item/weapon/paper{icon_state = "paper_words"; info = "
Incident Report


Arresting Officer: Meyers

Suspect: Laborer #24

Charge: Assault

Description of events: Damn fool clocked another lizard upside the head with his wrench, started screaming about how the voices in his head wanted him to bring bodies to research to 'feed the mother' or something. Probably spent too much time down in those caves. Give him a good couple of days in the brig, he'll snap out of it quick enough."; name = "Incident Report"},/turf/simulated/floor,/area/awaymission/labs/security) +"uz" = (/obj/structure/table/reinforced,/obj/machinery/door/window/westright,/obj/machinery/door/window/eastright,/obj/item/paper{icon_state = "paper_words"; info = "
Incident Report


Arresting Officer: Meyers

Suspect: Laborer #24

Charge: Assault

Description of events: Damn fool clocked another lizard upside the head with his wrench, started screaming about how the voices in his head wanted him to bring bodies to research to 'feed the mother' or something. Probably spent too much time down in those caves. Give him a good couple of days in the brig, he'll snap out of it quick enough."; name = "Incident Report"},/turf/simulated/floor,/area/awaymission/labs/security) "uA" = (/obj/structure/stool/bed/chair/office/dark{dir = 8},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/labs/security) "uB" = (/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/awaymission/labs/security) "uC" = (/turf/simulated/floor{ icon_state = "warningcorner"; dir = 4},/area/awaymission/labs/security) @@ -1072,13 +1072,13 @@ "uF" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/awaymission/labs/security) "uG" = (/obj/structure/toilet,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/awaymission/labs/security) "uH" = (/obj/machinery/shower,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/awaymission/labs/security) -"uI" = (/obj/structure/table/standard,/obj/item/weapon/folder/red,/obj/item/weapon/book/manual/security_space_law{pixel_x = -3; pixel_y = 5},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/labs/security) +"uI" = (/obj/structure/table/standard,/obj/item/folder/red,/obj/item/book/manual/security_space_law{pixel_x = -3; pixel_y = 5},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/labs/security) "uJ" = (/obj/machinery/door/airlock/glass_security{name = "Armory"},/turf/simulated/floor,/area/awaymission/labs/security) "uK" = (/obj/machinery/computer/arcade,/turf/simulated/floor,/area/awaymission/labs/security) "uL" = (/obj/machinery/door/window/westright,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/awaymission/labs/security) "uM" = (/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/awaymission/labs/security) "uN" = (/obj/structure/closet/secure_closet/brig,/turf/simulated/floor,/area/awaymission/labs/security) -"uO" = (/obj/structure/table/standard,/obj/machinery/recharger,/obj/item/weapon/gun/energy/stunrevolver{pixel_y = 6},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/labs/security) +"uO" = (/obj/structure/table/standard,/obj/machinery/recharger,/obj/item/gun/energy/stunrevolver{pixel_y = 6},/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/labs/security) "uP" = (/obj/machinery/recharger,/obj/structure/table/reinforced,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/awaymission/labs/security) "uQ" = (/obj/machinery/recharger,/obj/structure/reagent_dispensers/peppertank{pixel_x = 0; pixel_y = -30},/obj/structure/table/reinforced,/obj/machinery/light,/turf/simulated/floor{icon_state = "red"; dir = 1},/area/awaymission/labs/security) "uR" = (/obj/machinery/recharger,/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "red"; dir = 5},/area/awaymission/labs/security) diff --git a/maps/gateway_vr/carpfarm.dm b/maps/gateway_vr/carpfarm.dm index 61658710ef2..e43251de086 100644 --- a/maps/gateway_vr/carpfarm.dm +++ b/maps/gateway_vr/carpfarm.dm @@ -21,7 +21,7 @@ /area/awaymission/carpfarm/base/entry icon_state = "blue" -/obj/item/weapon/paper/awaygate/carpfarm/suicide +/obj/item/paper/awaygate/carpfarm/suicide name = "suicide letter" info = "dear rescue,

my name markov. if reading this, i am dead. i am was miner for 3rd union of soviet socialist republiks. \ comrades yuri, dimitri, ivan, all eaten by space carp. all started month ago when soviet shipment sent new sonic jackhammers. \ diff --git a/maps/gateway_vr/carpfarm.dmm b/maps/gateway_vr/carpfarm.dmm index 6f90e4f782f..5d38b0a9933 100644 --- a/maps/gateway_vr/carpfarm.dmm +++ b/maps/gateway_vr/carpfarm.dmm @@ -17,7 +17,7 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/space) "aj" = ( -/obj/item/weapon/pickaxe/jackhammer, +/obj/item/pickaxe/jackhammer, /turf/simulated/mineral/floor/ignore_mapgen, /area/space) "ak" = ( @@ -121,7 +121,7 @@ /turf/simulated/floor/lino, /area/awaymission/carpfarm/base) "az" = ( -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/structure/cable, /obj/machinery/power/apc{ alarms_hidden = 1; @@ -132,7 +132,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/item/weapon/paper/awaygate/carpfarm/suicide, +/obj/item/paper/awaygate/carpfarm/suicide, /turf/simulated/floor/plating, /area/awaymission/carpfarm/base) "aA" = ( @@ -173,7 +173,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/carpfarm/base) "aH" = ( -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/bed/padded, /turf/simulated/floor/lino, /area/awaymission/carpfarm/base) @@ -185,8 +185,8 @@ /obj/item/clothing/suit/space/void/mining, /obj/item/clothing/mask/breath, /obj/item/clothing/head/helmet/space/void/mining, -/obj/item/weapon/mining_scanner, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/mining_scanner, +/obj/item/tank/jetpack/oxygen, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/awaymission/carpfarm/base) @@ -195,7 +195,7 @@ /area/awaymission/carpfarm/base) "aL" = ( /obj/structure/closet/toolcloset, -/obj/item/weapon/pickaxe/jackhammer, +/obj/item/pickaxe/jackhammer, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/awaymission/carpfarm/base) @@ -335,9 +335,9 @@ dir = 8 }, /obj/structure/closet/crate/internals, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, @@ -346,9 +346,9 @@ /area/awaymission/carpfarm/base) "bl" = ( /obj/structure/closet/crate/internals, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, @@ -381,7 +381,7 @@ /area/awaymission/carpfarm/base) "br" = ( /obj/item/mecha_parts/mecha_equipment/tool/drill, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/structure/table/steel, /turf/simulated/floor/tiled, /area/awaymission/carpfarm/base) @@ -458,7 +458,7 @@ /area/awaymission/carpfarm/base) "bD" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/weapon/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/projectile/shotgun/pump/rifle, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/awaymission/carpfarm/base) @@ -565,13 +565,13 @@ /turf/simulated/floor/tiled, /area/awaymission/carpfarm/base) "bS" = ( -/obj/item/weapon/reagent_containers/food/snacks/cubancarp, +/obj/item/reagent_containers/food/snacks/cubancarp, /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/table/glass, /turf/simulated/floor/tiled, /area/awaymission/carpfarm/base) "bT" = ( -/obj/item/weapon/reagent_containers/food/snacks/carpmeat, +/obj/item/reagent_containers/food/snacks/carpmeat, /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/table/glass, /turf/simulated/floor/tiled, @@ -617,7 +617,7 @@ /area/awaymission/carpfarm/base) "bX" = ( /obj/structure/closet/emcloset, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/machinery/airlock_sensor{ frequency = 1375; id_tag = "carp_sensor"; diff --git a/maps/gateway_vr/isle_de_monch.dmm b/maps/gateway_vr/isle_de_monch.dmm index 82f66aa4977..d011a53d3f6 100644 --- a/maps/gateway_vr/isle_de_monch.dmm +++ b/maps/gateway_vr/isle_de_monch.dmm @@ -21,7 +21,7 @@ "bE" = ( /obj/structure/table/steel, /obj/machinery/light, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = -3; pixel_y = -2 }, @@ -142,7 +142,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/item/weapon/melee/baton/cattleprod{ +/obj/item/melee/baton/cattleprod{ desc = "Metal rod with wire attached to it."; name = "jury-rigged antenna"; pixel_x = 5; @@ -529,16 +529,16 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/item/weapon/melee/baton/cattleprod{ +/obj/item/melee/baton/cattleprod{ desc = "Metal rod with wire attached to it."; name = "jury-rigged antenna"; pixel_x = 5; pixel_y = 4 }, -/obj/item/weapon/cell/emergency_light{ +/obj/item/cell/emergency_light{ pixel_x = -4 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1); pixel_x = 4; pixel_y = -3 @@ -876,7 +876,7 @@ pixel_x = -22 }, /obj/structure/closet/walllocker_double/kitchen/south, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 4; pixel_y = 2 }, @@ -919,7 +919,7 @@ /area/tether_away/beach/resort) "Po" = ( /obj/structure/table/standard, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/techfloor, /area/tether_away/beach/resort) "PI" = ( @@ -1053,7 +1053,7 @@ /obj/structure/railing/grey{ dir = 4 }, -/obj/item/weapon/gun/projectile/pistol, +/obj/item/gun/projectile/pistol, /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact, /turf/simulated/floor/tiled/techmaint, @@ -1158,7 +1158,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tether_away/beach/resort) "Xl" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /turf/simulated/floor/plating, /area/tether_away/beach/resort) "Xo" = ( @@ -1175,7 +1175,7 @@ /turf/simulated/floor/tiled/techfloor, /area/tether_away/beach/resort) "Xw" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /turf/simulated/floor/tiled/techfloor, /area/tether_away/beach/resort) "Xx" = ( diff --git a/maps/gateway_vr/listeningpost.dm b/maps/gateway_vr/listeningpost.dm index c7504ff740d..cb82e1e0c85 100644 --- a/maps/gateway_vr/listeningpost.dm +++ b/maps/gateway_vr/listeningpost.dm @@ -5,23 +5,23 @@ [i]Class[/i]: Wreckage [i]Transponder[/i]: None Detected"} -/obj/item/weapon/paper/listeningpost/mission +/obj/item/paper/listeningpost/mission name = "\improper Operation: Watchtower" info = {"Mission Details: You have been assigned to a newly constructed listening post constructed within an asteroid in Nanotrasen space to monitor their phoron mining operations. Accurate intel is crucial to the success of our operatives onboard, do not fail us."} -/obj/item/weapon/paper/listeningpost/reciept +/obj/item/paper/listeningpost/reciept name = "\improper SpacEx reciept" info = {"1 x Stechtkin pistol plus ammo - $600
1 x silencer - $200
shipping charge - $4360
total - $5160"} -/obj/item/weapon/paper/crumpled/listeningpost/fanfiction +/obj/item/paper/crumpled/listeningpost/fanfiction name = "\improper Regarding Latest Report" info = {"I swear to god, Dave, if you send us your stupid 'Futuristic version of VORE' fanfiction instead of actual report again 'on accident' even one more time, I'm sending you there myself, and you know better than most what they do there. Your writing is trash anyway, I bet even those freaks wouldn't like it."} -/obj/item/weapon/paper/listeningpost/departure +/obj/item/paper/listeningpost/departure name = "\improper Notice To All Facilities" info = {"After recent developments and Nanotrasen deal, we're pulling back resources from the Virgo-Erigone system. Any facility recieving this notice is to collect all valuable equipment and data, then fly to the closest general facility diff --git a/maps/gateway_vr/listeningpost.dmm b/maps/gateway_vr/listeningpost.dmm index 3d32c77f5bd..255737eabe1 100644 --- a/maps/gateway_vr/listeningpost.dmm +++ b/maps/gateway_vr/listeningpost.dmm @@ -68,8 +68,8 @@ /turf/simulated/floor/airless, /area/awaymission/listeningpost) "aq" = ( -/obj/item/weapon/pen, -/obj/item/weapon/paper/listeningpost/departure, +/obj/item/pen, +/obj/item/paper/listeningpost/departure, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/airless, /area/awaymission/listeningpost) @@ -108,7 +108,7 @@ /obj/structure/bed/chair/bay/comfy/red{ dir = 1 }, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, /turf/simulated/shuttle/floor/red/airless, /area/space) "ay" = ( @@ -130,7 +130,7 @@ /turf/simulated/floor/airless, /area/awaymission/listeningpost) "aB" = ( -/obj/item/weapon/gun/projectile/pistol, +/obj/item/gun/projectile/pistol, /turf/simulated/shuttle/floor/red/airless, /area/space) "aC" = ( @@ -141,7 +141,7 @@ /turf/simulated/floor/airless, /area/awaymission/listeningpost) "aD" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/airless, /area/awaymission/listeningpost) @@ -171,13 +171,13 @@ /area/awaymission/listeningpost) "aI" = ( /obj/structure/table/rack, -/obj/item/weapon/paper/listeningpost/reciept, +/obj/item/paper/listeningpost/reciept, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/airless, /area/awaymission/listeningpost) "aJ" = ( /obj/machinery/door/airlock, -/obj/item/weapon/silencer, +/obj/item/silencer, /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, /turf/simulated/floor/airless, @@ -280,7 +280,7 @@ /turf/simulated/floor/airless, /area/awaymission/listeningpost) "bc" = ( -/obj/item/weapon/card/emag_broken, +/obj/item/card/emag_broken, /turf/space, /area/space) "bd" = ( @@ -328,7 +328,7 @@ /area/awaymission/listeningpost) "bm" = ( /obj/structure/closet, -/obj/item/weapon/paper/listeningpost/mission, +/obj/item/paper/listeningpost/mission, /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, /turf/simulated/floor/airless, @@ -368,7 +368,7 @@ /obj/effect/floor_decal/techfloor/hole/right{ dir = 4 }, -/obj/item/weapon/broken_bottle, +/obj/item/broken_bottle, /obj/effect/decal/cleanable/cobweb2, /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, @@ -385,8 +385,8 @@ dir = 8; icon_state = "toilet00" }, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/paper/crumpled/listeningpost/fanfiction, +/obj/item/tool/crowbar, +/obj/item/paper/crumpled/listeningpost/fanfiction, /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, /turf/simulated/floor/airless, diff --git a/maps/gateway_vr/lucky_7.dmm b/maps/gateway_vr/lucky_7.dmm index 254dfd346b8..bcd94780f03 100644 --- a/maps/gateway_vr/lucky_7.dmm +++ b/maps/gateway_vr/lucky_7.dmm @@ -137,7 +137,7 @@ "ap" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/marble, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/simulated/floor/tiled/white, /area/awaymission/lucky7/kitchen) "aq" = ( @@ -178,7 +178,7 @@ /obj/structure/casino_table/craps{ dir = 1 }, -/obj/item/weapon/dice{ +/obj/item/dice{ pixel_x = 4; pixel_y = 6 }, @@ -237,7 +237,7 @@ /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/awaymission/lucky7/loungeprivateroom) "aC" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -443,9 +443,9 @@ dir = 4; pixel_x = 24 }, -/obj/item/weapon/storage/box/roulette_balls_normal, -/obj/item/weapon/storage/box/roulette_balls_fancy, -/obj/item/weapon/storage/box/roulette_balls_cheat, +/obj/item/storage/box/roulette_balls_normal, +/obj/item/storage/box/roulette_balls_fancy, +/obj/item/storage/box/roulette_balls_cheat, /obj/structure/table/rack/shelf, /turf/simulated/floor/tiled/dark, /area/awaymission/lucky7/breakroom) @@ -560,7 +560,7 @@ /area/awaymission/lucky7/privateroom/three) "bC" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/kitchen/utensil/fork/plastic, +/obj/item/material/kitchen/utensil/fork/plastic, /turf/simulated/floor/carpet/brown, /area/awaymission/lucky7/casinofloor) "bD" = ( @@ -572,7 +572,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 10; pixel_y = 8 }, @@ -619,7 +619,7 @@ /obj/structure/casino_table/blackjack_m{ dir = 4 }, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /obj/machinery/light/floortube{ dir = 8 }, @@ -788,25 +788,25 @@ /area/awaymission/lucky7/loungeprivateroom) "da" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 7; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -7; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -7; pixel_y = -3 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_y = -3 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 7; pixel_y = -3 }, @@ -1039,7 +1039,7 @@ "er" = ( /obj/effect/floor_decal/rust, /obj/structure/table/steel, -/obj/item/weapon/weldingtool{ +/obj/item/weldingtool{ pixel_x = 1; pixel_y = -4 }, @@ -1081,7 +1081,7 @@ /area/awaymission/lucky7/privateroom/two) "ey" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /obj/machinery/alarm{ dir = 8; pixel_x = 27 @@ -1104,7 +1104,7 @@ /turf/simulated/floor/water/pool, /area/awaymission/lucky7/privateroom/vip) "eF" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /turf/simulated/floor/carpet/retro, @@ -1129,11 +1129,11 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/weapon/handcuffs{ +/obj/item/handcuffs{ pixel_y = -5 }, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs{ +/obj/item/handcuffs, +/obj/item/handcuffs{ pixel_y = 5 }, /turf/simulated/floor/tiled, @@ -1183,7 +1183,7 @@ "eY" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/marble, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/white, /area/awaymission/lucky7/kitchen) "fb" = ( @@ -1198,7 +1198,7 @@ /area/awaymission/lucky7/casinofloor) "ff" = ( /obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/weapon/storage/pill_bottle/happy, +/obj/item/storage/pill_bottle/happy, /obj/item/clothing/under/bathrobe, /obj/item/clothing/under/bathrobe, /turf/simulated/floor/wood, @@ -1415,7 +1415,7 @@ /obj/machinery/door/window/brigdoor/eastleft{ dir = 2 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; @@ -1603,7 +1603,7 @@ /turf/simulated/floor/tiled, /area/awaymission/lucky7/privateroom/five) "hD" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/carpet/brown, @@ -1718,7 +1718,7 @@ /area/awaymission/lucky7/entry) "ir" = ( /obj/structure/table/gamblingtable, -/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, /obj/machinery/light, /turf/simulated/floor/carpet/retro, /area/awaymission/lucky7/arcade) @@ -2235,7 +2235,7 @@ /turf/simulated/floor/wood, /area/awaymission/lucky7/bar) "ln" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/carpet/brown, @@ -2373,8 +2373,8 @@ /area/awaymission/lucky7/kitchen) "mv" = ( /obj/structure/table/standard, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled, /area/awaymission/lucky7/laundry) "mw" = ( @@ -2415,7 +2415,7 @@ /area/awaymission/lucky7/trash) "mJ" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/belt/janitor, +/obj/item/storage/belt/janitor, /turf/simulated/floor/tiled, /area/awaymission/lucky7/maint1) "mK" = ( @@ -2502,7 +2502,7 @@ /turf/simulated/floor/carpet/brown, /area/awaymission/lucky7/casinofloor) "ng" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/carpet/brown, @@ -2835,8 +2835,8 @@ /area/awaymission/lucky7/privateroom/three) "oT" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/device/radio, +/obj/item/storage/firstaid/regular, +/obj/item/radio, /obj/item/ammo_casing/spent{ pixel_x = -12; pixel_y = 8 @@ -2888,7 +2888,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/lucky7/medical) "pn" = ( -/obj/item/weapon/flame/candle/candelabra/everburn, +/obj/item/flame/candle/candelabra/everburn, /obj/structure/table/fancyblack, /turf/simulated/floor/wood, /area/awaymission/lucky7/privateroom/vip) @@ -2912,14 +2912,14 @@ name = "Game Cabinet"; pixel_x = -28 }, -/obj/item/weapon/book/manual/wizzoffguide, -/obj/item/weapon/deck/wizoff, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/storage/dicecup, +/obj/item/book/manual/wizzoffguide, +/obj/item/deck/wizoff, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice, +/obj/item/deck/cards/casino, +/obj/item/deck/cah, +/obj/item/deck/cah/black, +/obj/item/storage/dicecup, /turf/simulated/floor/carpet/purple, /area/awaymission/lucky7/privategameroom) "py" = ( @@ -3075,7 +3075,7 @@ /area/space) "qv" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/captaindouble, +/obj/item/bedsheet/captaindouble, /obj/structure/curtain/open/bed, /turf/simulated/floor/carpet/purcarpet, /area/awaymission/lucky7/privateroom/vip) @@ -3290,7 +3290,7 @@ /area/awaymission/lucky7/maint2) "rN" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/manual/bar_guide, +/obj/item/book/manual/bar_guide, /turf/simulated/floor/wood, /area/awaymission/lucky7/barbackroom) "rT" = ( @@ -3385,7 +3385,7 @@ "ss" = ( /obj/structure/table/woodentable, /obj/item/trash/plate, -/obj/item/weapon/material/kitchen/utensil/fork/plastic, +/obj/item/material/kitchen/utensil/fork/plastic, /turf/simulated/floor/wood, /area/awaymission/lucky7/lounge) "sv" = ( @@ -3455,11 +3455,11 @@ /area/awaymission/lucky7/entry) "sX" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/fancy/cigar/havana{ +/obj/item/storage/fancy/cigar/havana{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/storage/fancy/cigar{ +/obj/item/storage/fancy/cigar{ pixel_x = 2; pixel_y = 3 }, @@ -3507,7 +3507,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /obj/effect/decal/cleanable/filth, @@ -3525,9 +3525,9 @@ "ts" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/closet/crate/internals, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, @@ -3579,7 +3579,7 @@ /area/awaymission/lucky7/bar) "tE" = ( /obj/structure/table/marble, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /obj/machinery/light/floortube{ dir = 4 }, @@ -3809,7 +3809,7 @@ /area/awaymission/lucky7/gateway) "uF" = ( /obj/structure/casino_table/craps, -/obj/item/weapon/dice{ +/obj/item/dice{ pixel_x = 4; pixel_y = 6 }, @@ -3824,7 +3824,7 @@ /area/awaymission/lucky7/privateroom) "uH" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /turf/simulated/floor/wood, /area/awaymission/lucky7/bar) "uI" = ( @@ -3877,7 +3877,7 @@ /obj/structure/casino_table/craps{ dir = 1 }, -/obj/item/weapon/dice, +/obj/item/dice, /turf/simulated/floor/carpet/brown, /area/awaymission/lucky7/casinofloor) "uZ" = ( @@ -3960,7 +3960,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 5 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/lino, @@ -3973,7 +3973,7 @@ /turf/simulated/floor/carpet/brown, /area/awaymission/lucky7/casinofloor) "vy" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /turf/simulated/floor/carpet/brown, @@ -4021,13 +4021,13 @@ /area/awaymission/lucky7/dock1) "wd" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/food/drinks/shaker, /turf/simulated/floor/lino, /area/awaymission/lucky7/bar) "we" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/manual/casino, -/obj/item/weapon/pen, +/obj/item/book/manual/casino, +/obj/item/pen, /turf/simulated/floor/tiled/dark, /area/awaymission/lucky7/breakroom) "wj" = ( @@ -4136,7 +4136,7 @@ "wG" = ( /obj/structure/table/woodentable, /obj/item/trash/asian_bowl, -/obj/item/weapon/material/kitchen/utensil/fork/plastic, +/obj/item/material/kitchen/utensil/fork/plastic, /obj/machinery/light{ dir = 8 }, @@ -4162,7 +4162,7 @@ /area/awaymission/lucky7/dock1) "wK" = ( /obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood, /area/awaymission/lucky7/privateroom/four) "wL" = ( @@ -4311,7 +4311,7 @@ /turf/simulated/floor/plating, /area/awaymission/lucky7/maint2) "xM" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /turf/simulated/floor/carpet/brown, @@ -4321,12 +4321,12 @@ /turf/simulated/floor/tiled/white, /area/awaymission/lucky7/privateroom/vip) "xU" = ( -/obj/item/weapon/gun/projectile/shotgun/pump{ +/obj/item/gun/projectile/shotgun/pump{ ammo_type = /obj/item/ammo_casing/a12g/pellet; pixel_x = 1; pixel_y = 4 }, -/obj/item/weapon/gun/projectile/shotgun/pump{ +/obj/item/gun/projectile/shotgun/pump{ ammo_type = /obj/item/ammo_casing/a12g/pellet; pixel_x = 2; pixel_y = -6 @@ -4393,7 +4393,7 @@ /area/awaymission/lucky7/hall2) "yv" = ( /obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood, /area/awaymission/lucky7/privateroom/two) "yw" = ( @@ -4614,7 +4614,7 @@ "zM" = ( /obj/structure/table/woodentable, /obj/item/trash/plate, -/obj/item/weapon/material/kitchen/utensil/fork/plastic, +/obj/item/material/kitchen/utensil/fork/plastic, /turf/simulated/floor/carpet/brown, /area/awaymission/lucky7/casinofloor) "zQ" = ( @@ -5224,7 +5224,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 10 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/lino, @@ -5556,7 +5556,7 @@ /obj/random/junk, /obj/random/maintenance, /obj/random/maintenance/engineering, -/obj/item/device/flashlight/color, +/obj/item/flashlight/color, /obj/structure/railing{ dir = 4 }, @@ -5621,7 +5621,7 @@ /turf/simulated/wall, /area/awaymission/lucky7/bar) "Fv" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -5866,7 +5866,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 5; pixel_y = 8 }, @@ -5876,7 +5876,7 @@ /area/awaymission/lucky7/medical) "GQ" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/random/maintenance/medical, /turf/simulated/floor/tiled/techfloor, /area/awaymission/lucky7/medical) @@ -6029,8 +6029,8 @@ "HH" = ( /obj/effect/floor_decal/rust, /obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/firealarm{ pixel_y = 26 @@ -6100,15 +6100,15 @@ /area/awaymission/lucky7/hall1) "HZ" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/spacecash/c1000{ +/obj/item/spacecash/c1000{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/spacecash/c1000{ +/obj/item/spacecash/c1000{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/spacecash/c1000, +/obj/item/spacecash/c1000, /turf/simulated/floor/tiled/techfloor, /area/awaymission/lucky7/security) "Ig" = ( @@ -6150,7 +6150,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 8 }, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /turf/simulated/floor/tiled/white, /area/awaymission/lucky7/medical) "Iq" = ( @@ -6178,7 +6178,7 @@ "Ir" = ( /obj/structure/table/glass, /obj/random/soap, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /obj/machinery/light{ dir = 8 }, @@ -6202,7 +6202,7 @@ /area/awaymission/lucky7/privategameroom/three) "Iu" = ( /obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood, /area/awaymission/lucky7/privateroom/five) "Iv" = ( @@ -6229,7 +6229,7 @@ /area/awaymission/lucky7/privateroom/five) "IJ" = ( /obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood, /area/awaymission/lucky7/privateroom/three) "IM" = ( @@ -6268,7 +6268,7 @@ pixel_y = 8 }, /obj/random/cash/huge, -/obj/item/weapon/bikehorn{ +/obj/item/bikehorn{ pixel_x = -7; pixel_y = 7 }, @@ -6354,7 +6354,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/lino, @@ -6523,7 +6523,7 @@ /area/awaymission/lucky7/dock2) "Kt" = ( /obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood, /area/awaymission/lucky7/privateroom) "Ku" = ( @@ -6637,7 +6637,7 @@ /obj/structure/table/steel, /obj/effect/floor_decal/rust, /obj/effect/decal/cleanable/blood/oil, -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/plating, /area/awaymission/lucky7/maint2) "KT" = ( @@ -6855,7 +6855,7 @@ /area/awaymission/lucky7/security) "LJ" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, +/obj/item/bedsheet/purpledouble, /obj/machinery/alarm{ dir = 8; pixel_x = 27 @@ -6942,30 +6942,30 @@ /area/awaymission/lucky7/workshop) "Mb" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /turf/simulated/floor/wood, /area/awaymission/lucky7/lounge) "Mc" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 7; pixel_y = -3 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_y = -3 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -7; pixel_y = -3 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 7; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -7; pixel_y = 3 }, @@ -6992,14 +6992,14 @@ name = "Game Cabinet"; pixel_x = -28 }, -/obj/item/weapon/book/manual/wizzoffguide, -/obj/item/weapon/deck/wizoff, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/storage/dicecup, +/obj/item/book/manual/wizzoffguide, +/obj/item/deck/wizoff, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice, +/obj/item/deck/cards/casino, +/obj/item/deck/cah, +/obj/item/deck/cah/black, +/obj/item/storage/dicecup, /turf/simulated/floor/carpet/green, /area/awaymission/lucky7/privategameroom/two) "Mf" = ( @@ -7179,11 +7179,11 @@ /area/awaymission/lucky7/maint2) "MX" = ( /obj/structure/table/steel, -/obj/item/weapon/tool/wrench{ +/obj/item/tool/wrench{ pixel_x = 6; pixel_y = -3 }, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = -6 }, /turf/simulated/floor/plating, @@ -7480,7 +7480,7 @@ /turf/simulated/floor/tiled, /area/awaymission/lucky7/security) "Ol" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -7577,7 +7577,7 @@ dir = 1 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled/dark, /area/awaymission/lucky7/security) "OC" = ( @@ -7757,10 +7757,10 @@ "Pq" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, /obj/structure/cable/green{ @@ -7810,14 +7810,14 @@ name = "Game Cabinet"; pixel_x = -28 }, -/obj/item/weapon/book/manual/wizzoffguide, -/obj/item/weapon/deck/wizoff, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/storage/dicecup, +/obj/item/book/manual/wizzoffguide, +/obj/item/deck/wizoff, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice, +/obj/item/deck/cards/casino, +/obj/item/deck/cah, +/obj/item/deck/cah/black, +/obj/item/storage/dicecup, /turf/simulated/floor/carpet/blue2, /area/awaymission/lucky7/privategameroom/three) "PC" = ( @@ -8103,11 +8103,11 @@ /area/awaymission/lucky7/casinofloor) "QU" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, @@ -8131,7 +8131,7 @@ "Rc" = ( /obj/effect/floor_decal/spline/plain, /obj/structure/table/woodentable, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /obj/random/cash/big{ pixel_x = 5; pixel_y = 8 @@ -8176,12 +8176,12 @@ /turf/simulated/floor/carpet/brown, /area/awaymission/lucky7/hotelhall) "Rw" = ( -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/simulated/floor/water/pool, /area/awaymission/lucky7/privateroom/vip) "Rx" = ( /obj/effect/floor_decal/spline/plain, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/lino, @@ -8287,7 +8287,7 @@ /turf/simulated/floor/carpet/brown, /area/awaymission/lucky7/hotelhall) "Sj" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/structure/disposalpipe/junction/yjunction{ dir = 8 }, @@ -8389,16 +8389,16 @@ /area/awaymission/lucky7/laundry) "SK" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /turf/simulated/floor/wood, /area/awaymission/lucky7/bar) "SM" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, /turf/simulated/floor/tiled/white, @@ -8833,7 +8833,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/white, /area/awaymission/lucky7/medical) "Uu" = ( @@ -8878,7 +8878,7 @@ /area/awaymission/lucky7/maint1) "UG" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/orangedouble, +/obj/item/bedsheet/orangedouble, /obj/machinery/alarm{ dir = 8; pixel_x = 27 @@ -8999,11 +8999,11 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 4 }, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /turf/simulated/floor/tiled/white, /area/awaymission/lucky7/medical) "Vv" = ( @@ -9059,7 +9059,7 @@ /area/awaymission/lucky7/entry) "VD" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/greendouble, +/obj/item/bedsheet/greendouble, /obj/machinery/alarm{ dir = 8; pixel_x = 27 @@ -9218,7 +9218,7 @@ /area/awaymission/lucky7/entry) "Wy" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/yellowdouble, +/obj/item/bedsheet/yellowdouble, /obj/machinery/alarm{ dir = 8; pixel_x = 27 @@ -9311,7 +9311,7 @@ dir = 9 }, /obj/structure/table/standard, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /turf/simulated/floor/tiled/white, /area/awaymission/lucky7/medical) "WR" = ( @@ -9608,7 +9608,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/lucky7/medical) "YD" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/carpet/brown, /area/awaymission/lucky7/casinofloor) "YE" = ( @@ -9688,8 +9688,8 @@ /area/awaymission/lucky7/privateroom/four) "Ze" = ( /obj/structure/table/reinforced, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs, /obj/item/ammo_casing/spent, /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -9789,14 +9789,14 @@ /turf/simulated/floor/tiled, /area/awaymission/lucky7/entry) "ZF" = ( -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/soap/nanotrasen, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/mousetraps, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/soap/nanotrasen, /obj/structure/closet, /obj/effect/floor_decal/rust, -/obj/item/weapon/storage/bag/trash, +/obj/item/storage/bag/trash, /turf/simulated/floor/tiled, /area/awaymission/lucky7/maint1) "ZJ" = ( @@ -9819,12 +9819,12 @@ /area/awaymission/lucky7/hall1) "ZO" = ( /obj/structure/table/steel, -/obj/item/weapon/spacecasinocash/c1000{ +/obj/item/spacecasinocash/c1000{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000{ +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000{ pixel_x = 3; pixel_y = 3 }, diff --git a/maps/gateway_vr/snow_outpost.dmm b/maps/gateway_vr/snow_outpost.dmm index 13435aff715..b7014e4ed4d 100644 --- a/maps/gateway_vr/snow_outpost.dmm +++ b/maps/gateway_vr/snow_outpost.dmm @@ -637,7 +637,7 @@ /turf/simulated/wall/sandstone, /area/awaymission/snow_outpost/dark) "cf" = ( -/obj/item/weapon/ore/diamond, +/obj/item/ore/diamond, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/dark) "cg" = ( @@ -651,7 +651,7 @@ /turf/simulated/floor/plating/external, /area/awaymission/snow_outpost/dark) "cj" = ( -/obj/item/weapon/ore, +/obj/item/ore, /turf/simulated/floor/plating/external, /area/awaymission/snow_outpost/dark) "ck" = ( @@ -687,7 +687,7 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/awaymission/snow_outpost/outside) "cs" = ( -/obj/item/weapon/ore, +/obj/item/ore, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/dark) "ct" = ( @@ -703,7 +703,7 @@ /area/awaymission/snow_outpost/dark) "cw" = ( /obj/item/frame/apc, -/obj/item/weapon/module/power_control, +/obj/item/module/power_control, /turf/simulated/floor/plating/external, /area/awaymission/snow_outpost/dark) "cx" = ( @@ -714,8 +714,8 @@ /area/awaymission/snow_outpost/dark) "cy" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/excavation, -/obj/item/device/measuring_tape, +/obj/item/storage/excavation, +/obj/item/measuring_tape, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/dark) "cz" = ( @@ -739,12 +739,12 @@ /area/awaymission/snow_outpost/dark) "cC" = ( /obj/structure/table/steel, -/obj/item/weapon/folder, +/obj/item/folder, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/dark) "cD" = ( /obj/structure/table/rack, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/dark) "cE" = ( @@ -762,7 +762,7 @@ /area/awaymission/snow_outpost/dark) "cH" = ( /obj/structure/table/rack, -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/dark) "cI" = ( @@ -780,8 +780,8 @@ /area/awaymission/snow_outpost/dark) "cL" = ( /obj/structure/table/steel, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/storage/box/samplebags, +/obj/item/tool/wrench, +/obj/item/storage/box/samplebags, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/dark) "cM" = ( @@ -821,7 +821,7 @@ /area/awaymission/snow_outpost/powered) "cV" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/powered) "cW" = ( @@ -830,7 +830,7 @@ /area/awaymission/snow_outpost/powered) "cX" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/light{ icon_state = "tube1"; dir = 1 @@ -851,36 +851,36 @@ /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/dark) "db" = ( -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/dark) "dc" = ( -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/dark) "dd" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/powered) "de" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/light, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/powered) @@ -902,8 +902,8 @@ /area/awaymission/snow_outpost/powered) "di" = ( /obj/structure/table/standard, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, +/obj/item/cell/high, +/obj/item/cell/high, /turf/simulated/floor, /area/awaymission/snow_outpost/powered) "dj" = ( @@ -949,7 +949,7 @@ /area/awaymission/snow_outpost/powered) "ds" = ( /obj/structure/table/rack, -/obj/item/weapon/pickaxe/drill, +/obj/item/pickaxe/drill, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/powered) "dt" = ( @@ -976,7 +976,7 @@ /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/powered) "dy" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/powered) "dz" = ( @@ -1019,7 +1019,7 @@ /obj/structure/closet/crate, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/weapon/storage/toolbox, +/obj/item/storage/toolbox, /obj/random/toolbox, /turf/simulated/shuttle/floor/alienplating, /area/awaymission/snow_outpost/dark) @@ -1037,7 +1037,7 @@ /area/awaymission/snow_outpost/dark) "dJ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/cell/void, +/obj/item/cell/void, /turf/simulated/shuttle/floor/alienplating, /area/awaymission/snow_outpost/dark) "dK" = ( @@ -1183,8 +1183,8 @@ /area/awaymission/snow_outpost/powered) "ed" = ( /obj/structure/table/steel, -/obj/item/weapon/gun/projectile/automatic/wt550, -/obj/item/weapon/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/wt550, +/obj/item/gun/projectile/automatic/p90, /turf/simulated/floor/tiled/steel_grid, /area/awaymission/snow_outpost/powered) "ee" = ( @@ -1302,7 +1302,7 @@ /area/awaymission/snow_outpost/powered) "ex" = ( /obj/structure/table/steel, -/obj/item/weapon/grenade/smokebomb, +/obj/item/grenade/smokebomb, /turf/simulated/floor/tiled/steel_grid, /area/awaymission/snow_outpost/powered) "ey" = ( @@ -1326,7 +1326,7 @@ /area/awaymission/snow_outpost/powered) "eB" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /obj/effect/floor_decal/corner/green/border{ icon_state = "bordercolor"; dir = 10 @@ -1335,7 +1335,7 @@ /area/awaymission/snow_outpost/powered) "eC" = ( /obj/structure/table/standard, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/effect/floor_decal/corner/green/border, /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) @@ -1352,14 +1352,14 @@ /area/awaymission/snow_outpost/powered) "eF" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/spray/sterilizine, -/obj/item/weapon/reagent_containers/spray/sterilizine, +/obj/item/reagent_containers/spray/sterilizine, +/obj/item/reagent_containers/spray/sterilizine, /obj/effect/floor_decal/corner/green/border, /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) "eG" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /obj/effect/floor_decal/corner/green/border{ icon_state = "bordercolor"; dir = 6 @@ -1427,7 +1427,7 @@ /area/awaymission/snow_outpost/powered) "eQ" = ( /obj/structure/table/steel, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /turf/simulated/floor/tiled/steel, /area/awaymission/snow_outpost/powered) "eR" = ( @@ -1504,7 +1504,7 @@ /turf/simulated/floor/tiled/steel, /area/awaymission/snow_outpost/powered) "fb" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/tiled/steel, /area/awaymission/snow_outpost/powered) "fc" = ( @@ -1618,7 +1618,7 @@ /area/awaymission/snow_outpost/powered) "fu" = ( /obj/structure/table/steel, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "We need to take a short stop. The engine's are in need of minor repairs due to turbulence, should be a week's time. We've got reserve food supplies but pleanty of locale fauna to subsist on too if need be. PCRC is keeping most of there assets near New Reykjavik and locale authorities are more mindful then most to travel in this kind of weather. Our outfit should be at the rendezvous point in less then ten days assuming the upper ecehelon hasn't dropped ties with us yet."; name = "Operation Progress/M-53" }, @@ -1626,7 +1626,7 @@ /area/awaymission/snow_outpost/powered) "fv" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/tiled/steel, /area/awaymission/snow_outpost/powered) "fw" = ( @@ -1692,7 +1692,7 @@ /area/awaymission/snow_outpost/powered) "fF" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled/steel, /area/awaymission/snow_outpost/powered) "fG" = ( @@ -1708,7 +1708,7 @@ /area/awaymission/snow_outpost/powered) "fJ" = ( /obj/structure/table/steel, -/obj/item/weapon/gun/projectile/pistol, +/obj/item/gun/projectile/pistol, /obj/machinery/light/small{ dir = 4; pixel_y = 0 @@ -1723,7 +1723,7 @@ /area/awaymission/snow_outpost/powered) "fL" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/bed, /turf/simulated/floor/tiled/steel, /area/awaymission/snow_outpost/powered) @@ -1787,7 +1787,7 @@ /area/awaymission/snow_outpost/powered) "fU" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/light, /turf/simulated/floor/tiled/steel, /area/awaymission/snow_outpost/powered) @@ -1796,7 +1796,7 @@ /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/dark) "fW" = ( -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, /obj/tether_away_spawner/aerostat_inside, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/dark) @@ -1817,7 +1817,7 @@ /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "gb" = ( -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/dark) "gc" = ( @@ -1838,7 +1838,7 @@ /area/awaymission/snow_outpost/outside) "gg" = ( /obj/item/ammo_casing/a45, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat, +/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "gh" = ( @@ -1879,7 +1879,7 @@ }, /area/awaymission/snow_outpost/outside) "go" = ( -/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat, +/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat, /turf/simulated/floor/snow/snow2, /area/awaymission/snow_outpost/outside) "gp" = ( @@ -1888,7 +1888,7 @@ /area/awaymission/snow_outpost/outside) "gq" = ( /obj/item/clothing/accessory/storage/webbing, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -1974,13 +1974,13 @@ /area/awaymission/snow_outpost/dark) "gE" = ( /obj/structure/closet/crate, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, -/obj/item/weapon/reagent_containers/glass/bottle/antitoxin, -/obj/item/weapon/reagent_containers/pill/antitox, -/obj/item/weapon/reagent_containers/pill/antitox, -/obj/item/weapon/reagent_containers/pill/antitox, -/obj/item/weapon/reagent_containers/pill/paracetamol, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/glass/bottle/antitoxin, +/obj/item/reagent_containers/pill/antitox, +/obj/item/reagent_containers/pill/antitox, +/obj/item/reagent_containers/pill/antitox, +/obj/item/reagent_containers/pill/paracetamol, /obj/random/firstaid, /turf/simulated/shuttle/floor/alienplating, /area/awaymission/snow_outpost/dark) @@ -1997,11 +1997,11 @@ /obj/random/contraband, /obj/random/contraband, /obj/random/energy, -/obj/item/weapon/material/star, -/obj/item/weapon/material/star, -/obj/item/weapon/material/star, -/obj/item/weapon/material/star, -/obj/item/weapon/material/star, +/obj/item/material/star, +/obj/item/material/star, +/obj/item/material/star, +/obj/item/material/star, +/obj/item/material/star, /turf/simulated/shuttle/floor/alienplating, /area/awaymission/snow_outpost/dark) "gH" = ( @@ -2097,18 +2097,18 @@ /area/awaymission/snow_outpost/dark) "ha" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/dark) "hb" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/curtain/open/bed, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/dark) "hc" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/pill/happy{ +/obj/item/reagent_containers/pill/happy{ name = "pill" }, /turf/simulated/floor/carpet, @@ -2134,7 +2134,7 @@ /area/awaymission/snow_outpost/dark) "hi" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/pill/methylphenidate{ +/obj/item/reagent_containers/pill/methylphenidate{ name = "pill" }, /turf/simulated/floor/carpet, @@ -2147,7 +2147,7 @@ /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/dark) "hk" = ( -/obj/item/weapon/reagent_containers/pill/citalopram{ +/obj/item/reagent_containers/pill/citalopram{ name = "pill" }, /turf/simulated/floor/carpet, @@ -2167,13 +2167,13 @@ /area/awaymission/snow_outpost/dark) "ho" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, -/obj/item/weapon/reagent_containers/syringe/drugs, +/obj/item/flashlight/lamp, +/obj/item/reagent_containers/syringe/drugs, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/dark) "hp" = ( /obj/structure/bed/chair/comfy/beige, -/obj/item/weapon/reagent_containers/pill/citalopram{ +/obj/item/reagent_containers/pill/citalopram{ name = "pill" }, /turf/simulated/floor/carpet, @@ -2183,17 +2183,17 @@ /turf/simulated/floor, /area/awaymission/snow_outpost/dark) "hr" = ( -/obj/item/weapon/reagent_containers/pill/citalopram{ +/obj/item/reagent_containers/pill/citalopram{ name = "pill" }, -/obj/item/weapon/reagent_containers/pill/citalopram{ +/obj/item/reagent_containers/pill/citalopram{ name = "pill" }, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/dark) "hs" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/pill_bottle/happy, +/obj/item/storage/pill_bottle/happy, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/dark) "ht" = ( @@ -2203,31 +2203,31 @@ /area/awaymission/snow_outpost/dark) "hu" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/pill/citalopram, -/obj/item/weapon/reagent_containers/pill/citalopram, +/obj/item/reagent_containers/pill/citalopram, +/obj/item/reagent_containers/pill/citalopram, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/dark) "hv" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/pill/tramadol, -/obj/item/weapon/reagent_containers/pill/tramadol, +/obj/item/reagent_containers/pill/tramadol, +/obj/item/reagent_containers/pill/tramadol, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/dark) "hw" = ( /obj/structure/closet/cabinet, /obj/item/clothing/accessory/jacket, -/obj/item/weapon/material/butterfly/switchblade, +/obj/item/material/butterfly/switchblade, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/dark) "hx" = ( -/obj/item/weapon/reagent_containers/pill/zoom{ +/obj/item/reagent_containers/pill/zoom{ name = "pill" }, /obj/random/trash, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/dark) "hy" = ( -/obj/item/weapon/reagent_containers/pill/zoom{ +/obj/item/reagent_containers/pill/zoom{ name = "pill" }, /turf/simulated/floor/carpet, @@ -2238,7 +2238,7 @@ /area/awaymission/snow_outpost/dark) "hA" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/scalpel, /turf/simulated/floor/tiled, /area/awaymission/snow_outpost/dark) "hB" = ( @@ -2261,13 +2261,13 @@ /area/awaymission/snow_outpost/dark) "hF" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/pill/zoom, -/obj/item/weapon/reagent_containers/pill/zoom, +/obj/item/reagent_containers/pill/zoom, +/obj/item/reagent_containers/pill/zoom, /turf/simulated/floor, /area/awaymission/snow_outpost/dark) "hG" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/pill/tramadol{ +/obj/item/reagent_containers/pill/tramadol{ name = "pill" }, /turf/simulated/floor/carpet, @@ -2281,17 +2281,17 @@ /turf/simulated/floor, /area/awaymission/snow_outpost/dark) "hJ" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor, /area/awaymission/snow_outpost/dark) "hK" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/dark) "hL" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/syringe/drugs, +/obj/item/reagent_containers/syringe/drugs, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/dark) "hM" = ( @@ -2303,8 +2303,8 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/awaymission/snow_outpost/outside) "hO" = ( -/obj/item/weapon/spacecash/c100, -/obj/item/weapon/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, /turf/simulated/mineral/floor/ignore_mapgen, /area/awaymission/snow_outpost/dark) "hP" = ( @@ -2312,9 +2312,9 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/awaymission/snow_outpost/outside) "hQ" = ( -/obj/item/weapon/spacecash/c100, -/obj/item/weapon/spacecash/c100, -/obj/item/weapon/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, +/obj/item/spacecash/c100, /obj/effect/decal/remains, /turf/simulated/mineral/floor/ignore_mapgen, /area/awaymission/snow_outpost/dark) @@ -2323,7 +2323,7 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/awaymission/snow_outpost/dark) "hS" = ( -/obj/item/weapon/grenade/spawnergrenade/spider, +/obj/item/grenade/spawnergrenade/spider, /turf/simulated/mineral/floor/ignore_mapgen, /area/awaymission/snow_outpost/dark) "hT" = ( @@ -2429,7 +2429,7 @@ dir = 1 }, /obj/structure/closet/walllocker/emerglocker/east, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -28 @@ -2502,7 +2502,7 @@ /obj/structure/closet/walllocker/emerglocker{ pixel_y = 28 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -26 }, /turf/simulated/shuttle/floor, @@ -2516,7 +2516,7 @@ pixel_y = 28 }, /obj/machinery/light, -/obj/item/weapon/weldingtool/largetank, +/obj/item/weldingtool/largetank, /turf/simulated/shuttle/floor, /area/awaymission/snow_outpost/outside) "iz" = ( @@ -2621,7 +2621,7 @@ /area/awaymission/snow_outpost/powered) "iT" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/item/toy/plushie/spider, /turf/simulated/floor/tiled/steel, /area/awaymission/snow_outpost/powered) diff --git a/maps/gateway_vr/snowfield.dm b/maps/gateway_vr/snowfield.dm index 7315fdb3650..f8679ae65c5 100644 --- a/maps/gateway_vr/snowfield.dm +++ b/maps/gateway_vr/snowfield.dm @@ -86,7 +86,7 @@ minbodytemp = 0 //speak_chance = 1 //VORESTATION AI TEMPORARY REMOVAL - meat_type = /obj/item/weapon/reagent_containers/food/snacks/bearmeat + meat_type = /obj/item/reagent_containers/food/snacks/bearmeat /datum/say_list/polar_bear speak = list("RAWR!","Rawr!","GRR!","Growl!") emote_hear = list("rawrs","grumbles","grawls") diff --git a/maps/gateway_vr/snowfield.dmm b/maps/gateway_vr/snowfield.dmm index 397de9c2ab5..a2f68bfa418 100644 --- a/maps/gateway_vr/snowfield.dmm +++ b/maps/gateway_vr/snowfield.dmm @@ -79,7 +79,7 @@ amount = 2; icon_state = "coil2" }, -/obj/item/weapon/shovel, +/obj/item/shovel, /obj/machinery/light/small{ dir = 1 }, @@ -157,7 +157,7 @@ /area/awaymission/snowfield/base) "aw" = ( /obj/structure/table/standard, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/effect/floor_decal/corner/green/full{ dir = 8 }, @@ -215,7 +215,7 @@ /area/awaymission/snowfield/base) "aE" = ( /obj/machinery/atmospherics/portables_connector, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/machinery/light{ dir = 1 }, @@ -239,7 +239,7 @@ dir = 6 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, @@ -247,12 +247,12 @@ /area/awaymission/snowfield/base) "aJ" = ( /obj/structure/closet/jcloset, -/obj/item/weapon/soap, +/obj/item/soap, /turf/simulated/floor/tiled/steel, /area/awaymission/snowfield/base) "aK" = ( /obj/structure/closet/jcloset, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /turf/simulated/floor/tiled/steel, /area/awaymission/snowfield/base) "aL" = ( @@ -367,7 +367,7 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/botanydisk, +/obj/item/storage/box/botanydisk, /turf/simulated/floor/tiled/white, /area/awaymission/snowfield/base) "ba" = ( @@ -405,7 +405,7 @@ /area/awaymission/snowfield/base) "bh" = ( /obj/effect/floor_decal/corner/green/full, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -457,15 +457,15 @@ /turf/simulated/floor/tiled/hydro, /area/awaymission/snowfield/base) "bn" = ( -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/table/steel, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/storage/box/mousetraps, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/steel, /area/awaymission/snowfield/base) "bo" = ( @@ -543,11 +543,11 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/white, /area/awaymission/snowfield/base) "by" = ( @@ -565,7 +565,7 @@ /turf/simulated/floor/tiled/hydro, /area/awaymission/snowfield/base) "bB" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -580,8 +580,8 @@ pixel_y = -32 }, /obj/structure/table/standard, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/syringes, +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, @@ -592,7 +592,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ layer = 4; name = "Station Intercom (General)"; pixel_y = -21 @@ -608,7 +608,7 @@ /area/awaymission/snowfield/base) "bF" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/awaymission/snowfield/base) @@ -626,8 +626,8 @@ /obj/structure/closet/medical_wall{ pixel_y = -32 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled/white, /area/awaymission/snowfield/base) "bI" = ( @@ -647,8 +647,8 @@ /area/awaymission/snowfield/base) "bL" = ( /obj/structure/table/glass, -/obj/item/weapon/tape_roll, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/tape_roll, +/obj/item/analyzer/plant_analyzer, /turf/simulated/floor/tiled/white, /area/awaymission/snowfield/base) "bM" = ( @@ -656,13 +656,13 @@ dir = 6 }, /obj/structure/table/glass, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white, +/obj/item/clipboard, +/obj/item/folder/white, /turf/simulated/floor/tiled/white, /area/awaymission/snowfield/base) "bN" = ( -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /obj/structure/janitorialcart, /turf/simulated/floor/tiled/steel, /area/awaymission/snowfield/base) @@ -791,7 +791,7 @@ "cf" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/table/standard, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 2 }, @@ -873,7 +873,7 @@ /area/awaymission/snowfield/base) "cq" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/white, /area/awaymission/snowfield/base) "cr" = ( @@ -918,7 +918,7 @@ "cw" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/table/standard, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /turf/simulated/floor/tiled/white, /area/awaymission/snowfield/base) "cx" = ( @@ -1247,7 +1247,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/tiled/dark, /area/awaymission/snowfield/base) "dH" = ( @@ -1296,14 +1296,14 @@ /obj/structure/closet/medical_wall{ pixel_y = -32 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/adv, /turf/simulated/floor/tiled/dark, /area/awaymission/snowfield/base) "dP" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/backpack/satchel/sec, +/obj/item/storage/backpack/satchel/sec, /turf/simulated/floor/tiled/dark, /area/awaymission/snowfield/base) "dQ" = ( @@ -1354,7 +1354,7 @@ /obj/item/clothing/under/soviet, /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/head/ushanka, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, /turf/simulated/floor/tiled/dark, /area/awaymission/snowfield/base) "dZ" = ( @@ -1369,7 +1369,7 @@ "ea" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/base) "eb" = ( @@ -1412,7 +1412,7 @@ /area/awaymission/snowfield/base) "eh" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/weapon/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/projectile/shotgun/pump/rifle, /turf/simulated/floor/tiled/dark, /area/awaymission/snowfield/base) "ei" = ( @@ -1427,12 +1427,12 @@ "ek" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/base) "el" = ( diff --git a/maps/gateway_vr/variable/arynthilake.dm b/maps/gateway_vr/variable/arynthilake.dm index 50421175f36..9a4a171a90c 100644 --- a/maps/gateway_vr/variable/arynthilake.dm +++ b/maps/gateway_vr/variable/arynthilake.dm @@ -83,6 +83,6 @@ /area/gateway/arynthilake/underground/intocave icon_state = "redwhisqu" -/obj/item/weapon/paper/gateway/arynthilake +/obj/item/paper/gateway/arynthilake name = "Maintenance Tunnel Notes" info = "Please be advised

Beyond this point the underground maintenance tunnels are dangerous. Monsters have taken to making their nests in the tunnels. As such we have installed an automatic defense system.

The turrets and supply caches in the tunnels are powered by this facility. Should there be undesired creatures or personnel in the tunnels, the turrets exist to keep them clear.

The turret control system is situated within the local administration building. It is advised that you never enter the tunnels outside of regulatly scheduled maintenance windows, and never without secturity escort.

If you should need to enter the tunnels outside of regularly scheduled maintenance windows, it is advised that you contact the administration building to disable the turrets, and when you are done, contact them again to re-enable them.

Your safety is important to us. Should you end up within the tunnels when dangerous entities are present, it is advised to seek out the supply caches scattered throughout. Survival equipment can be obtained from within.

" \ No newline at end of file diff --git a/maps/gateway_vr/variable/arynthilake_a.dmm b/maps/gateway_vr/variable/arynthilake_a.dmm index 8f4cee6f6c8..bfef889fb93 100644 --- a/maps/gateway_vr/variable/arynthilake_a.dmm +++ b/maps/gateway_vr/variable/arynthilake_a.dmm @@ -87,7 +87,7 @@ /area/gateway/arynthilake/caveruins) "aD" = ( /obj/structure/table/woodentable, -/obj/item/weapon/lampshade, +/obj/item/lampshade, /obj/effect/landmark/mcguffin_spawner, /turf/simulated/floor/plating/external, /area/gateway/arynthilake/caveruins) @@ -146,7 +146,7 @@ /turf/simulated/floor/wood/sif/broken, /area/gateway/arynthilake/oldcabin) "aV" = ( -/obj/item/weapon/lampshade, +/obj/item/lampshade, /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "aX" = ( @@ -436,28 +436,28 @@ /area/gateway/arynthilake/dome) "cG" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/mass_spectrometry, -/obj/item/weapon/book/manual/materials_chemistry_analysis, -/obj/item/weapon/book/manual/medical_cloning, -/obj/item/weapon/book/manual/medical_diagnostics_manual, -/obj/item/weapon/book/manual/nuclear, -/obj/item/weapon/book/manual/research_and_development, -/obj/item/weapon/book/manual/resleeving, -/obj/item/weapon/book/manual/ripley_build_and_repair, -/obj/item/weapon/book/manual/robotics_cyborgs, -/obj/item/weapon/book/manual/rust_engine, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/stasis, -/obj/item/weapon/book/manual/supermatter_engine, -/obj/item/weapon/book/manual/tesla_engine, +/obj/item/book/manual/mass_spectrometry, +/obj/item/book/manual/materials_chemistry_analysis, +/obj/item/book/manual/medical_cloning, +/obj/item/book/manual/medical_diagnostics_manual, +/obj/item/book/manual/nuclear, +/obj/item/book/manual/research_and_development, +/obj/item/book/manual/resleeving, +/obj/item/book/manual/ripley_build_and_repair, +/obj/item/book/manual/robotics_cyborgs, +/obj/item/book/manual/rust_engine, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/stasis, +/obj/item/book/manual/supermatter_engine, +/obj/item/book/manual/tesla_engine, /turf/simulated/floor/wood{ outdoors = 1 }, /area/gateway/arynthilake/dome) "dg" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/gateway/arynthilake/dome) "dB" = ( @@ -471,7 +471,7 @@ /area/gateway/arynthilake/dome) "dI" = ( /obj/structure/table/darkglass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 9 }, @@ -504,9 +504,9 @@ /area/gateway/arynthilake/engine) "eo" = ( /obj/structure/bookcase, -/obj/item/weapon/book/custom_library/religious/storyoflordganesha, -/obj/item/weapon/book/custom_library/religious/sungoddessofkorea, -/obj/item/weapon/book/custom_library/religious/wayofbleedingswan, +/obj/item/book/custom_library/religious/storyoflordganesha, +/obj/item/book/custom_library/religious/sungoddessofkorea, +/obj/item/book/custom_library/religious/wayofbleedingswan, /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "er" = ( @@ -523,8 +523,8 @@ /area/gateway/arynthilake/engine) "ex" = ( /obj/machinery/light, -/obj/item/device/flash, -/obj/item/weapon/stamp, +/obj/item/flash, +/obj/item/stamp, /obj/structure/closet/walllocker{ dir = 4; pixel_x = 27 @@ -536,12 +536,12 @@ /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "eW" = ( -/obj/item/device/analyzer/plant_analyzer, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/minihoe, +/obj/item/analyzer/plant_analyzer, +/obj/item/material/minihoe, +/obj/item/material/minihoe, /obj/structure/closet, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/landmark/mcguffin_spawner, /turf/simulated/floor/tiled/eris/techmaint_cargo, /area/gateway/arynthilake/dome) @@ -561,9 +561,9 @@ /area/gateway/arynthilake/dome) "fu" = ( /obj/structure/table/darkglass, -/obj/item/weapon/pen, -/obj/item/weapon/folder/red, -/obj/item/weapon/paper_bin{ +/obj/item/pen, +/obj/item/folder/red, +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 9 }, @@ -596,7 +596,7 @@ /area/gateway/arynthilake) "fY" = ( /obj/structure/mopbucket, -/obj/item/weapon/mop, +/obj/item/mop, /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) "gu" = ( @@ -664,8 +664,8 @@ /area/gateway/arynthilake/dome) "il" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/bundle/custom_library/nonfiction/viabilityofcorporategov, +/obj/item/book/manual/security_space_law, +/obj/item/book/bundle/custom_library/nonfiction/viabilityofcorporategov, /turf/simulated/floor/carpet/blucarpet, /area/gateway/arynthilake/dome) "iI" = ( @@ -735,12 +735,12 @@ dir = 8 }, /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/gateway/arynthilake/dome) "jZ" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) "kf" = ( @@ -754,12 +754,12 @@ /area/gateway/arynthilake/dome) "kk" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/carpet/bcarpet, /area/gateway/arynthilake/dome) "kl" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) "ko" = ( @@ -777,9 +777,9 @@ /area/gateway/arynthilake/dome) "kK" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/reference/recyclingprocedures, -/obj/item/weapon/book/custom_library/reference/securityguidelines, -/obj/item/weapon/book/custom_library/reference/spacesurvivalguidedespressurization, +/obj/item/book/bundle/custom_library/reference/recyclingprocedures, +/obj/item/book/custom_library/reference/securityguidelines, +/obj/item/book/custom_library/reference/spacesurvivalguidedespressurization, /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "kX" = ( @@ -828,7 +828,7 @@ /obj/structure/table/standard{ color = "#b8e4ff" }, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) "lI" = ( @@ -838,9 +838,9 @@ /area/gateway/arynthilake/dome) "lO" = ( /obj/structure/table/darkglass, -/obj/item/weapon/pen, -/obj/item/weapon/folder/blue, -/obj/item/weapon/paper_bin{ +/obj/item/pen, +/obj/item/folder/blue, +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 9 }, @@ -893,7 +893,7 @@ /area/gateway/arynthilake) "mL" = ( /obj/structure/table/darkglass, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/random/snack, /obj/random/snack, /turf/simulated/floor/carpet/bcarpet, @@ -1079,9 +1079,9 @@ /area/gateway/arynthilake/dome) "qW" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/reference/ThermodynamicReactionsandResearch, -/obj/item/weapon/book/bundle/custom_library/reference/fbpandprostheticmaintenance, -/obj/item/weapon/book/custom_library/reference/fistfulofd6splayersguide, +/obj/item/book/bundle/custom_library/reference/ThermodynamicReactionsandResearch, +/obj/item/book/bundle/custom_library/reference/fbpandprostheticmaintenance, +/obj/item/book/custom_library/reference/fistfulofd6splayersguide, /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "rm" = ( @@ -1134,24 +1134,24 @@ /obj/random/meat, /obj/random/meat, /obj/random/meat, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/yeast, -/obj/item/weapon/reagent_containers/food/condiment/yeast, -/obj/item/weapon/reagent_containers/food/condiment/yeast, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/yeast, +/obj/item/reagent_containers/food/condiment/yeast, +/obj/item/reagent_containers/food/condiment/yeast, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, /obj/random/awayloot, /obj/effect/landmark/mcguffin_spawner, /turf/simulated/floor/tiled/eris/cafe{ @@ -1186,11 +1186,11 @@ /obj/structure/table/standard{ color = "#ffb8b8" }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) "sO" = ( @@ -1205,11 +1205,11 @@ /area/gateway/arynthilake) "to" = ( /obj/structure/table/sifwooden_reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/random/awayloot, /turf/simulated/floor/carpet{ outdoors = 1 @@ -1267,11 +1267,11 @@ /obj/structure/table/standard{ color = "#b8e4ff" }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) "vy" = ( @@ -1295,12 +1295,12 @@ /obj/structure/closet/walllocker_double{ pixel_y = 26 }, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/multitool, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/multitool, /obj/random/tool, /obj/random/tool, /obj/random/tool/power, @@ -1313,7 +1313,7 @@ /area/gateway/arynthilake/engine) "wb" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/reddouble, +/obj/item/bedsheet/reddouble, /obj/effect/landmark/mcguffin_spawner, /turf/simulated/floor/carpet/blucarpet, /area/gateway/arynthilake/dome) @@ -1370,16 +1370,16 @@ /area/gateway/arynthilake/dome) "xu" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/manfromsnowyriver, -/obj/item/weapon/book/bundle/custom_library/fiction/metalglen, -/obj/item/weapon/book/bundle/custom_library/fiction/poemsforarainyday, -/obj/item/weapon/book/bundle/custom_library/fiction/raissue142, -/obj/item/weapon/book/bundle/custom_library/fiction/raissue147, -/obj/item/weapon/book/bundle/custom_library/fiction/silence, -/obj/item/weapon/book/bundle/custom_library/fiction/taleoftherainbowcat, -/obj/item/weapon/book/custom_library/fiction/starsandsometimesfallingones, -/obj/item/weapon/book/custom_library/fiction/truelovehathmyheart, -/obj/item/weapon/book/custom_library/fiction/woodysgotwood, +/obj/item/book/bundle/custom_library/fiction/manfromsnowyriver, +/obj/item/book/bundle/custom_library/fiction/metalglen, +/obj/item/book/bundle/custom_library/fiction/poemsforarainyday, +/obj/item/book/bundle/custom_library/fiction/raissue142, +/obj/item/book/bundle/custom_library/fiction/raissue147, +/obj/item/book/bundle/custom_library/fiction/silence, +/obj/item/book/bundle/custom_library/fiction/taleoftherainbowcat, +/obj/item/book/custom_library/fiction/starsandsometimesfallingones, +/obj/item/book/custom_library/fiction/truelovehathmyheart, +/obj/item/book/custom_library/fiction/woodysgotwood, /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "xv" = ( @@ -1451,7 +1451,7 @@ /area/gateway/arynthilake/engine) "At" = ( /obj/structure/table/fancyblack, -/obj/item/weapon/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, /turf/simulated/floor/tiled/eris/dark/brown_platform, /area/gateway/arynthilake/dome) "Ax" = ( @@ -1490,8 +1490,8 @@ /area/gateway/arynthilake/dome) "Bg" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/ghostship, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/bundle/custom_library/fiction/ghostship, +/obj/item/book/manual/security_space_law, /turf/simulated/floor/carpet/bcarpet, /area/gateway/arynthilake/dome) "Bv" = ( @@ -1614,7 +1614,7 @@ /area/gateway/arynthilake/gateway) "Fk" = ( /obj/structure/table/sifwooden_reinforced, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet/purcarpet, /area/gateway/arynthilake/dome) "Fm" = ( @@ -1625,8 +1625,8 @@ /area/gateway/arynthilake/gateway) "Fq" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/religious/zoroastrianism, -/obj/item/weapon/book/custom_library/religious/feastofkubera, +/obj/item/book/bundle/custom_library/religious/zoroastrianism, +/obj/item/book/custom_library/religious/feastofkubera, /turf/simulated/floor/wood{ outdoors = 1 }, @@ -1672,12 +1672,12 @@ /area/gateway/arynthilake/dome) "Gc" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/book/manual/chef_recipes, +/obj/item/book/manual/chef_recipes, /obj/effect/landmark/mcguffin_spawner, /turf/simulated/floor/tiled/eris/cafe, /area/gateway/arynthilake/dome) "Gh" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/carpet/purcarpet, /area/gateway/arynthilake/dome) "Gp" = ( @@ -1806,23 +1806,23 @@ /area/gateway/arynthilake) "JQ" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/anomaly_spectroscopy, -/obj/item/weapon/book/manual/anomaly_testing, -/obj/item/weapon/book/manual/atmospipes, -/obj/item/weapon/book/manual/bar_guide, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/cook_guide, -/obj/item/weapon/book/manual/detective, -/obj/item/weapon/book/manual/engineering_construction, -/obj/item/weapon/book/manual/engineering_guide, -/obj/item/weapon/book/manual/engineering_hacking, -/obj/item/weapon/book/manual/engineering_particle_accelerator, -/obj/item/weapon/book/manual/engineering_singularity_safety, -/obj/item/weapon/book/manual/evaguide, -/obj/item/weapon/book/manual/excavation, -/obj/item/weapon/book/manual/hydroponics_pod_people, +/obj/item/book/manual/anomaly_spectroscopy, +/obj/item/book/manual/anomaly_testing, +/obj/item/book/manual/atmospipes, +/obj/item/book/manual/bar_guide, +/obj/item/book/manual/barman_recipes, +/obj/item/book/manual/chef_recipes, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/cook_guide, +/obj/item/book/manual/detective, +/obj/item/book/manual/engineering_construction, +/obj/item/book/manual/engineering_guide, +/obj/item/book/manual/engineering_hacking, +/obj/item/book/manual/engineering_particle_accelerator, +/obj/item/book/manual/engineering_singularity_safety, +/obj/item/book/manual/evaguide, +/obj/item/book/manual/excavation, +/obj/item/book/manual/hydroponics_pod_people, /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "Kc" = ( @@ -1870,7 +1870,7 @@ /turf/simulated/floor/tiled/eris/cafe, /area/gateway/arynthilake/dome) "Lr" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/structure/table/rack/steel, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/gateway/arynthilake/dome) @@ -1888,11 +1888,11 @@ /area/gateway/arynthilake/dome) "LQ" = ( /obj/structure/table/sifwooden_reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 5; pixel_y = 9 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_x = -4; pixel_y = -2 }, @@ -1900,8 +1900,8 @@ /area/gateway/arynthilake/dome) "LR" = ( /obj/structure/table/sifwooden_reinforced, -/obj/item/weapon/newspaper, -/obj/item/weapon/dice/d20, +/obj/item/newspaper, +/obj/item/dice/d20, /turf/simulated/floor/carpet/purcarpet, /area/gateway/arynthilake/dome) "Md" = ( @@ -1916,7 +1916,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/gateway/arynthilake/dome) "Mq" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, /turf/simulated/floor/carpet/purcarpet, /area/gateway/arynthilake/dome) @@ -1932,22 +1932,22 @@ /area/gateway/arynthilake/engine) "MH" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual, -/obj/item/weapon/book/manual/anomaly_spectroscopy, -/obj/item/weapon/book/manual/anomaly_testing, -/obj/item/weapon/book/manual/atmospipes, -/obj/item/weapon/book/manual/bar_guide, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/cook_guide, -/obj/item/weapon/book/manual/detective, -/obj/item/weapon/book/manual/engineering_construction, -/obj/item/weapon/book/manual/engineering_guide, -/obj/item/weapon/book/manual/engineering_hacking, -/obj/item/weapon/book/manual/engineering_particle_accelerator, -/obj/item/weapon/book/manual/engineering_singularity_safety, -/obj/item/weapon/book/manual/evaguide, +/obj/item/book/manual, +/obj/item/book/manual/anomaly_spectroscopy, +/obj/item/book/manual/anomaly_testing, +/obj/item/book/manual/atmospipes, +/obj/item/book/manual/bar_guide, +/obj/item/book/manual/barman_recipes, +/obj/item/book/manual/chef_recipes, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/cook_guide, +/obj/item/book/manual/detective, +/obj/item/book/manual/engineering_construction, +/obj/item/book/manual/engineering_guide, +/obj/item/book/manual/engineering_hacking, +/obj/item/book/manual/engineering_particle_accelerator, +/obj/item/book/manual/engineering_singularity_safety, +/obj/item/book/manual/evaguide, /turf/simulated/floor/carpet, /area/gateway/arynthilake/dome) "MS" = ( @@ -1976,7 +1976,7 @@ /area/gateway/arynthilake/dome) "Ng" = ( /obj/structure/table/darkglass, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/eris, /area/gateway/arynthilake/engine) "Nm" = ( @@ -2043,8 +2043,8 @@ /area/gateway/arynthilake/dome) "Og" = ( /obj/machinery/light, -/obj/item/device/flash, -/obj/item/weapon/stamp, +/obj/item/flash, +/obj/item/stamp, /obj/structure/closet/walllocker{ dir = 8; pixel_x = -27 @@ -2175,10 +2175,10 @@ /area/gateway/arynthilake/dome) "Rl" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/eris/cafe, /area/gateway/arynthilake/dome) "Rm" = ( @@ -2198,8 +2198,8 @@ /area/gateway/arynthilake) "RW" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/nonfiction/viabilityofcorporategov, -/obj/item/weapon/book/custom_library/nonfiction/freesirisailightbulbs, +/obj/item/book/bundle/custom_library/nonfiction/viabilityofcorporategov, +/obj/item/book/custom_library/nonfiction/freesirisailightbulbs, /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "Sb" = ( @@ -2275,7 +2275,7 @@ /area/gateway/arynthilake/dome) "Um" = ( /obj/structure/table/darkglass, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/random/awayloot, /turf/simulated/floor/carpet/blucarpet, /area/gateway/arynthilake/dome) @@ -2287,20 +2287,20 @@ /area/gateway/arynthilake/dome) "UJ" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/nonfiction/riseandfallofpersianempire, -/obj/item/weapon/book/bundle/custom_library/nonfiction/skrelliancastesystem, +/obj/item/book/bundle/custom_library/nonfiction/riseandfallofpersianempire, +/obj/item/book/bundle/custom_library/nonfiction/skrelliancastesystem, /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "UY" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/apurrrrfectman, -/obj/item/weapon/book/bundle/custom_library/fiction/beyondthedoor, -/obj/item/weapon/book/bundle/custom_library/fiction/chroniclesofmargatavol1, -/obj/item/weapon/book/bundle/custom_library/fiction/coldmountain, -/obj/item/weapon/book/bundle/custom_library/fiction/ghostship, -/obj/item/weapon/book/custom_library/fiction/blacksmithandkinglybloke, -/obj/item/weapon/book/custom_library/fiction/irishairmanforseesdeath, -/obj/item/weapon/book/custom_library/fiction/myrock, +/obj/item/book/bundle/custom_library/fiction/apurrrrfectman, +/obj/item/book/bundle/custom_library/fiction/beyondthedoor, +/obj/item/book/bundle/custom_library/fiction/chroniclesofmargatavol1, +/obj/item/book/bundle/custom_library/fiction/coldmountain, +/obj/item/book/bundle/custom_library/fiction/ghostship, +/obj/item/book/custom_library/fiction/blacksmithandkinglybloke, +/obj/item/book/custom_library/fiction/irishairmanforseesdeath, +/obj/item/book/custom_library/fiction/myrock, /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "UZ" = ( @@ -2336,7 +2336,7 @@ /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "Vo" = ( -/obj/item/weapon/storage/box/sinpockets, +/obj/item/storage/box/sinpockets, /obj/structure/table/rack/steel, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/gateway/arynthilake/dome) @@ -2382,7 +2382,7 @@ /obj/structure/table/standard{ color = "#ffb8b8" }, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) "WV" = ( diff --git a/maps/gateway_vr/variable/arynthilake_b.dmm b/maps/gateway_vr/variable/arynthilake_b.dmm index 9a57b076d53..d403ba6e7a9 100644 --- a/maps/gateway_vr/variable/arynthilake_b.dmm +++ b/maps/gateway_vr/variable/arynthilake_b.dmm @@ -19,7 +19,7 @@ /turf/simulated/floor/outdoors/grass, /area/gateway/arynthilake/caves) "aG" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/structure/table/rack/steel, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/gateway/arynthilake/dome) @@ -45,8 +45,8 @@ /area/gateway/arynthilake/caves) "bw" = ( /obj/structure/table/sifwooden_reinforced, -/obj/item/weapon/newspaper, -/obj/item/weapon/dice/d20, +/obj/item/newspaper, +/obj/item/dice/d20, /turf/simulated/floor/carpet/purcarpet, /area/gateway/arynthilake/dome) "bI" = ( @@ -68,7 +68,7 @@ /area/gateway/arynthilake/dome) "bO" = ( /obj/structure/table/sifwooden_reinforced, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet/purcarpet, /area/gateway/arynthilake/dome) "cg" = ( @@ -96,7 +96,7 @@ /area/gateway/arynthilake) "cL" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/gateway/arynthilake/dome) "cN" = ( @@ -158,24 +158,24 @@ /obj/random/meat, /obj/random/meat, /obj/random/meat, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/yeast, -/obj/item/weapon/reagent_containers/food/condiment/yeast, -/obj/item/weapon/reagent_containers/food/condiment/yeast, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/yeast, +/obj/item/reagent_containers/food/condiment/yeast, +/obj/item/reagent_containers/food/condiment/yeast, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, /obj/random/awayloot, /obj/effect/landmark/mcguffin_spawner, /turf/simulated/floor/tiled/eris/cafe{ @@ -213,10 +213,10 @@ /area/gateway/arynthilake) "dR" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/eris/cafe, /area/gateway/arynthilake/dome) "dV" = ( @@ -259,11 +259,11 @@ /obj/structure/table/standard{ color = "#b8e4ff" }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) "eT" = ( @@ -294,21 +294,21 @@ /area/gateway/arynthilake/engine) "fA" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/mass_spectrometry, -/obj/item/weapon/book/manual/materials_chemistry_analysis, -/obj/item/weapon/book/manual/medical_cloning, -/obj/item/weapon/book/manual/medical_diagnostics_manual, -/obj/item/weapon/book/manual/nuclear, -/obj/item/weapon/book/manual/research_and_development, -/obj/item/weapon/book/manual/resleeving, -/obj/item/weapon/book/manual/ripley_build_and_repair, -/obj/item/weapon/book/manual/robotics_cyborgs, -/obj/item/weapon/book/manual/rust_engine, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/stasis, -/obj/item/weapon/book/manual/supermatter_engine, -/obj/item/weapon/book/manual/tesla_engine, +/obj/item/book/manual/mass_spectrometry, +/obj/item/book/manual/materials_chemistry_analysis, +/obj/item/book/manual/medical_cloning, +/obj/item/book/manual/medical_diagnostics_manual, +/obj/item/book/manual/nuclear, +/obj/item/book/manual/research_and_development, +/obj/item/book/manual/resleeving, +/obj/item/book/manual/ripley_build_and_repair, +/obj/item/book/manual/robotics_cyborgs, +/obj/item/book/manual/rust_engine, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/stasis, +/obj/item/book/manual/supermatter_engine, +/obj/item/book/manual/tesla_engine, /turf/simulated/floor/wood{ outdoors = 1 }, @@ -317,7 +317,7 @@ /obj/structure/table/standard{ color = "#b8e4ff" }, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) "gm" = ( @@ -430,12 +430,12 @@ /obj/structure/closet/walllocker_double{ pixel_y = 26 }, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/multitool, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/multitool, /obj/random/tool, /obj/random/tool, /obj/random/tool/power, @@ -516,11 +516,11 @@ /area/gateway/arynthilake/dome) "jP" = ( /obj/structure/table/sifwooden_reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/random/awayloot, /turf/simulated/floor/carpet{ outdoors = 1 @@ -747,12 +747,12 @@ dir = 8 }, /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/gateway/arynthilake/dome) "oH" = ( /obj/structure/table/darkglass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 9 }, @@ -794,12 +794,12 @@ /turf/simulated/floor/tiled/techfloor, /area/gateway/arynthilake/gateway) "pl" = ( -/obj/item/device/analyzer/plant_analyzer, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/minihoe, +/obj/item/analyzer/plant_analyzer, +/obj/item/material/minihoe, +/obj/item/material/minihoe, /obj/structure/closet, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/landmark/mcguffin_spawner, /turf/simulated/floor/tiled/eris/techmaint_cargo, /area/gateway/arynthilake/dome) @@ -810,7 +810,7 @@ /area/gateway/arynthilake/engine) "pI" = ( /obj/structure/mopbucket, -/obj/item/weapon/mop, +/obj/item/mop, /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) "pM" = ( @@ -825,7 +825,7 @@ /area/gateway/arynthilake/caves) "pT" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/carpet/bcarpet, /area/gateway/arynthilake/dome) "qh" = ( @@ -837,7 +837,7 @@ /area/gateway/arynthilake) "qy" = ( /obj/structure/table/fancyblack, -/obj/item/weapon/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, /turf/simulated/floor/tiled/eris/dark/brown_platform, /area/gateway/arynthilake/dome) "qG" = ( @@ -847,7 +847,7 @@ /turf/simulated/floor/tiled/techfloor, /area/gateway/arynthilake/gateway) "qR" = ( -/obj/item/weapon/storage/box/sinpockets, +/obj/item/storage/box/sinpockets, /obj/structure/table/rack/steel, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/gateway/arynthilake/dome) @@ -892,9 +892,9 @@ /area/gateway/arynthilake/caves) "rF" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/reference/ThermodynamicReactionsandResearch, -/obj/item/weapon/book/bundle/custom_library/reference/fbpandprostheticmaintenance, -/obj/item/weapon/book/custom_library/reference/fistfulofd6splayersguide, +/obj/item/book/bundle/custom_library/reference/ThermodynamicReactionsandResearch, +/obj/item/book/bundle/custom_library/reference/fbpandprostheticmaintenance, +/obj/item/book/custom_library/reference/fistfulofd6splayersguide, /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "rI" = ( @@ -914,11 +914,11 @@ /area/gateway/arynthilake/caves) "sg" = ( /obj/structure/table/sifwooden_reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 5; pixel_y = 9 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_x = -4; pixel_y = -2 }, @@ -944,9 +944,9 @@ /area/gateway/arynthilake) "sY" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/reference/recyclingprocedures, -/obj/item/weapon/book/custom_library/reference/securityguidelines, -/obj/item/weapon/book/custom_library/reference/spacesurvivalguidedespressurization, +/obj/item/book/bundle/custom_library/reference/recyclingprocedures, +/obj/item/book/custom_library/reference/securityguidelines, +/obj/item/book/custom_library/reference/spacesurvivalguidedespressurization, /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "tk" = ( @@ -954,8 +954,8 @@ /area/gateway/arynthilake/engine) "tu" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/religious/zoroastrianism, -/obj/item/weapon/book/custom_library/religious/feastofkubera, +/obj/item/book/bundle/custom_library/religious/zoroastrianism, +/obj/item/book/custom_library/religious/feastofkubera, /turf/simulated/floor/wood{ outdoors = 1 }, @@ -1020,8 +1020,8 @@ /area/gateway/arynthilake) "vB" = ( /obj/machinery/light, -/obj/item/device/flash, -/obj/item/weapon/stamp, +/obj/item/flash, +/obj/item/stamp, /obj/structure/closet/walllocker{ dir = 8; pixel_x = -27 @@ -1128,7 +1128,7 @@ /area/gateway/arynthilake/dome) "xN" = ( /obj/structure/table/darkglass, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/random/snack, /obj/random/snack, /turf/simulated/floor/carpet/bcarpet, @@ -1219,7 +1219,7 @@ /area/gateway/arynthilake/dome) "Ar" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) "AA" = ( @@ -1289,8 +1289,8 @@ /area/gateway/arynthilake) "CK" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/ghostship, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/bundle/custom_library/fiction/ghostship, +/obj/item/book/manual/security_space_law, /turf/simulated/floor/carpet/bcarpet, /area/gateway/arynthilake/dome) "CM" = ( @@ -1358,14 +1358,14 @@ /area/gateway/arynthilake/dome) "EX" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/apurrrrfectman, -/obj/item/weapon/book/bundle/custom_library/fiction/beyondthedoor, -/obj/item/weapon/book/bundle/custom_library/fiction/chroniclesofmargatavol1, -/obj/item/weapon/book/bundle/custom_library/fiction/coldmountain, -/obj/item/weapon/book/bundle/custom_library/fiction/ghostship, -/obj/item/weapon/book/custom_library/fiction/blacksmithandkinglybloke, -/obj/item/weapon/book/custom_library/fiction/irishairmanforseesdeath, -/obj/item/weapon/book/custom_library/fiction/myrock, +/obj/item/book/bundle/custom_library/fiction/apurrrrfectman, +/obj/item/book/bundle/custom_library/fiction/beyondthedoor, +/obj/item/book/bundle/custom_library/fiction/chroniclesofmargatavol1, +/obj/item/book/bundle/custom_library/fiction/coldmountain, +/obj/item/book/bundle/custom_library/fiction/ghostship, +/obj/item/book/custom_library/fiction/blacksmithandkinglybloke, +/obj/item/book/custom_library/fiction/irishairmanforseesdeath, +/obj/item/book/custom_library/fiction/myrock, /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "Fc" = ( @@ -1406,9 +1406,9 @@ /area/gateway/arynthilake/dome) "FA" = ( /obj/structure/table/darkglass, -/obj/item/weapon/pen, -/obj/item/weapon/folder/red, -/obj/item/weapon/paper_bin{ +/obj/item/pen, +/obj/item/folder/red, +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 9 }, @@ -1428,7 +1428,7 @@ /area/gateway/arynthilake/oldcabin) "FI" = ( /obj/structure/table/woodentable, -/obj/item/weapon/lampshade, +/obj/item/lampshade, /obj/effect/landmark/mcguffin_spawner, /turf/simulated/floor/plating/external, /area/gateway/arynthilake/caveruins) @@ -1495,9 +1495,9 @@ /area/gateway/arynthilake/dome) "Ic" = ( /obj/structure/table/darkglass, -/obj/item/weapon/pen, -/obj/item/weapon/folder/blue, -/obj/item/weapon/paper_bin{ +/obj/item/pen, +/obj/item/folder/blue, +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 9 }, @@ -1544,7 +1544,7 @@ /area/gateway/arynthilake/dome) "IZ" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) "Jn" = ( @@ -1569,7 +1569,7 @@ }, /area/gateway/arynthilake/dome) "JB" = ( -/obj/item/weapon/lampshade, +/obj/item/lampshade, /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "JK" = ( @@ -1623,7 +1623,7 @@ /area/gateway/arynthilake/dome) "Kp" = ( /obj/structure/table/darkglass, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/random/awayloot, /turf/simulated/floor/carpet/blucarpet, /area/gateway/arynthilake/dome) @@ -1681,7 +1681,7 @@ /area/gateway/arynthilake/engine) "Li" = ( /obj/structure/table/darkglass, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/eris, /area/gateway/arynthilake/engine) "Lx" = ( @@ -1734,7 +1734,7 @@ /obj/structure/table/standard{ color = "#ffb8b8" }, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) "Ml" = ( @@ -1797,8 +1797,8 @@ /area/gateway/arynthilake/dome) "Nh" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/nonfiction/viabilityofcorporategov, -/obj/item/weapon/book/custom_library/nonfiction/freesirisailightbulbs, +/obj/item/book/bundle/custom_library/nonfiction/viabilityofcorporategov, +/obj/item/book/custom_library/nonfiction/freesirisailightbulbs, /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "Nl" = ( @@ -1902,28 +1902,28 @@ /area/gateway/arynthilake/dome) "Pt" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/bundle/custom_library/nonfiction/viabilityofcorporategov, +/obj/item/book/manual/security_space_law, +/obj/item/book/bundle/custom_library/nonfiction/viabilityofcorporategov, /turf/simulated/floor/carpet/blucarpet, /area/gateway/arynthilake/dome) "Pv" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual, -/obj/item/weapon/book/manual/anomaly_spectroscopy, -/obj/item/weapon/book/manual/anomaly_testing, -/obj/item/weapon/book/manual/atmospipes, -/obj/item/weapon/book/manual/bar_guide, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/cook_guide, -/obj/item/weapon/book/manual/detective, -/obj/item/weapon/book/manual/engineering_construction, -/obj/item/weapon/book/manual/engineering_guide, -/obj/item/weapon/book/manual/engineering_hacking, -/obj/item/weapon/book/manual/engineering_particle_accelerator, -/obj/item/weapon/book/manual/engineering_singularity_safety, -/obj/item/weapon/book/manual/evaguide, +/obj/item/book/manual, +/obj/item/book/manual/anomaly_spectroscopy, +/obj/item/book/manual/anomaly_testing, +/obj/item/book/manual/atmospipes, +/obj/item/book/manual/bar_guide, +/obj/item/book/manual/barman_recipes, +/obj/item/book/manual/chef_recipes, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/cook_guide, +/obj/item/book/manual/detective, +/obj/item/book/manual/engineering_construction, +/obj/item/book/manual/engineering_guide, +/obj/item/book/manual/engineering_hacking, +/obj/item/book/manual/engineering_particle_accelerator, +/obj/item/book/manual/engineering_singularity_safety, +/obj/item/book/manual/evaguide, /turf/simulated/floor/carpet, /area/gateway/arynthilake/dome) "Py" = ( @@ -1936,7 +1936,7 @@ }, /area/gateway/arynthilake/dome) "PF" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/carpet/purcarpet, /area/gateway/arynthilake/dome) "PL" = ( @@ -2012,8 +2012,8 @@ /area/gateway/arynthilake/dome) "Rs" = ( /obj/machinery/light, -/obj/item/device/flash, -/obj/item/weapon/stamp, +/obj/item/flash, +/obj/item/stamp, /obj/effect/landmark/mcguffin_spawner, /obj/structure/closet/walllocker{ dir = 4; @@ -2038,16 +2038,16 @@ /area/gateway/arynthilake/dome) "RX" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/manfromsnowyriver, -/obj/item/weapon/book/bundle/custom_library/fiction/metalglen, -/obj/item/weapon/book/bundle/custom_library/fiction/poemsforarainyday, -/obj/item/weapon/book/bundle/custom_library/fiction/raissue142, -/obj/item/weapon/book/bundle/custom_library/fiction/raissue147, -/obj/item/weapon/book/bundle/custom_library/fiction/silence, -/obj/item/weapon/book/bundle/custom_library/fiction/taleoftherainbowcat, -/obj/item/weapon/book/custom_library/fiction/starsandsometimesfallingones, -/obj/item/weapon/book/custom_library/fiction/truelovehathmyheart, -/obj/item/weapon/book/custom_library/fiction/woodysgotwood, +/obj/item/book/bundle/custom_library/fiction/manfromsnowyriver, +/obj/item/book/bundle/custom_library/fiction/metalglen, +/obj/item/book/bundle/custom_library/fiction/poemsforarainyday, +/obj/item/book/bundle/custom_library/fiction/raissue142, +/obj/item/book/bundle/custom_library/fiction/raissue147, +/obj/item/book/bundle/custom_library/fiction/silence, +/obj/item/book/bundle/custom_library/fiction/taleoftherainbowcat, +/obj/item/book/custom_library/fiction/starsandsometimesfallingones, +/obj/item/book/custom_library/fiction/truelovehathmyheart, +/obj/item/book/custom_library/fiction/woodysgotwood, /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "Sc" = ( @@ -2072,12 +2072,12 @@ /area/gateway/arynthilake/underground/maintenance) "Sq" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/nonfiction/riseandfallofpersianempire, -/obj/item/weapon/book/bundle/custom_library/nonfiction/skrelliancastesystem, +/obj/item/book/bundle/custom_library/nonfiction/riseandfallofpersianempire, +/obj/item/book/bundle/custom_library/nonfiction/skrelliancastesystem, /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "Sr" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, /turf/simulated/floor/carpet/purcarpet, /area/gateway/arynthilake/dome) @@ -2176,23 +2176,23 @@ /area/gateway/arynthilake) "UL" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/anomaly_spectroscopy, -/obj/item/weapon/book/manual/anomaly_testing, -/obj/item/weapon/book/manual/atmospipes, -/obj/item/weapon/book/manual/bar_guide, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/cook_guide, -/obj/item/weapon/book/manual/detective, -/obj/item/weapon/book/manual/engineering_construction, -/obj/item/weapon/book/manual/engineering_guide, -/obj/item/weapon/book/manual/engineering_hacking, -/obj/item/weapon/book/manual/engineering_particle_accelerator, -/obj/item/weapon/book/manual/engineering_singularity_safety, -/obj/item/weapon/book/manual/evaguide, -/obj/item/weapon/book/manual/excavation, -/obj/item/weapon/book/manual/hydroponics_pod_people, +/obj/item/book/manual/anomaly_spectroscopy, +/obj/item/book/manual/anomaly_testing, +/obj/item/book/manual/atmospipes, +/obj/item/book/manual/bar_guide, +/obj/item/book/manual/barman_recipes, +/obj/item/book/manual/chef_recipes, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/cook_guide, +/obj/item/book/manual/detective, +/obj/item/book/manual/engineering_construction, +/obj/item/book/manual/engineering_guide, +/obj/item/book/manual/engineering_hacking, +/obj/item/book/manual/engineering_particle_accelerator, +/obj/item/book/manual/engineering_singularity_safety, +/obj/item/book/manual/evaguide, +/obj/item/book/manual/excavation, +/obj/item/book/manual/hydroponics_pod_people, /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "UU" = ( @@ -2253,11 +2253,11 @@ /obj/structure/table/standard{ color = "#ffb8b8" }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) "Vy" = ( @@ -2286,7 +2286,7 @@ /area/gateway/arynthilake/engine) "Wt" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/book/manual/chef_recipes, +/obj/item/book/manual/chef_recipes, /obj/effect/landmark/mcguffin_spawner, /turf/simulated/floor/tiled/eris/cafe, /area/gateway/arynthilake/dome) @@ -2380,9 +2380,9 @@ /area/gateway/arynthilake/dome) "YA" = ( /obj/structure/bookcase, -/obj/item/weapon/book/custom_library/religious/storyoflordganesha, -/obj/item/weapon/book/custom_library/religious/sungoddessofkorea, -/obj/item/weapon/book/custom_library/religious/wayofbleedingswan, +/obj/item/book/custom_library/religious/storyoflordganesha, +/obj/item/book/custom_library/religious/sungoddessofkorea, +/obj/item/book/custom_library/religious/wayofbleedingswan, /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "YQ" = ( @@ -2412,7 +2412,7 @@ /area/gateway/arynthilake/engine) "Zn" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/reddouble, +/obj/item/bedsheet/reddouble, /obj/effect/landmark/mcguffin_spawner, /turf/simulated/floor/carpet/blucarpet, /area/gateway/arynthilake/dome) diff --git a/maps/gateway_vr/variable/arynthilakeunderground_a.dmm b/maps/gateway_vr/variable/arynthilakeunderground_a.dmm index 4bc8b66405b..54142bffc8f 100644 --- a/maps/gateway_vr/variable/arynthilakeunderground_a.dmm +++ b/maps/gateway_vr/variable/arynthilakeunderground_a.dmm @@ -45,7 +45,7 @@ /area/gateway/arynthilake/underground) "hB" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/mapping_unit, +/obj/item/mapping_unit, /turf/simulated/floor/tiled/eris/steel/orangecorner, /area/gateway/arynthilake/engine) "hK" = ( @@ -346,7 +346,7 @@ /obj/structure/noticeboard{ pixel_x = -32 }, -/obj/item/weapon/paper/gateway/arynthilake, +/obj/item/paper/gateway/arynthilake, /turf/simulated/floor/tiled/eris/steel/orangecorner, /area/gateway/arynthilake/engine) "WN" = ( @@ -366,7 +366,7 @@ /area/gateway/arynthilake/underground/maintenance) "ZY" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/cell/void, +/obj/item/cell/void, /obj/random/tool, /obj/random/tool, /obj/random/tech_supply, diff --git a/maps/gateway_vr/variable/arynthilakeunderground_b.dmm b/maps/gateway_vr/variable/arynthilakeunderground_b.dmm index e440cdf66be..ea3323eae99 100644 --- a/maps/gateway_vr/variable/arynthilakeunderground_b.dmm +++ b/maps/gateway_vr/variable/arynthilakeunderground_b.dmm @@ -91,7 +91,7 @@ /obj/structure/noticeboard{ pixel_x = 32 }, -/obj/item/weapon/paper/gateway/arynthilake, +/obj/item/paper/gateway/arynthilake, /turf/simulated/floor/tiled/eris/steel/orangecorner, /area/gateway/arynthilake/engine) "iR" = ( @@ -211,7 +211,7 @@ /area/gateway/arynthilake/engine) "xP" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/mapping_unit, +/obj/item/mapping_unit, /turf/simulated/floor/tiled/eris/steel/orangecorner, /area/gateway/arynthilake/engine) "yv" = ( @@ -376,7 +376,7 @@ /area/gateway/arynthilake/engine) "Wd" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/cell/void, +/obj/item/cell/void, /obj/random/tool, /obj/random/tool, /obj/random/tech_supply, diff --git a/maps/gateway_vr/variable/honlethhighlands_a.dmm b/maps/gateway_vr/variable/honlethhighlands_a.dmm index fad656a5d9f..c2bbc92a582 100644 --- a/maps/gateway_vr/variable/honlethhighlands_a.dmm +++ b/maps/gateway_vr/variable/honlethhighlands_a.dmm @@ -269,7 +269,7 @@ }, /area/gateway/honlethhighlands/caves) "bi" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/outdoors/newdirt{ temperature = 253.15 }, @@ -320,10 +320,10 @@ dir = 8; pixel_x = -28 }, -/obj/item/device/flash, -/obj/item/weapon/reagent_containers/spray/pepper, -/obj/item/weapon/stamp, -/obj/item/weapon/stamp/denied, +/obj/item/flash, +/obj/item/reagent_containers/spray/pepper, +/obj/item/stamp, +/obj/item/stamp/denied, /turf/simulated/floor/tiled/techfloor, /area/gateway/honlethhighlands/gate) "by" = ( @@ -414,10 +414,10 @@ /area/gateway/honlethhighlands/town/supply) "cT" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, /turf/simulated/floor/lino, @@ -451,7 +451,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/stool{ +/obj/item/stool{ dir = 4 }, /turf/simulated/floor/wood, @@ -482,7 +482,7 @@ /turf/simulated/floor/tiled/techfloor, /area/gateway/honlethhighlands/gate) "ef" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/outdoors/grass/forest, /area/gateway/honlethhighlands/town/garden) "em" = ( @@ -521,7 +521,7 @@ /area/gateway/honlethhighlands/caves) "fi" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/book/manual/bar_guide, +/obj/item/book/manual/bar_guide, /obj/random/drinkbottle, /turf/simulated/floor/lino, /area/gateway/honlethhighlands/town/bar) @@ -662,7 +662,7 @@ /turf/simulated/floor/plating, /area/gateway/honlethhighlands) "is" = ( -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, /turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, @@ -723,30 +723,30 @@ /turf/simulated/floor/tiled, /area/gateway/honlethhighlands/town/command) "kL" = ( -/obj/item/weapon/stool{ +/obj/item/stool{ dir = 1 }, /turf/simulated/floor/plating, /area/gateway/honlethhighlands/town/bar) "kS" = ( /obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ name = "box of measuring cups"; pixel_x = 2; pixel_y = 3; - starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup = 7) + starts_with = list(/obj/item/reagent_containers/glass/beaker/measuring_cup = 7) }, /obj/machinery/power/apc/alarms_hidden{ dir = 4; @@ -884,7 +884,7 @@ }, /area/gateway/honlethhighlands/town/garden) "nx" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, @@ -1060,7 +1060,7 @@ /turf/simulated/floor/tiled, /area/gateway/honlethhighlands/town/command) "qB" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /obj/random/junk, @@ -1125,13 +1125,13 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/gateway/honlethhighlands/town/bar) "rz" = ( /obj/structure/table/marble, /obj/machinery/reagentgrinder, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/structure/cable/pink{ icon_state = "2-8" }, @@ -1169,7 +1169,7 @@ /area/gateway/honlethhighlands/gate) "rP" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, +/obj/item/reagent_containers/food/drinks/flask/vacuumflask, /obj/random/drinkbottle, /turf/simulated/floor/lino, /area/gateway/honlethhighlands/town/bar) @@ -1308,7 +1308,7 @@ /turf/simulated/floor/tiled, /area/gateway/honlethhighlands/town/command) "uu" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /obj/random/junk, @@ -1355,7 +1355,7 @@ /turf/simulated/floor/plating, /area/gateway/honlethhighlands/town/xenobio) "vt" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/wood, @@ -1368,8 +1368,8 @@ /area/gateway/honlethhighlands/town/engineering) "vL" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/drinks/jar, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/jar, +/obj/item/reagent_containers/food/drinks/drinkingglass, /turf/simulated/floor/lino, /area/gateway/honlethhighlands/town/bar) "vU" = ( @@ -1476,7 +1476,7 @@ /area/gateway/honlethhighlands/caves) "wY" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /turf/simulated/floor/lino, /area/gateway/honlethhighlands/town/bar) "xo" = ( @@ -1557,7 +1557,7 @@ /turf/simulated/floor/plating, /area/gateway/honlethhighlands/town/bar) "yX" = ( -/obj/item/weapon/material/knife/machete/hatchet, +/obj/item/material/knife/machete/hatchet, /turf/simulated/floor/tiled, /area/gateway/honlethhighlands/town/garden) "zh" = ( @@ -1598,7 +1598,7 @@ }, /area/gateway/honlethhighlands/caves) "zP" = ( -/obj/item/weapon/bedsheet/pirate, +/obj/item/bedsheet/pirate, /obj/structure/bed/padded, /turf/simulated/floor/carpet/purcarpet, /area/gateway/honlethhighlands) @@ -1663,7 +1663,7 @@ /area/gateway/honlethhighlands) "AF" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/drinks/cup, +/obj/item/reagent_containers/food/drinks/cup, /turf/simulated/floor/wood, /area/gateway/honlethhighlands/town/bar) "AK" = ( @@ -1724,12 +1724,12 @@ /turf/simulated/floor/plating, /area/gateway/honlethhighlands/town/kitchen) "BS" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/gateway/honlethhighlands/town/bar) "BW" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, /turf/simulated/floor/lino, /area/gateway/honlethhighlands/town/bar) "Ca" = ( @@ -1748,8 +1748,8 @@ /area/gateway/honlethhighlands/town/garden) "Cl" = ( /obj/structure/table/marble, -/obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/material/knife/butch, +/obj/item/material/kitchen/rollingpin, +/obj/item/material/knife/butch, /obj/machinery/light{ dir = 1 }, @@ -1914,7 +1914,7 @@ /obj/structure/cable/pink{ icon_state = "0-4" }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/lino, @@ -1927,9 +1927,9 @@ /area/gateway/honlethhighlands/beach) "EP" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/newspaper, -/obj/item/weapon/pen/multi, +/obj/item/paper_bin, +/obj/item/newspaper, +/obj/item/pen/multi, /turf/simulated/floor/tiled/techfloor, /area/gateway/honlethhighlands/gate) "Fb" = ( @@ -1964,7 +1964,7 @@ /area/gateway/honlethhighlands) "FR" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, /obj/random/awayloot, /turf/simulated/floor/wood, /area/gateway/honlethhighlands/town/bar) @@ -1991,7 +1991,7 @@ /obj/structure/closet, /obj/random/contraband, /obj/random/tech_supply/component, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/plating, /area/gateway/honlethhighlands/town/supply) "Gz" = ( @@ -2115,7 +2115,7 @@ }, /area/gateway/honlethhighlands/town/garden) "JI" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/lino, @@ -2458,7 +2458,7 @@ icon_state = "4-8" }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /obj/item/broken_device/random, /turf/simulated/floor/plating, /area/gateway/honlethhighlands/town/supply) @@ -2480,7 +2480,7 @@ /turf/simulated/floor/plating, /area/gateway/honlethhighlands/town/xenobio) "Rx" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /obj/move_trader_landmark{ @@ -2618,8 +2618,8 @@ "Vl" = ( /obj/effect/floor_decal/techfloor, /obj/structure/table/glass, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/red{ +/obj/item/folder/blue, +/obj/item/folder/red{ pixel_x = 5; pixel_y = -4 }, @@ -2813,7 +2813,7 @@ /turf/simulated/floor/tiled, /area/gateway/honlethhighlands/town/command) "Ze" = ( -/obj/item/weapon/stool, +/obj/item/stool, /obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, /turf/simulated/floor/wood, /area/gateway/honlethhighlands/town/bar) @@ -2845,7 +2845,7 @@ /obj/item/stack/material/wood, /obj/item/stack/material/wood, /obj/item/stack/material/wood, -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, /turf/simulated/floor/wood, /area/gateway/honlethhighlands) "ZZ" = ( diff --git a/maps/gateway_vr/variable/honlethhighlands_b.dmm b/maps/gateway_vr/variable/honlethhighlands_b.dmm index 865715aab27..405119f78c4 100644 --- a/maps/gateway_vr/variable/honlethhighlands_b.dmm +++ b/maps/gateway_vr/variable/honlethhighlands_b.dmm @@ -269,7 +269,7 @@ }, /area/gateway/honlethhighlands/caves) "bi" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/outdoors/newdirt{ temperature = 253.15 }, @@ -321,10 +321,10 @@ dir = 8; pixel_x = -28 }, -/obj/item/device/flash, -/obj/item/weapon/reagent_containers/spray/pepper, -/obj/item/weapon/stamp, -/obj/item/weapon/stamp/denied, +/obj/item/flash, +/obj/item/reagent_containers/spray/pepper, +/obj/item/stamp, +/obj/item/stamp/denied, /turf/simulated/floor/tiled/techfloor, /area/gateway/honlethhighlands/gate) "by" = ( @@ -395,10 +395,10 @@ /area/gateway/honlethhighlands/town/supply) "cT" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, /turf/simulated/floor/lino, @@ -433,7 +433,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/stool{ +/obj/item/stool{ dir = 4 }, /turf/simulated/floor/wood, @@ -464,7 +464,7 @@ /turf/simulated/floor/tiled/techfloor, /area/gateway/honlethhighlands/gate) "ef" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/outdoors/grass/forest, /area/gateway/honlethhighlands/town/garden) "em" = ( @@ -503,7 +503,7 @@ /area/gateway/honlethhighlands/caves) "fi" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/book/manual/bar_guide, +/obj/item/book/manual/bar_guide, /obj/random/drinkbottle, /turf/simulated/floor/lino, /area/gateway/honlethhighlands/town/bar) @@ -653,7 +653,7 @@ /turf/simulated/floor/plating, /area/gateway/honlethhighlands) "is" = ( -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, /turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, @@ -676,7 +676,7 @@ /turf/simulated/floor/tiled, /area/gateway/honlethhighlands/town/command) "jq" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/wood, @@ -730,30 +730,30 @@ /turf/simulated/floor/tiled, /area/gateway/honlethhighlands/town/command) "kL" = ( -/obj/item/weapon/stool{ +/obj/item/stool{ dir = 1 }, /turf/simulated/floor/plating, /area/gateway/honlethhighlands/town/bar) "kS" = ( /obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ name = "box of measuring cups"; pixel_x = 2; pixel_y = 3; - starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup = 7) + starts_with = list(/obj/item/reagent_containers/glass/beaker/measuring_cup = 7) }, /obj/machinery/power/apc/alarms_hidden{ dir = 4; @@ -970,7 +970,7 @@ pixel_x = -28 }, /obj/random/firstaid, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /turf/simulated/floor/plating, /area/gateway/honlethhighlands/town/command) "oP" = ( @@ -1092,7 +1092,7 @@ /turf/simulated/floor/tiled, /area/gateway/honlethhighlands/town/command) "qB" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /obj/random/junk, @@ -1170,13 +1170,13 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/gateway/honlethhighlands/town/bar) "rz" = ( /obj/structure/table/marble, /obj/machinery/reagentgrinder, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/structure/cable/pink{ icon_state = "2-8" }, @@ -1214,7 +1214,7 @@ /area/gateway/honlethhighlands/gate) "rP" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, +/obj/item/reagent_containers/food/drinks/flask/vacuumflask, /obj/random/drinkbottle, /turf/simulated/floor/lino, /area/gateway/honlethhighlands/town/bar) @@ -1339,7 +1339,7 @@ }, /area/gateway/honlethhighlands/town) "uu" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /obj/random/junk, @@ -1358,7 +1358,7 @@ /turf/simulated/floor/lino, /area/gateway/honlethhighlands/town/kitchen) "uP" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /obj/random/mob/semirandom_mob_spawner/humanoid, @@ -1403,8 +1403,8 @@ /area/gateway/honlethhighlands/town/engineering) "vL" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/drinks/jar, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/jar, +/obj/item/reagent_containers/food/drinks/drinkingglass, /turf/simulated/floor/lino, /area/gateway/honlethhighlands/town/bar) "vU" = ( @@ -1504,7 +1504,7 @@ /area/gateway/honlethhighlands/town/kitchen) "wY" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /turf/simulated/floor/lino, /area/gateway/honlethhighlands/town/bar) "xa" = ( @@ -1597,7 +1597,7 @@ /turf/simulated/floor/plating, /area/gateway/honlethhighlands/town/bar) "yX" = ( -/obj/item/weapon/material/knife/machete/hatchet, +/obj/item/material/knife/machete/hatchet, /turf/simulated/floor/tiled, /area/gateway/honlethhighlands/town/garden) "zh" = ( @@ -1638,7 +1638,7 @@ }, /area/gateway/honlethhighlands/caves) "zP" = ( -/obj/item/weapon/bedsheet/pirate, +/obj/item/bedsheet/pirate, /obj/structure/bed/padded, /turf/simulated/floor/carpet/purcarpet, /area/gateway/honlethhighlands) @@ -1694,7 +1694,7 @@ /area/gateway/honlethhighlands) "AF" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/drinks/cup, +/obj/item/reagent_containers/food/drinks/cup, /turf/simulated/floor/wood, /area/gateway/honlethhighlands/town/bar) "AK" = ( @@ -1755,12 +1755,12 @@ /turf/simulated/floor/plating, /area/gateway/honlethhighlands/town/kitchen) "BS" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/gateway/honlethhighlands/town/bar) "BW" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, /turf/simulated/floor/lino, /area/gateway/honlethhighlands/town/bar) "Ca" = ( @@ -1779,8 +1779,8 @@ /area/gateway/honlethhighlands/town/garden) "Cl" = ( /obj/structure/table/marble, -/obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/material/knife/butch, +/obj/item/material/kitchen/rollingpin, +/obj/item/material/knife/butch, /obj/machinery/light{ dir = 1 }, @@ -1920,16 +1920,16 @@ /obj/structure/cable/pink{ icon_state = "0-4" }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/lino, /area/gateway/honlethhighlands/town/bar) "EP" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/newspaper, -/obj/item/weapon/pen/multi, +/obj/item/paper_bin, +/obj/item/newspaper, +/obj/item/pen/multi, /turf/simulated/floor/tiled/techfloor, /area/gateway/honlethhighlands/gate) "Fb" = ( @@ -1973,7 +1973,7 @@ /area/gateway/honlethhighlands) "FR" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, /obj/random/awayloot, /turf/simulated/floor/wood, /area/gateway/honlethhighlands/town/bar) @@ -2006,7 +2006,7 @@ /obj/structure/closet, /obj/random/contraband, /obj/random/tech_supply/component, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/plating, /area/gateway/honlethhighlands/town/supply) "Gz" = ( @@ -2112,7 +2112,7 @@ }, /area/gateway/honlethhighlands/town/garden) "JI" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/lino, @@ -2286,7 +2286,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/gateway/honlethhighlands) "Nt" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /obj/random/mob/semirandom_mob_spawner/humanoid, @@ -2476,7 +2476,7 @@ icon_state = "4-8" }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /obj/item/broken_device/random, /turf/simulated/floor/plating, /area/gateway/honlethhighlands/town/supply) @@ -2560,7 +2560,7 @@ /turf/simulated/floor/plating, /area/gateway/honlethhighlands/town/kitchen) "TA" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /obj/move_trader_landmark{ @@ -2669,8 +2669,8 @@ "Vl" = ( /obj/effect/floor_decal/techfloor, /obj/structure/table/glass, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/red{ +/obj/item/folder/blue, +/obj/item/folder/red{ pixel_x = 5; pixel_y = -4 }, @@ -2868,7 +2868,7 @@ /turf/simulated/floor/tiled, /area/gateway/honlethhighlands/town/command) "Ze" = ( -/obj/item/weapon/stool, +/obj/item/stool, /obj/random/mob/semirandom_mob_spawner/humanoid, /turf/simulated/floor/wood, /area/gateway/honlethhighlands/town/bar) @@ -2890,7 +2890,7 @@ /obj/item/stack/material/wood, /obj/item/stack/material/wood, /obj/item/stack/material/wood, -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, /turf/simulated/floor/wood, /area/gateway/honlethhighlands) "ZZ" = ( diff --git a/maps/gateway_vr/wildwest.dmm b/maps/gateway_vr/wildwest.dmm index d80e24e75ab..69f38dd01e4 100644 --- a/maps/gateway_vr/wildwest.dmm +++ b/maps/gateway_vr/wildwest.dmm @@ -327,7 +327,7 @@ /turf/simulated/floor/redgrid/off, /area/awaymission/wwvault) "ce" = ( -/obj/item/weapon/moneybag, +/obj/item/moneybag, /turf/simulated/floor/carpet, /area/awaymission/wwgov) "ck" = ( @@ -345,7 +345,7 @@ /area/awaymission/wwgov) "co" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/wine, /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwgov) "cp" = ( @@ -442,7 +442,7 @@ /area/awaymission/wwrefine) "du" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/wood, /area/awaymission/wwmines) "dv" = ( @@ -620,7 +620,7 @@ /area/awaymission/wwmines) "eY" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/manual/barman_recipes, +/obj/item/book/manual/barman_recipes, /turf/simulated/floor/wood, /area/awaymission/wwmines) "eZ" = ( @@ -636,14 +636,14 @@ /area/awaymission/wwmines) "fb" = ( /obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwmines) "fc" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/manual/chef_recipes, +/obj/item/book/manual/chef_recipes, /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwmines) "fe" = ( @@ -660,11 +660,11 @@ /area/awaymission/wwmines) "fg" = ( /obj/structure/closet/secure_closet/freezer/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, -/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, -/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, -/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, -/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, +/obj/item/reagent_containers/food/snacks/meat/syntiflesh, +/obj/item/reagent_containers/food/snacks/meat/syntiflesh, +/obj/item/reagent_containers/food/snacks/meat/syntiflesh, +/obj/item/reagent_containers/food/snacks/meat/syntiflesh, +/obj/item/reagent_containers/food/snacks/meat/syntiflesh, /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwmines) "fi" = ( @@ -762,7 +762,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/wwmines) "fJ" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/carpet, /area/awaymission/wwmines) "fK" = ( @@ -785,7 +785,7 @@ /turf/simulated/wall/sandstone, /area/awaymission/wwmines) "fT" = ( -/obj/item/weapon/stool{ +/obj/item/stool{ dir = 1 }, /turf/simulated/floor/wood, @@ -795,7 +795,7 @@ /turf/simulated/floor/wood, /area/awaymission/wwgov) "fY" = ( -/obj/item/weapon/moneybag, +/obj/item/moneybag, /turf/simulated/floor/wood, /area/awaymission/wwgov) "fZ" = ( @@ -840,13 +840,13 @@ /area/awaymission/wwgov) "gk" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/wood, /area/awaymission/wwgov) "gl" = ( /obj/structure/table/woodentable, /obj/item/clothing/gloves/yellow, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/wood, /area/awaymission/wwgov) "gm" = ( @@ -875,17 +875,17 @@ /area/awaymission/wwmines) "gt" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/peppermill, /turf/simulated/floor/wood, /area/awaymission/wwmines) "gu" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/saltshaker, /turf/simulated/floor/wood, /area/awaymission/wwmines) "gv" = ( /obj/structure/table/woodentable, -/obj/item/weapon/melee/energy/spear, +/obj/item/melee/energy/spear, /turf/simulated/floor/wood, /area/awaymission/wwgov) "gw" = ( @@ -939,17 +939,17 @@ /area/awaymission/wwmines) "gQ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight, +/obj/item/reagent_containers/food/snacks/monkeysdelight, /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwgov) "gS" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwgov) "gT" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/stew, +/obj/item/reagent_containers/food/snacks/stew, /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwgov) "gW" = ( @@ -1114,7 +1114,7 @@ /area/awaymission/wwmines) "mD" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/item/ammo_casing/a357, /turf/simulated/floor/wood, /area/awaymission/wwmines) @@ -1260,7 +1260,7 @@ /area/awaymission/wwmines) "tk" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake, +/obj/item/reagent_containers/food/snacks/sliceable/lemoncake, /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwgov) "tn" = ( @@ -1288,7 +1288,7 @@ /area/awaymission/wwmines) "uH" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwgov) "uJ" = ( @@ -1321,7 +1321,7 @@ /area/awaymission/wwmines) "vc" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/machinery/light/small{ dir = 8 }, @@ -1332,7 +1332,7 @@ /turf/simulated/floor/grass, /area/awaymission/wwgov) "we" = ( -/obj/item/weapon/stool{ +/obj/item/stool{ dir = 1 }, /obj/random/mob/semirandom_mob_spawner/wildwest, @@ -1343,7 +1343,7 @@ /area/awaymission/wwvault) "ws" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly, +/obj/item/reagent_containers/food/snacks/donut/pink/jelly, /turf/simulated/floor/carpet, /area/awaymission/wwmines) "xo" = ( @@ -1454,7 +1454,7 @@ /area/awaymission/wwrefine) "zY" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly, +/obj/item/reagent_containers/food/snacks/donut/choc/jelly, /turf/simulated/floor/carpet, /area/awaymission/wwmines) "AA" = ( @@ -1465,7 +1465,7 @@ /area/awaymission/wwrefine) "Bf" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/patron, +/obj/item/reagent_containers/food/drinks/bottle/patron, /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwgov) "BQ" = ( @@ -1477,7 +1477,7 @@ /area/awaymission/wwmines) "Ce" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/donut/plain, +/obj/item/reagent_containers/food/snacks/donut/plain, /turf/simulated/floor/carpet, /area/awaymission/wwmines) "Ch" = ( @@ -1570,7 +1570,7 @@ /obj/item/clothing/suit/space/syndicate/black/orange, /obj/item/clothing/head/helmet/space/syndicate/black/orange, /obj/item/clothing/mask/gas/syndicate, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, /turf/simulated/shuttle/floor, /area/awaymission/wwrefine) "Ft" = ( @@ -1619,7 +1619,7 @@ /turf/simulated/floor/tiled/asteroid_steel, /area/awaymission/wwrefine) "Hq" = ( -/obj/item/weapon/material/knife/machete/hatchet, +/obj/item/material/knife/machete/hatchet, /turf/simulated/floor/wood, /area/awaymission/wwmines) "Ht" = ( @@ -1631,7 +1631,7 @@ "Hw" = ( /obj/effect/decal/cleanable/blood, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/wood, /area/awaymission/wwmines) "HA" = ( @@ -1645,7 +1645,7 @@ /area/awaymission/wwrefine) "HT" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/food/drinks/coffee, /turf/simulated/floor/carpet, /area/awaymission/wwmines) "HU" = ( @@ -1663,8 +1663,8 @@ /area/awaymission/wwmines) "Io" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/coffee, -/obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly, +/obj/item/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/food/snacks/donut/pink/jelly, /turf/simulated/floor/carpet, /area/awaymission/wwmines) "Iy" = ( @@ -1687,12 +1687,12 @@ /area/awaymission/wwmines) "Jd" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread, +/obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread, /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwgov) "Jo" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/wood, /area/awaymission/wwgov) "Jx" = ( @@ -1932,7 +1932,7 @@ /area/space) "RP" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/random/gun/random, /turf/simulated/floor/wood, /area/awaymission/wwmines) @@ -2089,10 +2089,10 @@ /area/awaymission/wwmines) "YL" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwgov) "YV" = ( @@ -2127,7 +2127,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/wwmines) "ZW" = ( -/obj/item/weapon/moneybag, +/obj/item/moneybag, /obj/machinery/light/small{ dir = 1 }, diff --git a/maps/gateway_vr/zoo.dm b/maps/gateway_vr/zoo.dm index 8dfc8857831..10228c8f870 100644 --- a/maps/gateway_vr/zoo.dm +++ b/maps/gateway_vr/zoo.dm @@ -18,26 +18,26 @@ /area/awaymission/zoo/pirateship icon_state = "bluenew" -/obj/item/weapon/paper/zoo +/obj/item/paper/zoo name = "\improper Quarterly Report" info = {"There's nothing but spreadsheets and budget reports on this document, apparently regarding a zoo owned by NanoTrasen."} -/obj/item/weapon/paper/zoo/pirate +/obj/item/paper/zoo/pirate name = "odd note" -/obj/item/weapon/paper/zoo/pirate/volk +/obj/item/paper/zoo/pirate/volk info = {"Lady Nebula,

We can't keep these animals here permanently. We're running out of food and they're getting hungry. Ma'isi went missing last night when we sent her to clean up the petting zoo. This morning, we found Tajaran hair in the horse shit. I can't speak for everyone, but I'm out. If these animals break loose, we're all fucking dead. Please get some extra rations of meat before the carnivores realize the electrified grilles don't work right now.

-Volk"} -/obj/item/weapon/paper/zoo/pirate/nebula +/obj/item/paper/zoo/pirate/nebula info = {"Volk,

Throw some prisoners into the cages, then. The client took too long to pay up anyway.

-Lady Nebula"} -/obj/item/weapon/paper/zoo/pirate/haveyouseen +/obj/item/paper/zoo/pirate/haveyouseen info = {"Has anyone seen Za'med? I sent him to get something out of the tool shed and he hasn't come back.

-Meesei"} -/obj/item/weapon/paper/zoo/pirate/warning +/obj/item/paper/zoo/pirate/warning info = {"Attention crew,

Since apparently you fucking idiots didn't notice, that bulltaur who delivered the bears was Jarome Rognvaldr. I'm sorry, maybe you scabs forgot? Does the name Jarome the Bottomless ring any fucking bells? If he's seen again without a laser bolt hole through his fucking skull, I'm shoving anyone on guard duty up Zed's arse. Are we diff --git a/maps/gateway_vr/zoo.dmm b/maps/gateway_vr/zoo.dmm index 6bb8c36d6a9..f7938f2810f 100644 --- a/maps/gateway_vr/zoo.dmm +++ b/maps/gateway_vr/zoo.dmm @@ -34,7 +34,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/simulated/floor/reinforced, /area/awaymission/zoo/pirateship) @@ -50,30 +50,30 @@ "ai" = ( /obj/structure/table/marble, /obj/structure/safe/floor, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/card/emag, -/obj/item/weapon/beartrap, -/obj/item/weapon/grenade/spawnergrenade/spesscarp, -/obj/item/weapon/grenade/spawnergrenade/spesscarp, -/obj/item/weapon/grenade/spawnergrenade/spesscarp, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/card/emag, +/obj/item/beartrap, +/obj/item/grenade/spawnergrenade/spesscarp, +/obj/item/grenade/spawnergrenade/spesscarp, +/obj/item/grenade/spawnergrenade/spesscarp, /obj/item/clothing/glasses/thermal/plain/monocle, /obj/item/stolenpackage, /obj/item/stolenpackage, /obj/item/stolenpackage, /obj/item/stolenpackage, /obj/item/stolenpackage, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/melee/energy/sword/pirate, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/melee/energy/sword/pirate, /turf/space, /area/awaymission/zoo) "aj" = ( @@ -120,15 +120,15 @@ /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "aq" = ( -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs, /obj/structure/closet/crate, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "ar" = ( -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/scalpel, /obj/structure/closet/crate, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "as" = ( @@ -136,7 +136,7 @@ /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "at" = ( -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "au" = ( @@ -155,8 +155,8 @@ /area/awaymission/zoo/pirateship) "ax" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -164,7 +164,7 @@ /area/awaymission/zoo/pirateship) "ay" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -172,7 +172,7 @@ /area/awaymission/zoo/pirateship) "az" = ( /obj/structure/table/reinforced, -/obj/item/weapon/packageWrap, +/obj/item/packageWrap, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -180,7 +180,7 @@ /area/awaymission/zoo/pirateship) "aA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box, +/obj/item/storage/box, /obj/machinery/light/small{ dir = 1 }, @@ -202,7 +202,7 @@ /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "aD" = ( -/obj/item/weapon/storage/box, +/obj/item/storage/box, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "aE" = ( @@ -224,7 +224,7 @@ /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "aH" = ( -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "aI" = ( @@ -236,19 +236,19 @@ /area/awaymission/zoo/pirateship) "aJ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/spacecash/c500, -/obj/item/weapon/spacecash/c100, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/spacecash/c500, +/obj/item/spacecash/c100, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /turf/simulated/floor/wood, /area/awaymission/zoo/pirateship) "aK" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/yellow, +/obj/item/bedsheet/yellow, /turf/simulated/floor/wood, /area/awaymission/zoo/pirateship) "aL" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/head/helmet/space/emergency, /obj/effect/floor_decal/industrial/warning{ @@ -272,8 +272,8 @@ /area/awaymission/zoo/pirateship) "aP" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "aQ" = ( @@ -424,13 +424,13 @@ /area/awaymission/zoo/pirateship) "bq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/paper{ +/obj/item/tool/screwdriver, +/obj/item/tool/screwdriver, +/obj/item/paper{ info = "The next person who takes one of my screwdrivers gets stabbed with one. They are MINE. - Love, Madsen"; name = "scribbled note" }, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) @@ -477,19 +477,19 @@ /area/awaymission/zoo/pirateship) "bx" = ( /obj/structure/table/reinforced, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, +/obj/item/material/knife/butch, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, /obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled/white, /area/awaymission/zoo/pirateship) "by" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled/white, /area/awaymission/zoo/pirateship) @@ -507,13 +507,13 @@ /area/awaymission/zoo/pirateship) "bB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) "bC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) @@ -590,7 +590,7 @@ /turf/space, /area/awaymission/zoo/tradeship) "bN" = ( -/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice, +/obj/item/reagent_containers/food/snacks/hugemushroomslice, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) @@ -598,7 +598,7 @@ /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) "bP" = ( -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) "bQ" = ( @@ -606,7 +606,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/zoo/pirateship) "bR" = ( -/obj/item/weapon/stool, +/obj/item/stool, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) @@ -647,7 +647,7 @@ /area/awaymission/zoo/tradeship) "ca" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/rd, +/obj/item/bedsheet/rd, /turf/simulated/shuttle/floor/black, /area/awaymission/zoo/tradeship) "cb" = ( @@ -692,7 +692,7 @@ /turf/space, /area/awaymission/zoo/tradeship) "cj" = ( -/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice, +/obj/item/reagent_containers/food/snacks/hugemushroomslice, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) "ck" = ( @@ -720,7 +720,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/zoo/pirateship) "co" = ( -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) @@ -734,18 +734,18 @@ /obj/structure/closet/secure_closet/freezer/meat{ opened = 1 }, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, /turf/simulated/floor/tiled/white, /area/awaymission/zoo/pirateship) "cr" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/xenomeat, /turf/simulated/floor/tiled/white, /area/awaymission/zoo/pirateship) "cs" = ( @@ -753,7 +753,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/zoo/pirateship) "ct" = ( -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /turf/simulated/floor/tiled/white, /area/awaymission/zoo/pirateship) "cu" = ( @@ -796,7 +796,7 @@ /area/awaymission/zoo/tradeship) "cA" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/simulated/floor/carpet, /area/awaymission/zoo/tradeship) "cB" = ( @@ -826,11 +826,11 @@ /turf/simulated/shuttle/floor/black, /area/awaymission/zoo/tradeship) "cG" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, @@ -840,30 +840,30 @@ /obj/item/bodybag/cryobag{ pixel_x = 5 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/box/masks, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire{ layer = 2.9; pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = -2 }, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/structure/closet/medical_wall{ pixel_y = 32 }, @@ -871,12 +871,12 @@ /area/awaymission/zoo/tradeship) "cI" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper/zoo/pirate/volk, +/obj/item/paper/zoo/pirate/volk, /turf/simulated/floor/carpet, /area/awaymission/zoo/pirateship) "cJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /turf/simulated/floor/carpet, /area/awaymission/zoo/pirateship) "cK" = ( @@ -910,7 +910,7 @@ /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) "cP" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/tiled/freezer, /area/awaymission/zoo/pirateship) "cQ" = ( @@ -923,7 +923,7 @@ /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) "cR" = ( -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/reinforced, /area/awaymission/zoo/pirateship) "cS" = ( @@ -957,11 +957,11 @@ /turf/simulated/shuttle/floor/black, /area/awaymission/zoo/tradeship) "cW" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /obj/machinery/light, @@ -970,7 +970,7 @@ /area/awaymission/zoo/tradeship) "cX" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /turf/simulated/shuttle/floor/black, /area/awaymission/zoo/tradeship) "cY" = ( @@ -981,7 +981,7 @@ /area/awaymission/zoo/tradeship) "cZ" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/glasses/square, +/obj/item/storage/box/glasses/square, /turf/simulated/floor/carpet, /area/awaymission/zoo/tradeship) "da" = ( @@ -1042,7 +1042,7 @@ /turf/simulated/floor/carpet, /area/awaymission/zoo/pirateship) "di" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/carpet, /area/awaymission/zoo/pirateship) "dj" = ( @@ -1209,12 +1209,12 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "dI" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/lights, +/obj/item/storage/box/lights, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, @@ -1272,26 +1272,26 @@ /obj/structure/table/standard, /obj/item/clothing/gloves/sterile, /obj/item/clothing/mask/surgical, -/obj/item/weapon/surgical/retractor{ +/obj/item/surgical/retractor{ pixel_y = 6 }, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/surgical/circular_saw, +/obj/item/surgical/scalpel, +/obj/item/surgical/surgicaldrill, +/obj/item/surgical/circular_saw, /obj/item/stack/nanopaste, -/obj/item/weapon/surgical/hemostat{ +/obj/item/surgical/hemostat{ pixel_y = 4 }, -/obj/item/weapon/surgical/cautery{ +/obj/item/surgical/cautery{ pixel_y = 4 }, -/obj/item/weapon/surgical/FixOVein{ +/obj/item/surgical/FixOVein{ pixel_x = -6; pixel_y = 1 }, /obj/item/stack/medical/advanced/bruise_pack, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel{ +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel{ pixel_x = 4; pixel_y = 3 }, @@ -1322,7 +1322,7 @@ /area/awaymission/zoo/pirateship) "dY" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "dZ" = ( @@ -1332,7 +1332,7 @@ /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "ea" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) @@ -1385,7 +1385,7 @@ /area/awaymission/zoo/pirateship) "eh" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, @@ -1438,7 +1438,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "ep" = ( @@ -1450,7 +1450,7 @@ /area/awaymission/zoo/pirateship) "eq" = ( /obj/structure/table/rack, -/obj/item/weapon/cell/high, +/obj/item/cell/high, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, @@ -1458,11 +1458,11 @@ /area/awaymission/zoo/pirateship) "er" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/shuttle/floor/black, @@ -1547,7 +1547,7 @@ base_state = "right"; icon_state = "right" }, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "eD" = ( @@ -1557,7 +1557,7 @@ /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "eE" = ( -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "eF" = ( @@ -1612,7 +1612,7 @@ /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/simulated/shuttle/floor/black, /area/awaymission/zoo/tradeship) @@ -1631,7 +1631,7 @@ /turf/simulated/shuttle/floor/black, /area/awaymission/zoo/tradeship) "eP" = ( -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "eQ" = ( @@ -1650,11 +1650,11 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "eT" = ( -/obj/item/weapon/cell/high, +/obj/item/cell/high, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) "eU" = ( @@ -1714,7 +1714,7 @@ dir = 4; id = "meatConvey2" }, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /turf/simulated/shuttle/plating, /area/awaymission/zoo/pirateship) "fd" = ( @@ -1779,7 +1779,7 @@ /obj/machinery/vending/assist{ contraband = null; name = "Old Vending Machine"; - products = list(/obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/signaler = 4, /obj/item/device/assembly/infra = 4, /obj/item/device/assembly/prox_sensor = 4, /obj/item/weapon/handcuffs = 8, /obj/item/device/flash = 4, /obj/item/weapon/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) + products = list(/obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, /obj/item/assembly/infra = 4, /obj/item/assembly/prox_sensor = 4, /obj/item/handcuffs = 8, /obj/item/flash = 4, /obj/item/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) }, /turf/simulated/shuttle/floor/black, /area/awaymission/zoo/tradeship) @@ -1787,9 +1787,9 @@ /obj/structure/closet{ name = "custodial" }, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, /turf/simulated/shuttle/floor/black, /area/awaymission/zoo/tradeship) "fo" = ( @@ -1799,8 +1799,8 @@ "fp" = ( /obj/machinery/light, /obj/structure/table/standard, -/obj/item/weapon/soap, -/obj/item/weapon/towel{ +/obj/item/soap, +/obj/item/towel{ color = "#0000FF" }, /turf/simulated/shuttle/floor/black, @@ -1824,7 +1824,7 @@ /turf/simulated/shuttle/floor/black, /area/awaymission/zoo/tradeship) "ft" = ( -/obj/item/weapon/material/knife, +/obj/item/material/knife, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) @@ -1836,7 +1836,7 @@ /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) "fv" = ( -/obj/item/weapon/mop, +/obj/item/mop, /turf/simulated/floor/tiled/freezer, /area/awaymission/zoo/pirateship) "fw" = ( @@ -1856,20 +1856,20 @@ /area/awaymission/zoo/tradeship) "fy" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/shuttle/floor/black, /area/awaymission/zoo/tradeship) "fz" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "fA" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/tiled/freezer, /area/awaymission/zoo/pirateship) "fB" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/freezer, /area/awaymission/zoo/pirateship) "fC" = ( @@ -1948,12 +1948,12 @@ /turf/simulated/floor/tiled/steel, /area/awaymission/zoo/pirateship) "fQ" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/tiled/steel, /area/awaymission/zoo/pirateship) "fR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "DEAR DAIRY: So we was doing our typpical route when the captain says we've been picking up weird signals on some backwatter planet. Madsen wanted to stay on course but he ain't the captain, so we went out of the way to check it out. There was lots of rocks on the way, but we got to the planet fine. Found a big fancy camp with nobody around and this big metal donut thing with NT stamps all over it right in the middle. Case of beer too. Captain reckons we can pass it off to some buyer in the Syndicate. Ingram says it's bad luck and that someone is going to come look for it but it sounds like better money than selling bad meat to jerky companies."; name = "Old Diary" }, @@ -1961,8 +1961,8 @@ /area/awaymission/zoo/pirateship) "fS" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pen/red, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/pen/red, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /turf/simulated/floor/tiled/steel, /area/awaymission/zoo/pirateship) "fT" = ( @@ -2055,11 +2055,11 @@ /area/awaymission/zoo/tradeship) "gh" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/carpet, @@ -2115,8 +2115,8 @@ /area/awaymission/zoo/pirateship) "gp" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, -/obj/item/weapon/storage/wallet/random, +/obj/item/bedsheet, +/obj/item/storage/wallet/random, /turf/simulated/floor/tiled/steel, /area/awaymission/zoo/pirateship) "gq" = ( @@ -2180,7 +2180,7 @@ /area/awaymission/zoo/syndieship) "gv" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /turf/simulated/shuttle/floor/black, /area/awaymission/zoo/tradeship) "gw" = ( @@ -2230,7 +2230,7 @@ /area/awaymission/zoo/pirateship) "gF" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/head/helmet/space/emergency, /obj/effect/floor_decal/industrial/warning, @@ -2251,7 +2251,7 @@ /area/awaymission/zoo/syndieship) "gJ" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled/steel, /area/awaymission/zoo/pirateship) "gK" = ( @@ -2299,18 +2299,18 @@ /area/awaymission/zoo/pirateship) "gT" = ( /obj/structure/closet/crate, -/obj/item/weapon/spacecash/c10, -/obj/item/weapon/spacecash/c200, +/obj/item/spacecash/c10, +/obj/item/spacecash/c200, /turf/simulated/floor/tiled/steel, /area/awaymission/zoo/pirateship) "gU" = ( /obj/structure/closet/crate, -/obj/item/weapon/spacecash/c10, +/obj/item/spacecash/c10, /turf/simulated/floor/tiled/steel, /area/awaymission/zoo/pirateship) "gV" = ( /obj/structure/closet/crate, -/obj/item/weapon/spacecash/c1000, +/obj/item/spacecash/c1000, /turf/simulated/floor/tiled/steel, /area/awaymission/zoo/pirateship) "gW" = ( @@ -2330,7 +2330,7 @@ /area/awaymission/zoo) "gY" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 2; pixel_y = 3 }, @@ -2390,14 +2390,14 @@ /obj/item/stack/material/glass{ amount = 15 }, -/obj/item/weapon/cell{ +/obj/item/cell{ charge = 100; maxcharge = 15000 }, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "hf" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -2410,11 +2410,11 @@ /area/awaymission/zoo/syndieship) "hg" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/shuttle/floor/darkred, @@ -2469,8 +2469,8 @@ /turf/simulated/floor/plating, /area/awaymission/zoo) "hk" = ( -/obj/item/weapon/storage/box/matches, -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco, +/obj/item/storage/box/matches, +/obj/item/storage/fancy/cigarettes/dromedaryco, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "hl" = ( @@ -2514,7 +2514,7 @@ /turf/simulated/floor/tiled, /area/awaymission/zoo) "hr" = ( -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "hs" = ( @@ -2532,8 +2532,8 @@ /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "hu" = ( @@ -2659,10 +2659,10 @@ /area/awaymission/zoo/syndieship) "hK" = ( /obj/structure/closet, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, /obj/machinery/light{ dir = 4 }, @@ -2670,10 +2670,10 @@ /area/awaymission/zoo/syndieship) "hL" = ( /obj/structure/closet, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "hM" = ( @@ -2693,7 +2693,7 @@ /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "hO" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -2755,7 +2755,7 @@ /obj/machinery/vending/assist{ contraband = null; name = "AntagCorpVend"; - products = list(/obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/signaler = 4, /obj/item/device/assembly/infra = 4, /obj/item/device/assembly/prox_sensor = 4, /obj/item/weapon/handcuffs = 8, /obj/item/device/flash = 4, /obj/item/weapon/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) + products = list(/obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, /obj/item/assembly/infra = 4, /obj/item/assembly/prox_sensor = 4, /obj/item/handcuffs = 8, /obj/item/flash = 4, /obj/item/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) }, /obj/machinery/light{ dir = 4 @@ -2780,7 +2780,7 @@ /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) @@ -2809,18 +2809,18 @@ /area/awaymission/zoo/syndieship) "id" = ( /obj/structure/table/standard, -/obj/item/weapon/material/knife{ +/obj/item/material/knife{ pixel_x = -6 }, -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = -1 }, -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = 9 }, @@ -2856,9 +2856,9 @@ /obj/structure/closet{ name = "custodial" }, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "ij" = ( @@ -2899,8 +2899,8 @@ /area/awaymission/zoo/syndieship) "ip" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "iq" = ( @@ -2910,18 +2910,18 @@ req_access = list(150) }, /obj/item/bodybag, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{ +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/glass/bottle/antitoxin{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{ +/obj/item/reagent_containers/glass/bottle/inaprovaline{ pixel_x = 4; pixel_y = 7 }, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /obj/machinery/light{ dir = 4 }, @@ -3024,7 +3024,7 @@ /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "iA" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "iB" = ( @@ -3099,7 +3099,7 @@ /area/awaymission/zoo/syndieship) "iF" = ( /obj/structure/table/rack, -/obj/item/device/multitool, +/obj/item/multitool, /obj/machinery/light{ dir = 8 }, @@ -3110,9 +3110,9 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/surgical/cautery, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/surgicaldrill, +/obj/item/surgical/cautery, +/obj/item/surgical/retractor, /obj/item/stack/nanopaste, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) @@ -3121,12 +3121,12 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw, -/obj/item/weapon/surgical/FixOVein{ +/obj/item/surgical/circular_saw, +/obj/item/surgical/FixOVein{ pixel_x = -6; pixel_y = 1 }, -/obj/item/weapon/surgical/hemostat, +/obj/item/surgical/hemostat, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "iI" = ( @@ -3134,21 +3134,21 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 1 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 1 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "iJ" = ( @@ -3159,7 +3159,7 @@ /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "iK" = ( -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/machinery/light{ dir = 8 }, @@ -3208,13 +3208,13 @@ pixel_x = 32; req_access = list(150) }, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/surgical, /obj/item/clothing/gloves/sterile, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/glass/bottle/stoxin, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "iQ" = ( @@ -3222,7 +3222,7 @@ /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "iR" = ( -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "iS" = ( @@ -3241,9 +3241,9 @@ /area/awaymission/zoo/syndieship) "iV" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel{ +/obj/item/surgical/scalpel, +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel{ pixel_x = 4; pixel_y = 3 }, @@ -3990,7 +3990,7 @@ /area/awaymission/zoo) "kY" = ( /obj/structure/table/marble, -/obj/item/weapon/pen/multi, +/obj/item/pen/multi, /turf/simulated/floor/holofloor/lino, /area/awaymission/zoo) "kZ" = ( @@ -4008,7 +4008,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, /turf/simulated/floor/beach/water{ icon_state = "seadeep" }, @@ -4093,7 +4093,7 @@ /area/awaymission/zoo) "lq" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "lr" = ( @@ -4115,18 +4115,18 @@ /area/awaymission/zoo) "lu" = ( /obj/structure/table/rack, -/obj/item/device/camera_film, +/obj/item/camera_film, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "lv" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/photo_album, +/obj/item/storage/photo_album, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "lw" = ( /obj/structure/table/rack, -/obj/item/device/camera_film, -/obj/item/device/camera, +/obj/item/camera_film, +/obj/item/camera, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "lx" = ( @@ -4197,7 +4197,7 @@ }, /area/awaymission/zoo) "lG" = ( -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /turf/simulated/floor/beach/water{ icon_state = "seadeep" }, @@ -4260,32 +4260,32 @@ /area/awaymission/zoo) "lR" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/wallet/poly, +/obj/item/storage/wallet/poly, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "lS" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "lT" = ( /obj/structure/table/rack, -/obj/item/weapon/beach_ball, +/obj/item/beach_ball, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "lU" = ( /obj/structure/table/rack, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "lV" = ( /obj/structure/table/rack, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "lW" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/backpack/clown, +/obj/item/storage/backpack/clown, /obj/item/clothing/shoes/rainbow, /obj/item/clothing/under/color/rainbow, /obj/item/clothing/gloves/rainbow, @@ -4990,12 +4990,12 @@ /area/awaymission/zoo) "nM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pen/blue, -/obj/item/weapon/pen/red{ +/obj/item/pen/blue, +/obj/item/pen/red{ pixel_x = -5; pixel_y = -1 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -5003,18 +5003,18 @@ /area/awaymission/zoo) "nN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder{ +/obj/item/folder{ pixel_x = -4 }, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_y = 3 }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 5 }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/stamp/internalaffairs, -/obj/item/weapon/stamp/denied{ +/obj/item/folder/yellow, +/obj/item/stamp/internalaffairs, +/obj/item/stamp/denied{ pixel_x = 4; pixel_y = -2 }, @@ -5022,7 +5022,7 @@ /area/awaymission/zoo) "nO" = ( /obj/structure/table/reinforced, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/lino, /area/awaymission/zoo) "nP" = ( @@ -6136,7 +6136,7 @@ /turf/simulated/floor/plating, /area/awaymission/zoo) "qP" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/plating, /area/awaymission/zoo) "qQ" = ( @@ -6159,16 +6159,16 @@ /area/awaymission/zoo) "qU" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/plating, /area/awaymission/zoo) "qV" = ( /obj/structure/table/rack{ dir = 1 }, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/plating, /area/awaymission/zoo) "qW" = ( @@ -8177,11 +8177,11 @@ /turf/simulated/floor/tiled/white, /area/awaymission/zoo) "vL" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, @@ -8191,34 +8191,34 @@ /obj/item/bodybag/cryobag{ pixel_x = 5 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/box/masks, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire{ layer = 2.9; pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = -2 }, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/structure/closet/medical_wall{ pixel_y = 32 }, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, /turf/simulated/floor/tiled/white, /area/awaymission/zoo) "vM" = ( @@ -8253,26 +8253,26 @@ /obj/structure/table/standard, /obj/item/clothing/gloves/sterile, /obj/item/clothing/mask/surgical, -/obj/item/weapon/surgical/retractor{ +/obj/item/surgical/retractor{ pixel_y = 6 }, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/surgical/circular_saw, +/obj/item/surgical/scalpel, +/obj/item/surgical/surgicaldrill, +/obj/item/surgical/circular_saw, /obj/item/stack/nanopaste, -/obj/item/weapon/surgical/hemostat{ +/obj/item/surgical/hemostat{ pixel_y = 4 }, -/obj/item/weapon/surgical/cautery{ +/obj/item/surgical/cautery{ pixel_y = 4 }, -/obj/item/weapon/surgical/FixOVein{ +/obj/item/surgical/FixOVein{ pixel_x = -6; pixel_y = 1 }, /obj/item/stack/medical/advanced/bruise_pack, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel{ +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel{ pixel_x = 4; pixel_y = 3 }, @@ -8301,7 +8301,7 @@ /area/awaymission/zoo) "vY" = ( /obj/structure/table/standard, -/obj/item/weapon/paper/zoo/pirate/haveyouseen, +/obj/item/paper/zoo/pirate/haveyouseen, /turf/simulated/floor/tiled/dark, /area/awaymission/zoo) "vZ" = ( @@ -8447,7 +8447,7 @@ /area/awaymission/zoo) "ww" = ( /obj/structure/table/standard, -/obj/item/weapon/paper/zoo/pirate/warning, +/obj/item/paper/zoo/pirate/warning, /turf/simulated/floor/tiled/dark, /area/awaymission/zoo) "wx" = ( @@ -8589,17 +8589,17 @@ /area/awaymission/zoo) "wW" = ( /obj/structure/filingcabinet/filingcabinet, -/obj/item/weapon/paper/zoo, -/obj/item/weapon/paper/zoo, -/obj/item/weapon/paper/zoo, +/obj/item/paper/zoo, +/obj/item/paper/zoo, +/obj/item/paper/zoo, /turf/simulated/floor/tiled/dark, /area/awaymission/zoo) "wX" = ( /obj/structure/filingcabinet/filingcabinet, -/obj/item/weapon/paper/zoo, -/obj/item/weapon/paper/zoo, -/obj/item/weapon/paper/zoo, -/obj/item/weapon/paper/zoo/pirate/nebula, +/obj/item/paper/zoo, +/obj/item/paper/zoo, +/obj/item/paper/zoo, +/obj/item/paper/zoo/pirate/nebula, /turf/simulated/floor/tiled/dark, /area/awaymission/zoo) "wY" = ( @@ -8629,9 +8629,9 @@ "xc" = ( /obj/structure/closet/crate/solar, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/cell/crap, -/obj/item/weapon/cell/crap, -/obj/item/weapon/cell/crap, +/obj/item/cell/crap, +/obj/item/cell/crap, +/obj/item/cell/crap, /turf/simulated/floor, /area/awaymission/zoo) "xd" = ( diff --git a/maps/gateway_vr/zoo_b.dmm b/maps/gateway_vr/zoo_b.dmm index 0dfcbcb6475..90313731947 100644 --- a/maps/gateway_vr/zoo_b.dmm +++ b/maps/gateway_vr/zoo_b.dmm @@ -15,20 +15,20 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, /turf/simulated/floor/beach/water{ icon_state = "seadeep" }, /area/awaymission/zoo) "ah" = ( /obj/structure/table/reinforced, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, +/obj/item/material/knife/butch, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, /obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled/white, /area/awaymission/zoo/pirateship) @@ -109,7 +109,7 @@ /area/awaymission/zoo) "aC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box, +/obj/item/storage/box, /obj/machinery/light/small{ dir = 1 }, @@ -235,7 +235,7 @@ /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "bD" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "bF" = ( @@ -406,9 +406,9 @@ /area/awaymission/zoo/pirateship) "de" = ( /obj/structure/table/woodentable, -/obj/item/weapon/spacecash/c500, -/obj/item/weapon/spacecash/c100, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/spacecash/c500, +/obj/item/spacecash/c100, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /turf/simulated/floor/wood, /area/awaymission/zoo/pirateship) "dj" = ( @@ -430,10 +430,10 @@ /area/awaymission/zoo) "dt" = ( /obj/structure/closet, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "dw" = ( @@ -562,9 +562,9 @@ /obj/structure/table/rack{ dir = 1 }, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/plating, /area/awaymission/zoo) "ey" = ( @@ -790,7 +790,7 @@ /turf/space, /area/awaymission/zoo/syndieship) "fV" = ( -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/reinforced, /area/awaymission/zoo/pirateship) "fW" = ( @@ -798,11 +798,11 @@ /area/awaymission/zoo/syndieship) "fY" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/shuttle/floor/darkred, @@ -972,12 +972,12 @@ /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "hx" = ( -/obj/item/weapon/storage/box/matches, -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco, +/obj/item/storage/box/matches, +/obj/item/storage/fancy/cigarettes/dromedaryco, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "hy" = ( -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /turf/simulated/floor/beach/water{ icon_state = "seadeep" }, @@ -1123,7 +1123,7 @@ }, /area/awaymission/zoo) "iy" = ( -/obj/item/weapon/storage/box, +/obj/item/storage/box, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "iE" = ( @@ -1201,7 +1201,7 @@ /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "jc" = ( -/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice, +/obj/item/reagent_containers/food/snacks/hugemushroomslice, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) @@ -1300,7 +1300,7 @@ dir = 4; id = "meatConvey2" }, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /turf/simulated/shuttle/plating, /area/awaymission/zoo/pirateship) "kc" = ( @@ -1360,7 +1360,7 @@ }, /area/awaymission/zoo) "ky" = ( -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /turf/simulated/floor/tiled/white, /area/awaymission/zoo/pirateship) "kC" = ( @@ -1421,7 +1421,7 @@ /turf/simulated/floor/lino, /area/awaymission/zoo) "lv" = ( -/obj/item/weapon/cell/high, +/obj/item/cell/high, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) "lw" = ( @@ -1430,7 +1430,7 @@ /area/awaymission/zoo/syndieship) "lB" = ( /obj/structure/table/reinforced, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/lino, /area/awaymission/zoo) "lH" = ( @@ -1549,7 +1549,7 @@ /area/awaymission/zoo/pirateship) "nj" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -1569,18 +1569,18 @@ /area/awaymission/zoo) "no" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder{ +/obj/item/folder{ pixel_x = -4 }, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_y = 3 }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 5 }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/stamp/internalaffairs, -/obj/item/weapon/stamp/denied{ +/obj/item/folder/yellow, +/obj/item/stamp/internalaffairs, +/obj/item/stamp/denied{ pixel_x = 4; pixel_y = -2 }, @@ -1588,7 +1588,7 @@ /area/awaymission/zoo) "nr" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "ns" = ( @@ -1649,7 +1649,7 @@ /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) "nS" = ( -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) "nT" = ( @@ -1715,7 +1715,7 @@ }, /area/awaymission/zoo) "oq" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) @@ -1725,7 +1725,7 @@ /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "oA" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/freezer, /area/awaymission/zoo/pirateship) "oE" = ( @@ -1750,7 +1750,7 @@ /area/awaymission/zoo/pirateship) "oJ" = ( /obj/structure/table/rack, -/obj/item/device/multitool, +/obj/item/multitool, /obj/machinery/light{ dir = 8 }, @@ -1773,7 +1773,7 @@ /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) @@ -1792,7 +1792,7 @@ /turf/space, /area/awaymission/zoo/pirateship) "pa" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -1903,8 +1903,8 @@ /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "pX" = ( @@ -1916,7 +1916,7 @@ /area/awaymission/zoo/pirateship) "qb" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/head/helmet/space/emergency, /obj/effect/floor_decal/industrial/warning{ @@ -2059,8 +2059,8 @@ /area/awaymission/zoo) "rw" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "rz" = ( @@ -2068,7 +2068,7 @@ /area/awaymission/zoo) "rA" = ( /obj/structure/table/rack, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "rF" = ( @@ -2089,7 +2089,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/simulated/floor/reinforced, /area/awaymission/zoo/pirateship) @@ -2138,14 +2138,14 @@ /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "sd" = ( -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/machinery/light{ dir = 8 }, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "sh" = ( -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "so" = ( @@ -2173,14 +2173,14 @@ /area/awaymission/zoo) "sz" = ( /obj/structure/closet/crate, -/obj/item/weapon/spacecash/c10, -/obj/item/weapon/spacecash/c200, +/obj/item/spacecash/c10, +/obj/item/spacecash/c200, /turf/simulated/floor/tiled/steel, /area/awaymission/zoo/pirateship) "sB" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "sI" = ( @@ -2264,7 +2264,7 @@ /area/awaymission/zoo) "tr" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled/steel, /area/awaymission/zoo/pirateship) "tx" = ( @@ -2295,8 +2295,8 @@ /area/awaymission/zoo/pirateship) "tK" = ( /obj/structure/table/rack, -/obj/item/device/camera_film, -/obj/item/device/camera, +/obj/item/camera_film, +/obj/item/camera, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "tM" = ( @@ -2305,18 +2305,18 @@ /area/awaymission/zoo) "tN" = ( /obj/structure/table/standard, -/obj/item/weapon/material/knife{ +/obj/item/material/knife{ pixel_x = -6 }, -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = -1 }, -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = 9 }, @@ -2331,7 +2331,7 @@ /area/awaymission/zoo) "tR" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/wallet/poly, +/obj/item/storage/wallet/poly, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "tU" = ( @@ -2344,8 +2344,8 @@ /area/awaymission/zoo) "tX" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -2448,7 +2448,7 @@ /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "uA" = ( -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "uC" = ( @@ -2557,7 +2557,7 @@ /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "vj" = ( -/obj/item/weapon/stool, +/obj/item/stool, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) @@ -2608,7 +2608,7 @@ /area/awaymission/zoo/pirateship) "wa" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) @@ -2716,7 +2716,7 @@ /area/awaymission/zoo) "xA" = ( /obj/structure/table/marble, -/obj/item/weapon/pen/multi, +/obj/item/pen/multi, /turf/simulated/floor/holofloor/lino, /area/awaymission/zoo) "xB" = ( @@ -2735,7 +2735,7 @@ }, /area/awaymission/zoo) "xL" = ( -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) @@ -2780,7 +2780,7 @@ /area/awaymission/zoo) "yn" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/tiled/freezer, /area/awaymission/zoo/pirateship) "yp" = ( @@ -2846,16 +2846,16 @@ /area/awaymission/zoo) "yR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled/white, /area/awaymission/zoo/pirateship) "yU" = ( /obj/structure/closet, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, /obj/machinery/light{ dir = 4 }, @@ -2930,7 +2930,7 @@ /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) "zv" = ( -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "zx" = ( @@ -2966,21 +2966,21 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 1 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 1 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "zJ" = ( @@ -3097,7 +3097,7 @@ /turf/simulated/floor/grass, /area/awaymission/zoo) "Bi" = ( -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "Bk" = ( @@ -3149,7 +3149,7 @@ /area/awaymission/zoo/pirateship) "By" = ( /obj/structure/table/rack, -/obj/item/weapon/beach_ball, +/obj/item/beach_ball, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "BC" = ( @@ -3207,7 +3207,7 @@ /turf/simulated/floor/plating, /area/awaymission/zoo) "BS" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "Cc" = ( @@ -3226,7 +3226,7 @@ /area/awaymission/zoo) "Cj" = ( /obj/structure/table/rack, -/obj/item/weapon/cell/high, +/obj/item/cell/high, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, @@ -3240,7 +3240,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "Cp" = ( @@ -3261,15 +3261,15 @@ /area/awaymission/zoo) "Cx" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/xenomeat, /turf/simulated/floor/tiled/white, /area/awaymission/zoo/pirateship) "Cy" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pen/red, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/pen/red, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /turf/simulated/floor/tiled/steel, /area/awaymission/zoo/pirateship) "Cz" = ( @@ -3307,26 +3307,26 @@ /obj/structure/table/standard, /obj/item/clothing/gloves/sterile, /obj/item/clothing/mask/surgical, -/obj/item/weapon/surgical/retractor{ +/obj/item/surgical/retractor{ pixel_y = 6 }, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/surgical/circular_saw, +/obj/item/surgical/scalpel, +/obj/item/surgical/surgicaldrill, +/obj/item/surgical/circular_saw, /obj/item/stack/nanopaste, -/obj/item/weapon/surgical/hemostat{ +/obj/item/surgical/hemostat{ pixel_y = 4 }, -/obj/item/weapon/surgical/cautery{ +/obj/item/surgical/cautery{ pixel_y = 4 }, -/obj/item/weapon/surgical/FixOVein{ +/obj/item/surgical/FixOVein{ pixel_x = -6; pixel_y = 1 }, /obj/item/stack/medical/advanced/bruise_pack, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel{ +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel{ pixel_x = 4; pixel_y = 3 }, @@ -3334,19 +3334,19 @@ /area/awaymission/zoo) "CO" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/paper{ +/obj/item/tool/screwdriver, +/obj/item/tool/screwdriver, +/obj/item/paper{ info = "The next person who takes one of my screwdrivers gets stabbed with one. They are MINE. - Love, Madsen"; name = "scribbled note" }, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) "CR" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/photo_album, +/obj/item/storage/photo_album, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "CS" = ( @@ -3465,11 +3465,11 @@ /turf/simulated/floor/plating, /area/awaymission/zoo) "DX" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, @@ -3479,34 +3479,34 @@ /obj/item/bodybag/cryobag{ pixel_x = 5 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/box/masks, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire{ layer = 2.9; pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = -2 }, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/structure/closet/medical_wall{ pixel_y = 32 }, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, /turf/simulated/floor/tiled/white, /area/awaymission/zoo) "Ea" = ( @@ -3523,7 +3523,7 @@ }, /area/awaymission/zoo) "Ei" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -3752,7 +3752,7 @@ /area/awaymission/zoo) "FS" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/plating, /area/awaymission/zoo) "FV" = ( @@ -3782,12 +3782,12 @@ /area/awaymission/zoo) "FY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pen/blue, -/obj/item/weapon/pen/red{ +/obj/item/pen/blue, +/obj/item/pen/red{ pixel_x = -5; pixel_y = -1 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -3866,14 +3866,14 @@ /area/awaymission/zoo) "GF" = ( /obj/structure/table/rack, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "GI" = ( /obj/machinery/vending/assist{ contraband = null; name = "AntagCorpVend"; - products = list(/obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/signaler = 4, /obj/item/device/assembly/infra = 4, /obj/item/device/assembly/prox_sensor = 4, /obj/item/weapon/handcuffs = 8, /obj/item/device/flash = 4, /obj/item/weapon/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) + products = list(/obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, /obj/item/assembly/infra = 4, /obj/item/assembly/prox_sensor = 4, /obj/item/handcuffs = 8, /obj/item/flash = 4, /obj/item/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) }, /obj/machinery/light{ dir = 4 @@ -3916,7 +3916,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "Ho" = ( @@ -4035,7 +4035,7 @@ /area/awaymission/zoo) "HX" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 2; pixel_y = 3 }, @@ -4075,7 +4075,7 @@ /turf/simulated/floor/tiled, /area/awaymission/zoo) "Im" = ( -/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice, +/obj/item/reagent_containers/food/snacks/hugemushroomslice, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) "Io" = ( @@ -4167,12 +4167,12 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw, -/obj/item/weapon/surgical/FixOVein{ +/obj/item/surgical/circular_saw, +/obj/item/surgical/FixOVein{ pixel_x = -6; pixel_y = 1 }, -/obj/item/weapon/surgical/hemostat, +/obj/item/surgical/hemostat, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "Ju" = ( @@ -4201,12 +4201,12 @@ /area/awaymission/zoo) "JD" = ( /obj/structure/table/rack, -/obj/item/device/camera_film, +/obj/item/camera_film, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "JH" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "JI" = ( @@ -4262,7 +4262,7 @@ }, /area/awaymission/zoo) "Ku" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/plating, /area/awaymission/zoo) "Kw" = ( @@ -4334,9 +4334,9 @@ /area/awaymission/zoo) "Lr" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel{ +/obj/item/surgical/scalpel, +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel{ pixel_x = 4; pixel_y = 3 }, @@ -4351,8 +4351,8 @@ /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) "Ly" = ( -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs, /obj/structure/closet/crate, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) @@ -4592,7 +4592,7 @@ /area/awaymission/zoo/pirateship) "NI" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/yellow, +/obj/item/bedsheet/yellow, /turf/simulated/floor/wood, /area/awaymission/zoo/pirateship) "NS" = ( @@ -4708,7 +4708,7 @@ /area/awaymission/zoo) "OP" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/lights, +/obj/item/storage/box/lights, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, @@ -4737,16 +4737,16 @@ /obj/item/stack/material/glass{ amount = 15 }, -/obj/item/weapon/cell{ +/obj/item/cell{ charge = 100; maxcharge = 15000 }, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "OZ" = ( -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/scalpel, /obj/structure/closet/crate, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "Pa" = ( @@ -4757,7 +4757,7 @@ /area/awaymission/zoo/syndieship) "Pc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper/zoo/pirate/volk, +/obj/item/paper/zoo/pirate/volk, /turf/simulated/floor/carpet, /area/awaymission/zoo/pirateship) "Pd" = ( @@ -4775,7 +4775,7 @@ /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) "Pp" = ( -/obj/item/weapon/material/knife, +/obj/item/material/knife, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) @@ -4822,7 +4822,7 @@ /area/awaymission/zoo/pirateship) "Pw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/awaymission/zoo/pirateship) @@ -4837,12 +4837,12 @@ /area/awaymission/zoo) "Pz" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "PB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "DEAR DAIRY: So we was doing our typpical route when the captain says we've been picking up weird signals on some backwatter planet. Madsen wanted to stay on course but he ain't the captain, so we went out of the way to check it out. There was lots of rocks on the way, but we got to the planet fine. Found a big fancy camp with nobody around and this big metal donut thing with NT stamps all over it right in the middle. Case of beer too. Captain reckons we can pass it off to some buyer in the Syndicate. Ingram says it's bad luck and that someone is going to come look for it but it sounds like better money than selling bad meat to jerky companies."; name = "Old Diary" }, @@ -4923,11 +4923,11 @@ /turf/simulated/floor/tiled/white, /area/awaymission/zoo) "Qy" = ( -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "QD" = ( -/obj/item/weapon/mop, +/obj/item/mop, /turf/simulated/floor/tiled/freezer, /area/awaymission/zoo/pirateship) "QK" = ( @@ -5008,7 +5008,7 @@ }, /area/awaymission/zoo) "Rj" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/tiled/steel, /area/awaymission/zoo/pirateship) "Rk" = ( @@ -5221,7 +5221,7 @@ /area/awaymission/zoo/pirateship) "Td" = ( /obj/structure/table/reinforced, -/obj/item/weapon/packageWrap, +/obj/item/packageWrap, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -5311,18 +5311,18 @@ req_access = list(150) }, /obj/item/bodybag, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{ +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/glass/bottle/antitoxin{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{ +/obj/item/reagent_containers/glass/bottle/inaprovaline{ pixel_x = 4; pixel_y = 7 }, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /obj/machinery/light{ dir = 4 }, @@ -5339,7 +5339,7 @@ /area/awaymission/zoo/syndieship) "Un" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/backpack/clown, +/obj/item/storage/backpack/clown, /obj/item/clothing/shoes/rainbow, /obj/item/clothing/under/color/rainbow, /obj/item/clothing/gloves/rainbow, @@ -5364,11 +5364,11 @@ /obj/structure/closet/secure_closet/freezer/meat{ opened = 1 }, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, /turf/simulated/floor/tiled/white, /area/awaymission/zoo/pirateship) "Ux" = ( @@ -5437,7 +5437,7 @@ /area/awaymission/zoo) "UT" = ( /obj/structure/closet/crate, -/obj/item/weapon/spacecash/c10, +/obj/item/spacecash/c10, /turf/simulated/floor/tiled/steel, /area/awaymission/zoo/pirateship) "UV" = ( @@ -5465,7 +5465,7 @@ base_state = "right"; icon_state = "right" }, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "Vh" = ( @@ -5491,7 +5491,7 @@ /area/awaymission/zoo/pirateship) "Vj" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /turf/simulated/floor/carpet, /area/awaymission/zoo/pirateship) "Vk" = ( @@ -5565,7 +5565,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "VX" = ( @@ -5614,7 +5614,7 @@ /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "Wl" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/tiled/freezer, /area/awaymission/zoo/pirateship) "Wn" = ( @@ -5700,7 +5700,7 @@ /area/awaymission/zoo/pirateship) "WV" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/head/helmet/space/emergency, /obj/effect/floor_decal/industrial/warning, @@ -5708,7 +5708,7 @@ /area/awaymission/zoo/pirateship) "WY" = ( /obj/structure/closet/crate, -/obj/item/weapon/spacecash/c1000, +/obj/item/spacecash/c1000, /turf/simulated/floor/tiled/steel, /area/awaymission/zoo/pirateship) "WZ" = ( @@ -5764,7 +5764,7 @@ /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "Xv" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/carpet, /area/awaymission/zoo/pirateship) "Xz" = ( @@ -5855,9 +5855,9 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/surgical/cautery, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/surgicaldrill, +/obj/item/surgical/cautery, +/obj/item/surgical/retractor, /obj/item/stack/nanopaste, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) @@ -5902,8 +5902,8 @@ /area/awaymission/zoo/pirateship) "YM" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, -/obj/item/weapon/storage/wallet/random, +/obj/item/bedsheet, +/obj/item/storage/wallet/random, /turf/simulated/floor/tiled/steel, /area/awaymission/zoo/pirateship) "YO" = ( @@ -5914,9 +5914,9 @@ /obj/structure/closet{ name = "custodial" }, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "YR" = ( @@ -5942,7 +5942,7 @@ /area/awaymission/zoo/pirateship) "YW" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, @@ -5955,7 +5955,7 @@ /turf/simulated/floor/tiled, /area/awaymission/zoo) "Za" = ( -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) "Ze" = ( @@ -6081,13 +6081,13 @@ pixel_x = 32; req_access = list(150) }, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/surgical, /obj/item/clothing/gloves/sterile, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/glass/bottle/stoxin, /turf/simulated/shuttle/floor/darkred, /area/awaymission/zoo/syndieship) diff --git a/maps/groundbase/gb-centcomm.dmm b/maps/groundbase/gb-centcomm.dmm index 699b29e099a..dbac218cc93 100644 --- a/maps/groundbase/gb-centcomm.dmm +++ b/maps/groundbase/gb-centcomm.dmm @@ -52,11 +52,11 @@ /area/centcom/specops) "al" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "am" = ( @@ -124,12 +124,12 @@ /area/centcom/terminal) "aC" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/syringe/inaprovaline, -/obj/item/weapon/reagent_containers/syringe/inaprovaline{ +/obj/item/reagent_containers/syringe/inaprovaline, +/obj/item/reagent_containers/syringe/inaprovaline{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe/inaprovaline{ +/obj/item/reagent_containers/syringe/inaprovaline{ pixel_y = 10 }, /obj/effect/floor_decal/borderfloor, @@ -149,7 +149,7 @@ /area/shuttle/ccboat) "aF" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/clothing/gloves/sterile/latex, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -161,10 +161,10 @@ /area/centcom/control) "aG" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/compact, -/obj/item/weapon/gun/energy/gun/compact, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/gun/energy/gun/compact, +/obj/item/gun/energy/gun/compact, +/obj/item/flash, +/obj/item/flash, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -196,12 +196,12 @@ /area/centcom/evac) "aL" = ( /obj/structure/table/reinforced, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, /obj/effect/floor_decal/corner/blue{ dir = 5 }, @@ -239,10 +239,10 @@ /obj/item/clothing/head/helmet/ert/security, /obj/item/clothing/head/helmet/ert/security, /obj/item/clothing/head/helmet/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -257,7 +257,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -269,11 +269,11 @@ }) "aT" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/button/remote/blast_door{ id = "TelelockdownC"; name = "Teleporter Entrance Lockdown"; @@ -496,8 +496,8 @@ /area/centcom/specops) "bB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, @@ -568,11 +568,11 @@ /area/centcom/specops) "bW" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "bY" = ( @@ -586,7 +586,7 @@ /turf/simulated/floor/tiled, /area/centcom) "ca" = ( -/obj/item/device/taperecorder, +/obj/item/taperecorder, /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorblack{ dir = 10 @@ -683,17 +683,17 @@ /area/shuttle/escape) "cq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "cs" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "ct" = ( @@ -710,10 +710,10 @@ /area/centcom/terminal) "cv" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/compact, -/obj/item/weapon/gun/energy/gun/compact, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/gun/energy/gun/compact, +/obj/item/gun/energy/gun/compact, +/obj/item/flash, +/obj/item/flash, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "cw" = ( @@ -740,9 +740,9 @@ pixel_y = 26 }, /obj/structure/table/reinforced, -/obj/item/weapon/stamp/ward, -/obj/item/weapon/stamp/denied, -/obj/item/device/binoculars, +/obj/item/stamp/ward, +/obj/item/stamp/denied, +/obj/item/binoculars, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -788,7 +788,7 @@ /area/centcom/security) "cM" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/pastatomato, +/obj/item/reagent_containers/food/snacks/pastatomato, /turf/simulated/floor/wood, /area/centcom/restaurant) "cN" = ( @@ -863,19 +863,19 @@ /turf/simulated/floor/tiled/dark, /area/centcom/security) "cZ" = ( -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -885,7 +885,7 @@ }, /area/tdome/tdomeobserve) "dc" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/wood, @@ -928,7 +928,7 @@ /turf/simulated/floor/tiled/eris/dark/cargo, /area/shuttle/ccboat) "dj" = ( -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -941,8 +941,8 @@ /area/centcom/main_hall) "dn" = ( /obj/structure/table/rack, -/obj/item/device/defib_kit/compact/combat/loaded, -/obj/item/device/defib_kit/compact/combat/loaded, +/obj/item/defib_kit/compact/combat/loaded, +/obj/item/defib_kit/compact/combat/loaded, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "do" = ( @@ -960,11 +960,11 @@ dir = 8; pixel_x = 16 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/command) "dt" = ( @@ -994,8 +994,8 @@ /area/centcom/command) "dx" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/rocket, -/obj/item/weapon/gun/launcher/rocket, +/obj/item/gun/launcher/rocket, +/obj/item/gun/launcher/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, @@ -1028,11 +1028,11 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/command) "dF" = ( @@ -1061,8 +1061,8 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -1127,10 +1127,10 @@ /area/centcom/medical) "dV" = ( /obj/structure/table/reinforced, -/obj/item/device/healthanalyzer/phasic, -/obj/item/device/healthanalyzer/phasic, -/obj/item/device/healthanalyzer/phasic, -/obj/item/device/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dX" = ( @@ -1142,8 +1142,8 @@ /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/melee/baton/loaded, +/obj/item/shield/riot, +/obj/item/melee/baton/loaded, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -1217,11 +1217,11 @@ }) "el" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/shotgun/pump, -/obj/item/weapon/gun/projectile/shotgun/pump, -/obj/item/weapon/gun/projectile/shotgun/pump, -/obj/item/weapon/gun/projectile/shotgun/pump, -/obj/item/weapon/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -1240,12 +1240,12 @@ /area/centcom/evac) "ep" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw, -/obj/item/weapon/surgical/scalpel{ +/obj/item/surgical/circular_saw, +/obj/item/surgical/scalpel{ pixel_y = 12 }, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/hemostat, +/obj/item/surgical/retractor, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -1352,32 +1352,32 @@ /area/centcom/medical) "eI" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, @@ -1409,7 +1409,7 @@ /turf/simulated/floor/tiled/dark, /area/centcom/security) "eM" = ( -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 2; pixel_y = 6 }, @@ -1426,11 +1426,11 @@ /area/centcom/main_hall) "eQ" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/blue, +/obj/item/pen/blue, /turf/simulated/floor/tiled, /area/centcom/control) "eS" = ( @@ -1495,7 +1495,7 @@ "fe" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/projectile/heavysniper, +/obj/item/gun/projectile/heavysniper, /turf/simulated/floor/tiled/dark, /area/centcom/security) "fg" = ( @@ -1558,8 +1558,8 @@ /area/centcom/main_hall) "fl" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, @@ -1629,7 +1629,7 @@ /obj/structure/bed/chair/bay/shuttle{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_x = -32; pixel_y = 24 @@ -1661,10 +1661,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/weapon/gun/projectile/p92x, +/obj/item/gun/projectile/p92x, +/obj/item/gun/projectile/p92x, +/obj/item/gun/projectile/p92x, +/obj/item/gun/projectile/p92x, /obj/item/ammo_magazine/m9mm/large/preban, /obj/item/ammo_magazine/m9mm/large/preban, /obj/item/ammo_magazine/m9mm/large/preban, @@ -1752,9 +1752,9 @@ /area/centcom/medical) "ga" = ( /obj/structure/table/reinforced, -/obj/item/device/aicard, -/obj/item/weapon/pinpointer/advpinpointer, -/obj/item/weapon/stamp/centcomm, +/obj/item/aicard, +/obj/item/pinpointer/advpinpointer, +/obj/item/stamp/centcomm, /turf/simulated/floor/wood, /area/centcom/specops) "gc" = ( @@ -1782,8 +1782,8 @@ /area/shuttle/escape) "gi" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/device/taperecorder, +/obj/item/book/manual/security_space_law, +/obj/item/taperecorder, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled/dark, @@ -1866,11 +1866,11 @@ /area/centcom/living) "gt" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/control) "gw" = ( @@ -1903,7 +1903,7 @@ /area/centcom/security) "gB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, /turf/simulated/floor/wood, /area/centcom/specops) "gD" = ( @@ -2042,7 +2042,7 @@ /area/centcom/bar) "hd" = ( /obj/structure/bed/chair, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2061,10 +2061,10 @@ /area/centcom/security) "hg" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/pillbottles, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/autoinjectors, +/obj/item/storage/box/pillbottles, +/obj/item/storage/box/gloves, +/obj/item/storage/box/beakers, +/obj/item/storage/box/autoinjectors, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "hh" = ( @@ -2113,10 +2113,10 @@ /obj/item/clothing/head/helmet/ert/engineer, /obj/item/clothing/head/helmet/ert/engineer, /obj/item/clothing/head/helmet/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2157,14 +2157,14 @@ /area/centcom/terminal) "hw" = ( /obj/structure/table/rack, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "hz" = ( @@ -2176,10 +2176,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2200,15 +2200,15 @@ dir = 4 }, /obj/structure/table/marble, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/book/manual/chef_recipes, +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/material/knife/butch, +/obj/item/material/kitchen/rollingpin, +/obj/item/material/knife/butch, /turf/simulated/floor/tiled/white, /area/centcom/control) "hF" = ( @@ -2234,8 +2234,8 @@ /area/tdome/tdome1) "hI" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/grenade, -/obj/item/weapon/gun/launcher/grenade, +/obj/item/gun/launcher/grenade, +/obj/item/gun/launcher/grenade, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "hJ" = ( @@ -2265,7 +2265,7 @@ /turf/simulated/floor/lino, /area/centcom/restaurant) "hT" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -2397,7 +2397,7 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -2412,15 +2412,15 @@ /area/centcom) "iv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 5 }, -/obj/item/weapon/pen/multi, +/obj/item/pen/multi, /turf/simulated/floor/tiled, /area/centcom/control) "iw" = ( /obj/structure/table/reinforced, -/obj/item/device/camera, +/obj/item/camera, /obj/effect/floor_decal/borderfloor{ dir = 10 }, @@ -2508,17 +2508,17 @@ /area/centcom/medical) "iP" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) "iR" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/heavysniper, +/obj/item/gun/projectile/heavysniper, /obj/item/ammo_magazine/ammo_box/b145, /obj/item/ammo_magazine/ammo_box/b145, /turf/simulated/floor/tiled/dark, @@ -2638,7 +2638,7 @@ name = "\improper CentCom Residential Security" }) "js" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/corner/blue/diagonal{ dir = 4 @@ -2653,12 +2653,12 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -2683,8 +2683,8 @@ /area/centcom/specops) "jy" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/xray, -/obj/item/weapon/gun/energy/xray, +/obj/item/gun/energy/xray, +/obj/item/gun/energy/xray, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "jA" = ( @@ -2712,8 +2712,8 @@ dir = 10 }, /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" @@ -2894,9 +2894,9 @@ /area/centcom) "ki" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2910,7 +2910,7 @@ /turf/unsimulated/floor/steel, /area/tdome/tdomeobserve) "ko" = ( -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -6 }, /obj/structure/table/standard, @@ -2953,14 +2953,14 @@ /area/centcom/terminal) "kA" = ( /obj/machinery/chemical_dispenser/ert, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /obj/structure/table/reinforced, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "kB" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, @@ -3013,10 +3013,10 @@ /area/centcom/terminal) "kM" = ( /obj/structure/table/rack, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "kN" = ( @@ -3051,8 +3051,8 @@ "kR" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/weapon/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, /turf/simulated/floor/tiled/dark, /area/centcom/security) "kT" = ( @@ -3073,7 +3073,7 @@ /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/paleblue/bordercorner2, /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /turf/simulated/floor/tiled/white, /area/centcom/medical) "kV" = ( @@ -3085,15 +3085,15 @@ "kW" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, @@ -3101,7 +3101,7 @@ /area/centcom/security) "kY" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 3 }, @@ -3115,11 +3115,11 @@ /area/centcom/terminal) "la" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -3180,8 +3180,8 @@ /area/centcom/terminal/tramfluff) "li" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/lasercannon, -/obj/item/weapon/gun/energy/lasercannon, +/obj/item/gun/energy/lasercannon, +/obj/item/gun/energy/lasercannon, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "lj" = ( @@ -3198,8 +3198,8 @@ /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -3217,7 +3217,7 @@ "ll" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/closet/secure_closet/nanotrasen_warden, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled/dark, /area/centcom/security) "lm" = ( @@ -3244,12 +3244,12 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; @@ -3285,15 +3285,15 @@ /area/centcom/command) "lv" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 8; pixel_y = 6 }, -/obj/item/weapon/storage/box/chemimp{ +/obj/item/storage/box/chemimp{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/storage/box/trackimp, +/obj/item/storage/box/trackimp, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -3301,7 +3301,7 @@ /obj/structure/table/rack, /obj/item/clothing/under/color/green, /obj/item/clothing/shoes/brown, -/obj/item/weapon/melee/energy/axe, +/obj/item/melee/energy/axe, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "ly" = ( @@ -3310,7 +3310,7 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet/swat, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "lA" = ( @@ -3334,11 +3334,11 @@ dir = 1; pixel_y = -16 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/command) "lD" = ( @@ -3360,7 +3360,7 @@ /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "lK" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/orange/border, /turf/simulated/floor/tiled/dark, @@ -3397,7 +3397,7 @@ pixel_y = 30 }, /obj/structure/table/reinforced, -/obj/item/weapon/gun/projectile/shotgun/pump/combat{ +/obj/item/gun/projectile/shotgun/pump/combat{ name = "Discipline" }, /obj/effect/floor_decal/borderfloorblack{ @@ -3471,8 +3471,8 @@ dir = 8 }, /obj/machinery/computer/transhuman/resleeving, -/obj/item/weapon/book/manual/resleeving, -/obj/item/weapon/storage/box/backup_kit, +/obj/item/book/manual/resleeving, +/obj/item/storage/box/backup_kit, /turf/simulated/floor/tiled, /area/centcom/control) "mi" = ( @@ -3483,26 +3483,26 @@ dir = 10 }, /obj/structure/table/reinforced, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/gun/energy/taser, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/gun/energy/taser, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" }) "mj" = ( /obj/structure/table/rack, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, /turf/simulated/floor/tiled/dark, /area/centcom/security) "ml" = ( @@ -3547,8 +3547,8 @@ /area/centcom/control) "mv" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel, +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -3627,7 +3627,7 @@ /area/centcom/specops) "mJ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/meatballspagetti, +/obj/item/reagent_containers/food/snacks/meatballspagetti, /turf/simulated/floor/wood, /area/centcom/restaurant) "mL" = ( @@ -3757,12 +3757,12 @@ /area/centcom/terminal) "na" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "nd" = ( @@ -3809,7 +3809,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 27 @@ -3850,7 +3850,7 @@ /area/centcom/bar) "nr" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/simulated/floor/tiled, /area/centcom/security) "nv" = ( @@ -3860,7 +3860,7 @@ /area/centcom/control) "nw" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, @@ -3937,15 +3937,15 @@ }) "nJ" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = 3; pixel_y = 5 }, @@ -3979,21 +3979,21 @@ /area/centcom) "nO" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "nP" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "nQ" = ( @@ -4015,7 +4015,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/device/megaphone, +/obj/item/megaphone, /turf/simulated/floor/carpet, /area/centcom/command) "nV" = ( @@ -4047,12 +4047,12 @@ }, /area/centcom/terminal) "nZ" = ( -/obj/item/weapon/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, /obj/structure/table/standard, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, /obj/machinery/recharger, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -4201,9 +4201,9 @@ /turf/simulated/floor/tiled/dark, /area/centcom/security) "ow" = ( -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, /obj/structure/table/standard, /turf/unsimulated/floor/steel, /area/tdome/tdomeobserve) @@ -4402,7 +4402,7 @@ /area/centcom/security) "pe" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /turf/simulated/floor/tiled, /area/centcom/security) "pg" = ( @@ -4454,11 +4454,11 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -4523,7 +4523,7 @@ "px" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/book/codex, +/obj/item/book/codex, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 26 @@ -4544,7 +4544,7 @@ /area/centcom/control) "pB" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite{ dir = 6 }, @@ -4603,12 +4603,12 @@ /turf/simulated/floor/tiled, /area/centcom/terminal/tramfluff) "pJ" = ( -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/storage/box/beakers, +/obj/item/reagent_containers/dropper, /obj/structure/table/glass, /obj/structure/reagent_dispensers/virusfood{ pixel_y = 28 @@ -4645,12 +4645,12 @@ /area/centcom/terminal/tramfluff) "pQ" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/frags, -/obj/item/weapon/storage/box/frags, -/obj/item/weapon/storage/box/teargas, -/obj/item/weapon/storage/box/teargas, -/obj/item/weapon/storage/box/empslite, -/obj/item/weapon/storage/box/empslite, +/obj/item/storage/box/frags, +/obj/item/storage/box/frags, +/obj/item/storage/box/teargas, +/obj/item/storage/box/teargas, +/obj/item/storage/box/empslite, +/obj/item/storage/box/empslite, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "pR" = ( @@ -4751,9 +4751,9 @@ /area/centcom/control) "qd" = ( /obj/structure/table/steel, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/cautery, +/obj/item/autopsy_scanner, +/obj/item/surgical/scalpel, +/obj/item/surgical/cautery, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 @@ -4783,7 +4783,7 @@ /area/centcom/security) "qg" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind, +/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind, /turf/simulated/floor/lino, /area/centcom/restaurant) "qi" = ( @@ -4865,17 +4865,17 @@ /turf/simulated/floor/tiled/white, /area/centcom/control) "qz" = ( -/obj/item/weapon/circuitboard/aiupload, -/obj/item/weapon/circuitboard/borgupload, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/aiModule/nanotrasen, -/obj/item/weapon/aiModule/reset, -/obj/item/weapon/aiModule/freeformcore, -/obj/item/weapon/aiModule/protectStation, -/obj/item/weapon/aiModule/quarantine, -/obj/item/weapon/aiModule/paladin, -/obj/item/weapon/aiModule/robocop, -/obj/item/weapon/aiModule/safeguard, +/obj/item/circuitboard/aiupload, +/obj/item/circuitboard/borgupload, +/obj/item/circuitboard/smes, +/obj/item/aiModule/nanotrasen, +/obj/item/aiModule/reset, +/obj/item/aiModule/freeformcore, +/obj/item/aiModule/protectStation, +/obj/item/aiModule/quarantine, +/obj/item/aiModule/paladin, +/obj/item/aiModule/robocop, +/obj/item/aiModule/safeguard, /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -4888,7 +4888,7 @@ "qB" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/projectile/automatic/advanced_smg, +/obj/item/gun/projectile/automatic/advanced_smg, /obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mmAdvanced, @@ -4923,7 +4923,7 @@ /area/centcom/security) "qG" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/borderfloorblack{ dir = 6 }, @@ -4946,12 +4946,12 @@ /area/centcom/bathroom) "qK" = ( /obj/structure/table/reinforced, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, /obj/effect/floor_decal/corner/blue{ dir = 5 }, @@ -4980,7 +4980,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -5080,25 +5080,25 @@ /area/centcom/command) "rg" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 4 }, @@ -5176,7 +5176,7 @@ /area/centcom/terminal/tramfluff) "ru" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = -1; pixel_y = -2 }, @@ -5200,9 +5200,9 @@ /area/centcom/terminal) "rz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stamp/centcomm, -/obj/item/weapon/pen, -/obj/item/weapon/paper_bin{ +/obj/item/stamp/centcomm, +/obj/item/pen, +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -5366,11 +5366,11 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, @@ -5389,7 +5389,7 @@ /area/centcom/security) "sa" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/ids, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled, @@ -5397,26 +5397,26 @@ "sd" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/gun/energy/gun/burst, +/obj/item/gun/energy/gun/burst, +/obj/item/gun/energy/gun/burst, /turf/simulated/floor/tiled/dark, /area/centcom/security) "sf" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/toxin, /turf/simulated/shuttle/floor/white, /area/centcom/terminal) "sg" = ( /obj/structure/table/standard, -/obj/item/device/taperecorder, -/obj/item/device/megaphone, -/obj/item/weapon/packageWrap, -/obj/item/weapon/storage/box, -/obj/item/weapon/hand_labeler, -/obj/item/device/universal_translator, +/obj/item/taperecorder, +/obj/item/megaphone, +/obj/item/packageWrap, +/obj/item/storage/box, +/obj/item/hand_labeler, +/obj/item/universal_translator, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -5474,7 +5474,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/blue_captain, +/obj/item/folder/blue_captain, /turf/simulated/floor/carpet, /area/centcom/command) "sq" = ( @@ -5523,7 +5523,7 @@ /area/centcom/control) "sz" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /turf/simulated/floor/carpet, /area/centcom/control) "sB" = ( @@ -5559,8 +5559,8 @@ /area/centcom/terminal) "sK" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 }, @@ -5639,12 +5639,12 @@ dir = 4 }, /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/red_hos, -/obj/item/weapon/pen/multi, +/obj/item/folder/red_hos, +/obj/item/pen/multi, /turf/simulated/floor/tiled/dark, /area/centcom/command) "ta" = ( @@ -5712,7 +5712,7 @@ "tl" = ( /obj/structure/table/standard, /obj/machinery/chemical_dispenser/bar_soft/full, -/obj/item/weapon/storage/box/glasses/square, +/obj/item/storage/box/glasses/square, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -5773,9 +5773,9 @@ /area/centcom/bathroom) "ty" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled/dark, @@ -5819,15 +5819,15 @@ dir = 4 }, /obj/structure/table/marble, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/book/manual/chef_recipes, +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/material/knife/butch, +/obj/item/material/kitchen/rollingpin, +/obj/item/material/knife/butch, /turf/simulated/floor/tiled/white, /area/centcom/bar) "tI" = ( @@ -5856,7 +5856,7 @@ /turf/simulated/floor/tiled, /area/centcom) "tM" = ( -/obj/item/device/camera, +/obj/item/camera, /turf/unsimulated/floor/steel, /area/tdome/tdomeobserve) "tN" = ( @@ -5874,8 +5874,8 @@ /area/centcom/security) "tP" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/weapon/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, @@ -5902,7 +5902,7 @@ "tU" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/green/border, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled/white, @@ -6003,11 +6003,11 @@ /area/centcom/main_hall) "uq" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/flame/lighter/zippo, +/obj/item/storage/fancy/cigarettes, /turf/unsimulated/floor/steel, /area/tdome/tdomeobserve) "ur" = ( @@ -6019,7 +6019,7 @@ /area/tdome/tdomeadmin) "ut" = ( /obj/structure/closet/wardrobe/robotics_black, -/obj/item/device/radio/headset/headset_sci{ +/obj/item/radio/headset/headset_sci{ pixel_x = -3 }, /turf/simulated/floor/tiled, @@ -6032,12 +6032,12 @@ /obj/item/taperoll/police, /obj/item/taperoll/police, /obj/item/taperoll/police, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -6063,7 +6063,7 @@ /area/centcom/security) "uz" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/green/border, /turf/simulated/floor/tiled/white, @@ -6090,7 +6090,7 @@ /turf/simulated/floor/tiled/dark, /area/centcom/security) "uD" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/structure/reagent_dispensers/peppertank{ pixel_x = 30 }, @@ -6156,11 +6156,11 @@ /area/centcom/evac) "uO" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/battlerifle, -/obj/item/weapon/gun/projectile/automatic/battlerifle, -/obj/item/weapon/gun/projectile/automatic/battlerifle, -/obj/item/weapon/gun/projectile/automatic/battlerifle, -/obj/item/weapon/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -6187,14 +6187,14 @@ /obj/item/clothing/shoes/boots/tactical, /obj/item/clothing/suit/armor/tactical, /obj/item/clothing/under/tactical, -/obj/item/weapon/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, /obj/structure/closet{ desc = "It's a storage unit for standard-issue attire."; name = "tactical equipment" }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/satchel/sec, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/satchel/sec, /turf/simulated/floor/tiled/dark, /area/centcom/security) "uV" = ( @@ -6243,13 +6243,13 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/tool/crowbar, +/obj/item/storage/belt/utility, +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 6 }, @@ -6257,10 +6257,10 @@ /area/centcom/control) "vh" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw{ +/obj/item/surgical/circular_saw{ pixel_y = 8 }, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/scalpel, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -6301,24 +6301,24 @@ /area/centcom/security) "vo" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -6343,8 +6343,8 @@ /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/melee/baton/loaded, +/obj/item/shield/riot, +/obj/item/melee/baton/loaded, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -6477,7 +6477,7 @@ /area/centcom/security) "vT" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /turf/simulated/floor/carpet, /area/centcom/restaurant) "vU" = ( @@ -6511,9 +6511,9 @@ /area/centcom/command) "vY" = ( /obj/structure/table/reinforced, -/obj/item/device/pda/ert, -/obj/item/device/perfect_tele, -/obj/item/weapon/hand_tele, +/obj/item/pda/ert, +/obj/item/perfect_tele, +/obj/item/hand_tele, /turf/simulated/floor/wood, /area/centcom/specops) "vZ" = ( @@ -6528,11 +6528,11 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/button/remote/blast_door{ id = "FrontlockC"; name = "Colony Entrance Lockdown"; @@ -6594,38 +6594,38 @@ "wg" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, /turf/simulated/floor/tiled/dark, /area/centcom/security) "wk" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "wl" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/dark, /area/centcom/medical) "wm" = ( @@ -6638,10 +6638,10 @@ /obj/item/clothing/head/helmet/ert/medical, /obj/item/clothing/head/helmet/ert/medical, /obj/item/clothing/head/helmet/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "wo" = ( @@ -6677,14 +6677,14 @@ "wu" = ( /obj/effect/floor_decal/industrial/outline, /obj/structure/closet/secure_closet/nanotrasen_security, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled/dark, /area/centcom/security) "wy" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/simulated/floor/tiled/white, /area/centcom/medical) "wB" = ( @@ -6737,13 +6737,13 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = -8 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = 8 }, -/obj/item/weapon/backup_implanter, +/obj/item/backup_implanter, /turf/simulated/floor/tiled/white, /area/centcom/medical) "wO" = ( @@ -6786,12 +6786,12 @@ /area/centcom/control) "wR" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -6805,13 +6805,13 @@ /turf/simulated/floor/tiled, /area/centcom/security) "wU" = ( -/obj/item/weapon/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/control) "wV" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "CentCom"; tele_network = "centcom" }, @@ -6873,11 +6873,11 @@ /area/centcom/command) "xh" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "xj" = ( @@ -6906,9 +6906,9 @@ /area/centcom/medical) "xo" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/emps{ +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/emps{ pixel_x = 4; pixel_y = 4 }, @@ -6918,8 +6918,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/storage/box/smokes, -/obj/item/weapon/storage/box/smokes, +/obj/item/storage/box/smokes, +/obj/item/storage/box/smokes, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -6929,7 +6929,7 @@ /obj/item/modular_computer/console/preset/command{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 1; dir = 4; frequency = 1443; @@ -6943,30 +6943,30 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/white_cmo, +/obj/item/folder/white_cmo, /turf/simulated/floor/carpet, /area/centcom/command) "xs" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 4 }, @@ -6997,16 +6997,16 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/red_hos, +/obj/item/folder/red_hos, /turf/simulated/floor/carpet, /area/centcom/command) "xy" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburger{ +/obj/item/reagent_containers/food/snacks/cheeseburger{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburger, +/obj/item/reagent_containers/food/snacks/cheeseburger, /turf/simulated/floor/wood, /area/centcom/restaurant) "xz" = ( @@ -7056,11 +7056,11 @@ }) "xH" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -7089,11 +7089,11 @@ /area/centcom/terminal) "xO" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, /obj/item/clothing/glasses/thermal, /obj/item/clothing/glasses/thermal, /obj/item/clothing/glasses/thermal, @@ -7166,13 +7166,13 @@ /turf/simulated/floor/tiled/white, /area/centcom/control) "yc" = ( -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/structure/table/standard, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/reagent_containers/dropper{ +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, +/obj/item/reagent_containers/dropper{ pixel_y = -4 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -7219,7 +7219,7 @@ /area/centcom/security) "yh" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /obj/machinery/camera/network/crescent{ dir = 4 }, @@ -7293,7 +7293,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = 3; pixel_y = 5 }, @@ -7332,11 +7332,11 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OPlus{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OMinus{ +/obj/item/reagent_containers/blood/OMinus{ pixel_x = -5; pixel_y = -1 }, @@ -7366,7 +7366,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, /turf/simulated/floor/carpet, @@ -7384,14 +7384,14 @@ /area/centcom/specops) "yG" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -7526,7 +7526,7 @@ /area/shuttle/ccboat) "zj" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/kitsuneudon, +/obj/item/reagent_containers/food/snacks/kitsuneudon, /turf/simulated/floor/wood, /area/centcom/restaurant) "zl" = ( @@ -7627,19 +7627,19 @@ /obj/item/stack/material/glass/reinforced{ amount = 50 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, @@ -7657,7 +7657,7 @@ "zt" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/projectile/automatic/l6_saw, +/obj/item/gun/projectile/automatic/l6_saw, /turf/simulated/floor/tiled/dark, /area/centcom/security) "zu" = ( @@ -7668,7 +7668,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/item/device/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "zv" = ( @@ -7698,7 +7698,7 @@ /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/effect/floor_decal/industrial/outline/blue, -/obj/item/weapon/storage/box/traumainjectors, +/obj/item/storage/box/traumainjectors, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -7717,8 +7717,8 @@ /area/centcom/main_hall) "zD" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid_combat, -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid_combat, +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid_combat, +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid_combat, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "zF" = ( @@ -7772,7 +7772,7 @@ "zR" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/device/flash, +/obj/item/flash, /turf/simulated/floor/tiled, /area/centcom/control) "zS" = ( @@ -7798,8 +7798,8 @@ "zV" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/sniperrifle, -/obj/item/weapon/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, /turf/simulated/floor/tiled/dark, /area/centcom/security) "zW" = ( @@ -7817,13 +7817,13 @@ "Aa" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Ac" = ( @@ -7835,11 +7835,11 @@ /area/centcom/evac) "Ad" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/dark, @@ -7883,11 +7883,11 @@ dir = 6 }, /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{ +/obj/item/reagent_containers/food/drinks/flask/barflask{ pixel_x = -4; pixel_y = 8 }, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/tiled/dark, /area/centcom/command) "An" = ( @@ -7959,7 +7959,7 @@ /area/centcom) "AA" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine, +/obj/item/reagent_containers/food/drinks/bottle/grenadine, /turf/simulated/floor/lino, /area/centcom/restaurant) "AB" = ( @@ -8071,7 +8071,7 @@ /area/centcom/terminal) "AX" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert, +/obj/item/rig/ert, /obj/item/clothing/accessory/storage/black_vest, /turf/simulated/floor/wood, /area/centcom/specops) @@ -8143,20 +8143,20 @@ /area/centcom/terminal) "Bs" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/frags, +/obj/item/storage/box/frags, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Bu" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/device/radio/intercom{ +/obj/item/reagent_containers/spray/cleaner, +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 27 }, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -8294,9 +8294,9 @@ /area/centcom/medical) "BR" = ( /obj/structure/table/reinforced, -/obj/item/device/binoculars, -/obj/item/device/survivalcapsule, -/obj/item/device/survivalcapsule, +/obj/item/binoculars, +/obj/item/survivalcapsule, +/obj/item/survivalcapsule, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -8354,7 +8354,7 @@ /area/centcom/control) "Cc" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich{ +/obj/item/reagent_containers/food/snacks/toastedsandwich{ pixel_y = 10 }, /turf/simulated/floor/lino, @@ -8377,8 +8377,8 @@ /area/centcom/security) "Cr" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/gun/energy/gun/burst, +/obj/item/gun/energy/gun/burst, +/obj/item/gun/energy/gun/burst, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "Ct" = ( @@ -8433,7 +8433,7 @@ /area/shuttle/centcom/ccbay) "Cz" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/lasagna, +/obj/item/reagent_containers/food/snacks/lasagna, /turf/simulated/floor/wood, /area/centcom/restaurant) "CA" = ( @@ -8478,59 +8478,59 @@ /obj/structure/closet{ name = "robotics parts" }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /turf/simulated/floor/tiled, @@ -8572,7 +8572,7 @@ /area/centcom/main_hall) "CT" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/borderfloorblack{ dir = 10 }, @@ -8657,7 +8657,7 @@ /area/centcom/specops) "Dh" = ( /obj/structure/table/standard, -/obj/item/weapon/soap, +/obj/item/soap, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 }, @@ -8699,7 +8699,7 @@ /area/centcom/medical) "Dp" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red_hos, +/obj/item/folder/red_hos, /turf/simulated/floor/tiled, /area/centcom/security) "Ds" = ( @@ -8731,11 +8731,11 @@ /area/centcom/terminal/tramfluff) "Dy" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/dark, @@ -8749,11 +8749,11 @@ /area/centcom/specops) "DA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/combat{ +/obj/item/storage/firstaid/combat{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "DB" = ( @@ -8788,12 +8788,12 @@ /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -8839,13 +8839,13 @@ "DP" = ( /obj/structure/closet/crate/medical, /obj/item/stack/nanopaste/advanced, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/surgical, /obj/item/clothing/mask/surgical, /obj/item/stack/nanopaste/advanced, /obj/item/stack/nanopaste/advanced, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "DQ" = ( @@ -8904,16 +8904,16 @@ /area/centcom/bathroom) "Ec" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -8947,22 +8947,22 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "Ej" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "Em" = ( @@ -8975,9 +8975,9 @@ dir = 9 }, /obj/structure/closet/secure_closet/nanotrasen_security, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/shield/riot, +/obj/item/storage/box/handcuffs, +/obj/item/gun/energy/gun, +/obj/item/shield/riot, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" @@ -9001,7 +9001,7 @@ /area/centcom/security) "Eq" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, /turf/simulated/floor/wood, /area/centcom/restaurant) "Es" = ( @@ -9016,9 +9016,9 @@ /obj/structure/table/rack{ dir = 4 }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, @@ -9087,11 +9087,11 @@ /area/centcom/security) "EI" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -9138,8 +9138,8 @@ /turf/simulated/floor/tiled, /area/centcom/living) "EV" = ( -/obj/item/weapon/storage/box/evidence, -/obj/item/weapon/folder/red, +/obj/item/storage/box/evidence, +/obj/item/folder/red, /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -9157,8 +9157,8 @@ /area/centcom/security) "EX" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/hotdog, -/obj/item/weapon/reagent_containers/food/snacks/hotdog{ +/obj/item/reagent_containers/food/snacks/hotdog, +/obj/item/reagent_containers/food/snacks/hotdog{ pixel_x = -5; pixel_y = -3 }, @@ -9166,32 +9166,32 @@ /area/centcom/restaurant) "EY" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, @@ -9246,8 +9246,8 @@ /area/centcom/specops) "Ff" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/surgical/cautery, +/obj/item/surgical/hemostat, +/obj/item/surgical/cautery, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -9332,7 +9332,7 @@ /area/centcom/specops) "Fr" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, @@ -9347,7 +9347,7 @@ /area/shuttle/centcom/ccbay) "Fy" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cola, +/obj/item/reagent_containers/food/drinks/bottle/cola, /turf/simulated/floor/lino, /area/centcom/restaurant) "Fz" = ( @@ -9389,7 +9389,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -2; pixel_y = 2 }, @@ -9403,12 +9403,12 @@ }) "FK" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -9447,7 +9447,7 @@ /turf/simulated/floor/tiled, /area/centcom/security) "FV" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -9477,15 +9477,15 @@ /area/centcom/security) "FX" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/surgical/surgicaldrill, +/obj/item/autopsy_scanner, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/surgical/FixOVein, +/obj/item/surgical/FixOVein, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -9565,13 +9565,13 @@ /area/tdome/tdomeadmin) "Gl" = ( /obj/structure/table/reinforced, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Gr" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/l6_saw, -/obj/item/weapon/gun/projectile/automatic/l6_saw, +/obj/item/gun/projectile/automatic/l6_saw, +/obj/item/gun/projectile/automatic/l6_saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, @@ -9585,8 +9585,8 @@ "Gs" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/lasercannon, -/obj/item/weapon/gun/energy/lasercannon, +/obj/item/gun/energy/lasercannon, +/obj/item/gun/energy/lasercannon, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Gu" = ( @@ -9605,7 +9605,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -9623,7 +9623,7 @@ dir = 1 }, /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled/dark, /area/centcom/command) "GA" = ( @@ -9651,8 +9651,8 @@ "GD" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/projectile/revolver/detective45, -/obj/item/weapon/gun/projectile/revolver/detective45, +/obj/item/gun/projectile/revolver/detective45, +/obj/item/gun/projectile/revolver/detective45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, @@ -9797,10 +9797,10 @@ /area/centcom/specops) "Hb" = ( /obj/structure/table/standard, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/pen, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/hand_labeler, +/obj/item/pen, +/obj/item/packageWrap, +/obj/item/packageWrap, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -9815,7 +9815,7 @@ /area/centcom/evac) "Hd" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/meatballsoup, +/obj/item/reagent_containers/food/snacks/meatballsoup, /turf/simulated/floor/wood, /area/centcom/restaurant) "Hf" = ( @@ -9884,7 +9884,7 @@ /area/centcom/security) "Hu" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 10; pixel_y = 12 }, @@ -9912,7 +9912,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/carpet, /area/centcom/command) "Hz" = ( @@ -9943,7 +9943,7 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, @@ -9990,9 +9990,9 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/window/reinforced{ dir = 4 @@ -10005,9 +10005,9 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/blue/border, /obj/structure/closet/secure_closet/nanotrasen_security, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/shield/riot, +/obj/item/storage/box/handcuffs, +/obj/item/gun/energy/gun, +/obj/item/shield/riot, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" @@ -10062,7 +10062,7 @@ /turf/simulated/floor/tiled/freezer, /area/centcom/security) "HR" = ( -/obj/item/weapon/melee/baton/cattleprod, +/obj/item/melee/baton/cattleprod, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -10122,7 +10122,7 @@ /turf/simulated/floor/tiled/white, /area/centcom/bathroom) "Id" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled/white, @@ -10172,8 +10172,8 @@ /area/centcom/terminal/tramfluff) "Il" = ( /obj/structure/table/reinforced, -/obj/item/device/camera, -/obj/item/weapon/storage/box/ids, +/obj/item/camera, +/obj/item/storage/box/ids, /obj/effect/floor_decal/borderfloorblack{ dir = 6 }, @@ -10193,24 +10193,24 @@ /obj/structure/reagent_dispensers/peppertank{ pixel_x = 30 }, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 26 @@ -10290,8 +10290,8 @@ /area/centcom/main_hall) "IB" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/cups, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, +/obj/item/storage/box/cups, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -10301,7 +10301,7 @@ /turf/simulated/floor/tiled/white, /area/centcom/medical) "IC" = ( -/obj/item/device/camera{ +/obj/item/camera{ desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; @@ -10344,7 +10344,7 @@ /area/centcom/living) "IG" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -10360,11 +10360,11 @@ /turf/simulated/floor/wood, /area/centcom/specops) "II" = ( -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /obj/structure/table/glass, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -10397,8 +10397,8 @@ "IN" = ( /obj/structure/table/rack, /obj/item/clothing/suit/armor/riot, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/shield/riot, +/obj/item/melee/baton/loaded, +/obj/item/shield/riot, /obj/item/clothing/head/helmet/riot, /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -10411,7 +10411,7 @@ "IO" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, /turf/simulated/floor/tiled/dark, /area/centcom/security) "IP" = ( @@ -10420,8 +10420,8 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/tdome/green, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/energy/sword/green, +/obj/item/melee/baton/loaded, +/obj/item/melee/energy/sword/green, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "IR" = ( @@ -10435,8 +10435,8 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/tdome/red, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/energy/sword/red, +/obj/item/melee/baton/loaded, +/obj/item/melee/energy/sword/red, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "IU" = ( @@ -10490,11 +10490,11 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/scanning_module{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, /obj/machinery/light{ dir = 4 }, @@ -10509,7 +10509,7 @@ /area/centcom/control) "Jf" = ( /obj/structure/table/reinforced, -/obj/item/weapon/card/id/gold/captain/spare, +/obj/item/card/id/gold/captain/spare, /turf/simulated/floor/tiled, /area/centcom/control) "Ji" = ( @@ -10520,7 +10520,7 @@ /area/centcom/terminal) "Jj" = ( /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/simulated/floor/tiled/white, /area/centcom/control) "Jl" = ( @@ -10563,12 +10563,12 @@ /obj/item/clothing/glasses/welding/superior, /obj/structure/table/steel_reinforced, /obj/item/clothing/glasses/welding/superior, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -10646,7 +10646,7 @@ /area/centcom/bar) "JE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid, +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid, /turf/simulated/floor/wood, /area/centcom/specops) "JG" = ( @@ -10660,7 +10660,7 @@ /area/centcom/security) "JH" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/item/stack/medical/bruise_pack{ pixel_x = -4; pixel_y = 3 @@ -10764,8 +10764,8 @@ /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -10915,11 +10915,11 @@ /area/centcom/security) "Ky" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -11067,7 +11067,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 4 }, @@ -11098,41 +11098,41 @@ "Ld" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, @@ -11147,8 +11147,8 @@ /area/centcom/specops) "Lh" = ( /obj/structure/table/standard, -/obj/item/device/mmi/digital/posibrain, -/obj/item/device/robotanalyzer, +/obj/item/mmi/digital/posibrain, +/obj/item/robotanalyzer, /turf/simulated/floor/tiled, /area/centcom/control) "Li" = ( @@ -11243,7 +11243,7 @@ /turf/simulated/floor, /area/centcom/restaurant) "Lu" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled, /area/centcom/security) "Lv" = ( @@ -11383,12 +11383,12 @@ /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/simulated/floor/wood, /area/centcom/specops) "LS" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 1; dir = 1; frequency = 1443; @@ -11447,17 +11447,17 @@ }, /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "Mf" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/roastbeef, +/obj/item/reagent_containers/food/snacks/roastbeef, /turf/simulated/floor/wood, /area/centcom/restaurant) "Mg" = ( @@ -11489,9 +11489,9 @@ /area/centcom/living) "Mj" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, +/obj/item/rig/ert/medical, +/obj/item/rig/ert/medical, +/obj/item/rig/ert/medical, /obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/accessory/storage/white_vest, @@ -11508,32 +11508,32 @@ /area/centcom/specops) "Mk" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, @@ -11546,7 +11546,7 @@ /turf/simulated/floor/reinforced, /area/centcom) "Mm" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -11608,11 +11608,11 @@ /area/centcom) "Mv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "Mx" = ( @@ -11623,18 +11623,18 @@ dir = 1 }, /obj/structure/table/woodentable, -/obj/item/device/radio/off, -/obj/item/device/megaphone, +/obj/item/radio/off, +/obj/item/megaphone, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/dark, /area/centcom/command) "My" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -11651,7 +11651,7 @@ /area/centcom/evac) "MC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled, /area/centcom/security) "MD" = ( @@ -11669,28 +11669,28 @@ pixel_x = -32; req_access = list(29) }, -/obj/item/weapon/tank/anesthetic, -/obj/item/weapon/tank/anesthetic, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, +/obj/item/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/breath/medical, -/obj/item/weapon/storage/box/gloves, -/obj/item/device/defib_kit/jumper_kit, +/obj/item/storage/box/gloves, +/obj/item/defib_kit/jumper_kit, /turf/simulated/floor/tiled{ icon_state = "white" }, /area/centcom/control) "MH" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/handcuffs, -/obj/item/device/flash, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/storage/box/flashbangs, +/obj/item/handcuffs, +/obj/item/flash, +/obj/item/melee/baton/loaded, +/obj/item/storage/belt/security/tactical, +/obj/item/gun/energy/stunrevolver, /obj/item/clothing/glasses/sunglasses/sechud/tactical, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, /turf/simulated/floor/wood, /area/centcom/specops) "MI" = ( @@ -11786,7 +11786,7 @@ /area/centcom/specops) "MW" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled, /area/centcom/bathroom) "MX" = ( @@ -11933,8 +11933,8 @@ dir = 1 }, /obj/machinery/camera/network/crescent, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Nw" = ( @@ -11945,7 +11945,7 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/ids, /turf/simulated/floor/tiled, /area/centcom/command) "Nz" = ( @@ -12130,7 +12130,7 @@ /area/centcom/control) "Oh" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/energy/taser, +/obj/item/gun/energy/taser, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 26 @@ -12141,11 +12141,11 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/blue_hop, +/obj/item/folder/blue_hop, /turf/simulated/floor/carpet, /area/centcom/command) "Ol" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled, /area/centcom/bathroom) "On" = ( @@ -12153,7 +12153,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/item/weapon/book/manual/robotics_cyborgs{ +/obj/item/book/manual/robotics_cyborgs{ pixel_x = 2; pixel_y = 5 }, @@ -12189,7 +12189,7 @@ req_access = list(101) }, /obj/structure/table/reinforced, -/obj/item/device/pda/captain, +/obj/item/pda/captain, /turf/simulated/floor/tiled, /area/centcom/control) "Os" = ( @@ -12224,13 +12224,13 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/white_rd, +/obj/item/folder/white_rd, /turf/simulated/floor/carpet, /area/centcom/command) "OA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/gun/energy/taser, +/obj/item/book/manual/security_space_law, +/obj/item/gun/energy/taser, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled, @@ -12284,8 +12284,8 @@ dir = 5 }, /obj/structure/table/reinforced, -/obj/item/device/camera, -/obj/item/weapon/storage/box/ids, +/obj/item/camera, +/obj/item/storage/box/ids, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" @@ -12293,8 +12293,8 @@ "OI" = ( /obj/structure/table/rack, /obj/item/clothing/suit/armor/riot, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/shield/riot, +/obj/item/melee/baton/loaded, +/obj/item/shield/riot, /obj/item/clothing/head/helmet/riot, /obj/effect/floor_decal/borderfloorblack{ dir = 9 @@ -12373,7 +12373,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/yellow_ce, +/obj/item/folder/yellow_ce, /turf/simulated/floor/carpet, /area/centcom/command) "OW" = ( @@ -12399,9 +12399,9 @@ /area/centcom/command) "Pa" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -12414,28 +12414,28 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 8 }, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OPlus{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OPlus{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OPlus{ pixel_x = 4; pixel_y = 2 }, -/obj/item/device/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Pb" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "Pd" = ( @@ -12447,7 +12447,7 @@ /area/centcom/bathroom) "Pf" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/meatsteak, +/obj/item/reagent_containers/food/snacks/meatsteak, /turf/simulated/floor/wood, /area/centcom/restaurant) "Pg" = ( @@ -12485,7 +12485,7 @@ /area/centcom/specops) "Pn" = ( /obj/structure/table/glass, -/obj/item/device/defib_kit/compact/loaded, +/obj/item/defib_kit/compact/loaded, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Po" = ( @@ -12592,8 +12592,8 @@ "PG" = ( /obj/structure/table/rack, /obj/item/clothing/suit/armor/riot, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/shield/riot, +/obj/item/melee/baton/loaded, +/obj/item/shield/riot, /obj/item/clothing/head/helmet/riot, /obj/effect/floor_decal/borderfloorblack{ dir = 5 @@ -12687,8 +12687,8 @@ /area/centcom/control) "PS" = ( /obj/structure/table/reinforced, -/obj/item/weapon/material/minihoe, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/material/minihoe, +/obj/item/analyzer/plant_analyzer, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -12702,7 +12702,7 @@ /obj/item/bodybag/cryobag{ pixel_x = 6 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 5; pixel_y = 5 }, @@ -12788,20 +12788,20 @@ /area/centcom/security) "Qg" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "Qi" = ( /obj/structure/table/reinforced, -/obj/item/device/camera, -/obj/item/weapon/storage/box/ids, +/obj/item/camera, +/obj/item/storage/box/ids, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, @@ -12849,13 +12849,13 @@ /area/centcom/terminal) "Qp" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/fries, +/obj/item/reagent_containers/food/snacks/fries, /turf/simulated/floor/wood, /area/centcom/restaurant) "Qq" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/flame/lighter/zippo, +/obj/item/storage/fancy/cigarettes, /turf/simulated/floor/carpet, /area/centcom/restaurant) "Qr" = ( @@ -12893,8 +12893,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -12920,19 +12920,19 @@ /obj/item/clothing/shoes/boots/tactical, /obj/item/clothing/suit/armor/tactical, /obj/item/clothing/under/tactical, -/obj/item/weapon/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, /obj/structure/closet{ desc = "It's a storage unit for standard-issue attire."; name = "tactical equipment" }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, -/obj/item/weapon/storage/backpack/satchel/sec, +/obj/item/storage/backpack/dufflebag/syndie/med, +/obj/item/storage/backpack/satchel/sec, /turf/simulated/floor/tiled/dark, /area/centcom/security) "QA" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -12954,17 +12954,17 @@ /area/centcom/security) "QF" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/empslite{ +/obj/item/storage/box/empslite{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/box/empslite, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/empslite, +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, @@ -13127,7 +13127,7 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet/swat, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "Rb" = ( @@ -13136,17 +13136,17 @@ /area/centcom/control) "Rc" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/seccarts{ +/obj/item/storage/box/seccarts{ pixel_x = 3; pixel_y = 2 }, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -13182,7 +13182,7 @@ /turf/simulated/floor/tiled/dark, /area/centcom/security) "Rh" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/corner/blue/diagonal{ dir = 4 @@ -13198,11 +13198,11 @@ /area/centcom/control) "Rk" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "Rl" = ( @@ -13302,23 +13302,23 @@ /area/centcom/control) "Ry" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask, -/obj/item/weapon/reagent_containers/glass/rag, -/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, +/obj/item/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/food/drinks/flask/vacuumflask, /turf/simulated/floor/lino, /area/centcom/restaurant) "Rz" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, /turf/simulated/floor/tiled/dark, /area/centcom/security) "RA" = ( /turf/simulated/wall/rshull, /area/shuttle/ccboat) "RB" = ( -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, /obj/structure/table/standard, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/corner/blue/diagonal{ @@ -13351,8 +13351,8 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" @@ -13521,18 +13521,18 @@ "Sh" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/industrial/outline/blue, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -13540,8 +13540,8 @@ "Si" = ( /obj/structure/table/standard, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/box/teargas, -/obj/item/weapon/storage/box/teargas, +/obj/item/storage/box/teargas, +/obj/item/storage/box/teargas, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Sk" = ( @@ -13560,7 +13560,7 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/netgun, +/obj/item/gun/energy/netgun, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -13643,7 +13643,7 @@ /area/centcom/main_hall) "Sz" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/grilledcheese, +/obj/item/reagent_containers/food/snacks/grilledcheese, /turf/simulated/floor/wood, /area/centcom/restaurant) "SA" = ( @@ -13699,7 +13699,7 @@ "SR" = ( /obj/structure/table/standard, /obj/item/stack/medical/advanced/bruise_pack, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/retractor, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -13819,7 +13819,7 @@ /area/centcom/medical) "Tk" = ( /obj/structure/table/standard, -/obj/item/weapon/soap, +/obj/item/soap, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 }, @@ -13827,26 +13827,26 @@ /area/centcom/bathroom) "Tm" = ( /obj/structure/table/reinforced, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -13862,17 +13862,17 @@ /area/centcom/command) "Tw" = ( /obj/structure/table/glass, -/obj/item/device/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Tx" = ( /obj/structure/table/standard, /obj/effect/floor_decal/borderfloor, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/command) "Ty" = ( @@ -13907,14 +13907,14 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/command) "TF" = ( /obj/structure/table/rack, /obj/item/clothing/under/color/red, /obj/item/clothing/shoes/brown, -/obj/item/weapon/melee/energy/axe, +/obj/item/melee/energy/axe, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "TG" = ( @@ -13932,10 +13932,10 @@ }, /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -13994,11 +13994,11 @@ /area/centcom/control) "TU" = ( /obj/structure/table/standard, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -14058,7 +14058,7 @@ /obj/structure/table/rack, /obj/item/clothing/suit/armor/vest/ert/command, /obj/item/clothing/head/helmet/ert/command, -/obj/item/weapon/storage/backpack/ert/commander, +/obj/item/storage/backpack/ert/commander, /turf/simulated/floor/wood, /area/centcom/specops) "Uf" = ( @@ -14070,13 +14070,13 @@ /area/centcom/command) "Ug" = ( /obj/structure/table/woodentable, -/obj/item/weapon/stamp/hos, +/obj/item/stamp/hos, /turf/simulated/floor/tiled/dark, /area/centcom/command) "Ui" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Uj" = ( @@ -14101,7 +14101,7 @@ /area/centcom) "Uq" = ( /obj/structure/table/standard, -/obj/item/device/mmi, +/obj/item/mmi, /turf/simulated/floor/tiled, /area/centcom/control) "Us" = ( @@ -14120,9 +14120,9 @@ /area/centcom/control) "Uu" = ( /obj/structure/table/standard, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/hand_labeler, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/simulated/floor/tiled, /area/centcom/control) "Uw" = ( @@ -14164,29 +14164,29 @@ "UD" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "UE" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) "UH" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/tool/screwdriver, +/obj/item/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/tool/screwdriver, +/obj/item/tool/wrench, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -14197,7 +14197,7 @@ /obj/item/clothing/accessory/holster/hip, /obj/item/ammo_magazine/m44, /obj/item/ammo_magazine/m44, -/obj/item/weapon/gun/projectile/deagle, +/obj/item/gun/projectile/deagle, /turf/simulated/floor/wood, /area/centcom/specops) "UJ" = ( @@ -14262,8 +14262,8 @@ "UP" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -14281,7 +14281,7 @@ /obj/effect/floor_decal/corner/blue/bordercorner2{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -14343,10 +14343,10 @@ /area/centcom/main_hall) "UY" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil, -/obj/item/device/t_scanner/advanced, -/obj/item/device/t_scanner/advanced, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/t_scanner/advanced, +/obj/item/t_scanner/advanced, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -14376,9 +14376,9 @@ "Ve" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Vf" = ( @@ -14398,17 +14398,17 @@ /area/centcom/bathroom) "Vi" = ( /obj/structure/table/rack, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/window/reinforced{ dir = 1 @@ -14440,18 +14440,18 @@ /area/centcom/control) "Vn" = ( /obj/structure/table/reinforced, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -14463,7 +14463,7 @@ /area/centcom/terminal/tramfluff) "Vq" = ( /obj/structure/table/standard, -/obj/item/weapon/soap, +/obj/item/soap, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -14510,7 +14510,7 @@ /obj/effect/floor_decal/corner/blue/bordercorner2{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -14537,7 +14537,7 @@ /obj/structure/reagent_dispensers/acid{ pixel_y = -30 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -14621,7 +14621,7 @@ /area/centcom/security) "VT" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/machinery/camera/network/crescent, /obj/effect/floor_decal/borderfloorblack{ dir = 5 @@ -14873,8 +14873,8 @@ /area/centcom/medical) "WL" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/deck/cards, +/obj/item/storage/pill_bottle/dice, +/obj/item/deck/cards, /turf/simulated/floor/tiled/dark, /area/centcom/security) "WM" = ( @@ -14920,7 +14920,7 @@ /turf/simulated/floor/tiled/white, /area/centcom/medical) "WZ" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/centcom/specops) "Xa" = ( @@ -14931,11 +14931,11 @@ /area/centcom/main_hall) "Xc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/door/window/brigdoor{ dir = 2 }, @@ -15010,12 +15010,12 @@ /area/centcom/terminal/tramfluff) "Xo" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "Xp" = ( @@ -15090,7 +15090,7 @@ name = "\improper CentCom Residential Security" }) "Xy" = ( -/obj/item/weapon/paper{ +/obj/item/paper{ info = "You're not supposed to be here."; name = "unnerving letter" }, @@ -15151,7 +15151,7 @@ /turf/simulated/floor/lino, /area/centcom/command) "XJ" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/lino, /area/centcom/restaurant) "XK" = ( @@ -15186,7 +15186,7 @@ /area/centcom/terminal) "XR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /turf/simulated/floor/tiled/dark, /area/centcom/security) "XT" = ( @@ -15284,9 +15284,9 @@ /area/centcom/specops) "Yp" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/pill_bottle/blood_regen, -/obj/item/weapon/storage/pill_bottle/blood_regen, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, +/obj/item/storage/pill_bottle/blood_regen, +/obj/item/storage/pill_bottle/blood_regen, +/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "Yq" = ( @@ -15337,7 +15337,7 @@ "Yy" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/xray, +/obj/item/gun/energy/xray, /turf/simulated/floor/tiled/dark, /area/centcom/security) "YA" = ( @@ -15406,8 +15406,8 @@ "YM" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/gun/energy/netgun, +/obj/item/gun/energy/netgun, +/obj/item/gun/energy/netgun, /turf/simulated/floor/tiled/dark, /area/centcom/security) "YQ" = ( @@ -15424,18 +15424,18 @@ /area/centcom/security) "YX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -15558,7 +15558,7 @@ dir = 6 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Zu" = ( @@ -15604,16 +15604,16 @@ /area/centcom/holding) "ZA" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = -6 }, -/obj/item/device/camera{ +/obj/item/camera{ name = "Autopsy Camera"; pixel_x = -2; pixel_y = 7 }, -/obj/item/weapon/pen/red, -/obj/item/weapon/pen/blue{ +/obj/item/pen/red, +/obj/item/pen/blue{ pixel_x = 3; pixel_y = -5 }, @@ -15632,9 +15632,9 @@ /area/centcom/bar) "ZC" = ( /obj/structure/table/reinforced, -/obj/item/device/megaphone, -/obj/item/weapon/storage/box/trackimp, -/obj/item/weapon/storage/box/cdeathalarm_kit, +/obj/item/megaphone, +/obj/item/storage/box/trackimp, +/obj/item/storage/box/cdeathalarm_kit, /turf/simulated/floor/wood, /area/centcom/specops) "ZD" = ( @@ -15709,19 +15709,19 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled, /area/centcom/command) "ZU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/clotting, -/obj/item/weapon/storage/firstaid/bonemed, -/obj/item/weapon/storage/pill_bottle/sleevingcure/full, +/obj/item/storage/firstaid/clotting, +/obj/item/storage/firstaid/bonemed, +/obj/item/storage/pill_bottle/sleevingcure/full, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "ZW" = ( diff --git a/maps/groundbase/gb-misc.dmm b/maps/groundbase/gb-misc.dmm index 4909eeea2cd..efbbcf5a278 100644 --- a/maps/groundbase/gb-misc.dmm +++ b/maps/groundbase/gb-misc.dmm @@ -758,24 +758,24 @@ /area/unknown/dorm1) "cq" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm1) "cr" = ( @@ -848,24 +848,24 @@ /area/unknown/dorm2) "cD" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm2) "cE" = ( @@ -881,24 +881,24 @@ /area/unknown/dorm3) "cH" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm3) "cI" = ( @@ -930,7 +930,7 @@ /turf/simulated/shuttle/floor/alien, /area/unknown/dorm1) "cO" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unkone" }, @@ -984,7 +984,7 @@ /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) "cV" = ( -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /obj/structure/bed/double/padded, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm1) @@ -993,14 +993,14 @@ /turf/simulated/shuttle/floor/alien, /area/unknown/dorm2) "cX" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unktwo" }, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm2) "cY" = ( -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /obj/structure/bed/double/padded, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm2) @@ -1016,14 +1016,14 @@ /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) "db" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unkthree" }, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm3) "dc" = ( -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /obj/structure/bed/double/padded, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm3) @@ -1310,7 +1310,7 @@ /obj/item/clothing/head/helmet/thunderdome, /obj/item/clothing/suit/armor/tdome/red, /obj/item/clothing/under/color/red, -/obj/item/weapon/holo/esword/red, +/obj/item/holo/esword/red, /obj/effect/floor_decal/corner/red{ dir = 5 }, @@ -1539,7 +1539,7 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_meetinghall) "eM" = ( -/obj/item/weapon/beach_ball, +/obj/item/beach_ball, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) "eN" = ( @@ -1632,7 +1632,7 @@ /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) "fa" = ( -/obj/item/weapon/beach_ball/holoball, +/obj/item/beach_ball/holoball, /obj/effect/floor_decal/corner/red{ dir = 10 }, @@ -1645,7 +1645,7 @@ /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) "fc" = ( -/obj/item/weapon/inflatable_duck, +/obj/item/inflatable_duck, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) "fd" = ( @@ -1692,7 +1692,7 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_gym) "fm" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /turf/simulated/floor/holofloor/tiled{ @@ -1865,7 +1865,7 @@ /area/unknown/dorm6) "fN" = ( /obj/structure/table/woodentable/holotable, -/obj/item/weapon/dice/d8, +/obj/item/dice/d8, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_game_room) "fO" = ( @@ -1933,7 +1933,7 @@ /obj/item/clothing/head/helmet/thunderdome, /obj/item/clothing/suit/armor/tdome/green, /obj/item/clothing/under/color/green, -/obj/item/weapon/holo/esword/green, +/obj/item/holo/esword/green, /obj/effect/floor_decal/corner/green{ dir = 10 }, @@ -2022,21 +2022,21 @@ /area/beach) "gm" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, /turf/unsimulated/beach/sand, /area/beach) "gn" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, /turf/unsimulated/beach/sand, /area/beach) "go" = ( -/obj/item/weapon/beach_ball, +/obj/item/beach_ball, /turf/unsimulated/beach/sand, /area/beach) "gp" = ( @@ -2118,24 +2118,24 @@ /area/unknown/dorm4) "gE" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm4) "gF" = ( @@ -2151,24 +2151,24 @@ /area/unknown/dorm5) "gI" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm5) "gJ" = ( @@ -2184,24 +2184,24 @@ /area/unknown/dorm6) "gM" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm6) "gN" = ( @@ -2230,7 +2230,7 @@ /turf/simulated/shuttle/floor/alien, /area/unknown/dorm4) "gT" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unkfour" }, @@ -2238,7 +2238,7 @@ /area/unknown/dorm4) "gU" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm4) "gV" = ( @@ -2246,7 +2246,7 @@ /turf/simulated/shuttle/floor/alien, /area/unknown/dorm5) "gW" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unkfive" }, @@ -2254,7 +2254,7 @@ /area/unknown/dorm5) "gX" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm5) "gY" = ( @@ -2262,7 +2262,7 @@ /turf/simulated/shuttle/floor/alien, /area/unknown/dorm6) "gZ" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unksix" }, @@ -2270,7 +2270,7 @@ /area/unknown/dorm6) "ha" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm6) "hb" = ( @@ -2497,7 +2497,7 @@ /area/space) "ml" = ( /obj/structure/table/holotable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, @@ -2537,8 +2537,8 @@ /area/holodeck/source_gym) "ov" = ( /obj/structure/table/woodentable/holotable, -/obj/item/weapon/dice/d12, -/obj/item/weapon/dice/d10, +/obj/item/dice/d12, +/obj/item/dice/d10, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_game_room) "oJ" = ( @@ -2609,7 +2609,7 @@ /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) "rD" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/corner/paleblue{ @@ -2638,7 +2638,7 @@ /turf/unsimulated/wall, /area/ai_multicam_room) "tR" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/corner/paleblue/full{ @@ -2766,8 +2766,8 @@ /area/holodeck/source_patient_ward) "BR" = ( /obj/structure/table/woodentable/holotable, -/obj/item/weapon/dice/d100, -/obj/item/weapon/dice/d20, +/obj/item/dice/d100, +/obj/item/dice/d20, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_game_room) "BU" = ( @@ -2824,7 +2824,7 @@ /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) "Eq" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/corner/paleblue{ @@ -2913,7 +2913,7 @@ }, /area/holodeck/source_patient_ward) "Lt" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/corner/paleblue/full{ @@ -2946,8 +2946,8 @@ /area/holodeck/source_gym) "Nj" = ( /obj/structure/table/woodentable/holotable, -/obj/item/weapon/dice, -/obj/item/weapon/dice/d4, +/obj/item/dice, +/obj/item/dice/d4, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_game_room) "NT" = ( @@ -3009,7 +3009,7 @@ /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_game_room) "SJ" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/corner/paleblue{ diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index 408bfb22a30..bd49571f889 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -114,12 +114,12 @@ /area/groundbase/civilian/gateway) "ap" = ( /obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/machinery/light_switch{ dir = 8; pixel_x = 30 }, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) "aq" = ( @@ -599,19 +599,19 @@ /area/groundbase/level1/westspur) "bw" = ( /obj/structure/closet/toolcloset, -/obj/item/weapon/pickaxe, -/obj/item/weapon/chainsaw, -/obj/item/weapon/shovel, +/obj/item/pickaxe, +/obj/item/chainsaw, +/obj/item/shovel, /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) "bx" = ( /obj/structure/table/reinforced, -/obj/item/device/floor_painter, -/obj/item/device/t_scanner, -/obj/item/device/multitool{ +/obj/item/floor_painter, +/obj/item/t_scanner, +/obj/item/multitool{ pixel_x = 5 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/machinery/power/apc{ dir = 8 }, @@ -692,12 +692,12 @@ /area/groundbase/engineering/ce) "bG" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/projectile/shotgun/pump{ +/obj/item/gun/projectile/shotgun/pump{ ammo_type = /obj/item/ammo_casing/a12g/pellet; pixel_x = 1; pixel_y = 4 }, -/obj/item/weapon/gun/projectile/shotgun/pump{ +/obj/item/gun/projectile/shotgun/pump{ ammo_type = /obj/item/ammo_casing/a12g/pellet; pixel_x = 2; pixel_y = -6 @@ -734,7 +734,7 @@ /area/groundbase/command/tcomms/chamber) "bL" = ( /obj/machinery/vending/loadout/accessory, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 @@ -812,7 +812,7 @@ dir = 8 }, /obj/structure/table/glass, -/obj/item/weapon/cane, +/obj/item/cane, /turf/simulated/floor/tiled/white, /area/groundbase/medical/office) "bT" = ( @@ -864,11 +864,11 @@ /area/groundbase/civilian/apparel) "bZ" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/clown{ +/obj/item/flashlight/lamp/clown{ pixel_x = -4; pixel_y = 6 }, -/obj/item/weapon/bikehorn{ +/obj/item/bikehorn{ pixel_x = -2; pixel_y = 11 }, @@ -953,20 +953,20 @@ /area/groundbase/level1/southeastspur) "cl" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ name = "human repair kit"; pixel_x = -9; pixel_y = 9 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = -9; pixel_y = 1 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 6; pixel_y = 9 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 6; pixel_y = 1 }, @@ -982,8 +982,8 @@ /area/groundbase/command/tcomms/chamber) "cn" = ( /obj/structure/table/reinforced, -/obj/item/device/retail_scanner/security, -/obj/item/device/radio{ +/obj/item/retail_scanner/security, +/obj/item/radio{ pixel_x = -4 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -1063,9 +1063,9 @@ }, /area/groundbase/command/tcomms/chamber) "cu" = ( -/obj/item/weapon/storage/secure/briefcase/ml3m_pack_med, +/obj/item/storage/secure/briefcase/ml3m_pack_med, /obj/structure/table/reinforced, -/obj/item/weapon/storage/secure/briefcase/ml3m_pack_med, +/obj/item/storage/secure/briefcase/ml3m_pack_med, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/groundbase/medical/equipment) @@ -1249,7 +1249,7 @@ /area/groundbase/cargo/mining) "cQ" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/nanotrasen, +/obj/item/aiModule/nanotrasen, /obj/machinery/power/apc{ dir = 1 }, @@ -1283,13 +1283,13 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) "cU" = ( -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/manipulator, /obj/structure/table/rack/steel, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/circuitboard/autolathe, +/obj/item/stock_parts/console_screen, +/obj/item/circuitboard/autolathe, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) "cV" = ( @@ -1307,32 +1307,32 @@ /area/groundbase/civilian/clown) "cW" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/mech_recharger{ +/obj/item/circuitboard/mech_recharger{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/circuitboard/cell_charger{ +/obj/item/circuitboard/cell_charger{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/recharger{ +/obj/item/circuitboard/recharger{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/recharge_station{ +/obj/item/circuitboard/recharge_station{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/arcade/battle, -/obj/item/weapon/circuitboard/arcade/clawmachine{ +/obj/item/circuitboard/arcade/battle, +/obj/item/circuitboard/arcade/clawmachine{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/arcade/orion_trail{ +/obj/item/circuitboard/arcade/orion_trail{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/jukebox{ +/obj/item/circuitboard/jukebox{ pixel_x = 3; pixel_y = -3 }, @@ -1444,7 +1444,7 @@ "dj" = ( /obj/structure/table/marble, /obj/machinery/chemical_dispenser/bar_soft/full, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -1481,8 +1481,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/item/device/ticket_printer, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/groundbase/security/briefing) "do" = ( @@ -1618,32 +1618,32 @@ /area/maintenance/groundbase/level1/nwtunnel) "dD" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/grinder{ +/obj/item/circuitboard/grinder{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/circuitboard/grill{ +/obj/item/circuitboard/grill{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/fryer{ +/obj/item/circuitboard/fryer{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/oven{ +/obj/item/circuitboard/oven{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/microwave, -/obj/item/weapon/circuitboard/cerealmaker{ +/obj/item/circuitboard/microwave, +/obj/item/circuitboard/cerealmaker{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/candymachine{ +/obj/item/circuitboard/candymachine{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/biogenerator{ +/obj/item/circuitboard/biogenerator{ pixel_x = 3; pixel_y = -3 }, @@ -1711,14 +1711,14 @@ /area/groundbase/engineering/eva) "dJ" = ( /obj/structure/table/reinforced, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ pixel_x = 3; pixel_y = 6 }, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ pixel_y = 3 }, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ pixel_x = -3 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -1859,7 +1859,7 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/or2) "ea" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) "eb" = ( @@ -1892,22 +1892,22 @@ /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) "ee" = ( -/obj/item/weapon/shovel, -/obj/item/weapon/shovel, -/obj/item/weapon/shovel, -/obj/item/weapon/shovel, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, +/obj/item/shovel, +/obj/item/shovel, +/obj/item/shovel, +/obj/item/shovel, +/obj/item/tool/wrench, +/obj/item/tool/wrench, +/obj/item/tool/wrench, +/obj/item/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/pickaxe, /obj/structure/closet/walllocker_double/cargo/east, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) @@ -1963,12 +1963,12 @@ /area/maintenance/groundbase/level1/swtunnel) "ej" = ( /obj/structure/table/steel, -/obj/item/weapon/module/power_control, -/obj/item/weapon/airlock_electronics, -/obj/item/weapon/module/power_control, -/obj/item/weapon/airlock_electronics, -/obj/item/device/aicard, -/obj/item/weapon/aiModule/reset, +/obj/item/module/power_control, +/obj/item/airlock_electronics, +/obj/item/module/power_control, +/obj/item/airlock_electronics, +/obj/item/aicard, +/obj/item/aiModule/reset, /obj/machinery/light, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) @@ -2687,12 +2687,12 @@ "fQ" = ( /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/carpet/bcarpet, /area/groundbase/security/briefing) "fR" = ( /obj/structure/table/glass, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/item/clothing/accessory/stethoscope, /obj/machinery/light{ dir = 8 @@ -2718,24 +2718,24 @@ /area/groundbase/engineering/lobby) "fU" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/powermonitor{ +/obj/item/circuitboard/powermonitor{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/stationalert_engineering{ +/obj/item/circuitboard/stationalert_engineering{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/atmos_alert{ +/obj/item/circuitboard/atmos_alert{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/rcon_console, -/obj/item/weapon/circuitboard/atmoscontrol{ +/obj/item/circuitboard/rcon_console, +/obj/item/circuitboard/atmoscontrol{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/drone_control{ +/obj/item/circuitboard/drone_control{ pixel_x = 2; pixel_y = -2 }, @@ -2748,10 +2748,10 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) "fV" = ( -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, /obj/structure/closet/walllocker_double/misc_civ{ pixel_y = 28 }, @@ -2866,7 +2866,7 @@ /area/maintenance/groundbase/substation/secsci) "gj" = ( /obj/structure/table/standard, -/obj/item/weapon/phone, +/obj/item/phone, /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/robot) "gk" = ( @@ -3039,7 +3039,7 @@ /area/groundbase/security/halls) "gD" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/machinery/light{ dir = 4 }, @@ -3305,7 +3305,7 @@ /area/groundbase/security/equipment) "hj" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/carpet, /area/groundbase/security/detective) @@ -3333,10 +3333,10 @@ /turf/simulated/floor/outdoors/sidewalk, /area/groundbase/level1/centsquare) "hm" = ( -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/deck/cards, -/obj/item/weapon/deck/wizoff, +/obj/item/deck/cah, +/obj/item/deck/cah/black, +/obj/item/deck/cards, +/obj/item/deck/wizoff, /obj/structure/closet/walllocker_double/misc_civ{ pixel_y = 28 }, @@ -3375,9 +3375,9 @@ /area/groundbase/civilian/cafe) "hs" = ( /obj/structure/table/woodentable, -/obj/item/weapon/folder/red_hos, -/obj/item/weapon/stamp/hos, -/obj/item/device/flashlight/lamp/green{ +/obj/item/folder/red_hos, +/obj/item/stamp/hos, +/obj/item/flashlight/lamp/green{ pixel_x = -14; pixel_y = 4 }, @@ -3641,10 +3641,10 @@ /area/maintenance/groundbase/trashpit) "ic" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_y = 7 }, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_y = -5 }, /turf/simulated/floor/tiled/dark, @@ -3654,12 +3654,12 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/item/device/radio/off, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{ +/obj/item/radio/off, +/obj/item/reagent_containers/food/drinks/flask/barflask{ pixel_x = -9; pixel_y = -2 }, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = 10 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -3673,9 +3673,9 @@ /area/groundbase/security/hos) "ie" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/hand_labeler, +/obj/item/tool/crowbar, +/obj/item/tool/wrench, +/obj/item/hand_labeler, /obj/machinery/light_switch{ dir = 8; pixel_x = 30 @@ -3718,14 +3718,14 @@ /area/groundbase/security/lobby) "ik" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 6 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, /obj/machinery/camera/network/engineering, @@ -3757,7 +3757,7 @@ /turf/simulated/floor/tiled/techmaint, /area/groundbase/engineering/atmos) "ip" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3773,8 +3773,8 @@ /obj/item/bodybag/cryobag, /obj/random/medical/lite, /obj/random/medical/lite, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled, /area/groundbase/engineering/eva) "ir" = ( @@ -3849,13 +3849,13 @@ /area/groundbase/medical/resleeving) "iB" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = -24 }, @@ -3866,19 +3866,19 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/transhuman_resleever{ +/obj/item/circuitboard/transhuman_resleever{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/circuit_imprinter{ +/obj/item/circuitboard/circuit_imprinter{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/aiupload{ +/obj/item/circuitboard/aiupload{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/borgupload{ +/obj/item/circuitboard/borgupload{ pixel_x = 3; pixel_y = -3 }, @@ -3892,11 +3892,11 @@ /obj/structure/closet{ name = "Forensics Gear" }, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/evidence, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/briefcase/crimekit, -/obj/item/weapon/storage/briefcase/crimekit, +/obj/item/storage/box/gloves, +/obj/item/storage/box/evidence, +/obj/item/storage/box/bodybags, +/obj/item/storage/briefcase/crimekit, +/obj/item/storage/briefcase/crimekit, /obj/machinery/firealarm{ dir = 4 }, @@ -3905,7 +3905,7 @@ "iE" = ( /obj/structure/table/bench/padded, /obj/effect/landmark/start/entertainer, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -4085,10 +4085,10 @@ /area/maintenance/groundbase/level1/netunnel) "iZ" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/storage/box/trackimp{ +/obj/item/storage/box/trackimp{ pixel_y = -4 }, -/obj/item/weapon/storage/box/trackimp{ +/obj/item/storage/box/trackimp{ pixel_x = 5; pixel_y = 1 }, @@ -4222,15 +4222,15 @@ /turf/simulated/floor/lino, /area/groundbase/civilian/bar) "jp" = ( -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/device/mass_spectrometer/adv, -/obj/item/weapon/reagent_containers/spray/luminol, -/obj/item/device/reagent_scanner, -/obj/item/device/uv_light, -/obj/item/weapon/forensics/sample_kit/powder, -/obj/item/weapon/forensics/sample_kit, -/obj/item/weapon/storage/box/swabs{ +/obj/item/storage/box/gloves, +/obj/item/reagent_containers/syringe, +/obj/item/mass_spectrometer/adv, +/obj/item/reagent_containers/spray/luminol, +/obj/item/reagent_scanner, +/obj/item/uv_light, +/obj/item/forensics/sample_kit/powder, +/obj/item/forensics/sample_kit, +/obj/item/storage/box/swabs{ layer = 5 }, /obj/structure/table/steel_reinforced, @@ -4244,16 +4244,16 @@ /area/groundbase/security/detective) "jq" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_y = -2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_y = -8 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_y = 11 }, /turf/simulated/floor/tiled/dark, @@ -4313,16 +4313,16 @@ icon_state = "crate"; name = "Grenade Crate" }, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/weapon/tool/screwdriver, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/tool/screwdriver, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 4 @@ -4385,7 +4385,7 @@ /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, /area/groundbase/level1/centsquare) "jE" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 @@ -4509,7 +4509,7 @@ }, /area/maintenance/groundbase/level1/nwtunnel) "jV" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4525,14 +4525,14 @@ /area/groundbase/civilian/gateway) "jX" = ( /obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /obj/machinery/light{ dir = 8 }, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) "jY" = ( @@ -4596,11 +4596,11 @@ /area/groundbase/command/tcomms/chamber) "kg" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled, /area/groundbase/civilian/gateway) "kh" = ( @@ -4624,9 +4624,9 @@ /area/groundbase/engineering/atmos) "kk" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /obj/item/clothing/gloves/black, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/firealarm{ dir = 8 }, @@ -4645,11 +4645,11 @@ /area/maintenance/groundbase/level1/swtunnel) "km" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_x = 11; pixel_y = 3 }, @@ -4920,8 +4920,8 @@ /area/groundbase/civilian/gateway) "kL" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled/white, /area/groundbase/medical/office) "kM" = ( @@ -4937,10 +4937,10 @@ /obj/item/clothing/suit/space/void/security, /obj/item/clothing/mask/breath, /obj/item/clothing/head/helmet/space/void/security, -/obj/item/device/gps/security{ +/obj/item/gps/security{ pixel_y = 3 }, -/obj/item/device/gps/security{ +/obj/item/gps/security{ pixel_x = -3 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -5132,7 +5132,7 @@ /obj/structure/curtain/black{ color = "#361447" }, -/obj/item/weapon/bedsheet/clowndouble, +/obj/item/bedsheet/clowndouble, /obj/structure/bed/double/padded, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/carpet/gaycarpet, @@ -5164,40 +5164,40 @@ /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/chamber) "lk" = ( -/obj/item/weapon/pipe_dispenser, -/obj/item/device/pipe_painter, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/scanning_module, -/obj/item/weapon/stock_parts/scanning_module, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/pipe_dispenser, +/obj/item/pipe_painter, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, /obj/item/clothing/gloves/yellow, -/obj/item/device/multitool, -/obj/item/weapon/computer_hardware/hard_drive/portable, -/obj/item/weapon/computer_hardware/hard_drive/portable, -/obj/item/weapon/computer_hardware/nano_printer, -/obj/item/weapon/computer_hardware/tesla_link, -/obj/item/weapon/computer_hardware/processor_unit/small, -/obj/item/weapon/computer_hardware/processor_unit, -/obj/item/weapon/computer_hardware/processor_unit, -/obj/item/weapon/computer_hardware/processor_unit, -/obj/item/weapon/computer_hardware/network_card/wired, -/obj/item/weapon/computer_hardware/network_card, -/obj/item/weapon/computer_hardware/network_card, -/obj/item/weapon/computer_hardware/hard_drive/micro, -/obj/item/weapon/computer_hardware/hard_drive, -/obj/item/weapon/computer_hardware/hard_drive, -/obj/item/weapon/computer_hardware/battery_module/nano, -/obj/item/weapon/computer_hardware/battery_module, -/obj/item/weapon/computer_hardware/battery_module, +/obj/item/multitool, +/obj/item/computer_hardware/hard_drive/portable, +/obj/item/computer_hardware/hard_drive/portable, +/obj/item/computer_hardware/nano_printer, +/obj/item/computer_hardware/tesla_link, +/obj/item/computer_hardware/processor_unit/small, +/obj/item/computer_hardware/processor_unit, +/obj/item/computer_hardware/processor_unit, +/obj/item/computer_hardware/processor_unit, +/obj/item/computer_hardware/network_card/wired, +/obj/item/computer_hardware/network_card, +/obj/item/computer_hardware/network_card, +/obj/item/computer_hardware/hard_drive/micro, +/obj/item/computer_hardware/hard_drive, +/obj/item/computer_hardware/hard_drive, +/obj/item/computer_hardware/battery_module/nano, +/obj/item/computer_hardware/battery_module, +/obj/item/computer_hardware/battery_module, /obj/structure/closet/walllocker_double/engineering/west, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) @@ -5347,12 +5347,12 @@ dir = 1 }, /obj/structure/bookcase, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/command_guide, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/command_guide, /obj/effect/floor_decal/spline/plain{ dir = 1 }, @@ -5459,7 +5459,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/tcomms/chamber) "lN" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 4 }, /obj/structure/cable/yellow{ @@ -5545,8 +5545,8 @@ /area/groundbase/security/equipment) "lX" = ( /obj/structure/closet/secure_closet/medical3, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/storage/belt/medical, +/obj/item/soap/nanotrasen, +/obj/item/storage/belt/medical, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -5814,12 +5814,12 @@ name = "sample weapon permit"; owner = 1 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/multi, -/obj/item/device/megaphone, +/obj/item/pen/multi, +/obj/item/megaphone, /obj/item/clothing/accessory/permit/gun, /obj/item/clothing/accessory/permit/gun, /obj/item/clothing/accessory/permit/gun, @@ -5874,7 +5874,7 @@ /obj/random/mug, /obj/random/mug, /obj/random/mug, -/obj/item/weapon/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/food/drinks/shaker{ pixel_x = 5; pixel_y = 6 }, @@ -5948,12 +5948,12 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "mU" = ( -/obj/item/weapon/storage/box/nifsofts_mining, +/obj/item/storage/box/nifsofts_mining, /obj/structure/table/reinforced, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/device/personal_shield_generator/belt/mining/loaded, +/obj/item/personal_shield_generator/belt/mining/loaded, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) "mV" = ( @@ -5962,13 +5962,13 @@ /area/groundbase/civilian/apparel) "mW" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = -24 }, @@ -6033,8 +6033,8 @@ pixel_y = 4 }, /obj/item/clothing/glasses/welding/superior, -/obj/item/device/flashlight/lamp, -/obj/item/weapon/stamp/ce, +/obj/item/flashlight/lamp, +/obj/item/stamp/ce, /turf/simulated/floor/carpet/oracarpet, /area/groundbase/engineering/ce) "nf" = ( @@ -6067,11 +6067,11 @@ dir = 8; layer = 2.6 }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/item/device/personal_shield_generator/security/loaded, +/obj/item/personal_shield_generator/security/loaded, /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) "nk" = ( @@ -6122,24 +6122,24 @@ /area/groundbase/engineering/atmos/monitoring) "np" = ( /obj/structure/table/steel, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/holowarrant, -/obj/item/device/holowarrant, -/obj/item/device/holowarrant, -/obj/item/device/holowarrant, -/obj/item/device/retail_scanner/security, -/obj/item/device/retail_scanner/security, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/holowarrant, +/obj/item/holowarrant, +/obj/item/holowarrant, +/obj/item/holowarrant, +/obj/item/retail_scanner/security, +/obj/item/retail_scanner/security, /obj/item/clothing/accessory/badge/holo/cord, /obj/item/clothing/accessory/badge/holo/cord, /obj/item/clothing/accessory/badge/holo, @@ -6254,7 +6254,7 @@ pixel_x = -8; pixel_y = -4 }, -/obj/item/weapon/storage/lockbox, +/obj/item/storage/lockbox, /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) "nB" = ( @@ -6279,13 +6279,13 @@ /turf/simulated/floor/plating, /area/groundbase/engineering/storage) "nE" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/cell/high{ +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -6299,11 +6299,11 @@ /area/groundbase/security/equipment) "nF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/rcd, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd_ammo, +/obj/item/rcd, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -6311,19 +6311,19 @@ /area/groundbase/engineering/ce) "nG" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = -9; pixel_y = 10 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = -9; pixel_y = 1 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 6; pixel_y = 10 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 6; pixel_y = 1 }, @@ -6346,8 +6346,8 @@ /area/holodeck_control) "nJ" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/device/radio/intercom{ +/obj/item/storage/firstaid/surgery, +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -6524,7 +6524,7 @@ /turf/simulated/floor, /area/maintenance/groundbase/substation/secsci) "oe" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -6574,12 +6574,12 @@ /area/groundbase/security/halls) "ol" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_y = 5 }, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/device/radio/intercom{ +/obj/item/storage/toolbox/electrical, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -6608,8 +6608,8 @@ }, /obj/structure/table/rack, /obj/item/clothing/shoes/magboots, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/oxygen, +/obj/item/suit_cooling_unit, +/obj/item/tank/oxygen, /obj/machinery/door/window/brigdoor/eastleft{ name = "Protosuit Storage"; req_access = list(58) @@ -6659,7 +6659,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 @@ -6677,7 +6677,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/device/tape, +/obj/item/tape, /turf/simulated/floor/wood, /area/groundbase/civilian/entrepreneur/meeting) "ox" = ( @@ -6734,7 +6734,7 @@ /area/groundbase/engineering/engine) "oC" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) "oD" = ( @@ -6742,7 +6742,7 @@ dir = 8 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/light{ dir = 4 }, @@ -6822,7 +6822,7 @@ }, /area/maintenance/groundbase/level1/nwtunnel) "oK" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -6895,7 +6895,7 @@ /area/groundbase/level1/northspur) "oT" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/machinery/light{ dir = 4 }, @@ -6919,7 +6919,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/item/weapon/bananapeel, +/obj/item/bananapeel, /turf/simulated/floor/bmarble, /area/groundbase/civilian/clown) "oV" = ( @@ -6957,8 +6957,8 @@ dir = 8; layer = 2.6 }, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/structure/window/reinforced{ dir = 4 }, @@ -7012,7 +7012,7 @@ /obj/structure/table/reinforced, /obj/random/powercell, /obj/random/tech_supply, -/obj/item/device/t_scanner, +/obj/item/t_scanner, /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) "pg" = ( @@ -7303,10 +7303,10 @@ /area/groundbase/engineering/engine) "pT" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -7398,11 +7398,11 @@ "qg" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -7414,9 +7414,9 @@ pixel_x = 3; pixel_y = -7 }, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, /turf/simulated/floor/tiled, /area/groundbase/civilian/gateway) "qi" = ( @@ -7526,7 +7526,7 @@ /area/groundbase/level1/centsquare) "qv" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/evidence, +/obj/item/storage/box/evidence, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -7544,8 +7544,8 @@ /area/groundbase/civilian/bar) "qx" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stamp/internalaffairs, -/obj/item/weapon/stamp/denied{ +/obj/item/stamp/internalaffairs, +/obj/item/stamp/denied{ pixel_x = 4; pixel_y = -2 }, @@ -7581,7 +7581,7 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) "qC" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 @@ -7599,8 +7599,8 @@ /obj/machinery/cell_charger{ pixel_y = 7 }, -/obj/item/weapon/cell/super, -/obj/item/weapon/cell/super, +/obj/item/cell/super, +/obj/item/cell/super, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) "qG" = ( @@ -7669,11 +7669,11 @@ /area/groundbase/level1/northspur) "qQ" = ( /obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/machinery/camera/network/security{ dir = 4 }, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) "qR" = ( @@ -7699,7 +7699,7 @@ /area/groundbase/cargo/mining) "qV" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /obj/machinery/alarm{ dir = 8 }, @@ -7712,7 +7712,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask{ +/obj/item/reagent_containers/food/drinks/flask/vacuumflask{ pixel_x = -9; pixel_y = 5 }, @@ -7720,14 +7720,14 @@ /area/groundbase/civilian/cafe) "qY" = ( /obj/structure/closet/crate, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil/super_capacity, -/obj/item/weapon/smes_coil/super_capacity, -/obj/item/weapon/smes_coil/super_io, -/obj/item/weapon/smes_coil/super_io, +/obj/item/circuitboard/smes, +/obj/item/circuitboard/smes, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil/super_capacity, +/obj/item/smes_coil/super_capacity, +/obj/item/smes_coil/super_io, +/obj/item/smes_coil/super_io, /obj/machinery/alarm{ dir = 4 }, @@ -7738,9 +7738,9 @@ /area/groundbase/engineering/storage) "qZ" = ( /obj/structure/table/reinforced, -/obj/item/device/retail_scanner/medical, -/obj/item/weapon/storage/box/body_record_disk, -/obj/item/weapon/storage/box/nifsofts_medical, +/obj/item/retail_scanner/medical, +/obj/item/storage/box/body_record_disk, +/obj/item/storage/box/nifsofts_medical, /turf/simulated/floor/tiled/white, /area/groundbase/medical/equipment) "ra" = ( @@ -7797,12 +7797,12 @@ dir = 1 }, /obj/structure/bookcase, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/command_guide, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/command_guide, /obj/effect/floor_decal/spline/plain{ dir = 1 }, @@ -7851,28 +7851,28 @@ /area/groundbase/level1/westspur) "rj" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/rdserver{ +/obj/item/circuitboard/rdserver{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/protolathe{ +/obj/item/circuitboard/protolathe{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/destructive_analyzer{ +/obj/item/circuitboard/destructive_analyzer{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/rdconsole, -/obj/item/weapon/circuitboard/autolathe{ +/obj/item/circuitboard/rdconsole, +/obj/item/circuitboard/autolathe{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/mechfab{ +/obj/item/circuitboard/mechfab{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/prosthetics{ +/obj/item/circuitboard/prosthetics{ pixel_x = 3; pixel_y = -3 }, @@ -8011,18 +8011,18 @@ /area/groundbase/command/ai/hall) "rA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder{ +/obj/item/folder{ pixel_x = -4 }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 5 }, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_y = 3 }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/clipboard, -/obj/item/weapon/storage/briefcase{ +/obj/item/folder/yellow, +/obj/item/clipboard, +/obj/item/storage/briefcase{ pixel_x = -2; pixel_y = -5 }, @@ -8255,14 +8255,14 @@ /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/accessory/stethoscope, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_y = 9 }, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_y = 9 }, /obj/random/medical, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 14; pixel_y = 10 }, @@ -8276,17 +8276,17 @@ /obj/structure/closet/walllocker_double/misc_civ/south{ name = "vanity" }, -/obj/item/weapon/reagent_containers/glass/bottle/essential_oil, -/obj/item/weapon/entrepreneur/crystal, -/obj/item/weapon/entrepreneur/crystal, -/obj/item/weapon/entrepreneur/crystal, -/obj/item/weapon/entrepreneur/crystal, -/obj/item/weapon/entrepreneur/crystal, -/obj/item/weapon/makeover, -/obj/item/weapon/lipstick/random, -/obj/item/weapon/lipstick/random, -/obj/item/weapon/nailpolish_remover, -/obj/item/weapon/nailpolish, +/obj/item/reagent_containers/glass/bottle/essential_oil, +/obj/item/entrepreneur/crystal, +/obj/item/entrepreneur/crystal, +/obj/item/entrepreneur/crystal, +/obj/item/entrepreneur/crystal, +/obj/item/entrepreneur/crystal, +/obj/item/makeover, +/obj/item/lipstick/random, +/obj/item/lipstick/random, +/obj/item/nailpolish_remover, +/obj/item/nailpolish, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/entrepreneur/session) "sj" = ( @@ -8329,7 +8329,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/item/weapon/storage/box/nifsofts_security, +/obj/item/storage/box/nifsofts_security, /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) "so" = ( @@ -8421,8 +8421,8 @@ dir = 1 }, /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/structure/sink{ dir = 4; pixel_x = 11 @@ -8458,7 +8458,7 @@ /area/groundbase/security/briefing) "sC" = ( /obj/structure/table/reinforced, -/obj/item/device/retail_scanner/engineering, +/obj/item/retail_scanner/engineering, /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, @@ -8495,10 +8495,10 @@ /area/groundbase/civilian/arrivals) "sJ" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -8561,7 +8561,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled, /area/groundbase/civilian/toolstorage) "sQ" = ( @@ -8820,11 +8820,11 @@ /turf/simulated/floor, /area/groundbase/cargo/mining) "tw" = ( -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /obj/item/gunbox/warden, /obj/structure/closet/secure_closet/warden, -/obj/item/device/ticket_printer, -/obj/item/weapon/gun/energy/sizegun, +/obj/item/ticket_printer, +/obj/item/gun/energy/sizegun, /turf/simulated/floor/tiled/dark, /area/groundbase/security/warden) "tx" = ( @@ -8875,7 +8875,7 @@ dir = 8 }, /obj/structure/table/steel, -/obj/item/weapon/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, /obj/machinery/alarm{ dir = 1 }, @@ -8999,10 +8999,10 @@ /obj/structure/closet/walllocker_double/misc_civ/north{ name = "streamer equipment" }, -/obj/item/device/tvcamera/streamer, -/obj/item/device/camera/selfie, -/obj/item/device/camera_film, -/obj/item/device/camera_film, +/obj/item/tvcamera/streamer, +/obj/item/camera/selfie, +/obj/item/camera_film, +/obj/item/camera_film, /turf/simulated/floor/wood, /area/groundbase/civilian/entrepreneur) "tR" = ( @@ -9013,11 +9013,11 @@ /area/groundbase/civilian/entrepreneur/session) "tS" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_x = -1; pixel_y = 2 }, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_x = -1; pixel_y = -11 }, @@ -9055,15 +9055,15 @@ /area/groundbase/engineering/engine) "tY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 7 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_x = 1; pixel_y = 8 }, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -9126,11 +9126,11 @@ /area/groundbase/civilian/mensrestroom) "uf" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/sub_filter, -/obj/item/weapon/stock_parts/subspace/sub_filter, -/obj/item/weapon/stock_parts/subspace/sub_filter, -/obj/item/weapon/stock_parts/subspace/sub_filter, -/obj/item/weapon/stock_parts/subspace/sub_filter, +/obj/item/stock_parts/subspace/sub_filter, +/obj/item/stock_parts/subspace/sub_filter, +/obj/item/stock_parts/subspace/sub_filter, +/obj/item/stock_parts/subspace/sub_filter, +/obj/item/stock_parts/subspace/sub_filter, /obj/machinery/light/no_nightshift, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -9315,11 +9315,11 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/gateway) "uA" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 7 }, /obj/structure/table/steel, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/recharger{ pixel_y = 4 }, @@ -9839,14 +9839,14 @@ /area/groundbase/security/lobby) "vR" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/blue{ +/obj/item/folder/red, +/obj/item/folder/blue{ pixel_y = -3 }, -/obj/item/weapon/folder/yellow{ +/obj/item/folder/yellow{ pixel_y = -5 }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/carpet, /area/groundbase/security/detective) "vT" = ( @@ -9945,12 +9945,12 @@ /area/groundbase/medical/or2) "wf" = ( /obj/structure/table/reinforced, -/obj/item/device/glasses_kit, -/obj/item/weapon/storage/box/rxglasses{ +/obj/item/glasses_kit, +/obj/item/storage/box/rxglasses{ pixel_x = 7; pixel_y = 7 }, -/obj/item/weapon/storage/box/rxglasses, +/obj/item/storage/box/rxglasses, /turf/simulated/floor/tiled/white, /area/groundbase/medical/equipment) "wg" = ( @@ -10177,36 +10177,36 @@ /turf/simulated/floor/wood, /area/groundbase/civilian/entrepreneur) "wI" = ( -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 4; pixel_y = -6 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -4; pixel_y = -6 }, /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 4; pixel_y = -6 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -4; pixel_y = -6 }, @@ -10256,7 +10256,7 @@ /area/maintenance/groundbase/substation/aiciv) "wN" = ( /obj/structure/table/reinforced, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 7 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -10266,8 +10266,8 @@ /area/groundbase/security/iaa1) "wO" = ( /obj/structure/closet/secure_closet/medical3, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/storage/belt/medical, +/obj/item/soap/nanotrasen, +/obj/item/storage/belt/medical, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -10291,28 +10291,28 @@ /area/maintenance/groundbase/substation/aiciv) "wS" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/sleeper{ +/obj/item/circuitboard/sleeper{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/sleeper_console{ +/obj/item/circuitboard/sleeper_console{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/body_scanner{ +/obj/item/circuitboard/body_scanner{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/scanner_console, -/obj/item/weapon/circuitboard/grinder{ +/obj/item/circuitboard/scanner_console, +/obj/item/circuitboard/grinder{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/bioprinter{ +/obj/item/circuitboard/bioprinter{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/chem_master{ +/obj/item/circuitboard/chem_master{ pixel_x = 3; pixel_y = -3 }, @@ -10378,7 +10378,7 @@ }, /area/maintenance/groundbase/level1/swtunnel) "wY" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 @@ -10424,11 +10424,11 @@ /area/groundbase/command/tcomms/storage) "xd" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/consuming_eradicator, -/obj/item/weapon/aiModule/guard_dog, -/obj/item/weapon/aiModule/pleasurebot, -/obj/item/weapon/aiModule/protective_shell, -/obj/item/weapon/aiModule/scientific_pursuer, +/obj/item/aiModule/consuming_eradicator, +/obj/item/aiModule/guard_dog, +/obj/item/aiModule/pleasurebot, +/obj/item/aiModule/protective_shell, +/obj/item/aiModule/scientific_pursuer, /obj/machinery/light, /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/storage) @@ -10497,7 +10497,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /turf/simulated/floor/carpet/purcarpet, /area/groundbase/civilian/entrepreneur) "xm" = ( @@ -10507,23 +10507,23 @@ /area/groundbase/engineering/atmos) "xn" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -7; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = 4; pixel_y = 6 }, -/obj/item/device/flashlight/pen{ +/obj/item/flashlight/pen{ pixel_x = -3; pixel_y = -3 }, @@ -10545,7 +10545,7 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/shoes/magboots, /obj/item/clothing/head/helmet/space/void/mining, -/obj/item/weapon/mining_scanner, +/obj/item/mining_scanner, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -10584,7 +10584,7 @@ /area/groundbase/security/warden) "xr" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /obj/machinery/camera/network/security, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) @@ -10645,8 +10645,8 @@ /area/groundbase/command/tcomms/foyer) "xy" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/transmitter, -/obj/item/weapon/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter, /obj/machinery/light, /turf/simulated/floor/tiled/techmaint, /area/groundbase/command/tcomms/storage) @@ -10683,8 +10683,8 @@ /area/groundbase/civilian/toolstorage) "xC" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/device/radio/intercom{ +/obj/item/storage/firstaid/surgery, +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -10800,7 +10800,7 @@ }, /area/groundbase/level1/eastspur) "xR" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 4 }, /turf/simulated/floor/wood, @@ -11044,17 +11044,17 @@ pixel_x = -32; pixel_y = 32 }, -/obj/item/device/radio/intercom/locked/ai_private{ +/obj/item/radio/intercom/locked/ai_private{ dir = 4; pixel_x = 32 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 1; dir = 8; name = "Common Channel"; pixel_x = -21 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -11122,11 +11122,11 @@ /area/groundbase/civilian/womensrestroom) "yD" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/oxygen, -/obj/item/weapon/aiModule/oneHuman, -/obj/item/weapon/aiModule/purge, -/obj/item/weapon/aiModule/antimov, -/obj/item/weapon/aiModule/teleporterOffline, +/obj/item/aiModule/oxygen, +/obj/item/aiModule/oneHuman, +/obj/item/aiModule/purge, +/obj/item/aiModule/antimov, +/obj/item/aiModule/teleporterOffline, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -11191,7 +11191,7 @@ /area/groundbase/engineering/lobby) "yL" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 8 }, /turf/simulated/floor/carpet, @@ -11235,16 +11235,16 @@ /area/groundbase/engineering/atmos) "yS" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -18; pixel_y = 7 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/pen, -/obj/item/weapon/pen/blade/red{ +/obj/item/pen, +/obj/item/pen/blade/red{ pixel_x = -2; pixel_y = -2 }, @@ -11483,7 +11483,7 @@ /area/groundbase/engineering/workshop) "zw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = -24 }, @@ -11515,8 +11515,8 @@ "zB" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, -/obj/item/weapon/cell/device, -/obj/item/weapon/cell/device, +/obj/item/cell/device, +/obj/item/cell/device, /obj/structure/cable{ icon_state = "1-4" }, @@ -11572,11 +11572,11 @@ /area/groundbase/medical/or1) "zH" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/asimov, -/obj/item/weapon/aiModule/freeformcore, -/obj/item/weapon/aiModule/corp, -/obj/item/weapon/aiModule/paladin, -/obj/item/weapon/aiModule/robocop, +/obj/item/aiModule/asimov, +/obj/item/aiModule/freeformcore, +/obj/item/aiModule/corp, +/obj/item/aiModule/paladin, +/obj/item/aiModule/robocop, /obj/machinery/light_switch{ dir = 4; pixel_x = -30 @@ -11723,7 +11723,7 @@ /area/groundbase/security/lobby) "zY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, @@ -11808,10 +11808,10 @@ /area/groundbase/cargo/mining) "Aj" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 7 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_y = 8 }, /turf/simulated/floor/tiled/dark, @@ -11849,8 +11849,8 @@ /area/groundbase/engineering/lobby) "An" = ( /obj/structure/table/rack/shelf, -/obj/item/device/cataloguer, -/obj/item/device/cataloguer, +/obj/item/cataloguer, +/obj/item/cataloguer, /turf/simulated/floor/tiled, /area/groundbase/civilian/gateway) "Ao" = ( @@ -11896,14 +11896,14 @@ /area/groundbase/security/equipment) "At" = ( /obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, /obj/machinery/light{ dir = 4 }, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) "Au" = ( @@ -12160,7 +12160,7 @@ pixel_x = 7; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/glass/rag{ +/obj/item/reagent_containers/glass/rag{ pixel_x = -5; pixel_y = 17 }, @@ -12349,7 +12349,7 @@ /turf/simulated/floor/outdoors/sidewalk, /area/groundbase/level1/centsquare) "Bw" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/tiled/dark, @@ -12453,18 +12453,18 @@ /area/groundbase/cargo/mining) "BH" = ( /obj/structure/table/reinforced, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 6 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -6; pixel_y = 4 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = 6; pixel_y = 4 }, -/obj/item/device/radio/off, +/obj/item/radio/off, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -12675,14 +12675,14 @@ /area/groundbase/cargo/mining) "Ck" = ( /obj/structure/table/standard, -/obj/item/device/defib_kit/loaded, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/defib_kit/loaded, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = 24 }, @@ -12704,11 +12704,11 @@ /area/groundbase/engineering/lobby) "Cn" = ( /obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/machinery/firealarm{ dir = 4 }, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) "Co" = ( @@ -12717,7 +12717,7 @@ department = "Head of Security"; pixel_y = 6 }, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 1; pixel_y = 24 }, @@ -12828,8 +12828,8 @@ /area/maintenance/groundbase/substation/secsci) "CA" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -12851,8 +12851,8 @@ /area/groundbase/level1/eastspur) "CG" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stamp/internalaffairs, -/obj/item/weapon/stamp/denied{ +/obj/item/stamp/internalaffairs, +/obj/item/stamp/denied{ pixel_x = 4; pixel_y = -2 }, @@ -12956,7 +12956,7 @@ /area/groundbase/security/halle) "CT" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/machinery/light{ dir = 8 }, @@ -13241,9 +13241,9 @@ /area/groundbase/civilian/mensrestroom) "DC" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/command_guide, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/command_guide, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -13459,11 +13459,11 @@ /area/groundbase/engineering/eva) "Ea" = ( /obj/structure/table/steel, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 2; pixel_y = 4 }, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/simulated/floor/tiled, /area/groundbase/security/processing) "Eb" = ( @@ -13520,14 +13520,14 @@ /turf/simulated/floor/outdoors/sidewalk/side, /area/groundbase/level1/sw) "Ek" = ( -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 6 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, /obj/structure/table/reinforced, @@ -13575,12 +13575,12 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/crew{ +/obj/item/circuitboard/crew{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/card, -/obj/item/weapon/circuitboard/communications{ +/obj/item/circuitboard/card, +/obj/item/circuitboard/communications{ pixel_x = 3; pixel_y = -3 }, @@ -13646,7 +13646,7 @@ /area/groundbase/civilian/entrepreneur) "Ex" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/reset, +/obj/item/aiModule/reset, /obj/machinery/firealarm, /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/storage) @@ -13732,7 +13732,7 @@ }, /area/maintenance/groundbase/level1/nwtunnel) "EL" = ( -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 1; pixel_y = 24 }, @@ -13840,15 +13840,15 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) "EY" = ( -/obj/item/weapon/surgical/cautery, +/obj/item/surgical/cautery, /obj/structure/table/standard, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/surgical/scalpel, +/obj/item/autopsy_scanner, +/obj/item/surgical/scalpel, /turf/simulated/floor/tiled/white, /area/groundbase/medical/morgue) "EZ" = ( /obj/structure/table/reinforced, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 7 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -13874,7 +13874,7 @@ layer = 2.9 }, /obj/item/clothing/mask/breath, -/obj/item/weapon/rig/eva/equipped, +/obj/item/rig/eva/equipped, /obj/machinery/door/window/brigdoor{ req_access = list(11,24) }, @@ -14083,13 +14083,13 @@ dir = 8 }, /obj/structure/table/steel, -/obj/item/weapon/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/glasses/goggles, /turf/simulated/floor/tiled/dark, /area/security/range) "FB" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /obj/structure/cable/yellow{ @@ -14177,7 +14177,7 @@ "FM" = ( /obj/structure/table/hardwoodtable, /obj/effect/floor_decal/spline/fancy/wood, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /turf/simulated/floor/carpet/purcarpet, /area/groundbase/civilian/entrepreneur) "FN" = ( @@ -14297,7 +14297,7 @@ /turf/simulated/floor/tiled/white, /area/groundbase/civilian/mensrestroom) "Ga" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 @@ -14312,7 +14312,7 @@ "Gd" = ( /obj/structure/table/hardwoodtable, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, @@ -14487,7 +14487,7 @@ "Gw" = ( /obj/structure/table/reinforced, /obj/random/toolbox, -/obj/item/device/geiger, +/obj/item/geiger, /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) "Gx" = ( @@ -14523,17 +14523,17 @@ /turf/simulated/floor/reinforced, /area/groundbase/civilian/toolstorage) "GC" = ( -/obj/item/weapon/circuitboard/telecomms/processor, -/obj/item/weapon/circuitboard/telecomms/processor, -/obj/item/weapon/circuitboard/telecomms/receiver, -/obj/item/weapon/circuitboard/telecomms/server, -/obj/item/weapon/circuitboard/telecomms/server, -/obj/item/weapon/circuitboard/telecomms/bus, -/obj/item/weapon/circuitboard/telecomms/bus, -/obj/item/weapon/circuitboard/telecomms/broadcaster, -/obj/item/weapon/circuitboard/telecomms/exonet_node, -/obj/item/weapon/circuitboard/ntnet_relay, -/obj/item/weapon/circuitboard/telecomms/relay, +/obj/item/circuitboard/telecomms/processor, +/obj/item/circuitboard/telecomms/processor, +/obj/item/circuitboard/telecomms/receiver, +/obj/item/circuitboard/telecomms/server, +/obj/item/circuitboard/telecomms/server, +/obj/item/circuitboard/telecomms/bus, +/obj/item/circuitboard/telecomms/bus, +/obj/item/circuitboard/telecomms/broadcaster, +/obj/item/circuitboard/telecomms/exonet_node, +/obj/item/circuitboard/ntnet_relay, +/obj/item/circuitboard/telecomms/relay, /obj/structure/table/standard, /turf/simulated/floor/tiled/techmaint, /area/groundbase/command/tcomms/storage) @@ -14543,13 +14543,13 @@ /obj/random/tetheraid, /obj/item/clothing/gloves/sterile/nitrile, /obj/item/clothing/gloves/sterile/nitrile, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/firstaid/regular{ pixel_x = 5; pixel_y = 8 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 5; pixel_y = 8 }, @@ -14860,9 +14860,9 @@ /area/groundbase/engineering/atmos) "Hs" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, /obj/machinery/alarm, /turf/simulated/floor/tiled/techmaint, /area/groundbase/command/tcomms/storage) @@ -14887,9 +14887,9 @@ /area/maintenance/groundbase/level1/nwtunnel) "Hu" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, /turf/simulated/floor/tiled/techmaint, /area/groundbase/command/tcomms/storage) "Hv" = ( @@ -14901,7 +14901,7 @@ icon_state = "0-4" }, /obj/random/paicard, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hos) "Hw" = ( @@ -14959,11 +14959,11 @@ /area/groundbase/civilian/bar) "HC" = ( /obj/structure/table/reinforced, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 4; pixel_y = 4 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -4 }, /obj/machinery/power/apc{ @@ -15211,13 +15211,13 @@ /turf/simulated/floor/tiled, /area/groundbase/security/processing) "Ie" = ( -/obj/item/weapon/material/fishing_rod/modern, -/obj/item/weapon/material/fishing_rod/modern, -/obj/item/weapon/material/fishing_rod/modern, -/obj/item/weapon/material/fishing_rod/modern, +/obj/item/material/fishing_rod/modern, +/obj/item/material/fishing_rod/modern, +/obj/item/material/fishing_rod/modern, +/obj/item/material/fishing_rod/modern, /obj/random/fishing_junk, -/obj/item/weapon/material/fishing_net, -/obj/item/weapon/material/fishing_net, +/obj/item/material/fishing_net, +/obj/item/material/fishing_net, /obj/item/clothing/head/fishing, /obj/structure/table/rack, /obj/item/stack/cable_coil/random, @@ -15261,16 +15261,16 @@ /area/groundbase/civilian/gameroom) "Ij" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/analyzer, -/obj/item/weapon/stock_parts/subspace/analyzer, -/obj/item/weapon/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, /turf/simulated/floor/tiled/techmaint, /area/groundbase/command/tcomms/storage) "Ik" = ( /obj/structure/bed/chair{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -15310,14 +15310,14 @@ /area/groundbase/civilian/entrepreneur) "Ir" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) "Is" = ( /obj/machinery/vending/loadout/uniform, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 @@ -15354,18 +15354,18 @@ /area/groundbase/command/ai/robot) "Iw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder{ +/obj/item/folder{ pixel_x = -4 }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 5 }, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_y = 3 }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/clipboard, -/obj/item/weapon/storage/briefcase{ +/obj/item/folder/yellow, +/obj/item/clipboard, +/obj/item/storage/briefcase{ pixel_x = -2; pixel_y = -5 }, @@ -15390,8 +15390,8 @@ /area/groundbase/level1/centsquare) "Iz" = ( /obj/structure/table/reinforced, -/obj/item/device/megaphone, -/obj/item/device/radio{ +/obj/item/megaphone, +/obj/item/radio{ pixel_x = -4 }, /turf/simulated/floor/tiled, @@ -15417,7 +15417,7 @@ /area/groundbase/command/ai/chamber) "IC" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/freeform, +/obj/item/aiModule/freeform, /obj/machinery/alarm, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/bluegrid, @@ -15440,7 +15440,7 @@ dir = 8; pixel_x = -6 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -15590,8 +15590,8 @@ /area/groundbase/level1/sw) "IW" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/device/radio/intercom{ +/obj/item/storage/firstaid/surgery, +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 @@ -15697,8 +15697,8 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) "Jk" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/structure/table/reinforced, /obj/structure/sign/painting/library_secure{ pixel_y = -30 @@ -15729,17 +15729,17 @@ /area/groundbase/command/ai/upload) "Jp" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, -/obj/item/weapon/paper_bin{ +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/stamp/ward, -/obj/item/weapon/stamp/denied{ +/obj/item/stamp/ward, +/obj/item/stamp/denied{ pixel_x = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/alarm, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, @@ -15821,7 +15821,7 @@ /obj/machinery/computer/secure_data{ dir = 4 }, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 8; pixel_x = -24 }, @@ -15849,7 +15849,7 @@ /turf/simulated/floor/tiled/white, /area/groundbase/civilian/bar) "JE" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -15908,14 +15908,14 @@ /obj/structure/closet{ name = "meeting room closet" }, -/obj/item/weapon/entrepreneur/emf, -/obj/item/weapon/entrepreneur/spirit_board, -/obj/item/weapon/entrepreneur/crystal_ball, -/obj/item/weapon/entrepreneur/horoscope, -/obj/item/weapon/entrepreneur/magnifying_glass, -/obj/item/device/camera, -/obj/item/device/taperecorder, -/obj/item/device/tape, +/obj/item/entrepreneur/emf, +/obj/item/entrepreneur/spirit_board, +/obj/item/entrepreneur/crystal_ball, +/obj/item/entrepreneur/horoscope, +/obj/item/entrepreneur/magnifying_glass, +/obj/item/camera, +/obj/item/taperecorder, +/obj/item/tape, /obj/item/sticky_pad/random, /turf/simulated/floor/wood, /area/groundbase/civilian/entrepreneur/meeting) @@ -15944,12 +15944,12 @@ /area/groundbase/security/lobby) "JO" = ( /obj/structure/closet/lawcloset, -/obj/item/weapon/storage/secure/briefcase, -/obj/item/device/tape/random, -/obj/item/device/tape/random, -/obj/item/device/taperecorder, -/obj/item/device/camera_film, -/obj/item/device/camera, +/obj/item/storage/secure/briefcase, +/obj/item/rectape/random, +/obj/item/rectape/random, +/obj/item/taperecorder, +/obj/item/camera_film, +/obj/item/camera, /turf/simulated/floor/tiled/dark, /area/groundbase/security/iaa1) "JP" = ( @@ -15998,23 +15998,23 @@ /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, +/obj/item/shield/riot, /obj/item/clothing/gloves/arm_guard/riot, /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, +/obj/item/shield/riot, /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) "JV" = ( /obj/structure/closet/walllocker_double/misc_civ/south{ name = "dentistry tools" }, -/obj/item/device/flashlight/pen, -/obj/item/weapon/entrepreneur/dentist_mirror, -/obj/item/weapon/entrepreneur/dentist_probe, -/obj/item/weapon/entrepreneur/dentist_scaler, -/obj/item/weapon/entrepreneur/dentist_sickle, +/obj/item/flashlight/pen, +/obj/item/entrepreneur/dentist_mirror, +/obj/item/entrepreneur/dentist_probe, +/obj/item/entrepreneur/dentist_scaler, +/obj/item/entrepreneur/dentist_sickle, /obj/machinery/light_switch{ dir = 4; pixel_x = -30 @@ -16095,8 +16095,8 @@ /area/groundbase/level1/centsquare) "Kb" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/stack/cable_coil{ pixel_x = 3; pixel_y = 3 @@ -16105,7 +16105,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/nifsofts_engineering, +/obj/item/storage/box/nifsofts_engineering, /obj/machinery/alarm{ dir = 4 }, @@ -16141,16 +16141,16 @@ "Ke" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/cell/high{ +/obj/item/tool/wrench, +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -16192,10 +16192,10 @@ /area/holodeck_control) "Kj" = ( /obj/structure/table/steel, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 3 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -3; pixel_y = 8 }, @@ -16209,30 +16209,30 @@ /obj/structure/closet/walllocker_double/misc_civ/west{ name = "Office Supplies" }, -/obj/item/weapon/folder, -/obj/item/weapon/folder, -/obj/item/weapon/folder, -/obj/item/weapon/folder, -/obj/item/weapon/folder, -/obj/item/weapon/pen, -/obj/item/weapon/pen, -/obj/item/weapon/pen, -/obj/item/weapon/pen, -/obj/item/weapon/stamp/accepted, -/obj/item/weapon/stamp/denied, -/obj/item/weapon/tape_roll, -/obj/item/weapon/tape_roll, +/obj/item/folder, +/obj/item/folder, +/obj/item/folder, +/obj/item/folder, +/obj/item/folder, +/obj/item/pen, +/obj/item/pen, +/obj/item/pen, +/obj/item/pen, +/obj/item/stamp/accepted, +/obj/item/stamp/denied, +/obj/item/tape_roll, +/obj/item/tape_roll, /obj/item/sticky_pad/random, /turf/simulated/floor/wood, /area/groundbase/civilian/entrepreneur) "Kl" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/algae_farm{ +/obj/item/circuitboard/algae_farm{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/unary_atmos/heater, -/obj/item/weapon/circuitboard/unary_atmos/cooler{ +/obj/item/circuitboard/unary_atmos/heater, +/obj/item/circuitboard/unary_atmos/cooler{ pixel_x = 3; pixel_y = -3 }, @@ -16370,7 +16370,7 @@ /obj/structure/table/reinforced, /obj/random/tech_supply, /obj/random/tech_supply, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -16432,9 +16432,9 @@ /area/maintenance/groundbase/level1/stunnel) "KK" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/techmaint, /area/groundbase/command/tcomms/storage) @@ -16588,7 +16588,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/dark, /area/groundbase/security/briefing) "Le" = ( @@ -16694,7 +16694,7 @@ "Lp" = ( /obj/structure/table/bench/padded, /obj/effect/landmark/start/entertainer, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 @@ -16840,7 +16840,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/groundbase/civilian/entrepreneur/meeting) "LF" = ( @@ -17055,16 +17055,16 @@ /area/groundbase/engineering/eva) "Mg" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/holowarrants, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/holowarrants, +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 6; pixel_y = -2 }, -/obj/item/weapon/storage/box/evidence, +/obj/item/storage/box/evidence, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -17299,14 +17299,14 @@ /area/groundbase/civilian/apparel) "MJ" = ( /obj/structure/table/standard, -/obj/item/device/defib_kit/loaded, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/defib_kit/loaded, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = 24 }, @@ -17338,15 +17338,15 @@ /area/groundbase/medical/resleeving) "MR" = ( /obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/machinery/power/apc{ dir = 8 }, /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/item/device/ticket_printer, -/obj/item/device/radio/intercom{ +/obj/item/ticket_printer, +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -17386,7 +17386,7 @@ /turf/simulated/floor/tiled, /area/groundbase/civilian/gateway) "MW" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17440,8 +17440,8 @@ /area/groundbase/engineering/atmos) "Nc" = ( /obj/structure/table/reinforced, -/obj/item/device/assembly/signaler, -/obj/item/device/assembly/signaler, +/obj/item/assembly/signaler, +/obj/item/assembly/signaler, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -17484,7 +17484,7 @@ /area/security/range) "Ng" = ( /obj/structure/table/marble, -/obj/item/device/retail_scanner/civilian{ +/obj/item/retail_scanner/civilian{ pixel_x = -8 }, /obj/machinery/button/remote/blast_door{ @@ -17493,11 +17493,11 @@ pixel_x = -3; pixel_y = 26 }, -/obj/item/weapon/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/food/drinks/shaker{ pixel_x = -10; pixel_y = 11 }, -/obj/item/weapon/reagent_containers/glass/rag{ +/obj/item/reagent_containers/glass/rag{ pixel_x = -9 }, /obj/structure/sink/countertop{ @@ -17632,7 +17632,7 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/shoes/magboots, /obj/item/clothing/head/helmet/space/void/mining, -/obj/item/weapon/mining_scanner, +/obj/item/mining_scanner, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) "Nz" = ( @@ -17919,23 +17919,23 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/void/exploration, /obj/item/clothing/suit/space/void/exploration, /obj/item/clothing/head/helmet/space/void/exploration, /obj/item/clothing/head/helmet/space/void/exploration, -/obj/item/device/bluespaceradio/groundbase_prelinked, +/obj/item/bluespaceradio/groundbase_prelinked, /obj/machinery/door/window/brigdoor/eastright{ req_access = list(43) }, -/obj/item/device/mapping_unit, -/obj/item/device/cataloguer, -/obj/item/device/cataloguer, -/obj/item/device/cataloguer/compact, -/obj/item/device/cataloguer/compact, +/obj/item/mapping_unit, +/obj/item/cataloguer, +/obj/item/cataloguer, +/obj/item/cataloguer/compact, +/obj/item/cataloguer/compact, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/gateway) "Oj" = ( @@ -18041,12 +18041,12 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/robotics{ +/obj/item/circuitboard/robotics{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/mecha_control, -/obj/item/weapon/circuitboard/aifixer{ +/obj/item/circuitboard/mecha_control, +/obj/item/circuitboard/aifixer{ pixel_x = 3; pixel_y = -3 }, @@ -18079,7 +18079,7 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/shoes/magboots, /obj/item/clothing/head/helmet/space/void/mining, -/obj/item/weapon/mining_scanner, +/obj/item/mining_scanner, /obj/machinery/camera/network/mining{ dir = 4 }, @@ -18357,19 +18357,19 @@ pixel_x = -5; pixel_y = 4 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -6; pixel_y = -4 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -6; pixel_y = -4 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 6; pixel_y = -4 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 6; pixel_y = -4 }, @@ -18520,7 +18520,7 @@ /area/groundbase/civilian/cafe) "PJ" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/machinery/light{ dir = 8 }, @@ -18756,7 +18756,7 @@ /area/security/range) "Qs" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, @@ -18896,8 +18896,8 @@ /area/groundbase/civilian/entrepreneur/session) "QH" = ( /obj/structure/table/reinforced, -/obj/item/device/sleevemate, -/obj/item/device/denecrotizer/medical, +/obj/item/sleevemate, +/obj/item/denecrotizer/medical, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /turf/simulated/floor/tiled/white, @@ -18954,7 +18954,7 @@ "QO" = ( /obj/structure/table/reinforced, /obj/item/clothing/head/welding, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /turf/simulated/floor/tiled, /area/groundbase/civilian/gateway) "QP" = ( @@ -18972,7 +18972,7 @@ /turf/simulated/floor/outdoors/sidewalk/side, /area/maintenance/groundbase/level1/nwtunnel) "QS" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -19217,7 +19217,7 @@ /turf/simulated/floor, /area/maintenance/groundbase/substation/medcargo) "Rw" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 @@ -19244,14 +19244,14 @@ /area/groundbase/level1/centsquare) "Ry" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 6 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, /turf/simulated/floor/tiled, @@ -19398,7 +19398,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, @@ -19588,19 +19588,19 @@ /area/groundbase/engineering/eva) "Sm" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/body_designer{ +/obj/item/circuitboard/body_designer{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/resleeving_control{ +/obj/item/circuitboard/resleeving_control{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/transhuman_clonepod{ +/obj/item/circuitboard/transhuman_clonepod{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/transhuman_synthprinter{ +/obj/item/circuitboard/transhuman_synthprinter{ pixel_x = 3; pixel_y = -3 }, @@ -19635,9 +19635,9 @@ /area/groundbase/engineering/eva) "Sr" = ( /obj/structure/table/steel, -/obj/item/device/taperecorder, -/obj/item/device/retail_scanner/security, -/obj/item/device/camera, +/obj/item/taperecorder, +/obj/item/retail_scanner/security, +/obj/item/camera, /obj/machinery/newscaster/security_unit{ pixel_y = -29 }, @@ -19827,7 +19827,7 @@ /area/groundbase/security/halls) "SL" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/alarm{ dir = 8 @@ -20021,12 +20021,12 @@ /area/groundbase/engineering/engine) "Tj" = ( /obj/structure/closet/lawcloset, -/obj/item/weapon/storage/secure/briefcase, -/obj/item/device/tape/random, -/obj/item/device/tape/random, -/obj/item/device/taperecorder, -/obj/item/device/camera_film, -/obj/item/device/camera, +/obj/item/storage/secure/briefcase, +/obj/item/rectape/random, +/obj/item/rectape/random, +/obj/item/taperecorder, +/obj/item/camera_film, +/obj/item/camera, /turf/simulated/floor/tiled/dark, /area/groundbase/security/iaa2) "Tk" = ( @@ -20059,7 +20059,7 @@ departmentType = 2; pixel_y = 30 }, -/obj/item/weapon/gun/energy/mouseray/medical, +/obj/item/gun/energy/mouseray/medical, /turf/simulated/floor/tiled/white, /area/groundbase/medical/equipment) "To" = ( @@ -20092,8 +20092,8 @@ /area/groundbase/command/ai/foyer) "Tq" = ( /obj/machinery/recharger, -/obj/item/weapon/storage/box/syringegun, -/obj/item/weapon/gun/launcher/syringe, +/obj/item/storage/box/syringegun, +/obj/item/gun/launcher/syringe, /obj/structure/table/reinforced, /obj/machinery/camera/network/medbay{ dir = 8 @@ -20161,7 +20161,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/weapon/storage/box/nifsofts_engineering, +/obj/item/storage/box/nifsofts_engineering, /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) "Tz" = ( @@ -20170,7 +20170,7 @@ layer = 2.9 }, /obj/item/clothing/mask/breath, -/obj/item/weapon/rig/ce/equipped, +/obj/item/rig/ce/equipped, /obj/machinery/power/apc{ dir = 4 }, @@ -20193,28 +20193,28 @@ /area/groundbase/security/processing) "TD" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/skills{ +/obj/item/circuitboard/skills{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/med_data{ +/obj/item/circuitboard/med_data{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/secure_data{ +/obj/item/circuitboard/secure_data{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/security, -/obj/item/weapon/circuitboard/security/engineering{ +/obj/item/circuitboard/security, +/obj/item/circuitboard/security/engineering{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/security/mining{ +/obj/item/circuitboard/security/mining{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/stationalert_security{ +/obj/item/circuitboard/stationalert_security{ pixel_x = 3; pixel_y = -3 }, @@ -20292,12 +20292,12 @@ /area/groundbase/level1/centsquare) "TL" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/circuitboard/partslathe, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/console_screen, +/obj/item/circuitboard/partslathe, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) "TM" = ( @@ -20341,7 +20341,7 @@ /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/robot) "TR" = ( -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 8; pixel_x = -24 }, @@ -20375,7 +20375,7 @@ /area/maintenance/groundbase/substation/secsci) "TU" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -20533,20 +20533,20 @@ /obj/structure/closet/walllocker_double/misc_civ/north{ name = "office equipment" }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -2; pixel_y = -5 }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -2; pixel_y = -5 }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -2; pixel_y = -5 }, -/obj/item/weapon/storage/toolbox/brass, -/obj/item/device/measuring_tape, +/obj/item/storage/toolbox/brass, +/obj/item/measuring_tape, /turf/simulated/floor/wood, /area/groundbase/civilian/entrepreneur) "Up" = ( @@ -20557,17 +20557,17 @@ /area/groundbase/engineering/atmos) "Uq" = ( /obj/structure/table/rack/steel, -/obj/item/device/slime_scanner, -/obj/item/device/sleevemate, -/obj/item/device/robotanalyzer, -/obj/item/device/reagent_scanner, -/obj/item/device/healthanalyzer, -/obj/item/device/geiger, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/analyzer, -/obj/item/device/t_scanner, -/obj/item/weapon/circuitboard/machine/reg_c, -/obj/item/weapon/circuitboard/machine/reg_c, +/obj/item/slime_scanner, +/obj/item/sleevemate, +/obj/item/robotanalyzer, +/obj/item/reagent_scanner, +/obj/item/healthanalyzer, +/obj/item/geiger, +/obj/item/analyzer/plant_analyzer, +/obj/item/analyzer, +/obj/item/t_scanner, +/obj/item/circuitboard/machine/reg_c, +/obj/item/circuitboard/machine/reg_c, /obj/machinery/camera/network/engineering{ dir = 4 }, @@ -20672,9 +20672,9 @@ /area/groundbase/civilian/apparel) "UH" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -20715,7 +20715,7 @@ "UN" = ( /obj/structure/table/woodentable, /obj/item/toy/figure/clown, -/obj/item/weapon/pen/crayon/marker/rainbow, +/obj/item/pen/crayon/marker/rainbow, /obj/machinery/firealarm{ dir = 1 }, @@ -20776,10 +20776,10 @@ name = "session equipment" }, /obj/item/roller/massage, -/obj/item/weapon/bedsheet/pillow/exercise, -/obj/item/weapon/bedsheet/pillow/exercise, -/obj/item/weapon/entrepreneur/dumbbell, -/obj/item/weapon/entrepreneur/dumbbell, +/obj/item/bedsheet/pillow/exercise, +/obj/item/bedsheet/pillow/exercise, +/obj/item/entrepreneur/dumbbell, +/obj/item/entrepreneur/dumbbell, /obj/item/clothing/under/pants/yogapants, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/entrepreneur/session) @@ -20909,9 +20909,9 @@ /turf/simulated/wall, /area/groundbase/medical/resleeving) "Vl" = ( -/obj/item/weapon/book/manual/rotary_electric_generator, +/obj/item/book/manual/rotary_electric_generator, /obj/structure/table/reinforced, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 @@ -21031,16 +21031,16 @@ /area/groundbase/engineering/lobby) "Vz" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, /turf/simulated/floor/tiled/techmaint, /area/groundbase/command/tcomms/storage) "VA" = ( @@ -21107,7 +21107,7 @@ /area/groundbase/civilian/womensrestroom) "VH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /turf/simulated/floor/wood, @@ -21210,11 +21210,11 @@ /turf/simulated/floor/outdoors/newdirt, /area/groundbase/level1/southeastspur) "VU" = ( -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/structure/table/standard, -/obj/item/device/camera, -/obj/item/device/sleevemate, +/obj/item/camera, +/obj/item/sleevemate, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -21238,8 +21238,8 @@ /area/groundbase/level1/westspur) "VX" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/device/radio/intercom{ +/obj/item/storage/firstaid/surgery, +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 @@ -21248,7 +21248,7 @@ /area/groundbase/medical/or2) "VY" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/milspec/color/orange/half{ dir = 4 }, @@ -21299,7 +21299,7 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) "Wg" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /turf/simulated/floor/wood, @@ -21509,7 +21509,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 4 }, /turf/simulated/floor/wood, @@ -21594,10 +21594,10 @@ /area/groundbase/civilian/gameroom) "WN" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/machinery/firealarm{ dir = 4 }, @@ -21676,8 +21676,8 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/void/expedition_medical, @@ -21721,7 +21721,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/upload) "Xc" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -21753,7 +21753,7 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/hos) "Xg" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -21835,16 +21835,16 @@ /area/groundbase/engineering/lobby) "Xo" = ( /obj/structure/table/steel, -/obj/item/device/integrated_circuit_printer, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_circuit_printer, +/obj/item/integrated_electronics/debugger{ pixel_x = -5 }, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = 5 }, /obj/random/tech_supply/component/nofail, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, /obj/random/tech_supply/component/nofail, /obj/random/tech_supply/component/nofail, /obj/random/tech_supply/component/nofail, @@ -21906,7 +21906,7 @@ /area/groundbase/engineering/lobby) "Xu" = ( /obj/structure/table/bench/padded, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled/dark, @@ -21921,7 +21921,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -22041,7 +22041,7 @@ "XM" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/bottle/essential_oil, +/obj/item/reagent_containers/glass/bottle/essential_oil, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/entrepreneur/session) "XN" = ( @@ -22141,16 +22141,16 @@ /area/groundbase/civilian/gameroom) "Yb" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 18; pixel_y = 7 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/pen, -/obj/item/weapon/pen/blade/red{ +/obj/item/pen, +/obj/item/pen/blade/red{ pixel_x = -2; pixel_y = -2 }, @@ -22187,7 +22187,7 @@ /turf/simulated/floor/outdoors/sidewalk/side, /area/groundbase/level1/westspur) "Yg" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /obj/structure/sign/painting/library_secure{ @@ -22245,7 +22245,7 @@ /area/groundbase/level1/northspur) "Yn" = ( /obj/structure/bed/chair/office/dark, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 @@ -22265,8 +22265,8 @@ dir = 1 }, /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/structure/sink{ dir = 4; pixel_x = 11 @@ -22338,7 +22338,7 @@ }, /area/maintenance/groundbase/level1/stunnel) "Yx" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -22464,16 +22464,16 @@ /area/groundbase/level1/westspur) "YN" = ( /obj/structure/closet/secure_closet/detective, -/obj/item/weapon/reagent_containers/spray/pepper, -/obj/item/weapon/gun/energy/taser, -/obj/item/device/camera{ +/obj/item/reagent_containers/spray/pepper, +/obj/item/gun/energy/taser, +/obj/item/camera{ desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; pixel_x = 2; pixel_y = 3 }, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/groundbase/security/detective) "YO" = ( @@ -22631,12 +22631,12 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/yellow_ce, -/obj/item/weapon/pen/multi, +/obj/item/folder/yellow_ce, +/obj/item/pen/multi, /obj/machinery/light{ dir = 4 }, @@ -22734,12 +22734,12 @@ /obj/structure/closet/crate{ name = "Camera Assembly Crate" }, -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, +/obj/item/camera_assembly, +/obj/item/camera_assembly, +/obj/item/camera_assembly, +/obj/item/camera_assembly, +/obj/item/camera_assembly, +/obj/item/camera_assembly, /obj/machinery/light, /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/robot) diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index 254efd5cfe2..f4074ec2c78 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -109,8 +109,8 @@ /area/groundbase/science/robotics) "am" = ( /obj/item/toy/figure/mime, -/obj/item/weapon/pen/crayon/marker/mime, -/obj/item/weapon/pen/crayon/mime, +/obj/item/pen/crayon/marker/mime, +/obj/item/pen/crayon/mime, /obj/structure/table/standard, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -158,7 +158,7 @@ "ar" = ( /obj/machinery/light, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room3) "as" = ( @@ -216,19 +216,19 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, /obj/structure/closet/walllocker_double/cargo/west, /turf/simulated/floor/tiled, /area/groundbase/cargo/office) "ax" = ( /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/towel/random, -/obj/item/weapon/storage/backpack, +/obj/item/towel/random, +/obj/item/storage/backpack, /turf/simulated/floor/wood, /area/groundbase/dorms/room7) "ay" = ( @@ -287,20 +287,20 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) "aG" = ( -/obj/item/device/camera{ +/obj/item/camera{ pixel_x = 3; pixel_y = -4 }, -/obj/item/device/camera, -/obj/item/device/camera_film{ +/obj/item/camera, +/obj/item/camera_film{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/camera_film{ +/obj/item/camera_film{ pixel_x = -2; pixel_y = -2 }, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /obj/structure/closet/walllocker_double/misc_civ{ dir = 8; pixel_x = -28 @@ -312,8 +312,8 @@ /area/groundbase/level2/nw) "aH" = ( /obj/structure/table/glass, -/obj/item/device/antibody_scanner, -/obj/item/device/antibody_scanner{ +/obj/item/antibody_scanner, +/obj/item/antibody_scanner{ pixel_x = 2; pixel_y = 2 }, @@ -361,31 +361,31 @@ }, /area/groundbase/level2/nw) "aL" = ( -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/tape_roll, -/obj/item/weapon/tape_roll, -/obj/item/weapon/storage/box{ +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/tape_roll, +/obj/item/tape_roll, +/obj/item/storage/box{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box{ +/obj/item/storage/box{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box{ +/obj/item/storage/box{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box{ +/obj/item/storage/box{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box{ +/obj/item/storage/box{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box{ +/obj/item/storage/box{ pixel_x = 3; pixel_y = 3 }, @@ -460,15 +460,15 @@ /area/rnd/xenobiology) "aR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_y = 4 }, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, -/obj/item/weapon/paper_bin{ +/obj/item/folder/blue, +/obj/item/pen, +/obj/item/paper_bin{ pixel_y = 7 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 2; pixel_y = 3 }, @@ -510,10 +510,10 @@ /area/groundbase/science/xenobot) "aV" = ( /obj/structure/table/woodentable, -/obj/item/device/taperecorder, -/obj/item/device/tape/random, -/obj/item/device/camera, -/obj/item/device/retail_scanner/civilian, +/obj/item/taperecorder, +/obj/item/rectape/random, +/obj/item/camera, +/obj/item/retail_scanner/civilian, /obj/machinery/firealarm{ dir = 4 }, @@ -614,7 +614,7 @@ /area/groundbase/level2/nw) "be" = ( /obj/structure/table/fancyblack, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -685,12 +685,12 @@ /turf/simulated/floor/carpet/geo, /area/groundbase/civilian/kitchen/backroom) "bm" = ( -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, /obj/structure/closet/walllocker_double/misc_civ{ dir = 4; pixel_x = 28 @@ -714,7 +714,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/dorms/bathroom) "bo" = ( -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/structure/bed/padded, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -789,13 +789,13 @@ /area/groundbase/medical/psych) "bw" = ( /obj/effect/floor_decal/industrial/warning, -/obj/item/device/defib_kit/jumper_kit, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/defib_kit/jumper_kit, +/obj/item/storage/box/gloves, +/obj/item/storage/box/bodybags{ pixel_x = -3; pixel_y = -2 }, -/obj/item/weapon/book/manual/robotics_cyborgs, +/obj/item/book/manual/robotics_cyborgs, /obj/structure/closet/walllocker_double/science/east, /turf/simulated/floor/tiled, /area/groundbase/science/robotics) @@ -847,7 +847,7 @@ /turf/simulated/floor/tiled, /area/groundbase/science/xenobot/storage) "bC" = ( -/obj/item/weapon/book/manual/virology, +/obj/item/book/manual/virology, /obj/structure/table/glass, /turf/simulated/floor/tiled/white, /area/medical/virology) @@ -886,15 +886,15 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/Chemistry) "bH" = ( -/obj/item/weapon/circuitboard/aicore{ +/obj/item/circuitboard/aicore{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/circuitboard/teleporter, +/obj/item/circuitboard/teleporter, /obj/random/paicard{ pixel_x = 4 }, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = -3 }, /obj/structure/closet/walllocker_double/command/rd{ @@ -949,7 +949,7 @@ "bP" = ( /obj/item/clothing/glasses/omnihud/all, /obj/structure/closet/secure_closet/captains, -/obj/item/weapon/disk/nuclear{ +/obj/item/disk/nuclear{ name = "authentication disk" }, /obj/machinery/light/small{ @@ -1040,12 +1040,12 @@ /area/groundbase/dorms) "cf" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/blue, -/obj/item/device/flashlight/lamp/green{ +/obj/item/folder/blue, +/obj/item/flashlight/lamp/green{ pixel_x = -13; pixel_y = 7 }, @@ -1336,7 +1336,7 @@ /area/rnd/xenobiology) "cZ" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/tiled, /area/groundbase/cargo/office) "da" = ( @@ -1362,8 +1362,8 @@ /area/groundbase/science/robotics) "df" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, -/obj/item/weapon/nullrod, +/obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/item/nullrod, /obj/structure/noticeboard{ pixel_y = 32 }, @@ -1399,7 +1399,7 @@ /area/groundbase/civilian/kitchen) "dj" = ( /obj/structure/table/fancyblack, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /obj/effect/landmark{ name = "lightsout" }, @@ -1482,10 +1482,10 @@ /area/groundbase/science/circuits) "dv" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/belt/utility, -/obj/item/device/multitool, +/obj/item/storage/belt/utility, +/obj/item/multitool, /obj/fiftyspawner/steel, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/machinery/alarm{ dir = 4 }, @@ -1528,8 +1528,8 @@ dir = 8 }, /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/towel/random, -/obj/item/weapon/storage/backpack, +/obj/item/towel/random, +/obj/item/storage/backpack, /turf/simulated/floor/wood, /area/groundbase/dorms/room5) "dE" = ( @@ -1565,13 +1565,13 @@ /area/groundbase/command/hop) "dL" = ( /obj/structure/table/woodentable, -/obj/item/weapon/melee/chainofcommand, -/obj/item/weapon/coin/phoron{ +/obj/item/melee/chainofcommand, +/obj/item/coin/phoron{ desc = "The face of the coin shows a portrait of the explorer who discovered the Virgo-Erigone system. The back depicts a Zodiac symbol that represents Virgo."; name = "limited edition phoron coin" }, -/obj/item/weapon/folder/blue_captain, -/obj/item/weapon/stamp/captain, +/obj/item/folder/blue_captain, +/obj/item/stamp/captain, /obj/machinery/alarm{ dir = 4 }, @@ -1694,19 +1694,19 @@ /area/groundbase/science/server) "eg" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/blue_hop, -/obj/item/weapon/pen/multi{ +/obj/item/folder/blue_hop, +/obj/item/pen/multi{ pixel_x = -2; pixel_y = 9 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/weapon/storage/box/PDAs, +/obj/item/storage/box/PDAs, /turf/simulated/floor/tiled, /area/groundbase/command/hop) "ei" = ( @@ -1759,14 +1759,14 @@ /area/groundbase/cargo/office) "eo" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -1776,7 +1776,7 @@ /area/groundbase/civilian/kitchen) "ep" = ( /obj/structure/table/standard, -/obj/item/weapon/book/manual/cook_guide, +/obj/item/book/manual/cook_guide, /obj/machinery/camera/network/civilian{ dir = 4 }, @@ -2032,11 +2032,11 @@ /area/groundbase/level2/se) "fa" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /turf/simulated/floor/tiled/white, /area/medical/virology) "fb" = ( @@ -2066,7 +2066,7 @@ /area/groundbase/science/server) "fe" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -2222,11 +2222,11 @@ /area/groundbase/civilian/library) "fF" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -5; pixel_y = 10 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 6; pixel_y = 2 }, @@ -2468,11 +2468,11 @@ /area/groundbase/level2/nw) "gq" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 8 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = 2; pixel_y = 1 }, @@ -2503,11 +2503,11 @@ /area/groundbase/cargo/office) "gv" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ name = "box of measuring cups"; pixel_x = 2; pixel_y = 3; - starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup = 7) + starts_with = list(/obj/item/reagent_containers/glass/beaker/measuring_cup = 7) }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -2674,7 +2674,7 @@ /obj/structure/bed/chair/comfy/blue{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -2693,8 +2693,8 @@ /area/groundbase/dorms/room7) "gX" = ( /obj/structure/table/standard, -/obj/item/weapon/clipboard, -/obj/item/weapon/stamp/qm, +/obj/item/clipboard, +/obj/item/stamp/qm, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -2752,8 +2752,8 @@ /area/groundbase/science/circuits) "hi" = ( /obj/structure/table/standard, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/knife/butch, +/obj/item/material/kitchen/rollingpin, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -2951,7 +2951,7 @@ /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level2/nw) "hJ" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -2977,7 +2977,7 @@ /obj/machinery/firealarm{ dir = 4 }, -/obj/item/device/retail_scanner/medical, +/obj/item/retail_scanner/medical, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) "hL" = ( @@ -3237,11 +3237,11 @@ /area/groundbase/level2/southeastspur) "iy" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = -5; pixel_y = 4 }, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -3480,7 +3480,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/dorms/room1) "jc" = ( -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/bed/double/padded, /turf/simulated/floor/wood, /area/groundbase/dorms/room8) @@ -3536,17 +3536,17 @@ /area/groundbase/medical/lobby) "jm" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/light/small{ dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/device/retail_scanner/civilian, +/obj/item/retail_scanner/civilian, /turf/simulated/floor/carpet, /area/groundbase/civilian/library) "jn" = ( @@ -3954,7 +3954,7 @@ /area/groundbase/science/server) "kv" = ( /obj/structure/closet/secure_closet/quartermaster, -/obj/item/weapon/storage/backpack/dufflebag, +/obj/item/storage/backpack/dufflebag, /turf/simulated/floor/wood, /area/groundbase/cargo/qm) "ky" = ( @@ -4086,12 +4086,12 @@ /area/groundbase/level2/nw) "kT" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/device/megaphone, -/obj/item/weapon/paper/monitorkey, +/obj/item/megaphone, +/obj/item/paper/monitorkey, /turf/simulated/floor/tiled, /area/groundbase/science/rd) "kU" = ( @@ -4200,7 +4200,7 @@ /area/medical/virology) "lj" = ( /obj/structure/table/glass, -/obj/item/device/radio{ +/obj/item/radio{ anchored = 1; canhear_range = 7; frequency = 1487; @@ -4689,7 +4689,7 @@ /turf/simulated/wall, /area/groundbase/medical/lobby) "mw" = ( -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/bed/double/padded, /turf/simulated/floor/wood, /area/groundbase/dorms/room7) @@ -4701,7 +4701,7 @@ /area/groundbase/science/hall) "my" = ( /obj/structure/table/steel, -/obj/item/device/integrated_circuit_printer, +/obj/item/integrated_circuit_printer, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -4836,11 +4836,11 @@ /turf/simulated/floor/tiled/white, /area/groundbase/dorms/room1) "mW" = ( -/obj/item/weapon/storage/box/botanydisk, +/obj/item/storage/box/botanydisk, /obj/structure/table/glass, -/obj/item/weapon/storage/box/botanydisk, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/material/minihoe, +/obj/item/storage/box/botanydisk, +/obj/item/reagent_containers/glass/bucket, +/obj/item/material/minihoe, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) "mX" = ( @@ -4954,7 +4954,7 @@ /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) "nt" = ( -/obj/item/weapon/stamp/rd, +/obj/item/stamp/rd, /turf/simulated/floor/tiled, /area/groundbase/science/rd) "nv" = ( @@ -4981,7 +4981,7 @@ /area/groundbase/civilian/hydroponics) "nz" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 12 }, /turf/simulated/floor/carpet, @@ -5107,9 +5107,9 @@ /area/groundbase/science/xenobot) "nW" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/device/radio/intercom{ +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -5144,8 +5144,8 @@ /area/groundbase/cargo/office) "ob" = ( /obj/structure/table/standard, -/obj/item/device/retail_scanner/civilian, -/obj/item/device/multitool, +/obj/item/retail_scanner/civilian, +/obj/item/multitool, /turf/simulated/floor/tiled, /area/groundbase/civilian/hydroponics) "od" = ( @@ -5402,8 +5402,8 @@ /area/groundbase/command/captain) "oR" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen/red{ +/obj/item/folder/yellow, +/obj/item/pen/red{ pixel_x = 2; pixel_y = 6 }, @@ -5502,7 +5502,7 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/Chemistry) "ph" = ( -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /obj/machinery/r_n_d/circuit_imprinter{ dir = 1 }, @@ -5518,7 +5518,7 @@ /area/groundbase/medical/psych) "pj" = ( /obj/structure/table/fancyblack, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/dark, /area/groundbase/command/meeting) "pk" = ( @@ -5541,7 +5541,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/retail_scanner/command, +/obj/item/retail_scanner/command, /turf/simulated/floor/tiled/dark, /area/groundbase/command/meeting) "pn" = ( @@ -5663,14 +5663,14 @@ /area/groundbase/cargo/bay) "pC" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/anomaly_spectroscopy, -/obj/item/weapon/book/manual/anomaly_testing, -/obj/item/weapon/book/manual/materials_chemistry_analysis, -/obj/item/weapon/book/manual/resleeving, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual, +/obj/item/book/manual/anomaly_spectroscopy, +/obj/item/book/manual/anomaly_testing, +/obj/item/book/manual/materials_chemistry_analysis, +/obj/item/book/manual/resleeving, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/command_guide, +/obj/item/book/manual, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/light{ dir = 1 @@ -5887,8 +5887,8 @@ }, /obj/machinery/light, /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/towel/random, -/obj/item/weapon/storage/backpack, +/obj/item/towel/random, +/obj/item/storage/backpack, /turf/simulated/floor/wood, /area/groundbase/dorms/room2) "qg" = ( @@ -5998,46 +5998,46 @@ /obj/structure/bookcase{ name = "bookcase (Reference)" }, -/obj/item/weapon/book/bundle/custom_library/reference/ThermodynamicReactionsandResearch, -/obj/item/weapon/book/bundle/custom_library/reference/fbpandprostheticmaintenance, -/obj/item/weapon/book/bundle/custom_library/reference/recyclingprocedures, -/obj/item/weapon/book/custom_library/reference/fistfulofd6splayersguide, -/obj/item/weapon/book/custom_library/reference/securityguidelines, -/obj/item/weapon/book/custom_library/reference/spacesurvivalguidedespressurization, -/obj/item/weapon/book/manual/anomaly_spectroscopy, -/obj/item/weapon/book/manual/anomaly_testing, -/obj/item/weapon/book/manual/atmospipes, -/obj/item/weapon/book/manual/bar_guide, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/book/manual/casino, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/cook_guide, -/obj/item/weapon/book/manual/detective, -/obj/item/weapon/book/manual/engineering_construction, -/obj/item/weapon/book/manual/engineering_guide, -/obj/item/weapon/book/manual/engineering_hacking, -/obj/item/weapon/book/manual/engineering_particle_accelerator, -/obj/item/weapon/book/manual/engineering_singularity_safety, -/obj/item/weapon/book/manual/evaguide, -/obj/item/weapon/book/manual/excavation, -/obj/item/weapon/book/manual/hydroponics_pod_people, -/obj/item/weapon/book/manual/mass_spectrometry, -/obj/item/weapon/book/manual/materials_chemistry_analysis, -/obj/item/weapon/book/manual/medical_cloning, -/obj/item/weapon/book/manual/medical_diagnostics_manual, -/obj/item/weapon/book/manual/research_and_development, -/obj/item/weapon/book/manual/resleeving, -/obj/item/weapon/book/manual/ripley_build_and_repair, -/obj/item/weapon/book/manual/robotics_cyborgs, -/obj/item/weapon/book/manual/rust_engine, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/stasis, -/obj/item/weapon/book/manual/supermatter_engine, -/obj/item/weapon/book/manual/tesla_engine, -/obj/item/weapon/book/manual/virology, -/obj/item/weapon/book/manual/rotary_electric_generator, +/obj/item/book/bundle/custom_library/reference/ThermodynamicReactionsandResearch, +/obj/item/book/bundle/custom_library/reference/fbpandprostheticmaintenance, +/obj/item/book/bundle/custom_library/reference/recyclingprocedures, +/obj/item/book/custom_library/reference/fistfulofd6splayersguide, +/obj/item/book/custom_library/reference/securityguidelines, +/obj/item/book/custom_library/reference/spacesurvivalguidedespressurization, +/obj/item/book/manual/anomaly_spectroscopy, +/obj/item/book/manual/anomaly_testing, +/obj/item/book/manual/atmospipes, +/obj/item/book/manual/bar_guide, +/obj/item/book/manual/barman_recipes, +/obj/item/book/manual/casino, +/obj/item/book/manual/chef_recipes, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/cook_guide, +/obj/item/book/manual/detective, +/obj/item/book/manual/engineering_construction, +/obj/item/book/manual/engineering_guide, +/obj/item/book/manual/engineering_hacking, +/obj/item/book/manual/engineering_particle_accelerator, +/obj/item/book/manual/engineering_singularity_safety, +/obj/item/book/manual/evaguide, +/obj/item/book/manual/excavation, +/obj/item/book/manual/hydroponics_pod_people, +/obj/item/book/manual/mass_spectrometry, +/obj/item/book/manual/materials_chemistry_analysis, +/obj/item/book/manual/medical_cloning, +/obj/item/book/manual/medical_diagnostics_manual, +/obj/item/book/manual/research_and_development, +/obj/item/book/manual/resleeving, +/obj/item/book/manual/ripley_build_and_repair, +/obj/item/book/manual/robotics_cyborgs, +/obj/item/book/manual/rust_engine, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/stasis, +/obj/item/book/manual/supermatter_engine, +/obj/item/book/manual/tesla_engine, +/obj/item/book/manual/virology, +/obj/item/book/manual/rotary_electric_generator, /turf/simulated/floor/wood, /area/groundbase/civilian/library) "qy" = ( @@ -6149,16 +6149,16 @@ "qQ" = ( /obj/structure/closet/chefcloset, /obj/item/glass_jar, -/obj/item/device/retail_scanner/civilian, -/obj/item/weapon/soap/nanotrasen, -/obj/item/device/destTagger{ +/obj/item/retail_scanner/civilian, +/obj/item/soap/nanotrasen, +/obj/item/destTagger{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/tool/wrench, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/tool/wrench, /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) "qS" = ( @@ -6275,10 +6275,10 @@ /area/groundbase/science/rnd) "ri" = ( /obj/structure/table/steel, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = -5 }, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = 5 }, /obj/machinery/firealarm, @@ -6327,11 +6327,11 @@ /area/groundbase/level2/nw) "rp" = ( /obj/structure/closet/wardrobe/chaplain_black, -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/flame/candle/candelabra, -/obj/item/weapon/flame/candle/candelabra, -/obj/item/weapon/flame/candle/candelabra, -/obj/item/weapon/flame/candle/candelabra, +/obj/item/storage/fancy/crayons, +/obj/item/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, /obj/machinery/light_switch{ dir = 1; pixel_y = -30 @@ -6370,13 +6370,13 @@ /area/groundbase/civilian/kitchen) "ru" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen/multi{ +/obj/item/folder/red, +/obj/item/folder/blue, +/obj/item/pen/multi{ pixel_x = -2; pixel_y = 9 }, @@ -6475,8 +6475,8 @@ /area/groundbase/science/rnd) "rI" = ( /obj/structure/table/standard, -/obj/item/weapon/book/manual/resleeving, -/obj/item/weapon/storage/box/backup_kit, +/obj/item/book/manual/resleeving, +/obj/item/storage/box/backup_kit, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -6582,8 +6582,8 @@ /area/rnd/xenobiology) "rX" = ( /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/towel/random, -/obj/item/weapon/storage/backpack, +/obj/item/towel/random, +/obj/item/storage/backpack, /turf/simulated/floor/wood, /area/groundbase/dorms/room8) "rZ" = ( @@ -6592,8 +6592,8 @@ /area/groundbase/medical/Chemistry) "sb" = ( /obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/alarm{ dir = 4 }, @@ -6617,9 +6617,9 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) "se" = ( -/obj/item/device/aicard, +/obj/item/aicard, /obj/structure/table/reinforced, -/obj/item/device/multitool, +/obj/item/multitool, /obj/machinery/button/remote/blast_door{ dir = 8; id = "bridge blast"; @@ -6635,8 +6635,8 @@ /area/rnd/xenobiology) "sh" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/gloves, +/obj/item/storage/box/masks, /turf/simulated/floor/tiled/white, /area/groundbase/medical/triage) "si" = ( @@ -6670,7 +6670,7 @@ "so" = ( /obj/machinery/alarm, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room2) "sp" = ( @@ -7135,7 +7135,7 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/science/rnd) "tJ" = ( -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/structure/table/fancyblack, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -7238,11 +7238,11 @@ /area/groundbase/civilian/kitchen) "tX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donut, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/command_guide, -/obj/item/device/radio, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/box/donut, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/command_guide, +/obj/item/radio, +/obj/item/storage/firstaid/regular, /obj/machinery/power/apc{ dir = 4 }, @@ -7509,8 +7509,8 @@ /area/medical/virology) "uK" = ( /obj/structure/table/standard, -/obj/item/weapon/tape_roll, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/tape_roll, +/obj/item/storage/firstaid/regular{ pixel_x = 6; pixel_y = -5 }, @@ -7590,22 +7590,22 @@ /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level2/northspur) "uU" = ( -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/peppermill, /obj/structure/closet, /obj/random/donkpocketbox, /turf/simulated/floor/tiled/eris/cafe, @@ -7794,16 +7794,16 @@ /area/groundbase/cargo/qm) "vF" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, /obj/item/clothing/glasses/welding, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/camera/network/research, /turf/simulated/floor/tiled, @@ -7832,8 +7832,8 @@ /area/groundbase/civilian/library) "vK" = ( /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/towel/random, -/obj/item/weapon/storage/backpack, +/obj/item/towel/random, +/obj/item/storage/backpack, /obj/machinery/firealarm{ dir = 4 }, @@ -7867,10 +7867,10 @@ "vP" = ( /obj/machinery/door/firedoor, /obj/structure/table/glass, -/obj/item/weapon/backup_implanter, -/obj/item/weapon/backup_implanter, -/obj/item/weapon/backup_implanter, -/obj/item/weapon/backup_implanter, +/obj/item/backup_implanter, +/obj/item/backup_implanter, +/obj/item/backup_implanter, +/obj/item/backup_implanter, /obj/machinery/door/window/southleft{ dir = 8; req_access = list(5) @@ -7884,23 +7884,23 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/weapon/book/bundle/custom_library/fiction/apurrrrfectman, -/obj/item/weapon/book/bundle/custom_library/fiction/beyondthedoor, -/obj/item/weapon/book/bundle/custom_library/fiction/chroniclesofmargatavol1, -/obj/item/weapon/book/bundle/custom_library/fiction/coldmountain, -/obj/item/weapon/book/bundle/custom_library/fiction/ghostship, -/obj/item/weapon/book/bundle/custom_library/fiction/manfromsnowyriver, -/obj/item/weapon/book/bundle/custom_library/fiction/metalglen, -/obj/item/weapon/book/bundle/custom_library/fiction/poemsforarainyday, -/obj/item/weapon/book/bundle/custom_library/fiction/raissue142, -/obj/item/weapon/book/bundle/custom_library/fiction/raissue147, -/obj/item/weapon/book/bundle/custom_library/fiction/silence, -/obj/item/weapon/book/bundle/custom_library/fiction/taleoftherainbowcat, -/obj/item/weapon/book/custom_library/fiction/blacksmithandkinglybloke, -/obj/item/weapon/book/custom_library/fiction/irishairmanforseesdeath, -/obj/item/weapon/book/custom_library/fiction/myrock, -/obj/item/weapon/book/custom_library/fiction/starsandsometimesfallingones, -/obj/item/weapon/book/custom_library/fiction/truelovehathmyheart, +/obj/item/book/bundle/custom_library/fiction/apurrrrfectman, +/obj/item/book/bundle/custom_library/fiction/beyondthedoor, +/obj/item/book/bundle/custom_library/fiction/chroniclesofmargatavol1, +/obj/item/book/bundle/custom_library/fiction/coldmountain, +/obj/item/book/bundle/custom_library/fiction/ghostship, +/obj/item/book/bundle/custom_library/fiction/manfromsnowyriver, +/obj/item/book/bundle/custom_library/fiction/metalglen, +/obj/item/book/bundle/custom_library/fiction/poemsforarainyday, +/obj/item/book/bundle/custom_library/fiction/raissue142, +/obj/item/book/bundle/custom_library/fiction/raissue147, +/obj/item/book/bundle/custom_library/fiction/silence, +/obj/item/book/bundle/custom_library/fiction/taleoftherainbowcat, +/obj/item/book/custom_library/fiction/blacksmithandkinglybloke, +/obj/item/book/custom_library/fiction/irishairmanforseesdeath, +/obj/item/book/custom_library/fiction/myrock, +/obj/item/book/custom_library/fiction/starsandsometimesfallingones, +/obj/item/book/custom_library/fiction/truelovehathmyheart, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -7908,8 +7908,8 @@ /area/groundbase/civilian/library) "vS" = ( /obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -7928,7 +7928,7 @@ /area/groundbase/medical/Chemistry) "vV" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/newscaster{ pixel_y = 28 }, @@ -8007,7 +8007,7 @@ /turf/simulated/floor/wood, /area/groundbase/civilian/library) "wh" = ( -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/structure/table/fancyblack, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -8169,10 +8169,10 @@ /area/groundbase/civilian/chapel) "wI" = ( /obj/structure/table/steel, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = -5 }, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = 5 }, /obj/machinery/light, @@ -8750,10 +8750,10 @@ /area/groundbase/cargo/office) "yt" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, @@ -8762,7 +8762,7 @@ /obj/machinery/computer/message_monitor{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -8996,7 +8996,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/item/device/retail_scanner/cargo, +/obj/item/retail_scanner/cargo, /turf/simulated/floor/tiled, /area/groundbase/cargo/office) "zg" = ( @@ -9124,7 +9124,7 @@ /area/groundbase/medical/triage) "zG" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 2; pixel_y = 7 }, @@ -9136,7 +9136,7 @@ /area/groundbase/civilian/chapel/office) "zH" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/camera/network/research/xenobio{ dir = 1 }, @@ -9175,7 +9175,7 @@ /area/groundbase/civilian/kitchen) "zK" = ( /obj/machinery/door/firedoor, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/westright{ dir = 4; @@ -9183,11 +9183,11 @@ req_access = list(7); req_one_access = list(47) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 4 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/door/blast/angled_shutter/open{ dir = 4; id = "rndshutters"; @@ -9315,12 +9315,12 @@ /area/groundbase/command/meeting) "Ag" = ( /obj/structure/table/glass, -/obj/item/weapon/book/manual/virology, -/obj/item/device/antibody_scanner, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/book/manual/virology, +/obj/item/antibody_scanner, +/obj/item/reagent_containers/glass/beaker, +/obj/item/paper_bin, +/obj/item/folder/white, +/obj/item/pen, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -9523,73 +9523,73 @@ /obj/structure/closet{ name = "robotics equipment" }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, /obj/item/clothing/glasses/omnihud/rnd, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 6 }, -/obj/item/weapon/storage/belt/utility, -/obj/item/device/multitool{ +/obj/item/storage/belt/utility, +/obj/item/multitool{ pixel_x = 3 }, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/tool/crowbar, +/obj/item/storage/toolbox/mechanical, /obj/item/clothing/glasses/welding, /obj/item/clothing/glasses/welding, /obj/item/clothing/head/welding{ @@ -9629,7 +9629,7 @@ "AX" = ( /obj/structure/table/woodentable, /obj/random/coin/sometimes, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -9831,7 +9831,7 @@ "BC" = ( /obj/machinery/light, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room4) "BD" = ( @@ -9932,13 +9932,13 @@ /area/groundbase/dorms/bathroom) "BV" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -10159,8 +10159,8 @@ /turf/simulated/wall/r_wall, /area/groundbase/dorms/room5) "CC" = ( -/obj/item/weapon/storage/briefcase, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, +/obj/item/storage/briefcase, /obj/structure/table/rack, /obj/machinery/light/small, /turf/simulated/floor/carpet, @@ -10375,11 +10375,11 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/device/robotanalyzer, -/obj/item/device/mmi/digital/posibrain, -/obj/item/device/mmi, -/obj/item/weapon/paper{ +/obj/item/storage/firstaid/surgery, +/obj/item/robotanalyzer, +/obj/item/mmi/digital/posibrain, +/obj/item/mmi, +/obj/item/paper{ desc = ""; info = "Stop installing NIFs in here you clods! Unless it's on a synth. Otherwise, STOP DOING IT! You're killing people! -Management"; name = "note to science staff" @@ -10414,7 +10414,7 @@ /area/groundbase/dorms/room1) "Dm" = ( /obj/structure/table/standard, -/obj/item/device/retail_scanner/science, +/obj/item/retail_scanner/science, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -10533,7 +10533,7 @@ /area/groundbase/command/hop) "DD" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "DE" = ( @@ -10651,7 +10651,7 @@ "DP" = ( /obj/machinery/light, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room5) "DQ" = ( @@ -10661,7 +10661,7 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/triage) "DR" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark/start/librarian, @@ -10684,13 +10684,13 @@ /area/groundbase/civilian/bar) "DV" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, /obj/item/clothing/mask/gas, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/card/id/gold/captain/spare, +/obj/item/card/id/gold/captain/spare, /obj/machinery/door/window/brigdoor/westright{ dir = 4; name = "Colony Director's Storage"; @@ -10761,12 +10761,12 @@ /obj/structure/bookcase{ name = "bookcase (Non-Fiction)" }, -/obj/item/weapon/book/bundle/custom_library/nonfiction/riseandfallofpersianempire, -/obj/item/weapon/book/bundle/custom_library/nonfiction/skrelliancastesystem, -/obj/item/weapon/book/bundle/custom_library/nonfiction/viabilityofcorporategov, -/obj/item/weapon/book/custom_library/nonfiction/freesirisailightbulbs, +/obj/item/book/bundle/custom_library/nonfiction/riseandfallofpersianempire, +/obj/item/book/bundle/custom_library/nonfiction/skrelliancastesystem, +/obj/item/book/bundle/custom_library/nonfiction/viabilityofcorporategov, +/obj/item/book/custom_library/nonfiction/freesirisailightbulbs, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/weapon/book/manual/synthetic_life, +/obj/item/book/manual/synthetic_life, /turf/simulated/floor/wood, /area/groundbase/civilian/library) "Ee" = ( @@ -10845,7 +10845,7 @@ /area/groundbase/cargo/office) "Eo" = ( /obj/machinery/firealarm, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/structure/table/standard, /turf/simulated/floor/tiled, /area/groundbase/civilian/hydroponics) @@ -10868,7 +10868,7 @@ /area/groundbase/civilian/kitchen) "Et" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /turf/simulated/floor/tiled/dark, /area/groundbase/command/meeting) "Eu" = ( @@ -10924,7 +10924,7 @@ "EC" = ( /obj/machinery/alarm, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room1) "ED" = ( @@ -11000,15 +11000,15 @@ /area/groundbase/level2/ne) "EQ" = ( /obj/structure/closet/walllocker_double/cargo/north, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster{ pixel_x = 6; pixel_y = 5 }, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster{ pixel_x = -4; pixel_y = 7 }, -/obj/item/weapon/cartridge/quartermaster, +/obj/item/cartridge/quartermaster, /turf/simulated/floor/wood, /area/groundbase/cargo/qm) "ET" = ( @@ -11229,25 +11229,25 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/science/robotics) "FB" = ( -/obj/item/weapon/storage/fancy/vials, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/storage/lockbox/vials, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/fancy/vials, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/storage/lockbox/vials, +/obj/item/reagent_containers/dropper, +/obj/item/storage/box/syringes{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/masks, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/beakers, +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/structure/closet/walllocker_double/medical/east, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/storage/box/monkeycubes/wolpincubes, +/obj/item/hand_labeler, +/obj/item/storage/box/monkeycubes/wolpincubes, /turf/simulated/floor/tiled/white, /area/medical/virology) "FC" = ( @@ -11285,7 +11285,7 @@ /obj/structure/table/standard, /obj/item/clothing/head/soft, /obj/item/clothing/head/soft, -/obj/item/weapon/stamp{ +/obj/item/stamp{ pixel_x = -3; pixel_y = 3 }, @@ -11461,7 +11461,7 @@ /area/groundbase/dorms/room5) "Gi" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/light, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) @@ -11489,7 +11489,7 @@ /area/groundbase/civilian/bar/upper) "Gm" = ( /obj/structure/table/woodentable, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/carpet, /area/groundbase/civilian/library) "Gn" = ( @@ -11590,13 +11590,13 @@ /area/groundbase/command/bridge) "Gx" = ( /obj/structure/table/reinforced, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = -10; pixel_y = 3 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/stamp/hop, -/obj/item/weapon/paper/dockingcodes, +/obj/item/clipboard, +/obj/item/stamp/hop, +/obj/item/paper/dockingcodes, /turf/simulated/floor/carpet, /area/groundbase/command/hop) "Gy" = ( @@ -11654,13 +11654,13 @@ /area/groundbase/science/xenobot) "GJ" = ( /obj/structure/table/steel, -/obj/item/device/integrated_circuit_printer, +/obj/item/integrated_circuit_printer, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/circuits) "GK" = ( /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /obj/machinery/light{ dir = 1 }, @@ -11778,9 +11778,9 @@ /area/groundbase/level2/nw) "Ha" = ( /obj/structure/table/steel, -/obj/item/device/multitool, +/obj/item/multitool, /obj/item/clothing/glasses/welding, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "Hb" = ( @@ -11789,7 +11789,7 @@ /turf/simulated/floor/tiled, /area/groundbase/science/robotics) "Hc" = ( -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /obj/structure/bed/padded, /obj/machinery/alarm, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -12030,7 +12030,7 @@ "HJ" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -12061,9 +12061,9 @@ /area/groundbase/level2/sw) "HR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/device/radio/intercom{ +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -12222,7 +12222,7 @@ /turf/simulated/floor/outdoors/newdirt, /area/groundbase/level2/ne) "Il" = ( -/obj/item/weapon/bedsheet/mimedouble, +/obj/item/bedsheet/mimedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -12818,7 +12818,7 @@ /area/groundbase/cargo/bay) "JO" = ( /obj/structure/table/standard, -/obj/item/device/retail_scanner/civilian, +/obj/item/retail_scanner/civilian, /obj/machinery/light{ dir = 8 }, @@ -12882,11 +12882,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/device/megaphone, +/obj/item/megaphone, /turf/simulated/floor/wood, /area/groundbase/cargo/qm) "JX" = ( @@ -12903,7 +12903,7 @@ dir = 2; icon_state = "pipe-c" }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled, @@ -12985,7 +12985,7 @@ /obj/item/honey_frame, /obj/item/honey_frame, /obj/item/honey_frame, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /obj/item/bee_smoker, /obj/item/beehive_assembly, /obj/structure/closet/crate/hydroponics{ @@ -13140,9 +13140,9 @@ /area/groundbase/cargo/qm) "KD" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/command_guide, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/command_guide, /turf/simulated/floor/wood, /area/groundbase/command/captain) "KE" = ( @@ -13196,8 +13196,8 @@ /area/groundbase/civilian/hydroponics) "KO" = ( /obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) "KP" = ( @@ -13316,7 +13316,7 @@ /area/groundbase/cargo/office) "Lk" = ( /obj/structure/table/steel, -/obj/item/device/electronic_assembly/large/default, +/obj/item/electronic_assembly/large/default, /turf/simulated/floor/tiled, /area/groundbase/science/circuits) "Lm" = ( @@ -13340,7 +13340,7 @@ /area/groundbase/cargo/office) "Lo" = ( /obj/structure/table/reinforced, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /obj/structure/extinguisher_cabinet{ dir = 8; pixel_x = 30 @@ -13364,7 +13364,7 @@ /turf/simulated/floor/outdoors/newdirt, /area/groundbase/level2/ne) "Ls" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -13454,12 +13454,12 @@ /area/groundbase/dorms/room5) "LD" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/mint, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/snacks/mint, +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3; pixel_y = 13 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -1; pixel_y = 10 }, @@ -13469,13 +13469,13 @@ /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) "LE" = ( -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/beakers, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/table/steel, /turf/simulated/floor/tiled, /area/rnd/xenobiology) @@ -13579,8 +13579,8 @@ /area/groundbase/level2/nw) "LU" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white_rd, -/obj/item/weapon/stamp/rd, +/obj/item/folder/white_rd, +/obj/item/stamp/rd, /turf/simulated/floor/tiled, /area/groundbase/science/rd) "LV" = ( @@ -13676,14 +13676,14 @@ /area/groundbase/medical/triage) "Mi" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/packageWrap, -/obj/item/device/mass_spectrometer/adv, -/obj/item/device/mass_spectrometer/adv, +/obj/item/hand_labeler, +/obj/item/packageWrap, +/obj/item/mass_spectrometer/adv, +/obj/item/mass_spectrometer/adv, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/science, /obj/machinery/alarm{ @@ -13819,7 +13819,7 @@ /obj/machinery/computer/med_data/laptop{ dir = 8 }, -/obj/item/device/radio{ +/obj/item/radio{ anchored = 1; canhear_range = 7; frequency = 1487; @@ -13841,7 +13841,7 @@ /area/groundbase/science/robotics) "Mz" = ( /obj/structure/table/steel, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/machinery/camera/network/research/xenobio{ dir = 1 }, @@ -13942,15 +13942,15 @@ /area/groundbase/science/robotics) "MQ" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/stamp/denied{ +/obj/item/folder/yellow, +/obj/item/stamp/denied{ pixel_x = 4; pixel_y = -2 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/weapon/stamp/accepted, +/obj/item/stamp/accepted, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -13958,10 +13958,10 @@ /area/groundbase/cargo/office) "MR" = ( /obj/structure/table/standard, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/pen, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/hand_labeler, +/obj/item/pen, +/obj/item/packageWrap, +/obj/item/packageWrap, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -14579,7 +14579,7 @@ "OD" = ( /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, @@ -14685,8 +14685,8 @@ dir = 8 }, /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/towel/random, -/obj/item/weapon/storage/backpack, +/obj/item/towel/random, +/obj/item/storage/backpack, /turf/simulated/floor/wood, /area/groundbase/dorms/room3) "OS" = ( @@ -14822,8 +14822,8 @@ departmentType = 2; pixel_y = 30 }, -/obj/item/device/healthanalyzer/guide, -/obj/item/device/healthanalyzer/guide, +/obj/item/healthanalyzer/guide, +/obj/item/healthanalyzer/guide, /obj/structure/table/glass, /turf/simulated/floor/tiled/white, /area/groundbase/medical/triage) @@ -14987,9 +14987,9 @@ desc = "There appears to be a shrine to WGW at the back..."; name = "Forbidden Knowledge" }, -/obj/item/weapon/book/manual/engineering_hacking, -/obj/item/weapon/book/manual/nuclear, -/obj/item/weapon/book/custom_library/fiction/woodysgotwood, +/obj/item/book/manual/engineering_hacking, +/obj/item/book/manual/nuclear, +/obj/item/book/custom_library/fiction/woodysgotwood, /obj/machinery/light/small{ dir = 1 }, @@ -15133,11 +15133,11 @@ /obj/structure/bookcase{ name = "bookcase (Religious)" }, -/obj/item/weapon/book/bundle/custom_library/religious/zoroastrianism, -/obj/item/weapon/book/custom_library/religious/feastofkubera, -/obj/item/weapon/book/custom_library/religious/storyoflordganesha, -/obj/item/weapon/book/custom_library/religious/sungoddessofkorea, -/obj/item/weapon/book/custom_library/religious/wayofbleedingswan, +/obj/item/book/bundle/custom_library/religious/zoroastrianism, +/obj/item/book/custom_library/religious/feastofkubera, +/obj/item/book/custom_library/religious/storyoflordganesha, +/obj/item/book/custom_library/religious/sungoddessofkorea, +/obj/item/book/custom_library/religious/wayofbleedingswan, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/wood, /area/groundbase/civilian/library) @@ -15460,9 +15460,9 @@ /area/groundbase/science/xenobot/storage) "Rd" = ( /obj/structure/table/reinforced, -/obj/item/device/megaphone, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/standard_operating_procedure, +/obj/item/megaphone, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/standard_operating_procedure, /obj/machinery/light{ dir = 1 }, @@ -15605,7 +15605,7 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/item/device/perfect_tele{ +/obj/item/perfect_tele{ desc = "Seems absurd, doesn't it? Yet, here we are. Generally considered dangerous contraband unless the user has permission from Central Command. This one is the Site Manager's, and they are authorized to use it."; name = "manager's translocator" }, @@ -15635,10 +15635,10 @@ /turf/simulated/floor/tiled, /area/groundbase/science/xenobot/storage) "RC" = ( -/obj/item/weapon/gun/projectile/shotgun/doublebarrel{ +/obj/item/gun/projectile/shotgun/doublebarrel{ name = "chef's double-barreled shotgun" }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "This permit signifies that the Chef is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest."; name = "Shotgun permit" }, @@ -15810,7 +15810,7 @@ /area/groundbase/science/xenobot) "Sb" = ( /obj/structure/table/steel, -/obj/item/device/electronic_assembly/large/default, +/obj/item/electronic_assembly/large/default, /obj/machinery/light{ dir = 1 }, @@ -15818,8 +15818,8 @@ /area/groundbase/science/circuits) "Sc" = ( /obj/structure/table/woodentable, -/obj/item/device/tvcamera, -/obj/item/device/radio/intercom{ +/obj/item/tvcamera, +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -15886,11 +15886,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/item/device/destTagger, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/destTagger, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, /turf/simulated/floor/tiled, /area/groundbase/cargo/office) "Sm" = ( @@ -15992,7 +15992,7 @@ /obj/machinery/computer/communications{ dir = 4 }, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = -24 }, /turf/simulated/floor/carpet/blucarpet, @@ -16075,7 +16075,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/triage) "SM" = ( -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/structure/bed/padded, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/landmark{ @@ -16582,7 +16582,7 @@ /area/groundbase/medical/Chemistry) "Uv" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/machinery/light, /turf/simulated/floor/tiled, /area/rnd/xenobiology) @@ -16610,7 +16610,7 @@ "UA" = ( /obj/structure/table/glass, /obj/machinery/recharger, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled/white, /area/groundbase/medical/triage) "UB" = ( @@ -16673,11 +16673,11 @@ /area/groundbase/level2/ne) "UK" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = -2; pixel_y = 10 }, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_x = 5; pixel_y = 2 }, @@ -16696,8 +16696,8 @@ /area/groundbase/cargo/office) "UN" = ( /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/towel/random, -/obj/item/weapon/storage/backpack, +/obj/item/towel/random, +/obj/item/storage/backpack, /obj/machinery/firealarm{ dir = 4 }, @@ -17002,13 +17002,13 @@ /area/groundbase/medical/lobby) "VE" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/photo_album{ +/obj/item/storage/photo_album{ pixel_y = -10 }, -/obj/item/weapon/reagent_containers/food/drinks/flask{ +/obj/item/reagent_containers/food/drinks/flask{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/carnoth, +/obj/item/reagent_containers/food/drinks/bottle/carnoth, /turf/simulated/floor/wood, /area/groundbase/command/captainq) "VG" = ( @@ -17028,8 +17028,8 @@ /area/groundbase/civilian/kitchen) "VI" = ( /obj/structure/table/steel, -/obj/item/device/slime_scanner, -/obj/item/device/slime_scanner, +/obj/item/slime_scanner, +/obj/item/slime_scanner, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "VJ" = ( @@ -17314,7 +17314,7 @@ /area/groundbase/medical/triage) "Wy" = ( /obj/structure/closet/secure_closet/RD, -/obj/item/device/aicard, +/obj/item/aicard, /obj/item/clothing/glasses/omnihud/rnd, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -17345,7 +17345,7 @@ /area/groundbase/civilian/library) "WA" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -17404,10 +17404,10 @@ /area/groundbase/dorms/room5) "WM" = ( /obj/structure/table/steel, -/obj/item/weapon/melee/baton/slime/loaded, -/obj/item/weapon/melee/baton/slime/loaded, -/obj/item/weapon/gun/energy/taser/xeno, -/obj/item/weapon/gun/energy/taser/xeno, +/obj/item/melee/baton/slime/loaded, +/obj/item/melee/baton/slime/loaded, +/obj/item/gun/energy/taser/xeno, +/obj/item/gun/energy/taser/xeno, /obj/machinery/recharger/wallcharger{ pixel_x = 32 }, @@ -17418,7 +17418,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "WN" = ( -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/structure/bed/padded, /turf/simulated/floor/tiled/white, /area/medical/virology) @@ -17431,7 +17431,7 @@ /area/groundbase/civilian/chapel) "WP" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled, /area/groundbase/civilian/hydroponics) "WQ" = ( @@ -17441,7 +17441,7 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) "WR" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/lino{ edge_blending_priority = 0.1 }, @@ -17500,7 +17500,7 @@ /area/groundbase/dorms/bathroom) "Xc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, @@ -17566,10 +17566,10 @@ /turf/simulated/floor/tiled, /area/groundbase/science/hall) "Xn" = ( -/obj/item/weapon/rig/hazmat/equipped, +/obj/item/rig/hazmat/equipped, /obj/structure/table/rack, /obj/item/clothing/glasses/welding/superior, -/obj/item/weapon/cartridge/signal/science, +/obj/item/cartridge/signal/science, /turf/simulated/floor/tiled, /area/groundbase/science/rd) "Xp" = ( @@ -17713,12 +17713,12 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/command/bridge) "XO" = ( -/obj/item/device/radio/headset/headset_med, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/fancy/vials, -/obj/item/weapon/storage/fancy/vials, -/obj/item/weapon/storage/box/pillbottles, -/obj/item/weapon/storage/box/pillbottles, +/obj/item/radio/headset/headset_med, +/obj/item/storage/box/syringes, +/obj/item/storage/fancy/vials, +/obj/item/storage/fancy/vials, +/obj/item/storage/box/pillbottles, +/obj/item/storage/box/pillbottles, /obj/structure/closet/wardrobe/chemistry_white, /obj/machinery/light{ dir = 1 @@ -17770,12 +17770,12 @@ pixel_x = 30 }, /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/pen/red{ +/obj/item/clipboard, +/obj/item/pen/red{ pixel_x = 2; pixel_y = 6 }, @@ -17789,11 +17789,11 @@ /area/groundbase/science/rd) "Yb" = ( /obj/structure/table/standard, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/reagent_containers/dropper{ +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, +/obj/item/reagent_containers/dropper{ pixel_y = -4 }, /obj/item/clothing/glasses/omnihud/rnd, @@ -17957,8 +17957,8 @@ }, /obj/machinery/light, /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/towel/random, -/obj/item/weapon/storage/backpack, +/obj/item/towel/random, +/obj/item/storage/backpack, /turf/simulated/floor/wood, /area/groundbase/dorms/room1) "Yz" = ( @@ -18089,16 +18089,16 @@ /area/groundbase/civilian/hydroponics/out) "YX" = ( /obj/structure/table/steel, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/soap/nanotrasen, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/soap/nanotrasen, +/obj/item/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) "YZ" = ( @@ -18113,7 +18113,7 @@ "Za" = ( /obj/machinery/light, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room6) "Zb" = ( @@ -18258,7 +18258,7 @@ /obj/machinery/recharger{ pixel_y = 5 }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/wood, /area/groundbase/civilian/library) "Zw" = ( @@ -18329,7 +18329,7 @@ /area/groundbase/level2/ne) "ZF" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_y = 4 }, /obj/machinery/camera/network/research/xenobio{ @@ -18423,7 +18423,7 @@ /obj/machinery/computer/skills{ dir = 8 }, -/obj/item/weapon/paper/dockingcodes, +/obj/item/paper/dockingcodes, /turf/simulated/floor/carpet/blucarpet, /area/groundbase/command/captain) "ZT" = ( diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm index 3a6ffa54373..99416b3b972 100644 --- a/maps/groundbase/gb-z3.dmm +++ b/maps/groundbase/gb-z3.dmm @@ -26,17 +26,17 @@ /obj/structure/cable/cyan{ icon_state = "1-8" }, -/obj/item/weapon/tank/phoron, -/obj/item/weapon/tank/phoron, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tank/phoron, +/obj/item/tank/phoron, +/obj/item/tool/crowbar/red, /obj/structure/closet/walllocker_double/engineering/east, /turf/simulated/floor, /area/shuttle/groundbase/exploration) "ak" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/radio/intercom/department/medbay{ dir = 1; pixel_y = 24 }, @@ -50,25 +50,25 @@ /turf/simulated/floor/carpet, /area/groundbase/medical/cmo) "aN" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/wmarble, /area/groundbase/civilian/kitchen) "aQ" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white_cmo, -/obj/item/weapon/stamp/cmo, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/folder/white_cmo, +/obj/item/stamp/cmo, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/carpet, /area/groundbase/medical/cmo) "bf" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/device/multitool, -/obj/item/device/gps/medical, -/obj/item/device/radio, +/obj/item/storage/toolbox/mechanical, +/obj/item/multitool, +/obj/item/gps/medical, +/obj/item/radio, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) "bk" = ( @@ -78,7 +78,7 @@ /area/groundbase/cargo/office) "bm" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/milspec, /area/groundbase/civilian/pilot) "bM" = ( @@ -262,7 +262,7 @@ /area/groundbase/medical/paramedic) "ey" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit{ +/obj/item/suit_cooling_unit{ pixel_y = -5 }, /turf/simulated/floor/tiled/white, @@ -626,8 +626,8 @@ /area/groundbase/level3/ne) "kE" = ( /obj/structure/table/glass, -/obj/item/weapon/clipboard, -/obj/item/device/radio/intercom{ +/obj/item/clipboard, +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -824,14 +824,14 @@ /area/groundbase/medical/patient3) "nC" = ( /obj/structure/closet/secure_closet/CMO, -/obj/item/weapon/storage/belt/medical, -/obj/item/device/flashlight/pen, +/obj/item/storage/belt/medical, +/obj/item/flashlight/pen, /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/glasses/hud/health, -/obj/item/device/defib_kit/compact/combat/loaded, -/obj/item/weapon/cmo_disk_holder, -/obj/item/weapon/storage/secure/briefcase/ml3m_pack_cmo, -/obj/item/weapon/storage/mrebag/pill/sleevingcure, +/obj/item/defib_kit/compact/combat/loaded, +/obj/item/cmo_disk_holder, +/obj/item/storage/secure/briefcase/ml3m_pack_cmo, +/obj/item/storage/mrebag/pill/sleevingcure, /obj/structure/sign/painting/library_secure{ pixel_x = 30 }, @@ -959,9 +959,9 @@ /area/groundbase/medical/cmo) "oX" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/radio/intercom/department/medbay{ dir = 1; pixel_y = 24 }, @@ -969,7 +969,7 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient4) "pa" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wmarble, /area/groundbase/civilian/kitchen) "pd" = ( @@ -1125,7 +1125,7 @@ /area/shuttle/groundbase/exploration) "ro" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/alarm{ dir = 1 }, @@ -1407,8 +1407,8 @@ /area/groundbase/level3/escapepad) "wu" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/pilot, /obj/item/clothing/head/helmet/space/void/pilot, @@ -1628,14 +1628,14 @@ name = "misc equipment cabinet"; pixel_x = -32 }, -/obj/item/weapon/storage/box/nifsofts_pilot, -/obj/item/device/multitool/station_buffered, +/obj/item/storage/box/nifsofts_pilot, +/obj/item/multitool/station_buffered, /obj/structure/table/steel, /turf/simulated/floor/tiled, /area/groundbase/civilian/pilot) "zL" = ( /obj/structure/table/rack, -/obj/item/device/defib_kit/compact/loaded, +/obj/item/defib_kit/compact/loaded, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -1667,7 +1667,7 @@ /area/groundbase/level3/escapepad) "Aa" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/alarm{ dir = 1 }, @@ -1695,7 +1695,7 @@ /area/groundbase/medical/patient2) "AY" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/cosmosdouble{ +/obj/item/bedsheet/cosmosdouble{ icon_state = "dobulesheetcosmos" }, /turf/simulated/floor/wood, @@ -1794,7 +1794,7 @@ /area/groundbase/civilian/kitchen) "Cv" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/alarm{ dir = 1 }, @@ -1816,7 +1816,7 @@ /turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) "CS" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/outdoors/sidewalk/slab{ @@ -1909,7 +1909,7 @@ /area/groundbase/medical/uhallway) "DQ" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit{ +/obj/item/suit_cooling_unit{ pixel_y = -5 }, /obj/machinery/camera/network/medbay, @@ -2021,8 +2021,8 @@ /area/groundbase/level3/nw) "Fb" = ( /obj/structure/table/glass, -/obj/item/weapon/clipboard, -/obj/item/device/radio/intercom{ +/obj/item/clipboard, +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -2051,7 +2051,7 @@ /turf/simulated/floor/wood, /area/groundbase/dorms/bathroom) "Fr" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/wmarble, @@ -2086,8 +2086,8 @@ /area/groundbase/civilian/kitchen) "FV" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/pilot, /obj/item/clothing/head/helmet/space/void/pilot, @@ -2215,7 +2215,7 @@ /area/groundbase/level3/escapepad) "Io" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/medical/equipped, +/obj/item/rig/medical/equipped, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) @@ -2234,8 +2234,8 @@ /area/shuttle/groundbase/exploration) "ID" = ( /obj/structure/table/glass, -/obj/item/weapon/clipboard, -/obj/item/device/radio/intercom{ +/obj/item/clipboard, +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -2405,8 +2405,8 @@ /area/groundbase/level3/sw) "Lw" = ( /obj/structure/table/glass, -/obj/item/weapon/clipboard, -/obj/item/device/radio/intercom{ +/obj/item/clipboard, +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -2598,10 +2598,10 @@ /area/shuttle/groundbase/exploration) "Ok" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/device/multitool, -/obj/item/device/gps/medical, -/obj/item/device/radio, +/obj/item/storage/toolbox/mechanical, +/obj/item/multitool, +/obj/item/gps/medical, +/obj/item/radio, /obj/machinery/alarm, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) @@ -2634,7 +2634,7 @@ /turf/simulated/open, /area/groundbase/dorms/bathroom) "Pd" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled{ @@ -2982,9 +2982,9 @@ /area/groundbase/medical/uhallway) "ST" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/radio/intercom/department/medbay{ dir = 1; pixel_y = 24 }, @@ -3016,9 +3016,9 @@ /area/groundbase/civilian/pilot) "Tv" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/radio/intercom/department/medbay{ dir = 1; pixel_y = 24 }, @@ -3234,7 +3234,7 @@ /area/groundbase/civilian/kitchen) "XB" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/alarm{ dir = 1 }, @@ -3338,7 +3338,7 @@ /area/groundbase/unexplored/outdoors) "Zp" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, diff --git a/maps/groundbase/groundbase_poi_stuff.dm b/maps/groundbase/groundbase_poi_stuff.dm index 2089827d31f..f9e0a5c5e3d 100644 --- a/maps/groundbase/groundbase_poi_stuff.dm +++ b/maps/groundbase/groundbase_poi_stuff.dm @@ -1069,7 +1069,7 @@ name = "wide building 6" mappath = 'southwilds/villagepois/wide6.dmm' /area/submap/groundbase/poi/wildvillage/wide/wide6 -/obj/item/weapon/paper/wide6 +/obj/item/paper/wide6 name = "\improper hand written letter" info = {"It is hard for me to write this out, and I hope you will be back soon, but I fear that by the time you return I will already be gone. I will try my best to hold on, but even as I write this, I can feel myself slipping.

I know that you all do not believe me but I really can see them, just beyond the walls, and they're even closer now than they were before. I can see them even when I close my eyes. Seven golden eyes watch me, and I can feel their heat pouring into me. As they come closer, I can feel myself being tugged in. Like I'm a little lost moon being tugged into the embrace of a passing star.

It still doesn't hurt. It's getting hard to see anything else, and I can't move anymore. I feel like everything is going to be okay. If you see seven eyes, don't be afraid. Just promise you'll come find me, okay?

diff --git a/maps/groundbase/groundbase_telecomms.dm b/maps/groundbase/groundbase_telecomms.dm index da91ca9b95a..7e77d02d1f1 100644 --- a/maps/groundbase/groundbase_telecomms.dm +++ b/maps/groundbase/groundbase_telecomms.dm @@ -76,18 +76,18 @@ num2text(EXP_FREQ) = list(access_explorer) ) -/obj/item/device/multitool/station_buffered +/obj/item/multitool/station_buffered name = "pre-linked multitool (Rascal's Pass hub)" desc = "This multitool has already been linked to the groundbase 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/groundbase) -/obj/item/device/bluespaceradio/groundbase_prelinked +/obj/item/bluespaceradio/groundbase_prelinked name = "bluespace radio (Rascal's Pass)" - handset = /obj/item/device/radio/bluespacehandset/linked/groundbase_prelinked + handset = /obj/item/radio/bluespacehandset/linked/groundbase_prelinked -/obj/item/device/radio/bluespacehandset/linked/groundbase_prelinked +/obj/item/radio/bluespacehandset/linked/groundbase_prelinked bs_tx_preload_id = "groundbase_rx" //Transmit to a receiver bs_rx_preload_id = "groundbase_tx" //Recveive from a transmitter diff --git a/maps/groundbase/pois/cavething7.dmm b/maps/groundbase/pois/cavething7.dmm index 85c2a8016c9..47548a80c68 100644 --- a/maps/groundbase/pois/cavething7.dmm +++ b/maps/groundbase/pois/cavething7.dmm @@ -42,7 +42,7 @@ /obj/random/tool, /obj/random/tool, /obj/random/tool, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor{ edge_blending_priority = -1; outdoors = 0 @@ -50,7 +50,7 @@ /area/maintenance/groundbase/poi/caves) "Y" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /turf/simulated/floor{ edge_blending_priority = -1; outdoors = 0 diff --git a/maps/groundbase/pois/outdoors10.dmm b/maps/groundbase/pois/outdoors10.dmm index 7a3967ee262..cbf5137b597 100644 --- a/maps/groundbase/pois/outdoors10.dmm +++ b/maps/groundbase/pois/outdoors10.dmm @@ -13,7 +13,7 @@ /area/submap/groundbase/poi/outdoor/cabin5) "g" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -55,7 +55,7 @@ /area/submap/groundbase/poi/outdoor/cabin5) "J" = ( /obj/structure/table/glass, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, diff --git a/maps/groundbase/pois/outdoors16.dmm b/maps/groundbase/pois/outdoors16.dmm index c613a41c915..81f946d4523 100644 --- a/maps/groundbase/pois/outdoors16.dmm +++ b/maps/groundbase/pois/outdoors16.dmm @@ -1,10 +1,10 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/item/weapon/reagent_containers/food/snacks/chip/nacho/cheese, +/obj/item/reagent_containers/food/snacks/chip/nacho/cheese, /turf/simulated/floor/outdoors/grass/seasonal/nomobs, /area/template_noop) "b" = ( -/obj/item/weapon/reagent_containers/food/snacks/chip/nacho/salsa, +/obj/item/reagent_containers/food/snacks/chip/nacho/salsa, /turf/simulated/floor/outdoors/grass/seasonal/nomobs, /area/template_noop) "c" = ( @@ -18,11 +18,11 @@ folded_desc = "A worn picnic blanket with a rough texture. One could swear it seems to be covered in strange, otter-like fur"; name = "weathered picnic blanket" }, -/obj/item/weapon/storage/toolbox/lunchbox/cat/filled{ +/obj/item/storage/toolbox/lunchbox/cat/filled{ pixel_x = 6; pixel_y = 9 }, -/obj/item/weapon/reagent_containers/food/snacks/fruitsalad, +/obj/item/reagent_containers/food/snacks/fruitsalad, /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_nosnow, /area/template_noop) "h" = ( @@ -37,7 +37,7 @@ "i" = ( /obj/structure/table/wooden_reinforced, /obj/random/pizzabox, -/obj/item/weapon/storage/toolbox/lunchbox/mars/filled{ +/obj/item/storage/toolbox/lunchbox/mars/filled{ pixel_x = -7; pixel_y = 11 }, @@ -65,7 +65,7 @@ newdesc = "A wild catslug enjoying the simpler things in life: a picnic!"; newname = list("happy catslug", "rotund catslug", "anxious catslug", "angry Catslug", "content Catslug", "sad catslug") }, -/obj/item/weapon/ore/diamond{ +/obj/item/ore/diamond{ name = "porl" }, /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_nosnow, @@ -91,7 +91,7 @@ newdesc = "A wild catslug enjoying the simpler things in life: a picnic!"; newname = list("happy catslug", "rotund catslug", "anxious catslug", "angry Catslug", "content Catslug", "sad catslug") }, -/obj/item/weapon/material/twohanded/spear/foam{ +/obj/item/material/twohanded/spear/foam{ desc = "The only way you can hunt things with this is by tickling them to death."; name = "squishy foam spear" }, @@ -111,7 +111,7 @@ /area/template_noop) "N" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/storage/toolbox/lunchbox/heart/filled{ +/obj/item/storage/toolbox/lunchbox/heart/filled{ pixel_x = -4; pixel_y = -6 }, @@ -133,7 +133,7 @@ /area/template_noop) "S" = ( /obj/structure/table/bench/wooden, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /obj/random/mob/wildscugs{ newdesc = "A wild catslug enjoying the simpler things in life: a picnic!"; newname = list("happy catslug", "rotund catslug", "anxious catslug", "angry Catslug", "content Catslug", "sad catslug") diff --git a/maps/groundbase/pois/outdoors4.dmm b/maps/groundbase/pois/outdoors4.dmm index 71122a524e3..92ccb147b00 100644 --- a/maps/groundbase/pois/outdoors4.dmm +++ b/maps/groundbase/pois/outdoors4.dmm @@ -8,7 +8,7 @@ "h" = ( /obj/structure/table/standard, /obj/random/maintenance/misc, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -16,7 +16,7 @@ /area/submap/groundbase/poi/outdoor/cabin1) "i" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 2; pixel_y = 7 }, diff --git a/maps/groundbase/pois/outdoors5.dmm b/maps/groundbase/pois/outdoors5.dmm index 9a52c008bc5..4d914e114c0 100644 --- a/maps/groundbase/pois/outdoors5.dmm +++ b/maps/groundbase/pois/outdoors5.dmm @@ -12,7 +12,7 @@ "g" = ( /obj/structure/table/standard, /obj/random/maintenance/misc, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -43,7 +43,7 @@ /area/submap/groundbase/poi/outdoor/cabin2) "G" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, diff --git a/maps/groundbase/pois/outdoors6.dmm b/maps/groundbase/pois/outdoors6.dmm index 688e4a91c82..2087bb2c383 100644 --- a/maps/groundbase/pois/outdoors6.dmm +++ b/maps/groundbase/pois/outdoors6.dmm @@ -32,7 +32,7 @@ /area/submap/groundbase/poi/outdoor/cabin3) "r" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, diff --git a/maps/groundbase/pois/outdoors9.dmm b/maps/groundbase/pois/outdoors9.dmm index 8412f0de74f..9073a3f0b9d 100644 --- a/maps/groundbase/pois/outdoors9.dmm +++ b/maps/groundbase/pois/outdoors9.dmm @@ -45,7 +45,7 @@ /area/submap/groundbase/poi/outdoor/cabin4) "Q" = ( /obj/structure/table/glass, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, diff --git a/maps/groundbase/pois/template.dmm b/maps/groundbase/pois/template.dmm index 37250a89c7d..1a4b7e9a14a 100644 --- a/maps/groundbase/pois/template.dmm +++ b/maps/groundbase/pois/template.dmm @@ -10,7 +10,7 @@ /area/template_noop) "am" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /turf/simulated/floor{ edge_blending_priority = -1; outdoors = 0 @@ -138,7 +138,7 @@ /area/submap/groundbase/poi/outdoor/cabin2) "fp" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -457,7 +457,7 @@ "wa" = ( /obj/structure/table/standard, /obj/random/maintenance/misc, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -485,7 +485,7 @@ /area/submap/groundbase/poi/outdoor/cabin1) "xr" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -516,7 +516,7 @@ /obj/random/tool, /obj/random/tool, /obj/random/tool, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor{ edge_blending_priority = -1; outdoors = 0 @@ -594,7 +594,7 @@ /area/submap/groundbase/poi/outdoor/cabin5) "DG" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 2; pixel_y = 7 }, @@ -723,7 +723,7 @@ /turf/template_noop, /area/template_noop) "IT" = ( -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, /turf/template_noop, /area/template_noop) "JD" = ( @@ -732,7 +732,7 @@ /area/template_noop) "Kr" = ( /obj/structure/table/glass, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -798,7 +798,7 @@ /area/submap/groundbase/poi/outdoor/cabin4) "NI" = ( /obj/structure/table/glass, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -826,7 +826,7 @@ "PK" = ( /obj/structure/table/standard, /obj/random/maintenance/misc, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -995,7 +995,7 @@ /area/template_noop) "Yk" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -1017,7 +1017,7 @@ }, /area/maintenance/groundbase/poi/caves) "YI" = ( -/obj/item/weapon/storage/wallet/random, +/obj/item/storage/wallet/random, /turf/template_noop, /area/template_noop) "YX" = ( diff --git a/maps/groundbase/southwilds/villagepois/long4.dmm b/maps/groundbase/southwilds/villagepois/long4.dmm index e5753ec40f7..05a1c97ff18 100644 --- a/maps/groundbase/southwilds/villagepois/long4.dmm +++ b/maps/groundbase/southwilds/villagepois/long4.dmm @@ -4,7 +4,7 @@ /turf/template_noop, /area/submap/groundbase/poi/wildvillage) "j" = ( -/obj/item/weapon/beach_ball/dodgeball, +/obj/item/beach_ball/dodgeball, /turf/simulated/floor/outdoors/newdirt, /area/submap/groundbase/poi/wildvillage/long/long4) "s" = ( diff --git a/maps/groundbase/southwilds/villagepois/square1.dmm b/maps/groundbase/southwilds/villagepois/square1.dmm index f65801d62dd..552a2517b9c 100644 --- a/maps/groundbase/southwilds/villagepois/square1.dmm +++ b/maps/groundbase/southwilds/villagepois/square1.dmm @@ -29,7 +29,7 @@ /area/submap/groundbase/poi/wildvillage) "f" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/curtain/open/bed{ color = "#5e0c1d" }, @@ -154,7 +154,7 @@ /area/submap/groundbase/poi/wildvillage/square/square1) "S" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet, /area/submap/groundbase/poi/wildvillage/square/square1) "V" = ( @@ -169,7 +169,7 @@ /area/submap/groundbase/poi/wildvillage/square/square1) "Y" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 8 }, /turf/simulated/floor/wood, diff --git a/maps/groundbase/southwilds/villagepois/square12.dmm b/maps/groundbase/southwilds/villagepois/square12.dmm index 8a9eb8a9f52..ae911579919 100644 --- a/maps/groundbase/southwilds/villagepois/square12.dmm +++ b/maps/groundbase/southwilds/villagepois/square12.dmm @@ -45,7 +45,7 @@ /area/submap/groundbase/poi/wildvillage/square/square12) "h" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/curtain/open/bed{ color = "#5e0c1d" }, @@ -170,7 +170,7 @@ /area/submap/groundbase/poi/wildvillage/square/square12) "G" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/curtain/open/bed{ color = "#5e0c1d" }, @@ -198,7 +198,7 @@ /obj/structure/table/glass, /obj/random/maintenance/misc, /obj/random/maintenance/misc, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 2; pixel_y = 7 }, diff --git a/maps/groundbase/southwilds/villagepois/square2.dmm b/maps/groundbase/southwilds/villagepois/square2.dmm index 9ccc33902c9..579c8c91f6d 100644 --- a/maps/groundbase/southwilds/villagepois/square2.dmm +++ b/maps/groundbase/southwilds/villagepois/square2.dmm @@ -6,7 +6,7 @@ /obj/structure/table/standard, /obj/random/maintenance/misc, /obj/random/maintenance/misc, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 2; pixel_y = 7 }, @@ -35,7 +35,7 @@ /obj/structure/table/standard, /obj/random/maintenance/misc, /obj/random/maintenance/misc, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 8 }, /turf/simulated/floor/carpet, @@ -65,7 +65,7 @@ /area/submap/groundbase/poi/wildvillage/square/square2) "q" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/curtain/open/bed{ color = "#5e0c1d" }, diff --git a/maps/groundbase/southwilds/villagepois/square3.dmm b/maps/groundbase/southwilds/villagepois/square3.dmm index 96d616076aa..9b713c70aea 100644 --- a/maps/groundbase/southwilds/villagepois/square3.dmm +++ b/maps/groundbase/southwilds/villagepois/square3.dmm @@ -106,7 +106,7 @@ /obj/structure/table/standard, /obj/random/maintenance/misc, /obj/random/maintenance/misc, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 2; pixel_y = 7 }, @@ -114,7 +114,7 @@ /area/submap/groundbase/poi/wildvillage/square/square3) "M" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/curtain/open/bed{ color = "#5e0c1d" }, @@ -128,7 +128,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 8 }, /turf/simulated/floor/wood, diff --git a/maps/groundbase/southwilds/villagepois/square4.dmm b/maps/groundbase/southwilds/villagepois/square4.dmm index f7ab0eb5add..80298db2bd1 100644 --- a/maps/groundbase/southwilds/villagepois/square4.dmm +++ b/maps/groundbase/southwilds/villagepois/square4.dmm @@ -104,7 +104,7 @@ "w" = ( /obj/structure/table/steel, /obj/random/maintenance/misc, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 8 }, /turf/simulated/floor/wood, @@ -133,7 +133,7 @@ /area/submap/groundbase/poi/wildvillage/square/square4) "A" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/curtain/open/bed{ color = "#5e0c1d" }, @@ -230,7 +230,7 @@ /area/submap/groundbase/poi/wildvillage/square/square4) "R" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/curtain/open/bed{ color = "#4287f5" }, diff --git a/maps/groundbase/southwilds/villagepois/square5.dmm b/maps/groundbase/southwilds/villagepois/square5.dmm index 80ab202b9b2..901206a8a7c 100644 --- a/maps/groundbase/southwilds/villagepois/square5.dmm +++ b/maps/groundbase/southwilds/villagepois/square5.dmm @@ -54,11 +54,11 @@ /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, /area/submap/groundbase/poi/wildvillage/square/square5) "T" = ( -/obj/item/weapon/material/minihoe, +/obj/item/material/minihoe, /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, /area/submap/groundbase/poi/wildvillage/square/square5) "V" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, /area/submap/groundbase/poi/wildvillage/square/square5) diff --git a/maps/groundbase/southwilds/villagepois/square6.dmm b/maps/groundbase/southwilds/villagepois/square6.dmm index f6c81ec8c53..41a3ab70e71 100644 --- a/maps/groundbase/southwilds/villagepois/square6.dmm +++ b/maps/groundbase/southwilds/villagepois/square6.dmm @@ -37,7 +37,7 @@ /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, /area/submap/groundbase/poi/wildvillage/square/square6) "A" = ( -/obj/item/weapon/material/minihoe, +/obj/item/material/minihoe, /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, /area/submap/groundbase/poi/wildvillage/square/square6) "E" = ( @@ -58,7 +58,7 @@ /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, /area/submap/groundbase/poi/wildvillage/square/square6) "Y" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, /area/submap/groundbase/poi/wildvillage/square/square6) "Z" = ( diff --git a/maps/groundbase/southwilds/villagepois/square7.dmm b/maps/groundbase/southwilds/villagepois/square7.dmm index f0697e0a253..0ca6e64f530 100644 --- a/maps/groundbase/southwilds/villagepois/square7.dmm +++ b/maps/groundbase/southwilds/villagepois/square7.dmm @@ -25,7 +25,7 @@ /area/submap/groundbase/poi/wildvillage/square/square7) "k" = ( /obj/structure/table/standard, -/obj/item/weapon/book/manual/cook_guide, +/obj/item/book/manual/cook_guide, /turf/simulated/floor/tiled/eris/cafe, /area/submap/groundbase/poi/wildvillage/square/square7) "m" = ( @@ -44,16 +44,16 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ name = "box of measuring cups"; pixel_x = 2; pixel_y = 3; - starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup = 7) + starts_with = list(/obj/item/reagent_containers/glass/beaker/measuring_cup = 7) }, /turf/simulated/floor/tiled/eris/cafe, /area/submap/groundbase/poi/wildvillage/square/square7) "r" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /turf/simulated/floor/lino, @@ -107,7 +107,7 @@ /area/submap/groundbase/poi/wildvillage/square/square7) "D" = ( /obj/structure/table/standard, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/eris/cafe, /area/submap/groundbase/poi/wildvillage/square/square7) "E" = ( @@ -119,22 +119,22 @@ /turf/simulated/floor/tiled/eris/cafe, /area/submap/groundbase/poi/wildvillage/square/square7) "G" = ( -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/peppermill, /obj/structure/closet, /obj/random/donkpocketbox, /obj/machinery/light{ @@ -147,7 +147,7 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/simulated/floor/tiled/eris/cafe, /area/submap/groundbase/poi/wildvillage/square/square7) "J" = ( diff --git a/maps/groundbase/southwilds/villagepois/square9.dmm b/maps/groundbase/southwilds/villagepois/square9.dmm index 33ced322ae3..cbb02214214 100644 --- a/maps/groundbase/southwilds/villagepois/square9.dmm +++ b/maps/groundbase/southwilds/villagepois/square9.dmm @@ -30,7 +30,7 @@ /obj/random/maintenance/misc, /obj/random/maintenance/misc, /obj/random/maintenance/misc, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 8 }, /turf/simulated/floor/wood, @@ -174,7 +174,7 @@ /obj/structure/table/standard, /obj/random/maintenance/misc, /obj/random/maintenance/misc, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 8 }, /turf/simulated/floor/carpet, @@ -198,7 +198,7 @@ /area/submap/groundbase/poi/wildvillage/square/square9) "U" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/curtain/open/bed{ color = "#5e0c1d" }, diff --git a/maps/groundbase/southwilds/villagepois/wide1.dmm b/maps/groundbase/southwilds/villagepois/wide1.dmm index 61060d7d64e..d54412ec272 100644 --- a/maps/groundbase/southwilds/villagepois/wide1.dmm +++ b/maps/groundbase/southwilds/villagepois/wide1.dmm @@ -72,7 +72,7 @@ /area/submap/groundbase/poi/wildvillage/wide/wide1) "p" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 8 }, /turf/simulated/floor/carpet/sblucarpet, @@ -89,7 +89,7 @@ /area/submap/groundbase/poi/wildvillage/wide/wide1) "s" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 8 }, /turf/simulated/floor/wood, @@ -198,7 +198,7 @@ /area/submap/groundbase/poi/wildvillage/wide/wide1) "N" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/curtain/open/bed{ color = "#5e0c1d" }, diff --git a/maps/groundbase/southwilds/villagepois/wide2.dmm b/maps/groundbase/southwilds/villagepois/wide2.dmm index 9322e2c9cf0..0db6a161e0d 100644 --- a/maps/groundbase/southwilds/villagepois/wide2.dmm +++ b/maps/groundbase/southwilds/villagepois/wide2.dmm @@ -125,7 +125,7 @@ /area/submap/groundbase/poi/wildvillage/wide/wide2) "A" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 2; pixel_y = 7 }, @@ -144,7 +144,7 @@ /area/submap/groundbase/poi/wildvillage/wide/wide2) "C" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 2; pixel_y = 7 }, @@ -262,7 +262,7 @@ /area/submap/groundbase/poi/wildvillage/wide/wide2) "Z" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/curtain/open/bed{ color = "#5e0c1d" }, diff --git a/maps/groundbase/southwilds/villagepois/wide3.dmm b/maps/groundbase/southwilds/villagepois/wide3.dmm index 63220d97a93..4614fba78ba 100644 --- a/maps/groundbase/southwilds/villagepois/wide3.dmm +++ b/maps/groundbase/southwilds/villagepois/wide3.dmm @@ -104,7 +104,7 @@ /area/submap/groundbase/poi/wildvillage/wide/wide3) "r" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/curtain/open/bed{ color = "#4287f5" }, @@ -237,7 +237,7 @@ /area/submap/groundbase/poi/wildvillage/wide/wide3) "N" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/random/plushie, /obj/structure/curtain/open/bed{ color = "#5e0c1d" diff --git a/maps/groundbase/southwilds/villagepois/wide4.dmm b/maps/groundbase/southwilds/villagepois/wide4.dmm index 112ab24fd7c..83cb62de6a4 100644 --- a/maps/groundbase/southwilds/villagepois/wide4.dmm +++ b/maps/groundbase/southwilds/villagepois/wide4.dmm @@ -45,7 +45,7 @@ /area/submap/groundbase/poi/wildvillage/wide/wide4) "i" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/random/plushie, /obj/structure/curtain/open/bed, /turf/simulated/floor/carpet/bcarpet, @@ -63,7 +63,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/handcuffs/fuzzy, +/obj/item/handcuffs/fuzzy, /turf/simulated/floor/wmarble, /area/submap/groundbase/poi/wildvillage/wide/wide4) "m" = ( diff --git a/maps/groundbase/southwilds/villagepois/wide5.dmm b/maps/groundbase/southwilds/villagepois/wide5.dmm index 3a4ad205624..c2b8d047c42 100644 --- a/maps/groundbase/southwilds/villagepois/wide5.dmm +++ b/maps/groundbase/southwilds/villagepois/wide5.dmm @@ -52,7 +52,7 @@ /area/submap/groundbase/poi/wildvillage/wide/wide5) "i" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/rainbowdouble, +/obj/item/bedsheet/rainbowdouble, /obj/structure/curtain/open/bed, /obj/machinery/button/windowtint{ id = "village_wide5_bedroom"; @@ -145,7 +145,7 @@ /area/submap/groundbase/poi/wildvillage/wide/wide5) "w" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/rainbowdouble, +/obj/item/bedsheet/rainbowdouble, /obj/random/plushie, /obj/structure/curtain/open/bed{ color = "#5e0c1d" @@ -160,7 +160,7 @@ /area/submap/groundbase/poi/wildvillage/wide/wide5) "z" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 2; pixel_y = 7 }, @@ -274,7 +274,7 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 21 }, /turf/simulated/floor/wmarble, @@ -292,7 +292,7 @@ /area/submap/groundbase/poi/wildvillage/wide/wide5) "W" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/rainbowdouble, +/obj/item/bedsheet/rainbowdouble, /obj/structure/curtain/open/bed{ color = "#4287f5" }, @@ -316,7 +316,7 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = -15 }, diff --git a/maps/groundbase/southwilds/villagepois/wide6.dmm b/maps/groundbase/southwilds/villagepois/wide6.dmm index 42c40b89346..52d998b71bc 100644 --- a/maps/groundbase/southwilds/villagepois/wide6.dmm +++ b/maps/groundbase/southwilds/villagepois/wide6.dmm @@ -50,10 +50,10 @@ /area/submap/groundbase/poi/wildvillage/wide/wide6) "m" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /obj/random/plushie, /obj/structure/curtain/open/privacy, -/obj/item/weapon/paper/wide6, +/obj/item/paper/wide6, /turf/simulated/floor/tiled/white, /area/submap/groundbase/poi/wildvillage/wide/wide6) "n" = ( @@ -111,7 +111,7 @@ /obj/structure/bed/chair/sofa/blue{ dir = 4 }, -/obj/item/weapon/bedsheet/ian, +/obj/item/bedsheet/ian, /turf/simulated/floor/wood, /area/submap/groundbase/poi/wildvillage/wide/wide6) "z" = ( @@ -153,18 +153,18 @@ /area/submap/groundbase/poi/wildvillage/wide/wide6) "K" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/apurrrrfectman, -/obj/item/weapon/book/bundle/custom_library/fiction/beyondthedoor, -/obj/item/weapon/book/bundle/custom_library/fiction/chroniclesofmargatavol1, -/obj/item/weapon/book/bundle/custom_library/fiction/coldmountain, -/obj/item/weapon/book/bundle/custom_library/fiction/ghostship, -/obj/item/weapon/book/bundle/custom_library/fiction/manfromsnowyriver, -/obj/item/weapon/book/bundle/custom_library/fiction/metalglen, -/obj/item/weapon/book/bundle/custom_library/fiction/poemsforarainyday, -/obj/item/weapon/book/bundle/custom_library/fiction/raissue142, -/obj/item/weapon/book/bundle/custom_library/fiction/raissue147, -/obj/item/weapon/book/bundle/custom_library/fiction/silence, -/obj/item/weapon/book/bundle/custom_library/fiction/taleoftherainbowcat, +/obj/item/book/bundle/custom_library/fiction/apurrrrfectman, +/obj/item/book/bundle/custom_library/fiction/beyondthedoor, +/obj/item/book/bundle/custom_library/fiction/chroniclesofmargatavol1, +/obj/item/book/bundle/custom_library/fiction/coldmountain, +/obj/item/book/bundle/custom_library/fiction/ghostship, +/obj/item/book/bundle/custom_library/fiction/manfromsnowyriver, +/obj/item/book/bundle/custom_library/fiction/metalglen, +/obj/item/book/bundle/custom_library/fiction/poemsforarainyday, +/obj/item/book/bundle/custom_library/fiction/raissue142, +/obj/item/book/bundle/custom_library/fiction/raissue147, +/obj/item/book/bundle/custom_library/fiction/silence, +/obj/item/book/bundle/custom_library/fiction/taleoftherainbowcat, /turf/simulated/floor/tiled/white, /area/submap/groundbase/poi/wildvillage/wide/wide6) "L" = ( diff --git a/maps/groundbase/westwilds/westwilds template.dmm b/maps/groundbase/westwilds/westwilds template.dmm index 4b8292828ae..2813d8700b0 100644 --- a/maps/groundbase/westwilds/westwilds template.dmm +++ b/maps/groundbase/westwilds/westwilds template.dmm @@ -5,12 +5,12 @@ /obj/effect/floor_decal/corner/purple{ dir = 5 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) "ab" = ( @@ -255,7 +255,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/machinery/pipedispenser, @@ -447,7 +447,7 @@ /area/submap/groundbase/wilderness/west) "ea" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/light_switch{ dir = 4; pixel_x = 22 @@ -667,7 +667,7 @@ /area/shuttle/axolotl_engineering) "gx" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/alarm/alarms_hidden{ dir = 8; pixel_x = 26 @@ -706,7 +706,7 @@ /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) "gU" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() @@ -741,7 +741,7 @@ "gZ" = ( /obj/structure/table/standard, /obj/item/stack/nanopaste, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/structure/window/reinforced{ dir = 4 }, @@ -994,8 +994,8 @@ /area/groundbase/science/outpost) "jj" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) "js" = ( @@ -1075,18 +1075,18 @@ /obj/structure/railing/grey{ dir = 8 }, -/obj/item/weapon/tank/phoron/pressurized, -/obj/item/weapon/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, /obj/structure/closet/walllocker{ dir = 1; name = "Spare Fuel"; pixel_y = -32 }, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /obj/item/stack/material/tritium{ amount = 25 }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/tiled/techfloor, /area/shuttle/axolotl_engineering) "jS" = ( @@ -1948,7 +1948,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() @@ -2103,7 +2103,7 @@ pixel_x = -26; pixel_y = -8 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) "sw" = ( @@ -2286,8 +2286,8 @@ /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) "uk" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/structure/railing/grey{ dir = 8 }, @@ -2385,7 +2385,7 @@ /area/groundbase/science/outpost/anomaly_lab) "uI" = ( /obj/structure/table/standard, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) "uT" = ( @@ -2697,16 +2697,16 @@ "xj" = ( /obj/structure/table/standard, /obj/machinery/light, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/storage/box/beakers, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_lab) "xn" = ( /obj/machinery/vending/phoronresearch{ dir = 8; name = "Toximate 2556"; - products = list(/obj/item/device/transfer_valve = 3, /obj/item/device/assembly/timer = 6, /obj/item/device/assembly/signaler = 6, /obj/item/device/assembly/prox_sensor = 6, /obj/item/device/assembly/igniter = 12) + products = list(/obj/item/transfer_valve = 3, /obj/item/assembly/timer = 6, /obj/item/assembly/signaler = 6, /obj/item/assembly/prox_sensor = 6, /obj/item/assembly/igniter = 12) }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) @@ -2821,8 +2821,8 @@ /area/groundbase/science/outpost/substation) "yw" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/random/snack, /obj/random/snack, /obj/random/snack, @@ -3262,8 +3262,8 @@ /turf/simulated/floor/outdoors/newdirt, /area/groundbase/science/outpost/toxins_mixing) "BY" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/structure/railing/grey{ dir = 8 }, @@ -3311,8 +3311,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/weapon/tool/screwdriver, -/obj/item/device/assembly_holder/timer_igniter, +/obj/item/tool/screwdriver, +/obj/item/assembly_holder/timer_igniter, /obj/machinery/camera/network/research_outpost{ dir = 4 }, @@ -3376,7 +3376,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/axolotl) "Dn" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -3437,7 +3437,7 @@ /area/groundbase/engineering/solarshed) "DN" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/vending/wallmed1{ pixel_x = 30 }, @@ -3488,8 +3488,8 @@ /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_storage) "Ej" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/structure/handrail{ dir = 1 }, @@ -3734,11 +3734,11 @@ /area/groundbase/science/outpost/toxing_gasworks) "Gg" = ( /obj/structure/table/steel, -/obj/item/device/measuring_tape, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/storage/excavation, +/obj/item/measuring_tape, +/obj/item/tool/wrench, +/obj/item/storage/excavation, /obj/item/stack/flag/yellow, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) "Gh" = ( @@ -3775,8 +3775,8 @@ /area/groundbase/science/outpost/toxins_mixing) "Gq" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen/fountain, +/obj/item/folder/white, +/obj/item/pen/fountain, /obj/machinery/light{ dir = 8 }, @@ -4395,17 +4395,17 @@ /area/groundbase/science/outpost/atmos) "Lg" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/anobattery{ +/obj/item/tool/screwdriver, +/obj/item/anobattery{ pixel_x = 5; pixel_y = 2 }, -/obj/item/weapon/anobattery, -/obj/item/weapon/anobattery{ +/obj/item/anobattery, +/obj/item/anobattery{ pixel_x = -4; pixel_y = 3 }, -/obj/item/weapon/anobattery{ +/obj/item/anobattery{ pixel_x = -5; pixel_y = -3 }, @@ -4476,8 +4476,8 @@ /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, -/obj/item/weapon/storage/belt/archaeology, -/obj/item/weapon/melee/umbrella/random, +/obj/item/storage/belt/archaeology, +/obj/item/melee/umbrella/random, /obj/machinery/alarm{ dir = 1 }, @@ -4651,7 +4651,7 @@ /area/shuttle/axolotl) "NG" = ( /obj/structure/table/standard, -/obj/item/weapon/tank/phoron, +/obj/item/tank/phoron, /obj/machinery/requests_console/preset/research{ pixel_x = -30 }, @@ -4968,7 +4968,7 @@ /area/shuttle/axolotl) "Qi" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/alarm/alarms_hidden{ dir = 8; pixel_x = 26 @@ -4977,11 +4977,11 @@ /area/shuttle/axolotl_q2) "Qm" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/anodevice{ +/obj/item/tool/crowbar, +/obj/item/anodevice{ pixel_x = -2 }, -/obj/item/weapon/anodevice{ +/obj/item/anodevice{ pixel_x = 1 }, /obj/structure/window/reinforced{ @@ -5060,7 +5060,7 @@ /area/shuttle/axolotl) "QY" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/light_switch{ dir = 4; pixel_x = 22 @@ -5201,7 +5201,7 @@ }, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/weapon/tool/wirecutters, +/obj/item/tool/wirecutters, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) "Sb" = ( @@ -5221,11 +5221,11 @@ }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/standard, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/machinery/camera/network/research_outpost{ dir = 8 }, -/obj/item/device/analyzer, +/obj/item/analyzer, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) "Sh" = ( @@ -5297,8 +5297,8 @@ /turf/simulated/floor, /area/groundbase/science/outpost/atmos) "ST" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/structure/handrail, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/closet/walllocker_double/north{ @@ -5334,7 +5334,7 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/item/clothing/glasses/welding, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) @@ -5452,8 +5452,8 @@ /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, -/obj/item/weapon/storage/belt/archaeology, -/obj/item/weapon/melee/umbrella/random, +/obj/item/storage/belt/archaeology, +/obj/item/melee/umbrella/random, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) "UL" = ( @@ -5478,11 +5478,11 @@ /area/shuttle/axolotl) "Vf" = ( /obj/structure/table/steel, -/obj/item/device/measuring_tape, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/storage/excavation, +/obj/item/measuring_tape, +/obj/item/tool/wrench, +/obj/item/storage/excavation, /obj/item/stack/flag/yellow, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /obj/machinery/light, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) @@ -5922,11 +5922,11 @@ /area/groundbase/science/outpost/toxing_gasworks) "YW" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/anodevice{ +/obj/item/tool/crowbar, +/obj/item/anodevice{ pixel_x = -2 }, -/obj/item/weapon/anodevice{ +/obj/item/anodevice{ pixel_x = 1 }, /obj/structure/window/reinforced{ diff --git a/maps/groundbase/westwilds/westwilds1.dmm b/maps/groundbase/westwilds/westwilds1.dmm index 98db54c3970..187eb7aa939 100644 --- a/maps/groundbase/westwilds/westwilds1.dmm +++ b/maps/groundbase/westwilds/westwilds1.dmm @@ -121,11 +121,11 @@ }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/standard, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/machinery/camera/network/research_outpost{ dir = 8 }, -/obj/item/device/analyzer, +/obj/item/analyzer, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) "bs" = ( @@ -318,7 +318,7 @@ /turf/simulated/floor/tiled, /area/groundbase/science/outpost) "cK" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -400,8 +400,8 @@ /turf/simulated/floor, /area/groundbase/engineering/solarshed) "df" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/structure/handrail{ dir = 1 }, @@ -431,7 +431,7 @@ pixel_x = 7; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/glass/bucket{ pixel_x = -3 }, /turf/simulated/floor/tiled/monotile, @@ -962,7 +962,7 @@ /area/groundbase/science/outpost/atmos) "hv" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/alarm/alarms_hidden{ dir = 8; pixel_x = 26; @@ -1499,11 +1499,11 @@ /area/shuttle/axolotl_engineering) "mx" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/anodevice{ +/obj/item/tool/crowbar, +/obj/item/anodevice{ pixel_x = -2 }, -/obj/item/weapon/anodevice{ +/obj/item/anodevice{ pixel_x = 1 }, /obj/structure/window/reinforced{ @@ -1650,8 +1650,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/weapon/tool/screwdriver, -/obj/item/device/assembly_holder/timer_igniter, +/obj/item/tool/screwdriver, +/obj/item/assembly_holder/timer_igniter, /obj/machinery/camera/network/research_outpost{ dir = 4 }, @@ -1770,7 +1770,7 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/item/clothing/glasses/welding, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) @@ -2055,7 +2055,7 @@ /area/groundbase/science/outpost/toxins_lab) "sf" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/light_switch{ dir = 4; pixel_x = 22 @@ -2189,17 +2189,17 @@ /area/shuttle/axolotl) "sS" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/anobattery{ +/obj/item/tool/screwdriver, +/obj/item/anobattery{ pixel_x = 5; pixel_y = 2 }, -/obj/item/weapon/anobattery, -/obj/item/weapon/anobattery{ +/obj/item/anobattery, +/obj/item/anobattery{ pixel_x = -4; pixel_y = 3 }, -/obj/item/weapon/anobattery{ +/obj/item/anobattery{ pixel_x = -5; pixel_y = -3 }, @@ -2508,7 +2508,7 @@ /obj/machinery/vending/phoronresearch{ dir = 8; name = "Toximate 2556"; - products = list(/obj/item/device/transfer_valve = 3, /obj/item/device/assembly/timer = 6, /obj/item/device/assembly/signaler = 6, /obj/item/device/assembly/prox_sensor = 6, /obj/item/device/assembly/igniter = 12) + products = list(/obj/item/transfer_valve = 3, /obj/item/assembly/timer = 6, /obj/item/assembly/signaler = 6, /obj/item/assembly/prox_sensor = 6, /obj/item/assembly/igniter = 12) }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) @@ -2629,18 +2629,18 @@ /obj/structure/railing/grey{ dir = 8 }, -/obj/item/weapon/tank/phoron/pressurized, -/obj/item/weapon/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, /obj/structure/closet/walllocker{ dir = 1; name = "Spare Fuel"; pixel_y = -32 }, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /obj/item/stack/material/tritium{ amount = 25 }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/item/stack/material/tritium{ amount = 25 }, @@ -2950,7 +2950,7 @@ /area/shuttle/axolotl_engineering) "yZ" = ( /obj/structure/table/standard, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) "za" = ( @@ -2967,7 +2967,7 @@ /area/shuttle/axolotl_engineering) "zc" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/light_switch{ dir = 4; pixel_x = 22 @@ -3082,9 +3082,9 @@ "zX" = ( /obj/structure/table/standard, /obj/machinery/light, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/storage/box/beakers, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_lab) "Ah" = ( @@ -3169,8 +3169,8 @@ /area/groundbase/engineering/solarshed) "AJ" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) "AK" = ( @@ -3228,7 +3228,7 @@ /area/groundbase/science/outpost/atmos) "Bh" = ( /obj/structure/table/standard, -/obj/item/weapon/tank/phoron, +/obj/item/tank/phoron, /obj/machinery/requests_console/preset/research{ pixel_x = -30 }, @@ -3350,11 +3350,11 @@ /area/shuttle/axolotl) "BQ" = ( /obj/structure/table/steel, -/obj/item/device/measuring_tape, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/storage/excavation, +/obj/item/measuring_tape, +/obj/item/tool/wrench, +/obj/item/storage/excavation, /obj/item/stack/flag/yellow, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /obj/machinery/light, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) @@ -3468,11 +3468,11 @@ /area/shuttle/axolotl_engineering) "Dj" = ( /obj/structure/table/steel, -/obj/item/device/measuring_tape, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/storage/excavation, +/obj/item/measuring_tape, +/obj/item/tool/wrench, +/obj/item/storage/excavation, /obj/item/stack/flag/yellow, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) "Dk" = ( @@ -4049,8 +4049,8 @@ /area/groundbase/science/outpost/toxing_gasworks) "HN" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen/fountain, +/obj/item/folder/white, +/obj/item/pen/fountain, /obj/machinery/light{ dir = 8 }, @@ -4270,7 +4270,7 @@ pixel_x = -26; pixel_y = -8 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) "IZ" = ( @@ -4281,8 +4281,8 @@ /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) "Jc" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/structure/handrail, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/closet/walllocker_double/north{ @@ -4572,8 +4572,8 @@ /area/submap/groundbase/wilderness/west) "KK" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/random/snack, /obj/random/snack, /obj/random/snack, @@ -4752,8 +4752,8 @@ /turf/simulated/floor, /area/groundbase/engineering/solarshed) "Me" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/structure/railing/grey{ dir = 8 }, @@ -4832,8 +4832,8 @@ /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, -/obj/item/weapon/storage/belt/archaeology, -/obj/item/weapon/melee/umbrella/random, +/obj/item/storage/belt/archaeology, +/obj/item/melee/umbrella/random, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) "MY" = ( @@ -5381,7 +5381,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() @@ -5399,8 +5399,8 @@ /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, -/obj/item/weapon/storage/belt/archaeology, -/obj/item/weapon/melee/umbrella/random, +/obj/item/storage/belt/archaeology, +/obj/item/melee/umbrella/random, /obj/machinery/alarm{ dir = 1 }, @@ -5433,7 +5433,7 @@ /area/shuttle/axolotl_engineering) "RW" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/alarm/alarms_hidden{ dir = 8; pixel_x = 26; @@ -5537,7 +5537,7 @@ }, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/weapon/tool/wirecutters, +/obj/item/tool/wirecutters, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) "SW" = ( @@ -5620,7 +5620,7 @@ /turf/simulated/wall, /area/submap/groundbase/wilderness/west) "TC" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() @@ -5773,7 +5773,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/machinery/pipedispenser, @@ -5810,12 +5810,12 @@ /obj/effect/floor_decal/corner/purple{ dir = 5 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) "VA" = ( @@ -5858,8 +5858,8 @@ /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) "VR" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/structure/railing/grey{ dir = 8 }, @@ -6076,11 +6076,11 @@ /area/groundbase/science/outpost/toxins_hallway) "XD" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/anodevice{ +/obj/item/tool/crowbar, +/obj/item/anodevice{ pixel_x = -2 }, -/obj/item/weapon/anodevice{ +/obj/item/anodevice{ pixel_x = 1 }, /obj/structure/window/reinforced{ diff --git a/maps/groundbase/westwilds/westwilds2.dmm b/maps/groundbase/westwilds/westwilds2.dmm index 6e706981172..62094d097fc 100644 --- a/maps/groundbase/westwilds/westwilds2.dmm +++ b/maps/groundbase/westwilds/westwilds2.dmm @@ -5,12 +5,12 @@ /obj/effect/floor_decal/corner/purple{ dir = 5 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) "ab" = ( @@ -309,7 +309,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/machinery/pipedispenser, @@ -817,7 +817,7 @@ /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) "gU" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() @@ -1127,8 +1127,8 @@ /area/groundbase/science/outpost) "jj" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) "jn" = ( @@ -2052,8 +2052,8 @@ /turf/simulated/floor/tiled, /area/groundbase/science/outpost) "qm" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/structure/railing/grey{ dir = 8 }, @@ -2117,7 +2117,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() @@ -2327,7 +2327,7 @@ pixel_x = -26; pixel_y = -8 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) "sw" = ( @@ -2422,8 +2422,8 @@ /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) "tg" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/structure/handrail{ dir = 1 }, @@ -2667,7 +2667,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/glass/bucket{ pixel_x = -6 }, /turf/simulated/floor/tiled/monotile, @@ -2699,7 +2699,7 @@ /area/groundbase/science/outpost/anomaly_lab) "uI" = ( /obj/structure/table/standard, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) "uL" = ( @@ -2976,8 +2976,8 @@ /turf/simulated/floor/plating, /area/shuttle/axolotl_engineering) "wP" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/structure/handrail, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/closet/walllocker_double/north{ @@ -3031,16 +3031,16 @@ "xj" = ( /obj/structure/table/standard, /obj/machinery/light, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/storage/box/beakers, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_lab) "xn" = ( /obj/machinery/vending/phoronresearch{ dir = 8; name = "Toximate 2556"; - products = list(/obj/item/device/transfer_valve = 3, /obj/item/device/assembly/timer = 6, /obj/item/device/assembly/signaler = 6, /obj/item/device/assembly/prox_sensor = 6, /obj/item/device/assembly/igniter = 12) + products = list(/obj/item/transfer_valve = 3, /obj/item/assembly/timer = 6, /obj/item/assembly/signaler = 6, /obj/item/assembly/prox_sensor = 6, /obj/item/assembly/igniter = 12) }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) @@ -3195,7 +3195,7 @@ /area/groundbase/science/outpost/substation) "yu" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/light_switch{ dir = 4; pixel_x = 22 @@ -3709,8 +3709,8 @@ /area/groundbase/science/outpost/toxins_mixing) "BU" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/random/snack, /obj/random/snack, /obj/random/snack, @@ -3762,8 +3762,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/weapon/tool/screwdriver, -/obj/item/device/assembly_holder/timer_igniter, +/obj/item/tool/screwdriver, +/obj/item/assembly_holder/timer_igniter, /obj/machinery/camera/network/research_outpost{ dir = 4 }, @@ -3858,7 +3858,7 @@ }, /area/submap/groundbase/wilderness/west) "Dn" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -4113,7 +4113,7 @@ /area/groundbase/science/outpost/toxing_gasworks) "Fo" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/alarm/alarms_hidden{ dir = 8; pixel_x = 26; @@ -4234,11 +4234,11 @@ /area/groundbase/science/outpost/toxing_gasworks) "Gg" = ( /obj/structure/table/steel, -/obj/item/device/measuring_tape, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/storage/excavation, +/obj/item/measuring_tape, +/obj/item/tool/wrench, +/obj/item/storage/excavation, /obj/item/stack/flag/yellow, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) "Gl" = ( @@ -4261,8 +4261,8 @@ /area/groundbase/science/outpost/toxins_mixing) "Gq" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen/fountain, +/obj/item/folder/white, +/obj/item/pen/fountain, /obj/machinery/light{ dir = 8 }, @@ -4799,7 +4799,7 @@ /area/groundbase/science/outpost/anomaly_lab) "KP" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/alarm/alarms_hidden{ dir = 8; pixel_x = 26; @@ -4828,17 +4828,17 @@ /area/groundbase/science/outpost/atmos) "Lg" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/anobattery{ +/obj/item/tool/screwdriver, +/obj/item/anobattery{ pixel_x = 5; pixel_y = 2 }, -/obj/item/weapon/anobattery, -/obj/item/weapon/anobattery{ +/obj/item/anobattery, +/obj/item/anobattery{ pixel_x = -4; pixel_y = 3 }, -/obj/item/weapon/anobattery{ +/obj/item/anobattery{ pixel_x = -5; pixel_y = -3 }, @@ -4926,8 +4926,8 @@ /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, -/obj/item/weapon/storage/belt/archaeology, -/obj/item/weapon/melee/umbrella/random, +/obj/item/storage/belt/archaeology, +/obj/item/melee/umbrella/random, /obj/machinery/alarm{ dir = 1 }, @@ -5083,7 +5083,7 @@ /area/submap/groundbase/wilderness/west) "NG" = ( /obj/structure/table/standard, -/obj/item/weapon/tank/phoron, +/obj/item/tank/phoron, /obj/machinery/requests_console/preset/research{ pixel_x = -30 }, @@ -5363,7 +5363,7 @@ /area/groundbase/science/outpost/toxins_mixing) "PX" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/light_switch{ dir = 4; pixel_x = 22 @@ -5406,11 +5406,11 @@ /area/shuttle/axolotl_galley) "Qm" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/anodevice{ +/obj/item/tool/crowbar, +/obj/item/anodevice{ pixel_x = -2 }, -/obj/item/weapon/anodevice{ +/obj/item/anodevice{ pixel_x = 1 }, /obj/structure/window/reinforced{ @@ -5559,7 +5559,7 @@ }, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/weapon/tool/wirecutters, +/obj/item/tool/wirecutters, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) "Sb" = ( @@ -5579,11 +5579,11 @@ }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/standard, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/machinery/camera/network/research_outpost{ dir = 8 }, -/obj/item/device/analyzer, +/obj/item/analyzer, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) "Sh" = ( @@ -5704,7 +5704,7 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/item/clothing/glasses/welding, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) @@ -5772,8 +5772,8 @@ /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, -/obj/item/weapon/storage/belt/archaeology, -/obj/item/weapon/melee/umbrella/random, +/obj/item/storage/belt/archaeology, +/obj/item/melee/umbrella/random, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) "UL" = ( @@ -5796,11 +5796,11 @@ /area/shuttle/axolotl) "Vf" = ( /obj/structure/table/steel, -/obj/item/device/measuring_tape, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/storage/excavation, +/obj/item/measuring_tape, +/obj/item/tool/wrench, +/obj/item/storage/excavation, /obj/item/stack/flag/yellow, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /obj/machinery/light, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) @@ -5852,21 +5852,21 @@ /obj/structure/railing/grey{ dir = 8 }, -/obj/item/weapon/tank/phoron/pressurized, -/obj/item/weapon/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, /obj/structure/closet/walllocker{ dir = 1; name = "Spare Fuel"; pixel_y = -32 }, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /obj/item/stack/material/tritium{ amount = 25 }, /obj/structure/cable{ icon_state = "1-8" }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/item/stack/material/tritium{ amount = 25 }, @@ -6231,11 +6231,11 @@ /area/groundbase/science/outpost/toxing_gasworks) "YW" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/anodevice{ +/obj/item/tool/crowbar, +/obj/item/anodevice{ pixel_x = -2 }, -/obj/item/weapon/anodevice{ +/obj/item/anodevice{ pixel_x = 1 }, /obj/structure/window/reinforced{ @@ -6256,8 +6256,8 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/axolotl_cockpit) "Zb" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/structure/railing/grey{ dir = 8 }, diff --git a/maps/northern_star/polaris-1.dmm b/maps/northern_star/polaris-1.dmm index 7f1d835c4bf..1d1cef83bac 100644 --- a/maps/northern_star/polaris-1.dmm +++ b/maps/northern_star/polaris-1.dmm @@ -18,14 +18,14 @@ "aar" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/airless,/area/mine/unexplored/upper_level) "aas" = (/obj/effect/decal/cleanable/blood/oil/streak{amount = 0},/turf/simulated/floor/airless,/area/mine/unexplored/upper_level) "aat" = (/obj/structure/table/rack,/turf/simulated/floor/airless,/area/mine/unexplored/upper_level) -"aau" = (/obj/structure/table/rack{dir = 1},/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/device/flashlight,/turf/simulated/floor/airless,/area/mine/unexplored/upper_level) +"aau" = (/obj/structure/table/rack{dir = 1},/obj/item/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/flashlight,/turf/simulated/floor/airless,/area/mine/unexplored/upper_level) "aav" = (/obj/effect/decal/cleanable/generic,/turf/simulated/floor/airless,/area/mine/unexplored/upper_level) "aaw" = (/turf/simulated/mineral/ignore_mapgen,/area/mine/unexplored/upper_level) "aax" = (/turf/simulated/wall,/area/maintenance/locker) "aay" = (/obj/structure/grille,/obj/structure/lattice,/turf/space,/area/space) "aaz" = (/obj/structure/grille/broken,/obj/structure/lattice,/turf/space,/area/space) "aaA" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/airless,/area/mine/unexplored/upper_level) -"aaB" = (/obj/item/weapon/pickaxe/drill,/turf/simulated/floor,/area/maintenance/locker) +"aaB" = (/obj/item/pickaxe/drill,/turf/simulated/floor,/area/maintenance/locker) "aaC" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor/airless,/area/mine/unexplored/upper_level) "aaD" = (/obj/structure/door_assembly/door_assembly_mai,/turf/simulated/floor/airless,/area/mine/unexplored/upper_level) "aaE" = (/obj/random/contraband,/obj/random/maintenance/security,/obj/random/maintenance/security,/obj/random/contraband,/turf/simulated/floor,/area/maintenance/locker) @@ -64,7 +64,7 @@ "abl" = (/obj/structure/closet/crate,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/maintenance/clean,/obj/random/toy,/turf/simulated/floor,/area/maintenance/library) "abm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/auxsolarstarboard) "abn" = (/obj/structure/cable/yellow,/obj/machinery/power/solar_control{id = "auxsolareast"; name = "Fore Starboard Solar Control"; track = 0},/turf/simulated/floor,/area/maintenance/auxsolarstarboard) -"abo" = (/obj/item/weapon/stool,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/item/stack/cable_coil/yellow,/obj/item/stack/cable_coil/yellow,/turf/simulated/floor,/area/maintenance/auxsolarstarboard) +"abo" = (/obj/item/stool,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/item/stack/cable_coil/yellow,/obj/item/stack/cable_coil/yellow,/turf/simulated/floor,/area/maintenance/auxsolarstarboard) "abp" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/camera/network/engineering{c_tag = "ENG - Solar Fore Starboard"; dir = 1},/turf/simulated/floor,/area/maintenance/auxsolarstarboard) "abq" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/library) "abr" = (/turf/simulated/floor,/area/maintenance/library) @@ -107,8 +107,8 @@ "acc" = (/obj/structure/lattice,/obj/structure/grille,/turf/space,/area/space) "acd" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor,/area/maintenance/library) "ace" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/library) -"acf" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/lights/mixed,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/library) -"acg" = (/obj/structure/table/rack{dir = 1},/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/device/flashlight,/turf/simulated/floor/plating,/area/maintenance/library) +"acf" = (/obj/structure/table/rack,/obj/item/storage/box/lights/mixed,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/library) +"acg" = (/obj/structure/table/rack{dir = 1},/obj/item/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/flashlight,/turf/simulated/floor/plating,/area/maintenance/library) "ach" = (/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/maintenance/library) "aci" = (/obj/machinery/floodlight,/turf/simulated/floor,/area/maintenance/library) "acj" = (/obj/machinery/cryopod{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/cryo/station) @@ -137,13 +137,13 @@ "acG" = (/turf/simulated/floor/wood,/area/library_conference_room) "acH" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/library_conference_room) "acI" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/wood,/area/library_conference_room) -"acJ" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/packageWrap,/turf/simulated/floor/wood,/area/library_conference_room) +"acJ" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/packageWrap,/turf/simulated/floor/wood,/area/library_conference_room) "acK" = (/turf/simulated/wall,/area/library) "acL" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor,/area/maintenance/library) "acM" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/maintenance/library) "acN" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/airless,/area/shuttle/cryo/station) -"acO" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/light,/obj/structure/closet/emcloset,/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/shuttle/floor,/area/shuttle/cryo/station) -"acP" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/closet/emcloset,/obj/machinery/light,/obj/item/weapon/storage/toolbox/emergency,/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/shuttle/floor,/area/shuttle/cryo/station) +"acO" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/light,/obj/structure/closet/emcloset,/obj/item/storage/toolbox/emergency,/turf/simulated/shuttle/floor,/area/shuttle/cryo/station) +"acP" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/closet/emcloset,/obj/machinery/light,/obj/item/storage/toolbox/emergency,/obj/item/storage/toolbox/emergency,/turf/simulated/shuttle/floor,/area/shuttle/cryo/station) "acQ" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/airless,/area/shuttle/cryo/station) "acR" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/maintenance/locker) "acS" = (/turf/simulated/wall,/area/chapel/chapel_morgue) @@ -168,15 +168,15 @@ "adl" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/newscaster{pixel_x = -30},/turf/simulated/floor/wood,/area/library_conference_room) "adm" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/library_conference_room) "adn" = (/obj/structure/bed/chair/office/dark{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/library_conference_room) -"ado" = (/obj/structure/table/woodentable,/obj/item/weapon/folder/yellow,/obj/item/weapon/pen,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/library_conference_room) -"adp" = (/obj/structure/table/woodentable,/obj/item/weapon/tape_roll,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/library_conference_room) +"ado" = (/obj/structure/table/woodentable,/obj/item/folder/yellow,/obj/item/pen,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/library_conference_room) +"adp" = (/obj/structure/table/woodentable,/obj/item/tape_roll,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/library_conference_room) "adq" = (/obj/structure/table/woodentable,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/library_conference_room) "adr" = (/obj/structure/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/wood,/area/library_conference_room) "ads" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/library_conference_room) -"adt" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/wood,/area/library_conference_room) +"adt" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/wood,/area/library_conference_room) "adu" = (/obj/machinery/door/airlock/glass{frequency = null; id_tag = "cryostorage_shuttle_berth_hatch"; name = "Cryogenic Storage"},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_fore) "adv" = (/obj/machinery/door/airlock/glass{name = "Cryogenic Storage"},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_fore) -"adw" = (/obj/item/weapon/storage/toolbox/syndicate,/obj/structure/closet,/obj/random/contraband,/obj/random/maintenance/clean,/obj/random/maintenance/cargo,/turf/simulated/floor,/area/maintenance/locker) +"adw" = (/obj/item/storage/toolbox/syndicate,/obj/structure/closet,/obj/random/contraband,/obj/random/maintenance/clean,/obj/random/maintenance/cargo,/turf/simulated/floor,/area/maintenance/locker) "adx" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/turf/simulated/floor,/area/maintenance/locker) "ady" = (/obj/structure/morgue,/turf/simulated/floor/tiled/dark,/area/chapel/chapel_morgue) "adz" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/library) @@ -184,9 +184,9 @@ "adB" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/wood,/area/library_conference_room) "adC" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/wood,/area/library_conference_room) "adD" = (/obj/structure/bed/chair/office/dark{dir = 4},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/wood,/area/library_conference_room) -"adE" = (/obj/structure/table/woodentable,/obj/item/weapon/dice/d20,/obj/item/weapon/dice,/turf/simulated/floor/wood,/area/library_conference_room) -"adF" = (/obj/structure/table/woodentable,/obj/item/weapon/book/codex/lore/vir,/turf/simulated/floor/wood,/area/library_conference_room) -"adG" = (/obj/structure/table/woodentable,/obj/item/weapon/deck/cards,/turf/simulated/floor/wood,/area/library_conference_room) +"adE" = (/obj/structure/table/woodentable,/obj/item/dice/d20,/obj/item/dice,/turf/simulated/floor/wood,/area/library_conference_room) +"adF" = (/obj/structure/table/woodentable,/obj/item/book/codex/lore/vir,/turf/simulated/floor/wood,/area/library_conference_room) +"adG" = (/obj/structure/table/woodentable,/obj/item/deck/cards,/turf/simulated/floor/wood,/area/library_conference_room) "adH" = (/obj/structure/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/wood,/area/library_conference_room) "adI" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/wood,/area/library_conference_room) "adJ" = (/turf/simulated/wall,/area/hallway/secondary/civilian_hallway_fore) @@ -225,14 +225,14 @@ "aeq" = (/obj/machinery/atmospherics/valve{dir = 4},/obj/effect/decal/cleanable/spiderling_remains,/turf/simulated/floor,/area/maintenance/library) "aer" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/universal{dir = 4},/turf/simulated/floor/plating,/area/maintenance/library) "aes" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor,/area/maintenance/library) -"aet" = (/obj/structure/closet,/obj/item/device/flashlight,/obj/effect/decal/cleanable/cobweb2,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/library) +"aet" = (/obj/structure/closet,/obj/item/flashlight,/obj/effect/decal/cleanable/cobweb2,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/library) "aeu" = (/obj/structure/sign/directions/engineering{dir = 2; pixel_y = 32; pixel_z = -8},/obj/structure/sign/directions/security{dir = 2; pixel_y = 32},/obj/structure/sign/directions/cargo{dir = 2; pixel_y = 32; pixel_z = 8},/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 1},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_fore) "aev" = (/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) "aew" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) "aex" = (/obj/structure/sign/directions/science{dir = 2; pixel_y = 32; pixel_z = -8},/obj/structure/sign/directions/medical{dir = 2; pixel_y = 32},/obj/structure/sign/directions/evac{pixel_y = 32; pixel_z = 8},/obj/machinery/camera/network/northern_star{c_tag = "Hall - Civilian Primary Fore 1"; dir = 9},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_fore) "aey" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor,/area/maintenance/locker) "aez" = (/obj/item/stack/material/glass/reinforced,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/locker) -"aeA" = (/obj/item/weapon/material/shard{icon_state = "medium"},/obj/item/stack/rods,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/locker) +"aeA" = (/obj/item/material/shard{icon_state = "medium"},/obj/item/stack/rods,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/locker) "aeB" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/locker) "aeC" = (/obj/structure/flora/pottedplant{icon_state = "plant-06"; pixel_y = 8},/obj/structure/table/woodentable,/turf/simulated/floor/lino,/area/chapel/office) "aeD" = (/obj/machinery/newscaster{pixel_y = 32},/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for shutters."; id = "chapel"; name = "Chapel Office Shutters"; pixel_x = -24; pixel_y = 26},/turf/simulated/floor/lino,/area/chapel/office) @@ -246,7 +246,7 @@ "aeL" = (/obj/structure/shuttle/window,/obj/structure/grille,/turf/simulated/shuttle/plating,/area/shuttle/escape_pod1/station) "aeM" = (/turf/simulated/shuttle/wall,/area/shuttle/escape_pod2/station) "aeN" = (/obj/structure/shuttle/window,/obj/structure/grille,/turf/simulated/shuttle/plating,/area/shuttle/escape_pod2/station) -"aeO" = (/obj/structure/table/rack,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/clothing/glasses/sunglasses,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/library) +"aeO" = (/obj/structure/table/rack,/obj/item/flashlight,/obj/item/flashlight,/obj/item/clothing/glasses/sunglasses,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/library) "aeP" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{name = "Library Meeting Room"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood,/area/library_conference_room) "aeQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/library_conference_room) "aeR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/library_conference_room) @@ -268,7 +268,7 @@ "afh" = (/obj/structure/bed/chair,/obj/effect/landmark/start{name = "Chaplain"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/lino,/area/chapel/office) "afi" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/lino,/area/chapel/office) "afj" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/lino,/area/chapel/office) -"afk" = (/obj/structure/table/woodentable,/obj/item/weapon/nullrod,/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/lino,/area/chapel/office) +"afk" = (/obj/structure/table/woodentable,/obj/item/nullrod,/obj/item/reagent_containers/food/drinks/bottle/holywater,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/lino,/area/chapel/office) "afl" = (/obj/structure/table/rack,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/suit/storage/hazardvest,/turf/simulated/floor/plating,/area/maintenance/locker) "afm" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/locker) "afn" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/chapel/chapel_morgue) @@ -284,7 +284,7 @@ "afx" = (/obj/structure/bookcase{name = "bookcase (Adult)"},/turf/simulated/floor/wood,/area/library) "afy" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood,/area/library) "afz" = (/obj/structure/bed/chair/comfy/black{dir = 4},/turf/simulated/floor/carpet,/area/library) -"afA" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/obj/machinery/camera/network/civilian{c_tag = "CIV - Library Fore"; dir = 2},/turf/simulated/floor/carpet,/area/library) +"afA" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/obj/machinery/camera/network/civilian{c_tag = "CIV - Library Fore"; dir = 2},/turf/simulated/floor/carpet,/area/library) "afB" = (/obj/structure/bed/chair/comfy/black{dir = 8},/turf/simulated/floor/carpet,/area/library) "afC" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/wood,/area/library) "afD" = (/obj/structure/bookcase{name = "bookcase (Non-Fiction)"},/turf/simulated/floor/wood,/area/library) @@ -296,12 +296,12 @@ "afJ" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) "afK" = (/obj/structure/closet/emcloset,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_fore) "afL" = (/turf/simulated/wall,/area/chapel/main) -"afM" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp{pixel_y = 10},/obj/machinery/camera/network/civilian{c_tag = "CIV - Chapel Office"; dir = 4},/turf/simulated/floor/lino,/area/chapel/office) -"afN" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen/blue{pixel_x = 5; pixel_y = 5},/turf/simulated/floor/lino,/area/chapel/office) -"afO" = (/obj/structure/table/woodentable,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/weapon/storage/fancy/markers,/turf/simulated/floor/lino,/area/chapel/office) +"afM" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp{pixel_y = 10},/obj/machinery/camera/network/civilian{c_tag = "CIV - Chapel Office"; dir = 4},/turf/simulated/floor/lino,/area/chapel/office) +"afN" = (/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/pen/blue{pixel_x = 5; pixel_y = 5},/turf/simulated/floor/lino,/area/chapel/office) +"afO" = (/obj/structure/table/woodentable,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/storage/fancy/markers,/turf/simulated/floor/lino,/area/chapel/office) "afP" = (/turf/simulated/floor/lino,/area/chapel/office) "afQ" = (/obj/structure/closet/wardrobe/chaplain_black,/obj/machinery/light{dir = 4},/turf/simulated/floor/lino,/area/chapel/office) -"afR" = (/obj/machinery/light/small{dir = 8},/obj/item/weapon/storage/bible,/obj/structure/table/rack,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/clean,/turf/simulated/floor,/area/maintenance/locker) +"afR" = (/obj/machinery/light/small{dir = 8},/obj/item/storage/bible,/obj/structure/table/rack,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/clean,/turf/simulated/floor,/area/maintenance/locker) "afS" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/locker) "afT" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/turf/simulated/floor/tiled/dark,/area/chapel/chapel_morgue) "afU" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/dark,/area/chapel/chapel_morgue) @@ -326,15 +326,15 @@ "agn" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) "ago" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) "agp" = (/obj/structure/disposalpipe/segment,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) -"agq" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/machinery/light/small{dir = 1},/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; frequency = 1480; name = "Confessional Intercom"; pixel_x = 0; pixel_y = 27},/turf/simulated/floor/tiled/dark,/area/chapel/main) +"agq" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/machinery/light/small{dir = 1},/obj/item/radio/intercom{broadcasting = 1; dir = 1; frequency = 1480; name = "Confessional Intercom"; pixel_x = 0; pixel_y = 27},/turf/simulated/floor/tiled/dark,/area/chapel/main) "agr" = (/obj/structure/grille,/obj/structure/window/reinforced/tinted{dir = 1},/obj/structure/window/reinforced/tinted,/obj/structure/window/reinforced/tinted{dir = 4; icon_state = "twindow"},/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/turf/simulated/floor/plating,/area/chapel/main) -"ags" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/light/small{dir = 1},/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; frequency = 1480; name = "Confessional Intercom"; pixel_x = 0; pixel_y = 27},/turf/simulated/floor/tiled/dark,/area/chapel/main) +"ags" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/light/small{dir = 1},/obj/item/radio/intercom{broadcasting = 1; dir = 1; frequency = 1480; name = "Confessional Intercom"; pixel_x = 0; pixel_y = 27},/turf/simulated/floor/tiled/dark,/area/chapel/main) "agt" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/lino,/area/chapel/office) "agu" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/lino,/area/chapel/office) "agv" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/lino,/area/chapel/office) "agw" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/lino,/area/chapel/office) -"agx" = (/obj/structure/closet/wardrobe/grey,/obj/item/weapon/storage/backpack,/obj/item/weapon/storage/backpack,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/locker) -"agy" = (/obj/effect/decal/cleanable/dirt,/obj/item/weapon/cigbutt,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/maintenance/locker) +"agx" = (/obj/structure/closet/wardrobe/grey,/obj/item/storage/backpack,/obj/item/storage/backpack,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/locker) +"agy" = (/obj/effect/decal/cleanable/dirt,/obj/item/cigbutt,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/maintenance/locker) "agz" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/maintenance/locker) "agA" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/chapel/chapel_morgue) "agB" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/light,/turf/simulated/floor/tiled/dark,/area/chapel/chapel_morgue) @@ -344,17 +344,17 @@ "agF" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/detectives_office) "agG" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/detectives_office) "agH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/detectives_office) -"agI" = (/obj/structure/table/reinforced,/obj/item/device/mass_spectrometer/adv,/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/item/device/reagent_scanner,/obj/item/weapon/reagent_containers/syringe,/turf/simulated/floor/tiled/white,/area/security/detectives_office) +"agI" = (/obj/structure/table/reinforced,/obj/item/mass_spectrometer/adv,/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/item/reagent_scanner,/obj/item/reagent_containers/syringe,/turf/simulated/floor/tiled/white,/area/security/detectives_office) "agJ" = (/obj/machinery/dnaforensics,/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor/tiled/white,/area/security/detectives_office) "agK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/cable/green,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/security/detectives_office) -"agL" = (/obj/structure/closet/wardrobe/grey,/obj/item/weapon/storage/backpack,/obj/item/weapon/storage/backpack,/obj/random/maintenance/security,/obj/random/maintenance/security,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/security_starboard) -"agM" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/oxygen,/obj/item/weapon/storage/belt/utility,/obj/item/clothing/mask/breath,/obj/random/maintenance/security,/obj/random/maintenance/security,/obj/random/maintenance/security,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/security_starboard) -"agN" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/extinguisher,/turf/simulated/floor/plating,/area/maintenance/security_starboard) +"agL" = (/obj/structure/closet/wardrobe/grey,/obj/item/storage/backpack,/obj/item/storage/backpack,/obj/random/maintenance/security,/obj/random/maintenance/security,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/security_starboard) +"agM" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/tank/oxygen,/obj/item/storage/belt/utility,/obj/item/clothing/mask/breath,/obj/random/maintenance/security,/obj/random/maintenance/security,/obj/random/maintenance/security,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/security_starboard) +"agN" = (/obj/structure/table/standard,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/mixed,/obj/item/extinguisher,/turf/simulated/floor/plating,/area/maintenance/security_starboard) "agO" = (/obj/structure/mirror{pixel_y = 25},/turf/simulated/floor,/area/maintenance/security_starboard) "agP" = (/turf/simulated/floor,/area/maintenance/security_starboard) -"agQ" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/mime,/obj/item/weapon/pen/crayon/mime,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor,/area/maintenance/security_starboard) -"agR" = (/obj/structure/bed/chair{dir = 1},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/structure/closet/walllocker/emerglocker{pixel_x = -28},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod1/station) -"agS" = (/obj/structure/bed/chair{dir = 1},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/structure/closet/walllocker/emerglocker{pixel_x = -28},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod2/station) +"agQ" = (/obj/structure/bed/padded,/obj/item/bedsheet/mime,/obj/item/pen/crayon/mime,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor,/area/maintenance/security_starboard) +"agR" = (/obj/structure/bed/chair{dir = 1},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/structure/closet/walllocker/emerglocker{pixel_x = -28},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod1/station) +"agS" = (/obj/structure/bed/chair{dir = 1},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/structure/closet/walllocker/emerglocker{pixel_x = -28},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod2/station) "agT" = (/obj/structure/bookcase{name = "bookcase (Fiction)"},/turf/simulated/floor/wood,/area/library) "agU" = (/turf/simulated/floor/carpet,/area/library) "agV" = (/obj/structure/bed/chair/comfy/brown{dir = 8},/turf/simulated/floor/carpet,/area/library) @@ -372,19 +372,19 @@ "ahh" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock{name = "Chapel Office"; req_access = list(27)},/turf/simulated/floor/lino,/area/chapel/office) "ahi" = (/obj/machinery/door/airlock/maintenance{name = "Chapel Maintenance"; req_one_access = list(12,22)},/obj/machinery/door/firedoor,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/locker) "ahj" = (/obj/machinery/door/airlock{name = "Chapel Backroom"; req_access = list(27)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/dark,/area/chapel/chapel_morgue) -"ahk" = (/obj/structure/table/woodentable,/obj/item/device/flash,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/obj/item/device/radio/intercom{broadcasting = 0; dir = 4; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = -21; pixel_y = 0},/turf/simulated/floor/lino,/area/security/detectives_office) -"ahl" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/obj/machinery/light{dir = 1},/turf/simulated/floor/lino,/area/security/detectives_office) -"ahm" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/secure/safe{pixel_x = 6; pixel_y = 28},/obj/item/weapon/storage/photo_album{pixel_y = -10},/obj/item/device/camera_film,/obj/item/device/camera{desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; pixel_x = 2; pixel_y = 3},/turf/simulated/floor/lino,/area/security/detectives_office) -"ahn" = (/obj/structure/bookcase,/obj/item/weapon/book/codex/corp_regs,/turf/simulated/floor/lino,/area/security/detectives_office) -"aho" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/secure/safe{pixel_x = 6; pixel_y = 28},/obj/item/weapon/storage/photo_album{pixel_y = -10},/obj/item/device/camera_film,/obj/item/device/camera{name = "detectives camera"; desc = "A one use - polaroid camera. 30 photos left."; pixel_x = 0; pixel_y = 0; pictures_left = 30},/turf/simulated/floor/lino,/area/security/detectives_office) -"ahp" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/obj/machinery/light{dir = 1},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/lino,/area/security/detectives_office) -"ahq" = (/obj/structure/table/woodentable,/obj/item/device/flash,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/obj/item/device/radio/intercom{broadcasting = 0; dir = 4; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 21; pixel_y = 0},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/lino,/area/security/detectives_office) +"ahk" = (/obj/structure/table/woodentable,/obj/item/flash,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes/dromedaryco,/obj/item/radio/intercom{broadcasting = 0; dir = 4; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = -21; pixel_y = 0},/turf/simulated/floor/lino,/area/security/detectives_office) +"ahl" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green,/obj/machinery/light{dir = 1},/turf/simulated/floor/lino,/area/security/detectives_office) +"ahm" = (/obj/structure/table/woodentable,/obj/item/storage/secure/safe{pixel_x = 6; pixel_y = 28},/obj/item/storage/photo_album{pixel_y = -10},/obj/item/camera_film,/obj/item/camera{desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; pixel_x = 2; pixel_y = 3},/turf/simulated/floor/lino,/area/security/detectives_office) +"ahn" = (/obj/structure/bookcase,/obj/item/book/codex/corp_regs,/turf/simulated/floor/lino,/area/security/detectives_office) +"aho" = (/obj/structure/table/woodentable,/obj/item/storage/secure/safe{pixel_x = 6; pixel_y = 28},/obj/item/storage/photo_album{pixel_y = -10},/obj/item/camera_film,/obj/item/camera{name = "detectives camera"; desc = "A one use - polaroid camera. 30 photos left."; pixel_x = 0; pixel_y = 0; pictures_left = 30},/turf/simulated/floor/lino,/area/security/detectives_office) +"ahp" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green,/obj/machinery/light{dir = 1},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/lino,/area/security/detectives_office) +"ahq" = (/obj/structure/table/woodentable,/obj/item/flash,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes/dromedaryco,/obj/item/radio/intercom{broadcasting = 0; dir = 4; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 21; pixel_y = 0},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/lino,/area/security/detectives_office) "ahr" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/wall/r_wall,/area/security/detectives_office) -"ahs" = (/obj/structure/table/rack,/obj/item/weapon/storage/briefcase/crimekit,/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/weapon/storage/briefcase/crimekit,/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) -"aht" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/swabs{layer = 5},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/item/weapon/folder/red,/obj/item/weapon/folder/blue{pixel_y = -3},/obj/item/weapon/folder/yellow{pixel_y = -5},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) +"ahs" = (/obj/structure/table/rack,/obj/item/storage/briefcase/crimekit,/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/storage/briefcase/crimekit,/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) +"aht" = (/obj/structure/table/reinforced,/obj/item/storage/box/swabs{layer = 5},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/item/folder/red,/obj/item/folder/blue{pixel_y = -3},/obj/item/folder/yellow{pixel_y = -5},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) "ahu" = (/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) -"ahv" = (/obj/structure/table/reinforced,/obj/item/weapon/forensics/sample_kit/powder,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) -"ahw" = (/obj/structure/table/reinforced,/obj/item/weapon/forensics/sample_kit,/obj/item/device/radio/intercom{broadcasting = 0; dir = 4; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) +"ahv" = (/obj/structure/table/reinforced,/obj/item/forensics/sample_kit/powder,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) +"ahw" = (/obj/structure/table/reinforced,/obj/item/forensics/sample_kit,/obj/item/radio/intercom{broadcasting = 0; dir = 4; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) "ahx" = (/obj/structure/table/steel,/turf/simulated/floor,/area/maintenance/security_starboard) "ahy" = (/obj/structure/shuttle/engine/propulsion/burst,/turf/simulated/shuttle/wall,/area/shuttle/escape_pod1/station) "ahz" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_pod_1_hatch"; locked = 1; name = "Escape Pod 1 Hatch"; req_access = list(13)},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod1/station) @@ -425,14 +425,14 @@ "aii" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/maintenance/chapel) "aij" = (/obj/machinery/computer/security/wooden_tv,/turf/simulated/floor/lino,/area/security/detectives_office) "aik" = (/obj/structure/bed/chair/office/dark{dir = 4},/obj/effect/landmark/start{name = "Detective"},/turf/simulated/floor/carpet,/area/security/detectives_office) -"ail" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/table/woodentable,/obj/item/device/taperecorder{pixel_x = -4; pixel_y = 2},/turf/simulated/floor/carpet,/area/security/detectives_office) -"aim" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/weapon/stool/padded,/turf/simulated/floor/carpet,/area/security/detectives_office) +"ail" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/table/woodentable,/obj/item/taperecorder{pixel_x = -4; pixel_y = 2},/turf/simulated/floor/carpet,/area/security/detectives_office) +"aim" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/stool/padded,/turf/simulated/floor/carpet,/area/security/detectives_office) "ain" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/carpet,/area/security/detectives_office) -"aio" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/table/woodentable,/obj/item/device/taperecorder{pixel_x = -4; pixel_y = 2},/turf/simulated/floor/carpet,/area/security/detectives_office) +"aio" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/table/woodentable,/obj/item/taperecorder{pixel_x = -4; pixel_y = 2},/turf/simulated/floor/carpet,/area/security/detectives_office) "aip" = (/obj/structure/bed/chair/office/dark{dir = 8},/obj/effect/landmark/start{name = "Detective"},/turf/simulated/floor/carpet,/area/security/detectives_office) "aiq" = (/obj/structure/table/reinforced,/obj/machinery/computer/med_data/laptop,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) "air" = (/turf/simulated/floor/tiled/white,/area/security/detectives_office) -"ais" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/white,/area/security/detectives_office) +"ais" = (/obj/item/stool/padded,/turf/simulated/floor/tiled/white,/area/security/detectives_office) "ait" = (/obj/machinery/computer/secure_data/detective_computer,/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) "aiu" = (/obj/machinery/light/small{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 9},/turf/simulated/floor,/area/maintenance/security_starboard) "aiv" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/turf/simulated/floor,/area/maintenance/security_starboard) @@ -448,9 +448,9 @@ "aiF" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{req_access = list(12)},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/hallway/secondary/escape/fore_escape_pod_hallway) "aiG" = (/turf/simulated/wall,/area/hallway/secondary/escape/fore_escape_pod_hallway) "aiH" = (/obj/structure/bookcase{name = "bookcase (Religious)"},/turf/simulated/floor/wood,/area/library) -"aiI" = (/obj/structure/table/woodentable,/obj/item/weapon/pen/blue{pixel_x = -5; pixel_y = -1},/obj/item/weapon/pen/red{pixel_x = -1; pixel_y = 3},/obj/item/weapon/book/codex/lore/vir,/turf/simulated/floor/carpet,/area/library) -"aiJ" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/carpet,/area/library) -"aiK" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/carpet,/area/library) +"aiI" = (/obj/structure/table/woodentable,/obj/item/pen/blue{pixel_x = -5; pixel_y = -1},/obj/item/pen/red{pixel_x = -1; pixel_y = 3},/obj/item/book/codex/lore/vir,/turf/simulated/floor/carpet,/area/library) +"aiJ" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/carpet,/area/library) +"aiK" = (/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/carpet,/area/library) "aiL" = (/turf/simulated/floor/wood,/area/library) "aiM" = (/obj/structure/bed/chair/office/dark{dir = 4},/turf/simulated/floor/wood,/area/library) "aiN" = (/obj/machinery/librarypubliccomp,/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/library) @@ -480,15 +480,15 @@ "ajl" = (/obj/machinery/airlock_sensor{frequency = 1379; id_tag = "chapel_maint_sensor"; pixel_x = 0; pixel_y = 25},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; frequency = 1379; id_tag = "chapel_maint_pump"},/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/floor,/area/maintenance/chapel) "ajm" = (/obj/machinery/door/airlock/external{frequency = 1379; icon_state = "door_locked"; id_tag = "chapel_maint_outer"; locked = 1; name = "Chapel Maintenance EVA External Access"; req_access = list(13)},/turf/simulated/floor,/area/maintenance/chapel) "ajn" = (/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/mine/explored/upper_level) -"ajo" = (/obj/structure/closet/secure_closet/detective,/obj/item/weapon/reagent_containers/spray/pepper,/turf/simulated/floor/lino,/area/security/detectives_office) +"ajo" = (/obj/structure/closet/secure_closet/detective,/obj/item/reagent_containers/spray/pepper,/turf/simulated/floor/lino,/area/security/detectives_office) "ajp" = (/turf/simulated/floor/carpet,/area/security/detectives_office) -"ajq" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/item/clothing/glasses/sunglasses,/turf/simulated/floor/carpet,/area/security/detectives_office) +"ajq" = (/obj/structure/table/woodentable,/obj/item/paper_bin,/obj/item/pen,/obj/item/clothing/glasses/sunglasses,/turf/simulated/floor/carpet,/area/security/detectives_office) "ajr" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/hologram/holopad,/turf/simulated/floor/carpet,/area/security/detectives_office) "ajs" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/carpet,/area/security/detectives_office) "ajt" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/reinforced,/obj/machinery/microscope,/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) "aju" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/white,/area/security/detectives_office) "ajv" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/white,/area/security/detectives_office) -"ajw" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/spray/luminol,/obj/item/device/uv_light,/obj/item/clothing/gloves/sterile/latex,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) +"ajw" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/spray/luminol,/obj/item/uv_light,/obj/item/clothing/gloves/sterile/latex,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) "ajx" = (/obj/machinery/door/airlock/glass_external{icon_state = "door_locked"; locked = 1; name = "Escape Pod"},/turf/simulated/floor,/area/maintenance/security_starboard) "ajy" = (/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_pod_1_berth_hatch"; locked = 1; name = "Escape Pod 1"; req_access = list(13)},/turf/simulated/floor/plating,/area/hallway/secondary/escape/fore_escape_pod_hallway) "ajz" = (/obj/structure/sign/pods,/turf/simulated/wall,/area/hallway/secondary/escape/fore_escape_pod_hallway) @@ -500,8 +500,8 @@ "ajF" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/carpet,/area/library) "ajG" = (/obj/structure/bed/chair/comfy/green{dir = 8},/turf/simulated/floor/carpet,/area/library) "ajH" = (/obj/machinery/space_heater,/turf/simulated/floor,/area/storage/emergency_storage/emergency4) -"ajI" = (/obj/structure/table/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency4) -"ajJ" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/extinguisher,/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency4) +"ajI" = (/obj/structure/table/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency4) +"ajJ" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/tank/oxygen,/obj/item/tank/oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/flashlight,/obj/item/flashlight,/obj/item/storage/box/lights/mixed,/obj/item/extinguisher,/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency4) "ajK" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) "ajL" = (/obj/structure/disposalpipe/segment,/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) "ajM" = (/obj/machinery/camera/network/civilian{c_tag = "CIV - Chapel Port"; dir = 4},/turf/simulated/floor/tiled/dark,/area/chapel/main) @@ -540,17 +540,17 @@ "akt" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) "aku" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth{frequency = 1380; id_tag = "escape_pod_1_berth"; pixel_x = -25; pixel_y = 30; tag_door = "escape_pod_1_berth_hatch"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) "akv" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) -"akw" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 22},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) +"akw" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 22},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) "akx" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth{frequency = 1380; id_tag = "escape_pod_2_berth"; pixel_x = -25; pixel_y = 30; tag_door = "escape_pod_2_berth_hatch"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) "aky" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) "akz" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) "akA" = (/obj/structure/disposalpipe/junction{dir = 1; icon_state = "pipe-j2"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) "akB" = (/turf/simulated/floor/tiled/dark,/area/hallway/secondary/escape/fore_escape_pod_hallway) -"akC" = (/obj/structure/bed/chair/comfy/black,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/carpet,/area/library) +"akC" = (/obj/structure/bed/chair/comfy/black,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/carpet,/area/library) "akD" = (/obj/structure/bed/chair/comfy/black,/turf/simulated/floor/carpet,/area/library) "akE" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/carpet,/area/library) -"akF" = (/obj/structure/table/woodentable,/obj/item/device/camera_film,/obj/item/device/camera_film,/turf/simulated/floor/wood,/area/library) -"akG" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/turf/simulated/floor/wood,/area/library) +"akF" = (/obj/structure/table/woodentable,/obj/item/camera_film,/obj/item/camera_film,/turf/simulated/floor/wood,/area/library) +"akG" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/turf/simulated/floor/wood,/area/library) "akH" = (/obj/machinery/newscaster{pixel_x = 30},/obj/machinery/door/window/northright{name = "Library Desk Door"; req_access = list(37)},/turf/simulated/floor/wood,/area/library) "akI" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/storage/emergency_storage/emergency4) "akJ" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/storage/emergency_storage/emergency4) @@ -559,16 +559,16 @@ "akM" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) "akN" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) "akO" = (/obj/structure/disposalpipe/segment,/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) -"akP" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/dark,/area/chapel/main) -"akQ" = (/obj/effect/floor_decal/chapel{icon_state = "chapel"; dir = 1},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/dark,/area/chapel/main) -"akR" = (/obj/effect/floor_decal/chapel{icon_state = "chapel"; dir = 4},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/dark,/area/chapel/main) +"akP" = (/obj/item/stool/padded,/turf/simulated/floor/tiled/dark,/area/chapel/main) +"akQ" = (/obj/effect/floor_decal/chapel{icon_state = "chapel"; dir = 1},/obj/item/stool/padded,/turf/simulated/floor/tiled/dark,/area/chapel/main) +"akR" = (/obj/effect/floor_decal/chapel{icon_state = "chapel"; dir = 4},/obj/item/stool/padded,/turf/simulated/floor/tiled/dark,/area/chapel/main) "akS" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/chapel/main) "akT" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/carpet,/area/chapel/main) "akU" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/dark,/area/chapel/main) "akV" = (/obj/machinery/door/airlock/maintenance{name = "Chapel Maintenance"; req_one_access = list(12,22)},/obj/machinery/door/firedoor,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/chapel) -"akW" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/structure/closet/wardrobe/detective,/turf/simulated/floor/lino,/area/security/detectives_office) +"akW" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/structure/closet/wardrobe/detective,/turf/simulated/floor/lino,/area/security/detectives_office) "akX" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/lino,/area/security/detectives_office) -"akY" = (/obj/structure/table/rack,/obj/item/weapon/storage/briefcase{pixel_x = -2; pixel_y = -5},/obj/item/weapon/storage/briefcase{pixel_x = 3; pixel_y = 0},/obj/machinery/light,/turf/simulated/floor/lino,/area/security/detectives_office) +"akY" = (/obj/structure/table/rack,/obj/item/storage/briefcase{pixel_x = -2; pixel_y = -5},/obj/item/storage/briefcase{pixel_x = 3; pixel_y = 0},/obj/machinery/light,/turf/simulated/floor/lino,/area/security/detectives_office) "akZ" = (/turf/simulated/floor/lino,/area/security/detectives_office) "ala" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/lino,/area/security/detectives_office) "alb" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/camera/network/security{c_tag = "SEC - Detective Office"; dir = 1},/obj/structure/disposalpipe/segment,/obj/structure/flora/pottedplant{icon_state = "plant-10"},/turf/simulated/floor/lino,/area/security/detectives_office) @@ -577,7 +577,7 @@ "ale" = (/obj/structure/noticeboard{pixel_y = -30},/turf/simulated/floor/lino,/area/security/detectives_office) "alf" = (/obj/machinery/door/window/westleft{name = "Forensics Area"; req_access = list(4)},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) "alg" = (/obj/machinery/light,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -25},/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) -"alh" = (/obj/machinery/status_display{pixel_x = 0; pixel_y = -32},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/closet{name = "Evidence Closet"},/obj/item/weapon/storage/box/gloves,/obj/item/weapon/storage/box/evidence,/obj/item/weapon/storage/box/bodybags,/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) +"alh" = (/obj/machinery/status_display{pixel_x = 0; pixel_y = -32},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/closet{name = "Evidence Closet"},/obj/item/storage/box/gloves,/obj/item/storage/box/evidence,/obj/item/storage/box/bodybags,/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) "ali" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) "alj" = (/obj/machinery/light,/obj/machinery/chem_master,/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) "alk" = (/obj/machinery/camera/network/security{c_tag = "SEC - Forensic Office"; dir = 8},/obj/machinery/photocopier,/turf/simulated/floor/tiled/freezer,/area/security/detectives_office) @@ -592,10 +592,10 @@ "alt" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) "alu" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) "alv" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) -"alw" = (/obj/structure/table/woodentable,/obj/item/weapon/paper,/obj/item/weapon/pen,/obj/machinery/newscaster{pixel_x = -30},/turf/simulated/floor/carpet,/area/library) -"alx" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/obj/item/weapon/book/codex/lore/vir,/turf/simulated/floor/carpet,/area/library) +"alw" = (/obj/structure/table/woodentable,/obj/item/paper,/obj/item/pen,/obj/machinery/newscaster{pixel_x = -30},/turf/simulated/floor/carpet,/area/library) +"alx" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/obj/item/book/codex/lore/vir,/turf/simulated/floor/carpet,/area/library) "aly" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/polarized{dir = 1; id = "library_window_tint"},/obj/structure/window/reinforced/polarized{dir = 2; id = "library_window_tint"},/obj/structure/window/reinforced/polarized{dir = 4; id = "library_window_tint"},/obj/structure/window/reinforced/polarized{dir = 8; id = "library_window_tint"},/turf/simulated/floor/plating,/area/library) -"alz" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/briefcase{pixel_x = -2; pixel_y = -5},/obj/item/weapon/storage/briefcase{pixel_x = 3; pixel_y = 0},/obj/machinery/camera/network/civilian{c_tag = "CIV - Library Office"; dir = 2},/turf/simulated/floor/carpet,/area/library) +"alz" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/storage/briefcase{pixel_x = -2; pixel_y = -5},/obj/item/storage/briefcase{pixel_x = 3; pixel_y = 0},/obj/machinery/camera/network/civilian{c_tag = "CIV - Library Office"; dir = 2},/turf/simulated/floor/carpet,/area/library) "alA" = (/obj/structure/bookcase{name = "Forbidden Knowledge"},/turf/simulated/floor/carpet,/area/library) "alB" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/storage/emergency_storage/emergency4) "alC" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor,/area/storage/emergency_storage/emergency4) @@ -634,11 +634,11 @@ "amj" = (/obj/structure/bed/chair/comfy/black{dir = 1},/turf/simulated/floor/carpet,/area/library) "amk" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/turf/simulated/floor/wood,/area/library) "aml" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/library) -"amm" = (/obj/structure/table/woodentable,/obj/item/weapon/pen/red{pixel_x = 2; pixel_y = 6},/obj/item/weapon/pen/blue{pixel_x = 5; pixel_y = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/library) +"amm" = (/obj/structure/table/woodentable,/obj/item/pen/red{pixel_x = 2; pixel_y = 6},/obj/item/pen/blue{pixel_x = 5; pixel_y = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/library) "amn" = (/obj/machinery/door/morgue{dir = 2; name = "Private Study"; req_access = list(37)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/library) "amo" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/carpet,/area/library) "amp" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/carpet,/area/library) -"amq" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 22},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/carpet,/area/library) +"amq" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 22},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/carpet,/area/library) "amr" = (/turf/simulated/wall,/area/medical/first_aid_station_starboard) "ams" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) "amt" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) @@ -646,7 +646,7 @@ "amv" = (/turf/simulated/floor,/area/maintenance/chapel) "amw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/chapel) "amx" = (/turf/simulated/wall/r_wall,/area/security/interrogation) -"amy" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/effect/floor_decal/corner/red{dir = 5},/obj/item/device/radio/intercom{broadcasting = 0; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled,/area/security/brig) +"amy" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/effect/floor_decal/corner/red{dir = 5},/obj/item/radio/intercom{broadcasting = 0; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled,/area/security/brig) "amz" = (/obj/effect/floor_decal/corner/red{dir = 5},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled,/area/security/brig) "amA" = (/obj/effect/floor_decal/corner/red{dir = 5},/turf/simulated/floor/tiled,/area/security/brig) "amB" = (/obj/effect/floor_decal/corner/red{dir = 1},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/security/brig) @@ -661,33 +661,33 @@ "amK" = (/obj/effect/floor_decal/corner/red{dir = 5},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/security/main) "amL" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/corner/red{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/security/main) "amM" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/security/main) -"amN" = (/obj/effect/floor_decal/corner/red{dir = 4},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment,/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_soft/full,/obj/item/weapon/storage/box/glasses/square,/turf/simulated/floor/tiled,/area/security/main) +"amN" = (/obj/effect/floor_decal/corner/red{dir = 4},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment,/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_soft/full,/obj/item/storage/box/glasses/square,/turf/simulated/floor/tiled,/area/security/main) "amO" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/red{dir = 5},/obj/machinery/recharger,/turf/simulated/floor/tiled,/area/security/main) -"amP" = (/obj/structure/table/standard,/obj/machinery/recharger,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/effect/floor_decal/corner/red{dir = 5},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/item/weapon/storage/box/donut,/turf/simulated/floor/tiled,/area/security/main) +"amP" = (/obj/structure/table/standard,/obj/machinery/recharger,/obj/item/reagent_containers/spray/cleaner,/obj/effect/floor_decal/corner/red{dir = 5},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/item/storage/box/donut,/turf/simulated/floor/tiled,/area/security/main) "amQ" = (/obj/effect/floor_decal/corner/red{dir = 5},/obj/machinery/photocopier,/turf/simulated/floor/tiled,/area/security/main) "amR" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/effect/floor_decal/corner/red{dir = 5},/turf/simulated/floor/tiled,/area/security/main) "amS" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/security_lockerroom) "amT" = (/obj/structure/closet/secure_closet/security,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/clothing/glasses/hud/security,/turf/simulated/floor/tiled,/area/security/security_lockerroom) "amU" = (/obj/structure/closet/secure_closet/security,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/clothing/glasses/hud/security,/turf/simulated/floor/tiled,/area/security/security_lockerroom) "amV" = (/obj/structure/closet/secure_closet/security,/obj/machinery/light{dir = 1},/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/clothing/glasses/hud/security,/turf/simulated/floor/tiled,/area/security/security_lockerroom) -"amW" = (/obj/structure/closet/wardrobe/red,/obj/effect/floor_decal/corner/red/full{dir = 8},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/security/security_lockerroom) -"amX" = (/obj/structure/table/standard,/obj/item/device/taperecorder{pixel_y = 0},/obj/item/device/megaphone,/obj/item/weapon/packageWrap,/obj/item/weapon/storage/box,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/effect/floor_decal/corner/red/full{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/item/weapon/hand_labeler,/turf/simulated/floor/tiled,/area/security/security_lockerroom) +"amW" = (/obj/structure/closet/wardrobe/red,/obj/effect/floor_decal/corner/red/full{dir = 8},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/security/security_lockerroom) +"amX" = (/obj/structure/table/standard,/obj/item/taperecorder{pixel_y = 0},/obj/item/megaphone,/obj/item/packageWrap,/obj/item/storage/box,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/effect/floor_decal/corner/red/full{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/item/hand_labeler,/turf/simulated/floor/tiled,/area/security/security_lockerroom) "amY" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) "amZ" = (/obj/structure/undies_wardrobe,/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) -"ana" = (/obj/structure/table/standard,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/item/weapon/soap/nanotrasen,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) +"ana" = (/obj/structure/table/standard,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/item/soap/nanotrasen,/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) "anb" = (/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/obj/structure/urinal{pixel_y = 32},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) "anc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/maintenance/security_starboard) -"and" = (/obj/item/clothing/gloves/rainbow,/obj/item/clothing/head/soft/rainbow,/obj/item/clothing/shoes/rainbow,/obj/item/clothing/under/color/rainbow,/obj/item/weapon/bedsheet/rainbow,/obj/item/weapon/pen/crayon/rainbow,/turf/simulated/floor,/area/maintenance/security_starboard) +"and" = (/obj/item/clothing/gloves/rainbow,/obj/item/clothing/head/soft/rainbow,/obj/item/clothing/shoes/rainbow,/obj/item/clothing/under/color/rainbow,/obj/item/bedsheet/rainbow,/obj/item/pen/crayon/rainbow,/turf/simulated/floor,/area/maintenance/security_starboard) "ane" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) "anf" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) "ang" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) "anh" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/wood,/area/library) "ani" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/wood,/area/library) "anj" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/wood,/area/library) -"ank" = (/obj/structure/table/woodentable,/obj/item/device/taperecorder,/turf/simulated/floor/wood,/area/library) +"ank" = (/obj/structure/table/woodentable,/obj/item/taperecorder,/turf/simulated/floor/wood,/area/library) "anl" = (/obj/machinery/button/windowtint{id = "library_window_tint"; pixel_x = 26; pixel_y = -26},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/carpet,/area/library) "anm" = (/obj/structure/bed/chair/comfy/brown,/obj/effect/landmark/start{name = "Librarian"},/turf/simulated/floor/carpet,/area/library) -"ann" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/obj/structure/table/woodentable,/obj/item/device/tvcamera,/turf/simulated/floor/carpet,/area/library) +"ann" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/obj/structure/table/woodentable,/obj/item/tvcamera,/turf/simulated/floor/carpet,/area/library) "ano" = (/obj/machinery/sleeper{dir = 8},/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) "anp" = (/obj/machinery/sleep_console,/obj/effect/floor_decal/corner/paleblue{dir = 5},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) "anq" = (/obj/effect/floor_decal/corner/paleblue/full{dir = 1},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = 28},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) @@ -701,7 +701,7 @@ "any" = (/turf/simulated/wall,/area/vacant/vacant_site) "anz" = (/obj/machinery/smartfridge/drinks,/turf/simulated/floor/wood,/area/vacant/vacant_site) "anA" = (/obj/structure/table/reinforced,/obj/machinery/reagentgrinder,/turf/simulated/floor,/area/vacant/vacant_site) -"anB" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/light/small{dir = 8},/obj/item/device/radio/intercom/interrogation{dir = 1; pixel_y = 22},/turf/simulated/floor/tiled,/area/security/interrogation) +"anB" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/light/small{dir = 8},/obj/item/radio/intercom/interrogation{dir = 1; pixel_y = 22},/turf/simulated/floor/tiled,/area/security/interrogation) "anC" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/security/interrogation) "anD" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/security{name = "Interrogation Observation"; req_access = list(63)},/turf/simulated/floor/tiled,/area/security/interrogation) "anE" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/turf/simulated/floor/tiled,/area/security/brig) @@ -731,7 +731,7 @@ "aoc" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) "aod" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) "aoe" = (/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) -"aof" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) +"aof" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) "aog" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) "aoh" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) "aoi" = (/obj/machinery/vending/coffee,/turf/simulated/floor/wood,/area/library) @@ -741,29 +741,29 @@ "aom" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/library) "aon" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/wood,/area/library) "aoo" = (/obj/machinery/light,/turf/simulated/floor/wood,/area/library) -"aop" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/wood,/area/library) +"aop" = (/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/wood,/area/library) "aoq" = (/obj/machinery/librarycomp{pixel_y = 0},/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/library) "aor" = (/obj/machinery/libraryscanner,/turf/simulated/floor/wood,/area/library) -"aos" = (/obj/structure/table/woodentable,/obj/item/device/taperecorder{pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/obj/item/device/retail_scanner/civilian{icon_state = "retail_idle"; dir = 1},/obj/item/device/camera,/obj/item/device/tape,/turf/simulated/floor/carpet,/area/library) -"aot" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen/invisible,/obj/item/clothing/under/suit_jacket/red,/obj/machinery/light,/obj/item/weapon/barcodescanner,/turf/simulated/floor/carpet,/area/library) -"aou" = (/obj/structure/table/rack,/obj/item/weapon/storage/firstaid/adv,/obj/item/bodybag/cryobag,/obj/item/weapon/tool/crowbar,/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/structure/sign/poster{pixel_y = 32},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) +"aos" = (/obj/structure/table/woodentable,/obj/item/taperecorder{pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/obj/item/retail_scanner/civilian{icon_state = "retail_idle"; dir = 1},/obj/item/camera,/obj/item/rectape,/turf/simulated/floor/carpet,/area/library) +"aot" = (/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/pen/invisible,/obj/item/clothing/under/suit_jacket/red,/obj/machinery/light,/obj/item/barcodescanner,/turf/simulated/floor/carpet,/area/library) +"aou" = (/obj/structure/table/rack,/obj/item/storage/firstaid/adv,/obj/item/bodybag/cryobag,/obj/item/tool/crowbar,/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/structure/sign/poster{pixel_y = 32},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) "aov" = (/obj/effect/floor_decal/corner/paleblue{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) "aow" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) "aox" = (/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) "aoy" = (/obj/machinery/door/airlock/glass_medical{name = "First-Aid Station"; req_one_access = list(5,10,63)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) "aoz" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) "aoA" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) -"aoB" = (/obj/structure/table/glass,/obj/machinery/status_display{pixel_x = 32; pixel_y = 0},/obj/item/weapon/book/codex/lore/vir,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_fore) -"aoC" = (/obj/effect/floor_decal/chapel{icon_state = "chapel"; dir = 8},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/dark,/area/chapel/main) -"aoD" = (/obj/effect/floor_decal/chapel,/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/dark,/area/chapel/main) -"aoE" = (/obj/effect/floor_decal/chapel{icon_state = "chapel"; dir = 8},/obj/item/weapon/stool/padded,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/chapel/main) +"aoB" = (/obj/structure/table/glass,/obj/machinery/status_display{pixel_x = 32; pixel_y = 0},/obj/item/book/codex/lore/vir,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_fore) +"aoC" = (/obj/effect/floor_decal/chapel{icon_state = "chapel"; dir = 8},/obj/item/stool/padded,/turf/simulated/floor/tiled/dark,/area/chapel/main) +"aoD" = (/obj/effect/floor_decal/chapel,/obj/item/stool/padded,/turf/simulated/floor/tiled/dark,/area/chapel/main) +"aoE" = (/obj/effect/floor_decal/chapel{icon_state = "chapel"; dir = 8},/obj/item/stool/padded,/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/chapel/main) "aoF" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor,/area/vacant/vacant_site) "aoG" = (/turf/simulated/floor/wood,/area/vacant/vacant_site) "aoH" = (/obj/random/drinkbottle,/obj/structure/closet/crate,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/drinkbottle,/turf/simulated/floor/wood,/area/vacant/vacant_site) "aoI" = (/obj/structure/table,/obj/item/stack/material/steel{amount = 2},/obj/random/maintenance/engineering,/turf/simulated/floor,/area/vacant/vacant_site) "aoJ" = (/obj/item/stack/material/wood{amount = 24},/turf/simulated/floor/wood,/area/vacant/vacant_site) "aoK" = (/obj/item/stack/tile/wood,/turf/simulated/floor,/area/vacant/vacant_site) -"aoL" = (/obj/machinery/camera/network/security{c_tag = "SEC - Interrogation Observation"; dir = 4},/obj/structure/table/standard,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/folder/red,/obj/item/weapon/pen,/obj/item/device/radio/intercom{broadcasting = 0; dir = 8; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = -21; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/interrogation) +"aoL" = (/obj/machinery/camera/network/security{c_tag = "SEC - Interrogation Observation"; dir = 4},/obj/structure/table/standard,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/folder/red,/obj/item/pen,/obj/item/radio/intercom{broadcasting = 0; dir = 8; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = -21; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/interrogation) "aoM" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/computer/security/telescreen{layer = 4; name = "Observation Screen"; network = list("Interrogation"); pixel_x = 0; pixel_y = -34},/obj/structure/bed/chair,/turf/simulated/floor/tiled,/area/security/interrogation) "aoN" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/bed/chair,/turf/simulated/floor/tiled,/area/security/interrogation) "aoO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/corner/red{dir = 8},/turf/simulated/floor/tiled,/area/security/brig) @@ -779,13 +779,13 @@ "aoY" = (/obj/structure/grille,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced/polarized{dir = 1},/obj/structure/window/reinforced/polarized,/obj/structure/window/reinforced/polarized{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/heads/hos) "aoZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/corner/red{dir = 8},/obj/machinery/newscaster{pixel_x = -31; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/main) "apa" = (/obj/structure/bed/chair/office/dark{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/landmark/start{name = "Security Officer"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/security/main) -"apb" = (/obj/structure/table/standard,/obj/item/weapon/folder/red,/obj/item/clothing/glasses/hud/security,/turf/simulated/floor/tiled,/area/security/main) -"apc" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/security/main) +"apb" = (/obj/structure/table/standard,/obj/item/folder/red,/obj/item/clothing/glasses/hud/security,/turf/simulated/floor/tiled,/area/security/main) +"apc" = (/obj/structure/table/standard,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/pen,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/security/main) "apd" = (/obj/structure/bed/chair/office/dark{dir = 8},/turf/simulated/floor/tiled,/area/security/main) "ape" = (/turf/simulated/floor/tiled,/area/security/main) -"apf" = (/obj/item/weapon/stool/padded,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/camera/network/security{c_tag = "SEC - Locker Room"; dir = 4},/turf/simulated/floor/tiled/red,/area/security/security_lockerroom) -"apg" = (/obj/item/weapon/stool/padded,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/red,/area/security/security_lockerroom) -"aph" = (/obj/item/weapon/stool/padded,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/turf/simulated/floor/tiled/red,/area/security/security_lockerroom) +"apf" = (/obj/item/stool/padded,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/camera/network/security{c_tag = "SEC - Locker Room"; dir = 4},/turf/simulated/floor/tiled/red,/area/security/security_lockerroom) +"apg" = (/obj/item/stool/padded,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/red,/area/security/security_lockerroom) +"aph" = (/obj/item/stool/padded,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/turf/simulated/floor/tiled/red,/area/security/security_lockerroom) "api" = (/obj/effect/floor_decal/corner/red{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/security/security_lockerroom) "apj" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled,/area/security/security_lockerroom) "apk" = (/obj/machinery/door/airlock{name = "Security Restroom"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/freezer,/area/security/security_lockerroom) @@ -797,8 +797,8 @@ "apq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/library) "apr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/library) "aps" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/library) -"apt" = (/obj/structure/table/glass,/obj/item/weapon/storage/firstaid/regular,/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/newscaster{pixel_x = -31; pixel_y = 0},/obj/random/medical/lite,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) -"apu" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) +"apt" = (/obj/structure/table/glass,/obj/item/storage/firstaid/regular,/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/newscaster{pixel_x = -31; pixel_y = 0},/obj/random/medical/lite,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) +"apu" = (/obj/item/stool/padded,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) "apv" = (/obj/effect/floor_decal/corner/paleblue{dir = 2},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) "apw" = (/obj/structure/bed/roller,/obj/effect/floor_decal/corner/paleblue/full{dir = 4},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green,/obj/machinery/light_switch{pixel_x = 12; pixel_y = -24},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) "apx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/first_aid_station_starboard) @@ -811,18 +811,18 @@ "apE" = (/obj/machinery/door/airlock/glass{name = "Chapel"},/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/dark,/area/chapel/main) "apF" = (/obj/structure/disposalpipe/segment,/obj/item/stack/tile/wood,/turf/simulated/floor,/area/vacant/vacant_site) "apG" = (/obj/structure/table/reinforced,/obj/item/stack/tile/wood,/turf/simulated/floor/wood,/area/vacant/vacant_site) -"apH" = (/obj/structure/table/reinforced,/obj/item/device/flashlight,/turf/simulated/floor/wood,/area/vacant/vacant_site) -"apI" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/drinks/glass2/square{pixel_x = 4; pixel_y = 5},/obj/item/weapon/reagent_containers/food/drinks/glass2/square,/turf/simulated/floor/wood,/area/vacant/vacant_site) +"apH" = (/obj/structure/table/reinforced,/obj/item/flashlight,/turf/simulated/floor/wood,/area/vacant/vacant_site) +"apI" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/drinks/glass2/square{pixel_x = 4; pixel_y = 5},/obj/item/reagent_containers/food/drinks/glass2/square,/turf/simulated/floor/wood,/area/vacant/vacant_site) "apJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/maintenance/chapel) "apK" = (/turf/simulated/wall/r_wall,/area/security/security_equiptment_storage) "apL" = (/obj/structure/window/reinforced/tinted{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced/tinted,/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/interrogation) "apM" = (/obj/structure/window/reinforced/tinted{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced/tinted,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/interrogation) "apN" = (/obj/structure/window/reinforced/tinted{dir = 1},/obj/structure/window/reinforced/tinted{dir = 4; icon_state = "twindow"},/obj/structure/grille,/obj/structure/window/reinforced/tinted,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/interrogation) -"apO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/corner/red{dir = 9},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/security/brig) +"apO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/corner/red{dir = 9},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/security/brig) "apP" = (/obj/effect/floor_decal/corner/red{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/security/brig) "apQ" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/security/evidence_storage) "apR" = (/obj/structure/closet{name = "Evidence Closet"},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/evidence_storage) -"apS" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/machinery/requests_console{announcementConsole = 1; department = "Head of Security's Desk"; departmentType = 5; name = "Head of Security RC"; pixel_x = 0; pixel_y = 30},/obj/structure/table/woodentable,/obj/machinery/recharger{pixel_y = 4},/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{pixel_x = -4; pixel_y = 8},/obj/item/device/taperecorder{pixel_y = 0},/obj/item/device/megaphone,/obj/item/device/radio/off,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) +"apS" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/machinery/requests_console{announcementConsole = 1; department = "Head of Security's Desk"; departmentType = 5; name = "Head of Security RC"; pixel_x = 0; pixel_y = 30},/obj/structure/table/woodentable,/obj/machinery/recharger{pixel_y = 4},/obj/item/reagent_containers/food/drinks/flask/barflask{pixel_x = -4; pixel_y = 8},/obj/item/taperecorder{pixel_y = 0},/obj/item/megaphone,/obj/item/radio/off,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "apT" = (/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "apU" = (/turf/simulated/floor/carpet,/area/crew_quarters/heads/hos) "apV" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/carpet,/area/crew_quarters/heads/hos) @@ -830,8 +830,8 @@ "apX" = (/obj/structure/grille,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/window/reinforced/polarized{dir = 1},/obj/structure/window/reinforced/polarized{dir = 8},/obj/structure/window/reinforced/polarized{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/heads/hos) "apY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/corner/red{dir = 9},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/main) "apZ" = (/obj/structure/bed/chair/office/dark{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/landmark/start{name = "Security Officer"},/obj/structure/disposalpipe/sortjunction/flipped{dir = 1; name = "HoS Office"; sortType = "HoS Office"},/turf/simulated/floor/tiled,/area/security/main) -"aqa" = (/obj/structure/table/standard,/obj/item/weapon/folder/red,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/security/main) -"aqb" = (/obj/structure/table/standard,/obj/item/weapon/folder/red,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/security/main) +"aqa" = (/obj/structure/table/standard,/obj/item/folder/red,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/security/main) +"aqb" = (/obj/structure/table/standard,/obj/item/folder/red,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/security/main) "aqc" = (/obj/structure/bed/chair/office/dark{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/landmark/start{name = "Security Officer"},/turf/simulated/floor/tiled,/area/security/main) "aqd" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/security/main) "aqe" = (/obj/machinery/door/airlock/security{name = "Security Locker Room"; req_access = list(1)},/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/security/security_lockerroom) @@ -847,9 +847,9 @@ "aqo" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{name = "Library"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/library) "aqp" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/library) "aqq" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{name = "Library"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/library) -"aqr" = (/obj/structure/table/glass,/obj/item/device/radio{anchored = 1; broadcasting = 0; canhear_range = 1; frequency = 1487; icon = 'icons/obj/items.dmi'; icon_state = "red_phone"; listening = 1; name = "Medical Emergency Phone"},/obj/effect/floor_decal/corner/paleblue/full,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/firealarm{dir = 8; pixel_x = -24; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) -"aqs" = (/obj/structure/table/glass,/obj/item/weapon/storage/toolbox/emergency,/obj/item/device/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/machinery/camera/network/medbay{c_tag = "MED - FA Station Starboard"; dir = 1},/obj/machinery/recharger,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) -"aqt" = (/obj/effect/floor_decal/corner/paleblue/full{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/table/glass,/obj/item/device/defib_kit/loaded,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) +"aqr" = (/obj/structure/table/glass,/obj/item/radio{anchored = 1; broadcasting = 0; canhear_range = 1; frequency = 1487; icon = 'icons/obj/items.dmi'; icon_state = "red_phone"; listening = 1; name = "Medical Emergency Phone"},/obj/effect/floor_decal/corner/paleblue/full,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/firealarm{dir = 8; pixel_x = -24; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) +"aqs" = (/obj/structure/table/glass,/obj/item/storage/toolbox/emergency,/obj/item/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/machinery/camera/network/medbay{c_tag = "MED - FA Station Starboard"; dir = 1},/obj/machinery/recharger,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) +"aqt" = (/obj/effect/floor_decal/corner/paleblue/full{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/table/glass,/obj/item/defib_kit/loaded,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) "aqu" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/glass{name = "Central Access"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) "aqv" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/airlock/glass{name = "Central Access"},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) "aqw" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass{name = "Central Access"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) @@ -858,13 +858,13 @@ "aqz" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/chapel_hallway) "aqA" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/chapel_hallway) "aqB" = (/turf/simulated/floor,/area/vacant/vacant_site) -"aqC" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/wood,/area/vacant/vacant_site) +"aqC" = (/obj/item/stool/padded,/turf/simulated/floor/wood,/area/vacant/vacant_site) "aqD" = (/obj/machinery/flasher/portable,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) "aqE" = (/obj/machinery/flasher/portable,/obj/machinery/camera/network/security{c_tag = "Armoury"},/obj/machinery/light{dir = 1},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) "aqF" = (/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) -"aqG" = (/obj/item/device/radio/intercom{broadcasting = 0; dir = 1; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) +"aqG" = (/obj/item/radio/intercom{broadcasting = 0; dir = 1; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) "aqH" = (/obj/structure/table/rack,/obj/item/clothing/mask/gas{pixel_x = 3; pixel_y = 3},/obj/item/clothing/mask/gas{pixel_x = 3; pixel_y = 3},/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas{pixel_x = -3; pixel_y = -3},/obj/item/clothing/mask/gas{pixel_x = -3; pixel_y = -3},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = 28},/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) -"aqI" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/seccarts{pixel_x = 3; pixel_y = 2},/obj/item/weapon/storage/box/handcuffs,/obj/item/weapon/storage/box/flashbangs{pixel_x = -2; pixel_y = -2},/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) +"aqI" = (/obj/structure/table/rack,/obj/item/storage/box/seccarts{pixel_x = 3; pixel_y = 2},/obj/item/storage/box/handcuffs,/obj/item/storage/box/flashbangs{pixel_x = -2; pixel_y = -2},/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) "aqJ" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/camera/network/interrogation{c_tag = "INT - Interrogation"},/turf/simulated/floor/tiled/dark,/area/security/interrogation) "aqK" = (/obj/structure/bed/chair,/turf/simulated/floor/tiled/dark,/area/security/interrogation) "aqL" = (/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/security/interrogation) @@ -873,7 +873,7 @@ "aqO" = (/obj/structure/closet{name = "Evidence Closet"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/evidence_storage) "aqP" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled/dark,/area/security/evidence_storage) "aqQ" = (/obj/structure/closet{name = "Evidence Closet"},/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/evidence_storage) -"aqR" = (/obj/machinery/newscaster/security_unit{pixel_x = -30},/obj/machinery/camera/network/security{c_tag = "SEC - HoS' Office"; dir = 4},/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/folder/red_hos,/obj/item/weapon/pen/multi,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) +"aqR" = (/obj/machinery/newscaster/security_unit{pixel_x = -30},/obj/machinery/camera/network/security{c_tag = "SEC - HoS' Office"; dir = 4},/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/folder/red_hos,/obj/item/pen/multi,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "aqS" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "aqT" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hos) "aqU" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/bed/chair,/turf/simulated/floor/carpet,/area/crew_quarters/heads/hos) @@ -881,13 +881,13 @@ "aqW" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "aqX" = (/obj/structure/grille,/obj/structure/cable/green,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/polarized,/obj/structure/window/reinforced/polarized{dir = 8},/obj/structure/window/reinforced/polarized{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/heads/hos) "aqY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/corner/red{dir = 9},/turf/simulated/floor/tiled,/area/security/main) -"aqZ" = (/obj/structure/table/standard,/obj/item/weapon/folder/red,/turf/simulated/floor/tiled,/area/security/main) +"aqZ" = (/obj/structure/table/standard,/obj/item/folder/red,/turf/simulated/floor/tiled,/area/security/main) "ara" = (/obj/structure/bed/chair/office/dark{dir = 8},/obj/effect/landmark/start{name = "Security Officer"},/turf/simulated/floor/tiled,/area/security/main) "arb" = (/obj/effect/floor_decal/corner/red,/obj/machinery/camera/network/security{c_tag = "SEC - Briefing"; dir = 8},/turf/simulated/floor/tiled,/area/security/main) "arc" = (/obj/structure/closet/secure_closet/security,/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/clothing/glasses/hud/security,/turf/simulated/floor/tiled,/area/security/security_lockerroom) "ard" = (/obj/structure/closet/secure_closet/security,/obj/machinery/light,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/clothing/glasses/hud/security,/turf/simulated/floor/tiled,/area/security/security_lockerroom) "are" = (/obj/structure/table/standard,/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -28},/obj/item/clothing/accessory/badge/holo,/obj/item/clothing/accessory/badge/holo,/obj/item/clothing/accessory/badge/holo/cord,/obj/effect/floor_decal/corner/red/full,/turf/simulated/floor/tiled,/area/security/security_lockerroom) -"arf" = (/obj/structure/table/standard,/obj/structure/reagent_dispensers/peppertank{pixel_x = 30},/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -28},/obj/effect/floor_decal/corner/red/full{dir = 4},/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/turf/simulated/floor/tiled,/area/security/security_lockerroom) +"arf" = (/obj/structure/table/standard,/obj/structure/reagent_dispensers/peppertank{pixel_x = 30},/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -28},/obj/effect/floor_decal/corner/red/full{dir = 4},/obj/item/radio,/obj/item/radio,/obj/item/radio,/obj/item/radio,/obj/item/radio,/obj/item/radio,/obj/item/flashlight,/obj/item/flashlight,/obj/item/flashlight,/obj/item/flashlight,/obj/item/flashlight,/obj/item/flashlight,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/turf/simulated/floor/tiled,/area/security/security_lockerroom) "arg" = (/obj/structure/curtain/open/shower/security,/obj/machinery/shower{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/northleft{name = "Shower"; req_access = list()},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) "arh" = (/obj/structure/curtain/open/shower/security,/obj/machinery/shower{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/northright{dir = 1; name = "Shower"; req_access = list()},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) "ari" = (/obj/structure/toilet{dir = 1},/obj/machinery/light/small{brightness_color = "#DA0205"; brightness_power = 1; brightness_range = 5},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) @@ -914,27 +914,27 @@ "arD" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/chapel_hallway) "arE" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/hallway/secondary/chapel_hallway) "arF" = (/obj/structure/table/woodentable,/obj/effect/decal/cleanable/dirt,/obj/item/frame,/turf/simulated/floor,/area/vacant/vacant_site) -"arG" = (/obj/effect/decal/cleanable/dirt,/obj/item/weapon/cigbutt/cigarbutt,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/chapel) +"arG" = (/obj/effect/decal/cleanable/dirt,/obj/item/cigbutt/cigarbutt,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/chapel) "arH" = (/turf/simulated/wall/r_wall,/area/security/armoury) "arI" = (/obj/machinery/flasher/portable,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/window/reinforced,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) "arJ" = (/obj/structure/window/reinforced,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) -"arK" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/light/small{dir = 8},/obj/item/device/radio/intercom/interrogation{dir = 8; pixel_x = -22},/turf/simulated/floor/tiled/dark,/area/security/interrogation) -"arL" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/obj/item/device/taperecorder,/turf/simulated/floor/tiled/dark,/area/security/interrogation) +"arK" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/light/small{dir = 8},/obj/item/radio/intercom/interrogation{dir = 8; pixel_x = -22},/turf/simulated/floor/tiled/dark,/area/security/interrogation) +"arL" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/table/standard,/obj/item/flashlight/lamp,/obj/item/taperecorder,/turf/simulated/floor/tiled/dark,/area/security/interrogation) "arM" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/dark,/area/security/interrogation) "arN" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/security{name = "Interrogation"; req_access = list(63)},/turf/simulated/floor/tiled/dark,/area/security/interrogation) "arO" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/tiled,/area/security/brig) "arP" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/camera/network/security{c_tag = "SEC - Brig Fore Hallway 2"; dir = 8},/turf/simulated/floor/tiled,/area/security/brig) "arQ" = (/turf/simulated/floor/tiled/dark,/area/security/evidence_storage) -"arR" = (/obj/structure/closet{name = "Evidence Closet"},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/evidence_storage) -"arS" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/obj/structure/table/woodentable,/obj/machinery/photocopier/faxmachine{department = "Head of Security"},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) +"arR" = (/obj/structure/closet{name = "Evidence Closet"},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/evidence_storage) +"arS" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/obj/structure/table/woodentable,/obj/machinery/photocopier/faxmachine{department = "Head of Security"},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "arT" = (/obj/machinery/hologram/holopad,/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) -"arU" = (/obj/structure/table/woodentable,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/flashlight/lamp/green{dir = 2; pixel_x = 10; pixel_y = 12},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hos) -"arV" = (/obj/structure/table/woodentable,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/item/weapon/stamp/hos,/turf/simulated/floor/carpet,/area/crew_quarters/heads/hos) +"arU" = (/obj/structure/table/woodentable,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/flashlight/lamp/green{dir = 2; pixel_x = 10; pixel_y = 12},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hos) +"arV" = (/obj/structure/table/woodentable,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/item/stamp/hos,/turf/simulated/floor/carpet,/area/crew_quarters/heads/hos) "arW" = (/obj/structure/table/woodentable,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/computer/skills{pixel_y = 4},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hos) "arX" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "arY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/corner/red{dir = 9},/obj/structure/noticeboard{pixel_x = -32},/turf/simulated/floor/tiled,/area/security/main) "arZ" = (/obj/structure/bed/chair/office/dark{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/security/main) -"asa" = (/obj/structure/table/standard,/obj/item/weapon/book/codex/corp_regs,/turf/simulated/floor/tiled,/area/security/main) +"asa" = (/obj/structure/table/standard,/obj/item/book/codex/corp_regs,/turf/simulated/floor/tiled,/area/security/main) "asb" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled,/area/security/main) "asc" = (/turf/simulated/wall/r_wall,/area/security/security_lockerroom) "asd" = (/turf/simulated/wall/r_wall,/area/security/security_bathroom) @@ -944,7 +944,7 @@ "ash" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "asi" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "asj" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/glass{name = "Civilian Hallway Access"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) -"ask" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) +"ask" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "asl" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "asm" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "asn" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) @@ -954,7 +954,7 @@ "asr" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "ass" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/alarm{pixel_y = 22},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "ast" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) -"asu" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) +"asu" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "asv" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/camera/network/northern_star{c_tag = "Hall - Civilian Aft Starboard 1"; dir = 2},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "asw" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "asx" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) @@ -982,8 +982,8 @@ "asT" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/red{dir = 8},/turf/simulated/floor/tiled,/area/security/brig) "asU" = (/obj/structure/filingcabinet/filingcabinet,/obj/machinery/light_switch{pixel_x = 0; pixel_y = -26},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/tiled/dark,/area/security/evidence_storage) "asV" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/dark,/area/security/evidence_storage) -"asW" = (/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/table/standard,/obj/machinery/camera/network/security{c_tag = "SEC - Evidence Storage"; dir = 8},/obj/item/weapon/storage/laundry_basket,/turf/simulated/floor/tiled/dark,/area/security/evidence_storage) -"asX" = (/obj/machinery/photocopier,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/item/weapon/storage/secure/safe{pixel_x = 5; pixel_y = -28},/obj/machinery/keycard_auth{pixel_x = -26},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) +"asW" = (/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/table/standard,/obj/machinery/camera/network/security{c_tag = "SEC - Evidence Storage"; dir = 8},/obj/item/storage/laundry_basket,/turf/simulated/floor/tiled/dark,/area/security/evidence_storage) +"asX" = (/obj/machinery/photocopier,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/item/storage/secure/safe{pixel_x = 5; pixel_y = -28},/obj/machinery/keycard_auth{pixel_x = -26},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "asY" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green,/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "asZ" = (/obj/structure/bed/chair/comfy/black{dir = 1},/obj/effect/landmark/start{name = "Head of Security"},/obj/machinery/button/remote/airlock{id = "HoSdoor"; name = "Office Door"; pixel_x = -36; pixel_y = 29},/obj/machinery/button/windowtint{pixel_x = -26; pixel_y = 30; req_access = list(58)},/obj/machinery/button/remote/blast_door{id = "security_lockdown"; name = "Brig Lockdown"; pixel_x = -36; pixel_y = 39; req_access = list(2)},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hos) "ata" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) @@ -993,7 +993,7 @@ "ate" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/security/main) "atf" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/security/main) "atg" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/security/main) -"ath" = (/obj/effect/floor_decal/corner/red{dir = 6},/obj/item/device/radio/intercom{broadcasting = 0; dir = 4; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/main) +"ath" = (/obj/effect/floor_decal/corner/red{dir = 6},/obj/item/radio/intercom{broadcasting = 0; dir = 4; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/main) "ati" = (/turf/simulated/wall/r_wall,/area/security/security_cell_hallway) "atj" = (/obj/machinery/cryopod,/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor/tiled/white,/area/security/security_cell_hallway) "atk" = (/obj/machinery/camera/network/security{c_tag = "SEC - Solitary Confinement 1"},/obj/structure/cryofeed,/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/tiled/white,/area/security/security_cell_hallway) @@ -1033,7 +1033,7 @@ "atS" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/chapel_hallway) "atT" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/vacant/vacant_site) "atU" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/vacant/vacant_site) -"atV" = (/obj/effect/decal/cleanable/dirt,/obj/item/weapon/cigbutt/cigarbutt,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor,/area/vacant/vacant_site) +"atV" = (/obj/effect/decal/cleanable/dirt,/obj/item/cigbutt/cigarbutt,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor,/area/vacant/vacant_site) "atW" = (/obj/structure/table/gamblingtable,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/vacant/vacant_site) "atX" = (/obj/structure/table/gamblingtable,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/random/toy,/turf/simulated/floor/wood,/area/vacant/vacant_site) "atY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor,/area/vacant/vacant_site) @@ -1054,7 +1054,7 @@ "aun" = (/obj/machinery/door/airlock/security{name = "Evidence Storage"; req_access = list(1)},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/dark,/area/security/security_processing) "auo" = (/obj/machinery/computer/security,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "aup" = (/obj/machinery/computer/secure_data,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) -"auq" = (/obj/structure/filingcabinet,/obj/item/device/radio/intercom{broadcasting = 0; dir = 2; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) +"auq" = (/obj/structure/filingcabinet,/obj/item/radio/intercom{broadcasting = 0; dir = 2; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "aur" = (/obj/structure/closet/secure_closet/hos,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "aus" = (/obj/structure/grille,/obj/structure/cable/green,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/polarized,/obj/structure/window/reinforced/polarized{dir = 8},/obj/structure/window/reinforced/polarized{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/heads/hos) "aut" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/security/main) @@ -1062,18 +1062,18 @@ "auv" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled,/area/security/main) "auw" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/corner/red{dir = 6},/turf/simulated/floor/tiled,/area/security/main) "aux" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/corner/red/full{dir = 8},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) -"auy" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/structure/table/standard,/obj/item/weapon/paper,/obj/item/weapon/pen,/obj/effect/floor_decal/corner/red/full{dir = 1},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) -"auz" = (/obj/machinery/light/small{dir = 8},/obj/structure/table/standard,/obj/item/weapon/paper,/obj/item/weapon/pen,/obj/effect/floor_decal/corner/red/full{dir = 8},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) +"auy" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/structure/table/standard,/obj/item/paper,/obj/item/pen,/obj/effect/floor_decal/corner/red/full{dir = 1},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) +"auz" = (/obj/machinery/light/small{dir = 8},/obj/structure/table/standard,/obj/item/paper,/obj/item/pen,/obj/effect/floor_decal/corner/red/full{dir = 8},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) "auA" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/corner/red/full{dir = 1},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) -"auB" = (/obj/item/weapon/stool,/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/machinery/camera/network/security{c_tag = "SEC - Riot Control"; dir = 4},/turf/simulated/floor,/area/security/riot_control) +"auB" = (/obj/item/stool,/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/machinery/camera/network/security{c_tag = "SEC - Riot Control"; dir = 4},/turf/simulated/floor,/area/security/riot_control) "auC" = (/obj/machinery/atmospherics/valve,/turf/simulated/floor,/area/security/riot_control) "auD" = (/turf/simulated/floor,/area/security/riot_control) -"auE" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor,/area/security/riot_control) +"auE" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor,/area/security/riot_control) "auF" = (/obj/machinery/door/airlock/atmos{name = "Riot Control Maintenance"; req_access = newlist(); req_one_access = list(2,12,24)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/security/riot_control) "auG" = (/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "security_lockdown"; name = "Security Blast Door"; opacity = 0},/turf/simulated/floor,/area/maintenance/security_starboard) "auH" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor,/area/maintenance/security_starboard) "auI" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/maintenance/security_starboard) -"auJ" = (/obj/structure/closet,/obj/item/clothing/glasses/welding,/obj/item/weapon/weldingtool,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/security,/obj/random/maintenance/security,/turf/simulated/floor/plating,/area/maintenance/security_starboard) +"auJ" = (/obj/structure/closet,/obj/item/clothing/glasses/welding,/obj/item/weldingtool,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/security,/obj/random/maintenance/security,/turf/simulated/floor/plating,/area/maintenance/security_starboard) "auK" = (/obj/structure/closet/emcloset,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_aft) "auL" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "auM" = (/obj/machinery/door/airlock/glass{name = "Civilian Hallway Access"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) @@ -1103,9 +1103,9 @@ "avk" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/wood,/area/vacant/vacant_site) "avl" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/vacant/vacant_site) "avm" = (/obj/structure/table/gamblingtable,/turf/simulated/floor/wood,/area/vacant/vacant_site) -"avn" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/table/gamblingtable,/obj/effect/decal/cleanable/dirt,/obj/item/weapon/deck/cards,/turf/simulated/floor,/area/vacant/vacant_site) +"avn" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/table/gamblingtable,/obj/effect/decal/cleanable/dirt,/obj/item/deck/cards,/turf/simulated/floor,/area/vacant/vacant_site) "avo" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/chapel) -"avp" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/gun/energy/gun{pixel_x = 3; pixel_y = 3},/obj/item/weapon/gun/energy/gun,/obj/effect/floor_decal/corner/blue/full{dir = 8},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/light{dir = 8},/obj/machinery/door/window/brigdoor/eastleft{name = "Energy"},/turf/simulated/floor/tiled/dark,/area/security/armoury) +"avp" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/item/gun/energy/gun{pixel_x = 3; pixel_y = 3},/obj/item/gun/energy/gun,/obj/effect/floor_decal/corner/blue/full{dir = 8},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/light{dir = 8},/obj/machinery/door/window/brigdoor/eastleft{name = "Energy"},/turf/simulated/floor/tiled/dark,/area/security/armoury) "avq" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/dark,/area/security/armoury) "avr" = (/turf/simulated/floor/tiled/dark,/area/security/armoury) "avs" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled/dark,/area/security/armoury) @@ -1113,17 +1113,17 @@ "avu" = (/obj/structure/closet/bombclosetsecurity,/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/window/reinforced,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) "avv" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/security_equiptment_storage) "avw" = (/obj/machinery/computer/prisoner,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/effect/floor_decal/industrial/outline/grey,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/dark,/area/security/warden) -"avx" = (/obj/structure/filingcabinet/chestdrawer,/obj/effect/floor_decal/industrial/outline/grey,/obj/item/device/radio/intercom{broadcasting = 0; dir = 1; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled/dark,/area/security/warden) -"avy" = (/obj/structure/table/reinforced,/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = 26},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/camera/network/security{c_tag = "SEC - Warden's Office"},/obj/item/weapon/tool/crowbar,/obj/item/device/radio/off,/obj/item/weapon/tool/wrench,/obj/item/device/retail_scanner/security,/turf/simulated/floor/tiled/dark,/area/security/warden) +"avx" = (/obj/structure/filingcabinet/chestdrawer,/obj/effect/floor_decal/industrial/outline/grey,/obj/item/radio/intercom{broadcasting = 0; dir = 1; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled/dark,/area/security/warden) +"avy" = (/obj/structure/table/reinforced,/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = 26},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/camera/network/security{c_tag = "SEC - Warden's Office"},/obj/item/tool/crowbar,/obj/item/radio/off,/obj/item/tool/wrench,/obj/item/retail_scanner/security,/turf/simulated/floor/tiled/dark,/area/security/warden) "avz" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/light_switch{pixel_x = 14; pixel_y = 24},/obj/machinery/photocopier,/turf/simulated/floor/tiled/dark,/area/security/warden) "avA" = (/obj/machinery/newscaster/security_unit{pixel_x = 0; pixel_y = 30},/obj/structure/table/reinforced,/obj/machinery/photocopier/faxmachine{department = "Warden's Office"},/turf/simulated/floor/tiled/dark,/area/security/warden) -"avB" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/obj/item/weapon/clipboard,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/folder/red,/obj/item/weapon/pen,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/dark,/area/security/warden) +"avB" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/obj/item/clipboard,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/folder/red,/obj/item/pen,/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/dark,/area/security/warden) "avC" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/red{dir = 9},/turf/simulated/floor/tiled,/area/security/brig) "avD" = (/obj/effect/floor_decal/corner/red{dir = 6},/turf/simulated/floor/tiled,/area/security/brig) "avE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/security_processing) -"avF" = (/obj/structure/table/standard,/obj/item/weapon/folder/red,/obj/item/weapon/folder/red{pixel_x = 2; pixel_y = 4},/obj/item/weapon/hand_labeler,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/effect/floor_decal/corner/red/full{dir = 8},/turf/simulated/floor/tiled,/area/security/security_processing) +"avF" = (/obj/structure/table/standard,/obj/item/folder/red,/obj/item/folder/red{pixel_x = 2; pixel_y = 4},/obj/item/hand_labeler,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/effect/floor_decal/corner/red/full{dir = 8},/turf/simulated/floor/tiled,/area/security/security_processing) "avG" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/red{dir = 1},/turf/simulated/floor/tiled,/area/security/security_processing) -"avH" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/security/security_processing) +"avH" = (/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/security/security_processing) "avI" = (/obj/effect/floor_decal/corner/red{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/security/security_processing) "avJ" = (/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/obj/effect/floor_decal/corner/red/full{dir = 1},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/tiled,/area/security/security_processing) "avK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_security{name = "Briefing Room"; req_access = list(1)},/turf/simulated/floor/tiled,/area/security/main) @@ -1138,11 +1138,11 @@ "avT" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/effect/floor_decal/corner/red{dir = 4},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) "avU" = (/obj/machinery/computer/area_atmos/area,/turf/simulated/floor,/area/security/riot_control) "avV" = (/obj/machinery/atmospherics/binary/pump,/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/security/riot_control) -"avW" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/portable_atmospherics/powered/scrubber,/obj/item/weapon/tool/wrench,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/security/riot_control) +"avW" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/portable_atmospherics/powered/scrubber,/obj/item/tool/wrench,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/security/riot_control) "avX" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor,/area/maintenance/security_starboard) "avY" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/maintenance/security_starboard) "avZ" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/maintenance/security_starboard) -"awa" = (/obj/structure/sign/directions/cargo{dir = 2; pixel_x = -32; pixel_z = 8},/obj/structure/sign/directions/medical{dir = 2; pixel_x = -32},/obj/structure/sign/directions/engineering{dir = 2; pixel_x = -32; pixel_z = -8},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_aft) +"awa" = (/obj/structure/sign/directions/cargo{dir = 2; pixel_x = -32; pixel_z = 8},/obj/structure/sign/directions/medical{dir = 2; pixel_x = -32},/obj/structure/sign/directions/engineering{dir = 2; pixel_x = -32; pixel_z = -8},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_aft) "awb" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_aft) "awc" = (/obj/structure/flora/pottedplant{icon_state = "plant-22"},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_aft) "awd" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_aft) @@ -1150,35 +1150,35 @@ "awf" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/civilian_hallway_aft) "awg" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/civilian_hallway_aft) "awh" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/sign/directions/engineering{dir = 2; pixel_y = -32; pixel_z = 8},/obj/structure/sign/directions/security{dir = 2; pixel_y = -32},/obj/structure/sign/directions/cargo{dir = 2; pixel_y = -32; pixel_z = -8},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_aft) -"awi" = (/obj/structure/sign/directions/science{dir = 2; pixel_y = -32; pixel_z = 8},/obj/structure/sign/directions/medical{dir = 2; pixel_y = -32},/obj/structure/sign/directions/evac{pixel_y = -32; pixel_z = -8},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/obj/structure/flora/pottedplant{icon_state = "plant-22"},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_aft) +"awi" = (/obj/structure/sign/directions/science{dir = 2; pixel_y = -32; pixel_z = 8},/obj/structure/sign/directions/medical{dir = 2; pixel_y = -32},/obj/structure/sign/directions/evac{pixel_y = -32; pixel_z = -8},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/obj/structure/flora/pottedplant{icon_state = "plant-22"},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_aft) "awj" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green,/turf/simulated/floor/wood,/area/vacant/vacant_site) "awk" = (/obj/structure/bed/chair/comfy/brown{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/vacant/vacant_site) "awl" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/effect/decal/cleanable/dirt,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/turf/simulated/floor,/area/maintenance/chapel) "awm" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/maintenance/chapel) -"awn" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/item/weapon/gun/energy/ionrifle{pixel_y = -3},/obj/item/weapon/gun/energy/ionrifle{pixel_x = -2; pixel_y = -5},/obj/effect/floor_decal/corner/blue/full,/obj/machinery/door/window/brigdoor/eastright{name = "Energy"},/turf/simulated/floor/tiled/dark,/area/security/armoury) +"awn" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/item/gun/energy/ionrifle{pixel_y = -3},/obj/item/gun/energy/ionrifle{pixel_x = -2; pixel_y = -5},/obj/effect/floor_decal/corner/blue/full,/obj/machinery/door/window/brigdoor/eastright{name = "Energy"},/turf/simulated/floor/tiled/dark,/area/security/armoury) "awo" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/security/armoury) "awp" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/dark,/area/security/armoury) "awq" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/security/armoury) -"awr" = (/obj/structure/sign/securearea{name = "\improper ARMORY"; pixel_x = -32; pixel_y = 0},/obj/structure/window/reinforced{dir = 1},/obj/structure/table/rack,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/weapon/gun/energy/taser,/obj/item/weapon/gun/energy/taser,/obj/item/weapon/gun/energy/taser,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/gun/energy/stunrevolver,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) -"aws" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/rack,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/reagent_containers/spray/pepper,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) +"awr" = (/obj/structure/sign/securearea{name = "\improper ARMORY"; pixel_x = -32; pixel_y = 0},/obj/structure/window/reinforced{dir = 1},/obj/structure/table/rack,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/gun/energy/taser,/obj/item/gun/energy/taser,/obj/item/gun/energy/taser,/obj/item/gun/energy/stunrevolver,/obj/item/gun/energy/stunrevolver,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) +"aws" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/rack,/obj/item/reagent_containers/spray/pepper,/obj/item/reagent_containers/spray/pepper,/obj/item/reagent_containers/spray/pepper,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) "awt" = (/obj/structure/closet/l3closet/security,/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) "awu" = (/obj/structure/closet/l3closet/security,/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/window/reinforced{dir = 1},/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/camera/network/security{c_tag = "SEC - Equipment Storage"; dir = 9},/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) "awv" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/security_equiptment_storage) "aww" = (/turf/simulated/floor/tiled/dark,/area/security/warden) "awx" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/security/warden) "awy" = (/obj/structure/bed/chair/office/dark{dir = 1},/obj/machinery/button/remote/blast_door{id = "security_lockdown"; name = "Brig Lockdown"; pixel_x = 36; pixel_y = 18; req_access = list(2)},/obj/machinery/button/remote/blast_door{id = "brigobs"; name = "Observation Shutters"; pixel_x = 24; pixel_y = 18; req_access = list(2)},/turf/simulated/floor/tiled/dark,/area/security/warden) -"awz" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/obj/item/weapon/material/ashtray/glass,/obj/structure/window/reinforced,/obj/item/weapon/book/codex/corp_regs,/obj/item/weapon/stamp/denied{pixel_x = 5},/obj/item/weapon/stamp/ward,/turf/simulated/floor/tiled/dark,/area/security/warden) +"awz" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/obj/item/material/ashtray/glass,/obj/structure/window/reinforced,/obj/item/book/codex/corp_regs,/obj/item/stamp/denied{pixel_x = 5},/obj/item/stamp/ward,/turf/simulated/floor/tiled/dark,/area/security/warden) "awA" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/effect/floor_decal/corner/red{dir = 1},/turf/simulated/floor/tiled,/area/security/brig) "awB" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/effect/floor_decal/corner/red{dir = 4},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/security/brig) "awC" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/security_processing) -"awD" = (/obj/structure/table/standard,/obj/item/device/taperecorder,/obj/effect/floor_decal/corner/red{dir = 1},/turf/simulated/floor/tiled,/area/security/security_processing) +"awD" = (/obj/structure/table/standard,/obj/item/taperecorder,/obj/effect/floor_decal/corner/red{dir = 1},/turf/simulated/floor/tiled,/area/security/security_processing) "awE" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/security/security_processing) -"awF" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor/tiled,/area/security/security_processing) +"awF" = (/obj/structure/table/standard,/obj/item/flashlight/lamp,/turf/simulated/floor/tiled,/area/security/security_processing) "awG" = (/obj/structure/bed/chair,/turf/simulated/floor/tiled,/area/security/security_processing) -"awH" = (/obj/effect/floor_decal/corner/red{dir = 4},/obj/item/device/radio/intercom{broadcasting = 0; dir = 4; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/security_processing) -"awI" = (/obj/structure/table/standard,/obj/item/device/healthanalyzer,/obj/item/stack/medical/bruise_pack{pixel_x = -4; pixel_y = 3},/obj/item/stack/medical/bruise_pack{pixel_x = 10},/obj/item/stack/medical/ointment{pixel_y = 10},/obj/machinery/alarm{pixel_y = 22},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/random/medical/lite,/turf/simulated/floor/tiled/white,/area/security/security_aid_station) -"awJ" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/syringe/inaprovaline,/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = -2; pixel_y = 5},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_y = 10},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/machinery/light_switch{pixel_x = 14; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/white,/area/security/security_aid_station) -"awK" = (/obj/structure/table/standard,/obj/item/bodybag/cryobag{pixel_x = 6},/obj/item/weapon/storage/firstaid/regular{pixel_x = 5; pixel_y = 5},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/security/security_aid_station) +"awH" = (/obj/effect/floor_decal/corner/red{dir = 4},/obj/item/radio/intercom{broadcasting = 0; dir = 4; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/security_processing) +"awI" = (/obj/structure/table/standard,/obj/item/healthanalyzer,/obj/item/stack/medical/bruise_pack{pixel_x = -4; pixel_y = 3},/obj/item/stack/medical/bruise_pack{pixel_x = 10},/obj/item/stack/medical/ointment{pixel_y = 10},/obj/machinery/alarm{pixel_y = 22},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/random/medical/lite,/turf/simulated/floor/tiled/white,/area/security/security_aid_station) +"awJ" = (/obj/structure/table/standard,/obj/item/reagent_containers/syringe/inaprovaline,/obj/item/reagent_containers/syringe/inaprovaline{pixel_x = -2; pixel_y = 5},/obj/item/reagent_containers/syringe/inaprovaline{pixel_y = 10},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/machinery/light_switch{pixel_x = 14; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/white,/area/security/security_aid_station) +"awK" = (/obj/structure/table/standard,/obj/item/bodybag/cryobag{pixel_x = 6},/obj/item/storage/firstaid/regular{pixel_x = 5; pixel_y = 5},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/security/security_aid_station) "awL" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/security_aid_station) "awM" = (/obj/machinery/vending/coffee,/obj/effect/floor_decal/corner/red/full{dir = 8},/turf/simulated/floor/tiled,/area/security/brig) "awN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/security/brig) @@ -1192,7 +1192,7 @@ "awV" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/plushie/beepsky,/obj/machinery/light/small{dir = 1},/turf/simulated/floor,/area/maintenance/security_starboard) "awW" = (/obj/item/tape/atmos,/obj/machinery/door/airlock/maintenance{req_access = list(12)},/turf/simulated/floor,/area/maintenance/security_starboard) "awX" = (/obj/random/obstruction,/turf/simulated/floor,/area/maintenance/security_starboard) -"awY" = (/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,/turf/simulated/floor,/area/maintenance/security_starboard) +"awY" = (/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris,/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris,/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris,/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris,/turf/simulated/floor,/area/maintenance/security_starboard) "awZ" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/glass{name = "Civilian Hallway Access"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "axa" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/airlock/glass{name = "Civilian Hallway Access"},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "axb" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass{name = "Civilian Hallway Access"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) @@ -1203,7 +1203,7 @@ "axg" = (/obj/machinery/door/airlock/glass{name = "Recreation Area"},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "axh" = (/obj/machinery/door/airlock/glass{name = "Recreation Area"},/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "axi" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/maintenance{req_access = list(12)},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/chapel) -"axj" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/item/weapon/gun/projectile/shotgun/pump{pixel_x = -3; pixel_y = 3},/obj/item/weapon/gun/projectile/shotgun/pump,/obj/effect/floor_decal/corner/green/full,/obj/machinery/door/window/brigdoor/eastright{name = "Ballistics"},/turf/simulated/floor/tiled/dark,/area/security/armoury) +"axj" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/item/gun/projectile/shotgun/pump{pixel_x = -3; pixel_y = 3},/obj/item/gun/projectile/shotgun/pump,/obj/effect/floor_decal/corner/green/full,/obj/machinery/door/window/brigdoor/eastright{name = "Ballistics"},/turf/simulated/floor/tiled/dark,/area/security/armoury) "axk" = (/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -30},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/armoury) "axl" = (/obj/machinery/door/airlock/highsecurity{name = "Secure Armoury Section"; req_access = list(3)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/dark,/area/security/armoury) "axm" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) @@ -1217,7 +1217,7 @@ "axu" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/dark,/area/security/warden) "axv" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/security/warden) "axw" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/security/warden) -"axx" = (/obj/structure/table/reinforced,/obj/item/weapon/hand_labeler,/obj/machinery/door/window/brigdoor/eastleft{name = "Warden's Desk"; req_access = list(1)},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/door/window/westright{name = "Warden's Desk"; req_access = list(3)},/turf/simulated/floor/tiled/dark,/area/security/warden) +"axx" = (/obj/structure/table/reinforced,/obj/item/hand_labeler,/obj/machinery/door/window/brigdoor/eastleft{name = "Warden's Desk"; req_access = list(1)},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/door/window/westright{name = "Warden's Desk"; req_access = list(3)},/turf/simulated/floor/tiled/dark,/area/security/warden) "axy" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/security/brig) "axz" = (/turf/simulated/floor/tiled,/area/security/brig) "axA" = (/obj/machinery/door/airlock/glass_security{name = "Security Processing"; req_access = list(1)},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/security/security_processing) @@ -1244,7 +1244,7 @@ "axV" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/corner/red{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/computer/cryopod{density = 0; layer = 3.3; pixel_y = 32},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) "axW" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/tiled,/area/security/security_cell_hallway) "axX" = (/obj/effect/floor_decal/corner/red{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) -"axY" = (/obj/effect/floor_decal/corner/red{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/item/device/radio/intercom{broadcasting = 0; dir = 1; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) +"axY" = (/obj/effect/floor_decal/corner/red{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/item/radio/intercom{broadcasting = 0; dir = 1; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) "axZ" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 9; icon_state = "intact"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) "aya" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) "ayb" = (/obj/structure/plasticflaps{opacity = 1},/obj/machinery/navbeacon/delivery/west{location = "Security"},/obj/machinery/door/firedoor/border_only,/obj/effect/floor_decal/industrial/loading{icon_state = "loadingarea"; dir = 8},/turf/simulated/floor/plating,/area/security/security_cell_hallway) @@ -1259,12 +1259,12 @@ "ayk" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "ayl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aym" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) -"ayn" = (/obj/structure/disposalpipe/segment,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) +"ayn" = (/obj/structure/disposalpipe/segment,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "ayo" = (/turf/simulated/wall,/area/maintenance/pool) "ayp" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/pool) -"ayq" = (/obj/structure/closet/crate,/obj/item/weapon/tank/emergency/oxygen/engi,/obj/item/weapon/tank/emergency/oxygen/double,/obj/effect/decal/cleanable/cobweb2,/obj/effect/landmark{name = "blobstart"},/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/pool) +"ayq" = (/obj/structure/closet/crate,/obj/item/tank/emergency/oxygen/engi,/obj/item/tank/emergency/oxygen/double,/obj/effect/decal/cleanable/cobweb2,/obj/effect/landmark{name = "blobstart"},/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/pool) "ayr" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/red/full,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/machinery/door/window/brigdoor/northleft{name = "Ammo"; req_access = list(2)},/obj/item/ammo_magazine/s45/rubber,/obj/item/ammo_magazine/s45/rubber,/turf/simulated/floor/tiled/dark,/area/security/armoury) -"ays" = (/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/brigdoor/northright{name = "Ammo"},/obj/structure/table/rack,/obj/effect/floor_decal/corner/red/full{dir = 4},/obj/item/weapon/storage/box/flashshells,/obj/item/weapon/storage/box/beanbags,/obj/item/weapon/storage/box/beanbags,/obj/item/weapon/storage/box/stunshells,/obj/item/weapon/storage/box/stunshells,/turf/simulated/floor/tiled/dark,/area/security/armoury) +"ays" = (/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/brigdoor/northright{name = "Ammo"},/obj/structure/table/rack,/obj/effect/floor_decal/corner/red/full{dir = 4},/obj/item/storage/box/flashshells,/obj/item/storage/box/beanbags,/obj/item/storage/box/beanbags,/obj/item/storage/box/stunshells,/obj/item/storage/box/stunshells,/turf/simulated/floor/tiled/dark,/area/security/armoury) "ayt" = (/obj/machinery/camera/network/security{c_tag = "SEC - Secure Armory Fore"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/security/armoury) "ayu" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) "ayv" = (/obj/machinery/light,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) @@ -1281,7 +1281,7 @@ "ayG" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/security/security_processing) "ayH" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/security/security_processing) "ayI" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/security/security_processing) -"ayJ" = (/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/table/standard,/obj/item/weapon/storage/box/evidence,/obj/machinery/light_switch{pixel_x = 36; pixel_y = 0},/obj/effect/floor_decal/corner/red,/turf/simulated/floor/tiled,/area/security/security_processing) +"ayJ" = (/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/table/standard,/obj/item/storage/box/evidence,/obj/machinery/light_switch{pixel_x = 36; pixel_y = 0},/obj/effect/floor_decal/corner/red,/turf/simulated/floor/tiled,/area/security/security_processing) "ayK" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/camera/network/security{c_tag = "SEC - Medical Station"; dir = 4},/turf/simulated/floor/tiled/white,/area/security/security_aid_station) "ayL" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/security/security_aid_station) "ayM" = (/obj/structure/bed/roller,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/white,/area/security/security_aid_station) @@ -1289,11 +1289,11 @@ "ayO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/security/brig) "ayP" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/security/brig) "ayQ" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_security{name = "Security Cells"; req_access = list(1)},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) -"ayR" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) +"ayR" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) "ayS" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) "ayT" = (/obj/machinery/button/remote/blast_door{id = "Cell 1"; name = "Cell 1 Door"; pixel_x = -1; pixel_y = -28; req_access = list(2)},/obj/effect/floor_decal/corner/red,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/junction{dir = 8; icon_state = "pipe-j2"},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) "ayU" = (/obj/machinery/door_timer/cell_3{id = "Cell 1"; name = "Cell 1"; pixel_y = -32},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/floor_decal/corner/red{dir = 10},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) -"ayV" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/effect/floor_decal/corner/red{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) +"ayV" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/effect/floor_decal/corner/red{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) "ayW" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) "ayX" = (/obj/machinery/button/remote/blast_door{id = "Cell 2"; name = "Cell 2 Door"; pixel_x = -1; pixel_y = -28; req_access = list(2)},/obj/effect/floor_decal/corner/red,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/camera/network/security{c_tag = "SEC - Cell Hallway"; dir = 1},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) "ayY" = (/obj/machinery/door_timer/cell_3{id = "Cell 2"; name = "Cell 2"; pixel_y = -32},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/effect/floor_decal/corner/red{dir = 10},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/security_cell_hallway) @@ -1318,17 +1318,17 @@ "azr" = (/turf/simulated/wall,/area/crew_quarters/pool) "azs" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/maintenance/pool) "azt" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/maintenance/pool) -"azu" = (/obj/structure/table/rack,/obj/effect/floor_decal/corner/red/full{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/item/clothing/gloves/arm_guard/riot,/obj/item/clothing/shoes/leg_guard/riot,/obj/item/clothing/suit/armor/riot/alt,/obj/item/clothing/head/helmet/riot,/obj/item/weapon/shield/riot,/obj/item/weapon/melee/baton/loaded,/obj/machinery/door/window/brigdoor/eastleft{name = "Riot Armor"},/turf/simulated/floor/tiled/dark,/area/security/armoury) +"azu" = (/obj/structure/table/rack,/obj/effect/floor_decal/corner/red/full{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/item/clothing/gloves/arm_guard/riot,/obj/item/clothing/shoes/leg_guard/riot,/obj/item/clothing/suit/armor/riot/alt,/obj/item/clothing/head/helmet/riot,/obj/item/shield/riot,/obj/item/melee/baton/loaded,/obj/machinery/door/window/brigdoor/eastleft{name = "Riot Armor"},/turf/simulated/floor/tiled/dark,/area/security/armoury) "azv" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled/dark,/area/security/armoury) -"azw" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/empslite{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/flashbangs{pixel_x = -2; pixel_y = -2},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/armoury) -"azx" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/handcuffs{pixel_x = 8; pixel_y = 6},/obj/item/weapon/storage/box/chemimp{pixel_x = 4; pixel_y = 3},/obj/item/weapon/storage/box/trackimp,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/armoury) +"azw" = (/obj/structure/table/standard,/obj/item/storage/box/empslite{pixel_x = 2; pixel_y = 2},/obj/item/storage/box/flashbangs{pixel_x = -2; pixel_y = -2},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/armoury) +"azx" = (/obj/structure/table/standard,/obj/item/storage/box/handcuffs{pixel_x = 8; pixel_y = 6},/obj/item/storage/box/chemimp{pixel_x = 4; pixel_y = 3},/obj/item/storage/box/trackimp,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/armoury) "azy" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/armoury) "azz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/security/security_equiptment_storage) "azA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/security/security_equiptment_storage) "azB" = (/obj/machinery/door/airlock/security{name = "Equipment Storage"; req_access = list(2)},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) "azC" = (/turf/simulated/wall,/area/security/security_equiptment_storage) "azD" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/window/brigdoor/northleft{name = "Weapons locker"; req_access = list(2)},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/window/reinforced{dir = 4},/obj/item/clothing/suit/storage/vest/heavy/officer,/obj/item/clothing/suit/storage/vest/heavy/officer,/obj/item/clothing/suit/storage/vest/heavy/officer,/obj/item/clothing/suit/storage/vest/heavy/officer,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) -"azE" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/machinery/door/window/brigdoor/northleft{name = "Weapons locker"; req_access = list(2)},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/gun/projectile/colt/detective,/obj/item/weapon/gun/projectile/colt/detective,/obj/item/weapon/gun/projectile/colt/detective,/obj/item/weapon/gun/projectile/colt/detective,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) +"azE" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/machinery/door/window/brigdoor/northleft{name = "Weapons locker"; req_access = list(2)},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/projectile/colt/detective,/obj/item/gun/projectile/colt/detective,/obj/item/gun/projectile/colt/detective,/obj/item/gun/projectile/colt/detective,/turf/simulated/floor/tiled,/area/security/security_equiptment_storage) "azF" = (/obj/machinery/disposal,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/disposalpipe/trunk,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/warden) "azG" = (/obj/structure/closet/secure_closet/warden,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/warden) "azH" = (/obj/machinery/computer/secure_data,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/warden) @@ -1340,8 +1340,8 @@ "azN" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/computer/secure_data,/obj/effect/floor_decal/corner/red/full,/turf/simulated/floor/tiled,/area/security/security_processing) "azO" = (/obj/effect/floor_decal/corner/red{dir = 8},/obj/machinery/light,/turf/simulated/floor/tiled,/area/security/security_processing) "azP" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/security/security_processing) -"azQ" = (/obj/structure/table/standard,/obj/item/device/camera,/obj/effect/floor_decal/corner/red,/turf/simulated/floor/tiled,/area/security/security_processing) -"azR" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/machinery/newscaster{pixel_x = 26; pixel_y = 1},/obj/effect/floor_decal/corner/red/full{dir = 4},/turf/simulated/floor/tiled,/area/security/security_processing) +"azQ" = (/obj/structure/table/standard,/obj/item/camera,/obj/effect/floor_decal/corner/red,/turf/simulated/floor/tiled,/area/security/security_processing) +"azR" = (/obj/structure/table/standard,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/pen,/obj/machinery/newscaster{pixel_x = 26; pixel_y = 1},/obj/effect/floor_decal/corner/red/full{dir = 4},/turf/simulated/floor/tiled,/area/security/security_processing) "azS" = (/obj/machinery/door/airlock/glass_security{name = "Security Medical"; req_access = newlist()},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/security/security_aid_station) "azT" = (/turf/simulated/wall,/area/security/security_aid_station) "azU" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/red{dir = 9},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/security/brig) @@ -1359,10 +1359,10 @@ "aAg" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/security_starboard) "aAh" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/universal,/turf/simulated/floor/plating,/area/maintenance/security_starboard) "aAi" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/maintenance/security_starboard) -"aAj" = (/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor,/area/maintenance/security_starboard) +"aAj" = (/obj/item/reagent_containers/glass/bucket,/turf/simulated/floor,/area/maintenance/security_starboard) "aAk" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/closet/l3closet/janitor,/turf/simulated/floor/tiled,/area/janitor) -"aAl" = (/obj/structure/table/steel,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled,/area/janitor) -"aAm" = (/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/machinery/requests_console{department = "Janitorial"; departmentType = 1; pixel_y = 28},/obj/item/weapon/reagent_containers/spray/cleaner,/obj/structure/table/steel,/obj/item/weapon/storage/box/mousetraps,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor/tiled,/area/janitor) +"aAl" = (/obj/structure/table/steel,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/pen,/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled,/area/janitor) +"aAm" = (/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/machinery/requests_console{department = "Janitorial"; departmentType = 1; pixel_y = 28},/obj/item/reagent_containers/spray/cleaner,/obj/structure/table/steel,/obj/item/storage/box/mousetraps,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/mixed,/obj/item/reagent_containers/spray/cleaner,/turf/simulated/floor/tiled,/area/janitor) "aAn" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "aAo" = (/turf/simulated/wall,/area/lawoffice) "aAp" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/recreation_area_hallway) @@ -1371,27 +1371,27 @@ "aAs" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aAt" = (/obj/structure/disposalpipe/segment,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aAu" = (/obj/structure/flora/pottedplant{icon_state = "plant-22"},/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) -"aAv" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) +"aAv" = (/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aAw" = (/obj/machinery/computer/arcade,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aAx" = (/obj/structure/table/woodentable,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/recharger{pixel_y = 0},/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) -"aAy" = (/obj/structure/table/woodentable,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/item/device/paicard,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) -"aAz" = (/obj/structure/table/woodentable,/obj/item/weapon/coin/silver,/obj/machinery/ai_status_display{pixel_y = 32},/obj/machinery/camera/network/civilian{c_tag = "CIV - Recreation Area Fore"; dir = 2},/obj/item/clothing/glasses/threedglasses,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) +"aAy" = (/obj/structure/table/woodentable,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/item/paicard,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) +"aAz" = (/obj/structure/table/woodentable,/obj/item/coin/silver,/obj/machinery/ai_status_display{pixel_y = 32},/obj/machinery/camera/network/civilian{c_tag = "CIV - Recreation Area Fore"; dir = 2},/obj/item/clothing/glasses/threedglasses,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aAA" = (/obj/machinery/computer/arcade/orion_trail,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aAB" = (/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aAC" = (/obj/structure/closet/athletic_mixed,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) -"aAD" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) +"aAD" = (/obj/item/stool/padded,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) "aAE" = (/obj/structure/table/glass,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) -"aAF" = (/obj/item/weapon/stool/padded,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) +"aAF" = (/obj/item/stool/padded,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) "aAG" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) "aAH" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/camera/network/civilian{c_tag = "CIV - Pool Fore"; dir = 2},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) -"aAI" = (/obj/item/weapon/stool/padded,/obj/machinery/ai_status_display{pixel_y = 32},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) +"aAI" = (/obj/item/stool/padded,/obj/machinery/ai_status_display{pixel_y = 32},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) "aAJ" = (/obj/structure/table/glass,/obj/item/inflatable{pixel_x = 6; pixel_y = 6},/obj/item/inflatable{pixel_x = 2; pixel_y = 2},/obj/item/inflatable{pixel_x = -2; pixel_y = -3},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) "aAK" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/pool) "aAL" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor,/area/maintenance/pool) -"aAM" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/brigdoor/eastright{name = "Riot Armor"},/obj/item/clothing/gloves/arm_guard/riot,/obj/item/clothing/shoes/leg_guard/riot,/obj/item/clothing/suit/armor/riot/alt,/obj/item/clothing/head/helmet/riot,/obj/item/weapon/shield/riot,/obj/item/weapon/melee/baton/loaded,/obj/effect/floor_decal/corner/red/full,/obj/structure/window/reinforced,/turf/simulated/floor/tiled/dark,/area/security/armoury) +"aAM" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/brigdoor/eastright{name = "Riot Armor"},/obj/item/clothing/gloves/arm_guard/riot,/obj/item/clothing/shoes/leg_guard/riot,/obj/item/clothing/suit/armor/riot/alt,/obj/item/clothing/head/helmet/riot,/obj/item/shield/riot,/obj/item/melee/baton/loaded,/obj/effect/floor_decal/corner/red/full,/obj/structure/window/reinforced,/turf/simulated/floor/tiled/dark,/area/security/armoury) "aAN" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/dark,/area/security/armoury) "aAO" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/dark,/area/security/armoury) -"aAP" = (/obj/item/weapon/stool,/turf/simulated/floor/tiled/dark,/area/security/armoury) +"aAP" = (/obj/item/stool,/turf/simulated/floor/tiled/dark,/area/security/armoury) "aAQ" = (/obj/effect/floor_decal/industrial/warning{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/security/armoury) "aAR" = (/obj/machinery/door/blast/regular{id = "Armoury"; name = "Emergency Access"},/turf/simulated/floor/tiled,/area/security/armoury) "aAS" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/floor/tiled,/area/security/brig) @@ -1426,13 +1426,13 @@ "aBv" = (/obj/machinery/portable_atmospherics/powered/pump/filled,/turf/simulated/floor,/area/maintenance/security_starboard) "aBw" = (/obj/machinery/atmospherics/valve,/turf/simulated/floor,/area/maintenance/security_starboard) "aBx" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor,/area/maintenance/security_starboard) -"aBy" = (/obj/machinery/status_display{pixel_x = 0; pixel_y = 32},/obj/structure/closet/jcloset,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled,/area/janitor) +"aBy" = (/obj/machinery/status_display{pixel_x = 0; pixel_y = 32},/obj/structure/closet/jcloset,/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled,/area/janitor) "aBz" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/janitor) -"aBA" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/item/weapon/stool/padded,/obj/effect/landmark/start{name = "Janitor"},/turf/simulated/floor/tiled,/area/janitor) -"aBB" = (/obj/item/weapon/stool/padded,/obj/effect/landmark/start{name = "Janitor"},/turf/simulated/floor/tiled,/area/janitor) +"aBA" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/item/stool/padded,/obj/effect/landmark/start{name = "Janitor"},/turf/simulated/floor/tiled,/area/janitor) +"aBB" = (/obj/item/stool/padded,/obj/effect/landmark/start{name = "Janitor"},/turf/simulated/floor/tiled,/area/janitor) "aBC" = (/obj/machinery/door/window/westright{name = "Janitoral Desk"; req_access = list(26)},/obj/structure/table/reinforced,/obj/machinery/door/window/eastleft{name = "Janitorial Desk"},/obj/structure/noticeboard{pixel_y = 27},/obj/machinery/door/blast/shutters{dir = 4; id = "janitor_blast"; layer = 3.1; name = "Janitorial Shutters"},/turf/simulated/floor/tiled,/area/janitor) "aBD" = (/obj/structure/disposalpipe/segment,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) -"aBE" = (/obj/structure/table/reinforced,/obj/item/weapon/clipboard,/obj/item/weapon/clipboard,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/dark,/area/lawoffice) +"aBE" = (/obj/structure/table/reinforced,/obj/item/clipboard,/obj/item/clipboard,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/dark,/area/lawoffice) "aBF" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/tiled/dark,/area/lawoffice) "aBG" = (/obj/structure/filingcabinet/chestdrawer,/turf/simulated/floor/tiled/dark,/area/lawoffice) "aBH" = (/turf/simulated/wall,/area/holodeck_control) @@ -1446,14 +1446,14 @@ "aBP" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aBQ" = (/obj/structure/reagent_dispensers/water_cooler/full,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aBR" = (/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) -"aBS" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) +"aBS" = (/obj/item/stool/padded,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aBT" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aBU" = (/obj/structure/closet/lasertag/blue,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aBV" = (/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) "aBW" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) "aBX" = (/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) "aBY" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/maintenance/pool) -"aBZ" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/item/clothing/gloves/arm_guard/riot,/obj/item/clothing/shoes/leg_guard/riot,/obj/item/clothing/suit/armor/riot/alt,/obj/item/clothing/head/helmet/riot,/obj/item/weapon/shield/riot,/obj/item/weapon/melee/baton/loaded,/obj/effect/floor_decal/corner/red/full{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/machinery/door/window/brigdoor/eastleft{name = "Riot Armor"},/turf/simulated/floor/tiled/dark,/area/security/armoury) +"aBZ" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/item/clothing/gloves/arm_guard/riot,/obj/item/clothing/shoes/leg_guard/riot,/obj/item/clothing/suit/armor/riot/alt,/obj/item/clothing/head/helmet/riot,/obj/item/shield/riot,/obj/item/melee/baton/loaded,/obj/effect/floor_decal/corner/red/full{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/machinery/door/window/brigdoor/eastleft{name = "Riot Armor"},/turf/simulated/floor/tiled/dark,/area/security/armoury) "aCa" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled/dark,/area/security/armoury) "aCb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/dark,/area/security/armoury) "aCc" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/turf/simulated/floor/tiled/dark,/area/security/armoury) @@ -1499,23 +1499,23 @@ "aCQ" = (/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 5},/obj/machinery/meter,/turf/simulated/floor,/area/maintenance/security_starboard) "aCR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/security_starboard) "aCS" = (/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor,/area/maintenance/security_starboard) -"aCT" = (/obj/structure/closet/jcloset,/obj/machinery/alarm{pixel_y = 22},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled,/area/janitor) +"aCT" = (/obj/structure/closet/jcloset,/obj/machinery/alarm{pixel_y = 22},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled,/area/janitor) "aCU" = (/turf/simulated/floor/tiled,/area/janitor) "aCV" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/janitor) "aCW" = (/obj/machinery/light_switch{pixel_x = 34; pixel_y = 1},/obj/machinery/button/remote/blast_door{id = "janitor_blast"; name = "Privacy Shutters"; pixel_x = 26; pixel_y = 0},/obj/machinery/camera/network/civilian{c_tag = "CIV - Custodial Closet"; dir = 9},/turf/simulated/floor/tiled,/area/janitor) "aCX" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera/network/northern_star{c_tag = "Hall - Civilian Primary Aft 2"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) -"aCY" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/dark,/area/lawoffice) +"aCY" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/dark,/area/lawoffice) "aCZ" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/dark,/area/lawoffice) -"aDa" = (/obj/structure/table/reinforced,/obj/item/device/flashlight/lamp,/turf/simulated/floor/tiled/dark,/area/lawoffice) +"aDa" = (/obj/structure/table/reinforced,/obj/item/flashlight/lamp,/turf/simulated/floor/tiled/dark,/area/lawoffice) "aDb" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/dark,/area/lawoffice) "aDc" = (/obj/structure/table/standard,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/holodeck_control) "aDd" = (/turf/simulated/floor/reinforced{name = "Holodeck Projector Floor"},/area/holodeck/alphadeck) "aDe" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/holodeck_control) -"aDf" = (/obj/structure/table/glass,/obj/item/weapon/book/codex/lore/vir,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) +"aDf" = (/obj/structure/table/glass,/obj/item/book/codex/lore/vir,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aDg" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aDh" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aDi" = (/obj/structure/disposalpipe/segment,/obj/machinery/newscaster{pixel_x = 30},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) -"aDj" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/box/cups,/obj/machinery/light{dir = 8},/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) +"aDj" = (/obj/structure/table/woodentable,/obj/item/storage/box/cups,/obj/machinery/light{dir = 8},/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aDk" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aDl" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/hologram/holopad,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aDm" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) @@ -1527,7 +1527,7 @@ "aDs" = (/obj/random/obstruction,/turf/simulated/floor,/area/maintenance/pool) "aDt" = (/obj/item/clothing/gloves/boxing/blue,/turf/simulated/floor,/area/maintenance/pool) "aDu" = (/turf/simulated/floor,/area/maintenance/pool) -"aDv" = (/obj/structure/table/rack,/obj/effect/floor_decal/corner/red/full,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/machinery/door/window/brigdoor/eastright{name = "Riot Armor"},/obj/item/clothing/gloves/arm_guard/riot,/obj/item/clothing/shoes/leg_guard/riot,/obj/item/clothing/suit/armor/riot/alt,/obj/item/clothing/head/helmet/riot,/obj/item/weapon/shield/riot,/obj/item/weapon/melee/baton/loaded,/turf/simulated/floor/tiled/dark,/area/security/armoury) +"aDv" = (/obj/structure/table/rack,/obj/effect/floor_decal/corner/red/full,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/machinery/door/window/brigdoor/eastright{name = "Riot Armor"},/obj/item/clothing/gloves/arm_guard/riot,/obj/item/clothing/shoes/leg_guard/riot,/obj/item/clothing/suit/armor/riot/alt,/obj/item/clothing/head/helmet/riot,/obj/item/shield/riot,/obj/item/melee/baton/loaded,/turf/simulated/floor/tiled/dark,/area/security/armoury) "aDw" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/dark,/area/security/armoury) "aDx" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled/dark,/area/security/armoury) "aDy" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/security/armoury) @@ -1536,7 +1536,7 @@ "aDB" = (/obj/machinery/door/blast/regular{id = "Armoury"; name = "Emergency Access"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/security/armoury) "aDC" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/button/remote/blast_door{id = "Armoury"; name = "Emergency Access"; pixel_x = 0; pixel_y = -28; req_access = list(3)},/turf/simulated/floor/tiled,/area/security/brig) "aDD" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/tiled,/area/security/brig) -"aDE" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/floor_decal/corner/red,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/security/brig) +"aDE" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/floor_decal/corner/red,/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/security/brig) "aDF" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner/red{dir = 10},/obj/machinery/light,/turf/simulated/floor/tiled,/area/security/brig) "aDG" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/floor_decal/corner/red{dir = 8},/obj/machinery/camera/network/security{c_tag = "SEC - Brig Port"; dir = 1},/turf/simulated/floor/tiled,/area/security/brig) "aDH" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/security/brig) @@ -1553,7 +1553,7 @@ "aDS" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/computer/guestpass{pixel_x = 0; pixel_y = -30},/turf/simulated/floor/tiled,/area/security/brig) "aDT" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/brig) "aDU" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner/red,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/brig) -"aDV" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/effect/floor_decal/corner/red{dir = 10},/obj/structure/disposalpipe/segment{dir = 4},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/security/brig) +"aDV" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/effect/floor_decal/corner/red{dir = 10},/obj/structure/disposalpipe/segment{dir = 4},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/security/brig) "aDW" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/corner/red{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/brig) "aDX" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/security/brig) "aDY" = (/obj/machinery/button/remote/airlock{id = "visitdoor"; name = "Visitation Access"; pixel_y = -28},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/security/brig) @@ -1579,13 +1579,13 @@ "aEs" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "lawyer_blast"; name = "Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/lawoffice) "aEt" = (/turf/simulated/floor/tiled/dark,/area/lawoffice) "aEu" = (/obj/structure/bed/chair{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/dark,/area/lawoffice) -"aEv" = (/obj/structure/table/reinforced,/obj/item/weapon/folder{pixel_x = -4},/obj/item/weapon/folder/red{pixel_y = 3},/obj/item/weapon/folder/blue{pixel_x = 5},/obj/item/weapon/folder/yellow,/obj/item/weapon/stamp/internalaffairs,/obj/item/weapon/stamp/denied{pixel_x = 4; pixel_y = -2},/turf/simulated/floor/tiled/dark,/area/lawoffice) +"aEv" = (/obj/structure/table/reinforced,/obj/item/folder{pixel_x = -4},/obj/item/folder/red{pixel_y = 3},/obj/item/folder/blue{pixel_x = 5},/obj/item/folder/yellow,/obj/item/stamp/internalaffairs,/obj/item/stamp/denied{pixel_x = 4; pixel_y = -2},/turf/simulated/floor/tiled/dark,/area/lawoffice) "aEw" = (/obj/structure/bed/chair/office/dark{dir = 8},/obj/effect/landmark/start{name = "Internal Affairs Agent"},/turf/simulated/floor/tiled/dark,/area/lawoffice) "aEx" = (/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/obj/structure/table/reinforced,/obj/machinery/computer/skills,/turf/simulated/floor/tiled/dark,/area/lawoffice) "aEy" = (/obj/structure/table/standard,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled,/area/holodeck_control) "aEz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/holodeck_control) -"aEA" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/light{dir = 8},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) -"aEB" = (/obj/structure/disposalpipe/segment,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) +"aEA" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/light{dir = 8},/obj/item/stool/padded,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) +"aEB" = (/obj/structure/disposalpipe/segment,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aEC" = (/obj/machinery/vending/cola,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aED" = (/obj/structure/bed/chair/office/dark{dir = 4},/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aEE" = (/obj/structure/table/woodentable,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) @@ -1603,11 +1603,11 @@ "aEQ" = (/obj/item/clothing/head/cone,/turf/simulated/floor,/area/maintenance/pool) "aER" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor,/area/maintenance/pool) "aES" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor,/area/maintenance/pool) -"aET" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/mask/breath,/obj/item/clothing/suit/space/void/security,/obj/item/clothing/head/helmet/space/void/security,/obj/item/device/suit_cooling_unit,/obj/item/weapon/tank/oxygen,/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/white{icon_state = "corner_white"; dir = 1},/obj/effect/floor_decal/corner/blue{dir = 8},/obj/machinery/door/window/brigdoor/eastright{name = "EVA Suit"},/turf/simulated/floor/tiled/dark,/area/security/armoury) +"aET" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/mask/breath,/obj/item/clothing/suit/space/void/security,/obj/item/clothing/head/helmet/space/void/security,/obj/item/suit_cooling_unit,/obj/item/tank/oxygen,/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/white{icon_state = "corner_white"; dir = 1},/obj/effect/floor_decal/corner/blue{dir = 8},/obj/machinery/door/window/brigdoor/eastright{name = "EVA Suit"},/turf/simulated/floor/tiled/dark,/area/security/armoury) "aEU" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/security/armoury) "aEV" = (/obj/structure/table/rack,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/armoury) "aEW" = (/obj/structure/table/rack,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/armoury) -"aEX" = (/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = -21},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/armoury) +"aEX" = (/obj/item/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = -21},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/armoury) "aEY" = (/turf/simulated/wall/r_wall,/area/security/range) "aEZ" = (/turf/simulated/wall,/area/security/range) "aFa" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/security/range) @@ -1645,9 +1645,9 @@ "aFG" = (/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/obj/structure/janitorialcart,/turf/simulated/floor/tiled,/area/janitor) "aFH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "lawyer_blast"; name = "Privacy Shutters"; opacity = 0},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/lawoffice) "aFI" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/dark,/area/lawoffice) -"aFJ" = (/obj/structure/table/reinforced,/obj/item/weapon/pen/blue{pixel_x = -5; pixel_y = -1},/obj/item/weapon/pen/red{pixel_x = -1; pixel_y = 3},/obj/item/weapon/material/ashtray/plastic{pixel_x = 4; pixel_y = 6},/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/turf/simulated/floor/tiled/dark,/area/lawoffice) +"aFJ" = (/obj/structure/table/reinforced,/obj/item/pen/blue{pixel_x = -5; pixel_y = -1},/obj/item/pen/red{pixel_x = -1; pixel_y = 3},/obj/item/material/ashtray/plastic{pixel_x = 4; pixel_y = 6},/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/turf/simulated/floor/tiled/dark,/area/lawoffice) "aFK" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/dark,/area/lawoffice) -"aFL" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) +"aFL" = (/obj/item/stool/padded,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aFM" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aFN" = (/obj/machinery/vending/coffee,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aFO" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) @@ -1669,11 +1669,11 @@ "aGe" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/security/range) "aGf" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = 28},/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled,/area/security/range) "aGg" = (/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled,/area/security/range) -"aGh" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/item/weapon/gun/energy/laser/practice,/turf/simulated/floor/tiled,/area/security/range) +"aGh" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/item/gun/energy/laser/practice,/turf/simulated/floor/tiled,/area/security/range) "aGi" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/turf/simulated/floor/tiled,/area/security/range) "aGj" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/security/range) -"aGk" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/firealarm{dir = 2; pixel_y = 23},/obj/machinery/light_switch{pixel_x = 14; pixel_y = 24},/obj/item/device/radio/intercom{broadcasting = 0; dir = 4; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/range) -"aGl" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/red/full{dir = 8},/obj/item/device/radio/intercom{broadcasting = 0; dir = 8; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = -21; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/lobby) +"aGk" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/firealarm{dir = 2; pixel_y = 23},/obj/machinery/light_switch{pixel_x = 14; pixel_y = 24},/obj/item/radio/intercom{broadcasting = 0; dir = 4; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/range) +"aGl" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/red/full{dir = 8},/obj/item/radio/intercom{broadcasting = 0; dir = 8; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = -21; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/lobby) "aGm" = (/turf/simulated/floor/tiled,/area/security/lobby) "aGn" = (/obj/effect/floor_decal/corner/red/full{dir = 1},/turf/simulated/floor/tiled,/area/security/lobby) "aGo" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/security/lobby) @@ -1686,9 +1686,9 @@ "aGv" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/security/prison) "aGw" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "Prison Gate"; name = "Communal Brig Blast Door"; opacity = 0},/turf/simulated/floor/plating,/area/security/prison) "aGx" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/button/flasher{id = "permentryflash"; name = "entry flash"; pixel_x = 0; pixel_y = -34; req_access = list(2)},/obj/machinery/button/remote/airlock{id = "prisonexit"; name = "Exit Doors"; pixel_x = 6; pixel_y = -26; req_access = list(2)},/obj/machinery/button/remote/airlock{id = "prisonentry"; name = "Entry Doors"; pixel_x = -6; pixel_y = -26; req_access = list(2)},/turf/simulated/floor/tiled,/area/security/prison) -"aGy" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/computer/security/telescreen{desc = "Big Brother is watching."; layer = 3.4; name = "Brig Monitor"; network = list("Prison"); pixel_x = 32; pixel_y = -3},/obj/item/weapon/stool/padded,/obj/machinery/button/remote/blast_door{id = "brigobs"; name = "Observation Shutters"; pixel_x = 6; pixel_y = -26; req_access = list(2)},/obj/machinery/button/flasher{id = "permflash"; name = "Brig flashes"; pixel_x = -6; pixel_y = -36; req_access = list(2)},/obj/machinery/button/remote/blast_door{id = "Prison Gate"; name = "Prison Lockdown"; pixel_x = 6; pixel_y = -36; req_access = list(2)},/obj/machinery/light_switch{pixel_x = -8; pixel_y = 26},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/security/prison) +"aGy" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/computer/security/telescreen{desc = "Big Brother is watching."; layer = 3.4; name = "Brig Monitor"; network = list("Prison"); pixel_x = 32; pixel_y = -3},/obj/item/stool/padded,/obj/machinery/button/remote/blast_door{id = "brigobs"; name = "Observation Shutters"; pixel_x = 6; pixel_y = -26; req_access = list(2)},/obj/machinery/button/flasher{id = "permflash"; name = "Brig flashes"; pixel_x = -6; pixel_y = -36; req_access = list(2)},/obj/machinery/button/remote/blast_door{id = "Prison Gate"; name = "Prison Lockdown"; pixel_x = 6; pixel_y = -36; req_access = list(2)},/obj/machinery/light_switch{pixel_x = -8; pixel_y = 26},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/security/prison) "aGz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "Prison Gate"; name = "Communal Brig Blast Door"; opacity = 0},/turf/simulated/floor/plating,/area/security/prison) -"aGA" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled,/area/security/prison) +"aGA" = (/obj/item/stool/padded,/turf/simulated/floor/tiled,/area/security/prison) "aGB" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled,/area/security/prison) "aGC" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/security/prison) "aGD" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/security/prison) @@ -1701,13 +1701,13 @@ "aGK" = (/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/window/northleft{name = "Janitorial Delivery"; req_access = list(26)},/turf/simulated/floor/tiled,/area/janitor) "aGL" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/tiled,/area/janitor) "aGM" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/tiled,/area/janitor) -"aGN" = (/obj/structure/mopbucket,/obj/item/weapon/mop,/obj/item/weapon/reagent_containers/glass/bucket,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -26},/turf/simulated/floor/tiled,/area/janitor) -"aGO" = (/obj/structure/mopbucket,/obj/item/weapon/mop,/obj/item/weapon/reagent_containers/glass/bucket,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/janitor) +"aGN" = (/obj/structure/mopbucket,/obj/item/mop,/obj/item/reagent_containers/glass/bucket,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -26},/turf/simulated/floor/tiled,/area/janitor) +"aGO" = (/obj/structure/mopbucket,/obj/item/mop,/obj/item/reagent_containers/glass/bucket,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/janitor) "aGP" = (/obj/structure/janitorialcart,/turf/simulated/floor/tiled,/area/janitor) -"aGQ" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) +"aGQ" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "aGR" = (/obj/machinery/button/remote/blast_door{id = "lawyer_blast"; name = "Privacy Shutters"; pixel_x = -26; pixel_y = 0},/obj/machinery/light_switch{pixel_x = -34; pixel_y = 0},/obj/machinery/camera/network/civilian{c_tag = "CIV - Internal Affairs"; dir = 5},/turf/simulated/floor/tiled/dark,/area/lawoffice) "aGS" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/dark,/area/lawoffice) -"aGT" = (/obj/item/device/taperecorder{pixel_x = -4; pixel_y = 2},/obj/item/device/camera{pixel_x = 3; pixel_y = -4},/obj/item/device/flash,/obj/item/device/flash,/obj/item/weapon/storage/secure/briefcase,/obj/structure/closet,/obj/item/weapon/storage/secure/briefcase,/obj/item/device/taperecorder{pixel_x = -4; pixel_y = 2},/obj/item/device/camera{pixel_x = 3; pixel_y = -4},/obj/machinery/status_display{pixel_x = 32; pixel_y = 0},/turf/simulated/floor/tiled/dark,/area/lawoffice) +"aGT" = (/obj/item/taperecorder{pixel_x = -4; pixel_y = 2},/obj/item/camera{pixel_x = 3; pixel_y = -4},/obj/item/flash,/obj/item/flash,/obj/item/storage/secure/briefcase,/obj/structure/closet,/obj/item/storage/secure/briefcase,/obj/item/taperecorder{pixel_x = -4; pixel_y = 2},/obj/item/camera{pixel_x = 3; pixel_y = -4},/obj/machinery/status_display{pixel_x = 32; pixel_y = 0},/turf/simulated/floor/tiled/dark,/area/lawoffice) "aGU" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/maintenance/holodeck) "aGV" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/maintenance/holodeck) "aGW" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/camera/network/civilian{c_tag = "CIV - Holodeck Control"; dir = 4},/turf/simulated/floor/tiled,/area/holodeck_control) @@ -1727,7 +1727,7 @@ "aHk" = (/obj/structure/table/standard,/obj/machinery/camera/network/security{c_tag = "SEC - Secure Armory Aft"; dir = 2},/turf/simulated/floor/tiled/dark,/area/security/tactical) "aHl" = (/obj/structure/table/standard,/turf/simulated/floor/tiled/dark,/area/security/tactical) "aHm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/security/tactical) -"aHn" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/recharger,/obj/item/weapon/cell/device/weapon{pixel_x = 4; pixel_y = 4},/obj/item/weapon/cell/device/weapon{pixel_x = 2; pixel_y = 2},/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/tactical) +"aHn" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/recharger,/obj/item/cell/device/weapon{pixel_x = 4; pixel_y = 4},/obj/item/cell/device/weapon{pixel_x = 2; pixel_y = 2},/obj/item/cell/device/weapon,/obj/item/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/tactical) "aHo" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/target_stake,/turf/simulated/floor/tiled,/area/security/range) "aHp" = (/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled,/area/security/range) "aHq" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/security/range) @@ -1735,7 +1735,7 @@ "aHs" = (/obj/effect/floor_decal/industrial/loading{icon_state = "loadingarea"; dir = 8},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/window/westright{name = "Range Access"; req_access = list(63)},/turf/simulated/floor/tiled,/area/security/range) "aHt" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/security/range) "aHu" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/security/range) -"aHv" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/flashbangs{pixel_x = -2; pixel_y = -2},/turf/simulated/floor/tiled,/area/security/range) +"aHv" = (/obj/structure/table/reinforced,/obj/item/storage/box/flashbangs{pixel_x = -2; pixel_y = -2},/turf/simulated/floor/tiled,/area/security/range) "aHw" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/lobby) "aHx" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/security/lobby) "aHy" = (/obj/machinery/computer/security,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/red{dir = 9},/turf/simulated/floor/tiled,/area/security/lobby) @@ -1743,18 +1743,18 @@ "aHA" = (/obj/structure/bed/chair/office/dark,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/security/lobby) "aHB" = (/obj/machinery/computer/secure_data,/obj/effect/floor_decal/corner/red{dir = 6},/turf/simulated/floor/tiled,/area/security/lobby) "aHC" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/effect/floor_decal/corner/red/full,/turf/simulated/floor/tiled,/area/security/prison) -"aHD" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/bed/chair,/obj/effect/floor_decal/corner/red{dir = 10},/obj/item/device/radio/intercom{broadcasting = 0; dir = 4; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/prison) +"aHD" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/bed/chair,/obj/effect/floor_decal/corner/red{dir = 10},/obj/item/radio/intercom{broadcasting = 0; dir = 4; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/prison) "aHE" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/flasher{id = "permentryflash"; name = "Floor mounted flash"; pixel_x = 0},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled,/area/security/prison) "aHF" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera/network/prison{c_tag = "SEC - Common Brig Enterance"; dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/security/prison) "aHG" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green,/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "Prison Gate"; name = "Communal Brig Blast Door"; opacity = 0},/turf/simulated/floor/plating,/area/security/prison) -"aHH" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/table/steel,/obj/item/device/communicator,/obj/item/device/communicator,/obj/item/device/communicator,/obj/item/device/communicator,/obj/item/device/radio/headset,/obj/item/device/radio/headset,/obj/item/device/radio/headset,/obj/item/device/radio/headset,/turf/simulated/floor/tiled,/area/security/prison) +"aHH" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/table/steel,/obj/item/communicator,/obj/item/communicator,/obj/item/communicator,/obj/item/communicator,/obj/item/radio/headset,/obj/item/radio/headset,/obj/item/radio/headset,/obj/item/radio/headset,/turf/simulated/floor/tiled,/area/security/prison) "aHI" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/table/steel,/obj/machinery/camera/network/prison{c_tag = "SEC - Brig Observation"; dir = 1},/turf/simulated/floor/tiled,/area/security/prison) "aHJ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green,/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "Prison Gate"; name = "Communal Brig Blast Door"; opacity = 0},/turf/simulated/floor/plating,/area/security/prison) "aHK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/security/prison) "aHL" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/security/prison) "aHM" = (/obj/machinery/flasher{id = "permflash"; name = "Floor mounted flash"; pixel_x = 0},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/security/prison) "aHN" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/security/prison) -"aHO" = (/obj/structure/closet/crate,/obj/item/clothing/glasses/meson/prescription,/obj/item/weapon/storage/box/lights/mixed,/obj/random/maintenance/security,/obj/random/maintenance/security,/obj/random/maintenance/security,/turf/simulated/floor/plating,/area/maintenance/security_starboard) +"aHO" = (/obj/structure/closet/crate,/obj/item/clothing/glasses/meson/prescription,/obj/item/storage/box/lights/mixed,/obj/random/maintenance/security,/obj/random/maintenance/security,/obj/random/maintenance/security,/turf/simulated/floor/plating,/area/maintenance/security_starboard) "aHP" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "aHQ" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "aHR" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) @@ -1766,7 +1766,7 @@ "aHX" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor,/area/maintenance/holodeck) "aHY" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/meter,/turf/simulated/floor,/area/maintenance/holodeck) "aHZ" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled,/area/holodeck_control) -"aIa" = (/obj/structure/table/standard,/obj/item/weapon/paper{desc = ""; info = "Brusies sustained in the holodeck can be healed simply by sleeping."; name = "Holodeck Disclaimer"},/turf/simulated/floor/tiled,/area/holodeck_control) +"aIa" = (/obj/structure/table/standard,/obj/item/paper{desc = ""; info = "Brusies sustained in the holodeck can be healed simply by sleeping."; name = "Holodeck Disclaimer"},/turf/simulated/floor/tiled,/area/holodeck_control) "aIb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/holodeck_control) "aIc" = (/obj/machinery/door/airlock/glass{name = "Holodeck"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/holodeck_control) "aId" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) @@ -1778,10 +1778,10 @@ "aIj" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area) "aIk" = (/obj/machinery/door/airlock/glass{name = "Pool"},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/crew_quarters/pool) "aIl" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) -"aIm" = (/obj/effect/floor_decal/spline/plain{dir = 9},/obj/item/weapon/beach_ball,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) +"aIm" = (/obj/effect/floor_decal/spline/plain{dir = 9},/obj/item/beach_ball,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) "aIn" = (/obj/structure/closet/emcloset,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/chapel_hallway) "aIo" = (/obj/effect/floor_decal/spline/plain{dir = 5},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) -"aIp" = (/obj/structure/table/glass,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) +"aIp" = (/obj/structure/table/glass,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) "aIq" = (/obj/structure/table/rack,/obj/effect/floor_decal/corner/green/full{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/brigdoor/eastleft{name = "Ballistics"},/obj/random/projectile/sec,/turf/simulated/floor/tiled/dark,/area/security/tactical) "aIr" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/security/tactical) "aIs" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/dark,/area/security/tactical) @@ -1792,7 +1792,7 @@ "aIx" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/security/range) "aIy" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/tiled,/area/security/range) "aIz" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning/corner,/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/floor/tiled,/area/security/range) -"aIA" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/item/weapon/gun/energy/laser/practice,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/security/range) +"aIA" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/item/gun/energy/laser/practice,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/security/range) "aIB" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor/tiled,/area/security/range) "aIC" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/security/range) "aID" = (/obj/structure/table/reinforced,/obj/machinery/light{dir = 4},/obj/item/ammo_magazine/m9mmt/practice,/obj/item/ammo_magazine/m9mmt/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/s45/practice,/obj/item/ammo_magazine/s45/practice,/obj/item/ammo_magazine/s45/practice,/obj/item/ammo_magazine/s45/practice,/turf/simulated/floor/tiled,/area/security/range) @@ -1802,7 +1802,7 @@ "aIH" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner/red{dir = 6},/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/tiled,/area/security/lobby) "aII" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/security/lobby) "aIJ" = (/obj/structure/table/reinforced,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/window/brigdoor/southleft{name = "Secure Door"},/obj/effect/floor_decal/corner/red{dir = 10},/turf/simulated/floor/tiled,/area/security/lobby) -"aIK" = (/obj/structure/table/reinforced,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/window/brigdoor/southright{name = "Secure Door"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/corner/red{dir = 10},/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor/tiled,/area/security/lobby) +"aIK" = (/obj/structure/table/reinforced,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/window/brigdoor/southright{name = "Secure Door"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/corner/red{dir = 10},/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/pen,/turf/simulated/floor/tiled,/area/security/lobby) "aIL" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/security/lobby) "aIM" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "brigobs"; name = "Communal Brig Blast Door"; opacity = 0},/turf/simulated/floor/plating,/area/security/prison) "aIN" = (/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "Secure Gate"; name = "Communal Brig Blast Door"; opacity = 0},/obj/structure/table/steel_reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/window/northright{name = "Visitation"; req_access = list(2)},/turf/simulated/floor/tiled,/area/security/prison) @@ -1812,20 +1812,20 @@ "aIR" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/cable/green,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "Prison Gate"; name = "Communal Brig Blast Door"; opacity = 0},/turf/simulated/floor/plating,/area/security/prison) "aIS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/security/prison) "aIT" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/tiled,/area/security/prison) -"aIU" = (/obj/structure/table/steel,/obj/item/weapon/material/minihoe,/obj/item/device/analyzer/plant_analyzer,/obj/item/clothing/head/greenbandana,/turf/simulated/floor/tiled,/area/security/prison) +"aIU" = (/obj/structure/table/steel,/obj/item/material/minihoe,/obj/item/analyzer/plant_analyzer,/obj/item/clothing/head/greenbandana,/turf/simulated/floor/tiled,/area/security/prison) "aIV" = (/obj/machinery/vending/hydronutrients,/turf/simulated/floor/tiled,/area/security/prison) "aIW" = (/obj/machinery/seed_storage/garden,/obj/machinery/camera/network/prison{c_tag = "SEC - Common Brig Fore"; dir = 1},/turf/simulated/floor/tiled,/area/security/prison) "aIX" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/floor/tiled,/area/security/prison) "aIY" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/machinery/light,/turf/simulated/floor/tiled,/area/security/prison) -"aIZ" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/tiled,/area/security/prison) -"aJa" = (/obj/structure/table/rack,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/weapon/storage/belt/utility,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/security,/obj/random/maintenance/security,/turf/simulated/floor/plating,/area/maintenance/security_starboard) +"aIZ" = (/obj/structure/reagent_dispensers/watertank,/obj/item/reagent_containers/glass/bucket,/turf/simulated/floor/tiled,/area/security/prison) +"aJa" = (/obj/structure/table/rack,/obj/item/storage/toolbox/mechanical,/obj/item/storage/belt/utility,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/security,/obj/random/maintenance/security,/turf/simulated/floor/plating,/area/maintenance/security_starboard) "aJb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/security_starboard) "aJc" = (/turf/simulated/wall,/area/storage/art) -"aJd" = (/obj/structure/table/standard,/obj/item/weapon/storage/fancy/markers,/obj/item/weapon/storage/fancy/markers,/turf/simulated/floor/tiled,/area/storage/art) -"aJe" = (/obj/structure/table/standard,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/turf/simulated/floor/tiled,/area/storage/art) -"aJf" = (/obj/structure/table/standard,/obj/item/weapon/hand_labeler,/obj/item/weapon/hand_labeler,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/turf/simulated/floor/tiled,/area/storage/art) -"aJg" = (/obj/structure/table/standard,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/machinery/atmospherics/unary/vent_pump/on,/obj/item/device/taperecorder,/obj/item/device/taperecorder,/turf/simulated/floor/tiled,/area/storage/art) -"aJh" = (/obj/structure/table/standard,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/storage/art) +"aJd" = (/obj/structure/table/standard,/obj/item/storage/fancy/markers,/obj/item/storage/fancy/markers,/turf/simulated/floor/tiled,/area/storage/art) +"aJe" = (/obj/structure/table/standard,/obj/item/packageWrap,/obj/item/packageWrap,/turf/simulated/floor/tiled,/area/storage/art) +"aJf" = (/obj/structure/table/standard,/obj/item/hand_labeler,/obj/item/hand_labeler,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/turf/simulated/floor/tiled,/area/storage/art) +"aJg" = (/obj/structure/table/standard,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/machinery/atmospherics/unary/vent_pump/on,/obj/item/taperecorder,/obj/item/taperecorder,/turf/simulated/floor/tiled,/area/storage/art) +"aJh" = (/obj/structure/table/standard,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/storage/art) "aJi" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/storage/art) "aJj" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green,/turf/simulated/floor/tiled/dark,/area/lawoffice) "aJk" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/lawoffice) @@ -1833,7 +1833,7 @@ "aJm" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/meter,/turf/simulated/floor,/area/maintenance/holodeck) "aJn" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor,/area/maintenance/holodeck) "aJo" = (/obj/machinery/door/airlock/maintenance{req_access = list(12)},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/holodeck_control) -"aJp" = (/obj/item/weapon/stool/padded,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/holodeck_control) +"aJp" = (/obj/item/stool/padded,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/holodeck_control) "aJq" = (/obj/machinery/computer/HolodeckControl,/turf/simulated/floor/tiled,/area/holodeck_control) "aJr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/holodeck_control) "aJs" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) @@ -1864,35 +1864,35 @@ "aJR" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/loading{icon_state = "loadingarea"; dir = 8},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/window/westright{name = "Range Access"; req_access = list(63)},/turf/simulated/floor/tiled,/area/security/range) "aJS" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/security/range) "aJT" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/security/range) -"aJU" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/blanks{pixel_x = 2; pixel_y = -2},/obj/item/weapon/storage/box/blanks,/turf/simulated/floor/tiled,/area/security/range) +"aJU" = (/obj/structure/table/reinforced,/obj/item/storage/box/blanks{pixel_x = 2; pixel_y = -2},/obj/item/storage/box/blanks,/turf/simulated/floor/tiled,/area/security/range) "aJV" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/lobby) "aJW" = (/obj/effect/floor_decal/corner/red{dir = 9},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/lobby) "aJX" = (/obj/machinery/hologram/holopad,/obj/effect/floor_decal/corner/red{dir = 4},/turf/simulated/floor/tiled,/area/security/lobby) "aJY" = (/obj/effect/floor_decal/corner/red{dir = 5},/turf/simulated/floor/tiled,/area/security/lobby) "aJZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/security/lobby) -"aKa" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/floor_decal/corner/red/full{dir = 1},/obj/structure/table/standard,/obj/item/weapon/book/codex/corp_regs,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/security/lobby) +"aKa" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/floor_decal/corner/red/full{dir = 1},/obj/structure/table/standard,/obj/item/book/codex/corp_regs,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/security/lobby) "aKb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "brigobs"; name = "Communal Brig Blast Door"; opacity = 0},/turf/simulated/floor/plating,/area/security/prison) -"aKc" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/table/reinforced,/obj/item/weapon/book/codex/corp_regs,/obj/effect/floor_decal/corner/red/full{dir = 8},/turf/simulated/floor/tiled,/area/security/prison) +"aKc" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/table/reinforced,/obj/item/book/codex/corp_regs,/obj/effect/floor_decal/corner/red/full{dir = 8},/turf/simulated/floor/tiled,/area/security/prison) "aKd" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/bed/chair{dir = 1},/obj/effect/floor_decal/corner/red{dir = 5},/obj/machinery/flasher{id = "IAflash"; pixel_x = 30; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/prison) "aKe" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/security/prison) "aKf" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/security/prison) -"aKg" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/item/device/radio/intercom{desc = "Talk... listen through this."; dir = 1; name = "Station Intercom (Brig Radio)"; pixel_x = 0; pixel_y = 21; wires = 7},/turf/simulated/floor/tiled,/area/security/prison) +"aKg" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/item/radio/intercom{desc = "Talk... listen through this."; dir = 1; name = "Station Intercom (Brig Radio)"; pixel_x = 0; pixel_y = 21; wires = 7},/turf/simulated/floor/tiled,/area/security/prison) "aKh" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/computer/cryopod{density = 0; layer = 3.3; pixel_y = 32},/turf/simulated/floor/tiled,/area/security/prison) "aKi" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/security/prison) "aKj" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/prison) "aKk" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/prison) "aKl" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/prison) "aKm" = (/obj/machinery/door/airlock{name = "Brig Restroom"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/freezer,/area/security/prison) -"aKn" = (/obj/structure/table/standard,/obj/item/device/camera_film{pixel_x = -2; pixel_y = -2},/obj/item/device/camera_film{pixel_x = 2; pixel_y = 2},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled,/area/storage/art) +"aKn" = (/obj/structure/table/standard,/obj/item/camera_film{pixel_x = -2; pixel_y = -2},/obj/item/camera_film{pixel_x = 2; pixel_y = 2},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled,/area/storage/art) "aKo" = (/turf/simulated/floor/tiled,/area/storage/art) "aKp" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/storage/art) "aKq" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/storage/art) "aKr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/storage/art) "aKs" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/dark,/area/lawoffice) -"aKt" = (/obj/structure/table/reinforced,/obj/item/weapon/pen/blue,/obj/item/weapon/pen/red{pixel_x = -5; pixel_y = -1},/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/turf/simulated/floor/tiled/dark,/area/lawoffice) +"aKt" = (/obj/structure/table/reinforced,/obj/item/pen/blue,/obj/item/pen/red{pixel_x = -5; pixel_y = -1},/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/turf/simulated/floor/tiled/dark,/area/lawoffice) "aKu" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/holodeck) "aKv" = (/obj/machinery/alarm{dir = 1; pixel_y = -25},/obj/structure/table/rack,/obj/random/maintenance/security,/obj/random/maintenance/clean,/turf/simulated/floor,/area/maintenance/holodeck) -"aKw" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/holodeck_control) +"aKw" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/holodeck_control) "aKx" = (/obj/machinery/light/small,/turf/simulated/floor/tiled,/area/holodeck_control) "aKy" = (/obj/machinery/camera/network/northern_star{c_tag = "Hall - Recreation Mid"; dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aKz" = (/obj/structure/disposalpipe/junction{icon_state = "pipe-j2"; dir = 2},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) @@ -1905,7 +1905,7 @@ "aKG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/pool) "aKH" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) "aKI" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/pool) -"aKJ" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/item/weapon/storage/box/shotgunshells,/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/green/full,/obj/item/weapon/storage/box/shotgunshells,/obj/item/weapon/storage/box/shotgunammo,/obj/item/weapon/storage/box/shotgunammo,/obj/machinery/door/window/brigdoor/northleft{name = "Ammo"; req_access = list(2)},/turf/simulated/floor/tiled/dark,/area/security/tactical) +"aKJ" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/item/storage/box/shotgunshells,/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/green/full,/obj/item/storage/box/shotgunshells,/obj/item/storage/box/shotgunammo,/obj/item/storage/box/shotgunammo,/obj/machinery/door/window/brigdoor/northleft{name = "Ammo"; req_access = list(2)},/turf/simulated/floor/tiled/dark,/area/security/tactical) "aKK" = (/obj/effect/floor_decal/corner/green/full{dir = 4},/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/machinery/door/window/brigdoor/northright{name = "Ammo"},/obj/item/ammo_magazine/s45,/obj/item/ammo_magazine/s45,/turf/simulated/floor/tiled/dark,/area/security/tactical) "aKL" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced,/obj/effect/floor_decal/corner/yellow/full,/obj/machinery/door/window/brigdoor/northleft{name = "Combat Armor"; req_access = list(2)},/obj/item/clothing/gloves/arm_guard/combat,/obj/item/clothing/shoes/leg_guard/combat,/obj/item/clothing/suit/armor/combat,/obj/item/clothing/head/helmet/combat,/turf/simulated/floor/tiled/dark,/area/security/tactical) "aKM" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/effect/floor_decal/corner/yellow/full{icon_state = "corner_white_full"; dir = 4},/obj/machinery/door/window/brigdoor/northright{name = "Combat Armor"},/obj/item/clothing/gloves/arm_guard/combat,/obj/item/clothing/shoes/leg_guard/combat,/obj/item/clothing/suit/armor/combat,/obj/item/clothing/head/helmet/combat,/turf/simulated/floor/tiled/dark,/area/security/tactical) @@ -1932,13 +1932,13 @@ "aLh" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/security/prison) "aLi" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/security/prison) "aLj" = (/obj/machinery/recharge_station,/turf/simulated/floor/tiled,/area/security/prison) -"aLk" = (/obj/structure/closet{name = "Prisoner's Locker"},/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/storage/fancy/cigarettes,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/security/prison) -"aLl" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/item/weapon/bedsheet/orange,/obj/structure/bed/padded,/turf/simulated/floor/tiled,/area/security/prison) +"aLk" = (/obj/structure/closet{name = "Prisoner's Locker"},/obj/item/flame/lighter/zippo,/obj/item/storage/fancy/cigarettes,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/security/prison) +"aLl" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/item/bedsheet/orange,/obj/structure/bed/padded,/turf/simulated/floor/tiled,/area/security/prison) "aLm" = (/obj/structure/closet{name = "Prisoner's Locker"},/obj/random/tech_supply,/obj/item/clothing/head/flatcap,/turf/simulated/floor/tiled,/area/security/prison) "aLn" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/curtain/open/shower/security,/turf/simulated/floor/tiled/freezer,/area/security/prison) "aLo" = (/turf/simulated/floor/tiled/freezer,/area/security/prison) -"aLp" = (/obj/structure/mirror{pixel_x = 30},/obj/item/weapon/soap/nanotrasen,/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/tiled/freezer,/area/security/prison) -"aLq" = (/obj/structure/table/standard,/obj/item/device/camera,/obj/item/device/camera{pixel_x = 3; pixel_y = -4},/turf/simulated/floor/tiled,/area/storage/art) +"aLp" = (/obj/structure/mirror{pixel_x = 30},/obj/item/soap/nanotrasen,/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/tiled/freezer,/area/security/prison) +"aLq" = (/obj/structure/table/standard,/obj/item/camera,/obj/item/camera{pixel_x = 3; pixel_y = -4},/turf/simulated/floor/tiled,/area/storage/art) "aLr" = (/obj/machinery/hologram/holopad,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/storage/art) "aLs" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/storage/art) "aLt" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/storage/art) @@ -1960,16 +1960,16 @@ "aLJ" = (/obj/structure/closet/crate,/obj/item/target,/obj/item/target,/obj/item/target,/obj/item/target,/obj/item/target,/turf/simulated/floor/tiled,/area/security/range) "aLK" = (/obj/machinery/light,/turf/simulated/floor/tiled,/area/security/range) "aLL" = (/obj/machinery/camera/network/security{c_tag = "SEC - Firing Range"; dir = 1},/turf/simulated/floor/tiled,/area/security/range) -"aLM" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/window/westright{name = "Range Access"; req_access = list(63)},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/item/device/radio/intercom{broadcasting = 0; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled,/area/security/range) +"aLM" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/window/westright{name = "Range Access"; req_access = list(63)},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/item/radio/intercom{broadcasting = 0; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled,/area/security/range) "aLN" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/security/range) -"aLO" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/security/range) +"aLO" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/security/range) "aLP" = (/obj/structure/table/reinforced,/obj/machinery/recharger/wallcharger{pixel_x = 32; pixel_y = -4},/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/glasses/sunglasses{pixel_x = 3; pixel_y = 3},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled,/area/security/range) "aLQ" = (/obj/effect/floor_decal/corner/red/full,/obj/structure/bed/chair{dir = 1},/obj/machinery/atm{pixel_y = -30},/turf/simulated/floor/tiled,/area/security/lobby) "aLR" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/tiled,/area/security/lobby) "aLS" = (/obj/effect/floor_decal/corner/red{dir = 10},/turf/simulated/floor/tiled,/area/security/lobby) "aLT" = (/obj/structure/bed/chair{dir = 1},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/tiled,/area/security/lobby) -"aLU" = (/obj/effect/floor_decal/corner/red/full{dir = 4},/obj/structure/bed/chair{dir = 1},/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/security/lobby) -"aLV" = (/obj/structure/table/steel,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/vending/wallmed1{pixel_y = -32},/turf/simulated/floor/tiled,/area/security/prison) +"aLU" = (/obj/effect/floor_decal/corner/red/full{dir = 4},/obj/structure/bed/chair{dir = 1},/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/security/lobby) +"aLV" = (/obj/structure/table/steel,/obj/item/paper_bin,/obj/item/pen,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/vending/wallmed1{pixel_y = -32},/turf/simulated/floor/tiled,/area/security/prison) "aLW" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/security/prison) "aLX" = (/obj/structure/bed/chair,/turf/simulated/floor/tiled,/area/security/prison) "aLY" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled,/area/security/prison) @@ -1977,17 +1977,17 @@ "aMa" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/prison) "aMb" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/security/prison) "aMc" = (/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/curtain/open/shower/security,/turf/simulated/floor/tiled/freezer,/area/security/prison) -"aMd" = (/obj/structure/mopbucket,/obj/item/weapon/mop,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/freezer,/area/security/prison) +"aMd" = (/obj/structure/mopbucket,/obj/item/mop,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/freezer,/area/security/prison) "aMe" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24; pixel_y = 0},/turf/simulated/floor/tiled,/area/storage/art) "aMf" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/storage/art) "aMg" = (/obj/machinery/camera/network/civilian{c_tag = "CIV - Art Storage"; dir = 8},/turf/simulated/floor/tiled,/area/storage/art) "aMh" = (/obj/machinery/firealarm{dir = 4; pixel_x = 26},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) "aMi" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = -30},/turf/simulated/floor/tiled/dark,/area/lawoffice) -"aMj" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled,/area/holodeck_control) -"aMk" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/light{dir = 8},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) +"aMj" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled,/area/holodeck_control) +"aMk" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/light{dir = 8},/obj/item/stool/padded,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aMl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aMm" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) -"aMn" = (/obj/item/weapon/soap/nanotrasen,/obj/item/weapon/soap/nanotrasen,/obj/structure/table/standard,/obj/random/soap,/obj/item/clothing/under/bathrobe,/obj/item/clothing/under/bathrobe,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) +"aMn" = (/obj/item/soap/nanotrasen,/obj/item/soap/nanotrasen,/obj/structure/table/standard,/obj/random/soap,/obj/item/clothing/under/bathrobe,/obj/item/clothing/under/bathrobe,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) "aMo" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) "aMp" = (/obj/structure/mirror{pixel_x = 28},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) "aMq" = (/obj/machinery/door/airlock{name = "Unisex Showers"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) @@ -1996,31 +1996,31 @@ "aMt" = (/obj/effect/floor_decal/spline/plain,/turf/simulated/floor/water/pool,/area/crew_quarters/pool) "aMu" = (/obj/effect/floor_decal/spline/plain,/turf/simulated/floor/water/deep/pool,/area/crew_quarters/pool) "aMv" = (/obj/effect/floor_decal/spline/plain{dir = 6},/turf/simulated/floor/water/deep/pool,/area/crew_quarters/pool) -"aMw" = (/obj/structure/closet,/obj/item/weapon/beach_ball,/obj/random/maintenance/clean,/obj/random/maintenance/cargo,/turf/simulated/floor,/area/maintenance/pool) +"aMw" = (/obj/structure/closet,/obj/item/beach_ball,/obj/random/maintenance/clean,/obj/random/maintenance/cargo,/turf/simulated/floor,/area/maintenance/pool) "aMx" = (/turf/simulated/wall/r_wall,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) "aMy" = (/turf/simulated/wall/r_wall,/area/maintenance/security_port) "aMz" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/maintenance{name = "Security Maintenance"; req_access = list(1)},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/maintenance/security_port) "aMA" = (/turf/simulated/wall/r_wall,/area/security/lobby) "aMB" = (/obj/machinery/door/airlock/glass_security{name = "Security Lobby"},/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/security/lobby) "aMC" = (/obj/structure/table/steel,/obj/machinery/microwave,/turf/simulated/floor/tiled,/area/security/prison) -"aMD" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table/steel,/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/donkpockets{pixel_x = -3; pixel_y = -3},/turf/simulated/floor/tiled,/area/security/prison) -"aME" = (/obj/structure/table/steel,/obj/item/weapon/dice,/obj/machinery/camera/network/prison{c_tag = "SEC - Common Brig Aft"; dir = 1},/obj/item/weapon/deck/cards,/turf/simulated/floor/tiled,/area/security/prison) -"aMF" = (/obj/structure/table/steel,/obj/item/weapon/book/codex/corp_regs,/obj/item/device/taperecorder{pixel_x = -4; pixel_y = 2},/turf/simulated/floor/tiled,/area/security/prison) -"aMG" = (/obj/structure/table/steel,/obj/item/weapon/newspaper,/obj/machinery/light,/turf/simulated/floor/tiled,/area/security/prison) +"aMD" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table/steel,/obj/item/storage/box/donkpockets,/obj/item/storage/box/donkpockets{pixel_x = -3; pixel_y = -3},/turf/simulated/floor/tiled,/area/security/prison) +"aME" = (/obj/structure/table/steel,/obj/item/dice,/obj/machinery/camera/network/prison{c_tag = "SEC - Common Brig Aft"; dir = 1},/obj/item/deck/cards,/turf/simulated/floor/tiled,/area/security/prison) +"aMF" = (/obj/structure/table/steel,/obj/item/book/codex/corp_regs,/obj/item/taperecorder{pixel_x = -4; pixel_y = 2},/turf/simulated/floor/tiled,/area/security/prison) +"aMG" = (/obj/structure/table/steel,/obj/item/newspaper,/obj/machinery/light,/turf/simulated/floor/tiled,/area/security/prison) "aMH" = (/obj/machinery/cryopod,/obj/effect/floor_decal/industrial/warning{dir = 9},/turf/simulated/floor/tiled/white,/area/security/prison) "aMI" = (/obj/structure/cryofeed,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled/white,/area/security/prison) -"aMJ" = (/obj/item/weapon/bedsheet/orange,/obj/structure/bed/padded,/turf/simulated/floor/tiled,/area/security/prison) +"aMJ" = (/obj/item/bedsheet/orange,/obj/structure/bed/padded,/turf/simulated/floor/tiled,/area/security/prison) "aMK" = (/obj/structure/closet{name = "Prisoner's Locker"},/obj/item/clothing/head/soft/orange,/obj/item/clothing/shoes/sandal,/turf/simulated/floor/tiled,/area/security/prison) -"aML" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/item/weapon/bedsheet/orange,/obj/structure/bed/padded,/turf/simulated/floor/tiled,/area/security/prison) -"aMM" = (/obj/structure/closet{name = "Prisoner's Locker"},/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe,/obj/item/clothing/suit/storage/apron/overalls,/obj/machinery/camera/network/prison{c_tag = "SEC - Brig Bedroom"; dir = 8},/turf/simulated/floor/tiled,/area/security/prison) +"aML" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/item/bedsheet/orange,/obj/structure/bed/padded,/turf/simulated/floor/tiled,/area/security/prison) +"aMM" = (/obj/structure/closet{name = "Prisoner's Locker"},/obj/item/reagent_containers/food/drinks/bottle/absinthe,/obj/item/clothing/suit/storage/apron/overalls,/obj/machinery/camera/network/prison{c_tag = "SEC - Brig Bedroom"; dir = 8},/turf/simulated/floor/tiled,/area/security/prison) "aMN" = (/obj/machinery/door/airlock{name = "Toilet"},/turf/simulated/floor/tiled/freezer,/area/security/prison) -"aMO" = (/obj/structure/table/standard,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box{pixel_x = 3; pixel_y = 3},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/item/weapon/tape_roll{pixel_x = 4; pixel_y = 4},/obj/item/weapon/tape_roll,/turf/simulated/floor/tiled,/area/storage/art) -"aMP" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen/blue{pixel_x = -5; pixel_y = -1},/obj/item/weapon/pen/red{pixel_x = -1; pixel_y = 3},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/light,/turf/simulated/floor/tiled,/area/storage/art) +"aMO" = (/obj/structure/table/standard,/obj/item/storage/box,/obj/item/storage/box{pixel_x = 3; pixel_y = 3},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/item/tape_roll{pixel_x = 4; pixel_y = 4},/obj/item/tape_roll,/turf/simulated/floor/tiled,/area/storage/art) +"aMP" = (/obj/structure/table/standard,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/pen/blue{pixel_x = -5; pixel_y = -1},/obj/item/pen/red{pixel_x = -1; pixel_y = 3},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/light,/turf/simulated/floor/tiled,/area/storage/art) "aMQ" = (/obj/structure/table/standard,/obj/machinery/recharger,/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/turf/simulated/floor/tiled,/area/storage/art) "aMR" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_aft) -"aMS" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/briefcase{pixel_x = -2; pixel_y = -5},/obj/item/weapon/storage/briefcase{pixel_x = 3; pixel_y = 0},/obj/machinery/light,/turf/simulated/floor/tiled/dark,/area/lawoffice) +"aMS" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/storage/briefcase{pixel_x = -2; pixel_y = -5},/obj/item/storage/briefcase{pixel_x = 3; pixel_y = 0},/obj/machinery/light,/turf/simulated/floor/tiled/dark,/area/lawoffice) "aMT" = (/obj/structure/closet/lawcloset,/turf/simulated/floor/tiled/dark,/area/lawoffice) -"aMU" = (/obj/structure/table/standard,/obj/machinery/light{dir = 8},/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled,/area/holodeck_control) +"aMU" = (/obj/structure/table/standard,/obj/machinery/light{dir = 8},/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled,/area/holodeck_control) "aMV" = (/obj/structure/table/glass,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aMW" = (/obj/structure/disposalpipe/segment,/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aMX" = (/obj/machinery/recharge_station,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) @@ -2060,7 +2060,7 @@ "aNF" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) "aNG" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) "aNH" = (/obj/structure/bed/chair,/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) -"aNI" = (/obj/structure/bed/chair,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) +"aNI" = (/obj/structure/bed/chair,/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) "aNJ" = (/obj/structure/bed/chair,/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) "aNK" = (/obj/machinery/sleep_console{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) "aNL" = (/obj/machinery/sleeper{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) @@ -2079,20 +2079,20 @@ "aNY" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/maintenance/security_starboard) "aNZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/hallway/secondary/civilian_hallway_aft) "aOa" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/maintenance/holodeck) -"aOb" = (/obj/structure/closet,/obj/item/clothing/suit/storage/toggle/labcoat/genetics,/obj/item/weapon/storage/backpack/genetics,/obj/random/maintenance/clean,/obj/random/maintenance/medical,/turf/simulated/floor,/area/maintenance/holodeck) +"aOb" = (/obj/structure/closet,/obj/item/clothing/suit/storage/toggle/labcoat/genetics,/obj/item/storage/backpack/genetics,/obj/random/maintenance/clean,/obj/random/maintenance/medical,/turf/simulated/floor,/area/maintenance/holodeck) "aOc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aOd" = (/obj/machinery/light/small{dir = 8},/obj/structure/toilet{dir = 4},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) "aOe" = (/obj/machinery/door/airlock{name = "Unit 2"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) "aOf" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) "aOg" = (/obj/machinery/light,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) "aOh" = (/obj/machinery/washing_machine,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) -"aOi" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/light,/obj/item/weapon/bikehorn/rubberducky,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) +"aOi" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/light,/obj/item/bikehorn/rubberducky,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/recreation_area_restroom) "aOj" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) "aOk" = (/obj/structure/table/glass,/obj/machinery/light,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) -"aOl" = (/obj/item/weapon/stool/padded,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) +"aOl" = (/obj/item/stool/padded,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) "aOm" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/camera/network/civilian{c_tag = "CIV - Pool Aft"; dir = 1},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) -"aOn" = (/obj/item/weapon/stool/padded,/obj/machinery/ai_status_display{pixel_y = -32},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) -"aOo" = (/obj/structure/table/glass,/obj/item/weapon/inflatable_duck,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) +"aOn" = (/obj/item/stool/padded,/obj/machinery/ai_status_display{pixel_y = -32},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) +"aOo" = (/obj/structure/table/glass,/obj/item/inflatable_duck,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) "aOp" = (/obj/structure/shuttle/window,/obj/structure/grille,/turf/simulated/shuttle/plating,/area/shuttle/large_escape_pod2/station) "aOq" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) "aOr" = (/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) @@ -2117,11 +2117,11 @@ "aOK" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/primary/central_two) "aOL" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/primary/central_two) "aOM" = (/obj/machinery/camera/network/northern_star{c_tag = "Hall - Recreation Aft"; dir = 4},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) -"aON" = (/obj/item/inflatable/door/torn,/obj/item/weapon/tool/screwdriver,/turf/simulated/floor,/area/maintenance/pool) +"aON" = (/obj/item/inflatable/door/torn,/obj/item/tool/screwdriver,/turf/simulated/floor,/area/maintenance/pool) "aOO" = (/obj/structure/bed/chair{dir = 1},/obj/machinery/vending/wallmed1{layer = 3.3; name = "Emergency NanoMed"; pixel_x = -28; pixel_y = 0},/obj/structure/closet/walllocker/emerglocker{pixel_x = 0; pixel_y = -32},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) "aOP" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) "aOQ" = (/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod{frequency = 1380; id_tag = "large_escape_pod_2"; pixel_x = 26; pixel_y = -26; tag_door = "large_escape_pod_2_hatch"},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) -"aOR" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 3},/obj/item/weapon/extinguisher,/obj/item/weapon/tool/crowbar,/obj/random/medical/lite,/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) +"aOR" = (/obj/structure/table/standard,/obj/item/storage/firstaid/fire,/obj/item/storage/firstaid/regular{pixel_x = 2; pixel_y = 3},/obj/item/extinguisher,/obj/item/tool/crowbar,/obj/random/medical/lite,/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) "aOS" = (/obj/structure/bed/chair{dir = 1},/obj/structure/closet/walllocker/emerglocker{pixel_x = 0; pixel_y = -32},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) "aOT" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) "aOU" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/maintenance/substation/security) @@ -2145,7 +2145,7 @@ "aPm" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/pool) "aPn" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "large_escape_pod_2_hatch"; locked = 1; name = "Large Escape Pod Hatch 2"; req_access = list(13)},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) "aPo" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion_l"},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod2/station) -"aPp" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/structure/table/steel,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/maintenance/substation/security) +"aPp" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/structure/table/steel,/obj/machinery/cell_charger,/obj/item/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/maintenance/substation/security) "aPq" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor,/area/maintenance/substation/security) "aPr" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/turf/simulated/floor,/area/maintenance/substation/security) "aPs" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{req_access = list(12)},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor,/area/maintenance/security_port) @@ -2153,7 +2153,7 @@ "aPu" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) "aPv" = (/obj/structure/sign/pods{dir = 8; pixel_x = -32; pixel_y = 0},/obj/structure/sign/directions/evac{pixel_y = 32; pixel_z = 8},/obj/structure/sign/directions/medical{dir = 4; pixel_y = 32},/obj/structure/sign/directions/science{dir = 2; pixel_y = 32; pixel_z = -8},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_one) "aPw" = (/obj/structure/sign/directions/security{dir = 4; pixel_y = 32},/obj/structure/sign/directions/cargo{dir = 2; pixel_y = 32; pixel_z = 8},/obj/structure/sign/directions/engineering{dir = 2; pixel_y = 32; pixel_z = -8},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_one) -"aPx" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_one) +"aPx" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_one) "aPy" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/hallway/primary/central_one) "aPz" = (/obj/structure/sign/directions/security{dir = 1; pixel_y = 32},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_one) "aPA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/hallway/primary/central_one) @@ -2181,7 +2181,7 @@ "aPW" = (/obj/machinery/door/airlock/glass{name = "Recreation Area"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aPX" = (/turf/simulated/wall,/area/storage/tools) "aPY" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/pool) -"aPZ" = (/obj/effect/decal/cleanable/dirt,/obj/structure/closet/crate,/obj/item/weapon/reagent_containers/food/drinks/bottle/wine,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/random/drinkbottle,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/pool) +"aPZ" = (/obj/effect/decal/cleanable/dirt,/obj/structure/closet/crate,/obj/item/reagent_containers/food/drinks/bottle/wine,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/random/drinkbottle,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/pool) "aQa" = (/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "large_escape_pod_2_berth_hatch"; locked = 1; name = "Large Escape Pod 2"; req_access = list(13)},/turf/simulated/floor,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) "aQb" = (/turf/simulated/wall,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) "aQc" = (/obj/machinery/computer/arcade,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) @@ -2203,11 +2203,11 @@ "aQs" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = 28},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) "aQt" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/camera/network/northern_star{c_tag = "Hall - Central Primary Fore Mid 1"; dir = 2},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) "aQu" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_one) -"aQv" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/disposalpipe/segment{dir = 4},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) +"aQv" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/disposalpipe/segment{dir = 4},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) "aQw" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) "aQx" = (/obj/structure/disposalpipe/junction{icon_state = "pipe-j1"; dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) "aQy" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) -"aQz" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) +"aQz" = (/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) "aQA" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = 28},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) "aQB" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable{d2 = 2; icon_state = "0-2"; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) "aQC" = (/obj/machinery/door/airlock/glass{name = "Central Access"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_two) @@ -2226,7 +2226,7 @@ "aQP" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aQQ" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aQR" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/camera/network/northern_star{c_tag = "Hall - Recreation Aft Starboard"; dir = 2},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) -"aQS" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) +"aQS" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aQT" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aQU" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aQV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/storage/tools) @@ -2235,14 +2235,14 @@ "aQY" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/random/tech_supply,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/storage/tools) "aQZ" = (/obj/structure/closet/toolcloset,/turf/simulated/floor/tiled,/area/storage/tools) "aRa" = (/obj/structure/closet,/obj/item/clothing/head/ushanka,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/pool) -"aRb" = (/obj/structure/table/rack,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/pool) +"aRb" = (/obj/structure/table/rack,/obj/item/flame/lighter/random,/obj/item/storage/fancy/cigarettes/dromedaryco,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/pool) "aRc" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 9},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) "aRd" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) "aRe" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 5},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) "aRf" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "large_escape_pod_2_berth_hatch"; locked = 1; name = "Large Escape Pod 2"; req_access = list(13)},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) "aRg" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth{frequency = 1380; id_tag = "large_escape_pod_2_berth"; pixel_x = 0; pixel_y = 26; tag_door = "large_escape_pod_2_berth_hatch"},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 9},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) "aRh" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) -"aRi" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 27},/obj/machinery/hologram/holopad,/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) +"aRi" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 27},/obj/machinery/hologram/holopad,/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) "aRj" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) "aRk" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) "aRl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/sign/pods{dir = 8; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) @@ -2327,7 +2327,7 @@ "aSM" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) "aSN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) "aSO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) -"aSP" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/disposalpipe/segment{dir = 4},/obj/item/device/radio/intercom{layer = 4; name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) +"aSP" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/disposalpipe/segment{dir = 4},/obj/item/radio/intercom{layer = 4; name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) "aSQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_port_escape_pod_hallway) "aSR" = (/obj/machinery/door/airlock/glass{name = "Central Access"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_one) "aSS" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) @@ -2343,7 +2343,7 @@ "aTc" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) "aTd" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/light,/turf/simulated/floor/tiled,/area/hallway/primary/central_one) "aTe" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) -"aTf" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) +"aTf" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) "aTg" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) "aTh" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_one) "aTi" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) @@ -2367,7 +2367,7 @@ "aTA" = (/obj/machinery/door/airlock/glass{name = "Central Access"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "aTB" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aTC" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/light,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) -"aTD" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) +"aTD" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aTE" = (/obj/machinery/light,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aTF" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aTG" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) @@ -2416,7 +2416,7 @@ "aUx" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/recreation_area_hallway) "aUy" = (/obj/item/clothing/head/cone,/turf/simulated/floor/tiled/dark,/area/crew_quarters/recreation_area_hallway) "aUz" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = -26; pixel_y = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/tiled,/area/storage/tools) -"aUA" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled,/area/storage/tools) +"aUA" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled,/area/storage/tools) "aUB" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled,/area/storage/tools) "aUC" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/storage/tools) "aUD" = (/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/structure/table/steel,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/recharger{pixel_y = 0},/turf/simulated/floor/tiled,/area/storage/tools) @@ -2433,7 +2433,7 @@ "aUO" = (/turf/simulated/wall,/area/gateway) "aUP" = (/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/tiled/dark,/area/gateway) "aUQ" = (/turf/simulated/floor/tiled/dark,/area/gateway) -"aUR" = (/obj/structure/closet/emcloset,/obj/item/weapon/storage/toolbox/emergency,/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/floor/tiled/dark,/area/gateway) +"aUR" = (/obj/structure/closet/emcloset,/obj/item/storage/toolbox/emergency,/obj/item/storage/toolbox/emergency,/turf/simulated/floor/tiled/dark,/area/gateway) "aUS" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass{name = "Central Access"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_one) "aUT" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/airlock/glass{name = "Central Access"},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) "aUU" = (/obj/machinery/door/airlock/glass{name = "Central Access"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_one) @@ -2460,8 +2460,8 @@ "aVp" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 4; icon_state = "intact"},/obj/machinery/atmospherics/pipe/simple/visible/universal,/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation) "aVq" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 4; icon_state = "intact"},/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation) "aVr" = (/obj/machinery/atmospherics/pipe/manifold/visible/cyan,/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation) -"aVs" = (/obj/structure/closet,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor,/area/maintenance/pool) -"aVt" = (/obj/structure/closet,/obj/item/clothing/glasses/welding,/obj/item/weapon/weldingtool,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/research,/obj/random/maintenance/research,/turf/simulated/floor/plating,/area/maintenance/research_shuttle) +"aVs" = (/obj/structure/closet,/obj/item/towel/random,/obj/item/towel/random,/obj/item/towel/random,/obj/item/towel/random,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor,/area/maintenance/pool) +"aVt" = (/obj/structure/closet,/obj/item/clothing/glasses/welding,/obj/item/weldingtool,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/research,/obj/random/maintenance/research,/turf/simulated/floor/plating,/area/maintenance/research_shuttle) "aVu" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/research_shuttle) "aVv" = (/turf/simulated/wall/r_wall,/area/rnd/research_foyer_auxiliary) "aVw" = (/obj/structure/sign/securearea,/turf/simulated/wall/r_wall,/area/rnd/research_foyer_auxiliary) @@ -2511,7 +2511,7 @@ "aWo" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/closet/firecloset,/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation) "aWp" = (/obj/machinery/door/airlock/maintenance{req_one_access = list(12,5)},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/pool) "aWq" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/maintenance/research_shuttle) -"aWr" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer_auxiliary) +"aWr" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer_auxiliary) "aWs" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer_auxiliary) "aWt" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer_auxiliary) "aWu" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/computer/cryopod/gateway{pixel_x = -32},/turf/simulated/floor/tiled/dark,/area/gateway) @@ -2520,7 +2520,7 @@ "aWx" = (/obj/machinery/cryopod/robot/door/gateway,/turf/simulated/floor/tiled/dark,/area/gateway) "aWy" = (/obj/machinery/gateway{dir = 4},/turf/simulated/floor/tiled/dark,/area/gateway) "aWz" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/gateway) -"aWA" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/dark,/area/gateway) +"aWA" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/dark,/area/gateway) "aWB" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/primary/central_four) "aWC" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "aWD" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) @@ -2533,14 +2533,14 @@ "aWK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled/dark,/area/ai_upload_foyer) "aWL" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/sign/kiddieplaque{pixel_y = 32},/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor/tiled/dark,/area/ai_upload_foyer) "aWM" = (/obj/structure/bed/chair/office/light{dir = 4},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/cyan{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/dark,/area/ai_cyborg_station) -"aWN" = (/obj/structure/table/standard,/obj/item/weapon/phone,/obj/machinery/light{dir = 1},/turf/simulated/floor/bluegrid,/area/ai_cyborg_station) +"aWN" = (/obj/structure/table/standard,/obj/item/phone,/obj/machinery/light{dir = 1},/turf/simulated/floor/bluegrid,/area/ai_cyborg_station) "aWO" = (/obj/machinery/computer/aifixer,/turf/simulated/floor/bluegrid,/area/ai_cyborg_station) "aWP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/maintenance/central) "aWQ" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hydroponics/garden) "aWR" = (/obj/machinery/smartfridge/drying_rack,/turf/simulated/floor/grass,/area/hydroponics/garden) "aWS" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 2},/obj/machinery/seed_storage/garden,/turf/simulated/floor/grass,/area/hydroponics/garden) "aWT" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 2},/obj/machinery/vending/hydronutrients,/turf/simulated/floor/grass,/area/hydroponics/garden) -"aWU" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 6},/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/glass/bucket,/obj/machinery/light{dir = 1},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/grass,/area/hydroponics/garden) +"aWU" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 6},/obj/structure/table/woodentable,/obj/item/reagent_containers/glass/bucket,/obj/machinery/light{dir = 1},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/grass,/area/hydroponics/garden) "aWV" = (/obj/structure/sink/kitchen{pixel_y = 28},/obj/effect/floor_decal/corner/green{dir = 9},/turf/simulated/floor/tiled,/area/hydroponics/garden) "aWW" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/hydroponics/garden) "aWX" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hydroponics/garden) @@ -2558,7 +2558,7 @@ "aXj" = (/obj/structure/dispenser/oxygen,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva) "aXk" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 9},/obj/machinery/door/window/southleft,/obj/item/clothing/suit/space,/obj/item/clothing/head/helmet/space,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva) "aXl" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 5},/obj/machinery/door/window/southright,/obj/item/clothing/suit/space,/obj/item/clothing/head/helmet/space,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva) -"aXm" = (/obj/structure/table/rack,/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/item/device/suit_cooling_unit,/obj/item/device/suit_cooling_unit,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva) +"aXm" = (/obj/structure/table/rack,/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/item/suit_cooling_unit,/obj/item/suit_cooling_unit,/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva) "aXn" = (/obj/item/stack/material/wood{amount = 24},/turf/simulated/floor,/area/ai_monitored/storage/emergency/eva) "aXo" = (/obj/item/stack/material/wood,/turf/simulated/floor,/area/ai_monitored/storage/emergency/eva) "aXp" = (/obj/machinery/newscaster{pixel_y = 32},/obj/effect/floor_decal/corner/brown/full{dir = 1},/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva) @@ -2567,7 +2567,7 @@ "aXs" = (/obj/effect/floor_decal/corner/yellow{dir = 5},/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva) "aXt" = (/obj/effect/floor_decal/corner/yellow{dir = 5},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva) "aXu" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/maintenance/medbay_fore) -"aXv" = (/obj/structure/closet,/obj/item/weapon/storage/backpack,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/firstaid,/turf/simulated/floor/plating,/area/maintenance/medbay_fore) +"aXv" = (/obj/structure/closet,/obj/item/storage/backpack,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/firstaid,/turf/simulated/floor/plating,/area/maintenance/medbay_fore) "aXw" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/powered/pump/filled,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/hydro,/area/maintenance/engineering/pumpstation) "aXx" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 9; icon_state = "intact"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation) "aXy" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation) @@ -2605,7 +2605,7 @@ "aYe" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/highsecurity{name = "AI Upload Access"; req_access = list(16)},/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/dark,/area/ai_upload_foyer) "aYf" = (/obj/structure/cable/cyan{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/dark,/area/ai_cyborg_station) "aYg" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/dark,/area/ai_cyborg_station) -"aYh" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/dark,/area/ai_cyborg_station) +"aYh" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/dark,/area/ai_cyborg_station) "aYi" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/hydroponics/garden) "aYj" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/turf/simulated/floor/grass,/area/hydroponics/garden) "aYk" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 6},/turf/simulated/floor/grass,/area/hydroponics/garden) @@ -2635,7 +2635,7 @@ "aYI" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva) "aYJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva) "aYK" = (/turf/simulated/floor/tiled/yellow,/area/ai_monitored/storage/emergency/eva) -"aYL" = (/obj/structure/table/rack{dir = 1},/obj/item/weapon/storage/toolbox/emergency,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/maintenance/medbay_fore) +"aYL" = (/obj/structure/table/rack{dir = 1},/obj/item/storage/toolbox/emergency,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/maintenance/medbay_fore) "aYM" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/powered/scrubber,/turf/simulated/floor/tiled/hydro,/area/maintenance/engineering/pumpstation) "aYN" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/red{dir = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation) "aYO" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation) @@ -2654,17 +2654,17 @@ "aZb" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/gateway) "aZc" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/gateway) "aZd" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/gateway) -"aZe" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/closet/emcloset,/obj/item/weapon/storage/toolbox/emergency,/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/floor/tiled,/area/gateway) +"aZe" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/closet/emcloset,/obj/item/storage/toolbox/emergency,/obj/item/storage/toolbox/emergency,/turf/simulated/floor/tiled,/area/gateway) "aZf" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/shuttle/plating,/area/gateway) "aZg" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "aZh" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "aZi" = (/obj/structure/disposalpipe/junction{dir = 1; icon_state = "pipe-j2"},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "aZj" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "aZk" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) -"aZl" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/dark,/area/ai_server_room) +"aZl" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/dark,/area/ai_server_room) "aZm" = (/turf/simulated/floor/tiled/dark,/area/ai_server_room) "aZn" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/ai_server_room) -"aZo" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/machinery/turretid/stun{control_area = "\improper AI Upload Chamber"; name = "AI Upload turret control"; pixel_x = 6; pixel_y = -24},/obj/item/device/radio/intercom{broadcasting = 1; frequency = 1447; name = "Private AI Channel"; pixel_x = -12; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/ai_upload_foyer) +"aZo" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/machinery/turretid/stun{control_area = "\improper AI Upload Chamber"; name = "AI Upload turret control"; pixel_x = 6; pixel_y = -24},/obj/item/radio/intercom{broadcasting = 1; frequency = 1447; name = "Private AI Channel"; pixel_x = -12; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/ai_upload_foyer) "aZp" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/cyan{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/flasher{id = "AIFoyer"; pixel_x = 22; pixel_y = -36},/turf/simulated/floor/tiled/dark,/area/ai_upload_foyer) "aZq" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/cyan{d2 = 8; icon_state = "0-8"},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/dark,/area/ai_upload_foyer) "aZr" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/ai_cyborg_station) @@ -2678,7 +2678,7 @@ "aZz" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/hydroponics/garden) "aZA" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled,/area/hydroponics/garden) "aZB" = (/obj/effect/floor_decal/corner/green/full{dir = 1},/turf/simulated/floor/tiled,/area/hydroponics/garden) -"aZC" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) +"aZC" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "aZD" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "aZE" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "aZF" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) @@ -2700,10 +2700,10 @@ "aZV" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{icon_state = "intact"; dir = 9},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = 12; pixel_y = -24},/obj/structure/cable,/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation) "aZW" = (/obj/structure/table/steel_reinforced,/obj/machinery/cell_charger,/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation) "aZX" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/engineering/pumpstation) -"aZY" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 6},/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation) +"aZY" = (/obj/structure/table/steel_reinforced,/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 6},/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation) "aZZ" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/table/steel_reinforced,/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/steel{amount = 50; pixel_x = -2; pixel_y = -2},/turf/simulated/floor/tiled,/area/maintenance/engineering/pumpstation) "baa" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/research_shuttle) -"bab" = (/obj/effect/decal/cleanable/generic,/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/floor/plating,/area/maintenance/research_shuttle) +"bab" = (/obj/effect/decal/cleanable/generic,/obj/item/material/shard{icon_state = "medium"},/turf/simulated/floor/plating,/area/maintenance/research_shuttle) "bac" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/airlock/research{name = "Research Division Auxiliary Access"; req_access = list(47)},/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer_auxiliary) "bad" = (/obj/machinery/lapvend,/turf/simulated/floor/tiled,/area/gateway) "bae" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/gateway) @@ -2723,7 +2723,7 @@ "bas" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled/dark,/area/ai_server_room) "bat" = (/turf/simulated/wall/r_wall,/area/ai_upload) "bau" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/highsecurity{name = "AI Upload"; req_access = list(16)},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/ai_upload) -"bav" = (/obj/structure/closet/crate{name = "Camera Assembly Crate"},/obj/item/weapon/camera_assembly,/obj/item/weapon/camera_assembly,/obj/item/weapon/camera_assembly,/obj/item/weapon/camera_assembly,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled/dark,/area/ai_cyborg_station) +"bav" = (/obj/structure/closet/crate{name = "Camera Assembly Crate"},/obj/item/camera_assembly,/obj/item/camera_assembly,/obj/item/camera_assembly,/obj/item/camera_assembly,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled/dark,/area/ai_cyborg_station) "baw" = (/obj/machinery/recharge_station,/obj/machinery/camera/network/command{c_tag = "AI - Cyborg Station"; dir = 1},/turf/simulated/floor/bluegrid,/area/ai_cyborg_station) "bax" = (/obj/machinery/recharge_station,/turf/simulated/floor/bluegrid,/area/ai_cyborg_station) "bay" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hydroponics/garden) @@ -2732,24 +2732,24 @@ "baB" = (/obj/structure/flora/ausbushes/brflowers,/turf/simulated/floor/grass,/area/hydroponics/garden) "baC" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "baD" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/primary/central_two) -"baE" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/industrial/warning,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = 12; pixel_y = -24},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva) -"baF" = (/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 6},/obj/item/weapon/storage/briefcase/inflatable{pixel_y = 3},/obj/item/weapon/storage/briefcase/inflatable{pixel_x = -3},/obj/structure/table/reinforced,/obj/effect/floor_decal/industrial/warning,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva) +"baE" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/industrial/warning,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/cell/high{charge = 100; maxcharge = 15000},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/cell/high{charge = 100; maxcharge = 15000},/obj/item/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = 12; pixel_y = -24},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva) +"baF" = (/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 6},/obj/item/storage/briefcase/inflatable{pixel_y = 3},/obj/item/storage/briefcase/inflatable{pixel_x = -3},/obj/structure/table/reinforced,/obj/effect/floor_decal/industrial/warning,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva) "baG" = (/obj/machinery/suit_storage_unit/standard_unit,/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva) -"baH" = (/obj/structure/table/reinforced,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/floor_decal/industrial/warning,/obj/item/weapon/tool/crowbar/red,/obj/item/weapon/tool/crowbar/red,/obj/item/weapon/tool/crowbar/red,/obj/item/weapon/tool/crowbar/red,/obj/item/weapon/tool/crowbar/red,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/camera/network/civilian{c_tag = "CIV - Emergency EVA"; dir = 1},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva) -"baI" = (/obj/structure/table/woodentable,/obj/machinery/light,/obj/effect/floor_decal/corner/brown{dir = 10},/obj/random/maintenance/engineering,/obj/item/weapon/storage/belt/utility,/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva) +"baH" = (/obj/structure/table/reinforced,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/floor_decal/industrial/warning,/obj/item/tool/crowbar/red,/obj/item/tool/crowbar/red,/obj/item/tool/crowbar/red,/obj/item/tool/crowbar/red,/obj/item/tool/crowbar/red,/obj/item/flashlight,/obj/item/flashlight,/obj/item/radio/off,/obj/item/radio/off,/obj/item/radio/off,/obj/item/radio/off,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/camera/network/civilian{c_tag = "CIV - Emergency EVA"; dir = 1},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva) +"baI" = (/obj/structure/table/woodentable,/obj/machinery/light,/obj/effect/floor_decal/corner/brown{dir = 10},/obj/random/maintenance/engineering,/obj/item/storage/belt/utility,/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva) "baJ" = (/obj/effect/floor_decal/corner/brown{dir = 10},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva) "baK" = (/obj/effect/floor_decal/corner/brown/full{dir = 4},/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva) "baL" = (/obj/effect/floor_decal/corner/yellow/full,/obj/effect/decal/cleanable/blood/oil,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva) -"baM" = (/obj/effect/floor_decal/corner/yellow{dir = 10},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva) -"baN" = (/obj/effect/floor_decal/corner/yellow{dir = 10},/obj/structure/table/marble,/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/item/taperoll/engineering,/obj/item/weapon/tool/crowbar,/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva) +"baM" = (/obj/effect/floor_decal/corner/yellow{dir = 10},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva) +"baN" = (/obj/effect/floor_decal/corner/yellow{dir = 10},/obj/structure/table/marble,/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/item/taperoll/engineering,/obj/item/tool/crowbar,/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva) "baO" = (/obj/structure/table/marble,/turf/simulated/floor/tiled/yellow,/area/ai_monitored/storage/emergency/eva) "baP" = (/obj/structure/closet/crate/freezer,/turf/simulated/floor/tiled/freezer,/area/medical/surgery_storage) "baQ" = (/obj/structure/closet/crate/freezer,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/tiled/freezer,/area/medical/surgery_storage) "baR" = (/obj/machinery/iv_drip,/turf/simulated/floor/tiled/freezer,/area/medical/surgery_storage) "baS" = (/obj/machinery/door/blast/shutters{density = 0; dir = 4; icon_state = "shutter0"; id = "medbayquar"; name = "Medbay Emergency Lockdown Shutters"; opacity = 0},/turf/simulated/floor,/area/maintenance/medbay_fore) "baT" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor,/area/maintenance/medbay_fore) -"baU" = (/obj/structure/closet/crate,/obj/item/weapon/coin/silver,/obj/effect/decal/cleanable/cobweb2{icon_state = "cobweb1"},/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/mine/unexplored/upper_level) -"baV" = (/obj/structure/closet/crate,/obj/item/clothing/shoes/boots/combat,/obj/item/weapon/tank/air,/obj/item/weapon/tank/air,/obj/item/weapon/tank/air,/obj/item/clothing/mask/gas,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/cargo,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/mine/unexplored/upper_level) +"baU" = (/obj/structure/closet/crate,/obj/item/coin/silver,/obj/effect/decal/cleanable/cobweb2{icon_state = "cobweb1"},/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/mine/unexplored/upper_level) +"baV" = (/obj/structure/closet/crate,/obj/item/clothing/shoes/boots/combat,/obj/item/tank/air,/obj/item/tank/air,/obj/item/tank/air,/obj/item/clothing/mask/gas,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/cargo,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/mine/unexplored/upper_level) "baW" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/engineering{name = "Pump Station"; req_one_access = list(11,24)},/turf/simulated/floor,/area/maintenance/medbay_fore) "baX" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/research_shuttle) "baY" = (/mob/living/simple_mob/animal/passive/mouse,/turf/simulated/floor,/area/maintenance/research_shuttle) @@ -2758,7 +2758,7 @@ "bbb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/white,/area/rnd/research) "bbc" = (/obj/effect/floor_decal/corner/purple{dir = 6},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/atm{pixel_x = 28; pixel_y = 0},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/white,/area/rnd/research) "bbd" = (/turf/simulated/wall/r_wall,/area/rnd/research) -"bbe" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/table/standard,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/item/weapon/storage/fancy/cigarettes{pixel_y = 2},/obj/machinery/atm{pixel_x = 0; pixel_y = -30},/obj/item/weapon/deck/cards,/obj/item/weapon/book/codex/lore/vir,/turf/simulated/floor/tiled,/area/gateway) +"bbe" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/table/standard,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/item/storage/fancy/cigarettes{pixel_y = 2},/obj/machinery/atm{pixel_x = 0; pixel_y = -30},/obj/item/deck/cards,/obj/item/book/codex/lore/vir,/turf/simulated/floor/tiled,/area/gateway) "bbf" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/gateway) "bbg" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/gateway) "bbh" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/gateway) @@ -2783,9 +2783,9 @@ "bbA" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/structure/flora/ausbushes/brflowers,/turf/simulated/floor/grass,/area/hydroponics/garden) "bbB" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera/network/northern_star{c_tag = "Hall - Central Primary Starboard Fore 2"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "bbC" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/primary/central_two) -"bbD" = (/obj/structure/closet/crate/medical,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/FixOVein,/obj/item/weapon/surgical/circular_saw,/obj/item/weapon/surgical/scalpel,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/weapon/surgical/retractor,/obj/item/weapon/surgical/hemostat,/obj/item/weapon/surgical/cautery,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel,/obj/item/stack/nanopaste,/obj/item/weapon/autopsy_scanner,/obj/item/weapon/reagent_containers/spray/cleaner{desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2},/turf/simulated/floor/tiled/freezer,/area/medical/surgery_storage) +"bbD" = (/obj/structure/closet/crate/medical,/obj/item/surgical/surgicaldrill,/obj/item/surgical/FixOVein,/obj/item/surgical/circular_saw,/obj/item/surgical/scalpel,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/surgical/retractor,/obj/item/surgical/hemostat,/obj/item/surgical/cautery,/obj/item/surgical/bonesetter,/obj/item/surgical/bonegel,/obj/item/stack/nanopaste,/obj/item/autopsy_scanner,/obj/item/reagent_containers/spray/cleaner{desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2},/turf/simulated/floor/tiled/freezer,/area/medical/surgery_storage) "bbE" = (/turf/simulated/floor/tiled/freezer,/area/medical/surgery_storage) -"bbF" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/freezer,/area/medical/surgery_storage) +"bbF" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/freezer,/area/medical/surgery_storage) "bbG" = (/turf/simulated/floor,/area/mine/unexplored/upper_level) "bbH" = (/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor,/area/maintenance/medbay_fore) "bbI" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor,/area/maintenance/medbay_fore) @@ -2793,8 +2793,8 @@ "bbK" = (/obj/effect/decal/cleanable/cobweb2,/obj/effect/decal/cleanable/cobweb2{icon_state = "spiderling"; name = "dead spider"},/turf/simulated/floor,/area/maintenance/medbay_fore) "bbL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/research_shuttle) "bbM" = (/obj/machinery/floodlight,/turf/simulated/floor,/area/rnd/research_storage) -"bbN" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/table/standard,/obj/item/device/t_scanner,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor,/area/rnd/research_storage) -"bbO" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/gloves,/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/floor/plating,/area/rnd/research_storage) +"bbN" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/table/standard,/obj/item/t_scanner,/obj/item/storage/box/lights/mixed,/turf/simulated/floor,/area/rnd/research_storage) +"bbO" = (/obj/structure/table/rack,/obj/item/storage/box/gloves,/obj/item/storage/toolbox/emergency,/turf/simulated/floor/plating,/area/rnd/research_storage) "bbP" = (/turf/simulated/floor/tiled/white,/area/rnd/research) "bbQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/research) "bbR" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research) @@ -2805,7 +2805,7 @@ "bbW" = (/obj/structure/closet/l3closet/scientist,/turf/simulated/floor/tiled,/area/gateway) "bbX" = (/obj/structure/disposalpipe/segment,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bbY" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/newscaster{pixel_x = 28; pixel_y = 1},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) -"bbZ" = (/obj/structure/table/standard,/obj/item/weapon/hand_tele,/turf/simulated/floor/tiled/dark,/area/teleporter) +"bbZ" = (/obj/structure/table/standard,/obj/item/hand_tele,/turf/simulated/floor/tiled/dark,/area/teleporter) "bca" = (/obj/machinery/computer/teleporter,/turf/simulated/floor/tiled/dark,/area/teleporter) "bcb" = (/obj/machinery/teleport/station,/turf/simulated/floor/tiled/dark,/area/teleporter) "bcc" = (/obj/machinery/teleport/hub,/turf/simulated/floor/tiled/dark,/area/teleporter) @@ -2820,16 +2820,16 @@ "bcl" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/corner/green{dir = 6},/turf/simulated/floor/tiled,/area/hydroponics/garden) "bcm" = (/obj/structure/disposalpipe/segment,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "bcn" = (/turf/simulated/wall,/area/medical/surgeryobs) -"bco" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/cups{pixel_x = 0; pixel_y = 0},/turf/simulated/floor/tiled,/area/medical/surgeryobs) +"bco" = (/obj/structure/table/standard,/obj/item/storage/box/cups{pixel_x = 0; pixel_y = 0},/turf/simulated/floor/tiled,/area/medical/surgeryobs) "bcp" = (/obj/structure/reagent_dispensers/water_cooler/full,/obj/effect/floor_decal/corner/paleblue{dir = 2},/turf/simulated/floor/tiled,/area/medical/surgeryobs) -"bcq" = (/obj/structure/table/standard,/obj/item/weapon/surgical/hemostat,/obj/item/weapon/surgical/cautery,/obj/effect/floor_decal/corner/pink/full{dir = 8},/obj/machinery/button/remote/blast_door{id = "surgeryobs2"; name = "Privacy Shutters"; pixel_x = -26; pixel_y = 0},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/tiled/white,/area/medical/surgery2) -"bcr" = (/obj/structure/table/standard,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/weapon/surgical/retractor,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/white,/area/medical/surgery2) -"bcs" = (/obj/structure/table/standard,/obj/item/weapon/surgical/circular_saw{pixel_y = 8},/obj/item/weapon/surgical/scalpel,/obj/effect/floor_decal/corner/pink{dir = 5},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/medical/surgery2) -"bct" = (/obj/structure/table/standard,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/autopsy_scanner,/obj/item/weapon/reagent_containers/spray/cleaner{desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2},/obj/item/weapon/surgical/FixOVein,/turf/simulated/floor/tiled/white,/area/medical/surgery2) +"bcq" = (/obj/structure/table/standard,/obj/item/surgical/hemostat,/obj/item/surgical/cautery,/obj/effect/floor_decal/corner/pink/full{dir = 8},/obj/machinery/button/remote/blast_door{id = "surgeryobs2"; name = "Privacy Shutters"; pixel_x = -26; pixel_y = 0},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/tiled/white,/area/medical/surgery2) +"bcr" = (/obj/structure/table/standard,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/surgical/retractor,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/white,/area/medical/surgery2) +"bcs" = (/obj/structure/table/standard,/obj/item/surgical/circular_saw{pixel_y = 8},/obj/item/surgical/scalpel,/obj/effect/floor_decal/corner/pink{dir = 5},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/medical/surgery2) +"bct" = (/obj/structure/table/standard,/obj/item/surgical/surgicaldrill,/obj/item/autopsy_scanner,/obj/item/reagent_containers/spray/cleaner{desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2},/obj/item/surgical/FixOVein,/turf/simulated/floor/tiled/white,/area/medical/surgery2) "bcu" = (/obj/structure/closet/secure_closet/medical2,/obj/effect/floor_decal/corner/pink/full{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/surgery2) "bcv" = (/turf/simulated/wall,/area/medical/surgery2) "bcw" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) -"bcx" = (/obj/structure/table/standard,/obj/item/device/radio{anchored = 1; broadcasting = 0; canhear_range = 7; frequency = 1487; icon = 'icons/obj/items.dmi'; icon_state = "red_phone"; listening = 1; name = "Surgery Emergency Phone"},/obj/machinery/light{dir = 1},/obj/random/medical,/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) +"bcx" = (/obj/structure/table/standard,/obj/item/radio{anchored = 1; broadcasting = 0; canhear_range = 7; frequency = 1487; icon = 'icons/obj/items.dmi'; icon_state = "red_phone"; listening = 1; name = "Surgery Emergency Phone"},/obj/machinery/light{dir = 1},/obj/random/medical,/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) "bcy" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/tiled/freezer,/area/medical/surgery_storage) "bcz" = (/obj/machinery/door/airlock/maintenance{name = "Operating Theatre Maintenance Access"; req_access = list(45)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/freezer,/area/medical/surgery_storage) "bcA" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor,/area/maintenance/medbay_fore) @@ -2849,18 +2849,18 @@ "bcO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/gateway) "bcP" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/hallway/primary/central_four) "bcQ" = (/obj/structure/disposalpipe/segment,/obj/machinery/camera/network/northern_star{c_tag = "Hall - Central Primary Port Fore 1"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) -"bcR" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) +"bcR" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bcS" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 1},/obj/machinery/light,/turf/simulated/floor/tiled,/area/teleporter) -"bcT" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/teleporter) +"bcT" = (/obj/item/stool/padded,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/teleporter) "bcU" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/teleporter) "bcV" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/teleporter) -"bcW" = (/obj/structure/table/standard,/obj/item/weapon/aiModule/protectStation,/obj/machinery/light{dir = 1},/turf/simulated/floor/bluegrid,/area/ai_upload) +"bcW" = (/obj/structure/table/standard,/obj/item/aiModule/protectStation,/obj/machinery/light{dir = 1},/turf/simulated/floor/bluegrid,/area/ai_upload) "bcX" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/dark,/area/ai_upload) "bcY" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/ai_slipper{icon_state = "motion0"},/turf/simulated/floor/tiled/dark,/area/ai_upload) "bcZ" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/dark,/area/ai_upload) -"bda" = (/obj/structure/table/standard,/obj/item/weapon/aiModule/reset,/obj/machinery/light{dir = 1},/turf/simulated/floor/bluegrid,/area/ai_upload) +"bda" = (/obj/structure/table/standard,/obj/item/aiModule/reset,/obj/machinery/light{dir = 1},/turf/simulated/floor/bluegrid,/area/ai_upload) "bdb" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/structure/flora/ausbushes/sparsegrass,/obj/structure/flora/ausbushes/brflowers,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/newscaster{pixel_x = -30},/turf/simulated/floor/grass,/area/hydroponics/garden) -"bdc" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/britcup,/obj/effect/floor_decal/corner/green{dir = 9},/turf/simulated/floor/tiled,/area/hydroponics/garden) +"bdc" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/drinks/britcup,/obj/effect/floor_decal/corner/green{dir = 9},/turf/simulated/floor/tiled,/area/hydroponics/garden) "bdd" = (/obj/structure/table/woodentable,/turf/simulated/floor/tiled,/area/hydroponics/garden) "bde" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/flora/ausbushes/reedbush,/turf/simulated/floor/water/pool,/area/hydroponics/garden) "bdf" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/hydroponics/garden) @@ -2875,7 +2875,7 @@ "bdo" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/tiled,/area/medical/surgeryobs) "bdp" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/effect/floor_decal/corner/paleblue{dir = 6},/turf/simulated/floor/tiled,/area/medical/surgeryobs) "bdq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "surgeryobs2"; name = "Operating Theatre Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/medical/surgeryobs) -"bdr" = (/obj/structure/table/standard,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel,/turf/simulated/floor/tiled/white,/area/medical/surgery2) +"bdr" = (/obj/structure/table/standard,/obj/item/surgical/bonesetter,/obj/item/surgical/bonegel,/turf/simulated/floor/tiled/white,/area/medical/surgery2) "bds" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/white,/area/medical/surgery2) "bdt" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/medical/surgery2) "bdu" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/medical/surgery2) @@ -2903,9 +2903,9 @@ "bdQ" = (/turf/simulated/floor/tiled,/area/teleporter) "bdR" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor/tiled,/area/teleporter) "bdS" = (/obj/structure/dispenser{phorontanks = 0},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/dark,/area/teleporter) -"bdT" = (/obj/structure/table/standard,/obj/item/weapon/aiModule/freeform,/turf/simulated/floor/bluegrid,/area/ai_upload) +"bdT" = (/obj/structure/table/standard,/obj/item/aiModule/freeform,/turf/simulated/floor/bluegrid,/area/ai_upload) "bdU" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/ai_upload) -"bdV" = (/obj/structure/table/standard,/obj/item/weapon/aiModule/nanotrasen,/turf/simulated/floor/bluegrid,/area/ai_upload) +"bdV" = (/obj/structure/table/standard,/obj/item/aiModule/nanotrasen,/turf/simulated/floor/bluegrid,/area/ai_upload) "bdW" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/structure/flora/ausbushes/pointybush,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/grass,/area/hydroponics/garden) "bdX" = (/obj/structure/bed/chair/wood{dir = 1},/obj/effect/floor_decal/corner/green{dir = 9},/turf/simulated/floor/tiled,/area/hydroponics/garden) "bdY" = (/obj/structure/bed/chair/wood{dir = 1},/turf/simulated/floor/tiled,/area/hydroponics/garden) @@ -2935,9 +2935,9 @@ "bew" = (/turf/simulated/wall,/area/medical/surgery_hallway) "bex" = (/turf/simulated/wall,/area/medical/exam_room) "bey" = (/turf/simulated/wall,/area/medical/cryo) -"bez" = (/obj/structure/bookcase/manuals/medical,/obj/item/weapon/book/manual/stasis,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) +"bez" = (/obj/structure/bookcase/manuals/medical,/obj/item/book/manual/stasis,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) "beA" = (/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) -"beB" = (/obj/structure/table/standard,/obj/structure/noticeboard{pixel_y = 28},/obj/item/weapon/book/manual/medical_diagnostics_manual{pixel_y = 7},/obj/item/device/radio{anchored = 1; broadcasting = 0; canhear_range = 4; frequency = 1487; icon = 'icons/obj/items.dmi'; icon_state = "red_phone"; listening = 1; name = "Break Room Emergency Phone"},/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/machinery/light{dir = 1},/obj/item/weapon/storage/box/glasses/square,/obj/machinery/recharger{pixel_y = 0},/obj/item/weapon/reagent_containers/food/drinks/britcup,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) +"beB" = (/obj/structure/table/standard,/obj/structure/noticeboard{pixel_y = 28},/obj/item/book/manual/medical_diagnostics_manual{pixel_y = 7},/obj/item/radio{anchored = 1; broadcasting = 0; canhear_range = 4; frequency = 1487; icon = 'icons/obj/items.dmi'; icon_state = "red_phone"; listening = 1; name = "Break Room Emergency Phone"},/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/machinery/light{dir = 1},/obj/item/storage/box/glasses/square,/obj/machinery/recharger{pixel_y = 0},/obj/item/reagent_containers/food/drinks/britcup,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) "beC" = (/obj/machinery/vending/cola,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) "beD" = (/obj/machinery/vending/coffee,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) "beE" = (/turf/simulated/wall,/area/crew_quarters/medical_restroom) @@ -2949,7 +2949,7 @@ "beK" = (/turf/simulated/wall,/area/rnd/research_storage) "beL" = (/obj/machinery/door/airlock{name = "Research Storage"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/rnd/research_storage) "beM" = (/obj/effect/floor_decal/corner/purple{dir = 9},/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/tiled/white,/area/rnd/research) -"beN" = (/obj/effect/floor_decal/corner/purple{dir = 6},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera/network/research{c_tag = "SCI - Research Auxiliary Hallway"; dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/research) +"beN" = (/obj/effect/floor_decal/corner/purple{dir = 6},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera/network/research{c_tag = "SCI - Research Auxiliary Hallway"; dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/research) "beO" = (/turf/simulated/wall/r_wall,/area/rnd/research_restroom) "beP" = (/obj/structure/bed/chair,/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_four) "beQ" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) @@ -2972,27 +2972,27 @@ "bfh" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "bfi" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "bfj" = (/obj/structure/bed/chair,/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two) -"bfk" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/medical/surgeryobs) +"bfk" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/medical/surgeryobs) "bfl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/tiled,/area/medical/surgeryobs) "bfm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "surgeryobs2"; name = "Operating Theatre Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/medical/surgeryobs) "bfn" = (/turf/simulated/floor/tiled/white,/area/medical/surgery2) "bfo" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/surgery2) "bfp" = (/obj/machinery/door/airlock/medical{name = "Operating Theatre 2"; req_access = list(45)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/white,/area/medical/surgery2) "bfq" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) -"bfr" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/box/masks,/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) +"bfr" = (/obj/structure/table/standard,/obj/item/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/item/storage/box/masks,/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) "bfs" = (/obj/structure/table/standard,/obj/machinery/computer/med_data/laptop,/obj/effect/floor_decal/corner/pink/full{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/exam_room) -"bft" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin,/obj/item/weapon/folder/white,/obj/item/weapon/pen,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/effect/floor_decal/corner/pink{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/exam_room) +"bft" = (/obj/structure/table/standard,/obj/item/paper_bin,/obj/item/folder/white,/obj/item/pen,/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/effect/floor_decal/corner/pink{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/exam_room) "bfu" = (/obj/structure/filingcabinet/medical{desc = "A large cabinet with hard copy medical records."; name = "Medical Records"},/obj/machinery/camera/network/medbay{c_tag = "MED - Examination Room"},/obj/effect/floor_decal/corner/pink{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/exam_room) "bfv" = (/obj/structure/closet/secure_closet/medical1,/obj/effect/floor_decal/corner/pink/full{dir = 1},/obj/random/medical,/turf/simulated/floor/tiled/white,/area/medical/exam_room) -"bfw" = (/obj/item/weapon/tool/wrench,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 7; pixel_y = 1},/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/structure/table/glass,/obj/effect/floor_decal/corner/pink/full{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/cryo) +"bfw" = (/obj/item/tool/wrench,/obj/item/reagent_containers/glass/beaker/cryoxadone{pixel_x = 7; pixel_y = 1},/obj/item/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/structure/table/glass,/obj/effect/floor_decal/corner/pink/full{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/cryo) "bfx" = (/obj/machinery/atmospherics/unary/cryo_cell,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/medical/cryo) "bfy" = (/obj/machinery/atmospherics/unary/freezer{dir = 2; icon_state = "freezer"},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/medical/cryo) "bfz" = (/obj/machinery/vending/snack,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) -"bfA" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) -"bfB" = (/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) +"bfA" = (/obj/item/stool/padded,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) +"bfB" = (/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) "bfC" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom) "bfD" = (/obj/structure/undies_wardrobe,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom) -"bfE" = (/obj/structure/table/standard,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/item/weapon/soap,/obj/random/soap,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom) +"bfE" = (/obj/structure/table/standard,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/item/soap,/obj/random/soap,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom) "bfF" = (/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/obj/structure/urinal{pixel_y = 32},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom) "bfG" = (/obj/structure/bed/padded,/turf/simulated/floor/tiled/white,/area/medical/virology) "bfH" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/black,/turf/simulated/floor/tiled/white,/area/medical/virology) @@ -3020,14 +3020,14 @@ "bgd" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bge" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/command{name = "Teleport Access"; req_access = list(17)},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/teleporter) "bgf" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor/tiled,/area/teleporter) -"bgg" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/hologram/holopad,/obj/item/device/radio/beacon,/turf/simulated/floor/tiled,/area/teleporter) -"bgh" = (/obj/structure/table/standard,/obj/item/weapon/aiModule/asimov,/obj/item/weapon/aiModule/freeformcore,/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Core Modules"; req_access = list(20)},/obj/item/weapon/aiModule/corp,/obj/item/weapon/aiModule/paladin,/obj/item/weapon/aiModule/robocop,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/bluegrid,/area/ai_upload) +"bgg" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/hologram/holopad,/obj/item/radio/beacon,/turf/simulated/floor/tiled,/area/teleporter) +"bgh" = (/obj/structure/table/standard,/obj/item/aiModule/asimov,/obj/item/aiModule/freeformcore,/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Core Modules"; req_access = list(20)},/obj/item/aiModule/corp,/obj/item/aiModule/paladin,/obj/item/aiModule/robocop,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/bluegrid,/area/ai_upload) "bgi" = (/obj/structure/cable/cyan,/obj/machinery/power/apc/critical{name = "south bump"; pixel_y = -24},/turf/simulated/floor/bluegrid,/area/ai_upload) "bgj" = (/obj/machinery/computer/aiupload,/turf/simulated/floor/bluegrid,/area/ai_upload) -"bgk" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/flasher{id = "AI"; pixel_x = 22; pixel_y = -24},/obj/item/device/radio/intercom/locked{frequency = 1343; locked_frequency = 1343; name = "Private AI Channel"; pixel_x = 38; pixel_y = -21},/turf/simulated/floor/bluegrid,/area/ai_upload) +"bgk" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/flasher{id = "AI"; pixel_x = 22; pixel_y = -24},/obj/item/radio/intercom/locked{frequency = 1343; locked_frequency = 1343; name = "Private AI Channel"; pixel_x = 38; pixel_y = -21},/turf/simulated/floor/bluegrid,/area/ai_upload) "bgl" = (/obj/machinery/computer/borgupload,/turf/simulated/floor/bluegrid,/area/ai_upload) "bgm" = (/obj/machinery/alarm{dir = 1; pixel_y = -25},/obj/machinery/camera/network/command{c_tag = "AI - Upload"; dir = 1},/turf/simulated/floor/bluegrid,/area/ai_upload) -"bgn" = (/obj/structure/table/standard,/obj/item/weapon/aiModule/oxygen,/obj/item/weapon/aiModule/oneHuman,/obj/machinery/door/window{base_state = "left"; dir = 8; icon_state = "left"; name = "High-Risk Modules"; req_access = list(20)},/obj/item/weapon/aiModule/purge,/obj/item/weapon/aiModule/antimov,/obj/item/weapon/aiModule/teleporterOffline,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/bluegrid,/area/ai_upload) +"bgn" = (/obj/structure/table/standard,/obj/item/aiModule/oxygen,/obj/item/aiModule/oneHuman,/obj/machinery/door/window{base_state = "left"; dir = 8; icon_state = "left"; name = "High-Risk Modules"; req_access = list(20)},/obj/item/aiModule/purge,/obj/item/aiModule/antimov,/obj/item/aiModule/teleporterOffline,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/bluegrid,/area/ai_upload) "bgo" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/maintenance/central) "bgp" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/machinery/portable_atmospherics/hydroponics/soil,/obj/machinery/camera/network/civilian{c_tag = "CIV - Park Port"; dir = 4},/turf/simulated/floor/grass,/area/hydroponics/garden) "bgq" = (/obj/effect/floor_decal/spline/plain{icon_state = "spline_plain_full"; dir = 1},/obj/structure/showcase{desc = "It looks almost lifelike."; icon = 'icons/obj/statue.dmi'; icon_state = "hos"; name = "Statue"},/turf/simulated/floor/tiled,/area/hydroponics/garden) @@ -3044,12 +3044,12 @@ "bgB" = (/obj/effect/floor_decal/corner/paleblue{dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = 25},/turf/simulated/floor/tiled,/area/medical/surgeryobs) "bgC" = (/obj/machinery/computer/med_data,/obj/effect/floor_decal/corner/pink/full,/turf/simulated/floor/tiled/white,/area/medical/surgery2) "bgD" = (/obj/machinery/iv_drip,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled/white,/area/medical/surgery2) -"bgE" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/medical/surgery2) +"bgE" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/medical/surgery2) "bgF" = (/obj/machinery/vending/wallmed1{pixel_y = -32},/obj/machinery/camera/network/medbay{c_tag = "MED - Operating Theatre 2"; dir = 1},/turf/simulated/floor/tiled/white,/area/medical/surgery2) "bgG" = (/obj/machinery/light_switch{pixel_x = 32; pixel_y = 2},/obj/effect/floor_decal/corner/pink/full{dir = 4},/obj/machinery/button/holosign{pixel_x = 24; pixel_y = 2},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/surgery2) "bgH" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) -"bgI" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) -"bgJ" = (/obj/structure/table/standard,/obj/item/weapon/cane,/obj/item/weapon/cane{pixel_x = -3; pixel_y = 2},/obj/item/weapon/storage/box/rxglasses,/obj/effect/floor_decal/corner/pink{dir = 9},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/random/medical,/turf/simulated/floor/tiled/white,/area/medical/exam_room) +"bgI" = (/obj/structure/table/standard,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) +"bgJ" = (/obj/structure/table/standard,/obj/item/cane,/obj/item/cane{pixel_x = -3; pixel_y = 2},/obj/item/storage/box/rxglasses,/obj/effect/floor_decal/corner/pink{dir = 9},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/random/medical,/turf/simulated/floor/tiled/white,/area/medical/exam_room) "bgK" = (/obj/structure/bed/chair/office/light{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/exam_room) "bgL" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/exam_room) "bgM" = (/obj/effect/floor_decal/corner/pink{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_x = 25; pixel_y = 16},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/exam_room) @@ -3059,21 +3059,21 @@ "bgQ" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 9},/obj/effect/floor_decal/corner/pink{dir = 6},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/cryo) "bgR" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) "bgS" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) -"bgT" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) -"bgU" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/britcup,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/item/weapon/reagent_containers/food/drinks/britcup,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) -"bgV" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/item/weapon/deck/cards,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) -"bgW" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) +"bgT" = (/obj/item/stool/padded,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) +"bgU" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/drinks/britcup,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/item/reagent_containers/food/drinks/britcup,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) +"bgV" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/item/deck/cards,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) +"bgW" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/item/stool/padded,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) "bgX" = (/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera/network/medbay{c_tag = "MED - Break Room"; dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) "bgY" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom) "bgZ" = (/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom) -"bha" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom) +"bha" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom) "bhb" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor,/area/maintenance/medbay_fore) "bhc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/maintenance/medbay_fore) -"bhd" = (/obj/item/roller,/obj/effect/floor_decal/corner/lime{dir = 10},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/medical/virology) +"bhd" = (/obj/item/roller,/obj/effect/floor_decal/corner/lime{dir = 10},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/medical/virology) "bhe" = (/obj/effect/floor_decal/corner/lime{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/black,/turf/simulated/floor/tiled/white,/area/medical/virology) "bhf" = (/obj/effect/floor_decal/corner/lime{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/virology) "bhg" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/medical/virology) -"bhh" = (/obj/item/roller,/obj/effect/floor_decal/corner/lime{dir = 10},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/white,/area/medical/virology) +"bhh" = (/obj/item/roller,/obj/effect/floor_decal/corner/lime{dir = 10},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/white,/area/medical/virology) "bhi" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; name = "KEEP CLEAR: DOCKING AREA"; pixel_y = 0},/turf/simulated/wall/r_wall,/area/rnd/docking) "bhj" = (/turf/simulated/wall/r_wall,/area/rnd/docking) "bhk" = (/obj/structure/lattice,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/mineral/floor/ignore_mapgen,/area/rnd/docking) @@ -3115,25 +3115,25 @@ "bhU" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two) "bhV" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/light_switch{pixel_x = -36; pixel_y = 0},/turf/simulated/floor/tiled,/area/medical/surgeryobs) "bhW" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/hologram/holopad,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/medical/surgeryobs) -"bhX" = (/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 4; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled,/area/medical/surgeryobs) +"bhX" = (/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 4; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled,/area/medical/surgeryobs) "bhY" = (/obj/machinery/status_display,/turf/simulated/wall,/area/medical/surgery2) "bhZ" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment,/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) "bia" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) -"bib" = (/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/structure/table/standard,/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) +"bib" = (/obj/item/reagent_containers/blood/empty,/obj/item/reagent_containers/blood/empty,/obj/item/reagent_containers/blood/empty,/obj/item/reagent_containers/blood/empty,/obj/item/reagent_containers/blood/empty,/obj/structure/table/standard,/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) "bic" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/pink/full,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/structure/closet/secure_closet/medical_wall/pills{pixel_y = -32},/turf/simulated/floor/tiled/white,/area/medical/exam_room) "bid" = (/obj/effect/floor_decal/corner/pink{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/exam_room) "bie" = (/obj/structure/bed/padded,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/white,/area/medical/exam_room) "bif" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/effect/floor_decal/corner/pink{dir = 6},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled/white,/area/medical/exam_room) -"big" = (/obj/effect/floor_decal/corner/pink{dir = 9},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/medical/cryo) +"big" = (/obj/effect/floor_decal/corner/pink{dir = 9},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/medical/cryo) "bih" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/cryo) "bii" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/effect/floor_decal/industrial/warning/corner,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/cryo) "bij" = (/obj/effect/floor_decal/corner/pink{dir = 6},/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = 25},/turf/simulated/floor/tiled/white,/area/medical/cryo) "bik" = (/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_x = -25; pixel_y = 0},/obj/structure/flora/pottedplant{icon_state = "plant-22"},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) "bil" = (/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) -"bim" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) -"bin" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/structure/disposalpipe/segment,/obj/item/device/defib_kit/loaded,/obj/item/device/defib_kit/loaded,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) -"bio" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/britcup,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/random/medical,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) -"bip" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) +"bim" = (/obj/item/stool/padded,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) +"bin" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/structure/disposalpipe/segment,/obj/item/defib_kit/loaded,/obj/item/defib_kit/loaded,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) +"bio" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/drinks/britcup,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/random/medical,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) +"bip" = (/obj/item/stool/padded,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) "biq" = (/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) "bir" = (/obj/machinery/door/airlock/medical{name = "Rest Room"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom) "bis" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom) @@ -3172,11 +3172,11 @@ "biZ" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bja" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bjb" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) -"bjc" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/teleporter) +"bjc" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/teleporter) "bjd" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/dark,/area/teleporter) "bje" = (/turf/simulated/floor/tiled/dark,/area/ai) "bjf" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/bluegrid,/area/ai) -"bjg" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/structure/flora/ausbushes/palebush,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/grass,/area/hydroponics/garden) +"bjg" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/structure/flora/ausbushes/palebush,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/grass,/area/hydroponics/garden) "bjh" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/water/pool,/area/hydroponics/garden) "bji" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 2},/obj/structure/flora/ausbushes/brflowers,/turf/simulated/floor/grass,/area/hydroponics/garden) "bjj" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/hydroponics/garden) @@ -3186,35 +3186,35 @@ "bjn" = (/obj/machinery/camera/network/medbay{c_tag = "MED - Surgery Observation"; dir = 4},/turf/simulated/floor/tiled,/area/medical/surgeryobs) "bjo" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/medical/surgeryobs) "bjp" = (/obj/effect/floor_decal/corner/paleblue{dir = 2},/turf/simulated/floor/tiled,/area/medical/surgeryobs) -"bjq" = (/obj/structure/table/standard,/obj/item/weapon/surgical/hemostat,/obj/item/weapon/surgical/cautery,/obj/machinery/button/remote/blast_door{id = "surgeryobs"; name = "Privacy Shutters"; pixel_x = -26; pixel_y = 0},/obj/effect/floor_decal/corner/pink/full{dir = 8},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/tiled/white,/area/medical/surgery) -"bjr" = (/obj/structure/table/standard,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/weapon/surgical/retractor,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/white,/area/medical/surgery) -"bjs" = (/obj/structure/table/standard,/obj/item/weapon/surgical/circular_saw{pixel_y = 8},/obj/item/weapon/surgical/scalpel,/obj/effect/floor_decal/corner/pink{dir = 5},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/medical/surgery) -"bjt" = (/obj/structure/table/standard,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/autopsy_scanner,/obj/item/weapon/reagent_containers/spray/cleaner{desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2},/obj/item/weapon/surgical/FixOVein,/turf/simulated/floor/tiled/white,/area/medical/surgery) +"bjq" = (/obj/structure/table/standard,/obj/item/surgical/hemostat,/obj/item/surgical/cautery,/obj/machinery/button/remote/blast_door{id = "surgeryobs"; name = "Privacy Shutters"; pixel_x = -26; pixel_y = 0},/obj/effect/floor_decal/corner/pink/full{dir = 8},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/tiled/white,/area/medical/surgery) +"bjr" = (/obj/structure/table/standard,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/surgical/retractor,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/white,/area/medical/surgery) +"bjs" = (/obj/structure/table/standard,/obj/item/surgical/circular_saw{pixel_y = 8},/obj/item/surgical/scalpel,/obj/effect/floor_decal/corner/pink{dir = 5},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/medical/surgery) +"bjt" = (/obj/structure/table/standard,/obj/item/surgical/surgicaldrill,/obj/item/autopsy_scanner,/obj/item/reagent_containers/spray/cleaner{desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2},/obj/item/surgical/FixOVein,/turf/simulated/floor/tiled/white,/area/medical/surgery) "bju" = (/obj/structure/closet/secure_closet/medical2,/obj/effect/floor_decal/corner/pink/full{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/surgery) "bjv" = (/turf/simulated/wall,/area/medical/surgery) -"bjw" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/camera/network/medbay{c_tag = "MED - Surgery Hallway"; dir = 4},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) -"bjx" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/blood/AMinus,/obj/item/weapon/reagent_containers/blood/APlus,/obj/item/weapon/reagent_containers/blood/BMinus,/obj/item/weapon/reagent_containers/blood/BPlus,/obj/item/weapon/reagent_containers/blood/OPlus,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) +"bjw" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/camera/network/medbay{c_tag = "MED - Surgery Hallway"; dir = 4},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) +"bjx" = (/obj/structure/table/standard,/obj/item/reagent_containers/blood/AMinus,/obj/item/reagent_containers/blood/APlus,/obj/item/reagent_containers/blood/BMinus,/obj/item/reagent_containers/blood/BPlus,/obj/item/reagent_containers/blood/OPlus,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) "bjy" = (/obj/effect/floor_decal/corner/pink{dir = 9},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/exam_room) "bjz" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/exam_room) -"bjA" = (/obj/effect/floor_decal/corner/pink{dir = 6},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 4; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/exam_room) +"bjA" = (/obj/effect/floor_decal/corner/pink{dir = 6},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 4; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/exam_room) "bjB" = (/obj/effect/floor_decal/corner/pink{dir = 9},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled/white,/area/medical/cryo) "bjC" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/medical/cryo) "bjD" = (/obj/machinery/atmospherics/pipe/manifold/visible{dir = 8},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/white,/area/medical/cryo) "bjE" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/atmospherics/portables_connector{dir = 8},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/steel,/area/medical/cryo) -"bjF" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 8; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = -21; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) +"bjF" = (/obj/item/stool/padded,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 8; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = -21; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) "bjG" = (/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) "bjH" = (/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/machinery/newscaster{pixel_x = 30},/turf/simulated/floor/tiled/white,/area/crew_quarters/medbreak) "bjI" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom) "bjJ" = (/obj/machinery/door/airlock{name = "Medical Restroom"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom) -"bjK" = (/obj/structure/closet/crate/medical,/obj/item/weapon/reagent_containers/syringe,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/firstaid,/turf/simulated/floor,/area/maintenance/medbay_fore) -"bjL" = (/obj/item/roller,/obj/effect/floor_decal/corner/lime{dir = 6},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/medical/virology) -"bjM" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/monkeycubes,/obj/effect/floor_decal/corner/lime{dir = 1},/obj/item/weapon/extinguisher,/turf/simulated/floor/tiled/white,/area/medical/virology) +"bjK" = (/obj/structure/closet/crate/medical,/obj/item/reagent_containers/syringe,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/firstaid,/turf/simulated/floor,/area/maintenance/medbay_fore) +"bjL" = (/obj/item/roller,/obj/effect/floor_decal/corner/lime{dir = 6},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/medical/virology) +"bjM" = (/obj/structure/table/glass,/obj/item/storage/box/monkeycubes,/obj/effect/floor_decal/corner/lime{dir = 1},/obj/item/extinguisher,/turf/simulated/floor/tiled/white,/area/medical/virology) "bjN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/black,/turf/simulated/floor/tiled/white,/area/medical/virology) "bjO" = (/obj/effect/floor_decal/corner/lime{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) -"bjP" = (/obj/item/weapon/storage/secure/safe{pixel_x = 5; pixel_y = 29},/obj/effect/floor_decal/corner/lime{dir = 5},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/camera/network/medbay{c_tag = "MED - Virology Fore"; dir = 2},/turf/simulated/floor/tiled/white,/area/medical/virology) +"bjP" = (/obj/item/storage/secure/safe{pixel_x = 5; pixel_y = 29},/obj/effect/floor_decal/corner/lime{dir = 5},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/camera/network/medbay{c_tag = "MED - Virology Fore"; dir = 2},/turf/simulated/floor/tiled/white,/area/medical/virology) "bjQ" = (/obj/effect/floor_decal/corner/lime{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/virology) "bjR" = (/obj/machinery/smartfridge/secure/virology,/obj/effect/floor_decal/corner/lime/full{dir = 1},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/white,/area/medical/virology) -"bjS" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/green,/obj/effect/floor_decal/corner/lime/full{dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled/white,/area/medical/virology) +"bjS" = (/obj/structure/bed/padded,/obj/item/bedsheet/green,/obj/effect/floor_decal/corner/lime/full{dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled/white,/area/medical/virology) "bjT" = (/obj/effect/floor_decal/corner/lime{dir = 5},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled/white,/area/medical/virology) "bjU" = (/turf/simulated/floor/tiled/white,/area/medical/virology) "bjV" = (/obj/machinery/washing_machine,/obj/effect/floor_decal/corner/lime/full{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/virology) @@ -3227,13 +3227,13 @@ "bkc" = (/obj/machinery/atmospherics/portables_connector,/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/rnd/docking) "bkd" = (/obj/machinery/door/airlock/maintenance{req_access = null; req_one_access = list(12,47,55)},/obj/machinery/door/firedoor,/turf/simulated/floor,/area/rnd/docking) "bke" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 8},/obj/effect/floor_decal/corner/purple{dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/research) -"bkf" = (/obj/effect/floor_decal/corner/purple,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/tiled/white,/area/rnd/research) +"bkf" = (/obj/effect/floor_decal/corner/purple,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/tiled/white,/area/rnd/research) "bkg" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/rnd/research) "bkh" = (/obj/effect/floor_decal/corner/purple/diagonal,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/research_restroom) "bki" = (/obj/effect/floor_decal/corner/purple/diagonal,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/tiled/white,/area/rnd/research_restroom) "bkj" = (/obj/structure/closet/wardrobe/science_white,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/corner/purple/diagonal,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/research_restroom) "bkk" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/tiled/dark,/area/rnd/lab) -"bkl" = (/obj/structure/table/standard,/obj/item/weapon/storage/belt/utility,/obj/item/clothing/gloves/sterile/latex,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/dark,/area/rnd/lab) +"bkl" = (/obj/structure/table/standard,/obj/item/storage/belt/utility,/obj/item/clothing/gloves/sterile/latex,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/dark,/area/rnd/lab) "bkm" = (/obj/machinery/autolathe,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/dark,/area/rnd/lab) "bkn" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/turf/simulated/shuttle/plating,/area/rnd/lab) "bko" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/turf/simulated/shuttle/plating,/area/rnd/lab) @@ -3251,7 +3251,7 @@ "bkA" = (/obj/machinery/porta_turret/ai_defense,/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/turf/simulated/floor/tiled/dark,/area/ai) "bkB" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/structure/flora/ausbushes/sparsegrass,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/grass,/area/hydroponics/garden) "bkC" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/corner/green{dir = 9},/turf/simulated/floor/tiled,/area/hydroponics/garden) -"bkD" = (/obj/structure/table/woodentable,/obj/item/weapon/book/codex/lore/vir,/turf/simulated/floor/tiled,/area/hydroponics/garden) +"bkD" = (/obj/structure/table/woodentable,/obj/item/book/codex/lore/vir,/turf/simulated/floor/tiled,/area/hydroponics/garden) "bkE" = (/obj/machinery/light,/turf/simulated/floor/tiled,/area/hydroponics/garden) "bkF" = (/obj/structure/bed/chair/wood,/obj/effect/floor_decal/corner/green{dir = 6},/turf/simulated/floor/tiled,/area/hydroponics/garden) "bkG" = (/obj/effect/floor_decal/spline/fancy/wood{icon_state = "spline_fancy"; dir = 9},/obj/structure/flora/ausbushes/sunnybush,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/grass,/area/hydroponics/garden) @@ -3259,7 +3259,7 @@ "bkI" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/bed/chair{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/medical/surgeryobs) "bkJ" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/effect/floor_decal/corner/paleblue{dir = 6},/turf/simulated/floor/tiled,/area/medical/surgeryobs) "bkK" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "surgeryobs"; name = "Operating Theatre Privacy Shutters"; opacity = 0},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/medical/surgeryobs) -"bkL" = (/obj/structure/table/standard,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel,/turf/simulated/floor/tiled/white,/area/medical/surgery) +"bkL" = (/obj/structure/table/standard,/obj/item/surgical/bonesetter,/obj/item/surgical/bonegel,/turf/simulated/floor/tiled/white,/area/medical/surgery) "bkM" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/white,/area/medical/surgery) "bkN" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/medical/surgery) "bkO" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/medical/surgery) @@ -3284,7 +3284,7 @@ "blh" = (/obj/machinery/shower{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/northleft{name = "Shower"; req_access = list()},/obj/structure/curtain/open/shower/medical,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom) "bli" = (/obj/machinery/shower{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/northright{dir = 1; name = "Shower"; req_access = list()},/obj/structure/curtain/open/shower/medical,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom) "blj" = (/obj/structure/toilet{dir = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/medical_restroom) -"blk" = (/obj/structure/table/rack,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/suit/storage/hazardvest,/obj/item/device/radio,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/maintenance/medbay_fore) +"blk" = (/obj/structure/table/rack,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/suit/storage/hazardvest,/obj/item/radio,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/maintenance/medbay_fore) "bll" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/effect/floor_decal/corner/lime{dir = 9},/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) "blm" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) "bln" = (/obj/effect/floor_decal/corner/lime{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) @@ -3293,12 +3293,12 @@ "blq" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/machinery/atmospherics/pipe/manifold4w/hidden/black,/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/white,/area/medical/virology) "blr" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/black,/turf/simulated/floor/tiled/white,/area/medical/virology) "bls" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/black{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) -"blt" = (/obj/structure/table/glass,/obj/item/device/antibody_scanner{pixel_x = 2; pixel_y = 2},/obj/item/device/antibody_scanner,/obj/structure/reagent_dispensers/virusfood{pixel_x = 30},/obj/effect/floor_decal/corner/lime{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/virology) -"blu" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/green,/obj/effect/floor_decal/corner/lime{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/virology) +"blt" = (/obj/structure/table/glass,/obj/item/antibody_scanner{pixel_x = 2; pixel_y = 2},/obj/item/antibody_scanner,/obj/structure/reagent_dispensers/virusfood{pixel_x = 30},/obj/effect/floor_decal/corner/lime{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/virology) +"blu" = (/obj/structure/bed/padded,/obj/item/bedsheet/green,/obj/effect/floor_decal/corner/lime{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/virology) "blv" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) "blw" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/virology) "blx" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/white,/area/medical/virology) -"bly" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/lime{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) +"bly" = (/obj/item/stool/padded,/obj/effect/floor_decal/corner/lime{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) "blz" = (/obj/structure/reagent_dispensers/water_cooler/full,/obj/effect/floor_decal/corner/lime/full{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/virology) "blA" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/research/station) "blB" = (/turf/simulated/shuttle/floor,/area/shuttle/research/station) @@ -3327,17 +3327,17 @@ "blY" = (/obj/structure/bed/chair/comfy/purp{dir = 4},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/wood,/area/rnd/research) "blZ" = (/obj/structure/table/glass,/obj/machinery/newscaster{pixel_y = 32},/obj/machinery/light{dir = 1},/turf/simulated/floor/wood,/area/rnd/research) "bma" = (/obj/structure/bed/chair/comfy/purp{dir = 8},/turf/simulated/floor/wood,/area/rnd/research) -"bmb" = (/obj/structure/table/standard,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/obj/effect/floor_decal/corner/purple/diagonal,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/item/weapon/soap/nanotrasen,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/rnd/research_restroom) +"bmb" = (/obj/structure/table/standard,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/obj/effect/floor_decal/corner/purple/diagonal,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/item/soap/nanotrasen,/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/rnd/research_restroom) "bmc" = (/obj/effect/floor_decal/corner/purple/diagonal,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/white,/area/rnd/research_restroom) "bmd" = (/obj/structure/undies_wardrobe,/obj/effect/floor_decal/corner/purple/diagonal,/turf/simulated/floor/tiled/white,/area/rnd/research_restroom) -"bme" = (/obj/effect/floor_decal/corner/purple/full{dir = 8},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/rnd/lab) +"bme" = (/obj/effect/floor_decal/corner/purple/full{dir = 8},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/rnd/lab) "bmf" = (/obj/effect/floor_decal/corner/purple{dir = 5},/turf/simulated/floor/tiled/white,/area/rnd/lab) "bmg" = (/obj/effect/floor_decal/corner/purple{dir = 5},/obj/machinery/camera/network/research{c_tag = "SCI - R&D Lab"},/turf/simulated/floor/tiled/white,/area/rnd/lab) "bmh" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/item/stack/material/glass{amount = 50; pixel_x = 3; pixel_y = 3},/obj/item/stack/material/steel{amount = 50},/obj/item/clothing/glasses/welding,/obj/effect/floor_decal/corner/purple{dir = 5},/turf/simulated/floor/tiled/white,/area/rnd/lab) -"bmi" = (/obj/structure/table/standard,/obj/item/weapon/hand_labeler,/obj/item/weapon/pen,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/effect/floor_decal/corner/purple{dir = 5},/turf/simulated/floor/tiled/white,/area/rnd/lab) -"bmj" = (/obj/item/weapon/stock_parts/console_screen,/obj/structure/table/standard,/obj/item/weapon/stock_parts/console_screen,/obj/item/weapon/stock_parts/console_screen,/obj/item/weapon/stock_parts/matter_bin,/obj/item/weapon/stock_parts/matter_bin,/obj/effect/floor_decal/corner/purple/full{dir = 1},/obj/machinery/firealarm{dir = 4; layer = 3.3; pixel_x = 26},/obj/machinery/recharger{pixel_y = 0},/turf/simulated/floor/tiled/white,/area/rnd/lab) +"bmi" = (/obj/structure/table/standard,/obj/item/hand_labeler,/obj/item/pen,/obj/item/packageWrap,/obj/item/packageWrap,/obj/effect/floor_decal/corner/purple{dir = 5},/turf/simulated/floor/tiled/white,/area/rnd/lab) +"bmj" = (/obj/item/stock_parts/console_screen,/obj/structure/table/standard,/obj/item/stock_parts/console_screen,/obj/item/stock_parts/console_screen,/obj/item/stock_parts/matter_bin,/obj/item/stock_parts/matter_bin,/obj/effect/floor_decal/corner/purple/full{dir = 1},/obj/machinery/firealarm{dir = 4; layer = 3.3; pixel_x = 26},/obj/machinery/recharger{pixel_y = 0},/turf/simulated/floor/tiled/white,/area/rnd/lab) "bmk" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) -"bml" = (/obj/structure/closet/crate,/obj/item/weapon/tool/crowbar,/turf/simulated/floor/tiled,/area/teleporter) +"bml" = (/obj/structure/closet/crate,/obj/item/tool/crowbar,/turf/simulated/floor/tiled,/area/teleporter) "bmm" = (/obj/structure/closet/crate,/turf/simulated/floor/tiled,/area/teleporter) "bmn" = (/obj/structure/table/standard,/obj/structure/flora/pottedplant{icon_state = "plant-09"; name = "Steve"; pixel_y = 15},/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled/dark,/area/ai) "bmo" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor/tiled/dark,/area/ai) @@ -3349,7 +3349,7 @@ "bmu" = (/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 8},/turf/simulated/floor/tiled/dark,/area/ai) "bmv" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/structure/flora/ausbushes/ppflowers,/turf/simulated/floor/grass,/area/hydroponics/garden) "bmw" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/hallway/primary/central_two) -"bmx" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/disposalpipe/segment,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) +"bmx" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/disposalpipe/segment,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "bmy" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/bed/chair{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/medical/surgeryobs) "bmz" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "surgeryobs"; name = "Operating Theatre Privacy Shutters"; opacity = 0},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/medical/surgeryobs) "bmA" = (/obj/effect/floor_decal/corner/pink{dir = 9},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/surgery) @@ -3380,8 +3380,8 @@ "bmZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/black,/turf/simulated/floor/tiled/white,/area/medical/virology) "bna" = (/obj/effect/floor_decal/corner/lime,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/black,/turf/simulated/floor/tiled/white,/area/medical/virology) "bnb" = (/obj/effect/floor_decal/corner/lime{dir = 10},/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/medical/virology) -"bnc" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/white,/area/medical/virology) -"bnd" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/cups,/obj/effect/floor_decal/corner/lime{dir = 6},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 4; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/virology) +"bnc" = (/obj/item/stool/padded,/turf/simulated/floor/tiled/white,/area/medical/virology) +"bnd" = (/obj/structure/table/standard,/obj/item/storage/box/cups,/obj/effect/floor_decal/corner/lime{dir = 6},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 4; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/virology) "bne" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/space) "bnf" = (/obj/machinery/computer/shuttle_control/research{name = "research elevator control console"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/research/station) "bng" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "research_shuttle_hatch"; locked = 1; name = "Shuttle Hatch"; req_access = list(13)},/turf/simulated/shuttle/floor,/area/shuttle/research/station) @@ -3400,7 +3400,7 @@ "bnt" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/docking) "bnu" = (/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/tiled/white,/area/rnd/docking) "bnv" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/power/apc/critical{name = "south bump"; pixel_y = -24},/obj/structure/cable/green,/turf/simulated/floor/tiled/white,/area/rnd/docking) -"bnw" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/item/device/radio/intercom{layer = 4; name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/rnd/docking) +"bnw" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/item/radio/intercom{layer = 4; name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/rnd/docking) "bnx" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/camera/network/research{c_tag = "SCI - Research Dock Hallway Starboard"; dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/docking) "bny" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/rnd/docking) "bnz" = (/obj/machinery/door/airlock/glass_research{name = "Research Dock Hallway"; req_access = list(47)},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/docking) @@ -3414,7 +3414,7 @@ "bnH" = (/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled/white,/area/rnd/lab) "bnI" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled/white,/area/rnd/lab) "bnJ" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/lab) -"bnK" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/capacitor,/obj/item/weapon/stock_parts/capacitor,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/micro_laser,/obj/item/weapon/stock_parts/micro_laser,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/corner/purple{dir = 6},/turf/simulated/floor/tiled/white,/area/rnd/lab) +"bnK" = (/obj/structure/table/standard,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/capacitor,/obj/item/stock_parts/capacitor,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/micro_laser,/obj/item/stock_parts/micro_laser,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/corner/purple{dir = 6},/turf/simulated/floor/tiled/white,/area/rnd/lab) "bnL" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor/tiled/dark,/area/ai) "bnM" = (/turf/simulated/floor/bluegrid,/area/ai) "bnN" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/bluegrid,/area/ai) @@ -3447,8 +3447,8 @@ "boo" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bop" = (/obj/effect/floor_decal/corner/paleblue{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "boq" = (/obj/machinery/recharge_station,/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/sleeper) -"bor" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/bodybags{pixel_x = 1; pixel_y = 2},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/effect/floor_decal/corner/mauve{dir = 5},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/light_switch{pixel_x = -36; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning) -"bos" = (/obj/effect/floor_decal/corner/mauve/full{dir = 1},/obj/machinery/light{dir = 1},/obj/structure/table/standard,/obj/item/weapon/storage/laundry_basket,/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning) +"bor" = (/obj/structure/table/standard,/obj/item/storage/box/bodybags{pixel_x = 1; pixel_y = 2},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/effect/floor_decal/corner/mauve{dir = 5},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/light_switch{pixel_x = -36; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning) +"bos" = (/obj/effect/floor_decal/corner/mauve/full{dir = 1},/obj/machinery/light{dir = 1},/obj/structure/table/standard,/obj/item/storage/laundry_basket,/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning) "bot" = (/obj/structure/window/reinforced{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/medical/genetics_cloning) "bou" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/camera/network/medbay{c_tag = "MED - Cloning"; dir = 2},/turf/simulated/floor/tiled,/area/medical/genetics_cloning) "bov" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/medical/genetics_cloning) @@ -3467,14 +3467,14 @@ "boI" = (/obj/effect/floor_decal/corner/lime{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/black{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) "boJ" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 0},/turf/simulated/wall/r_wall,/area/medical/virology) "boK" = (/obj/effect/floor_decal/corner/lime{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/virology) -"boL" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/lime{dir = 6},/obj/machinery/camera/network/medbay{c_tag = "MED - Virology Quarantine Starboard"; dir = 8},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/medical/virology) +"boL" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/lime{dir = 6},/obj/machinery/camera/network/medbay{c_tag = "MED - Virology Quarantine Starboard"; dir = 8},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/medical/virology) "boM" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 2; external_pressure_bound = 140; external_pressure_bound_default = 140; icon_state = "map_vent_out"; pressure_checks = 1; pressure_checks_default = 1; use_power = 1},/obj/machinery/shield_diffuser,/turf/simulated/floor/airless,/area/maintenance/disposal) "boN" = (/obj/structure/closet/crate,/obj/random/maintenance/research,/turf/simulated/shuttle/floor,/area/shuttle/research/station) "boO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/shuttle/plating,/area/rnd/docking) "boP" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1380; id_tag = "research_dock_pump"},/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/machinery/camera/network/research{c_tag = "SCI - Research Elevator Airlock"; dir = 1},/turf/simulated/floor/tiled,/area/rnd/docking) "boQ" = (/obj/machinery/embedded_controller/radio/airlock/docking_port{frequency = 1380; id_tag = "research_dock_airlock"; pixel_x = 0; pixel_y = -26; req_one_access = list(13,65); tag_airpump = "research_dock_pump"; tag_chamber_sensor = "research_dock_sensor"; tag_exterior_door = "research_dock_outer"; tag_interior_door = "research_dock_inner"},/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor/tiled,/area/rnd/docking) "boR" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/turf/simulated/shuttle/plating,/area/rnd/docking) -"boS" = (/obj/effect/floor_decal/corner/purple,/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/item/device/radio/intercom{layer = 4; name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/rnd/docking) +"boS" = (/obj/effect/floor_decal/corner/purple,/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/item/radio/intercom{layer = 4; name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/rnd/docking) "boT" = (/obj/machinery/light,/obj/effect/floor_decal/corner/purple{dir = 10},/turf/simulated/floor/tiled/white,/area/rnd/docking) "boU" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/corner/purple{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/docking) "boV" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/rnd/research) @@ -3491,16 +3491,16 @@ "bpg" = (/turf/simulated/floor/tiled,/area/rnd/lab) "bph" = (/obj/machinery/r_n_d/protolathe,/turf/simulated/floor/tiled,/area/rnd/lab) "bpi" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/lab) -"bpj" = (/obj/structure/table/standard,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/weapon/stock_parts/scanning_module{pixel_x = 2; pixel_y = 3},/obj/item/weapon/stock_parts/scanning_module,/obj/effect/floor_decal/corner/purple{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/rnd/lab) +"bpj" = (/obj/structure/table/standard,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/stock_parts/scanning_module{pixel_x = 2; pixel_y = 3},/obj/item/stock_parts/scanning_module,/obj/effect/floor_decal/corner/purple{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/rnd/lab) "bpk" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/disposalpipe/segment,/obj/machinery/camera/network/northern_star{c_tag = "Hall - Central Primary Port Fore 2"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bpl" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bpm" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) -"bpn" = (/obj/effect/landmark{name = "tripai"},/obj/item/device/radio/intercom{dir = 1; listening = 0; name = "Custom Channel"; pixel_x = 0; pixel_y = 20},/obj/item/device/radio/intercom{broadcasting = 0; dir = 2; frequency = 1343; name = "Private Channel"; pixel_x = 0; pixel_y = -21},/obj/item/device/radio/intercom{broadcasting = 1; dir = 8; listening = 1; name = "Common Channel"; pixel_x = -21; pixel_y = 0},/turf/simulated/floor/bluegrid,/area/ai) +"bpn" = (/obj/effect/landmark{name = "tripai"},/obj/item/radio/intercom{dir = 1; listening = 0; name = "Custom Channel"; pixel_x = 0; pixel_y = 20},/obj/item/radio/intercom{broadcasting = 0; dir = 2; frequency = 1343; name = "Private Channel"; pixel_x = 0; pixel_y = -21},/obj/item/radio/intercom{broadcasting = 1; dir = 8; listening = 1; name = "Common Channel"; pixel_x = -21; pixel_y = 0},/turf/simulated/floor/bluegrid,/area/ai) "bpo" = (/obj/machinery/porta_turret/ai_defense,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor/tiled/dark,/area/ai) "bpp" = (/obj/machinery/door/airlock/hatch{icon_state = "door_locked"; id_tag = null; locked = 1; name = "AI Core"; req_access = list(16)},/turf/simulated/floor/tiled/dark,/area/ai) "bpq" = (/obj/machinery/ai_slipper{icon_state = "motion0"},/obj/machinery/turretid/stun{check_synth = 1; name = "AI Chamber turret control"; pixel_x = 30; pixel_y = -24},/obj/machinery/flasher{id = "AI"; pixel_x = -24; pixel_y = -25},/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for the AI core maintenance door."; id = "AICore"; name = "AI Maintenance Hatch"; pixel_x = 8; pixel_y = 25; req_access = list(16)},/obj/machinery/light/small{dir = 1},/obj/machinery/camera/xray/command{c_tag = "AI - Core"; dir = 2},/turf/simulated/floor/tiled/dark,/area/ai) "bpr" = (/obj/machinery/porta_turret/ai_defense,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled/dark,/area/ai) -"bps" = (/obj/effect/landmark{name = "tripai"},/obj/item/device/radio/intercom{dir = 1; listening = 0; name = "Custom Channel"; pixel_x = 0; pixel_y = 21},/obj/item/device/radio/intercom{broadcasting = 0; frequency = 1343; name = "Private Channel"; pixel_x = 0; pixel_y = -21},/obj/item/device/radio/intercom{broadcasting = 1; dir = 4; listening = 1; name = "Common Channel"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/bluegrid,/area/ai) +"bps" = (/obj/effect/landmark{name = "tripai"},/obj/item/radio/intercom{dir = 1; listening = 0; name = "Custom Channel"; pixel_x = 0; pixel_y = 21},/obj/item/radio/intercom{broadcasting = 0; frequency = 1343; name = "Private Channel"; pixel_x = 0; pixel_y = -21},/obj/item/radio/intercom{broadcasting = 1; dir = 4; listening = 1; name = "Common Channel"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/bluegrid,/area/ai) "bpt" = (/obj/structure/flora/ausbushes/lavendergrass,/turf/simulated/floor/grass,/area/hydroponics/garden) "bpu" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 5},/obj/structure/flora/ausbushes/sparsegrass,/obj/structure/flora/ausbushes/brflowers,/turf/simulated/floor/grass,/area/hydroponics/garden) "bpv" = (/obj/effect/floor_decal/spline/fancy/wood{icon_state = "spline_fancy"; dir = 9},/obj/structure/flora/ausbushes/sparsegrass,/turf/simulated/floor/grass,/area/hydroponics/garden) @@ -3511,7 +3511,7 @@ "bpA" = (/obj/effect/floor_decal/corner/paleblue{dir = 4},/turf/simulated/floor/tiled,/area/medical/surgeryobs) "bpB" = (/obj/machinery/computer/med_data,/obj/effect/floor_decal/corner/pink/full,/turf/simulated/floor/tiled/white,/area/medical/surgery) "bpC" = (/obj/machinery/iv_drip,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled/white,/area/medical/surgery) -"bpD" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/medical/surgery) +"bpD" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/medical/surgery) "bpE" = (/obj/machinery/vending/wallmed1{pixel_y = -32},/obj/machinery/camera/network/medbay{c_tag = "MED - Operating Theatre 1"; dir = 1},/turf/simulated/floor/tiled/white,/area/medical/surgery) "bpF" = (/obj/machinery/button/holosign{pixel_x = 24; pixel_y = 2},/obj/machinery/light_switch{pixel_x = 32; pixel_y = 2},/obj/effect/floor_decal/corner/pink/full{dir = 4},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/surgery) "bpG" = (/obj/structure/bed/chair/comfy/black{dir = 1},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) @@ -3543,7 +3543,7 @@ "bqg" = (/obj/effect/floor_decal/corner/lime{dir = 8},/obj/machinery/camera/network/medbay{c_tag = "MED - Virology Quarantine Port"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/black,/turf/simulated/floor/tiled/white,/area/medical/virology) "bqh" = (/obj/effect/floor_decal/corner/lime{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/black,/turf/simulated/floor/tiled/white,/area/medical/virology) "bqi" = (/obj/effect/floor_decal/corner/lime{dir = 5},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/virology) -"bqj" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/effect/floor_decal/corner/lime{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/virology) +"bqj" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/effect/floor_decal/corner/lime{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/virology) "bqk" = (/obj/machinery/atmospherics/pipe/simple/visible/yellow,/obj/structure/lattice,/turf/space,/area/space) "bql" = (/obj/structure/lattice,/obj/machinery/light,/turf/simulated/mineral/floor/ignore_mapgen,/area/rnd/docking) "bqm" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/research/station) @@ -3555,29 +3555,29 @@ "bqs" = (/obj/random/junk,/turf/simulated/floor,/area/maintenance/research) "bqt" = (/turf/simulated/wall/r_wall,/area/maintenance/research) "bqu" = (/turf/simulated/wall,/area/rnd/workshop) -"bqv" = (/obj/structure/table/steel,/obj/item/weapon/storage/bag/circuits/basic,/obj/machinery/newscaster{pixel_x = -28; pixel_y = 0},/obj/effect/floor_decal/corner/green/full{dir = 8},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) -"bqw" = (/obj/structure/table/steel,/obj/item/device/integrated_electronics/debugger{pixel_x = -5; pixel_y = 0},/obj/item/device/integrated_electronics/wirer{pixel_x = 5; pixel_y = 0},/obj/effect/floor_decal/corner/green{dir = 5},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) -"bqx" = (/obj/structure/table/steel,/obj/item/device/electronic_assembly/large{pixel_y = 6},/obj/effect/floor_decal/corner/green{dir = 5},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) +"bqv" = (/obj/structure/table/steel,/obj/item/storage/bag/circuits/basic,/obj/machinery/newscaster{pixel_x = -28; pixel_y = 0},/obj/effect/floor_decal/corner/green/full{dir = 8},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) +"bqw" = (/obj/structure/table/steel,/obj/item/integrated_electronics/debugger{pixel_x = -5; pixel_y = 0},/obj/item/integrated_electronics/wirer{pixel_x = 5; pixel_y = 0},/obj/effect/floor_decal/corner/green{dir = 5},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) +"bqx" = (/obj/structure/table/steel,/obj/item/electronic_assembly/large{pixel_y = 6},/obj/effect/floor_decal/corner/green{dir = 5},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) "bqy" = (/obj/machinery/alarm{pixel_y = 25},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/camera/network/research{c_tag = "SCI - Workshop"; dir = 2},/obj/effect/floor_decal/corner/green{dir = 1},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) "bqz" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) "bqA" = (/turf/simulated/wall/r_wall,/area/rnd/workshop) "bqB" = (/obj/effect/floor_decal/corner/purple{dir = 9},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/rnd/research) "bqC" = (/obj/effect/floor_decal/corner/purple{dir = 6},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research) -"bqD" = (/obj/structure/table/glass,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/camera/network/research{c_tag = "SCI - Break Room"; dir = 4},/turf/simulated/floor/wood,/area/rnd/research) +"bqD" = (/obj/structure/table/glass,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/camera/network/research{c_tag = "SCI - Break Room"; dir = 4},/turf/simulated/floor/wood,/area/rnd/research) "bqE" = (/obj/structure/table/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/wood,/area/rnd/research) "bqF" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/rnd/research) "bqG" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/rnd/research) "bqH" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/research) "bqI" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/research) -"bqJ" = (/obj/structure/table/standard,/obj/item/weapon/clipboard,/obj/item/weapon/clipboard,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research) +"bqJ" = (/obj/structure/table/standard,/obj/item/clipboard,/obj/item/clipboard,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research) "bqK" = (/obj/machinery/requests_console{department = "Science"; departmentType = 2; name = "Science Requests Console"; pixel_x = -30; pixel_y = 0},/obj/effect/floor_decal/corner/purple{dir = 9},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/rnd/lab) "bqL" = (/obj/machinery/computer/rdconsole/core,/turf/simulated/floor/tiled,/area/rnd/lab) "bqM" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/rnd/lab) -"bqN" = (/obj/machinery/r_n_d/circuit_imprinter,/obj/item/weapon/reagent_containers/glass/beaker/sulphuric,/turf/simulated/floor/tiled,/area/rnd/lab) +"bqN" = (/obj/machinery/r_n_d/circuit_imprinter,/obj/item/reagent_containers/glass/beaker/sulphuric,/turf/simulated/floor/tiled,/area/rnd/lab) "bqO" = (/obj/effect/floor_decal/corner/purple{dir = 6},/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled/white,/area/rnd/lab) "bqP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/turf/simulated/floor/plating,/area/rnd/lab) "bqQ" = (/obj/machinery/power/apc/super/critical{dir = 4; is_critical = 1; name = "east bump"; pixel_x = 24; pixel_y = 0},/obj/structure/cable/cyan,/turf/simulated/floor/bluegrid,/area/ai) -"bqR" = (/obj/effect/landmark/start{name = "AI"},/obj/item/device/radio/intercom{broadcasting = 1; dir = 2; listening = 1; name = "Common Channel"; pixel_y = -21},/obj/item/device/radio/intercom{dir = 8; listening = 0; name = "Custom Channel"; pixel_x = -21; pixel_y = -10},/obj/item/device/radio/intercom{broadcasting = 0; dir = 4; frequency = 1343; name = "Private Channel"; pixel_x = 21; pixel_y = -10},/obj/machinery/requests_console{department = "AI"; departmentType = 5; pixel_x = 30; pixel_y = -32},/obj/machinery/newscaster/security_unit{pixel_x = -32; pixel_y = -32},/turf/simulated/floor/bluegrid,/area/ai) +"bqR" = (/obj/effect/landmark/start{name = "AI"},/obj/item/radio/intercom{broadcasting = 1; dir = 2; listening = 1; name = "Common Channel"; pixel_y = -21},/obj/item/radio/intercom{dir = 8; listening = 0; name = "Custom Channel"; pixel_x = -21; pixel_y = -10},/obj/item/radio/intercom{broadcasting = 0; dir = 4; frequency = 1343; name = "Private Channel"; pixel_x = 21; pixel_y = -10},/obj/machinery/requests_console{department = "AI"; departmentType = 5; pixel_x = 30; pixel_y = -32},/obj/machinery/newscaster/security_unit{pixel_x = -32; pixel_y = -32},/turf/simulated/floor/bluegrid,/area/ai) "bqS" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 5},/obj/structure/flora/ausbushes/sparsegrass,/turf/simulated/floor/grass,/area/hydroponics/garden) "bqT" = (/obj/structure/bed/chair/wood{dir = 4},/turf/simulated/floor/tiled,/area/hydroponics/garden) "bqU" = (/obj/structure/bed/chair/wood{dir = 8},/turf/simulated/floor/tiled,/area/hydroponics/garden) @@ -3609,12 +3609,12 @@ "bru" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/black,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/virology) "brv" = (/obj/structure/bed/chair/office/dark{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/virology) "brw" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/white,/area/medical/virology) -"brx" = (/obj/structure/table/glass,/obj/item/weapon/storage/lockbox/vials,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/machinery/requests_console{department = "Virology"; name = "Virology Requests Console"; pixel_x = 32},/obj/effect/floor_decal/corner/lime{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/virology) -"bry" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/green,/obj/effect/floor_decal/corner/lime{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/black,/turf/simulated/floor/tiled/white,/area/medical/virology) +"brx" = (/obj/structure/table/glass,/obj/item/storage/lockbox/vials,/obj/item/reagent_containers/syringe/antiviral,/obj/item/reagent_containers/syringe/antiviral,/obj/item/reagent_containers/syringe/antiviral,/obj/item/reagent_containers/syringe/antiviral,/obj/machinery/requests_console{department = "Virology"; name = "Virology Requests Console"; pixel_x = 32},/obj/effect/floor_decal/corner/lime{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/virology) +"bry" = (/obj/structure/bed/padded,/obj/item/bedsheet/green,/obj/effect/floor_decal/corner/lime{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/black,/turf/simulated/floor/tiled/white,/area/medical/virology) "brz" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/black{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/virology) "brA" = (/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 4},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/white,/area/medical/virology) "brB" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/virology) -"brC" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/lime,/turf/simulated/floor/tiled/white,/area/medical/virology) +"brC" = (/obj/item/stool/padded,/obj/effect/floor_decal/corner/lime,/turf/simulated/floor/tiled/white,/area/medical/virology) "brD" = (/obj/structure/table/standard,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/obj/effect/floor_decal/corner/lime/full{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) "brE" = (/obj/machinery/power/solar{id = "portsolar"; name = "Port Solar Array"},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/airless{icon_state = "solarpanel"},/area/solar/auxport) "brF" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/airless,/area/solar/auxport) @@ -3627,10 +3627,10 @@ "brM" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 6},/turf/simulated/floor/plating,/area/maintenance/disposal) "brN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 9; icon_state = "intact"},/turf/simulated/floor/plating,/area/maintenance/disposal) "brO" = (/turf/simulated/wall,/area/rnd/docking) -"brP" = (/obj/structure/table/rack,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/mask/gas,/obj/item/device/flashlight,/obj/item/clothing/glasses/meson,/obj/random/maintenance/research,/obj/random/maintenance/research,/turf/simulated/floor,/area/maintenance/research) +"brP" = (/obj/structure/table/rack,/obj/item/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/mask/gas,/obj/item/flashlight,/obj/item/clothing/glasses/meson,/obj/random/maintenance/research,/obj/random/maintenance/research,/turf/simulated/floor,/area/maintenance/research) "brQ" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/research) "brR" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/research) -"brS" = (/obj/structure/table/steel,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/effect/floor_decal/corner/green{dir = 9},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) +"brS" = (/obj/structure/table/steel,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/effect/floor_decal/corner/green{dir = 9},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) "brT" = (/obj/structure/bed/chair/office/dark{dir = 8},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) "brU" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) "brV" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) @@ -3667,15 +3667,15 @@ "bsA" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/reception) "bsB" = (/obj/item/roller,/obj/item/roller{pixel_y = 8},/obj/item/roller{pixel_y = 16},/obj/structure/table/glass,/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/effect/floor_decal/corner/paleblue{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/reception) "bsC" = (/obj/structure/table/standard,/obj/structure/window/reinforced{dir = 8},/obj/machinery/computer/med_data/laptop,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/obj/machinery/camera/network/medbay{c_tag = "MED - Lobby Fore"; dir = 2},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/reception) -"bsD" = (/obj/machinery/photocopier,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/reception) +"bsD" = (/obj/machinery/photocopier,/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/reception) "bsE" = (/obj/structure/filingcabinet/chestdrawer{name = "Medical Forms"},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/reception) "bsF" = (/obj/structure/filingcabinet/medical{desc = "A large cabinet with hard copy medical records."; name = "Medical Records"},/obj/machinery/alarm{pixel_y = 22},/obj/effect/floor_decal/corner/paleblue/full{dir = 1},/obj/structure/extinguisher_cabinet{pixel_x = 25},/turf/simulated/floor/tiled/white,/area/medical/reception) -"bsG" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/belt/medical,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) -"bsH" = (/obj/structure/table/standard,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/device/flashlight/pen,/obj/item/device/flashlight/pen,/obj/item/device/flashlight/pen,/obj/item/device/flashlight/pen,/obj/item/device/flashlight/pen,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) -"bsI" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/beakers,/obj/item/weapon/storage/box/syringes{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/box/syringes,/obj/machinery/alarm{pixel_y = 22},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) -"bsJ" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/box/masks{pixel_y = 0},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) -"bsK" = (/obj/structure/closet/secure_closet/medical3,/obj/effect/floor_decal/corner/paleblue{dir = 5},/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) -"bsL" = (/obj/structure/closet/secure_closet/medical3,/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/effect/floor_decal/corner/paleblue/full{dir = 1},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) +"bsG" = (/obj/structure/table/rack,/obj/item/storage/belt/medical,/obj/item/storage/belt/medical,/obj/item/storage/belt/medical,/obj/item/storage/belt/medical,/obj/item/storage/belt/medical,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) +"bsH" = (/obj/structure/table/standard,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/flashlight/pen,/obj/item/flashlight/pen,/obj/item/flashlight/pen,/obj/item/flashlight/pen,/obj/item/flashlight/pen,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) +"bsI" = (/obj/structure/table/standard,/obj/item/storage/box/beakers,/obj/item/storage/box/syringes{pixel_x = 4; pixel_y = 4},/obj/item/storage/box/syringes,/obj/machinery/alarm{pixel_y = 22},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) +"bsJ" = (/obj/structure/table/standard,/obj/item/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/item/storage/box/masks{pixel_y = 0},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) +"bsK" = (/obj/structure/closet/secure_closet/medical3,/obj/effect/floor_decal/corner/paleblue{dir = 5},/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) +"bsL" = (/obj/structure/closet/secure_closet/medical3,/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/effect/floor_decal/corner/paleblue/full{dir = 1},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bsM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/medical/medbay_primary_storage) "bsN" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bsO" = (/obj/structure/disposalpipe/junction{dir = 1; icon_state = "pipe-j2"},/turf/simulated/floor/tiled/white,/area/medical/sleeper) @@ -3689,16 +3689,16 @@ "bsW" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 1; icon_state = "shutter0"; id = "cmooffice"; name = "CMO Office Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/crew_quarters/heads/cmo) "bsX" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/shutters{density = 0; dir = 1; icon_state = "shutter0"; id = "cmooffice"; name = "CMO Office Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/crew_quarters/heads/cmo) "bsY" = (/obj/machinery/door/airlock/command{id_tag = null; name = "CMO's Office"; req_access = list(40)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) -"bsZ" = (/obj/effect/floor_decal/corner/mauve{dir = 9},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 8; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = -21; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning) +"bsZ" = (/obj/effect/floor_decal/corner/mauve{dir = 9},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 8; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = -21; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning) "bta" = (/obj/structure/bed/chair/office/dark,/obj/effect/landmark/start{name = "Geneticist"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning) "btb" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning) "btc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning) "btd" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning) "bte" = (/obj/effect/floor_decal/corner/mauve{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning) -"btf" = (/obj/item/roller,/obj/effect/floor_decal/corner/lime{dir = 6},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/medical/virology) +"btf" = (/obj/item/roller,/obj/effect/floor_decal/corner/lime{dir = 6},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/medical/virology) "btg" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/virology) -"bth" = (/obj/structure/table/glass,/obj/item/weapon/storage/fancy/vials,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/corner/lime/full{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) -"bti" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/green,/obj/effect/floor_decal/corner/lime/full,/obj/machinery/atmospherics/pipe/simple/hidden/black,/turf/simulated/floor/tiled/white,/area/medical/virology) +"bth" = (/obj/structure/table/glass,/obj/item/storage/fancy/vials,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/corner/lime/full{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) +"bti" = (/obj/structure/bed/padded,/obj/item/bedsheet/green,/obj/effect/floor_decal/corner/lime/full,/obj/machinery/atmospherics/pipe/simple/hidden/black,/turf/simulated/floor/tiled/white,/area/medical/virology) "btj" = (/obj/effect/floor_decal/corner/lime{dir = 10},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/tiled/white,/area/medical/virology) "btk" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/virology) "btl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/virology) @@ -3717,8 +3717,8 @@ "bty" = (/obj/machinery/computer/rdconsole/core,/obj/effect/floor_decal/corner/green{dir = 9},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) "btz" = (/obj/structure/reagent_dispensers/acid{density = 0; pixel_x = 0; pixel_y = -30},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) "btA" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/light,/obj/effect/floor_decal/corner/green,/turf/simulated/floor/tiled/dark,/area/rnd/workshop) -"btB" = (/obj/machinery/r_n_d/circuit_imprinter,/obj/item/weapon/reagent_containers/glass/beaker/sulphuric,/obj/effect/floor_decal/corner/green{dir = 10},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) -"btC" = (/obj/item/stack/material/glass{amount = 50; pixel_x = 3; pixel_y = 3},/obj/structure/table/steel,/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers,/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind,/obj/effect/floor_decal/corner/green/full{dir = 4},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) +"btB" = (/obj/machinery/r_n_d/circuit_imprinter,/obj/item/reagent_containers/glass/beaker/sulphuric,/obj/effect/floor_decal/corner/green{dir = 10},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) +"btC" = (/obj/item/stack/material/glass{amount = 50; pixel_x = 3; pixel_y = 3},/obj/structure/table/steel,/obj/item/reagent_containers/food/snacks/cheesiehonkers,/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind,/obj/effect/floor_decal/corner/green/full{dir = 4},/turf/simulated/floor/tiled/dark,/area/rnd/workshop) "btD" = (/obj/effect/floor_decal/corner/purple/full,/obj/machinery/newscaster{pixel_x = -28; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/rnd/research) "btE" = (/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/rnd/research) "btF" = (/obj/effect/floor_decal/corner/purple/full{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research) @@ -3731,12 +3731,12 @@ "btM" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/research) "btN" = (/obj/machinery/door/airlock/glass_research{name = "Research and Development"; req_access = list(7)},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/lab) "btO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/rnd/lab) -"btP" = (/obj/item/weapon/stool/padded,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/rnd/lab) +"btP" = (/obj/item/stool/padded,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/rnd/lab) "btQ" = (/obj/effect/floor_decal/corner/purple{dir = 2},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/rnd/lab) "btR" = (/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled/white,/area/rnd/lab) "btS" = (/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/lab) "btT" = (/obj/structure/bed/chair/office/light,/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/landmark/start{name = "Scientist"},/turf/simulated/floor/tiled/white,/area/rnd/lab) -"btU" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/clipboard,/obj/item/weapon/folder/white,/obj/item/weapon/pen,/obj/effect/floor_decal/corner/purple/full{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/rnd/lab) +"btU" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/clipboard,/obj/item/folder/white,/obj/item/pen,/obj/effect/floor_decal/corner/purple/full{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/rnd/lab) "btV" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/navbeacon/patrol{next_patrol = "CH1"; location = "CH12"},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "btW" = (/obj/machinery/porta_turret/ai_defense,/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/floor/tiled/dark,/area/ai) "btX" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/bluegrid,/area/ai) @@ -3756,11 +3756,11 @@ "bul" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "medbayquar"; name = "Medbay Emergency Lockdown Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/medical/reception) "bum" = (/obj/structure/bed/chair{dir = 4},/obj/effect/floor_decal/corner/paleblue{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/reception) "bun" = (/obj/effect/floor_decal/corner/paleblue{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/reception) -"buo" = (/obj/structure/table/standard,/obj/structure/window/reinforced{dir = 8},/obj/item/device/radio{anchored = 1; broadcasting = 0; canhear_range = 1; frequency = 1487; icon = 'icons/obj/items.dmi'; icon_state = "red_phone"; listening = 1; name = "Reception Emergency Phone"; pixel_x = -5},/obj/effect/floor_decal/corner/paleblue{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/reception) +"buo" = (/obj/structure/table/standard,/obj/structure/window/reinforced{dir = 8},/obj/item/radio{anchored = 1; broadcasting = 0; canhear_range = 1; frequency = 1487; icon = 'icons/obj/items.dmi'; icon_state = "red_phone"; listening = 1; name = "Reception Emergency Phone"; pixel_x = -5},/obj/effect/floor_decal/corner/paleblue{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/reception) "bup" = (/turf/simulated/floor/tiled/white,/area/medical/reception) "buq" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/white,/area/medical/reception) -"bur" = (/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 4; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/reception) -"bus" = (/obj/structure/table/standard,/obj/item/roller,/obj/item/roller{pixel_y = 8},/obj/item/roller{pixel_y = 16},/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -22},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) +"bur" = (/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 4; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/reception) +"bus" = (/obj/structure/table/standard,/obj/item/roller,/obj/item/roller{pixel_y = 8},/obj/item/roller{pixel_y = 16},/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -22},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "but" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "buu" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "buv" = (/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) @@ -3786,12 +3786,12 @@ "buP" = (/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning) "buQ" = (/obj/structure/closet/wardrobe/genetics_white,/obj/effect/floor_decal/corner/mauve,/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning) "buR" = (/obj/structure/closet/wardrobe/medic_white,/obj/effect/floor_decal/corner/mauve/full{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -25},/turf/simulated/floor/tiled/white,/area/medical/genetics_cloning) -"buS" = (/obj/structure/table/glass,/obj/item/weapon/folder/white,/obj/item/weapon/hand_labeler,/obj/effect/floor_decal/corner/lime/full,/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/tiled/white,/area/medical/virology) -"buT" = (/obj/structure/table/glass,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 8},/obj/item/device/radio{anchored = 1; broadcasting = 0; canhear_range = 7; frequency = 1487; icon = 'icons/obj/items.dmi'; icon_state = "red_phone"; listening = 1; name = "Virology Emergency Phone"; pixel_x = -6; pixel_y = 8},/obj/item/weapon/reagent_containers/spray/cleaner,/obj/effect/floor_decal/corner/lime{dir = 10},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/virology) -"buU" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/effect/floor_decal/corner/lime{dir = 8},/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/medical/virology) -"buV" = (/obj/effect/floor_decal/corner/lime,/obj/machinery/camera/network/medbay{c_tag = "MED - Virology Aft"; dir = 1},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/medical/virology) -"buW" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/box/masks,/obj/effect/floor_decal/corner/lime{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/virology) -"buX" = (/obj/item/weapon/storage/box/syringes{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/box/beakers,/obj/item/weapon/reagent_containers/dropper,/obj/structure/table/glass,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/effect/floor_decal/corner/lime/full{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) +"buS" = (/obj/structure/table/glass,/obj/item/folder/white,/obj/item/hand_labeler,/obj/effect/floor_decal/corner/lime/full,/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/tiled/white,/area/medical/virology) +"buT" = (/obj/structure/table/glass,/obj/item/paper_bin{pixel_x = 1; pixel_y = 8},/obj/item/radio{anchored = 1; broadcasting = 0; canhear_range = 7; frequency = 1487; icon = 'icons/obj/items.dmi'; icon_state = "red_phone"; listening = 1; name = "Virology Emergency Phone"; pixel_x = -6; pixel_y = 8},/obj/item/reagent_containers/spray/cleaner,/obj/effect/floor_decal/corner/lime{dir = 10},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/virology) +"buU" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/effect/floor_decal/corner/lime{dir = 8},/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/medical/virology) +"buV" = (/obj/effect/floor_decal/corner/lime,/obj/machinery/camera/network/medbay{c_tag = "MED - Virology Aft"; dir = 1},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/medical/virology) +"buW" = (/obj/structure/table/glass,/obj/item/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/item/storage/box/masks,/obj/effect/floor_decal/corner/lime{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/virology) +"buX" = (/obj/item/storage/box/syringes{pixel_x = 4; pixel_y = 4},/obj/item/storage/box/beakers,/obj/item/reagent_containers/dropper,/obj/structure/table/glass,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/effect/floor_decal/corner/lime/full{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) "buY" = (/obj/machinery/atmospherics/pipe/simple/hidden/black,/turf/simulated/wall,/area/medical/virology) "buZ" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/medical/virology) "bva" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/black,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) @@ -3815,9 +3815,9 @@ "bvs" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/rnd/research) "bvt" = (/obj/machinery/vending/snack,/turf/simulated/floor/wood,/area/rnd/research) "bvu" = (/obj/effect/floor_decal/corner/purple{dir = 9},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/rnd/research) -"bvv" = (/obj/item/weapon/folder/white,/obj/structure/table/standard,/obj/item/weapon/disk/tech_disk{pixel_x = 0; pixel_y = 0},/obj/item/weapon/disk/tech_disk{pixel_x = 0; pixel_y = 0},/obj/item/weapon/disk/design_disk,/obj/item/weapon/disk/design_disk,/obj/item/weapon/reagent_containers/dropper{pixel_y = -4},/obj/machinery/light_switch{pixel_x = 0; pixel_y = -26},/obj/effect/floor_decal/corner/purple{dir = 10},/turf/simulated/floor/tiled/white,/area/rnd/lab) -"bvw" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/obj/effect/floor_decal/corner/purple{dir = 10},/turf/simulated/floor/tiled/white,/area/rnd/lab) -"bvx" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = 2; pixel_y = 3},/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/effect/floor_decal/corner/purple/full{dir = 4},/obj/machinery/light,/obj/structure/reagent_dispensers/acid{density = 0; pixel_x = 0; pixel_y = -30},/turf/simulated/floor/tiled/white,/area/rnd/lab) +"bvv" = (/obj/item/folder/white,/obj/structure/table/standard,/obj/item/disk/tech_disk{pixel_x = 0; pixel_y = 0},/obj/item/disk/tech_disk{pixel_x = 0; pixel_y = 0},/obj/item/disk/design_disk,/obj/item/disk/design_disk,/obj/item/reagent_containers/dropper{pixel_y = -4},/obj/machinery/light_switch{pixel_x = 0; pixel_y = -26},/obj/effect/floor_decal/corner/purple{dir = 10},/turf/simulated/floor/tiled/white,/area/rnd/lab) +"bvw" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/obj/item/cell/high{charge = 100; maxcharge = 15000},/obj/item/cell/high{charge = 100; maxcharge = 15000},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/obj/effect/floor_decal/corner/purple{dir = 10},/turf/simulated/floor/tiled/white,/area/rnd/lab) +"bvx" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical{pixel_x = 2; pixel_y = 3},/obj/item/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/effect/floor_decal/corner/purple/full{dir = 4},/obj/machinery/light,/obj/structure/reagent_dispensers/acid{density = 0; pixel_x = 0; pixel_y = -30},/turf/simulated/floor/tiled/white,/area/rnd/lab) "bvy" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/rnd/lab) "bvz" = (/obj/structure/table/reinforced,/obj/machinery/door/window/northleft{name = "Research and Development Desk"; req_access = list(7)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/rnd/lab) "bvA" = (/obj/machinery/light,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor/tiled/dark,/area/ai) @@ -3834,8 +3834,8 @@ "bvL" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = 36; pixel_y = 0},/obj/effect/floor_decal/corner/paleblue{dir = 4},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/white,/area/medical/reception) "bvM" = (/obj/effect/floor_decal/corner/paleblue{dir = 1},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bvN" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) -"bvO" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/adv{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/firstaid/adv,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) -"bvP" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/toxin{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/firstaid/toxin{pixel_x = 0; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) +"bvO" = (/obj/structure/table/standard,/obj/item/storage/firstaid/adv{pixel_x = 5; pixel_y = 5},/obj/item/storage/firstaid/adv,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) +"bvP" = (/obj/structure/table/standard,/obj/item/storage/firstaid/toxin{pixel_x = 5; pixel_y = 5},/obj/item/storage/firstaid/toxin{pixel_x = 0; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bvQ" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_medical{name = "Medbay Equipment"; req_access = list(5)},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bvR" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bvS" = (/obj/effect/floor_decal/corner/paleblue,/turf/simulated/floor/tiled/white,/area/medical/sleeper) @@ -3847,7 +3847,7 @@ "bvY" = (/obj/structure/table/reinforced,/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) "bvZ" = (/obj/structure/table/reinforced,/obj/machinery/computer/skills{pixel_y = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) "bwa" = (/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) -"bwb" = (/obj/structure/closet/secure_closet/CMO,/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) +"bwb" = (/obj/structure/closet/secure_closet/CMO,/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) "bwc" = (/obj/machinery/door/airlock/medical{name = "Morgue"; req_access = list(6,5)},/obj/machinery/door/firedoor,/turf/simulated/floor/tiled,/area/medical/genetics_cloning) "bwd" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/medical/virology) "bwe" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/medical/virology) @@ -3862,7 +3862,7 @@ "bwn" = (/obj/machinery/embedded_controller/radio/airlock/airlock_controller{tag_airpump = "arrivals_pump"; tag_exterior_door = "arrivals_outer"; frequency = 1379; id_tag = "arrivals_airlock"; tag_interior_door = "arrivals_inner"; pixel_x = 25; req_access = list(13); tag_chamber_sensor = "arrivals_sensor"},/obj/machinery/airlock_sensor{frequency = 1379; id_tag = "arrivals_sensor"; pixel_x = 25; pixel_y = 12},/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor,/area/maintenance/research) "bwo" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/disposal) "bwp" = (/obj/item/trash/candy,/obj/item/trash/popcorn,/obj/machinery/button/remote/driver{id = "trash"; pixel_x = -26; pixel_y = -6},/turf/simulated/floor/plating,/area/maintenance/disposal) -"bwq" = (/obj/item/weapon/stool/padded,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/turf/simulated/floor,/area/maintenance/disposal) +"bwq" = (/obj/item/stool/padded,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/turf/simulated/floor,/area/maintenance/disposal) "bwr" = (/obj/machinery/conveyor_switch/oneway{convdir = -1; id = "garbage"; name = "disposal coveyor"},/turf/simulated/floor,/area/maintenance/disposal) "bws" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/disposal) "bwt" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/machinery/conveyor{dir = 2; id = "garbage"},/turf/simulated/floor/plating,/area/maintenance/disposal) @@ -3881,7 +3881,7 @@ "bwG" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/rnd/research) "bwH" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/rnd/research) "bwI" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/rnd/research) -"bwJ" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research) +"bwJ" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research) "bwK" = (/turf/simulated/wall/r_wall,/area/rnd/research_foyer) "bwL" = (/obj/effect/floor_decal/corner/purple/full{dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled,/area/rnd/research_foyer) "bwM" = (/obj/effect/floor_decal/corner/purple{dir = 5},/turf/simulated/floor/tiled,/area/rnd/research_foyer) @@ -3898,13 +3898,13 @@ "bwX" = (/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/medical/reception) "bwY" = (/obj/structure/table/standard,/obj/structure/window/reinforced{dir = 8},/obj/machinery/button/remote/blast_door{id = "medbayrecquar"; name = "Medbay Entrance Quarantine Shutters Control"; pixel_x = -4; pixel_y = -4; req_access = list(5)},/obj/machinery/button/remote/airlock{desc = "A remote control switch for the medbay foyer."; id = "MedbayFoyer"; name = "Medbay Doors Control"; pixel_x = -4; pixel_y = 6},/obj/machinery/button/remote/airlock{desc = "A remote control switch for the medbay foyer."; id = "surgery_observation"; name = "Surgery Door Access"; pixel_x = 8; pixel_y = 0; specialfunctions = 4},/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/medical/reception) "bwZ" = (/obj/machinery/computer/crew,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/medical/reception) -"bxa" = (/obj/item/weapon/stool/padded,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/reception) +"bxa" = (/obj/item/stool/padded,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/reception) "bxb" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/reception) "bxc" = (/obj/machinery/door/airlock/glass_medical{name = "Medbay Equipment"; req_access = list(5)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bxd" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bxe" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) -"bxf" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/o2{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/firstaid/o2{pixel_x = 0; pixel_y = 0},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) -"bxg" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/fire{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/firstaid/fire{pixel_x = 0; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) +"bxf" = (/obj/structure/table/standard,/obj/item/storage/firstaid/o2{pixel_x = 5; pixel_y = 5},/obj/item/storage/firstaid/o2{pixel_x = 0; pixel_y = 0},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) +"bxg" = (/obj/structure/table/standard,/obj/item/storage/firstaid/fire{pixel_x = 5; pixel_y = 5},/obj/item/storage/firstaid/fire{pixel_x = 0; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bxh" = (/obj/structure/bed/chair/wheelchair,/obj/machinery/camera/network/medbay{c_tag = "MED - Equipment Storage"; dir = 8},/obj/effect/floor_decal/corner/paleblue,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bxi" = (/obj/structure/table/glass,/obj/structure/closet/secure_closet/medical_wall/pills{pixel_x = -32},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bxj" = (/obj/effect/floor_decal/corner/paleblue{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/sleeper) @@ -3916,13 +3916,13 @@ "bxp" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/airlock/command{id_tag = "cmodoor"; name = "CMO's Office"; req_access = list(40)},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) "bxq" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) "bxr" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) -"bxs" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/clipboard,/obj/item/weapon/stamp/cmo,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/weapon/folder/white_cmo,/obj/item/weapon/pen/multi,/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) +"bxs" = (/obj/structure/table/reinforced,/obj/item/paper_bin,/obj/item/clipboard,/obj/item/stamp/cmo,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/folder/white_cmo,/obj/item/pen/multi,/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) "bxt" = (/obj/structure/bed/chair/office/light{dir = 8},/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for shutters."; id = "medbayquar"; name = "Medbay Emergency Lockdown Control"; pixel_x = -28; pixel_y = 36; req_access = list(5)},/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for shutters."; id = "virologyquar"; name = "Virology Emergency Lockdown Control"; pixel_x = -28; pixel_y = 28; req_access = list(5)},/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for shutters."; id = "cmooffice"; name = "CMO Privacy Shutters"; pixel_x = -38; pixel_y = 28},/obj/machinery/button/remote/airlock{desc = "A remote control switch for the CMO's office."; id = "cmodoor"; name = "CMO Office Door Control"; pixel_x = -38; pixel_y = 36},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/landmark/start{name = "Chief Medical Officer"},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) "bxu" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) -"bxv" = (/obj/structure/table/reinforced,/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/item/weapon/storage/fancy/vials{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/fancy/vials,/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) +"bxv" = (/obj/structure/table/reinforced,/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/item/storage/fancy/vials{pixel_x = 5; pixel_y = 5},/obj/item/storage/fancy/vials,/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) "bxw" = (/turf/simulated/wall,/area/medical/morgue) -"bxx" = (/obj/structure/table/steel,/obj/item/weapon/autopsy_scanner,/obj/item/weapon/surgical/scalpel,/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/obj/machinery/light{dir = 1},/obj/item/weapon/surgical/cautery,/turf/simulated/floor/tiled,/area/medical/morgue) -"bxy" = (/obj/structure/table/steel,/obj/item/device/camera{name = "Autopsy Camera"; pixel_x = -2; pixel_y = 7},/obj/item/weapon/paper_bin{pixel_y = -6},/obj/item/weapon/pen/red{pixel_x = -1; pixel_y = -9},/obj/item/weapon/pen/blue{pixel_x = 3; pixel_y = -5},/obj/effect/floor_decal/corner/paleblue{dir = 5},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 1; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled,/area/medical/morgue) +"bxx" = (/obj/structure/table/steel,/obj/item/autopsy_scanner,/obj/item/surgical/scalpel,/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/obj/machinery/light{dir = 1},/obj/item/surgical/cautery,/turf/simulated/floor/tiled,/area/medical/morgue) +"bxy" = (/obj/structure/table/steel,/obj/item/camera{name = "Autopsy Camera"; pixel_x = -2; pixel_y = 7},/obj/item/paper_bin{pixel_y = -6},/obj/item/pen/red{pixel_x = -1; pixel_y = -9},/obj/item/pen/blue{pixel_x = 3; pixel_y = -5},/obj/effect/floor_decal/corner/paleblue{dir = 5},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 1; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled,/area/medical/morgue) "bxz" = (/obj/machinery/disposal,/obj/effect/floor_decal/corner/paleblue{dir = 1},/obj/structure/disposalpipe/trunk,/turf/simulated/floor/tiled,/area/medical/morgue) "bxA" = (/turf/simulated/floor/tiled,/area/medical/morgue) "bxB" = (/obj/effect/floor_decal/corner/paleblue{dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/medical/morgue) @@ -3948,7 +3948,7 @@ "bxV" = (/turf/simulated/floor,/area/maintenance/disposal) "bxW" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/disposal) "bxX" = (/obj/machinery/conveyor{dir = 2; id = "garbage"},/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/turf/simulated/floor,/area/maintenance/disposal) -"bxY" = (/obj/machinery/atmospherics/portables_connector,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/effect/floor_decal/corner/purple/full{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/misc_lab) +"bxY" = (/obj/machinery/atmospherics/portables_connector,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/effect/floor_decal/corner/purple/full{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/misc_lab) "bxZ" = (/obj/effect/floor_decal/corner/purple{dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/misc_lab) "bya" = (/turf/simulated/floor/tiled/white,/area/rnd/misc_lab) "byb" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/white,/area/rnd/misc_lab) @@ -3971,7 +3971,7 @@ "bys" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera/network/research{c_tag = "SCI - Research Hallway Starboard"; dir = 8},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/rnd/research) "byt" = (/obj/structure/sign/securearea,/turf/simulated/wall/r_wall,/area/rnd/research_foyer) "byu" = (/obj/structure/closet/firecloset,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer) -"byv" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer) +"byv" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer) "byw" = (/obj/structure/sink{pixel_y = 16},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/research_foyer) "byx" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/turf/simulated/floor/tiled,/area/rnd/research_foyer) "byy" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/rnd/research_foyer) @@ -3986,7 +3986,7 @@ "byH" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor,/area/maintenance/central) "byI" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/turf/simulated/floor,/area/maintenance/central) "byJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/meter,/turf/simulated/floor,/area/maintenance/central) -"byK" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two) +"byK" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two) "byL" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "byM" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "byN" = (/obj/structure/disposalpipe/sortjunction{dir = 2; icon_state = "pipe-j1s"; name = "Kitchen"; sortType = "Kitchen"},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) @@ -3994,7 +3994,7 @@ "byP" = (/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "medbayquar"; name = "Medbay Emergency Lockdown Shutters"; opacity = 0},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two) "byQ" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/white,/area/medical/reception) "byR" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/medical/reception) -"byS" = (/obj/structure/table/standard,/obj/machinery/door/window/eastright{base_state = "left"; dir = 8; icon_state = "left"; name = "Medical Reception"; req_access = list(5)},/obj/item/weapon/reagent_containers/spray/cleaner{pixel_x = -5},/obj/effect/floor_decal/corner/paleblue{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/reception) +"byS" = (/obj/structure/table/standard,/obj/machinery/door/window/eastright{base_state = "left"; dir = 8; icon_state = "left"; name = "Medical Reception"; req_access = list(5)},/obj/item/reagent_containers/spray/cleaner{pixel_x = -5},/obj/effect/floor_decal/corner/paleblue{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/reception) "byT" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/medical/reception) "byU" = (/obj/effect/floor_decal/corner/paleblue{dir = 2},/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/tiled/white,/area/medical/reception) "byV" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/obj/effect/floor_decal/corner/paleblue{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) @@ -4003,7 +4003,7 @@ "byY" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "byZ" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bza" = (/obj/structure/bed/chair/wheelchair,/obj/effect/floor_decal/corner/paleblue{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) -"bzb" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/spray/cleaner{pixel_x = 2; pixel_y = 2},/obj/item/weapon/reagent_containers/spray/cleaner{pixel_x = -2; pixel_y = -2},/obj/item/device/defib_kit/loaded,/obj/item/device/defib_kit/loaded,/turf/simulated/floor/tiled/white,/area/medical/sleeper) +"bzb" = (/obj/structure/table/glass,/obj/item/reagent_containers/spray/cleaner{pixel_x = 2; pixel_y = 2},/obj/item/reagent_containers/spray/cleaner{pixel_x = -2; pixel_y = -2},/obj/item/defib_kit/loaded,/obj/item/defib_kit/loaded,/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bzc" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bzd" = (/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bze" = (/obj/effect/floor_decal/corner/paleblue{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/medical/sleeper) @@ -4012,7 +4012,7 @@ "bzh" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) "bzi" = (/obj/structure/table/reinforced,/obj/machinery/computer/med_data/laptop{pixel_x = 3; pixel_y = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) "bzj" = (/obj/effect/floor_decal/corner/paleblue{dir = 2},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) -"bzk" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/medical,/obj/item/clothing/accessory/stethoscope,/obj/machinery/requests_console{announcementConsole = 1; department = "Chief Medical Officer's Desk"; departmentType = 5; name = "Chief Medical Officer RC"; pixel_x = 32; pixel_y = -2},/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -26},/obj/effect/floor_decal/corner/paleblue/full{dir = 4},/obj/item/device/radio{frequency = 1487; name = "Medbay Emergency Radio Link"},/obj/item/device/megaphone,/obj/item/clothing/glasses/sunglasses/medhud,/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) +"bzk" = (/obj/structure/table/rack,/obj/item/storage/belt/medical,/obj/item/clothing/accessory/stethoscope,/obj/machinery/requests_console{announcementConsole = 1; department = "Chief Medical Officer's Desk"; departmentType = 5; name = "Chief Medical Officer RC"; pixel_x = 32; pixel_y = -2},/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -26},/obj/effect/floor_decal/corner/paleblue/full{dir = 4},/obj/item/radio{frequency = 1487; name = "Medbay Emergency Radio Link"},/obj/item/megaphone,/obj/item/clothing/glasses/sunglasses/medhud,/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) "bzl" = (/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/medical/morgue) "bzm" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/medical/morgue) "bzn" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/medical/morgue) @@ -4024,7 +4024,7 @@ "bzt" = (/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for shutters."; id = "virologyquar"; name = "Virology Emergency Lockdown Control"; pixel_x = 0; pixel_y = -28; req_access = list(5)},/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/effect/floor_decal/corner/lime,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 6},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) "bzu" = (/obj/effect/floor_decal/corner/lime{dir = 10},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/camera/network/medbay{c_tag = "MED - Virology Hallway"; dir = 1},/turf/simulated/floor/tiled/white,/area/medical/virology) "bzv" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/floor_decal/corner/lime{dir = 10},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/tiled/white,/area/medical/virology) -"bzw" = (/obj/effect/floor_decal/corner/lime{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/medical/virology) +"bzw" = (/obj/effect/floor_decal/corner/lime{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/medical/virology) "bzx" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) "bzy" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 9; icon_state = "intact"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) "bzz" = (/obj/machinery/door/airlock/medical{autoclose = 0; frequency = 1379; icon_state = "door_locked"; id_tag = "virologyq_airlock_interior"; locked = 1; name = "Virology Quarantine Airlock"; req_access = list(39)},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/virology) @@ -4044,7 +4044,7 @@ "bzN" = (/obj/structure/closet/emcloset,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor,/area/maintenance/research) "bzO" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/light_switch{pixel_x = 12; pixel_y = -25},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor,/area/maintenance/disposal) "bzP" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/turf/simulated/floor,/area/maintenance/disposal) -"bzQ" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -21},/obj/machinery/light/small,/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/plating,/area/maintenance/disposal) +"bzQ" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -21},/obj/machinery/light/small,/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/plating,/area/maintenance/disposal) "bzR" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Disposal Access"; req_access = list(12)},/turf/simulated/floor/plating,/area/maintenance/disposal) "bzS" = (/obj/machinery/conveyor{dir = 2; id = "garbage"},/turf/simulated/floor,/area/maintenance/disposal) "bzT" = (/obj/machinery/atmospherics/binary/pump,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/effect/floor_decal/corner/purple{dir = 9},/turf/simulated/floor/tiled/white,/area/rnd/misc_lab) @@ -4070,7 +4070,7 @@ "bAn" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/rnd/research_foyer) "bAo" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/hologram/holopad,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/rnd/research_foyer) "bAp" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/rnd/research_foyer) -"bAq" = (/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/item/device/radio/beacon,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/rnd/research_foyer) +"bAq" = (/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/item/radio/beacon,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/rnd/research_foyer) "bAr" = (/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_four) "bAs" = (/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bAt" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) @@ -4106,14 +4106,14 @@ "bAX" = (/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/reception) "bAY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/reception) "bAZ" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/reception) -"bBa" = (/obj/structure/table/standard,/obj/structure/window/reinforced{dir = 8},/obj/item/device/radio{anchored = 1; broadcasting = 0; canhear_range = 1; frequency = 1487; icon = 'icons/obj/items.dmi'; icon_state = "red_phone"; listening = 1; name = "Reception Emergency Phone"},/obj/effect/floor_decal/corner/paleblue{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/reception) +"bBa" = (/obj/structure/table/standard,/obj/structure/window/reinforced{dir = 8},/obj/item/radio{anchored = 1; broadcasting = 0; canhear_range = 1; frequency = 1487; icon = 'icons/obj/items.dmi'; icon_state = "red_phone"; listening = 1; name = "Reception Emergency Phone"},/obj/effect/floor_decal/corner/paleblue{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/reception) "bBb" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/reception) "bBc" = (/obj/effect/floor_decal/corner/paleblue{dir = 4},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/medical/reception) -"bBd" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/bottle/stoxin{pixel_x = -6; pixel_y = 10},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = 5; pixel_y = 5},/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{pixel_x = 1},/obj/random/medical,/obj/effect/floor_decal/corner/paleblue/full,/obj/machinery/light{dir = 8},/obj/item/weapon/storage/firstaid/regular{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) -"bBe" = (/obj/structure/table/standard,/obj/item/weapon/packageWrap,/obj/item/weapon/hand_labeler,/obj/effect/floor_decal/corner/paleblue{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) +"bBd" = (/obj/structure/table/standard,/obj/item/reagent_containers/glass/bottle/stoxin{pixel_x = -6; pixel_y = 10},/obj/item/reagent_containers/glass/bottle/antitoxin{pixel_x = 5; pixel_y = 5},/obj/item/reagent_containers/glass/bottle/inaprovaline{pixel_x = 1},/obj/random/medical,/obj/effect/floor_decal/corner/paleblue/full,/obj/machinery/light{dir = 8},/obj/item/storage/firstaid/regular{pixel_x = 5; pixel_y = 5},/obj/item/storage/firstaid/regular,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) +"bBe" = (/obj/structure/table/standard,/obj/item/packageWrap,/obj/item/hand_labeler,/obj/effect/floor_decal/corner/paleblue{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bBf" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) -"bBg" = (/obj/structure/table/rack,/obj/item/device/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"; pixel_x = 2; pixel_y = 2},/obj/item/device/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/obj/item/device/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) -"bBh" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/emergency,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) +"bBg" = (/obj/structure/table/rack,/obj/item/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"; pixel_x = 2; pixel_y = 2},/obj/item/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/obj/item/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) +"bBh" = (/obj/structure/table/standard,/obj/item/storage/toolbox/emergency,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bBi" = (/obj/machinery/vending/medical,/obj/effect/floor_decal/corner/paleblue/full{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bBj" = (/obj/structure/closet/secure_closet/medical1,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bBk" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/sleeper) @@ -4126,7 +4126,7 @@ "bBr" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) "bBs" = (/obj/structure/table/reinforced,/obj/machinery/photocopier/faxmachine{department = "CMO's Office"},/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/machinery/light,/obj/machinery/camera/network/medbay{c_tag = "MED - CMO"; dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) "bBt" = (/obj/machinery/keycard_auth{pixel_x = 0; pixel_y = -24},/obj/machinery/light_switch{pixel_x = -10; pixel_y = -23},/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) -"bBu" = (/obj/machinery/computer/crew,/obj/effect/floor_decal/corner/paleblue/full{dir = 4},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) +"bBu" = (/obj/machinery/computer/crew,/obj/effect/floor_decal/corner/paleblue/full{dir = 4},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) "bBv" = (/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/medical/morgue) "bBw" = (/obj/machinery/optable,/turf/simulated/floor/tiled,/area/medical/morgue) "bBx" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/medical/morgue) @@ -4157,9 +4157,9 @@ "bBW" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 10},/obj/structure/table/reinforced,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/rnd/misc_lab) "bBX" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/misc_lab) "bBY" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/white,/area/rnd/misc_lab) -"bBZ" = (/obj/structure/table/reinforced,/obj/item/weapon/tool/wrench,/obj/item/weapon/tool/crowbar/red,/obj/item/clothing/glasses/science,/turf/simulated/floor/tiled/white,/area/rnd/misc_lab) +"bBZ" = (/obj/structure/table/reinforced,/obj/item/tool/wrench,/obj/item/tool/crowbar/red,/obj/item/clothing/glasses/science,/turf/simulated/floor/tiled/white,/area/rnd/misc_lab) "bCa" = (/obj/structure/table/reinforced,/obj/machinery/button/ignition{id = "Xenobio"; pixel_x = -6; pixel_y = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/white,/area/rnd/misc_lab) -"bCb" = (/obj/machinery/computer/security/telescreen{desc = "Used to monitor the proceedings inside the test chamber."; name = "Test Chamber Monitor"; network = list("Miscellaneous Reseach"); pixel_x = 32; pixel_y = 0},/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/purple,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/white,/area/rnd/misc_lab) +"bCb" = (/obj/machinery/computer/security/telescreen{desc = "Used to monitor the proceedings inside the test chamber."; name = "Test Chamber Monitor"; network = list("Miscellaneous Reseach"); pixel_x = 32; pixel_y = 0},/obj/item/stool/padded,/obj/effect/floor_decal/corner/purple,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/white,/area/rnd/misc_lab) "bCc" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/camera/network/research{c_tag = "SCI - Research Hallway Center"; dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/research) "bCd" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/rnd/research) "bCe" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/rnd/research) @@ -4185,7 +4185,7 @@ "bCy" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light/small,/obj/machinery/portable_atmospherics/powered/pump/filled,/turf/simulated/floor,/area/maintenance/central) "bCz" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/portable_atmospherics/powered/scrubber,/turf/simulated/floor,/area/maintenance/central) "bCA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/central) -"bCB" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/weapon/material/shard{icon_state = "medium"},/obj/item/stack/rods,/turf/simulated/floor,/area/maintenance/central) +"bCB" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/material/shard{icon_state = "medium"},/obj/item/stack/rods,/turf/simulated/floor,/area/maintenance/central) "bCC" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/maintenance/central) "bCD" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/mob/living/simple_mob/animal/passive/mouse,/turf/simulated/floor,/area/maintenance/central) "bCE" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor,/area/maintenance/central) @@ -4202,7 +4202,7 @@ "bCP" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/maintenance/central) "bCQ" = (/obj/random/obstruction,/turf/simulated/floor,/area/maintenance/central) "bCR" = (/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/structure/closet/crate/freezer,/turf/simulated/floor,/area/maintenance/central) -"bCS" = (/obj/structure/table/rack{dir = 4},/obj/item/weapon/storage/toolbox/mechanical,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/medical,/turf/simulated/floor,/area/maintenance/central) +"bCS" = (/obj/structure/table/rack{dir = 4},/obj/item/storage/toolbox/mechanical,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/medical,/turf/simulated/floor,/area/maintenance/central) "bCT" = (/turf/simulated/wall,/area/crew_quarters/kitchen) "bCU" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/maintenance/central) "bCV" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor,/area/maintenance/central) @@ -4215,12 +4215,12 @@ "bDc" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/reception) "bDd" = (/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/medical/reception) "bDe" = (/obj/structure/table/standard,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/computer/med_data/laptop,/obj/effect/floor_decal/corner/paleblue/full,/turf/simulated/floor/tiled/white,/area/medical/reception) -"bDf" = (/obj/structure/table/standard,/obj/structure/window/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/folder/white,/obj/item/weapon/pen,/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/reception) -"bDg" = (/obj/structure/table/standard,/obj/structure/window/reinforced,/obj/item/weapon/storage/box/cups,/obj/item/weapon/storage/box/cups{pixel_x = 2; pixel_y = 5},/obj/effect/floor_decal/corner/paleblue{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/reception) +"bDf" = (/obj/structure/table/standard,/obj/structure/window/reinforced,/obj/item/paper_bin,/obj/item/folder/white,/obj/item/pen,/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/reception) +"bDg" = (/obj/structure/table/standard,/obj/structure/window/reinforced,/obj/item/storage/box/cups,/obj/item/storage/box/cups{pixel_x = 2; pixel_y = 5},/obj/effect/floor_decal/corner/paleblue{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/reception) "bDh" = (/obj/machinery/door/window/southright{name = "Medical Reception"; req_access = list(5)},/obj/structure/noticeboard{pixel_x = 32; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/reception) "bDi" = (/obj/machinery/door/airlock/glass_medical{name = "Medbay Equipment"; req_access = list(5)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bDj" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/medical/medbay_primary_storage) -"bDk" = (/obj/machinery/iv_drip,/obj/structure/closet/secure_closet/medical_wall{name = "O- Blood Locker"; pixel_x = -32},/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/turf/simulated/floor/tiled/white,/area/medical/sleeper) +"bDk" = (/obj/machinery/iv_drip,/obj/structure/closet/secure_closet/medical_wall{name = "O- Blood Locker"; pixel_x = -32},/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bDl" = (/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bDm" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/effect/floor_decal/corner/paleblue{dir = 4},/obj/structure/disposalpipe/segment,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bDn" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "cmooffice"; name = "CMO Office Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/crew_quarters/heads/cmo) @@ -4235,7 +4235,7 @@ "bDw" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/machinery/shower{dir = 8; icon_state = "shower"; pixel_x = -5; pixel_y = 0},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/turf/simulated/floor/tiled/steel,/area/medical/virology) "bDx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "bDy" = (/obj/structure/cable/yellow,/obj/machinery/power/solar_control{id = "auxsolareast"; name = "Fore Port Solar Control"; track = 0},/turf/simulated/floor,/area/maintenance/auxsolarport) -"bDz" = (/obj/item/weapon/stool,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/item/stack/cable_coil/yellow,/obj/item/stack/cable_coil/yellow,/turf/simulated/floor,/area/maintenance/auxsolarport) +"bDz" = (/obj/item/stool,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/item/stack/cable_coil/yellow,/obj/item/stack/cable_coil/yellow,/turf/simulated/floor,/area/maintenance/auxsolarport) "bDA" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/camera/network/engineering{c_tag = "ENG - Solar Fore Port"; dir = 1},/turf/simulated/floor,/area/maintenance/auxsolarport) "bDB" = (/obj/machinery/camera/network/engineering{c_tag = "ENG - Solar Fore Port Access"; dir = 4},/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor,/area/maintenance/research) "bDC" = (/obj/machinery/light/small,/turf/simulated/floor,/area/maintenance/research) @@ -4251,7 +4251,7 @@ "bDM" = (/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/rnd/misc_lab) "bDN" = (/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/rnd/misc_lab) "bDO" = (/obj/machinery/shieldwallgen{anchored = 1; req_access = list(47)},/obj/effect/floor_decal/corner/purple/full{dir = 4},/obj/structure/cable/green,/turf/simulated/floor/tiled/white,/area/rnd/misc_lab) -"bDP" = (/obj/effect/floor_decal/corner/purple{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/rnd/research) +"bDP" = (/obj/effect/floor_decal/corner/purple{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/rnd/research) "bDQ" = (/obj/effect/floor_decal/corner/purple{dir = 6},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/rnd/research) "bDR" = (/turf/simulated/wall/r_wall,/area/rnd/rdoffice) "bDS" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/polarized{dir = 1},/obj/structure/window/reinforced/polarized,/obj/structure/window/reinforced/polarized{dir = 4},/obj/structure/window/reinforced/polarized{dir = 8},/turf/simulated/floor/plating,/area/rnd/rdoffice) @@ -4260,24 +4260,24 @@ "bDV" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/polarized{dir = 1},/obj/structure/window/reinforced/polarized,/obj/structure/window/reinforced/polarized{dir = 4},/turf/simulated/floor/plating,/area/rnd/rdoffice) "bDW" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/assembly/robotics) "bDX" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_research{name = "Robotics Lab"; req_access = list(29,47)},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/assembly/robotics) -"bDY" = (/obj/effect/floor_decal/corner/purple/full,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/tiled,/area/rnd/research_foyer) +"bDY" = (/obj/effect/floor_decal/corner/purple/full,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/tiled,/area/rnd/research_foyer) "bDZ" = (/obj/effect/floor_decal/corner/purple{dir = 10},/turf/simulated/floor/tiled,/area/rnd/research_foyer) "bEa" = (/obj/effect/floor_decal/corner/purple/full{dir = 4},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/rnd/research_foyer) "bEb" = (/obj/structure/sign/directions/cargo{dir = 2; pixel_x = -32; pixel_z = 8},/obj/structure/sign/directions/medical{dir = 2; pixel_x = -32; pixel_y = 0},/obj/structure/sign/directions/engineering{dir = 2; pixel_x = -32; pixel_z = -8},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_four) "bEc" = (/obj/machinery/camera/network/northern_star{c_tag = "Hall - Central Primary Port Mid 1"; dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bEd" = (/turf/simulated/wall/r_wall,/area/crew_quarters/heads/hop) -"bEe" = (/obj/structure/table/rack{dir = 1},/obj/item/weapon/extinguisher,/obj/item/clothing/mask/gas,/turf/simulated/floor/plating,/area/maintenance/central) -"bEf" = (/obj/structure/closet/crate,/obj/item/weapon/reagent_containers/food/drinks/bottle/wine,/obj/random/drinkbottle,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/central) +"bEe" = (/obj/structure/table/rack{dir = 1},/obj/item/extinguisher,/obj/item/clothing/mask/gas,/turf/simulated/floor/plating,/area/maintenance/central) +"bEf" = (/obj/structure/closet/crate,/obj/item/reagent_containers/food/drinks/bottle/wine,/obj/random/drinkbottle,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/central) "bEg" = (/turf/simulated/floor/tiled,/area/maintenance/central) "bEh" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/maintenance/central) "bEi" = (/obj/machinery/light/small,/mob/living/simple_mob/animal/passive/mouse,/turf/simulated/floor/plating,/area/maintenance/central) "bEj" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/maintenance/central) "bEk" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/maintenance/central) -"bEl" = (/obj/structure/closet,/obj/item/weapon/storage/backpack,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/random/maintenance/clean,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/central) +"bEl" = (/obj/structure/closet,/obj/item/storage/backpack,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/random/maintenance/clean,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/central) "bEm" = (/obj/structure/closet/secure_closet/hydroponics,/obj/effect/floor_decal/corner/lime/full{dir = 8},/turf/simulated/floor/tiled,/area/hydroponics) "bEn" = (/obj/effect/floor_decal/corner/lime{dir = 5},/obj/structure/closet/secure_closet/hydroponics,/turf/simulated/floor/tiled,/area/hydroponics) "bEo" = (/obj/effect/floor_decal/corner/lime{dir = 5},/obj/structure/closet/secure_closet/hydroponics,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/hydroponics) -"bEp" = (/obj/machinery/alarm{pixel_y = 22},/obj/structure/closet/crate/hydroponics{desc = "All you need to start your own honey farm."; name = "beekeeping crate"},/obj/item/beehive_assembly,/obj/item/bee_smoker,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/bee_pack,/obj/item/weapon/tool/crowbar,/obj/effect/floor_decal/corner/lime/full{dir = 1},/turf/simulated/floor/tiled,/area/hydroponics) +"bEp" = (/obj/machinery/alarm{pixel_y = 22},/obj/structure/closet/crate/hydroponics{desc = "All you need to start your own honey farm."; name = "beekeeping crate"},/obj/item/beehive_assembly,/obj/item/bee_smoker,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/bee_pack,/obj/item/tool/crowbar,/obj/effect/floor_decal/corner/lime/full{dir = 1},/turf/simulated/floor/tiled,/area/hydroponics) "bEq" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/maintenance{name = "Hydroponics Maintenance"; req_access = list(35)},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/hydroponics) "bEr" = (/obj/machinery/navbeacon/delivery/south{location = "Hydroponics"},/obj/structure/plasticflaps{opacity = 1},/obj/machinery/door/firedoor/border_only,/obj/effect/floor_decal/industrial/loading,/turf/simulated/floor/tiled,/area/hydroponics) "bEs" = (/obj/structure/kitchenspike,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen) @@ -4309,14 +4309,14 @@ "bES" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/atmospherics/portables_connector,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled,/area/medical/sleeper) "bET" = (/obj/machinery/atmospherics/unary/freezer{dir = 2; icon_state = "freezer"},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/medical/sleeper) "bEU" = (/obj/machinery/atmospherics/unary/cryo_cell,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/medical/sleeper) -"bEV" = (/obj/structure/table/steel,/obj/item/weapon/storage/box/bodybags,/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/item/weapon/storage/box/bodybags,/turf/simulated/floor/tiled,/area/medical/morgue) -"bEW" = (/obj/structure/table/steel,/obj/item/weapon/paper_bin,/obj/item/weapon/pen/blue{pixel_x = 3; pixel_y = -5},/obj/item/weapon/pen/red{pixel_x = -1; pixel_y = -9},/obj/effect/floor_decal/corner/paleblue{dir = 5},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/medical/morgue) +"bEV" = (/obj/structure/table/steel,/obj/item/storage/box/bodybags,/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/item/storage/box/bodybags,/turf/simulated/floor/tiled,/area/medical/morgue) +"bEW" = (/obj/structure/table/steel,/obj/item/paper_bin,/obj/item/pen/blue{pixel_x = 3; pixel_y = -5},/obj/item/pen/red{pixel_x = -1; pixel_y = -9},/obj/effect/floor_decal/corner/paleblue{dir = 5},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/medical/morgue) "bEX" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/paleblue{dir = 1},/turf/simulated/floor/tiled,/area/medical/morgue) "bEY" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/medical/morgue) "bEZ" = (/obj/structure/morgue{icon_state = "morgue1"; dir = 8},/turf/simulated/floor/tiled,/area/medical/morgue) "bFa" = (/obj/structure/morgue,/turf/simulated/floor/tiled,/area/medical/morgue) "bFb" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/medical/morgue) -"bFc" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/structure/closet/l3closet/virology,/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/super; dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled/white,/area/medical/virology) +"bFc" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/structure/closet/l3closet/virology,/obj/machinery/power/apc{cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled/white,/area/medical/virology) "bFd" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/white,/area/medical/virology) "bFe" = (/obj/structure/table/steel,/obj/machinery/light_switch{pixel_x = 26; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/machinery/camera/network/medbay{c_tag = "MED - Virology Airlock"; dir = 8},/obj/random/medical,/turf/simulated/floor/tiled/white,/area/medical/virology) "bFf" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/airless,/area/solar/auxport) @@ -4335,21 +4335,21 @@ "bFs" = (/obj/machinery/disposal,/obj/effect/floor_decal/corner/purple{dir = 9},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "bFt" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "bFu" = (/obj/effect/floor_decal/corner/purple{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) -"bFv" = (/obj/structure/table/standard,/obj/item/device/taperecorder{pixel_x = -3},/obj/item/device/paicard{pixel_x = 4},/obj/item/weapon/circuitboard/teleporter,/obj/item/weapon/circuitboard/aicore{pixel_x = -2; pixel_y = 4},/obj/effect/floor_decal/corner/purple/full{dir = 1},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) -"bFw" = (/obj/effect/floor_decal/corner/pink{dir = 4},/obj/structure/closet/wardrobe/robotics_black,/obj/item/device/radio/headset/headset_sci{pixel_x = -3},/obj/item/device/radio/headset/headset_sci{pixel_x = -3},/turf/simulated/floor/tiled/white,/area/assembly/robotics) +"bFv" = (/obj/structure/table/standard,/obj/item/taperecorder{pixel_x = -3},/obj/item/paicard{pixel_x = 4},/obj/item/circuitboard/teleporter,/obj/item/circuitboard/aicore{pixel_x = -2; pixel_y = 4},/obj/effect/floor_decal/corner/purple/full{dir = 1},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) +"bFw" = (/obj/effect/floor_decal/corner/pink{dir = 4},/obj/structure/closet/wardrobe/robotics_black,/obj/item/radio/headset/headset_sci{pixel_x = -3},/obj/item/radio/headset/headset_sci{pixel_x = -3},/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bFx" = (/obj/effect/floor_decal/corner/pink{dir = 5},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bFy" = (/obj/effect/floor_decal/corner/pink{dir = 1},/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bFz" = (/obj/machinery/autolathe,/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bFA" = (/obj/machinery/computer/rdconsole/robotics,/obj/machinery/alarm{pixel_y = 25},/turf/simulated/floor/tiled/white,/area/assembly/robotics) -"bFB" = (/obj/item/weapon/book/manual/robotics_cyborgs{pixel_x = 2; pixel_y = 5},/obj/machinery/requests_console{department = "Robotics"; departmentType = 2; name = "Robotics RC"; pixel_y = 30},/obj/machinery/light{dir = 1},/obj/structure/table/standard{name = "plastic table frame"},/turf/simulated/floor/tiled/white,/area/assembly/robotics) +"bFB" = (/obj/item/book/manual/robotics_cyborgs{pixel_x = 2; pixel_y = 5},/obj/machinery/requests_console{department = "Robotics"; departmentType = 2; name = "Robotics RC"; pixel_y = 30},/obj/machinery/light{dir = 1},/obj/structure/table/standard{name = "plastic table frame"},/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bFC" = (/obj/machinery/r_n_d/circuit_imprinter,/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bFD" = (/turf/simulated/wall/r_wall,/area/assembly/robotics) -"bFE" = (/obj/structure/table/reinforced,/obj/machinery/door/window/southright{name = "Robotics Desk"; req_access = list(29)},/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/folder/white,/obj/item/weapon/pen,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/assembly/robotics) -"bFF" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) +"bFE" = (/obj/structure/table/reinforced,/obj/machinery/door/window/southright{name = "Robotics Desk"; req_access = list(29)},/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/folder/white,/obj/item/pen,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/assembly/robotics) +"bFF" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bFG" = (/obj/effect/floor_decal/industrial/loading{icon_state = "loadingarea"; dir = 8},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bFH" = (/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bFI" = (/obj/structure/table/reinforced,/obj/machinery/computer/skills,/obj/effect/floor_decal/corner/blue/full{dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) -"bFJ" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/effect/floor_decal/corner/blue{dir = 5},/obj/machinery/computer/guestpass{pixel_x = 0; pixel_y = 30},/obj/item/weapon/folder/blue_hop,/obj/item/weapon/pen,/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) +"bFJ" = (/obj/structure/table/reinforced,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/effect/floor_decal/corner/blue{dir = 5},/obj/machinery/computer/guestpass{pixel_x = 0; pixel_y = 30},/obj/item/folder/blue_hop,/obj/item/pen,/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) "bFK" = (/obj/structure/filingcabinet/chestdrawer,/obj/effect/floor_decal/corner/blue{dir = 5},/obj/machinery/newscaster/security_unit{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) "bFL" = (/obj/machinery/account_database,/obj/effect/floor_decal/corner/blue/full{dir = 1},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) "bFM" = (/obj/effect/floor_decal/industrial/loading,/obj/machinery/door/firedoor/border_only,/obj/structure/plasticflaps{opacity = 1},/obj/machinery/navbeacon/delivery/south{location = "Command"},/turf/simulated/floor/tiled,/area/bridge_hallway) @@ -4367,7 +4367,7 @@ "bFY" = (/obj/effect/floor_decal/corner/lime{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/turf/simulated/floor/tiled,/area/hydroponics) "bFZ" = (/obj/effect/floor_decal/corner/lime/full{dir = 1},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hydroponics) "bGa" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/window/reinforced,/obj/machinery/door/window/westright{name = "Hydroponics Delivery"; req_access = list(35)},/turf/simulated/floor/tiled,/area/hydroponics) -"bGb" = (/obj/structure/closet/chefcloset,/obj/item/glass_jar,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/device/retail_scanner/civilian,/obj/item/weapon/soap/nanotrasen,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) +"bGb" = (/obj/structure/closet/chefcloset,/obj/item/glass_jar,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/retail_scanner/civilian,/obj/item/soap/nanotrasen,/obj/item/destTagger{pixel_x = 4; pixel_y = 3},/obj/item/packageWrap,/obj/item/packageWrap,/obj/item/packageWrap,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bGc" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bGd" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/closet/secure_closet/freezer/meat,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bGe" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen) @@ -4403,11 +4403,11 @@ "bGI" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/medical/morgue) "bGJ" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/medical/morgue) "bGK" = (/obj/machinery/light/small{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/medbay_fore) -"bGL" = (/obj/structure/closet,/obj/item/device/flashlight,/obj/effect/decal/cleanable/cobweb2,/obj/item/weapon/storage/backpack/satchel/vir,/obj/item/weapon/storage/backpack/virology,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/maintenance/medbay_fore) +"bGL" = (/obj/structure/closet,/obj/item/flashlight,/obj/effect/decal/cleanable/cobweb2,/obj/item/storage/backpack/satchel/vir,/obj/item/storage/backpack/virology,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/maintenance/medbay_fore) "bGM" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/structure/closet/l3closet/virology,/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/medical/virology) "bGN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/virology) "bGO" = (/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/virology) -"bGP" = (/obj/structure/closet/crate,/obj/item/weapon/tank/emergency/oxygen/engi,/obj/item/weapon/tank/emergency/oxygen/double,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/research) +"bGP" = (/obj/structure/closet/crate,/obj/item/tank/emergency/oxygen/engi,/obj/item/tank/emergency/oxygen/double,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/research) "bGQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/machinery/meter,/turf/simulated/floor,/area/maintenance/research) "bGR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/research) "bGS" = (/obj/structure/table/standard,/turf/simulated/floor/reinforced,/area/rnd/misc_lab) @@ -4424,9 +4424,9 @@ "bHd" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bHe" = (/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bHf" = (/obj/structure/bed/chair/office/light{dir = 1},/obj/effect/landmark/start{name = "Roboticist"},/turf/simulated/floor/tiled/white,/area/assembly/robotics) -"bHg" = (/obj/effect/floor_decal/corner/pink{dir = 4},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/table/standard,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/item/weapon/hand_labeler,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/item/weapon/reagent_containers/glass/beaker/sulphuric,/turf/simulated/floor/tiled/white,/area/assembly/robotics) -"bHh" = (/obj/effect/floor_decal/corner/pink{dir = 5},/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/recharger{pixel_y = 0},/obj/item/device/flash,/obj/item/device/flash,/turf/simulated/floor/tiled/white,/area/assembly/robotics) -"bHi" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/pink{dir = 5},/obj/effect/landmark/start{name = "Roboticist"},/turf/simulated/floor/tiled/white,/area/assembly/robotics) +"bHg" = (/obj/effect/floor_decal/corner/pink{dir = 4},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/table/standard,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/item/hand_labeler,/obj/item/reagent_containers/glass/beaker/large,/obj/item/reagent_containers/glass/beaker/sulphuric,/turf/simulated/floor/tiled/white,/area/assembly/robotics) +"bHh" = (/obj/effect/floor_decal/corner/pink{dir = 5},/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/recharger{pixel_y = 0},/obj/item/flash,/obj/item/flash,/turf/simulated/floor/tiled/white,/area/assembly/robotics) +"bHi" = (/obj/item/stool/padded,/obj/effect/floor_decal/corner/pink{dir = 5},/obj/effect/landmark/start{name = "Roboticist"},/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bHj" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/closet{name = "materials"},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/glass{amount = 50; pixel_x = -2; pixel_y = 2},/obj/item/stack/material/glass{amount = 50; pixel_x = -2; pixel_y = 2},/obj/item/stack/material/glass{amount = 50; pixel_x = -2; pixel_y = 2},/obj/item/stack/material/glass{amount = 50; pixel_x = -2; pixel_y = 2},/obj/item/stack/material/plasteel{amount = 10},/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bHk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/turf/simulated/floor/plating,/area/assembly/robotics) "bHl" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/hallway/primary/central_four) @@ -4437,11 +4437,11 @@ "bHq" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) "bHr" = (/obj/effect/floor_decal/corner/blue{dir = 4},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) "bHs" = (/obj/effect/floor_decal/corner/blue{dir = 5},/obj/machinery/requests_console{announcementConsole = 1; department = "Bridge"; departmentType = 5; name = "Bridge RC"; pixel_y = 28},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) -"bHt" = (/obj/structure/table/reinforced,/obj/item/weapon/packageWrap,/obj/item/weapon/hand_labeler,/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = 30},/obj/effect/floor_decal/corner/blue{dir = 5},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) +"bHt" = (/obj/structure/table/reinforced,/obj/item/packageWrap,/obj/item/hand_labeler,/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = 30},/obj/effect/floor_decal/corner/blue{dir = 5},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) "bHu" = (/obj/structure/table/reinforced,/obj/machinery/photocopier/faxmachine{department = "Head of Personnel's Office"},/obj/effect/floor_decal/corner/blue/full{dir = 1},/obj/machinery/ai_status_display{pixel_x = 32; pixel_y = 0},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) "bHv" = (/obj/effect/floor_decal/corner/blue{dir = 9},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/window/southleft{base_state = "left"; dir = 2; icon_state = "left"; name = "Command Delivery"; req_access = list(19)},/turf/simulated/floor/tiled,/area/bridge_hallway) "bHw" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/tiled,/area/bridge_hallway) -"bHx" = (/obj/effect/floor_decal/corner/blue{dir = 6},/obj/structure/table/standard,/obj/item/weapon/storage/box/cups,/turf/simulated/floor/tiled,/area/bridge_hallway) +"bHx" = (/obj/effect/floor_decal/corner/blue{dir = 6},/obj/structure/table/standard,/obj/item/storage/box/cups,/turf/simulated/floor/tiled,/area/bridge_hallway) "bHy" = (/obj/machinery/cell_charger,/obj/structure/table/steel,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/substation/command) "bHz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor,/area/maintenance/substation/command) "bHA" = (/obj/machinery/power/breakerbox/activated{RCon_tag = "Command Substation Bypass"},/turf/simulated/floor,/area/maintenance/substation/command) @@ -4457,7 +4457,7 @@ "bHK" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/closet/secure_closet/freezer/kitchen,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bHL" = (/obj/structure/closet/crate/freezer,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen) "bHM" = (/obj/structure/closet/secure_closet/freezer/meat,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/light,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen) -"bHN" = (/obj/machinery/camera/network/civilian{c_tag = "CIV - Kitchen Cold Room"; dir = 1},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen) +"bHN" = (/obj/machinery/camera/network/civilian{c_tag = "CIV - Kitchen Cold Room"; dir = 1},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen) "bHO" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen) "bHP" = (/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen) "bHQ" = (/obj/machinery/gibber,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/kitchen) @@ -4475,7 +4475,7 @@ "bIc" = (/obj/effect/floor_decal/corner/paleblue{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bId" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bIe" = (/obj/structure/sign/goldenplaque{desc = "Done No Harm."; name = "Best Doctor 2552"; pixel_y = -32},/obj/effect/floor_decal/corner/paleblue,/turf/simulated/floor/tiled/white,/area/medical/sleeper) -"bIf" = (/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/machinery/camera/network/medbay{c_tag = "MED - Diagnostics Aft"; dir = 1},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/medical/sleeper) +"bIf" = (/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/machinery/camera/network/medbay{c_tag = "MED - Diagnostics Aft"; dir = 1},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bIg" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bIh" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bIi" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/medical/sleeper) @@ -4495,22 +4495,22 @@ "bIw" = (/obj/structure/morgue{icon_state = "morgue1"; dir = 8},/obj/effect/floor_decal/corner/paleblue/full{dir = 4},/turf/simulated/floor/tiled,/area/medical/morgue) "bIx" = (/obj/machinery/door/airlock/medical{autoclose = 0; frequency = 1379; icon_state = "door_locked"; id_tag = "virology_airlock_exterior"; locked = 1; name = "Virology Exterior Airlock"; req_access = list(39)},/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1379; master_tag = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -24; pixel_y = 0; req_access = list(39)},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/black,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/medical/virology) "bIy" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/turf/simulated/wall/r_wall,/area/medical/virology) -"bIz" = (/obj/structure/table/rack,/obj/item/weapon/extinguisher,/obj/item/weapon/storage/belt/utility,/obj/item/clothing/mask/gas,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/random/maintenance/research,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/research) -"bIA" = (/obj/structure/table/standard,/obj/structure/table/standard,/obj/item/stack/cable_coil,/obj/item/device/multitool,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/machinery/sparker{id = "Xenobio"; pixel_x = -25},/turf/simulated/floor/reinforced,/area/rnd/misc_lab) +"bIz" = (/obj/structure/table/rack,/obj/item/extinguisher,/obj/item/storage/belt/utility,/obj/item/clothing/mask/gas,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/random/maintenance/research,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/research) +"bIA" = (/obj/structure/table/standard,/obj/structure/table/standard,/obj/item/stack/cable_coil,/obj/item/multitool,/obj/machinery/cell_charger,/obj/item/cell/high{charge = 100; maxcharge = 15000},/obj/item/cell/high{charge = 100; maxcharge = 15000},/obj/machinery/sparker{id = "Xenobio"; pixel_x = -25},/turf/simulated/floor/reinforced,/area/rnd/misc_lab) "bIB" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 5},/turf/simulated/floor/reinforced,/area/rnd/misc_lab) "bIC" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "map_injector"; id = "n2_in"; use_power = 1},/turf/simulated/floor/reinforced,/area/rnd/misc_lab) "bID" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research) "bIE" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/rnd/research) "bIF" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/rnd/research) "bIG" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/polarized{dir = 8},/obj/structure/window/reinforced/polarized,/obj/structure/window/reinforced/polarized{dir = 4},/turf/simulated/floor/plating,/area/rnd/rdoffice) -"bIH" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/purple{dir = 9},/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/device/megaphone,/obj/item/weapon/paper/monitorkey,/obj/item/weapon/pen/multi,/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) -"bII" = (/obj/structure/table/standard,/obj/item/weapon/stamp/rd{pixel_x = 3; pixel_y = -2},/obj/item/weapon/reagent_containers/food/drinks/jar,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/item/weapon/folder/white_rd,/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) +"bIH" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/purple{dir = 9},/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/megaphone,/obj/item/paper/monitorkey,/obj/item/pen/multi,/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) +"bII" = (/obj/structure/table/standard,/obj/item/stamp/rd{pixel_x = 3; pixel_y = -2},/obj/item/reagent_containers/food/drinks/jar,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/item/folder/white_rd,/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "bIJ" = (/obj/structure/table/standard,/obj/machinery/computer/skills,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "bIK" = (/obj/effect/floor_decal/corner/purple{dir = 6},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/machinery/light_switch{pixel_x = 36; pixel_y = 0},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "bIL" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/table/standard,/obj/machinery/computer/med_data/laptop,/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bIM" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bIN" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/assembly/robotics) -"bIO" = (/obj/structure/closet{name = "robotics parts"},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5},/obj/item/weapon/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/weapon/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/weapon/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/device/healthanalyzer,/obj/item/device/healthanalyzer,/obj/item/device/healthanalyzer,/obj/effect/floor_decal/corner/pink{dir = 6},/obj/item/device/flash/synthetic,/obj/item/device/flash/synthetic,/obj/item/device/flash/synthetic,/obj/item/device/flash/synthetic,/obj/item/device/flash/synthetic,/obj/item/device/flash/synthetic,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/turf/simulated/floor/tiled/white,/area/assembly/robotics) +"bIO" = (/obj/structure/closet{name = "robotics parts"},/obj/item/cell/high{charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5},/obj/item/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/cell/high{charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5},/obj/item/cell/high{charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5},/obj/item/cell/high{charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5},/obj/item/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/healthanalyzer,/obj/item/healthanalyzer,/obj/item/healthanalyzer,/obj/effect/floor_decal/corner/pink{dir = 6},/obj/item/flash/synthetic,/obj/item/flash/synthetic,/obj/item/flash/synthetic,/obj/item/flash/synthetic,/obj/item/flash/synthetic,/obj/item/flash/synthetic,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bIP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/turf/simulated/floor/plating,/area/assembly/robotics) "bIQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/hallway/primary/central_four) "bIR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/hallway/primary/central_four) @@ -4528,7 +4528,7 @@ "bJd" = (/obj/machinery/power/smes/buildable{charge = 0; RCon_tag = "Substation - Command"},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor,/area/maintenance/substation/command) "bJe" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plating,/area/maintenance/central) "bJf" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/central) -"bJg" = (/obj/effect/floor_decal/corner/lime{dir = 9},/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/reagent_containers/glass/bucket,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/hydroponics) +"bJg" = (/obj/effect/floor_decal/corner/lime{dir = 9},/obj/structure/reagent_dispensers/watertank,/obj/item/reagent_containers/glass/bucket,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/hydroponics) "bJh" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hydroponics) "bJi" = (/obj/effect/floor_decal/corner/lime{dir = 6},/turf/simulated/floor/tiled,/area/hydroponics) "bJj" = (/obj/machinery/door/airlock/glass{name = "Hydroponics"; req_access = list(28)},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/white,/area/hydroponics) @@ -4542,8 +4542,8 @@ "bJr" = (/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/reception) "bJs" = (/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/machinery/camera/network/medbay{c_tag = "MED - Lobby Aft"; dir = 1},/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/medical/reception) "bJt" = (/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/machinery/newscaster{pixel_y = -30},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/reception) -"bJu" = (/obj/item/weapon/storage/box/cups{pixel_x = 0; pixel_y = 0},/obj/structure/table/standard,/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/medical/reception) -"bJv" = (/obj/structure/reagent_dispensers/water_cooler/full,/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/white,/area/medical/reception) +"bJu" = (/obj/item/storage/box/cups{pixel_x = 0; pixel_y = 0},/obj/structure/table/standard,/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/medical/reception) +"bJv" = (/obj/structure/reagent_dispensers/water_cooler/full,/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/white,/area/medical/reception) "bJw" = (/turf/simulated/wall,/area/medical/medbay_emt_bay) "bJx" = (/obj/machinery/door/airlock/multi_tile/glass{id_tag = "MedbayFoyerPort"; req_access = list(5)},/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/corner/pink{dir = 9},/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bJy" = (/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/corner/pink{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) @@ -4570,21 +4570,21 @@ "bJT" = (/turf/simulated/wall/r_wall,/area/quartermaster/miningdock) "bJU" = (/obj/structure/lattice,/obj/machinery/light{dir = 8},/turf/simulated/mineral/floor/ignore_mapgen,/area/quartermaster/miningdock) "bJV" = (/obj/structure/lattice,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/mineral/floor/ignore_mapgen,/area/quartermaster/miningdock) -"bJW" = (/obj/structure/table/rack,/obj/item/weapon/extinguisher,/obj/item/weapon/storage/belt/utility,/obj/item/clothing/mask/gas,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/mob/living/simple_mob/animal/passive/mouse,/turf/simulated/floor/plating,/area/maintenance/research) -"bJX" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/extinguisher,/obj/random/maintenance/research,/obj/random/maintenance/research,/turf/simulated/floor/plating,/area/maintenance/research) -"bJY" = (/obj/structure/table/standard,/obj/item/device/assembly/igniter,/turf/simulated/floor/reinforced,/area/rnd/misc_lab) +"bJW" = (/obj/structure/table/rack,/obj/item/extinguisher,/obj/item/storage/belt/utility,/obj/item/clothing/mask/gas,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/mob/living/simple_mob/animal/passive/mouse,/turf/simulated/floor/plating,/area/maintenance/research) +"bJX" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/tank/oxygen,/obj/item/tank/oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/flashlight,/obj/item/flashlight,/obj/item/storage/box/lights/mixed,/obj/item/extinguisher,/obj/random/maintenance/research,/obj/random/maintenance/research,/turf/simulated/floor/plating,/area/maintenance/research) +"bJY" = (/obj/structure/table/standard,/obj/item/assembly/igniter,/turf/simulated/floor/reinforced,/area/rnd/misc_lab) "bJZ" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/light,/turf/simulated/floor/reinforced,/area/rnd/misc_lab) "bKa" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/reinforced,/area/rnd/misc_lab) -"bKb" = (/obj/item/device/radio/intercom{layer = 4; name = "Station Intercom (General)"; pixel_y = -27},/obj/machinery/camera/network/research{c_tag = "Research - Miscellaneous Test Chamber"; dir = 1; network = list("Research","Miscellaneous Reseach")},/turf/simulated/floor/reinforced,/area/rnd/misc_lab) +"bKb" = (/obj/item/radio/intercom{layer = 4; name = "Station Intercom (General)"; pixel_y = -27},/obj/machinery/camera/network/research{c_tag = "Research - Miscellaneous Test Chamber"; dir = 1; network = list("Research","Miscellaneous Reseach")},/turf/simulated/floor/reinforced,/area/rnd/misc_lab) "bKc" = (/obj/machinery/light,/turf/simulated/floor/reinforced,/area/rnd/misc_lab) "bKd" = (/obj/effect/floor_decal/corner/purple{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research) "bKe" = (/obj/machinery/computer/security/telescreen{desc = "Used for watching the RD's goons from the safety of his office."; name = "Research Monitor"; network = list("Research","Toxins Test Area","Robots","Anomaly Isolation","Research Outpost"); pixel_x = -32; pixel_y = -4},/obj/structure/table/standard,/obj/machinery/photocopier/faxmachine{department = "Research Director's Office"},/obj/effect/floor_decal/corner/purple{dir = 9},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "bKf" = (/obj/structure/bed/chair/office/light{dir = 1},/obj/effect/landmark/start{name = "Research Director"},/obj/machinery/button/remote/blast_door{id = "Biohazard"; name = "Biohazard Shutter Control"; pixel_x = -38; pixel_y = 13; req_access = list(47)},/obj/machinery/button/remote/airlock{desc = "A remote control-switch for the cargo doors."; id = "researchdoor"; name = "Research door control"; pixel_x = -27; pixel_y = 13; req_access = list(30)},/obj/machinery/button/windowtint{pixel_x = -26; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "bKg" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "bKh" = (/obj/effect/floor_decal/corner/purple{dir = 6},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) -"bKi" = (/obj/structure/table/standard,/obj/item/weapon/cartridge/signal/science,/obj/item/weapon/cartridge/signal/science{pixel_x = -4; pixel_y = 2},/obj/item/weapon/cartridge/signal/science{pixel_x = 4; pixel_y = 6},/obj/item/clothing/glasses/welding/superior,/obj/machinery/requests_console{announcementConsole = 1; department = "Research Director's Desk"; departmentType = 5; name = "Research Director RC"; pixel_x = 30; pixel_y = -2},/turf/simulated/floor/tiled/dark,/area/rnd/rdoffice) -"bKj" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/table/standard,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/item/weapon/pen/red,/obj/item/weapon/pen/blue,/turf/simulated/floor/tiled/white,/area/assembly/robotics) -"bKk" = (/obj/structure/disposalpipe/segment,/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/white,/area/assembly/robotics) +"bKi" = (/obj/structure/table/standard,/obj/item/cartridge/signal/science,/obj/item/cartridge/signal/science{pixel_x = -4; pixel_y = 2},/obj/item/cartridge/signal/science{pixel_x = 4; pixel_y = 6},/obj/item/clothing/glasses/welding/superior,/obj/machinery/requests_console{announcementConsole = 1; department = "Research Director's Desk"; departmentType = 5; name = "Research Director RC"; pixel_x = 30; pixel_y = -2},/turf/simulated/floor/tiled/dark,/area/rnd/rdoffice) +"bKj" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/table/standard,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/pen,/obj/item/pen/red,/obj/item/pen/blue,/turf/simulated/floor/tiled/white,/area/assembly/robotics) +"bKk" = (/obj/structure/disposalpipe/segment,/obj/item/stool/padded,/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bKl" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bKm" = (/obj/effect/floor_decal/corner/pink{dir = 6},/obj/structure/closet{name = "welding equipment"},/obj/item/clothing/head/welding{pixel_x = -3; pixel_y = 5},/obj/item/clothing/head/welding{pixel_x = -3; pixel_y = 5},/obj/item/clothing/glasses/welding,/obj/item/clothing/glasses/welding,/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bKn" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) @@ -4603,18 +4603,18 @@ "bKA" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/maintenance/substation/command) "bKB" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/power/sensor{name = "Powernet Sensor - Command Subgrid"; name_tag = "Command Subgrid"},/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/obj/machinery/light/small,/turf/simulated/floor,/area/maintenance/substation/command) "bKC" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor,/area/maintenance/substation/command) -"bKD" = (/obj/effect/floor_decal/corner/lime{dir = 9},/obj/item/weapon/stool/padded,/obj/effect/landmark/start{name = "Gardener"},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hydroponics) +"bKD" = (/obj/effect/floor_decal/corner/lime{dir = 9},/obj/item/stool/padded,/obj/effect/landmark/start{name = "Gardener"},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hydroponics) "bKE" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/hydroponics) "bKF" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled,/area/hydroponics) "bKG" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/hydroponics) "bKH" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hydroponics) "bKI" = (/obj/effect/floor_decal/corner/lime{dir = 6},/obj/machinery/biogenerator,/turf/simulated/floor/tiled,/area/hydroponics) "bKJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hydroponics) -"bKK" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/table/marble,/obj/item/weapon/book/manual/chef_recipes,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{pixel_x = -3; pixel_y = 0},/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{pixel_x = 3},/obj/machinery/camera/network/civilian{c_tag = "CIV - Kitchen Port"; dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) +"bKK" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/table/marble,/obj/item/book/manual/chef_recipes,/obj/item/reagent_containers/food/condiment/small/saltshaker{pixel_x = -3; pixel_y = 0},/obj/item/reagent_containers/food/condiment/small/peppermill{pixel_x = 3},/obj/machinery/camera/network/civilian{c_tag = "CIV - Kitchen Port"; dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bKL" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = 28},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bKM" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/appliance/cooker/fryer,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bKN" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/appliance/cooker/grill,/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) -"bKO" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) +"bKO" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bKP" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bKQ" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/sink/kitchen{pixel_y = 28},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bKR" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/appliance/cooker/oven,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) @@ -4635,7 +4635,7 @@ "bLg" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/wood,/area/medical/psych) "bLh" = (/obj/structure/bookcase,/turf/simulated/floor/wood,/area/medical/psych) "bLi" = (/obj/effect/floor_decal/corner/pink/full{dir = 8},/obj/machinery/iv_drip,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_x = -25; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/patient_a) -"bLj" = (/obj/effect/floor_decal/corner/pink{dir = 5},/obj/structure/bed/padded,/obj/item/weapon/bedsheet/medical,/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled/white,/area/medical/patient_a) +"bLj" = (/obj/effect/floor_decal/corner/pink{dir = 5},/obj/structure/bed/padded,/obj/item/bedsheet/medical,/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled/white,/area/medical/patient_a) "bLk" = (/obj/effect/floor_decal/corner/pink{dir = 5},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = 0; pixel_y = 36},/obj/machinery/button/windowtint{id = "pr1_window_tint"; pixel_y = 26},/turf/simulated/floor/tiled/white,/area/medical/patient_a) "bLl" = (/obj/structure/window/reinforced/polarized{dir = 1; id = "pr1_window_tint"},/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/polarized{dir = 2; id = "pr1_window_tint"},/obj/structure/window/reinforced/polarized{dir = 4; id = "pr1_window_tint"},/obj/structure/window/reinforced/polarized{dir = 8; id = "pr1_window_tint"},/turf/simulated/floor,/area/medical/patient_a) "bLm" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/patient_wing) @@ -4643,7 +4643,7 @@ "bLo" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/medical/patient_wing) "bLp" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/white,/area/medical/patient_wing) "bLq" = (/obj/structure/bed/chair/comfy/teal{dir = 4},/obj/effect/floor_decal/corner/paleblue{dir = 4},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) -"bLr" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/effect/floor_decal/corner/paleblue{dir = 5},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 1; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) +"bLr" = (/obj/structure/table/glass,/obj/item/reagent_containers/spray/cleaner,/obj/effect/floor_decal/corner/paleblue{dir = 5},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 1; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) "bLs" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/structure/bed/chair/comfy/teal{dir = 8},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) "bLt" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) "bLu" = (/obj/effect/floor_decal/corner/paleblue{dir = 5},/obj/machinery/alarm{pixel_y = 22},/obj/structure/table/glass,/obj/item/roller,/obj/item/roller{pixel_y = 8},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) @@ -4658,7 +4658,7 @@ "bLD" = (/obj/effect/floor_decal/corner/lime{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/medical/virologyaccess) "bLE" = (/obj/structure/sign/biohazard,/turf/simulated/wall/r_wall,/area/medical/virologyaccess) "bLF" = (/obj/effect/floor_decal/corner/paleblue{dir = 9},/turf/simulated/floor/tiled,/area/medical/virologyaccess) -"bLG" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/medical/virologyaccess) +"bLG" = (/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/medical/virologyaccess) "bLH" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/medical/virologyaccess) "bLI" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled,/area/medical/virologyaccess) "bLJ" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/floor/tiled,/area/medical/virologyaccess) @@ -4669,7 +4669,7 @@ "bLO" = (/turf/simulated/shuttle/wall{hard_corner = 1},/area/shuttle/mining/station) "bLP" = (/turf/simulated/shuttle/wall,/area/shuttle/mining/station) "bLQ" = (/obj/structure/shuttle/window,/obj/structure/grille,/turf/simulated/shuttle/plating,/area/shuttle/mining/station) -"bLR" = (/obj/structure/closet/crate,/obj/item/device/multitool,/obj/item/device/multitool,/obj/item/device/assembly/prox_sensor,/obj/item/device/flashlight,/obj/item/weapon/storage/backpack,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/research) +"bLR" = (/obj/structure/closet/crate,/obj/item/multitool,/obj/item/multitool,/obj/item/assembly/prox_sensor,/obj/item/flashlight,/obj/item/storage/backpack,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/research) "bLS" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/maintenance/research) "bLT" = (/obj/effect/floor_decal/corner/purple/full{dir = 8},/obj/machinery/vending/cigarette,/turf/simulated/floor/tiled/white,/area/rnd/research) "bLU" = (/obj/effect/floor_decal/corner/purple{dir = 1},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research) @@ -4677,34 +4677,34 @@ "bLW" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "bLX" = (/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "bLY" = (/turf/simulated/floor/tiled/dark,/area/rnd/rdoffice) -"bLZ" = (/obj/structure/reagent_dispensers/acid{density = 0; pixel_x = -32},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/camera/network/research{c_tag = "SCI - Robotics Port"; dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/table/standard,/obj/item/device/mmi,/obj/item/device/mmi,/obj/item/device/mmi,/obj/item/weapon/storage/box/bodybags{pixel_x = -1; pixel_y = -2},/turf/simulated/floor/tiled,/area/assembly/robotics) +"bLZ" = (/obj/structure/reagent_dispensers/acid{density = 0; pixel_x = -32},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/camera/network/research{c_tag = "SCI - Robotics Port"; dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/table/standard,/obj/item/mmi,/obj/item/mmi,/obj/item/mmi,/obj/item/storage/box/bodybags{pixel_x = -1; pixel_y = -2},/turf/simulated/floor/tiled,/area/assembly/robotics) "bMa" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/assembly/robotics) "bMb" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/assembly/robotics) "bMc" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/mecha_part_fabricator,/turf/simulated/floor/tiled,/area/assembly/robotics) "bMd" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/mecha_part_fabricator/pros,/turf/simulated/floor/tiled,/area/assembly/robotics) -"bMe" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/table/standard,/obj/item/device/robotanalyzer,/obj/item/device/robotanalyzer,/obj/item/device/mmi/digital/robot,/turf/simulated/floor/tiled,/area/assembly/robotics) +"bMe" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/table/standard,/obj/item/robotanalyzer,/obj/item/robotanalyzer,/obj/item/mmi/digital/robot,/turf/simulated/floor/tiled,/area/assembly/robotics) "bMf" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/assembly/robotics) "bMg" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/assembly/robotics) -"bMh" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/toolbox/mechanical,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/effect/floor_decal/corner/pink{dir = 6},/obj/item/weapon/storage/toolbox/mechanical,/obj/item/device/multitool{pixel_x = 3},/obj/item/device/multitool{pixel_x = 3},/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = 6},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = 6},/turf/simulated/floor/tiled,/area/assembly/robotics) +"bMh" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/storage/toolbox/mechanical,/obj/item/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/effect/floor_decal/corner/pink{dir = 6},/obj/item/storage/toolbox/mechanical,/obj/item/multitool{pixel_x = 3},/obj/item/multitool{pixel_x = 3},/obj/item/tool/crowbar,/obj/item/tool/crowbar,/obj/item/storage/belt/utility,/obj/item/storage/belt/utility,/obj/item/storage/toolbox/electrical{pixel_x = 1; pixel_y = 6},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/item/storage/toolbox/electrical{pixel_x = 1; pixel_y = 6},/turf/simulated/floor/tiled,/area/assembly/robotics) "bMi" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/turf/simulated/floor/plating,/area/assembly/robotics) "bMj" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bMk" = (/obj/structure/closet/secure_closet/hop2,/obj/effect/floor_decal/corner/blue{dir = 9},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) -"bMl" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/folder/blue,/obj/item/weapon/folder/red,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/item/weapon/pen/multi,/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) -"bMm" = (/obj/structure/table/reinforced,/obj/item/weapon/clipboard,/obj/item/weapon/stamp/hop,/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) -"bMn" = (/obj/structure/table/reinforced,/obj/item/device/megaphone,/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) +"bMl" = (/obj/structure/table/reinforced,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/folder/blue,/obj/item/folder/red,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/item/pen/multi,/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) +"bMm" = (/obj/structure/table/reinforced,/obj/item/clipboard,/obj/item/stamp/hop,/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) +"bMn" = (/obj/structure/table/reinforced,/obj/item/megaphone,/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) "bMo" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) "bMp" = (/obj/effect/floor_decal/corner/blue,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) "bMq" = (/obj/effect/floor_decal/corner/blue{dir = 8},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/bridge_hallway) "bMr" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/bridge_hallway) "bMs" = (/obj/effect/floor_decal/corner/blue,/obj/structure/reagent_dispensers/water_cooler/full,/turf/simulated/floor/tiled,/area/bridge_hallway) "bMt" = (/turf/simulated/wall/r_wall,/area/crew_quarters/captain) -"bMu" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/effect/floor_decal/corner/lime/full,/obj/item/weapon/material/knife/machete/hatchet,/obj/item/weapon/material/minihoe,/obj/item/weapon/material/minihoe,/obj/item/weapon/material/knife/machete/hatchet,/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/tiled,/area/hydroponics) -"bMv" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/effect/floor_decal/corner/lime{dir = 10},/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/reagent_containers/glass/bucket,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -26},/turf/simulated/floor/tiled,/area/hydroponics) +"bMu" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/effect/floor_decal/corner/lime/full,/obj/item/material/knife/machete/hatchet,/obj/item/material/minihoe,/obj/item/material/minihoe,/obj/item/material/knife/machete/hatchet,/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/tiled,/area/hydroponics) +"bMv" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/effect/floor_decal/corner/lime{dir = 10},/obj/item/reagent_containers/glass/bucket,/obj/item/reagent_containers/glass/bucket,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -26},/turf/simulated/floor/tiled,/area/hydroponics) "bMw" = (/obj/machinery/smartfridge/drying_rack,/obj/effect/floor_decal/corner/lime{dir = 10},/turf/simulated/floor/tiled,/area/hydroponics) "bMx" = (/obj/machinery/honey_extractor,/obj/effect/floor_decal/corner/lime{dir = 10},/obj/machinery/camera/network/civilian{c_tag = "CIV - Hydroponics"; dir = 1},/turf/simulated/floor/tiled,/area/hydroponics) "bMy" = (/obj/machinery/seed_storage/garden,/obj/effect/floor_decal/corner/lime{dir = 10},/turf/simulated/floor/tiled,/area/hydroponics) "bMz" = (/obj/machinery/vending/hydronutrients,/obj/effect/floor_decal/corner/lime{dir = 10},/turf/simulated/floor/tiled,/area/hydroponics) -"bMA" = (/obj/effect/floor_decal/corner/lime{dir = 8},/obj/item/weapon/stool/padded,/obj/effect/landmark/start{name = "Gardener"},/turf/simulated/floor/tiled,/area/hydroponics) +"bMA" = (/obj/effect/floor_decal/corner/lime{dir = 8},/obj/item/stool/padded,/obj/effect/landmark/start{name = "Gardener"},/turf/simulated/floor/tiled,/area/hydroponics) "bMB" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hydroponics) "bMC" = (/obj/effect/floor_decal/corner/lime{dir = 6},/obj/machinery/seed_extractor,/turf/simulated/floor/tiled,/area/hydroponics) "bMD" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hydroponics) @@ -4718,15 +4718,15 @@ "bML" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bMM" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/appliance/mixer/candy,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bMN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/kitchen) -"bMO" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) +"bMO" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "bMP" = (/obj/structure/extinguisher_cabinet{pixel_x = 25},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "bMQ" = (/obj/structure/table/reinforced,/obj/machinery/reagentgrinder,/obj/structure/extinguisher_cabinet{pixel_x = -27},/obj/effect/floor_decal/corner/beige/full{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bMR" = (/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bMS" = (/obj/effect/floor_decal/corner/beige{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bMT" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/corner/beige{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bMU" = (/obj/effect/floor_decal/corner/beige{dir = 5},/obj/structure/sink{dir = 2; icon_state = "sink"; pixel_x = 0; pixel_y = 26},/turf/simulated/floor/tiled/white,/area/medical/chemistry) -"bMV" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/tool/screwdriver,/obj/effect/floor_decal/corner/beige{dir = 5},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 1; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/medical/chemistry) -"bMW" = (/obj/machinery/button/remote/blast_door{id = "chemwindow"; name = "Pharmacy Windows Shutter Control"; pixel_x = 0; pixel_y = 24; pixel_z = 0},/obj/machinery/light_switch{pixel_x = 12; pixel_y = 25},/obj/effect/floor_decal/corner/beige{dir = 5},/obj/structure/table/reinforced,/obj/item/weapon/packageWrap,/obj/item/weapon/hand_labeler,/obj/item/weapon/reagent_containers/spray/cleaner{desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner"},/turf/simulated/floor/tiled/white,/area/medical/chemistry) +"bMV" = (/obj/structure/table/reinforced,/obj/item/storage/box/syringes,/obj/item/tool/screwdriver,/obj/effect/floor_decal/corner/beige{dir = 5},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 1; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/medical/chemistry) +"bMW" = (/obj/machinery/button/remote/blast_door{id = "chemwindow"; name = "Pharmacy Windows Shutter Control"; pixel_x = 0; pixel_y = 24; pixel_z = 0},/obj/machinery/light_switch{pixel_x = 12; pixel_y = 25},/obj/effect/floor_decal/corner/beige{dir = 5},/obj/structure/table/reinforced,/obj/item/packageWrap,/obj/item/hand_labeler,/obj/item/reagent_containers/spray/cleaner{desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner"},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bMX" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/medical/chemistry) "bMY" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/structure/closet/secure_closet/paramedic,/obj/random/medical,/obj/random/medical,/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bMZ" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled/steel,/area/medical/medbay_emt_bay) @@ -4795,28 +4795,28 @@ "bOk" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/assembly/robotics) "bOl" = (/obj/structure/reagent_dispensers/fueltank,/obj/effect/floor_decal/corner/pink{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/assembly/robotics) "bOm" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/hallway/primary/central_four) -"bOn" = (/obj/effect/floor_decal/corner/blue{dir = 1},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) +"bOn" = (/obj/effect/floor_decal/corner/blue{dir = 1},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) "bOo" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) "bOp" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) "bOq" = (/obj/effect/floor_decal/corner/blue{dir = 6},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) "bOr" = (/obj/effect/floor_decal/corner/blue{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/bridge_hallway) "bOs" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/bridge_hallway) "bOt" = (/obj/effect/floor_decal/corner/blue{dir = 6},/obj/machinery/vending/cola,/turf/simulated/floor/tiled,/area/bridge_hallway) -"bOu" = (/obj/structure/table/woodentable,/obj/item/device/camera,/obj/item/weapon/storage/photo_album{pixel_y = -10},/turf/simulated/floor/carpet,/area/crew_quarters/captain) -"bOv" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/obj/machinery/alarm{pixel_y = 23},/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/carpet,/area/crew_quarters/captain) -"bOw" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/captain,/obj/machinery/light{dir = 1},/turf/simulated/floor/carpet,/area/crew_quarters/captain) -"bOx" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/structure/closet/wardrobe/captain,/turf/simulated/floor/carpet,/area/crew_quarters/captain) -"bOy" = (/obj/item/weapon/soap/deluxe,/obj/item/weapon/bikehorn/rubberducky,/obj/machinery/shower{pixel_y = 2},/obj/machinery/door/window/southright{name = "Shower"},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/captain) +"bOu" = (/obj/structure/table/woodentable,/obj/item/camera,/obj/item/storage/photo_album{pixel_y = -10},/turf/simulated/floor/carpet,/area/crew_quarters/captain) +"bOv" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green,/obj/machinery/alarm{pixel_y = 23},/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/carpet,/area/crew_quarters/captain) +"bOw" = (/obj/structure/bed/padded,/obj/item/bedsheet/captain,/obj/machinery/light{dir = 1},/turf/simulated/floor/carpet,/area/crew_quarters/captain) +"bOx" = (/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/structure/closet/wardrobe/captain,/turf/simulated/floor/carpet,/area/crew_quarters/captain) +"bOy" = (/obj/item/soap/deluxe,/obj/item/bikehorn/rubberducky,/obj/machinery/shower{pixel_y = 2},/obj/machinery/door/window/southright{name = "Shower"},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/captain) "bOz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hydroponics) "bOA" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{name = "Hydroponics"; req_access = newlist(); req_one_access = list(35,28)},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hydroponics) "bOB" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hydroponics) "bOC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hydroponics) "bOD" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bOE" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/icecream_vat,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) -"bOF" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/reagent_containers/food/snacks/mint,/obj/item/weapon/reagent_containers/food/condiment/enzyme{layer = 5},/obj/item/weapon/packageWrap,/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) +"bOF" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/reagent_containers/food/snacks/mint,/obj/item/reagent_containers/food/condiment/enzyme{layer = 5},/obj/item/packageWrap,/obj/item/reagent_containers/dropper,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bOG" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_soft/full,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) -"bOH" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) -"bOI" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/material/knife/butch,/obj/item/weapon/material/kitchen/rollingpin,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) +"bOH" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/reagent_containers/glass/beaker{pixel_x = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) +"bOI" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/material/knife/butch,/obj/item/material/kitchen/rollingpin,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bOJ" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/appliance/mixer/cereal,/obj/machinery/camera/network/civilian{c_tag = "CIV - Kitchen Starboard"; dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bOK" = (/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/structure/table/reinforced,/obj/machinery/button/remote/blast_door{id = "chemcounter"; name = "Pharmacy Counter Lockdown Control"; pixel_y = 14},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/effect/floor_decal/corner/beige{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bOL" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/chemistry) @@ -4834,10 +4834,10 @@ "bOX" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/structure/fireaxecabinet{pixel_x = 32; pixel_y = 0},/turf/simulated/floor/tiled/steel,/area/medical/medbay_emt_bay) "bOY" = (/obj/structure/bed/psych,/turf/simulated/floor/carpet/blue,/area/medical/psych) "bOZ" = (/turf/simulated/floor/carpet/blue,/area/medical/psych) -"bPa" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/carpet/blue,/area/medical/psych) -"bPb" = (/obj/structure/table/woodentable,/obj/machinery/computer/med_data/laptop,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/carpet/blue,/area/medical/psych) -"bPc" = (/obj/effect/floor_decal/corner/pink/full,/obj/machinery/computer/med_data/laptop,/obj/structure/table/glass,/obj/machinery/light,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/medical/patient_a) -"bPd" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/structure/table/glass,/obj/item/weapon/paper_bin,/obj/item/weapon/clipboard,/obj/item/weapon/pen,/turf/simulated/floor/tiled/white,/area/medical/patient_a) +"bPa" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green,/turf/simulated/floor/carpet/blue,/area/medical/psych) +"bPb" = (/obj/structure/table/woodentable,/obj/machinery/computer/med_data/laptop,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/carpet/blue,/area/medical/psych) +"bPc" = (/obj/effect/floor_decal/corner/pink/full,/obj/machinery/computer/med_data/laptop,/obj/structure/table/glass,/obj/machinery/light,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/medical/patient_a) +"bPd" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/structure/table/glass,/obj/item/paper_bin,/obj/item/clipboard,/obj/item/pen,/turf/simulated/floor/tiled/white,/area/medical/patient_a) "bPe" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor/tiled/white,/area/medical/patient_a) "bPf" = (/obj/effect/floor_decal/corner/pink{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) "bPg" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/corner/pink,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) @@ -4855,7 +4855,7 @@ "bPs" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/medical/virologyaccess) "bPt" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = -32},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/camera/network/medbay{c_tag = "MED - Virology Access"; dir = 1},/turf/simulated/floor/tiled,/area/medical/virologyaccess) "bPu" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/lime{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/medical/virologyaccess) -"bPv" = (/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled,/area/medical/virologyaccess) +"bPv" = (/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled,/area/medical/virologyaccess) "bPw" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green,/turf/simulated/floor/tiled,/area/medical/virologyaccess) "bPx" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/camera/network/medbay{c_tag = "MED - Virology Access Hallway"; dir = 1},/obj/machinery/alarm{dir = 1; pixel_y = -25},/turf/simulated/floor/tiled,/area/medical/virologyaccess) "bPy" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/medical/virologyaccess) @@ -4887,9 +4887,9 @@ "bPY" = (/obj/machinery/computer/robotics,/obj/effect/floor_decal/corner/purple{dir = 10},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "bPZ" = (/obj/machinery/computer/mecha,/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/ai_status_display{pixel_y = -32},/obj/machinery/camera/network/research{c_tag = "SCI - RD's Office"; dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "bQa" = (/obj/effect/floor_decal/corner/purple/full{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -22},/mob/living/simple_mob/slime/xenobio/rainbow/kendrick,/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) -"bQb" = (/obj/structure/table/rack,/obj/item/weapon/rig/hazmat/equipped,/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled/dark,/area/rnd/rdoffice) +"bQb" = (/obj/structure/table/rack,/obj/item/rig/hazmat/equipped,/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled/dark,/area/rnd/rdoffice) "bQc" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/tiled,/area/assembly/robotics) -"bQd" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/effect/floor_decal/corner/pink{dir = 4},/turf/simulated/floor/tiled,/area/assembly/robotics) +"bQd" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/effect/floor_decal/corner/pink{dir = 4},/turf/simulated/floor/tiled,/area/assembly/robotics) "bQe" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bQf" = (/obj/effect/floor_decal/industrial/loading{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bQg" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) @@ -4903,7 +4903,7 @@ "bQo" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/effect/floor_decal/corner/blue{dir = 6},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) "bQp" = (/obj/effect/floor_decal/corner/blue{dir = 9},/obj/structure/extinguisher_cabinet{pixel_x = -27},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/camera/network/command{c_tag = "COM - Bridge Hallway"; dir = 4},/turf/simulated/floor/tiled,/area/bridge_hallway) "bQq" = (/obj/effect/floor_decal/corner/blue{dir = 6},/obj/machinery/vending/snack,/turf/simulated/floor/tiled,/area/bridge_hallway) -"bQr" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/box/matches,/obj/item/clothing/mask/smokable/cigarette/cigar,/obj/item/weapon/reagent_containers/food/drinks/flask{pixel_x = 8},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/carpet,/area/crew_quarters/captain) +"bQr" = (/obj/structure/table/woodentable,/obj/item/storage/box/matches,/obj/item/clothing/mask/smokable/cigarette/cigar,/obj/item/reagent_containers/food/drinks/flask{pixel_x = 8},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/carpet,/area/crew_quarters/captain) "bQs" = (/obj/structure/bed/chair/comfy/brown{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/carpet,/area/crew_quarters/captain) "bQt" = (/turf/simulated/floor/carpet,/area/crew_quarters/captain) "bQu" = (/obj/machinery/door/airlock{name = "Private Restroom"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/captain) @@ -4911,9 +4911,9 @@ "bQw" = (/obj/structure/toilet{dir = 8},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/captain) "bQx" = (/obj/machinery/navbeacon/delivery/east{location = "Bar"},/obj/structure/plasticflaps{opacity = 1},/obj/machinery/door/firedoor/border_only,/obj/effect/floor_decal/industrial/loading{icon_state = "loadingarea"; dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/bar) "bQy" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/window/southleft,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/bar) -"bQz" = (/obj/structure/closet/secure_closet/bar{req_access = list(25)},/obj/item/weapon/storage/secure/safe{pixel_z = 30},/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/wood,/area/crew_quarters/bar) +"bQz" = (/obj/structure/closet/secure_closet/bar{req_access = list(25)},/obj/item/storage/secure/safe{pixel_z = 30},/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/wood,/area/crew_quarters/bar) "bQA" = (/obj/structure/reagent_dispensers/beerkeg,/obj/machinery/camera/network/civilian{c_tag = "CIV - Bar Storage"; dir = 2},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"bQB" = (/obj/structure/closet/gmcloset{name = "formal wardrobe"},/obj/item/glass_jar,/obj/item/device/retail_scanner/civilian,/obj/item/device/retail_scanner/civilian,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/wood,/area/crew_quarters/bar) +"bQB" = (/obj/structure/closet/gmcloset{name = "formal wardrobe"},/obj/item/glass_jar,/obj/item/retail_scanner/civilian,/obj/item/retail_scanner/civilian,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bQC" = (/turf/simulated/wall,/area/crew_quarters/bar) "bQD" = (/obj/machinery/computer/arcade,/turf/simulated/floor/wood,/area/crew_quarters/bar) "bQE" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood,/area/crew_quarters/bar) @@ -4933,15 +4933,15 @@ "bQS" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bQT" = (/obj/machinery/chem_master,/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bQU" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/chemistry) -"bQV" = (/obj/structure/closet/secure_closet/chemical,/obj/item/device/radio/headset/headset_med,/obj/effect/floor_decal/corner/beige,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/medical/chemistry) +"bQV" = (/obj/structure/closet/secure_closet/chemical,/obj/item/radio/headset/headset_med,/obj/effect/floor_decal/corner/beige,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bQW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/medical/chemistry) -"bQX" = (/obj/item/weapon/stool/padded,/obj/effect/landmark/start{name = "Paramedic"},/obj/effect/floor_decal/corner/pink{dir = 5},/obj/machinery/camera/network/medbay{c_tag = "MED - EMT Bay"; dir = 4},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) +"bQX" = (/obj/item/stool/padded,/obj/effect/landmark/start{name = "Paramedic"},/obj/effect/floor_decal/corner/pink{dir = 5},/obj/machinery/camera/network/medbay{c_tag = "MED - EMT Bay"; dir = 4},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bQY" = (/obj/effect/floor_decal/corner/pink{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bQZ" = (/obj/machinery/hologram/holopad,/obj/effect/floor_decal/corner/pink{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bRa" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bRb" = (/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) -"bRc" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/table/rack,/obj/machinery/door/window/westright{name = "EVA Suit Storage"; req_access = list(5)},/obj/item/device/suit_cooling_unit,/turf/simulated/floor/tiled/dark,/area/medical/medbay_emt_bay) -"bRd" = (/obj/structure/bed/chair/comfy/brown{dir = 1},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 8; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = -21; pixel_y = 0},/turf/simulated/floor/carpet/blue,/area/medical/psych) +"bRc" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/table/rack,/obj/machinery/door/window/westright{name = "EVA Suit Storage"; req_access = list(5)},/obj/item/suit_cooling_unit,/turf/simulated/floor/tiled/dark,/area/medical/medbay_emt_bay) +"bRd" = (/obj/structure/bed/chair/comfy/brown{dir = 1},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 8; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = -21; pixel_y = 0},/turf/simulated/floor/carpet/blue,/area/medical/psych) "bRe" = (/obj/structure/table/woodentable,/turf/simulated/floor/carpet/blue,/area/medical/psych) "bRf" = (/obj/structure/bed/chair/office/dark{dir = 1},/obj/machinery/light_switch{pixel_x = -25; pixel_y = 8},/obj/machinery/button/windowtint{id = "psyco_tint"; pixel_x = -25},/obj/machinery/button/remote/airlock{desc = "A remote control-switch for the office door."; id = "mentaldoor"; name = "office door control"; pixel_x = -34; pixel_y = 7},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/effect/landmark/start{name = "Psychiatrist"},/turf/simulated/floor/carpet/blue,/area/medical/psych) "bRg" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/effect/floor_decal/corner/pink{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) @@ -4960,7 +4960,7 @@ "bRt" = (/obj/structure/ore_box,/obj/machinery/light{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/shuttle/mining/station) "bRu" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "mining_shuttle"; pixel_x = 25; pixel_y = -8; req_one_access = list(13,48); tag_door = "mining_shuttle_hatch"},/turf/simulated/shuttle/floor,/area/shuttle/mining/station) "bRv" = (/obj/structure/table/rack,/obj/item/clothing/mask/gas,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/research) -"bRw" = (/obj/effect/decal/cleanable/generic,/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/floor/plating,/area/maintenance/research) +"bRw" = (/obj/effect/decal/cleanable/generic,/obj/item/material/shard{icon_state = "medium"},/turf/simulated/floor/plating,/area/maintenance/research) "bRx" = (/turf/simulated/wall/r_wall,/area/rnd/xenobiology/xenoflora_storage) "bRy" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/turf/simulated/floor/plating,/area/rnd/xenobiology/xenoflora_storage) "bRz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/turf/simulated/floor/plating,/area/rnd/xenobiology/xenoflora_storage) @@ -4973,13 +4973,13 @@ "bRG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plating,/area/rnd/xenobiology/xenoflora) "bRH" = (/obj/effect/floor_decal/corner/white{dir = 5},/obj/machinery/door/airlock/glass_research{name = "Xenoflora Research"; req_access = list(55)},/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/hydro,/area/rnd/xenobiology/xenoflora) "bRI" = (/obj/structure/sign/biohazard,/turf/simulated/wall/r_wall,/area/rnd/xenobiology/xenoflora) -"bRJ" = (/obj/structure/table/standard,/obj/item/weapon/surgical/circular_saw,/obj/item/weapon/surgical/scalpel{pixel_y = 12},/obj/item/weapon/surgical/hemostat,/obj/item/weapon/surgical/retractor,/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/tiled/white,/area/assembly/robotics) +"bRJ" = (/obj/structure/table/standard,/obj/item/surgical/circular_saw,/obj/item/surgical/scalpel{pixel_y = 12},/obj/item/surgical/hemostat,/obj/item/surgical/retractor,/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bRK" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bRL" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/floor/tiled/white,/area/assembly/robotics) -"bRM" = (/obj/effect/floor_decal/industrial/warning{dir = 9},/obj/structure/table/standard,/obj/item/stack/cable_coil,/obj/item/weapon/weldingtool/hugetank,/turf/simulated/floor/tiled/white,/area/assembly/robotics) +"bRM" = (/obj/effect/floor_decal/industrial/warning{dir = 9},/obj/structure/table/standard,/obj/item/stack/cable_coil,/obj/item/weldingtool/hugetank,/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bRN" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bRO" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 5},/turf/simulated/floor/tiled/white,/area/assembly/robotics) -"bRP" = (/obj/structure/table/standard,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/camera/network/research{c_tag = "SCI - Robotics Starboard"; dir = 8},/obj/item/device/defib_kit/jumper_kit/loaded,/obj/item/device/defib_kit/jumper_kit/loaded,/turf/simulated/floor/tiled,/area/assembly/robotics) +"bRP" = (/obj/structure/table/standard,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/camera/network/research{c_tag = "SCI - Robotics Starboard"; dir = 8},/obj/item/defib_kit/jumper_kit/loaded,/obj/item/defib_kit/jumper_kit/loaded,/turf/simulated/floor/tiled,/area/assembly/robotics) "bRQ" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bRR" = (/obj/machinery/door/airlock/command{name = "Head of Personnel"; req_access = list(57)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/wood,/area/crew_quarters/heads/hop) "bRS" = (/obj/effect/floor_decal/corner/blue{dir = 9},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/bridge_hallway) @@ -4997,7 +4997,7 @@ "bSe" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bSf" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bSg" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/sign/securearea{desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'"; icon_state = "monkey_painting"; name = "Mr. Deempisi portrait"; pixel_x = 28; pixel_y = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"bSh" = (/obj/item/weapon/stool/padded,/obj/machinery/light{dir = 8},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/wood,/area/crew_quarters/bar) +"bSh" = (/obj/item/stool/padded,/obj/machinery/light{dir = 8},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bSi" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bSj" = (/obj/effect/floor_decal/spline/plain{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bSk" = (/obj/structure/flora/pottedplant{icon_state = "plant-01"},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) @@ -5010,35 +5010,35 @@ "bSr" = (/obj/structure/table/glass,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/newscaster{pixel_x = 30},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two) "bSs" = (/obj/machinery/chemical_dispenser/full,/obj/effect/floor_decal/corner/beige{dir = 9},/obj/structure/table/reinforced,/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bSt" = (/obj/structure/bed/chair/office/dark,/obj/effect/landmark/start{name = "Chemist"},/turf/simulated/floor/tiled/white,/area/medical/chemistry) -"bSu" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/beakers,/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor/tiled/white,/area/medical/chemistry) +"bSu" = (/obj/structure/table/reinforced,/obj/item/storage/box/beakers,/obj/item/reagent_containers/dropper,/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bSv" = (/obj/machinery/chemical_dispenser/full,/obj/structure/table/reinforced,/turf/simulated/floor/tiled/white,/area/medical/chemistry) -"bSw" = (/obj/structure/closet/secure_closet/medical1,/obj/item/weapon/storage/box/pillbottles,/obj/effect/floor_decal/corner/beige{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/chemistry) +"bSw" = (/obj/structure/closet/secure_closet/medical1,/obj/item/storage/box/pillbottles,/obj/effect/floor_decal/corner/beige{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bSx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/medical/chemistry) -"bSy" = (/obj/structure/table/steel,/obj/item/device/multitool,/obj/machinery/light{dir = 8},/obj/item/weapon/deck/cards,/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) +"bSy" = (/obj/structure/table/steel,/obj/item/multitool,/obj/machinery/light{dir = 8},/obj/item/deck/cards,/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bSz" = (/obj/effect/floor_decal/corner/pink{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bSA" = (/obj/effect/floor_decal/corner/pink{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bSB" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bSC" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) -"bSD" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/machinery/door/window/westleft{name = "EVA Suit Storage"; req_access = list(5)},/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/void/medical,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/medical,/obj/item/weapon/tank/oxygen,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/dark,/area/medical/medbay_emt_bay) -"bSE" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/item/toy/plushie/therapy/blue,/turf/simulated/floor/carpet/blue,/area/medical/psych) +"bSD" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/machinery/door/window/westleft{name = "EVA Suit Storage"; req_access = list(5)},/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/void/medical,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/medical,/obj/item/tank/oxygen,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/dark,/area/medical/medbay_emt_bay) +"bSE" = (/obj/structure/table/woodentable,/obj/item/paper_bin,/obj/item/pen,/obj/item/toy/plushie/therapy/blue,/turf/simulated/floor/carpet/blue,/area/medical/psych) "bSF" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/carpet/blue,/area/medical/psych) "bSG" = (/obj/machinery/camera/network/medbay{c_tag = "MED - Mental Health"; dir = 1},/obj/machinery/light,/turf/simulated/floor/carpet/blue,/area/medical/psych) "bSH" = (/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/carpet/blue,/area/medical/psych) "bSI" = (/turf/simulated/wall,/area/medical/patient_c) "bSJ" = (/obj/effect/floor_decal/corner/pink/full{dir = 8},/obj/machinery/iv_drip,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_x = -25; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/patient_c) -"bSK" = (/obj/effect/floor_decal/corner/pink{dir = 5},/obj/structure/bed/padded,/obj/item/weapon/bedsheet/medical,/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled/white,/area/medical/patient_c) +"bSK" = (/obj/effect/floor_decal/corner/pink{dir = 5},/obj/structure/bed/padded,/obj/item/bedsheet/medical,/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled/white,/area/medical/patient_c) "bSL" = (/obj/effect/floor_decal/corner/pink{dir = 5},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = 0; pixel_y = 36},/obj/machinery/button/windowtint{id = "pr3_window_tint"; pixel_y = 26},/turf/simulated/floor/tiled/white,/area/medical/patient_c) "bSM" = (/obj/structure/window/reinforced/polarized{dir = 8; id = "pr3_window_tint"},/obj/structure/window/reinforced/polarized{dir = 4; id = "pr3_window_tint"},/obj/structure/window/reinforced/polarized{dir = 2; id = "pr3_window_tint"},/obj/structure/window/reinforced/polarized{dir = 1; id = "pr3_window_tint"},/obj/structure/grille,/obj/machinery/door/firedoor,/turf/simulated/floor,/area/medical/patient_c) "bSN" = (/obj/effect/floor_decal/corner/pink{dir = 1},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) "bSO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/corner/pink{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) "bSP" = (/obj/structure/window/reinforced/polarized{dir = 1; id = "pr2_window_tint"},/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/polarized{dir = 2; id = "pr2_window_tint"},/obj/structure/window/reinforced/polarized{dir = 4; id = "pr2_window_tint"},/obj/structure/window/reinforced/polarized{dir = 8; id = "pr2_window_tint"},/turf/simulated/floor,/area/medical/patient_b) "bSQ" = (/obj/machinery/button/windowtint{id = "pr2_window_tint"; pixel_y = 26},/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = 0; pixel_y = 36},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/corner/pink{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/patient_b) -"bSR" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/medical,/obj/effect/floor_decal/corner/pink{dir = 5},/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled/white,/area/medical/patient_b) +"bSR" = (/obj/structure/bed/padded,/obj/item/bedsheet/medical,/obj/effect/floor_decal/corner/pink{dir = 5},/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled/white,/area/medical/patient_b) "bSS" = (/obj/machinery/iv_drip,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/effect/floor_decal/corner/pink/full{dir = 1},/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/patient_b) "bST" = (/obj/structure/bed/chair/wheelchair,/turf/simulated/floor/tiled/dark,/area/medical/biostorage) "bSU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/medical/biostorage) "bSV" = (/obj/machinery/iv_drip,/turf/simulated/floor/tiled/dark,/area/medical/biostorage) -"bSW" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/structure/closet/l3closet/medical,/turf/simulated/floor/tiled/dark,/area/medical/biostorage) +"bSW" = (/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/structure/closet/l3closet/medical,/turf/simulated/floor/tiled/dark,/area/medical/biostorage) "bSX" = (/obj/structure/closet/l3closet/medical,/turf/simulated/floor/tiled/dark,/area/medical/biostorage) "bSY" = (/obj/structure/bedsheetbin,/obj/structure/table/steel,/obj/random/firstaid,/obj/random/firstaid,/turf/simulated/floor/tiled/dark,/area/medical/biostorage) "bSZ" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/floodlight,/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor,/area/maintenance/medbay_aft) @@ -5049,7 +5049,7 @@ "bTe" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/medical_escape_pod_hallway) "bTf" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/medical_escape_pod_hallway) "bTg" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "mining_shuttle_hatch"; locked = 1; name = "Shuttle Hatch"; req_access = list(13)},/turf/simulated/floor,/area/shuttle/mining/station) -"bTh" = (/obj/structure/table/standard,/obj/item/weapon/hand_labeler,/obj/effect/floor_decal/corner/green/full{dir = 8},/obj/machinery/alarm{pixel_y = 22},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_storage) +"bTh" = (/obj/structure/table/standard,/obj/item/hand_labeler,/obj/effect/floor_decal/corner/green/full{dir = 8},/obj/machinery/alarm{pixel_y = 22},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_storage) "bTi" = (/obj/structure/closet/secure_closet/hydroponics{req_access = list(47)},/obj/effect/floor_decal/corner/green{dir = 5},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_storage) "bTj" = (/obj/structure/closet/secure_closet/hydroponics{req_access = list(47)},/obj/effect/floor_decal/corner/green{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_storage) "bTk" = (/obj/machinery/smartfridge/drying_rack,/obj/effect/floor_decal/corner/green/full{dir = 1},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_storage) @@ -5060,15 +5060,15 @@ "bTp" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/camera/network/research{c_tag = "SCI - Xenoflora"; dir = 2},/turf/simulated/floor/tiled/hydro,/area/rnd/xenobiology/xenoflora) "bTq" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/hydro,/area/rnd/xenobiology/xenoflora) "bTr" = (/obj/effect/floor_decal/corner/green{dir = 9},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) -"bTs" = (/obj/machinery/atmospherics/portables_connector,/obj/machinery/light{dir = 1},/obj/item/weapon/tool/wrench,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) +"bTs" = (/obj/machinery/atmospherics/portables_connector,/obj/machinery/light{dir = 1},/obj/item/tool/wrench,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "bTt" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/biogenerator,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "bTu" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/seed_extractor,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "bTv" = (/obj/machinery/reagentgrinder,/obj/structure/table/glass,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) -"bTw" = (/obj/effect/floor_decal/corner/green{dir = 6},/obj/structure/table/glass,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) -"bTx" = (/obj/structure/table/standard,/obj/machinery/light,/obj/structure/closet/secure_closet/medical_wall{name = "anesthetic closet"; pixel_x = -32; req_access = list(29)},/obj/item/weapon/tank/anesthetic,/obj/item/weapon/tank/anesthetic,/obj/item/weapon/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/breath/medical,/obj/item/weapon/storage/box/gloves,/turf/simulated/floor/tiled/white,/area/assembly/robotics) +"bTw" = (/obj/effect/floor_decal/corner/green{dir = 6},/obj/structure/table/glass,/obj/item/storage/box/beakers{pixel_x = 2; pixel_y = 2},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) +"bTx" = (/obj/structure/table/standard,/obj/machinery/light,/obj/structure/closet/secure_closet/medical_wall{name = "anesthetic closet"; pixel_x = -32; req_access = list(29)},/obj/item/tank/anesthetic,/obj/item/tank/anesthetic,/obj/item/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/breath/medical,/obj/item/storage/box/gloves,/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bTy" = (/obj/machinery/optable{name = "Robotics Operating Table"},/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bTz" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/computer/operating{name = "Robotics Operating Computer"},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/tiled/white,/area/assembly/robotics) -"bTA" = (/obj/structure/table/standard,/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/item/weapon/tool/screwdriver,/obj/item/weapon/tool/crowbar,/obj/item/weapon/surgical/circular_saw,/obj/item/weapon/surgical/hemostat,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/tiled/white,/area/assembly/robotics) +"bTA" = (/obj/structure/table/standard,/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/item/tool/screwdriver,/obj/item/tool/crowbar,/obj/item/surgical/circular_saw,/obj/item/surgical/hemostat,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bTB" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/light,/obj/machinery/computer/operating{name = "Robotics Operating Computer"},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bTC" = (/obj/structure/table/standard,/obj/machinery/newscaster{pixel_x = 28; pixel_y = 1},/obj/machinery/cell_charger,/turf/simulated/floor/tiled,/area/assembly/robotics) "bTD" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/hallway/primary/central_four) @@ -5078,42 +5078,42 @@ "bTH" = (/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/wood,/area/bridge/meeting_room) "bTI" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/camera/network/command{c_tag = "COM - Conference Room"},/obj/machinery/light{dir = 1},/turf/simulated/floor/wood,/area/bridge/meeting_room) "bTJ" = (/turf/simulated/floor/wood,/area/bridge/meeting_room) -"bTK" = (/obj/structure/table/woodentable,/obj/item/device/retail_scanner/command{icon_state = "retail_idle"; dir = 4},/turf/simulated/floor/wood,/area/bridge/meeting_room) +"bTK" = (/obj/structure/table/woodentable,/obj/item/retail_scanner/command{icon_state = "retail_idle"; dir = 4},/turf/simulated/floor/wood,/area/bridge/meeting_room) "bTL" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/table/woodentable,/obj/machinery/photocopier/faxmachine{department = "Bridge"},/obj/machinery/light_switch{pixel_x = 36; pixel_y = 0},/turf/simulated/floor/wood,/area/bridge/meeting_room) "bTM" = (/obj/effect/floor_decal/corner/blue{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled,/area/bridge_hallway) "bTN" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/blue{dir = 6},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled,/area/bridge_hallway) "bTO" = (/turf/simulated/wall/r_wall,/area/bridge_hallway) "bTP" = (/obj/machinery/door/airlock/command{name = "Colony Director's Quarters"; req_access = list(20)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor,/turf/simulated/floor/carpet,/area/crew_quarters/captain) -"bTQ" = (/obj/structure/table/woodentable,/obj/machinery/reagentgrinder,/obj/item/weapon/reagent_containers/food/drinks/shaker,/obj/item/weapon/packageWrap,/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = -22},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"bTR" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/box/beanbags,/obj/item/weapon/gun/projectile/shotgun/doublebarrel,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/bar) +"bTQ" = (/obj/structure/table/woodentable,/obj/machinery/reagentgrinder,/obj/item/reagent_containers/food/drinks/shaker,/obj/item/packageWrap,/obj/item/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = -22},/turf/simulated/floor/wood,/area/crew_quarters/bar) +"bTR" = (/obj/structure/table/woodentable,/obj/item/storage/box/beanbags,/obj/item/gun/projectile/shotgun/doublebarrel,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/bar) "bTS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/wood,/area/crew_quarters/bar) "bTT" = (/obj/machinery/vending/coffee,/turf/simulated/floor/wood,/area/crew_quarters/bar) "bTU" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bTV" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bTW" = (/obj/effect/floor_decal/spline/plain{dir = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bTX" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) -"bTY" = (/obj/structure/table/standard,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/camera/network/civilian{c_tag = "CIV - Cafeteria Fore"; dir = 2},/turf/simulated/floor/tiled/neutral,/area/crew_quarters/cafeteria) +"bTY" = (/obj/structure/table/standard,/obj/item/material/kitchen/utensil/fork,/obj/item/material/kitchen/utensil/spoon{pixel_x = 2},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/camera/network/civilian{c_tag = "CIV - Cafeteria Fore"; dir = 2},/turf/simulated/floor/tiled/neutral,/area/crew_quarters/cafeteria) "bTZ" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) "bUa" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/neutral,/area/crew_quarters/cafeteria) "bUb" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/clothing/head/cakehat,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/cafeteria) "bUc" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/cafeteria) -"bUd" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/white,/area/crew_quarters/cafeteria) -"bUe" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/reagent_containers/food/snacks/pie,/obj/machinery/light{dir = 1},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/white,/area/crew_quarters/cafeteria) +"bUd" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/stool/padded,/turf/simulated/floor/tiled/white,/area/crew_quarters/cafeteria) +"bUe" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/reagent_containers/food/snacks/pie,/obj/machinery/light{dir = 1},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/white,/area/crew_quarters/cafeteria) "bUf" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/cafeteria) -"bUg" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/structure/flora/pottedplant{icon_state = "plant-22"},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two) -"bUh" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/dropper,/obj/effect/floor_decal/corner/beige/full,/turf/simulated/floor/tiled/white,/area/medical/chemistry) -"bUi" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/effect/floor_decal/corner/beige{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/chemistry) -"bUj" = (/obj/structure/table/reinforced,/obj/item/device/mass_spectrometer/adv,/obj/item/clothing/glasses/science,/obj/item/clothing/glasses/science,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/effect/floor_decal/corner/beige{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/chemistry) -"bUk" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/effect/floor_decal/corner/beige{dir = 10},/obj/machinery/camera/network/medbay{c_tag = "MED - Chemistry"; dir = 1},/turf/simulated/floor/tiled/white,/area/medical/chemistry) -"bUl" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/dropper,/obj/effect/floor_decal/corner/beige{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/chemistry) +"bUg" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/structure/flora/pottedplant{icon_state = "plant-22"},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two) +"bUh" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/dropper,/obj/effect/floor_decal/corner/beige/full,/turf/simulated/floor/tiled/white,/area/medical/chemistry) +"bUi" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/glass/beaker/large,/obj/effect/floor_decal/corner/beige{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/chemistry) +"bUj" = (/obj/structure/table/reinforced,/obj/item/mass_spectrometer/adv,/obj/item/clothing/glasses/science,/obj/item/clothing/glasses/science,/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/effect/floor_decal/corner/beige{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/chemistry) +"bUk" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/glass/beaker/large,/obj/effect/floor_decal/corner/beige{dir = 10},/obj/machinery/camera/network/medbay{c_tag = "MED - Chemistry"; dir = 1},/turf/simulated/floor/tiled/white,/area/medical/chemistry) +"bUl" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/dropper,/obj/effect/floor_decal/corner/beige{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bUm" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/effect/floor_decal/corner/beige{dir = 10},/obj/structure/cable/green,/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bUn" = (/obj/structure/closet/wardrobe/chemistry_white,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/effect/floor_decal/corner/beige/full{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bUo" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/medical/chemistry) -"bUp" = (/obj/item/weapon/stool/padded,/obj/effect/landmark/start{name = "Paramedic"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) +"bUp" = (/obj/item/stool/padded,/obj/effect/landmark/start{name = "Paramedic"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bUq" = (/obj/effect/floor_decal/corner/pink{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bUr" = (/obj/effect/floor_decal/corner/pink{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bUs" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green,/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) -"bUt" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/westright{name = "EVA Suit Storage"; req_access = newlist(); req_one_access = list(5,18)},/obj/item/weapon/rig/medical/equipped,/turf/simulated/floor/tiled/dark,/area/medical/medbay_emt_bay) +"bUt" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/westright{name = "EVA Suit Storage"; req_access = newlist(); req_one_access = list(5,18)},/obj/item/rig/medical/equipped,/turf/simulated/floor/tiled/dark,/area/medical/medbay_emt_bay) "bUu" = (/obj/effect/floor_decal/corner/pink{dir = 9},/obj/structure/bed/chair/office/light,/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/camera/network/medbay{c_tag = "MED - Patient Room C"; dir = 4},/turf/simulated/floor/tiled/white,/area/medical/patient_c) "bUv" = (/obj/machinery/hologram/holopad,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/medical/patient_c) "bUw" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/medical/patient_c) @@ -5157,7 +5157,7 @@ "bVi" = (/obj/effect/floor_decal/corner/green{dir = 10},/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 9},/obj/machinery/meter,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "bVj" = (/obj/effect/floor_decal/corner/green{dir = 10},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "bVk" = (/obj/effect/floor_decal/corner/green{dir = 10},/obj/structure/bed/chair/office/dark{dir = 4},/obj/effect/landmark/start{name = "Xenobiologist"},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) -"bVl" = (/obj/effect/floor_decal/corner/green/full{dir = 4},/obj/structure/table/glass,/obj/machinery/requests_console{department = "Science"; departmentType = 2; name = "Science Requests Console"; pixel_x = 30; pixel_y = 0},/obj/item/weapon/storage/box/botanydisk,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) +"bVl" = (/obj/effect/floor_decal/corner/green/full{dir = 4},/obj/structure/table/glass,/obj/machinery/requests_console{department = "Science"; departmentType = 2; name = "Science Requests Console"; pixel_x = 30; pixel_y = 0},/obj/item/storage/box/botanydisk,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "bVm" = (/turf/simulated/wall/r_wall,/area/assembly/chargebay) "bVn" = (/turf/simulated/wall,/area/assembly/chargebay) "bVo" = (/obj/machinery/ai_status_display{pixel_x = 0; pixel_y = 0},/turf/simulated/wall,/area/assembly/chargebay) @@ -5176,46 +5176,46 @@ "bVB" = (/obj/structure/flora/pottedplant{icon_state = "plant-10"},/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/wood,/area/crew_quarters/captain) "bVC" = (/obj/machinery/ai_status_display{pixel_y = 32},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain) "bVD" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain) -"bVE" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/secure/safe{pixel_x = 5; pixel_y = 28},/obj/machinery/recharger{pixel_y = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain) -"bVF" = (/obj/machinery/computer/card,/obj/item/weapon/card/id/gold/captain/spare,/turf/simulated/floor/wood,/area/crew_quarters/captain) +"bVE" = (/obj/structure/table/woodentable,/obj/item/storage/secure/safe{pixel_x = 5; pixel_y = 28},/obj/machinery/recharger{pixel_y = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain) +"bVF" = (/obj/machinery/computer/card,/obj/item/card/id/gold/captain/spare,/turf/simulated/floor/wood,/area/crew_quarters/captain) "bVG" = (/obj/machinery/computer/communications,/obj/machinery/status_display{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/crew_quarters/captain) "bVH" = (/obj/machinery/keycard_auth{pixel_x = 0; pixel_y = 24},/turf/simulated/floor/wood,/area/crew_quarters/captain) -"bVI" = (/obj/structure/table/rack,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/armor/captain,/obj/item/clothing/head/helmet/space/capspace,/obj/machinery/newscaster/security_unit{pixel_x = 32; pixel_y = 0},/turf/simulated/floor/wood,/area/crew_quarters/captain) +"bVI" = (/obj/structure/table/rack,/obj/item/tank/jetpack/oxygen,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/armor/captain,/obj/item/clothing/head/helmet/space/capspace,/obj/machinery/newscaster/security_unit{pixel_x = 32; pixel_y = 0},/turf/simulated/floor/wood,/area/crew_quarters/captain) "bVJ" = (/obj/structure/closet/crate,/obj/random/drinkbottle,/obj/random/drinkbottle,/obj/random/maintenance/clean,/turf/simulated/floor,/area/maintenance/central) "bVK" = (/obj/machinery/door/airlock{name = "Bar Backroom"; req_access = list(25)},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/wood,/area/crew_quarters/bar) "bVL" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/wood,/area/crew_quarters/bar) "bVM" = (/turf/simulated/floor/wood,/area/crew_quarters/bar) "bVN" = (/obj/effect/floor_decal/spline/plain{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/crew_quarters/bar) "bVO" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/tiled/neutral,/area/crew_quarters/cafeteria) -"bVP" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{pixel_x = -3; pixel_y = 0},/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{pixel_x = 3},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) +"bVP" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/condiment/small/saltshaker{pixel_x = -3; pixel_y = 0},/obj/item/reagent_containers/food/condiment/small/peppermill{pixel_x = 3},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) "bVQ" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/tiled/neutral,/area/crew_quarters/cafeteria) "bVR" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) -"bVS" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/turf/simulated/floor/tiled/white,/area/crew_quarters/cafeteria) -"bVT" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/obj/item/weapon/material/kitchen/utensil/fork,/turf/simulated/floor/tiled/white,/area/crew_quarters/cafeteria) +"bVS" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/paper_bin,/obj/item/pen,/turf/simulated/floor/tiled/white,/area/crew_quarters/cafeteria) +"bVT" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/material/kitchen/utensil/spoon{pixel_x = 2},/obj/item/material/kitchen/utensil/fork,/turf/simulated/floor/tiled/white,/area/crew_quarters/cafeteria) "bVU" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/cafeteria) "bVV" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/cash_register/civilian{icon_state = "register_idle"; dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/cafeteria) "bVW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/cafeteria) "bVX" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/hallway/primary/central_two) "bVY" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "chemwindow"; name = "Chemistry Window Shutters"; opacity = 0},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/medical/chemistry) "bVZ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "chemwindow"; name = "Chemistry Window Shutters"; opacity = 0},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/medical/chemistry) -"bWa" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/obj/structure/closet/secure_closet/medical1,/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) +"bWa" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/obj/structure/closet/secure_closet/medical1,/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bWb" = (/obj/effect/floor_decal/corner/pink{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bWc" = (/obj/effect/floor_decal/corner/pink{dir = 6},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) -"bWd" = (/obj/structure/table/rack,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/roller,/obj/item/roller,/obj/item/roller,/obj/structure/sign/poster{pixel_x = 0; pixel_y = -32},/obj/item/device/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/obj/item/device/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) -"bWe" = (/obj/effect/floor_decal/corner/pink/full,/obj/machinery/computer/med_data/laptop,/obj/structure/table/glass,/obj/machinery/light,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/medical/patient_c) -"bWf" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/structure/table/glass,/obj/item/weapon/paper_bin,/obj/item/weapon/clipboard,/obj/item/weapon/pen,/turf/simulated/floor/tiled/white,/area/medical/patient_c) +"bWd" = (/obj/structure/table/rack,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/obj/item/storage/toolbox/mechanical,/obj/item/roller,/obj/item/roller,/obj/item/roller,/obj/structure/sign/poster{pixel_x = 0; pixel_y = -32},/obj/item/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/obj/item/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) +"bWe" = (/obj/effect/floor_decal/corner/pink/full,/obj/machinery/computer/med_data/laptop,/obj/structure/table/glass,/obj/machinery/light,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/medical/patient_c) +"bWf" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/structure/table/glass,/obj/item/paper_bin,/obj/item/clipboard,/obj/item/pen,/turf/simulated/floor/tiled/white,/area/medical/patient_c) "bWg" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor/tiled/white,/area/medical/patient_c) "bWh" = (/obj/effect/floor_decal/corner/pink{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) "bWi" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/corner/pink,/turf/simulated/floor/tiled/white,/area/medical/patient_wing) "bWj" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor/tiled/white,/area/medical/patient_b) -"bWk" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/structure/table/glass,/obj/item/weapon/paper_bin,/obj/item/weapon/clipboard,/obj/item/weapon/pen,/turf/simulated/floor/tiled/white,/area/medical/patient_b) -"bWl" = (/obj/machinery/computer/med_data/laptop,/obj/structure/table/glass,/obj/effect/floor_decal/corner/pink/full{dir = 4},/obj/machinery/light,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/white,/area/medical/patient_b) -"bWm" = (/obj/item/weapon/gun/launcher/syringe,/obj/item/weapon/storage/box/syringegun,/obj/structure/table/steel,/obj/machinery/light{dir = 8},/obj/random/medical,/turf/simulated/floor/tiled/dark,/area/medical/biostorage) -"bWn" = (/obj/item/weapon/storage/box/lights/mixed,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/structure/table/steel,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green,/obj/item/device/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/turf/simulated/floor/tiled/dark,/area/medical/biostorage) -"bWo" = (/obj/structure/closet/crate{icon_state = "crateopen"; name = "Grenade Crate"; opened = 1},/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/grenade/chem_grenade,/obj/item/device/assembly/igniter,/obj/item/device/assembly/igniter,/obj/item/device/assembly/igniter,/obj/item/device/assembly/timer,/obj/item/device/assembly/timer,/obj/item/device/assembly/timer,/turf/simulated/floor/tiled/dark,/area/medical/biostorage) -"bWp" = (/obj/structure/table/rack,/obj/item/clothing/suit/radiation,/obj/item/clothing/head/radiation,/obj/item/weapon/storage/toolbox/emergency,/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/obj/item/weapon/storage/box/lights/mixed,/obj/item/device/defib_kit/loaded,/obj/item/device/defib_kit/loaded,/turf/simulated/floor/tiled/dark,/area/medical/biostorage) -"bWq" = (/obj/item/weapon/cane,/obj/item/weapon/cane{pixel_x = -3; pixel_y = 2},/obj/item/weapon/cane{pixel_x = -6; pixel_y = 4},/obj/structure/table/steel,/obj/item/weapon/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/box/rxglasses,/turf/simulated/floor/tiled/dark,/area/medical/biostorage) -"bWr" = (/obj/item/weapon/storage/box/cdeathalarm_kit,/obj/item/bodybag/cryobag{pixel_x = -3},/obj/item/bodybag/cryobag{pixel_x = -3},/obj/structure/table/steel,/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/dark,/area/medical/biostorage) +"bWk" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/structure/table/glass,/obj/item/paper_bin,/obj/item/clipboard,/obj/item/pen,/turf/simulated/floor/tiled/white,/area/medical/patient_b) +"bWl" = (/obj/machinery/computer/med_data/laptop,/obj/structure/table/glass,/obj/effect/floor_decal/corner/pink/full{dir = 4},/obj/machinery/light,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/white,/area/medical/patient_b) +"bWm" = (/obj/item/gun/launcher/syringe,/obj/item/storage/box/syringegun,/obj/structure/table/steel,/obj/machinery/light{dir = 8},/obj/random/medical,/turf/simulated/floor/tiled/dark,/area/medical/biostorage) +"bWn" = (/obj/item/storage/box/lights/mixed,/obj/item/flashlight,/obj/item/flashlight,/obj/structure/table/steel,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green,/obj/item/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/turf/simulated/floor/tiled/dark,/area/medical/biostorage) +"bWo" = (/obj/structure/closet/crate{icon_state = "crateopen"; name = "Grenade Crate"; opened = 1},/obj/item/grenade/chem_grenade,/obj/item/grenade/chem_grenade,/obj/item/grenade/chem_grenade,/obj/item/grenade/chem_grenade,/obj/item/assembly/igniter,/obj/item/assembly/igniter,/obj/item/assembly/igniter,/obj/item/assembly/timer,/obj/item/assembly/timer,/obj/item/assembly/timer,/turf/simulated/floor/tiled/dark,/area/medical/biostorage) +"bWp" = (/obj/structure/table/rack,/obj/item/clothing/suit/radiation,/obj/item/clothing/head/radiation,/obj/item/storage/toolbox/emergency,/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 2; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -21},/obj/item/storage/box/lights/mixed,/obj/item/defib_kit/loaded,/obj/item/defib_kit/loaded,/turf/simulated/floor/tiled/dark,/area/medical/biostorage) +"bWq" = (/obj/item/cane,/obj/item/cane{pixel_x = -3; pixel_y = 2},/obj/item/cane{pixel_x = -6; pixel_y = 4},/obj/structure/table/steel,/obj/item/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/item/storage/box/rxglasses,/turf/simulated/floor/tiled/dark,/area/medical/biostorage) +"bWr" = (/obj/item/storage/box/cdeathalarm_kit,/obj/item/bodybag/cryobag{pixel_x = -3},/obj/item/bodybag/cryobag{pixel_x = -3},/obj/structure/table/steel,/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/dark,/area/medical/biostorage) "bWs" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/medbay_aft) "bWt" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/meter,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/medbay_aft) "bWu" = (/obj/machinery/door/airlock/engineering{name = "Medbay Substation"; req_one_access = list(11,24,5)},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/turf/simulated/floor,/area/maintenance/substation/medical) @@ -5255,40 +5255,40 @@ "bXc" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bXd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "heads_meeting"; name = "Meeting Room Window Shutters"; opacity = 0},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/bridge/meeting_room) "bXe" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/bed/chair/comfy/black{dir = 4},/turf/simulated/floor/carpet,/area/bridge/meeting_room) -"bXf" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/table/woodentable,/obj/item/weapon/folder/red,/turf/simulated/floor/carpet,/area/bridge/meeting_room) -"bXg" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/table/woodentable,/obj/item/weapon/book/codex/corp_regs,/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/carpet,/area/bridge/meeting_room) +"bXf" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/table/woodentable,/obj/item/folder/red,/turf/simulated/floor/carpet,/area/bridge/meeting_room) +"bXg" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/table/woodentable,/obj/item/book/codex/corp_regs,/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/carpet,/area/bridge/meeting_room) "bXh" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/bed/chair/comfy/black{dir = 8},/turf/simulated/floor/carpet,/area/bridge/meeting_room) "bXi" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/bridge/meeting_room) -"bXj" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/table/woodentable,/obj/item/weapon/storage/box/donut,/turf/simulated/floor/wood,/area/bridge/meeting_room) +"bXj" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/table/woodentable,/obj/item/storage/box/donut,/turf/simulated/floor/wood,/area/bridge/meeting_room) "bXk" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/button/windowtint{id = "meet_window_tint"; pixel_x = 36; pixel_y = 0},/obj/machinery/keycard_auth{pixel_x = 24; pixel_y = 0},/turf/simulated/floor/wood,/area/bridge/meeting_room) "bXl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/bridge_hallway) "bXm" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/blue{dir = 6},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/bridge_hallway) "bXn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "cap_office"; name = "Captain's Shutters"; opacity = 0},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/bridge_hallway) "bXo" = (/obj/structure/bed/chair/comfy/brown,/turf/simulated/floor/carpet,/area/crew_quarters/captain) "bXp" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/wood,/area/crew_quarters/captain) -"bXq" = (/obj/structure/table/woodentable,/obj/item/weapon/melee/chainofcommand,/obj/machinery/button/remote/airlock{desc = "A remote control switch for the Starboard Bridge Doors."; id = "sbridgedoor"; name = "Starboard Bridge Door Control"; pixel_x = 4; pixel_y = -6},/obj/machinery/button/remote/airlock{desc = "A remote control switch for the captain's office."; id = "captaindoor"; name = "Office Door Control"; pixel_x = 4; pixel_y = 6},/turf/simulated/floor/wood,/area/crew_quarters/captain) +"bXq" = (/obj/structure/table/woodentable,/obj/item/melee/chainofcommand,/obj/machinery/button/remote/airlock{desc = "A remote control switch for the Starboard Bridge Doors."; id = "sbridgedoor"; name = "Starboard Bridge Door Control"; pixel_x = 4; pixel_y = -6},/obj/machinery/button/remote/airlock{desc = "A remote control switch for the captain's office."; id = "captaindoor"; name = "Office Door Control"; pixel_x = 4; pixel_y = 6},/turf/simulated/floor/wood,/area/crew_quarters/captain) "bXr" = (/obj/structure/bed/chair/comfy/brown{dir = 1},/obj/effect/landmark/start{name = "Colony Director"},/turf/simulated/floor/wood,/area/crew_quarters/captain) "bXs" = (/turf/simulated/floor/wood,/area/crew_quarters/captain) -"bXt" = (/obj/item/device/radio/intercom{broadcasting = 0; dir = 4; listening = 1; name = "Colony Director's Intercom"; pixel_x = 21; pixel_y = 0},/obj/structure/table/woodentable,/obj/item/weapon/folder/blue_captain,/turf/simulated/floor/wood,/area/crew_quarters/captain) +"bXt" = (/obj/item/radio/intercom{broadcasting = 0; dir = 4; listening = 1; name = "Colony Director's Intercom"; pixel_x = 21; pixel_y = 0},/obj/structure/table/woodentable,/obj/item/folder/blue_captain,/turf/simulated/floor/wood,/area/crew_quarters/captain) "bXu" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/maintenance/central) "bXv" = (/obj/machinery/smartfridge/drinks,/turf/simulated/floor/lino,/area/crew_quarters/bar) "bXw" = (/obj/effect/landmark/start{name = "Bartender"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/light{dir = 1},/turf/simulated/floor/lino,/area/crew_quarters/bar) "bXx" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/mob/living/carbon/human/monkey/punpun,/turf/simulated/floor/lino,/area/crew_quarters/bar) "bXy" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/lino,/area/crew_quarters/bar) "bXz" = (/obj/structure/table/reinforced,/obj/machinery/door/blast/shutters{dir = 4; id = "bar"; layer = 3.1; name = "Bar Shutters"},/turf/simulated/floor/lino,/area/crew_quarters/bar) -"bXA" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/wood,/area/crew_quarters/bar) +"bXA" = (/obj/item/stool/padded,/turf/simulated/floor/wood,/area/crew_quarters/bar) "bXB" = (/obj/structure/table/standard,/turf/simulated/floor/tiled/neutral,/area/crew_quarters/cafeteria) "bXC" = (/obj/structure/bed/chair{dir = 8},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) -"bXD" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) -"bXE" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/neutral,/area/crew_quarters/cafeteria) -"bXF" = (/obj/item/weapon/stool/padded,/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) +"bXD" = (/obj/item/stool/padded,/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) +"bXE" = (/obj/item/stool/padded,/turf/simulated/floor/tiled/neutral,/area/crew_quarters/cafeteria) +"bXF" = (/obj/item/stool/padded,/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) "bXG" = (/turf/simulated/wall,/area/crew_quarters/cafeteria) "bXH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/primary/central_two) "bXI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/primary/central_two) "bXJ" = (/obj/machinery/door/airlock/multi_tile/glass{id_tag = "MedbayFoyerPort"; req_access = list(5)},/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/corner/pink{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bXK" = (/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/corner/pink{dir = 6},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) -"bXL" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/effect/floor_decal/corner/pink{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) -"bXM" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/corner/pink{dir = 6},/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 4; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) +"bXL" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/effect/floor_decal/corner/pink{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) +"bXM" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/corner/pink{dir = 6},/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 4; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) "bXN" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/medbay_aft) "bXO" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_x = 32; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/visible/universal,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/maintenance/medbay_aft) "bXP" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/medical_escape_pod_hallway) @@ -5299,7 +5299,7 @@ "bXU" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1; icon_state = "map"},/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled/steel,/area/quartermaster/miningdock) "bXV" = (/obj/machinery/embedded_controller/radio/airlock/docking_port{frequency = 1380; id_tag = "mining_dock_airlock"; pixel_x = -6; pixel_y = -25; req_one_access = list(13,48); tag_airpump = "mining_dock_pump"; tag_chamber_sensor = "mining_dock_sensor"; tag_exterior_door = "mining_dock_outer"; tag_interior_door = "mining_dock_inner"},/obj/machinery/airlock_sensor{frequency = 1380; id_tag = "mining_dock_sensor"; pixel_x = 6; pixel_y = -24},/obj/structure/closet/emcloset,/obj/machinery/atmospherics/pipe/simple/hidden{dir = 9; icon_state = "intact"},/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor/tiled/steel,/area/quartermaster/miningdock) "bXW" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/maintenance{req_access = null; req_one_access = list(12,47)},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/research) -"bXX" = (/obj/effect/floor_decal/corner/green/full,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/obj/machinery/camera/network/research{c_tag = "SCI - Xenoflora Storage"; dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_storage) +"bXX" = (/obj/effect/floor_decal/corner/green/full,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/obj/machinery/camera/network/research{c_tag = "SCI - Xenoflora Storage"; dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_storage) "bXY" = (/obj/machinery/atmospherics/unary/freezer{dir = 2; icon_state = "freezer"},/obj/effect/floor_decal/corner/green{dir = 10},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_storage) "bXZ" = (/obj/machinery/atmospherics/unary/heater{dir = 2; icon_state = "heater"},/obj/effect/floor_decal/corner/green{dir = 10},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_storage) "bYa" = (/obj/machinery/atmospherics/portables_connector,/obj/effect/floor_decal/corner/green/full{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_storage) @@ -5318,22 +5318,22 @@ "bYn" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bYo" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "heads_meeting"; name = "Meeting Room Window Shutters"; opacity = 0},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/bridge/meeting_room) "bYp" = (/obj/structure/bed/chair/comfy/black{dir = 4},/turf/simulated/floor/carpet,/area/bridge/meeting_room) -"bYq" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor/carpet,/area/bridge/meeting_room) -"bYr" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/table/woodentable,/obj/item/weapon/folder/blue,/turf/simulated/floor/carpet,/area/bridge/meeting_room) +"bYq" = (/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/pen,/turf/simulated/floor/carpet,/area/bridge/meeting_room) +"bYr" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/table/woodentable,/obj/item/folder/blue,/turf/simulated/floor/carpet,/area/bridge/meeting_room) "bYs" = (/obj/structure/bed/chair/comfy/black{dir = 8},/turf/simulated/floor/carpet,/area/bridge/meeting_room) -"bYt" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/item/weapon/pen/red{pixel_y = 5},/obj/item/weapon/pen/blue{pixel_y = -5},/turf/simulated/floor/wood,/area/bridge/meeting_room) +"bYt" = (/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/pen,/obj/item/pen/red{pixel_y = 5},/obj/item/pen/blue{pixel_y = -5},/turf/simulated/floor/wood,/area/bridge/meeting_room) "bYu" = (/obj/structure/bed/chair/comfy/black{dir = 8},/turf/simulated/floor/wood,/area/bridge/meeting_room) "bYv" = (/obj/structure/grille,/obj/structure/window/reinforced/polarized{dir = 2; id = "meet_window_tint"},/obj/structure/window/reinforced/polarized{dir = 8; id = "meet_window_tint"},/obj/structure/window/reinforced/polarized{dir = 4; id = "meet_window_tint"},/obj/structure/window/reinforced/polarized{dir = 1; id = "meet_window_tint"},/turf/simulated/floor,/area/bridge/meeting_room) "bYw" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/floor_decal/corner/blue{dir = 6},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/bridge_hallway) "bYx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "cap_office"; name = "Captain's Shutters"; opacity = 0},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/bridge_hallway) -"bYy" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/box/donut,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/carpet,/area/crew_quarters/captain) -"bYz" = (/obj/structure/table/woodentable,/obj/item/weapon/book/codex/corp_regs,/obj/item/device/taperecorder,/turf/simulated/floor/carpet,/area/crew_quarters/captain) +"bYy" = (/obj/structure/table/woodentable,/obj/item/storage/box/donut,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/carpet,/area/crew_quarters/captain) +"bYz" = (/obj/structure/table/woodentable,/obj/item/book/codex/corp_regs,/obj/item/taperecorder,/turf/simulated/floor/carpet,/area/crew_quarters/captain) "bYA" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/wood,/area/crew_quarters/captain) -"bYB" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/wood,/area/crew_quarters/captain) -"bYC" = (/obj/structure/table/woodentable,/obj/item/weapon/stamp/captain,/turf/simulated/floor/wood,/area/crew_quarters/captain) -"bYD" = (/obj/structure/table/woodentable,/obj/machinery/computer/skills,/obj/item/weapon/hand_tele,/turf/simulated/floor/wood,/area/crew_quarters/captain) +"bYB" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green,/turf/simulated/floor/wood,/area/crew_quarters/captain) +"bYC" = (/obj/structure/table/woodentable,/obj/item/stamp/captain,/turf/simulated/floor/wood,/area/crew_quarters/captain) +"bYD" = (/obj/structure/table/woodentable,/obj/machinery/computer/skills,/obj/item/hand_tele,/turf/simulated/floor/wood,/area/crew_quarters/captain) "bYE" = (/obj/machinery/door/window/southright{name = "Captain's Desk Door"; req_access = list(20)},/turf/simulated/floor/wood,/area/crew_quarters/captain) -"bYF" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/folder/blue,/obj/item/device/megaphone,/obj/machinery/requests_console{announcementConsole = 1; department = "Colony Director's Desk"; departmentType = 5; name = "Station Administrator RC"; pixel_x = 30; pixel_y = 0},/obj/structure/window/reinforced,/obj/item/weapon/pen/multi,/turf/simulated/floor/wood,/area/crew_quarters/captain) +"bYF" = (/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/folder/blue,/obj/item/megaphone,/obj/machinery/requests_console{announcementConsole = 1; department = "Colony Director's Desk"; departmentType = 5; name = "Station Administrator RC"; pixel_x = 30; pixel_y = 0},/obj/structure/window/reinforced,/obj/item/pen/multi,/turf/simulated/floor/wood,/area/crew_quarters/captain) "bYG" = (/obj/machinery/floodlight,/turf/simulated/floor,/area/maintenance/central) "bYH" = (/obj/machinery/vending/boozeomat,/obj/machinery/status_display{pixel_x = -32; pixel_y = 0},/turf/simulated/floor/lino,/area/crew_quarters/bar) "bYI" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/lino,/area/crew_quarters/bar) @@ -5355,12 +5355,12 @@ "bYY" = (/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "medbayquar"; name = "Medbay Emergency Lockdown Shutters"; opacity = 0},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/medical_emergency_hallway) "bYZ" = (/turf/simulated/wall,/area/medical/patient_e) "bZa" = (/obj/effect/floor_decal/corner/pink/full{dir = 8},/obj/machinery/iv_drip,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_x = -25; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/patient_e) -"bZb" = (/obj/effect/floor_decal/corner/pink{dir = 5},/obj/structure/bed/padded,/obj/item/weapon/bedsheet/medical,/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled/white,/area/medical/patient_e) +"bZb" = (/obj/effect/floor_decal/corner/pink{dir = 5},/obj/structure/bed/padded,/obj/item/bedsheet/medical,/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled/white,/area/medical/patient_e) "bZc" = (/obj/effect/floor_decal/corner/pink{dir = 5},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = 0; pixel_y = 36},/obj/machinery/button/windowtint{id = "pr5_window_tint"; pixel_y = 26},/turf/simulated/floor/tiled/white,/area/medical/patient_e) "bZd" = (/obj/structure/window/reinforced/polarized{dir = 1; id = "pr5_window_tint"},/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/polarized{dir = 2; id = "pr5_window_tint"},/obj/structure/window/reinforced/polarized{dir = 4; id = "pr5_window_tint"},/obj/structure/window/reinforced/polarized{dir = 8; id = "pr5_window_tint"},/turf/simulated/floor,/area/medical/patient_e) "bZe" = (/obj/structure/window/reinforced/polarized{dir = 1; id = "pr4_window_tint"},/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/polarized{dir = 2; id = "pr4_window_tint"},/obj/structure/window/reinforced/polarized{dir = 4; id = "pr4_window_tint"},/obj/structure/window/reinforced/polarized{dir = 8; id = "pr4_window_tint"},/turf/simulated/floor,/area/medical/patient_d) "bZf" = (/obj/machinery/button/windowtint{id = "pr4_window_tint"; pixel_y = 26},/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = 0; pixel_y = 36},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/corner/pink{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/patient_d) -"bZg" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/medical,/obj/effect/floor_decal/corner/pink{dir = 5},/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled/white,/area/medical/patient_d) +"bZg" = (/obj/structure/bed/padded,/obj/item/bedsheet/medical,/obj/effect/floor_decal/corner/pink{dir = 5},/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled/white,/area/medical/patient_d) "bZh" = (/obj/machinery/iv_drip,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/effect/floor_decal/corner/pink/full{dir = 1},/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/patient_d) "bZi" = (/turf/simulated/wall,/area/medical/patient_d) "bZj" = (/turf/simulated/wall,/area/maintenance/medbay_aft) @@ -5370,7 +5370,7 @@ "bZn" = (/obj/machinery/atmospherics/pipe/tank/air{dir = 8},/turf/simulated/floor/plating,/area/maintenance/medbay_aft) "bZo" = (/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth{frequency = 1380; id_tag = "large_escape_pod_1_berth"; pixel_x = -26; pixel_y = 0; tag_door = "large_escape_pod_1_berth_hatch"},/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/medical_escape_pod_hallway) "bZp" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/medical_escape_pod_hallway) -"bZq" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/item/device/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/medical_escape_pod_hallway) +"bZq" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/item/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/medical_escape_pod_hallway) "bZr" = (/turf/simulated/wall,/area/quartermaster/miningdock) "bZs" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/miningdock) "bZt" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "mining_dock_inner"; locked = 1; name = "Mining Dock Airlock"; req_access = list(13)},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/quartermaster/miningdock) @@ -5387,8 +5387,8 @@ "bZE" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled/hydro,/area/rnd/xenobiology/xenoflora) "bZF" = (/obj/effect/floor_decal/corner/green/full{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "bZG" = (/obj/effect/floor_decal/corner/green{dir = 5},/obj/structure/bed/chair/office/dark{dir = 4},/obj/effect/landmark/start{name = "Xenobiologist"},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) -"bZH" = (/obj/effect/floor_decal/corner/green/full{dir = 1},/obj/structure/table/glass,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/obj/machinery/newscaster{pixel_x = 28; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) -"bZI" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/obj/machinery/camera/network/research{c_tag = "SCI - Mech Bay Port"; dir = 4},/turf/simulated/floor/tiled,/area/assembly/chargebay) +"bZH" = (/obj/effect/floor_decal/corner/green/full{dir = 1},/obj/structure/table/glass,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/pen,/obj/machinery/newscaster{pixel_x = 28; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) +"bZI" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/obj/machinery/camera/network/research{c_tag = "SCI - Mech Bay Port"; dir = 4},/turf/simulated/floor/tiled,/area/assembly/chargebay) "bZJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled,/area/assembly/chargebay) "bZK" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/assembly/chargebay) "bZL" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/assembly/chargebay) @@ -5454,11 +5454,11 @@ "caT" = (/obj/machinery/light,/turf/simulated/floor/tiled/hydro,/area/rnd/xenobiology/xenoflora_storage) "caU" = (/turf/simulated/floor/tiled/hydro,/area/rnd/xenobiology/xenoflora_storage) "caV" = (/obj/machinery/atmospherics/portables_connector,/turf/simulated/floor/tiled/hydro,/area/rnd/xenobiology/xenoflora_storage) -"caW" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/machinery/light,/turf/simulated/floor/tiled/hydro,/area/rnd/xenobiology/xenoflora_storage) -"caX" = (/obj/effect/floor_decal/corner/green{dir = 9},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/obj/structure/table/standard,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/storage/box/gloves{pixel_x = 4; pixel_y = 4},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) -"caY" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/effect/floor_decal/industrial/warning{dir = 9},/obj/item/device/radio/intercom{layer = 4; name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) +"caW" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/machinery/light,/turf/simulated/floor/tiled/hydro,/area/rnd/xenobiology/xenoflora_storage) +"caX" = (/obj/effect/floor_decal/corner/green{dir = 9},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/obj/structure/table/standard,/obj/item/storage/box/syringes,/obj/item/storage/box/gloves{pixel_x = 4; pixel_y = 4},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) +"caY" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/effect/floor_decal/industrial/warning{dir = 9},/obj/item/radio/intercom{layer = 4; name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "caZ" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/obj/effect/floor_decal/industrial/warning{dir = 5},/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) -"cba" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) +"cba" = (/obj/structure/reagent_dispensers/watertank,/obj/item/reagent_containers/glass/bucket,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "cbb" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/effect/floor_decal/corner/green{dir = 6},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "cbc" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/hydro,/area/rnd/xenobiology/xenoflora) "cbd" = (/obj/machinery/light,/turf/simulated/floor/tiled/hydro,/area/rnd/xenobiology/xenoflora) @@ -5466,8 +5466,8 @@ "cbf" = (/obj/machinery/seed_storage/xenobotany,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "cbg" = (/obj/machinery/vending/hydronutrients{categories = 3},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "cbh" = (/obj/machinery/smartfridge,/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) -"cbi" = (/obj/structure/table/glass,/obj/item/weapon/tape_roll,/obj/item/device/analyzer/plant_analyzer,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) -"cbj" = (/obj/effect/floor_decal/corner/green{dir = 6},/obj/structure/table/glass,/obj/item/weapon/clipboard,/obj/item/weapon/folder/white,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) +"cbi" = (/obj/structure/table/glass,/obj/item/tape_roll,/obj/item/analyzer/plant_analyzer,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) +"cbj" = (/obj/effect/floor_decal/corner/green{dir = 6},/obj/structure/table/glass,/obj/item/clipboard,/obj/item/folder/white,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "cbk" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/assembly/chargebay) "cbl" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/assembly/chargebay) "cbm" = (/obj/machinery/computer/cryopod/robot{pixel_x = 30; pixel_y = 0},/obj/effect/floor_decal/industrial/warning/corner,/obj/machinery/camera/network/research{c_tag = "SCI - Mech Bay Starboard"; dir = 8},/turf/simulated/floor/tiled,/area/assembly/chargebay) @@ -5488,13 +5488,13 @@ "cbB" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/camera/network/command{c_tag = "COM - Captain's Office"; dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/captain) "cbC" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/captain) "cbD" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/captain) -"cbE" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/wood,/area/crew_quarters/captain) -"cbF" = (/obj/structure/table/reinforced,/obj/item/weapon/book/manual/barman_recipes,/obj/item/clothing/head/that{pixel_x = 4; pixel_y = 6},/obj/item/weapon/tool/screwdriver,/obj/item/weapon/flame/lighter/zippo,/obj/machinery/light_switch{pixel_x = -36; pixel_y = 0},/obj/machinery/button/remote/blast_door{id = "bar"; name = "Bar Shutters"; pixel_x = -26; pixel_y = 0},/turf/simulated/floor/lino,/area/crew_quarters/bar) +"cbE" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/wood,/area/crew_quarters/captain) +"cbF" = (/obj/structure/table/reinforced,/obj/item/book/manual/barman_recipes,/obj/item/clothing/head/that{pixel_x = 4; pixel_y = 6},/obj/item/tool/screwdriver,/obj/item/flame/lighter/zippo,/obj/machinery/light_switch{pixel_x = -36; pixel_y = 0},/obj/machinery/button/remote/blast_door{id = "bar"; name = "Bar Shutters"; pixel_x = -26; pixel_y = 0},/turf/simulated/floor/lino,/area/crew_quarters/bar) "cbG" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/lino,/area/crew_quarters/bar) -"cbH" = (/obj/item/weapon/stool/padded,/obj/effect/landmark/start{name = "Bartender"},/turf/simulated/floor/lino,/area/crew_quarters/bar) +"cbH" = (/obj/item/stool/padded,/obj/effect/landmark/start{name = "Bartender"},/turf/simulated/floor/lino,/area/crew_quarters/bar) "cbI" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/neutral,/area/crew_quarters/cafeteria) "cbJ" = (/obj/structure/bed/chair{dir = 4},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) -"cbK" = (/obj/structure/table/standard,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) +"cbK" = (/obj/structure/table/standard,/obj/item/material/kitchen/utensil/fork,/obj/item/material/kitchen/utensil/spoon{pixel_x = 2},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) "cbL" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled/neutral,/area/crew_quarters/cafeteria) "cbM" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) "cbN" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) @@ -5504,14 +5504,14 @@ "cbR" = (/obj/effect/decal/cleanable/cobweb2{icon_state = "cobweb1"},/obj/effect/decal/cleanable/cobweb2{icon_state = "spiderling"; name = "dead spider"},/turf/simulated/floor,/area/maintenance/medbay_aft) "cbS" = (/turf/simulated/floor,/area/maintenance/medbay_aft) "cbT" = (/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor,/area/maintenance/medbay_aft) -"cbU" = (/obj/effect/floor_decal/corner/pink/full,/obj/machinery/computer/med_data/laptop,/obj/structure/table/glass,/obj/machinery/light,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/medical/patient_e) -"cbV" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/structure/table/glass,/obj/item/weapon/paper_bin,/obj/item/weapon/clipboard,/obj/item/weapon/pen,/turf/simulated/floor/tiled/white,/area/medical/patient_e) +"cbU" = (/obj/effect/floor_decal/corner/pink/full,/obj/machinery/computer/med_data/laptop,/obj/structure/table/glass,/obj/machinery/light,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/medical/patient_e) +"cbV" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/structure/table/glass,/obj/item/paper_bin,/obj/item/clipboard,/obj/item/pen,/turf/simulated/floor/tiled/white,/area/medical/patient_e) "cbW" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor/tiled/white,/area/medical/patient_e) "cbX" = (/turf/simulated/floor/tiled/white,/area/medical/patient_wing) "cbY" = (/obj/effect/floor_decal/corner/pink,/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/obj/machinery/light,/obj/machinery/camera/network/medbay{c_tag = "MED - Patient Hallway Aft"; dir = 1},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) "cbZ" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/floor/tiled/white,/area/medical/patient_d) -"cca" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/structure/table/glass,/obj/item/weapon/paper_bin,/obj/item/weapon/clipboard,/obj/item/weapon/pen,/turf/simulated/floor/tiled/white,/area/medical/patient_d) -"ccb" = (/obj/machinery/computer/med_data/laptop,/obj/structure/table/glass,/obj/effect/floor_decal/corner/pink/full{dir = 4},/obj/machinery/light,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/white,/area/medical/patient_d) +"cca" = (/obj/effect/floor_decal/corner/pink{dir = 10},/obj/structure/table/glass,/obj/item/paper_bin,/obj/item/clipboard,/obj/item/pen,/turf/simulated/floor/tiled/white,/area/medical/patient_d) +"ccb" = (/obj/machinery/computer/med_data/laptop,/obj/structure/table/glass,/obj/effect/floor_decal/corner/pink/full{dir = 4},/obj/machinery/light,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/white,/area/medical/patient_d) "ccc" = (/obj/machinery/light{dir = 8},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 9},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/medical_escape_pod_hallway) "ccd" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/medical_escape_pod_hallway) "cce" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/industrial/warning{dir = 5},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/medical_escape_pod_hallway) @@ -5539,7 +5539,7 @@ "ccA" = (/obj/structure/table/woodentable,/obj/machinery/photocopier/faxmachine{department = "Captain's Office"},/turf/simulated/floor/wood,/area/crew_quarters/captain) "ccB" = (/turf/simulated/wall,/area/crew_quarters/captain) "ccC" = (/obj/machinery/door/airlock/maintenance{req_access = list(12)},/obj/machinery/door/firedoor/border_only,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/central) -"ccD" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced,/obj/item/weapon/reagent_containers/food/drinks/flask/barflask,/obj/item/weapon/reagent_containers/glass/rag,/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask,/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/lino,/area/crew_quarters/bar) +"ccD" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced,/obj/item/reagent_containers/food/drinks/flask/barflask,/obj/item/reagent_containers/glass/rag,/obj/item/reagent_containers/food/drinks/flask/vacuumflask,/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/lino,/area/crew_quarters/bar) "ccE" = (/obj/machinery/door/window/southleft{name = "Bar"; req_access = list(25)},/obj/structure/disposalpipe/segment,/turf/simulated/floor/lino,/area/crew_quarters/bar) "ccF" = (/obj/structure/table/reinforced,/obj/machinery/door/blast/shutters{dir = 2; id = "bar"; layer = 3.1; name = "Bar Shutters"},/turf/simulated/floor/lino,/area/crew_quarters/bar) "ccG" = (/obj/structure/flora/pottedplant{icon_state = "plant-01"},/turf/simulated/floor/tiled,/area/crew_quarters/bar) @@ -5548,13 +5548,13 @@ "ccJ" = (/obj/machinery/vending/snack,/turf/simulated/floor/tiled/neutral,/area/crew_quarters/cafeteria) "ccK" = (/obj/machinery/atm{pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) "ccL" = (/obj/structure/bed/chair{dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/tiled/neutral,/area/crew_quarters/cafeteria) -"ccM" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{pixel_x = -3; pixel_y = 0},/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{pixel_x = 3},/obj/machinery/camera/network/civilian{c_tag = "CIV - Cafeteria Aft"; dir = 1},/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -25},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) -"ccN" = (/obj/structure/table/standard,/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/obj/machinery/light,/obj/item/weapon/book/codex/lore/vir,/turf/simulated/floor/tiled/neutral,/area/crew_quarters/cafeteria) +"ccM" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/condiment/small/saltshaker{pixel_x = -3; pixel_y = 0},/obj/item/reagent_containers/food/condiment/small/peppermill{pixel_x = 3},/obj/machinery/camera/network/civilian{c_tag = "CIV - Cafeteria Aft"; dir = 1},/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -25},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) +"ccN" = (/obj/structure/table/standard,/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/obj/machinery/light,/obj/item/book/codex/lore/vir,/turf/simulated/floor/tiled/neutral,/area/crew_quarters/cafeteria) "ccO" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/neutral,/area/crew_quarters/cafeteria) "ccP" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/turf/simulated/floor/tiled,/area/crew_quarters/cafeteria) "ccQ" = (/obj/machinery/light{dir = 8},/obj/effect/floor_decal/corner/pink{dir = 9},/turf/simulated/floor/tiled,/area/hallway/secondary/medical_emergency_hallway) "ccR" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/corner/pink{dir = 6},/obj/structure/extinguisher_cabinet{pixel_x = 25},/turf/simulated/floor/tiled,/area/hallway/secondary/medical_emergency_hallway) -"ccS" = (/obj/effect/decal/cleanable/vomit,/obj/item/weapon/stool/padded,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor,/area/maintenance/medbay_aft) +"ccS" = (/obj/effect/decal/cleanable/vomit,/obj/item/stool/padded,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor,/area/maintenance/medbay_aft) "ccT" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/maintenance{name = "Medbay Patient Wing Maintenance Access"; req_access = list(5)},/turf/simulated/floor/plating,/area/medical/patient_wing) "ccU" = (/turf/simulated/wall,/area/medical/patient_wing) "ccV" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/medical_escape_pod_hallway) @@ -5591,7 +5591,7 @@ "cdA" = (/obj/effect/floor_decal/corner/blue{dir = 1},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/camera/network/command{c_tag = "COM - Bridge Starboard"},/turf/simulated/floor/tiled,/area/bridge) "cdB" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/bridge) "cdC" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/corner/blue{dir = 4},/obj/machinery/button/remote/blast_door{id = "bridge blast"; name = "Bridge Blastdoors"; pixel_x = 0; pixel_y = 24},/turf/simulated/floor/tiled,/area/bridge) -"cdD" = (/obj/structure/fireaxecabinet{pixel_y = 32},/obj/structure/table/reinforced,/obj/item/weapon/storage/box/lights/mixed,/obj/item/device/multitool,/obj/item/weapon/storage/toolbox/mechanical,/obj/effect/floor_decal/corner/blue/full{dir = 1},/obj/machinery/requests_console{announcementConsole = 1; department = "Bridge"; departmentType = 5; name = "Bridge RC"; pixel_x = 30; pixel_y = -3},/turf/simulated/floor/tiled,/area/bridge) +"cdD" = (/obj/structure/fireaxecabinet{pixel_y = 32},/obj/structure/table/reinforced,/obj/item/storage/box/lights/mixed,/obj/item/multitool,/obj/item/storage/toolbox/mechanical,/obj/effect/floor_decal/corner/blue/full{dir = 1},/obj/machinery/requests_console{announcementConsole = 1; department = "Bridge"; departmentType = 5; name = "Bridge RC"; pixel_x = 30; pixel_y = -3},/turf/simulated/floor/tiled,/area/bridge) "cdE" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_three) "cdF" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_three) "cdG" = (/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_three) @@ -5606,10 +5606,10 @@ "cdP" = (/obj/machinery/newscaster{pixel_x = 30},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "cdQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/medical_emergency_hallway) "cdR" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/effect/floor_decal/corner/pink{dir = 9},/turf/simulated/floor/tiled,/area/hallway/secondary/medical_emergency_hallway) -"cdS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/obj/effect/floor_decal/corner/pink{dir = 6},/turf/simulated/floor/tiled,/area/hallway/secondary/medical_emergency_hallway) +"cdS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/obj/effect/floor_decal/corner/pink{dir = 6},/turf/simulated/floor/tiled,/area/hallway/secondary/medical_emergency_hallway) "cdT" = (/obj/item/clothing/head/cone,/turf/simulated/floor,/area/maintenance/medbay_aft) -"cdU" = (/obj/item/weapon/broken_bottle,/turf/simulated/floor,/area/maintenance/medbay_aft) -"cdV" = (/obj/structure/table/woodentable,/obj/item/weapon/material/ashtray/plastic,/obj/item/weapon/cigbutt/cigarbutt,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor,/area/maintenance/medbay_aft) +"cdU" = (/obj/item/broken_bottle,/turf/simulated/floor,/area/maintenance/medbay_aft) +"cdV" = (/obj/structure/table/woodentable,/obj/item/material/ashtray/plastic,/obj/item/cigbutt/cigarbutt,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor,/area/maintenance/medbay_aft) "cdW" = (/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "medbayquar"; name = "Medbay Emergency Lockdown Shutters"; opacity = 0},/turf/simulated/floor,/area/maintenance/medbay_aft) "cdX" = (/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "medbayquar"; name = "Medbay Emergency Lockdown Shutters"; opacity = 0},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/medbay_aft) "cdY" = (/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "large_escape_pod_1_berth_hatch"; locked = 1; name = "Large Escape Pod 1"; req_access = list(13)},/turf/simulated/floor,/area/hallway/secondary/escape/medical_escape_pod_hallway) @@ -5642,7 +5642,7 @@ "cez" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "ceA" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "ceB" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) -"ceC" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) +"ceC" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "ceD" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/bar) "ceE" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) "ceF" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/wood,/area/crew_quarters/bar) @@ -5675,9 +5675,9 @@ "cfg" = (/obj/effect/floor_decal/corner/brown{dir = 1},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) "cfh" = (/obj/machinery/hologram/holopad,/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) "cfi" = (/obj/effect/floor_decal/corner/brown{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) -"cfj" = (/obj/structure/table/steel,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = 0; pixel_y = 28},/obj/effect/floor_decal/corner/brown{dir = 5},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) -"cfk" = (/obj/structure/table/steel,/obj/item/weapon/folder/yellow,/obj/item/weapon/pen,/obj/effect/floor_decal/corner/brown{dir = 5},/obj/machinery/light{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) -"cfl" = (/obj/effect/floor_decal/corner/brown{dir = 5},/obj/item/weapon/stool,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/landmark/start{name = "Shaft Miner"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) +"cfj" = (/obj/structure/table/steel,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = 0; pixel_y = 28},/obj/effect/floor_decal/corner/brown{dir = 5},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) +"cfk" = (/obj/structure/table/steel,/obj/item/folder/yellow,/obj/item/pen,/obj/effect/floor_decal/corner/brown{dir = 5},/obj/machinery/light{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) +"cfl" = (/obj/effect/floor_decal/corner/brown{dir = 5},/obj/item/stool,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/landmark/start{name = "Shaft Miner"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) "cfm" = (/obj/machinery/firealarm{pixel_y = 26},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) "cfn" = (/obj/machinery/door/airlock/maintenance{name = "Mining Maintenance"; req_access = list(50)},/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/quartermaster/miningdock) "cfo" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/sortjunction/untagged{dir = 4},/turf/simulated/floor,/area/maintenance/cargo) @@ -5724,7 +5724,7 @@ "cgd" = (/obj/machinery/floor_light{anchored = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor,/area/crew_quarters/bar) "cge" = (/obj/machinery/door/airlock{name = "Unit 2"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/barrestroom) "cgf" = (/obj/machinery/door/airlock{name = "Unit 1"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/barrestroom) -"cgg" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/barrestroom) +"cgg" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/barrestroom) "cgh" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{pixel_x = 28},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/barrestroom) "cgi" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable{d2 = 2; icon_state = "0-2"; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "cgj" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) @@ -5734,12 +5734,12 @@ "cgn" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/medical_emergency_hallway) "cgo" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/medical_emergency_hallway) "cgp" = (/obj/structure/closet/emcloset,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/medical_emergency_hallway) -"cgq" = (/obj/structure/closet,/obj/item/clothing/glasses/welding,/obj/item/weapon/weldingtool,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/clean,/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/maintenance/medbay_aft) +"cgq" = (/obj/structure/closet,/obj/item/clothing/glasses/welding,/obj/item/weldingtool,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/clean,/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/maintenance/medbay_aft) "cgr" = (/obj/machinery/space_heater,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/medbay_aft) "cgs" = (/obj/machinery/portable_atmospherics/powered/scrubber,/turf/simulated/floor,/area/maintenance/medbay_aft) "cgt" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/medbay_aft) "cgu" = (/turf/simulated/floor/plating,/area/maintenance/medbay_aft) -"cgv" = (/obj/structure/closet/crate,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/wirecutters,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor,/area/maintenance/medbay_aft) +"cgv" = (/obj/structure/closet/crate,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/item/tool/crowbar,/obj/item/tool/wirecutters,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor,/area/maintenance/medbay_aft) "cgw" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod1/station) "cgx" = (/obj/structure/shuttle/engine/heater{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/airless,/area/shuttle/large_escape_pod1/station) "cgy" = (/obj/machinery/atmospherics/unary/cryo_cell{layer = 3.3},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) @@ -5748,7 +5748,7 @@ "cgB" = (/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod{frequency = 1380; id_tag = "large_escape_pod_1"; pixel_x = -26; pixel_y = 26; tag_door = "large_escape_pod_1_hatch"},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) "cgC" = (/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) "cgD" = (/obj/structure/bed/chair,/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) -"cgE" = (/obj/structure/bed/chair,/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 1; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = 21},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) +"cgE" = (/obj/structure/bed/chair,/obj/item/radio/intercom{broadcasting = 0; canhear_range = 5; dir = 1; frequency = 1487; icon_state = "intercom"; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = 21},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) "cgF" = (/obj/structure/bed/chair,/obj/machinery/vending/wallmed1{layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28; pixel_y = 0},/obj/structure/closet/walllocker/emerglocker{pixel_x = 0; pixel_y = 32},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) "cgG" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor/tiled/steel,/area/quartermaster/miningdock) "cgH" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled/steel,/area/quartermaster/miningdock) @@ -5792,9 +5792,9 @@ "cht" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/bar) "chu" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/turf/simulated/floor/wood,/area/crew_quarters/bar) "chv" = (/obj/structure/bed/chair/wood/wings{icon_state = "wooden_chair_wings"; dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"chw" = (/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{pixel_x = 2; pixel_y = 6},/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{pixel_x = -2; pixel_y = 4},/obj/item/weapon/flame/candle,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/bar) +"chw" = (/obj/item/reagent_containers/food/condiment/small/peppermill{pixel_x = 2; pixel_y = 6},/obj/structure/table/woodentable,/obj/item/reagent_containers/food/condiment/small/saltshaker{pixel_x = -2; pixel_y = 4},/obj/item/flame/candle,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/bar) "chx" = (/obj/structure/bed/chair/wood/wings{icon_state = "wooden_chair_wings"; dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"chy" = (/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{pixel_x = 2; pixel_y = 6},/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{pixel_x = -2; pixel_y = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/wood,/area/crew_quarters/bar) +"chy" = (/obj/item/reagent_containers/food/condiment/small/peppermill{pixel_x = 2; pixel_y = 6},/obj/structure/table/woodentable,/obj/item/reagent_containers/food/condiment/small/saltshaker{pixel_x = -2; pixel_y = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/item/flashlight/lamp/green,/turf/simulated/floor/wood,/area/crew_quarters/bar) "chz" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/media/jukebox,/turf/simulated/floor/wood,/area/crew_quarters/bar) "chA" = (/obj/machinery/floor_light{anchored = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor,/area/crew_quarters/bar) "chB" = (/obj/machinery/camera/network/civilian{c_tag = "CIV - Bar Aft Starboard"; dir = 8},/obj/machinery/floor_light{anchored = 1},/turf/simulated/floor,/area/crew_quarters/bar) @@ -5820,7 +5820,7 @@ "chV" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) "chW" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) "chX" = (/obj/structure/shuttle/window,/obj/structure/grille,/turf/simulated/shuttle/plating,/area/shuttle/large_escape_pod1/station) -"chY" = (/obj/effect/floor_decal/corner/brown/full,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled/steel,/area/quartermaster/miningdock) +"chY" = (/obj/effect/floor_decal/corner/brown/full,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled/steel,/area/quartermaster/miningdock) "chZ" = (/obj/effect/floor_decal/corner/brown{dir = 8},/turf/simulated/floor/tiled/steel,/area/quartermaster/miningdock) "cia" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) "cib" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) @@ -5828,7 +5828,7 @@ "cid" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) "cie" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/effect/landmark/start{name = "Shaft Miner"},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) "cif" = (/obj/effect/floor_decal/corner/brown,/turf/simulated/floor/tiled,/area/quartermaster/miningdock) -"cig" = (/obj/item/weapon/pickaxe{pixel_x = 5},/obj/item/weapon/shovel{pixel_x = -5},/obj/structure/table/rack{dir = 1},/obj/effect/floor_decal/corner/brown/full{dir = 4},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/ai_status_display{pixel_y = -32},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) +"cig" = (/obj/item/pickaxe{pixel_x = 5},/obj/item/shovel{pixel_x = -5},/obj/structure/table/rack{dir = 1},/obj/effect/floor_decal/corner/brown/full{dir = 4},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/ai_status_display{pixel_y = -32},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) "cih" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Delivery Office Maintenance"; req_access = list(50)},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/quartermaster/delivery) "cii" = (/turf/simulated/wall,/area/quartermaster/delivery) "cij" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/quartermaster/delivery) @@ -5847,21 +5847,21 @@ "ciw" = (/obj/machinery/power/breakerbox/activated{RCon_tag = "Research Substation Bypass"},/turf/simulated/floor,/area/maintenance/substation/research) "cix" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "ciy" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/corner/blue/full,/turf/simulated/floor/tiled,/area/bridge) -"ciz" = (/obj/structure/table/reinforced,/obj/item/device/flashlight,/obj/item/device/flashlight{pixel_x = 2; pixel_y = 2},/obj/effect/floor_decal/corner/blue{dir = 10},/turf/simulated/floor/tiled,/area/bridge) -"ciA" = (/obj/structure/table/reinforced,/obj/item/device/radio,/obj/item/device/radio{pixel_x = 2; pixel_y = 3},/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/corner/blue/full{dir = 4},/obj/machinery/light,/turf/simulated/floor/tiled,/area/bridge) +"ciz" = (/obj/structure/table/reinforced,/obj/item/flashlight,/obj/item/flashlight{pixel_x = 2; pixel_y = 2},/obj/effect/floor_decal/corner/blue{dir = 10},/turf/simulated/floor/tiled,/area/bridge) +"ciA" = (/obj/structure/table/reinforced,/obj/item/radio,/obj/item/radio{pixel_x = 2; pixel_y = 3},/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/corner/blue/full{dir = 4},/obj/machinery/light,/turf/simulated/floor/tiled,/area/bridge) "ciB" = (/obj/machinery/computer/secure_data,/obj/effect/floor_decal/corner/red/full,/turf/simulated/floor/tiled,/area/bridge) "ciC" = (/obj/machinery/computer/security,/obj/effect/floor_decal/corner/red/full{dir = 4},/turf/simulated/floor/tiled,/area/bridge) -"ciD" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/secure/briefcase,/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/blue/full,/turf/simulated/floor/tiled,/area/bridge) -"ciE" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/PDAs{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/box/ids,/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/corner/blue/full{dir = 4},/obj/machinery/light,/turf/simulated/floor/tiled,/area/bridge) +"ciD" = (/obj/structure/table/reinforced,/obj/item/storage/secure/briefcase,/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/blue/full,/turf/simulated/floor/tiled,/area/bridge) +"ciE" = (/obj/structure/table/reinforced,/obj/item/storage/box/PDAs{pixel_x = 4; pixel_y = 4},/obj/item/storage/box/ids,/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/corner/blue/full{dir = 4},/obj/machinery/light,/turf/simulated/floor/tiled,/area/bridge) "ciF" = (/obj/machinery/computer/card,/obj/effect/floor_decal/corner/blue/full,/turf/simulated/floor/tiled,/area/bridge) "ciG" = (/obj/machinery/computer/communications,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/blue/full{dir = 4},/turf/simulated/floor/tiled,/area/bridge) -"ciH" = (/obj/structure/table/reinforced,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/aicard,/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/blue/full,/obj/machinery/light,/turf/simulated/floor/tiled,/area/bridge) +"ciH" = (/obj/structure/table/reinforced,/obj/item/flash,/obj/item/flash,/obj/item/aicard,/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/blue/full,/obj/machinery/light,/turf/simulated/floor/tiled,/area/bridge) "ciI" = (/obj/structure/table/reinforced,/obj/machinery/recharger{pixel_y = 0},/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/corner/blue/full{dir = 4},/turf/simulated/floor/tiled,/area/bridge) "ciJ" = (/obj/machinery/computer/crew,/obj/effect/floor_decal/corner/white/full,/turf/simulated/floor/tiled,/area/bridge) "ciK" = (/obj/machinery/computer/med_data,/obj/effect/floor_decal/corner/white/full{icon_state = "corner_white_full"; dir = 4},/turf/simulated/floor/tiled,/area/bridge) -"ciL" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/folder/red,/obj/item/weapon/folder/blue,/obj/item/weapon/pen,/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/blue/full,/obj/machinery/light,/turf/simulated/floor/tiled,/area/bridge) -"ciM" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/regular,/obj/effect/floor_decal/corner/blue{dir = 10},/turf/simulated/floor/tiled,/area/bridge) -"ciN" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/donut,/obj/effect/floor_decal/corner/blue/full{dir = 4},/obj/machinery/keycard_auth{pixel_x = 0; pixel_y = -24},/turf/simulated/floor/tiled,/area/bridge) +"ciL" = (/obj/structure/table/reinforced,/obj/item/paper_bin,/obj/item/folder/red,/obj/item/folder/blue,/obj/item/pen,/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/blue/full,/obj/machinery/light,/turf/simulated/floor/tiled,/area/bridge) +"ciM" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/regular,/obj/effect/floor_decal/corner/blue{dir = 10},/turf/simulated/floor/tiled,/area/bridge) +"ciN" = (/obj/structure/table/reinforced,/obj/item/storage/box/donut,/obj/effect/floor_decal/corner/blue/full{dir = 4},/obj/machinery/keycard_auth{pixel_x = 0; pixel_y = -24},/turf/simulated/floor/tiled,/area/bridge) "ciO" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "ciP" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "ciQ" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) @@ -5884,14 +5884,14 @@ "cjh" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor,/area/maintenance/medbay_aft) "cji" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/maintenance/medbay_aft) "cjj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/medbay_aft) -"cjk" = (/obj/structure/table/rack,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/suit/storage/hazardvest,/obj/item/weapon/storage/box/lights/mixed,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/maintenance/medbay_aft) +"cjk" = (/obj/structure/table/rack,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/suit/storage/hazardvest,/obj/item/storage/box/lights/mixed,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/maintenance/medbay_aft) "cjl" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,/obj/machinery/light,/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) -"cjm" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/weapon/tool/wrench,/obj/random/medical/lite,/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) -"cjn" = (/obj/structure/closet/crate/medical,/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/weapon/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/weapon/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/weapon/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/weapon/storage/firstaid/adv{pixel_x = -2},/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) +"cjm" = (/obj/structure/table/standard,/obj/item/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/tool/wrench,/obj/random/medical/lite,/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) +"cjn" = (/obj/structure/closet/crate/medical,/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/storage/firstaid/toxin,/obj/item/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/storage/firstaid/adv{pixel_x = -2},/obj/item/reagent_containers/blood/empty,/obj/item/reagent_containers/blood/empty,/obj/item/reagent_containers/blood/empty,/obj/item/reagent_containers/blood/empty,/obj/item/reagent_containers/blood/empty,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) "cjo" = (/obj/machinery/sleeper{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) "cjp" = (/obj/machinery/sleep_console,/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) "cjq" = (/obj/structure/bed/chair{dir = 1},/obj/machinery/light,/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) -"cjr" = (/obj/structure/bed/chair{dir = 1},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) +"cjr" = (/obj/structure/bed/chair{dir = 1},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) "cjs" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) "cjt" = (/turf/simulated/wall,/area/quartermaster/office) "cju" = (/obj/structure/reagent_dispensers/fueltank,/obj/effect/floor_decal/corner/brown/full,/turf/simulated/floor/tiled,/area/quartermaster/miningdock) @@ -5899,7 +5899,7 @@ "cjw" = (/obj/effect/floor_decal/corner/brown{dir = 8},/obj/machinery/camera/network/cargo{c_tag = "CRG - Mining Dock"; dir = 1; name = "security camera"},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) "cjx" = (/obj/structure/closet/secure_closet/miner,/obj/effect/floor_decal/corner/brown,/turf/simulated/floor/tiled,/area/quartermaster/miningdock) "cjy" = (/obj/structure/closet/secure_closet/miner,/obj/effect/floor_decal/corner/brown{dir = 10},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) -"cjz" = (/obj/structure/table/rack{dir = 1},/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/item/weapon/storage/belt/utility,/obj/effect/floor_decal/corner/brown/full{dir = 4},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) +"cjz" = (/obj/structure/table/rack{dir = 1},/obj/item/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/item/storage/belt/utility,/obj/effect/floor_decal/corner/brown/full{dir = 4},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) "cjA" = (/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/quartermaster/delivery) "cjB" = (/obj/machinery/disposal/deliveryChute,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor,/area/quartermaster/delivery) "cjC" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/engineering{name = "Cargo Substation"; req_one_access = list(11,24,50)},/obj/machinery/door/firedoor,/turf/simulated/floor,/area/maintenance/substation/cargo) @@ -5907,12 +5907,12 @@ "cjE" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/engineering{name = "Cargo Substation"; req_one_access = list(11,24,50)},/obj/machinery/door/firedoor,/turf/simulated/floor,/area/maintenance/substation/cargo) "cjF" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 0},/turf/simulated/wall,/area/maintenance/substation/cargo) "cjG" = (/obj/effect/decal/cleanable/generic,/obj/structure/table/rack,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/cargo) -"cjH" = (/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/floor,/area/maintenance/cargo) +"cjH" = (/obj/item/material/shard{icon_state = "medium"},/turf/simulated/floor,/area/maintenance/cargo) "cjI" = (/turf/simulated/floor,/area/maintenance/cargo) "cjJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/cargo) -"cjK" = (/obj/structure/closet/crate,/obj/item/weapon/tank/emergency/oxygen/engi,/obj/item/weapon/tank/emergency/oxygen/double,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/cargo) +"cjK" = (/obj/structure/closet/crate,/obj/item/tank/emergency/oxygen/engi,/obj/item/tank/emergency/oxygen/double,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/cargo) "cjL" = (/obj/structure/closet/emcloset,/turf/simulated/floor,/area/maintenance/cargo) -"cjM" = (/obj/structure/table/rack,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/mask/gas,/obj/item/device/flashlight,/obj/item/clothing/glasses/meson,/obj/random/maintenance/cargo,/turf/simulated/floor,/area/maintenance/cargo) +"cjM" = (/obj/structure/table/rack,/obj/item/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/mask/gas,/obj/item/flashlight,/obj/item/clothing/glasses/meson,/obj/random/maintenance/cargo,/turf/simulated/floor,/area/maintenance/cargo) "cjN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/maintenance/cargo) "cjO" = (/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{dir = 8; icon_state = "map"},/obj/machinery/meter,/obj/effect/floor_decal/industrial/warning{dir = 9},/turf/simulated/floor,/area/maintenance/cargo) "cjP" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 10; icon_state = "intact"},/obj/effect/floor_decal/industrial/warning{dir = 5},/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor,/area/maintenance/cargo) @@ -5930,7 +5930,7 @@ "ckb" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "ckc" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "ckd" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_two) -"cke" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two) +"cke" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two) "ckf" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/medical_emergency_hallway) "ckg" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/hallway/secondary/medical_emergency_hallway) "ckh" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/medical_emergency_hallway) @@ -5940,21 +5940,21 @@ "ckl" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/miningdock) "ckm" = (/obj/machinery/door/airlock/mining{id_tag = "cargodoor"; name = "Mining Dock"; req_access = list(50)},/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/quartermaster/miningdock) "ckn" = (/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/quartermaster/delivery) -"cko" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/quartermaster/delivery) +"cko" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/quartermaster/delivery) "ckp" = (/obj/machinery/conveyor{dir = 1; id = "packageSort1"},/turf/simulated/floor,/area/quartermaster/delivery) "ckq" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/maintenance/substation/cargo) "ckr" = (/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/turf/simulated/floor,/area/maintenance/substation/cargo) "cks" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor,/area/maintenance/substation/cargo) "ckt" = (/turf/simulated/wall,/area/storage/primary) "cku" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{req_access = list(12)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/storage/primary) -"ckv" = (/obj/structure/closet/crate,/obj/item/clothing/mask/gas,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/cargo) +"ckv" = (/obj/structure/closet/crate,/obj/item/clothing/mask/gas,/obj/item/flashlight,/obj/item/flashlight,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/cargo) "ckw" = (/obj/machinery/atmospherics/pipe/tank/air{dir = 1; start_pressure = 740},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor,/area/maintenance/cargo) "ckx" = (/obj/machinery/atmospherics/pipe/tank/air{dir = 1; start_pressure = 740},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor,/area/maintenance/cargo) -"cky" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/item/device/multitool,/obj/item/clothing/glasses/meson,/obj/machinery/ai_status_display{pixel_x = -32; pixel_y = 0},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/storage/tech) -"ckz" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/item/clothing/gloves/yellow,/obj/item/device/t_scanner,/obj/item/clothing/glasses/meson,/obj/item/device/multitool,/turf/simulated/floor/plating,/area/storage/tech) -"ckA" = (/obj/item/device/flashlight{pixel_x = 1; pixel_y = 5},/obj/item/device/flashlight{pixel_x = 1; pixel_y = 5},/obj/item/device/flash,/obj/item/device/flash,/obj/structure/table/steel,/obj/machinery/camera/network/engineering{c_tag = "ENG - Technical Storage"; dir = 2},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/plating,/area/storage/tech) -"ckB" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/device/analyzer/plant_analyzer,/obj/item/device/healthanalyzer,/obj/item/device/analyzer,/obj/item/device/analyzer,/turf/simulated/floor/plating,/area/storage/tech) -"ckC" = (/obj/machinery/status_display{layer = 4; pixel_x = 32; pixel_y = 0},/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/stock_parts/matter_bin,/obj/item/weapon/stock_parts/matter_bin,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/console_screen,/obj/item/weapon/circuitboard/autolathe,/obj/machinery/light/small{dir = 1},/turf/simulated/floor,/area/storage/tech) +"cky" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/item/multitool,/obj/item/clothing/glasses/meson,/obj/machinery/ai_status_display{pixel_x = -32; pixel_y = 0},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/storage/tech) +"ckz" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/item/clothing/gloves/yellow,/obj/item/t_scanner,/obj/item/clothing/glasses/meson,/obj/item/multitool,/turf/simulated/floor/plating,/area/storage/tech) +"ckA" = (/obj/item/flashlight{pixel_x = 1; pixel_y = 5},/obj/item/flashlight{pixel_x = 1; pixel_y = 5},/obj/item/flash,/obj/item/flash,/obj/structure/table/steel,/obj/machinery/camera/network/engineering{c_tag = "ENG - Technical Storage"; dir = 2},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/plating,/area/storage/tech) +"ckB" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/analyzer/plant_analyzer,/obj/item/healthanalyzer,/obj/item/analyzer,/obj/item/analyzer,/turf/simulated/floor/plating,/area/storage/tech) +"ckC" = (/obj/machinery/status_display{layer = 4; pixel_x = 32; pixel_y = 0},/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/stock_parts/matter_bin,/obj/item/stock_parts/matter_bin,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/console_screen,/obj/item/circuitboard/autolathe,/obj/machinery/light/small{dir = 1},/turf/simulated/floor,/area/storage/tech) "ckD" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "ckE" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 32},/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored/upper_level) "ckF" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) @@ -5966,7 +5966,7 @@ "ckL" = (/obj/effect/floor_decal/corner/brown/full{dir = 8},/obj/machinery/status_display/supply_display{pixel_y = 32},/turf/simulated/floor/tiled,/area/quartermaster/office) "ckM" = (/obj/effect/floor_decal/corner/brown{dir = 1},/turf/simulated/floor/tiled,/area/quartermaster/office) "ckN" = (/turf/simulated/floor/tiled,/area/quartermaster/office) -"ckO" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/quartermaster/office) +"ckO" = (/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/quartermaster/office) "ckP" = (/obj/machinery/door/airlock/glass_mining{id_tag = "cargodoor"; name = "Cargo Office"; req_access = list(50)},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/quartermaster/office) "ckQ" = (/obj/effect/floor_decal/corner/brown{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/quartermaster/miningdock) "ckR" = (/obj/effect/floor_decal/corner/brown{dir = 1},/turf/simulated/floor/tiled,/area/quartermaster/miningdock) @@ -5986,14 +5986,14 @@ "clf" = (/obj/structure/table/standard,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/machinery/requests_console{department = "Tool Storage"; departmentType = 0; pixel_y = 30},/turf/simulated/floor/tiled,/area/storage/primary) "clg" = (/obj/machinery/camera/network/civilian{c_tag = "CIV - Primary Tool Storage"; dir = 2},/turf/simulated/floor/tiled,/area/storage/primary) "clh" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/storage/primary) -"cli" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/storage/primary) +"cli" = (/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/storage/primary) "clj" = (/obj/structure/table/standard,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/tiled,/area/storage/primary) "clk" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/storage/tech) "cll" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/storage/tech) "clm" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/storage/tech) -"cln" = (/obj/item/weapon/module/power_control,/obj/item/weapon/airlock_electronics,/obj/structure/table/steel,/turf/simulated/floor/plating,/area/storage/tech) +"cln" = (/obj/item/module/power_control,/obj/item/airlock_electronics,/obj/structure/table/steel,/turf/simulated/floor/plating,/area/storage/tech) "clo" = (/turf/simulated/floor,/area/storage/tech) -"clp" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/structure/sign/directions/security{dir = 1; pixel_x = -32; pixel_y = 0},/obj/structure/sign/directions/science{dir = 1; pixel_x = -32; pixel_z = -8},/obj/structure/sign/directions/evac{dir = 4; pixel_x = -32; pixel_z = 8},/obj/machinery/camera/network/northern_star{c_tag = "Hall - Central Primary Port Aft 2"; dir = 4},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_four) +"clp" = (/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/structure/sign/directions/security{dir = 1; pixel_x = -32; pixel_y = 0},/obj/structure/sign/directions/science{dir = 1; pixel_x = -32; pixel_z = -8},/obj/structure/sign/directions/evac{dir = 4; pixel_x = -32; pixel_z = 8},/obj/machinery/camera/network/northern_star{c_tag = "Hall - Central Primary Port Aft 2"; dir = 4},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_four) "clq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/primary/central_three) "clr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/primary/central_three) "cls" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/primary/central_three) @@ -6019,25 +6019,25 @@ "clM" = (/turf/simulated/floor/tiled,/area/quartermaster/delivery) "clN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/quartermaster/delivery) "clO" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/delivery) -"clP" = (/obj/item/weapon/stool,/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/floor/tiled,/area/quartermaster/delivery) +"clP" = (/obj/item/stool,/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/floor/tiled,/area/quartermaster/delivery) "clQ" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green,/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/power/sensor{name = "Powernet Sensor - Cargo Subgrid"; name_tag = "Cargo Subgrid"},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor,/area/maintenance/substation/cargo) "clR" = (/obj/machinery/power/smes/buildable{charge = 0; RCon_tag = "Substation - Cargo"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/maintenance/substation/cargo) "clS" = (/obj/machinery/power/breakerbox/activated{RCon_tag = "Cargo Substation Bypass"},/turf/simulated/floor/plating,/area/maintenance/substation/cargo) "clT" = (/obj/structure/table/standard,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled,/area/storage/primary) "clU" = (/turf/simulated/floor/tiled,/area/storage/primary) -"clV" = (/obj/item/weapon/stool,/obj/effect/landmark/start{name = "Assistant"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/storage/primary) +"clV" = (/obj/item/stool,/obj/effect/landmark/start{name = "Assistant"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/storage/primary) "clW" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/storage/primary) "clX" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/storage/primary) "clY" = (/obj/machinery/lapvend,/turf/simulated/floor/tiled,/area/storage/primary) "clZ" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green,/turf/simulated/floor/plating,/area/storage/tech) -"cma" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/borgupload{pixel_x = -1; pixel_y = 1},/obj/item/weapon/circuitboard/aiupload{pixel_x = 2; pixel_y = -2},/turf/simulated/floor/tiled/dark,/area/storage/tech) +"cma" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/circuitboard/borgupload{pixel_x = -1; pixel_y = 1},/obj/item/circuitboard/aiupload{pixel_x = 2; pixel_y = -2},/turf/simulated/floor/tiled/dark,/area/storage/tech) "cmb" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/machinery/camera/network/engineering{c_tag = "ENG - Secure Technical Storage"; dir = 2},/turf/simulated/floor/tiled/dark,/area/storage/tech) "cmc" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall/r_wall,/area/storage/tech) -"cmd" = (/obj/item/device/aicard,/obj/item/weapon/aiModule/reset,/obj/structure/table/steel,/turf/simulated/floor/plating,/area/storage/tech) +"cmd" = (/obj/item/aicard,/obj/item/aiModule/reset,/obj/structure/table/steel,/turf/simulated/floor/plating,/area/storage/tech) "cme" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor,/area/storage/tech) -"cmf" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/cloning{pixel_x = 0},/obj/item/weapon/circuitboard/clonescanner,/obj/item/weapon/circuitboard/clonepod,/obj/item/weapon/circuitboard/scan_consolenew,/obj/item/weapon/circuitboard/med_data{pixel_x = 3; pixel_y = -3},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/plating,/area/storage/tech) +"cmf" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/circuitboard/cloning{pixel_x = 0},/obj/item/circuitboard/clonescanner,/obj/item/circuitboard/clonepod,/obj/item/circuitboard/scan_consolenew,/obj/item/circuitboard/med_data{pixel_x = 3; pixel_y = -3},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/plating,/area/storage/tech) "cmg" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor,/area/storage/tech) -"cmh" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/rdconsole,/obj/item/weapon/circuitboard/destructive_analyzer,/obj/item/weapon/circuitboard/protolathe,/obj/item/weapon/circuitboard/rdserver{pixel_x = 3; pixel_y = -3},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plating,/area/storage/tech) +"cmh" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/circuitboard/rdconsole,/obj/item/circuitboard/destructive_analyzer,/obj/item/circuitboard/protolathe,/obj/item/circuitboard/rdserver{pixel_x = 3; pixel_y = -3},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plating,/area/storage/tech) "cmi" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor,/area/storage/tech) "cmj" = (/obj/machinery/requests_console{department = "Tech storage"; pixel_x = 28; pixel_y = 0},/turf/simulated/floor,/area/storage/tech) "cmk" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) @@ -6052,12 +6052,12 @@ "cmt" = (/obj/machinery/camera/network/northern_star{c_tag = "Hall - Central Primary Aft Port 2"; dir = 2},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "cmu" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "cmv" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) -"cmw" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) +"cmw" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "cmx" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "cmy" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "cmz" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "cmA" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_three) -"cmB" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) +"cmB" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "cmC" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "cmD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "cmE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) @@ -6068,17 +6068,17 @@ "cmJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "cmK" = (/obj/structure/flora/pottedplant{icon_state = "plant-01"},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_three) "cmL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/primary/central_three) -"cmM" = (/obj/structure/safe,/obj/item/clothing/under/color/yellow,/obj/item/key,/obj/item/toy/katana,/obj/item/weapon/melee/chainofcommand,/obj/item/weapon/disk/nuclear{name = "authentication disk"},/obj/item/weapon/moneybag/vault,/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) +"cmM" = (/obj/structure/safe,/obj/item/clothing/under/color/yellow,/obj/item/key,/obj/item/toy/katana,/obj/item/melee/chainofcommand,/obj/item/disk/nuclear{name = "authentication disk"},/obj/item/moneybag/vault,/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) "cmN" = (/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) "cmO" = (/obj/effect/landmark{name = "blobstart"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) "cmP" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) "cmQ" = (/obj/structure/filingcabinet/security{name = "Security Records"},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) -"cmR" = (/obj/structure/table/standard,/obj/item/weapon/material/ashtray/glass,/obj/effect/floor_decal/corner/brown{dir = 9},/obj/machinery/newscaster{pixel_x = -28; pixel_y = 0},/obj/item/weapon/deck/cards,/turf/simulated/floor/tiled,/area/quartermaster/office) +"cmR" = (/obj/structure/table/standard,/obj/item/material/ashtray/glass,/obj/effect/floor_decal/corner/brown{dir = 9},/obj/machinery/newscaster{pixel_x = -28; pixel_y = 0},/obj/item/deck/cards,/turf/simulated/floor/tiled,/area/quartermaster/office) "cmS" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/quartermaster/office) -"cmT" = (/obj/item/weapon/stamp/denied{pixel_x = 4; pixel_y = -2},/obj/structure/table/standard,/obj/effect/floor_decal/corner/brown,/obj/item/weapon/stamp/cargo,/turf/simulated/floor/tiled,/area/quartermaster/office) +"cmT" = (/obj/item/stamp/denied{pixel_x = 4; pixel_y = -2},/obj/structure/table/standard,/obj/effect/floor_decal/corner/brown,/obj/item/stamp/cargo,/turf/simulated/floor/tiled,/area/quartermaster/office) "cmU" = (/obj/structure/sign/poster{pixel_x = 0; pixel_y = 0},/turf/simulated/wall,/area/quartermaster/office) "cmV" = (/obj/machinery/door/airlock/glass_mining{id_tag = "cargodoor"; name = "Cargo Office"; req_access = list(50)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/quartermaster/miningdock) -"cmW" = (/obj/structure/table/steel,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/effect/floor_decal/corner/brown{dir = 8},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/tiled,/area/quartermaster/delivery) +"cmW" = (/obj/structure/table/steel,/obj/item/storage/box,/obj/item/storage/box,/obj/effect/floor_decal/corner/brown{dir = 8},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/tiled,/area/quartermaster/delivery) "cmX" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/quartermaster/delivery) "cmY" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/quartermaster/delivery) "cmZ" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/delivery) @@ -6089,13 +6089,13 @@ "cne" = (/turf/simulated/wall,/area/storage/emergency_storage/emergency6) "cnf" = (/turf/simulated/wall,/area/medical/first_aid_station) "cng" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green,/turf/simulated/floor/plating,/area/storage/tech) -"cnh" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/crew{pixel_x = -1; pixel_y = 1},/obj/item/weapon/circuitboard/card{pixel_x = 2; pixel_y = -2},/obj/item/weapon/circuitboard/communications{pixel_x = 5; pixel_y = -5},/obj/machinery/light/small{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/storage/tech) +"cnh" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/circuitboard/crew{pixel_x = -1; pixel_y = 1},/obj/item/circuitboard/card{pixel_x = 2; pixel_y = -2},/obj/item/circuitboard/communications{pixel_x = 5; pixel_y = -5},/obj/machinery/light/small{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/storage/tech) "cni" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/storage/tech) "cnj" = (/obj/machinery/door/airlock/highsecurity{name = "Secure Tech Storage"; req_access = list(19,23)},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/storage/tech) "cnk" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/storage/tech) -"cnl" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/secure_data{pixel_x = -2; pixel_y = 2},/obj/item/weapon/circuitboard/security{pixel_x = 1; pixel_y = -1},/obj/item/weapon/circuitboard/skills{pixel_x = 4; pixel_y = -3},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/storage/tech) +"cnl" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/circuitboard/secure_data{pixel_x = -2; pixel_y = 2},/obj/item/circuitboard/security{pixel_x = 1; pixel_y = -1},/obj/item/circuitboard/skills{pixel_x = 4; pixel_y = -3},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/storage/tech) "cnm" = (/obj/machinery/hologram/holopad,/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/storage/tech) -"cnn" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/security/mining,/obj/item/weapon/circuitboard/autolathe{pixel_x = 3; pixel_y = -3},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/storage/tech) +"cnn" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/circuitboard/security/mining,/obj/item/circuitboard/autolathe{pixel_x = 3; pixel_y = -3},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/storage/tech) "cno" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/storage/tech) "cnp" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/navbeacon/patrol{next_patrol = "CH11"; location = "CH10"},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "cnq" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{name = "Central Access"},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) @@ -6118,7 +6118,7 @@ "cnH" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/navbeacon/patrol{next_patrol = "CH8"; location = "CH7"},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "cnI" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "cnJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) -"cnK" = (/obj/machinery/camera/network/northern_star{c_tag = "Hall - Central Primary Aft Starboard 3"; dir = 8},/obj/structure/table/glass,/obj/item/weapon/dice,/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_three) +"cnK" = (/obj/machinery/camera/network/northern_star{c_tag = "Hall - Central Primary Aft Starboard 3"; dir = 8},/obj/structure/table/glass,/obj/item/dice,/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_three) "cnL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/primary/central_three) "cnM" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) "cnN" = (/obj/structure/filingcabinet/medical{desc = "A large cabinet with hard copy medical records."; name = "Medical Records"},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) @@ -6126,14 +6126,14 @@ "cnP" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/office) "cnQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled,/area/quartermaster/office) "cnR" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/quartermaster/office) -"cnS" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/clipboard,/obj/item/weapon/pen/red{pixel_x = 2; pixel_y = 6},/obj/structure/table/standard,/obj/effect/floor_decal/corner/brown{dir = 6},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/office) +"cnS" = (/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/clipboard,/obj/item/pen/red{pixel_x = 2; pixel_y = 6},/obj/structure/table/standard,/obj/effect/floor_decal/corner/brown{dir = 6},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/office) "cnT" = (/obj/machinery/computer/supplycomp,/turf/simulated/floor/tiled,/area/quartermaster/foyer) "cnU" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/flora/pottedplant,/turf/simulated/floor/tiled,/area/quartermaster/foyer) "cnV" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/quartermaster/foyer) "cnW" = (/obj/effect/floor_decal/corner/brown{dir = 4},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/tiled,/area/quartermaster/foyer) "cnX" = (/obj/structure/bed/chair{dir = 8},/obj/effect/floor_decal/corner/brown/full{dir = 1},/turf/simulated/floor/tiled,/area/quartermaster/foyer) "cnY" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/delivery) -"cnZ" = (/obj/structure/table/steel,/obj/item/weapon/wrapping_paper,/obj/item/weapon/wrapping_paper,/obj/item/weapon/wrapping_paper,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/obj/effect/floor_decal/corner/brown{dir = 9},/obj/machinery/camera/network/cargo{c_tag = "CRG - Delivery Office"; dir = 4; name = "security camera"},/turf/simulated/floor/tiled,/area/quartermaster/delivery) +"cnZ" = (/obj/structure/table/steel,/obj/item/wrapping_paper,/obj/item/wrapping_paper,/obj/item/wrapping_paper,/obj/item/destTagger{pixel_x = 4; pixel_y = 3},/obj/effect/floor_decal/corner/brown{dir = 9},/obj/machinery/camera/network/cargo{c_tag = "CRG - Delivery Office"; dir = 4; name = "security camera"},/turf/simulated/floor/tiled,/area/quartermaster/delivery) "coa" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/delivery) "cob" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled,/area/quartermaster/delivery) "coc" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/quartermaster/delivery) @@ -6142,20 +6142,20 @@ "cof" = (/obj/structure/table/standard,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/machinery/cell_charger,/turf/simulated/floor/tiled,/area/storage/primary) "cog" = (/obj/machinery/vending/tool,/turf/simulated/floor/tiled,/area/storage/primary) "coh" = (/obj/machinery/floodlight,/turf/simulated/floor,/area/storage/emergency_storage/emergency6) -"coi" = (/obj/structure/table/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency6) +"coi" = (/obj/structure/table/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency6) "coj" = (/obj/machinery/portable_atmospherics/powered/pump/filled,/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency6) -"cok" = (/obj/structure/closet/wardrobe/grey,/obj/item/weapon/storage/backpack,/obj/item/weapon/storage/backpack,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/cargo) -"col" = (/obj/structure/table/rack,/obj/item/bodybag/cryobag,/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/obj/item/weapon/storage/toolbox/emergency,/obj/item/weapon/storage/firstaid/regular,/obj/random/medical/lite,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station) +"cok" = (/obj/structure/closet/wardrobe/grey,/obj/item/storage/backpack,/obj/item/storage/backpack,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/cargo) +"col" = (/obj/structure/table/rack,/obj/item/bodybag/cryobag,/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/obj/item/storage/toolbox/emergency,/obj/item/storage/firstaid/regular,/obj/random/medical/lite,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station) "com" = (/obj/machinery/sleep_console{dir = 4},/obj/machinery/alarm{pixel_y = 23},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station) "con" = (/obj/machinery/sleeper{dir = 4},/obj/effect/floor_decal/corner/paleblue/full{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station) -"coo" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/robotics{pixel_x = -2; pixel_y = 2},/obj/item/weapon/circuitboard/mecha_control{pixel_x = 1; pixel_y = -1},/turf/simulated/floor/tiled/dark,/area/storage/tech) +"coo" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/circuitboard/robotics{pixel_x = -2; pixel_y = 2},/obj/item/circuitboard/mecha_control{pixel_x = 1; pixel_y = -1},/turf/simulated/floor/tiled/dark,/area/storage/tech) "cop" = (/turf/simulated/floor/tiled/dark,/area/storage/tech) "coq" = (/obj/structure/sign/securearea,/turf/simulated/wall/r_wall,/area/storage/tech) -"cor" = (/obj/structure/table/steel,/obj/item/device/integrated_electronics/debugger{pixel_x = -5; pixel_y = 0},/obj/item/device/integrated_electronics/wirer{pixel_x = 5; pixel_y = 0},/turf/simulated/floor/plating,/area/storage/tech) -"cos" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/powermonitor{pixel_x = -2; pixel_y = 2},/obj/item/weapon/circuitboard/stationalert_engineering{pixel_x = 1; pixel_y = -1},/obj/item/weapon/circuitboard/security/engineering,/obj/item/weapon/circuitboard/atmos_alert{pixel_x = 3; pixel_y = -3},/turf/simulated/floor/plating,/area/storage/tech) +"cor" = (/obj/structure/table/steel,/obj/item/integrated_electronics/debugger{pixel_x = -5; pixel_y = 0},/obj/item/integrated_electronics/wirer{pixel_x = 5; pixel_y = 0},/turf/simulated/floor/plating,/area/storage/tech) +"cos" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/circuitboard/powermonitor{pixel_x = -2; pixel_y = 2},/obj/item/circuitboard/stationalert_engineering{pixel_x = 1; pixel_y = -1},/obj/item/circuitboard/security/engineering,/obj/item/circuitboard/atmos_alert{pixel_x = 3; pixel_y = -3},/turf/simulated/floor/plating,/area/storage/tech) "cot" = (/obj/effect/landmark{name = "blobstart"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/storage/tech) -"cou" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/arcade,/obj/item/weapon/circuitboard/message_monitor{pixel_x = 3; pixel_y = -3},/turf/simulated/floor/plating,/area/storage/tech) -"cov" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/unary_atmos/heater,/obj/item/weapon/circuitboard/unary_atmos/cooler{pixel_x = 3; pixel_y = -3},/turf/simulated/floor/plating,/area/storage/tech) +"cou" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/circuitboard/arcade,/obj/item/circuitboard/message_monitor{pixel_x = 3; pixel_y = -3},/turf/simulated/floor/plating,/area/storage/tech) +"cov" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/circuitboard/unary_atmos/heater,/obj/item/circuitboard/unary_atmos/cooler{pixel_x = 3; pixel_y = -3},/turf/simulated/floor/plating,/area/storage/tech) "cow" = (/obj/machinery/door/airlock/glass{name = "Central Access"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "cox" = (/obj/machinery/light,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "coy" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) @@ -6187,7 +6187,7 @@ "coY" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/mob/living/simple_mob/animal/passive/mouse/brown/Tom,/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) "coZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) "cpa" = (/obj/machinery/camera/network/command{c_tag = "COM - Vault"; dir = 9},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) -"cpb" = (/obj/structure/closet/crate,/obj/item/clothing/mask/gas,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/maintenance/medbay_aft) +"cpb" = (/obj/structure/closet/crate,/obj/item/clothing/mask/gas,/obj/item/flashlight,/obj/item/flashlight,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/maintenance/medbay_aft) "cpc" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/obj/effect/floor_decal/corner/brown{dir = 9},/turf/simulated/floor/tiled,/area/quartermaster/office) "cpd" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/office) "cpe" = (/obj/structure/disposalpipe/sortjunction/flipped{dir = 1; sortType = "Cargo Bay"; name = "Cargo Bay"},/turf/simulated/floor/tiled,/area/quartermaster/office) @@ -6198,13 +6198,13 @@ "cpj" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/quartermaster/foyer) "cpk" = (/obj/structure/bed/chair{dir = 8},/obj/effect/floor_decal/corner/brown{dir = 6},/turf/simulated/floor/tiled,/area/quartermaster/foyer) "cpl" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/delivery) -"cpm" = (/obj/structure/table/steel,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/effect/floor_decal/corner/brown{dir = 9},/obj/item/weapon/material/butterfly/boxcutter,/turf/simulated/floor/tiled,/area/quartermaster/delivery) +"cpm" = (/obj/structure/table/steel,/obj/item/packageWrap,/obj/item/packageWrap,/obj/item/packageWrap,/obj/item/packageWrap,/obj/item/packageWrap,/obj/effect/floor_decal/corner/brown{dir = 9},/obj/item/material/butterfly/boxcutter,/turf/simulated/floor/tiled,/area/quartermaster/delivery) "cpn" = (/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = 30; pixel_y = -1},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/delivery) "cpo" = (/obj/machinery/conveyor{dir = 1; id = "packageSort1"},/obj/structure/plasticflaps/mining,/turf/simulated/floor/plating,/area/quartermaster/delivery) "cpp" = (/obj/structure/table/standard,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/machinery/newscaster{pixel_x = -30},/turf/simulated/floor/tiled,/area/storage/primary) "cpq" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/storage/primary) "cpr" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/storage/primary) -"cps" = (/obj/item/weapon/stool,/obj/effect/landmark/start{name = "Assistant"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/storage/primary) +"cps" = (/obj/item/stool,/obj/effect/landmark/start{name = "Assistant"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/storage/primary) "cpt" = (/obj/structure/table/standard,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/storage/primary) "cpu" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor,/area/storage/emergency_storage/emergency6) "cpv" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/storage/emergency_storage/emergency6) @@ -6213,14 +6213,14 @@ "cpy" = (/obj/structure/extinguisher_cabinet{pixel_x = -27},/obj/effect/floor_decal/corner/paleblue/full,/obj/machinery/light,/obj/structure/bed/roller,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station) "cpz" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/effect/floor_decal/corner/paleblue{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station) "cpA" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/effect/floor_decal/corner/paleblue{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station) -"cpB" = (/obj/structure/bed/chair/office/light,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/effect/floor_decal/corner/paleblue/full{dir = 1},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/newscaster{pixel_x = 28; pixel_y = 1},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station) +"cpB" = (/obj/structure/bed/chair/office/light,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/effect/floor_decal/corner/paleblue/full{dir = 1},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/newscaster{pixel_x = 28; pixel_y = 1},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station) "cpC" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/storage/tech) "cpD" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/storage/tech) -"cpE" = (/obj/structure/table/steel,/obj/item/weapon/storage/bag/circuits/basic,/turf/simulated/floor/plating,/area/storage/tech) +"cpE" = (/obj/structure/table/steel,/obj/item/storage/bag/circuits/basic,/turf/simulated/floor/plating,/area/storage/tech) "cpF" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/storage/tech) -"cpG" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/matter_bin,/obj/item/weapon/stock_parts/matter_bin,/obj/item/weapon/stock_parts/capacitor,/obj/item/weapon/stock_parts/capacitor,/turf/simulated/floor/plating,/area/storage/tech) +"cpG" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/stock_parts/manipulator,/obj/item/stock_parts/matter_bin,/obj/item/stock_parts/matter_bin,/obj/item/stock_parts/capacitor,/obj/item/stock_parts/capacitor,/turf/simulated/floor/plating,/area/storage/tech) "cpH" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/sign/directions/engineering{dir = 2; pixel_x = -32; pixel_z = -8},/obj/structure/sign/directions/medical{dir = 4; pixel_x = -32; pixel_y = 0},/obj/structure/sign/directions/cargo{dir = 2; pixel_x = -32; pixel_z = 8},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_four) -"cpI" = (/obj/machinery/newscaster{pixel_x = 28; pixel_y = 1},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_four) +"cpI" = (/obj/machinery/newscaster{pixel_x = 28; pixel_y = 1},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_four) "cpJ" = (/turf/simulated/wall,/area/crew_quarters/sleep/elevator) "cpK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/crew_quarters/sleep/elevator) "cpL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/sleep/elevator) @@ -6230,15 +6230,15 @@ "cpP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/crew_quarters/sleep/elevator) "cpQ" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_three) "cpR" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) -"cpS" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_three) +"cpS" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_three) "cpT" = (/obj/machinery/door/airlock/glass{name = "Construction Area"; req_access = list(32)},/turf/simulated/floor/plating,/area/hallway/primary/central_three) "cpU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/hallway/primary/central_three) "cpV" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_three) -"cpW" = (/obj/structure/sign/directions/medical{dir = 1; pixel_x = 32; pixel_y = 0},/obj/structure/sign/directions/cargo{dir = 8; pixel_x = 32; pixel_z = 8},/obj/structure/sign/directions/engineering{dir = 8; pixel_x = 32; pixel_z = -8},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_three) -"cpX" = (/obj/item/weapon/coin/silver{pixel_x = 7; pixel_y = 12},/obj/item/weapon/coin/silver{pixel_x = 12; pixel_y = 7},/obj/item/weapon/coin/silver{pixel_x = 4; pixel_y = 8},/obj/item/weapon/coin/silver{pixel_x = -6; pixel_y = 5},/obj/item/weapon/coin/silver{pixel_x = 5; pixel_y = -8},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/closet/crate/secure{name = "Silver Crate"; req_access = list(19)},/obj/item/weapon/coin/silver{pixel_x = 4; pixel_y = 8},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) +"cpW" = (/obj/structure/sign/directions/medical{dir = 1; pixel_x = 32; pixel_y = 0},/obj/structure/sign/directions/cargo{dir = 8; pixel_x = 32; pixel_z = 8},/obj/structure/sign/directions/engineering{dir = 8; pixel_x = 32; pixel_z = -8},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_three) +"cpX" = (/obj/item/coin/silver{pixel_x = 7; pixel_y = 12},/obj/item/coin/silver{pixel_x = 12; pixel_y = 7},/obj/item/coin/silver{pixel_x = 4; pixel_y = 8},/obj/item/coin/silver{pixel_x = -6; pixel_y = 5},/obj/item/coin/silver{pixel_x = 5; pixel_y = -8},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/closet/crate/secure{name = "Silver Crate"; req_access = list(19)},/obj/item/coin/silver{pixel_x = 4; pixel_y = 8},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) "cpY" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) -"cpZ" = (/obj/item/weapon/coin/gold,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/gold,/obj/structure/closet/crate/secure{name = "Gold Crate"; req_access = list(19)},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) -"cqa" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/extinguisher,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/maintenance/medbay_aft) +"cpZ" = (/obj/item/coin/gold,/obj/item/coin/gold,/obj/item/coin/gold,/obj/item/coin/gold,/obj/item/coin/gold,/obj/item/coin/gold,/obj/structure/closet/crate/secure{name = "Gold Crate"; req_access = list(19)},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) +"cqa" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/tank/oxygen,/obj/item/tank/oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/flashlight,/obj/item/flashlight,/obj/item/storage/box/lights/mixed,/obj/item/extinguisher,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/maintenance/medbay_aft) "cqb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor,/area/maintenance/medbay_aft) "cqc" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/maintenance/medbay_aft) "cqd" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor,/area/maintenance/medbay_aft) @@ -6255,7 +6255,7 @@ "cqo" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/foyer) "cqp" = (/obj/structure/bed/chair{dir = 8},/obj/effect/floor_decal/corner/brown{dir = 6},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/foyer) "cqq" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/delivery) -"cqr" = (/obj/structure/table/steel,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/effect/floor_decal/corner/brown/full,/turf/simulated/floor/tiled,/area/quartermaster/delivery) +"cqr" = (/obj/structure/table/steel,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/effect/floor_decal/corner/brown/full,/turf/simulated/floor/tiled,/area/quartermaster/delivery) "cqs" = (/obj/structure/bed/chair,/obj/effect/landmark/start{name = "Cargo Technician"},/obj/effect/floor_decal/corner/brown{dir = 10},/turf/simulated/floor/tiled,/area/quartermaster/delivery) "cqt" = (/obj/structure/filingcabinet/filingcabinet,/obj/effect/floor_decal/corner/brown{dir = 8},/obj/machinery/light,/turf/simulated/floor/tiled,/area/quartermaster/delivery) "cqu" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/disposalpipe/segment,/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = 36; pixel_y = 0},/turf/simulated/floor/tiled,/area/quartermaster/delivery) @@ -6267,19 +6267,19 @@ "cqA" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/storage/primary) "cqB" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/storage/primary) "cqC" = (/obj/machinery/disposal,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -26},/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/tiled,/area/storage/primary) -"cqD" = (/obj/structure/table/standard,/obj/item/device/t_scanner,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency6) +"cqD" = (/obj/structure/table/standard,/obj/item/t_scanner,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency6) "cqE" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency6) "cqF" = (/turf/simulated/wall,/area/hallway/primary/port) "cqG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/airlock/maintenance{req_access = list(12)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/maintenance/cargo) "cqH" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/camera/network/medbay{c_tag = "MED - FA Station Port"; dir = 1},/obj/machinery/light_switch{pixel_x = -36; pixel_y = 0},/obj/effect/floor_decal/corner/paleblue{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station) "cqI" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station) -"cqJ" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_x = 25; pixel_y = 0},/obj/machinery/recharger,/obj/item/device/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/obj/item/device/defib_kit/loaded,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station) -"cqK" = (/obj/machinery/cell_charger{pixel_y = 5},/obj/item/device/multitool,/obj/structure/table/steel,/turf/simulated/floor/plating,/area/storage/tech) -"cqL" = (/obj/machinery/light/small,/obj/structure/table/steel,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/turf/simulated/floor,/area/storage/tech) +"cqJ" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_x = 25; pixel_y = 0},/obj/machinery/recharger,/obj/item/radio{frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link"},/obj/item/defib_kit/loaded,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station) +"cqK" = (/obj/machinery/cell_charger{pixel_y = 5},/obj/item/multitool,/obj/structure/table/steel,/turf/simulated/floor/plating,/area/storage/tech) +"cqL" = (/obj/machinery/light/small,/obj/structure/table/steel,/obj/item/cell/high{charge = 100; maxcharge = 15000},/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/turf/simulated/floor,/area/storage/tech) "cqM" = (/obj/machinery/light_switch{pixel_x = 0; pixel_y = -26},/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor,/area/storage/tech) "cqN" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/storage/tech) "cqO" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/turf/simulated/floor,/area/storage/tech) -"cqP" = (/obj/item/device/radio/intercom{layer = 4; name = "Station Intercom (General)"; pixel_y = -21},/obj/machinery/light/small,/turf/simulated/floor,/area/storage/tech) +"cqP" = (/obj/item/radio/intercom{layer = 4; name = "Station Intercom (General)"; pixel_y = -21},/obj/machinery/light/small,/turf/simulated/floor,/area/storage/tech) "cqQ" = (/obj/machinery/vending/assist,/turf/simulated/floor,/area/storage/tech) "cqR" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/glass{name = "Central Access"},/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "cqS" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{name = "Central Access"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/primary/central_four) @@ -6291,7 +6291,7 @@ "cqY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/sleep/elevator) "cqZ" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/sleep/elevator) "cra" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/crew_quarters/sleep/elevator) -"crb" = (/obj/machinery/newscaster{pixel_y = 32},/obj/machinery/firealarm{dir = 4; pixel_x = 26},/obj/structure/table/glass,/obj/item/weapon/book/codex/lore/vir,/turf/simulated/floor/tiled,/area/crew_quarters/sleep/elevator) +"crb" = (/obj/machinery/newscaster{pixel_y = 32},/obj/machinery/firealarm{dir = 4; pixel_x = 26},/obj/structure/table/glass,/obj/item/book/codex/lore/vir,/turf/simulated/floor/tiled,/area/crew_quarters/sleep/elevator) "crc" = (/obj/machinery/door/airlock/glass{name = "Central Access"},/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "crd" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{name = "Central Access"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "cre" = (/turf/simulated/wall,/area/vacant/vacant_shop) @@ -6300,15 +6300,15 @@ "crh" = (/obj/structure/table/rack{dir = 4},/turf/simulated/floor/tiled,/area/vacant/vacant_shop) "cri" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "crj" = (/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) -"crk" = (/obj/structure/closet/crate,/obj/item/stack/material/silver,/obj/item/stack/material/silver,/obj/item/stack/material/silver,/obj/item/stack/material/gold,/obj/item/stack/material/gold,/obj/item/stack/material/gold,/obj/item/weapon/storage/belt/champion,/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) -"crl" = (/obj/structure/closet/secure_closet/freezer/money,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/item/weapon/storage/secure/briefcase/money{desc = "An sleek tidy briefcase."; name = "secure briefcase"},/obj/structure/cable,/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) +"crk" = (/obj/structure/closet/crate,/obj/item/stack/material/silver,/obj/item/stack/material/silver,/obj/item/stack/material/silver,/obj/item/stack/material/gold,/obj/item/stack/material/gold,/obj/item/stack/material/gold,/obj/item/storage/belt/champion,/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) +"crl" = (/obj/structure/closet/secure_closet/freezer/money,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/item/storage/secure/briefcase/money{desc = "An sleek tidy briefcase."; name = "secure briefcase"},/obj/structure/cable,/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) "crm" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) "crn" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor,/area/maintenance/medbay_aft) "cro" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/medbay_aft) "crp" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor,/area/maintenance/medbay_aft) "crq" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/maintenance/medbay_aft) "crr" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor,/area/maintenance/medbay_aft) -"crs" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/brown{dir = 9},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/fiftyspawner/steel,/obj/fiftyspawner/glass,/obj/item/device/multitool,/turf/simulated/floor/tiled,/area/quartermaster/office) +"crs" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/brown{dir = 9},/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/fiftyspawner/steel,/obj/fiftyspawner/glass,/obj/item/multitool,/turf/simulated/floor/tiled,/area/quartermaster/office) "crt" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/office) "cru" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/turf/simulated/floor/tiled,/area/quartermaster/office) "crv" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/quartermaster/office) @@ -6318,7 +6318,7 @@ "crz" = (/obj/machinery/hologram/holopad,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/tiled,/area/quartermaster/foyer) "crA" = (/obj/structure/bed/chair{dir = 8},/obj/effect/floor_decal/corner/brown{dir = 4},/obj/machinery/firealarm{dir = 4; pixel_x = 26},/turf/simulated/floor/tiled,/area/quartermaster/foyer) "crB" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/delivery) -"crC" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/folder/yellow,/obj/item/weapon/pen{pixel_x = 4; pixel_y = 4},/obj/machinery/door/window/northright{name = "Mailing Room"; req_access = list(50)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/quartermaster/delivery) +"crC" = (/obj/structure/table/steel_reinforced,/obj/item/folder/yellow,/obj/item/pen{pixel_x = 4; pixel_y = 4},/obj/machinery/door/window/northright{name = "Mailing Room"; req_access = list(50)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/quartermaster/delivery) "crD" = (/obj/machinery/door/airlock/glass_mining{name = "Delivery Office"; req_access = list(50)},/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/quartermaster/delivery) "crE" = (/obj/structure/sign/poster{pixel_x = 0; pixel_y = 0},/turf/simulated/wall,/area/quartermaster/delivery) "crF" = (/turf/simulated/wall,/area/hallway/secondary/cargo_hallway) @@ -6346,7 +6346,7 @@ "csb" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/tiled,/area/crew_quarters/sleep/elevator) "csc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/computer/cryopod/dorms{pixel_y = -30},/turf/simulated/floor/tiled,/area/crew_quarters/sleep/elevator) "csd" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/effect/landmark{name = "JoinLateElevator"},/turf/simulated/floor/tiled,/area/crew_quarters/sleep/elevator) -"cse" = (/obj/item/device/radio/beacon,/obj/effect/landmark{name = "JoinLateElevator"},/turf/simulated/floor/tiled,/area/crew_quarters/sleep/elevator) +"cse" = (/obj/item/radio/beacon,/obj/effect/landmark{name = "JoinLateElevator"},/turf/simulated/floor/tiled,/area/crew_quarters/sleep/elevator) "csf" = (/obj/effect/landmark{name = "JoinLateElevator"},/turf/simulated/floor/tiled,/area/crew_quarters/sleep/elevator) "csg" = (/obj/machinery/computer/cryopod/dorms{pixel_y = -30},/turf/simulated/floor/tiled,/area/crew_quarters/sleep/elevator) "csh" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/sleep/elevator) @@ -6362,7 +6362,7 @@ "csr" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "css" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/medbay_aft) "cst" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/medbay_aft) -"csu" = (/obj/structure/table/standard,/obj/item/weapon/folder/yellow,/obj/effect/floor_decal/corner/brown{dir = 9},/obj/machinery/firealarm{dir = 8; pixel_x = -26},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/quartermaster/office) +"csu" = (/obj/structure/table/standard,/obj/item/folder/yellow,/obj/effect/floor_decal/corner/brown{dir = 9},/obj/machinery/firealarm{dir = 8; pixel_x = -26},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/quartermaster/office) "csv" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled,/area/quartermaster/office) "csw" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/quartermaster/office) "csx" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/quartermaster/office) @@ -6377,7 +6377,7 @@ "csG" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/hallway/secondary/cargo_hallway) "csH" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/camera/network/northern_star{c_tag = "Hall - Cargo Hallway Port"; dir = 2},/turf/simulated/floor/tiled,/area/hallway/secondary/cargo_hallway) "csI" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/alarm{pixel_y = 23},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/hallway/secondary/cargo_hallway) -"csJ" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/effect/floor_decal/corner/brown{dir = 5},/obj/structure/sign/directions/cargo{dir = 8; pixel_y = 32; pixel_z = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/cargo_hallway) +"csJ" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/effect/floor_decal/corner/brown{dir = 5},/obj/structure/sign/directions/cargo{dir = 8; pixel_y = 32; pixel_z = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/cargo_hallway) "csK" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = 28},/turf/simulated/floor/tiled,/area/hallway/secondary/cargo_hallway) "csL" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/cargo_hallway) "csM" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled,/area/hallway/secondary/cargo_hallway) @@ -6410,7 +6410,7 @@ "ctn" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/alarm{pixel_y = 23},/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor/tiled,/area/hallway/primary/port) "cto" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/port) "ctp" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/primary/port) -"ctq" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/hallway/primary/port) +"ctq" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/hallway/primary/port) "ctr" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/hallway/primary/port) "cts" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/primary/port) "ctt" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/port) @@ -6427,7 +6427,7 @@ "ctE" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) "ctF" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) "ctG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/vacant/vacant_shop) -"ctH" = (/obj/structure/table/rack{dir = 4},/obj/item/weapon/storage/toolbox/mechanical,/obj/random/maintenance/engineering,/turf/simulated/floor/tiled,/area/vacant/vacant_shop) +"ctH" = (/obj/structure/table/rack{dir = 4},/obj/item/storage/toolbox/mechanical,/obj/random/maintenance/engineering,/turf/simulated/floor/tiled,/area/vacant/vacant_shop) "ctI" = (/turf/simulated/wall,/area/crew_quarters/coffee_shop) "ctJ" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/polarized{dir = 2; id = "coffee"},/obj/structure/window/reinforced/polarized{dir = 8; id = "coffee"},/obj/structure/window/reinforced/polarized{dir = 1; id = "coffee"},/turf/simulated/floor/plating,/area/crew_quarters/coffee_shop) "ctK" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/polarized{dir = 4; id = "coffee"},/obj/structure/window/reinforced/polarized{dir = 2; id = "coffee"},/obj/structure/window/reinforced/polarized{dir = 1; id = "coffee"},/turf/simulated/floor/plating,/area/crew_quarters/coffee_shop) @@ -6442,7 +6442,7 @@ "ctT" = (/turf/simulated/wall,/area/crew_quarters/sleep/vistor_room_11) "ctU" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/maintenance{req_access = list(12)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/maintenance/medbay_aft) "ctV" = (/turf/simulated/wall,/area/crew_quarters/sleep/vistor_room_12) -"ctW" = (/obj/structure/table/standard,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/effect/floor_decal/corner/brown{dir = 9},/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 1},/turf/simulated/floor/tiled,/area/quartermaster/office) +"ctW" = (/obj/structure/table/standard,/obj/item/storage/belt/utility,/obj/item/storage/belt/utility,/obj/effect/floor_decal/corner/brown{dir = 9},/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 1},/turf/simulated/floor/tiled,/area/quartermaster/office) "ctX" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/quartermaster/office) "ctY" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/junction{dir = 1},/turf/simulated/floor/tiled,/area/quartermaster/office) "ctZ" = (/obj/machinery/door/airlock/glass_mining{id_tag = "cargodoor"; name = "Cargo Office"; req_access = list(50)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/office) @@ -6487,10 +6487,10 @@ "cuM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking_hallway) "cuN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/docking_hallway) "cuO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/vacant/vacant_shop) -"cuP" = (/obj/item/weapon/tool/crowbar,/turf/simulated/floor/tiled,/area/vacant/vacant_shop) +"cuP" = (/obj/item/tool/crowbar,/turf/simulated/floor/tiled,/area/vacant/vacant_shop) "cuQ" = (/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/tiled,/area/vacant/vacant_shop) -"cuR" = (/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/drinks/cup{pixel_x = 8; pixel_y = 8},/obj/item/weapon/reagent_containers/food/drinks/cup{pixel_x = -4; pixel_y = 8},/obj/item/weapon/reagent_containers/food/drinks/cup{pixel_x = 8; pixel_y = -4},/obj/item/weapon/reagent_containers/food/drinks/cup{pixel_x = -4; pixel_y = -4},/obj/item/weapon/reagent_containers/food/drinks/cup{pixel_x = 8},/obj/item/weapon/reagent_containers/food/drinks/cup{pixel_x = -4},/obj/item/weapon/reagent_containers/food/drinks/cup{pixel_x = 8; pixel_y = 12},/obj/item/weapon/reagent_containers/food/drinks/cup{pixel_x = -4; pixel_y = 12},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled/yellow,/area/crew_quarters/coffee_shop) -"cuS" = (/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/drinks/glass2/square{pixel_x = 8; pixel_y = 8},/obj/item/weapon/reagent_containers/food/drinks/glass2/square{pixel_x = 0; pixel_y = 8},/obj/item/weapon/reagent_containers/food/drinks/glass2/square{pixel_x = -8; pixel_y = 8},/obj/item/weapon/reagent_containers/food/drinks/glass2/square{pixel_x = 8; pixel_y = 4},/obj/item/weapon/reagent_containers/food/drinks/glass2/square{pixel_x = 0; pixel_y = 4},/obj/item/weapon/reagent_containers/food/drinks/glass2/square{pixel_x = -8; pixel_y = 4},/obj/machinery/camera/network/civilian{c_tag = "CIV - Cafe Back Room"; dir = 2},/turf/simulated/floor/tiled/yellow,/area/crew_quarters/coffee_shop) +"cuR" = (/obj/structure/table/marble,/obj/item/reagent_containers/food/drinks/cup{pixel_x = 8; pixel_y = 8},/obj/item/reagent_containers/food/drinks/cup{pixel_x = -4; pixel_y = 8},/obj/item/reagent_containers/food/drinks/cup{pixel_x = 8; pixel_y = -4},/obj/item/reagent_containers/food/drinks/cup{pixel_x = -4; pixel_y = -4},/obj/item/reagent_containers/food/drinks/cup{pixel_x = 8},/obj/item/reagent_containers/food/drinks/cup{pixel_x = -4},/obj/item/reagent_containers/food/drinks/cup{pixel_x = 8; pixel_y = 12},/obj/item/reagent_containers/food/drinks/cup{pixel_x = -4; pixel_y = 12},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled/yellow,/area/crew_quarters/coffee_shop) +"cuS" = (/obj/structure/table/marble,/obj/item/reagent_containers/food/drinks/glass2/square{pixel_x = 8; pixel_y = 8},/obj/item/reagent_containers/food/drinks/glass2/square{pixel_x = 0; pixel_y = 8},/obj/item/reagent_containers/food/drinks/glass2/square{pixel_x = -8; pixel_y = 8},/obj/item/reagent_containers/food/drinks/glass2/square{pixel_x = 8; pixel_y = 4},/obj/item/reagent_containers/food/drinks/glass2/square{pixel_x = 0; pixel_y = 4},/obj/item/reagent_containers/food/drinks/glass2/square{pixel_x = -8; pixel_y = 4},/obj/machinery/camera/network/civilian{c_tag = "CIV - Cafe Back Room"; dir = 2},/turf/simulated/floor/tiled/yellow,/area/crew_quarters/coffee_shop) "cuT" = (/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_coffee/full,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/yellow,/area/crew_quarters/coffee_shop) "cuU" = (/obj/structure/sink/kitchen{pixel_y = 28},/obj/machinery/button/remote/blast_door{id = "coffeeshop"; name = "Cafe Shutters"; pixel_x = 26; pixel_y = 0},/obj/machinery/light_switch{pixel_x = 34; pixel_y = 4},/obj/machinery/button/windowtint{id = "coffee"; pixel_x = 34; pixel_y = -4},/turf/simulated/floor/tiled/yellow,/area/crew_quarters/coffee_shop) "cuV" = (/obj/structure/closet/emcloset,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/docking_hallway2) @@ -6503,25 +6503,25 @@ "cvc" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/tiled/dark,/area/crew_quarters/locker) "cvd" = (/obj/structure/curtain/open/shower,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/southright{name = "Shower"},/obj/machinery/shower{pixel_y = 3},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_5) "cve" = (/obj/structure/toilet,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_5) -"cvf" = (/obj/structure/table/standard,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_5) +"cvf" = (/obj/structure/table/standard,/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_5) "cvg" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 0},/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/hallway/primary/central_one) "cvh" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) -"cvi" = (/obj/structure/table/standard,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_6) +"cvi" = (/obj/structure/table/standard,/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_6) "cvj" = (/obj/structure/toilet,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_6) "cvk" = (/obj/structure/curtain/open/shower,/obj/machinery/door/window/southright{name = "Shower"},/obj/structure/window/reinforced{dir = 8},/obj/machinery/shower{pixel_y = 3},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_6) "cvl" = (/obj/structure/curtain/open/shower,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/southright{name = "Shower"},/obj/machinery/shower{pixel_y = 3},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_11) "cvm" = (/obj/structure/toilet,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_11) -"cvn" = (/obj/structure/table/standard,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_11) +"cvn" = (/obj/structure/table/standard,/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_11) "cvo" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cvp" = (/obj/structure/table/glass,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_four) -"cvq" = (/obj/structure/table/standard,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_12) +"cvq" = (/obj/structure/table/standard,/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_12) "cvr" = (/obj/structure/toilet,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_12) "cvs" = (/obj/structure/curtain/open/shower,/obj/machinery/door/window/southright{name = "Shower"},/obj/structure/window/reinforced{dir = 8},/obj/machinery/shower{pixel_y = 3},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_12) -"cvt" = (/obj/structure/table/standard,/obj/item/weapon/tape_roll,/obj/item/weapon/storage/firstaid/regular{pixel_x = 6; pixel_y = -5},/obj/effect/floor_decal/corner/brown/full,/turf/simulated/floor/tiled,/area/quartermaster/office) -"cvu" = (/obj/structure/table/standard,/obj/item/weapon/hand_labeler,/obj/effect/floor_decal/corner/brown{dir = 10},/obj/machinery/recharger,/turf/simulated/floor/tiled,/area/quartermaster/office) -"cvv" = (/obj/structure/table/standard,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/obj/effect/floor_decal/corner/brown{dir = 8},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/item/device/retail_scanner/civilian{icon_state = "retail_idle"; dir = 1},/turf/simulated/floor/tiled,/area/quartermaster/office) +"cvt" = (/obj/structure/table/standard,/obj/item/tape_roll,/obj/item/storage/firstaid/regular{pixel_x = 6; pixel_y = -5},/obj/effect/floor_decal/corner/brown/full,/turf/simulated/floor/tiled,/area/quartermaster/office) +"cvu" = (/obj/structure/table/standard,/obj/item/hand_labeler,/obj/effect/floor_decal/corner/brown{dir = 10},/obj/machinery/recharger,/turf/simulated/floor/tiled,/area/quartermaster/office) +"cvv" = (/obj/structure/table/standard,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/obj/effect/floor_decal/corner/brown{dir = 8},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/item/retail_scanner/civilian{icon_state = "retail_idle"; dir = 1},/turf/simulated/floor/tiled,/area/quartermaster/office) "cvw" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/quartermaster/office) -"cvx" = (/obj/effect/floor_decal/corner/brown{dir = 10},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/obj/structure/flora/pottedplant,/turf/simulated/floor/tiled,/area/quartermaster/foyer) +"cvx" = (/obj/effect/floor_decal/corner/brown{dir = 10},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/newscaster{pixel_x = 0; pixel_y = -28},/obj/structure/flora/pottedplant,/turf/simulated/floor/tiled,/area/quartermaster/foyer) "cvy" = (/obj/effect/floor_decal/corner/brown{dir = 10},/obj/machinery/status_display/supply_display{pixel_y = -32},/turf/simulated/floor/tiled,/area/quartermaster/foyer) "cvz" = (/obj/machinery/computer/guestpass{pixel_y = -28},/obj/effect/floor_decal/corner/brown{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/light,/turf/simulated/floor/tiled,/area/quartermaster/foyer) "cvA" = (/obj/effect/floor_decal/corner/brown{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/foyer) @@ -6552,7 +6552,7 @@ "cvZ" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/port) "cwa" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/port) "cwb" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable,/turf/simulated/floor/tiled,/area/hallway/primary/port) -"cwc" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/hallway/primary/port) +"cwc" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/hallway/primary/port) "cwd" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light,/turf/simulated/floor/tiled,/area/hallway/primary/port) "cwe" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/port) "cwf" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/port) @@ -6587,7 +6587,7 @@ "cwI" = (/obj/machinery/vending/snack,/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cwJ" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cwK" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) -"cwL" = (/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/browndouble,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) +"cwL" = (/obj/structure/bed/double/padded,/obj/item/bedsheet/browndouble,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) "cwM" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_5) "cwN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_5) "cwO" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/mirror{pixel_x = 28},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_5) @@ -6597,9 +6597,9 @@ "cwS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_6) "cwT" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_6) "cwU" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) -"cwV" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/browndouble,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) +"cwV" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/bed/double/padded,/obj/item/bedsheet/browndouble,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) "cwW" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11) -"cwX" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/browndouble,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11) +"cwX" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/bed/double/padded,/obj/item/bedsheet/browndouble,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11) "cwY" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_11) "cwZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_11) "cxa" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/mirror{pixel_x = 28},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_11) @@ -6609,7 +6609,7 @@ "cxe" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_12) "cxf" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_12) "cxg" = (/obj/structure/closet/secure_closet/personal,/obj/item/clothing/head/kitty,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) -"cxh" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/browndouble,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) +"cxh" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/obj/structure/bed/double/padded,/obj/item/bedsheet/browndouble,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) "cxi" = (/turf/simulated/wall,/area/quartermaster/storage) "cxj" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/storage) "cxk" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/storage) @@ -6624,25 +6624,25 @@ "cxt" = (/obj/machinery/vending/cola,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/cargo_hallway) "cxu" = (/obj/machinery/vending/snack,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/cargo_hallway) "cxv" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/cargo_hallway) -"cxw" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/machinery/camera/network/northern_star{c_tag = "Hall - Port Primary 1"; dir = 4},/turf/simulated/floor/tiled/dark,/area/hallway/primary/port) +"cxw" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/machinery/camera/network/northern_star{c_tag = "Hall - Port Primary 1"; dir = 4},/turf/simulated/floor/tiled/dark,/area/hallway/primary/port) "cxx" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/primary/port) "cxy" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/port) "cxz" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled/dark,/area/hallway/primary/port) "cxA" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/obj/machinery/camera/network/northern_star{c_tag = "Hall - Port Primary 3"; dir = 4},/turf/simulated/floor/tiled/dark,/area/hallway/primary/port) "cxB" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/hallway/primary/port) "cxC" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled/dark,/area/hallway/primary/port) -"cxD" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/tiled/dark,/area/hallway/primary/port) +"cxD" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/tiled/dark,/area/hallway/primary/port) "cxE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/sleep/elevator) "cxF" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator) "cxG" = (/turf/simulated/shuttle/wall/dark/hard_corner,/area/crew_quarters/sleep/elevator) "cxH" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator) -"cxI" = (/obj/machinery/camera/network/northern_star{c_tag = "HALL - Dock Hallway Fore"; dir = 4},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) +"cxI" = (/obj/machinery/camera/network/northern_star{c_tag = "HALL - Dock Hallway Fore"; dir = 4},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) "cxJ" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) "cxK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/vacant/vacant_shop) "cxL" = (/obj/item/frame/light,/turf/simulated/floor/tiled,/area/vacant/vacant_shop) -"cxM" = (/obj/structure/table/marble,/obj/item/weapon/hand_labeler,/obj/item/weapon/reagent_containers/food/condiment/small/sugar,/obj/item/weapon/reagent_containers/food/drinks/britcup,/obj/item/weapon/reagent_containers/food/drinks/britcup,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/item/weapon/reagent_containers/food/drinks/teapot,/turf/simulated/floor/tiled/yellow,/area/crew_quarters/coffee_shop) -"cxN" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) -"cxO" = (/obj/item/weapon/stool/padded,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) +"cxM" = (/obj/structure/table/marble,/obj/item/hand_labeler,/obj/item/reagent_containers/food/condiment/small/sugar,/obj/item/reagent_containers/food/drinks/britcup,/obj/item/reagent_containers/food/drinks/britcup,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/item/reagent_containers/food/drinks/teapot,/turf/simulated/floor/tiled/yellow,/area/crew_quarters/coffee_shop) +"cxN" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) +"cxO" = (/obj/item/stool/padded,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cxP" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cxQ" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cxR" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/polarized{dir = 2; id = "coffee"},/obj/structure/window/reinforced/polarized{dir = 4; id = "coffee"},/obj/structure/window/reinforced/polarized{dir = 8; id = "coffee"},/obj/structure/window/reinforced/polarized{dir = 1; id = "coffee"},/turf/simulated/floor/plating,/area/crew_quarters/coffee_shop) @@ -6650,10 +6650,10 @@ "cxT" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway2) "cxU" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway2) "cxV" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/structure/disposalpipe/junction{dir = 1; icon_state = "pipe-j2"},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway2) -"cxW" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway2) -"cxX" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/crew_quarters/locker) +"cxW" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway2) +"cxX" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cxY" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/locker) -"cxZ" = (/obj/structure/closet/secure_closet/personal,/obj/item/weapon/storage/backpack/dufflebag,/turf/simulated/floor/tiled,/area/crew_quarters/locker) +"cxZ" = (/obj/structure/closet/secure_closet/personal,/obj/item/storage/backpack/dufflebag,/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cya" = (/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) "cyb" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) "cyc" = (/obj/machinery/door/airlock{name = "Restroom"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_5) @@ -6674,8 +6674,8 @@ "cyr" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/storage) "cys" = (/obj/structure/closet/emcloset,/obj/machinery/status_display/supply_display{pixel_y = 32},/turf/simulated/floor/tiled,/area/quartermaster/storage) "cyt" = (/obj/structure/closet/emcloset,/turf/simulated/floor/tiled,/area/quartermaster/storage) -"cyu" = (/obj/structure/closet/secure_closet/cargotech,/obj/item/weapon/storage/backpack/dufflebag,/obj/item/weapon/stamp/cargo,/turf/simulated/floor/tiled,/area/quartermaster/storage) -"cyv" = (/obj/structure/closet/secure_closet/cargotech,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/item/weapon/stamp/cargo,/turf/simulated/floor/tiled,/area/quartermaster/storage) +"cyu" = (/obj/structure/closet/secure_closet/cargotech,/obj/item/storage/backpack/dufflebag,/obj/item/stamp/cargo,/turf/simulated/floor/tiled,/area/quartermaster/storage) +"cyv" = (/obj/structure/closet/secure_closet/cargotech,/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/item/stamp/cargo,/turf/simulated/floor/tiled,/area/quartermaster/storage) "cyw" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/quartermaster/storage) "cyx" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/quartermaster/storage) "cyy" = (/obj/machinery/navbeacon/delivery/south{location = "QM #3"},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/quartermaster/storage) @@ -6684,7 +6684,7 @@ "cyB" = (/obj/machinery/status_display/supply_display,/turf/simulated/wall,/area/quartermaster/qm) "cyC" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/tiled,/area/quartermaster/qm) "cyD" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/quartermaster/qm) -"cyE" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/device/megaphone,/turf/simulated/floor/tiled,/area/quartermaster/qm) +"cyE" = (/obj/structure/table/standard,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/megaphone,/turf/simulated/floor/tiled,/area/quartermaster/qm) "cyF" = (/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = -32; pixel_y = 30},/turf/simulated/floor/tiled,/area/quartermaster/qm) "cyG" = (/obj/structure/filingcabinet,/turf/simulated/floor/tiled,/area/quartermaster/qm) "cyH" = (/turf/simulated/wall,/area/hallway/secondary/engineering_hallway) @@ -6701,7 +6701,7 @@ "cyS" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator) "cyT" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator) "cyU" = (/obj/machinery/camera/network/civilian{c_tag = "CIV - Residential Elevator Starboard"; dir = 8},/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator) -"cyV" = (/obj/item/frame,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/tiled,/area/vacant/vacant_shop) +"cyV" = (/obj/item/frame,/obj/item/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/tiled,/area/vacant/vacant_shop) "cyW" = (/obj/item/stack/cable_coil/green,/turf/simulated/floor/tiled,/area/vacant/vacant_shop) "cyX" = (/obj/structure/table/marble,/obj/machinery/door/blast/shutters{dir = 2; id = "coffeeshop"; layer = 3.1; name = "Cafe Shutters"},/obj/machinery/cash_register/civilian{icon_state = "register_idle"; dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cyY" = (/obj/structure/table/marble,/obj/machinery/door/blast/shutters{dir = 2; id = "coffeeshop"; layer = 3.1; name = "Cafe Shutters"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) @@ -6715,7 +6715,7 @@ "czg" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/locker) "czh" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/locker) "czi" = (/obj/structure/table/standard,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/locker) -"czj" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/crew_quarters/locker) +"czj" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/crew_quarters/locker) "czk" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/locker) "czl" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/tiled,/area/crew_quarters/locker) "czm" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) @@ -6723,12 +6723,12 @@ "czo" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) "czp" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) "czq" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) -"czr" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/junction{icon_state = "pipe-j1"; dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) +"czr" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/junction{icon_state = "pipe-j1"; dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) "czs" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock{name = "Room 5"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) "czt" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "czu" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/junction{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "czv" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock{name = "Room 6"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) -"czw" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/junction{dir = 8; icon_state = "pipe-j2"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) +"czw" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/junction{dir = 8; icon_state = "pipe-j2"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) "czx" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) "czy" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) "czz" = (/obj/machinery/alarm{pixel_y = 22},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) @@ -6739,12 +6739,12 @@ "czE" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11) "czF" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11) "czG" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11) -"czH" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/junction{dir = 8; icon_state = "pipe-j2"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11) +"czH" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/junction{dir = 8; icon_state = "pipe-j2"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11) "czI" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock{name = "Room 11"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11) "czJ" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "czK" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "czL" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock{name = "Room 12"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) -"czM" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) +"czM" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) "czN" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) "czO" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) "czP" = (/obj/machinery/alarm{pixel_y = 22},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) @@ -6756,7 +6756,7 @@ "czV" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = 36; pixel_y = 0},/turf/simulated/floor/tiled,/area/quartermaster/storage) "czW" = (/obj/structure/bed/chair{dir = 4},/obj/structure/disposalpipe/segment,/obj/machinery/camera/network/cargo{c_tag = "CRG - Quartermaster"; dir = 4; name = "security camera"},/turf/simulated/floor/tiled,/area/quartermaster/qm) "czX" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/quartermaster/qm) -"czY" = (/obj/structure/table/standard,/obj/item/weapon/folder/yellow,/obj/item/weapon/pen{pixel_x = 4; pixel_y = 4},/obj/item/weapon/pen/red{pixel_x = 2; pixel_y = 6},/turf/simulated/floor/tiled,/area/quartermaster/qm) +"czY" = (/obj/structure/table/standard,/obj/item/folder/yellow,/obj/item/pen{pixel_x = 4; pixel_y = 4},/obj/item/pen/red{pixel_x = 2; pixel_y = 6},/turf/simulated/floor/tiled,/area/quartermaster/qm) "czZ" = (/obj/structure/bed/chair/office/dark{dir = 8},/obj/effect/landmark/start{name = "Quartermaster"},/turf/simulated/floor/tiled,/area/quartermaster/qm) "cAa" = (/obj/machinery/computer/supplycomp/control,/turf/simulated/floor/tiled,/area/quartermaster/qm) "cAb" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor,/area/maintenance/apmaint) @@ -6775,13 +6775,13 @@ "cAo" = (/obj/machinery/door/airlock/glass_command{name = "E.V.A."; req_one_access = list(18)},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cAp" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) "cAq" = (/obj/machinery/door/airlock/glass_command{name = "E.V.A."; req_one_access = list(18)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) -"cAr" = (/obj/structure/closet/emcloset,/obj/item/weapon/storage/toolbox/emergency,/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator) +"cAr" = (/obj/structure/closet/emcloset,/obj/item/storage/toolbox/emergency,/obj/item/storage/toolbox/emergency,/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator) "cAs" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator) "cAt" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator) "cAu" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator) "cAv" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator) "cAw" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator) -"cAx" = (/obj/structure/closet/emcloset,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/item/weapon/storage/toolbox/emergency,/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator) +"cAx" = (/obj/structure/closet/emcloset,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/item/storage/toolbox/emergency,/obj/item/storage/toolbox/emergency,/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/elevator) "cAy" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/disposalpipe/segment,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) "cAz" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) "cAA" = (/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/structure/closet/crate,/turf/simulated/floor/tiled,/area/vacant/vacant_shop) @@ -6791,7 +6791,7 @@ "cAE" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/tiled,/area/vacant/vacant_shop) "cAF" = (/obj/effect/floor_decal/corner/brown/full{dir = 8},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = 32},/obj/structure/flora/pottedplant{icon_state = "plant-01"},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cAG" = (/obj/effect/floor_decal/corner/brown{dir = 5},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) -"cAH" = (/obj/effect/floor_decal/corner/brown{dir = 5},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) +"cAH" = (/obj/effect/floor_decal/corner/brown{dir = 5},/obj/item/stool/padded,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cAI" = (/obj/effect/floor_decal/corner/brown{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cAJ" = (/obj/effect/floor_decal/corner/brown{dir = 5},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cAK" = (/obj/effect/floor_decal/corner/brown{dir = 5},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) @@ -6799,14 +6799,14 @@ "cAM" = (/obj/effect/floor_decal/corner/brown{dir = 6},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/newscaster{pixel_x = 28; pixel_y = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cAN" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway2) "cAO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway2) -"cAP" = (/obj/item/weapon/stool/padded,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/crew_quarters/locker) -"cAQ" = (/obj/structure/table/standard,/obj/item/weapon/coin/silver,/turf/simulated/floor/tiled,/area/crew_quarters/locker) -"cAR" = (/obj/structure/table/standard,/obj/item/weapon/tape_roll,/turf/simulated/floor/tiled,/area/crew_quarters/locker) -"cAS" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled,/area/crew_quarters/locker) +"cAP" = (/obj/item/stool/padded,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/crew_quarters/locker) +"cAQ" = (/obj/structure/table/standard,/obj/item/coin/silver,/turf/simulated/floor/tiled,/area/crew_quarters/locker) +"cAR" = (/obj/structure/table/standard,/obj/item/tape_roll,/turf/simulated/floor/tiled,/area/crew_quarters/locker) +"cAS" = (/obj/item/stool/padded,/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cAT" = (/obj/structure/bed/chair/comfy/beige{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) "cAU" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/obj/structure/table/standard,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) "cAV" = (/obj/structure/bed/chair/comfy/beige{dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) -"cAW" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) +"cAW" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) "cAX" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) "cAY" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/disposalpipe/segment,/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) "cAZ" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) @@ -6815,14 +6815,14 @@ "cBc" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) "cBd" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/disposalpipe/segment,/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) "cBe" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) -"cBf" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) +"cBf" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) "cBg" = (/obj/structure/bed/chair/comfy/beige{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) "cBh" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) "cBi" = (/obj/structure/bed/chair/comfy/beige{dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) "cBj" = (/obj/structure/bed/chair/comfy/beige{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11) "cBk" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11) "cBl" = (/obj/structure/bed/chair/comfy/beige{dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11) -"cBm" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11) +"cBm" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11) "cBn" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11) "cBo" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/disposalpipe/segment,/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11) "cBp" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_11) @@ -6832,7 +6832,7 @@ "cBt" = (/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/disposal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) "cBu" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) "cBv" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) -"cBw" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) +"cBw" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) "cBx" = (/obj/structure/bed/chair/comfy/beige{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) "cBy" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) "cBz" = (/obj/structure/bed/chair/comfy/beige{dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) @@ -6848,7 +6848,7 @@ "cBJ" = (/obj/machinery/door/airlock/glass_mining{name = "Quartermaster"; req_access = list(41)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/qm) "cBK" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/quartermaster/qm) "cBL" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/quartermaster/qm) -"cBM" = (/obj/structure/table/standard,/obj/item/weapon/clipboard,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/weapon/stamp/qm,/turf/simulated/floor/tiled,/area/quartermaster/qm) +"cBM" = (/obj/structure/table/standard,/obj/item/clipboard,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/stamp/qm,/turf/simulated/floor/tiled,/area/quartermaster/qm) "cBN" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/quartermaster/qm) "cBO" = (/obj/machinery/computer/security/mining,/turf/simulated/floor/tiled,/area/quartermaster/qm) "cBP" = (/turf/simulated/floor,/area/maintenance/apmaint) @@ -6882,9 +6882,9 @@ "cCr" = (/obj/effect/floor_decal/corner/brown{dir = 6},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cCs" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/coffee_shop) "cCt" = (/obj/machinery/camera/network/civilian{c_tag = "Civ - Locker Room"; dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/locker) -"cCu" = (/obj/item/weapon/stool/padded,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/crew_quarters/locker) +"cCu" = (/obj/item/stool/padded,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cCv" = (/obj/structure/table/standard,/obj/item/clothing/head/soft/grey{pixel_x = -2; pixel_y = 3},/turf/simulated/floor/tiled,/area/crew_quarters/locker) -"cCw" = (/obj/structure/table/standard,/obj/item/weapon/storage/laundry_basket,/turf/simulated/floor/tiled,/area/crew_quarters/locker) +"cCw" = (/obj/structure/table/standard,/obj/item/storage/laundry_basket,/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cCx" = (/obj/machinery/lapvend,/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cCy" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/crew_quarters/sleep/vistor_room_5) "cCz" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) @@ -6911,9 +6911,9 @@ "cCU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/maintenance/apmaint) "cCV" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor,/area/maintenance/apmaint) "cCW" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/maintenance/apmaint) -"cCX" = (/obj/structure/closet,/obj/item/clothing/glasses/welding,/obj/item/weapon/weldingtool,/obj/effect/decal/cleanable/dirt,/obj/item/clothing/shoes/boots/workboots,/obj/random/maintenance/engineering,/obj/random/maintenance/cargo,/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/maintenance/apmaint) +"cCX" = (/obj/structure/closet,/obj/item/clothing/glasses/welding,/obj/item/weldingtool,/obj/effect/decal/cleanable/dirt,/obj/item/clothing/shoes/boots/workboots,/obj/random/maintenance/engineering,/obj/random/maintenance/cargo,/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/maintenance/apmaint) "cCY" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/turf/simulated/floor,/area/maintenance/apmaint) -"cCZ" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/camera/network/northern_star{c_tag = "Hall - Engineering Primary Fore"; dir = 1},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway) +"cCZ" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/camera/network/northern_star{c_tag = "Hall - Engineering Primary Fore"; dir = 1},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/engineering_hallway) "cDa" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway) "cDb" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway) "cDc" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway) @@ -6939,7 +6939,7 @@ "cDw" = (/turf/simulated/wall,/area/maintenance/arrivals) "cDx" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/maintenance/arrivals) "cDy" = (/obj/structure/bed/chair/wood{dir = 4},/obj/effect/floor_decal/corner/brown{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) -"cDz" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/corner/yellow{dir = 9},/obj/item/weapon/book/codex/lore/vir,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) +"cDz" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/corner/yellow{dir = 9},/obj/item/book/codex/lore/vir,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cDA" = (/obj/structure/bed/chair/wood{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cDB" = (/obj/effect/floor_decal/corner/yellow{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cDC" = (/obj/effect/floor_decal/corner/yellow{dir = 6},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) @@ -6953,7 +6953,7 @@ "cDK" = (/obj/machinery/door/airlock/glass{name = "Locker Room"},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cDL" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cDM" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/crew_quarters/locker) -"cDN" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/locker) +"cDN" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cDO" = (/obj/structure/table/standard,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cDP" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cDQ" = (/turf/simulated/wall,/area/crew_quarters/sleep/vistor_room_3) @@ -6961,11 +6961,11 @@ "cDS" = (/obj/structure/table/standard,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) "cDT" = (/obj/structure/curtain/open/shower,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/southright{name = "Shower"},/obj/machinery/shower{pixel_y = 3},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_3) "cDU" = (/obj/structure/toilet,/obj/machinery/light{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_3) -"cDV" = (/obj/structure/table/standard,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_3) +"cDV" = (/obj/structure/table/standard,/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_3) "cDW" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cDX" = (/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cDY" = (/turf/simulated/wall,/area/crew_quarters/sleep/vistor_room_4) -"cDZ" = (/obj/structure/table/standard,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_4) +"cDZ" = (/obj/structure/table/standard,/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_4) "cEa" = (/obj/structure/toilet,/obj/machinery/light{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_4) "cEb" = (/obj/structure/curtain/open/shower,/obj/machinery/door/window/southright{name = "Shower"},/obj/structure/window/reinforced{dir = 8},/obj/machinery/shower{pixel_y = 3},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_4) "cEc" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) @@ -6975,11 +6975,11 @@ "cEg" = (/turf/simulated/wall,/area/crew_quarters/sleep/vistor_room_9) "cEh" = (/obj/structure/curtain/open/shower,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/southright{name = "Shower"},/obj/machinery/shower{pixel_y = 3},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_9) "cEi" = (/obj/structure/toilet,/obj/machinery/light{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_9) -"cEj" = (/obj/structure/table/standard,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_9) +"cEj" = (/obj/structure/table/standard,/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_9) "cEk" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cEl" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cEm" = (/turf/simulated/wall,/area/crew_quarters/sleep/vistor_room_10) -"cEn" = (/obj/structure/table/standard,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_10) +"cEn" = (/obj/structure/table/standard,/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_10) "cEo" = (/obj/structure/toilet,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_10) "cEp" = (/obj/structure/curtain/open/shower,/obj/machinery/door/window/southright{name = "Shower"},/obj/structure/window/reinforced{dir = 8},/obj/machinery/shower{pixel_y = 3},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_10) "cEq" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) @@ -6992,10 +6992,10 @@ "cEx" = (/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/quartermaster/storage) "cEy" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/vehicle/train/engine,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/storage) "cEz" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/quartermaster/qm) -"cEA" = (/obj/structure/closet,/obj/item/weapon/storage/backpack/dufflebag,/turf/simulated/floor/tiled,/area/quartermaster/qm) +"cEA" = (/obj/structure/closet,/obj/item/storage/backpack/dufflebag,/turf/simulated/floor/tiled,/area/quartermaster/qm) "cEB" = (/obj/structure/closet/secure_closet/quartermaster,/turf/simulated/floor/tiled,/area/quartermaster/qm) -"cEC" = (/obj/structure/table/standard,/obj/item/weapon/coin/silver{pixel_x = -3; pixel_y = 3},/obj/item/weapon/coin/silver,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/light,/turf/simulated/floor/tiled,/area/quartermaster/qm) -"cED" = (/obj/structure/table/standard,/obj/item/weapon/cartridge/quartermaster{pixel_x = 6; pixel_y = 5},/obj/item/weapon/cartridge/quartermaster,/obj/item/weapon/cartridge/quartermaster{pixel_x = -4; pixel_y = 7},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/tiled,/area/quartermaster/qm) +"cEC" = (/obj/structure/table/standard,/obj/item/coin/silver{pixel_x = -3; pixel_y = 3},/obj/item/coin/silver,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/light,/turf/simulated/floor/tiled,/area/quartermaster/qm) +"cED" = (/obj/structure/table/standard,/obj/item/cartridge/quartermaster{pixel_x = 6; pixel_y = 5},/obj/item/cartridge/quartermaster,/obj/item/cartridge/quartermaster{pixel_x = -4; pixel_y = 7},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/tiled,/area/quartermaster/qm) "cEE" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/apmaint) "cEF" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/apmaint) "cEG" = (/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/turf/simulated/floor,/area/maintenance/apmaint) @@ -7015,18 +7015,18 @@ "cEU" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) "cEV" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) "cEW" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) -"cEX" = (/obj/structure/bed/chair/wood{dir = 4},/obj/effect/floor_decal/corner/brown{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) -"cEY" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/corner/yellow{dir = 9},/obj/item/weapon/reagent_containers/food/condiment/small/sugar,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) +"cEX" = (/obj/structure/bed/chair/wood{dir = 4},/obj/effect/floor_decal/corner/brown{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) +"cEY" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/corner/yellow{dir = 9},/obj/item/reagent_containers/food/condiment/small/sugar,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cEZ" = (/obj/structure/bed/chair/wood{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cFa" = (/obj/effect/floor_decal/corner/yellow{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cFb" = (/obj/effect/floor_decal/corner/yellow{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cFc" = (/obj/structure/bed/chair/wood{dir = 4},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) -"cFd" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/corner/yellow{dir = 6},/obj/item/weapon/reagent_containers/food/condiment/small/sugar,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) +"cFd" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/corner/yellow{dir = 6},/obj/item/reagent_containers/food/condiment/small/sugar,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cFe" = (/obj/structure/bed/chair/wood{dir = 8},/obj/effect/floor_decal/corner/brown{dir = 6},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cFf" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/coffee_shop) "cFg" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/machinery/light_switch{pixel_x = -36; pixel_y = 0},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cFh" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/crew_quarters/locker) -"cFi" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) +"cFi" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) "cFj" = (/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) "cFk" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_3) "cFl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_3) @@ -7035,9 +7035,9 @@ "cFo" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/mirror{pixel_x = -28},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_4) "cFp" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_4) "cFq" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_4) -"cFr" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) +"cFr" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) "cFs" = (/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) -"cFt" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9) +"cFt" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9) "cFu" = (/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9) "cFv" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_9) "cFw" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_9) @@ -7046,7 +7046,7 @@ "cFz" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/mirror{pixel_x = -28},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_10) "cFA" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_10) "cFB" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_10) -"cFC" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) +"cFC" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) "cFD" = (/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) "cFE" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/storage) "cFF" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/storage) @@ -7063,7 +7063,7 @@ "cFQ" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "cFR" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "cFS" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) -"cFT" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/obj/structure/table/rack,/obj/item/device/suit_cooling_unit,/obj/item/device/suit_cooling_unit,/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) +"cFT" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/obj/structure/table/rack,/obj/item/suit_cooling_unit,/obj/item/suit_cooling_unit,/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cFU" = (/obj/effect/floor_decal/corner/red{dir = 5},/obj/structure/closet/secure_closet/security,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/security/checkpoint2) "cFV" = (/obj/effect/floor_decal/corner/red{dir = 5},/obj/structure/closet/wardrobe/red,/turf/simulated/floor/tiled,/area/security/checkpoint2) "cFW" = (/turf/simulated/floor/tiled/dark,/area/hallway/secondary/docking_hallway) @@ -7106,7 +7106,7 @@ "cGH" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/vehicle/train/trolley,/obj/machinery/camera/network/cargo{c_tag = "CRG - Cargo Bay Starboard"; dir = 8; name = "security camera"},/turf/simulated/floor/tiled,/area/quartermaster/storage) "cGI" = (/turf/simulated/wall,/area/quartermaster/warehouse) "cGJ" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/effect/decal/cleanable/cobweb,/obj/effect/floor_decal/corner/brown/full{dir = 8},/turf/simulated/floor/tiled,/area/quartermaster/warehouse) -"cGK" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/module/power_control,/obj/item/weapon/cell{maxcharge = 2000},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled/steel,/area/quartermaster/warehouse) +"cGK" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/module/power_control,/obj/item/cell{maxcharge = 2000},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled/steel,/area/quartermaster/warehouse) "cGL" = (/obj/machinery/light/small{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/warehouse) "cGM" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/effect/floor_decal/corner/brown{dir = 5},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light_switch{pixel_x = -12; pixel_y = 24},/turf/simulated/floor/tiled,/area/quartermaster/warehouse) "cGN" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/warehouse) @@ -7118,20 +7118,20 @@ "cGT" = (/turf/simulated/floor/tiled/yellow,/area/engineering/locker_room) "cGU" = (/obj/structure/closet/secure_closet/atmos_personal,/turf/simulated/floor/tiled/yellow,/area/engineering/locker_room) "cGV" = (/turf/simulated/wall,/area/crew_quarters/sleep/engi_wash) -"cGW" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway) +"cGW" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway) "cGX" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway) "cGY" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway) "cGZ" = (/turf/simulated/wall,/area/construction) "cHa" = (/obj/machinery/door/airlock/maintenance{req_one_access = list(11,24)},/turf/simulated/floor,/area/construction) -"cHb" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/clothing/mask/breath,/obj/item/weapon/rig/eva/equipped,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) +"cHb" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/clothing/mask/breath,/obj/item/rig/eva/equipped,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "cHc" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/atmos,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/void/atmos,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "cHd" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cHe" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "cHf" = (/obj/structure/table/reinforced,/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cHg" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) -"cHh" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/weapon/tank/jetpack/carbondioxide,/obj/item/clothing/suit/space/skrell/white,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/skrell/white,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) +"cHh" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/tank/jetpack/carbondioxide,/obj/item/clothing/suit/space/skrell/white,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/skrell/white,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "cHi" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) -"cHj" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/jetpack/carbondioxide,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/skrell/black,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/skrell/black,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) +"cHj" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/tank/jetpack/carbondioxide,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/skrell/black,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/skrell/black,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "cHk" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/turf/simulated/floor,/area/maintenance/evahallway) "cHl" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/evahallway) "cHm" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/maintenance/evahallway) @@ -7152,12 +7152,12 @@ "cHB" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/maintenance/arrivals) "cHC" = (/turf/simulated/floor,/area/maintenance/arrivals) "cHD" = (/obj/structure/bed/chair/wood{dir = 4},/obj/effect/floor_decal/corner/brown/full,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) -"cHE" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/corner/brown{dir = 10},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/obj/item/weapon/reagent_containers/food/condiment/small/sugar,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) +"cHE" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/corner/brown{dir = 10},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/obj/item/reagent_containers/food/condiment/small/sugar,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cHF" = (/obj/structure/bed/chair/wood{dir = 8},/obj/effect/floor_decal/corner/brown{dir = 10},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cHG" = (/obj/effect/floor_decal/corner/brown{dir = 10},/obj/machinery/media/jukebox,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cHH" = (/obj/effect/floor_decal/corner/brown{dir = 10},/obj/machinery/disposal,/obj/machinery/camera/network/civilian{c_tag = "CIV - Cafe"; dir = 1},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cHI" = (/obj/structure/bed/chair/wood{dir = 4},/obj/effect/floor_decal/corner/brown{dir = 10},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) -"cHJ" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/corner/brown{dir = 10},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/obj/item/weapon/reagent_containers/food/condiment/small/sugar,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) +"cHJ" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/corner/brown{dir = 10},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/obj/item/reagent_containers/food/condiment/small/sugar,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cHK" = (/obj/structure/bed/chair/wood{dir = 8},/obj/effect/floor_decal/corner/brown/full{dir = 4},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cHL" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway2) "cHM" = (/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -25},/turf/simulated/floor/tiled,/area/crew_quarters/locker) @@ -7169,12 +7169,12 @@ "cHS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) "cHT" = (/obj/machinery/alarm{pixel_y = 22},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) "cHU" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/structure/disposalpipe/junction{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) -"cHV" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) +"cHV" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) "cHW" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock{name = "Room 3"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) "cHX" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cHY" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cHZ" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock{name = "Room 4"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) -"cIa" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/junction{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) +"cIa" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/junction{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) "cIb" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) "cIc" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) "cId" = (/obj/machinery/alarm{pixel_y = 22},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) @@ -7185,12 +7185,12 @@ "cIi" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9) "cIj" = (/obj/machinery/alarm{pixel_y = 22},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9) "cIk" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/structure/disposalpipe/junction{icon_state = "pipe-j2"; dir = 2},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9) -"cIl" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9) +"cIl" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9) "cIm" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock{name = "Room 9"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9) "cIn" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cIo" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cIp" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock{name = "Room 10"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) -"cIq" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) +"cIq" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) "cIr" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) "cIs" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) "cIt" = (/obj/machinery/alarm{pixel_y = 22},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) @@ -7219,10 +7219,10 @@ "cIQ" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/camera/network/northern_star{c_tag = "Hall - Engineering Primary Aft"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway) "cIR" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway) "cIS" = (/obj/structure/disposalpipe/segment,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway) -"cIT" = (/obj/structure/table/steel,/obj/item/clothing/gloves/black,/obj/item/device/multitool{pixel_x = 5},/obj/random/tech_supply,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/construction) +"cIT" = (/obj/structure/table/steel,/obj/item/clothing/gloves/black,/obj/item/multitool{pixel_x = 5},/obj/random/tech_supply,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/construction) "cIU" = (/obj/structure/table/steel,/obj/random/tech_supply,/obj/random/tech_supply,/turf/simulated/floor,/area/construction) "cIV" = (/obj/structure/table/steel,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/maintenance/engineering,/turf/simulated/floor,/area/construction) -"cIW" = (/obj/structure/table/steel,/obj/item/weapon/tank/emergency/oxygen/engi,/obj/random/tech_supply,/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor,/area/construction) +"cIW" = (/obj/structure/table/steel,/obj/item/tank/emergency/oxygen/engi,/obj/random/tech_supply,/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor,/area/construction) "cIX" = (/turf/simulated/floor,/area/construction) "cIY" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor,/area/construction) "cIZ" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering Hardsuits"; req_one_access = list(11,24)},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) @@ -7258,21 +7258,21 @@ "cJD" = (/obj/structure/bed/chair/comfy/beige{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) "cJE" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) "cJF" = (/obj/structure/bed/chair/comfy/beige{dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) -"cJG" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) +"cJG" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) "cJH" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) "cJI" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/disposalpipe/segment,/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) "cJJ" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_3) "cJK" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) "cJL" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/disposalpipe/segment,/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) "cJM" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) -"cJN" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) +"cJN" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) "cJO" = (/obj/structure/bed/chair/comfy/beige{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) "cJP" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) "cJQ" = (/obj/structure/bed/chair/comfy/beige{dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_4) "cJR" = (/obj/structure/bed/chair/comfy/beige{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9) "cJS" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9) "cJT" = (/obj/structure/bed/chair/comfy/beige{dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9) -"cJU" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9) +"cJU" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9) "cJV" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9) "cJW" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/disposalpipe/segment,/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9) "cJX" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_9) @@ -7280,7 +7280,7 @@ "cJZ" = (/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/disposal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) "cKa" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) "cKb" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) -"cKc" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) +"cKc" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) "cKd" = (/obj/structure/bed/chair/comfy/beige{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) "cKe" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) "cKf" = (/obj/structure/bed/chair/comfy/beige{dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_10) @@ -7310,11 +7310,11 @@ "cKD" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/effect/floor_decal/corner/yellow{dir = 6},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway) "cKE" = (/obj/structure/table/steel,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/maintenance/engineering,/turf/simulated/floor/tiled,/area/construction) "cKF" = (/turf/simulated/floor/tiled,/area/construction) -"cKG" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/table/reinforced,/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) +"cKG" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/table/reinforced,/obj/item/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cKH" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "cKI" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_command{name = "Skrellian Hardsuits"; req_one_access = list(18)},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cKJ" = (/obj/structure/table/reinforced,/obj/item/stack/material/plasteel{amount = 10},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/steel{amount = 50},/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/camera/network/security{c_tag = "EVA Northeast"; dir = 8},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) -"cKK" = (/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 6},/obj/item/weapon/storage/briefcase/inflatable{pixel_y = 3},/obj/item/weapon/storage/briefcase/inflatable{pixel_x = -3},/obj/structure/table/reinforced,/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) +"cKK" = (/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 6},/obj/item/storage/briefcase/inflatable{pixel_y = 3},/obj/item/storage/briefcase/inflatable{pixel_x = -3},/obj/structure/table/reinforced,/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cKL" = (/obj/machinery/suit_storage_unit/standard_unit,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "cKM" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plating,/area/maintenance/evahallway) "cKN" = (/obj/effect/floor_decal/corner/red{dir = 9},/obj/machinery/computer/secure_data,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/checkpoint2) @@ -7332,12 +7332,12 @@ "cKZ" = (/obj/structure/bookcase,/turf/simulated/floor/wood,/area/crew_quarters/longue_area) "cLa" = (/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/wood,/area/crew_quarters/longue_area) "cLb" = (/obj/structure/bed/chair/comfy/black{dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/turf/simulated/floor/carpet,/area/crew_quarters/longue_area) -"cLc" = (/obj/structure/table/woodentable,/obj/item/weapon/material/ashtray/glass,/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = 32},/obj/item/weapon/book/codex/lore/vir,/turf/simulated/floor/carpet,/area/crew_quarters/longue_area) +"cLc" = (/obj/structure/table/woodentable,/obj/item/material/ashtray/glass,/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = 32},/obj/item/book/codex/lore/vir,/turf/simulated/floor/carpet,/area/crew_quarters/longue_area) "cLd" = (/obj/structure/bed/chair/comfy/black{dir = 8},/turf/simulated/floor/carpet,/area/crew_quarters/longue_area) "cLe" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/crew_quarters/longue_area) "cLf" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/longue_area) "cLg" = (/obj/structure/flora/pottedplant{icon_state = "plant-10"},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/docking_hallway2) -"cLh" = (/obj/structure/table/standard,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/item/weapon/soap,/obj/random/soap,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet) +"cLh" = (/obj/structure/table/standard,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/item/soap,/obj/random/soap,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet) "cLi" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet) "cLj" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet) "cLk" = (/obj/machinery/door/airlock{name = "Unit 1"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet) @@ -7369,10 +7369,10 @@ "cLK" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/construction) "cLL" = (/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/turf/simulated/floor,/area/construction) "cLM" = (/obj/machinery/suit_cycler/security,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) -"cLN" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) +"cLN" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/cell/high{charge = 100; maxcharge = 15000},/obj/item/cell/high{charge = 100; maxcharge = 15000},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/radio/off,/obj/item/radio/off,/obj/item/radio/off,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cLO" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) "cLP" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/cable/green,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) -"cLQ" = (/obj/effect/floor_decal/corner/red{dir = 9},/obj/machinery/computer/card,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/tiled,/area/security/checkpoint2) +"cLQ" = (/obj/effect/floor_decal/corner/red{dir = 9},/obj/machinery/computer/card,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/tiled,/area/security/checkpoint2) "cLR" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/security/checkpoint2) "cLS" = (/obj/effect/floor_decal/corner/red{dir = 6},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/bed/chair/office/dark{dir = 4},/obj/machinery/button/remote/airlock{id = "security_checkpoint"; name = "Door Bolt Control"; pixel_x = 6; pixel_y = -28; req_access = list(1); specialfunctions = 4},/obj/machinery/button/remote/airlock{id = "security_bar"; name = "Bar Door Bolt Control"; pixel_x = -6; pixel_y = -28; req_access = list(1); specialfunctions = 4},/turf/simulated/floor/tiled,/area/security/checkpoint2) "cLT" = (/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/window/brigdoor/westleft{name = "Security Checkpoint"; req_access = list(1)},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/table/reinforced,/turf/simulated/floor/tiled,/area/security/checkpoint2) @@ -7390,7 +7390,7 @@ "cMf" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{req_access = list(12)},/turf/simulated/floor,/area/crew_quarters/longue_area) "cMg" = (/turf/simulated/floor/wood,/area/crew_quarters/longue_area) "cMh" = (/obj/structure/bed/chair/comfy/black{dir = 4},/turf/simulated/floor/carpet,/area/crew_quarters/longue_area) -"cMi" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/carpet,/area/crew_quarters/longue_area) +"cMi" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/carpet,/area/crew_quarters/longue_area) "cMj" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/wood,/area/crew_quarters/longue_area) "cMk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/longue_area) "cMl" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway2) @@ -7402,21 +7402,21 @@ "cMr" = (/turf/simulated/wall,/area/crew_quarters/sleep/vistor_room_1) "cMs" = (/obj/structure/curtain/open/shower,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/southright{name = "Shower"},/obj/machinery/shower{pixel_y = 3},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_1) "cMt" = (/obj/structure/toilet,/obj/machinery/light{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_1) -"cMu" = (/obj/structure/table/standard,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_1) +"cMu" = (/obj/structure/table/standard,/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_1) "cMv" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cMw" = (/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cMx" = (/turf/simulated/wall,/area/crew_quarters/sleep/vistor_room_2) -"cMy" = (/obj/structure/table/standard,/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_2) +"cMy" = (/obj/structure/table/standard,/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_2) "cMz" = (/obj/structure/toilet,/obj/machinery/light{dir = 1},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_2) "cMA" = (/obj/structure/curtain/open/shower,/obj/machinery/door/window/southright{name = "Shower"},/obj/structure/window/reinforced{dir = 8},/obj/machinery/shower{pixel_y = 3},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_2) "cMB" = (/turf/simulated/wall,/area/crew_quarters/sleep/vistor_room_7) "cMC" = (/obj/structure/curtain/open/shower,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/southright{name = "Shower"},/obj/machinery/shower{pixel_y = 3},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_7) "cMD" = (/obj/structure/toilet,/obj/machinery/light{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_7) -"cME" = (/obj/structure/table/standard,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_7) +"cME" = (/obj/structure/table/standard,/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_7) "cMF" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cMG" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cMH" = (/turf/simulated/wall,/area/crew_quarters/sleep/vistor_room_8) -"cMI" = (/obj/structure/table/standard,/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_8) +"cMI" = (/obj/structure/table/standard,/obj/item/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_8) "cMJ" = (/obj/structure/toilet,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_8) "cMK" = (/obj/structure/curtain/open/shower,/obj/machinery/door/window/southright{name = "Shower"},/obj/structure/window/reinforced{dir = 8},/obj/machinery/shower{pixel_y = 3},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_8) "cML" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/quartermaster/storage) @@ -7438,11 +7438,11 @@ "cNb" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash) "cNc" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash) "cNd" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/table/standard,/obj/machinery/light_switch{pixel_x = 12; pixel_y = 24},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash) -"cNe" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/structure/undies_wardrobe,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash) +"cNe" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/structure/undies_wardrobe,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash) "cNf" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway) "cNg" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway) "cNh" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/engineering_hallway) -"cNi" = (/obj/effect/decal/cleanable/blood/oil/streak{amount = 0},/obj/item/weapon/tool/wirecutters,/turf/simulated/floor/tiled,/area/construction) +"cNi" = (/obj/effect/decal/cleanable/blood/oil/streak{amount = 0},/obj/item/tool/wirecutters,/turf/simulated/floor/tiled,/area/construction) "cNj" = (/obj/machinery/suit_cycler/medical,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "cNk" = (/obj/machinery/door/airlock/glass_command{name = "E.V.A. Cycler Access"; req_one_access = list(18)},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cNl" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) @@ -7451,7 +7451,7 @@ "cNo" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_command{name = "E.V.A."; req_one_access = list(18)},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cNp" = (/obj/effect/floor_decal/corner/red{dir = 9},/obj/machinery/computer/security,/obj/machinery/firealarm{dir = 8; pixel_x = -24; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/checkpoint2) "cNq" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/security/checkpoint2) -"cNr" = (/obj/effect/floor_decal/corner/red{dir = 6},/obj/structure/table/reinforced,/obj/item/weapon/pen,/turf/simulated/floor/tiled,/area/security/checkpoint2) +"cNr" = (/obj/effect/floor_decal/corner/red{dir = 6},/obj/structure/table/reinforced,/obj/item/pen,/turf/simulated/floor/tiled,/area/security/checkpoint2) "cNs" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) "cNt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/hallway/secondary/docking_hallway) "cNu" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) @@ -7486,9 +7486,9 @@ "cNX" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/mirror{pixel_x = -28},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_8) "cNY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_8) "cNZ" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_8) -"cOa" = (/obj/structure/table/standard,/obj/item/clothing/head/soft,/obj/item/weapon/stamp{pixel_x = -3; pixel_y = 3},/obj/item/clothing/head/soft,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -24},/turf/simulated/floor/tiled,/area/quartermaster/storage) +"cOa" = (/obj/structure/table/standard,/obj/item/clothing/head/soft,/obj/item/stamp{pixel_x = -3; pixel_y = 3},/obj/item/clothing/head/soft,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -24},/turf/simulated/floor/tiled,/area/quartermaster/storage) "cOb" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = 0; pixel_y = -30},/turf/simulated/floor/tiled,/area/quartermaster/storage) -"cOc" = (/obj/structure/table/standard,/obj/item/weapon/hand_labeler,/obj/item/weapon/stamp{pixel_x = -3; pixel_y = 3},/obj/item/weapon/hand_labeler,/turf/simulated/floor/tiled,/area/quartermaster/storage) +"cOc" = (/obj/structure/table/standard,/obj/item/hand_labeler,/obj/item/stamp{pixel_x = -3; pixel_y = 3},/obj/item/hand_labeler,/turf/simulated/floor/tiled,/area/quartermaster/storage) "cOd" = (/obj/machinery/status_display/supply_display,/turf/simulated/wall,/area/quartermaster/warehouse) "cOe" = (/obj/structure/closet/crate/medical,/obj/effect/floor_decal/corner/brown/full,/turf/simulated/floor/tiled,/area/quartermaster/warehouse) "cOf" = (/turf/simulated/floor/tiled/steel,/area/quartermaster/warehouse) @@ -7499,7 +7499,7 @@ "cOk" = (/obj/machinery/power/breakerbox/activated{RCon_tag = "Atmos Substation Bypass"},/turf/simulated/floor,/area/engineering/atmos/storage) "cOl" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/engineering/atmos/storage) "cOm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/engineering/atmos/storage) -"cOn" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/item/weapon/tank/oxygen/yellow,/obj/item/weapon/tank/oxygen/yellow,/turf/simulated/floor,/area/engineering/atmos/storage) +"cOn" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/item/tank/oxygen/yellow,/obj/item/tank/oxygen/yellow,/turf/simulated/floor,/area/engineering/atmos/storage) "cOo" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/tiled/yellow,/area/engineering/locker_room) "cOp" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/yellow,/area/engineering/locker_room) "cOq" = (/obj/machinery/door/airlock/engineering{name = "Engineering Washroom"; req_one_access = list(10)},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/freezer,/area/engineering/locker_room) @@ -7513,18 +7513,18 @@ "cOy" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor,/area/construction) "cOz" = (/obj/machinery/suit_cycler/engineering,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "cOA" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) -"cOB" = (/obj/structure/table/reinforced,/obj/item/clothing/head/welding,/obj/item/weapon/storage/belt/utility,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/camera/network/command{c_tag = "EVA - Aft"; dir = 4},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) +"cOB" = (/obj/structure/table/reinforced,/obj/item/clothing/head/welding,/obj/item/storage/belt/utility,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/camera/network/command{c_tag = "EVA - Aft"; dir = 4},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cOC" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "cOD" = (/obj/structure/table/reinforced,/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/stack/rods{amount = 50},/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cOE" = (/obj/effect/floor_decal/corner/red/full,/obj/structure/filingcabinet/chestdrawer,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled,/area/security/checkpoint2) "cOF" = (/obj/effect/floor_decal/corner/red{dir = 10},/obj/machinery/light,/turf/simulated/floor/tiled,/area/security/checkpoint2) -"cOG" = (/obj/effect/floor_decal/corner/red/full{dir = 4},/obj/structure/table/reinforced,/obj/item/weapon/tool/crowbar,/obj/item/device/flash,/obj/machinery/camera/network/security{c_tag = "SEC - Arrival Checkpoint"; dir = 1},/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/tiled,/area/security/checkpoint2) +"cOG" = (/obj/effect/floor_decal/corner/red/full{dir = 4},/obj/structure/table/reinforced,/obj/item/tool/crowbar,/obj/item/flash,/obj/machinery/camera/network/security{c_tag = "SEC - Arrival Checkpoint"; dir = 1},/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/tiled,/area/security/checkpoint2) "cOH" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) "cOI" = (/obj/effect/floor_decal/industrial/loading{icon_state = "loadingarea"; dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) "cOJ" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) "cOK" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) "cOL" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) -"cOM" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/docking_hallway) +"cOM" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/docking_hallway) "cON" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/maintenance/substation/dock) "cOO" = (/obj/machinery/power/breakerbox/activated{RCon_tag = "Dock Substation Bypass"},/turf/simulated/floor/plating,/area/maintenance/substation/dock) "cOP" = (/obj/machinery/power/smes/buildable{charge = 0; RCon_tag = "Substation - Dock"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/maintenance/substation/dock) @@ -7540,25 +7540,25 @@ "cOZ" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway2) "cPa" = (/obj/structure/undies_wardrobe,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet) "cPb" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet) -"cPc" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 22},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet) +"cPc" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 22},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet) "cPd" = (/obj/structure/table/standard,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) -"cPe" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/brown,/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) +"cPe" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) "cPf" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) "cPg" = (/obj/machinery/door/airlock{name = "Restroom"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_1) "cPh" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/camera/network/civilian{c_tag = "CIV - Visitor Room Hall AP"; dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cPi" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/crew_quarters/sleep/vistor_room_2) "cPj" = (/obj/machinery/door/airlock{name = "Restroom"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_2) "cPk" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) -"cPl" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/brown,/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) +"cPl" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) "cPm" = (/obj/structure/table/standard,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) "cPn" = (/obj/structure/table/standard,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) -"cPo" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/brown,/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) +"cPo" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) "cPp" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) "cPq" = (/obj/machinery/door/airlock{name = "Restroom"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_7) "cPr" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/white{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/camera/network/civilian{c_tag = "CIV - Visitor Room Hall AS"; dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cPs" = (/obj/machinery/door/airlock{name = "Restroom"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_8) "cPt" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) -"cPu" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/brown,/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) +"cPu" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) "cPv" = (/obj/structure/table/standard,/obj/machinery/newscaster{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) "cPw" = (/obj/machinery/power/smes/buildable{charge = 2e+006; RCon_tag = "Substation - Atmospherics"},/obj/structure/cable/cyan{d2 = 2; icon_state = "0-2"},/obj/structure/cable/cyan,/turf/simulated/floor,/area/engineering/atmos/storage) "cPx" = (/obj/machinery/power/terminal{dir = 8},/obj/structure/cable,/turf/simulated/floor,/area/engineering/atmos/storage) @@ -7566,8 +7566,8 @@ "cPz" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/cyan{d2 = 2; icon_state = "0-2"},/turf/simulated/floor,/area/engineering/atmos/storage) "cPA" = (/turf/simulated/wall/r_wall,/area/engineering/atmos/monitoring) "cPB" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = -36; pixel_y = 0},/turf/simulated/floor/tiled/yellow,/area/engineering/locker_room) -"cPC" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/regular,/obj/item/bodybag/cryobag{pixel_x = 6},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/random/medical/lite,/turf/simulated/floor/tiled/yellow,/area/engineering/locker_room) -"cPD" = (/obj/structure/table/standard,/obj/structure/bedsheetbin,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/weapon/soap/nanotrasen,/obj/random/soap,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash) +"cPC" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/regular,/obj/item/bodybag/cryobag{pixel_x = 6},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/random/medical/lite,/turf/simulated/floor/tiled/yellow,/area/engineering/locker_room) +"cPD" = (/obj/structure/table/standard,/obj/structure/bedsheetbin,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/soap/nanotrasen,/obj/random/soap,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash) "cPE" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash) "cPF" = (/obj/machinery/shower{dir = 1},/obj/machinery/door/window/northleft{name = "Shower"; req_access = list()},/obj/structure/curtain/open/shower/engineering,/obj/structure/window/basic{dir = 8},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash) "cPG" = (/obj/machinery/shower{dir = 1},/obj/machinery/door/window/northright{dir = 1; name = "Shower"; req_access = list()},/obj/structure/curtain/open/shower/engineering,/obj/structure/window/basic{dir = 8},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/engi_wash) @@ -7576,11 +7576,11 @@ "cPJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/airlock/glass{name = "Engineering Access"},/turf/simulated/floor/tiled,/area/engineering/foyer) "cPK" = (/obj/machinery/door/airlock/glass{name = "Engineering Access"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/engineering/foyer) "cPL" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor,/area/construction) -"cPM" = (/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/construction) -"cPN" = (/obj/item/device/flashlight,/turf/simulated/floor,/area/construction) +"cPM" = (/obj/item/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/construction) +"cPN" = (/obj/item/flashlight,/turf/simulated/floor,/area/construction) "cPO" = (/turf/simulated/wall/r_wall,/area/construction) "cPP" = (/obj/machinery/suit_cycler/mining,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) -"cPQ" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/table/reinforced,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/item/device/multitool,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) +"cPQ" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/table/reinforced,/obj/item/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/item/multitool,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cPR" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "cPS" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cPT" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced{dir = 1},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) @@ -7591,8 +7591,8 @@ "cPY" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass{name = "Dock"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/docking_lounge) "cPZ" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/airlock/glass{name = "Dock"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/docking_lounge) "cQa" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/glass{name = "Dock"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/docking_lounge) -"cQb" = (/obj/structure/table/woodentable,/obj/item/weapon/pen/blue{pixel_x = -5; pixel_y = -1},/obj/item/weapon/pen/red{pixel_x = -1; pixel_y = 3},/obj/item/weapon/pen,/obj/item/weapon/paper,/turf/simulated/floor/wood,/area/crew_quarters/longue_area) -"cQc" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/device/taperecorder,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -26},/turf/simulated/floor/wood,/area/crew_quarters/longue_area) +"cQb" = (/obj/structure/table/woodentable,/obj/item/pen/blue{pixel_x = -5; pixel_y = -1},/obj/item/pen/red{pixel_x = -1; pixel_y = 3},/obj/item/pen,/obj/item/paper,/turf/simulated/floor/wood,/area/crew_quarters/longue_area) +"cQc" = (/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/taperecorder,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -26},/turf/simulated/floor/wood,/area/crew_quarters/longue_area) "cQd" = (/obj/structure/bed/chair/comfy/black{dir = 4},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/carpet,/area/crew_quarters/longue_area) "cQe" = (/obj/machinery/camera/network/civilian{c_tag = "CIV - Lounge"; dir = 1},/turf/simulated/floor/carpet,/area/crew_quarters/longue_area) "cQf" = (/obj/structure/bed/chair/comfy/black{dir = 8},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = 12; pixel_y = -24},/obj/structure/cable/green,/turf/simulated/floor/carpet,/area/crew_quarters/longue_area) @@ -7604,10 +7604,10 @@ "cQl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) "cQm" = (/obj/machinery/alarm{pixel_y = 22},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) "cQn" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) -"cQo" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) +"cQo" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) "cQp" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock{name = "Room 1"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) "cQq" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock{name = "Room 2"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) -"cQr" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/junction{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) +"cQr" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/junction{dir = 1},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) "cQs" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) "cQt" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) "cQu" = (/obj/machinery/alarm{pixel_y = 22},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) @@ -7618,10 +7618,10 @@ "cQz" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) "cQA" = (/obj/machinery/alarm{pixel_y = 22},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) "cQB" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/structure/disposalpipe/junction{icon_state = "pipe-j2"; dir = 2},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) -"cQC" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) +"cQC" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) "cQD" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock{name = "Room 7"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) "cQE" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock{name = "Room 8"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) -"cQF" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) +"cQF" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) "cQG" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) "cQH" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) "cQI" = (/obj/machinery/alarm{pixel_y = 22},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) @@ -7645,7 +7645,7 @@ "cRa" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/engineering/foyer) "cRb" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/engineering/foyer) "cRc" = (/turf/simulated/wall/r_wall,/area/crew_quarters/heads/chief) -"cRd" = (/obj/structure/table/reinforced,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) +"cRd" = (/obj/structure/table/reinforced,/obj/item/assembly/signaler,/obj/item/assembly/signaler,/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cRe" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cRf" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) "cRg" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = 12; pixel_y = -24},/turf/simulated/floor/tiled,/area/ai_monitored/storage/eva) @@ -7675,14 +7675,14 @@ "cRE" = (/obj/structure/bed/chair/comfy/beige{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) "cRF" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) "cRG" = (/obj/structure/bed/chair/comfy/beige{dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) -"cRH" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) +"cRH" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) "cRI" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) "cRJ" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) "cRK" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_1) "cRL" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) "cRM" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) "cRN" = (/obj/structure/table/standard,/obj/machinery/microwave,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) -"cRO" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) +"cRO" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) "cRP" = (/obj/structure/bed/chair/comfy/beige{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) "cRQ" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) "cRR" = (/obj/structure/bed/chair/comfy/beige{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_2) @@ -7690,7 +7690,7 @@ "cRT" = (/obj/structure/bed/chair/comfy/beige{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) "cRU" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) "cRV" = (/obj/structure/bed/chair/comfy/beige{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) -"cRW" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) +"cRW" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) "cRX" = (/obj/structure/table/standard,/obj/machinery/microwave,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) "cRY" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) "cRZ" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_7) @@ -7699,7 +7699,7 @@ "cSc" = (/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/disposal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) "cSd" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) "cSe" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) -"cSf" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) +"cSf" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/light,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) "cSg" = (/obj/structure/bed/chair/comfy/beige{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) "cSh" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) "cSi" = (/obj/structure/bed/chair/comfy/beige{dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_8) @@ -7715,9 +7715,9 @@ "cSs" = (/turf/simulated/wall/r_wall,/area/engineering/break_room) "cSt" = (/turf/simulated/wall,/area/engineering/break_room) "cSu" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/newscaster{pixel_x = -28; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/engineering/break_room) -"cSv" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/woodentable,/obj/item/weapon/book/manual/engineering_construction,/obj/item/weapon/book/manual/evaguide{pixel_x = -2; pixel_y = 7},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/tiled,/area/engineering/break_room) -"cSw" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/woodentable,/obj/item/weapon/dice,/obj/structure/noticeboard{pixel_x = 0; pixel_y = 27},/obj/item/weapon/deck/cards,/turf/simulated/floor/tiled,/area/engineering/break_room) -"cSx" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/woodentable,/obj/item/weapon/book/manual/engineering_guide{pixel_x = 3; pixel_y = 2},/obj/item/weapon/book/manual/atmospipes,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/machinery/light_switch{pixel_x = -12; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled,/area/engineering/break_room) +"cSv" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/woodentable,/obj/item/book/manual/engineering_construction,/obj/item/book/manual/evaguide{pixel_x = -2; pixel_y = 7},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/tiled,/area/engineering/break_room) +"cSw" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/woodentable,/obj/item/dice,/obj/structure/noticeboard{pixel_x = 0; pixel_y = 27},/obj/item/deck/cards,/turf/simulated/floor/tiled,/area/engineering/break_room) +"cSx" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/woodentable,/obj/item/book/manual/engineering_guide{pixel_x = 3; pixel_y = 2},/obj/item/book/manual/atmospipes,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/machinery/light_switch{pixel_x = -12; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled,/area/engineering/break_room) "cSy" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/engineering/break_room) "cSz" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/bookcase/manuals/engineering,/turf/simulated/floor/tiled,/area/engineering/break_room) "cSA" = (/obj/machinery/atm{pixel_y = 28},/obj/machinery/newscaster{pixel_x = -31; pixel_y = 0},/obj/effect/floor_decal/corner/yellow/diagonal,/turf/simulated/floor/tiled,/area/engineering/foyer) @@ -7728,7 +7728,7 @@ "cSF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "ceoffice"; name = "CE Office Privacy Shutters"; opacity = 0},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/crew_quarters/heads/chief) "cSG" = (/obj/machinery/computer/atmos_alert,/obj/effect/floor_decal/corner/blue/full{dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "cSH" = (/obj/machinery/computer/station_alert/all,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) -"cSI" = (/obj/structure/table/reinforced,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/machinery/light{dir = 1},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 27},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) +"cSI" = (/obj/structure/table/reinforced,/obj/item/cell/high{charge = 100; maxcharge = 15000},/obj/item/cell/high{charge = 100; maxcharge = 15000},/obj/machinery/light{dir = 1},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 27},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "cSJ" = (/obj/structure/closet/secure_closet/engineering_chief,/obj/effect/floor_decal/corner/blue/full{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "cSK" = (/obj/machinery/button/remote/driver{id = "enginecore"; name = "Emergency Core Eject"; pixel_x = 0; pixel_y = 21},/obj/structure/window/basic,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/heads/chief) "cSL" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/engineering) @@ -7761,14 +7761,14 @@ "cTm" = (/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard) "cTn" = (/obj/structure/flora/pottedplant{icon_state = "plant-22"},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/starboard) "cTo" = (/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet) -"cTp" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/item/weapon/bikehorn/rubberducky,/obj/machinery/light,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet) -"cTq" = (/obj/item/weapon/handcuffs/cable/pink{desc = "Looks fluffy and comfy. Could be used to tie something up."; name = "Fuzzy Cuffs"},/obj/item/latexballon,/turf/simulated/floor,/area/crew_quarters/locker/locker_toilet) +"cTp" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/item/bikehorn/rubberducky,/obj/machinery/light,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet) +"cTq" = (/obj/item/handcuffs/cable/pink{desc = "Looks fluffy and comfy. Could be used to tie something up."; name = "Fuzzy Cuffs"},/obj/item/latexballon,/turf/simulated/floor,/area/crew_quarters/locker/locker_toilet) "cTr" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cTs" = (/obj/machinery/atmospherics/pipe/simple/visible/green,/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored/upper_level) "cTt" = (/obj/machinery/atmospherics/pipe/simple/visible/yellow,/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored/upper_level) -"cTu" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/table/standard,/obj/machinery/requests_console{department = "Atmospherics"; departmentType = 3; name = "Atmos RC"; pixel_x = 0; pixel_y = 28},/obj/item/device/t_scanner,/obj/item/device/multitool{pixel_x = 5},/obj/item/device/radio/headset/headset_eng,/obj/item/weapon/cartridge/atmos,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/item/clothing/ears/earmuffs,/obj/item/clothing/ears/earmuffs,/obj/item/weapon/cartridge/atmos,/obj/item/device/pipe_painter,/turf/simulated/floor/tiled,/area/engineering/atmos) -"cTv" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/table/standard,/obj/structure/fireaxecabinet{pixel_y = 32},/obj/machinery/cell_charger,/obj/item/weapon/tool/wrench,/turf/simulated/floor/tiled,/area/engineering/atmos) -"cTw" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/table/standard,/obj/machinery/newscaster{pixel_y = 30},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/weapon/storage/belt/utility/atmostech,/obj/item/weapon/storage/belt/utility/atmostech,/obj/machinery/camera/network/engineering{c_tag = "ENG - Atmospherics Fore Starboard"; dir = 2},/turf/simulated/floor/tiled,/area/engineering/atmos) +"cTu" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/table/standard,/obj/machinery/requests_console{department = "Atmospherics"; departmentType = 3; name = "Atmos RC"; pixel_x = 0; pixel_y = 28},/obj/item/t_scanner,/obj/item/multitool{pixel_x = 5},/obj/item/radio/headset/headset_eng,/obj/item/cartridge/atmos,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/item/clothing/ears/earmuffs,/obj/item/clothing/ears/earmuffs,/obj/item/cartridge/atmos,/obj/item/pipe_painter,/turf/simulated/floor/tiled,/area/engineering/atmos) +"cTv" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/table/standard,/obj/structure/fireaxecabinet{pixel_y = 32},/obj/machinery/cell_charger,/obj/item/tool/wrench,/turf/simulated/floor/tiled,/area/engineering/atmos) +"cTw" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/table/standard,/obj/machinery/newscaster{pixel_y = 30},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/storage/belt/utility/atmostech,/obj/item/storage/belt/utility/atmostech,/obj/machinery/camera/network/engineering{c_tag = "ENG - Atmospherics Fore Starboard"; dir = 2},/turf/simulated/floor/tiled,/area/engineering/atmos) "cTx" = (/obj/effect/decal/warning_stripes,/obj/machinery/atmospherics/pipe/manifold4w/visible/scrubbers,/obj/machinery/atmospherics/pipe/manifold4w/visible/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/engineering/atmos) "cTy" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/cyan{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/engineering/atmos) "cTz" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock/glass_atmos{name = "Atmospherics Monitoring Room"; req_access = list(24)},/obj/machinery/door/firedoor/border_only,/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/atmos/monitoring) @@ -7786,10 +7786,10 @@ "cTL" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/effect/floor_decal/corner/yellow,/turf/simulated/floor/tiled,/area/engineering/foyer) "cTM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "ceoffice"; name = "CE Office Privacy Shutters"; opacity = 0},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/crew_quarters/heads/chief) "cTN" = (/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) -"cTO" = (/obj/structure/table/reinforced,/obj/item/weapon/stamp/ce,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/flame/lighter/zippo,/obj/item/device/megaphone,/obj/item/weapon/folder/yellow_ce,/obj/item/weapon/pen/multi,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) +"cTO" = (/obj/structure/table/reinforced,/obj/item/stamp/ce,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/flame/lighter/zippo,/obj/item/megaphone,/obj/item/folder/yellow_ce,/obj/item/pen/multi,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "cTP" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "cTQ" = (/obj/machinery/computer/security/telescreen{desc = "Used to monitor the engine room."; layer = 3.3; name = "Engine Monitor"; network = list("Engine"); pixel_x = 0; pixel_y = 28},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) -"cTR" = (/obj/machinery/keycard_auth{pixel_x = 0; pixel_y = 24},/obj/machinery/button/remote/airlock{desc = "A remote control-switch for the engine core airlock hatch bolts."; id = "engine_access_hatch"; name = "Engine Hatch Bolt Control"; pixel_x = -6; pixel_y = 32; req_access = newlist(); specialfunctions = 4},/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for engine core."; id = "EngineVent"; name = "Engine Ventillatory Control"; pixel_x = 6; pixel_y = 32; req_access = newlist()},/obj/structure/table/reinforced,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd,/obj/machinery/newscaster{layer = 3.3; pixel_x = 27; pixel_y = 0},/obj/effect/floor_decal/corner/blue/full{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) +"cTR" = (/obj/machinery/keycard_auth{pixel_x = 0; pixel_y = 24},/obj/machinery/button/remote/airlock{desc = "A remote control-switch for the engine core airlock hatch bolts."; id = "engine_access_hatch"; name = "Engine Hatch Bolt Control"; pixel_x = -6; pixel_y = 32; req_access = newlist(); specialfunctions = 4},/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for engine core."; id = "EngineVent"; name = "Engine Ventillatory Control"; pixel_x = 6; pixel_y = 32; req_access = newlist()},/obj/structure/table/reinforced,/obj/item/rcd_ammo,/obj/item/rcd_ammo,/obj/item/rcd_ammo,/obj/item/rcd_ammo,/obj/item/rcd,/obj/machinery/newscaster{layer = 3.3; pixel_x = 27; pixel_y = 0},/obj/effect/floor_decal/corner/blue/full{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "cTS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/meter,/obj/effect/decal/cleanable/dirt,/obj/machinery/light/small{dir = 8},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/maintenance/engineering) "cTT" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/engineering) "cTU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{req_access = list(12)},/turf/simulated/floor,/area/maintenance/evahallway) @@ -7820,8 +7820,8 @@ "cUt" = (/obj/machinery/vending/snack,/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) "cUu" = (/obj/machinery/vending/cigarette,/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/machinery/camera/network/civilian{c_tag = "CIV - Visitor's Dinning"; dir = 2},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) "cUv" = (/obj/structure/reagent_dispensers/water_cooler/full,/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) -"cUw" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/cups,/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) -"cUx" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) +"cUw" = (/obj/structure/table/standard,/obj/item/storage/box/cups,/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) +"cUx" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) "cUy" = (/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cUz" = (/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cUA" = (/turf/simulated/wall,/area/crew_quarters/visitor_lodging) @@ -7831,15 +7831,15 @@ "cUE" = (/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/machinery/atm{pixel_y = 30},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cUF" = (/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/machinery/camera/network/civilian{c_tag = "CIV - Visitor's Lodging"; dir = 2},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cUG" = (/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/bed/chair/office/dark,/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) -"cUH" = (/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) +"cUH" = (/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cUI" = (/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cUJ" = (/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue/diagonal,/obj/structure/flora/pottedplant{icon_state = "plant-22"},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cUK" = (/obj/machinery/door/firedoor/glass,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cUL" = (/turf/simulated/wall,/area/crew_quarters/visitor_laundry) -"cUM" = (/obj/machinery/washing_machine,/obj/effect/floor_decal/corner/blue{dir = 1},/obj/effect/floor_decal/corner/white{dir = 4},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry) +"cUM" = (/obj/machinery/washing_machine,/obj/effect/floor_decal/corner/blue{dir = 1},/obj/effect/floor_decal/corner/white{dir = 4},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry) "cUN" = (/obj/machinery/washing_machine,/obj/effect/floor_decal/corner/blue{dir = 1},/obj/effect/floor_decal/corner/white{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry) "cUO" = (/obj/effect/floor_decal/corner/blue{dir = 1},/obj/effect/floor_decal/corner/white{dir = 4},/obj/structure/undies_wardrobe,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry) -"cUP" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue{dir = 1},/obj/effect/floor_decal/corner/white{dir = 4},/obj/machinery/camera/network/civilian{c_tag = "CIV - Visitor's Dinning"; dir = 2},/obj/item/weapon/storage/laundry_basket,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry) +"cUP" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue{dir = 1},/obj/effect/floor_decal/corner/white{dir = 4},/obj/machinery/camera/network/civilian{c_tag = "CIV - Visitor's Dinning"; dir = 2},/obj/item/storage/laundry_basket,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry) "cUQ" = (/obj/machinery/recharge_station,/obj/effect/floor_decal/corner/blue{dir = 1},/obj/effect/floor_decal/corner/white{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry) "cUR" = (/obj/structure/closet/wardrobe/pjs,/obj/effect/floor_decal/corner/blue{dir = 1},/obj/effect/floor_decal/corner/white{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry) "cUS" = (/obj/structure/closet/wardrobe/pjs,/obj/effect/floor_decal/corner/blue/diagonal,/obj/effect/floor_decal/corner/white{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry) @@ -7874,13 +7874,13 @@ "cVv" = (/obj/structure/bed/chair/office/light{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for shutters."; id = "ceoffice"; name = "Chief Engineer Privacy Shutters"; pixel_x = -26; pixel_y = 18; req_access = list(56)},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/landmark/start{name = "Chief Engineer"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "cVw" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "cVx" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) -"cVy" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/clothing/mask/breath,/obj/item/weapon/rig/ce/equipped,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) +"cVy" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/clothing/mask/breath,/obj/item/rig/ce/equipped,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "cVz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/engineering) "cVA" = (/obj/structure/table/rack{dir = 1},/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/turf/simulated/floor,/area/maintenance/evahallway) "cVB" = (/obj/structure/closet/crate,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor,/area/maintenance/evahallway) "cVC" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/evahallway) "cVD" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable,/turf/simulated/floor,/area/maintenance/evahallway) -"cVE" = (/obj/structure/closet/crate,/obj/item/clothing/mask/gas,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/binary/pump/on,/obj/random/maintenance/clean,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/evahallway) +"cVE" = (/obj/structure/closet/crate,/obj/item/clothing/mask/gas,/obj/item/flashlight,/obj/item/flashlight,/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/binary/pump/on,/obj/random/maintenance/clean,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/evahallway) "cVF" = (/obj/structure/bed/chair,/turf/simulated/floor/carpet,/area/hallway/secondary/entry/docking_lounge) "cVG" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/lino,/area/hallway/secondary/entry/docking_lounge) "cVH" = (/obj/structure/bed/chair,/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/carpet,/area/hallway/secondary/entry/docking_lounge) @@ -7906,10 +7906,10 @@ "cWb" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cWc" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cWd" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/table/reinforced,/obj/machinery/recharger,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) -"cWe" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/table/reinforced,/obj/item/weapon/hand_labeler,/obj/item/device/communicator,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) -"cWf" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table/reinforced,/obj/item/weapon/folder,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) -"cWg" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/table/reinforced,/obj/item/device/paicard,/obj/item/clothing/head/soft/grey,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) -"cWh" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) +"cWe" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/table/reinforced,/obj/item/hand_labeler,/obj/item/communicator,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) +"cWf" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table/reinforced,/obj/item/folder,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) +"cWg" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/table/reinforced,/obj/item/paicard,/obj/item/clothing/head/soft/grey,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) +"cWh" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/table/reinforced,/obj/item/paper_bin,/obj/item/pen,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cWi" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cWj" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cWk" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) @@ -7938,8 +7938,8 @@ "cWH" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/engineering/atmos/monitoring) "cWI" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/vending/cigarette,/turf/simulated/floor/tiled,/area/engineering/break_room) "cWJ" = (/obj/structure/bed/chair/comfy/brown{dir = 4},/obj/effect/landmark/start{name = "Station Engineer"},/turf/simulated/floor/carpet,/area/engineering/break_room) -"cWK" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/supermatter_engine{pixel_x = -3},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/carpet,/area/engineering/break_room) -"cWL" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/carpet,/area/engineering/break_room) +"cWK" = (/obj/structure/table/woodentable,/obj/item/book/manual/supermatter_engine{pixel_x = -3},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/carpet,/area/engineering/break_room) +"cWL" = (/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/carpet,/area/engineering/break_room) "cWM" = (/obj/structure/bed/chair/comfy/brown{dir = 8},/obj/effect/landmark/start{name = "Station Engineer"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/carpet,/area/engineering/break_room) "cWN" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_engineeringatmos{name = "Engineering Break Room"; req_one_access = list(10)},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/break_room) "cWO" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner/yellow{dir = 8},/turf/simulated/floor/tiled,/area/engineering/foyer) @@ -7950,7 +7950,7 @@ "cWT" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "ceoffice"; name = "CE Office Privacy Shutters"; opacity = 0},/obj/structure/cable/green,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/crew_quarters/heads/chief) "cWU" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "cWV" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) -"cWW" = (/obj/structure/table/reinforced,/obj/item/weapon/clipboard,/obj/item/clothing/glasses/meson{pixel_y = 4},/obj/item/clothing/glasses/welding/superior,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/book/manual/supermatter_engine,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) +"cWW" = (/obj/structure/table/reinforced,/obj/item/clipboard,/obj/item/clothing/glasses/meson{pixel_y = 4},/obj/item/clothing/glasses/welding/superior,/obj/item/storage/fancy/cigarettes,/obj/item/book/manual/supermatter_engine,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "cWX" = (/obj/structure/table/reinforced,/obj/machinery/computer/skills,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "cWY" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "cWZ" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) @@ -7960,9 +7960,9 @@ "cXd" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 9; icon_state = "intact"},/turf/simulated/floor,/area/maintenance/evahallway) "cXe" = (/obj/structure/table/glass,/turf/simulated/floor/carpet,/area/hallway/secondary/entry/docking_lounge) "cXf" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/lino,/area/hallway/secondary/entry/docking_lounge) -"cXg" = (/obj/structure/table/glass,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/turf/simulated/floor/carpet,/area/hallway/secondary/entry/docking_lounge) +"cXg" = (/obj/structure/table/glass,/obj/item/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/turf/simulated/floor/carpet,/area/hallway/secondary/entry/docking_lounge) "cXh" = (/obj/structure/table/glass,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/docking_lounge) -"cXi" = (/obj/structure/table/glass,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/item/weapon/book/codex/lore/vir,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/docking_lounge) +"cXi" = (/obj/structure/table/glass,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/item/book/codex/lore/vir,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/docking_lounge) "cXj" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5; icon_state = "intact"},/turf/simulated/floor,/area/maintenance/arrivals) "cXk" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10; icon_state = "intact"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/maintenance/arrivals) "cXl" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry/starboard) @@ -7990,7 +7990,7 @@ "cXH" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry) "cXI" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry) "cXJ" = (/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry) -"cXK" = (/obj/structure/closet/crate,/obj/item/weapon/bedsheet/orange,/obj/item/weapon/bedsheet/orange,/obj/item/weapon/bedsheet/yellow,/obj/item/weapon/bedsheet/purple,/obj/item/weapon/bedsheet/red,/obj/item/weapon/bedsheet/brown,/obj/item/weapon/bedsheet/green,/obj/effect/floor_decal/corner/white/diagonal{icon_state = "corner_white_diagonal"; dir = 4},/obj/effect/floor_decal/corner/blue,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green,/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry) +"cXK" = (/obj/structure/closet/crate,/obj/item/bedsheet/orange,/obj/item/bedsheet/orange,/obj/item/bedsheet/yellow,/obj/item/bedsheet/purple,/obj/item/bedsheet/red,/obj/item/bedsheet/brown,/obj/item/bedsheet/green,/obj/effect/floor_decal/corner/white/diagonal{icon_state = "corner_white_diagonal"; dir = 4},/obj/effect/floor_decal/corner/blue,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green,/obj/machinery/light_switch{pixel_x = -12; pixel_y = -24},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry) "cXL" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; name = "Atmospherics Lockdown"; opacity = 0},/turf/simulated/floor,/area/engineering/atmos) "cXM" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/engineering/atmos) "cXN" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/engineering/atmos) @@ -8005,12 +8005,12 @@ "cXW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/engineering/atmos/monitoring) "cXX" = (/obj/machinery/computer/security/engineering,/turf/simulated/floor/tiled,/area/engineering/atmos/monitoring) "cXY" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/engineering/atmos/monitoring) -"cXZ" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled,/area/engineering/atmos/monitoring) +"cXZ" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled,/area/engineering/atmos/monitoring) "cYa" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/reinforced,/obj/machinery/chemical_dispenser/bar_soft/full,/obj/machinery/camera/network/engineering{c_tag = "ENG - Break Room"; dir = 4},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled,/area/engineering/break_room) "cYb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/turf/simulated/floor/carpet,/area/engineering/break_room) "cYc" = (/obj/structure/bed/chair/comfy/brown{dir = 4},/obj/effect/landmark/start{name = "Station Engineer"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/carpet,/area/engineering/break_room) -"cYd" = (/obj/structure/table/woodentable,/obj/item/weapon/folder/yellow,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/turf/simulated/floor/carpet,/area/engineering/break_room) -"cYe" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/snacks/chips,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/carpet,/area/engineering/break_room) +"cYd" = (/obj/structure/table/woodentable,/obj/item/folder/yellow,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/turf/simulated/floor/carpet,/area/engineering/break_room) +"cYe" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/snacks/chips,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/carpet,/area/engineering/break_room) "cYf" = (/obj/structure/bed/chair/comfy/brown{dir = 8},/obj/effect/landmark/start{name = "Station Engineer"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/carpet,/area/engineering/break_room) "cYg" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/carpet,/area/engineering/break_room) "cYh" = (/obj/machinery/door/airlock/glass_engineeringatmos{name = "Engineering Break Room"; req_one_access = list(10)},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/engineering/break_room) @@ -8025,7 +8025,7 @@ "cYq" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = 25},/obj/effect/floor_decal/corner/blue/full{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "cYr" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 8; icon_state = "map"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/evahallway) "cYs" = (/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/atmospherics/portables_connector{dir = 8},/turf/simulated/floor/plating,/area/maintenance/evahallway) -"cYt" = (/obj/structure/bed/chair{dir = 1},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/carpet,/area/hallway/secondary/entry/docking_lounge) +"cYt" = (/obj/structure/bed/chair{dir = 1},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/carpet,/area/hallway/secondary/entry/docking_lounge) "cYu" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/carpet,/area/hallway/secondary/entry/docking_lounge) "cYv" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/lino,/area/hallway/secondary/entry/docking_lounge) "cYw" = (/obj/structure/bed/chair{dir = 1},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/carpet,/area/hallway/secondary/entry/docking_lounge) @@ -8033,19 +8033,19 @@ "cYy" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/docking_lounge) "cYz" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/docking_lounge) "cYA" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/lino,/area/hallway/secondary/entry/docking_lounge) -"cYB" = (/obj/structure/bed/chair{dir = 1},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/turf/simulated/floor/carpet,/area/hallway/secondary/entry/docking_lounge) +"cYB" = (/obj/structure/bed/chair{dir = 1},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/turf/simulated/floor/carpet,/area/hallway/secondary/entry/docking_lounge) "cYC" = (/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/atmospherics/portables_connector{dir = 4},/turf/simulated/floor/plating,/area/maintenance/arrivals) "cYD" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 4; icon_state = "map"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/maintenance/arrivals) "cYE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry/starboard) -"cYF" = (/obj/structure/table/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency5) +"cYF" = (/obj/structure/table/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency5) "cYG" = (/obj/machinery/portable_atmospherics/powered/pump/filled,/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency5) "cYH" = (/obj/structure/bed/chair{dir = 4},/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue/diagonal,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) "cYI" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) "cYJ" = (/obj/structure/bed/chair{dir = 8},/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue,/obj/machinery/light,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) "cYK" = (/obj/structure/bed/chair{dir = 4},/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) -"cYL" = (/obj/structure/table/standard,/obj/item/weapon/coin/silver,/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) +"cYL" = (/obj/structure/table/standard,/obj/item/coin/silver,/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) "cYM" = (/obj/structure/bed/chair{dir = 8},/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) -"cYN" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue/diagonal,/obj/effect/floor_decal/corner/white{dir = 8},/obj/item/weapon/book/codex/lore/vir,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) +"cYN" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue/diagonal,/obj/effect/floor_decal/corner/white{dir = 8},/obj/item/book/codex/lore/vir,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cYO" = (/obj/structure/bed/chair{dir = 1},/obj/effect/floor_decal/corner/blue,/obj/effect/floor_decal/corner/white{dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cYP" = (/obj/structure/bed/chair{dir = 1},/obj/effect/floor_decal/corner/blue,/obj/effect/floor_decal/corner/white{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cYQ" = (/obj/effect/floor_decal/corner/blue,/obj/effect/floor_decal/corner/white{dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) @@ -8056,7 +8056,7 @@ "cYV" = (/obj/effect/floor_decal/corner/blue,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cYW" = (/obj/effect/floor_decal/corner/blue,/obj/effect/floor_decal/corner/white{dir = 8},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cYX" = (/obj/structure/bed/chair{dir = 1},/obj/effect/floor_decal/corner/blue,/obj/effect/floor_decal/corner/white{dir = 8},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) -"cYY" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue,/obj/effect/floor_decal/corner/white/diagonal{icon_state = "corner_white_diagonal"; dir = 4},/obj/item/device/communicator,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) +"cYY" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue,/obj/effect/floor_decal/corner/white/diagonal{icon_state = "corner_white_diagonal"; dir = 4},/obj/item/communicator,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "cYZ" = (/obj/structure/closet/wardrobe/suit,/obj/effect/floor_decal/corner/blue,/obj/effect/floor_decal/corner/white{dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry) "cZa" = (/obj/structure/closet/wardrobe/xenos,/obj/effect/floor_decal/corner/blue,/obj/effect/floor_decal/corner/white{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry) "cZb" = (/obj/structure/closet/wardrobe/mixed,/obj/effect/floor_decal/corner/blue,/obj/effect/floor_decal/corner/white{dir = 8},/obj/item/clothing/accessory/storage/knifeharness,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_laundry) @@ -8076,7 +8076,7 @@ "cZp" = (/obj/machinery/atmospherics/pipe/simple/visible/universal,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/engineering/atmos) "cZq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/engineering/atmos/monitoring) "cZr" = (/obj/machinery/door/airlock/glass_atmos{name = "Atmospherics Monitoring Room"; req_access = list(24)},/obj/machinery/door/firedoor/border_only,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/engineering/atmos/monitoring) -"cZs" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/reinforced,/obj/machinery/microwave,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -22},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled,/area/engineering/break_room) +"cZs" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/reinforced,/obj/machinery/microwave,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -22},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled,/area/engineering/break_room) "cZt" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/carpet,/area/engineering/break_room) "cZu" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/carpet,/area/engineering/break_room) "cZv" = (/obj/structure/bed/chair/comfy/brown{dir = 1},/obj/effect/landmark/start{name = "Station Engineer"},/turf/simulated/floor/carpet,/area/engineering/break_room) @@ -8123,21 +8123,21 @@ "dak" = (/obj/machinery/atmospherics/binary/pump{dir = 2; name = "Transit to Waste"},/turf/simulated/floor/tiled,/area/engineering/atmos) "dal" = (/obj/machinery/atmospherics/binary/pump/on{name = "Scrubber to Waste"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/engineering/atmos) "dam" = (/obj/machinery/atmospherics/binary/pump/on{dir = 1; name = "Air to Supply"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/engineering/atmos) -"dan" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos) +"dan" = (/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos) "dao" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/engineering/atmos) "dap" = (/obj/machinery/pipedispenser,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/tiled,/area/engineering/atmos) "daq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; name = "Atmospherics Lockdown"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/break_room) -"dar" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/reinforced,/obj/item/weapon/storage/box/glasses/square,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/turf/simulated/floor/tiled,/area/engineering/break_room) +"dar" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/reinforced,/obj/item/storage/box/glasses/square,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/turf/simulated/floor/tiled,/area/engineering/break_room) "das" = (/obj/structure/bed/chair/office/dark,/turf/simulated/floor/carpet,/area/engineering/break_room) "dat" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/effect/floor_decal/corner/white{icon_state = "corner_white"; dir = 1},/obj/effect/floor_decal/corner/blue{dir = 8},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/machinery/portable_atmospherics/powered/pump/filled,/turf/simulated/floor/tiled,/area/engineering/foyer) "dau" = (/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/engineering/foyer) -"dav" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen/blue{pixel_x = 4; pixel_y = 4},/obj/item/weapon/pen/red,/obj/effect/floor_decal/corner/yellow{dir = 4},/turf/simulated/floor/tiled,/area/engineering/foyer) -"daw" = (/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/table/reinforced,/obj/item/weapon/packageWrap,/obj/item/weapon/hand_labeler,/obj/effect/floor_decal/corner/yellow{dir = 1},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/turf/simulated/floor/tiled,/area/engineering/foyer) +"dav" = (/obj/structure/table/reinforced,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/pen/blue{pixel_x = 4; pixel_y = 4},/obj/item/pen/red,/obj/effect/floor_decal/corner/yellow{dir = 4},/turf/simulated/floor/tiled,/area/engineering/foyer) +"daw" = (/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/table/reinforced,/obj/item/packageWrap,/obj/item/hand_labeler,/obj/effect/floor_decal/corner/yellow{dir = 1},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/turf/simulated/floor/tiled,/area/engineering/foyer) "dax" = (/obj/machinery/computer/station_alert,/obj/effect/floor_decal/corner/yellow/full{dir = 1},/turf/simulated/floor/tiled,/area/engineering/foyer) "day" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/engineering/engineering_monitoring) "daz" = (/obj/machinery/computer/power_monitor,/obj/effect/floor_decal/corner/yellow/full{icon_state = "corner_white_full"; dir = 8},/turf/simulated/floor/tiled,/area/engineering/engineering_monitoring) "daA" = (/obj/structure/bed/chair/office/dark{dir = 8},/obj/effect/landmark/start{name = "Station Engineer"},/turf/simulated/floor/tiled,/area/engineering/engineering_monitoring) -"daB" = (/obj/structure/table/reinforced,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/machinery/alarm{pixel_y = 25},/obj/effect/floor_decal/corner/yellow{dir = 5},/obj/machinery/button/remote/blast_door{id = "atmoslockdown"; name = "Atmospherics Lockdown"; pixel_x = 6; pixel_y = -12; req_access = newlist(); req_one_access = list(10,24)},/obj/machinery/button/remote/blast_door{id = "englockdown"; name = "Engineering Lockdown"; pixel_x = -6; pixel_y = -12; req_access = list(10)},/turf/simulated/floor/tiled,/area/engineering/engineering_monitoring) +"daB" = (/obj/structure/table/reinforced,/obj/item/flashlight,/obj/item/flashlight,/obj/machinery/alarm{pixel_y = 25},/obj/effect/floor_decal/corner/yellow{dir = 5},/obj/machinery/button/remote/blast_door{id = "atmoslockdown"; name = "Atmospherics Lockdown"; pixel_x = 6; pixel_y = -12; req_access = newlist(); req_one_access = list(10,24)},/obj/machinery/button/remote/blast_door{id = "englockdown"; name = "Engineering Lockdown"; pixel_x = -6; pixel_y = -12; req_access = list(10)},/turf/simulated/floor/tiled,/area/engineering/engineering_monitoring) "daC" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/bed/chair/office/dark{dir = 4},/obj/effect/landmark/start{name = "Atmospheric Technician"},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/light_switch{pixel_x = -12; pixel_y = 24},/turf/simulated/floor/tiled,/area/engineering/engineering_monitoring) "daD" = (/obj/machinery/computer/atmoscontrol,/obj/effect/floor_decal/corner/yellow/full{dir = 1},/turf/simulated/floor/tiled,/area/engineering/engineering_monitoring) "daE" = (/turf/simulated/wall/r_wall,/area/engineering/engineering_monitoring) @@ -8149,7 +8149,7 @@ "daK" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/lino,/area/hallway/secondary/entry/docking_lounge) "daL" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor,/area/maintenance/arrivals) "daM" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard) -"daN" = (/obj/structure/table/standard,/obj/item/device/t_scanner,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency5) +"daN" = (/obj/structure/table/standard,/obj/item/t_scanner,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency5) "daO" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency5) "daP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/crew_quarters/visitor_lodging) "daQ" = (/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) @@ -8184,7 +8184,7 @@ "dbt" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/effect/floor_decal/corner/red{dir = 9},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/portable_atmospherics/powered/scrubber,/turf/simulated/floor/tiled,/area/engineering/foyer) "dbu" = (/obj/machinery/atmospherics/pipe/simple/hidden/red{dir = 10; icon_state = "intact"},/turf/simulated/floor/tiled,/area/engineering/foyer) "dbv" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/tiled,/area/engineering/foyer) -"dbw" = (/obj/structure/table/reinforced,/obj/item/weapon/clipboard,/obj/item/weapon/tape_roll,/turf/simulated/floor/tiled,/area/engineering/foyer) +"dbw" = (/obj/structure/table/reinforced,/obj/item/clipboard,/obj/item/tape_roll,/turf/simulated/floor/tiled,/area/engineering/foyer) "dbx" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/engineering/foyer) "dby" = (/obj/structure/bed/chair/office/dark{dir = 1},/turf/simulated/floor/tiled,/area/engineering/foyer) "dbz" = (/obj/machinery/computer/station_alert,/turf/simulated/floor/tiled,/area/engineering/engineering_monitoring) @@ -8236,7 +8236,7 @@ "dct" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/effect/floor_decal/corner/red{dir = 9},/obj/machinery/portable_atmospherics/powered/scrubber,/turf/simulated/floor/tiled,/area/engineering/foyer) "dcu" = (/obj/machinery/atmospherics/pipe/manifold/hidden/red{dir = 4},/turf/simulated/floor/tiled,/area/engineering/foyer) "dcv" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/engineering/foyer) -"dcw" = (/obj/structure/table/reinforced,/obj/item/weapon/folder/yellow,/turf/simulated/floor/tiled,/area/engineering/foyer) +"dcw" = (/obj/structure/table/reinforced,/obj/item/folder/yellow,/turf/simulated/floor/tiled,/area/engineering/foyer) "dcx" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/bed/chair/office/dark{dir = 8},/turf/simulated/floor/tiled,/area/engineering/foyer) "dcy" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/effect/floor_decal/corner/yellow{dir = 6},/turf/simulated/floor/tiled,/area/engineering/foyer) "dcz" = (/obj/machinery/computer/rcon,/obj/effect/floor_decal/corner/yellow{dir = 9},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled,/area/engineering/engineering_monitoring) @@ -8278,7 +8278,7 @@ "ddj" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard) "ddk" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard) "ddl" = (/turf/simulated/floor/tiled,/area/vacant/vacant_site2) -"ddm" = (/obj/machinery/alarm{pixel_y = 23},/obj/item/weapon/camera_assembly,/turf/simulated/floor/tiled,/area/vacant/vacant_site2) +"ddm" = (/obj/machinery/alarm{pixel_y = 23},/obj/item/camera_assembly,/turf/simulated/floor/tiled,/area/vacant/vacant_site2) "ddn" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/vacant/vacant_site2) "ddo" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/vacant/vacant_site2) "ddp" = (/obj/structure/closet/crate,/obj/item/stack/material/steel{amount = 50},/obj/item/stack/rods,/turf/simulated/floor/tiled,/area/vacant/vacant_site2) @@ -8317,7 +8317,7 @@ "ddW" = (/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/dock_escape_pod_hallway_port) "ddX" = (/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth{frequency = 1380; id_tag = "escape_pod_6_berth"; pixel_x = 25; pixel_y = -30; tag_door = "escape_pod_6_berth_hatch"},/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/dock_escape_pod_hallway_port) "ddY" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/dock_escape_pod_hallway_port) -"ddZ" = (/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = -28},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/dock_escape_pod_hallway_port) +"ddZ" = (/obj/item/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = -28},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/dock_escape_pod_hallway_port) "dea" = (/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth{frequency = 1380; id_tag = "escape_pod_5_berth"; pixel_x = 25; pixel_y = -30; tag_door = "escape_pod_5_berth_hatch"},/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/dock_escape_pod_hallway_port) "deb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/dock_escape_pod_hallway_port) "dec" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/dock_escape_pod_hallway_port) @@ -8328,7 +8328,7 @@ "deh" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port) "dei" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/camera/network/northern_star{c_tag = "DOCK - Hallway Port 1"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port) "dej" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port) -"dek" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port) +"dek" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port) "del" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port) "dem" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/sign/directions/medical{dir = 4; pixel_y = 32},/obj/structure/sign/directions/science{dir = 4; pixel_y = 32; pixel_z = -8},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port) "den" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 6},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port) @@ -8441,7 +8441,7 @@ "dgq" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/vacant/vacant_site2) "dgr" = (/obj/structure/table/standard,/obj/item/clothing/head/soft/grey{pixel_x = -2; pixel_y = 3},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/vacant/vacant_site2) "dgs" = (/obj/structure/table/standard,/obj/structure/disposalpipe/segment,/obj/item/frame,/turf/simulated/floor/tiled,/area/vacant/vacant_site2) -"dgt" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled,/area/vacant/vacant_site2) +"dgt" = (/obj/item/stool/padded,/turf/simulated/floor/tiled,/area/vacant/vacant_site2) "dgu" = (/obj/item/stack/tile/floor,/turf/simulated/floor,/area/vacant/vacant_site2) "dgv" = (/obj/machinery/light/small{dir = 8},/obj/machinery/camera/network/engineering{c_tag = "Atmos Tank - Oxygen"; dir = 4},/turf/simulated/floor/reinforced/oxygen,/area/engineering/atmos) "dgw" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/reinforced/oxygen,/area/engineering/atmos) @@ -8473,9 +8473,9 @@ "dgW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/engineering/engine_eva) "dgX" = (/obj/machinery/door/airlock/glass_engineeringatmos{name = "Engineering EVA Storage"; req_one_access = list(11,24)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/engineering/engine_eva) "dgY" = (/obj/machinery/door/airlock/glass_engineeringatmos{name = "Engineering EVA Storage"; req_one_access = list(11,24)},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/engineering/engine_eva) -"dgZ" = (/obj/structure/table/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/engineering) +"dgZ" = (/obj/structure/table/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/engineering) "dha" = (/turf/simulated/floor/plating,/area/maintenance/engineering) -"dhb" = (/obj/item/device/t_scanner,/obj/structure/table/steel,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plating,/area/maintenance/engineering) +"dhb" = (/obj/item/t_scanner,/obj/structure/table/steel,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plating,/area/maintenance/engineering) "dhc" = (/obj/machinery/light/small{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor,/area/hallway/secondary/escape/dock_escape_pod_hallway_port) "dhd" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor,/area/hallway/secondary/escape/dock_escape_pod_hallway_port) "dhe" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor,/area/hallway/secondary/escape/dock_escape_pod_hallway_port) @@ -8500,11 +8500,11 @@ "dhx" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port) "dhy" = (/obj/machinery/light,/obj/machinery/embedded_controller/radio/docking_port_multi{child_names_txt = "Airlock One;Airlock Two;Airlock Three;Airlock Four"; child_tags_txt = "escape_dock_north_airlock;escape_dock_south_airlock;escape_dock_snorth_airlock;escape_dock_ssouth_airlock"; frequency = 1380; id_tag = "escape_dock"; pixel_x = 0; pixel_y = -25; req_one_access = list(13)},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port) "dhz" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/camera/network/northern_star{c_tag = "DOCK - Hallway Port 4"; dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port) -"dhA" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port) +"dhA" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port) "dhB" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port) "dhC" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10; icon_state = "intact"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port) "dhD" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/light,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/port) -"dhE" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard) +"dhE" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard) "dhF" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/camera/network/northern_star{c_tag = "DOCK - Hallway Mid 2"; dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard) "dhG" = (/obj/machinery/light,/obj/machinery/embedded_controller/radio/docking_port_multi{child_names_txt = "Airlock One;Airlock Two"; child_tags_txt = "arrivals_dock_north_airlock;arrivals_dock_south_airlock"; frequency = 1380; id_tag = "arrivals_dock"; pixel_x = 0; pixel_y = -25; req_one_access = list(13)},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard) "dhH" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard) @@ -8517,10 +8517,10 @@ "dhO" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/starboard) "dhP" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/item/clothing/head/cone,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/starboard) "dhQ" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/vacant/vacant_site2) -"dhR" = (/obj/item/weapon/stool/padded,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/vacant/vacant_site2) +"dhR" = (/obj/item/stool/padded,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/vacant/vacant_site2) "dhS" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/vacant/vacant_site2) -"dhT" = (/obj/structure/table/standard,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/weapon/weldingtool,/turf/simulated/floor/tiled,/area/vacant/vacant_site2) -"dhU" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/vacant/vacant_site2) +"dhT" = (/obj/structure/table/standard,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/weldingtool,/turf/simulated/floor/tiled,/area/vacant/vacant_site2) +"dhU" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/vacant/vacant_site2) "dhV" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; external_pressure_bound = 0; external_pressure_bound_default = 0; frequency = 1441; icon_state = "map_vent_in"; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; internal_pressure_bound_default = 4000; pressure_checks = 2; pressure_checks_default = 2; pump_direction = 0; use_power = 1},/turf/simulated/floor/reinforced/oxygen,/area/engineering/atmos) "dhW" = (/obj/structure/grille,/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/visible/green{icon_state = "intact"; dir = 4},/turf/simulated/wall/r_wall,/area/engineering/atmos) "dhX" = (/obj/machinery/atmospherics/pipe/simple/visible/green{icon_state = "intact"; dir = 4},/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored/upper_level) @@ -8557,11 +8557,11 @@ "diC" = (/obj/machinery/portable_atmospherics/powered/pump/filled,/turf/simulated/floor/tiled,/area/engineering/engine_eva) "diD" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/engineering/engine_eva) "diE" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/engineering/engine_eva) -"diF" = (/obj/structure/table/rack{dir = 8; layer = 2.6},/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/tank/jetpack/carbondioxide,/obj/machinery/door/window/southleft{name = "Jetpack Storage"; req_access = newlist(); req_one_access = list(11,24)},/turf/simulated/floor/tiled,/area/engineering/engine_eva) -"diG" = (/obj/structure/table/rack{dir = 8; layer = 2.6},/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/tank/jetpack/carbondioxide,/obj/machinery/door/window/southright{name = "Jetpack Storage"; req_one_access = list(11,24)},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/engineering/engine_eva) -"diH" = (/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/briefcase/inflatable,/obj/structure/table/steel_reinforced,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/item/device/suit_cooling_unit,/obj/item/device/suit_cooling_unit,/turf/simulated/floor/tiled,/area/engineering/engine_eva) +"diF" = (/obj/structure/table/rack{dir = 8; layer = 2.6},/obj/structure/window/reinforced{dir = 8},/obj/item/tank/jetpack/carbondioxide,/obj/machinery/door/window/southleft{name = "Jetpack Storage"; req_access = newlist(); req_one_access = list(11,24)},/turf/simulated/floor/tiled,/area/engineering/engine_eva) +"diG" = (/obj/structure/table/rack{dir = 8; layer = 2.6},/obj/structure/window/reinforced{dir = 4},/obj/item/tank/jetpack/carbondioxide,/obj/machinery/door/window/southright{name = "Jetpack Storage"; req_one_access = list(11,24)},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/engineering/engine_eva) +"diH" = (/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/item/storage/briefcase/inflatable,/obj/structure/table/steel_reinforced,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/item/suit_cooling_unit,/obj/item/suit_cooling_unit,/turf/simulated/floor/tiled,/area/engineering/engine_eva) "diI" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/maintenance{req_access = null; req_one_access = list(12,47)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/maintenance/engineering) -"diJ" = (/obj/structure/closet,/obj/item/weapon/lipstick/purple,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/engineering) +"diJ" = (/obj/structure/closet,/obj/item/lipstick/purple,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/engineering) "diK" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/maintenance/engineering) "diL" = (/obj/structure/shuttle/engine/propulsion/burst{dir = 1},/turf/simulated/shuttle/wall,/area/shuttle/escape_pod6/station) "diM" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_pod_6_hatch"; locked = 1; name = "Escape Pod Hatch 6"; req_access = list(13)},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod6/station) @@ -8591,7 +8591,7 @@ "djk" = (/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden,/obj/machinery/door/airlock/glass{name = "Dock"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4) "djl" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/glass{name = "Dock"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4) "djm" = (/turf/simulated/wall,/area/hallway/secondary/entry/D4) -"djn" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/vacant/vacant_site2) +"djn" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/vacant/vacant_site2) "djo" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/vacant/vacant_site2) "djp" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/vacant/vacant_site2) "djq" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/vacant/vacant_site2) @@ -8617,14 +8617,14 @@ "djK" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/engineering/engine_eva) "djL" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/engine_eva) "djM" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/engine_eva) -"djN" = (/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 6},/obj/item/weapon/storage/briefcase/inflatable{pixel_y = 3},/obj/item/weapon/storage/briefcase/inflatable{pixel_x = -3; pixel_y = 0},/obj/structure/table/steel_reinforced,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = 36; pixel_y = 0},/turf/simulated/floor/tiled,/area/engineering/engine_eva) +"djN" = (/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 6},/obj/item/storage/briefcase/inflatable{pixel_y = 3},/obj/item/storage/briefcase/inflatable{pixel_x = -3; pixel_y = 0},/obj/structure/table/steel_reinforced,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = 36; pixel_y = 0},/turf/simulated/floor/tiled,/area/engineering/engine_eva) "djO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/engineering) "djP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/engineering) "djQ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/engineering) "djR" = (/turf/simulated/shuttle/wall,/area/shuttle/escape_pod6/station) -"djS" = (/obj/structure/bed/chair,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/closet/walllocker/emerglocker{pixel_x = 28},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod6/station) +"djS" = (/obj/structure/bed/chair,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/closet/walllocker/emerglocker{pixel_x = 28},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod6/station) "djT" = (/turf/simulated/shuttle/wall,/area/shuttle/escape_pod5/station) -"djU" = (/obj/structure/bed/chair,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/closet/walllocker/emerglocker{pixel_x = 28},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod5/station) +"djU" = (/obj/structure/bed/chair,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/closet/walllocker/emerglocker{pixel_x = 28},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod5/station) "djV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/hallway/secondary/entry/D1) "djW" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1) "djX" = (/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1) @@ -8637,7 +8637,7 @@ "dke" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2) "dkf" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2) "dkg" = (/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2) -"dkh" = (/obj/structure/table/standard,/obj/item/weapon/book/codex/lore/vir,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2) +"dkh" = (/obj/structure/table/standard,/obj/item/book/codex/lore/vir,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2) "dki" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/hallway/secondary/entry/D3) "dkj" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/structure/table/standard,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3) "dkk" = (/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3) @@ -8818,7 +8818,7 @@ "dnD" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor,/area/maintenance/substation/engineering) "dnE" = (/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor,/area/maintenance/substation/engineering) "dnF" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor,/area/maintenance/substation/engineering) -"dnG" = (/obj/structure/table/steel,/obj/item/weapon/paper{info = "The big blue box recently installed in here is a 'grid checker' which will shut off the power if a dangerous power spike from the engine erupts into the powernet. Shutting everything down protects everything from electrical damage, however the outages can be disruptive to colony operations, so it is designed to restore power after a somewhat significant delay, up to ten minutes or so. The grid checker can be manually hacked in order to end the outage sooner. To do that, you must cut three specific wires which do not cause a red light to shine, then pulse a fourth wire. Electrical protection is highly recommended when doing maintenance on the grid checker."; name = "grid checker info"},/obj/random/maintenance/engineering,/turf/simulated/floor,/area/maintenance/engineering) +"dnG" = (/obj/structure/table/steel,/obj/item/paper{info = "The big blue box recently installed in here is a 'grid checker' which will shut off the power if a dangerous power spike from the engine erupts into the powernet. Shutting everything down protects everything from electrical damage, however the outages can be disruptive to colony operations, so it is designed to restore power after a somewhat significant delay, up to ten minutes or so. The grid checker can be manually hacked in order to end the outage sooner. To do that, you must cut three specific wires which do not cause a red light to shine, then pulse a fourth wire. Electrical protection is highly recommended when doing maintenance on the grid checker."; name = "grid checker info"},/obj/random/maintenance/engineering,/turf/simulated/floor,/area/maintenance/engineering) "dnH" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 0},/turf/simulated/wall,/area/maintenance/engineering) "dnI" = (/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/turf/simulated/floor,/area/maintenance/engineering) "dnJ" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor,/area/maintenance/engineering) @@ -8860,9 +8860,9 @@ "dot" = (/obj/effect/floor_decal/corner/white/diagonal{icon_state = "corner_white_diagonal"; dir = 4},/obj/effect/floor_decal/corner/red,/obj/machinery/atmospherics/binary/pump{dir = 1; name = "N2O to Transit"},/turf/simulated/floor/tiled,/area/engineering/atmos) "dou" = (/obj/machinery/atmospherics/binary/pump{dir = 1; name = "N2O to Connector"},/turf/simulated/floor/tiled,/area/engineering/atmos) "dov" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/engineering/atmos) -"dow" = (/obj/structure/closet/toolcloset,/obj/item/device/flashlight,/turf/simulated/floor/tiled,/area/engineering/workshop) +"dow" = (/obj/structure/closet/toolcloset,/obj/item/flashlight,/turf/simulated/floor/tiled,/area/engineering/workshop) "dox" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/reinforced,/obj/item/stack/material/plasteel{amount = 10},/obj/item/stack/material/plasteel{amount = 10},/obj/item/stack/material/plasteel{amount = 10},/obj/item/stack/material/plastic{amount = 50},/obj/item/stack/material/plastic{amount = 50},/turf/simulated/floor/tiled,/area/engineering/workshop) -"doy" = (/obj/structure/table/reinforced,/obj/item/device/radio/off{pixel_y = 6},/obj/item/device/radio/off{pixel_x = 6; pixel_y = 4},/obj/item/device/radio/off{pixel_x = -6; pixel_y = 4},/obj/item/device/radio/off,/obj/structure/extinguisher_cabinet{pixel_x = 25},/turf/simulated/floor/tiled,/area/engineering/workshop) +"doy" = (/obj/structure/table/reinforced,/obj/item/radio/off{pixel_y = 6},/obj/item/radio/off{pixel_x = 6; pixel_y = 4},/obj/item/radio/off{pixel_x = -6; pixel_y = 4},/obj/item/radio/off,/obj/structure/extinguisher_cabinet{pixel_x = 25},/turf/simulated/floor/tiled,/area/engineering/workshop) "doz" = (/obj/structure/disposalpipe/segment,/obj/machinery/firealarm{dir = 8; pixel_x = -26},/turf/simulated/floor/tiled,/area/engineering) "doA" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/engineering) "doB" = (/obj/structure/table/standard,/obj/random/tech_supply,/turf/simulated/floor/tiled,/area/engineering) @@ -8892,14 +8892,14 @@ "doZ" = (/obj/machinery/atmospherics/pipe/simple/visible/green{dir = 9; icon_state = "intact"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; name = "Atmospherics Lockdown"; opacity = 0},/turf/simulated/floor,/area/engineering/atmos) "dpa" = (/turf/simulated/wall/r_wall,/area/maintenance/atmos_control) "dpb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/atmos{name = "Atmospherics Maintenance"; req_access = list(24)},/turf/simulated/floor,/area/maintenance/atmos_control) -"dpc" = (/obj/structure/closet/toolcloset,/obj/item/device/flashlight,/obj/machinery/light,/turf/simulated/floor/tiled,/area/engineering/workshop) +"dpc" = (/obj/structure/closet/toolcloset,/obj/item/flashlight,/obj/machinery/light,/turf/simulated/floor/tiled,/area/engineering/workshop) "dpd" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled,/area/engineering/workshop) -"dpe" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/device/flashlight,/obj/item/weapon/tool/wrench,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -24},/turf/simulated/floor/tiled,/area/engineering/workshop) -"dpf" = (/obj/item/weapon/storage/toolbox/mechanical{pixel_y = 5},/obj/item/weapon/storage/toolbox/mechanical{pixel_y = 5},/obj/item/weapon/storage/toolbox/electrical,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/obj/machinery/newscaster{pixel_x = 0; pixel_y = -30},/turf/simulated/floor/tiled,/area/engineering/workshop) -"dpg" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/reinforced,/obj/item/stack/rods{amount = 50},/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/cell/high,/obj/item/stack/material/glass/phoronrglass{amount = 20},/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/turf/simulated/floor/tiled,/area/engineering/workshop) -"dph" = (/obj/structure/table/reinforced,/obj/item/device/floor_painter,/obj/item/device/multitool{pixel_x = 5},/obj/item/device/t_scanner,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/machinery/requests_console{announcementConsole = 0; department = "Engineering"; departmentType = 3; name = "Engineering RC"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled,/area/engineering/workshop) -"dpi" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/table/reinforced,/obj/item/weapon/tool/crowbar,/obj/item/clothing/gloves/black,/obj/item/weapon/storage/box/lights/mixed,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/engineering/workshop) -"dpj" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/machinery/light,/turf/simulated/floor/tiled,/area/engineering/workshop) +"dpe" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/cell/high{charge = 100; maxcharge = 15000},/obj/item/flashlight,/obj/item/tool/wrench,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -24},/turf/simulated/floor/tiled,/area/engineering/workshop) +"dpf" = (/obj/item/storage/toolbox/mechanical{pixel_y = 5},/obj/item/storage/toolbox/mechanical{pixel_y = 5},/obj/item/storage/toolbox/electrical,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/obj/machinery/newscaster{pixel_x = 0; pixel_y = -30},/turf/simulated/floor/tiled,/area/engineering/workshop) +"dpg" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/reinforced,/obj/item/stack/rods{amount = 50},/obj/item/airlock_electronics,/obj/item/airlock_electronics,/obj/item/cell/high,/obj/item/stack/material/glass/phoronrglass{amount = 20},/obj/item/pickaxe,/obj/item/pickaxe,/turf/simulated/floor/tiled,/area/engineering/workshop) +"dph" = (/obj/structure/table/reinforced,/obj/item/floor_painter,/obj/item/multitool{pixel_x = 5},/obj/item/t_scanner,/obj/item/reagent_containers/spray/cleaner,/obj/machinery/requests_console{announcementConsole = 0; department = "Engineering"; departmentType = 3; name = "Engineering RC"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled,/area/engineering/workshop) +"dpi" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/table/reinforced,/obj/item/tool/crowbar,/obj/item/clothing/gloves/black,/obj/item/storage/box/lights/mixed,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/engineering/workshop) +"dpj" = (/obj/structure/table/reinforced,/obj/item/storage/belt/utility,/obj/item/storage/belt/utility,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/machinery/light,/turf/simulated/floor/tiled,/area/engineering/workshop) "dpk" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green,/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/power/sensor{name = "Powernet Sensor - Engineering Subgrid"; name_tag = "Engineering Subgrid"},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor,/area/maintenance/substation/engineering) "dpl" = (/obj/machinery/power/smes/buildable{charge = 0; RCon_tag = "Substation - Engineering"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/maintenance/substation/engineering) "dpm" = (/obj/machinery/power/breakerbox/activated{RCon_tag = "Engineering Substation Bypass"},/turf/simulated/floor/plating,/area/maintenance/substation/engineering) @@ -8911,22 +8911,22 @@ "dps" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/hallway/secondary/entry/D1) "dpt" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/hallway/secondary/entry/D1) "dpu" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/hallway/secondary/entry/D1) -"dpv" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1) +"dpv" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1) "dpw" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1) "dpx" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1) "dpy" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1) "dpz" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2) "dpA" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2) "dpB" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2) -"dpC" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 28},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2) -"dpD" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3) +"dpC" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 28},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2) +"dpD" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3) "dpE" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3) "dpF" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3) "dpG" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3) "dpH" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4) "dpI" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4) "dpJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4) -"dpK" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 28},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4) +"dpK" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 28},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4) "dpL" = (/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/freezer,/area/vacant/vacant_site2) "dpM" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 6},/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored/upper_level) "dpN" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 4},/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored/upper_level) @@ -8946,7 +8946,7 @@ "dqb" = (/obj/machinery/atmospherics/pipe/simple/visible/red,/obj/structure/lattice,/turf/space,/area/space) "dqc" = (/obj/structure/grille,/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/visible/red,/turf/simulated/wall/r_wall,/area/engineering/atmos) "dqd" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/sign/nosmoking_1{pixel_x = -32},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor,/area/maintenance/atmos_control) -"dqe" = (/obj/structure/closet/crate,/obj/item/weapon/deck/tarot,/obj/item/weapon/coin/gold,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/obj/item/weapon/flame/lighter/zippo,/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/turf/simulated/floor,/area/maintenance/atmos_control) +"dqe" = (/obj/structure/closet/crate,/obj/item/deck/tarot,/obj/item/coin/gold,/obj/item/storage/fancy/cigarettes/dromedaryco,/obj/item/flame/lighter/zippo,/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/turf/simulated/floor,/area/maintenance/atmos_control) "dqf" = (/turf/simulated/wall/r_wall,/area/engineering/drone_fabrication) "dqg" = (/obj/machinery/cryopod/robot{dir = 4},/turf/simulated/floor/plating,/area/engineering/drone_fabrication) "dqh" = (/obj/effect/floor_decal/industrial/warning{dir = 9},/turf/simulated/floor,/area/engineering/drone_fabrication) @@ -8954,7 +8954,7 @@ "dqj" = (/obj/machinery/computer/cryopod/robot{pixel_y = 30},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/camera/network/engineering{c_tag = "ENG - Drone Fabrication"; dir = 2},/obj/structure/bed/chair,/obj/machinery/light{dir = 1},/turf/simulated/floor/plating,/area/engineering/drone_fabrication) "dqk" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/plating,/area/engineering/drone_fabrication) "dql" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/ai_status_display{layer = 4; pixel_y = 32},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 5},/turf/simulated/floor,/area/engineering/drone_fabrication) -"dqm" = (/obj/item/weapon/storage/toolbox/electrical,/obj/structure/table/steel,/turf/simulated/floor,/area/engineering/drone_fabrication) +"dqm" = (/obj/item/storage/toolbox/electrical,/obj/structure/table/steel,/turf/simulated/floor,/area/engineering/drone_fabrication) "dqn" = (/turf/simulated/wall,/area/engineering/drone_fabrication) "dqo" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/engineering) "dqp" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/engineering) @@ -8968,7 +8968,7 @@ "dqx" = (/obj/machinery/shieldgen,/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor,/area/engineering/storage) "dqy" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hallway/secondary/entry/D1) "dqz" = (/obj/structure/table/standard,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2) -"dqA" = (/obj/structure/table/standard,/obj/item/weapon/book/codex/lore/vir,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3) +"dqA" = (/obj/structure/table/standard,/obj/item/book/codex/lore/vir,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3) "dqB" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; external_pressure_bound = 140; external_pressure_bound_default = 140; icon_state = "map_vent_out"; pressure_checks = 1; pressure_checks_default = 1; use_power = 1},/obj/machinery/shield_diffuser,/turf/simulated/floor/airless,/area/engineering/atmos) "dqC" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1441; icon_state = "map_injector"; id = "co2_in"; use_power = 1; pixel_y = 1},/turf/simulated/floor/reinforced/carbon_dioxide,/area/engineering/atmos) "dqD" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "co2_sensor"},/turf/simulated/floor/reinforced/carbon_dioxide,/area/engineering/atmos) @@ -8980,7 +8980,7 @@ "dqJ" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2o_sensor"},/turf/simulated/floor/reinforced/n20,/area/engineering/atmos) "dqK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; external_pressure_bound_default = 0; frequency = 1441; icon_state = "map_vent_in"; id_tag = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; internal_pressure_bound_default = 4000; use_power = 1; pressure_checks = 2; pressure_checks_default = 2; pump_direction = 0},/turf/simulated/floor/reinforced/n20,/area/engineering/atmos) "dqL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/maintenance/atmos_control) -"dqM" = (/obj/item/weapon/stool/padded,/turf/simulated/floor,/area/maintenance/atmos_control) +"dqM" = (/obj/item/stool/padded,/turf/simulated/floor,/area/maintenance/atmos_control) "dqN" = (/obj/machinery/recharge_station,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/plating,/area/engineering/drone_fabrication) "dqO" = (/obj/effect/landmark{name = "JoinLateCyborg"},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/plating,/area/engineering/drone_fabrication) "dqP" = (/obj/machinery/computer/drone_control,/turf/simulated/floor/plating,/area/engineering/drone_fabrication) @@ -9053,7 +9053,7 @@ "dse" = (/turf/simulated/floor,/area/engineering/storage) "dsf" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor,/area/engineering/storage) "dsg" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor,/area/engineering/storage) -"dsh" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 28},/obj/machinery/space_heater,/turf/simulated/floor,/area/engineering/storage) +"dsh" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 28},/obj/machinery/space_heater,/turf/simulated/floor,/area/engineering/storage) "dsi" = (/obj/structure/closet/wardrobe/black,/obj/item/clothing/shoes/boots/combat,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/turf/simulated/floor,/area/maintenance/engineering) "dsj" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/engineering) "dsk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/engineering) @@ -9141,14 +9141,14 @@ "dtO" = (/obj/machinery/vending/coffee,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D4) "dtP" = (/obj/item/clothing/head/cone,/turf/simulated/floor,/area/maintenance/atmos_control) "dtQ" = (/obj/machinery/drone_fabricator/derelict,/turf/simulated/floor/plating,/area/engineering/drone_fabrication) -"dtR" = (/obj/item/weapon/storage/box/matches,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/deck/cards,/obj/structure/table/steel,/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/engineering/drone_fabrication) +"dtR" = (/obj/item/storage/box/matches,/obj/item/storage/fancy/cigarettes,/obj/item/deck/cards,/obj/structure/table/steel,/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/engineering/drone_fabrication) "dtS" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera/network/engineering{c_tag = "ENG - Hallway Aft"; dir = 8},/turf/simulated/floor/tiled,/area/engineering) "dtT" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green,/obj/machinery/light_switch{pixel_x = -38; pixel_y = 0},/obj/structure/closet/crate/radiation,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/turf/simulated/floor,/area/engineering/storage) "dtU" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/floodlight,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor,/area/engineering/storage) "dtV" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/power/emitter,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor,/area/engineering/storage) "dtW" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/power/emitter,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor,/area/engineering/storage) "dtX" = (/obj/machinery/power/port_gen/pacman{anchored = 1},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/plating,/area/engineering/storage) -"dtY" = (/obj/structure/closet/crate,/obj/item/weapon/circuitboard/smes,/obj/item/weapon/circuitboard/smes,/obj/item/weapon/smes_coil,/obj/item/weapon/smes_coil,/obj/item/weapon/smes_coil/super_capacity,/obj/item/weapon/smes_coil/super_capacity,/obj/item/weapon/smes_coil/super_io,/obj/item/weapon/smes_coil/super_io,/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/plating,/area/engineering/storage) +"dtY" = (/obj/structure/closet/crate,/obj/item/circuitboard/smes,/obj/item/circuitboard/smes,/obj/item/smes_coil,/obj/item/smes_coil,/obj/item/smes_coil/super_capacity,/obj/item/smes_coil/super_capacity,/obj/item/smes_coil/super_io,/obj/item/smes_coil/super_io,/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/plating,/area/engineering/storage) "dtZ" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor,/area/engineering/storage) "dua" = (/obj/effect/decal/cleanable/dirt,/obj/structure/dispenser{oxygentanks = 0},/turf/simulated/floor,/area/engineering/storage) "dub" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/maintenance/engineering) @@ -9196,13 +9196,13 @@ "duR" = (/obj/machinery/atmospherics/portables_connector,/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/portable_atmospherics/canister/air/airlock,/turf/simulated/floor/tiled,/area/engineering/aft_hallway) "duS" = (/obj/machinery/computer/shuttle_control/engineering{name = "engineering elevator control console"},/turf/simulated/floor/tiled,/area/engineering/aft_hallway) "duT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/engineering/aft_hallway) -"duU" = (/obj/structure/table/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled,/area/engineering/aft_hallway) +"duU" = (/obj/structure/table/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled,/area/engineering/aft_hallway) "duV" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled,/area/engineering/aft_hallway) "duW" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/engineering/aft_hallway) "duX" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/engineering/aft_hallway) "duY" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/engineering/aft_hallway) "duZ" = (/turf/simulated/floor/tiled,/area/engineering/aft_hallway) -"dva" = (/obj/structure/table/steel,/obj/item/weapon/book/manual/engineering_singularity_safety,/turf/simulated/floor,/area/maintenance/engineering) +"dva" = (/obj/structure/table/steel,/obj/item/book/manual/engineering_singularity_safety,/turf/simulated/floor,/area/maintenance/engineering) "dvb" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2) "dvc" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3) "dvd" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4) @@ -9219,7 +9219,7 @@ "dvo" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/camera/network/engineering{c_tag = "ENG - Solar Aft Port Access"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/aft_hallway) "dvp" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/engineering/aft_hallway) "dvq" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/engineering/aft_hallway) -"dvr" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/engineering/aft_hallway) +"dvr" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/engineering/aft_hallway) "dvs" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/tiled,/area/engineering/aft_hallway) "dvt" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/engineering/aft_hallway) "dvu" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/engineering/aft_hallway) @@ -9364,20 +9364,20 @@ "dyd" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor/tiled/steel,/area/engineering/engine_waste) "dye" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/closet/radiation,/obj/item/clothing/glasses/meson,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/camera/network/engine{c_tag = "ENG - Waste Handling"},/turf/simulated/floor/tiled,/area/engineering/engine_waste) "dyf" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/light_switch{pixel_x = -38; pixel_y = 0},/turf/simulated/floor/tiled,/area/engineering/engine_smes) -"dyg" = (/obj/item/stack/cable_coil,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/device/multitool{pixel_x = 5},/obj/item/clothing/gloves/yellow,/obj/structure/table/steel,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/engineering/engine_smes) +"dyg" = (/obj/item/stack/cable_coil,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/multitool{pixel_x = 5},/obj/item/clothing/gloves/yellow,/obj/structure/table/steel,/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/engineering/engine_smes) "dyh" = (/turf/simulated/wall/r_wall,/area/engineering/engine_monitoring) "dyi" = (/obj/structure/table/standard,/obj/machinery/microwave{pixel_x = -2; pixel_y = 5},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) -"dyj" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) +"dyj" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) "dyk" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) "dyl" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/ai_status_display{layer = 4; pixel_y = 32},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) -"dym" = (/obj/structure/closet/radiation,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 28},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) +"dym" = (/obj/structure/closet/radiation,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 28},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) "dyn" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/machinery/alarm{pixel_y = 22},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled,/area/engineering/engine_airlock) "dyo" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/engineering/engine_airlock) "dyp" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/closet/radiation,/obj/item/clothing/glasses/meson,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/camera/network/engine{c_tag = "ENG - Engine Access"},/turf/simulated/floor/tiled,/area/engineering/engine_airlock) "dyq" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/camera/network/engineering{c_tag = "ENG - Hallway Port"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/aft_hallway) "dyr" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/engineering/aft_hallway) "dys" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor/tiled,/area/engineering/aft_hallway) -"dyt" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1) +"dyt" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1) "dyu" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 8; icon_state = "map"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1) "dyv" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1380; master_tag = "escape_dock_south_airlock"; name = "interior access button"; pixel_x = 26; pixel_y = -26; req_one_access = list(13)},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1) "dyw" = (/obj/machinery/atmospherics/pipe/simple/hidden{icon_state = "intact"; dir = 4},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_dock_south_inner"; locked = 1; name = "Docking Port Airlock"; req_access = list(13)},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D1) @@ -9435,7 +9435,7 @@ "dzw" = (/obj/structure/cable{d2 = 2; icon_state = "0-2"; pixel_y = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/sensor{name = "Powernet Sensor - Master Grid"; name_tag = "Master"},/turf/simulated/floor,/area/engineering/engine_waste) "dzx" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/machinery/light_switch{pixel_x = 38; pixel_y = 0},/turf/simulated/floor,/area/engineering/engine_waste) "dzy" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled,/area/engineering/engine_smes) -"dzz" = (/obj/item/stack/cable_coil,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/box/lights/mixed,/obj/structure/table/steel,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/engineering/engine_smes) +"dzz" = (/obj/item/stack/cable_coil,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/storage/box/lights/mixed,/obj/structure/table/steel,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/engineering/engine_smes) "dzA" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) "dzB" = (/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) "dzC" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) @@ -9462,7 +9462,7 @@ "dzX" = (/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/dock_escape_pod_hallway_starboard) "dzY" = (/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth{frequency = 1380; id_tag = "escape_pod_4_berth"; pixel_x = 25; pixel_y = -30; tag_door = "escape_pod_4_berth_hatch"},/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/dock_escape_pod_hallway_starboard) "dzZ" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/dock_escape_pod_hallway_starboard) -"dAa" = (/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = -28},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/dock_escape_pod_hallway_starboard) +"dAa" = (/obj/item/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = -28},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/dock_escape_pod_hallway_starboard) "dAb" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/dock_escape_pod_hallway_starboard) "dAc" = (/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth{frequency = 1380; id_tag = "escape_pod_3_berth"; pixel_x = 25; pixel_y = -30; tag_door = "escape_pod_3_berth_hatch"},/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/dock_escape_pod_hallway_starboard) "dAd" = (/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/dock_escape_pod_hallway_starboard) @@ -9475,7 +9475,7 @@ "dAk" = (/obj/machinery/door/airlock/external{frequency = 1379; icon_state = "door_locked"; id_tag = "eng_port_outer"; locked = 1; name = "Engineering Port External Access"; req_access = list(13)},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/engineering/aft_hallway) "dAl" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/engineering/aft_hallway) "dAm" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "engineering_dock_outer"; locked = 1; name = "Engineering Dock Airlock"; req_access = list(13)},/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1380; master_tag = "engineering_dock_airlock"; name = "exterior access button"; pixel_x = -28; pixel_y = -8; req_one_access = list(13,11,24)},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/shield_diffuser,/turf/simulated/floor/tiled/dark,/area/engineering/aft_hallway) -"dAn" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor,/area/engineering/engine_waste) +"dAn" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor,/area/engineering/engine_waste) "dAo" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/engineering/engine_waste) "dAp" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/engineering/engine_waste) "dAq" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/door/airlock/maintenance_hatch{name = "SMES Access"; req_access = list(11)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/engineering/engine_smes) @@ -9518,7 +9518,7 @@ "dBb" = (/obj/machinery/atmospherics/portables_connector{dir = 8},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/engineering/engine_waste) "dBc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/industrial/warning,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor/tiled,/area/engineering/engine_smes) "dBd" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/machinery/camera/network/engine{c_tag = "ENG - SMES Room"; dir = 8},/turf/simulated/floor/tiled,/area/engineering/engine_smes) -"dBe" = (/obj/structure/table/reinforced,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/camera/network/engine{c_tag = "ENG - Monitoring Room"; dir = 4},/obj/item/weapon/book/manual/supermatter_engine,/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) +"dBe" = (/obj/structure/table/reinforced,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/camera/network/engine{c_tag = "ENG - Monitoring Room"; dir = 4},/obj/item/book/manual/supermatter_engine,/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) "dBf" = (/obj/structure/bed/chair/office/dark,/obj/effect/landmark/start{name = "Station Engineer"},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) "dBg" = (/obj/structure/table/reinforced,/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for the engine control room blast doors."; id = "EngineBlast"; name = "Engine Monitoring Room Blast Doors"; pixel_x = 0; pixel_y = -3; req_access = list(10)},/obj/machinery/button/remote/blast_door{desc = "A remote control-switch for the engine charging port."; id = "SupermatterPort"; name = "Reactor Blast Doors"; pixel_x = -6; pixel_y = 7; req_access = list(10)},/obj/machinery/button/remote/emitter{desc = "A remote control-switch for the engine emitter."; id = "EngineEmitter"; name = "Engine Emitter"; pixel_x = 6; pixel_y = 7; req_access = list(10)},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) "dBh" = (/obj/structure/table/reinforced,/obj/machinery/light_switch{pixel_x = 27},/obj/item/clothing/ears/earmuffs,/obj/item/clothing/ears/earmuffs,/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) @@ -9539,7 +9539,7 @@ "dBw" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3) "dBx" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4) "dBy" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4) -"dBz" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 28},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4) +"dBz" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 28},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4) "dBA" = (/obj/machinery/light/small{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor,/area/shuttle/escape_pod4/station) "dBB" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor,/area/shuttle/escape_pod4/station) "dBC" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor,/area/shuttle/escape_pod4/station) @@ -9564,7 +9564,7 @@ "dBV" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/computer/power_monitor,/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) "dBW" = (/obj/machinery/computer/security/engineering,/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) "dBX" = (/obj/machinery/computer/station_alert,/turf/simulated/floor/tiled,/area/engineering/engine_monitoring) -"dBY" = (/obj/machinery/airlock_sensor{frequency = 1379; id_tag = "eng_al_c_snsr"; pixel_x = -25; pixel_y = 0},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1379; id_tag = "engine_airlock_pump"},/turf/simulated/floor/plating,/area/engineering/engine_airlock) +"dBY" = (/obj/machinery/airlock_sensor{frequency = 1379; id_tag = "eng_al_c_snsr"; pixel_x = -25; pixel_y = 0},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1379; id_tag = "engine_airlock_pump"},/turf/simulated/floor/plating,/area/engineering/engine_airlock) "dBZ" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/plating,/area/engineering/engine_airlock) "dCa" = (/obj/machinery/light/small{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1379; id_tag = "engine_airlock_pump"},/turf/simulated/floor/plating,/area/engineering/engine_airlock) "dCb" = (/obj/machinery/embedded_controller/radio/airlock/airlock_controller{frequency = 1379; id_tag = "eng_starboard_airlock"; pixel_x = -25; req_access = list(13); req_one_access = null; tag_airpump = "eng_starboard_pump"; tag_chamber_sensor = "eng_starboard_sensor"; tag_exterior_door = "eng_starboard_outer"; tag_interior_door = "eng_starboard_inner"},/obj/machinery/light/small,/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor/tiled,/area/engineering/aft_hallway) @@ -9609,10 +9609,10 @@ "dCO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4) "dCP" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D4) "dCQ" = (/turf/simulated/shuttle/wall,/area/shuttle/escape_pod4/station) -"dCR" = (/obj/structure/bed/chair,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/closet/walllocker/emerglocker{pixel_x = 28},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod4/station) +"dCR" = (/obj/structure/bed/chair,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/closet/walllocker/emerglocker{pixel_x = 28},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod4/station) "dCS" = (/turf/simulated/shuttle/wall,/area/shuttle/escape_pod3/station) -"dCT" = (/obj/structure/bed/chair,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/closet/walllocker/emerglocker{pixel_x = 28},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod3/station) -"dCU" = (/obj/item/weapon/stool,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/camera/network/engineering{c_tag = "ENG - Solar Aft Starboard"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboardsolar) +"dCT" = (/obj/structure/bed/chair,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/closet/walllocker/emerglocker{pixel_x = 28},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod3/station) +"dCU" = (/obj/item/stool,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/camera/network/engineering{c_tag = "ENG - Solar Aft Starboard"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboardsolar) "dCV" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/starboardsolar) "dCW" = (/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/machinery/light/small{dir = 4},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/maintenance/starboardsolar) "dCX" = (/obj/effect/landmark{name = "carpspawn"},/turf/space,/area/syndicate_station/southwest) @@ -9766,7 +9766,7 @@ "dFP" = (/obj/machinery/atmospherics/portables_connector,/obj/effect/floor_decal/industrial/outline/blue,/obj/machinery/portable_atmospherics/canister/empty,/obj/effect/engine_setup/empty_canister,/turf/simulated/floor,/area/engineering/engine_room) "dFQ" = (/obj/machinery/atmospherics/pipe/cap/visible,/turf/simulated/floor,/area/engineering/engine_room) "dFR" = (/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/plating,/area/engineering/engine_room) -"dFS" = (/obj/machinery/light,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/plating,/area/engineering/engine_room) +"dFS" = (/obj/machinery/light,/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/plating,/area/engineering/engine_room) "dFT" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan,/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor/plating,/area/engineering/engine_room) "dFU" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/plating,/area/engineering/engine_room) "dFV" = (/obj/machinery/atmospherics/pipe/simple/visible/yellow{dir = 6},/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor/plating,/area/engineering/engine_room) @@ -9865,13 +9865,13 @@ "dHK" = (/turf/space,/area/skipjack_station/southeast_solars) "dHL" = (/turf/space,/area/syndicate_station/south) "dHM" = (/obj/machinery/power/tracker,/obj/structure/cable/yellow,/turf/simulated/floor/airless,/area/solar/starboard) -"dHN" = (/obj/item/weapon/broken_bottle,/turf/simulated/floor,/area/vacant/vacant_site) -"dHO" = (/obj/structure/table/gamblingtable,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/turf/simulated/floor/wood,/area/vacant/vacant_site) +"dHN" = (/obj/item/broken_bottle,/turf/simulated/floor,/area/vacant/vacant_site) +"dHO" = (/obj/structure/table/gamblingtable,/obj/item/reagent_containers/food/condiment/enzyme,/turf/simulated/floor/wood,/area/vacant/vacant_site) "dHP" = (/obj/effect/floor_decal/corner/white{dir = 8},/obj/effect/floor_decal/corner/blue{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/closet/emcloset,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) "dHQ" = (/obj/effect/floor_decal/corner/white{dir = 4},/obj/effect/floor_decal/corner/blue,/obj/structure/closet/emcloset,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) -"dHR" = (/obj/item/weapon/rig/breacher,/obj/item/clothing/mask/breath,/obj/machinery/suit_storage_unit/standard_unit,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) +"dHR" = (/obj/item/rig/breacher,/obj/item/clothing/mask/breath,/obj/machinery/suit_storage_unit/standard_unit,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "dHS" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/light,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_lodging) -"dHT" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/item/clothing/mask/breath,/obj/item/weapon/rig/breacher,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) +"dHT" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/item/clothing/mask/breath,/obj/item/rig/breacher,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -10175,4 +10175,3 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa "} - diff --git a/maps/northern_star/polaris-2.dmm b/maps/northern_star/polaris-2.dmm index ce07b72d12f..2bef1a90a20 100644 --- a/maps/northern_star/polaris-2.dmm +++ b/maps/northern_star/polaris-2.dmm @@ -140,7 +140,7 @@ "cJ" = (/obj/structure/holostool,/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) "cK" = (/obj/structure/holostool,/obj/structure/window/reinforced/holowindow{dir = 4},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) "cL" = (/obj/structure/table/holotable,/obj/machinery/readybutton{pixel_y = 0},/obj/effect/floor_decal/corner/red/full{dir = 8},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) -"cM" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/under/color/red,/obj/item/weapon/holo/esword/red,/obj/effect/floor_decal/corner/red{dir = 5},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) +"cM" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/under/color/red,/obj/item/holo/esword/red,/obj/effect/floor_decal/corner/red{dir = 5},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) "cN" = (/obj/structure/table/holotable,/obj/effect/floor_decal/corner/red/full{dir = 1},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) "cO" = (/obj/structure/table/holotable,/obj/item/clothing/gloves/boxing/hologlove,/turf/simulated/floor/holofloor/tiled/dark,/area/holodeck/source_boxingcourt) "cP" = (/turf/simulated/floor/holofloor/tiled/dark,/area/holodeck/source_boxingcourt) @@ -169,7 +169,7 @@ "dm" = (/obj/structure/flora/tree/dead,/turf/simulated/floor/holofloor/snow,/area/holodeck/source_snowfield) "dn" = (/turf/simulated/floor/holofloor/lino,/area/holodeck/source_meetinghall) "do" = (/turf/simulated/floor/holofloor/tiled/dark,/area/holodeck/source_meetinghall) -"dp" = (/obj/item/weapon/beach_ball,/turf/simulated/floor/holofloor/beach/sand,/area/holodeck/source_beach) +"dp" = (/obj/item/beach_ball,/turf/simulated/floor/holofloor/beach/sand,/area/holodeck/source_beach) "dq" = (/obj/structure/window/reinforced/holowindow{dir = 4},/turf/simulated/floor/holofloor/tiled/dark,/area/holodeck/source_boxingcourt) "dr" = (/obj/effect/floor_decal/corner/red/full{dir = 8},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_boxingcourt) "ds" = (/obj/effect/floor_decal/corner/red{dir = 5},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_boxingcourt) @@ -182,9 +182,9 @@ "dz" = (/obj/structure/holostool,/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet{dir = 1},/obj/effect/floor_decal/carpet{dir = 5},/turf/simulated/floor/holofloor/carpet,/area/holodeck/source_meetinghall) "dA" = (/obj/effect/floor_decal/corner/red/full,/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_basketball) "dB" = (/obj/effect/floor_decal/corner/red{dir = 10},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_basketball) -"dC" = (/obj/item/weapon/beach_ball/holoball,/obj/effect/floor_decal/corner/red{dir = 10},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_basketball) +"dC" = (/obj/item/beach_ball/holoball,/obj/effect/floor_decal/corner/red{dir = 10},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_basketball) "dD" = (/obj/effect/floor_decal/corner/red/full{dir = 4},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_basketball) -"dE" = (/obj/item/weapon/inflatable_duck,/turf/simulated/floor/holofloor/beach/sand,/area/holodeck/source_beach) +"dE" = (/obj/item/inflatable_duck,/turf/simulated/floor/holofloor/beach/sand,/area/holodeck/source_beach) "dF" = (/obj/structure/window/reinforced/holowindow/disappearing,/obj/effect/floor_decal/corner/red/full,/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) "dG" = (/obj/structure/window/reinforced/holowindow/disappearing,/obj/effect/floor_decal/corner/red{dir = 10},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) "dH" = (/obj/structure/window/reinforced/holowindow/disappearing,/obj/effect/floor_decal/corner/red/full{dir = 4},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) @@ -225,7 +225,7 @@ "eq" = (/obj/structure/holohoop{dir = 1},/obj/effect/floor_decal/corner/green{dir = 10},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_basketball) "er" = (/obj/effect/floor_decal/corner/green/full{dir = 4},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_basketball) "es" = (/obj/structure/table/holotable,/obj/effect/floor_decal/corner/green/full,/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) -"et" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/under/color/green,/obj/item/weapon/holo/esword/green,/obj/effect/floor_decal/corner/green{dir = 10},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) +"et" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/under/color/green,/obj/item/holo/esword/green,/obj/effect/floor_decal/corner/green{dir = 10},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) "eu" = (/obj/structure/table/holotable,/obj/machinery/readybutton{pixel_y = 0},/obj/effect/floor_decal/corner/green/full{dir = 4},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) "ev" = (/obj/structure/table/holotable,/obj/item/clothing/gloves/boxing/hologlove{icon_state = "boxinggreen"; item_state = "boxinggreen"},/turf/simulated/floor/holofloor/tiled/dark,/area/holodeck/source_boxingcourt) "ew" = (/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/wall,/area/space) @@ -242,9 +242,9 @@ "eH" = (/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership{name = "\improper Trader Base"}) "eI" = (/obj/structure/closet/wardrobe/yellow,/turf/unsimulated/floor{icon_state = "steel"},/area/syndicate_mothership{name = "\improper Trader Base"}) "eJ" = (/obj/structure/closet/wardrobe/suit,/turf/unsimulated/floor{icon_state = "steel"},/area/syndicate_mothership{name = "\improper Trader Base"}) -"eK" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership{name = "\improper Trader Base"}) +"eK" = (/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership{name = "\improper Trader Base"}) "eL" = (/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/syndicate_mothership{name = "\improper Trader Base"}) -"eM" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "steel"},/area/syndicate_mothership{name = "\improper Trader Base"}) +"eM" = (/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "steel"},/area/syndicate_mothership{name = "\improper Trader Base"}) "eN" = (/obj/structure/closet/wardrobe/mixed,/turf/unsimulated/floor{icon_state = "steel"},/area/syndicate_mothership{name = "\improper Trader Base"}) "eO" = (/obj/structure/closet/wardrobe/xenos,/turf/unsimulated/floor{icon_state = "steel"},/area/syndicate_mothership{name = "\improper Trader Base"}) "eP" = (/obj/effect/landmark{name = "Trader"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership{name = "\improper Trader Base"}) @@ -270,7 +270,7 @@ "fj" = (/obj/structure/table/steel,/obj/structure/flora/pottedplant{icon_state = "plant-09"; name = "Dave"; pixel_y = 15},/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/shuttle/arrival/pre_game) "fk" = (/obj/machinery/light,/obj/structure/bed/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/shuttle/arrival/pre_game) "fl" = (/obj/structure/window/reinforced,/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 1},/turf/simulated/floor/airless,/area/shuttle/syndicate_elite/mothership) -"fm" = (/obj/structure/table/standard,/obj/item/weapon/soap/deluxe,/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership{name = "\improper Trader Base"}) +"fm" = (/obj/structure/table/standard,/obj/item/soap/deluxe,/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership{name = "\improper Trader Base"}) "fn" = (/obj/structure/undies_wardrobe,/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership{name = "\improper Trader Base"}) "fo" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 4; name = "thrower_escapeshuttletop(right)"; tiles = 0},/turf/space/transit/north,/area/space) "fp" = (/obj/machinery/status_display,/turf/simulated/shuttle/wall,/area/shuttle/arrival/pre_game) @@ -279,7 +279,7 @@ "fs" = (/obj/machinery/ai_status_display,/turf/simulated/shuttle/wall,/area/shuttle/arrival/pre_game) "ft" = (/obj/effect/landmark{name = "Syndicate-Commando-Bomb"},/turf/simulated/shuttle/floor/red,/area/shuttle/syndicate_elite/mothership) "fu" = (/mob/living/silicon/decoy{icon_state = "ai-malf"; name = "GLaDOS"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/control) -"fv" = (/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; frequency = 1213; listening = 1; name = "Syndicate Ops Intercom"; pixel_y = 0; subspace_transmission = 1; syndie = 1},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"fv" = (/obj/item/radio/intercom{broadcasting = 1; dir = 1; frequency = 1213; listening = 1; name = "Syndicate Ops Intercom"; pixel_y = 0; subspace_transmission = 1; syndie = 1},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "fw" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; tiles = 0},/turf/space/transit/north,/area/space) "fx" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 8; name = "thrower_escapeshuttletop(left)"; tiles = 0},/turf/space/transit/north,/area/space) "fy" = (/turf/space/transit/north,/area/syndicate_station/transit) @@ -300,7 +300,7 @@ "fN" = (/turf/space,/area/syndicate_mothership/elite_squad) "fO" = (/turf/simulated/shuttle/wall/dark/no_join,/area/syndicate_mothership/elite_squad) "fP" = (/obj/machinery/computer/pod{id = "syndicate_elite"; name = "Hull Door Control"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/elite_squad) -"fQ" = (/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; frequency = 1213; listening = 0; name = "Syndicate Ops Intercom"; pixel_y = 28; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/elite_squad) +"fQ" = (/obj/item/radio/intercom{broadcasting = 1; dir = 1; frequency = 1213; listening = 0; name = "Syndicate Ops Intercom"; pixel_y = 28; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/elite_squad) "fR" = (/obj/effect/landmark{name = "Syndicate-Commando"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/elite_squad) "fS" = (/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/elite_squad) "fT" = (/obj/machinery/mech_recharger,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/elite_squad) @@ -308,8 +308,8 @@ "fV" = (/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "fW" = (/turf/space/transit/north,/area/skipjack_station/transit) "fX" = (/obj/structure/bed/chair,/obj/effect/landmark{name = "JoinLate"},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/shuttle/arrival/pre_game) -"fY" = (/obj/structure/bed/chair,/obj/effect/landmark{name = "JoinLate"},/obj/structure/window/reinforced{dir = 1},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/shuttle/arrival/pre_game) -"fZ" = (/obj/structure/bed/chair,/obj/effect/landmark{name = "JoinLate"},/obj/structure/window/reinforced{dir = 1},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/shuttle/arrival/pre_game) +"fY" = (/obj/structure/bed/chair,/obj/effect/landmark{name = "JoinLate"},/obj/structure/window/reinforced{dir = 1},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/shuttle/arrival/pre_game) +"fZ" = (/obj/structure/bed/chair,/obj/effect/landmark{name = "JoinLate"},/obj/structure/window/reinforced{dir = 1},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/shuttle/arrival/pre_game) "ga" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/syndicate_mothership/elite_squad) "gb" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "trade_shuttle_bay_door"; locked = 1},/turf/unsimulated/floor{icon_state = "steel"},/area/syndicate_mothership{name = "\improper Trader Base"}) "gc" = (/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/shuttle/arrival/pre_game) @@ -335,11 +335,11 @@ "gw" = (/turf/space/transit/north,/area/shuttle/escape_pod1/transit) "gx" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/shuttle/arrival/pre_game) "gy" = (/obj/machinery/hologram/holopad,/obj/effect/landmark{name = "Observer-Start"},/turf/simulated/shuttle/floor,/area/shuttle/arrival/pre_game) -"gz" = (/obj/structure/table/standard,/obj/item/weapon/book/codex/lore/vir,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/shuttle/arrival/pre_game) +"gz" = (/obj/structure/table/standard,/obj/item/book/codex/lore/vir,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/shuttle/arrival/pre_game) "gA" = (/obj/machinery/computer/pod{id = "syndicate_elite"; name = "Hull Door Control"},/turf/simulated/shuttle/floor/red,/area/shuttle/syndicate_elite/mothership) "gB" = (/obj/machinery/computer/syndicate_elite_shuttle,/turf/simulated/shuttle/floor/red,/area/shuttle/syndicate_elite/mothership) "gC" = (/obj/structure/closet/cabinet,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"gD" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/rd,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"gD" = (/obj/structure/bed/padded,/obj/item/bedsheet/rd,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "gE" = (/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_alc/full,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "gF" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "gG" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) @@ -356,26 +356,26 @@ "gR" = (/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "gS" = (/obj/machinery/door/airlock/silver{name = "Sleeping"},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "gT" = (/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) -"gU" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets,/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) +"gU" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets,/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) "gV" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) "gW" = (/obj/machinery/atm{pixel_x = -32},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "gX" = (/obj/machinery/suit_cycler/syndicate,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "gY" = (/obj/machinery/bodyscanner{dir = 8},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "gZ" = (/obj/machinery/body_scanconsole,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"ha" = (/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/weapon/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/weapon/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/weapon/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/weapon/storage/firstaid/adv{pixel_x = -2},/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/structure/closet/medical_wall{pixel_y = 32},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"ha" = (/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/storage/firstaid/toxin,/obj/item/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/storage/firstaid/adv{pixel_x = -2},/obj/item/reagent_containers/blood/empty,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/structure/closet/medical_wall{pixel_y = 32},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hb" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hc" = (/turf/space,/area/syndicate_mothership) "hd" = (/turf/simulated/floor/airless,/area/shuttle/syndicate_elite/mothership) "he" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "tradestarshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/shuttle/trade/centcom) "hf" = (/obj/structure/closet/wardrobe/pjs,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"hg" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/weapon/pen{pixel_y = 4},/obj/machinery/light,/obj/structure/table/glass,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"hh" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/hos,/obj/structure/sign/poster{pixel_y = -32},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"hg" = (/obj/item/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/pen{pixel_y = 4},/obj/machinery/light,/obj/structure/table/glass,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"hh" = (/obj/structure/bed/padded,/obj/item/bedsheet/hos,/obj/structure/sign/poster{pixel_y = -32},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hi" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) -"hj" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/glasses/square,/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) +"hj" = (/obj/structure/table/standard,/obj/item/storage/box/glasses/square,/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) "hk" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 32},/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) -"hl" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/inflatable_duck,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"hl" = (/obj/structure/table/steel_reinforced,/obj/item/inflatable_duck,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hm" = (/obj/structure/table/steel_reinforced,/obj/item/stack/material/mhydrogen,/obj/item/stack/material/diamond,/obj/item/stack/material/sandstone,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"hn" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/rig/internalaffairs,/obj/item/clothing/head/helmet/space/void/wizard,/obj/item/clothing/suit/space/void/wizard,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"hn" = (/obj/structure/table/steel_reinforced,/obj/item/rig/internalaffairs,/obj/item/clothing/head/helmet/space/void/wizard,/obj/item/clothing/suit/space/void/wizard,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "ho" = (/obj/structure/table/steel_reinforced,/obj/random/tool,/obj/random/tool,/obj/random/tool,/obj/random/tool,/obj/random/tool,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hp" = (/obj/structure/table/steel_reinforced,/obj/random/toolbox,/obj/random/toolbox,/obj/random/toolbox,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hq" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating,/area/shuttle/trade/centcom) @@ -385,15 +385,15 @@ "hu" = (/obj/machinery/optable,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hv" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"; dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/trade/centcom) "hw" = (/obj/structure/bed/chair{dir = 1},/obj/effect/landmark{name = "JoinLate"},/obj/structure/window/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/shuttle/arrival/pre_game) -"hx" = (/obj/structure/bed/chair{dir = 1},/obj/effect/landmark{name = "JoinLate"},/obj/structure/window/reinforced,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/shuttle/arrival/pre_game) -"hy" = (/obj/structure/bed/chair{dir = 1},/obj/effect/landmark{name = "JoinLate"},/obj/structure/window/reinforced,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/shuttle/arrival/pre_game) +"hx" = (/obj/structure/bed/chair{dir = 1},/obj/effect/landmark{name = "JoinLate"},/obj/structure/window/reinforced,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/shuttle/arrival/pre_game) +"hy" = (/obj/structure/bed/chair{dir = 1},/obj/effect/landmark{name = "JoinLate"},/obj/structure/window/reinforced,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/shuttle/arrival/pre_game) "hz" = (/obj/structure/closet/walllocker/emerglocker{pixel_y = -32},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hA" = (/obj/machinery/button/remote/blast_door{id = "tradestarshutters"; name = "remote shutter control"; pixel_x = 30; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hB" = (/obj/structure/table/steel_reinforced,/obj/random/firstaid,/obj/random/firstaid,/obj/random/firstaid,/obj/random/firstaid,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hC" = (/obj/effect/floor_decal/industrial/warning{dir = 9},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hD" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hE" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"hF" = (/obj/structure/table/steel_reinforced,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/item/weapon/weldpack,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"hF" = (/obj/structure/table/steel_reinforced,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/item/weldpack,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hG" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating,/area/shuttle/trade/centcom) "hH" = (/obj/vehicle/train/trolley,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hI" = (/obj/machinery/light,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) @@ -401,11 +401,11 @@ "hK" = (/obj/machinery/door/airlock/multi_tile/glass{dir = 4; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hL" = (/obj/structure/table/steel_reinforced,/obj/random/medical,/obj/random/medical,/obj/random/medical,/obj/random/medical,/obj/structure/window/reinforced,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hM" = (/obj/machinery/door/window/southleft{name = "Cargo Hold"; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"hN" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/coin/uranium,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/platinum,/obj/item/weapon/coin/phoron,/obj/item/weapon/coin/iron,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/diamond,/obj/structure/window/reinforced,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"hN" = (/obj/structure/table/steel_reinforced,/obj/item/coin/uranium,/obj/item/coin/silver,/obj/item/coin/platinum,/obj/item/coin/phoron,/obj/item/coin/iron,/obj/item/coin/gold,/obj/item/coin/diamond,/obj/structure/window/reinforced,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hO" = (/obj/machinery/door/window/southright{name = "Cargo Hold"; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"hP" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/item/weapon/cell/hyper,/obj/item/weapon/cell/potato,/obj/structure/window/reinforced,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"hP" = (/obj/structure/table/steel_reinforced,/obj/item/cell/high,/obj/item/cell/high,/obj/item/cell/hyper,/obj/item/cell/potato,/obj/structure/window/reinforced,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hQ" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating,/area/shuttle/trade/centcom) -"hR" = (/obj/structure/table/standard,/obj/item/clothing/gloves/sterile/latex,/obj/item/clothing/mask/surgical,/obj/item/weapon/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/circular_saw,/obj/item/stack/nanopaste,/obj/item/weapon/surgical/hemostat{pixel_y = 4},/obj/item/weapon/surgical/cautery{pixel_y = 4},/obj/item/weapon/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/medical/advanced/bruise_pack,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"hR" = (/obj/structure/table/standard,/obj/item/clothing/gloves/sterile/latex,/obj/item/clothing/mask/surgical,/obj/item/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/surgical/scalpel,/obj/item/surgical/surgicaldrill,/obj/item/surgical/circular_saw,/obj/item/stack/nanopaste,/obj/item/surgical/hemostat{pixel_y = 4},/obj/item/surgical/cautery{pixel_y = 4},/obj/item/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/medical/advanced/bruise_pack,/obj/item/surgical/bonesetter,/obj/item/surgical/bonegel{pixel_x = 4; pixel_y = 3},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hS" = (/obj/machinery/iv_drip,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hT" = (/obj/machinery/vending/snack,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/shuttle/arrival/pre_game) "hU" = (/obj/machinery/vending/cigarette,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/shuttle/arrival/pre_game) @@ -425,7 +425,7 @@ "ii" = (/obj/structure/flora/grass/brown,/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/area/syndicate_mothership) "ij" = (/obj/structure/flora/tree/pine,/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/area/syndicate_mothership) "ik" = (/obj/structure/flora/grass/both,/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/area/syndicate_mothership) -"il" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/weapon/pen{pixel_y = 4},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"il" = (/obj/structure/table/steel_reinforced,/obj/item/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/pen{pixel_y = 4},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "im" = (/obj/structure/table/steel_reinforced,/obj/machinery/newscaster{pixel_x = 32},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "in" = (/obj/structure/toilet,/obj/machinery/light/small{dir = 1},/turf/simulated/shuttle/floor/white,/area/shuttle/trade/centcom) "io" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/light/small,/turf/simulated/shuttle/floor/white,/area/shuttle/trade/centcom) @@ -442,11 +442,11 @@ "iz" = (/obj/machinery/door/airlock/silver{name = "Toilet"},/turf/simulated/shuttle/floor/white,/area/shuttle/trade/centcom) "iA" = (/obj/machinery/door/airlock/silver{name = "Restroom"},/turf/simulated/shuttle/floor/white,/area/shuttle/trade/centcom) "iB" = (/obj/structure/undies_wardrobe,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"iC" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"iC" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "iD" = (/obj/effect/floor_decal/industrial/warning{dir = 9},/obj/structure/largecrate/animal/cat,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "iE" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/obj/structure/largecrate/animal/cow,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "iF" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/obj/structure/closet/crate/freezer/rations,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"iG" = (/obj/structure/table/rack,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/obj/item/device/kit/paint/ripley/death,/obj/item/device/kit/paint/ripley/flames_blue,/obj/item/device/kit/paint/ripley/flames_red,/obj/item/device/kit/paint/ripley,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"iG" = (/obj/structure/table/rack,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/obj/item/kit/paint/ripley/death,/obj/item/kit/paint/ripley/flames_blue,/obj/item/kit/paint/ripley/flames_red,/obj/item/kit/paint/ripley,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "iH" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/obj/structure/closet/crate/secure/loot,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "iI" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/obj/structure/largecrate/hoverpod,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "iJ" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/obj/mecha/working/ripley/mining,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) @@ -461,17 +461,17 @@ "iS" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/structure/largecrate/animal/corgi,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "iT" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/largecrate/animal/corgi,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "iU" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/closet/crate/internals,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"iV" = (/obj/structure/table/rack,/obj/effect/floor_decal/industrial/warning,/obj/item/device/kit/paint/gygax/darkgygax,/obj/item/device/kit/paint/gygax/recitence,/obj/item/device/kit/paint/durand,/obj/item/device/kit/paint/durand/phazon,/obj/item/device/kit/paint/durand/seraph,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"iV" = (/obj/structure/table/rack,/obj/effect/floor_decal/industrial/warning,/obj/item/kit/paint/gygax/darkgygax,/obj/item/kit/paint/gygax/recitence,/obj/item/kit/paint/durand,/obj/item/kit/paint/durand/phazon,/obj/item/kit/paint/durand/seraph,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "iW" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/closet/crate/secure/loot,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "iX" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/largecrate/hoverpod,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "iY" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/mecha/working/ripley/firefighter,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "iZ" = (/obj/machinery/door/window/westleft{name = "Storefront"; req_access = list(160)},/obj/structure/window/reinforced,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "trade"; name = "Shop Shutters"; opacity = 0},/obj/structure/table/marble,/turf/simulated/shuttle/floor/darkred,/area/shuttle/trade/centcom) "ja" = (/obj/machinery/computer/arcade/battle,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jb" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{id = "tradebridgeshutters"; name = "remote shutter control"; pixel_x = 30; req_access = list(150)},/obj/structure/flora/pottedplant{icon_state = "plant-09"; name = "Esteban"; pixel_y = 8},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"jc" = (/obj/machinery/vending/assist{contraband = null; name = "Old Vending Machine"; products = list(/obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/signaler = 4, /obj/item/device/assembly/infra = 4, /obj/item/device/assembly/prox_sensor = 4, /obj/item/weapon/handcuffs = 8, /obj/item/device/flash = 4, /obj/item/weapon/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"jd" = (/obj/structure/closet{name = "custodial"},/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/mop,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"jc" = (/obj/machinery/vending/assist{contraband = null; name = "Old Vending Machine"; products = list(/obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, /obj/item/assembly/infra = 4, /obj/item/assembly/prox_sensor = 4, /obj/item/handcuffs = 8, /obj/item/flash = 4, /obj/item/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"jd" = (/obj/structure/closet{name = "custodial"},/obj/item/reagent_containers/spray/cleaner,/obj/item/reagent_containers/glass/bucket,/obj/item/mop,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "je" = (/obj/machinery/vending/sovietsoda,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"jf" = (/obj/machinery/light,/obj/structure/table/standard,/obj/item/weapon/soap,/obj/item/weapon/towel{color = "#0000FF"},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"jf" = (/obj/machinery/light,/obj/structure/table/standard,/obj/item/soap,/obj/item/towel{color = "#0000FF"},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jg" = (/obj/structure/sign/poster{pixel_y = -32},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jh" = (/obj/machinery/door/airlock/multi_tile/glass{dir = 2; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "ji" = (/obj/machinery/door/window/westleft{name = "Storefront"; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) @@ -480,7 +480,7 @@ "jl" = (/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "tradebridgeshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/shuttle/trade/centcom) "jm" = (/obj/machinery/vending/boozeomat{req_access = null},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jn" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"jo" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"jo" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jp" = (/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "gravsnow_corner"},/area/syndicate_mothership) "jq" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/steel_reinforced,/obj/item/poster,/obj/item/poster,/obj/item/poster,/obj/item/poster,/obj/item/poster,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jr" = (/obj/machinery/door/window/northleft{name = "Cargo Hold"; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) @@ -495,7 +495,7 @@ "jA" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/shutters{density = 0; icon_state = "shutter0"; id = "syndieshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/syndicate_mothership) "jB" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/shutters{density = 0; icon_state = "shutter0"; id = "syndieshutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/syndicate_mothership) "jC" = (/obj/machinery/button/remote/blast_door{id = "tradeportshutters"; name = "remote shutter control"; pixel_x = 30; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"jD" = (/obj/structure/table/steel_reinforced,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/item/weapon/bikehorn,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"jD" = (/obj/structure/table/steel_reinforced,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/item/bikehorn,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jE" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jF" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jG" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) @@ -507,13 +507,13 @@ "jM" = (/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/obj/structure/flora/grass/both,/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "gravsnow_corner"},/area/syndicate_mothership) "jN" = (/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/obj/structure/flora/tree/pine,/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "gravsnow_corner"},/area/syndicate_mothership) "jO" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "tradeportshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/shuttle/trade/centcom) -"jP" = (/obj/structure/closet/wardrobe/captain,/obj/item/weapon/gun/projectile/revolver/mateba,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"jP" = (/obj/structure/closet/wardrobe/captain,/obj/item/gun/projectile/revolver/mateba,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jQ" = (/obj/machinery/light{dir = 1},/obj/structure/bookcase,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jR" = (/obj/structure/bed/chair/comfy/black,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jS" = (/obj/structure/bed/chair/office/dark,/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) "jT" = (/obj/machinery/photocopier,/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) "jU" = (/obj/structure/table/steel_reinforced,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"jV" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/lipstick/black,/obj/item/weapon/lipstick/jade,/obj/item/weapon/lipstick/purple,/obj/item/weapon/lipstick,/obj/item/weapon/lipstick/random,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"jV" = (/obj/structure/table/steel_reinforced,/obj/item/lipstick/black,/obj/item/lipstick/jade,/obj/item/lipstick/purple,/obj/item/lipstick,/obj/item/lipstick/random,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jW" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/webbing,/obj/item/clothing/accessory/storage/webbing,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/scarf/white,/obj/item/clothing/accessory/scarf/lightblue,/obj/item/clothing/accessory/scarf/red,/obj/item/clothing/accessory/scarf/purple,/obj/item/clothing/accessory/armband/science,/obj/item/clothing/accessory/armband/med,/obj/item/clothing/accessory/armband/engine,/obj/item/clothing/accessory/armband/cargo,/obj/item/clothing/accessory/armband,/obj/item/clothing/accessory/medal/nobel_science,/obj/item/clothing/accessory/medal/silver,/obj/item/clothing/accessory/medal/gold,/obj/item/clothing/accessory/medal/bronze_heart,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jX" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/under/cheongsam,/obj/item/clothing/under/hosformalmale,/obj/item/clothing/under/hosformalfem,/obj/item/clothing/under/harness,/obj/item/clothing/under/gladiator,/obj/item/clothing/under/ert,/obj/item/clothing/under/schoolgirl,/obj/item/clothing/under/redcoat,/obj/item/clothing/under/sexymime,/obj/item/clothing/under/sexyclown,/obj/item/clothing/under/soviet,/obj/item/clothing/under/space,/obj/item/clothing/under/swimsuit/stripper/mankini,/obj/item/clothing/under/suit_jacket/female,/obj/item/clothing/under/rank/psych/turtleneck,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/dress/sailordress,/obj/item/clothing/under/dress/redeveninggown,/obj/item/clothing/under/dress/dress_saloon,/obj/item/clothing/under/dress/blacktango,/obj/item/clothing/under/dress/blacktango/alt,/obj/item/clothing/under/dress/dress_orange,/obj/item/clothing/under/dress/maid/janitor,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "jY" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/suit/hgpirate,/obj/item/clothing/suit/imperium_monk,/obj/item/clothing/suit/leathercoat,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/pirate,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) @@ -528,9 +528,9 @@ "kh" = (/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows"; dir = 4},/area/syndicate_mothership) "ki" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "tradeportshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/shuttle/plating,/area/shuttle/trade/centcom) "kj" = (/obj/machinery/door/airlock/command{name = "Captain's Quarters"; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"kk" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/weapon/pen{pixel_y = 4},/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) +"kk" = (/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/pen{pixel_y = 4},/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) "kl" = (/obj/structure/table/woodentable,/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) -"km" = (/obj/structure/table/woodentable,/obj/item/device/laptop,/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) +"km" = (/obj/structure/table/woodentable,/obj/item/laptop,/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) "kn" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "tradeportshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/shuttle/plating,/area/shuttle/trade/centcom) "ko" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "tradeportshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/shuttle/plating,/area/shuttle/trade/centcom) "kp" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "tradeportshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/shuttle/plating,/area/shuttle/trade/centcom) @@ -544,9 +544,9 @@ "kx" = (/obj/structure/sign/double/map/left{pixel_y = 32},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "ky" = (/obj/structure/sign/double/map/right{pixel_y = 32},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "kz" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"kA" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"kA" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "kB" = (/obj/structure/sink/kitchen{pixel_y = 28},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"kC" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/captain,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"kC" = (/obj/structure/bed/padded,/obj/item/bedsheet/captain,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "kD" = (/obj/structure/table/glass,/obj/machinery/computer3/wall_comp/telescreen/entertainment{pixel_y = -35},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "kE" = (/obj/structure/filingcabinet/filingcabinet,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "kF" = (/obj/machinery/light,/turf/simulated/floor/carpet,/area/shuttle/trade/centcom) @@ -565,12 +565,12 @@ "kS" = (/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "gravsnow_corner"; dir = 6},/area/syndicate_mothership) "kT" = (/turf/unsimulated/wall/fakeglass,/area/syndicate_mothership) "kU" = (/obj/structure/bed/chair/comfy/black{dir = 4},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"kV" = (/obj/structure/table/standard,/obj/item/weapon/folder,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"kV" = (/obj/structure/table/standard,/obj/item/folder,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "kW" = (/obj/structure/bed/chair/comfy/black{dir = 8},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "kX" = (/obj/structure/closet/crate/freezer,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "kY" = (/obj/machinery/door/airlock/external{frequency = 1331; icon_state = "door_locked"; id_tag = "trade2_shuttle_outer"; locked = 1; name = "Ship Hatch"; req_access = list(13)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "kZ" = (/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1331; master_tag = "trade2_control"; pixel_x = 24; req_one_access = list(150)},/obj/machinery/door/airlock/external{frequency = 1331; icon_state = "door_locked"; id_tag = "trade2_shuttle_outer"; locked = 1; name = "Ship Hatch"; req_access = list(13)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"la" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"la" = (/obj/structure/table/standard,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/pen,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "lb" = (/obj/machinery/door/airlock/external{req_access = list(150)},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "lc" = (/obj/machinery/door/airlock/centcom{name = "Restroom"; opacity = 1; req_access = list(150)},/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area/syndicate_mothership) "ld" = (/obj/structure/urinal{pixel_y = 32},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_mothership) @@ -584,7 +584,7 @@ "ll" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'FOURTH WALL'."; name = "\improper FOURTH WALL"; pixel_x = -32},/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/area/syndicate_mothership) "lm" = (/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/obj/structure/flora/grass/brown,/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "gravsnow_corner"; dir = 8},/area/syndicate_mothership) "ln" = (/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/turf/unsimulated/floor{dir = 1; icon = 'icons/turf/snow.dmi'; icon_state = "gravsnow_corner"},/area/syndicate_mothership) -"lo" = (/obj/structure/bed,/obj/item/weapon/bedsheet/red,/turf/simulated/floor/wood,/area/syndicate_mothership) +"lo" = (/obj/structure/bed,/obj/item/bedsheet/red,/turf/simulated/floor/wood,/area/syndicate_mothership) "lp" = (/turf/simulated/floor/wood,/area/syndicate_mothership) "lq" = (/turf/unsimulated/wall/fakeglass{dir = 1; icon_state = "fakewindows"},/area/syndicate_mothership) "lr" = (/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "gravsnow_corner"; dir = 10},/area/syndicate_mothership) @@ -596,7 +596,7 @@ "lx" = (/turf/simulated/shuttle/wall,/area/syndicate_mothership{name = "\improper Ninja Base"}) "ly" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/syndicate_mothership{name = "\improper Ninja Base"}) "lz" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "diagonalWall3"},/area/syndicate_mothership{name = "\improper Ninja Base"}) -"lA" = (/obj/item/weapon/paper{info = "Some stuff is missing..."; name = "Insert alien artifacts here."},/turf/unsimulated/floor{icon_state = "dark"},/area/alien) +"lA" = (/obj/item/paper{info = "Some stuff is missing..."; name = "Insert alien artifacts here."},/turf/unsimulated/floor{icon_state = "dark"},/area/alien) "lB" = (/obj/machinery/door/airlock/hatch,/turf/unsimulated/floor{icon_state = "dark"},/area/alien) "lC" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/mask/balaclava/tactical,/obj/item/clothing/mask/balaclava,/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/syndicate_mothership{name = "\improper Ninja Base"}) "lD" = (/obj/structure/table/steel_reinforced,/obj/structure/mirror,/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/syndicate_mothership{name = "\improper Ninja Base"}) @@ -631,14 +631,14 @@ "mg" = (/obj/machinery/teleport/station,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "mh" = (/obj/machinery/teleport/hub,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "mi" = (/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"mj" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/gun,/obj/item/weapon/gun/energy/gun,/obj/item/weapon/gun/energy/gun,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"mk" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/gun/energy/gun/nuclear,/obj/item/weapon/gun/energy/gun/nuclear,/obj/item/weapon/gun/energy/gun/nuclear,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"ml" = (/obj/structure/table/rack,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"mm" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/gun/energy/ionrifle,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"mn" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/rack,/obj/item/weapon/gun/projectile/automatic/wt550,/obj/item/weapon/gun/projectile/automatic/wt550,/obj/item/weapon/gun/projectile/automatic/wt550,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mj" = (/obj/structure/table/rack,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mk" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/item/gun/energy/gun/nuclear,/obj/item/gun/energy/gun/nuclear,/obj/item/gun/energy/gun/nuclear,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"ml" = (/obj/structure/table/rack,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mm" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/item/gun/energy/ionrifle,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mn" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/rack,/obj/item/gun/projectile/automatic/wt550,/obj/item/gun/projectile/automatic/wt550,/obj/item/gun/projectile/automatic/wt550,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "mo" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"mp" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/gun/launcher/grenade,/obj/item/weapon/gun/launcher/grenade,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"mq" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/flashbangs,/obj/item/weapon/storage/box/flashbangs,/obj/item/weapon/storage/box/emps{pixel_x = 4; pixel_y = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/storage/box/frags,/obj/item/weapon/storage/box/smokes,/obj/item/weapon/storage/box/smokes,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mp" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/launcher/grenade,/obj/item/gun/launcher/grenade,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mq" = (/obj/structure/table/rack,/obj/item/storage/box/flashbangs,/obj/item/storage/box/flashbangs,/obj/item/storage/box/emps{pixel_x = 4; pixel_y = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/item/storage/box/frags,/obj/item/storage/box/smokes,/obj/item/storage/box/smokes,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "mr" = (/obj/machinery/vending/security,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "ms" = (/obj/structure/table/rack,/obj/item/rig_module/device/rcd,/obj/item/rig_module/device/rcd,/obj/item/rig_module/device/plasmacutter,/obj/item/rig_module/device/plasmacutter,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "mt" = (/obj/structure/table/rack,/obj/item/rig_module/chem_dispenser/combat,/obj/item/rig_module/chem_dispenser/combat,/obj/item/rig_module/chem_dispenser/injector,/obj/item/rig_module/chem_dispenser/injector,/obj/item/rig_module/device/healthscanner,/obj/item/rig_module/device/healthscanner,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) @@ -647,60 +647,60 @@ "mw" = (/obj/structure/sign/securearea,/turf/simulated/shuttle/wall/dark/hard_corner,/area/centcom/specops) "mx" = (/obj/machinery/door/airlock/centcom,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "my" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"mz" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/automatic/z8,/obj/item/weapon/gun/projectile/automatic/z8,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"mA" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/sniperrifle,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"mB" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/weapon/gun/projectile/automatic/p90,/obj/item/weapon/gun/projectile/automatic/p90,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"mC" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m545saw,/obj/item/ammo_magazine/m545saw,/obj/item/ammo_magazine/m545saw,/obj/item/ammo_magazine/m545saw,/obj/item/weapon/gun/projectile/automatic/l6_saw,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mz" = (/obj/structure/table/rack,/obj/item/gun/projectile/automatic/z8,/obj/item/gun/projectile/automatic/z8,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mA" = (/obj/structure/table/rack,/obj/item/gun/energy/sniperrifle,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mB" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/gun/projectile/automatic/p90,/obj/item/gun/projectile/automatic/p90,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mC" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m545saw,/obj/item/ammo_magazine/m545saw,/obj/item/ammo_magazine/m545saw,/obj/item/ammo_magazine/m545saw,/obj/item/gun/projectile/automatic/l6_saw,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "mD" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) -"mE" = (/obj/structure/closet/crate,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mE" = (/obj/structure/closet/crate,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/storage/box,/obj/item/storage/box,/obj/item/storage/box,/obj/item/storage/box,/obj/item/storage/box,/obj/item/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "mF" = (/obj/machinery/autolathe{desc = "Your typical Autolathe. It appears to have much more options than your regular one, however..."; hacked = 1; name = "Unlocked Autolathe"},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"mG" = (/obj/structure/table/reinforced,/obj/item/device/megaphone,/obj/item/weapon/storage/box/trackimp,/obj/item/weapon/storage/box/cdeathalarm_kit,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"mH" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/vest/ert/command,/obj/item/clothing/head/helmet/ert/command,/obj/item/weapon/storage/backpack/ert/commander,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mG" = (/obj/structure/table/reinforced,/obj/item/megaphone,/obj/item/storage/box/trackimp,/obj/item/storage/box/cdeathalarm_kit,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mH" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/vest/ert/command,/obj/item/clothing/head/helmet/ert/command,/obj/item/storage/backpack/ert/commander,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "mI" = (/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "mJ" = (/obj/structure/grille,/obj/structure/lattice,/turf/space,/area/space) "mK" = (/obj/structure/lattice,/turf/space,/area/space) -"mL" = (/obj/structure/table/reinforced,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"mM" = (/obj/structure/table/reinforced,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/screwdriver,/obj/item/weapon/tool/wrench,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/screwdriver,/obj/item/weapon/tool/wrench,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mL" = (/obj/structure/table/reinforced,/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mM" = (/obj/structure/table/reinforced,/obj/item/tool/crowbar,/obj/item/tool/screwdriver,/obj/item/tool/wrench,/obj/item/tool/crowbar,/obj/item/tool/screwdriver,/obj/item/tool/wrench,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "mN" = (/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "mO" = (/obj/effect/floor_decal/corner/blue{dir = 9},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"mP" = (/obj/structure/table/reinforced,/obj/item/device/aicard,/obj/item/weapon/pinpointer/advpinpointer,/obj/item/weapon/stamp/centcomm,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mP" = (/obj/structure/table/reinforced,/obj/item/aicard,/obj/item/pinpointer/advpinpointer,/obj/item/stamp/centcomm,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "mQ" = (/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"mR" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/device/flash,/obj/item/device/flash,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"mS" = (/obj/structure/table/rack,/obj/item/device/lightreplacer,/obj/item/device/lightreplacer,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"mR" = (/obj/structure/table/rack,/obj/item/gun/energy/stunrevolver,/obj/item/gun/energy/stunrevolver,/obj/item/flash,/obj/item/flash,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"mS" = (/obj/structure/table/rack,/obj/item/lightreplacer,/obj/item/lightreplacer,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "mT" = (/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "mU" = (/obj/machinery/camera/network/ert{c_tag = "Assault Armor North"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) -"mV" = (/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; frequency = 1441; listening = 0; name = "Spec Ops Intercom"; pixel_y = 28},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) -"mW" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/weapon/storage/box/shotgunshells,/obj/item/weapon/storage/box/shotgunshells,/obj/item/weapon/storage/box/shotgunammo,/obj/item/weapon/storage/box/shotgunammo,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"mX" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/item/weapon/gun/projectile/shotgun/pump/combat,/obj/item/weapon/gun/projectile/shotgun/pump/combat,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"mY" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/weapon/gun/projectile/automatic/z8,/obj/item/weapon/gun/projectile/automatic/z8,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mV" = (/obj/item/radio/intercom{broadcasting = 1; dir = 1; frequency = 1441; listening = 0; name = "Spec Ops Intercom"; pixel_y = 28},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) +"mW" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/storage/box/shotgunshells,/obj/item/storage/box/shotgunshells,/obj/item/storage/box/shotgunammo,/obj/item/storage/box/shotgunammo,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mX" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/item/gun/projectile/shotgun/pump/combat,/obj/item/gun/projectile/shotgun/pump/combat,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mY" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/gun/projectile/automatic/z8,/obj/item/gun/projectile/automatic/z8,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "mZ" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "na" = (/obj/machinery/deployable/barrier,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"nb" = (/obj/structure/table/reinforced,/obj/item/device/pda/ert,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"nb" = (/obj/structure/table/reinforced,/obj/item/pda/ert,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nc" = (/obj/effect/floor_decal/corner/purple{dir = 9},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "nd" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "ne" = (/turf/unsimulated/wall{icon = 'icons/misc/title.dmi'; icon_state = "title"},/area) "nf" = (/turf/unsimulated/wall,/area/centcom/specops) "ng" = (/obj/machinery/mech_recharger,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "nh" = (/obj/mecha/combat/gygax/dark,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) -"ni" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/flashshells,/obj/item/weapon/storage/box/flashshells,/obj/item/weapon/storage/box/stunshells,/obj/item/weapon/storage/box/stunshells,/obj/item/weapon/storage/box/beanbags,/obj/item/weapon/storage/box/beanbags,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"nj" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/handcuffs{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/box/handcuffs,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"nk" = (/obj/structure/table/reinforced,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"nl" = (/obj/structure/table/reinforced,/obj/item/weapon/tool/wrench,/obj/item/weapon/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"ni" = (/obj/structure/table/reinforced,/obj/item/storage/box/flashshells,/obj/item/storage/box/flashshells,/obj/item/storage/box/stunshells,/obj/item/storage/box/stunshells,/obj/item/storage/box/beanbags,/obj/item/storage/box/beanbags,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"nj" = (/obj/structure/table/reinforced,/obj/item/storage/box/handcuffs{pixel_x = 3; pixel_y = 3},/obj/item/storage/box/handcuffs,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"nk" = (/obj/structure/table/reinforced,/obj/item/material/knife/tacknife/combatknife,/obj/item/material/knife/tacknife/combatknife,/obj/item/material/knife/tacknife/combatknife,/obj/item/material/knife/tacknife/combatknife,/obj/item/material/knife/tacknife/combatknife,/obj/item/material/knife/tacknife/combatknife,/obj/item/melee/baton/loaded,/obj/item/melee/baton/loaded,/obj/item/melee/baton/loaded,/obj/item/melee/baton/loaded,/obj/item/melee/baton/loaded,/obj/item/melee/baton/loaded,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"nl" = (/obj/structure/table/reinforced,/obj/item/tool/wrench,/obj/item/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nm" = (/obj/structure/table/rack,/obj/item/rig_module/device/drill,/obj/item/rig_module/device/drill,/obj/item/rig_module/maneuvering_jets,/obj/item/rig_module/maneuvering_jets,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nn" = (/obj/structure/table/rack,/obj/item/rig_module/mounted/taser,/obj/item/rig_module/mounted/taser,/obj/item/rig_module/mounted/taser,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "no" = (/obj/structure/table/rack,/obj/item/rig_module/grenade_launcher,/obj/item/rig_module/grenade_launcher,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"np" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/flashbangs,/obj/item/weapon/handcuffs,/obj/item/device/flash,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/weapon/material/knife/tacknife/combatknife,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"nq" = (/obj/structure/table/rack,/obj/item/weapon/rig/ert,/obj/item/clothing/accessory/storage/black_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"nr" = (/obj/structure/table/reinforced,/obj/item/weapon/gun/energy/gun/nuclear,/obj/item/weapon/hand_tele,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"ns" = (/obj/structure/table/rack,/obj/item/weapon/storage/backpack/security,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/shoes/galoshes,/obj/item/clothing/head/bio_hood/janitor,/obj/item/clothing/suit/bio_suit/janitor,/obj/item/clothing/gloves/purple,/obj/item/clothing/glasses/science,/obj/item/weapon/storage/backpack/security,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/shoes/galoshes,/obj/item/clothing/head/bio_hood/janitor,/obj/item/clothing/suit/bio_suit/janitor,/obj/item/clothing/gloves/purple,/obj/item/clothing/glasses/science,/obj/item/weapon/reagent_containers/spray/cleaner{pixel_x = 6; pixel_y = 3},/obj/item/weapon/reagent_containers/spray/cleaner{pixel_x = 6; pixel_y = 3},/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"nt" = (/obj/item/weapon/mop,/obj/structure/mopbucket,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"nu" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/reagent_containers/glass/bucket{amount_per_transfer_from_this = 50},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"np" = (/obj/structure/table/reinforced,/obj/item/storage/box/flashbangs,/obj/item/handcuffs,/obj/item/flash,/obj/item/melee/baton/loaded,/obj/item/storage/belt/security/tactical,/obj/item/gun/energy/stunrevolver,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/material/knife/tacknife/combatknife,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"nq" = (/obj/structure/table/rack,/obj/item/rig/ert,/obj/item/clothing/accessory/storage/black_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"nr" = (/obj/structure/table/reinforced,/obj/item/gun/energy/gun/nuclear,/obj/item/hand_tele,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"ns" = (/obj/structure/table/rack,/obj/item/storage/backpack/security,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/shoes/galoshes,/obj/item/clothing/head/bio_hood/janitor,/obj/item/clothing/suit/bio_suit/janitor,/obj/item/clothing/gloves/purple,/obj/item/clothing/glasses/science,/obj/item/storage/backpack/security,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/shoes/galoshes,/obj/item/clothing/head/bio_hood/janitor,/obj/item/clothing/suit/bio_suit/janitor,/obj/item/clothing/gloves/purple,/obj/item/clothing/glasses/science,/obj/item/reagent_containers/spray/cleaner{pixel_x = 6; pixel_y = 3},/obj/item/reagent_containers/spray/cleaner{pixel_x = 6; pixel_y = 3},/obj/item/reagent_containers/spray/plantbgone,/obj/item/reagent_containers/spray/plantbgone,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/mixed,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"nt" = (/obj/item/mop,/obj/structure/mopbucket,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"nu" = (/obj/structure/reagent_dispensers/watertank,/obj/item/reagent_containers/glass/bucket{amount_per_transfer_from_this = 50},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "nv" = (/obj/structure/lattice,/obj/structure/grille,/turf/space,/area/space) "nw" = (/obj/effect/landmark{name = "Marauder Exit"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "nx" = (/obj/machinery/door/blast/regular{icon_state = "pdoor1"; id = "ASSAULT3"; name = "Launch Bay #3"; p_open = 0},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "ny" = (/obj/machinery/mass_driver{dir = 8; id = "ASSAULT3"; name = "gravpult"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "nz" = (/obj/structure/table/reinforced,/obj/item/mecha_parts/mecha_equipment/weapon/energy/ion,/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser,/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster,/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) -"nA" = (/obj/structure/table/rack,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"nA" = (/obj/structure/table/rack,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/flash,/obj/item/flash,/obj/item/flash,/obj/item/flash,/obj/item/flash,/obj/item/flash,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nB" = (/obj/structure/curtain/open/shower,/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "nC" = (/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "nD" = (/obj/machinery/shower{icon_state = "shower"; dir = 8},/obj/structure/curtain/open/shower,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) @@ -711,58 +711,58 @@ "nI" = (/obj/structure/table/rack,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nJ" = (/obj/structure/table/rack,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nK" = (/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = 32},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"nL" = (/obj/structure/table/reinforced,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/screwdriver,/obj/item/weapon/tool/wrench,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"nL" = (/obj/structure/table/reinforced,/obj/item/tool/crowbar,/obj/item/tool/screwdriver,/obj/item/tool/wrench,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nM" = (/obj/machinery/porta_turret{anchored = 0; check_records = 0; enabled = 0; req_one_access = list(103); use_power = 0},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nN" = (/obj/machinery/vending/snack{name = "hacked Getmore Chocolate Corp"; prices = list()},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "nO" = (/obj/structure/closet/wardrobe/ert,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "nP" = (/obj/structure/undies_wardrobe,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "nQ" = (/obj/structure/urinal{pixel_y = 32},/obj/structure/window/reinforced/tinted{dir = 4; icon_state = "twindow"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "nR" = (/obj/structure/urinal{pixel_y = 32},/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) -"nS" = (/obj/item/weapon/bikehorn/rubberducky,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) -"nT" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp{pixel_x = 4; pixel_y = 8},/obj/item/clothing/glasses/sunglasses/prescription,/obj/item/clothing/glasses/sunglasses/prescription,/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_mothership) -"nU" = (/obj/structure/table/standard,/obj/item/device/radio/headset/syndicate/alt,/obj/item/device/radio/headset/syndicate/alt,/obj/item/device/radio/headset/syndicate/alt,/obj/item/device/radio/headset/syndicate/alt,/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_mothership) -"nV" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/weapon/pen{pixel_y = 4},/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_mothership) +"nS" = (/obj/item/bikehorn/rubberducky,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) +"nT" = (/obj/structure/table/standard,/obj/item/flashlight/lamp{pixel_x = 4; pixel_y = 8},/obj/item/clothing/glasses/sunglasses/prescription,/obj/item/clothing/glasses/sunglasses/prescription,/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_mothership) +"nU" = (/obj/structure/table/standard,/obj/item/radio/headset/syndicate/alt,/obj/item/radio/headset/syndicate/alt,/obj/item/radio/headset/syndicate/alt,/obj/item/radio/headset/syndicate/alt,/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_mothership) +"nV" = (/obj/structure/table/standard,/obj/item/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/pen{pixel_y = 4},/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_mothership) "nW" = (/obj/mecha/medical/odysseus/loaded,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "nX" = (/obj/machinery/recharge_station,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "nY" = (/obj/structure/table/rack,/obj/item/ammo_casing/rocket,/obj/item/ammo_casing/rocket,/obj/item/ammo_casing/rocket,/obj/item/ammo_casing/rocket,/obj/item/ammo_casing/rocket,/obj/item/ammo_casing/rocket,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"nZ" = (/obj/structure/table/rack,/obj/item/weapon/gun/launcher/rocket,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"oa" = (/obj/structure/table/rack,/obj/item/weapon/rig/ert/assetprotection,/obj/item/weapon/rig/ert/assetprotection,/obj/item/weapon/rig/ert/assetprotection,/obj/item/weapon/rig/ert/assetprotection,/obj/item/weapon/rig/ert/assetprotection,/obj/item/weapon/rig/ert/assetprotection,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"ob" = (/obj/structure/table/rack,/obj/item/weapon/melee/energy/sword/blue,/obj/item/weapon/melee/energy/sword/blue,/obj/item/weapon/melee/energy/sword/blue,/obj/item/weapon/melee/energy/sword/blue,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"oc" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/xray,/obj/item/weapon/gun/energy/xray,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"od" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/laser,/obj/item/weapon/gun/energy/laser,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"nZ" = (/obj/structure/table/rack,/obj/item/gun/launcher/rocket,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"oa" = (/obj/structure/table/rack,/obj/item/rig/ert/assetprotection,/obj/item/rig/ert/assetprotection,/obj/item/rig/ert/assetprotection,/obj/item/rig/ert/assetprotection,/obj/item/rig/ert/assetprotection,/obj/item/rig/ert/assetprotection,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"ob" = (/obj/structure/table/rack,/obj/item/melee/energy/sword/blue,/obj/item/melee/energy/sword/blue,/obj/item/melee/energy/sword/blue,/obj/item/melee/energy/sword/blue,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"oc" = (/obj/structure/table/rack,/obj/item/gun/energy/xray,/obj/item/gun/energy/xray,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"od" = (/obj/structure/table/rack,/obj/item/gun/energy/laser,/obj/item/gun/energy/laser,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oe" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/flash,/obj/item/ammo_magazine/m45/flash,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"of" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/item/weapon/gun/projectile/sec,/obj/item/weapon/gun/projectile/sec,/obj/item/weapon/gun/projectile/sec,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"og" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"of" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/item/gun/projectile/sec,/obj/item/gun/projectile/sec,/obj/item/gun/projectile/sec,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"og" = (/obj/structure/table/reinforced,/obj/item/storage/belt/security/tactical,/obj/item/storage/belt/security/tactical,/obj/item/storage/belt/security/tactical,/obj/item/storage/belt/security/tactical,/obj/item/storage/belt/security/tactical,/obj/item/storage/belt/security/tactical,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oh" = (/obj/structure/table/reinforced,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"oi" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/vest/ert/security,/obj/item/clothing/suit/armor/vest/ert/security,/obj/item/clothing/suit/armor/vest/ert/security,/obj/item/clothing/suit/armor/vest/ert/security,/obj/item/clothing/head/helmet/ert/security,/obj/item/clothing/head/helmet/ert/security,/obj/item/clothing/head/helmet/ert/security,/obj/item/clothing/head/helmet/ert/security,/obj/item/weapon/storage/backpack/ert/security,/obj/item/weapon/storage/backpack/ert/security,/obj/item/weapon/storage/backpack/ert/security,/obj/item/weapon/storage/backpack/ert/security,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"oj" = (/obj/structure/table/rack,/obj/item/weapon/rig/ert/security,/obj/item/weapon/rig/ert/security,/obj/item/weapon/rig/ert/security,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"oi" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/vest/ert/security,/obj/item/clothing/suit/armor/vest/ert/security,/obj/item/clothing/suit/armor/vest/ert/security,/obj/item/clothing/suit/armor/vest/ert/security,/obj/item/clothing/head/helmet/ert/security,/obj/item/clothing/head/helmet/ert/security,/obj/item/clothing/head/helmet/ert/security,/obj/item/clothing/head/helmet/ert/security,/obj/item/storage/backpack/ert/security,/obj/item/storage/backpack/ert/security,/obj/item/storage/backpack/ert/security,/obj/item/storage/backpack/ert/security,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"oj" = (/obj/structure/table/rack,/obj/item/rig/ert/security,/obj/item/rig/ert/security,/obj/item/rig/ert/security,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "ok" = (/obj/structure/table/rack,/obj/item/rig_module/mounted,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"ol" = (/obj/structure/table/reinforced,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"ol" = (/obj/structure/table/reinforced,/obj/item/megaphone,/obj/item/megaphone,/obj/item/megaphone,/obj/item/megaphone,/obj/item/megaphone,/obj/item/megaphone,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "om" = (/obj/effect/landmark{name = "Response Team"},/obj/effect/landmark{name = "Commando"},/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/centcom/specops) "on" = (/obj/structure/curtain/open/shower,/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/window/reinforced/tinted,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "oo" = (/obj/machinery/shower{icon_state = "shower"; dir = 8},/obj/structure/curtain/open/shower,/obj/structure/window/reinforced/tinted,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) -"op" = (/obj/item/weapon/bedsheet/hos,/obj/structure/bed/padded,/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_mothership) +"op" = (/obj/item/bedsheet/hos,/obj/structure/bed/padded,/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_mothership) "oq" = (/obj/effect/landmark{name = "Syndicate-Spawn"},/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_mothership) "or" = (/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_mothership) "os" = (/obj/machinery/door/blast/regular{icon_state = "pdoor1"; id = "ASSAULT2"; name = "Launch Bay #2"; p_open = 0},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "ot" = (/obj/machinery/mass_driver{dir = 8; id = "ASSAULT2"; name = "gravpult"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "ou" = (/obj/effect/floor_decal/corner/red{dir = 10},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"ov" = (/obj/structure/table/reinforced,/obj/item/device/pda/ert,/obj/item/device/pda/ert,/obj/item/device/pda/ert,/obj/item/device/pda/ert,/obj/item/device/pda/ert,/obj/item/device/pda/ert,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"ow" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"ov" = (/obj/structure/table/reinforced,/obj/item/pda/ert,/obj/item/pda/ert,/obj/item/pda/ert,/obj/item/pda/ert,/obj/item/pda/ert,/obj/item/pda/ert,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"ow" = (/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "ox" = (/obj/machinery/door/airlock,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "oy" = (/obj/mecha/working/ripley/firefighter,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "oz" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/obj/machinery/door/airlock/centcom{name = "Special Operations"; opacity = 1; req_access = list(103)},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oA" = (/obj/structure/sign/securearea{name = "\improper ARMORY"; pixel_y = 32},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"oB" = (/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; frequency = 1441; listening = 0; name = "Spec Ops Intercom"; pixel_y = 28},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"oB" = (/obj/item/radio/intercom{broadcasting = 1; dir = 1; frequency = 1441; listening = 0; name = "Spec Ops Intercom"; pixel_y = 28},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oC" = (/obj/structure/bed/chair{dir = 4},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"oD" = (/obj/structure/table/reinforced,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/screwdriver,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"oE" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/donut,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"oD" = (/obj/structure/table/reinforced,/obj/item/tool/crowbar,/obj/item/tool/screwdriver,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"oE" = (/obj/structure/table/reinforced,/obj/item/storage/box/donut,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oF" = (/obj/structure/bed/chair{dir = 8},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oG" = (/obj/machinery/door/blast/regular{icon_state = "pdoor1"; id = "ASSAULT1"; name = "Launch Bay #1"; p_open = 0},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "oH" = (/obj/machinery/mass_driver{dir = 8; id = "ASSAULT1"; name = "gravpult"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "oI" = (/obj/structure/sign/securearea{name = "ENGINEERING ACCESS"; pixel_y = -32},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oJ" = (/obj/structure/sign/redcross{pixel_y = -32},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"oK" = (/obj/structure/table/reinforced,/obj/item/weapon/stamp/centcomm,/obj/item/weapon/pen,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"oK" = (/obj/structure/table/reinforced,/obj/item/stamp/centcomm,/obj/item/pen,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oL" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "oM" = (/obj/machinery/door/airlock{name = "Unit 1"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "oN" = (/obj/machinery/door/airlock{name = "Unit 2"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) @@ -772,47 +772,47 @@ "oR" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/centcom/specops) "oS" = (/obj/effect/floor_decal/corner/white{dir = 5},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oT" = (/obj/structure/table/reinforced,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"oU" = (/obj/structure/table/reinforced,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"oV" = (/obj/structure/table/reinforced,/obj/item/device/paicard,/obj/item/device/paicard,/obj/item/device/paicard,/obj/item/device/paicard,/obj/item/device/paicard,/obj/item/device/paicard,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"oU" = (/obj/structure/table/reinforced,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/obj/item/radio/off,/obj/item/radio/off,/obj/item/radio/off,/obj/item/radio/off,/obj/item/radio/off,/obj/item/radio/off,/obj/item/flashlight,/obj/item/flashlight,/obj/item/flashlight,/obj/item/flashlight,/obj/item/flashlight,/obj/item/flashlight,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"oV" = (/obj/structure/table/reinforced,/obj/item/paicard,/obj/item/paicard,/obj/item/paicard,/obj/item/paicard,/obj/item/paicard,/obj/item/paicard,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oW" = (/obj/machinery/cell_charger,/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"oX" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"oX" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "oY" = (/obj/machinery/vending/cola{name = "hacked Robust Softdrinks"; prices = list()},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "oZ" = (/obj/structure/toilet{dir = 1},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "pa" = (/obj/structure/undies_wardrobe,/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_mothership) -"pb" = (/obj/structure/table/standard,/obj/item/device/pda/syndicate,/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_mothership) +"pb" = (/obj/structure/table/standard,/obj/item/pda/syndicate,/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_mothership) "pc" = (/obj/machinery/door/blast/regular{icon_state = "pdoor1"; id = "ASSAULT0"; name = "Launch Bay #0"; p_open = 0},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "pd" = (/obj/machinery/mass_driver{dir = 8; id = "ASSAULT0"; name = "gravpult"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "pe" = (/obj/item/mecha_parts/mecha_equipment/teleporter,/obj/item/mecha_parts/mecha_tracking,/obj/item/mecha_parts/mecha_tracking,/obj/item/mecha_parts/mecha_tracking,/obj/item/mecha_parts/mecha_tracking,/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "pf" = (/obj/machinery/vending/assist,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"pg" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/vest/ert/engineer,/obj/item/clothing/suit/armor/vest/ert/engineer,/obj/item/clothing/suit/armor/vest/ert/engineer,/obj/item/clothing/suit/armor/vest/ert/engineer,/obj/item/clothing/head/helmet/ert/engineer,/obj/item/clothing/head/helmet/ert/engineer,/obj/item/clothing/head/helmet/ert/engineer,/obj/item/clothing/head/helmet/ert/engineer,/obj/item/weapon/storage/backpack/ert/engineer,/obj/item/weapon/storage/backpack/ert/engineer,/obj/item/weapon/storage/backpack/ert/engineer,/obj/item/weapon/storage/backpack/ert/engineer,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"ph" = (/obj/structure/table/rack,/obj/item/weapon/rig/ert/engineer,/obj/item/weapon/rig/ert/engineer,/obj/item/weapon/rig/ert/engineer,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"pg" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/vest/ert/engineer,/obj/item/clothing/suit/armor/vest/ert/engineer,/obj/item/clothing/suit/armor/vest/ert/engineer,/obj/item/clothing/suit/armor/vest/ert/engineer,/obj/item/clothing/head/helmet/ert/engineer,/obj/item/clothing/head/helmet/ert/engineer,/obj/item/clothing/head/helmet/ert/engineer,/obj/item/clothing/head/helmet/ert/engineer,/obj/item/storage/backpack/ert/engineer,/obj/item/storage/backpack/ert/engineer,/obj/item/storage/backpack/ert/engineer,/obj/item/storage/backpack/ert/engineer,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"ph" = (/obj/structure/table/rack,/obj/item/rig/ert/engineer,/obj/item/rig/ert/engineer,/obj/item/rig/ert/engineer,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "pi" = (/obj/structure/closet/crate/medical,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"pj" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/hypospray,/obj/item/weapon/reagent_containers/hypospray,/obj/item/weapon/reagent_containers/hypospray,/obj/item/weapon/reagent_containers/hypospray,/obj/item/weapon/reagent_containers/hypospray,/obj/item/weapon/reagent_containers/hypospray,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"pk" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"pl" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/autoinjectors,/obj/item/weapon/storage/box/beakers,/obj/item/weapon/storage/box/gloves,/obj/item/weapon/storage/box/pillbottles,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/weapon/reagent_containers/glass/beaker/large,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"pm" = (/obj/machinery/chemical_dispenser/ert,/obj/item/weapon/reagent_containers/glass/beaker/large,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"pj" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/hypospray,/obj/item/reagent_containers/hypospray,/obj/item/reagent_containers/hypospray,/obj/item/reagent_containers/hypospray,/obj/item/reagent_containers/hypospray,/obj/item/reagent_containers/hypospray,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"pk" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/glass/bottle/inaprovaline,/obj/item/reagent_containers/glass/bottle/inaprovaline,/obj/item/reagent_containers/glass/bottle/inaprovaline,/obj/item/reagent_containers/glass/bottle/inaprovaline,/obj/item/reagent_containers/glass/bottle/inaprovaline,/obj/item/reagent_containers/glass/bottle/inaprovaline,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"pl" = (/obj/structure/table/reinforced,/obj/item/storage/box/autoinjectors,/obj/item/storage/box/beakers,/obj/item/storage/box/gloves,/obj/item/storage/box/pillbottles,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/reagent_containers/glass/beaker/large,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"pm" = (/obj/machinery/chemical_dispenser/ert,/obj/item/reagent_containers/glass/beaker/large,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "pn" = (/obj/machinery/chem_master,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"po" = (/obj/structure/table/rack,/obj/item/weapon/rig/ert/medical,/obj/item/weapon/rig/ert/medical,/obj/item/weapon/rig/ert/medical,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"po" = (/obj/structure/table/rack,/obj/item/rig/ert/medical,/obj/item/rig/ert/medical,/obj/item/rig/ert/medical,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "pp" = (/obj/structure/table/reinforced,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"pq" = (/obj/structure/table/reinforced,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"pq" = (/obj/structure/table/reinforced,/obj/item/cell/high,/obj/item/cell/high,/obj/item/cell/high,/obj/item/cell/high,/obj/item/cell/high,/obj/item/cell/high,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "pr" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/syndicate_mothership) "ps" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/syndicate_mothership) "pt" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/syndicate_mothership) "pu" = (/obj/machinery/door/airlock/centcom{name = "Barracks"; opacity = 1; req_access = list(150)},/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_mothership) "pv" = (/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,/obj/item/mecha_parts/mecha_equipment/repair_droid,/obj/item/mecha_parts/mecha_equipment/repair_droid,/obj/item/mecha_parts/mecha_equipment/repair_droid,/obj/item/mecha_parts/mecha_equipment/repair_droid,/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "pw" = (/obj/machinery/vending/tool,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"px" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/device/flash,/obj/item/device/flash,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"py" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"pz" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/vest/ert/medical,/obj/item/clothing/suit/armor/vest/ert/medical,/obj/item/clothing/suit/armor/vest/ert/medical,/obj/item/clothing/suit/armor/vest/ert/medical,/obj/item/clothing/head/helmet/ert/medical,/obj/item/clothing/head/helmet/ert/medical,/obj/item/clothing/head/helmet/ert/medical,/obj/item/clothing/head/helmet/ert/medical,/obj/item/weapon/storage/backpack/ert/medical,/obj/item/weapon/storage/backpack/ert/medical,/obj/item/weapon/storage/backpack/ert/medical,/obj/item/weapon/storage/backpack/ert/medical,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"px" = (/obj/structure/table/rack,/obj/item/gun/energy/stunrevolver,/obj/item/gun/energy/stunrevolver,/obj/item/flash,/obj/item/flash,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"py" = (/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"pz" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/vest/ert/medical,/obj/item/clothing/suit/armor/vest/ert/medical,/obj/item/clothing/suit/armor/vest/ert/medical,/obj/item/clothing/suit/armor/vest/ert/medical,/obj/item/clothing/head/helmet/ert/medical,/obj/item/clothing/head/helmet/ert/medical,/obj/item/clothing/head/helmet/ert/medical,/obj/item/clothing/head/helmet/ert/medical,/obj/item/storage/backpack/ert/medical,/obj/item/storage/backpack/ert/medical,/obj/item/storage/backpack/ert/medical,/obj/item/storage/backpack/ert/medical,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "pA" = (/obj/structure/table/rack,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"pB" = (/obj/structure/table/rack,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"pB" = (/obj/structure/table/rack,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "pC" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "pD" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "specops_centcom_dock"; name = "docking port controller"; pixel_x = 0; pixel_y = -25; req_one_access = list(103); tag_door = "specops_centcom_dock_door"},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "pE" = (/obj/structure/closet/secure_closet/bar{req_access = list(25)},/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) "pF" = (/obj/structure/reagent_dispensers/beerkeg,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) "pG" = (/obj/machinery/vending/boozeomat,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) "pH" = (/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_soft/full,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) -"pI" = (/obj/structure/table/marble,/obj/item/weapon/storage/box/glasses/square,/obj/item/weapon/storage/box/glasses/square,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) +"pI" = (/obj/structure/table/marble,/obj/item/storage/box/glasses/square,/obj/item/storage/box/glasses/square,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) "pJ" = (/obj/structure/kitchenspike,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "pK" = (/obj/machinery/gibber,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "pL" = (/turf/simulated/shuttle/wall/dark,/area/syndicate_station/start) @@ -825,7 +825,7 @@ "pS" = (/obj/structure/sign/double/map/left{pixel_y = 32},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership) "pT" = (/obj/machinery/vending/snack{name = "hacked Getmore Chocolate Corp"; prices = list()},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership) "pU" = (/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_soft/full,/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership) -"pV" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/glasses/square{pixel_x = 1; pixel_y = 4},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership) +"pV" = (/obj/structure/table/standard,/obj/item/storage/box/glasses/square{pixel_x = 1; pixel_y = 4},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership) "pW" = (/obj/structure/sink/kitchen{pixel_y = 28},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership) "pX" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership) "pY" = (/obj/effect/landmark{name = "Nuclear-Code"},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/syndicate_mothership) @@ -833,11 +833,11 @@ "qa" = (/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/syndicate_mothership) "qb" = (/obj/machinery/camera/network/ert{c_tag = "Assault Armor South"; dir = 1},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "qc" = (/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill,/obj/item/mecha_parts/mecha_equipment/tool/cable_layer,/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) -"qd" = (/obj/item/mecha_parts/mecha_equipment/tool/extinguisher,/obj/item/mecha_parts/mecha_equipment/tool/rcd,/obj/item/weapon/pickaxe/diamonddrill,/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) +"qd" = (/obj/item/mecha_parts/mecha_equipment/tool/extinguisher,/obj/item/mecha_parts/mecha_equipment/tool/rcd,/obj/item/pickaxe/diamonddrill,/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "qe" = (/obj/structure/table/reinforced,/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp,/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp,/obj/item/mecha_parts/mecha_equipment/tool/passenger,/obj/item/mecha_parts/mecha_equipment/tool/passenger,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "qf" = (/obj/machinery/vending/engivend,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"qg" = (/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/steel{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/material/steel{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/material/steel{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/material/steel{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/material/plasteel{amount = 50},/obj/item/stack/material/plasteel{amount = 50},/obj/item/stack/material/plasteel{amount = 50},/obj/item/stack/material/plasteel{amount = 50},/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"qh" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"qg" = (/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/steel{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/material/steel{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/material/steel{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/material/steel{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/material/plasteel{amount = 50},/obj/item/stack/material/plasteel{amount = 50},/obj/item/stack/material/plasteel{amount = 50},/obj/item/stack/material/plasteel{amount = 50},/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"qh" = (/obj/structure/table/steel_reinforced,/obj/item/storage/box,/obj/item/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "qi" = (/obj/machinery/pipedispenser/orderable,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "qj" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "specops_centcom_dock_door"; locked = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "qk" = (/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) @@ -853,35 +853,35 @@ "qu" = (/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership) "qv" = (/obj/structure/table/reinforced,/obj/machinery/microwave{pixel_x = -1; pixel_y = 8},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership) "qw" = (/obj/machinery/vending/engineering,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"qx" = (/obj/item/weapon/circuitboard/aiupload,/obj/item/weapon/circuitboard/borgupload,/obj/item/weapon/circuitboard/smes,/obj/item/weapon/aiModule/nanotrasen,/obj/item/weapon/aiModule/reset,/obj/item/weapon/aiModule/freeformcore,/obj/item/weapon/aiModule/protectStation,/obj/item/weapon/aiModule/quarantine,/obj/item/weapon/aiModule/paladin,/obj/item/weapon/aiModule/robocop,/obj/item/weapon/aiModule/safeguard,/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"qy" = (/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/structure/table/steel_reinforced,/obj/item/clothing/glasses/welding/superior,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"qx" = (/obj/item/circuitboard/aiupload,/obj/item/circuitboard/borgupload,/obj/item/circuitboard/smes,/obj/item/aiModule/nanotrasen,/obj/item/aiModule/reset,/obj/item/aiModule/freeformcore,/obj/item/aiModule/protectStation,/obj/item/aiModule/quarantine,/obj/item/aiModule/paladin,/obj/item/aiModule/robocop,/obj/item/aiModule/safeguard,/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"qy" = (/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/structure/table/steel_reinforced,/obj/item/clothing/glasses/welding/superior,/obj/item/grenade/chem_grenade/metalfoam,/obj/item/grenade/chem_grenade/metalfoam,/obj/item/grenade/chem_grenade/metalfoam,/obj/item/grenade/chem_grenade/metalfoam,/obj/item/grenade/chem_grenade/metalfoam,/obj/item/grenade/chem_grenade/metalfoam,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "qz" = (/obj/machinery/pipedispenser/disposal/orderable,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"qA" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/syringes{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"qA" = (/obj/structure/table/reinforced,/obj/item/storage/box/syringes{pixel_x = 2; pixel_y = 2},/obj/item/storage/box/syringes,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "qB" = (/obj/structure/table/reinforced,/obj/item/clothing/glasses/hud/health{pixel_x = 4; pixel_y = 4},/obj/item/clothing/glasses/hud/health{pixel_x = 2; pixel_y = 2},/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"qC" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"qD" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/device/flash,/obj/item/device/flash,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"qC" = (/obj/structure/table/reinforced,/obj/item/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"qD" = (/obj/structure/table/rack,/obj/item/gun/energy/stunrevolver,/obj/item/gun/energy/stunrevolver,/obj/item/flash,/obj/item/flash,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "qE" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_l"; dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/specops/centcom) "qF" = (/turf/simulated/shuttle/wall/dark{join_group = "shuttle_ert"},/area/shuttle/specops/centcom) "qG" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "specops_shuttle_port_hatch"; locked = 1; name = "Port Docking Hatch"; req_access = list(13)},/turf/unsimulated/floor{icon_state = "dark"},/area/shuttle/specops/centcom) -"qH" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/shaker,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) +"qH" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/drinks/shaker,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) "qI" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) "qJ" = (/obj/machinery/door/airlock/freezer,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "qK" = (/obj/structure/table/standard,/obj/machinery/microwave{pixel_x = -1; pixel_y = 2},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "qL" = (/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "qM" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "qN" = (/obj/structure/bed/chair/comfy/black{dir = 4},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership) -"qO" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen{pixel_y = 4},/obj/structure/table/glass,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership) -"qP" = (/obj/item/weapon/folder{pixel_y = 2},/obj/structure/table/glass,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership) +"qO" = (/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/pen{pixel_y = 4},/obj/structure/table/glass,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership) +"qP" = (/obj/item/folder{pixel_y = 2},/obj/structure/table/glass,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership) "qQ" = (/obj/structure/bed/chair/comfy/black{dir = 8},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership) -"qR" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership) +"qR" = (/obj/structure/table/reinforced,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership) "qS" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/syndicate/black/green,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/syndicate/black/green,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "qT" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/syndicate/black/blue,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/syndicate/black/blue,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"qU" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"qU" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/storage/belt/utility/full,/obj/item/storage/belt/utility/full,/obj/item/storage/belt/utility/full,/obj/item/storage/belt/utility/full,/obj/item/storage/belt/utility/full,/obj/item/storage/belt/utility/full,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "qV" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/taperoll/engineering,/obj/item/taperoll/engineering,/obj/item/taperoll/engineering,/obj/item/taperoll/engineering,/obj/item/taperoll/engineering,/obj/item/taperoll/engineering,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"qW" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/pill_bottle/tramadol,/obj/item/weapon/storage/pill_bottle/tramadol,/obj/item/weapon/storage/pill_bottle/tramadol,/obj/item/weapon/storage/pill_bottle/dylovene,/obj/item/weapon/storage/pill_bottle/dylovene,/obj/item/weapon/storage/pill_bottle/dylovene,/obj/item/weapon/storage/pill_bottle/dermaline,/obj/item/weapon/storage/pill_bottle/dermaline,/obj/item/weapon/storage/pill_bottle/dermaline,/obj/item/weapon/storage/pill_bottle/spaceacillin,/obj/item/weapon/storage/pill_bottle/dexalin_plus,/obj/item/weapon/storage/pill_bottle/dexalin_plus,/obj/item/weapon/storage/pill_bottle/dexalin_plus,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"qX" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/bodybags{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/bodybags,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"qY" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/belt/medical/emt,/obj/item/weapon/storage/belt/medical/emt,/obj/item/weapon/storage/belt/medical/emt,/obj/item/weapon/storage/belt/medical/emt,/obj/item/weapon/storage/belt/medical/emt,/obj/item/weapon/storage/belt/medical/emt,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"qZ" = (/obj/structure/closet/crate/medical,/obj/item/weapon/surgical/circular_saw,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/weapon/surgical/hemostat{pixel_y = 4},/obj/item/weapon/surgical/cautery{pixel_y = 4},/obj/item/weapon/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/nanopaste,/obj/item/weapon/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/mask/surgical,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"qW" = (/obj/structure/table/reinforced,/obj/item/storage/pill_bottle/tramadol,/obj/item/storage/pill_bottle/tramadol,/obj/item/storage/pill_bottle/tramadol,/obj/item/storage/pill_bottle/dylovene,/obj/item/storage/pill_bottle/dylovene,/obj/item/storage/pill_bottle/dylovene,/obj/item/storage/pill_bottle/dermaline,/obj/item/storage/pill_bottle/dermaline,/obj/item/storage/pill_bottle/dermaline,/obj/item/storage/pill_bottle/spaceacillin,/obj/item/storage/pill_bottle/dexalin_plus,/obj/item/storage/pill_bottle/dexalin_plus,/obj/item/storage/pill_bottle/dexalin_plus,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"qX" = (/obj/structure/table/reinforced,/obj/item/storage/box/bodybags{pixel_x = 2; pixel_y = 2},/obj/item/storage/box/bodybags,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"qY" = (/obj/structure/table/reinforced,/obj/item/storage/belt/medical/emt,/obj/item/storage/belt/medical/emt,/obj/item/storage/belt/medical/emt,/obj/item/storage/belt/medical/emt,/obj/item/storage/belt/medical/emt,/obj/item/storage/belt/medical/emt,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"qZ" = (/obj/structure/closet/crate/medical,/obj/item/surgical/circular_saw,/obj/item/surgical/surgicaldrill,/obj/item/surgical/bonegel{pixel_x = 4; pixel_y = 3},/obj/item/surgical/bonesetter,/obj/item/surgical/scalpel,/obj/item/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/surgical/hemostat{pixel_y = 4},/obj/item/surgical/cautery{pixel_y = 4},/obj/item/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/nanopaste,/obj/item/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/mask/surgical,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "ra" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/specops/centcom) "rb" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 8},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/simulated/shuttle/plating/airless,/area/shuttle/specops/centcom) "rc" = (/obj/structure/bed/chair,/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/shuttle/specops/centcom) @@ -892,16 +892,16 @@ "rh" = (/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = 32},/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/shuttle/specops/centcom) "ri" = (/turf/simulated/shuttle/wall/dark{hard_corner = 1; join_group = "shuttle_ert"},/area/shuttle/specops/centcom) "rj" = (/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/obj/machinery/door/airlock/glass,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) -"rk" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/red/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) -"rl" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 2; pixel_y = 3},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"rk" = (/obj/item/stool/padded,/obj/effect/floor_decal/corner/red/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) +"rl" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets{pixel_x = 2; pixel_y = 3},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "rm" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "rn" = (/obj/structure/frame/computer,/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "ro" = (/obj/structure/bed/chair/comfy/black{dir = 1},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership) "rp" = (/obj/machinery/vending/cola{name = "hacked Robust Softdrinks"; prices = list()},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership) "rq" = (/obj/structure/closet/secure_closet/freezer/kitchen{req_access = list(150)},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership) "rr" = (/obj/structure/reagent_dispensers/beerkeg/fakenuke,/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership) -"rs" = (/obj/structure/table/reinforced,/obj/item/weapon/tray{pixel_y = 5},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership) -"rt" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka{pixel_x = 3; pixel_y = 12},/obj/item/weapon/reagent_containers/food/drinks/bottle/wine{pixel_x = -1; pixel_y = 8},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership) +"rs" = (/obj/structure/table/reinforced,/obj/item/tray{pixel_y = 5},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership) +"rt" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/drinks/bottle/vodka{pixel_x = 3; pixel_y = 12},/obj/item/reagent_containers/food/drinks/bottle/wine{pixel_x = -1; pixel_y = 8},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership) "ru" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/syndicate/black/med,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/syndicate/black/med,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "rv" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/syndicate/black/orange,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/syndicate/black/orange,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "rw" = (/obj/machinery/iv_drip,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) @@ -910,18 +910,18 @@ "rz" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "specops_shuttle_fore"; name = "forward docking hatch controller"; pixel_x = 0; pixel_y = -25; tag_door = "specops_shuttle_fore_hatch"},/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/shuttle/specops/centcom) "rA" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "specops_shuttle_fore_hatch"; locked = 1; name = "Forward Docking Hatch"; req_access = list(13)},/turf/simulated/shuttle/plating,/area/shuttle/specops/centcom) "rB" = (/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/mob/living/simple_mob/animal/passive/dog/corgi/puppy{name = "Bockscar"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) -"rC" = (/obj/structure/table/standard,/obj/item/stack/material/glass{amount = 15},/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"rD" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_y = -32; subspace_transmission = 1; syndie = 1},/obj/machinery/light,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"rE" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/weapon/pen{pixel_y = 4},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"rF" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership) +"rC" = (/obj/structure/table/standard,/obj/item/stack/material/glass{amount = 15},/obj/item/cell{charge = 100; maxcharge = 15000},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"rD" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_y = -32; subspace_transmission = 1; syndie = 1},/obj/machinery/light,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"rE" = (/obj/structure/table/standard,/obj/item/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/pen{pixel_y = 4},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"rF" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership) "rG" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/syndicate/black/engie,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/syndicate/black/engie,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "rH" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/syndicate/black/red,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/syndicate/black/red,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "rI" = (/obj/machinery/computer/prisoner{name = "Implant Management"},/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/shuttle/specops/centcom) -"rJ" = (/obj/machinery/computer/communications,/obj/item/device/radio/intercom{broadcasting = 0; dir = 1; frequency = 1443; listening = 1; name = "Spec Ops Intercom"; pixel_y = -28},/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/shuttle/specops/centcom) +"rJ" = (/obj/machinery/computer/communications,/obj/item/radio/intercom{broadcasting = 0; dir = 1; frequency = 1443; listening = 1; name = "Spec Ops Intercom"; pixel_y = -28},/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/shuttle/specops/centcom) "rK" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/shuttle/specops/centcom) "rL" = (/obj/structure/bed/chair{dir = 1},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/shuttle/specops/centcom) -"rM" = (/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) -"rN" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/weapon/material/kitchen/rollingpin,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) +"rM" = (/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) +"rN" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/material/kitchen/rollingpin,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) "rO" = (/turf/unsimulated/wall,/area/centcom/command) "rP" = (/turf/unsimulated/wall{desc = "That looks like it doesn't open easily."; dir = 8; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/command) "rQ" = (/turf/simulated/shuttle/wall/dark/hard_corner,/area/syndicate_station/start) @@ -929,7 +929,7 @@ "rS" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/syndicate_mothership) "rT" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/syndicate_mothership) "rU" = (/obj/machinery/shower{pixel_y = 32},/obj/structure/window/basic{dir = 8},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_mothership) -"rV" = (/obj/machinery/shower{pixel_y = 32},/obj/item/weapon/soap/syndie,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_mothership) +"rV" = (/obj/machinery/shower{pixel_y = 32},/obj/item/soap/syndie,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_mothership) "rW" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/syndicate/black,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/syndicate/black,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "rX" = (/obj/structure/table/rack,/obj/item/clothing/mask/balaclava/tactical,/obj/item/clothing/mask/balaclava/tactical,/obj/item/clothing/mask/balaclava/tactical,/obj/item/clothing/mask/balaclava/tactical,/obj/item/clothing/mask/balaclava/tactical,/obj/item/clothing/mask/balaclava/tactical,/obj/item/clothing/mask/balaclava,/obj/item/clothing/mask/balaclava,/obj/item/clothing/mask/balaclava,/obj/item/clothing/mask/balaclava,/obj/item/clothing/mask/balaclava,/obj/item/clothing/mask/balaclava,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "rY" = (/obj/machinery/shieldgen,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) @@ -939,25 +939,25 @@ "sc" = (/obj/machinery/shieldwallgen,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "sd" = (/obj/machinery/power/emitter,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "se" = (/obj/structure/table/reinforced,/obj/item/roller,/obj/item/roller,/obj/item/roller,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"sf" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/fire{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/firstaid/fire,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"sg" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/toxin{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/firstaid/toxin,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"sh" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/adv{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/firstaid/adv,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"si" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/o2{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/firstaid/o2,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"sj" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/firstaid/regular,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"sk" = (/obj/structure/table/reinforced,/obj/item/device/defib_kit/compact/combat/loaded,/obj/item/device/defib_kit/compact/combat/loaded,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"sl" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"sf" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/fire{pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/fire,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"sg" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/toxin{pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/toxin,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"sh" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/adv{pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/adv,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"si" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/o2{pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/o2,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"sj" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/regular{pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/regular,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"sk" = (/obj/structure/table/reinforced,/obj/item/defib_kit/compact/combat/loaded,/obj/item/defib_kit/compact/combat/loaded,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"sl" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "sm" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_r"; dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/specops/centcom) "sn" = (/obj/machinery/vending/dinnerware,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) "so" = (/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/obj/machinery/computer/arcade/orion_trail,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) "sp" = (/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/obj/machinery/computer/arcade,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) -"sq" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) +"sq" = (/obj/structure/table/standard,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/food/condiment/enzyme,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) "sr" = (/obj/structure/table/standard,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) "ss" = (/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/command) -"st" = (/obj/structure/closet/secure_closet/medical_wall{pixel_x = -32; pixel_y = 0; req_access = list(150)},/obj/item/stack/medical/splint,/obj/item/stack/medical/ointment,/obj/item/stack/medical/ointment,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack,/obj/item/weapon/storage/belt/medical/emt,/obj/item/weapon/storage/belt/medical/emt,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"st" = (/obj/structure/closet/secure_closet/medical_wall{pixel_x = -32; pixel_y = 0; req_access = list(150)},/obj/item/stack/medical/splint,/obj/item/stack/medical/ointment,/obj/item/stack/medical/ointment,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack,/obj/item/storage/belt/medical/emt,/obj/item/storage/belt/medical/emt,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "su" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "sv" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "sw" = (/obj/structure/closet/hydrant{pixel_y = 32},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"sx" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/security,/obj/item/weapon/storage/belt/security,/obj/item/ammo_magazine/m9mm/flash,/obj/item/weapon/gun/projectile/pistol/flash,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"sx" = (/obj/structure/table/rack,/obj/item/storage/belt/security,/obj/item/storage/belt/security,/obj/item/ammo_magazine/m9mm/flash,/obj/item/gun/projectile/pistol/flash,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "sy" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/syndicate_mothership) "sz" = (/obj/machinery/door/airlock/centcom{name = "Bathroom"; opacity = 1},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_mothership) "sA" = (/obj/machinery/shower{dir = 1},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_mothership) @@ -977,16 +977,16 @@ "sO" = (/turf/simulated/shuttle/wall/dark,/area/shuttle/administration/centcom) "sP" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "admin_shuttle_hatch"; locked = 1; name = "Shuttle Hatch"; req_access = list(13)},/turf/simulated/floor/plating,/area/shuttle/administration/centcom) "sQ" = (/obj/machinery/recharger/wallcharger{pixel_x = -25},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"sR" = (/obj/structure/closet,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"sR" = (/obj/structure/closet,/obj/item/reagent_containers/food/snacks/liquidfood,/obj/item/reagent_containers/food/snacks/liquidfood,/obj/item/reagent_containers/food/snacks/liquidfood,/obj/item/reagent_containers/food/snacks/liquidfood,/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "sS" = (/obj/structure/lattice,/obj/structure/grille,/obj/structure/lattice,/turf/space,/area/space) -"sT" = (/obj/structure/table/rack,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"sU" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/ionrifle,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/obj/item/weapon/gun/energy/ionrifle,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"sV" = (/obj/structure/table/rack,/obj/item/weapon/tool/crowbar/red,/obj/item/weapon/tool/crowbar/red,/obj/item/weapon/tool/crowbar/red,/obj/item/weapon/tool/crowbar/red,/obj/item/weapon/tool/crowbar/red,/obj/item/weapon/tool/crowbar/red,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"sW" = (/obj/structure/table/rack,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"sX" = (/obj/structure/table/rack,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"sY" = (/obj/structure/table/rack,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera,/obj/item/device/camera,/obj/item/device/camera,/obj/item/device/camera,/obj/item/device/camera,/obj/item/device/camera,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"sZ" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/weapon/gun/projectile/automatic/c20r,/obj/item/weapon/gun/projectile/automatic/c20r,/obj/item/weapon/gun/projectile/automatic/c20r,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"ta" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m545,/obj/item/ammo_magazine/m545,/obj/item/ammo_magazine/m545,/obj/item/ammo_magazine/m545,/obj/item/weapon/gun/projectile/automatic/sts35,/obj/item/weapon/gun/projectile/automatic/sts35,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"sT" = (/obj/structure/table/rack,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/obj/item/material/knife/tacknife/combatknife,/obj/item/material/knife/tacknife/combatknife,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"sU" = (/obj/structure/table/rack,/obj/item/gun/energy/ionrifle,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/obj/item/gun/energy/ionrifle,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"sV" = (/obj/structure/table/rack,/obj/item/tool/crowbar/red,/obj/item/tool/crowbar/red,/obj/item/tool/crowbar/red,/obj/item/tool/crowbar/red,/obj/item/tool/crowbar/red,/obj/item/tool/crowbar/red,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"sW" = (/obj/structure/table/rack,/obj/item/megaphone,/obj/item/megaphone,/obj/item/megaphone,/obj/item/megaphone,/obj/item/megaphone,/obj/item/megaphone,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"sX" = (/obj/structure/table/rack,/obj/item/flashlight/maglight,/obj/item/flashlight/maglight,/obj/item/flashlight/maglight,/obj/item/flashlight/maglight,/obj/item/flashlight/maglight,/obj/item/flashlight/maglight,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"sY" = (/obj/structure/table/rack,/obj/item/camera_film,/obj/item/camera_film,/obj/item/camera_film,/obj/item/camera_film,/obj/item/camera_film,/obj/item/camera_film,/obj/item/camera,/obj/item/camera,/obj/item/camera,/obj/item/camera,/obj/item/camera,/obj/item/camera,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"sZ" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/gun/projectile/automatic/c20r,/obj/item/gun/projectile/automatic/c20r,/obj/item/gun/projectile/automatic/c20r,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"ta" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m545,/obj/item/ammo_magazine/m545,/obj/item/ammo_magazine/m545,/obj/item/ammo_magazine/m545,/obj/item/gun/projectile/automatic/sts35,/obj/item/gun/projectile/automatic/sts35,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "tb" = (/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) "tc" = (/obj/machinery/vending/boozeomat,/turf/simulated/shuttle/wall/dark,/area/shuttle/administration/centcom) "td" = (/obj/machinery/vending/coffee,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) @@ -994,17 +994,17 @@ "tf" = (/obj/machinery/microwave,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "tg" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "admin_shuttle"; pixel_x = -25; pixel_y = 0; req_one_access = list(101); tag_door = "admin_shuttle_hatch"},/turf/simulated/floor/plating,/area/shuttle/administration/centcom) "th" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/plating,/area/shuttle/administration/centcom) -"ti" = (/obj/item/device/multitool,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) -"tj" = (/obj/item/weapon/storage/toolbox/mechanical,/obj/structure/table/reinforced,/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) +"ti" = (/obj/item/multitool,/obj/item/reagent_containers/spray/cleaner,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) +"tj" = (/obj/item/storage/toolbox/mechanical,/obj/structure/table/reinforced,/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "tk" = (/obj/machinery/computer/card,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "tl" = (/obj/structure/bed/chair/office/dark{dir = 8},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "tm" = (/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "tn" = (/obj/structure/sign/poster{poster_type = "/decl/poster/bay_50"; pixel_x = -32},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"to" = (/obj/structure/closet,/obj/item/weapon/reagent_containers/food/snacks/tastybread,/obj/item/weapon/reagent_containers/food/snacks/tastybread,/obj/item/weapon/reagent_containers/food/snacks/tastybread,/obj/item/weapon/reagent_containers/food/snacks/tastybread,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"to" = (/obj/structure/closet,/obj/item/reagent_containers/food/snacks/tastybread,/obj/item/reagent_containers/food/snacks/tastybread,/obj/item/reagent_containers/food/snacks/tastybread,/obj/item/reagent_containers/food/snacks/tastybread,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "tp" = (/obj/structure/window/reinforced,/obj/structure/lattice,/turf/space,/area/space) "tq" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1331; id_tag = "merc_base"; pixel_x = -25; pixel_y = -5},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/syndicate_mothership) -"tr" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/handcuffs{pixel_x = 4; pixel_y = 2},/obj/item/weapon/storage/box/flashbangs,/obj/item/weapon/storage/box/smokes,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"ts" = (/obj/structure/table/rack,/obj/item/weapon/pinpointer/nukeop,/obj/item/weapon/pinpointer/nukeop,/obj/item/weapon/pinpointer/nukeop,/obj/item/weapon/pinpointer/nukeop,/obj/item/weapon/pinpointer/nukeop,/obj/item/weapon/pinpointer/nukeop,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"tr" = (/obj/structure/table/rack,/obj/item/storage/box/handcuffs{pixel_x = 4; pixel_y = 2},/obj/item/storage/box/flashbangs,/obj/item/storage/box/smokes,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"ts" = (/obj/structure/table/rack,/obj/item/pinpointer/nukeop,/obj/item/pinpointer/nukeop,/obj/item/pinpointer/nukeop,/obj/item/pinpointer/nukeop,/obj/item/pinpointer/nukeop,/obj/item/pinpointer/nukeop,/obj/item/shield/energy,/obj/item/shield/energy,/obj/item/shield/energy,/obj/item/shield/energy,/obj/item/shield/energy,/obj/item/shield/energy,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "tt" = (/obj/machinery/suit_cycler/syndicate{locked = 0},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "tu" = (/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "tv" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access = list(101)},/turf/simulated/floor/plating,/area/shuttle/administration/centcom) @@ -1013,8 +1013,8 @@ "ty" = (/obj/machinery/computer/card/centcom,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "tz" = (/obj/structure/toilet{dir = 4},/turf/simulated/shuttle/floor/black,/area/syndicate_station/start) "tA" = (/obj/machinery/flasher{id = "syndieflash"; pixel_x = 0; pixel_y = 28},/obj/machinery/light/small{dir = 1},/turf/simulated/shuttle/floor/black,/area/syndicate_station/start) -"tB" = (/obj/item/device/radio/electropack,/turf/simulated/shuttle/floor/black,/area/syndicate_station/start) -"tC" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 0; pixel_y = -32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"tB" = (/obj/item/radio/electropack,/turf/simulated/shuttle/floor/black,/area/syndicate_station/start) +"tC" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 0; pixel_y = -32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "tD" = (/obj/structure/closet/walllocker/emerglocker{pixel_x = 28},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "tE" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; frequency = 1331; id_tag = "merc_shuttle_pump"},/obj/machinery/button/remote/blast_door{id = "smindicate"; name = "ship lockdown control"; pixel_x = -25},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "tF" = (/obj/machinery/atmospherics/pipe/manifold/visible{dir = 1},/obj/machinery/airlock_sensor{frequency = 1331; id_tag = "merc_shuttle_sensor"; pixel_x = 8; pixel_y = 25},/obj/machinery/light/small{dir = 1},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) @@ -1027,8 +1027,8 @@ "tM" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "tN" = (/obj/machinery/door/window/northright,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "tO" = (/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) -"tP" = (/obj/item/weapon/flame/lighter/zippo,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) -"tQ" = (/obj/item/weapon/storage/fancy/cigarettes,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) +"tP" = (/obj/item/flame/lighter/zippo,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) +"tQ" = (/obj/item/storage/fancy/cigarettes,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "tR" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "tS" = (/obj/machinery/door/airlock/glass,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "tT" = (/obj/item/stack/material/glass{amount = 50},/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) @@ -1036,7 +1036,7 @@ "tV" = (/obj/machinery/door/airlock/centcom{name = "Administrative Office"; opacity = 1; req_access = list(108)},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "tW" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/shuttle/plating,/area/syndicate_station/start) "tX" = (/turf/simulated/shuttle/floor/black,/area/syndicate_station/start) -"tY" = (/obj/item/weapon/cigbutt,/turf/simulated/shuttle/floor/black,/area/syndicate_station/start) +"tY" = (/obj/item/cigbutt,/turf/simulated/shuttle/floor/black,/area/syndicate_station/start) "tZ" = (/obj/machinery/door/window{dir = 2; name = "Seating"; req_access = list(150)},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "ua" = (/obj/machinery/door/window{name = "Seating"; icon_state = "right"; dir = 2; req_access = list(150)},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "ub" = (/obj/structure/flora/pottedplant{icon_state = "plant-10"},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) @@ -1044,22 +1044,22 @@ "ud" = (/obj/machinery/atmospherics/pipe/manifold4w/visible,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "ue" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; frequency = 1331; id_tag = "merc_shuttle_pump"},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "uf" = (/obj/structure/window/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"ug" = (/obj/structure/table/rack,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/weapon/tank/jetpack/oxygen,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"uh" = (/obj/structure/table/rack,/obj/item/weapon/tank/jetpack/carbondioxide,/obj/item/weapon/tank/jetpack/carbondioxide,/obj/item/weapon/tank/jetpack/carbondioxide,/obj/item/weapon/tank/jetpack/carbondioxide,/obj/item/weapon/tank/jetpack/carbondioxide,/obj/item/weapon/tank/jetpack/carbondioxide,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"ug" = (/obj/structure/table/rack,/obj/item/tank/jetpack/oxygen,/obj/item/tank/jetpack/oxygen,/obj/item/tank/jetpack/oxygen,/obj/item/tank/jetpack/oxygen,/obj/item/tank/jetpack/oxygen,/obj/item/tank/jetpack/oxygen,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"uh" = (/obj/structure/table/rack,/obj/item/tank/jetpack/carbondioxide,/obj/item/tank/jetpack/carbondioxide,/obj/item/tank/jetpack/carbondioxide,/obj/item/tank/jetpack/carbondioxide,/obj/item/tank/jetpack/carbondioxide,/obj/item/tank/jetpack/carbondioxide,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "ui" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "uj" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"; dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/administration/centcom) "uk" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating/airless,/area/shuttle/administration/centcom) "ul" = (/obj/machinery/vending/snack,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) -"um" = (/obj/item/weapon/stool,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) +"um" = (/obj/item/stool,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "un" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "uo" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "up" = (/obj/machinery/recharge_station,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "uq" = (/obj/machinery/robotic_fabricator,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "ur" = (/obj/machinery/autolathe{desc = "Your typical Autolathe. It appears to have much more options than your regular one, however..."; hacked = 1; name = "Thunderdome Autolathe"},/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "us" = (/obj/structure/dispenser,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) -"ut" = (/obj/machinery/door/window{dir = 1; name = "Cell"; req_access = list(150)},/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"ut" = (/obj/machinery/door/window{dir = 1; name = "Cell"; req_access = list(150)},/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "uu" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"uv" = (/obj/machinery/vending/assist{contraband = null; name = "AntagCorpVend"; products = list(/obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/signaler = 4, /obj/item/device/assembly/infra = 4, /obj/item/device/assembly/prox_sensor = 4, /obj/item/weapon/handcuffs = 8, /obj/item/device/flash = 4, /obj/item/weapon/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4)},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"uv" = (/obj/machinery/vending/assist{contraband = null; name = "AntagCorpVend"; products = list(/obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, /obj/item/assembly/infra = 4, /obj/item/assembly/prox_sensor = 4, /obj/item/handcuffs = 8, /obj/item/flash = 4, /obj/item/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4)},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "uw" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/syndicate_station/start) "ux" = (/obj/machinery/door/airlock/external{frequency = 1331; id_tag = "merc_shuttle_inner"; name = "Ship External Access"; req_access = list(0)},/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "uy" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/lattice,/turf/space,/area/space) @@ -1067,16 +1067,16 @@ "uA" = (/obj/structure/table/rack,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "uB" = (/obj/structure/table/rack,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "uC" = (/obj/structure/table/rack,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"uD" = (/obj/structure/table/rack,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"uE" = (/obj/structure/table/rack,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"uF" = (/obj/structure/table/rack,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"uG" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/gun,/obj/item/weapon/gun/energy/gun,/obj/item/weapon/gun/energy/gun,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = -32},/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"uH" = (/obj/structure/table/rack,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"uD" = (/obj/structure/table/rack,/obj/item/binoculars,/obj/item/binoculars,/obj/item/binoculars,/obj/item/binoculars,/obj/item/binoculars,/obj/item/binoculars,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"uE" = (/obj/structure/table/rack,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"uF" = (/obj/structure/table/rack,/obj/item/radio,/obj/item/radio,/obj/item/radio,/obj/item/radio,/obj/item/radio,/obj/item/radio,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"uG" = (/obj/structure/table/rack,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = -32},/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"uH" = (/obj/structure/table/rack,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "uI" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/administration/centcom) -"uJ" = (/obj/structure/closet/cabinet{name = "Clothing Storage"},/obj/item/weapon/storage/box/syndie_kit/chameleon,/obj/item/weapon/stamp/chameleon,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) +"uJ" = (/obj/structure/closet/cabinet{name = "Clothing Storage"},/obj/item/storage/box/syndie_kit/chameleon,/obj/item/stamp/chameleon,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "uK" = (/obj/structure/table/woodentable{dir = 5},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) -"uL" = (/obj/structure/closet/cabinet,/obj/item/weapon/card/id/centcom,/obj/item/weapon/card/id/syndicate,/obj/item/weapon/card/id,/obj/item/weapon/card/id/gold,/obj/item/weapon/card/id/silver,/obj/item/device/pda/captain,/obj/item/device/pda/ert,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) -"uM" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"uL" = (/obj/structure/closet/cabinet,/obj/item/card/id/centcom,/obj/item/card/id/syndicate,/obj/item/card/id,/obj/item/card/id/gold,/obj/item/card/id/silver,/obj/item/pda/captain,/obj/item/pda/ert,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) +"uM" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "uN" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/button/flasher{id = "syndieflash"; name = "Flasher"; pixel_x = 27; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "uO" = (/obj/machinery/button/remote/blast_door{id = "smindicate"; name = "ship lockdown control"; pixel_x = -25},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "uP" = (/mob/living/simple_mob/animal/passive/cat/kitten{name = "Enola"},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) @@ -1089,7 +1089,7 @@ "uW" = (/obj/machinery/computer/communications,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "uX" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/simulated/shuttle/plating,/area/shuttle/administration/centcom) "uY" = (/turf/unsimulated/wall,/area/centcom/suppy) -"uZ" = (/obj/structure/table/standard,/obj/item/weapon/material/knife{pixel_x = -6},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = -1},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 4},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 9},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"uZ" = (/obj/structure/table/standard,/obj/item/material/knife{pixel_x = -6},/obj/item/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = -1},/obj/item/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 4},/obj/item/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 9},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "va" = (/obj/machinery/door/window{dir = 4; name = "Brig"; req_access = list(150)},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "vb" = (/obj/machinery/door/window{base_state = "right"; dir = 8; icon_state = "right"; name = "Preparation"; req_access = list(150)},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "vc" = (/obj/structure/closet/syndicate/suit{name = "suit closet"},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) @@ -1097,10 +1097,10 @@ "ve" = (/obj/structure/bed/chair/comfy/black{dir = 4},/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "vf" = (/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/suppy) "vg" = (/turf/unsimulated/wall{desc = "That looks like it doesn't open easily."; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/suppy) -"vh" = (/obj/structure/closet{name = "custodial"},/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/mop,/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"vh" = (/obj/structure/closet{name = "custodial"},/obj/item/reagent_containers/glass/bucket,/obj/item/mop,/obj/item/reagent_containers/spray/cleaner,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "vi" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Brig"; req_access = list(150)},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "vj" = (/obj/machinery/door/window{base_state = "left"; dir = 8; icon_state = "left"; name = "Preparation"; req_access = list(150)},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"vk" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/syndicate{pixel_x = -1; pixel_y = 3},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"vk" = (/obj/structure/table/standard,/obj/item/storage/toolbox/syndicate{pixel_x = -1; pixel_y = 3},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "vl" = (/obj/machinery/dna_scannernew,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "vm" = (/obj/machinery/computer/cloning,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "vn" = (/obj/machinery/clonepod,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) @@ -1111,14 +1111,14 @@ "vs" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/machinery/sleeper{dir = 8},/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) "vt" = (/obj/machinery/sleep_console,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) "vu" = (/obj/structure/sign/nosmoking_1{pixel_y = 32},/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) -"vv" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) -"vw" = (/obj/structure/table/standard,/obj/structure/closet/secure_closet/medical_wall{pixel_y = 32; req_access = list(150)},/obj/item/bodybag,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = -4; pixel_y = 8},/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{pixel_x = 4; pixel_y = 7},/obj/item/weapon/reagent_containers/syringe,/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) -"vx" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"vv" = (/obj/structure/table/standard,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) +"vw" = (/obj/structure/table/standard,/obj/structure/closet/secure_closet/medical_wall{pixel_y = 32; req_access = list(150)},/obj/item/bodybag,/obj/item/reagent_containers/syringe/antiviral,/obj/item/reagent_containers/syringe/antiviral,/obj/item/reagent_containers/syringe/antiviral,/obj/item/reagent_containers/glass/bottle/antitoxin{pixel_x = -4; pixel_y = 8},/obj/item/reagent_containers/glass/bottle/inaprovaline{pixel_x = 4; pixel_y = 7},/obj/item/reagent_containers/syringe,/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) +"vx" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "vy" = (/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"vz" = (/obj/structure/table/standard,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/signaler{pixel_y = 2},/obj/item/clothing/glasses/night,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"vA" = (/obj/structure/table/standard,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/signaler{pixel_y = 2},/obj/item/clothing/glasses/night,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"vB" = (/obj/structure/table/standard,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/night,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"vC" = (/obj/structure/table/standard,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/night,/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"vz" = (/obj/structure/table/standard,/obj/item/clothing/gloves/yellow,/obj/item/assembly/signaler{pixel_y = 2},/obj/item/clothing/glasses/night,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"vA" = (/obj/structure/table/standard,/obj/item/clothing/gloves/yellow,/obj/item/assembly/signaler{pixel_y = 2},/obj/item/clothing/glasses/night,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"vB" = (/obj/structure/table/standard,/obj/item/clothing/gloves/yellow,/obj/item/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/night,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"vC" = (/obj/structure/table/standard,/obj/item/clothing/gloves/yellow,/obj/item/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/night,/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "vD" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/terminal) "vE" = (/turf/unsimulated/wall,/area/centcom/terminal) "vF" = (/obj/machinery/door/blast/regular{icon_state = "pdoor1"; id = "CREED"; name = "Ready Room"; p_open = 0},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) @@ -1132,11 +1132,11 @@ "vN" = (/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor,/area/supply/dock) "vO" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "syndieshutters_infirmary"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/syndicate_station/start) "vP" = (/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) -"vQ" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"vR" = (/obj/structure/table/standard,/obj/item/weapon/tool/screwdriver,/obj/effect/spawner/newbomb/timer/syndicate,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"vQ" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"vR" = (/obj/structure/table/standard,/obj/item/tool/screwdriver,/obj/effect/spawner/newbomb/timer/syndicate,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "vS" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 4; icon_state = "shutter0"; id = "syndieshutters_workshop"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/syndicate_station/start) -"vT" = (/obj/structure/table/rack,/obj/item/device/suit_cooling_unit,/obj/item/device/suit_cooling_unit,/obj/item/device/suit_cooling_unit,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"vU" = (/obj/structure/table/rack,/obj/item/weapon/rig/merc/empty,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"vT" = (/obj/structure/table/rack,/obj/item/suit_cooling_unit,/obj/item/suit_cooling_unit,/obj/item/suit_cooling_unit,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"vU" = (/obj/structure/table/rack,/obj/item/rig/merc/empty,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "vV" = (/obj/structure/flora/ausbushes/brflowers,/turf/unsimulated/floor{icon_state = "grass0"; name = "grass"},/area/centcom/terminal) "vW" = (/obj/structure/flora/ausbushes/ppflowers,/turf/unsimulated/floor{icon_state = "grass0"; name = "grass"},/area/centcom/terminal) "vX" = (/obj/machinery/porta_turret/crescent,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) @@ -1146,9 +1146,9 @@ "wb" = (/obj/machinery/door/airlock/external,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "wc" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "admin_shuttle_bay_door"; locked = 1},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/command) "wd" = (/obj/machinery/door/window/northright{icon_state = "right"; dir = 2},/obj/machinery/light{dir = 8},/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) -"we" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/surgery,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) +"we" = (/obj/structure/table/standard,/obj/item/storage/firstaid/surgery,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "wf" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) -"wg" = (/obj/structure/table/standard,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/item/weapon/reagent_containers/glass/beaker/large,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) +"wg" = (/obj/structure/table/standard,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/item/reagent_containers/glass/beaker/large,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "wh" = (/obj/machinery/conveyor{dir = 4; id = "QMLoad2"},/turf/simulated/shuttle/floor,/area/supply/dock) "wi" = (/obj/machinery/conveyor{dir = 4; id = "QMLoad2"},/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "supply_shuttle_hatch"; locked = 1; name = "Shuttle Hatch"; req_access = list(13)},/turf/simulated/shuttle/plating,/area/supply/dock) "wj" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "syndieshutters_infirmary"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/syndicate_station/start) @@ -1156,52 +1156,52 @@ "wl" = (/obj/machinery/body_scanconsole,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) "wm" = (/obj/machinery/door/window{dir = 4; name = "Infirmary"; req_access = list(150)},/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) "wn" = (/obj/machinery/door/window/westright{name = "Tool Storage"; req_access = list(150)},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"wo" = (/obj/item/weapon/stool/padded,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"wp" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/frags,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"wo" = (/obj/item/stool/padded,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"wp" = (/obj/structure/table/standard,/obj/item/storage/box/frags,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "wq" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 4; icon_state = "shutter0"; id = "syndieshutters_workshop"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/syndicate_station/start) "wr" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; name = "KEEP CLEAR: DOCKING AREA"; pixel_y = 0},/turf/unsimulated/wall,/area/centcom/terminal) "ws" = (/obj/machinery/door/airlock/centcom{name = "Special Operations"; opacity = 1; req_access = list(103)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) -"wt" = (/obj/machinery/light{dir = 8},/obj/structure/bed/padded,/obj/item/weapon/bedsheet/hos,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) +"wt" = (/obj/machinery/light{dir = 8},/obj/structure/bed/padded,/obj/item/bedsheet/hos,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "wu" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "supply_shuttle_hatch"; locked = 1; name = "Shuttle Hatch"; req_access = list(13)},/turf/simulated/shuttle/floor,/area/supply/dock) "wv" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "syndieshutters_infirmary"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/syndicate_station/start) "ww" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Infirmary"; req_access = list(150)},/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) "wx" = (/obj/machinery/door/window{dir = 8; name = "Tool Storage"; req_access = list(150)},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"wy" = (/obj/structure/table/standard,/obj/item/device/aicard,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"wy" = (/obj/structure/table/standard,/obj/item/aicard,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "wz" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 4; icon_state = "shutter0"; id = "syndieshutters_workshop"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/syndicate_station/start) "wA" = (/obj/machinery/vending/medical,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "wB" = (/obj/machinery/chem_master,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "wC" = (/obj/machinery/chemical_dispenser/ert,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "wD" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "supply_shuttle"; pixel_x = 25; pixel_y = 0; req_one_access = list(13,31); tag_door = "supply_shuttle_hatch"},/turf/simulated/shuttle/floor,/area/supply/dock) "wE" = (/obj/machinery/button/remote/blast_door{id = "syndieshutters_infirmary"; name = "remote shutter control"; pixel_x = -25},/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) -"wF" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) +"wF" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) "wG" = (/obj/machinery/door/window{dir = 1; name = "Secure Storage"; req_access = list(150)},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"wH" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/utility/full,/obj/item/device/multitool,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"wI" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/utility/full,/obj/item/device/multitool,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"wH" = (/obj/structure/table/rack,/obj/item/storage/belt/utility/full,/obj/item/multitool,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"wI" = (/obj/structure/table/rack,/obj/item/storage/belt/utility/full,/obj/item/multitool,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "wJ" = (/obj/machinery/button/remote/blast_door{id = "syndieshutters_telebay"; name = "remote shutter control"; pixel_x = 0; pixel_y = -25; req_access = list(150)},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "wK" = (/obj/machinery/button/remote/blast_door{id = "syndieshutters_workshop"; name = "remote shutter control"; pixel_x = 25},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "wL" = (/turf/unsimulated/wall,/area/centcom/security) "wM" = (/obj/machinery/door/airlock/centcom{name = "Administrative Office"; opacity = 1; req_access = list(108)},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/command) "wN" = (/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) -"wO" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/captain,/obj/effect/floor_decal/carpet{dir = 1},/obj/effect/floor_decal/carpet{dir = 8},/obj/effect/floor_decal/carpet{dir = 9},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) +"wO" = (/obj/structure/bed/padded,/obj/item/bedsheet/captain,/obj/effect/floor_decal/carpet{dir = 1},/obj/effect/floor_decal/carpet{dir = 8},/obj/effect/floor_decal/carpet{dir = 9},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "wP" = (/obj/structure/table/standard,/obj/effect/floor_decal/carpet{dir = 1},/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet{dir = 5},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) -"wQ" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/standard,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/cautery,/obj/item/weapon/surgical/retractor,/obj/item/stack/nanopaste,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) +"wQ" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/standard,/obj/item/surgical/surgicaldrill,/obj/item/surgical/cautery,/obj/item/surgical/retractor,/obj/item/stack/nanopaste,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) "wR" = (/obj/machinery/door/window{dir = 1; name = "Surgery"; req_access = list(150)},/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) -"wS" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/standard,/obj/item/weapon/surgical/circular_saw,/obj/item/weapon/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/weapon/surgical/hemostat,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) -"wT" = (/obj/structure/table/standard,/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/storage/firstaid/toxin{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/firstaid/adv{pixel_x = 1},/obj/item/weapon/storage/firstaid/fire{pixel_x = 1},/obj/item/weapon/storage/firstaid/o2{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/firstaid/regular,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) -"wU" = (/obj/structure/table/standard,/obj/item/roller,/obj/item/roller,/obj/item/roller,/obj/item/device/defib_kit/compact/combat/loaded,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) -"wV" = (/obj/item/weapon/weldingtool,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"wS" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/standard,/obj/item/surgical/circular_saw,/obj/item/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/surgical/hemostat,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) +"wT" = (/obj/structure/table/standard,/obj/structure/window/reinforced{dir = 8},/obj/item/storage/firstaid/toxin{pixel_x = 3; pixel_y = 3},/obj/item/storage/firstaid/adv{pixel_x = 1},/obj/item/storage/firstaid/fire{pixel_x = 1},/obj/item/storage/firstaid/o2{pixel_x = 3; pixel_y = 3},/obj/item/storage/firstaid/regular,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) +"wU" = (/obj/structure/table/standard,/obj/item/roller,/obj/item/roller,/obj/item/roller,/obj/item/defib_kit/compact/combat/loaded,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) +"wV" = (/obj/item/weldingtool,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "wW" = (/obj/structure/sign/securearea{name = "\improper CAUTION"; pixel_x = 32},/obj/machinery/light{dir = 4},/obj/structure/mopbucket,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "wX" = (/obj/machinery/telecomms/allinone{intercept = 1},/obj/machinery/door/window/northright{name = "Telecoms Mainframe"; req_access = list(150)},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "wY" = (/obj/machinery/door/blast/regular{id = "syndieshutters_telebay"; name = "Outer Airlock"},/turf/simulated/shuttle/plating,/area/syndicate_station/start) "wZ" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/effect/floor_decal/corner/orange/full{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "xa" = (/obj/effect/floor_decal/corner/orange{dir = 5},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "xb" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/security) -"xc" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/orange,/obj/effect/floor_decal/corner/orange{dir = 5},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"xc" = (/obj/structure/bed/padded,/obj/item/bedsheet/orange,/obj/effect/floor_decal/corner/orange{dir = 5},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "xd" = (/obj/structure/closet{name = "Prisoner's Locker"},/obj/effect/floor_decal/corner/orange{dir = 5},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"xe" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/orange,/obj/effect/floor_decal/corner/orange/full{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"xe" = (/obj/structure/bed/padded,/obj/item/bedsheet/orange,/obj/effect/floor_decal/corner/orange/full{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "xf" = (/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/command) "xg" = (/obj/machinery/computer/security/telescreen{name = "Spec. Ops. Monitor"; network = list("ERT")},/obj/structure/table/woodentable{dir = 5},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/command) -"xh" = (/obj/machinery/computer/card/centcom,/obj/item/weapon/card/id/centcom,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/command) +"xh" = (/obj/machinery/computer/card/centcom,/obj/item/card/id/centcom,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/command) "xi" = (/obj/machinery/vending/cola,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "xj" = (/obj/machinery/vending/cigarette,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "xk" = (/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/command) @@ -1210,9 +1210,9 @@ "xn" = (/obj/machinery/conveyor{dir = 4; id = "QMLoad"},/turf/simulated/shuttle/floor,/area/supply/dock) "xo" = (/obj/machinery/conveyor{dir = 4; id = "QMLoad"},/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "supply_shuttle_hatch"; locked = 1; name = "Shuttle Hatch"; req_access = list(13)},/turf/simulated/shuttle/plating,/area/supply/dock) "xp" = (/obj/machinery/light/small{dir = 8},/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) -"xq" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/closet/secure_closet/medical_wall{pixel_x = 32; pixel_y = 0; req_access = list(150)},/obj/item/weapon/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/gloves/sterile/latex,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) +"xq" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/closet/secure_closet/medical_wall{pixel_x = 32; pixel_y = 0; req_access = list(150)},/obj/item/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/gloves/sterile/latex,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/glass/bottle/stoxin,/obj/item/reagent_containers/glass/bottle/stoxin,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) "xr" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"xs" = (/obj/item/weapon/tool/crowbar,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"xs" = (/obj/item/tool/crowbar,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "xt" = (/obj/machinery/light/small{dir = 8},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "xu" = (/obj/structure/sign/nosmoking_2{pixel_x = 32},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "xv" = (/obj/machinery/door/airlock/external,/obj/effect/forcefield{desc = "You can't get in. Heh."; layer = 1; name = "Blocker"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) @@ -1224,9 +1224,9 @@ "xB" = (/obj/machinery/door/airlock/glass{name = "Brig Dormitories"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "xC" = (/obj/effect/floor_decal/corner/orange{dir = 6},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "xD" = (/obj/machinery/telecomms/relay/preset/centcom,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/command) -"xE" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) -"xF" = (/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{pixel_x = 2; pixel_y = 6},/obj/structure/table/standard,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) -"xG" = (/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/structure/table/standard,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) +"xE" = (/obj/item/stool/padded,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) +"xF" = (/obj/item/reagent_containers/food/condiment/small/peppermill{pixel_x = 2; pixel_y = 6},/obj/structure/table/standard,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) +"xG" = (/obj/item/reagent_containers/food/drinks/cans/cola,/obj/structure/table/standard,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "xH" = (/obj/effect/floor_decal/carpet{dir = 1},/obj/effect/floor_decal/carpet{dir = 8},/obj/effect/floor_decal/carpet{dir = 9},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "xI" = (/obj/structure/bed/chair/comfy/teal,/obj/effect/floor_decal/carpet{dir = 1},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "xJ" = (/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet{dir = 1},/obj/effect/floor_decal/carpet{dir = 5},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) @@ -1234,22 +1234,22 @@ "xL" = (/obj/structure/closet/secure_closet/personal,/obj/effect/floor_decal/carpet,/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet{dir = 6},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "xM" = (/obj/machinery/iv_drip,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) "xN" = (/obj/machinery/optable,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) -"xO" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/structure/table/standard,/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/obj/item/stack/medical/advanced/bruise_pack,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) +"xO" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/structure/table/standard,/obj/item/surgical/scalpel,/obj/item/surgical/bonesetter,/obj/item/surgical/bonegel{pixel_x = 4; pixel_y = 3},/obj/item/stack/medical/advanced/bruise_pack,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) "xP" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating/airless,/area/syndicate_station/start) "xQ" = (/obj/machinery/teleport/station,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "xR" = (/obj/machinery/teleport/hub,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "xS" = (/obj/structure/bed/chair{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"xT" = (/obj/structure/table/reinforced,/obj/item/device/taperecorder,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"xT" = (/obj/structure/table/reinforced,/obj/item/taperecorder,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "xU" = (/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "xV" = (/obj/structure/bed/chair{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "xW" = (/obj/effect/floor_decal/corner/orange,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"xX" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/orange,/obj/effect/floor_decal/corner/orange{dir = 10},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"xX" = (/obj/structure/bed/padded,/obj/item/bedsheet/orange,/obj/effect/floor_decal/corner/orange{dir = 10},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "xY" = (/obj/structure/closet{name = "Prisoner's Locker"},/obj/effect/floor_decal/corner/orange{dir = 10},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"xZ" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/orange,/obj/effect/floor_decal/corner/orange/full{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"ya" = (/obj/structure/table/rack,/obj/item/weapon/storage/secure/briefcase,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/backpack/satchel,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/command) +"xZ" = (/obj/structure/bed/padded,/obj/item/bedsheet/orange,/obj/effect/floor_decal/corner/orange/full{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"ya" = (/obj/structure/table/rack,/obj/item/storage/secure/briefcase,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter/zippo,/obj/item/storage/belt/utility,/obj/item/storage/backpack/satchel,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/command) "yb" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "yc" = (/obj/structure/bed/chair/comfy/teal{dir = 4},/obj/effect/floor_decal/carpet{dir = 8},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) -"yd" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/bananapeel,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) +"yd" = (/obj/structure/table/woodentable{dir = 5},/obj/item/bananapeel,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "ye" = (/obj/structure/bed/chair/comfy/teal{dir = 8},/obj/effect/floor_decal/carpet{dir = 4},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "yf" = (/obj/machinery/door/airlock/centcom{name = "Living Quarters"; opacity = 1; req_access = list(105)},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "yg" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"},/turf/simulated/shuttle/plating/airless/carry,/area/syndicate_station/start) @@ -1259,13 +1259,13 @@ "yk" = (/obj/structure/device/piano{dir = 4},/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "yl" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "mining_shuttle_hatch"; locked = 1; name = "Shuttle Hatch"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/command) "ym" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/airless,/area/supply/dock) -"yn" = (/obj/structure/table/reinforced,/obj/item/weapon/material/minihoe,/obj/item/device/analyzer/plant_analyzer,/obj/effect/floor_decal/corner/orange{dir = 9},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"yo" = (/obj/structure/table/reinforced,/obj/item/weapon/book/codex/corp_regs,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"yp" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/pill_bottle/dice,/obj/item/weapon/deck/cards,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"yn" = (/obj/structure/table/reinforced,/obj/item/material/minihoe,/obj/item/analyzer/plant_analyzer,/obj/effect/floor_decal/corner/orange{dir = 9},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"yo" = (/obj/structure/table/reinforced,/obj/item/book/codex/corp_regs,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"yp" = (/obj/structure/table/reinforced,/obj/item/storage/pill_bottle/dice,/obj/item/deck/cards,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "yq" = (/obj/effect/floor_decal/corner/orange{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "yr" = (/obj/structure/table/woodentable{dir = 10},/obj/machinery/button/remote/blast_door{name = "Spec Ops Ready Room"; pixel_y = 15; req_access = list(11); id = "CREED"},/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl0"; pixel_y = 0; req_access = list(11); id = "ASSAULT"},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/command) "ys" = (/obj/structure/bed/chair/office/dark{dir = 1},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/command) -"yt" = (/obj/machinery/computer/pod{id = "NTrasen"; name = "Hull Door Control"},/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; frequency = 1441; name = "Spec Ops Intercom"; pixel_y = 28},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/command) +"yt" = (/obj/machinery/computer/pod{id = "NTrasen"; name = "Hull Door Control"},/obj/item/radio/intercom{broadcasting = 1; dir = 1; frequency = 1441; name = "Spec Ops Intercom"; pixel_y = 28},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/command) "yu" = (/obj/machinery/door/airlock/centcom{name = "Courthouse"; opacity = 1},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/command) "yv" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_l"},/turf/simulated/shuttle/plating/airless/carry{icon_state = "platform"; dir = 1},/area/supply/dock) "yw" = (/turf/space,/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating/airless/carry{icon_state = "platform"; dir = 1},/area/supply/dock) @@ -1273,13 +1273,13 @@ "yy" = (/obj/structure/table/reinforced,/obj/item/clothing/head/greenbandana,/obj/effect/floor_decal/corner/orange{dir = 9},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "yz" = (/obj/structure/bed/chair{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "yA" = (/obj/structure/closet/secure_closet/hos,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/command) -"yB" = (/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{pixel_x = -6},/obj/structure/table/standard,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) +"yB" = (/obj/item/reagent_containers/food/condiment/small/saltshaker{pixel_x = -6},/obj/structure/table/standard,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "yC" = (/obj/machinery/vending/hydronutrients,/obj/effect/floor_decal/corner/orange/full,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "yD" = (/obj/machinery/vending/hydroseeds,/obj/effect/floor_decal/corner/orange{dir = 10},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "yE" = (/obj/effect/floor_decal/corner/orange{dir = 10},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "yF" = (/obj/effect/floor_decal/corner/orange{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "yG" = (/turf/unsimulated/wall,/area/centcom/restaurant) -"yH" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/storage/briefcase,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) +"yH" = (/obj/structure/table/woodentable{dir = 5},/obj/item/storage/briefcase,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "yI" = (/obj/structure/bed/chair{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "yJ" = (/obj/machinery/computer/secure_data,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "yK" = (/obj/machinery/computer/med_data,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) @@ -1289,7 +1289,7 @@ "yO" = (/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "yP" = (/turf/unsimulated/floor{icon_state = "steel"},/area/space) "yQ" = (/obj/effect/floor_decal/corner/orange{dir = 9},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"yR" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"yR" = (/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "yS" = (/obj/machinery/computer/arcade/orion_trail,/obj/effect/floor_decal/corner/orange{dir = 6},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "yT" = (/obj/structure/kitchenspike,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/restaurant) "yU" = (/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/restaurant) @@ -1297,38 +1297,38 @@ "yW" = (/obj/machinery/vending/dinnerware,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) "yX" = (/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) "yY" = (/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_soft/full,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) -"yZ" = (/obj/structure/table/marble,/obj/item/weapon/storage/box/glasses/square,/obj/item/weapon/storage/box/glasses/square,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) +"yZ" = (/obj/structure/table/marble,/obj/item/storage/box/glasses/square,/obj/item/storage/box/glasses/square,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) "za" = (/obj/structure/bed/chair/comfy/teal{dir = 1},/obj/effect/floor_decal/carpet,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "zb" = (/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet,/obj/effect/floor_decal/carpet{dir = 6},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "zc" = (/obj/machinery/computer/security,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "zd" = (/obj/machinery/computer/crew,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) -"ze" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; frequency = 1443; listening = 0; name = "Spec Ops Intercom"; pixel_y = 28},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) +"ze" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/radio/intercom{broadcasting = 1; dir = 1; frequency = 1443; listening = 0; name = "Spec Ops Intercom"; pixel_y = 28},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "zf" = (/obj/machinery/door/window{dir = 2; name = "AI Core Door"; req_access = list(109)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "zg" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "zh" = (/obj/structure/closet/wardrobe/orange,/obj/effect/floor_decal/corner/orange/full{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "zi" = (/obj/structure/closet/wardrobe/orange,/obj/effect/floor_decal/corner/orange{dir = 5},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "zj" = (/obj/effect/floor_decal/corner/orange{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"zk" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/donkpockets,/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 30},/obj/effect/floor_decal/corner/orange{dir = 6},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"zl" = (/obj/item/device/camera{desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; pixel_x = 2; pixel_y = 3},/obj/effect/floor_decal/corner/red/full{dir = 8},/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"zm" = (/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/effect/floor_decal/corner/red{dir = 5},/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"zk" = (/obj/structure/table/reinforced,/obj/item/storage/box/donkpockets,/obj/item/storage/box/donkpockets,/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 30},/obj/effect/floor_decal/corner/orange{dir = 6},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"zl" = (/obj/item/camera{desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; pixel_x = 2; pixel_y = 3},/obj/effect/floor_decal/corner/red/full{dir = 8},/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"zm" = (/obj/item/paper_bin,/obj/item/pen,/obj/effect/floor_decal/corner/red{dir = 5},/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "zn" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/corner/red{dir = 5},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "zo" = (/obj/structure/closet{name = "Evidence Closet"},/obj/effect/floor_decal/corner/red/full{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "zp" = (/obj/machinery/chem_master/condimaster{name = "CondiMaster Neo"; pixel_x = -5},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/restaurant) "zq" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) -"zr" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) +"zr" = (/obj/item/stool/padded,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) "zs" = (/obj/structure/filingcabinet/filingcabinet,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "zt" = (/obj/machinery/door/airlock/glass_security{name = "Spaceport Security Airlock"; req_access = list(63)},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "zu" = (/obj/structure/table/reinforced,/obj/machinery/microwave,/obj/effect/floor_decal/corner/orange{dir = 6},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"zv" = (/obj/item/weapon/storage/box/evidence,/obj/item/weapon/folder/red,/obj/effect/floor_decal/corner/red{dir = 9},/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"zv" = (/obj/item/storage/box/evidence,/obj/item/folder/red,/obj/effect/floor_decal/corner/red{dir = 9},/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "zw" = (/obj/effect/floor_decal/corner/red{dir = 6},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "zx" = (/obj/machinery/door/airlock/freezer,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/restaurant) -"zy" = (/obj/structure/table/marble,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/weapon/material/kitchen/rollingpin,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) +"zy" = (/obj/structure/table/marble,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/material/kitchen/rollingpin,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) "zz" = (/obj/structure/bed/chair{dir = 4},/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) "zA" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) "zB" = (/obj/structure/bed/chair{dir = 8},/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) "zC" = (/obj/machinery/door/airlock/centcom{name = "Bridge"; opacity = 1; req_access = list(109)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) -"zD" = (/obj/structure/table/reinforced,/obj/item/device/pda/captain,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) -"zE" = (/obj/structure/table/reinforced,/obj/item/weapon/card/id/gold/captain/spare,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) +"zD" = (/obj/structure/table/reinforced,/obj/item/pda/captain,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) +"zE" = (/obj/structure/table/reinforced,/obj/item/card/id/gold/captain/spare,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "zF" = (/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "zG" = (/obj/structure/table/reinforced,/obj/machinery/recharger{pixel_y = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "zH" = (/turf/simulated/shuttle/wall,/area/shuttle/transport1/centcom) @@ -1336,13 +1336,13 @@ "zJ" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_r"; dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/transport1/centcom) "zK" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "centcom_shuttle_bay"; name = "shuttle bay controller"; pixel_x = -24; pixel_y = 0; tag_door = "centcom_shuttle_bay_door"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "zL" = (/obj/machinery/computer/arcade/battle,/obj/effect/floor_decal/corner/orange{dir = 10},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"zM" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/effect/floor_decal/corner/orange{dir = 10},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"zM" = (/obj/structure/table/reinforced,/obj/item/paper_bin,/obj/item/pen,/obj/effect/floor_decal/corner/orange{dir = 10},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "zN" = (/obj/structure/table/reinforced,/obj/machinery/newscaster{layer = 3.3; pixel_x = 27; pixel_y = 0},/obj/effect/floor_decal/corner/orange/full{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"zO" = (/obj/item/device/taperecorder,/obj/effect/floor_decal/corner/red/full,/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"zO" = (/obj/item/taperecorder,/obj/effect/floor_decal/corner/red/full,/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "zP" = (/obj/effect/floor_decal/corner/red{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "zQ" = (/obj/structure/closet/secure_closet/freezer/meat,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/restaurant) "zR" = (/obj/structure/table/standard,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) -"zS" = (/obj/structure/table/marble,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) +"zS" = (/obj/structure/table/marble,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/food/condiment/enzyme,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) "zT" = (/obj/machinery/door/airlock/centcom{name = "Teleporter Bay"; opacity = 1; req_access = list(107)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "zU" = (/obj/structure/bed/chair,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "zV" = (/obj/machinery/computer/shuttle_control{req_access = list(101); shuttle_tag = "Centcom"},/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/transport1/centcom) @@ -1356,7 +1356,7 @@ "Ad" = (/obj/effect/floor_decal/corner/red/full{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "Ae" = (/obj/structure/closet/secure_closet/bar,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/restaurant) "Af" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/cash_register/civilian{icon_state = "register_idle"; dir = 8},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) -"Ag" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/white/diagonal,/obj/item/weapon/reagent_containers/food/condiment/small/peppermill,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) +"Ag" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/white/diagonal,/obj/item/reagent_containers/food/condiment/small/peppermill,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) "Ah" = (/obj/machinery/computer/supplycomp/control,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "Ai" = (/obj/machinery/button/remote/blast_door{id = "crescent_checkpoint_access"; name = "Crescent Checkpoint Access"; pixel_x = -6; pixel_y = -24; req_access = list(101)},/obj/machinery/button/remote/blast_door{id = "crescent_thunderdome"; name = "Thunderdome Access"; pixel_x = 6; pixel_y = -24; req_access = list(101)},/obj/machinery/button/remote/blast_door{id = "crescent_vip_shuttle"; name = "VIP Shuttle Access"; pixel_x = 6; pixel_y = -34; req_access = list(101)},/obj/machinery/turretid{pixel_x = 28; pixel_y = -28; req_access = list(101)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "Aj" = (/obj/machinery/computer/shuttle_control{req_access = list(101); shuttle_tag = "Centcom"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) @@ -1370,7 +1370,7 @@ "Ar" = (/obj/effect/floor_decal/corner/red{dir = 5},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "As" = (/obj/effect/floor_decal/corner/red/full{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "At" = (/obj/machinery/door/airlock/glass_security{name = "Security Processing"; req_access = list(1)},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"Au" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/white/diagonal,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) +"Au" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/white/diagonal,/obj/item/reagent_containers/food/condiment/small/saltshaker,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) "Av" = (/obj/machinery/door/airlock/centcom{name = "Maintenance Access"; opacity = 1; req_access = list(106)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "Aw" = (/obj/machinery/computer/robotics,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "Ax" = (/turf/unsimulated/wall,/area/centcom/main_hall) @@ -1381,7 +1381,7 @@ "AC" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating/airless,/area/shuttle/transport1/centcom) "AD" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/transport1/centcom) "AE" = (/obj/effect/floor_decal/corner/red{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"AF" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/red{dir = 5},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"AF" = (/obj/item/stool/padded,/obj/effect/floor_decal/corner/red{dir = 5},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "AG" = (/obj/machinery/computer/secure_data,/obj/effect/floor_decal/corner/red/full{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "AH" = (/obj/machinery/telecomms/receiver/preset_cent,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "AI" = (/obj/machinery/telecomms/bus/preset_cent,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) @@ -1410,7 +1410,7 @@ "Bf" = (/obj/machinery/gateway/centerstation,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/main_hall) "Bg" = (/obj/machinery/gateway{dir = 4},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/main_hall) "Bh" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; tiles = 0},/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; tiles = 0},/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space,/area/space) -"Bi" = (/obj/structure/table/reinforced,/obj/item/weapon/folder/red,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"Bi" = (/obj/structure/table/reinforced,/obj/item/folder/red,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "Bj" = (/obj/machinery/turretid{pixel_x = -28; pixel_y = -28; req_access = list(101)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "Bk" = (/obj/structure/bed/chair/office/dark,/obj/machinery/button/remote/blast_door{desc = "A remote control switch for port-side blast doors."; id = "CentComPort"; name = "Security Doors"; pixel_x = -12; pixel_y = -25; req_access = list(101)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "Bl" = (/obj/machinery/computer/secure_data,/obj/machinery/camera/network/crescent{c_tag = "Crescent Arrivals North"; dir = 8},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) @@ -1427,7 +1427,7 @@ "Bw" = (/obj/machinery/r_n_d/server/centcom,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "Bx" = (/obj/machinery/door/blast/regular{id = "CentComPort"; name = "Security Doors"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "By" = (/obj/structure/table/reinforced,/obj/machinery/computer/skills,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) -"Bz" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) +"Bz" = (/obj/structure/table/reinforced,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/pen,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "BA" = (/obj/machinery/computer/teleporter,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "BB" = (/obj/machinery/teleport/station,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "BC" = (/obj/machinery/teleport/hub,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) @@ -1445,17 +1445,17 @@ "BO" = (/obj/effect/floor_decal/corner/white,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "BP" = (/obj/effect/floor_decal/corner/white{dir = 5},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "BQ" = (/obj/effect/floor_decal/corner/white{dir = 8},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) -"BR" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/window/brigdoor{dir = 4; name = "Weapons locker"},/obj/structure/table/rack,/obj/item/clothing/suit/armor/riot,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/shield/riot,/obj/item/clothing/head/helmet/riot,/obj/effect/floor_decal/corner/red{dir = 9},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"BR" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/window/brigdoor{dir = 4; name = "Weapons locker"},/obj/structure/table/rack,/obj/item/clothing/suit/armor/riot,/obj/item/melee/baton/loaded,/obj/item/shield/riot,/obj/item/clothing/head/helmet/riot,/obj/effect/floor_decal/corner/red{dir = 9},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "BS" = (/obj/structure/closet/secure_closet/security,/obj/effect/floor_decal/corner/red{dir = 6},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "BT" = (/obj/structure/bed/chair,/turf/simulated/shuttle/floor,/area/centcom/tram) "BU" = (/obj/structure/bed/chair,/obj/structure/closet/walllocker/emerglocker{pixel_x = 0; pixel_y = 28},/turf/simulated/shuttle/floor,/area/centcom/tram) "BV" = (/turf/simulated/shuttle/floor,/area/centcom/tram) -"BW" = (/obj/structure/bed/chair,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = 26},/turf/simulated/shuttle/floor,/area/centcom/tram) +"BW" = (/obj/structure/bed/chair,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = 26},/turf/simulated/shuttle/floor,/area/centcom/tram) "BX" = (/obj/effect/floor_decal/spline/plain,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/tram) "BY" = (/obj/effect/floor_decal/corner/white{dir = 6; icon_state = "corner_white"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "BZ" = (/obj/effect/floor_decal/corner/white/diagonal{icon_state = "corner_white_diagonal"; dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "Ca" = (/obj/effect/floor_decal/corner/white{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) -"Cb" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/brigdoor{dir = 4; name = "Weapons locker"},/obj/structure/table/rack,/obj/item/clothing/suit/armor/riot,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/shield/riot,/obj/item/clothing/head/helmet/riot,/obj/structure/window/reinforced,/obj/effect/floor_decal/corner/red{dir = 9},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"Cb" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/brigdoor{dir = 4; name = "Weapons locker"},/obj/structure/table/rack,/obj/item/clothing/suit/armor/riot,/obj/item/melee/baton/loaded,/obj/item/shield/riot,/obj/item/clothing/head/helmet/riot,/obj/structure/window/reinforced,/obj/effect/floor_decal/corner/red{dir = 9},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "Cc" = (/obj/machinery/porta_turret/crescent,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "Cd" = (/obj/machinery/porta_turret/crescent,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "Ce" = (/obj/structure/grille,/obj/structure/window/shuttle{icon_state = "window2"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/tram) @@ -1464,7 +1464,7 @@ "Ch" = (/obj/effect/floor_decal/spline/plain{dir = 1},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/tram) "Ci" = (/obj/effect/floor_decal/corner/white{icon_state = "corner_white"; dir = 1},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "Cj" = (/obj/machinery/computer/card,/obj/effect/floor_decal/corner/red{dir = 6},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"Ck" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/brigdoor{dir = 4; name = "Weapons locker"},/obj/structure/table/rack,/obj/item/clothing/suit/armor/riot,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/shield/riot,/obj/item/clothing/head/helmet/riot,/obj/structure/window/reinforced{dir = 1},/obj/effect/floor_decal/corner/red{dir = 9},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"Ck" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/brigdoor{dir = 4; name = "Weapons locker"},/obj/structure/table/rack,/obj/item/clothing/suit/armor/riot,/obj/item/melee/baton/loaded,/obj/item/shield/riot,/obj/item/clothing/head/helmet/riot,/obj/structure/window/reinforced{dir = 1},/obj/effect/floor_decal/corner/red{dir = 9},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "Cl" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/restaurant) "Cm" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/door/airlock/glass,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) "Cn" = (/obj/structure/flora/grass/brown,/obj/effect/floor_decal/spline/fancy/wood{icon_state = "spline_fancy"; dir = 9},/turf/unsimulated/floor{icon_state = "grass0"; name = "grass"},/area/centcom/main_hall) @@ -1482,7 +1482,7 @@ "Cz" = (/obj/structure/table/standard,/obj/structure/flora/pottedplant{icon_state = "plant-06"; pixel_y = 8},/obj/effect/floor_decal/corner/red{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "CA" = (/obj/structure/bed/chair/office/dark,/obj/machinery/button/remote/blast_door{desc = "A remote control switch for port-side blast doors."; id = "CentComPort"; name = "Security Doors"; pixel_x = -12; pixel_y = -25; req_access = list(101)},/obj/effect/floor_decal/corner/red,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "CB" = (/obj/machinery/computer/secure_data,/obj/machinery/camera/network/crescent{c_tag = "Crescent Arrivals North"; dir = 8},/obj/effect/floor_decal/corner/red/full{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"CC" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/brigdoor{dir = 4; name = "Weapons locker"},/obj/structure/table/rack,/obj/item/clothing/suit/armor/riot,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/shield/riot,/obj/item/clothing/head/helmet/riot,/obj/structure/window/reinforced,/obj/effect/floor_decal/corner/red/full,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"CC" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/brigdoor{dir = 4; name = "Weapons locker"},/obj/structure/table/rack,/obj/item/clothing/suit/armor/riot,/obj/item/melee/baton/loaded,/obj/item/shield/riot,/obj/item/clothing/head/helmet/riot,/obj/structure/window/reinforced,/obj/effect/floor_decal/corner/red/full,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "CD" = (/obj/structure/closet/secure_closet/security,/obj/effect/floor_decal/corner/red/full{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "CE" = (/obj/structure/flora/ausbushes/fernybush,/turf/unsimulated/floor{icon_state = "grass0"; name = "grass"},/area/centcom/main_hall) "CF" = (/obj/structure/flora/ausbushes/brflowers,/turf/unsimulated/floor{icon_state = "grass0"; name = "grass"},/area/centcom/main_hall) @@ -1499,10 +1499,10 @@ "CQ" = (/obj/machinery/computer/card,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/tram) "CR" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor,/area/centcom/tram) "CS" = (/obj/structure/bed/chair{dir = 1},/obj/structure/closet/walllocker/emerglocker{pixel_x = 0; pixel_y = -30},/turf/simulated/shuttle/floor,/area/centcom/tram) -"CT" = (/obj/structure/bed/chair{dir = 1},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -30},/turf/simulated/shuttle/floor,/area/centcom/tram) +"CT" = (/obj/structure/bed/chair{dir = 1},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -30},/turf/simulated/shuttle/floor,/area/centcom/tram) "CU" = (/obj/structure/table/woodentable{dir = 5},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) "CV" = (/obj/structure/table/reinforced,/obj/machinery/computer/skills,/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/red/full,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"CW" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/obj/machinery/door/window/southright{name = "Arrivals Processing"; req_access = list(101)},/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/corner/red/full{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) +"CW" = (/obj/structure/table/reinforced,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/pen,/obj/machinery/door/window/southright{name = "Arrivals Processing"; req_access = list(101)},/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/corner/red/full{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "CX" = (/obj/structure/flora/ausbushes/brflowers,/obj/effect/floor_decal/spline/fancy/wood{icon_state = "spline_fancy"; dir = 9},/turf/unsimulated/floor{icon_state = "grass0"; name = "grass"},/area/centcom/main_hall) "CY" = (/obj/structure/flora/ausbushes/ppflowers,/obj/effect/floor_decal/spline/fancy/wood{dir = 6},/turf/unsimulated/floor{icon_state = "grass0"; name = "grass"},/area/centcom/main_hall) "CZ" = (/obj/structure/flora/ausbushes/ppflowers,/obj/effect/floor_decal/spline/fancy/wood{icon_state = "spline_fancy"; dir = 10},/turf/unsimulated/floor{icon_state = "grass0"; name = "grass"},/area/centcom/main_hall) @@ -1517,17 +1517,17 @@ "Di" = (/obj/structure/bed/chair{dir = 8},/obj/effect/floor_decal/spline/plain,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) "Dj" = (/obj/structure/table/woodentable{dir = 5},/obj/structure/flora/pottedplant{pixel_y = 8},/obj/effect/floor_decal/spline/plain,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) "Dk" = (/obj/structure/bed/chair{dir = 4},/obj/effect/floor_decal/spline/plain,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) -"Dl" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) +"Dl" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/pen,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) "Dm" = (/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "CentComPortWest"; name = "Security Doors"; opacity = 0},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "Dn" = (/obj/structure/flora/ausbushes/ppflowers,/obj/effect/floor_decal/spline/fancy/wood/cee,/turf/unsimulated/floor{icon_state = "grass0"; name = "grass"},/area/centcom/main_hall) "Do" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/beach/sand{icon_state = "seashallow"},/area/centcom/main_hall) "Dp" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/beach/sand{icon_state = "seashallow"},/area/centcom/main_hall) "Dq" = (/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/beach/sand{icon_state = "seashallow"},/area/centcom/main_hall) "Dr" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced,/obj/machinery/computer/skills,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/tram) -"Ds" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/obj/machinery/door/window/southright{name = "Arrivals Processing"; req_access = list(101)},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/tram) +"Ds" = (/obj/structure/table/reinforced,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/pen,/obj/machinery/door/window/southright{name = "Arrivals Processing"; req_access = list(101)},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/tram) "Dt" = (/obj/machinery/door/airlock/external,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/tram) "Du" = (/obj/structure/bed/chair/office/light{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) -"Dv" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) +"Dv" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/pen,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) "Dw" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/table/reinforced,/obj/machinery/computer/skills,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) "Dx" = (/obj/machinery/turretid{pixel_x = 28; pixel_y = -28; req_access = list(101)},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) "Dy" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) @@ -1547,7 +1547,7 @@ "DM" = (/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/beach/sand{icon_state = "seashallow"},/area/centcom/main_hall) "DN" = (/obj/structure/bed/chair/office/light,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) "DO" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) -"DP" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) +"DP" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/table/reinforced,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/pen,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) "DQ" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/beach/sand{icon_state = "seashallow"},/area/centcom/main_hall) "DR" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/unsimulated/beach/sand{icon_state = "seashallow"},/area/centcom/main_hall) "DS" = (/obj/machinery/door/window/southleft,/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) @@ -1559,7 +1559,7 @@ "DY" = (/obj/structure/table/woodentable{dir = 5},/obj/structure/flora/pottedplant{pixel_y = 8},/obj/effect/floor_decal/spline/plain{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) "DZ" = (/obj/structure/bed/chair{dir = 4},/obj/effect/floor_decal/spline/plain{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) "Ea" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/reinforced,/obj/structure/window/reinforced,/obj/machinery/computer/skills,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) -"Eb" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/obj/structure/window/reinforced,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) +"Eb" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/obj/structure/window/reinforced,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/pen,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) "Ec" = (/obj/structure/flora/ausbushes/ppflowers,/obj/effect/floor_decal/spline/fancy/wood/cee{dir = 1},/turf/unsimulated/floor{icon_state = "grass0"; name = "grass"},/area/centcom/main_hall) "Ed" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/beach/sand{icon_state = "seashallow"},/area/centcom/main_hall) "Ee" = (/obj/structure/window/reinforced,/turf/unsimulated/beach/sand{icon_state = "seashallow"},/area/centcom/main_hall) @@ -1596,8 +1596,8 @@ "EJ" = (/obj/effect/floor_decal/corner/white{dir = 9; icon_state = "corner_white"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "EK" = (/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "EL" = (/obj/effect/floor_decal/corner/beige{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"EM" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"EN" = (/obj/machinery/chemical_dispenser/ert,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/effect/floor_decal/corner/beige{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"EM" = (/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"EN" = (/obj/machinery/chemical_dispenser/ert,/obj/item/reagent_containers/glass/beaker/large,/obj/effect/floor_decal/corner/beige{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "EO" = (/turf/unsimulated/wall,/area/centcom/bar) "EP" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/bar) "EQ" = (/obj/machinery/door/airlock/glass,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) @@ -1609,7 +1609,7 @@ "EW" = (/obj/structure/bed/chair{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "EX" = (/obj/structure/bed/chair{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/green{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "EY" = (/obj/structure/closet/secure_closet/chemical,/obj/effect/floor_decal/corner/beige{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"EZ" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/effect/floor_decal/corner/beige{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"EZ" = (/obj/structure/table/standard,/obj/item/reagent_containers/glass/beaker/large,/obj/item/reagent_containers/glass/beaker/large,/obj/effect/floor_decal/corner/beige{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Fa" = (/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) "Fb" = (/obj/structure/table/woodentable{dir = 5},/obj/structure/flora/pottedplant{pixel_y = 8},/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) "Fc" = (/obj/structure/table/steel,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bathroom) @@ -1625,33 +1625,33 @@ "Fm" = (/obj/machinery/computer/med_data,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "Fn" = (/obj/effect/floor_decal/corner/green{dir = 8},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Fo" = (/obj/structure/closet/secure_closet/medical1,/obj/effect/floor_decal/corner/beige{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Fp" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/extinguisher,/obj/machinery/camera/network/crescent{c_tag = "Shuttle Bridge West"},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) +"Fp" = (/obj/structure/table/standard,/obj/item/storage/firstaid/fire,/obj/item/extinguisher,/obj/machinery/camera/network/crescent{c_tag = "Shuttle Bridge West"},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "Fq" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "Fr" = (/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) -"Fs" = (/obj/machinery/status_display{pixel_y = 30},/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/toxin,/obj/machinery/camera/network/crescent{c_tag = "Shuttle Bridge East"},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) +"Fs" = (/obj/machinery/status_display{pixel_y = 30},/obj/structure/table/standard,/obj/item/storage/firstaid/toxin,/obj/machinery/camera/network/crescent{c_tag = "Shuttle Bridge East"},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "Ft" = (/obj/effect/floor_decal/corner/green{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Fu" = (/obj/structure/closet/secure_closet/medical1,/obj/effect/floor_decal/corner/beige/full,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Fv" = (/obj/effect/floor_decal/corner/beige{dir = 8},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Fw" = (/obj/effect/floor_decal/corner/beige,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Fx" = (/obj/machinery/chem_master,/obj/effect/floor_decal/corner/beige/full{dir = 4},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Fy" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/amanita_pie,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"Fy" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/snacks/amanita_pie,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) "Fz" = (/obj/structure/bed/chair/wood/wings{icon_state = "wooden_chair_wings"; dir = 4},/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) "FA" = (/obj/structure/bed/chair/wood/wings{icon_state = "wooden_chair_wings"; dir = 8},/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) -"FB" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) -"FC" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/slice/carrotcake/filled,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) -"FD" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/stew,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) -"FE" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bathroom) +"FB" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/snacks/bigbiteburger,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"FC" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/snacks/slice/carrotcake/filled,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"FD" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/snacks/stew,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"FE" = (/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bathroom) "FF" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "escape_shuttle"; pixel_x = 0; pixel_y = -25; req_one_access = list(13); tag_door = "escape_shuttle_hatch"},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "FG" = (/obj/machinery/hologram/holopad,/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "FH" = (/obj/machinery/light,/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "FI" = (/obj/effect/floor_decal/corner/beige{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"FJ" = (/obj/structure/closet/secure_closet/medical_wall{name = "Pill Cabinet"},/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/weapon/storage/pill_bottle/tramadol,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/syringe/inaprovaline,/turf/unsimulated/wall,/area/centcom/medical) -"FK" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/boiledrice,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) -"FL" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/beetsoup,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) -"FM" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/stuffing,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) -"FN" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/soylenviridians,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"FJ" = (/obj/structure/closet/secure_closet/medical_wall{name = "Pill Cabinet"},/obj/item/storage/pill_bottle/antitox,/obj/item/storage/pill_bottle/tramadol,/obj/item/reagent_containers/syringe/antiviral,/obj/item/reagent_containers/syringe/antiviral,/obj/item/reagent_containers/syringe/inaprovaline,/turf/unsimulated/wall,/area/centcom/medical) +"FK" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/snacks/boiledrice,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"FL" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/snacks/beetsoup,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"FM" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/snacks/stuffing,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"FN" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/snacks/soylenviridians,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) "FO" = (/obj/structure/table/standard,/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = -30},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) -"FP" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) +"FP" = (/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "FQ" = (/obj/structure/table/standard,/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 30},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "FR" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "FS" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) @@ -1672,23 +1672,23 @@ "Gh" = (/obj/structure/table/glass,/obj/structure/window/reinforced{dir = 1},/obj/effect/floor_decal/corner/green{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Gi" = (/obj/structure/table/glass,/obj/machinery/computer/med_data/laptop,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/corner/green/full{dir = 1},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Gj" = (/obj/structure/closet/secure_closet/medical3,/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Gk" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/bloodsoup,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) -"Gl" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/tofukabob,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) -"Gm" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/poppypretzel,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) -"Gn" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/slice/orangecake/filled,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"Gk" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/snacks/bloodsoup,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"Gl" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/snacks/tofukabob,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"Gm" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/snacks/poppypretzel,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"Gn" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/snacks/slice/orangecake/filled,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) "Go" = (/obj/machinery/atm{pixel_x = -30},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "Gp" = (/obj/machinery/atm{pixel_x = 30},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "Gq" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/shuttle/floor/red,/area/shuttle/escape/centcom) "Gr" = (/obj/machinery/status_display{pixel_y = 30},/obj/machinery/camera/network/crescent{c_tag = "Shuttle Cell"},/turf/simulated/shuttle/floor/red,/area/shuttle/escape/centcom) -"Gs" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 30},/obj/structure/bed/chair{dir = 8},/obj/machinery/light/small{dir = 1},/turf/simulated/shuttle/floor/red,/area/shuttle/escape/centcom) +"Gs" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 30},/obj/structure/bed/chair{dir = 8},/obj/machinery/light/small{dir = 1},/turf/simulated/shuttle/floor/red,/area/shuttle/escape/centcom) "Gt" = (/obj/machinery/computer/crew,/obj/effect/floor_decal/corner/green{dir = 4},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Gu" = (/obj/structure/bed/chair/office/light{dir = 1},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Gv" = (/obj/machinery/computer/med_data,/obj/effect/floor_decal/corner/green{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Gw" = (/obj/machinery/iv_drip,/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Gx" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/spesslaw,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) -"Gy" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/candiedapple,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) -"Gz" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/mushroomsoup,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) -"GA" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/meatsteak,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"Gx" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/snacks/spesslaw,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"Gy" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/snacks/candiedapple,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"Gz" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/snacks/mushroomsoup,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"GA" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/snacks/meatsteak,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) "GB" = (/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bathroom) "GC" = (/obj/structure/sink{pixel_y = 16},/obj/structure/mirror{pixel_y = 32},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bathroom) "GD" = (/obj/structure/window/reinforced/tinted{dir = 4; icon_state = "twindow"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bathroom) @@ -1698,9 +1698,9 @@ "GH" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/shuttle/floor/red,/area/shuttle/escape/centcom) "GI" = (/obj/machinery/hologram/holopad,/turf/simulated/shuttle/floor/red,/area/shuttle/escape/centcom) "GJ" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/shuttle/floor/red,/area/shuttle/escape/centcom) -"GK" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/medical,/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"GK" = (/obj/structure/bed/padded,/obj/item/bedsheet/medical,/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "GL" = (/turf/simulated/shuttle/floor/red,/area/shuttle/escape/centcom) -"GM" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) +"GM" = (/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) "GN" = (/turf/unsimulated/wall,/area/tdome) "GO" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/tdome) "GP" = (/obj/machinery/door/airlock/centcom{name = "Thunderdome"; opacity = 1; req_access = list(101)},/obj/machinery/door/blast/regular{id = "crescent_thunderdome"; name = "Thunderdome"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) @@ -1710,12 +1710,12 @@ "GT" = (/obj/machinery/door/airlock{name = "Unit 4"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bathroom) "GU" = (/obj/machinery/door/airlock{name = "Unit 5"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bathroom) "GV" = (/obj/machinery/door/airlock{name = "Unit 6"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bathroom) -"GW" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 3},/obj/item/weapon/extinguisher,/obj/item/weapon/tool/crowbar,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) +"GW" = (/obj/structure/table/standard,/obj/item/storage/firstaid/fire,/obj/item/storage/firstaid/regular{pixel_x = 2; pixel_y = 3},/obj/item/extinguisher,/obj/item/tool/crowbar,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "GX" = (/obj/machinery/door/airlock/glass_security{name = "Escape Shuttle Cell"; req_access = list(1)},/turf/simulated/shuttle/floor/red,/area/shuttle/escape/centcom) -"GY" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/material/ashtray/bronze{pixel_x = -1; pixel_y = 1},/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) -"GZ" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/material/ashtray/bronze{pixel_x = -1; pixel_y = 1},/obj/machinery/camera/network/crescent{c_tag = "Crescent Bar East"; dir = 4},/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"GY" = (/obj/structure/table/woodentable{dir = 5},/obj/item/flame/lighter/zippo,/obj/item/storage/fancy/cigarettes,/obj/item/material/ashtray/bronze{pixel_x = -1; pixel_y = 1},/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"GZ" = (/obj/structure/table/woodentable{dir = 5},/obj/item/flame/lighter/zippo,/obj/item/storage/fancy/cigarettes,/obj/item/material/ashtray/bronze{pixel_x = -1; pixel_y = 1},/obj/machinery/camera/network/crescent{c_tag = "Crescent Bar East"; dir = 4},/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) "Ha" = (/turf/unsimulated/floor{icon_state = "wood"},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) -"Hb" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/drinks/glass2/square,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) +"Hb" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/drinks/glass2/square,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) "Hc" = (/obj/structure/table/woodentable{dir = 5},/obj/machinery/cash_register/civilian,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) "Hd" = (/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "He" = (/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) @@ -1727,8 +1727,8 @@ "Hk" = (/obj/machinery/camera/network/crescent{c_tag = "Shuttle Center"},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "Hl" = (/obj/machinery/vending/medical,/turf/unsimulated/wall,/area/centcom/medical) "Hm" = (/obj/machinery/vending/medical,/obj/effect/floor_decal/corner/green{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Hn" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/blood/AMinus,/obj/item/weapon/reagent_containers/blood/APlus,/obj/item/weapon/reagent_containers/blood/BMinus,/obj/item/weapon/reagent_containers/blood/BPlus,/obj/item/weapon/reagent_containers/blood/OPlus,/obj/effect/floor_decal/corner/green{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Ho" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/effect/floor_decal/corner/green/full{dir = 4},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Hn" = (/obj/structure/table/standard,/obj/item/reagent_containers/blood/AMinus,/obj/item/reagent_containers/blood/APlus,/obj/item/reagent_containers/blood/BMinus,/obj/item/reagent_containers/blood/BPlus,/obj/item/reagent_containers/blood/OPlus,/obj/effect/floor_decal/corner/green{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Ho" = (/obj/structure/table/standard,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/effect/floor_decal/corner/green/full{dir = 4},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Hp" = (/obj/structure/bed/chair/comfy/brown,/obj/effect/floor_decal/carpet{dir = 8},/obj/effect/floor_decal/carpet{dir = 1},/obj/effect/floor_decal/carpet{dir = 9},/turf/unsimulated/floor{dir = 2; icon_state = "carpet"},/area/centcom/bar) "Hq" = (/obj/structure/bed/chair/comfy/brown,/obj/effect/floor_decal/carpet{dir = 1},/turf/unsimulated/floor{dir = 2; icon_state = "carpet"},/area/centcom/bar) "Hr" = (/obj/structure/bed/chair/comfy/brown,/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet{dir = 1},/obj/effect/floor_decal/carpet{dir = 5},/turf/unsimulated/floor{dir = 2; icon_state = "carpet"},/area/centcom/bar) @@ -1750,9 +1750,9 @@ "HH" = (/obj/effect/floor_decal/carpet{dir = 4},/turf/unsimulated/floor{dir = 2; icon_state = "carpet"},/area/centcom/bar) "HI" = (/obj/structure/curtain/open/shower,/obj/machinery/shower,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bathroom) "HJ" = (/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bathroom) -"HK" = (/obj/structure/bed/chair{dir = 4},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/camera/network/crescent{c_tag = "Shuttle West"; dir = 4},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) +"HK" = (/obj/structure/bed/chair{dir = 4},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/camera/network/crescent{c_tag = "Shuttle West"; dir = 4},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "HL" = (/obj/structure/bed/chair{dir = 8},/obj/structure/closet/walllocker/emerglocker{pixel_x = 28},/obj/machinery/camera/network/crescent{c_tag = "Shuttle East"; dir = 8},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) -"HM" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/adv,/obj/item/weapon/storage/firstaid/adv,/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"HM" = (/obj/structure/table/standard,/obj/item/storage/firstaid/adv,/obj/item/storage/firstaid/adv,/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "HN" = (/obj/effect/floor_decal/corner/blue{dir = 4},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "HO" = (/obj/machinery/atmospherics/unary/cryo_cell,/obj/effect/floor_decal/corner/blue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "HP" = (/obj/machinery/atmospherics/unary/cryo_cell,/obj/effect/floor_decal/corner/blue/full{dir = 1},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) @@ -1760,30 +1760,30 @@ "HR" = (/obj/structure/bed/chair/comfy/brown{dir = 1},/obj/effect/floor_decal/carpet,/turf/unsimulated/floor{dir = 2; icon_state = "carpet"},/area/centcom/bar) "HS" = (/obj/structure/bed/chair/comfy/brown{dir = 1},/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet,/obj/effect/floor_decal/carpet{dir = 6},/turf/unsimulated/floor{dir = 2; icon_state = "carpet"},/area/centcom/bar) "HT" = (/obj/structure/closet/secure_closet/bar{req_access = list(25)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) -"HU" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/book/manual/barman_recipes,/obj/item/weapon/reagent_containers/glass/rag,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) +"HU" = (/obj/structure/table/woodentable{dir = 5},/obj/item/book/manual/barman_recipes,/obj/item/reagent_containers/glass/rag,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) "HV" = (/obj/structure/table/woodentable{dir = 5},/obj/machinery/chemical_dispenser/bar_alc/full,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) "HW" = (/obj/structure/table/woodentable{dir = 5},/obj/machinery/chemical_dispenser/bar_soft/full,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) "HX" = (/obj/machinery/porta_turret/crescent,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/tram) "HY" = (/obj/machinery/sleeper{dir = 8},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "HZ" = (/obj/machinery/sleep_console,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Ia" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/fire,/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Ia" = (/obj/structure/table/standard,/obj/item/storage/firstaid/fire,/obj/item/storage/firstaid/fire,/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Ib" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5; icon_state = "intact"},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Ic" = (/obj/machinery/atmospherics/pipe/manifold/hidden,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Id" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 4; icon_state = "map"},/obj/effect/floor_decal/corner/blue{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Ie" = (/obj/structure/curtain/open/shower,/obj/machinery/shower{dir = 1},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bathroom) "If" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "centcom_dock"; name = "docking port controller"; pixel_x = 25; pixel_y = 0; req_one_access = list(13); tag_door = "centcom_dock_airlock"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "Ig" = (/obj/machinery/iv_drip,/obj/effect/floor_decal/corner/green{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Ih" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/toxin,/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Ih" = (/obj/structure/table/standard,/obj/item/storage/firstaid/toxin,/obj/item/storage/firstaid/toxin,/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Ii" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Ij" = (/obj/structure/morgue,/obj/effect/floor_decal/corner/blue/full{dir = 8},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Ik" = (/obj/effect/floor_decal/corner/blue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Il" = (/obj/structure/morgue{icon_state = "morgue1"; dir = 8},/obj/effect/floor_decal/corner/blue/full{dir = 1},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Im" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access = list(101)},/obj/machinery/door/blast/regular{id = "crescent_thunderdome"; name = "Thunderdome"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) -"In" = (/obj/structure/bed/roller,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/structure/closet/secure_closet/medical_wall{name = "O- Blood Locker"; pixel_x = -32},/obj/effect/floor_decal/corner/green{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"In" = (/obj/structure/bed/roller,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/structure/closet/secure_closet/medical_wall{name = "O- Blood Locker"; pixel_x = -32},/obj/effect/floor_decal/corner/green{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Io" = (/obj/machinery/bodyscanner{dir = 8},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Ip" = (/obj/machinery/body_scanconsole,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Iq" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/o2,/obj/item/weapon/storage/firstaid/o2,/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Ir" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 5; pixel_y = 5},/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 0; pixel_y = 0},/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 7; pixel_y = 1},/obj/item/weapon/tool/wrench,/obj/effect/floor_decal/corner/blue/full,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Iq" = (/obj/structure/table/standard,/obj/item/storage/firstaid/o2,/obj/item/storage/firstaid/o2,/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Ir" = (/obj/structure/table/standard,/obj/item/reagent_containers/glass/beaker/cryoxadone{pixel_x = 5; pixel_y = 5},/obj/item/reagent_containers/glass/beaker/cryoxadone{pixel_x = 0; pixel_y = 0},/obj/item/reagent_containers/glass/beaker/cryoxadone{pixel_x = 7; pixel_y = 1},/obj/item/tool/wrench,/obj/effect/floor_decal/corner/blue/full,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Is" = (/obj/effect/floor_decal/corner/blue{dir = 8},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "It" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,/obj/effect/floor_decal/corner/blue,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Iu" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,/obj/effect/floor_decal/corner/blue/full{dir = 4},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) @@ -1791,8 +1791,8 @@ "Iw" = (/obj/structure/morgue{icon_state = "morgue1"; dir = 8},/obj/effect/floor_decal/corner/blue{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Ix" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access = list(101)},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "Iy" = (/obj/structure/bed/chair{dir = 4},/obj/structure/closet/walllocker/emerglocker{pixel_x = -28},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) -"Iz" = (/obj/structure/bed/chair{dir = 8},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) -"IA" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/regular,/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Iz" = (/obj/structure/bed/chair{dir = 8},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) +"IA" = (/obj/structure/table/standard,/obj/item/storage/firstaid/regular,/obj/item/storage/firstaid/regular,/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "IB" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_medical{id_tag = "GeneticsDoor"; name = "Cloning Laboratory"; req_access = list(66)},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "IC" = (/obj/structure/closet/secure_closet/bar,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) "ID" = (/turf/unsimulated/floor{icon_state = "white"},/area/tdome) @@ -1802,11 +1802,11 @@ "IH" = (/obj/machinery/door/airlock/medical{name = "Virology Access"; req_access = list(5)},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "II" = (/obj/effect/floor_decal/corner/blue/full{dir = 8},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "IJ" = (/obj/effect/floor_decal/corner/blue{dir = 1},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"IK" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/effect/floor_decal/corner/blue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"IK" = (/obj/structure/closet/crate/freezer,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/effect/floor_decal/corner/blue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "IL" = (/obj/structure/filingcabinet/chestdrawer{desc = "A large drawer filled with autopsy reports."; name = "Autopsy Reports"},/obj/effect/floor_decal/corner/blue{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "IM" = (/obj/machinery/vending/cigarette,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) -"IN" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/storage/fancy/cigarettes,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) -"IO" = (/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) +"IN" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/drinks/bottle/small/beer,/obj/item/reagent_containers/food/drinks/bottle/small/beer,/obj/item/reagent_containers/food/drinks/bottle/small/beer,/obj/item/flame/lighter/zippo,/obj/item/storage/fancy/cigarettes,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) +"IO" = (/obj/item/reagent_containers/food/drinks/cans/cola,/obj/item/reagent_containers/food/drinks/cans/cola,/obj/item/reagent_containers/food/drinks/cans/cola,/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) "IP" = (/obj/structure/reagent_dispensers/beerkeg,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) "IQ" = (/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) "IR" = (/obj/machinery/vending/coffee,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) @@ -1816,7 +1816,7 @@ "IV" = (/obj/structure/closet/l3closet/virology,/obj/item/clothing/mask/gas,/obj/effect/floor_decal/industrial/warning{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "IW" = (/obj/machinery/door/airlock/medical{name = "Morgue"; req_access = list(6,5)},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "IX" = (/obj/machinery/optable,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"IY" = (/obj/item/device/camera{name = "Autopsy Camera"; pixel_x = -2; pixel_y = 7},/obj/item/weapon/paper_bin{pixel_y = -6},/obj/item/weapon/pen/red{pixel_x = -1; pixel_y = -9},/obj/item/weapon/pen/blue{pixel_x = 3; pixel_y = -5},/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"IY" = (/obj/item/camera{name = "Autopsy Camera"; pixel_x = -2; pixel_y = 7},/obj/item/paper_bin{pixel_y = -6},/obj/item/pen/red{pixel_x = -1; pixel_y = -9},/obj/item/pen/blue{pixel_x = 3; pixel_y = -5},/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "IZ" = (/obj/structure/closet/secure_closet/freezer/meat,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) "Ja" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) "Jb" = (/obj/structure/bed/chair,/obj/effect/landmark{name = "tdomeobserve"},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) @@ -1834,23 +1834,23 @@ "Jn" = (/obj/machinery/computer/cloning,/obj/effect/floor_decal/corner/blue{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Jo" = (/obj/machinery/dna_scannernew,/obj/effect/floor_decal/corner/blue{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Jp" = (/obj/structure/closet/wardrobe/white,/obj/effect/floor_decal/corner/blue{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Jq" = (/obj/structure/table/standard,/obj/item/weapon/book/manual/medical_cloning,/obj/effect/floor_decal/corner/blue{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Jr" = (/obj/item/weapon/storage/box/bodybags,/obj/item/weapon/storage/box/bodybags,/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Jq" = (/obj/structure/table/standard,/obj/item/book/manual/medical_cloning,/obj/effect/floor_decal/corner/blue{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Jr" = (/obj/item/storage/box/bodybags,/obj/item/storage/box/bodybags,/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Js" = (/obj/effect/floor_decal/corner/blue{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Jt" = (/obj/item/weapon/autopsy_scanner,/obj/item/weapon/surgical/scalpel,/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue/full{dir = 4},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Ju" = (/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) +"Jt" = (/obj/item/autopsy_scanner,/obj/item/surgical/scalpel,/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue/full{dir = 4},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Ju" = (/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) "Jv" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) "Jw" = (/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "white"},/area/tdome) "Jx" = (/obj/machinery/computer/security/telescreen,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) -"Jy" = (/obj/item/device/camera,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) +"Jy" = (/obj/item/camera,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) "Jz" = (/obj/structure/disposalpipe/segment,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) "JA" = (/obj/structure/closet/walllocker/emerglocker{pixel_x = -28},/turf/simulated/shuttle/floor/yellow,/area/shuttle/escape/centcom) "JB" = (/obj/structure/closet/hydrant{pixel_x = 30; pixel_y = 0},/turf/simulated/shuttle/floor/yellow,/area/shuttle/escape/centcom) "JC" = (/obj/machinery/atmospherics/unary/cryo_cell{layer = 3.3},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "JD" = (/obj/machinery/atmospherics/portables_connector,/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "JE" = (/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) -"JF" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/weapon/tool/wrench,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) -"JG" = (/obj/structure/closet/crate/medical,/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/weapon/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/weapon/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/weapon/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/weapon/storage/firstaid/adv{pixel_x = -2},/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) +"JF" = (/obj/structure/table/standard,/obj/item/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/tool/wrench,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) +"JG" = (/obj/structure/closet/crate/medical,/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/storage/firstaid/toxin,/obj/item/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/storage/firstaid/adv{pixel_x = -2},/obj/item/reagent_containers/blood/empty,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "JH" = (/obj/structure/closet/hydrant{pixel_x = -30; pixel_y = 0},/turf/simulated/shuttle/floor/yellow,/area/shuttle/escape/centcom) "JI" = (/obj/structure/closet/walllocker/emerglocker{pixel_x = 28},/turf/simulated/shuttle/floor/yellow,/area/shuttle/escape/centcom) "JJ" = (/obj/effect/floor_decal/corner/pink,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) @@ -1865,27 +1865,27 @@ "JS" = (/obj/machinery/vending/wallmed1{layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28; pixel_y = 0},/obj/structure/bed/chair{dir = 8},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "JT" = (/obj/machinery/door/airlock/medical{name = "Operating Theatre"; req_access = list(45)},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "JU" = (/obj/machinery/disease2/incubator,/obj/effect/floor_decal/corner/green/full{dir = 8},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"JV" = (/obj/item/weapon/storage/box/syringes{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/box/beakers,/obj/item/weapon/reagent_containers/dropper,/obj/structure/table/glass,/obj/structure/reagent_dispensers/virusfood{pixel_x = 0; pixel_y = 28},/obj/effect/floor_decal/corner/green{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"JV" = (/obj/item/storage/box/syringes{pixel_x = 4; pixel_y = 4},/obj/item/storage/box/beakers,/obj/item/reagent_containers/dropper,/obj/structure/table/glass,/obj/structure/reagent_dispensers/virusfood{pixel_x = 0; pixel_y = 28},/obj/effect/floor_decal/corner/green{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "JW" = (/obj/machinery/disease2/isolator,/obj/effect/floor_decal/corner/green/full{dir = 1},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "JX" = (/obj/effect/floor_decal/corner/green/full{dir = 8},/obj/machinery/computer/arcade/orion_trail,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"JY" = (/obj/effect/floor_decal/corner/green{dir = 5},/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"JZ" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/green,/obj/effect/floor_decal/corner/green{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Ka" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/green,/obj/effect/floor_decal/corner/green/full{dir = 1},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Kb" = (/obj/structure/table/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/weapon/melee/energy/axe,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) +"JY" = (/obj/effect/floor_decal/corner/green{dir = 5},/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"JZ" = (/obj/structure/bed/padded,/obj/item/bedsheet/green,/obj/effect/floor_decal/corner/green{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Ka" = (/obj/structure/bed/padded,/obj/item/bedsheet/green,/obj/effect/floor_decal/corner/green/full{dir = 1},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Kb" = (/obj/structure/table/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/melee/energy/axe,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "Kc" = (/obj/effect/forcefield{desc = "You can't get in. Heh."; layer = 1; name = "Blocker"},/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) "Kd" = (/obj/effect/forcefield{desc = "You can't get in. Heh."; layer = 1; name = "Blocker"},/obj/structure/disposalpipe/segment,/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) -"Ke" = (/obj/structure/table/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/weapon/melee/energy/axe,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) +"Ke" = (/obj/structure/table/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/melee/energy/axe,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "Kf" = (/obj/structure/closet/crate/freezer/rations,/obj/machinery/camera/network/crescent{c_tag = "Shuttle West Storage"; dir = 4},/turf/simulated/shuttle/floor/yellow,/area/shuttle/escape/centcom) "Kg" = (/obj/structure/closet/crate/freezer/rations,/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/yellow,/area/shuttle/escape/centcom) "Kh" = (/obj/machinery/iv_drip,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "Ki" = (/obj/machinery/hologram/holopad,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "Kj" = (/obj/structure/bed/roller,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) -"Kk" = (/obj/structure/bed/roller,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) +"Kk" = (/obj/structure/bed/roller,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 26},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "Kl" = (/obj/machinery/recharge_station,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/yellow,/area/shuttle/escape/centcom) "Km" = (/obj/machinery/recharge_station,/obj/machinery/camera/network/crescent{c_tag = "Shuttle East Storage"; dir = 8},/turf/simulated/shuttle/floor/yellow,/area/shuttle/escape/centcom) -"Kn" = (/obj/structure/table/standard,/obj/item/weapon/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/medical/advanced/bruise_pack,/obj/effect/floor_decal/corner/pink{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Ko" = (/obj/structure/table/standard,/obj/item/weapon/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/weapon/surgical/scalpel,/obj/effect/floor_decal/corner/pink{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Kp" = (/obj/structure/table/standard,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/circular_saw,/obj/effect/floor_decal/corner/pink/full{dir = 1},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Kn" = (/obj/structure/table/standard,/obj/item/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/medical/advanced/bruise_pack,/obj/effect/floor_decal/corner/pink{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Ko" = (/obj/structure/table/standard,/obj/item/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/surgical/scalpel,/obj/effect/floor_decal/corner/pink{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Kp" = (/obj/structure/table/standard,/obj/item/surgical/surgicaldrill,/obj/item/surgical/circular_saw,/obj/effect/floor_decal/corner/pink/full{dir = 1},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Kq" = (/obj/machinery/door/blast/regular{id = "thunderdomeaxe"; name = "Axe Supply"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "Kr" = (/obj/machinery/igniter,/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) "Ks" = (/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) @@ -1895,21 +1895,21 @@ "Kw" = (/obj/machinery/sleep_console,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "Kx" = (/obj/machinery/sleep_console{dir = 4},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "Ky" = (/obj/machinery/sleeper{dir = 4},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) -"Kz" = (/obj/structure/table/standard,/obj/item/weapon/surgical/cautery{pixel_y = 4},/obj/item/weapon/surgical/hemostat{pixel_y = 4},/obj/item/stack/nanopaste,/obj/effect/floor_decal/corner/pink{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Kz" = (/obj/structure/table/standard,/obj/item/surgical/cautery{pixel_y = 4},/obj/item/surgical/hemostat{pixel_y = 4},/obj/item/stack/nanopaste,/obj/effect/floor_decal/corner/pink{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "KA" = (/obj/effect/floor_decal/corner/pink{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "KB" = (/obj/machinery/door/airlock/glass_medical{name = "Virology Laboratory"},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"KC" = (/obj/structure/table/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/head/helmet/thunderdome,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/energy/sword/red,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) +"KC" = (/obj/structure/table/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/head/helmet/thunderdome,/obj/item/melee/baton/loaded,/obj/item/melee/energy/sword/red,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "KD" = (/obj/machinery/door/blast/regular{id = "thunderdomegen"; name = "General Supply"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "KE" = (/obj/effect/landmark{name = "tdome2"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome/tdome2) "KF" = (/obj/machinery/door/blast/regular{id = "thunderdome"; name = "Thunderdome Blast Door"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "KG" = (/obj/effect/landmark{name = "tdome1"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome/tdome1) -"KH" = (/obj/structure/table/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/head/helmet/thunderdome,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/energy/sword/green,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) +"KH" = (/obj/structure/table/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/head/helmet/thunderdome,/obj/item/melee/baton/loaded,/obj/item/melee/energy/sword/green,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "KI" = (/turf/space,/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/escape/centcom) -"KJ" = (/obj/structure/table/standard,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/obj/effect/floor_decal/corner/pink{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"KJ" = (/obj/structure/table/standard,/obj/item/surgical/bonesetter,/obj/item/surgical/bonegel{pixel_x = 4; pixel_y = 3},/obj/effect/floor_decal/corner/pink{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "KK" = (/obj/machinery/computer/operating,/obj/effect/floor_decal/corner/pink{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "KL" = (/obj/machinery/computer/centrifuge,/obj/effect/floor_decal/corner/green{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "KM" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/green/full{dir = 8},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"KN" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/glass,/obj/item/weapon/storage/box/monkeycubes,/obj/effect/floor_decal/corner/green/full{dir = 1},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"KN" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/glass,/obj/item/storage/box/monkeycubes,/obj/effect/floor_decal/corner/green/full{dir = 1},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "KO" = (/obj/machinery/recharger{pixel_y = 4},/obj/effect/landmark{name = "tdome2"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome/tdome2) "KP" = (/obj/machinery/recharger{pixel_y = 4},/obj/effect/landmark{name = "tdome1"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome/tdome1) "KQ" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/machinery/vending/wallmed1{name = "Emergency NanoMed"; pixel_x = 28},/obj/effect/floor_decal/corner/pink{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) @@ -1920,18 +1920,18 @@ "KV" = (/obj/machinery/vending/snack,/obj/effect/floor_decal/corner/green/full,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "KW" = (/obj/machinery/vending/coffee,/obj/effect/floor_decal/corner/green{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "KX" = (/obj/machinery/computer/arcade,/obj/effect/floor_decal/corner/green{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"KY" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/green,/obj/effect/floor_decal/corner/green{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"KZ" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/green,/obj/effect/floor_decal/corner/green/full{dir = 4},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"KY" = (/obj/structure/bed/padded,/obj/item/bedsheet/green,/obj/effect/floor_decal/corner/green{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"KZ" = (/obj/structure/bed/padded,/obj/item/bedsheet/green,/obj/effect/floor_decal/corner/green/full{dir = 4},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "La" = (/obj/effect/landmark{name = "tdome2"},/obj/machinery/camera/network/thunder{c_tag = "Thunderdome - Red Team"; invisibility = 101},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome/tdome2) "Lb" = (/obj/machinery/flasher{id = "flash"; name = "Thunderdome Flash"},/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) "Lc" = (/obj/effect/landmark{name = "tdome1"},/obj/machinery/camera/network/thunder{c_tag = "Green Team"; invisibility = 101},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome/tdome1) "Ld" = (/obj/structure/closet/secure_closet/medical2,/obj/effect/floor_decal/corner/pink/full,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Le" = (/obj/machinery/iv_drip,/obj/effect/floor_decal/corner/pink{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Lf" = (/obj/effect/floor_decal/corner/pink{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Lg" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/blood/OPlus{pixel_x = 4; pixel_y = 2},/obj/item/weapon/reagent_containers/blood/OPlus{pixel_x = 4; pixel_y = 2},/obj/item/weapon/reagent_containers/blood/OMinus{pixel_x = -5; pixel_y = -1},/obj/item/weapon/reagent_containers/blood/OMinus{pixel_x = -5; pixel_y = -1},/obj/effect/floor_decal/corner/pink{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Lh" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/weapon/storage/box/masks,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/effect/floor_decal/corner/pink/full{dir = 4},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Lg" = (/obj/structure/table/standard,/obj/item/reagent_containers/blood/OPlus{pixel_x = 4; pixel_y = 2},/obj/item/reagent_containers/blood/OPlus{pixel_x = 4; pixel_y = 2},/obj/item/reagent_containers/blood/OMinus{pixel_x = -5; pixel_y = -1},/obj/item/reagent_containers/blood/OMinus{pixel_x = -5; pixel_y = -1},/obj/effect/floor_decal/corner/pink{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Lh" = (/obj/structure/table/standard,/obj/item/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/storage/box/masks,/obj/item/reagent_containers/spray/cleaner,/obj/effect/floor_decal/corner/pink/full{dir = 4},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Li" = (/obj/structure/table/glass,/obj/machinery/computer/med_data/laptop,/obj/effect/floor_decal/corner/green/full,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Lj" = (/obj/item/weapon/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/box/masks,/obj/structure/table/glass,/obj/effect/floor_decal/corner/green{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Lj" = (/obj/item/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/item/storage/box/masks,/obj/structure/table/glass,/obj/effect/floor_decal/corner/green{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Lk" = (/obj/machinery/disease2/diseaseanalyser,/obj/effect/floor_decal/corner/green{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Ll" = (/obj/machinery/computer/diseasesplicer,/obj/effect/floor_decal/corner/green/full{dir = 4},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Lm" = (/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/green/full,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) @@ -1943,34 +1943,34 @@ "Ls" = (/obj/machinery/atmospherics/pipe/simple/visible,/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) "Lt" = (/obj/machinery/door/airlock/command{name = "Thunderdome Administration"; req_access = list(102)},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "Lu" = (/obj/machinery/door/blast/regular{id = "thunderdomehea"; name = "Heavy Supply"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) -"Lv" = (/obj/structure/table/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/vest,/obj/item/clothing/head/helmet/swat,/obj/item/weapon/gun/energy/laser,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) +"Lv" = (/obj/structure/table/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/vest,/obj/item/clothing/head/helmet/swat,/obj/item/gun/energy/laser,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "Lw" = (/obj/machinery/door/airlock/command{name = "Thunderdome Administration"; req_access = list(102)},/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) "Lx" = (/obj/effect/forcefield{desc = "You can't get in. Heh."; layer = 1; name = "Blocker"},/obj/machinery/atmospherics/pipe/simple/visible,/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) -"Ly" = (/obj/structure/table/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/vest,/obj/item/clothing/head/helmet/swat,/obj/item/weapon/gun/energy/laser,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) +"Ly" = (/obj/structure/table/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/vest,/obj/item/clothing/head/helmet/swat,/obj/item/gun/energy/laser,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "Lz" = (/obj/machinery/door/airlock/centcom{name = "Special Operations"; opacity = 1; req_access = list(103)},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/terminal) "LA" = (/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LB" = (/obj/structure/bed/chair{dir = 1},/obj/effect/landmark{name = "tdomeadmin"},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) -"LC" = (/obj/item/weapon/extinguisher,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) +"LC" = (/obj/item/extinguisher,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LD" = (/obj/machinery/atmospherics/valve,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LE" = (/obj/structure/bed/chair{dir = 1},/obj/structure/disposalpipe/segment,/obj/effect/landmark{name = "tdomeadmin"},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LF" = (/obj/machinery/computer/security/telescreen,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LG" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/nitrous_oxide{pixel_x = 1},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) -"LH" = (/obj/item/weapon/tool/wrench,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) +"LH" = (/obj/item/tool/wrench,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LI" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LJ" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access = list(101)},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome) "LK" = (/obj/structure/bed/chair,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LL" = (/obj/structure/table/standard,/obj/machinery/recharger{pixel_y = 4},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) -"LM" = (/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) +"LM" = (/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LN" = (/obj/machinery/computer/pod{id = "thunderdomeaxe"; name = "Thunderdome Axe Supply"},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LO" = (/obj/machinery/computer/pod{id = "thunderdomegen"; name = "Thunderdome General Supply"},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LP" = (/obj/machinery/computer/pod{id = "thunderdomehea"; name = "Thunderdome Heavy Supply"},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LQ" = (/obj/machinery/computer/pod{id = "thunderdome"; name = "Thunderdome Blast Door Control"},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LR" = (/obj/item/stack/medical/ointment,/obj/item/stack/medical/ointment,/obj/item/stack/medical/ointment,/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LS" = (/obj/structure/table/standard,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) -"LT" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/handcuffs,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) +"LT" = (/obj/structure/table/standard,/obj/item/storage/box/handcuffs,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LU" = (/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) -"LV" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/electrical,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) -"LW" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) +"LV" = (/obj/structure/table/standard,/obj/item/storage/toolbox/electrical,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) +"LW" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LX" = (/turf/unsimulated/beach/sand{density = 1; opacity = 1},/area/beach) "LY" = (/turf/unsimulated/beach/sand,/area/beach) "LZ" = (/obj/structure/signpost,/turf/unsimulated/beach/sand,/area/beach) @@ -1994,11 +1994,11 @@ "Mr" = (/obj/machinery/dna_scannernew,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "Ms" = (/obj/machinery/atmospherics/unary/cryo_cell{layer = 3.3},/turf/simulated/shuttle/floor/white,/area/centcom/evac) "Mt" = (/obj/machinery/atmospherics/portables_connector,/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"Mu" = (/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/weapon/tool/wrench,/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone,/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"Mv" = (/obj/structure/closet/crate/medical,/obj/item/weapon/surgical/circular_saw,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/weapon/surgical/hemostat{pixel_y = 4},/obj/item/weapon/surgical/cautery{pixel_y = 4},/obj/item/weapon/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/nanopaste,/obj/item/weapon/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/mask/surgical,/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"Mw" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/snacks/chips,/turf/unsimulated/beach/sand,/area/beach) -"Mx" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/turf/unsimulated/beach/sand,/area/beach) -"My" = (/obj/item/weapon/beach_ball,/turf/unsimulated/beach/sand,/area/beach) +"Mu" = (/obj/item/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/tool/wrench,/obj/structure/table/reinforced,/obj/item/reagent_containers/glass/beaker/cryoxadone,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"Mv" = (/obj/structure/closet/crate/medical,/obj/item/surgical/circular_saw,/obj/item/surgical/surgicaldrill,/obj/item/surgical/bonegel{pixel_x = 4; pixel_y = 3},/obj/item/surgical/bonesetter,/obj/item/surgical/scalpel,/obj/item/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/surgical/hemostat{pixel_y = 4},/obj/item/surgical/cautery{pixel_y = 4},/obj/item/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/nanopaste,/obj/item/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/mask/surgical,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"Mw" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/snacks/chips,/turf/unsimulated/beach/sand,/area/beach) +"Mx" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/drinks/cans/cola,/obj/item/reagent_containers/food/drinks/cans/cola,/obj/item/reagent_containers/food/drinks/cans/cola,/obj/item/reagent_containers/food/drinks/cans/cola,/obj/item/reagent_containers/food/drinks/cans/cola,/obj/item/reagent_containers/food/drinks/cans/cola,/turf/unsimulated/beach/sand,/area/beach) +"My" = (/obj/item/beach_ball,/turf/unsimulated/beach/sand,/area/beach) "Mz" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8; icon_state = "propulsion_l"},/turf/simulated/shuttle/plating/airless/carry,/area/centcom/evac) "MA" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating/airless,/area/centcom/evac) "MB" = (/obj/machinery/portable_atmospherics/powered/scrubber,/turf/simulated/shuttle/plating,/area/centcom/evac) @@ -2019,14 +2019,14 @@ "MQ" = (/obj/machinery/body_scanconsole,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "MR" = (/obj/machinery/optable,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "MS" = (/turf/simulated/shuttle/floor,/area/centcom/evac) -"MT" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/toxin{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"MU" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/fire{pixel_x = -2; pixel_y = 4},/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"MV" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 0},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"MT" = (/obj/structure/table/standard,/obj/item/storage/firstaid/toxin{pixel_x = -2; pixel_y = 4},/obj/item/storage/firstaid/toxin,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"MU" = (/obj/structure/table/standard,/obj/item/storage/firstaid/fire,/obj/item/storage/firstaid/fire{pixel_x = -2; pixel_y = 4},/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"MV" = (/obj/structure/table/standard,/obj/item/storage/firstaid/regular{pixel_x = 2; pixel_y = 0},/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/turf/simulated/shuttle/floor/white,/area/centcom/evac) "MW" = (/obj/machinery/computer/crew,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "MX" = (/obj/machinery/sleeper{dir = 8},/turf/simulated/shuttle/floor/white,/area/centcom/evac) "MY" = (/obj/machinery/sleep_console,/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"MZ" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"Na" = (/obj/structure/closet/crate/medical,/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/weapon/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/weapon/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/weapon/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/weapon/storage/firstaid/adv{pixel_x = -2},/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"MZ" = (/obj/structure/closet/crate/freezer,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"Na" = (/obj/structure/closet/crate/medical,/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/storage/firstaid/toxin,/obj/item/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/storage/firstaid/adv{pixel_x = -2},/obj/item/reagent_containers/blood/empty,/obj/item/reagent_containers/blood/empty,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "Nb" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "Nc" = (/obj/structure/morgue{icon_state = "morgue1"; dir = 8},/turf/simulated/shuttle/floor/white,/area/centcom/evac) "Nd" = (/obj/structure/bed/chair,/obj/effect/landmark{name = "endgame_exit"},/obj/item/toy/plushie/mouse{desc = "A plushie of a small fuzzy rodent."; name = "Woodrat"},/turf/unsimulated/beach/sand,/area/beach) @@ -2043,9 +2043,9 @@ "No" = (/obj/machinery/vending/cigarette,/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "Np" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "large_escape_pod_2_recovery"; pixel_x = -25; pixel_y = 25; req_one_access = list(13); tag_door = "large_escape_pod_2_recovery_hatch"},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "Nq" = (/obj/structure/bed/roller,/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"Nr" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"Nr" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "Ns" = (/obj/machinery/iv_drip,/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"Nt" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/bodybags{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/bodybags,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"Nt" = (/obj/structure/table/reinforced,/obj/item/storage/box/bodybags{pixel_x = 2; pixel_y = 2},/obj/item/storage/box/bodybags,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "Nu" = (/turf/unsimulated/floor{icon_state = "sandwater"},/area/beach) "Nv" = (/turf/unsimulated/wall{desc = "That looks like it doesn't open easily."; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/evac) "Nw" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "escape_pod_1_recovery"; pixel_x = -25; pixel_y = 25; req_one_access = list(13); tag_door = "escape_pod_1_recovery_hatch"},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) @@ -2058,7 +2058,7 @@ "ND" = (/obj/machinery/door/airlock/glass,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/centcom/evac) "NE" = (/obj/machinery/computer/communications,/turf/simulated/shuttle/floor/black,/area/centcom/evac) "NF" = (/turf/simulated/shuttle/floor/black,/area/centcom/evac) -"NG" = (/obj/structure/table/standard,/obj/item/device/radio/off,/obj/item/weapon/paper_bin,/turf/simulated/shuttle/floor/black,/area/centcom/evac) +"NG" = (/obj/structure/table/standard,/obj/item/radio/off,/obj/item/paper_bin,/turf/simulated/shuttle/floor/black,/area/centcom/evac) "NH" = (/turf/unsimulated/beach/coastline{density = 1; opacity = 1},/area/beach) "NI" = (/turf/unsimulated/beach/coastline,/area/beach) "NJ" = (/obj/machinery/door/airlock/glass,/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) @@ -2072,7 +2072,7 @@ "NR" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor,/area/centcom/evac) "NS" = (/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/centcom/evac) "NT" = (/obj/machinery/door/airlock/hatch{name = "Cockpit"; req_access = list(109)},/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/centcom/evac) -"NU" = (/obj/structure/table/standard,/obj/item/weapon/storage/lockbox,/turf/simulated/shuttle/floor/black,/area/centcom/evac) +"NU" = (/obj/structure/table/standard,/obj/item/storage/lockbox,/turf/simulated/shuttle/floor/black,/area/centcom/evac) "NV" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor,/area/centcom/evac) "NW" = (/obj/structure/bed/chair,/turf/simulated/shuttle/floor/black,/area/centcom/evac) "NX" = (/obj/machinery/computer/station_alert,/turf/simulated/shuttle/floor/black,/area/centcom/evac) @@ -2082,7 +2082,7 @@ "Ob" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "escape_pod_3_recovery"; pixel_x = -25; pixel_y = -25; req_one_access = list(13); tag_door = "escape_pod_3_recovery_hatch"},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "Oc" = (/obj/machinery/door/airlock/glass_security{name = "Security Processing"; req_access = list(1)},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "Od" = (/obj/machinery/computer/crew,/turf/simulated/shuttle/floor/black,/area/centcom/evac) -"Oe" = (/obj/structure/table/standard,/obj/item/weapon/clipboard,/obj/item/weapon/pen,/obj/item/weapon/stamp/captain,/turf/simulated/shuttle/floor/black,/area/centcom/evac) +"Oe" = (/obj/structure/table/standard,/obj/item/clipboard,/obj/item/pen,/obj/item/stamp/captain,/turf/simulated/shuttle/floor/black,/area/centcom/evac) "Of" = (/turf/unsimulated/wall,/area/syndicate_mothership{name = "\improper Raider Base"}) "Og" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_pod_6_recovery_hatch"; locked = 1; name = "Recovery Shuttle Dock 6"; req_access = list(13)},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "Oh" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_pod_5_recovery_hatch"; locked = 1; name = "Recovery Shuttle Dock 5"; req_access = list(13)},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) @@ -2092,10 +2092,10 @@ "Ol" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "large_escape_pod_1_recovery"; pixel_x = -25; pixel_y = -25; req_one_access = list(13); tag_door = "large_escape_pod_1_recovery_hatch"},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "Om" = (/obj/structure/table/rack,/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) "On" = (/obj/machinery/computer/card,/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) -"Oo" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) +"Oo" = (/obj/structure/table/reinforced,/obj/item/paper_bin,/obj/item/pen,/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) "Op" = (/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) "Oq" = (/obj/machinery/computer/secure_data,/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) -"Or" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/medical,/turf/simulated/shuttle/floor,/area/centcom/evac) +"Or" = (/obj/structure/bed/padded,/obj/item/bedsheet/medical,/turf/simulated/shuttle/floor,/area/centcom/evac) "Os" = (/turf/simulated/mineral,/area/syndicate_mothership{name = "\improper Raider Base"}) "Ot" = (/obj/effect/landmark{name = "voxstart"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership{name = "\improper Raider Base"}) "Ou" = (/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership{name = "\improper Raider Base"}) @@ -2109,7 +2109,7 @@ "OC" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) "OD" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/shuttle/floor,/area/centcom/evac) "OE" = (/obj/structure/table/standard,/obj/structure/bedsheetbin,/turf/simulated/shuttle/floor,/area/centcom/evac) -"OF" = (/obj/item/weapon/bedsheet/orange,/obj/structure/bed/padded,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership{name = "\improper Raider Base"}) +"OF" = (/obj/item/bedsheet/orange,/obj/structure/bed/padded,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership{name = "\improper Raider Base"}) "OG" = (/turf/simulated/shuttle/plating,/area/shuttle/large_escape_pod1/centcom) "OH" = (/obj/structure/closet/secure_closet/security,/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) "OI" = (/obj/structure/closet{name = "Evidence Closet"},/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) @@ -2118,23 +2118,23 @@ "OL" = (/obj/machinery/door/airlock/glass_security{name = "Escape Shuttle Cell"; req_access = list(1)},/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) "OM" = (/turf/unsimulated/floor{icon_state = "asteroid"},/area/syndicate_mothership{name = "\improper Raider Base"}) "ON" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) -"OO" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/orange,/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) -"OP" = (/obj/item/weapon/tray{pixel_y = 5},/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership{name = "\improper Raider Base"}) -"OQ" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/glasses/square{pixel_x = 1; pixel_y = 4},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership{name = "\improper Raider Base"}) +"OO" = (/obj/structure/bed/padded,/obj/item/bedsheet/orange,/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) +"OP" = (/obj/item/tray{pixel_y = 5},/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership{name = "\improper Raider Base"}) +"OQ" = (/obj/structure/table/standard,/obj/item/storage/box/glasses/square{pixel_x = 1; pixel_y = 4},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership{name = "\improper Raider Base"}) "OR" = (/obj/machinery/portable_atmospherics/powered/pump,/turf/simulated/shuttle/plating,/area/centcom/evac) "OS" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/shuttle/plating,/area/centcom/evac) -"OT" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/reagent_containers/glass/bucket{amount_per_transfer_from_this = 50},/turf/simulated/shuttle/floor,/area/centcom/evac) -"OU" = (/obj/item/weapon/mop,/obj/structure/mopbucket,/turf/simulated/shuttle/floor,/area/centcom/evac) -"OV" = (/obj/structure/table/rack,/obj/item/weapon/reagent_containers/spray/cleaner{pixel_x = 6; pixel_y = 3},/obj/item/clothing/accessory/storage/brown_vest,/turf/simulated/shuttle/floor,/area/centcom/evac) +"OT" = (/obj/structure/reagent_dispensers/watertank,/obj/item/reagent_containers/glass/bucket{amount_per_transfer_from_this = 50},/turf/simulated/shuttle/floor,/area/centcom/evac) +"OU" = (/obj/item/mop,/obj/structure/mopbucket,/turf/simulated/shuttle/floor,/area/centcom/evac) +"OV" = (/obj/structure/table/rack,/obj/item/reagent_containers/spray/cleaner{pixel_x = 6; pixel_y = 3},/obj/item/clothing/accessory/storage/brown_vest,/turf/simulated/shuttle/floor,/area/centcom/evac) "OW" = (/obj/structure/grille,/obj/structure/window/shuttle{icon_state = "window4"},/turf/simulated/shuttle/plating,/area/centcom/evac) "OX" = (/obj/structure/grille,/obj/structure/window/shuttle{icon_state = "window8"},/turf/simulated/shuttle/plating,/area/centcom/evac) "OY" = (/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership{name = "\improper Raider Base"}) "OZ" = (/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_soft/full,/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership{name = "\improper Raider Base"}) -"Pa" = (/obj/item/weapon/bedsheet/orange,/obj/effect/decal/cleanable/cobweb2{icon_state = "cobweb1"},/obj/structure/bed/padded,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership{name = "\improper Raider Base"}) +"Pa" = (/obj/item/bedsheet/orange,/obj/effect/decal/cleanable/cobweb2{icon_state = "cobweb1"},/obj/structure/bed/padded,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership{name = "\improper Raider Base"}) "Pb" = (/obj/machinery/microwave{pixel_x = -1; pixel_y = 8},/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership{name = "\improper Raider Base"}) "Pc" = (/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership{name = "\improper Raider Base"}) "Pd" = (/obj/structure/closet/secure_closet/freezer/kitchen,/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership{name = "\improper Raider Base"}) -"Pe" = (/obj/structure/urinal{pixel_y = 32},/obj/item/weapon/soap/syndie,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_mothership{name = "\improper Raider Base"}) +"Pe" = (/obj/structure/urinal{pixel_y = 32},/obj/item/soap/syndie,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_mothership{name = "\improper Raider Base"}) "Pf" = (/obj/structure/urinal{pixel_y = 32},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_mothership{name = "\improper Raider Base"}) "Pg" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_mothership{name = "\improper Raider Base"}) "Ph" = (/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_mothership{name = "\improper Raider Base"}) @@ -2147,7 +2147,7 @@ "Po" = (/obj/item/clothing/mask/gas/swat{desc = "A close-fitting mask clearly not made for a human face."; name = "\improper alien mask"},/turf/unsimulated/floor{icon_state = "asteroid"},/area/syndicate_mothership{name = "\improper Raider Base"}) "Pp" = (/obj/structure/table/rack,/turf/unsimulated/floor{icon_state = "asteroid"},/area/syndicate_mothership{name = "\improper Raider Base"}) "Pq" = (/obj/item/xenos_claw,/turf/unsimulated/floor{icon_state = "asteroid"},/area/syndicate_mothership{name = "\improper Raider Base"}) -"Pr" = (/obj/structure/table/rack,/obj/item/weapon/gun/launcher/spikethrower,/turf/unsimulated/floor{icon_state = "asteroid"},/area/syndicate_mothership{name = "\improper Raider Base"}) +"Pr" = (/obj/structure/table/rack,/obj/item/gun/launcher/spikethrower,/turf/unsimulated/floor{icon_state = "asteroid"},/area/syndicate_mothership{name = "\improper Raider Base"}) "Ps" = (/obj/machinery/shower{dir = 1},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_mothership{name = "\improper Raider Base"}) "Pt" = (/obj/item/pizzabox/meat,/turf/unsimulated/floor{icon_state = "asteroid"},/area/syndicate_mothership{name = "\improper Raider Base"}) "Pu" = (/obj/structure/reagent_dispensers/beerkeg,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership{name = "\improper Raider Base"}) @@ -2155,7 +2155,7 @@ "Pw" = (/obj/effect/decal/cleanable/cobweb2,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership{name = "\improper Raider Base"}) "Px" = (/obj/structure/table/rack,/obj/item/clothing/glasses/thermal/plain/monocle,/turf/unsimulated/floor{icon_state = "asteroid"},/area/syndicate_mothership{name = "\improper Raider Base"}) "Py" = (/obj/effect/landmark{name = "voxstart"},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership{name = "\improper Raider Base"}) -"Pz" = (/obj/item/weapon/tank/nitrogen,/turf/unsimulated/floor{icon_state = "asteroid"},/area/syndicate_mothership{name = "\improper Raider Base"}) +"Pz" = (/obj/item/tank/nitrogen,/turf/unsimulated/floor{icon_state = "asteroid"},/area/syndicate_mothership{name = "\improper Raider Base"}) "PA" = (/obj/item/organ/internal/stack,/turf/unsimulated/floor{icon_state = "asteroid"},/area/syndicate_mothership{name = "\improper Raider Base"}) "PB" = (/obj/structure/bed/chair,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership{name = "\improper Raider Base"}) "PC" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership{name = "\improper Raider Base"}) @@ -2165,7 +2165,7 @@ "PG" = (/obj/machinery/computer/station_alert,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership{name = "\improper Raider Base"}) "PH" = (/obj/machinery/suit_cycler/syndicate{locked = 0},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_mothership{name = "\improper Raider Base"}) "PI" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; tiles = 0},/turf/space,/area/space) -"PJ" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/item/weapon/tank/nitrogen,/turf/unsimulated/floor{icon_state = "asteroid"},/area/syndicate_mothership{name = "\improper Raider Base"}) +"PJ" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/item/tank/nitrogen,/turf/unsimulated/floor{icon_state = "asteroid"},/area/syndicate_mothership{name = "\improper Raider Base"}) "PK" = (/obj/item/clothing/head/philosopher_wig,/turf/unsimulated/floor{icon_state = "asteroid"},/area/syndicate_mothership{name = "\improper Raider Base"}) "PL" = (/obj/structure/lattice,/obj/structure/window/reinforced{dir = 4},/turf/space,/area/syndicate_mothership{name = "\improper Raider Base"}) "PM" = (/obj/machinery/door/airlock/external{req_access = list(150)},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership{name = "\improper Raider Base"}) @@ -2175,15 +2175,15 @@ "PQ" = (/turf/simulated/shuttle/wall/dark/hard_corner,/area/wizard_station) "PR" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "PS" = (/obj/machinery/chemical_dispenser/bar_soft/full,/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) -"PT" = (/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine{pixel_x = -4; pixel_y = 10},/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) +"PT" = (/obj/item/reagent_containers/food/drinks/bottle/pwine{pixel_x = -4; pixel_y = 10},/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) "PU" = (/obj/structure/sink/kitchen{pixel_y = 28},/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) "PV" = (/turf/simulated/shuttle/wall/dark,/area/skipjack_station/start) "PW" = (/obj/machinery/computer/arcade/battle,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "PX" = (/obj/machinery/computer/arcade/orion_trail,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "PY" = (/obj/machinery/microwave{pixel_x = -1; pixel_y = 8},/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) "PZ" = (/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) -"Qa" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{on = 0; pixel_x = -3; pixel_y = 8},/obj/item/toy/figure/ninja,/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) -"Qb" = (/obj/structure/bed,/obj/item/weapon/bedsheet/rd,/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) +"Qa" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green{on = 0; pixel_x = -3; pixel_y = 8},/obj/item/toy/figure/ninja,/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) +"Qb" = (/obj/structure/bed,/obj/item/bedsheet/rd,/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) "Qc" = (/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1331; master_tag = "vox_west_control"; req_one_access = list(150)},/turf/simulated/shuttle/wall/dark,/area/skipjack_station/start) "Qd" = (/obj/machinery/door/airlock/hatch{frequency = 1331; icon_state = "door_closed"; id_tag = "vox_northwest_lock"; locked = 0; req_access = list(150)},/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Qe" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/blast/regular{id = "skipjackshutters"; name = "Skipjack Blast Shielding"},/turf/simulated/shuttle/plating,/area/skipjack_station/start) @@ -2194,10 +2194,10 @@ "Qj" = (/obj/structure/bed/chair/wood/wings,/obj/machinery/newscaster{layer = 3.3; pixel_x = 0; pixel_y = 30},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "Qk" = (/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "Ql" = (/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) -"Qm" = (/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) +"Qm" = (/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) "Qn" = (/obj/structure/mirror{pixel_x = -28},/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) "Qo" = (/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) -"Qp" = (/obj/structure/table/woodentable,/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/obj/item/weapon/ore/slag{desc = "Well at least Arthur doesn't have to share now..."; name = "pet rock"},/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) +"Qp" = (/obj/structure/table/woodentable,/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/obj/item/ore/slag{desc = "Well at least Arthur doesn't have to share now..."; name = "pet rock"},/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) "Qq" = (/obj/machinery/newscaster{layer = 3.3; pixel_x = 0; pixel_y = 30},/obj/structure/bedsheetbin,/obj/structure/table/woodentable,/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) "Qr" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{frequency = 1331; id_tag = "vox_west_vent"},/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Qs" = (/obj/machinery/airlock_sensor{frequency = 1331; id_tag = "vox_west_sensor"; pixel_x = 25},/turf/simulated/shuttle/plating,/area/skipjack_station/start) @@ -2207,12 +2207,12 @@ "Qw" = (/obj/machinery/button/remote/blast_door{id = "skipjackshutters"; name = "remote shutter control"; req_access = list(150)},/turf/simulated/shuttle/wall/dark,/area/skipjack_station/start) "Qx" = (/obj/machinery/airlock_sensor{frequency = 1331; id_tag = "vox_east_sensor"; pixel_x = -25},/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Qy" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{frequency = 1331; id_tag = "vox_east_vent"},/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"Qz" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) -"QA" = (/obj/structure/table/woodentable,/obj/item/device/radio/headset,/obj/item/weapon/spacecash/c500,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) +"Qz" = (/obj/structure/table/woodentable,/obj/item/paper_bin,/obj/item/pen,/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) +"QA" = (/obj/structure/table/woodentable,/obj/item/radio/headset,/obj/item/spacecash/c500,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "QB" = (/obj/structure/bed/chair/wood/wings{icon_state = "wooden_chair_wings"; dir = 8},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) -"QC" = (/obj/item/weapon/reagent_containers/food/snacks/spellburger{pixel_y = 8},/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) +"QC" = (/obj/item/reagent_containers/food/snacks/spellburger{pixel_y = 8},/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) "QD" = (/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"QE" = (/obj/structure/undies_wardrobe,/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"QE" = (/obj/structure/undies_wardrobe,/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "QF" = (/obj/machinery/atmospherics/pipe/manifold/visible{dir = 8},/obj/machinery/meter,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "QG" = (/obj/machinery/embedded_controller/radio/airlock/airlock_controller{tag_airpump = "vox_west_vent"; tag_exterior_door = "vox_northwest_lock"; frequency = 1331; id_tag = "vox_west_control"; tag_interior_door = "vox_southwest_lock"; pixel_x = 24; req_access = list(150); tag_chamber_sensor = "vox_west_sensor"},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; frequency = 1331; id_tag = "vox_west_vent"},/obj/machinery/light/small,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "QH" = (/obj/machinery/light/small{dir = 8},/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) @@ -2222,33 +2222,33 @@ "QL" = (/obj/machinery/embedded_controller/radio/airlock/airlock_controller{tag_airpump = "vox_east_vent"; tag_exterior_door = "vox_northeast_lock"; frequency = 1331; id_tag = "vox_east_control"; tag_interior_door = "vox_southeast_lock"; pixel_x = -24; req_access = list(150); tag_chamber_sensor = "vox_east_sensor"},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; frequency = 1331; id_tag = "vox_east_vent"},/obj/machinery/light/small,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "QM" = (/obj/machinery/atmospherics/pipe/manifold/visible{dir = 4},/obj/machinery/meter,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "QN" = (/obj/structure/bed/chair/wood/wings{icon_state = "wooden_chair_wings"; dir = 4},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) -"QO" = (/obj/structure/table/woodentable,/obj/item/device/paicard,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) -"QP" = (/obj/structure/table/woodentable,/obj/item/weapon/book/codex/corp_regs,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) +"QO" = (/obj/structure/table/woodentable,/obj/item/paicard,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) +"QP" = (/obj/structure/table/woodentable,/obj/item/book/codex/corp_regs,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "QQ" = (/obj/machinery/door/airlock/hatch,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "QR" = (/obj/machinery/door/airlock/hatch,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"QS" = (/obj/item/weapon/antag_spawner/technomancer_apprentice,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"QT" = (/obj/structure/table/woodentable,/obj/item/clothing/shoes/boots/workboots,/obj/item/clothing/under/technomancer,/obj/item/clothing/head/technomancer,/obj/item/weapon/storage/box/syndie_kit/chameleon,/obj/item/weapon/storage/box/syndie_kit/chameleon,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"QS" = (/obj/item/antag_spawner/technomancer_apprentice,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"QT" = (/obj/structure/table/woodentable,/obj/item/clothing/shoes/boots/workboots,/obj/item/clothing/under/technomancer,/obj/item/clothing/head/technomancer,/obj/item/storage/box/syndie_kit/chameleon,/obj/item/storage/box/syndie_kit/chameleon,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "QU" = (/obj/machinery/door/airlock/hatch{frequency = 1331; icon_state = "door_closed"; id_tag = "vox_southwest_lock"; locked = 0; req_access = list(150)},/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"QV" = (/obj/structure/table/rack,/obj/item/weapon/rig/industrial,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"QV" = (/obj/structure/table/rack,/obj/item/rig/industrial,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "QW" = (/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"QX" = (/obj/structure/table/rack,/obj/item/weapon/rig/light/hacker,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"QX" = (/obj/structure/table/rack,/obj/item/rig/light/hacker,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "QY" = (/obj/machinery/door/airlock/hatch{frequency = 1331; icon_state = "door_closed"; id_tag = "vox_southeast_lock"; locked = 0; req_access = list(150)},/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "QZ" = (/obj/structure/bed/chair/wood/wings{icon_state = "wooden_chair_wings"; dir = 1},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "Ra" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/unsimulated/floor{icon_state = "grass0"; name = "grass"},/area/wizard_station) "Rb" = (/obj/machinery/vending/hydroseeds,/turf/unsimulated/floor{icon_state = "grass0"; name = "grass"},/area/wizard_station) -"Rc" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/wizrobe/magusblue,/obj/item/clothing/head/wizard/magus,/obj/item/weapon/staff,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Rc" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/wizrobe/magusblue,/obj/item/clothing/head/wizard/magus,/obj/item/staff,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Rd" = (/obj/effect/landmark/start{name = "wizard"},/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"Re" = (/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"Re" = (/obj/item/reagent_containers/food/snacks/cheesewedge,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "Rf" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1331; master_tag = "vox_west_control"; pixel_x = -22; req_one_access = list(150)},/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"Rg" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/ionrifle,/obj/item/weapon/material/harpoon,/obj/item/clothing/suit/space/void/merc,/obj/item/clothing/head/helmet/space/void/merc,/obj/item/clothing/head/helmet/space/void/engineering,/obj/item/clothing/suit/space/void/engineering,/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/weapon/rig/light/stealth,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"Rg" = (/obj/structure/table/rack,/obj/item/gun/energy/ionrifle,/obj/item/material/harpoon,/obj/item/clothing/suit/space/void/merc,/obj/item/clothing/head/helmet/space/void/merc,/obj/item/clothing/head/helmet/space/void/engineering,/obj/item/clothing/suit/space/void/engineering,/obj/item/tank/oxygen,/obj/item/tank/oxygen,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/rig/light/stealth,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Rh" = (/obj/machinery/microwave{pixel_x = -1; pixel_y = 8},/obj/structure/table/steel,/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"Ri" = (/obj/item/seeds/potatoseed,/obj/item/seeds/potatoseed,/obj/item/seeds/ambrosiavulgarisseed,/obj/item/weapon/material/minihoe,/obj/item/weapon/beartrap,/obj/structure/table/steel,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"Ri" = (/obj/item/seeds/potatoseed,/obj/item/seeds/potatoseed,/obj/item/seeds/ambrosiavulgarisseed,/obj/item/material/minihoe,/obj/item/beartrap,/obj/structure/table/steel,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Rj" = (/obj/machinery/vending/hydroseeds,/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"Rk" = (/obj/structure/table/rack,/obj/item/weapon/melee/energy/sword/pirate,/obj/item/clothing/suit/space/pirate,/obj/item/clothing/suit/space/pirate,/obj/item/weapon/tank/oxygen,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"Rl" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/obj/item/device/multitool,/obj/item/device/multitool,/obj/item/clothing/shoes/magboots,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"Rk" = (/obj/structure/table/rack,/obj/item/melee/energy/sword/pirate,/obj/item/clothing/suit/space/pirate,/obj/item/clothing/suit/space/pirate,/obj/item/tank/oxygen,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"Rl" = (/obj/structure/table/rack,/obj/item/storage/belt/utility/full,/obj/item/storage/belt/utility/full,/obj/item/multitool,/obj/item/multitool,/obj/item/clothing/shoes/magboots,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Rm" = (/obj/machinery/washing_machine,/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"Rn" = (/obj/structure/table/standard,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter/zippo,/obj/item/clothing/gloves/yellow,/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/weapon/card/emag,/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"Ro" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/sniperrifle,/obj/item/clothing/suit/space/void/mining,/obj/item/clothing/head/helmet/space/void/mining,/obj/item/clothing/head/helmet/space/void/atmos,/obj/item/clothing/suit/space/void/atmos,/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"Rn" = (/obj/structure/table/standard,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter/zippo,/obj/item/clothing/gloves/yellow,/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/card/emag,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"Ro" = (/obj/structure/table/rack,/obj/item/gun/energy/sniperrifle,/obj/item/clothing/suit/space/void/mining,/obj/item/clothing/head/helmet/space/void/mining,/obj/item/clothing/head/helmet/space/void/atmos,/obj/item/clothing/suit/space/void/atmos,/obj/item/tank/oxygen,/obj/item/tank/oxygen,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Rp" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1331; master_tag = "vox_east_control"; pixel_x = 22; req_access = list(150)},/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Rq" = (/obj/structure/table/woodentable,/obj/machinery/librarycomp{pixel_y = 6},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "Rr" = (/obj/machinery/media/jukebox,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) @@ -2265,24 +2265,24 @@ "RC" = (/obj/machinery/photocopier,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "RD" = (/obj/structure/bookcase,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "RE" = (/obj/structure/flora/pottedplant{icon_state = "plant-08"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) -"RF" = (/obj/structure/closet/cabinet,/obj/item/clothing/shoes/sandal/marisa{desc = "A set of fancy shoes that are as functional as they are comfortable."; name = "Gentlemans Shoes"},/obj/item/clothing/under/gentlesuit,/obj/item/clothing/suit/wizrobe/gentlecoat,/obj/item/clothing/head/wizard/cap,/obj/item/weapon/staff/gentcane,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"RG" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/wizrobe/magusred,/obj/item/clothing/head/wizard/magus,/obj/item/weapon/staff,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"RH" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/wizrobe/marisa,/obj/item/clothing/shoes/sandal/marisa,/obj/item/clothing/head/wizard/marisa,/obj/item/weapon/staff/broom,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"RI" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/wizrobe/red,/obj/item/clothing/shoes/sandal,/obj/item/clothing/head/wizard/red,/obj/item/weapon/staff,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"RF" = (/obj/structure/closet/cabinet,/obj/item/clothing/shoes/sandal/marisa{desc = "A set of fancy shoes that are as functional as they are comfortable."; name = "Gentlemans Shoes"},/obj/item/clothing/under/gentlesuit,/obj/item/clothing/suit/wizrobe/gentlecoat,/obj/item/clothing/head/wizard/cap,/obj/item/staff/gentcane,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"RG" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/wizrobe/magusred,/obj/item/clothing/head/wizard/magus,/obj/item/staff,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"RH" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/wizrobe/marisa,/obj/item/clothing/shoes/sandal/marisa,/obj/item/clothing/head/wizard/marisa,/obj/item/staff/broom,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"RI" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/wizrobe/red,/obj/item/clothing/shoes/sandal,/obj/item/clothing/head/wizard/red,/obj/item/staff,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "RJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/blast/regular{id = "skipjackshutters"; name = "Skipjack Blast Shielding"},/turf/simulated/shuttle/plating,/area/skipjack_station/start) "RK" = (/obj/item/robot_parts/l_leg,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "RL" = (/obj/machinery/the_singularitygen,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "RM" = (/obj/machinery/crystal,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "RN" = (/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"RO" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/arrow/quill,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"RP" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/stock_parts/matter_bin/super,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"RO" = (/obj/structure/table/steel_reinforced,/obj/item/arrow/quill,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"RP" = (/obj/structure/table/steel_reinforced,/obj/item/stock_parts/matter_bin/super,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "RQ" = (/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "RR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/blast/regular{id = "skipjackshutters"; name = "Skipjack Blast Shielding"},/turf/simulated/shuttle/plating,/area/skipjack_station/start) "RS" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "RT" = (/obj/machinery/floodlight,/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"RU" = (/obj/item/device/suit_cooling_unit,/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"RV" = (/obj/structure/table/rack,/obj/item/weapon/gun/launcher/crossbow,/obj/item/stack/rods{amount = 10},/obj/machinery/light/small{dir = 8},/obj/item/weapon/beartrap,/obj/item/weapon/beartrap,/obj/item/weapon/beartrap,/obj/item/weapon/beartrap,/obj/item/weapon/beartrap,/obj/item/weapon/beartrap,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"RW" = (/obj/structure/table/rack,/obj/item/weapon/grenade/empgrenade,/obj/item/weapon/grenade/flashbang,/obj/item/weapon/grenade/spawnergrenade/manhacks,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"RU" = (/obj/item/suit_cooling_unit,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"RV" = (/obj/structure/table/rack,/obj/item/gun/launcher/crossbow,/obj/item/stack/rods{amount = 10},/obj/machinery/light/small{dir = 8},/obj/item/beartrap,/obj/item/beartrap,/obj/item/beartrap,/obj/item/beartrap,/obj/item/beartrap,/obj/item/beartrap,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"RW" = (/obj/structure/table/rack,/obj/item/grenade/empgrenade,/obj/item/grenade/flashbang,/obj/item/grenade/spawnergrenade/manhacks,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "RX" = (/obj/structure/table/steel,/obj/machinery/recharger,/obj/machinery/light/small{dir = 4},/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "RY" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "RZ" = (/obj/item/robot_parts/robot_suit,/obj/item/robot_parts/r_leg,/obj/item/robot_parts/r_arm,/turf/simulated/shuttle/plating,/area/skipjack_station/start) @@ -2292,7 +2292,7 @@ "Sd" = (/obj/machinery/computer/message_monitor,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Se" = (/obj/machinery/computer/security,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Sf" = (/obj/structure/table/steel_reinforced,/obj/item/stack/telecrystal,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"Sg" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Sg" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Sh" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/head/philosopher_wig,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "Si" = (/obj/structure/flora/pottedplant{icon_state = "plant-04"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Sj" = (/obj/structure/sign/electricshock,/turf/simulated/shuttle/wall/dark/hard_corner,/area/wizard_station) @@ -2302,8 +2302,8 @@ "Sn" = (/obj/structure/table/steel,/obj/item/clothing/glasses/regular,/obj/item/clothing/glasses/regular,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "So" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/light/small{dir = 4},/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "Sp" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"Sq" = (/obj/item/weapon/tool/wrench,/obj/item/weapon/mop,/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"Sr" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/item/weapon/tool/crowbar,/obj/item/device/suit_cooling_unit,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"Sq" = (/obj/item/tool/wrench,/obj/item/mop,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"Sr" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/item/tool/crowbar,/obj/item/suit_cooling_unit,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Ss" = (/obj/machinery/computer/shuttle,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "St" = (/obj/structure/bed/chair/comfy/brown{dir = 8},/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "Su" = (/obj/machinery/door/airlock/maintenance_hatch,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) @@ -2311,68 +2311,68 @@ "Sw" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Sx" = (/obj/machinery/light/small{dir = 1},/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "Sy" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"Sz" = (/obj/structure/table/steel,/obj/item/weapon/deck/cards,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"Sz" = (/obj/structure/table/steel,/obj/item/deck/cards,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "SA" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "SB" = (/obj/machinery/bodyscanner{dir = 8},/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "SC" = (/obj/machinery/light/small{dir = 1},/obj/machinery/body_scanconsole,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "SD" = (/obj/structure/toilet{dir = 4},/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"SE" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/item/weapon/tank/nitrogen,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"SE" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/item/tank/nitrogen,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "SF" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/pipe/tank/air{dir = 1; start_pressure = 740},/turf/simulated/shuttle/plating,/area/skipjack_station/start) "SG" = (/obj/machinery/computer/crew,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "SH" = (/obj/machinery/computer/power_monitor,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"SI" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/machinery/computer/station_alert/all,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"SJ" = (/obj/structure/table/steel_reinforced,/obj/item/device/mmi/radio_enabled,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"SK" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/material/knife/ritual,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"SL" = (/obj/structure/flora/pottedplant{icon_state = "plant-03"},/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"SI" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/machinery/computer/station_alert/all,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"SJ" = (/obj/structure/table/steel_reinforced,/obj/item/mmi/radio_enabled,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"SK" = (/obj/structure/table/steel_reinforced,/obj/item/material/knife/ritual,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"SL" = (/obj/structure/flora/pottedplant{icon_state = "plant-03"},/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "SM" = (/obj/structure/reagent_dispensers/watertank,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "SN" = (/obj/machinery/power/port_gen/pacman,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "SO" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating/airless,/area/skipjack_station/start) "SP" = (/obj/structure/table/steel,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "SQ" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "SR" = (/obj/structure/table/steel_reinforced,/obj/item/xenos_claw,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"SS" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/coin/diamond,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"SS" = (/obj/structure/table/steel_reinforced,/obj/item/coin/diamond,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "ST" = (/obj/structure/table/steel_reinforced,/obj/item/broken_device,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "SU" = (/obj/structure/table/steel_reinforced,/obj/item/organ/internal/stack,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "SV" = (/obj/machinery/floodlight,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "SW" = (/turf/space,/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating/airless/carry,/area/skipjack_station/start) -"SX" = (/obj/structure/table/standard,/obj/item/weapon/handcuffs/legcuffs,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"SY" = (/obj/structure/table/standard,/obj/item/weapon/deck/cards,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"SX" = (/obj/structure/table/standard,/obj/item/handcuffs/legcuffs,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"SY" = (/obj/structure/table/standard,/obj/item/deck/cards,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "SZ" = (/obj/machinery/light/small,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"Ta" = (/obj/structure/table/standard,/obj/item/weapon/surgical/circular_saw{pixel_y = 8},/obj/item/weapon/surgical/hemostat,/obj/item/weapon/surgical/scalpel,/obj/item/stack/medical/advanced/bruise_pack,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"Ta" = (/obj/structure/table/standard,/obj/item/surgical/circular_saw{pixel_y = 8},/obj/item/surgical/hemostat,/obj/item/surgical/scalpel,/obj/item/stack/medical/advanced/bruise_pack,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "Tb" = (/obj/machinery/mecha_part_fabricator,/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Tc" = (/obj/structure/table/steel_reinforced,/obj/machinery/cell_charger,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"Td" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/book/manual/ripley_build_and_repair,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"Te" = (/obj/item/device/suit_cooling_unit,/obj/structure/table/steel_reinforced,/obj/machinery/newscaster{layer = 3.3; pixel_x = 0; pixel_y = 30},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Td" = (/obj/structure/table/steel_reinforced,/obj/item/book/manual/ripley_build_and_repair,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Te" = (/obj/item/suit_cooling_unit,/obj/structure/table/steel_reinforced,/obj/machinery/newscaster{layer = 3.3; pixel_x = 0; pixel_y = 30},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Tf" = (/obj/machinery/newscaster{layer = 3.3; pixel_x = 0; pixel_y = 30},/obj/item/target,/obj/effect/floor_decal/industrial/outline/yellow,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Tg" = (/obj/item/target/syndicate,/obj/effect/floor_decal/industrial/outline/yellow,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Th" = (/obj/structure/table/steel_reinforced,/obj/item/toy/sword,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"Ti" = (/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/obj/structure/table/steel_reinforced,/obj/item/weapon/gun/energy/laser/practice,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Ti" = (/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/obj/structure/table/steel_reinforced,/obj/item/gun/energy/laser/practice,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Tj" = (/obj/machinery/optable,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"Tk" = (/obj/structure/table/standard,/obj/item/weapon/surgical/cautery,/obj/item/weapon/surgical/retractor,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/syringe,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"Tk" = (/obj/structure/table/standard,/obj/item/surgical/cautery,/obj/item/surgical/retractor,/obj/item/reagent_containers/glass/bottle/stoxin,/obj/item/reagent_containers/glass/bottle/stoxin,/obj/item/reagent_containers/syringe,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "Tl" = (/obj/machinery/recharge_station,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"Tm" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/book/manual/engineering_hacking,/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Tm" = (/obj/structure/table/steel_reinforced,/obj/item/book/manual/engineering_hacking,/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Tn" = (/obj/effect/floor_decal/industrial/warning/corner,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "To" = (/obj/effect/floor_decal/industrial/warning,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "Tp" = (/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"Tq" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/obj/item/target,/obj/effect/floor_decal/industrial/outline/yellow,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"Tr" = (/obj/item/weapon/bedsheet/rainbow,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"Ts" = (/obj/item/weapon/bedsheet/hos,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"Tt" = (/obj/structure/table/standard,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel,/obj/item/weapon/surgical/FixOVein,/obj/item/stack/nanopaste,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"Tq" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/obj/item/target,/obj/effect/floor_decal/industrial/outline/yellow,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Tr" = (/obj/item/bedsheet/rainbow,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"Ts" = (/obj/item/bedsheet/hos,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"Tt" = (/obj/structure/table/standard,/obj/item/surgical/bonesetter,/obj/item/surgical/bonegel,/obj/item/surgical/FixOVein,/obj/item/stack/nanopaste,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "Tu" = (/obj/item/robot_parts/r_arm,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "Tv" = (/obj/item/robot_parts/l_leg,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) -"Tw" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/book/manual/robotics_cyborgs,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Tw" = (/obj/structure/table/steel_reinforced,/obj/item/book/manual/robotics_cyborgs,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Tx" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Ty" = (/obj/machinery/power/emitter{anchored = 1; desc = "It is a heavy duty industrial laser used in a very non-industrial way."; name = "teleport defender"},/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "Tz" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "TA" = (/obj/effect/floor_decal/industrial/warning{dir = 9},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "TB" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "TC" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 5},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) -"TD" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"TD" = (/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "TE" = (/obj/structure/toilet{dir = 4},/obj/machinery/light/small{dir = 8},/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"TF" = (/obj/item/weapon/bedsheet/orange,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"TG" = (/obj/item/weapon/bedsheet/green,/obj/machinery/light/small{dir = 4},/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"TH" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/device/defib_kit/compact/combat/loaded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"TI" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/adv{pixel_x = 1},/obj/item/weapon/storage/firstaid/toxin{pixel_x = 3; pixel_y = 3},/obj/machinery/light/small{dir = 4},/obj/structure/closet/secure_closet/medical_wall{pixel_x = 32; pixel_y = 0; req_access = list(150)},/obj/item/weapon/storage/firstaid/fire{pixel_x = 1},/obj/item/weapon/storage/firstaid/o2{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/firstaid/regular,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"TF" = (/obj/item/bedsheet/orange,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"TG" = (/obj/item/bedsheet/green,/obj/machinery/light/small{dir = 4},/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"TH" = (/obj/structure/table/standard,/obj/item/reagent_containers/syringe/antiviral,/obj/item/reagent_containers/syringe/antiviral,/obj/item/defib_kit/compact/combat/loaded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"TI" = (/obj/structure/table/standard,/obj/item/storage/firstaid/adv{pixel_x = 1},/obj/item/storage/firstaid/toxin{pixel_x = 3; pixel_y = 3},/obj/machinery/light/small{dir = 4},/obj/structure/closet/secure_closet/medical_wall{pixel_x = 32; pixel_y = 0; req_access = list(150)},/obj/item/storage/firstaid/fire{pixel_x = 1},/obj/item/storage/firstaid/o2{pixel_x = 3; pixel_y = 3},/obj/item/storage/firstaid/regular,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "TJ" = (/obj/item/robot_parts/r_leg,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "TK" = (/obj/item/robot_parts/chest,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "TL" = (/obj/item/robot_parts/l_arm,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) @@ -2381,9 +2381,9 @@ "TO" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "TP" = (/obj/structure/target_stake,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "TQ" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) -"TR" = (/obj/item/weapon/bedsheet/rd,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"TR" = (/obj/item/bedsheet/rd,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "TS" = (/obj/item/pizzabox/meat,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"TT" = (/obj/item/weapon/bedsheet/clown,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"TT" = (/obj/item/bedsheet/clown,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "TU" = (/obj/structure/AIcore,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "TV" = (/obj/structure/flora/pottedplant{icon_state = "plant-20"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "TW" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) @@ -2391,9 +2391,9 @@ "TY" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "TZ" = (/obj/effect/decal/mecha_wreckage/phazon,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "Ua" = (/obj/item/robot_parts/head,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) -"Ub" = (/obj/item/weapon/firstaid_arm_assembly,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"Uc" = (/obj/item/weapon/bucket_sensor,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"Ud" = (/obj/item/weapon/farmbot_arm_assembly,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Ub" = (/obj/item/firstaid_arm_assembly,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Uc" = (/obj/item/bucket_sensor,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"Ud" = (/obj/item/farmbot_arm_assembly,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Ue" = (/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Uf" = (/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "Ug" = (/obj/machinery/computer/teleporter,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) diff --git a/maps/northern_star/polaris-3.dmm b/maps/northern_star/polaris-3.dmm index d74448f8d3c..a485982abcf 100644 --- a/maps/northern_star/polaris-3.dmm +++ b/maps/northern_star/polaris-3.dmm @@ -4,15 +4,15 @@ "ad" = (/obj/machinery/sleep_console,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "ae" = (/obj/machinery/light{dir = 1},/obj/machinery/sleeper{dir = 8},/obj/effect/decal/remains/human,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "af" = (/obj/machinery/computer/med_data,/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"ag" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/regular{pixel_x = 6; pixel_y = -5},/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"ah" = (/obj/item/weapon/surgical/scalpel,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"ag" = (/obj/structure/table/standard,/obj/item/storage/firstaid/regular{pixel_x = 6; pixel_y = -5},/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"ah" = (/obj/item/surgical/scalpel,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "ai" = (/obj/structure/frame/computer,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aj" = (/obj/machinery/door/airlock/glass{name = "Hibernation Pods"},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "ak" = (/obj/structure/shuttle/engine/propulsion{icon_state = "burst_r"; dir = 4},/turf/space,/area/derelict/ship) "al" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "am" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"an" = (/obj/item/device/multitool,/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"ao" = (/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"an" = (/obj/item/multitool,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"ao" = (/obj/item/cell{charge = 100; maxcharge = 15000},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "ap" = (/obj/structure/table/standard,/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aq" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/airless,/area/derelict/ship) "ar" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 4},/turf/space,/area/derelict/ship) @@ -20,39 +20,39 @@ "at" = (/obj/machinery/light_switch{pixel_x = 27},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "au" = (/obj/machinery/portable_atmospherics/powered/scrubber,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "av" = (/turf/simulated/shuttle/plating,/area/derelict/ship) -"aw" = (/obj/item/weapon/bedsheet,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"aw" = (/obj/item/bedsheet,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "ax" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/shuttle/plating,/area/derelict/ship) "ay" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/shuttle/plating,/area/derelict/ship) "az" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/shuttle/plating,/area/derelict/ship) "aA" = (/obj/machinery/door/window,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aB" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"aC" = (/obj/structure/table/standard,/obj/item/weapon/gun/energy/retro,/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"aD" = (/obj/structure/table/standard,/obj/item/weapon/tank/oxygen,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"aC" = (/obj/structure/table/standard,/obj/item/gun/energy/retro,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"aD" = (/obj/structure/table/standard,/obj/item/tank/oxygen,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aE" = (/obj/machinery/light/small{dir = 8},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aF" = (/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aG" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/floor/plating,/area/derelict/ship) -"aH" = (/obj/structure/table/standard,/obj/item/device/analyzer,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"aH" = (/obj/structure/table/standard,/obj/item/analyzer,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aI" = (/obj/structure/shuttle/engine/propulsion{ icon_state = "burst_l"; dir = 4},/turf/space,/area/derelict/ship) "aJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating,/area/derelict/ship) "aK" = (/obj/structure/bed/chair{dir = 8},/obj/effect/decal/remains/human,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aL" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aM" = (/obj/machinery/door/airlock/glass,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship) -"aN" = (/obj/item/weapon/bedsheet,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/bed/padded,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"aN" = (/obj/item/bedsheet,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/bed/padded,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aO" = (/obj/machinery/door/window/northright,/obj/effect/decal/remains/human,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating,/area/derelict/ship) "aQ" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aR" = (/obj/structure/table,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aS" = (/obj/machinery/light_switch{pixel_x = 27},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aT" = (/obj/structure/lattice,/turf/space,/area/space) -"aU" = (/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"aU" = (/obj/item/material/shard{icon_state = "medium"},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aV" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/derelict/ship) "aW" = (/obj/structure/bed/chair,/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"aX" = (/obj/item/weapon/material/shard,/obj/structure/bed/chair,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"aX" = (/obj/item/material/shard,/obj/structure/bed/chair,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aY" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/shuttle/plating,/area/derelict/ship) "aZ" = (/obj/structure/cable,/obj/structure/frame/computer,/obj/item/stack/cable_coil/cut,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "ba" = (/obj/structure/cable,/obj/structure/frame/computer,/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"bb" = (/obj/structure/table/rack,/obj/item/weapon/tank/emergency/oxygen,/obj/item/weapon/tank/emergency/oxygen,/obj/item/weapon/tank/emergency/oxygen,/obj/item/weapon/tank/emergency/oxygen,/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"bc" = (/obj/structure/table/rack,/obj/item/weapon/storage/toolbox/syndicate,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"bb" = (/obj/structure/table/rack,/obj/item/tank/emergency/oxygen,/obj/item/tank/emergency/oxygen,/obj/item/tank/emergency/oxygen,/obj/item/tank/emergency/oxygen,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"bc" = (/obj/structure/table/rack,/obj/item/storage/toolbox/syndicate,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "bd" = (/obj/machinery/power/solar,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/airless{icon_state = "solarpanel"},/area/tcomsat) "be" = (/obj/structure/table/rack,/obj/item/clothing/suit/space/syndicate,/obj/item/clothing/head/helmet/space/syndicate,/obj/item/clothing/mask/breath,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "bf" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/shuttle/floor/white,/area/derelict/ship) @@ -77,8 +77,8 @@ "by" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall/r_wall,/area/tcomsat) "bz" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless,/area/tcomsat) "bA" = (/obj/structure/disposaloutlet{dir = 4},/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/airless,/area/tcomsat) -"bB" = (/obj/structure/table/standard,/obj/item/device/radio/off,/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"bC" = (/obj/structure/table/standard,/obj/item/weapon/tool/screwdriver,/obj/machinery/light,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"bB" = (/obj/structure/table/standard,/obj/item/radio/off,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"bC" = (/obj/structure/table/standard,/obj/item/tool/screwdriver,/obj/machinery/light,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "bN" = (/obj/item/trash/cheesie,/turf/space,/area/space) "bO" = (/obj/machinery/door/blast/regular{id = "oldship_gun"; name = "Pod Bay Door"},/turf/simulated/shuttle/plating,/area/derelict/ship) "bP" = (/obj/machinery/mass_driver{dir = 8; icon_state = "mass_driver"; id = "oldship_gun"},/turf/simulated/shuttle/plating,/area/derelict/ship) @@ -105,12 +105,12 @@ "cs" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/valve/digital/open{dir = 4; name = "Mixed Air Outlet Valve"},/turf/simulated/floor/plating,/area/tcomsat) "ct" = (/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{dir = 1; icon_state = "map"},/obj/machinery/meter,/obj/machinery/firealarm{dir = 2; layer = 3.3; pixel_x = 0; pixel_y = 26},/turf/simulated/floor/plating,/area/tcomsat) "cu" = (/obj/machinery/atmospherics/pipe/tank/air{dir = 8},/turf/simulated/floor/plating,/area/tcomsat) -"cv" = (/obj/item/weapon/bedsheet/green,/obj/structure/bed/padded,/turf/simulated/floor/tiled,/area/tcommsat/computer) +"cv" = (/obj/item/bedsheet/green,/obj/structure/bed/padded,/turf/simulated/floor/tiled,/area/tcommsat/computer) "cw" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/tcommsat/computer) -"cx" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/purple,/turf/simulated/floor/tiled,/area/tcommsat/computer) +"cx" = (/obj/structure/bed/padded,/obj/item/bedsheet/purple,/turf/simulated/floor/tiled,/area/tcommsat/computer) "cy" = (/obj/machinery/camera/network/telecom{c_tag = "Telecoms Lounge"},/turf/simulated/floor/tiled,/area/tcommsat/computer) -"cz" = (/obj/item/weapon/bedsheet/brown,/obj/structure/bed/padded,/turf/simulated/floor/tiled,/area/tcommsat/computer) -"cA" = (/obj/item/weapon/bedsheet/red,/obj/structure/bed/padded,/turf/simulated/floor/tiled,/area/tcommsat/computer) +"cz" = (/obj/item/bedsheet/brown,/obj/structure/bed/padded,/turf/simulated/floor/tiled,/area/tcommsat/computer) +"cA" = (/obj/item/bedsheet/red,/obj/structure/bed/padded,/turf/simulated/floor/tiled,/area/tcommsat/computer) "cB" = (/obj/machinery/atmospherics/portables_connector,/obj/machinery/portable_atmospherics/canister/air/airlock,/turf/simulated/floor/tiled/dark,/area/tcommsat/computer) "cC" = (/obj/structure/lattice,/obj/structure/window/reinforced{dir = 4},/turf/space,/area/tcomsat) "cD" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/plating,/area/tcomsat) @@ -119,14 +119,14 @@ "cG" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 5; icon_state = "intact"},/turf/simulated/floor/plating,/area/tcomsat) "cH" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/tank/air{dir = 8},/turf/simulated/floor/plating,/area/tcomsat) "cI" = (/obj/structure/lattice,/obj/structure/window/reinforced{dir = 8},/turf/space,/area/tcomsat) -"cJ" = (/obj/structure/table/standard,/obj/item/weapon/folder/yellow,/obj/item/weapon/folder/yellow,/obj/machinery/light{dir = 1},/obj/machinery/camera/network/telecom{c_tag = "Telecoms Main Computer Room"},/obj/machinery/firealarm{dir = 2; layer = 3.3; pixel_x = 0; pixel_y = 26},/turf/simulated/floor/tiled/dark,/area/tcommsat/computer) +"cJ" = (/obj/structure/table/standard,/obj/item/folder/yellow,/obj/item/folder/yellow,/obj/machinery/light{dir = 1},/obj/machinery/camera/network/telecom{c_tag = "Telecoms Main Computer Room"},/obj/machinery/firealarm{dir = 2; layer = 3.3; pixel_x = 0; pixel_y = 26},/turf/simulated/floor/tiled/dark,/area/tcommsat/computer) "cK" = (/obj/structure/filingcabinet,/turf/simulated/floor/tiled/dark,/area/tcommsat/computer) "cL" = (/obj/machinery/alarm{frequency = 1441; pixel_y = 22},/turf/simulated/floor/tiled/dark,/area/tcommsat/computer) -"cM" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin,/obj/item/weapon/pen/blue{pixel_x = -3; pixel_y = 2},/turf/simulated/floor/tiled/dark,/area/tcommsat/computer) +"cM" = (/obj/structure/table/standard,/obj/item/paper_bin,/obj/item/pen/blue{pixel_x = -3; pixel_y = 2},/turf/simulated/floor/tiled/dark,/area/tcommsat/computer) "cN" = (/turf/simulated/floor/tiled,/area/tcommsat/computer) -"cO" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor/tiled/dark,/area/tcommsat/computer) -"cP" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = -29; pixel_y = 0},/turf/simulated/floor/tiled,/area/tcommsat/computer) -"cQ" = (/obj/machinery/computer/telecomms/monitor{network = "tcommsat"},/obj/item/device/radio/intercom{name = "General Listening Channel"; pixel_x = 28; pixel_y = 0},/turf/simulated/floor/tiled/dark,/area/tcommsat/computer) +"cO" = (/obj/structure/table/standard,/obj/item/flashlight/lamp,/turf/simulated/floor/tiled/dark,/area/tcommsat/computer) +"cP" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_x = -29; pixel_y = 0},/turf/simulated/floor/tiled,/area/tcommsat/computer) +"cQ" = (/obj/machinery/computer/telecomms/monitor{network = "tcommsat"},/obj/item/radio/intercom{name = "General Listening Channel"; pixel_x = 28; pixel_y = 0},/turf/simulated/floor/tiled/dark,/area/tcommsat/computer) "cR" = (/obj/structure/window/reinforced{dir = 4},/turf/space,/area/tcomsat) "cS" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/plating,/area/tcomsat) "cT" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/plating,/area/tcomsat) @@ -134,12 +134,12 @@ "cV" = (/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tcomsat) "cW" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/closet,/turf/simulated/floor/plating,/area/tcomsat) "cX" = (/obj/structure/window/reinforced{dir = 8},/turf/space,/area/tcomsat) -"cY" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5; icon_state = "intact"},/turf/simulated/floor/tiled,/area/tcommsat/computer) +"cY" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5; icon_state = "intact"},/turf/simulated/floor/tiled,/area/tcommsat/computer) "cZ" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4; icon_state = "intact"},/turf/simulated/floor/tiled,/area/tcommsat/computer) "da" = (/obj/structure/bed/chair/office/dark{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4; icon_state = "intact"},/turf/simulated/floor/tiled,/area/tcommsat/computer) "db" = (/obj/machinery/atmospherics/pipe/simple/hidden{ icon_state = "intact"; dir = 4},/turf/simulated/floor/tiled,/area/tcommsat/computer) "dc" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10; icon_state = "intact"},/turf/simulated/floor/tiled,/area/tcommsat/computer) -"dd" = (/obj/item/weapon/bedsheet/orange,/obj/machinery/light{dir = 8},/obj/structure/bed/padded,/turf/simulated/floor/tiled,/area/tcommsat/computer) +"dd" = (/obj/item/bedsheet/orange,/obj/machinery/light{dir = 8},/obj/structure/bed/padded,/turf/simulated/floor/tiled,/area/tcommsat/computer) "de" = (/obj/machinery/firealarm{dir = 4; pixel_x = 26},/turf/simulated/floor/tiled,/area/tcommsat/computer) "df" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/lattice,/turf/space,/area/tcomsat) "dg" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/lattice,/turf/space,/area/tcomsat) @@ -157,7 +157,7 @@ "ds" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/tiled,/area/tcommsat/computer) "dt" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/tiled,/area/tcommsat/computer) "du" = (/obj/structure/bed/chair{dir = 8},/obj/structure/sign/deathsposal{pixel_x = 32},/turf/simulated/floor/tiled,/area/tcommsat/computer) -"dv" = (/obj/structure/table/standard,/obj/item/weapon/storage/fancy/cigarettes,/turf/simulated/floor/tiled,/area/tcommsat/computer) +"dv" = (/obj/structure/table/standard,/obj/item/storage/fancy/cigarettes,/turf/simulated/floor/tiled,/area/tcommsat/computer) "dw" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled,/area/tcomsat) "dx" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled,/area/tcomsat) "dy" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/tcomsat) @@ -171,7 +171,7 @@ "dG" = (/turf/simulated/wall/r_wall,/area/tcommsat/chamber) "dH" = (/obj/machinery/vending/cola,/turf/simulated/floor/tiled,/area/tcommsat/computer) "dI" = (/obj/machinery/vending/snack,/turf/simulated/floor/tiled,/area/tcommsat/computer) -"dJ" = (/obj/item/weapon/cigbutt,/obj/machinery/light,/turf/simulated/floor/tiled,/area/tcommsat/computer) +"dJ" = (/obj/item/cigbutt,/obj/machinery/light,/turf/simulated/floor/tiled,/area/tcommsat/computer) "dK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/tcommsat/computer) "dL" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/tiled,/area/tcommsat/computer) "dM" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/tiled,/area/tcommsat/computer) @@ -184,7 +184,7 @@ "dT" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/space,/area/tcomsat) "dU" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/lattice,/obj/machinery/light,/turf/space,/area/tcomsat) "dV" = (/obj/structure/window/reinforced{dir = 1},/turf/space,/area/tcomsat) -"dW" = (/obj/machinery/light{dir = 8},/obj/structure/table/standard,/obj/item/device/multitool,/obj/structure/sign/electricshock{pixel_x = -32},/turf/simulated/floor/tiled/dark,/area/tcommsat/computer) +"dW" = (/obj/machinery/light{dir = 8},/obj/structure/table/standard,/obj/item/multitool,/obj/structure/sign/electricshock{pixel_x = -32},/turf/simulated/floor/tiled/dark,/area/tcommsat/computer) "dX" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/tcommsat/computer) "dY" = (/obj/machinery/atmospherics/unary/freezer{dir = 2; icon_state = "freezer_1"; set_temperature = 73; use_power = 1},/turf/simulated/floor/tiled/dark,/area/tcommsat/computer) "dZ" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5; icon_state = "intact"},/obj/machinery/airlock_sensor/airlock_exterior{frequency = 1381; id_tag = "server_access_ex_sensor"; master_tag = "server_access_airlock"; pixel_x = 25; pixel_y = 22},/turf/simulated/floor/tiled,/area/tcommsat/computer) @@ -230,13 +230,13 @@ "eN" = (/obj/machinery/telecomms/server/presets/service,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "eO" = (/obj/machinery/telecomms/server/presets/supply,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "eP" = (/obj/machinery/telecomms/server/presets/unused,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) -"eQ" = (/obj/structure/table/rack,/obj/item/weapon/circuitboard/telecomms/processor,/obj/item/weapon/circuitboard/telecomms/processor,/obj/item/weapon/circuitboard/telecomms/receiver,/obj/item/weapon/circuitboard/telecomms/server,/obj/item/weapon/circuitboard/telecomms/server,/obj/item/weapon/circuitboard/telecomms/bus,/obj/item/weapon/circuitboard/telecomms/bus,/obj/item/weapon/circuitboard/telecomms/broadcaster,/obj/item/weapon/circuitboard/telecomms/exonet_node,/turf/simulated/floor,/area/tcomsat) +"eQ" = (/obj/structure/table/rack,/obj/item/circuitboard/telecomms/processor,/obj/item/circuitboard/telecomms/processor,/obj/item/circuitboard/telecomms/receiver,/obj/item/circuitboard/telecomms/server,/obj/item/circuitboard/telecomms/server,/obj/item/circuitboard/telecomms/bus,/obj/item/circuitboard/telecomms/bus,/obj/item/circuitboard/telecomms/broadcaster,/obj/item/circuitboard/telecomms/exonet_node,/turf/simulated/floor,/area/tcomsat) "eR" = (/obj/machinery/telecomms/server/presets/common,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "eS" = (/obj/machinery/telecomms/server/presets/engineering,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "eT" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/space,/area/tcomsat) "eU" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor/tiled,/area/tcomsat) "eV" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/tcomsat) -"eW" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/micro_laser,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/capacitor,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/turf/simulated/floor,/area/tcomsat) +"eW" = (/obj/structure/table/standard,/obj/item/stock_parts/micro_laser,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/capacitor,/obj/item/stock_parts/micro_laser/high,/obj/item/stock_parts/micro_laser/high,/obj/item/stock_parts/micro_laser/high,/obj/item/stock_parts/micro_laser/high,/turf/simulated/floor,/area/tcomsat) "eX" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/camera/network/telecom{c_tag = "Telecoms Storage"},/turf/simulated/floor,/area/tcomsat) "eY" = (/obj/machinery/teleport/hub,/turf/simulated/floor/tiled/dark,/area/tcommsat/entrance) "eZ" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/camera/network/telecom{c_tag = "Telecoms West Wing Central"; dir = 8},/turf/space,/area/tcomsat) @@ -244,8 +244,8 @@ "fb" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/lattice,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/space,/area/tcomsat) "fc" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/tcomsat) "fd" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/space,/area/tcomsat) -"fe" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/machinery/firealarm{dir = 4; pixel_x = 26},/turf/simulated/floor,/area/tcomsat) -"ff" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/subspace/treatment,/obj/item/weapon/stock_parts/subspace/treatment,/obj/item/weapon/stock_parts/subspace/treatment,/turf/simulated/floor,/area/tcomsat) +"fe" = (/obj/structure/table/standard,/obj/item/stock_parts/subspace/analyzer,/obj/item/stock_parts/subspace/analyzer,/obj/item/stock_parts/subspace/analyzer,/obj/machinery/firealarm{dir = 4; pixel_x = 26},/turf/simulated/floor,/area/tcomsat) +"ff" = (/obj/structure/table/standard,/obj/item/stock_parts/subspace/treatment,/obj/item/stock_parts/subspace/treatment,/obj/item/stock_parts/subspace/treatment,/turf/simulated/floor,/area/tcomsat) "fg" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor,/area/tcomsat) "fh" = (/obj/machinery/telecomms/hub/preset,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "fi" = (/obj/machinery/teleport/station,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/airless,/area/AIsattele) @@ -266,7 +266,7 @@ "fx" = (/obj/machinery/telecomms/receiver/preset_right,/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "fy" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor,/area/tcomsat) "fz" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor,/area/tcomsat) -"fA" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/subspace/amplifier,/obj/item/weapon/stock_parts/subspace/amplifier,/obj/item/weapon/stock_parts/subspace/amplifier,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = 29; pixel_y = 0},/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/tcomsat) +"fA" = (/obj/structure/table/standard,/obj/item/stock_parts/subspace/amplifier,/obj/item/stock_parts/subspace/amplifier,/obj/item/stock_parts/subspace/amplifier,/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_x = 29; pixel_y = 0},/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/tcomsat) "fB" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'LETHAL TURRETS'. Enter at your own risk!"; name = "LETHAL TURRETS"; pixel_x = -32; pixel_y = 0},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/tiled/dark,/area/tcomfoyer) "fC" = (/obj/machinery/turretid/lethal{ailock = 1; check_synth = 1; control_area = "\improper Telecoms Satellite"; desc = "A firewall prevents AIs from interacting with this device."; name = "Telecoms lethal turret control"; pixel_y = 29; req_access = list(61)},/obj/machinery/camera/network/telecom{c_tag = "Telecoms Foyer"},/turf/simulated/floor/tiled/dark,/area/tcomsat) "fD" = (/obj/machinery/telecomms/processor/preset_one,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) @@ -276,12 +276,12 @@ "fH" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/space,/area/tcomsat) "fI" = (/obj/machinery/door/airlock/maintenance_hatch{name = "Telecoms Storage"; req_access = list(61)},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/tiled,/area/tcomsat) "fJ" = (/turf/simulated/floor,/area/tcomsat) -"fK" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor,/area/tcomsat) +"fK" = (/obj/item/storage/toolbox/mechanical,/turf/simulated/floor,/area/tcomsat) "fL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tcomsat) -"fM" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/subspace/ansible,/obj/item/weapon/stock_parts/subspace/ansible,/obj/item/weapon/stock_parts/subspace/ansible,/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/turf/simulated/floor,/area/tcomsat) -"fN" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/subspace/transmitter,/obj/item/weapon/stock_parts/subspace/transmitter,/turf/simulated/floor,/area/tcomsat) -"fO" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/subspace/sub_filter,/obj/item/weapon/stock_parts/subspace/sub_filter,/obj/item/weapon/stock_parts/subspace/sub_filter,/obj/item/weapon/stock_parts/subspace/sub_filter,/obj/item/weapon/stock_parts/subspace/sub_filter,/turf/simulated/floor,/area/tcomsat) -"fP" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/subspace/crystal,/obj/item/weapon/stock_parts/subspace/crystal,/obj/item/weapon/stock_parts/subspace/crystal,/turf/simulated/floor,/area/tcomsat) +"fM" = (/obj/structure/table/standard,/obj/item/stock_parts/subspace/ansible,/obj/item/stock_parts/subspace/ansible,/obj/item/stock_parts/subspace/ansible,/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/turf/simulated/floor,/area/tcomsat) +"fN" = (/obj/structure/table/standard,/obj/item/stock_parts/subspace/transmitter,/obj/item/stock_parts/subspace/transmitter,/turf/simulated/floor,/area/tcomsat) +"fO" = (/obj/structure/table/standard,/obj/item/stock_parts/subspace/sub_filter,/obj/item/stock_parts/subspace/sub_filter,/obj/item/stock_parts/subspace/sub_filter,/obj/item/stock_parts/subspace/sub_filter,/obj/item/stock_parts/subspace/sub_filter,/turf/simulated/floor,/area/tcomsat) +"fP" = (/obj/structure/table/standard,/obj/item/stock_parts/subspace/crystal,/obj/item/stock_parts/subspace/crystal,/obj/item/stock_parts/subspace/crystal,/turf/simulated/floor,/area/tcomsat) "fQ" = (/obj/machinery/telecomms/server/presets/medical,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "fR" = (/obj/machinery/telecomms/server/presets/science,/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "fS" = (/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 9},/turf/simulated/floor/tiled/dark{nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) @@ -321,7 +321,7 @@ "gA" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/tcomfoyer) "gB" = (/turf/simulated/wall/r_wall,/area/tcommsat/entrance) "gC" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'LETHAL TURRETS'. Enter at your own risk!"; name = "LETHAL TURRETS"; pixel_x = -32; pixel_y = 0},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled/dark,/area/tcomfoyer) -"gD" = (/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 20},/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/tiled,/area/tcomfoyer) +"gD" = (/obj/item/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 20},/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/tiled,/area/tcomfoyer) "gE" = (/turf/simulated/floor/tiled,/area/tcommsat/entrance) "gG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/tcommsat/entrance) "gI" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/hatch{name = "Telecoms Satellite"; req_access = list(61)},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/firedoor,/turf/simulated/floor/tiled,/area/tcomfoyer) @@ -370,18 +370,18 @@ "hB" = (/obj/structure/sign/electricshock,/turf/simulated/wall/r_wall,/area/tcommsat/powercontrol) "hC" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/tcommsat/entrance) "hD" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled/dark,/area/tcommsat/entrance) -"hE" = (/obj/item/weapon/cell,/turf/simulated/floor/tiled/dark,/area/tcommsat/entrance) +"hE" = (/obj/item/cell,/turf/simulated/floor/tiled/dark,/area/tcommsat/entrance) "hH" = (/obj/structure/closet/malf/suits,/turf/simulated/floor/tiled/dark,/area/tcommsat/entrance) "hI" = (/obj/machinery/door/airlock/hatch{name = "Power Control"; req_access = list(61)},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/tcommsat/powercontrol) -"hJ" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled/dark,/area/tcommsat/entrance) +"hJ" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled/dark,/area/tcommsat/entrance) "hM" = (/turf/space,/area/syndicate_station/commssat) "hN" = (/turf/simulated/wall/r_wall,/area/AIsattele) "hQ" = (/turf/simulated/floor/airless,/area/AIsattele) -"hR" = (/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/floor/airless,/area/AIsattele) +"hR" = (/obj/item/material/shard{icon_state = "medium"},/turf/simulated/floor/airless,/area/AIsattele) "hS" = (/obj/structure/cable,/turf/simulated/floor/airless,/area/AIsattele) "hT" = (/obj/structure/table/rack,/obj/item/clothing/gloves/yellow,/turf/simulated/floor/airless,/area/AIsattele) "hU" = (/obj/structure/girder,/turf/simulated/floor/airless,/area/AIsattele) -"hV" = (/obj/item/weapon/cell,/turf/simulated/floor/airless,/area/AIsattele) +"hV" = (/obj/item/cell,/turf/simulated/floor/airless,/area/AIsattele) "hW" = (/obj/structure/grille/broken,/turf/simulated/floor/airless,/area/AIsattele) "hX" = (/turf/space,/area/AIsattele) "hY" = (/obj/structure/table,/turf/simulated/floor/airless,/area/AIsattele) @@ -389,13 +389,13 @@ "ia" = (/obj/structure/closet,/turf/simulated/floor/airless,/area/AIsattele) "ib" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/airless,/area/AIsattele) "ic" = (/obj/structure/grille/broken,/turf/space,/area/AIsattele) -"id" = (/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/turf/simulated/floor/airless,/area/AIsattele) +"id" = (/obj/item/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/turf/simulated/floor/airless,/area/AIsattele) "ie" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/table/standard,/obj/machinery/cell_charger,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plating,/area/tcommsat/powercontrol) "if" = (/obj/structure/closet/crate,/obj/item/clothing/glasses/night,/turf/simulated/floor/tiled/dark,/area/tcommsat/entrance) -"ig" = (/obj/structure/closet/crate,/obj/item/device/aicard,/obj/item/device/multitool,/obj/machinery/camera/network/telecom{c_tag = "Telecoms Entrance South"; dir = 1},/turf/simulated/floor/tiled/dark,/area/tcommsat/entrance) +"ig" = (/obj/structure/closet/crate,/obj/item/aicard,/obj/item/multitool,/obj/machinery/camera/network/telecom{c_tag = "Telecoms Entrance South"; dir = 1},/turf/simulated/floor/tiled/dark,/area/tcommsat/entrance) "ih" = (/obj/machinery/light{dir = 4},/obj/structure/closet/emcloset,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled/dark,/area/tcommsat/entrance) "ij" = (/obj/machinery/computer/teleporter,/turf/simulated/floor/tiled/dark,/area/tcommsat/entrance) -"im" = (/obj/item/weapon/circuitboard/teleporter,/turf/space,/area/space) +"im" = (/obj/item/circuitboard/teleporter,/turf/space,/area/space) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/northern_star/polaris-4.dmm b/maps/northern_star/polaris-4.dmm index f16d1ee23d2..d1350723a6b 100644 --- a/maps/northern_star/polaris-4.dmm +++ b/maps/northern_star/polaris-4.dmm @@ -6,7 +6,7 @@ "af" = (/turf/simulated/floor/airless,/area/mine/explored) "ag" = (/obj/machinery/door/airlock/glass_command{name = "Bridge"; req_access = list(19)},/turf/simulated/floor/airless,/area/mine/explored) "ah" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored) -"ai" = (/obj/item/weapon/circuitboard/teleporter,/turf/simulated/floor/airless,/area/mine/explored) +"ai" = (/obj/item/circuitboard/teleporter,/turf/simulated/floor/airless,/area/mine/explored) "aj" = (/obj/structure/girder,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored) "ak" = (/obj/structure/frame/computer,/turf/simulated/floor/airless,/area/mine/explored) "al" = (/obj/machinery/teleport/station,/turf/simulated/floor/airless,/area/mine/explored) @@ -16,20 +16,20 @@ "ap" = (/obj/machinery/optable,/turf/simulated/floor/tiled/white/airless,/area/mine/explored) "aq" = (/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/mine/explored) "ar" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/unexplored) -"as" = (/obj/item/weapon/ore,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/unexplored) +"as" = (/obj/item/ore,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/unexplored) "at" = (/obj/structure/girder,/turf/simulated/floor/airless,/area/wreck/main) "au" = (/turf/simulated/wall/skipjack,/area/wreck/main) "av" = (/turf/simulated/floor/airless,/area/wreck/main) "aw" = (/obj/effect/floor_decal/asteroid,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/unexplored) "ax" = (/obj/item/stack/material/steel,/turf/simulated/floor/airless,/area/wreck/main) "ay" = (/obj/item/stack/rods,/turf/simulated/floor/airless,/area/wreck/main) -"az" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/stack/rods,/turf/simulated/floor/airless,/area/wreck/main) -"aA" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/surgical/scalpel/laser3,/turf/simulated/floor/tiled/airless,/area/wreck/main) -"aB" = (/obj/item/weapon/surgical/circular_saw,/turf/simulated/floor/tiled/airless,/area/wreck/main) +"az" = (/obj/structure/table/steel_reinforced,/obj/item/reagent_containers/syringe/antiviral,/obj/item/stack/rods,/turf/simulated/floor/airless,/area/wreck/main) +"aA" = (/obj/structure/table/steel_reinforced,/obj/item/surgical/scalpel/laser3,/turf/simulated/floor/tiled/airless,/area/wreck/main) +"aB" = (/obj/item/surgical/circular_saw,/turf/simulated/floor/tiled/airless,/area/wreck/main) "aC" = (/obj/structure/table/steel_reinforced,/turf/simulated/floor/airless,/area/wreck/main) "aD" = (/obj/structure/table/steel_reinforced,/turf/simulated/floor/tiled/airless,/area/wreck/main) "aE" = (/obj/effect/decal/mecha_wreckage/phazon,/turf/simulated/floor/airless,/area/wreck/main) -"aF" = (/obj/item/weapon/ore,/turf/simulated/floor/airless,/area/wreck/main) +"aF" = (/obj/item/ore,/turf/simulated/floor/airless,/area/wreck/main) "aG" = (/turf/simulated/shuttle/wall,/area/wreck/main) "aH" = (/obj/machinery/door/airlock/hatch,/turf/simulated/floor/airless,/area/wreck/main) "aI" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/tiled/white/airless,/area/wreck/main) @@ -37,44 +37,44 @@ "aK" = (/turf/simulated/floor/tiled/airless,/area/wreck/main) "aL" = (/obj/effect/floor_decal/asteroid,/obj/effect/decal/cleanable/molten_item,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/unexplored) "aM" = (/obj/effect/decal/mecha_wreckage/gygax/dark,/turf/simulated/floor/airless,/area/wreck/main) -"aN" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/airless,/area/wreck/main) +"aN" = (/obj/item/storage/toolbox/mechanical,/turf/simulated/floor/airless,/area/wreck/main) "aO" = (/obj/structure/table/rack,/turf/simulated/floor/airless,/area/wreck/main) "aP" = (/obj/structure/table/rack,/obj/item/stack/cable_coil/yellow,/turf/simulated/floor/airless,/area/wreck/main) "aQ" = (/obj/effect/decal/cleanable/blood/gibs/robot/down,/turf/simulated/floor/airless,/area/wreck/main) "aR" = (/obj/machinery/optable,/obj/effect/decal/remains/xeno,/obj/effect/decal/cleanable/blood/xeno,/turf/simulated/floor/tiled/white/airless,/area/wreck/main) -"aS" = (/obj/item/weapon/material/shard/shrapnel,/turf/simulated/floor/airless,/area/wreck/main) +"aS" = (/obj/item/material/shard/shrapnel,/turf/simulated/floor/airless,/area/wreck/main) "aT" = (/obj/structure/table/rack,/turf/simulated/floor/tiled/airless,/area/wreck/main) "aU" = (/obj/machinery/door/airlock/glass_medical{name = "Medbay"; req_one_access = list(65,5)},/turf/simulated/floor/tiled/white/airless,/area/mine/explored) "aV" = (/obj/effect/decal/cleanable/blood/xeno,/turf/simulated/floor/tiled/white/airless,/area/wreck/main) -"aW" = (/obj/item/weapon/ore,/obj/item/stack/rods,/turf/simulated/floor/airless,/area/wreck/main) +"aW" = (/obj/item/ore,/obj/item/stack/rods,/turf/simulated/floor/airless,/area/wreck/main) "aX" = (/obj/effect/overlay/wallrot,/turf/simulated/wall/skipjack,/area/wreck/main) "aY" = (/obj/machinery/door/airlock/hatch,/turf/simulated/floor/tiled/white/airless,/area/wreck/main) "aZ" = (/obj/structure/window/phoronreinforced,/turf/simulated/floor/tiled/airless,/area/wreck/main) -"ba" = (/obj/item/device/flashlight/flare,/turf/simulated/floor/tiled/airless,/area/wreck/main) -"bb" = (/obj/item/stack/material/wood,/obj/item/stack/material/wood,/obj/structure/ore_box,/obj/item/weapon/ore/iron,/obj/item/weapon/ore/iron,/obj/item/weapon/ore/iron,/turf/simulated/floor/airless,/area/wreck/main) +"ba" = (/obj/item/flashlight/flare,/turf/simulated/floor/tiled/airless,/area/wreck/main) +"bb" = (/obj/item/stack/material/wood,/obj/item/stack/material/wood,/obj/structure/ore_box,/obj/item/ore/iron,/obj/item/ore/iron,/obj/item/ore/iron,/turf/simulated/floor/airless,/area/wreck/main) "bc" = (/obj/item/clothing/head/helmet/space/deathsquad,/obj/structure/table/rack,/obj/effect/decal/cleanable/molten_item,/turf/simulated/floor/tiled/airless,/area/wreck/main) "bd" = (/obj/structure/grille,/turf/simulated/floor/airless{icon_state = "white"},/area/mine/explored) "be" = (/obj/machinery/crystal,/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 1},/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced,/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel,/turf/simulated/floor/reinforced/phoron,/area/wreck/main) "bf" = (/obj/machinery/compressor{dir = 4},/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 8},/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 1},/turf/simulated/floor/reinforced/phoron,/area/wreck/main) -"bg" = (/obj/item/device/gps,/turf/simulated/floor/tiled/airless,/area/wreck/main) +"bg" = (/obj/item/gps,/turf/simulated/floor/tiled/airless,/area/wreck/main) "bh" = (/obj/structure/ore_box,/turf/simulated/floor/airless,/area/wreck/main) -"bi" = (/obj/item/weapon/circuitboard/broken,/turf/simulated/floor/tiled/airless,/area/wreck/main) +"bi" = (/obj/item/circuitboard/broken,/turf/simulated/floor/tiled/airless,/area/wreck/main) "bj" = (/obj/structure/closet/acloset,/turf/simulated/floor/tiled/airless,/area/wreck/main) -"bk" = (/obj/item/weapon/ore,/turf/simulated/floor/tiled/white/airless,/area/wreck/main) +"bk" = (/obj/item/ore,/turf/simulated/floor/tiled/white/airless,/area/wreck/main) "bl" = (/obj/structure/bed,/turf/simulated/floor/tiled/white/airless,/area/wreck/main) "bm" = (/obj/item/clothing/under/color/pink,/obj/structure/table/steel_reinforced,/turf/simulated/floor/tiled/white/airless,/area/wreck/main) -"bn" = (/obj/structure/table/rack,/obj/item/weapon/tank/jetpack/void,/obj/item/clothing/suit/space/syndicate/green,/obj/item/clothing/head/helmet/space/syndicate/green,/turf/simulated/floor/tiled/airless,/area/wreck/main) +"bn" = (/obj/structure/table/rack,/obj/item/tank/jetpack/void,/obj/item/clothing/suit/space/syndicate/green,/obj/item/clothing/head/helmet/space/syndicate/green,/turf/simulated/floor/tiled/airless,/area/wreck/main) "bo" = (/obj/effect/wingrille_spawn/phoron,/turf/simulated/floor/tiled/airless,/area/wreck/main) -"bp" = (/obj/structure/table/rack,/obj/item/weapon/material/shard/shrapnel,/turf/simulated/floor/tiled/airless,/area/wreck/main) +"bp" = (/obj/structure/table/rack,/obj/item/material/shard/shrapnel,/turf/simulated/floor/tiled/airless,/area/wreck/main) "bq" = (/obj/item/broken_device,/obj/structure/bed/chair{dir = 8},/obj/effect/decal/remains/robot,/turf/simulated/floor/tiled/airless,/area/wreck/main) "br" = (/obj/effect/decal/cleanable/blood/oil/streak,/turf/simulated/floor/tiled/airless,/area/wreck/main) -"bs" = (/obj/item/weapon/tank/oxygen/yellow,/turf/simulated/floor/tiled/airless,/area/wreck/main) +"bs" = (/obj/item/tank/oxygen/yellow,/turf/simulated/floor/tiled/airless,/area/wreck/main) "bt" = (/obj/effect/decal/cleanable/blood/gibs/robot/down,/turf/simulated/floor/tiled/airless,/area/wreck/main) "bu" = (/obj/structure/bed/chair/comfy/brown{dir = 8},/turf/simulated/floor/tiled/airless,/area/wreck/main) "bv" = (/obj/effect/decal/cleanable/vomit,/turf/simulated/floor/tiled/airless,/area/wreck/main) "bw" = (/obj/structure/AIcore,/turf/simulated/floor/tiled/airless,/area/wreck/main) -"bx" = (/obj/item/frame/apc,/obj/item/weapon/module/power_control,/obj/item/weapon/material/shard/shrapnel,/turf/simulated/floor/tiled/white/airless,/area/wreck/main) -"by" = (/obj/item/device/flashlight/glowstick,/turf/simulated/floor/tiled/airless,/area/wreck/main) +"bx" = (/obj/item/frame/apc,/obj/item/module/power_control,/obj/item/material/shard/shrapnel,/turf/simulated/floor/tiled/white/airless,/area/wreck/main) +"by" = (/obj/item/flashlight/glowstick,/turf/simulated/floor/tiled/airless,/area/wreck/main) "bz" = (/obj/machinery/door/airlock/hatch,/turf/simulated/floor/tiled/airless,/area/wreck/main) "bA" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/tiled/airless,/area/wreck/main) "bB" = (/obj/item/robot_parts/head,/turf/simulated/floor/tiled/airless,/area/wreck/main) @@ -96,11 +96,11 @@ "bU" = (/obj/structure/table/rack,/obj/item/clothing/glasses/welding,/turf/simulated/floor/tiled/airless,/area/wreck/main) "bV" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/airless,/area/wreck/main) "bW" = (/obj/item/frame/light,/turf/simulated/floor/airless,/area/wreck/main) -"bX" = (/obj/effect/decal/mecha_wreckage/mauler,/obj/item/weapon/material/shard/shrapnel,/turf/simulated/floor/airless,/area/wreck/main) +"bX" = (/obj/effect/decal/mecha_wreckage/mauler,/obj/item/material/shard/shrapnel,/turf/simulated/floor/airless,/area/wreck/main) "bY" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/airless,/area/wreck/main) "bZ" = (/obj/item/stack/material/steel,/obj/item/stack/rods,/turf/simulated/floor/airless,/area/wreck/main) -"ca" = (/obj/structure/table/rack,/obj/item/weapon/storage/toolbox/syndicate,/turf/simulated/floor/airless,/area/wreck/main) -"cb" = (/obj/item/weapon/circuitboard/teleporter,/turf/simulated/floor/tiled/white/airless,/area/wreck/main) +"ca" = (/obj/structure/table/rack,/obj/item/storage/toolbox/syndicate,/turf/simulated/floor/airless,/area/wreck/main) +"cb" = (/obj/item/circuitboard/teleporter,/turf/simulated/floor/tiled/white/airless,/area/wreck/main) "cc" = (/obj/machinery/teleport/station,/turf/simulated/floor/tiled/airless,/area/wreck/main) "cd" = (/obj/structure/frame/computer,/turf/simulated/floor/tiled/airless,/area/wreck/main) "ce" = (/obj/machinery/teleport/hub,/turf/simulated/floor/tiled/airless,/area/wreck/main) @@ -112,12 +112,12 @@ "cp" = (/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/outpost/abandoned) "cq" = (/turf/simulated/wall/r_wall,/area/outpost/abandoned) "cr" = (/turf/simulated/floor/airless,/area/outpost/abandoned) -"cs" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/grille{density = 0; icon_state = "brokengrille"},/obj/item/weapon/material/shard,/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/floor/airless,/area/outpost/abandoned) +"cs" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/grille{density = 0; icon_state = "brokengrille"},/obj/item/material/shard,/obj/item/material/shard{icon_state = "medium"},/turf/simulated/floor/airless,/area/outpost/abandoned) "ct" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/abandoned) "cu" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/abandoned) "cv" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/abandoned) "cw" = (/turf/simulated/floor,/area/outpost/abandoned) -"cx" = (/obj/item/weapon/material/shard/shrapnel,/turf/simulated/floor/airless,/area/outpost/abandoned) +"cx" = (/obj/item/material/shard/shrapnel,/turf/simulated/floor/airless,/area/outpost/abandoned) "cy" = (/turf/simulated/floor/tiled,/area/outpost/abandoned) "cz" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/abandoned) "cA" = (/obj/machinery/door/airlock/external,/turf/simulated/floor,/area/outpost/abandoned) @@ -152,7 +152,7 @@ "dd" = (/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/outpost/abandoned) "de" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/outpost/abandoned) "df" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor,/area/outpost/abandoned) -"dg" = (/obj/structure/table/rack,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/turf/simulated/floor,/area/outpost/abandoned) +"dg" = (/obj/structure/table/rack,/obj/item/pickaxe,/obj/item/pickaxe,/obj/item/pickaxe,/obj/item/pickaxe,/turf/simulated/floor,/area/outpost/abandoned) "dh" = (/obj/structure/table/rack,/turf/simulated/floor/tiled,/area/outpost/abandoned) "di" = (/obj/structure/table/rack,/obj/random/tech_supply,/obj/item/stack/cable_coil/yellow,/turf/simulated/floor/tiled,/area/outpost/abandoned) "dj" = (/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = -28},/obj/machinery/atmospherics/pipe/simple/visible/cyan{ icon_state = "intact"; dir = 5},/turf/simulated/floor,/area/outpost/abandoned) @@ -189,7 +189,7 @@ "dO" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/outpost/abandoned) "dP" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled,/area/outpost/abandoned) "dQ" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/outpost/abandoned) -"dR" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/item/frame/apc,/obj/item/weapon/module/power_control,/turf/simulated/floor,/area/outpost/abandoned) +"dR" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/item/frame/apc,/obj/item/module/power_control,/turf/simulated/floor,/area/outpost/abandoned) "dS" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/smes/buildable,/turf/simulated/floor,/area/outpost/abandoned) "dT" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'COMPRESSED GAS'."; name = "COMPRESSED GAS"; pixel_x = -32; pixel_y = 0},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor,/area/outpost/abandoned) "dU" = (/obj/machinery/atmospherics/pipe/simple/visible/blue,/obj/machinery/atmospherics/pipe/simple/visible/red{ icon_state = "intact"; dir = 4},/turf/simulated/floor,/area/outpost/abandoned) @@ -219,7 +219,7 @@ "es" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/manifold/hidden,/turf/simulated/floor/tiled,/area/outpost/abandoned) "et" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/outpost/abandoned) "eu" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/outpost/abandoned) -"ev" = (/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -28},/turf/simulated/floor/tiled,/area/outpost/abandoned) +"ev" = (/obj/item/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -28},/turf/simulated/floor/tiled,/area/outpost/abandoned) "ew" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/outpost/abandoned) "ex" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor,/area/outpost/abandoned) "ey" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/outpost/abandoned) @@ -238,7 +238,7 @@ "eL" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/abandoned) "eM" = (/obj/structure/frame/computer,/turf/simulated/floor/tiled,/area/outpost/abandoned) "eN" = (/obj/structure/table/steel,/obj/machinery/cell_charger,/obj/machinery/alarm{frequency = 1439; pixel_y = 22},/turf/simulated/floor/tiled,/area/outpost/abandoned) -"eO" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/orange,/turf/simulated/floor/tiled,/area/outpost/abandoned) +"eO" = (/obj/structure/bed/padded,/obj/item/bedsheet/orange,/turf/simulated/floor/tiled,/area/outpost/abandoned) "eP" = (/obj/structure/toilet{dir = 4},/turf/simulated/floor/tiled,/area/outpost/abandoned) "eQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/outpost/abandoned) "eR" = (/obj/structure/bed/chair/office/dark{dir = 1},/turf/simulated/floor/tiled,/area/outpost/abandoned) @@ -276,16 +276,16 @@ "fx" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/abandoned) "fy" = (/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored) "fz" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/abandoned) -"fA" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/motor,/turf/simulated/floor/tiled,/area/outpost/abandoned) +"fA" = (/obj/structure/table/standard,/obj/item/stock_parts/motor,/turf/simulated/floor/tiled,/area/outpost/abandoned) "fB" = (/obj/structure/table/standard,/turf/simulated/floor/tiled,/area/outpost/abandoned) "fC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/abandoned) "fD" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/abandoned) -"fE" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/regular,/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = -28},/turf/simulated/floor/tiled,/area/outpost/abandoned) +"fE" = (/obj/structure/table/standard,/obj/item/storage/firstaid/regular,/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = -28},/turf/simulated/floor/tiled,/area/outpost/abandoned) "fF" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/outpost/abandoned) "fG" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/abandoned) "fH" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/abandoned) "fI" = (/obj/structure/lattice,/obj/structure/grille{density = 0; icon_state = "brokengrille"},/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored) -"fJ" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/grille{density = 0; icon_state = "brokengrille"},/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/floor/airless,/area/outpost/abandoned) +"fJ" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/grille{density = 0; icon_state = "brokengrille"},/obj/item/material/shard{icon_state = "medium"},/turf/simulated/floor/airless,/area/outpost/abandoned) "fK" = (/obj/structure/closet/emcloset,/turf/simulated/floor,/area/outpost/abandoned) "fL" = (/obj/structure/grille,/turf/space,/area/space) "fM" = (/obj/structure/lattice,/obj/structure/grille{density = 0; icon_state = "brokengrille"},/turf/space,/area/space) diff --git a/maps/northern_star/polaris-5.dmm b/maps/northern_star/polaris-5.dmm index 99ebb9b1f0a..ab9dd887b5b 100644 --- a/maps/northern_star/polaris-5.dmm +++ b/maps/northern_star/polaris-5.dmm @@ -16,12 +16,12 @@ "ap" = (/obj/structure/closet/emcloset,/turf/simulated/floor/tiled/dark,/area/outpost/research/mixing) "aq" = (/obj/structure/closet/hydrant{pixel_x = -32},/turf/simulated/floor/plating,/area/outpost/research/hallway/toxins_hallway) "ar" = (/turf/simulated/floor/plating,/area/outpost/research/hallway/toxins_hallway) -"as" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/extinguisher,/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/plating,/area/outpost/research/hallway/toxins_hallway) +"as" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/tank/oxygen,/obj/item/tank/oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/flashlight,/obj/item/flashlight,/obj/item/storage/box/lights/mixed,/obj/item/extinguisher,/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/plating,/area/outpost/research/hallway/toxins_hallway) "at" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/outpost/research/tox_store) "au" = (/turf/simulated/floor/tiled/airless,/area/outpost/research/test_area) "av" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/airless,/area/outpost/research/test_area) "aw" = (/obj/structure/dispenser,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/outpost/research/mixing) -"ax" = (/obj/structure/table/standard,/obj/item/weapon/tool/wrench,/obj/item/weapon/tool/screwdriver{pixel_y = 10},/obj/machinery/newscaster{layer = 3.3; pixel_x = 0; pixel_y = 30},/obj/item/weapon/tool/crowbar,/turf/simulated/floor/tiled/white,/area/outpost/research/mixing) +"ax" = (/obj/structure/table/standard,/obj/item/tool/wrench,/obj/item/tool/screwdriver{pixel_y = 10},/obj/machinery/newscaster{layer = 3.3; pixel_x = 0; pixel_y = 30},/obj/item/tool/crowbar,/turf/simulated/floor/tiled/white,/area/outpost/research/mixing) "ay" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled/white,/area/outpost/research/mixing) "az" = (/obj/machinery/requests_console{department = "Science"; departmentType = 2; name = "Science Requests Console"; pixel_x = 30; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/outpost/research/mixing) "aA" = (/turf/simulated/wall,/area/outpost/research/hallway/toxins_hallway) @@ -32,17 +32,17 @@ "aF" = (/obj/machinery/light{dir = 1},/obj/machinery/camera/network/research{c_tag = "Research - Toxins Test Chamber North"; network = list("Research","Toxins Test Area")},/turf/simulated/floor/tiled/airless,/area/outpost/research/test_area) "aG" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 8},/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 1},/turf/simulated/floor/plating,/area/outpost/research/mixing) "aH" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 1},/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced,/turf/simulated/floor/plating,/area/outpost/research/mixing) -"aI" = (/obj/machinery/atmospherics/portables_connector,/obj/machinery/portable_atmospherics/powered/pump,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/mixing) +"aI" = (/obj/machinery/atmospherics/portables_connector,/obj/machinery/portable_atmospherics/powered/pump,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/mixing) "aJ" = (/turf/simulated/floor/tiled/white,/area/outpost/research/mixing) "aK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/outpost/research/mixing) "aL" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 8},/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 1},/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 4},/turf/simulated/floor/plating,/area/outpost/research/mixing) "aM" = (/obj/machinery/portable_atmospherics/powered/pump,/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/corner/purple{dir = 9},/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) "aN" = (/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) -"aO" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) +"aO" = (/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) "aP" = (/obj/machinery/door/airlock/research{name = "Toxins Storage"; req_access = list(8)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/outpost/research/tox_store) "aQ" = (/turf/simulated/floor/tiled,/area/outpost/research/tox_store) "aR" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/outpost/research/tox_store) -"aS" = (/obj/machinery/alarm{pixel_y = 23},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled,/area/outpost/research/tox_store) +"aS" = (/obj/machinery/alarm{pixel_y = 23},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled,/area/outpost/research/tox_store) "aT" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 8},/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced,/turf/simulated/floor/plating,/area/outpost/research/mixing) "aU" = (/obj/machinery/atmospherics/portables_connector,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/white,/area/outpost/research/mixing) "aV" = (/obj/machinery/atmospherics/pipe/manifold/visible/red{ icon_state = "map"; dir = 8},/turf/simulated/floor/tiled/white,/area/outpost/research/mixing) @@ -140,7 +140,7 @@ "cJ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/hallway/toxins_hallway) "cK" = (/obj/effect/floor_decal/corner/purple{dir = 5},/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) "cL" = (/obj/machinery/alarm{pixel_y = 23},/obj/effect/floor_decal/corner/purple{dir = 5},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) -"cM" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Toxins Starboard"; dir = 8},/obj/effect/floor_decal/industrial/warning/corner,/obj/effect/floor_decal/corner/purple{dir = 5},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) +"cM" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Toxins Starboard"; dir = 8},/obj/effect/floor_decal/industrial/warning/corner,/obj/effect/floor_decal/corner/purple{dir = 5},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) "cN" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/disposaloutlet{dir = 1},/obj/structure/disposalpipe/trunk,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/airless,/area/outpost/research/toxins_launch) "cO" = (/obj/machinery/door/window/southright{name = "Toxins Launcher"; req_access = list(8)},/obj/machinery/door/window/southright{dir = 1; name = "Toxins Launcher"; req_access = list(8)},/obj/machinery/door/firedoor/border_only{dir = 2},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plating,/area/outpost/research/toxins_launch) "cP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/toxins_launch) @@ -198,7 +198,7 @@ "dP" = (/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner/purple{dir = 8},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) "dQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/blue{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) "dR" = (/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner/purple,/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) -"dS" = (/obj/structure/cable/blue{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/light,/obj/effect/floor_decal/corner/purple/full{dir = 4},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) +"dS" = (/obj/structure/cable/blue{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/light,/obj/effect/floor_decal/corner/purple/full{dir = 4},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) "dT" = (/turf/simulated/wall/r_wall,/area/outpost/research/toxins_misc_lab) "dU" = (/obj/machinery/door/airlock/research{name = "Toxins Misc Lab"; req_access = list(8)},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/research/toxins_misc_lab) "dV" = (/obj/machinery/disposal,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = -30; pixel_y = 0},/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled,/area/outpost/research/toxins_launch) @@ -219,8 +219,8 @@ "ek" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Toxins Lab Aft"; dir = 8},/turf/simulated/floor/tiled,/area/outpost/research/mixing) "el" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) "em" = (/obj/effect/floor_decal/corner/purple{dir = 6},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) -"en" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 5},/obj/item/weapon/clipboard,/obj/item/weapon/pen,/obj/machinery/alarm{pixel_y = 23},/obj/machinery/newscaster{layer = 3.3; pixel_x = -30; pixel_y = 0},/turf/simulated/floor/tiled,/area/outpost/research/toxins_misc_lab) -"eo" = (/obj/structure/table/standard,/obj/item/weapon/folder,/obj/item/clothing/glasses/science,/obj/machinery/light_switch{pixel_y = 28},/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Toxins Misc Lab"; dir = 2},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/outpost/research/toxins_misc_lab) +"en" = (/obj/structure/table/standard,/obj/item/paper_bin{pixel_x = -2; pixel_y = 5},/obj/item/clipboard,/obj/item/pen,/obj/machinery/alarm{pixel_y = 23},/obj/machinery/newscaster{layer = 3.3; pixel_x = -30; pixel_y = 0},/turf/simulated/floor/tiled,/area/outpost/research/toxins_misc_lab) +"eo" = (/obj/structure/table/standard,/obj/item/folder,/obj/item/clothing/glasses/science,/obj/machinery/light_switch{pixel_y = 28},/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Toxins Misc Lab"; dir = 2},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/outpost/research/toxins_misc_lab) "ep" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/research/toxins_misc_lab) "eq" = (/obj/machinery/light/small{dir = 8; pixel_x = 0},/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored) "er" = (/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/mine/explored) @@ -251,7 +251,7 @@ "eQ" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/effect/floor_decal/corner/purple{dir = 9},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) "eR" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) "eS" = (/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Toxins Aft"; dir = 8},/obj/effect/floor_decal/corner/purple{dir = 6},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) -"eT" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets,/obj/machinery/firealarm{dir = 8; pixel_x = -24; pixel_y = 0},/turf/simulated/floor/tiled,/area/outpost/research/toxins_misc_lab) +"eT" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets,/obj/machinery/firealarm{dir = 8; pixel_x = -24; pixel_y = 0},/turf/simulated/floor/tiled,/area/outpost/research/toxins_misc_lab) "eU" = (/turf/simulated/floor/tiled,/area/outpost/research/toxins_misc_lab) "eV" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled,/area/outpost/research/toxins_misc_lab) "eW" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/outpost/research/toxins_misc_lab) @@ -259,7 +259,7 @@ "eY" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/effect/floor_decal/corner/purple{dir = 9},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) "eZ" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/effect/floor_decal/corner/purple{dir = 6},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) "fa" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/toxins_misc_lab) -"fb" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/purple,/turf/simulated/floor/tiled,/area/outpost/research/toxins_misc_lab) +"fb" = (/obj/structure/bed/padded,/obj/item/bedsheet/purple,/turf/simulated/floor/tiled,/area/outpost/research/toxins_misc_lab) "fc" = (/turf/simulated/floor/tiled/steel,/area/outpost/research/toxins_misc_lab) "fd" = (/turf/simulated/floor/plating,/area/outpost/research/toxins_misc_lab) "fe" = (/obj/structure/closet,/obj/item/clothing/accessory/armband/science,/turf/simulated/floor/tiled,/area/outpost/research/toxins_misc_lab) @@ -278,24 +278,24 @@ "fr" = (/turf/simulated/floor/reinforced,/area/outpost/research/xenobiology) "fs" = (/obj/structure/disposaloutlet{dir = 8},/obj/structure/disposalpipe/trunk,/turf/simulated/floor/reinforced,/area/outpost/research/xenobiology) "ft" = (/turf/simulated/wall,/area/outpost/research/xenobiology) -"fu" = (/obj/structure/table/rack,/obj/item/weapon/storage/toolbox/emergency,/obj/item/clothing/accessory/armband/science,/obj/item/clothing/glasses/science,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/item/device/suit_cooling_unit,/turf/simulated/floor/plating,/area/outpost/research/hallway/toxins_hallway) +"fu" = (/obj/structure/table/rack,/obj/item/storage/toolbox/emergency,/obj/item/clothing/accessory/armband/science,/obj/item/clothing/glasses/science,/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/item/suit_cooling_unit,/turf/simulated/floor/plating,/area/outpost/research/hallway/toxins_hallway) "fv" = (/obj/structure/closet/wardrobe/science_white,/turf/simulated/floor/plating,/area/outpost/research/hallway/toxins_hallway) "fw" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/research{autoclose = 0; frequency = 1379; icon_state = "door_locked"; id_tag = "toxins_airlock_interior"; locked = 1; name = "Toxins Internal Airlock"; req_access = list(7)},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) "fx" = (/obj/machinery/atmospherics/pipe/simple/visible/purple{dir = 6},/obj/machinery/light,/turf/simulated/floor/plating,/area/outpost/research/toxins_misc_lab) -"fy" = (/obj/machinery/atmospherics/pipe/manifold/visible/purple{dir = 4},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/plating,/area/outpost/research/toxins_misc_lab) +"fy" = (/obj/machinery/atmospherics/pipe/manifold/visible/purple{dir = 4},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/plating,/area/outpost/research/toxins_misc_lab) "fz" = (/obj/machinery/atmospherics/pipe/simple/hidden/purple,/turf/simulated/wall/r_wall,/area/outpost/research/toxins_misc_lab) "fA" = (/mob/living/simple_mob/slime/xenobio,/turf/simulated/floor/reinforced,/area/outpost/research/xenobiology) "fB" = (/obj/structure/disposalpipe/segment,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/reinforced,/area/outpost/research/xenobiology) "fC" = (/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/plating,/area/outpost/research/hallway/toxins_hallway) -"fD" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 9},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) +"fD" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 9},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) "fE" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "toxins_airlock_control"; name = "Toxins Access Button"; pixel_x = 26; pixel_y = 26; req_access = list(7)},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) "fF" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Toxins Access"; dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) -"fG" = (/obj/item/weapon/tool/wrench,/obj/structure/table/steel,/turf/simulated/floor/tiled/dark,/area/outpost/research/toxins_misc_lab) +"fG" = (/obj/item/tool/wrench,/obj/structure/table/steel,/turf/simulated/floor/tiled/dark,/area/outpost/research/toxins_misc_lab) "fH" = (/obj/machinery/pipedispenser,/turf/simulated/floor/tiled/dark,/area/outpost/research/toxins_misc_lab) "fI" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored) "fJ" = (/obj/structure/closet/emcloset,/turf/simulated/floor/tiled/dark,/area/outpost/research/xenobiology) "fK" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/reinforced,/area/outpost/research/xenobiology) -"fL" = (/obj/structure/table/standard,/obj/item/weapon/weldingtool,/obj/item/clothing/head/welding,/turf/simulated/floor/tiled/dark,/area/outpost/research/xenobiology) +"fL" = (/obj/structure/table/standard,/obj/item/weldingtool,/obj/item/clothing/head/welding,/turf/simulated/floor/tiled/dark,/area/outpost/research/xenobiology) "fM" = (/obj/structure/closet/firecloset,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) "fN" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) "fO" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/toxins_hallway) @@ -323,7 +323,7 @@ "gk" = (/obj/structure/table/reinforced,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/industrial/warning,/obj/machinery/button/remote/blast_door{id = "xenobio2"; name = "Containment Blast Doors"; pixel_x = 0; pixel_y = 4; req_access = list(55)},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) "gl" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) "gm" = (/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Xenobiology Fore Starboard"; dir = 2},/obj/machinery/light{dir = 1},/obj/structure/cable/blue{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) -"gn" = (/obj/structure/table/standard,/obj/item/clothing/suit/storage/hooded/wintercoat/science,/obj/item/clothing/suit/storage/hooded/wintercoat/science,/obj/item/weapon/storage/firstaid,/turf/simulated/floor/tiled/dark,/area/outpost/research/xenobiology) +"gn" = (/obj/structure/table/standard,/obj/item/clothing/suit/storage/hooded/wintercoat/science,/obj/item/clothing/suit/storage/hooded/wintercoat/science,/obj/item/storage/firstaid,/turf/simulated/floor/tiled/dark,/area/outpost/research/xenobiology) "go" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/airless,/area/mine/explored) "gp" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/light/small{dir = 1},/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/hallway/catwalk) "gq" = (/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/outpost/research/hallway/catwalk) @@ -410,11 +410,11 @@ "hT" = (/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) "hU" = (/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/blue{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) "hV" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/table/standard,/obj/machinery/reagentgrinder,/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) -"hW" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) +"hW" = (/obj/structure/table/standard,/obj/item/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) "hX" = (/obj/structure/cable/blue{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) "hY" = (/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) "hZ" = (/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/blue{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) -"ia" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/machinery/button/remote/blast_door{desc = "It controls blast doors, remotely."; id = "xenobiodivid"; name = "Divider Switch"; pixel_x = 38; pixel_y = 0; req_access = list(55)},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/cable/blue{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) +"ia" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/machinery/button/remote/blast_door{desc = "It controls blast doors, remotely."; id = "xenobiodivid"; name = "Divider Switch"; pixel_x = 38; pixel_y = 0; req_access = list(55)},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/cable/blue{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) "ib" = (/obj/machinery/door/blast/regular{id = "xenobiodivid"},/turf/simulated/floor/reinforced,/area/outpost/research/xenobiology) "ic" = (/obj/structure/lattice,/obj/structure/window/reinforced{dir = 4},/turf/space,/area/space) "id" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/landmark{name = "bluespacerift"},/turf/simulated/floor/tiled,/area/outpost/research/hallway/catwalk) @@ -425,10 +425,10 @@ "ii" = (/obj/structure/window/reinforced,/obj/structure/cable/blue{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/light/small{dir = 4},/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/hallway/catwalk) "ij" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) "ik" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Xenobiology Access"; dir = 1},/obj/structure/closet/l3closet/scientist,/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) -"il" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/structure/closet/l3closet/scientist,/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) -"im" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped,/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) -"in" = (/obj/structure/table/standard,/obj/item/clothing/gloves/sterile/latex,/obj/item/weapon/hand_labeler,/obj/item/device/slime_scanner,/obj/item/device/slime_scanner,/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) -"io" = (/obj/structure/table/standard,/obj/item/glass_jar,/obj/item/glass_jar,/obj/item/weapon/storage/box/syringes,/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) +"il" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/structure/closet/l3closet/scientist,/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) +"im" = (/obj/structure/table/standard,/obj/item/storage/box/monkeycubes,/obj/item/storage/box/monkeycubes,/obj/item/storage/box/monkeycubes,/obj/item/storage/box/monkeycubes,/obj/item/reagent_containers/food/snacks/monkeycube/wrapped,/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) +"in" = (/obj/structure/table/standard,/obj/item/clothing/gloves/sterile/latex,/obj/item/hand_labeler,/obj/item/slime_scanner,/obj/item/slime_scanner,/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) +"io" = (/obj/structure/table/standard,/obj/item/glass_jar,/obj/item/glass_jar,/obj/item/storage/box/syringes,/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) "ip" = (/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) "iq" = (/obj/structure/table/reinforced,/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/button/remote/blast_door{id = "xenobio4"; name = "Containment Blast Doors"; pixel_x = 0; pixel_y = 4; req_access = list(55)},/obj/structure/window/reinforced,/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) "ir" = (/obj/structure/grille,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "xenobio4"; name = "Containment Blast Doors"; opacity = 0},/obj/structure/cable/blue{d2 = 8; icon_state = "0-8"},/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/outpost/research/xenobiology) @@ -446,7 +446,7 @@ "iD" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/outpost/research/hallway/catwalk) "iE" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/outpost/research/hallway/catwalk) "iF" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored) -"iG" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 5},/obj/item/weapon/pen/blue{pixel_x = -5; pixel_y = -1},/obj/item/weapon/pen/red{pixel_x = -1; pixel_y = 3},/turf/simulated/floor/tiled/dark,/area/outpost/research/xenobiology) +"iG" = (/obj/structure/table/standard,/obj/item/paper_bin{pixel_x = -2; pixel_y = 5},/obj/item/pen/blue{pixel_x = -5; pixel_y = -1},/obj/item/pen/red{pixel_x = -1; pixel_y = 3},/turf/simulated/floor/tiled/dark,/area/outpost/research/xenobiology) "iH" = (/obj/machinery/requests_console{department = "Science"; departmentType = 2; name = "Science Requests Console"; pixel_x = 0; pixel_y = 30},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) "iI" = (/obj/machinery/light{dir = 1},/obj/machinery/vending/wallmed1{name = "Emergency NanoMed"; pixel_x = -7; pixel_y = 32},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) "iJ" = (/obj/machinery/chemical_dispenser/full{density = 1},/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) @@ -460,14 +460,14 @@ "iR" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light/small,/turf/simulated/floor/reinforced,/area/outpost/research/xenobiology) "iS" = (/obj/structure/disposaloutlet{dir = 1},/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/reinforced,/area/outpost/research/xenobiology) "iT" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/outpost/research/hallway/catwalk) -"iU" = (/obj/structure/table/standard,/obj/item/weapon/clipboard,/obj/item/weapon/folder,/obj/item/weapon/pen,/obj/item/weapon/melee/baton/slime/loaded,/obj/item/weapon/gun/energy/taser/xeno,/turf/simulated/floor/tiled/dark,/area/outpost/research/xenobiology) +"iU" = (/obj/structure/table/standard,/obj/item/clipboard,/obj/item/folder,/obj/item/pen,/obj/item/melee/baton/slime/loaded,/obj/item/gun/energy/taser/xeno,/turf/simulated/floor/tiled/dark,/area/outpost/research/xenobiology) "iV" = (/obj/structure/bed/chair/office/light{dir = 1},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) "iW" = (/obj/structure/cable/blue{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) "iX" = (/obj/structure/cable/blue{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) "iY" = (/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/blue{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) "iZ" = (/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) "ja" = (/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) -"jb" = (/obj/structure/table/standard,/obj/item/weapon/folder/red{pixel_y = 3},/obj/item/weapon/folder/blue{pixel_x = 5},/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) +"jb" = (/obj/structure/table/standard,/obj/item/folder/red{pixel_y = 3},/obj/item/folder/blue{pixel_x = 5},/obj/item/reagent_containers/spray/cleaner,/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) "jc" = (/obj/structure/bed/chair/office/light,/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) "jd" = (/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Xenobiology Aft Port"; dir = 1},/obj/structure/cable/blue,/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) "je" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 9},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) @@ -480,7 +480,7 @@ "jl" = (/obj/structure/table/steel,/obj/item/clothing/glasses/science,/turf/simulated/floor/tiled/dark,/area/outpost/research/xenobiology) "jm" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/turf/simulated/floor/tiled,/area/outpost/research/hallway/catwalk) "jn" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/outpost/research/hallway/catwalk) -"jo" = (/obj/structure/table/standard,/obj/item/weapon/melee/baton/slime/loaded,/obj/item/weapon/gun/energy/taser/xeno,/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) +"jo" = (/obj/structure/table/standard,/obj/item/melee/baton/slime/loaded,/obj/item/gun/energy/taser/xeno,/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) "jp" = (/obj/item/clothing/shoes/galoshes,/obj/item/clothing/shoes/galoshes,/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) "jq" = (/obj/structure/grille,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "xenobio6"; name = "Containment Blast Doors"; opacity = 0},/obj/structure/disposalpipe/segment,/obj/structure/cable/blue,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/outpost/research/xenobiology) "jr" = (/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "xenobio6"; name = "Containment Blast Doors"; opacity = 0},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/window/brigdoor/southright{name = "Containment Pen"; req_access = list(47)},/turf/simulated/floor/reinforced,/area/outpost/research/xenobiology) @@ -489,7 +489,7 @@ "ju" = (/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "xenobio5"; name = "Containment Blast Doors"; opacity = 0},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/window/brigdoor/southright{name = "Containment Pen"; req_access = list(47)},/turf/simulated/floor/reinforced,/area/outpost/research/xenobiology) "jv" = (/obj/structure/grille,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "xenobio5"; name = "Containment Blast Doors"; opacity = 0},/obj/structure/cable/blue,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/outpost/research/xenobiology) "jw" = (/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) -"jx" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/extinguisher,/obj/item/weapon/extinguisher,/turf/simulated/floor/tiled/dark,/area/outpost/research/xenobiology) +"jx" = (/obj/structure/reagent_dispensers/watertank,/obj/item/extinguisher,/obj/item/extinguisher,/turf/simulated/floor/tiled/dark,/area/outpost/research/xenobiology) "jy" = (/obj/structure/closet,/obj/item/toy/figure/scientist,/obj/item/clothing/accessory/armband/science,/turf/simulated/floor/tiled/dark,/area/outpost/research/xenobiology) "jz" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/outpost/research/hallway/catwalk) "jA" = (/obj/machinery/light/small{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/reinforced,/area/outpost/research/xenobiology) @@ -520,8 +520,8 @@ "jZ" = (/obj/effect/floor_decal/industrial/outline/grey,/obj/structure/closet/crate,/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/dark,/area/outpost/research/longtermstorage) "ka" = (/obj/effect/floor_decal/industrial/outline/grey,/obj/structure/table/rack,/turf/simulated/floor/tiled/dark,/area/outpost/research/longtermstorage) "kb" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/medical) -"kc" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/regular{pixel_x = 3; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/turf/simulated/floor/tiled/white,/area/outpost/research/medical) -"kd" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/o2{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/firstaid/fire,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled/white,/area/outpost/research/medical) +"kc" = (/obj/structure/table/standard,/obj/item/storage/firstaid/regular{pixel_x = 3; pixel_y = 4},/obj/item/storage/firstaid/toxin,/turf/simulated/floor/tiled/white,/area/outpost/research/medical) +"kd" = (/obj/structure/table/standard,/obj/item/storage/firstaid/o2{pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/fire,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled/white,/area/outpost/research/medical) "ke" = (/obj/structure/sign/greencross,/turf/simulated/wall,/area/outpost/research/medical) "kf" = (/obj/effect/floor_decal/corner/purple{dir = 9},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) "kg" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) @@ -535,7 +535,7 @@ "ko" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/tiled/dark,/area/outpost/research/longtermstorage) "kp" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/dark,/area/outpost/research/longtermstorage) "kq" = (/turf/simulated/wall,/area/outpost/research/tempstorage) -"kr" = (/obj/structure/table/steel,/obj/item/weapon/storage/toolbox/mechanical,/obj/item/weapon/storage/toolbox/emergency{pixel_x = 5; pixel_y = 5},/turf/simulated/floor/tiled/dark,/area/outpost/research/tempstorage) +"kr" = (/obj/structure/table/steel,/obj/item/storage/toolbox/mechanical,/obj/item/storage/toolbox/emergency{pixel_x = 5; pixel_y = 5},/turf/simulated/floor/tiled/dark,/area/outpost/research/tempstorage) "ks" = (/turf/simulated/wall,/area/mine/explored) "kt" = (/obj/machinery/alarm{frequency = 1441; pixel_y = 22},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/blue{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled/white,/area/outpost/research/medical) "ku" = (/obj/machinery/light{dir = 1},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/outpost/research/medical) @@ -550,7 +550,7 @@ "kD" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/dorms) "kE" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/dorms) "kF" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/dorms) -"kG" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets,/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/outpost/research/dorms) +"kG" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets,/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/outpost/research/dorms) "kH" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor/wood,/area/outpost/research/dorms) "kI" = (/obj/structure/closet/wardrobe/science_white,/turf/simulated/floor/wood,/area/outpost/research/dorms) "kJ" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled/dark,/area/outpost/research/longtermstorage) @@ -613,7 +613,7 @@ "lO" = (/obj/structure/undies_wardrobe,/turf/simulated/floor/wood,/area/outpost/research/dorms) "lP" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/sign/nosmoking_2{pixel_x = -32; pixel_y = 0},/turf/simulated/floor/tiled,/area/outpost/research/longtermstorage) "lQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/outpost/research/longtermstorage) -"lR" = (/obj/effect/floor_decal/industrial/outline/grey,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/dark,/area/outpost/research/longtermstorage) +"lR" = (/obj/effect/floor_decal/industrial/outline/grey,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/dark,/area/outpost/research/longtermstorage) "lS" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled,/area/outpost/research/tempstorage) "lT" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/tempstorage) "lU" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled,/area/outpost/research/tempstorage) @@ -630,8 +630,8 @@ "mf" = (/obj/structure/reagent_dispensers/water_cooler/full,/turf/simulated/floor/wood,/area/outpost/research/dorms) "mg" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/wood,/area/outpost/research/dorms) "mh" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/wood,/area/outpost/research/dorms) -"mi" = (/obj/structure/table/glass,/obj/item/weapon/tape_roll,/turf/simulated/floor/wood,/area/outpost/research/dorms) -"mj" = (/obj/structure/table/glass,/obj/item/weapon/hand_labeler,/turf/simulated/floor/wood,/area/outpost/research/dorms) +"mi" = (/obj/structure/table/glass,/obj/item/tape_roll,/turf/simulated/floor/wood,/area/outpost/research/dorms) +"mj" = (/obj/structure/table/glass,/obj/item/hand_labeler,/turf/simulated/floor/wood,/area/outpost/research/dorms) "mk" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/wood,/area/outpost/research/dorms) "ml" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/wood,/area/outpost/research/dorms) "mm" = (/obj/machinery/door/airlock{name = "Room 1"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/outpost/research/dorms) @@ -661,12 +661,12 @@ "mK" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/dock) "mL" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_research{name = "Outpost Primary Access"; req_access = list(47)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) "mM" = (/obj/structure/bookcase/manuals/xenoarchaeology,/turf/simulated/floor/wood,/area/outpost/research/dorms) -"mN" = (/obj/structure/table/glass,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 5},/obj/item/weapon/clipboard,/obj/item/weapon/pen,/obj/item/device/taperecorder,/turf/simulated/floor/wood,/area/outpost/research/dorms) -"mO" = (/obj/structure/table/glass,/obj/item/weapon/folder,/obj/item/weapon/stamp,/turf/simulated/floor/wood,/area/outpost/research/dorms) +"mN" = (/obj/structure/table/glass,/obj/item/paper_bin{pixel_x = -2; pixel_y = 5},/obj/item/clipboard,/obj/item/pen,/obj/item/taperecorder,/turf/simulated/floor/wood,/area/outpost/research/dorms) +"mO" = (/obj/structure/table/glass,/obj/item/folder,/obj/item/stamp,/turf/simulated/floor/wood,/area/outpost/research/dorms) "mP" = (/obj/machinery/status_display{layer = 4; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/wood,/area/outpost/research/dorms) "mQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/carpet/blue,/area/outpost/research/dorms) -"mR" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/carpet/blue,/area/outpost/research/dorms) -"mS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/freezer,/area/outpost/research/dorms) +"mR" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/carpet/blue,/area/outpost/research/dorms) +"mS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/freezer,/area/outpost/research/dorms) "mT" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/light/small{dir = 1},/obj/machinery/alarm{frequency = 1441; pixel_y = 22},/turf/simulated/floor/tiled/freezer,/area/outpost/research/dorms) "mU" = (/obj/machinery/shower{pixel_y = 3},/obj/structure/curtain/open/shower,/obj/machinery/door/window/westright{name = "Shower"},/turf/simulated/floor/tiled/freezer,/area/outpost/research/dorms) "mV" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/outpost/research/longtermstorage) @@ -680,13 +680,13 @@ "nd" = (/obj/machinery/conveyor{dir = 4; id = "anotempload"},/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/outpost/research/tempstorage) "ne" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/shuttle/research/outpost) "nf" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 4; icon_state = "map"},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) -"ng" = (/obj/structure/table/standard,/obj/item/weapon/material/ashtray/glass,/obj/item/weapon/reagent_containers/food/drinks/coffee,/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/outpost/research/dock) +"ng" = (/obj/structure/table/standard,/obj/item/material/ashtray/glass,/obj/item/reagent_containers/food/drinks/coffee,/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/outpost/research/dock) "nh" = (/obj/effect/floor_decal/corner/purple{dir = 9},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) "ni" = (/obj/effect/floor_decal/corner/purple{dir = 6},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) -"nj" = (/obj/machinery/newscaster{layer = 3.3; pixel_x = 0; pixel_y = -27},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/wood,/area/outpost/research/dorms) -"nk" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/cups,/obj/item/weapon/storage/box/glasses/square{pixel_x = 1; pixel_y = 4},/obj/machinery/light,/turf/simulated/floor/wood,/area/outpost/research/dorms) -"nl" = (/obj/structure/table/glass,/obj/item/device/camera_film{pixel_x = 2; pixel_y = 2},/obj/item/device/camera,/turf/simulated/floor/wood,/area/outpost/research/dorms) -"nm" = (/obj/item/weapon/bedsheet/purple,/obj/structure/bed/padded,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/carpet/blue,/area/outpost/research/dorms) +"nj" = (/obj/machinery/newscaster{layer = 3.3; pixel_x = 0; pixel_y = -27},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/wood,/area/outpost/research/dorms) +"nk" = (/obj/structure/table/glass,/obj/item/storage/box/cups,/obj/item/storage/box/glasses/square{pixel_x = 1; pixel_y = 4},/obj/machinery/light,/turf/simulated/floor/wood,/area/outpost/research/dorms) +"nl" = (/obj/structure/table/glass,/obj/item/camera_film{pixel_x = 2; pixel_y = 2},/obj/item/camera,/turf/simulated/floor/wood,/area/outpost/research/dorms) +"nm" = (/obj/item/bedsheet/purple,/obj/structure/bed/padded,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/carpet/blue,/area/outpost/research/dorms) "nn" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 1; pixel_y = -25},/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/carpet/blue,/area/outpost/research/dorms) "no" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/freezer,/area/outpost/research/dorms) "np" = (/obj/structure/toilet{dir = 1},/turf/simulated/floor/tiled/freezer,/area/outpost/research/dorms) @@ -694,7 +694,7 @@ "nr" = (/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/corner/purple/full{dir = 8},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) "ns" = (/obj/effect/floor_decal/corner/purple{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) "nt" = (/obj/effect/floor_decal/corner/purple/full{dir = 1},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) -"nu" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/outpost/research/tempstorage) +"nu" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/outpost/research/tempstorage) "nv" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/blue{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled,/area/outpost/research/tempstorage) "nw" = (/obj/effect/floor_decal/corner/purple,/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/outpost/research/tempstorage) "nx" = (/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/tiled,/area/outpost/research/tempstorage) @@ -716,7 +716,7 @@ "nN" = (/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/corner/purple{dir = 1},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) "nO" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) "nP" = (/obj/effect/floor_decal/corner/purple{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) -"nQ" = (/obj/structure/table/steel,/obj/machinery/cell_charger,/obj/item/weapon/cell/high,/obj/effect/floor_decal/corner/purple/full{dir = 1},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) +"nQ" = (/obj/structure/table/steel,/obj/machinery/cell_charger,/obj/item/cell/high,/obj/effect/floor_decal/corner/purple/full{dir = 1},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) "nR" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/tempstorage) "nS" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/research{name = "Temporary Storage"; req_access = list(65)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/research/tempstorage) "nT" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/tempstorage) @@ -729,7 +729,7 @@ "oa" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 4; icon_state = "map"},/obj/effect/floor_decal/industrial/warning{dir = 5},/obj/machinery/embedded_controller/radio/airlock/docking_port{frequency = 1380; id_tag = "research_outpost_dock"; pixel_x = 0; pixel_y = 30; req_one_access = list(13,48); tag_airpump = "research_outpost_pump"; tag_chamber_sensor = "research_outpost_sensor"; tag_exterior_door = "research_outpost_outer"; tag_interior_door = "research_outpost_inner"},/turf/simulated/floor/tiled,/area/outpost/research/dock) "ob" = (/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 8},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) "oc" = (/obj/machinery/computer/guestpass{pixel_x = 0; pixel_y = 30},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) -"od" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) +"od" = (/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) "oe" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled/white,/area/outpost/research/dock) "of" = (/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) "og" = (/obj/effect/floor_decal/corner/purple{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) @@ -743,7 +743,7 @@ "oo" = (/obj/machinery/shower{pixel_y = 3},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/tiled/freezer,/area/outpost/research/hallway/mid) "op" = (/turf/simulated/wall/r_wall,/area/outpost/research/hallway/mid) "oq" = (/obj/machinery/portable_atmospherics/canister/air,/obj/effect/floor_decal/corner/purple{dir = 5},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) -"or" = (/obj/machinery/portable_atmospherics/canister/air,/obj/effect/floor_decal/corner/purple{dir = 5},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) +"or" = (/obj/machinery/portable_atmospherics/canister/air,/obj/effect/floor_decal/corner/purple{dir = 5},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) "os" = (/obj/machinery/portable_atmospherics/powered/scrubber,/obj/effect/floor_decal/corner/purple{dir = 5},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) "ot" = (/obj/machinery/portable_atmospherics/powered/scrubber,/obj/effect/floor_decal/corner/purple{dir = 5},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) "ou" = (/obj/effect/floor_decal/corner/purple{dir = 5},/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/space_heater,/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) @@ -754,7 +754,7 @@ "oz" = (/obj/effect/floor_decal/corner/purple{dir = 10},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) "oA" = (/obj/effect/floor_decal/corner/purple{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) "oB" = (/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) -"oC" = (/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Hallway Starboard 2"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) +"oC" = (/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Hallway Starboard 2"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) "oD" = (/obj/effect/floor_decal/corner/purple{dir = 4},/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) "oE" = (/obj/effect/floor_decal/corner/purple{dir = 1},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) "oF" = (/obj/machinery/atmospherics/binary/pump/on,/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) @@ -817,7 +817,7 @@ "pK" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/cable/blue{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) "pL" = (/obj/structure/closet/secure_closet/xenoarchaeologist{req_access = list(47)},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) "pM" = (/obj/structure/closet/secure_closet/xenoarchaeologist{req_access = list(47)},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) -"pN" = (/obj/structure/closet/secure_closet/xenoarchaeologist{req_access = list(47)},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Hallway Mid 1"; dir = 1},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) +"pN" = (/obj/structure/closet/secure_closet/xenoarchaeologist{req_access = list(47)},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Hallway Mid 1"; dir = 1},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) "pO" = (/obj/structure/table/rack,/obj/item/clothing/suit/bio_suit/anomaly,/obj/item/clothing/head/bio_hood/anomaly,/obj/item/clothing/mask/breath,/obj/item/clothing/glasses/science,/obj/item/clothing/gloves/sterile/latex,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) "pP" = (/obj/structure/table/rack,/obj/item/clothing/suit/bio_suit/anomaly,/obj/item/clothing/head/bio_hood/anomaly,/obj/item/clothing/mask/breath,/obj/item/clothing/glasses/science,/obj/item/clothing/gloves/sterile/latex,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/sign/nosmoking_2{pixel_x = 32; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) "pQ" = (/obj/effect/floor_decal/corner/purple{dir = 8},/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) @@ -827,7 +827,7 @@ "pU" = (/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) "pV" = (/obj/effect/floor_decal/corner/purple{dir = 8},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) "pW" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/outpost/research/hallway/mid) -"pX" = (/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) +"pX" = (/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) "pY" = (/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) "pZ" = (/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/corner/purple{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) "qa" = (/obj/effect/floor_decal/corner/purple{dir = 5},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/blue{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) @@ -875,14 +875,14 @@ "qQ" = (/obj/effect/floor_decal/corner/beige{dir = 5},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) "qR" = (/obj/structure/sign/nosmoking_2{pixel_y = 32},/obj/effect/floor_decal/corner/beige{dir = 1},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) "qS" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) -"qT" = (/obj/effect/floor_decal/corner/beige{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/blue{d2 = 8; icon_state = "0-8"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) +"qT" = (/obj/effect/floor_decal/corner/beige{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/blue{d2 = 8; icon_state = "0-8"},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) "qU" = (/obj/effect/floor_decal/corner/purple/full,/obj/structure/closet/emcloset,/turf/simulated/floor/tiled/white,/area/outpost/research/dock) "qV" = (/obj/effect/floor_decal/corner/purple{dir = 10},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) "qW" = (/obj/effect/floor_decal/corner/purple/full{dir = 4},/obj/machinery/recharge_station,/turf/simulated/floor/tiled/white,/area/outpost/research/dock) "qX" = (/obj/machinery/artifact_analyser,/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) "qY" = (/obj/machinery/artifact_scanpad,/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) -"qZ" = (/obj/structure/table/rack,/obj/item/clothing/head/welding,/obj/item/weapon/weldingtool,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) -"ra" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/obj/item/weapon/tool/screwdriver{pixel_y = 15},/obj/item/weapon/melee/baton/loaded,/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) +"qZ" = (/obj/structure/table/rack,/obj/item/clothing/head/welding,/obj/item/weldingtool,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) +"ra" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/obj/item/tool/screwdriver{pixel_y = 15},/obj/item/melee/baton/loaded,/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) "rb" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "rc" = (/obj/machinery/conveyor{dir = 4; id = "anom"},/turf/simulated/floor/plating,/area/outpost/research/anomaly) "rd" = (/obj/machinery/conveyor{dir = 4; id = "anom"},/obj/structure/plasticflaps/mining,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/outpost/research/anomaly) @@ -891,25 +891,25 @@ "rg" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "rh" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "ri" = (/obj/machinery/artifact_harvester,/turf/simulated/floor/bluegrid,/area/outpost/research/anomaly) -"rj" = (/obj/item/weapon/anodevice{pixel_x = 3; pixel_y = 3},/obj/item/weapon/anodevice,/obj/structure/table/steel,/obj/machinery/light{dir = 1},/obj/structure/sign/nosmoking_2{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) -"rk" = (/obj/item/weapon/anobattery{pixel_x = -6; pixel_y = 2},/obj/item/weapon/anobattery{pixel_x = -2; pixel_y = -2},/obj/item/weapon/anobattery{pixel_x = 2; pixel_y = 2},/obj/item/weapon/anobattery{pixel_x = 6; pixel_y = 6},/obj/structure/table/steel,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) +"rj" = (/obj/item/anodevice{pixel_x = 3; pixel_y = 3},/obj/item/anodevice,/obj/structure/table/steel,/obj/machinery/light{dir = 1},/obj/structure/sign/nosmoking_2{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) +"rk" = (/obj/item/anobattery{pixel_x = -6; pixel_y = 2},/obj/item/anobattery{pixel_x = -2; pixel_y = -2},/obj/item/anobattery{pixel_x = 2; pixel_y = 2},/obj/item/anobattery{pixel_x = 6; pixel_y = 6},/obj/structure/table/steel,/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) "rl" = (/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/corner/purple/full,/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) "rm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/purple{dir = 10},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) "rn" = (/obj/effect/floor_decal/corner/purple/full{dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/hallway/starboard) "ro" = (/obj/machinery/suspension_gen,/obj/effect/floor_decal/corner/purple/full{dir = 8},/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Expedition Prep"},/turf/simulated/floor/tiled,/area/outpost/research/eva) -"rp" = (/obj/machinery/suspension_gen,/obj/effect/floor_decal/corner/purple{dir = 1},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/outpost/research/eva) +"rp" = (/obj/machinery/suspension_gen,/obj/effect/floor_decal/corner/purple{dir = 1},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/outpost/research/eva) "rq" = (/turf/simulated/floor/tiled,/area/outpost/research/eva) "rr" = (/obj/effect/floor_decal/corner/purple{dir = 6},/turf/simulated/floor/tiled,/area/outpost/research/eva) -"rs" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/archaeology,/obj/item/clothing/suit/space/anomaly,/obj/item/clothing/head/helmet/space/anomaly,/obj/item/clothing/mask/breath,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/westright,/turf/simulated/floor/tiled/dark,/area/outpost/research/eva) +"rs" = (/obj/structure/table/rack,/obj/item/storage/belt/archaeology,/obj/item/clothing/suit/space/anomaly,/obj/item/clothing/head/helmet/space/anomaly,/obj/item/clothing/mask/breath,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/westright,/turf/simulated/floor/tiled/dark,/area/outpost/research/eva) "rt" = (/obj/structure/sign/science{desc = "A warning sign which reads 'SCIENCE!'. It has fine print below it reading 'May or may not contain spiders'."},/turf/simulated/wall/r_wall,/area/outpost/research/eva) "ru" = (/obj/machinery/chem_master,/obj/effect/floor_decal/corner/beige/full,/obj/machinery/firealarm{dir = 8; pixel_x = -24; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) -"rv" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) +"rv" = (/obj/item/stool/padded,/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) "rw" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) -"rx" = (/obj/item/weapon/stool/padded,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) +"rx" = (/obj/item/stool/padded,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) "ry" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) "rz" = (/obj/effect/floor_decal/corner/beige{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) "rA" = (/obj/structure/table/glass,/obj/effect/floor_decal/corner/beige/full{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) -"rB" = (/obj/structure/table/standard,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/tool/crowbar,/obj/machinery/newscaster{layer = 3.3; pixel_x = -30; pixel_y = 0},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) +"rB" = (/obj/structure/table/standard,/obj/item/flame/lighter/random,/obj/item/tool/crowbar,/obj/machinery/newscaster{layer = 3.3; pixel_x = -30; pixel_y = 0},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) "rC" = (/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) "rD" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "rE" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) @@ -921,20 +921,20 @@ "rK" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/blue{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) "rL" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/outpost/research/eva) "rM" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/outpost/research/eva) -"rN" = (/obj/effect/floor_decal/corner/purple/full{dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/blue{d2 = 2; icon_state = "0-2"},/obj/structure/table/steel,/obj/item/device/suit_cooling_unit,/turf/simulated/floor/tiled,/area/outpost/research/eva) +"rN" = (/obj/effect/floor_decal/corner/purple/full{dir = 8},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/blue{d2 = 2; icon_state = "0-2"},/obj/structure/table/steel,/obj/item/suit_cooling_unit,/turf/simulated/floor/tiled,/area/outpost/research/eva) "rO" = (/obj/effect/floor_decal/corner/purple{dir = 1},/turf/simulated/floor/tiled,/area/outpost/research/eva) "rP" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/outpost/research/eva) -"rQ" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/archaeology,/obj/item/clothing/suit/space/anomaly,/obj/item/clothing/head/helmet/space/anomaly,/obj/item/clothing/mask/breath,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/westleft,/turf/simulated/floor/tiled/dark,/area/outpost/research/eva) -"rR" = (/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/effect/floor_decal/corner/beige/full,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) -"rS" = (/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/item/weapon/reagent_containers/dropper{pixel_y = -4},/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/effect/floor_decal/corner/beige{dir = 10},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) -"rT" = (/obj/item/weapon/reagent_containers/glass/bottle/toxin,/obj/item/weapon/reagent_containers/glass/beaker/sulphuric{name = "beaker 'sulphuric acid'"},/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/effect/floor_decal/corner/beige{dir = 10},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) +"rQ" = (/obj/structure/table/rack,/obj/item/storage/belt/archaeology,/obj/item/clothing/suit/space/anomaly,/obj/item/clothing/head/helmet/space/anomaly,/obj/item/clothing/mask/breath,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/westleft,/turf/simulated/floor/tiled/dark,/area/outpost/research/eva) +"rR" = (/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/item/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/effect/floor_decal/corner/beige/full,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) +"rS" = (/obj/item/reagent_containers/glass/beaker/large,/obj/item/reagent_containers/dropper{pixel_y = -4},/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/effect/floor_decal/corner/beige{dir = 10},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) +"rT" = (/obj/item/reagent_containers/glass/bottle/toxin,/obj/item/reagent_containers/glass/beaker/sulphuric{name = "beaker 'sulphuric acid'"},/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/effect/floor_decal/corner/beige{dir = 10},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) "rU" = (/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/effect/floor_decal/corner/beige{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) "rV" = (/obj/machinery/door/window/southright{name = "Spectrometry Lab"; req_access = list(65)},/obj/effect/floor_decal/corner/beige{dir = 10},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) "rW" = (/obj/machinery/reagentgrinder,/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/effect/floor_decal/corner/beige/full{dir = 4},/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Sample Preparation"; dir = 8},/obj/machinery/status_display{layer = 4; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) "rX" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "rY" = (/obj/machinery/atmospherics/omni/atmos_filter{tag_east = 1; tag_south = 2; tag_west = 3},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "rZ" = (/obj/machinery/atmospherics/portables_connector{dir = 8},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/outpost/research/anomaly) -"sa" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/dropper{pixel_y = -4},/obj/effect/floor_decal/industrial/warning,/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Anomalous Materials Port"; dir = 4},/obj/machinery/status_display{layer = 4; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) +"sa" = (/obj/structure/table/standard,/obj/item/reagent_containers/dropper{pixel_y = -4},/obj/effect/floor_decal/industrial/warning,/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Anomalous Materials Port"; dir = 4},/obj/machinery/status_display{layer = 4; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) "sb" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) "sc" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "sd" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) @@ -943,17 +943,17 @@ "sg" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "sh" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "si" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Anomalous Materials Starboard"; dir = 8},/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly) -"sj" = (/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/corner/purple/full{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/structure/table/standard,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/turf/simulated/floor/tiled,/area/outpost/research/eva) +"sj" = (/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/corner/purple/full{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/structure/table/standard,/obj/item/storage/box/monkeycubes,/obj/item/storage/box/monkeycubes,/turf/simulated/floor/tiled,/area/outpost/research/eva) "sk" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/research/eva) "sl" = (/obj/effect/floor_decal/corner/purple/full{dir = 1},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/table/standard,/turf/simulated/floor/tiled,/area/outpost/research/eva) "sm" = (/obj/effect/floor_decal/corner/purple{dir = 1},/obj/machinery/light{dir = 8},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/research/eva) -"sn" = (/obj/item/weapon/storage/excavation,/obj/item/weapon/pickaxe,/obj/item/weapon/tool/wrench,/obj/item/device/measuring_tape,/obj/item/stack/flag/yellow,/obj/structure/table/steel,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/outpost/research/eva) -"so" = (/obj/item/weapon/storage/excavation,/obj/item/weapon/pickaxe,/obj/item/weapon/tool/wrench,/obj/item/device/measuring_tape,/obj/item/stack/flag/yellow,/obj/structure/table/steel,/turf/simulated/floor/tiled,/area/outpost/research/eva) +"sn" = (/obj/item/storage/excavation,/obj/item/pickaxe,/obj/item/tool/wrench,/obj/item/measuring_tape,/obj/item/stack/flag/yellow,/obj/structure/table/steel,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/outpost/research/eva) +"so" = (/obj/item/storage/excavation,/obj/item/pickaxe,/obj/item/tool/wrench,/obj/item/measuring_tape,/obj/item/stack/flag/yellow,/obj/structure/table/steel,/turf/simulated/floor/tiled,/area/outpost/research/eva) "sp" = (/obj/structure/dispenser/oxygen,/obj/effect/floor_decal/corner/purple{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/outpost/research/eva) "sq" = (/obj/machinery/light/small,/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored) "sr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/analysis) "ss" = (/obj/item/stack/nanopaste,/obj/item/stack/nanopaste,/obj/item/stack/nanopaste,/obj/structure/table/standard,/turf/simulated/floor/tiled/dark,/area/outpost/research/analysis) -"st" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/dark,/area/outpost/research/analysis) +"st" = (/obj/item/stool/padded,/turf/simulated/floor/tiled/dark,/area/outpost/research/analysis) "su" = (/obj/effect/floor_decal/corner/lime{dir = 9},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) "sv" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) "sw" = (/obj/effect/floor_decal/corner/lime{dir = 6},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) @@ -966,11 +966,11 @@ "sD" = (/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "sE" = (/obj/machinery/atmospherics/pipe/simple/visible/yellow{dir = 6},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "sF" = (/obj/machinery/atmospherics/binary/pump{dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) -"sG" = (/obj/machinery/atmospherics/pipe/simple/hidden/universal{dir = 4},/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor/tiled,/area/outpost/research/anomaly) -"sH" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin,/obj/item/weapon/tape_roll,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) +"sG" = (/obj/machinery/atmospherics/pipe/simple/hidden/universal{dir = 4},/obj/structure/table/standard,/obj/item/flashlight/lamp,/turf/simulated/floor/tiled,/area/outpost/research/anomaly) +"sH" = (/obj/structure/table/standard,/obj/item/paper_bin,/obj/item/tape_roll,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "sI" = (/obj/structure/table/standard,/obj/machinery/computer/atmoscontrol/laptop{monitored_alarm_ids = list("isolation_one","isolation_two","isolation_three"); req_one_access = list(47,24,11)},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "sJ" = (/obj/structure/table/standard,/obj/item/clothing/gloves/sterile/latex,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) -"sK" = (/obj/machinery/atmospherics/pipe/simple/hidden/universal{dir = 4},/obj/structure/table/standard,/obj/item/weapon/folder,/obj/item/device/camera,/obj/item/weapon/pen,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) +"sK" = (/obj/machinery/atmospherics/pipe/simple/hidden/universal{dir = 4},/obj/structure/table/standard,/obj/item/folder,/obj/item/camera,/obj/item/pen,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "sL" = (/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ icon_state = "map"; dir = 1},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "sM" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "sN" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/floor_decal/industrial/warning,/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) @@ -987,7 +987,7 @@ "sY" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/eva) "sZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/analysis) "ta" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/analysis) -"tb" = (/obj/item/weapon/reagent_containers/glass/bucket,/obj/structure/table/standard,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled/dark,/area/outpost/research/analysis) +"tb" = (/obj/item/reagent_containers/glass/bucket,/obj/structure/table/standard,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled/dark,/area/outpost/research/analysis) "tc" = (/obj/effect/floor_decal/corner/lime{dir = 9},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) "td" = (/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) "te" = (/obj/effect/floor_decal/corner/lime{dir = 6},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled/white,/area/outpost/research/analysis) @@ -1003,7 +1003,7 @@ "to" = (/obj/machinery/atmospherics/binary/pump{dir = 8},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "tp" = (/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/anomaly) "tq" = (/obj/machinery/conveyor{dir = 2; id = "anolongstorage2"},/turf/simulated/floor,/area/outpost/research/anomaly) -"tr" = (/obj/effect/floor_decal/corner/purple{dir = 9},/obj/effect/floor_decal/industrial/warning/corner,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/outpost/research/eva) +"tr" = (/obj/effect/floor_decal/corner/purple{dir = 9},/obj/effect/floor_decal/industrial/warning/corner,/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/outpost/research/eva) "ts" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/research/eva) "tt" = (/obj/effect/floor_decal/corner/purple{dir = 6},/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Expedition Prep Access"; dir = 8},/turf/simulated/floor/tiled,/area/outpost/research/eva) "tu" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/eva) @@ -1087,14 +1087,14 @@ "uU" = (/turf/simulated/wall/r_wall,/area/outpost/research/power) "uV" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/outpost/research/power) "uW" = (/obj/machinery/light/small{dir = 8},/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored) -"uX" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor/tiled/dark,/area/outpost/research/isolation_a) +"uX" = (/obj/structure/table/standard,/obj/item/flashlight/lamp,/turf/simulated/floor/tiled/dark,/area/outpost/research/isolation_a) "uY" = (/obj/machinery/artifact_scanpad,/turf/simulated/floor/tiled/dark,/area/outpost/research/isolation_a) "uZ" = (/obj/machinery/artifact_analyser,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/dark,/area/outpost/research/isolation_a) -"va" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor/tiled/dark,/area/outpost/research/isolation_b) +"va" = (/obj/structure/table/standard,/obj/item/flashlight/lamp,/turf/simulated/floor/tiled/dark,/area/outpost/research/isolation_b) "vb" = (/obj/machinery/artifact_scanpad,/turf/simulated/floor/tiled/dark,/area/outpost/research/isolation_b) "vc" = (/obj/machinery/artifact_analyser,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/dark,/area/outpost/research/isolation_b) "vd" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/tiled/dark,/area/outpost/research/isolation_c) -"ve" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor/tiled/dark,/area/outpost/research/isolation_c) +"ve" = (/obj/structure/table/standard,/obj/item/flashlight/lamp,/turf/simulated/floor/tiled/dark,/area/outpost/research/isolation_c) "vf" = (/obj/structure/bed,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/dark,/area/outpost/research/isolation_c) "vg" = (/obj/machinery/atmospherics/pipe/simple/visible/supply,/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/mine/explored) "vh" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/mine/explored) @@ -1148,12 +1148,12 @@ "wd" = (/turf/simulated/floor/tiled,/area/outpost/mining_main/north_hall) "we" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1380; id_tag = "mining_outpost_pump"},/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor/tiled/steel,/area/outpost/mining_main/north_hall) "wf" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/outpost/mining_main/north_hall) -"wg" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer{pixel_x = 2; pixel_y = 3},/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer{pixel_x = 5},/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/break_room) +"wg" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/drinks/bottle/small/beer{pixel_x = 2; pixel_y = 3},/obj/item/reagent_containers/food/drinks/bottle/small/beer{pixel_x = 5},/obj/item/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/break_room) "wh" = (/obj/structure/bed/chair{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) "wi" = (/obj/structure/table/standard,/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) "wj" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) "wk" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) -"wl" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/toxin,/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay) +"wl" = (/obj/structure/table/standard,/obj/item/storage/firstaid/regular,/obj/item/storage/firstaid/toxin,/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay) "wm" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay) "wn" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay) "wo" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay) @@ -1167,7 +1167,7 @@ "ww" = (/obj/structure/flora/pottedplant{icon_state = "plant-06"; pixel_y = 8},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/break_room) "wx" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) "wy" = (/obj/structure/bed/chair{dir = 4},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) -"wz" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) +"wz" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/drinks/bottle/small/beer,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) "wA" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) "wB" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) "wC" = (/obj/structure/table/standard,/obj/machinery/microwave{pixel_y = 6},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/break_room) @@ -1178,19 +1178,19 @@ "wH" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning/dust{ icon_state = "warning_dust"; dir = 1},/turf/simulated/floor/tiled/asteroid_steel/airless,/area/mine/explored) "wI" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning/dust{ icon_state = "warning_dust"; dir = 1},/turf/simulated/floor/tiled/asteroid_steel/airless,/area/mine/explored) "wJ" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/effect/floor_decal/industrial/warning/dust{ icon_state = "warning_dust"; dir = 1},/turf/simulated/floor/tiled/asteroid_steel/airless,/area/mine/explored) -"wK" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/o2{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/firstaid/fire,/obj/effect/floor_decal/corner/paleblue/full,/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay) +"wK" = (/obj/structure/table/standard,/obj/item/storage/firstaid/o2{pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/fire,/obj/effect/floor_decal/corner/paleblue/full,/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay) "wL" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/blue{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay) "wM" = (/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay) "wN" = (/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay) "wO" = (/obj/machinery/camera/network/mining{c_tag = "OPM - Mining Medical"; dir = 1},/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay) -"wP" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/machinery/computer/crew,/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay) +"wP" = (/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/machinery/computer/crew,/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay) "wQ" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/floor/tiled,/area/outpost/mining_main/north_hall) "wR" = (/obj/machinery/access_button{command = "cycle_interior"; frequency = 1380; master_tag = "mining_outpost_airlock"; name = "interior access button"; pixel_x = -30; pixel_y = 25; req_one_access = list(13,48)},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/turf/simulated/floor/tiled,/area/outpost/mining_main/north_hall) "wS" = (/obj/machinery/computer/shuttle_control/mining,/obj/machinery/camera/network/mining{c_tag = "OPM - Mining Elevator Airlock"; dir = 8},/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/floor/tiled,/area/outpost/mining_main/north_hall) -"wT" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = -30},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) +"wT" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = -30},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) "wU" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) "wV" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) -"wW" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/break_room) +"wW" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/break_room) "wX" = (/obj/effect/floor_decal/industrial/warning/dust{ icon_state = "warning_dust"; dir = 8},/turf/simulated/floor/tiled/asteroid_steel/airless,/area/mine/explored) "wY" = (/turf/simulated/wall,/area/outpost/engineering/mining/hallway) "wZ" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/engineering/mining/hallway) @@ -1264,7 +1264,7 @@ "yp" = (/obj/machinery/atmospherics/pipe/tank/carbon_dioxide,/turf/simulated/floor/plating,/area/outpost/engineering/mining/atmospherics) "yq" = (/obj/machinery/atmospherics/pipe/tank/air,/turf/simulated/floor/plating,/area/outpost/engineering/mining/atmospherics) "yr" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/outpost/mining_main/north_hall) -"ys" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/extinguisher,/turf/simulated/floor/plating,/area/outpost/mining_main/north_hall) +"ys" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/tank/oxygen,/obj/item/tank/oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/flashlight,/obj/item/flashlight,/obj/item/storage/box/lights/mixed,/obj/item/extinguisher,/turf/simulated/floor/plating,/area/outpost/mining_main/north_hall) "yt" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/floor_decal/corner/brown,/turf/simulated/floor/tiled,/area/outpost/mining_main/north_hall) "yu" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/light,/obj/effect/floor_decal/corner/brown{dir = 10},/turf/simulated/floor/tiled,/area/outpost/mining_main/north_hall) "yv" = (/obj/machinery/portable_atmospherics/canister/air,/obj/effect/floor_decal/corner/brown{dir = 10},/turf/simulated/floor/tiled,/area/outpost/mining_main/north_hall) @@ -1298,7 +1298,7 @@ "yX" = (/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ icon_state = "map"; dir = 4},/turf/simulated/floor/plating,/area/outpost/engineering/mining/atmospherics) "yY" = (/turf/simulated/wall/r_wall,/area/outpost/mining_main/dorms) "yZ" = (/turf/simulated/wall,/area/outpost/mining_main/dorms) -"za" = (/obj/effect/floor_decal/corner/brown/full,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/outpost/mining_main/north_hall) +"za" = (/obj/effect/floor_decal/corner/brown/full,/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/outpost/mining_main/north_hall) "zb" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/mining_main/north_hall) "zc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/landmark{name = "bluespacerift"},/turf/simulated/floor/tiled,/area/outpost/mining_main/north_hall) "zd" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/outpost/mining_main/north_hall) @@ -1325,8 +1325,8 @@ "zy" = (/obj/machinery/atmospherics/pipe/manifold/visible/cyan{dir = 1},/turf/simulated/floor/plating,/area/outpost/engineering/mining/atmospherics) "zz" = (/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/freezer,/area/outpost/mining_main/dorms) "zA" = (/obj/structure/mirror{pixel_x = 30; pixel_y = -2},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/machinery/alarm{frequency = 1441; pixel_y = 22},/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled/freezer,/area/outpost/mining_main/dorms) -"zB" = (/obj/item/weapon/bedsheet/brown,/obj/structure/bed/padded,/turf/simulated/floor/carpet,/area/outpost/mining_main/dorms) -"zC" = (/obj/structure/table/standard,/obj/machinery/alarm{frequency = 1441; pixel_y = 22},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/carpet,/area/outpost/mining_main/dorms) +"zB" = (/obj/item/bedsheet/brown,/obj/structure/bed/padded,/turf/simulated/floor/carpet,/area/outpost/mining_main/dorms) +"zC" = (/obj/structure/table/standard,/obj/machinery/alarm{frequency = 1441; pixel_y = 22},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/carpet,/area/outpost/mining_main/dorms) "zD" = (/obj/structure/undies_wardrobe,/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) "zE" = (/obj/machinery/door/airlock/glass_mining{name = "Mining Outpost Airlock"; req_access = list(48)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/mining_main/north_hall) "zF" = (/obj/machinery/door/airlock/glass_mining{name = "Mining Outpost Airlock"; req_access = list(48)},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/outpost/mining_main/north_hall) @@ -1349,22 +1349,22 @@ "zW" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/camera/network/engineering_outpost{c_tag = "ENG - Outpost Mining Main"; dir = 8},/obj/machinery/status_display{layer = 4; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/tiled,/area/outpost/engineering/mining/hallway) "zX" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/extinguisher_cabinet{pixel_x = 7; pixel_y = -32},/turf/simulated/floor/plating,/area/outpost/engineering/mining/atmospherics) "zY" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plating,/area/outpost/engineering/mining/atmospherics) -"zZ" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/plating,/area/outpost/engineering/mining/atmospherics) +"zZ" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/plating,/area/outpost/engineering/mining/atmospherics) "Aa" = (/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/light/small,/turf/simulated/floor/plating,/area/outpost/engineering/mining/atmospherics) "Ab" = (/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/camera/network/engineering_outpost{c_tag = "ENG - Outpost Mining Atmospherics"; dir = 1},/turf/simulated/floor/plating,/area/outpost/engineering/mining/atmospherics) "Ac" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/outpost/engineering/mining/atmospherics) "Ad" = (/obj/machinery/atmospherics/pipe/tank/air{dir = 1; start_pressure = 740},/turf/simulated/floor/plating,/area/outpost/engineering/mining/atmospherics) "Ae" = (/obj/structure/toilet{dir = 4},/obj/machinery/light/small,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/freezer,/area/outpost/mining_main/dorms) -"Af" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/freezer,/area/outpost/mining_main/dorms) +"Af" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/freezer,/area/outpost/mining_main/dorms) "Ag" = (/obj/machinery/light/small,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/carpet,/area/outpost/mining_main/dorms) "Ah" = (/obj/machinery/button/remote/airlock{id = "miningdorm2"; name = "Door Bolt Control"; pixel_x = 25; pixel_y = 0; specialfunctions = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/carpet,/area/outpost/mining_main/dorms) "Ai" = (/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) -"Aj" = (/obj/structure/table/steel,/obj/item/weapon/cell/high,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) +"Aj" = (/obj/structure/table/steel,/obj/item/cell/high,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) "Ak" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/mining_main/dorms) "Al" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) "Am" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) -"An" = (/obj/structure/disposalpipe/segment,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) -"Ao" = (/obj/machinery/alarm{pixel_y = 24},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/refinery) +"An" = (/obj/structure/disposalpipe/segment,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) +"Ao" = (/obj/machinery/alarm{pixel_y = 24},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/refinery) "Ap" = (/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/refinery) "Aq" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/mining_main/refinery) "Ar" = (/obj/machinery/conveyor{dir = 2; id = "mining_internal"},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/refinery) @@ -1398,7 +1398,7 @@ "AT" = (/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/outpost/engineering/mining/hallway) "AU" = (/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/outpost/engineering/mining/hallway) "AV" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/dispenser/oxygen,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/outpost/engineering/mining/hallway) -"AW" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled,/area/outpost/engineering/mining/hallway) +"AW" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled,/area/outpost/engineering/mining/hallway) "AX" = (/turf/simulated/wall,/area/outpost/engineering/mining/power) "AY" = (/obj/structure/cable/blue{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/outpost/engineering/mining/power) "AZ" = (/obj/machinery/power/smes/buildable/outpost_substation{charge = 500000; input_attempt = 1; input_level = 150000; output_level = 150000; RCon_tag = "Outpost - Mining Engineering"},/obj/structure/cable/blue{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/outpost/engineering/mining/power) @@ -1422,7 +1422,7 @@ "Br" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/mining_main/refinery) "Bs" = (/obj/machinery/mineral/input,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/refinery) "Bt" = (/turf/simulated/floor/tiled/asteroid_steel/airless,/area/outpost/mining_main/refinery) -"Bu" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/outpost/engineering/mining/telecomms) +"Bu" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/outpost/engineering/mining/telecomms) "Bv" = (/obj/machinery/alarm{dir = 1; pixel_y = -25},/obj/machinery/firealarm{dir = 4; layer = 3.3; pixel_x = 26},/turf/simulated/floor/tiled/dark,/area/outpost/engineering/mining/telecomms) "Bw" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/engineering{name = "Generator Room"; req_one_access = list(10,48,65)},/turf/simulated/floor/plating,/area/outpost/engineering/mining/power) "Bx" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plating,/area/outpost/engineering/mining/power) @@ -1433,7 +1433,7 @@ "BC" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/light,/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) "BD" = (/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = -30},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) "BE" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) -"BF" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) +"BF" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) "BG" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) "BH" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) "BI" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) @@ -1450,7 +1450,7 @@ "BT" = (/obj/machinery/mining/brace,/turf/simulated/floor/tiled/asteroid_steel/airless,/area/outpost/mining_main/refinery) "BU" = (/obj/machinery/mining/drill,/turf/simulated/floor/tiled/asteroid_steel/airless,/area/outpost/mining_main/refinery) "BV" = (/obj/effect/floor_decal/industrial/warning/dust{ icon_state = "warning_dust"; dir = 4},/obj/machinery/mining/brace,/turf/simulated/floor/tiled/asteroid_steel/airless,/area/outpost/mining_main/refinery) -"BW" = (/obj/machinery/cell_charger,/obj/structure/table/steel,/obj/machinery/camera/network/engineering_outpost{c_tag = "ENG - Outpost Mining Power Port"; dir = 2},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/plating,/area/outpost/engineering/mining/power) +"BW" = (/obj/machinery/cell_charger,/obj/structure/table/steel,/obj/machinery/camera/network/engineering_outpost{c_tag = "ENG - Outpost Mining Power Port"; dir = 2},/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/plating,/area/outpost/engineering/mining/power) "BX" = (/obj/structure/cable/blue{d2 = 4; icon_state = "0-4"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/turf/simulated/floor/plating,/area/outpost/engineering/mining/power) "BY" = (/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/plating,/area/outpost/engineering/mining/power) "BZ" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/plating,/area/outpost/engineering/mining/power) @@ -1470,7 +1470,7 @@ "Cn" = (/obj/structure/closet/crate,/turf/simulated/floor/tiled,/area/outpost/mining_main/refinery) "Co" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/outpost/mining_main/refinery) "Cp" = (/obj/machinery/conveyor{dir = 2; id = "mining_internal"},/obj/machinery/mineral/output,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/refinery) -"Cq" = (/obj/structure/table/steel,/obj/item/weapon/tool/screwdriver,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/wrench,/turf/simulated/floor/tiled/asteroid_steel/airless,/area/outpost/mining_main/refinery) +"Cq" = (/obj/structure/table/steel,/obj/item/tool/screwdriver,/obj/item/tool/crowbar,/obj/item/tool/wrench,/turf/simulated/floor/tiled/asteroid_steel/airless,/area/outpost/mining_main/refinery) "Cr" = (/obj/structure/closet/crate,/obj/item/stack/material/phoron{amount = 50},/obj/item/stack/material/phoron{amount = 50},/obj/item/stack/material/phoron{amount = 50},/turf/simulated/floor/plating,/area/outpost/engineering/mining/power) "Cs" = (/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/structure/cable/yellow,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/machinery/power/sensor{long_range = 1; name_tag = "Asteroid Main Grid"},/turf/simulated/floor/plating,/area/outpost/engineering/mining/power) "Ct" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/outpost/engineering/mining/power) @@ -1485,13 +1485,13 @@ "CC" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/mining_main/refinery) "CD" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/mining_main/refinery) "CE" = (/obj/machinery/mineral/stacking_unit_console,/turf/simulated/wall/r_wall,/area/outpost/mining_main/refinery) -"CF" = (/obj/structure/table/steel,/obj/item/weapon/cell/high,/turf/simulated/floor/tiled/asteroid_steel/airless,/area/outpost/mining_main/refinery) -"CG" = (/obj/structure/table/steel,/obj/item/weapon/storage/toolbox/mechanical,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/outpost/engineering/mining/power) +"CF" = (/obj/structure/table/steel,/obj/item/cell/high,/turf/simulated/floor/tiled/asteroid_steel/airless,/area/outpost/mining_main/refinery) +"CG" = (/obj/structure/table/steel,/obj/item/storage/toolbox/mechanical,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/outpost/engineering/mining/power) "CH" = (/obj/machinery/power/smes/buildable{charge = 1.5e+007; cur_coils = 3; input_attempt = 1; input_level = 750000; input_level_max = 750000; output_level = 750000; output_level_max = 750000; RCon_tag = "Outpost - Main Power Unit 1"},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/outpost/engineering/mining/power) "CI" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/outpost/engineering/mining/power) "CJ" = (/obj/machinery/power/smes/buildable{charge = 1.5e+007; cur_coils = 3; input_attempt = 1; input_level = 750000; input_level_max = 750000; output_level = 750000; output_level_max = 750000; RCon_tag = "Outpost - Main Power Unit 2"},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/outpost/engineering/mining/power) "CK" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/machinery/floodlight,/turf/simulated/floor/plating,/area/outpost/engineering/mining/power) -"CL" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 1; pixel_y = -25},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/carpet,/area/outpost/mining_main/dorms) +"CL" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 1; pixel_y = -25},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/carpet,/area/outpost/mining_main/dorms) "CM" = (/obj/machinery/washing_machine,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/dorms) "CN" = (/obj/machinery/firealarm{dir = 8; pixel_x = -26},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) "CO" = (/obj/structure/disposalpipe/segment,/obj/machinery/status_display{layer = 4; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms) @@ -1522,14 +1522,14 @@ "Dn" = (/obj/machinery/door/airlock/glass_mining{name = "Mining Outpost Airlock"; req_access = list(48)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/mining_main/south_hall) "Do" = (/obj/machinery/door/airlock/glass_mining{name = "Mining Outpost Airlock"; req_access = list(48)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/outpost/mining_main/south_hall) "Dp" = (/obj/machinery/door/airlock/glass_mining{name = "Mining Outpost Airlock"; req_access = list(48)},/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/outpost/mining_main/south_hall) -"Dq" = (/obj/structure/table/rack,/obj/item/clothing/suit/space/void/mining,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/void/mining,/obj/item/weapon/mining_scanner,/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) -"Dr" = (/obj/structure/table/rack,/obj/item/clothing/suit/space/void/mining,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/void/mining,/obj/item/weapon/mining_scanner,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) +"Dq" = (/obj/structure/table/rack,/obj/item/clothing/suit/space/void/mining,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/void/mining,/obj/item/mining_scanner,/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) +"Dr" = (/obj/structure/table/rack,/obj/item/clothing/suit/space/void/mining,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/void/mining,/obj/item/mining_scanner,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) "Ds" = (/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/machinery/atmospherics/portables_connector,/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) "Dt" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/outpost/mining_main/eva) "Du" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 2; frequency = 1377; id_tag = "mvent"},/obj/machinery/embedded_controller/radio/airlock/airlock_controller{frequency = 1377; id_tag = "mcontrol"; pixel_x = 0; pixel_y = 28; tag_airpump = "mvent"; tag_chamber_sensor = "msensor"; tag_exterior_door = "mext"; tag_interior_door = "mint"},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) "Dv" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 2; frequency = 1377; id_tag = "mvent"},/obj/machinery/airlock_sensor{frequency = 1377; id_tag = "msensor"; pixel_x = 0; pixel_y = 26},/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) "Dw" = (/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) -"Dx" = (/obj/structure/table/rack,/obj/item/clothing/mask/breath,/obj/item/weapon/mining_scanner,/obj/machinery/alarm{pixel_y = 22},/obj/item/weapon/rig/industrial/equipped,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) +"Dx" = (/obj/structure/table/rack,/obj/item/clothing/mask/breath,/obj/item/mining_scanner,/obj/machinery/alarm{pixel_y = 22},/obj/item/rig/industrial/equipped,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) "Dy" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/mining_main/storage) "Dz" = (/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/outpost/mining_main/south_hall) "DA" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/outpost/mining_main/south_hall) @@ -1561,8 +1561,8 @@ "Ea" = (/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) "Eb" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1377; id_tag = "mvent"},/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) "Ec" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1377; id_tag = "mvent"},/obj/machinery/camera/network/mining{c_tag = "OPM - Mining Airlock"; dir = 8},/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) -"Ed" = (/obj/structure/table/steel,/obj/item/device/suit_cooling_unit,/obj/item/device/suit_cooling_unit,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) -"Ee" = (/obj/structure/table/steel,/obj/item/weapon/pickaxe,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) +"Ed" = (/obj/structure/table/steel,/obj/item/suit_cooling_unit,/obj/item/suit_cooling_unit,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) +"Ee" = (/obj/structure/table/steel,/obj/item/pickaxe,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) "Ef" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) "Eg" = (/obj/machinery/door/airlock/mining{name = "Mining Station Storage"; req_access = list(48)},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) "Eh" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/mining_main/south_hall) @@ -1575,7 +1575,7 @@ "Eo" = (/obj/machinery/suit_cycler/mining,/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) "Ep" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/outpost/mining_main/eva) "Eq" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/outpost/mining_main/eva) -"Er" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/blue{d2 = 4; icon_state = "0-4"},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) +"Er" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/blue{d2 = 4; icon_state = "0-4"},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) "Es" = (/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) "Et" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) "Eu" = (/obj/machinery/door/airlock/mining{name = "Mining Station Storage"; req_access = list(48)},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) @@ -1585,21 +1585,21 @@ "Ey" = (/obj/machinery/door/airlock/glass_mining{name = "Mining Station EVA"; req_access = list(54)},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) "Ez" = (/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) "EA" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) -"EB" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/blue{d2 = 8; icon_state = "0-8"},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) -"EC" = (/obj/structure/table/rack,/obj/item/weapon/pickaxe,/obj/item/weapon/tool/wrench,/obj/item/weapon/tool/crowbar,/obj/item/weapon/shovel,/obj/machinery/light,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) -"ED" = (/obj/structure/table/rack,/obj/item/weapon/pickaxe,/obj/item/weapon/tool/wrench,/obj/item/weapon/tool/crowbar,/obj/item/weapon/shovel,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) +"EB" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/blue{d2 = 8; icon_state = "0-8"},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) +"EC" = (/obj/structure/table/rack,/obj/item/pickaxe,/obj/item/tool/wrench,/obj/item/tool/crowbar,/obj/item/shovel,/obj/machinery/light,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) +"ED" = (/obj/structure/table/rack,/obj/item/pickaxe,/obj/item/tool/wrench,/obj/item/tool/crowbar,/obj/item/shovel,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) "EE" = (/turf/simulated/wall,/area/outpost/mining_main/storage) -"EF" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/camera/network/mining{c_tag = "OPM - Mining Hallway Aft"; dir = 4},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/outpost/mining_main/south_hall) +"EF" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/camera/network/mining{c_tag = "OPM - Mining Hallway Aft"; dir = 4},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/outpost/mining_main/south_hall) "EG" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled,/area/outpost/mining_main/south_hall) "EH" = (/obj/structure/disposalpipe/segment,/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/blue,/turf/simulated/floor/tiled,/area/outpost/mining_main/south_hall) -"EI" = (/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/wrench,/obj/item/weapon/storage/toolbox/mechanical,/obj/structure/table/steel,/obj/machinery/light,/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) +"EI" = (/obj/item/tool/crowbar,/obj/item/tool/wrench,/obj/item/storage/toolbox/mechanical,/obj/structure/table/steel,/obj/machinery/light,/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) "EJ" = (/obj/item/stack/flag/green{pixel_x = -4; pixel_y = 0},/obj/item/stack/flag/red,/obj/item/stack/flag/yellow{pixel_x = 4},/obj/structure/table/steel,/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) "EK" = (/obj/structure/reagent_dispensers/fueltank,/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) "EL" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/storage) "EM" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -20},/turf/simulated/floor/tiled,/area/outpost/mining_main/south_hall) "EN" = (/turf/simulated/floor/tiled,/area/outpost/mining_main/south_hall) -"EO" = (/obj/item/weapon/storage/backpack/satchel,/obj/structure/table/steel,/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) -"EP" = (/obj/item/weapon/storage/belt/utility,/obj/item/weapon/pickaxe,/obj/structure/table/steel,/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) +"EO" = (/obj/item/storage/backpack/satchel,/obj/structure/table/steel,/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) +"EP" = (/obj/item/storage/belt/utility,/obj/item/pickaxe,/obj/structure/table/steel,/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled,/area/outpost/mining_main/eva) "EQ" = (/turf/simulated/floor,/area/outpost/mining_main/south_hall) "ER" = (/obj/machinery/mech_recharger,/obj/machinery/light,/turf/simulated/floor/plating,/area/outpost/mining_main/south_hall) "ES" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/outpost/mining_main/south_hall) @@ -1607,9 +1607,9 @@ "EU" = (/turf/simulated/wall,/area/outpost/mining_main/south_hall) "EV" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall/r_wall,/area/outpost/mining_main/south_hall) "EW" = (/obj/structure/disposaloutlet,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/mine/explored) -"EX" = (/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/mine/explored) +"EX" = (/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris,/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris,/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/mine/explored) "EY" = (/obj/machinery/light/small{dir = 4},/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored) -"EZ" = (/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap,/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/mine/explored) +"EZ" = (/obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap,/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/mine/explored) "Fa" = (/turf/simulated/wall,/area/mine/unexplored) "Fb" = (/turf/space,/area/skipjack_station/mining) "Fc" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/mine/explored) @@ -1626,8 +1626,8 @@ "Fn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/engineering/hallway) "Fo" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/engineering/hallway) "Fp" = (/turf/simulated/wall/r_wall,/area/outpost/engineering/storage) -"Fq" = (/obj/machinery/cell_charger,/obj/structure/table/steel,/obj/structure/cable,/obj/item/frame/apc,/obj/item/weapon/module/power_control,/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/mine/explored) -"Fr" = (/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/structure/table/steel,/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/mine/explored) +"Fq" = (/obj/machinery/cell_charger,/obj/structure/table/steel,/obj/structure/cable,/obj/item/frame/apc,/obj/item/module/power_control,/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/mine/explored) +"Fr" = (/obj/item/cell/high{charge = 100; maxcharge = 15000},/obj/structure/table/steel,/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/mine/explored) "Fs" = (/turf/simulated/wall/r_wall,/area/outpost/engineering/kitchen) "Ft" = (/obj/structure/table/steel,/obj/effect/floor_decal/industrial/warning/dust,/turf/simulated/floor/tiled/asteroid_steel/airless,/area/mine/explored) "Fu" = (/obj/effect/floor_decal/industrial/warning/dust,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/asteroid_steel/airless,/area/outpost/engineering/kitchen) @@ -1685,10 +1685,10 @@ "Gu" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) "Gv" = (/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) "Gw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) -"Gx" = (/obj/structure/table/rack,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/turf/simulated/floor/tiled,/area/outpost/engineering/storage) +"Gx" = (/obj/structure/table/rack,/obj/item/pickaxe,/obj/item/pickaxe,/obj/item/pickaxe,/obj/item/pickaxe,/turf/simulated/floor/tiled,/area/outpost/engineering/storage) "Gy" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/outpost/engineering/storage) -"Gz" = (/obj/structure/table/rack,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/item/stack/cable_coil/yellow,/obj/item/stack/cable_coil,/obj/item/weapon/module/power_control,/obj/item/weapon/module/power_control,/obj/item/clothing/gloves/yellow,/turf/simulated/floor/tiled,/area/outpost/engineering/storage) -"GA" = (/obj/structure/table/rack,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/item/stack/cable_coil/yellow,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/tiled,/area/outpost/engineering/storage) +"Gz" = (/obj/structure/table/rack,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/item/stack/cable_coil/yellow,/obj/item/stack/cable_coil,/obj/item/module/power_control,/obj/item/module/power_control,/obj/item/clothing/gloves/yellow,/turf/simulated/floor/tiled,/area/outpost/engineering/storage) +"GA" = (/obj/structure/table/rack,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/item/stack/cable_coil/yellow,/obj/item/storage/box/lights/mixed,/turf/simulated/floor/tiled,/area/outpost/engineering/storage) "GB" = (/obj/structure/dispenser/oxygen,/turf/simulated/floor/tiled,/area/outpost/engineering/storage) "GC" = (/obj/effect/floor_decal/industrial/warning/dust{ icon_state = "warning_dust"; dir = 4},/obj/machinery/light/small,/turf/simulated/floor/tiled/asteroid_steel/airless,/area/outpost/engineering/kitchen) "GD" = (/obj/effect/floor_decal/industrial/warning/dust{ icon_state = "warning_dust"; dir = 8},/obj/machinery/light/small,/turf/simulated/floor/tiled/asteroid_steel/airless,/area/outpost/engineering/kitchen) @@ -1701,7 +1701,7 @@ "GK" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) "GL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) "GM" = (/obj/item/stack/material/plasteel{amount = 10},/obj/item/stack/material/wood{amount = 30},/obj/item/stack/material/plastic{amount = 10},/obj/structure/table/steel,/obj/machinery/light,/turf/simulated/floor/tiled,/area/outpost/engineering/storage) -"GN" = (/obj/structure/table/rack,/obj/item/clothing/head/helmet/space/void/engineering,/obj/item/clothing/suit/space/void/engineering,/obj/item/clothing/shoes/magboots,/obj/machinery/firealarm{dir = 4; layer = 3.3; pixel_x = 26},/obj/item/weapon/storage/briefcase/inflatable,/turf/simulated/floor/tiled,/area/outpost/engineering/storage) +"GN" = (/obj/structure/table/rack,/obj/item/clothing/head/helmet/space/void/engineering,/obj/item/clothing/suit/space/void/engineering,/obj/item/clothing/shoes/magboots,/obj/machinery/firealarm{dir = 4; layer = 3.3; pixel_x = 26},/obj/item/storage/briefcase/inflatable,/turf/simulated/floor/tiled,/area/outpost/engineering/storage) "GO" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor,/area/outpost/engineering/atmospherics) "GP" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plating,/area/outpost/engineering/atmospherics) "GQ" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) @@ -1776,7 +1776,7 @@ "Ih" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10; icon_state = "intact"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) "Ii" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) "Ij" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) -"Ik" = (/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -28},/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) +"Ik" = (/obj/item/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -28},/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) "Il" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/camera/network/engineering_outpost{c_tag = "ENG - Outpost Hallway East"; dir = 1},/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) "Im" = (/turf/simulated/floor/tiled,/area/outpost/engineering/solars) "In" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/light,/turf/simulated/floor/tiled,/area/outpost/engineering/solars) @@ -1801,7 +1801,7 @@ "IG" = (/obj/machinery/computer/station_alert,/turf/simulated/floor/tiled,/area/outpost/engineering/rest) "IH" = (/obj/structure/table/steel,/obj/machinery/cell_charger,/obj/machinery/alarm{frequency = 1439; pixel_y = 22},/turf/simulated/floor/tiled,/area/outpost/engineering/rest) "II" = (/turf/simulated/floor/tiled,/area/outpost/engineering/rest) -"IJ" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/orange,/turf/simulated/floor/tiled,/area/outpost/engineering/rest) +"IJ" = (/obj/structure/bed/padded,/obj/item/bedsheet/orange,/turf/simulated/floor/tiled,/area/outpost/engineering/rest) "IK" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -20},/turf/simulated/floor/tiled,/area/outpost/engineering/solars) "IL" = (/obj/structure/toilet{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/tiled,/area/outpost/engineering/kitchen) "IM" = (/obj/machinery/door/airlock/engineering{name = "Restrooms"; req_access = list(10)},/turf/simulated/floor/tiled,/area/outpost/engineering/kitchen) @@ -1816,7 +1816,7 @@ "IV" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 4; icon_state = "intact"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/engineering/solars) "IW" = (/obj/machinery/atmospherics/portables_connector{dir = 8},/obj/machinery/portable_atmospherics/canister/air/airlock,/turf/simulated/floor/tiled,/area/outpost/engineering/solars) "IX" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/tiled,/area/outpost/engineering/kitchen) -"IY" = (/obj/structure/table/standard,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/tiled,/area/outpost/engineering/kitchen) +"IY" = (/obj/structure/table/standard,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/item/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/tiled,/area/outpost/engineering/kitchen) "IZ" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/tiled,/area/outpost/engineering/kitchen) "Ja" = (/obj/structure/cable{d2 = 2; icon_state = "0-2"; pixel_y = 0},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/turf/simulated/floor/tiled,/area/outpost/engineering/kitchen) "Jb" = (/obj/machinery/computer/shuttle_control/engineering,/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) @@ -1838,7 +1838,7 @@ "Jr" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/outpost/engineering/rest) "Js" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/outpost/engineering/rest) "Jt" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled,/area/outpost/engineering/rest) -"Ju" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -24},/turf/simulated/floor/tiled,/area/outpost/engineering/rest) +"Ju" = (/obj/structure/table/standard,/obj/item/flashlight/lamp,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -24},/turf/simulated/floor/tiled,/area/outpost/engineering/rest) "Jv" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/cyan,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "eoutpost_solar_airlock"; name = "interior access button"; pixel_x = 25; pixel_y = -25; req_access = list(10)},/turf/simulated/floor/tiled,/area/outpost/engineering/solars) "Jw" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/outpost/engineering/solars) "Jx" = (/obj/machinery/power/solar_control,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled,/area/outpost/engineering/solars) @@ -1854,11 +1854,11 @@ "JH" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/engineering/solars) "JI" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/engineering/solars) "JJ" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor/tiled,/area/outpost/engineering/kitchen) -"JK" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets,/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = -28},/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/tiled,/area/outpost/engineering/kitchen) +"JK" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets,/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = -28},/obj/item/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/tiled,/area/outpost/engineering/kitchen) "JL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/engineering/hallway) "JM" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/engineering/hallway) "JN" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "edock_inner"; locked = 1; name = "Engineering Dock Airlock"},/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) -"JO" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/o2{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/firstaid/regular,/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = -28},/obj/item/roller,/turf/simulated/floor/tiled,/area/outpost/engineering/rest) +"JO" = (/obj/structure/table/standard,/obj/item/storage/firstaid/o2{pixel_x = 4; pixel_y = 4},/obj/item/storage/firstaid/regular,/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = -28},/obj/item/roller,/turf/simulated/floor/tiled,/area/outpost/engineering/rest) "JP" = (/obj/machinery/computer/crew,/turf/simulated/floor/tiled,/area/outpost/engineering/rest) "JQ" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/engineering/solars) "JR" = (/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{dir = 8; icon_state = "map"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/outpost/engineering/solars) diff --git a/maps/offmap_vr/om_ships/abductor.dm b/maps/offmap_vr/om_ships/abductor.dm index d8d23f295ea..4cb4502a21a 100644 --- a/maps/offmap_vr/om_ships/abductor.dm +++ b/maps/offmap_vr/om_ships/abductor.dm @@ -41,7 +41,7 @@ fore_dir = NORTH known = FALSE -/obj/item/weapon/paper/alien/abductor +/obj/item/paper/alien/abductor name = "Read Me" info = {"((Just to state the obvious here, but make sure you're reading OOC notes and all that. This role does not give you any special protections from the rules. Only abduct people who seem like they'd be cool with it.))

@@ -71,7 +71,7 @@ You will find a dispenser within the room you started in which contains some bas /obj/machinery/porta_turret/alien/abductor name = "anti-personnel turret" - installation = /obj/item/weapon/gun/energy/gun/taser + installation = /obj/item/gun/energy/gun/taser lethal = FALSE health = 500 // Sturdier turrets, non-lethal, for capturing people alive maxhealth = 500 @@ -79,7 +79,7 @@ You will find a dispenser within the room you started in which contains some bas /obj/machinery/porta_turret/alien/abductor/ion name = "anti-personnel turret" - installation = /obj/item/weapon/gun/energy/ionrifle/weak + installation = /obj/item/gun/energy/ionrifle/weak lethal = TRUE /obj/machinery/power/rtg/abductor/built/abductor diff --git a/maps/offmap_vr/om_ships/abductor.dmm b/maps/offmap_vr/om_ships/abductor.dmm index 5083af6250a..541936afd26 100644 --- a/maps/offmap_vr/om_ships/abductor.dmm +++ b/maps/offmap_vr/om_ships/abductor.dmm @@ -23,18 +23,18 @@ /area/abductor/interior) "dN" = ( /obj/structure/closet/alien, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/clotting, -/obj/item/weapon/storage/firstaid/clotting, -/obj/item/weapon/storage/firstaid/bonemed, -/obj/item/weapon/storage/firstaid/bonemed, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid, -/obj/item/weapon/storage/firstaid, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/clotting, +/obj/item/storage/firstaid/clotting, +/obj/item/storage/firstaid/bonemed, +/obj/item/storage/firstaid/bonemed, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid, +/obj/item/storage/firstaid, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "ed" = ( @@ -68,26 +68,26 @@ /area/abductor/exterior) "fw" = ( /obj/structure/table/alien, -/obj/item/device/radio_jammer/admin, -/obj/item/device/radio_jammer/admin, +/obj/item/radio_jammer/admin, +/obj/item/radio_jammer/admin, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "fz" = ( /obj/structure/table/alien, -/obj/item/weapon/implanter, -/obj/item/weapon/implanter, -/obj/item/weapon/implant/freedom, -/obj/item/weapon/implant/adrenalin, -/obj/item/weapon/implant/sizecontrol, -/obj/item/weapon/implant/sizecontrol, +/obj/item/implanter, +/obj/item/implanter, +/obj/item/implant/freedom, +/obj/item/implant/adrenalin, +/obj/item/implant/sizecontrol, +/obj/item/implant/sizecontrol, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "fQ" = ( -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/teargas, -/obj/item/weapon/grenade/flashbang/clusterbang, -/obj/item/weapon/grenade/flashbang/clusterbang, -/obj/item/weapon/storage/box/metalfoam, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/teargas, +/obj/item/grenade/flashbang/clusterbang, +/obj/item/grenade/flashbang/clusterbang, +/obj/item/storage/box/metalfoam, /obj/item/clothing/mask/gas/wwii, /obj/item/clothing/mask/gas, /obj/structure/closet/alien, @@ -126,7 +126,7 @@ /turf/simulated/shuttle/floor/alienplating, /area/abductor/exterior) "iH" = ( -/obj/item/weapon/paper/alien/abductor, +/obj/item/paper/alien/abductor, /obj/structure/table/alien, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) @@ -175,8 +175,8 @@ /obj/structure/table/alien, /obj/item/clothing/mask/gas/voice, /obj/item/clothing/mask/gas/voice, -/obj/item/device/universal_translator/ear, -/obj/item/device/universal_translator/ear, +/obj/item/universal_translator/ear, +/obj/item/universal_translator/ear, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "nw" = ( @@ -206,15 +206,15 @@ /area/abductor/interior) "pa" = ( /obj/structure/closet/alien, -/obj/item/device/sleevemate, -/obj/item/device/flash, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/sleevemate, +/obj/item/flash, +/obj/item/storage/firstaid/toxin, /turf/simulated/shuttle/floor/alien, /area/abductor/interior) "pc" = ( /obj/structure/table/alien, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/gun/energy/netgun, +/obj/item/gun/energy/netgun, +/obj/item/gun/energy/netgun, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "pB" = ( @@ -273,14 +273,14 @@ /area/abductor/interior) "rB" = ( /obj/structure/table/alien, -/obj/item/device/perfect_tele/alien, -/obj/item/device/perfect_tele/alien, +/obj/item/perfect_tele/alien, +/obj/item/perfect_tele/alien, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "rL" = ( /obj/structure/table/alien, -/obj/item/weapon/storage/belt/utility/alien/full, -/obj/item/weapon/storage/belt/utility/alien/full, +/obj/item/storage/belt/utility/alien/full, +/obj/item/storage/belt/utility/alien/full, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "rP" = ( @@ -307,9 +307,9 @@ /area/abductor/interior) "td" = ( /obj/structure/table/alien, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/device/sleevemate, +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, +/obj/item/sleevemate, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "tl" = ( @@ -317,8 +317,8 @@ /area/abductor/exterior) "tI" = ( /obj/structure/table/alien, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "tQ" = ( @@ -361,14 +361,14 @@ pixel_y = 32 }, /obj/item/clothing/shoes/magboots, -/obj/item/weapon/gun/energy/gun/taser, -/obj/item/device/flash, +/obj/item/gun/energy/gun/taser, +/obj/item/flash, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "vS" = ( /obj/structure/table/alien, -/obj/item/weapon/storage/belt/medical/alien, -/obj/item/weapon/storage/belt/medical/alien, +/obj/item/storage/belt/medical/alien, +/obj/item/storage/belt/medical/alien, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "wk" = ( @@ -408,8 +408,8 @@ dir = 1; pixel_y = -32 }, -/obj/item/weapon/gun/energy/gun/taser, -/obj/item/device/flash, +/obj/item/gun/energy/gun/taser, +/obj/item/flash, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "yB" = ( @@ -441,24 +441,24 @@ /area/abductor/interior) "AZ" = ( /obj/structure/table/alien, -/obj/item/weapon/gun/energy/medigun, -/obj/item/weapon/gun/energy/medigun, -/obj/item/weapon/cell/infinite, -/obj/item/weapon/cell/infinite, +/obj/item/gun/energy/medigun, +/obj/item/gun/energy/medigun, +/obj/item/cell/infinite, +/obj/item/cell/infinite, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "Bv" = ( /obj/structure/table/alien, -/obj/item/weapon/reagent_containers/glass/bottle/adminordrazine, -/obj/item/weapon/reagent_containers/glass/bottle/adminordrazine, -/obj/item/weapon/reagent_containers/glass/bottle/adminordrazine, -/obj/item/weapon/reagent_containers/glass/bottle/adminordrazine, +/obj/item/reagent_containers/glass/bottle/adminordrazine, +/obj/item/reagent_containers/glass/bottle/adminordrazine, +/obj/item/reagent_containers/glass/bottle/adminordrazine, +/obj/item/reagent_containers/glass/bottle/adminordrazine, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "DG" = ( /obj/structure/table/alien, -/obj/item/weapon/bluespace_harpoon, -/obj/item/weapon/bluespace_harpoon, +/obj/item/bluespace_harpoon, +/obj/item/bluespace_harpoon, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "DI" = ( @@ -478,8 +478,8 @@ pixel_x = 32 }, /obj/item/clothing/shoes/magboots, -/obj/item/weapon/gun/energy/gun/taser, -/obj/item/device/flash, +/obj/item/gun/energy/gun/taser, +/obj/item/flash, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "Fl" = ( @@ -487,22 +487,22 @@ /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "Fq" = ( -/obj/item/weapon/bikehorn, +/obj/item/bikehorn, /obj/item/toy/bosunwhistle, -/obj/item/weapon/storage/bible, -/obj/item/weapon/storage/photo_album, -/obj/item/weapon/storage/trinketbox, -/obj/item/weapon/storage/briefcase/clutch, -/obj/item/weapon/storage/wallet/random, -/obj/item/weapon/storage/wallet/womens, -/obj/item/weapon/bananapeel, -/obj/item/device/taperecorder, -/obj/item/device/camera, -/obj/item/device/binoculars, -/obj/item/device/binoculars/spyglass, -/obj/item/device/laser_pointer/red, -/obj/item/device/healthanalyzer, -/obj/item/weapon/stamp/chameleon, +/obj/item/storage/bible, +/obj/item/storage/photo_album, +/obj/item/storage/trinketbox, +/obj/item/storage/briefcase/clutch, +/obj/item/storage/wallet/random, +/obj/item/storage/wallet/womens, +/obj/item/bananapeel, +/obj/item/taperecorder, +/obj/item/camera, +/obj/item/binoculars, +/obj/item/binoculars/spyglass, +/obj/item/laser_pointer/red, +/obj/item/healthanalyzer, +/obj/item/stamp/chameleon, /obj/structure/closet/alien, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) @@ -554,10 +554,10 @@ /obj/item/clothing/mask/muzzle/tape, /obj/item/clothing/mask/muzzle/tape, /obj/item/clothing/mask/muzzle/tape, -/obj/item/weapon/tape_roll, -/obj/item/weapon/tape_roll, -/obj/item/weapon/tape_roll, -/obj/item/weapon/tape_roll, +/obj/item/tape_roll, +/obj/item/tape_roll, +/obj/item/tape_roll, +/obj/item/tape_roll, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "Ji" = ( @@ -614,8 +614,8 @@ /area/space) "KW" = ( /obj/structure/table/alien, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/storage/box/beakers, +/obj/item/reagent_containers/dropper, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "Lg" = ( @@ -663,8 +663,8 @@ /area/abductor/interior) "Nq" = ( /obj/structure/table/alien, -/obj/item/weapon/melee/baton, -/obj/item/weapon/melee/baton, +/obj/item/melee/baton, +/obj/item/melee/baton, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "ND" = ( @@ -677,8 +677,8 @@ /area/abductor/interior) "Ov" = ( /obj/structure/table/alien, -/obj/item/weapon/gun/energy/sickshot, -/obj/item/weapon/gun/energy/sickshot, +/obj/item/gun/energy/sickshot, +/obj/item/gun/energy/sickshot, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "Oz" = ( @@ -727,8 +727,8 @@ pixel_x = -32 }, /obj/item/clothing/shoes/magboots, -/obj/item/weapon/gun/energy/gun/taser, -/obj/item/device/flash, +/obj/item/gun/energy/gun/taser, +/obj/item/flash, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "QI" = ( @@ -833,7 +833,7 @@ /area/abductor/interior) "Wl" = ( /obj/structure/table/alien, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/gloves, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "WB" = ( @@ -924,8 +924,8 @@ /obj/item/ammo_magazine/cell_mag/advanced, /obj/item/ammo_magazine/cell_mag/advanced, /obj/item/ammo_magazine/cell_mag/advanced, -/obj/item/weapon/gun/projectile/cell_loaded, -/obj/item/weapon/gun/projectile/cell_loaded, +/obj/item/gun/projectile/cell_loaded, +/obj/item/gun/projectile/cell_loaded, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "Zk" = ( diff --git a/maps/offmap_vr/om_ships/aro.dmm b/maps/offmap_vr/om_ships/aro.dmm index 5991b169e98..18e07a2001a 100644 --- a/maps/offmap_vr/om_ships/aro.dmm +++ b/maps/offmap_vr/om_ships/aro.dmm @@ -548,8 +548,8 @@ /area/ship/aro/recreation) "bs" = ( /obj/structure/table/standard, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/knife/butch, +/obj/item/material/kitchen/rollingpin, /obj/effect/floor_decal/borderfloorwhite{ dir = 6 }, @@ -584,7 +584,7 @@ /area/ship/aro/centralarea) "bz" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /obj/machinery/alarm/alarms_hidden{ pixel_y = 25 }, @@ -626,7 +626,7 @@ /area/ship/aro/centralarea) "bF" = ( /obj/structure/table/standard, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/machinery/light{ dir = 8 @@ -704,7 +704,7 @@ /turf/simulated/floor/tiled/white, /area/ship/aro/centralarea) "bQ" = ( -/obj/item/device/healthanalyzer/advanced, +/obj/item/healthanalyzer/advanced, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -739,11 +739,11 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/aro/centralarea) "bT" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/techmaint, /area/ship/aro/centralarea) "bU" = ( -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /obj/structure/table/alien/blue, /turf/simulated/floor/tiled/techmaint, /area/ship/aro/centralarea) @@ -1006,11 +1006,11 @@ /turf/simulated/floor/tiled/white, /area/ship/aro/centralarea) "cB" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, @@ -1020,34 +1020,34 @@ /obj/item/bodybag/cryobag{ pixel_x = 5 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/box/masks, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire{ layer = 2.9; pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = -2 }, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/structure/closet/medical_wall{ pixel_y = -32 }, -/obj/item/weapon/storage/box/body_record_disk, +/obj/item/storage/box/body_record_disk, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/borderfloorwhite/corner2{ dir = 9 @@ -1551,8 +1551,8 @@ /area/ship/aro/centralarea) "dD" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /turf/simulated/floor/tiled/techfloor, /area/ship/aro/centralarea) "dE" = ( @@ -1596,10 +1596,10 @@ /obj/structure/closet{ name = "custodial" }, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/storage/box/lights/mixed, /obj/machinery/light/small{ dir = 8 }, @@ -2157,7 +2157,7 @@ /turf/simulated/floor/wood, /area/ship/aro/midshipshangars) "eX" = ( -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/table/alien/blue, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/alarm/alarms_hidden{ @@ -2215,7 +2215,7 @@ /turf/simulated/shuttle/floor/alienplating/blue, /area/ship/aro/midshipshangars) "ff" = ( -/obj/item/weapon/bedsheet/captaindouble, +/obj/item/bedsheet/captaindouble, /obj/structure/bed/double, /turf/simulated/floor/wood, /area/ship/aro/midshipshangars) @@ -2408,7 +2408,7 @@ /turf/simulated/floor/wood, /area/ship/aro/midshipshangars) "fA" = ( -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/table/alien/blue, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -3016,8 +3016,8 @@ /area/ship/aro/centralarea) "si" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/rig/robotics, -/obj/item/weapon/cell/high, +/obj/item/rig/robotics, +/obj/item/cell/high, /turf/simulated/floor/tiled/techfloor, /area/ship/aro/centralarea) "sl" = ( @@ -3079,8 +3079,8 @@ /area/ship/aro/midshipshangars) "CT" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/technomancer_core/universal, -/obj/item/weapon/technomancer_catalog/universal, +/obj/item/technomancer_core/universal, +/obj/item/technomancer_catalog/universal, /turf/simulated/floor/tiled/techfloor, /area/ship/aro/centralarea) "GH" = ( diff --git a/maps/offmap_vr/om_ships/aro2.dmm b/maps/offmap_vr/om_ships/aro2.dmm index f8fdcb70111..d39bc855e86 100644 --- a/maps/offmap_vr/om_ships/aro2.dmm +++ b/maps/offmap_vr/om_ships/aro2.dmm @@ -83,7 +83,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -24 @@ -104,7 +104,7 @@ /area/aro2/room1) "aE" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/carpet/blue, /area/aro2/room1) "aI" = ( @@ -257,7 +257,7 @@ /area/aro2/room2) "bB" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/carpet/gaycarpet, /area/aro2/room2) "bC" = ( @@ -386,7 +386,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -24 @@ -404,7 +404,7 @@ /area/aro2/room3) "cF" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/carpet/purcarpet, /area/aro2/room3) "cG" = ( @@ -742,7 +742,7 @@ pixel_y = 23 }, /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro2/airarea) "fm" = ( @@ -1346,7 +1346,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -24 @@ -1585,7 +1585,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -24 @@ -1882,7 +1882,7 @@ /obj/structure/table/steel, /obj/structure/cable/cyan, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -24 @@ -1917,11 +1917,11 @@ /area/aro2/airarea) "sB" = ( /obj/structure/table/steel, -/obj/item/weapon/magnetic_ammo/pistol/khi{ +/obj/item/magnetic_ammo/pistol/khi{ pixel_x = 5; pixel_y = 2 }, -/obj/item/weapon/magnetic_ammo/pistol/khi{ +/obj/item/magnetic_ammo/pistol/khi{ pixel_x = -3; pixel_y = 5 }, @@ -2266,7 +2266,7 @@ /area/aro2/boatdeck) "wM" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /turf/simulated/floor/tiled/eris/techmaint_perforated, /area/aro2/starboardbay) "wS" = ( @@ -2378,7 +2378,7 @@ dir = 8 }, /obj/structure/table/steel, -/obj/item/weapon/inducer/hybrid, +/obj/item/inducer/hybrid, /turf/simulated/floor/tiled/eris/techmaint_perforated, /area/aro2/surfluid) "yw" = ( @@ -2431,13 +2431,13 @@ /obj/structure/closet/secure_closet/freezer/fridge{ starts_with = null }, -/obj/item/weapon/reagent_containers/food/snacks/generalschicken, -/obj/item/weapon/storage/box/wings, -/obj/item/weapon/reagent_containers/food/snacks/kitsuneudon, -/obj/item/weapon/reagent_containers/food/snacks/fries, -/obj/item/weapon/reagent_containers/food/snacks/grilledcheese, -/obj/item/weapon/reagent_containers/food/snacks/jellysandwich, -/obj/item/weapon/reagent_containers/food/snacks/enchiladas, +/obj/item/reagent_containers/food/snacks/generalschicken, +/obj/item/storage/box/wings, +/obj/item/reagent_containers/food/snacks/kitsuneudon, +/obj/item/reagent_containers/food/snacks/fries, +/obj/item/reagent_containers/food/snacks/grilledcheese, +/obj/item/reagent_containers/food/snacks/jellysandwich, +/obj/item/reagent_containers/food/snacks/enchiladas, /turf/simulated/floor/tiled/eris/techmaint_perforated, /area/aro2/dining) "yY" = ( @@ -3159,7 +3159,7 @@ /area/aro2/airarea) "HT" = ( /obj/structure/table/steel, -/obj/item/device/perfect_tele/alien, +/obj/item/perfect_tele/alien, /turf/simulated/floor/tiled/eris/dark/cargo, /area/shuttle/aroboat2) "Ib" = ( @@ -3515,7 +3515,7 @@ /area/shuttle/aroboat2) "Lv" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/metalfoam, +/obj/item/storage/box/metalfoam, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -3689,7 +3689,7 @@ dir = 4 }, /obj/structure/table/steel, -/obj/item/device/sleevemate, +/obj/item/sleevemate, /turf/simulated/floor/tiled/eris/techmaint_perforated, /area/aro2/surfluid) "NQ" = ( @@ -4217,7 +4217,7 @@ /area/space) "TT" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /turf/simulated/floor/tiled/eris/techmaint_perforated, /area/aro2/portbay) "TU" = ( @@ -4282,7 +4282,7 @@ /area/aro2/boatdeck) "Vg" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro2/powerarea) "Vm" = ( diff --git a/maps/offmap_vr/om_ships/aro3.dmm b/maps/offmap_vr/om_ships/aro3.dmm index 1cef8ee3e52..db87ae36368 100644 --- a/maps/offmap_vr/om_ships/aro3.dmm +++ b/maps/offmap_vr/om_ships/aro3.dmm @@ -412,7 +412,7 @@ /area/aro3/function) "cn" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/metalfoam, +/obj/item/storage/box/metalfoam, /turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "cr" = ( @@ -443,7 +443,7 @@ dir = 8 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/metalfoam, +/obj/item/storage/box/metalfoam, /obj/effect/floor_decal/milspec/color/blue/half{ dir = 9 }, @@ -489,7 +489,7 @@ /area/aro3/atmos) "cL" = ( /obj/structure/table/marble, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) @@ -581,10 +581,10 @@ /area/space) "dp" = ( /obj/structure/table/fancyblack, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -769,7 +769,7 @@ /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/aro3/bar) "en" = ( -/obj/item/weapon/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -836,7 +836,7 @@ /area/aro3/suite_starboard_wc) "eL" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -1185,8 +1185,8 @@ /area/aro3/flight_deck) "hb" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/reagent_containers/spray/sterilizine, +/obj/item/storage/box/lights/mixed, +/obj/item/reagent_containers/spray/sterilizine, /obj/effect/floor_decal/milspec/monotile, /turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) @@ -1226,13 +1226,13 @@ /obj/structure/closet/crate{ name = "qpad parts" }, -/obj/item/weapon/bluespace_crystal, -/obj/item/weapon/stock_parts/capacitor/hyper, -/obj/item/weapon/stock_parts/manipulator/hyper, +/obj/item/bluespace_crystal, +/obj/item/stock_parts/capacitor/hyper, +/obj/item/stock_parts/manipulator/hyper, /obj/item/stack/cable_coil{ amount = 15 }, -/obj/item/weapon/circuitboard/quantumpad, +/obj/item/circuitboard/quantumpad, /obj/item/stack/material/steel{ amount = 20 }, @@ -1249,7 +1249,7 @@ /area/aro3/suite_starboard_wc) "hw" = ( /obj/structure/table/glass, -/obj/item/device/sleevemate, +/obj/item/sleevemate, /obj/effect/floor_decal/milspec_sterile/green/corner{ dir = 1 }, @@ -1469,7 +1469,7 @@ /area/aro3/hallway_port) "iP" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/blucarpet, /area/aro3/bunkrooms) "iQ" = ( @@ -1570,10 +1570,10 @@ /area/aro3/park) "jx" = ( /obj/structure/closet/crate/medical/blood, -/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus, -/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus, -/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus, -/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus, +/obj/item/reagent_containers/blood/prelabeled/OMinus, +/obj/item/reagent_containers/blood/prelabeled/OMinus, +/obj/item/reagent_containers/blood/prelabeled/OMinus, +/obj/item/reagent_containers/blood/prelabeled/OMinus, /turf/simulated/floor/tiled/techmaint, /area/aro3/medical) "jy" = ( @@ -1797,7 +1797,7 @@ /area/aro3/medical) "kI" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 6 }, @@ -1889,7 +1889,7 @@ /turf/simulated/floor/plating/eris/under/airless, /area/space) "lo" = ( -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/bed/padded, /turf/simulated/floor/carpet/oracarpet, /area/aro3/bunkrooms) @@ -2299,10 +2299,10 @@ /area/aro3/suite_starboard) "nW" = ( /obj/structure/table/fancyblack, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -2342,7 +2342,7 @@ /area/aro3/bar) "on" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -2581,7 +2581,7 @@ /area/aro3/power) "px" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/effect/floor_decal/milspec/monotile, /turf/simulated/floor/tiled/milspec, /area/aro3/workshop) @@ -2596,7 +2596,7 @@ /area/aro3/workshop) "pH" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/milspec_sterile/green/corner, /turf/simulated/floor/tiled/milspec/sterile, @@ -2655,7 +2655,7 @@ /area/aro3/hallway_bunkrooms) "qk" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "qm" = ( @@ -2843,7 +2843,7 @@ /area/aro3/function) "rA" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/effect/floor_decal/milspec/monotile, /turf/simulated/floor/tiled/milspec, /area/aro3/workshop) @@ -3179,7 +3179,7 @@ /area/aro3/power) "tL" = ( /obj/structure/table/glass, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "I guess you can use this body while I'm in another one, but I'll charge you for anything you blow up or steal! -Aro" }, /obj/effect/floor_decal/milspec/color/blue/half{ @@ -3226,7 +3226,7 @@ /area/aro3/repair_bay) "ug" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/oracarpet, /area/aro3/bunkrooms) "uE" = ( @@ -3401,7 +3401,7 @@ /area/aro3/workshop) "vL" = ( /obj/structure/table/marble, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/kitchen/rollingpin, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) @@ -3430,7 +3430,7 @@ /area/aro3/eva_hall) "vQ" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/purcarpet, /area/aro3/bunkrooms) "vT" = ( @@ -3503,7 +3503,7 @@ /area/aro3/function) "wl" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/milspec_sterile/green/corner{ dir = 4 @@ -4123,7 +4123,7 @@ /area/aro3/repair_bay) "zB" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/device/nif/authentic, +/obj/item/nif/authentic, /turf/simulated/floor/tiled/techmaint, /area/aro3/medical) "zD" = ( @@ -4813,7 +4813,7 @@ /area/aro3/atmos) "Er" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/metalfoam, +/obj/item/storage/box/metalfoam, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/milspec/monotile, /turf/simulated/floor/tiled/milspec, @@ -4961,7 +4961,7 @@ /area/aro3/function) "Ff" = ( /obj/structure/table/glass, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /obj/effect/floor_decal/milspec_sterile/green/corner, /turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) @@ -4978,7 +4978,7 @@ /area/aro3/eva_hall) "Fl" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) "Fn" = ( @@ -5047,8 +5047,8 @@ /area/aro3/eva_hall) "FH" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus, -/obj/item/weapon/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/prelabeled/OMinus, +/obj/item/reagent_containers/blood/empty, /obj/machinery/firealarm/angled/hidden{ dir = 8 }, @@ -5097,7 +5097,7 @@ /turf/simulated/floor/plating/eris/under, /area/aro3/atmos) "Go" = ( -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/bed/padded, /turf/simulated/floor/carpet/blucarpet, /area/aro3/bunkrooms) @@ -5131,7 +5131,7 @@ dir = 1; pixel_y = -24 }, -/obj/item/device/uav/loaded{ +/obj/item/uav/loaded{ nickname = "FoxBot Beta" }, /turf/simulated/floor/tiled/milspec, @@ -5168,7 +5168,7 @@ /area/aro3/medical) "GG" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/device/sleevemate, +/obj/item/sleevemate, /turf/simulated/floor/tiled/techmaint, /area/aro3/medical) "GI" = ( @@ -5177,9 +5177,9 @@ /area/aro3/surfluid) "GV" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/surgery, +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/adv, /turf/simulated/floor/tiled/techmaint, /area/aro3/medical) "Hb" = ( @@ -6145,7 +6145,7 @@ /area/aro3/atmos) "NV" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -6284,7 +6284,7 @@ /area/space) "ON" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled/milspec, /area/aro3/power) "OP" = ( @@ -6366,7 +6366,7 @@ /area/aro3/power) "Pu" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) "Pw" = ( @@ -6801,9 +6801,9 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/inducer/hybrid, -/obj/item/device/perfect_tele/alien/bluefo, -/obj/item/device/mapping_unit, +/obj/item/inducer/hybrid, +/obj/item/perfect_tele/alien/bluefo, +/obj/item/mapping_unit, /turf/simulated/floor/tiled/milspec, /area/aro3/repair_bay) "Ta" = ( @@ -7123,7 +7123,7 @@ /area/aro3/park) "Vl" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /obj/effect/floor_decal/milspec_sterile/green/corner{ dir = 4 }, @@ -7208,7 +7208,7 @@ /area/aro3/hallway_starboard) "Wg" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) "Wk" = ( @@ -7333,7 +7333,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 8 }, -/obj/item/device/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, /turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "Xj" = ( @@ -7556,7 +7556,7 @@ /area/aro3/surfluid) "YN" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) "YQ" = ( @@ -7718,7 +7718,7 @@ /area/aro3/suite_starboard) "ZM" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -7738,7 +7738,7 @@ /turf/simulated/floor/tiled/milspec, /area/aro3/surfluid) "ZO" = ( -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/bed/padded, /turf/simulated/floor/carpet/purcarpet, /area/aro3/bunkrooms) diff --git a/maps/offmap_vr/om_ships/bearcat.dmm b/maps/offmap_vr/om_ships/bearcat.dmm index 25c74eb6d4c..aa1c6ca1e61 100644 --- a/maps/offmap_vr/om_ships/bearcat.dmm +++ b/maps/offmap_vr/om_ships/bearcat.dmm @@ -182,7 +182,7 @@ dir = 8; icon_state = "tube1" }, -/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, /obj/structure/closet/cabinet, /obj/item/clothing/suit/space/void/refurb/officer, /obj/item/clothing/head/helmet/space/void/refurb/officer, @@ -201,13 +201,13 @@ /turf/simulated/floor/bluegrid, /area/shuttle/bearcat/comms) "aB" = ( -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /obj/structure/bed/pod, /turf/simulated/floor/wood, /area/shuttle/bearcat/command_captain) "aC" = ( -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/structure/table/woodentable, /obj/machinery/light_switch{ pixel_y = 25 @@ -247,7 +247,7 @@ /obj/structure/handrail{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -22 }, /turf/simulated/floor/tiled/techmaint, @@ -329,7 +329,7 @@ icon_state = "1-4" }, /obj/item/ammo_magazine/ammo_box/b12g/beanbag, -/obj/item/weapon/gun/projectile/shotgun/pump/combat{ +/obj/item/gun/projectile/shotgun/pump/combat{ desc = "When words don't strike hard enough."; name = "Solid Argument" }, @@ -339,7 +339,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -22 }, /turf/simulated/floor/wood, @@ -389,16 +389,16 @@ /area/shuttle/bearcat/dock_central) "aT" = ( /obj/structure/closet/crate, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/refurb/engineering, /obj/item/clothing/suit/space/void/refurb/engineering, /obj/item/clothing/head/helmet/space/void/refurb/engineering, /obj/item/clothing/head/helmet/space/void/refurb/engineering, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/dock_port) "aU" = ( @@ -874,7 +874,7 @@ dir = 4; icon_state = "shower" }, -/obj/item/weapon/soap, +/obj/item/soap, /obj/machinery/light{ dir = 1 }, @@ -974,7 +974,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_dorms) "cv" = ( -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/structure/bed, /obj/structure/closet/walllocker/emerglocker/north, /turf/simulated/floor/tiled/techfloor, @@ -1095,7 +1095,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_dorms) "cK" = ( -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/structure/bed, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -1160,16 +1160,16 @@ /area/shuttle/bearcat/maintenance_engine) "cS" = ( /obj/structure/closet/crate, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/refurb/engineering, /obj/item/clothing/suit/space/void/refurb/engineering, /obj/item/clothing/head/helmet/space/void/refurb/engineering, /obj/item/clothing/head/helmet/space/void/refurb/engineering, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/dock_starboard) "cT" = ( @@ -1210,7 +1210,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -22 }, /obj/machinery/light, @@ -1244,7 +1244,7 @@ /area/shuttle/bearcat/crew_corridors) "db" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_x = -32 }, /obj/structure/cable{ @@ -1256,7 +1256,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_dorms) "dc" = ( -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/structure/bed, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_dorms) @@ -1299,7 +1299,7 @@ /area/shuttle/bearcat/crew_dorms) "dh" = ( /obj/structure/closet/walllocker/emerglocker/south, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/structure/bed, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_dorms) @@ -1349,7 +1349,7 @@ /area/shuttle/bearcat/crew_kitchen) "dq" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/machinery/light{ dir = 4 }, @@ -1368,7 +1368,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/cargo) "dt" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 22 }, @@ -1513,7 +1513,7 @@ /area/shuttle/bearcat/crew_medbay) "dK" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/effect/decal/cleanable/blood, /obj/structure/closet/walllocker/emerglocker/east, /turf/simulated/floor/tiled/techfloor, @@ -1684,10 +1684,10 @@ /area/shuttle/bearcat/crew_medbay) "ec" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/pill_bottle/kelotane, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/pill_bottle/kelotane, +/obj/item/storage/box/syringes, /obj/structure/cable, -/obj/item/weapon/storage/firstaid, +/obj/item/storage/firstaid, /obj/machinery/power/apc/alarms_hidden{ dir = 8; icon_state = "apc0" @@ -1832,9 +1832,9 @@ /area/shuttle/bearcat/crew_corridors) "ex" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer, -/obj/item/weapon/storage/pill_bottle/kelotane, -/obj/item/weapon/storage/pill_bottle/antitox, +/obj/item/healthanalyzer, +/obj/item/storage/pill_bottle/kelotane, +/obj/item/storage/pill_bottle/antitox, /obj/machinery/light_switch{ pixel_x = -25 }, @@ -1971,7 +1971,7 @@ /obj/structure/handrail{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -22 }, /turf/simulated/floor/tiled/techfloor, @@ -1987,7 +1987,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 22 }, @@ -2018,13 +2018,13 @@ /area/shuttle/bearcat/crew_corridors) "eV" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical{ pixel_x = 7; pixel_y = 4 }, -/obj/item/device/t_scanner, -/obj/item/weapon/cell/high, +/obj/item/t_scanner, +/obj/item/cell/high, /obj/machinery/light_switch{ pixel_y = 25 }, @@ -2055,7 +2055,7 @@ /obj/fiftyspawner/steel, /obj/fiftyspawner/rods, /obj/fiftyspawner/rglass, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 22 }, @@ -2063,11 +2063,11 @@ /area/shuttle/bearcat/maintenance_storage) "eZ" = ( /obj/structure/table/standard, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/refurb/engineering, /obj/item/clothing/head/helmet/space/void/refurb/engineering, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/maintenance_storage) "fa" = ( @@ -2084,7 +2084,7 @@ /area/shuttle/bearcat/crew_corridors) "fb" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/closet/walllocker/emerglocker/east, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_medbay) @@ -2118,13 +2118,13 @@ /area/shuttle/bearcat/crew_corridors) "fh" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = 5; pixel_y = -7 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/clothing/head/welding, -/obj/item/device/analyzer, +/obj/item/analyzer, /obj/machinery/light_switch{ pixel_x = -25 }, @@ -2159,7 +2159,7 @@ /area/shuttle/bearcat/maintenance_storage) "fm" = ( /obj/structure/table/standard, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/refurb/engineering, /obj/item/clothing/head/helmet/space/void/refurb/engineering, @@ -2168,7 +2168,7 @@ icon_state = "alarm0"; pixel_x = 26 }, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/maintenance_storage) "fn" = ( @@ -2279,7 +2279,7 @@ /obj/structure/closet/walllocker/emerglocker/east, /obj/effect/decal/cleanable/cobweb2, /obj/machinery/washing_machine, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 22 }, @@ -2297,10 +2297,10 @@ /area/shuttle/bearcat/crew_corridors) "fA" = ( /obj/structure/table/standard, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/weapon/storage/box/lights/bulbs, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/storage/box/lights/bulbs, +/obj/item/storage/box/lights/mixed, /obj/structure/cable, /obj/machinery/alarm/alarms_hidden{ dir = 4; @@ -2309,7 +2309,7 @@ }, /obj/machinery/power/apc/alarms_hidden, /obj/item/clothing/head/welding, -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/maintenance_storage) "fB" = ( @@ -2459,8 +2459,8 @@ /area/shuttle/bearcat/unused2) "fR" = ( /obj/structure/table/reinforced, -/obj/item/device/flashlight/lamp, -/obj/item/weapon/spacecash/c1000, +/obj/item/flashlight/lamp, +/obj/item/spacecash/c1000, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/unused2) "fS" = ( @@ -2584,7 +2584,7 @@ /area/shuttle/bearcat/unused2) "gg" = ( /obj/machinery/light/small, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -22 }, /turf/simulated/floor/tiled/techfloor, @@ -2679,7 +2679,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 22 }, @@ -2728,15 +2728,15 @@ /area/shuttle/bearcat/maintenance_power) "gx" = ( /obj/structure/table/standard, -/obj/item/device/flashlight, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/flashlight, +/obj/item/storage/toolbox/electrical{ pixel_x = 7; pixel_y = 4 }, /obj/machinery/light_switch{ pixel_y = 25 }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/machinery/light/small{ dir = 1 }, @@ -2747,7 +2747,7 @@ /obj/item/stack/material/uranium{ amount = 10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 22 }, @@ -2911,7 +2911,7 @@ /obj/structure/handrail{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -22 }, /turf/simulated/floor/plating, @@ -2949,8 +2949,8 @@ /obj/structure/closet/crate{ dir = 8 }, -/obj/item/weapon/tank/phoron, -/obj/item/weapon/tank/phoron, +/obj/item/tank/phoron, +/obj/item/tank/phoron, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/maintenance_enginecontrol) "gS" = ( @@ -3209,7 +3209,7 @@ /turf/simulated/wall/rshull, /area/shuttle/bearcat/maintenance_engine_pod_starboard) "in" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -22 }, /turf/simulated/floor/tiled/techfloor, @@ -3289,7 +3289,7 @@ /area/shuttle/bearcat/dock_port) "nx" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/closet/walllocker/emerglocker/south, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_medbay) @@ -3323,7 +3323,7 @@ /turf/simulated/floor/airless, /area/shuttle/bearcat/command) "sP" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -22 }, /obj/structure/closet/walllocker/emerglocker/east, @@ -3356,7 +3356,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/dock_starboard) "Bo" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -22 }, /turf/simulated/floor/tiled/techfloor, @@ -3508,7 +3508,7 @@ /obj/structure/bed/chair/bay/comfy/black{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -22 }, /turf/simulated/floor/tiled/techfloor, diff --git a/maps/offmap_vr/om_ships/curashuttle.dmm b/maps/offmap_vr/om_ships/curashuttle.dmm index 6ea0a0df556..3d4887fed2a 100644 --- a/maps/offmap_vr/om_ships/curashuttle.dmm +++ b/maps/offmap_vr/om_ships/curashuttle.dmm @@ -115,11 +115,11 @@ pixel_x = 24 }, /obj/structure/table/darkglass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 8; pixel_y = -2 }, -/obj/item/weapon/pen/fountain, +/obj/item/pen/fountain, /obj/machinery/photocopier/faxmachine{ department = "Curabitur Rescue Service"; name = "curabitur fax machine"; @@ -132,10 +132,10 @@ /turf/simulated/wall/rdshull, /area/shuttle/curabitur/curashuttle/cockpit) "ar" = ( -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/weapon/surgical/scalpel/manager, -/obj/item/weapon/surgical/scalpel/ripper, -/obj/item/weapon/surgical/circular_saw/manager, +/obj/item/storage/firstaid/surgery, +/obj/item/surgical/scalpel/manager, +/obj/item/surgical/scalpel/ripper, +/obj/item/surgical/circular_saw/manager, /obj/item/stack/nanopaste/advanced, /obj/item/stack/nanopaste/advanced, /obj/structure/table/standard, @@ -146,8 +146,8 @@ /area/shuttle/curabitur/curashuttle/med) "at" = ( /obj/structure/closet/crate/large, -/obj/item/weapon/gun/projectile/multi_cannon, -/obj/item/weapon/gun/projectile/multi_cannon, +/obj/item/gun/projectile/multi_cannon, +/obj/item/gun/projectile/multi_cannon, /obj/item/ammo_casing/macrobattery/buff, /obj/item/ammo_casing/macrobattery/buff, /obj/item/ammo_casing/macrobattery/detox, @@ -196,7 +196,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/shuttle/curabitur/curashuttle/cockpit) "ay" = ( -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/open/bed, /turf/simulated/floor/carpet/bcarpet, @@ -205,26 +205,26 @@ /turf/simulated/wall/rpshull, /area/shuttle/curabitur/curashuttle/med) "aA" = ( -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/pill_bottle/spaceacillin, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/pill_bottle/spaceacillin, /obj/structure/table/standard, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/healthanalyzer/advanced, +/obj/item/healthanalyzer/advanced, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/white, /area/shuttle/curabitur/curashuttle/med) "aB" = ( -/obj/item/weapon/surgical/scalpel/alien, -/obj/item/weapon/surgical/retractor/alien, -/obj/item/weapon/surgical/hemostat/alien, -/obj/item/weapon/surgical/circular_saw/alien, -/obj/item/weapon/surgical/cautery/alien, -/obj/item/weapon/surgical/FixOVein/alien, -/obj/item/weapon/surgical/surgicaldrill/alien, +/obj/item/surgical/scalpel/alien, +/obj/item/surgical/retractor/alien, +/obj/item/surgical/hemostat/alien, +/obj/item/surgical/circular_saw/alien, +/obj/item/surgical/cautery/alien, +/obj/item/surgical/FixOVein/alien, +/obj/item/surgical/surgicaldrill/alien, /obj/structure/table/standard, /obj/machinery/recharger{ pixel_x = -8; @@ -241,12 +241,12 @@ /turf/simulated/floor/tiled/white, /area/shuttle/curabitur/curashuttle/med) "aD" = ( -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, +/obj/item/storage/backpack/dufflebag/syndie/med, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, /obj/structure/table/rack, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, +/obj/item/storage/backpack/dufflebag/syndie/med, /turf/simulated/floor/tiled/white, /area/shuttle/curabitur/curashuttle/med) "aE" = ( @@ -295,36 +295,36 @@ /turf/simulated/floor/carpet/bcarpet, /area/shuttle/curabitur/curashuttle/cockpit) "aH" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 31 }, -/obj/item/weapon/gun/projectile/automatic/mini_uzi, -/obj/item/weapon/card/id/syndicate{ +/obj/item/gun/projectile/automatic/mini_uzi, +/obj/item/card/id/syndicate{ access = list(616); assignment = "Curabitur Contractor"; origin_tech = newlist() }, -/obj/item/weapon/card/id/syndicate{ +/obj/item/card/id/syndicate{ access = list(616); assignment = "Curabitur Contractor"; origin_tech = newlist() }, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, /turf/simulated/floor/carpet/bcarpet, /area/shuttle/curabitur/curashuttle/cockpit) "aI" = ( @@ -346,10 +346,10 @@ /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled/white, /area/shuttle/curabitur/curashuttle/med) "aL" = ( @@ -363,10 +363,10 @@ /area/shuttle/curabitur/curashuttle/med) "aM" = ( /obj/structure/table/rack, -/obj/item/device/defib_kit/jumper_kit/loaded, -/obj/item/device/defib_kit/compact/combat/loaded, -/obj/item/device/defib_kit/compact/combat/loaded, -/obj/item/device/mmi/radio_enabled{ +/obj/item/defib_kit/jumper_kit/loaded, +/obj/item/defib_kit/compact/combat/loaded, +/obj/item/defib_kit/compact/combat/loaded, +/obj/item/mmi/radio_enabled{ req_access = newlist() }, /obj/machinery/light{ @@ -390,7 +390,7 @@ /obj/item/clothing/accessory/storage/white_drop_pouches, /obj/item/clothing/accessory/holster/machete, /obj/item/clothing/accessory/holster/hip, -/obj/item/weapon/material/knife/machete, +/obj/item/material/knife/machete, /obj/item/clothing/accessory/storage/white_drop_pouches, /obj/item/clothing/accessory/storage/white_drop_pouches, /turf/simulated/floor/carpet/bcarpet, @@ -446,9 +446,9 @@ /obj/structure/table/rack, /obj/item/wheelchair, /obj/item/wheelchair, -/obj/item/weapon/cane/crutch, -/obj/item/weapon/cane/crutch, -/obj/item/weapon/cane/white/collapsible, +/obj/item/cane/crutch, +/obj/item/cane/crutch, +/obj/item/cane/white/collapsible, /obj/item/clothing/accessory/stethoscope, /turf/simulated/floor/tiled/white, /area/shuttle/curabitur/curashuttle/med) @@ -497,16 +497,16 @@ }, /obj/structure/table/standard, /obj/fiftyspawner/steel, -/obj/item/weapon/storage/toolbox/syndicate/powertools, +/obj/item/storage/toolbox/syndicate/powertools, /obj/item/stack/nanopaste/advanced, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/device/multitool, -/obj/item/weapon/storage/box/metalfoam, +/obj/item/multitool, +/obj/item/storage/box/metalfoam, /obj/item/bodybag/cryobag/robobag, /obj/item/bodybag/cryobag/robobag, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/structure/panic_button{ pixel_y = 32 }, @@ -569,7 +569,7 @@ pixel_x = 2; pixel_y = 8 }, -/obj/item/device/gps/medical, +/obj/item/gps/medical, /turf/simulated/floor/tiled, /area/shuttle/curabitur/curashuttle/med) "bg" = ( @@ -581,9 +581,9 @@ /turf/simulated/floor/tiled, /area/shuttle/curabitur/curashuttle/med) "bh" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/structure/table/rack, /obj/item/clothing/head/helmet/space/void/medical, /obj/item/clothing/head/helmet/space/void/medical, @@ -591,23 +591,23 @@ /obj/item/clothing/suit/space/void/medical, /obj/item/clothing/suit/space/void/medical, /obj/item/clothing/suit/space/void/medical, -/obj/item/weapon/tank/air, -/obj/item/weapon/tank/air, -/obj/item/weapon/tank/air, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/air, +/obj/item/tank/air, +/obj/item/tank/air, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, -/obj/item/device/gps/medical, -/obj/item/device/gps/medical, -/obj/item/device/gps/medical, +/obj/item/gps/medical, +/obj/item/gps/medical, +/obj/item/gps/medical, /turf/simulated/floor/tiled, /area/shuttle/curabitur/curashuttle/med) "bi" = ( @@ -703,21 +703,21 @@ "bu" = ( /obj/structure/table/darkglass, /obj/machinery/atmospherics/pipe/vent, -/obj/item/weapon/reagent_containers/food/snacks/bagelsunflower, -/obj/item/weapon/reagent_containers/food/snacks/applepie, -/obj/item/weapon/reagent_containers/food/snacks/carrotfries, -/obj/item/weapon/reagent_containers/food/snacks/cube/nutriment, -/obj/item/weapon/reagent_containers/food/snacks/cube/protein, -/obj/item/weapon/reagent_containers/food/snacks/cube/protein, -/obj/item/weapon/reagent_containers/food/snacks/cube/protein, -/obj/item/weapon/reagent_containers/food/snacks/cracker, +/obj/item/reagent_containers/food/snacks/bagelsunflower, +/obj/item/reagent_containers/food/snacks/applepie, +/obj/item/reagent_containers/food/snacks/carrotfries, +/obj/item/reagent_containers/food/snacks/cube/nutriment, +/obj/item/reagent_containers/food/snacks/cube/protein, +/obj/item/reagent_containers/food/snacks/cube/protein, +/obj/item/reagent_containers/food/snacks/cube/protein, +/obj/item/reagent_containers/food/snacks/cracker, /turf/simulated/floor/carpet/sblucarpet, /area/shuttle/curabitur/curashuttle/med) "bv" = ( /obj/structure/table/darkglass, -/obj/item/weapon/reagent_containers/food/snacks/bangersandmash, -/obj/item/weapon/reagent_containers/food/snacks/candiedapple, -/obj/item/weapon/reagent_containers/food/snacks/chickenwing, +/obj/item/reagent_containers/food/snacks/bangersandmash, +/obj/item/reagent_containers/food/snacks/candiedapple, +/obj/item/reagent_containers/food/snacks/chickenwing, /turf/simulated/floor/carpet/sblucarpet, /area/shuttle/curabitur/curashuttle/med) "bw" = ( @@ -751,10 +751,10 @@ /area/shuttle/curabitur/curashuttle/med) "bB" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/bag/chemistry, -/obj/item/weapon/storage/box/pillbottles, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/storage/bag/chemistry, +/obj/item/storage/box/pillbottles, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/structure/cable{ icon_state = "0-4" }, @@ -773,8 +773,8 @@ pixel_y = -31 }, /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/beaker/bluespace, -/obj/item/weapon/reagent_containers/glass/beaker/bluespace, +/obj/item/reagent_containers/glass/beaker/bluespace, +/obj/item/reagent_containers/glass/beaker/bluespace, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -1071,8 +1071,8 @@ /area/shuttle/curabitur/curashuttle/hangar) "ca" = ( /obj/structure/table/standard, -/obj/item/device/survivalcapsule, -/obj/item/device/survivalcapsule, +/obj/item/survivalcapsule, +/obj/item/survivalcapsule, /obj/item/clothing/gloves/sterile/nitrile, /obj/item/clothing/gloves/sterile/nitrile, /obj/item/clothing/suit/surgicalapron, @@ -1080,19 +1080,19 @@ /area/shuttle/curabitur/curashuttle/med) "cb" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/surgical/scalpel/manager, -/obj/item/weapon/surgical/scalpel/manager, -/obj/item/weapon/surgical/circular_saw/manager, -/obj/item/weapon/surgical/circular_saw/manager, +/obj/item/surgical/scalpel/manager, +/obj/item/surgical/scalpel/manager, +/obj/item/surgical/circular_saw/manager, +/obj/item/surgical/circular_saw/manager, /obj/item/stack/nanopaste/advanced, /obj/item/stack/nanopaste/advanced, -/obj/item/device/defib_kit/compact/combat/loaded, -/obj/item/device/defib_kit/compact/combat/loaded, -/obj/item/device/healthanalyzer/advanced, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, -/obj/item/weapon/surgical/bone_clamp, -/obj/item/weapon/surgical/bone_clamp, -/obj/item/weapon/surgical/scalpel/ripper, +/obj/item/defib_kit/compact/combat/loaded, +/obj/item/defib_kit/compact/combat/loaded, +/obj/item/healthanalyzer/advanced, +/obj/item/storage/backpack/dufflebag/syndie/med, +/obj/item/surgical/bone_clamp, +/obj/item/surgical/bone_clamp, +/obj/item/surgical/scalpel/ripper, /obj/machinery/firealarm{ pixel_y = 24 }, @@ -1321,17 +1321,17 @@ icon_state = "2-8" }, /obj/structure/table/standard, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, /obj/machinery/cell_charger{ pixel_x = -3; pixel_y = 13 }, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, -/obj/item/weapon/storage/briefcase/inflatable, -/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/cell/high, +/obj/item/cell/high, +/obj/item/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/curabitur/curashuttle/hangar) "cG" = ( diff --git a/maps/offmap_vr/om_ships/gecko_cr.dmm b/maps/offmap_vr/om_ships/gecko_cr.dmm index defc551901e..d8ee6d4b87c 100644 --- a/maps/offmap_vr/om_ships/gecko_cr.dmm +++ b/maps/offmap_vr/om_ships/gecko_cr.dmm @@ -79,7 +79,7 @@ /area/shuttle/gecko_cr_cockpit) "bL" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_cr_cockpit) "bN" = ( @@ -94,7 +94,7 @@ dir = 8 }, /obj/structure/closet/crate, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb/marine, /obj/item/clothing/head/helmet/space/void/refurb/marine, /turf/simulated/floor/tiled/techfloor, @@ -127,7 +127,7 @@ dir = 8 }, /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_cr_cockpit) "dh" = ( @@ -157,8 +157,8 @@ "dO" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/closet/crate/engineering/electrical, -/obj/item/weapon/tank/oxygen/yellow, -/obj/item/weapon/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, /obj/item/clothing/suit/space/void/refurb/engineering, /obj/item/clothing/suit/space/void/refurb/engineering, /obj/item/clothing/head/helmet/space/void/refurb/engineering, @@ -632,11 +632,11 @@ /obj/structure/closet/crate{ dir = 1 }, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /turf/simulated/floor/tiled/techfloor, @@ -1079,7 +1079,7 @@ dir = 8 }, /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, @@ -1125,7 +1125,7 @@ dir = 4 }, /obj/structure/closet/crate, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb/marine, /obj/item/clothing/head/helmet/space/void/refurb/marine, /obj/structure/sign/directions/bridge{ @@ -1209,11 +1209,11 @@ /obj/structure/closet/crate{ dir = 1 }, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /turf/simulated/floor/tiled/techfloor, @@ -1249,16 +1249,16 @@ /turf/simulated/floor/plating, /area/shuttle/gecko_cr) "xT" = ( -/obj/item/weapon/tank/phoron/pressurized, -/obj/item/weapon/tank/phoron/pressurized, -/obj/item/weapon/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, /obj/structure/fuel_port/heavy{ pixel_y = 28 }, /obj/structure/closet/crate{ dir = 2 }, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_cr_engineering) @@ -1708,12 +1708,12 @@ /obj/structure/closet/crate{ dir = 1 }, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /obj/machinery/light, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /turf/simulated/floor/tiled/techfloor, @@ -1733,8 +1733,8 @@ dir = 4 }, /obj/structure/closet/crate, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_cr_cockpit) "FL" = ( @@ -1856,8 +1856,8 @@ dir = 8 }, /obj/structure/closet/crate, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_cr_cockpit) "HI" = ( @@ -2405,13 +2405,13 @@ "PI" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/closet/crate/engineering, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_cr_engineering) @@ -2513,11 +2513,11 @@ /obj/structure/closet/crate{ dir = 1 }, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb/pilot, /obj/item/clothing/head/helmet/space/void/refurb/pilot, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb/pilot, /obj/item/clothing/head/helmet/space/void/refurb/pilot, /turf/simulated/floor/tiled/techfloor, @@ -2659,7 +2659,7 @@ pixel_x = 27 }, /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_cr_cockpit) "Tx" = ( @@ -2924,7 +2924,7 @@ dir = 8 }, /obj/structure/table/steel, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/item/stack/material/tritium{ amount = 25 }, diff --git a/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm b/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm index bc77ee4563b..c392ed08a72 100644 --- a/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm +++ b/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm @@ -76,7 +76,7 @@ /area/shuttle/gecko_cr_cockpit_wreck) "bL" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_cr_cockpit_wreck) "bN" = ( @@ -91,7 +91,7 @@ dir = 8 }, /obj/structure/closet/crate, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb/marine, /obj/item/clothing/head/helmet/space/void/refurb/marine, /turf/simulated/floor/tiled/techfloor, @@ -118,7 +118,7 @@ }, /obj/machinery/light, /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_cr_cockpit_wreck) "dh" = ( @@ -144,7 +144,7 @@ "dO" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/closet/crate/engineering/electrical, -/obj/item/weapon/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; @@ -454,7 +454,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /obj/random/empty_or_lootable_crate, /turf/simulated/floor/reinforced/airless, /area/shuttle/gecko_cr_wreck) @@ -504,7 +504,7 @@ /area/shuttle/gecko_cr_cockpit_wreck) "kF" = ( /obj/structure/catwalk, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/floor/airless, /area/shuttle/gecko_cr_engineering_wreck) "kI" = ( @@ -619,7 +619,7 @@ /obj/structure/closet/crate{ dir = 1 }, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /obj/effect/floor_decal/industrial/outline/grey, @@ -1003,7 +1003,7 @@ dir = 1 }, /obj/structure/railing/grey, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/floor/airless, /area/shuttle/gecko_cr_wreck) "tD" = ( @@ -1062,7 +1062,7 @@ dir = 8 }, /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, @@ -1171,7 +1171,7 @@ /obj/structure/closet/crate{ dir = 1 }, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /obj/effect/floor_decal/industrial/outline/grey, @@ -1205,7 +1205,7 @@ /turf/simulated/floor/airless, /area/shuttle/gecko_cr_wreck) "xo" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/template_noop, /area/shuttle/gecko_cr_cockpit_wreck) "xT" = ( @@ -1606,7 +1606,7 @@ /area/shuttle/gecko_cr_wreck) "Ff" = ( /obj/structure/lattice, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/template_noop, /area/shuttle/gecko_cr_engineering_wreck) "Fq" = ( @@ -1680,7 +1680,7 @@ /turf/simulated/floor/plating, /area/shuttle/gecko_cr_engineering_wreck) "FV" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/template_noop, /area/template_noop) "FX" = ( @@ -1757,7 +1757,7 @@ dir = 8 }, /obj/structure/closet/crate, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_cr_cockpit_wreck) "HI" = ( @@ -1776,7 +1776,7 @@ /area/shuttle/gecko_cr_cockpit_wreck) "HK" = ( /obj/structure/closet/walllocker/emerglocker/north, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/floor/airless, /area/shuttle/gecko_cr_wreck) "Id" = ( @@ -1871,7 +1871,7 @@ dir = 1; pixel_y = -26 }, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/floor/reinforced/airless, /area/shuttle/gecko_cr_wreck) "Kn" = ( @@ -2174,7 +2174,7 @@ /turf/simulated/floor/reinforced/airless, /area/shuttle/gecko_cr_wreck) "Oz" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/template_noop, /area/shuttle/gecko_cr_wreck) "OA" = ( @@ -2221,7 +2221,7 @@ /turf/simulated/floor/reinforced/airless, /area/shuttle/gecko_cr_wreck) "OU" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/template_noop, /area/template_noop) "OX" = ( @@ -2322,7 +2322,7 @@ "PI" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/closet/crate/engineering, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -2351,7 +2351,7 @@ /turf/simulated/floor/airless, /area/shuttle/gecko_cr_cockpit_wreck) "PW" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/template_noop, /area/shuttle/gecko_cr_engineering_wreck) "Ql" = ( @@ -2565,7 +2565,7 @@ pixel_x = 27 }, /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_cr_cockpit_wreck) "Tx" = ( @@ -2628,7 +2628,7 @@ }, /area/shuttle/gecko_cr_engineering_wreck) "UY" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/airless, /area/shuttle/gecko_cr_engineering_wreck) "Va" = ( @@ -2832,7 +2832,7 @@ dir = 8 }, /obj/structure/table/steel, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/machinery/light{ dir = 4 }, diff --git a/maps/offmap_vr/om_ships/gecko_sh.dmm b/maps/offmap_vr/om_ships/gecko_sh.dmm index 54d6ef5da21..2a7a483965f 100644 --- a/maps/offmap_vr/om_ships/gecko_sh.dmm +++ b/maps/offmap_vr/om_ships/gecko_sh.dmm @@ -98,7 +98,7 @@ /area/shuttle/gecko_sh_engineering) "bL" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_sh) "bN" = ( @@ -112,8 +112,8 @@ /obj/structure/window/basic{ dir = 8 }, -/obj/item/weapon/tank/air, -/obj/item/weapon/tank/air, +/obj/item/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/head/helmet/space/emergency, @@ -174,12 +174,12 @@ }, /obj/machinery/light, /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_sh) "cY" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -199,8 +199,8 @@ /area/shuttle/gecko_sh) "dO" = ( /obj/effect/floor_decal/industrial/warning, -/obj/item/weapon/tank/oxygen/yellow, -/obj/item/weapon/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, /obj/item/clothing/suit/space/void/refurb/engineering, /obj/item/clothing/suit/space/void/refurb/engineering, /obj/item/clothing/head/helmet/space/void/refurb/engineering, @@ -619,7 +619,7 @@ /obj/structure/closet/crate{ dir = 1 }, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /obj/effect/floor_decal/industrial/outline/grey, @@ -1054,8 +1054,8 @@ /obj/structure/window/basic{ dir = 4 }, -/obj/item/weapon/tank/air, -/obj/item/weapon/tank/air, +/obj/item/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/head/helmet/space/emergency, @@ -1106,7 +1106,7 @@ /obj/structure/closet/crate{ dir = 1 }, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /obj/effect/floor_decal/industrial/outline/grey, @@ -1150,16 +1150,16 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_sh_engineering) "xT" = ( -/obj/item/weapon/tank/phoron/pressurized, -/obj/item/weapon/tank/phoron/pressurized, -/obj/item/weapon/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, /obj/structure/fuel_port/heavy{ pixel_y = 28 }, /obj/structure/closet/crate{ dir = 2 }, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_sh_engineering) @@ -1537,8 +1537,8 @@ /obj/structure/window/basic{ dir = 4 }, -/obj/item/weapon/tank/air, -/obj/item/weapon/tank/air, +/obj/item/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/head/helmet/space/emergency, @@ -1661,7 +1661,7 @@ /obj/structure/closet/crate{ dir = 1 }, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /obj/machinery/light, @@ -1688,8 +1688,8 @@ /obj/structure/window/basic{ dir = 4 }, -/obj/item/weapon/tank/air, -/obj/item/weapon/tank/air, +/obj/item/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/head/helmet/space/emergency, @@ -1733,8 +1733,8 @@ /obj/structure/window/basic{ dir = 8 }, -/obj/item/weapon/tank/air, -/obj/item/weapon/tank/air, +/obj/item/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/head/helmet/space/emergency, @@ -1782,8 +1782,8 @@ /obj/structure/window/basic{ dir = 8 }, -/obj/item/weapon/tank/air, -/obj/item/weapon/tank/air, +/obj/item/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/head/helmet/space/emergency, @@ -2180,13 +2180,13 @@ "PI" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/closet/crate/engineering, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_sh_engineering) @@ -2213,8 +2213,8 @@ /obj/structure/window/basic{ dir = 8 }, -/obj/item/weapon/tank/air, -/obj/item/weapon/tank/air, +/obj/item/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/head/helmet/space/emergency, @@ -2240,10 +2240,10 @@ /obj/structure/closet/crate{ dir = 1 }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_sh_engineering) "Qx" = ( @@ -2275,11 +2275,11 @@ /turf/simulated/floor/plating, /area/shuttle/gecko_sh_engineering) "Rh" = ( -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb/pilot, /obj/item/clothing/head/helmet/space/void/refurb/pilot, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb/pilot, /obj/item/clothing/head/helmet/space/void/refurb/pilot, /obj/structure/closet/crate/aether{ @@ -2411,7 +2411,7 @@ pixel_x = 27 }, /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_sh) "Tx" = ( @@ -2618,7 +2618,7 @@ dir = 8 }, /obj/structure/table/steel, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/item/stack/material/tritium{ amount = 25 }, @@ -2717,8 +2717,8 @@ /obj/structure/window/basic{ dir = 4 }, -/obj/item/weapon/tank/air, -/obj/item/weapon/tank/air, +/obj/item/tank/air, +/obj/item/tank/air, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/head/helmet/space/emergency, diff --git a/maps/offmap_vr/om_ships/generic_shuttle.dmm b/maps/offmap_vr/om_ships/generic_shuttle.dmm index 47bc5e154d5..aaf77338040 100644 --- a/maps/offmap_vr/om_ships/generic_shuttle.dmm +++ b/maps/offmap_vr/om_ships/generic_shuttle.dmm @@ -19,7 +19,7 @@ /area/shuttle/generic_shuttle/gen) "af" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/remote/blast_door{ id = "generic_dorm1_blast"; name = "Blast Doors Controls"; @@ -683,7 +683,7 @@ dir = 6 }, /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/fiftyspawner/steel, /turf/simulated/floor/plating, /area/shuttle/generic_shuttle/eng) @@ -812,7 +812,7 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/storage/box/metalfoam, +/obj/item/storage/box/metalfoam, /turf/simulated/floor/plating, /area/shuttle/generic_shuttle/eng) "bM" = ( @@ -925,7 +925,7 @@ /area/shuttle/generic_shuttle/gen) "tg" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/wood, /area/shuttle/generic_shuttle/gen) "Ue" = ( diff --git a/maps/offmap_vr/om_ships/hybridshuttle.dmm b/maps/offmap_vr/om_ships/hybridshuttle.dmm index 7b896361a48..813f41d697a 100644 --- a/maps/offmap_vr/om_ships/hybridshuttle.dmm +++ b/maps/offmap_vr/om_ships/hybridshuttle.dmm @@ -40,10 +40,10 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/suit/space/emergency, @@ -86,7 +86,7 @@ /obj/structure/bed/alien{ icon = 'icons/obj/abductor_vr.dmi' }, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/tiled/techfloor, /area/shuttle/blue_fo) "an" = ( @@ -227,7 +227,7 @@ /area/shuttle/blue_fo) "aF" = ( /obj/effect/map_effect/perma_light/brighter, -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ icon_state = "beacon"; tele_name = "Hybrid Shuttle"; tele_network = "hybridshuttle" @@ -402,11 +402,11 @@ dir = 1 }, /obj/structure/table/alien/blue, -/obj/item/device/perfect_tele/alien/bluefo{ +/obj/item/perfect_tele/alien/bluefo{ pixel_x = 6; pixel_y = 3 }, -/obj/item/device/perfect_tele/alien/bluefo{ +/obj/item/perfect_tele/alien/bluefo{ pixel_x = -6; pixel_y = 3 }, @@ -463,11 +463,11 @@ /area/shuttle/blue_fo) "bg" = ( /obj/structure/table/alien/blue, -/obj/item/device/perfect_tele/alien/bluefo{ +/obj/item/perfect_tele/alien/bluefo{ pixel_x = -6; pixel_y = 3 }, -/obj/item/device/perfect_tele/alien/bluefo{ +/obj/item/perfect_tele/alien/bluefo{ pixel_x = 6; pixel_y = 3 }, diff --git a/maps/offmap_vr/om_ships/itglight.dm b/maps/offmap_vr/om_ships/itglight.dm index e0ce61cb625..d771b87589b 100644 --- a/maps/offmap_vr/om_ships/itglight.dm +++ b/maps/offmap_vr/om_ships/itglight.dm @@ -136,7 +136,7 @@ department = "ITG Dauntless" desc = "The ship's fax machine! It's a safe assumption that most of the departments listed aren't on your ship, since the ship only has one." -/obj/item/weapon/paper/Dauntless +/obj/item/paper/Dauntless name = "Notes about Dauntless" info = {"Welcome to the Ironcrest Transport Group

ITG Dauntless

diff --git a/maps/offmap_vr/om_ships/itglight.dmm b/maps/offmap_vr/om_ships/itglight.dmm index 611f5508f41..95ee0d28fa9 100644 --- a/maps/offmap_vr/om_ships/itglight.dmm +++ b/maps/offmap_vr/om_ships/itglight.dmm @@ -56,7 +56,7 @@ /area/itglight/readyroom) "af" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/card/id/event/accessset/itg/crew/captain, +/obj/item/card/id/event/accessset/itg/crew/captain, /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = -32 }, @@ -76,9 +76,9 @@ /obj/item/clothing/under/utility/grey, /obj/item/clothing/shoes/boots/winter, /obj/item/clothing/shoes/boots/duty, -/obj/item/device/communicator, -/obj/item/weapon/storage/backpack/messenger/hyd, -/obj/item/device/radio/headset{ +/obj/item/communicator, +/obj/item/storage/backpack/messenger/hyd, +/obj/item/radio/headset{ adhoc_fallback = 1; desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; name = "dauntless headset" @@ -88,7 +88,7 @@ /obj/item/clothing/suit/chef/classic, /obj/item/clothing/head/chefhat, /obj/item/clothing/suit/storage/solgov/service/army/service, -/obj/item/weapon/card/id/event/accessset/itg/crew/service, +/obj/item/card/id/event/accessset/itg/crew/service, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/metingroom) "ah" = ( @@ -105,9 +105,9 @@ /obj/item/clothing/under/utility/grey, /obj/item/clothing/shoes/boots/winter, /obj/item/clothing/shoes/boots/duty, -/obj/item/device/communicator, -/obj/item/weapon/storage/backpack/messenger/engi, -/obj/item/device/radio/headset{ +/obj/item/communicator, +/obj/item/storage/backpack/messenger/engi, +/obj/item/radio/headset{ adhoc_fallback = 1; desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; name = "dauntless headset" @@ -115,7 +115,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/engineering, /obj/item/taperoll/engineering, /obj/item/clothing/suit/storage/solgov/service/army/engineering, -/obj/item/weapon/card/id/event/accessset/itg/crew/engineer, +/obj/item/card/id/event/accessset/itg/crew/engineer, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/metingroom) "ai" = ( @@ -132,16 +132,16 @@ /obj/item/clothing/under/utility/grey, /obj/item/clothing/shoes/boots/winter, /obj/item/clothing/shoes/boots/duty, -/obj/item/device/communicator, -/obj/item/weapon/storage/backpack/messenger/med, -/obj/item/device/radio/headset{ +/obj/item/communicator, +/obj/item/storage/backpack/messenger/med, +/obj/item/radio/headset{ adhoc_fallback = 1; desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; name = "dauntless headset" }, /obj/item/clothing/suit/storage/hooded/wintercoat/medical, /obj/item/clothing/suit/storage/solgov/service/army/medical, -/obj/item/weapon/card/id/event/accessset/itg/crew/medical, +/obj/item/card/id/event/accessset/itg/crew/medical, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/metingroom) "aj" = ( @@ -158,9 +158,9 @@ /obj/item/clothing/under/utility/grey, /obj/item/clothing/shoes/boots/winter, /obj/item/clothing/shoes/boots/duty, -/obj/item/device/communicator, -/obj/item/weapon/storage/backpack/messenger/sec, -/obj/item/device/radio/headset{ +/obj/item/communicator, +/obj/item/storage/backpack/messenger/sec, +/obj/item/radio/headset{ adhoc_fallback = 1; desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; name = "dauntless headset" @@ -168,13 +168,13 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/security, /obj/item/clothing/suit/storage/trench, /obj/item/clothing/suit/storage/solgov/service/army/security, -/obj/item/weapon/card/id/event/accessset/itg/crew/security, +/obj/item/card/id/event/accessset/itg/crew/security, /obj/item/clothing/accessory/holster/hip, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/metingroom) "ak" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/curtain{ color = "#2e1604" }, @@ -184,11 +184,11 @@ /obj/structure/closet/autolok_wall{ pixel_x = -24 }, -/obj/item/device/radio, +/obj/item/radio, /obj/structure/bed/chair/bay/chair/padded/brown{ dir = 4 }, -/obj/item/device/flash, +/obj/item/flash, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/itglight/cockpit) "as" = ( @@ -431,10 +431,10 @@ /obj/structure/cable/pink{ icon_state = "4-8" }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -473,7 +473,7 @@ "cp" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 4; pixel_x = 25 }, @@ -481,7 +481,7 @@ icon_state = "0-8" }, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew4) "cv" = ( @@ -496,10 +496,10 @@ /area/itglight/shuttlebay) "cx" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, /obj/machinery/light{ @@ -526,7 +526,7 @@ }, /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; pixel_y = -25 }, /obj/structure/cable/pink, @@ -588,13 +588,13 @@ dir = 1; pixel_y = -23 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/weapon/pen/blade/blue{ +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/pen/blade/blue{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/pen/blade/red{ +/obj/item/pen/blade/red{ pixel_x = -4; pixel_y = -3 }, @@ -637,7 +637,7 @@ /obj/structure/bed/chair/bay/chair/padded/brown{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 25 }, @@ -679,17 +679,17 @@ dir = 8 }, /obj/structure/table/woodentable, -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, /obj/random/plushie, /obj/random/contraband/nofail, /obj/random/drinksoft, -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew1) "ed" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; pixel_y = -25 }, /obj/structure/cable/pink, @@ -793,15 +793,15 @@ /area/itglight/kitchen) "eI" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/material/kitchen/rollingpin, +/obj/item/book/manual/chef_recipes, +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/eris/cafe, /area/itglight/kitchen) "eJ" = ( @@ -837,7 +837,7 @@ "eW" = ( /obj/structure/table/rack/shelf/steel, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/weapon/rig/eva, +/obj/item/rig/eva, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardhighsec) "eZ" = ( @@ -864,7 +864,7 @@ /area/itglight/cockpit) "fc" = ( /obj/machinery/chem_master, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -25 }, @@ -898,8 +898,8 @@ }, /obj/item/clothing/under/rank/medical/scrubs, /obj/item/clothing/under/rank/medical/scrubs, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, /obj/item/clothing/suit/storage/toggle/labcoat, /obj/item/clothing/suit/storage/toggle/labcoat, /turf/simulated/floor/tiled/eris/white/cargo, @@ -1008,7 +1008,7 @@ icon_state = "4-8" }, /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -1064,7 +1064,7 @@ /area/itglight/captain) "gS" = ( /obj/structure/bed/chair/sofa/right/brown, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 25 }, @@ -1122,7 +1122,7 @@ "hk" = ( /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/paper/Dauntless, +/obj/item/paper/Dauntless, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/itglight/cockpit) "hm" = ( @@ -1331,11 +1331,11 @@ dir = 8 }, /obj/structure/table/woodentable, -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, /obj/random/plushie, /obj/random/contraband/nofail, /obj/random/drinksoft, -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew2) "iq" = ( @@ -1473,24 +1473,24 @@ /area/itglight/shuttlebay) "jg" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/metalfoam, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/device/assembly/prox_sensor, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/metalfoam, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/assembly/prox_sensor, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/suit/armor/vest, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -25 }, @@ -1504,11 +1504,11 @@ /obj/structure/closet/autolok_wall{ pixel_x = 24 }, -/obj/item/device/radio, +/obj/item/radio, /obj/structure/bed/chair/bay/chair/padded/brown{ dir = 8 }, -/obj/item/device/flash, +/obj/item/flash, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/itglight/cockpit) "jo" = ( @@ -1529,8 +1529,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, /obj/structure/table/rack/steel, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardhighsec) @@ -1539,7 +1539,7 @@ /obj/machinery/photocopier/faxmachine/itglight, /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 8; nightshift_setting = 3; pixel_x = -25 @@ -1555,7 +1555,7 @@ /area/itglight/kitchen) "jG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -25 }, @@ -1566,10 +1566,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardhighsec) "jQ" = ( @@ -1610,7 +1610,7 @@ /area/itglight/cockpit) "ko" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 25 }, @@ -1633,8 +1633,8 @@ /turf/simulated/floor/tiled/eris/dark/monofloor, /area/itglight/cockpit) "ky" = ( -/obj/item/device/radio, -/obj/item/device/flash, +/obj/item/radio, +/obj/item/flash, /obj/structure/bed/chair/bay/shuttle{ dir = 1 }, @@ -1695,7 +1695,7 @@ "kU" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 4; pixel_x = 25 }, @@ -1725,7 +1725,7 @@ "lh" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 4; pixel_x = 25 }, @@ -1821,43 +1821,43 @@ /turf/simulated/floor, /area/itglight/portengi) "lO" = ( -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/knife/machete/hatchet, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/material/knife/butch, +/obj/item/material/minihoe, +/obj/item/material/knife/machete/hatchet, /obj/random/drinkbottle, /obj/random/drinkbottle, /obj/random/drinkbottle, /obj/structure/closet, /obj/item/robot_parts/l_arm, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/glass/bucket, +/obj/item/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, /turf/simulated/floor/tiled/eris/cafe, @@ -1889,7 +1889,7 @@ /area/itglight/portengi) "mf" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/box/sinpockets, +/obj/item/storage/box/sinpockets, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/metingroom) "mg" = ( @@ -1971,7 +1971,7 @@ "mZ" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 8; nightshift_setting = 3; pixel_x = -25 @@ -2057,10 +2057,10 @@ dir = 8 }, /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/storage/briefcase/inflatable, -/obj/item/weapon/storage/briefcase/inflatable, -/obj/item/weapon/storage/briefcase/inflatable, -/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardhighsec) "nH" = ( @@ -2294,7 +2294,7 @@ }, /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 8; nightshift_setting = 3; pixel_x = -25 @@ -2372,7 +2372,7 @@ "pL" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 4; pixel_x = 25 }, @@ -2510,59 +2510,59 @@ /obj/structure/cable/pink{ icon_state = "4-8" }, -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 8 }, /turf/simulated/floor/tiled/eris/cafe, /area/itglight/kitchen) "qW" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/device/radio/headset{ +/obj/item/radio/headset{ adhoc_fallback = 1; desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; name = "dauntless headset" }, -/obj/item/device/radio/headset{ +/obj/item/radio/headset{ adhoc_fallback = 1; desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; name = "dauntless headset" }, -/obj/item/device/radio/headset{ +/obj/item/radio/headset{ adhoc_fallback = 1; desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; name = "dauntless headset" }, -/obj/item/device/radio/headset{ +/obj/item/radio/headset{ adhoc_fallback = 1; desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; name = "dauntless headset" }, -/obj/item/device/radio/headset{ +/obj/item/radio/headset{ adhoc_fallback = 1; desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; name = "dauntless headset" }, -/obj/item/device/radio/headset{ +/obj/item/radio/headset{ adhoc_fallback = 1; desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; name = "dauntless headset" }, -/obj/item/device/radio/headset{ +/obj/item/radio/headset{ adhoc_fallback = 1; desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; name = "dauntless headset" }, -/obj/item/device/radio/headset{ +/obj/item/radio/headset{ adhoc_fallback = 1; desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; name = "dauntless headset" }, -/obj/item/device/radio/headset{ +/obj/item/radio/headset{ adhoc_fallback = 1; desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; name = "dauntless headset" }, -/obj/item/device/radio/headset{ +/obj/item/radio/headset{ adhoc_fallback = 1; desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; name = "dauntless headset" @@ -2700,7 +2700,7 @@ }, /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 4; pixel_x = 25 }, @@ -2815,10 +2815,10 @@ pixel_x = -16; pixel_y = 30 }, -/obj/item/weapon/storage/box/masks, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/eris/white/techfloor_grid, /area/itglight/medbay) "tz" = ( @@ -3014,13 +3014,13 @@ "vr" = ( /obj/structure/table/rack/shelf/steel, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/device/lightreplacer, -/obj/item/device/lightreplacer, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/lightreplacer, +/obj/item/lightreplacer, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardhighsec) "vy" = ( @@ -3088,7 +3088,7 @@ /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/porthighsec) "wm" = ( -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/structure/curtain/black, /obj/structure/bed/padded, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -3121,7 +3121,7 @@ /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardcargo) "ww" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 25 }, @@ -3131,7 +3131,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -25 }, @@ -3160,7 +3160,7 @@ /obj/structure/cable/pink{ icon_state = "2-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 25 }, @@ -3316,7 +3316,7 @@ /obj/structure/handrail{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 25 }, @@ -3334,31 +3334,31 @@ /obj/structure/closet/secure_closet/personal{ req_access = list(778) }, -/obj/item/device/radio, +/obj/item/radio, /obj/random/drinksoft, /obj/random/contraband/nofail, /obj/random/plushie, -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, /obj/item/clothing/suit/space/void/captain, /obj/item/clothing/head/helmet/space/void/captain, -/obj/item/weapon/card/id/event/accessset/itg/crew, -/obj/item/weapon/card/id/event/accessset/itg/crew, -/obj/item/weapon/card/id/event/accessset/itg/crew, -/obj/item/weapon/card/id/event/accessset/itg/crew, -/obj/item/weapon/card/id/event/accessset/itg/crew, -/obj/item/weapon/card/id/event/accessset/itg/crew/passengerliason, -/obj/item/weapon/card/id/event/accessset/itg/crew/pilot, -/obj/item/weapon/card/id/event/accessset/itg/crew/research, -/obj/item/weapon/card/id/event/accessset/itg/crew/research, -/obj/item/weapon/card/id/event/accessset/itg/crew/security, -/obj/item/weapon/card/id/event/accessset/itg/crew/service, -/obj/item/weapon/card/id/event/accessset/itg/crew/engineer, -/obj/item/weapon/card/id/event/accessset/itg/crew/engineer, -/obj/item/weapon/card/id/event/accessset/itg/crew/medical, -/obj/item/weapon/card/id/event/accessset/itg/crew/medical, +/obj/item/card/id/event/accessset/itg/crew, +/obj/item/card/id/event/accessset/itg/crew, +/obj/item/card/id/event/accessset/itg/crew, +/obj/item/card/id/event/accessset/itg/crew, +/obj/item/card/id/event/accessset/itg/crew, +/obj/item/card/id/event/accessset/itg/crew/passengerliason, +/obj/item/card/id/event/accessset/itg/crew/pilot, +/obj/item/card/id/event/accessset/itg/crew/research, +/obj/item/card/id/event/accessset/itg/crew/research, +/obj/item/card/id/event/accessset/itg/crew/security, +/obj/item/card/id/event/accessset/itg/crew/service, +/obj/item/card/id/event/accessset/itg/crew/engineer, +/obj/item/card/id/event/accessset/itg/crew/engineer, +/obj/item/card/id/event/accessset/itg/crew/medical, +/obj/item/card/id/event/accessset/itg/crew/medical, /obj/item/clothing/suit/storage/hooded/wintercoat/cargo{ name = "dauntless winter coat" }, @@ -3367,10 +3367,10 @@ name = "captain's coat" }, /obj/item/clothing/suit/storage/solgov/service/army/command, -/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, -/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, -/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, -/obj/item/weapon/gun/energy/taser, +/obj/item/reagent_containers/food/snacks/candy/proteinbar, +/obj/item/reagent_containers/food/snacks/candy/proteinbar, +/obj/item/reagent_containers/food/snacks/candy/proteinbar, +/obj/item/gun/energy/taser, /obj/item/clothing/accessory/holster/hip, /turf/simulated/floor/carpet/sblucarpet, /area/itglight/captain) @@ -3386,7 +3386,7 @@ "xE" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 1; pixel_y = 25 }, @@ -3593,7 +3593,7 @@ "yY" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 1; pixel_y = 25 }, @@ -3713,7 +3713,7 @@ "zL" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 4; nightshift_setting = 3; pixel_x = 25 @@ -3835,16 +3835,16 @@ /area/itglight/passengersleeping) "AH" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/device/healthanalyzer, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/storage/firstaid/surgery, +/obj/item/healthanalyzer, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/device/defib_kit/loaded, -/obj/item/device/robotanalyzer{ +/obj/item/defib_kit/loaded, +/obj/item/robotanalyzer{ pixel_y = -8 }, /obj/item/stack/nanopaste/advanced, @@ -3853,7 +3853,7 @@ "AJ" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 1; pixel_y = 25 }, @@ -3916,7 +3916,7 @@ }, /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 4; pixel_x = 25 }, @@ -4012,17 +4012,17 @@ dir = 8 }, /obj/structure/table/woodentable, -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, /obj/random/plushie, /obj/random/contraband/nofail, /obj/random/drinksoft, -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew4) "BU" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 4; pixel_x = 25 }, @@ -4030,7 +4030,7 @@ icon_state = "0-8" }, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew1) "BW" = ( @@ -4102,8 +4102,8 @@ /turf/simulated/floor, /area/itglight/portdocking) "Ct" = ( -/obj/item/weapon/stool/baystool/padded, -/obj/item/device/radio/intercom{ +/obj/item/stool/baystool/padded, +/obj/item/radio/intercom{ dir = 1; pixel_y = 25 }, @@ -4266,11 +4266,11 @@ dir = 8 }, /obj/structure/table/woodentable, -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, /obj/random/plushie, /obj/random/contraband/nofail, /obj/random/drinksoft, -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew3) "Dy" = ( @@ -4795,23 +4795,23 @@ /area/shuttle/itglightshuttle) "Gm" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -7; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = 4; pixel_y = 6 }, -/obj/item/device/flashlight/pen{ +/obj/item/flashlight/pen{ pixel_x = -3; pixel_y = -3 }, @@ -4836,15 +4836,15 @@ /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/clotting, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/clotting, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /obj/item/stack/medical/advanced/bruise_pack, /obj/item/stack/medical/advanced/bruise_pack, /obj/item/stack/medical/advanced/bruise_pack, @@ -5189,7 +5189,7 @@ "IM" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 4; pixel_x = 25 }, @@ -5235,7 +5235,7 @@ "Jc" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 1; nightshift_setting = 3; pixel_y = 25 @@ -5378,7 +5378,7 @@ "JR" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 4; pixel_x = 25 }, @@ -5386,7 +5386,7 @@ icon_state = "0-8" }, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew3) "JT" = ( @@ -5432,7 +5432,7 @@ "Kh" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 1; nightshift_setting = 3; pixel_y = 25 @@ -5490,7 +5490,7 @@ "KB" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 4; nightshift_setting = 3; pixel_x = 25 @@ -5683,7 +5683,7 @@ "Mk" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 4; pixel_x = 25 }, @@ -5691,7 +5691,7 @@ icon_state = "0-8" }, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew2) "Ml" = ( @@ -5711,12 +5711,12 @@ /area/itglight/common) "Mm" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/monotile, /area/itglight/lockers) @@ -5977,7 +5977,7 @@ "NY" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 4; pixel_x = 25 }, @@ -5993,7 +5993,7 @@ }, /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 1; pixel_y = 25 }, @@ -6012,7 +6012,7 @@ /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/afthall) "Oi" = ( -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/structure/curtain/black, /obj/structure/bed/padded, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -6297,7 +6297,7 @@ /turf/simulated/floor/airless, /area/itglight/starboardsolars) "PO" = ( -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/structure/curtain/black, /obj/structure/bed/padded, /obj/machinery/alarm/angled/hidden{ @@ -6334,7 +6334,7 @@ }, /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 1; pixel_y = 25 }, @@ -6446,7 +6446,7 @@ "QR" = ( /obj/structure/closet/secure_closet/personal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/floor/tiled/monotile, /area/itglight/lockers) "QW" = ( @@ -6467,12 +6467,12 @@ /area/itglight/medbay) "Ra" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/khcrystal, -/obj/item/weapon/storage/box/khcrystal, -/obj/item/weapon/storage/box/khcrystal, -/obj/item/weapon/storage/box/khcrystal, -/obj/item/weapon/storage/box/khcrystal, -/obj/item/device/sleevemate, +/obj/item/storage/box/khcrystal, +/obj/item/storage/box/khcrystal, +/obj/item/storage/box/khcrystal, +/obj/item/storage/box/khcrystal, +/obj/item/storage/box/khcrystal, +/obj/item/sleevemate, /turf/simulated/floor/tiled/eris/white/cargo, /area/itglight/medbay) "Rb" = ( @@ -6708,13 +6708,13 @@ dir = 8 }, /obj/machinery/recharger, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -25 }, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/common) "SL" = ( -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/structure/curtain/black, /obj/structure/bed/padded, /turf/simulated/floor/tiled/dark, @@ -6746,7 +6746,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/device/radio, +/obj/item/radio, /obj/machinery/alarm/angled/hidden{ dir = 8; pixel_x = 26 @@ -6783,7 +6783,7 @@ /turf/simulated/floor, /area/itglight/portengi) "Tm" = ( -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/structure/curtain/black, /obj/structure/bed/padded, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -6962,13 +6962,13 @@ /area/itglight/portengi) "UY" = ( /obj/structure/table/glass, -/obj/item/device/sleevemate, -/obj/item/weapon/book/manual/resleeving, -/obj/item/weapon/storage/box/khcrystal, -/obj/item/weapon/storage/box/khcrystal, -/obj/item/weapon/storage/box/khcrystal, -/obj/item/weapon/storage/box/khcrystal, -/obj/item/weapon/storage/box/khcrystal, +/obj/item/sleevemate, +/obj/item/book/manual/resleeving, +/obj/item/storage/box/khcrystal, +/obj/item/storage/box/khcrystal, +/obj/item/storage/box/khcrystal, +/obj/item/storage/box/khcrystal, +/obj/item/storage/box/khcrystal, /turf/simulated/floor/tiled/eris/white/cargo, /area/itglight/medbay) "UZ" = ( @@ -6989,7 +6989,7 @@ "Ve" = ( /obj/structure/closet/secure_closet/personal, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/floor/tiled/monotile, /area/itglight/lockers) "Vi" = ( @@ -7024,7 +7024,7 @@ /turf/simulated/floor, /area/itglight/starboardengi) "Vt" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /turf/simulated/floor/tiled/eris/cafe, @@ -7097,13 +7097,13 @@ /area/itglight/afthall) "VK" = ( /obj/structure/table/standard, -/obj/item/weapon/bikehorn/rubberducky, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/bikehorn/rubberducky, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled/white, /area/itglight/showers) "VM" = ( @@ -7165,9 +7165,9 @@ /area/itglight/starboardsolars) "Wh" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/storage/box/beakers, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, +/obj/item/storage/box/beakers, /obj/item/stack/material/phoron, /obj/item/stack/material/phoron, /obj/item/stack/material/phoron, @@ -7194,7 +7194,7 @@ /turf/simulated/floor/tiled/dark, /area/itglight/passengersleeping) "WC" = ( -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/structure/curtain/black, /obj/structure/bed/padded, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -7226,7 +7226,7 @@ /obj/random/plushie, /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; pixel_y = -25 }, /obj/structure/cable/pink, @@ -7241,7 +7241,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/floor/tiled/monotile, /area/itglight/lockers) "WP" = ( @@ -7314,7 +7314,7 @@ "Xl" = ( /obj/machinery/power/apc/angled{ alarms_hidden = 1; - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 8; pixel_x = -25 }, @@ -7727,7 +7727,7 @@ /turf/simulated/floor/tiled/eris/cafe, /area/itglight/kitchen) "Zp" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 8 }, /turf/simulated/floor/tiled/eris/cafe, @@ -7783,11 +7783,11 @@ pixel_x = -32; pixel_y = 27 }, -/obj/item/weapon/storage/bag/chemistry, +/obj/item/storage/bag/chemistry, /obj/item/clothing/under/rank/chemist, /obj/item/clothing/suit/storage/toggle/labcoat/chemist, -/obj/item/weapon/storage/box/pillbottles, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/pillbottles, +/obj/item/storage/box/beakers, /turf/simulated/floor/tiled/eris/white/cargo, /area/itglight/medbay) "ZL" = ( diff --git a/maps/offmap_vr/om_ships/lunaship.dmm b/maps/offmap_vr/om_ships/lunaship.dmm index 663215fbf00..c21ccbee426 100644 --- a/maps/offmap_vr/om_ships/lunaship.dmm +++ b/maps/offmap_vr/om_ships/lunaship.dmm @@ -20,11 +20,11 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/device/perfect_tele/alien{ +/obj/item/perfect_tele/alien{ desc = "An enhanced device that allows one to teleport people and objects across large distances."; name = "advanced translocator" }, -/obj/item/weapon/card/id/event/polymorphic/altcard{ +/obj/item/card/id/event/polymorphic/altcard{ access = list(777) }, /obj/structure/table/hardwoodtable, @@ -689,11 +689,11 @@ /area/lunaship/medical) "kM" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /obj/structure/closet/walllocker/medical/west, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/toxin, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -712,7 +712,7 @@ /turf/simulated/floor/reinforced/airless, /area/space) "kZ" = ( -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/milspec/raised{ name = "computer corium plating" }, @@ -805,9 +805,9 @@ dir = 4 }, /obj/structure/closet/walllocker_double/east, -/obj/item/device/lightreplacer, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full{ +/obj/item/lightreplacer, +/obj/item/storage/belt/utility/chief/full, +/obj/item/storage/belt/utility/chief/full{ pixel_y = 5 }, /obj/item/clothing/gloves/yellow, @@ -1093,8 +1093,8 @@ dir = 4; pixel_x = -26 }, -/obj/item/weapon/implanter, -/obj/item/weapon/implant/organ/limbaugment/upperarm/blade, +/obj/item/implanter, +/obj/item/implant/organ/limbaugment/upperarm/blade, /obj/structure/table/hardwoodtable, /turf/simulated/floor/wood, /area/lunaship/office) @@ -1138,10 +1138,10 @@ dir = 6 }, /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_y = 5 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/milspec, /area/lunaship/robotics_bay) "qI" = ( @@ -1252,12 +1252,12 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/device/paicard/sleevecard, -/obj/item/device/paicard/sleevecard, -/obj/item/device/sleevemate{ +/obj/item/paicard/sleevecard, +/obj/item/paicard/sleevecard, +/obj/item/sleevemate{ pixel_y = -5 }, -/obj/item/device/sleevemate, +/obj/item/sleevemate, /obj/machinery/light{ dir = 8; icon_state = "tube1" @@ -1367,13 +1367,13 @@ /turf/simulated/floor/tiled/milspec, /area/lunaship/robotics_bay) "sZ" = ( -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/effect/floor_decal/milspec_sterile/green/corner{ dir = 4 }, /obj/structure/closet/walllocker/medical/east, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/machinery/light, /turf/simulated/floor/tiled/milspec/sterile, /area/lunaship/medical) @@ -1632,9 +1632,9 @@ /area/lunaship/robotics_bay) "wK" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/bonemed, -/obj/item/weapon/storage/firstaid/clotting, +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/bonemed, +/obj/item/storage/firstaid/clotting, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -1881,9 +1881,9 @@ /obj/item/clothing/gloves/sterile/nitrile, /obj/item/clothing/gloves/sterile/nitrile, /obj/item/clothing/gloves/sterile/nitrile, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, /turf/simulated/floor/tiled/milspec/sterile, /area/lunaship/medical) "zB" = ( @@ -2013,7 +2013,7 @@ /area/lunaship/hallway_port) "AS" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/wood, /area/lunaship/office) "AT" = ( @@ -2225,7 +2225,7 @@ /obj/structure/reagent_dispensers/acid{ pixel_x = 32 }, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/simulated/floor/tiled/milspec, /area/lunaship/robotics_bay) "EK" = ( @@ -2424,7 +2424,7 @@ /turf/simulated/floor/tiled/milspec, /area/lunaship/hallway_port) "HC" = ( -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/table/hardwoodtable, /turf/simulated/floor/wood, /area/lunaship/office) @@ -2456,8 +2456,8 @@ /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 23 }, -/obj/item/weapon/gun/energy/locked/frontier/carbine, -/obj/item/weapon/gun/energy/locked/frontier/unlocked, +/obj/item/gun/energy/locked/frontier/carbine, +/obj/item/gun/energy/locked/frontier/unlocked, /turf/simulated/floor/wood, /area/lunaship/office) "Ia" = ( @@ -2473,9 +2473,9 @@ /turf/simulated/floor/tiled/milspec, /area/lunaship/hallway_starboard) "Ih" = ( -/obj/item/device/defib_kit/jumper_kit, +/obj/item/defib_kit/jumper_kit, /obj/structure/table/steel, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /obj/structure/closet/walllocker_double/east, /obj/effect/floor_decal/milspec/color/black/half{ dir = 6 @@ -2668,13 +2668,13 @@ light_color = "#00AAFF" }, /obj/structure/table/darkglass, -/obj/item/device/juke_remote, -/obj/item/device/juke_remote, -/obj/item/device/juke_remote, -/obj/item/device/juke_remote, -/obj/item/device/juke_remote, -/obj/item/device/juke_remote, -/obj/item/device/juke_remote, +/obj/item/juke_remote, +/obj/item/juke_remote, +/obj/item/juke_remote, +/obj/item/juke_remote, +/obj/item/juke_remote, +/obj/item/juke_remote, +/obj/item/juke_remote, /obj/structure/closet/walllocker_double/east, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/lunaship/bar) @@ -2790,18 +2790,18 @@ /area/lunaship/engineering) "NS" = ( /obj/structure/closet/walllocker_double/east, -/obj/item/device/nif/protean, -/obj/item/device/nif/protean, -/obj/item/device/nif/protean, +/obj/item/nif/protean, +/obj/item/nif/protean, +/obj/item/nif/protean, /obj/item/organ/internal/nano/orchestrator, /obj/item/organ/internal/nano/orchestrator, /obj/item/organ/internal/nano/orchestrator, /obj/item/organ/internal/nano/refactory, /obj/item/organ/internal/nano/refactory, /obj/item/organ/internal/nano/refactory, -/obj/item/device/mmi/digital/posibrain/nano, -/obj/item/device/mmi/digital/posibrain/nano, -/obj/item/device/mmi/digital/posibrain/nano, +/obj/item/mmi/digital/posibrain/nano, +/obj/item/mmi/digital/posibrain/nano, +/obj/item/mmi/digital/posibrain/nano, /turf/simulated/floor/wood, /area/lunaship/office) "Oa" = ( @@ -2838,57 +2838,57 @@ /area/lunaship/office) "OG" = ( /obj/structure/closet/wardrobe, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/manipulator/omni, -/obj/item/weapon/stock_parts/manipulator/omni, -/obj/item/weapon/stock_parts/manipulator/omni, -/obj/item/weapon/stock_parts/manipulator/omni, -/obj/item/weapon/stock_parts/manipulator/omni, -/obj/item/weapon/stock_parts/matter_bin/omni, -/obj/item/weapon/stock_parts/matter_bin/omni, -/obj/item/weapon/stock_parts/matter_bin/omni, -/obj/item/weapon/stock_parts/matter_bin/omni, -/obj/item/weapon/stock_parts/matter_bin/omni, -/obj/item/weapon/stock_parts/scanning_module/omni, -/obj/item/weapon/stock_parts/scanning_module/omni, -/obj/item/weapon/stock_parts/scanning_module/omni, -/obj/item/weapon/stock_parts/scanning_module/omni, -/obj/item/weapon/stock_parts/scanning_module/omni, -/obj/item/weapon/stock_parts/micro_laser/omni, -/obj/item/weapon/stock_parts/micro_laser/omni, -/obj/item/weapon/stock_parts/micro_laser/omni, -/obj/item/weapon/stock_parts/micro_laser/omni, -/obj/item/weapon/stock_parts/micro_laser/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/manipulator/omni, -/obj/item/weapon/stock_parts/manipulator/omni, -/obj/item/weapon/stock_parts/manipulator/omni, -/obj/item/weapon/stock_parts/manipulator/omni, -/obj/item/weapon/stock_parts/manipulator/omni, -/obj/item/weapon/stock_parts/matter_bin/omni, -/obj/item/weapon/stock_parts/matter_bin/omni, -/obj/item/weapon/stock_parts/matter_bin/omni, -/obj/item/weapon/stock_parts/matter_bin/omni, -/obj/item/weapon/stock_parts/matter_bin/omni, -/obj/item/weapon/stock_parts/micro_laser/omni, -/obj/item/weapon/stock_parts/micro_laser/omni, -/obj/item/weapon/stock_parts/micro_laser/omni, -/obj/item/weapon/stock_parts/micro_laser/omni, -/obj/item/weapon/stock_parts/micro_laser/omni, -/obj/item/weapon/stock_parts/scanning_module/omni, -/obj/item/weapon/stock_parts/scanning_module/omni, -/obj/item/weapon/stock_parts/scanning_module/omni, -/obj/item/weapon/stock_parts/scanning_module/omni, -/obj/item/weapon/stock_parts/scanning_module/omni, -/obj/item/weapon/storage/part_replacer/adv/discount_bluespace, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/manipulator/omni, +/obj/item/stock_parts/manipulator/omni, +/obj/item/stock_parts/manipulator/omni, +/obj/item/stock_parts/manipulator/omni, +/obj/item/stock_parts/manipulator/omni, +/obj/item/stock_parts/matter_bin/omni, +/obj/item/stock_parts/matter_bin/omni, +/obj/item/stock_parts/matter_bin/omni, +/obj/item/stock_parts/matter_bin/omni, +/obj/item/stock_parts/matter_bin/omni, +/obj/item/stock_parts/scanning_module/omni, +/obj/item/stock_parts/scanning_module/omni, +/obj/item/stock_parts/scanning_module/omni, +/obj/item/stock_parts/scanning_module/omni, +/obj/item/stock_parts/scanning_module/omni, +/obj/item/stock_parts/micro_laser/omni, +/obj/item/stock_parts/micro_laser/omni, +/obj/item/stock_parts/micro_laser/omni, +/obj/item/stock_parts/micro_laser/omni, +/obj/item/stock_parts/micro_laser/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/manipulator/omni, +/obj/item/stock_parts/manipulator/omni, +/obj/item/stock_parts/manipulator/omni, +/obj/item/stock_parts/manipulator/omni, +/obj/item/stock_parts/manipulator/omni, +/obj/item/stock_parts/matter_bin/omni, +/obj/item/stock_parts/matter_bin/omni, +/obj/item/stock_parts/matter_bin/omni, +/obj/item/stock_parts/matter_bin/omni, +/obj/item/stock_parts/matter_bin/omni, +/obj/item/stock_parts/micro_laser/omni, +/obj/item/stock_parts/micro_laser/omni, +/obj/item/stock_parts/micro_laser/omni, +/obj/item/stock_parts/micro_laser/omni, +/obj/item/stock_parts/micro_laser/omni, +/obj/item/stock_parts/scanning_module/omni, +/obj/item/stock_parts/scanning_module/omni, +/obj/item/stock_parts/scanning_module/omni, +/obj/item/stock_parts/scanning_module/omni, +/obj/item/stock_parts/scanning_module/omni, +/obj/item/storage/part_replacer/adv/discount_bluespace, /turf/simulated/floor/wood, /area/lunaship/office) "OH" = ( @@ -3258,32 +3258,32 @@ pixel_y = 5 }, /obj/structure/closet/walllocker_double/west, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/spoon{ pixel_x = 5 }, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/spoon{ pixel_x = 5 }, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/spoon{ pixel_x = 5 }, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/spoon{ pixel_x = 5 }, -/obj/item/weapon/material/knife{ +/obj/item/material/knife{ pixel_x = -3 }, -/obj/item/weapon/material/knife{ +/obj/item/material/knife{ pixel_x = -3 }, -/obj/item/weapon/material/knife{ +/obj/item/material/knife{ pixel_x = -3 }, -/obj/item/weapon/material/knife{ +/obj/item/material/knife{ pixel_x = -3 }, /obj/machinery/disposal/wall{ @@ -3304,10 +3304,10 @@ /area/lunaship/park) "UK" = ( /obj/structure/table/glass, -/obj/item/device/healthanalyzer/advanced{ +/obj/item/healthanalyzer/advanced{ pixel_x = -5 }, -/obj/item/device/healthanalyzer/advanced{ +/obj/item/healthanalyzer/advanced{ pixel_x = -5; pixel_y = -5 }, @@ -3734,11 +3734,11 @@ dir = 6 }, /obj/structure/closet/walllocker_double/east, -/obj/item/device/radio/beacon, -/obj/item/device/radio/beacon, -/obj/item/device/radio/beacon, -/obj/item/device/multitool, -/obj/item/device/multitool, +/obj/item/radio/beacon, +/obj/item/radio/beacon, +/obj/item/radio/beacon, +/obj/item/multitool, +/obj/item/multitool, /obj/structure/table/darkglass, /turf/simulated/floor/tiled/milspec/raised{ name = "computer corium plating" diff --git a/maps/offmap_vr/om_ships/mackerel_hc.dmm b/maps/offmap_vr/om_ships/mackerel_hc.dmm index b6ac45ce8f8..7a9aa92b3d1 100644 --- a/maps/offmap_vr/om_ships/mackerel_hc.dmm +++ b/maps/offmap_vr/om_ships/mackerel_hc.dmm @@ -326,14 +326,14 @@ /area/shuttle/mackerel_hc) "we" = ( /obj/structure/closet/crate/engineering, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_hc) "wv" = ( /obj/structure/closet/crate/engineering/electrical, -/obj/item/weapon/tank/phoron, -/obj/item/weapon/tank/phoron, +/obj/item/tank/phoron, +/obj/item/tank/phoron, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_hc) "wF" = ( diff --git a/maps/offmap_vr/om_ships/mackerel_hc_skel.dmm b/maps/offmap_vr/om_ships/mackerel_hc_skel.dmm index bed6a058f6d..f45a3c710a6 100644 --- a/maps/offmap_vr/om_ships/mackerel_hc_skel.dmm +++ b/maps/offmap_vr/om_ships/mackerel_hc_skel.dmm @@ -452,8 +452,8 @@ /area/shuttle/mackerel_hc_skel_cockpit) "we" = ( /obj/structure/closet/crate/engineering, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_hc_skel_eng) "wF" = ( @@ -583,8 +583,8 @@ /obj/structure/fuel_port{ pixel_y = -26 }, -/obj/item/weapon/tank/phoron, -/obj/item/weapon/tank/phoron, +/obj/item/tank/phoron, +/obj/item/tank/phoron, /obj/structure/closet/crate/engineering, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_hc_skel_eng) diff --git a/maps/offmap_vr/om_ships/mackerel_lc.dmm b/maps/offmap_vr/om_ships/mackerel_lc.dmm index 0b4124d9904..8ba38fef0ec 100644 --- a/maps/offmap_vr/om_ships/mackerel_lc.dmm +++ b/maps/offmap_vr/om_ships/mackerel_lc.dmm @@ -212,8 +212,8 @@ /area/shuttle/mackerel_lc) "nD" = ( /obj/structure/closet/crate/engineering/electrical, -/obj/item/weapon/tank/phoron, -/obj/item/weapon/tank/phoron, +/obj/item/tank/phoron, +/obj/item/tank/phoron, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_lc) "oe" = ( @@ -319,8 +319,8 @@ /area/shuttle/mackerel_lc) "ue" = ( /obj/structure/closet/crate/engineering, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_lc) "ug" = ( diff --git a/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm b/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm index 3376a5100b9..45922c0e19c 100644 --- a/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm +++ b/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm @@ -22,7 +22,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/airless, /area/shuttle/mackerel_lc_wreck) "bw" = ( @@ -69,13 +69,13 @@ /area/shuttle/mackerel_lc_wreck) "cv" = ( /obj/machinery/computer/shuttle_control/explore/mackerel_lc_wreck, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/mackerel_lc_wreck) "cD" = ( /obj/effect/floor_decal/industrial/warning, -/obj/item/weapon/material/shard/shrapnel, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/mackerel_lc_wreck) "dG" = ( @@ -93,8 +93,8 @@ /obj/structure/bed/chair/bay/shuttle{ dir = 1 }, -/obj/item/weapon/material/shard, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard, +/obj/item/material/shard/shrapnel, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/mackerel_lc_wreck) "ju" = ( @@ -134,7 +134,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/closet/walllocker/emerglocker/west, /obj/effect/floor_decal/industrial/warning/corner, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/machinery/light/flicker, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/mackerel_lc_wreck) @@ -161,8 +161,8 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/material/shard, +/obj/item/tank/oxygen, +/obj/item/material/shard, /obj/machinery/light, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/mackerel_lc_wreck) @@ -203,7 +203,7 @@ /area/shuttle/mackerel_lc_wreck) "nD" = ( /obj/structure/closet/crate/engineering/electrical, -/obj/item/weapon/tank/phoron, +/obj/item/tank/phoron, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_lc_wreck) "oe" = ( @@ -285,8 +285,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/material/shard, -/obj/item/weapon/material/shard, +/obj/item/material/shard, +/obj/item/material/shard, /turf/simulated/floor/airless, /area/shuttle/mackerel_lc_wreck) "sg" = ( @@ -331,9 +331,9 @@ /area/shuttle/mackerel_lc_wreck) "ue" = ( /obj/structure/closet/crate/engineering, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/module/power_control, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical, +/obj/item/module/power_control, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_lc_wreck) "ug" = ( @@ -436,7 +436,7 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/mackerel_lc_wreck) "BB" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/template_noop, /area/template_noop) "BN" = ( @@ -666,7 +666,7 @@ /area/shuttle/mackerel_lc_wreck) "Ly" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/mackerel_lc_wreck) "LU" = ( @@ -808,7 +808,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_lc_wreck) "TC" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/template_noop, /area/shuttle/mackerel_lc_wreck) "UY" = ( @@ -873,7 +873,7 @@ /area/shuttle/mackerel_lc_wreck) "WN" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/template_noop, /area/shuttle/mackerel_lc_wreck) "WP" = ( diff --git a/maps/offmap_vr/om_ships/mackerel_sh.dmm b/maps/offmap_vr/om_ships/mackerel_sh.dmm index 5bf3e2df896..50eb5335bfb 100644 --- a/maps/offmap_vr/om_ships/mackerel_sh.dmm +++ b/maps/offmap_vr/om_ships/mackerel_sh.dmm @@ -215,8 +215,8 @@ /area/shuttle/mackerel_sh) "nD" = ( /obj/structure/closet/crate/engineering/electrical, -/obj/item/weapon/tank/phoron, -/obj/item/weapon/tank/phoron, +/obj/item/tank/phoron, +/obj/item/tank/phoron, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_sh) "oe" = ( @@ -329,8 +329,8 @@ /area/shuttle/mackerel_sh) "ue" = ( /obj/structure/closet/crate/engineering, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_sh) "ug" = ( diff --git a/maps/offmap_vr/om_ships/mercenarybase.dmm b/maps/offmap_vr/om_ships/mercenarybase.dmm index 42b6a45289a..0513b4daf1f 100644 --- a/maps/offmap_vr/om_ships/mercenarybase.dmm +++ b/maps/offmap_vr/om_ships/mercenarybase.dmm @@ -1048,11 +1048,11 @@ /obj/item/clothing/glasses/sunglasses/aviator, /obj/item/clothing/accessory/permit/gun, /obj/item/clothing/accessory/holster/leg, -/obj/item/device/flashlight/maglight, -/obj/item/device/flash, -/obj/item/device/gps/syndie, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/backpack/dufflebag/syndie, +/obj/item/flashlight/maglight, +/obj/item/flash, +/obj/item/gps/syndie, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/backpack/dufflebag/syndie, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_drop_pouches, /turf/simulated/floor/tiled/dark, @@ -1274,11 +1274,11 @@ /obj/item/clothing/glasses/sunglasses/aviator, /obj/item/clothing/accessory/permit/gun, /obj/item/clothing/accessory/holster/leg, -/obj/item/device/flashlight/maglight, -/obj/item/device/flash, -/obj/item/device/gps/syndie, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/backpack/dufflebag/syndie, +/obj/item/flashlight/maglight, +/obj/item/flash, +/obj/item/gps/syndie, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/backpack/dufflebag/syndie, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_drop_pouches, /turf/simulated/floor/tiled/dark, @@ -2374,11 +2374,11 @@ /obj/item/clothing/glasses/sunglasses/aviator, /obj/item/clothing/accessory/permit/gun, /obj/item/clothing/accessory/holster/leg, -/obj/item/device/flashlight/maglight, -/obj/item/device/flash, -/obj/item/device/gps/syndie, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/backpack/dufflebag/syndie, +/obj/item/flashlight/maglight, +/obj/item/flash, +/obj/item/gps/syndie, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/backpack/dufflebag/syndie, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_drop_pouches, /turf/simulated/floor/tiled/dark, @@ -2588,7 +2588,7 @@ /obj/machinery/power/terminal, /obj/structure/cable, /obj/structure/table/reinforced, -/obj/item/device/healthanalyzer/advanced, +/obj/item/healthanalyzer/advanced, /turf/simulated/floor/tiled/dark, /area/mercbase/medical) "lD" = ( @@ -2689,9 +2689,9 @@ /area/mercbase/eqroom) "lO" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, /turf/simulated/floor/tiled/dark, /area/mercbase/medical) "lP" = ( @@ -2721,8 +2721,8 @@ /obj/item/clothing/accessory/armor/armguards/merc, /obj/item/clothing/accessory/armor/legguards/merc, /obj/item/clothing/head/helmet/merc, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/grenade/flashbang, +/obj/item/gun/energy/gun, +/obj/item/grenade/flashbang, /turf/simulated/floor/tiled/dark, /area/mercbase/eqroom) "lR" = ( @@ -2764,8 +2764,8 @@ /obj/item/clothing/accessory/armor/armguards/merc, /obj/item/clothing/accessory/armor/legguards/merc, /obj/item/clothing/head/helmet/merc, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/grenade/flashbang, +/obj/item/gun/energy/gun, +/obj/item/grenade/flashbang, /turf/simulated/floor/tiled/dark, /area/mercbase/eqroom) "lT" = ( @@ -2777,7 +2777,7 @@ /area/mercbase/eqroom) "lU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /turf/simulated/floor/tiled/dark, /area/mercbase/engineering) "lV" = ( @@ -2822,7 +2822,7 @@ /area/mercbase/barracks) "ma" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled/dark, /area/mercbase/medicalOR) "mb" = ( @@ -3481,7 +3481,7 @@ /area/mercbase/roid) "nS" = ( /obj/structure/table/standard, -/obj/item/weapon/soap/syndie, +/obj/item/soap/syndie, /turf/simulated/floor/tiled/dark, /area/mercbase/roid) "nT" = ( @@ -3614,8 +3614,8 @@ /obj/item/clothing/accessory/armor/armguards/merc, /obj/item/clothing/accessory/armor/legguards/merc, /obj/item/clothing/head/helmet/merc, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/grenade/flashbang, +/obj/item/gun/energy/gun, +/obj/item/grenade/flashbang, /turf/simulated/floor/tiled/dark, /area/mercbase/eqroom) "oo" = ( @@ -3630,12 +3630,12 @@ /turf/simulated/floor/tiled/dark, /area/mercbase/medicalstorage) "oq" = ( -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, /obj/structure/closet/secure_closet/guncabinet{ req_one_access = list(150) }, @@ -3655,22 +3655,22 @@ /obj/item/clothing/accessory/armor/armguards/merc, /obj/item/clothing/accessory/armor/legguards/merc, /obj/item/clothing/head/helmet/merc, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/grenade/flashbang, +/obj/item/gun/energy/gun, +/obj/item/grenade/flashbang, /turf/simulated/floor/tiled/dark, /area/mercbase/eqroom) "os" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled/dark, /area/mercbase/engineering) "ot" = ( -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, /obj/structure/closet/secure_closet/guncabinet{ req_one_access = list(150) }, @@ -3681,7 +3681,7 @@ /obj/structure/closet/hydrant{ pixel_w = -32 }, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /turf/simulated/floor/tiled/dark, /area/mercbase/engineering) "ov" = ( @@ -3690,11 +3690,11 @@ /area/mercbase/medicalOR) "ow" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/clotting, -/obj/item/weapon/storage/firstaid/clotting, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/clotting, +/obj/item/storage/firstaid/clotting, /turf/simulated/floor/tiled/dark, /area/mercbase/medicalstorage) "ox" = ( diff --git a/maps/offmap_vr/om_ships/mercship.dmm b/maps/offmap_vr/om_ships/mercship.dmm index 11d041f6087..7b9653df4bd 100644 --- a/maps/offmap_vr/om_ships/mercship.dmm +++ b/maps/offmap_vr/om_ships/mercship.dmm @@ -421,10 +421,10 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/item/device/flashlight/maglight, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/backpack/dufflebag/syndie, -/obj/item/weapon/gun/projectile/silenced, +/obj/item/flashlight/maglight, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/backpack/dufflebag/syndie, +/obj/item/gun/projectile/silenced, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/barracks) "aT" = ( @@ -745,7 +745,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/med1) "bB" = ( @@ -842,10 +842,10 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/item/device/flashlight/maglight, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/backpack/dufflebag/syndie, -/obj/item/weapon/gun/projectile/silenced, +/obj/item/flashlight/maglight, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/backpack/dufflebag/syndie, +/obj/item/gun/projectile/silenced, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/barracks) "bJ" = ( @@ -941,10 +941,10 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 5 }, -/obj/item/device/flashlight/maglight, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/backpack/dufflebag/syndie, -/obj/item/weapon/gun/projectile/silenced, +/obj/item/flashlight/maglight, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/backpack/dufflebag/syndie, +/obj/item/gun/projectile/silenced, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/barracks) "bR" = ( @@ -1023,7 +1023,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/machinery/alarm{ pixel_y = 30 }, @@ -1118,9 +1118,9 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/med1) "cf" = ( @@ -1412,7 +1412,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 5 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/med1) "cE" = ( @@ -1425,7 +1425,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/med1) "cF" = ( @@ -2554,9 +2554,9 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 5 }, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, /turf/simulated/floor/tiled/white, /area/ship/mercenary/armoury) "eH" = ( @@ -2598,7 +2598,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/med1) "eL" = ( @@ -2841,8 +2841,8 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, /turf/simulated/floor/tiled/white, /area/ship/mercenary/fighter) "fc" = ( @@ -3835,7 +3835,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 10 }, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/med1) "gL" = ( @@ -4114,7 +4114,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/item/weapon/storage/box/freezer, +/obj/item/storage/box/freezer, /turf/simulated/floor/tiled/white, /area/ship/mercenary/fighter) "hk" = ( @@ -4332,7 +4332,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 6 }, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled/white, /area/ship/mercenary/fighter) "hH" = ( @@ -4340,7 +4340,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 10 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/simulated/floor/tiled/white, /area/ship/mercenary/fighter) "hI" = ( diff --git a/maps/offmap_vr/om_ships/salamander.dm b/maps/offmap_vr/om_ships/salamander.dm index 21a68ca5e66..340b8c3d420 100644 --- a/maps/offmap_vr/om_ships/salamander.dm +++ b/maps/offmap_vr/om_ships/salamander.dm @@ -189,7 +189,7 @@ shuttle = "Salamander Wreckage" known = FALSE -/obj/item/weapon/paper/unity_notice +/obj/item/paper/unity_notice name = "hastily-scrawled missive" info = {"The writing on this scrap of paper is barely legible. Whoever wrote it was clearly in a hurry.
\
\ diff --git a/maps/offmap_vr/om_ships/salamander.dmm b/maps/offmap_vr/om_ships/salamander.dmm index a90d410ccf2..2db4c7fff4b 100644 --- a/maps/offmap_vr/om_ships/salamander.dmm +++ b/maps/offmap_vr/om_ships/salamander.dmm @@ -321,7 +321,7 @@ /area/shuttle/salamander_engineering) "fu" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/light_switch{ dir = 4; pixel_x = 22 @@ -388,8 +388,8 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander) "fZ" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /obj/structure/handrail, @@ -877,14 +877,14 @@ /obj/structure/railing/grey{ dir = 8 }, -/obj/item/weapon/tank/phoron/pressurized, -/obj/item/weapon/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, /obj/structure/closet/walllocker{ dir = 1; name = "Spare Fuel"; pixel_y = -32 }, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /obj/item/stack/material/tritium{ amount = 25 }, @@ -1035,8 +1035,8 @@ /area/shuttle/salamander) "oi" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/random/snack, /obj/random/snack, /obj/random/snack, @@ -1062,7 +1062,7 @@ /area/shuttle/salamander_cockpit) "oF" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/light_switch{ dir = 4; pixel_x = 22 @@ -1553,8 +1553,8 @@ /turf/simulated/floor/plating, /area/shuttle/salamander_cockpit) "IL" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /obj/structure/handrail{ @@ -1800,7 +1800,7 @@ /area/shuttle/salamander_q1) "Rm" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/alarm/alarms_hidden{ dir = 8; pixel_x = 26 @@ -1810,7 +1810,7 @@ /area/shuttle/salamander_q1) "RO" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/alarm/alarms_hidden{ dir = 8; pixel_x = 26 @@ -1875,8 +1875,8 @@ /turf/simulated/wall/shull, /area/shuttle/salamander_head) "Tl" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /obj/structure/railing/grey{ @@ -1999,8 +1999,8 @@ /turf/simulated/floor/plating, /area/shuttle/salamander) "Xc" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /obj/structure/railing/grey{ diff --git a/maps/offmap_vr/om_ships/salamander_wreck.dmm b/maps/offmap_vr/om_ships/salamander_wreck.dmm index 304059ed837..ef15ffdf54f 100644 --- a/maps/offmap_vr/om_ships/salamander_wreck.dmm +++ b/maps/offmap_vr/om_ships/salamander_wreck.dmm @@ -514,7 +514,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/circuitboard/smes, +/obj/item/circuitboard/smes, /obj/structure/closet/walllocker_double/north{ name = "Uniform Locker" }, @@ -910,7 +910,7 @@ name = "Spare Fuel"; pixel_y = -32 }, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /obj/machinery/light, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; @@ -965,7 +965,7 @@ dir = 1 }, /obj/random/empty_or_lootable_crate, -/obj/item/weapon/smes_coil, +/obj/item/smes_coil, /obj/structure/closet/walllocker_double/south{ name = "Storage Locker" }, @@ -1048,8 +1048,8 @@ /area/shuttle/salamander_wreck) "oi" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/random/snack, /obj/random/snack, /obj/random/snack, @@ -1078,7 +1078,7 @@ /area/shuttle/salamander_wreck_cockpit) "oF" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/light_switch{ dir = 4; pixel_x = 22 @@ -1318,7 +1318,7 @@ /area/shuttle/salamander_wreck_galley) "vt" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/alarm/alarms_hidden{ dir = 8; pixel_x = 26 @@ -1355,7 +1355,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/weapon/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, /obj/structure/closet/walllocker_double/south{ name = "Uniform Locker" }, @@ -1415,7 +1415,7 @@ /area/shuttle/salamander_wreck_engineering) "AK" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/light_switch{ dir = 4; pixel_x = 22 @@ -1830,7 +1830,7 @@ }, /obj/structure/handrail, /obj/random/empty_or_lootable_crate, -/obj/item/weapon/smes_coil, +/obj/item/smes_coil, /obj/structure/closet/walllocker_double/north{ name = "Storage Locker" }, @@ -1841,7 +1841,7 @@ /area/shuttle/salamander_wreck) "RO" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/alarm/alarms_hidden{ dir = 8; pixel_x = 26 @@ -1886,7 +1886,7 @@ "Sp" = ( /obj/structure/table/steel, /obj/machinery/light, -/obj/item/weapon/paper/unity_notice, +/obj/item/paper/unity_notice, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -1908,7 +1908,7 @@ /obj/machinery/light/flicker{ dir = 1 }, -/obj/item/weapon/smes_coil, +/obj/item/smes_coil, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 diff --git a/maps/offmap_vr/om_ships/screebarge.dmm b/maps/offmap_vr/om_ships/screebarge.dmm index 21e85fded39..c729c128b1f 100644 --- a/maps/offmap_vr/om_ships/screebarge.dmm +++ b/maps/offmap_vr/om_ships/screebarge.dmm @@ -396,11 +396,11 @@ /area/shuttle/screebarge/mid) "bc" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = -2 }, diff --git a/maps/offmap_vr/om_ships/sdf_corvette.dmm b/maps/offmap_vr/om_ships/sdf_corvette.dmm index 1ac822457be..744f6803ecd 100644 --- a/maps/offmap_vr/om_ships/sdf_corvette.dmm +++ b/maps/offmap_vr/om_ships/sdf_corvette.dmm @@ -8,7 +8,7 @@ /obj/structure/closet/walllocker_double/emergency_engi/north, /obj/fiftyspawner/steel/hull, /obj/fiftyspawner/rglass, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/techfloor, /area/shuttle/sdf_corvette) "bn" = ( @@ -63,7 +63,7 @@ dir = 4 }, /obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/structure/closet/walllocker_double/emergency_engi/north, /obj/machinery/button/remote/airlock{ dir = 4; @@ -675,11 +675,11 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/item/weapon/storage/firstaid{ +/obj/item/storage/firstaid{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = -2; pixel_y = -2 }, diff --git a/maps/offmap_vr/om_ships/sdf_corvette_wreck.dmm b/maps/offmap_vr/om_ships/sdf_corvette_wreck.dmm index bbc9b83fc93..abac085b9a4 100644 --- a/maps/offmap_vr/om_ships/sdf_corvette_wreck.dmm +++ b/maps/offmap_vr/om_ships/sdf_corvette_wreck.dmm @@ -8,7 +8,7 @@ /obj/structure/closet/walllocker_double/emergency_engi/north, /obj/fiftyspawner/steel/hull, /obj/fiftyspawner/rglass, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -30,7 +30,7 @@ dir = 10 }, /obj/item/trash/material/circuit, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -50,7 +50,7 @@ /obj/machinery/airlock_sensor/airlock_interior{ pixel_y = -24 }, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -79,7 +79,7 @@ dir = 4 }, /obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/structure/closet/walllocker_double/emergency_engi/north, /obj/machinery/button/remote/airlock{ dir = 4; @@ -102,7 +102,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -116,7 +116,7 @@ id = "sdfc_wreck_cockpitshutters"; name = "Blast Shield" }, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/airless, /area/shuttle/sdf_corvette_wreck) "eT" = ( @@ -200,7 +200,7 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/unary/vent_scrubber, -/obj/item/weapon/gun/energy/gun/compact{ +/obj/item/gun/energy/gun/compact{ random_start_ammo = 1 }, /turf/simulated/floor/tiled/techfloor{ @@ -213,7 +213,7 @@ dir = 8 }, /obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/machinery/light{ dir = 1 }, @@ -236,7 +236,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -318,8 +318,8 @@ dir = 1; pixel_y = -26 }, -/obj/item/weapon/material/shard/shrapnel, -/obj/item/weapon/material/shard, +/obj/item/material/shard/shrapnel, +/obj/item/material/shard, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -342,7 +342,7 @@ pixel_x = 26 }, /obj/effect/decal/cleanable/blood, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -413,7 +413,7 @@ dir = 4 }, /obj/effect/map_helper/airlock/atmos/pump_out_internal, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -425,7 +425,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -477,7 +477,7 @@ icon_state = "1-2" }, /obj/effect/landmark/corpse/vintage/marine, -/obj/item/weapon/gun/energy/laser/old{ +/obj/item/gun/energy/laser/old{ random_start_ammo = 1 }, /turf/simulated/floor/tiled/techfloor{ @@ -569,7 +569,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/blood, -/obj/item/weapon/gun/energy/laser/old{ +/obj/item/gun/energy/laser/old{ random_start_ammo = 1 }, /turf/simulated/floor/tiled/techfloor{ @@ -597,7 +597,7 @@ dir = 1; pixel_y = -28 }, -/obj/item/device/gps/on{ +/obj/item/gps/on{ gps_tag = "SDF Beacon" }, /obj/machinery/light, @@ -635,7 +635,7 @@ name = "Blast Shields Control"; pixel_y = 24 }, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -659,8 +659,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/item/weapon/material/shard/shrapnel, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/floor/airless, /area/shuttle/sdf_corvette_wreck) "EN" = ( @@ -672,7 +672,7 @@ pixel_y = 21 }, /obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/item/weapon/gun/energy/gun/compact{ +/obj/item/gun/energy/gun/compact{ random_start_ammo = 1 }, /turf/simulated/floor/tiled/techfloor{ @@ -696,7 +696,7 @@ /turf/simulated/wall/rshull, /area/shuttle/sdf_corvette_wreck) "Gc" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/template_noop, /area/space) "Hb" = ( @@ -763,8 +763,8 @@ dir = 1; pixel_y = -28 }, -/obj/item/weapon/material/shard/shrapnel, -/obj/item/weapon/gun/energy/laser/old{ +/obj/item/material/shard/shrapnel, +/obj/item/gun/energy/laser/old{ random_start_ammo = 1 }, /turf/simulated/floor/tiled/techfloor{ @@ -804,7 +804,7 @@ /turf/template_noop, /area/space) "Lj" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/template_noop, /area/space) "Ly" = ( @@ -831,11 +831,11 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/item/weapon/storage/firstaid{ +/obj/item/storage/firstaid{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = -2; pixel_y = -2 }, @@ -874,7 +874,7 @@ icon_state = "2-8" }, /obj/structure/closet/walllocker/emerglocker/north, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /obj/machinery/light{ dir = 1 }, @@ -942,7 +942,7 @@ /area/shuttle/sdf_corvette_wreck) "Rb" = ( /obj/machinery/computer/shuttle_control/explore/sdf_corvette_wreck, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -966,7 +966,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /obj/item/frame/apc, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; @@ -979,7 +979,7 @@ }, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/closet/walllocker/emerglocker/south, -/obj/item/weapon/gun/energy/laser/old{ +/obj/item/gun/energy/laser/old{ random_start_ammo = 1 }, /turf/simulated/floor/tiled/techfloor{ @@ -1052,7 +1052,7 @@ pixel_x = -30 }, /obj/structure/lattice, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/template_noop, /area/shuttle/sdf_corvette_wreck) diff --git a/maps/offmap_vr/om_ships/shelter_5.dmm b/maps/offmap_vr/om_ships/shelter_5.dmm index 7055a4dee35..9aa78944201 100644 --- a/maps/offmap_vr/om_ships/shelter_5.dmm +++ b/maps/offmap_vr/om_ships/shelter_5.dmm @@ -26,35 +26,35 @@ /area/shuttle/deployable/escapepod) "e" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/box/survival/space, -/obj/item/weapon/storage/box/survival/space, -/obj/item/weapon/storage/box/survival/space, -/obj/item/weapon/storage/box/survival/space, -/obj/item/device/gps, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/adv, +/obj/item/storage/box/survival/space, +/obj/item/storage/box/survival/space, +/obj/item/storage/box/survival/space, +/obj/item/storage/box/survival/space, +/obj/item/gps, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/storage/toolbox/emergency, /obj/effect/floor_decal/techfloor{ dir = 1 }, diff --git a/maps/offmap_vr/om_ships/vespa.dmm b/maps/offmap_vr/om_ships/vespa.dmm index 5a1393ff78b..4c6b5928905 100644 --- a/maps/offmap_vr/om_ships/vespa.dmm +++ b/maps/offmap_vr/om_ships/vespa.dmm @@ -671,7 +671,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/item/weapon/handcuffs/fuzzy, +/obj/item/handcuffs/fuzzy, /turf/simulated/floor, /area/ship/expe/maintenancerim) "bM" = ( @@ -968,7 +968,7 @@ pixel_y = 22 }, /obj/structure/table/woodentable, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin1) "cD" = ( @@ -1116,7 +1116,7 @@ pixel_y = 22 }, /obj/structure/table/woodentable, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin6) "cS" = ( @@ -1323,7 +1323,7 @@ /turf/simulated/floor, /area/ship/expe/maintenance2) "dn" = ( -/obj/item/weapon/handcuffs/fuzzy, +/obj/item/handcuffs/fuzzy, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 9; icon_state = "intact-aux" @@ -1344,7 +1344,7 @@ /obj/structure/table/rack, /obj/item/clothing/suit/space/void/medical, /obj/item/clothing/head/helmet/space/void/medical, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/hangarcontrol) @@ -1369,7 +1369,7 @@ /obj/structure/table/rack, /obj/item/clothing/head/helmet/space/void/security, /obj/item/clothing/suit/space/void/security, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/hangarcontrol) @@ -1389,7 +1389,7 @@ dir = 4 }, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin1) "dy" = ( @@ -1417,7 +1417,7 @@ dir = 4 }, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin2) "dB" = ( @@ -1445,7 +1445,7 @@ dir = 4 }, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin3) "dE" = ( @@ -1473,7 +1473,7 @@ dir = 4 }, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin4) "dH" = ( @@ -1501,7 +1501,7 @@ dir = 4 }, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin5) "dK" = ( @@ -1529,7 +1529,7 @@ dir = 4 }, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin6) "dN" = ( @@ -1557,7 +1557,7 @@ dir = 4 }, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin7) "dQ" = ( @@ -1585,7 +1585,7 @@ dir = 4 }, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin8) "dT" = ( @@ -1613,7 +1613,7 @@ dir = 4 }, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin9) "dW" = ( @@ -2468,7 +2468,7 @@ /obj/item/clothing/head/helmet/space/void/pilot, /obj/item/clothing/head/helmet/space/void/pilot, /obj/item/clothing/head/helmet/space/void/pilot, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/hangarcontrol) @@ -2486,7 +2486,7 @@ /obj/item/clothing/head/helmet/space/void/exploration, /obj/item/clothing/head/helmet/space/void/exploration, /obj/item/clothing/head/helmet/space/void/exploration, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/hangarcontrol) @@ -3416,7 +3416,7 @@ /obj/item/clothing/suit/space/void/engineering, /obj/item/clothing/head/helmet/space/void/engineering, /obj/item/clothing/head/helmet/space/void/engineering, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/hangarcontrol) @@ -3426,7 +3426,7 @@ /obj/item/clothing/suit/space/void/atmos, /obj/item/clothing/head/helmet/space/void/atmos, /obj/item/clothing/head/helmet/space/void/atmos, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/hangarcontrol) @@ -4206,8 +4206,8 @@ dir = 9; icon_state = "bordercolor" }, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seceq) "iF" = ( @@ -4330,9 +4330,9 @@ /area/ship/expe/secmain) "iM" = ( /obj/structure/closet/secure_closet, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, -/obj/item/weapon/storage/backpack/satchel/sec, +/obj/item/handcuffs, +/obj/item/handcuffs, +/obj/item/storage/backpack/satchel/sec, /obj/effect/floor_decal/borderfloorblack{ dir = 1; icon_state = "borderfloor_black" @@ -4351,10 +4351,10 @@ /obj/item/clothing/accessory/storage/black_drop_pouches, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/badge/corporate_tag/hephaestus, -/obj/item/device/flashlight/maglight, -/obj/item/device/megaphone, -/obj/item/device/radio, -/obj/item/weapon/melee/baton, +/obj/item/flashlight/maglight, +/obj/item/megaphone, +/obj/item/radio, +/obj/item/melee/baton, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/secmain) "iN" = ( @@ -4553,7 +4553,7 @@ icon_state = "bordercolor" }, /obj/structure/table/reinforced, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalmain) "jc" = ( @@ -4581,8 +4581,8 @@ dir = 9; icon_state = "bordercolor" }, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /turf/simulated/floor/tiled/white, /area/ship/expe/medicaleq) "jf" = ( @@ -4596,9 +4596,9 @@ dir = 1; icon_state = "bordercolor" }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled/white, /area/ship/expe/medicaleq) "jg" = ( @@ -4615,9 +4615,9 @@ dir = 1; icon_state = "bordercolor" }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /turf/simulated/floor/tiled/white, /area/ship/expe/medicaleq) "jh" = ( @@ -4632,9 +4632,9 @@ icon_state = "bordercolor" }, /obj/structure/closet/crate, -/obj/item/weapon/storage/box/bloodpacks, -/obj/item/weapon/storage/box/backup_kit, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/bloodpacks, +/obj/item/storage/box/backup_kit, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, /area/ship/expe/medicaleq) "ji" = ( @@ -5075,8 +5075,8 @@ dir = 8; icon_state = "bordercolor" }, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seceq) "ke" = ( @@ -5319,8 +5319,8 @@ dir = 8; icon_state = "bordercolor" }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/simulated/floor/tiled/white, /area/ship/expe/medicaleq) "kB" = ( @@ -5725,7 +5725,7 @@ /area/ship/expe/hangar) "lo" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/box/holobadge, +/obj/item/storage/box/holobadge, /obj/effect/floor_decal/borderfloorblack{ dir = 8; icon_state = "borderfloor_black" @@ -5738,14 +5738,14 @@ /area/ship/expe/seceq) "lp" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/flashbangs, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/flashbangs, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seceq) "lq" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /obj/effect/floor_decal/borderfloorblack{ dir = 4; icon_state = "borderfloor_black" @@ -5890,8 +5890,8 @@ dir = 8; icon_state = "bordercolor" }, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /obj/machinery/light{ dir = 8; icon_state = "tube1"; @@ -5915,7 +5915,7 @@ icon_state = "bordercolor" }, /obj/structure/table/reinforced, -/obj/item/weapon/soap/syndie, +/obj/item/soap/syndie, /turf/simulated/floor/tiled/white, /area/ship/expe/medicaleq) "lI" = ( @@ -6411,7 +6411,7 @@ dir = 4; icon_state = "bordercolor" }, -/obj/item/weapon/storage/box/pillbottles, +/obj/item/storage/box/pillbottles, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalchem) "mz" = ( @@ -6580,7 +6580,7 @@ icon_state = "bordercolor" }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/cdeathalarm_kit, +/obj/item/storage/box/cdeathalarm_kit, /turf/simulated/floor/tiled/white, /area/ship/expe/medicaleq) "mK" = ( @@ -7221,7 +7221,7 @@ dir = 4; icon_state = "bordercolor" }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalchem) "nS" = ( @@ -7943,9 +7943,9 @@ /area/ship/expe/medicalchem) "pc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalchem) "pd" = ( @@ -8272,8 +8272,8 @@ icon_state = "bordercolor" }, /obj/structure/closet, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, +/obj/item/cell/high, +/obj/item/cell/high, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/expedition) "pL" = ( @@ -8286,10 +8286,10 @@ icon_state = "bordercolor" }, /obj/structure/closet, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/expedition) "pM" = ( @@ -8313,9 +8313,9 @@ icon_state = "bordercolor" }, /obj/structure/table/rack/shelf, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/expedition) "pO" = ( @@ -8328,11 +8328,11 @@ icon_state = "bordercolor" }, /obj/structure/table/rack/shelf, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/expedition) "pP" = ( @@ -8557,7 +8557,7 @@ /area/ship/expe/seclobby2) "qc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled/techfloor, @@ -8572,8 +8572,8 @@ dir = 1; icon_state = "bordercolor" }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/secmain) "qe" = ( @@ -8596,8 +8596,8 @@ dir = 10; icon_state = "bordercolor" }, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, +/obj/item/storage/box/beakers, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalchem) "qh" = ( @@ -8632,7 +8632,7 @@ dir = 6; icon_state = "bordercolor" }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalchem) "qk" = ( @@ -8665,9 +8665,9 @@ /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/masks, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/storage/box/gloves, +/obj/item/storage/box/masks, +/obj/item/reagent_containers/spray/cleaner, /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalmain) @@ -8685,7 +8685,7 @@ /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/item/weapon/storage/quickdraw/syringe_case, +/obj/item/storage/quickdraw/syringe_case, /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalmain) @@ -9122,7 +9122,7 @@ dir = 1; icon_state = "bordercolor" }, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/secmain) "rk" = ( @@ -9206,8 +9206,8 @@ /area/ship/expe/medical1) "rx" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/effect/floor_decal/borderfloorblack{ dir = 10; icon_state = "borderfloor_black" @@ -9220,8 +9220,8 @@ /area/ship/expe/engineeringequipment) "ry" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/yellow/border, /turf/simulated/floor/tiled/techfloor, @@ -9869,7 +9869,7 @@ dir = 9; icon_state = "bordercolor" }, -/obj/item/weapon/storage/box/freezer, +/obj/item/storage/box/freezer, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalsur) "sF" = ( @@ -9946,7 +9946,7 @@ dir = 5; icon_state = "bordercolor" }, -/obj/item/weapon/storage/box/freezer, +/obj/item/storage/box/freezer, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalsur) "sJ" = ( @@ -10148,7 +10148,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/expedition) "tq" = ( @@ -10157,7 +10157,7 @@ icon_state = "intact-supply" }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/expedition) "tr" = ( @@ -10166,7 +10166,7 @@ icon_state = "intact-supply" }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/expedition) "ts" = ( @@ -10175,7 +10175,7 @@ icon_state = "intact-supply" }, /obj/structure/table/steel_reinforced, -/obj/item/device/universal_translator, +/obj/item/universal_translator, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/expedition) "tt" = ( @@ -10311,7 +10311,7 @@ icon_state = "bordercolor" }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalsur) "tJ" = ( @@ -10319,7 +10319,7 @@ /area/ship/expe/medicalsur) "tK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/spray/sterilizine, +/obj/item/reagent_containers/spray/sterilizine, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalsur) "tL" = ( @@ -10332,7 +10332,7 @@ dir = 4; icon_state = "bordercolor" }, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalsur) "tM" = ( @@ -10758,7 +10758,7 @@ /area/ship/expe/expedition) "uy" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/expedition) "uz" = ( @@ -10767,7 +10767,7 @@ /area/ship/expe/expedition) "uA" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/universal_translator, +/obj/item/universal_translator, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/expedition) "uB" = ( @@ -11199,7 +11199,7 @@ /area/ship/expe/captqua) "vx" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/captaindouble, +/obj/item/bedsheet/captaindouble, /obj/effect/floor_decal/corner/blue/border{ dir = 6; icon_state = "bordercolor" @@ -11361,9 +11361,9 @@ icon_state = "bordercolor" }, /obj/structure/table/rack/shelf, -/obj/item/device/gps/explorer, -/obj/item/device/gps/explorer, -/obj/item/device/gps/explorer, +/obj/item/gps/explorer, +/obj/item/gps/explorer, +/obj/item/gps/explorer, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/expedition) "vZ" = ( @@ -11666,14 +11666,14 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/purple/border, /obj/structure/table/steel_reinforced, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/expedition) "wE" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/purple/border, /obj/structure/table/steel_reinforced, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/expedition) "wF" = ( @@ -11714,9 +11714,9 @@ icon_state = "bordercolor" }, /obj/structure/table/rack/shelf, -/obj/item/device/gps/explorer, -/obj/item/device/gps/explorer, -/obj/item/device/gps/explorer, +/obj/item/gps/explorer, +/obj/item/gps/explorer, +/obj/item/gps/explorer, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/expedition) "wK" = ( @@ -12233,15 +12233,15 @@ icon_state = "1-2" }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/bridge) "yQ" = ( /obj/structure/closet/secure_closet, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, -/obj/item/weapon/storage/backpack/satchel/sec, +/obj/item/handcuffs, +/obj/item/handcuffs, +/obj/item/storage/backpack/satchel/sec, /obj/effect/floor_decal/borderfloorblack{ dir = 1; icon_state = "borderfloor_black" @@ -12260,16 +12260,16 @@ /obj/item/clothing/accessory/storage/black_drop_pouches, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/badge/corporate_tag/hephaestus, -/obj/item/device/flashlight/maglight, -/obj/item/device/radio, -/obj/item/weapon/melee/baton, +/obj/item/flashlight/maglight, +/obj/item/radio, +/obj/item/melee/baton, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/secmain) "yR" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/red/border, -/obj/item/weapon/folder, +/obj/item/folder, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seclobby2) "yS" = ( @@ -12278,7 +12278,7 @@ /obj/machinery/door/window/northright, /obj/effect/floor_decal/borderfloorblack/full, /obj/effect/floor_decal/corner/red/borderfull, -/obj/item/weapon/deskbell, +/obj/item/deskbell, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seclobby) diff --git a/maps/offmap_vr/talon/talon_v2.dm b/maps/offmap_vr/talon/talon_v2.dm index 901e42c271e..73db3be4737 100644 --- a/maps/offmap_vr/talon/talon_v2.dm +++ b/maps/offmap_vr/talon/talon_v2.dm @@ -144,7 +144,7 @@ var/global/list/latejoin_talon = list() /obj/machinery/telecomms/allinone/talon freq_listening = list(PUB_FREQ, TALON_FREQ) -/obj/item/weapon/paper/talon_shields +/obj/item/paper/talon_shields name = "to whatever asshole" info = {"to whatever asshole keeps resetting the shield generator,
\ please stop fucking around before you get us all killed. thanks.
\ @@ -159,7 +159,7 @@ good luck
\
\ Harry Townes"} -/obj/item/weapon/paper/talon_power +/obj/item/paper/talon_power name = "new power setup" info = {"to whoever's saddled with running this rustbucket this week,
\ good news! you may have noticed the entire ship was replaced pretty much overnight.
\ @@ -179,7 +179,7 @@ alternately maybe you can trade some off those nanotrasen corpos down on 3B. atm
\ p.s. speaking of shit that's bad for your health for the love of fuck do not smoke in the main engineering compartments, and definitely don't smoke in the engine rooms! if the ass-end of the ship ends up blown off because you went for a smoke break in a room full of crazy-flammable phoron they'll stick your reconstituted atoms so far in debt-prison you won't see daylight for a century."} -/obj/item/weapon/paper/talon_doctor +/obj/item/paper/talon_doctor name = "new medical bay" info = {"to whoever's stuck babysitting everyone's booboos,
\ good news! you may have noticed the entire ship was replaced pretty much overnight.
\ @@ -190,7 +190,7 @@ whatever. enjoy the change of scenery. or don't.
\
\ Harry Townes"} -/obj/item/weapon/paper/talon_guard +/obj/item/paper/talon_guard name = "new brig" info = {"to whoever's stuck enforcing some semblance of order on this hulk,
\ good news! you may have noticed the entire ship was replaced pretty much overnight.
\ @@ -203,7 +203,7 @@ so stay sharp eh?
\
\ Harry Townes"} -/obj/item/weapon/paper/talon_captain +/obj/item/paper/talon_captain name = "storage space" info = {"to whoever's stuck at the helm of this farce of an operation,
\ good news! you may have noticed the entire ship was replaced pretty much overnight.
\ @@ -214,7 +214,7 @@ have fun!
\
\ Harry Townes"} -/obj/item/weapon/paper/talon_pilot +/obj/item/paper/talon_pilot name = "new shuttle" info = {"to whoever's stuck flying this ungreased beast,
\ good news! you may have noticed the entire ship was replaced pretty much overnight.
\ @@ -231,7 +231,7 @@ speaking of, if some dumbass does take it and fly off solo then get themselves k
\ Harry Townes"} -/obj/item/weapon/paper/talon_cannon +/obj/item/paper/talon_cannon name = "ITV Talon OFD Console" info = {"to whoever's got the itchiest trigger finger,
\ as a reward for recent good performance, the lads upstairs have seen fit to have our ship retrofitted with an Obstruction Field Disperser. This fancy bit of hardware can be used to, well, 'disperse' 'obstructions'. asteroids or carp shoals in the way? no problem! load her up and fire! range is pretty short though.
\ @@ -244,7 +244,7 @@ oh, and it's not a weapon. don't try to shoot other ships with it or anything, i
\ Harry Townes"} -/obj/item/weapon/paper/talon_escape_pod +/obj/item/paper/talon_escape_pod name = "ITV Talon Escape Pod" info = {"to whoever's stuck bailing out,
\ after some extensive retrofits to comply with starfaring vessel regulations, our lovely little ship has been outfitted with a proper escape pod, which you are now standing in if you are reading this paper! congratulations!
\ @@ -271,16 +271,16 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /mob/living/silicon/robot/drone/talon foreign_droid = TRUE - idcard_type = /obj/item/weapon/card/id/synthetic/talon + idcard_type = /obj/item/card/id/synthetic/talon -/obj/item/weapon/card/id/synthetic/talon +/obj/item/card/id/synthetic/talon name = "\improper Talon synthetic ID" desc = "Access module for Talon synthetics" icon_state = "id-robot" item_state = "tdgreen" assignment = "Talon synthetic" -/obj/item/weapon/card/id/synthetic/talon/Initialize() +/obj/item/card/id/synthetic/talon/Initialize() . = ..() access = list(access_talon, access_synth) @@ -297,7 +297,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you req_one_access = list(access_talon) /obj/machinery/power/apc/talon/hyper - cell_type = /obj/item/weapon/cell/hyper + cell_type = /obj/item/cell/hyper /obj/machinery/alarm/talon req_access = list() @@ -356,17 +356,17 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /obj/item/clothing/suit/space/void/mining/talon name = "talon miner's voidsuit" -/obj/item/device/gps/command/taloncap +/obj/item/gps/command/taloncap gps_tag = "TALC" -/obj/item/device/gps/security/talonguard +/obj/item/gps/security/talonguard gps_tag = "TALG" -/obj/item/device/gps/medical/talonmed +/obj/item/gps/medical/talonmed gps_tag = "TALM" -/obj/item/device/gps/engineering/taloneng +/obj/item/gps/engineering/taloneng gps_tag = "TALE" -/obj/item/device/gps/explorer/talonpilot +/obj/item/gps/explorer/talonpilot gps_tag = "TALP" -/obj/item/device/gps/mining/talonminer +/obj/item/gps/mining/talonminer gps_tag = "TALM" /obj/structure/closet/secure_closet/talon_captain @@ -375,16 +375,16 @@ personally I recommend using the ship's boat if you need to evacuate, but if you closet_appearance = /decl/closet_appearance/secure_closet/talon/captain starts_with = list( - /obj/item/weapon/storage/backpack/dufflebag/captain, + /obj/item/storage/backpack/dufflebag/captain, /obj/item/clothing/suit/storage/vest, - /obj/item/weapon/melee/telebaton, - /obj/item/device/flash, - /obj/item/device/radio/headset/talon, + /obj/item/melee/telebaton, + /obj/item/flash, + /obj/item/radio/headset/talon, /obj/item/clothing/head/helmet/space/void/refurb/officer/talon, /obj/item/clothing/suit/space/void/refurb/officer/talon, - /obj/item/weapon/tank/oxygen, - /obj/item/device/suit_cooling_unit, - /obj/item/device/gps/command/taloncap + /obj/item/tank/oxygen, + /obj/item/suit_cooling_unit, + /obj/item/gps/command/taloncap ) /obj/structure/closet/secure_closet/talon_guard @@ -397,21 +397,21 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /obj/item/clothing/under/utility, /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/shoes/boots/jackboots/toeless, - /obj/item/weapon/handcuffs = 2, - /obj/item/weapon/gun/energy/stunrevolver, + /obj/item/handcuffs = 2, + /obj/item/gun/energy/stunrevolver, /obj/item/clothing/accessory/armor/tag/sec, - /obj/item/device/flash, - /obj/item/device/flashlight/maglight, + /obj/item/flash, + /obj/item/flashlight/maglight, /obj/item/clothing/glasses/sunglasses, - /obj/item/weapon/storage/belt/security, - /obj/item/device/radio/headset/talon, + /obj/item/storage/belt/security, + /obj/item/radio/headset/talon, /obj/item/clothing/accessory/solgov/department/security/army, /obj/item/clothing/head/helmet/space/void/refurb/marine/talon, /obj/item/clothing/suit/space/void/refurb/marine/talon, - /obj/item/weapon/tank/oxygen, - /obj/item/device/suit_cooling_unit, - /obj/item/device/gps/security/talonguard, - /obj/item/weapon/melee/baton + /obj/item/tank/oxygen, + /obj/item/suit_cooling_unit, + /obj/item/gps/security/talonguard, + /obj/item/melee/baton ) /obj/structure/closet/secure_closet/talon_doctor @@ -426,12 +426,12 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /obj/item/clothing/suit/storage/toggle/labcoat/modern, /obj/item/clothing/suit/storage/toggle/fr_jacket, /obj/item/clothing/shoes/white, - /obj/item/device/radio/headset/talon, + /obj/item/radio/headset/talon, /obj/item/clothing/head/helmet/space/void/refurb/medical/alt/talon, /obj/item/clothing/suit/space/void/refurb/medical/talon, - /obj/item/weapon/tank/oxygen, - /obj/item/device/suit_cooling_unit, - /obj/item/device/gps/medical/talonmed + /obj/item/tank/oxygen, + /obj/item/suit_cooling_unit, + /obj/item/gps/medical/talonmed ) /obj/structure/closet/secure_closet/talon_engineer @@ -441,19 +441,19 @@ personally I recommend using the ship's boat if you need to evacuate, but if you starts_with = list( /obj/item/clothing/accessory/storage/brown_vest, - /obj/item/device/flashlight, - /obj/item/weapon/extinguisher, + /obj/item/flashlight, + /obj/item/extinguisher, /obj/item/clamp, - /obj/item/device/radio/headset/talon, + /obj/item/radio/headset/talon, /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/mask/gas, /obj/item/taperoll/atmos, - /obj/item/weapon/tank/emergency/oxygen/engi, + /obj/item/tank/emergency/oxygen/engi, /obj/item/clothing/head/helmet/space/void/refurb/engineering/talon, /obj/item/clothing/suit/space/void/refurb/engineering/talon, - /obj/item/weapon/tank/oxygen, - /obj/item/device/suit_cooling_unit, - /obj/item/device/gps/engineering/taloneng + /obj/item/tank/oxygen, + /obj/item/suit_cooling_unit, + /obj/item/gps/engineering/taloneng ) /obj/structure/closet/secure_closet/talon_pilot @@ -462,25 +462,25 @@ personally I recommend using the ship's boat if you need to evacuate, but if you closet_appearance = /decl/closet_appearance/secure_closet/talon/pilot starts_with = list( - /obj/item/weapon/material/knife/tacknife/survival, + /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, /obj/item/clothing/gloves/fingerless, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood, - /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, - /obj/item/device/radio, + /obj/item/reagent_containers/food/snacks/liquidfood, + /obj/item/reagent_containers/food/drinks/cans/waterbottle, + /obj/item/radio, /obj/item/clothing/under/utility/blue, /obj/item/clothing/accessory/solgov/specialty/pilot, /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/shoes/boots/jackboots/toeless, - /obj/item/device/radio/headset/talon, - /obj/item/device/flashlight/color/orange, + /obj/item/radio/headset/talon, + /obj/item/flashlight/color/orange, /obj/item/clothing/head/helmet/space/void/refurb/pilot/talon, /obj/item/clothing/suit/space/void/refurb/pilot/talon, - /obj/item/weapon/tank/oxygen, - /obj/item/device/suit_cooling_unit, - /obj/item/device/gps/explorer/talonpilot + /obj/item/tank/oxygen, + /obj/item/suit_cooling_unit, + /obj/item/gps/explorer/talonpilot ) /obj/structure/closet/secure_closet/talon_miner @@ -489,19 +489,19 @@ personally I recommend using the ship's boat if you need to evacuate, but if you closet_appearance = /decl/closet_appearance/secure_closet/talon/miner starts_with = list( - /obj/item/device/radio/headset/talon, + /obj/item/radio/headset/talon, /obj/item/clothing/head/helmet/space/void/refurb/mining/talon, /obj/item/clothing/suit/space/void/refurb/mining/talon, - /obj/item/weapon/tank/oxygen, - /obj/item/device/suit_cooling_unit, - /obj/item/device/gps/mining/talonminer, + /obj/item/tank/oxygen, + /obj/item/suit_cooling_unit, + /obj/item/gps/mining/talonminer, /obj/item/clothing/gloves/black, - /obj/item/device/analyzer, - /obj/item/weapon/storage/bag/ore, - /obj/item/device/flashlight/lantern, - /obj/item/weapon/shovel, - /obj/item/weapon/pickaxe, - /obj/item/weapon/mining_scanner, + /obj/item/analyzer, + /obj/item/storage/bag/ore, + /obj/item/flashlight/lantern, + /obj/item/shovel, + /obj/item/pickaxe, + /obj/item/mining_scanner, /obj/item/clothing/glasses/material, /obj/item/clothing/glasses/meson ) @@ -512,14 +512,14 @@ personally I recommend using the ship's boat if you need to evacuate, but if you icon_state = "med" product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!" req_access = list(access_talon) - products = list(/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 4, - /obj/item/weapon/reagent_containers/glass/bottle/stoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/toxin = 4, - /obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/syringe = 12, - /obj/item/device/healthanalyzer = 5,/obj/item/weapon/reagent_containers/glass/beaker = 4, /obj/item/weapon/reagent_containers/dropper = 2, + products = list(/obj/item/reagent_containers/glass/bottle/antitoxin = 4,/obj/item/reagent_containers/glass/bottle/inaprovaline = 4, + /obj/item/reagent_containers/glass/bottle/stoxin = 4,/obj/item/reagent_containers/glass/bottle/toxin = 4, + /obj/item/reagent_containers/syringe/antiviral = 4,/obj/item/reagent_containers/syringe = 12, + /obj/item/healthanalyzer = 5,/obj/item/reagent_containers/glass/beaker = 4, /obj/item/reagent_containers/dropper = 2, /obj/item/stack/medical/advanced/bruise_pack = 6, /obj/item/stack/medical/advanced/ointment = 6, /obj/item/stack/medical/splint = 4, - /obj/item/weapon/storage/pill_bottle/carbon = 2, /obj/item/weapon/storage/box/khcrystal = 4, /obj/item/clothing/glasses/omnihud/med = 4, - /obj/item/device/glasses_kit = 1, /obj/item/weapon/storage/quickdraw/syringe_case = 4) - contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3,/obj/item/weapon/reagent_containers/pill/stox = 4,/obj/item/weapon/reagent_containers/pill/antitox = 6) + /obj/item/storage/pill_bottle/carbon = 2, /obj/item/storage/box/khcrystal = 4, /obj/item/clothing/glasses/omnihud/med = 4, + /obj/item/glasses_kit = 1, /obj/item/storage/quickdraw/syringe_case = 4) + contraband = list(/obj/item/reagent_containers/pill/tox = 3,/obj/item/reagent_containers/pill/stox = 4,/obj/item/reagent_containers/pill/antitox = 6) idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. req_log_access = access_talon has_logs = 1 @@ -622,11 +622,11 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /obj/item/modular_computer/console/preset/talon/install_default_hardware() ..() - processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(src) - tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/super(src) - network_card = new/obj/item/weapon/computer_hardware/network_card/wired(src) - nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) + processor_unit = new/obj/item/computer_hardware/processor_unit(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive/super(src) + network_card = new/obj/item/computer_hardware/network_card/wired(src) + nano_printer = new/obj/item/computer_hardware/nano_printer(src) /obj/item/modular_computer/console/preset/talon/install_default_programs() ..() @@ -678,97 +678,97 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /obj/random/multiple/ore_pile/talon/item_to_spawn() return pick( prob(10);list( - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal, - /obj/item/weapon/ore/coal + /obj/item/ore/coal, + /obj/item/ore/coal, + /obj/item/ore/coal, + /obj/item/ore/coal, + /obj/item/ore/coal, + /obj/item/ore/coal, + /obj/item/ore/coal, + /obj/item/ore/coal, + /obj/item/ore/coal, + /obj/item/ore/coal ), prob(3);list( - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond + /obj/item/ore/diamond, + /obj/item/ore/diamond ), prob(15);list( - /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/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/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/glass, + /obj/item/ore/glass, + /obj/item/ore/glass, + /obj/item/ore/glass, + /obj/item/ore/glass, + /obj/item/ore/glass ), prob(5);list( - /obj/item/weapon/ore/gold, - /obj/item/weapon/ore/gold, - /obj/item/weapon/ore/gold, - /obj/item/weapon/ore/gold, - /obj/item/weapon/ore/gold + /obj/item/ore/gold, + /obj/item/ore/gold, + /obj/item/ore/gold, + /obj/item/ore/gold, + /obj/item/ore/gold ), prob(2);list( - /obj/item/weapon/ore/hydrogen + /obj/item/ore/hydrogen ), prob(10);list( - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/iron + /obj/item/ore/iron, + /obj/item/ore/iron, + /obj/item/ore/iron, + /obj/item/ore/iron, + /obj/item/ore/iron, + /obj/item/ore/iron, + /obj/item/ore/iron, + /obj/item/ore/iron, + /obj/item/ore/iron, + /obj/item/ore/iron ), prob(10);list( - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead, - /obj/item/weapon/ore/lead + /obj/item/ore/lead, + /obj/item/ore/lead, + /obj/item/ore/lead, + /obj/item/ore/lead, + /obj/item/ore/lead, + /obj/item/ore/lead, + /obj/item/ore/lead, + /obj/item/ore/lead, + /obj/item/ore/lead, + /obj/item/ore/lead ), prob(5);list( - /obj/item/weapon/ore/marble, - /obj/item/weapon/ore/marble, - /obj/item/weapon/ore/marble, - /obj/item/weapon/ore/marble + /obj/item/ore/marble, + /obj/item/ore/marble, + /obj/item/ore/marble, + /obj/item/ore/marble ), prob(3);list( - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium + /obj/item/ore/osmium, + /obj/item/ore/osmium ), prob(5);list( - /obj/item/weapon/ore/phoron, - /obj/item/weapon/ore/phoron, - /obj/item/weapon/ore/phoron, - /obj/item/weapon/ore/phoron + /obj/item/ore/phoron, + /obj/item/ore/phoron, + /obj/item/ore/phoron, + /obj/item/ore/phoron ), prob(5);list( - /obj/item/weapon/ore/silver, - /obj/item/weapon/ore/silver, - /obj/item/weapon/ore/silver, - /obj/item/weapon/ore/silver + /obj/item/ore/silver, + /obj/item/ore/silver, + /obj/item/ore/silver, + /obj/item/ore/silver ), prob(3);list( - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium + /obj/item/ore/uranium, + /obj/item/ore/uranium ), ) @@ -817,11 +817,11 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /obj/structure/closet/crate/freezer/centauri //CENTAURI SNACKS ), prob(10);list( - /obj/item/weapon/storage/box/donkpockets, - /obj/item/weapon/storage/box/donkpockets, - /obj/item/weapon/storage/box/donkpockets, - /obj/item/weapon/storage/box/donkpockets, - /obj/item/weapon/storage/box/donkpockets, + /obj/item/storage/box/donkpockets, + /obj/item/storage/box/donkpockets, + /obj/item/storage/box/donkpockets, + /obj/item/storage/box/donkpockets, + /obj/item/storage/box/donkpockets, /obj/structure/closet/crate/freezer/centauri //CENTAURI DONK-POCKETS ), prob(10);list( @@ -832,16 +832,16 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /obj/structure/closet/crate/einstein //EINSTEIN BATTERYPACK ), prob(5);list( - /obj/item/weapon/circuitboard/smes, + /obj/item/circuitboard/smes, /obj/random/smes_coil, /obj/random/smes_coil, /obj/structure/closet/crate/focalpoint //FOCAL SMES ), prob(10);list( - /obj/item/weapon/module/power_control, + /obj/item/module/power_control, /obj/item/stack/cable_coil, /obj/item/frame/apc, - /obj/item/weapon/cell/apc, + /obj/item/cell/apc, /obj/structure/closet/crate/focalpoint //FOCAL APC ), prob(5);list( @@ -949,67 +949,67 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /obj/structure/closet/crate/freezer/zenghu //ZENGHU PILLS ), prob(10);list( - /obj/item/device/toner, - /obj/item/device/toner, - /obj/item/device/toner, - /obj/item/weapon/clipboard, - /obj/item/weapon/clipboard, - /obj/item/weapon/pen/red, - /obj/item/weapon/pen/blue, - /obj/item/weapon/pen/blue, - /obj/item/device/camera_film, - /obj/item/weapon/folder/blue, - /obj/item/weapon/folder/red, - /obj/item/weapon/folder/yellow, - /obj/item/weapon/hand_labeler, - /obj/item/weapon/tape_roll, - /obj/item/weapon/paper_bin, + /obj/item/toner, + /obj/item/toner, + /obj/item/toner, + /obj/item/clipboard, + /obj/item/clipboard, + /obj/item/pen/red, + /obj/item/pen/blue, + /obj/item/pen/blue, + /obj/item/camera_film, + /obj/item/folder/blue, + /obj/item/folder/red, + /obj/item/folder/yellow, + /obj/item/hand_labeler, + /obj/item/tape_roll, + /obj/item/paper_bin, /obj/item/sticky_pad/random, /obj/structure/closet/crate/ummarcar //UMMARCAR OFFICE TRASH ), prob(5);list( - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, - /obj/item/weapon/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, + /obj/item/reagent_containers/food/snacks/unajerky, /obj/structure/closet/crate/unathi //UNAJERKY ), prob(10);list( - /obj/item/weapon/reagent_containers/glass/bucket, - /obj/item/weapon/mop, + /obj/item/reagent_containers/glass/bucket, + /obj/item/mop, /obj/item/clothing/under/rank/janitor, - /obj/item/weapon/cartridge/janitor, + /obj/item/cartridge/janitor, /obj/item/clothing/gloves/black, /obj/item/clothing/head/soft/purple, - /obj/item/weapon/storage/belt/janitor, + /obj/item/storage/belt/janitor, /obj/item/clothing/shoes/galoshes, - /obj/item/weapon/storage/bag/trash, - /obj/item/device/lightreplacer, - /obj/item/weapon/reagent_containers/spray/cleaner, - /obj/item/weapon/reagent_containers/glass/rag, - /obj/item/weapon/grenade/chem_grenade/cleaner, - /obj/item/weapon/grenade/chem_grenade/cleaner, - /obj/item/weapon/grenade/chem_grenade/cleaner, + /obj/item/storage/bag/trash, + /obj/item/lightreplacer, + /obj/item/reagent_containers/spray/cleaner, + /obj/item/reagent_containers/glass/rag, + /obj/item/grenade/chem_grenade/cleaner, + /obj/item/grenade/chem_grenade/cleaner, + /obj/item/grenade/chem_grenade/cleaner, /obj/structure/closet/crate/galaksi //GALAKSI JANITOR SUPPLIES ), prob(5);list( - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, - /obj/item/weapon/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, + /obj/item/reagent_containers/food/snacks/candy/gummy, /obj/structure/closet/crate/allico //GUMMIES ), prob(2);list( - /obj/item/weapon/tank/phoron/pressurized, - /obj/item/weapon/tank/phoron/pressurized, + /obj/item/tank/phoron/pressurized, + /obj/item/tank/phoron/pressurized, /obj/structure/closet/crate/secure/phoron //HQ FUEL TANKS ) ) diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm index aa62de30420..f32945647bf 100644 --- a/maps/offmap_vr/talon/talon_v2.dmm +++ b/maps/offmap_vr/talon/talon_v2.dmm @@ -327,9 +327,9 @@ /area/talon_v2/engineering) "aH" = ( /obj/structure/closet/walllocker/medical/east, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/extinguisher/mini, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2, +/obj/item/extinguisher/mini, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -365,8 +365,8 @@ }, /obj/structure/catwalk, /obj/structure/closet/walllocker/medical/south, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/fire, /turf/simulated/floor/plating, /area/talon_v2/engineering) "aL" = ( @@ -485,11 +485,11 @@ /area/shuttle/talonboat) "aX" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -5; pixel_y = 2 }, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, /obj/item/clothing/accessory/holster/waist, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -498,7 +498,7 @@ /area/talon_v2/armory) "aY" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/netgun, +/obj/item/gun/energy/netgun, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/armory) "aZ" = ( @@ -524,7 +524,7 @@ pixel_y = -25 }, /obj/structure/table/rack/steel, -/obj/item/device/spaceflare, +/obj/item/spaceflare, /obj/machinery/camera/network/talon{ dir = 1 }, @@ -557,11 +557,11 @@ /area/talon_v2/ofd_ops) "be" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -5; pixel_y = 2 }, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, /obj/item/clothing/accessory/holster/waist, /obj/machinery/light_switch{ dir = 1; @@ -616,7 +616,7 @@ /area/talon_v2/engineering/atmospherics) "bj" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/gun, +/obj/item/gun/energy/gun, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/armory) "bn" = ( @@ -648,7 +648,7 @@ pixel_y = -28 }, /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /turf/simulated/floor/carpet, /area/talon_v2/crew_quarters/sec_room) "br" = ( @@ -813,8 +813,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2, /obj/structure/closet/walllocker/medical/south, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/crew_quarters/restrooms) @@ -888,9 +888,9 @@ icon_state = "4-8" }, /obj/structure/closet/walllocker/medical/south, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/device/radio/off{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2, +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/tiled/techfloor, @@ -1086,10 +1086,10 @@ icon_state = "pipe-c" }, /obj/structure/closet/walllocker_double/east, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device, -/obj/item/weapon/cell/device, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device, +/obj/item/cell/device, /obj/random/maintenance/engineering, /obj/random/maintenance/engineering, /obj/structure/cable/green{ @@ -1449,8 +1449,8 @@ "ek" = ( /obj/structure/table/woodentable, /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -1461,11 +1461,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/weapon/paper/dockingcodes{ +/obj/item/paper/dockingcodes{ pixel_x = 5; pixel_y = -1 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/talon{ +/obj/item/reagent_containers/food/drinks/glass2/coffeemug/talon{ pixel_x = -13; pixel_y = 7 }, @@ -1475,7 +1475,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/steel, /obj/machinery/recharger, -/obj/item/device/geiger{ +/obj/item/geiger{ pixel_x = -7 }, /obj/machinery/alarm/talon{ @@ -1699,7 +1699,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/black/diagonal, -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 4 }, /turf/simulated/floor/tiled/white, @@ -1731,7 +1731,7 @@ }, /obj/effect/floor_decal/corner/black/diagonal, /obj/structure/table/marble, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/tiled/white, @@ -1791,8 +1791,8 @@ /area/talon_v2/engineering/star_store) "fd" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) "ff" = ( @@ -1957,7 +1957,7 @@ /area/talon_v2/engineering/port_store) "fM" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -1975,7 +1975,7 @@ pixel_y = -24 }, /obj/structure/cable/green, -/obj/item/weapon/paper/talon_captain, +/obj/item/paper/talon_captain, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -1989,7 +1989,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/obj/item/weapon/paper/talon_shields, +/obj/item/paper/talon_shields, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/engineering) @@ -2673,7 +2673,7 @@ /area/talon_v2/engineering) "ii" = ( /obj/machinery/vending/engivend{ - products = list(/obj/item/device/geiger = 4, /obj/item/clothing/glasses/meson = 2, /obj/item/device/multitool = 4, /obj/item/weapon/cell/high = 10, /obj/item/weapon/airlock_electronics = 10, /obj/item/weapon/module/power_control = 10, /obj/item/weapon/circuitboard/airalarm = 10, /obj/item/weapon/circuitboard/firealarm = 10, /obj/item/weapon/circuitboard/status_display = 2, /obj/item/weapon/circuitboard/ai_status_display = 2, /obj/item/weapon/circuitboard/newscaster = 2, /obj/item/weapon/circuitboard/holopad = 2, /obj/item/weapon/circuitboard/intercom = 4, /obj/item/weapon/circuitboard/security/telescreen/entertainment = 4, /obj/item/weapon/stock_parts/motor = 2, /obj/item/weapon/stock_parts/spring = 2, /obj/item/weapon/stock_parts/gear = 2, /obj/item/weapon/circuitboard/atm, /obj/item/weapon/circuitboard/guestpass, /obj/item/weapon/circuitboard/keycard_auth, /obj/item/weapon/circuitboard/photocopier, /obj/item/weapon/circuitboard/fax, /obj/item/weapon/circuitboard/request, /obj/item/weapon/circuitboard/microwave, /obj/item/weapon/circuitboard/washing, /obj/item/weapon/circuitboard/scanner_console, /obj/item/weapon/circuitboard/sleeper_console, /obj/item/weapon/circuitboard/body_scanner, /obj/item/weapon/circuitboard/sleeper, /obj/item/weapon/circuitboard/dna_analyzer, /obj/item/weapon/circuitboard/partslathe); + products = list(/obj/item/geiger = 4, /obj/item/clothing/glasses/meson = 2, /obj/item/multitool = 4, /obj/item/cell/high = 10, /obj/item/airlock_electronics = 10, /obj/item/module/power_control = 10, /obj/item/circuitboard/airalarm = 10, /obj/item/circuitboard/firealarm = 10, /obj/item/circuitboard/status_display = 2, /obj/item/circuitboard/ai_status_display = 2, /obj/item/circuitboard/newscaster = 2, /obj/item/circuitboard/holopad = 2, /obj/item/circuitboard/intercom = 4, /obj/item/circuitboard/security/telescreen/entertainment = 4, /obj/item/stock_parts/motor = 2, /obj/item/stock_parts/spring = 2, /obj/item/stock_parts/gear = 2, /obj/item/circuitboard/atm, /obj/item/circuitboard/guestpass, /obj/item/circuitboard/keycard_auth, /obj/item/circuitboard/photocopier, /obj/item/circuitboard/fax, /obj/item/circuitboard/request, /obj/item/circuitboard/microwave, /obj/item/circuitboard/washing, /obj/item/circuitboard/scanner_console, /obj/item/circuitboard/sleeper_console, /obj/item/circuitboard/body_scanner, /obj/item/circuitboard/sleeper, /obj/item/circuitboard/dna_analyzer, /obj/item/circuitboard/partslathe); req_access = list(301); req_log_access = 301 }, @@ -3754,8 +3754,8 @@ /area/talon_v2/engineering/atmospherics) "mg" = ( /obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -3975,10 +3975,10 @@ /area/talon_v2/crew_quarters/sec_room) "ng" = ( /obj/structure/closet/secure_closet/talon_guard, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, -/obj/item/weapon/storage/box/nifsofts_security, +/obj/item/storage/box/nifsofts_security, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/sec_room) "nh" = ( @@ -4020,10 +4020,10 @@ /area/talon_v2/engineering/port_store) "nq" = ( /obj/structure/closet/secure_closet/talon_doctor, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, -/obj/item/weapon/storage/box/nifsofts_medical, +/obj/item/storage/box/nifsofts_medical, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/med_room) "ns" = ( @@ -4259,7 +4259,7 @@ /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway) "oh" = ( -/obj/item/weapon/storage/dicecup/loaded{ +/obj/item/storage/dicecup/loaded{ pixel_x = 7; pixel_y = 11 }, @@ -4268,7 +4268,7 @@ }, /obj/effect/floor_decal/corner/black/diagonal, /obj/structure/table/marble, -/obj/item/weapon/deck/cards{ +/obj/item/deck/cards{ pixel_x = 3 }, /turf/simulated/floor/tiled/white, @@ -4283,7 +4283,7 @@ /area/talon_v2/maintenance/fore_port) "ok" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/carpet, /area/talon_v2/crew_quarters/mine_room) "ol" = ( @@ -4366,7 +4366,7 @@ pixel_y = -28 }, /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /turf/simulated/floor/carpet, /area/talon_v2/crew_quarters/med_room) "ow" = ( @@ -4424,7 +4424,7 @@ dir = 4; pixel_x = -22 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/tiled/techfloor, @@ -4454,7 +4454,7 @@ /obj/structure/table/rack/shelf/steel, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/gen_store) "oS" = ( @@ -4475,7 +4475,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/weapon/paper/talon_doctor, +/obj/item/paper/talon_doctor, /turf/simulated/floor/carpet, /area/talon_v2/crew_quarters/med_room) "oW" = ( @@ -4700,7 +4700,7 @@ pixel_x = 22 }, /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = -32 }, @@ -4771,11 +4771,11 @@ /area/talon_v2/crew_quarters/eng_room) "pU" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/box/mousetraps, +/obj/item/storage/box/lights/mixed, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/glass/rag, /obj/machinery/light_switch{ dir = 1; pixel_x = 2; @@ -5008,7 +5008,7 @@ pixel_x = -28; specialfunctions = 4 }, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/structure/bed/pod, /obj/machinery/light_switch{ dir = 1; @@ -5148,8 +5148,8 @@ /area/talon_v2/central_hallway/star) "ri" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/cable/green{ icon_state = "1-2" @@ -5388,7 +5388,7 @@ pixel_y = -32 }, /obj/structure/table/steel, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/plating, @@ -5551,7 +5551,7 @@ icon_state = "1-2" }, /obj/structure/closet/walllocker_double/east, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/plating, /area/talon_v2/engineering) "sD" = ( @@ -5882,10 +5882,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/closet/walllocker/medical/east, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/device/radio/off{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/fire, +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/tiled/techmaint, @@ -6004,7 +6004,7 @@ /area/talon_v2/crew_quarters/restrooms) "ui" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/mime, +/obj/item/bedsheet/mime, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -6076,7 +6076,7 @@ /area/space) "uv" = ( /obj/machinery/shower, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /obj/structure/curtain, /turf/simulated/floor/tiled/white, /area/talon_v2/crew_quarters/restrooms) @@ -6218,7 +6218,7 @@ "uR" = ( /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/weapon/cell/apc, +/obj/item/cell/apc, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/engineering) "uS" = ( @@ -6788,7 +6788,7 @@ /area/talon_v2/engineering/port_store) "wS" = ( /obj/structure/closet/wardrobe/black{ - starts_with = list(/obj/item/clothing/under/color/black = 4, /obj/item/clothing/accessory/storage/black_vest = 4, /obj/item/clothing/accessory/storage/black_drop_pouches = 4, /obj/item/clothing/gloves/black = 4, /obj/item/clothing/head/soft/black = 4, /obj/item/clothing/mask/balaclava = 4, /obj/item/clothing/mask/bandana = 4, /obj/item/clothing/mask/gas/commando = 4, /obj/item/weapon/storage/backpack/messenger/black = 4, /obj/item/weapon/storage/backpack/dufflebag = 4, /obj/item/clothing/shoes/black = 4, /obj/item/clothing/shoes/boots/duty = 4) + starts_with = list(/obj/item/clothing/under/color/black = 4, /obj/item/clothing/accessory/storage/black_vest = 4, /obj/item/clothing/accessory/storage/black_drop_pouches = 4, /obj/item/clothing/gloves/black = 4, /obj/item/clothing/head/soft/black = 4, /obj/item/clothing/mask/balaclava = 4, /obj/item/clothing/mask/bandana = 4, /obj/item/clothing/mask/gas/commando = 4, /obj/item/storage/backpack/messenger/black = 4, /obj/item/storage/backpack/dufflebag = 4, /obj/item/clothing/shoes/black = 4, /obj/item/clothing/shoes/boots/duty = 4) }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/armory) @@ -6816,10 +6816,10 @@ /obj/structure/closet/crate/secure/phoron{ req_one_access = list(301) }, -/obj/item/weapon/tank/phoron/pressurized{ +/obj/item/tank/phoron/pressurized{ pixel_x = -3 }, -/obj/item/weapon/tank/phoron/pressurized{ +/obj/item/tank/phoron/pressurized{ pixel_x = 3 }, /obj/structure/cable/green{ @@ -6906,7 +6906,7 @@ /area/talon_v2/bridge) "xj" = ( /obj/machinery/vending/engineering{ - products = list(/obj/item/clothing/under/rank/chief_engineer = 4, /obj/item/clothing/under/rank/engineer = 4, /obj/item/clothing/shoes/orange = 4, /obj/item/clothing/head/hardhat = 4, /obj/item/weapon/storage/belt/utility = 4, /obj/item/clothing/glasses/meson = 4, /obj/item/clothing/gloves/yellow = 4, /obj/item/weapon/tool/screwdriver = 12, /obj/item/weapon/tool/crowbar = 12, /obj/item/weapon/tool/wirecutters = 12, /obj/item/device/multitool = 12, /obj/item/weapon/tool/wrench = 12, /obj/item/device/t_scanner = 12, /obj/item/stack/cable_coil/heavyduty = 8, /obj/item/weapon/cell = 8, /obj/item/weapon/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/weapon/light/tube = 10, /obj/item/clothing/head/hardhat/red = 4, /obj/item/clothing/suit/fire = 4, /obj/item/weapon/stock_parts/scanning_module = 5, /obj/item/weapon/stock_parts/micro_laser = 5, /obj/item/weapon/stock_parts/matter_bin = 5, /obj/item/weapon/stock_parts/manipulator = 5, /obj/item/weapon/stock_parts/console_screen = 5); + products = list(/obj/item/clothing/under/rank/chief_engineer = 4, /obj/item/clothing/under/rank/engineer = 4, /obj/item/clothing/shoes/orange = 4, /obj/item/clothing/head/hardhat = 4, /obj/item/storage/belt/utility = 4, /obj/item/clothing/glasses/meson = 4, /obj/item/clothing/gloves/yellow = 4, /obj/item/tool/screwdriver = 12, /obj/item/tool/crowbar = 12, /obj/item/tool/wirecutters = 12, /obj/item/multitool = 12, /obj/item/tool/wrench = 12, /obj/item/t_scanner = 12, /obj/item/stack/cable_coil/heavyduty = 8, /obj/item/cell = 8, /obj/item/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/light/tube = 10, /obj/item/clothing/head/hardhat/red = 4, /obj/item/clothing/suit/fire = 4, /obj/item/stock_parts/scanning_module = 5, /obj/item/stock_parts/micro_laser = 5, /obj/item/stock_parts/matter_bin = 5, /obj/item/stock_parts/manipulator = 5, /obj/item/stock_parts/console_screen = 5); req_access = list(301); req_log_access = 301; req_one_access = list(301) @@ -7111,8 +7111,8 @@ /area/talon_v2/secure_storage) "ya" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/pipe_dispenser, +/obj/item/storage/toolbox/electrical, +/obj/item/pipe_dispenser, /obj/machinery/light/small, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/engineering/star_store) @@ -7124,7 +7124,7 @@ /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) "yd" = ( -/obj/item/device/mass_spectrometer/adv, +/obj/item/mass_spectrometer/adv, /obj/structure/table/standard, /obj/machinery/alarm/talon{ dir = 4; @@ -7208,10 +7208,10 @@ /turf/space, /area/space) "yt" = ( -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2, /obj/structure/closet/walllocker/medical/north, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/tiled/techfloor, @@ -7234,7 +7234,7 @@ /obj/machinery/alarm/talon{ pixel_y = 24 }, -/obj/item/weapon/paper/talon_escape_pod, +/obj/item/paper/talon_escape_pod, /turf/simulated/floor/tiled/techfloor, /area/shuttle/talonpod) "yw" = ( @@ -7288,14 +7288,14 @@ /turf/simulated/floor/tiled/white, /area/talon_v2/medical) "yF" = ( -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /obj/structure/closet/walllocker_double/medical/east, /turf/simulated/floor/tiled/white, /area/talon_v2/medical) @@ -7355,8 +7355,8 @@ }, /obj/structure/table/standard, /obj/machinery/cell_charger, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2, /obj/structure/closet/walllocker/medical/north, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/workroom) @@ -7386,9 +7386,9 @@ /area/talon_v2/engineering/atmospherics) "yY" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -7408,8 +7408,8 @@ pixel_y = 28 }, /obj/structure/table/rack/steel, -/obj/item/weapon/shovel, -/obj/item/weapon/mining_scanner, +/obj/item/shovel, +/obj/item/mining_scanner, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/refining) "zd" = ( @@ -7740,8 +7740,8 @@ /area/talon_v2/crew_quarters/mine_room) "Az" = ( /obj/structure/table/rack/steel, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) "AB" = ( @@ -7896,8 +7896,8 @@ /area/talon_v2/engineering) "Ba" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/oxygen, +/obj/item/suit_cooling_unit, +/obj/item/tank/oxygen, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) "Bb" = ( @@ -7972,21 +7972,21 @@ /area/talon_v2/bridge) "Bt" = ( /obj/structure/table/steel, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1); pixel_y = 6 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1); pixel_x = -6; pixel_y = 4 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1); pixel_x = 6; pixel_y = 4 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/tiled/techfloor, @@ -8055,7 +8055,7 @@ /area/talon_v2/engineering/atmospherics) "BH" = ( /obj/structure/closet/wardrobe/black{ - starts_with = list(/obj/item/clothing/under/color/black = 4, /obj/item/clothing/accessory/storage/black_vest = 4, /obj/item/clothing/accessory/storage/black_drop_pouches = 4, /obj/item/clothing/gloves/black = 4, /obj/item/clothing/head/soft/black = 4, /obj/item/clothing/mask/balaclava = 4, /obj/item/clothing/mask/bandana = 4, /obj/item/clothing/mask/gas/commando = 4, /obj/item/weapon/storage/backpack/messenger/black = 4, /obj/item/weapon/storage/backpack/dufflebag = 4, /obj/item/clothing/shoes/black = 4, /obj/item/clothing/shoes/boots/duty = 4) + starts_with = list(/obj/item/clothing/under/color/black = 4, /obj/item/clothing/accessory/storage/black_vest = 4, /obj/item/clothing/accessory/storage/black_drop_pouches = 4, /obj/item/clothing/gloves/black = 4, /obj/item/clothing/head/soft/black = 4, /obj/item/clothing/mask/balaclava = 4, /obj/item/clothing/mask/bandana = 4, /obj/item/clothing/mask/gas/commando = 4, /obj/item/storage/backpack/messenger/black = 4, /obj/item/storage/backpack/dufflebag = 4, /obj/item/clothing/shoes/black = 4, /obj/item/clothing/shoes/boots/duty = 4) }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/crew_quarters/restrooms) @@ -8105,7 +8105,7 @@ /area/talon_v2/medical) "BU" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /obj/item/stack/nanopaste{ pixel_x = -7; pixel_y = -4 @@ -8114,7 +8114,7 @@ pixel_x = 9; pixel_y = -4 }, -/obj/item/device/robotanalyzer{ +/obj/item/robotanalyzer{ pixel_y = -8 }, /obj/machinery/light, @@ -8142,8 +8142,8 @@ /area/shuttle/talonpod) "BX" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/adv{ pixel_x = 2; pixel_y = 5 }, @@ -8170,7 +8170,7 @@ /area/talon_v2/secure_storage) "Cd" = ( /obj/structure/closet/secure_closet/talon_pilot, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, /obj/machinery/light{ @@ -8183,7 +8183,7 @@ /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, -/obj/item/weapon/storage/belt/archaeology, +/obj/item/storage/belt/archaeology, /obj/machinery/light_switch{ pixel_y = 24 }, @@ -8217,10 +8217,10 @@ /area/talon_v2/ofd_ops) "Cy" = ( /obj/structure/table/standard, -/obj/item/device/defib_kit/jumper_kit/loaded, -/obj/item/device/defib_kit/loaded, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/device/sleevemate, +/obj/item/defib_kit/jumper_kit/loaded, +/obj/item/defib_kit/loaded, +/obj/item/storage/belt/medical/emt, +/obj/item/sleevemate, /turf/simulated/floor/tiled/white, /area/talon_v2/medical) "CA" = ( @@ -8279,7 +8279,7 @@ /turf/simulated/floor/tiled/techmaint, /area/talon_v2/maintenance/wing_port) "CF" = ( -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/item/roller, /obj/item/roller{ pixel_y = 8 @@ -8319,11 +8319,11 @@ }, /obj/structure/catwalk, /obj/structure/closet/walllocker_double/west, -/obj/item/weapon/cell/apc, -/obj/item/weapon/cell/apc, +/obj/item/cell/apc, +/obj/item/cell/apc, /obj/random/maintenance/engineering, /obj/random/maintenance/engineering, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, /obj/item/clothing/suit/radiation, @@ -8401,8 +8401,8 @@ pixel_y = -24 }, /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -8611,7 +8611,7 @@ /area/talon_v2/maintenance/wing_starboard) "DZ" = ( /obj/structure/closet/secure_closet/talon_captain, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/wood, @@ -8722,8 +8722,8 @@ dir = 4 }, /obj/structure/closet/secure_closet/talon_miner, -/obj/item/weapon/storage/box/nifsofts_mining, -/obj/item/device/radio/off{ +/obj/item/storage/box/nifsofts_mining, +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/wood, @@ -8932,8 +8932,8 @@ /area/talon_v2/maintenance/aft_starboard) "Fc" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) "Fd" = ( @@ -8995,9 +8995,9 @@ dir = 4 }, /obj/structure/closet/walllocker/medical/north, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/device/radio/off{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2, +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/wood, @@ -9295,7 +9295,7 @@ /obj/machinery/computer/ship/disperser{ dir = 8 }, -/obj/item/weapon/paper/talon_cannon, +/obj/item/paper/talon_cannon, /obj/machinery/alarm/talon{ pixel_y = 24 }, @@ -9588,7 +9588,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/weapon/paper/talon_guard, +/obj/item/paper/talon_guard, /turf/simulated/floor/carpet, /area/talon_v2/crew_quarters/sec_room) "Hj" = ( @@ -10052,7 +10052,7 @@ "Ip" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/black/diagonal, -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 4 }, /turf/simulated/floor/tiled/white, @@ -10126,7 +10126,7 @@ /area/talon_v2/maintenance/wing_starboard) "Ix" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/alarm/talon{ dir = 4; @@ -10689,7 +10689,7 @@ pixel_y = 24 }, /obj/structure/table/rack/shelf/steel, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1); pixel_y = 6 }, @@ -10753,13 +10753,13 @@ /area/talon_v2/engineering/port_store) "KN" = ( /obj/structure/table/steel, -/obj/item/weapon/pickaxe/drill, +/obj/item/pickaxe/drill, /obj/machinery/button/remote/blast_door{ id = "talon_boat_cockpit"; pixel_x = 6; pixel_y = 28 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, /obj/machinery/embedded_controller/radio/simple_docking_controller{ @@ -10881,7 +10881,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/weapon/paper/talon_power, +/obj/item/paper/talon_power, /turf/simulated/floor/carpet, /area/talon_v2/crew_quarters/eng_room) "Ln" = ( @@ -11126,7 +11126,7 @@ /obj/structure/table/steel, /obj/machinery/camera/network/talon, /obj/machinery/cell_charger, -/obj/item/weapon/cell/apc, +/obj/item/cell/apc, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/engineering) "LO" = ( @@ -11243,9 +11243,9 @@ icon_state = "1-2" }, /obj/structure/closet/walllocker/medical/west, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/device/radio/off{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2, +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/tiled/techmaint, @@ -11276,7 +11276,7 @@ pixel_x = -24 }, /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/whetstone, +/obj/item/whetstone, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/armory) "Mj" = ( @@ -11660,7 +11660,7 @@ /obj/structure/handrail{ dir = 1 }, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 9 }, @@ -11668,7 +11668,7 @@ /area/shuttle/talonboat) "NB" = ( /obj/structure/closet/walllocker_double/south, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/stack/cable_coil/green, /obj/item/stack/cable_coil/green, /obj/machinery/atmospherics/pipe/simple/hidden/fuel, @@ -11722,7 +11722,7 @@ /obj/structure/handrail{ dir = 1 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 5 }, @@ -12305,7 +12305,7 @@ pixel_x = 5; pixel_y = 24 }, -/obj/item/weapon/storage/backpack/dufflebag/talon, +/obj/item/storage/backpack/dufflebag/talon, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/armory) "PC" = ( @@ -12445,11 +12445,11 @@ /area/talon_v2/anomaly_storage) "Qc" = ( /obj/structure/table/steel, -/obj/item/device/measuring_tape, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/storage/excavation, +/obj/item/measuring_tape, +/obj/item/tool/wrench, +/obj/item/storage/excavation, /obj/item/stack/flag/yellow, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/anomaly_storage) "Qe" = ( @@ -13110,7 +13110,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/weapon/paper/talon_pilot, +/obj/item/paper/talon_pilot, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -13362,7 +13362,7 @@ /area/talon_v2/crew_quarters/eng_room) "Ti" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/brig) "Tk" = ( @@ -14240,7 +14240,7 @@ /obj/structure/closet/secure_closet/chemical{ req_access = list(301) }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, @@ -14553,10 +14553,10 @@ /area/talon_v2/hangar) "Xh" = ( /obj/structure/closet/secure_closet/talon_engineer, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, -/obj/item/weapon/storage/box/nifsofts_engineering, +/obj/item/storage/box/nifsofts_engineering, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/eng_room) "Xi" = ( @@ -14700,7 +14700,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/talon{ +/obj/item/reagent_containers/food/drinks/glass2/coffeemug/talon{ pixel_x = 6; pixel_y = -1 }, @@ -14758,8 +14758,8 @@ pixel_x = 28 }, /obj/structure/closet/walllocker/medical/south, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/meditation) "XU" = ( @@ -14802,10 +14802,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2, /obj/structure/closet/walllocker/medical/east, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/tiled/techmaint, @@ -14858,8 +14858,8 @@ "Yj" = ( /obj/structure/catwalk, /obj/structure/closet/walllocker_double/west, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/mechanical, /obj/item/stack/cable_coil/green, /turf/simulated/floor/plating, /area/talon_v2/engineering) @@ -14871,8 +14871,8 @@ dir = 8 }, /obj/structure/table/rack/steel, -/obj/item/weapon/storage/bag/ore, -/obj/item/weapon/pickaxe/drill, +/obj/item/storage/bag/ore, +/obj/item/pickaxe/drill, /obj/item/stack/marker_beacon/thirty, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -15173,7 +15173,7 @@ dir = 6 }, /obj/effect/floor_decal/corner/black/diagonal, -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 4 }, /turf/simulated/floor/tiled/white, @@ -15347,7 +15347,7 @@ /area/space) "ZF" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) "ZH" = ( diff --git a/maps/om_adventure/pois/cabin1.dmm b/maps/om_adventure/pois/cabin1.dmm index 419919404e6..526b47d668c 100644 --- a/maps/om_adventure/pois/cabin1.dmm +++ b/maps/om_adventure/pois/cabin1.dmm @@ -42,7 +42,7 @@ /area/om_adventure/poi/cabin1) "k" = ( /obj/structure/table/reinforced, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /turf/simulated/floor/bmarble, /area/om_adventure/poi/cabin1) "r" = ( @@ -61,7 +61,7 @@ /turf/simulated/floor/plating, /area/om_adventure/poi/cabin1) "v" = ( -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet, @@ -92,7 +92,7 @@ "F" = ( /obj/structure/table/darkglass, /obj/random/awayloot/looseloot, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /turf/simulated/floor/wood, /area/om_adventure/poi/cabin1) "G" = ( diff --git a/maps/om_adventure/pois/cabin2.dmm b/maps/om_adventure/pois/cabin2.dmm index d0d13c3951f..15027353402 100644 --- a/maps/om_adventure/pois/cabin2.dmm +++ b/maps/om_adventure/pois/cabin2.dmm @@ -83,7 +83,7 @@ /area/om_adventure/poi/cabin2) "x" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/curtain/black, /turf/simulated/floor/carpet, /area/om_adventure/poi/cabin2) diff --git a/maps/om_adventure/pois/camp.dmm b/maps/om_adventure/pois/camp.dmm index ced5709932e..e2810a4630c 100644 --- a/maps/om_adventure/pois/camp.dmm +++ b/maps/om_adventure/pois/camp.dmm @@ -39,7 +39,7 @@ /area/om_adventure/poi/camp) "U" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/matches, +/obj/item/storage/box/matches, /turf/simulated/floor/outdoors/newdirt, /area/om_adventure/poi/camp) "Y" = ( diff --git a/maps/om_adventure/pois/medicalcenter.dmm b/maps/om_adventure/pois/medicalcenter.dmm index 7130db01d95..0f969aee311 100644 --- a/maps/om_adventure/pois/medicalcenter.dmm +++ b/maps/om_adventure/pois/medicalcenter.dmm @@ -12,7 +12,7 @@ /area/om_adventure/poi/medicalcenter) "m" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/curtain/medical, /obj/tether_away_spawner/spookyland, /turf/simulated/floor/tiled/eris/white/orangecorner, @@ -92,7 +92,7 @@ /area/om_adventure/poi/medicalcenter) "I" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/curtain/medical, /turf/simulated/floor/tiled/eris/white/orangecorner, /area/om_adventure/poi/medicalcenter) diff --git a/maps/om_adventure/pois/shippart1.dmm b/maps/om_adventure/pois/shippart1.dmm index 8fe8459aa26..b23765b2923 100644 --- a/maps/om_adventure/pois/shippart1.dmm +++ b/maps/om_adventure/pois/shippart1.dmm @@ -37,7 +37,7 @@ /turf/simulated/floor/tiled/eris/dark/techfloor, /area/om_adventure/poi/shippart1) "r" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/template_noop, /area/template_noop) "s" = ( @@ -80,7 +80,7 @@ /turf/template_noop, /area/template_noop) "M" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating/eris/under, /area/om_adventure/poi/shippart1) @@ -89,7 +89,7 @@ /turf/template_noop, /area/template_noop) "Q" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/om_adventure/poi/shippart1) "R" = ( @@ -97,11 +97,11 @@ /turf/simulated/floor/tiled/eris/dark/monofloor, /area/om_adventure/poi/shippart1) "T" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/floor/weird_things/dark, /area/om_adventure/poi/shippart1) "X" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/template_noop, /area/template_noop) "Z" = ( diff --git a/maps/om_adventure/pois/shuttlewreck2.dmm b/maps/om_adventure/pois/shuttlewreck2.dmm index 50e8e0b4831..6f8961f3c2b 100644 --- a/maps/om_adventure/pois/shuttlewreck2.dmm +++ b/maps/om_adventure/pois/shuttlewreck2.dmm @@ -136,7 +136,7 @@ /area/om_adventure/poi/shuttlewreck2) "K" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/tank/phoron, +/obj/item/tank/phoron, /obj/random/awayloot/looseloot, /turf/simulated/floor/plating, /area/om_adventure/poi/shuttlewreck2) diff --git a/maps/om_adventure/pois/shuttlewreck3.dmm b/maps/om_adventure/pois/shuttlewreck3.dmm index 005ceb21c9d..6477505b03e 100644 --- a/maps/om_adventure/pois/shuttlewreck3.dmm +++ b/maps/om_adventure/pois/shuttlewreck3.dmm @@ -17,15 +17,15 @@ /turf/simulated/shuttle/wall, /area/om_adventure/poi/shuttlewreck3) "m" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/template_noop, /area/template_noop) "p" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/floor/weird_things/dark, /area/om_adventure/poi/shuttlewreck3) "u" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /obj/random/awayloot/looseloot, /turf/simulated/shuttle/floor/white, /area/om_adventure/poi/shuttlewreck3) @@ -39,7 +39,7 @@ /area/om_adventure/poi/shuttlewreck3) "F" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/plating, /area/om_adventure/poi/shuttlewreck3) "H" = ( @@ -59,7 +59,7 @@ /turf/simulated/floor/weird_things/dark, /area/om_adventure/poi/shuttlewreck3) "Q" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /obj/effect/gibspawner/human, /obj/random/contraband/nofail, /turf/simulated/shuttle/floor/white, diff --git a/maps/om_adventure/pois/woodentemple.dmm b/maps/om_adventure/pois/woodentemple.dmm index d12c7fa6807..5a2939b1a6e 100644 --- a/maps/om_adventure/pois/woodentemple.dmm +++ b/maps/om_adventure/pois/woodentemple.dmm @@ -20,7 +20,7 @@ /turf/simulated/floor/outdoors/grass, /area/om_adventure/poi/woodentemple) "f" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/floor, /area/om_adventure/poi/woodentemple) "g" = ( @@ -28,7 +28,7 @@ /turf/simulated/floor/wood, /area/om_adventure/poi/woodentemple) "j" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/floor/wood, /area/om_adventure/poi/woodentemple) "k" = ( @@ -78,7 +78,7 @@ /turf/simulated/floor/wood, /area/om_adventure/poi/woodentemple) "C" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/wood, /area/om_adventure/poi/woodentemple) "E" = ( diff --git a/maps/overmap/bearcat/bearcat.dmm b/maps/overmap/bearcat/bearcat.dmm index 71481ed9121..c96ca1919ba 100644 --- a/maps/overmap/bearcat/bearcat.dmm +++ b/maps/overmap/bearcat/bearcat.dmm @@ -8,7 +8,7 @@ "ah" = (/obj/machinery/computer/helm,/turf/simulated/floor/bluegrid,/area/ship/scrap/command) "ai" = (/obj/machinery/computer/station_alert,/turf/simulated/floor/bluegrid,/area/ship/scrap/command) "aj" = (/obj/effect/mapinfo/ship/bearcat,/turf/space,/area) -"ak" = (/obj/structure/table/standard,/obj/machinery/light,/obj/item/device/radio,/obj/item/device/radio/intercom{pixel_y = -32},/turf/simulated/floor{ icon_state = "gcircuit"; dir = 6},/area/ship/scrap/command) +"ak" = (/obj/structure/table/standard,/obj/machinery/light,/obj/item/radio,/obj/item/radio/intercom{pixel_y = -32},/turf/simulated/floor{ icon_state = "gcircuit"; dir = 6},/area/ship/scrap/command) "al" = (/obj/structure/stool/bed/chair/comfy/teal{ icon_state = "comfychair_teal"; dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark/start{name = "Captain"},/turf/simulated/floor{ icon_state = "gcircuitoff"; dir = 2},/area/ship/scrap/command) "am" = (/obj/structure/table/standard,/obj/machinery/light,/obj/machinery/newscaster{pixel_y = -32},/obj/machinery/door_control{id = "scraplock"; name = "External Lockdown"},/turf/simulated/floor{ icon_state = "gcircuit"; dir = 6},/area/ship/scrap/command) "an" = (/turf/simulated/wall/r_wall,/area/ship/scrap/command) @@ -22,9 +22,9 @@ "av" = (/turf/simulated/floor/bluegrid,/area/ship/scrap/comms) "aw" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/window/reinforced{dir = 8},/obj/machinery/power/apc{dir = 1; name = "Communications APC"},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/light_switch{pixel_x = 28},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/ship/scrap/comms) "ax" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/power/apc{dir = 4; name = "Bridge APC"},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/atmospherics/pipe/simple{dir = 2; icon_state = "intact"; level = 1},/turf/simulated/floor{ icon_state = "neutralfull"; dir = 4},/area/ship/scrap/command) -"ay" = (/obj/machinery/light{ icon_state = "tube1"; dir = 8},/obj/item/weapon/gun/energy/stunrevolver,/obj/structure/closet/cabinet,/turf/simulated/floor{ icon_state = "cult"; dir = 2},/area/ship/scrap/command/captain) -"az" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/captain,/turf/simulated/floor{ icon_state = "cult"; dir = 2},/area/ship/scrap/command/captain) -"aA" = (/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/structure/table/woodentable,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/light_switch{pixel_y = 25},/turf/simulated/floor{ icon_state = "cult"; dir = 2},/area/ship/scrap/command/captain) +"ay" = (/obj/machinery/light{ icon_state = "tube1"; dir = 8},/obj/item/gun/energy/stunrevolver,/obj/structure/closet/cabinet,/turf/simulated/floor{ icon_state = "cult"; dir = 2},/area/ship/scrap/command/captain) +"az" = (/obj/structure/stool/bed,/obj/item/bedsheet/captain,/turf/simulated/floor{ icon_state = "cult"; dir = 2},/area/ship/scrap/command/captain) +"aA" = (/obj/item/paper_bin,/obj/item/pen,/obj/structure/table/woodentable,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/light_switch{pixel_y = 25},/turf/simulated/floor{ icon_state = "cult"; dir = 2},/area/ship/scrap/command/captain) "aB" = (/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "scraplock"; name = "External Blast Doors"; opacity = 0},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/comms) "aC" = (/obj/machinery/telecomms/allinone,/turf/simulated/floor/bluegrid,/area/ship/scrap/comms) "aD" = (/obj/machinery/door/window/westleft,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; level = 2; on = 1},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/ship/scrap/comms) @@ -35,9 +35,9 @@ "aI" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; level = 1; on = 1},/turf/simulated/floor{ icon_state = "cult"; dir = 2},/area/ship/scrap/command/captain) "aJ" = (/obj/structure/stool/bed/chair/comfy/brown,/turf/simulated/floor{ icon_state = "cult"; dir = 2},/area/ship/scrap/command/captain) "aK" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/bluegrid,/area/ship/scrap/comms) -"aL" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/window/reinforced{dir = 8},/obj/item/device/radio/intercom{pixel_y = -32},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/ship/scrap/comms) +"aL" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/window/reinforced{dir = 8},/obj/item/radio/intercom{pixel_y = -32},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{ icon_state = "vault"; dir = 5},/area/ship/scrap/comms) "aM" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple{dir = 2; icon_state = "intact"; level = 1},/turf/simulated/floor{ icon_state = "neutralfull"; dir = 4},/area/ship/scrap/command) -"aN" = (/obj/machinery/light{ icon_state = "tube1"; dir = 8},/obj/item/device/radio/intercom{pixel_x = -32},/obj/structure/table/standard,/obj/item/weapon/gun/projectile/shotgun/pump/combat{desc = "When words don't strike hard enough."; name = "Solid Argument"},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor{ icon_state = "cult"; dir = 2},/area/ship/scrap/command/captain) +"aN" = (/obj/machinery/light{ icon_state = "tube1"; dir = 8},/obj/item/radio/intercom{pixel_x = -32},/obj/structure/table/standard,/obj/item/gun/projectile/shotgun/pump/combat{desc = "When words don't strike hard enough."; name = "Solid Argument"},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor{ icon_state = "cult"; dir = 2},/area/ship/scrap/command/captain) "aO" = (/obj/structure/cable{ icon_state = "4-9"},/turf/simulated/floor{ icon_state = "cult"; dir = 2},/area/ship/scrap/command/captain) "aP" = (/obj/structure/table/woodentable,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "Captain's Quarters APC"},/turf/simulated/floor{ icon_state = "cult"; dir = 2},/area/ship/scrap/command/captain) "aQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple{dir = 2; icon_state = "intact"; level = 1},/turf/simulated/floor{ icon_state = "neutralfull"; dir = 4},/area/ship/scrap/command) @@ -73,7 +73,7 @@ "bu" = (/obj/machinery/door/airlock/external,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "scraplock"; name = "External Blast Doors"; opacity = 0},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/dock) "bv" = (/turf/simulated/floor{ icon_state = "loadingareadirty2"; dir = 4},/area/ship/scrap/dock) "bw" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 4},/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/dock) -"bx" = (/obj/structure/closet/walllocker/emerglocker/south,/obj/item/device/radio/intercom{pixel_x = -32},/turf/simulated/floor{ icon_state = "neutralfull"; dir = 4},/area/ship/scrap/dock) +"bx" = (/obj/structure/closet/walllocker/emerglocker/south,/obj/item/radio/intercom{pixel_x = -32},/turf/simulated/floor{ icon_state = "neutralfull"; dir = 4},/area/ship/scrap/dock) "by" = (/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 6; level = 2},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{ icon_state = "neutralfull"; dir = 4},/area/ship/scrap/dock) "bz" = (/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 9; level = 2},/obj/machinery/light_switch{pixel_x = 28},/obj/machinery/light_switch{pixel_x = 28},/turf/simulated/floor{ icon_state = "neutralfull"; dir = 4},/area/ship/scrap/dock) "bA" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 8},/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/dock) @@ -82,9 +82,9 @@ "bD" = (/obj/structure/window/reinforced{dir = 1},/turf/space,/area) "bE" = (/obj/structure/lattice,/obj/structure/window/reinforced{dir = 1},/turf/space,/area) "bF" = (/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 6; level = 2},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/dock) -"bG" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; level = 2; on = 1},/obj/item/device/radio/intercom{pixel_y = -32},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/dock) +"bG" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; level = 2; on = 1},/obj/item/radio/intercom{pixel_y = -32},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/dock) "bH" = (/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/maintenance_hatch{name = "Hatch"; normalspeed = 0},/turf/simulated/floor,/area/ship/scrap/dock) -"bI" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; level = 2; on = 1},/obj/item/device/radio/intercom{pixel_y = -32},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -24},/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/dock) +"bI" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; level = 2; on = 1},/obj/item/radio/intercom{pixel_y = -32},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -24},/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/dock) "bJ" = (/obj/machinery/atmospherics/pipe/simple{icon_state = "intact"; dir = 10; pixel_x = 0; level = 2; initialize_directions = 10},/turf/simulated/floor,/area/ship/scrap/dock) "bK" = (/obj/structure/lattice,/obj/structure/window/reinforced{dir = 1},/obj/machinery/light{ icon_state = "tube1"; dir = 8},/turf/space,/area/ship/scrap/dock) "bL" = (/turf/simulated/shuttle/wall{ icon_state = "swall_s"; dir = 1},/area/ship/scrap/shuttle/outgoing) @@ -107,12 +107,12 @@ "cc" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 4},/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/turf/simulated/floor/plating,/area/ship/scrap/crew) "cd" = (/turf/simulated/wall/r_wall,/area/ship/scrap/crew/saloon) "ce" = (/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/maintenance_hatch{name = "Hatch"; normalspeed = 0},/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/crew/saloon) -"cf" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 8},/obj/item/weapon/crowbar,/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/turf/simulated/floor/plating,/area/ship/scrap/crew) +"cf" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 8},/obj/item/crowbar,/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/turf/simulated/floor/plating,/area/ship/scrap/crew) "cg" = (/turf/simulated/wall/r_wall,/area/ship/scrap/crew/dorms) "ch" = (/obj/structure/sign/poster,/turf/simulated/wall,/area/ship/scrap/crew/dorms) "ci" = (/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "scraplock"; name = "External Blast Doors"; opacity = 0},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/crew/dorms) "cj" = (/turf/simulated/wall,/area/ship/scrap/crew/dorms) -"ck" = (/obj/structure/window/reinforced/tinted{ icon_state = "twindow"; dir = 4},/obj/machinery/shower{ icon_state = "shower"; dir = 4},/obj/structure/window/reinforced/tinted{dir = 1},/obj/item/weapon/soap,/turf/simulated/floor{ icon_state = "hydrofloor"; dir = 6},/area/ship/scrap/crew/toilets) +"ck" = (/obj/structure/window/reinforced/tinted{ icon_state = "twindow"; dir = 4},/obj/machinery/shower{ icon_state = "shower"; dir = 4},/obj/structure/window/reinforced/tinted{dir = 1},/obj/item/soap,/turf/simulated/floor{ icon_state = "hydrofloor"; dir = 6},/area/ship/scrap/crew/toilets) "cl" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 8},/obj/structure/toilet,/obj/structure/window/reinforced/tinted{dir = 1},/obj/structure/window/reinforced/tinted{ icon_state = "twindow"; dir = 4},/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/obj/effect/decal/cleanable/dirt,/obj/effect/landmark/start{name = "Cargo Technician"},/turf/simulated/floor{ icon_state = "hydrofloor"; dir = 6},/area/ship/scrap/crew/toilets) "cm" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 8},/obj/structure/mirror{pixel_y = 29},/obj/structure/sink{pixel_y = 18},/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/obj/structure/window/reinforced/tinted{ icon_state = "twindow"; dir = 4},/obj/structure/window/reinforced/tinted{dir = 1},/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{ icon_state = "hydrofloor"; dir = 6},/area/ship/scrap/crew/toilets) "cn" = (/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/machinery/door/airlock/maintenance_hatch{name = "Hatch"; normalspeed = 0},/turf/simulated/floor/plating,/area/ship/scrap/crew) @@ -123,7 +123,7 @@ "cs" = (/obj/structure/closet/walllocker/emerglocker/north,/turf/simulated/floor,/area/ship/scrap/crew/saloon) "ct" = (/obj/machinery/vending/coffee,/turf/simulated/floor{ icon_state = "orange"; dir = 4},/area/ship/scrap/crew/saloon) "cu" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 8},/obj/structure/closet/wardrobe/pjs,/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/crew/dorms) -"cv" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/blue,/turf/simulated/floor,/area/ship/scrap/crew/dorms) +"cv" = (/obj/structure/stool/bed,/obj/item/bedsheet/blue,/turf/simulated/floor,/area/ship/scrap/crew/dorms) "cw" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor,/area/ship/scrap/crew/dorms) "cx" = (/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "scraplock"; name = "External Blast Doors"; opacity = 0},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/crew/toilets) "cy" = (/obj/machinery/door/window/westleft{base_state = "right"; dir = 4; icon_state = "right"; name = "Reception Window"; opacity = 1; req_access_txt = "0"},/obj/machinery/light/small{ icon_state = "bulb1"; dir = 8},/turf/simulated/floor{ icon_state = "hydrofloor"; dir = 6},/area/ship/scrap/crew/toilets) @@ -140,7 +140,7 @@ "cJ" = (/obj/machinery/atmospherics/pipe/manifold{dir = 8; icon_state = "manifold"; level = 2},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/crew) "cK" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact"; level = 2},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/door/airlock/maintenance_hatch{name = "Hatch"; normalspeed = 0},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/crew/dorms) "cL" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact"; level = 2},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/crew/dorms) -"cM" = (/obj/structure/stool/bed,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; level = 2; on = 1},/obj/item/weapon/bedsheet/brown,/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/crew/dorms) +"cM" = (/obj/structure/stool/bed,/obj/machinery/atmospherics/unary/vent_pump{dir = 8; level = 2; on = 1},/obj/item/bedsheet/brown,/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/crew/dorms) "cN" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor,/area/ship/scrap/crew/dorms) "cO" = (/obj/machinery/shower{ icon_state = "shower"; dir = 4},/obj/structure/window/reinforced/tinted{ icon_state = "twindow"; dir = 4},/obj/structure/window/reinforced/tinted,/turf/simulated/floor{ icon_state = "hydrofloor"; dir = 6},/area/ship/scrap/crew/toilets) "cP" = (/obj/structure/toilet{ icon_state = "toilet00"; dir = 1},/obj/structure/window/reinforced/tinted,/obj/structure/window/reinforced/tinted{ icon_state = "twindow"; dir = 4},/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/obj/effect/decal/cleanable/dirt,/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor{ icon_state = "hydrofloor"; dir = 6},/area/ship/scrap/crew/toilets) @@ -150,11 +150,11 @@ "cT" = (/obj/effect/decal/cleanable/dirt,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/vending/cigarette,/turf/simulated/floor{ icon_state = "orange"; dir = 8},/area/ship/scrap/crew/saloon) "cU" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/crew/saloon) "cV" = (/obj/structure/stool,/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/crew/saloon) -"cW" = (/obj/machinery/light/small,/obj/structure/disposalpipe/segment{dir = 4},/obj/item/device/radio/intercom{pixel_y = -32},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/crew/saloon) +"cW" = (/obj/machinery/light/small,/obj/structure/disposalpipe/segment{dir = 4},/obj/item/radio/intercom{pixel_y = -32},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/crew/saloon) "cX" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/light_switch{pixel_x = 28},/turf/simulated/floor{ icon_state = "orange"; dir = 4},/area/ship/scrap/crew/saloon) "cY" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 4},/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/crew) -"cZ" = (/obj/effect/decal/cleanable/dirt,/obj/item/device/radio/intercom{pixel_x = -32},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/ship/scrap/crew/dorms) -"da" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/orange,/turf/simulated/floor,/area/ship/scrap/crew/dorms) +"cZ" = (/obj/effect/decal/cleanable/dirt,/obj/item/radio/intercom{pixel_x = -32},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/ship/scrap/crew/dorms) +"da" = (/obj/structure/stool/bed,/obj/item/bedsheet/orange,/turf/simulated/floor,/area/ship/scrap/crew/dorms) "db" = (/turf/simulated/wall/r_wall,/area/ship/scrap/crew/kitchen) "dc" = (/turf/simulated/wall,/area/ship/scrap/crew/kitchen) "dd" = (/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/structure/disposalpipe/segment,/obj/structure/closet/walllocker/emerglocker/east,/obj/machinery/light_switch{pixel_x = -25},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/crew) @@ -162,14 +162,14 @@ "df" = (/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/maintenance_hatch{name = "Hatch"; normalspeed = 0},/turf/simulated/floor,/area/ship/scrap/cargo) "dg" = (/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/machinery/light_switch{pixel_x = -25},/turf/simulated/floor,/area/ship/scrap/crew) "dh" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable,/obj/machinery/power/apc{name = "Dorms APC"},/obj/machinery/light_switch{pixel_x = -25},/turf/simulated/floor,/area/ship/scrap/crew/dorms) -"di" = (/obj/structure/stool/bed,/obj/structure/closet/walllocker/emerglocker/south,/obj/item/weapon/bedsheet/green,/turf/simulated/floor,/area/ship/scrap/crew/dorms) +"di" = (/obj/structure/stool/bed,/obj/structure/closet/walllocker/emerglocker/south,/obj/item/bedsheet/green,/turf/simulated/floor,/area/ship/scrap/crew/dorms) "dj" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/light/small{ icon_state = "bulb1"; dir = 4},/turf/simulated/floor,/area/ship/scrap/crew/dorms) "dk" = (/obj/structure/table/standard,/obj/machinery/reagentgrinder,/turf/simulated/floor{ icon_state = "bar"; dir = 6},/area/ship/scrap/crew/kitchen) -"dl" = (/obj/machinery/processor,/obj/item/device/radio/intercom{pixel_y = 32},/turf/simulated/floor{ icon_state = "bar"; dir = 6},/area/ship/scrap/crew/kitchen) +"dl" = (/obj/machinery/processor,/obj/item/radio/intercom{pixel_y = 32},/turf/simulated/floor{ icon_state = "bar"; dir = 6},/area/ship/scrap/crew/kitchen) "dm" = (/obj/structure/closet/walllocker/emerglocker/north,/obj/structure/closet/secure_closet/freezer/fridge,/obj/machinery/light/small{ icon_state = "bulb1"; dir = 4},/turf/simulated/floor{ icon_state = "stage_bleft"; dir = 6},/area/ship/scrap/crew/kitchen) "dn" = (/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/structure/disposalpipe/segment,/obj/machinery/power/apc{dir = 4; name = "Crew Deck APC"},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor,/area/ship/scrap/crew) "do" = (/obj/structure/closet/crate,/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/cargo) -"dp" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 1},/obj/item/device/radio/intercom{pixel_y = 32},/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/cargo) +"dp" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 1},/obj/item/radio/intercom{pixel_y = 32},/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/cargo) "dq" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/cargo) "dr" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/cargo) "ds" = (/obj/effect/decal/cleanable/dirt,/obj/effect/landmark/start{name = "Cargo Technician"},/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/cargo) @@ -191,9 +191,9 @@ "dI" = (/obj/structure/sign/redcross,/turf/simulated/wall,/area/ship/scrap/crew/medbay) "dJ" = (/obj/machinery/sleeper,/obj/structure/sign/nosmoking_2{pixel_y = 28},/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/crew/medbay) "dK" = (/obj/machinery/sleep_console,/obj/machinery/light{ icon_state = "tube1"; dir = 1},/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/crew/medbay) -"dL" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/obj/item/device/radio/intercom{pixel_y = 32},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/crew/medbay) +"dL" = (/obj/structure/stool/bed,/obj/item/bedsheet/medical,/obj/item/radio/intercom{pixel_y = 32},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/crew/medbay) "dM" = (/turf/simulated/floor{ icon_state = "wall_thermite"; dir = 6},/area/ship/scrap/maintenance/engine) -"dN" = (/obj/structure/table/standard,/obj/machinery/light/small{ icon_state = "bulb1"; dir = 8},/obj/item/weapon/storage/box/donkpockets,/turf/simulated/floor{ icon_state = "bar"; dir = 6},/area/ship/scrap/crew/kitchen) +"dN" = (/obj/structure/table/standard,/obj/machinery/light/small{ icon_state = "bulb1"; dir = 8},/obj/item/storage/box/donkpockets,/turf/simulated/floor{ icon_state = "bar"; dir = 6},/area/ship/scrap/crew/kitchen) "dO" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{ icon_state = "bar"; dir = 6},/area/ship/scrap/crew/kitchen) "dP" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; level = 2; on = 1},/obj/structure/disposalpipe/segment{ icon_state = "conpipe-c"; dir = 4},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{ icon_state = "stage_bleft"; dir = 6},/area/ship/scrap/crew/kitchen) "dQ" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact"; level = 2},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/door/airlock/maintenance_hatch{name = "Hatch"; normalspeed = 0},/turf/simulated/floor,/area/ship/scrap/crew/kitchen) @@ -211,7 +211,7 @@ "ec" = (/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/crew/medbay) "ed" = (/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "scraplock"; name = "External Blast Doors"; opacity = 0},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/crew/medbay) "ee" = (/obj/structure/sign{ icon_state = "radiation"},/turf/simulated/wall/r_wall,/area/ship/scrap/maintenance/engine) -"ef" = (/obj/item/weapon/storage/pill_bottle/happy,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/ship/scrap/maintenance/engine) +"ef" = (/obj/item/storage/pill_bottle/happy,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/ship/scrap/maintenance/engine) "eg" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 1},/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/ship/scrap/maintenance/engine) "eh" = (/obj/machinery/door/airlock/maintenance_hatch{name = "Hatch"; normalspeed = 0},/turf/simulated/floor/plating,/area/ship/scrap/maintenance/engine) "ei" = (/turf/simulated/floor{ icon_state = "platingdmg1"; dir = 2},/area) @@ -221,15 +221,15 @@ "em" = (/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/structure/disposalpipe/segment,/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/crew) "en" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 8},/obj/machinery/light_switch{pixel_x = -25},/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/cargo) "eo" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable,/obj/machinery/power/apc{dir = 4; name = "Cargo Hold APC"},/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/cargo) -"ep" = (/obj/structure/table/standard,/obj/item/weapon/storage/pill_bottle/kelotane,/obj/item/weapon/storage/box/syringes,/obj/structure/cable,/obj/machinery/power/apc{name = "Medical Bay APC"},/obj/machinery/light_switch{pixel_x = -25},/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/crew/medbay) -"eq" = (/obj/structure/table/standard,/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/weapon/storage/pill_bottle/kelotane,/obj/item/clothing/tie/stethoscope,/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/crew/medbay) -"er" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/crew/medbay) -"es" = (/obj/item/device/radio,/turf/simulated/floor/plating,/area) -"et" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 1},/obj/item/weapon/coin/gold,/obj/item/weapon/coin/silver,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/ship/scrap/maintenance/engine) +"ep" = (/obj/structure/table/standard,/obj/item/storage/pill_bottle/kelotane,/obj/item/storage/box/syringes,/obj/structure/cable,/obj/machinery/power/apc{name = "Medical Bay APC"},/obj/machinery/light_switch{pixel_x = -25},/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/crew/medbay) +"eq" = (/obj/structure/table/standard,/obj/item/storage/pill_bottle/antitox,/obj/item/storage/pill_bottle/kelotane,/obj/item/clothing/tie/stethoscope,/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/crew/medbay) +"er" = (/obj/structure/table/standard,/obj/item/storage/firstaid,/obj/item/healthanalyzer,/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/crew/medbay) +"es" = (/obj/item/radio,/turf/simulated/floor/plating,/area) +"et" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 1},/obj/item/coin/gold,/obj/item/coin/silver,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/ship/scrap/maintenance/engine) "eu" = (/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/ship/scrap/maintenance/engine) "ev" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/ship/scrap/maintenance/engine) "ew" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/light/small{ icon_state = "bulb1"; dir = 1},/turf/simulated/floor/plating/airless,/area/ship/scrap/maintenance/engine) -"ex" = (/obj/item/weapon/screwdriver,/turf/simulated/floor/plating,/area) +"ex" = (/obj/item/screwdriver,/turf/simulated/floor/plating,/area) "ey" = (/turf/simulated/wall,/area/ship/scrap/crew/wash) "ez" = (/obj/structure/closet/crate,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/cargo) "eA" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/turf/simulated/floor,/area/ship/scrap/cargo) @@ -242,7 +242,7 @@ "eH" = (/turf/simulated/floor{ icon_state = "platingdmg2"; dir = 2},/area) "eI" = (/turf/simulated/wall/r_wall,/area/ship/scrap/crew/wash) "eJ" = (/obj/structure/closet/wardrobe/grey,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -24},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/ship/scrap/crew/wash) -"eK" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 1},/obj/item/device/radio/intercom{pixel_y = 32},/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 6; level = 2},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/ship/scrap/crew/wash) +"eK" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 1},/obj/item/radio/intercom{pixel_y = 32},/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 6; level = 2},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/ship/scrap/crew/wash) "eL" = (/obj/structure/disposalpipe/segment{ icon_state = "conpipe-c"; dir = 4},/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact"; level = 2},/obj/machinery/power/apc{dir = 1; name = "Washroom APC"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/ship/scrap/crew/wash) "eM" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact"; level = 2},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/machinery/door/airlock/maintenance_hatch{name = "Hatch"; normalspeed = 0},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/crew/wash) "eN" = (/obj/machinery/atmospherics/pipe/manifold{dir = 4; icon_state = "manifold"; initialize_directions = 11; level = 2},/obj/structure/disposalpipe/segment,/obj/structure/disposalpipe/junction,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/crew) @@ -263,13 +263,13 @@ "fc" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1; pressure_checks = 0},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/ship/scrap/crew/wash) "fd" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{ icon_state = "pipe-t"; dir = 1},/obj/machinery/light_switch{pixel_x = 28},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/ship/scrap/crew/wash) "fe" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 8},/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{ icon_state = "stage_stairs"; dir = 6},/area/ship/scrap/crew) -"ff" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/electrical,/obj/item/weapon/storage/toolbox/electrical{pixel_x = 7; pixel_y = 4},/obj/item/device/t_scanner,/obj/item/weapon/cell/high,/obj/machinery/light_switch{pixel_y = 25},/turf/simulated/floor{ icon_state = "orange"; dir = 8},/area/ship/scrap/maintenance/storage) -"fg" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/light/small{ icon_state = "bulb1"; dir = 1},/obj/item/device/radio/intercom{pixel_y = 32},/obj/machinery/vending/tool,/turf/simulated/floor,/area/ship/scrap/maintenance/storage) +"ff" = (/obj/structure/table/standard,/obj/item/storage/toolbox/electrical,/obj/item/storage/toolbox/electrical{pixel_x = 7; pixel_y = 4},/obj/item/t_scanner,/obj/item/cell/high,/obj/machinery/light_switch{pixel_y = 25},/turf/simulated/floor{ icon_state = "orange"; dir = 8},/area/ship/scrap/maintenance/storage) +"fg" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/light/small{ icon_state = "bulb1"; dir = 1},/obj/item/radio/intercom{pixel_y = 32},/obj/machinery/vending/tool,/turf/simulated/floor,/area/ship/scrap/maintenance/storage) "fh" = (/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{ icon_state = "stage_stairs"; dir = 6},/area/ship/scrap/maintenance/storage) "fi" = (/obj/structure/window/reinforced{dir = 8},/obj/item/stack/rods,/obj/item/stack/rods,/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/structure/table/standard,/turf/simulated/floor,/area/ship/scrap/maintenance/storage) -"fj" = (/obj/structure/table/standard,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/clothing/suit/space/rig,/obj/item/clothing/shoes/magboots,/obj/item/clothing/head/helmet/space/rig,/obj/item/clothing/mask/breath,/turf/simulated/floor{ icon_state = "orange"; dir = 4},/area/ship/scrap/maintenance/storage) +"fj" = (/obj/structure/table/standard,/obj/item/tank/jetpack/oxygen,/obj/item/clothing/suit/space/rig,/obj/item/clothing/shoes/magboots,/obj/item/clothing/head/helmet/space/rig,/obj/item/clothing/mask/breath,/turf/simulated/floor{ icon_state = "orange"; dir = 4},/area/ship/scrap/maintenance/storage) "fk" = (/obj/structure/closet/walllocker/emerglocker/west,/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{ icon_state = "stage_stairs"; dir = 6},/area/ship/scrap/crew) -"fl" = (/obj/effect/decal/cleanable/generic,/obj/item/device/flashlight,/turf/simulated/floor/plating,/area/ship/scrap/unused2) +"fl" = (/obj/effect/decal/cleanable/generic,/obj/item/flashlight,/turf/simulated/floor/plating,/area/ship/scrap/unused2) "fm" = (/turf/simulated/floor/plating,/area/ship/scrap/unused2) "fn" = (/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "scraplock"; name = "External Blast Doors"; opacity = 0},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/unused2) "fo" = (/turf/simulated/floor{ icon_state = "platingdmg3"; dir = 2},/area) @@ -277,11 +277,11 @@ "fq" = (/obj/structure/table/standard,/obj/machinery/light/small,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/ship/scrap/crew/wash) "fr" = (/turf/simulated/floor{ icon_state = "wall_thermite"; dir = 2},/area/ship/scrap/crew/wash) "fs" = (/obj/structure/closet/walllocker/emerglocker/east,/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/crew) -"ft" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = 5; pixel_y = -7},/obj/item/weapon/storage/toolbox/mechanical,/obj/item/clothing/head/welding,/obj/item/device/analyzer,/turf/simulated/floor{ icon_state = "orange"; dir = 8},/area/ship/scrap/maintenance/storage) +"ft" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical{pixel_x = 5; pixel_y = -7},/obj/item/storage/toolbox/mechanical,/obj/item/clothing/head/welding,/obj/item/analyzer,/turf/simulated/floor{ icon_state = "orange"; dir = 8},/area/ship/scrap/maintenance/storage) "fu" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/stool,/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/maintenance/storage) "fv" = (/obj/machinery/atmospherics/pipe/manifold{dir = 8; icon_state = "manifold"; level = 2},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/ship/scrap/maintenance/storage) "fw" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; level = 2; on = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/maintenance/storage) -"fx" = (/obj/structure/table/standard,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/clothing/suit/space/rig,/obj/item/clothing/shoes/magboots,/obj/item/clothing/head/helmet/space/rig,/obj/item/clothing/mask/breath,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{ icon_state = "orange"; dir = 4},/area/ship/scrap/maintenance/storage) +"fx" = (/obj/structure/table/standard,/obj/item/tank/jetpack/oxygen,/obj/item/clothing/suit/space/rig,/obj/item/clothing/shoes/magboots,/obj/item/clothing/head/helmet/space/rig,/obj/item/clothing/mask/breath,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{ icon_state = "orange"; dir = 4},/area/ship/scrap/maintenance/storage) "fy" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 4},/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/ship/scrap/crew) "fz" = (/turf/simulated/floor{ icon_state = "wall_thermite"; dir = 2},/area/ship/scrap/unused2) "fA" = (/turf/simulated/wall/r_wall,/area/ship/scrap/unused1) @@ -301,8 +301,8 @@ "fO" = (/obj/machinery/alarm{pixel_y = 25},/obj/machinery/light/small{ icon_state = "bulb1"; dir = 1},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/unused1) "fP" = (/obj/structure/closet/walllocker/emerglocker/east,/obj/structure/reagent_dispensers,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/unused1) "fQ" = (/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/door/airlock/maintenance_hatch{name = "Hatch"; normalspeed = 0},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/maintenance) -"fR" = (/obj/structure/table/standard,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/storage/box/lights/bulbs,/obj/item/weapon/storage/box/lights/mixed,/obj/structure/cable,/obj/machinery/power/apc{name = "Tools Storage APC"},/turf/simulated/floor{ icon_state = "orange"; dir = 8},/area/ship/scrap/maintenance/storage) -"fS" = (/obj/structure/table/standard,/obj/item/clothing/head/welding,/obj/item/device/radio,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/ship/scrap/maintenance/storage) +"fR" = (/obj/structure/table/standard,/obj/item/flashlight,/obj/item/flashlight,/obj/item/storage/box/lights/bulbs,/obj/item/storage/box/lights/mixed,/obj/structure/cable,/obj/machinery/power/apc{name = "Tools Storage APC"},/turf/simulated/floor{ icon_state = "orange"; dir = 8},/area/ship/scrap/maintenance/storage) +"fS" = (/obj/structure/table/standard,/obj/item/clothing/head/welding,/obj/item/radio,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/ship/scrap/maintenance/storage) "fT" = (/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/maintenance/storage) "fU" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/light/small,/obj/effect/decal/cleanable/dirt,/obj/structure/dispenser/oxygen,/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/maintenance/storage) "fV" = (/obj/machinery/recharge_station,/turf/simulated/floor{ icon_state = "orange"; dir = 4},/area/ship/scrap/maintenance/storage) @@ -318,7 +318,7 @@ "gf" = (/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/plating,/area/ship/scrap/maintenance) "gg" = (/obj/structure/falserwall,/turf/simulated/floor/plating,/area/ship/scrap/unused3) "gh" = (/obj/structure/stool,/turf/simulated/floor/plating,/area/ship/scrap/unused3) -"gi" = (/obj/structure/table/reinforced,/obj/item/device/flashlight/lamp,/obj/item/weapon/spacecash/c1000,/turf/simulated/floor/plating,/area/ship/scrap/unused3) +"gi" = (/obj/structure/table/reinforced,/obj/item/flashlight/lamp,/obj/item/spacecash/c1000,/turf/simulated/floor/plating,/area/ship/scrap/unused3) "gj" = (/obj/machinery/power/apc{name = "Fire Closet APC"},/obj/structure/cable,/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/unused1) "gk" = (/obj/structure/reagent_dispensers,/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/unused1) "gl" = (/obj/machinery/atmospherics/pipe/simple{dir = 5; icon_state = "intact"; level = 2},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/maintenance) @@ -326,7 +326,7 @@ "gn" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact"; level = 2},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/maintenance) "go" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact"; level = 2},/turf/simulated/floor/plating,/area/ship/scrap/maintenance) "gp" = (/obj/machinery/atmospherics/pipe/manifold4w{level = 2},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 8; icon_state = "bulb1"; pixel_y = 16},/turf/simulated/floor,/area/ship/scrap/maintenance) -"gq" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact"; level = 2},/obj/machinery/light/small{ icon_state = "bulb1"; dir = 1},/obj/item/weapon/crowbar,/turf/simulated/floor/plating,/area/ship/scrap/maintenance) +"gq" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact"; level = 2},/obj/machinery/light/small{ icon_state = "bulb1"; dir = 1},/obj/item/crowbar,/turf/simulated/floor/plating,/area/ship/scrap/maintenance) "gr" = (/obj/machinery/atmospherics/pipe/simple{dir = 9; icon_state = "intact"; level = 2},/turf/simulated/floor{ icon_state = "wall_thermite"; dir = 2},/area/ship/scrap/maintenance) "gs" = (/turf/simulated/wall/r_wall,/area/ship/scrap/maintenance/atmos) "gt" = (/turf/simulated/wall,/area/ship/scrap/maintenance/atmos) @@ -341,13 +341,13 @@ "gC" = (/obj/machinery/pipedispenser,/obj/machinery/light/small{dir = 4},/obj/machinery/light_switch{pixel_y = 25},/turf/simulated/floor/plating,/area/ship/scrap/maintenance/atmos) "gD" = (/obj/machinery/power/apc{dir = 1; name = "Maintenance APC"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/disposalpipe/segment,/obj/machinery/computer/engines,/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/maintenance) "gE" = (/obj/machinery/light/small{ icon_state = "bulb1"; dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/alarm{pixel_y = 32},/obj/structure/closet/secure_closet/engineering_electrical,/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/maintenance) -"gF" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/item/device/radio/intercom{pixel_y = 32},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/closet/toolcloset,/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/maintenance) +"gF" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/item/radio/intercom{pixel_y = 32},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/closet/toolcloset,/turf/simulated/floor{ icon_state = "bot"; dir = 2},/area/ship/scrap/maintenance) "gG" = (/obj/machinery/atmospherics/pipe/simple{ icon_state = "intact"; dir = 2; level = 2},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/maintenance) "gH" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light_switch{pixel_y = 25},/obj/structure/table/standard,/obj/item/ashtray/plastic,/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/maintenance) "gI" = (/obj/structure/stool/bed/chair/comfy/brown,/obj/effect/landmark/start{name = "Chief Engineer"},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/maintenance) "gJ" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/machinery/light/small{ icon_state = "bulb1"; dir = 1},/turf/simulated/floor{ icon_state = "floorgrime"; dir = 6},/area/ship/scrap/maintenance) "gK" = (/obj/machinery/power/port_gen/pacman/super,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/apc{dir = 1; name = "Power APC"},/turf/simulated/floor/plating,/area/ship/scrap/maintenance/power) -"gL" = (/obj/structure/table/standard,/obj/item/device/flashlight,/obj/item/weapon/storage/toolbox/electrical{pixel_x = 7; pixel_y = 4},/obj/machinery/light_switch{pixel_y = 25},/turf/simulated/floor/plating,/area/ship/scrap/maintenance/power) +"gL" = (/obj/structure/table/standard,/obj/item/flashlight,/obj/item/storage/toolbox/electrical{pixel_x = 7; pixel_y = 4},/obj/machinery/light_switch{pixel_y = 25},/turf/simulated/floor/plating,/area/ship/scrap/maintenance/power) "gM" = (/obj/structure/closet/crate,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/item/stack/sheet/mineral/uranium{amount = 50},/turf/simulated/floor/plating,/area/ship/scrap/maintenance/power) "gN" = (/obj/structure/window/reinforced{dir = 5; health = 1e+007},/obj/structure/grille,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "scraplock"; name = "External Blast Doors"; opacity = 0},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor{icon_state = "white"},/area/ship/scrap/maintenance/atmos) "gO" = (/obj/machinery/atmospherics/pipe/simple{dir = 5; icon_state = "intact"; level = 2},/obj/machinery/meter,/turf/simulated/floor/plating,/area/ship/scrap/maintenance/atmos) diff --git a/maps/overmap/example_sector1.dmm b/maps/overmap/example_sector1.dmm index 7e1f2d4ec09..6cbf083ee3f 100644 --- a/maps/overmap/example_sector1.dmm +++ b/maps/overmap/example_sector1.dmm @@ -13,11 +13,11 @@ "am" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/turf/simulated/floor/plating,/area/tcomsat) "an" = (/obj/machinery/atmospherics/pipe/tank/air{dir = 8},/turf/simulated/floor/plating,/area/tcomsat) "ao" = (/turf/simulated/floor/engine,/area/tcommsat/computer) -"ap" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/green,/turf/simulated/floor,/area/tcommsat/computer) +"ap" = (/obj/structure/stool/bed,/obj/item/bedsheet/green,/turf/simulated/floor,/area/tcommsat/computer) "aq" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/tcommsat/computer) -"ar" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor,/area/tcommsat/computer) +"ar" = (/obj/structure/stool/bed,/obj/item/bedsheet/brown,/turf/simulated/floor,/area/tcommsat/computer) "as" = (/obj/machinery/camera{c_tag = "Lounge"; dir = 2; network = list("Tcomsat")},/turf/simulated/floor,/area/tcommsat/computer) -"at" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/red,/turf/simulated/floor,/area/tcommsat/computer) +"at" = (/obj/structure/stool/bed,/obj/item/bedsheet/red,/turf/simulated/floor,/area/tcommsat/computer) "au" = (/turf/simulated/floor,/area/tcommsat/computer) "av" = (/obj/structure/lattice,/obj/structure/window/reinforced{dir = 4},/turf/space,/area/tcomsat) "aw" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plating,/area/tcomsat) @@ -27,21 +27,21 @@ "aA" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/tank/air{dir = 8},/turf/simulated/floor/plating,/area/tcomsat) "aB" = (/obj/structure/lattice,/obj/structure/window/reinforced{dir = 8},/turf/space,/area/tcomsat) "aC" = (/obj/structure/filingcabinet,/turf/simulated/floor,/area/tcommsat/computer) -"aD" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 140; on = 1; pressure_checks = 0},/obj/machinery/camera{c_tag = "Main Computer Room"; dir = 2; network = list("Tcomsat")},/obj/structure/table/standard,/obj/item/weapon/folder/yellow,/obj/item/weapon/folder/yellow,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/tcommsat/computer) -"aE" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin,/obj/item/weapon/pen/blue{pixel_x = -3; pixel_y = 2},/turf/simulated/floor,/area/tcommsat/computer) -"aF" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor,/area/tcommsat/computer) -"aG" = (/obj/item/weapon/syntiflesh{name = "Cuban Pete-Meat"},/turf/simulated/floor/engine,/area/tcommsat/computer) -"aH" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = -29; pixel_y = 0},/turf/simulated/floor,/area/tcommsat/computer) +"aD" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 140; on = 1; pressure_checks = 0},/obj/machinery/camera{c_tag = "Main Computer Room"; dir = 2; network = list("Tcomsat")},/obj/structure/table/standard,/obj/item/folder/yellow,/obj/item/folder/yellow,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/tcommsat/computer) +"aE" = (/obj/structure/table/standard,/obj/item/paper_bin,/obj/item/pen/blue{pixel_x = -3; pixel_y = 2},/turf/simulated/floor,/area/tcommsat/computer) +"aF" = (/obj/structure/table/standard,/obj/item/flashlight/lamp,/turf/simulated/floor,/area/tcommsat/computer) +"aG" = (/obj/item/syntiflesh{name = "Cuban Pete-Meat"},/turf/simulated/floor/engine,/area/tcommsat/computer) +"aH" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_x = -29; pixel_y = 0},/turf/simulated/floor,/area/tcommsat/computer) "aI" = (/obj/structure/window/reinforced{dir = 4},/turf/space,/area/tcomsat) "aJ" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/hidden/supply{req_access_txt = "0"},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/tcomsat) "aK" = (/obj/machinery/atmospherics/valve/digital{pipe_color = "cyan"; icon_state = "valve1"; name = "Mixed Air Outlet Valve"; open = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tcomsat) "aL" = (/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tcomsat) "aM" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/closet,/turf/simulated/floor/plating,/area/tcomsat) "aN" = (/obj/structure/window/reinforced{dir = 8},/turf/space,/area/tcomsat) -"aO" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor,/area/tcommsat/computer) +"aO" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor,/area/tcommsat/computer) "aP" = (/obj/structure/stool/bed/chair/office/dark{dir = 1},/turf/simulated/floor,/area/tcommsat/computer) -"aQ" = (/obj/machinery/computer/telecomms/monitor{network = "tcommsat"},/obj/item/device/radio/intercom{anyai = 1; freerange = 1; name = "General Listening Channel"; pixel_x = 28; pixel_y = 0},/turf/simulated/floor,/area/tcommsat/computer) -"aR" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/orange,/obj/machinery/light{dir = 8},/turf/simulated/floor,/area/tcommsat/computer) +"aQ" = (/obj/machinery/computer/telecomms/monitor{network = "tcommsat"},/obj/item/radio/intercom{anyai = 1; freerange = 1; name = "General Listening Channel"; pixel_x = 28; pixel_y = 0},/turf/simulated/floor,/area/tcommsat/computer) +"aR" = (/obj/structure/stool/bed,/obj/item/bedsheet/orange,/obj/machinery/light{dir = 8},/turf/simulated/floor,/area/tcommsat/computer) "aS" = (/obj/structure/lattice,/turf/space,/area) "aT" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/structure/lattice,/turf/space,/area/tcomsat) "aU" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/lattice,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/space,/area/tcomsat) @@ -54,11 +54,11 @@ "bb" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor,/area/tcommsat/computer) "bc" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/turf/simulated/floor,/area/tcommsat/computer) "bd" = (/obj/machinery/computer/telecomms/server{network = "tcommsat"},/turf/simulated/floor,/area/tcommsat/computer) -"be" = (/obj/item/weapon/syntiflesh{name = "Cuban Pete-Meat"},/obj/item/weapon/spacecash/c1,/turf/simulated/floor/engine,/area/tcommsat/computer) +"be" = (/obj/item/syntiflesh{name = "Cuban Pete-Meat"},/obj/item/spacecash/c1,/turf/simulated/floor/engine,/area/tcommsat/computer) "bf" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor,/area/tcommsat/computer) "bg" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor,/area/tcommsat/computer) "bh" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor,/area/tcommsat/computer) -"bi" = (/obj/structure/table/standard,/obj/item/weapon/storage/fancy/cigarettes,/turf/simulated/floor,/area/tcommsat/computer) +"bi" = (/obj/structure/table/standard,/obj/item/storage/fancy/cigarettes,/turf/simulated/floor,/area/tcommsat/computer) "bj" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor,/area/tcommsat/computer) "bk" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/tcomsat) "bl" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/tcomsat) @@ -73,7 +73,7 @@ "bu" = (/turf/simulated/wall/r_wall,/area/tcommsat/chamber) "bv" = (/obj/machinery/vending/snack,/turf/simulated/floor,/area/tcommsat/computer) "bw" = (/obj/machinery/vending/cola,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor,/area/tcommsat/computer) -"bx" = (/obj/item/weapon/cigbutt,/obj/machinery/light,/turf/simulated/floor,/area/tcommsat/computer) +"bx" = (/obj/item/cigbutt,/obj/machinery/light,/turf/simulated/floor,/area/tcommsat/computer) "by" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/tcommsat/computer) "bz" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor,/area/tcommsat/computer) "bA" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall/r_wall,/area/tcommsat/computer) @@ -84,7 +84,7 @@ "bF" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/space,/area/tcomsat) "bG" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/lattice,/obj/machinery/light,/turf/space,/area/tcomsat) "bH" = (/obj/structure/window/reinforced{dir = 1},/turf/space,/area/tcomsat) -"bI" = (/obj/machinery/light{dir = 8},/obj/structure/table/standard,/obj/item/device/multitool,/obj/structure/sign/electricshock{pixel_x = -32},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor,/area/tcommsat/computer) +"bI" = (/obj/machinery/light{dir = 8},/obj/structure/table/standard,/obj/item/multitool,/obj/structure/sign/electricshock{pixel_x = -32},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor,/area/tcommsat/computer) "bJ" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{current_temperature = 80; dir = 1; on = 1},/turf/simulated/floor,/area/tcommsat/computer) "bK" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor,/area/tcommsat/computer) "bL" = (/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor,/area/tcommsat/computer) @@ -128,9 +128,9 @@ "cx" = (/obj/machinery/telecomms/server/presets/common,/turf/simulated/floor{dir = 4; icon_state = "vault"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "cy" = (/obj/machinery/telecomms/server/presets/engineering,/turf/simulated/floor{dir = 4; icon_state = "vault"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "cz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plating,/area/tcomsat) -"cA" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/micro_laser,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/manipulator,/obj/item/weapon/stock_parts/capacitor,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/obj/item/weapon/stock_parts/micro_laser/high,/turf/simulated/floor,/area/tcomsat) +"cA" = (/obj/structure/table/standard,/obj/item/stock_parts/micro_laser,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/manipulator,/obj/item/stock_parts/capacitor,/obj/item/stock_parts/micro_laser/high,/obj/item/stock_parts/micro_laser/high,/obj/item/stock_parts/micro_laser/high,/obj/item/stock_parts/micro_laser/high,/turf/simulated/floor,/area/tcomsat) "cB" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/camera{c_tag = "Telecoms Storage"; network = list("Tcomsat")},/turf/simulated/floor,/area/tcomsat) -"cC" = (/obj/structure/rack,/obj/item/weapon/circuitboard/telecomms/processor,/obj/item/weapon/circuitboard/telecomms/processor,/obj/item/weapon/circuitboard/telecomms/receiver,/obj/item/weapon/circuitboard/telecomms/server,/obj/item/weapon/circuitboard/telecomms/server,/obj/item/weapon/circuitboard/telecomms/bus,/obj/item/weapon/circuitboard/telecomms/bus,/obj/item/weapon/circuitboard/telecomms/broadcaster,/turf/simulated/floor,/area/tcomsat) +"cC" = (/obj/structure/rack,/obj/item/circuitboard/telecomms/processor,/obj/item/circuitboard/telecomms/processor,/obj/item/circuitboard/telecomms/receiver,/obj/item/circuitboard/telecomms/server,/obj/item/circuitboard/telecomms/server,/obj/item/circuitboard/telecomms/bus,/obj/item/circuitboard/telecomms/bus,/obj/item/circuitboard/telecomms/broadcaster,/turf/simulated/floor,/area/tcomsat) "cD" = (/obj/machinery/camera{c_tag = "West Solars"; dir = 8; network = list("Tcomsat")},/turf/space,/area) "cE" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{req_access_txt = "0"},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/tcomsat) "cF" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/camera{c_tag = "West Wing Middle"; dir = 8; network = list("Tcomsat")},/turf/space,/area/tcomsat) @@ -140,9 +140,9 @@ "cJ" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/tcomsat) "cK" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/space,/area/tcomsat) "cL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plating,/area/tcomsat) -"cM" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/subspace/treatment,/obj/item/weapon/stock_parts/subspace/treatment,/obj/item/weapon/stock_parts/subspace/treatment,/turf/simulated/floor,/area/tcomsat) +"cM" = (/obj/structure/table/standard,/obj/item/stock_parts/subspace/treatment,/obj/item/stock_parts/subspace/treatment,/obj/item/stock_parts/subspace/treatment,/turf/simulated/floor,/area/tcomsat) "cN" = (/turf/simulated/floor,/area/tcomsat) -"cO" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/item/weapon/stock_parts/subspace/analyzer,/obj/item/weapon/stock_parts/subspace/analyzer,/turf/simulated/floor,/area/tcomsat) +"cO" = (/obj/structure/table/standard,/obj/item/stock_parts/subspace/analyzer,/obj/item/stock_parts/subspace/analyzer,/obj/item/stock_parts/subspace/analyzer,/turf/simulated/floor,/area/tcomsat) "cP" = (/turf/simulated/floor/plating,/area) "cQ" = (/obj/structure/lattice,/obj/structure/window/reinforced{dir = 8},/obj/machinery/light{dir = 4},/turf/space,/area/tcomsat) "cR" = (/obj/structure/sign/nosmoking_2{pixel_x = -32; pixel_y = 0},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) @@ -158,7 +158,7 @@ "db" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/tcomsat) "dc" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/tcomsat) "dd" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/door/airlock/maintenance_hatch{name = "Telecoms Storage"; req_access_txt = "61"},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/tcomsat) -"de" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/subspace/amplifier,/obj/item/weapon/stock_parts/subspace/amplifier,/obj/item/weapon/stock_parts/subspace/amplifier,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = 29; pixel_y = 0},/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/tcomsat) +"de" = (/obj/structure/table/standard,/obj/item/stock_parts/subspace/amplifier,/obj/item/stock_parts/subspace/amplifier,/obj/item/stock_parts/subspace/amplifier,/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_x = 29; pixel_y = 0},/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/tcomsat) "df" = (/obj/machinery/telecomms/bus/preset_one,/turf/simulated/floor{dir = 1; icon_state = "vault"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "dg" = (/obj/machinery/telecomms/processor/preset_one,/turf/simulated/floor{dir = 1; icon_state = "vault"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "dh" = (/obj/machinery/telecomms/receiver/preset_left,/turf/simulated/floor{dir = 1; icon_state = "vault"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) @@ -167,12 +167,12 @@ "dk" = (/obj/machinery/telecomms/processor/preset_three,/turf/simulated/floor{dir = 4; icon_state = "vault"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "dl" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/space,/area/tcomsat) "dm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tcomsat) -"dn" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor,/area/tcomsat) -"do" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/subspace/ansible,/obj/item/weapon/stock_parts/subspace/ansible,/obj/item/weapon/stock_parts/subspace/ansible,/turf/simulated/floor,/area/tcomsat) +"dn" = (/obj/item/storage/toolbox/mechanical,/turf/simulated/floor,/area/tcomsat) +"do" = (/obj/structure/table/standard,/obj/item/stock_parts/subspace/ansible,/obj/item/stock_parts/subspace/ansible,/obj/item/stock_parts/subspace/ansible,/turf/simulated/floor,/area/tcomsat) "dp" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/tcomsat) -"dq" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/subspace/transmitter,/obj/item/weapon/stock_parts/subspace/transmitter,/turf/simulated/floor,/area/tcomsat) -"dr" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/subspace/filter,/obj/item/weapon/stock_parts/subspace/filter,/turf/simulated/floor,/area/tcomsat) -"ds" = (/obj/structure/table/standard,/obj/item/weapon/stock_parts/subspace/crystal,/obj/item/weapon/stock_parts/subspace/crystal,/obj/item/weapon/stock_parts/subspace/crystal,/turf/simulated/floor,/area/tcomsat) +"dq" = (/obj/structure/table/standard,/obj/item/stock_parts/subspace/transmitter,/obj/item/stock_parts/subspace/transmitter,/turf/simulated/floor,/area/tcomsat) +"dr" = (/obj/structure/table/standard,/obj/item/stock_parts/subspace/filter,/obj/item/stock_parts/subspace/filter,/obj/item/stock_parts/subspace/filter,/obj/item/stock_parts/subspace/filter,/obj/item/stock_parts/subspace/filter,/turf/simulated/floor,/area/tcomsat) +"ds" = (/obj/structure/table/standard,/obj/item/stock_parts/subspace/crystal,/obj/item/stock_parts/subspace/crystal,/obj/item/stock_parts/subspace/crystal,/turf/simulated/floor,/area/tcomsat) "dt" = (/obj/machinery/telecomms/server/presets/science,/turf/simulated/floor{dir = 1; icon_state = "vault"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "du" = (/obj/machinery/telecomms/server/presets/medical,/turf/simulated/floor{dir = 1; icon_state = "vault"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) "dv" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 6},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Mainframe Floor"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber) @@ -227,7 +227,7 @@ "es" = (/obj/machinery/power/smes/magical,/obj/structure/cable{d2 = 2; icon_state = "0-2"; pixel_y = 0},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/tcommsat/entrance) "et" = (/obj/machinery/power/terminal{dir = 8},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/tcommsat/entrance) "eu" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/sign/electricshock,/turf/simulated/wall/r_wall,/area/tcommsat/entrance) -"ev" = (/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 20},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor,/area/tcommsat/entrance) +"ev" = (/obj/item/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 20},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor,/area/tcommsat/entrance) "ew" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor,/area/tcommsat/entrance) "ex" = (/obj/machinery/turretid{ailock = 1; control_area = "\improper Telecoms Foyer"; desc = "A firewall prevents AIs from interacting with this device."; icon_state = "motion3"; lethal = 0; name = "Telecoms Foyer turret control"; pixel_y = 29; req_access = list(61)},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor,/area/tcommsat/entrance) "ey" = (/obj/structure/sign/electricshock,/turf/simulated/wall/r_wall,/area/tcommsat/entrance) @@ -258,17 +258,17 @@ "eX" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/turf/simulated/floor,/area/tcommsat/entrance) "eY" = (/obj/structure/sign/vacuum,/turf/simulated/wall/r_wall,/area/tcommsat/entrance) "eZ" = (/obj/machinery/atmospherics/pipe/tank/air,/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/tcommsat/entrance) -"fa" = (/obj/item/weapon/cell,/turf/simulated/floor,/area/tcommsat/entrance) +"fa" = (/obj/item/cell,/turf/simulated/floor,/area/tcommsat/entrance) "fb" = (/obj/structure/closet/malf/suits,/turf/simulated/floor,/area/tcommsat/entrance) "fc" = (/obj/machinery/door/airlock/external{frequency = 1381; icon_state = "door_locked"; id_tag = "telecoms_outer"; locked = 1; name = "External Access"; req_access = null; req_access_txt = "10;13"},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1381; master_tag = "telecoms_airlock"; name = "interior access button"; pixel_x = -7; pixel_y = 25; req_access_txt = "13"},/turf/simulated/floor/plating,/area/tcommsat/entrance) "fd" = (/obj/machinery/camera/xray{c_tag = "External Airlock"; network = list("Tcomsat")},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; frequency = 1381; id_tag = "telecoms_pump"},/obj/machinery/embedded_controller/radio/airlock/airlock_controller{tag_airpump = "telecoms_pump"; tag_exterior_door = "telecoms_outer"; frequency = 1381; id_tag = "telecoms_airlock"; tag_interior_door = "telecoms_inner"; pixel_x = 0; pixel_y = -25; req_access_txt = "13"; tag_chamber_sensor = "telecoms_sensor"},/obj/machinery/airlock_sensor{frequency = 1381; id_tag = "telecoms_sensor"; pixel_x = 12; pixel_y = -25},/turf/simulated/floor/plating,/area/tcommsat/entrance) "fe" = (/obj/machinery/door/airlock/external{frequency = 1381; icon_state = "door_locked"; id_tag = "telecoms_inner"; locked = 1; name = "External Access"; req_access = null; req_access_txt = "13"},/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/turf/simulated/floor/plating,/area/tcommsat/entrance) "ff" = (/obj/machinery/access_button{command = "cycle_interior"; frequency = 1381; master_tag = "telecoms_airlock"; name = "interior access button"; pixel_x = -25; pixel_y = -25; req_access_txt = "13"},/obj/machinery/atmospherics/pipe/simple/visible{ icon_state = "intact"; dir = 9},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/tcommsat/entrance) "fg" = (/obj/machinery/bluespace_beacon,/turf/simulated/floor,/area/tcommsat/entrance) -"fh" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = 29; pixel_y = 0},/turf/simulated/floor,/area/tcommsat/entrance) +"fh" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_x = 29; pixel_y = 0},/turf/simulated/floor,/area/tcommsat/entrance) "fi" = (/obj/structure/closet/crate,/obj/item/clothing/glasses/night,/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/tcommsat/entrance) "fj" = (/turf/simulated/floor{icon_state = "warningcorner"; dir = 1},/area/tcommsat/entrance) -"fk" = (/obj/structure/closet/crate,/obj/item/device/aicard,/obj/item/device/multitool,/obj/machinery/camera{c_tag = "Entrance South"; dir = 1; network = list("Tcomsat")},/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/tcommsat/entrance) +"fk" = (/obj/structure/closet/crate,/obj/item/aicard,/obj/item/multitool,/obj/machinery/camera{c_tag = "Entrance South"; dir = 1; network = list("Tcomsat")},/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/tcommsat/entrance) "fl" = (/turf/simulated/floor{dir = 2; icon_state = "warning"},/area/tcommsat/entrance) "fm" = (/obj/machinery/light{dir = 4},/obj/structure/closet/emcloset,/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/tcommsat/entrance) "fn" = (/obj/machinery/computer/teleporter,/turf/simulated/floor/plating,/area/tcommsat/entrance) diff --git a/maps/overmap/example_sector2.dmm b/maps/overmap/example_sector2.dmm index e84bc1e9da8..31bf0e38e2c 100644 --- a/maps/overmap/example_sector2.dmm +++ b/maps/overmap/example_sector2.dmm @@ -13,23 +13,23 @@ "am" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/mine/abandoned) "an" = (/turf/simulated/floor,/area/mine/abandoned) "ao" = (/obj/structure/lattice,/turf/space,/area) -"ap" = (/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/shard{icon_state = "small"},/turf/simulated/floor/plating,/area/mine/abandoned) +"ap" = (/obj/structure/window/reinforced{dir = 4},/obj/item/shard{icon_state = "small"},/turf/simulated/floor/plating,/area/mine/abandoned) "aq" = (/obj/item/stack/rods,/obj/structure/door_assembly/door_assembly_ext{name = "Broken External Airlock"},/turf/simulated/floor,/area/mine/abandoned) "ar" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/mine/abandoned) "as" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/mine/abandoned) "at" = (/obj/item/stack/rods,/turf/simulated/floor/airless{icon_state = "floorscorched1"},/area/mine/abandoned) "au" = (/obj/effect/alien/weeds{icon_state = "weeds2"},/turf/simulated/floor/airless{icon_state = "floorscorched1"},/area/mine/abandoned) "av" = (/turf/simulated/mineral,/area/mine/unexplored) -"aw" = (/obj/item/weapon/shard{icon_state = "medium"},/obj/effect/alien/weeds{icon_state = "weeds"},/turf/simulated/floor/airless{icon_state = "floorscorched1"},/area/mine/abandoned) +"aw" = (/obj/item/shard{icon_state = "medium"},/obj/effect/alien/weeds{icon_state = "weeds"},/turf/simulated/floor/airless{icon_state = "floorscorched1"},/area/mine/abandoned) "ax" = (/turf/simulated/floor/airless{icon_state = "damaged5"},/area/mine/abandoned) "ay" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/mine/abandoned) "az" = (/turf/simulated/mineral/random,/area/mine/unexplored) -"aA" = (/obj/item/weapon/shard,/turf/simulated/floor/airless{icon_state = "floorscorched1"},/area/mine/abandoned) +"aA" = (/obj/item/shard,/turf/simulated/floor/airless{icon_state = "floorscorched1"},/area/mine/abandoned) "aB" = (/turf/simulated/wall,/area/mine/abandoned) -"aC" = (/obj/item/stack/rods,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/shard,/turf/simulated/floor/plating,/area/mine/abandoned) +"aC" = (/obj/item/stack/rods,/obj/structure/window/reinforced{dir = 4},/obj/item/shard,/turf/simulated/floor/plating,/area/mine/abandoned) "aD" = (/obj/item/stack/rods,/obj/effect/alien/weeds{icon_state = "weeds2"},/turf/simulated/floor/airless{icon_state = "floorscorched1"},/area/mine/abandoned) "aE" = (/turf/simulated/floor/airless{icon_state = "damaged2"},/area/mine/abandoned) -"aF" = (/obj/structure/lattice,/obj/item/weapon/shard{icon_state = "medium"},/turf/space,/area) +"aF" = (/obj/structure/lattice,/obj/item/shard{icon_state = "medium"},/turf/space,/area) "aG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/mine/abandoned) "aH" = (/obj/effect/alien/weeds{icon_state = "weeds2"},/obj/item/clothing/mask/facehugger{icon_state = "facehugger_dead"; stat = 2},/turf/simulated/floor/airless{icon_state = "damaged2"},/area/mine/abandoned) "aI" = (/obj/effect/alien/weeds,/turf/simulated/floor/airless{icon_state = "damaged5"},/area/mine/abandoned) @@ -39,7 +39,7 @@ "aM" = (/obj/effect/alien/weeds{icon_state = "weeds1"},/turf/simulated/floor/airless{icon_state = "damaged2"},/area/mine/abandoned) "aN" = (/obj/effect/decal/remains/xeno,/turf/simulated/floor/airless{icon_state = "damaged2"},/area/mine/abandoned) "aO" = (/obj/item/stack/rods,/obj/structure/lattice,/turf/space,/area) -"aP" = (/obj/item/weapon/shard,/obj/item/stack/rods,/turf/simulated/floor/plating/airless,/area/mine/abandoned) +"aP" = (/obj/item/shard,/obj/item/stack/rods,/turf/simulated/floor/plating/airless,/area/mine/abandoned) "aQ" = (/turf/simulated/floor/plating/airless,/area/mine/abandoned) "aR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/mine/abandoned) "aS" = (/obj/structure/table/standard,/turf/simulated/floor/airless{icon_state = "floorscorched2"},/area/mine/abandoned) @@ -49,7 +49,7 @@ "aW" = (/obj/effect/alien/weeds,/turf/simulated/floor/plating,/area/mine/abandoned) "aX" = (/obj/effect/alien/weeds{icon_state = "weeds1"},/turf/simulated/floor/plating,/area/mine/abandoned) "aY" = (/obj/item/stack/rods,/turf/simulated/floor/plating/airless,/area/mine/abandoned) -"aZ" = (/obj/item/weapon/shard{icon_state = "small"},/obj/item/clothing/suit/space/syndicate,/turf/simulated/floor/plating/airless,/area/mine/abandoned) +"aZ" = (/obj/item/shard{icon_state = "small"},/obj/item/clothing/suit/space/syndicate,/turf/simulated/floor/plating/airless,/area/mine/abandoned) "ba" = (/turf/simulated/floor/airless{icon_state = "damaged3"},/area/mine/abandoned) "bb" = (/turf/simulated/floor/airless{icon_state = "floorscorched1"},/area/mine/abandoned) "bc" = (/turf/simulated/floor/airless{icon_state = "floorscorched2"},/area/mine/abandoned) @@ -57,14 +57,14 @@ "be" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/mine/abandoned) "bf" = (/obj/effect/alien/weeds{icon_state = "weeds1"},/turf/simulated/floor/airless{icon_state = "damaged3"},/area/mine/abandoned) "bg" = (/obj/effect/alien/weeds{icon_state = "weeds1"},/obj/item/clothing/mask/facehugger{icon_state = "facehugger_dead"; stat = 2},/turf/simulated/floor/plating,/area/mine/abandoned) -"bh" = (/obj/item/weapon/shard,/obj/structure/lattice,/turf/space,/area) -"bi" = (/obj/item/weapon/shard{icon_state = "small"},/turf/simulated/floor/plating/airless,/area/mine/abandoned) +"bh" = (/obj/item/shard,/obj/structure/lattice,/turf/space,/area) +"bi" = (/obj/item/shard{icon_state = "small"},/turf/simulated/floor/plating/airless,/area/mine/abandoned) "bj" = (/obj/effect/gibspawner/robot,/turf/simulated/floor/airless{icon_state = "floorscorched1"},/area/mine/abandoned) "bk" = (/obj/effect/gibspawner/human,/turf/simulated/floor/airless{icon_state = "damaged2"},/area/mine/abandoned) "bl" = (/obj/effect/alien/weeds{icon_state = "weeds1"},/obj/effect/decal/remains/xeno,/turf/simulated/floor/plating,/area/mine/abandoned) "bm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/mine/abandoned) -"bn" = (/obj/item/weapon/shard,/turf/simulated/floor/plating/airless,/area/mine/abandoned) -"bo" = (/obj/structure/lattice,/obj/item/weapon/shard{icon_state = "small"},/obj/item/clothing/mask/facehugger{icon_state = "facehugger_dead"; stat = 2},/turf/space,/area/mine/abandoned) +"bn" = (/obj/item/shard,/turf/simulated/floor/plating/airless,/area/mine/abandoned) +"bo" = (/obj/structure/lattice,/obj/item/shard{icon_state = "small"},/obj/item/clothing/mask/facehugger{icon_state = "facehugger_dead"; stat = 2},/turf/space,/area/mine/abandoned) "bp" = (/obj/structure/lattice,/turf/space,/area/mine/abandoned) "bq" = (/obj/effect/alien/weeds,/turf/simulated/floor/airless{icon_state = "floorscorched2"},/area/mine/abandoned) "br" = (/obj/machinery/door/airlock,/turf/simulated/floor,/area/mine/abandoned) @@ -88,13 +88,13 @@ "bJ" = (/obj/item/clothing/mask/facehugger{icon_state = "facehugger_dead"; stat = 2},/turf/simulated/floor/airless{icon_state = "floorscorched1"},/area/mine/abandoned) "bK" = (/obj/structure/table/standard,/turf/simulated/floor/airless,/area/mine/abandoned) "bL" = (/obj/effect/alien/weeds{icon_state = "weeds"},/turf/simulated/floor/airless{icon_state = "damaged5"},/area/mine/abandoned) -"bM" = (/obj/item/weapon/shard,/turf/simulated/floor/airless{icon_state = "floorscorched2"},/area/mine/abandoned) -"bN" = (/obj/item/weapon/shard{icon_state = "small"},/turf/simulated/floor/airless,/area/mine/abandoned) +"bM" = (/obj/item/shard,/turf/simulated/floor/airless{icon_state = "floorscorched2"},/area/mine/abandoned) +"bN" = (/obj/item/shard{icon_state = "small"},/turf/simulated/floor/airless,/area/mine/abandoned) "bO" = (/obj/effect/alien/weeds,/turf/simulated/floor/airless{icon_state = "damaged3"},/area/mine/abandoned) "bP" = (/obj/machinery/hydroponics,/turf/simulated/floor{icon_state = "dark"},/area/mine/abandoned) -"bQ" = (/obj/structure/table/standard,/obj/item/weapon/paper/crumpled,/turf/simulated/floor/airless{icon_state = "floorscorched2"},/area/mine/abandoned) +"bQ" = (/obj/structure/table/standard,/obj/item/paper/crumpled,/turf/simulated/floor/airless{icon_state = "floorscorched2"},/area/mine/abandoned) "bR" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/mine/abandoned) -"bS" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating,/area/mine/abandoned) +"bS" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/item/shard{icon_state = "medium"},/turf/simulated/floor/plating,/area/mine/abandoned) "bT" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/mine/abandoned) "bU" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/mine/abandoned) "bV" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/mine/abandoned) @@ -115,7 +115,7 @@ "ck" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/mine/abandoned) "cl" = (/obj/effect/alien/weeds{icon_state = "weeds2"},/obj/item/clothing/mask/facehugger{icon_state = "facehugger_dead"; stat = 2},/turf/simulated/floor/airless{icon_state = "damaged5"},/area/mine/abandoned) "cm" = (/obj/effect/alien/weeds{icon_state = "weeds2"},/turf/simulated/floor/airless{icon_state = "damaged3"},/area/mine/abandoned) -"cn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/shard,/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/abandoned) +"cn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/item/shard,/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/abandoned) "co" = (/obj/machinery/door/airlock/glass{name = "Glass Airlock"; req_access_txt = "0"},/turf/simulated/floor/airless{dir = 5; icon_state = "asteroidfloor"},/area/mine/abandoned) "cp" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/mine/abandoned) "cq" = (/obj/effect/decal/remains/human,/obj/item/clothing/mask/facehugger{icon_state = "facehugger_dead"; stat = 2},/turf/simulated/floor,/area/mine/abandoned) @@ -123,14 +123,14 @@ "cs" = (/turf/simulated/floor/airless{dir = 5; icon_state = "asteroidfloor"},/area/mine/abandoned) "ct" = (/obj/structure/rack,/turf/simulated/floor/airless{dir = 5; icon_state = "asteroidfloor"},/area/mine/abandoned) "cu" = (/turf/simulated/floor/plating/airless/asteroid,/area/mine/unexplored) -"cv" = (/obj/item/weapon/rack_parts,/turf/simulated/floor/airless{dir = 5; icon_state = "asteroidfloor"},/area/mine/abandoned) +"cv" = (/obj/item/rack_parts,/turf/simulated/floor/airless{dir = 5; icon_state = "asteroidfloor"},/area/mine/abandoned) "cw" = (/obj/structure/girder/displaced,/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/abandoned) "cx" = (/obj/structure/girder,/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/abandoned) "cy" = (/obj/machinery/door/airlock/external{name = "External Airlock"; req_access_txt = "0"},/turf/simulated/floor/airless{dir = 5; icon_state = "asteroidfloor"},/area/mine/abandoned) -"cz" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/grille{density = 0; icon_state = "brokengrille"},/obj/item/weapon/shard{icon_state = "small"},/obj/item/stack/rods,/turf/simulated/floor/plating,/area/mine/abandoned) +"cz" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/grille{density = 0; icon_state = "brokengrille"},/obj/item/shard{icon_state = "small"},/obj/item/stack/rods,/turf/simulated/floor/plating,/area/mine/abandoned) "cA" = (/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 2},/area/mine/abandoned) -"cB" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 2},/area/mine/abandoned) -"cC" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille{density = 0; icon_state = "brokengrille"},/obj/item/stack/rods,/obj/item/weapon/shard,/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/abandoned) +"cB" = (/obj/item/shard{icon_state = "medium"},/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 2},/area/mine/abandoned) +"cC" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille{density = 0; icon_state = "brokengrille"},/obj/item/stack/rods,/obj/item/shard,/turf/simulated/floor/plating/airless{icon_state = "asteroidplating"},/area/mine/abandoned) "cD" = (/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 10},/area/mine/unexplored) "cE" = (/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 2},/area/mine/unexplored) "cF" = (/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 6},/area/mine/unexplored) diff --git a/maps/redgate/abandonedisland.dmm b/maps/redgate/abandonedisland.dmm index cc7473627da..6bafd9a19be 100644 --- a/maps/redgate/abandonedisland.dmm +++ b/maps/redgate/abandonedisland.dmm @@ -217,14 +217,14 @@ /area/redgate/structure) "bL" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /turf/simulated/floor/wood, /area/redgate/structure) "bM" = ( diff --git a/maps/redgate/cybercity.dmm b/maps/redgate/cybercity.dmm index 038324dc9b1..88191962abe 100644 --- a/maps/redgate/cybercity.dmm +++ b/maps/redgate/cybercity.dmm @@ -5,7 +5,7 @@ /area/redgate/city/science) "acv" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/mimedouble, +/obj/item/bedsheet/mimedouble, /turf/simulated/floor/carpet/bcarpet, /area/redgate/city/house3) "acN" = ( @@ -30,7 +30,7 @@ /area/redgate/city/apartments) "aex" = ( /obj/structure/table/rack, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled/neutral, /area/redgate/city/hotel) "aeE" = ( @@ -96,23 +96,23 @@ "akH" = ( /obj/structure/table/steel, /obj/item/integrated_circuit/memory/large, -/obj/item/weapon/circuitboard/sensors, +/obj/item/circuitboard/sensors, /turf/simulated/floor/tiled/dark, /area/redgate/city/workshop) "alA" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/drinks/bottle/jager, -/obj/item/weapon/reagent_containers/food/drinks/bottle/jager, -/obj/item/weapon/reagent_containers/food/drinks/bottle/jager, -/obj/item/weapon/reagent_containers/food/drinks/bottle/jager, -/obj/item/weapon/reagent_containers/food/drinks/bottle/gin, -/obj/item/weapon/reagent_containers/food/drinks/bottle/gin, -/obj/item/weapon/reagent_containers/food/drinks/bottle/gin, -/obj/item/weapon/reagent_containers/food/drinks/bottle/gin, -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum, -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum, -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum, -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/food/drinks/bottle/jager, +/obj/item/reagent_containers/food/drinks/bottle/jager, +/obj/item/reagent_containers/food/drinks/bottle/jager, +/obj/item/reagent_containers/food/drinks/bottle/jager, +/obj/item/reagent_containers/food/drinks/bottle/gin, +/obj/item/reagent_containers/food/drinks/bottle/gin, +/obj/item/reagent_containers/food/drinks/bottle/gin, +/obj/item/reagent_containers/food/drinks/bottle/gin, +/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/food/drinks/bottle/rum, /turf/simulated/floor/wood/alt/tile, /area/redgate/city/gamblingden) "alF" = ( @@ -149,7 +149,7 @@ dir = 1 }, /obj/structure/table/woodentable, -/obj/item/device/tape/random, +/obj/item/rectape/random, /turf/simulated/floor/wood, /area/redgate/city/library) "anE" = ( @@ -294,7 +294,7 @@ /area/redgate/city/house13) "azU" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 8 }, /turf/simulated/floor/wood, @@ -323,22 +323,22 @@ /area/redgate/city/science) "aBw" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/peppermill, /obj/random/donkpocketbox, /obj/structure/closet/walllocker_double/kitchen/east, /turf/simulated/floor/tiled/white, @@ -357,7 +357,7 @@ /area/redgate/city/supermarket) "aCc" = ( /obj/structure/table/fancyblack, -/obj/item/weapon/deck/tarot, +/obj/item/deck/tarot, /turf/simulated/floor/carpet/brown, /area/redgate/city/tarot) "aCP" = ( @@ -406,7 +406,7 @@ /area/redgate/city/house15) "aHa" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/captaindouble, +/obj/item/bedsheet/captaindouble, /turf/simulated/floor/carpet/purple, /area/redgate/city/cardmon) "aHi" = ( @@ -442,7 +442,7 @@ /turf/simulated/wall/tgmc/darkwall, /area/redgate/city/check1) "aIV" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/wood/alt/tile, @@ -467,7 +467,7 @@ /area/redgate/city/house8) "aKz" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled/white, /area/redgate/city/hospital) "aLg" = ( @@ -491,31 +491,31 @@ color = "#8da4a6"; pixel_x = -5 }, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, /turf/simulated/floor/tiled/eris/steel/techfloor_grid, /area/redgate/city/bar1) "aMa" = ( @@ -579,7 +579,7 @@ /area/redgate/city/house8) "aQg" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /turf/simulated/floor/tiled/dark, /area/redgate/city/workshop) "aQx" = ( @@ -612,8 +612,8 @@ /area/redgate/city/corporation) "aRR" = ( /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/handcuffs/legcuffs/fuzzy, -/obj/item/weapon/handcuffs/fuzzy, +/obj/item/handcuffs/legcuffs/fuzzy, +/obj/item/handcuffs/fuzzy, /turf/simulated/floor/tiled/milspec, /area/redgate/city/police) "aRY" = ( @@ -659,10 +659,10 @@ /area/redgate/city/science) "aTW" = ( /obj/structure/closet, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /obj/item/clothing/under/bathrobe, /obj/item/clothing/under/bathrobe, /obj/item/clothing/under/bathrobe, @@ -678,7 +678,7 @@ /turf/simulated/floor/wood, /area/redgate/city/spa) "aUs" = ( -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /turf/simulated/floor/dungeon, /area/redgate/city/doctor) "aUw" = ( @@ -740,7 +740,7 @@ /area/redgate/city/police) "aYz" = ( /obj/structure/table/woodentable, -/obj/item/device/tape/random, +/obj/item/rectape/random, /obj/machinery/light_switch{ pixel_y = 24 }, @@ -813,14 +813,14 @@ /area/redgate/city/gamblingden) "beL" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/wine, /obj/machinery/light{ dir = 4 }, @@ -855,10 +855,10 @@ /area/redgate/city/hospital) "bhc" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog, -/obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog, -/obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog, -/obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog, +/obj/item/reagent_containers/food/snacks/packaged/vendhotdog, +/obj/item/reagent_containers/food/snacks/packaged/vendhotdog, +/obj/item/reagent_containers/food/snacks/packaged/vendhotdog, +/obj/item/reagent_containers/food/snacks/packaged/vendhotdog, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "bhX" = ( @@ -875,7 +875,7 @@ /area/redgate/city/nifshop) "biP" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 4; pixel_y = 4 }, @@ -887,7 +887,7 @@ /area/redgate/city/hospital) "biY" = ( /obj/structure/table/reinforced, -/obj/item/device/mass_spectrometer/adv, +/obj/item/mass_spectrometer/adv, /turf/simulated/floor/tiled/white, /area/redgate/city/science) "bka" = ( @@ -950,11 +950,11 @@ /area/redgate/city/offlicense) "boo" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "bpi" = ( @@ -1064,7 +1064,7 @@ /turf/simulated/floor/wood, /area/redgate/city/apartments) "bAz" = ( -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled/neutral, /area/redgate/city/house3) "bBb" = ( @@ -1160,10 +1160,10 @@ /area/redgate/city/hospital) "bGz" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/snacks/ratpacktaco, -/obj/item/weapon/reagent_containers/food/snacks/ratpacktaco, -/obj/item/weapon/reagent_containers/food/snacks/ratpacktaco, -/obj/item/weapon/reagent_containers/food/snacks/ratpacktaco, +/obj/item/reagent_containers/food/snacks/ratpacktaco, +/obj/item/reagent_containers/food/snacks/ratpacktaco, +/obj/item/reagent_containers/food/snacks/ratpacktaco, +/obj/item/reagent_containers/food/snacks/ratpacktaco, /obj/machinery/light/small/neon/import{ pixel_y = 25 }, @@ -1202,7 +1202,7 @@ /area/redgate/city/succ) "bJy" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 8 }, /turf/simulated/floor/wood, @@ -1297,7 +1297,7 @@ /turf/simulated/wall/tgmc/window/darkwall, /area/redgate/city/hotel) "bQA" = ( -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /obj/machinery/light/small{ dir = 1 }, @@ -1351,19 +1351,19 @@ /area/redgate/city/science) "bTR" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/city/offlicense) "bUz" = ( -/obj/item/weapon/stool/baystool, +/obj/item/stool/baystool, /turf/simulated/floor/tiled/eris/steel/cyancorner, /area/redgate/city/bar1) "bUF" = ( @@ -1404,13 +1404,13 @@ /area/redgate/city/house17) "bXw" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, /area/redgate/city/hospital) "bXx" = ( @@ -1494,7 +1494,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/city/pharmacy) "cbl" = ( -/obj/item/weapon/handcuffs/fuzzy, +/obj/item/handcuffs/fuzzy, /turf/simulated/floor/carpet/brown, /area/redgate/city/hotel) "cbx" = ( @@ -1517,7 +1517,7 @@ /area/redgate/city/house4) "cdb" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/autoinjectors, +/obj/item/storage/box/autoinjectors, /turf/simulated/floor/wood/alt/tile, /area/redgate/city/drugden) "cdk" = ( @@ -1525,14 +1525,14 @@ /area/redgate/city/police) "cdy" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, -/obj/item/weapon/reagent_containers/food/snacks/liquidprotein, +/obj/item/reagent_containers/food/snacks/liquidprotein, +/obj/item/reagent_containers/food/snacks/liquidprotein, +/obj/item/reagent_containers/food/snacks/liquidprotein, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "cdL" = ( /obj/random/soap, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled/neutral, /area/redgate/city/house16) "cdY" = ( @@ -1560,7 +1560,7 @@ /obj/machinery/light/floortube{ dir = 8; light_color = "#ff8086"; - light_type = /obj/item/weapon/light/bulb/red; + light_type = /obj/item/light/bulb/red; name = "stripper light" }, /turf/simulated/floor/carpet/gaycarpet, @@ -1576,7 +1576,7 @@ /turf/simulated/floor/wood, /area/redgate/city/spa) "cgc" = ( -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled/neutral, /area/redgate/city/house2) "cgf" = ( @@ -1628,7 +1628,7 @@ /area/redgate/city/apartments) "cly" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/staff, +/obj/item/staff, /turf/simulated/floor/tiled/eris/derelict3, /area/redgate/city/wiz) "clE" = ( @@ -1708,7 +1708,7 @@ /area/redgate/city/offlicense) "css" = ( /obj/structure/dirtybed, -/obj/item/weapon/reagent_containers/syringe/drugs, +/obj/item/reagent_containers/syringe/drugs, /turf/simulated/floor/wood/alt/tile, /area/redgate/city/drugden) "ctv" = ( @@ -1856,7 +1856,7 @@ /area/redgate/city/cafe) "cBU" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, /turf/simulated/floor/tiled/white, /area/redgate/city/house18) "cCO" = ( @@ -1983,12 +1983,12 @@ /turf/simulated/floor/wood/alt/panel, /area/redgate/city/rats) "cOh" = ( -/obj/item/weapon/storage/fancy/blackcandle_box, +/obj/item/storage/fancy/blackcandle_box, /obj/structure/closet, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/storage/fancy/whitecandle_box, -/obj/item/weapon/storage/box/matches, -/obj/item/weapon/storage/box/matches, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/whitecandle_box, +/obj/item/storage/box/matches, +/obj/item/storage/box/matches, /turf/simulated/floor/wood, /area/redgate/city/tarot) "cOn" = ( @@ -2027,7 +2027,7 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/city/workshop) "cRf" = ( -/obj/item/weapon/broken_bottle, +/obj/item/broken_bottle, /obj/machinery/light/small{ dir = 1 }, @@ -2035,11 +2035,11 @@ /area/redgate/city/hotel) "cRx" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 2; pixel_y = 7 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -1; pixel_y = 10 }, @@ -2095,12 +2095,12 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/item/weapon/surgical/surgicaldrill, +/obj/item/surgical/surgicaldrill, /turf/simulated/floor/dungeon, /area/redgate/city/doctor) "cXQ" = ( /obj/structure/table/glass, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /obj/machinery/light{ dir = 1 }, @@ -2118,9 +2118,9 @@ /area/redgate/city/scughouse) "cYY" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/snacks/liquidvitamin, -/obj/item/weapon/reagent_containers/food/snacks/liquidvitamin, -/obj/item/weapon/reagent_containers/food/snacks/liquidvitamin, +/obj/item/reagent_containers/food/snacks/liquidvitamin, +/obj/item/reagent_containers/food/snacks/liquidvitamin, +/obj/item/reagent_containers/food/snacks/liquidvitamin, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "cZx" = ( @@ -2179,7 +2179,7 @@ /area/redgate/city/hospital) "ddc" = ( /obj/structure/table/alien, -/obj/item/weapon/deck/egy{ +/obj/item/deck/egy{ pixel_x = 15 }, /turf/simulated/shuttle/floor/alienplating/blue/half{ @@ -2197,7 +2197,7 @@ /obj/random/snack, /obj/random/snack, /obj/random/snack, -/obj/item/weapon/reagent_containers/food/snacks/truffle/random, +/obj/item/reagent_containers/food/snacks/truffle/random, /turf/simulated/floor/tiled/white, /area/redgate/city/house2) "dew" = ( @@ -2208,7 +2208,7 @@ /area/redgate/city/streets) "deD" = ( /obj/structure/table/rack/gun_rack/steel, -/obj/item/weapon/gun/energy/netgun, +/obj/item/gun/energy/netgun, /turf/simulated/floor/tiled/milspec, /area/redgate/city/police) "deF" = ( @@ -2222,11 +2222,11 @@ /area/redgate/city/science) "deJ" = ( /obj/structure/table/rack, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_y = 3 }, -/obj/item/device/gps/medical, -/obj/item/device/gps/medical{ +/obj/item/gps/medical, +/obj/item/gps/medical{ pixel_x = -3 }, /obj/structure/fireaxecabinet/empty{ @@ -2244,7 +2244,7 @@ /turf/simulated/floor/wood/alt/tile, /area/redgate/city/gamblingden) "dfT" = ( -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /turf/simulated/floor/tiled/neutral, /area/redgate/city/drugden) "dgh" = ( @@ -2264,7 +2264,7 @@ /area/redgate/city/altevian) "dgs" = ( /obj/structure/table/steel, -/obj/item/weapon/autopsy_scanner, +/obj/item/autopsy_scanner, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/redgate/city/morgue) "dgM" = ( @@ -2293,7 +2293,7 @@ /area/redgate/city/hospital) "dhx" = ( /obj/item/clothing/under/bathrobe, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled/neutral, /area/redgate/city/house11) "diU" = ( @@ -2435,7 +2435,7 @@ /turf/simulated/floor/tiled/techfloor, /area/redgate/city/casino) "dtf" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/light{ dir = 8 }, @@ -2470,20 +2470,20 @@ "dwz" = ( /obj/structure/closet, /obj/random/maintenance/security, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/red, -/obj/item/weapon/paper, -/obj/item/weapon/paper, -/obj/item/weapon/paper, -/obj/item/weapon/paper, -/obj/item/weapon/paper, -/obj/item/weapon/paper, -/obj/item/weapon/paper, -/obj/item/weapon/paper, -/obj/item/weapon/paper, +/obj/item/folder/red, +/obj/item/folder/red, +/obj/item/folder/red, +/obj/item/folder/red, +/obj/item/folder/red, +/obj/item/paper, +/obj/item/paper, +/obj/item/paper, +/obj/item/paper, +/obj/item/paper, +/obj/item/paper, +/obj/item/paper, +/obj/item/paper, +/obj/item/paper, /turf/simulated/floor/tiled, /area/redgate/city/police) "dxq" = ( @@ -2578,7 +2578,7 @@ /area/redgate/city/spa) "dDh" = ( /obj/machinery/light/small, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /turf/simulated/floor/wood/alt/tile, /area/redgate/city/drugden) "dDq" = ( @@ -2621,13 +2621,13 @@ /area/redgate/city/stripclub) "dHh" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/fancy/cigarettes/killthroat, -/obj/item/weapon/storage/fancy/cigarettes/killthroat, -/obj/item/weapon/storage/fancy/cigarettes/killthroat, -/obj/item/weapon/storage/fancy/cigarettes/killthroat, -/obj/item/weapon/storage/fancy/cigarettes/killthroat, -/obj/item/weapon/storage/fancy/cigarettes/killthroat, -/obj/item/weapon/storage/fancy/cigarettes/killthroat, +/obj/item/storage/fancy/cigarettes/killthroat, +/obj/item/storage/fancy/cigarettes/killthroat, +/obj/item/storage/fancy/cigarettes/killthroat, +/obj/item/storage/fancy/cigarettes/killthroat, +/obj/item/storage/fancy/cigarettes/killthroat, +/obj/item/storage/fancy/cigarettes/killthroat, +/obj/item/storage/fancy/cigarettes/killthroat, /obj/machinery/light{ dir = 4 }, @@ -2667,20 +2667,20 @@ light_color = "#575656"; name = "dim light" }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3; pixel_y = 13 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 2; pixel_y = 7 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/peppermill, /turf/simulated/floor/wood/alt, /area/redgate/city/restaurant) "dKy" = ( /obj/structure/table/standard, -/obj/item/device/camera{ +/obj/item/camera{ pixel_x = 2; pixel_y = 3 }, @@ -2718,9 +2718,9 @@ /area/redgate/city/parkinglot) "dMu" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/matches, -/obj/item/weapon/storage/box/matches, -/obj/item/weapon/storage/box/matches, +/obj/item/storage/box/matches, +/obj/item/storage/box/matches, +/obj/item/storage/box/matches, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "dMH" = ( @@ -2766,7 +2766,7 @@ /turf/simulated/floor/carpet/oracarpet, /area/redgate/city/house1) "dQv" = ( -/obj/item/weapon/stool/baystool/padded, +/obj/item/stool/baystool/padded, /turf/simulated/floor/wood/alt/tile, /area/redgate/city/bar2) "dQG" = ( @@ -2786,9 +2786,9 @@ /area/redgate/city/hospital) "dRm" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/apurrrrfectman, -/obj/item/weapon/book/bundle/custom_library/fiction/beyondthedoor, -/obj/item/weapon/book/bundle/custom_library/fiction/chroniclesofmargatavol1, +/obj/item/book/bundle/custom_library/fiction/apurrrrfectman, +/obj/item/book/bundle/custom_library/fiction/beyondthedoor, +/obj/item/book/bundle/custom_library/fiction/chroniclesofmargatavol1, /turf/simulated/floor/wood, /area/redgate/city/library) "dRw" = ( @@ -2878,8 +2878,8 @@ /area/redgate/city/science) "dWz" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, +/obj/item/paper_bin, +/obj/item/pen/blue, /turf/simulated/floor/tiled/white, /area/redgate/city/science) "dWH" = ( @@ -2897,7 +2897,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/city/hotel) "dWV" = ( -/obj/item/weapon/handcuffs/legcuffs/fuzzy, +/obj/item/handcuffs/legcuffs/fuzzy, /turf/simulated/floor/carpet/brown, /area/redgate/city/hotel) "dXc" = ( @@ -3049,7 +3049,7 @@ /area/redgate/city/gym) "ehS" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/pill_bottle/happy, +/obj/item/storage/pill_bottle/happy, /obj/effect/floor_decal/corner/red/border{ dir = 1 }, @@ -3167,7 +3167,7 @@ /area/redgate/city/clotheshop) "epr" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/clown, +/obj/item/bedsheet/clown, /turf/simulated/floor/wood, /area/redgate/city/apartments) "epQ" = ( @@ -3178,14 +3178,14 @@ /area/redgate/city/pool) "erI" = ( /obj/structure/closet/secure_closet/engineering_personal, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/redgate/city/engine) "erQ" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/simulated/floor/carpet/oracarpet, /area/redgate/city/house3) "esT" = ( @@ -3231,24 +3231,24 @@ /obj/structure/closet/walllocker{ pixel_y = 33 }, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/deck/cah/black, +/obj/item/deck/cah, +/obj/item/deck/cah, +/obj/item/deck/cah, +/obj/item/deck/cah, +/obj/item/deck/cah, +/obj/item/deck/cah/black, +/obj/item/deck/cah/black, +/obj/item/deck/cah/black, +/obj/item/deck/cah/black, +/obj/item/deck/cah/black, +/obj/item/deck/cah/black, +/obj/item/deck/cah, +/obj/item/deck/cah, +/obj/item/deck/cah, +/obj/item/deck/cah/black, +/obj/item/deck/cah/black, +/obj/item/deck/cah/black, +/obj/item/deck/cah/black, /turf/simulated/shuttle/floor/white, /area/redgate/city/cards) "ewn" = ( @@ -3260,9 +3260,9 @@ /area/redgate/city/casino) "eww" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/reference/ThermodynamicReactionsandResearch, -/obj/item/weapon/book/bundle/custom_library/reference/fbpandprostheticmaintenance, -/obj/item/weapon/book/bundle/custom_library/reference/recyclingprocedures, +/obj/item/book/bundle/custom_library/reference/ThermodynamicReactionsandResearch, +/obj/item/book/bundle/custom_library/reference/fbpandprostheticmaintenance, +/obj/item/book/bundle/custom_library/reference/recyclingprocedures, /turf/simulated/floor/wood, /area/redgate/city/library) "ewA" = ( @@ -3371,11 +3371,11 @@ /area/redgate/city/clotheshop) "eEp" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3; pixel_y = 13 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = 14; pixel_y = 13 }, @@ -3387,7 +3387,7 @@ /area/redgate/city/restaurant) "eEw" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /turf/simulated/floor/tiled/eris/derelict3, /area/redgate/city/wiz) "eEz" = ( @@ -3481,15 +3481,15 @@ /area/redgate/city/streets) "eKL" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -1; pixel_y = 10 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/saltshaker, /turf/simulated/floor/wood/alt, /area/redgate/city/restaurant) "eKM" = ( @@ -3505,7 +3505,7 @@ /obj/structure/closet/walllocker_double/misc_civ/north, /obj/random/toy, /obj/random/plushie, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /turf/simulated/floor/tiled/kafel_full/white, /area/redgate/city/gallery) "eLr" = ( @@ -3542,9 +3542,9 @@ /area/redgate/city/gym) "eMQ" = ( /obj/structure/bookcase, -/obj/item/weapon/book/custom_library/religious/feastofkubera, -/obj/item/weapon/book/custom_library/religious/storyoflordganesha, -/obj/item/weapon/book/custom_library/religious/sungoddessofkorea, +/obj/item/book/custom_library/religious/feastofkubera, +/obj/item/book/custom_library/religious/storyoflordganesha, +/obj/item/book/custom_library/religious/sungoddessofkorea, /turf/simulated/floor/wood, /area/redgate/city/library) "eNy" = ( @@ -3749,9 +3749,9 @@ /area/redgate/city/toys) "fap" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/meteor, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/meteor, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/meteor, +/obj/item/reagent_containers/food/drinks/bottle/small/beer/meteor, +/obj/item/reagent_containers/food/drinks/bottle/small/beer/meteor, +/obj/item/reagent_containers/food/drinks/bottle/small/beer/meteor, /turf/simulated/floor/carpet/brown, /area/redgate/city/hotel) "fba" = ( @@ -3766,9 +3766,9 @@ /area/redgate/city/house12) "fbr" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/fancy/chewables/tobacco/nico, -/obj/item/weapon/storage/box/fancy/chewables/tobacco/nico, -/obj/item/weapon/storage/box/fancy/chewables/tobacco/nico, +/obj/item/storage/box/fancy/chewables/tobacco/nico, +/obj/item/storage/box/fancy/chewables/tobacco/nico, +/obj/item/storage/box/fancy/chewables/tobacco/nico, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "fcp" = ( @@ -3885,12 +3885,12 @@ /obj/structure/closet, /obj/random/contraband, /obj/random/maintenance/misc, -/obj/item/weapon/reagent_containers/syringe/drugs, +/obj/item/reagent_containers/syringe/drugs, /turf/simulated/floor/wood/alt, /area/redgate/city/stripclub) "fmA" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple, +/obj/item/reagent_containers/food/snacks/sliceable/pizza/pineapple, /turf/simulated/floor/tiled/kafel_full/blue, /area/redgate/city/pizza) "fnj" = ( @@ -3953,8 +3953,8 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/item/weapon/surgical/cautery, -/obj/item/weapon/surgical/bone_clamp, +/obj/item/surgical/cautery, +/obj/item/surgical/bone_clamp, /turf/simulated/floor/dungeon, /area/redgate/city/doctor) "fsS" = ( @@ -3975,7 +3975,7 @@ /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/redgate/city/engine) "fuf" = ( -/obj/item/weapon/reagent_containers/food/snacks/old/horseburger, +/obj/item/reagent_containers/food/snacks/old/horseburger, /turf/simulated/floor/plating, /area/redgate/city/dump) "fuu" = ( @@ -4054,7 +4054,7 @@ /obj/machinery/light/floortube{ dir = 4; light_color = "#ff8086"; - light_type = /obj/item/weapon/light/bulb/red; + light_type = /obj/item/light/bulb/red; name = "stripper light" }, /turf/simulated/floor/carpet/purcarpet, @@ -4177,7 +4177,7 @@ /area/redgate/city/hospital) "fEG" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/yellow, +/obj/item/bedsheet/yellow, /turf/simulated/floor/wood, /area/redgate/city/apartments) "fEQ" = ( @@ -4195,11 +4195,11 @@ /area/redgate/city/hospital) "fEX" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -1; pixel_y = 10 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3; pixel_y = 13 }, @@ -4333,7 +4333,7 @@ /obj/structure/window/basic{ dir = 8 }, -/obj/item/weapon/storage/wallet/casino, +/obj/item/storage/wallet/casino, /turf/simulated/floor/tiled/yellow, /area/redgate/city/casino) "fQX" = ( @@ -4382,7 +4382,7 @@ /area/redgate/city/hospital) "fVx" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/light/small{ dir = 1 }, @@ -4429,19 +4429,19 @@ /area/redgate/city/church) "fZJ" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = -9; pixel_y = 10 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 6; pixel_y = 10 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = -9; pixel_y = 1 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 6; pixel_y = 1 }, @@ -4463,10 +4463,10 @@ /area/redgate/city/casino) "gbV" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/snacks/ratpackcheese, -/obj/item/weapon/reagent_containers/food/snacks/ratpackcheese, -/obj/item/weapon/reagent_containers/food/snacks/ratpackcheese, -/obj/item/weapon/reagent_containers/food/snacks/ratpackcheese, +/obj/item/reagent_containers/food/snacks/ratpackcheese, +/obj/item/reagent_containers/food/snacks/ratpackcheese, +/obj/item/reagent_containers/food/snacks/ratpackcheese, +/obj/item/reagent_containers/food/snacks/ratpackcheese, /obj/machinery/light{ dir = 1 }, @@ -4575,13 +4575,13 @@ /area/redgate/city/clotheshop) "gjk" = ( /obj/structure/closet/walllocker_double/emergency_engi/north, -/obj/item/device/multitool, -/obj/item/weapon/storage/toolbox/brass, +/obj/item/multitool, +/obj/item/storage/toolbox/brass, /turf/simulated/floor/tiled/dark, /area/redgate/city/comms) "gjl" = ( /obj/structure/table/steel, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled/dark, /area/redgate/city/workshop) "gjG" = ( @@ -4615,7 +4615,7 @@ /area/redgate/city/science) "gmI" = ( /obj/structure/table/standard, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled/white, /area/redgate/city/hospital) "gmQ" = ( @@ -4643,7 +4643,7 @@ /obj/structure/casino_table/blackjack_m{ dir = 4 }, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/carpet/purple, /area/redgate/city/casino) "gpj" = ( @@ -4737,11 +4737,11 @@ /area/redgate/city/storage) "gyl" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine, +/obj/item/reagent_containers/food/drinks/bottle/pwine, +/obj/item/reagent_containers/food/drinks/bottle/pwine, +/obj/item/reagent_containers/food/drinks/bottle/pwine, +/obj/item/reagent_containers/food/drinks/bottle/pwine, +/obj/item/reagent_containers/food/drinks/bottle/pwine, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/city/offlicense) "gyB" = ( @@ -4802,7 +4802,7 @@ /area/redgate/city/hospital) "gEX" = ( /obj/structure/table/woodentable, -/obj/item/device/retail_scanner, +/obj/item/retail_scanner, /turf/simulated/floor/wood/alt, /area/redgate/city/stripclub) "gFk" = ( @@ -4862,25 +4862,25 @@ /area/redgate/city/house17) "gIb" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 8 }, /turf/simulated/floor/carpet/blue, /area/redgate/city/stripclub) "gIf" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, /turf/simulated/floor/wood/alt/tile, /area/redgate/city/gamblingden) "gJm" = ( @@ -4909,8 +4909,8 @@ /area/redgate/city/house5) "gKj" = ( /obj/structure/table/woodentable, -/obj/item/weapon/tool/wrench/brass, -/obj/item/weapon/tool/screwdriver/brass{ +/obj/item/tool/wrench/brass, +/obj/item/tool/screwdriver/brass{ pixel_y = 5 }, /turf/simulated/floor/wood/alt, @@ -4935,12 +4935,12 @@ /obj/structure/closet/walllocker{ pixel_y = 33 }, -/obj/item/weapon/deck/egy, -/obj/item/weapon/deck/egy, -/obj/item/weapon/deck/egy, -/obj/item/weapon/deck/egy, -/obj/item/weapon/deck/egy, -/obj/item/weapon/deck/egy, +/obj/item/deck/egy, +/obj/item/deck/egy, +/obj/item/deck/egy, +/obj/item/deck/egy, +/obj/item/deck/egy, +/obj/item/deck/egy, /turf/simulated/shuttle/floor/white, /area/redgate/city/cards) "gMN" = ( @@ -4955,7 +4955,7 @@ /area/redgate/city/morgue) "gNu" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/greendouble, +/obj/item/bedsheet/greendouble, /turf/simulated/floor/carpet/green, /area/redgate/city/house17) "gNx" = ( @@ -4977,7 +4977,7 @@ /area/redgate/city/hotel) "gOW" = ( /obj/structure/closet/radiation, -/obj/item/weapon/reagent_containers/glass/beaker/vial/random/toxin, +/obj/item/reagent_containers/glass/beaker/vial/random/toxin, /turf/simulated/floor/tiled/white, /area/redgate/city/science) "gPf" = ( @@ -5004,15 +5004,15 @@ /area/redgate/city/streets) "gQo" = ( /obj/structure/closet, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/red, -/obj/item/device/tape/random, +/obj/item/folder/red, +/obj/item/folder/red, +/obj/item/rectape/random, /obj/random/powercell/device, /turf/simulated/floor/tiled/red, /area/redgate/city/corporation) "gQA" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/wood/alt, /area/redgate/city/pharmacy) "gRW" = ( @@ -5055,7 +5055,7 @@ /area/redgate/city/restaurant) "gSV" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/ian, +/obj/item/bedsheet/ian, /turf/simulated/floor/wood, /area/redgate/city/apartments) "gTg" = ( @@ -5110,9 +5110,9 @@ /obj/random/contraband, /obj/random/medical/pillbottle, /obj/random/cash/huge, -/obj/item/weapon/reagent_containers/syringe/drugs, -/obj/item/weapon/reagent_containers/syringe/drugs, -/obj/item/weapon/reagent_containers/syringe/drugs, +/obj/item/reagent_containers/syringe/drugs, +/obj/item/reagent_containers/syringe/drugs, +/obj/item/reagent_containers/syringe/drugs, /obj/random/unidentified_medicine/drug_den, /turf/simulated/floor/carpet/blue, /area/redgate/city/stripclub) @@ -5143,7 +5143,7 @@ /obj/structure/closet, /obj/random/coin, /obj/random/maintenance/clean, -/obj/item/device/camera, +/obj/item/camera, /obj/item/clothing/under/librarian, /turf/simulated/floor/wood, /area/redgate/city/library) @@ -5180,8 +5180,8 @@ name = "dim light" }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/circular_saw{ +/obj/item/surgical/scalpel, +/obj/item/surgical/circular_saw{ pixel_y = 7 }, /turf/simulated/floor/dungeon, @@ -5220,7 +5220,7 @@ /area/redgate/city/house8) "hag" = ( /obj/structure/closet, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, /turf/simulated/floor/wood/alt, @@ -5271,7 +5271,7 @@ /area/redgate/city/science) "hdR" = ( /obj/structure/table/woodentable, -/obj/item/weapon/pack/cardemon, +/obj/item/pack/cardemon, /turf/simulated/floor/wood/alt/panel, /area/redgate/city/cardmon) "hea" = ( @@ -5282,14 +5282,14 @@ /area/redgate/city/streets) "heQ" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, /obj/machinery/light{ dir = 8 }, @@ -5325,7 +5325,7 @@ /area/redgate/city/cardmon) "hfF" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /turf/simulated/floor/carpet/oracarpet, /area/redgate/city/house1) "hfG" = ( @@ -5370,7 +5370,7 @@ /obj/structure/window/basic{ dir = 1 }, -/obj/item/device/retail_scanner, +/obj/item/retail_scanner, /turf/simulated/floor/tiled/white, /area/redgate/city/pharmacy) "hip" = ( @@ -5412,7 +5412,7 @@ /turf/simulated/floor/tiled/neutral, /area/redgate/city/weretiger) "hnf" = ( -/obj/item/weapon/reagent_containers/food/snacks/old/fries, +/obj/item/reagent_containers/food/snacks/old/fries, /turf/simulated/floor/wood/alt/panel, /area/redgate/city/rats) "hny" = ( @@ -5546,7 +5546,7 @@ /area/redgate/city/workshop) "hAZ" = ( /obj/structure/table/glass, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/purple, /area/redgate/city/house2) "hBj" = ( @@ -5568,15 +5568,15 @@ /area/redgate/city/pharmacy) "hBE" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/snacks/ratveggies, -/obj/item/weapon/reagent_containers/food/snacks/ratveggies, -/obj/item/weapon/reagent_containers/food/snacks/ratveggies, -/obj/item/weapon/reagent_containers/food/snacks/ratveggies, +/obj/item/reagent_containers/food/snacks/ratveggies, +/obj/item/reagent_containers/food/snacks/ratveggies, +/obj/item/reagent_containers/food/snacks/ratveggies, +/obj/item/reagent_containers/food/snacks/ratveggies, /turf/simulated/floor/tiled/neutral, /area/redgate/city/altevian) "hCn" = ( /obj/structure/bed/chair/sofa/left/brown, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/meteor, +/obj/item/reagent_containers/food/drinks/bottle/small/beer/meteor, /turf/simulated/floor/carpet/brown, /area/redgate/city/hotel) "hCP" = ( @@ -5611,7 +5611,7 @@ /area/redgate/city/science) "hEw" = ( /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/handcuffs/legcuffs/bola, +/obj/item/handcuffs/legcuffs/bola, /obj/machinery/light/small{ dir = 8 }, @@ -5631,7 +5631,7 @@ /area/redgate/city/science) "hEQ" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/syringe/drugs, +/obj/item/reagent_containers/syringe/drugs, /obj/effect/floor_decal/corner/red/border{ dir = 1 }, @@ -5646,7 +5646,7 @@ /area/redgate/city/stripclub) "hFs" = ( /obj/structure/table/woodentable, -/obj/item/device/retail_scanner, +/obj/item/retail_scanner, /turf/simulated/floor/wood/alt, /area/redgate/city/hotel) "hFF" = ( @@ -5659,7 +5659,7 @@ /area/redgate/city/hospital) "hGr" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/carpet/turcarpet, /area/redgate/city/house13) "hGN" = ( @@ -5672,41 +5672,41 @@ /obj/structure/closet{ name = "chips" }, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, /obj/item/roulette_ball/gold, /turf/simulated/floor/tiled/yellow, /area/redgate/city/casino) @@ -5754,8 +5754,8 @@ /area/redgate/city/theatre) "hMM" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/mmi, -/obj/item/device/robotanalyzer, +/obj/item/mmi, +/obj/item/robotanalyzer, /turf/simulated/floor/tiled/milspec, /area/redgate/city/ripper) "hNk" = ( @@ -5795,25 +5795,25 @@ /area/redgate/city/science) "hQh" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/drinks/cans/bodaplus, -/obj/item/weapon/reagent_containers/food/drinks/cans/bodaplus, -/obj/item/weapon/reagent_containers/food/drinks/cans/bodaplus, -/obj/item/weapon/reagent_containers/food/drinks/cans/bodaplus, -/obj/item/weapon/reagent_containers/food/drinks/cans/bodaplus, +/obj/item/reagent_containers/food/drinks/cans/bodaplus, +/obj/item/reagent_containers/food/drinks/cans/bodaplus, +/obj/item/reagent_containers/food/drinks/cans/bodaplus, +/obj/item/reagent_containers/food/drinks/cans/bodaplus, +/obj/item/reagent_containers/food/drinks/cans/bodaplus, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "hQZ" = ( /obj/structure/closet/secure_closet/freezer/meat, /obj/random/unidentified_medicine/drug_den, -/obj/item/weapon/reagent_containers/syringe/steroid, -/obj/item/weapon/reagent_containers/syringe/steroid, +/obj/item/reagent_containers/syringe/steroid, +/obj/item/reagent_containers/syringe/steroid, /turf/simulated/floor/wood/alt/tile, /area/redgate/city/drugden) "hRb" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/snacks/tuna, -/obj/item/weapon/reagent_containers/food/snacks/tuna, -/obj/item/weapon/reagent_containers/food/snacks/tuna, +/obj/item/reagent_containers/food/snacks/tuna, +/obj/item/reagent_containers/food/snacks/tuna, +/obj/item/reagent_containers/food/snacks/tuna, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "hRs" = ( @@ -5860,21 +5860,21 @@ /area/redgate/city/engine) "hSz" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/carpet/purcarpet, /area/redgate/city/house8) "hSA" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/flame/lighter/random, -/obj/item/weapon/flame/lighter/random, -/obj/item/weapon/flame/lighter/random, -/obj/item/weapon/flame/lighter/random, -/obj/item/weapon/flame/lighter/random, -/obj/item/weapon/flame/lighter/random, -/obj/item/weapon/flame/lighter/random, -/obj/item/weapon/flame/lighter/random, -/obj/item/weapon/flame/lighter/random, -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, +/obj/item/flame/lighter/random, +/obj/item/flame/lighter/random, +/obj/item/flame/lighter/random, +/obj/item/flame/lighter/random, +/obj/item/flame/lighter/random, +/obj/item/flame/lighter/random, +/obj/item/flame/lighter/random, +/obj/item/flame/lighter/random, +/obj/item/flame/lighter/random, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/city/offlicense) "hSV" = ( @@ -5954,7 +5954,7 @@ /area/redgate/city/morgue) "hYt" = ( /obj/structure/table/woodentable, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/simulated/floor/wood/alt, /area/redgate/city/police) "hYX" = ( @@ -6109,8 +6109,8 @@ /area/redgate/city/warehouse) "ijs" = ( /obj/structure/table/standard, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/knife/butch, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/kafel_full/blue, /area/redgate/city/pizza) "ikt" = ( @@ -6150,7 +6150,7 @@ /area/redgate/city/supermarket) "imI" = ( /obj/structure/table/alien, -/obj/item/weapon/deck/egy{ +/obj/item/deck/egy{ pixel_x = 15 }, /turf/simulated/shuttle/floor/alienplating/blue/half, @@ -6163,7 +6163,7 @@ /area/redgate/city/check1) "imS" = ( /obj/structure/table/steel, -/obj/item/device/electronic_assembly/large/default, +/obj/item/electronic_assembly/large/default, /turf/simulated/floor/tiled/dark, /area/redgate/city/workshop) "imV" = ( @@ -6246,7 +6246,7 @@ /area/redgate/city/toys) "itN" = ( /obj/structure/table/glass, -/obj/item/device/nif/bad{ +/obj/item/nif/bad{ name = "display model NIF" }, /obj/machinery/light{ @@ -6256,7 +6256,7 @@ /area/redgate/city/nifshop) "iuB" = ( /obj/structure/table/rack/gun_rack/steel, -/obj/item/weapon/reagent_containers/food/drinks/golden_cup, +/obj/item/reagent_containers/food/drinks/golden_cup, /turf/simulated/floor/tiled/techfloor, /area/redgate/city/casino) "ivG" = ( @@ -6304,8 +6304,8 @@ /area/redgate/city/laundry) "iyb" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/storage/box/beakers, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/storage/box/beakers, /turf/simulated/floor/tiled/white, /area/redgate/city/science) "iyu" = ( @@ -6323,7 +6323,7 @@ /area/redgate/city/science) "izm" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/brainzsnax, +/obj/item/storage/box/brainzsnax, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "izw" = ( @@ -6337,7 +6337,7 @@ /area/redgate/city/house3) "iAv" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet/bcarpet, /area/redgate/city/house3) "iAW" = ( @@ -6351,9 +6351,9 @@ /area/redgate/city/corporation) "iCg" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/metalglen, -/obj/item/weapon/book/bundle/custom_library/fiction/poemsforarainyday, -/obj/item/weapon/book/bundle/custom_library/fiction/raissue142, +/obj/item/book/bundle/custom_library/fiction/metalglen, +/obj/item/book/bundle/custom_library/fiction/poemsforarainyday, +/obj/item/book/bundle/custom_library/fiction/raissue142, /turf/simulated/floor/wood, /area/redgate/city/library) "iCp" = ( @@ -6372,7 +6372,7 @@ /area/redgate/city/hospital) "iDE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /obj/machinery/injector_maker{ pixel_y = 21 }, @@ -6469,11 +6469,11 @@ /obj/structure/sign/painting/public{ pixel_x = -30 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 2; pixel_y = 7 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -1; pixel_y = 10 }, @@ -6601,13 +6601,13 @@ /area/redgate/city/check2) "iQt" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/food/drinks/bottle/vodka, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/city/offlicense) "iRO" = ( @@ -6664,15 +6664,15 @@ /area/redgate/city/drugden) "iUI" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne, -/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne, -/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne, -/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne, -/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne, -/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne, -/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne, -/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne, -/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne, +/obj/item/reagent_containers/food/drinks/bottle/champagne, +/obj/item/reagent_containers/food/drinks/bottle/champagne, +/obj/item/reagent_containers/food/drinks/bottle/champagne, +/obj/item/reagent_containers/food/drinks/bottle/champagne, +/obj/item/reagent_containers/food/drinks/bottle/champagne, +/obj/item/reagent_containers/food/drinks/bottle/champagne, +/obj/item/reagent_containers/food/drinks/bottle/champagne, +/obj/item/reagent_containers/food/drinks/bottle/champagne, +/obj/item/reagent_containers/food/drinks/bottle/champagne, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/city/offlicense) "iVh" = ( @@ -6741,8 +6741,8 @@ /area/redgate/city/hospital) "jaC" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/bone/arm, -/obj/item/weapon/bone/leg, +/obj/item/bone/arm, +/obj/item/bone/leg, /obj/item/clothing/under/pizzaguy, /obj/item/clothing/head/pizzaguy, /turf/simulated/floor/wood/alt/panel, @@ -6757,7 +6757,7 @@ /area/redgate/city/church) "jaJ" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/carpet/blue, /area/redgate/city/house16) "jbM" = ( @@ -6795,11 +6795,11 @@ /area/redgate/city/apartments) "jdC" = ( /obj/structure/table/glass, -/obj/item/weapon/disk/nifsoft/compliance, +/obj/item/disk/nifsoft/compliance, /turf/simulated/shuttle/floor, /area/redgate/city/nifshop) "jdR" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/light{ dir = 8 }, @@ -6828,10 +6828,10 @@ /area/redgate/city/apartments) "jfs" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/donut, -/obj/item/weapon/storage/box/donut, -/obj/item/weapon/storage/box/donut, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, +/obj/item/storage/box/donut, +/obj/item/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "jgR" = ( @@ -6856,10 +6856,10 @@ /area/redgate/city/corporation) "jiS" = ( /obj/structure/table/steel, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = 5 }, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = -5 }, /turf/simulated/floor/tiled/dark, @@ -6899,11 +6899,11 @@ /area/redgate/city/costumes) "jkl" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = 6; pixel_y = 8 }, @@ -6919,10 +6919,10 @@ /area/redgate/city/science) "jlg" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/snacks/ratprotein, -/obj/item/weapon/reagent_containers/food/snacks/ratprotein, -/obj/item/weapon/reagent_containers/food/snacks/ratprotein, -/obj/item/weapon/reagent_containers/food/snacks/ratprotein, +/obj/item/reagent_containers/food/snacks/ratprotein, +/obj/item/reagent_containers/food/snacks/ratprotein, +/obj/item/reagent_containers/food/snacks/ratprotein, +/obj/item/reagent_containers/food/snacks/ratprotein, /turf/simulated/floor/tiled/neutral, /area/redgate/city/altevian) "jlA" = ( @@ -6967,10 +6967,10 @@ /area/redgate/city/wiz) "jpC" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/snacks/ratpackramen, -/obj/item/weapon/reagent_containers/food/snacks/ratpackramen, -/obj/item/weapon/reagent_containers/food/snacks/ratpackramen, -/obj/item/weapon/reagent_containers/food/snacks/ratpackramen, +/obj/item/reagent_containers/food/snacks/ratpackramen, +/obj/item/reagent_containers/food/snacks/ratpackramen, +/obj/item/reagent_containers/food/snacks/ratpackramen, +/obj/item/reagent_containers/food/snacks/ratpackramen, /turf/simulated/floor/tiled/neutral, /area/redgate/city/altevian) "jpH" = ( @@ -6987,7 +6987,7 @@ /area/redgate/city/hospital) "jqG" = ( /obj/structure/table/standard, -/obj/item/device/retail_scanner, +/obj/item/retail_scanner, /turf/simulated/floor/tiled/monotile, /area/redgate/city/stripclub) "jqI" = ( @@ -7079,7 +7079,7 @@ /area/redgate/city/streets) "jwD" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hop, +/obj/item/bedsheet/hop, /turf/simulated/floor/wood, /area/redgate/city/apartments) "jwI" = ( @@ -7175,7 +7175,7 @@ /area/redgate/city/doctor) "jCC" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/simulated/floor/wood/alt, /area/redgate/city/streets) "jCN" = ( @@ -7204,7 +7204,7 @@ /area/redgate/city/stripclub) "jEC" = ( /obj/structure/table/alien, -/obj/item/weapon/gun/projectile/revolver/toy/big_iron, +/obj/item/gun/projectile/revolver/toy/big_iron, /turf/simulated/floor/carpet/retro, /area/redgate/city/toys) "jED" = ( @@ -7260,7 +7260,7 @@ /area/redgate/city/casino) "jGZ" = ( /obj/structure/closet/wardrobe/chemistry_white, -/obj/item/weapon/storage/bag/chemistry, +/obj/item/storage/bag/chemistry, /obj/item/clothing/accessory/solgov/department/research/jumper{ desc = "Insignia denoting assignment to the research department." }, @@ -7399,7 +7399,7 @@ /area/redgate/city/supermarket) "jPE" = ( /obj/structure/table/fancyblack, -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/carpet/bcarpet, /area/redgate/city/bar1) "jPW" = ( @@ -7422,7 +7422,7 @@ /obj/structure/window/basic{ dir = 8 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/redgate/city/pharmacy) "jQG" = ( @@ -7439,7 +7439,7 @@ /area/redgate/city/chopshop) "jRE" = ( /obj/structure/closet/l3closet/scientist, -/obj/item/weapon/reagent_containers/glass/beaker/vial/random, +/obj/item/reagent_containers/glass/beaker/vial/random, /obj/random/slimecore, /turf/simulated/floor/tiled/white, /area/redgate/city/science) @@ -7455,10 +7455,10 @@ /area/redgate/city/science) "jSC" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs/legcuffs, -/obj/item/weapon/handcuffs/legcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs/legcuffs, +/obj/item/handcuffs/legcuffs, /turf/simulated/floor/tiled/milspec, /area/redgate/city/police) "jTu" = ( @@ -7496,7 +7496,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/city/house17) "jVD" = ( -/obj/item/weapon/reagent_containers/food/snacks/old/taco, +/obj/item/reagent_containers/food/snacks/old/taco, /turf/simulated/floor/plating, /area/redgate/city/dump) "jVJ" = ( @@ -7578,7 +7578,7 @@ /area/redgate/city/house4) "kaY" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, /turf/simulated/floor/tiled/kafel_full/blue, @@ -7602,7 +7602,7 @@ /area/redgate/city/waterworks) "kcE" = ( /obj/structure/table/sifwoodentable, -/obj/item/weapon/storage/box/casino/costume_plaguedoctor, +/obj/item/storage/box/casino/costume_plaguedoctor, /turf/simulated/floor/wood/alt, /area/redgate/city/costumes) "kcU" = ( @@ -7612,8 +7612,8 @@ /area/redgate/city/workshop) "kdF" = ( /obj/structure/table/steel, -/obj/item/weapon/surgical/cautery, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/cautery, +/obj/item/surgical/scalpel, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/redgate/city/morgue) "kdK" = ( @@ -7689,7 +7689,7 @@ /area/redgate/city/corporation) "khO" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, /turf/simulated/floor/tiled/kafel_full/white, /area/redgate/city/gallery) "kih" = ( @@ -7715,9 +7715,9 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 1 }, -/obj/item/weapon/storage/pill_bottle/paracetamol, -/obj/item/weapon/storage/pill_bottle/paracetamol, -/obj/item/weapon/storage/pill_bottle/paracetamol, +/obj/item/storage/pill_bottle/paracetamol, +/obj/item/storage/pill_bottle/paracetamol, +/obj/item/storage/pill_bottle/paracetamol, /turf/simulated/floor/tiled/white, /area/redgate/city/pharmacy) "kjI" = ( @@ -7851,7 +7851,7 @@ /area/redgate/city/engine) "kpN" = ( /obj/structure/table/standard, -/obj/item/weapon/pen/fountain2, +/obj/item/pen/fountain2, /turf/simulated/floor/tiled/white, /area/redgate/city/science) "kqd" = ( @@ -7875,7 +7875,7 @@ /area/redgate/city/tarot) "kua" = ( /obj/structure/table/alien, -/obj/item/weapon/deck/egy{ +/obj/item/deck/egy{ pixel_y = -16 }, /turf/simulated/shuttle/floor/alienplating/blue/half{ @@ -7956,7 +7956,7 @@ /obj/machinery/light/floortube{ dir = 8; light_color = "#ff8086"; - light_type = /obj/item/weapon/light/bulb/red; + light_type = /obj/item/light/bulb/red; name = "stripper light" }, /turf/simulated/floor/carpet/purcarpet, @@ -8026,7 +8026,7 @@ /turf/simulated/floor/wood, /area/redgate/city/house4) "kFi" = ( -/obj/item/weapon/towel/random, +/obj/item/towel/random, /obj/random/soap_common, /turf/simulated/floor/tiled/neutral, /area/redgate/city/cardmon) @@ -8056,7 +8056,7 @@ /area/redgate/city/house14) "kHd" = ( /obj/structure/table/fancyblack, -/obj/item/weapon/flame/candle/candelabra{ +/obj/item/flame/candle/candelabra{ pixel_y = 13 }, /turf/simulated/floor/carpet/brown, @@ -8099,7 +8099,7 @@ /turf/simulated/floor/wood, /area/redgate/city/house3) "kLq" = ( -/obj/item/weapon/reagent_containers/food/snacks/old/pizza, +/obj/item/reagent_containers/food/snacks/old/pizza, /turf/simulated/floor/wood/alt/panel, /area/redgate/city/rats) "kLU" = ( @@ -8261,7 +8261,7 @@ /obj/structure/closet/crate/secure{ req_one_access = list(101) }, -/obj/item/weapon/tool/transforming/altevian, +/obj/item/tool/transforming/altevian, /obj/random/junk, /obj/random/grenade/less_lethal, /obj/item/clothing/mask/altevian_breath, @@ -8322,8 +8322,8 @@ /area/redgate/city/workshop) "kWL" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fountain9, +/obj/item/paper_bin, +/obj/item/pen/fountain9, /obj/random/mug, /turf/simulated/floor/tiled/white, /area/redgate/city/science) @@ -8375,10 +8375,10 @@ /area/redgate/city/spa) "kZm" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/snacks/packaged/meatration, -/obj/item/weapon/reagent_containers/food/snacks/packaged/meatration, -/obj/item/weapon/reagent_containers/food/snacks/packaged/meatration, -/obj/item/weapon/reagent_containers/food/snacks/packaged/meatration, +/obj/item/reagent_containers/food/snacks/packaged/meatration, +/obj/item/reagent_containers/food/snacks/packaged/meatration, +/obj/item/reagent_containers/food/snacks/packaged/meatration, +/obj/item/reagent_containers/food/snacks/packaged/meatration, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "kZP" = ( @@ -8405,9 +8405,9 @@ /area/redgate/city/library) "lbl" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "lbt" = ( @@ -8421,7 +8421,7 @@ /obj/machinery/light/floortube{ dir = 8; light_color = "#ff8086"; - light_type = /obj/item/weapon/light/bulb/red; + light_type = /obj/item/light/bulb/red; name = "stripper light" }, /turf/simulated/floor/carpet/gaycarpet, @@ -8474,15 +8474,15 @@ /area/redgate/city/streets) "leS" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whitewine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whitewine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whitewine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whitewine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whitewine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whitewine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whitewine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whitewine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whitewine, +/obj/item/reagent_containers/food/drinks/bottle/whitewine, +/obj/item/reagent_containers/food/drinks/bottle/whitewine, +/obj/item/reagent_containers/food/drinks/bottle/whitewine, +/obj/item/reagent_containers/food/drinks/bottle/whitewine, +/obj/item/reagent_containers/food/drinks/bottle/whitewine, +/obj/item/reagent_containers/food/drinks/bottle/whitewine, +/obj/item/reagent_containers/food/drinks/bottle/whitewine, +/obj/item/reagent_containers/food/drinks/bottle/whitewine, +/obj/item/reagent_containers/food/drinks/bottle/whitewine, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/city/offlicense) "lfd" = ( @@ -8493,11 +8493,11 @@ /area/redgate/city/streets) "lfQ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -1; pixel_y = 10 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3; pixel_y = 13 }, @@ -8505,11 +8505,11 @@ /area/redgate/city/cafe) "lfT" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/drinks/cans/root_beer, -/obj/item/weapon/reagent_containers/food/drinks/cans/root_beer, -/obj/item/weapon/reagent_containers/food/drinks/cans/root_beer, -/obj/item/weapon/reagent_containers/food/drinks/cans/root_beer, -/obj/item/weapon/reagent_containers/food/drinks/cans/root_beer, +/obj/item/reagent_containers/food/drinks/cans/root_beer, +/obj/item/reagent_containers/food/drinks/cans/root_beer, +/obj/item/reagent_containers/food/drinks/cans/root_beer, +/obj/item/reagent_containers/food/drinks/cans/root_beer, +/obj/item/reagent_containers/food/drinks/cans/root_beer, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "lgF" = ( @@ -8635,7 +8635,7 @@ /area/redgate/city/hospital) "loA" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/machinery/light{ dir = 4 }, @@ -8660,7 +8660,7 @@ /area/redgate/city/casino) "lpN" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /turf/simulated/floor/wood, /area/redgate/city/library) "lpQ" = ( @@ -8696,8 +8696,8 @@ /area/redgate/city/supermarket) "ltu" = ( /obj/structure/closet/walllocker_double/medical/north, -/obj/item/weapon/cane, -/obj/item/weapon/cane, +/obj/item/cane, +/obj/item/cane, /obj/random/maintenance/medical, /turf/simulated/floor/tiled/white, /area/redgate/city/hospital) @@ -8709,7 +8709,7 @@ /area/redgate/city/pizza) "luj" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/manual/medical_diagnostics_manual{ +/obj/item/book/manual/medical_diagnostics_manual{ pixel_y = 7 }, /turf/simulated/floor/wood, @@ -8754,10 +8754,10 @@ /area/redgate/city/pool) "lxh" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito, -/obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito, -/obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito, -/obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito, +/obj/item/reagent_containers/food/snacks/packaged/vendburrito, +/obj/item/reagent_containers/food/snacks/packaged/vendburrito, +/obj/item/reagent_containers/food/snacks/packaged/vendburrito, +/obj/item/reagent_containers/food/snacks/packaged/vendburrito, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "lxv" = ( @@ -8791,7 +8791,7 @@ /area/redgate/city/dealership) "lCA" = ( /obj/structure/table/darkglass, -/obj/item/weapon/storage/belt/holding, +/obj/item/storage/belt/holding, /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/redgate/city/corporation) "lCD" = ( @@ -8846,7 +8846,7 @@ /area/redgate/city/house10) "lFu" = ( /obj/structure/table/darkglass, -/obj/item/weapon/bluespace_crystal, +/obj/item/bluespace_crystal, /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/redgate/city/corporation) "lFx" = ( @@ -8856,7 +8856,7 @@ /area/redgate/city/warehouse) "lFz" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/simulated/floor/tiled/dark, /area/redgate/city/police) "lFH" = ( @@ -8936,7 +8936,7 @@ /area/redgate/city/theatre) "lKL" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/bundle/custom_library/fiction/metalglen, +/obj/item/book/bundle/custom_library/fiction/metalglen, /turf/simulated/floor/wood, /area/redgate/city/house18) "lKP" = ( @@ -8967,7 +8967,7 @@ "lMx" = ( /obj/structure/table/rack/shelf, /obj/random/grenade/less_lethal, -/obj/item/weapon/gun/energy/plasmastun, +/obj/item/gun/energy/plasmastun, /obj/machinery/light/small, /turf/simulated/floor/concrete, /area/redgate/city/storage) @@ -8980,18 +8980,18 @@ /obj/structure/closet/walllocker/medical/south, /obj/random/unidentified_medicine/drug_den, /obj/random/unidentified_medicine/drug_den, -/obj/item/weapon/storage/box/pillbottles, +/obj/item/storage/box/pillbottles, /obj/random/medical/pillbottle, /obj/random/medical/pillbottle, /obj/random/medical/pillbottle, /obj/random/medical/pillbottle, -/obj/item/weapon/reagent_containers/pill/vermicetol, +/obj/item/reagent_containers/pill/vermicetol, /turf/simulated/floor/wood/alt, /area/redgate/city/pharmacy) "lNn" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fountain5, +/obj/item/paper_bin, +/obj/item/pen/fountain5, /turf/simulated/floor/carpet, /area/redgate/city/house15) "lNM" = ( @@ -9009,7 +9009,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/city/toys) "lPv" = ( -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /turf/simulated/floor/wood/alt/tile, /area/redgate/city/drugden) "lPB" = ( @@ -9036,9 +9036,9 @@ /area/redgate/city/hotel) "lRp" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/book/manual/bar_guide, -/obj/item/weapon/book/manual/barman_recipes, +/obj/item/book/manual/chef_recipes, +/obj/item/book/manual/bar_guide, +/obj/item/book/manual/barman_recipes, /turf/simulated/floor/wood, /area/redgate/city/library) "lRH" = ( @@ -9065,7 +9065,7 @@ /turf/simulated/floor/wood, /area/redgate/city/house11) "lUM" = ( -/obj/item/device/communicator/watch, +/obj/item/communicator/watch, /turf/simulated/floor/carpet/brown, /area/redgate/city/hotel) "lVa" = ( @@ -9162,7 +9162,7 @@ /area/redgate/city/clotheshop) "mbT" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/wood/alt, /area/redgate/city/dealership) "mck" = ( @@ -9174,10 +9174,10 @@ /area/redgate/city/apartments) "mcm" = ( /obj/structure/table/reinforced, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 5 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/redgate/city/engine) "mds" = ( @@ -9186,7 +9186,7 @@ /area/redgate/city/clotheshop) "mdv" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet/blue, /area/redgate/city/house4) "mdY" = ( @@ -9225,8 +9225,8 @@ /area/redgate/city/warehouse) "mib" = ( /obj/structure/table/standard, -/obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/material/knife/butch, +/obj/item/material/kitchen/rollingpin, +/obj/item/material/knife/butch, /turf/simulated/floor/tiled/white, /area/redgate/city/restaurant) "mii" = ( @@ -9259,13 +9259,13 @@ /area/redgate/city/police) "mjx" = ( /obj/structure/table/reinforced, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ pixel_x = -3 }, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ pixel_y = 3 }, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ pixel_x = 3; pixel_y = 6 }, @@ -9286,7 +9286,7 @@ /area/redgate/city/casino) "mkj" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /turf/simulated/floor/carpet/blue, /area/redgate/city/house4) "mkK" = ( @@ -9294,7 +9294,7 @@ /area/redgate/city/fightclub) "mkP" = ( /obj/structure/closet/wardrobe, -/obj/item/weapon/bone/skull, +/obj/item/bone/skull, /obj/random/meat, /obj/random/meat, /obj/random/maintenance/security, @@ -9344,7 +9344,7 @@ /area/redgate/city/apartments) "moo" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /turf/simulated/floor/wood/alt/tile, /area/redgate/city/drugden) "mpi" = ( @@ -9368,7 +9368,7 @@ /area/redgate/city/apartments) "mqz" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/tiled/white, /area/redgate/city/science) "mqA" = ( @@ -9400,7 +9400,7 @@ /area/redgate/city/fightclub) "mrZ" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/lights/bulbs, +/obj/item/storage/box/lights/bulbs, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "msj" = ( @@ -9412,10 +9412,10 @@ /area/redgate/city/science) "msF" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/snacks/packaged/vegration, -/obj/item/weapon/reagent_containers/food/snacks/packaged/vegration, -/obj/item/weapon/reagent_containers/food/snacks/packaged/vegration, -/obj/item/weapon/reagent_containers/food/snacks/packaged/vegration, +/obj/item/reagent_containers/food/snacks/packaged/vegration, +/obj/item/reagent_containers/food/snacks/packaged/vegration, +/obj/item/reagent_containers/food/snacks/packaged/vegration, +/obj/item/reagent_containers/food/snacks/packaged/vegration, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "msM" = ( @@ -9448,7 +9448,7 @@ /area/redgate/city/house10) "mvM" = ( /obj/structure/table/standard, -/obj/item/weapon/tape_roll{ +/obj/item/tape_roll{ pixel_x = 4; pixel_y = 4 }, @@ -9459,23 +9459,23 @@ /area/redgate/city/teppi) "mwe" = ( /obj/structure/closet/walllocker_double/kitchen/north, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/storage/box/beakers{ +/obj/item/reagent_containers/dropper, +/obj/item/storage/box/beakers{ name = "box of measuring cups"; pixel_x = 2; pixel_y = 3; - starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup=7) + starts_with = list(/obj/item/reagent_containers/glass/beaker/measuring_cup=7) }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/random/medical/lite, /turf/simulated/floor/tiled/white, /area/redgate/city/restaurant) @@ -9524,16 +9524,16 @@ /area/redgate/city/house8) "mzz" = ( /obj/structure/table/rack/gun_rack/steel, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, /turf/simulated/floor/tiled/techfloor, /area/redgate/city/casino) "mBu" = ( @@ -9556,7 +9556,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/redgate/city/waterworks) "mEd" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/wood/alt/tile, @@ -9750,7 +9750,7 @@ /area/redgate/city/gym) "mNh" = ( /obj/structure/table/woodentable, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/wood, /area/redgate/city/library) "mNF" = ( @@ -9794,10 +9794,10 @@ /area/redgate/city/dealership) "mPN" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/popcorn, -/obj/item/weapon/reagent_containers/food/snacks/popcorn, -/obj/item/weapon/reagent_containers/food/snacks/popcorn, -/obj/item/weapon/reagent_containers/food/snacks/popcorn, +/obj/item/reagent_containers/food/snacks/popcorn, +/obj/item/reagent_containers/food/snacks/popcorn, +/obj/item/reagent_containers/food/snacks/popcorn, +/obj/item/reagent_containers/food/snacks/popcorn, /turf/simulated/floor/carpet/blue, /area/redgate/city/theatre) "mQe" = ( @@ -9835,17 +9835,17 @@ /area/redgate/city/spa) "mSf" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /turf/simulated/floor/carpet/purcarpet, /area/redgate/city/house10) "mSj" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac, +/obj/item/reagent_containers/food/drinks/bottle/cognac, +/obj/item/reagent_containers/food/drinks/bottle/cognac, +/obj/item/reagent_containers/food/drinks/bottle/cognac, +/obj/item/reagent_containers/food/drinks/bottle/cognac, +/obj/item/reagent_containers/food/drinks/bottle/cognac, +/obj/item/reagent_containers/food/drinks/bottle/cognac, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/city/offlicense) "mSy" = ( @@ -10004,7 +10004,7 @@ /area/redgate/city/bar2) "nfa" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/book/tome, +/obj/item/book/tome, /turf/simulated/floor/tiled/eris/derelict3, /area/redgate/city/wiz) "nfg" = ( @@ -10078,7 +10078,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/item/weapon/surgical/bioregen, +/obj/item/surgical/bioregen, /turf/simulated/floor/dungeon, /area/redgate/city/doctor) "njA" = ( @@ -10087,10 +10087,10 @@ /area/redgate/city/science) "nkD" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger, -/obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger, -/obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger, -/obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger, +/obj/item/reagent_containers/food/snacks/packaged/vendburger, +/obj/item/reagent_containers/food/snacks/packaged/vendburger, +/obj/item/reagent_containers/food/snacks/packaged/vendburger, +/obj/item/reagent_containers/food/snacks/packaged/vendburger, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "nlQ" = ( @@ -10121,7 +10121,7 @@ /area/redgate/city/gym) "noL" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/blue, /area/redgate/city/house16) "npc" = ( @@ -10144,7 +10144,7 @@ /area/redgate/city/streets) "nqc" = ( /obj/structure/table/glass, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/purple, /area/redgate/city/cardmon) "nqu" = ( @@ -10153,7 +10153,7 @@ /area/redgate/city/doctor) "nqO" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/rainbow, +/obj/item/bedsheet/rainbow, /turf/simulated/floor/wood, /area/redgate/city/apartments) "nqT" = ( @@ -10219,7 +10219,7 @@ /area/redgate/city/altevian) "nvN" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/defib_kit/jumper_kit, +/obj/item/defib_kit/jumper_kit, /turf/simulated/floor/tiled/milspec, /area/redgate/city/ripper) "nwI" = ( @@ -10285,7 +10285,7 @@ dir = 1 }, /obj/structure/table/rack/gun_rack/steel, -/obj/item/weapon/flame/lighter/zippo/gold, +/obj/item/flame/lighter/zippo/gold, /turf/simulated/floor/tiled/techfloor, /area/redgate/city/casino) "nyv" = ( @@ -10320,7 +10320,7 @@ /area/redgate/city/waterworks) "nAC" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit{ +/obj/item/suit_cooling_unit{ pixel_y = -5 }, /obj/machinery/light{ @@ -10329,7 +10329,7 @@ /turf/simulated/floor/tiled/eris/white/bluecorner, /area/redgate/city/hospital) "nBM" = ( -/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/oldpizza, +/obj/item/reagent_containers/food/snacks/sliceable/pizza/oldpizza, /turf/simulated/floor/dungeon, /area/redgate/city/pizza) "nCg" = ( @@ -10489,7 +10489,7 @@ /area/redgate/city/cardmon) "nOh" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /turf/simulated/floor/wood, /area/redgate/city/apartments) "nOE" = ( @@ -10511,7 +10511,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/item/clothing/mask/breath/anesthetic, /turf/simulated/floor/dungeon, /area/redgate/city/doctor) @@ -10562,7 +10562,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/carpet/purcarpet, /area/redgate/city/church) "nSS" = ( @@ -10605,7 +10605,7 @@ /area/redgate/city/cards) "nWw" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/lights/tubes, +/obj/item/storage/box/lights/tubes, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "nWH" = ( @@ -10628,7 +10628,7 @@ /area/redgate/city/house6) "nXR" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/wood, /area/redgate/city/apartments) "nYE" = ( @@ -10770,13 +10770,13 @@ /area/redgate/city/hospital) "ogW" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hosdouble, -/obj/item/weapon/paper, +/obj/item/bedsheet/hosdouble, +/obj/item/paper, /turf/simulated/floor/carpet/brown, /area/redgate/city/hotel) "ohf" = ( /obj/structure/table/alien/blue, -/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, /obj/machinery/light{ dir = 1 }, @@ -10788,7 +10788,7 @@ /area/redgate/city/church) "ohq" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, +/obj/item/bedsheet/purpledouble, /turf/simulated/floor/carpet/purple, /area/redgate/city/house2) "oht" = ( @@ -10825,7 +10825,7 @@ /area/redgate/city/waterworks) "okB" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/custom_library/religious/feastofkubera, +/obj/item/book/custom_library/religious/feastofkubera, /turf/simulated/floor/wood, /area/redgate/city/house4) "okP" = ( @@ -10896,7 +10896,7 @@ /area/redgate/city/morgue) "ooo" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/ce, +/obj/item/bedsheet/ce, /turf/simulated/floor/wood, /area/redgate/city/apartments) "oov" = ( @@ -10959,7 +10959,7 @@ /area/redgate/city/workshop) "osK" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/cedouble, +/obj/item/bedsheet/cedouble, /obj/machinery/light_switch{ pixel_y = 24 }, @@ -11065,10 +11065,10 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/dark, @@ -11109,7 +11109,7 @@ /area/redgate/city/house9) "oES" = ( /obj/structure/bed/chair/sofa/right/brown, -/obj/item/weapon/card/id/event/polymorphic/altcard, +/obj/item/card/id/event/polymorphic/altcard, /obj/item/clothing/shoes/heels, /obj/machinery/light{ dir = 1 @@ -11145,9 +11145,9 @@ /area/redgate/city/house13) "oGK" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/donut, -/obj/item/weapon/storage/box/donut, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, +/obj/item/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "oHL" = ( @@ -11182,28 +11182,28 @@ /turf/simulated/floor/wood/alt, /area/redgate/city/streets) "oJh" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /obj/machinery/light{ @@ -11269,8 +11269,8 @@ /obj/random/medical/pillbottle, /obj/random/medical/pillbottle, /obj/random/medical/pillbottle, -/obj/item/weapon/reagent_containers/glass/beaker/vial/random, -/obj/item/weapon/reagent_containers/glass/beaker/vial/random, +/obj/item/reagent_containers/glass/beaker/vial/random, +/obj/item/reagent_containers/glass/beaker/vial/random, /turf/simulated/floor/tiled/white, /area/redgate/city/science) "oML" = ( @@ -11299,7 +11299,7 @@ /area/redgate/city/succ) "oPf" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/mint, +/obj/item/reagent_containers/food/snacks/mint, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/city/offlicense) "oPT" = ( @@ -11323,7 +11323,7 @@ /area/redgate/city/police) "oQV" = ( /obj/structure/table/alien/blue, -/obj/item/device/retail_scanner, +/obj/item/retail_scanner, /turf/simulated/shuttle/floor, /area/redgate/city/nifshop) "oQW" = ( @@ -11366,7 +11366,7 @@ /area/redgate/city/apartments) "oTp" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hosdouble, +/obj/item/bedsheet/hosdouble, /turf/simulated/floor/carpet, /area/redgate/city/house7) "oUG" = ( @@ -11376,28 +11376,28 @@ /turf/simulated/fitness, /area/redgate/city/gym) "oUL" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/tiled/yellow, @@ -11434,9 +11434,9 @@ /area/redgate/city/bar1) "oXJ" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, /obj/machinery/light, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) @@ -11468,7 +11468,7 @@ /area/redgate/city/morgue) "oYM" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hosdouble, +/obj/item/bedsheet/hosdouble, /turf/simulated/floor/carpet, /area/redgate/city/house15) "oYO" = ( @@ -11477,8 +11477,8 @@ /area/redgate/city/scughouse) "oYS" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, +/obj/item/paper_bin, +/obj/item/pen/blue, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/city/gym) "oZa" = ( @@ -11493,7 +11493,7 @@ /obj/structure/casino_table/craps{ dir = 1 }, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/simulated/floor/carpet/purple, /area/redgate/city/casino) "paA" = ( @@ -11521,7 +11521,7 @@ /area/redgate/city/supermarket) "pck" = ( /obj/structure/table/alien, -/obj/item/weapon/deck/egy{ +/obj/item/deck/egy{ pixel_y = -16 }, /turf/simulated/shuttle/floor/alienplating/blue/half{ @@ -11530,7 +11530,7 @@ /area/redgate/city/cards) "pcD" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /turf/simulated/floor/tiled/white, /area/redgate/city/science) "pcG" = ( @@ -11541,24 +11541,24 @@ /area/redgate/city/conveyors) "pdm" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco, -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco, -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco, -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco, -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco, -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco, +/obj/item/storage/fancy/cigarettes/dromedaryco, +/obj/item/storage/fancy/cigarettes/dromedaryco, +/obj/item/storage/fancy/cigarettes/dromedaryco, +/obj/item/storage/fancy/cigarettes/dromedaryco, +/obj/item/storage/fancy/cigarettes/dromedaryco, +/obj/item/storage/fancy/cigarettes/dromedaryco, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/city/offlicense) "pdK" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/snacks/ratpackburger, -/obj/item/weapon/reagent_containers/food/snacks/ratpackburger, -/obj/item/weapon/reagent_containers/food/snacks/ratpackburger, +/obj/item/reagent_containers/food/snacks/ratpackburger, +/obj/item/reagent_containers/food/snacks/ratpackburger, +/obj/item/reagent_containers/food/snacks/ratpackburger, /turf/simulated/floor/tiled/neutral, /area/redgate/city/altevian) "pdR" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/wood, /area/redgate/city/laundry) "pdY" = ( @@ -11589,7 +11589,7 @@ "pfT" = ( /obj/structure/closet, /obj/random/contraband, -/obj/item/weapon/storage/secure/briefcase/money, +/obj/item/storage/secure/briefcase/money, /obj/random/forgotten_tram, /turf/simulated/floor/wood/alt, /area/redgate/city/offlicense) @@ -11629,7 +11629,7 @@ /obj/machinery/light/floortube{ dir = 8; light_color = "#ff8086"; - light_type = /obj/item/weapon/light/bulb/red; + light_type = /obj/item/light/bulb/red; name = "stripper light" }, /turf/simulated/floor/carpet/gaycarpet, @@ -11692,7 +11692,7 @@ /area/redgate/city/chopshop) "ple" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /turf/simulated/floor/tiled/white, /area/redgate/city/hospital) "plq" = ( @@ -11756,7 +11756,7 @@ /area/redgate/city/pool) "psl" = ( /obj/structure/table/fancyblack, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/carpet/blue, /area/redgate/city/house4) "psB" = ( @@ -11805,7 +11805,7 @@ "puH" = ( /obj/structure/window/reinforced, /obj/structure/table/rack/gun_rack/steel, -/obj/item/weapon/gun/projectile/shotgun/doublebarrel/flare, +/obj/item/gun/projectile/shotgun/doublebarrel/flare, /turf/simulated/floor/tiled/milspec, /area/redgate/city/police) "pvu" = ( @@ -11866,7 +11866,7 @@ /turf/simulated/floor/tiled/neutral, /area/redgate/city/house14) "pAl" = ( -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/wood, /area/redgate/city/house15) "pAF" = ( @@ -11902,7 +11902,7 @@ /area/redgate/city/toys) "pCC" = ( /obj/structure/table/alien/blue, -/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, /turf/simulated/floor/tiled/kafel_full/green, /area/redgate/city/lasertag) "pCI" = ( @@ -11973,7 +11973,7 @@ /area/redgate/city/laundry) "pGW" = ( /obj/structure/table/alien, -/obj/item/weapon/aliencoin/phoron, +/obj/item/aliencoin/phoron, /turf/simulated/floor/wood/sif, /area/redgate/city/succ) "pGZ" = ( @@ -12005,12 +12005,12 @@ /area/redgate/city/house6) "pIU" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew, -/obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew, -/obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew, -/obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew, -/obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew, -/obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew, +/obj/item/reagent_containers/food/drinks/bottle/redeemersbrew, +/obj/item/reagent_containers/food/drinks/bottle/redeemersbrew, +/obj/item/reagent_containers/food/drinks/bottle/redeemersbrew, +/obj/item/reagent_containers/food/drinks/bottle/redeemersbrew, +/obj/item/reagent_containers/food/drinks/bottle/redeemersbrew, +/obj/item/reagent_containers/food/drinks/bottle/redeemersbrew, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/city/offlicense) "pKp" = ( @@ -12020,10 +12020,10 @@ "pKK" = ( /obj/structure/table/standard, /obj/structure/window/basic, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -12065,7 +12065,7 @@ /obj/machinery/light/floortube{ dir = 8; light_color = "#ff8086"; - light_type = /obj/item/weapon/light/bulb/red; + light_type = /obj/item/light/bulb/red; name = "stripper light" }, /turf/simulated/floor/carpet/purcarpet, @@ -12079,8 +12079,8 @@ /area/redgate/city/house1) "pNn" = ( /obj/structure/table/fancyblack, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fountain6, +/obj/item/paper_bin, +/obj/item/pen/fountain6, /turf/simulated/floor/carpet/bcarpet, /area/redgate/city/bar1) "pNA" = ( @@ -12156,7 +12156,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/item/weapon/surgical/hemostat, +/obj/item/surgical/hemostat, /turf/simulated/floor/dungeon, /area/redgate/city/doctor) "pRq" = ( @@ -12207,12 +12207,12 @@ /area/redgate/city/police) "pVc" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, /turf/simulated/floor/tiled/kafel_full/blue, /area/redgate/city/pizza) "pVH" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/piratedouble, +/obj/item/bedsheet/piratedouble, /turf/simulated/floor/carpet/geo, /area/redgate/city/house18) "pVJ" = ( @@ -12234,10 +12234,10 @@ /area/redgate/city/house4) "pWC" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/pocky, -/obj/item/weapon/storage/box/pocky, -/obj/item/weapon/storage/box/pocky, -/obj/item/weapon/storage/box/pocky, +/obj/item/storage/box/pocky, +/obj/item/storage/box/pocky, +/obj/item/storage/box/pocky, +/obj/item/storage/box/pocky, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "pWU" = ( @@ -12275,9 +12275,9 @@ /area/redgate/city/house5) "qaH" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/freezer, -/obj/item/weapon/storage/box/freezer, -/obj/item/weapon/storage/box/freezer, +/obj/item/storage/box/freezer, +/obj/item/storage/box/freezer, +/obj/item/storage/box/freezer, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "qaR" = ( @@ -12372,7 +12372,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/city/pool) "qfB" = ( -/obj/item/weapon/broken_bottle, +/obj/item/broken_bottle, /turf/simulated/floor/wood/alt/tile, /area/redgate/city/bar2) "qfY" = ( @@ -12452,7 +12452,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, /turf/simulated/floor/wood/alt, @@ -12464,7 +12464,7 @@ /turf/simulated/floor/concrete, /area/redgate/city/shooting) "qlB" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/wood/alt/tile, @@ -12500,7 +12500,7 @@ "qmM" = ( /obj/structure/table/reinforced, /obj/random/maintenance/engineering, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/redgate/city/engine) "qnY" = ( @@ -12610,7 +12610,7 @@ /area/redgate/city/house3) "quX" = ( /obj/structure/table/gamblingtable, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/carpet/purple, /area/redgate/city/casino) "qvg" = ( @@ -12619,7 +12619,7 @@ /area/redgate/city/supermarket) "qvr" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 6 }, @@ -12642,10 +12642,10 @@ /area/redgate/city/bar1) "qxx" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -12666,27 +12666,27 @@ /obj/structure/closet/walllocker{ pixel_y = 33 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, /turf/simulated/floor/wood/alt, /area/redgate/city/stripclub) "qzT" = ( @@ -12703,16 +12703,16 @@ /area/redgate/city/apartments) "qBt" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/random/action_figure, /turf/simulated/floor/carpet, /area/redgate/city/house15) "qBE" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/drinks/cans/baconsoda, -/obj/item/weapon/reagent_containers/food/drinks/cans/baconsoda, -/obj/item/weapon/reagent_containers/food/drinks/cans/baconsoda, -/obj/item/weapon/reagent_containers/food/drinks/cans/baconsoda, +/obj/item/reagent_containers/food/drinks/cans/baconsoda, +/obj/item/reagent_containers/food/drinks/cans/baconsoda, +/obj/item/reagent_containers/food/drinks/cans/baconsoda, +/obj/item/reagent_containers/food/drinks/cans/baconsoda, /obj/machinery/light{ dir = 8; light_color = "#575656"; @@ -12739,7 +12739,7 @@ /turf/simulated/floor/tiled, /area/redgate/city/police) "qCR" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood/alt, /area/redgate/city/restaurant) "qCT" = ( @@ -12750,7 +12750,7 @@ /area/redgate/city/hotel) "qCV" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/wood/alt, /area/redgate/city/teppi) "qDU" = ( @@ -12762,9 +12762,9 @@ /area/redgate/city/science) "qDV" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/condiment/ketchup, -/obj/item/weapon/reagent_containers/food/condiment/ketchup, -/obj/item/weapon/reagent_containers/food/condiment/ketchup, +/obj/item/reagent_containers/food/condiment/ketchup, +/obj/item/reagent_containers/food/condiment/ketchup, +/obj/item/reagent_containers/food/condiment/ketchup, /obj/machinery/light{ dir = 1 }, @@ -12923,7 +12923,7 @@ /area/redgate/city/waterworks) "qOv" = ( /obj/structure/table/glass, -/obj/item/device/nif/bad{ +/obj/item/nif/bad{ name = "display model NIF" }, /obj/machinery/light{ @@ -12933,7 +12933,7 @@ /area/redgate/city/nifshop) "qOA" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/wood, /area/redgate/city/apartments) "qOG" = ( @@ -13000,7 +13000,7 @@ /turf/simulated/floor/wood/sif, /area/redgate/city/succ) "qQU" = ( -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/carpet/blue, /area/redgate/city/house16) "qSg" = ( @@ -13068,7 +13068,7 @@ /area/redgate/city/restaurant) "qYM" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /turf/simulated/floor/wood, /area/redgate/city/apartments) "qYT" = ( @@ -13094,7 +13094,7 @@ /turf/simulated/wall/tgmc/darkwall, /area/redgate/city/house2) "rbd" = ( -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/wood, /area/redgate/city/house18) "rbl" = ( @@ -13110,7 +13110,7 @@ /area/redgate/city/streets) "rbP" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/light{ dir = 1 }, @@ -13160,7 +13160,7 @@ dir = 1 }, /obj/structure/table/woodentable, -/obj/item/weapon/gun/energy/taser/disabler, +/obj/item/gun/energy/taser/disabler, /turf/simulated/floor/wood/alt/panel, /area/redgate/city/shooting) "ris" = ( @@ -13175,7 +13175,7 @@ /area/redgate/city/stripclub) "rkV" = ( /obj/structure/table/rack/gun_rack/steel, -/obj/item/weapon/gun/energy/sickshot, +/obj/item/gun/energy/sickshot, /obj/machinery/light/small{ dir = 8 }, @@ -13224,11 +13224,11 @@ /area/redgate/city/shooting) "rne" = ( /obj/structure/closet, -/obj/item/weapon/storage/box/casino/costume_wizard, +/obj/item/storage/box/casino/costume_wizard, /turf/simulated/floor/tiled/eris/derelict3, /area/redgate/city/wiz) "rni" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood/alt/tile, /area/redgate/city/gamblingden) "rno" = ( @@ -13296,17 +13296,17 @@ /obj/structure/closet{ name = "prize closet" }, -/obj/item/weapon/grenade/spawnergrenade/casino/chicken, -/obj/item/weapon/grenade/spawnergrenade/casino, -/obj/item/weapon/grenade/spawnergrenade/casino/corgi, -/obj/item/weapon/grenade/spawnergrenade/casino/cow, -/obj/item/weapon/grenade/spawnergrenade/casino/fennec, -/obj/item/weapon/grenade/spawnergrenade/casino/fox, -/obj/item/weapon/grenade/spawnergrenade/casino/goldcrest, -/obj/item/weapon/grenade/spawnergrenade/casino/otie, -/obj/item/weapon/grenade/spawnergrenade/casino/penguin, -/obj/item/weapon/grenade/spawnergrenade/casino/redpanda, -/obj/item/weapon/grenade/spawnergrenade/casino/snake, +/obj/item/grenade/spawnergrenade/casino/chicken, +/obj/item/grenade/spawnergrenade/casino, +/obj/item/grenade/spawnergrenade/casino/corgi, +/obj/item/grenade/spawnergrenade/casino/cow, +/obj/item/grenade/spawnergrenade/casino/fennec, +/obj/item/grenade/spawnergrenade/casino/fox, +/obj/item/grenade/spawnergrenade/casino/goldcrest, +/obj/item/grenade/spawnergrenade/casino/otie, +/obj/item/grenade/spawnergrenade/casino/penguin, +/obj/item/grenade/spawnergrenade/casino/redpanda, +/obj/item/grenade/spawnergrenade/casino/snake, /turf/simulated/floor/tiled/yellow, /area/redgate/city/casino) "rsi" = ( @@ -13331,14 +13331,14 @@ /obj/structure/closet/walllocker{ pixel_y = 33 }, -/obj/item/weapon/deck/wizoff, -/obj/item/weapon/deck/wizoff, -/obj/item/weapon/deck/wizoff, -/obj/item/weapon/deck/wizoff, -/obj/item/weapon/deck/wizoff, -/obj/item/weapon/deck/wizoff, -/obj/item/weapon/deck/wizoff, -/obj/item/weapon/deck/wizoff, +/obj/item/deck/wizoff, +/obj/item/deck/wizoff, +/obj/item/deck/wizoff, +/obj/item/deck/wizoff, +/obj/item/deck/wizoff, +/obj/item/deck/wizoff, +/obj/item/deck/wizoff, +/obj/item/deck/wizoff, /turf/simulated/shuttle/floor/white, /area/redgate/city/cards) "ruI" = ( @@ -13429,11 +13429,11 @@ /area/redgate/city/shooting) "ryX" = ( /obj/structure/closet, -/obj/item/weapon/bone/skull, -/obj/item/weapon/bone/skull/tajaran, -/obj/item/weapon/bone/skull/unathi, -/obj/item/weapon/bone/skull/unknown, -/obj/item/weapon/reagent_containers/spray/waterflower, +/obj/item/bone/skull, +/obj/item/bone/skull/tajaran, +/obj/item/bone/skull/unathi, +/obj/item/bone/skull/unknown, +/obj/item/reagent_containers/spray/waterflower, /obj/random/maintenance, /turf/simulated/floor/wood, /area/redgate/city/tarot) @@ -13455,11 +13455,11 @@ /area/redgate/city/cardmon) "rBx" = ( /obj/structure/table/standard, -/obj/item/device/camera_film{ +/obj/item/camera_film{ pixel_x = 4; pixel_y = 11 }, -/obj/item/device/camera_film{ +/obj/item/camera_film{ pixel_x = -3; pixel_y = 4 }, @@ -13807,17 +13807,17 @@ /area/redgate/city/hotel) "scK" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hosdouble, +/obj/item/bedsheet/hosdouble, /turf/simulated/floor/carpet/brown, /area/redgate/city/hotel) "scP" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/fancy/cigarettes/jerichos, -/obj/item/weapon/storage/fancy/cigarettes/jerichos, -/obj/item/weapon/storage/fancy/cigarettes/jerichos, -/obj/item/weapon/storage/fancy/cigarettes/jerichos, -/obj/item/weapon/storage/fancy/cigarettes/jerichos, -/obj/item/weapon/storage/fancy/cigarettes/jerichos, +/obj/item/storage/fancy/cigarettes/jerichos, +/obj/item/storage/fancy/cigarettes/jerichos, +/obj/item/storage/fancy/cigarettes/jerichos, +/obj/item/storage/fancy/cigarettes/jerichos, +/obj/item/storage/fancy/cigarettes/jerichos, +/obj/item/storage/fancy/cigarettes/jerichos, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/city/offlicense) "scY" = ( @@ -13902,8 +13902,8 @@ /area/redgate/city/house15) "siU" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fountain8, +/obj/item/paper_bin, +/obj/item/pen/fountain8, /obj/machinery/light_switch{ pixel_y = 25 }, @@ -14087,19 +14087,19 @@ /area/redgate/city/drugden) "sst" = ( /obj/structure/closet/secure_closet/medical3, -/obj/item/device/glasses_kit, -/obj/item/weapon/storage/box/bloodpacks, -/obj/item/weapon/storage/box/autoinjectors, +/obj/item/glasses_kit, +/obj/item/storage/box/bloodpacks, +/obj/item/storage/box/autoinjectors, /turf/simulated/floor/tiled/white, /area/redgate/city/hospital) "ssv" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/fancy/cigarettes/professionals, -/obj/item/weapon/storage/fancy/cigarettes/professionals, -/obj/item/weapon/storage/fancy/cigarettes/professionals, -/obj/item/weapon/storage/fancy/cigarettes/professionals, -/obj/item/weapon/storage/fancy/cigarettes/professionals, -/obj/item/weapon/storage/fancy/cigarettes/professionals, +/obj/item/storage/fancy/cigarettes/professionals, +/obj/item/storage/fancy/cigarettes/professionals, +/obj/item/storage/fancy/cigarettes/professionals, +/obj/item/storage/fancy/cigarettes/professionals, +/obj/item/storage/fancy/cigarettes/professionals, +/obj/item/storage/fancy/cigarettes/professionals, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/city/offlicense) "ssJ" = ( @@ -14110,11 +14110,11 @@ /area/redgate/city/hotel) "stU" = ( /obj/structure/table/standard, -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/tiled/white, /area/redgate/city/house17) "suq" = ( -/obj/item/weapon/reagent_containers/food/snacks/old/hotdog, +/obj/item/reagent_containers/food/snacks/old/hotdog, /turf/simulated/floor/wood/alt/panel, /area/redgate/city/rats) "suC" = ( @@ -14230,9 +14230,9 @@ /area/redgate/city/offlicense) "szC" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/wormcan, -/obj/item/weapon/storage/box/wormcan, -/obj/item/weapon/storage/box/wormcan, +/obj/item/storage/box/wormcan, +/obj/item/storage/box/wormcan, +/obj/item/storage/box/wormcan, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "szL" = ( @@ -14293,9 +14293,9 @@ /area/redgate/city/streets) "sFj" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/nonfiction/riseandfallofpersianempire, -/obj/item/weapon/book/bundle/custom_library/nonfiction/skrelliancastesystem, -/obj/item/weapon/book/bundle/custom_library/nonfiction/viabilityofcorporategov, +/obj/item/book/bundle/custom_library/nonfiction/riseandfallofpersianempire, +/obj/item/book/bundle/custom_library/nonfiction/skrelliancastesystem, +/obj/item/book/bundle/custom_library/nonfiction/viabilityofcorporategov, /turf/simulated/floor/wood, /area/redgate/city/library) "sFv" = ( @@ -14304,9 +14304,9 @@ /area/redgate/city/workshop) "sGs" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/gum, -/obj/item/weapon/storage/box/gum, -/obj/item/weapon/storage/box/gum, +/obj/item/storage/box/gum, +/obj/item/storage/box/gum, +/obj/item/storage/box/gum, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "sGF" = ( @@ -14425,8 +14425,8 @@ /area/redgate/city/house15) "sOv" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/gloves, +/obj/item/storage/box/gloves, /obj/random/maintenance/medical, /turf/simulated/floor/tiled/white, /area/redgate/city/hospital) @@ -14493,7 +14493,7 @@ /area/redgate/city/house7) "sVe" = ( /obj/structure/table/steel, -/obj/item/device/integrated_circuit_printer, +/obj/item/integrated_circuit_printer, /turf/simulated/floor/tiled/dark, /area/redgate/city/workshop) "sVm" = ( @@ -14639,52 +14639,52 @@ /area/redgate/city/library) "tcH" = ( /obj/structure/safe/floor, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c20, -/obj/item/weapon/spacecasinocash/c20, -/obj/item/weapon/spacecasinocash/c20, -/obj/item/weapon/spacecasinocash/c20, -/obj/item/weapon/spacecasinocash/c20, -/obj/item/weapon/spacecasinocash/c200, -/obj/item/weapon/spacecasinocash/c200, -/obj/item/weapon/spacecasinocash/c200, -/obj/item/weapon/spacecasinocash/c200, -/obj/item/weapon/spacecasinocash/c200, -/obj/item/weapon/spacecasinocash/c200, -/obj/item/weapon/spacecasinocash/c50, -/obj/item/weapon/spacecasinocash/c50, -/obj/item/weapon/spacecasinocash/c50, -/obj/item/weapon/spacecasinocash/c50, -/obj/item/weapon/casino_platinum_chip, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c20, +/obj/item/spacecasinocash/c20, +/obj/item/spacecasinocash/c20, +/obj/item/spacecasinocash/c20, +/obj/item/spacecasinocash/c20, +/obj/item/spacecasinocash/c200, +/obj/item/spacecasinocash/c200, +/obj/item/spacecasinocash/c200, +/obj/item/spacecasinocash/c200, +/obj/item/spacecasinocash/c200, +/obj/item/spacecasinocash/c200, +/obj/item/spacecasinocash/c50, +/obj/item/spacecasinocash/c50, +/obj/item/spacecasinocash/c50, +/obj/item/spacecasinocash/c50, +/obj/item/casino_platinum_chip, /obj/random/cash/big, /obj/random/maintenance/morestuff, /obj/item/roulette_ball/cheat/black, @@ -14705,14 +14705,14 @@ /turf/simulated/floor/tiled/neutral, /area/redgate/city/house12) "tdw" = ( -/obj/item/weapon/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/food/drinks/shaker{ pixel_x = -7; pixel_y = 11 }, /turf/simulated/floor/wood/alt/tile, /area/redgate/city/bar2) "tdM" = ( -/obj/item/weapon/broken_bottle, +/obj/item/broken_bottle, /turf/simulated/floor/carpet/brown, /area/redgate/city/hotel) "ten" = ( @@ -14773,7 +14773,7 @@ /area/redgate/city/pool) "tkS" = ( /obj/structure/table/woodentable, -/obj/item/weapon/tape_roll, +/obj/item/tape_roll, /turf/simulated/floor/carpet/brown, /area/redgate/city/hotel) "tkZ" = ( @@ -14848,7 +14848,7 @@ /turf/simulated/floor/wood/alt/tile, /area/redgate/city/gamblingden) "tpU" = ( -/obj/item/weapon/storage/box/donkpockets/pizza, +/obj/item/storage/box/donkpockets/pizza, /turf/simulated/floor/wood/alt/panel, /area/redgate/city/rats) "tpX" = ( @@ -14926,7 +14926,7 @@ /area/redgate/city/wiz) "tub" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/item/clothing/glasses/regular, /turf/simulated/floor/carpet/green, /area/redgate/city/house17) @@ -14986,7 +14986,7 @@ /area/redgate/city/house16) "tyl" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/oldpizza, +/obj/item/reagent_containers/food/snacks/sliceable/pizza/oldpizza, /turf/simulated/floor/wood/alt/panel, /area/redgate/city/rats) "tyH" = ( @@ -14994,13 +14994,13 @@ color = "#8da4a6"; pixel_x = -5 }, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, /obj/random/mug, /obj/random/mug, /obj/random/mug, @@ -15078,10 +15078,10 @@ /area/redgate/city/rats) "tDL" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -15097,18 +15097,18 @@ }, /obj/item/clothing/accessory/collar/casinosentientprize_fake, /obj/item/clothing/accessory/medal/gold/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice_nerd, /turf/simulated/floor/wood/alt/tile, /area/redgate/city/gamblingden) "tEB" = ( -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled/neutral, /area/redgate/city/house13) "tFX" = ( @@ -15124,12 +15124,12 @@ /area/redgate/city/house18) "tGw" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor, -/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor, -/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor, -/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor, -/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor, -/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor, +/obj/item/reagent_containers/food/drinks/bottle/melonliquor, +/obj/item/reagent_containers/food/drinks/bottle/melonliquor, +/obj/item/reagent_containers/food/drinks/bottle/melonliquor, +/obj/item/reagent_containers/food/drinks/bottle/melonliquor, +/obj/item/reagent_containers/food/drinks/bottle/melonliquor, +/obj/item/reagent_containers/food/drinks/bottle/melonliquor, /obj/machinery/light{ dir = 8 }, @@ -15141,12 +15141,12 @@ /area/redgate/city/chopshop) "tGz" = ( /obj/structure/table/standard, -/obj/item/weapon/paper, +/obj/item/paper, /turf/simulated/floor/tiled/white, /area/redgate/city/science) "tGJ" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/roulette_balls_fancy, +/obj/item/storage/box/roulette_balls_fancy, /turf/simulated/floor/tiled/yellow, /area/redgate/city/casino) "tHt" = ( @@ -15209,7 +15209,7 @@ /obj/item/clothing/mask/pig, /obj/random/tank, /obj/structure/closet/cabinet, -/obj/item/weapon/moneybag, +/obj/item/moneybag, /turf/simulated/floor/carpet/geo, /area/redgate/city/house18) "tKE" = ( @@ -15301,14 +15301,14 @@ /area/redgate/city/science) "tSf" = ( /obj/structure/table/darkglass, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/food/drinks/shaker, /turf/simulated/floor/tiled/eris/steel/techfloor_grid, /area/redgate/city/bar1) "tSF" = ( /turf/simulated/wall/tgmc/darkwall, /area/redgate/city/house9) "tTJ" = ( -/obj/item/weapon/inflatable_duck, +/obj/item/inflatable_duck, /turf/simulated/floor/water/deep/indoors, /area/redgate/city/pool) "tUh" = ( @@ -15503,11 +15503,11 @@ /area/redgate/city/house16) "ujz" = ( /obj/structure/table/rack, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -1; pixel_y = -3 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 2 }, /turf/simulated/floor/tiled/eris/white/bluecorner, @@ -15528,7 +15528,7 @@ /turf/simulated/floor/dungeon, /area/redgate/city/scughouse) "uky" = ( -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled/neutral, /area/redgate/city/house17) "ulB" = ( @@ -15593,9 +15593,9 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 5 }, -/obj/item/weapon/storage/pill_bottle/iron, -/obj/item/weapon/storage/pill_bottle/iron, -/obj/item/weapon/storage/pill_bottle/iron, +/obj/item/storage/pill_bottle/iron, +/obj/item/storage/pill_bottle/iron, +/obj/item/storage/pill_bottle/iron, /obj/machinery/light{ dir = 4 }, @@ -15633,7 +15633,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/city/hospital) "uui" = ( -/obj/item/weapon/towel/random, +/obj/item/towel/random, /obj/machinery/light_switch{ pixel_y = 24 }, @@ -15654,7 +15654,7 @@ /area/redgate/city/hospital) "uwj" = ( /obj/structure/table/glass, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/machinery/light{ dir = 4 }, @@ -15662,11 +15662,11 @@ /area/redgate/city/hospital) "uwE" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua, -/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua, -/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua, -/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua, -/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua, +/obj/item/reagent_containers/food/drinks/bottle/kahlua, +/obj/item/reagent_containers/food/drinks/bottle/kahlua, +/obj/item/reagent_containers/food/drinks/bottle/kahlua, +/obj/item/reagent_containers/food/drinks/bottle/kahlua, +/obj/item/reagent_containers/food/drinks/bottle/kahlua, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/city/offlicense) "uxg" = ( @@ -15682,19 +15682,19 @@ /turf/simulated/floor/outdoors/sidewalk/slab/city, /area/redgate/city/streets) "uxt" = ( -/obj/item/weapon/storage/laundry_basket{ +/obj/item/storage/laundry_basket{ name = "shopping basket" }, -/obj/item/weapon/storage/laundry_basket{ +/obj/item/storage/laundry_basket{ name = "shopping basket" }, -/obj/item/weapon/storage/laundry_basket{ +/obj/item/storage/laundry_basket{ name = "shopping basket" }, -/obj/item/weapon/storage/laundry_basket{ +/obj/item/storage/laundry_basket{ name = "shopping basket" }, -/obj/item/weapon/storage/laundry_basket{ +/obj/item/storage/laundry_basket{ name = "shopping basket" }, /turf/simulated/floor/tiled/white, @@ -15769,10 +15769,10 @@ /area/redgate/city/gallery) "uDr" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/drinks/cans/alecan, -/obj/item/weapon/reagent_containers/food/drinks/cans/alecan, -/obj/item/weapon/reagent_containers/food/drinks/cans/alecan, -/obj/item/weapon/reagent_containers/food/drinks/cans/alecan, +/obj/item/reagent_containers/food/drinks/cans/alecan, +/obj/item/reagent_containers/food/drinks/cans/alecan, +/obj/item/reagent_containers/food/drinks/cans/alecan, +/obj/item/reagent_containers/food/drinks/cans/alecan, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "uDH" = ( @@ -15782,7 +15782,7 @@ /turf/simulated/floor/tiled/eris/bcircuit, /area/redgate/city/nifshop) "uDL" = ( -/obj/item/weapon/towel/random, +/obj/item/towel/random, /obj/machinery/light_switch{ dir = 8; pixel_x = 24; @@ -15824,12 +15824,12 @@ /obj/structure/closet{ name = "prize closet" }, -/obj/item/weapon/storage/box/casino/costume_commie, -/obj/item/weapon/storage/box/casino/costume_cowboy, -/obj/item/weapon/storage/box/casino/costume_marine, -/obj/item/weapon/storage/box/casino/costume_pirate, -/obj/item/weapon/storage/box/casino/costume_plaguedoctor, -/obj/item/weapon/storage/box/casino/costume_wizard, +/obj/item/storage/box/casino/costume_commie, +/obj/item/storage/box/casino/costume_cowboy, +/obj/item/storage/box/casino/costume_marine, +/obj/item/storage/box/casino/costume_pirate, +/obj/item/storage/box/casino/costume_plaguedoctor, +/obj/item/storage/box/casino/costume_wizard, /turf/simulated/floor/tiled/yellow, /area/redgate/city/casino) "uGR" = ( @@ -15879,7 +15879,7 @@ /area/redgate/city/gallery) "uHF" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/random/tool/power, /obj/machinery/light/small, /turf/simulated/floor/tiled/milspec, @@ -15892,9 +15892,9 @@ /area/redgate/city/pool) "uIN" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/raissue147, -/obj/item/weapon/book/bundle/custom_library/fiction/silence, -/obj/item/weapon/book/bundle/custom_library/fiction/taleoftherainbowcat, +/obj/item/book/bundle/custom_library/fiction/raissue147, +/obj/item/book/bundle/custom_library/fiction/silence, +/obj/item/book/bundle/custom_library/fiction/taleoftherainbowcat, /turf/simulated/floor/wood, /area/redgate/city/library) "uJn" = ( @@ -15914,8 +15914,8 @@ /area/redgate/city/house13) "uKe" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, +/obj/item/paper_bin, +/obj/item/pen/blue, /turf/simulated/floor/tiled, /area/redgate/city/police) "uLj" = ( @@ -15943,7 +15943,7 @@ /turf/simulated/floor/wood/alt/parquet, /area/redgate/city/chopshop) "uMt" = ( -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/meteor, +/obj/item/reagent_containers/food/drinks/bottle/small/beer/meteor, /turf/simulated/floor/carpet/brown, /area/redgate/city/hotel) "uMU" = ( @@ -16008,7 +16008,7 @@ /turf/simulated/floor/carpet/retro, /area/redgate/city/toys) "uPK" = ( -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, /turf/simulated/floor/wood/alt/tile, /area/redgate/city/fightclub) "uQh" = ( @@ -16067,7 +16067,7 @@ dir = 1 }, /obj/structure/table/rack/gun_rack/steel, -/obj/item/weapon/soap/golden_soap, +/obj/item/soap/golden_soap, /turf/simulated/floor/tiled/techfloor, /area/redgate/city/casino) "uUa" = ( @@ -16126,20 +16126,20 @@ color = "#8da4a6"; pixel_x = -5 }, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, /turf/simulated/floor/wood/alt, @@ -16286,7 +16286,7 @@ pixel_x = -4; pixel_y = 5 }, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /turf/simulated/floor/tiled/white, /area/redgate/city/hospital) "vfl" = ( @@ -16337,7 +16337,7 @@ /area/redgate/city/stripclub) "vii" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/machinery/light_switch{ dir = 8; pixel_x = 26; @@ -16360,11 +16360,11 @@ /area/redgate/city/house1) "vko" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, -/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, -/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, -/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, -/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, +/obj/item/reagent_containers/food/snacks/candy/proteinbar, +/obj/item/reagent_containers/food/snacks/candy/proteinbar, +/obj/item/reagent_containers/food/snacks/candy/proteinbar, +/obj/item/reagent_containers/food/snacks/candy/proteinbar, +/obj/item/reagent_containers/food/snacks/candy/proteinbar, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "vkJ" = ( @@ -16376,15 +16376,15 @@ /area/redgate/city/clotheshop) "vlx" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/flame/lighter/zippo/skull, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/flame/lighter/zippo/capitalist, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/flame/lighter/zippo, +/obj/item/flame/lighter/zippo, +/obj/item/flame/lighter/zippo, +/obj/item/flame/lighter/zippo, +/obj/item/flame/lighter/zippo/skull, +/obj/item/flame/lighter/zippo, +/obj/item/flame/lighter/zippo, +/obj/item/flame/lighter/zippo/capitalist, +/obj/item/flame/lighter/zippo, +/obj/item/flame/lighter/zippo, /obj/machinery/light{ dir = 1 }, @@ -16392,11 +16392,11 @@ /area/redgate/city/offlicense) "vlR" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea, -/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea, -/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea, -/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea, -/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea, +/obj/item/reagent_containers/food/drinks/cans/iced_tea, +/obj/item/reagent_containers/food/drinks/cans/iced_tea, +/obj/item/reagent_containers/food/drinks/cans/iced_tea, +/obj/item/reagent_containers/food/drinks/cans/iced_tea, +/obj/item/reagent_containers/food/drinks/cans/iced_tea, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "vmc" = ( @@ -16427,7 +16427,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/city/hospital) "vnD" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/dark, /area/redgate/city/workshop) "vob" = ( @@ -16451,7 +16451,7 @@ /obj/machinery/light/floortube{ dir = 4; light_color = "#ff8086"; - light_type = /obj/item/weapon/light/bulb/red; + light_type = /obj/item/light/bulb/red; name = "stripper light" }, /turf/simulated/floor/carpet/purcarpet, @@ -16462,7 +16462,7 @@ /area/redgate/city/crates) "voC" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/lights, +/obj/item/storage/box/lights, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "voK" = ( @@ -16721,7 +16721,7 @@ /turf/simulated/floor/tiled/eris/cafe, /area/redgate/city/gym) "vIp" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /obj/machinery/light{ @@ -16743,29 +16743,29 @@ name = "kitchen cupboard"; pixel_y = -30 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, /turf/simulated/floor/wood/alt/tile, /area/redgate/city/gamblingden) "vJx" = ( @@ -16876,9 +16876,9 @@ /area/redgate/city/hospital) "vXn" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/coldmountain, -/obj/item/weapon/book/bundle/custom_library/fiction/ghostship, -/obj/item/weapon/book/bundle/custom_library/fiction/manfromsnowyriver, +/obj/item/book/bundle/custom_library/fiction/coldmountain, +/obj/item/book/bundle/custom_library/fiction/ghostship, +/obj/item/book/bundle/custom_library/fiction/manfromsnowyriver, /turf/simulated/floor/wood, /area/redgate/city/library) "vXV" = ( @@ -16949,7 +16949,7 @@ /area/redgate/city/stripclub) "waR" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza, +/obj/item/reagent_containers/food/snacks/slice/vegetablepizza, /turf/simulated/floor/wood/alt, /area/redgate/city/pizza) "wbr" = ( @@ -17021,7 +17021,7 @@ "wgO" = ( /obj/structure/table/woodentable, /obj/item/stack/cable_coil, -/obj/item/weapon/newspaper, +/obj/item/newspaper, /turf/simulated/floor/carpet/brown, /area/redgate/city/hotel) "whs" = ( @@ -17104,7 +17104,7 @@ /area/redgate/city/crates) "wma" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/buns, +/obj/item/storage/box/buns, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "wml" = ( @@ -17151,7 +17151,7 @@ /area/redgate/city/dodgypharmacy) "wpm" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/rd, +/obj/item/bedsheet/rd, /turf/simulated/floor/carpet/retro_red, /area/redgate/city/house11) "wpA" = ( @@ -17160,7 +17160,7 @@ /area/redgate/city/clotheshop) "wpE" = ( /obj/structure/table/woodentable, -/obj/item/device/retail_scanner/civilian, +/obj/item/retail_scanner/civilian, /turf/simulated/floor/wood/alt, /area/redgate/city/restaurant) "wpN" = ( @@ -17318,7 +17318,7 @@ /obj/item/clothing/shoes/heels, /obj/random/maintenance/medical, /obj/random/maintenance/medical, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /obj/structure/closet/cabinet, /turf/simulated/floor/carpet/purple, /area/redgate/city/house2) @@ -17348,7 +17348,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/city/pool) "wET" = ( -/obj/item/weapon/bedsheet/cosmos, +/obj/item/bedsheet/cosmos, /obj/structure/bed/padded, /turf/simulated/floor/wood/sif, /area/redgate/city/succ) @@ -17400,7 +17400,7 @@ /area/redgate/city/chopshop) "wIE" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; @@ -17455,8 +17455,8 @@ /area/redgate/city/corporation) "wLD" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, /turf/simulated/floor/tiled/milspec, /area/redgate/city/ripper) "wMk" = ( @@ -17471,7 +17471,7 @@ dir = 5 }, /obj/structure/closet, -/obj/item/weapon/melee/classic_baton, +/obj/item/melee/classic_baton, /turf/simulated/floor/tiled/steel_dirty, /area/redgate/city/dodgypharmacy) "wMY" = ( @@ -17493,11 +17493,11 @@ /area/redgate/city/dealership) "wOo" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/food/drinks/cans/boda, -/obj/item/weapon/reagent_containers/food/drinks/cans/boda, -/obj/item/weapon/reagent_containers/food/drinks/cans/boda, -/obj/item/weapon/reagent_containers/food/drinks/cans/boda, -/obj/item/weapon/reagent_containers/food/drinks/cans/boda, +/obj/item/reagent_containers/food/drinks/cans/boda, +/obj/item/reagent_containers/food/drinks/cans/boda, +/obj/item/reagent_containers/food/drinks/cans/boda, +/obj/item/reagent_containers/food/drinks/cans/boda, +/obj/item/reagent_containers/food/drinks/cans/boda, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) "wOJ" = ( @@ -17531,7 +17531,7 @@ /area/redgate/city/waterworks) "wRp" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/light, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/city/supermarket) @@ -17577,9 +17577,9 @@ /area/redgate/city/house13) "wUr" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/snacks/ratpackturkey, -/obj/item/weapon/reagent_containers/food/snacks/ratpackturkey, -/obj/item/weapon/reagent_containers/food/snacks/ratpackturkey, +/obj/item/reagent_containers/food/snacks/ratpackturkey, +/obj/item/reagent_containers/food/snacks/ratpackturkey, +/obj/item/reagent_containers/food/snacks/ratpackturkey, /turf/simulated/floor/tiled/neutral, /area/redgate/city/altevian) "wUP" = ( @@ -17636,7 +17636,7 @@ /obj/machinery/door/window/eastright{ dir = 8 }, -/obj/item/weapon/book/manual/casino, +/obj/item/book/manual/casino, /turf/simulated/floor/tiled/yellow, /area/redgate/city/casino) "wXV" = ( @@ -17715,13 +17715,13 @@ /area/redgate/city/science) "xeZ" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fountain8, +/obj/item/paper_bin, +/obj/item/pen/fountain8, /turf/simulated/floor/carpet/blue, /area/redgate/city/house16) "xfo" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, /turf/simulated/floor/wood, /area/redgate/city/house4) "xfB" = ( @@ -17878,12 +17878,12 @@ /area/redgate/city/house18) "xrc" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/city/offlicense) "xsl" = ( @@ -17910,9 +17910,9 @@ /area/redgate/city/lasertag) "xuh" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/mass_spectrometry, -/obj/item/weapon/book/manual/materials_chemistry_analysis, -/obj/item/weapon/book/manual/nuclear, +/obj/item/book/manual/mass_spectrometry, +/obj/item/book/manual/materials_chemistry_analysis, +/obj/item/book/manual/nuclear, /turf/simulated/floor/wood, /area/redgate/city/library) "xul" = ( @@ -17957,7 +17957,7 @@ /turf/simulated/floor/wood, /area/redgate/city/house2) "xyk" = ( -/obj/item/device/radio/headset, +/obj/item/radio/headset, /turf/simulated/floor/carpet/brown, /area/redgate/city/hotel) "xyC" = ( @@ -17970,7 +17970,7 @@ /area/redgate/city/house13) "xzD" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/wood, /area/redgate/city/apartments) "xAj" = ( @@ -18125,7 +18125,7 @@ /area/redgate/city/science) "xOB" = ( /obj/structure/table/woodentable, -/obj/item/weapon/glass_extra/straw, +/obj/item/glass_extra/straw, /turf/simulated/floor/wood/alt, /area/redgate/city/stripclub) "xOC" = ( @@ -18142,8 +18142,8 @@ /area/redgate/city/doctor) "xPE" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fountain9, +/obj/item/paper_bin, +/obj/item/pen/fountain9, /turf/simulated/floor/tiled/eris/dark/brown_perforated, /area/redgate/city/dealership) "xQn" = ( @@ -18151,11 +18151,11 @@ /area/redgate/city/casino) "xQq" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/rainbow, +/obj/item/bedsheet/rainbow, /turf/simulated/floor/carpet/happy, /area/redgate/city/house14) "xQN" = ( -/obj/item/weapon/paperplane, +/obj/item/paperplane, /turf/simulated/floor/carpet/brown, /area/redgate/city/hotel) "xQU" = ( @@ -18179,7 +18179,7 @@ /area/redgate/city/warehouse) "xTc" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/curtain/open/privacy, /turf/simulated/floor/tiled/white, /area/redgate/city/hospital) @@ -18282,7 +18282,7 @@ /area/redgate/city/theatre) "yaE" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -4 }, /obj/effect/floor_decal/industrial/warning{ @@ -18303,8 +18303,8 @@ /area/redgate/city/bar1) "ybM" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fountain2, +/obj/item/paper_bin, +/obj/item/pen/fountain2, /turf/simulated/floor/carpet/green, /area/redgate/city/house17) "ycs" = ( @@ -18336,14 +18336,14 @@ /obj/structure/closet/walllocker{ pixel_y = 33 }, -/obj/item/weapon/deck/schnapsen, -/obj/item/weapon/deck/schnapsen, -/obj/item/weapon/deck/schnapsen, -/obj/item/weapon/deck/schnapsen, -/obj/item/weapon/deck/holder, -/obj/item/weapon/deck/holder, -/obj/item/weapon/deck/holder, -/obj/item/weapon/deck/holder, +/obj/item/deck/schnapsen, +/obj/item/deck/schnapsen, +/obj/item/deck/schnapsen, +/obj/item/deck/schnapsen, +/obj/item/deck/holder, +/obj/item/deck/holder, +/obj/item/deck/holder, +/obj/item/deck/holder, /turf/simulated/shuttle/floor/white, /area/redgate/city/cards) "yfe" = ( @@ -18354,7 +18354,7 @@ /area/redgate/city/engine) "yfs" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/mimedouble, +/obj/item/bedsheet/mimedouble, /turf/simulated/floor/carpet/turcarpet, /area/redgate/city/house9) "yfD" = ( @@ -18419,7 +18419,7 @@ /turf/simulated/floor/wood/alt/tile, /area/redgate/city/bar2) "yjg" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/wood/alt, diff --git a/maps/redgate/darkadventure.dmm b/maps/redgate/darkadventure.dmm index e8abd194906..034cb6e02c9 100644 --- a/maps/redgate/darkadventure.dmm +++ b/maps/redgate/darkadventure.dmm @@ -66,7 +66,7 @@ /area/redgate/wilds) "hS" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /turf/simulated/floor/tiled/dark, /area/redgate/structure) "iy" = ( @@ -140,7 +140,7 @@ }, /area/redgate/wilds) "rE" = ( -/obj/item/weapon/paper, +/obj/item/paper, /turf/simulated/floor/tiled/dark, /area/redgate/structure) "si" = ( @@ -185,7 +185,7 @@ /area/redgate/structure) "xw" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper, +/obj/item/paper, /turf/simulated/floor/tiled/dark, /area/redgate/structure) "yA" = ( @@ -216,7 +216,7 @@ /area/redgate/wilds) "AU" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, +/obj/item/bedsheet/purpledouble, /turf/simulated/floor/tiled/dark, /area/redgate/structure) "BD" = ( @@ -231,7 +231,7 @@ /turf/simulated/floor/outdoors/grass/forest, /area/redgate/wilds) "Cg" = ( -/obj/item/weapon/paper, +/obj/item/paper, /obj/structure/table/woodentable, /turf/simulated/floor/tiled/dark, /area/redgate/structure) @@ -350,7 +350,7 @@ }, /area/redgate/wilds) "Rd" = ( -/obj/item/weapon/broken_bottle, +/obj/item/broken_bottle, /turf/simulated/floor/tiled/dark, /area/redgate/structure) "Rl" = ( diff --git a/maps/redgate/eggnogtown.dmm b/maps/redgate/eggnogtown.dmm index ca8ad82ca9d..9dc3ed22d03 100644 --- a/maps/redgate/eggnogtown.dmm +++ b/maps/redgate/eggnogtown.dmm @@ -30,15 +30,15 @@ /area/redgate/eggnogtown/vibeout) "af" = ( /obj/structure/table/fancyblack, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -5; pixel_y = 9 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 6; pixel_y = 9 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 6; pixel_y = -1 }, @@ -84,7 +84,7 @@ /area/redgate/eggnogtown/nigloo) "am" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, +/obj/item/bedsheet/purpledouble, /obj/random/awayloot, /turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 258.15 @@ -97,7 +97,7 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Loni Nesumi's humbble abode, feel free to rest inside if the lights are out, please go change the cell in the maint room otherwise enjoy your stay and please don't take anything" }, /turf/simulated/mineral/floor/ignore_cavegen/cave{ @@ -106,13 +106,13 @@ /area/redgate/eggnogtown/loniabode) "ap" = ( /obj/structure/table/marble, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/tool/screwdriver, +/obj/item/flame/lighter/zippo, +/obj/item/tool/screwdriver, /obj/item/clothing/head/that{ pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/item/clothing/suit/storage/hooded/wintercoat/bar{ pixel_x = -8; pixel_y = -8 @@ -217,7 +217,7 @@ /area/redgate/eggnogtown/bar) "aD" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 258.15 }, @@ -353,7 +353,7 @@ /area/redgate/eggnogtown/bar) "aW" = ( /obj/structure/table/fancyblack, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = 3; pixel_y = 12 }, @@ -457,20 +457,20 @@ /area/redgate/eggnogtown/vibeout) "bw" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/clothing/glasses/welding, /obj/item/clothing/glasses/welding, -/obj/item/weapon/shovel, +/obj/item/shovel, /obj/random/tool/power, -/obj/item/weapon/pickaxe/drill, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/pickaxe/drill, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /turf/simulated/floor/tiled/techmaint{ temperature = 258.15 }, @@ -528,19 +528,19 @@ /area/redgate/eggnogtown/storage) "bM" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/clothing/glasses/welding, /obj/item/clothing/glasses/welding, -/obj/item/weapon/shovel, -/obj/item/weapon/pickaxe/drill, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/shovel, +/obj/item/pickaxe/drill, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /obj/machinery/light/small, /turf/simulated/floor/tiled/techmaint{ temperature = 258.15 @@ -548,25 +548,25 @@ /area/redgate/eggnogtown/storage) "bO" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/clothing/glasses/welding, /obj/item/clothing/glasses/welding, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/shovel, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/shovel, /obj/random/tool/alien, -/obj/item/weapon/pickaxe/drill, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/pickaxe/drill, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /turf/simulated/floor/tiled/techmaint{ temperature = 258.15 }, @@ -630,7 +630,7 @@ /area/redgate/eggnogtown/stokeswashere) "cx" = ( /obj/structure/table/fancyblack, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = 15; pixel_y = 10 }, @@ -756,7 +756,7 @@ }, /area/redgate/eggnogtown/sigloo) "dy" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /obj/effect/floor_decal/spline/plain{ @@ -801,12 +801,12 @@ /area/redgate/eggnogtown/visitorlounge) "dX" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/lasagna, -/obj/item/weapon/reagent_containers/food/snacks/lasagna, -/obj/item/weapon/reagent_containers/food/snacks/lasagna, -/obj/item/weapon/reagent_containers/food/snacks/lasagna, -/obj/item/weapon/reagent_containers/food/snacks/lasagna, -/obj/item/device/flashlight/lamp/green, +/obj/item/reagent_containers/food/snacks/lasagna, +/obj/item/reagent_containers/food/snacks/lasagna, +/obj/item/reagent_containers/food/snacks/lasagna, +/obj/item/reagent_containers/food/snacks/lasagna, +/obj/item/reagent_containers/food/snacks/lasagna, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood{ temperature = 258.15 }, @@ -837,26 +837,26 @@ /area/redgate/eggnogtown/bar) "ew" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/wood{ temperature = 258.15 }, /area/redgate/eggnogtown/stokeswashere/bedroom) "ex" = ( /obj/structure/table/fancyblack, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 6; pixel_y = -1 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -5; pixel_y = -1 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 6; pixel_y = 9 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -5; pixel_y = 9 }, @@ -901,7 +901,7 @@ /area/redgate/eggnogtown/stokeswashere) "eY" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /turf/simulated/floor/wood{ temperature = 258.15 }, @@ -931,7 +931,7 @@ /area/redgate/eggnogtown/kitchihome/diningroom) "fj" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/iandouble, +/obj/item/bedsheet/iandouble, /obj/structure/curtain/black, /turf/simulated/floor/wood, /area/redgate/eggnogtown/visitorlounge/room2) @@ -939,7 +939,7 @@ /obj/structure/noticeboard{ pixel_x = -32 }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Ali's Kickass Pad of Awesomeness" }, /turf/simulated/floor/wood, @@ -994,31 +994,31 @@ /turf/simulated/floor/tiled, /area/redgate/eggnogtown/loniabode) "gk" = ( -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, /obj/structure/closet, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/peppermill, /obj/machinery/alarm/alarms_hidden{ pixel_y = 21 }, @@ -1074,7 +1074,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/redgate/eggnogtown/kitchihome/den) "gP" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/outdoors/newdirt{ outdoors = 0 }, @@ -1084,10 +1084,10 @@ /area/redgate/eggnogtown/eastcaveland) "gV" = ( /obj/structure/table/marble, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_y = 25 }, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, /turf/simulated/floor/tiled/eris/white/monofloor, /area/redgate/eggnogtown/kitchihome/kitchen) "hd" = ( @@ -1163,7 +1163,7 @@ }, /area/redgate/eggnogtown/cavehome) "hS" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/outdoors/grass{ outdoors = 0 }, @@ -1229,7 +1229,7 @@ /area/redgate/eggnogtown/vibeout) "jb" = ( /obj/structure/table/fancyblack, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = 3; pixel_y = 12 }, @@ -1257,7 +1257,7 @@ /turf/simulated/floor/bmarble, /area/redgate/eggnogtown/arturoswolfden) "jy" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/outdoors/newdirt{ @@ -1267,13 +1267,13 @@ "jB" = ( /obj/structure/table/woodentable, /obj/item/toy/plushie/black_fox, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood{ temperature = 258.15 }, /area/redgate/eggnogtown/houserhomestead) "jH" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/carpet/bcarpet, @@ -1358,7 +1358,7 @@ /turf/simulated/floor/wood, /area/redgate/eggnogtown/kitchihome/diningroom) "lB" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/carpet/bcarpet, /area/redgate/eggnogtown/hall/south) "lF" = ( @@ -1373,7 +1373,7 @@ /turf/simulated/floor/tiled/techmaint, /area/redgate/eggnogtown/dining/storage) "lK" = ( -/obj/item/weapon/bedsheet/yellowdouble, +/obj/item/bedsheet/yellowdouble, /obj/structure/curtain/black, /obj/structure/bed/double/padded, /turf/simulated/floor/wood, @@ -1436,7 +1436,7 @@ /area/redgate/eggnogtown/hall/north) "mt" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/ashtray, +/obj/item/material/ashtray, /obj/random/awayloot, /turf/simulated/floor/wood{ temperature = 258.15 @@ -1448,7 +1448,7 @@ /area/redgate/eggnogtown/hall/south) "mw" = ( /obj/structure/closet, -/obj/item/device/camera, +/obj/item/camera, /obj/random/maintenance, /obj/random/maintenance, /obj/random/maintenance, @@ -1499,7 +1499,7 @@ /area/redgate/eggnogtown/dining/storage) "mP" = ( /obj/structure/table/fancyblack, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = 3; pixel_y = 12 }, @@ -1563,12 +1563,12 @@ }, /area/redgate/eggnogtown) "nQ" = ( -/obj/item/weapon/material/minihoe, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/material/minihoe, +/obj/item/analyzer/plant_analyzer, +/obj/item/reagent_containers/glass/bucket, /obj/item/robot_parts/l_arm, -/obj/item/weapon/material/knife/machete/hatchet, -/obj/item/weapon/material/minihoe, +/obj/item/material/knife/machete/hatchet, +/obj/item/material/minihoe, /obj/structure/closet, /turf/simulated/floor/tiled/monotile, /area/redgate/eggnogtown/dining/botany) @@ -1815,8 +1815,8 @@ /area/redgate/eggnogtown/dining/botany) "rQ" = ( /obj/structure/table/standard, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/knife, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/knife, /turf/simulated/floor/wood{ temperature = 258.15 }, @@ -1926,7 +1926,7 @@ /turf/simulated/floor/tiled/techmaint, /area/redgate/eggnogtown/dining/storage) "tc" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/outdoors/newdirt{ @@ -1965,9 +1965,9 @@ /area/redgate/eggnogtown/dining/kitchen) "tC" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/glass/rag, -/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, -/obj/item/weapon/book/manual/barman_recipes, +/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/food/drinks/flask/vacuumflask, +/obj/item/book/manual/barman_recipes, /obj/random/awayloot, /turf/simulated/floor/lino, /area/redgate/eggnogtown/bar) @@ -2050,12 +2050,12 @@ /area/redgate/eggnogtown/stokeswashere) "uX" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/material/kitchen/rollingpin, +/obj/item/book/manual/chef_recipes, +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/eggnogtown/dining/kitchen) "uY" = ( @@ -2087,7 +2087,7 @@ /area/redgate/eggnogtown/nigloo) "vc" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /obj/machinery/light{ dir = 1 }, @@ -2095,7 +2095,7 @@ /area/redgate/eggnogtown/dining/kitchen) "vn" = ( /obj/structure/table/standard, -/obj/item/weapon/material/ashtray, +/obj/item/material/ashtray, /turf/simulated/floor/wood, /area/redgate/eggnogtown/arturoswolfden) "vq" = ( @@ -2189,12 +2189,12 @@ /turf/simulated/floor/wood, /area/redgate/eggnogtown/dining) "wP" = ( -/obj/item/weapon/deck/cards, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/deck/tarot, +/obj/item/deck/cards, +/obj/item/storage/dicecup, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/deck/cah, +/obj/item/deck/cah/black, +/obj/item/deck/tarot, /obj/structure/closet, /turf/simulated/floor/wood, /area/redgate/eggnogtown/hall/south) @@ -2221,7 +2221,7 @@ /area/redgate/eggnogtown/stokeswashere/bathroom) "xn" = ( /obj/structure/table/glass, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet/bcarpet, /area/redgate/eggnogtown/loniabode) "xq" = ( @@ -2353,7 +2353,7 @@ /area/redgate/eggnogtown/dining) "zJ" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/wood{ temperature = 258.15 }, @@ -2477,7 +2477,7 @@ /area/redgate/eggnogtown/vibeout) "AZ" = ( /obj/structure/table/fancyblack, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = 3; pixel_y = 12 }, @@ -2529,7 +2529,7 @@ }, /area/redgate/eggnogtown) "BR" = ( -/obj/item/weapon/stool/baystool, +/obj/item/stool/baystool, /turf/simulated/floor/wood, /area/redgate/eggnogtown/visitorlounge) "BW" = ( @@ -2588,7 +2588,7 @@ /obj/structure/noticeboard{ pixel_x = -32 }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Arturo's Wolf Den" }, /turf/simulated/floor/outdoors/snow{ @@ -2619,7 +2619,7 @@ /area/redgate/eggnogtown/teshnest) "Dj" = ( /obj/structure/table/darkglass, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /turf/simulated/floor/wood, /area/redgate/eggnogtown/visitorlounge) "DG" = ( @@ -2683,7 +2683,7 @@ /area/redgate/eggnogtown/cavehome) "Ew" = ( /obj/structure/table/marble, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/simulated/floor/wood, /area/redgate/eggnogtown/loniabode) "Ey" = ( @@ -2701,12 +2701,12 @@ /area/redgate/eggnogtown/sigloo) "EC" = ( /obj/structure/table/marble, -/obj/item/weapon/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, /turf/simulated/floor/tiled/eris/white/monofloor, /area/redgate/eggnogtown/kitchihome/kitchen) "EI" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, +/obj/item/bedsheet/purpledouble, /turf/simulated/floor/carpet/bcarpet, /area/redgate/eggnogtown/kitchihome/bedroom) "EK" = ( @@ -2799,7 +2799,7 @@ }, /obj/fiftyspawner/log/sif, /obj/fiftyspawner/log/sif, -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, /turf/simulated/floor/wood{ temperature = 258.15 }, @@ -2827,7 +2827,7 @@ /turf/simulated/floor/tiled/eris/cafe, /area/redgate/eggnogtown/dining/kitchen) "Gj" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/carpet/bcarpet, @@ -2977,7 +2977,7 @@ /turf/simulated/floor/bmarble, /area/redgate/eggnogtown/hall) "II" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /obj/effect/floor_decal/spline/plain{ @@ -3016,11 +3016,11 @@ /area/redgate/eggnogtown/hall/south) "Jc" = ( /obj/structure/table/rack, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/techmaint, /area/redgate/eggnogtown/dining/storage) "Jk" = ( @@ -3042,7 +3042,7 @@ "JE" = ( /obj/structure/table/standard, /obj/item/trash/bowl, -/obj/item/weapon/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, /turf/simulated/floor/wood{ temperature = 258.15 }, @@ -3139,7 +3139,7 @@ /obj/structure/bed/chair/sofa/left/black{ dir = 1 }, -/obj/item/weapon/card/id{ +/obj/item/card/id{ access = list(777); name = "Houser's secret hidden keycard"; registered_name = "Houser" @@ -3320,7 +3320,7 @@ "MV" = ( /obj/structure/bed/pod, /obj/structure/curtain/open/bed, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /turf/simulated/floor/wood, /area/redgate/eggnogtown/visitorlounge/room1) "MZ" = ( @@ -3359,7 +3359,7 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Houser Homestead. Private Property. Trespassers will be eaten" }, /turf/simulated/floor/beach/sand{ @@ -3570,11 +3570,11 @@ icon_state = "0-10" }, /obj/structure/cable/yellow, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Dear Santa Talon. Please make this Christmas run with red. Because red is a real flappin nice colour. Like a strawberry. Or a cranberry river. From your biggest friendo, Xinxim! P.S. Please make those real spooky snow ghosts go away. They're scary! P.P.S. Here are some offerings to make sure I don't get haunted when I'm trying to roost!"; name = "Christmasacrifice" }, -/obj/item/weapon/tray, +/obj/item/tray, /turf/simulated/floor/plating{ temperature = 258.15 }, @@ -3604,7 +3604,7 @@ /area/redgate/eggnogtown/stokeswashere/bathroom) "PY" = ( /obj/structure/table/darkglass, -/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, /turf/simulated/floor/wood, /area/redgate/eggnogtown/visitorlounge) "Qh" = ( @@ -3652,11 +3652,11 @@ /area/redgate/eggnogtown/kitchihome/kitchen) "Rd" = ( /obj/structure/table/marble, -/obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/yeast, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/yeast, +/obj/item/material/kitchen/rollingpin, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/yeast, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/yeast, /turf/simulated/floor/tiled/eris/white/monofloor, /area/redgate/eggnogtown/kitchihome/kitchen) "Ri" = ( @@ -3698,7 +3698,7 @@ /turf/simulated/floor/wood, /area/redgate/eggnogtown/visitorlounge/room2) "Sa" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/lino, @@ -3870,8 +3870,8 @@ /turf/simulated/floor/tiled/eris/white/monofloor, /area/redgate/eggnogtown/kitchihome/kitchen) "UK" = ( -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/knife/machete/hatchet, +/obj/item/material/minihoe, +/obj/item/material/knife/machete/hatchet, /turf/simulated/floor/outdoors/grass{ outdoors = 0 }, @@ -3891,7 +3891,7 @@ /area/redgate/eggnogtown/alipad) "US" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/iandouble, +/obj/item/bedsheet/iandouble, /turf/simulated/floor/wood{ temperature = 258.15 }, @@ -3956,7 +3956,7 @@ /area/redgate/eggnogtown/stokeswashere) "VJ" = ( /obj/structure/closet, -/obj/item/weapon/cell/hyper, +/obj/item/cell/hyper, /obj/random/maintenance, /obj/random/maintenance, /obj/random/maintenance, @@ -3978,7 +3978,7 @@ /area/redgate/eggnogtown/dining/kitchen) "Wd" = ( /obj/structure/table/marble, -/obj/item/weapon/tape_roll, +/obj/item/tape_roll, /turf/simulated/floor/wood, /area/redgate/eggnogtown/loniabode) "Wf" = ( @@ -3995,7 +3995,7 @@ /area/redgate/eggnogtown/dining) "WF" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/wood{ temperature = 258.15 }, @@ -4165,7 +4165,7 @@ /turf/simulated/floor/wood, /area/redgate/eggnogtown/loniabode) "YK" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/carpet/bcarpet, @@ -4198,10 +4198,10 @@ /area/redgate/eggnogtown/stokeswashere) "Zl" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/condiment/ketchup, -/obj/item/weapon/reagent_containers/food/condiment/hotsauce, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/soysauce, +/obj/item/reagent_containers/food/condiment/ketchup, +/obj/item/reagent_containers/food/condiment/hotsauce, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/soysauce, /turf/simulated/floor/tiled/eris/white/monofloor, /area/redgate/eggnogtown/kitchihome/kitchen) "Zm" = ( @@ -4214,7 +4214,7 @@ /area/redgate/eggnogtown/vibeout) "Zo" = ( /obj/structure/table/marble, -/obj/item/weapon/storage/firstaid, +/obj/item/storage/firstaid, /turf/simulated/floor/lino, /area/redgate/eggnogtown/bar) "Zr" = ( @@ -4250,10 +4250,10 @@ /area/redgate/eggnogtown/kitchihome/bedroom) "ZJ" = ( /obj/structure/table/fancyblack, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, /turf/simulated/floor/wood, diff --git a/maps/redgate/eggnogtownunderground.dmm b/maps/redgate/eggnogtownunderground.dmm index 7f4603d53af..bace2a9eeee 100644 --- a/maps/redgate/eggnogtownunderground.dmm +++ b/maps/redgate/eggnogtownunderground.dmm @@ -167,8 +167,8 @@ pixel_y = -26 }, /obj/random/awayloot, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /obj/item/clothing/under/swimsuit/fluff/science, /turf/simulated/floor/bmarble{ temperature = 303.15 @@ -242,8 +242,8 @@ dir = 1; pixel_y = -26 }, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /obj/item/clothing/under/swimsuit/fluff/engineering, /turf/simulated/floor/bmarble{ temperature = 303.15 @@ -325,8 +325,8 @@ /obj/structure/closet/walllocker{ pixel_y = 26 }, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /obj/item/clothing/under/swimsuit/earth, /turf/simulated/floor/bmarble{ temperature = 303.15 @@ -352,8 +352,8 @@ dir = 1; pixel_y = -26 }, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /obj/item/clothing/under/swimsuit/fluff/medical, /turf/simulated/floor/bmarble{ temperature = 303.15 @@ -392,7 +392,7 @@ /area/redgate/eggnogtown/underground) "lX" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/item/toy/mecha/honk, /turf/simulated/floor/wood{ temperature = 258.15 @@ -464,7 +464,7 @@ /turf/simulated/floor/reinforced, /area/redgate/eggnogtown/telecomms) "qr" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/dark{ temperature = 258.15 }, @@ -613,7 +613,7 @@ /area/redgate/eggnogtown/houserhomestead/basement) "vW" = ( /obj/structure/table/borosilicate, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood{ temperature = 258.15 }, @@ -701,8 +701,8 @@ /obj/structure/closet/walllocker{ pixel_y = 26 }, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /obj/item/clothing/under/swimsuit/blue, /turf/simulated/floor/bmarble{ temperature = 303.15 @@ -727,8 +727,8 @@ "DZ" = ( /obj/structure/railing, /obj/structure/table/wooden_reinforced, -/obj/item/weapon/material/ashtray, -/obj/item/device/flashlight/lamp/green, +/obj/item/material/ashtray, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/tiled/dark{ temperature = 258.15 }, @@ -777,7 +777,7 @@ /turf/simulated/wall/iron, /area/redgate/eggnogtown/houserhomestead/basement) "Hk" = ( -/obj/item/weapon/bedsheet/mimedouble, +/obj/item/bedsheet/mimedouble, /obj/structure/bed/double/padded, /turf/simulated/floor/wood{ temperature = 258.15 @@ -815,8 +815,8 @@ /area/redgate/eggnogtown/hotsprings) "Jv" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/material/ashtray, -/obj/item/device/flashlight/lamp/green, +/obj/item/material/ashtray, +/obj/item/flashlight/lamp/green, /obj/item/toy/plushie/orange_fox, /turf/simulated/floor/wood{ temperature = 258.15 @@ -948,7 +948,7 @@ }, /area/redgate/eggnogtown/hotspring) "Pb" = ( -/obj/item/weapon/bedsheet/piratedouble, +/obj/item/bedsheet/piratedouble, /obj/structure/bed/double/padded, /turf/simulated/floor/wood{ temperature = 258.15 @@ -991,7 +991,7 @@ /area/redgate/eggnogtown/telecomms) "Tx" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood{ temperature = 258.15 }, @@ -1060,7 +1060,7 @@ /area/redgate/eggnogtown/hotspring) "Wr" = ( /obj/structure/table/borosilicate, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/plating/eris/under{ temperature = 258.15 }, @@ -1121,7 +1121,7 @@ /turf/simulated/floor/reinforced, /area/redgate/eggnogtown/telecomms) "YF" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled{ temperature = 258.15 }, @@ -1140,12 +1140,12 @@ /area/redgate/eggnogtown/houserhomestead/basement) "YK" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/glasses/mug, +/obj/item/storage/box/glasses/mug, /obj/random/drinkbottle, /obj/random/drinkbottle, /obj/random/drinkbottle, /obj/random/cigarettes, -/obj/item/weapon/book/manual/barman_recipes, +/obj/item/book/manual/barman_recipes, /turf/simulated/floor/tiled{ temperature = 258.15 }, @@ -1161,8 +1161,8 @@ pixel_y = 26 }, /obj/random/awayloot, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /obj/item/clothing/under/swimsuit/black, /turf/simulated/floor/bmarble{ temperature = 303.15 diff --git a/maps/redgate/facility.dmm b/maps/redgate/facility.dmm index c7fb17b2a3d..fb8828fcb77 100644 --- a/maps/redgate/facility.dmm +++ b/maps/redgate/facility.dmm @@ -37,7 +37,7 @@ /area/redgate/facility/ne) "ahj" = ( /obj/structure/table/woodentable, -/obj/item/weapon/potion_material/glamour_shard, +/obj/item/potion_material/glamour_shard, /turf/simulated/floor/wood/alt, /area/redgate/facility/ne) "ahx" = ( @@ -73,7 +73,7 @@ /area/redgate/facility/ne) "ajx" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/shield/riot, +/obj/item/shield/riot, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/ne) "akB" = ( @@ -116,7 +116,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/grass, /area/redgate/facility/office1) "alP" = ( @@ -127,7 +127,7 @@ /area/redgate/facility/cell23) "alV" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/flash/synthetic, +/obj/item/flash/synthetic, /turf/simulated/floor/tiled/techfloor, /area/redgate/facility/ne) "aml" = ( @@ -261,7 +261,7 @@ /area/redgate/facility/ne) "atT" = ( /obj/structure/table/steel, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/machinery/light, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/ne) @@ -612,26 +612,26 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /turf/simulated/floor/wood/alt, /area/redgate/facility/office9) "bay" = ( /obj/structure/closet/walllocker/wooden/east, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/burger/bacon, -/obj/item/weapon/reagent_containers/food/snacks/burger/bacon, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburger, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburger, -/obj/item/weapon/reagent_containers/food/snacks/fishburger, -/obj/item/weapon/reagent_containers/food/snacks/fishburger, -/obj/item/weapon/reagent_containers/food/snacks/jellyburger, -/obj/item/weapon/reagent_containers/food/snacks/jellyburger, -/obj/item/weapon/reagent_containers/food/snacks/superbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/superbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/superbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/bearburger, -/obj/item/weapon/reagent_containers/food/snacks/bearburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/burger/bacon, +/obj/item/reagent_containers/food/snacks/burger/bacon, +/obj/item/reagent_containers/food/snacks/cheeseburger, +/obj/item/reagent_containers/food/snacks/cheeseburger, +/obj/item/reagent_containers/food/snacks/fishburger, +/obj/item/reagent_containers/food/snacks/fishburger, +/obj/item/reagent_containers/food/snacks/jellyburger, +/obj/item/reagent_containers/food/snacks/jellyburger, +/obj/item/reagent_containers/food/snacks/superbiteburger, +/obj/item/reagent_containers/food/snacks/superbiteburger, +/obj/item/reagent_containers/food/snacks/superbiteburger, +/obj/item/reagent_containers/food/snacks/bearburger, +/obj/item/reagent_containers/food/snacks/bearburger, /turf/simulated/floor/wood/alt, /area/redgate/facility/cell4) "baM" = ( @@ -670,8 +670,8 @@ /area/redgate/facility/cell24) "bcI" = ( /obj/structure/closet/walllocker_double/science/north, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, /turf/simulated/floor/tiled/white, /area/redgate/facility/sw) "bcZ" = ( @@ -842,13 +842,13 @@ /area/redgate/facility/ne) "bpL" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 8 }, /turf/simulated/floor/carpet/blue, /area/redgate/facility/office2) "bpW" = ( -/obj/item/weapon/paper, +/obj/item/paper, /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) "bqd" = ( @@ -863,8 +863,8 @@ /area/redgate/facility/ne) "bqM" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, +/obj/item/paper_bin, +/obj/item/pen/blue, /obj/machinery/light{ dir = 4 }, @@ -886,13 +886,13 @@ /area/redgate/facility/nw) "bua" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/wood/alt, /area/redgate/facility/lab5) "buD" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = 9; pixel_y = 17 }, @@ -900,7 +900,7 @@ /area/redgate/facility/nw) "buS" = ( /obj/structure/flora/ausbushes/fullgrass, -/obj/item/weapon/bone/ribs, +/obj/item/bone/ribs, /turf/simulated/floor/grass, /area/redgate/facility/cell27) "bvQ" = ( @@ -1138,7 +1138,7 @@ dir = 5 }, /obj/effect/floor_decal/transit/orange, -/obj/item/device/geiger/wall/east, +/obj/item/geiger/wall/east, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/redgate/facility/ne) "bKf" = ( @@ -1181,11 +1181,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 }, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/simulated/floor/tiled/white, /area/redgate/facility/nw) "bOm" = ( -/obj/item/weapon/circuitboard/fluidpump, +/obj/item/circuitboard/fluidpump, /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell22) @@ -1195,7 +1195,7 @@ /area/redgate/facility/nw) "bOz" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood/alt/panel, /area/redgate/facility/nw) "bOV" = ( @@ -1203,8 +1203,8 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, +/obj/item/paper_bin, +/obj/item/pen/blue, /turf/simulated/floor/carpet/purcarpet, /area/redgate/facility/ne) "bPs" = ( @@ -1244,7 +1244,7 @@ /turf/simulated/floor/tiled/steel, /area/redgate/facility/cell11) "bSn" = ( -/obj/item/device/geiger/wall/north, +/obj/item/geiger/wall/north, /obj/effect/floor_decal/corner/black/border{ dir = 1 }, @@ -1314,8 +1314,8 @@ /area/redgate/facility/ne) "bVf" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, +/obj/item/paper_bin, +/obj/item/pen/blue, /obj/random/cigarettes, /turf/simulated/floor/wood/alt, /area/redgate/facility/ne) @@ -1330,7 +1330,7 @@ /area/redgate/facility/ne) "bVp" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/greendouble, +/obj/item/bedsheet/greendouble, /turf/simulated/floor/wood/alt/panel, /area/redgate/facility/nw) "bVI" = ( @@ -1339,12 +1339,12 @@ /area/redgate/facility/lab2) "bXd" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/orangedouble, +/obj/item/bedsheet/orangedouble, /turf/simulated/floor/wood/alt/panel, /area/redgate/facility/nw) "bXi" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/wood/alt/panel, /area/redgate/facility/nw) "bXk" = ( @@ -1450,7 +1450,7 @@ /area/redgate/facility/cell22) "ceo" = ( /obj/structure/table/steel, -/obj/item/device/integrated_electronics/detailer, +/obj/item/integrated_electronics/detailer, /turf/simulated/floor/tiled/eris/techmaint_perforated, /area/redgate/facility/sw) "ceN" = ( @@ -1515,7 +1515,7 @@ /area/redgate/facility/cell10) "cjl" = ( /obj/structure/table/glass, -/obj/item/weapon/book/manual/resleeving, +/obj/item/book/manual/resleeving, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -1541,7 +1541,7 @@ "cka" = ( /obj/structure/closet, /obj/item/clothing/suit/storage/toggle/labcoat, -/obj/item/weapon/melee/baton/cattleprod, +/obj/item/melee/baton/cattleprod, /obj/random/maintenance/morestuff, /turf/simulated/floor/wood/alt, /area/redgate/facility/office8) @@ -1583,7 +1583,7 @@ /area/redgate/facility/lab8) "cnr" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, /turf/simulated/floor/wood/alt, /area/redgate/facility/lab5) "cnG" = ( @@ -1796,8 +1796,8 @@ /area/redgate/facility/ne) "cDW" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, +/obj/item/paper_bin, +/obj/item/pen/blue, /turf/simulated/floor/carpet/blue2, /area/redgate/facility/ne) "cEL" = ( @@ -1854,7 +1854,7 @@ /area/redgate/facility/nw) "cHD" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/laundry_basket, +/obj/item/storage/laundry_basket, /obj/effect/floor_decal/corner/grey{ dir = 5 }, @@ -1907,7 +1907,7 @@ /turf/simulated/floor/wood/alt/panel, /area/redgate/facility/nw) "cKz" = ( -/obj/item/weapon/reagent_containers/food/snacks/sliceable/bread, +/obj/item/reagent_containers/food/snacks/sliceable/bread, /turf/simulated/floor/tiled/steel, /area/redgate/facility/ne) "cKL" = ( @@ -1961,7 +1961,7 @@ /area/redgate/facility/cell21) "cNI" = ( /obj/structure/table/glass, -/obj/item/device/sleevemate, +/obj/item/sleevemate, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -1985,7 +1985,7 @@ /area/redgate/facility/ne) "cPU" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 6 }, @@ -1999,7 +1999,7 @@ /turf/simulated/floor/tiled/techfloor, /area/redgate/facility/ne) "cQi" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell25) "cQv" = ( @@ -2016,7 +2016,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/redgate/facility/ne) "cRi" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/machinery/button/remote/airlock{ dir = 4; id = "cell_20"; @@ -2125,7 +2125,7 @@ "dcx" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/grey/diagonal, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /turf/simulated/floor/tiled/white, /area/redgate/facility/nw) "dcE" = ( @@ -2150,7 +2150,7 @@ /area/redgate/facility/ne) "dfe" = ( /obj/structure/table/glass, -/obj/item/weapon/gun/energy/mouseray/medical, +/obj/item/gun/energy/mouseray/medical, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -2332,47 +2332,47 @@ "dxX" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/grey/diagonal, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, /turf/simulated/floor/tiled/white, /area/redgate/facility/nw) "dyp" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, +/obj/item/paper_bin, +/obj/item/pen/blue, /turf/simulated/floor/wood/alt, /area/redgate/facility/nw) "dyR" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/machinery/light{ dir = 4 }, @@ -2380,11 +2380,11 @@ /area/redgate/facility/ne) "dzj" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/geiger{ +/obj/item/geiger{ pixel_x = 7; pixel_y = 6 }, -/obj/item/device/geiger, +/obj/item/geiger, /turf/simulated/floor/tiled/steel, /area/redgate/facility/ne) "dzk" = ( @@ -2436,10 +2436,10 @@ /area/redgate/facility/sw) "dBD" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -2490,7 +2490,7 @@ /area/redgate/facility/nw) "dFt" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/taser, +/obj/item/gun/energy/taser, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/ne) "dFD" = ( @@ -2527,9 +2527,9 @@ /area/redgate/facility/ne) "dHH" = ( /obj/structure/closet, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/tool/crowbar, -/obj/item/device/multitool{ +/obj/item/storage/belt/utility, +/obj/item/tool/crowbar, +/obj/item/multitool{ pixel_x = 3 }, /obj/item/clothing/head/welding/engie, @@ -2677,15 +2677,15 @@ "dQf" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/grey/diagonal, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, @@ -2744,7 +2744,7 @@ /area/redgate/facility/ne) "dTW" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/syringe/steroid, +/obj/item/reagent_containers/syringe/steroid, /obj/structure/closet/walllocker_double/science/north, /obj/random/maintenance/research, /obj/random/maintenance/research, @@ -2907,11 +2907,11 @@ "ehD" = ( /obj/structure/railing, /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen{ +/obj/item/paper_bin, +/obj/item/pen{ pixel_y = 4 }, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/simulated/floor/tiled/steel, /area/redgate/facility/ne) "ehY" = ( @@ -2989,7 +2989,7 @@ /area/redgate/facility/nw) "eoP" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/reddouble, +/obj/item/bedsheet/reddouble, /turf/simulated/floor/wood/alt/panel, /area/redgate/facility/nw) "epk" = ( @@ -3000,7 +3000,7 @@ /area/redgate/facility/ne) "epA" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, +/obj/item/bedsheet/purpledouble, /turf/simulated/floor/wood/alt/panel, /area/redgate/facility/nw) "equ" = ( @@ -3010,7 +3010,7 @@ /turf/simulated/wall/tgmc/window/white/reinf, /area/redgate/facility/lab3) "erk" = ( -/obj/item/weapon/bedsheet/pillow/black, +/obj/item/bedsheet/pillow/black, /turf/simulated/floor/tiled/techfloor, /area/redgate/facility/cell9) "erx" = ( @@ -3023,7 +3023,7 @@ /area/redgate/facility/nw) "esm" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood/alt/panel, /area/redgate/facility/nw) "esq" = ( @@ -3081,7 +3081,7 @@ /area/redgate/facility/office10) "euN" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/toy/desk/newtoncradle, +/obj/item/toy/desk/newtoncradle, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/redgate/facility/ne) "evB" = ( @@ -3139,7 +3139,7 @@ /area/redgate/facility/ne) "exj" = ( /obj/structure/table/borosilicate, -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/floor/tiled/steel_ridged, /area/redgate/facility/cell8) "exB" = ( @@ -3233,7 +3233,7 @@ /area/redgate/facility/nw) "eEs" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; @@ -3243,7 +3243,7 @@ /area/redgate/facility/ne) "eFb" = ( /obj/structure/flora/ausbushes/leafybush, -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/floor/grass, /area/redgate/facility/cell27) "eFo" = ( @@ -3255,7 +3255,7 @@ /area/redgate/facility/cell27) "eHZ" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, @@ -3266,7 +3266,7 @@ /area/redgate/facility/security) "eJr" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/mmi/digital/robot, +/obj/item/mmi/digital/robot, /turf/simulated/floor/tiled/steel_grid, /area/redgate/facility/ne) "eJY" = ( @@ -3333,7 +3333,7 @@ /area/redgate/facility/se) "eNP" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/orangedouble, +/obj/item/bedsheet/orangedouble, /turf/simulated/floor, /area/redgate/facility/office3) "eOs" = ( @@ -3347,7 +3347,7 @@ "eOC" = ( /obj/structure/table/steel_reinforced, /obj/machinery/light, -/obj/item/weapon/toy/desk/fan, +/obj/item/toy/desk/fan, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/redgate/facility/ne) "eOF" = ( @@ -3392,7 +3392,7 @@ /area/redgate/facility/sw) "eSO" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hosdouble, +/obj/item/bedsheet/hosdouble, /turf/simulated/floor/tiled/steel, /area/redgate/facility/nw) "eTa" = ( @@ -3412,8 +3412,8 @@ /area/redgate/facility/ne) "eUm" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/device/robotanalyzer, +/obj/item/storage/firstaid/surgery, +/obj/item/robotanalyzer, /obj/machinery/light{ dir = 8 }, @@ -3442,7 +3442,7 @@ /turf/simulated/floor, /area/redgate/facility/nw) "eWk" = ( -/obj/item/weapon/weldingtool/mini, +/obj/item/weldingtool/mini, /turf/simulated/floor, /area/redgate/facility/ne) "eWF" = ( @@ -3489,19 +3489,19 @@ /area/redgate/facility/nw) "fbr" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -7; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = 4; pixel_y = 6 }, @@ -3525,17 +3525,17 @@ /area/redgate/facility/nw) "fcq" = ( /obj/structure/closet/walllocker_double/generic_civ/west, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ name = "box of measuring cups"; pixel_x = 2; pixel_y = 3; - starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup = 7) + starts_with = list(/obj/item/reagent_containers/glass/beaker/measuring_cup = 7) }, /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, @@ -3543,16 +3543,16 @@ "fcr" = ( /obj/structure/table/hardwoodtable, /obj/structure/closet/walllocker_double/medical/south, -/obj/item/weapon/reagent_containers/food/snacks/burger/bacon, -/obj/item/weapon/reagent_containers/food/snacks/burger/bacon, -/obj/item/weapon/reagent_containers/food/snacks/burger/bacon, -/obj/item/weapon/reagent_containers/food/snacks/burger/bacon, -/obj/item/weapon/reagent_containers/food/snacks/burger/bacon, -/obj/item/weapon/reagent_containers/food/snacks/burger/bacon, -/obj/item/weapon/reagent_containers/food/snacks/burger/bacon, -/obj/item/weapon/reagent_containers/food/snacks/burger/bacon, -/obj/item/weapon/reagent_containers/food/snacks/burger/bacon, -/obj/item/weapon/reagent_containers/food/snacks/burger/bacon, +/obj/item/reagent_containers/food/snacks/burger/bacon, +/obj/item/reagent_containers/food/snacks/burger/bacon, +/obj/item/reagent_containers/food/snacks/burger/bacon, +/obj/item/reagent_containers/food/snacks/burger/bacon, +/obj/item/reagent_containers/food/snacks/burger/bacon, +/obj/item/reagent_containers/food/snacks/burger/bacon, +/obj/item/reagent_containers/food/snacks/burger/bacon, +/obj/item/reagent_containers/food/snacks/burger/bacon, +/obj/item/reagent_containers/food/snacks/burger/bacon, +/obj/item/reagent_containers/food/snacks/burger/bacon, /turf/simulated/floor/wood/alt, /area/redgate/facility/sw) "fcs" = ( @@ -3589,9 +3589,9 @@ /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) "ffI" = ( -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/structure/closet/walllocker_double/medical/north, /turf/simulated/floor/tiled/techfloor, /area/redgate/facility/ne) @@ -3600,18 +3600,18 @@ /area/redgate/facility/cell16) "fgB" = ( /obj/structure/table/steel, -/obj/item/weapon/card/id/keycard, +/obj/item/card/id/keycard, /turf/simulated/floor/tiled/techfloor, /area/redgate/facility/ne) "fgH" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/defib_kit/jumper_kit, +/obj/item/defib_kit/jumper_kit, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/facility/ne) "fgM" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen{ +/obj/item/paper_bin, +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/wood/alt, @@ -3657,7 +3657,7 @@ "fjS" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/grey/diagonal, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) @@ -3895,7 +3895,7 @@ /area/redgate/facility/cell10) "fAe" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 28 @@ -3976,7 +3976,7 @@ "fFU" = ( /obj/structure/table/glass, /obj/effect/floor_decal/borderfloorwhite, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, /area/redgate/facility/lab4) "fFX" = ( @@ -3995,7 +3995,7 @@ /area/redgate/facility/sw) "fGx" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell4) "fHh" = ( @@ -4004,9 +4004,9 @@ /area/redgate/facility/ne) "fHH" = ( /obj/structure/table/steel, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/cautery, +/obj/item/autopsy_scanner, +/obj/item/surgical/scalpel, +/obj/item/surgical/cautery, /obj/machinery/light/small{ dir = 4 }, @@ -4052,10 +4052,10 @@ /area/redgate/facility/cell24) "fKj" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell26) "fKl" = ( @@ -4080,10 +4080,10 @@ /area/redgate/facility/cell24) "fLK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -4139,12 +4139,12 @@ /area/redgate/facility/office10) "fQa" = ( /obj/structure/table/glass, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) "fQY" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) "fRB" = ( @@ -4225,7 +4225,7 @@ dir = 1 }, /obj/structure/closet/walllocker_double/medical/west, -/obj/item/device/megaphone, +/obj/item/megaphone, /turf/simulated/floor/wood, /area/redgate/facility/cell2) "fVZ" = ( @@ -4253,15 +4253,15 @@ "fWP" = ( /obj/structure/table/glass, /obj/effect/floor_decal/corner/blue/border, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled/white, /area/redgate/facility/medbay) "fXP" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, /obj/effect/floor_decal/corner/grey/diagonal, @@ -4294,7 +4294,7 @@ /area/redgate/facility/entrance) "gbm" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = -1; pixel_y = -2 }, @@ -4302,7 +4302,7 @@ /area/redgate/facility/ne) "gbT" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/security) "gcd" = ( @@ -4381,7 +4381,7 @@ /area/redgate/facility/cell23) "ghT" = ( /obj/structure/table/steel, -/obj/item/device/integrated_circuit_printer, +/obj/item/integrated_circuit_printer, /turf/simulated/floor/tiled/eris/techmaint_perforated, /area/redgate/facility/sw) "giI" = ( @@ -4396,7 +4396,7 @@ dir = 8 }, /obj/structure/table/rack/steel, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /obj/random/soap, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/office4) @@ -4481,10 +4481,10 @@ /area/redgate/facility/cell4) "gnc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, /turf/simulated/floor/tiled, @@ -4670,13 +4670,13 @@ /area/redgate/facility/cell24) "gzV" = ( /obj/structure/closet/walllocker_double/science/east, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell24) "gAk" = ( @@ -4747,8 +4747,8 @@ /area/redgate/facility/ne) "gDT" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/button/windowtint{ id = "cell_10"; pixel_x = 22 @@ -4880,7 +4880,7 @@ /area/redgate/facility/cell2) "gNW" = ( /obj/structure/grille, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/tiled/techfloor, /area/redgate/facility/cell21) "gOc" = ( @@ -4945,7 +4945,7 @@ /area/redgate/facility/office2) "gRw" = ( /obj/structure/table/glass, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/tiled/white, /area/redgate/facility/lab2) "gSw" = ( @@ -4979,7 +4979,7 @@ /turf/simulated/floor/tiled, /area/redgate/facility/cell29) "gTQ" = ( -/obj/item/weapon/potion_material/glowing_gem, +/obj/item/potion_material/glowing_gem, /turf/simulated/floor/tiled/steel, /area/redgate/facility/ne) "gTY" = ( @@ -4997,7 +4997,7 @@ /obj/structure/closet, /obj/random/contraband/nofail, /obj/random/forgotten_tram, -/obj/item/weapon/card/id/keycard/green, +/obj/item/card/id/keycard/green, /turf/simulated/floor/wood/alt, /area/redgate/facility/ne) "gVH" = ( @@ -5210,7 +5210,7 @@ /area/redgate/facility/ne) "hlm" = ( /obj/structure/table/standard, -/obj/item/device/mass_spectrometer/adv, +/obj/item/mass_spectrometer/adv, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell20) "hly" = ( @@ -5321,8 +5321,8 @@ /area/redgate/facility/nw) "hrF" = ( /obj/structure/table/standard, -/obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/material/knife/butch, +/obj/item/material/kitchen/rollingpin, +/obj/item/material/knife/butch, /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, /area/redgate/facility/nw) @@ -5354,14 +5354,14 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, +/obj/item/paper_bin, +/obj/item/pen/blue, /turf/simulated/floor/carpet/tealcarpet, /area/redgate/facility/nw) "hsx" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen{ +/obj/item/paper_bin, +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -5378,8 +5378,8 @@ /area/redgate/facility/cell23) "htQ" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, /obj/effect/floor_decal/corner/grey/diagonal, @@ -5623,11 +5623,11 @@ /area/redgate/facility/cell27) "hLa" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stamp/denied{ +/obj/item/stamp/denied{ pixel_x = 4; pixel_y = -2 }, -/obj/item/weapon/stamp/accepted, +/obj/item/stamp/accepted, /turf/simulated/floor/tiled, /area/redgate/facility/nw) "hLq" = ( @@ -5642,8 +5642,8 @@ /area/redgate/facility/cell9) "hLT" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell10) "hMK" = ( @@ -5661,13 +5661,13 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, +/obj/item/paper_bin, +/obj/item/pen/blue, /turf/simulated/floor/carpet/green, /area/redgate/facility/nw) "hNb" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 8 }, /turf/simulated/floor/wood/alt, @@ -5678,7 +5678,7 @@ /area/redgate/facility/cell22) "hNU" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = 9; pixel_y = 17 }, @@ -5824,7 +5824,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) "hXX" = ( -/obj/item/weapon/paper/crumpled, +/obj/item/paper/crumpled, /obj/effect/floor_decal/corner/black/border{ dir = 4 }, @@ -5838,10 +5838,10 @@ /area/redgate/facility/sw) "hYC" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/dermaline, -/obj/item/weapon/reagent_containers/glass/bottle/dermaline, -/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline, -/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline, +/obj/item/reagent_containers/glass/bottle/dermaline, +/obj/item/reagent_containers/glass/bottle/dermaline, +/obj/item/reagent_containers/glass/bottle/inaprovaline, +/obj/item/reagent_containers/glass/bottle/inaprovaline, /turf/simulated/floor/wood/alt, /area/redgate/facility/office7) "hYS" = ( @@ -5960,7 +5960,7 @@ /area/redgate/facility/cell7) "igR" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/tiled/techfloor, /area/redgate/facility/cell21) "igU" = ( @@ -6223,7 +6223,7 @@ /turf/simulated/wall/tgmc/whitewall, /area/redgate/facility/lab5) "iuM" = ( -/obj/item/weapon/paper/crumpled, +/obj/item/paper/crumpled, /obj/effect/floor_decal/corner/black/border{ dir = 8 }, @@ -6234,7 +6234,7 @@ /turf/simulated/floor/tiled, /area/redgate/facility/cell29) "ivl" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, /obj/structure/bed/chair/office/light{ @@ -6436,21 +6436,21 @@ /obj/random/snack, /obj/random/snack, /obj/random/snack, -/obj/item/weapon/reagent_containers/food/snacks/superbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/superbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/superbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake, -/obj/item/weapon/reagent_containers/food/snacks/pancakes, -/obj/item/weapon/reagent_containers/food/snacks/onionrings, +/obj/item/reagent_containers/food/snacks/superbiteburger, +/obj/item/reagent_containers/food/snacks/superbiteburger, +/obj/item/reagent_containers/food/snacks/superbiteburger, +/obj/item/reagent_containers/food/snacks/sliceable/chocolatecake, +/obj/item/reagent_containers/food/snacks/sliceable/chocolatecake, +/obj/item/reagent_containers/food/snacks/sliceable/orangecake, +/obj/item/reagent_containers/food/snacks/sliceable/limecake, +/obj/item/reagent_containers/food/snacks/sliceable/cheesecake, +/obj/item/reagent_containers/food/snacks/pancakes, +/obj/item/reagent_containers/food/snacks/onionrings, /turf/simulated/floor/wood/alt, /area/redgate/facility/cell1) "iKG" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/nachos, +/obj/item/reagent_containers/food/snacks/nachos, /turf/simulated/floor/wood/alt, /area/redgate/facility/cell1) "iLu" = ( @@ -6500,7 +6500,7 @@ "iQO" = ( /obj/structure/closet, /obj/random/tool/alien, -/obj/item/device/megaphone, +/obj/item/megaphone, /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) "iRl" = ( @@ -6546,7 +6546,7 @@ /area/redgate/facility/se) "iTw" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/teapot, +/obj/item/reagent_containers/food/drinks/teapot, /turf/simulated/floor/wood/alt, /area/redgate/facility/office1) "iUd" = ( @@ -6584,7 +6584,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/facility/sw) "iVL" = ( -/obj/item/weapon/paper, +/obj/item/paper, /obj/effect/floor_decal/corner/black/border{ dir = 4 }, @@ -6595,7 +6595,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) "iWh" = ( -/obj/item/weapon/paper/crumpled/bloody{ +/obj/item/paper/crumpled/bloody{ info = "Report: The Canidfelanis specimens have take a sudden disliking to the lights in their study cell. It's becoming difficult to obser" }, /obj/structure/extinguisher_cabinet{ @@ -6632,7 +6632,7 @@ /area/redgate/facility/ne) "iZa" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/sickshot, +/obj/item/gun/energy/sickshot, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/security) "iZh" = ( @@ -6674,7 +6674,7 @@ /area/redgate/facility/entrance) "jcf" = ( /obj/structure/table/standard, -/obj/item/weapon/entrepreneur/emf, +/obj/item/entrepreneur/emf, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell27) "jcm" = ( @@ -6689,7 +6689,7 @@ /area/redgate/facility/entrance) "jcX" = ( /obj/structure/table/glass, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) "jfC" = ( @@ -6701,7 +6701,7 @@ /area/redgate/facility/office9) "jhi" = ( /obj/structure/table/woodentable, -/obj/item/weapon/potion_base/aqua_regia, +/obj/item/potion_base/aqua_regia, /turf/simulated/floor/wood/alt, /area/redgate/facility/ne) "jhV" = ( @@ -6741,14 +6741,14 @@ /area/redgate/facility/se) "jkX" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen/fountain3, +/obj/item/pen/fountain3, /turf/simulated/floor/wood/alt, /area/redgate/facility/office8) "jla" = ( -/obj/item/weapon/card/id/keycard/blue, +/obj/item/card/id/keycard/blue, /turf/simulated/floor, /area/redgate/facility/nw) "jlr" = ( @@ -6780,7 +6780,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) "jmK" = ( -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -6853,7 +6853,7 @@ /turf/simulated/floor/grass, /area/redgate/facility/cell3) "jtc" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/effect/floor_decal/industrial/warning{ dir = 6 }, @@ -6865,7 +6865,7 @@ /area/redgate/facility/cell3) "jwg" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, /turf/simulated/floor/tiled/white, /area/redgate/facility/lab1) "jws" = ( @@ -6921,7 +6921,7 @@ /area/redgate/facility/entrance) "jAJ" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/device/slow_sizegun, +/obj/item/slow_sizegun, /obj/machinery/light, /turf/simulated/floor/wood/alt, /area/redgate/facility/cell1) @@ -6964,7 +6964,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/facility/office8) "jDE" = ( -/obj/item/weapon/storage/vore_egg/slimeglob{ +/obj/item/storage/vore_egg/slimeglob{ name = "sect egg clutch" }, /turf/simulated/floor/tiled/dark, @@ -7106,7 +7106,7 @@ "jOx" = ( /obj/machinery/optable, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/mmi/digital/posibrain, +/obj/item/mmi/digital/posibrain, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/facility/ne) "jOG" = ( @@ -7199,7 +7199,7 @@ /turf/simulated/floor, /area/redgate/facility/nw) "jTs" = ( -/obj/item/weapon/potion_material/folded_dark, +/obj/item/potion_material/folded_dark, /turf/unsimulated/floor/dark, /area/redgate/facility/cell9) "jUm" = ( @@ -7211,7 +7211,7 @@ /area/redgate/facility/sw) "jUM" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/mmi, +/obj/item/mmi, /turf/simulated/floor/tiled/steel_grid, /area/redgate/facility/ne) "jUS" = ( @@ -7265,10 +7265,10 @@ /area/redgate/facility/nw) "jYL" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -7292,7 +7292,7 @@ icon_scale_x = 2; icon_scale_y = 2 }, -/obj/item/weapon/bedsheet/rddouble{ +/obj/item/bedsheet/rddouble{ icon_scale_x = 2; icon_scale_y = 2 }, @@ -7377,11 +7377,11 @@ /area/redgate/facility/tram) "khn" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, /turf/simulated/floor/tiled/techfloor, /area/redgate/facility/office2) "khA" = ( -/obj/item/weapon/bedsheet/pillow/black, +/obj/item/bedsheet/pillow/black, /turf/unsimulated/floor/dark, /area/redgate/facility/cell9) "kjk" = ( @@ -7496,8 +7496,8 @@ /area/redgate/facility/office2) "ktI" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/assembly/signaler, -/obj/item/device/assembly/signaler, +/obj/item/assembly/signaler, +/obj/item/assembly/signaler, /turf/simulated/floor/tiled/techfloor, /area/redgate/facility/office2) "ktY" = ( @@ -7570,7 +7570,7 @@ /area/redgate/facility/securitylobby) "kzP" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/tiled/steel, /area/redgate/facility/cell11) "kzS" = ( @@ -7608,7 +7608,7 @@ /area/redgate/facility/cell6) "kCk" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 8 }, /turf/simulated/floor, @@ -7654,7 +7654,7 @@ /area/redgate/facility/office2) "kGK" = ( /obj/structure/table/borosilicate, -/obj/item/device/pda, +/obj/item/pda, /turf/simulated/floor/tiled/steel_ridged, /area/redgate/facility/cell8) "kHg" = ( @@ -7687,7 +7687,7 @@ /area/redgate/facility/ne) "kKm" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /turf/simulated/floor/carpet/blue, /area/redgate/facility/office2) "kKp" = ( @@ -7764,8 +7764,8 @@ /area/redgate/facility/entrance) "kPd" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, +/obj/item/paper_bin, +/obj/item/pen/blue, /turf/simulated/floor/carpet/oracarpet, /area/redgate/facility/ne) "kPt" = ( @@ -7796,14 +7796,14 @@ "kQT" = ( /obj/structure/table/woodentable, /obj/item/trash/plate, -/obj/item/weapon/reagent_containers/food/snacks/variable/cookie, -/obj/item/weapon/reagent_containers/food/snacks/variable/cookie, -/obj/item/weapon/reagent_containers/food/snacks/variable/cookie, -/obj/item/weapon/reagent_containers/food/snacks/variable/cookie, -/obj/item/weapon/reagent_containers/food/snacks/variable/cookie, -/obj/item/weapon/reagent_containers/food/snacks/variable/cookie, -/obj/item/weapon/reagent_containers/food/snacks/variable/cookie, -/obj/item/weapon/reagent_containers/food/snacks/variable/cookie, +/obj/item/reagent_containers/food/snacks/variable/cookie, +/obj/item/reagent_containers/food/snacks/variable/cookie, +/obj/item/reagent_containers/food/snacks/variable/cookie, +/obj/item/reagent_containers/food/snacks/variable/cookie, +/obj/item/reagent_containers/food/snacks/variable/cookie, +/obj/item/reagent_containers/food/snacks/variable/cookie, +/obj/item/reagent_containers/food/snacks/variable/cookie, +/obj/item/reagent_containers/food/snacks/variable/cookie, /turf/simulated/floor/wood/alt, /area/redgate/facility/office2) "kRs" = ( @@ -7839,13 +7839,13 @@ /area/redgate/facility/office3) "kWx" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fountain3, +/obj/item/paper_bin, +/obj/item/pen/fountain3, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/security) "kXk" = ( -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled, /area/redgate/facility/office3) "kXM" = ( @@ -7876,10 +7876,10 @@ /area/redgate/facility/office10) "kZb" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -7975,10 +7975,10 @@ /area/redgate/facility/cell23) "lhQ" = ( /obj/structure/table/standard, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /obj/effect/floor_decal/corner/grey{ dir = 5 }, @@ -8089,7 +8089,7 @@ /area/redgate/facility/securitylobby) "lpm" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/packaged/scotchegg, +/obj/item/reagent_containers/food/snacks/packaged/scotchegg, /obj/machinery/atmospherics/pipe/vent{ dir = 4 }, @@ -8097,8 +8097,8 @@ /area/redgate/facility/sw) "lqI" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen{ +/obj/item/paper_bin, +/obj/item/pen{ pixel_y = 4 }, /obj/machinery/button/windowtint{ @@ -8130,8 +8130,8 @@ /area/redgate/facility/ne) "lrx" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/material/knife/butch, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/material/knife/butch, /obj/effect/floor_decal/industrial/warning, /obj/machinery/light{ dir = 8 @@ -8289,8 +8289,8 @@ /area/redgate/facility/cell13) "lEz" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen{ +/obj/item/paper_bin, +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -8304,7 +8304,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/facility/office2) "lGB" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/grass, /area/redgate/facility/cell13) "lHt" = ( @@ -8467,8 +8467,8 @@ "lSA" = ( /obj/structure/closet, /obj/random/forgotten_tram, -/obj/item/weapon/folder, -/obj/item/weapon/folder, +/obj/item/folder, +/obj/item/folder, /obj/random/material/precious, /turf/simulated/floor/wood/alt, /area/redgate/facility/office9) @@ -8709,9 +8709,9 @@ /area/redgate/facility/lab5) "mkd" = ( /obj/structure/closet, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/storage/fancy/vials, -/obj/item/weapon/storage/box/syringes, +/obj/item/gun/energy/sizegun, +/obj/item/storage/fancy/vials, +/obj/item/storage/box/syringes, /turf/simulated/floor/wood/alt, /area/redgate/facility/office11) "mkB" = ( @@ -8773,7 +8773,7 @@ /area/redgate/facility/lab1) "mnQ" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/tiled/white, /area/redgate/facility/tram) "moY" = ( @@ -8808,13 +8808,13 @@ /obj/structure/window/plastitanium{ dir = 8 }, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/securitylobby) "mqH" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fountain5, +/obj/item/paper_bin, +/obj/item/pen/fountain5, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/redgate/facility/ne) "mqU" = ( @@ -8851,7 +8851,7 @@ /area/redgate/facility/office7) "mtg" = ( /obj/structure/table/steel, -/obj/item/weapon/circuitboard/telecomms/pda_multicaster, +/obj/item/circuitboard/telecomms/pda_multicaster, /turf/simulated/floor/tiled/steel, /area/redgate/facility/lab3) "mtn" = ( @@ -8890,7 +8890,7 @@ /area/redgate/facility/cell22) "mwC" = ( /obj/structure/closet/walllocker_double/security/west, -/obj/item/weapon/melee/baton/cattleprod, +/obj/item/melee/baton/cattleprod, /obj/random/maintenance/security, /obj/random/maintenance/security, /turf/simulated/floor/tiled/white, @@ -8928,10 +8928,10 @@ /area/redgate/facility/lab2) "myT" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -8939,8 +8939,8 @@ "mza" = ( /obj/structure/table/glass, /obj/effect/floor_decal/corner/blue/border, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, /turf/simulated/floor/tiled/white, /area/redgate/facility/medbay) "mzf" = ( @@ -9071,21 +9071,21 @@ /area/redgate/facility/cell13) "mHR" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/storage/fancy/vials, +/obj/item/storage/fancy/vials, /turf/simulated/floor/wood/alt, /area/redgate/facility/office11) "mHW" = ( /obj/structure/table/glass, -/obj/item/weapon/material/minihoe, +/obj/item/material/minihoe, /turf/simulated/floor/tiled/white, /area/redgate/facility/office11) "mJl" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 4; pixel_y = 7 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = 5; pixel_y = 5 }, @@ -9124,22 +9124,22 @@ "mLn" = ( /obj/structure/closet, /obj/item/clothing/under/rank/security/corp, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, /obj/item/clothing/shoes/boots/duty, /obj/item/clothing/gloves/black, /obj/item/clothing/head/helmet/solgov/security, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/office4) "mMd" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled/white, /area/redgate/facility/sw) "mMr" = ( /obj/structure/closet/radiation, -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, /turf/simulated/floor/tiled/steel, /area/redgate/facility/ne) "mMN" = ( @@ -9166,7 +9166,7 @@ /area/redgate/facility/office9) "mQQ" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/office4) "mRw" = ( @@ -9200,7 +9200,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/facility/nw) "mST" = ( -/obj/item/weapon/inflatable_duck, +/obj/item/inflatable_duck, /turf/simulated/floor/water/pool, /area/redgate/facility/cell13) "mTa" = ( @@ -9350,10 +9350,10 @@ /area/redgate/facility/security) "nfT" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -9374,10 +9374,10 @@ /area/redgate/facility/cell13) "nix" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -9451,11 +9451,11 @@ /area/redgate/facility/office1) "nql" = ( /obj/structure/closet/walllocker_double/generic_civ/east, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/random/tool/power, /turf/simulated/floor/wood/alt, /area/redgate/facility/office1) @@ -9488,7 +9488,7 @@ /area/redgate/facility/security) "nsG" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/netgun, +/obj/item/gun/energy/netgun, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/security) "nsV" = ( @@ -9519,7 +9519,7 @@ /area/redgate/facility/cell25) "nue" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) "nun" = ( @@ -9613,11 +9613,11 @@ /area/redgate/facility/office1) "nAY" = ( /obj/structure/table/woodentable, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/scanning_module{ pixel_x = 2; pixel_y = 3 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, @@ -9736,18 +9736,18 @@ /area/redgate/facility/sw) "nIW" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /obj/effect/floor_decal/corner/grey/diagonal, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) "nJc" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/antitoxin, -/obj/item/weapon/reagent_containers/glass/bottle/antitoxin, -/obj/item/weapon/reagent_containers/glass/bottle/spaceacillin, -/obj/item/weapon/reagent_containers/glass/bottle/spaceacillin, +/obj/item/reagent_containers/glass/bottle/antitoxin, +/obj/item/reagent_containers/glass/bottle/antitoxin, +/obj/item/reagent_containers/glass/bottle/spaceacillin, +/obj/item/reagent_containers/glass/bottle/spaceacillin, /obj/effect/floor_decal/spline/plain{ dir = 4 }, @@ -9885,10 +9885,10 @@ /area/redgate/facility/sw) "nTy" = ( /obj/structure/table/marble, -/obj/item/weapon/flame/candle/everburn{ +/obj/item/flame/candle/everburn{ pixel_x = 8 }, -/obj/item/weapon/flame/candle/everburn{ +/obj/item/flame/candle/everburn{ pixel_x = -8 }, /turf/simulated/floor/atoll, @@ -9905,7 +9905,7 @@ /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, -/obj/item/device/mass_spectrometer/adv, +/obj/item/mass_spectrometer/adv, /turf/simulated/floor/tiled/white, /area/redgate/facility/lab4) "nUg" = ( @@ -9958,7 +9958,7 @@ /obj/effect/floor_decal/borderfloorwhite{ dir = 6 }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, @@ -10034,7 +10034,7 @@ /area/redgate/facility/sw) "oeJ" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /turf/simulated/floor/tiled/white, /area/redgate/facility/sw) "oeT" = ( @@ -10054,7 +10054,7 @@ /area/redgate/facility/medbay) "ogF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell4) "ohm" = ( @@ -10071,7 +10071,7 @@ /area/redgate/facility/cell20) "ohR" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/machinery/button/windowtint{ id = "office_1"; pixel_x = -22 @@ -10098,7 +10098,7 @@ /area/redgate/facility/office5) "ojc" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/handcuffs/legcuffs/bola, +/obj/item/handcuffs/legcuffs/bola, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/security) "ojh" = ( @@ -10110,7 +10110,7 @@ /area/redgate/facility/lab5) "ojx" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/security) "ojH" = ( @@ -10133,7 +10133,7 @@ /area/redgate/facility/office3) "ols" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled/steel, /area/redgate/facility/cell12) "olu" = ( @@ -10214,12 +10214,12 @@ /area/redgate/facility/cell15) "opZ" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/syringes, +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, @@ -10266,23 +10266,23 @@ /obj/item/seeds/random, /obj/item/seeds/random, /obj/item/seeds/random, -/obj/item/weapon/material/minihoe, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/material/minihoe, +/obj/item/analyzer/plant_analyzer, /turf/simulated/floor/grass, /area/redgate/facility/office1) "oti" = ( /obj/structure/closet, /obj/item/clothing/under/rank/security/corp, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, /obj/item/clothing/shoes/boots/duty, /obj/item/clothing/gloves/black, /obj/item/clothing/head/helmet/solgov/security, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/office5) "otx" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/egg/rainbow, +/obj/item/reagent_containers/food/snacks/egg/rainbow, /turf/simulated/floor/tiled/white, /area/redgate/facility/sw) "otO" = ( @@ -10292,7 +10292,7 @@ /area/redgate/facility/office5) "otW" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/office5) "oui" = ( @@ -10402,10 +10402,10 @@ /area/redgate/facility/cell2) "oHI" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -10479,7 +10479,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell15) "oNV" = ( @@ -10505,7 +10505,7 @@ /turf/simulated/floor, /area/redgate/facility/sw) "oPv" = ( -/obj/item/weapon/paper/crumpled, +/obj/item/paper/crumpled, /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) "oRY" = ( @@ -10543,7 +10543,7 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 6 }, -/obj/item/weapon/tool/crowbar/brass, +/obj/item/tool/crowbar/brass, /turf/simulated/floor/tiled/white, /area/redgate/facility/entrance) "oUz" = ( @@ -10590,7 +10590,7 @@ /area/redgate/facility/sw) "oXb" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /turf/simulated/floor/tiled/techfloor, /area/redgate/facility/cell14) "oXm" = ( @@ -10625,9 +10625,9 @@ /area/redgate/facility/sw) "oZU" = ( /obj/structure/closet/secure_closet/medical3, -/obj/item/device/glasses_kit, -/obj/item/weapon/storage/box/bloodpacks, -/obj/item/weapon/storage/box/autoinjectors, +/obj/item/glasses_kit, +/obj/item/storage/box/bloodpacks, +/obj/item/storage/box/autoinjectors, /turf/simulated/floor/tiled/white, /area/redgate/facility/medbay) "pag" = ( @@ -10645,7 +10645,7 @@ /area/redgate/facility/office2) "pbO" = ( /obj/structure/table/standard, -/obj/item/device/slime_scanner, +/obj/item/slime_scanner, /turf/simulated/floor/tiled/white, /area/redgate/facility/lab5) "pck" = ( @@ -10654,7 +10654,7 @@ /area/redgate/facility/cell27) "pcs" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell9) "pdn" = ( @@ -10825,7 +10825,7 @@ /area/redgate/facility/cell15) "prt" = ( /obj/structure/table/standard, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /turf/simulated/floor/tiled/white, /area/redgate/facility/lab5) "prT" = ( @@ -10851,9 +10851,9 @@ /obj/effect/floor_decal/corner/blue/border, /obj/random/maintenance/medical, /obj/random/maintenance/medical, -/obj/item/weapon/cane, +/obj/item/cane, /obj/structure/closet/walllocker_double/medical/south, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /turf/simulated/floor/tiled/white, /area/redgate/facility/medbay) "psL" = ( @@ -10924,7 +10924,7 @@ /area/redgate/facility/lab8) "pys" = ( /obj/structure/table/glass, -/obj/item/weapon/autopsy_scanner, +/obj/item/autopsy_scanner, /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) "pyE" = ( @@ -11033,7 +11033,7 @@ /area/redgate/facility/sw) "pFo" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/bone/skull, +/obj/item/bone/skull, /turf/simulated/floor/tiled/steel, /area/redgate/facility/cell17) "pFq" = ( @@ -11089,7 +11089,7 @@ /area/redgate/facility/lab8) "pJE" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) "pJK" = ( @@ -11347,7 +11347,7 @@ /area/redgate/facility/lab4) "qax" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, @@ -11378,7 +11378,7 @@ /area/redgate/facility/office11) "qbY" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/effect/floor_decal/corner/blue/border{ dir = 5 }, @@ -11406,7 +11406,7 @@ /area/redgate/facility/office1) "qdH" = ( /obj/structure/flora/ausbushes/fullgrass, -/obj/item/weapon/bone, +/obj/item/bone, /obj/machinery/light{ dir = 4 }, @@ -11475,7 +11475,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/facility/cell25) "qis" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor, /area/redgate/facility/cell22) @@ -11493,10 +11493,10 @@ /obj/structure/sign/signnew/cryogenics{ pixel_y = 32 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, @@ -11582,10 +11582,10 @@ /area/redgate/facility/cell25) "qpO" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /obj/machinery/button/windowtint{ @@ -11653,7 +11653,7 @@ /area/redgate/facility/sw) "qtt" = ( /obj/structure/window/basic, -/obj/item/weapon/storage/vore_egg/rock, +/obj/item/storage/vore_egg/rock, /turf/simulated/floor/tiled/freezer, /area/redgate/facility/sw) "qtY" = ( @@ -11798,14 +11798,14 @@ /turf/simulated/floor/water/pool, /area/redgate/facility/cell13) "qDz" = ( -/obj/item/weapon/reagent_containers/food/snacks/snackplanet/virgoprime{ +/obj/item/reagent_containers/food/snacks/snackplanet/virgoprime{ name = "Ringed planet" }, /turf/unsimulated/fake_space, /area/redgate/facility/cell15) "qEg" = ( /obj/structure/table/standard, -/obj/item/weapon/paper, +/obj/item/paper, /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) "qFr" = ( @@ -11932,7 +11932,7 @@ /area/redgate/facility/ne) "qPj" = ( /obj/structure/window/basic, -/obj/item/weapon/storage/vore_egg/slimeglob{ +/obj/item/storage/vore_egg/slimeglob{ name = "sect egg clutch" }, /turf/simulated/floor/tiled/freezer, @@ -11987,7 +11987,7 @@ /area/redgate/facility/medbay) "qVa" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/effect/floor_decal/corner/blue/border{ dir = 10 }, @@ -12008,7 +12008,7 @@ /area/redgate/facility/cell3) "qXg" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/effect/floor_decal/corner/blue/border{ dir = 6 }, @@ -12032,7 +12032,7 @@ /area/redgate/facility/sw) "ram" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/noreact, +/obj/item/reagent_containers/glass/beaker/noreact, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/white, /area/redgate/facility/lab1) @@ -12080,7 +12080,7 @@ /turf/simulated/floor/tiled/techfloor, /area/redgate/facility/cell22) "rdK" = ( -/obj/item/weapon/reagent_containers/food/snacks/snackplanet/phoron, +/obj/item/reagent_containers/food/snacks/snackplanet/phoron, /turf/unsimulated/fake_space, /area/redgate/facility/cell15) "reE" = ( @@ -12131,7 +12131,7 @@ /area/redgate/facility/sw) "rjc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell9) "rjr" = ( @@ -12170,18 +12170,18 @@ "rlN" = ( /obj/structure/table/standard, /obj/structure/closet/walllocker_double/science/north, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/fancy/vials, -/obj/item/weapon/storage/lockbox/vials, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/fancy/vials, +/obj/item/storage/lockbox/vials, +/obj/item/storage/box/monkeycubes, /turf/simulated/floor/tiled/white, /area/redgate/facility/sw) "rmF" = ( @@ -12324,11 +12324,11 @@ /obj/structure/closet{ name = "experimental tools" }, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/handcuffs/legcuffs, -/obj/item/weapon/handcuffs, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/sizegun, +/obj/item/material/knife/butch, +/obj/item/handcuffs/legcuffs, +/obj/item/handcuffs, /obj/item/clothing/glasses/sunglasses/thinblindfold, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell18) @@ -12358,7 +12358,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/facility/cell4) "ryq" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/item/broken_device/random, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell25) @@ -12402,10 +12402,10 @@ /area/redgate/facility/nw) "rzV" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/bicaridine, -/obj/item/weapon/reagent_containers/glass/bottle/bicaridine, -/obj/item/weapon/reagent_containers/glass/bottle/dexalinp, -/obj/item/weapon/reagent_containers/glass/bottle/dexalinp, +/obj/item/reagent_containers/glass/bottle/bicaridine, +/obj/item/reagent_containers/glass/bottle/bicaridine, +/obj/item/reagent_containers/glass/bottle/dexalinp, +/obj/item/reagent_containers/glass/bottle/dexalinp, /turf/simulated/floor/wood/alt, /area/redgate/facility/office7) "rBd" = ( @@ -12413,7 +12413,7 @@ /area/redgate/facility/office4) "rBl" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /turf/simulated/floor/tiled/white, /area/redgate/facility/office7) "rBs" = ( @@ -12459,7 +12459,7 @@ /area/redgate/facility/lab2) "rDt" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /turf/simulated/floor/tiled/white, /area/redgate/facility/office6) "rDZ" = ( @@ -12480,12 +12480,12 @@ /area/redgate/facility/sw) "rEw" = ( /obj/structure/table/glass, -/obj/item/weapon/material/minihoe, +/obj/item/material/minihoe, /turf/simulated/floor/tiled/white, /area/redgate/facility/lab8) "rFo" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = 2; pixel_y = 3 }, @@ -12504,7 +12504,7 @@ /area/redgate/facility/office3) "rHb" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/botanydisk, +/obj/item/storage/box/botanydisk, /turf/simulated/floor/tiled/white, /area/redgate/facility/lab8) "rIw" = ( @@ -12681,11 +12681,11 @@ /area/redgate/facility/ne) "rUr" = ( /obj/structure/table/reinforced, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = 6; pixel_y = 4 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -6; pixel_y = 4 }, @@ -12753,18 +12753,18 @@ /area/redgate/facility/cell24) "rXr" = ( /obj/structure/closet/walllocker/wooden/west, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup, -/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/glass/beaker/measuring_cup, +/obj/item/reagent_containers/glass/beaker/measuring_cup, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, /turf/simulated/floor/wood/alt, /area/redgate/facility/cell4) "rXY" = ( @@ -12777,7 +12777,7 @@ /area/redgate/facility/se) "rZd" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/atmospherics/pipe/vent{ dir = 1 }, @@ -12796,7 +12796,7 @@ /area/redgate/facility/cell4) "saX" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/toy/desk/officetoy, +/obj/item/toy/desk/officetoy, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/redgate/facility/ne) "sbR" = ( @@ -12987,7 +12987,7 @@ /area/redgate/facility/se) "smZ" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor, /area/redgate/facility/cell25) "snf" = ( @@ -13044,7 +13044,7 @@ /area/redgate/facility/sw) "stb" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell4) "stt" = ( @@ -13161,22 +13161,22 @@ /turf/simulated/floor/tiled/white, /area/redgate/facility/cell17) "sAu" = ( -/obj/item/weapon/bone/arm, +/obj/item/bone/arm, /turf/simulated/floor/tiled/steel, /area/redgate/facility/cell17) "sAK" = ( /obj/structure/closet, /obj/item/clothing/under/rank/security/corp, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, /obj/item/clothing/shoes/boots/duty, /obj/item/clothing/gloves/black, /obj/item/clothing/head/helmet/solgov/security, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/office10) "sAM" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/smolebrickcase, +/obj/item/storage/smolebrickcase, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell15) "sAQ" = ( @@ -13194,7 +13194,7 @@ /area/redgate/facility/se) "sCG" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 3 }, /turf/simulated/floor/tiled/techfloor, @@ -13325,7 +13325,7 @@ icon_scale_x = 3; icon_scale_y = 3 }, -/obj/item/weapon/bedsheet/hosdouble{ +/obj/item/bedsheet/hosdouble{ icon_scale_x = 3; icon_scale_y = 3 }, @@ -13346,10 +13346,10 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, /turf/simulated/floor/wood/alt, @@ -13405,7 +13405,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/item/weapon/gun/launcher/syringe/rapid, +/obj/item/gun/launcher/syringe/rapid, /turf/simulated/floor/wood/alt, /area/redgate/facility/office7) "sUQ" = ( @@ -13486,7 +13486,7 @@ /area/redgate/facility/medbay) "sXx" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/snackplanet/moon, +/obj/item/reagent_containers/food/snacks/snackplanet/moon, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell15) "sXK" = ( @@ -13504,7 +13504,7 @@ /area/redgate/facility/cell15) "sZE" = ( /obj/structure/table/steel, -/obj/item/device/electronic_assembly/large/default, +/obj/item/electronic_assembly/large/default, /turf/simulated/floor/tiled/eris/techmaint_perforated, /area/redgate/facility/sw) "tbG" = ( @@ -13525,8 +13525,8 @@ /area/redgate/facility/sw) "tdG" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen{ +/obj/item/paper_bin, +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/wood/alt, @@ -13536,7 +13536,7 @@ /area/redgate/facility/cell29) "teZ" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled/steel, /area/redgate/facility/lab3) "tfK" = ( @@ -13821,7 +13821,7 @@ /turf/simulated/floor/tiled/steel, /area/redgate/facility/cell11) "txD" = ( -/obj/item/weapon/bone/ribs, +/obj/item/bone/ribs, /turf/simulated/floor/tiled/steel, /area/redgate/facility/cell17) "txE" = ( @@ -13848,7 +13848,7 @@ /turf/simulated/floor/tiled/steel, /area/redgate/facility/cell17) "tAe" = ( -/obj/item/weapon/bone/skull/tajaran, +/obj/item/bone/skull/tajaran, /turf/simulated/floor/tiled/steel, /area/redgate/facility/cell17) "tAi" = ( @@ -13862,7 +13862,7 @@ /area/redgate/facility/nw) "tAu" = ( /obj/structure/table/standard, -/obj/item/weapon/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell15) "tAT" = ( @@ -13874,7 +13874,7 @@ /area/redgate/facility/cell3) "tBu" = ( /obj/structure/table/reinforced, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ pixel_y = 3 }, /turf/simulated/floor/tiled, @@ -13924,7 +13924,7 @@ /area/redgate/facility/entrance) "tCX" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = -9; pixel_y = 17 }, @@ -13932,7 +13932,7 @@ /area/redgate/facility/nw) "tDX" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, /turf/simulated/floor/tiled/white, /area/redgate/facility/lab5) "tEq" = ( @@ -13943,10 +13943,10 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/wood/alt, @@ -13987,7 +13987,7 @@ dir = 8 }, /obj/structure/table/rack/steel, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /obj/random/soap, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/office5) @@ -14037,10 +14037,10 @@ /area/redgate/facility/cell5) "tIY" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -14224,8 +14224,8 @@ /area/redgate/facility/cell14) "uaM" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled/white, /area/redgate/facility/office8) "ubE" = ( @@ -14245,7 +14245,7 @@ /area/redgate/facility/sw) "uct" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, /area/redgate/facility/lab1) "ucB" = ( @@ -14303,8 +14303,8 @@ /area/redgate/facility/office5) "ugx" = ( /obj/structure/table/standard, -/obj/item/weapon/gun/energy/taser/xeno, -/obj/item/weapon/melee/baton/slime/loaded, +/obj/item/gun/energy/taser/xeno, +/obj/item/melee/baton/slime/loaded, /turf/simulated/floor/tiled/white, /area/redgate/facility/lab5) "ugM" = ( @@ -14473,7 +14473,7 @@ /obj/structure/closet, /obj/item/clothing/suit/kimono/blue, /obj/item/clothing/shoes/sandal, -/obj/item/weapon/storage/box/matches, +/obj/item/storage/box/matches, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell16) "utW" = ( @@ -14532,11 +14532,11 @@ "uxJ" = ( /obj/structure/closet, /obj/item/clothing/under/rank/security/corp, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, /obj/item/clothing/shoes/boots/duty, /obj/item/clothing/gloves/black, /obj/item/clothing/head/helmet/solgov/security, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/milspec, /area/redgate/facility/security) "uxP" = ( @@ -14555,7 +14555,7 @@ /area/redgate/facility/ne) "uzu" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/simulated/floor/tiled/white, /area/redgate/facility/lab5) "uAd" = ( @@ -14709,7 +14709,7 @@ /area/redgate/facility/cell15) "uJD" = ( /obj/structure/flora/ausbushes/fullgrass, -/obj/item/weapon/bone/skull, +/obj/item/bone/skull, /turf/simulated/floor/grass, /area/redgate/facility/cell27) "uJU" = ( @@ -14774,13 +14774,13 @@ /area/redgate/facility/lab3) "uMq" = ( /obj/structure/closet/walllocker_double/science/east, -/obj/item/weapon/book/manual/virology, -/obj/item/device/antibody_scanner, -/obj/item/device/antibody_scanner, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/virusdish/random, -/obj/item/weapon/virusdish/random, -/obj/item/weapon/virusdish/random, +/obj/item/book/manual/virology, +/obj/item/antibody_scanner, +/obj/item/antibody_scanner, +/obj/item/reagent_containers/glass/beaker, +/obj/item/virusdish/random, +/obj/item/virusdish/random, +/obj/item/virusdish/random, /turf/simulated/floor/tiled/white, /area/redgate/facility/sw) "uNl" = ( @@ -14799,7 +14799,7 @@ /area/redgate/facility/lab1) "uNy" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /obj/machinery/light{ dir = 8 }, @@ -14904,7 +14904,7 @@ /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/redgate/facility/ne) "uYc" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor, /area/redgate/facility/cell6) "uYg" = ( @@ -14927,8 +14927,8 @@ /area/redgate/facility/cell6) "uZl" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -15047,7 +15047,7 @@ /area/redgate/facility/office11) "vjk" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell16) "vjE" = ( @@ -15060,12 +15060,12 @@ "vjP" = ( /obj/structure/table/glass, /obj/effect/floor_decal/borderfloorwhite, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, /turf/simulated/floor/tiled/white, /area/redgate/facility/lab4) "vjS" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/machinery/button/remote/airlock{ id = "lab_office"; pixel_y = 25; @@ -15178,8 +15178,8 @@ /area/redgate/facility/cell29) "vqJ" = ( /obj/structure/closet/wardrobe/chemistry_white, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -15326,7 +15326,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/facility/cell5) "vCK" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell6) "vDA" = ( @@ -15360,7 +15360,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/facility/lab4) "vFv" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/effect/floor_decal/industrial/warning{ dir = 5 }, @@ -15368,7 +15368,7 @@ /area/redgate/facility/cell22) "vFG" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell7) "vGy" = ( @@ -15403,10 +15403,10 @@ /area/redgate/facility/cell17) "vIk" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell7) "vIA" = ( @@ -15423,9 +15423,9 @@ /area/redgate/facility/se) "vKd" = ( /obj/structure/closet/walllocker_double/science/east, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder, -/obj/item/weapon/clipboard, +/obj/item/folder/blue, +/obj/item/folder, +/obj/item/clipboard, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell7) "vKi" = ( @@ -15455,7 +15455,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/facility/cell18) "vMw" = ( -/obj/item/device/geiger/wall/north, +/obj/item/geiger/wall/north, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/facility/ne) "vMO" = ( @@ -15483,7 +15483,7 @@ /obj/random/maintenance/research, /obj/random/maintenance/research, /obj/random/toy, -/obj/item/device/camera, +/obj/item/camera, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell10) "vOj" = ( @@ -15500,7 +15500,7 @@ /area/redgate/facility/security) "vPf" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled/steel, /area/redgate/facility/cell18) "vPh" = ( @@ -15596,10 +15596,10 @@ /area/redgate/facility/cell3) "vUT" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -15702,7 +15702,7 @@ /area/redgate/facility/cell11) "wbX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/chocolateegg, +/obj/item/reagent_containers/food/snacks/chocolateegg, /turf/simulated/floor/tiled/white, /area/redgate/facility/sw) "wcy" = ( @@ -15732,7 +15732,7 @@ /area/redgate/facility/cell17) "wfv" = ( /obj/structure/closet/walllocker_double/science/north, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/scalpel, /obj/item/clothing/gloves/sterile/nitrile, /obj/item/clothing/gloves/sterile/nitrile, /obj/item/clothing/gloves/sterile/nitrile, @@ -15788,8 +15788,8 @@ /area/redgate/facility/lab2) "wlM" = ( /obj/structure/table/borosilicate, -/obj/item/weapon/implantcase/tracking, -/obj/item/weapon/implanter, +/obj/item/implantcase/tracking, +/obj/item/implanter, /turf/simulated/floor/tiled/steel_ridged, /area/redgate/facility/cell8) "wlO" = ( @@ -15804,7 +15804,7 @@ /area/redgate/facility/cell29) "wmm" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/book/manual/robotics_manual, +/obj/item/book/manual/robotics_manual, /turf/simulated/floor/tiled/steel_grid, /area/redgate/facility/ne) "wmn" = ( @@ -15818,7 +15818,7 @@ /area/redgate/facility/lab5) "wmT" = ( /obj/structure/table/glass, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /obj/effect/floor_decal/borderfloor, /turf/simulated/floor/tiled/white, /area/redgate/facility/ne) @@ -15888,7 +15888,7 @@ /area/redgate/facility/sw) "wtl" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/egg/green, +/obj/item/reagent_containers/food/snacks/egg/green, /turf/simulated/floor/tiled/white, /area/redgate/facility/sw) "wty" = ( @@ -15920,7 +15920,7 @@ /area/redgate/facility/ne) "wvE" = ( /obj/structure/table/darkglass, -/obj/item/weapon/bikehorn/rubberducky/grey, +/obj/item/bikehorn/rubberducky/grey, /turf/simulated/floor/tiled/steel, /area/redgate/facility/cell11) "wwn" = ( @@ -15973,12 +15973,12 @@ /area/redgate/facility/cell11) "wBd" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/vial/microcillin, -/obj/item/weapon/reagent_containers/glass/beaker/vial/microcillin, -/obj/item/weapon/reagent_containers/glass/beaker/vial/macrocillin, -/obj/item/weapon/reagent_containers/glass/beaker/vial/macrocillin, -/obj/item/weapon/reagent_containers/glass/beaker/vial/normalcillin, -/obj/item/weapon/reagent_containers/glass/beaker/vial/normalcillin, +/obj/item/reagent_containers/glass/beaker/vial/microcillin, +/obj/item/reagent_containers/glass/beaker/vial/microcillin, +/obj/item/reagent_containers/glass/beaker/vial/macrocillin, +/obj/item/reagent_containers/glass/beaker/vial/macrocillin, +/obj/item/reagent_containers/glass/beaker/vial/normalcillin, +/obj/item/reagent_containers/glass/beaker/vial/normalcillin, /turf/simulated/floor/tiled/white, /area/redgate/facility/office11) "wBO" = ( @@ -15987,10 +15987,10 @@ /area/redgate/facility/cell11) "wCE" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/wood/alt, @@ -16057,10 +16057,10 @@ /area/redgate/facility/nw) "wGJ" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -16095,7 +16095,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/facility/entrance) "wIG" = ( -/obj/item/weapon/reagent_containers/food/drinks/cans/bepis{ +/obj/item/reagent_containers/food/drinks/cans/bepis{ pixel_x = 13; pixel_y = 10 }, @@ -16207,10 +16207,10 @@ /area/redgate/facility/office6) "wPL" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/white, @@ -16437,7 +16437,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/facility/entrance) "xgW" = ( -/obj/item/weapon/paper/crumpled, +/obj/item/paper/crumpled, /obj/machinery/light/broken{ dir = 1 }, @@ -16463,10 +16463,10 @@ /area/redgate/facility/sw) "xiu" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/tiled/steel, @@ -16598,8 +16598,8 @@ /area/redgate/facility/cell29) "xsN" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, +/obj/item/paper_bin, +/obj/item/pen/blue, /turf/simulated/floor/wood/alt, /area/redgate/facility/ne) "xth" = ( @@ -16624,15 +16624,15 @@ icon_state = "1-8" }, /obj/structure/table/reinforced, -/obj/item/device/t_scanner/advanced, +/obj/item/t_scanner/advanced, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/redgate/facility/cell29) "xul" = ( /obj/structure/closet, -/obj/item/weapon/storage/bag/circuits/basic, +/obj/item/storage/bag/circuits/basic, /obj/item/integrated_circuit/output/led/blue, /obj/item/integrated_circuit/output/led/orange, -/obj/item/weapon/circuitboard/gyrotron, +/obj/item/circuitboard/gyrotron, /obj/fiftyspawner/steel, /turf/simulated/floor/tiled/eris/techmaint_perforated, /area/redgate/facility/sw) @@ -16701,7 +16701,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/facility/cell9) "xyt" = ( -/obj/item/weapon/paper, +/obj/item/paper, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell25) "xyV" = ( @@ -16767,18 +16767,18 @@ /area/redgate/facility/cell8) "xDC" = ( /obj/structure/closet/walllocker_double/science/north, -/obj/item/weapon/folder, +/obj/item/folder, /obj/random/mainttoyloot/nofail, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell26) "xDR" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = 2; pixel_y = 6 }, @@ -17122,7 +17122,7 @@ /area/redgate/facility/ne) "xYt" = ( /obj/structure/closet/walllocker_double/north, -/obj/item/weapon/entrepreneur/spirit_board, +/obj/item/entrepreneur/spirit_board, /obj/random/maintenance/research, /turf/simulated/floor/tiled/white, /area/redgate/facility/cell27) @@ -17182,10 +17182,10 @@ /area/redgate/facility/cell29) "yeR" = ( /obj/structure/table/steel, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = -5 }, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = 5 }, /turf/simulated/floor/tiled/eris/techmaint_perforated, @@ -17230,9 +17230,9 @@ /area/redgate/facility/cell26) "yhk" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /obj/machinery/light{ dir = 4 }, @@ -17275,7 +17275,7 @@ /area/redgate/facility/se) "ykE" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/storage/box/trackimp{ +/obj/item/storage/box/trackimp{ pixel_x = 5; pixel_y = 1 }, diff --git a/maps/redgate/facility_items.dm b/maps/redgate/facility_items.dm index 939f5bfed12..81fcc02eacd 100644 --- a/maps/redgate/facility_items.dm +++ b/maps/redgate/facility_items.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/card/id/keycard +/obj/item/card/id/keycard name = "keycard" desc = "Allows access to certain doors." icon_state = "keycard-red" @@ -6,20 +6,20 @@ light_color = "#0099ff" access = list(801) -/obj/item/weapon/card/id/keycard/update_icon() +/obj/item/card/id/keycard/update_icon() return -/obj/item/weapon/card/id/keycard/read() +/obj/item/card/id/keycard/read() to_chat(usr, "It is a red keycard, it must unlock something.") -/obj/item/weapon/card/id/keycard/attack_self(mob/living/user as mob) +/obj/item/card/id/keycard/attack_self(mob/living/user as mob) return -/obj/item/weapon/card/id/keycard/blue +/obj/item/card/id/keycard/blue icon_state = "keycard-blue" access = list(802) -/obj/item/weapon/card/id/keycard/green +/obj/item/card/id/keycard/green icon_state = "keycard-green" access = list(803) diff --git a/maps/redgate/falls/atoll_objs.dm b/maps/redgate/falls/atoll_objs.dm index d60d7b8e0b5..340b3c034aa 100644 --- a/maps/redgate/falls/atoll_objs.dm +++ b/maps/redgate/falls/atoll_objs.dm @@ -22,7 +22,7 @@ //Escape most railing interactions besides tackling people over them /obj/structure/railing/overhang/attackby(obj/item/W) - if(!istype(W, /obj/item/weapon/grab)) + if(!istype(W, /obj/item/grab)) return return ..() diff --git a/maps/redgate/falls/falls.dmm b/maps/redgate/falls/falls.dmm index 9a422349795..3a8cfeb690b 100644 --- a/maps/redgate/falls/falls.dmm +++ b/maps/redgate/falls/falls.dmm @@ -132,7 +132,7 @@ "jO" = (/obj/effect/decal/shadow/silhouette{icon_state = "silhouette"; dir = 1},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 8},/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "jP" = (/obj/structure/canopy/edge/south,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "jT" = (/obj/structure/canopy/edge/north,/turf/simulated/floor/atoll,/area/gateway/atoll/falls) -"jW" = (/obj/structure/canopy/edge/south,/obj/vehicle/boat{icon_state = "boat"; dir = 8},/obj/item/weapon/oar,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) +"jW" = (/obj/structure/canopy/edge/south,/obj/vehicle/boat{icon_state = "boat"; dir = 8},/obj/item/oar,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "jX" = (/obj/structure/railing/overhang/waterless,/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 4},/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "jZ" = (/obj/structure/canopy/edge/north,/obj/structure/temple,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "ka" = (/obj/structure/waterfall,/obj/structure/canopy_corner,/obj/effect/blocker,/turf/simulated/floor/atoll/vertical,/area/gateway/atoll/falls) @@ -234,7 +234,7 @@ "so" = (/obj/structure/railing/overhang/waterless,/obj/effect/decal/shadow/silhouette{icon_state = "silhouette"; dir = 1},/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "sr" = (/obj/effect/decal/godray{dir = 8},/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "sE" = (/obj/effect/decal/shadow/floor,/turf/simulated/floor/water/atoll/sunk,/area/gateway/atoll/falls) -"sH" = (/obj/vehicle/boat{icon_state = "boat"; dir = 4},/obj/item/weapon/oar,/turf/simulated/floor/water/atoll/sunk,/area/gateway/atoll/falls) +"sH" = (/obj/vehicle/boat{icon_state = "boat"; dir = 4},/obj/item/oar,/turf/simulated/floor/water/atoll/sunk,/area/gateway/atoll/falls) "sI" = (/obj/structure/aqueduct,/turf/simulated/floor/atoll,/area/gateway/atoll/falls) "sN" = (/obj/structure/waterfall,/obj/structure/railing/overhang/waterless,/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 8},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll/falls) "sU" = (/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 1},/obj/structure/railing/overhang,/obj/effect/decal/shadow/silhouette/pillar,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) @@ -397,7 +397,7 @@ "Ej" = (/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 8},/obj/structure/canopy/edge/north,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "Em" = (/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 4},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 8},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 1},/obj/effect/decal/shadow/silhouette/pillar,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "Ep" = (/obj/structure/canopy_corner{dir = 1},/obj/structure/flora/tree/atoll/mangrove,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) -"Eq" = (/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 4},/obj/vehicle/boat{icon_state = "boat"; dir = 8},/obj/item/weapon/oar,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) +"Eq" = (/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 4},/obj/vehicle/boat{icon_state = "boat"; dir = 8},/obj/item/oar,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "Er" = (/obj/structure/bed/chair/sofa/bench/marble,/obj/effect/floor_decal/atoll/bronze{dir = 1},/obj/effect/floor_decal/atoll/bronze{dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll/falls) "Et" = (/obj/structure/railing/overhang,/obj/structure/flora/tree/atoll/mangrove{dir = 1},/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "Ev" = (/obj/effect/floor_decal/atoll/border{dir = 8},/obj/structure/aqueduct,/turf/simulated/floor/atoll,/area/gateway/atoll/falls) @@ -410,7 +410,7 @@ "EW" = (/obj/effect/floor_decal/atoll/bronze{dir = 4},/obj/effect/floor_decal/atoll/bronze,/obj/structure/bed/chair/sofa/bench/marble{dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll/falls) "EY" = (/obj/effect/blocker,/obj/structure/canopy,/obj/structure/aqueduct,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "Fb" = (/obj/structure/canopy/edge/north,/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 1},/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) -"Ff" = (/obj/vehicle/boat{icon_state = "boat"; dir = 8},/obj/item/weapon/oar,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) +"Ff" = (/obj/vehicle/boat{icon_state = "boat"; dir = 8},/obj/item/oar,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "Fg" = (/obj/effect/floor_decal/atoll{dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll/falls) "Fr" = (/obj/structure/canopy,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "Fw" = (/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 1},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 8},/obj/effect/decal/shadow/silhouette/pillar,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) @@ -617,7 +617,7 @@ "UZ" = (/obj/effect/decal/shadow,/turf/simulated/floor/atoll/vertical,/area/gateway/atoll/falls) "Vc" = (/obj/effect/floor_decal/atoll/bronze{dir = 6},/obj/effect/floor_decal/atoll/border/invert{dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll/falls) "Vd" = (/obj/effect/floor_decal/atoll/bronze{dir = 4},/obj/effect/floor_decal/atoll/border{dir = 10},/turf/simulated/floor/atoll,/area/gateway/atoll/falls) -"Ve" = (/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 8},/obj/vehicle/boat{icon_state = "boat"; dir = 4},/obj/item/weapon/oar,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) +"Ve" = (/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 8},/obj/vehicle/boat{icon_state = "boat"; dir = 4},/obj/item/oar,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "Vg" = (/obj/effect/blocker,/obj/structure/canopy/edge/south,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "Vk" = (/obj/effect/decal/shadow/floor,/obj/effect/floor_decal/atoll{dir = 8},/obj/structure/bed/chair/sofa/bench/marble{dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll/falls) "Vn" = (/obj/structure/aqueduct/pillar{dir = 4},/obj/effect/decal/shadow/silhouette{icon_state = "silhouette"; dir = 1},/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) @@ -638,10 +638,10 @@ "WK" = (/obj/effect/floor_decal/atoll/stairs,/obj/effect/decal/shadow,/turf/simulated/floor/atoll,/area/gateway/atoll/falls) "WM" = (/obj/effect/decal/shadow/floor,/obj/effect/floor_decal/atoll/border{dir = 4},/obj/effect/floor_decal/atoll/bronze{dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll/falls) "WO" = (/obj/structure/canopy_corner{dir = 8},/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 8},/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) -"WP" = (/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 8},/obj/vehicle/boat{icon_state = "boat"; dir = 4},/obj/effect/decal/godray{dir = 1},/obj/item/weapon/oar,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) +"WP" = (/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 8},/obj/vehicle/boat{icon_state = "boat"; dir = 4},/obj/effect/decal/godray{dir = 1},/obj/item/oar,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "WQ" = (/obj/structure/canopy_corner,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "WS" = (/obj/effect/floor_decal/atoll/border{dir = 6},/obj/structure/bed/chair/sofa/bench/marble{dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll/falls) -"WV" = (/obj/vehicle/boat{icon_state = "boat"; dir = 4},/obj/item/weapon/oar,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) +"WV" = (/obj/vehicle/boat{icon_state = "boat"; dir = 4},/obj/item/oar,/turf/simulated/floor/water/atoll,/area/gateway/atoll/falls) "WW" = (/obj/effect/floor_decal/atoll/border{dir = 4},/obj/effect/floor_decal/atoll/border{dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll/falls) "WX" = (/obj/effect/floor_decal/atoll/bronze{dir = 8},/obj/effect/floor_decal/atoll/bronze,/obj/effect/floor_decal/atoll/bronze{dir = 1},/obj/structure/bed/chair/sofa/bench/marble{dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll/falls) "Xa" = (/obj/effect/floor_decal/atoll/border{dir = 10},/obj/structure/bed/chair/sofa/bench/marble{dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll/falls) diff --git a/maps/redgate/fantasy.dmm b/maps/redgate/fantasy.dmm index 789fa791626..55252e07c65 100644 --- a/maps/redgate/fantasy.dmm +++ b/maps/redgate/fantasy.dmm @@ -29,12 +29,12 @@ /area/redgate/fantasy/restaurant) "aj" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/slice/bread/filled, +/obj/item/reagent_containers/food/snacks/slice/bread/filled, /turf/simulated/floor/carpet/oracarpet, /area/redgate/fantasy/arena) "al" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/gun/launcher/crossbow/bow, +/obj/item/gun/launcher/crossbow/bow, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/guardhouse) "ao" = ( @@ -45,16 +45,16 @@ /area/redgate/fantasy/church) "ap" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/arrow/standard, +/obj/item/material/knife/butch, +/obj/item/arrow/standard, /obj/random/potion_base, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/guardhouse) "aq" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/food/condiment/vinegar, -/obj/item/weapon/reagent_containers/food/condiment/vinegar, -/obj/item/weapon/reagent_containers/food/condiment/vinegar, +/obj/item/reagent_containers/food/condiment/vinegar, +/obj/item/reagent_containers/food/condiment/vinegar, +/obj/item/reagent_containers/food/condiment/vinegar, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/farmhouse) "ar" = ( @@ -63,7 +63,7 @@ /area/redgate/fantasy/tavern) "as" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/machinery/light/small/torch{ dir = 4 }, @@ -78,11 +78,11 @@ /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/castle) "ax" = ( -/obj/item/weapon/material/knife/machete/hatchet/stone, +/obj/item/material/knife/machete/hatchet/stone, /turf/simulated/floor/outdoors/grass/seasonal, /area/redgate/fantasy/druid) "aA" = ( -/obj/item/weapon/reagent_containers/glass/bottle/potion/relaxation, +/obj/item/reagent_containers/glass/bottle/potion/relaxation, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "aB" = ( @@ -99,7 +99,7 @@ /area/redgate/fantasy/druid) "aE" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/twohanded/fireaxe{ +/obj/item/material/twohanded/fireaxe{ icon_state = "fireaxe_mask0"; name = "big axe" }, @@ -124,7 +124,7 @@ /area/redgate/fantasy/druid) "aQ" = ( /obj/structure/table/rack/wood, -/obj/item/weapon/shield/primitive, +/obj/item/shield/primitive, /obj/machinery/light/small/torch{ dir = 8 }, @@ -132,7 +132,7 @@ /area/redgate/fantasy/castle) "aS" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "aT" = ( @@ -170,7 +170,7 @@ /area/redgate/fantasy/rogue) "bn" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/pickaxe/hand, +/obj/item/pickaxe/hand, /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) "bo" = ( @@ -191,7 +191,7 @@ /area/redgate/fantasy/mininghouse) "bw" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread, +/obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bakery) "bx" = ( @@ -214,7 +214,7 @@ /area/redgate/fantasy/tavern) "bC" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot{ color = "#A1662F" }, /turf/simulated/floor/concrete, @@ -224,7 +224,7 @@ /obj/item/clothing/head/wizard/fake/realistic, /obj/item/clothing/suit/wizrobe, /obj/item/clothing/shoes/sandal, -/obj/item/weapon/staff, +/obj/item/staff, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/castle) "bE" = ( @@ -267,35 +267,35 @@ /area/redgate/fantasy/blacksmith) "bT" = ( /obj/structure/table/steel, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "This is a request to our staff adventuring out into this place: Please don't bring deadly weapons back to our ships and stations. If you have to, take them straight to security or research if appropriate. Thank you."; name = "Leave weapons here!" }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "This is a request to our staff adventuring out into this place: Please don't bring deadly weapons back to our ships and stations. If you have to, take them straight to security or research if appropriate. Thank you."; name = "Leave weapons here!" }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "This is a request to our staff adventuring out into this place: Please don't bring deadly weapons back to our ships and stations. If you have to, take them straight to security or research if appropriate. Thank you."; name = "Leave weapons here!" }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "This is a request to our staff adventuring out into this place: Please don't bring deadly weapons back to our ships and stations. If you have to, take them straight to security or research if appropriate. Thank you."; name = "Leave weapons here!" }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "This is a request to our staff adventuring out into this place: Please don't bring deadly weapons back to our ships and stations. If you have to, take them straight to security or research if appropriate. Thank you."; name = "Leave weapons here!" }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "This is a request to our staff adventuring out into this place: Please don't bring deadly weapons back to our ships and stations. If you have to, take them straight to security or research if appropriate. Thank you."; name = "Leave weapons here!" }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "This is a request to our staff adventuring out into this place: Please don't bring deadly weapons back to our ships and stations. If you have to, take them straight to security or research if appropriate. Thank you."; name = "Leave weapons here!" }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "This is a request to our staff adventuring out into this place: Please don't bring deadly weapons back to our ships and stations. If you have to, take them straight to security or research if appropriate. Thank you."; name = "Leave weapons here!" }, @@ -331,7 +331,7 @@ /area/redgate/fantasy/aliens) "cf" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "ch" = ( @@ -352,12 +352,12 @@ /area/redgate/fantasy/castle) "cl" = ( /obj/structure/table/rack/wood, -/obj/item/weapon/material/sword/rapier, +/obj/item/material/sword/rapier, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/rogue) "co" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood, /area/redgate/fantasy/blacksmith) "cq" = ( @@ -374,11 +374,11 @@ /area/redgate/fantasy/druid) "cs" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat, +/obj/item/reagent_containers/food/snacks/xenomeat, /turf/simulated/floor/wood, /area/redgate/fantasy/butcher) "ct" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/house) "cu" = ( @@ -451,17 +451,17 @@ /area/redgate/fantasy/alchemist) "cS" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/meatbun, +/obj/item/reagent_containers/food/snacks/meatbun, /turf/simulated/floor/carpet/oracarpet, /area/redgate/fantasy/arena) "cT" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/walls) "cU" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/pancakes, +/obj/item/reagent_containers/food/snacks/pancakes, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bakery) "cV" = ( @@ -490,8 +490,8 @@ /area/redgate/fantasy/aliens) "df" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/glass/bottle/potion/healing, -/obj/item/weapon/reagent_containers/glass/bottle/potion/healing, +/obj/item/reagent_containers/glass/bottle/potion/healing, +/obj/item/reagent_containers/glass/bottle/potion/healing, /turf/simulated/floor/wood, /area/redgate/fantasy/alchemist) "dg" = ( @@ -500,12 +500,12 @@ /area/redgate/fantasy/house) "dh" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/twohanded/baseballbat, +/obj/item/material/twohanded/baseballbat, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "di" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/reagent_containers/food/snacks/rawmeatball, +/obj/item/reagent_containers/food/snacks/rawmeatball, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "dj" = ( @@ -518,7 +518,7 @@ /area/redgate/fantasy/aliens) "dl" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/house) "dm" = ( @@ -545,7 +545,7 @@ /area/redgate/fantasy/streets) "du" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/bearmeat, +/obj/item/reagent_containers/food/snacks/bearmeat, /turf/simulated/floor/wood, /area/redgate/fantasy/butcher) "dw" = ( @@ -565,7 +565,7 @@ /area/redgate/fantasy/mininghouse) "dF" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/gun/launcher/crossbow/bow, +/obj/item/gun/launcher/crossbow/bow, /obj/machinery/light/small/torch{ dir = 8 }, @@ -593,7 +593,7 @@ /area/redgate/fantasy/streets) "dM" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/glass/bottle/potion/fire_resist, +/obj/item/reagent_containers/glass/bottle/potion/fire_resist, /turf/simulated/floor/wood, /area/redgate/fantasy/alchemist) "dO" = ( @@ -601,7 +601,7 @@ /turf/simulated/floor/wood, /area/redgate/fantasy/blacksmith) "dQ" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/gambling) "dU" = ( @@ -639,7 +639,7 @@ /area/redgate/fantasy/guardhouse) "eg" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/minihoe, +/obj/item/material/minihoe, /turf/simulated/floor/concrete, /area/redgate/fantasy/farmhouse) "ei" = ( @@ -718,12 +718,12 @@ /area/redgate/fantasy/jewler) "eE" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/food/drinks/bottle/holywater, /turf/simulated/floor/carpet/gaycarpet, /area/redgate/fantasy/castle) "eF" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/storage/bible, +/obj/item/storage/bible, /turf/simulated/floor/concrete, /area/redgate/fantasy/paladinhouse) "eH" = ( @@ -742,18 +742,18 @@ /area/redgate/fantasy/paladinhouse) "eN" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/quicheslice/filled, +/obj/item/reagent_containers/food/snacks/quicheslice/filled, /turf/simulated/floor/carpet/oracarpet, /area/redgate/fantasy/arena) "eO" = ( /obj/structure/closet/crate/wooden, -/obj/item/weapon/firework_star/weather/confetti, +/obj/item/firework_star/weather/confetti, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "eQ" = ( /obj/structure/table/woodentable, /obj/random/potion_ingredient, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Apprentice, I have written out these instructions so that you may operate the alembic in your own time without me needing to watch over your every step.

The alembic is simple to operate, simply activate the spontaneous heating stone beneath it to begin boiling the contents. However, the contents that you choose are critical in creating a potion of any merit, and mixing the wrong materials may create something completely useless, wasting our resources!

You must mix two materials, and only ever two. One primary ingredient, this can be one of many materials with valuable alchemical properties. The other is a potion base, this will be essential to properly break down and transmute the ingredient into a potent potion. Once you have added the two, boil as above, and collect the distilate in a bottle. As for choosing your base, here is a short guide, but be aware that the properties of an ingredient are not always immediately apparent and some experimentation may be required:

Alkahest is a potent solvent and particularly useful for dissolving metals.

Aqua Regia is a heavily corrosive mixture of acids that readily dissolve most organic materials.

Ichor is a rich ferrous fluid that binds well to minerals, it can often break down gemstones."; name = "alchemy instructions" }, @@ -776,8 +776,8 @@ /area/redgate/fantasy/bard) "eT" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake, +/obj/item/reagent_containers/food/snacks/sliceable/carrotcake, +/obj/item/reagent_containers/food/snacks/sliceable/carrotcake, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/grocery) "eV" = ( @@ -785,19 +785,19 @@ dir = 4 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/walls) "eW" = ( /obj/structure/table/marble, -/obj/item/weapon/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/church) "eX" = ( /obj/structure/closet/cabinet, /obj/item/clothing/accessory/maidcorset, /obj/item/clothing/under/dress/black_corset, -/obj/item/weapon/handcuffs/cable/plantfiber, +/obj/item/handcuffs/cable/plantfiber, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/washhouse) "eY" = ( @@ -814,7 +814,7 @@ /area/redgate/fantasy/arena) "fb" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/bearmeat, +/obj/item/reagent_containers/food/snacks/bearmeat, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/barbarian) "fc" = ( @@ -822,7 +822,7 @@ /area/redgate/fantasy/farmhouse) "ff" = ( /obj/structure/table/rack/wood, -/obj/item/weapon/gun/launcher/crossbow, +/obj/item/gun/launcher/crossbow, /obj/machinery/light/small/torch{ dir = 4 }, @@ -884,7 +884,7 @@ /area/redgate/fantasy/blacksmith) "fz" = ( /obj/structure/bookcase, -/obj/item/weapon/book/custom_library/fiction/truelovehathmyheart, +/obj/item/book/custom_library/fiction/truelovehathmyheart, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "fB" = ( @@ -912,7 +912,7 @@ /area/redgate/fantasy/castle) "fH" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/farmhouse) "fJ" = ( @@ -921,7 +921,7 @@ /area/redgate/fantasy/gambling) "fL" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, +/obj/item/bedsheet/purpledouble, /turf/simulated/floor/carpet/purple, /area/redgate/fantasy/bard) "fM" = ( @@ -949,9 +949,9 @@ /area/redgate/fantasy/bard) "fY" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) "ga" = ( @@ -1001,8 +1001,8 @@ /area/redgate/fantasy/blacksmith) "gx" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/knife/butch, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/tavern) "gz" = ( @@ -1043,7 +1043,7 @@ /area/redgate/fantasy/gambling) "gN" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/bun, +/obj/item/reagent_containers/food/snacks/bun, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bakery) "gO" = ( @@ -1076,7 +1076,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/fantasy/cafe) "ha" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood, /area/redgate/fantasy/paladinhouse) "hg" = ( @@ -1086,7 +1086,7 @@ /obj/structure/closet/cabinet, /obj/item/clothing/head/fancy_crown, /obj/item/clothing/suit/wizrobe/magusred, -/obj/item/weapon/material/sword/sabre{ +/obj/item/material/sword/sabre{ color = "#FFD700" }, /turf/simulated/floor/carpet, @@ -1172,7 +1172,7 @@ /area/redgate/fantasy/tavern) "hR" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hosdouble, +/obj/item/bedsheet/hosdouble, /obj/structure/curtain{ color = "#FF0000" }, @@ -1210,7 +1210,7 @@ "hZ" = ( /obj/structure/table/rack/shelf/wood, /obj/random/soap, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bard) "ia" = ( @@ -1219,7 +1219,7 @@ /area/redgate/fantasy/farmhouse) "ic" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/fishing_rod/built, +/obj/item/material/fishing_rod/built, /turf/simulated/floor/outdoors/grass/seasonal, /area/redgate/fantasy/streets) "id" = ( @@ -1253,7 +1253,7 @@ /area/redgate/fantasy/jewler) "in" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/farmhouse) "io" = ( @@ -1298,8 +1298,8 @@ /obj/item/clothing/shoes/knight/black, /obj/item/clothing/gloves/combat/knight/brown, /obj/item/clothing/head/helmet/gladiator, -/obj/item/weapon/shield/primitive, -/obj/item/weapon/handcuffs/cable/plantfiber, +/obj/item/shield/primitive, +/obj/item/handcuffs/cable/plantfiber, /turf/simulated/floor/concrete, /area/redgate/fantasy/walls) "iD" = ( @@ -1323,7 +1323,7 @@ /area/redgate/fantasy/farmhouse) "iJ" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/redgate) "iK" = ( @@ -1340,8 +1340,8 @@ /area/redgate/fantasy/gambling) "iQ" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/material/twohanded/fireaxe/foam, -/obj/item/weapon/material/twohanded/fireaxe/foam, +/obj/item/material/twohanded/fireaxe/foam, +/obj/item/material/twohanded/fireaxe/foam, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "iS" = ( @@ -1353,7 +1353,7 @@ /area/redgate/fantasy/house) "iV" = ( /obj/structure/table/rack/wood, -/obj/item/weapon/material/sword/longsword, +/obj/item/material/sword/longsword, /obj/structure/prop/fantasy/pinkbanner{ pixel_y = 32 }, @@ -1385,7 +1385,7 @@ /area/redgate/fantasy/arena) "jc" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/golden_cup, +/obj/item/reagent_containers/food/drinks/golden_cup, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/church) "je" = ( @@ -1401,26 +1401,26 @@ /area/redgate/fantasy/paladinhouse) "jj" = ( /obj/structure/closet/walllocker/wooden/north, -/obj/item/weapon/material/knife/table, -/obj/item/weapon/material/knife/table, -/obj/item/weapon/material/knife/table, -/obj/item/weapon/material/knife/table, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/material/knife/table, +/obj/item/material/knife/table, +/obj/item/material/knife/table, +/obj/item/material/knife/table, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/farmhouse) "jl" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/chroniclesofmargatavol1, +/obj/item/book/bundle/custom_library/fiction/chroniclesofmargatavol1, /obj/machinery/light/small/torch{ dir = 1 }, @@ -1444,7 +1444,7 @@ /area/redgate/fantasy/house) "jv" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/tofubread, +/obj/item/reagent_containers/food/snacks/sliceable/tofubread, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bakery) "jw" = ( @@ -1453,7 +1453,7 @@ /area/redgate/fantasy/farmhouse) "jx" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/jewler) "jz" = ( @@ -1466,7 +1466,7 @@ /turf/simulated/floor/tiled/techfloor, /area/redgate/fantasy/aliens) "jD" = ( -/obj/item/weapon/mop, +/obj/item/mop, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/castle) "jG" = ( @@ -1489,7 +1489,7 @@ /area/redgate/fantasy/tavern) "jM" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/castle) "jO" = ( @@ -1555,7 +1555,7 @@ /area/redgate/fantasy/house) "kg" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/concrete, /area/redgate/fantasy/walls) "ki" = ( @@ -1614,7 +1614,7 @@ /area/redgate/fantasy/castle) "kH" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, +/obj/item/bedsheet/purpledouble, /turf/simulated/floor/wood, /area/redgate/fantasy/alchemist) "kJ" = ( @@ -1622,12 +1622,12 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/carpet/green, /area/redgate/fantasy/gambling) "kK" = ( /obj/structure/table/woodentable, -/obj/item/weapon/pen/crayon/blue{ +/obj/item/pen/crayon/blue{ name = "chalk" }, /turf/simulated/floor/wood, @@ -1646,16 +1646,16 @@ /area/redgate/fantasy/arena) "kO" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/cafe) "kP" = ( @@ -1673,7 +1673,7 @@ /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/restaurant) "kU" = ( -/obj/item/weapon/reagent_containers/glass/bottle/potion/faerie, +/obj/item/reagent_containers/glass/bottle/potion/faerie, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "kX" = ( @@ -1696,7 +1696,7 @@ /area/redgate/fantasy/jewler) "lb" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/restaurant) "ld" = ( @@ -1726,7 +1726,7 @@ /area/redgate/fantasy/shop) "lk" = ( /obj/structure/bookcase, -/obj/item/weapon/book/custom_library/religious/wayofbleedingswan, +/obj/item/book/custom_library/religious/wayofbleedingswan, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "ll" = ( @@ -1780,7 +1780,7 @@ /area/redgate/fantasy/paladinhouse) "ly" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/orangedouble, +/obj/item/bedsheet/orangedouble, /obj/machinery/light/small/torch{ dir = 4 }, @@ -1793,7 +1793,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/fantasy/cafe) "lC" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/concrete, /area/redgate/fantasy/guardhouse) "lF" = ( @@ -1814,7 +1814,7 @@ /obj/structure/closet/crate/wooden, /obj/item/clothing/under/primitive, /obj/item/clothing/shoes/primitive, -/obj/item/weapon/material/twohanded/staff, +/obj/item/material/twohanded/staff, /obj/item/clothing/accessory/poncho/roles/cloak{ name = "simple cloak" }, @@ -1848,7 +1848,7 @@ /area/redgate/fantasy/castle) "lR" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/flatbread, +/obj/item/reagent_containers/food/snacks/flatbread, /obj/machinery/light/small/torch{ dir = 4 }, @@ -1856,8 +1856,8 @@ /area/redgate/fantasy/bakery) "lS" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/knife/butch, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "lT" = ( @@ -1878,7 +1878,7 @@ /area/redgate/fantasy/washhouse) "ma" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/simulated/floor/concrete, /area/redgate/fantasy/blacksmith) "md" = ( @@ -1903,7 +1903,7 @@ /area/redgate/fantasy/butcher) "ml" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/fishing_net, +/obj/item/material/fishing_net, /turf/simulated/floor/outdoors/grass/seasonal, /area/redgate/fantasy/streets) "mm" = ( @@ -1931,7 +1931,7 @@ /area/redgate/fantasy/restaurant) "mn" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/wood, /area/redgate/fantasy/butcher) "mo" = ( @@ -1941,7 +1941,7 @@ /obj/item/clothing/mask/smokable/cigarette/cigar, /obj/item/clothing/mask/smokable/cigarette/cigar, /obj/item/clothing/mask/smokable/cigarette/cigar, -/obj/item/weapon/storage/box/matches, +/obj/item/storage/box/matches, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/house) "mp" = ( @@ -1950,7 +1950,7 @@ /area/redgate/fantasy/blacksmith) "mq" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, +/obj/item/bedsheet/purpledouble, /turf/simulated/floor/carpet/gaycarpet, /area/redgate/fantasy/castle) "ms" = ( @@ -2019,7 +2019,7 @@ /area/redgate/fantasy/paladinhouse) "mG" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/bible, +/obj/item/storage/bible, /turf/simulated/floor/concrete, /area/redgate/fantasy/paladinhouse) "mL" = ( @@ -2034,7 +2034,7 @@ /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/ranger) "mM" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/jewler) "mO" = ( @@ -2042,7 +2042,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/carpet/green, /area/redgate/fantasy/gambling) "mQ" = ( @@ -2058,7 +2058,7 @@ /area/redgate/fantasy/arena) "mT" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/farmhouse) "mU" = ( @@ -2092,7 +2092,7 @@ /area/redgate/fantasy/butcher) "ng" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/house) "nj" = ( @@ -2105,7 +2105,7 @@ /area/redgate/fantasy/house) "nn" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/storage/bag/ore, +/obj/item/storage/bag/ore, /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) "nr" = ( @@ -2175,7 +2175,7 @@ /area/redgate/fantasy/house) "nJ" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/cedouble, +/obj/item/bedsheet/cedouble, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/jewler) "nK" = ( @@ -2184,18 +2184,18 @@ /area/redgate/fantasy/farmhouse) "nM" = ( /obj/structure/closet/crate/wooden, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/shovel/spade, +/obj/item/material/minihoe, +/obj/item/shovel/spade, /turf/simulated/floor/wood, /area/redgate/fantasy/druid) "nN" = ( /obj/structure/table/marble, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/scalpel, /turf/simulated/floor/concrete, /area/redgate/fantasy/churchhouse) "nP" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/bread, +/obj/item/reagent_containers/food/snacks/sliceable/bread, /obj/machinery/light/small/torch{ dir = 4 }, @@ -2227,7 +2227,7 @@ /turf/simulated/floor/concrete, /area/redgate/fantasy/arena) "nX" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/tavern) "nY" = ( @@ -2247,8 +2247,8 @@ /area/redgate/fantasy/gambling) "od" = ( /obj/structure/closet/crate/wooden, -/obj/item/device/flashlight/lantern, -/obj/item/weapon/material/knife/tacknife/boot, +/obj/item/flashlight/lantern, +/obj/item/material/knife/tacknife/boot, /obj/random/potion_ingredient, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/walls) @@ -2280,15 +2280,15 @@ /area/redgate/fantasy/streets) "oq" = ( /obj/structure/closet/walllocker/wooden/north, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/carpet/purcarpet, /area/redgate/fantasy/washhouse) "os" = ( @@ -2297,7 +2297,7 @@ /area/redgate/fantasy/house) "ot" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/tavern) "ou" = ( @@ -2308,13 +2308,13 @@ /area/redgate/fantasy/castle) "oz" = ( /obj/structure/closet/walllocker/wooden/north, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/concrete, /area/redgate/fantasy/arena) "oA" = ( @@ -2344,7 +2344,7 @@ /area/redgate/fantasy/castle) "oH" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Apprentice, I have written out these instructions so that you may operate the alembic in your own time without me needing to watch over your every step.

The alembic is simple to operate, simply activate the spontaneous heating stone beneath it to begin boiling the contents. However, the contents that you choose are critical in creating a potion of any merit, and mixing the wrong materials may create something completely useless, wasting our resources!

You must mix two materials, and only ever two. One primary ingredient, this can be one of many materials with valuable alchemical properties. The other is a potion base, this will be essential to properly break down and transmute the ingredient into a potent potion. Once you have added the two, boil as above, and collect the distilate in a bottle. As for choosing your base, here is a short guide, but be aware that the properties of an ingredient are not always immediately apparent and some experimentation may be required:

Alkahest is a potent solvent and particularly useful for dissolving metals.

Aqua Regia is a heavily corrosive mixture of acids that readily dissolve most organic materials.

Ichor is a rich ferrous fluid that binds well to minerals, it can often break down gemstones."; name = "alchemy instructions" }, @@ -2359,61 +2359,61 @@ /area/redgate/fantasy/aliens) "oJ" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/tray, -/obj/item/weapon/tray, -/obj/item/weapon/tray, -/obj/item/weapon/material/knife{ +/obj/item/tray, +/obj/item/tray, +/obj/item/tray, +/obj/item/material/knife{ default_material = "gold" }, -/obj/item/weapon/material/knife{ +/obj/item/material/knife{ default_material = "gold" }, -/obj/item/weapon/material/knife{ +/obj/item/material/knife{ default_material = "gold" }, -/obj/item/weapon/material/knife{ +/obj/item/material/knife{ default_material = "gold" }, -/obj/item/weapon/material/knife{ +/obj/item/material/knife{ default_material = "gold" }, -/obj/item/weapon/material/knife{ +/obj/item/material/knife{ default_material = "gold" }, -/obj/item/weapon/material/kitchen/utensil/fork{ +/obj/item/material/kitchen/utensil/fork{ default_material = "gold" }, -/obj/item/weapon/material/kitchen/utensil/fork{ +/obj/item/material/kitchen/utensil/fork{ default_material = "gold" }, -/obj/item/weapon/material/kitchen/utensil/fork{ +/obj/item/material/kitchen/utensil/fork{ default_material = "gold" }, -/obj/item/weapon/material/kitchen/utensil/fork{ +/obj/item/material/kitchen/utensil/fork{ default_material = "gold" }, -/obj/item/weapon/material/kitchen/utensil/fork{ +/obj/item/material/kitchen/utensil/fork{ default_material = "gold" }, -/obj/item/weapon/material/kitchen/utensil/fork{ +/obj/item/material/kitchen/utensil/fork{ default_material = "gold" }, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/spoon{ default_material = "gold" }, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/spoon{ default_material = "gold" }, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/spoon{ default_material = "gold" }, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/spoon{ default_material = "gold" }, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/spoon{ default_material = "gold" }, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/spoon{ default_material = "gold" }, /turf/simulated/floor/concrete, @@ -2431,18 +2431,18 @@ /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bakery) "oV" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /obj/machinery/light/small/torch, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/house) "oW" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/berryclafoutis, +/obj/item/reagent_containers/food/snacks/berryclafoutis, /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) "oX" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood, /area/redgate/fantasy/butcher) "pa" = ( @@ -2451,7 +2451,7 @@ /area/redgate/fantasy/bard) "pb" = ( /obj/structure/table/woodentable, -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/jewler) "pc" = ( @@ -2473,8 +2473,8 @@ /area/redgate/fantasy/aliens) "pg" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/bread, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/bread, +/obj/item/reagent_containers/food/snacks/sliceable/bread, +/obj/item/reagent_containers/food/snacks/sliceable/bread, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/grocery) "pi" = ( @@ -2483,7 +2483,7 @@ /area/redgate/fantasy/house) "pj" = ( /obj/structure/table/woodentable, -/obj/item/weapon/shovel/spade, +/obj/item/shovel/spade, /turf/simulated/floor/concrete, /area/redgate/fantasy/farmhouse) "pl" = ( @@ -2555,13 +2555,13 @@ /area/redgate/fantasy/bard) "pI" = ( /obj/structure/table/woodentable, -/obj/item/weapon/potion_material/blood_ruby, +/obj/item/potion_material/blood_ruby, /turf/simulated/floor/wood, /area/redgate/fantasy/alchemist) "pJ" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/sexyclown, -/obj/item/weapon/handcuffs/cable/plantfiber, +/obj/item/handcuffs/cable/plantfiber, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/washhouse) "pK" = ( @@ -2579,7 +2579,7 @@ "pQ" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/dress/westernbustle, -/obj/item/weapon/storage/wallet, +/obj/item/storage/wallet, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/tavern) "pS" = ( @@ -2588,7 +2588,7 @@ /area/redgate/fantasy/castle) "pU" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /obj/machinery/light/small/torch, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) @@ -2655,7 +2655,7 @@ /area/redgate/fantasy/walls) "qm" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/restaurant) "qp" = ( @@ -2684,7 +2684,7 @@ /area/redgate/fantasy/bard) "qB" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, +/obj/item/bedsheet/purpledouble, /obj/structure/curtain{ color = "#FF0000" }, @@ -2703,7 +2703,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/fantasy/shop) "qI" = ( -/obj/item/weapon/potion_material/fairy_house, +/obj/item/potion_material/fairy_house, /turf/simulated/floor/outdoors/grass/seasonal/notrees, /area/redgate/fantasy/streets) "qK" = ( @@ -2736,14 +2736,14 @@ /obj/random/meat, /obj/random/meat, /obj/random/meat, -/obj/item/weapon/reagent_containers/food/snacks/flatbread, -/obj/item/weapon/reagent_containers/food/snacks/flatbread, -/obj/item/weapon/reagent_containers/food/snacks/flatbread, -/obj/item/weapon/reagent_containers/food/snacks/flatbread, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/bread, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/bread, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/bread, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/bread, +/obj/item/reagent_containers/food/snacks/flatbread, +/obj/item/reagent_containers/food/snacks/flatbread, +/obj/item/reagent_containers/food/snacks/flatbread, +/obj/item/reagent_containers/food/snacks/flatbread, +/obj/item/reagent_containers/food/snacks/sliceable/bread, +/obj/item/reagent_containers/food/snacks/sliceable/bread, +/obj/item/reagent_containers/food/snacks/sliceable/bread, +/obj/item/reagent_containers/food/snacks/sliceable/bread, /obj/machinery/light/small/torch{ dir = 8 }, @@ -2791,7 +2791,7 @@ /area/redgate/fantasy/arena) "rg" = ( /obj/structure/closet/crate/wooden, -/obj/item/weapon/pickaxe/gold, +/obj/item/pickaxe/gold, /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) "rh" = ( @@ -2801,7 +2801,7 @@ /area/redgate/fantasy/rogue) "ri" = ( /obj/structure/table/gamblingtable, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/carpet/green, /area/redgate/fantasy/gambling) "rk" = ( @@ -2823,23 +2823,23 @@ /turf/simulated/floor/concrete, /area/redgate/fantasy/blacksmith) "ru" = ( -/obj/item/weapon/potion_base/aqua_regia, +/obj/item/potion_base/aqua_regia, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "rv" = ( /obj/structure/closet/crate/wooden, -/obj/item/weapon/material/star/ninja, -/obj/item/weapon/material/star/ninja, -/obj/item/weapon/material/star/ninja, -/obj/item/weapon/material/star/ninja, -/obj/item/weapon/material/star/ninja, +/obj/item/material/star/ninja, +/obj/item/material/star/ninja, +/obj/item/material/star/ninja, +/obj/item/material/star/ninja, +/obj/item/material/star/ninja, /obj/item/clothing/accessory/gaiter/charcoal, /obj/item/clothing/under/shiny/catsuit, /obj/item/clothing/head/shiny_hood, /obj/item/clothing/accessory/shiny/gloves, /obj/item/clothing/accessory/shiny/socks, /obj/random/potion, -/obj/item/weapon/handcuffs/legcuffs/bola, +/obj/item/handcuffs/legcuffs/bola, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/house) "rx" = ( @@ -2855,7 +2855,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "rz" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bakery) "rB" = ( @@ -2890,7 +2890,7 @@ /turf/simulated/floor/concrete, /area/redgate/fantasy/arena) "rL" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /obj/machinery/light/small/torch{ @@ -3003,7 +3003,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/fantasy/tavern) "sq" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/redgate) "ss" = ( @@ -3041,12 +3041,12 @@ /turf/simulated/wall/wood, /area/redgate/fantasy/aliens) "sK" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/restaurant) "sL" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/cafe) "sN" = ( @@ -3079,13 +3079,13 @@ /area/redgate/fantasy/guardhouse) "sZ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, /turf/simulated/floor/wood, /area/redgate/fantasy/paladinhouse) "tc" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/material/knife/tacknife, -/obj/item/weapon/material/knife/tacknife, +/obj/item/material/knife/tacknife, +/obj/item/material/knife/tacknife, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/rogue) "td" = ( @@ -3176,21 +3176,21 @@ /area/redgate/fantasy/grocery) "tG" = ( /obj/structure/closet/walllocker/wooden/north, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/glass_extra/straw, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/glass_extra/straw, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/restaurant) "tJ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bard) "tK" = ( @@ -3210,17 +3210,17 @@ /area/redgate/fantasy/streets) "tO" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /obj/structure/closet/walllocker/wooden/north, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/tavern) @@ -3240,7 +3240,7 @@ dir = 1 }, /obj/structure/table/alien/blue, -/obj/item/weapon/paper/alien{ +/obj/item/paper/alien{ info = "Thus far the mission has been a success, we've managed to integrate ourselves into the local community without arousing suspicion.

We had initially overestimated the technological level of the locals, and their initial encounters with our equipment did cause a concern. However, we were able to latch onto their superstitious beliefs in magic to explain away the abilities that we possess. To enhance this perception, we've taken to hiding our technology in more mundane looking materials, and the townsfolk appear to be content with this." }, /turf/simulated/floor/tiled/milspec/sterile, @@ -3267,7 +3267,7 @@ /area/redgate/fantasy/house) "ud" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/reagent_containers/food/drinks/golden_cup, +/obj/item/reagent_containers/food/drinks/golden_cup, /turf/simulated/floor/carpet/gaycarpet, /area/redgate/fantasy/castle) "ue" = ( @@ -3320,7 +3320,7 @@ /area/redgate/fantasy/paladinhouse) "uq" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/cookie, +/obj/item/reagent_containers/food/snacks/cookie, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bakery) "ur" = ( @@ -3342,24 +3342,24 @@ /area/redgate/fantasy/cafe) "uu" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, /obj/structure/closet/walllocker/wooden/south, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/tavern) @@ -3370,7 +3370,7 @@ /area/redgate/fantasy/castle) "uC" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/tacknife/boot, +/obj/item/material/knife/tacknife/boot, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/house) "uD" = ( @@ -3400,7 +3400,7 @@ /area/redgate/fantasy/tavern) "uR" = ( /obj/structure/table/rack/wood, -/obj/item/weapon/material/sword/katana, +/obj/item/material/sword/katana, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/castle) "uT" = ( @@ -3430,10 +3430,10 @@ /area/redgate/fantasy/mininghouse) "uZ" = ( /obj/structure/closet/cabinet, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/item/clothing/under/redpyjamas, /obj/item/clothing/under/assistantformal, -/obj/item/weapon/storage/wallet, +/obj/item/storage/wallet, /obj/item/clothing/mask/gas/plaguedoctor, /turf/simulated/floor/wood, /area/redgate/fantasy/alchemist) @@ -3442,12 +3442,12 @@ /area/redgate/fantasy/cafe) "vb" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread, +/obj/item/reagent_containers/food/snacks/sliceable/meatbread, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bakery) "ve" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/cafe) "vf" = ( @@ -3473,14 +3473,14 @@ /area/redgate/fantasy/jewler) "vm" = ( /obj/structure/table/rack/wood, -/obj/item/weapon/melee/chainofcommand{ +/obj/item/melee/chainofcommand{ name = "iron whip" }, /turf/simulated/floor/concrete, /area/redgate/fantasy/arena) "vn" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/silence, +/obj/item/book/bundle/custom_library/fiction/silence, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "vo" = ( @@ -3497,8 +3497,8 @@ /area/redgate/fantasy/jewler) "vq" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/material/twohanded/spear/foam, -/obj/item/weapon/material/twohanded/spear/foam, +/obj/item/material/twohanded/spear/foam, +/obj/item/material/twohanded/spear/foam, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "vt" = ( @@ -3539,7 +3539,7 @@ /area/redgate/fantasy/jewler) "vI" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper, +/obj/item/paper, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/guardhouse) "vJ" = ( @@ -3588,7 +3588,7 @@ /turf/simulated/floor/carpet, /area/redgate/fantasy/castle) "vU" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/concrete, /area/redgate/fantasy/farmhouse) "vX" = ( @@ -3601,7 +3601,7 @@ /area/redgate/fantasy/washhouse) "vZ" = ( /obj/structure/bookcase, -/obj/item/weapon/book/custom_library/fiction/blacksmithandkinglybloke, +/obj/item/book/custom_library/fiction/blacksmithandkinglybloke, /obj/machinery/light/small/torch, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) @@ -3636,7 +3636,7 @@ /turf/simulated/floor/carpet, /area/redgate/fantasy/castle) "wh" = ( -/obj/item/weapon/shovel/wood, +/obj/item/shovel/wood, /turf/simulated/floor/wood, /area/redgate/fantasy/druid) "wi" = ( @@ -3658,7 +3658,7 @@ /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/washhouse) "wq" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bard) "wr" = ( @@ -3742,7 +3742,7 @@ /area/redgate/fantasy/castle) "wX" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/barbarian) "wY" = ( @@ -3763,7 +3763,7 @@ /area/redgate/fantasy/alchemist) "xb" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/beetsoup, +/obj/item/reagent_containers/food/snacks/beetsoup, /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) "xc" = ( @@ -3779,8 +3779,8 @@ /area/redgate/fantasy/bard) "xf" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /obj/machinery/light/small/torch{ dir = 4 }, @@ -3836,7 +3836,7 @@ /area/redgate/fantasy/bakery) "xu" = ( /obj/structure/table/woodentable, -/obj/item/weapon/potion_material/frozen_dew, +/obj/item/potion_material/frozen_dew, /turf/simulated/floor/wood, /area/redgate/fantasy/alchemist) "xy" = ( @@ -3853,9 +3853,9 @@ /obj/item/clothing/suit/wizrobe/fake{ color = "#000000" }, -/obj/item/weapon/staff/broom, +/obj/item/staff/broom, /obj/item/clothing/shoes/sandal, -/obj/item/weapon/material/knife/stone/bone, +/obj/item/material/knife/stone/bone, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/redgate) "xA" = ( @@ -3930,7 +3930,7 @@ /area/redgate/fantasy/farmhouse) "xU" = ( /obj/structure/table/rack/wood, -/obj/item/weapon/material/knife/machete/hatchet/unathiknife, +/obj/item/material/knife/machete/hatchet/unathiknife, /obj/structure/prop/fantasy/pinkbanner{ pixel_y = 32 }, @@ -3944,8 +3944,8 @@ /area/redgate/fantasy/farmhouse) "xX" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/grocery) "xY" = ( @@ -3996,7 +3996,7 @@ /obj/item/clothing/mask/smokable/cigarette/cigar, /obj/item/clothing/mask/smokable/cigarette/cigar, /obj/item/clothing/mask/smokable/cigarette/cigar, -/obj/item/weapon/storage/box/matches, +/obj/item/storage/box/matches, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "yp" = ( @@ -4016,14 +4016,14 @@ /area/redgate/fantasy/cafe) "yy" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/glass/bucket/wood, -/obj/item/weapon/reagent_containers/glass/bucket/wood, -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/shop) "yA" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/pen/crayon/red{ +/obj/item/pen/crayon/red{ name = "chalk" }, /turf/simulated/floor/concrete, @@ -4035,8 +4035,8 @@ /area/redgate/fantasy/churchhouse) "yC" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /obj/machinery/light/small/torch{ dir = 8 }, @@ -4081,21 +4081,21 @@ /area/redgate/fantasy/hedgemaze) "yR" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/carpet/purple, /area/redgate/fantasy/bard) "yT" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/farmhouse) "yV" = ( /obj/structure/table/rack/wood, -/obj/item/weapon/material/sword/longsword, +/obj/item/material/sword/longsword, /obj/structure/prop/fantasy/redbanner{ pixel_y = 32 }, @@ -4168,7 +4168,7 @@ /area/redgate/fantasy/guardhouse) "zp" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle/candelabra/everburn, +/obj/item/flame/candle/candelabra/everburn, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/cafe) "zq" = ( @@ -4181,7 +4181,7 @@ /area/redgate/fantasy/streets) "zx" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper, +/obj/item/paper, /turf/simulated/floor/wood, /area/redgate/fantasy/alchemist) "zz" = ( @@ -4216,7 +4216,7 @@ /area/redgate/fantasy/aliens) "zK" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/food/drinks/bottle/holywater, /turf/simulated/floor/concrete, /area/redgate/fantasy/paladinhouse) "zP" = ( @@ -4263,7 +4263,7 @@ /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/castle) "Ae" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "Af" = ( @@ -4299,8 +4299,8 @@ /area/redgate/fantasy/churchhouse) "Ao" = ( /obj/structure/closet/crate/wooden, -/obj/item/device/flashlight/lantern, -/obj/item/weapon/material/knife/tacknife/boot, +/obj/item/flashlight/lantern, +/obj/item/material/knife/tacknife/boot, /obj/random/fantasy_item, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/walls) @@ -4310,13 +4310,13 @@ /area/redgate/fantasy/house) "Aq" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/moneybag, -/obj/item/weapon/simple_key/dungeon, +/obj/item/moneybag, +/obj/item/simple_key/dungeon, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "As" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/bun, +/obj/item/reagent_containers/food/snacks/bun, /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) "At" = ( @@ -4324,10 +4324,10 @@ /area/redgate/fantasy/bakery) "Au" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper/crumpled, -/obj/item/weapon/paper/crumpled, -/obj/item/weapon/paper/crumpled, -/obj/item/weapon/paper/crumpled, +/obj/item/paper/crumpled, +/obj/item/paper/crumpled, +/obj/item/paper/crumpled, +/obj/item/paper/crumpled, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/farmhouse) "Av" = ( @@ -4339,7 +4339,7 @@ /turf/simulated/wall/stonelogs, /area/redgate/fantasy/churchhouse) "Az" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/grocery) "AA" = ( @@ -4368,7 +4368,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/fantasy/farmhouse) "AL" = ( -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/simulated/floor/concrete, /area/redgate/fantasy/farmhouse) "AN" = ( @@ -4378,21 +4378,21 @@ /area/redgate/fantasy/castle) "AO" = ( /obj/structure/table/woodentable, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/washhouse) "AQ" = ( /obj/structure/bookcase, -/obj/item/weapon/book/custom_library/fiction/myrock, +/obj/item/book/custom_library/fiction/myrock, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/redgate) "AR" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/stone/wood, +/obj/item/material/knife/stone/wood, /turf/simulated/floor/wood, /area/redgate/fantasy/druid) "AS" = ( @@ -4414,12 +4414,12 @@ /area/redgate/fantasy/aliens) "AY" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/manfromsnowyriver, +/obj/item/book/bundle/custom_library/fiction/manfromsnowyriver, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "Ba" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread, +/obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread, /obj/machinery/light/small/torch{ dir = 4 }, @@ -4427,7 +4427,7 @@ /area/redgate/fantasy/bakery) "Bb" = ( /obj/structure/table/woodentable, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/wood, /area/redgate/fantasy/blacksmith) "Bd" = ( @@ -4459,7 +4459,7 @@ /area/redgate/fantasy/washhouse) "Bn" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/barbarian) "Bp" = ( @@ -4485,13 +4485,13 @@ /area/redgate/fantasy/house) "Bz" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/material/knife/tacknife/boot, +/obj/item/material/knife/tacknife/boot, /turf/simulated/floor/concrete, /area/redgate/fantasy/blacksmith) "BA" = ( /obj/structure/closet/crate/chest, /obj/random/fantasy_item, -/obj/item/weapon/material/sword/longsword, +/obj/item/material/sword/longsword, /obj/item/clothing/suit/armor/combat/imperial, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/guardhouse) @@ -4528,7 +4528,7 @@ /area/redgate/fantasy/paladinhouse) "BN" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/greendouble, +/obj/item/bedsheet/greendouble, /turf/simulated/floor/carpet/green, /area/redgate/fantasy/house) "BQ" = ( @@ -4537,8 +4537,8 @@ /area/redgate/fantasy/restaurant) "BT" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/material/sword/foam, -/obj/item/weapon/material/sword/foam, +/obj/item/material/sword/foam, +/obj/item/material/sword/foam, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "BY" = ( @@ -4546,7 +4546,7 @@ /area/redgate/fantasy/arena) "Ca" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/bottle/potion, +/obj/item/reagent_containers/glass/bottle/potion, /obj/machinery/light/small/torch{ dir = 1 }, @@ -4559,16 +4559,16 @@ "Cf" = ( /obj/structure/table/woodentable, /obj/structure/closet/walllocker/wooden/south, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "Cg" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "Ci" = ( @@ -4577,8 +4577,8 @@ /obj/item/clothing/shoes/knight/black, /obj/item/clothing/gloves/combat/knight/brown, /obj/item/clothing/head/helmet/gladiator, -/obj/item/weapon/shield/primitive, -/obj/item/weapon/handcuffs/cable/plantfiber, +/obj/item/shield/primitive, +/obj/item/handcuffs/cable/plantfiber, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/guardhouse) "Ck" = ( @@ -4598,8 +4598,8 @@ /area/redgate/fantasy/blacksmith) "Cu" = ( /obj/structure/closet/crate/wooden, -/obj/item/device/flashlight/lantern, -/obj/item/weapon/material/knife/tacknife/boot, +/obj/item/flashlight/lantern, +/obj/item/material/knife/tacknife/boot, /obj/random/potion_base, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/walls) @@ -4652,12 +4652,12 @@ /area/redgate/fantasy/streets) "CI" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/material/knife/stone/wood, +/obj/item/material/knife/stone/wood, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/rogue) "CK" = ( /obj/structure/closet/crate/wooden, -/obj/item/weapon/material/sword/longsword, +/obj/item/material/sword/longsword, /obj/item/clothing/accessory/holster/machete/rapier/swords, /turf/simulated/floor/wood, /area/redgate/fantasy/blacksmith) @@ -4692,14 +4692,14 @@ /turf/simulated/floor/concrete, /area/redgate/fantasy/guardhouse) "CY" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /obj/machinery/light/small/torch{ dir = 8 }, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/washhouse) "Db" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/cafe) "Dc" = ( @@ -4742,22 +4742,22 @@ /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) "Dn" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/concrete, /area/redgate/fantasy/walls) "Do" = ( /obj/structure/closet/crate/chest, /obj/item/clothing/accessory/bracelet/material/gold, /obj/item/clothing/ears/earring/dangle/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, /obj/random/potion_base, -/obj/item/weapon/picnic_blankets_carried, +/obj/item/picnic_blankets_carried, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/castle) "Dq" = ( @@ -4782,11 +4782,11 @@ /turf/simulated/floor/carpet, /area/redgate/fantasy/castle) "Dw" = ( -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/concrete, /area/redgate/fantasy/mininghouse) "Dz" = ( -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/structure/table/rack/shelf/wood, /turf/simulated/floor/concrete, /area/redgate/fantasy/paladinhouse) @@ -4796,7 +4796,7 @@ /turf/simulated/floor/wood, /area/redgate/fantasy/blacksmith) "DI" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/wood/alt, @@ -4812,7 +4812,7 @@ dir = 5 }, /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle/candelabra/everburn, +/obj/item/flame/candle/candelabra/everburn, /turf/simulated/floor/carpet/bcarpet, /area/redgate/fantasy/cafe) "DN" = ( @@ -4835,7 +4835,7 @@ /area/redgate/fantasy/redgate) "DS" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/twobread, +/obj/item/reagent_containers/food/snacks/twobread, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bakery) "DT" = ( @@ -4847,7 +4847,7 @@ /area/redgate/fantasy/castle) "DU" = ( /obj/structure/table/woodentable, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/house) "DV" = ( @@ -4927,8 +4927,8 @@ /area/redgate/fantasy/guardhouse) "Ew" = ( /obj/structure/closet/crate/wooden, -/obj/item/device/flashlight/lantern, -/obj/item/weapon/material/knife/tacknife/boot, +/obj/item/flashlight/lantern, +/obj/item/material/knife/tacknife/boot, /obj/random/instrument, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/walls) @@ -4964,9 +4964,9 @@ /area/redgate/fantasy/streets) "EO" = ( /obj/structure/closet/walllocker/wooden/east, -/obj/item/weapon/potion_base/alkahest, -/obj/item/weapon/potion_base/aqua_regia, -/obj/item/weapon/potion_base/ichor, +/obj/item/potion_base/alkahest, +/obj/item/potion_base/aqua_regia, +/obj/item/potion_base/ichor, /obj/random/potion_base, /obj/random/potion_ingredient, /turf/simulated/floor/wood, @@ -4992,7 +4992,7 @@ /area/redgate/fantasy/rogue) "EY" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/house) "Fa" = ( @@ -5009,8 +5009,8 @@ /obj/item/clothing/shoes/knight/black, /obj/item/clothing/gloves/combat/knight/brown, /obj/item/clothing/head/helmet/gladiator, -/obj/item/weapon/shield/primitive, -/obj/item/weapon/handcuffs/cable/plantfiber, +/obj/item/shield/primitive, +/obj/item/handcuffs/cable/plantfiber, /obj/machinery/light/small/torch{ dir = 4 }, @@ -5029,7 +5029,7 @@ /area/redgate/fantasy/churchhouse) "Fg" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) "Fh" = ( @@ -5056,7 +5056,7 @@ "Fn" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/pirate, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/bread, +/obj/item/reagent_containers/food/snacks/sliceable/bread, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/house) "Fo" = ( @@ -5076,7 +5076,7 @@ /area/redgate/fantasy/house) "Fs" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/bottle/potion/relaxation, +/obj/item/reagent_containers/glass/bottle/potion/relaxation, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "Fw" = ( @@ -5095,12 +5095,12 @@ /area/redgate/fantasy/church) "FB" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/pickaxe/four_pick, +/obj/item/pickaxe/four_pick, /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) "FD" = ( /obj/structure/table/woodentable, -/obj/item/weapon/tray, +/obj/item/tray, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "FE" = ( @@ -5131,17 +5131,17 @@ /area/redgate/fantasy/house) "FS" = ( /obj/structure/table/marble, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/retractor, /turf/simulated/floor/concrete, /area/redgate/fantasy/churchhouse) "FV" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bard) "FX" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/ranger) "FZ" = ( @@ -5153,7 +5153,7 @@ /area/redgate/fantasy/rogue) "Gb" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) "Gc" = ( @@ -5168,12 +5168,12 @@ /area/redgate/fantasy/house) "Ge" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/storage/wallet, +/obj/item/storage/wallet, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/grocery) "Gf" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/roastbeef, +/obj/item/reagent_containers/food/snacks/roastbeef, /turf/simulated/floor/carpet/oracarpet, /area/redgate/fantasy/arena) "Gi" = ( @@ -5203,7 +5203,7 @@ /obj/structure/closet/cabinet, /obj/item/clothing/head/collectable/tophat, /obj/item/clothing/under/gentlesuit, -/obj/item/weapon/cane, +/obj/item/cane, /obj/item/clothing/gloves/white, /obj/item/clothing/glasses/monocle, /obj/item/clothing/shoes/dress, @@ -5221,7 +5221,7 @@ /area/redgate/fantasy/barbarian) "Gt" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/rogue) "Gu" = ( @@ -5276,7 +5276,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/fantasy/rogue) "GL" = ( -/obj/item/weapon/reagent_containers/food/snacks/old/taco, +/obj/item/reagent_containers/food/snacks/old/taco, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "GM" = ( @@ -5288,7 +5288,7 @@ "GP" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/dress/wench, -/obj/item/weapon/storage/wallet, +/obj/item/storage/wallet, /obj/random/potion_base, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/tavern) @@ -5308,14 +5308,14 @@ /area/redgate/fantasy/hedgemaze) "GX" = ( /obj/structure/table/woodentable, -/obj/item/weapon/bone/horn, +/obj/item/bone/horn, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/redgate) "Ha" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/melee/classic_baton, -/obj/item/weapon/melee/classic_baton, -/obj/item/weapon/melee/classic_baton, +/obj/item/melee/classic_baton, +/obj/item/melee/classic_baton, +/obj/item/melee/classic_baton, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/guardhouse) "Hb" = ( @@ -5328,7 +5328,7 @@ /area/redgate/fantasy/house) "Hd" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood, /area/redgate/fantasy/paladinhouse) "He" = ( @@ -5354,7 +5354,7 @@ /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/washhouse) "Hn" = ( -/obj/item/weapon/tool/wrench/brass, +/obj/item/tool/wrench/brass, /turf/simulated/floor/concrete, /area/redgate/fantasy/farmhouse) "Ho" = ( @@ -5370,12 +5370,12 @@ /area/redgate/fantasy/alchemist) "Hx" = ( /obj/structure/bookcase, -/obj/item/weapon/book/custom_library/fiction/myrock, +/obj/item/book/custom_library/fiction/myrock, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "Hy" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/ore/iron, +/obj/item/ore/iron, /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) "Hz" = ( @@ -5389,7 +5389,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/carpet/green, /area/redgate/fantasy/gambling) "HC" = ( @@ -5405,12 +5405,12 @@ /area/redgate/fantasy/mininghouse) "HE" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/custom_library/fiction/blacksmithandkinglybloke, +/obj/item/book/custom_library/fiction/blacksmithandkinglybloke, /turf/simulated/floor/wood, /area/redgate/fantasy/blacksmith) "HF" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/reddouble, +/obj/item/bedsheet/reddouble, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "HH" = ( @@ -5467,7 +5467,7 @@ /area/redgate/fantasy/aliens) "HY" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/ranger) "Ib" = ( @@ -5476,7 +5476,7 @@ /area/redgate/fantasy/castle) "Id" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle/candelabra/everburn, +/obj/item/flame/candle/candelabra/everburn, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/restaurant) "If" = ( @@ -5529,7 +5529,7 @@ /area/redgate/fantasy/house) "IC" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/roulette_balls_fancy, +/obj/item/storage/box/roulette_balls_fancy, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/gambling) "ID" = ( @@ -5575,21 +5575,21 @@ /area/redgate/fantasy/house) "IM" = ( /obj/structure/closet/walllocker/wooden/north, -/obj/item/weapon/material/knife/table, -/obj/item/weapon/material/knife/table, -/obj/item/weapon/material/knife/table, -/obj/item/weapon/material/knife/table, -/obj/item/weapon/material/knife/table, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, +/obj/item/material/knife/table, +/obj/item/material/knife/table, +/obj/item/material/knife/table, +/obj/item/material/knife/table, +/obj/item/material/knife/table, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/restaurant) "IP" = ( @@ -5628,11 +5628,11 @@ /area/redgate/fantasy/aliens) "Ja" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/concrete, /area/redgate/fantasy/walls) "Jd" = ( @@ -5656,7 +5656,7 @@ /area/redgate/fantasy/house) "Jg" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/grocery) "Jh" = ( @@ -5679,12 +5679,12 @@ /obj/item/clothing/suit/storage/hooded/chaplain_hoodie, /obj/item/clothing/under/rank/chaplain, /obj/item/clothing/shoes/dress, -/obj/item/weapon/storage/bible/booze, +/obj/item/storage/bible/booze, /turf/simulated/floor/concrete, /area/redgate/fantasy/church) "Jm" = ( /obj/structure/bookcase, -/obj/item/weapon/book/custom_library/fiction/irishairmanforseesdeath, +/obj/item/book/custom_library/fiction/irishairmanforseesdeath, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "Jn" = ( @@ -5696,8 +5696,8 @@ /area/redgate/fantasy/castle) "Jo" = ( /obj/structure/closet/crate/wooden, -/obj/item/device/flashlight/lantern, -/obj/item/weapon/material/knife/tacknife/boot, +/obj/item/flashlight/lantern, +/obj/item/material/knife/tacknife/boot, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/walls) "Jr" = ( @@ -5706,7 +5706,7 @@ /area/redgate/fantasy/arena) "Js" = ( /obj/structure/table/woodentable, -/obj/item/weapon/picnic_blankets_carried, +/obj/item/picnic_blankets_carried, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "Jt" = ( @@ -5736,7 +5736,7 @@ /area/redgate/fantasy/guardhouse) "JD" = ( /obj/structure/table/woodentable, -/obj/item/weapon/picnic_blankets_carried, +/obj/item/picnic_blankets_carried, /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) "JE" = ( @@ -5767,7 +5767,7 @@ /area/redgate/fantasy/walls) "JO" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/ghostship, +/obj/item/book/bundle/custom_library/fiction/ghostship, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "JP" = ( @@ -5775,7 +5775,7 @@ /obj/item/instrument/violin/golden, /obj/random/instrument, /obj/random/potion_base, -/obj/item/weapon/material/sword/rapier, +/obj/item/material/sword/rapier, /turf/simulated/floor/carpet/purple, /area/redgate/fantasy/bard) "JT" = ( @@ -5791,8 +5791,8 @@ /area/redgate/fantasy/hedgemaze) "JW" = ( /obj/structure/closet/crate/wooden, -/obj/item/device/flashlight/lantern, -/obj/item/weapon/material/knife/tacknife/boot, +/obj/item/flashlight/lantern, +/obj/item/material/knife/tacknife/boot, /obj/random/material, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/walls) @@ -5804,7 +5804,7 @@ /area/redgate/fantasy/house) "JY" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/house) "JZ" = ( @@ -5813,7 +5813,7 @@ /area/redgate/fantasy/mininghouse) "Ka" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/material/sword/sabre, +/obj/item/material/sword/sabre, /turf/simulated/floor/concrete, /area/redgate/fantasy/walls) "Kb" = ( @@ -5838,7 +5838,7 @@ /turf/simulated/floor/carpet/green, /area/redgate/fantasy/house) "Ki" = ( -/obj/item/weapon/material/gravemarker, +/obj/item/material/gravemarker, /turf/simulated/floor/outdoors/grass/seasonal/notrees, /area/redgate/fantasy/streets) "Kk" = ( @@ -5849,7 +5849,7 @@ /area/redgate/fantasy/grocery) "Km" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/carpet/green, /area/redgate/fantasy/house) "Kq" = ( @@ -5879,7 +5879,7 @@ /area/redgate/fantasy/guardhouse) "KB" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/twohanded/staff, +/obj/item/material/twohanded/staff, /turf/simulated/floor/concrete, /area/redgate/fantasy/arena) "KE" = ( @@ -5897,7 +5897,7 @@ /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/castle) "KK" = ( -/obj/item/weapon/reagent_containers/food/snacks/worm, +/obj/item/reagent_containers/food/snacks/worm, /turf/simulated/floor/outdoors/grass/seasonal, /area/redgate/fantasy/streets) "KM" = ( @@ -5955,7 +5955,7 @@ /area/redgate/fantasy/gambling) "Lg" = ( /obj/structure/bookcase, -/obj/item/weapon/book/custom_library/fiction/woodysgotwood, +/obj/item/book/custom_library/fiction/woodysgotwood, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "Lh" = ( @@ -5964,7 +5964,7 @@ /area/redgate/fantasy/aliens) "Lj" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/risottoballs, +/obj/item/reagent_containers/food/snacks/risottoballs, /turf/simulated/floor/carpet/oracarpet, /area/redgate/fantasy/arena) "Lk" = ( @@ -5983,7 +5983,7 @@ /area/redgate/fantasy/castle) "Ln" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/material/sword/longsword, +/obj/item/material/sword/longsword, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/guardhouse) "Lo" = ( @@ -6024,7 +6024,7 @@ /area/redgate/fantasy/bard) "Lz" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/simulated/floor/wood, /area/redgate/fantasy/butcher) "LA" = ( @@ -6033,12 +6033,12 @@ /turf/simulated/floor/outdoors/sidewalk/slab, /area/redgate/fantasy/hedgemaze) "LE" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "LI" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper, +/obj/item/paper, /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) "LJ" = ( @@ -6047,12 +6047,12 @@ /area/redgate/fantasy/streets) "LK" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/concrete, /area/redgate/fantasy/church) "LN" = ( /obj/structure/closet/crate/wooden, -/obj/item/weapon/storage/bag/ore, +/obj/item/storage/bag/ore, /turf/simulated/floor/concrete, /area/redgate/fantasy/mininghouse) "LR" = ( @@ -6104,16 +6104,16 @@ /area/redgate/fantasy/walls) "Mj" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish, +/obj/item/reagent_containers/food/snacks/carpmeat/fish, /turf/simulated/floor/wood, /area/redgate/fantasy/butcher) "Ml" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood, /area/redgate/fantasy/alchemist) "Mn" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood, /area/redgate/fantasy/paladinhouse) "Mo" = ( @@ -6188,7 +6188,7 @@ /turf/simulated/floor/wood, /area/redgate/fantasy/paladinhouse) "MG" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/cafe) "MI" = ( @@ -6198,7 +6198,7 @@ /area/redgate/fantasy/house) "MJ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/potion_material/thorny_bulb, +/obj/item/potion_material/thorny_bulb, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "MK" = ( @@ -6217,7 +6217,7 @@ /area/redgate/fantasy/jewler) "MN" = ( /obj/structure/table/rack/wood, -/obj/item/weapon/material/twohanded/longsword, +/obj/item/material/twohanded/longsword, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/castle) "MO" = ( @@ -6251,7 +6251,7 @@ /area/redgate/fantasy/cafe) "MZ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/tavern) "Nb" = ( @@ -6265,7 +6265,7 @@ /area/redgate/fantasy/castle) "Ne" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/bard) "Ng" = ( @@ -6278,7 +6278,7 @@ /area/redgate/fantasy/churchhouse) "Nn" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/wine, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/church) "Np" = ( @@ -6298,7 +6298,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "Nw" = ( -/obj/item/weapon/material/knife/machete/hatchet/stone/bone, +/obj/item/material/knife/machete/hatchet/stone/bone, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/barbarian) "Nx" = ( @@ -6306,7 +6306,7 @@ /area/redgate/fantasy/aliens) "Ny" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/match, +/obj/item/flame/match, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "Nz" = ( @@ -6340,7 +6340,7 @@ dir = 9 }, /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle/candelabra/everburn, +/obj/item/flame/candle/candelabra/everburn, /turf/simulated/floor/carpet/bcarpet, /area/redgate/fantasy/cafe) "NH" = ( @@ -6355,7 +6355,7 @@ /area/redgate/fantasy/house) "NJ" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/gun/launcher/crossbow/bow, +/obj/item/gun/launcher/crossbow/bow, /turf/simulated/floor/concrete, /area/redgate/fantasy/paladinhouse) "NL" = ( @@ -6374,7 +6374,7 @@ /turf/simulated/floor/concrete, /area/redgate/fantasy/mininghouse) "NP" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) "NR" = ( @@ -6385,7 +6385,7 @@ /area/redgate/fantasy/restaurant) "NT" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/berrymuffin/berry, +/obj/item/reagent_containers/food/snacks/berrymuffin/berry, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bakery) "NW" = ( @@ -6393,11 +6393,11 @@ /turf/simulated/floor/outdoors/grass/seasonal/notrees, /area/redgate/fantasy/streets) "NZ" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/ranger) "Ob" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/wood/alt, @@ -6413,7 +6413,7 @@ /area/redgate/fantasy/grocery) "Od" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/pickaxe/five_pick, +/obj/item/pickaxe/five_pick, /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) "Of" = ( @@ -6459,17 +6459,17 @@ /area/redgate/fantasy/cafe) "Ow" = ( /obj/structure/table/woodentable, -/obj/item/weapon/bone/skull, +/obj/item/bone/skull, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/redgate) "Ox" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "Oy" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/guardhouse) "Oz" = ( @@ -6502,13 +6502,13 @@ /area/redgate/fantasy/rogue) "OK" = ( /obj/structure/closet/crate/chest, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/flame/candle/candelabra, -/obj/item/weapon/flame/candle/candelabra, -/obj/item/weapon/flame/candle/candelabra, -/obj/item/weapon/flame/candle/candelabra, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, +/obj/item/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "OM" = ( @@ -6523,7 +6523,7 @@ /area/redgate/fantasy/restaurant) "OQ" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/material/twohanded/longsword, +/obj/item/material/twohanded/longsword, /turf/simulated/floor/concrete, /area/redgate/fantasy/paladinhouse) "OS" = ( @@ -6538,8 +6538,8 @@ /area/redgate/fantasy/mininghouse) "OU" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/walls) "OX" = ( @@ -6550,7 +6550,7 @@ /area/redgate/fantasy/barbarian) "OY" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bard) "Pa" = ( @@ -6558,7 +6558,7 @@ /area/redgate/fantasy/redgate) "Pb" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "Pc" = ( @@ -6582,13 +6582,13 @@ /area/redgate/fantasy/arena) "Pf" = ( /obj/structure/table/woodentable, -/obj/item/weapon/tray, +/obj/item/tray, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/restaurant) "Ph" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/glass/bottle/potion/antidote, -/obj/item/weapon/reagent_containers/glass/bottle/potion/antidote, +/obj/item/reagent_containers/glass/bottle/potion/antidote, +/obj/item/reagent_containers/glass/bottle/potion/antidote, /turf/simulated/floor/wood, /area/redgate/fantasy/alchemist) "Pj" = ( @@ -6609,7 +6609,7 @@ /area/redgate/fantasy/aliens) "Ps" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/shovel/wood, +/obj/item/shovel/wood, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/shop) "Pu" = ( @@ -6627,7 +6627,7 @@ /area/redgate/fantasy/paladinhouse) "Py" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/machete, +/obj/item/material/knife/machete, /turf/simulated/floor/wood, /area/redgate/fantasy/paladinhouse) "Pz" = ( @@ -6643,30 +6643,30 @@ /area/redgate/fantasy/house) "PG" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, /obj/structure/closet/walllocker/wooden/south, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "PH" = ( /obj/structure/table/rack/wood, -/obj/item/weapon/material/knife/machete/hatchet/unathiknife, +/obj/item/material/knife/machete/hatchet/unathiknife, /obj/structure/prop/fantasy/redbanner{ pixel_y = 32 }, @@ -6677,13 +6677,13 @@ dir = 4 }, /obj/structure/table/alien/blue, -/obj/item/weapon/surgical/FixOVein/alien, +/obj/item/surgical/FixOVein/alien, /turf/simulated/floor/tiled/milspec/sterile, /area/redgate/fantasy/aliens) "PJ" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/food/snacks/funnelcake, -/obj/item/weapon/reagent_containers/food/snacks/funnelcake, +/obj/item/reagent_containers/food/snacks/funnelcake, +/obj/item/reagent_containers/food/snacks/funnelcake, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/grocery) "PK" = ( @@ -6696,7 +6696,7 @@ /area/redgate/fantasy/rogue) "PL" = ( /obj/structure/table/gamblingtable, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/gambling) "PM" = ( @@ -6722,7 +6722,7 @@ /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/bard) "PU" = ( -/obj/item/weapon/potion_material/blood_ruby, +/obj/item/potion_material/blood_ruby, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/redgate) "PV" = ( @@ -6740,24 +6740,24 @@ /area/redgate/fantasy/castle) "PX" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, /obj/machinery/light/small/torch{ dir = 8 }, @@ -6788,28 +6788,28 @@ "Qi" = ( /obj/structure/closet/cabinet, /obj/item/clothing/suit/storage/apron/white, -/obj/item/weapon/storage/wallet, +/obj/item/storage/wallet, /turf/simulated/floor/wood, /area/redgate/fantasy/blacksmith) "Qj" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/restaurant) "Qn" = ( @@ -6822,29 +6822,29 @@ /area/redgate/fantasy/house) "Qu" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread, +/obj/item/reagent_containers/food/snacks/sliceable/bananabread, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bakery) "Qv" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "Qy" = ( @@ -6853,13 +6853,13 @@ /area/redgate/fantasy/jewler) "QA" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/meatsteak, +/obj/item/reagent_containers/food/snacks/meatsteak, /turf/simulated/floor/concrete, /area/redgate/fantasy/arena) "QF" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/shop) "QL" = ( @@ -6891,14 +6891,14 @@ /area/redgate/fantasy/tavern) "QR" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/farmhouse) "QS" = ( @@ -6938,8 +6938,8 @@ /area/redgate/fantasy/house) "Rj" = ( /obj/structure/closet/cabinet, -/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/fruitspawner/apple, /obj/fruitspawner/apple, /obj/fruitspawner/apple, @@ -6968,7 +6968,7 @@ /area/redgate/fantasy/church) "Rp" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/croissant, +/obj/item/reagent_containers/food/snacks/croissant, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bakery) "Rq" = ( @@ -7012,12 +7012,12 @@ /area/redgate/fantasy/walls) "RA" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/coldmountain, +/obj/item/book/bundle/custom_library/fiction/coldmountain, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "RC" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/cherrypie, +/obj/item/reagent_containers/food/snacks/cherrypie, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bakery) "RE" = ( @@ -7029,8 +7029,8 @@ /area/redgate/fantasy/restaurant) "RF" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/food/snacks/flatbread, -/obj/item/weapon/reagent_containers/food/snacks/flatbread, +/obj/item/reagent_containers/food/snacks/flatbread, +/obj/item/reagent_containers/food/snacks/flatbread, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/grocery) "RG" = ( @@ -7091,7 +7091,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/fantasy/castle) "RW" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/castle) "RX" = ( @@ -7110,7 +7110,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/fantasy/farmhouse) "Sj" = ( -/obj/item/weapon/ore/coal, +/obj/item/ore/coal, /turf/simulated/floor/concrete, /area/redgate/fantasy/mininghouse) "Sm" = ( @@ -7213,7 +7213,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "SS" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/farmhouse) "SW" = ( @@ -7310,7 +7310,7 @@ /area/redgate/fantasy/streets) "TG" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/concrete, /area/redgate/fantasy/church) "TH" = ( @@ -7323,11 +7323,11 @@ /area/redgate/fantasy/bakery) "TJ" = ( /obj/structure/closet/crate/chest, -/obj/item/weapon/storage/box/matches, -/obj/item/weapon/storage/fancy/blackcandle_box, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/storage/fancy/whitecandle_box, +/obj/item/storage/box/matches, +/obj/item/storage/fancy/blackcandle_box, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/whitecandle_box, /obj/random/potion_ingredient, /obj/random/fantasy_item, /turf/simulated/floor/concrete, @@ -7370,7 +7370,7 @@ /area/redgate/fantasy/castle) "TR" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat, +/obj/item/reagent_containers/food/snacks/meat/grubmeat, /turf/simulated/floor/wood, /area/redgate/fantasy/butcher) "TS" = ( @@ -7379,9 +7379,9 @@ /area/redgate/fantasy/guardhouse) "TT" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /obj/random/soap, /obj/random/soap, /obj/random/soap, @@ -7398,12 +7398,12 @@ "Uc" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/dress/maid/sexy, -/obj/item/weapon/handcuffs/cable/plantfiber, +/obj/item/handcuffs/cable/plantfiber, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/washhouse) "Ug" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/tavern) "Ui" = ( @@ -7416,7 +7416,7 @@ /obj/item/clothing/suit/storage/apron, /obj/item/clothing/under/dress/hightrousers, /obj/item/clothing/shoes/sandal/clogs, -/obj/item/weapon/storage/wallet, +/obj/item/storage/wallet, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/cafe) "Un" = ( @@ -7464,7 +7464,7 @@ /area/redgate/fantasy/guardhouse) "UB" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/old/horseburger, +/obj/item/reagent_containers/food/snacks/old/horseburger, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/house) "UF" = ( @@ -7527,17 +7527,17 @@ /area/redgate/fantasy/castle) "UX" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/bible, +/obj/item/storage/bible, /turf/simulated/floor/wood, /area/redgate/fantasy/paladinhouse) "UY" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/tavern) "UZ" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/machinery/light/small/torch{ dir = 4 }, @@ -7545,7 +7545,7 @@ /area/redgate/fantasy/house) "Va" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/house) "Ve" = ( @@ -7553,7 +7553,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/fantasy/shop) "Vh" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/wood/alt, @@ -7577,7 +7577,7 @@ /area/redgate/fantasy/house) "Vm" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/religious/zoroastrianism, +/obj/item/book/bundle/custom_library/religious/zoroastrianism, /obj/machinery/light/small/torch, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) @@ -7631,7 +7631,7 @@ /area/redgate/fantasy/ranger) "VK" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/food/drinks/bottle/holywater, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/church) "VL" = ( @@ -7650,7 +7650,7 @@ /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/ranger) "VS" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/concrete, /area/redgate/fantasy/church) "VT" = ( @@ -7682,7 +7682,7 @@ /turf/simulated/floor/outdoors/sidewalk, /area/redgate/fantasy/streets) "Wa" = ( -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/carpet/gaycarpet, /area/redgate/fantasy/castle) "Wc" = ( @@ -7697,7 +7697,7 @@ /area/redgate/fantasy/mininghouse) "Wf" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/shop) "Wg" = ( @@ -7705,7 +7705,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/carpet/green, /area/redgate/fantasy/gambling) "Wj" = ( @@ -7767,17 +7767,17 @@ /area/redgate/fantasy/castle) "WC" = ( /obj/structure/closet/crate/chest, -/obj/item/weapon/gun/launcher/crossbow/bow, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, +/obj/item/gun/launcher/crossbow/bow, +/obj/item/arrow/standard, +/obj/item/arrow/standard, +/obj/item/arrow/standard, +/obj/item/arrow/standard, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/ranger) "WF" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/knife/butch, +/obj/item/material/kitchen/rollingpin, /obj/machinery/light/small/torch{ dir = 8 }, @@ -7785,7 +7785,7 @@ /area/redgate/fantasy/bakery) "WH" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/meat/chicken, +/obj/item/reagent_containers/food/snacks/meat/chicken, /turf/simulated/floor/wood, /area/redgate/fantasy/butcher) "WP" = ( @@ -7799,34 +7799,34 @@ /area/redgate/fantasy/mininghouse) "WT" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/picnic_blankets_carried, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/picnic_blankets_carried, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bard) "WU" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/food/snacks/bun, -/obj/item/weapon/reagent_containers/food/snacks/bun, -/obj/item/weapon/reagent_containers/food/snacks/bun, -/obj/item/weapon/reagent_containers/food/snacks/bun, -/obj/item/weapon/reagent_containers/food/snacks/bun, +/obj/item/reagent_containers/food/snacks/bun, +/obj/item/reagent_containers/food/snacks/bun, +/obj/item/reagent_containers/food/snacks/bun, +/obj/item/reagent_containers/food/snacks/bun, +/obj/item/reagent_containers/food/snacks/bun, /turf/simulated/floor/concrete, /area/redgate/fantasy/arena) "WV" = ( @@ -7887,7 +7887,7 @@ /area/redgate/fantasy/redgate) "Xr" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/gun/launcher/crossbow/bow, +/obj/item/gun/launcher/crossbow/bow, /turf/simulated/floor/concrete, /area/redgate/fantasy/walls) "Xs" = ( @@ -7899,13 +7899,13 @@ "Xx" = ( /obj/structure/table/woodentable, /obj/structure/closet/walllocker/wooden/north, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/material/knife/tacknife/combatknife, /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, @@ -7942,7 +7942,7 @@ /area/redgate/fantasy/restaurant) "XF" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/restaurant) "XG" = ( @@ -8026,7 +8026,7 @@ /area/redgate/fantasy/castle) "Yn" = ( /obj/structure/closet/crate/chest, -/obj/item/device/slow_sizegun/magic, +/obj/item/slow_sizegun/magic, /obj/item/toy/character/wizard, /obj/machinery/light/small/torch{ dir = 4 @@ -8069,12 +8069,12 @@ /area/redgate/fantasy/castle) "Yx" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/soup/onion, +/obj/item/reagent_containers/food/snacks/soup/onion, /turf/simulated/floor/carpet/oracarpet, /area/redgate/fantasy/arena) "YC" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/poemsforarainyday, +/obj/item/book/bundle/custom_library/fiction/poemsforarainyday, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "YD" = ( @@ -8095,7 +8095,7 @@ /area/redgate/fantasy/gambling) "YO" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/meatpie, +/obj/item/reagent_containers/food/snacks/meatpie, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/bakery) "YP" = ( @@ -8116,7 +8116,7 @@ /area/redgate/fantasy/guardhouse) "YU" = ( /obj/structure/table/woodentable, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/scalpel, /turf/simulated/floor/concrete, /area/redgate/fantasy/arena) "Za" = ( @@ -8159,7 +8159,7 @@ /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/walls) "Zo" = ( -/obj/item/weapon/ore/coal, +/obj/item/ore/coal, /obj/machinery/light/small/torch, /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) @@ -8218,13 +8218,13 @@ /area/redgate/fantasy/ranger) "ZD" = ( /obj/structure/bookcase, -/obj/item/weapon/book/custom_library/fiction/starsandsometimesfallingones, +/obj/item/book/custom_library/fiction/starsandsometimesfallingones, /turf/simulated/floor/wood/alt/panel, /area/redgate/fantasy/redgate) "ZE" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/coal, +/obj/item/ore/coal, +/obj/item/ore/coal, /turf/simulated/floor/wood, /area/redgate/fantasy/mininghouse) "ZH" = ( @@ -8260,7 +8260,7 @@ /area/redgate/fantasy/jewler) "ZS" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/potion_material/golden_scale, +/obj/item/potion_material/golden_scale, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/jewler) "ZW" = ( @@ -8269,7 +8269,7 @@ /area/redgate/fantasy/rogue) "ZZ" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/toy/snowglobe/snowvillage, +/obj/item/toy/snowglobe/snowvillage, /turf/simulated/floor/wood/alt/parquet, /area/redgate/fantasy/house) diff --git a/maps/redgate/fantasy_dungeon.dmm b/maps/redgate/fantasy_dungeon.dmm index 96aef51a37d..64436653a2a 100644 --- a/maps/redgate/fantasy_dungeon.dmm +++ b/maps/redgate/fantasy_dungeon.dmm @@ -16,7 +16,7 @@ /area/redgate/fantasy/dungeon) "az" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/caves) "aG" = ( @@ -45,7 +45,7 @@ /area/redgate/fantasy/underwater) "bp" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/bloodsoup, +/obj/item/reagent_containers/food/snacks/bloodsoup, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "bw" = ( @@ -151,7 +151,7 @@ /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/redgate/fantasy/caves) "dA" = ( -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/concrete, /area/redgate/fantasy/ratbasement) "dI" = ( @@ -180,12 +180,12 @@ /area/redgate/fantasy/mines) "ei" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/material/knife/stone/bone, +/obj/item/material/knife/stone/bone, /turf/simulated/floor/cult, /area/redgate/fantasy/dungeon) "ep" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "es" = ( @@ -198,12 +198,12 @@ /area/redgate/fantasy/mines) "ev" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/coin/iron, +/obj/item/coin/iron, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "ew" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/spoon{ default_material = "gold" }, /turf/simulated/floor/concrete, @@ -234,7 +234,7 @@ /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "fB" = ( -/obj/item/weapon/bluespace_crystal, +/obj/item/bluespace_crystal, /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/redgate/fantasy/caves) "fI" = ( @@ -266,10 +266,10 @@ /obj/structure/closet/crate/chest, /obj/random/fishing_junk, /obj/random/fishing_junk, -/obj/item/weapon/reagent_containers/food/snacks/wormdeluxe, -/obj/item/weapon/reagent_containers/food/snacks/wormdeluxe, -/obj/item/weapon/reagent_containers/food/snacks/wormdeluxe, -/obj/item/weapon/reagent_containers/food/snacks/wormdeluxe, +/obj/item/reagent_containers/food/snacks/wormdeluxe, +/obj/item/reagent_containers/food/snacks/wormdeluxe, +/obj/item/reagent_containers/food/snacks/wormdeluxe, +/obj/item/reagent_containers/food/snacks/wormdeluxe, /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/redgate/fantasy/mines) "fT" = ( @@ -306,12 +306,12 @@ /area/redgate/fantasy/mines) "gH" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "gJ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "gL" = ( @@ -349,7 +349,7 @@ /turf/simulated/floor/cult, /area/redgate/fantasy/dungeon) "hY" = ( -/obj/item/weapon/reagent_containers/food/snacks/bearstew, +/obj/item/reagent_containers/food/snacks/bearstew, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "id" = ( @@ -378,7 +378,7 @@ /area/redgate/fantasy/dungeon) "iz" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/material/knife/machete/hatchet/stone/bone, +/obj/item/material/knife/machete/hatchet/stone/bone, /turf/simulated/floor/cult, /area/redgate/fantasy/dungeon) "iQ" = ( @@ -399,7 +399,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/fantasy/alienbasement) "jc" = ( -/obj/item/weapon/bone/skull, +/obj/item/bone/skull, /obj/machinery/light/small/torch{ dir = 4 }, @@ -472,9 +472,9 @@ "kE" = ( /obj/structure/closet/crate/chest, /obj/random/potion_base, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, /obj/random/fantasy_item, /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/redgate/fantasy/caves) @@ -532,7 +532,7 @@ /turf/simulated/floor/water/digestive_enzymes, /area/redgate/fantasy/dungeon) "lL" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "lR" = ( @@ -719,7 +719,7 @@ /area/redgate/fantasy/dungeon) "pH" = ( /obj/structure/table/marble, -/obj/item/weapon/telecube/randomized, +/obj/item/telecube/randomized, /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "pI" = ( @@ -775,7 +775,7 @@ /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/redgate/fantasy/caves) "qY" = ( -/obj/item/weapon/strangerock, +/obj/item/strangerock, /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/redgate/fantasy/caves) "rb" = ( @@ -829,7 +829,7 @@ /area/redgate/fantasy/caves) "sa" = ( /obj/structure/table/marble, -/obj/item/weapon/pen/crayon/red{ +/obj/item/pen/crayon/red{ name = "red chalk" }, /obj/machinery/light/small/torch{ @@ -853,7 +853,7 @@ /area/redgate/fantasy/dungeon) "sm" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/dungeon) "sw" = ( @@ -861,7 +861,7 @@ /turf/simulated/floor/cult, /area/redgate/fantasy/dungeon) "sE" = ( -/obj/item/weapon/material/fishing_rod/modern/strong, +/obj/item/material/fishing_rod/modern/strong, /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/redgate/fantasy/mines) "sG" = ( @@ -911,7 +911,7 @@ /area/redgate/fantasy/alienbasement) "tO" = ( /obj/structure/table/alien, -/obj/item/weapon/paper/alien{ +/obj/item/paper/alien{ info = "Our search for the source has brought us to this planet, and we were quickly able to locate a seepage of the anomaly in the area. We set up this base immediately beside it, so that we can best study it. However, we are growing concerned as the material continues to spread beyond it's initial sprouting point and has begun to encroach directly on our buildings.

Our plan was to move our base further back from the site and study from a distance, but we have begun to detect lifeforms traversing the void. Yellow eyes have been seen watching from beyond the safety of the cave, disappearing and reappearing seemingly at random. We weren't aware that anything could survive this, they could hold the key to our scenario and we are requesting immediate support to research this further." }, /turf/simulated/floor/tiled/techfloor, @@ -950,7 +950,7 @@ /area/redgate/fantasy/mines) "uE" = ( /obj/structure/table/alien/blue, -/obj/item/weapon/pickaxe/jackhammer, +/obj/item/pickaxe/jackhammer, /turf/simulated/floor/tiled/techfloor, /area/redgate/fantasy/alienbasement) "uJ" = ( @@ -999,7 +999,7 @@ /area/redgate/fantasy/alienbasement) "vL" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "vV" = ( @@ -1097,7 +1097,7 @@ /area/redgate/fantasy/dungeon) "xI" = ( /obj/structure/table/marble, -/obj/item/weapon/surgical/bone_clamp, +/obj/item/surgical/bone_clamp, /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "xK" = ( @@ -1115,8 +1115,8 @@ /area/redgate/fantasy/dungeon) "xV" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/material/knife/butch, +/obj/item/material/kitchen/rollingpin, +/obj/item/material/knife/butch, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/caves) "xX" = ( @@ -1154,7 +1154,7 @@ /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "yJ" = ( -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/redgate/fantasy/caves) "yM" = ( @@ -1177,7 +1177,7 @@ /area/redgate/fantasy/dungeon) "yV" = ( /obj/structure/table/alien/blue, -/obj/item/weapon/gun/energy/sickshot, +/obj/item/gun/energy/sickshot, /turf/simulated/floor/tiled/techfloor, /area/redgate/fantasy/alienbasement) "yW" = ( @@ -1186,7 +1186,7 @@ /area/redgate/fantasy/crypt) "zh" = ( /obj/structure/table/alien/blue, -/obj/item/device/gps/mining, +/obj/item/gps/mining, /turf/simulated/floor/tiled/techfloor, /area/redgate/fantasy/alienbasement) "zj" = ( @@ -1207,7 +1207,7 @@ /area/redgate/fantasy/crypt) "zB" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "zH" = ( @@ -1223,12 +1223,12 @@ /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "zV" = ( -/obj/item/weapon/fossil/skull/horned, +/obj/item/fossil/skull/horned, /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/redgate/fantasy/caves) "zW" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /obj/machinery/light/small/torch{ dir = 1 }, @@ -1270,8 +1270,8 @@ "AH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/marble, -/obj/item/weapon/bone/ribs, -/obj/item/weapon/bone/skull, +/obj/item/bone/ribs, +/obj/item/bone/skull, /turf/simulated/floor/bmarble, /area/redgate/fantasy/dungeon) "AM" = ( @@ -1320,7 +1320,7 @@ /area/redgate/fantasy/alienbasement) "Bs" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake, +/obj/item/reagent_containers/food/snacks/sliceable/lemoncake, /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "BG" = ( @@ -1330,24 +1330,24 @@ /area/redgate/fantasy/dungeon) "BJ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, /obj/structure/closet/walllocker/wooden/south, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/caves) @@ -1374,7 +1374,7 @@ /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "Cc" = ( -/obj/item/weapon/bone/leg, +/obj/item/bone/leg, /turf/simulated/floor/cult, /area/redgate/fantasy/dungeon) "Ch" = ( @@ -1382,7 +1382,7 @@ /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "Cz" = ( -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/redgate/fantasy/caves) "CD" = ( @@ -1443,7 +1443,7 @@ /area/redgate/fantasy/castle) "Dn" = ( /obj/structure/table/marble, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "DK" = ( @@ -1489,12 +1489,12 @@ /area/redgate/fantasy/dungeon) "Eq" = ( /obj/structure/table/alien, -/obj/item/weapon/potion_material/glowing_gem, +/obj/item/potion_material/glowing_gem, /turf/simulated/shuttle/floor/alien/blue, /area/redgate/fantasy/alienbasement) "EA" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/storage/backpack/cultpack, +/obj/item/storage/backpack/cultpack, /obj/machinery/light/small/torch{ dir = 4 }, @@ -1512,7 +1512,7 @@ /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/redgate/fantasy/mines) "EN" = ( -/obj/item/weapon/shreddedp, +/obj/item/shreddedp, /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "ER" = ( @@ -1563,7 +1563,7 @@ /area/redgate/fantasy/caves) "FH" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/melee/cultblade, +/obj/item/melee/cultblade, /turf/simulated/floor/cult, /area/redgate/fantasy/dungeon) "FR" = ( @@ -1574,16 +1574,16 @@ /area/redgate/fantasy/alienbasement) "FV" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "Ga" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/food/drinks/shaker, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/dungeon) "Gh" = ( @@ -1591,7 +1591,7 @@ /turf/simulated/floor/beach/sand/desert, /area/redgate/fantasy/caves) "Gl" = ( -/obj/item/weapon/paper/alien, +/obj/item/paper/alien, /turf/simulated/wall/tgmc/rwall, /area/redgate/fantasy/alienbasement) "Gu" = ( @@ -1626,7 +1626,7 @@ /turf/simulated/floor/cult, /area/redgate/fantasy/dungeon) "Hx" = ( -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/floor/cult, /area/redgate/fantasy/dungeon) "Hz" = ( @@ -1664,7 +1664,7 @@ /obj/structure/bed/chair/sofa/corp/left, /obj/machinery/light/small/torch{ dir = 1; - light_type = /obj/item/weapon/light/bulb/red + light_type = /obj/item/light/bulb/red }, /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) @@ -1732,19 +1732,19 @@ /area/redgate/fantasy/caves) "Jo" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/reagent_containers/food/snacks/flatbread, -/obj/item/weapon/reagent_containers/food/snacks/flatbread, -/obj/item/weapon/reagent_containers/food/snacks/flatbread, -/obj/item/weapon/reagent_containers/food/snacks/flatbread, -/obj/item/weapon/reagent_containers/food/snacks/flatbread, -/obj/item/weapon/reagent_containers/food/snacks/flatbread, -/obj/item/weapon/reagent_containers/food/snacks/flatbread, -/obj/item/weapon/reagent_containers/food/snacks/flatbread, +/obj/item/reagent_containers/food/snacks/flatbread, +/obj/item/reagent_containers/food/snacks/flatbread, +/obj/item/reagent_containers/food/snacks/flatbread, +/obj/item/reagent_containers/food/snacks/flatbread, +/obj/item/reagent_containers/food/snacks/flatbread, +/obj/item/reagent_containers/food/snacks/flatbread, +/obj/item/reagent_containers/food/snacks/flatbread, +/obj/item/reagent_containers/food/snacks/flatbread, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "Jp" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "Jq" = ( @@ -1786,7 +1786,7 @@ /area/redgate/fantasy/castle) "Kn" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /turf/simulated/floor/carpet/gaycarpet, /area/redgate/fantasy/dungeon) "Ku" = ( @@ -1798,7 +1798,7 @@ /turf/simulated/floor/tiled/techfloor, /area/redgate/fantasy/alienbasement) "Ky" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "KA" = ( @@ -1864,7 +1864,7 @@ /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "LH" = ( -/obj/item/weapon/potion_material/golden_scale, +/obj/item/potion_material/golden_scale, /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/redgate/fantasy/caves) "LL" = ( @@ -1906,7 +1906,7 @@ /area/redgate/fantasy/alienbasement) "ME" = ( /obj/structure/table/marble, -/obj/item/weapon/material/knife/stone/bone, +/obj/item/material/knife/stone/bone, /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "MO" = ( @@ -1922,8 +1922,8 @@ /area/redgate/fantasy/dungeon) "MZ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "Nq" = ( @@ -1965,9 +1965,9 @@ /area/redgate/fantasy/mines) "NN" = ( /obj/structure/table/alien, -/obj/item/weapon/reagent_containers/glass/bottle/biomass, -/obj/item/weapon/reagent_containers/glass/bottle/biomass, -/obj/item/weapon/reagent_containers/glass/bottle/biomass, +/obj/item/reagent_containers/glass/bottle/biomass, +/obj/item/reagent_containers/glass/bottle/biomass, +/obj/item/reagent_containers/glass/bottle/biomass, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/fantasy/alienbasement) "NQ" = ( @@ -1993,7 +1993,7 @@ /turf/simulated/floor/cult, /area/redgate/fantasy/dungeon) "Of" = ( -/obj/item/weapon/fossil/plant, +/obj/item/fossil/plant, /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/redgate/fantasy/caves) "Oh" = ( @@ -2028,7 +2028,7 @@ /area/redgate/fantasy/dungeon) "Pa" = ( /obj/structure/table/marble, -/obj/item/weapon/bone/leg, +/obj/item/bone/leg, /turf/simulated/floor/bmarble, /area/redgate/fantasy/dungeon) "Pb" = ( @@ -2048,7 +2048,7 @@ /area/redgate/fantasy/alienbasement) "PA" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/flatbread, +/obj/item/reagent_containers/food/snacks/flatbread, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "PC" = ( @@ -2125,7 +2125,7 @@ /obj/structure/table/hardwoodtable, /obj/item/clothing/mask/muzzle/ballgag, /obj/item/clothing/mask/muzzle/ballgag/ringgag, -/obj/item/weapon/material/whip, +/obj/item/material/whip, /turf/simulated/floor/cult, /area/redgate/fantasy/dungeon) "RX" = ( @@ -2135,7 +2135,7 @@ /turf/simulated/floor/tiled/techfloor, /area/redgate/fantasy/alienbasement) "RZ" = ( -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, /turf/simulated/mineral/floor/dirt, /area/redgate/fantasy/caves) "Sb" = ( @@ -2153,7 +2153,7 @@ /area/redgate/fantasy/dungeon) "Sk" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/snacks/bloodsoup, +/obj/item/reagent_containers/food/snacks/bloodsoup, /obj/machinery/light/small/torch{ dir = 8 }, @@ -2161,12 +2161,12 @@ /area/redgate/fantasy/dungeon) "Sn" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/snacks/bloodsoup, +/obj/item/reagent_containers/food/snacks/bloodsoup, /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "Sx" = ( /obj/structure/table/marble, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/scalpel, /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "SA" = ( @@ -2175,7 +2175,7 @@ /area/redgate/fantasy/mines) "SI" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/handcuffs/cable/plantfiber, +/obj/item/handcuffs/cable/plantfiber, /turf/simulated/floor/cult, /area/redgate/fantasy/dungeon) "SJ" = ( @@ -2184,7 +2184,7 @@ /turf/simulated/shuttle/floor/alien/blue, /area/redgate/fantasy/alienbasement) "SZ" = ( -/obj/item/weapon/potion_material/folded_dark, +/obj/item/potion_material/folded_dark, /turf/simulated/floor/weird_things/dark, /area/redgate/fantasy/dark) "Tk" = ( @@ -2218,7 +2218,7 @@ "TB" = ( /obj/machinery/light/small/torch{ dir = 1; - light_type = /obj/item/weapon/light/bulb/red + light_type = /obj/item/light/bulb/red }, /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) @@ -2251,9 +2251,9 @@ /area/redgate/fantasy/alienbasement) "Uc" = ( /obj/structure/table/alien/blue, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs, /turf/simulated/floor/tiled/techfloor, /area/redgate/fantasy/alienbasement) "Ul" = ( @@ -2278,7 +2278,7 @@ /area/redgate/fantasy/dungeon) "UV" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/bone/skull/unknown, +/obj/item/bone/skull/unknown, /turf/simulated/floor/cult, /area/redgate/fantasy/dungeon) "UW" = ( @@ -2292,7 +2292,7 @@ /turf/simulated/floor/tiled/techfloor, /area/redgate/fantasy/alienbasement) "Vo" = ( -/obj/item/weapon/reagent_containers/food/drinks/golden_cup, +/obj/item/reagent_containers/food/drinks/golden_cup, /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/redgate/fantasy/caves) "Vq" = ( @@ -2366,8 +2366,8 @@ /area/redgate/fantasy/underwater) "WR" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/handcuffs/legcuffs/fuzzy, -/obj/item/weapon/handcuffs/fuzzy, +/obj/item/handcuffs/legcuffs/fuzzy, +/obj/item/handcuffs/fuzzy, /obj/machinery/light/small/torch{ dir = 8 }, @@ -2384,15 +2384,15 @@ /area/redgate/fantasy/dungeon) "Xq" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/golden_cup, +/obj/item/reagent_containers/food/drinks/golden_cup, /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "Xr" = ( -/obj/item/weapon/picnic_blankets_carried, +/obj/item/picnic_blankets_carried, /turf/simulated/floor/beach/sand/desert, /area/redgate/fantasy/caves) "Xt" = ( -/obj/item/weapon/material/whip, +/obj/item/material/whip, /turf/simulated/floor/wood/alt, /area/redgate/fantasy/dungeon) "Xy" = ( @@ -2461,8 +2461,8 @@ /area/redgate/fantasy/alienbasement) "YF" = ( /obj/structure/table/marble, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen/fountain8, +/obj/item/folder/yellow, +/obj/item/pen/fountain8, /turf/simulated/floor/wmarble, /area/redgate/fantasy/dungeon) "YP" = ( @@ -2479,9 +2479,9 @@ /area/redgate/fantasy/caves) "ZA" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/concrete, /area/redgate/fantasy/castle) "ZB" = ( diff --git a/maps/redgate/fantasy_items.dm b/maps/redgate/fantasy_items.dm index 69c82e2a1d5..dc6f7060659 100644 --- a/maps/redgate/fantasy_items.dm +++ b/maps/redgate/fantasy_items.dm @@ -1,5 +1,5 @@ -/obj/item/device/healthanalyzer/scroll //reports all of the above, as well as name and quantity of nonmed reagents in stomach +/obj/item/healthanalyzer/scroll //reports all of the above, as well as name and quantity of nonmed reagents in stomach name = "scroll of divination" desc = "An unusual scroll that appears to report all of the details of a person's health when waved near them. Oddly, it seems to have a little metal chip up near the handles..." advscan = 3 @@ -7,40 +7,40 @@ icon_state = "health_scroll" -/obj/item/weapon/tool/crowbar/alien/magic +/obj/item/tool/crowbar/alien/magic name = "sentient crowbar" desc = "A crowbar with a green gem set in it and a green ribbon tied to it, it floats lightly by itself and appears to be able to pry on its own. It almost feels like there is some sort of anti gravity generator running in it..." catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_crowbar) icon_state = "crowbar_sentient" -/obj/item/weapon/tool/screwdriver/alien/magic +/obj/item/tool/screwdriver/alien/magic name = "vintage screwdriver of revolving" desc = "A vintage screwdriver that spins as fast as a drill with little aid, it has a red gem on the handle. It oddly sounds like a drill too..." catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_screwdriver) icon = 'icons/obj/abductor.dmi' icon_state = "screwdriver_old" -/obj/item/weapon/weldingtool/alien/magic +/obj/item/weldingtool/alien/magic name = "bellows of flame" desc = "A set of bellows that have a yellow gem on the spout, they emit flames when pressed. Oddly seems to have a faint phoron smell to it..." catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_welder) icon = 'icons/obj/abductor.dmi' icon_state = "bellows" -/obj/item/weapon/tool/wirecutters/alien/magic +/obj/item/tool/wirecutters/alien/magic name = "secateurs of organisation" desc = "Extremely sharp secateurs, fitted with a glowing blue gem, said to be magically enhanced for speed. There seems to be a little whirring sound coming from beneath that gem..." icon = 'icons/obj/abductor.dmi' icon_state = "cutters_magic" -/obj/item/weapon/tool/wrench/alien/magic +/obj/item/tool/wrench/alien/magic name = "pliers of molding" desc = "A set of pliers that seems to mold to the shape of their target, housing a pink gem. Oddly seems to have a slightly slimey texture at the metal..." catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_wrench) icon = 'icons/obj/abductor.dmi' icon_state = "pliers" -/obj/item/weapon/surgical/bone_clamp/alien/magic +/obj/item/surgical/bone_clamp/alien/magic icon = 'icons/obj/abductor.dmi' toolspeed = 0.75 icon_state = "bone_boneclamp" @@ -69,18 +69,18 @@ return // Doesn't care about material or anything else. /obj/structure/bed/bath/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/soap)) //VOREStation Edit - "Allows soap and rags to be used on mopbuckets" + if(istype(I, /obj/item/mop) || istype(I, /obj/item/soap)) //VOREStation Edit - "Allows soap and rags to be used on mopbuckets" if(reagents.total_volume < 1) to_chat(user, "\The [src] is out of water!") else reagents.trans_to_obj(I, 5) to_chat(user, "You wet \the [I] in \the [src].") playsound(src, 'sound/effects/slosh.ogg', 25, 1) - if(istype(I, /obj/item/weapon/reagent_containers/glass)) + if(istype(I, /obj/item/reagent_containers/glass)) update_icon() return - else if(istype(I, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = I + else if(istype(I, /obj/item/grab)) + var/obj/item/grab/G = I var/mob/living/affecting = G.affecting if(has_buckled_mobs()) //Handles trying to buckle someone else to a chair when someone else is on it to_chat(user, "\The [src] already has someone buckled to it.") @@ -141,9 +141,9 @@ return //No lid /obj/structure/toilet/wooden/attackby(obj/item/I as obj, mob/living/user as mob) //simpler interactions - if(istype(I, /obj/item/weapon/grab)) + if(istype(I, /obj/item/grab)) user.setClickCooldown(user.get_attack_speed(I)) - var/obj/item/weapon/grab/G = I + var/obj/item/grab/G = I if(isliving(G.affecting)) var/mob/living/GM = G.affecting @@ -246,7 +246,7 @@ return 1 else if(src.dirty==100) // The microwave is all dirty so can't be used! - if(istype(O, /obj/item/weapon/reagent_containers/spray/cleaner) || istype(O, /obj/item/weapon/soap)) // If they're trying to clean it then let them + if(istype(O, /obj/item/reagent_containers/spray/cleaner) || istype(O, /obj/item/soap)) // If they're trying to clean it then let them user.visible_message( \ "\The [user] starts to clean the cooking pot.", \ "You start to clean the cooking pot." \ @@ -285,8 +285,8 @@ "You add \the [O] to \the [src].") SStgui.update_uis(src) return - else if (istype(O,/obj/item/weapon/storage/bag/plants)) // There might be a better way about making plant bags dump their contents into a microwave, but it works. - var/obj/item/weapon/storage/bag/plants/bag = O + else if (istype(O,/obj/item/storage/bag/plants)) // There might be a better way about making plant bags dump their contents into a microwave, but it works. + var/obj/item/storage/bag/plants/bag = O var/failed = 1 for(var/obj/item/G in O.contents) if(!G.reagents || !G.reagents.total_volume) @@ -313,9 +313,9 @@ SStgui.update_uis(src) return 0 - else if(istype(O,/obj/item/weapon/reagent_containers/glass) || \ - istype(O,/obj/item/weapon/reagent_containers/food/drinks) || \ - istype(O,/obj/item/weapon/reagent_containers/food/condiment) \ + else if(istype(O,/obj/item/reagent_containers/glass) || \ + istype(O,/obj/item/reagent_containers/food/drinks) || \ + istype(O,/obj/item/reagent_containers/food/condiment) \ ) if (!O.reagents) return 1 @@ -324,8 +324,8 @@ to_chat(user, "Your [O] contains components unsuitable for cookery.") return 1 return - else if(istype(O,/obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = O + else if(istype(O,/obj/item/grab)) + var/obj/item/grab/G = O to_chat(user, "This is ridiculous. You can not fit \the [G.affecting] in this [src].") return 1 else if(O.is_screwdriver()) @@ -349,7 +349,7 @@ to_chat(user, "You decide not to do that.") else if(default_part_replacement(user, O)) return - else if(istype(O, /obj/item/device/paicard)) + else if(istype(O, /obj/item/paicard)) if(!paicard) insertpai(user, O) else @@ -401,14 +401,14 @@ //harpoon -/obj/item/weapon/bluespace_harpoon/wand +/obj/item/bluespace_harpoon/wand name = "teleportation wand" desc = "An odd wand that weighs more than it looks like it should. It has a wire protruding from it and a glass-like tip, suggesting there may be more tech behind this than magic." icon = 'icons/obj/gun_vr.dmi' icon_state = "harpoonwand-2" -/obj/item/weapon/bluespace_harpoon/wand/update_icon() +/obj/item/bluespace_harpoon/wand/update_icon() if(transforming) switch(mode) if(0) @@ -423,7 +423,7 @@ * magic orb */ -/obj/item/weapon/gun/energy/taser/magic +/obj/item/gun/energy/taser/magic name = "orb of lightning" desc = "An orb filled with electrical energy, it looks oddly like a toy plasma orb..." description_fluff = "" @@ -440,46 +440,46 @@ /obj/machinery/chemical_dispenser/kettle/full spawn_cartridges = list( - /obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cafe_latte, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/soy_latte, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/hot_coco, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/milk, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/cream, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ice, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/mint, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/berry, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/greentea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/decaf, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/chaitea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/decafchai + /obj/item/reagent_containers/chem_disp_cartridge/coffee, + /obj/item/reagent_containers/chem_disp_cartridge/cafe_latte, + /obj/item/reagent_containers/chem_disp_cartridge/soy_latte, + /obj/item/reagent_containers/chem_disp_cartridge/hot_coco, + /obj/item/reagent_containers/chem_disp_cartridge/milk, + /obj/item/reagent_containers/chem_disp_cartridge/cream, + /obj/item/reagent_containers/chem_disp_cartridge/sugar, + /obj/item/reagent_containers/chem_disp_cartridge/tea, + /obj/item/reagent_containers/chem_disp_cartridge/ice, + /obj/item/reagent_containers/chem_disp_cartridge/mint, + /obj/item/reagent_containers/chem_disp_cartridge/orange, + /obj/item/reagent_containers/chem_disp_cartridge/lemon, + /obj/item/reagent_containers/chem_disp_cartridge/lime, + /obj/item/reagent_containers/chem_disp_cartridge/berry, + /obj/item/reagent_containers/chem_disp_cartridge/greentea, + /obj/item/reagent_containers/chem_disp_cartridge/decaf, + /obj/item/reagent_containers/chem_disp_cartridge/chaitea, + /obj/item/reagent_containers/chem_disp_cartridge/decafchai ) // teleporter -/obj/item/device/perfect_tele/magic +/obj/item/perfect_tele/magic name = "teleportation tome" desc = "A large tome that can be used to teleport to special pages that can be removed from it. The spine seems to have some sort buzzing tech inside..." icon = 'icons/obj/props/fantasy.dmi' icon_state = "teleporter" beacons_left = 3 - cell_type = /obj/item/weapon/cell/device + cell_type = /obj/item/cell/device origin_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5) -/obj/item/device/perfect_tele_beacon/magic +/obj/item/perfect_tele_beacon/magic name = "teleportation page" desc = "A single page from a tome, with a glowing blue symbol on it. It seems like the symbol is raised as though there were something running beneath it..." icon = 'icons/obj/props/fantasy.dmi' icon_state = "page" -/obj/item/device/perfect_tele/magic/attack_self(mob/user, var/radial_menu_anchor = src) +/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 premade_tele_beacons) + for(var/obj/item/perfect_tele_beacon/stationary/nb in premade_tele_beacons) if(nb.tele_network == loc_network) beacons[nb.tele_name] = nb loc_network = null //Consumed @@ -513,7 +513,7 @@ This device records all warnings given and teleport events for admin review in c to_chat(user, "No duplicate names, please. '[new_name]' exists already.") return - var/obj/item/device/perfect_tele_beacon/magic/nb = new(get_turf(src)) + var/obj/item/perfect_tele_beacon/magic/nb = new(get_turf(src)) nb.tele_name = new_name nb.tele_hand = src nb.creator = user.ckey @@ -530,7 +530,7 @@ This device records all warnings given and teleport events for admin review in c //sizegun -/obj/item/device/slow_sizegun/magic +/obj/item/slow_sizegun/magic name = "wand of growth and shrinking" desc = "A wand said to be able to shrink or grow it's targets, it's encrusted with glowing gems and a... trigger?" icon = 'icons/obj/gun_vr.dmi' @@ -547,7 +547,7 @@ This device records all warnings given and teleport events for admin review in c breakable = FALSE lock_id = "dungeon" -/obj/item/weapon/simple_key/dungeon +/obj/item/simple_key/dungeon name = "old key" desc = "A plain, old-timey key, as one might use to unlock a door." icon_state = "dungeon" diff --git a/maps/redgate/hotsprings.dmm b/maps/redgate/hotsprings.dmm index 415cba972c6..725aafba2a2 100644 --- a/maps/redgate/hotsprings.dmm +++ b/maps/redgate/hotsprings.dmm @@ -16,7 +16,7 @@ /area/redgate/hotsprings/eastcave) "be" = ( /obj/structure/table/rack/shelf, -/obj/item/device/slow_sizegun, +/obj/item/slow_sizegun, /turf/simulated/floor/tiled/steel, /area/redgate/hotsprings/outdoors) "bt" = ( @@ -112,12 +112,12 @@ /obj/item/clothing/shoes/boots/winter, /obj/structure/closet, /obj/random/firstaid, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/simulated/floor/tiled/steel, /area/redgate/hotsprings/redgate) "dC" = ( -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/simulated/floor/outdoors/dirt{ nitrogen = 93.7835; outdoors = -1; @@ -210,8 +210,8 @@ /obj/item/clothing/shoes/boots/winter, /obj/structure/closet, /obj/random/firstaid, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/simulated/floor/tiled/steel, /area/redgate/hotsprings/redgate) "fS" = ( @@ -268,17 +268,17 @@ /area/redgate/hotsprings/outdoors) "hv" = ( /obj/structure/closet/crate/wooden, -/obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager, -/obj/item/weapon/reagent_containers/food/drinks/bottle/jager, -/obj/item/weapon/reagent_containers/food/drinks/bottle/peppermintschnapps, -/obj/item/weapon/reagent_containers/food/drinks/bottle/sake, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/space_mountain_wind, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/meteor, -/obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew, +/obj/item/reagent_containers/food/drinks/bottle/goldschlager, +/obj/item/reagent_containers/food/drinks/bottle/jager, +/obj/item/reagent_containers/food/drinks/bottle/peppermintschnapps, +/obj/item/reagent_containers/food/drinks/bottle/sake, +/obj/item/reagent_containers/food/drinks/bottle/small/space_mountain_wind, +/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/bottle/tequilla, +/obj/item/reagent_containers/food/drinks/bottle/small/beer/meteor, +/obj/item/reagent_containers/food/drinks/bottle/redeemersbrew, /turf/simulated/floor/outdoors/dirt{ nitrogen = 93.7835; outdoors = -1; @@ -302,12 +302,12 @@ /area/redgate/hotsprings/house/lovercave) "hR" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/steel, /area/redgate/hotsprings/outdoors) "hX" = ( /obj/structure/table/woodentable, -/obj/item/weapon/toy/snowglobe/snowvillage, +/obj/item/toy/snowglobe/snowvillage, /turf/simulated/floor/wood, /area/redgate/hotsprings/house) "ic" = ( @@ -321,11 +321,11 @@ /area/redgate/hotsprings/house/succcave) "ie" = ( /obj/structure/table/rack, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled, /area/redgate/hotsprings/house) "iE" = ( -/obj/item/weapon/paper/card/heart, +/obj/item/paper/card/heart, /turf/simulated/floor/outdoors/dirt{ nitrogen = 93.7835; outdoors = -1; @@ -338,8 +338,8 @@ /area/redgate/hotsprings/outdoors) "iK" = ( /obj/structure/table/standard, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/knife/butch, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/freezer, /area/redgate/hotsprings/house) "iV" = ( @@ -374,7 +374,7 @@ /area/redgate/hotsprings/redgate) "jK" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/rainbowdouble, +/obj/item/bedsheet/rainbowdouble, /turf/simulated/floor/wood, /area/redgate/hotsprings/house/hotspringhouse) "kf" = ( @@ -393,8 +393,8 @@ /turf/simulated/floor/carpet/gaycarpet, /area/redgate/hotsprings/house) "ko" = ( -/obj/item/weapon/stool/padded, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded, +/obj/item/stool/padded{ pixel_y = 10 }, /turf/simulated/floor/outdoors/dirt{ @@ -453,11 +453,11 @@ /area/redgate/hotsprings/westcave) "mr" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/steel, /area/redgate/hotsprings/redgate) "ms" = ( @@ -478,7 +478,7 @@ }, /area/redgate/hotsprings/outdoors) "mA" = ( -/obj/item/weapon/bedsheet/purpledouble{ +/obj/item/bedsheet/purpledouble{ pixel_x = 4 }, /turf/simulated/floor/outdoors/dirt{ @@ -595,9 +595,9 @@ /obj/item/clothing/under/shorts/green, /obj/item/clothing/under/shorts/blue, /obj/item/clothing/under/shorts/black, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/floor/outdoors/dirt{ nitrogen = 93.7835; outdoors = -1; @@ -616,7 +616,7 @@ /turf/simulated/wall/log, /area/redgate/hotsprings/house/dorm1) "pR" = ( -/obj/item/weapon/broken_bottle, +/obj/item/broken_bottle, /turf/simulated/floor/outdoors/dirt{ nitrogen = 93.7835; outdoors = -1; @@ -630,8 +630,8 @@ /obj/item/clothing/shoes/boots/winter, /obj/structure/closet, /obj/random/firstaid, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/simulated/floor/tiled/steel, /area/redgate/hotsprings/redgate) "pU" = ( @@ -664,7 +664,7 @@ range = 10 }, /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 2 }, /turf/simulated/floor/carpet/sblucarpet, @@ -783,7 +783,7 @@ }, /area/redgate/hotsprings/house/hotspringhouse) "um" = ( -/obj/item/weapon/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/food/drinks/shaker{ pixel_x = 7; pixel_y = -5 }, @@ -832,8 +832,8 @@ /obj/item/clothing/shoes/boots/winter, /obj/structure/closet, /obj/random/firstaid, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/simulated/floor/tiled/steel, /area/redgate/hotsprings/redgate) "uT" = ( @@ -889,11 +889,11 @@ }, /area/redgate/hotsprings/outdoors) "vA" = ( -/obj/item/weapon/reagent_containers/food/drinks/cans/beercan{ +/obj/item/reagent_containers/food/drinks/cans/beercan{ pixel_x = 11; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/cans/beercan, +/obj/item/reagent_containers/food/drinks/cans/beercan, /turf/simulated/floor/outdoors/dirt{ nitrogen = 93.7835; outdoors = -1; @@ -952,7 +952,7 @@ /area/redgate/hotsprings/outdoors) "wL" = ( /obj/structure/bed/double, -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /turf/simulated/floor/carpet/sblucarpet, /area/redgate/hotsprings/house/dorm1) "wX" = ( @@ -981,11 +981,11 @@ /area/redgate/hotsprings/outdoors) "xY" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /turf/simulated/floor/tiled/steel, /area/redgate/hotsprings/redgate) "yp" = ( @@ -997,7 +997,7 @@ }, /area/redgate/hotsprings/outdoors) "yt" = ( -/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne, +/obj/item/reagent_containers/food/drinks/bottle/champagne, /turf/simulated/floor/outdoors/dirt{ nitrogen = 93.7835; outdoors = -1; @@ -1085,11 +1085,11 @@ /area/redgate/hotsprings/outdoors) "zB" = ( /obj/structure/bed/double, -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /turf/simulated/floor/carpet/sblucarpet, /area/redgate/hotsprings/house/dorm2) "zI" = ( -/obj/item/weapon/storage/toolbox/lunchbox/filled, +/obj/item/storage/toolbox/lunchbox/filled, /turf/simulated/floor/outdoors/dirt{ nitrogen = 93.7835; outdoors = -1; @@ -1170,7 +1170,7 @@ /area/redgate/hotsprings/eastcave) "BM" = ( /obj/structure/table/glass, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/steel, /area/redgate/hotsprings/redgate) "Ci" = ( @@ -1184,8 +1184,8 @@ /turf/simulated/floor/wood, /area/redgate/hotsprings/house) "CL" = ( -/obj/item/weapon/tool/screwdriver/brass, -/obj/item/weapon/tool/wrench/brass{ +/obj/item/tool/screwdriver/brass, +/obj/item/tool/wrench/brass{ pixel_x = 5; pixel_y = -5 }, @@ -1262,9 +1262,9 @@ /area/redgate/hotsprings/outdoors) "DA" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/storage/box/donkpockets/berry, -/obj/item/weapon/storage/box/donkpockets/berry, -/obj/item/weapon/storage/box/donkpockets/berry, +/obj/item/storage/box/donkpockets/berry, +/obj/item/storage/box/donkpockets/berry, +/obj/item/storage/box/donkpockets/berry, /turf/simulated/floor/tiled/steel, /area/redgate/hotsprings/redgate) "DD" = ( @@ -1296,7 +1296,7 @@ range = 10 }, /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 2 }, /turf/simulated/floor/carpet/sblucarpet, @@ -1334,7 +1334,7 @@ /area/redgate/hotsprings/house) "EN" = ( /obj/random/coin, -/obj/item/weapon/storage/mre, +/obj/item/storage/mre, /obj/item/trash/beans{ pixel_x = -9 }, @@ -1377,15 +1377,15 @@ }, /area/redgate/hotsprings/house/hotspringhouse) "Gb" = ( -/obj/item/weapon/bluespace_crystal{ +/obj/item/bluespace_crystal{ pixel_x = -7; pixel_y = 1 }, -/obj/item/weapon/bluespace_crystal{ +/obj/item/bluespace_crystal{ pixel_x = 6; pixel_y = 4 }, -/obj/item/weapon/bluespace_crystal, +/obj/item/bluespace_crystal, /turf/simulated/floor/outdoors/dirt{ nitrogen = 93.7835; outdoors = -1; @@ -1653,12 +1653,12 @@ /area/redgate/hotsprings/westcave) "Nw" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, /turf/simulated/floor/outdoors/dirt{ nitrogen = 93.7835; outdoors = -1; @@ -1743,12 +1743,12 @@ /area/redgate/hotsprings/eastcave) "PX" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/drinks/bottle/gin, -/obj/item/weapon/reagent_containers/food/drinks/bottle/gin, -/obj/item/weapon/reagent_containers/food/drinks/bottle/gin, -/obj/item/weapon/reagent_containers/food/drinks/bottle/gin, -/obj/item/weapon/reagent_containers/food/drinks/bottle/gin, -/obj/item/weapon/reagent_containers/food/drinks/bottle/gin, +/obj/item/reagent_containers/food/drinks/bottle/gin, +/obj/item/reagent_containers/food/drinks/bottle/gin, +/obj/item/reagent_containers/food/drinks/bottle/gin, +/obj/item/reagent_containers/food/drinks/bottle/gin, +/obj/item/reagent_containers/food/drinks/bottle/gin, +/obj/item/reagent_containers/food/drinks/bottle/gin, /turf/simulated/floor/outdoors/dirt{ nitrogen = 93.7835; outdoors = -1; @@ -1767,11 +1767,11 @@ /area/redgate/hotsprings/outdoors) "Qu" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale, +/obj/item/reagent_containers/food/drinks/bottle/small/ale, +/obj/item/reagent_containers/food/drinks/bottle/small/ale, +/obj/item/reagent_containers/food/drinks/bottle/small/ale, +/obj/item/reagent_containers/food/drinks/bottle/small/ale, +/obj/item/reagent_containers/food/drinks/bottle/small/ale, /turf/simulated/floor/outdoors/dirt{ nitrogen = 93.7835; outdoors = -1; @@ -2036,17 +2036,17 @@ /area/redgate/hotsprings/outdoors) "XD" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, /obj/random/meat, /obj/random/meat, /obj/random/meat, @@ -2085,7 +2085,7 @@ /area/redgate/hotsprings/house) "Ym" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 2 }, /turf/simulated/floor/wood, diff --git a/maps/redgate/innland.dmm b/maps/redgate/innland.dmm index e723903268d..95300851cab 100644 --- a/maps/redgate/innland.dmm +++ b/maps/redgate/innland.dmm @@ -222,10 +222,10 @@ /area/redgate/structure/powered) "cV" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/carpet/bcarpet, @@ -329,20 +329,20 @@ /area/redgate/structure/powered) "do" = ( /obj/structure/mopbucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, /turf/simulated/floor/plating, /area/redgate/structure/powered) "dp" = ( /obj/structure/table/steel, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/machinery/light/small{ dir = 4 }, @@ -362,11 +362,11 @@ /area/redgate/structure/powered) "dv" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/laundry_basket, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/laundry_basket, /turf/simulated/floor/plating, /area/redgate/structure/powered) "dA" = ( @@ -412,10 +412,10 @@ /area/redgate/structure/powered) "dE" = ( /obj/structure/table/marble, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, -/obj/item/weapon/reagent_containers/glass/rag, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/book/manual/barman_recipes, +/obj/item/reagent_containers/food/drinks/flask/vacuumflask, +/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /obj/machinery/light{ dir = 4 }, @@ -426,10 +426,10 @@ /obj/effect/floor_decal/corner/grey/diagonal{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/structure/sign/poster, /turf/unsimulated/floor/steel{ icon_state = "white" @@ -449,22 +449,22 @@ /area/redgate/structure/powered) "dL" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes/neaeracubes, -/obj/item/weapon/storage/box/monkeycubes/sarucubes, -/obj/item/weapon/storage/box/monkeycubes/sobakacubes, -/obj/item/weapon/storage/box/monkeycubes/sparracubes, -/obj/item/weapon/storage/box/monkeycubes/stokcubes, -/obj/item/weapon/storage/box/monkeycubes/wolpincubes, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes/neaeracubes, +/obj/item/storage/box/monkeycubes/sarucubes, +/obj/item/storage/box/monkeycubes/sobakacubes, +/obj/item/storage/box/monkeycubes/sparracubes, +/obj/item/storage/box/monkeycubes/stokcubes, +/obj/item/storage/box/monkeycubes/wolpincubes, +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -490,7 +490,7 @@ /area/redgate/wilds) "dR" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/grilledcheese, +/obj/item/reagent_containers/food/snacks/grilledcheese, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -529,7 +529,7 @@ /area/redgate/structure/powered) "ea" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/roastbeef, +/obj/item/reagent_containers/food/snacks/roastbeef, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -573,10 +573,10 @@ /area/redgate/structure/powered) "eh" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, /turf/unsimulated/floor/steel{ @@ -589,8 +589,8 @@ /obj/effect/floor_decal/corner/grey/diagonal{ dir = 4 }, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/material/knife/butch, +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, /turf/unsimulated/floor/steel{ @@ -613,10 +613,10 @@ /obj/structure/table/standard{ name = "plastic table frame" }, -/obj/item/weapon/material/knife, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/material/knife, +/obj/item/material/minihoe, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/unsimulated/floor/steel, /area/redgate/structure/powered) "el" = ( @@ -679,7 +679,7 @@ /turf/unsimulated/floor/steel, /area/redgate/structure/powered) "ev" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/spline/plain{ dir = 8 }, @@ -687,10 +687,10 @@ /area/redgate/structure/powered) "ew" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, /turf/simulated/floor/lino, @@ -704,7 +704,7 @@ /obj/effect/floor_decal/corner/grey/diagonal{ dir = 4 }, -/obj/item/weapon/book/manual/chef_recipes, +/obj/item/book/manual/chef_recipes, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -718,7 +718,7 @@ /area/redgate/structure/powered) "eE" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/meatballsoup, +/obj/item/reagent_containers/food/snacks/meatballsoup, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -732,7 +732,7 @@ /obj/effect/floor_decal/corner/grey/diagonal{ dir = 4 }, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/kitchen/rollingpin, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -743,7 +743,7 @@ /area/redgate/structure/powered) "eN" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/meatsteak, +/obj/item/reagent_containers/food/snacks/meatsteak, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -751,7 +751,7 @@ /area/redgate/structure/powered) "eO" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /turf/simulated/floor/lino, /area/redgate/structure/powered) "eP" = ( @@ -804,15 +804,15 @@ /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/closet/chefcloset, /obj/item/glass_jar, -/obj/item/device/retail_scanner/civilian, -/obj/item/weapon/soap/nanotrasen, -/obj/item/device/destTagger{ +/obj/item/retail_scanner/civilian, +/obj/item/soap/nanotrasen, +/obj/item/destTagger{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, /turf/simulated/floor/tiled/white, /area/redgate/structure/powered) "eW" = ( @@ -935,10 +935,10 @@ dir = 4 }, /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, /obj/structure/extinguisher_cabinet{ diff --git a/maps/redgate/islands.dmm b/maps/redgate/islands.dmm index 3255403fed2..936d3a55ab5 100644 --- a/maps/redgate/islands.dmm +++ b/maps/redgate/islands.dmm @@ -5,7 +5,7 @@ /area/redgate/islands/gear) "az" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/greendouble, +/obj/item/bedsheet/greendouble, /turf/simulated/floor/carpet/green, /area/redgate/islands/dorm1) "aL" = ( @@ -13,7 +13,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/islands/diningroom) "aP" = ( -/obj/item/weapon/material/shard/titaniumglass, +/obj/item/material/shard/titaniumglass, /turf/simulated/shuttle/floor/alienplating/blue, /area/redgate/islands/alienship) "bg" = ( @@ -25,12 +25,12 @@ /turf/simulated/floor/wood/alt, /area/redgate/islands/diningroom) "bo" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /turf/simulated/shuttle/floor/alien/blue, /area/redgate/islands/alienship) "bt" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/toy/desk/officetoy, +/obj/item/toy/desk/officetoy, /turf/simulated/floor/tiled/dark, /area/redgate/islands/control) "bv" = ( @@ -85,20 +85,20 @@ /turf/simulated/floor/tiled/dark, /area/redgate/islands/gear) "dk" = ( -/obj/item/weapon/oar, +/obj/item/oar, /turf/simulated/floor/outdoors/newdirt, /area/redgate/islands/ocean) "dr" = ( /obj/structure/table/darkglass, -/obj/item/weapon/toy/desk/newtoncradle, +/obj/item/toy/desk/newtoncradle, /turf/simulated/floor/wood/alt, /area/redgate/islands/office) "dt" = ( -/obj/item/weapon/picnic_blankets_carried, +/obj/item/picnic_blankets_carried, /turf/simulated/floor/beach/sand/desert/outdoors, /area/redgate/islands/ocean) "dD" = ( -/obj/item/weapon/bone/skull/unknown, +/obj/item/bone/skull/unknown, /turf/simulated/shuttle/floor/alien/blue, /area/redgate/islands/alienship) "dF" = ( @@ -117,8 +117,8 @@ /area/redgate/islands/kitchen) "dX" = ( /obj/structure/table/marble, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/knife/butch, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/kafel_full, /area/redgate/islands/kitchen) "ea" = ( @@ -146,7 +146,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/islands/diningroom) "eG" = ( -/obj/item/weapon/beach_ball, +/obj/item/beach_ball, /turf/simulated/floor/beach/sand/desert/outdoors, /area/redgate/islands/ocean) "eH" = ( @@ -171,7 +171,7 @@ /area/redgate/islands/livingroom) "fc" = ( /obj/structure/grille, -/obj/item/weapon/material/shard/titaniumglass, +/obj/item/material/shard/titaniumglass, /turf/simulated/shuttle/floor/alien/blue, /area/redgate/islands/alienship) "fd" = ( @@ -218,7 +218,7 @@ /area/redgate/islands/dorm1) "gH" = ( /obj/structure/table/darkglass, -/obj/item/weapon/toy/desk/fan, +/obj/item/toy/desk/fan, /turf/simulated/floor/wood/alt, /area/redgate/islands/office) "gJ" = ( @@ -235,7 +235,7 @@ /area/redgate/islands/livingroom) "gT" = ( /obj/structure/salvageable/shuttle_console, -/obj/item/weapon/material/shard/titaniumglass, +/obj/item/material/shard/titaniumglass, /turf/simulated/shuttle/floor/alienplating/blue/half{ dir = 1 }, @@ -264,26 +264,26 @@ "hP" = ( /obj/structure/table/marble, /obj/structure/closet/walllocker_double/kitchen/west, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, /obj/machinery/light, /turf/simulated/floor/tiled/kafel_full, /area/redgate/islands/kitchen) "hS" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/toy/desk/fan, +/obj/item/toy/desk/fan, /turf/simulated/floor/tiled/dark, /area/redgate/islands/control) "hU" = ( @@ -316,8 +316,8 @@ /area/redgate/islands/oxygen) "it" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup, -/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup, +/obj/item/reagent_containers/glass/beaker/measuring_cup, +/obj/item/reagent_containers/glass/beaker/measuring_cup, /turf/simulated/floor/tiled/kafel_full, /area/redgate/islands/kitchen) "iu" = ( @@ -363,9 +363,9 @@ /area/redgate/islands/cave) "iX" = ( /obj/structure/bookcase, -/obj/item/weapon/book/bundle/custom_library/fiction/apurrrrfectman, -/obj/item/weapon/book/bundle/custom_library/fiction/beyondthedoor, -/obj/item/weapon/book/bundle/custom_library/fiction/ghostship, +/obj/item/book/bundle/custom_library/fiction/apurrrrfectman, +/obj/item/book/bundle/custom_library/fiction/beyondthedoor, +/obj/item/book/bundle/custom_library/fiction/ghostship, /turf/simulated/floor/wood/alt, /area/redgate/islands/office) "jt" = ( @@ -386,8 +386,8 @@ /area/redgate/islands/ocean) "kd" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fountain7, +/obj/item/paper_bin, +/obj/item/pen/fountain7, /turf/simulated/floor/tiled/dark, /area/redgate/islands/control) "kf" = ( @@ -444,7 +444,7 @@ }, /area/redgate/islands/ocean) "lJ" = ( -/obj/item/weapon/material/shard/titaniumglass, +/obj/item/material/shard/titaniumglass, /obj/structure/bed/chair/bay/chair/padded/purple{ dir = 1 }, @@ -633,9 +633,9 @@ /area/redgate/islands/ocean) "qF" = ( /obj/structure/bookcase, -/obj/item/weapon/book/custom_library/fiction/blacksmithandkinglybloke, -/obj/item/weapon/book/custom_library/fiction/irishairmanforseesdeath, -/obj/item/weapon/book/custom_library/fiction/myrock, +/obj/item/book/custom_library/fiction/blacksmithandkinglybloke, +/obj/item/book/custom_library/fiction/irishairmanforseesdeath, +/obj/item/book/custom_library/fiction/myrock, /turf/simulated/floor/wood/alt, /area/redgate/islands/office) "qU" = ( @@ -666,10 +666,10 @@ /area/redgate/islands/control) "rA" = ( /obj/structure/table/gold, -/obj/item/weapon/tank/oxygen/yellow, -/obj/item/weapon/tank/oxygen/yellow, -/obj/item/weapon/tank/oxygen/yellow, -/obj/item/weapon/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, /turf/simulated/floor/concrete, /area/redgate/islands/oxygen) "rT" = ( @@ -703,7 +703,7 @@ /turf/simulated/floor/outdoors/grass/heavy, /area/redgate/islands/ocean) "sO" = ( -/obj/item/weapon/material/shard/titaniumglass, +/obj/item/material/shard/titaniumglass, /turf/simulated/floor/water/deep/ocean/diving, /area/redgate/islands/ocean) "sR" = ( @@ -723,7 +723,7 @@ /turf/simulated/floor/lava, /area/redgate/islands/ocean) "tA" = ( -/obj/item/weapon/oar, +/obj/item/oar, /turf/simulated/floor/beach/sand/desert/outdoors, /area/redgate/islands/ocean) "tD" = ( @@ -775,7 +775,7 @@ /area/redgate/islands/ocean) "wp" = ( /obj/structure/table/hardwoodtable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 7 }, /turf/simulated/floor/wood/alt, @@ -824,7 +824,7 @@ /area/redgate/islands/office) "xN" = ( /obj/structure/table/hardwoodtable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 7 }, /turf/simulated/floor/wood/alt, @@ -1008,7 +1008,7 @@ /area/redgate/islands/livingroom) "CT" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/oar, +/obj/item/oar, /obj/machinery/light_switch{ dir = 8; pixel_x = 24; @@ -1024,7 +1024,7 @@ /area/redgate/islands/livingroom) "Dx" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard/titaniumglass, +/obj/item/material/shard/titaniumglass, /turf/simulated/shuttle/floor/alien/blue, /area/redgate/islands/alienship) "DD" = ( @@ -1261,16 +1261,16 @@ /obj/structure/closet/crate{ name = "oar box" }, -/obj/item/weapon/oar, -/obj/item/weapon/oar, -/obj/item/weapon/oar, -/obj/item/weapon/oar, -/obj/item/weapon/oar, -/obj/item/weapon/oar, +/obj/item/oar, +/obj/item/oar, +/obj/item/oar, +/obj/item/oar, +/obj/item/oar, +/obj/item/oar, /turf/simulated/floor/beach/sand/desert/outdoors, /area/redgate/islands/ocean) "LC" = ( -/obj/item/weapon/oar, +/obj/item/oar, /turf/simulated/floor/tiled{ outdoors = 1 }, @@ -1339,9 +1339,9 @@ /area/redgate/islands/gear) "Ns" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, /obj/machinery/light, /turf/simulated/floor/tiled/kafel_full, /area/redgate/islands/kitchen) @@ -1389,7 +1389,7 @@ /obj/structure/table/rack/shelf/steel{ pixel_y = 16 }, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /obj/random/soap, /turf/simulated/floor/tiled/kafel_full/gray, /area/redgate/islands/bathroom) @@ -1447,7 +1447,7 @@ /area/redgate/islands/livingroom) "QQ" = ( /obj/structure/table/darkglass, -/obj/item/weapon/book/bundle/custom_library/fiction/taleoftherainbowcat, +/obj/item/book/bundle/custom_library/fiction/taleoftherainbowcat, /turf/simulated/floor/wood/alt, /area/redgate/islands/office) "RG" = ( @@ -1465,7 +1465,7 @@ /turf/simulated/shuttle/floor/alien/blue, /area/redgate/islands/alienship) "RP" = ( -/obj/item/weapon/oar, +/obj/item/oar, /turf/simulated/floor/water/beach, /area/redgate/islands/ocean) "RZ" = ( @@ -1474,9 +1474,9 @@ /area/redgate/islands/cave) "Si" = ( /obj/structure/bookcase, -/obj/item/weapon/book/custom_library/fiction/starsandsometimesfallingones, -/obj/item/weapon/book/custom_library/fiction/truelovehathmyheart, -/obj/item/weapon/book/custom_library/fiction/woodysgotwood, +/obj/item/book/custom_library/fiction/starsandsometimesfallingones, +/obj/item/book/custom_library/fiction/truelovehathmyheart, +/obj/item/book/custom_library/fiction/woodysgotwood, /turf/simulated/floor/wood/alt, /area/redgate/islands/office) "Sk" = ( @@ -1624,28 +1624,28 @@ /area/redgate/islands/redgate) "Xl" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spork, -/obj/item/weapon/material/kitchen/utensil/foon, -/obj/item/weapon/material/knife, -/obj/item/weapon/material/knife, -/obj/item/weapon/material/knife, -/obj/item/weapon/material/knife, -/obj/item/weapon/material/knife, -/obj/item/weapon/material/knife, -/obj/item/weapon/material/knife, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spork, +/obj/item/material/kitchen/utensil/foon, +/obj/item/material/knife, +/obj/item/material/knife, +/obj/item/material/knife, +/obj/item/material/knife, +/obj/item/material/knife, +/obj/item/material/knife, +/obj/item/material/knife, /turf/simulated/floor/wood/alt, /area/redgate/islands/diningroom) "Xq" = ( @@ -1719,7 +1719,7 @@ /turf/simulated/floor/water/deep/ocean/diving, /area/redgate/islands/ocean) "Zg" = ( -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/wood/alt, /area/redgate/islands/diningroom) "ZF" = ( @@ -1739,12 +1739,12 @@ /area/redgate/islands/ocean) "ZR" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/material/fishing_rod/modern/strong, +/obj/item/material/fishing_rod/modern/strong, /turf/simulated/floor/wood/alt, /area/redgate/islands/livingroom) "ZY" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, +/obj/item/bedsheet/purpledouble, /turf/simulated/floor/wood/alt, /area/redgate/islands/dorm2) diff --git a/maps/redgate/islands_underwater.dmm b/maps/redgate/islands_underwater.dmm index e76e10957f1..834ec9585ae 100644 --- a/maps/redgate/islands_underwater.dmm +++ b/maps/redgate/islands_underwater.dmm @@ -5,7 +5,7 @@ /area/redgate/islands/ruins) "ad" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /turf/simulated/floor/wood/alt, /area/redgate/islands/sparerooms) "af" = ( @@ -45,12 +45,12 @@ /area/redgate/islands/sparerooms) "bi" = ( /obj/structure/table/gold, -/obj/item/weapon/material/knife/ritual, +/obj/item/material/knife/ritual, /turf/simulated/floor/water/underwater/sand, /area/redgate/islands/ruins) "bl" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/rainbow, +/obj/item/bedsheet/rainbow, /turf/simulated/floor/wood/alt, /area/redgate/islands/sparerooms) "bm" = ( @@ -64,7 +64,7 @@ }, /area/redgate/islands/ruins) "by" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /obj/machinery/light/small{ @@ -74,18 +74,18 @@ /area/redgate/islands/gambling) "bZ" = ( /obj/structure/closet/grave, -/obj/item/weapon/bone/skull, -/obj/item/weapon/bone/skull, -/obj/item/weapon/bone/skull/tajaran, -/obj/item/weapon/bone/skull/unathi, -/obj/item/weapon/bone/skull/unknown, +/obj/item/bone/skull, +/obj/item/bone/skull, +/obj/item/bone/skull/tajaran, +/obj/item/bone/skull/unathi, +/obj/item/bone/skull/unknown, /obj/item/clothing/suit/dress/solgov/fleet/sailor, /obj/random/contraband/nofail, /turf/simulated/floor/water/underwater, /area/redgate/islands/underwater) "cl" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hop, +/obj/item/bedsheet/hop, /turf/simulated/floor/wood/alt, /area/redgate/islands/sparerooms) "cu" = ( @@ -105,49 +105,49 @@ /area/redgate/islands/bar) "cK" = ( /obj/structure/closet/walllocker_double/north, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c1, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c10, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c100, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c20, -/obj/item/weapon/spacecasinocash/c20, -/obj/item/weapon/spacecasinocash/c20, -/obj/item/weapon/spacecasinocash/c20, -/obj/item/weapon/spacecasinocash/c200, -/obj/item/weapon/spacecasinocash/c200, -/obj/item/weapon/spacecasinocash/c200, -/obj/item/weapon/spacecasinocash/c200, -/obj/item/weapon/spacecasinocash/c50, -/obj/item/weapon/spacecasinocash/c50, -/obj/item/weapon/spacecasinocash/c50, -/obj/item/weapon/spacecasinocash/c50, -/obj/item/weapon/spacecasinocash/c500, -/obj/item/weapon/spacecasinocash/c500, -/obj/item/weapon/spacecasinocash/c500, -/obj/item/weapon/spacecasinocash/c500, -/obj/item/weapon/spacecasinocash/c500, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c1, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c10, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c100, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c20, +/obj/item/spacecasinocash/c20, +/obj/item/spacecasinocash/c20, +/obj/item/spacecasinocash/c20, +/obj/item/spacecasinocash/c200, +/obj/item/spacecasinocash/c200, +/obj/item/spacecasinocash/c200, +/obj/item/spacecasinocash/c200, +/obj/item/spacecasinocash/c50, +/obj/item/spacecasinocash/c50, +/obj/item/spacecasinocash/c50, +/obj/item/spacecasinocash/c50, +/obj/item/spacecasinocash/c500, +/obj/item/spacecasinocash/c500, +/obj/item/spacecasinocash/c500, +/obj/item/spacecasinocash/c500, +/obj/item/spacecasinocash/c500, /turf/simulated/floor/wood/alt, /area/redgate/islands/gamblingbackroom) "da" = ( @@ -160,7 +160,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/islands/bar) "db" = ( -/obj/item/weapon/storage/backpack/cultpack, +/obj/item/storage/backpack/cultpack, /obj/structure/grille/broken/cult, /turf/simulated/floor/water/underwater/cult, /area/redgate/islands/cult) @@ -197,14 +197,14 @@ /turf/simulated/floor/wood/alt, /area/redgate/islands/piratecave) "dT" = ( -/obj/item/weapon/casino_platinum_chip, +/obj/item/casino_platinum_chip, /turf/simulated/floor/outdoors/rocks/caves, /area/redgate/islands/piratecave) "eb" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/storage/box/roulette_balls_fancy, +/obj/item/storage/dicecup, +/obj/item/storage/dicecup, +/obj/item/storage/box/roulette_balls_fancy, /turf/simulated/floor/wood/alt, /area/redgate/islands/gamblingbackroom) "eD" = ( @@ -226,8 +226,8 @@ /area/redgate/islands/underwater) "eX" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fountain9, +/obj/item/paper_bin, +/obj/item/pen/fountain9, /turf/simulated/floor/tiled/dark, /area/redgate/islands/meeting) "eY" = ( @@ -257,7 +257,7 @@ /turf/simulated/floor/water/underwater, /area/redgate/islands/underwater) "fF" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/carpet/bcarpet, @@ -281,7 +281,7 @@ /area/redgate/islands/underwater) "fU" = ( /obj/structure/table/gold, -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, /turf/simulated/floor/water/underwater/sand, /area/redgate/islands/ruins) "fZ" = ( @@ -425,7 +425,7 @@ /area/redgate/islands/backroom) "iT" = ( /obj/structure/table/gold, -/obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced/random, +/obj/item/gun/energy/mouseray/metamorphosis/advanced/random, /turf/simulated/floor/water/underwater/sand, /area/redgate/islands/ruins) "iV" = ( @@ -456,7 +456,7 @@ /turf/simulated/floor/outdoors/rocks/caves, /area/redgate/islands/underwatercave) "jv" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /obj/machinery/light/small, @@ -536,7 +536,7 @@ /obj/structure/bed/double/padded{ color = "#FFD700" }, -/obj/item/weapon/bedsheet/yellowdouble, +/obj/item/bedsheet/yellowdouble, /turf/simulated/floor/water/underwater/sand, /area/redgate/islands/ruins) "kJ" = ( @@ -553,33 +553,33 @@ /area/redgate/islands/piratecave) "lk" = ( /obj/structure/closet/walllocker_double/kitchen/west, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/glass2/carafe, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/glass2/carafe, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, /turf/simulated/floor/wood/alt, /area/redgate/islands/bar) "lq" = ( @@ -604,7 +604,7 @@ /area/redgate/islands/underwater) "lB" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, /obj/item/clothing/mask/gas/half{ name = "diving mask" }, @@ -631,18 +631,18 @@ /area/redgate/islands/robotics) "lW" = ( /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, /obj/item/clothing/under/pants/khaki, /turf/simulated/floor/tiled/dark, /area/redgate/islands/mess) @@ -800,7 +800,7 @@ /area/redgate/islands/shower) "qb" = ( /obj/structure/table/glass, -/obj/item/weapon/newspaper, +/obj/item/newspaper, /turf/simulated/floor/tiled/dark, /area/redgate/islands/mess) "qk" = ( @@ -813,7 +813,7 @@ /area/redgate/islands/underwater) "qn" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/sword/sabre, +/obj/item/material/sword/sabre, /turf/simulated/floor/wood/alt, /area/redgate/islands/piratecave) "qo" = ( @@ -863,7 +863,7 @@ /obj/structure/table/rack{ color = "#FFD700" }, -/obj/item/weapon/soap/golden_soap, +/obj/item/soap/golden_soap, /turf/simulated/floor/water/underwater/sand, /area/redgate/islands/ruins) "rq" = ( @@ -904,7 +904,7 @@ /area/redgate/islands/ruins) "sh" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/tank/air, +/obj/item/tank/air, /obj/item/clothing/mask/gas/half{ name = "diving mask" }, @@ -919,7 +919,7 @@ /turf/simulated/floor/outdoors/rocks/caves, /area/redgate/islands/piratecave) "sF" = ( -/obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog, +/obj/item/reagent_containers/food/snacks/packaged/vendhotdog, /turf/simulated/floor/water/underwater, /area/redgate/islands/underwater) "sH" = ( @@ -930,7 +930,7 @@ /area/redgate/islands/ruins) "sR" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/piratedouble, +/obj/item/bedsheet/piratedouble, /turf/simulated/floor/carpet/brown, /area/redgate/islands/backroom) "tb" = ( @@ -947,7 +947,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/islands/bar) "ts" = ( -/obj/item/weapon/pickaxe/gold, +/obj/item/pickaxe/gold, /turf/simulated/floor/water/underwater/sand, /area/redgate/islands/ruins) "tv" = ( @@ -1004,10 +1004,10 @@ /area/redgate/islands/lavabase) "ud" = ( /obj/structure/closet, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/folder/blue, /turf/simulated/floor/tiled/dark, /area/redgate/islands/meeting) "uf" = ( @@ -1035,7 +1035,7 @@ /area/redgate/islands/robotics) "us" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 7 }, /turf/simulated/floor/wood/alt, @@ -1059,7 +1059,7 @@ /turf/simulated/floor/water/underwater/sand, /area/redgate/islands/ruins) "uK" = ( -/obj/item/weapon/bluespace_crystal, +/obj/item/bluespace_crystal, /turf/simulated/floor/water/underwater, /area/redgate/islands/underwater) "uN" = ( @@ -1118,7 +1118,7 @@ /turf/simulated/floor/carpet/blue2, /area/redgate/islands/rig1) "wc" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/carpet/bcarpet, @@ -1152,7 +1152,7 @@ /turf/simulated/floor/tiled/dark, /area/redgate/islands/mess) "wG" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /obj/machinery/light/small{ @@ -1168,7 +1168,7 @@ /turf/simulated/floor/greengrid, /area/redgate/islands/lavabase) "xa" = ( -/obj/item/weapon/material/twohanded/baseballbat/gold, +/obj/item/material/twohanded/baseballbat/gold, /turf/simulated/floor/water/underwater/sand, /area/redgate/islands/ruins) "xg" = ( @@ -1180,14 +1180,14 @@ /area/redgate/islands/rig2) "xm" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/blue2, /area/redgate/islands/rig1) "xz" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, /turf/simulated/floor/wood/alt, /area/redgate/islands/storeroom) "xC" = ( @@ -1218,7 +1218,7 @@ /area/redgate/islands/rig2) "yd" = ( /obj/machinery/optable, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/islands/robotics) "yl" = ( @@ -1237,7 +1237,7 @@ /area/redgate/islands/gamblingbackroom) "yv" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/carpet/blue2, /area/redgate/islands/rig1) "yB" = ( @@ -1287,7 +1287,7 @@ /turf/simulated/wall/cult, /area/redgate/islands/cult) "zE" = ( -/obj/item/weapon/reagent_containers/food/snacks/old/hotdog, +/obj/item/reagent_containers/food/snacks/old/hotdog, /turf/simulated/floor/water/underwater, /area/redgate/islands/underwater) "zK" = ( @@ -1322,10 +1322,10 @@ /area/redgate/islands/underwater) "Ai" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, /obj/machinery/light/small{ dir = 8 }, @@ -1362,7 +1362,7 @@ /area/redgate/islands/ruins) "Bu" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 7 }, /turf/simulated/floor/carpet/brown, @@ -1414,7 +1414,7 @@ /area/redgate/islands/underwater) "Cs" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, /obj/item/clothing/mask/gas/half{ name = "diving mask" }, @@ -1444,7 +1444,7 @@ /turf/simulated/floor/water/underwater/wood, /area/redgate/islands/underwater) "CM" = ( -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, /turf/simulated/floor/water/underwater/sand, /area/redgate/islands/ruins) "CN" = ( @@ -1482,7 +1482,7 @@ /turf/simulated/floor/tiled/techfloor, /area/redgate/islands/lavabase) "DF" = ( -/obj/item/weapon/material/shard/titaniumglass, +/obj/item/material/shard/titaniumglass, /turf/simulated/floor/water/underwater, /area/redgate/islands/underwater) "DJ" = ( @@ -1491,7 +1491,7 @@ /turf/simulated/floor/tiled/dark, /area/redgate/islands/mess) "DK" = ( -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, /turf/simulated/floor/water/underwater/sand, /area/redgate/islands/ruins) "DM" = ( @@ -1512,7 +1512,7 @@ /turf/simulated/floor/water/underwater, /area/redgate/islands/underwater) "DW" = ( -/obj/item/weapon/reagent_containers/food/snacks/packaged/meatration, +/obj/item/reagent_containers/food/snacks/packaged/meatration, /turf/simulated/floor/outdoors/rocks/caves, /area/redgate/islands/underwatercave) "DZ" = ( @@ -1625,7 +1625,7 @@ /area/redgate/islands/underwatercave) "Gv" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/food/drinks/shaker, /turf/simulated/floor/wood/alt, /area/redgate/islands/bar) "Gz" = ( @@ -1641,7 +1641,7 @@ /area/redgate/islands/lavadorm) "GE" = ( /obj/structure/table/woodentable, -/obj/item/weapon/gun/projectile/pirate, +/obj/item/gun/projectile/pirate, /turf/simulated/floor/wood/alt, /area/redgate/islands/piratecave) "GL" = ( @@ -1772,7 +1772,7 @@ "KV" = ( /obj/structure/table/woodentable, /obj/item/ammo_magazine/s45/rubber, -/obj/item/weapon/gun/projectile/revolver/detective45, +/obj/item/gun/projectile/revolver/detective45, /turf/simulated/floor/wood/alt, /area/redgate/islands/backroom) "KX" = ( @@ -1789,13 +1789,13 @@ /turf/simulated/floor/water/underwater, /area/redgate/islands/underwater) "Lt" = ( -/obj/item/weapon/paper/alien, +/obj/item/paper/alien, /turf/simulated/floor/water/underwater, /area/redgate/islands/underwater) "Lu" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /obj/random/soap, /turf/simulated/floor/tiled/old_tile, /area/redgate/islands/shower) @@ -1806,7 +1806,7 @@ pixel_y = 21 }, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /obj/machinery/light_switch{ dir = 8; pixel_x = 25; @@ -1871,7 +1871,7 @@ /turf/simulated/floor/water/underwater, /area/redgate/islands/underwater) "Mq" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /obj/effect/floor_decal/spline/plain{ @@ -1903,7 +1903,7 @@ /turf/simulated/floor/outdoors/rocks/caves, /area/redgate/islands/piratecave) "MO" = ( -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /turf/simulated/floor/water/underwater, /area/redgate/islands/underwater) "MU" = ( @@ -1966,7 +1966,7 @@ /area/redgate/islands/underwater) "Oz" = ( /obj/structure/table/gold, -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, /turf/simulated/floor/water/underwater/sand, /area/redgate/islands/ruins) "OA" = ( @@ -2068,7 +2068,7 @@ /turf/simulated/floor/carpet/brown, /area/redgate/islands/gambling) "QF" = ( -/obj/item/weapon/handcuffs/cable/plantfiber, +/obj/item/handcuffs/cable/plantfiber, /turf/simulated/floor/wood/alt, /area/redgate/islands/piratecave) "QM" = ( @@ -2131,7 +2131,7 @@ /area/redgate/islands/underwater) "RF" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /turf/simulated/floor/carpet/purcarpet, /area/redgate/islands/lavadorm) "RJ" = ( @@ -2143,7 +2143,7 @@ /obj/item/clothing/accessory/jacket/gambler, /obj/item/clothing/under/suit_jacket/gambler, /obj/item/clothing/shoes/flats, -/obj/item/weapon/gun/energy/sickshot, +/obj/item/gun/energy/sickshot, /turf/simulated/floor/wood/alt, /area/redgate/islands/gamblingbackroom) "RR" = ( @@ -2204,7 +2204,7 @@ /turf/simulated/floor/water/underwater, /area/redgate/islands/underwater) "Su" = ( -/obj/item/weapon/aliencoin/gold, +/obj/item/aliencoin/gold, /turf/simulated/floor/water/underwater, /area/redgate/islands/underwater) "Sx" = ( @@ -2271,7 +2271,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/redgate/islands/gambling) "To" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/carpet/bcarpet, /area/redgate/islands/gambling) "Tt" = ( @@ -2331,7 +2331,7 @@ /area/redgate/islands/underwatercave) "Um" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/blue2, /area/redgate/islands/rig2) "Uo" = ( @@ -2351,7 +2351,7 @@ /area/redgate/islands/underwater) "Uy" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /turf/simulated/floor/wood/alt, /area/redgate/islands/sparerooms) "UC" = ( @@ -2366,7 +2366,7 @@ /turf/simulated/floor/water/underwater, /area/redgate/islands/underwater) "UI" = ( -/obj/item/weapon/paper/sec_ticket, +/obj/item/paper/sec_ticket, /turf/simulated/floor/water/underwater, /area/redgate/islands/underwater) "UO" = ( @@ -2444,11 +2444,11 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/islands/robotics) "Wq" = ( -/obj/item/weapon/paperplane, +/obj/item/paperplane, /turf/simulated/floor/tiled/dark, /area/redgate/islands/meeting) "Wx" = ( -/obj/item/weapon/material/knife/tacknife/boot, +/obj/item/material/knife/tacknife/boot, /turf/simulated/floor/water/underwater, /area/redgate/islands/underwater) "WB" = ( @@ -2470,13 +2470,13 @@ /turf/simulated/floor/wood/alt, /area/redgate/islands/piratecave) "Xk" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/carpet/brown, /area/redgate/islands/gambling) "Xl" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/wood/alt, @@ -2495,7 +2495,7 @@ /turf/simulated/floor/tiled/eris/dark/techfloor, /area/redgate/islands/divingbay) "XI" = ( -/obj/item/weapon/tank/air, +/obj/item/tank/air, /turf/simulated/floor/outdoors/rocks/caves, /area/redgate/islands/underwatercave) "XM" = ( @@ -2505,9 +2505,9 @@ /area/redgate/islands/bar) "XS" = ( /obj/structure/table/woodentable, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/wood/alt, /area/redgate/islands/gamblingbackroom) "XU" = ( @@ -2529,7 +2529,7 @@ /area/redgate/islands/bar) "XZ" = ( /obj/structure/table/gold, -/obj/item/weapon/reagent_containers/food/drinks/golden_cup, +/obj/item/reagent_containers/food/drinks/golden_cup, /turf/simulated/floor/water/underwater/sand, /area/redgate/islands/ruins) "Yd" = ( diff --git a/maps/redgate/jungle.dmm b/maps/redgate/jungle.dmm index 9308753680f..de8eeff00d0 100644 --- a/maps/redgate/jungle.dmm +++ b/maps/redgate/jungle.dmm @@ -5,31 +5,31 @@ /area/redgate/jungle/temple) "af" = ( /obj/structure/closet/crate/wooden, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, /turf/simulated/floor/wood, /area/redgate/jungle/aboveground) "ak" = ( @@ -67,25 +67,25 @@ /area/redgate/jungle/temple) "aC" = ( /obj/structure/closet/walllocker/wooden/south, -/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua, -/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua, -/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua, -/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua, -/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua, -/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum, -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum, -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum, -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum, -/obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey, -/obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey, -/obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey, -/obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey, +/obj/item/reagent_containers/food/drinks/bottle/kahlua, +/obj/item/reagent_containers/food/drinks/bottle/kahlua, +/obj/item/reagent_containers/food/drinks/bottle/kahlua, +/obj/item/reagent_containers/food/drinks/bottle/kahlua, +/obj/item/reagent_containers/food/drinks/bottle/kahlua, +/obj/item/reagent_containers/food/drinks/bottle/grenadine, +/obj/item/reagent_containers/food/drinks/bottle/grenadine, +/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey, +/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey, +/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey, +/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "aE" = ( -/obj/item/weapon/reagent_containers/food/snacks/packaged/meatration, +/obj/item/reagent_containers/food/snacks/packaged/meatration, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -144,7 +144,7 @@ /obj/effect/floor_decal/atoll/border{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine, +/obj/item/reagent_containers/food/drinks/bottle/pwine, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -208,15 +208,15 @@ /area/redgate/jungle/temple) "cq" = ( /obj/structure/closet/crate/wooden, -/obj/item/weapon/reagent_containers/food/snacks/flatbread, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/bread, -/obj/item/weapon/reagent_containers/food/snacks/berrymuffin, -/obj/item/weapon/reagent_containers/food/snacks/berrymuffin, -/obj/item/weapon/reagent_containers/food/snacks/berrymuffin, -/obj/item/weapon/reagent_containers/food/snacks/berrymuffin, -/obj/item/weapon/reagent_containers/food/snacks/sausage, -/obj/item/weapon/reagent_containers/food/snacks/sausage, -/obj/item/weapon/material/knife, +/obj/item/reagent_containers/food/snacks/flatbread, +/obj/item/reagent_containers/food/snacks/sliceable/bread, +/obj/item/reagent_containers/food/snacks/berrymuffin, +/obj/item/reagent_containers/food/snacks/berrymuffin, +/obj/item/reagent_containers/food/snacks/berrymuffin, +/obj/item/reagent_containers/food/snacks/berrymuffin, +/obj/item/reagent_containers/food/snacks/sausage, +/obj/item/reagent_containers/food/snacks/sausage, +/obj/item/material/knife, /turf/simulated/floor/outdoors/grass/forest, /area/redgate/jungle/aboveground) "ct" = ( @@ -244,7 +244,7 @@ /area/redgate/jungle/temple) "cA" = ( /obj/structure/closet/crate/chest, -/obj/item/weapon/simple_key/dungeon{ +/obj/item/simple_key/dungeon{ color = "#06362e"; key_id = "silver"; name = "silver key" @@ -270,19 +270,19 @@ /area/redgate/jungle/aboveground) "cU" = ( /obj/structure/closet/crate/chest, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/potion_material/golden_scale, -/obj/item/weapon/potion_material/golden_scale, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/potion_material/golden_scale, +/obj/item/potion_material/golden_scale, /obj/item/seeds/goldappleseed, -/obj/item/weapon/potion_material/golden_grapes, +/obj/item/potion_material/golden_grapes, /obj/item/clothing/under/dress/golddress, /obj/item/clothing/under/dress/goldwrap, /obj/item/clothing/accessory/bracelet/material/gold, /turf/simulated/floor/tiled/eris/white/golden, /area/redgate/jungle/temple) "cW" = ( -/obj/item/weapon/bluespace_crystal, +/obj/item/bluespace_crystal, /turf/simulated/floor/reinforced, /area/redgate/jungle/temple) "cX" = ( @@ -309,7 +309,7 @@ /area/redgate/jungle/southcaves) "df" = ( /obj/fiftyspawner/log, -/obj/item/weapon/storage/box/matches, +/obj/item/storage/box/matches, /turf/simulated/mineral/floor/cave, /area/redgate/jungle/westcaves) "di" = ( @@ -337,7 +337,7 @@ /area/redgate/jungle/aboveground) "dz" = ( /obj/effect/floor_decal/milspec/color/purple, -/obj/item/weapon/potion_material/solid_mist, +/obj/item/potion_material/solid_mist, /turf/simulated/shuttle/floor/purple, /area/redgate/jungle/temple) "dB" = ( @@ -348,7 +348,7 @@ /area/redgate/jungle/aboveground) "dC" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /turf/simulated/mineral/floor/cave, /area/redgate/jungle/westcaves) "dJ" = ( @@ -425,7 +425,7 @@ /turf/simulated/floor/wood, /area/redgate/jungle/aboveground) "eK" = ( -/obj/item/weapon/picnic_blankets_carried, +/obj/item/picnic_blankets_carried, /turf/simulated/mineral/floor/cave, /area/redgate/jungle/eastcaves) "eT" = ( @@ -439,16 +439,16 @@ /area/redgate/jungle/aboveground) "eU" = ( /obj/structure/closet/crate/chest, -/obj/item/weapon/reagent_containers/food/snacks/egg/purple, -/obj/item/weapon/reagent_containers/food/snacks/egg/purple, -/obj/item/weapon/reagent_containers/food/snacks/egg/purple, -/obj/item/weapon/reagent_containers/food/snacks/egg/purple, -/obj/item/weapon/reagent_containers/food/snacks/egg/purple, -/obj/item/weapon/reagent_containers/glass/paint/purple, -/obj/item/weapon/reagent_containers/food/snacks/grub_purple, -/obj/item/weapon/reagent_containers/food/snacks/grub_purple, -/obj/item/weapon/reagent_containers/food/snacks/grub_purple, -/obj/item/weapon/pen/crayon/purple, +/obj/item/reagent_containers/food/snacks/egg/purple, +/obj/item/reagent_containers/food/snacks/egg/purple, +/obj/item/reagent_containers/food/snacks/egg/purple, +/obj/item/reagent_containers/food/snacks/egg/purple, +/obj/item/reagent_containers/food/snacks/egg/purple, +/obj/item/reagent_containers/glass/paint/purple, +/obj/item/reagent_containers/food/snacks/grub_purple, +/obj/item/reagent_containers/food/snacks/grub_purple, +/obj/item/reagent_containers/food/snacks/grub_purple, +/obj/item/pen/crayon/purple, /obj/item/toy/plushie/therapy/purple, /obj/item/clothing/under/cheongsam/purple, /obj/item/clothing/shoes/flats/purple, @@ -477,9 +477,9 @@ /obj/random/potion_base, /obj/random/potion_base, /obj/random/potion_base, -/obj/item/weapon/potion_base/alkahest, -/obj/item/weapon/potion_base/aqua_regia, -/obj/item/weapon/potion_base/ichor, +/obj/item/potion_base/alkahest, +/obj/item/potion_base/aqua_regia, +/obj/item/potion_base/ichor, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "fg" = ( @@ -488,11 +488,11 @@ /area/redgate/jungle/aboveground) "fi" = ( /obj/structure/closet/crate/wooden, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /obj/random/potion_ingredient, /turf/simulated/mineral/floor/cave, /area/redgate/jungle/westcaves) @@ -505,31 +505,31 @@ dir = 8 }, /obj/structure/closet/walllocker/wooden/west, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/milk, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "fo" = ( @@ -552,15 +552,15 @@ "fK" = ( /obj/structure/closet/crate/wooden, /obj/random/fishing_junk, -/obj/item/weapon/reagent_containers/food/snacks/worm, -/obj/item/weapon/reagent_containers/food/snacks/worm, -/obj/item/weapon/reagent_containers/food/snacks/worm, -/obj/item/weapon/reagent_containers/food/snacks/worm, -/obj/item/weapon/reagent_containers/food/snacks/worm, -/obj/item/weapon/reagent_containers/food/snacks/worm, -/obj/item/weapon/reagent_containers/food/snacks/worm, -/obj/item/weapon/reagent_containers/food/snacks/worm, -/obj/item/weapon/reagent_containers/food/snacks/worm, +/obj/item/reagent_containers/food/snacks/worm, +/obj/item/reagent_containers/food/snacks/worm, +/obj/item/reagent_containers/food/snacks/worm, +/obj/item/reagent_containers/food/snacks/worm, +/obj/item/reagent_containers/food/snacks/worm, +/obj/item/reagent_containers/food/snacks/worm, +/obj/item/reagent_containers/food/snacks/worm, +/obj/item/reagent_containers/food/snacks/worm, +/obj/item/reagent_containers/food/snacks/worm, /obj/random/potion_base, /turf/simulated/floor/wood, /area/redgate/jungle/aboveground) @@ -604,7 +604,7 @@ /area/redgate/jungle/aboveground) "gm" = ( /obj/structure/flora/ausbushes/stalkybush, -/obj/item/weapon/bone/skull/tajaran, +/obj/item/bone/skull/tajaran, /turf/simulated/floor/outdoors/grass/forest, /area/redgate/jungle/aboveground) "gt" = ( @@ -651,7 +651,7 @@ /area/redgate/jungle/temple) "hg" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/wood, /area/redgate/jungle/aboveground) "hh" = ( @@ -678,8 +678,8 @@ /area/redgate/jungle/aboveground) "hq" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/fishing_net, -/obj/item/weapon/material/fishing_rod/modern/strong, +/obj/item/material/fishing_net, +/obj/item/material/fishing_rod/modern/strong, /turf/simulated/floor/wood, /area/redgate/jungle/aboveground) "hA" = ( @@ -746,11 +746,11 @@ /turf/simulated/floor/tiled/yellow, /area/redgate/jungle/temple) "iG" = ( -/obj/item/weapon/ore/phoron, +/obj/item/ore/phoron, /turf/simulated/floor/reinforced, /area/redgate/jungle/temple) "iI" = ( -/obj/item/weapon/pickaxe/gold, +/obj/item/pickaxe/gold, /turf/simulated/floor/tiled/eris/white/golden, /area/redgate/jungle/temple) "iJ" = ( @@ -796,7 +796,7 @@ /turf/simulated/wall/solidrock, /area/redgate/jungle/southcaves) "jd" = ( -/obj/item/weapon/bone/skull, +/obj/item/bone/skull, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -831,7 +831,7 @@ /turf/simulated/floor/tiled/techfloor, /area/redgate/jungle/westcaves) "jQ" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/tiled/yellow, /area/redgate/jungle/temple) "jW" = ( @@ -937,7 +937,7 @@ /area/redgate/jungle/eastcaves) "ld" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/reddouble, +/obj/item/bedsheet/reddouble, /turf/simulated/floor/wood, /area/redgate/jungle/aboveground) "ll" = ( @@ -989,8 +989,8 @@ /area/redgate/jungle/temple) "lI" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/material/fishing_net, -/obj/item/weapon/material/fishing_net, +/obj/item/material/fishing_net, +/obj/item/material/fishing_net, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -1025,7 +1025,7 @@ /area/redgate/jungle/temple) "mm" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/carpmeat, +/obj/item/reagent_containers/food/snacks/carpmeat, /turf/simulated/floor/wood, /area/redgate/jungle/aboveground) "mv" = ( @@ -1043,19 +1043,19 @@ /obj/structure/closet/crate/wooden, /obj/random/fantasy_item, /obj/random/fantasy_item, -/obj/item/weapon/gun/launcher/crossbow/bow, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, +/obj/item/gun/launcher/crossbow/bow, +/obj/item/arrow/standard, +/obj/item/arrow/standard, +/obj/item/arrow/standard, +/obj/item/arrow/standard, +/obj/item/arrow/standard, +/obj/item/arrow/standard, +/obj/item/arrow/standard, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "mz" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/sword/foam, +/obj/item/material/sword/foam, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -1064,12 +1064,12 @@ /area/redgate/jungle/temple) "mH" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, -/obj/item/weapon/bedsheet/pillow/white, +/obj/item/bedsheet/brown, +/obj/item/bedsheet/pillow/white, /turf/simulated/floor/wood, /area/redgate/jungle/aboveground) "mI" = ( -/obj/item/weapon/melee/shock_maul, +/obj/item/melee/shock_maul, /obj/structure/table/alien/blue, /turf/simulated/floor/reinforced, /area/redgate/jungle/temple) @@ -1082,7 +1082,7 @@ /area/redgate/jungle/southcaves) "mT" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/machete/hatchet/stone, +/obj/item/material/knife/machete/hatchet/stone, /turf/simulated/mineral/floor/cave, /area/redgate/jungle/westcaves) "mX" = ( @@ -1136,7 +1136,7 @@ /area/redgate/jungle/aboveground) "nP" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake, +/obj/item/reagent_containers/food/snacks/sliceable/chocolatecake, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -1185,8 +1185,8 @@ /area/redgate/jungle/aboveground) "oo" = ( /obj/structure/closet/crate/wooden, -/obj/item/weapon/storage/box/matches, -/obj/item/device/slow_sizegun/magic, +/obj/item/storage/box/matches, +/obj/item/slow_sizegun/magic, /obj/random/fantasy_item, /obj/random/potion_ingredient, /turf/simulated/floor/wood, @@ -1267,7 +1267,7 @@ /obj/structure/closet/cabinet, /obj/item/clothing/under/primitive, /obj/item/clothing/shoes/primitive, -/obj/item/weapon/material/knife/stone/bone, +/obj/item/material/knife/stone/bone, /turf/simulated/floor/wood, /area/redgate/jungle/aboveground) "pt" = ( @@ -1330,7 +1330,7 @@ /area/redgate/jungle/southcaves) "pU" = ( /obj/random/tool/alien, -/obj/item/weapon/aliencoin/phoron, +/obj/item/aliencoin/phoron, /obj/item/trash/meatration, /obj/item/trash/meatration, /obj/item/trash/meatration, @@ -1340,7 +1340,7 @@ /turf/simulated/shuttle/floor, /area/redgate/jungle/aboveground) "pX" = ( -/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat, +/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -1367,7 +1367,7 @@ /area/redgate/jungle/aboveground) "qc" = ( /obj/structure/grille, -/obj/item/weapon/material/shard/titaniumglass, +/obj/item/material/shard/titaniumglass, /turf/simulated/floor/plating, /area/redgate/jungle/aboveground) "qe" = ( @@ -1376,7 +1376,7 @@ /area/redgate/jungle/aboveground) "qi" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard/titaniumglass, +/obj/item/material/shard/titaniumglass, /turf/simulated/floor/plating, /area/redgate/jungle/aboveground) "qj" = ( @@ -1460,7 +1460,7 @@ /turf/simulated/shuttle/floor, /area/redgate/jungle/aboveground) "qU" = ( -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/floor/outdoors/grass/forest, /area/redgate/jungle/aboveground) "qV" = ( @@ -1474,7 +1474,7 @@ /turf/simulated/floor/wmarble, /area/redgate/jungle/aboveground) "ra" = ( -/obj/item/weapon/reagent_containers/food/drinks/golden_cup, +/obj/item/reagent_containers/food/drinks/golden_cup, /obj/structure/sign/goldenplaque{ desc = "Surprisingly written in galcom, the enscryption reads: The phoron room key is stored in the sealed room closest to the lava."; name = "gold engraving"; @@ -1544,7 +1544,7 @@ /area/redgate/jungle/temple) "rJ" = ( /obj/structure/table/alien/blue, -/obj/item/weapon/pickaxe/diamonddrill, +/obj/item/pickaxe/diamonddrill, /turf/simulated/floor/bluegrid, /area/redgate/jungle/temple) "rL" = ( @@ -1559,7 +1559,7 @@ "rZ" = ( /obj/structure/closet/crate/wooden, /obj/item/instrument/musicalmoth, -/obj/item/weapon/flame/lighter/zippo/royal, +/obj/item/flame/lighter/zippo/royal, /obj/random/fantasy_item, /obj/random/potion_base, /obj/random/plushielarge, @@ -1571,7 +1571,7 @@ /area/redgate/jungle/westcaves) "sh" = ( /obj/structure/salvageable/shuttle_console, -/obj/item/weapon/material/shard/titaniumglass, +/obj/item/material/shard/titaniumglass, /turf/simulated/shuttle/floor, /area/redgate/jungle/aboveground) "sm" = ( @@ -1605,7 +1605,7 @@ /turf/simulated/shuttle/floor, /area/redgate/jungle/aboveground) "sU" = ( -/obj/item/weapon/aliencoin/phoron, +/obj/item/aliencoin/phoron, /turf/simulated/floor/weird_things/dark, /area/redgate/jungle/temple) "sX" = ( @@ -1620,7 +1620,7 @@ /area/redgate/jungle/aboveground) "ti" = ( /obj/structure/closet/coffin, -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -1628,7 +1628,7 @@ }, /area/redgate/jungle/temple) "tj" = ( -/obj/item/weapon/material/shard/titaniumglass, +/obj/item/material/shard/titaniumglass, /obj/structure/bed/chair/bay/chair/padded/purple{ dir = 1 }, @@ -1636,7 +1636,7 @@ /area/redgate/jungle/aboveground) "tk" = ( /obj/structure/closet/crate/nanotrasen, -/obj/item/device/gps/explorer, +/obj/item/gps/explorer, /obj/random/bluespace, /turf/simulated/mineral/floor/cave, /area/redgate/jungle/westcaves) @@ -1727,12 +1727,12 @@ /area/redgate/jungle/temple) "uM" = ( /obj/structure/closet/crate/chest, -/obj/item/weapon/simple_key/dungeon{ +/obj/item/simple_key/dungeon{ color = "#fff700"; key_id = "gold"; name = "gold key" }, -/obj/item/weapon/spellbook/oneuse/knock, +/obj/item/spellbook/oneuse/knock, /obj/random/fantasy_item, /turf/simulated/floor/tiled/yellow, /area/redgate/jungle/temple) @@ -1745,7 +1745,7 @@ /turf/simulated/floor/outdoors/grass/forest, /area/redgate/jungle/aboveground) "uZ" = ( -/obj/item/weapon/potion_material/folded_dark, +/obj/item/potion_material/folded_dark, /turf/simulated/floor/weird_things/dark, /area/redgate/jungle/southcaves) "vi" = ( @@ -1756,11 +1756,11 @@ /area/redgate/jungle/aboveground) "vj" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /turf/simulated/floor/reinforced, /area/redgate/jungle/aboveground) "vs" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /turf/simulated/shuttle/floor, /area/redgate/jungle/aboveground) "vv" = ( @@ -1775,7 +1775,7 @@ "vx" = ( /obj/item/clothing/head/cowboy/wide, /obj/structure/loot_pile/surface/bones, -/obj/item/weapon/melee/chainofcommand/curator_whip, +/obj/item/melee/chainofcommand/curator_whip, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -1802,9 +1802,9 @@ /area/redgate/jungle/temple) "vP" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/food/snacks/bearmeat, -/obj/item/weapon/reagent_containers/food/snacks/bearmeat, -/obj/item/weapon/reagent_containers/food/snacks/bearmeat, +/obj/item/reagent_containers/food/snacks/bearmeat, +/obj/item/reagent_containers/food/snacks/bearmeat, +/obj/item/reagent_containers/food/snacks/bearmeat, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "vQ" = ( @@ -1817,22 +1817,22 @@ /area/redgate/jungle/aboveground) "vU" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/backpack/parachute, +/obj/item/storage/backpack/parachute, /turf/simulated/mineral/floor/cave, /area/redgate/jungle/westcaves) "wa" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "wi" = ( @@ -1952,14 +1952,14 @@ /obj/item/paint_palette, /obj/item/paint_brush, /obj/item/paint_brush, -/obj/item/weapon/reagent_containers/glass/paint/black, -/obj/item/weapon/reagent_containers/glass/paint/blue, -/obj/item/weapon/reagent_containers/glass/paint/cyan, -/obj/item/weapon/reagent_containers/glass/paint/green, -/obj/item/weapon/reagent_containers/glass/paint/red, -/obj/item/weapon/reagent_containers/glass/paint/yellow, -/obj/item/weapon/reagent_containers/glass/paint/purple, -/obj/item/weapon/reagent_containers/glass/paint/orange, +/obj/item/reagent_containers/glass/paint/black, +/obj/item/reagent_containers/glass/paint/blue, +/obj/item/reagent_containers/glass/paint/cyan, +/obj/item/reagent_containers/glass/paint/green, +/obj/item/reagent_containers/glass/paint/red, +/obj/item/reagent_containers/glass/paint/yellow, +/obj/item/reagent_containers/glass/paint/purple, +/obj/item/reagent_containers/glass/paint/orange, /turf/simulated/floor/wood, /area/redgate/jungle/aboveground) "xD" = ( @@ -1976,31 +1976,31 @@ /turf/simulated/floor/outdoors/grass/forest, /area/redgate/jungle/aboveground) "xH" = ( -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, -/obj/item/weapon/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/flour/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/carton/sugar/rustic, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, +/obj/item/reagent_containers/food/snacks/egg, /obj/structure/closet/walllocker/wooden/east, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; @@ -2051,7 +2051,7 @@ /area/redgate/jungle/aboveground) "yj" = ( /obj/structure/table/gold, -/obj/item/weapon/material/knife/ritual, +/obj/item/material/knife/ritual, /obj/random/fantasy_item/better, /turf/simulated/floor/bmarble, /area/redgate/jungle/temple) @@ -2094,10 +2094,10 @@ /area/redgate/jungle/aboveground) "yH" = ( /obj/structure/closet/walllocker/wooden/south, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/food/drinks/flask/barflask, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "yJ" = ( @@ -2160,7 +2160,7 @@ /area/redgate/jungle/aboveground) "zr" = ( /obj/structure/table/woodentable, -/obj/item/device/healthanalyzer/scroll, +/obj/item/healthanalyzer/scroll, /obj/item/robot_parts/robot_component/diagnosis_unit, /turf/simulated/floor/reinforced, /area/redgate/jungle/aboveground) @@ -2176,7 +2176,7 @@ /area/redgate/jungle/aboveground) "zv" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -2215,7 +2215,7 @@ /area/redgate/jungle/aboveground) "zV" = ( /obj/structure/table/gold, -/obj/item/weapon/material/knife/hook, +/obj/item/material/knife/hook, /turf/simulated/floor/bmarble, /area/redgate/jungle/temple) "zX" = ( @@ -2257,8 +2257,8 @@ /area/redgate/jungle/temple) "AU" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/beartrap/hunting, -/obj/item/weapon/beartrap/hunting, +/obj/item/beartrap/hunting, +/obj/item/beartrap/hunting, /obj/machinery/light/small/torch{ dir = 4 }, @@ -2309,8 +2309,8 @@ /area/redgate/jungle/aboveground) "Bu" = ( /obj/structure/closet/crate/wooden, -/obj/item/weapon/material/twohanded/spear, -/obj/item/weapon/material/knife/machete, +/obj/item/material/twohanded/spear, +/obj/item/material/knife/machete, /obj/random/fantasy_item, /turf/simulated/mineral/floor/cave, /area/redgate/jungle/eastcaves) @@ -2350,10 +2350,10 @@ /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "BS" = ( -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/coal, +/obj/item/ore/coal, +/obj/item/ore/coal, +/obj/item/ore/coal, +/obj/item/ore/coal, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -2416,15 +2416,15 @@ /obj/structure/closet/crate/wooden, /obj/item/clothing/under/tribalwear/hunter, /obj/item/clothing/shoes/sandal, -/obj/item/weapon/gun/launcher/crossbow/bow, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, +/obj/item/gun/launcher/crossbow/bow, +/obj/item/arrow/standard, +/obj/item/arrow/standard, +/obj/item/arrow/standard, +/obj/item/arrow/standard, +/obj/item/arrow/standard, +/obj/item/arrow/standard, +/obj/item/arrow/standard, +/obj/item/arrow/standard, /obj/random/fantasy_item, /turf/simulated/floor/wood, /area/redgate/jungle/westcaves) @@ -2479,7 +2479,7 @@ /area/redgate/jungle/temple) "DQ" = ( /obj/structure/closet/coffin, -/obj/item/weapon/bone/ribs, +/obj/item/bone/ribs, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -2495,7 +2495,7 @@ /area/redgate/jungle/aboveground) "Ei" = ( /obj/structure/table/woodentable, -/obj/item/weapon/handcuffs/cable/plantfiber, +/obj/item/handcuffs/cable/plantfiber, /turf/simulated/floor/wood, /area/redgate/jungle/aboveground) "Ej" = ( @@ -2556,8 +2556,8 @@ /area/redgate/jungle/aboveground) "EJ" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/bedsheet/cosmos, -/obj/item/weapon/bedsheet/pillow/black, +/obj/item/bedsheet/cosmos, +/obj/item/bedsheet/pillow/black, /obj/item/clothing/under/tribalwear/hunter, /obj/item/clothing/shoes/tribalwear, /obj/item/clothing/head/helmet/bucket/wood, @@ -2594,11 +2594,11 @@ /area/redgate/jungle/aboveground) "Fl" = ( /obj/structure/closet/crate/wooden, -/obj/item/weapon/storage/backpack/explorer, +/obj/item/storage/backpack/explorer, /obj/item/clothing/suit/storage/toggle/labcoat/neo_ranger, /obj/item/clothing/accessory/poncho/roles/ranger/tan, /obj/item/clothing/shoes/boots/jungle, -/obj/item/weapon/material/knife/tacknife/boot, +/obj/item/material/knife/tacknife/boot, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -2607,7 +2607,7 @@ /area/redgate/jungle/temple) "Fq" = ( /obj/effect/floor_decal/milspec/color/silver, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -2616,7 +2616,7 @@ /area/redgate/jungle/temple) "Fu" = ( /obj/structure/table/alien/blue, -/obj/item/device/nif, +/obj/item/nif, /turf/simulated/floor/bluegrid, /area/redgate/jungle/temple) "Fv" = ( @@ -2625,11 +2625,11 @@ /area/redgate/jungle/southcaves) "Fx" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/gun/launcher/crossbow/bow, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, -/obj/item/weapon/arrow/standard, +/obj/item/gun/launcher/crossbow/bow, +/obj/item/arrow/standard, +/obj/item/arrow/standard, +/obj/item/arrow/standard, +/obj/item/arrow/standard, /turf/simulated/floor/wood/alt/panel, /area/redgate/jungle/aboveground) "FA" = ( @@ -2685,7 +2685,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "FQ" = ( -/obj/item/weapon/reagent_containers/food/snacks/packaged/genration, +/obj/item/reagent_containers/food/snacks/packaged/genration, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -2714,18 +2714,18 @@ /area/redgate/jungle/aboveground) "GF" = ( /obj/structure/closet/walllocker/wooden/west, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "GJ" = ( @@ -2747,19 +2747,19 @@ /obj/random/fantasy_item, /obj/random/potion_base, /obj/random/potion_ingredient, -/obj/item/weapon/simple_key/dungeon{ +/obj/item/simple_key/dungeon{ color = "#00fff2"; key_id = "diamond"; name = "diamond key" }, -/obj/item/weapon/coin/diamond, +/obj/item/coin/diamond, /turf/simulated/floor/tiled/yellow, /area/redgate/jungle/temple) "GP" = ( /obj/structure/table/rack/wood, /obj/item/clothing/under/tribalwear/hunter, /obj/item/clothing/shoes/tribalwear, -/obj/item/weapon/material/knife/stone/wood, +/obj/item/material/knife/stone/wood, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "GT" = ( @@ -2767,8 +2767,8 @@ /area/redgate/jungle/temple) "GV" = ( /obj/structure/table/woodentable, -/obj/item/weapon/handcuffs/cable/plantfiber, -/obj/item/weapon/handcuffs/cable/plantfiber, +/obj/item/handcuffs/cable/plantfiber, +/obj/item/handcuffs/cable/plantfiber, /turf/simulated/floor/wood, /area/redgate/jungle/westcaves) "HB" = ( @@ -2798,7 +2798,7 @@ /obj/item/stack/material/log, /obj/item/stack/material/log, /obj/item/stack/material/log, -/obj/item/weapon/storage/box/matches, +/obj/item/storage/box/matches, /obj/random/potion_ingredient, /turf/simulated/floor/wood, /area/redgate/jungle/aboveground) @@ -2861,7 +2861,7 @@ /turf/simulated/floor/outdoors/grass/forest, /area/redgate/jungle/aboveground) "IV" = ( -/obj/item/weapon/soap/golden_soap, +/obj/item/soap/golden_soap, /turf/simulated/floor/tiled/eris/white/golden, /area/redgate/jungle/temple) "IZ" = ( @@ -2878,8 +2878,8 @@ /area/redgate/jungle/aboveground) "Jd" = ( /obj/effect/floor_decal/milspec/color/silver, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, +/obj/item/coin/silver, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -2917,13 +2917,13 @@ /obj/random/fantasy_item, /obj/random/fantasy_item, /obj/fiftyspawner/iron, -/obj/item/weapon/coin/iron, -/obj/item/weapon/coin/iron, -/obj/item/weapon/coin/iron, -/obj/item/weapon/coin/iron, -/obj/item/weapon/coin/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, +/obj/item/coin/iron, +/obj/item/coin/iron, +/obj/item/coin/iron, +/obj/item/coin/iron, +/obj/item/coin/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -2982,7 +2982,7 @@ /area/redgate/jungle/temple) "JL" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/bedsheet/pillow/orange, +/obj/item/bedsheet/pillow/orange, /obj/item/clothing/gloves/evening, /obj/item/clothing/under/wedding/floofdress, /obj/item/clothing/head/lavender_crown, @@ -2994,11 +2994,11 @@ /obj/random/fantasy_item, /obj/random/fantasy_item, /obj/random/fantasy_item/better, -/obj/item/weapon/potion_material/golden_scale, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, +/obj/item/potion_material/golden_scale, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, /obj/random/potion_ingredient, /turf/simulated/mineral/floor/cave, /area/redgate/jungle/eastcaves) @@ -3023,7 +3023,7 @@ /area/redgate/jungle/eastcaves) "Kk" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper, +/obj/item/paper, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "Kl" = ( @@ -3049,7 +3049,7 @@ /area/redgate/jungle/aboveground) "Kw" = ( /obj/structure/bed/double, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "Kz" = ( @@ -3076,7 +3076,7 @@ /area/redgate/jungle/aboveground) "KM" = ( /obj/structure/table/woodentable, -/obj/item/weapon/soap/white_soap, +/obj/item/soap/white_soap, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "KO" = ( @@ -3094,7 +3094,7 @@ /area/redgate/jungle/temple) "KV" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/material/twohanded/spear, +/obj/item/material/twohanded/spear, /turf/simulated/floor/wood, /area/redgate/jungle/aboveground) "La" = ( @@ -3169,8 +3169,8 @@ /area/redgate/jungle/aboveground) "LM" = ( /obj/structure/table/rack/wood, -/obj/item/weapon/shield/primitive, -/obj/item/weapon/material/twohanded/spear/flint, +/obj/item/shield/primitive, +/obj/item/material/twohanded/spear/flint, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -3195,12 +3195,12 @@ /turf/simulated/floor/water/deep, /area/redgate/jungle/aboveground) "Mj" = ( -/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish, -/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish, -/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish, -/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish, -/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish, -/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish, +/obj/item/reagent_containers/food/snacks/carpmeat/fish, +/obj/item/reagent_containers/food/snacks/carpmeat/fish, +/obj/item/reagent_containers/food/snacks/carpmeat/fish, +/obj/item/reagent_containers/food/snacks/carpmeat/fish, +/obj/item/reagent_containers/food/snacks/carpmeat/fish, +/obj/item/reagent_containers/food/snacks/carpmeat/fish, /obj/structure/table/woodentable, /obj/random/potion_ingredient, /turf/simulated/mineral/floor/cave, @@ -3270,24 +3270,24 @@ }, /area/redgate/jungle/temple) "MV" = ( -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, /turf/simulated/floor/tiled/eris/white/golden, /area/redgate/jungle/temple) "Nc" = ( -/obj/item/weapon/bone/skull/unknown, +/obj/item/bone/skull/unknown, /turf/simulated/floor/outdoors/grass/forest, /area/redgate/jungle/aboveground) "Ne" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/glass/bottle/potion/antidote, -/obj/item/weapon/reagent_containers/glass/bottle/potion/antidote, -/obj/item/weapon/reagent_containers/glass/bottle/potion/water, -/obj/item/weapon/reagent_containers/glass/bottle/potion/water, +/obj/item/reagent_containers/glass/bottle/potion/antidote, +/obj/item/reagent_containers/glass/bottle/potion/antidote, +/obj/item/reagent_containers/glass/bottle/potion/water, +/obj/item/reagent_containers/glass/bottle/potion/water, /obj/random/potion, /obj/machinery/light/small/torch{ dir = 1 @@ -3317,7 +3317,7 @@ /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "NY" = ( -/obj/item/weapon/coin/phoron, +/obj/item/coin/phoron, /obj/structure/table/alien, /turf/simulated/floor/reinforced, /area/redgate/jungle/temple) @@ -3450,8 +3450,8 @@ /area/redgate/jungle/temple) "Pf" = ( /obj/structure/table/woodentable, -/obj/item/weapon/beartrap/hunting, -/obj/item/weapon/beartrap/hunting, +/obj/item/beartrap/hunting, +/obj/item/beartrap/hunting, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "Ph" = ( @@ -3477,9 +3477,9 @@ /area/redgate/jungle/aboveground) "Pv" = ( /obj/structure/closet/walllocker/wooden/east, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac, +/obj/item/reagent_containers/food/drinks/bottle/cognac, +/obj/item/reagent_containers/food/drinks/bottle/cognac, +/obj/item/reagent_containers/food/drinks/bottle/cognac, /obj/item/clothing/suit/shrine_maiden, /obj/random/coin, /obj/random/coin, @@ -3504,7 +3504,7 @@ /turf/simulated/floor/outdoors/grass/forest, /area/redgate/jungle/aboveground) "PK" = ( -/obj/item/weapon/bedsheet/pillow, +/obj/item/bedsheet/pillow, /turf/simulated/mineral/floor/cave, /area/redgate/jungle/southcaves) "PO" = ( @@ -3513,12 +3513,12 @@ /area/redgate/jungle/eastcaves) "PS" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/glass/bottle/potion/healing, -/obj/item/weapon/reagent_containers/glass/bottle/potion/healing, -/obj/item/weapon/reagent_containers/glass/bottle/potion/fire_resist, -/obj/item/weapon/reagent_containers/glass/bottle/potion/fire_resist, -/obj/item/weapon/reagent_containers/glass/bottle/potion/pain, -/obj/item/weapon/reagent_containers/glass/bottle/potion/pain, +/obj/item/reagent_containers/glass/bottle/potion/healing, +/obj/item/reagent_containers/glass/bottle/potion/healing, +/obj/item/reagent_containers/glass/bottle/potion/fire_resist, +/obj/item/reagent_containers/glass/bottle/potion/fire_resist, +/obj/item/reagent_containers/glass/bottle/potion/pain, +/obj/item/reagent_containers/glass/bottle/potion/pain, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "PW" = ( @@ -3554,20 +3554,20 @@ /area/redgate/jungle/eastcaves) "Qv" = ( /obj/structure/table/darkglass, -/obj/item/weapon/potion_material/folded_dark, +/obj/item/potion_material/folded_dark, /turf/simulated/mineral/floor/cave, /area/redgate/jungle/westcaves) "Qx" = ( /obj/effect/floor_decal/milspec/color/purple, -/obj/item/weapon/storage/vore_egg/purple, +/obj/item/storage/vore_egg/purple, /turf/simulated/shuttle/floor/purple, /area/redgate/jungle/temple) "Qz" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/handcuffs/cable/plantfiber, -/obj/item/weapon/handcuffs/cable/plantfiber, -/obj/item/weapon/handcuffs/cable/plantfiber, -/obj/item/weapon/handcuffs/cable/plantfiber, +/obj/item/handcuffs/cable/plantfiber, +/obj/item/handcuffs/cable/plantfiber, +/obj/item/handcuffs/cable/plantfiber, +/obj/item/handcuffs/cable/plantfiber, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -3618,7 +3618,7 @@ /turf/simulated/floor/wood, /area/redgate/jungle/aboveground) "Rj" = ( -/obj/item/weapon/material/knife/stone/bone, +/obj/item/material/knife/stone/bone, /turf/simulated/floor/wood, /area/redgate/jungle/aboveground) "Rl" = ( @@ -3666,9 +3666,9 @@ /obj/item/trash/genration, /obj/item/trash/sweetration, /obj/item/trash/meatration, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /obj/fruitspawner/watermelon, /turf/simulated/mineral/floor/cave, /area/redgate/jungle/westcaves) @@ -3690,8 +3690,8 @@ /area/redgate/jungle/aboveground) "RX" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/wood/alt/panel, /area/redgate/jungle/aboveground) "RZ" = ( @@ -3709,7 +3709,7 @@ }, /area/redgate/jungle/temple) "Sp" = ( -/obj/item/weapon/digestion_remains/skull/akula, +/obj/item/digestion_remains/skull/akula, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -3778,7 +3778,7 @@ /area/redgate/jungle/aboveground) "Tw" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/stone/bone, +/obj/item/material/knife/stone/bone, /turf/simulated/floor/wood, /area/redgate/jungle/westcaves) "TA" = ( @@ -3787,12 +3787,12 @@ /area/redgate/jungle/aboveground) "TC" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -3813,7 +3813,7 @@ /turf/simulated/mineral/floor/cave, /area/redgate/jungle/eastcaves) "TI" = ( -/obj/item/weapon/simple_key/dungeon{ +/obj/item/simple_key/dungeon{ color = "#ff00ee"; key_id = "phoron"; name = "phoron key" @@ -3839,7 +3839,7 @@ /turf/simulated/floor/wood/alt/panel, /area/redgate/jungle/aboveground) "Ui" = ( -/obj/item/weapon/bedsheet/pillow/orange, +/obj/item/bedsheet/pillow/orange, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "Uk" = ( @@ -3866,12 +3866,12 @@ /area/redgate/jungle/aboveground) "UA" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "UC" = ( @@ -3910,7 +3910,7 @@ /turf/simulated/floor/outdoors/grass/forest, /area/redgate/jungle/aboveground) "UY" = ( -/obj/item/weapon/bedsheet/pillow/orange, +/obj/item/bedsheet/pillow/orange, /turf/simulated/mineral/floor/cave, /area/redgate/jungle/westcaves) "UZ" = ( @@ -3929,8 +3929,8 @@ /area/redgate/jungle/aboveground) "Ve" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/rainbowdouble, -/obj/item/weapon/bedsheet/pillow/red, +/obj/item/bedsheet/rainbowdouble, +/obj/item/bedsheet/pillow/red, /turf/simulated/floor/wood, /area/redgate/jungle/aboveground) "Vf" = ( @@ -3943,8 +3943,8 @@ /turf/simulated/floor/outdoors/grass/forest, /area/redgate/jungle/aboveground) "Vj" = ( -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, /turf/simulated/floor/tiled/eris/white/golden, /area/redgate/jungle/temple) "Vk" = ( @@ -3961,8 +3961,8 @@ /area/redgate/jungle/aboveground) "Vt" = ( /obj/structure/bed/double, -/obj/item/weapon/bedsheet/browndouble, -/obj/item/weapon/bedsheet/pillow/orange, +/obj/item/bedsheet/browndouble, +/obj/item/bedsheet/pillow/orange, /turf/simulated/floor/carpet/turcarpet, /area/redgate/jungle/temple) "VB" = ( @@ -3972,12 +3972,12 @@ /area/redgate/jungle/temple) "VN" = ( /obj/structure/table/woodentable, -/obj/item/weapon/gun/launcher/syringe, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/gun/launcher/syringe, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /turf/simulated/floor/wood/alt/panel, /area/redgate/jungle/aboveground) "VQ" = ( @@ -3987,7 +3987,7 @@ }, /area/redgate/jungle/aboveground) "VT" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt/panel, /area/redgate/jungle/aboveground) "VY" = ( @@ -4003,8 +4003,8 @@ /area/redgate/jungle/southcaves) "Wd" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/melee/classic_baton, -/obj/item/weapon/melee/classic_baton, +/obj/item/melee/classic_baton, +/obj/item/melee/classic_baton, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; @@ -4013,7 +4013,7 @@ /area/redgate/jungle/temple) "Wj" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/simulated/floor/wood, /area/redgate/jungle/westcaves) "Wk" = ( @@ -4038,8 +4038,8 @@ /area/redgate/jungle/aboveground) "WT" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/pillow/orange, -/obj/item/weapon/bedsheet/orangedouble, +/obj/item/bedsheet/pillow/orange, +/obj/item/bedsheet/orangedouble, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "WW" = ( @@ -4067,7 +4067,7 @@ /area/redgate/jungle/temple) "Xi" = ( /obj/effect/floor_decal/milspec/color/purple, -/obj/item/weapon/potion_material/living_coral, +/obj/item/potion_material/living_coral, /turf/simulated/shuttle/floor/purple, /area/redgate/jungle/temple) "Xk" = ( @@ -4107,7 +4107,7 @@ /turf/simulated/floor/bluegrid, /area/redgate/jungle/temple) "XG" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "XJ" = ( @@ -4132,18 +4132,18 @@ /area/redgate/jungle/temple) "XX" = ( /obj/structure/closet/crate/wooden, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/weapon/storage/pouch/flares/full_flare, -/obj/item/weapon/storage/pouch/flares/full_flare, -/obj/item/weapon/storage/pouch/flares/full_flare, -/obj/item/weapon/storage/pouch/flares/full_flare, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/storage/pouch/flares/full_flare, +/obj/item/storage/pouch/flares/full_flare, +/obj/item/storage/pouch/flares/full_flare, +/obj/item/storage/pouch/flares/full_flare, /turf/simulated/floor/wood/alt, /area/redgate/jungle/aboveground) "Ya" = ( @@ -4159,7 +4159,7 @@ /turf/simulated/floor/outdoors/grass/forest, /area/redgate/jungle/aboveground) "Yj" = ( -/obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced/random, +/obj/item/gun/energy/mouseray/metamorphosis/advanced/random, /obj/structure/closet/alien, /obj/random/bluespace, /obj/random/maintenance/research, @@ -4195,7 +4195,7 @@ /area/redgate/jungle/temple) "YH" = ( /obj/structure/closet/tent/B, -/obj/item/weapon/material/twohanded/fireaxe, +/obj/item/material/twohanded/fireaxe, /obj/random/potion, /obj/random/potion_base, /obj/random/coin, @@ -4206,7 +4206,7 @@ /area/redgate/jungle/temple) "YP" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/reagent_containers/glass/pint_mug, +/obj/item/reagent_containers/glass/pint_mug, /turf/simulated/mineral/floor/light{ nitrogen = 82.1472; oxygen = 21.8366; diff --git a/maps/redgate/jungle_underground.dmm b/maps/redgate/jungle_underground.dmm index bcf6b0a68b2..91aceb41d10 100644 --- a/maps/redgate/jungle_underground.dmm +++ b/maps/redgate/jungle_underground.dmm @@ -100,7 +100,7 @@ /area/redgate/jungle/facilityne) "bw" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/snacks/packaged/pasty, +/obj/item/reagent_containers/food/snacks/packaged/pasty, /turf/simulated/floor, /area/redgate/jungle/facilityse) "bA" = ( @@ -138,7 +138,7 @@ /area/redgate/jungle/facilitynw) "bQ" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/toy/desk/fan, +/obj/item/toy/desk/fan, /turf/simulated/floor/carpet/blue, /area/redgate/jungle/facilityse) "bW" = ( @@ -163,7 +163,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilityne) "cj" = ( -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor, /area/redgate/jungle/facilityne) "cn" = ( @@ -246,7 +246,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "cW" = ( -/obj/item/weapon/bone/leg, +/obj/item/bone/leg, /turf/simulated/mineral/floor/ignore_cavegen{ nitrogen = 82.1472; oxygen = 21.8366; @@ -313,7 +313,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "dB" = ( -/obj/item/weapon/cell/emergency_light, +/obj/item/cell/emergency_light, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "dH" = ( @@ -431,7 +431,7 @@ dir = 1 }, /obj/structure/table/rack/steel, -/obj/item/weapon/implantcase/language/eal, +/obj/item/implantcase/language/eal, /turf/simulated/floor, /area/redgate/jungle/facilityne) "eK" = ( @@ -445,7 +445,7 @@ /turf/simulated/floor/lava, /area/redgate/jungle/facilityse) "eM" = ( -/obj/item/weapon/reagent_containers/syringe/drugs, +/obj/item/reagent_containers/syringe/drugs, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "eN" = ( @@ -463,7 +463,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilityne) "eS" = ( -/obj/item/weapon/weldingtool/hugetank, +/obj/item/weldingtool/hugetank, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "eW" = ( @@ -564,8 +564,8 @@ /area/redgate/jungle/facilitysw) "gf" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/folder, -/obj/item/weapon/pen/fountain, +/obj/item/folder, +/obj/item/pen/fountain, /turf/simulated/floor/wmarble, /area/redgate/jungle/facilityse) "gh" = ( @@ -663,19 +663,19 @@ /area/redgate/jungle/facilityne) "hw" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/toy/desk/newtoncradle, +/obj/item/toy/desk/newtoncradle, /turf/simulated/floor/carpet/blue, /area/redgate/jungle/facilityse) "hx" = ( /turf/simulated/wall, /area/redgate/jungle/facilitynw) "hy" = ( -/obj/item/weapon/bikehorn/rubberducky/red, +/obj/item/bikehorn/rubberducky/red, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "hB" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/box/custardcream, +/obj/item/storage/box/custardcream, /turf/simulated/floor, /area/redgate/jungle/facilityse) "hD" = ( @@ -722,7 +722,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "iq" = ( -/obj/item/weapon/mine/stun, +/obj/item/mine/stun, /turf/simulated/floor, /area/redgate/jungle/facilitysw) "iv" = ( @@ -813,12 +813,12 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "jH" = ( -/obj/item/weapon/storage/vore_egg/floppy, +/obj/item/storage/vore_egg/floppy, /turf/simulated/floor, /area/redgate/jungle/facilityne) "jK" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/box/jaffacake, +/obj/item/storage/box/jaffacake, /turf/simulated/floor, /area/redgate/jungle/facilityse) "jL" = ( @@ -854,7 +854,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "kh" = ( -/obj/item/weapon/mine/stun, +/obj/item/mine/stun, /turf/simulated/floor, /area/redgate/jungle/facilityne) "kj" = ( @@ -887,13 +887,13 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "kS" = ( -/obj/item/weapon/bikehorn, +/obj/item/bikehorn, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "kX" = ( /obj/structure/closet/walllocker_double/casino/west, -/obj/item/weapon/storage/box/roulette_balls_fancy, -/obj/item/weapon/storage/box/roulette_balls_normal, +/obj/item/storage/box/roulette_balls_fancy, +/obj/item/storage/box/roulette_balls_normal, /turf/simulated/floor/tiled/eris/white/golden, /area/redgate/jungle/facilitycasino) "kY" = ( @@ -930,7 +930,7 @@ /area/redgate/jungle/facilitybar) "lt" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, /turf/simulated/floor, /area/redgate/jungle/facilityse) "lv" = ( @@ -959,7 +959,7 @@ /area/redgate/jungle/facilitynw) "lD" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/snacks/packaged/sausageroll, +/obj/item/reagent_containers/food/snacks/packaged/sausageroll, /turf/simulated/floor, /area/redgate/jungle/facilityse) "lH" = ( @@ -988,7 +988,7 @@ }, /area/redgate/jungle/facilitynw) "mm" = ( -/obj/item/weapon/inducer/unloaded, +/obj/item/inducer/unloaded, /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/jungle/facilitynw) @@ -1000,22 +1000,22 @@ /turf/simulated/floor/water/underwater, /area/redgate/jungle/underwaterswamp) "mv" = ( -/obj/item/weapon/cannonframe, +/obj/item/cannonframe, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "mw" = ( -/obj/item/weapon/stool/padded, -/obj/item/weapon/stool/padded, -/obj/item/weapon/stool/padded, -/obj/item/weapon/stool/padded, -/obj/item/weapon/stool/padded, -/obj/item/weapon/stool/padded, -/obj/item/weapon/stool/padded, -/obj/item/weapon/stool/padded, -/obj/item/weapon/stool/padded, -/obj/item/weapon/stool/padded, -/obj/item/weapon/stool/padded, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, +/obj/item/stool/padded, +/obj/item/stool/padded, +/obj/item/stool/padded, +/obj/item/stool/padded, +/obj/item/stool/padded, +/obj/item/stool/padded, +/obj/item/stool/padded, +/obj/item/stool/padded, +/obj/item/stool/padded, +/obj/item/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/eris/white/golden, /area/redgate/jungle/facilitycasino) "my" = ( @@ -1038,7 +1038,7 @@ /turf/simulated/floor/tiled/eris/white/golden, /area/redgate/jungle/facilitycasino) "mK" = ( -/obj/item/weapon/bone/arm, +/obj/item/bone/arm, /turf/simulated/mineral/floor/ignore_cavegen{ nitrogen = 82.1472; oxygen = 21.8366; @@ -1047,7 +1047,7 @@ /area/redgate/jungle/underwatercavepond) "mM" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/surgical/cautery/alien, +/obj/item/surgical/cautery/alien, /turf/simulated/floor, /area/redgate/jungle/facilitysw) "mQ" = ( @@ -1085,7 +1085,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/jungle/facilitysw) "nc" = ( -/obj/item/weapon/bone/horn, +/obj/item/bone/horn, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "nd" = ( @@ -1098,7 +1098,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "ng" = ( -/obj/item/weapon/newspaper, +/obj/item/newspaper, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "nq" = ( @@ -1152,10 +1152,10 @@ /area/redgate/jungle/facilityne) "nN" = ( /obj/structure/closet/crate/wooden, -/obj/item/weapon/bone/leg, -/obj/item/weapon/bone/arm, -/obj/item/weapon/bone/horn, -/obj/item/weapon/bone/skull/unknown, +/obj/item/bone/leg, +/obj/item/bone/arm, +/obj/item/bone/horn, +/obj/item/bone/skull/unknown, /obj/random/mug, /obj/item/clothing/accessory/bracelet/material/gold, /obj/item/clothing/ears/earring/dangle/gold, @@ -1163,8 +1163,8 @@ /area/redgate/jungle/murderroom) "nP" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen/fountain4, +/obj/item/folder/blue, +/obj/item/pen/fountain4, /turf/simulated/floor/wmarble, /area/redgate/jungle/facilityse) "nZ" = ( @@ -1180,7 +1180,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "ok" = ( -/obj/item/weapon/implantcase/armblade, +/obj/item/implantcase/armblade, /turf/simulated/floor, /area/redgate/jungle/facilityse) "oo" = ( @@ -1201,10 +1201,10 @@ /area/redgate/jungle/facilitysw) "ou" = ( /obj/structure/closet/crate/wooden, -/obj/item/weapon/material/twohanded/spear/flint, -/obj/item/weapon/material/fishing_net, -/obj/item/weapon/material/fishing_net, -/obj/item/weapon/material/fishing_net, +/obj/item/material/twohanded/spear/flint, +/obj/item/material/fishing_net, +/obj/item/material/fishing_net, +/obj/item/material/fishing_net, /obj/random/fantasy_item, /obj/random/potion_ingredient, /turf/simulated/mineral/floor/ignore_cavegen{ @@ -1220,7 +1220,7 @@ /area/redgate/jungle/facilitynw) "ow" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/packageWrap, +/obj/item/packageWrap, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/jungle/facilitynw) "oB" = ( @@ -1286,7 +1286,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "pp" = ( -/obj/item/weapon/inflatable_duck, +/obj/item/inflatable_duck, /turf/simulated/floor/water/deep/pool, /area/redgate/jungle/facilitynw) "pq" = ( @@ -1326,7 +1326,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilityne) "pO" = ( -/obj/item/device/healthanalyzer/advanced, +/obj/item/healthanalyzer/advanced, /turf/simulated/floor, /area/redgate/jungle/facilityse) "pR" = ( @@ -1344,7 +1344,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/jungle/facilitynw) "pZ" = ( -/obj/item/weapon/cell/spike, +/obj/item/cell/spike, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "ql" = ( @@ -1361,7 +1361,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilityse) "qD" = ( -/obj/item/weapon/anodevice, +/obj/item/anodevice, /obj/structure/closet/tent/B, /turf/simulated/floor, /area/redgate/jungle/facilityne) @@ -1443,7 +1443,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "ry" = ( -/obj/item/weapon/bone/skull/unknown, +/obj/item/bone/skull/unknown, /turf/simulated/floor, /area/redgate/jungle/facilitysw) "rB" = ( @@ -1454,7 +1454,7 @@ /area/redgate/jungle/facilityne) "rD" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/pen/fountain8, +/obj/item/pen/fountain8, /turf/simulated/floor/wmarble, /area/redgate/jungle/facilityse) "rF" = ( @@ -1466,7 +1466,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilityne) "rR" = ( -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/floor, /area/redgate/jungle/facilitysw) "rU" = ( @@ -1490,11 +1490,11 @@ /area/redgate/jungle/facilityse) "sr" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor, /area/redgate/jungle/facilityne) "su" = ( -/obj/item/weapon/anobattery, +/obj/item/anobattery, /obj/structure/table/steel_reinforced, /turf/simulated/floor, /area/redgate/jungle/facilitysw) @@ -1521,7 +1521,7 @@ }, /area/redgate/jungle/facilitysw) "sA" = ( -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/floor, /area/redgate/jungle/facilityse) "sG" = ( @@ -1561,7 +1561,7 @@ }, /area/redgate/jungle/underwatercave) "tf" = ( -/obj/item/weapon/mine/stun, +/obj/item/mine/stun, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "th" = ( @@ -1571,40 +1571,40 @@ /turf/simulated/floor, /area/redgate/jungle/facilitysw) "tj" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/tiled/eris/white/golden, @@ -1616,7 +1616,7 @@ /area/redgate/jungle/facilitynw) "tn" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor, /area/redgate/jungle/facilityse) "to" = ( @@ -1629,7 +1629,7 @@ /area/redgate/jungle/facilityne) "tF" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, /turf/simulated/floor/reinforced, /area/redgate/jungle/facilitybar) "tL" = ( @@ -1652,7 +1652,7 @@ /area/redgate/jungle/underwatercaveswamp) "tQ" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/snacks/packaged/scotchegg, +/obj/item/reagent_containers/food/snacks/packaged/scotchegg, /turf/simulated/floor, /area/redgate/jungle/facilityse) "tR" = ( @@ -1667,7 +1667,7 @@ /area/redgate/jungle/facilityne) "tV" = ( /obj/structure/table/gamblingtable, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/tiled/eris/white/golden, /area/redgate/jungle/facilitycasino) "ub" = ( @@ -1751,7 +1751,7 @@ /area/redgate/jungle/facilityne) "uY" = ( /obj/structure/table/rack/gun_rack/steel, -/obj/item/weapon/gun/energy/sickshot, +/obj/item/gun/energy/sickshot, /turf/simulated/floor/reinforced, /area/redgate/jungle/facilitybar) "vd" = ( @@ -1767,7 +1767,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilityne) "vq" = ( -/obj/item/weapon/folder, +/obj/item/folder, /turf/simulated/floor, /area/redgate/jungle/facilitysw) "vw" = ( @@ -1785,7 +1785,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilityne) "vH" = ( -/obj/item/weapon/refill_cartridge/universal, +/obj/item/refill_cartridge/universal, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "vI" = ( @@ -1795,7 +1795,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "vM" = ( -/obj/item/weapon/gun/projectile/deagle/gold, +/obj/item/gun/projectile/deagle/gold, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/jungle/facilityse) "vS" = ( @@ -1929,7 +1929,7 @@ /area/redgate/jungle/facilityne) "xF" = ( /obj/structure/bed/nest, -/obj/item/weapon/storage/vore_egg/purple, +/obj/item/storage/vore_egg/purple, /turf/simulated/floor, /area/redgate/jungle/facilitysw) "xH" = ( @@ -1950,7 +1950,7 @@ /area/redgate/jungle/facilitynw) "xW" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/implanter/vrlanguage, +/obj/item/implanter/vrlanguage, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "ya" = ( @@ -1959,7 +1959,7 @@ /area/redgate/jungle/facilitynw) "yc" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/snacks/packaged/porkpie, +/obj/item/reagent_containers/food/snacks/packaged/porkpie, /turf/simulated/floor, /area/redgate/jungle/facilityse) "yd" = ( @@ -2035,7 +2035,7 @@ /area/redgate/jungle/facilitynw) "yS" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "yV" = ( @@ -2115,7 +2115,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "Aa" = ( -/obj/item/weapon/storage/mre/menu12, +/obj/item/storage/mre/menu12, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "Ab" = ( @@ -2128,7 +2128,7 @@ /area/redgate/jungle/facilityse) "Al" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/snacks/old/burger, +/obj/item/reagent_containers/food/snacks/old/burger, /turf/simulated/floor, /area/redgate/jungle/facilitysw) "An" = ( @@ -2137,7 +2137,7 @@ /area/redgate/jungle/facilitysw) "Au" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/bottle/poppy, +/obj/item/reagent_containers/glass/bottle/poppy, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/jungle/facilitynw) "Az" = ( @@ -2145,7 +2145,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitysw) "AA" = ( -/obj/item/weapon/grenade/confetti/party_ball, +/obj/item/grenade/confetti/party_ball, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "AI" = ( @@ -2243,28 +2243,28 @@ /area/redgate/jungle/facilitysw) "BT" = ( /obj/structure/closet/walllocker_double/casino/west, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/item/storage/dicecup, +/obj/item/storage/dicecup, +/obj/item/storage/dicecup, +/obj/item/storage/dicecup, +/obj/item/storage/dicecup, +/obj/item/storage/dicecup, +/obj/item/storage/dicecup, +/obj/item/storage/dicecup, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, /turf/simulated/floor/tiled/eris/white/golden, /area/redgate/jungle/facilitycasino) "BV" = ( @@ -2329,7 +2329,7 @@ /turf/simulated/floor/lava, /area/redgate/jungle/facilityse) "CC" = ( -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/simulated/floor, /area/redgate/jungle/facilitysw) "CE" = ( @@ -2386,32 +2386,32 @@ /area/redgate/jungle/facilityse) "Dj" = ( /obj/structure/table/rack/shelf/wood, -/obj/item/weapon/bone/skull, +/obj/item/bone/skull, /turf/simulated/floor/wood, /area/redgate/jungle/murderroom) "Dn" = ( /obj/structure/closet/walllocker_double/casino/west, -/obj/item/weapon/deck/schnapsen, -/obj/item/weapon/deck/schnapsen, -/obj/item/weapon/deck/schnapsen, -/obj/item/weapon/deck/schnapsen, -/obj/item/weapon/deck/schnapsen, -/obj/item/weapon/deck/schnapsen, -/obj/item/weapon/deck/schnapsen, -/obj/item/weapon/deck/holder/casino, -/obj/item/weapon/deck/holder/casino, -/obj/item/weapon/deck/holder/casino, -/obj/item/weapon/deck/holder/casino, -/obj/item/weapon/deck/holder/casino, -/obj/item/weapon/deck/cards, -/obj/item/weapon/deck/cards, -/obj/item/weapon/deck/cards, -/obj/item/weapon/deck/cards, -/obj/item/weapon/deck/cards, -/obj/item/weapon/deck/cards, -/obj/item/weapon/deck/cards, -/obj/item/weapon/deck/cards, -/obj/item/weapon/deck/cards, +/obj/item/deck/schnapsen, +/obj/item/deck/schnapsen, +/obj/item/deck/schnapsen, +/obj/item/deck/schnapsen, +/obj/item/deck/schnapsen, +/obj/item/deck/schnapsen, +/obj/item/deck/schnapsen, +/obj/item/deck/holder/casino, +/obj/item/deck/holder/casino, +/obj/item/deck/holder/casino, +/obj/item/deck/holder/casino, +/obj/item/deck/holder/casino, +/obj/item/deck/cards, +/obj/item/deck/cards, +/obj/item/deck/cards, +/obj/item/deck/cards, +/obj/item/deck/cards, +/obj/item/deck/cards, +/obj/item/deck/cards, +/obj/item/deck/cards, +/obj/item/deck/cards, /turf/simulated/floor/tiled/eris/white/golden, /area/redgate/jungle/facilitycasino) "Dr" = ( @@ -2459,7 +2459,7 @@ /area/redgate/jungle/murderroom) "DP" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor, /area/redgate/jungle/facilityse) "DQ" = ( @@ -2554,7 +2554,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilityne) "ET" = ( -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; @@ -2633,7 +2633,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/jungle/facilityne) "Gc" = ( -/obj/item/weapon/reagent_containers/glass/beaker/noreact, +/obj/item/reagent_containers/glass/beaker/noreact, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "Ge" = ( @@ -2643,7 +2643,7 @@ }, /area/redgate/jungle/deepforest) "Gh" = ( -/obj/item/weapon/mine/stun, +/obj/item/mine/stun, /turf/simulated/floor, /area/redgate/jungle/facilityse) "Gj" = ( @@ -2678,7 +2678,7 @@ /area/redgate/jungle/facilityne) "GF" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/toy/desk/dippingbird, +/obj/item/toy/desk/dippingbird, /turf/simulated/floor/carpet/blue, /area/redgate/jungle/facilityse) "GH" = ( @@ -2772,7 +2772,7 @@ /turf/simulated/mineral/ignore_cavegen, /area/redgate/jungle/underwaterpong) "HB" = ( -/obj/item/weapon/implanter, +/obj/item/implanter, /turf/simulated/floor, /area/redgate/jungle/facilityse) "HI" = ( @@ -2860,14 +2860,14 @@ /area/redgate/jungle/facilitybar) "IB" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/food/drinks/shaker{ pixel_x = -7; pixel_y = 11 }, /turf/simulated/floor/reinforced, /area/redgate/jungle/facilitybar) "IC" = ( -/obj/item/weapon/folder, +/obj/item/folder, /turf/simulated/floor, /area/redgate/jungle/facilityse) "ID" = ( @@ -2898,7 +2898,7 @@ /area/redgate/jungle/facilitysw) "IQ" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/box/saucer, +/obj/item/storage/box/saucer, /turf/simulated/floor, /area/redgate/jungle/facilityse) "IV" = ( @@ -2906,12 +2906,12 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "IW" = ( -/obj/item/weapon/implanter/compliance, +/obj/item/implanter/compliance, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "Jj" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/beaker/vial/random, +/obj/item/reagent_containers/glass/beaker/vial/random, /turf/simulated/floor, /area/redgate/jungle/facilityne) "Jk" = ( @@ -2932,7 +2932,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "JF" = ( -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "JG" = ( @@ -2964,7 +2964,7 @@ /area/redgate/jungle/facilityne) "JT" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/lunchbox/filled, +/obj/item/storage/toolbox/lunchbox/filled, /turf/simulated/floor/tiled, /area/redgate/jungle/facilitynw) "JU" = ( @@ -2998,7 +2998,7 @@ /area/redgate/jungle/facilityne) "KD" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/box/shrimpsandbananas, +/obj/item/storage/box/shrimpsandbananas, /turf/simulated/floor, /area/redgate/jungle/facilityse) "KG" = ( @@ -3023,7 +3023,7 @@ /area/redgate/jungle/facilityse) "KT" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/simulated/floor, /area/redgate/jungle/facilitysw) "KX" = ( @@ -3049,7 +3049,7 @@ /turf/simulated/floor/water/underwater, /area/redgate/jungle/underwaterpong) "Lo" = ( -/obj/item/weapon/reagent_containers/glass/beaker/vial/random, +/obj/item/reagent_containers/glass/beaker/vial/random, /turf/simulated/floor, /area/redgate/jungle/facilityse) "Lv" = ( @@ -3079,7 +3079,7 @@ /obj/structure/closet/crate/bin{ anchored = 1 }, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/floor, /area/redgate/jungle/facilityse) "LE" = ( @@ -3102,7 +3102,7 @@ /area/redgate/jungle/facilitysw) "LN" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/toy/desk/officetoy, +/obj/item/toy/desk/officetoy, /turf/simulated/floor, /area/redgate/jungle/facilityse) "LP" = ( @@ -3139,7 +3139,7 @@ /area/redgate/jungle/facilityne) "Mi" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/melee/chainofcommand/curator_whip, +/obj/item/melee/chainofcommand/curator_whip, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "Ml" = ( @@ -3180,7 +3180,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitysw) "ME" = ( -/obj/item/device/pipe_painter, +/obj/item/pipe_painter, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "MF" = ( @@ -3211,7 +3211,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "MP" = ( -/obj/item/weapon/handcuffs/legcuffs/fuzzy, +/obj/item/handcuffs/legcuffs/fuzzy, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "MQ" = ( @@ -3270,7 +3270,7 @@ /area/redgate/jungle/facilitynw) "Nx" = ( /obj/structure/closet/walllocker_double/medical/north, -/obj/item/device/glasses_kit, +/obj/item/glasses_kit, /obj/random/medical/pillbottle, /obj/random/medical/pillbottle, /turf/simulated/floor, @@ -3293,7 +3293,7 @@ /area/redgate/jungle/facilityse) "NR" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/bottle/frostoil, +/obj/item/reagent_containers/glass/bottle/frostoil, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/jungle/facilitynw) "NS" = ( @@ -3303,7 +3303,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "NT" = ( -/obj/item/weapon/storage/box/handcuffs/fake, +/obj/item/storage/box/handcuffs/fake, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "NZ" = ( @@ -3399,7 +3399,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitysw) "OV" = ( -/obj/item/weapon/handcuffs/cable/red, +/obj/item/handcuffs/cable/red, /turf/simulated/floor, /area/redgate/jungle/facilityse) "OW" = ( @@ -3418,7 +3418,7 @@ /area/redgate/jungle/facilitysw) "Pa" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/phone, +/obj/item/phone, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/jungle/facilitynw) "Pb" = ( @@ -3442,7 +3442,7 @@ /area/redgate/jungle/facilitynw) "Ph" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor, /area/redgate/jungle/facilityse) "Pi" = ( @@ -3520,7 +3520,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilityne) "Qa" = ( -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/simulated/floor/water/deep/pool, /area/redgate/jungle/facilitynw) "Qb" = ( @@ -3540,7 +3540,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "Qj" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/redgrid/animated, @@ -3564,7 +3564,7 @@ /area/redgate/jungle/facilityne) "QB" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor, /area/redgate/jungle/facilityne) "QC" = ( @@ -3599,7 +3599,7 @@ /area/redgate/jungle/facilitynw) "QS" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /turf/simulated/floor/wmarble, /area/redgate/jungle/facilityse) "QY" = ( @@ -3740,7 +3740,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitynw) "SJ" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/jungle/facilitynw) "SP" = ( @@ -3797,7 +3797,7 @@ /turf/simulated/floor, /area/redgate/jungle/facilitysw) "Tw" = ( -/obj/item/weapon/autopsy_scanner, +/obj/item/autopsy_scanner, /turf/simulated/floor, /area/redgate/jungle/facilitysw) "TA" = ( @@ -3845,10 +3845,10 @@ /area/redgate/jungle/facilityne) "Us" = ( /obj/structure/closet, -/obj/item/device/multitool, -/obj/item/weapon/pen/multi, +/obj/item/multitool, +/obj/item/pen/multi, /obj/item/stack/cable_coil/silver, -/obj/item/weapon/tool/wirecutters/brass, +/obj/item/tool/wirecutters/brass, /obj/random/maintenance/engineering, /turf/simulated/floor, /area/redgate/jungle/facilityne) @@ -3865,7 +3865,7 @@ /obj/effect/floor_decal/industrial/danger{ dir = 4 }, -/obj/item/weapon/circuitboard/smes, +/obj/item/circuitboard/smes, /turf/simulated/floor/tiled/techfloor, /area/redgate/jungle/facilitynw) "UB" = ( @@ -3879,7 +3879,7 @@ /area/redgate/jungle/facilitybar) "UF" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/scalpel, /turf/simulated/floor, /area/redgate/jungle/facilityse) "UL" = ( @@ -3978,11 +3978,11 @@ /area/redgate/jungle/facilitysw) "VN" = ( /obj/structure/bed/double, -/obj/item/weapon/bedsheet/yellowdouble, +/obj/item/bedsheet/yellowdouble, /turf/simulated/floor/reinforced, /area/redgate/jungle/facilitybar) "VP" = ( -/obj/item/weapon/reagent_containers/food/snacks/jaffacake{ +/obj/item/reagent_containers/food/snacks/jaffacake{ bitesize = 0.1; icon_scale_x = 3; icon_scale_y = 3; @@ -4188,7 +4188,7 @@ /turf/simulated/floor/reinforced, /area/redgate/jungle/facilitybar) "YY" = ( -/obj/item/weapon/handcuffs/fuzzy, +/obj/item/handcuffs/fuzzy, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "Za" = ( @@ -4197,7 +4197,7 @@ /area/redgate/jungle/facilityne) "Zb" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/food/snacks/truffle/random, +/obj/item/reagent_containers/food/snacks/truffle/random, /turf/simulated/floor/redgrid/animated, /area/redgate/jungle/facilitybar) "Zc" = ( @@ -4244,7 +4244,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/redgate/jungle/facilityse) "ZH" = ( -/obj/item/weapon/tool/wrench/pipe, +/obj/item/tool/wrench/pipe, /turf/simulated/floor, /area/redgate/jungle/facilitynw) "ZI" = ( @@ -4256,7 +4256,7 @@ }, /area/redgate/jungle/underwatercaveswamp) "ZJ" = ( -/obj/item/weapon/bone/ribs, +/obj/item/bone/ribs, /turf/simulated/mineral/floor/ignore_cavegen{ nitrogen = 82.1472; oxygen = 21.8366; @@ -4290,7 +4290,7 @@ /area/redgate/jungle/facilitysw) "ZX" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/surgical/scalpel/alien, +/obj/item/surgical/scalpel/alien, /turf/simulated/floor, /area/redgate/jungle/facilitysw) diff --git a/maps/redgate/laserdome.dmm b/maps/redgate/laserdome.dmm index 91dd9acce85..ee6346f6cf6 100644 --- a/maps/redgate/laserdome.dmm +++ b/maps/redgate/laserdome.dmm @@ -52,7 +52,7 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/lobby/store_1) "awn" = ( -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/simulated/floor/tiled/white, /area/redgate/laserdome/lobby/showers) "ayr" = ( @@ -244,7 +244,7 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hbl_prep) "cRZ" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /turf/simulated/floor/tiled/milspec, @@ -387,7 +387,7 @@ /area/redgate/laserdome/arena/ctf_prep) "ebx" = ( /obj/structure/table/marble, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled/milspec/sterile, /area/redgate/laserdome/lobby/aid_station) "eqO" = ( @@ -411,7 +411,7 @@ /area/redgate/laserdome/arena/hyperball) "eAj" = ( /obj/structure/table/marble, -/obj/item/device/encryptionkey/ent, +/obj/item/encryptionkey/ent, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/lobby/spaceview_lounge) "eCL" = ( @@ -426,7 +426,7 @@ /area/redgate/laserdome/lobby) "eND" = ( /obj/structure/hyperball_pedestal, -/obj/item/weapon/laserdome_hyperball, +/obj/item/laserdome_hyperball, /turf/simulated/floor/tiled/milspec/raised, /area/redgate/laserdome/arena/hyperball) "eSA" = ( @@ -516,12 +516,12 @@ /area/redgate/laserdome/arena/capture_the_flag) "fsP" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburger, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburger, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburger, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburger, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburger, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburger, +/obj/item/reagent_containers/food/snacks/cheeseburger, +/obj/item/reagent_containers/food/snacks/cheeseburger, +/obj/item/reagent_containers/food/snacks/cheeseburger, +/obj/item/reagent_containers/food/snacks/cheeseburger, +/obj/item/reagent_containers/food/snacks/cheeseburger, +/obj/item/reagent_containers/food/snacks/cheeseburger, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/laserdome/lobby/restaurant) "fxa" = ( @@ -647,7 +647,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/device/healthanalyzer/guide, +/obj/item/healthanalyzer/guide, /turf/simulated/floor/tiled/milspec/sterile, /area/redgate/laserdome/lobby/aid_station) "gEn" = ( @@ -698,8 +698,8 @@ /area/redgate/laserdome/arena/ctf_prep) "gTS" = ( /obj/structure/table/marble, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/knife/butch, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/laserdome/lobby/restaurant) "gVl" = ( @@ -755,7 +755,7 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/ctf_prep) "hfU" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /turf/simulated/floor/tiled/milspec, @@ -936,11 +936,11 @@ /area/redgate/laserdome/arena/hbl_prep) "iVw" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -1; pixel_y = 10 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3; pixel_y = 13 }, @@ -980,7 +980,7 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/capture_the_flag) "jti" = ( -/obj/item/weapon/stool/baystool/padded, +/obj/item/stool/baystool/padded, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/lobby/spaceview_lounge) "jCB" = ( @@ -1133,7 +1133,7 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hyperball) "kKQ" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 4 }, /turf/simulated/floor/tiled/milspec, @@ -1210,7 +1210,7 @@ /area/redgate/laserdome/arena/hbl_prep) "lgv" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/snacks/mint, +/obj/item/reagent_containers/food/snacks/mint, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/laserdome/lobby/restaurant) "lpp" = ( @@ -1244,7 +1244,7 @@ /area/redgate/laserdome/arena/ctf_prep) "lIm" = ( /obj/structure/table/marble, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/simulated/floor/tiled/milspec/sterile, /area/redgate/laserdome/lobby/aid_station) "lON" = ( @@ -1447,14 +1447,14 @@ /area/redgate/laserdome/arena/hyperball) "nVx" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3; pixel_y = 4 }, @@ -1478,7 +1478,7 @@ /turf/simulated/floor/tiled/white, /area/redgate/laserdome/lobby/showers) "obC" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 8 }, /turf/simulated/floor/tiled/milspec, @@ -1634,19 +1634,19 @@ /area/redgate/laserdome/lobby) "pgz" = ( /obj/structure/table/marble, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = -9; pixel_y = 10 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = -9; pixel_y = 1 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 6; pixel_y = 10 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 6; pixel_y = 1 }, @@ -1765,7 +1765,7 @@ "qyt" = ( /obj/effect/floor_decal/industrial/hatch/blue, /obj/structure/flag_base/blue, -/obj/item/weapon/laserdome_flag/blue, +/obj/item/laserdome_flag/blue, /turf/simulated/floor/tiled/milspec/raised, /area/redgate/laserdome/arena/capture_the_flag) "qAG" = ( @@ -1846,7 +1846,7 @@ "rnw" = ( /obj/structure/table/standard, /obj/random/soap, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/simulated/floor/tiled/white, /area/redgate/laserdome/lobby/showers) "roP" = ( @@ -1997,13 +1997,13 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/simulated/floor/tiled/milspec/sterile, /area/redgate/laserdome/lobby/aid_station) "sOY" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/structure/flag_base/red, -/obj/item/weapon/laserdome_flag/red, +/obj/item/laserdome_flag/red, /turf/simulated/floor/tiled/milspec/raised, /area/redgate/laserdome/arena/capture_the_flag) "sQh" = ( @@ -2065,7 +2065,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 6 }, -/obj/item/weapon/laserdome_hyperball_prop{ +/obj/item/laserdome_hyperball_prop{ icon_state = "hyperball_red" }, /turf/simulated/floor/tiled/milspec, @@ -2224,19 +2224,19 @@ /area/redgate/laserdome/arena/capture_the_flag) "uwE" = ( /obj/structure/table/marble, -/obj/item/weapon/storage/firstaid{ +/obj/item/storage/firstaid{ pixel_x = -9; pixel_y = 10 }, -/obj/item/weapon/storage/firstaid{ +/obj/item/storage/firstaid{ pixel_x = -9; pixel_y = 1 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 6; pixel_y = 10 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 6; pixel_y = 1 }, @@ -2340,7 +2340,7 @@ /obj/effect/floor_decal/corner/red{ dir = 9 }, -/obj/item/weapon/laserdome_hyperball_prop{ +/obj/item/laserdome_hyperball_prop{ icon_state = "hyperball_blue" }, /turf/simulated/floor/tiled/milspec, @@ -2531,11 +2531,11 @@ /area/redgate/laserdome/arena/ctf_prep) "wFp" = ( /obj/structure/table/marble, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ name = "box of measuring cups"; pixel_x = 2; pixel_y = 3; - starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup = 7) + starts_with = list(/obj/item/reagent_containers/glass/beaker/measuring_cup = 7) }, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/laserdome/lobby/restaurant) @@ -2679,8 +2679,8 @@ /obj/structure/closet/secure_closet/personal, /obj/item/clothing/under/bathrobe, /obj/item/clothing/under/bathrobe, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled/white, /area/redgate/laserdome/lobby/showers) "ymc" = ( diff --git a/maps/redgate/stardog.dmm b/maps/redgate/stardog.dmm index 6556d35a21b..711109ba9fc 100644 --- a/maps/redgate/stardog.dmm +++ b/maps/redgate/stardog.dmm @@ -226,7 +226,7 @@ /turf/simulated/floor/lino, /area/redgate/stardog/lounge) "ud" = ( -/obj/item/weapon/pickaxe/hand, +/obj/item/pickaxe/hand, /turf/simulated/floor/flesh, /area/redgate/stardog/flesh_abyss/stomach) "uQ" = ( diff --git a/maps/redgate/teppiranch.dmm b/maps/redgate/teppiranch.dmm index 6d8468b7eb7..fa0eeb4164e 100644 --- a/maps/redgate/teppiranch.dmm +++ b/maps/redgate/teppiranch.dmm @@ -112,14 +112,14 @@ /area/redgate/structure/powered/teppi_ranch) "jE" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, /turf/simulated/floor/tiled/eris/cafe, @@ -281,7 +281,7 @@ /area/redgate/wilds) "ux" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/reagent_containers/food/snacks/lasagna, +/obj/item/reagent_containers/food/snacks/lasagna, /turf/simulated/floor/wood, /area/redgate/structure/powered/teppi_ranch) "uP" = ( @@ -428,7 +428,7 @@ /area/redgate/structure/powered/teppi_ranch) "Fc" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/paper/teppiranch, +/obj/item/paper/teppiranch, /turf/simulated/floor/wood, /area/redgate/structure/powered/teppi_ranch) "Gj" = ( @@ -444,8 +444,8 @@ /area/redgate/structure/powered/teppi_ranch/barn) "GF" = ( /obj/structure/table/standard, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/knife/butch, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/structure/powered/teppi_ranch) "GQ" = ( @@ -471,7 +471,7 @@ /area/redgate/structure/powered/teppi_ranch/barn) "Hf" = ( /obj/structure/table/standard, -/obj/item/weapon/book/manual/cook_guide, +/obj/item/book/manual/cook_guide, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/structure/powered/teppi_ranch) "Ia" = ( @@ -483,7 +483,7 @@ /area/redgate/structure/powered/teppi_ranch) "IV" = ( /obj/structure/table/hardwoodtable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/redgate/structure/powered/teppi_ranch) "Jg" = ( @@ -603,11 +603,11 @@ /area/redgate/structure/powered/teppi_ranch/barn) "NL" = ( /obj/structure/closet/chefcloset, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/tool/wrench, +/obj/item/soap/nanotrasen, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/tool/wrench, /obj/machinery/light, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/structure/powered/teppi_ranch) @@ -711,22 +711,22 @@ /area/redgate/wilds) "Wa" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/peppermill, /obj/random/donkpocketbox, /obj/structure/closet/walllocker_double/south{ dir = 2; @@ -746,12 +746,12 @@ /area/redgate/structure/powered/teppi_ranch/barn) "WL" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/mint, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/snacks/mint, +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3; pixel_y = 13 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -1; pixel_y = 10 }, @@ -771,7 +771,7 @@ /area/redgate/structure/powered/teppi_ranch/barn) "Xg" = ( /obj/structure/flora/tree/bigtree, -/obj/item/weapon/aliencoin/silver, +/obj/item/aliencoin/silver, /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs, /area/redgate/wilds) "XA" = ( @@ -797,11 +797,11 @@ /area/redgate/structure/powered/teppi_ranch) "Zr" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ name = "box of measuring cups"; pixel_x = 2; pixel_y = 3; - starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup=7) + starts_with = list(/obj/item/reagent_containers/glass/beaker/measuring_cup=7) }, /turf/simulated/floor/tiled/eris/cafe, /area/redgate/structure/powered/teppi_ranch) diff --git a/maps/redgate/train.dmm b/maps/redgate/train.dmm index d68554155e5..e3af7942ed2 100644 --- a/maps/redgate/train.dmm +++ b/maps/redgate/train.dmm @@ -66,7 +66,7 @@ /turf/simulated/shuttle/floor/black, /area/redgate/train/tableseating) "bC" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/shuttle/floor/black, /area/redgate/train/bar) "bT" = ( @@ -150,7 +150,7 @@ /turf/simulated/floor/plating, /area/redgate/train/meeting) "dN" = ( -/obj/item/weapon/material/sword/battleaxe, +/obj/item/material/sword/battleaxe, /turf/simulated/shuttle/floor/voidcraft{ outdoors = 1 }, @@ -276,13 +276,13 @@ /obj/structure/closet/hydrant{ pixel_x = -30 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin, /turf/simulated/shuttle/floor/black, /area/redgate/train/viewing) "fM" = ( @@ -539,7 +539,7 @@ }, /area/redgate/train/meeting) "le" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/shuttle/floor/skipjack{ @@ -550,9 +550,9 @@ /area/redgate/train/casino) "lo" = ( /obj/structure/table/standard, -/obj/item/weapon/pen, -/obj/item/weapon/pen, -/obj/item/weapon/pen, +/obj/item/pen, +/obj/item/pen, +/obj/item/pen, /turf/simulated/shuttle/floor/black, /area/redgate/train/tableseating) "lC" = ( @@ -660,13 +660,13 @@ /obj/structure/closet/hydrant{ pixel_x = -30 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin, /turf/simulated/shuttle/floor/black, /area/redgate/train/seating) "mW" = ( @@ -708,13 +708,13 @@ /obj/structure/closet/hydrant{ pixel_x = -30 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin, /turf/simulated/shuttle/floor/black, /area/redgate/train/rear) "np" = ( @@ -857,13 +857,13 @@ /area/redgate/train/overboard) "pM" = ( /obj/structure/closet/walllocker_double/misc_civ/north, -/obj/item/weapon/pack/cardemon, -/obj/item/weapon/pack/cardemon, -/obj/item/weapon/pack/cardemon, -/obj/item/weapon/deck/cards, -/obj/item/weapon/deck/wizoff, -/obj/item/weapon/deck/schnapsen, -/obj/item/weapon/deck/egy, +/obj/item/pack/cardemon, +/obj/item/pack/cardemon, +/obj/item/pack/cardemon, +/obj/item/deck/cards, +/obj/item/deck/wizoff, +/obj/item/deck/schnapsen, +/obj/item/deck/egy, /turf/simulated/shuttle/floor/black, /area/redgate/train/arena) "pT" = ( @@ -879,9 +879,9 @@ /area/redgate/train/redgate) "qk" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/book/manual/barman_recipes, +/obj/item/reagent_containers/food/drinks/flask/vacuumflask, +/obj/item/flame/lighter/zippo, +/obj/item/book/manual/barman_recipes, /obj/item/clothing/head/that{ pixel_x = 4; pixel_y = 6 @@ -1052,7 +1052,7 @@ /area/redgate/train/storage) "tg" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /turf/simulated/shuttle/floor/skipjack{ name = "floor"; nitrogen = 82.1472; @@ -1163,7 +1163,7 @@ /turf/simulated/shuttle/floor/black, /area/redgate/train/tableseating) "vg" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/shuttle/floor/black, /area/redgate/train/tableseating) "vn" = ( @@ -1339,7 +1339,7 @@ }, /area/redgate/train/overboard) "yq" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/shuttle/floor/skipjack{ name = "floor"; nitrogen = 82.1472; @@ -2078,8 +2078,8 @@ /area/redgate/train/redgate) "Io" = ( /obj/structure/table/standard, -/obj/item/weapon/pen, -/obj/item/weapon/pen, +/obj/item/pen, +/obj/item/pen, /turf/simulated/shuttle/floor/yellow, /area/redgate/train/meeting) "Ip" = ( @@ -2162,7 +2162,7 @@ /turf/simulated/floor/outdoors/newdirt, /area/redgate/train/animals) "Kb" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/shuttle/floor/skipjack{ @@ -2326,7 +2326,7 @@ }, /area/redgate/train/meeting) "Lw" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/shuttle/floor/skipjack{ @@ -2351,7 +2351,7 @@ /area/redgate/train/redgate) "LG" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/shuttle/floor/black, /area/redgate/train/tableseating) "LI" = ( @@ -2382,13 +2382,13 @@ /obj/structure/closet/hydrant{ pixel_x = -30 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin, /turf/simulated/shuttle/floor/black, /area/redgate/train/bar) "LU" = ( @@ -2502,15 +2502,15 @@ /area/redgate/train/wood) "Or" = ( /obj/structure/closet/walllocker_double/casino/north, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/storage/dicecup, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/dicecup, +/obj/item/storage/dicecup, +/obj/item/storage/dicecup, /obj/machinery/light{ dir = 8 }, @@ -2518,8 +2518,8 @@ /area/redgate/train/casino) "Os" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, +/obj/item/paper_bin, /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, @@ -2613,15 +2613,15 @@ /area/redgate/train/bar) "Px" = ( /obj/structure/closet/walllocker_double/casino/south, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/storage/dicecup, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/dicecup, +/obj/item/storage/dicecup, +/obj/item/storage/dicecup, /obj/machinery/light{ dir = 4 }, @@ -3031,13 +3031,13 @@ /obj/structure/closet/hydrant{ pixel_x = -30 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin, /turf/simulated/shuttle/floor/black, /area/redgate/train/tableseating) "VK" = ( @@ -3067,13 +3067,13 @@ /area/redgate/train/overboard) "VU" = ( /obj/structure/closet/walllocker_double/misc_civ/south, -/obj/item/weapon/pack/cardemon, -/obj/item/weapon/pack/cardemon, -/obj/item/weapon/pack/cardemon, -/obj/item/weapon/deck/cards, -/obj/item/weapon/deck/wizoff, -/obj/item/weapon/deck/schnapsen, -/obj/item/weapon/deck/egy, +/obj/item/pack/cardemon, +/obj/item/pack/cardemon, +/obj/item/pack/cardemon, +/obj/item/deck/cards, +/obj/item/deck/wizoff, +/obj/item/deck/schnapsen, +/obj/item/deck/egy, /turf/simulated/shuttle/floor/black, /area/redgate/train/arena) "Wd" = ( @@ -3095,7 +3095,7 @@ /area/redgate/train/overboard) "Wr" = ( /obj/structure/table/standard, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/shuttle/floor/black, /area/redgate/train/tableseating) "Wy" = ( @@ -3340,13 +3340,13 @@ /area/redgate/train/teppi) "ZP" = ( /obj/structure/closet/walllocker_double/casino/north, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/storage/box/roulette_balls_fancy, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/storage/box/roulette_balls_fancy, /obj/machinery/light{ dir = 4 }, @@ -3354,13 +3354,13 @@ /area/redgate/train/casino) "ZY" = ( /obj/structure/closet/walllocker_double/casino/south, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/storage/box/roulette_balls_normal, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/storage/box/roulette_balls_normal, /obj/machinery/light{ dir = 8 }, diff --git a/maps/redgate/train_upper.dmm b/maps/redgate/train_upper.dmm index 0124e721c36..f5921a71d0a 100644 --- a/maps/redgate/train_upper.dmm +++ b/maps/redgate/train_upper.dmm @@ -21,7 +21,7 @@ /area/redgate/train/roof) "aQ" = ( /obj/structure/table/fancyblack, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 7; pixel_y = 16 }, @@ -123,7 +123,7 @@ /area/redgate/train/gym) "cp" = ( /obj/structure/table/fancyblack, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 7; pixel_y = 16 }, @@ -165,7 +165,7 @@ /area/redgate/train/chef) "cU" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /turf/simulated/floor/carpet/bcarpet, /area/redgate/train/dorm2) "dd" = ( @@ -187,8 +187,8 @@ /area/redgate/train/vault) "dC" = ( /obj/structure/table/darkglass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fountain6, +/obj/item/paper_bin, +/obj/item/pen/fountain6, /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, @@ -258,7 +258,7 @@ "eD" = ( /obj/structure/table/steel_reinforced, /obj/structure/window/reinforced, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/shuttle/floor/skipjack{ name = "floor"; nitrogen = 82.1472; @@ -333,13 +333,13 @@ /obj/structure/closet/hydrant{ pixel_x = -30 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin, /turf/simulated/shuttle/floor/black, /area/redgate/train/dining) "fL" = ( @@ -511,22 +511,22 @@ name = "train captain's locker"; req_access = list(900) }, -/obj/item/weapon/soap/golden_soap, -/obj/item/device/perfect_tele/frontier, -/obj/item/device/gps/command, -/obj/item/device/universal_translator, -/obj/item/device/megaphone/super, -/obj/item/device/binoculars/spyglass, +/obj/item/soap/golden_soap, +/obj/item/perfect_tele/frontier, +/obj/item/gps/command, +/obj/item/universal_translator, +/obj/item/megaphone/super, +/obj/item/binoculars/spyglass, /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, /area/redgate/train/captain) "iS" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/shuttle/floor/white, /area/redgate/train/medbay) "iZ" = ( @@ -550,7 +550,7 @@ /area/redgate/train/helipad) "jf" = ( /obj/structure/table/rack/gun_rack/steel, -/obj/item/device/slow_sizegun, +/obj/item/slow_sizegun, /turf/simulated/shuttle/floor/red, /area/redgate/train/gear) "jh" = ( @@ -647,10 +647,10 @@ /area/redgate/train/dorm4) "kV" = ( /obj/structure/closet/chefcloset, -/obj/item/device/retail_scanner/civilian, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/flame/candle/candelabra, -/obj/item/weapon/flame/candle/candelabra, +/obj/item/retail_scanner/civilian, +/obj/item/storage/fancy/candle_box, +/obj/item/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, /turf/simulated/floor/wood, /area/redgate/train/chef) "kW" = ( @@ -715,8 +715,8 @@ /obj/random/firstaid, /obj/item/clothing/gloves/sterile/nitrile, /obj/item/clothing/gloves/sterile/nitrile, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, /obj/effect/floor_decal/corner/green/border{ dir = 4 }, @@ -742,7 +742,7 @@ /area/redgate/train/kitchen) "lB" = ( /obj/structure/table/fancyblack, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 7; pixel_y = 16 }, @@ -802,14 +802,14 @@ /area/redgate/train/kitchen) "mF" = ( /obj/structure/closet, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/random/flashlight, -/obj/item/device/text_to_speech, -/obj/item/weapon/storage/box/matches, +/obj/item/text_to_speech, +/obj/item/storage/box/matches, /obj/random/mre, /obj/random/mre, /obj/random/mre, @@ -836,8 +836,8 @@ /area/redgate/train/vault) "mV" = ( /obj/structure/closet, -/obj/item/weapon/melee/telebaton, -/obj/item/weapon/folder/red, +/obj/item/melee/telebaton, +/obj/item/folder/red, /obj/random/maintenance/security, /obj/random/maintenance/security, /obj/machinery/light, @@ -860,7 +860,7 @@ /area/redgate/train/dining) "mY" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /turf/simulated/floor/carpet/bcarpet, /area/redgate/train/dorm1) "nc" = ( @@ -920,7 +920,7 @@ /area/redgate/train/dining) "nG" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /turf/simulated/floor/carpet/bcarpet, /area/redgate/train/dorm3) "nQ" = ( @@ -945,8 +945,8 @@ /area/redgate/train/medbay) "ol" = ( /obj/structure/table/standard, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/knife/butch, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/kafel_full, /area/redgate/train/kitchen) "or" = ( @@ -1082,7 +1082,7 @@ /area/redgate/train/helipad) "qd" = ( /obj/structure/table/fancyblack, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 7; pixel_y = 16 }, @@ -1090,7 +1090,7 @@ /area/redgate/train/dorm5) "qe" = ( /obj/structure/table/fancyblack, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 7; pixel_y = 16 }, @@ -1136,10 +1136,10 @@ /area/redgate/train/dining) "qO" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/handcuffs/legcuffs, -/obj/item/weapon/handcuffs/legcuffs, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs/legcuffs, +/obj/item/handcuffs/legcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs, /turf/simulated/shuttle/floor/red, /area/redgate/train/gear) "qX" = ( @@ -1154,8 +1154,8 @@ /obj/item/clothing/shoes/boots/jackboots/silver, /obj/item/clothing/gloves/blue, /obj/item/clothing/glasses/hud/security/jensenshades, -/obj/item/weapon/melee/telebaton, -/obj/item/device/ticket_printer/train, +/obj/item/melee/telebaton, +/obj/item/ticket_printer/train, /obj/item/taperoll/police, /turf/simulated/shuttle/floor/skipjack{ name = "floor"; @@ -1196,7 +1196,7 @@ /area/redgate/train/dining) "rG" = ( /obj/structure/mopbucket, -/obj/item/weapon/mop, +/obj/item/mop, /obj/machinery/light{ dir = 4 }, @@ -1220,7 +1220,7 @@ /area/redgate/train/helipad) "sl" = ( /obj/structure/table/darkglass, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, @@ -1306,13 +1306,13 @@ /obj/structure/closet/hydrant{ pixel_x = -30 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin, /turf/simulated/floor/wood, /area/redgate/train/sleeper2) "tF" = ( @@ -1394,7 +1394,7 @@ /turf/simulated/shuttle/floor/white, /area/redgate/train/medbay) "uN" = ( -/obj/item/weapon/inflatable_duck, +/obj/item/inflatable_duck, /turf/simulated/floor/water/deep/indoors, /area/redgate/train/pool) "uR" = ( @@ -1416,8 +1416,8 @@ /obj/item/clothing/head/shiny_hood, /obj/item/clothing/under/shiny/catsuit, /obj/item/clothing/under/shiny/leotard, -/obj/item/weapon/handcuffs/fuzzy, -/obj/item/weapon/handcuffs/legcuffs/fuzzy, +/obj/item/handcuffs/fuzzy, +/obj/item/handcuffs/legcuffs/fuzzy, /turf/simulated/floor/wood, /area/redgate/train/dorm1) "vd" = ( @@ -1593,7 +1593,7 @@ /area/redgate/train/helipad) "xP" = ( /obj/structure/table/rack/gun_rack/steel, -/obj/item/weapon/bluespace_harpoon, +/obj/item/bluespace_harpoon, /turf/simulated/shuttle/floor/red, /area/redgate/train/gear) "xS" = ( @@ -1697,21 +1697,21 @@ "zY" = ( /obj/structure/table/standard, /obj/structure/closet/walllocker_double/medical/east, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/tray, -/obj/item/weapon/tray, +/obj/item/reagent_containers/dropper, +/obj/item/tray, +/obj/item/tray, /turf/simulated/floor/tiled/kafel_full, /area/redgate/train/kitchen) "Aa" = ( @@ -1738,21 +1738,21 @@ "AJ" = ( /obj/structure/table/standard, /obj/structure/closet/walllocker_double/kitchen/west, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/saltshaker, /turf/simulated/floor/tiled/kafel_full, /area/redgate/train/kitchen) "AQ" = ( @@ -1849,7 +1849,7 @@ /obj/machinery/vending/wallmed1/public{ pixel_x = -29 }, -/obj/item/weapon/storage/lockbox, +/obj/item/storage/lockbox, /turf/simulated/shuttle/floor/skipjack{ name = "floor"; nitrogen = 82.1472; @@ -1857,7 +1857,7 @@ }, /area/redgate/train/security) "BY" = ( -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/simulated/floor/water/deep/indoors, /area/redgate/train/pool) "BZ" = ( @@ -1866,7 +1866,7 @@ /area/redgate/train/medbay) "Cg" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /turf/simulated/floor/carpet/bcarpet, /area/redgate/train/dorm4) "Ct" = ( @@ -1888,24 +1888,24 @@ /area/redgate/train/dorm1) "CQ" = ( /obj/structure/closet/walllocker_double/security/north, -/obj/item/device/gps/security{ +/obj/item/gps/security{ pixel_x = -3 }, -/obj/item/device/gps/security{ +/obj/item/gps/security{ pixel_x = -3 }, -/obj/item/device/gps/security{ +/obj/item/gps/security{ pixel_x = -3 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 4; pixel_y = -4 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 4; pixel_y = -4 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 4; pixel_y = -4 }, @@ -1946,9 +1946,9 @@ desc = "A whistle used by the train staff. Suitable for ages 8 and up, do not swallow."; name = "train whistle" }, -/obj/item/weapon/cane, -/obj/item/weapon/cane, -/obj/item/weapon/storage/wallet/random, +/obj/item/cane, +/obj/item/cane, +/obj/item/storage/wallet/random, /turf/simulated/floor/tiled/dark, /area/redgate/train/staff) "Dm" = ( @@ -1972,7 +1972,7 @@ /area/redgate/train/dining) "DF" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /obj/structure/curtain/black, /turf/simulated/floor/tiled/dark, /area/redgate/train/staff) @@ -2005,8 +2005,8 @@ desc = "A whistle used by the train staff. Suitable for ages 8 and up, do not swallow."; name = "train whistle" }, -/obj/item/weapon/cane, -/obj/item/weapon/cane, +/obj/item/cane, +/obj/item/cane, /turf/simulated/floor/tiled/dark, /area/redgate/train/staff) "DR" = ( @@ -2020,7 +2020,7 @@ /area/redgate/train/dorm5) "Ec" = ( /obj/structure/table/standard, -/obj/item/weapon/book/manual/cook_guide, +/obj/item/book/manual/cook_guide, /obj/random/snack, /turf/simulated/floor/wood, /area/redgate/train/chef) @@ -2067,7 +2067,7 @@ /area/redgate/train/command) "EE" = ( /obj/structure/table/glass, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /obj/effect/floor_decal/milspec_sterile/green, /turf/simulated/shuttle/floor/white, /area/redgate/train/medbay) @@ -2093,13 +2093,13 @@ /obj/structure/closet/hydrant{ pixel_x = -30 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin, /turf/simulated/floor/wood, /area/redgate/train/sleeper1) "Fv" = ( @@ -2134,22 +2134,22 @@ /area/redgate/train/kitchen) "FV" = ( /obj/structure/closet, -/obj/item/device/ticket_printer/train, -/obj/item/device/ticket_printer/train, -/obj/item/device/ticket_printer/train, -/obj/item/device/ticket_printer/train, -/obj/item/device/ticket_printer/train, -/obj/item/device/ticket_printer/train, +/obj/item/ticket_printer/train, +/obj/item/ticket_printer/train, +/obj/item/ticket_printer/train, +/obj/item/ticket_printer/train, +/obj/item/ticket_printer/train, +/obj/item/ticket_printer/train, /obj/item/clothing/accessory/holster/hip/black, /obj/item/clothing/accessory/holster/hip/black, /obj/item/clothing/accessory/holster/hip/black, /obj/item/clothing/accessory/holster/hip/black, /obj/item/clothing/accessory/holster/hip/black, /obj/item/clothing/accessory/holster/hip/black, -/obj/item/device/laser_pointer/red, -/obj/item/device/laser_pointer/purple, -/obj/item/device/laser_pointer/green, -/obj/item/device/laser_pointer/blue, +/obj/item/laser_pointer/red, +/obj/item/laser_pointer/purple, +/obj/item/laser_pointer/green, +/obj/item/laser_pointer/blue, /turf/simulated/floor/tiled/dark, /area/redgate/train/staff) "Gj" = ( @@ -2331,9 +2331,9 @@ /area/redgate/train/dorm5) "IV" = ( /obj/structure/closet/chefcloset, -/obj/item/device/retail_scanner/civilian, -/obj/item/weapon/storage/fancy/blackcandle_box, -/obj/item/weapon/storage/fancy/whitecandle_box, +/obj/item/retail_scanner/civilian, +/obj/item/storage/fancy/blackcandle_box, +/obj/item/storage/fancy/whitecandle_box, /turf/simulated/floor/wood, /area/redgate/train/chef) "Jk" = ( @@ -2360,11 +2360,11 @@ /area/redgate/train/security) "JJ" = ( /obj/structure/closet/walllocker_double/medical/west, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/regular, /obj/random/firstaid, /obj/effect/floor_decal/corner/green/border{ dir = 8 @@ -2620,8 +2620,8 @@ desc = "A whistle used by the train staff. Suitable for ages 8 and up, do not swallow."; name = "train whistle" }, -/obj/item/weapon/cane, -/obj/item/weapon/cane, +/obj/item/cane, +/obj/item/cane, /obj/random/snack, /turf/simulated/floor/tiled/dark, /area/redgate/train/staff) @@ -2746,7 +2746,7 @@ /area/redgate/train/vault) "Pp" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/shuttle/floor/skipjack{ name = "floor"; nitrogen = 82.1472; @@ -2767,7 +2767,7 @@ /area/redgate/train/dorm5) "Ps" = ( /obj/structure/table/rack/gun_rack/steel, -/obj/item/weapon/gun/energy/netgun, +/obj/item/gun/energy/netgun, /turf/simulated/shuttle/floor/red, /area/redgate/train/gear) "Pv" = ( @@ -2843,7 +2843,7 @@ /obj/structure/table/rack/shelf{ color = "#FFD700" }, -/obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced/random, +/obj/item/gun/energy/mouseray/metamorphosis/advanced/random, /obj/random/maintenance/research, /turf/simulated/shuttle/floor/yellow, /area/redgate/train/vault) @@ -2871,14 +2871,14 @@ /obj/structure/table/rack{ color = "#FFD700" }, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, /obj/machinery/light{ dir = 4 }, @@ -2898,7 +2898,7 @@ dir = 8; pixel_x = -13 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/dark, /area/redgate/train/staff) "Rr" = ( @@ -2919,7 +2919,7 @@ /area/redgate/train/dining) "RG" = ( /obj/structure/table/fancyblack, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 7; pixel_y = 16 }, @@ -2941,7 +2941,7 @@ /area/redgate/train/kitchen) "RT" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/tiled/dark, /area/redgate/train/staff) "RY" = ( @@ -2990,8 +2990,8 @@ /area/redgate/train/kitchen) "Sx" = ( /obj/structure/table/darkglass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fountain6, +/obj/item/paper_bin, +/obj/item/pen/fountain6, /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, @@ -3041,7 +3041,7 @@ /area/redgate/train/dining) "Tr" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /turf/simulated/floor/carpet/bcarpet, /area/redgate/train/dorm6) "Ts" = ( @@ -3072,7 +3072,7 @@ /area/redgate/train/gym) "Ty" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/gift, +/obj/item/gift, /turf/simulated/floor/tiled/dark, /area/redgate/train/staff) "TG" = ( @@ -3147,7 +3147,7 @@ /obj/structure/closet/walllocker_double/security/north{ name = "evidence cabinet" }, -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, /obj/random/contraband/nofail, /obj/random/contraband/nofail, /obj/random/mainttoyloot/nofail, @@ -3255,7 +3255,7 @@ /area/redgate/train/security) "VU" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/captaindouble, +/obj/item/bedsheet/captaindouble, /turf/simulated/shuttle/floor/white{ color = "#cccccc" }, @@ -3275,9 +3275,9 @@ /area/redgate/train/dining) "Wk" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/melee/baton/shocker, -/obj/item/weapon/melee/baton/shocker, -/obj/item/weapon/melee/baton/shocker, +/obj/item/melee/baton/shocker, +/obj/item/melee/baton/shocker, +/obj/item/melee/baton/shocker, /turf/simulated/shuttle/floor/red, /area/redgate/train/gear) "Wn" = ( @@ -3322,10 +3322,10 @@ /area/redgate/train/kitchen) "Xk" = ( /obj/structure/closet/walllocker_double/medical/east, -/obj/item/device/retail_scanner/medical, -/obj/item/weapon/gun/energy/mouseray/medical, -/obj/item/device/denecrotizer/medical, -/obj/item/device/glasses_kit, +/obj/item/retail_scanner/medical, +/obj/item/gun/energy/mouseray/medical, +/obj/item/denecrotizer/medical, +/obj/item/glasses_kit, /obj/random/maintenance/medical, /obj/effect/floor_decal/corner/green/border{ dir = 4 @@ -3349,7 +3349,7 @@ color = "#FFD700" }, /obj/item/ammo_magazine/ammo_box/b44/rubber, -/obj/item/weapon/gun/projectile/deagle/gold, +/obj/item/gun/projectile/deagle/gold, /turf/simulated/shuttle/floor/yellow, /area/redgate/train/vault) "XP" = ( @@ -3369,7 +3369,7 @@ /area/redgate/train/kitchen) "XW" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /turf/simulated/floor/carpet/bcarpet, /area/redgate/train/dorm5) "XX" = ( @@ -3444,7 +3444,7 @@ /obj/structure/table/rack{ color = "#FFD700" }, -/obj/item/weapon/reagent_containers/food/drinks/golden_cup, +/obj/item/reagent_containers/food/drinks/golden_cup, /turf/simulated/shuttle/floor/yellow, /area/redgate/train/vault) "Zl" = ( diff --git a/maps/southern_cross/datums/supplypacks/munitions.dm b/maps/southern_cross/datums/supplypacks/munitions.dm index 0ce445ac8cf..4cce792053e 100644 --- a/maps/southern_cross/datums/supplypacks/munitions.dm +++ b/maps/southern_cross/datums/supplypacks/munitions.dm @@ -6,7 +6,7 @@ /datum/supply_pack/munitions/bolt_rifles_explorer name = "Weapons - Surplus Hunting Rifles" contains = list( - /obj/item/weapon/gun/projectile/shotgun/pump/rifle = 2, + /obj/item/gun/projectile/shotgun/pump/rifle = 2, /obj/item/ammo_magazine/clip/c762/hunter = 6 ) cost = 50 @@ -17,7 +17,7 @@ /datum/supply_pack/munitions/phase_carbines_explorer name = "Weapons - Surplus Phase Carbines" contains = list( - /obj/item/weapon/gun/energy/phasegun = 2, + /obj/item/gun/energy/phasegun = 2, ) cost = 25 containertype = /obj/structure/closet/crate/secure/ward @@ -27,7 +27,7 @@ /datum/supply_pack/munitions/phase_rifles_explorer name = "Weapons - Phase Rifles" contains = list( - /obj/item/weapon/gun/energy/phasegun/rifle = 2, + /obj/item/gun/energy/phasegun/rifle = 2, ) cost = 50 containertype = /obj/structure/closet/crate/secure/ward diff --git a/maps/southern_cross/items/encryptionkey_sc.dm b/maps/southern_cross/items/encryptionkey_sc.dm index d723c83c223..7346efef359 100644 --- a/maps/southern_cross/items/encryptionkey_sc.dm +++ b/maps/southern_cross/items/encryptionkey_sc.dm @@ -1,30 +1,30 @@ -/obj/item/device/encryptionkey/pilot +/obj/item/encryptionkey/pilot name = "pilot's encryption key" icon_state = "com_cypherkey" channels = list(CHANNEL_SUPPLY = 1, CHANNEL_EXPLORATION = 1) -/obj/item/device/encryptionkey/explorer +/obj/item/encryptionkey/explorer name = "explorer radio encryption key" icon_state = "com_cypherkey" channels = list(CHANNEL_EXPLORATION = 1, CHANNEL_SCIENCE = 1) -/obj/item/device/encryptionkey/sar +/obj/item/encryptionkey/sar name = "sar's encryption key" icon_state = "med_cypherkey" channels = list(CHANNEL_MEDICAL = 1, CHANNEL_EXPLORATION = 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(CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_EXPLORATION = 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(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_AI_PRIVATE = 1, CHANNEL_EXPLORATION = 1) -/obj/item/device/encryptionkey/heads/captain +/obj/item/encryptionkey/heads/captain name = "site manager's encryption key" icon_state = "cap_cypherkey" channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_EXPLORATION = 1) diff --git a/maps/southern_cross/items/headset_sc.dm b/maps/southern_cross/items/headset_sc.dm index eca7eeb27d3..b409dd2dddf 100644 --- a/maps/southern_cross/items/headset_sc.dm +++ b/maps/southern_cross/items/headset_sc.dm @@ -1,35 +1,35 @@ -/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/southern_cross/job/outfits.dm b/maps/southern_cross/job/outfits.dm index c42fd755ec2..2a1cf6d67b0 100644 --- a/maps/southern_cross/job/outfits.dm +++ b/maps/southern_cross/job/outfits.dm @@ -10,11 +10,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/science/explorer + pda_type = /obj/item/pda/explorer //VORESTation Edit - Better Brown + id_type = /obj/item/card/id/science/explorer id_pda_assignment = "Explorer" flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1) @@ -26,13 +26,13 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go /decl/hierarchy/outfit/job/explorer2/technician name = OUTFIT_JOB_NAME(JOB_ALT_EXPLORERE_TECHNICIAN) - belt = /obj/item/weapon/storage/belt/utility/full + belt = /obj/item/storage/belt/utility/full pda_slot = slot_l_store id_pda_assignment = JOB_ALT_EXPLORERE_TECHNICIAN /decl/hierarchy/outfit/job/explorer2/medic name = OUTFIT_JOB_NAME(JOB_ALT_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 = JOB_ALT_EXPLORER_MEDIC @@ -43,12 +43,12 @@ 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 uniform_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1 = 1) 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/civilian/pilot + pda_type = /obj/item/pda //VOREStation Edit - Civilian + id_type = /obj/item/card/id/civilian/pilot id_pda_assignment = JOB_PILOT flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL @@ -57,11 +57,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 - id_type = /obj/item/weapon/card/id/medical/sar - pda_type = /obj/item/device/pda/sar //VOREStation Add + id_type = /obj/item/card/id/medical/sar + 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 diff --git a/maps/southern_cross/southern_cross-1.dmm b/maps/southern_cross/southern_cross-1.dmm index af26139e652..6b7d2dbfeb3 100644 --- a/maps/southern_cross/southern_cross-1.dmm +++ b/maps/southern_cross/southern_cross-1.dmm @@ -107,7 +107,7 @@ /area/hallway/primary/firstdeck/auxdockfore) "aav" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/ai_status_display{ pixel_y = 32 }, @@ -276,7 +276,7 @@ "aaP" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/machinery/light{ dir = 8 }, @@ -284,7 +284,7 @@ /area/crew_quarters/firstdeck/gym) "aaQ" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /turf/simulated/floor/holofloor/wood, /area/crew_quarters/firstdeck/gym) "aaR" = ( @@ -437,7 +437,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -557,7 +557,7 @@ /area/hallway/primary/firstdeck/auxdockfore) "abq" = ( /obj/structure/closet/emcloset, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -579,7 +579,7 @@ name = "Emergency NanoMed"; pixel_x = -28 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -605,7 +605,7 @@ name = "Emergency NanoMed"; pixel_x = -28 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -796,9 +796,9 @@ /area/storage/emergency_storage/firstdeck/fore_emergency) "abV" = ( /obj/structure/table/standard, -/obj/item/device/t_scanner, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/t_scanner, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/plating, /area/storage/emergency_storage/firstdeck/fore_emergency) "abW" = ( @@ -997,7 +997,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/firstdeck/gym) "act" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/power/apc{ name = "south bump"; pixel_y = -24 @@ -1780,7 +1780,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -2350,7 +2350,7 @@ /area/construction/firstdeck/construction5) "aeO" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -2563,7 +2563,7 @@ /obj/structure/sink{ pixel_y = 16 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -2808,7 +2808,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/toy/xmas_cracker, +/obj/item/toy/xmas_cracker, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, /obj/random/maintenance/engineering, @@ -2822,14 +2822,14 @@ dir = 4; pixel_x = -22 }, -/obj/item/device/paicard, +/obj/item/paicard, /turf/simulated/floor/plating, /area/construction/firstdeck/construction5) "afU" = ( /obj/effect/decal/cleanable/blood/oil/streak{ amount = 0 }, -/obj/item/weapon/tool/wirecutters, +/obj/item/tool/wirecutters, /turf/simulated/floor/tiled, /area/construction/firstdeck/construction5) "afV" = ( @@ -2873,7 +2873,7 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/toilet/firstdeck) "afZ" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -2913,11 +2913,11 @@ /obj/item/clothing/under/color/yellow, /obj/item/key, /obj/item/toy/katana, -/obj/item/weapon/melee/chainofcommand, -/obj/item/weapon/disk/nuclear{ +/obj/item/melee/chainofcommand, +/obj/item/disk/nuclear{ name = "authentication disk" }, -/obj/item/weapon/moneybag/vault, +/obj/item/moneybag/vault, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "agd" = ( @@ -2952,11 +2952,11 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) "agi" = ( -/obj/item/weapon/storage/backpack, -/obj/item/device/multitool, -/obj/item/device/multitool, -/obj/item/device/assembly/prox_sensor, -/obj/item/device/flashlight, +/obj/item/storage/backpack, +/obj/item/multitool, +/obj/item/multitool, +/obj/item/assembly/prox_sensor, +/obj/item/flashlight, /obj/random/maintenance/engineering, /obj/random/maintenance/engineering, /obj/random/maintenance/cargo, @@ -2966,8 +2966,8 @@ /area/maintenance/firstdeck/forestarboard) "agj" = ( /obj/item/clothing/mask/gas, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance/clean, /obj/random/maintenance/engineering, @@ -2978,7 +2978,7 @@ /area/maintenance/firstdeck/forestarboard) "agk" = ( /obj/structure/table/rack, -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, /obj/random/maintenance/clean, /obj/random/cigarettes, /obj/random/maintenance/clean, @@ -3143,7 +3143,7 @@ /turf/simulated/floor/plating, /area/construction/firstdeck/construction5) "agD" = ( -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /turf/simulated/floor/tiled, /area/construction/firstdeck/construction5) "agE" = ( @@ -3174,8 +3174,8 @@ /area/crew_quarters/toilet/firstdeck) "agH" = ( /obj/structure/table/standard, -/obj/item/weapon/towel, -/obj/item/weapon/towel, +/obj/item/towel, +/obj/item/towel, /obj/random/soap, /obj/random/soap, /obj/machinery/power/apc{ @@ -3212,7 +3212,7 @@ "agL" = ( /obj/structure/closet/crate, /obj/item/stack/material/gold, -/obj/item/weapon/storage/belt/champion, +/obj/item/storage/belt/champion, /obj/item/stack/material/gold, /obj/item/stack/material/gold, /obj/item/stack/material/gold, @@ -3381,7 +3381,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -3404,8 +3404,8 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/device/gps, -/obj/item/device/gps{ +/obj/item/gps, +/obj/item/gps{ pixel_x = 3; pixel_y = 3 }, @@ -3457,7 +3457,7 @@ /turf/simulated/floor/tiled, /area/construction/firstdeck/construction5) "ahh" = ( -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/plating, /area/construction/firstdeck/construction5) "ahi" = ( @@ -3692,7 +3692,7 @@ "ahL" = ( /obj/structure/table/steel, /obj/item/clothing/gloves/black, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 5 }, /obj/random/tech_supply, @@ -3714,7 +3714,7 @@ /area/construction/firstdeck/construction5) "ahO" = ( /obj/structure/table/steel, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/random/tech_supply, /obj/effect/landmark{ name = "blobstart" @@ -3766,23 +3766,23 @@ /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/fore) "ahW" = ( -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 7; pixel_y = 12 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 12; pixel_y = 7 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 4; pixel_y = 8 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = -6; pixel_y = 5 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 5; pixel_y = -8 }, @@ -3794,7 +3794,7 @@ name = "Silver Crate"; req_access = list(19) }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 4; pixel_y = 8 }, @@ -3806,7 +3806,7 @@ name = "south bump"; pixel_y = -24 }, -/obj/item/weapon/storage/secure/briefcase/money{ +/obj/item/storage/secure/briefcase/money{ desc = "An sleek tidy briefcase."; name = "secure briefcase" }, @@ -3821,12 +3821,12 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "ahZ" = ( -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, /obj/structure/closet/crate/secure{ name = "Gold Crate"; req_access = list(19) @@ -4019,7 +4019,7 @@ /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/large_escape_pod2/station) "aix" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/structure/table/steel, /obj/random/maintenance/clean, /obj/random/maintenance/clean, @@ -4225,7 +4225,7 @@ /obj/structure/bed/chair/shuttle{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -4238,9 +4238,9 @@ /turf/simulated/shuttle/floor/black, /area/shuttle/shuttle1/start) "aiZ" = ( -/obj/item/device/t_scanner, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/t_scanner, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/structure/table/steel, /obj/random/maintenance/engineering, /obj/random/maintenance/clean, @@ -4451,10 +4451,10 @@ /area/maintenance/firstdeck/forestarboard) "ajz" = ( /obj/structure/table/rack, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/mask/gas, -/obj/item/device/flashlight, +/obj/item/flashlight, /obj/item/clothing/glasses/meson, /obj/random/maintenance/research, /obj/random/maintenance/research, @@ -4733,14 +4733,14 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/extinguisher, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/storage/box/lights/mixed, +/obj/item/extinguisher, /obj/random/maintenance/research, /obj/random/maintenance/research, /obj/structure/catwalk, @@ -5155,7 +5155,7 @@ /obj/random/action_figure, /obj/random/maintenance/clean, /obj/random/toy, -/obj/item/weapon/toy/xmas_cracker, +/obj/item/toy/xmas_cracker, /obj/random/crate, /turf/simulated/floor, /area/maintenance/firstdeck/foreport) @@ -5595,7 +5595,7 @@ /area/shuttle/large_escape_pod2/station) "alS" = ( /obj/structure/bed/chair, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -5618,7 +5618,7 @@ /obj/machinery/sleep_console{ dir = 4 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ pixel_y = 21 }, /turf/simulated/shuttle/floor, @@ -5731,10 +5731,10 @@ /area/hallway/primary/firstdeck/fscenter) "amj" = ( /obj/structure/closet, -/obj/item/device/flashlight, +/obj/item/flashlight, /obj/effect/decal/cleanable/cobweb2, -/obj/item/weapon/storage/backpack/satchel/vir, -/obj/item/weapon/storage/backpack/virology, +/obj/item/storage/backpack/satchel/vir, +/obj/item/storage/backpack/virology, /obj/random/maintenance/medical, /obj/random/maintenance/medical, /obj/random/maintenance/medical, @@ -5813,7 +5813,7 @@ /turf/simulated/floor/tiled, /area/hangar/one) "amu" = ( -/obj/item/weapon/storage/bible, +/obj/item/storage/bible, /obj/structure/table/rack, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -6046,13 +6046,13 @@ /area/shuttle/large_escape_pod2/station) "amV" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/extinguisher, -/obj/item/weapon/tool/crowbar, +/obj/item/extinguisher, +/obj/item/tool/crowbar, /obj/random/medical/lite, /turf/simulated/shuttle/floor/white, /area/shuttle/large_escape_pod2/station) @@ -6150,8 +6150,8 @@ /area/hangar/one) "anf" = ( /obj/structure/closet/wardrobe/grey, -/obj/item/weapon/storage/backpack, -/obj/item/weapon/storage/backpack, +/obj/item/storage/backpack, +/obj/item/storage/backpack, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, @@ -6549,7 +6549,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -6591,7 +6591,7 @@ /turf/simulated/floor/tiled/monotile, /area/hangar/one) "anP" = ( -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /obj/structure/closet, /obj/random/contraband, /obj/random/maintenance/clean, @@ -6695,8 +6695,8 @@ }, /area/tcomm/chamber) "aoa" = ( -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/double, /obj/random/maintenance/engineering, /obj/random/maintenance/engineering, /obj/random/maintenance/clean, @@ -6858,7 +6858,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -7370,8 +7370,8 @@ /area/rnd/research/firstdeck/hallway) "apj" = ( /obj/structure/table/rack, -/obj/item/weapon/extinguisher, -/obj/item/weapon/storage/belt/utility, +/obj/item/extinguisher, +/obj/item/storage/belt/utility, /obj/item/clothing/mask/gas, /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralport) @@ -7400,8 +7400,8 @@ /area/maintenance/firstdeck/centralport) "apn" = ( /obj/structure/closet/wardrobe/grey, -/obj/item/weapon/storage/backpack, -/obj/item/weapon/storage/backpack, +/obj/item/storage/backpack, +/obj/item/storage/backpack, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, @@ -7505,7 +7505,7 @@ /area/construction/firstdeck/construction1) "apw" = ( /obj/structure/table/steel, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/random/tech_supply, /obj/random/toolbox, /turf/simulated/floor, @@ -7555,7 +7555,7 @@ dir = 4; pixel_x = -22 }, -/obj/item/device/communicator, +/obj/item/communicator, /turf/simulated/floor/tiled, /area/hangar/onecontrol) "apE" = ( @@ -7859,10 +7859,10 @@ dir = 1 }, /obj/structure/grille/broken, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/item/stack/rods, /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) @@ -7946,7 +7946,7 @@ /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/random/drinkbottle, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, /obj/random/crate, @@ -8055,8 +8055,8 @@ /area/maintenance/firstdeck/centralstarboard) "aqC" = ( /obj/structure/table/rack, -/obj/item/weapon/extinguisher, -/obj/item/weapon/storage/belt/utility, +/obj/item/extinguisher, +/obj/item/storage/belt/utility, /obj/item/clothing/mask/gas, /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -8137,7 +8137,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -8515,8 +8515,8 @@ /area/tcomm/computer) "arr" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, -/obj/item/device/radio/intercom{ +/obj/item/flashlight/lamp, +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -8524,11 +8524,11 @@ /area/tcomm/computer) "ars" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/folder/yellow, -/obj/item/device/multitool, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue{ +/obj/item/folder/yellow, +/obj/item/folder/yellow, +/obj/item/multitool, +/obj/item/paper_bin, +/obj/item/pen/blue{ pixel_x = -3; pixel_y = 2 }, @@ -8849,7 +8849,7 @@ "arY" = ( /obj/structure/table/steel, /obj/item/clothing/gloves/black, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 5 }, /obj/random/tech_supply, @@ -8928,7 +8928,7 @@ /turf/simulated/floor/tiled, /area/hangar/onecontrol) "ash" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -9108,7 +9108,7 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) "asB" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -9179,16 +9179,16 @@ /area/construction/firstdeck/construction4) "asI" = ( /obj/structure/table/reinforced, -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/wood, /area/construction/firstdeck/construction4) "asJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 4; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square, +/obj/item/reagent_containers/food/drinks/glass2/square, /obj/machinery/light, /turf/simulated/floor/wood, /area/construction/firstdeck/construction4) @@ -9437,16 +9437,16 @@ /area/tcomm/tcomstorage) "atq" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, /obj/machinery/alarm{ pixel_y = 22 }, @@ -9458,15 +9458,15 @@ /area/tcomm/tcomstorage) "ats" = ( /obj/structure/table/rack, -/obj/item/weapon/circuitboard/telecomms/processor, -/obj/item/weapon/circuitboard/telecomms/processor, -/obj/item/weapon/circuitboard/telecomms/receiver, -/obj/item/weapon/circuitboard/telecomms/server, -/obj/item/weapon/circuitboard/telecomms/server, -/obj/item/weapon/circuitboard/telecomms/bus, -/obj/item/weapon/circuitboard/telecomms/bus, -/obj/item/weapon/circuitboard/telecomms/broadcaster, -/obj/item/weapon/circuitboard/telecomms/exonet_node, +/obj/item/circuitboard/telecomms/processor, +/obj/item/circuitboard/telecomms/processor, +/obj/item/circuitboard/telecomms/receiver, +/obj/item/circuitboard/telecomms/server, +/obj/item/circuitboard/telecomms/server, +/obj/item/circuitboard/telecomms/bus, +/obj/item/circuitboard/telecomms/bus, +/obj/item/circuitboard/telecomms/broadcaster, +/obj/item/circuitboard/telecomms/exonet_node, /obj/machinery/camera/network/telecom{ c_tag = "Tcoms - Storage" }, @@ -9501,7 +9501,7 @@ "atw" = ( /obj/machinery/porta_turret/stationary, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -9836,7 +9836,7 @@ /area/hallway/primary/firstdeck/port) "auf" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -10194,9 +10194,9 @@ /area/hallway/primary/firstdeck/elevator) "auI" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, /obj/machinery/light{ dir = 8 }, @@ -10208,9 +10208,9 @@ /area/tcomm/tcomstorage) "auK" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/analyzer, -/obj/item/weapon/stock_parts/subspace/analyzer, -/obj/item/weapon/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, /turf/simulated/floor, /area/tcomm/tcomstorage) "auL" = ( @@ -10331,7 +10331,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/starboard) "auW" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -10859,14 +10859,14 @@ name = "defibrillator closet"; pixel_y = 31 }, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled/white, /area/medical/first_aid_station/firstdeck) "avM" = ( /obj/structure/table/steel, /obj/machinery/cell_charger, /obj/random/tech_supply, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/random/powercell, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/alarm{ @@ -10965,9 +10965,9 @@ /area/medical/first_aid_station/firstdeck) "avT" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, /obj/structure/cable/cyan{ d2 = 4; icon_state = "0-4" @@ -11473,7 +11473,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/port) "awF" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -11625,7 +11625,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/firstdeck/port) "awV" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -11723,7 +11723,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/random/medical/lite, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -11739,8 +11739,8 @@ /obj/effect/floor_decal/corner/paleblue/border, /obj/item/roller, /obj/item/bodybag/cryobag, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/pill_bottle/spaceacillin, +/obj/item/storage/firstaid/regular, +/obj/item/storage/pill_bottle/spaceacillin, /turf/simulated/floor/tiled/white, /area/medical/first_aid_station/firstdeck) "axg" = ( @@ -11748,12 +11748,12 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/device/radio{ +/obj/item/radio{ frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link" }, -/obj/item/device/radio{ +/obj/item/radio{ frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link" @@ -11777,7 +11777,7 @@ /turf/simulated/floor/tiled/white, /area/medical/first_aid_station/firstdeck) "axi" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -11792,8 +11792,8 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, /obj/item/roller, /obj/item/roller, /obj/effect/floor_decal/borderfloorwhite, @@ -11812,15 +11812,15 @@ /turf/simulated/floor, /area/tcomm/tcomstorage) "axl" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, /area/tcomm/tcomstorage) "axm" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, /turf/simulated/floor, /area/tcomm/tcomstorage) "axn" = ( @@ -12009,8 +12009,8 @@ }, /obj/item/roller, /obj/item/bodybag/cryobag, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/pill_bottle/spaceacillin, +/obj/item/storage/firstaid/regular, +/obj/item/storage/pill_bottle/spaceacillin, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/starboard) "axE" = ( @@ -12309,17 +12309,17 @@ /area/hallway/primary/firstdeck/elevator) "ayo" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/transmitter, -/obj/item/weapon/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter, /turf/simulated/floor, /area/tcomm/tcomstorage) "ayp" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/sub_filter, -/obj/item/weapon/stock_parts/subspace/sub_filter, -/obj/item/weapon/stock_parts/subspace/sub_filter, -/obj/item/weapon/stock_parts/subspace/sub_filter, -/obj/item/weapon/stock_parts/subspace/sub_filter, +/obj/item/stock_parts/subspace/sub_filter, +/obj/item/stock_parts/subspace/sub_filter, +/obj/item/stock_parts/subspace/sub_filter, +/obj/item/stock_parts/subspace/sub_filter, +/obj/item/stock_parts/subspace/sub_filter, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -12327,9 +12327,9 @@ /area/tcomm/tcomstorage) "ayq" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -12542,8 +12542,8 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralstarboard) "ayO" = ( -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/double, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, @@ -12579,7 +12579,7 @@ /obj/effect/decal/cleanable/blood/oil/streak{ amount = 0 }, -/obj/item/weapon/tool/wirecutters, +/obj/item/tool/wirecutters, /obj/machinery/light{ dir = 1 }, @@ -12648,11 +12648,11 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftport) "azd" = ( -/obj/item/device/multitool, -/obj/item/device/multitool, -/obj/item/device/assembly/prox_sensor, -/obj/item/device/flashlight, -/obj/item/weapon/storage/backpack, +/obj/item/multitool, +/obj/item/multitool, +/obj/item/assembly/prox_sensor, +/obj/item/flashlight, +/obj/item/storage/backpack, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, /obj/random/crate, @@ -12887,7 +12887,7 @@ /obj/random/maintenance/research, /obj/random/maintenance/research, /obj/random/maintenance/clean, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftstarboard) "azD" = ( @@ -12903,7 +12903,7 @@ "azE" = ( /obj/structure/closet, /obj/item/clothing/glasses/welding, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance/research, /obj/random/maintenance/research, @@ -12911,7 +12911,7 @@ /area/maintenance/firstdeck/aftstarboard) "azF" = ( /obj/structure/closet, -/obj/item/weapon/lipstick/purple, +/obj/item/lipstick/purple, /obj/random/maintenance/engineering, /obj/random/maintenance/engineering, /obj/random/maintenance/clean, @@ -12919,7 +12919,7 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftstarboard) "azG" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -12996,8 +12996,8 @@ /area/construction/firstdeck/construction3) "azM" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/mime, -/obj/item/weapon/pen/crayon/mime, +/obj/item/bedsheet/mime, +/obj/item/pen/crayon/mime, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor, /area/construction/firstdeck/construction3) @@ -13296,7 +13296,7 @@ /area/tcomm/entrance) "aAw" = ( /obj/structure/table/standard, -/obj/item/weapon/cell, +/obj/item/cell, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, @@ -13552,11 +13552,11 @@ "aAU" = ( /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -13617,7 +13617,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -13694,7 +13694,7 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralport) "aBh" = ( -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralport) "aBi" = ( @@ -13717,7 +13717,7 @@ /obj/random/maintenance/clean, /obj/random/tech_supply, /obj/random/tech_supply, -/obj/item/weapon/airlock_electronics, +/obj/item/airlock_electronics, /obj/item/stack/cable_coil/random, /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralport) @@ -13732,7 +13732,7 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralport) "aBn" = ( -/obj/item/device/flashlight, +/obj/item/flashlight, /obj/random/crate, /turf/simulated/floor/plating, /area/construction/firstdeck/construction2) @@ -13994,8 +13994,8 @@ /area/hallway/primary/firstdeck/elevator) "aBL" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -14289,8 +14289,8 @@ /area/hallway/secondary/escape/firstdeck/ep_starboard2) "aCo" = ( /obj/structure/closet/wardrobe/grey, -/obj/item/weapon/storage/backpack, -/obj/item/weapon/storage/backpack, +/obj/item/storage/backpack, +/obj/item/storage/backpack, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, @@ -14371,7 +14371,7 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/mininglockerroom) "aCA" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -14405,8 +14405,8 @@ dir = 8 }, /obj/item/clothing/mask/breath, -/obj/item/weapon/mining_scanner, -/obj/item/weapon/rig/industrial/equipped, +/obj/item/mining_scanner, +/obj/item/rig/industrial/equipped, /obj/machinery/door/window/southleft{ name = "Mining Suits"; req_access = list(50) @@ -14432,7 +14432,7 @@ health = 1e+006 }, /obj/item/clothing/mask/breath, -/obj/item/weapon/mining_scanner, +/obj/item/mining_scanner, /obj/item/clothing/suit/space/void/mining, /obj/item/clothing/head/helmet/space/void/mining, /obj/structure/table/rack{ @@ -14544,12 +14544,12 @@ name = "parachute crate"; req_access = list(67) }, -/obj/item/weapon/storage/backpack/parachute, -/obj/item/weapon/storage/backpack/parachute, -/obj/item/weapon/storage/backpack/parachute, -/obj/item/weapon/storage/backpack/parachute, -/obj/item/weapon/storage/backpack/parachute, -/obj/item/weapon/storage/backpack/parachute, +/obj/item/storage/backpack/parachute, +/obj/item/storage/backpack/parachute, +/obj/item/storage/backpack/parachute, +/obj/item/storage/backpack/parachute, +/obj/item/storage/backpack/parachute, +/obj/item/storage/backpack/parachute, /turf/simulated/floor/tiled/techmaint, /area/ai_monitored/storage/eva/pilot) "aCL" = ( @@ -14811,8 +14811,8 @@ /obj/structure/closet/crate, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/wirecutters, +/obj/item/tool/crowbar, +/obj/item/tool/wirecutters, /obj/random/maintenance/medical, /obj/random/maintenance/medical, /obj/structure/catwalk, @@ -15040,7 +15040,7 @@ "aDD" = ( /obj/structure/table/steel_reinforced, /obj/item/clothing/accessory/armband/cargo, -/obj/item/device/retail_scanner/cargo, +/obj/item/retail_scanner/cargo, /obj/machinery/requests_console{ department = "Cargo Bay"; departmentType = 2; @@ -15056,11 +15056,11 @@ /area/quartermaster/storage) "aDE" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/stamp{ +/obj/item/stamp{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/stamp/cargo, +/obj/item/stamp/cargo, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -15216,7 +15216,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/device/paicard, +/obj/item/paicard, /obj/item/clothing/head/soft/grey, /turf/simulated/floor/tiled/dark, /area/hallway/primary/firstdeck/elevator) @@ -15231,8 +15231,8 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/device/communicator, -/obj/item/weapon/hand_labeler, +/obj/item/communicator, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/dark, /area/hallway/primary/firstdeck/elevator) "aDY" = ( @@ -15391,7 +15391,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -15453,7 +15453,7 @@ /area/maintenance/firstdeck/aftstarboard) "aEm" = ( /obj/structure/closet, -/obj/item/weapon/storage/backpack, +/obj/item/storage/backpack, /obj/random/maintenance/medical, /obj/random/maintenance/medical, /obj/random/maintenance/medical, @@ -15524,7 +15524,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -15774,9 +15774,9 @@ /area/quartermaster/storage) "aER" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, -/obj/item/weapon/hand_labeler, +/obj/item/folder/yellow, +/obj/item/pen, +/obj/item/hand_labeler, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -15999,10 +15999,10 @@ /area/maintenance/firstdeck/aftstarboard) "aFv" = ( /obj/structure/table/rack, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/mask/gas, -/obj/item/device/flashlight, +/obj/item/flashlight, /obj/item/clothing/glasses/meson, /obj/random/maintenance/cargo, /turf/simulated/floor, @@ -16385,7 +16385,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/elevator) "aGn" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -16424,8 +16424,8 @@ "aGq" = ( /obj/structure/closet/crate, /obj/item/clothing/glasses/night, -/obj/item/device/aicard, -/obj/item/device/multitool, +/obj/item/aicard, +/obj/item/multitool, /turf/simulated/floor/tiled/dark, /area/tcomm/entrance) "aGr" = ( @@ -16450,7 +16450,7 @@ /obj/structure/table/rack{ dir = 1 }, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/random/maintenance/medical, /obj/random/maintenance/medical, /obj/random/cash, @@ -16582,11 +16582,11 @@ /obj/structure/table/rack{ dir = 1 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled, @@ -16595,10 +16595,10 @@ /obj/structure/table/rack{ dir = 1 }, -/obj/item/weapon/pickaxe{ +/obj/item/pickaxe{ pixel_x = 5 }, -/obj/item/weapon/shovel{ +/obj/item/shovel{ pixel_x = -5 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -16640,7 +16640,7 @@ dir = 1; pixel_y = -22 }, -/obj/item/weapon/stool, +/obj/item/stool, /obj/effect/landmark/start{ name = "Shaft Miner" }, @@ -16650,7 +16650,7 @@ /area/quartermaster/mininglockerroom) "aGQ" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -16663,8 +16663,8 @@ /area/quartermaster/mininglockerroom) "aGR" = ( /obj/structure/table/steel, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /obj/machinery/requests_console{ department = "Cargo Bay"; departmentType = 2; @@ -16774,7 +16774,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -16851,10 +16851,10 @@ /area/shuttle/large_escape_pod1/station) "aHo" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -4 }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/random/medical/lite, /obj/structure/closet/walllocker/emerglocker{ pixel_y = -32 @@ -16863,11 +16863,11 @@ /area/shuttle/large_escape_pod1/station) "aHp" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, @@ -16877,30 +16877,30 @@ /obj/item/bodybag/cryobag{ pixel_x = 5 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/box/masks, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire{ layer = 2.9; pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = -2 }, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, /obj/machinery/light, /turf/simulated/shuttle/floor/white, /area/shuttle/large_escape_pod1/station) @@ -16912,7 +16912,7 @@ /area/shuttle/large_escape_pod1/station) "aHr" = ( /obj/machinery/sleep_console, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 1; pixel_y = -21 }, @@ -16939,7 +16939,7 @@ /obj/structure/bed/chair{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -17217,7 +17217,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "aIb" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -17231,7 +17231,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "aIc" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -18373,7 +18373,7 @@ /area/hallway/primary/firstdeck/ascenter) "aKd" = ( /obj/item/inflatable/door/torn, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /turf/simulated/floor, /area/maintenance/firstdeck/aftstarboard) "aKe" = ( @@ -18760,9 +18760,9 @@ /turf/simulated/floor/plating, /area/storage/emergency_storage/firstdeck/as_emergency) "aKW" = ( -/obj/item/device/t_scanner, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/t_scanner, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/structure/table/steel, /obj/random/maintenance/engineering, /obj/random/maintenance/clean, @@ -18784,7 +18784,7 @@ /area/shuttle/shuttle2/start) "aLa" = ( /obj/structure/bed/chair/shuttle, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -19248,8 +19248,8 @@ /area/maintenance/substation/firstdeck/cargo) "aMc" = ( /obj/structure/closet/crate/hydroponics, -/obj/item/weapon/material/knife/machete/hatchet, -/obj/item/weapon/material/minihoe, +/obj/item/material/knife/machete/hatchet, +/obj/item/material/minihoe, /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftport) "aMd" = ( @@ -19258,7 +19258,7 @@ /area/maintenance/firstdeck/aftport) "aMe" = ( /obj/structure/table/steel, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/random/maintenance/cargo, /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftport) @@ -19303,11 +19303,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/robotics{ +/obj/item/circuitboard/robotics{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/mecha_control{ +/obj/item/circuitboard/mecha_control{ pixel_x = 1; pixel_y = -1 }, @@ -19318,15 +19318,15 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/crew{ +/obj/item/circuitboard/crew{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/card{ +/obj/item/circuitboard/card{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/communications{ +/obj/item/circuitboard/communications{ pixel_x = 5; pixel_y = -5 }, @@ -19348,11 +19348,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/borgupload{ +/obj/item/circuitboard/borgupload{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/aiupload{ +/obj/item/circuitboard/aiupload{ pixel_x = 2; pixel_y = -2 }, @@ -19396,7 +19396,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/engineering/auxiliary_engineering) "aMs" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -19596,7 +19596,7 @@ /area/quartermaster/storage) "aMO" = ( /obj/effect/decal/cleanable/generic, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/floor/plating, @@ -19793,8 +19793,8 @@ "aNl" = ( /obj/structure/table/reinforced, /obj/machinery/light, -/obj/item/device/gps, -/obj/item/device/gps{ +/obj/item/gps, +/obj/item/gps{ pixel_x = 3; pixel_y = 3 }, @@ -19807,7 +19807,7 @@ "aNn" = ( /obj/structure/table/reinforced, /obj/machinery/light, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -20043,8 +20043,8 @@ /turf/simulated/floor, /area/storage/tech) "aNJ" = ( -/obj/item/weapon/module/power_control, -/obj/item/weapon/airlock_electronics, +/obj/item/module/power_control, +/obj/item/airlock_electronics, /obj/structure/table/steel, /turf/simulated/floor/plating, /area/storage/tech) @@ -20053,14 +20053,14 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, /obj/item/clothing/gloves/yellow, -/obj/item/device/t_scanner, +/obj/item/t_scanner, /obj/item/clothing/glasses/meson, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/plating, /area/storage/tech) "aNL" = ( @@ -20093,30 +20093,30 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, /turf/simulated/floor/plating, /area/storage/tech) "aNP" = ( -/obj/item/device/aicard, -/obj/item/weapon/aiModule/reset, +/obj/item/aicard, +/obj/item/aiModule/reset, /obj/structure/table/steel, /turf/simulated/floor/plating, /area/storage/tech) "aNQ" = ( -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 1; pixel_y = 5 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 1; pixel_y = 5 }, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, /obj/structure/table/steel, /turf/simulated/floor/plating, /area/storage/tech) @@ -20420,11 +20420,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, -/obj/item/device/multitool, +/obj/item/multitool, /obj/item/clothing/glasses/meson, /turf/simulated/floor/plating, /area/storage/tech) @@ -20433,10 +20433,10 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/rdconsole, -/obj/item/weapon/circuitboard/destructive_analyzer, -/obj/item/weapon/circuitboard/protolathe, -/obj/item/weapon/circuitboard/rdserver{ +/obj/item/circuitboard/rdconsole, +/obj/item/circuitboard/destructive_analyzer, +/obj/item/circuitboard/protolathe, +/obj/item/circuitboard/rdserver{ pixel_x = 3; pixel_y = -3 }, @@ -20465,7 +20465,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -20477,8 +20477,8 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/security/mining, -/obj/item/weapon/circuitboard/autolathe{ +/obj/item/circuitboard/security/mining, +/obj/item/circuitboard/autolathe{ pixel_x = 3; pixel_y = -3 }, @@ -20489,19 +20489,19 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/circuitboard/autolathe, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/console_screen, +/obj/item/circuitboard/autolathe, /turf/simulated/floor, /area/storage/tech) "aOI" = ( /obj/structure/table/steel, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = -5 }, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = 5 }, /obj/machinery/requests_console{ @@ -20529,7 +20529,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/aft) "aOK" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -20629,7 +20629,7 @@ dir = 8 }, /obj/machinery/portable_atmospherics/canister/empty, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -20789,7 +20789,7 @@ /area/storage/tech) "aPp" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/bag/circuits/basic, +/obj/item/storage/bag/circuits/basic, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -20888,7 +20888,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 6 }, @@ -21046,8 +21046,8 @@ /obj/machinery/cell_charger{ pixel_y = 5 }, -/obj/item/device/multitool, -/obj/item/weapon/cell/high{ +/obj/item/multitool, +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -21060,15 +21060,15 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/secure_data{ +/obj/item/circuitboard/secure_data{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/security{ +/obj/item/circuitboard/security{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/skills{ +/obj/item/circuitboard/skills{ pixel_x = 4; pixel_y = -3 }, @@ -21079,8 +21079,8 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/unary_atmos/heater, -/obj/item/weapon/circuitboard/unary_atmos/cooler{ +/obj/item/circuitboard/unary_atmos/heater, +/obj/item/circuitboard/unary_atmos/cooler{ pixel_x = 3; pixel_y = -3 }, @@ -21092,16 +21092,16 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/powermonitor{ +/obj/item/circuitboard/powermonitor{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/stationalert_engineering{ +/obj/item/circuitboard/stationalert_engineering{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/security/engineering, -/obj/item/weapon/circuitboard/atmos_alert{ +/obj/item/circuitboard/security/engineering, +/obj/item/circuitboard/atmos_alert{ pixel_x = 3; pixel_y = -3 }, @@ -21157,11 +21157,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/cloning, -/obj/item/weapon/circuitboard/clonescanner, -/obj/item/weapon/circuitboard/clonepod, -/obj/item/weapon/circuitboard/scan_consolenew, -/obj/item/weapon/circuitboard/med_data{ +/obj/item/circuitboard/cloning, +/obj/item/circuitboard/clonescanner, +/obj/item/circuitboard/clonepod, +/obj/item/circuitboard/scan_consolenew, +/obj/item/circuitboard/med_data{ pixel_x = 3; pixel_y = -3 }, @@ -21172,7 +21172,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/message_monitor{ +/obj/item/circuitboard/message_monitor{ pixel_x = 3; pixel_y = -3 }, @@ -21184,10 +21184,10 @@ dir = 8; layer = 2.9 }, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, +/obj/item/analyzer/plant_analyzer, +/obj/item/healthanalyzer, +/obj/item/analyzer, +/obj/item/analyzer, /turf/simulated/floor/plating, /area/storage/tech) "aPX" = ( @@ -21306,7 +21306,7 @@ /area/engineering/auxiliary_engineering) "aQg" = ( /obj/item/stack/cable_coil/yellow, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/plating, /area/engineering/auxiliary_engineering) "aQh" = ( @@ -21967,7 +21967,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -22056,7 +22056,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -22247,7 +22247,7 @@ }, /area/shuttle/escape_pod3/station) "aRL" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/item/stack/cable_coil/random, /obj/machinery/light_construct, /obj/machinery/light_construct, @@ -22329,7 +22329,7 @@ name = "defibrillator closet"; pixel_x = -31 }, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/aft) "aRU" = ( @@ -22348,8 +22348,8 @@ }, /obj/item/roller, /obj/item/bodybag/cryobag, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/pill_bottle/spaceacillin, +/obj/item/storage/firstaid/regular, +/obj/item/storage/pill_bottle/spaceacillin, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/aft) "aRV" = ( @@ -22458,7 +22458,7 @@ /obj/structure/bed/chair{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -22534,9 +22534,9 @@ /area/hallway/secondary/escape/firstdeck/ep_aftport) "aSo" = ( /obj/structure/table/standard, -/obj/item/device/t_scanner, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/t_scanner, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/plating, /area/storage/emergency_storage/firstdeck/aft_emergency) "aSp" = ( @@ -22675,7 +22675,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -22919,7 +22919,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -22965,7 +22965,7 @@ dir = 4 }, /obj/structure/closet/emcloset, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -23012,13 +23012,13 @@ /area/security/checkpoint3) "aTe" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/pen, -/obj/item/device/flash, +/obj/item/tool/crowbar, +/obj/item/pen, +/obj/item/flash, /obj/machinery/light{ dir = 8 }, @@ -23056,7 +23056,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -23195,7 +23195,7 @@ /turf/simulated/floor/tiled/monotile, /area/security/checkpoint3) "aTz" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -23299,7 +23299,7 @@ /obj/structure/bed/chair{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -23529,7 +23529,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -23595,7 +23595,7 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -23932,7 +23932,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -24833,8 +24833,8 @@ /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/melee/baton/loaded, +/obj/item/shield/riot, +/obj/item/melee/baton/loaded, /obj/effect/floor_decal/corner/red/full{ dir = 8 }, @@ -24855,8 +24855,8 @@ /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/melee/baton/loaded, +/obj/item/shield/riot, +/obj/item/melee/baton/loaded, /obj/effect/floor_decal/corner/red{ dir = 5 }, @@ -24878,8 +24878,8 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/void/security, /obj/item/clothing/head/helmet/space/void/security, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/oxygen, +/obj/item/suit_cooling_unit, +/obj/item/tank/oxygen, /obj/effect/floor_decal/corner/white{ dir = 1 }, @@ -24900,8 +24900,8 @@ /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/melee/baton/loaded, +/obj/item/shield/riot, +/obj/item/melee/baton/loaded, /obj/effect/floor_decal/corner/red{ dir = 5 }, @@ -24922,8 +24922,8 @@ /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/melee/baton/loaded, +/obj/item/shield/riot, +/obj/item/melee/baton/loaded, /obj/effect/floor_decal/corner/red/full{ dir = 1 }, @@ -25046,11 +25046,11 @@ /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/gun, +/obj/item/gun/energy/gun, /obj/machinery/door/window/brigdoor/southleft{ name = "Energy" }, @@ -25071,10 +25071,10 @@ /obj/effect/floor_decal/corner/blue{ dir = 5 }, -/obj/item/weapon/gun/energy/ionrifle{ +/obj/item/gun/energy/ionrifle{ pixel_y = -3 }, -/obj/item/weapon/gun/energy/ionrifle{ +/obj/item/gun/energy/ionrifle{ pixel_x = -2; pixel_y = -5 }, @@ -25098,11 +25098,11 @@ /obj/effect/floor_decal/corner/green/full{ dir = 1 }, -/obj/item/weapon/gun/projectile/shotgun/pump{ +/obj/item/gun/projectile/shotgun/pump{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, /obj/machinery/door/window/brigdoor/southleft{ name = "Ballistics" }, @@ -25159,16 +25159,16 @@ pixel_x = -24 }, /obj/structure/table/steel, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, @@ -25309,12 +25309,12 @@ /area/security/prison) "aXc" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -25327,8 +25327,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/material/minihoe, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/material/minihoe, +/obj/item/analyzer/plant_analyzer, /obj/item/clothing/head/greenbandana, /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -25337,7 +25337,7 @@ /area/security/prison) "aXe" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -25410,7 +25410,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/tiled/dark, /area/security/armoury) "aXp" = ( @@ -25423,12 +25423,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/item/weapon/stool, +/obj/item/stool, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/dark, /area/security/armoury) "aXq" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/tiled/dark, /area/security/armoury) "aXr" = ( @@ -25522,18 +25522,18 @@ /area/security/security_restroom) "aXB" = ( /obj/structure/table/standard, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, /obj/machinery/recharger/wallcharger{ pixel_x = -24; pixel_y = -4 @@ -25544,7 +25544,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 9 }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled, /area/security/security_lockerroom) "aXC" = ( @@ -25611,7 +25611,7 @@ /area/security/prison) "aXJ" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -25697,11 +25697,11 @@ /area/security/armoury) "aXS" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/empslite{ +/obj/item/storage/box/empslite{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, @@ -25727,7 +25727,7 @@ /obj/item/clothing/glasses/sunglasses/sechud/tactical, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 5 }, /turf/simulated/floor/tiled/dark, @@ -25739,15 +25739,15 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 8; pixel_y = 6 }, -/obj/item/weapon/storage/box/chemimp{ +/obj/item/storage/box/chemimp{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/storage/box/trackimp, +/obj/item/storage/box/trackimp, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/dark, /area/security/armoury) @@ -25845,11 +25845,11 @@ /area/security/security_restroom) "aYd" = ( /obj/structure/table/standard, -/obj/item/device/taperecorder, -/obj/item/device/tape, -/obj/item/device/megaphone, -/obj/item/weapon/packageWrap, -/obj/item/weapon/storage/box, +/obj/item/taperecorder, +/obj/item/rectape, +/obj/item/megaphone, +/obj/item/packageWrap, +/obj/item/storage/box, /obj/machinery/recharger/wallcharger{ pixel_x = -24; pixel_y = -4 @@ -25932,7 +25932,7 @@ dir = 4 }, /obj/random/cigarettes, -/obj/item/weapon/flame/lighter/zippo, +/obj/item/flame/lighter/zippo, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -25957,7 +25957,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, /obj/item/clothing/suit/storage/apron/overalls, /obj/machinery/camera/network/prison{ c_tag = "SEC - Brig Dormitories"; @@ -26004,8 +26004,8 @@ /area/security/prison) "aYs" = ( /obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/soap/nanotrasen, +/obj/item/mop, +/obj/item/soap/nanotrasen, /obj/machinery/light/small{ dir = 4 }, @@ -26055,11 +26055,11 @@ /obj/effect/floor_decal/corner/red/full{ dir = 1 }, -/obj/item/weapon/storage/box/flashshells, -/obj/item/weapon/storage/box/beanbags, -/obj/item/weapon/storage/box/beanbags, -/obj/item/weapon/storage/box/stunshells, -/obj/item/weapon/storage/box/stunshells, +/obj/item/storage/box/flashshells, +/obj/item/storage/box/beanbags, +/obj/item/storage/box/beanbags, +/obj/item/storage/box/stunshells, +/obj/item/storage/box/stunshells, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -26167,10 +26167,10 @@ /obj/effect/floor_decal/corner/green/full{ dir = 4 }, -/obj/item/weapon/storage/box/shotgunshells, -/obj/item/weapon/storage/box/shotgunshells, -/obj/item/weapon/storage/box/shotgunammo, -/obj/item/weapon/storage/box/shotgunammo, +/obj/item/storage/box/shotgunshells, +/obj/item/storage/box/shotgunshells, +/obj/item/storage/box/shotgunammo, +/obj/item/storage/box/shotgunammo, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45, @@ -26286,7 +26286,7 @@ /area/security/security_lockerroom) "aYO" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -26317,7 +26317,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/tiled, /area/security/prison) "aYS" = ( @@ -26412,7 +26412,7 @@ /area/security/armoury) "aZa" = ( /obj/effect/floor_decal/industrial/warning, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_x = 32; pixel_y = -21 @@ -26518,7 +26518,7 @@ pixel_x = 11; pixel_y = -24 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_x = 32; pixel_y = -21 @@ -26793,29 +26793,29 @@ /area/security/security_restroom) "aZH" = ( /obj/structure/table/standard, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#ff0000"; name = "red towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#ff0000"; name = "red towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#ff0000"; name = "red towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#ff0000"; name = "red towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#ff0000"; name = "red towel" }, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/soap/nanotrasen, -/obj/item/device/radio/intercom{ +/obj/item/soap/nanotrasen, +/obj/item/soap/nanotrasen, +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -26825,7 +26825,7 @@ /turf/simulated/floor/tiled/freezer, /area/security/security_restroom) "aZI" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -26873,7 +26873,7 @@ pixel_y = -24 }, /obj/item/clothing/glasses/hud/security, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 8; icon_override = "secintercom"; pixel_x = 21 @@ -26929,7 +26929,7 @@ /turf/simulated/floor/tiled/airless, /area/rnd/test_area) "aZP" = ( -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/airless, /area/rnd/test_area) "aZQ" = ( @@ -26961,9 +26961,9 @@ /area/security/prison) "aZS" = ( /obj/structure/table/steel, -/obj/item/weapon/newspaper, -/obj/item/device/tape, -/obj/item/device/taperecorder{ +/obj/item/newspaper, +/obj/item/rectape, +/obj/item/taperecorder{ pixel_x = -4; pixel_y = 2 }, @@ -27026,8 +27026,8 @@ icon_state = "1-2" }, /obj/structure/table/steel, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled, /area/security/prison) "aZY" = ( @@ -27337,8 +27337,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/book/codex/corp_regs, -/obj/item/weapon/dice, +/obj/item/book/codex/corp_regs, +/obj/item/dice, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, @@ -27356,7 +27356,7 @@ id = "air_in"; use_power = 1 }, -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/tiled, /area/security/prison) "baI" = ( @@ -27748,7 +27748,7 @@ /area/security/main) "bbn" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -27762,7 +27762,7 @@ /turf/simulated/floor/tiled, /area/security/main) "bbo" = ( -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 8; icon_override = "secintercom"; pixel_x = 21 @@ -27771,7 +27771,7 @@ /obj/machinery/chemical_dispenser/bar_soft/full{ dir = 8 }, -/obj/item/weapon/storage/box/glasses/square, +/obj/item/storage/box/glasses/square, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -27901,7 +27901,7 @@ /turf/simulated/floor/tiled, /area/security/prison) "bbB" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; @@ -27979,7 +27979,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 1; pixel_y = -21 }, @@ -28028,10 +28028,10 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/gun/projectile/colt/detective, -/obj/item/weapon/gun/projectile/colt/detective, -/obj/item/weapon/gun/projectile/colt/detective, -/obj/item/weapon/gun/projectile/colt/detective, +/obj/item/gun/projectile/colt/detective, +/obj/item/gun/projectile/colt/detective, +/obj/item/gun/projectile/colt/detective, +/obj/item/gun/projectile/colt/detective, /obj/structure/cable/green{ d1 = 2; d2 = 4; @@ -28085,7 +28085,7 @@ /area/security/brig) "bbP" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/laundry_basket, +/obj/item/storage/laundry_basket, /turf/simulated/floor/tiled/dark, /area/security/evidence_storage) "bbQ" = ( @@ -28115,7 +28115,7 @@ name = "Evidence Closet" }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -28208,7 +28208,7 @@ "bca" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -28516,7 +28516,7 @@ /area/security/main) "bcD" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/item/clothing/glasses/hud/security, /obj/structure/cable/green{ d1 = 1; @@ -28529,11 +28529,11 @@ /area/security/main) "bcE" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/red, /area/security/main) "bcF" = ( @@ -28556,7 +28556,7 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /obj/effect/floor_decal/borderfloor/corner{ dir = 4 }, @@ -28585,7 +28585,7 @@ pixel_x = -3; pixel_y = -2 }, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /turf/simulated/floor/tiled, /area/security/range) "bcJ" = ( @@ -28607,7 +28607,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, /turf/simulated/floor/tiled, /area/security/range) "bcL" = ( @@ -28615,7 +28615,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, /turf/simulated/floor/tiled, /area/security/range) "bcM" = ( @@ -28661,7 +28661,7 @@ c_tag = "SEC - Brig Cell 2"; dir = 8 }, -/obj/item/device/radio/headset, +/obj/item/radio/headset, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -28696,7 +28696,7 @@ c_tag = "SEC - Brig Cell 1"; dir = 8 }, -/obj/item/device/radio/headset, +/obj/item/radio/headset, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -28775,7 +28775,7 @@ /obj/machinery/camera/network/security{ c_tag = "SEC - Warden's Office" }, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ pixel_y = 21 }, /turf/simulated/floor/tiled/dark, @@ -28801,15 +28801,15 @@ icon_state = "4-8" }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/book/codex/corp_regs, -/obj/item/weapon/stamp/denied{ +/obj/item/book/codex/corp_regs, +/obj/item/stamp/denied{ pixel_x = 5 }, -/obj/item/weapon/stamp/ward, -/obj/item/weapon/tool/crowbar, -/obj/item/device/radio/off, -/obj/item/weapon/tool/wrench, -/obj/item/device/retail_scanner/security, +/obj/item/stamp/ward, +/obj/item/tool/crowbar, +/obj/item/radio/off, +/obj/item/tool/wrench, +/obj/item/retail_scanner/security, /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/light{ dir = 1 @@ -28882,8 +28882,8 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/red, +/obj/item/folder/red, +/obj/item/folder/red, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -28897,7 +28897,7 @@ /turf/simulated/floor/tiled, /area/security/security_processing) "bdi" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -28933,15 +28933,15 @@ /area/security/security_processing) "bdl" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 2; pixel_y = 4 }, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 2; pixel_y = 4 }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -28980,7 +28980,7 @@ /area/security/main) "bdp" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -28996,7 +28996,7 @@ /area/security/main) "bdq" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -29182,7 +29182,7 @@ /turf/simulated/floor/tiled, /area/security/prison) "bdG" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -29225,13 +29225,13 @@ dir = 4; health = 1e+006 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/pen, /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/tiled/dark, /area/security/warden) @@ -29286,7 +29286,7 @@ /area/security/security_processing) "bdS" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/evidence, +/obj/item/storage/box/evidence, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -29325,12 +29325,12 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/book/codex/corp_regs, +/obj/item/book/codex/corp_regs, /turf/simulated/floor/tiled/red, /area/security/main) "bdV" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -29458,7 +29458,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; @@ -29492,7 +29492,7 @@ /area/security/range) "bee" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, @@ -29510,8 +29510,8 @@ pixel_y = -26 }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/box/blanks, -/obj/item/weapon/storage/box/blanks{ +/obj/item/storage/box/blanks, +/obj/item/storage/box/blanks{ pixel_x = 2; pixel_y = -2 }, @@ -29652,7 +29652,7 @@ name = "Visitation"; req_access = list(2) }, -/obj/item/weapon/book/codex/corp_regs, +/obj/item/book/codex/corp_regs, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -29782,7 +29782,7 @@ /area/security/security_processing) "beA" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -29793,8 +29793,8 @@ /area/security/security_processing) "beB" = ( /obj/structure/table/standard, -/obj/item/device/tape/random, -/obj/item/device/taperecorder, +/obj/item/rectape/random, +/obj/item/taperecorder, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -29810,11 +29810,11 @@ /area/security/security_processing) "beD" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/light{ dir = 4 }, @@ -29970,7 +29970,7 @@ /turf/simulated/floor/tiled, /area/security/security_cell_hallway) "beS" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -30024,7 +30024,7 @@ /turf/simulated/floor/tiled, /area/security/security_cell_hallway) "beV" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -30172,7 +30172,7 @@ dir = 4; health = 1e+006 }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/tiled/dark, /area/security/warden) @@ -30217,7 +30217,7 @@ /area/security/security_processing) "bfk" = ( /obj/structure/table/standard, -/obj/item/device/camera, +/obj/item/camera, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -30293,12 +30293,12 @@ /area/security/main) "bfs" = ( /obj/structure/table/standard, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 }, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/item/stack/medical/bruise_pack{ pixel_x = -4; pixel_y = 3 @@ -30333,12 +30333,12 @@ d2 = 2; icon_state = "0-2" }, -/obj/item/weapon/reagent_containers/syringe/inaprovaline, -/obj/item/weapon/reagent_containers/syringe/inaprovaline{ +/obj/item/reagent_containers/syringe/inaprovaline, +/obj/item/reagent_containers/syringe/inaprovaline{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe/inaprovaline{ +/obj/item/reagent_containers/syringe/inaprovaline{ pixel_y = 10 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -30351,7 +30351,7 @@ /area/security/aid_station) "bfu" = ( /obj/structure/table/standard, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 8; icon_override = "secintercom"; pixel_x = 21 @@ -30359,7 +30359,7 @@ /obj/item/bodybag/cryobag{ pixel_x = 6 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 5; pixel_y = 5 }, @@ -30381,7 +30381,7 @@ "bfw" = ( /obj/structure/closet/bombclosetsecurity, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -30409,7 +30409,7 @@ "bfy" = ( /obj/structure/closet/l3closet/security, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ pixel_y = 21 }, /obj/machinery/camera/network/security{ @@ -30559,7 +30559,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -31368,12 +31368,12 @@ /area/security/aid_station) "bhb" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/seccarts{ +/obj/item/storage/box/seccarts{ pixel_x = 3; pixel_y = 2 }, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, @@ -31426,11 +31426,11 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, /obj/machinery/door/window/northleft, /turf/simulated/floor/tiled, /area/security/security_ses) @@ -31441,9 +31441,9 @@ dir = 4; health = 1e+006 }, -/obj/item/weapon/reagent_containers/spray/pepper, -/obj/item/weapon/reagent_containers/spray/pepper, -/obj/item/weapon/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, /obj/machinery/door/window/northright, /turf/simulated/floor/tiled, /area/security/security_ses) @@ -31576,7 +31576,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -32312,7 +32312,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/plating, /area/security/riot_control) "bil" = ( @@ -32326,13 +32326,13 @@ /area/security/riot_control) "bim" = ( /obj/structure/table/steel, -/obj/item/weapon/pen, -/obj/item/weapon/paper, +/obj/item/pen, +/obj/item/paper, /obj/machinery/alarm{ dir = 4; pixel_x = -23 }, -/obj/item/device/radio/headset, +/obj/item/radio/headset, /turf/simulated/floor/tiled, /area/security/security_cell_hallway) "bin" = ( @@ -32355,26 +32355,26 @@ /area/security/security_cell_hallway) "bip" = ( /obj/structure/table/steel, -/obj/item/weapon/pen, -/obj/item/weapon/paper, +/obj/item/pen, +/obj/item/paper, /obj/machinery/alarm{ dir = 8; pixel_x = 22 }, -/obj/item/device/radio/headset, +/obj/item/radio/headset, /turf/simulated/floor/tiled, /area/security/security_cell_hallway) "biq" = ( /obj/structure/closet/secure_closet/brig, /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/light, -/obj/item/device/radio/headset, +/obj/item/radio/headset, /turf/simulated/floor/tiled/dark, /area/security/security_cell_hallway) "bir" = ( /obj/structure/closet/secure_closet/brig, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/device/radio/headset, +/obj/item/radio/headset, /turf/simulated/floor/tiled/dark, /area/security/security_cell_hallway) "bis" = ( @@ -32383,7 +32383,7 @@ /turf/simulated/floor/plating, /area/security/security_cell_hallway) "bit" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; @@ -33423,7 +33423,7 @@ dir = 1 }, /obj/machinery/portable_atmospherics/powered/scrubber, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/effect/floor_decal/industrial/warning{ dir = 6 }, @@ -33435,7 +33435,7 @@ "bjZ" = ( /obj/structure/table/reinforced, /obj/machinery/microscope, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ pixel_y = 21 }, /turf/simulated/floor/tiled/freezer, @@ -33450,7 +33450,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -33473,10 +33473,10 @@ pixel_x = -12; pixel_y = 24 }, -/obj/item/weapon/handcuffs, -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco, -/obj/item/device/tape/random, -/obj/item/device/taperecorder{ +/obj/item/handcuffs, +/obj/item/storage/fancy/cigarettes/dromedaryco, +/obj/item/rectape/random, +/obj/item/taperecorder{ pixel_x = -4; pixel_y = 2 }, @@ -33488,7 +33488,7 @@ /area/security/detectives_office) "bkd" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/machinery/camera/network/security{ c_tag = "SEC - Detective Office" }, @@ -33520,7 +33520,7 @@ /area/security/detectives_office) "bkg" = ( /obj/structure/closet/wardrobe/detective, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 8; icon_override = "secintercom"; pixel_x = 21 @@ -33531,7 +33531,7 @@ /turf/simulated/floor/lino, /area/security/detectives_office) "bkh" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -33561,7 +33561,7 @@ /obj/machinery/computer/secure_data{ dir = 8 }, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 8; icon_override = "secintercom"; pixel_x = 21 @@ -33626,7 +33626,7 @@ /turf/simulated/floor/tiled, /area/security/lobby) "bkp" = ( -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 8; icon_override = "secintercom"; pixel_x = 21 @@ -33898,7 +33898,7 @@ /area/security/riot_control) "bkO" = ( /obj/structure/table/steel, -/obj/item/device/t_scanner, +/obj/item/t_scanner, /obj/random/tech_supply, /obj/random/tech_supply, /turf/simulated/floor/plating, @@ -33936,7 +33936,7 @@ /turf/simulated/floor/tiled/white, /area/security/detectives_office) "bkT" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -33945,14 +33945,14 @@ /area/security/detectives_office) "bkU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/blue{ +/obj/item/folder/red, +/obj/item/folder/blue{ pixel_y = -3 }, -/obj/item/weapon/folder/yellow{ +/obj/item/folder/yellow{ pixel_y = -5 }, -/obj/item/weapon/storage/box/swabs{ +/obj/item/storage/box/swabs{ layer = 5 }, /obj/structure/disposalpipe/segment{ @@ -33968,8 +33968,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/reagent_containers/spray/pepper, -/obj/item/device/flash, +/obj/item/reagent_containers/spray/pepper, +/obj/item/flash, /turf/simulated/floor/lino, /area/security/detectives_office) "bkW" = ( @@ -33993,7 +33993,7 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "bkY" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -34008,10 +34008,10 @@ /area/security/detectives_office) "bla" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = 3 }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -2; pixel_y = -5 }, @@ -34062,7 +34062,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/book/codex/corp_regs, +/obj/item/book/codex/corp_regs, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -34081,11 +34081,11 @@ d2 = 4; icon_state = "1-4" }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, @@ -34143,7 +34143,7 @@ /area/crew_quarters/heads/sc/hos) "blm" = ( /obj/machinery/disposal, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 5; pixel_y = 28 }, @@ -34272,8 +34272,8 @@ /area/lawoffice) "blv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/clipboard, +/obj/item/clipboard, +/obj/item/clipboard, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, @@ -34688,8 +34688,8 @@ /area/security/detectives_office) "bmd" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/briefcase/crimekit, -/obj/item/weapon/storage/briefcase/crimekit, +/obj/item/storage/briefcase/crimekit, +/obj/item/storage/briefcase/crimekit, /turf/simulated/floor/tiled/freezer, /area/security/detectives_office) "bme" = ( @@ -34697,11 +34697,11 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/photo_album{ +/obj/item/storage/photo_album{ pixel_y = -10 }, -/obj/item/device/camera_film, -/obj/item/device/camera{ +/obj/item/camera_film, +/obj/item/camera{ desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; @@ -34712,8 +34712,8 @@ /area/security/detectives_office) "bmf" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/item/clothing/glasses/sunglasses, /turf/simulated/floor/carpet, /area/security/detectives_office) @@ -34880,7 +34880,7 @@ /area/crew_quarters/heads/sc/hos) "bmw" = ( /obj/structure/table/reinforced, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, @@ -34891,18 +34891,18 @@ /area/lawoffice) "bmx" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder{ +/obj/item/folder{ pixel_x = -4 }, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_y = 3 }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 5 }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/stamp/internalaffairs, -/obj/item/weapon/stamp/denied{ +/obj/item/folder/yellow, +/obj/item/stamp/internalaffairs, +/obj/item/stamp/denied{ pixel_x = 4; pixel_y = -2 }, @@ -34910,19 +34910,19 @@ /area/lawoffice) "bmy" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = -5; pixel_y = -1 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = -1; pixel_y = 3 }, -/obj/item/weapon/material/ashtray/plastic{ +/obj/item/material/ashtray/plastic{ pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -35138,7 +35138,7 @@ "bmW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -35190,9 +35190,9 @@ /obj/structure/closet{ name = "Evidence Closet" }, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/evidence, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/gloves, +/obj/item/storage/box/evidence, +/obj/item/storage/box/bodybags, /obj/machinery/alarm{ dir = 4; pixel_x = -22 @@ -35265,7 +35265,7 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "bnj" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -35356,7 +35356,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 10; pixel_y = 12 }, @@ -35370,8 +35370,8 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/folder/red, -/obj/item/weapon/stamp/hos, +/obj/item/folder/red, +/obj/item/stamp/hos, /obj/structure/table/reinforced, /turf/simulated/floor/carpet, /area/crew_quarters/heads/sc/hos) @@ -35386,14 +35386,14 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{ +/obj/item/reagent_containers/food/drinks/flask/barflask{ pixel_x = -4; pixel_y = 8 }, -/obj/item/device/tape/random, -/obj/item/device/taperecorder, -/obj/item/device/megaphone, -/obj/item/device/radio/off, +/obj/item/rectape/random, +/obj/item/taperecorder, +/obj/item/megaphone, +/obj/item/radio/off, /obj/machinery/light{ dir = 4 }, @@ -35634,8 +35634,8 @@ /area/security/detectives_office) "bof" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp/green, -/obj/item/device/radio/intercom{ +/obj/item/flashlight/lamp/green, +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -35763,7 +35763,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -35818,12 +35818,12 @@ name = "Head of Security RC"; pixel_x = 30 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/red_hos, -/obj/item/weapon/pen/multi, +/obj/item/folder/red_hos, +/obj/item/pen/multi, /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -35926,7 +35926,7 @@ /obj/item/honey_frame, /obj/item/honey_frame, /obj/item/bee_pack, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora) "boD" = ( @@ -36168,14 +36168,14 @@ /turf/simulated/floor/tiled/white, /area/security/detectives_office) "bpf" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/white, /area/security/detectives_office) "bpg" = ( /obj/structure/table/reinforced, -/obj/item/device/mass_spectrometer/adv, -/obj/item/device/reagent_scanner, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/mass_spectrometer/adv, +/obj/item/reagent_scanner, +/obj/item/reagent_containers/syringe, /turf/simulated/floor/tiled/freezer, /area/security/detectives_office) "bph" = ( @@ -36202,10 +36202,10 @@ /area/security/detectives_office) "bpk" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/handcuffs, -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco, -/obj/item/device/tape/random, -/obj/item/device/taperecorder{ +/obj/item/handcuffs, +/obj/item/storage/fancy/cigarettes/dromedaryco, +/obj/item/rectape/random, +/obj/item/taperecorder{ pixel_x = -4; pixel_y = 2 }, @@ -36245,7 +36245,7 @@ /area/security/lobby) "bpp" = ( /obj/structure/filingcabinet, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 4; icon_override = "secintercom"; pixel_x = -21 @@ -36312,24 +36312,24 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/sc/hos) "bpu" = ( -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = -4; pixel_y = 2 }, -/obj/item/device/camera{ +/obj/item/camera{ pixel_x = 3; pixel_y = -4 }, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/flash, +/obj/item/flash, +/obj/item/storage/secure/briefcase, /obj/structure/closet, -/obj/item/weapon/storage/secure/briefcase, -/obj/item/device/taperecorder{ +/obj/item/storage/secure/briefcase, +/obj/item/taperecorder{ pixel_x = -4; pixel_y = 2 }, -/obj/item/device/camera{ +/obj/item/camera{ pixel_x = 3; pixel_y = -4 }, @@ -36422,8 +36422,8 @@ }, /obj/machinery/meter, /obj/item/clothing/mask/gas, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /obj/random/maintenance/research, /obj/random/maintenance/cargo, /obj/random/maintenance/security, @@ -36659,8 +36659,8 @@ /area/security/detectives_office) "bqc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/spray/luminol, -/obj/item/device/uv_light, +/obj/item/reagent_containers/spray/luminol, +/obj/item/uv_light, /obj/item/clothing/gloves/sterile/latex, /obj/machinery/requests_console{ department = "Security"; @@ -36672,18 +36672,18 @@ /area/security/detectives_office) "bqd" = ( /obj/structure/table/reinforced, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; wires = 7 }, -/obj/item/weapon/forensics/sample_kit, +/obj/item/forensics/sample_kit, /turf/simulated/floor/tiled/freezer, /area/security/detectives_office) "bqe" = ( /obj/structure/table/reinforced, -/obj/item/weapon/forensics/sample_kit/powder, +/obj/item/forensics/sample_kit/powder, /turf/simulated/floor/tiled/freezer, /area/security/detectives_office) "bqf" = ( @@ -36697,7 +36697,7 @@ /turf/simulated/floor/lino, /area/security/detectives_office) "bqg" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 5; pixel_y = -26 }, @@ -36705,16 +36705,16 @@ /area/security/detectives_office) "bqh" = ( /obj/structure/bookcase, -/obj/item/weapon/book/codex/corp_regs, +/obj/item/book/codex/corp_regs, /turf/simulated/floor/lino, /area/security/detectives_office) "bqi" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/photo_album{ +/obj/item/storage/photo_album{ pixel_y = -10 }, -/obj/item/device/camera_film, -/obj/item/device/camera{ +/obj/item/camera_film, +/obj/item/camera{ desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; @@ -36726,8 +36726,8 @@ /area/security/detectives_office) "bqj" = ( /obj/structure/closet/secure_closet/detective, -/obj/item/weapon/reagent_containers/spray/pepper, -/obj/item/device/flash, +/obj/item/reagent_containers/spray/pepper, +/obj/item/flash, /turf/simulated/floor/lino, /area/security/detectives_office) "bqk" = ( @@ -36735,7 +36735,7 @@ /turf/simulated/floor/lino, /area/security/detectives_office) "bql" = ( -/obj/item/weapon/bedsheet/ian, +/obj/item/bedsheet/ian, /obj/item/clothing/suit/ianshirt, /turf/simulated/floor/plating, /area/security/lobby) @@ -36794,11 +36794,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -2; pixel_y = -5 }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = 3 }, /obj/machinery/status_display{ @@ -36846,7 +36846,7 @@ /area/lawoffice) "bqw" = ( /obj/structure/table/reinforced, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled/dark, @@ -36883,8 +36883,8 @@ /area/maintenance/security_starboard) "bqz" = ( /obj/structure/closet/wardrobe/grey, -/obj/item/weapon/storage/backpack, -/obj/item/weapon/storage/backpack, +/obj/item/storage/backpack, +/obj/item/storage/backpack, /obj/random/maintenance/security, /obj/random/maintenance/security, /obj/random/maintenance/clean, @@ -37028,8 +37028,8 @@ name_tag = "Atmospherics Subgrid" }, /obj/structure/table/rack, -/obj/item/weapon/tank/oxygen/yellow, -/obj/item/weapon/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, +/obj/item/tank/oxygen/yellow, /obj/machinery/alarm{ pixel_y = 23 }, @@ -37177,7 +37177,7 @@ /area/hallway/secondary/eva_hallway) "brl" = ( /obj/structure/table/glass, -/obj/item/weapon/book/codex/lore/vir, +/obj/item/book/codex/lore/vir, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/eva_hallway) "brm" = ( @@ -37308,7 +37308,7 @@ /obj/machinery/camera/network/engineering{ c_tag = "ENG - Atmospherics Central" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -37559,17 +37559,17 @@ /area/ai_monitored/storage/eva) "brZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, -/obj/item/device/multitool, +/obj/item/multitool, /obj/item/clothing/head/welding, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) @@ -37611,10 +37611,10 @@ /area/ai_monitored/storage/eva) "bsg" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/effect/floor_decal/industrial/warning, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -37624,11 +37624,11 @@ "bsh" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -37640,9 +37640,9 @@ pixel_x = 3; pixel_y = -7 }, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, /obj/effect/floor_decal/industrial/warning, /obj/item/stack/material/copper{ amount = 10 @@ -37720,7 +37720,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /obj/machinery/navbeacon/patrol{ location = "SEC"; next_patrol = "CH1" @@ -39547,11 +39547,11 @@ /area/maintenance/engineering) "bvH" = ( /obj/structure/closet/crate, -/obj/item/weapon/storage/backpack, -/obj/item/device/multitool, -/obj/item/device/multitool, -/obj/item/device/assembly/prox_sensor, -/obj/item/device/flashlight, +/obj/item/storage/backpack, +/obj/item/multitool, +/obj/item/multitool, +/obj/item/assembly/prox_sensor, +/obj/item/flashlight, /obj/random/maintenance/engineering, /obj/random/maintenance/engineering, /obj/random/maintenance/cargo, @@ -39574,15 +39574,15 @@ /obj/random/maintenance/engineering, /obj/random/maintenance/engineering, /obj/random/powercell, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /turf/simulated/floor/plating, /area/maintenance/engineering) "bvK" = ( /obj/structure/table/rack, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/mask/gas, -/obj/item/device/flashlight, +/obj/item/flashlight, /obj/item/clothing/glasses/meson, /obj/random/maintenance/cargo, /turf/simulated/floor, @@ -39615,7 +39615,7 @@ health = 1e+006 }, /obj/item/clothing/mask/breath, -/obj/item/weapon/rig/breacher, +/obj/item/rig/breacher, /obj/machinery/door/window/eastleft{ name = "E.V.A."; req_one_access = list(18) @@ -39626,14 +39626,14 @@ /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "bvO" = ( -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 6 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, /obj/structure/table/reinforced, @@ -39735,7 +39735,7 @@ /turf/simulated/wall, /area/maintenance/research) "bwa" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/landmark/start{ name = "Janitor" }, @@ -39799,20 +39799,20 @@ /turf/simulated/floor/tiled, /area/janitor) "bwe" = ( -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, /obj/machinery/requests_console{ department = "Janitorial"; departmentType = 1; pixel_y = 28 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/table/steel, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/storage/box/mousetraps, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/reagent_containers/spray/cleaner, /obj/machinery/newscaster{ pixel_x = 30 }, @@ -39898,15 +39898,15 @@ /area/storage/auxillary) "bwj" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/tape_roll{ +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/tape_roll{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/tape_roll, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/tape_roll, +/obj/item/packageWrap, +/obj/item/packageWrap, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -40010,9 +40010,9 @@ "bwt" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/structure/closet/crate/internals, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/double, /obj/random/tank, /obj/random/maintenance/research, /obj/random/maintenance/research, @@ -40226,7 +40226,7 @@ pixel_y = 24 }, /obj/structure/table/steel, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "The big blue box recently installed in here is a 'grid checker' which will shut off the power if a dangerous power spike from the engine erupts into the powernet. Shutting everything down protects everything from electrical damage, however the outages can be disruptive to colony operations, so it is designed to restore power after a somewhat significant delay, up to ten minutes or so. The grid checker can be manually hacked in order to end the outage sooner. To do that, you must cut three specific wires which do not cause a red light to shine, then pulse a fourth wire. Electrical protection is highly recommended when doing maintenance on the grid checker."; name = "grid checker info" }, @@ -40414,7 +40414,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/item/clothing/shoes/magboots, /obj/machinery/door/window/westright{ name = "E.V.A."; @@ -40435,7 +40435,7 @@ dir = 8; layer = 2.6 }, -/obj/item/weapon/rig/eva/equipped, +/obj/item/rig/eva/equipped, /obj/machinery/door/window/westright{ name = "Engineering Hardsuits"; req_one_access = list(11,24) @@ -40561,7 +40561,7 @@ /turf/simulated/floor/tiled, /area/janitor) "bxn" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/landmark/start{ name = "Janitor" }, @@ -40569,11 +40569,11 @@ /area/janitor) "bxo" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/camera/network/civilian{ c_tag = "CIV - Custodial Closet"; dir = 9 @@ -40630,16 +40630,16 @@ /area/storage/auxillary) "bxt" = ( /obj/structure/table/steel, -/obj/item/device/camera_film{ +/obj/item/camera_film{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/camera_film{ +/obj/item/camera_film{ pixel_x = -2; pixel_y = -2 }, -/obj/item/device/camera, -/obj/item/device/camera{ +/obj/item/camera, +/obj/item/camera{ pixel_x = 3; pixel_y = -4 }, @@ -41002,7 +41002,7 @@ c_tag = "ENG - Atmospherics Monitoring Room"; dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -41164,7 +41164,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/item/clothing/shoes/magboots, /obj/machinery/door/window/westleft{ name = "E.V.A."; @@ -41269,7 +41269,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -28 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -41350,15 +41350,15 @@ /area/storage/auxillary) "byF" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = -5; pixel_y = -1 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = -1; pixel_y = 3 }, @@ -41366,7 +41366,7 @@ c_tag = "CIV - Auxiliary Storage"; dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -41377,8 +41377,8 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 4 }, -/obj/item/weapon/storage/fancy/markers, -/obj/item/weapon/storage/fancy/markers, +/obj/item/storage/fancy/markers, +/obj/item/storage/fancy/markers, /turf/simulated/floor/tiled, /area/storage/auxillary) "byG" = ( @@ -41498,7 +41498,7 @@ /turf/simulated/floor/plating, /area/maintenance/research) "byU" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -41592,10 +41592,10 @@ pixel_x = 32 }, /obj/machinery/cell_charger, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 5 }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" @@ -41616,8 +41616,8 @@ }, /obj/item/clothing/gloves/black, /obj/item/clothing/gloves/black, -/obj/item/weapon/storage/belt/utility/atmostech, -/obj/item/weapon/storage/belt/utility/atmostech, +/obj/item/storage/belt/utility/atmostech, +/obj/item/storage/belt/utility/atmostech, /obj/machinery/camera/network/engineering{ c_tag = "ENG - Atmospherics Aft Port"; dir = 1 @@ -41635,7 +41635,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "bzh" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled, /area/engineering/atmos) "bzi" = ( @@ -41730,7 +41730,7 @@ /area/maintenance/engineering) "bzt" = ( /obj/structure/closet/toolcloset, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/simulated/floor/plating, /area/maintenance/engineering) "bzu" = ( @@ -41795,7 +41795,7 @@ dir = 8; pixel_x = -24 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -41876,8 +41876,8 @@ /area/storage/auxillary) "bzI" = ( /obj/structure/table/steel, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, +/obj/item/hand_labeler, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -42372,7 +42372,7 @@ dir = 1; pixel_y = -22 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -42430,7 +42430,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -42748,17 +42748,17 @@ /area/janitor) "bAY" = ( /obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, /turf/simulated/floor/tiled, /area/janitor) "bAZ" = ( /obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/device/radio/intercom{ +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -42807,10 +42807,10 @@ /area/storage/auxillary) "bBe" = ( /obj/structure/table/steel, -/obj/item/device/tape/random, -/obj/item/device/tape/random, -/obj/item/device/taperecorder, -/obj/item/device/taperecorder, +/obj/item/rectape/random, +/obj/item/rectape/random, +/obj/item/taperecorder, +/obj/item/taperecorder, /obj/structure/extinguisher_cabinet{ pixel_x = 28 }, @@ -42856,8 +42856,8 @@ /area/maintenance/research) "bBk" = ( /obj/structure/closet, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /obj/random/maintenance/security, /obj/random/maintenance/clean, /obj/random/maintenance/clean, @@ -43154,7 +43154,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -43169,13 +43169,13 @@ name = "Atmos RC"; pixel_y = -32 }, -/obj/item/device/t_scanner, -/obj/item/device/radio/headset/headset_eng, -/obj/item/weapon/cartridge/atmos, -/obj/item/weapon/cartridge/atmos, +/obj/item/t_scanner, +/obj/item/radio/headset/headset_eng, +/obj/item/cartridge/atmos, +/obj/item/cartridge/atmos, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/ears/earmuffs, -/obj/item/device/pipe_painter, +/obj/item/pipe_painter, /obj/machinery/light/spot, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -43544,8 +43544,8 @@ "bCB" = ( /obj/structure/table, /obj/item/stack/material/plastic, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/weldingtool/hugetank, +/obj/item/tool/wrench, +/obj/item/weldingtool/hugetank, /turf/simulated/floor/plating, /area/maintenance/research) "bCC" = ( @@ -43557,7 +43557,7 @@ /turf/simulated/floor/plating, /area/maintenance/research) "bCE" = ( -/obj/item/weapon/rig/hazmat/equipped, +/obj/item/rig/hazmat/equipped, /obj/structure/window/reinforced{ dir = 1 }, @@ -43644,21 +43644,21 @@ /area/crew_quarters/heads/sc/hor) "bCI" = ( /obj/structure/table/reinforced, -/obj/item/weapon/circuitboard/teleporter, -/obj/item/weapon/circuitboard/aicore{ +/obj/item/circuitboard/teleporter, +/obj/item/circuitboard/aicore{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/cartridge/signal/science, -/obj/item/weapon/cartridge/signal/science{ +/obj/item/cartridge/signal/science, +/obj/item/cartridge/signal/science{ pixel_x = -4; pixel_y = 2 }, -/obj/item/weapon/cartridge/signal/science{ +/obj/item/cartridge/signal/science{ pixel_x = 4; pixel_y = 6 }, -/obj/item/device/megaphone, +/obj/item/megaphone, /obj/machinery/requests_console{ announcementConsole = 1; department = "Research Director's Desk"; @@ -43694,7 +43694,7 @@ /area/rnd/research) "bCL" = ( /obj/structure/closet/secure_closet/scientist, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -43907,7 +43907,7 @@ pixel_y = 22; req_one_access = list(8,13,65) }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -44150,9 +44150,9 @@ dir = 1 }, /obj/item/clothing/suit/fire/firefighter, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, /obj/item/clothing/mask/gas, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/glasses/meson, /obj/random/maintenance/engineering, @@ -44171,8 +44171,8 @@ /area/maintenance/engineering) "bDK" = ( /obj/structure/closet/wardrobe/grey, -/obj/item/weapon/storage/backpack, -/obj/item/weapon/storage/backpack, +/obj/item/storage/backpack, +/obj/item/storage/backpack, /obj/random/maintenance/security, /obj/random/maintenance/security, /obj/random/maintenance/clean, @@ -44205,7 +44205,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/fscenter) "bDO" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -44410,14 +44410,14 @@ /area/crew_quarters/heads/sc/hor) "bEf" = ( /obj/structure/table/reinforced, -/obj/item/device/paicard{ +/obj/item/paicard{ pixel_x = 4 }, -/obj/item/device/tape, -/obj/item/device/taperecorder{ +/obj/item/rectape, +/obj/item/taperecorder{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/drinks/jar, +/obj/item/reagent_containers/food/drinks/jar, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -44569,7 +44569,7 @@ "bEz" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -44875,7 +44875,7 @@ /turf/simulated/floor/tiled, /area/engineering/engineer_eva) "bFc" = ( -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/structure/window/reinforced{ dir = 4; health = 1e+006 @@ -44912,7 +44912,7 @@ "bFe" = ( /obj/structure/closet, /obj/item/clothing/glasses/welding, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/shoes/boots/workboots, /obj/random/maintenance/engineering, @@ -45254,7 +45254,7 @@ /obj/structure/table/steel, /obj/machinery/cell_charger, /obj/item/stack/cable_coil, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -45306,8 +45306,8 @@ /area/crew_quarters/heads/sc/hor) "bFL" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white_rd, -/obj/item/weapon/stamp/rd{ +/obj/item/folder/white_rd, +/obj/item/stamp/rd{ pixel_x = 3; pixel_y = -2 }, @@ -45393,12 +45393,12 @@ /area/rnd/toxins_launch) "bFV" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen/multi, -/obj/item/weapon/paper/monitorkey, +/obj/item/pen/multi, +/obj/item/paper/monitorkey, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -45425,31 +45425,31 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#800080"; name = "purple towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#800080"; name = "purple towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#800080"; name = "purple towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#800080"; name = "purple towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#800080"; name = "purple towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#800080"; name = "purple towel" }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/random/soap, /obj/structure/cable/green{ d1 = 2; @@ -45471,7 +45471,7 @@ dir = 8; pixel_x = 22 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -45887,7 +45887,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 1 }, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/simulated/floor/tiled/dark, /area/rnd/workshop) "bGF" = ( @@ -46033,7 +46033,7 @@ /turf/simulated/floor/tiled, /area/engineering/engineer_eva) "bGR" = ( -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/structure/window/reinforced{ dir = 4; health = 1e+006 @@ -46160,7 +46160,7 @@ /turf/simulated/floor/plating, /area/storage/emergency_storage/seconddeck/fs_emergency) "bHg" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/structure/table/steel, /obj/random/maintenance/clean, /obj/random/maintenance/clean, @@ -46329,18 +46329,18 @@ /area/rnd/research) "bHu" = ( /obj/structure/table/glass, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/knife/machete/hatchet, -/obj/item/weapon/material/knife/machete/hatchet, +/obj/item/material/minihoe, +/obj/item/material/minihoe, +/obj/item/material/knife/machete/hatchet, +/obj/item/material/knife/machete/hatchet, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora) "bHv" = ( /obj/structure/sink/kitchen{ pixel_y = 28 }, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora) @@ -46376,7 +46376,7 @@ /area/rnd/storage) "bHz" = ( /obj/structure/closet/crate/hydroponics/exotic, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -46396,7 +46396,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, @@ -46698,7 +46698,7 @@ /turf/simulated/floor/tiled/dark, /area/engineering/hallway/atmos_hallway) "bIm" = ( -/obj/item/device/t_scanner, +/obj/item/t_scanner, /obj/structure/table/steel, /obj/machinery/alarm{ dir = 8; @@ -46751,7 +46751,7 @@ /obj/machinery/computer/atmos_alert{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -46783,7 +46783,7 @@ name = "Engineering Suits"; req_access = list(11) }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -46813,15 +46813,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 6 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_y = 3 }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/dark, /area/engineering/engineer_eva) "bIv" = ( @@ -46889,9 +46889,9 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "bIA" = ( -/obj/item/device/t_scanner, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/t_scanner, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/structure/table/steel, /obj/random/maintenance/engineering, /obj/random/maintenance/clean, @@ -47095,7 +47095,7 @@ /obj/machinery/computer/mecha{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -47186,7 +47186,7 @@ /area/rnd/research) "bIY" = ( /obj/structure/table/glass, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -47376,11 +47376,11 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/screwdriver{ +/obj/item/tool/wrench, +/obj/item/tool/screwdriver{ pixel_y = 10 }, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /obj/machinery/requests_console{ department = "Science"; departmentType = 2; @@ -47485,7 +47485,7 @@ dir = 1 }, /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/plating, /area/engineering/drone_fabrication) "bJD" = ( @@ -47528,7 +47528,7 @@ req_one_access = list(11,24) }, /obj/structure/table/steel, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/storage/fancy/cigarettes, /obj/random/maintenance/engineering, /obj/random/maintenance/engineering, /obj/random/maintenance/clean, @@ -47562,14 +47562,14 @@ /area/engineering/storage) "bJL" = ( /obj/structure/closet/crate, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil/super_capacity, -/obj/item/weapon/smes_coil/super_capacity, -/obj/item/weapon/smes_coil/super_io, -/obj/item/weapon/smes_coil/super_io, +/obj/item/circuitboard/smes, +/obj/item/circuitboard/smes, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil/super_capacity, +/obj/item/smes_coil/super_capacity, +/obj/item/smes_coil/super_io, +/obj/item/smes_coil/super_io, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light, /turf/simulated/floor/plating, @@ -47613,7 +47613,7 @@ /obj/structure/table/reinforced, /obj/structure/window/reinforced, /obj/machinery/recharger, -/obj/item/weapon/tape_roll, +/obj/item/tape_roll, /obj/machinery/button/remote/blast_door{ id = "englockdown"; name = "Engineering Lockdown"; @@ -47667,8 +47667,8 @@ "bJV" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, -/obj/item/weapon/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/packageWrap, +/obj/item/hand_labeler, /obj/machinery/button/remote/blast_door{ id = "atmoslockdown"; name = "Atmospherics Lockdown"; @@ -47695,11 +47695,11 @@ "bJX" = ( /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 6 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_y = 3 }, /obj/item/clamp, @@ -48841,7 +48841,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -49340,7 +49340,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -49610,7 +49610,7 @@ /area/engineering/engineer_eva) "bNp" = ( /obj/structure/closet/secure_closet/engineering_personal, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -49621,7 +49621,7 @@ /area/engineering/locker_room) "bNq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/item/bodybag/cryobag{ pixel_x = 6 }, @@ -49682,7 +49682,7 @@ /obj/machinery/camera/network/second_deck{ c_tag = "Second Deck - Center Eight" }, -/obj/item/weapon/book/codex/lore/vir, +/obj/item/book/codex/lore/vir, /turf/simulated/floor/tiled/hydro, /area/hallway/primary/seconddeck/fpcenter) "bNz" = ( @@ -49826,7 +49826,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -50457,7 +50457,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -50598,7 +50598,7 @@ /turf/simulated/floor/tiled/yellow, /area/engineering/locker_room) "bPf" = ( -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/simulated/floor/plating, /area/maintenance/engineering) "bPg" = ( @@ -50626,7 +50626,7 @@ "bPk" = ( /obj/structure/table/woodentable, /obj/effect/floor_decal/spline/plain, -/obj/item/device/communicator, +/obj/item/communicator, /turf/simulated/floor/tiled/hydro, /area/hallway/primary/seconddeck/fpcenter) "bPl" = ( @@ -50661,7 +50661,7 @@ /area/hallway/primary/seconddeck/fscenter) "bPo" = ( /obj/structure/table/woodentable, -/obj/item/device/paicard, +/obj/item/paicard, /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/hydro, /area/hallway/primary/seconddeck/fscenter) @@ -50980,7 +50980,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -51207,7 +51207,7 @@ "bQv" = ( /obj/machinery/disposal, /obj/effect/floor_decal/corner/white/diagonal, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -51566,13 +51566,13 @@ pixel_x = 11; pixel_y = 24 }, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/clothing/gloves/sterile/latex, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -51587,15 +51587,15 @@ "bRe" = ( /obj/structure/table/standard, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -51755,8 +51755,8 @@ /area/assembly/robotics) "bRo" = ( /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/device/radio/intercom{ +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -51772,21 +51772,21 @@ "bRp" = ( /obj/structure/table/standard, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, -/obj/item/weapon/pen/red, -/obj/item/weapon/pen/blue, +/obj/item/pen, +/obj/item/pen/red, +/obj/item/pen/blue, /obj/machinery/requests_console{ department = "Robotics"; departmentType = 2; name = "Robotics RC"; pixel_y = 30 }, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, -/obj/item/weapon/hand_labeler, +/obj/item/reagent_containers/glass/beaker/sulphuric, +/obj/item/hand_labeler, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -51816,13 +51816,13 @@ pixel_y = 32; req_access = list(29) }, -/obj/item/weapon/tank/anesthetic, -/obj/item/weapon/tank/anesthetic, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, +/obj/item/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/breath/medical, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/gloves, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, @@ -51860,7 +51860,7 @@ /area/assembly/robotics) "bRu" = ( /obj/machinery/disposal, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -51959,13 +51959,13 @@ /obj/structure/table/standard, /obj/structure/table/standard, /obj/item/stack/cable_coil, -/obj/item/device/multitool, +/obj/item/multitool, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -51978,7 +51978,7 @@ /area/rnd/misc_lab) "bRz" = ( /obj/structure/table/standard, -/obj/item/device/assembly/igniter, +/obj/item/assembly/igniter, /turf/simulated/floor/reinforced, /area/rnd/misc_lab) "bRA" = ( @@ -52893,9 +52893,9 @@ /area/assembly/robotics) "bTf" = ( /obj/structure/table/standard, -/obj/item/device/mmi, -/obj/item/device/mmi, -/obj/item/device/mmi, +/obj/item/mmi, +/obj/item/mmi, +/obj/item/mmi, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -52914,12 +52914,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/surgical/circular_saw, -/obj/item/weapon/surgical/scalpel{ +/obj/item/surgical/circular_saw, +/obj/item/surgical/scalpel{ pixel_y = 12 }, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/hemostat, +/obj/item/surgical/retractor, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, @@ -53055,7 +53055,7 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -53084,7 +53084,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/research) "bTt" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -53153,7 +53153,7 @@ /turf/simulated/floor/tiled, /area/rnd/mixing) "bTA" = ( -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/tiled, /area/rnd/mixing) "bTB" = ( @@ -53208,7 +53208,7 @@ "bTK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -53366,7 +53366,7 @@ /area/engineering/break_room) "bUf" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/manual/supermatter_engine{ +/obj/item/book/manual/supermatter_engine{ pixel_x = -3 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -53380,11 +53380,11 @@ /area/engineering/break_room) "bUg" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/carpet, /area/engineering/break_room) "bUh" = ( @@ -53419,33 +53419,33 @@ pixel_x = 11; pixel_y = 24 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FF8C00"; name = "orange towel"; pixel_x = -2; pixel_y = -4 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FF8C00"; name = "orange towel"; pixel_x = -2; pixel_y = -4 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FFD700"; name = "gold towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FFD700"; name = "gold towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#00FFFF"; name = "cyan towel"; pixel_x = 2; pixel_y = 4 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#00FFFF"; name = "cyan towel"; pixel_x = 2; @@ -53493,8 +53493,8 @@ /obj/structure/closet/crate, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/wirecutters, +/obj/item/tool/crowbar, +/obj/item/tool/wirecutters, /obj/random/maintenance/engineering, /obj/random/maintenance/engineering, /obj/random/maintenance/security, @@ -53717,8 +53717,8 @@ /area/maintenance/research) "bUL" = ( /obj/item/clothing/mask/gas, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance/research, /obj/random/maintenance/research, @@ -53768,7 +53768,7 @@ /area/rnd/lab) "bUT" = ( /obj/effect/floor_decal/industrial/warning/corner, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -53803,14 +53803,14 @@ /area/rnd/research) "bUW" = ( /obj/structure/closet/wardrobe/robotics_black, -/obj/item/device/radio/headset/headset_sci{ +/obj/item/radio/headset/headset_sci{ pixel_x = -3 }, -/obj/item/device/radio/headset/headset_sci{ +/obj/item/radio/headset/headset_sci{ pixel_x = -3 }, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/purple/border, /obj/effect/floor_decal/borderfloorwhite/corner2{ @@ -53872,12 +53872,12 @@ "bVe" = ( /obj/structure/table/standard, /obj/structure/window/reinforced, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/surgical/circular_saw, -/obj/item/weapon/surgical/hemostat, +/obj/item/tool/screwdriver, +/obj/item/tool/crowbar, +/obj/item/surgical/circular_saw, +/obj/item/surgical/hemostat, /obj/item/stack/cable_coil, -/obj/item/weapon/weldingtool/hugetank, +/obj/item/weldingtool/hugetank, /obj/effect/floor_decal/industrial/warning, /obj/machinery/light{ dir = 4 @@ -54146,12 +54146,12 @@ }, /obj/structure/table/steel, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/floor_painter, -/obj/item/device/multitool{ +/obj/item/floor_painter, +/obj/item/multitool{ pixel_x = 5 }, -/obj/item/device/t_scanner, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/t_scanner, +/obj/item/reagent_containers/spray/cleaner, /obj/random/tech_supply, /obj/random/tech_supply, /turf/simulated/floor/tiled, @@ -54174,7 +54174,7 @@ /obj/machinery/photocopier/faxmachine{ department = "Chief Engineer's Office" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -54189,11 +54189,11 @@ /area/crew_quarters/heads/sc/chief) "bVW" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/device/megaphone, +/obj/item/megaphone, /turf/simulated/floor/tiled, /area/crew_quarters/heads/sc/chief) "bVX" = ( @@ -54203,9 +54203,9 @@ d2 = 4; icon_state = "1-4" }, -/obj/item/weapon/folder/yellow_ce, -/obj/item/weapon/pen/multi, -/obj/item/weapon/stamp/ce, +/obj/item/folder/yellow_ce, +/obj/item/pen/multi, +/obj/item/stamp/ce, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/crew_quarters/heads/sc/chief) @@ -54221,14 +54221,14 @@ d2 = 8; icon_state = "2-8" }, -/obj/item/weapon/clipboard, -/obj/item/weapon/book/manual/supermatter_engine, +/obj/item/clipboard, +/obj/item/book/manual/supermatter_engine, /obj/item/clothing/glasses/meson{ pixel_y = 4 }, /obj/item/clothing/glasses/welding/superior, -/obj/item/weapon/storage/fancy/cigarettes, -/obj/item/weapon/flame/lighter/zippo, +/obj/item/storage/fancy/cigarettes, +/obj/item/flame/lighter/zippo, /turf/simulated/floor/tiled, /area/crew_quarters/heads/sc/chief) "bVZ" = ( @@ -54398,7 +54398,7 @@ /area/engineering/break_room) "bWi" = ( /obj/structure/table/woodentable, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -54414,7 +54414,7 @@ /area/engineering/break_room) "bWj" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, /obj/item/tabloid, /turf/simulated/floor/carpet, /area/engineering/break_room) @@ -54504,7 +54504,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 6 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -54582,7 +54582,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -54603,12 +54603,12 @@ /obj/random/maintenance/research, /obj/random/maintenance/research, /obj/random/maintenance/clean, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/simulated/floor/plating, /area/maintenance/research) "bWK" = ( /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /obj/machinery/light{ dir = 8 }, @@ -54682,9 +54682,9 @@ "bWR" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/steel_reinforced, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, -/obj/item/device/mmi/digital/robot, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/mmi/digital/robot, /turf/simulated/floor/tiled, /area/assembly/robotics) "bWS" = ( @@ -54724,16 +54724,16 @@ /area/assembly/robotics) "bWX" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = -1; pixel_y = -2 }, -/obj/item/weapon/book/manual/robotics_cyborgs{ +/obj/item/book/manual/robotics_cyborgs{ pixel_x = 2; pixel_y = 5 }, -/obj/item/device/defib_kit/jumper_kit/loaded, -/obj/item/device/defib_kit/jumper_kit/loaded, +/obj/item/defib_kit/jumper_kit/loaded, +/obj/item/defib_kit/jumper_kit/loaded, /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) "bWY" = ( @@ -54880,7 +54880,7 @@ tag_west_con = 0.5; use_power = 0 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -54982,7 +54982,7 @@ /area/engineering/atmos/monitoring) "bXE" = ( /obj/structure/closet/toolcloset, -/obj/item/device/flashlight, +/obj/item/flashlight, /obj/structure/window/reinforced{ dir = 8 }, @@ -54993,9 +54993,9 @@ /obj/structure/table/steel_reinforced, /obj/item/clothing/gloves/black, /obj/item/clothing/gloves/black, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar/red, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/tiled/dark, /area/engineering/workshop) "bXG" = ( @@ -55124,7 +55124,7 @@ /obj/effect/landmark{ name = "blobstart" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -55338,10 +55338,10 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/pen, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/hand_labeler, +/obj/item/pen, +/obj/item/packageWrap, +/obj/item/packageWrap, /obj/machinery/requests_console{ department = "Science"; departmentType = 2; @@ -55559,7 +55559,7 @@ /turf/simulated/floor/plating, /area/rnd/misc_lab) "bYN" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -55689,11 +55689,11 @@ "bZk" = ( /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/machinery/status_display{ pixel_y = -32 }, @@ -55803,11 +55803,11 @@ /area/engineering/break_room) "bZt" = ( /obj/effect/floor_decal/corner/white/diagonal, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 2 }, -/obj/item/weapon/storage/box/glasses/square, +/obj/item/storage/box/glasses/square, /obj/machinery/newscaster{ pixel_x = 30 }, @@ -56007,7 +56007,7 @@ "bZO" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/closet/crate, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /turf/simulated/floor/tiled, /area/teleporter) "bZP" = ( @@ -56135,7 +56135,7 @@ dir = 5 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/rnd/research_foyer) @@ -56173,7 +56173,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/landmark/start{ name = "Roboticist" }, @@ -56251,7 +56251,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -56384,8 +56384,8 @@ /area/engineering/break_room) "caA" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/bag/circuits/basic, -/obj/item/device/radio/intercom{ +/obj/item/storage/bag/circuits/basic, +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -56409,8 +56409,8 @@ /area/hallway/secondary/seconddeck/research_medical) "caD" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /turf/simulated/floor/tiled/white, /area/hallway/secondary/seconddeck/research_medical) "caE" = ( @@ -56488,9 +56488,9 @@ /obj/item/stack/rods{ amount = 50 }, -/obj/item/weapon/airlock_electronics, -/obj/item/weapon/airlock_electronics, -/obj/item/weapon/cell/high, +/obj/item/airlock_electronics, +/obj/item/airlock_electronics, +/obj/item/cell/high, /obj/item/stack/material/glass/phoronrglass{ amount = 20 }, @@ -56501,13 +56501,13 @@ dir = 8 }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_y = 5 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_y = 5 }, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, @@ -56515,8 +56515,8 @@ /area/engineering/workshop) "caU" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/stack/cable_coil{ pixel_x = 3; pixel_y = 3 @@ -56534,18 +56534,18 @@ /area/engineering/workshop) "caV" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 6 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = 6; pixel_y = 4 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -6; pixel_y = 4 }, -/obj/item/device/radio/off, +/obj/item/radio/off, /turf/simulated/floor/tiled/dark, /area/engineering/workshop) "caW" = ( @@ -56573,21 +56573,21 @@ pixel_x = 12; pixel_y = -24 }, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd, /obj/machinery/button/windowtint{ id = "ceoffice"; pixel_x = -12; pixel_y = -24 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -56604,7 +56604,7 @@ dir = 8 }, /obj/item/clothing/mask/breath, -/obj/item/weapon/rig/ce/equipped, +/obj/item/rig/ce/equipped, /obj/machinery/door/window/northright{ name = "Chief Engineer Suit Storage" }, @@ -56649,7 +56649,7 @@ /obj/machinery/computer/guestpass{ pixel_x = 30 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -56675,14 +56675,14 @@ pixel_x = 11; pixel_y = 24 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 }, /obj/structure/table/standard, -/obj/item/device/radio/beacon, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, +/obj/item/radio/beacon, /obj/random_multi/single_item/hand_tele, /turf/simulated/floor/tiled, /area/teleporter) @@ -56705,13 +56705,13 @@ "cbh" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/table/woodentable, -/obj/item/weapon/book/manual/engineering_construction, -/obj/item/weapon/book/manual/atmospipes, -/obj/item/weapon/book/manual/engineering_guide{ +/obj/item/book/manual/engineering_construction, +/obj/item/book/manual/atmospipes, +/obj/item/book/manual/engineering_guide{ pixel_x = 3; pixel_y = 2 }, -/obj/item/weapon/book/manual/evaguide{ +/obj/item/book/manual/evaguide{ pixel_x = -2; pixel_y = 7 }, @@ -56720,8 +56720,8 @@ "cbi" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/table/woodentable, -/obj/item/weapon/dice, -/obj/item/weapon/deck/cards, +/obj/item/dice, +/obj/item/deck/cards, /obj/machinery/status_display{ pixel_y = -32 }, @@ -57077,13 +57077,13 @@ /turf/simulated/floor/plating, /area/maintenance/research) "cbS" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/folder/white, +/obj/item/pen, /obj/machinery/newscaster{ pixel_x = -30 }, @@ -57097,12 +57097,12 @@ /turf/simulated/floor/tiled/white, /area/rnd/lab) "cbT" = ( -/obj/item/weapon/folder/white, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/reagent_containers/dropper{ +/obj/item/folder/white, +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, +/obj/item/reagent_containers/dropper{ pixel_y = -4 }, /obj/machinery/firealarm{ @@ -57116,13 +57116,13 @@ /area/rnd/lab) "cbU" = ( /obj/machinery/recharger, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, /obj/machinery/ai_status_display{ pixel_y = -32 }, @@ -57132,14 +57132,14 @@ /turf/simulated/floor/tiled/white, /area/rnd/lab) "cbV" = ( -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/weapon/stock_parts/scanning_module, -/obj/item/weapon/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, @@ -57239,27 +57239,27 @@ pixel_y = -30 }, /obj/machinery/recharger, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/device/multitool{ +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/multitool{ pixel_x = 3 }, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 3 }, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 6 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 6 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -57366,10 +57366,10 @@ /area/rnd/workshop) "ccq" = ( /obj/structure/table/steel, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = -5 }, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = 5 }, /obj/machinery/newscaster{ @@ -57398,8 +57398,8 @@ /area/hallway/secondary/seconddeck/research_medical) "ccu" = ( /obj/structure/table/standard, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/soap/nanotrasen, +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -57422,8 +57422,8 @@ /area/medical/virology) "ccw" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/extinguisher, +/obj/item/storage/box/monkeycubes, +/obj/item/extinguisher, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, @@ -57548,7 +57548,7 @@ /area/engineering/hallway/engineer_hallway) "ccM" = ( /obj/structure/table/reinforced, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -57773,7 +57773,7 @@ /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/random/maintenance/clean, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/plating, /area/maintenance/research) "cdm" = ( @@ -57884,7 +57884,7 @@ /obj/random/maintenance/research, /obj/random/maintenance/clean, /obj/item/stack/cable_coil, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /turf/simulated/floor/plating, /area/maintenance/research_medical) "cdy" = ( @@ -57955,8 +57955,8 @@ dir = 5 }, /obj/structure/closet/crate, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/wrench, +/obj/item/tool/crowbar/red, /obj/machinery/computer/security/telescreen{ desc = "Used to monitor the proceedings inside the test chamber."; name = "Test Chamber Monitor"; @@ -57974,7 +57974,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 8 }, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/white, /area/rnd/misc_lab) "cdG" = ( @@ -57984,7 +57984,7 @@ /area/rnd/workshop) "cdH" = ( /obj/structure/table/steel, -/obj/item/device/electronic_assembly/large{ +/obj/item/electronic_assembly/large{ pixel_y = 6 }, /obj/structure/reagent_dispensers/acid{ @@ -58004,10 +58004,10 @@ /area/hallway/secondary/seconddeck/research_medical) "cdJ" = ( /obj/structure/closet, -/obj/item/device/flashlight, +/obj/item/flashlight, /obj/effect/decal/cleanable/cobweb2, -/obj/item/weapon/storage/backpack/satchel/vir, -/obj/item/weapon/storage/backpack/virology, +/obj/item/storage/backpack/satchel/vir, +/obj/item/storage/backpack/virology, /obj/random/maintenance/medical, /obj/random/maintenance/medical, /obj/random/maintenance/medical, @@ -58055,12 +58055,12 @@ /area/medical/virology) "cdP" = ( /obj/structure/bed/padded, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 }, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -58097,7 +58097,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -58341,8 +58341,8 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "ceu" = ( -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/double, /obj/random/maintenance/engineering, /obj/random/maintenance/engineering, /obj/random/maintenance/engineering, @@ -58429,10 +58429,10 @@ /area/storage/emergency_storage/seconddeck/central_emergency) "ceC" = ( /obj/structure/table/steel, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/extinguisher, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/storage/box/lights/mixed, +/obj/item/extinguisher, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -58449,9 +58449,9 @@ dir = 1 }, /obj/item/clothing/suit/fire/firefighter, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, /obj/item/clothing/mask/gas, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/glasses/meson, /turf/simulated/floor/plating, @@ -58590,7 +58590,7 @@ /turf/simulated/floor/plating, /area/maintenance/research) "ceS" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/item/stack/rods, @@ -58608,7 +58608,7 @@ "ceU" = ( /obj/structure/closet, /obj/item/clothing/glasses/welding, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance/research, /obj/random/maintenance/research, @@ -58833,7 +58833,7 @@ /area/rnd/workshop) "cfu" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -58856,11 +58856,11 @@ /area/medical/virology) "cfw" = ( /obj/structure/table/glass, -/obj/item/device/antibody_scanner{ +/obj/item/antibody_scanner{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/antibody_scanner, +/obj/item/antibody_scanner, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -59440,7 +59440,7 @@ /obj/structure/window/reinforced, /obj/item/stack/rods, /obj/item/stack/rods, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/plating, /area/maintenance/research) "cgy" = ( @@ -59612,7 +59612,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -59660,8 +59660,8 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers, -/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind, +/obj/item/reagent_containers/food/snacks/cheesiehonkers, +/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind, /obj/random/maintenance/research, /obj/machinery/firealarm{ dir = 1; @@ -59776,7 +59776,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -60341,12 +60341,12 @@ /area/medical/virology) "cix" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white, -/obj/item/weapon/hand_labeler, +/obj/item/folder/white, +/obj/item/hand_labeler, /obj/structure/reagent_dispensers/virusfood{ pixel_x = 30 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ pixel_y = 21 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -60749,7 +60749,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/seconddeck/port) "cjq" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -61626,7 +61626,7 @@ }, /obj/machinery/hologram/holopad, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /obj/machinery/navbeacon/patrol{ location = "ENG"; next_patrol = "CH4" @@ -61716,7 +61716,7 @@ "clf" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, -/obj/item/device/radio{ +/obj/item/radio{ frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link" @@ -62248,7 +62248,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /obj/machinery/navbeacon/patrol{ location = "MED"; next_patrol = "CH10" @@ -62628,11 +62628,11 @@ /area/medical/virology) "cmp" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/lockbox/vials, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, +/obj/item/storage/lockbox/vials, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -62643,19 +62643,19 @@ /area/medical/virology) "cmq" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/fancy/vials, +/obj/item/storage/fancy/vials, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/virology) "cmr" = ( -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/storage/box/beakers, +/obj/item/reagent_containers/dropper, /obj/structure/table/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -62664,11 +62664,11 @@ /area/medical/virology) "cms" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -63294,7 +63294,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -63673,7 +63673,7 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "cor" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/white, /area/medical/virology) "cos" = ( @@ -63728,7 +63728,7 @@ /area/engineering/engine_monitoring) "coC" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -63927,7 +63927,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table/rack, /obj/random/cigarettes, -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/random/maintenance/clean, @@ -64103,7 +64103,7 @@ /obj/structure/table/steel, /obj/random/tech_supply, /obj/random/technology_scanner, -/obj/item/weapon/storage/bag/circuits/basic, +/obj/item/storage/bag/circuits/basic, /obj/random/tech_supply, /turf/simulated/floor/plating, /area/maintenance/research_medical) @@ -64169,7 +64169,7 @@ /area/medical/virology) "cpD" = ( /obj/structure/reagent_dispensers/watertank/high, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, @@ -64237,11 +64237,11 @@ /area/medical/virology) "cpJ" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 8 }, -/obj/item/device/radio{ +/obj/item/radio{ anchored = 1; canhear_range = 7; frequency = 1487; @@ -64251,13 +64251,13 @@ pixel_x = -6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/machinery/requests_console{ department = "Virology"; name = "Virology Requests Console"; pixel_x = 32 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -65034,7 +65034,7 @@ /area/medical/virology) "crx" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/virusdish/random, +/obj/item/virusdish/random, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -65111,7 +65111,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -65300,7 +65300,7 @@ dir = 1 }, /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/simulated/floor/tiled/dark, /area/rnd/workshop) "crX" = ( @@ -65318,7 +65318,7 @@ /obj/structure/table/rack{ dir = 1 }, -/obj/item/weapon/storage/bag/ore, +/obj/item/storage/bag/ore, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, @@ -65456,7 +65456,7 @@ /obj/random/cigarettes, /obj/random/toolbox, /obj/random/tech_supply, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -65543,8 +65543,8 @@ "csy" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, -/obj/item/weapon/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/packageWrap, +/obj/item/hand_labeler, /obj/machinery/computer/guestpass{ pixel_x = 28 }, @@ -65656,9 +65656,9 @@ dir = 1 }, /obj/item/clothing/suit/fire/firefighter, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, /obj/item/clothing/mask/gas, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/glasses/meson, /obj/machinery/alarm{ @@ -65686,16 +65686,16 @@ /area/maintenance/medbay_fore) "csP" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/device/t_scanner, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/t_scanner, /turf/simulated/floor/plating, /area/maintenance/medbay_fore) "csQ" = ( /obj/structure/table/rack, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/suit/storage/hazardvest, -/obj/item/device/radio, +/obj/item/radio, /obj/random/maintenance/medical, /obj/random/maintenance/medical, /obj/machinery/light/small, @@ -65707,7 +65707,7 @@ /area/maintenance/medbay_fore) "csS" = ( /obj/structure/closet, -/obj/item/weapon/storage/backpack, +/obj/item/storage/backpack, /obj/random/maintenance/medical, /obj/random/maintenance/medical, /obj/random/maintenance/medical, @@ -65807,7 +65807,7 @@ /area/medical/medbay2) "cta" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -65826,7 +65826,7 @@ /turf/simulated/floor/plating, /area/medical/genetics) "ctc" = ( -/obj/item/weapon/camera_assembly, +/obj/item/camera_assembly, /turf/simulated/floor/tiled/white, /area/medical/genetics) "ctd" = ( @@ -65986,7 +65986,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/tiled, /area/engineering/engine_smes) "ctz" = ( @@ -65996,7 +65996,7 @@ icon_state = "1-4" }, /obj/structure/table/steel, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 5 }, /obj/item/clothing/gloves/yellow, @@ -66335,20 +66335,20 @@ /area/crew_quarters/heads/sc/hop) "cun" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/stamp/hop, +/obj/item/clipboard, +/obj/item/stamp/hop, /turf/simulated/floor/carpet, /area/crew_quarters/heads/sc/hop) "cuo" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, -/obj/item/weapon/pen/multi, +/obj/item/folder/blue, +/obj/item/folder/red, +/obj/item/pen, +/obj/item/pen/multi, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -66391,7 +66391,7 @@ /area/hallway/primary/seconddeck/ascenter) "cur" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/floor_decal/spline/plain{ dir = 8 }, @@ -66652,7 +66652,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -66756,12 +66756,12 @@ /area/quartermaster/qm) "cvr" = ( /obj/structure/table/standard, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster{ pixel_x = 6; pixel_y = 5 }, -/obj/item/weapon/cartridge/quartermaster, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster, +/obj/item/cartridge/quartermaster{ pixel_x = -4; pixel_y = 7 }, @@ -66783,8 +66783,8 @@ /area/quartermaster/qm) "cvs" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/machinery/light{ dir = 8 }, @@ -66955,7 +66955,7 @@ /area/crew_quarters/heads/sc/hop) "cvM" = ( /obj/structure/closet/secure_closet/hop, -/obj/item/device/megaphone, +/obj/item/megaphone, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -67036,7 +67036,7 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = -21 }, @@ -67092,7 +67092,7 @@ name = "EVA Suit Storage"; req_access = list(5) }, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/structure/table/rack{ dir = 8; layer = 2.6 @@ -67122,9 +67122,9 @@ /area/medical/exam_room) "cwc" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/folder/white, +/obj/item/pen, /obj/machinery/alarm{ pixel_y = 23 }, @@ -67138,15 +67138,15 @@ /area/medical/exam_room) "cwd" = ( /obj/structure/table/glass, -/obj/item/weapon/cane, -/obj/item/weapon/cane{ +/obj/item/cane, +/obj/item/cane{ pixel_x = -3; pixel_y = 2 }, -/obj/item/weapon/storage/box/rxglasses, +/obj/item/storage/box/rxglasses, /obj/random/medical, /obj/random/firstaid, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = 21 }, @@ -67194,7 +67194,7 @@ /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 4 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ pixel_y = 21 }, /obj/effect/landmark/start{ @@ -67374,8 +67374,8 @@ /area/medical/chemistry) "cws" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /obj/machinery/firealarm{ pixel_y = 24 }, @@ -67389,7 +67389,7 @@ /area/medical/chemistry) "cwt" = ( /obj/structure/table/reinforced, -/obj/item/device/mass_spectrometer/adv, +/obj/item/mass_spectrometer/adv, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/science, /obj/machinery/computer/security/telescreen/entertainment{ @@ -67409,8 +67409,8 @@ /area/medical/chemistry) "cwu" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, @@ -67443,11 +67443,11 @@ /area/medical/chemistry) "cwx" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -67458,11 +67458,11 @@ /area/medical/medbay_primary_storage) "cwy" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /obj/machinery/alarm{ pixel_y = 23 }, @@ -67476,11 +67476,11 @@ /area/medical/medbay_primary_storage) "cwz" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, @@ -67500,7 +67500,7 @@ /turf/simulated/floor/tiled/dark, /area/medical/biostorage) "cwC" = ( -/obj/item/weapon/storage/box/cdeathalarm_kit, +/obj/item/storage/box/cdeathalarm_kit, /obj/item/bodybag/cryobag{ pixel_x = -3 }, @@ -67514,28 +67514,28 @@ /turf/simulated/floor/tiled/dark, /area/medical/biostorage) "cwD" = ( -/obj/item/weapon/cane, -/obj/item/weapon/cane{ +/obj/item/cane, +/obj/item/cane{ pixel_x = -3; pixel_y = 2 }, -/obj/item/weapon/cane{ +/obj/item/cane{ pixel_x = -6; pixel_y = 4 }, /obj/structure/table/steel, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/rxglasses, +/obj/item/storage/box/rxglasses, /turf/simulated/floor/tiled/dark, /area/medical/biostorage) "cwE" = ( /turf/simulated/wall, /area/medical/biostorage) "cwF" = ( -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = -21 }, @@ -67574,7 +67574,7 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay2) "cwH" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/plating, /area/medical/genetics) "cwI" = ( @@ -67732,8 +67732,8 @@ req_access = list(50) }, /obj/machinery/door/firedoor/glass, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen{ +/obj/item/folder/yellow, +/obj/item/pen{ pixel_x = 4; pixel_y = 4 }, @@ -67823,15 +67823,15 @@ pixel_x = 3; pixel_y = -7 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -67839,14 +67839,14 @@ dir = 1; pixel_y = -22 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 6 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, /turf/simulated/floor/tiled/techmaint, @@ -67854,21 +67854,21 @@ "cxw" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, /obj/machinery/camera/network/civilian{ c_tag = "CIV - Emergency EVA"; dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -68079,7 +68079,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/landmark/start{ name = "Paramedic" }, @@ -68117,7 +68117,7 @@ /obj/item/clothing/head/helmet/space/void/medical, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/medical, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, /obj/structure/table/rack{ dir = 8; layer = 2.6 @@ -68190,8 +68190,8 @@ /area/medical/reception) "cyf" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/food/drinks/britcup, -/obj/item/weapon/storage/box/glasses/square, +/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/storage/box/glasses/square, /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 4 }, @@ -68202,7 +68202,7 @@ /area/medical/reception) "cyg" = ( /obj/structure/table/glass, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 4 }, @@ -68253,7 +68253,7 @@ /area/medical/reception) "cyj" = ( /obj/structure/table/reinforced, -/obj/item/device/radio{ +/obj/item/radio{ anchored = 1; canhear_range = 1; frequency = 1487; @@ -68403,8 +68403,8 @@ /area/medical/chemistry) "cys" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/storage/box/beakers, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled/white, /area/medical/chemistry) "cyt" = ( @@ -68431,12 +68431,12 @@ /area/medical/medbay_primary_storage) "cyw" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/device/radio/intercom{ +/obj/item/storage/firstaid/fire, +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -68451,7 +68451,7 @@ /area/medical/medbay_primary_storage) "cyx" = ( /obj/structure/closet/l3closet/medical, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -68462,16 +68462,16 @@ /turf/simulated/floor/tiled/dark, /area/medical/biostorage) "cyz" = ( -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, /obj/structure/closet/crate{ name = "Grenade Crate" }, @@ -68589,7 +68589,7 @@ /turf/simulated/floor/plating, /area/quartermaster/delivery) "cyX" = ( -/obj/item/weapon/stool, +/obj/item/stool, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, @@ -68611,12 +68611,12 @@ name = "security camera" }, /obj/structure/table/steel, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, /obj/machinery/light{ dir = 4 }, @@ -68704,26 +68704,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/stamp/qm, +/obj/item/folder/yellow, +/obj/item/stamp/qm, /turf/simulated/floor/tiled, /area/quartermaster/qm) "czi" = ( /obj/structure/table/standard, -/obj/item/weapon/clipboard, -/obj/item/weapon/pen/multi, +/obj/item/clipboard, +/obj/item/pen/multi, /turf/simulated/floor/tiled, /area/quartermaster/qm) "czj" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, /obj/structure/extinguisher_cabinet{ pixel_x = 28 }, -/obj/item/device/megaphone, +/obj/item/megaphone, /obj/machinery/camera/network/cargo{ c_tag = "CRG - Quartermaster Office"; dir = 8; @@ -68815,7 +68815,7 @@ /area/hallway/primary/seconddeck/apcenter) "czt" = ( /obj/machinery/papershredder, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -68914,7 +68914,7 @@ /area/maintenance/medbay) "czD" = ( /obj/machinery/mech_recharger, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -68940,8 +68940,8 @@ /area/medical/medbay_emt_bay) "czG" = ( /obj/structure/table/steel, -/obj/item/device/multitool, -/obj/item/weapon/deck/cards, +/obj/item/multitool, +/obj/item/deck/cards, /obj/machinery/camera/network/medbay{ c_tag = "MED - EMT Bay"; dir = 8 @@ -68956,7 +68956,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -69004,12 +69004,12 @@ /area/medical/reception) "czL" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup, /obj/random/medical, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ pixel_x = -5 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 4 }, @@ -69017,7 +69017,7 @@ /area/medical/reception) "czM" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup, /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 4 }, @@ -69030,7 +69030,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/paleblue{ @@ -69142,7 +69142,7 @@ /turf/simulated/floor/tiled/white, /area/medical/chemistry) "czW" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -69203,23 +69203,23 @@ /area/medical/medbay_primary_storage) "cAd" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin{ +/obj/item/reagent_containers/glass/bottle/stoxin{ pixel_x = -6; pixel_y = 10 }, -/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{ +/obj/item/reagent_containers/glass/bottle/antitoxin{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{ +/obj/item/reagent_containers/glass/bottle/inaprovaline{ pixel_x = 1 }, /obj/random/medical, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/random/medical, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -69227,11 +69227,11 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -69258,21 +69258,21 @@ /area/medical/biostorage) "cAg" = ( /obj/structure/closet/crate, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/radio{ +/obj/item/storage/box/lights/mixed, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/radio{ frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link" }, -/obj/item/device/radio{ +/obj/item/radio{ frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link" }, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, /turf/simulated/floor/tiled/dark, /area/medical/biostorage) "cAh" = ( @@ -69329,7 +69329,7 @@ /obj/structure/mirror{ pixel_x = -28 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -69548,7 +69548,7 @@ /area/quartermaster/qm) "cAX" = ( /obj/machinery/disposal, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -69567,8 +69567,8 @@ /turf/simulated/floor/plating, /area/maintenance/bar) "cAZ" = ( -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/double, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, @@ -69629,7 +69629,7 @@ /obj/machinery/alarm{ pixel_y = 23 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -69690,7 +69690,7 @@ /obj/machinery/alarm{ pixel_y = 23 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -69724,7 +69724,7 @@ /obj/structure/fireaxecabinet{ pixel_x = -32 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/light{ dir = 8 }, @@ -69768,7 +69768,7 @@ req_access = newlist(); req_one_access = list(5,18) }, -/obj/item/weapon/rig/medical/equipped, +/obj/item/rig/medical/equipped, /obj/structure/window/reinforced{ dir = 1 }, @@ -69901,7 +69901,7 @@ /area/medical/reception) "cBF" = ( /obj/structure/table/reinforced, -/obj/item/device/radio{ +/obj/item/radio{ anchored = 1; canhear_range = 1; frequency = 1487; @@ -70125,7 +70125,7 @@ /area/medical/medbay2) "cBX" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ pixel_y = 21 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -70189,9 +70189,9 @@ dir = 1 }, /obj/item/clothing/suit/fire/firefighter, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, /obj/item/clothing/mask/gas, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/glasses/meson, /obj/random/maintenance/engineering, @@ -70343,9 +70343,9 @@ /area/quartermaster/delivery) "cCq" = ( /obj/structure/table/steel, -/obj/item/weapon/wrapping_paper, -/obj/item/weapon/wrapping_paper, -/obj/item/weapon/wrapping_paper, +/obj/item/wrapping_paper, +/obj/item/wrapping_paper, +/obj/item/wrapping_paper, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -70361,12 +70361,12 @@ d2 = 8; icon_state = "0-8" }, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/device/destTagger{ +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/destTagger{ pixel_x = 4; pixel_y = 3 }, @@ -70431,7 +70431,7 @@ /obj/random/maintenance/engineering, /obj/random/maintenance/clean, /obj/random/tech_supply, -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, /turf/simulated/floor/plating, /area/maintenance/bar) "cCx" = ( @@ -70799,15 +70799,15 @@ dir = 4 }, /obj/structure/window/reinforced, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/device/radio{ +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/storage/toolbox/mechanical, +/obj/item/radio{ frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link" }, -/obj/item/device/radio{ +/obj/item/radio{ frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link" @@ -70882,9 +70882,9 @@ /area/medical/reception) "cDj" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/folder/white, +/obj/item/pen, /turf/simulated/floor/tiled/white, /area/medical/reception) "cDk" = ( @@ -70950,7 +70950,7 @@ dir = 8 }, /obj/machinery/portable_atmospherics/powered/reagent_distillery, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/medical/chemistry) "cDp" = ( @@ -70961,7 +70961,7 @@ /area/medical/chemistry) "cDq" = ( /obj/structure/closet/secure_closet/chemical, -/obj/item/weapon/storage/box/pillbottles, +/obj/item/storage/box/pillbottles, /obj/machinery/alarm{ dir = 8; pixel_x = 22 @@ -70972,13 +70972,13 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 4 }, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/tool/screwdriver, +/obj/item/storage/box/syringes, +/obj/item/tool/screwdriver, /turf/simulated/floor/tiled/white, /area/medical/chemistry) "cDr" = ( /obj/structure/bed/chair/wheelchair, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = -21 }, @@ -70997,7 +70997,7 @@ /area/medical/medbay_primary_storage) "cDt" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, @@ -71015,8 +71015,8 @@ /area/medical/medbay_primary_storage) "cDu" = ( /obj/structure/table/steel, -/obj/item/weapon/gun/launcher/syringe, -/obj/item/weapon/storage/box/syringegun, +/obj/item/gun/launcher/syringe, +/obj/item/storage/box/syringegun, /obj/random/medical, /obj/random/medical, /obj/structure/extinguisher_cabinet{ @@ -71031,7 +71031,7 @@ /area/medical/biostorage) "cDw" = ( /obj/structure/bed/chair/wheelchair, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = 21 }, @@ -71268,9 +71268,9 @@ /area/maintenance/central) "cDR" = ( /obj/structure/table/standard, -/obj/item/device/t_scanner, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/t_scanner, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/plating, /area/storage/emergency_storage/seconddeck/port_emergency) "cDS" = ( @@ -71443,7 +71443,7 @@ /area/quartermaster/qm) "cEi" = ( /obj/structure/closet, -/obj/item/weapon/storage/backpack/dufflebag, +/obj/item/storage/backpack/dufflebag, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -71698,8 +71698,8 @@ /area/medical/medbay) "cEI" = ( /obj/structure/bookcase/manuals/medical, -/obj/item/weapon/book/manual/stasis, -/obj/item/weapon/book/manual/medical_diagnostics_manual{ +/obj/item/book/manual/stasis, +/obj/item/book/manual/medical_diagnostics_manual{ pixel_y = 7 }, /obj/effect/floor_decal/corner/paleblue/diagonal{ @@ -71725,7 +71725,7 @@ /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -71865,7 +71865,7 @@ "cEU" = ( /obj/machinery/reagentgrinder, /obj/structure/table/glass, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = -21 }, @@ -71926,7 +71926,7 @@ /area/medical/chemistry) "cEY" = ( /obj/structure/closet/wardrobe/chemistry_white, -/obj/item/device/radio/headset/headset_med, +/obj/item/radio/headset/headset_med, /obj/machinery/power/apc{ name = "south bump"; pixel_y = -24 @@ -71935,7 +71935,7 @@ pixel_x = 11; pixel_y = -24 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -71944,19 +71944,19 @@ d2 = 8; icon_state = "0-8" }, -/obj/item/weapon/storage/box/pillbottles, +/obj/item/storage/box/pillbottles, /obj/effect/floor_decal/borderfloorwhite{ dir = 6 }, /obj/effect/floor_decal/corner/beige/border{ dir = 6 }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/packageWrap, +/obj/item/hand_labeler, +/obj/item/packageWrap, /turf/simulated/floor/tiled/white, /area/medical/chemistry) "cEZ" = ( @@ -72073,7 +72073,7 @@ /area/medical/medbay2) "cFi" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/medical/medbay2) @@ -72085,37 +72085,37 @@ /area/medical/medbay2) "cFk" = ( /obj/structure/table/glass, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FF6666"; name = "light red towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FF6666"; name = "light red towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FF6666"; name = "light red towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#3fc0ea"; name = "light blue towel"; pixel_x = 2; pixel_y = 4 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#3fc0ea"; name = "light blue towel"; pixel_x = 2; pixel_y = 4 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#3fc0ea"; name = "light blue towel"; pixel_x = 2; pixel_y = 4 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -72306,12 +72306,12 @@ /area/quartermaster/delivery) "cFG" = ( /obj/structure/table/standard, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/coin/silver, -/obj/item/device/retail_scanner/civilian{ +/obj/item/coin/silver, +/obj/item/retail_scanner/civilian{ dir = 1 }, /obj/effect/floor_decal/borderfloor{ @@ -72380,7 +72380,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -72597,7 +72597,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = -21 }, @@ -72836,7 +72836,7 @@ /turf/simulated/floor, /area/maintenance/disposal) "cGL" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -72964,8 +72964,8 @@ dir = 1 }, /obj/structure/table/steel, -/obj/item/device/floor_painter, -/obj/item/weapon/weldingtool, +/obj/item/floor_painter, +/obj/item/weldingtool, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "cHb" = ( @@ -72994,9 +72994,9 @@ /obj/structure/table/steel, /obj/fiftyspawner/steel, /obj/fiftyspawner/glass, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/belt/utility, -/obj/item/device/multitool, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/multitool, /obj/machinery/camera/network/cargo{ c_tag = "CRG - Cargo Office Port"; name = "security camera" @@ -73025,12 +73025,12 @@ /area/quartermaster/office) "cHe" = ( /obj/structure/table/steel, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/stamp/denied{ +/obj/item/folder/yellow, +/obj/item/stamp/denied{ pixel_x = 4; pixel_y = -2 }, -/obj/item/weapon/stamp/cargo, +/obj/item/stamp/cargo, /obj/effect/floor_decal/borderfloor/corner{ dir = 1 }, @@ -73299,7 +73299,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/item/device/communicator, +/obj/item/communicator, /turf/simulated/floor/tiled/hydro, /area/hallway/primary/seconddeck/ascenter) "cHI" = ( @@ -74053,7 +74053,7 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay2) "cIA" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -74654,7 +74654,7 @@ /area/hallway/primary/seconddeck/ascenter) "cJt" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/codex/lore/vir, +/obj/item/book/codex/lore/vir, /obj/machinery/camera/network/second_deck{ c_tag = "Second Deck - Center Four"; dir = 1 @@ -74678,9 +74678,9 @@ "cJw" = ( /obj/structure/closet/crate, /obj/item/clothing/shoes/boots/combat, -/obj/item/weapon/tank/air, -/obj/item/weapon/tank/air, -/obj/item/weapon/tank/air, +/obj/item/tank/air, +/obj/item/tank/air, +/obj/item/tank/air, /obj/item/clothing/mask/gas, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance/cargo, @@ -74705,7 +74705,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -74845,7 +74845,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 1; pixel_y = -21 }, @@ -75018,7 +75018,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -75066,7 +75066,7 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay2) "cJZ" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -75189,11 +75189,11 @@ /area/medical/medical_lockerroom) "cKk" = ( /obj/structure/closet/secure_closet/medical3, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = 21 }, @@ -75381,8 +75381,8 @@ /area/quartermaster/lockerroom) "cKI" = ( /obj/structure/closet/secure_closet/cargotech, -/obj/item/weapon/storage/backpack/dufflebag, -/obj/item/weapon/stamp/cargo, +/obj/item/storage/backpack/dufflebag, +/obj/item/stamp/cargo, /obj/machinery/alarm{ dir = 1; pixel_y = -22 @@ -75391,7 +75391,7 @@ /area/quartermaster/lockerroom) "cKJ" = ( /obj/structure/closet/secure_closet/cargotech, -/obj/item/weapon/stamp/cargo, +/obj/item/stamp/cargo, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -75411,8 +75411,8 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/lockerroom) "cKL" = ( -/obj/item/weapon/tape_roll, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/tape_roll, +/obj/item/storage/firstaid/regular{ pixel_x = 6; pixel_y = -5 }, @@ -75422,7 +75422,7 @@ dir = 1; name = "security camera" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -75646,14 +75646,14 @@ pixel_y = -22 }, /obj/machinery/recharger, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ pixel_x = -5 }, /turf/simulated/floor/tiled/dark, /area/medical/medbay2) "cLq" = ( /obj/structure/table/glass, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 1; pixel_y = -21 }, @@ -75766,7 +75766,7 @@ /turf/simulated/floor, /area/maintenance/disposal) "cLC" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor, /area/maintenance/disposal) "cLD" = ( @@ -75777,7 +75777,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/obj/item/weapon/storage/bag/trash, +/obj/item/storage/bag/trash, /turf/simulated/floor, /area/maintenance/disposal) "cLE" = ( @@ -75850,7 +75850,7 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "cLN" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -76049,9 +76049,9 @@ /turf/simulated/floor/plating, /area/storage/emergency_storage/seconddeck/as_emergency) "cMj" = ( -/obj/item/device/t_scanner, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/t_scanner, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/structure/table/steel, /obj/random/maintenance/engineering, /obj/random/maintenance/clean, @@ -76111,7 +76111,7 @@ }, /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -76124,7 +76124,7 @@ /area/maintenance/substation/medical) "cMo" = ( /obj/machinery/disposal, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -76180,11 +76180,11 @@ /area/crew_quarters/heads/sc/cmo) "cMs" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/fancy/vials{ +/obj/item/storage/fancy/vials{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/fancy/vials, +/obj/item/storage/fancy/vials, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -76338,12 +76338,12 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "cMD" = ( -/obj/item/weapon/tool/wrench, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/tool/wrench, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -4 }, /obj/structure/table/glass, @@ -76386,7 +76386,7 @@ "cMJ" = ( /obj/structure/table/woodentable, /obj/item/toy/plushie/therapy/blue, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -76437,7 +76437,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -76629,8 +76629,8 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/module/power_control, -/obj/item/weapon/cell{ +/obj/item/module/power_control, +/obj/item/cell{ maxcharge = 2000 }, /obj/effect/floor_decal/borderfloor{ @@ -76647,8 +76647,8 @@ }, /obj/structure/table/steel, /obj/random/cigarettes, -/obj/item/weapon/flame/lighter/random, -/obj/item/weapon/deck/cards, +/obj/item/flame/lighter/random, +/obj/item/deck/cards, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -77168,7 +77168,7 @@ /area/medical/cryo) "cOd" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/machinery/alarm{ dir = 4; pixel_x = -22 @@ -77243,17 +77243,17 @@ /area/medical/morgue) "cOl" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/pen/red{ +/obj/item/clipboard, +/obj/item/pen/red{ pixel_x = 2; pixel_y = 6 }, -/obj/item/weapon/pen, -/obj/item/device/retail_scanner/civilian{ +/obj/item/pen, +/obj/item/retail_scanner/civilian{ dir = 1 }, /obj/machinery/light{ @@ -77309,7 +77309,7 @@ /area/medical/medical_lockerroom) "cOq" = ( /obj/structure/closet/secure_closet/medical3, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -77427,7 +77427,7 @@ /area/maintenance/substation/cargo) "cOB" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/random/medical/lite, /obj/machinery/camera/network/medbay{ c_tag = "MED - FA Station Fore"; @@ -77632,11 +77632,11 @@ /area/crew_quarters/heads/sc/cmo) "cOX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white_cmo, -/obj/item/weapon/stamp/cmo, -/obj/item/weapon/pen/multi, +/obj/item/paper_bin, +/obj/item/clipboard, +/obj/item/folder/white_cmo, +/obj/item/stamp/cmo, +/obj/item/pen/multi, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/sc/cmo) "cOY" = ( @@ -77801,12 +77801,12 @@ /area/medical/cryo) "cPn" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/blue, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/clipboard, +/obj/item/folder/blue, +/obj/item/folder/red, +/obj/item/folder/blue, /obj/machinery/light{ dir = 8 }, @@ -77864,7 +77864,7 @@ /obj/structure/bed/chair/comfy/brown{ dir = 8 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 1; pixel_y = -21 }, @@ -77939,8 +77939,8 @@ /area/medical/medical_lockerroom) "cPy" = ( /obj/structure/closet/wardrobe/medic_white, -/obj/item/device/flashlight/pen, -/obj/item/device/flashlight/pen, +/obj/item/flashlight/pen, +/obj/item/flashlight/pen, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 }, @@ -77951,8 +77951,8 @@ /area/medical/medical_lockerroom) "cPz" = ( /obj/structure/table/glass, -/obj/item/weapon/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/packageWrap, +/obj/item/hand_labeler, /obj/machinery/alarm{ dir = 1; pixel_y = -22 @@ -77963,11 +77963,11 @@ /area/medical/medical_lockerroom) "cPA" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/accessory/stethoscope, @@ -77978,7 +77978,7 @@ /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -78026,7 +78026,7 @@ /turf/simulated/floor, /area/maintenance/cargo) "cPE" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/plating, /area/maintenance/cargo) "cPF" = ( @@ -78134,9 +78134,9 @@ dir = 1 }, /obj/item/clothing/suit/fire/firefighter, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, /obj/item/clothing/mask/gas, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/glasses/meson, /obj/random/maintenance/engineering, @@ -78163,9 +78163,9 @@ /turf/simulated/floor/plating, /area/maintenance/bar) "cPV" = ( -/obj/item/device/t_scanner, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/t_scanner, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/structure/table/steel, /obj/random/maintenance/clean, /obj/random/maintenance/clean, @@ -78402,7 +78402,7 @@ /area/maintenance/bar) "cQk" = ( /obj/structure/table/steel, -/obj/item/device/t_scanner, +/obj/item/t_scanner, /obj/random/tech_supply, /obj/random/tech_supply, /obj/machinery/alarm{ @@ -78413,7 +78413,7 @@ /area/maintenance/bar) "cQl" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/random/maintenance/clean, @@ -78543,14 +78543,14 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/medical, +/obj/item/storage/belt/medical, /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/glasses/sunglasses/medhud, -/obj/item/device/radio{ +/obj/item/radio{ frequency = 1487; name = "Medbay Emergency Radio Link" }, -/obj/item/device/megaphone, +/obj/item/megaphone, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -78797,11 +78797,11 @@ "cQQ" = ( /obj/structure/table/steel, /obj/machinery/recharger, -/obj/item/weapon/stamp{ +/obj/item/stamp{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/dark, /area/quartermaster/office) "cQR" = ( @@ -78943,8 +78943,8 @@ name = "formal wardrobe" }, /obj/item/glass_jar, -/obj/item/device/retail_scanner/civilian, -/obj/item/device/retail_scanner/civilian, +/obj/item/retail_scanner/civilian, +/obj/item/retail_scanner/civilian, /obj/machinery/camera/network/civilian{ c_tag = "CIV - Bar Storage" }, @@ -78979,8 +78979,8 @@ /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, -/obj/item/weapon/material/knife, -/obj/item/weapon/storage/mre/random, +/obj/item/material/knife, +/obj/item/storage/mre/random, /obj/random/crate, /turf/simulated/floor/plating, /area/maintenance/bar) @@ -78991,7 +78991,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -79158,7 +79158,7 @@ /area/crew_quarters/heads/sc/cmo) "cRw" = ( /obj/machinery/photocopier, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 1; pixel_y = -21 }, @@ -79180,7 +79180,7 @@ /area/medical/sleeper) "cRy" = ( /obj/structure/closet/secure_closet/medical1, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 1; pixel_y = -21 }, @@ -79204,15 +79204,15 @@ /area/medical/sleeper) "cRA" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ pixel_x = -2; pixel_y = -2 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -79220,8 +79220,8 @@ c_tag = "MED - Acute"; dir = 1 }, -/obj/item/device/defib_kit/loaded, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, +/obj/item/defib_kit/loaded, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, @@ -79307,9 +79307,9 @@ name = "O- Blood Locker"; pixel_y = -32 }, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -79347,7 +79347,7 @@ /obj/machinery/sleep_console{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -79379,7 +79379,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 1; pixel_y = -21 }, @@ -79480,7 +79480,7 @@ /turf/simulated/floor/tiled/white, /area/medical/genetics_cloning) "cRQ" = ( -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ pixel_y = 21 }, /obj/machinery/camera/network/medbay{ @@ -79509,7 +79509,7 @@ /area/medical/genetics_cloning) "cRS" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/laundry_basket, +/obj/item/storage/laundry_basket, /obj/machinery/firealarm{ pixel_y = 24 }, @@ -79519,7 +79519,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/simulated/floor/tiled/white, /area/medical/genetics_cloning) "cRT" = ( @@ -79545,8 +79545,8 @@ /area/medical/morgue) "cRV" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -79675,7 +79675,7 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "cSg" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/item/stack/rods, @@ -80077,7 +80077,7 @@ /turf/simulated/floor/tiled/white, /area/medical/genetics_cloning) "cSW" = ( -/obj/item/weapon/stool, +/obj/item/stool, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -80198,7 +80198,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = 21 }, @@ -80416,7 +80416,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -80546,7 +80546,7 @@ /obj/structure/table/rack{ dir = 1 }, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/random/maintenance/medical, /obj/random/maintenance/medical, /obj/random/maintenance/medical, @@ -80570,7 +80570,7 @@ /area/medical/ward) "cTT" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/newscaster{ pixel_x = -30 }, @@ -80585,7 +80585,7 @@ /area/medical/ward) "cTU" = ( /obj/structure/closet/secure_closet/personal/patient, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -80618,7 +80618,7 @@ /area/medical/ward) "cTW" = ( /obj/structure/closet/secure_closet/personal/patient, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ pixel_y = 21 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -80631,7 +80631,7 @@ /area/medical/ward) "cTX" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -80643,11 +80643,11 @@ /area/medical/ward) "cTY" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -80720,7 +80720,7 @@ /area/medical/ward) "cUd" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 @@ -80732,7 +80732,7 @@ /area/medical/ward) "cUe" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/newscaster{ pixel_x = 30 }, @@ -80776,7 +80776,7 @@ /area/medical/genetics_cloning) "cUj" = ( /obj/structure/closet/wardrobe/medic_white, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -80789,19 +80789,19 @@ /area/medical/genetics_cloning) "cUk" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = -6 }, -/obj/item/device/camera{ +/obj/item/camera{ name = "Autopsy Camera"; pixel_x = -2; pixel_y = 7 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = -1; pixel_y = -9 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = 3; pixel_y = -5 }, @@ -80825,9 +80825,9 @@ /area/medical/morgue) "cUm" = ( /obj/structure/table/steel, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/cautery, +/obj/item/autopsy_scanner, +/obj/item/surgical/scalpel, +/obj/item/surgical/cautery, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -80918,7 +80918,7 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/kitchen) "cUx" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -81068,7 +81068,7 @@ /turf/simulated/wall, /area/crew_quarters/locker/locker_toilet) "cUO" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -81110,10 +81110,10 @@ /area/maintenance/medbay) "cUS" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/glass/rag, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask, -/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, -/obj/item/weapon/flame/lighter/zippo, +/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/food/drinks/flask/vacuumflask, +/obj/item/flame/lighter/zippo, /obj/item/clothing/head/that{ pixel_x = 4; pixel_y = 6 @@ -81178,7 +81178,7 @@ /area/crew_quarters/sleep/vistor_room_1) "cVb" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/machinery/computer/security/telescreen/entertainment{ icon_state = "frame"; pixel_y = 32 @@ -81295,7 +81295,7 @@ /area/medical/ward) "cVm" = ( /obj/structure/table/glass, -/obj/item/device/radio{ +/obj/item/radio{ anchored = 1; canhear_range = 7; frequency = 1487; @@ -81435,8 +81435,8 @@ /area/medical/patient_wing) "cVx" = ( /obj/structure/closet/wardrobe/grey, -/obj/item/weapon/storage/backpack, -/obj/item/weapon/storage/backpack, +/obj/item/storage/backpack, +/obj/item/storage/backpack, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, @@ -81451,7 +81451,7 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "cVz" = ( -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /obj/structure/table/steel, /turf/simulated/floor/plating, /area/maintenance/cargo) @@ -81461,8 +81461,8 @@ /area/maintenance/cargo) "cVB" = ( /obj/structure/table/steel, -/obj/item/weapon/reagent_containers/food/drinks/glass2/rocks, -/obj/item/weapon/reagent_containers/food/drinks/glass2/rocks, +/obj/item/reagent_containers/food/drinks/glass2/rocks, +/obj/item/reagent_containers/food/drinks/glass2/rocks, /turf/simulated/floor/plating, /area/maintenance/cargo) "cVC" = ( @@ -81471,7 +81471,7 @@ /area/maintenance/cargo) "cVD" = ( /obj/structure/table/steel, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/food/drinks/flask/barflask, /turf/simulated/floor/plating, /area/maintenance/cargo) "cVE" = ( @@ -81480,11 +81480,11 @@ pixel_y = -22 }, /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/plating, /area/maintenance/cargo) "cVF" = ( -/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, /turf/simulated/floor/plating, /area/maintenance/cargo) "cVG" = ( @@ -81551,8 +81551,8 @@ "cVP" = ( /obj/structure/table/woodentable, /obj/machinery/reagentgrinder, -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/obj/item/weapon/packageWrap, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/packageWrap, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -81571,13 +81571,13 @@ /area/crew_quarters/bar) "cVR" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/beanbags, -/obj/item/weapon/gun/projectile/shotgun/doublebarrel, -/obj/item/weapon/tool/screwdriver, +/obj/item/storage/box/beanbags, +/obj/item/gun/projectile/shotgun/doublebarrel, +/obj/item/tool/screwdriver, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; @@ -81586,14 +81586,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "cVS" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /mob/living/carbon/human/monkey/punpun, /turf/simulated/floor/lino, /area/crew_quarters/bar) "cVT" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -81669,15 +81669,15 @@ }, /obj/structure/closet/chefcloset, /obj/item/glass_jar, -/obj/item/device/retail_scanner/civilian, -/obj/item/weapon/soap/nanotrasen, -/obj/item/device/destTagger{ +/obj/item/retail_scanner/civilian, +/obj/item/soap/nanotrasen, +/obj/item/destTagger{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, /obj/item/clothing/gloves/sterile/latex, /obj/item/clothing/gloves/sterile/latex, /turf/simulated/floor/tiled/freezer, @@ -81710,7 +81710,7 @@ /area/maintenance/medbay) "cWd" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/carpet, /area/crew_quarters/sleep/vistor_room_1) "cWe" = ( @@ -81735,7 +81735,7 @@ /obj/effect/floor_decal/corner/grey/diagonal{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -81762,7 +81762,7 @@ /area/crew_quarters/bar) "cWk" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/machinery/computer/security/telescreen/entertainment{ icon_state = "frame"; pixel_y = 32 @@ -81790,7 +81790,7 @@ pixel_y = 30 }, /obj/structure/table/standard, -/obj/item/device/communicator, +/obj/item/communicator, /obj/machinery/light{ dir = 1 }, @@ -81798,7 +81798,7 @@ /area/crew_quarters/sleep/vistor_room_2) "cWo" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/carpet, /area/crew_quarters/sleep/vistor_room_2) "cWp" = ( @@ -82158,7 +82158,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -82250,7 +82250,7 @@ /area/maintenance/bar) "cWV" = ( /obj/structure/table/marble, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /obj/machinery/door/blast/shutters{ dir = 2; id = "bar"; @@ -82267,12 +82267,12 @@ /area/crew_quarters/bar) "cWW" = ( /obj/structure/table/standard, -/obj/item/weapon/towel, -/obj/item/weapon/towel, -/obj/item/weapon/towel, -/obj/item/weapon/towel, -/obj/item/weapon/towel, -/obj/item/weapon/towel, +/obj/item/towel, +/obj/item/towel, +/obj/item/towel, +/obj/item/towel, +/obj/item/towel, +/obj/item/towel, /obj/random/soap, /obj/random/soap, /obj/machinery/power/apc{ @@ -82383,7 +82383,7 @@ name = "xeno_spawn"; pixel_x = -1 }, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /obj/machinery/alarm{ dir = 8; pixel_x = 22 @@ -82428,7 +82428,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/aft) "cXj" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -82508,7 +82508,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -82629,11 +82629,11 @@ /area/rnd/research/firstdeck/hallway) "cXE" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/blood/AMinus, -/obj/item/weapon/reagent_containers/blood/APlus, -/obj/item/weapon/reagent_containers/blood/BMinus, -/obj/item/weapon/reagent_containers/blood/BPlus, -/obj/item/weapon/reagent_containers/blood/OPlus, +/obj/item/reagent_containers/blood/AMinus, +/obj/item/reagent_containers/blood/APlus, +/obj/item/reagent_containers/blood/BMinus, +/obj/item/reagent_containers/blood/BPlus, +/obj/item/reagent_containers/blood/OPlus, /obj/structure/extinguisher_cabinet{ pixel_x = -28 }, @@ -82647,25 +82647,25 @@ /area/medical/ward) "cXF" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/structure/closet/secure_closet/medical_wall{ name = "O- Blood Locker"; pixel_y = -32 }, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, /area/medical/ward) "cXG" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -82674,7 +82674,7 @@ /turf/simulated/floor/tiled/white, /area/medical/ward) "cXH" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/camera/network/medbay{ c_tag = "MED - Patient Ward Port"; dir = 1 @@ -82959,7 +82959,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/cafeteria) "cYk" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, @@ -82973,11 +82973,11 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar) "cYm" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/crew_quarters/cafeteria) "cYn" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/cable/green{ d1 = 1; @@ -82987,12 +82987,12 @@ /turf/simulated/floor/wood, /area/crew_quarters/cafeteria) "cYo" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/cafeteria) "cYp" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/wood, /area/crew_quarters/cafeteria) @@ -83016,7 +83016,7 @@ /turf/simulated/floor/carpet, /area/crew_quarters/sleep/vistor_room_2) "cYt" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -83066,7 +83066,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/locker/locker_toilet) "cYy" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; @@ -83124,7 +83124,7 @@ /turf/simulated/floor/carpet, /area/crew_quarters/sleep/vistor_room_1) "cYD" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; @@ -83289,7 +83289,7 @@ dir = 1; pixel_y = -22 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = -21 }, @@ -83322,7 +83322,7 @@ dir = 1; pixel_y = -24 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -83519,13 +83519,13 @@ /obj/effect/floor_decal/corner/grey/diagonal{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/small/sugar, /turf/simulated/floor/tiled/white, /area/crew_quarters/cafeteria) "cZs" = ( @@ -83556,7 +83556,7 @@ name = "defibrillator closet"; pixel_y = 31 }, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled/white, /area/medical/first_aid_station/seconddeck/aft) "cZx" = ( @@ -83612,12 +83612,12 @@ dir = 5 }, /obj/structure/table/glass, -/obj/item/device/radio{ +/obj/item/radio{ frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -83795,7 +83795,7 @@ /obj/effect/floor_decal/corner/green/bordercorner{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -83838,8 +83838,8 @@ /area/maintenance/medbay) "cZU" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/surgical/cautery, +/obj/item/surgical/hemostat, +/obj/item/surgical/cautery, /obj/machinery/status_display{ layer = 4; pixel_x = -32 @@ -83872,8 +83872,8 @@ d2 = 4; icon_state = "0-4" }, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel, +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel, /obj/machinery/button/holosign{ pixel_x = -11; pixel_y = 30 @@ -83993,8 +83993,8 @@ d2 = 8; icon_state = "0-8" }, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel, +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel, /obj/machinery/button/holosign{ pixel_x = -11; pixel_y = 30 @@ -84009,8 +84009,8 @@ /area/medical/surgery2) "dad" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/surgical/cautery, +/obj/item/surgical/hemostat, +/obj/item/surgical/cautery, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, @@ -84367,7 +84367,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "daB" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -84695,7 +84695,7 @@ "daZ" = ( /obj/structure/table/standard, /obj/item/stack/medical/advanced/bruise_pack, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/retractor, /obj/machinery/alarm{ dir = 4; pixel_x = -22 @@ -84859,7 +84859,7 @@ "dbl" = ( /obj/structure/table/standard, /obj/item/stack/medical/advanced/bruise_pack, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/retractor, /obj/machinery/alarm{ dir = 8; pixel_x = 22 @@ -85041,7 +85041,7 @@ /turf/simulated/floor/plating, /area/maintenance/bar) "dbA" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/corner/grey/diagonal{ dir = 4 }, @@ -85065,14 +85065,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "dbC" = ( @@ -85083,9 +85083,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/snacks/mint, -/obj/item/weapon/packageWrap, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/food/snacks/mint, +/obj/item/packageWrap, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "dbD" = ( @@ -85161,8 +85161,8 @@ /obj/structure/table/rack, /obj/item/clothing/suit/radiation, /obj/item/clothing/head/radiation, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/device/defib_kit/loaded, +/obj/item/storage/toolbox/emergency, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled/dark, /area/medical/biostorage) "dbM" = ( @@ -85343,11 +85343,11 @@ /area/crew_quarters/locker) "dca" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw{ +/obj/item/surgical/circular_saw{ pixel_y = 8 }, -/obj/item/weapon/surgical/scalpel, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/surgical/scalpel, +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = -21 }, @@ -85434,11 +85434,11 @@ /area/medical/surgery2) "dck" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw{ +/obj/item/surgical/circular_saw{ pixel_y = 8 }, -/obj/item/weapon/surgical/scalpel, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/surgical/scalpel, +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = 21 }, @@ -85452,19 +85452,19 @@ /area/medical/surgery2) "dcl" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/surgical/FixOVein, -/obj/item/weapon/surgical/circular_saw, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/surgicaldrill, +/obj/item/surgical/FixOVein, +/obj/item/surgical/circular_saw, +/obj/item/surgical/scalpel, /obj/item/stack/medical/advanced/bruise_pack, -/obj/item/weapon/surgical/retractor, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/surgical/cautery, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel, +/obj/item/surgical/retractor, +/obj/item/surgical/hemostat, +/obj/item/surgical/cautery, +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel, /obj/item/stack/nanopaste, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/autopsy_scanner, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; @@ -85504,14 +85504,14 @@ /area/medical/patient_a) "dcp" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/pink/border, /turf/simulated/floor/tiled/white, /area/medical/patient_a) "dcq" = ( /obj/structure/closet/secure_closet/personal/patient, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -85533,7 +85533,7 @@ "dcr" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -85548,7 +85548,7 @@ /area/medical/patient_b) "dcs" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/pink/border, /turf/simulated/floor/tiled/white, @@ -85605,11 +85605,11 @@ /area/crew_quarters/cafeteria) "dcx" = ( /obj/structure/table/woodentable, -/obj/item/weapon/deck/cah{ +/obj/item/deck/cah{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/deck/cah/black{ +/obj/item/deck/cah/black{ pixel_x = -2; pixel_y = -2 }, @@ -85636,8 +85636,8 @@ /area/maintenance/central) "dcz" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/spoon{ pixel_x = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -85645,8 +85645,8 @@ /area/crew_quarters/cafeteria) "dcA" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/codex/lore/vir, -/obj/item/weapon/deck/cards, +/obj/item/book/codex/lore/vir, +/obj/item/deck/cards, /turf/simulated/floor/wood, /area/crew_quarters/cafeteria) "dcB" = ( @@ -85657,8 +85657,8 @@ /area/crew_quarters/cafeteria) "dcC" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/spoon{ pixel_x = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -85815,7 +85815,7 @@ }, /obj/random/maintenance/clean, /obj/random/maintenance/clean, -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, /obj/random/crate, /turf/simulated/floor/plating, /area/maintenance/locker) @@ -85828,8 +85828,8 @@ }, /obj/item/roller, /obj/item/bodybag/cryobag, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/pill_bottle/spaceacillin, +/obj/item/storage/firstaid/regular, +/obj/item/storage/pill_bottle/spaceacillin, /turf/simulated/floor/tiled/white, /area/medical/first_aid_station/seconddeck/fore) "dcT" = ( @@ -85837,10 +85837,10 @@ /obj/effect/floor_decal/corner/grey/diagonal{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, /turf/simulated/floor/tiled/white, @@ -85859,7 +85859,7 @@ /area/crew_quarters/kitchen) "dcW" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/snacks/pie, +/obj/item/reagent_containers/food/snacks/pie, /obj/effect/floor_decal/corner/grey/diagonal{ dir = 4 }, @@ -85888,16 +85888,16 @@ /area/crew_quarters/locker) "dda" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/surgical/surgicaldrill, +/obj/item/autopsy_scanner, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/surgical/FixOVein, -/obj/item/device/radio/intercom{ +/obj/item/surgical/FixOVein, +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -85976,16 +85976,16 @@ /area/medical/surgery2) "ddj" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/surgical/surgicaldrill, +/obj/item/autopsy_scanner, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/surgical/FixOVein, -/obj/item/device/radio/intercom{ +/obj/item/surgical/FixOVein, +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -86047,7 +86047,7 @@ dir = 4 }, /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/random/medical/lite, /obj/machinery/firealarm{ dir = 4; @@ -86098,8 +86098,8 @@ }, /obj/item/roller, /obj/item/bodybag/cryobag, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/pill_bottle/spaceacillin, +/obj/item/storage/firstaid/regular, +/obj/item/storage/pill_bottle/spaceacillin, /turf/simulated/floor/tiled/white, /area/medical/first_aid_station/seconddeck/aft) "ddx" = ( @@ -86145,7 +86145,7 @@ /area/crew_quarters/locker) "ddC" = ( /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/storage/backpack/dufflebag, +/obj/item/storage/backpack/dufflebag, /turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "ddD" = ( @@ -86191,8 +86191,8 @@ dir = 5 }, /obj/structure/table/marble, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/knife/butch, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "ddI" = ( @@ -86203,7 +86203,7 @@ dir = 4 }, /obj/structure/table/marble, -/obj/item/weapon/book/manual/chef_recipes, +/obj/item/book/manual/chef_recipes, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "ddJ" = ( @@ -86308,8 +86308,8 @@ /area/medical/surgeryobs) "ddR" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/cups, -/obj/item/device/radio/intercom{ +/obj/item/storage/box/cups, +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -86340,7 +86340,7 @@ /area/medical/surgeryobs) "ddT" = ( /obj/structure/reagent_dispensers/water_cooler/full, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = 21 }, @@ -86417,7 +86417,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/food/drinks/flask/barflask, /obj/random/powercell, /obj/random/maintenance, /obj/random/maintenance/clean, @@ -86501,7 +86501,7 @@ dir = 1; health = 1e+006 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -86668,7 +86668,7 @@ /area/crew_quarters/cafeteria) "dev" = ( /obj/machinery/vending/cola, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -86853,7 +86853,7 @@ /area/crew_quarters/cafeteria) "deK" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -86966,7 +86966,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/cafeteria) "deW" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -87134,7 +87134,7 @@ /obj/machinery/camera/network/civilian{ c_tag = "CIV - Hydroponics" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -87161,7 +87161,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker) "dfp" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -87200,7 +87200,7 @@ name = "defibrillator closet"; pixel_y = -31 }, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled/white, /area/medical/first_aid_station/seconddeck/fore) "dfs" = ( @@ -87493,7 +87493,7 @@ /turf/simulated/floor/tiled/hydro, /area/hydroponics) "dfT" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/borderfloor/corner{ dir = 4 }, @@ -87656,7 +87656,7 @@ /area/hallway/primary/seconddeck/aft) "dgj" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -87687,7 +87687,7 @@ /obj/item/honey_frame, /obj/item/honey_frame, /obj/item/bee_pack, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /obj/effect/floor_decal/borderfloor/corner{ dir = 8 }, @@ -87701,7 +87701,7 @@ /area/hydroponics) "dgm" = ( /obj/structure/reagent_dispensers/watertank/high, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/hydro, @@ -87732,7 +87732,7 @@ /area/hydroponics) "dgr" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/laundry_basket, +/obj/item/storage/laundry_basket, /turf/simulated/floor/tiled, /area/crew_quarters/locker) "dgs" = ( @@ -87777,20 +87777,20 @@ /area/crew_quarters/locker) "dgx" = ( /obj/structure/table/glass, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/crew_quarters/locker) "dgy" = ( /obj/structure/table/glass, -/obj/item/weapon/tape_roll, +/obj/item/tape_roll, /turf/simulated/floor/tiled, /area/crew_quarters/locker) "dgz" = ( @@ -87802,7 +87802,7 @@ /obj/effect/floor_decal/corner/lime/bordercorner{ dir = 1 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/landmark/start{ name = "Botanist" }, @@ -87812,25 +87812,25 @@ /obj/structure/table/standard, /obj/random/maintenance/clean, /obj/random/maintenance, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /turf/simulated/floor/plating, /area/maintenance/bar) "dgB" = ( /obj/structure/table/standard, -/obj/item/weapon/material/knife/machete/hatchet, -/obj/item/weapon/material/knife/machete/hatchet, -/obj/item/weapon/material/knife/machete/hatchet, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/minihoe, +/obj/item/material/knife/machete/hatchet, +/obj/item/material/knife/machete/hatchet, +/obj/item/material/knife/machete/hatchet, +/obj/item/material/minihoe, +/obj/item/material/minihoe, +/obj/item/material/minihoe, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/hydro, /area/hydroponics) "dgC" = ( /obj/structure/reagent_dispensers/watertank/high, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -87873,7 +87873,7 @@ /obj/effect/floor_decal/corner/lime/bordercorner{ dir = 4 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/landmark/start{ name = "Botanist" }, @@ -87892,7 +87892,7 @@ /obj/effect/floor_decal/corner/purple/bordercorner{ dir = 4 }, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, /area/rnd/research_lockerroom) "dgH" = ( @@ -88255,7 +88255,7 @@ "dhs" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/brown/bordercorner, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -88338,8 +88338,8 @@ /area/chapel/office) "dhE" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/nullrod, -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, +/obj/item/nullrod, +/obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -88362,12 +88362,12 @@ /area/chapel/office) "dhF" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 }, -/obj/item/weapon/storage/fancy/markers, +/obj/item/storage/fancy/markers, /turf/simulated/floor/lino, /area/chapel/office) "dhG" = ( @@ -88410,7 +88410,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "dhK" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/green/bordercorner, /turf/simulated/floor/tiled, @@ -88489,7 +88489,7 @@ }, /obj/structure/table/glass, /obj/item/clothing/head/cakehat, -/obj/item/device/communicator, +/obj/item/communicator, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/aft) "dhS" = ( @@ -88572,8 +88572,8 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/structure/sign/deck/second{ pixel_y = -32 }, @@ -88624,11 +88624,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = 5; pixel_y = 5 }, @@ -88679,7 +88679,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker) "din" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/borderfloor{ dir = 6 }, @@ -88853,7 +88853,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 10 }, /turf/simulated/floor/lino, @@ -88976,7 +88976,7 @@ /area/library) "diT" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -88990,7 +88990,7 @@ /area/maintenance/locker) "diV" = ( /obj/structure/bookcase/bookcart, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -89022,7 +89022,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -89215,7 +89215,7 @@ /turf/simulated/wall, /area/maintenance/substation/civilian) "djr" = ( -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/machinery/light/small{ dir = 8 }, @@ -89294,13 +89294,13 @@ /area/chapel/main) "djB" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/tape_roll, -/obj/item/weapon/packageWrap, +/obj/item/folder/yellow, +/obj/item/tape_roll, +/obj/item/packageWrap, /turf/simulated/floor/wood, /area/library) "djC" = ( @@ -89445,16 +89445,16 @@ /area/library) "djQ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = 2; pixel_y = 6 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/pen, -/obj/item/weapon/book/codex/lore/news, +/obj/item/pen, +/obj/item/book/codex/lore/news, /turf/simulated/floor/wood, /area/library) "djR" = ( @@ -89479,32 +89479,32 @@ /area/library) "djU" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/invisible, -/obj/item/weapon/book/codex/lore/news, -/obj/item/device/tvcamera, +/obj/item/pen/invisible, +/obj/item/book/codex/lore/news, +/obj/item/tvcamera, /turf/simulated/floor/carpet, /area/library) "djV" = ( /obj/structure/table/woodentable, -/obj/item/device/taperecorder, -/obj/item/device/tape/random, -/obj/item/device/tape/random, -/obj/item/device/camera, +/obj/item/taperecorder, +/obj/item/rectape/random, +/obj/item/rectape/random, +/obj/item/camera, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/weapon/barcodescanner, +/obj/item/barcodescanner, /turf/simulated/floor/carpet, /area/library) "djW" = ( /obj/structure/table/woodentable, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/paicard, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/paicard, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/library) @@ -89606,7 +89606,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -89709,7 +89709,7 @@ /area/library) "dks" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -89747,8 +89747,8 @@ /area/library) "dkv" = ( /obj/structure/table/standard, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/paper{ +/obj/item/soap/nanotrasen, +/obj/item/paper{ desc = ""; info = "Brusies sustained in the holodeck can be healed simply by sleeping."; name = "Holodeck Disclaimer" @@ -89780,7 +89780,7 @@ /turf/simulated/floor/tiled/yellow, /area/library) "dkx" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/library) "dky" = ( @@ -89791,7 +89791,7 @@ /area/library) "dkz" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -89897,7 +89897,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -89996,9 +89996,9 @@ /obj/structure/table/rack{ dir = 1 }, -/obj/item/weapon/extinguisher, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/extinguisher, +/obj/item/flashlight, +/obj/item/flashlight, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, /obj/random/maintenance/clean, @@ -90015,11 +90015,11 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/weapon/storage/box/glasses/coffeecup, -/obj/item/weapon/storage/box/glasses/coffeemug, -/obj/item/weapon/storage/box/glasses/square, -/obj/item/weapon/storage/box/buns, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/glasses/coffeecup, +/obj/item/storage/box/glasses/coffeemug, +/obj/item/storage/box/glasses/square, +/obj/item/storage/box/buns, +/obj/item/storage/box/donut, /obj/machinery/alarm{ dir = 4; pixel_x = -22 @@ -90078,8 +90078,8 @@ /area/library) "dlb" = ( /obj/structure/table/woodentable, -/obj/item/device/tape/random, -/obj/item/device/taperecorder, +/obj/item/rectape/random, +/obj/item/taperecorder, /turf/simulated/floor/wood, /area/library) "dlc" = ( @@ -90167,12 +90167,12 @@ /area/maintenance/substation/civilian) "dlh" = ( /obj/structure/table/marble, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, -/obj/item/device/retail_scanner/civilian{ +/obj/item/hand_labeler, +/obj/item/reagent_containers/food/condiment/small/sugar, +/obj/item/retail_scanner/civilian{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -90273,7 +90273,7 @@ /turf/simulated/floor/tiled/yellow, /area/library) "dls" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/landmark/start{ name = "Barista" }, @@ -90420,18 +90420,18 @@ /obj/machinery/camera/network/civilian{ c_tag = "CIV - Library Office" }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -2; pixel_y = -5 }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = 3 }, /obj/item/clothing/under/suit_jacket/red, /obj/machinery/newscaster{ pixel_x = 30 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -90463,7 +90463,7 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "dlK" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; @@ -90727,12 +90727,12 @@ /area/library) "dmm" = ( /obj/structure/table/woodentable, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /turf/simulated/floor/carpet, /area/library) "dmn" = ( /obj/structure/table/woodentable, -/obj/item/weapon/dice/d20, +/obj/item/dice/d20, /turf/simulated/floor/carpet, /area/library) "dmo" = ( @@ -90745,10 +90745,10 @@ /obj/structure/bookcase{ name = "bookcase (Reference)" }, -/obj/item/weapon/book/codex/lore/vir, -/obj/item/weapon/book/codex/lore/vir, -/obj/item/weapon/book/codex/lore/robutt, -/obj/item/weapon/book/codex/corp_regs, +/obj/item/book/codex/lore/vir, +/obj/item/book/codex/lore/vir, +/obj/item/book/codex/lore/robutt, +/obj/item/book/codex/corp_regs, /turf/simulated/floor/wood, /area/library) "dmq" = ( @@ -90811,7 +90811,7 @@ dir = 4 }, /obj/structure/table/woodentable, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -91025,7 +91025,7 @@ /area/library) "dmW" = ( /obj/structure/table/woodentable, -/obj/item/weapon/dice, +/obj/item/dice, /turf/simulated/floor/carpet, /area/library) "dmX" = ( @@ -91328,7 +91328,7 @@ /turf/simulated/floor/plating, /area/construction/seconddeck/construction2) "dnE" = ( -/obj/item/device/radio/intercom/locked/confessional{ +/obj/item/radio/intercom/locked/confessional{ pixel_y = -21 }, /obj/structure/bed/chair{ @@ -91354,7 +91354,7 @@ /turf/simulated/floor/plating, /area/chapel/main) "dnG" = ( -/obj/item/device/radio/intercom/locked/confessional{ +/obj/item/radio/intercom/locked/confessional{ pixel_y = -21 }, /obj/structure/bed/chair{ @@ -91455,7 +91455,7 @@ /area/shuttle/cryo/station) "dnS" = ( /obj/structure/closet/emcloset, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/machinery/light{ dir = 4 }, @@ -91909,7 +91909,7 @@ /turf/space, /area/shuttle/response_ship/thirddeck) "doC" = ( -/obj/item/weapon/circuitboard/firealarm, +/obj/item/circuitboard/firealarm, /turf/simulated/floor/tiled/freezer, /area/construction/seconddeck/construction2) "doD" = ( @@ -92163,7 +92163,7 @@ /turf/simulated/floor/tiled/freezer, /area/construction/seconddeck/construction2) "dpl" = ( -/obj/item/weapon/circuitboard/airalarm, +/obj/item/circuitboard/airalarm, /turf/simulated/floor/tiled/dark, /area/construction/seconddeck/construction2) "dpm" = ( @@ -92185,7 +92185,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/camera_assembly, +/obj/item/camera_assembly, /turf/simulated/floor/plating, /area/construction/seconddeck/construction2) "dpp" = ( @@ -92597,8 +92597,8 @@ /area/construction/seconddeck/construction2) "dql" = ( /obj/structure/table/standard, -/obj/item/weapon/towel, -/obj/item/weapon/towel, +/obj/item/towel, +/obj/item/towel, /turf/simulated/floor/tiled/freezer, /area/construction/seconddeck/construction2) "dqm" = ( @@ -92612,8 +92612,8 @@ /obj/item/clothing/head/soft/rainbow, /obj/item/clothing/shoes/rainbow, /obj/item/clothing/under/color/rainbow, -/obj/item/weapon/bedsheet/rainbow, -/obj/item/weapon/pen/crayon/rainbow, +/obj/item/bedsheet/rainbow, +/obj/item/pen/crayon/rainbow, /obj/random/crate, /turf/simulated/floor, /area/construction/seconddeck/construction2) @@ -92628,7 +92628,7 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/seconddeck/aft) "dqp" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/plating, /area/construction/seconddeck/construction2) "dqq" = ( @@ -92636,7 +92636,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/plating, /area/construction/seconddeck/construction2) "dqr" = ( @@ -92685,18 +92685,18 @@ /area/construction/seconddeck/construction2) "dqy" = ( /obj/structure/closet/crate/engineering, -/obj/item/weapon/bedsheet/brown, -/obj/item/weapon/coin/silver, -/obj/item/weapon/bedsheet/brown, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, +/obj/item/coin/silver, +/obj/item/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/item/stack/tile/carpet{ amount = 24 }, -/obj/item/weapon/airlock_electronics, +/obj/item/airlock_electronics, /turf/simulated/floor/tiled/dark, /area/construction/seconddeck/construction2) "dqz" = ( -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -92765,13 +92765,13 @@ /area/hallway/secondary/docking_hallway2) "dqG" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/codex/lore/vir, -/obj/item/device/paicard, +/obj/item/book/codex/lore/vir, +/obj/item/paicard, /turf/simulated/floor/carpet, /area/hallway/secondary/entry/docking_lounge) "dqH" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -92822,7 +92822,7 @@ /turf/simulated/floor/tiled, /area/storage/primary) "dqN" = ( -/obj/item/weapon/stool, +/obj/item/stool, /obj/effect/landmark/start{ name = "Assistant" }, @@ -92893,12 +92893,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 }, -/obj/item/weapon/cell/apc, +/obj/item/cell/apc, /turf/simulated/floor/plating, /area/construction/seconddeck/construction2) "dqV" = ( @@ -93167,7 +93167,7 @@ /obj/machinery/computer/secure_data{ dir = 4 }, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 4; icon_override = "secintercom"; pixel_x = -21 @@ -93286,13 +93286,13 @@ /area/maintenance/chapel) "drD" = ( /obj/structure/closet, -/obj/item/weapon/lipstick/purple, +/obj/item/lipstick/purple, /obj/random/maintenance/engineering, /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/item/clothing/glasses/sunglasses, -/obj/item/weapon/storage/bible, +/obj/item/storage/bible, /turf/simulated/floor/plating, /area/maintenance/chapel) "drE" = ( @@ -93328,7 +93328,7 @@ /area/construction/seconddeck/construction2) "drK" = ( /obj/item/frame/extinguisher_cabinet, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/simulated/floor/tiled, /area/construction/seconddeck/construction2) "drL" = ( @@ -93399,19 +93399,19 @@ /area/hallway/secondary/entry/docking_lounge) "drT" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = -5; pixel_y = -1 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = -1; pixel_y = 3 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/wood, /area/hallway/secondary/entry/docking_lounge) "drU" = ( @@ -93478,13 +93478,13 @@ /area/security/checkpoint2) "dsa" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/pen, -/obj/item/device/flash, +/obj/item/tool/crowbar, +/obj/item/pen, +/obj/item/flash, /obj/machinery/camera/network/security{ c_tag = "SEC - Arrival Checkpoint"; dir = 8 @@ -93504,7 +93504,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/gamblingtable, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /turf/simulated/floor/plating, /area/construction/seconddeck/construction2) "dsd" = ( @@ -93604,7 +93604,7 @@ icon_state = "1-2" }, /obj/structure/door_assembly, -/obj/item/weapon/airlock_electronics, +/obj/item/airlock_electronics, /turf/simulated/floor/plating, /area/construction/seconddeck/construction2) "dsp" = ( @@ -93655,9 +93655,9 @@ /area/hallway/secondary/entry/docking_lounge) "dsu" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper, -/obj/item/device/taperecorder, -/obj/item/device/tape/random, +/obj/item/paper, +/obj/item/taperecorder, +/obj/item/rectape/random, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -93696,7 +93696,7 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/tech_supply, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -93759,7 +93759,7 @@ /area/security/checkpoint2) "dsB" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -93814,9 +93814,9 @@ dir = 1 }, /obj/item/clothing/suit/fire/firefighter, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, /obj/item/clothing/mask/gas, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/glasses/meson, /obj/random/maintenance/clean, @@ -93827,8 +93827,8 @@ /area/maintenance/chapel) "dsH" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/device/t_scanner, +/obj/item/storage/box/lights/mixed, +/obj/item/t_scanner, /obj/random/plushielarge, /turf/simulated/floor/plating, /area/maintenance/chapel) @@ -93853,7 +93853,7 @@ "dsL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/seconddeck/aft) "dsM" = ( @@ -93885,7 +93885,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/item/weapon/module/power_control, +/obj/item/module/power_control, /turf/simulated/floor/plating, /area/construction/seconddeck/construction2) "dsQ" = ( @@ -94107,7 +94107,7 @@ /turf/simulated/floor/plating, /area/construction/seconddeck/construction2) "dtq" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -94148,7 +94148,7 @@ /area/construction/seconddeck/construction2) "dtu" = ( /obj/structure/bed/chair, -/obj/item/weapon/handcuffs/fuzzy, +/obj/item/handcuffs/fuzzy, /obj/random/contraband, /turf/simulated/floor, /area/construction/seconddeck/construction2) @@ -94225,7 +94225,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/dockhallway) "dtF" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -94410,7 +94410,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/dockhallway) "dua" = ( -/obj/item/weapon/book/codex/lore/vir, +/obj/item/book/codex/lore/vir, /obj/structure/table/glass, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -94840,7 +94840,7 @@ /obj/machinery/ai_status_display{ pixel_y = -32 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -94901,7 +94901,7 @@ /obj/machinery/ai_status_display{ pixel_y = -32 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -95720,7 +95720,7 @@ /area/hallway/secondary/entry/D1) "dwA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -95750,7 +95750,7 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/secondary/entry/D2) "dwD" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -95760,7 +95760,7 @@ "dwE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -96097,7 +96097,7 @@ /obj/item/stack/material/plastic{ amount = 50 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -96573,7 +96573,7 @@ "dyb" = ( /obj/structure/table/glass, /obj/machinery/recharger, -/obj/item/device/radio{ +/obj/item/radio{ frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link" @@ -96834,7 +96834,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -28 }, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/D2) "dyy" = ( @@ -96851,7 +96851,7 @@ pixel_x = 22 }, /obj/structure/closet/emcloset, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/D2) "dyA" = ( @@ -97475,7 +97475,7 @@ dir = 8; pixel_x = 22 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled, /area/teleporter) "dzB" = ( @@ -97702,7 +97702,7 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/entry/D1) "dzS" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -97711,7 +97711,7 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/entry/D1) "dzT" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -97737,7 +97737,7 @@ /area/hallway/secondary/entry/D2) "dzW" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -97842,7 +97842,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/D2) "dAk" = ( @@ -98312,7 +98312,7 @@ /area/ai) "dBd" = ( /obj/structure/table/standard, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -98321,11 +98321,11 @@ name = "Steve"; pixel_y = 15 }, -/obj/item/device/radio/intercom/custom{ +/obj/item/radio/intercom/custom{ dir = 8; pixel_x = -21 }, -/obj/item/device/radio/intercom/private{ +/obj/item/radio/intercom/private{ dir = 4; pixel_x = 21 }, @@ -98652,7 +98652,7 @@ dir = 4 }, /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/random/medical/lite, /turf/simulated/floor/tiled/white, /area/medical/first_aid_station/seconddeck/port) @@ -98692,15 +98692,15 @@ /obj/effect/landmark{ name = "tripai" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 }, -/obj/item/device/radio/intercom/private{ +/obj/item/radio/intercom/private{ pixel_y = -21 }, -/obj/item/device/radio/intercom/custom{ +/obj/item/radio/intercom/custom{ dir = 1; pixel_y = 21 }, @@ -98842,16 +98842,16 @@ /obj/effect/landmark{ name = "tripai" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 }, -/obj/item/device/radio/intercom/private{ +/obj/item/radio/intercom/private{ dir = 1; pixel_y = 21 }, -/obj/item/device/radio/intercom/custom{ +/obj/item/radio/intercom/custom{ pixel_y = -21 }, /turf/simulated/floor/greengrid, @@ -98880,17 +98880,17 @@ pixel_x = -32; pixel_y = -32 }, -/obj/item/device/radio/intercom/private{ +/obj/item/radio/intercom/private{ dir = 4; pixel_x = 21; pixel_y = -10 }, -/obj/item/device/radio/intercom/custom{ +/obj/item/radio/intercom/custom{ dir = 8; pixel_x = -21; pixel_y = -10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 1; name = "Station Intercom (General)"; pixel_y = -21 @@ -99096,7 +99096,7 @@ name = "north bump"; pixel_y = 24 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -99228,7 +99228,7 @@ name = "north bump"; pixel_y = 24 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -99245,14 +99245,14 @@ }, /obj/item/stack/cable_coil/yellow, /obj/item/stack/cable_coil/yellow, -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/plating, /area/maintenance/solars/forestarboardsolar) "dCZ" = ( /obj/machinery/computer/security{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -99938,10 +99938,10 @@ /area/maintenance/thirddeck/foreport) "dEa" = ( /obj/structure/table/rack, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/mask/gas, -/obj/item/device/flashlight, +/obj/item/flashlight, /obj/item/clothing/glasses/meson, /obj/random/maintenance/cargo, /obj/effect/floor_decal/industrial/warning{ @@ -100154,8 +100154,8 @@ /area/maintenance/thirddeck/foreport) "dEz" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/freeform, -/obj/item/weapon/aiModule/protectStation{ +/obj/item/aiModule/freeform, +/obj/item/aiModule/protectStation{ pixel_x = -3; pixel_y = 2 }, @@ -100191,7 +100191,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/radio/intercom/locked/ai_private{ +/obj/item/radio/intercom/locked/ai_private{ dir = 1; pixel_x = -36; pixel_y = 21 @@ -100216,8 +100216,8 @@ /area/ai/ai_upload) "dEG" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/nanotrasen, -/obj/item/weapon/aiModule/reset{ +/obj/item/aiModule/nanotrasen, +/obj/item/aiModule/reset{ pixel_x = 2; pixel_y = 3 }, @@ -100438,24 +100438,24 @@ /area/maintenance/thirddeck/foreport) "dFe" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/asimov, -/obj/item/weapon/aiModule/freeformcore, +/obj/item/aiModule/asimov, +/obj/item/aiModule/freeformcore, /obj/machinery/door/window{ base_state = "right"; icon_state = "right"; name = "Core Modules"; req_access = list(20) }, -/obj/item/weapon/aiModule/corp, -/obj/item/weapon/aiModule/paladin, -/obj/item/weapon/aiModule/robocop, +/obj/item/aiModule/corp, +/obj/item/aiModule/paladin, +/obj/item/aiModule/robocop, /obj/structure/window/reinforced{ dir = 1 }, /turf/simulated/floor/bluegrid, /area/ai/ai_upload) "dFf" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -100476,7 +100476,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ai/ai_upload) "dFh" = ( -/obj/item/device/radio/intercom/locked/ai_private{ +/obj/item/radio/intercom/locked/ai_private{ dir = 4; pixel_x = 21 }, @@ -100490,16 +100490,16 @@ /area/ai/ai_upload) "dFj" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/oxygen, -/obj/item/weapon/aiModule/oneHuman, +/obj/item/aiModule/oxygen, +/obj/item/aiModule/oneHuman, /obj/machinery/door/window{ dir = 8; name = "High-Risk Modules"; req_access = list(20) }, -/obj/item/weapon/aiModule/purge, -/obj/item/weapon/aiModule/antimov, -/obj/item/weapon/aiModule/teleporterOffline, +/obj/item/aiModule/purge, +/obj/item/aiModule/antimov, +/obj/item/aiModule/teleporterOffline, /obj/structure/window/reinforced{ dir = 1 }, @@ -100633,8 +100633,8 @@ target_pressure = 200 }, /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/belt/utility, /obj/random/maintenance/security, /obj/random/maintenance/security, /obj/random/maintenance/security, @@ -100662,7 +100662,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/obj/item/device/radio/intercom/locked/ai_private{ +/obj/item/radio/intercom/locked/ai_private{ dir = 1; pixel_y = 21 }, @@ -100739,7 +100739,7 @@ /area/ai/ai_cyborg_station) "dFH" = ( /obj/structure/table/standard, -/obj/item/weapon/phone, +/obj/item/phone, /obj/machinery/camera/network/command{ c_tag = "AI - Cyborg Station"; dir = 8 @@ -101055,14 +101055,14 @@ /obj/structure/closet/crate{ name = "Camera Assembly Crate" }, -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, +/obj/item/camera_assembly, +/obj/item/camera_assembly, +/obj/item/camera_assembly, +/obj/item/camera_assembly, /turf/simulated/floor/bluegrid, /area/ai/ai_server_room) "dGj" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -101130,7 +101130,7 @@ /obj/effect/landmark{ name = "JoinLateCyborg" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -101212,8 +101212,8 @@ /area/crew_quarters/heads/sc/hop/quarters) "dGD" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green, -/obj/item/device/radio/intercom{ +/obj/item/flashlight/lamp/green, +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -101313,8 +101313,8 @@ /area/crew_quarters/heads/sc/cmo/quarters) "dGR" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green, -/obj/item/device/radio/intercom{ +/obj/item/flashlight/lamp/green, +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -101326,8 +101326,8 @@ /area/crew_quarters/heads/sc/cmo/quarters) "dGT" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green, -/obj/item/device/radio/intercom{ +/obj/item/flashlight/lamp/green, +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -101370,7 +101370,7 @@ /area/maintenance/thirddeck/foreport) "dGY" = ( /obj/structure/closet, -/obj/item/weapon/storage/backpack, +/obj/item/storage/backpack, /obj/random/maintenance/clean, /obj/random/maintenance/cargo, /turf/simulated/floor/plating, @@ -101413,12 +101413,12 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/blue_hop, -/obj/item/weapon/pen/multi, +/obj/item/folder/blue_hop, +/obj/item/pen/multi, /obj/machinery/computer/security/telescreen/entertainment{ icon_state = "frame"; pixel_x = 32 @@ -101549,12 +101549,12 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/white_cmo, -/obj/item/weapon/pen/multi, +/obj/item/folder/white_cmo, +/obj/item/pen/multi, /obj/machinery/computer/security/telescreen/entertainment{ icon_state = "frame"; pixel_x = 32 @@ -101566,12 +101566,12 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/white_rd, -/obj/item/weapon/pen/multi, +/obj/item/folder/white_rd, +/obj/item/pen/multi, /obj/machinery/computer/security/telescreen/entertainment{ icon_state = "frame"; pixel_x = -32 @@ -101612,7 +101612,7 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/sc/hor/quarters) "dHr" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/random/maintenance/security, /obj/random/maintenance/security, /obj/random/maintenance/security, @@ -101669,7 +101669,7 @@ /area/crew_quarters/heads/sc/hop/quarters) "dHw" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hop, +/obj/item/bedsheet/hop, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -101771,7 +101771,7 @@ /obj/effect/floor_decal/corner/blue/bordercorner{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -101801,7 +101801,7 @@ /area/crew_quarters/heads/sc/cmo/quarters) "dHL" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -101810,7 +101810,7 @@ /area/crew_quarters/heads/sc/cmo/quarters) "dHM" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/rd, +/obj/item/bedsheet/rd, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -103230,7 +103230,7 @@ /obj/effect/floor_decal/corner/blue/bordercorner{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -103322,7 +103322,7 @@ "dKq" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/blue/bordercorner, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -103678,7 +103678,7 @@ /obj/structure/bed/chair{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -103799,7 +103799,7 @@ pixel_x = 11; pixel_y = 24 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -103808,7 +103808,7 @@ /area/crew_quarters/heads/sc/restroom) "dLu" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/ce, +/obj/item/bedsheet/ce, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -103924,7 +103924,7 @@ /area/crew_quarters/heads/sc/hos/quarters) "dLF" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -103937,7 +103937,7 @@ pixel_x = -24 }, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/sc/bs) "dLH" = ( @@ -104018,7 +104018,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -104143,12 +104143,12 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/yellow_ce, -/obj/item/weapon/pen/multi, +/obj/item/folder/yellow_ce, +/obj/item/pen/multi, /obj/machinery/computer/security/telescreen/entertainment{ icon_state = "frame"; pixel_x = -32 @@ -104311,12 +104311,12 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/red_hos, -/obj/item/weapon/pen/multi, +/obj/item/folder/red_hos, +/obj/item/pen/multi, /obj/machinery/computer/security/telescreen/entertainment{ icon_state = "frame"; pixel_x = 32 @@ -104332,12 +104332,12 @@ pixel_x = -32 }, /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen/multi, +/obj/item/folder/blue, +/obj/item/pen/multi, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/sc/bs) "dMq" = ( @@ -104459,8 +104459,8 @@ /area/crew_quarters/heads/sc/restroom) "dMF" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green, -/obj/item/device/radio/intercom{ +/obj/item/flashlight/lamp/green, +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -104514,7 +104514,7 @@ /obj/effect/floor_decal/corner/blue/bordercorner{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -104633,8 +104633,8 @@ /area/crew_quarters/heads/sc/hos/quarters) "dMU" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green, -/obj/item/device/radio/intercom{ +/obj/item/flashlight/lamp/green, +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -104642,13 +104642,13 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/sc/hos/quarters) "dMV" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 }, /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/sc/bs) "dMW" = ( @@ -104795,7 +104795,7 @@ /area/hallway/primary/thirddeck/central) "dNp" = ( /obj/structure/closet, -/obj/item/weapon/storage/backpack, +/obj/item/storage/backpack, /obj/random/maintenance/medical, /obj/random/maintenance/medical, /obj/random/maintenance/medical, @@ -104957,15 +104957,15 @@ icon_state = "frame"; pixel_x = -32 }, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet, /area/crew_quarters/heads/sc/sd) "dNM" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/storage/photo_album{ +/obj/item/storage/photo_album{ pixel_y = -10 }, -/obj/item/device/camera, +/obj/item/camera, /obj/machinery/firealarm{ pixel_y = 24 }, @@ -104973,7 +104973,7 @@ /area/crew_quarters/heads/sc/sd) "dNN" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /turf/simulated/floor/carpet, /area/crew_quarters/heads/sc/sd) "dNO" = ( @@ -105003,8 +105003,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/weapon/soap/deluxe, -/obj/item/weapon/towel{ +/obj/item/soap/deluxe, +/obj/item/towel{ color = "#FFD700"; name = "gold towel" }, @@ -105015,7 +105015,7 @@ /area/crew_quarters/heads/sc/sd) "dNR" = ( /obj/structure/closet, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance/clean, /obj/random/maintenance/engineering, @@ -105171,13 +105171,13 @@ "dOj" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/storage/box/matches, +/obj/item/storage/box/matches, /obj/item/clothing/mask/smokable/cigarette/cigar, -/obj/item/weapon/reagent_containers/food/drinks/flask{ +/obj/item/reagent_containers/food/drinks/flask{ pixel_x = 8 }, /obj/random_multi/single_item/captains_spare_id, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -105241,8 +105241,8 @@ /area/crew_quarters/heads/sc/sd) "dOq" = ( /obj/item/clothing/mask/gas, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance/research, /obj/random/maintenance/research, @@ -105300,8 +105300,8 @@ /area/bridge/meeting_room) "dOw" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/blue{ +/obj/item/folder/red, +/obj/item/folder/blue{ pixel_x = -2; pixel_y = -2 }, @@ -105309,11 +105309,11 @@ /area/bridge/meeting_room) "dOx" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/effect/landmark{ name = "blobstart" }, @@ -105327,7 +105327,7 @@ /area/bridge/meeting_room) "dOy" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/book/codex/corp_regs, +/obj/item/book/codex/corp_regs, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -105566,7 +105566,7 @@ health = 1e+006 }, /obj/machinery/door/window/northright, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/heads/sc/sd) "dOU" = ( @@ -105576,8 +105576,8 @@ /area/maintenance/thirddeck/aftstarboard) "dOV" = ( /obj/item/clothing/mask/gas, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance/medical, /obj/random/maintenance/medical, @@ -105777,7 +105777,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -105855,7 +105855,7 @@ /area/bridge/meeting_room) "dPx" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/wood, /area/bridge/meeting_room) "dPy" = ( @@ -105987,7 +105987,7 @@ /obj/machinery/photocopier/faxmachine{ department = "Captain's Office" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -106070,9 +106070,9 @@ /area/bridge/meeting_room) "dPS" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/hand_labeler, -/obj/item/device/retail_scanner/command, -/obj/item/device/radio/intercom{ +/obj/item/hand_labeler, +/obj/item/retail_scanner/command, +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -106133,7 +106133,7 @@ /turf/simulated/floor/tiled, /area/bridge) "dQb" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -106183,8 +106183,8 @@ }, /obj/item/roller, /obj/item/bodybag/cryobag, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/pill_bottle/spaceacillin, +/obj/item/storage/firstaid/regular, +/obj/item/storage/pill_bottle/spaceacillin, /turf/simulated/floor/tiled, /area/bridge) "dQe" = ( @@ -106225,7 +106225,7 @@ name = "defibrillator closet"; pixel_y = 31 }, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled, /area/bridge) "dQi" = ( @@ -106241,7 +106241,7 @@ /turf/simulated/floor/tiled, /area/bridge) "dQj" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -106557,7 +106557,7 @@ "dQL" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/armor/captain, /obj/item/clothing/head/helmet/space/capspace, @@ -106588,13 +106588,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/blue, -/obj/item/device/megaphone, -/obj/item/weapon/pen/multi, +/obj/item/folder/blue, +/obj/item/megaphone, +/obj/item/pen/multi, /turf/simulated/floor/wood, /area/crew_quarters/heads/sc/sd) "dQO" = ( @@ -106604,17 +106604,17 @@ /area/crew_quarters/heads/sc/sd) "dQP" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/folder/blue_captain, -/obj/item/weapon/stamp/denied{ +/obj/item/folder/blue_captain, +/obj/item/stamp/denied{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/stamp/captain, +/obj/item/stamp/captain, /turf/simulated/floor/wood, /area/crew_quarters/heads/sc/sd) "dQQ" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/machinery/newscaster/security_unit{ pixel_x = 32 }, @@ -106653,7 +106653,7 @@ /area/maintenance/thirddeck/aftport) "dQU" = ( /obj/structure/closet, -/obj/item/weapon/storage/backpack, +/obj/item/storage/backpack, /obj/random/maintenance/clean, /obj/random/maintenance/cargo, /obj/random/maintenance/clean, @@ -106678,7 +106678,7 @@ /obj/machinery/keycard_auth{ pixel_y = 24 }, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /turf/simulated/floor/wood, /area/bridge/meeting_room) "dQX" = ( @@ -106743,9 +106743,9 @@ /area/bridge) "dRe" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, -/obj/item/device/flashlight, -/obj/item/device/flashlight{ +/obj/item/folder/yellow, +/obj/item/flashlight, +/obj/item/flashlight{ pixel_x = 2; pixel_y = 2 }, @@ -106825,9 +106825,9 @@ /area/bridge) "dRk" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/device/multitool, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/box/lights/mixed, +/obj/item/multitool, +/obj/item/storage/toolbox/mechanical, /obj/structure/window/reinforced{ dir = 4 }, @@ -106975,9 +106975,9 @@ /area/crew_quarters/heads/sc/sd) "dRv" = ( /obj/structure/table/woodentable, -/obj/item/weapon/melee/chainofcommand, -/obj/item/weapon/hand_tele, -/obj/item/device/radio/intercom{ +/obj/item/melee/chainofcommand, +/obj/item/hand_tele, +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -107049,7 +107049,7 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "dRF" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -107115,9 +107115,9 @@ /area/crew_quarters/heads/sc/sd) "dRO" = ( /obj/structure/closet/crate/internals, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/double, /obj/random/tank, /obj/random/maintenance/research, /obj/random/maintenance/research, @@ -107231,7 +107231,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, @@ -107345,7 +107345,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/white/border, /turf/simulated/floor/tiled, @@ -107395,15 +107395,15 @@ /area/crew_quarters/heads/sc/sd) "dSo" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/codex/corp_regs, -/obj/item/device/tape/random, -/obj/item/device/taperecorder, +/obj/item/book/codex/corp_regs, +/obj/item/rectape/random, +/obj/item/taperecorder, /turf/simulated/floor/carpet, /area/crew_quarters/heads/sc/sd) "dSp" = ( /obj/structure/table/woodentable, /obj/machinery/recharger, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 5; pixel_y = -26 }, @@ -107540,17 +107540,17 @@ /area/bridge/meeting_room) "dSH" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_y = -5 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/wood, /area/bridge/meeting_room) "dSI" = ( @@ -107563,7 +107563,7 @@ /area/bridge/meeting_room) "dSJ" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -107572,13 +107572,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_y = -5 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/wood, /area/bridge/meeting_room) "dSK" = ( @@ -107645,7 +107645,7 @@ /obj/machinery/newscaster{ pixel_y = -30 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/effect/floor_decal/borderfloor{ dir = 10 }, @@ -107656,11 +107656,11 @@ /area/bridge) "dSO" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/PDAs{ +/obj/item/storage/box/PDAs{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/ids, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled, @@ -107694,10 +107694,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/folder/red, +/obj/item/folder/blue, +/obj/item/pen, /obj/machinery/light, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, @@ -107723,9 +107723,9 @@ /area/bridge) "dSS" = ( /obj/structure/table/reinforced, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/aicard, +/obj/item/flash, +/obj/item/flash, +/obj/item/aicard, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled, @@ -107745,7 +107745,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 6 }, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/tiled, /area/bridge) "dSU" = ( @@ -107826,7 +107826,7 @@ /area/crew_quarters/heads/sc/sd) "dSZ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/carpet, /area/crew_quarters/heads/sc/sd) "dTa" = ( @@ -107849,7 +107849,7 @@ /obj/structure/table/rack, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/suit/storage/hazardvest, -/obj/item/device/radio, +/obj/item/radio, /obj/random/maintenance/medical, /obj/random/maintenance/medical, /obj/effect/floor_decal/industrial/warning{ @@ -107862,10 +107862,10 @@ /area/maintenance/thirddeck/aftstarboard) "dTd" = ( /obj/structure/table/rack, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/mask/gas, -/obj/item/device/flashlight, +/obj/item/flashlight, /obj/item/clothing/glasses/meson, /obj/random/maintenance/cargo, /obj/random/cash, @@ -108743,7 +108743,7 @@ dir = 1 }, /obj/machinery/light/small, -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/plating, /area/maintenance/solars/aftportsolar) "dUm" = ( @@ -108752,7 +108752,7 @@ name = "south bump"; pixel_y = -24 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -108823,7 +108823,7 @@ /area/maintenance/thirddeck/aftstarboard) "dUx" = ( /obj/structure/cable, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -108896,8 +108896,8 @@ /area/maintenance/thirddeck/aftport) "dUD" = ( /obj/structure/closet/wardrobe/grey, -/obj/item/weapon/storage/backpack, -/obj/item/weapon/storage/backpack, +/obj/item/storage/backpack, +/obj/item/storage/backpack, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, @@ -108912,10 +108912,10 @@ /area/maintenance/thirddeck/aftport) "dUF" = ( /obj/structure/table/rack, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/mask/gas, -/obj/item/device/flashlight, +/obj/item/flashlight, /obj/item/clothing/glasses/meson, /obj/random/maintenance/cargo, /turf/simulated/floor, @@ -108924,7 +108924,7 @@ /obj/structure/table/rack{ dir = 4 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/random/maintenance/engineering, /obj/random/maintenance/engineering, /obj/random/maintenance/engineering, @@ -109004,7 +109004,7 @@ /turf/space, /area/space) "dUP" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -109049,7 +109049,7 @@ name = "defibrillator closet"; pixel_y = -31 }, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled/white, /area/medical/first_aid_station/seconddeck/port) "dUS" = ( @@ -109068,8 +109068,8 @@ }, /obj/item/roller, /obj/item/bodybag/cryobag, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/pill_bottle/spaceacillin, +/obj/item/storage/firstaid/regular, +/obj/item/storage/pill_bottle/spaceacillin, /turf/simulated/floor/tiled/white, /area/medical/first_aid_station/seconddeck/port) "dUT" = ( @@ -109155,7 +109155,7 @@ /turf/simulated/floor/tiled/dark, /area/construction/seconddeck/construction2) "dVa" = ( -/obj/item/weapon/camera_assembly, +/obj/item/camera_assembly, /turf/simulated/floor/tiled, /area/construction/seconddeck/construction2) "dVb" = ( @@ -109179,8 +109179,8 @@ "dVd" = ( /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/wirecutters, +/obj/item/tool/crowbar, +/obj/item/tool/wirecutters, /obj/random/maintenance/medical, /obj/random/maintenance/medical, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -109193,7 +109193,7 @@ /area/construction/seconddeck/construction2) "dVf" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/mime, +/obj/item/bedsheet/mime, /turf/simulated/floor/plating, /area/construction/seconddeck/construction2) "dVg" = ( @@ -109410,7 +109410,7 @@ /area/rnd/xenobiology/xenoflora) "dVE" = ( /obj/structure/reagent_dispensers/watertank/high, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -109511,18 +109511,18 @@ /area/rnd/xenobiology/xenoflora) "dVU" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/botanydisk, +/obj/item/storage/box/botanydisk, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, /obj/effect/floor_decal/corner/green/border{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -109643,11 +109643,11 @@ /area/rnd/research/firstdeck/hallway) "dWj" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora) "dWk" = ( @@ -109657,9 +109657,9 @@ /area/rnd/xenobiology/xenoflora) "dWl" = ( /obj/structure/table/glass, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/folder/white, +/obj/item/pen, /obj/machinery/camera/network/research{ c_tag = "SCI - Xenoflora Port"; dir = 1 @@ -109668,11 +109668,11 @@ /area/rnd/xenobiology/xenoflora) "dWm" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora) @@ -109699,9 +109699,9 @@ /area/rnd/xenobiology/xenoflora) "dWo" = ( /obj/structure/table/glass, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/weapon/tape_roll, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, +/obj/item/tape_roll, +/obj/item/analyzer/plant_analyzer, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora) "dWp" = ( @@ -109920,7 +109920,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 1 }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora_isolation) "dWR" = ( @@ -110430,7 +110430,7 @@ /area/rnd/research/firstdeck/hallway) "dXG" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/simulated/floor/tiled/dark, /area/rnd/research/firstdeck/hallway) "dXH" = ( @@ -110489,7 +110489,7 @@ /area/rnd/research/firstdeck/hallway) "dXP" = ( /obj/structure/table/glass, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -110677,9 +110677,9 @@ /obj/structure/table/glass, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/science, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/item/clothing/head/welding, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -110705,7 +110705,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "dYp" = ( -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/structure/catwalk, /obj/structure/door_assembly/door_assembly_ext, /turf/simulated/floor/plating, @@ -110733,7 +110733,7 @@ /turf/space, /area/space) "dYs" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -110893,10 +110893,10 @@ /area/rnd/xenobiology) "dYB" = ( /obj/structure/table/glass, -/obj/item/weapon/surgical/scalpel{ +/obj/item/surgical/scalpel{ pixel_y = 12 }, -/obj/item/weapon/surgical/circular_saw, +/obj/item/surgical/circular_saw, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology) "dYC" = ( @@ -110922,7 +110922,7 @@ /obj/structure/closet, /obj/item/toy/figure/scientist, /obj/item/clothing/accessory/armband/science, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/item/clothing/shoes/galoshes, /obj/structure/disposalpipe/segment{ dir = 4 @@ -110940,7 +110940,7 @@ /turf/simulated/floor/airless, /area/rnd/xenobiology) "dYH" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -111069,7 +111069,7 @@ /area/rnd/xenobiology) "dYR" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for the divider between pens."; id = "xenobioout7station"; @@ -111146,7 +111146,7 @@ /area/rnd/research/firstdeck/hallway) "dYZ" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, @@ -111336,10 +111336,10 @@ /area/rnd/research/firstdeck/hallway) "dZr" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_y = 3 }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 5 }, /turf/simulated/floor/tiled, @@ -111395,8 +111395,8 @@ dir = 1; health = 1e+006 }, -/obj/item/weapon/melee/baton/slime/loaded, -/obj/item/weapon/gun/energy/taser/xeno, +/obj/item/melee/baton/slime/loaded, +/obj/item/gun/energy/taser/xeno, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "dZx" = ( @@ -111491,9 +111491,9 @@ /area/rnd/research/firstdeck/hallway) "dZF" = ( /obj/structure/table/standard, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/folder, +/obj/item/pen, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "dZG" = ( @@ -111518,7 +111518,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/item/glass_jar, /obj/item/glass_jar, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -111606,15 +111606,15 @@ /area/rnd/xenobiology) "dZP" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = -5; pixel_y = -1 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = -1; pixel_y = 3 }, @@ -111643,14 +111643,14 @@ /area/rnd/xenobiology) "dZR" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped, +/obj/item/reagent_containers/food/snacks/monkeycube/wrapped, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -111698,7 +111698,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenobiology) "dZV" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -111730,7 +111730,7 @@ /obj/machinery/recharger/wallcharger{ pixel_x = 36 }, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/machinery/camera/network/research{ c_tag = "SCI - Xenobiology Starboard"; dir = 8 @@ -111767,7 +111767,7 @@ dir = 4; pixel_x = 5 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -111838,7 +111838,7 @@ "eae" = ( /obj/structure/table/standard, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "eaf" = ( @@ -111896,7 +111896,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -112023,16 +112023,16 @@ /obj/structure/table/standard, /obj/structure/window/reinforced, /obj/item/clothing/gloves/sterile/latex, -/obj/item/weapon/hand_labeler, -/obj/item/device/slime_scanner, -/obj/item/device/slime_scanner, +/obj/item/hand_labeler, +/obj/item/slime_scanner, +/obj/item/slime_scanner, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "ear" = ( /obj/structure/table/standard, /obj/structure/window/reinforced, -/obj/item/weapon/melee/baton/slime/loaded, -/obj/item/weapon/gun/energy/taser/xeno, +/obj/item/melee/baton/slime/loaded, +/obj/item/gun/energy/taser/xeno, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "eas" = ( @@ -112042,7 +112042,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled, /area/rnd/xenobiology) "eat" = ( @@ -112103,7 +112103,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/machinery/camera/network/research{ c_tag = "SCI - Xenobiology Access"; dir = 1 @@ -112267,7 +112267,7 @@ /area/maintenance/firstdeck/centralstarboard) "eaL" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -112347,7 +112347,7 @@ /area/rnd/xenobiology) "eaR" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -112523,7 +112523,7 @@ /area/rnd/xenobiology) "ebc" = ( /obj/structure/closet/firecloset/full/double, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -112589,10 +112589,10 @@ /area/security/checkpoint3) "ebl" = ( /obj/structure/table/steel, -/obj/item/device/communicator, -/obj/item/device/communicator, -/obj/item/device/radio/headset, -/obj/item/device/radio/headset, +/obj/item/communicator, +/obj/item/communicator, +/obj/item/radio/headset, +/obj/item/radio/headset, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -112716,7 +112716,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/research_lockerroom) "ebv" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -112793,14 +112793,14 @@ "ebC" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, -/obj/item/weapon/clipboard, -/obj/item/weapon/clipboard, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/pen, +/obj/item/clipboard, +/obj/item/clipboard, +/obj/item/storage/firstaid/regular{ pixel_x = 5; pixel_y = 5 }, @@ -112943,59 +112943,59 @@ /turf/simulated/floor/plating, /area/maintenance/substation/central) "ebQ" = ( -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/machinery/light, @@ -113213,7 +113213,7 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "ecg" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 5; pixel_y = -29 }, @@ -114130,12 +114130,12 @@ "edV" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/red, -/obj/item/weapon/pen/blue{ +/obj/item/pen/red, +/obj/item/pen/blue{ pixel_x = 4; pixel_y = 4 }, @@ -114145,8 +114145,8 @@ "edW" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, +/obj/item/clipboard, +/obj/item/folder/yellow, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/engineering/foyer) diff --git a/maps/southern_cross/southern_cross-3.dmm b/maps/southern_cross/southern_cross-3.dmm index cc8b96536d1..53dec7725d8 100644 --- a/maps/southern_cross/southern_cross-3.dmm +++ b/maps/southern_cross/southern_cross-3.dmm @@ -201,7 +201,7 @@ }, /area/surface/outside/ocean) "aI" = ( -/obj/item/weapon/banner/nt, +/obj/item/banner/nt, /turf/simulated/floor/outdoors/snow/sif/planetuse, /area/surface/outside/plains/outpost) "aJ" = ( @@ -258,7 +258,7 @@ /area/surface/outpost/mining_main/storage) "aT" = ( /obj/structure/table/steel, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /obj/effect/floor_decal/corner/brown{ dir = 5 }, @@ -271,7 +271,7 @@ "aU" = ( /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high, +/obj/item/cell/high, /obj/effect/floor_decal/corner/brown{ dir = 5 }, @@ -305,29 +305,29 @@ /area/surface/outpost/mining_main/storage) "aW" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/pickaxe, +/obj/item/storage/belt/utility, +/obj/item/pickaxe, /obj/effect/floor_decal/corner/brown/full{ dir = 8 }, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, /turf/simulated/floor/tiled, /area/surface/outpost/mining_main) "aX" = ( /obj/effect/floor_decal/corner/brown{ dir = 5 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 }, /obj/structure/table/steel, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/tool/crowbar, +/obj/item/tool/wrench, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled, /area/surface/outpost/mining_main) "aY" = ( @@ -357,9 +357,9 @@ /area/surface/outpost/mining_main) "ba" = ( /obj/structure/table/steel, -/obj/item/weapon/mining_scanner, -/obj/item/weapon/mining_scanner, -/obj/item/weapon/mining_scanner, +/obj/item/mining_scanner, +/obj/item/mining_scanner, +/obj/item/mining_scanner, /obj/effect/floor_decal/corner/brown{ dir = 5 }, @@ -375,7 +375,7 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -741,10 +741,10 @@ /area/surface/outpost/mining_main/storage) "bW" = ( /obj/structure/table/rack, -/obj/item/weapon/pickaxe, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/shovel, +/obj/item/pickaxe, +/obj/item/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/shovel, /obj/effect/floor_decal/corner/brown{ dir = 10 }, @@ -752,10 +752,10 @@ /area/surface/outpost/mining_main/storage) "bX" = ( /obj/structure/table/rack, -/obj/item/weapon/pickaxe, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/shovel, +/obj/item/pickaxe, +/obj/item/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/shovel, /obj/effect/floor_decal/corner/brown{ dir = 10 }, @@ -855,13 +855,13 @@ /turf/simulated/floor/tiled, /area/surface/outpost/main/security) "cj" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 }, /obj/structure/table/standard, -/obj/item/weapon/book/codex/corp_regs, +/obj/item/book/codex/corp_regs, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -904,8 +904,8 @@ }, /obj/structure/table/glass, /obj/machinery/recharger, -/obj/item/weapon/tool/screwdriver, -/obj/item/device/defib_kit/loaded, +/obj/item/tool/screwdriver, +/obj/item/defib_kit/loaded, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -1000,9 +1000,9 @@ /turf/simulated/floor/tiled, /area/surface/outpost/mining_main) "cA" = ( -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/tool/crowbar, +/obj/item/tool/wrench, +/obj/item/storage/toolbox/mechanical, /obj/structure/table/steel, /obj/machinery/light, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -1078,7 +1078,7 @@ /turf/simulated/wall, /area/surface/outpost/main/gateway) "cL" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -1145,8 +1145,8 @@ /obj/structure/window/reinforced, /obj/structure/table/rack, /obj/item/bodybag/cryobag, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/firstaid/regular, /obj/random/medical/lite, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -1181,13 +1181,13 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/weapon/extinguisher, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/extinguisher, /obj/machinery/light/small{ dir = 4 }, @@ -1276,7 +1276,7 @@ pixel_y = 23 }, /obj/structure/table/standard, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -1380,8 +1380,8 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/tool/wrench, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, @@ -1432,9 +1432,9 @@ /turf/simulated/floor/plating, /area/surface/outpost/mining_main/emergencystorage) "dz" = ( -/obj/item/device/t_scanner, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/t_scanner, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/structure/table/steel, /obj/random/maintenance/engineering, /obj/random/maintenance/clean, @@ -2160,13 +2160,13 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/device/flash, -/obj/item/weapon/pen, -/obj/item/weapon/tool/crowbar, +/obj/item/flash, +/obj/item/pen, +/obj/item/tool/crowbar, /obj/machinery/light, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -2231,8 +2231,8 @@ /area/surface/outpost/main/gateway) "eY" = ( /obj/structure/closet/emcloset, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/machinery/light_switch{ pixel_x = 11; @@ -2269,7 +2269,7 @@ /area/surface/outpost/main/first_aid) "fb" = ( /obj/structure/table/glass, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /obj/item/bodybag, /obj/item/bodybag/cryobag, /obj/effect/floor_decal/borderfloorwhite/corner, @@ -2282,11 +2282,11 @@ dir = 8 }, /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 0; pixel_y = 0 }, @@ -2297,11 +2297,11 @@ /area/surface/outpost/main/first_aid) "fd" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 0; pixel_y = 0 }, @@ -2577,8 +2577,8 @@ name = "explorer crate"; req_access = list(43) }, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /turf/simulated/floor/tiled, /area/surface/outpost/main/security) "fz" = ( @@ -2617,8 +2617,8 @@ name = "explorer crate"; req_access = list(43) }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/pill_bottle/spaceacillin, +/obj/item/storage/firstaid/regular, +/obj/item/storage/pill_bottle/spaceacillin, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /turf/simulated/floor/tiled, @@ -2887,7 +2887,7 @@ c_tag = "MO - SAR Prep"; dir = 2 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -2898,7 +2898,7 @@ /obj/structure/closet/secure_closet/medical_wall/pills{ pixel_y = 32 }, -/obj/item/weapon/storage/pill_bottle/spaceacillin, +/obj/item/storage/pill_bottle/spaceacillin, /turf/simulated/floor/tiled, /area/surface/outpost/main/first_aid) "gg" = ( @@ -3179,7 +3179,7 @@ /turf/simulated/floor/tiled, /area/surface/outpost/main/first_aid) "gG" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled, /area/surface/outpost/main/first_aid) "gH" = ( @@ -3307,7 +3307,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -3327,16 +3327,16 @@ dir = 8; layer = 2.6 }, -/obj/item/device/gps/explorer{ +/obj/item/gps/explorer{ pixel_x = -5; pixel_y = -5 }, -/obj/item/device/gps/explorer{ +/obj/item/gps/explorer{ pixel_x = -3; pixel_y = -3 }, -/obj/item/device/gps, -/obj/item/device/gps{ +/obj/item/gps, +/obj/item/gps{ pixel_x = 3; pixel_y = 3 }, @@ -3358,7 +3358,7 @@ /obj/structure/closet/secure_closet/explorer, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/floor/tiled, /area/surface/outpost/main/security) "he" = ( @@ -3383,7 +3383,7 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /obj/machinery/alarm{ dir = 1; pixel_y = -22 @@ -3427,10 +3427,10 @@ /area/surface/outpost/main/first_aid) "hl" = ( /obj/structure/table/steel, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/device/multitool, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/storage/toolbox/mechanical, +/obj/item/multitool, /obj/machinery/ai_status_display{ pixel_y = -32 }, @@ -3453,21 +3453,21 @@ pixel_x = 0; pixel_y = -32 }, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, /obj/machinery/iv_drip, /turf/simulated/floor/tiled, /area/surface/outpost/main/first_aid) "ho" = ( /obj/structure/closet/secure_closet/sar, /obj/machinery/light, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/white/border, /obj/item/roller/adv, -/obj/item/weapon/storage/pill_bottle/spaceacillin, +/obj/item/storage/pill_bottle/spaceacillin, /turf/simulated/floor/tiled, /area/surface/outpost/main/first_aid) "hp" = ( @@ -3477,7 +3477,7 @@ /obj/item/roller/adv{ pixel_y = 5 }, -/obj/item/weapon/storage/pill_bottle/spaceacillin, +/obj/item/storage/pill_bottle/spaceacillin, /turf/simulated/floor/tiled, /area/surface/outpost/main/first_aid) "hq" = ( @@ -3493,8 +3493,8 @@ /area/surface/outpost/main/first_aid) "hr" = ( /obj/structure/table/steel, -/obj/item/device/gps/medical, -/obj/item/device/gps/medical{ +/obj/item/gps/medical, +/obj/item/gps/medical{ pixel_x = 3; pixel_y = 3 }, @@ -3740,11 +3740,11 @@ pixel_x = 0; pixel_y = -32 }, -/obj/item/device/paicard, +/obj/item/paicard, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/melee/umbrella/random, +/obj/item/hand_labeler, +/obj/item/melee/umbrella/random, /turf/simulated/floor/tiled, /area/surface/outpost/main/security) "hY" = ( @@ -3773,7 +3773,7 @@ /area/surface/outpost/main/garage) "id" = ( /obj/structure/table/steel, -/obj/item/weapon/weldpack, +/obj/item/weldpack, /turf/simulated/floor/plating, /area/surface/outpost/main/garage) "ie" = ( @@ -3807,8 +3807,8 @@ /area/surface/outpost/main/garage) "ij" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/emergency{ pixel_x = 5; pixel_y = 5 }, @@ -3930,7 +3930,7 @@ /turf/simulated/floor/plating, /area/surface/outpost/mining_main/gen_room) "iw" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -4015,7 +4015,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -4032,7 +4032,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -25 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/plating, /area/surface/outpost/main/garage) "iG" = ( @@ -4043,13 +4043,13 @@ /area/surface/outpost/main/garage) "iI" = ( /obj/structure/table/steel, -/obj/item/weapon/weldingtool, -/obj/item/device/floor_painter, +/obj/item/weldingtool, +/obj/item/floor_painter, /turf/simulated/floor/tiled/steel_grid, /area/surface/outpost/main/garage) "iJ" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/machinery/light/small{ dir = 8; pixel_x = 0 @@ -4097,7 +4097,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -4187,7 +4187,7 @@ /area/surface/outpost/main/telecomms) "iX" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /obj/machinery/power/apc{ dir = 2; name = "south bump"; @@ -4201,7 +4201,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /turf/simulated/floor/tiled, /area/surface/outpost/main/teleporter) "iY" = ( @@ -4209,7 +4209,7 @@ /area/surface/outpost/main/teleporter) "iZ" = ( /obj/machinery/bluespace_beacon, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -4235,7 +4235,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -4494,7 +4494,7 @@ "jA" = ( /obj/structure/table/steel, /obj/machinery/recharger, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/plating, /area/surface/outpost/main/gen_room) "jB" = ( @@ -5021,7 +5021,7 @@ icon_state = "4-8" }, /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/random/tech_supply, /obj/random/tech_supply, /turf/simulated/floor/plating, @@ -5098,7 +5098,7 @@ /area/surface/outpost/main/garage) "kI" = ( /obj/item/inflatable/door/torn, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /turf/simulated/floor, /area/surface/outpost/main/garage) "kJ" = ( @@ -5418,7 +5418,7 @@ /turf/simulated/floor/plating, /area/surface/outpost/main/construction_area) "ly" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/plating, /area/surface/outpost/main/construction_area) "lz" = ( @@ -5458,7 +5458,7 @@ icon_state = "alarm0"; pixel_x = -22 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/saltshaker, /obj/random/maintenance/engineering, /obj/random/maintenance/engineering, /turf/simulated/floor/plating, @@ -5468,7 +5468,7 @@ /area/surface/outpost/main/bar) "lF" = ( /obj/structure/table/marble, -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/plating, /area/surface/outpost/main/bar) "lG" = ( @@ -5503,7 +5503,7 @@ pixel_x = 24 }, /obj/item/frame/extinguisher_cabinet, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/simulated/floor/plating, /area/surface/outpost/main/bar) "lJ" = ( @@ -5516,7 +5516,7 @@ /turf/simulated/floor/tiled/steel/sif/planetuse, /area/surface/outpost/main/corridor) "lL" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -5701,7 +5701,7 @@ /area/surface/outpost/main) "mf" = ( /obj/structure/closet/toolcloset, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/simulated/floor/plating, /area/surface/outpost/main/construction_area) "mg" = ( @@ -5736,7 +5736,7 @@ c_tag = "MO - Bar West"; dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -5756,7 +5756,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/plating, /area/surface/outpost/main/bar) "mn" = ( @@ -5780,7 +5780,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/weapon/stock_parts/motor, +/obj/item/stock_parts/motor, /turf/simulated/floor/plating, /area/surface/outpost/main/bar) "mq" = ( @@ -5852,7 +5852,7 @@ "mz" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/machinery/light{ dir = 4; icon_state = "tube1" @@ -5937,7 +5937,7 @@ /turf/simulated/floor/tiled, /area/surface/outpost/main) "mH" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -5968,9 +5968,9 @@ /area/surface/outpost/main) "mK" = ( /obj/structure/closet/crate, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /obj/item/frame/light, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/plating, /area/surface/outpost/main/construction_area) "mL" = ( @@ -6028,7 +6028,7 @@ /area/surface/outpost/main/bar) "mR" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/machinery/camera/network/main_outpost{ c_tag = "MO - Bar East"; dir = 8 @@ -6076,7 +6076,7 @@ /area/surface/outpost/main/gym) "mY" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/alarm{ dir = 8; icon_state = "alarm0"; @@ -6119,7 +6119,7 @@ icon_state = "tube1"; pixel_x = 0 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -6305,13 +6305,13 @@ /area/surface/outpost/main/gym) "nA" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /obj/machinery/computer/security/telescreen/entertainment{ icon_state = "frame"; pixel_x = 32; pixel_y = 0 }, -/obj/item/weapon/book/codex/lore/vir, +/obj/item/book/codex/lore/vir, /turf/simulated/floor/tiled, /area/surface/outpost/main/gym) "nB" = ( @@ -6363,7 +6363,7 @@ /turf/simulated/floor/plating, /area/surface/outpost/main/construction_area) "nI" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -6444,7 +6444,7 @@ /turf/simulated/floor/tiled, /area/surface/outpost/main/gym) "nS" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled, /area/surface/outpost/main/gym) "nT" = ( @@ -6476,7 +6476,7 @@ /turf/simulated/floor/tiled, /area/surface/outpost/main/gym) "nV" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/structure/cable/blue{ d2 = 8; icon_state = "0-8" @@ -6565,8 +6565,8 @@ /area/surface/outpost/main/construction_area) "og" = ( /obj/structure/table/standard, -/obj/item/device/paicard, -/obj/item/weapon/book/codex/lore/vir, +/obj/item/paicard, +/obj/item/book/codex/lore/vir, /turf/simulated/floor/tiled, /area/surface/outpost/main/dorms) "oh" = ( @@ -6610,7 +6610,7 @@ icon_state = "alarm0"; pixel_x = -22 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -7715,7 +7715,7 @@ /turf/simulated/floor/tiled/steel, /area/surface/outpost/main/dorms) "pZ" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -7744,14 +7744,14 @@ pixel_y = -25 }, /obj/structure/closet/crate, -/obj/item/weapon/bedsheet, -/obj/item/weapon/bedsheet/blue, -/obj/item/weapon/bedsheet/brown, -/obj/item/weapon/bedsheet/green, -/obj/item/weapon/bedsheet/orange, -/obj/item/weapon/bedsheet/purple, -/obj/item/weapon/bedsheet/red, -/obj/item/weapon/bedsheet/yellow, +/obj/item/bedsheet, +/obj/item/bedsheet/blue, +/obj/item/bedsheet/brown, +/obj/item/bedsheet/green, +/obj/item/bedsheet/orange, +/obj/item/bedsheet/purple, +/obj/item/bedsheet/red, +/obj/item/bedsheet/yellow, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, /obj/effect/floor_decal/borderfloor/corner2{ @@ -7922,7 +7922,7 @@ name = "Statue"; pixel_y = 2 }, -/obj/item/device/gps/internal/base, +/obj/item/gps/internal/base, /turf/simulated/floor/tiled/techfloor, /area/surface/outpost/main/corridor) "qv" = ( @@ -8012,7 +8012,7 @@ /area/surface/outpost/main) "qG" = ( /obj/structure/disposalpipe/segment, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -8083,7 +8083,7 @@ /turf/simulated/floor/tiled/freezer, /area/surface/outpost/main/restroom) "qN" = ( -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9; pixel_y = 0 @@ -8213,9 +8213,9 @@ /turf/simulated/floor/tiled/steel_grid, /area/surface/outpost/main) "qZ" = ( -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/tool/crowbar, +/obj/item/tool/wrench, +/obj/item/storage/toolbox/mechanical, /obj/structure/table/steel, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/firealarm{ @@ -8290,12 +8290,12 @@ /area/surface/outpost/main/restroom) "ri" = ( /obj/structure/table/standard, -/obj/item/weapon/towel, -/obj/item/weapon/towel, -/obj/item/weapon/towel, -/obj/item/weapon/towel, -/obj/item/weapon/towel, -/obj/item/weapon/towel, +/obj/item/towel, +/obj/item/towel, +/obj/item/towel, +/obj/item/towel, +/obj/item/towel, +/obj/item/towel, /obj/random/soap, /obj/random/soap, /obj/machinery/power/apc{ @@ -8331,7 +8331,7 @@ /area/surface/outpost/main/restroom) "rk" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, +/obj/item/bedsheet/purpledouble, /turf/simulated/floor/carpet/purcarpet, /area/surface/outpost/main/dorms) "rl" = ( @@ -8413,7 +8413,7 @@ /area/surface/outpost/main/dorms) "rs" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/machinery/alarm{ frequency = 1441; pixel_y = 22 @@ -8425,7 +8425,7 @@ /area/surface/outpost/main/dorms) "rt" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/yellow, +/obj/item/bedsheet/yellow, /obj/machinery/alarm{ frequency = 1441; pixel_y = 22 @@ -8499,7 +8499,7 @@ /turf/simulated/floor/carpet/blucarpet, /area/surface/outpost/main/dorms) "rz" = ( -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /obj/structure/bed/double/padded, /turf/simulated/floor/carpet/blucarpet, /area/surface/outpost/main/dorms) @@ -8596,7 +8596,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/surface/outpost/main/dorms) "rK" = ( -/obj/item/weapon/stool, +/obj/item/stool, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -8604,7 +8604,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/surface/outpost/main/dorms) "rL" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -8634,8 +8634,8 @@ pixel_y = 0; specialfunctions = 4 }, -/obj/item/weapon/stool/padded, -/obj/item/device/radio/intercom{ +/obj/item/stool/padded, +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -8672,12 +8672,12 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/tiled, /area/surface/outpost/main/corridor) "rQ" = ( -/obj/item/weapon/stool/padded, -/obj/item/device/radio/intercom{ +/obj/item/stool/padded, +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -8700,7 +8700,7 @@ /turf/simulated/floor/tiled, /area/surface/outpost/main/dorms) "rS" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -8717,7 +8717,7 @@ /turf/simulated/floor/carpet/blucarpet, /area/surface/outpost/main/dorms) "rT" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -8730,7 +8730,7 @@ dir = 1; pixel_y = -25 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 3; pixel_y = 3 }, @@ -8778,7 +8778,7 @@ /turf/simulated/floor/tiled/freezer, /area/surface/outpost/main/pool) "sa" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -8978,7 +8978,7 @@ /turf/simulated/floor/plating, /area/surface/outpost/main/pool) "st" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/freezer, /area/surface/outpost/main/pool) "su" = ( @@ -9027,7 +9027,7 @@ /area/surface/outpost/main/pool) "sA" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /obj/machinery/alarm{ dir = 1; pixel_y = -25 @@ -9094,7 +9094,7 @@ /area/surface/outpost/main/dorms) "sG" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /obj/machinery/alarm{ frequency = 1441; pixel_y = 22 @@ -9106,7 +9106,7 @@ /area/surface/outpost/main/dorms) "sH" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /obj/machinery/alarm{ frequency = 1441; pixel_y = 22 @@ -9171,7 +9171,7 @@ /area/surface/outpost/main/dorms) "sM" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/alarm{ dir = 1; pixel_y = -25 @@ -9205,7 +9205,7 @@ /area/surface/outpost/main/pool) "sP" = ( /obj/structure/table/glass, -/obj/item/device/paicard, +/obj/item/paicard, /turf/simulated/floor/tiled/freezer, /area/surface/outpost/main/pool) "sQ" = ( @@ -9245,7 +9245,7 @@ /area/surface/outpost/main/pool) "sX" = ( /obj/structure/table/glass, -/obj/item/weapon/inflatable_duck, +/obj/item/inflatable_duck, /turf/simulated/floor/tiled/freezer, /area/surface/outpost/main/pool) "sY" = ( @@ -9257,8 +9257,8 @@ /turf/simulated/floor/carpet/purcarpet, /area/surface/outpost/main/dorms) "sZ" = ( -/obj/item/weapon/stool/padded, -/obj/item/device/radio/intercom{ +/obj/item/stool/padded, +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -9275,8 +9275,8 @@ /turf/simulated/floor/carpet/purcarpet, /area/surface/outpost/main/dorms) "ta" = ( -/obj/item/weapon/stool/padded, -/obj/item/device/radio/intercom{ +/obj/item/stool/padded, +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -9314,8 +9314,8 @@ /turf/simulated/floor/carpet, /area/surface/outpost/main/dorms) "td" = ( -/obj/item/weapon/stool, -/obj/item/device/radio/intercom{ +/obj/item/stool, +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -9332,8 +9332,8 @@ /turf/simulated/floor/carpet, /area/surface/outpost/main/dorms) "te" = ( -/obj/item/weapon/stool/padded, -/obj/item/device/radio/intercom{ +/obj/item/stool/padded, +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -9399,7 +9399,7 @@ pixel_x = -32; pixel_y = 0 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/camera/network/main_outpost{ c_tag = "MO - Pool West"; dir = 4 @@ -9409,14 +9409,14 @@ "tn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/hologram/holopad, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/freezer, /area/surface/outpost/main/pool) "to" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 }, -/obj/item/weapon/beach_ball, +/obj/item/beach_ball, /turf/simulated/floor/tiled/freezer, /area/surface/outpost/main/pool) "tp" = ( @@ -9434,7 +9434,7 @@ "tr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/hologram/holopad, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/freezer, /area/surface/outpost/main/pool) "ts" = ( @@ -9443,7 +9443,7 @@ pixel_x = 32; pixel_y = 0 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/camera/network/main_outpost{ c_tag = "MO - Pool East"; dir = 8 @@ -9472,7 +9472,7 @@ /area/surface/outpost/main/pool) "tw" = ( /obj/structure/table/glass, -/obj/item/weapon/book/codex/lore/vir, +/obj/item/book/codex/lore/vir, /obj/effect/zone_divider, /turf/simulated/floor/tiled/freezer, /area/surface/outpost/main/pool) @@ -9573,14 +9573,14 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/freezer, /area/surface/outpost/main/pool) "tP" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/freezer, /area/surface/outpost/main/pool) "tQ" = ( @@ -9609,8 +9609,8 @@ /area/surface/outpost/main/pool) "tV" = ( /obj/structure/closet/emcloset, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/clothing/suit/storage/hooded/wintercoat, /turf/simulated/floor/tiled/freezer, /area/surface/outpost/main/pool) @@ -9624,7 +9624,7 @@ /area/surface/outpost/main/pool) "tY" = ( /obj/machinery/light/spot, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/freezer, /area/surface/outpost/main/pool) "tZ" = ( @@ -9634,7 +9634,7 @@ /turf/simulated/floor/tiled/freezer, /area/surface/outpost/main/pool) "ua" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -9938,7 +9938,7 @@ /turf/simulated/wall, /area/surface/outpost/research/xenoresearch) "uP" = ( -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/machinery/light/small{ dir = 1 }, @@ -9985,7 +9985,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/plating, /area/surface/outpost/research/xenoresearch/smes) "uV" = ( @@ -10038,9 +10038,9 @@ /area/surface/outpost/research/xenoresearch/restroom) "va" = ( /obj/structure/table/standard, -/obj/item/weapon/towel, -/obj/item/weapon/towel, -/obj/item/weapon/towel, +/obj/item/towel, +/obj/item/towel, +/obj/item/towel, /obj/random/soap, /obj/random/soap, /obj/structure/cable/green{ @@ -10057,7 +10057,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -10101,7 +10101,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/machinery/light, -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/tiled/steel_grid, /area/surface/outpost/main) "vh" = ( @@ -10109,11 +10109,11 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoresearch) "vi" = ( @@ -10127,7 +10127,7 @@ dir = 4 }, /obj/machinery/light, -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/carpet/bcarpet, /area/surface/outpost/main/dorms) "vj" = ( @@ -10206,8 +10206,8 @@ }, /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high, -/obj/item/weapon/weldpack, +/obj/item/cell/high, +/obj/item/weldpack, /obj/structure/cable/green{ d1 = 1; d2 = 4; @@ -10257,7 +10257,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -10485,7 +10485,7 @@ /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoresearch) "vZ" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -10770,7 +10770,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -10891,7 +10891,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -11466,7 +11466,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/item/device/radio{ +/obj/item/radio{ frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link" @@ -11558,7 +11558,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -11605,29 +11605,29 @@ /area/surface/outpost/research/xenoresearch/xenoflora) "xZ" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_y = 3 }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 5 }, /turf/simulated/floor/plating, /area/surface/outpost/research/xenoresearch/xenobiology) "ya" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = -5; pixel_y = -1 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = -1; pixel_y = 3 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -11644,7 +11644,7 @@ /turf/simulated/floor/plating, /area/surface/outpost/research/xenoresearch/xenobiology) "yc" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -11730,7 +11730,7 @@ /area/surface/outpost/research/xenoresearch/xenoflora) "yl" = ( /obj/structure/table/glass, -/obj/item/weapon/tape_roll, +/obj/item/tape_roll, /obj/machinery/firealarm{ dir = 2; pixel_y = 24 @@ -11760,11 +11760,11 @@ /area/surface/outpost/research/xenoresearch/xenoflora) "yo" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 9; icon_state = "intact" @@ -11780,9 +11780,9 @@ pixel_x = 30; pixel_y = 0 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white, -/obj/item/device/radio/intercom{ +/obj/item/clipboard, +/obj/item/folder/white, +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -11791,8 +11791,8 @@ /area/surface/outpost/research/xenoresearch/xenoflora) "yq" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/extinguisher, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, +/obj/item/extinguisher, /turf/simulated/floor/tiled/dark, /area/surface/outpost/research/xenoresearch/xenobiology) "yr" = ( @@ -11832,9 +11832,9 @@ /area/surface/outpost/research/xenoresearch/xenobiology) "yu" = ( /obj/structure/table/standard, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/folder, +/obj/item/pen, /turf/simulated/floor/plating, /area/surface/outpost/research/xenoresearch/xenobiology) "yv" = ( @@ -12058,7 +12058,7 @@ /area/surface/outpost/research/xenoresearch/xenobiology) "yT" = ( /obj/structure/reagent_dispensers/watertank/high, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/hydro, /area/surface/outpost/research/xenoresearch/xenoflora) "yU" = ( @@ -12274,8 +12274,8 @@ /area/surface/outpost/research/xenoresearch/xenoflora) "zt" = ( /obj/structure/table/glass, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/knife/machete/hatchet, +/obj/item/material/minihoe, +/obj/item/material/knife/machete/hatchet, /obj/effect/floor_decal/corner/green{ dir = 10 }, @@ -12283,8 +12283,8 @@ /area/surface/outpost/research/xenoresearch/xenoflora) "zu" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /obj/effect/floor_decal/corner/green/full, /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoresearch/xenoflora) @@ -12459,7 +12459,7 @@ dir = 8 }, /obj/machinery/meter, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/tiled/hydro, /area/surface/outpost/research/xenoresearch/xenoflora) "zO" = ( @@ -12637,7 +12637,7 @@ /area/surface/outpost/research/xenoresearch/xenoflora) "Ah" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, @@ -12698,7 +12698,7 @@ /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoresearch/xenobiology) "Ap" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoresearch/xenobiology) "Aq" = ( @@ -12724,7 +12724,7 @@ /area/surface/outpost/research/xenoresearch/xenobiology) "At" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, @@ -12737,7 +12737,7 @@ icon_state = "tube1"; pixel_x = 0 }, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoresearch/xenobiology) "Au" = ( @@ -12785,7 +12785,7 @@ /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoresearch/xenoflora) "AB" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -13234,7 +13234,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoresearch/xenoflora) @@ -13258,7 +13258,7 @@ dir = 8 }, /obj/structure/reagent_dispensers/watertank/high, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoresearch/xenoflora) "BH" = ( @@ -13279,7 +13279,7 @@ /turf/simulated/floor/tiled/hydro, /area/surface/outpost/research/xenoresearch/xenoflora) "BK" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -13396,7 +13396,7 @@ /obj/structure/closet, /obj/item/toy/figure/scientist, /obj/item/clothing/accessory/armband/science, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/dark, /area/surface/outpost/research/xenoresearch/xenobiology) "BY" = ( @@ -13606,12 +13606,12 @@ }, /area/surface/outside/path/plains) "Cx" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/machinery/light{ dir = 8; icon_state = "tube1" @@ -13709,7 +13709,7 @@ /area/surface/outpost/research/xenoresearch/xenobiology) "CF" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoresearch/xenoflora) "CG" = ( @@ -13905,7 +13905,7 @@ /turf/simulated/floor/tiled/hydro, /area/surface/outpost/research/xenoresearch/xenoflora) "Di" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -14060,7 +14060,7 @@ /turf/simulated/shuttle/floor/voidcraft/external, /area/surface/outpost/wall) "DN" = ( -/obj/item/weapon/banner/virgov, +/obj/item/banner/virgov, /turf/simulated/shuttle/floor/voidcraft/external, /area/surface/outpost/wall) "DO" = ( @@ -14068,7 +14068,7 @@ /turf/simulated/shuttle/floor/voidcraft/external, /area/surface/outpost/wall) "DP" = ( -/obj/item/weapon/banner/nt, +/obj/item/banner/nt, /turf/simulated/shuttle/floor/voidcraft/external, /area/surface/outpost/wall) "DQ" = ( diff --git a/maps/southern_cross/southern_cross-4.dmm b/maps/southern_cross/southern_cross-4.dmm index 128b6be5584..534eafc4a40 100644 --- a/maps/southern_cross/southern_cross-4.dmm +++ b/maps/southern_cross/southern_cross-4.dmm @@ -155,7 +155,7 @@ /obj/effect/floor_decal/corner/purple{ dir = 5 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -223,7 +223,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -438,10 +438,10 @@ /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoarcheology/exp_prep) "bk" = ( -/obj/item/weapon/storage/excavation, -/obj/item/weapon/pickaxe, -/obj/item/weapon/tool/wrench, -/obj/item/device/measuring_tape, +/obj/item/storage/excavation, +/obj/item/pickaxe, +/obj/item/tool/wrench, +/obj/item/measuring_tape, /obj/item/stack/flag/yellow, /obj/structure/table/steel, /turf/simulated/floor/tiled, @@ -829,7 +829,7 @@ /area/surface/outpost/research/xenoarcheology/longtermstorage) "bS" = ( /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -863,10 +863,10 @@ /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoarcheology/exp_prep) "bW" = ( -/obj/item/weapon/storage/excavation, -/obj/item/weapon/pickaxe, -/obj/item/weapon/tool/wrench, -/obj/item/device/measuring_tape, +/obj/item/storage/excavation, +/obj/item/pickaxe, +/obj/item/tool/wrench, +/obj/item/measuring_tape, /obj/item/stack/flag/yellow, /obj/structure/table/steel, /obj/effect/floor_decal/corner/purple{ @@ -895,7 +895,7 @@ dir = 8; health = 1e+006 }, -/obj/item/weapon/storage/belt/archaeology, +/obj/item/storage/belt/archaeology, /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, @@ -912,7 +912,7 @@ dir = 4; health = 1e+006 }, -/obj/item/weapon/storage/belt/archaeology, +/obj/item/storage/belt/archaeology, /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, @@ -922,7 +922,7 @@ /area/surface/outpost/research/xenoarcheology/exp_prep) "bZ" = ( /obj/structure/table/steel, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/machinery/power/apc{ dir = 2; name = "south bump"; @@ -933,10 +933,10 @@ pixel_y = -24 }, /obj/structure/cable/blue, -/obj/item/device/suit_cooling_unit, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, +/obj/item/suit_cooling_unit, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, /turf/simulated/floor/tiled/dark, /area/surface/outpost/research/xenoarcheology/exp_prep) "ca" = ( @@ -962,7 +962,7 @@ /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology) "cd" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 21 @@ -1158,7 +1158,7 @@ /area/surface/outpost/research/xenoarcheology/isolation_a) "ct" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/reinforced, /area/surface/outpost/research/xenoarcheology/isolation_a) "cu" = ( @@ -1201,8 +1201,8 @@ }, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/firstaid/regular, /obj/random/medical/lite, /obj/structure/extinguisher_cabinet{ pixel_x = 28; @@ -1225,7 +1225,7 @@ frequency = 1441; pixel_y = 22 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -1557,7 +1557,7 @@ "dj" = ( /obj/structure/table/standard, /obj/item/clothing/head/welding, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology/anomaly) @@ -1566,7 +1566,7 @@ /area/surface/outpost/research/xenoarcheology/anomaly) "dl" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/dropper{ +/obj/item/reagent_containers/dropper{ pixel_y = -4 }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow, @@ -1761,12 +1761,12 @@ /obj/effect/floor_decal/corner/purple{ dir = 6 }, -/obj/item/weapon/storage/box/glasses/square{ +/obj/item/storage/box/glasses/square{ pixel_x = 1; pixel_y = 4 }, -/obj/item/weapon/storage/box/cups, -/obj/item/weapon/hand_labeler, +/obj/item/storage/box/cups, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/neutral, /area/surface/outpost/research/xenoarcheology) "dB" = ( @@ -1806,12 +1806,12 @@ "dG" = ( /obj/structure/table/standard, /obj/machinery/cell_charger, -/obj/item/weapon/tool/screwdriver{ +/obj/item/tool/screwdriver{ pixel_y = 15 }, -/obj/item/weapon/melee/baton/loaded, +/obj/item/melee/baton/loaded, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology/anomaly) "dH" = ( @@ -1845,14 +1845,14 @@ icon_state = "warning_dust" }, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high, +/obj/item/cell/high, /turf/simulated/floor/tiled/asteroid_steel, /area/surface/outpost/mining_main/cave) "dK" = ( /obj/machinery/computer/crew{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -1865,8 +1865,8 @@ }, /obj/structure/table/glass, /obj/machinery/recharger, -/obj/item/device/defib_kit/loaded, -/obj/item/device/radio{ +/obj/item/defib_kit/loaded, +/obj/item/radio{ frequency = 1487; icon_state = "med_walkietalkie"; name = "Medbay Emergency Radio Link" @@ -1879,19 +1879,19 @@ /area/surface/outpost/research/xenoarcheology/medical) "dM" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 0; pixel_y = 0 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 0; pixel_y = 0 }, @@ -1928,15 +1928,15 @@ /obj/effect/floor_decal/corner/purple{ dir = 6 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/pen, -/obj/item/device/taperecorder, -/obj/item/weapon/folder, -/obj/item/weapon/stamp, +/obj/item/clipboard, +/obj/item/pen, +/obj/item/taperecorder, +/obj/item/folder, +/obj/item/stamp, /turf/simulated/floor/tiled/neutral, /area/surface/outpost/research/xenoarcheology) "dR" = ( @@ -1963,7 +1963,7 @@ /area/surface/outpost/research/xenoarcheology) "dU" = ( /obj/structure/table/reinforced, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/window/reinforced{ dir = 1 }, @@ -1985,7 +1985,7 @@ dir = 1; icon_state = "warning_dust" }, -/obj/item/weapon/cell/high, +/obj/item/cell/high, /turf/simulated/floor/tiled/asteroid_steel, /area/surface/outpost/mining_main/cave) "dW" = ( @@ -2094,7 +2094,7 @@ /turf/simulated/shuttle/floor/voidcraft/external, /area/surface/outpost/wall/checkpoint) "ei" = ( -/obj/item/weapon/banner/nt, +/obj/item/banner/nt, /turf/simulated/mineral/floor/ignore_mapgen/sif, /area/surface/cave/explored/normal) "ej" = ( @@ -2126,13 +2126,13 @@ dir = 4 }, /obj/effect/floor_decal/industrial/warning, -/obj/item/device/camera_film{ +/obj/item/camera_film{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/camera, +/obj/item/camera, /obj/machinery/recharger, -/obj/item/weapon/tape_roll, +/obj/item/tape_roll, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -2236,9 +2236,9 @@ /area/surface/cave/explored/deep) "ey" = ( /obj/structure/table/steel, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/wrench, +/obj/item/tool/screwdriver, +/obj/item/tool/crowbar, +/obj/item/tool/wrench, /obj/effect/floor_decal/industrial/warning/dust{ dir = 1; icon_state = "warning_dust" @@ -2304,8 +2304,8 @@ /area/surface/outpost/research/xenoarcheology) "eG" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/device/camera, +/obj/item/paper_bin, +/obj/item/camera, /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -2318,15 +2318,15 @@ /area/surface/outpost/research/xenoarcheology/anomaly) "eH" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder, -/obj/item/weapon/pen, -/obj/item/weapon/tape_roll, +/obj/item/folder, +/obj/item/pen, +/obj/item/tape_roll, /obj/structure/window/reinforced, /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 }, -/obj/item/device/geiger, +/obj/item/geiger, /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoarcheology/anomaly) "eI" = ( @@ -2568,19 +2568,19 @@ /turf/simulated/floor/bluegrid, /area/surface/outpost/research/xenoarcheology/anomaly) "fe" = ( -/obj/item/weapon/anobattery{ +/obj/item/anobattery{ pixel_x = -6; pixel_y = 2 }, -/obj/item/weapon/anobattery{ +/obj/item/anobattery{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/anobattery{ +/obj/item/anobattery{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/anobattery{ +/obj/item/anobattery{ pixel_x = 6; pixel_y = 6 }, @@ -2588,11 +2588,11 @@ /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology/anomaly) "ff" = ( -/obj/item/weapon/anodevice{ +/obj/item/anodevice{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/anodevice, +/obj/item/anodevice, /obj/structure/table/steel, /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology/anomaly) @@ -2632,7 +2632,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -3043,7 +3043,7 @@ icon_state = "4-8" }, /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, @@ -3138,7 +3138,7 @@ c_tag = "OPR - Anomalous Materials 1"; dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -3471,15 +3471,15 @@ /area/surface/outpost/research/xenoarcheology/restroom) "gV" = ( /obj/structure/table/standard, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#800080"; name = "purple towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#800080"; name = "purple towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#800080"; name = "purple towel" }, @@ -3491,8 +3491,8 @@ /turf/simulated/floor/tiled/freezer, /area/surface/outpost/research/xenoarcheology/restroom) "gW" = ( -/obj/item/weapon/reagent_containers/glass/bottle/toxin, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric{ +/obj/item/reagent_containers/glass/bottle/toxin, +/obj/item/reagent_containers/glass/beaker/sulphuric{ name = "beaker 'sulphuric acid'" }, /obj/structure/table/glass, @@ -3761,7 +3761,7 @@ /turf/simulated/floor/plating, /area/surface/outpost/research/xenoarcheology/emergencystorage) "hx" = ( -/obj/item/weapon/weldpack, +/obj/item/weldpack, /obj/machinery/light/small{ dir = 4 }, @@ -3771,7 +3771,7 @@ /obj/structure/closet/toolcloset, /obj/random/maintenance/clean, /obj/random/maintenance/clean, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 }, @@ -3789,7 +3789,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 }, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoarcheology/anomaly) "hA" = ( @@ -3858,7 +3858,7 @@ /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology/analysis) "hI" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -3960,7 +3960,7 @@ pixel_x = 0; pixel_y = -24 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -21 @@ -3969,8 +3969,8 @@ /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology/analysis) "hW" = ( -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper{ +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper{ pixel_y = -4 }, /obj/structure/table/glass, @@ -3982,7 +3982,7 @@ /area/surface/outpost/research/xenoarcheology/analysis) "hX" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, @@ -4007,7 +4007,7 @@ /obj/item/stack/nanopaste, /obj/item/stack/nanopaste, /obj/item/stack/nanopaste, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/structure/closet/crate/secure/science{ req_access = list(65) }, @@ -4027,12 +4027,12 @@ /area/surface/outpost/research/xenoarcheology/analysis) "ic" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/clothing/accessory/armband/science, /obj/item/clothing/glasses/science, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/extinguisher, -/obj/item/device/flashlight, +/obj/item/suit_cooling_unit, +/obj/item/extinguisher, +/obj/item/flashlight, /turf/simulated/floor/plating, /area/surface/outpost/research/xenoarcheology/emergencystorage) "id" = ( @@ -4058,8 +4058,8 @@ /area/surface/cave/explored/normal) "ih" = ( /obj/structure/table/standard, -/obj/item/weapon/flame/lighter/random, -/obj/item/weapon/tool/crowbar, +/obj/item/flame/lighter/random, +/obj/item/tool/crowbar, /obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ dir = 8 }, @@ -4102,7 +4102,7 @@ /turf/simulated/floor/tiled/asteroid_steel, /area/surface/outpost/mining_main/cave) "in" = ( -/obj/item/weapon/banner/nt, +/obj/item/banner/nt, /turf/simulated/shuttle/floor/voidcraft/external, /area/surface/cave/explored/deep) "io" = ( @@ -4113,7 +4113,7 @@ /turf/simulated/floor/plating, /area/surface/outpost/research/xenoarcheology/smes) "ip" = ( -/obj/item/weapon/banner/virgov, +/obj/item/banner/virgov, /turf/simulated/shuttle/floor/voidcraft/external, /area/surface/cave/explored/deep) "iq" = ( diff --git a/maps/southern_cross/southern_cross-5.dmm b/maps/southern_cross/southern_cross-5.dmm index 11bfad0b0f6..5f88b256b9b 100644 --- a/maps/southern_cross/southern_cross-5.dmm +++ b/maps/southern_cross/southern_cross-5.dmm @@ -5,10 +5,10 @@ "ae" = (/obj/machinery/sleep_console,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "af" = (/obj/structure/shuttle/engine/propulsion{icon_state = "burst_r"; dir = 4},/turf/space,/area/derelict/ship) "ag" = (/obj/machinery/computer/med_data,/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"ah" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/regular{pixel_x = 6; pixel_y = -5},/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"ah" = (/obj/structure/table/standard,/obj/item/storage/firstaid/regular{pixel_x = 6; pixel_y = -5},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "ai" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/airless,/area/derelict/ship) "aj" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 4},/turf/space,/area/derelict/ship) -"ak" = (/obj/item/weapon/surgical/scalpel,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"ak" = (/obj/item/surgical/scalpel,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "al" = (/turf/simulated/shuttle/plating,/area/derelict/ship) "am" = (/obj/structure/frame/computer,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "an" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/shuttle/plating,/area/derelict/ship) @@ -17,8 +17,8 @@ "aq" = (/obj/machinery/door/airlock/glass{name = "Hibernation Pods"},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "ar" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "as" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"at" = (/obj/item/device/multitool,/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"au" = (/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"at" = (/obj/item/multitool,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"au" = (/obj/item/cell{charge = 100; maxcharge = 15000},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "av" = (/obj/machinery/door/airlock/glass,/turf/simulated/shuttle/plating,/area/derelict/ship) "aw" = (/obj/structure/shuttle/engine/propulsion{ icon_state = "burst_l"; dir = 4},/turf/space,/area/derelict/ship) "ax" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/derelict/ship) @@ -27,101 +27,101 @@ "aA" = (/obj/machinery/light_switch{pixel_x = 27},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aB" = (/obj/machinery/portable_atmospherics/powered/scrubber,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aC" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/derelict/ship) -"aD" = (/obj/item/weapon/bedsheet,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"aD" = (/obj/item/bedsheet,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aE" = (/obj/machinery/door/window,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aF" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aG" = (/obj/structure/lattice,/turf/space,/area/space) -"aH" = (/obj/structure/table/standard,/obj/item/weapon/gun/energy/retro,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"aH" = (/obj/structure/table/standard,/obj/item/gun/energy/retro,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/derelict/ship) "aJ" = (/obj/machinery/light/small{dir = 8},/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"aK" = (/obj/structure/table/standard,/obj/item/weapon/tank/oxygen,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"aK" = (/obj/structure/table/standard,/obj/item/tank/oxygen,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/shuttle/plating,/area/derelict/ship) "aM" = (/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"aN" = (/obj/structure/table/standard,/obj/item/device/analyzer,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"aN" = (/obj/structure/table/standard,/obj/item/analyzer,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aO" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"aP" = (/obj/structure/table/standard,/obj/item/weapon/tool/screwdriver,/obj/machinery/light,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"aP" = (/obj/structure/table/standard,/obj/item/tool/screwdriver,/obj/machinery/light,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aS" = (/obj/machinery/door/window/northright,/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"aT" = (/obj/item/weapon/bedsheet,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/bed/padded,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"aT" = (/obj/item/bedsheet,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/bed/padded,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aU" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aW" = (/obj/structure/table,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "aX" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/derelict/ship) "aY" = (/obj/machinery/light_switch{pixel_x = 27},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"aZ" = (/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"ba" = (/obj/item/weapon/material/shard,/obj/structure/bed/chair,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"aZ" = (/obj/item/material/shard{icon_state = "medium"},/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"ba" = (/obj/item/material/shard,/obj/structure/bed/chair,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "bb" = (/obj/structure/bed/chair,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "bc" = (/obj/structure/cable,/obj/structure/frame/computer,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "bd" = (/obj/structure/cable,/obj/structure/frame/computer,/obj/item/stack/cable_coil/cut,/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"be" = (/obj/structure/table/rack,/obj/item/weapon/tank/emergency/oxygen,/obj/item/weapon/tank/emergency/oxygen,/obj/item/weapon/tank/emergency/oxygen,/obj/item/weapon/tank/emergency/oxygen,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"be" = (/obj/structure/table/rack,/obj/item/tank/emergency/oxygen,/obj/item/tank/emergency/oxygen,/obj/item/tank/emergency/oxygen,/obj/item/tank/emergency/oxygen,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "bf" = (/obj/structure/table/rack,/obj/item/clothing/suit/space/syndicate,/obj/item/clothing/head/helmet/space/syndicate,/obj/item/clothing/mask/breath,/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"bg" = (/obj/structure/table/rack,/obj/item/weapon/storage/toolbox/syndicate,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"bg" = (/obj/structure/table/rack,/obj/item/storage/toolbox/syndicate,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "bh" = (/obj/machinery/power/apc{dir = 8; name = "west bump-derelict"; operating = 0; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "bi" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "bj" = (/obj/machinery/door/blast/regular{id = "oldship_gun"; name = "Pod Bay Door"},/turf/simulated/shuttle/plating,/area/derelict/ship) "bk" = (/obj/machinery/mass_driver{dir = 8; icon_state = "mass_driver"; id = "oldship_gun"},/turf/simulated/shuttle/plating,/area/derelict/ship) "bl" = (/obj/machinery/door/airlock/glass{name = "Pod Bay"},/turf/simulated/shuttle/floor/white,/area/derelict/ship) "bm" = (/obj/machinery/computer/pod{id = "oldship_gun"},/turf/simulated/shuttle/floor/white,/area/derelict/ship) -"bo" = (/obj/structure/table/standard,/obj/item/device/radio/off,/turf/simulated/shuttle/floor/white,/area/derelict/ship) +"bo" = (/obj/structure/table/standard,/obj/item/radio/off,/turf/simulated/shuttle/floor/white,/area/derelict/ship) "bp" = (/turf/simulated/mineral/vacuum,/area/mine/unexplored) "bq" = (/turf/simulated/mineral/floor/ignore_mapgen/vacuum,/area/mine/explored) -"br" = (/obj/item/weapon/ore,/turf/simulated/mineral/floor/ignore_mapgen/vacuum,/area/mine/explored) +"br" = (/obj/item/ore,/turf/simulated/mineral/floor/ignore_mapgen/vacuum,/area/mine/explored) "bs" = (/obj/structure/girder,/turf/simulated/floor/airless,/area/wreck/ufoship) "bt" = (/turf/simulated/wall/skipjack,/area/wreck/ufoship) "bu" = (/turf/simulated/floor/airless,/area/wreck/ufoship) "bv" = (/obj/effect/floor_decal/asteroid,/turf/simulated/mineral/floor/ignore_mapgen/vacuum,/area/mine/explored) "bw" = (/obj/item/stack/rods,/turf/simulated/floor/airless,/area/wreck/ufoship) "bx" = (/obj/item/stack/material/steel,/turf/simulated/floor/airless,/area/wreck/ufoship) -"by" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/stack/rods,/turf/simulated/floor/airless,/area/wreck/ufoship) -"bz" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/surgical/scalpel/laser3,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) +"by" = (/obj/structure/table/steel_reinforced,/obj/item/reagent_containers/syringe/antiviral,/obj/item/stack/rods,/turf/simulated/floor/airless,/area/wreck/ufoship) +"bz" = (/obj/structure/table/steel_reinforced,/obj/item/surgical/scalpel/laser3,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "bA" = (/obj/structure/frame/computer,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "bB" = (/obj/structure/table/steel_reinforced,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "bC" = (/obj/structure/table/steel_reinforced,/turf/simulated/floor/airless,/area/wreck/ufoship) "bD" = (/obj/effect/decal/mecha_wreckage/phazon,/turf/simulated/floor/airless,/area/wreck/ufoship) -"bE" = (/obj/item/weapon/ore,/turf/simulated/floor/airless,/area/wreck/ufoship) +"bE" = (/obj/item/ore,/turf/simulated/floor/airless,/area/wreck/ufoship) "bF" = (/obj/machinery/door/airlock/hatch,/turf/simulated/floor/airless,/area/wreck/ufoship) -"bG" = (/obj/item/weapon/surgical/circular_saw,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) +"bG" = (/obj/item/surgical/circular_saw,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "bH" = (/turf/simulated/floor/tiled/white/airless,/area/wreck/ufoship) "bI" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/tiled/white/airless,/area/wreck/ufoship) "bJ" = (/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "bK" = (/obj/effect/floor_decal/asteroid,/obj/effect/decal/cleanable/molten_item,/turf/simulated/mineral/floor/ignore_mapgen/vacuum,/area/mine/explored) "bL" = (/obj/effect/decal/mecha_wreckage/gygax/dark,/turf/simulated/floor/airless,/area/wreck/ufoship) -"bM" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/airless,/area/wreck/ufoship) +"bM" = (/obj/item/storage/toolbox/mechanical,/turf/simulated/floor/airless,/area/wreck/ufoship) "bN" = (/obj/structure/table/rack,/turf/simulated/floor/airless,/area/wreck/ufoship) "bO" = (/obj/structure/table/rack,/obj/item/stack/cable_coil/yellow,/turf/simulated/floor/airless,/area/wreck/ufoship) "bP" = (/obj/effect/decal/cleanable/blood/gibs/robot/down,/turf/simulated/floor/airless,/area/wreck/ufoship) "bQ" = (/obj/machinery/optable,/obj/effect/decal/remains/xeno,/obj/effect/decal/cleanable/blood/xeno,/turf/simulated/floor/tiled/white/airless,/area/wreck/ufoship) -"bR" = (/obj/item/weapon/material/shard/shrapnel,/turf/simulated/floor/airless,/area/wreck/ufoship) +"bR" = (/obj/item/material/shard/shrapnel,/turf/simulated/floor/airless,/area/wreck/ufoship) "bS" = (/obj/structure/table/rack,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "bT" = (/obj/effect/decal/cleanable/blood/xeno,/turf/simulated/floor/tiled/white/airless,/area/wreck/ufoship) -"bU" = (/obj/item/weapon/ore,/obj/item/stack/rods,/turf/simulated/floor/airless,/area/wreck/ufoship) +"bU" = (/obj/item/ore,/obj/item/stack/rods,/turf/simulated/floor/airless,/area/wreck/ufoship) "bV" = (/obj/machinery/door/airlock/hatch,/turf/simulated/floor/tiled/white/airless,/area/wreck/ufoship) "bW" = (/obj/effect/overlay/wallrot,/turf/simulated/wall/skipjack,/area/wreck/ufoship) "bX" = (/obj/structure/window/phoronreinforced,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) -"bY" = (/obj/item/device/flashlight/flare,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) -"bZ" = (/obj/item/stack/material/wood,/obj/item/stack/material/wood,/obj/structure/ore_box,/obj/item/weapon/ore/iron,/obj/item/weapon/ore/iron,/obj/item/weapon/ore/iron,/turf/simulated/floor/airless,/area/wreck/ufoship) +"bY" = (/obj/item/flashlight/flare,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) +"bZ" = (/obj/item/stack/material/wood,/obj/item/stack/material/wood,/obj/structure/ore_box,/obj/item/ore/iron,/obj/item/ore/iron,/obj/item/ore/iron,/turf/simulated/floor/airless,/area/wreck/ufoship) "ca" = (/obj/item/clothing/head/helmet/space/deathsquad,/obj/structure/table/rack,/obj/effect/decal/cleanable/molten_item,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "cb" = (/obj/machinery/compressor{dir = 4},/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 8},/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 1},/turf/simulated/floor/reinforced/phoron,/area/wreck/ufoship) "cc" = (/obj/machinery/crystal,/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 1},/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced,/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel,/turf/simulated/floor/reinforced/phoron,/area/wreck/ufoship) -"cd" = (/obj/item/device/gps,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) +"cd" = (/obj/item/gps,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "ce" = (/obj/structure/ore_box,/turf/simulated/floor/airless,/area/wreck/ufoship) -"cf" = (/obj/item/weapon/circuitboard/broken,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) +"cf" = (/obj/item/circuitboard/broken,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "cg" = (/obj/structure/closet/acloset,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) -"ch" = (/obj/item/weapon/ore,/turf/simulated/floor/tiled/white/airless,/area/wreck/ufoship) +"ch" = (/obj/item/ore,/turf/simulated/floor/tiled/white/airless,/area/wreck/ufoship) "ci" = (/obj/item/clothing/under/color/pink,/obj/structure/table/steel_reinforced,/turf/simulated/floor/tiled/white/airless,/area/wreck/ufoship) "cj" = (/obj/structure/bed,/turf/simulated/floor/tiled/white/airless,/area/wreck/ufoship) "ck" = (/obj/effect/wingrille_spawn/phoron,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) -"cl" = (/obj/structure/table/rack,/obj/item/weapon/tank/jetpack/void,/obj/item/clothing/suit/space/syndicate/green,/obj/item/clothing/head/helmet/space/syndicate/green,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) -"cm" = (/obj/structure/table/rack,/obj/item/weapon/material/shard/shrapnel,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) +"cl" = (/obj/structure/table/rack,/obj/item/tank/jetpack/void,/obj/item/clothing/suit/space/syndicate/green,/obj/item/clothing/head/helmet/space/syndicate/green,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) +"cm" = (/obj/structure/table/rack,/obj/item/material/shard/shrapnel,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "cn" = (/obj/item/broken_device,/obj/structure/bed/chair{dir = 8},/obj/effect/decal/remains/robot,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "co" = (/obj/effect/decal/cleanable/blood/oil/streak,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) -"cp" = (/obj/item/weapon/tank/oxygen/yellow,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) +"cp" = (/obj/item/tank/oxygen/yellow,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "cq" = (/obj/effect/decal/cleanable/blood/gibs/robot/down,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "cr" = (/obj/effect/decal/remains/human,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "cs" = (/obj/structure/bed/chair/comfy/brown{dir = 8},/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "ct" = (/obj/effect/decal/cleanable/vomit,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "cu" = (/obj/structure/AIcore,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) -"cv" = (/obj/item/frame/apc,/obj/item/weapon/module/power_control,/obj/item/weapon/material/shard/shrapnel,/turf/simulated/floor/tiled/white/airless,/area/wreck/ufoship) +"cv" = (/obj/item/frame/apc,/obj/item/module/power_control,/obj/item/material/shard/shrapnel,/turf/simulated/floor/tiled/white/airless,/area/wreck/ufoship) "cw" = (/turf/simulated/wall/r_wall,/area/wreck/ufoship) -"cx" = (/obj/item/device/flashlight/glowstick,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) +"cx" = (/obj/item/flashlight/glowstick,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "cy" = (/obj/machinery/door/airlock/hatch,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "cz" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "cA" = (/obj/item/robot_parts/head,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) @@ -134,19 +134,19 @@ "cH" = (/obj/item/stack/cable_coil/yellow,/turf/simulated/floor/airless,/area/wreck/ufoship) "cI" = (/obj/machinery/compressor{dir = 4},/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 8},/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 1},/turf/simulated/floor/reinforced/phoron,/area/wreck/ufoship) "cJ" = (/obj/machinery/crystal,/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 1},/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel,/turf/simulated/floor/reinforced/phoron,/area/wreck/ufoship) -"cK" = (/obj/item/weapon/cell/super,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) +"cK" = (/obj/item/cell/super,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "cL" = (/obj/structure/largecrate,/turf/simulated/floor/airless,/area/wreck/ufoship) "cM" = (/obj/effect/decal/cleanable/molten_item,/turf/simulated/floor/airless,/area/wreck/ufoship) "cN" = (/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 1},/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "cO" = (/obj/item/stack/material/steel,/obj/item/stack/material/steel,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "cP" = (/obj/structure/table/rack,/obj/item/clothing/glasses/welding,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) -"cQ" = (/obj/effect/decal/mecha_wreckage/mauler,/obj/item/weapon/material/shard/shrapnel,/turf/simulated/floor/airless,/area/wreck/ufoship) +"cQ" = (/obj/effect/decal/mecha_wreckage/mauler,/obj/item/material/shard/shrapnel,/turf/simulated/floor/airless,/area/wreck/ufoship) "cR" = (/obj/item/stack/material/steel,/obj/item/stack/rods,/turf/simulated/floor/airless,/area/wreck/ufoship) -"cS" = (/obj/structure/table/rack,/obj/item/weapon/storage/toolbox/syndicate,/turf/simulated/floor/airless,/area/wreck/ufoship) -"cT" = (/obj/item/weapon/circuitboard/teleporter,/turf/simulated/floor/tiled/white/airless,/area/wreck/ufoship) +"cS" = (/obj/structure/table/rack,/obj/item/storage/toolbox/syndicate,/turf/simulated/floor/airless,/area/wreck/ufoship) +"cT" = (/obj/item/circuitboard/teleporter,/turf/simulated/floor/tiled/white/airless,/area/wreck/ufoship) "cU" = (/obj/machinery/teleport/station,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) "cV" = (/obj/machinery/teleport/hub,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) -"cW" = (/obj/item/weapon/ore,/turf/space,/area/space) +"cW" = (/obj/item/ore,/turf/space,/area/space) "cX" = (/turf/simulated/shuttle/wall,/area/wreck/supplyshuttle) "cY" = (/turf/simulated/floor/airless,/area/wreck/supplyshuttle) "cZ" = (/obj/structure/largecrate/hoverpod,/turf/simulated/floor/airless,/area/wreck/supplyshuttle) diff --git a/maps/southern_cross/southern_cross-6.dmm b/maps/southern_cross/southern_cross-6.dmm index ae4e53390c2..37cee286c48 100644 --- a/maps/southern_cross/southern_cross-6.dmm +++ b/maps/southern_cross/southern_cross-6.dmm @@ -152,7 +152,7 @@ "cV" = (/obj/effect/floor_decal/spline/plain{dir = 4},/turf/simulated/floor/holofloor/lino,/area/holodeck/source_meetinghall) "cW" = (/turf/simulated/floor/holofloor/lino,/area/holodeck/source_meetinghall) "cX" = (/obj/effect/floor_decal/carpet{dir = 5},/obj/effect/floor_decal/carpet{dir = 6},/obj/effect/floor_decal/carpet{dir = 9},/obj/effect/floor_decal/carpet{dir = 10},/turf/simulated/floor/holofloor/carpet,/area/holodeck/source_meetinghall) -"cY" = (/obj/item/weapon/beach_ball,/turf/simulated/floor/holofloor/beach/sand,/area/holodeck/source_beach) +"cY" = (/obj/item/beach_ball,/turf/simulated/floor/holofloor/beach/sand,/area/holodeck/source_beach) "cZ" = (/obj/structure/window/reinforced/holowindow{dir = 4},/turf/simulated/floor/holofloor/tiled/dark,/area/holodeck/source_boxingcourt) "da" = (/obj/effect/floor_decal/corner/red/full{dir = 8},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_boxingcourt) "db" = (/obj/effect/floor_decal/corner/red{dir = 5},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_boxingcourt) @@ -160,13 +160,13 @@ "dd" = (/obj/structure/window/reinforced/holowindow{dir = 8},/turf/simulated/floor/holofloor/tiled/dark,/area/holodeck/source_boxingcourt) "de" = (/obj/structure/flora/grass/green,/turf/simulated/floor/holofloor/snow,/area/holodeck/source_snowfield) "df" = (/obj/structure/table/holotable,/obj/machinery/readybutton{pixel_y = 0},/obj/effect/floor_decal/corner/green/full{dir = 8},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) -"dg" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/under/color/green,/obj/item/clothing/suit/armor/tdome/green,/obj/item/weapon/holo/esword/green,/obj/effect/floor_decal/corner/green{dir = 5},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) +"dg" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/under/color/green,/obj/item/clothing/suit/armor/tdome/green,/obj/item/holo/esword/green,/obj/effect/floor_decal/corner/green{dir = 5},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) "dh" = (/obj/structure/holostool,/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet{dir = 1},/obj/effect/floor_decal/carpet{dir = 5},/turf/simulated/floor/holofloor/carpet,/area/holodeck/source_meetinghall) "di" = (/obj/effect/floor_decal/corner/red/full,/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_basketball) "dj" = (/obj/effect/floor_decal/corner/red{dir = 10},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_basketball) "dk" = (/obj/effect/floor_decal/spline/plain{dir = 1},/turf/simulated/floor/holofloor/lino,/area/holodeck/source_meetinghall) "dl" = (/obj/effect/floor_decal/corner/red/full{dir = 4},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_basketball) -"dm" = (/obj/item/weapon/inflatable_duck,/turf/simulated/floor/holofloor/beach/sand,/area/holodeck/source_beach) +"dm" = (/obj/item/inflatable_duck,/turf/simulated/floor/holofloor/beach/sand,/area/holodeck/source_beach) "dn" = (/turf/simulated/floor/holofloor/carpet,/area/holodeck/source_meetinghall) "do" = (/obj/effect/floor_decal/spline/plain{dir = 5},/turf/simulated/floor/holofloor/lino,/area/holodeck/source_meetinghall) "dp" = (/obj/effect/floor_decal/corner/green{dir = 9},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) @@ -204,7 +204,7 @@ "dV" = (/obj/effect/floor_decal/corner/green/full{dir = 4},/obj/structure/window/reinforced/holowindow/disappearing,/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) "dW" = (/turf/simulated/floor/holofloor/beach/water,/area/holodeck/source_beach) "dX" = (/obj/effect/floor_decal/corner/green/full,/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_basketball) -"dY" = (/obj/item/weapon/beach_ball/holoball,/obj/effect/floor_decal/corner/red{dir = 5},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_basketball) +"dY" = (/obj/item/beach_ball/holoball,/obj/effect/floor_decal/corner/red{dir = 5},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_basketball) "dZ" = (/obj/effect/floor_decal/corner/green/full{dir = 4},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_basketball) "ea" = (/obj/effect/floor_decal/corner/green/full{dir = 1},/obj/structure/table/holotable,/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) "eb" = (/obj/effect/floor_decal/corner/red/full{dir = 8},/obj/structure/window/reinforced/holowindow/disappearing{dir = 1},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) @@ -216,51 +216,51 @@ "eh" = (/obj/machinery/door/blast/regular{icon_state = "pdoor1"; id = "ASSAULT"; name = "Assault Weapon Storage"; p_open = 0},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "ei" = (/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "ej" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/obj/item/ammo_magazine/m762,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"ek" = (/obj/structure/table/rack,/obj/item/weapon/gun/launcher/rocket,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"el" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/automatic/z8,/obj/item/weapon/gun/projectile/automatic/z8,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"em" = (/obj/structure/table/rack,/obj/item/weapon/rig/ert/assetprotection,/obj/item/weapon/rig/ert/assetprotection,/obj/item/weapon/rig/ert/assetprotection,/obj/item/weapon/rig/ert/assetprotection,/obj/item/weapon/rig/ert/assetprotection,/obj/item/weapon/rig/ert/assetprotection,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"en" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/sniperrifle,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"eo" = (/obj/structure/table/rack,/obj/item/weapon/melee/energy/sword,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"ep" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/automatic/l6_saw,/obj/item/ammo_magazine/m545saw,/obj/item/ammo_magazine/m545saw,/obj/item/ammo_magazine/m545saw,/obj/item/ammo_magazine/m545saw,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"eq" = (/obj/structure/table/rack,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"er" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/laser,/obj/item/weapon/gun/energy/laser,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"es" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/weapon/gun/projectile/automatic/p90,/obj/item/weapon/gun/projectile/automatic/p90,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"et" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/xray,/obj/item/weapon/gun/energy/xray,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"ek" = (/obj/structure/table/rack,/obj/item/gun/launcher/rocket,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"el" = (/obj/structure/table/rack,/obj/item/gun/projectile/automatic/z8,/obj/item/gun/projectile/automatic/z8,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"em" = (/obj/structure/table/rack,/obj/item/rig/ert/assetprotection,/obj/item/rig/ert/assetprotection,/obj/item/rig/ert/assetprotection,/obj/item/rig/ert/assetprotection,/obj/item/rig/ert/assetprotection,/obj/item/rig/ert/assetprotection,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"en" = (/obj/structure/table/rack,/obj/item/gun/energy/sniperrifle,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"eo" = (/obj/structure/table/rack,/obj/item/melee/energy/sword,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"ep" = (/obj/structure/table/rack,/obj/item/gun/projectile/automatic/l6_saw,/obj/item/ammo_magazine/m545saw,/obj/item/ammo_magazine/m545saw,/obj/item/ammo_magazine/m545saw,/obj/item/ammo_magazine/m545saw,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"eq" = (/obj/structure/table/rack,/obj/item/shield/energy,/obj/item/shield/energy,/obj/item/shield/energy,/obj/item/shield/energy,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"er" = (/obj/structure/table/rack,/obj/item/gun/energy/laser,/obj/item/gun/energy/laser,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"es" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/gun/projectile/automatic/p90,/obj/item/gun/projectile/automatic/p90,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"et" = (/obj/structure/table/rack,/obj/item/gun/energy/xray,/obj/item/gun/energy/xray,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "eu" = (/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "ev" = (/obj/machinery/deployable/barrier,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "ew" = (/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"ex" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/gun,/obj/item/weapon/gun/energy/gun,/obj/item/weapon/gun/energy/gun,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"ey" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/gun/energy/ionrifle,/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/gun/energy/ionrifle,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"ez" = (/obj/structure/table/reinforced,/obj/item/weapon/gun/energy/ionrifle/pistol,/obj/item/weapon/gun/energy/ionrifle/pistol,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"ex" = (/obj/structure/table/rack,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"ey" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/item/gun/energy/ionrifle,/obj/structure/window/reinforced{dir = 1},/obj/item/gun/energy/ionrifle,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"ez" = (/obj/structure/table/reinforced,/obj/item/gun/energy/ionrifle/pistol,/obj/item/gun/energy/ionrifle/pistol,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "eA" = (/obj/machinery/computer/teleporter,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "eB" = (/obj/machinery/teleport/station,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "eC" = (/obj/machinery/teleport/hub,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "eD" = (/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "eE" = (/obj/machinery/mech_recharger,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "eF" = (/obj/machinery/mech_recharger,/obj/mecha/combat/gygax/dark,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) -"eG" = (/obj/structure/table/reinforced,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"eG" = (/obj/structure/table/reinforced,/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "eH" = (/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "eI" = (/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "eJ" = (/obj/structure/table/steel_reinforced,/obj/item/mecha_parts/mecha_equipment/weapon/energy/ion,/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "eK" = (/obj/structure/table/steel_reinforced,/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster,/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) -"eL" = (/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/item/weapon/storage/belt/security/tactical/bandolier,/obj/item/weapon/storage/belt/security/tactical/bandolier,/obj/item/weapon/storage/belt/security/tactical/bandolier,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/storage/belt/security/tactical,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"eL" = (/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/item/storage/belt/security/tactical/bandolier,/obj/item/storage/belt/security/tactical/bandolier,/obj/item/storage/belt/security/tactical/bandolier,/obj/item/storage/belt/security/tactical,/obj/item/storage/belt/security/tactical,/obj/item/storage/belt/security/tactical,/obj/item/storage/belt/security/tactical,/obj/item/storage/belt/security/tactical,/obj/item/storage/belt/security/tactical,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "eM" = (/obj/structure/curtain/open/shower,/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) -"eN" = (/obj/item/weapon/bikehorn/rubberducky,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) +"eN" = (/obj/item/bikehorn/rubberducky,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "eO" = (/obj/machinery/shower{icon_state = "shower"; dir = 8},/obj/structure/curtain/open/shower,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "eP" = (/obj/machinery/door/blast/regular{icon_state = "pdoor1"; id = "ASSAULT"; name = "Assault Armor Storage"; p_open = 0},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) -"eQ" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/gun/launcher/grenade,/obj/item/weapon/gun/launcher/grenade,/obj/structure/window/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"eR" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/gun/energy/gun/nuclear,/obj/item/weapon/gun/energy/gun/nuclear,/obj/item/weapon/gun/energy/gun/nuclear,/obj/structure/window/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"eS" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/weapon/storage/box/shotgunshells,/obj/item/weapon/storage/box/shotgunshells,/obj/item/weapon/storage/box/shotgunammo,/obj/item/weapon/storage/box/shotgunammo,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"eT" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/item/weapon/gun/projectile/shotgun/pump/combat,/obj/item/weapon/gun/projectile/shotgun/pump/combat,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"eU" = (/obj/item/weapon/storage/box/flashshells,/obj/item/weapon/storage/box/flashshells,/obj/item/weapon/storage/box/stunshells,/obj/item/weapon/storage/box/stunshells,/obj/item/weapon/storage/box/beanbags,/obj/item/weapon/storage/box/beanbags,/obj/structure/window/reinforced,/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"eV" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/taser,/obj/item/weapon/gun/energy/taser,/obj/item/weapon/gun/energy/taser,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"eQ" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/item/gun/launcher/grenade,/obj/item/gun/launcher/grenade,/obj/structure/window/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"eR" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/item/gun/energy/gun/nuclear,/obj/item/gun/energy/gun/nuclear,/obj/item/gun/energy/gun/nuclear,/obj/structure/window/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"eS" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/storage/box/shotgunshells,/obj/item/storage/box/shotgunshells,/obj/item/storage/box/shotgunammo,/obj/item/storage/box/shotgunammo,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"eT" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/item/gun/projectile/shotgun/pump/combat,/obj/item/gun/projectile/shotgun/pump/combat,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"eU" = (/obj/item/storage/box/flashshells,/obj/item/storage/box/flashshells,/obj/item/storage/box/stunshells,/obj/item/storage/box/stunshells,/obj/item/storage/box/beanbags,/obj/item/storage/box/beanbags,/obj/structure/window/reinforced,/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"eV" = (/obj/structure/table/rack,/obj/item/gun/energy/taser,/obj/item/gun/energy/taser,/obj/item/gun/energy/taser,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "eW" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/item/clothing/glasses/night{pixel_x = 2; pixel_y = 2},/obj/item/clothing/glasses/night{pixel_x = 2; pixel_y = 2},/obj/item/clothing/glasses/night{pixel_x = 2; pixel_y = 2},/obj/item/clothing/glasses/night{pixel_x = 2; pixel_y = 2},/obj/item/clothing/glasses/night{pixel_x = 2; pixel_y = 2},/obj/item/clothing/glasses/night{pixel_x = 2; pixel_y = 2},/obj/item/clothing/glasses/sunglasses/sechud/tactical{pixel_x = -2; pixel_y = -2},/obj/item/clothing/glasses/sunglasses/sechud/tactical{pixel_x = -2; pixel_y = -2},/obj/item/clothing/glasses/sunglasses/sechud/tactical{pixel_x = -2; pixel_y = -2},/obj/item/clothing/glasses/sunglasses/sechud/tactical{pixel_x = -2; pixel_y = -2},/obj/item/clothing/glasses/sunglasses/sechud/tactical{pixel_x = -2; pixel_y = -2},/obj/item/clothing/glasses/sunglasses/sechud/tactical{pixel_x = -2; pixel_y = -2},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "eX" = (/obj/structure/closet/wardrobe/ert,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "eY" = (/obj/machinery/vending/cola{name = "hacked Robust Softdrinks"; prices = list()},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"eZ" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"eZ" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fa" = (/obj/machinery/vending/snack{name = "hacked Getmore Chocolate Corp"; prices = list()},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fb" = (/obj/structure/undies_wardrobe,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"fc" = (/obj/structure/table/standard,/obj/item/weapon/towel,/obj/item/weapon/towel,/obj/item/weapon/towel,/obj/item/weapon/towel,/obj/random/soap,/obj/random/soap,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) +"fc" = (/obj/structure/table/standard,/obj/item/towel,/obj/item/towel,/obj/item/towel,/obj/item/towel,/obj/random/soap,/obj/random/soap,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "fd" = (/obj/structure/urinal{pixel_y = 32},/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "fe" = (/obj/structure/curtain/open/shower,/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/window/reinforced/tinted,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "ff" = (/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) @@ -270,15 +270,15 @@ "fj" = (/obj/item/mecha_parts/mecha_equipment/teleporter,/obj/item/mecha_parts/mecha_tracking,/obj/item/mecha_parts/mecha_tracking,/obj/item/mecha_parts/mecha_tracking,/obj/item/mecha_parts/mecha_tracking,/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "fk" = (/obj/item/mecha_parts/mecha_equipment/tool/sleeper,/obj/item/mecha_parts/mecha_equipment/tool/sleeper,/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun,/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "fl" = (/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,/obj/item/mecha_parts/mecha_equipment/repair_droid,/obj/item/mecha_parts/mecha_equipment/repair_droid,/obj/item/mecha_parts/mecha_equipment/repair_droid,/obj/item/mecha_parts/mecha_equipment/repair_droid,/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) -"fm" = (/obj/structure/table/rack,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"fn" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/flashbangs,/obj/item/weapon/storage/box/flashbangs,/obj/item/weapon/storage/box/emps{pixel_x = 4; pixel_y = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/storage/box/frags,/obj/item/weapon/storage/box/smokes,/obj/item/weapon/storage/box/smokes,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"fm" = (/obj/structure/table/rack,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"fn" = (/obj/structure/table/rack,/obj/item/storage/box/flashbangs,/obj/item/storage/box/flashbangs,/obj/item/storage/box/emps{pixel_x = 4; pixel_y = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/item/storage/box/frags,/obj/item/storage/box/smokes,/obj/item/storage/box/smokes,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fo" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/obj/item/ammo_magazine/m9mmt/rubber,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"fp" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/automatic/wt550,/obj/item/weapon/gun/projectile/automatic/wt550,/obj/item/weapon/gun/projectile/automatic/wt550,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"fp" = (/obj/structure/table/rack,/obj/item/gun/projectile/automatic/wt550,/obj/item/gun/projectile/automatic/wt550,/obj/item/gun/projectile/automatic/wt550,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fq" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/item/ammo_magazine/m9mmt,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"fr" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/gun/energy/stunrevolver,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"fr" = (/obj/structure/table/rack,/obj/item/gun/energy/stunrevolver,/obj/item/gun/energy/stunrevolver,/obj/item/gun/energy/stunrevolver,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fs" = (/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/storage/black_drop_pouches,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"ft" = (/obj/structure/table/reinforced,/obj/item/weapon/shield_diffuser,/obj/item/weapon/shield_diffuser,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"fu" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/obj/item/weapon/shield_diffuser,/obj/item/weapon/shield_diffuser,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"ft" = (/obj/structure/table/reinforced,/obj/item/shield_diffuser,/obj/item/shield_diffuser,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"fu" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/obj/item/shield_diffuser,/obj/item/shield_diffuser,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fv" = (/obj/effect/landmark{name = "Response Team"},/obj/effect/landmark{name = "Commando"},/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/centcom/specops) "fw" = (/obj/effect/landmark{name = "Commando"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fx" = (/obj/structure/table/reinforced,/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp,/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) @@ -287,12 +287,12 @@ "fA" = (/obj/machinery/door/airlock/centcom{name = "Special Operations"; opacity = 1; req_access = list(103)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) "fB" = (/obj/structure/table/bench/padded,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fC" = (/obj/machinery/door/airlock,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) -"fD" = (/obj/item/mecha_parts/mecha_equipment/tool/extinguisher,/obj/item/mecha_parts/mecha_equipment/tool/rcd,/obj/item/weapon/pickaxe/diamonddrill,/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) -"fE" = (/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/item/weapon/rig/ert/security,/obj/item/weapon/rig/ert/security,/obj/item/weapon/rig/ert/security,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"fD" = (/obj/item/mecha_parts/mecha_equipment/tool/extinguisher,/obj/item/mecha_parts/mecha_equipment/tool/rcd,/obj/item/pickaxe/diamonddrill,/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) +"fE" = (/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/item/rig/ert/security,/obj/item/rig/ert/security,/obj/item/rig/ert/security,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fF" = (/obj/structure/table/rack,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fG" = (/obj/structure/table/rack,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fH" = (/obj/structure/table/rack,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/effect/floor_decal/industrial/outline/blue,/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = 32},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"fI" = (/obj/structure/table/reinforced,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/screwdriver,/obj/item/weapon/tool/wrench,/obj/effect/floor_decal/industrial/outline/blue,/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = 32},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"fI" = (/obj/structure/table/reinforced,/obj/item/tool/crowbar,/obj/item/tool/screwdriver,/obj/item/tool/wrench,/obj/effect/floor_decal/industrial/outline/blue,/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = 32},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fJ" = (/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fK" = (/obj/machinery/porta_turret{anchored = 0; check_records = 0; enabled = 0; req_one_access = list(103); use_power = 0},/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fL" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) @@ -303,12 +303,12 @@ "fQ" = (/obj/mecha/medical/odysseus/loaded,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "fR" = (/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill,/obj/item/mecha_parts/mecha_equipment/tool/cable_layer,/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "fS" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/flash,/obj/item/ammo_magazine/m45/flash,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"fT" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/item/weapon/gun/projectile/sec,/obj/item/weapon/gun/projectile/sec,/obj/item/weapon/gun/projectile/sec,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"fU" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/handcuffs{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/box/handcuffs,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"fV" = (/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/reagent_containers/spray/pepper,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"fT" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/item/gun/projectile/sec,/obj/item/gun/projectile/sec,/obj/item/gun/projectile/sec,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"fU" = (/obj/structure/table/reinforced,/obj/item/storage/box/handcuffs{pixel_x = 3; pixel_y = 3},/obj/item/storage/box/handcuffs,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"fV" = (/obj/item/material/knife/tacknife/combatknife,/obj/item/material/knife/tacknife/combatknife,/obj/item/material/knife/tacknife/combatknife,/obj/item/material/knife/tacknife/combatknife,/obj/item/material/knife/tacknife/combatknife,/obj/item/material/knife/tacknife/combatknife,/obj/structure/table/reinforced,/obj/item/reagent_containers/spray/pepper,/obj/item/reagent_containers/spray/pepper,/obj/item/reagent_containers/spray/pepper,/obj/item/reagent_containers/spray/pepper,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fW" = (/obj/machinery/vending/security,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"fX" = (/obj/structure/table/rack,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"fY" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/item/weapon/storage/backpack/ert/security,/obj/item/weapon/storage/backpack/ert/security,/obj/item/weapon/storage/backpack/ert/security,/obj/item/weapon/storage/backpack/ert/security,/obj/item/weapon/storage/backpack/ert/security,/obj/item/weapon/storage/backpack/ert/security,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"fX" = (/obj/structure/table/rack,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/flash,/obj/item/flash,/obj/item/flash,/obj/item/flash,/obj/item/flash,/obj/item/flash,/obj/item/melee/baton/loaded,/obj/item/melee/baton/loaded,/obj/item/melee/baton/loaded,/obj/item/melee/baton/loaded,/obj/item/melee/baton/loaded,/obj/item/melee/baton/loaded,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"fY" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/item/storage/backpack/ert/security,/obj/item/storage/backpack/ert/security,/obj/item/storage/backpack/ert/security,/obj/item/storage/backpack/ert/security,/obj/item/storage/backpack/ert/security,/obj/item/storage/backpack/ert/security,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fZ" = (/obj/structure/table/rack,/obj/item/clothing/accessory/holster/leg,/obj/item/clothing/accessory/holster/leg,/obj/item/clothing/accessory/holster/leg,/obj/item/clothing/accessory/holster/leg,/obj/item/clothing/accessory/holster/leg,/obj/item/clothing/accessory/holster/leg,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "ga" = (/obj/machinery/door/airlock/centcom{icon_state = "door_locked"; locked = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "gb" = (/obj/structure/table/glass,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) @@ -321,12 +321,12 @@ "gi" = (/obj/effect/floor_decal/corner/red{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "gj" = (/obj/structure/bed/chair,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "gk" = (/obj/effect/floor_decal/corner/purple{dir = 6},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"gl" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/device/flash,/obj/item/device/flash,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"gm" = (/obj/structure/table/rack,/obj/item/device/lightreplacer,/obj/item/device/lightreplacer,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"gn" = (/obj/structure/table/reinforced,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/screwdriver,/obj/item/weapon/tool/wrench,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"go" = (/obj/structure/table/reinforced,/obj/item/weapon/stamp/centcomm,/obj/item/weapon/pen,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"gp" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"gq" = (/obj/structure/table/reinforced,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"gl" = (/obj/structure/table/rack,/obj/item/gun/energy/stunrevolver,/obj/item/gun/energy/stunrevolver,/obj/item/flash,/obj/item/flash,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"gm" = (/obj/structure/table/rack,/obj/item/lightreplacer,/obj/item/lightreplacer,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"gn" = (/obj/structure/table/reinforced,/obj/item/tool/crowbar,/obj/item/tool/screwdriver,/obj/item/tool/wrench,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"go" = (/obj/structure/table/reinforced,/obj/item/stamp/centcomm,/obj/item/pen,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"gp" = (/obj/structure/table/reinforced,/obj/item/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"gq" = (/obj/structure/table/reinforced,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/obj/item/tool/crowbar,/obj/item/radio/off,/obj/item/radio/off,/obj/item/radio/off,/obj/item/radio/off,/obj/item/radio/off,/obj/item/radio/off,/obj/item/flashlight,/obj/item/flashlight,/obj/item/flashlight,/obj/item/flashlight,/obj/item/flashlight,/obj/item/flashlight,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "gr" = (/obj/machinery/door/airlock,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "gs" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/specops) "gt" = (/obj/effect/floor_decal/corner/yellow,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) @@ -336,39 +336,39 @@ "gx" = (/obj/effect/floor_decal/corner/white{dir = 10},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "gy" = (/obj/effect/floor_decal/corner/white{dir = 8},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "gz" = (/obj/structure/table/reinforced,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"gA" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/donut,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"gB" = (/obj/structure/table/reinforced,/obj/item/device/paicard,/obj/item/device/paicard,/obj/item/device/paicard,/obj/item/device/paicard,/obj/item/device/paicard,/obj/item/device/paicard,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"gC" = (/obj/structure/table/rack,/obj/item/weapon/storage/backpack/security,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/shoes/galoshes,/obj/item/clothing/head/bio_hood/janitor,/obj/item/clothing/suit/bio_suit/janitor,/obj/item/clothing/gloves/purple,/obj/item/clothing/glasses/science,/obj/item/weapon/storage/backpack/security,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/shoes/galoshes,/obj/item/clothing/head/bio_hood/janitor,/obj/item/clothing/suit/bio_suit/janitor,/obj/item/clothing/gloves/purple,/obj/item/clothing/glasses/science,/obj/item/weapon/reagent_containers/spray/cleaner{pixel_x = 6; pixel_y = 3},/obj/item/weapon/reagent_containers/spray/cleaner{pixel_x = 6; pixel_y = 3},/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"gD" = (/obj/item/weapon/mop,/obj/structure/mopbucket,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"gE" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/reagent_containers/glass/bucket{amount_per_transfer_from_this = 50},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"gA" = (/obj/structure/table/reinforced,/obj/item/storage/box/donut,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"gB" = (/obj/structure/table/reinforced,/obj/item/paicard,/obj/item/paicard,/obj/item/paicard,/obj/item/paicard,/obj/item/paicard,/obj/item/paicard,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"gC" = (/obj/structure/table/rack,/obj/item/storage/backpack/security,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/shoes/galoshes,/obj/item/clothing/head/bio_hood/janitor,/obj/item/clothing/suit/bio_suit/janitor,/obj/item/clothing/gloves/purple,/obj/item/clothing/glasses/science,/obj/item/storage/backpack/security,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/shoes/galoshes,/obj/item/clothing/head/bio_hood/janitor,/obj/item/clothing/suit/bio_suit/janitor,/obj/item/clothing/gloves/purple,/obj/item/clothing/glasses/science,/obj/item/reagent_containers/spray/cleaner{pixel_x = 6; pixel_y = 3},/obj/item/reagent_containers/spray/cleaner{pixel_x = 6; pixel_y = 3},/obj/item/reagent_containers/spray/plantbgone,/obj/item/reagent_containers/spray/plantbgone,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/mixed,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"gD" = (/obj/item/mop,/obj/structure/mopbucket,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"gE" = (/obj/structure/reagent_dispensers/watertank,/obj/item/reagent_containers/glass/bucket{amount_per_transfer_from_this = 50},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "gF" = (/obj/structure/sign/greencross{desc = "White cross in a green field, you can get medical aid here."; name = "First-Aid"},/turf/simulated/shuttle/wall/dark/hard_corner,/area/centcom/specops) "gG" = (/obj/structure/bed/chair{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "gH" = (/turf/simulated/shuttle/wall/dark/no_join,/area/centcom/specops) -"gI" = (/obj/item/weapon/circuitboard/aiupload,/obj/item/weapon/circuitboard/borgupload,/obj/item/weapon/circuitboard/smes,/obj/item/weapon/aiModule/nanotrasen,/obj/item/weapon/aiModule/reset,/obj/item/weapon/aiModule/freeformcore,/obj/item/weapon/aiModule/protectStation,/obj/item/weapon/aiModule/quarantine,/obj/item/weapon/aiModule/paladin,/obj/item/weapon/aiModule/robocop,/obj/item/weapon/aiModule/safeguard,/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"gI" = (/obj/item/circuitboard/aiupload,/obj/item/circuitboard/borgupload,/obj/item/circuitboard/smes,/obj/item/aiModule/nanotrasen,/obj/item/aiModule/reset,/obj/item/aiModule/freeformcore,/obj/item/aiModule/protectStation,/obj/item/aiModule/quarantine,/obj/item/aiModule/paladin,/obj/item/aiModule/robocop,/obj/item/aiModule/safeguard,/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "gJ" = (/obj/machinery/vending/assist,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "gK" = (/obj/machinery/vending/tool,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "gL" = (/obj/machinery/vending/engivend,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "gM" = (/obj/machinery/vending/engineering,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"gN" = (/obj/structure/table/rack,/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"gO" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/item/weapon/storage/backpack/ert/engineer,/obj/item/weapon/storage/backpack/ert/engineer,/obj/item/weapon/storage/backpack/ert/engineer,/obj/item/weapon/storage/backpack/ert/engineer,/obj/item/weapon/storage/backpack/ert/engineer,/obj/item/weapon/storage/backpack/ert/engineer,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"gP" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/hypospray,/obj/item/weapon/reagent_containers/hypospray,/obj/item/weapon/reagent_containers/hypospray,/obj/item/weapon/reagent_containers/hypospray,/obj/item/weapon/reagent_containers/hypospray,/obj/item/weapon/reagent_containers/hypospray,/obj/item/weapon/storage/box/pillbottles,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"gQ" = (/obj/machinery/chemical_dispenser/full,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"gR" = (/obj/machinery/chem_master,/obj/item/weapon/reagent_containers/glass/beaker/large,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"gS" = (/obj/machinery/chemical_dispenser/ert,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"gN" = (/obj/structure/table/rack,/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/item/clothing/glasses/welding/superior,/obj/item/grenade/chem_grenade/metalfoam,/obj/item/grenade/chem_grenade/metalfoam,/obj/item/grenade/chem_grenade/metalfoam,/obj/item/grenade/chem_grenade/metalfoam,/obj/item/grenade/chem_grenade/metalfoam,/obj/item/grenade/chem_grenade/metalfoam,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"gO" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/item/storage/backpack/ert/engineer,/obj/item/storage/backpack/ert/engineer,/obj/item/storage/backpack/ert/engineer,/obj/item/storage/backpack/ert/engineer,/obj/item/storage/backpack/ert/engineer,/obj/item/storage/backpack/ert/engineer,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"gP" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/hypospray,/obj/item/reagent_containers/hypospray,/obj/item/reagent_containers/hypospray,/obj/item/reagent_containers/hypospray,/obj/item/reagent_containers/hypospray,/obj/item/reagent_containers/hypospray,/obj/item/storage/box/pillbottles,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"gQ" = (/obj/machinery/chemical_dispenser/full,/obj/item/reagent_containers/glass/beaker/large,/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"gR" = (/obj/machinery/chem_master,/obj/item/reagent_containers/glass/beaker/large,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"gS" = (/obj/machinery/chemical_dispenser/ert,/obj/item/reagent_containers/glass/beaker/large,/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "gT" = (/obj/machinery/vending/medical,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "gU" = (/obj/item/clothing/glasses/hud/health{pixel_x = 4; pixel_y = 4},/obj/item/clothing/glasses/hud/health{pixel_x = 2; pixel_y = 2},/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/structure/table/rack,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"gV" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/table/rack,/obj/item/weapon/storage/backpack/ert/medical,/obj/item/weapon/storage/backpack/ert/medical,/obj/item/weapon/storage/backpack/ert/medical,/obj/item/weapon/storage/backpack/ert/medical,/obj/item/weapon/storage/backpack/ert/medical,/obj/item/weapon/storage/backpack/ert/medical,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"gW" = (/obj/structure/table/reinforced,/obj/item/device/pda/ert,/obj/item/device/pda/ert,/obj/item/device/pda/ert,/obj/item/device/pda/ert,/obj/item/device/pda/ert,/obj/item/device/pda/ert,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"gX" = (/obj/structure/table/reinforced,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"gV" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/table/rack,/obj/item/storage/backpack/ert/medical,/obj/item/storage/backpack/ert/medical,/obj/item/storage/backpack/ert/medical,/obj/item/storage/backpack/ert/medical,/obj/item/storage/backpack/ert/medical,/obj/item/storage/backpack/ert/medical,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"gW" = (/obj/structure/table/reinforced,/obj/item/pda/ert,/obj/item/pda/ert,/obj/item/pda/ert,/obj/item/pda/ert,/obj/item/pda/ert,/obj/item/pda/ert,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"gX" = (/obj/structure/table/reinforced,/obj/item/cell/high,/obj/item/cell/high,/obj/item/cell/high,/obj/item/cell/high,/obj/item/cell/high,/obj/item/cell/high,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "gY" = (/obj/effect/floor_decal/corner/red/full{dir = 1},/obj/structure/window/reinforced/holowindow/disappearing{dir = 1},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) "gZ" = (/turf/simulated/shuttle/wall/dark{join_group = "shuttle_ert"},/area/shuttle/response_ship/start) -"ha" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/item/weapon/rig/ert/engineer,/obj/item/weapon/rig/ert/engineer,/obj/item/weapon/rig/ert/engineer,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"ha" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/item/rig/ert/engineer,/obj/item/rig/ert/engineer,/obj/item/rig/ert/engineer,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "hb" = (/obj/structure/closet/crate/medical,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"hc" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"hd" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced,/obj/structure/table/rack,/obj/item/weapon/rig/ert/medical,/obj/item/weapon/rig/ert/medical,/obj/item/weapon/rig/ert/medical,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"he" = (/obj/structure/table/reinforced,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"hc" = (/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"hd" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced,/obj/structure/table/rack,/obj/item/rig/ert/medical,/obj/item/rig/ert/medical,/obj/item/rig/ert/medical,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"he" = (/obj/structure/table/reinforced,/obj/item/megaphone,/obj/item/megaphone,/obj/item/megaphone,/obj/item/megaphone,/obj/item/megaphone,/obj/item/megaphone,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "hf" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"hg" = (/obj/structure/table/rack,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"hg" = (/obj/structure/table/rack,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "hh" = (/obj/structure/closet/crate/internals{name = "Mask Crate"},/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "hi" = (/obj/machinery/cell_charger,/obj/structure/table/reinforced,/obj/effect/floor_decal/industrial/outline/blue,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "hj" = (/obj/effect/floor_decal/carpet{dir = 8},/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet{dir = 10},/obj/effect/floor_decal/carpet{dir = 6},/turf/simulated/floor/holofloor/carpet,/area/holodeck/source_meetinghall) @@ -390,21 +390,21 @@ "hz" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "response_base_door"; locked = 1},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "hA" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "response_base"; name = "docking port controller"; pixel_x = 0; pixel_y = -25; req_one_access = list(103); tag_door = "response_base_door"},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "hB" = (/obj/structure/reagent_dispensers/watertank,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"hC" = (/obj/structure/table/steel_reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"hD" = (/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/steel{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/material/steel{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/material/steel{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/material/steel{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/material/plasteel{amount = 50},/obj/item/stack/material/plasteel{amount = 50},/obj/item/stack/material/plasteel{amount = 50},/obj/item/stack/material/plasteel{amount = 50},/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"hC" = (/obj/structure/table/steel_reinforced,/obj/machinery/cell_charger,/obj/item/cell/high,/obj/item/cell/high,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"hD" = (/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/steel{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/material/steel{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/material/steel{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/material/steel{amount = 50; pixel_x = 2; pixel_y = 2},/obj/item/stack/material/plasteel{amount = 50},/obj/item/stack/material/plasteel{amount = 50},/obj/item/stack/material/plasteel{amount = 50},/obj/item/stack/material/plasteel{amount = 50},/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/stack/material/glass/reinforced{amount = 50},/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/item/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 3},/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "hE" = (/obj/machinery/pipedispenser/orderable,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "hF" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/item/clothing/head/helmet/ert/engineer,/obj/item/clothing/head/helmet/ert/engineer,/obj/item/clothing/head/helmet/ert/engineer,/obj/item/clothing/head/helmet/ert/engineer,/obj/item/clothing/suit/armor/vest/ert/engineer,/obj/item/clothing/suit/armor/vest/ert/engineer,/obj/item/clothing/suit/armor/vest/ert/engineer,/obj/item/clothing/suit/armor/vest/ert/engineer,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"hG" = (/obj/structure/table/reinforced,/obj/item/device/defib_kit,/obj/item/device/defib_kit,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/item/weapon/tool/screwdriver,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"hH" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/syringes{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"hG" = (/obj/structure/table/reinforced,/obj/item/defib_kit,/obj/item/defib_kit,/obj/item/cell/high,/obj/item/cell/high,/obj/item/tool/screwdriver,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"hH" = (/obj/structure/table/reinforced,/obj/item/storage/box/syringes{pixel_x = 2; pixel_y = 2},/obj/item/storage/box/syringes,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "hI" = (/obj/item/roller,/obj/item/roller{pixel_y = 8},/obj/item/roller{pixel_y = 16},/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"hJ" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/autoinjectors,/obj/item/weapon/storage/box/beakers,/obj/item/weapon/storage/box/gloves,/obj/item/weapon/storage/box/masks,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"hJ" = (/obj/structure/table/reinforced,/obj/item/storage/box/autoinjectors,/obj/item/storage/box/beakers,/obj/item/storage/box/gloves,/obj/item/storage/box/masks,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "hK" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced,/obj/structure/table/rack,/obj/item/clothing/head/helmet/ert/medical,/obj/item/clothing/head/helmet/ert/medical,/obj/item/clothing/head/helmet/ert/medical,/obj/item/clothing/head/helmet/ert/medical,/obj/item/clothing/suit/armor/vest/ert/medical,/obj/item/clothing/suit/armor/vest/ert/medical,/obj/item/clothing/suit/armor/vest/ert/medical,/obj/item/clothing/suit/armor/vest/ert/medical,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "hL" = (/obj/structure/table/rack,/obj/item/rig_module/device/rcd,/obj/item/rig_module/device/rcd,/obj/item/rig_module/device/plasmacutter,/obj/item/rig_module/device/plasmacutter,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "hM" = (/obj/structure/table/rack,/obj/item/rig_module/chem_dispenser/combat,/obj/item/rig_module/chem_dispenser/combat,/obj/item/rig_module/chem_dispenser/injector,/obj/item/rig_module/chem_dispenser/injector,/obj/item/rig_module/device/healthscanner,/obj/item/rig_module/device/healthscanner,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "hN" = (/obj/structure/table/rack,/obj/item/rig_module/mounted/egun,/obj/item/rig_module/mounted/egun,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"hO" = (/obj/structure/table/reinforced,/obj/item/device/megaphone,/obj/item/weapon/storage/box/trackimp,/obj/item/weapon/storage/box/cdeathalarm_kit,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"hP" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/vest/ert/command,/obj/item/clothing/head/helmet/ert/command,/obj/item/weapon/storage/backpack/ert/commander,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"hQ" = (/obj/structure/table/reinforced,/obj/item/device/aicard,/obj/item/weapon/stamp/centcomm,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"hO" = (/obj/structure/table/reinforced,/obj/item/megaphone,/obj/item/storage/box/trackimp,/obj/item/storage/box/cdeathalarm_kit,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"hP" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/vest/ert/command,/obj/item/clothing/head/helmet/ert/command,/obj/item/storage/backpack/ert/commander,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"hQ" = (/obj/structure/table/reinforced,/obj/item/aicard,/obj/item/stamp/centcomm,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "hR" = (/turf/unsimulated/wall,/area/ai_multicam_room) "hS" = (/obj/structure/flight_right{icon_state = "right"; dir = 4},/turf/simulated/shuttle/floor/red,/area/shuttle/response_ship/start) "hT" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor/red,/area/shuttle/response_ship/start) @@ -412,21 +412,21 @@ "hV" = (/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/red,/area/shuttle/response_ship/start) "hW" = (/obj/structure/reagent_dispensers/fueltank,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "hX" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/meson,/obj/item/taperoll/engineering,/obj/item/taperoll/engineering,/obj/item/taperoll/engineering,/obj/item/taperoll/engineering,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"hY" = (/obj/structure/table/steel_reinforced,/obj/item/taperoll/atmos,/obj/item/taperoll/atmos,/obj/item/taperoll/atmos,/obj/item/weapon/pickaxe/drill,/obj/item/weapon/pickaxe/drill,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"hY" = (/obj/structure/table/steel_reinforced,/obj/item/taperoll/atmos,/obj/item/taperoll/atmos,/obj/item/taperoll/atmos,/obj/item/pickaxe/drill,/obj/item/pickaxe/drill,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "hZ" = (/obj/machinery/pipedispenser/disposal/orderable,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"ia" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/device/flash,/obj/item/device/flash,/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"ib" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/pill_bottle/tramadol,/obj/item/weapon/storage/pill_bottle/tramadol,/obj/item/weapon/storage/pill_bottle/tramadol,/obj/item/weapon/storage/pill_bottle/dylovene,/obj/item/weapon/storage/pill_bottle/dylovene,/obj/item/weapon/storage/pill_bottle/dylovene,/obj/item/weapon/storage/pill_bottle/dermaline,/obj/item/weapon/storage/pill_bottle/dermaline,/obj/item/weapon/storage/pill_bottle/dermaline,/obj/item/weapon/storage/pill_bottle/spaceacillin,/obj/item/weapon/storage/pill_bottle/dexalin_plus,/obj/item/weapon/storage/pill_bottle/dexalin_plus,/obj/item/weapon/storage/pill_bottle/dexalin_plus,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"ic" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"id" = (/obj/structure/closet/crate/medical,/obj/item/weapon/surgical/circular_saw,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/weapon/surgical/hemostat{pixel_y = 4},/obj/item/weapon/surgical/cautery{pixel_y = 4},/obj/item/weapon/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/nanopaste,/obj/item/weapon/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/mask/surgical,/obj/item/weapon/autopsy_scanner,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"ia" = (/obj/structure/table/rack,/obj/item/gun/energy/stunrevolver,/obj/item/gun/energy/stunrevolver,/obj/item/flash,/obj/item/flash,/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"ib" = (/obj/structure/table/reinforced,/obj/item/storage/pill_bottle/tramadol,/obj/item/storage/pill_bottle/tramadol,/obj/item/storage/pill_bottle/tramadol,/obj/item/storage/pill_bottle/dylovene,/obj/item/storage/pill_bottle/dylovene,/obj/item/storage/pill_bottle/dylovene,/obj/item/storage/pill_bottle/dermaline,/obj/item/storage/pill_bottle/dermaline,/obj/item/storage/pill_bottle/dermaline,/obj/item/storage/pill_bottle/spaceacillin,/obj/item/storage/pill_bottle/dexalin_plus,/obj/item/storage/pill_bottle/dexalin_plus,/obj/item/storage/pill_bottle/dexalin_plus,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"ic" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"id" = (/obj/structure/closet/crate/medical,/obj/item/surgical/circular_saw,/obj/item/surgical/surgicaldrill,/obj/item/surgical/bonegel{pixel_x = 4; pixel_y = 3},/obj/item/surgical/bonesetter,/obj/item/surgical/scalpel,/obj/item/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/surgical/hemostat{pixel_y = 4},/obj/item/surgical/cautery{pixel_y = 4},/obj/item/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/nanopaste,/obj/item/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/mask/surgical,/obj/item/autopsy_scanner,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "ie" = (/obj/machinery/iv_drip,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "if" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"ig" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/flashbangs,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"ig" = (/obj/structure/table/reinforced,/obj/item/storage/box/flashbangs,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "ih" = (/obj/effect/floor_decal/corner/red{dir = 9},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) -"ii" = (/obj/item/weapon/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"ij" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"ik" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/belt/medical/emt,/obj/item/weapon/storage/belt/medical/emt,/obj/item/weapon/storage/belt/medical/emt,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"il" = (/obj/structure/table/reinforced,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/screwdriver,/obj/item/weapon/tool/wrench,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/screwdriver,/obj/item/weapon/tool/wrench,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"im" = (/obj/structure/table/reinforced,/obj/item/weapon/pinpointer/advpinpointer,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"ii" = (/obj/item/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"ij" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/storage/belt/utility/full,/obj/item/storage/belt/utility/full,/obj/item/storage/belt/utility/full,/obj/item/storage/belt/utility/full,/obj/item/storage/belt/utility/full,/obj/item/storage/belt/utility/full,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"ik" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/item/storage/belt/medical,/obj/item/storage/belt/medical,/obj/item/storage/belt/medical,/obj/item/storage/belt/medical/emt,/obj/item/storage/belt/medical/emt,/obj/item/storage/belt/medical/emt,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"il" = (/obj/structure/table/reinforced,/obj/item/tool/crowbar,/obj/item/tool/screwdriver,/obj/item/tool/wrench,/obj/item/tool/crowbar,/obj/item/tool/screwdriver,/obj/item/tool/wrench,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"im" = (/obj/structure/table/reinforced,/obj/item/pinpointer/advpinpointer,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "in" = (/turf/unsimulated/wall{desc = "That looks like it doesn't open easily."; dir = 8; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/specops) "io" = (/obj/machinery/shield_gen,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "ip" = (/obj/machinery/shield_gen/external,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) @@ -436,27 +436,27 @@ "it" = (/obj/machinery/portable_atmospherics/canister/air,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "iu" = (/obj/machinery/shieldwallgen,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "iv" = (/obj/machinery/shieldgen,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"iw" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/bodybags{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/bodybags,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"ix" = (/obj/structure/table/reinforced,/obj/item/device/pda/ert,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"iw" = (/obj/structure/table/reinforced,/obj/item/storage/box/bodybags{pixel_x = 2; pixel_y = 2},/obj/item/storage/box/bodybags,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"ix" = (/obj/structure/table/reinforced,/obj/item/pda/ert,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "iy" = (/obj/machinery/shield_capacitor,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"iz" = (/obj/item/weapon/extinguisher,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"iA" = (/obj/structure/table/reinforced,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/item/weapon/packageWrap,/obj/item/weapon/hand_labeler,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/weapon/reagent_containers/spray/sterilizine,/obj/item/weapon/reagent_containers/spray/sterilizine,/obj/item/device/flashlight/pen,/obj/item/device/flashlight/pen,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"iB" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/combat{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/firstaid/combat,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"iC" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/fire{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/firstaid/fire,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"iD" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/toxin{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/firstaid/toxin,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"iE" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/adv{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/firstaid/adv,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"iF" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/o2{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/firstaid/o2,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"iG" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/firstaid/regular,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"iH" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/clotting{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/firstaid/clotting,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"iz" = (/obj/item/extinguisher,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"iA" = (/obj/structure/table/reinforced,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/item/packageWrap,/obj/item/hand_labeler,/obj/item/reagent_containers/spray/cleaner,/obj/item/reagent_containers/spray/cleaner,/obj/item/reagent_containers/spray/sterilizine,/obj/item/reagent_containers/spray/sterilizine,/obj/item/flashlight/pen,/obj/item/flashlight/pen,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"iB" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/combat{pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/combat,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"iC" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/fire{pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/fire,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"iD" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/toxin{pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/toxin,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"iE" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/adv{pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/adv,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"iF" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/o2{pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/o2,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"iG" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/regular{pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/regular,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"iH" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/clotting{pixel_x = 2; pixel_y = 2},/obj/item/storage/firstaid/clotting,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "iI" = (/obj/structure/table/reinforced,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "iJ" = (/obj/structure/table/rack,/obj/item/rig_module/device/drill,/obj/item/rig_module/device/drill,/obj/item/rig_module/maneuvering_jets,/obj/item/rig_module/maneuvering_jets,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "iK" = (/obj/structure/table/rack,/obj/item/rig_module/mounted/taser,/obj/item/rig_module/mounted/taser,/obj/item/rig_module/mounted/taser,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "iL" = (/obj/structure/table/rack,/obj/item/rig_module/grenade_launcher,/obj/item/rig_module/grenade_launcher,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"iM" = (/obj/structure/closet/crate,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"iM" = (/obj/structure/closet/crate,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/storage/box,/obj/item/storage/box,/obj/item/storage/box,/obj/item/storage/box,/obj/item/storage/box,/obj/item/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "iN" = (/obj/machinery/autolathe{desc = "Your typical Autolathe. It appears to have much more options than your regular one, however..."; hacked = 1; name = "Unlocked Autolathe"},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"iO" = (/obj/structure/table/reinforced,/obj/item/weapon/handcuffs,/obj/item/device/flash,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"iP" = (/obj/structure/table/rack,/obj/item/weapon/rig/ert,/obj/item/clothing/accessory/storage/black_vest,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"iQ" = (/obj/structure/table/reinforced,/obj/item/weapon/gun/energy/gun/nuclear,/obj/item/weapon/hand_tele,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"iO" = (/obj/structure/table/reinforced,/obj/item/handcuffs,/obj/item/flash,/obj/item/melee/baton/loaded,/obj/item/storage/belt/security/tactical,/obj/item/gun/energy/stunrevolver,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/material/knife/tacknife/combatknife,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"iP" = (/obj/structure/table/rack,/obj/item/rig/ert,/obj/item/clothing/accessory/storage/black_vest,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"iQ" = (/obj/structure/table/reinforced,/obj/item/gun/energy/gun/nuclear,/obj/item/hand_tele,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "iR" = (/obj/machinery/door/blast/regular{icon_state = "pdoor1"; id = "CREED"; name = "Ready Room"; p_open = 0},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "iS" = (/obj/structure/sign/warning/docking_area,/turf/unsimulated/wall,/area/centcom/command) "iT" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/command) @@ -487,7 +487,7 @@ "js" = (/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/command) "jt" = (/turf/unsimulated/ai_visible,/area/ai_multicam_room) "ju" = (/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/creed) -"jv" = (/obj/structure/table/rack,/obj/item/weapon/storage/secure/briefcase,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/backpack/satchel,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/creed) +"jv" = (/obj/structure/table/rack,/obj/item/storage/secure/briefcase,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter/zippo,/obj/item/storage/belt/utility,/obj/item/storage/backpack/satchel,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/creed) "jw" = (/obj/effect/shuttle_landmark/southern_cross/escape_pod1/offsite,/turf/simulated/shuttle/plating,/area/shuttle/escape_pod1/centcom) "jx" = (/obj/effect/shuttle_landmark/southern_cross/escape_pod2/offsite,/turf/simulated/shuttle/plating,/area/shuttle/escape_pod2/centcom) "jy" = (/obj/effect/floor_decal/corner/red{dir = 6},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) @@ -501,25 +501,25 @@ "jG" = (/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet{dir = 1},/obj/effect/floor_decal/carpet{dir = 5},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "jH" = (/obj/structure/table/wooden_reinforced,/obj/machinery/computer/security/telescreen{name = "Spec. Ops. Monitor"; network = list("ERT")},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/creed) "jI" = (/obj/structure/bed/chair/office/dark,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/creed) -"jJ" = (/obj/item/device/radio/intercom/specops{pixel_y = -21},/obj/machinery/computer/communications{dir = 1},/turf/simulated/shuttle/floor/red,/area/shuttle/response_ship/start) +"jJ" = (/obj/item/radio/intercom/specops{pixel_y = -21},/obj/machinery/computer/communications{dir = 1},/turf/simulated/shuttle/floor/red,/area/shuttle/response_ship/start) "jK" = (/obj/structure/closet/secure_closet/hos,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/creed) "jL" = (/obj/machinery/conveyor{dir = 4; id = "QMLoad2"},/turf/simulated/shuttle/floor,/area/shuttle/supply) "jM" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 1},/obj/structure/window/reinforced,/turf/simulated/shuttle/plating/airless,/area/centcom/evac) "jN" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_pod_1_recovery_hatch"; locked = 1; name = "Recovery Shuttle Dock 1"; req_access = list(13)},/turf/simulated/shuttle/floor/black,/area/centcom/evac) "jO" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_pod_2_recovery_hatch"; locked = 1; name = "Recovery Shuttle Dock 2"; req_access = list(13)},/turf/simulated/shuttle/floor/black,/area/centcom/evac) "jP" = (/obj/machinery/door/airlock/command{name = "Thunderdome Administration"; req_access = list(102)},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) -"jQ" = (/obj/structure/table/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/head/helmet/thunderdome,/obj/item/weapon/melee/baton/loaded,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) -"jR" = (/obj/structure/closet/chefcloset,/obj/item/glass_jar,/obj/item/device/retail_scanner/civilian,/obj/item/weapon/soap/nanotrasen,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"jQ" = (/obj/structure/table/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/head/helmet/thunderdome,/obj/item/melee/baton/loaded,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) +"jR" = (/obj/structure/closet/chefcloset,/obj/item/glass_jar,/obj/item/retail_scanner/civilian,/obj/item/soap/nanotrasen,/obj/item/destTagger{pixel_x = 4; pixel_y = 3},/obj/item/packageWrap,/obj/item/packageWrap,/obj/item/packageWrap,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "jS" = (/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "jT" = (/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bar) "jU" = (/obj/structure/bed/chair/comfy/teal{dir = 4},/obj/effect/floor_decal/carpet{dir = 8},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "jV" = (/obj/structure/table/woodentable{dir = 5},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) -"jW" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/bananapeel,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) +"jW" = (/obj/structure/table/woodentable{dir = 5},/obj/item/bananapeel,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "jX" = (/obj/structure/bed/chair/comfy/teal{dir = 8},/obj/effect/floor_decal/carpet{dir = 4},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "jY" = (/obj/structure/table/wooden_reinforced,/obj/machinery/button/remote/blast_door{name = "Spec Ops Ready Room"; pixel_y = 15; req_access = list(11); id = "CREED"},/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl0"; pixel_y = 0; req_access = list(11); id = "ASSAULT"},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/creed) "jZ" = (/obj/structure/table/wooden_reinforced,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/creed) "ka" = (/obj/machinery/conveyor{dir = 4; id = "QMLoad2"},/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "supply_shuttle_hatch"; locked = 1; name = "Shuttle Hatch"; req_access = list(13)},/turf/simulated/shuttle/plating,/area/shuttle/supply) -"kb" = (/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/table/rack,/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/shuttle/plating,/area/centcom/evac) +"kb" = (/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/table/rack,/obj/item/reagent_containers/spray/cleaner,/turf/simulated/shuttle/plating,/area/centcom/evac) "kc" = (/obj/structure/window/reinforced{dir = 1; health = 1e+006},/turf/simulated/shuttle/plating,/area/centcom/evac) "kd" = (/obj/structure/closet/emcloset,/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "ke" = (/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) @@ -528,32 +528,32 @@ "kh" = (/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/shuttle/plating,/area/centcom/evac) "ki" = (/obj/machinery/door/blast/regular{id = "thunderdomegen"; name = "General Supply"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "kj" = (/turf/unsimulated/floor{icon_state = "asteroid"},/area/centcom/main_hall) -"kk" = (/obj/structure/mopbucket,/obj/item/weapon/mop,/turf/simulated/shuttle/plating,/area/centcom/evac) +"kk" = (/obj/structure/mopbucket,/obj/item/mop,/turf/simulated/shuttle/plating,/area/centcom/evac) "kl" = (/turf/simulated/shuttle/plating,/area/centcom/evac) "km" = (/obj/machinery/door/airlock/maintenance_hatch{req_access = list(101)},/turf/simulated/shuttle/floor/black,/area/centcom/evac) "kn" = (/turf/simulated/shuttle/floor,/area/centcom/evac) -"ko" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/medical,/turf/simulated/shuttle/floor,/area/centcom/evac) +"ko" = (/obj/structure/bed/padded,/obj/item/bedsheet/medical,/turf/simulated/shuttle/floor,/area/centcom/evac) "kp" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/closet/secure_closet/personal,/turf/simulated/shuttle/floor,/area/centcom/evac) "kq" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/closet/secure_closet/personal,/turf/simulated/shuttle/floor,/area/centcom/evac) "kr" = (/obj/machinery/portable_atmospherics/powered/scrubber,/turf/simulated/shuttle/plating,/area/centcom/evac) -"ks" = (/obj/structure/table/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/vest,/obj/item/clothing/head/helmet/swat,/obj/item/weapon/gun/energy/laser,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) +"ks" = (/obj/structure/table/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/vest,/obj/item/clothing/head/helmet/swat,/obj/item/gun/energy/laser,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "kt" = (/obj/machinery/door/blast/regular{id = "thunderdomehea"; name = "Heavy Supply"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "ku" = (/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome/tdome2) "kv" = (/obj/effect/landmark{name = "tdome2"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome/tdome2) "kw" = (/obj/machinery/door/blast/regular{id = "thunderdomeaxe"; name = "Axe Supply"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) -"kx" = (/obj/structure/table/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/weapon/melee/energy/axe,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) +"kx" = (/obj/structure/table/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/melee/energy/axe,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "ky" = (/obj/machinery/door/airlock/centcom{name = "Courthouse"; opacity = 1},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/command) "kz" = (/obj/machinery/door/airlock/centcom{name = "Administrative Office"; opacity = 1; req_access = list(108)},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/creed) "kA" = (/mob/living/simple_mob/animal/passive/dog/corgi/puppy/Bockscar,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/creed) "kB" = (/obj/machinery/telecomms/relay/preset/centcom,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/creed) "kC" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "supply_shuttle_hatch"; locked = 1; name = "Shuttle Hatch"; req_access = list(13)},/turf/simulated/shuttle/floor,/area/shuttle/supply) "kD" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "supply_shuttle"; pixel_x = 25; pixel_y = 0; req_one_access = list(13,31); tag_door = "supply_shuttle_hatch"},/obj/effect/shuttle_landmark/southern_cross/supply_offsite,/turf/simulated/shuttle/floor,/area/shuttle/supply) -"kE" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/shuttle/plating,/area/centcom/evac) +"kE" = (/obj/structure/reagent_dispensers/watertank,/obj/item/reagent_containers/glass/bucket,/turf/simulated/shuttle/plating,/area/centcom/evac) "kF" = (/obj/machinery/vending/engineering,/turf/simulated/shuttle/plating,/area/centcom/evac) "kG" = (/obj/machinery/portable_atmospherics/powered/pump,/turf/simulated/shuttle/plating,/area/centcom/evac) "kH" = (/obj/structure/table/standard,/obj/machinery/recharger{pixel_y = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome/tdome2) "kI" = (/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) -"kJ" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/storage/briefcase,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) +"kJ" = (/obj/structure/table/woodentable{dir = 5},/obj/item/storage/briefcase,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "kK" = (/obj/machinery/conveyor{dir = 4; id = "QMLoad"},/turf/simulated/shuttle/floor,/area/shuttle/supply) "kL" = (/turf/unsimulated/wall{desc = "That looks like it doesn't open easily."; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/evac) "kM" = (/turf/simulated/shuttle/plating,/area/shuttle/escape_pod7/centcom) @@ -591,11 +591,11 @@ "ls" = (/turf/simulated/shuttle/wall,/area/shuttle/transport1/centcom) "lt" = (/obj/structure/grille,/obj/structure/shuttle/window,/turf/simulated/shuttle/plating,/area/shuttle/transport1/centcom) "lu" = (/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/command) -"lv" = (/obj/structure/bed,/obj/item/weapon/bedsheet/orange,/turf/simulated/shuttle/plating,/area/centcom/evac) +"lv" = (/obj/structure/bed,/obj/item/bedsheet/orange,/turf/simulated/shuttle/plating,/area/centcom/evac) "lw" = (/turf/simulated/shuttle/wall/dark/no_join,/area/centcom/evac) "lx" = (/obj/structure/closet/secure_closet/security,/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) "ly" = (/obj/structure/closet{name = "Evidence Closet"},/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) -"lz" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) +"lz" = (/obj/structure/table/reinforced,/obj/item/paper_bin,/obj/item/pen,/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) "lA" = (/obj/structure/table/rack,/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) "lB" = (/obj/structure/shuttle/window,/obj/structure/grille,/turf/simulated/shuttle/plating,/area/centcom/evac) "lC" = (/obj/machinery/door/airlock/glass,/turf/simulated/shuttle/floor,/area/centcom/evac) @@ -620,9 +620,9 @@ "lV" = (/obj/machinery/vending/snack,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) "lW" = (/obj/structure/closet/secure_closet/freezer/meat,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bar) "lX" = (/obj/machinery/gibber,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bar) -"lY" = (/obj/structure/reagent_dispensers/watertank/high,/obj/item/weapon/reagent_containers/glass/bucket,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"lY" = (/obj/structure/reagent_dispensers/watertank/high,/obj/item/reagent_containers/glass/bucket,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "lZ" = (/obj/machinery/door/airlock/glass,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"ma" = (/obj/structure/table/marble,/obj/item/weapon/reagent_containers/glass/beaker,/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/reagentgrinder,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"ma" = (/obj/structure/table/marble,/obj/item/reagent_containers/glass/beaker,/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/reagentgrinder,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "mb" = (/obj/machinery/door/airlock/freezer,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bar) "mc" = (/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command) "md" = (/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command) @@ -638,14 +638,14 @@ "mn" = (/obj/effect/landmark/ai_multicam_room,/turf/unsimulated/ai_visible,/area/ai_multicam_room) "mo" = (/obj/machinery/door/airlock/glass_security{name = "Escape Shuttle Cell"; req_access = list(1)},/turf/simulated/shuttle/plating,/area/centcom/evac) "mp" = (/obj/machinery/door/airlock/glass_security{name = "Security Processing"; req_access = list(1)},/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) -"mq" = (/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) -"mr" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/storage/fancy/cigarettes,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) +"mq" = (/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) +"mr" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/drinks/bottle/small/beer,/obj/item/reagent_containers/food/drinks/bottle/small/beer,/obj/item/reagent_containers/food/drinks/bottle/small/beer,/obj/item/flame/lighter/zippo,/obj/item/storage/fancy/cigarettes,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) "ms" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access = list(101)},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/main_hall) -"mt" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"mt" = (/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "mu" = (/obj/machinery/biogenerator,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "mv" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "mw" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/appliance/cooker/fryer,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"mx" = (/obj/machinery/computer/card/centcom{dir = 4},/obj/item/weapon/card/id/centcom,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/creed) +"mx" = (/obj/machinery/computer/card/centcom{dir = 4},/obj/item/card/id/centcom,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/creed) "my" = (/obj/structure/bed/chair{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command) "mz" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_l"; dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/response_ship/start) "mA" = (/obj/structure/shuttle/engine/heater{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/simulated/shuttle/plating/airless,/area/shuttle/transport1/centcom) @@ -669,14 +669,14 @@ "mS" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_r"; dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/response_ship/start) "mT" = (/obj/machinery/computer/pod{id = "thunderdomegen"; name = "Thunderdome General Supply"},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "mU" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/appliance/cooker/oven,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"mV" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/item/weapon/material/knife/machete/hatchet,/obj/item/weapon/material/knife/machete/hatchet,/obj/item/weapon/material/minihoe,/obj/item/weapon/material/minihoe,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"mV" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/item/material/knife/machete/hatchet,/obj/item/material/knife/machete/hatchet,/obj/item/material/minihoe,/obj/item/material/minihoe,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "mW" = (/obj/machinery/smartfridge/drying_rack,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"mX" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/reagent_containers/glass/bucket,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"mX" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/item/reagent_containers/glass/bucket,/obj/item/reagent_containers/glass/bucket,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "mY" = (/obj/machinery/door/airlock/centcom{name = "Maintenance Access"; opacity = 1; req_access = list(106)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "mZ" = (/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/command) "na" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "large_escape_pod_2_recovery_hatch"; locked = 1; name = "Recovery Shuttle Dock 02"; req_access = list(13)},/turf/simulated/shuttle/floor/black,/area/centcom/evac) "nb" = (/obj/machinery/computer/pod{id = "thunderdomehea"; name = "Thunderdome Heavy Supply"},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) -"nc" = (/obj/item/weapon/tool/wrench,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) +"nc" = (/obj/item/tool/wrench,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "nd" = (/obj/machinery/door/airlock/command{name = "Thunderdome Administration"; req_access = list(102)},/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) "ne" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 6},/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) "nf" = (/obj/machinery/atmospherics/pipe/vent{dir = 8},/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) @@ -684,7 +684,7 @@ "nh" = (/obj/machinery/seed_storage/garden,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "ni" = (/obj/machinery/honey_extractor,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "nj" = (/obj/machinery/vending/hydronutrients,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"nk" = (/obj/machinery/computer/pod{dir = 8; id = "NTrasen"; name = "Hull Door Control"},/obj/item/device/radio/intercom/specops{pixel_y = -21},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/creed) +"nk" = (/obj/machinery/computer/pod{dir = 8; id = "NTrasen"; name = "Hull Door Control"},/obj/item/radio/intercom/specops{pixel_y = -21},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/creed) "nl" = (/obj/structure/bed/chair{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command) "nm" = (/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/command) "nn" = (/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/command) @@ -714,25 +714,25 @@ "nL" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command) "nM" = (/obj/machinery/door/airlock/external,/turf/simulated/shuttle/floor,/area/centcom/evac) "nN" = (/obj/machinery/computer/pod{id = "thunderdome"; name = "Thunderdome Blast Door Control"},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) -"nO" = (/obj/item/weapon/extinguisher,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) +"nO" = (/obj/item/extinguisher,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "nP" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 5},/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) -"nQ" = (/obj/structure/table/marble,/obj/item/weapon/storage/box/glasses/square,/obj/item/weapon/storage/box/glasses/square,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"nQ" = (/obj/structure/table/marble,/obj/item/storage/box/glasses/square,/obj/item/storage/box/glasses/square,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "nR" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/icecream_vat,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "nS" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 1},/turf/simulated/shuttle/plating/airless/carry,/area/centcom/evac) "nT" = (/obj/machinery/computer/shuttle_control/web/shuttle1,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/command) -"nU" = (/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; frequency = 1443; listening = 0; name = "Spec Ops Intercom"; pixel_y = 22},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/command) +"nU" = (/obj/item/radio/intercom{broadcasting = 1; dir = 1; frequency = 1443; listening = 0; name = "Spec Ops Intercom"; pixel_y = 22},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/command) "nV" = (/obj/machinery/door/window{dir = 2; name = "AI Core Door"; req_access = list(109)},/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/command) "nW" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/machinery/turretid{pixel_x = 0; pixel_y = 28; req_access = list(101)},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/command) "nX" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 1},/turf/simulated/shuttle/plating/airless/carry,/area/centcom/evac) "nY" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "admin_shuttle_bay"; name = "shuttle bay controller"; pixel_x = 0; pixel_y = -26; tag_door = "admin_shuttle_bay_door"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "nZ" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "large_escape_pod_1_recovery"; pixel_x = -25; pixel_y = -25; req_one_access = list(13); tag_door = "large_escape_pod_1_recovery_hatch"},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "oa" = (/obj/item/stack/medical/ointment,/obj/item/stack/medical/ointment,/obj/item/stack/medical/ointment,/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) -"ob" = (/obj/structure/table/marble,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/weapon/material/kitchen/rollingpin,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"ob" = (/obj/structure/table/marble,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/material/kitchen/rollingpin,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "oc" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_soft/full,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"od" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"od" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/reagent_containers/food/condiment/enzyme,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "oe" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/appliance/mixer/cereal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"of" = (/obj/structure/table/reinforced,/obj/item/weapon/card/id/gold/captain/spare,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/command) -"og" = (/obj/structure/table/reinforced,/obj/item/device/pda/captain,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/command) +"of" = (/obj/structure/table/reinforced,/obj/item/card/id/gold/captain/spare,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/command) +"og" = (/obj/structure/table/reinforced,/obj/item/pda/captain,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/command) "oh" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "admin_shuttle_bay_door"; locked = 1},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/command) "oi" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "large_escape_pod_1_recovery_hatch"; locked = 1; name = "Recovery Shuttle Dock 01"; req_access = list(13)},/turf/simulated/shuttle/floor/black,/area/centcom/evac) "oj" = (/obj/structure/table/standard,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) @@ -746,12 +746,12 @@ "or" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command) "os" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command) "ot" = (/turf/simulated/shuttle/plating,/area/shuttle/cryo/centcom) -"ou" = (/obj/structure/table/standard,/obj/item/weapon/towel,/obj/item/weapon/towel,/obj/item/weapon/towel,/obj/item/weapon/towel,/obj/random/soap,/obj/random/soap,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"ou" = (/obj/structure/table/standard,/obj/item/towel,/obj/item/towel,/obj/item/towel,/obj/item/towel,/obj/random/soap,/obj/random/soap,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "ov" = (/obj/machinery/recharge_station,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "ow" = (/obj/structure/toilet,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "ox" = (/turf/simulated/shuttle/plating,/area/shuttle/large_escape_pod1/centcom) -"oy" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/handcuffs,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) -"oz" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"oy" = (/obj/structure/table/standard,/obj/item/storage/box/handcuffs,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) +"oz" = (/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) "oA" = (/obj/structure/flora/pottedplant,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/bar) "oB" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/door/airlock/glass,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "oC" = (/obj/machinery/telecomms/broadcaster/preset_cent,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/main_hall) @@ -762,16 +762,16 @@ "oH" = (/obj/structure/extinguisher_cabinet{pixel_x = 28; pixel_y = 0},/turf/simulated/shuttle/floor/white,/area/centcom/evac) "oI" = (/obj/machinery/door/airlock{name = "Unit 1"},/turf/simulated/shuttle/floor/white,/area/centcom/evac) "oJ" = (/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) -"oK" = (/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) -"oL" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/snacks/spesslaw,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"oM" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/snacks/stuffing,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"oK" = (/obj/item/reagent_containers/food/drinks/cans/cola,/obj/item/reagent_containers/food/drinks/cans/cola,/obj/item/reagent_containers/food/drinks/cans/cola,/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeobserve) +"oL" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/reagent_containers/food/snacks/spesslaw,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"oM" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/reagent_containers/food/snacks/stuffing,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "oN" = (/obj/machinery/telecomms/hub/preset/southerncross/centcomm,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/main_hall) "oO" = (/obj/machinery/computer/shuttle_control/centcom{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/transport1/centcom) "oP" = (/obj/structure/table/reinforced,/obj/machinery/photocopier/faxmachine,/obj/structure/window/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command) "oQ" = (/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 8},/obj/machinery/computer/supplycomp/control{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command) "oR" = (/turf/simulated/shuttle/wall/dark,/area/shuttle/administration/centcom) "oS" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "admin_shuttle_hatch"; locked = 1; name = "Shuttle Hatch"; req_access = list(13)},/turf/simulated/floor/plating,/area/shuttle/administration/centcom) -"oT" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/electrical,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) +"oT" = (/obj/structure/table/standard,/obj/item/storage/toolbox/electrical,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "oU" = (/obj/machinery/computer/robotics{dir = 8},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command) "oV" = (/obj/machinery/vending/boozeomat,/turf/simulated/shuttle/wall/dark,/area/shuttle/administration/centcom) "oW" = (/obj/machinery/vending/coffee,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) @@ -779,12 +779,12 @@ "oY" = (/obj/machinery/microwave,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "oZ" = (/turf/simulated/shuttle/wall/hard_corner,/area/shuttle/supply) "pa" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/plating,/area/shuttle/administration/centcom) -"pb" = (/obj/item/device/multitool,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) -"pc" = (/obj/item/weapon/storage/toolbox/mechanical,/obj/structure/table/reinforced,/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) +"pb" = (/obj/item/multitool,/obj/item/reagent_containers/spray/cleaner,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) +"pc" = (/obj/item/storage/toolbox/mechanical,/obj/structure/table/reinforced,/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "pd" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "cryostorage_shuttle_recovery_hatch"; locked = 1; name = "Recovery Shuttle Dock Cryostorage"; req_access = list(13)},/turf/simulated/shuttle/floor/black,/area/centcom/evac) "pe" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "cryostorage_shuttle_recovery"; pixel_x = -26; pixel_y = 26; req_one_access = list(13); tag_door = "cryostorage_shuttle_recovery_hatch"},/turf/simulated/shuttle/floor,/area/centcom/evac) "pf" = (/obj/machinery/door/airlock{name = "Unisex Restrooms"},/turf/simulated/shuttle/floor,/area/centcom/evac) -"pg" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) +"pg" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "ph" = (/obj/machinery/telecomms/receiver/preset_cent,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/main_hall) "pi" = (/obj/machinery/telecomms/bus/preset_cent,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/main_hall) "pj" = (/obj/machinery/telecomms/relay/preset/southerncross/transit,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/main_hall) @@ -795,46 +795,46 @@ "po" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access = list(101)},/turf/simulated/floor/plating,/area/shuttle/administration/centcom) "pp" = (/obj/structure/table/standard,/obj/machinery/recharger{pixel_y = 4},/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "pq" = (/obj/machinery/cell_charger,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) -"pr" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/snacks/slice/orangecake/filled,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"ps" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/snacks/meatsteak,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"pr" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/reagent_containers/food/snacks/slice/orangecake/filled,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"ps" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/reagent_containers/food/snacks/meatsteak,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "pt" = (/obj/machinery/door/window/northright,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "pu" = (/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) -"pv" = (/obj/item/weapon/flame/lighter/zippo,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) -"pw" = (/obj/item/weapon/storage/fancy/cigarettes,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) +"pv" = (/obj/item/flame/lighter/zippo,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) +"pw" = (/obj/item/storage/fancy/cigarettes,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "px" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "py" = (/obj/machinery/door/airlock/glass,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "pz" = (/obj/item/stack/material/glass{amount = 50},/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "pA" = (/obj/item/stack/material/steel{amount = 50},/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "pB" = (/obj/machinery/door/airlock{name = "Unisex Showers"},/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"pC" = (/obj/structure/table/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/vest,/obj/item/clothing/head/helmet/swat,/obj/item/weapon/gun/energy/laser,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) +"pC" = (/obj/structure/table/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/vest,/obj/item/clothing/head/helmet/swat,/obj/item/gun/energy/laser,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "pD" = (/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome/tdome1) "pE" = (/obj/effect/landmark{name = "tdome1"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome/tdome1) -"pF" = (/obj/structure/table/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/weapon/melee/energy/axe,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) +"pF" = (/obj/structure/table/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/melee/energy/axe,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "pG" = (/obj/structure/table/glass,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/main_hall) -"pH" = (/obj/structure/table/standard,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"pH" = (/obj/structure/table/standard,/obj/item/material/kitchen/utensil/fork,/obj/item/material/kitchen/utensil/spoon{pixel_x = 2},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "pI" = (/obj/structure/bed/chair{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/bar) "pJ" = (/obj/structure/bed/chair{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/bar) -"pK" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/snacks/soylenviridians,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"pL" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"pM" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/snacks/candiedapple,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"pK" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/reagent_containers/food/snacks/soylenviridians,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"pL" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"pM" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/reagent_containers/food/snacks/candiedapple,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "pN" = (/obj/machinery/vending/cigarette,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) -"pO" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,/obj/item/weapon/reagent_containers/food/condiment/small/peppermill,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/bar) +"pO" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/condiment/small/saltshaker,/obj/item/reagent_containers/food/condiment/small/peppermill,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/bar) "pP" = (/turf/unsimulated/wall,/area/centcom/bar) "pQ" = (/obj/structure/bed/chair{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "pR" = (/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) -"pS" = (/obj/effect/floor_decal/carpet{dir = 8},/obj/effect/floor_decal/carpet{dir = 1},/obj/effect/floor_decal/carpet{dir = 9},/obj/structure/bed/padded,/obj/item/weapon/bedsheet/captain,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/living) +"pS" = (/obj/effect/floor_decal/carpet{dir = 8},/obj/effect/floor_decal/carpet{dir = 1},/obj/effect/floor_decal/carpet{dir = 9},/obj/structure/bed/padded,/obj/item/bedsheet/captain,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/living) "pT" = (/obj/effect/floor_decal/carpet{dir = 1},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/living) "pU" = (/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet{dir = 1},/obj/effect/floor_decal/carpet{dir = 5},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/living) "pV" = (/obj/machinery/door/airlock/centcom{name = "Living Quarters"; opacity = 1; req_access = list(105)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/living) "pW" = (/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/living) "pX" = (/turf/unsimulated/wall,/area/centcom/living) "pY" = (/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/living) -"pZ" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/living) -"qa" = (/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{pixel_x = 2; pixel_y = 6},/obj/structure/table/standard,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/living) +"pZ" = (/obj/item/stool/padded,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/living) +"qa" = (/obj/item/reagent_containers/food/condiment/small/peppermill{pixel_x = 2; pixel_y = 6},/obj/structure/table/standard,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/living) "qb" = (/obj/structure/table/holotable,/obj/machinery/readybutton{pixel_y = 0},/obj/effect/floor_decal/corner/red/full,/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) "qc" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating/airless,/area/shuttle/administration/centcom) "qd" = (/obj/machinery/vending/snack,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) -"qe" = (/obj/item/weapon/stool,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) +"qe" = (/obj/item/stool,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "qf" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "qg" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "qh" = (/obj/machinery/recharge_station,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) @@ -847,35 +847,35 @@ "qo" = (/obj/machinery/door/airlock,/turf/simulated/shuttle/floor,/area/centcom/evac) "qp" = (/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/bar) "qq" = (/obj/structure/bed/chair{dir = 8},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"qr" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/snacks/bloodsoup,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"qr" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/reagent_containers/food/snacks/bloodsoup,/obj/item/material/kitchen/utensil/fork,/obj/item/material/kitchen/utensil/spoon{pixel_x = 2},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "qs" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/bar) -"qt" = (/obj/effect/floor_decal/carpet{dir = 8},/obj/effect/floor_decal/carpet,/obj/effect/floor_decal/carpet{dir = 10},/obj/structure/table/standard,/obj/item/weapon/melee/classic_baton,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/living) +"qt" = (/obj/effect/floor_decal/carpet{dir = 8},/obj/effect/floor_decal/carpet,/obj/effect/floor_decal/carpet{dir = 10},/obj/structure/table/standard,/obj/item/melee/classic_baton,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/living) "qu" = (/obj/effect/floor_decal/carpet,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/living) "qv" = (/obj/effect/floor_decal/carpet,/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet{dir = 6},/obj/structure/closet/secure_closet/personal,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/living) "qw" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/living) -"qx" = (/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/structure/table/standard,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/living) -"qy" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/under/color/red,/obj/item/clothing/suit/armor/tdome/red,/obj/item/weapon/holo/esword/red,/obj/effect/floor_decal/corner/red{dir = 10},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) -"qz" = (/obj/item/weapon/bikehorn/rubberducky,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"qx" = (/obj/item/reagent_containers/food/drinks/cans/cola,/obj/structure/table/standard,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/living) +"qy" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/under/color/red,/obj/item/clothing/suit/armor/tdome/red,/obj/item/holo/esword/red,/obj/effect/floor_decal/corner/red{dir = 10},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt) +"qz" = (/obj/item/bikehorn/rubberducky,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "qA" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/shuttle/floor,/area/centcom/evac) "qB" = (/turf/unsimulated/wall,/area/shuttle/trade) "qC" = (/obj/structure/table/standard,/obj/machinery/recharger{pixel_y = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome/tdome1) -"qD" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"qE" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/snacks/amanita_pie,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"qF" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/condiment/small/peppermill,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{pixel_x = 4; pixel_y = -2},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"qD" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/paper_bin,/obj/item/pen,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"qE" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/reagent_containers/food/snacks/amanita_pie,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"qF" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/reagent_containers/food/condiment/small/peppermill,/obj/item/reagent_containers/food/condiment/small/saltshaker{pixel_x = 4; pixel_y = -2},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "qG" = (/obj/structure/bed/chair/wood/wings,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) "qH" = (/obj/machinery/light,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "qI" = (/obj/machinery/computer/card{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/centcom/evac) "qJ" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/simulated/shuttle/plating,/area/shuttle/administration/centcom) -"qK" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/brown,/turf/unsimulated/floor{dir = 2; icon_state = "carpet"},/area/shuttle/trade) +"qK" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/turf/unsimulated/floor{dir = 2; icon_state = "carpet"},/area/shuttle/trade) "qL" = (/obj/structure/table/standard,/turf/unsimulated/floor{dir = 2; icon_state = "carpet"},/area/shuttle/trade) "qM" = (/turf/unsimulated/floor{icon_state = "steel"},/area/shuttle/trade) -"qN" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"qO" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/snacks/stew,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"qP" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/snacks/beetsoup,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"qN" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/reagent_containers/food/snacks/bigbiteburger,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"qO" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/reagent_containers/food/snacks/stew,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"qP" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/reagent_containers/food/snacks/beetsoup,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "qQ" = (/obj/machinery/smartfridge,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) "qR" = (/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) "qS" = (/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"qT" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/bar) +"qT" = (/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/bar) "qU" = (/obj/machinery/vending/boozeomat,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) "qV" = (/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_alc/full,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) "qW" = (/obj/structure/device/piano{dir = 4},/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/living) @@ -884,19 +884,19 @@ "qZ" = (/turf/simulated/shuttle/plating,/area/shuttle/escape_pod6/centcom) "ra" = (/turf/unsimulated/floor{dir = 2; icon_state = "carpet"},/area/shuttle/trade) "rb" = (/obj/machinery/door/airlock/hatch{req_access = list(150)},/turf/unsimulated/floor{dir = 2; icon_state = "carpet"},/area/shuttle/trade) -"rc" = (/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/drinks/glass2/square,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) +"rc" = (/obj/structure/table/marble,/obj/item/reagent_containers/food/drinks/glass2/square,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) "rd" = (/obj/machinery/door/airlock/glass{icon_state = "door_locked"; locked = 1; name = "Arrivals Processing"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "re" = (/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_soft/full,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) -"rf" = (/obj/structure/table/marble,/obj/item/weapon/book/manual/barman_recipes,/obj/item/weapon/reagent_containers/glass/rag,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) -"rg" = (/obj/structure/table/standard,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/bar) -"rh" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/snacks/tofukabob,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"rf" = (/obj/structure/table/marble,/obj/item/book/manual/barman_recipes,/obj/item/reagent_containers/glass/rag,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) +"rg" = (/obj/structure/table/standard,/obj/item/material/kitchen/utensil/fork,/obj/item/material/kitchen/utensil/spoon{pixel_x = 2},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/bar) +"rh" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/snacks/tofukabob,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "ri" = (/turf/unsimulated/wall{icon = 'icons/obj/doors/Doormaint.dmi'; icon_state = "door_closed"; name = "Sealed Door"},/area/centcom/main_hall) "rj" = (/obj/structure/table/marble,/obj/item/clothing/under/suit_jacket,/obj/item/clothing/accessory/wcoat,/obj/item/clothing/head/that{pixel_x = 4; pixel_y = 6},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) "rk" = (/obj/machinery/vending/cola,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "rl" = (/obj/machinery/vending/snack,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "rm" = (/obj/machinery/vending/coffee,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/bar) -"rn" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/snacks/poppypretzel,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) -"ro" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/condiment/small/peppermill,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{pixel_x = 4; pixel_y = -2},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/bar) +"rn" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/snacks/poppypretzel,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) +"ro" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/condiment/small/peppermill,/obj/item/reagent_containers/food/condiment/small/saltshaker{pixel_x = 4; pixel_y = -2},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/bar) "rp" = (/obj/machinery/floor_light,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/bar) "rq" = (/obj/machinery/door/airlock{name = "Unisex Restrooms"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bar) "rr" = (/obj/effect/floor_decal/industrial/hatch/yellow,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) @@ -910,26 +910,26 @@ "rz" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "escape_pod_4_recovery"; pixel_x = -26; pixel_y = 26; req_one_access = list(13); tag_door = "escape_pod_4_recovery_hatch"},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "rA" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "escape_pod_6_recovery"; pixel_x = 26; pixel_y = -26; req_one_access = list(13); tag_door = "escape_pod_6_recovery_hatch"},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "rB" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_pod_6_recovery_hatch"; locked = 1; name = "Recovery Shuttle Dock 6"; req_access = list(13)},/turf/simulated/shuttle/floor/black,/area/centcom/evac) -"rC" = (/obj/structure/closet/secure_closet/guncabinet,/obj/item/weapon/gun/energy/gun/burst,/obj/item/weapon/gun/energy/gun/burst,/obj/item/weapon/gun/energy/ionrifle/pistol,/obj/item/weapon/gun/projectile/shotgun/pump/combat,/turf/unsimulated/floor{icon_state = "steel"},/area/shuttle/trade) -"rD" = (/obj/structure/table/standard,/obj/item/device/flash,/obj/item/device/flash,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/glasses/sunglasses,/turf/unsimulated/floor{icon_state = "steel"},/area/shuttle/trade) -"rE" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/handcuffs,/turf/unsimulated/floor{icon_state = "steel"},/area/shuttle/trade) -"rF" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/syndie_kit/chameleon,/obj/item/weapon/storage/box/syndie_kit/clerical,/turf/unsimulated/floor{icon_state = "steel"},/area/shuttle/trade) +"rC" = (/obj/structure/closet/secure_closet/guncabinet,/obj/item/gun/energy/gun/burst,/obj/item/gun/energy/gun/burst,/obj/item/gun/energy/ionrifle/pistol,/obj/item/gun/projectile/shotgun/pump/combat,/turf/unsimulated/floor{icon_state = "steel"},/area/shuttle/trade) +"rD" = (/obj/structure/table/standard,/obj/item/flash,/obj/item/flash,/obj/item/reagent_containers/spray/pepper,/obj/item/reagent_containers/spray/pepper,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/glasses/sunglasses,/turf/unsimulated/floor{icon_state = "steel"},/area/shuttle/trade) +"rE" = (/obj/structure/table/standard,/obj/item/storage/box/handcuffs,/turf/unsimulated/floor{icon_state = "steel"},/area/shuttle/trade) +"rF" = (/obj/structure/table/standard,/obj/item/storage/box/syndie_kit/chameleon,/obj/item/storage/box/syndie_kit/clerical,/turf/unsimulated/floor{icon_state = "steel"},/area/shuttle/trade) "rG" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "rH" = (/obj/machinery/door/airlock/glass{name = "Bar"},/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) "rI" = (/obj/machinery/floor_light,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/bar) "rJ" = (/obj/structure/sink{pixel_y = 16},/obj/structure/mirror{pixel_x = 0; pixel_y = 32},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bar) "rK" = (/obj/structure/bed/chair,/turf/simulated/shuttle/floor,/area/centcom/evac) -"rL" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/shotgunammo/large,/obj/item/weapon/storage/box/stunshells/large,/turf/unsimulated/floor{icon_state = "steel"},/area/shuttle/trade) +"rL" = (/obj/structure/table/rack,/obj/item/storage/box/shotgunammo/large,/obj/item/storage/box/stunshells/large,/turf/unsimulated/floor{icon_state = "steel"},/area/shuttle/trade) "rM" = (/obj/structure/bed/chair{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/shuttle/trade) "rN" = (/obj/machinery/computer/secure_data{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command) "rO" = (/obj/structure/closet/crate,/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/shuttle/trade) "rP" = (/turf/unsimulated/floor{icon_state = "dark"},/area/shuttle/trade) -"rQ" = (/obj/structure/table/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/head/helmet/thunderdome,/obj/item/weapon/melee/baton/loaded,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) +"rQ" = (/obj/structure/table/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/head/helmet/thunderdome,/obj/item/melee/baton/loaded,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "rR" = (/obj/machinery/door/airlock/centcom{name = "Bridge Access"; opacity = 1; req_access = list(101)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "rS" = (/obj/machinery/door/airlock/glass_centcom{name = "Bridge Access"; req_access = list(101)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "rT" = (/obj/machinery/door/airlock{name = "Unit 2"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bar) "rU" = (/obj/machinery/door/airlock{name = "Unit 1"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bar) -"rV" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{pixel_x = 4; pixel_y = -2},/obj/item/weapon/reagent_containers/food/condiment/small/peppermill,/obj/item/weapon/flame/candle,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"rV" = (/obj/structure/table/woodentable{dir = 5},/obj/item/reagent_containers/food/condiment/small/saltshaker{pixel_x = 4; pixel_y = -2},/obj/item/reagent_containers/food/condiment/small/peppermill,/obj/item/flame/candle,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) "rW" = (/obj/structure/bed/chair/wood/wings{icon_state = "wooden_chair_wings"; dir = 4},/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) "rX" = (/obj/machinery/optable,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "rY" = (/obj/structure/table/reinforced,/obj/machinery/librarycomp,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) @@ -941,26 +941,26 @@ "se" = (/obj/structure/bed/chair/wood/wings{icon_state = "wooden_chair_wings"; dir = 8},/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) "sf" = (/obj/machinery/media/jukebox,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) "sg" = (/obj/machinery/vending/cola{name = "hacked Robust Softdrinks"; prices = list()},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/living) -"sh" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/living) -"si" = (/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{pixel_x = -6},/obj/structure/table/standard,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/living) +"sh" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/living) +"si" = (/obj/item/reagent_containers/food/condiment/small/saltshaker{pixel_x = -6},/obj/structure/table/standard,/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/living) "sj" = (/obj/machinery/door/window/northright{icon_state = "right"; dir = 2},/obj/machinery/light{dir = 8},/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) -"sk" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/surgery,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) +"sk" = (/obj/structure/table/standard,/obj/item/storage/firstaid/surgery,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "sl" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) -"sm" = (/obj/structure/table/standard,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/item/weapon/reagent_containers/glass/beaker/large,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) +"sm" = (/obj/structure/table/standard,/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/item/reagent_containers/glass/beaker/large,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "sn" = (/turf/simulated/shuttle/plating,/area/shuttle/escape_pod3/centcom) "so" = (/turf/simulated/shuttle/plating,/area/shuttle/escape_pod5/centcom) "sp" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/shuttle/trade) "sq" = (/obj/machinery/door/airlock/multi_tile/glass{dir = 4; req_access = list(160)},/turf/unsimulated/floor{icon_state = "steel"},/area/shuttle/trade) -"sr" = (/obj/structure/table/woodentable{dir = 5},/obj/item/device/flashlight/lamp/green,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) +"sr" = (/obj/structure/table/woodentable{dir = 5},/obj/item/flashlight/lamp/green,/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) "ss" = (/obj/machinery/floor_light,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/bar) -"st" = (/obj/machinery/light{dir = 8},/obj/structure/bed/padded,/obj/item/weapon/bedsheet/hos,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) +"st" = (/obj/machinery/light{dir = 8},/obj/structure/bed/padded,/obj/item/bedsheet/hos,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "su" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_pod_3_recovery_hatch"; locked = 1; name = "Recovery Shuttle Dock 3"; req_access = list(13)},/turf/simulated/shuttle/floor/black,/area/centcom/evac) "sv" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "escape_pod_3_recovery"; pixel_x = -26; pixel_y = 26; req_one_access = list(13); tag_door = "escape_pod_3_recovery_hatch"},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "sw" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor,/area/centcom/evac) "sx" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "escape_pod_5_recovery"; pixel_x = 26; pixel_y = -26; req_one_access = list(13); tag_door = "escape_pod_5_recovery_hatch"},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "sy" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_pod_5_recovery_hatch"; locked = 1; name = "Recovery Shuttle Dock 5"; req_access = list(13)},/turf/simulated/shuttle/floor/black,/area/centcom/evac) "sz" = (/obj/structure/curtain/open/shower,/obj/machinery/shower{pixel_y = 3},/turf/unsimulated/floor{icon_state = "white"},/area/shuttle/trade) -"sA" = (/obj/structure/table/standard,/obj/item/weapon/soap/deluxe,/turf/unsimulated/floor{icon_state = "white"},/area/shuttle/trade) +"sA" = (/obj/structure/table/standard,/obj/item/soap/deluxe,/turf/unsimulated/floor{icon_state = "white"},/area/shuttle/trade) "sB" = (/obj/structure/table/standard,/obj/item/clothing/accessory/permit,/obj/item/clothing/accessory/permit,/obj/item/clothing/accessory/permit,/turf/unsimulated/floor{icon_state = "steel"},/area/shuttle/trade) "sC" = (/obj/structure/closet/wardrobe/white,/turf/unsimulated/floor{icon_state = "steel"},/area/shuttle/trade) "sD" = (/obj/structure/closet/wardrobe/green,/turf/unsimulated/floor{icon_state = "steel"},/area/shuttle/trade) @@ -968,7 +968,7 @@ "sF" = (/obj/machinery/button/remote/blast_door{id = "tradestationshutters"; name = "warehouse control"; pixel_x = -30; req_access = list(160)},/turf/unsimulated/floor{icon_state = "dark"},/area/shuttle/trade) "sG" = (/obj/machinery/recharge_station,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bar) "sH" = (/obj/structure/toilet{dir = 1},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bar) -"sI" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) +"sI" = (/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) "sJ" = (/obj/machinery/vending/medical,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "sK" = (/obj/machinery/chem_master,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "sL" = (/obj/machinery/chemical_dispenser/ert,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) @@ -995,8 +995,8 @@ "tg" = (/obj/structure/table/rack,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "th" = (/obj/structure/table/reinforced,/obj/item/frame/light,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "ti" = (/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) -"tj" = (/obj/structure/table/rack,/obj/item/weapon/storage/toolbox/mechanical,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) -"tk" = (/obj/item/weapon/tool/crowbar,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) +"tj" = (/obj/structure/table/rack,/obj/item/storage/toolbox/mechanical,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) +"tk" = (/obj/item/tool/crowbar,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "tl" = (/obj/machinery/computer/crew,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "tm" = (/obj/machinery/bodyscanner{dir = 8},/turf/simulated/shuttle/floor/white,/area/centcom/evac) "tn" = (/obj/machinery/body_scanconsole,/turf/simulated/shuttle/floor/white,/area/centcom/evac) @@ -1008,7 +1008,7 @@ "tt" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor/white,/area/centcom/evac) "tu" = (/obj/machinery/iv_drip,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "tv" = (/obj/structure/bed/roller,/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"tw" = (/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/weapon/tool/wrench,/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"tw" = (/obj/item/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/tool/wrench,/obj/structure/table/reinforced,/obj/item/reagent_containers/glass/beaker/cryoxadone,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "tx" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 5},/turf/simulated/shuttle/floor/white,/area/centcom/evac) "ty" = (/obj/machinery/atmospherics/pipe/manifold/visible,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "tz" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 9},/turf/simulated/shuttle/floor/white,/area/centcom/evac) @@ -1024,9 +1024,9 @@ "tJ" = (/obj/item/frame/light,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "tK" = (/obj/machinery/chem_master,/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "tL" = (/obj/structure/closet/secure_closet/bar{req_access = list(25)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/bar) -"tM" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"tN" = (/obj/machinery/chemical_dispenser/full,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/structure/table/standard,/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"tO" = (/obj/machinery/chemical_dispenser/ert,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/structure/table/standard,/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"tM" = (/obj/structure/table/standard,/obj/item/reagent_containers/glass/beaker/large,/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"tN" = (/obj/machinery/chemical_dispenser/full,/obj/item/reagent_containers/glass/beaker/large,/obj/structure/table/standard,/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"tO" = (/obj/machinery/chemical_dispenser/ert,/obj/item/reagent_containers/glass/beaker/large,/obj/structure/table/standard,/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "tP" = (/obj/structure/closet/secure_closet/medical_wall/pills{pixel_y = 32},/obj/structure/table/glass,/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "tQ" = (/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,/obj/machinery/atmospherics/portables_connector,/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "tR" = (/obj/machinery/atmospherics/unary/cryo_cell,/obj/effect/floor_decal/corner/blue{dir = 5},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) @@ -1034,17 +1034,17 @@ "tT" = (/obj/structure/toilet{dir = 1},/turf/unsimulated/floor{icon_state = "white"},/area/shuttle/trade) "tU" = (/turf/unsimulated/wall,/area/centcom/security) "tV" = (/turf/unsimulated/wall,/area/centcom/medical) -"tW" = (/obj/machinery/vending/wallmed1{name = "Emergency NanoMed"; pixel_x = -30; pixel_y = 0},/obj/structure/table/standard,/obj/item/device/defib_kit,/obj/item/device/defib_kit,/obj/machinery/recharger,/obj/item/weapon/tool/screwdriver,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"tW" = (/obj/machinery/vending/wallmed1{name = "Emergency NanoMed"; pixel_x = -30; pixel_y = 0},/obj/structure/table/standard,/obj/item/defib_kit,/obj/item/defib_kit,/obj/machinery/recharger,/obj/item/tool/screwdriver,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "tX" = (/obj/machinery/sleeper{dir = 8},/turf/simulated/shuttle/floor/white,/area/centcom/evac) "tY" = (/obj/machinery/sleep_console,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "tZ" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "trade_shuttle_bay"; name = "shuttle bay controller"; pixel_x = 25; pixel_y = 0; tag_door = "trade_shuttle_bay_door"},/turf/unsimulated/floor{icon_state = "steel"},/area/shuttle/trade) -"ua" = (/obj/structure/bed,/obj/item/weapon/bedsheet/orange,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) +"ua" = (/obj/structure/bed,/obj/item/bedsheet/orange,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "ub" = (/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) -"uc" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/effect/floor_decal/corner/orange/full{dir = 8},/obj/item/weapon/reagent_containers/glass/bucket,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) -"ud" = (/obj/structure/table/reinforced,/obj/item/weapon/material/minihoe,/obj/item/device/analyzer/plant_analyzer,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) +"uc" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/effect/floor_decal/corner/orange/full{dir = 8},/obj/item/reagent_containers/glass/bucket,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) +"ud" = (/obj/structure/table/reinforced,/obj/item/material/minihoe,/obj/item/analyzer/plant_analyzer,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "ue" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "uf" = (/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) -"ug" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) +"ug" = (/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "uh" = (/obj/structure/closet/secure_closet/security,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "ui" = (/obj/structure/closet/secure_closet/security,/obj/effect/floor_decal/corner/red{dir = 5},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "uj" = (/obj/structure/closet/secure_closet/security,/obj/effect/floor_decal/corner/red/full{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) @@ -1053,15 +1053,15 @@ "um" = (/obj/machinery/atmospherics/unary/freezer{dir = 2; icon_state = "freezer"},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "un" = (/obj/machinery/atmospherics/unary/cryo_cell,/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "uo" = (/obj/machinery/iv_drip,/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"up" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"uq" = (/obj/structure/table/standard,/obj/item/weapon/surgical/hemostat,/obj/item/weapon/surgical/cautery,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"ur" = (/obj/structure/table/standard,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/weapon/surgical/retractor,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"us" = (/obj/structure/table/standard,/obj/item/weapon/surgical/circular_saw{pixel_y = 8},/obj/item/weapon/surgical/scalpel,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"ut" = (/obj/structure/table/standard,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/autopsy_scanner,/obj/item/weapon/reagent_containers/spray/cleaner{desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2},/obj/item/weapon/surgical/FixOVein,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"uu" = (/obj/structure/closet/crate/medical,/obj/item/weapon/surgical/circular_saw,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/weapon/surgical/hemostat{pixel_y = 4},/obj/item/weapon/surgical/cautery{pixel_y = 4},/obj/item/weapon/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/nanopaste,/obj/item/weapon/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/mask/surgical,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"up" = (/obj/structure/table/glass,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"uq" = (/obj/structure/table/standard,/obj/item/surgical/hemostat,/obj/item/surgical/cautery,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"ur" = (/obj/structure/table/standard,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/surgical/retractor,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"us" = (/obj/structure/table/standard,/obj/item/surgical/circular_saw{pixel_y = 8},/obj/item/surgical/scalpel,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"ut" = (/obj/structure/table/standard,/obj/item/surgical/surgicaldrill,/obj/item/autopsy_scanner,/obj/item/reagent_containers/spray/cleaner{desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2},/obj/item/surgical/FixOVein,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"uu" = (/obj/structure/closet/crate/medical,/obj/item/surgical/circular_saw,/obj/item/surgical/surgicaldrill,/obj/item/surgical/bonegel{pixel_x = 4; pixel_y = 3},/obj/item/surgical/bonesetter,/obj/item/surgical/scalpel,/obj/item/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/surgical/hemostat{pixel_y = 4},/obj/item/surgical/cautery{pixel_y = 4},/obj/item/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/nanopaste,/obj/item/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/mask/surgical,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "uv" = (/obj/machinery/door/airlock/hatch{name = "Cockpit"; req_access = list(109)},/turf/simulated/shuttle/floor/black,/area/centcom/evac) -"uw" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/bodybags{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/bodybags,/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"ux" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"uw" = (/obj/structure/table/reinforced,/obj/item/storage/box/bodybags{pixel_x = 2; pixel_y = 2},/obj/item/storage/box/bodybags,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"ux" = (/obj/structure/closet/crate/freezer,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "uy" = (/obj/machinery/clonepod,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "uz" = (/obj/machinery/computer/med_data{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command) "uA" = (/obj/machinery/dna_scannernew,/turf/simulated/shuttle/floor/white,/area/centcom/evac) @@ -1071,7 +1071,7 @@ "uE" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5; icon_state = "intact"},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "uF" = (/obj/machinery/atmospherics/pipe/manifold/hidden,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "uG" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 9; icon_state = "intact"},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"uH" = (/obj/structure/table/standard,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"uH" = (/obj/structure/table/standard,/obj/item/surgical/bonesetter,/obj/item/surgical/bonegel,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "uI" = (/obj/machinery/iv_drip,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "uJ" = (/obj/machinery/optable,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "uK" = (/obj/machinery/computer/crew,/turf/simulated/shuttle/floor/black,/area/centcom/evac) @@ -1099,16 +1099,16 @@ "vg" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "vh" = (/obj/machinery/vending/wallmed1{pixel_y = -30},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "vi" = (/obj/structure/closet/secure_closet/medical2,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"vj" = (/obj/structure/closet/crate/medical,/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/weapon/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/weapon/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/weapon/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/weapon/storage/firstaid/adv{pixel_x = -2},/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"vk" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 0},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"vl" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/fire{pixel_x = -2; pixel_y = 4},/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"vm" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/toxin{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"vn" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"vo" = (/obj/structure/table/standard,/obj/item/weapon/clipboard,/obj/item/weapon/pen,/obj/item/weapon/stamp/captain,/turf/simulated/shuttle/floor/black,/area/centcom/evac) +"vj" = (/obj/structure/closet/crate/medical,/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/storage/firstaid/toxin,/obj/item/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/storage/firstaid/adv{pixel_x = -2},/obj/item/reagent_containers/blood/empty,/obj/item/reagent_containers/blood/empty,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"vk" = (/obj/structure/table/standard,/obj/item/storage/firstaid/regular{pixel_x = 2; pixel_y = 0},/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"vl" = (/obj/structure/table/standard,/obj/item/storage/firstaid/fire,/obj/item/storage/firstaid/fire{pixel_x = -2; pixel_y = 4},/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"vm" = (/obj/structure/table/standard,/obj/item/storage/firstaid/toxin{pixel_x = -2; pixel_y = 4},/obj/item/storage/firstaid/toxin,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"vn" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"vo" = (/obj/structure/table/standard,/obj/item/clipboard,/obj/item/pen,/obj/item/stamp/captain,/turf/simulated/shuttle/floor/black,/area/centcom/evac) "vp" = (/obj/machinery/computer/shuttle_control{dir = 4; req_access = list(101); shuttle_tag = "Centcom"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command) -"vq" = (/obj/structure/table/standard,/obj/item/weapon/storage/lockbox,/turf/simulated/shuttle/floor/black,/area/centcom/evac) +"vq" = (/obj/structure/table/standard,/obj/item/storage/lockbox,/turf/simulated/shuttle/floor/black,/area/centcom/evac) "vr" = (/obj/machinery/computer/shuttle_control{dir = 8; req_access = list(101); shuttle_tag = "Centcom"},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command) -"vs" = (/obj/structure/table/standard,/obj/item/device/radio/off,/obj/item/weapon/paper_bin,/turf/simulated/shuttle/floor/black,/area/centcom/evac) +"vs" = (/obj/structure/table/standard,/obj/item/radio/off,/obj/item/paper_bin,/turf/simulated/shuttle/floor/black,/area/centcom/evac) "vt" = (/obj/structure/window/reinforced,/obj/machinery/door/blast/shutters{density = 0; icon_state = "shutter0"; id = "tradestarshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/shuttle/merchant/home) "vu" = (/obj/structure/window/reinforced,/obj/machinery/door/blast/shutters{density = 0; icon_state = "shutter0"; id = "tradestarshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/shuttle/merchant/home) "vv" = (/obj/structure/window/reinforced,/obj/machinery/door/blast/shutters{density = 0; icon_state = "shutter0"; id = "tradestarshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/shuttle/merchant/home) @@ -1121,7 +1121,7 @@ "vC" = (/obj/structure/table/glass,/obj/machinery/reagentgrinder,/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "vD" = (/obj/structure/grille,/obj/structure/shuttle/window,/turf/simulated/shuttle/plating,/area/centcom/evac) "vE" = (/obj/structure/closet/cabinet,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"vF" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/rd,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"vF" = (/obj/structure/bed/padded,/obj/item/bedsheet/rd,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "vG" = (/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_alc/full,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "vH" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "vI" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/carpet,/area/shuttle/merchant/home) @@ -1132,7 +1132,7 @@ "vN" = (/obj/machinery/computer/card{dir = 1},/obj/structure/window/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command) "vO" = (/obj/structure/table/bench/steel,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "vP" = (/obj/structure/closet/secure_closet/brig,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) -"vQ" = (/obj/structure/table/reinforced,/obj/item/weapon/book/codex/corp_regs,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) +"vQ" = (/obj/structure/table/reinforced,/obj/item/book/codex/corp_regs,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "vR" = (/obj/machinery/door/airlock/glass_security{name = "Security Lobby"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "vS" = (/obj/machinery/door/airlock/glass{name = "Arrivals Processing"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/medical) "vT" = (/obj/structure/closet/secure_closet/chemical,/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) @@ -1144,35 +1144,35 @@ "vZ" = (/obj/machinery/clonepod,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "wa" = (/obj/machinery/computer/cloning,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "wb" = (/obj/machinery/dna_scannernew,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"wc" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"wc" = (/obj/structure/closet/crate/freezer,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/obj/item/reagent_containers/food/snacks/meat/syntiflesh,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "wd" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "tradestarshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/shuttle/merchant/home) "we" = (/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wf" = (/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wg" = (/obj/machinery/door/airlock/silver{name = "Sleeping"},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wh" = (/turf/simulated/floor/carpet,/area/shuttle/merchant/home) -"wi" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets,/turf/simulated/floor/carpet,/area/shuttle/merchant/home) +"wi" = (/obj/structure/table/standard,/obj/item/storage/box/donkpockets,/turf/simulated/floor/carpet,/area/shuttle/merchant/home) "wj" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/carpet,/area/shuttle/merchant/home) "wk" = (/obj/machinery/atm{pixel_x = -32},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wl" = (/obj/machinery/suit_cycler/syndicate,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wm" = (/obj/machinery/bodyscanner{dir = 8},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wn" = (/obj/machinery/body_scanconsole,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"wo" = (/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/weapon/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/weapon/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/weapon/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/weapon/storage/firstaid/adv{pixel_x = -2},/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/structure/closet/medical_wall{pixel_y = 32},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"wo" = (/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/storage/firstaid/toxin,/obj/item/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/storage/firstaid/adv{pixel_x = -2},/obj/item/reagent_containers/blood/empty,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/structure/closet/medical_wall{pixel_y = 32},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wp" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"wq" = (/obj/structure/table/reinforced,/obj/item/device/taperecorder,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) -"wr" = (/obj/structure/table/reinforced,/obj/item/weapon/book/codex/corp_regs,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) -"ws" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/pill_bottle/dice,/obj/item/weapon/deck/cards,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) +"wq" = (/obj/structure/table/reinforced,/obj/item/taperecorder,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) +"wr" = (/obj/structure/table/reinforced,/obj/item/book/codex/corp_regs,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) +"ws" = (/obj/structure/table/reinforced,/obj/item/storage/pill_bottle/dice,/obj/item/deck/cards,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "wt" = (/obj/machinery/door/airlock/glass_security{name = "Spaceport Security Airlock"; req_access = list(63)},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "wu" = (/obj/structure/table/bench/padded,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "wv" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "tradestarshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/shuttle/merchant/home) "ww" = (/obj/structure/closet/wardrobe/pjs,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"wx" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/weapon/pen{pixel_y = 4},/obj/machinery/light,/obj/structure/table/glass,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"wy" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/hos,/obj/structure/sign/poster{pixel_y = -32},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"wx" = (/obj/item/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/pen{pixel_y = 4},/obj/machinery/light,/obj/structure/table/glass,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"wy" = (/obj/structure/bed/padded,/obj/item/bedsheet/hos,/obj/structure/sign/poster{pixel_y = -32},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wz" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/carpet,/area/shuttle/merchant/home) -"wA" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/glasses/square,/turf/simulated/floor/carpet,/area/shuttle/merchant/home) +"wA" = (/obj/structure/table/standard,/obj/item/storage/box/glasses/square,/turf/simulated/floor/carpet,/area/shuttle/merchant/home) "wB" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 32},/turf/simulated/floor/carpet,/area/shuttle/merchant/home) -"wC" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/inflatable_duck,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"wC" = (/obj/structure/table/steel_reinforced,/obj/item/inflatable_duck,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wD" = (/obj/structure/table/steel_reinforced,/obj/item/stack/material/mhydrogen,/obj/item/stack/material/diamond,/obj/item/stack/material/sandstone,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"wE" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/rig/internalaffairs,/obj/item/clothing/head/helmet/space/void/wizard,/obj/item/clothing/suit/space/void/wizard,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"wE" = (/obj/structure/table/steel_reinforced,/obj/item/rig/internalaffairs,/obj/item/clothing/head/helmet/space/void/wizard,/obj/item/clothing/suit/space/void/wizard,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wF" = (/obj/structure/table/steel_reinforced,/obj/random/tool,/obj/random/tool,/obj/random/tool,/obj/random/tool,/obj/random/tool,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wG" = (/obj/structure/table/steel_reinforced,/obj/random/toolbox,/obj/random/toolbox,/obj/random/toolbox,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wH" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating,/area/shuttle/merchant/home) @@ -1181,14 +1181,14 @@ "wK" = (/obj/machinery/door/airlock/glass_medical{name = "Medical Bay"; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wL" = (/obj/machinery/optable,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wM" = (/obj/machinery/computer/communications{dir = 1},/obj/structure/window/reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command) -"wN" = (/obj/structure/table/reinforced,/obj/item/weapon/folder/red,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) +"wN" = (/obj/structure/table/reinforced,/obj/item/folder/red,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "wO" = (/obj/structure/closet/walllocker/emerglocker{pixel_y = -32},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wP" = (/obj/machinery/button/remote/blast_door{id = "tradestarshutters"; name = "remote shutter control"; pixel_x = 30; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wQ" = (/obj/structure/table/steel_reinforced,/obj/random/firstaid,/obj/random/firstaid,/obj/random/firstaid,/obj/random/firstaid,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wR" = (/obj/effect/floor_decal/industrial/warning{dir = 9},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wS" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wT" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"wU" = (/obj/structure/table/steel_reinforced,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/item/weapon/weldpack,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"wU" = (/obj/structure/table/steel_reinforced,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/item/weldpack,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wV" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating,/area/shuttle/merchant/home) "wW" = (/obj/vehicle/train/trolley,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "wX" = (/obj/machinery/light,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) @@ -1201,11 +1201,11 @@ "xe" = (/obj/machinery/door/airlock/multi_tile/glass{dir = 4; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "xf" = (/obj/structure/table/steel_reinforced,/obj/random/medical,/obj/random/medical,/obj/random/medical,/obj/random/medical,/obj/structure/window/reinforced,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "xg" = (/obj/machinery/door/window/southleft{name = "Cargo Hold"; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"xh" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/coin/uranium,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/platinum,/obj/item/weapon/coin/phoron,/obj/item/weapon/coin/iron,/obj/item/weapon/coin/gold,/obj/item/weapon/coin/diamond,/obj/structure/window/reinforced,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"xh" = (/obj/structure/table/steel_reinforced,/obj/item/coin/uranium,/obj/item/coin/silver,/obj/item/coin/platinum,/obj/item/coin/phoron,/obj/item/coin/iron,/obj/item/coin/gold,/obj/item/coin/diamond,/obj/structure/window/reinforced,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "xi" = (/obj/machinery/door/window/southright{name = "Cargo Hold"; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"xj" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/item/weapon/cell/hyper,/obj/item/weapon/cell/potato,/obj/structure/window/reinforced,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"xj" = (/obj/structure/table/steel_reinforced,/obj/item/cell/high,/obj/item/cell/high,/obj/item/cell/hyper,/obj/item/cell/potato,/obj/structure/window/reinforced,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "xk" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating,/area/shuttle/merchant/home) -"xl" = (/obj/structure/table/standard,/obj/item/clothing/gloves/sterile/latex,/obj/item/clothing/mask/surgical,/obj/item/weapon/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/circular_saw,/obj/item/stack/nanopaste,/obj/item/weapon/surgical/hemostat{pixel_y = 4},/obj/item/weapon/surgical/cautery{pixel_y = 4},/obj/item/weapon/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/medical/advanced/bruise_pack,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"xl" = (/obj/structure/table/standard,/obj/item/clothing/gloves/sterile/latex,/obj/item/clothing/mask/surgical,/obj/item/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/surgical/scalpel,/obj/item/surgical/surgicaldrill,/obj/item/surgical/circular_saw,/obj/item/stack/nanopaste,/obj/item/surgical/hemostat{pixel_y = 4},/obj/item/surgical/cautery{pixel_y = 4},/obj/item/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/medical/advanced/bruise_pack,/obj/item/surgical/bonesetter,/obj/item/surgical/bonegel{pixel_x = 4; pixel_y = 3},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "xm" = (/obj/machinery/iv_drip,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "xn" = (/obj/structure/table/glass,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "xo" = (/obj/structure/morgue,/obj/effect/floor_decal/corner/blue{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) @@ -1223,7 +1223,7 @@ "xA" = (/obj/structure/closet/secure_closet/personal/patient,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "xB" = (/obj/effect/floor_decal/corner/blue{dir = 1},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "xC" = (/obj/structure/filingcabinet/chestdrawer{desc = "A large drawer filled with autopsy reports."; name = "Autopsy Reports"},/obj/effect/floor_decal/corner/blue{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"xD" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/weapon/pen{pixel_y = 4},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"xD" = (/obj/structure/table/steel_reinforced,/obj/item/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/pen{pixel_y = 4},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "xE" = (/obj/structure/table/steel_reinforced,/obj/machinery/newscaster{pixel_x = 32},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "xF" = (/obj/structure/toilet,/obj/machinery/light/small{dir = 1},/turf/simulated/shuttle/floor/white,/area/shuttle/merchant/home) "xG" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/light/small,/turf/simulated/shuttle/floor/white,/area/shuttle/merchant/home) @@ -1233,43 +1233,43 @@ "xK" = (/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/shuttle/merchant/home) "xL" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "xM" = (/obj/machinery/recharge_station,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) -"xN" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/donkpockets,/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 30},/obj/effect/floor_decal/corner/orange{dir = 6},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) +"xN" = (/obj/structure/table/reinforced,/obj/item/storage/box/donkpockets,/obj/item/storage/box/donkpockets,/obj/machinery/computer/security/telescreen/entertainment{icon_state = "frame"; pixel_x = 30},/obj/effect/floor_decal/corner/orange{dir = 6},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "xO" = (/obj/structure/bed/chair{dir = 4},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "xP" = (/obj/structure/bed/chair{dir = 8},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "xQ" = (/obj/structure/bed/chair/office/light{dir = 4},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "xR" = (/obj/structure/table/reinforced,/obj/machinery/door/window/brigdoor{dir = 4; name = "Security"},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "xS" = (/obj/structure/table/standard,/obj/item/roller,/obj/item/roller{pixel_y = 8},/obj/item/roller{pixel_y = 16},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "xT" = (/obj/structure/table/glass,/obj/machinery/computer/med_data/laptop,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"xU" = (/obj/item/device/camera{name = "Autopsy Camera"; pixel_x = -2; pixel_y = 7},/obj/item/weapon/paper_bin{pixel_y = -6},/obj/item/weapon/pen/red{pixel_x = -1; pixel_y = -9},/obj/item/weapon/pen/blue{pixel_x = 3; pixel_y = -5},/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"xU" = (/obj/item/camera{name = "Autopsy Camera"; pixel_x = -2; pixel_y = 7},/obj/item/paper_bin{pixel_y = -6},/obj/item/pen/red{pixel_x = -1; pixel_y = -9},/obj/item/pen/blue{pixel_x = 3; pixel_y = -5},/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "xV" = (/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "tradebridgeshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/shuttle/merchant/home) "xW" = (/obj/machinery/computer/rdservercontrol{badmin = 1; dir = 8; name = "Master R&D Server Controller"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/main_hall) "xX" = (/obj/machinery/light{dir = 4},/obj/structure/sign/kiddieplaque{desc = "A plaque commemorating the construction of the cargo ship Beruang."; name = "Beruang"; pixel_x = 32},/mob/living/simple_mob/animal/passive/dog/tamaskan/Spice,/turf/simulated/shuttle/floor/darkred,/area/shuttle/merchant/home) "xY" = (/obj/machinery/door/airlock/silver{name = "Toilet"},/turf/simulated/shuttle/floor/white,/area/shuttle/merchant/home) "xZ" = (/obj/machinery/door/airlock/silver{name = "Restroom"},/turf/simulated/shuttle/floor/white,/area/shuttle/merchant/home) "ya" = (/obj/structure/undies_wardrobe,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"yb" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"yb" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yc" = (/obj/effect/floor_decal/industrial/warning{dir = 9},/obj/structure/largecrate/animal/cat,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yd" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/obj/structure/largecrate/animal/cow,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "ye" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/obj/structure/closet/crate/freezer/rations,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"yf" = (/obj/structure/table/rack,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/obj/item/device/kit/paint/ripley/death,/obj/item/device/kit/paint/ripley/flames_blue,/obj/item/device/kit/paint/ripley/flames_red,/obj/item/device/kit/paint/ripley,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"yf" = (/obj/structure/table/rack,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/obj/item/kit/paint/ripley/death,/obj/item/kit/paint/ripley/flames_blue,/obj/item/kit/paint/ripley/flames_red,/obj/item/kit/paint/ripley,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yg" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/obj/structure/closet/crate/secure/loot,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yh" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/obj/structure/largecrate/hoverpod,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yi" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/obj/mecha/working/ripley/mining,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yj" = (/obj/machinery/door/window/westright{name = "Storefront"; req_access = list(160)},/obj/structure/table/marble,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "trade"; name = "Shop Shutters"; opacity = 0},/turf/simulated/shuttle/floor/darkred,/area/shuttle/merchant/home) "yk" = (/obj/structure/bed/chair/office/dark{dir = 8},/turf/simulated/shuttle/floor/darkred,/area/shuttle/merchant/home) "yl" = (/obj/machinery/computer/arcade/battle,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) -"ym" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/effect/floor_decal/corner/orange{dir = 10},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) +"ym" = (/obj/structure/table/reinforced,/obj/item/paper_bin,/obj/item/pen,/obj/effect/floor_decal/corner/orange{dir = 10},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "yn" = (/obj/structure/table/reinforced,/obj/machinery/microwave,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) -"yo" = (/obj/item/device/camera{desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; pixel_x = 2; pixel_y = 3},/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) -"yp" = (/obj/item/weapon/storage/box/evidence,/obj/item/weapon/folder/red,/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) -"yq" = (/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) +"yo" = (/obj/item/camera{desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; pixel_x = 2; pixel_y = 3},/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) +"yp" = (/obj/item/storage/box/evidence,/obj/item/folder/red,/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) +"yq" = (/obj/item/paper_bin,/obj/item/pen,/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "yr" = (/obj/structure/closet{name = "Evidence Closet"},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "ys" = (/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/obj/structure/shuttle/engine/propulsion{icon_state = "burst_r"},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/supply) "yt" = (/obj/machinery/smartfridge/chemistry,/turf/unsimulated/wall,/area/centcom/medical) -"yu" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/medical,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"yv" = (/obj/item/weapon/storage/box/bodybags,/obj/item/weapon/storage/box/bodybags,/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"yu" = (/obj/structure/bed/padded,/obj/item/bedsheet/medical,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"yv" = (/obj/item/storage/box/bodybags,/obj/item/storage/box/bodybags,/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "yw" = (/obj/effect/floor_decal/corner/blue{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"yx" = (/obj/item/weapon/autopsy_scanner,/obj/item/weapon/surgical/scalpel,/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue/full{dir = 4},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"yx" = (/obj/item/autopsy_scanner,/obj/item/surgical/scalpel,/obj/structure/table/standard,/obj/effect/floor_decal/corner/blue/full{dir = 4},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "yy" = (/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "tradebridgeshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/shuttle/merchant/home) "yz" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_l"; dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/transport1/centcom) "yA" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/shuttle/floor/darkred,/area/shuttle/merchant/home) @@ -1278,7 +1278,7 @@ "yD" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/structure/largecrate/animal/corgi,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yE" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/largecrate/animal/corgi,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yF" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/closet/crate/internals,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"yG" = (/obj/structure/table/rack,/obj/effect/floor_decal/industrial/warning,/obj/item/device/kit/paint/gygax/darkgygax,/obj/item/device/kit/paint/gygax/recitence,/obj/item/device/kit/paint/durand,/obj/item/device/kit/paint/durand/phazon,/obj/item/device/kit/paint/durand/seraph,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"yG" = (/obj/structure/table/rack,/obj/effect/floor_decal/industrial/warning,/obj/item/kit/paint/gygax/darkgygax,/obj/item/kit/paint/gygax/recitence,/obj/item/kit/paint/durand,/obj/item/kit/paint/durand/phazon,/obj/item/kit/paint/durand/seraph,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yH" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/closet/crate/secure/loot,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yI" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/largecrate/hoverpod,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yJ" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/mecha/working/ripley/firefighter,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) @@ -1286,10 +1286,10 @@ "yL" = (/obj/machinery/door/airlock/medical,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "yM" = (/obj/machinery/computer/arcade/battle,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yN" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{id = "tradebridgeshutters"; name = "remote shutter control"; pixel_x = 30; req_access = list(150)},/obj/structure/flora/pottedplant{icon_state = "plant-09"; name = "Esteban"; pixel_y = 8},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"yO" = (/obj/machinery/vending/assist{contraband = null; name = "Old Vending Machine"; products = list(/obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/signaler = 4, /obj/item/device/assembly/infra = 4, /obj/item/device/assembly/prox_sensor = 4, /obj/item/weapon/handcuffs = 8, /obj/item/device/flash = 4, /obj/item/weapon/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"yP" = (/obj/structure/closet{name = "custodial"},/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/mop,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"yO" = (/obj/machinery/vending/assist{contraband = null; name = "Old Vending Machine"; products = list(/obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, /obj/item/assembly/infra = 4, /obj/item/assembly/prox_sensor = 4, /obj/item/handcuffs = 8, /obj/item/flash = 4, /obj/item/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"yP" = (/obj/structure/closet{name = "custodial"},/obj/item/reagent_containers/spray/cleaner,/obj/item/reagent_containers/glass/bucket,/obj/item/mop,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yQ" = (/obj/machinery/vending/sovietsoda,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"yR" = (/obj/machinery/light,/obj/structure/table/standard,/obj/item/weapon/soap,/obj/item/weapon/towel{color = "#0000FF"},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"yR" = (/obj/machinery/light,/obj/structure/table/standard,/obj/item/soap,/obj/item/towel{color = "#0000FF"},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yS" = (/obj/structure/sign/poster{pixel_y = -32},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yT" = (/obj/machinery/door/airlock/multi_tile/glass{dir = 2; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "yU" = (/obj/machinery/door/window/westleft{name = "Storefront"; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) @@ -1301,7 +1301,7 @@ "za" = (/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "tradebridgeshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/shuttle/merchant/home) "zb" = (/obj/machinery/vending/boozeomat{req_access = null},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "zc" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"zd" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"zd" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "ze" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/under/cheongsam,/obj/item/clothing/under/hosformalmale,/obj/item/clothing/under/hosformalfem,/obj/item/clothing/under/harness,/obj/item/clothing/under/gladiator,/obj/item/clothing/under/ert,/obj/item/clothing/under/schoolgirl,/obj/item/clothing/under/redcoat,/obj/item/clothing/under/sexymime,/obj/item/clothing/under/sexyclown,/obj/item/clothing/under/soviet,/obj/item/clothing/under/space,/obj/item/clothing/under/swimsuit/stripper/mankini,/obj/item/clothing/under/suit_jacket/female,/obj/item/clothing/under/rank/psych/turtleneck,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/syndicate/tacticool,/obj/item/clothing/under/dress/sailordress,/obj/item/clothing/under/dress/redeveninggown,/obj/item/clothing/under/dress/dress_saloon,/obj/item/clothing/under/dress/blacktango,/obj/item/clothing/under/dress/blacktango/alt,/obj/item/clothing/under/dress/dress_orange,/obj/item/clothing/under/dress/maid/janitor,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "zf" = (/obj/machinery/door/airlock/glass{name = "Dock"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "zg" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/steel_reinforced,/obj/item/poster,/obj/item/poster,/obj/item/poster,/obj/item/poster,/obj/item/poster,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) @@ -1314,7 +1314,7 @@ "zn" = (/obj/machinery/autolathe{desc = "Your typical Autolathe. It appears to have much more options than your regular one, however..."; hacked = 1; name = "Unlocked Autolathe"},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "zo" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/terminal) "zp" = (/obj/machinery/button/remote/blast_door{id = "tradeportshutters"; name = "remote shutter control"; pixel_x = 30; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"zq" = (/obj/structure/table/steel_reinforced,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/item/weapon/bikehorn,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"zq" = (/obj/structure/table/steel_reinforced,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/item/bikehorn,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "zr" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "zs" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "zt" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) @@ -1324,24 +1324,24 @@ "zx" = (/obj/machinery/vending/medical,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "zy" = (/obj/structure/flora/pottedplant/orientaltree,/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "zz" = (/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"zA" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/adv{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/firstaid/adv,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"zB" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/toxin{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/firstaid/toxin{pixel_x = 0; pixel_y = 0},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"zA" = (/obj/structure/table/standard,/obj/item/storage/firstaid/adv{pixel_x = 5; pixel_y = 5},/obj/item/storage/firstaid/adv,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"zB" = (/obj/structure/table/standard,/obj/item/storage/firstaid/toxin{pixel_x = 5; pixel_y = 5},/obj/item/storage/firstaid/toxin{pixel_x = 0; pixel_y = 0},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "zC" = (/obj/structure/bed/chair{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/corner/paleblue{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "zD" = (/obj/structure/bed/chair{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/paleblue{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"zE" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/o2{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/firstaid/o2{pixel_x = 0; pixel_y = 0},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"zF" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/fire{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/firstaid/fire{pixel_x = 0; pixel_y = 0},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"zG" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/emergency,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"zE" = (/obj/structure/table/standard,/obj/item/storage/firstaid/o2{pixel_x = 5; pixel_y = 5},/obj/item/storage/firstaid/o2{pixel_x = 0; pixel_y = 0},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"zF" = (/obj/structure/table/standard,/obj/item/storage/firstaid/fire{pixel_x = 5; pixel_y = 5},/obj/item/storage/firstaid/fire{pixel_x = 0; pixel_y = 0},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"zG" = (/obj/structure/table/standard,/obj/item/storage/toolbox/emergency,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "zH" = (/obj/effect/floor_decal/corner/paleblue,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "zI" = (/obj/effect/floor_decal/corner/paleblue{dir = 8},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"zJ" = (/obj/structure/closet/secure_closet/medical_wall{name = "O- Blood Locker"; pixel_x = 0; pixel_y = -32},/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"zJ" = (/obj/structure/closet/secure_closet/medical_wall{name = "O- Blood Locker"; pixel_x = 0; pixel_y = -32},/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "zK" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "tradeportshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/shuttle/merchant/home) -"zL" = (/obj/structure/closet/wardrobe/captain,/obj/item/weapon/gun/projectile/revolver/mateba,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"zL" = (/obj/structure/closet/wardrobe/captain,/obj/item/gun/projectile/revolver/mateba,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "zM" = (/obj/machinery/light{dir = 1},/obj/structure/bookcase,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "zN" = (/obj/structure/bed/chair/comfy/black,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "zO" = (/obj/structure/bed/chair/office/dark,/turf/simulated/floor/carpet,/area/shuttle/merchant/home) "zP" = (/obj/machinery/photocopier,/turf/simulated/floor/carpet,/area/shuttle/merchant/home) "zQ" = (/obj/structure/table/steel_reinforced,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/obj/random/action_figure,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"zR" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/lipstick/black,/obj/item/weapon/lipstick/jade,/obj/item/weapon/lipstick/purple,/obj/item/weapon/lipstick,/obj/item/weapon/lipstick/random,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"zR" = (/obj/structure/table/steel_reinforced,/obj/item/lipstick/black,/obj/item/lipstick/jade,/obj/item/lipstick/purple,/obj/item/lipstick,/obj/item/lipstick/random,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "zS" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/webbing,/obj/item/clothing/accessory/storage/webbing,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/scarf/white,/obj/item/clothing/accessory/scarf/lightblue,/obj/item/clothing/accessory/scarf/red,/obj/item/clothing/accessory/scarf/purple,/obj/item/clothing/accessory/armband/science,/obj/item/clothing/accessory/armband/med,/obj/item/clothing/accessory/armband/engine,/obj/item/clothing/accessory/armband/cargo,/obj/item/clothing/accessory/armband,/obj/item/clothing/accessory/medal/nobel_science,/obj/item/clothing/accessory/medal/silver,/obj/item/clothing/accessory/medal/gold,/obj/item/clothing/accessory/medal/bronze_heart,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "zT" = (/obj/effect/floor_decal/corner/paleblue/full{dir = 4},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "zU" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/suit/hgpirate,/obj/item/clothing/suit/imperium_monk,/obj/item/clothing/suit/leathercoat,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/justice,/obj/item/clothing/suit/pirate,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) @@ -1363,7 +1363,7 @@ "Ak" = (/obj/structure/sign/directions/cargo{dir = 1},/obj/structure/sign/directions/security{dir = 1; pixel_y = -10},/obj/structure/sign/directions/engineering{dir = 1; pixel_y = 10},/turf/unsimulated/wall,/area/centcom/terminal) "Al" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "tradeportshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/shuttle/merchant/home) "Am" = (/obj/machinery/door/airlock/command{name = "Captain's Quarters"; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"An" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/weapon/pen{pixel_y = 4},/turf/simulated/floor/carpet,/area/shuttle/merchant/home) +"An" = (/obj/structure/table/woodentable,/obj/item/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/pen{pixel_y = 4},/turf/simulated/floor/carpet,/area/shuttle/merchant/home) "Ao" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_r"; dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/transport1/centcom) "Ap" = (/obj/structure/table/woodentable,/turf/simulated/floor/carpet,/area/shuttle/merchant/home) "Aq" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "tradeportshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/shuttle/merchant/home) @@ -1379,7 +1379,7 @@ "AA" = (/obj/machinery/door/airlock/glass{name = "Dock"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "AB" = (/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 8},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "AC" = (/obj/effect/floor_decal/corner/white/full{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) -"AD" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/captain,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) +"AD" = (/obj/structure/bed/padded,/obj/item/bedsheet/captain,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "AE" = (/obj/structure/table/glass,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "AF" = (/obj/structure/filingcabinet/filingcabinet,/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "AG" = (/obj/machinery/light,/turf/simulated/floor/carpet,/area/shuttle/merchant/home) @@ -1449,7 +1449,7 @@ "BS" = (/obj/structure/bed/chair/shuttle{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "BT" = (/obj/machinery/computer/crew,/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "BU" = (/obj/machinery/chemical_dispenser/bar_soft/full,/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) -"BV" = (/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine{pixel_x = -4; pixel_y = 10},/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) +"BV" = (/obj/item/reagent_containers/food/drinks/bottle/pwine{pixel_x = -4; pixel_y = 10},/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) "BW" = (/obj/structure/sink/kitchen{pixel_y = 28},/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) "BX" = (/obj/machinery/door/airlock/external{icon_state = "door_locked"; locked = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) "BY" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) @@ -1460,44 +1460,44 @@ "Cd" = (/obj/machinery/computer/arcade/orion_trail,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "Ce" = (/obj/machinery/microwave{pixel_x = -1; pixel_y = 8},/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) "Cf" = (/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) -"Cg" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{on = 0; pixel_x = -3; pixel_y = 8},/obj/item/toy/figure/ninja,/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) -"Ch" = (/obj/structure/bed,/obj/item/weapon/bedsheet/rd,/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) +"Cg" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green{on = 0; pixel_x = -3; pixel_y = 8},/obj/item/toy/figure/ninja,/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) +"Ch" = (/obj/structure/bed,/obj/item/bedsheet/rd,/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) "Ci" = (/obj/structure/AIcore/deactivated,/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "Cj" = (/obj/structure/bed/chair/wood/wings,/obj/machinery/newscaster{layer = 3.3; pixel_x = 0; pixel_y = 30},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "Ck" = (/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "Cl" = (/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) -"Cm" = (/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) +"Cm" = (/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) "Cn" = (/obj/structure/mirror{pixel_x = -28},/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) "Co" = (/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) -"Cp" = (/obj/structure/table/woodentable,/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/obj/item/weapon/ore/slag{desc = "Well at least Arthur doesn't have to share now..."; name = "pet rock"},/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) +"Cp" = (/obj/structure/table/woodentable,/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/obj/item/ore/slag{desc = "Well at least Arthur doesn't have to share now..."; name = "pet rock"},/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) "Cq" = (/obj/machinery/newscaster{layer = 3.3; pixel_x = 0; pixel_y = 30},/obj/structure/bedsheetbin,/obj/structure/table/woodentable,/turf/unsimulated/floor{icon_state = "lino"},/area/wizard_station) "Cr" = (/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "Cs" = (/obj/machinery/door/airlock/glass_command{name = "Escape Shuttle Cockpit"; req_access = list(19)},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) -"Ct" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) -"Cu" = (/obj/structure/table/woodentable,/obj/item/device/radio/headset,/obj/item/weapon/spacecash/c500,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) +"Ct" = (/obj/structure/table/woodentable,/obj/item/paper_bin,/obj/item/pen,/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) +"Cu" = (/obj/structure/table/woodentable,/obj/item/radio/headset,/obj/item/spacecash/c500,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "Cv" = (/obj/structure/bed/chair/wood/wings{icon_state = "wooden_chair_wings"; dir = 8},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) -"Cw" = (/obj/item/weapon/reagent_containers/food/snacks/spellburger{pixel_y = 8},/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) +"Cw" = (/obj/item/reagent_containers/food/snacks/spellburger{pixel_y = 8},/obj/structure/table/marble,/turf/unsimulated/floor{icon_state = "white"},/area/wizard_station) "Cx" = (/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"Cy" = (/obj/structure/undies_wardrobe,/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"Cy" = (/obj/structure/undies_wardrobe,/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "Cz" = (/turf/simulated/shuttle/wall/no_join,/area/shuttle/escape/centcom) -"CA" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 3},/obj/item/weapon/extinguisher,/obj/item/weapon/tool/crowbar,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) +"CA" = (/obj/structure/table/standard,/obj/item/storage/firstaid/fire,/obj/item/storage/firstaid/regular{pixel_x = 2; pixel_y = 3},/obj/item/extinguisher,/obj/item/tool/crowbar,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "CB" = (/obj/structure/closet/emcloset,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "CC" = (/obj/structure/bed/chair/wood/wings{icon_state = "wooden_chair_wings"; dir = 4},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) -"CD" = (/obj/structure/table/woodentable,/obj/item/device/paicard,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) -"CE" = (/obj/structure/table/woodentable,/obj/item/weapon/book/codex/corp_regs,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) +"CD" = (/obj/structure/table/woodentable,/obj/item/paicard,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) +"CE" = (/obj/structure/table/woodentable,/obj/item/book/codex/corp_regs,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "CF" = (/obj/machinery/door/airlock/hatch,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "CG" = (/obj/machinery/door/airlock/hatch,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"CH" = (/obj/item/weapon/antag_spawner/technomancer_apprentice,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"CI" = (/obj/structure/table/woodentable,/obj/item/clothing/shoes/boots/workboots,/obj/item/clothing/under/technomancer,/obj/item/clothing/head/technomancer,/obj/item/weapon/storage/box/syndie_kit/chameleon,/obj/item/weapon/storage/box/syndie_kit/chameleon,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"CH" = (/obj/item/antag_spawner/technomancer_apprentice,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"CI" = (/obj/structure/table/woodentable,/obj/item/clothing/shoes/boots/workboots,/obj/item/clothing/under/technomancer,/obj/item/clothing/head/technomancer,/obj/item/storage/box/syndie_kit/chameleon,/obj/item/storage/box/syndie_kit/chameleon,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "CJ" = (/obj/machinery/door/airlock/external{icon_state = "door_locked"; locked = 1},/obj/effect/forcefield{desc = "You can't get in. Heh."; layer = 1; name = "Blocker"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) "CK" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "centcom_dock_airlock"; locked = 1; name = "Arrivals Airlock"; req_access = list(13)},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) "CL" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_shuttle_hatch"; locked = 1; name = "Shuttle Hatch"; req_access = list(13)},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "CM" = (/obj/structure/bed/chair/wood/wings{icon_state = "wooden_chair_wings"; dir = 1},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "CN" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/unsimulated/floor{icon_state = "grass0"; name = "grass"},/area/wizard_station) "CO" = (/obj/machinery/vending/hydroseeds,/turf/unsimulated/floor{icon_state = "grass0"; name = "grass"},/area/wizard_station) -"CP" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/wizrobe/magusblue,/obj/item/clothing/head/wizard/magus,/obj/item/weapon/staff,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"CP" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/wizrobe/magusblue,/obj/item/clothing/head/wizard/magus,/obj/item/staff,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "CQ" = (/obj/effect/landmark/start{name = "wizard"},/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"CR" = (/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"CR" = (/obj/item/reagent_containers/food/snacks/cheesewedge,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "CS" = (/obj/structure/table/woodentable,/obj/machinery/librarycomp{pixel_y = 6},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "CT" = (/obj/machinery/media/jukebox,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "CU" = (/obj/machinery/vending/hydronutrients,/turf/unsimulated/floor{icon_state = "grass0"; name = "grass"},/area/wizard_station) @@ -1511,17 +1511,17 @@ "Dc" = (/obj/machinery/photocopier,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "Dd" = (/obj/structure/bookcase,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "De" = (/obj/structure/flora/pottedplant{icon_state = "plant-08"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) -"Df" = (/obj/structure/closet/cabinet,/obj/item/clothing/shoes/sandal/marisa{desc = "A set of fancy shoes that are as functional as they are comfortable."; name = "Gentlemans Shoes"},/obj/item/clothing/under/gentlesuit,/obj/item/clothing/suit/wizrobe/gentlecoat,/obj/item/clothing/head/wizard/cap,/obj/item/weapon/staff/gentcane,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"Dg" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/wizrobe/magusred,/obj/item/clothing/head/wizard/magus,/obj/item/weapon/staff,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"Dh" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/wizrobe/marisa,/obj/item/clothing/shoes/sandal/marisa,/obj/item/clothing/head/wizard/marisa,/obj/item/weapon/staff/broom,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"Di" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/wizrobe/red,/obj/item/clothing/shoes/sandal,/obj/item/clothing/head/wizard/red,/obj/item/weapon/staff,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Df" = (/obj/structure/closet/cabinet,/obj/item/clothing/shoes/sandal/marisa{desc = "A set of fancy shoes that are as functional as they are comfortable."; name = "Gentlemans Shoes"},/obj/item/clothing/under/gentlesuit,/obj/item/clothing/suit/wizrobe/gentlecoat,/obj/item/clothing/head/wizard/cap,/obj/item/staff/gentcane,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Dg" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/wizrobe/magusred,/obj/item/clothing/head/wizard/magus,/obj/item/staff,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Dh" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/wizrobe/marisa,/obj/item/clothing/shoes/sandal/marisa,/obj/item/clothing/head/wizard/marisa,/obj/item/staff/broom,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Di" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/wizrobe/red,/obj/item/clothing/shoes/sandal,/obj/item/clothing/head/wizard/red,/obj/item/staff,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Dj" = (/obj/structure/bed/chair/shuttle{dir = 4},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "Dk" = (/obj/structure/bed/chair/shuttle{dir = 8},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "Dl" = (/obj/machinery/the_singularitygen,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Dm" = (/obj/machinery/crystal,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "Dn" = (/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"Do" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/arrow/quill,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"Dp" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/stock_parts/matter_bin/super,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Do" = (/obj/structure/table/steel_reinforced,/obj/item/arrow/quill,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"Dp" = (/obj/structure/table/steel_reinforced,/obj/item/stock_parts/matter_bin/super,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Dq" = (/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "Dr" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "centcom_dock"; name = "docking port controller"; pixel_x = 25; pixel_y = 0; req_one_access = list(13); tag_door = "centcom_dock_airlock"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "Ds" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) @@ -1531,7 +1531,7 @@ "Dw" = (/obj/machinery/computer/message_monitor,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Dx" = (/obj/structure/frame/computer,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Dy" = (/obj/structure/table/steel_reinforced,/obj/item/stack/telecrystal,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"Dz" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Dz" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "DA" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/head/philosopher_wig,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "DB" = (/obj/structure/flora/pottedplant{icon_state = "plant-04"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "DC" = (/obj/structure/sign/electricshock,/turf/simulated/shuttle/wall/dark/hard_corner,/area/wizard_station) @@ -1542,50 +1542,50 @@ "DH" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/administration/centcom) "DI" = (/obj/machinery/computer/secure_data{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "DJ" = (/obj/structure/frame/computer{dir = 4},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) -"DK" = (/obj/structure/table/steel_reinforced,/obj/item/device/mmi/radio_enabled,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"DL" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/material/knife/ritual,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"DM" = (/obj/structure/flora/pottedplant{icon_state = "plant-03"},/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"DK" = (/obj/structure/table/steel_reinforced,/obj/item/mmi/radio_enabled,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"DL" = (/obj/structure/table/steel_reinforced,/obj/item/material/knife/ritual,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"DM" = (/obj/structure/flora/pottedplant{icon_state = "plant-03"},/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "DN" = (/obj/structure/reagent_dispensers/watertank,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "DO" = (/obj/machinery/power/port_gen/pacman,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "DP" = (/obj/structure/table/steel_reinforced,/obj/item/xenos_claw,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"DQ" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/coin/diamond,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"DQ" = (/obj/structure/table/steel_reinforced,/obj/item/coin/diamond,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "DR" = (/obj/structure/table/steel_reinforced,/obj/item/broken_device,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "DS" = (/obj/structure/table/steel_reinforced,/obj/item/organ/internal/stack,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "DT" = (/obj/machinery/floodlight,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "DU" = (/obj/machinery/mecha_part_fabricator,/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "DV" = (/obj/structure/table/steel_reinforced,/obj/machinery/cell_charger,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"DW" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/book/manual/ripley_build_and_repair,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"DX" = (/obj/item/device/suit_cooling_unit,/obj/structure/table/steel_reinforced,/obj/machinery/newscaster{layer = 3.3; pixel_x = 0; pixel_y = 30},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"DW" = (/obj/structure/table/steel_reinforced,/obj/item/book/manual/ripley_build_and_repair,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"DX" = (/obj/item/suit_cooling_unit,/obj/structure/table/steel_reinforced,/obj/machinery/newscaster{layer = 3.3; pixel_x = 0; pixel_y = 30},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "DY" = (/obj/machinery/newscaster{layer = 3.3; pixel_x = 0; pixel_y = 30},/obj/item/target,/obj/effect/floor_decal/industrial/outline/yellow,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "DZ" = (/obj/item/target/syndicate,/obj/effect/floor_decal/industrial/outline/yellow,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Ea" = (/obj/structure/table/steel_reinforced,/obj/item/toy/sword,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"Eb" = (/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/obj/structure/table/steel_reinforced,/obj/item/weapon/gun/energy/laser/practice,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Eb" = (/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/obj/structure/table/steel_reinforced,/obj/item/gun/energy/laser/practice,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Ec" = (/obj/machinery/door/airlock/glass_security{name = "Escape Shuttle Cell"; req_access = list(1)},/turf/simulated/shuttle/floor/red,/area/shuttle/escape/centcom) "Ed" = (/obj/machinery/door/airlock/glass_medical{name = "Escape Shuttle Infirmary"; req_access = list(5)},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "Ee" = (/obj/machinery/recharge_station,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"Ef" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/book/manual/engineering_hacking,/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Ef" = (/obj/structure/table/steel_reinforced,/obj/item/book/manual/engineering_hacking,/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Eg" = (/obj/effect/floor_decal/industrial/warning/corner,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Eh" = (/obj/effect/floor_decal/industrial/warning,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "Ei" = (/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"Ej" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/obj/item/target,/obj/effect/floor_decal/industrial/outline/yellow,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Ej" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/obj/item/target,/obj/effect/floor_decal/industrial/outline/yellow,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Ek" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/shuttle/floor/red,/area/shuttle/escape/centcom) "El" = (/turf/simulated/shuttle/floor/red,/area/shuttle/escape/centcom) "Em" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/shuttle/floor/red,/area/shuttle/escape/centcom) "En" = (/obj/machinery/atmospherics/unary/cryo_cell{layer = 3.3},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "Eo" = (/obj/machinery/atmospherics/portables_connector,/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "Ep" = (/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) -"Eq" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/weapon/tool/wrench,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) -"Er" = (/obj/structure/closet/crate/medical,/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/weapon/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/weapon/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/weapon/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/weapon/storage/firstaid/adv{pixel_x = -2},/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) +"Eq" = (/obj/structure/table/standard,/obj/item/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/tool/wrench,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) +"Er" = (/obj/structure/closet/crate/medical,/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/storage/firstaid/toxin,/obj/item/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/storage/firstaid/adv{pixel_x = -2},/obj/item/reagent_containers/blood/empty,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "Es" = (/obj/item/robot_parts/r_arm,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "Et" = (/obj/item/robot_parts/l_leg,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) -"Eu" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/book/manual/robotics_cyborgs,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Eu" = (/obj/structure/table/steel_reinforced,/obj/item/book/manual/robotics_cyborgs,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Ev" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Ew" = (/obj/machinery/power/emitter{anchored = 1; desc = "It is a heavy duty industrial laser used in a very non-industrial way."; name = "teleport defender"},/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "Ex" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Ey" = (/obj/effect/floor_decal/industrial/warning{dir = 9},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "Ez" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "EA" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 5},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) -"EB" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"EB" = (/obj/item/stool/padded,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "EC" = (/obj/item/robot_parts/r_leg,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "ED" = (/obj/item/robot_parts/chest,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "EE" = (/obj/item/robot_parts/l_arm,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) @@ -1608,11 +1608,11 @@ "EV" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/airless,/area/shuttle/escape/centcom) "EW" = (/obj/effect/decal/mecha_wreckage/phazon,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) "EX" = (/obj/item/robot_parts/head,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) -"EY" = (/obj/item/weapon/firstaid_arm_assembly,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"EY" = (/obj/item/firstaid_arm_assembly,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "EZ" = (/obj/machinery/computer/shuttle_control/merchant{dir = 4},/turf/simulated/shuttle/floor/black,/area/shuttle/merchant/home) "Fa" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating/airless,/area/shuttle/escape/centcom) -"Fb" = (/obj/item/weapon/bucket_sensor,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"Fc" = (/obj/item/weapon/farmbot_arm_assembly,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"Fb" = (/obj/item/bucket_sensor,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"Fc" = (/obj/item/farmbot_arm_assembly,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Fd" = (/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "Fe" = (/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "Ff" = (/obj/machinery/computer/teleporter,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) @@ -1635,8 +1635,8 @@ "Fw" = (/obj/effect/overlay/coconut,/turf/unsimulated/beach/sand,/area/beach) "Fx" = (/obj/item/target/alien,/turf/unsimulated/floor{icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood_broken2"},/area/ninja_dojo/dojo) "Fy" = (/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) -"Fz" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/flame/candle,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) -"FA" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/material/sword/katana,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) +"Fz" = (/obj/structure/table/wooden_reinforced,/obj/item/flame/candle,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) +"FA" = (/obj/structure/table/wooden_reinforced,/obj/item/material/sword/katana,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) "FB" = (/obj/machinery/space_heater,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) "FC" = (/obj/item/target,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) "FD" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 1},/turf/simulated/shuttle/plating/airless/carry,/area/ninja_dojo/start) @@ -1672,10 +1672,10 @@ "Gh" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/turf/simulated/shuttle/floor/voidcraft/dark,/area/ninja_dojo/start) "Gi" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/ninja_dojo/start) "Gj" = (/turf/simulated/shuttle/floor/voidcraft/dark,/area/ninja_dojo/start) -"Gk" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/storage/firstaid/adv{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/firstaid/combat,/turf/simulated/shuttle/floor/voidcraft/dark,/area/ninja_dojo/start) -"Gl" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/snacks/chips,/turf/unsimulated/beach/sand,/area/beach) -"Gm" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/turf/unsimulated/beach/sand,/area/beach) -"Gn" = (/obj/item/weapon/beach_ball,/turf/unsimulated/beach/sand,/area/beach) +"Gk" = (/obj/structure/table/steel_reinforced,/obj/item/storage/firstaid/adv{pixel_x = 5; pixel_y = 5},/obj/item/storage/firstaid/combat,/turf/simulated/shuttle/floor/voidcraft/dark,/area/ninja_dojo/start) +"Gl" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/snacks/chips,/turf/unsimulated/beach/sand,/area/beach) +"Gm" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/drinks/cans/cola,/obj/item/reagent_containers/food/drinks/cans/cola,/obj/item/reagent_containers/food/drinks/cans/cola,/obj/item/reagent_containers/food/drinks/cans/cola,/obj/item/reagent_containers/food/drinks/cans/cola,/obj/item/reagent_containers/food/drinks/cans/cola,/turf/unsimulated/beach/sand,/area/beach) +"Gn" = (/obj/item/beach_ball,/turf/unsimulated/beach/sand,/area/beach) "Go" = (/turf/unsimulated/floor{icon_state = "dark"},/area/ninja_dojo/dojo) "Gp" = (/obj/machinery/embedded_controller/radio/airlock/docking_port{frequency = 1331; id_tag = "ninja_shuttle"; pixel_x = 0; pixel_y = -25; req_access = list(150)},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; frequency = 1331; id_tag = "ninja_shuttle_pump"},/obj/machinery/button/remote/blast_door{id = "blastninja"; name = "ship lockdown control"; pixel_x = -25},/turf/simulated/shuttle/floor/voidcraft/dark,/area/ninja_dojo/start) "Gq" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/machinery/door/airlock/voidcraft/vertical{frequency = 1331; id_tag = "ninja_shuttle_inner"; name = "Ship Internal Hatch"; req_access = list(150)},/turf/simulated/shuttle/floor/voidcraft/dark,/area/ninja_dojo/start) @@ -1687,9 +1687,9 @@ "Gw" = (/obj/machinery/computer/security{dir = 8},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/security) "Gx" = (/obj/machinery/computer/cloning{dir = 1},/turf/simulated/shuttle/floor/white,/area/centcom/evac) "Gy" = (/turf/unsimulated/floor{icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood_broken1"},/area/ninja_dojo/dojo) -"Gz" = (/obj/structure/table/steel_reinforced,/obj/item/device/paicard,/obj/item/device/pda/syndicate,/turf/simulated/shuttle/floor/voidcraft/light,/area/ninja_dojo/start) +"Gz" = (/obj/structure/table/steel_reinforced,/obj/item/paicard,/obj/item/pda/syndicate,/turf/simulated/shuttle/floor/voidcraft/light,/area/ninja_dojo/start) "GA" = (/obj/structure/bed/chair/comfy/black,/turf/simulated/shuttle/floor/voidcraft/dark,/area/ninja_dojo/start) -"GB" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/storage/toolbox/syndicate{pixel_x = -1; pixel_y = 3},/obj/machinery/button/remote/blast_door{id = "ninjawindow"; name = "remote shutter control"; pixel_x = 0; pixel_y = -25; req_access = list(150)},/turf/simulated/shuttle/floor/voidcraft/light,/area/ninja_dojo/start) +"GB" = (/obj/structure/table/steel_reinforced,/obj/item/storage/toolbox/syndicate{pixel_x = -1; pixel_y = 3},/obj/machinery/button/remote/blast_door{id = "ninjawindow"; name = "remote shutter control"; pixel_x = 0; pixel_y = -25; req_access = list(150)},/turf/simulated/shuttle/floor/voidcraft/light,/area/ninja_dojo/start) "GC" = (/obj/structure/table/bench/wooden,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) "GD" = (/obj/structure/flight_right{dir = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/ninja_dojo/start) "GE" = (/obj/machinery/computer/shuttle_control/web/ninja{icon_state = "flightcomp_center"; dir = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/ninja_dojo/start) @@ -1718,21 +1718,21 @@ "Hb" = (/obj/structure/table/wooden_reinforced,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) "Hc" = (/turf/unsimulated/wall{icon = 'icons/obj/doors/Dooruranium.dmi'; icon_state = "door_closed"; name = "Sealed Door"},/area/ninja_dojo/dojo) "Hd" = (/obj/structure/table/glass,/obj/item/clothing/mask/balaclava/tactical{pixel_x = 2; pixel_y = 2},/obj/item/clothing/mask/balaclava,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) -"He" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/snacks/fortunecookie,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) +"He" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/snacks/fortunecookie,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) "Hf" = (/obj/structure/table/glass,/obj/item/clothing/mask/balaclava,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) -"Hg" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) +"Hg" = (/obj/structure/bed/padded,/obj/item/bedsheet,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) "Hh" = (/obj/structure/table/glass,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) "Hi" = (/obj/structure/toilet{dir = 4},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/ninja_dojo/dojo) "Hj" = (/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/ninja_dojo/dojo) "Hk" = (/obj/machinery/recharge_station,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/ninja_dojo/dojo) "Hl" = (/obj/structure/table/bench/wooden,/obj/effect/landmark{name = "ninjastart"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) "Hm" = (/obj/effect/landmark{name = "ninjastart"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) -"Hn" = (/obj/structure/window/reinforced/tinted{dir = 1},/obj/structure/table/glass,/obj/item/weapon/towel{color = "#FF6666"; name = "light red towel"},/obj/item/weapon/towel{color = "#FF6666"; name = "light red towel"},/obj/random/soap,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/ninja_dojo/dojo) +"Hn" = (/obj/structure/window/reinforced/tinted{dir = 1},/obj/structure/table/glass,/obj/item/towel{color = "#FF6666"; name = "light red towel"},/obj/item/towel{color = "#FF6666"; name = "light red towel"},/obj/random/soap,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/ninja_dojo/dojo) "Ho" = (/obj/machinery/recharger{pixel_y = 0},/obj/structure/table/steel_reinforced,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) -"Hp" = (/obj/structure/table/wooden_reinforced,/obj/item/device/radio/uplink,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) +"Hp" = (/obj/structure/table/wooden_reinforced,/obj/item/radio/uplink,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) "Hq" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/ninja_dojo/dojo) -"Hr" = (/obj/item/weapon/rig/light/stealth,/obj/structure/table/rack,/turf/unsimulated/floor{icon_state = "dark"},/area/ninja_dojo/dojo) -"Hs" = (/obj/item/device/suit_cooling_unit,/turf/unsimulated/floor{icon_state = "dark"},/area/ninja_dojo/dojo) +"Hr" = (/obj/item/rig/light/stealth,/obj/structure/table/rack,/turf/unsimulated/floor{icon_state = "dark"},/area/ninja_dojo/dojo) +"Hs" = (/obj/item/suit_cooling_unit,/turf/unsimulated/floor{icon_state = "dark"},/area/ninja_dojo/dojo) "Ht" = (/obj/machinery/door/airlock{icon = 'icons/obj/doors/Dooruranium.dmi'},/turf/unsimulated/floor{icon_state = "white"},/area/ninja_dojo/dojo) "Hu" = (/obj/machinery/door/morgue,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/ninja_dojo/dojo) "Hv" = (/obj/structure/closet/crate,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/turf/unsimulated/floor{icon_state = "dark"},/area/ninja_dojo/dojo) @@ -1741,7 +1741,7 @@ "Hy" = (/obj/machinery/door/morgue,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/ninja_dojo/dojo) "Hz" = (/obj/structure/table/steel_reinforced,/obj/item/rig_module/chem_dispenser/ninja,/turf/unsimulated/floor{icon_state = "dark"},/area/ninja_dojo/dojo) "HA" = (/obj/structure/bed/chair/office/dark,/turf/unsimulated/floor{icon_state = "dark"},/area/ninja_dojo/dojo) -"HB" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/storage/toolbox/syndicate{pixel_x = -1; pixel_y = 3},/obj/random/tech_supply,/turf/unsimulated/floor{icon_state = "dark"},/area/ninja_dojo/dojo) +"HB" = (/obj/structure/table/steel_reinforced,/obj/item/storage/toolbox/syndicate{pixel_x = -1; pixel_y = 3},/obj/random/tech_supply,/turf/unsimulated/floor{icon_state = "dark"},/area/ninja_dojo/dojo) "HC" = (/obj/structure/undies_wardrobe,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/ninja_dojo/dojo) "HD" = (/obj/machinery/shower{dir = 8; icon_state = "shower"; pixel_x = -5; pixel_y = -1},/obj/structure/curtain/open/shower/medical,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/ninja_dojo/dojo) "HE" = (/obj/structure/table/steel_reinforced,/obj/machinery/cell_charger,/obj/random/powercell,/turf/unsimulated/floor{icon_state = "dark"},/area/ninja_dojo/dojo) @@ -1749,22 +1749,22 @@ "HG" = (/obj/structure/table/steel_reinforced,/obj/item/rig_module/fabricator/energy_net,/obj/item/rig_module/vision/multi,/turf/unsimulated/floor{icon_state = "dark"},/area/ninja_dojo/dojo) "HH" = (/obj/machinery/sleeper{dir = 8},/turf/unsimulated/floor{icon_state = "white"},/area/ninja_dojo/dojo) "HI" = (/obj/machinery/sleep_console,/turf/unsimulated/floor{icon_state = "white"},/area/ninja_dojo/dojo) -"HJ" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/adv{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/firstaid/adv,/turf/unsimulated/floor{icon_state = "white"},/area/ninja_dojo/dojo) +"HJ" = (/obj/structure/table/standard,/obj/item/storage/firstaid/adv{pixel_x = 5; pixel_y = 5},/obj/item/storage/firstaid/adv,/turf/unsimulated/floor{icon_state = "white"},/area/ninja_dojo/dojo) "HK" = (/turf/unsimulated/wall,/area/syndicate_station) "HL" = (/obj/machinery/space_heater,/turf/unsimulated/floor{icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood_broken3"},/area/ninja_dojo/dojo) "HM" = (/turf/unsimulated/wall,/area/syndicate_mothership/elite_squad) "HN" = (/turf/unsimulated/wall,/area/skipjack_station) "HO" = (/turf/unsimulated/wall,/area/prison/solitary) -"HP" = (/obj/structure/table/rack,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera,/obj/item/device/camera,/obj/item/device/camera,/obj/item/device/camera,/obj/item/device/camera,/obj/item/device/camera,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"HQ" = (/obj/structure/table/rack,/obj/item/weapon/storage/toolbox/emergency{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/toolbox/emergency,/obj/item/weapon/storage/toolbox/emergency{pixel_x = -3; pixel_y = -3},/obj/item/weapon/storage/toolbox/emergency{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/toolbox/emergency,/obj/item/weapon/storage/toolbox/emergency{pixel_x = -3; pixel_y = -3},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"HR" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/plasmastun,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"HP" = (/obj/structure/table/rack,/obj/item/camera_film,/obj/item/camera_film,/obj/item/camera_film,/obj/item/camera_film,/obj/item/camera_film,/obj/item/camera_film,/obj/item/camera,/obj/item/camera,/obj/item/camera,/obj/item/camera,/obj/item/camera,/obj/item/camera,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"HQ" = (/obj/structure/table/rack,/obj/item/storage/toolbox/emergency{pixel_x = 3; pixel_y = 3},/obj/item/storage/toolbox/emergency,/obj/item/storage/toolbox/emergency{pixel_x = -3; pixel_y = -3},/obj/item/storage/toolbox/emergency{pixel_x = 3; pixel_y = 3},/obj/item/storage/toolbox/emergency,/obj/item/storage/toolbox/emergency{pixel_x = -3; pixel_y = -3},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"HR" = (/obj/structure/table/rack,/obj/item/gun/energy/plasmastun,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "HS" = (/obj/structure/table/rack,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"HT" = (/obj/structure/table/rack,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"HU" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/ionrifle,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/obj/item/weapon/gun/energy/ionrifle,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"HT" = (/obj/structure/table/rack,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/obj/item/material/knife/tacknife/combatknife,/obj/item/material/knife/tacknife/combatknife,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"HU" = (/obj/structure/table/rack,/obj/item/gun/energy/ionrifle,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/obj/item/gun/energy/ionrifle,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "HV" = (/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/elite_squad) "HW" = (/obj/mecha/combat/marauder/mauler,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/elite_squad) "HX" = (/obj/machinery/mech_recharger,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/elite_squad) -"HY" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/automatic/sts35,/obj/item/weapon/gun/projectile/automatic/sts35,/obj/item/ammo_magazine/m545,/obj/item/ammo_magazine/m545,/obj/item/ammo_magazine/m545,/obj/item/ammo_magazine/m545,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"HY" = (/obj/structure/table/rack,/obj/item/gun/projectile/automatic/sts35,/obj/item/gun/projectile/automatic/sts35,/obj/item/ammo_magazine/m545,/obj/item/ammo_magazine/m545,/obj/item/ammo_magazine/m545,/obj/item/ammo_magazine/m545,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "HZ" = (/turf/simulated/shuttle/wall/dark,/area/shuttle/syndicate_elite/mothership) "Ia" = (/obj/machinery/computer/operating{dir = 4},/turf/simulated/shuttle/floor/white,/area/centcom/evac) "Ib" = (/obj/machinery/computer/shuttle{dir = 1},/turf/simulated/shuttle/floor/black,/area/centcom/evac) @@ -1773,33 +1773,33 @@ "Ie" = (/turf/simulated/mineral,/area/skipjack_station) "If" = (/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) "Ig" = (/obj/machinery/embedded_controller/radio/docking_port_multi{child_names_txt = "Airlock One;Airlock Two;Airlock Three;Airlock Four"; child_tags_txt = "escape_dock_north_airlock;escape_dock_south_airlock;escape_dock_snorth_airlock;escape_dock_ssouth_airlock"; frequency = 1380; id_tag = "escape_dock"; pixel_y = -32; req_one_access = list(13)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) -"Ih" = (/obj/structure/table/standard,/obj/item/device/paicard,/turf/unsimulated/floor{icon_state = "steel"},/area/skipjack_station) +"Ih" = (/obj/structure/table/standard,/obj/item/paicard,/turf/unsimulated/floor{icon_state = "steel"},/area/skipjack_station) "Ii" = (/obj/effect/decal/cleanable/cobweb2{icon_state = "cobweb1"},/turf/unsimulated/floor{icon_state = "steel"},/area/skipjack_station) "Ij" = (/turf/unsimulated/floor{icon_state = "steel"},/area/skipjack_station) "Ik" = (/obj/structure/bed,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/prison/solitary) "Il" = (/obj/effect/landmark{name = "prisonwarp"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/prison/solitary) -"Im" = (/obj/structure/table/rack,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"Im" = (/obj/structure/table/rack,/obj/item/megaphone,/obj/item/megaphone,/obj/item/megaphone,/obj/item/megaphone,/obj/item/megaphone,/obj/item/megaphone,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "In" = (/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"Io" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/gun,/obj/item/weapon/gun/energy/gun,/obj/item/weapon/gun/energy/gun,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"Io" = (/obj/structure/table/rack,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun,/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "Ip" = (/mob/living/silicon/decoy{icon_state = "ai-malf"; name = "GLaDOS"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "Iq" = (/obj/structure/window/reinforced,/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 1},/turf/simulated/floor/airless,/area/shuttle/syndicate_elite/mothership) "Ir" = (/obj/structure/inflatable,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) -"Is" = (/obj/item/weapon/ore,/turf/unsimulated/floor{icon_state = "steel"},/area/skipjack_station) +"Is" = (/obj/item/ore,/turf/unsimulated/floor{icon_state = "steel"},/area/skipjack_station) "It" = (/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) -"Iu" = (/obj/structure/table/rack,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"Iv" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/handcuffs{pixel_x = 4; pixel_y = 2},/obj/item/weapon/storage/box/flashbangs,/obj/item/weapon/storage/box/smokes,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"Iu" = (/obj/structure/table/rack,/obj/item/flashlight/maglight,/obj/item/flashlight/maglight,/obj/item/flashlight/maglight,/obj/item/flashlight/maglight,/obj/item/flashlight/maglight,/obj/item/flashlight/maglight,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"Iv" = (/obj/structure/table/rack,/obj/item/storage/box/handcuffs{pixel_x = 4; pixel_y = 2},/obj/item/storage/box/flashbangs,/obj/item/storage/box/smokes,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "Iw" = (/obj/structure/table/rack,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/obj/item/clothing/accessory/storage/white_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"Ix" = (/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; frequency = 1213; listening = 1; name = "Syndicate Ops Intercom"; pixel_y = 26; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"Ix" = (/obj/item/radio/intercom{broadcasting = 1; dir = 1; frequency = 1213; listening = 1; name = "Syndicate Ops Intercom"; pixel_y = 26; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "Iy" = (/obj/machinery/door/airlock/glass_security{name = "Airlock"; req_access = list(150)},/obj/machinery/door/blast/regular{id = "syndicate_elite_mech_room"; name = "Mech Room Door"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/elite_squad) "Iz" = (/obj/effect/wingrille_spawn/reinforced,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/syndicate_mothership/elite_squad) "IA" = (/turf/simulated/shuttle/wall/dark/no_join,/area/shuttle/syndicate_elite/mothership) "IB" = (/obj/effect/landmark{name = "Syndicate-Commando-Bomb"},/turf/simulated/shuttle/floor/skipjack,/area/shuttle/syndicate_elite/mothership) "IC" = (/obj/structure/inflatable,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) "ID" = (/obj/machinery/door/airlock/hatch{req_access = list(150)},/turf/unsimulated/floor{icon_state = "steel"},/area/skipjack_station) -"IE" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/glasses/square{pixel_x = 1; pixel_y = 4},/turf/unsimulated/floor{icon_state = "white"},/area/skipjack_station) -"IF" = (/obj/item/weapon/tray{pixel_y = 5},/obj/structure/table/standard,/obj/item/weapon/material/knife/butch,/turf/unsimulated/floor{icon_state = "white"},/area/skipjack_station) -"IG" = (/obj/structure/table/rack,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"IH" = (/obj/structure/table/rack,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"IE" = (/obj/structure/table/standard,/obj/item/storage/box/glasses/square{pixel_x = 1; pixel_y = 4},/turf/unsimulated/floor{icon_state = "white"},/area/skipjack_station) +"IF" = (/obj/item/tray{pixel_y = 5},/obj/structure/table/standard,/obj/item/material/knife/butch,/turf/unsimulated/floor{icon_state = "white"},/area/skipjack_station) +"IG" = (/obj/structure/table/rack,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/obj/item/flashlight/flare,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"IH" = (/obj/structure/table/rack,/obj/item/binoculars,/obj/item/binoculars,/obj/item/binoculars,/obj/item/binoculars,/obj/item/binoculars,/obj/item/binoculars,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "II" = (/obj/structure/table/rack,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "IJ" = (/obj/machinery/embedded_controller/radio/docking_port_multi{child_names_txt = "Airlock One;Airlock Two"; child_tags_txt = "arrivals_dock_north_airlock;arrivals_dock_south_airlock"; frequency = 1380; id_tag = "arrivals_dock"; pixel_y = -32},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "IK" = (/obj/effect/wingrille_spawn/reinforced,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/syndicate_station) @@ -1811,23 +1811,23 @@ "IQ" = (/obj/effect/decal/cleanable/cobweb2{icon_state = "spiderling"; name = "dead spider"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) "IR" = (/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_soft/full,/turf/unsimulated/floor{icon_state = "white"},/area/skipjack_station) "IS" = (/turf/unsimulated/floor{icon_state = "white"},/area/skipjack_station) -"IT" = (/obj/item/weapon/ore,/obj/structure/reagent_dispensers/beerkeg,/turf/unsimulated/floor{icon_state = "white"},/area/skipjack_station) +"IT" = (/obj/item/ore,/obj/structure/reagent_dispensers/beerkeg,/turf/unsimulated/floor{icon_state = "white"},/area/skipjack_station) "IU" = (/obj/structure/table/rack,/obj/item/clothing/mask/balaclava/tactical,/obj/item/clothing/mask/balaclava/tactical,/obj/item/clothing/mask/balaclava/tactical,/obj/item/clothing/mask/balaclava/tactical,/obj/item/clothing/mask/balaclava/tactical,/obj/item/clothing/mask/balaclava/tactical,/obj/item/clothing/mask/balaclava,/obj/item/clothing/mask/balaclava,/obj/item/clothing/mask/balaclava,/obj/item/clothing/mask/balaclava,/obj/item/clothing/mask/balaclava,/obj/item/clothing/mask/balaclava,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"IV" = (/obj/structure/table/rack,/obj/item/weapon/pinpointer/shuttle/merc,/obj/item/weapon/pinpointer/shuttle/merc,/obj/item/weapon/pinpointer/shuttle/merc,/obj/item/weapon/pinpointer/shuttle/merc,/obj/item/weapon/pinpointer/shuttle/merc,/obj/item/weapon/pinpointer/shuttle/merc,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/obj/item/weapon/shield/energy,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"IV" = (/obj/structure/table/rack,/obj/item/pinpointer/shuttle/merc,/obj/item/pinpointer/shuttle/merc,/obj/item/pinpointer/shuttle/merc,/obj/item/pinpointer/shuttle/merc,/obj/item/pinpointer/shuttle/merc,/obj/item/pinpointer/shuttle/merc,/obj/item/shield/energy,/obj/item/shield/energy,/obj/item/shield/energy,/obj/item/shield/energy,/obj/item/shield/energy,/obj/item/shield/energy,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "IW" = (/obj/structure/table/rack,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"IX" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/weapon/gun/projectile/automatic/c20r,/obj/item/weapon/gun/projectile/automatic/c20r,/obj/item/weapon/gun/projectile/automatic/c20r,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"IX" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/ammo_magazine/m10mm,/obj/item/gun/projectile/automatic/c20r,/obj/item/gun/projectile/automatic/c20r,/obj/item/gun/projectile/automatic/c20r,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "IY" = (/turf/unsimulated/wall{desc = "That looks like it doesn't open easily."; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership/elite_squad) "IZ" = (/obj/machinery/microwave{pixel_x = -1; pixel_y = 8},/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "white"},/area/skipjack_station) -"Ja" = (/obj/item/weapon/ore,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) -"Jb" = (/obj/structure/urinal{pixel_y = 32},/obj/item/weapon/soap/syndie,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/skipjack_station) +"Ja" = (/obj/item/ore,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) +"Jb" = (/obj/structure/urinal{pixel_y = 32},/obj/item/soap/syndie,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/skipjack_station) "Jc" = (/obj/structure/undies_wardrobe,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/skipjack_station) "Jd" = (/obj/structure/toilet,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/skipjack_station) "Je" = (/obj/structure/table/rack,/obj/item/clothing/suit/space/vox/carapace,/obj/item/clothing/suit/space/vox/carapace,/obj/item/clothing/head/helmet/space/vox/carapace,/obj/item/clothing/head/helmet/space/vox/carapace,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) -"Jf" = (/obj/item/weapon/gun/energy/sonic,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) +"Jf" = (/obj/item/gun/energy/sonic,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) "Jg" = (/obj/structure/closet/crate,/obj/item/clothing/under/vox/vox_casual,/obj/item/clothing/under/vox/vox_casual,/obj/item/clothing/under/vox/vox_casual,/obj/item/clothing/under/vox/vox_robes,/obj/item/clothing/under/vox/vox_robes,/obj/item/clothing/under/vox/vox_robes,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) "Jh" = (/obj/structure/closet/crate,/obj/item/clothing/accessory/storage/vox,/obj/item/clothing/accessory/storage/vox,/obj/item/clothing/accessory/storage/vox,/obj/item/clothing/accessory/storage/vox,/obj/item/clothing/accessory/storage/vox,/obj/item/clothing/accessory/storage/vox,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) "Ji" = (/obj/structure/closet/crate,/obj/item/clothing/gloves/vox,/obj/item/clothing/gloves/vox,/obj/item/clothing/gloves/vox,/obj/item/clothing/gloves/vox,/obj/item/clothing/gloves/vox,/obj/item/clothing/gloves/vox,/obj/item/clothing/shoes/magboots/vox,/obj/item/clothing/shoes/magboots/vox,/obj/item/clothing/shoes/magboots/vox,/obj/item/clothing/shoes/magboots/vox,/obj/item/clothing/shoes/magboots/vox,/obj/item/clothing/shoes/magboots/vox,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) -"Jj" = (/obj/item/weapon/gun/launcher/spikethrower,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) +"Jj" = (/obj/item/gun/launcher/spikethrower,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) "Jk" = (/obj/structure/table/rack,/obj/item/clothing/suit/space/vox/stealth,/obj/item/clothing/suit/space/vox/stealth,/obj/item/clothing/head/helmet/space/vox/stealth,/obj/item/clothing/head/helmet/space/vox/stealth,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) "Jl" = (/obj/structure/table/rack,/obj/item/clothing/suit/storage/vest/heavy/merc{pixel_x = 2; pixel_y = 2},/obj/item/clothing/suit/storage/vest/heavy/merc{pixel_x = -2; pixel_y = -2},/obj/item/clothing/suit/storage/vest/heavy/merc,/obj/item/clothing/suit/storage/vest/heavy/merc,/obj/item/clothing/suit/storage/vest/heavy/merc,/obj/item/clothing/suit/storage/vest/heavy/merc,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "Jm" = (/obj/effect/landmark{name = "Syndicate-Commando"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/elite_squad) @@ -1841,20 +1841,20 @@ "Ju" = (/obj/effect/decal/cleanable/blood,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/skipjack_station) "Jv" = (/obj/structure/table/rack,/obj/item/clothing/suit/space/vox/medic,/obj/item/clothing/suit/space/vox/medic,/obj/item/clothing/head/helmet/space/vox/medic,/obj/item/clothing/head/helmet/space/vox/medic,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) "Jw" = (/obj/item/clothing/glasses/night/vox,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) -"Jx" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/darkmatter,/obj/item/weapon/gun/energy/darkmatter,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) +"Jx" = (/obj/structure/table/rack,/obj/item/gun/energy/darkmatter,/obj/item/gun/energy/darkmatter,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) "Jy" = (/obj/machinery/door/airlock/centcom{name = "Storage"; opacity = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "Jz" = (/obj/machinery/door/airlock/centcom{icon_state = "door_locked"; locked = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"JA" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/orange,/turf/unsimulated/floor{icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood_broken1"},/area/skipjack_station) +"JA" = (/obj/structure/bed/padded,/obj/item/bedsheet/orange,/turf/unsimulated/floor{icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood_broken1"},/area/skipjack_station) "JB" = (/obj/structure/table/standard,/turf/unsimulated/floor{icon_state = "wood"},/area/skipjack_station) -"JC" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/brown,/turf/unsimulated/floor{icon_state = "wood"},/area/skipjack_station) -"JD" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/green,/turf/unsimulated/floor{icon_state = "wood"},/area/skipjack_station) +"JC" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/turf/unsimulated/floor{icon_state = "wood"},/area/skipjack_station) +"JD" = (/obj/structure/bed/padded,/obj/item/bedsheet/green,/turf/unsimulated/floor{icon_state = "wood"},/area/skipjack_station) "JE" = (/obj/structure/table/standard,/obj/effect/decal/cleanable/cobweb2,/turf/unsimulated/floor{icon_state = "wood"},/area/skipjack_station) "JF" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/unsimulated/floor{icon_state = "white"},/area/skipjack_station) "JG" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{dir = 4; pixel_x = -28; pixel_y = 0},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/skipjack_station) "JH" = (/obj/machinery/shower{dir = 1},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/skipjack_station) "JI" = (/obj/structure/table/rack,/obj/item/clothing/suit/space/vox/pressure,/obj/item/clothing/suit/space/vox/pressure,/obj/item/clothing/head/helmet/space/vox/pressure,/obj/item/clothing/head/helmet/space/vox/pressure,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) -"JJ" = (/obj/item/weapon/gun/energy/plasmastun,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) -"JK" = (/obj/item/weapon/gun/launcher/crossbow,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) +"JJ" = (/obj/item/gun/energy/plasmastun,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) +"JK" = (/obj/item/gun/launcher/crossbow,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) "JL" = (/obj/fiftyspawner/rods,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) "JM" = (/obj/item/clothing/mask/gas/swat/vox,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) "JN" = (/obj/structure/table/rack,/obj/item/clothing/mask/gas/swat/vox,/obj/item/clothing/mask/gas/swat/vox,/obj/item/clothing/mask/gas/swat/vox,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) @@ -1876,7 +1876,7 @@ "Kd" = (/turf/unsimulated/wall{desc = "That looks like it doesn't open easily."; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/skipjack_station) "Ke" = (/obj/effect/landmark{name = "Syndicate-Uplink"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "Kf" = (/obj/machinery/door/airlock/centcom{name = "Armory"; opacity = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"Kg" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/glasses/square{pixel_x = 1; pixel_y = 4},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_station) +"Kg" = (/obj/structure/table/standard,/obj/item/storage/box/glasses/square{pixel_x = 1; pixel_y = 4},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_station) "Kh" = (/obj/structure/table/reinforced,/obj/machinery/microwave{pixel_x = -1; pixel_y = 8},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_station) "Ki" = (/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_station) "Kj" = (/obj/machinery/door/airlock{name = "Unit 2"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_station) @@ -1888,10 +1888,10 @@ "Kp" = (/obj/machinery/door/airlock/hatch{req_access = list(150)},/turf/unsimulated/floor{icon_state = "steel_dirty"},/area/skipjack_station) "Kq" = (/turf/unsimulated/floor{icon_state = "steel_dirty"},/area/skipjack_station) "Kr" = (/obj/item/xenos_claw,/obj/item/organ/internal/brain/vox,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) -"Ks" = (/obj/item/weapon/ore,/turf/unsimulated/floor{name = "plating"; icon_state = "asteroid_dug"},/area/skipjack_station) +"Ks" = (/obj/item/ore,/turf/unsimulated/floor{name = "plating"; icon_state = "asteroid_dug"},/area/skipjack_station) "Kt" = (/obj/effect/landmark{name = "Nuclear-Bomb"},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/syndicate_station) -"Ku" = (/obj/structure/table/reinforced,/obj/item/weapon/tray{pixel_y = 5},/obj/effect/landmark{name = "Nuclear-Code"},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_station) -"Kv" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_station) +"Ku" = (/obj/structure/table/reinforced,/obj/item/tray{pixel_y = 5},/obj/effect/landmark{name = "Nuclear-Code"},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_station) +"Kv" = (/obj/structure/table/reinforced,/obj/item/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_station) "Kw" = (/obj/structure/mirror{dir = 4; pixel_x = -32; pixel_y = 0},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_station) "Kx" = (/turf/simulated/shuttle/wall/dark/hard_corner,/area/shuttle/syndicate_elite/mothership) "Ky" = (/obj/machinery/door/airlock/external{name = "Shuttle Airlock"; req_access = list(150)},/obj/machinery/door/blast/regular{icon_state = "pdoor1"; id = "syndicate_elite"; name = "Front Hull Door"; opacity = 1},/turf/simulated/shuttle/plating,/area/shuttle/syndicate_elite/mothership) @@ -1900,28 +1900,28 @@ "KB" = (/obj/machinery/door/airlock/hatch{req_access = list(150)},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) "KC" = (/obj/structure/table/rack,/obj/item/clothing/glasses/thermal/plain/monocle,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) "KD" = (/obj/structure/table/rack,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) -"KE" = (/obj/structure/table/rack,/obj/item/weapon/gun/launcher/spikethrower,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) +"KE" = (/obj/structure/table/rack,/obj/item/gun/launcher/spikethrower,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) "KF" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "KG" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"KH" = (/obj/structure/table/rack,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/weapon/tank/jetpack/oxygen,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"KI" = (/obj/structure/table/rack,/obj/item/weapon/tank/jetpack/carbondioxide,/obj/item/weapon/tank/jetpack/carbondioxide,/obj/item/weapon/tank/jetpack/carbondioxide,/obj/item/weapon/tank/jetpack/carbondioxide,/obj/item/weapon/tank/jetpack/carbondioxide,/obj/item/weapon/tank/jetpack/carbondioxide,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"KH" = (/obj/structure/table/rack,/obj/item/tank/jetpack/oxygen,/obj/item/tank/jetpack/oxygen,/obj/item/tank/jetpack/oxygen,/obj/item/tank/jetpack/oxygen,/obj/item/tank/jetpack/oxygen,/obj/item/tank/jetpack/oxygen,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"KI" = (/obj/structure/table/rack,/obj/item/tank/jetpack/carbondioxide,/obj/item/tank/jetpack/carbondioxide,/obj/item/tank/jetpack/carbondioxide,/obj/item/tank/jetpack/carbondioxide,/obj/item/tank/jetpack/carbondioxide,/obj/item/tank/jetpack/carbondioxide,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "KJ" = (/obj/structure/closet/secure_closet/freezer/kitchen{req_access = list(150)},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_station) -"KK" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka{pixel_x = 3; pixel_y = 12},/obj/item/weapon/reagent_containers/food/drinks/bottle/wine{pixel_x = -1; pixel_y = 8},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_station) -"KL" = (/obj/structure/table/standard,/obj/item/weapon/towel{color = "#ff0000"; name = "red towel"},/obj/item/weapon/towel{color = "#ff0000"; name = "red towel"},/obj/item/weapon/towel{color = "#ff0000"; name = "red towel"},/obj/item/weapon/towel{color = "#ff0000"; name = "red towel"},/obj/item/weapon/towel{color = "#ff0000"; name = "red towel"},/obj/item/weapon/soap/syndie,/obj/item/weapon/soap/syndie,/turf/simulated/floor/tiled/freezer,/area/syndicate_station) +"KK" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/drinks/bottle/vodka{pixel_x = 3; pixel_y = 12},/obj/item/reagent_containers/food/drinks/bottle/wine{pixel_x = -1; pixel_y = 8},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_station) +"KL" = (/obj/structure/table/standard,/obj/item/towel{color = "#ff0000"; name = "red towel"},/obj/item/towel{color = "#ff0000"; name = "red towel"},/obj/item/towel{color = "#ff0000"; name = "red towel"},/obj/item/towel{color = "#ff0000"; name = "red towel"},/obj/item/towel{color = "#ff0000"; name = "red towel"},/obj/item/soap/syndie,/obj/item/soap/syndie,/turf/simulated/floor/tiled/freezer,/area/syndicate_station) "KM" = (/obj/machinery/door/airlock{name = "Unit 1"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_station) "KN" = (/obj/structure/toilet{dir = 8},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_station) "KO" = (/turf/simulated/floor/airless,/area/shuttle/syndicate_elite/mothership) -"KP" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/blue,/turf/unsimulated/floor{icon_state = "wood"},/area/skipjack_station) -"KQ" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/orange,/turf/unsimulated/floor{icon_state = "wood"},/area/skipjack_station) -"KR" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/hop,/turf/unsimulated/floor{icon_state = "wood"},/area/skipjack_station) -"KS" = (/obj/item/weapon/ore,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) +"KP" = (/obj/structure/bed/padded,/obj/item/bedsheet/blue,/turf/unsimulated/floor{icon_state = "wood"},/area/skipjack_station) +"KQ" = (/obj/structure/bed/padded,/obj/item/bedsheet/orange,/turf/unsimulated/floor{icon_state = "wood"},/area/skipjack_station) +"KR" = (/obj/structure/bed/padded,/obj/item/bedsheet/hop,/turf/unsimulated/floor{icon_state = "wood"},/area/skipjack_station) +"KS" = (/obj/item/ore,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) "KT" = (/obj/item/clothing/head/xenos,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) "KU" = (/obj/machinery/door/airlock/centcom{name = "Suit Storage"; opacity = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "KV" = (/obj/machinery/door/airlock/centcom{name = "Kitchen"; opacity = 1; req_access = list(150)},/turf/unsimulated/floor{icon_state = "white"},/area/syndicate_station) "KW" = (/obj/machinery/door/airlock{name = "Restroom"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_station) "KX" = (/obj/effect/wingrille_spawn/reinforced,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/skipjack_station) "KY" = (/obj/machinery/door/airlock/hatch{req_access = list(150)},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/skipjack_station) -"KZ" = (/obj/item/weapon/storage/box,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) +"KZ" = (/obj/item/storage/box,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) "La" = (/obj/item/clothing/mask/gas/swat{desc = "A close-fitting mask clearly not made for a human face."; name = "\improper alien mask"},/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) "Lb" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/merc,/obj/item/clothing/mask/gas/syndicate,/obj/item/clothing/head/helmet/space/void/merc,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "Lc" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/syndicate/black/green,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/syndicate/black/green,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) @@ -1929,24 +1929,24 @@ "Le" = (/obj/structure/sign/scenery/map/left{pixel_y = 32},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_station) "Lf" = (/obj/structure/sign/scenery/map/right{pixel_y = 32},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_station) "Lg" = (/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_station) -"Lh" = (/obj/item/weapon/storage/box/syndie_kit/clerical,/obj/structure/table/standard,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_station) +"Lh" = (/obj/item/storage/box/syndie_kit/clerical,/obj/structure/table/standard,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_station) "Li" = (/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_station) -"Lj" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/hos,/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_station) +"Lj" = (/obj/structure/bed/padded,/obj/item/bedsheet/hos,/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_station) "Lk" = (/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/skipjack_station) "Ll" = (/obj/effect/decal/cleanable/cobweb2,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/skipjack_station) "Lm" = (/obj/machinery/suit_cycler/syndicate{locked = 0},/turf/unsimulated/floor{icon_state = "steel"},/area/skipjack_station) "Ln" = (/obj/effect/decal/cleanable/cobweb2{icon_state = "spiderling"; name = "dead spider"},/turf/unsimulated/floor{icon_state = "steel_dirty"},/area/skipjack_station) -"Lo" = (/obj/structure/table/rack,/obj/item/weapon/tank/vox,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) +"Lo" = (/obj/structure/table/rack,/obj/item/tank/vox,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) "Lp" = (/obj/item/pizzabox/meat,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) -"Lq" = (/obj/structure/table/rack,/obj/item/weapon/storage/briefcase/inflatable,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"Lq" = (/obj/structure/table/rack,/obj/item/storage/briefcase/inflatable,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "Lr" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/syndicate/black/blue,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/syndicate/black/blue,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "Ls" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/syndicate/black/med,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/syndicate/black/med,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "Lt" = (/obj/machinery/computer/communications{dir = 4},/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "Lu" = (/obj/structure/bed/chair/comfy/black,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_station) "Lv" = (/obj/effect/landmark{name = "Syndicate-Spawn"},/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_station) -"Lw" = (/obj/structure/table/standard,/obj/item/device/radio/headset/syndicate/alt,/obj/item/device/radio/headset/syndicate/alt,/obj/item/device/radio/headset/syndicate/alt,/obj/item/device/radio/headset/syndicate/alt,/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_station) +"Lw" = (/obj/structure/table/standard,/obj/item/radio/headset/syndicate/alt,/obj/item/radio/headset/syndicate/alt,/obj/item/radio/headset/syndicate/alt,/obj/item/radio/headset/syndicate/alt,/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_station) "Lx" = (/obj/structure/bed/chair,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/skipjack_station) -"Ly" = (/obj/item/weapon/tank/vox,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) +"Ly" = (/obj/item/tank/vox,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) "Lz" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/syndicate/black/orange,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/syndicate/black/orange,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "LA" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/syndicate/black/engie,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/syndicate/black/engie,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "LB" = (/obj/machinery/computer/shuttle{dir = 4},/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) @@ -1955,27 +1955,27 @@ "LE" = (/obj/structure/table/glass,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_station) "LF" = (/obj/structure/bed/chair/comfy/black{dir = 8},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_station) "LG" = (/obj/machinery/door/airlock/centcom{name = "Barracks"; opacity = 1; req_access = list(150)},/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_station) -"LH" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp{pixel_x = 4; pixel_y = 8},/obj/item/clothing/glasses/sunglasses/prescription,/obj/item/clothing/glasses/sunglasses/prescription,/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_station) +"LH" = (/obj/structure/table/standard,/obj/item/flashlight/lamp{pixel_x = 4; pixel_y = 8},/obj/item/clothing/glasses/sunglasses/prescription,/obj/item/clothing/glasses/sunglasses/prescription,/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_station) "LI" = (/obj/structure/bed/chair{dir = 4},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/skipjack_station) -"LJ" = (/obj/structure/table/steel,/obj/item/device/pda/syndicate,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/skipjack_station) +"LJ" = (/obj/structure/table/steel,/obj/item/pda/syndicate,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/skipjack_station) "LK" = (/obj/structure/bed/chair{dir = 8},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/skipjack_station) -"LL" = (/obj/machinery/portable_atmospherics/canister/phoron,/obj/item/weapon/tank/vox,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) +"LL" = (/obj/machinery/portable_atmospherics/canister/phoron,/obj/item/tank/vox,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) "LM" = (/obj/item/clothing/head/philosopher_wig,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) "LN" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "LO" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/syndicate/black/red,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/syndicate/black/red,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "LP" = (/obj/structure/table/rack,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/syndicate/black,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/syndicate/black,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"LQ" = (/obj/structure/table/glass,/obj/item/device/paicard,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"LR" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/weapon/pen{pixel_y = 4},/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_station) -"LS" = (/obj/structure/table/steel,/obj/item/device/radio/uplink,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/skipjack_station) -"LT" = (/obj/item/weapon/gun/launcher/pneumatic,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) +"LQ" = (/obj/structure/table/glass,/obj/item/paicard,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"LR" = (/obj/structure/table/standard,/obj/item/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/pen{pixel_y = 4},/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_station) +"LS" = (/obj/structure/table/steel,/obj/item/radio/uplink,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/skipjack_station) +"LT" = (/obj/item/gun/launcher/pneumatic,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) "LU" = (/obj/structure/bed/chair/comfy/black{dir = 1},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/syndicate_station) -"LV" = (/obj/structure/table/standard,/obj/item/device/pda/syndicate,/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_station) -"LW" = (/obj/item/weapon/storage/box/syndie_kit/spy,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/skipjack_station) +"LV" = (/obj/structure/table/standard,/obj/item/pda/syndicate,/turf/unsimulated/floor{icon_state = "lino"},/area/syndicate_station) +"LW" = (/obj/item/storage/box/syndie_kit/spy,/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/skipjack_station) "LX" = (/obj/structure/bed/chair{dir = 1},/turf/unsimulated/floor{name = "plating"; icon_state = "cult"},/area/skipjack_station) "LY" = (/obj/structure/ore_box,/turf/unsimulated/floor{icon_state = "asteroid"},/area/skipjack_station) -"LZ" = (/obj/structure/table/rack,/obj/item/device/suit_cooling_unit,/obj/item/device/suit_cooling_unit,/obj/item/device/suit_cooling_unit,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"Ma" = (/obj/structure/table/rack,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"Mb" = (/obj/structure/table/rack,/obj/item/weapon/rig/merc/empty,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"LZ" = (/obj/structure/table/rack,/obj/item/suit_cooling_unit,/obj/item/suit_cooling_unit,/obj/item/suit_cooling_unit,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"Ma" = (/obj/structure/table/rack,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/obj/item/tank/emergency/oxygen/double,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"Mb" = (/obj/structure/table/rack,/obj/item/rig/merc/empty,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "Mc" = (/obj/machinery/suit_cycler/syndicate{locked = 0},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "Md" = (/obj/structure/lattice,/obj/structure/window/reinforced{dir = 4},/turf/space,/area/space) "Me" = (/obj/machinery/door/airlock/external{req_access = list(150)},/turf/unsimulated/floor{icon_state = "steel"},/area/skipjack_station) @@ -2014,14 +2014,14 @@ "ML" = (/obj/machinery/computer/power_monitor{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "MM" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{frequency = 1331; id_tag = "vox_east_vent"},/turf/simulated/shuttle/plating,/area/skipjack_station/start) "MN" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 6},/turf/simulated/shuttle/wall/voidcraft/red,/area/syndicate_station/start) -"MO" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/machinery/computer/station_alert/all{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) +"MO" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/machinery/computer/station_alert/all{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) "MP" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; frequency = 1331; id_tag = "merc_shuttle_pump"},/obj/machinery/airlock_sensor{frequency = 1331; id_tag = "merc_shuttle_sensor"; pixel_x = 28; pixel_y = 8},/obj/machinery/embedded_controller/radio/airlock/docking_port{frequency = 1331; id_tag = "merc_shuttle"; pixel_x = 24; pixel_y = -2; req_access = list(150)},/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) "MQ" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/turf/simulated/shuttle/wall/voidcraft/red,/area/syndicate_station/start) "MR" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 10},/turf/simulated/shuttle/wall/voidcraft/red,/area/syndicate_station/start) "MS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/syndicate_station/start) "MT" = (/obj/machinery/atmospherics/pipe/tank/air,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "MU" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) -"MV" = (/obj/machinery/recharger/wallcharger{pixel_x = -25},/obj/structure/table/steel,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/item/weapon/plastique,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) +"MV" = (/obj/machinery/recharger/wallcharger{pixel_x = -25},/obj/structure/table/steel,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "MW" = (/obj/machinery/light{dir = 4},/obj/structure/table/rack,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "MX" = (/obj/effect/shuttle_landmark/southern_cross/transport1_offsite,/turf/simulated/shuttle/floor,/area/shuttle/transport1/centcom) "MY" = (/obj/machinery/atmospherics/pipe/manifold/visible{dir = 8},/obj/machinery/meter,/turf/simulated/shuttle/plating,/area/skipjack_station/start) @@ -2042,7 +2042,7 @@ "Nn" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "No" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/machinery/meter,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "Np" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 9},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) -"Nq" = (/obj/machinery/recharger/wallcharger{pixel_x = -25},/obj/structure/table/steel,/obj/item/weapon/storage/box/frags,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) +"Nq" = (/obj/machinery/recharger/wallcharger{pixel_x = -25},/obj/structure/table/steel,/obj/item/storage/box/frags,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "Nr" = (/obj/machinery/door/airlock/hatch{frequency = 1331; icon_state = "door_closed"; id_tag = "vox_southwest_lock"; locked = 0; req_access = list(150)},/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Ns" = (/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) "Nt" = (/obj/machinery/light/small{dir = 8},/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) @@ -2054,24 +2054,24 @@ "Nz" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 5},/turf/simulated/shuttle/wall/voidcraft/red,/area/syndicate_station/start) "NA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced/full,/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/turf/simulated/shuttle/plating,/area/syndicate_station/start) "NB" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 9},/turf/simulated/shuttle/wall/voidcraft/red,/area/syndicate_station/start) -"NC" = (/obj/structure/table/steel,/obj/effect/spawner/newbomb/timer/syndicate,/obj/item/weapon/tool/screwdriver,/obj/item/device/assembly/signaler{pixel_y = 2},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) -"ND" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) +"NC" = (/obj/structure/table/steel,/obj/effect/spawner/newbomb/timer/syndicate,/obj/item/tool/screwdriver,/obj/item/assembly/signaler{pixel_y = 2},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) +"ND" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "NE" = (/obj/machinery/light/small{dir = 8},/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) "NF" = (/obj/structure/frame/computer,/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) "NG" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/merchant/home) "NH" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1331; master_tag = "vox_west_control"; pixel_x = -22; req_one_access = list(150)},/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"NI" = (/obj/structure/table/rack,/obj/item/weapon/material/harpoon,/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/random/rigsuit,/obj/random/multiple/voidsuit,/obj/random/multiple/voidsuit,/obj/random/energy,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"NI" = (/obj/structure/table/rack,/obj/item/material/harpoon,/obj/item/tank/oxygen,/obj/item/tank/oxygen,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/random/rigsuit,/obj/random/multiple/voidsuit,/obj/random/multiple/voidsuit,/obj/random/energy,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "NJ" = (/obj/structure/table/rack,/obj/random/rigsuit,/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) -"NK" = (/obj/structure/table/rack,/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/random/multiple/voidsuit,/obj/random/multiple/voidsuit,/obj/random/energy,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"NK" = (/obj/structure/table/rack,/obj/item/tank/oxygen,/obj/item/tank/oxygen,/obj/random/multiple/voidsuit,/obj/random/multiple/voidsuit,/obj/random/energy,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "NL" = (/obj/structure/table/rack,/obj/item/clothing/mask/breath,/obj/machinery/light/small{dir = 8},/obj/random/multiple/voidsuit,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "NM" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1331; master_tag = "vox_east_control"; pixel_x = 22; req_access = list(150)},/turf/simulated/shuttle/plating,/area/skipjack_station/start) "NN" = (/obj/structure/frame/computer,/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "NO" = (/obj/machinery/computer/security/nuclear,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "NP" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) -"NQ" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/security/tactical/bandolier,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) -"NR" = (/obj/structure/table/steel,/obj/item/weapon/storage/toolbox/syndicate/powertools,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) -"NS" = (/obj/structure/table/steel,/obj/item/weapon/gun/projectile/pistol,/obj/item/ammo_magazine/m9mm,/obj/item/weapon/gun/projectile/pistol,/obj/item/ammo_magazine/m9mm,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) -"NT" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/security,/obj/item/weapon/storage/belt/security,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) +"NQ" = (/obj/structure/table/rack,/obj/item/storage/belt/security/tactical/bandolier,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) +"NR" = (/obj/structure/table/steel,/obj/item/storage/toolbox/syndicate/powertools,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) +"NS" = (/obj/structure/table/steel,/obj/item/gun/projectile/pistol,/obj/item/ammo_magazine/m9mm,/obj/item/gun/projectile/pistol,/obj/item/ammo_magazine/m9mm,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) +"NT" = (/obj/structure/table/rack,/obj/item/storage/belt/security,/obj/item/storage/belt/security,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "NU" = (/obj/machinery/suit_cycler/syndicate{locked = 0},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "NV" = (/obj/machinery/light,/obj/structure/closet/syndicate/suit{name = "suit closet"},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "NW" = (/obj/machinery/light,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) @@ -2082,12 +2082,12 @@ "Ob" = (/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Oc" = (/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Od" = (/obj/machinery/microwave{pixel_x = -1; pixel_y = 8},/obj/structure/table/steel,/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"Oe" = (/obj/item/seeds/potatoseed,/obj/item/seeds/potatoseed,/obj/item/seeds/ambrosiavulgarisseed,/obj/item/weapon/material/minihoe,/obj/item/weapon/beartrap,/obj/structure/table/steel,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"Oe" = (/obj/item/seeds/potatoseed,/obj/item/seeds/potatoseed,/obj/item/seeds/ambrosiavulgarisseed,/obj/item/material/minihoe,/obj/item/beartrap,/obj/structure/table/steel,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Of" = (/obj/machinery/vending/hydroseeds,/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"Og" = (/obj/structure/table/rack,/obj/item/weapon/melee/energy/sword/pirate,/obj/item/clothing/suit/space/pirate,/obj/item/clothing/suit/space/pirate,/obj/item/weapon/tank/oxygen,/obj/item/weapon/pinpointer/shuttle/heist,/obj/item/weapon/pinpointer/shuttle/heist,/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) -"Oh" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/utility/full,/obj/item/weapon/storage/belt/utility/full,/obj/item/device/multitool,/obj/item/device/multitool,/obj/item/clothing/shoes/magboots,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"Og" = (/obj/structure/table/rack,/obj/item/melee/energy/sword/pirate,/obj/item/clothing/suit/space/pirate,/obj/item/clothing/suit/space/pirate,/obj/item/tank/oxygen,/obj/item/pinpointer/shuttle/heist,/obj/item/pinpointer/shuttle/heist,/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) +"Oh" = (/obj/structure/table/rack,/obj/item/storage/belt/utility/full,/obj/item/storage/belt/utility/full,/obj/item/multitool,/obj/item/multitool,/obj/item/clothing/shoes/magboots,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Oi" = (/obj/machinery/washing_machine,/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"Oj" = (/obj/structure/table/standard,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter/zippo,/obj/item/clothing/gloves/yellow,/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/weapon/card/emag,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"Oj" = (/obj/structure/table/standard,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter/zippo,/obj/item/clothing/gloves/yellow,/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/card/emag,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Ok" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "syndieshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/syndicate_station/start) "Ol" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{id = "syndieshutters"; name = "remote shutter control"; req_access = list(150)},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "Om" = (/obj/structure/bed/chair/comfy/red{icon_state = "comfychair_preview"; dir = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) @@ -2096,7 +2096,7 @@ "Op" = (/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) "Oq" = (/obj/machinery/light{dir = 4},/obj/structure/bed/chair/comfy/red{icon_state = "comfychair_preview"; dir = 8},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "Or" = (/obj/machinery/door/airlock/voidcraft{req_access = list(150)},/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) -"Os" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) +"Os" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "Ot" = (/obj/machinery/teleport/hub,/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) "Ou" = (/obj/structure/table/rack,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/obj/item/clothing/gloves/yellow,/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) "Ov" = (/obj/structure/table/rack,/obj/item/clothing/glasses/night,/obj/item/clothing/glasses/night,/obj/item/clothing/glasses/night,/obj/item/clothing/glasses/night,/obj/item/clothing/glasses/night,/obj/item/clothing/glasses/night,/obj/machinery/light/small{dir = 1},/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) @@ -2116,7 +2116,7 @@ "OJ" = (/obj/structure/bed/chair/comfy/red{icon_state = "comfychair_preview"; dir = 8},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "OK" = (/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "OL" = (/obj/machinery/turretid{pixel_x = 0; pixel_y = 32; req_access = list(150)},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) -"OM" = (/obj/structure/table/rack,/obj/item/device/aicard,/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) +"OM" = (/obj/structure/table/rack,/obj/item/aicard,/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) "ON" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; tiles = 0},/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/space,/area/space) "OO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/blast/regular{id = "skipjackshutters"; name = "Skipjack Blast Shielding"},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "OP" = (/obj/item/robot_parts/l_leg,/turf/simulated/shuttle/plating,/area/skipjack_station/start) @@ -2129,16 +2129,16 @@ "OW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/blast/regular{id = "skipjackshutters"; name = "Skipjack Blast Shielding"},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "OX" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "OY" = (/obj/machinery/floodlight,/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"OZ" = (/obj/item/device/suit_cooling_unit,/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"Pa" = (/obj/structure/table/rack,/obj/item/weapon/gun/launcher/crossbow,/obj/item/stack/rods{amount = 10},/obj/machinery/light/small{dir = 8},/obj/item/weapon/beartrap,/obj/item/weapon/beartrap,/obj/item/weapon/beartrap,/obj/item/weapon/beartrap,/obj/item/weapon/beartrap,/obj/item/weapon/beartrap,/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) -"Pb" = (/obj/structure/table/rack,/obj/item/weapon/grenade/empgrenade,/obj/item/weapon/grenade/flashbang,/obj/item/weapon/grenade/spawnergrenade/manhacks,/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) +"OZ" = (/obj/item/suit_cooling_unit,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"Pa" = (/obj/structure/table/rack,/obj/item/gun/launcher/crossbow,/obj/item/stack/rods{amount = 10},/obj/machinery/light/small{dir = 8},/obj/item/beartrap,/obj/item/beartrap,/obj/item/beartrap,/obj/item/beartrap,/obj/item/beartrap,/obj/item/beartrap,/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) +"Pb" = (/obj/structure/table/rack,/obj/item/grenade/empgrenade,/obj/item/grenade/flashbang,/obj/item/grenade/spawnergrenade/manhacks,/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) "Pc" = (/obj/structure/table/steel,/obj/machinery/recharger,/obj/machinery/light/small{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) "Pd" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) "Pe" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Pf" = (/obj/item/robot_parts/robot_suit,/obj/item/robot_parts/r_leg,/obj/item/robot_parts/r_arm,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Pg" = (/obj/structure/flight_left{icon_state = "left"; dir = 8},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) -"Ph" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) -"Pi" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) +"Ph" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) +"Pi" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) "Pj" = (/obj/machinery/recharge_station,/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) "Pk" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/blast/regular{id = "skipjackshutters"; name = "Skipjack Blast Shielding"},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Pl" = (/obj/machinery/door/airlock/hatch{req_access = list(150)},/turf/simulated/shuttle/floor/black,/area/skipjack_station/start) @@ -2147,16 +2147,16 @@ "Po" = (/obj/structure/table/steel,/obj/item/clothing/glasses/regular,/obj/item/clothing/glasses/regular,/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) "Pp" = (/obj/machinery/door/airlock/hatch{req_access = list(150)},/turf/simulated/shuttle/floor/white,/area/skipjack_station/start) "Pq" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"Pr" = (/obj/item/weapon/tool/wrench,/obj/item/weapon/mop,/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"Ps" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/item/weapon/tool/crowbar,/obj/item/device/suit_cooling_unit,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"Pr" = (/obj/item/tool/wrench,/obj/item/mop,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"Ps" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/item/tool/crowbar,/obj/item/suit_cooling_unit,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Pt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "syndieshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/syndicate_station/start) "Pu" = (/obj/structure/table/steel_reinforced,/obj/machinery/recharger,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "Pv" = (/obj/structure/bed/chair/comfy/red,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) -"Pw" = (/obj/machinery/vending/assist{contraband = null; name = "AntagCorpVend"; products = list(/obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/signaler = 4, /obj/item/device/assembly/infra = 4, /obj/item/device/assembly/prox_sensor = 4, /obj/item/weapon/handcuffs = 8, /obj/item/device/flash = 4, /obj/item/weapon/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4)},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) +"Pw" = (/obj/machinery/vending/assist{contraband = null; name = "AntagCorpVend"; products = list(/obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, /obj/item/assembly/infra = 4, /obj/item/assembly/prox_sensor = 4, /obj/item/handcuffs = 8, /obj/item/flash = 4, /obj/item/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4)},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "Px" = (/obj/machinery/atmospherics/unary/cryo_cell,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) -"Py" = (/obj/structure/table/rack,/obj/item/weapon/storage/toolbox/syndicate{pixel_x = -1; pixel_y = 3},/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) -"Pz" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/utility/full,/obj/item/device/multitool,/obj/machinery/light/small,/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) -"PA" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/utility/full,/obj/item/device/multitool,/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) +"Py" = (/obj/structure/table/rack,/obj/item/storage/toolbox/syndicate{pixel_x = -1; pixel_y = 3},/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) +"Pz" = (/obj/structure/table/rack,/obj/item/storage/belt/utility/full,/obj/item/multitool,/obj/machinery/light/small,/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) +"PA" = (/obj/structure/table/rack,/obj/item/storage/belt/utility/full,/obj/item/multitool,/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) "PB" = (/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/pipe/tank/air{dir = 1; start_pressure = 740},/turf/simulated/shuttle/plating,/area/skipjack_station/start) "PC" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "PD" = (/turf/simulated/shuttle/floor/black,/area/skipjack_station/start) @@ -2164,22 +2164,22 @@ "PF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/blast/regular{id = "skipjackshutters"; name = "Skipjack Blast Shielding"},/turf/simulated/shuttle/plating,/area/skipjack_station/start) "PG" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) "PH" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) -"PI" = (/obj/structure/table/steel,/obj/item/weapon/deck/cards,/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) +"PI" = (/obj/structure/table/steel,/obj/item/deck/cards,/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) "PJ" = (/obj/machinery/bodyscanner{dir = 8},/turf/simulated/shuttle/floor/white,/area/skipjack_station/start) "PK" = (/obj/machinery/light/small{dir = 1},/obj/machinery/body_scanconsole,/turf/simulated/shuttle/floor/white,/area/skipjack_station/start) "PL" = (/turf/simulated/shuttle/floor/white,/area/skipjack_station/start) "PM" = (/obj/structure/toilet{dir = 4},/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"PN" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/item/weapon/tank/nitrogen,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"PN" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/item/tank/nitrogen,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "PO" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/pipe/tank/air{dir = 1; start_pressure = 740},/turf/simulated/shuttle/plating,/area/skipjack_station/start) "PP" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/machinery/computer/station_alert{dir = 4},/turf/simulated/shuttle/floor/voidcraft/light,/area/ninja_dojo/start) "PQ" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/computer/security{dir = 8},/turf/simulated/shuttle/floor/voidcraft/light,/area/ninja_dojo/start) "PR" = (/obj/structure/closet/crate/freezer/rations,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "PS" = (/obj/item/trash/cigbutt,/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) "PT" = (/obj/machinery/light/small{dir = 1},/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) -"PU" = (/obj/machinery/light{dir = 1},/obj/structure/table/steel,/obj/item/roller,/obj/item/roller,/obj/item/roller,/obj/item/device/defib_kit/compact/combat/loaded,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) -"PV" = (/obj/structure/closet/secure_closet/medical_wall{pixel_y = 32; req_access = list(150)},/obj/item/bodybag,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = -4; pixel_y = 8},/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{pixel_x = 4; pixel_y = 7},/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/storage/firstaid/combat,/obj/item/weapon/storage/firstaid/clotting,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) +"PU" = (/obj/machinery/light{dir = 1},/obj/structure/table/steel,/obj/item/roller,/obj/item/roller,/obj/item/roller,/obj/item/defib_kit/compact/combat/loaded,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) +"PV" = (/obj/structure/closet/secure_closet/medical_wall{pixel_y = 32; req_access = list(150)},/obj/item/bodybag,/obj/item/reagent_containers/syringe/antiviral,/obj/item/reagent_containers/syringe/antiviral,/obj/item/reagent_containers/syringe/antiviral,/obj/item/reagent_containers/glass/bottle/antitoxin{pixel_x = -4; pixel_y = 8},/obj/item/reagent_containers/glass/bottle/inaprovaline{pixel_x = 4; pixel_y = 7},/obj/item/reagent_containers/syringe,/obj/item/storage/firstaid/combat,/obj/item/storage/firstaid/clotting,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) "PW" = (/obj/machinery/atmospherics/pipe/manifold/visible{icon_state = "map"; dir = 8},/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) -"PX" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 9},/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) +"PX" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 9},/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) "PY" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating/airless,/area/skipjack_station/start) "PZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/blast/regular{id = "skipjackshutters"; name = "Skipjack Blast Shielding"},/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Qa" = (/obj/structure/table/steel,/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) @@ -2189,61 +2189,61 @@ "Qe" = (/obj/machinery/sleeper{dir = 8},/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) "Qf" = (/obj/machinery/sleep_console,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) "Qg" = (/obj/machinery/atmospherics/portables_connector{icon_state = "map_connector"; dir = 4},/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) -"Qh" = (/obj/structure/table/steel,/obj/item/weapon/storage/firstaid/o2{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/firstaid/regular,/obj/machinery/atmospherics/pipe/manifold/visible,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/adv,/obj/item/weapon/storage/firstaid/clotting,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) +"Qh" = (/obj/structure/table/steel,/obj/item/storage/firstaid/o2{pixel_x = 3; pixel_y = 3},/obj/item/storage/firstaid/regular,/obj/machinery/atmospherics/pipe/manifold/visible,/obj/item/storage/firstaid/fire,/obj/item/storage/firstaid/toxin,/obj/item/storage/firstaid/adv,/obj/item/storage/firstaid/clotting,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) "Qi" = (/obj/machinery/atmospherics/unary/freezer{icon_state = "freezer_0"; dir = 8},/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) "Qj" = (/turf/simulated/shuttle/wall/no_join{base_state = "orange"; icon = 'icons/turf/shuttle_orange.dmi'; icon_state = "orange"},/area/centcom/evac) -"Qk" = (/obj/structure/table/standard,/obj/item/weapon/handcuffs/legcuffs,/turf/simulated/shuttle/floor/black,/area/skipjack_station/start) -"Ql" = (/obj/structure/table/standard,/obj/item/weapon/deck/cards,/turf/simulated/shuttle/floor/black,/area/skipjack_station/start) +"Qk" = (/obj/structure/table/standard,/obj/item/handcuffs/legcuffs,/turf/simulated/shuttle/floor/black,/area/skipjack_station/start) +"Ql" = (/obj/structure/table/standard,/obj/item/deck/cards,/turf/simulated/shuttle/floor/black,/area/skipjack_station/start) "Qm" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/blast/regular{id = "skipjackshutters"; name = "Skipjack Blast Shielding"},/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Qn" = (/obj/machinery/light/small,/turf/simulated/shuttle/floor/darkred,/area/skipjack_station/start) -"Qo" = (/obj/structure/table/standard,/obj/item/weapon/surgical/circular_saw{pixel_y = 8},/obj/item/weapon/surgical/hemostat,/obj/item/weapon/surgical/scalpel,/obj/item/stack/medical/advanced/bruise_pack,/turf/simulated/shuttle/floor/white,/area/skipjack_station/start) +"Qo" = (/obj/structure/table/standard,/obj/item/surgical/circular_saw{pixel_y = 8},/obj/item/surgical/hemostat,/obj/item/surgical/scalpel,/obj/item/stack/medical/advanced/bruise_pack,/turf/simulated/shuttle/floor/white,/area/skipjack_station/start) "Qp" = (/obj/structure/toilet{dir = 4},/obj/machinery/flasher{id = "syndieflash"; pixel_x = -28; pixel_y = 0},/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) "Qq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/shuttle/plating,/area/syndicate_station/start) -"Qr" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) +"Qr" = (/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "Qs" = (/obj/machinery/light{dir = 4},/obj/machinery/button/flasher{id = "syndieflash"; name = "Flasher"; pixel_x = 27; pixel_y = 0},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "Qt" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/window{dir = 8; name = "Surgery"; req_access = list(150)},/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) "Qu" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) -"Qv" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/steel,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) +"Qv" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/steel,/obj/item/reagent_containers/blood/OMinus,/obj/item/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) "Qw" = (/mob/living/simple_mob/animal/passive/tindalos,/turf/simulated/shuttle/floor/black,/area/skipjack_station/start) "Qx" = (/obj/machinery/door/airlock/hatch{req_access = list(150)},/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "Qy" = (/obj/machinery/optable,/turf/simulated/shuttle/floor/white,/area/skipjack_station/start) -"Qz" = (/obj/structure/table/standard,/obj/item/weapon/surgical/cautery,/obj/item/weapon/surgical/retractor,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/syringe,/turf/simulated/shuttle/floor/white,/area/skipjack_station/start) -"QA" = (/obj/structure/closet{name = "custodial"},/obj/item/weapon/mop,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) +"Qz" = (/obj/structure/table/standard,/obj/item/surgical/cautery,/obj/item/surgical/retractor,/obj/item/reagent_containers/glass/bottle/stoxin,/obj/item/reagent_containers/glass/bottle/stoxin,/obj/item/reagent_containers/syringe,/turf/simulated/shuttle/floor/white,/area/skipjack_station/start) +"QA" = (/obj/structure/closet{name = "custodial"},/obj/item/mop,/obj/item/reagent_containers/spray/cleaner,/obj/item/reagent_containers/glass/bucket,/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) "QB" = (/obj/structure/mopbucket,/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) -"QC" = (/obj/structure/table/steel,/obj/item/weapon/material/knife{pixel_x = -6},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 9},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 4},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = -1},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) -"QD" = (/obj/item/device/radio/electropack,/obj/structure/table/steel,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) +"QC" = (/obj/structure/table/steel,/obj/item/material/knife{pixel_x = -6},/obj/item/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 9},/obj/item/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 4},/obj/item/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = -1},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) +"QD" = (/obj/item/radio/electropack,/obj/structure/table/steel,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "QE" = (/obj/machinery/button/remote/blast_door{id = "syndieshutters_infirmary"; name = "remote shutter control"; pixel_x = -25},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) "QF" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/steel,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/stack/nanopaste,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) -"QG" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/closet/secure_closet/medical_wall{pixel_x = 32; pixel_y = 0; req_access = list(150)},/obj/item/weapon/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/gloves/sterile/latex,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) +"QG" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/closet/secure_closet/medical_wall{pixel_x = 32; pixel_y = 0; req_access = list(150)},/obj/item/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/gloves/sterile/latex,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/glass/bottle/stoxin,/obj/item/reagent_containers/glass/bottle/stoxin,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) "QH" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/shuttle/floor/black,/area/skipjack_station/start) -"QI" = (/obj/item/weapon/bedsheet/rainbow,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"QI" = (/obj/item/bedsheet/rainbow,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "QJ" = (/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"QK" = (/obj/item/weapon/bedsheet/hos,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"QL" = (/obj/structure/table/standard,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel,/obj/item/weapon/surgical/FixOVein,/obj/item/stack/nanopaste,/turf/simulated/shuttle/floor/white,/area/skipjack_station/start) +"QK" = (/obj/item/bedsheet/hos,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"QL" = (/obj/structure/table/standard,/obj/item/surgical/bonesetter,/obj/item/surgical/bonegel,/obj/item/surgical/FixOVein,/obj/item/stack/nanopaste,/turf/simulated/shuttle/floor/white,/area/skipjack_station/start) "QM" = (/obj/machinery/bodyscanner{dir = 8},/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) "QN" = (/obj/machinery/body_scanconsole,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) -"QO" = (/obj/structure/table/steel,/obj/item/stack/medical/splint,/obj/item/stack/medical/splint,/obj/item/weapon/storage/belt/medical/emt,/obj/item/weapon/storage/belt/medical/emt,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) -"QP" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/steel,/obj/item/weapon/storage/firstaid/surgery,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) +"QO" = (/obj/structure/table/steel,/obj/item/stack/medical/splint,/obj/item/stack/medical/splint,/obj/item/storage/belt/medical/emt,/obj/item/storage/belt/medical/emt,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) +"QP" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/steel,/obj/item/storage/firstaid/surgery,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) "QQ" = (/obj/machinery/optable,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) -"QR" = (/obj/machinery/iv_drip,/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) +"QR" = (/obj/machinery/iv_drip,/obj/item/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) "QS" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/obj/machinery/turretid{pixel_x = 32; req_access = list(150)},/obj/machinery/turretid{pixel_x = 32; req_access = list(150)},/turf/simulated/floor/airless,/area/syndicate_station/start) "QT" = (/obj/structure/toilet{dir = 4},/obj/machinery/light/small{dir = 8},/turf/simulated/shuttle/floor/black,/area/skipjack_station/start) -"QU" = (/obj/item/weapon/bedsheet/orange,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"QV" = (/obj/item/weapon/bedsheet/green,/obj/machinery/light/small{dir = 4},/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"QW" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/storage/firstaid/clotting,/obj/item/stack/medical/splint,/turf/simulated/shuttle/floor/white,/area/skipjack_station/start) -"QX" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/adv{pixel_x = 1},/obj/item/weapon/storage/firstaid/toxin{pixel_x = 3; pixel_y = 3},/obj/machinery/light/small{dir = 4},/obj/structure/closet/secure_closet/medical_wall{pixel_x = 32; pixel_y = 0; req_access = list(150)},/obj/item/weapon/storage/firstaid/fire{pixel_x = 1},/obj/item/weapon/storage/firstaid/o2{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/firstaid/regular,/turf/simulated/shuttle/floor/white,/area/skipjack_station/start) +"QU" = (/obj/item/bedsheet/orange,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"QV" = (/obj/item/bedsheet/green,/obj/machinery/light/small{dir = 4},/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"QW" = (/obj/structure/table/standard,/obj/item/reagent_containers/syringe/antiviral,/obj/item/reagent_containers/syringe/antiviral,/obj/item/storage/firstaid/clotting,/obj/item/stack/medical/splint,/turf/simulated/shuttle/floor/white,/area/skipjack_station/start) +"QX" = (/obj/structure/table/standard,/obj/item/storage/firstaid/adv{pixel_x = 1},/obj/item/storage/firstaid/toxin{pixel_x = 3; pixel_y = 3},/obj/machinery/light/small{dir = 4},/obj/structure/closet/secure_closet/medical_wall{pixel_x = 32; pixel_y = 0; req_access = list(150)},/obj/item/storage/firstaid/fire{pixel_x = 1},/obj/item/storage/firstaid/o2{pixel_x = 3; pixel_y = 3},/obj/item/storage/firstaid/regular,/turf/simulated/shuttle/floor/white,/area/skipjack_station/start) "QY" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "syndieshutters_infirmary"; name = "Blast Shutters"; opacity = 0},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/syndicate_station/start) "QZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "syndieshutters_infirmary"; name = "Blast Shutters"; opacity = 0},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/syndicate_station/start) "Ra" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "syndieshutters_infirmary"; name = "Blast Shutters"; opacity = 0},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/syndicate_station/start) -"Rb" = (/obj/item/weapon/bedsheet/rd,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"Rb" = (/obj/item/bedsheet/rd,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "Rc" = (/obj/item/pizzabox/meat,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) -"Rd" = (/obj/item/weapon/bedsheet/clown,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) +"Rd" = (/obj/item/bedsheet/clown,/obj/structure/bed/padded,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "Re" = (/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/space) "Rf" = (/turf/unsimulated/wall{icon = 'icons/misc/title.dmi'; icon_state = "title"},/area/space) "Rg" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; tiles = 0},/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/obj/effect/step_trigger/teleporter/random{affect_ghosts = 1; name = "escapeshuttle_leave"; teleport_x = 25; teleport_x_offset = 245; teleport_y = 25; teleport_y_offset = 245; teleport_z = 6; teleport_z_offset = 6},/turf/simulated/mineral,/area/space) "Rh" = (/turf/unsimulated/wall,/area/tdome/tdomeobserve) "Ri" = (/obj/machinery/door/blast/regular{id = "thunderdomeaxe"; name = "Axe Supply"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome/tdome1) -"Rj" = (/obj/structure/table/glass,/obj/item/weapon/book/codex/lore/vir,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) +"Rj" = (/obj/structure/table/glass,/obj/item/book/codex/lore/vir,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "Rk" = (/obj/machinery/computer/cryopod/dorms{pixel_y = -30},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "Rl" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/merchant/home) "Rm" = (/obj/effect/forcefield{desc = "You can't get in. Heh."; invisibility = 60; layer = 1; name = "Blocker"},/turf/simulated/shuttle/floor/white,/area/centcom/main_hall) @@ -2257,7 +2257,7 @@ "Ru" = (/obj/machinery/computer/syndicate_elite_shuttle{dir = 1},/turf/simulated/shuttle/floor/skipjack,/area/shuttle/syndicate_elite/mothership) "Rv" = (/obj/machinery/vending/snack{dir = 4; name = "hacked Getmore Chocolate Corp"; prices = list()},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "Rw" = (/obj/machinery/vending/cola{dir = 4; name = "hacked Robust Softdrinks"; prices = list()},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"Rx" = (/obj/machinery/vending/cigarette{dir = 4; name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"Rx" = (/obj/machinery/vending/cigarette{dir = 4; name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "Ry" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 1},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/syndicate_elite/mothership) "Rz" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 1},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/syndicate_elite/mothership) "RA" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"; dir = 1},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/syndicate_elite/mothership) @@ -2336,7 +2336,7 @@ "SV" = (/turf/unsimulated/floor{icon_state = "steel_dirty"},/area/virtual_reality) "SW" = (/obj/structure/table/steel,/turf/unsimulated/floor{icon_state = "steel_dirty"},/area/virtual_reality) "SX" = (/obj/structure/table/steel,/obj/random/energy,/turf/unsimulated/floor{icon_state = "steel_dirty"},/area/virtual_reality) -"SY" = (/obj/item/weapon/gun/magic/firestaff,/turf/unsimulated/floor{icon_state = "steel_dirty"},/area/virtual_reality) +"SY" = (/obj/item/gun/magic/firestaff,/turf/unsimulated/floor{icon_state = "steel_dirty"},/area/virtual_reality) "SZ" = (/obj/random/energy,/turf/unsimulated/floor{icon_state = "steel_dirty"},/area/virtual_reality) "Ta" = (/obj/machinery/door/airlock/multi_tile/metal,/obj/machinery/door/blast/regular{id = "spawngreen"; name = "Green Team Spawn"},/turf/unsimulated/floor{icon_state = "steel_dirty"},/area/virtual_reality) "Tb" = (/obj/machinery/door/blast/regular{id = "spawngreen"; name = "Green Team Spawn"},/turf/unsimulated/floor{icon_state = "steel_dirty"},/area/virtual_reality) diff --git a/maps/southern_cross/southern_cross-7.dmm b/maps/southern_cross/southern_cross-7.dmm index d64bee5ed41..33f2c5110be 100644 --- a/maps/southern_cross/southern_cross-7.dmm +++ b/maps/southern_cross/southern_cross-7.dmm @@ -47,7 +47,7 @@ "aU" = (/obj/machinery/ai_status_display,/turf/simulated/shuttle/wall,/area/shuttle/arrival/pre_game) "aV" = (/turf/space/transit/east,/area/shuttle/large_escape_pod1/transit) "aW" = (/turf/simulated/shuttle/wall/hard_corner,/area/shuttle/arrival/pre_game) -"aX" = (/obj/structure/closet/emcloset,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/shuttle/floor/white,/area/shuttle/arrival/pre_game) +"aX" = (/obj/structure/closet/emcloset,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/shuttle/floor/white,/area/shuttle/arrival/pre_game) "aY" = (/obj/machinery/light{dir = 1},/obj/structure/table/standard,/obj/random/plushie,/turf/simulated/shuttle/floor/white,/area/shuttle/arrival/pre_game) "aZ" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/shuttle/floor,/area/shuttle/arrival/pre_game) "ba" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/arrival/pre_game) @@ -73,14 +73,14 @@ "bu" = (/obj/structure/bed/chair/shuttle,/obj/structure/window/reinforced{dir = 1},/obj/effect/landmark{name = "JoinLate"},/obj/structure/closet/walllocker/emerglocker{pixel_x = -32},/turf/simulated/shuttle/floor/white,/area/shuttle/arrival/pre_game) "bv" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/simulated/floor/airless,/area/shuttle/arrival/pre_game) "bw" = (/obj/machinery/light,/turf/simulated/shuttle/floor/white,/area/shuttle/arrival/pre_game) -"bx" = (/obj/structure/table/standard,/obj/item/weapon/book/codex/lore/vir,/turf/simulated/shuttle/floor/white,/area/shuttle/arrival/pre_game) +"bx" = (/obj/structure/table/standard,/obj/item/book/codex/lore/vir,/turf/simulated/shuttle/floor/white,/area/shuttle/arrival/pre_game) "by" = (/obj/structure/table/standard,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/shuttle/floor/white,/area/shuttle/arrival/pre_game) -"bz" = (/obj/structure/table/standard,/obj/item/weapon/book/codex/corp_regs,/turf/simulated/shuttle/floor/white,/area/shuttle/arrival/pre_game) +"bz" = (/obj/structure/table/standard,/obj/item/book/codex/corp_regs,/turf/simulated/shuttle/floor/white,/area/shuttle/arrival/pre_game) "bA" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/airless,/area/shuttle/arrival/pre_game) "bB" = (/turf/space/transit/east,/area/shuttle/large_escape_pod2/transit) "bC" = (/turf/space,/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/arrival/pre_game) "bD" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating/airless,/area/shuttle/arrival/pre_game) -"bE" = (/obj/structure/closet/emcloset,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/shuttle/floor/white,/area/shuttle/arrival/pre_game) +"bE" = (/obj/structure/closet/emcloset,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/shuttle/floor/white,/area/shuttle/arrival/pre_game) "bF" = (/obj/effect/shuttle_landmark/southern_cross/escape_pod1/transit,/turf/space/transit/north,/area/shuttle/escape_pod1/transit) "bG" = (/turf/simulated/sky/moving/north,/area/space) "bH" = (/turf/simulated/sky/north,/area/space) diff --git a/maps/southern_cross/southern_cross-8.dmm b/maps/southern_cross/southern_cross-8.dmm index cc706e90981..b747af43d13 100644 --- a/maps/southern_cross/southern_cross-8.dmm +++ b/maps/southern_cross/southern_cross-8.dmm @@ -63,17 +63,17 @@ "bk" = (/turf/simulated/floor/outdoors/dirt/sif/planetuse,/area/surface/outside/wilderness/mountains) "bl" = (/turf/simulated/shuttle/floor/voidcraft/external,/area/surface/outpost/wall/checkpoint) "bm" = (/turf/simulated/shuttle/floor/voidcraft/external,/area/surface/outside/path/wilderness) -"bn" = (/obj/item/weapon/banner/nt,/turf/simulated/shuttle/floor/voidcraft/external,/area/surface/outside/path/wilderness) +"bn" = (/obj/item/banner/nt,/turf/simulated/shuttle/floor/voidcraft/external,/area/surface/outside/path/wilderness) "bo" = (/turf/simulated/shuttle/wall/voidcraft/hard_corner,/area/surface/outpost/wall/checkpoint) "bp" = (/obj/machinery/door/airlock/voidcraft{name = "Wilderness Containment"},/turf/simulated/shuttle/floor/voidcraft/external,/area/surface/outpost/wall/checkpoint) "bq" = (/turf/simulated/shuttle/wall/voidcraft,/area/surface/outpost/wall/checkpoint) "br" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/shuttle/floor/voidcraft/external,/area/surface/outpost/wall/checkpoint) "bs" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/shuttle/floor/voidcraft/external,/area/surface/outpost/wall/checkpoint) -"bt" = (/obj/item/weapon/banner/virgov,/turf/simulated/shuttle/floor/voidcraft/external,/area/surface/outside/path/wilderness) +"bt" = (/obj/item/banner/virgov,/turf/simulated/shuttle/floor/voidcraft/external,/area/surface/outside/path/wilderness) "bu" = (/obj/effect/map_effect/portal/master/side_b/wilderness_to_caves{icon_state = "portal_side_b"; dir = 1},/turf/simulated/shuttle/floor/voidcraft/external,/area/surface/outpost/wall/checkpoint) -"bv" = (/obj/structure/closet/crate,/obj/random/powercell,/obj/item/weapon/tool/screwdriver,/turf/simulated/floor/plating/external,/area/surface/outpost/shelter) +"bv" = (/obj/structure/closet/crate,/obj/random/powercell,/obj/item/tool/screwdriver,/turf/simulated/floor/plating/external,/area/surface/outpost/shelter) "bw" = (/obj/random/junk,/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "mining_dock_1"; name = "shuttle bay controller"; pixel_x = 0; pixel_y = -26; tag_door = "mining_dock_1_door"},/turf/simulated/floor/plating/external,/area/surface/outpost/shelter) -"bx" = (/obj/item/weapon/banner/virgov,/turf/simulated/floor/plating/external,/area/surface/outpost/shelter) +"bx" = (/obj/item/banner/virgov,/turf/simulated/floor/plating/external,/area/surface/outpost/shelter) "by" = (/obj/machinery/space_heater,/turf/simulated/floor/plating/external,/area/surface/outpost/shelter) "bz" = (/obj/machinery/space_heater,/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "mining_dock_2"; name = "shuttle bay controller"; pixel_x = 0; pixel_y = -26; tag_door = "mining_dock_2_door"},/turf/simulated/floor/plating/external,/area/surface/outpost/shelter) "bA" = (/obj/effect/shuttle_landmark{docking_controller = "mining_dock_2"; landmark_tag = "shuttle2_mining"; name = "Wilderness Landing Site"},/turf/simulated/floor/outdoors/grass/sif/planetuse{tree_chance = 0},/area/shuttle/shuttle2/mining) diff --git a/maps/southern_cross/southern_cross_overrides.dm b/maps/southern_cross/southern_cross_overrides.dm index 71dd04da38b..5458cb51dac 100644 --- a/maps/southern_cross/southern_cross_overrides.dm +++ b/maps/southern_cross/southern_cross_overrides.dm @@ -4,7 +4,7 @@ /mob/living/silicon/robot/platform/cargo req_access = list(access_cargo_bot) -/obj/item/weapon/card/id/platform/Initialize() +/obj/item/card/id/platform/Initialize() . = ..() access |= access_explorer access |= access_pilot diff --git a/maps/southern_cross/structures/closets/engineering.dm b/maps/southern_cross/structures/closets/engineering.dm index 278ace3e93c..fdaffb3995e 100644 --- a/maps/southern_cross/structures/closets/engineering.dm +++ b/maps/southern_cross/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/southern_cross/structures/closets/medical.dm b/maps/southern_cross/structures/closets/medical.dm index 666b42d6173..5af03b51510 100644 --- a/maps/southern_cross/structures/closets/medical.dm +++ b/maps/southern_cross/structures/closets/medical.dm @@ -14,20 +14,20 @@ /obj/item/clothing/suit/storage/toggle/labcoat/cmo, /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt, /obj/item/clothing/suit/storage/toggle/labcoat/modern/cmo, - /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/southern_cross/structures/closets/misc.dm b/maps/southern_cross/structures/closets/misc.dm index cc1567730f9..9d65f30bb3a 100644 --- a/maps/southern_cross/structures/closets/misc.dm +++ b/maps/southern_cross/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,9 +28,9 @@ req_one_access = list(access_explorer,access_brig) starts_with = list( - /obj/item/weapon/gun/energy/phasegun = 2, - /obj/item/weapon/gun/energy/phasegun/pistol, - /obj/item/weapon/cell/device/weapon = 2, + /obj/item/gun/energy/phasegun = 2, + /obj/item/gun/energy/phasegun/pistol, + /obj/item/cell/device/weapon = 2, /obj/item/clothing/accessory/permit/gun/planetside) //Explorer Lockers @@ -47,27 +47,27 @@ /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/device/cataloguer + /obj/item/cataloguer ) /obj/structure/closet/secure_closet/explorer/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 /* VOREStation Removal - Always give both if(prob(75)) - starts_with += /obj/item/weapon/material/knife/tacknife/survival + starts_with += /obj/item/material/knife/tacknife/survival else - starts_with += /obj/item/weapon/material/knife/machete + starts_with += /obj/item/material/knife/machete */ //VOREStation Removal End return ..() @@ -80,30 +80,30 @@ 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/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, /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/tool/crowbar, - /obj/item/weapon/extinguisher/mini, - /obj/item/weapon/storage/box/freezer, + /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, - /obj/item/device/geiger, + /obj/item/gps, + /obj/item/geiger, /obj/item/bodybag/cryobag) //Pilot Locker @@ -113,27 +113,27 @@ 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, /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/drinks/cans/waterbottle, - /obj/item/weapon/storage/box/flare, - /obj/item/weapon/cell/device, - /obj/item/device/radio) + /obj/item/radio/headset/pilot/alt, + /obj/item/flashlight, + /obj/item/reagent_containers/food/snacks/liquidfood, + /obj/item/reagent_containers/food/drinks/cans/waterbottle, + /obj/item/storage/box/flare, + /obj/item/cell/device, + /obj/item/radio) /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/southern_cross/structures/closets/research.dm b/maps/southern_cross/structures/closets/research.dm index 0447e9b0731..a279eeef773 100644 --- a/maps/southern_cross/structures/closets/research.dm +++ b/maps/southern_cross/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/southern_cross/structures/closets/security.dm b/maps/southern_cross/structures/closets/security.dm index 2ab3f7198e8..faa07d88573 100644 --- a/maps/southern_cross/structures/closets/security.dm +++ b/maps/southern_cross/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/stellar_delight/ship_centcom.dmm b/maps/stellar_delight/ship_centcom.dmm index 7b676d4c91e..5b5864e0db4 100644 --- a/maps/stellar_delight/ship_centcom.dmm +++ b/maps/stellar_delight/ship_centcom.dmm @@ -4,8 +4,8 @@ /area/centcom) "ab" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/lasercannon, -/obj/item/weapon/gun/energy/lasercannon, +/obj/item/gun/energy/lasercannon, +/obj/item/gun/energy/lasercannon, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "ac" = ( @@ -24,8 +24,8 @@ /area/shuttle/ccboat) "ad" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/xray, -/obj/item/weapon/gun/energy/xray, +/obj/item/gun/energy/xray, +/obj/item/gun/energy/xray, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "ae" = ( @@ -35,13 +35,13 @@ "af" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, /turf/simulated/floor/tiled/dark, /area/centcom/security) "ag" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/heavysniper, +/obj/item/gun/projectile/heavysniper, /obj/item/ammo_magazine/ammo_box/b145, /obj/item/ammo_magazine/ammo_box/b145, /turf/simulated/floor/tiled/dark, @@ -51,8 +51,8 @@ /area/centcom/main_hall) "ai" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/weapon/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, @@ -70,7 +70,7 @@ /area/centcom/control) "ak" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/simulated/floor/tiled, /area/centcom/security) "al" = ( @@ -78,8 +78,8 @@ /area/tdome/tdomeadmin) "am" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/rocket, -/obj/item/weapon/gun/launcher/rocket, +/obj/item/gun/launcher/rocket, +/obj/item/gun/launcher/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, @@ -153,18 +153,18 @@ /area/centcom/security) "au" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "av" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/l6_saw, -/obj/item/weapon/gun/projectile/automatic/l6_saw, +/obj/item/gun/projectile/automatic/l6_saw, +/obj/item/gun/projectile/automatic/l6_saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, @@ -188,8 +188,8 @@ /area/centcom/control) "az" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "aA" = ( @@ -201,8 +201,8 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -217,8 +217,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -232,7 +232,7 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/netgun, +/obj/item/gun/energy/netgun, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -300,7 +300,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = 3; pixel_y = 5 }, @@ -311,9 +311,9 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/window/reinforced{ dir = 4 @@ -328,10 +328,10 @@ }, /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -346,10 +346,10 @@ /area/centcom/specops) "aV" = ( /obj/structure/table/rack, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "aW" = ( @@ -388,11 +388,11 @@ /area/centcom/command) "bb" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, /obj/item/clothing/glasses/thermal, /obj/item/clothing/glasses/thermal, /obj/item/clothing/glasses/thermal, @@ -402,43 +402,43 @@ /area/centcom/specops) "bc" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/pill_bottle/blood_regen, -/obj/item/weapon/storage/pill_bottle/blood_regen, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, +/obj/item/storage/pill_bottle/blood_regen, +/obj/item/storage/pill_bottle/blood_regen, +/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "bd" = ( /obj/structure/closet/crate/medical, /obj/item/stack/nanopaste/advanced, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/surgical, /obj/item/clothing/mask/surgical, /obj/item/stack/nanopaste/advanced, /obj/item/stack/nanopaste/advanced, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "be" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "bf" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/clotting, -/obj/item/weapon/storage/firstaid/bonemed, -/obj/item/weapon/storage/pill_bottle/sleevingcure/full, +/obj/item/storage/firstaid/clotting, +/obj/item/storage/firstaid/bonemed, +/obj/item/storage/pill_bottle/sleevingcure/full, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "bg" = ( /obj/machinery/chemical_dispenser/ert, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /obj/structure/table/reinforced, /turf/simulated/floor/tiled/dark, /area/centcom/specops) @@ -447,8 +447,8 @@ /area/centcom/living) "bi" = ( /obj/structure/table/rack, -/obj/item/device/defib_kit/compact/combat/loaded, -/obj/item/device/defib_kit/compact/combat/loaded, +/obj/item/defib_kit/compact/combat/loaded, +/obj/item/defib_kit/compact/combat/loaded, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "bj" = ( @@ -584,20 +584,20 @@ /area/shuttle/centcom/ccbay) "bJ" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/pillbottles, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/autoinjectors, +/obj/item/storage/box/pillbottles, +/obj/item/storage/box/gloves, +/obj/item/storage/box/beakers, +/obj/item/storage/box/autoinjectors, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "bK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "bL" = ( @@ -618,11 +618,11 @@ /area/centcom/specops) "bM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "bS" = ( @@ -634,9 +634,9 @@ /area/centcom/specops) "bT" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, +/obj/item/rig/ert/medical, +/obj/item/rig/ert/medical, +/obj/item/rig/ert/medical, /obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/accessory/storage/white_vest, @@ -681,7 +681,7 @@ "ca" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/projectile/automatic/advanced_smg, +/obj/item/gun/projectile/automatic/advanced_smg, /obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mmAdvanced, @@ -693,7 +693,7 @@ "cb" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -711,21 +711,21 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "cf" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "ci" = ( @@ -756,8 +756,8 @@ /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -779,18 +779,18 @@ /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "cv" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil, -/obj/item/device/t_scanner/advanced, -/obj/item/device/t_scanner/advanced, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/t_scanner/advanced, +/obj/item/t_scanner/advanced, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -808,33 +808,33 @@ }, /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "cE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -908,10 +908,10 @@ /area/centcom/medical) "cL" = ( /obj/structure/table/reinforced, -/obj/item/device/healthanalyzer/phasic, -/obj/item/device/healthanalyzer/phasic, -/obj/item/device/healthanalyzer/phasic, -/obj/item/device/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "cN" = ( @@ -922,17 +922,17 @@ /area/shuttle/ccboat) "cO" = ( /obj/structure/table/rack, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/window/reinforced{ dir = 1 @@ -946,11 +946,11 @@ /area/centcom/specops) "cR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "cT" = ( @@ -969,19 +969,19 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "da" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/emps{ +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/emps{ pixel_x = 4; pixel_y = 4 }, @@ -991,8 +991,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/storage/box/smokes, -/obj/item/weapon/storage/box/smokes, +/obj/item/storage/box/smokes, +/obj/item/storage/box/smokes, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -1000,55 +1000,55 @@ /area/centcom/specops) "db" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "dc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "dd" = ( /obj/structure/table/reinforced, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -1084,12 +1084,12 @@ /area/centcom) "dl" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -1098,7 +1098,7 @@ /turf/simulated/shuttle/wall, /area/centcom/terminal) "dn" = ( -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 2; pixel_y = 6 }, @@ -1111,8 +1111,8 @@ /area/centcom/control) "dr" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/gun/energy/gun/burst, +/obj/item/gun/energy/gun/burst, +/obj/item/gun/energy/gun/burst, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "ds" = ( @@ -1127,82 +1127,82 @@ /area/centcom/specops) "du" = ( /obj/structure/table/rack, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dv" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/compact, -/obj/item/weapon/gun/energy/gun/compact, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/gun/energy/gun/compact, +/obj/item/gun/energy/gun/compact, +/obj/item/flash, +/obj/item/flash, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dw" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/grenade, -/obj/item/weapon/gun/launcher/grenade, +/obj/item/gun/launcher/grenade, +/obj/item/gun/launcher/grenade, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dx" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/frags, -/obj/item/weapon/storage/box/frags, -/obj/item/weapon/storage/box/teargas, -/obj/item/weapon/storage/box/teargas, -/obj/item/weapon/storage/box/empslite, -/obj/item/weapon/storage/box/empslite, +/obj/item/storage/box/frags, +/obj/item/storage/box/frags, +/obj/item/storage/box/teargas, +/obj/item/storage/box/teargas, +/obj/item/storage/box/empslite, +/obj/item/storage/box/empslite, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dy" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/combat{ +/obj/item/storage/firstaid/combat{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dC" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -1210,8 +1210,8 @@ "dD" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/projectile/revolver/detective45, -/obj/item/weapon/gun/projectile/revolver/detective45, +/obj/item/gun/projectile/revolver/detective45, +/obj/item/gun/projectile/revolver/detective45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, @@ -1250,10 +1250,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/weapon/gun/projectile/p92x, +/obj/item/gun/projectile/p92x, +/obj/item/gun/projectile/p92x, +/obj/item/gun/projectile/p92x, +/obj/item/gun/projectile/p92x, /obj/item/ammo_magazine/m9mm/large/preban, /obj/item/ammo_magazine/m9mm/large/preban, /obj/item/ammo_magazine/m9mm/large/preban, @@ -1274,11 +1274,11 @@ /area/shuttle/ccboat) "dU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dV" = ( @@ -1305,7 +1305,7 @@ /obj/structure/bed/chair/bay/shuttle{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_x = -32; pixel_y = 24 @@ -1333,7 +1333,7 @@ /area/centcom/control) "ef" = ( /obj/structure/bed/chair, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -1350,9 +1350,9 @@ /area/centcom/control) "ej" = ( /obj/structure/table/reinforced, -/obj/item/device/megaphone, -/obj/item/weapon/storage/box/trackimp, -/obj/item/weapon/storage/box/cdeathalarm_kit, +/obj/item/megaphone, +/obj/item/storage/box/trackimp, +/obj/item/storage/box/cdeathalarm_kit, /turf/simulated/floor/wood, /area/centcom/specops) "ek" = ( @@ -1363,12 +1363,12 @@ /obj/item/taperoll/police, /obj/item/taperoll/police, /obj/item/taperoll/police, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -1377,7 +1377,7 @@ /obj/structure/table/rack, /obj/item/clothing/suit/armor/vest/ert/command, /obj/item/clothing/head/helmet/ert/command, -/obj/item/weapon/storage/backpack/ert/commander, +/obj/item/storage/backpack/ert/commander, /turf/simulated/floor/wood, /area/centcom/specops) "em" = ( @@ -1385,7 +1385,7 @@ /area/centcom/control) "en" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid, +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid, /turf/simulated/floor/wood, /area/centcom/specops) "ep" = ( @@ -1422,11 +1422,11 @@ /area/centcom/specops) "ex" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "ey" = ( @@ -1462,10 +1462,10 @@ /obj/item/clothing/head/helmet/ert/medical, /obj/item/clothing/head/helmet/ert/medical, /obj/item/clothing/head/helmet/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "eI" = ( @@ -1499,9 +1499,9 @@ /area/tdome/tdomeobserve) "eR" = ( /obj/structure/table/reinforced, -/obj/item/device/aicard, -/obj/item/weapon/pinpointer/advpinpointer, -/obj/item/weapon/stamp/centcomm, +/obj/item/aicard, +/obj/item/pinpointer/advpinpointer, +/obj/item/stamp/centcomm, /turf/simulated/floor/wood, /area/centcom/specops) "eS" = ( @@ -1516,7 +1516,7 @@ /obj/item/clothing/accessory/holster/hip, /obj/item/ammo_magazine/m44, /obj/item/ammo_magazine/m44, -/obj/item/weapon/gun/projectile/deagle, +/obj/item/gun/projectile/deagle, /turf/simulated/floor/wood, /area/centcom/specops) "eU" = ( @@ -1528,9 +1528,9 @@ /area/centcom/specops) "eV" = ( /obj/structure/table/reinforced, -/obj/item/device/pda/ert, -/obj/item/device/perfect_tele, -/obj/item/weapon/hand_tele, +/obj/item/pda/ert, +/obj/item/perfect_tele, +/obj/item/hand_tele, /turf/simulated/floor/wood, /area/centcom/specops) "eX" = ( @@ -1551,7 +1551,7 @@ name = "\improper CentCom Residential Security" }) "eZ" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/corner/blue/diagonal{ dir = 4 @@ -1573,12 +1573,12 @@ /area/centcom) "fj" = ( /obj/structure/table/reinforced, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, /obj/effect/floor_decal/corner/blue{ dir = 5 }, @@ -1619,12 +1619,12 @@ /area/centcom/evac) "fs" = ( /obj/structure/table/reinforced, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, /obj/effect/floor_decal/corner/blue{ dir = 5 }, @@ -1719,25 +1719,25 @@ /area/centcom/specops) "fJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/handcuffs, -/obj/item/device/flash, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/storage/box/flashbangs, +/obj/item/handcuffs, +/obj/item/flash, +/obj/item/melee/baton/loaded, +/obj/item/storage/belt/security/tactical, +/obj/item/gun/energy/stunrevolver, /obj/item/clothing/glasses/sunglasses/sechud/tactical, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, /turf/simulated/floor/wood, /area/centcom/specops) "fL" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert, +/obj/item/rig/ert, /obj/item/clothing/accessory/storage/black_vest, /turf/simulated/floor/wood, /area/centcom/specops) "fM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, /turf/simulated/floor/wood, /area/centcom/specops) "fP" = ( @@ -1749,8 +1749,8 @@ /area/centcom/main_hall) "fR" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid_combat, -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid_combat, +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid_combat, +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid_combat, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "fS" = ( @@ -1760,17 +1760,17 @@ }, /area/centcom/specops) "fT" = ( -/obj/item/weapon/circuitboard/aiupload, -/obj/item/weapon/circuitboard/borgupload, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/aiModule/nanotrasen, -/obj/item/weapon/aiModule/reset, -/obj/item/weapon/aiModule/freeformcore, -/obj/item/weapon/aiModule/protectStation, -/obj/item/weapon/aiModule/quarantine, -/obj/item/weapon/aiModule/paladin, -/obj/item/weapon/aiModule/robocop, -/obj/item/weapon/aiModule/safeguard, +/obj/item/circuitboard/aiupload, +/obj/item/circuitboard/borgupload, +/obj/item/circuitboard/smes, +/obj/item/aiModule/nanotrasen, +/obj/item/aiModule/reset, +/obj/item/aiModule/freeformcore, +/obj/item/aiModule/protectStation, +/obj/item/aiModule/quarantine, +/obj/item/aiModule/paladin, +/obj/item/aiModule/robocop, +/obj/item/aiModule/safeguard, /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -1789,12 +1789,12 @@ /obj/item/clothing/glasses/welding/superior, /obj/structure/table/steel_reinforced, /obj/item/clothing/glasses/welding/superior, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -1824,11 +1824,11 @@ /area/centcom/specops) "ga" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "gb" = ( @@ -1859,31 +1859,31 @@ /obj/item/clothing/head/helmet/ert/security, /obj/item/clothing/head/helmet/ert/security, /obj/item/clothing/head/helmet/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "gd" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "ge" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stamp/centcomm, -/obj/item/weapon/pen, -/obj/item/weapon/paper_bin{ +/obj/item/stamp/centcomm, +/obj/item/pen, +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -1911,7 +1911,7 @@ /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/simulated/floor/wood, /area/centcom/specops) @@ -1993,12 +1993,12 @@ /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2075,19 +2075,19 @@ /obj/item/stack/material/glass/reinforced{ amount = 50 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, @@ -2109,8 +2109,8 @@ /area/centcom/holding) "gC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/device/taperecorder, +/obj/item/book/manual/security_space_law, +/obj/item/taperecorder, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled/dark, @@ -2137,8 +2137,8 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/tdome/green, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/energy/sword/green, +/obj/item/melee/baton/loaded, +/obj/item/melee/energy/sword/green, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "gR" = ( @@ -2160,13 +2160,13 @@ /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/effect/floor_decal/industrial/outline/blue, -/obj/item/weapon/storage/box/traumainjectors, +/obj/item/storage/box/traumainjectors, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "gV" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 1; dir = 1; frequency = 1443; @@ -2245,18 +2245,18 @@ "hl" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/industrial/outline/blue, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2276,10 +2276,10 @@ /area/centcom/control) "hq" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/compact, -/obj/item/weapon/gun/energy/gun/compact, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/gun/energy/gun/compact, +/obj/item/gun/energy/gun/compact, +/obj/item/flash, +/obj/item/flash, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2345,7 +2345,7 @@ }, /area/centcom/specops) "hE" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/centcom/specops) "hF" = ( @@ -2373,7 +2373,7 @@ }, /area/centcom/specops) "hH" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "CentCom"; tele_network = "centcom" }, @@ -2506,7 +2506,7 @@ }, /area/centcom/control) "il" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/corner/blue/diagonal{ dir = 4 @@ -2556,10 +2556,10 @@ /obj/item/clothing/head/helmet/ert/engineer, /obj/item/clothing/head/helmet/ert/engineer, /obj/item/clothing/head/helmet/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2572,9 +2572,9 @@ /area/centcom/terminal) "is" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2617,24 +2617,24 @@ /area/centcom/control) "iy" = ( /obj/structure/table/reinforced, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "iz" = ( -/obj/item/weapon/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2677,7 +2677,7 @@ /turf/simulated/floor/tiled/white, /area/centcom/control) "iL" = ( -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2755,24 +2755,24 @@ /area/centcom/control) "ja" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2791,9 +2791,9 @@ /area/tdome/tdomeobserve) "jd" = ( /obj/structure/table/reinforced, -/obj/item/device/binoculars, -/obj/item/device/survivalcapsule, -/obj/item/device/survivalcapsule, +/obj/item/binoculars, +/obj/item/survivalcapsule, +/obj/item/survivalcapsule, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2844,15 +2844,15 @@ /area/centcom/control) "jo" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 8; pixel_y = 6 }, -/obj/item/weapon/storage/box/chemimp{ +/obj/item/storage/box/chemimp{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/storage/box/trackimp, +/obj/item/storage/box/trackimp, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -2868,7 +2868,7 @@ /area/centcom/control) "ju" = ( /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/simulated/floor/tiled/white, /area/centcom/control) "jw" = ( @@ -2877,9 +2877,9 @@ /turf/simulated/floor/plating, /area/centcom/terminal) "jx" = ( -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, /obj/structure/table/standard, /turf/unsimulated/floor/steel, /area/tdome/tdomeobserve) @@ -2926,8 +2926,8 @@ /area/tdome/tdomeadmin) "jJ" = ( /obj/structure/table/reinforced, -/obj/item/device/camera, -/obj/item/weapon/storage/box/ids, +/obj/item/camera, +/obj/item/storage/box/ids, /obj/effect/floor_decal/borderfloorblack{ dir = 6 }, @@ -3011,7 +3011,7 @@ /turf/simulated/floor/tiled, /area/centcom/control) "kh" = ( -/obj/item/weapon/melee/baton/cattleprod, +/obj/item/melee/baton/cattleprod, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -3059,13 +3059,13 @@ /turf/simulated/floor/tiled, /area/centcom/control) "kp" = ( -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/structure/table/standard, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/reagent_containers/dropper{ +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, +/obj/item/reagent_containers/dropper{ pixel_y = -4 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -3084,11 +3084,11 @@ /area/centcom/specops) "kr" = ( /obj/structure/table/standard, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -3163,7 +3163,7 @@ /obj/structure/reagent_dispensers/acid{ pixel_y = -30 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -3190,12 +3190,12 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -3214,15 +3214,15 @@ /area/centcom/specops) "kP" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = 3; pixel_y = 5 }, @@ -3273,19 +3273,19 @@ /turf/simulated/wall/rshull, /area/shuttle/ccboat) "lb" = ( -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -3317,14 +3317,14 @@ /area/centcom/specops) "lf" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -3338,7 +3338,7 @@ /turf/simulated/floor/tiled/dark, /area/centcom/security) "lh" = ( -/obj/item/device/camera, +/obj/item/camera, /turf/unsimulated/floor/steel, /area/tdome/tdomeobserve) "lj" = ( @@ -3386,7 +3386,7 @@ "lw" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/device/flash, +/obj/item/flash, /turf/simulated/floor/tiled, /area/centcom/control) "lx" = ( @@ -3423,7 +3423,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 27 @@ -3566,7 +3566,7 @@ /obj/structure/table/rack, /obj/item/clothing/under/color/red, /obj/item/clothing/shoes/brown, -/obj/item/weapon/melee/energy/axe, +/obj/item/melee/energy/axe, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "mf" = ( @@ -3581,7 +3581,7 @@ /obj/structure/table/rack, /obj/item/clothing/under/color/green, /obj/item/clothing/shoes/brown, -/obj/item/weapon/melee/energy/axe, +/obj/item/melee/energy/axe, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "mh" = ( @@ -3608,11 +3608,11 @@ /area/centcom/control) "mk" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/control) "ml" = ( @@ -3661,39 +3661,39 @@ /area/centcom/control) "mu" = ( /obj/structure/closet/wardrobe/robotics_black, -/obj/item/device/radio/headset/headset_sci{ +/obj/item/radio/headset/headset_sci{ pixel_x = -3 }, /turf/simulated/floor/tiled, /area/centcom/control) "mw" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, @@ -3776,7 +3776,7 @@ /area/centcom/control) "mP" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/clothing/gloves/sterile/latex, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -3800,8 +3800,8 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/tdome/red, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/energy/sword/red, +/obj/item/melee/baton/loaded, +/obj/item/melee/energy/sword/red, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "mX" = ( @@ -3852,10 +3852,10 @@ /area/centcom/control) "nf" = ( /obj/structure/table/standard, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/pen, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/hand_labeler, +/obj/item/pen, +/obj/item/packageWrap, +/obj/item/packageWrap, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -3886,11 +3886,11 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -3920,12 +3920,12 @@ /turf/simulated/floor/tiled, /area/centcom/terminal/tramfluff) "nB" = ( -/obj/item/weapon/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, /obj/structure/table/standard, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, /obj/machinery/recharger, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -4107,8 +4107,8 @@ dir = 1 }, /obj/machinery/camera/network/crescent, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/centcom/medical) "oo" = ( @@ -4149,7 +4149,7 @@ /area/centcom/medical) "os" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = -1; pixel_y = -2 }, @@ -4259,7 +4259,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/item/weapon/book/manual/robotics_cyborgs{ +/obj/item/book/manual/robotics_cyborgs{ pixel_x = 2; pixel_y = 5 }, @@ -4323,7 +4323,7 @@ /obj/item/modular_computer/console/preset/command{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 1; dir = 4; frequency = 1443; @@ -4489,7 +4489,7 @@ /area/centcom/medical) "qf" = ( /obj/structure/table/standard, -/obj/item/device/mmi, +/obj/item/mmi, /turf/simulated/floor/tiled, /area/centcom/control) "qg" = ( @@ -4533,7 +4533,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/blue_captain, +/obj/item/folder/blue_captain, /turf/simulated/floor/carpet, /area/centcom/command) "qq" = ( @@ -4585,11 +4585,11 @@ /area/centcom/evac) "qR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/button/remote/blast_door{ id = "TelelockdownC"; name = "Teleporter Entrance Lockdown"; @@ -4668,10 +4668,10 @@ }) "ri" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 5 }, -/obj/item/weapon/pen/multi, +/obj/item/pen/multi, /turf/simulated/floor/tiled, /area/centcom/control) "rj" = ( @@ -4685,15 +4685,15 @@ dir = 4 }, /obj/structure/table/marble, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/book/manual/chef_recipes, +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/material/knife/butch, +/obj/item/material/kitchen/rollingpin, +/obj/item/material/knife/butch, /turf/simulated/floor/tiled/white, /area/centcom/control) "rm" = ( @@ -4751,12 +4751,12 @@ /area/shuttle/escape) "rZ" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw, -/obj/item/weapon/surgical/scalpel{ +/obj/item/surgical/circular_saw, +/obj/item/surgical/scalpel{ pixel_y = 12 }, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/hemostat, +/obj/item/surgical/retractor, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -4929,11 +4929,11 @@ /area/centcom) "sW" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -5085,14 +5085,14 @@ pixel_x = -32; req_access = list(29) }, -/obj/item/weapon/tank/anesthetic, -/obj/item/weapon/tank/anesthetic, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, +/obj/item/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/breath/medical, -/obj/item/weapon/storage/box/gloves, -/obj/item/device/defib_kit/jumper_kit, +/obj/item/storage/box/gloves, +/obj/item/defib_kit/jumper_kit, /turf/simulated/floor/tiled{ icon_state = "white" }, @@ -5260,7 +5260,7 @@ "vb" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/projectile/automatic/l6_saw, +/obj/item/gun/projectile/automatic/l6_saw, /turf/simulated/floor/tiled/dark, /area/centcom/security) "vc" = ( @@ -5300,8 +5300,8 @@ /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/melee/baton/loaded, +/obj/item/shield/riot, +/obj/item/melee/baton/loaded, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -5460,11 +5460,11 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/button/remote/blast_door{ id = "FrontlockC"; name = "Colony Entrance Lockdown"; @@ -5512,23 +5512,23 @@ /obj/item/clothing/shoes/boots/tactical, /obj/item/clothing/suit/armor/tactical, /obj/item/clothing/under/tactical, -/obj/item/weapon/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, /obj/structure/closet{ desc = "It's a storage unit for standard-issue attire."; name = "tactical equipment" }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/satchel/sec, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/satchel/sec, /turf/simulated/floor/tiled/dark, /area/centcom/security) "wg" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, /turf/simulated/floor/tiled/dark, /area/centcom/security) "wh" = ( @@ -5546,7 +5546,7 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet/swat, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "wj" = ( @@ -5563,7 +5563,7 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet/swat, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "wn" = ( @@ -5603,10 +5603,10 @@ /area/centcom/control) "wz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/toxin, /turf/simulated/shuttle/floor/white, /area/shuttle/escape) "wA" = ( @@ -5644,21 +5644,21 @@ /area/shuttle/ccboat) "wP" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburger{ +/obj/item/reagent_containers/food/snacks/cheeseburger{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburger, +/obj/item/reagent_containers/food/snacks/cheeseburger, /turf/simulated/floor/wood, /area/centcom/restaurant) "wT" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -5713,7 +5713,7 @@ "xc" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/projectile/heavysniper, +/obj/item/gun/projectile/heavysniper, /turf/simulated/floor/tiled/dark, /area/centcom/security) "xe" = ( @@ -5793,8 +5793,8 @@ "xz" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/weapon/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, /turf/simulated/floor/tiled/dark, /area/centcom/security) "xB" = ( @@ -5844,7 +5844,7 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/command) "xQ" = ( @@ -5866,8 +5866,8 @@ /area/centcom/restaurant) "xS" = ( /obj/structure/table/standard, -/obj/item/device/mmi/digital/posibrain, -/obj/item/device/robotanalyzer, +/obj/item/mmi/digital/posibrain, +/obj/item/robotanalyzer, /turf/simulated/floor/tiled, /area/centcom/control) "xU" = ( @@ -5888,7 +5888,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -5927,7 +5927,7 @@ "yj" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, /turf/simulated/floor/tiled/dark, /area/centcom/security) "yy" = ( @@ -5943,15 +5943,15 @@ /area/shuttle/escape) "yB" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/fries, +/obj/item/reagent_containers/food/snacks/fries, /turf/simulated/floor/wood, /area/centcom/restaurant) "yC" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, /turf/simulated/floor/tiled/dark, /area/centcom/security) "yD" = ( @@ -6036,25 +6036,25 @@ /area/centcom/medical) "yU" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 4 }, @@ -6068,7 +6068,7 @@ /area/centcom/restaurant) "yX" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -6211,11 +6211,11 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/scanning_module{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, /obj/machinery/light{ dir = 4 }, @@ -6246,21 +6246,21 @@ /area/centcom) "Ab" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Ac" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/dark, @@ -6305,7 +6305,7 @@ dir = 1 }, /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled/dark, /area/centcom/command) "Ak" = ( @@ -6375,20 +6375,20 @@ /area/centcom/security) "AF" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/flame/lighter/zippo, +/obj/item/storage/fancy/cigarettes, /turf/unsimulated/floor/steel, /area/tdome/tdomeobserve) "AG" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /turf/simulated/floor/carpet, /area/centcom/control) "AH" = ( -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, /obj/structure/table/standard, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/corner/blue/diagonal{ @@ -6407,11 +6407,11 @@ /area/centcom/medical) "AJ" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/blue, +/obj/item/pen/blue, /turf/simulated/floor/tiled, /area/centcom/control) "AK" = ( @@ -6535,11 +6535,11 @@ /area/centcom/terminal/tramfluff) "BR" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/shotgun/pump, -/obj/item/weapon/gun/projectile/shotgun/pump, -/obj/item/weapon/gun/projectile/shotgun/pump, -/obj/item/weapon/gun/projectile/shotgun/pump, -/obj/item/weapon/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -6642,7 +6642,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -6748,7 +6748,7 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, @@ -6785,11 +6785,11 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, @@ -6830,7 +6830,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/carpet, /area/centcom/command) "Ds" = ( @@ -6956,7 +6956,7 @@ /turf/simulated/floor/tiled/eris/dark/cargo, /area/shuttle/ccboat) "DF" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled/white, @@ -7023,11 +7023,11 @@ /turf/simulated/floor/tiled, /area/centcom/control) "DL" = ( -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /obj/structure/table/glass, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -7043,11 +7043,11 @@ /area/shuttle/ccboat) "DO" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -7096,7 +7096,7 @@ /area/centcom/security) "DU" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 10; pixel_y = 12 }, @@ -7161,7 +7161,7 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Ef" = ( @@ -7178,7 +7178,7 @@ "Eg" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/green/border, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled/white, @@ -7192,18 +7192,18 @@ /area/centcom/control) "Ei" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/green/border, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Ek" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -7307,7 +7307,7 @@ req_access = list(101) }, /obj/structure/table/reinforced, -/obj/item/device/pda/captain, +/obj/item/pda/captain, /turf/simulated/floor/tiled, /area/centcom/control) "EB" = ( @@ -7373,11 +7373,11 @@ /area/centcom/medical) "EM" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/battlerifle, -/obj/item/weapon/gun/projectile/automatic/battlerifle, -/obj/item/weapon/gun/projectile/automatic/battlerifle, -/obj/item/weapon/gun/projectile/automatic/battlerifle, -/obj/item/weapon/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -7390,12 +7390,12 @@ /area/centcom/evac) "EQ" = ( /obj/structure/table/standard, -/obj/item/device/taperecorder, -/obj/item/device/megaphone, -/obj/item/weapon/packageWrap, -/obj/item/weapon/storage/box, -/obj/item/weapon/hand_labeler, -/obj/item/device/universal_translator, +/obj/item/taperecorder, +/obj/item/megaphone, +/obj/item/packageWrap, +/obj/item/storage/box, +/obj/item/hand_labeler, +/obj/item/universal_translator, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -7424,12 +7424,12 @@ dir = 4 }, /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/red_hos, -/obj/item/weapon/pen/multi, +/obj/item/folder/red_hos, +/obj/item/pen/multi, /turf/simulated/floor/tiled/dark, /area/centcom/command) "EV" = ( @@ -7506,8 +7506,8 @@ /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/melee/baton/loaded, +/obj/item/shield/riot, +/obj/item/melee/baton/loaded, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -7577,7 +7577,7 @@ /area/centcom/medical) "Fv" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/meatballsoup, +/obj/item/reagent_containers/food/snacks/meatballsoup, /turf/simulated/floor/wood, /area/centcom/restaurant) "Fx" = ( @@ -7596,8 +7596,8 @@ /area/centcom/medical) "Fz" = ( /obj/structure/table/reinforced, -/obj/item/device/camera, -/obj/item/weapon/storage/box/ids, +/obj/item/camera, +/obj/item/storage/box/ids, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, @@ -7616,16 +7616,16 @@ }) "FC" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -7754,7 +7754,7 @@ /area/centcom/bathroom) "FW" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled, /area/centcom/security) "FX" = ( @@ -7889,16 +7889,16 @@ /area/centcom/command) "Gq" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = -6 }, -/obj/item/device/camera{ +/obj/item/camera{ name = "Autopsy Camera"; pixel_x = -2; pixel_y = 7 }, -/obj/item/weapon/pen/red, -/obj/item/weapon/pen/blue{ +/obj/item/pen/red, +/obj/item/pen/blue{ pixel_x = 3; pixel_y = -5 }, @@ -7918,41 +7918,41 @@ "Gs" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, @@ -8134,8 +8134,8 @@ /area/centcom) "GX" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/surgical/cautery, +/obj/item/surgical/hemostat, +/obj/item/surgical/cautery, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -8156,7 +8156,7 @@ "Hc" = ( /obj/structure/table/standard, /obj/item/stack/medical/advanced/bruise_pack, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/retractor, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -8184,10 +8184,10 @@ /area/centcom/evac) "Hg" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw{ +/obj/item/surgical/circular_saw{ pixel_y = 8 }, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/scalpel, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -8231,15 +8231,15 @@ /area/tdome/tdomeadmin) "Hp" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/surgical/surgicaldrill, +/obj/item/autopsy_scanner, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/surgical/FixOVein, +/obj/item/surgical/FixOVein, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -8444,7 +8444,7 @@ "HL" = ( /obj/structure/table/standard, /obj/machinery/chemical_dispenser/bar_soft/full, -/obj/item/weapon/storage/box/glasses/square, +/obj/item/storage/box/glasses/square, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -8461,19 +8461,19 @@ /area/centcom/main_hall) "HN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /turf/simulated/floor/tiled/dark, /area/centcom/security) "HO" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/device/radio/intercom{ +/obj/item/reagent_containers/spray/cleaner, +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 27 }, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -8505,8 +8505,8 @@ /area/centcom/security) "HV" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel, +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -8628,11 +8628,11 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OPlus{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OMinus{ +/obj/item/reagent_containers/blood/OMinus{ pixel_x = -5; pixel_y = -1 }, @@ -8660,7 +8660,7 @@ /obj/effect/floor_decal/corner/blue/bordercorner2{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -8769,7 +8769,7 @@ /area/centcom/security) "IC" = ( /obj/structure/table/woodentable, -/obj/item/weapon/stamp/hos, +/obj/item/stamp/hos, /turf/simulated/floor/tiled/dark, /area/centcom/command) "IE" = ( @@ -8793,7 +8793,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/red_hos, +/obj/item/folder/red_hos, /turf/simulated/floor/carpet, /area/centcom/command) "IH" = ( @@ -8803,7 +8803,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 4 }, @@ -8813,7 +8813,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/device/megaphone, +/obj/item/megaphone, /turf/simulated/floor/carpet, /area/centcom/command) "IM" = ( @@ -8824,14 +8824,14 @@ /obj/item/clothing/shoes/boots/tactical, /obj/item/clothing/suit/armor/tactical, /obj/item/clothing/under/tactical, -/obj/item/weapon/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, /obj/structure/closet{ desc = "It's a storage unit for standard-issue attire."; name = "tactical equipment" }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, -/obj/item/weapon/storage/backpack/satchel/sec, +/obj/item/storage/backpack/dufflebag/syndie/med, +/obj/item/storage/backpack/satchel/sec, /turf/simulated/floor/tiled/dark, /area/centcom/security) "IN" = ( @@ -8918,8 +8918,8 @@ "Ja" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/gun/energy/gun/burst, +/obj/item/gun/energy/gun/burst, +/obj/item/gun/energy/gun/burst, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Jb" = ( @@ -8940,13 +8940,13 @@ "Jd" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/lasercannon, -/obj/item/weapon/gun/energy/lasercannon, +/obj/item/gun/energy/lasercannon, +/obj/item/gun/energy/lasercannon, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Je" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, @@ -9018,8 +9018,8 @@ /area/shuttle/ccboat) "Jm" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, @@ -9043,11 +9043,11 @@ dir = 1; pixel_y = -16 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/command) "Jp" = ( @@ -9064,8 +9064,8 @@ dir = 8 }, /obj/machinery/computer/transhuman/resleeving, -/obj/item/weapon/book/manual/resleeving, -/obj/item/weapon/storage/box/backup_kit, +/obj/item/book/manual/resleeving, +/obj/item/storage/box/backup_kit, /turf/simulated/floor/tiled, /area/centcom/control) "Jr" = ( @@ -9078,7 +9078,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/white_cmo, +/obj/item/folder/white_cmo, /turf/simulated/floor/carpet, /area/centcom/command) "Jt" = ( @@ -9100,7 +9100,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -2; pixel_y = 2 }, @@ -9110,14 +9110,14 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/white_rd, +/obj/item/folder/white_rd, /turf/simulated/floor/carpet, /area/centcom/command) "Jx" = ( /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, /turf/simulated/floor/carpet, @@ -9132,7 +9132,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/yellow_ce, +/obj/item/folder/yellow_ce, /turf/simulated/floor/carpet, /area/centcom/command) "JD" = ( @@ -9239,7 +9239,7 @@ /area/centcom/security) "JN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red_hos, +/obj/item/folder/red_hos, /turf/simulated/floor/tiled, /area/centcom/security) "JO" = ( @@ -9288,59 +9288,59 @@ /obj/structure/closet{ name = "robotics parts" }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /turf/simulated/floor/tiled, @@ -9411,9 +9411,9 @@ /area/centcom/main_hall) "Kg" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled/dark, @@ -9433,15 +9433,15 @@ dir = 4 }, /obj/structure/table/marble, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/book/manual/chef_recipes, +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/material/knife/butch, +/obj/item/material/kitchen/rollingpin, +/obj/item/material/knife/butch, /turf/simulated/floor/tiled/white, /area/centcom/bar) "Kj" = ( @@ -9518,7 +9518,7 @@ /turf/simulated/floor/tiled, /area/centcom/terminal/tramfluff) "Kp" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -9567,12 +9567,12 @@ /turf/simulated/floor/tiled, /area/centcom/holding) "Kt" = ( -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/storage/box/beakers, +/obj/item/reagent_containers/dropper, /obj/structure/table/glass, /obj/structure/reagent_dispensers/virusfood{ pixel_y = 28 @@ -9630,8 +9630,8 @@ /area/centcom/security) "KD" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 }, @@ -9649,8 +9649,8 @@ /area/centcom/control) "KG" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, @@ -9749,32 +9749,32 @@ /area/centcom/command) "KV" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, @@ -9787,25 +9787,25 @@ /area/centcom/command) "KX" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 4 }, @@ -9813,7 +9813,7 @@ /area/centcom/command) "KZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -9865,7 +9865,7 @@ /area/centcom/holding) "Lj" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/item/stack/medical/bruise_pack{ pixel_x = -4; pixel_y = 3 @@ -9891,7 +9891,7 @@ /turf/simulated/floor/tiled, /area/centcom/terminal) "Ll" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled, /area/centcom/security) "Lm" = ( @@ -9920,12 +9920,12 @@ /area/centcom/security) "Lo" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/syringe/inaprovaline, -/obj/item/weapon/reagent_containers/syringe/inaprovaline{ +/obj/item/reagent_containers/syringe/inaprovaline, +/obj/item/reagent_containers/syringe/inaprovaline{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe/inaprovaline{ +/obj/item/reagent_containers/syringe/inaprovaline{ pixel_y = 10 }, /obj/effect/floor_decal/borderfloor, @@ -9944,7 +9944,7 @@ /obj/item/bodybag/cryobag{ pixel_x = 6 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 5; pixel_y = 5 }, @@ -9958,9 +9958,9 @@ /obj/structure/table/rack{ dir = 4 }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, @@ -9992,7 +9992,7 @@ /area/centcom/restaurant) "Lw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /turf/simulated/floor/tiled, /area/centcom/security) "Lx" = ( @@ -10058,7 +10058,7 @@ "LE" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/book/codex, +/obj/item/book/codex, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 26 @@ -10279,7 +10279,7 @@ /area/centcom/medical) "Me" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 3 }, @@ -10297,11 +10297,11 @@ dir = 8; pixel_x = 16 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/command) "Ml" = ( @@ -10352,7 +10352,7 @@ /area/centcom/security) "Mr" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/grilledcheese, +/obj/item/reagent_containers/food/snacks/grilledcheese, /turf/simulated/floor/wood, /area/centcom/restaurant) "Ms" = ( @@ -10492,18 +10492,18 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = -8 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = 8 }, -/obj/item/weapon/backup_implanter, +/obj/item/backup_implanter, /turf/simulated/floor/tiled/white, /area/centcom/medical) "MJ" = ( /obj/structure/table/glass, -/obj/item/device/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "MK" = ( @@ -10647,7 +10647,7 @@ /turf/simulated/floor/tiled/freezer, /area/centcom/bathroom) "Ne" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/dark, /area/centcom/medical) "Nf" = ( @@ -10691,7 +10691,7 @@ /area/centcom/bathroom) "Nk" = ( /obj/structure/table/glass, -/obj/item/device/defib_kit/compact/loaded, +/obj/item/defib_kit/compact/loaded, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Nl" = ( @@ -10719,8 +10719,8 @@ /area/centcom/living) "Nm" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/cups, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, +/obj/item/storage/box/cups, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -10763,7 +10763,7 @@ /obj/effect/floor_decal/corner/blue/bordercorner2{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -10803,8 +10803,8 @@ "Nt" = ( /obj/structure/table/standard, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/box/teargas, -/obj/item/weapon/storage/box/teargas, +/obj/item/storage/box/teargas, +/obj/item/storage/box/teargas, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Nv" = ( @@ -10812,7 +10812,7 @@ /turf/simulated/floor/tiled, /area/shuttle/centcom/ccbay) "Nw" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/structure/reagent_dispensers/peppertank{ pixel_x = 30 }, @@ -10880,7 +10880,7 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/ids, /turf/simulated/floor/tiled, /area/centcom/command) "NH" = ( @@ -10961,7 +10961,7 @@ /area/centcom/security) "NP" = ( /obj/structure/table/standard, -/obj/item/weapon/soap, +/obj/item/soap, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 }, @@ -10981,7 +10981,7 @@ /turf/simulated/floor/tiled/white, /area/centcom/bathroom) "NS" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -11024,11 +11024,11 @@ /area/centcom/medical) "NW" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/dark, @@ -11065,15 +11065,15 @@ "Od" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, @@ -11169,7 +11169,7 @@ /area/centcom/bathroom) "Oq" = ( /obj/structure/table/reinforced, -/obj/item/device/camera, +/obj/item/camera, /obj/effect/floor_decal/borderfloor{ dir = 10 }, @@ -11201,8 +11201,8 @@ /area/shuttle/escape) "Ou" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/gun/energy/taser, +/obj/item/book/manual/security_space_law, +/obj/item/gun/energy/taser, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled, @@ -11226,7 +11226,7 @@ }) "Ow" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/ids, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled, @@ -11279,11 +11279,11 @@ /area/centcom/terminal/tramfluff) "OE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/door/window/brigdoor{ dir = 2 }, @@ -11419,7 +11419,7 @@ /area/centcom/bathroom) "Pf" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/meatsteak, +/obj/item/reagent_containers/food/snacks/meatsteak, /turf/simulated/floor/wood, /area/centcom/restaurant) "Pg" = ( @@ -11496,7 +11496,7 @@ }) "Pq" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/borderfloorblack{ dir = 10 }, @@ -11524,9 +11524,9 @@ /area/shuttle/escape) "Pu" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -11539,19 +11539,19 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 8 }, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OPlus{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OPlus{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OPlus{ pixel_x = 4; pixel_y = 2 }, -/obj/item/device/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Pv" = ( @@ -11821,9 +11821,9 @@ /area/centcom/main_hall) "Qa" = ( /obj/structure/table/steel, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/cautery, +/obj/item/autopsy_scanner, +/obj/item/surgical/scalpel, +/obj/item/surgical/cautery, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 @@ -12033,7 +12033,7 @@ /turf/simulated/floor/tiled, /area/centcom) "QD" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled, /area/centcom/bathroom) "QE" = ( @@ -12044,7 +12044,7 @@ /area/centcom) "QF" = ( /obj/structure/table/standard, -/obj/item/weapon/soap, +/obj/item/soap, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -12102,8 +12102,8 @@ /area/centcom/restaurant) "QW" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/flame/lighter/zippo, +/obj/item/storage/fancy/cigarettes, /turf/simulated/floor/carpet, /area/centcom/restaurant) "QX" = ( @@ -12121,8 +12121,8 @@ "QY" = ( /obj/structure/table/rack, /obj/item/clothing/suit/armor/riot, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/shield/riot, +/obj/item/melee/baton/loaded, +/obj/item/shield/riot, /obj/item/clothing/head/helmet/riot, /obj/effect/floor_decal/borderfloorblack{ dir = 9 @@ -12149,8 +12149,8 @@ "Rb" = ( /obj/structure/table/rack, /obj/item/clothing/suit/armor/riot, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/shield/riot, +/obj/item/melee/baton/loaded, +/obj/item/shield/riot, /obj/item/clothing/head/helmet/riot, /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -12177,8 +12177,8 @@ "Rh" = ( /obj/structure/table/rack, /obj/item/clothing/suit/armor/riot, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/shield/riot, +/obj/item/melee/baton/loaded, +/obj/item/shield/riot, /obj/item/clothing/head/helmet/riot, /obj/effect/floor_decal/borderfloorblack{ dir = 5 @@ -12236,7 +12236,7 @@ pixel_y = 30 }, /obj/structure/table/reinforced, -/obj/item/weapon/gun/projectile/shotgun/pump/combat{ +/obj/item/gun/projectile/shotgun/pump/combat{ name = "Discipline" }, /obj/effect/floor_decal/borderfloorblack{ @@ -12253,9 +12253,9 @@ pixel_y = 26 }, /obj/structure/table/reinforced, -/obj/item/weapon/stamp/ward, -/obj/item/weapon/stamp/denied, -/obj/item/device/binoculars, +/obj/item/stamp/ward, +/obj/item/stamp/denied, +/obj/item/binoculars, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -12265,7 +12265,7 @@ /turf/simulated/floor/tiled/dark, /area/centcom/security) "Ro" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -12556,7 +12556,7 @@ /turf/simulated/floor/tiled/white, /area/centcom/control) "RY" = ( -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -6 }, /obj/structure/table/standard, @@ -12611,8 +12611,8 @@ dir = 5 }, /obj/structure/table/reinforced, -/obj/item/device/camera, -/obj/item/weapon/storage/box/ids, +/obj/item/camera, +/obj/item/storage/box/ids, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" @@ -12644,7 +12644,7 @@ /turf/simulated/floor/tiled, /area/centcom/control) "Sj" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/wood, @@ -12653,7 +12653,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -12715,8 +12715,8 @@ dir = 10 }, /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" @@ -12747,7 +12747,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/item/device/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Sx" = ( @@ -12853,7 +12853,7 @@ "SN" = ( /obj/effect/floor_decal/industrial/outline, /obj/structure/closet/secure_closet/nanotrasen_security, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled/dark, /area/centcom/security) "SO" = ( @@ -12953,7 +12953,7 @@ "SW" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/closet/secure_closet/nanotrasen_warden, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled/dark, /area/centcom/security) "SX" = ( @@ -12966,8 +12966,8 @@ }) "SZ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/hotdog, -/obj/item/weapon/reagent_containers/food/snacks/hotdog{ +/obj/item/reagent_containers/food/snacks/hotdog, +/obj/item/reagent_containers/food/snacks/hotdog{ pixel_x = -5; pixel_y = -3 }, @@ -12975,7 +12975,7 @@ /area/centcom/restaurant) "Ta" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, /turf/simulated/floor/wood, /area/centcom/restaurant) "Tb" = ( @@ -13014,7 +13014,7 @@ /area/centcom/command) "Tf" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /obj/machinery/camera/network/crescent{ dir = 4 }, @@ -13037,7 +13037,7 @@ /area/shuttle/escape) "Ti" = ( /obj/structure/table/reinforced, -/obj/item/weapon/card/id/gold/captain/spare, +/obj/item/card/id/gold/captain/spare, /turf/simulated/floor/tiled, /area/centcom/control) "Tj" = ( @@ -13065,8 +13065,8 @@ "Tn" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/sniperrifle, -/obj/item/weapon/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, /turf/simulated/floor/tiled/dark, /area/centcom/security) "To" = ( @@ -13081,7 +13081,7 @@ /area/shuttle/escape) "Tq" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled, /area/centcom/bathroom) "Tr" = ( @@ -13092,12 +13092,12 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; @@ -13138,8 +13138,8 @@ "Tw" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/gun/energy/netgun, +/obj/item/gun/energy/netgun, +/obj/item/gun/energy/netgun, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Tz" = ( @@ -13218,13 +13218,13 @@ "TJ" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, /turf/simulated/floor/tiled/dark, /area/centcom/security) "TK" = ( @@ -13235,7 +13235,7 @@ /area/centcom/main_hall) "TL" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /turf/simulated/floor/carpet, /area/centcom/restaurant) "TM" = ( @@ -13453,7 +13453,7 @@ /area/centcom/evac) "Ui" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/frags, +/obj/item/storage/box/frags, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -13494,8 +13494,8 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" @@ -13528,7 +13528,7 @@ }) "Uq" = ( /obj/structure/table/standard, -/obj/item/weapon/soap, +/obj/item/soap, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 }, @@ -13572,11 +13572,11 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled, /area/centcom/command) @@ -13588,9 +13588,9 @@ dir = 10 }, /obj/structure/table/reinforced, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/gun/energy/taser, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/gun/energy/taser, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" @@ -13615,9 +13615,9 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/blue/border, /obj/structure/closet/secure_closet/nanotrasen_security, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/shield/riot, +/obj/item/storage/box/handcuffs, +/obj/item/gun/energy/gun, +/obj/item/shield/riot, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" @@ -13632,9 +13632,9 @@ dir = 9 }, /obj/structure/closet/secure_closet/nanotrasen_security, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/shield/riot, +/obj/item/storage/box/handcuffs, +/obj/item/gun/energy/gun, +/obj/item/shield/riot, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" @@ -13672,8 +13672,8 @@ /turf/simulated/floor/tiled, /area/centcom/evac) "UG" = ( -/obj/item/weapon/storage/box/evidence, -/obj/item/weapon/folder/red, +/obj/item/storage/box/evidence, +/obj/item/folder/red, /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -13685,17 +13685,17 @@ /area/centcom/security) "UH" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/empslite{ +/obj/item/storage/box/empslite{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/box/empslite, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/empslite, +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, @@ -13703,22 +13703,22 @@ /area/centcom/security) "UJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled/dark, /area/centcom/security) "UK" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/roastbeef, +/obj/item/reagent_containers/food/snacks/roastbeef, /turf/simulated/floor/wood, /area/centcom/restaurant) "UL" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -13750,12 +13750,12 @@ /area/centcom/restaurant) "UQ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/pastatomato, +/obj/item/reagent_containers/food/snacks/pastatomato, /turf/simulated/floor/wood, /area/centcom/restaurant) "UR" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/meatballspagetti, +/obj/item/reagent_containers/food/snacks/meatballspagetti, /turf/simulated/floor/wood, /area/centcom/restaurant) "US" = ( @@ -13769,7 +13769,7 @@ /turf/simulated/floor/tiled, /area/centcom/evac) "UW" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/orange/border, /turf/simulated/floor/tiled/dark, @@ -13782,39 +13782,39 @@ /area/centcom/restaurant) "UY" = ( /obj/structure/table/standard, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/hand_labeler, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/simulated/floor/tiled, /area/centcom/control) "UZ" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, @@ -13867,13 +13867,13 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/tool/crowbar, +/obj/item/storage/belt/utility, +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 6 }, @@ -13990,8 +13990,8 @@ }) "Vv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/material/minihoe, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/material/minihoe, +/obj/item/analyzer/plant_analyzer, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -14008,12 +14008,12 @@ /area/shuttle/ccboat) "Vx" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/kitsuneudon, +/obj/item/reagent_containers/food/snacks/kitsuneudon, /turf/simulated/floor/wood, /area/centcom/restaurant) "Vy" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/lasagna, +/obj/item/reagent_containers/food/snacks/lasagna, /turf/simulated/floor/wood, /area/centcom/restaurant) "Vz" = ( @@ -14021,7 +14021,7 @@ /turf/simulated/floor/tiled, /area/centcom/restaurant) "VA" = ( -/obj/item/device/camera{ +/obj/item/camera{ desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; @@ -14116,7 +14116,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/blue_hop, +/obj/item/folder/blue_hop, /turf/simulated/floor/carpet, /area/centcom/command) "VM" = ( @@ -14137,15 +14137,15 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/command) "VP" = ( -/obj/item/device/taperecorder, +/obj/item/taperecorder, /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorblack{ dir = 10 @@ -14158,11 +14158,11 @@ "VQ" = ( /obj/structure/table/standard, /obj/effect/floor_decal/borderfloor, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/command) "VR" = ( @@ -14177,24 +14177,24 @@ /obj/structure/reagent_dispensers/peppertank{ pixel_x = 30 }, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 26 @@ -14385,7 +14385,7 @@ /turf/simulated/floor/tiled, /area/centcom/security) "Wl" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/lino, /area/centcom/restaurant) "Wm" = ( @@ -14562,7 +14562,7 @@ /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/paleblue/bordercorner2, /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /turf/simulated/floor/tiled/white, /area/centcom/medical) "WE" = ( @@ -14726,7 +14726,7 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -14735,17 +14735,17 @@ /area/centcom/command) "Xb" = ( /obj/structure/table/rack, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Xc" = ( @@ -14831,7 +14831,7 @@ /area/centcom) "Xr" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/energy/taser, +/obj/item/gun/energy/taser, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 26 @@ -14841,7 +14841,7 @@ "Xs" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/xray, +/obj/item/gun/energy/xray, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Xt" = ( @@ -14874,7 +14874,7 @@ /area/centcom/security) "Xx" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine, +/obj/item/reagent_containers/food/drinks/bottle/grenadine, /turf/simulated/floor/lino, /area/centcom/restaurant) "Xy" = ( @@ -14882,7 +14882,7 @@ /area/centcom/command) "Xz" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite{ dir = 6 }, @@ -14903,7 +14903,7 @@ /area/centcom/terminal/tramfluff) "XB" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cola, +/obj/item/reagent_containers/food/drinks/bottle/cola, /turf/simulated/floor/lino, /area/centcom/restaurant) "XD" = ( @@ -14915,12 +14915,12 @@ /area/centcom/security) "XE" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind, +/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind, /turf/simulated/floor/lino, /area/centcom/restaurant) "XF" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich{ +/obj/item/reagent_containers/food/snacks/toastedsandwich{ pixel_y = 10 }, /turf/simulated/floor/lino, @@ -14933,8 +14933,8 @@ dir = 1 }, /obj/structure/table/woodentable, -/obj/item/device/radio/off, -/obj/item/device/megaphone, +/obj/item/radio/off, +/obj/item/megaphone, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/dark, /area/centcom/command) @@ -15011,8 +15011,8 @@ /area/centcom/security) "XU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, @@ -15023,7 +15023,7 @@ /area/centcom/security) "XV" = ( /obj/structure/table/reinforced, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/tiled/dark, /area/centcom/security) "XW" = ( @@ -15074,7 +15074,7 @@ /area/centcom/terminal) "Yd" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/machinery/camera/network/crescent, /obj/effect/floor_decal/borderfloorblack{ dir = 5 @@ -15158,17 +15158,17 @@ /area/centcom/restaurant) "Ys" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/seccarts{ +/obj/item/storage/box/seccarts{ pixel_x = 3; pixel_y = 2 }, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -15191,7 +15191,7 @@ /area/centcom/living) "Yu" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/borderfloorblack{ dir = 6 }, @@ -15214,11 +15214,11 @@ /area/centcom/security) "Yx" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -15239,7 +15239,7 @@ /area/centcom/main_hall) "Yz" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, @@ -15327,11 +15327,11 @@ dir = 6 }, /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{ +/obj/item/reagent_containers/food/drinks/flask/barflask{ pixel_x = -4; pixel_y = 8 }, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/tiled/dark, /area/centcom/command) "YJ" = ( @@ -15360,7 +15360,7 @@ dir = 6 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/simulated/floor/tiled/white, /area/centcom/medical) "YN" = ( @@ -15481,9 +15481,9 @@ /area/centcom/bathroom) "Zh" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask, -/obj/item/weapon/reagent_containers/glass/rag, -/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, +/obj/item/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/food/drinks/flask/vacuumflask, /turf/simulated/floor/lino, /area/centcom/restaurant) "Zj" = ( @@ -15519,8 +15519,8 @@ /area/centcom/security) "Zp" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/deck/cards, +/obj/item/storage/pill_bottle/dice, +/obj/item/deck/cards, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Zq" = ( @@ -15638,7 +15638,7 @@ /turf/simulated/floor/tiled/dark, /area/centcom/security) "ZG" = ( -/obj/item/weapon/paper{ +/obj/item/paper{ info = "You're not supposed to be here."; name = "unnerving letter" }, @@ -15685,12 +15685,12 @@ /area/centcom/bar) "ZN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/tool/screwdriver, +/obj/item/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/tool/screwdriver, +/obj/item/tool/wrench, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled{ icon_state = "dark" diff --git a/maps/stellar_delight/ship_misc.dmm b/maps/stellar_delight/ship_misc.dmm index 2693ec1a859..251e171f688 100644 --- a/maps/stellar_delight/ship_misc.dmm +++ b/maps/stellar_delight/ship_misc.dmm @@ -758,24 +758,24 @@ /area/unknown/dorm1) "cq" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm1) "cr" = ( @@ -848,24 +848,24 @@ /area/unknown/dorm2) "cD" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm2) "cE" = ( @@ -881,24 +881,24 @@ /area/unknown/dorm3) "cH" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm3) "cI" = ( @@ -930,7 +930,7 @@ /turf/simulated/shuttle/floor/alien, /area/unknown/dorm1) "cO" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unkone" }, @@ -984,7 +984,7 @@ /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) "cV" = ( -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /obj/structure/bed/double/padded, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm1) @@ -993,14 +993,14 @@ /turf/simulated/shuttle/floor/alien, /area/unknown/dorm2) "cX" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unktwo" }, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm2) "cY" = ( -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /obj/structure/bed/double/padded, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm2) @@ -1016,14 +1016,14 @@ /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) "db" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unkthree" }, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm3) "dc" = ( -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /obj/structure/bed/double/padded, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm3) @@ -1310,7 +1310,7 @@ /obj/item/clothing/head/helmet/thunderdome, /obj/item/clothing/suit/armor/tdome/red, /obj/item/clothing/under/color/red, -/obj/item/weapon/holo/esword/red, +/obj/item/holo/esword/red, /obj/effect/floor_decal/corner/red{ dir = 5 }, @@ -1539,7 +1539,7 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_meetinghall) "eM" = ( -/obj/item/weapon/beach_ball, +/obj/item/beach_ball, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) "eN" = ( @@ -1632,7 +1632,7 @@ /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) "fa" = ( -/obj/item/weapon/beach_ball/holoball, +/obj/item/beach_ball/holoball, /obj/effect/floor_decal/corner/red{ dir = 10 }, @@ -1645,7 +1645,7 @@ /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) "fc" = ( -/obj/item/weapon/inflatable_duck, +/obj/item/inflatable_duck, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) "fd" = ( @@ -1696,7 +1696,7 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_gym) "fm" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /turf/simulated/floor/holofloor/tiled{ @@ -1869,7 +1869,7 @@ /area/unknown/dorm6) "fN" = ( /obj/structure/table/woodentable/holotable, -/obj/item/weapon/dice/d8, +/obj/item/dice/d8, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_game_room) "fO" = ( @@ -1937,7 +1937,7 @@ /obj/item/clothing/head/helmet/thunderdome, /obj/item/clothing/suit/armor/tdome/green, /obj/item/clothing/under/color/green, -/obj/item/weapon/holo/esword/green, +/obj/item/holo/esword/green, /obj/effect/floor_decal/corner/green{ dir = 10 }, @@ -2026,21 +2026,21 @@ /area/beach) "gm" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, /turf/unsimulated/beach/sand, /area/beach) "gn" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, /turf/unsimulated/beach/sand, /area/beach) "go" = ( -/obj/item/weapon/beach_ball, +/obj/item/beach_ball, /turf/unsimulated/beach/sand, /area/beach) "gp" = ( @@ -2122,24 +2122,24 @@ /area/unknown/dorm4) "gE" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm4) "gF" = ( @@ -2155,24 +2155,24 @@ /area/unknown/dorm5) "gI" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm5) "gJ" = ( @@ -2188,24 +2188,24 @@ /area/unknown/dorm6) "gM" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm6) "gN" = ( @@ -2234,7 +2234,7 @@ /turf/simulated/shuttle/floor/alien, /area/unknown/dorm4) "gT" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unkfour" }, @@ -2242,7 +2242,7 @@ /area/unknown/dorm4) "gU" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm4) "gV" = ( @@ -2250,7 +2250,7 @@ /turf/simulated/shuttle/floor/alien, /area/unknown/dorm5) "gW" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unkfive" }, @@ -2258,7 +2258,7 @@ /area/unknown/dorm5) "gX" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm5) "gY" = ( @@ -2266,7 +2266,7 @@ /turf/simulated/shuttle/floor/alien, /area/unknown/dorm6) "gZ" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unksix" }, @@ -2274,7 +2274,7 @@ /area/unknown/dorm6) "ha" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm6) "hb" = ( @@ -2506,7 +2506,7 @@ /area/space) "ml" = ( /obj/structure/table/holotable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, @@ -2546,8 +2546,8 @@ /area/holodeck/source_gym) "ov" = ( /obj/structure/table/woodentable/holotable, -/obj/item/weapon/dice/d12, -/obj/item/weapon/dice/d10, +/obj/item/dice/d12, +/obj/item/dice/d10, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_game_room) "oJ" = ( @@ -2606,7 +2606,7 @@ /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) "rD" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/corner/paleblue{ @@ -2635,7 +2635,7 @@ /turf/unsimulated/wall, /area/ai_multicam_room) "tR" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/corner/paleblue/full{ @@ -2765,8 +2765,8 @@ /area/holodeck/source_patient_ward) "BR" = ( /obj/structure/table/woodentable/holotable, -/obj/item/weapon/dice/d100, -/obj/item/weapon/dice/d20, +/obj/item/dice/d100, +/obj/item/dice/d20, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_game_room) "BU" = ( @@ -2820,7 +2820,7 @@ /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) "Eq" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/corner/paleblue{ @@ -2906,7 +2906,7 @@ }, /area/holodeck/source_patient_ward) "Lt" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/corner/paleblue/full{ @@ -2942,8 +2942,8 @@ /area/holodeck/source_gym) "Nj" = ( /obj/structure/table/woodentable/holotable, -/obj/item/weapon/dice, -/obj/item/weapon/dice/d4, +/obj/item/dice, +/obj/item/dice/d4, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_game_room) "NT" = ( @@ -3001,7 +3001,7 @@ /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_game_room) "SJ" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/corner/paleblue{ diff --git a/maps/stellar_delight/stellar_delight1.dmm b/maps/stellar_delight/stellar_delight1.dmm index 944baf45ec4..9da49823771 100644 --- a/maps/stellar_delight/stellar_delight1.dmm +++ b/maps/stellar_delight/stellar_delight1.dmm @@ -21,7 +21,7 @@ "ac" = ( /obj/structure/table/steel_reinforced, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 1; name = "night shift APC"; nightshift_setting = 2 @@ -41,14 +41,14 @@ /area/chapel/main) "ae" = ( /obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/item/clothing/accessory/badge/holo/cord, /obj/item/clothing/accessory/badge/holo/cord, /obj/machinery/alarm/angled{ dir = 4 }, /obj/effect/floor_decal/milspec/color/red, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "af" = ( @@ -61,7 +61,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/book/manual/resleeving, +/obj/item/book/manual/resleeving, /turf/simulated/floor/tiled/steel_grid, /area/assembly/robotics) "ag" = ( @@ -116,7 +116,7 @@ dir = 4 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/machinery/light{ dir = 1 }, @@ -218,7 +218,7 @@ color = "#42038a"; icon_state = "0-4" }, -/obj/item/weapon/storage/box/backup_kit, +/obj/item/storage/box/backup_kit, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -290,12 +290,12 @@ dir = 8; layer = 2.6 }, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/effect/floor_decal/milspec/color/red, -/obj/item/device/personal_shield_generator/security/loaded, +/obj/item/personal_shield_generator/security/loaded, /turf/simulated/floor/tiled/dark, /area/security/tactical) "aC" = ( @@ -342,11 +342,11 @@ /obj/structure/bookcase{ name = "bookcase (Religious)" }, -/obj/item/weapon/book/bundle/custom_library/religious/zoroastrianism, -/obj/item/weapon/book/custom_library/religious/feastofkubera, -/obj/item/weapon/book/custom_library/religious/storyoflordganesha, -/obj/item/weapon/book/custom_library/religious/sungoddessofkorea, -/obj/item/weapon/book/custom_library/religious/wayofbleedingswan, +/obj/item/book/bundle/custom_library/religious/zoroastrianism, +/obj/item/book/custom_library/religious/feastofkubera, +/obj/item/book/custom_library/religious/storyoflordganesha, +/obj/item/book/custom_library/religious/sungoddessofkorea, +/obj/item/book/custom_library/religious/wayofbleedingswan, /turf/simulated/floor/wood, /area/library) "aH" = ( @@ -451,19 +451,19 @@ /area/stellardelight/deck1/starboard) "aR" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/clipboard, +/obj/item/folder/white, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/exam_room) "aS" = ( /turf/simulated/wall/bay/r_wall/steel, /area/security/security_equiptment_storage) "aT" = ( -/obj/item/weapon/storage/box/nifsofts_mining, +/obj/item/storage/box/nifsofts_mining, /obj/structure/table/reinforced, -/obj/item/device/personal_shield_generator/belt/mining/loaded, +/obj/item/personal_shield_generator/belt/mining/loaded, /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/miningequipment) "aU" = ( @@ -687,8 +687,8 @@ /obj/effect/floor_decal/milspec/color/red/half{ dir = 8 }, -/obj/item/weapon/storage/box/evidence, -/obj/item/weapon/storage/box/evidence, +/obj/item/storage/box/evidence, +/obj/item/storage/box/evidence, /obj/structure/closet/walllocker_double/security/west{ name = "evidence storage cabinet" }, @@ -902,7 +902,7 @@ /area/security/armoury) "bJ" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/alarm/angled{ dir = 4 }, @@ -1102,9 +1102,9 @@ /area/stellardelight/deck1/exploration) "cf" = ( /obj/structure/table/steel, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/surgical/cautery, +/obj/item/surgical/scalpel, +/obj/item/autopsy_scanner, +/obj/item/surgical/cautery, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -1190,12 +1190,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /turf/simulated/floor/carpet/bcarpet, /area/stellardelight/deck1/starboard) "cm" = ( /obj/structure/table/reinforced, -/obj/item/weapon/forensics/sample_kit, +/obj/item/forensics/sample_kit, /obj/effect/floor_decal/milspec/color/red/half{ dir = 10 }, @@ -1299,26 +1299,26 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/research) "cx" = ( -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, -/obj/item/device/multitool, +/obj/item/multitool, /obj/item/clothing/head/welding, -/obj/item/weapon/storage/belt/utility, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/storage/belt/utility, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, /obj/item/stack/cable_coil{ pixel_x = 3; pixel_y = -7 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, -/obj/item/device/assembly/signaler, -/obj/item/device/assembly/signaler, +/obj/item/assembly/signaler, +/obj/item/assembly/signaler, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -1515,14 +1515,14 @@ /area/stellardelight/deck1/oreprocessing) "cR" = ( /obj/effect/floor_decal/industrial/warning, -/obj/item/device/defib_kit/jumper_kit, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/defib_kit/jumper_kit, +/obj/item/storage/box/gloves, +/obj/item/storage/box/bodybags{ pixel_x = -3; pixel_y = -2 }, -/obj/item/weapon/book/manual/robotics_manual, -/obj/item/weapon/book/manual/robotics_cyborgs, +/obj/item/book/manual/robotics_manual, +/obj/item/book/manual/robotics_cyborgs, /obj/structure/closet/walllocker_double/science/east, /turf/simulated/floor/tiled/steel_dirty, /area/assembly/robotics) @@ -1623,7 +1623,7 @@ /turf/simulated/floor/carpet, /area/stellardelight/deck1/dorms/dorm4) "dd" = ( -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = -24 }, @@ -1888,10 +1888,10 @@ /turf/simulated/floor, /area/maintenance/stellardelight/substation/medical) "dz" = ( -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/item/clothing/glasses/welding, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/device/multitool, +/obj/item/storage/box/lights/mixed, +/obj/item/multitool, /obj/structure/sink/kitchen{ dir = 4; pixel_x = 11 @@ -1923,22 +1923,22 @@ /turf/simulated/floor/tiled/dark, /area/security/security_cell_hallway) "dC" = ( -/obj/item/weapon/shovel, -/obj/item/weapon/shovel, -/obj/item/weapon/shovel, -/obj/item/weapon/shovel, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, +/obj/item/shovel, +/obj/item/shovel, +/obj/item/shovel, +/obj/item/shovel, +/obj/item/tool/wrench, +/obj/item/tool/wrench, +/obj/item/tool/wrench, +/obj/item/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/pickaxe, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -1966,10 +1966,10 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "dE" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/structure/closet/walllocker_double/cargo/west{ name = "suit cooling units" }, @@ -2030,22 +2030,22 @@ /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/miningequipment) "dM" = ( -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/storage/box/syringes, +/obj/item/storage/box/beakers, +/obj/item/storage/box/gloves, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/item/robot_parts/l_arm, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/weapon/material/knife/machete/hatchet, -/obj/item/weapon/material/knife/machete/hatchet, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/minihoe, +/obj/item/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, +/obj/item/material/knife/machete/hatchet, +/obj/item/material/knife/machete/hatchet, +/obj/item/material/minihoe, +/obj/item/material/minihoe, /obj/item/inflatable/door, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/weapon/storage/box/botanydisk, -/obj/item/weapon/storage/box/botanydisk, +/obj/item/storage/box/botanydisk, +/obj/item/storage/box/botanydisk, /obj/structure/closet/walllocker_double/science/west{ name = "xenoflora supplies" }, @@ -2150,7 +2150,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -2191,11 +2191,11 @@ /area/stellardelight/deck1/oreprocessing) "dZ" = ( /obj/structure/table/standard, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/reagent_containers/dropper{ +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, +/obj/item/reagent_containers/dropper{ pixel_y = -4 }, /obj/item/clothing/glasses/omnihud/rnd, @@ -2250,10 +2250,10 @@ /area/security/tactical) "ef" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit{ +/obj/item/suit_cooling_unit{ pixel_y = -5 }, -/obj/item/device/suit_cooling_unit{ +/obj/item/suit_cooling_unit{ pixel_y = -5 }, /obj/machinery/alarm/angled, @@ -2309,23 +2309,23 @@ /turf/simulated/wall/bay/r_wall/steel, /area/maintenance/stellardelight/deck1/portaft) "el" = ( -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /obj/structure/closet/walllocker_double/east, /obj/structure/table/reinforced, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/storage/box/beakers, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology) "em" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/alarm/angled{ dir = 8 }, @@ -2401,18 +2401,18 @@ /obj/structure/closet/walllocker_double/misc_civ/east{ name = "supernatural supplies" }, -/obj/item/weapon/entrepreneur/spirit_board, -/obj/item/weapon/entrepreneur/emf, -/obj/item/weapon/entrepreneur/crystal_ball, -/obj/item/weapon/entrepreneur/horoscope, -/obj/item/weapon/deck/tarot, +/obj/item/entrepreneur/spirit_board, +/obj/item/entrepreneur/emf, +/obj/item/entrepreneur/crystal_ball, +/obj/item/entrepreneur/horoscope, +/obj/item/deck/tarot, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/entrepreneur) "ev" = ( /obj/machinery/computer/transhuman/resleeving{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -2445,7 +2445,7 @@ "ez" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/sterile/latex, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /turf/simulated/floor/tiled/white, /area/security/detectives_office) "eA" = ( @@ -2536,8 +2536,8 @@ /area/library) "eJ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/storage/briefcase, +/obj/item/paper_bin, +/obj/item/storage/briefcase, /obj/machinery/light, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/entrepreneur) @@ -2584,7 +2584,7 @@ /area/stellardelight/deck1/starboard) "eO" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/curtain/open/privacy, /obj/structure/sign/painting/library_secure{ pixel_y = 30 @@ -2723,9 +2723,9 @@ /turf/simulated/floor/tiled/white, /area/security/detectives_office) "fe" = ( -/obj/item/device/camera, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/camera, +/obj/item/folder/yellow, +/obj/item/pen, /obj/structure/cable/green{ color = "#42038a"; icon_state = "1-2" @@ -2816,7 +2816,7 @@ /obj/machinery/r_n_d/circuit_imprinter{ dir = 1 }, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /obj/machinery/light{ dir = 4 }, @@ -2889,19 +2889,19 @@ /turf/simulated/floor/tiled/eris, /area/stellardelight/deck1/researchequip) "fy" = ( -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, -/obj/item/weapon/paper_bin{ +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/stamp/ward, -/obj/item/weapon/stamp/denied{ +/obj/item/stamp/ward, +/obj/item/stamp/denied{ pixel_x = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/table/steel_reinforced, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled/dark, @@ -2963,10 +2963,10 @@ /area/security/security_cell_hallway) "fG" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/gps/security{ +/obj/item/gps/security{ pixel_y = 3 }, -/obj/item/device/gps/security{ +/obj/item/gps/security{ pixel_x = -3 }, /obj/effect/floor_decal/milspec/color/red, @@ -3010,7 +3010,7 @@ /area/stellardelight/deck1/resleeving) "fM" = ( /obj/structure/closet/l3closet/scientist, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -3124,7 +3124,7 @@ id = "securitylockdown" }, /obj/effect/floor_decal/milspec/color/red, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/dark, /area/security/lobby) "fV" = ( @@ -3361,14 +3361,14 @@ /area/maintenance/stellardelight/deck1/starboardcent) "gC" = ( /obj/structure/table/steel, -/obj/item/device/sleevemate, -/obj/item/device/camera{ +/obj/item/sleevemate, +/obj/item/camera{ name = "Autopsy Camera"; pixel_x = -2; pixel_y = 7 }, /obj/machinery/alarm/angled, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -3383,15 +3383,15 @@ /area/stellardelight/deck1/resleeving) "gE" = ( /obj/structure/closet/wardrobe/chaplain_black, -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/flame/candle/candelabra, -/obj/item/weapon/flame/candle/candelabra, -/obj/item/weapon/flame/candle/candelabra, -/obj/item/weapon/flame/candle/candelabra, -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, -/obj/item/weapon/nullrod, -/obj/item/weapon/deck/tarot, -/obj/item/device/retail_scanner/civilian, +/obj/item/storage/fancy/crayons, +/obj/item/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, +/obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/item/nullrod, +/obj/item/deck/tarot, +/obj/item/retail_scanner/civilian, /turf/simulated/floor/lino, /area/chapel/office) "gF" = ( @@ -3464,7 +3464,7 @@ dir = 4 }, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; req_access = list(31,5) }, @@ -3773,10 +3773,10 @@ /area/stellardelight/deck1/aft) "hu" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_y = 7 }, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_y = -5 }, /obj/effect/floor_decal/milspec/color/black, @@ -3870,16 +3870,16 @@ /area/stellardelight/deck1/researchserver) "hC" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_y = -2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_y = -8 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_y = 11 }, /obj/machinery/atmospherics/pipe/simple/hidden/universal{ @@ -3988,7 +3988,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -4078,9 +4078,9 @@ /area/stellardelight/deck1/starboard) "hX" = ( /obj/structure/closet/walllocker_double/engineering/west, -/obj/item/weapon/storage/briefcase/inflatable, -/obj/item/weapon/storage/briefcase/inflatable, -/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, /turf/simulated/floor/tiled/eris/white/gray_platform, /area/gateway) "hY" = ( @@ -4122,7 +4122,7 @@ dir = 8 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/milspec/color/orange/half{ dir = 4 }, @@ -4372,7 +4372,7 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/starboardcent) "iB" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -4402,8 +4402,8 @@ /obj/structure/sign/painting/library_private{ pixel_y = -32 }, -/obj/item/weapon/storage/briefcase, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, +/obj/item/storage/briefcase, /obj/structure/table/rack, /turf/simulated/floor/wood, /area/library) @@ -4469,10 +4469,10 @@ /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 7 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 6 }, /obj/random/coin/sometimes, @@ -4520,11 +4520,11 @@ /area/chapel/main) "iO" = ( /obj/structure/table/steel, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 2; pixel_y = 4 }, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/alarm/angled, /turf/simulated/floor/tiled/dark, @@ -4716,9 +4716,9 @@ /area/rnd/xenobiology) "jl" = ( /obj/structure/table/steel, -/obj/item/device/retail_scanner/security, -/obj/item/device/taperecorder, -/obj/item/weapon/storage/box/evidence, +/obj/item/retail_scanner/security, +/obj/item/taperecorder, +/obj/item/storage/box/evidence, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -4762,7 +4762,7 @@ /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, /turf/simulated/floor/wood, /area/library) "jr" = ( @@ -4802,18 +4802,18 @@ /area/chapel/main) "jt" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/cell/high{ +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, /obj/effect/floor_decal/milspec/color/red, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -4957,7 +4957,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -5058,8 +5058,8 @@ /area/stellardelight/deck1/aft) "jU" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/void/expedition_medical, @@ -5316,7 +5316,7 @@ /obj/machinery/computer/message_monitor{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -5405,7 +5405,7 @@ "kM" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/closet/emcloset, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -5630,9 +5630,9 @@ /area/rnd/xenobiology) "lo" = ( /obj/structure/table/woodentable, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/taperecorder, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/taperecorder, /turf/simulated/floor/carpet, /area/library) "lp" = ( @@ -5726,7 +5726,7 @@ /obj/structure/bed/chair/backed_red{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -5787,11 +5787,11 @@ /obj/machinery/firealarm/angled, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/milspec/color/red, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/tiled/dark, /area/security/lobby) "lC" = ( -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet, @@ -5918,8 +5918,8 @@ /area/stellardelight/deck1/shuttlebay) "lQ" = ( /obj/structure/table/steel, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/monotile, /area/janitor) "lR" = ( @@ -5996,7 +5996,7 @@ /obj/machinery/computer/med_data/laptop{ dir = 4 }, -/obj/item/device/radio{ +/obj/item/radio{ anchored = 1; canhear_range = 7; frequency = 1487; @@ -6037,9 +6037,9 @@ /turf/simulated/floor/reinforced, /area/stellardelight/deck1/shuttlebay) "mc" = ( -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, /obj/structure/table/steel, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -6166,23 +6166,23 @@ /obj/structure/sign/painting/library_secure{ pixel_x = -30 }, -/obj/item/weapon/book/bundle/custom_library/fiction/apurrrrfectman, -/obj/item/weapon/book/bundle/custom_library/fiction/beyondthedoor, -/obj/item/weapon/book/bundle/custom_library/fiction/chroniclesofmargatavol1, -/obj/item/weapon/book/bundle/custom_library/fiction/coldmountain, -/obj/item/weapon/book/bundle/custom_library/fiction/ghostship, -/obj/item/weapon/book/bundle/custom_library/fiction/manfromsnowyriver, -/obj/item/weapon/book/bundle/custom_library/fiction/metalglen, -/obj/item/weapon/book/bundle/custom_library/fiction/poemsforarainyday, -/obj/item/weapon/book/bundle/custom_library/fiction/raissue142, -/obj/item/weapon/book/bundle/custom_library/fiction/raissue147, -/obj/item/weapon/book/bundle/custom_library/fiction/silence, -/obj/item/weapon/book/bundle/custom_library/fiction/taleoftherainbowcat, -/obj/item/weapon/book/custom_library/fiction/blacksmithandkinglybloke, -/obj/item/weapon/book/custom_library/fiction/irishairmanforseesdeath, -/obj/item/weapon/book/custom_library/fiction/myrock, -/obj/item/weapon/book/custom_library/fiction/starsandsometimesfallingones, -/obj/item/weapon/book/custom_library/fiction/truelovehathmyheart, +/obj/item/book/bundle/custom_library/fiction/apurrrrfectman, +/obj/item/book/bundle/custom_library/fiction/beyondthedoor, +/obj/item/book/bundle/custom_library/fiction/chroniclesofmargatavol1, +/obj/item/book/bundle/custom_library/fiction/coldmountain, +/obj/item/book/bundle/custom_library/fiction/ghostship, +/obj/item/book/bundle/custom_library/fiction/manfromsnowyriver, +/obj/item/book/bundle/custom_library/fiction/metalglen, +/obj/item/book/bundle/custom_library/fiction/poemsforarainyday, +/obj/item/book/bundle/custom_library/fiction/raissue142, +/obj/item/book/bundle/custom_library/fiction/raissue147, +/obj/item/book/bundle/custom_library/fiction/silence, +/obj/item/book/bundle/custom_library/fiction/taleoftherainbowcat, +/obj/item/book/custom_library/fiction/blacksmithandkinglybloke, +/obj/item/book/custom_library/fiction/irishairmanforseesdeath, +/obj/item/book/custom_library/fiction/myrock, +/obj/item/book/custom_library/fiction/starsandsometimesfallingones, +/obj/item/book/custom_library/fiction/truelovehathmyheart, /turf/simulated/floor/wood, /area/library) "mr" = ( @@ -6241,12 +6241,12 @@ /obj/item/clothing/suit/caution, /obj/item/clothing/suit/caution, /obj/item/clothing/suit/caution, -/obj/item/device/lightreplacer, +/obj/item/lightreplacer, /obj/structure/mopbucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, -/obj/item/weapon/storage/bag/trash, -/obj/item/weapon/soap/nanotrasen, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/storage/bag/trash, +/obj/item/soap/nanotrasen, /turf/simulated/floor/tiled/monotile, /area/janitor) "mw" = ( @@ -6383,7 +6383,7 @@ /area/stellardelight/deck1/lowermed) "mK" = ( /obj/structure/table/sifwooden_reinforced, -/obj/item/weapon/storage/box/nifsofts_pilot, +/obj/item/storage/box/nifsofts_pilot, /turf/simulated/floor/tiled/eris/steel/panels, /area/stellardelight/deck1/pilot) "mL" = ( @@ -6406,7 +6406,7 @@ pixel_y = 30 }, /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/simulated/floor/tiled/steel, /area/assembly/robotics) "mO" = ( @@ -6563,13 +6563,13 @@ /obj/structure/closet/walllocker_double/misc_civ/west{ name = "personality supplies" }, -/obj/item/device/camera/selfie, -/obj/item/device/tvcamera/streamer, -/obj/item/weapon/makeover, -/obj/item/weapon/nailpolish, -/obj/item/weapon/nailpolish_remover, -/obj/item/weapon/lipstick/random, -/obj/item/weapon/lipstick/random, +/obj/item/camera/selfie, +/obj/item/tvcamera/streamer, +/obj/item/makeover, +/obj/item/nailpolish, +/obj/item/nailpolish_remover, +/obj/item/lipstick/random, +/obj/item/lipstick/random, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/entrepreneur) "ne" = ( @@ -6669,7 +6669,7 @@ /area/stellardelight/deck1/researchserver) "nu" = ( /obj/machinery/transhuman/synthprinter, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -6924,7 +6924,7 @@ /area/stellardelight/deck1/aft) "nV" = ( /obj/structure/table/reinforced, -/obj/item/weapon/forensics/sample_kit/powder, +/obj/item/forensics/sample_kit/powder, /turf/simulated/floor/tiled/white, /area/security/detectives_office) "nW" = ( @@ -6969,9 +6969,9 @@ /area/maintenance/stellardelight/deck1/portfore) "oa" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/hand_labeler, +/obj/item/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/dark, /area/security/warden) "ob" = ( @@ -7312,8 +7312,8 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/shoes/magboots, /obj/item/clothing/head/helmet/space/void/mining, -/obj/item/weapon/mining_scanner, -/obj/item/device/radio/intercom{ +/obj/item/mining_scanner, +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -7331,7 +7331,7 @@ /area/library) "oL" = ( /obj/structure/table/steel, -/obj/item/device/integrated_circuit_printer, +/obj/item/integrated_circuit_printer, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "oM" = ( @@ -7375,7 +7375,7 @@ /area/stellardelight/deck1/pilot) "oS" = ( /obj/structure/table/steel, -/obj/item/device/electronic_assembly/large/default, +/obj/item/electronic_assembly/large/default, /obj/machinery/light{ dir = 8 }, @@ -7446,7 +7446,7 @@ /area/stellardelight/deck1/resleeving) "oZ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "pa" = ( @@ -7717,11 +7717,11 @@ /area/stellardelight/deck1/exploequipment) "pD" = ( /obj/structure/table/woodentable, -/obj/item/device/tvcamera, +/obj/item/tvcamera, /obj/structure/sign/painting/library_private{ pixel_y = -32 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -8082,7 +8082,7 @@ /obj/effect/floor_decal/milspec/color/red/half{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -8210,15 +8210,15 @@ /area/stellardelight/deck1/miningshuttle) "qI" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 6; pixel_y = -2 }, -/obj/item/weapon/storage/box/evidence, +/obj/item/storage/box/evidence, /obj/machinery/alarm/angled{ dir = 4 }, @@ -8325,7 +8325,7 @@ pixel_y = 32 }, /obj/effect/catwalk_plated/dark, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor, /area/stellardelight/deck1/aft) "qU" = ( @@ -8365,19 +8365,19 @@ /area/prison/cell_block) "qZ" = ( /obj/structure/table/steel, -/obj/item/device/retail_scanner/security, -/obj/item/device/retail_scanner/security, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, +/obj/item/retail_scanner/security, +/obj/item/retail_scanner/security, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, /obj/effect/floor_decal/milspec/color/red, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -8428,14 +8428,14 @@ /area/stellardelight/deck1/port) "rh" = ( /obj/structure/table/steel, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 3 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -6; pixel_y = -3 }, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "ri" = ( @@ -8481,7 +8481,7 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/shoes/magboots, /obj/item/clothing/head/helmet/space/void/mining, -/obj/item/weapon/mining_scanner, +/obj/item/mining_scanner, /obj/machinery/light{ dir = 1 }, @@ -8540,7 +8540,7 @@ /area/maintenance/stellardelight/substation/security) "rt" = ( /obj/structure/table/woodentable, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "ru" = ( @@ -8569,11 +8569,11 @@ "ry" = ( /obj/machinery/door/firedoor/glass, /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 4 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/door/blast/angled_shutter/open{ dir = 4; id = "dontlooktmyrobotpenis"; @@ -8665,7 +8665,7 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/shoes/magboots, /obj/item/clothing/head/helmet/space/void/mining, -/obj/item/weapon/mining_scanner, +/obj/item/mining_scanner, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -8814,7 +8814,7 @@ /area/security/security_cell_hallway) "rY" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -14; pixel_y = 4 }, @@ -8903,7 +8903,7 @@ pixel_x = -6 }, /obj/machinery/alarm/angled, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -8941,7 +8941,7 @@ /area/rnd/xenobiology/xenoflora) "sl" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/curtain/open/privacy, /obj/machinery/alarm/angled, /obj/machinery/light/small{ @@ -8990,7 +8990,7 @@ /area/assembly/robotics) "sr" = ( /obj/structure/closet/secure_closet/warden, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /obj/item/gunbox/warden, /obj/machinery/power/apc/angled{ dir = 8 @@ -9001,9 +9001,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/storage/box/donut, -/obj/item/device/ticket_printer, +/obj/item/gun/energy/sizegun, +/obj/item/storage/box/donut, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/security/warden) "ss" = ( @@ -9193,14 +9193,14 @@ /area/medical/virology) "sL" = ( /obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/item/clothing/accessory/badge/holo/cord, /obj/item/clothing/accessory/badge/holo/cord, /obj/machinery/light{ dir = 8 }, /obj/effect/floor_decal/milspec/color/red, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "sM" = ( @@ -9378,16 +9378,16 @@ /obj/structure/closet/walllocker_double/misc_civ/north{ name = "health and wellbeing supplies" }, -/obj/item/weapon/entrepreneur/dumbbell, -/obj/item/weapon/entrepreneur/dumbbell, -/obj/item/weapon/entrepreneur/crystal, -/obj/item/weapon/entrepreneur/crystal, -/obj/item/weapon/entrepreneur/crystal, -/obj/item/weapon/entrepreneur/crystal, -/obj/item/weapon/entrepreneur/crystal, -/obj/item/weapon/reagent_containers/glass/bottle/essential_oil, -/obj/item/weapon/bedsheet/pillow/exercise, -/obj/item/weapon/bedsheet/pillow/exercise, +/obj/item/entrepreneur/dumbbell, +/obj/item/entrepreneur/dumbbell, +/obj/item/entrepreneur/crystal, +/obj/item/entrepreneur/crystal, +/obj/item/entrepreneur/crystal, +/obj/item/entrepreneur/crystal, +/obj/item/entrepreneur/crystal, +/obj/item/reagent_containers/glass/bottle/essential_oil, +/obj/item/bedsheet/pillow/exercise, +/obj/item/bedsheet/pillow/exercise, /obj/item/roller/massage, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/entrepreneur) @@ -9405,14 +9405,14 @@ /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, +/obj/item/shield/riot, /obj/item/clothing/gloves/arm_guard/riot, /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, +/obj/item/shield/riot, /obj/effect/floor_decal/milspec/color/black, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -9571,7 +9571,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -9663,10 +9663,10 @@ /area/maintenance/stellardelight/deck1/starboardfore) "tO" = ( /obj/structure/table/standard, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/pen, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/hand_labeler, +/obj/item/pen, +/obj/item/packageWrap, +/obj/item/packageWrap, /turf/simulated/floor/tiled/steel_grid, /area/rnd/research) "tP" = ( @@ -9720,8 +9720,8 @@ "tW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder, +/obj/item/paper_bin, +/obj/item/folder, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/entrepreneur) "tX" = ( @@ -9838,7 +9838,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -9925,18 +9925,18 @@ /area/stellardelight/deck1/starboard) "uy" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, /obj/machinery/camera/network/security, /obj/effect/floor_decal/milspec/color/black, /turf/simulated/floor/tiled/dark, /area/security/armoury) "uz" = ( /obj/structure/table/reinforced, -/obj/item/device/slime_scanner, -/obj/item/device/slime_scanner, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/slime_scanner, +/obj/item/slime_scanner, +/obj/item/reagent_containers/spray/cleaner, /obj/machinery/light, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology) "uA" = ( @@ -10340,11 +10340,11 @@ /area/stellardelight/deck1/starboard) "vs" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/dark, /area/security/security_processing) "vt" = ( @@ -10558,7 +10558,7 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/starboardcent) "vQ" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -10658,8 +10658,8 @@ /area/assembly/robotics) "we" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/nifsofts_security, -/obj/item/weapon/hand_labeler, +/obj/item/storage/box/nifsofts_security, +/obj/item/hand_labeler, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -10748,7 +10748,7 @@ "wq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/entrepreneur) "ws" = ( @@ -10769,14 +10769,14 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, -/obj/item/device/suit_cooling_unit{ +/obj/item/suit_cooling_unit{ pixel_y = -5 }, -/obj/item/device/suit_cooling_unit{ +/obj/item/suit_cooling_unit{ pixel_y = -5 }, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, /obj/item/clothing/suit/space/void/pilot, /obj/item/clothing/suit/space/void/pilot, /obj/item/clothing/head/helmet/space/void/pilot, @@ -10936,7 +10936,7 @@ dir = 8 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/machinery/light{ dir = 1 }, @@ -11020,7 +11020,7 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) "wV" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -11111,23 +11111,23 @@ /area/stellardelight/deck1/miningequipment) "xg" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -7; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = 4; pixel_y = 6 }, -/obj/item/device/flashlight/pen{ +/obj/item/flashlight/pen{ pixel_x = -3; pixel_y = -3 }, @@ -11142,11 +11142,11 @@ /area/stellardelight/deck1/resleeving) "xh" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 8 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = 2; pixel_y = 1 }, @@ -11178,11 +11178,11 @@ /obj/structure/closet/walllocker_double/misc_civ/south{ name = "dentistry tools" }, -/obj/item/weapon/entrepreneur/dentist_mirror, -/obj/item/weapon/entrepreneur/dentist_probe, -/obj/item/weapon/entrepreneur/dentist_scaler, -/obj/item/weapon/entrepreneur/dentist_sickle, -/obj/item/device/flashlight/pen, +/obj/item/entrepreneur/dentist_mirror, +/obj/item/entrepreneur/dentist_probe, +/obj/item/entrepreneur/dentist_scaler, +/obj/item/entrepreneur/dentist_sickle, +/obj/item/flashlight/pen, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/entrepreneur) "xl" = ( @@ -11272,7 +11272,7 @@ /obj/random/maintenance, /obj/random/maintenance/cargo, /obj/random/maintenance/clean, -/obj/item/weapon/disk/nifsoft/compliance, +/obj/item/disk/nifsoft/compliance, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) "xx" = ( @@ -11514,8 +11514,8 @@ /area/maintenance/stellardelight/substation/security) "xX" = ( /obj/structure/table/reinforced, -/obj/item/device/uv_light, -/obj/item/weapon/reagent_containers/spray/luminol, +/obj/item/uv_light, +/obj/item/reagent_containers/spray/luminol, /turf/simulated/floor/tiled/white, /area/security/detectives_office) "xZ" = ( @@ -11560,7 +11560,7 @@ dir = 8 }, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 4; req_access = list(19,43,67,66,5) }, @@ -11591,7 +11591,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -11701,8 +11701,8 @@ "yq" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/device/retail_scanner/science, -/obj/item/device/multitool/scioutpost, +/obj/item/retail_scanner/science, +/obj/item/multitool/scioutpost, /turf/simulated/floor/tiled/steel_grid, /area/rnd/research) "yr" = ( @@ -11889,8 +11889,8 @@ /area/stellardelight/deck1/aft) "yP" = ( /obj/structure/table/woodentable, -/obj/item/weapon/pen, -/obj/item/weapon/paper_bin{ +/obj/item/pen, +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -11938,16 +11938,16 @@ /area/maintenance/stellardelight/deck1/starboardcent) "yU" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, /obj/item/clothing/glasses/welding, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/machinery/power/apc/angled{ dir = 4 }, @@ -12125,7 +12125,7 @@ /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck1/paramedic) "zo" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/light_switch{ pixel_y = 25 }, @@ -12134,7 +12134,7 @@ /area/library) "zp" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -12470,13 +12470,13 @@ /obj/structure/closet/walllocker_double/misc_civ/west{ name = "investigation tools" }, -/obj/item/weapon/entrepreneur/magnifying_glass, +/obj/item/entrepreneur/magnifying_glass, /obj/item/sticky_pad/random, /obj/item/sticky_pad/random, -/obj/item/device/camera, -/obj/item/device/tape, -/obj/item/device/tape, -/obj/item/device/taperecorder, +/obj/item/camera, +/obj/item/rectape, +/obj/item/rectape, +/obj/item/taperecorder, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/entrepreneur) "Ab" = ( @@ -12633,8 +12633,8 @@ /area/rnd/xenobiology/xenoflora) "At" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/void/exploration, @@ -12642,9 +12642,9 @@ /obj/machinery/door/window/brigdoor/eastright{ req_access = list(43) }, -/obj/item/device/bluespaceradio/sd_prelinked, -/obj/item/device/cataloguer/compact, -/obj/item/device/cataloguer/compact, +/obj/item/bluespaceradio/sd_prelinked, +/obj/item/cataloguer/compact, +/obj/item/cataloguer/compact, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "Au" = ( @@ -12713,7 +12713,7 @@ /area/maintenance/stellardelight/deck1/starboardcent) "AD" = ( /obj/machinery/photocopier, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -12759,11 +12759,11 @@ /obj/structure/bookcase{ name = "bookcase (Non-Fiction)" }, -/obj/item/weapon/book/bundle/custom_library/nonfiction/riseandfallofpersianempire, -/obj/item/weapon/book/bundle/custom_library/nonfiction/skrelliancastesystem, -/obj/item/weapon/book/bundle/custom_library/nonfiction/viabilityofcorporategov, -/obj/item/weapon/book/custom_library/nonfiction/freesirisailightbulbs, -/obj/item/weapon/book/manual/synthetic_life, +/obj/item/book/bundle/custom_library/nonfiction/riseandfallofpersianempire, +/obj/item/book/bundle/custom_library/nonfiction/skrelliancastesystem, +/obj/item/book/bundle/custom_library/nonfiction/viabilityofcorporategov, +/obj/item/book/custom_library/nonfiction/freesirisailightbulbs, +/obj/item/book/manual/synthetic_life, /turf/simulated/floor/wood, /area/library) "AI" = ( @@ -12798,7 +12798,7 @@ }, /obj/structure/window/reinforced, /obj/item/clothing/mask/breath, -/obj/item/weapon/rig/eva/equipped, +/obj/item/rig/eva/equipped, /obj/machinery/door/window/brigdoor/eastright{ req_access = list(11,24) }, @@ -12842,10 +12842,10 @@ /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/carpet, /area/library) "AO" = ( @@ -12855,7 +12855,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/assembly/robotics) "AP" = ( -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet, @@ -12877,10 +12877,10 @@ /area/rnd/xenobiology/xenoflora_storage) "AS" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/curtain/open/privacy, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -13068,18 +13068,18 @@ /area/assembly/robotics) "Bo" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/weapon/paper{ +/obj/item/storage/firstaid/surgery, +/obj/item/paper{ desc = ""; info = "Stop installing NIFs in here you clods! Unless it's on a synth. Otherwise, STOP DOING IT! You're killing people! -Management"; name = "note to science staff" }, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/item/device/mmi/digital/posibrain, -/obj/item/device/mmi, +/obj/item/mmi/digital/posibrain, +/obj/item/mmi, /turf/simulated/floor/tiled/steel_dirty, /area/assembly/robotics) "Bq" = ( @@ -13115,7 +13115,7 @@ /obj/effect/floor_decal/milspec/color/red/half{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -13134,12 +13134,12 @@ /area/rnd/research) "Bv" = ( /obj/structure/table/reinforced, -/obj/item/device/reagent_scanner, -/obj/item/device/mass_spectrometer/adv, +/obj/item/reagent_scanner, +/obj/item/mass_spectrometer/adv, /obj/effect/floor_decal/milspec/color/red/half{ dir = 6 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -13234,7 +13234,7 @@ dir = 8; pixel_x = -6 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -13309,7 +13309,7 @@ "BM" = ( /obj/structure/table/steel_reinforced, /obj/machinery/recharger, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "BN" = ( @@ -13716,12 +13716,12 @@ /area/security/warden) "CJ" = ( /obj/structure/table/glass, -/obj/item/weapon/book/manual/virology, -/obj/item/device/antibody_scanner, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/book/manual/virology, +/obj/item/antibody_scanner, +/obj/item/reagent_containers/glass/beaker, +/obj/item/paper_bin, +/obj/item/folder/white, +/obj/item/pen, /obj/machinery/light/floortube{ dir = 4; pixel_x = 6 @@ -13735,7 +13735,7 @@ /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/virology) "CK" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -13771,11 +13771,11 @@ }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/milspec/color/red, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 7 }, -/obj/item/weapon/pen, -/obj/item/device/ticket_printer, +/obj/item/pen, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/security/lobby) "CR" = ( @@ -13884,7 +13884,7 @@ /turf/simulated/floor, /area/rnd/storage) "Dc" = ( -/obj/item/weapon/bedsheet/orangedouble, +/obj/item/bedsheet/orangedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet/purcarpet, @@ -13903,7 +13903,7 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) "De" = ( -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet, @@ -13979,7 +13979,7 @@ /area/stellardelight/deck1/exterior) "Dm" = ( /obj/structure/bed/chair/backed_red, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -14232,36 +14232,36 @@ /turf/simulated/wall/bay/red, /area/prison/cell_block) "DT" = ( -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 4; pixel_y = -6 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -4; pixel_y = -6 }, /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 4; pixel_y = -6 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -4; pixel_y = -6 }, @@ -14481,8 +14481,8 @@ /obj/structure/closet/secure_closet/personal, /obj/item/clothing/under/bathrobe, /obj/item/clothing/under/bathrobe, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) "Ex" = ( @@ -14589,7 +14589,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -14620,7 +14620,7 @@ /area/stellardelight/deck1/exploequipment) "EM" = ( /obj/structure/table/rack, -/obj/item/device/defib_kit/compact/loaded, +/obj/item/defib_kit/compact/loaded, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck1/paramedic) "EN" = ( @@ -14688,10 +14688,10 @@ dir = 9 }, /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/light/small{ dir = 4 }, @@ -14754,7 +14754,7 @@ /area/stellardelight/deck1/researchequip) "Fd" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/curtain/open/privacy, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -14778,8 +14778,8 @@ dir = 1 }, /obj/structure/closet/secure_closet/detective, -/obj/item/weapon/reagent_containers/spray/pepper, -/obj/item/device/camera{ +/obj/item/reagent_containers/spray/pepper, +/obj/item/camera{ desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30 @@ -15077,10 +15077,10 @@ /area/library) "FM" = ( /obj/structure/table/steel, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = -5 }, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -15258,15 +15258,15 @@ /obj/structure/closet{ name = "Forensics Gear" }, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/evidence, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/briefcase/crimekit, -/obj/item/weapon/storage/briefcase/crimekit, +/obj/item/storage/box/gloves, +/obj/item/storage/box/evidence, +/obj/item/storage/box/bodybags, +/obj/item/storage/briefcase/crimekit, +/obj/item/storage/briefcase/crimekit, /obj/effect/floor_decal/milspec/color/red/half{ dir = 5 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -15341,7 +15341,7 @@ /turf/simulated/wall/bay/r_wall/red, /area/security/tactical) "Gu" = ( -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet, @@ -15357,8 +15357,8 @@ /area/maintenance/stellardelight/deck1/portcent) "Gy" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/void/expedition_medical, @@ -15419,11 +15419,11 @@ /area/maintenance/stellardelight/substation/research) "GG" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -15608,7 +15608,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/fore) "Hb" = ( @@ -15818,12 +15818,12 @@ /area/stellardelight/deck1/resleeving) "Hz" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/projectile/shotgun/pump{ +/obj/item/gun/projectile/shotgun/pump{ ammo_type = /obj/item/ammo_casing/a12g/pellet; pixel_x = 1; pixel_y = 4 }, -/obj/item/weapon/gun/projectile/shotgun/pump{ +/obj/item/gun/projectile/shotgun/pump{ ammo_type = /obj/item/ammo_casing/a12g/pellet; pixel_x = 2; pixel_y = -6 @@ -15879,10 +15879,10 @@ /area/stellardelight/deck1/aft) "HD" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/energy/taser/xeno, -/obj/item/weapon/gun/energy/taser/xeno, -/obj/item/weapon/melee/baton/slime/loaded, -/obj/item/weapon/melee/baton/slime/loaded, +/obj/item/gun/energy/taser/xeno, +/obj/item/gun/energy/taser/xeno, +/obj/item/melee/baton/slime/loaded, +/obj/item/melee/baton/slime/loaded, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -16003,7 +16003,7 @@ /area/stellardelight/deck1/explobriefing) "HR" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/sign/painting/library_secure{ pixel_y = 30 }, @@ -16117,73 +16117,73 @@ /obj/structure/closet{ name = "robotics equipment" }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, /obj/item/clothing/glasses/omnihud/rnd, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 6 }, -/obj/item/weapon/storage/belt/utility, -/obj/item/device/multitool{ +/obj/item/storage/belt/utility, +/obj/item/multitool{ pixel_x = 3 }, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/tool/crowbar, +/obj/item/storage/toolbox/mechanical, /obj/item/clothing/glasses/welding, /obj/item/clothing/glasses/welding, /obj/item/clothing/head/welding{ @@ -16224,19 +16224,19 @@ /obj/structure/cable/pink{ icon_state = "4-8" }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -4; pixel_y = -4 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 4; pixel_y = -4 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -4; pixel_y = 5 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 4; pixel_y = 5 }, @@ -16308,14 +16308,14 @@ /area/stellardelight/deck1/starboard) "Is" = ( /obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/item/clothing/accessory/badge/holo/cord, /obj/item/clothing/accessory/badge/holo/cord, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, /obj/effect/floor_decal/milspec/color/red, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "Iu" = ( @@ -16371,7 +16371,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -16514,7 +16514,7 @@ /obj/machinery/r_n_d/protolathe{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -16629,13 +16629,13 @@ /area/stellardelight/deck1/starboard) "Jc" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/scanning_module{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/stock_parts/scanning_module, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, /obj/machinery/light, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -16876,7 +16876,7 @@ /area/gateway) "JK" = ( /obj/machinery/door/firedoor, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/westright{ dir = 4; @@ -16884,11 +16884,11 @@ req_access = list(7); req_one_access = list(47) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 4 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/door/blast/angled_shutter/open{ dir = 4; id = "rndshutters"; @@ -17033,7 +17033,7 @@ /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/oreprocessing) "Kc" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -17156,10 +17156,10 @@ "Kq" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/table/woodentable, -/obj/item/device/taperecorder, -/obj/item/device/tape/random, -/obj/item/device/camera, -/obj/item/device/retail_scanner/civilian, +/obj/item/taperecorder, +/obj/item/rectape/random, +/obj/item/camera, +/obj/item/retail_scanner/civilian, /obj/structure/sign/painting/library_private{ pixel_y = 32 }, @@ -17188,10 +17188,10 @@ /area/stellardelight/deck1/exterior) "Kt" = ( /obj/structure/table/reinforced, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/eris/white/gray_platform, /area/gateway) "Ku" = ( @@ -17584,8 +17584,8 @@ /area/stellardelight/deck1/starboard) "Lp" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/void/exploration, @@ -17593,9 +17593,9 @@ /obj/machinery/door/window/brigdoor/eastleft{ req_access = list(43) }, -/obj/item/device/mapping_unit, -/obj/item/device/cataloguer, -/obj/item/device/cataloguer, +/obj/item/mapping_unit, +/obj/item/cataloguer, +/obj/item/cataloguer, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "Lq" = ( @@ -17836,7 +17836,7 @@ "LO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/standard, -/obj/item/device/multitool/station_buffered{ +/obj/item/multitool/station_buffered{ pixel_y = 2 }, /turf/simulated/floor/tiled/milspec, @@ -17844,11 +17844,11 @@ "LP" = ( /obj/structure/table/standard, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -17999,7 +17999,7 @@ /area/security/detectives_office) "Mf" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/curtain/open/privacy, /obj/structure/cable/white{ icon_state = "0-2" @@ -18022,11 +18022,11 @@ /area/stellardelight/deck1/starboard) "Mi" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -18147,10 +18147,10 @@ /area/stellardelight/deck1/starboard) "My" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, /obj/machinery/camera/network/research{ dir = 4 }, @@ -18195,7 +18195,7 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/shoes/magboots, /obj/item/clothing/head/helmet/space/void/mining, -/obj/item/weapon/mining_scanner, +/obj/item/mining_scanner, /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/miningequipment) "MG" = ( @@ -18633,9 +18633,9 @@ /area/stellardelight/deck1/lowermed) "Nw" = ( /obj/structure/closet/walllocker_double/medical/north, -/obj/item/weapon/folder/white, -/obj/item/device/healthanalyzer, -/obj/item/weapon/cane, +/obj/item/folder/white, +/obj/item/healthanalyzer, +/obj/item/cane, /obj/item/clothing/accessory/stethoscope, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) @@ -18665,7 +18665,7 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "NC" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -18688,7 +18688,7 @@ /area/maintenance/stellardelight/deck1/exploration) "NF" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -18944,18 +18944,18 @@ /area/stellardelight/deck1/aft) "Ol" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/device/multitool, -/obj/item/device/gps/medical{ +/obj/item/storage/toolbox/mechanical, +/obj/item/multitool, +/obj/item/gps/medical{ pixel_y = 3 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = -3 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 2 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -1; pixel_y = -3 }, @@ -19018,7 +19018,7 @@ /area/rnd/xenobiology) "Or" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -19282,7 +19282,7 @@ phorontanks = 0 }, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -19356,7 +19356,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/lino, @@ -19545,8 +19545,8 @@ }, /obj/random/soap, /obj/random/soap, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /obj/item/clothing/under/bathrobe, /obj/item/clothing/under/bathrobe, /obj/structure/table/standard, @@ -19573,12 +19573,12 @@ /obj/item/clothing/suit/caution, /obj/item/clothing/suit/caution, /obj/item/clothing/suit/caution, -/obj/item/device/lightreplacer, +/obj/item/lightreplacer, /obj/structure/mopbucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, -/obj/item/weapon/storage/bag/trash, -/obj/item/weapon/soap/nanotrasen, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/storage/bag/trash, +/obj/item/soap/nanotrasen, /turf/simulated/floor/tiled/monotile, /area/janitor) "PI" = ( @@ -19622,37 +19622,37 @@ /area/security/security_cell_hallway) "PP" = ( /obj/structure/closet/crate, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/oreprocessing) "PQ" = ( -/obj/item/weapon/storage/fancy/vials, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/storage/lockbox/vials, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/fancy/vials, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/storage/lockbox/vials, +/obj/item/reagent_containers/dropper, +/obj/item/storage/box/syringes{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/masks, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/beakers, +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/structure/closet/walllocker_double/medical/east, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/item/weapon/storage/box/monkeycubes/wolpincubes, +/obj/item/storage/box/monkeycubes/wolpincubes, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/virology) "PR" = ( @@ -19790,14 +19790,14 @@ /area/stellardelight/deck1/port) "Qg" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/button/remote/blast_door{ id = "processinglockdown"; name = "Window Lockdown"; pixel_x = -5; req_access = list(1) }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -19875,7 +19875,7 @@ /area/stellardelight/deck1/fore) "Qp" = ( /obj/structure/table/glass, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/item/clothing/accessory/stethoscope, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/exam_room) @@ -20062,7 +20062,7 @@ /turf/simulated/floor, /area/stellardelight/deck1/mining) "QM" = ( -/obj/item/weapon/bedsheet/orangedouble, +/obj/item/bedsheet/orangedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet/purcarpet, @@ -20076,10 +20076,10 @@ /area/stellardelight/deck1/lowermed) "QP" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/storage/box/trackimp{ +/obj/item/storage/box/trackimp{ pixel_y = -4 }, -/obj/item/weapon/storage/box/trackimp{ +/obj/item/storage/box/trackimp{ pixel_x = 5; pixel_y = 1 }, @@ -20368,12 +20368,12 @@ /obj/item/clothing/suit/caution, /obj/item/clothing/suit/caution, /obj/item/clothing/suit/caution, -/obj/item/device/lightreplacer, +/obj/item/lightreplacer, /obj/structure/mopbucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, -/obj/item/weapon/storage/bag/trash, -/obj/item/weapon/soap/nanotrasen, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/storage/bag/trash, +/obj/item/soap/nanotrasen, /turf/simulated/floor/tiled/monotile, /area/janitor) "Rr" = ( @@ -20615,7 +20615,7 @@ /area/rnd/xenobiology) "RP" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/medical/equipped, +/obj/item/rig/medical/equipped, /obj/machinery/light{ dir = 1 }, @@ -20787,9 +20787,9 @@ /area/stellardelight/deck1/exterior) "Se" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/adv, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /obj/machinery/alarm/angled{ @@ -20859,7 +20859,7 @@ color = "#42038a"; icon_state = "0-2" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -20943,7 +20943,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -20959,7 +20959,7 @@ /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "Sx" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -21262,7 +21262,7 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) "Tc" = ( -/obj/item/weapon/bedsheet/orangedouble, +/obj/item/bedsheet/orangedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet/purcarpet, @@ -21272,11 +21272,11 @@ /area/maintenance/stellardelight/deck1/portcent) "Te" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_x = -1; pixel_y = 2 }, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_x = -1; pixel_y = -11 }, @@ -21333,7 +21333,7 @@ /area/rnd/research) "Tk" = ( /obj/structure/bed/chair/comfy/black, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -21498,19 +21498,19 @@ "TD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/standard, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 6; pixel_y = 5 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -6; pixel_y = 5 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -6; pixel_y = -4 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 6; pixel_y = -4 }, @@ -21591,7 +21591,7 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "TN" = ( -/obj/item/weapon/bedsheet/orangedouble, +/obj/item/bedsheet/orangedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet/purcarpet, @@ -21766,7 +21766,7 @@ pixel_x = 32 }, /obj/structure/table/bench/sifwooden/padded, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24; pixel_y = -32 @@ -21987,7 +21987,7 @@ /turf/simulated/floor/tiled, /area/rnd/storage) "Uy" = ( -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/shower) "Uz" = ( @@ -22002,7 +22002,7 @@ /area/rnd/research) "UB" = ( /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 1; name = "night shift APC"; nightshift_setting = 2 @@ -22113,7 +22113,7 @@ /area/maintenance/stellardelight/deck1/starboardcent) "UN" = ( /obj/structure/table/steel, -/obj/item/device/electronic_assembly/large/default, +/obj/item/electronic_assembly/large/default, /obj/machinery/light{ dir = 8 }, @@ -22348,7 +22348,7 @@ }, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/table/woodentable, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/entrepreneur) "Vp" = ( @@ -22361,46 +22361,46 @@ /obj/structure/sign/painting/library_secure{ pixel_x = 30 }, -/obj/item/weapon/book/bundle/custom_library/reference/ThermodynamicReactionsandResearch, -/obj/item/weapon/book/bundle/custom_library/reference/fbpandprostheticmaintenance, -/obj/item/weapon/book/bundle/custom_library/reference/recyclingprocedures, -/obj/item/weapon/book/custom_library/reference/fistfulofd6splayersguide, -/obj/item/weapon/book/custom_library/reference/securityguidelines, -/obj/item/weapon/book/custom_library/reference/spacesurvivalguidedespressurization, -/obj/item/weapon/book/manual/anomaly_spectroscopy, -/obj/item/weapon/book/manual/anomaly_testing, -/obj/item/weapon/book/manual/atmospipes, -/obj/item/weapon/book/manual/bar_guide, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/book/manual/casino, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/cook_guide, -/obj/item/weapon/book/manual/detective, -/obj/item/weapon/book/manual/engineering_construction, -/obj/item/weapon/book/manual/engineering_guide, -/obj/item/weapon/book/manual/engineering_hacking, -/obj/item/weapon/book/manual/engineering_particle_accelerator, -/obj/item/weapon/book/manual/engineering_singularity_safety, -/obj/item/weapon/book/manual/evaguide, -/obj/item/weapon/book/manual/excavation, -/obj/item/weapon/book/manual/hydroponics_pod_people, -/obj/item/weapon/book/manual/mass_spectrometry, -/obj/item/weapon/book/manual/materials_chemistry_analysis, -/obj/item/weapon/book/manual/medical_cloning, -/obj/item/weapon/book/manual/medical_diagnostics_manual, -/obj/item/weapon/book/manual/research_and_development, -/obj/item/weapon/book/manual/resleeving, -/obj/item/weapon/book/manual/ripley_build_and_repair, -/obj/item/weapon/book/manual/robotics_cyborgs, -/obj/item/weapon/book/manual/robotics_manual, -/obj/item/weapon/book/manual/rust_engine, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/stasis, -/obj/item/weapon/book/manual/supermatter_engine, -/obj/item/weapon/book/manual/tesla_engine, -/obj/item/weapon/book/manual/virology, +/obj/item/book/bundle/custom_library/reference/ThermodynamicReactionsandResearch, +/obj/item/book/bundle/custom_library/reference/fbpandprostheticmaintenance, +/obj/item/book/bundle/custom_library/reference/recyclingprocedures, +/obj/item/book/custom_library/reference/fistfulofd6splayersguide, +/obj/item/book/custom_library/reference/securityguidelines, +/obj/item/book/custom_library/reference/spacesurvivalguidedespressurization, +/obj/item/book/manual/anomaly_spectroscopy, +/obj/item/book/manual/anomaly_testing, +/obj/item/book/manual/atmospipes, +/obj/item/book/manual/bar_guide, +/obj/item/book/manual/barman_recipes, +/obj/item/book/manual/casino, +/obj/item/book/manual/chef_recipes, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/cook_guide, +/obj/item/book/manual/detective, +/obj/item/book/manual/engineering_construction, +/obj/item/book/manual/engineering_guide, +/obj/item/book/manual/engineering_hacking, +/obj/item/book/manual/engineering_particle_accelerator, +/obj/item/book/manual/engineering_singularity_safety, +/obj/item/book/manual/evaguide, +/obj/item/book/manual/excavation, +/obj/item/book/manual/hydroponics_pod_people, +/obj/item/book/manual/mass_spectrometry, +/obj/item/book/manual/materials_chemistry_analysis, +/obj/item/book/manual/medical_cloning, +/obj/item/book/manual/medical_diagnostics_manual, +/obj/item/book/manual/research_and_development, +/obj/item/book/manual/resleeving, +/obj/item/book/manual/ripley_build_and_repair, +/obj/item/book/manual/robotics_cyborgs, +/obj/item/book/manual/robotics_manual, +/obj/item/book/manual/rust_engine, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/stasis, +/obj/item/book/manual/supermatter_engine, +/obj/item/book/manual/tesla_engine, +/obj/item/book/manual/virology, /obj/effect/landmark/vermin, /turf/simulated/floor/wood, /area/library) @@ -22509,7 +22509,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 6 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -22590,14 +22590,14 @@ /area/stellardelight/deck1/mining) "VF" = ( /obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/item/clothing/accessory/badge/holo/cord, /obj/item/clothing/accessory/badge/holo/cord, /obj/machinery/light{ dir = 4 }, /obj/effect/floor_decal/milspec/color/red, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "VG" = ( @@ -22626,7 +22626,7 @@ pixel_x = -8; pixel_y = -4 }, -/obj/item/weapon/storage/lockbox, +/obj/item/storage/lockbox, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "VJ" = ( @@ -22813,7 +22813,7 @@ dir = 4 }, /obj/random/coin/sometimes, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /turf/simulated/floor/carpet/bcarpet, /area/stellardelight/deck1/port) "Wg" = ( @@ -23074,19 +23074,19 @@ /area/stellardelight/deck1/exploration) "WI" = ( /obj/structure/table/rack/shelf, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -4; pixel_y = -4 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 4; pixel_y = -4 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -4; pixel_y = 5 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 4; pixel_y = 5 }, @@ -23135,7 +23135,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -23162,10 +23162,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/effect/landmark/vermin, /turf/simulated/floor/tiled/eris/white/gray_platform, /area/gateway) @@ -23371,10 +23371,10 @@ /area/maintenance/stellardelight/substation/medical) "Xp" = ( /obj/structure/table/steel, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = -5 }, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = 5 }, /obj/machinery/power/apc/angled{ @@ -23516,7 +23516,7 @@ /area/stellardelight/deck1/fore) "XD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -23591,7 +23591,7 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) "XN" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -23677,7 +23677,7 @@ /area/stellardelight/deck1/shuttlebay) "XX" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -23961,9 +23961,9 @@ /obj/structure/sign/painting/library_private{ pixel_x = -32 }, -/obj/item/weapon/book/manual/engineering_hacking, -/obj/item/weapon/book/manual/nuclear, -/obj/item/weapon/book/custom_library/fiction/woodysgotwood, +/obj/item/book/manual/engineering_hacking, +/obj/item/book/manual/nuclear, +/obj/item/book/custom_library/fiction/woodysgotwood, /turf/simulated/floor/wood, /area/library) "YB" = ( @@ -24130,10 +24130,10 @@ /area/stellardelight/deck1/mining) "YR" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /obj/machinery/firealarm/angled{ @@ -24175,14 +24175,14 @@ /area/rnd/xenobiology) "YX" = ( /obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/item/clothing/accessory/badge/holo/cord, /obj/item/clothing/accessory/badge/holo/cord, /obj/machinery/firealarm/angled{ dir = 4 }, /obj/effect/floor_decal/milspec/color/red, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "YY" = ( @@ -24200,15 +24200,15 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/swabs{ +/obj/item/storage/box/swabs{ layer = 5 }, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/blue{ +/obj/item/hand_labeler, +/obj/item/folder/red, +/obj/item/folder/blue{ pixel_y = -3 }, -/obj/item/weapon/folder/yellow{ +/obj/item/folder/yellow{ pixel_y = -5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -24223,14 +24223,14 @@ /area/assembly/robotics) "Zb" = ( /obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/item/clothing/accessory/badge/holo/cord, /obj/item/clothing/accessory/badge/holo/cord, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /obj/effect/floor_decal/milspec/color/red, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "Zc" = ( @@ -24346,7 +24346,7 @@ name = "Privacy Shutter Control"; pixel_y = 2 }, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /turf/simulated/floor/tiled/steel, /area/assembly/robotics) "Zs" = ( diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm index 577393b28bf..a7d0ce90503 100644 --- a/maps/stellar_delight/stellar_delight2.dmm +++ b/maps/stellar_delight/stellar_delight2.dmm @@ -43,7 +43,7 @@ /obj/item/honey_frame, /obj/item/honey_frame, /obj/item/honey_frame, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /obj/item/bee_smoker, /obj/item/beehive_assembly, /obj/structure/closet/crate/hydroponics{ @@ -383,7 +383,7 @@ /area/crew_quarters/bar) "aL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -443,7 +443,7 @@ /obj/effect/floor_decal/milspec/color/green/half{ dir = 4 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /obj/effect/landmark/start/botanist, @@ -713,7 +713,7 @@ /area/stellardelight/deck2/aftstarboard) "bs" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/machinery/light{ dir = 8 }, @@ -737,11 +737,11 @@ /area/hydroponics) "bu" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /obj/machinery/power/apc/angled{ dir = 8 }, @@ -806,7 +806,7 @@ /obj/structure/bed/chair/bay/shuttle{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -851,7 +851,7 @@ /obj/structure/bed/chair/bay/shuttle{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -870,28 +870,28 @@ /area/stellardelight/deck2/triage) "bK" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/sleeper{ +/obj/item/circuitboard/sleeper{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/sleeper_console{ +/obj/item/circuitboard/sleeper_console{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/body_scanner{ +/obj/item/circuitboard/body_scanner{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/scanner_console, -/obj/item/weapon/circuitboard/grinder{ +/obj/item/circuitboard/scanner_console, +/obj/item/circuitboard/grinder{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/bioprinter{ +/obj/item/circuitboard/bioprinter{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/chem_master{ +/obj/item/circuitboard/chem_master{ pixel_x = 3; pixel_y = -3 }, @@ -934,7 +934,7 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "bO" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -955,7 +955,7 @@ /area/maintenance/stellardelight/deck2/portfore) "bQ" = ( /obj/structure/closet/secure_closet/quartermaster, -/obj/item/weapon/storage/backpack/dufflebag, +/obj/item/storage/backpack/dufflebag, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -1005,8 +1005,8 @@ /area/quartermaster/qm) "bV" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/manual/bar_guide, -/obj/item/device/radio/intercom{ +/obj/item/book/manual/bar_guide, +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -1136,7 +1136,7 @@ /area/stellardelight/deck2/aftport) "ck" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, @@ -1484,11 +1484,11 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "cZ" = ( -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 7; pixel_y = 16 }, -/obj/item/weapon/folder/blue_captain{ +/obj/item/folder/blue_captain{ pixel_x = -6; pixel_y = 7 }, @@ -1499,8 +1499,8 @@ /obj/machinery/requests_console/preset/captain{ pixel_x = -30 }, -/obj/item/weapon/melee/chainofcommand, -/obj/item/weapon/folder/blue_captain{ +/obj/item/melee/chainofcommand, +/obj/item/folder/blue_captain{ pixel_x = -6 }, /turf/simulated/floor/carpet/blucarpet, @@ -1521,7 +1521,7 @@ /area/engineering/locker_room) "db" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "For those who didn't know yet, the big blue box in here is a 'grid checker' which will shut off the power if a dangerous power spike erupts into the powernet, shutting everything down protects everything from electrical damage, however the outages can be disruptive to ship operations, so it is designed to restore power after a somewhat significant delay, up to fifteen minutes or so. The grid checker can be manually hacked in order to end the outage sooner. To do that, you must cut three specific wires which do not cause a red light to shine, then pulse a fourth wire. Electrical protection is highly recommended when doing maintenance on the grid checker."; name = "grid checker info" }, @@ -1529,7 +1529,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/plating, /area/engineering/storage) "dc" = ( @@ -1626,7 +1626,7 @@ /turf/simulated/floor/plating, /area/engineering/storage) "dm" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_x = -32; pixel_y = 24 @@ -1705,7 +1705,7 @@ /turf/simulated/floor/glass/reinforced, /area/stellardelight/deck2/fore) "dw" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/spline/plain{ dir = 1 }, @@ -1952,7 +1952,7 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck2/port) "dY" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /obj/effect/landmark/start/visitor, @@ -2082,7 +2082,7 @@ /obj/effect/floor_decal/milspec/color/blue/half{ dir = 1 }, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled, /area/stellardelight/deck2/central) "en" = ( @@ -2160,7 +2160,7 @@ dir = 8 }, /obj/item/clothing/shoes/black, -/obj/item/device/communicator, +/obj/item/communicator, /turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "ew" = ( @@ -2237,14 +2237,14 @@ /obj/structure/table/reinforced, /obj/machinery/alarm/angled, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 6 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, /turf/simulated/floor/tiled/eris/dark/orangecorner, @@ -2283,7 +2283,7 @@ /area/medical/chemistry) "eK" = ( /obj/structure/table/steel, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -2315,7 +2315,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -2539,7 +2539,7 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/item/device/perfect_tele{ +/obj/item/perfect_tele{ name = "manager's translocator" }, /obj/structure/table/darkglass, @@ -2632,20 +2632,20 @@ /turf/simulated/floor/tiled/eris/white/cargo, /area/stellardelight/deck2/triage) "fy" = ( -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/structure/closet/crate/medical{ desc = "A crate full of emergency supplies to help with response and rescue operations. A logo of NanoTrasen with a checkmark is stamped on the crate."; name = "NanoTrasen Emergency Supply Crate" }, -/obj/item/weapon/storage/briefcase/inflatable, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/briefcase/inflatable, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/regular, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /turf/simulated/floor/tiled/eris/dark/monofloor, @@ -2703,13 +2703,13 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftport) "fE" = ( -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/deck/cards, -/obj/item/weapon/deck/cards/casino, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/dicecup, +/obj/item/deck/cah, +/obj/item/deck/cah/black, +/obj/item/deck/cards, +/obj/item/deck/cards/casino, /obj/structure/closet/walllocker_double/misc_civ/north, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) @@ -2817,9 +2817,9 @@ dir = 4; pixel_x = 6 }, -/obj/item/weapon/paper/dockingcodes/sd, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/paper/dockingcodes/sd, +/obj/item/radio, +/obj/item/radio, /obj/structure/closet/walllocker_double/command/east, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/bridge) @@ -2887,10 +2887,10 @@ /obj/structure/cable/blue{ icon_state = "4-8" }, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/sd_guide, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/sd_guide, /obj/structure/closet/walllocker_double/command/north, /turf/simulated/floor/wood, /area/crew_quarters/captain) @@ -2978,8 +2978,8 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/item/weapon/book/manual/engineering_particle_accelerator, -/obj/item/weapon/book/manual/tesla_engine, +/obj/item/book/manual/engineering_particle_accelerator, +/obj/item/book/manual/tesla_engine, /obj/structure/closet/walllocker_double/engineering/west, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/engineering/engine_room) @@ -3035,12 +3035,12 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/robotics{ +/obj/item/circuitboard/robotics{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/mecha_control, -/obj/item/weapon/circuitboard/aifixer{ +/obj/item/circuitboard/mecha_control, +/obj/item/circuitboard/aifixer{ pixel_x = 3; pixel_y = -3 }, @@ -3163,17 +3163,17 @@ /turf/simulated/floor/reinforced/airless, /area/stellardelight/deck2/combustionworkshop) "gt" = ( -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/tape_roll, -/obj/item/weapon/storage/belt/utility, -/obj/item/device/multitool, +/obj/item/storage/box/lights/mixed, +/obj/item/tape_roll, +/obj/item/storage/belt/utility, +/obj/item/multitool, /obj/fiftyspawner/steel, /obj/structure/closet/walllocker_double/cargo/east, /turf/simulated/floor/tiled/eris/steel/cargo, /area/quartermaster/storage) "gu" = ( /obj/machinery/firealarm/angled, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /obj/structure/table/reinforced, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/cmostore) @@ -3258,7 +3258,7 @@ /obj/structure/table/reinforced, /obj/random/powercell, /obj/random/tech_supply, -/obj/item/device/t_scanner, +/obj/item/t_scanner, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/workshop) "gE" = ( @@ -3315,8 +3315,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/item/weapon/circuitboard/tesla_coil, -/obj/item/weapon/circuitboard/tesla_coil, +/obj/item/circuitboard/tesla_coil, +/obj/item/circuitboard/tesla_coil, /obj/structure/closet/walllocker_double/engineering/north, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/engine_eva) @@ -3371,11 +3371,11 @@ /area/quartermaster/storage) "gO" = ( /obj/structure/table/standard, -/obj/item/device/destTagger{ +/obj/item/destTagger{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/packageWrap, +/obj/item/packageWrap, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/quartermaster/storage) "gP" = ( @@ -3515,8 +3515,8 @@ /area/hydroponics) "hi" = ( /obj/structure/closet/walllocker_double/medical/north, -/obj/item/weapon/storage/box/body_record_disk, -/obj/item/device/retail_scanner/medical, +/obj/item/storage/box/body_record_disk, +/obj/item/retail_scanner/medical, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/cmostore) "hj" = ( @@ -3787,8 +3787,8 @@ /area/maintenance/stellardelight/deck2/portfore) "hQ" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/device/radio/intercom{ +/obj/item/storage/firstaid/surgery, +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 @@ -3846,7 +3846,7 @@ /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/engineering/engine_room) "hY" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4132,7 +4132,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/workshop) "iJ" = ( @@ -4145,13 +4145,13 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) "iK" = ( -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/manipulator, /obj/structure/table/rack/steel, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/circuitboard/autolathe, +/obj/item/stock_parts/console_screen, +/obj/item/circuitboard/autolathe, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -4240,7 +4240,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -4311,8 +4311,8 @@ /area/stellardelight/deck2/port) "jf" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/injector_maker{ pixel_y = 21 @@ -4341,7 +4341,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -4365,14 +4365,14 @@ /area/stellardelight/deck2/starboard) "jm" = ( /obj/structure/table/reinforced, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ pixel_x = 3; pixel_y = 6 }, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ pixel_y = 3 }, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ pixel_x = -3 }, /obj/machinery/camera/network/engineering{ @@ -4554,10 +4554,10 @@ /area/stellardelight/deck2/fore) "jG" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/reception) "jI" = ( @@ -4734,11 +4734,11 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "ke" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = 24 }, @@ -4837,7 +4837,7 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) "ko" = ( -/obj/item/weapon/storage/secure/briefcase/ml3m_pack_med, +/obj/item/storage/secure/briefcase/ml3m_pack_med, /obj/structure/table/reinforced, /obj/machinery/alarm/angled{ dir = 4 @@ -4857,8 +4857,8 @@ /area/crew_quarters/recreation_area) "kq" = ( /obj/structure/closet/secure_closet/cargotech, -/obj/item/weapon/stamp/cargo, -/obj/item/weapon/storage/backpack/dufflebag, +/obj/item/stamp/cargo, +/obj/item/storage/backpack/dufflebag, /obj/machinery/light{ dir = 4 }, @@ -4878,32 +4878,32 @@ /area/stellardelight/deck2/fore) "ks" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/mech_recharger{ +/obj/item/circuitboard/mech_recharger{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/circuitboard/cell_charger{ +/obj/item/circuitboard/cell_charger{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/recharger{ +/obj/item/circuitboard/recharger{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/recharge_station{ +/obj/item/circuitboard/recharge_station{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/arcade/battle, -/obj/item/weapon/circuitboard/arcade/clawmachine{ +/obj/item/circuitboard/arcade/battle, +/obj/item/circuitboard/arcade/clawmachine{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/arcade/orion_trail{ +/obj/item/circuitboard/arcade/orion_trail{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/jukebox{ +/obj/item/circuitboard/jukebox{ pixel_x = 3; pixel_y = -3 }, @@ -4960,7 +4960,7 @@ "kA" = ( /obj/structure/table/reinforced, /obj/random/toolbox, -/obj/item/device/geiger, +/obj/item/geiger, /obj/machinery/alarm/angled{ dir = 4 }, @@ -5285,8 +5285,8 @@ "lg" = ( /obj/structure/closet/secure_closet/captains, /obj/item/clothing/glasses/omnihud/all, -/obj/item/weapon/disk/nuclear, -/obj/item/device/retail_scanner/command, +/obj/item/disk/nuclear, +/obj/item/retail_scanner/command, /turf/simulated/floor/wood, /area/crew_quarters/captain) "lh" = ( @@ -5354,7 +5354,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -5370,7 +5370,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftport) "lo" = ( @@ -5444,24 +5444,24 @@ /area/stellardelight/deck2/starboard) "lw" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/powermonitor{ +/obj/item/circuitboard/powermonitor{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/stationalert_engineering{ +/obj/item/circuitboard/stationalert_engineering{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/atmos_alert{ +/obj/item/circuitboard/atmos_alert{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/rcon_console, -/obj/item/weapon/circuitboard/atmoscontrol{ +/obj/item/circuitboard/rcon_console, +/obj/item/circuitboard/atmoscontrol{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/drone_control{ +/obj/item/circuitboard/drone_control{ pixel_x = 2; pixel_y = -2 }, @@ -5524,7 +5524,7 @@ /obj/machinery/computer/communications{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -5613,7 +5613,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -5753,8 +5753,8 @@ dir = 8; layer = 2.6 }, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/engine_eva) "lY" = ( @@ -5861,7 +5861,7 @@ "mj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 4; name = "night shift APC"; nightshift_setting = 2 @@ -6051,15 +6051,15 @@ }, /obj/item/clothing/shoes/black, /obj/machinery/light, -/obj/item/device/communicator, +/obj/item/communicator, /turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "mH" = ( /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/blue, +/obj/item/book/manual/security_space_law, +/obj/item/folder/red, +/obj/item/folder/blue, /obj/machinery/power/apc/angled{ dir = 8; name = "night shift APC"; @@ -6138,8 +6138,8 @@ /area/medical/psych) "mQ" = ( /obj/structure/table/standard, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, /obj/machinery/power/apc/angled{ dir = 1 }, @@ -6176,7 +6176,7 @@ /turf/simulated/wall/bay/steel, /area/storage/art) "mU" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -6199,24 +6199,24 @@ /area/stellardelight/deck2/fore) "mW" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/device/radio/intercom{ +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/chemistry) "mX" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = -1; pixel_y = 3 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = -5; pixel_y = -1 }, @@ -6465,7 +6465,7 @@ /obj/structure/table/standard, /obj/item/clothing/head/soft, /obj/item/clothing/head/soft, -/obj/item/weapon/stamp{ +/obj/item/stamp{ pixel_x = -3; pixel_y = 3 }, @@ -6483,8 +6483,8 @@ dir = 4 }, /obj/structure/closet/walllocker_double/medical/north, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/random/medical/lite, /obj/random/medical/lite, /obj/item/bodybag/cryobag, @@ -6572,7 +6572,7 @@ /obj/effect/floor_decal/milspec/color/green/corner{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -6697,8 +6697,8 @@ /area/stellardelight/deck2/triage) "oh" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/device/radio/intercom{ +/obj/item/storage/firstaid/surgery, +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -6811,7 +6811,7 @@ /obj/machinery/computer/supplycomp/control{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 @@ -6934,14 +6934,14 @@ /area/crew_quarters/bar) "oK" = ( /obj/structure/table/standard, -/obj/item/device/defib_kit/loaded, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/defib_kit/loaded, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = 24 }, @@ -7109,8 +7109,8 @@ /area/medical/cryo) "pg" = ( /obj/structure/closet/secure_closet/medical3, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/storage/belt/medical, +/obj/item/soap/nanotrasen, +/obj/item/storage/belt/medical, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/cmostore) "ph" = ( @@ -7355,7 +7355,7 @@ /area/medical/reception) "pN" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/light{ dir = 1 }, @@ -7397,13 +7397,13 @@ name = "formal wardrobe" }, /obj/item/glass_jar, -/obj/item/device/retail_scanner/civilian, -/obj/item/device/retail_scanner/civilian, -/obj/item/device/destTagger{ +/obj/item/retail_scanner/civilian, +/obj/item/retail_scanner/civilian, +/obj/item/destTagger{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/packageWrap, +/obj/item/packageWrap, /turf/simulated/floor/wood, /area/stellardelight/deck2/barbackroom) "pS" = ( @@ -7477,7 +7477,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -7518,7 +7518,7 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftport) "qd" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -7575,7 +7575,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = -6 }, /turf/simulated/floor/tiled/eris/white/bluecorner, @@ -7655,11 +7655,11 @@ /area/engineering/storage) "qs" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/newscaster{ pixel_y = 28 @@ -7736,28 +7736,28 @@ /area/engineering/workshop) "qA" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/skills{ +/obj/item/circuitboard/skills{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/med_data{ +/obj/item/circuitboard/med_data{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/secure_data{ +/obj/item/circuitboard/secure_data{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/security, -/obj/item/weapon/circuitboard/security/engineering{ +/obj/item/circuitboard/security, +/obj/item/circuitboard/security/engineering{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/security/mining{ +/obj/item/circuitboard/security/mining{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/stationalert_security{ +/obj/item/circuitboard/stationalert_security{ pixel_x = 3; pixel_y = -3 }, @@ -7866,7 +7866,7 @@ /turf/simulated/floor/plating, /area/medical/chemistry) "qS" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /obj/effect/floor_decal/spline/plain{ @@ -7922,15 +7922,15 @@ /obj/random/tech_supply/component/nofail, /obj/random/tech_supply/component/nofail, /obj/random/tech_supply/component/nofail, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/flash, +/obj/item/flash, +/obj/item/integrated_electronics/debugger{ pixel_x = -5 }, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = 5 }, -/obj/item/device/integrated_circuit_printer, +/obj/item/integrated_circuit_printer, /obj/structure/table/steel, /obj/machinery/alarm/angled, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, @@ -8115,22 +8115,22 @@ pixel_x = -1; pixel_y = -42 }, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/spacespice, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/carton/sugar, +/obj/item/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/peppermill, /obj/machinery/button/remote/blast_door{ dir = 1; id = "kitchenhallway"; @@ -8194,7 +8194,7 @@ /area/storage/primary) "ry" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/jetpack, +/obj/item/tank/jetpack, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/space/void/captain, /obj/item/clothing/head/helmet/space/void/captain, @@ -8210,7 +8210,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/card/id/gold/captain/spare{ +/obj/item/card/id/gold/captain/spare{ name = "\improper Captain's spare ID" }, /turf/simulated/floor/wood, @@ -8255,7 +8255,7 @@ /obj/machinery/newscaster{ pixel_y = 28 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -8323,7 +8323,7 @@ department = "Service"; pixel_y = 26 }, -/obj/item/device/retail_scanner/civilian, +/obj/item/retail_scanner/civilian, /turf/simulated/floor/tiled, /area/hydroponics) "rP" = ( @@ -8477,7 +8477,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -8496,7 +8496,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/quartermaster/storage) "sl" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -8544,7 +8544,7 @@ /turf/simulated/floor, /area/medical/chemistry) "sr" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /obj/effect/floor_decal/spline/plain{ @@ -8797,16 +8797,16 @@ icon_state = "crate"; name = "Grenade Crate" }, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/weapon/tool/screwdriver, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/tool/screwdriver, /obj/structure/table/reinforced, /obj/machinery/light, /turf/simulated/floor/tiled/eris/white/bluecorner, @@ -8933,11 +8933,11 @@ /area/engineering/engine_eva) "tn" = ( /obj/structure/table/standard, -/obj/item/device/camera{ +/obj/item/camera{ pixel_x = -2; pixel_y = 9 }, -/obj/item/device/camera{ +/obj/item/camera{ pixel_x = 2; pixel_y = 3 }, @@ -8977,8 +8977,8 @@ /area/crew_quarters/recreation_area) "tt" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen/red{ +/obj/item/folder/yellow, +/obj/item/pen/red{ pixel_x = 2; pixel_y = 6 }, @@ -9180,21 +9180,21 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck2/port) "tV" = ( -/obj/item/weapon/storage/box/nifsofts_medical{ +/obj/item/storage/box/nifsofts_medical{ pixel_x = 7; pixel_y = 7 }, -/obj/item/weapon/storage/box/nifsofts_medical, +/obj/item/storage/box/nifsofts_medical, /obj/structure/table/reinforced, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -4; pixel_y = 4 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 4; pixel_y = -4 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 7; pixel_y = 8 }, @@ -9442,8 +9442,8 @@ /area/stellardelight/deck2/combustionworkshop) "uv" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/device/radio/intercom{ +/obj/item/storage/firstaid/surgery, +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 @@ -9476,7 +9476,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -9696,8 +9696,8 @@ pixel_x = 24 }, /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/glass/rag, -/obj/item/weapon/reagent_containers/food/drinks/shaker{ +/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/food/drinks/shaker{ pixel_x = -7; pixel_y = 11 }, @@ -9757,10 +9757,10 @@ /area/stellardelight/deck2/triage) "vf" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, @@ -9822,8 +9822,8 @@ "vo" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, -/obj/item/weapon/cell/device, -/obj/item/weapon/cell/device, +/obj/item/cell/device, +/obj/item/cell/device, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -9943,16 +9943,16 @@ /area/engineering/atmos/monitoring) "vG" = ( /obj/structure/closet/walllocker_double/medical/north, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 5; pixel_y = 8 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 5; pixel_y = 8 }, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, /obj/item/clothing/gloves/sterile/nitrile, /obj/item/clothing/gloves/sterile/nitrile, /obj/random/tetheraid, @@ -10095,12 +10095,12 @@ /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck2/port) "vY" = ( -/obj/item/device/radio/headset/headset_med, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/fancy/vials, -/obj/item/weapon/storage/fancy/vials, -/obj/item/weapon/storage/box/pillbottles, -/obj/item/weapon/storage/box/pillbottles, +/obj/item/radio/headset/headset_med, +/obj/item/storage/box/syringes, +/obj/item/storage/fancy/vials, +/obj/item/storage/fancy/vials, +/obj/item/storage/box/pillbottles, +/obj/item/storage/box/pillbottles, /obj/structure/closet/wardrobe/chemistry_white, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/chemistry) @@ -10312,8 +10312,8 @@ /area/stellardelight/deck2/port) "wC" = ( /obj/machinery/recharger, -/obj/item/weapon/storage/box/syringegun, -/obj/item/weapon/gun/launcher/syringe, +/obj/item/storage/box/syringegun, +/obj/item/gun/launcher/syringe, /obj/structure/table/reinforced, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/cmostore) @@ -10349,11 +10349,11 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 30 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 2; pixel_y = 7 }, @@ -10660,7 +10660,7 @@ /obj/machinery/computer/skills{ pixel_x = 9 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -7; pixel_y = -2 }, @@ -10810,7 +10810,7 @@ "xJ" = ( /obj/structure/table/reinforced, /obj/machinery/chemical_dispenser/biochemistry/full, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -10920,7 +10920,7 @@ dir = 8; pixel_x = -12 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -10953,13 +10953,13 @@ /area/stellardelight/deck2/starboard) "xY" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = -24 }, @@ -11043,14 +11043,14 @@ icon_state = "4-8" }, /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, /turf/simulated/floor/tiled/eris/cafe, @@ -11386,13 +11386,13 @@ /turf/simulated/floor/tiled/white, /area/medical/surgery) "yV" = ( -/obj/item/device/sleevemate, -/obj/item/device/denecrotizer/medical, +/obj/item/sleevemate, +/obj/item/denecrotizer/medical, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/gun/energy/mouseray/medical, +/obj/item/gun/energy/mouseray/medical, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/cmostore) "yW" = ( @@ -11587,7 +11587,7 @@ dir = 4 }, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "night shift APC"; nightshift_setting = 2 @@ -11865,7 +11865,7 @@ /area/crew_quarters/locker) "Af" = ( /obj/structure/table/reinforced, -/obj/item/device/retail_scanner/engineering, +/obj/item/retail_scanner/engineering, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/workshop) "Ag" = ( @@ -11897,16 +11897,16 @@ /area/stellardelight/deck2/starboard) "Ak" = ( /obj/structure/table/standard, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/knife/butch, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/eris/cafe, /area/crew_quarters/kitchen) "Al" = ( /obj/structure/table/fancyblack, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/carpet/sblucarpet, /area/stellardelight/deck2/briefingroom) "Am" = ( @@ -12165,11 +12165,11 @@ pixel_x = -15; pixel_y = 2 }, -/obj/item/weapon/stamp/captain{ +/obj/item/stamp/captain{ pixel_x = 10; pixel_y = 6 }, -/obj/item/weapon/coin/phoron{ +/obj/item/coin/phoron{ desc = "The face of the coin shows a portrait of the explorer who discovered the Virgo-Erigone system. The back depicts a Zodiac symbol that represents Virgo."; name = "limited edition phoron coin"; pixel_x = 11; @@ -12194,12 +12194,12 @@ /area/hydroponics) "AS" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/algae_farm{ +/obj/item/circuitboard/algae_farm{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/unary_atmos/heater, -/obj/item/weapon/circuitboard/unary_atmos/cooler{ +/obj/item/circuitboard/unary_atmos/heater, +/obj/item/circuitboard/unary_atmos/cooler{ pixel_x = 3; pixel_y = -3 }, @@ -12483,7 +12483,7 @@ /area/engineering/engine_eva) "BC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -12533,8 +12533,8 @@ /area/hydroponics) "BI" = ( /obj/structure/table/standard, -/obj/item/weapon/clipboard, -/obj/item/weapon/stamp/qm, +/obj/item/clipboard, +/obj/item/stamp/qm, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/quartermaster/qm) @@ -12546,7 +12546,7 @@ /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/crew_quarters/bar) "BK" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/hologram/holopad, /turf/simulated/floor/carpet, /area/crew_quarters/recreation_area) @@ -12558,8 +12558,8 @@ /area/stellardelight/deck2/aftport) "BM" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/stamp/denied{ +/obj/item/folder/yellow, +/obj/item/stamp/denied{ pixel_x = 4; pixel_y = -2 }, @@ -12568,8 +12568,8 @@ pixel_y = 6 }, /obj/machinery/camera/network/cargo, -/obj/item/device/retail_scanner/cargo, -/obj/item/weapon/stamp/accepted, +/obj/item/retail_scanner/cargo, +/obj/item/stamp/accepted, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/quartermaster/storage) "BN" = ( @@ -12636,7 +12636,7 @@ layer = 3.3; name = "Bar Shutters" }, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /turf/simulated/floor/lino, /area/crew_quarters/bar) "BW" = ( @@ -12951,11 +12951,11 @@ /area/engineering/atmos/storage) "CI" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 2; pixel_y = 7 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3; pixel_y = 4 }, @@ -12979,7 +12979,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/weapon/toy/desk/stellardelight{ +/obj/item/toy/desk/stellardelight{ pixel_x = -11; pixel_y = -8 }, @@ -13081,11 +13081,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 2; pixel_y = 7 }, @@ -13143,7 +13143,7 @@ /area/storage/primary) "De" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -13283,23 +13283,23 @@ /area/engineering/engine_eva) "Dx" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = -5; pixel_y = 4 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /turf/simulated/floor/carpet/blue, /area/medical/psych) "Dy" = ( /obj/structure/table/standard, -/obj/item/device/defib_kit/loaded, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/defib_kit/loaded, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = 24 }, @@ -13431,7 +13431,7 @@ /area/stellardelight/deck2/fore) "DO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -13567,13 +13567,13 @@ "Ed" = ( /obj/machinery/light, /obj/structure/table/reinforced, -/obj/item/weapon/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/packageWrap, +/obj/item/hand_labeler, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/weapon/tape_roll, -/obj/item/weapon/clipboard, +/obj/item/tape_roll, +/obj/item/clipboard, /obj/machinery/recharger{ pixel_y = 4 }, @@ -13770,8 +13770,8 @@ /area/storage/primary) "Ez" = ( /obj/structure/table/woodentable, -/obj/item/weapon/gun/projectile/shotgun/doublebarrel, -/obj/item/weapon/paper{ +/obj/item/gun/projectile/shotgun/doublebarrel, +/obj/item/paper{ info = "This permit signifies that the Bartender is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest."; name = "Shotgun permit" }, @@ -13789,10 +13789,10 @@ /area/hydroponics) "EC" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/carpet/blue, @@ -13865,7 +13865,7 @@ /obj/machinery/computer/crew{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -13881,7 +13881,7 @@ /area/quartermaster/storage) "EL" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/machinery/light{ dir = 4 }, @@ -13912,7 +13912,7 @@ /area/stellardelight/deck2/fore) "EO" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/captaindouble, +/obj/item/bedsheet/captaindouble, /obj/structure/curtain/black, /obj/effect/landmark/start/captain, /turf/simulated/floor/wood, @@ -13966,7 +13966,7 @@ /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck2/triage) "EV" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled/eris/steel/brown_platform, @@ -14152,7 +14152,7 @@ /area/maintenance/stellardelight/deck2/portsolars) "Fq" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/machinery/light{ dir = 8 }, @@ -14163,7 +14163,7 @@ /area/medical/surgery) "Fr" = ( /obj/structure/table/woodentable, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -14200,7 +14200,7 @@ /obj/machinery/light/floortube{ pixel_y = -6 }, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /turf/simulated/floor/carpet, /area/crew_quarters/recreation_area) "Fx" = ( @@ -14236,7 +14236,7 @@ /turf/simulated/floor, /area/stellardelight/deck2/combustionworkshop) "Fy" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/tiled/eris/dark/cargo, @@ -14360,7 +14360,7 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) "FM" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -14370,32 +14370,32 @@ /area/crew_quarters/bar) "FN" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/grinder{ +/obj/item/circuitboard/grinder{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/circuitboard/grill{ +/obj/item/circuitboard/grill{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/fryer{ +/obj/item/circuitboard/fryer{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/oven{ +/obj/item/circuitboard/oven{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/microwave, -/obj/item/weapon/circuitboard/cerealmaker{ +/obj/item/circuitboard/microwave, +/obj/item/circuitboard/cerealmaker{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/candymachine{ +/obj/item/circuitboard/candymachine{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/biogenerator{ +/obj/item/circuitboard/biogenerator{ pixel_x = 3; pixel_y = -3 }, @@ -14555,7 +14555,7 @@ /area/stellardelight/deck2/fore) "Gc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -14744,7 +14744,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -14979,10 +14979,10 @@ }, /obj/structure/cable/blue, /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/bridge) "GX" = ( @@ -15025,8 +15025,8 @@ /area/bridge) "Hc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /obj/machinery/light, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -15124,11 +15124,11 @@ icon_state = "1-2" }, /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/device/megaphone, +/obj/item/megaphone, /turf/simulated/floor/wood, /area/quartermaster/qm) "Hq" = ( @@ -15161,8 +15161,8 @@ /area/engineering/atmos/monitoring) "Ht" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/device/radio/intercom{ +/obj/item/storage/firstaid/surgery, +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -15205,7 +15205,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -15240,7 +15240,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck2/port) "HA" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -15249,7 +15249,7 @@ }, /obj/structure/table/glass, /obj/machinery/recharger, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /turf/simulated/floor/tiled/eris/white/cargo, /area/stellardelight/deck2/triage) "HB" = ( @@ -15279,7 +15279,7 @@ /area/stellardelight/deck2/starboard) "HE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -15341,8 +15341,8 @@ /obj/structure/sign/poster{ dir = 8 }, -/obj/item/device/healthanalyzer/guide, -/obj/item/device/healthanalyzer/guide, +/obj/item/healthanalyzer/guide, +/obj/item/healthanalyzer/guide, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck2/triage) "HN" = ( @@ -15456,19 +15456,19 @@ /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/accessory/stethoscope, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_y = 9 }, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_y = 9 }, /obj/random/medical, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 14; pixel_y = 10 }, /obj/structure/table/reinforced, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -15562,25 +15562,25 @@ /turf/simulated/floor/airless, /area/stellardelight/deck2/exterior) "Ij" = ( -/obj/item/weapon/computer_hardware/battery_module, -/obj/item/weapon/computer_hardware/battery_module, -/obj/item/weapon/computer_hardware/battery_module/nano, -/obj/item/weapon/computer_hardware/hard_drive, -/obj/item/weapon/computer_hardware/hard_drive, -/obj/item/weapon/computer_hardware/hard_drive/micro, -/obj/item/weapon/computer_hardware/network_card, -/obj/item/weapon/computer_hardware/network_card, -/obj/item/weapon/computer_hardware/network_card/wired, -/obj/item/weapon/computer_hardware/processor_unit, -/obj/item/weapon/computer_hardware/processor_unit, -/obj/item/weapon/computer_hardware/processor_unit/small, -/obj/item/weapon/computer_hardware/tesla_link, -/obj/item/weapon/computer_hardware/nano_printer, -/obj/item/weapon/computer_hardware/hard_drive/portable, -/obj/item/weapon/computer_hardware/hard_drive/portable, -/obj/item/device/multitool, +/obj/item/computer_hardware/battery_module, +/obj/item/computer_hardware/battery_module, +/obj/item/computer_hardware/battery_module/nano, +/obj/item/computer_hardware/hard_drive, +/obj/item/computer_hardware/hard_drive, +/obj/item/computer_hardware/hard_drive/micro, +/obj/item/computer_hardware/network_card, +/obj/item/computer_hardware/network_card, +/obj/item/computer_hardware/network_card/wired, +/obj/item/computer_hardware/processor_unit, +/obj/item/computer_hardware/processor_unit, +/obj/item/computer_hardware/processor_unit/small, +/obj/item/computer_hardware/tesla_link, +/obj/item/computer_hardware/nano_printer, +/obj/item/computer_hardware/hard_drive/portable, +/obj/item/computer_hardware/hard_drive/portable, +/obj/item/multitool, /obj/item/clothing/gloves/yellow, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, @@ -15640,7 +15640,7 @@ dir = 1 }, /obj/structure/table/steel_reinforced, -/obj/item/device/retail_scanner/command, +/obj/item/retail_scanner/command, /obj/effect/landmark/vermin, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/bridge) @@ -15658,7 +15658,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -15974,12 +15974,12 @@ /area/medical/surgery) "Ja" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/circuitboard/partslathe, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/console_screen, +/obj/item/circuitboard/partslathe, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/storage/tech) "Jb" = ( @@ -16264,7 +16264,7 @@ /obj/effect/floor_decal/milspec/color/silver/corner{ dir = 8 }, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "JM" = ( @@ -16389,7 +16389,7 @@ /area/maintenance/stellardelight/deck2/portaft) "Kc" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/floor_decal/milspec/color/green/half, /turf/simulated/floor/tiled, /area/hydroponics) @@ -16411,7 +16411,7 @@ /area/medical/cmostore) "Kg" = ( /obj/structure/table/glass, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled/eris/white/cargo, /area/stellardelight/deck2/triage) "Kh" = ( @@ -16498,16 +16498,16 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = 9 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = 2 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = -5 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = -12 }, /obj/machinery/alarm/angled{ @@ -16546,19 +16546,19 @@ pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/reagent_containers/food/drinks/shaker{ +/obj/item/tool/screwdriver, +/obj/item/reagent_containers/food/drinks/shaker{ pixel_x = -7; pixel_y = 11 }, -/obj/item/weapon/flame/lighter/zippo{ +/obj/item/flame/lighter/zippo{ pixel_x = 2 }, /obj/item/clothing/mask/smokable/cigarette/cigar/cohiba, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, /obj/machinery/power/apc/angled{ dir = 4 }, @@ -16820,12 +16820,12 @@ /area/crew_quarters/recreation_area) "Lc" = ( /obj/structure/table/reinforced, -/obj/item/device/floor_painter, -/obj/item/device/t_scanner, -/obj/item/device/multitool{ +/obj/item/floor_painter, +/obj/item/t_scanner, +/obj/item/multitool{ pixel_x = 5 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/machinery/camera/network/engineering{ dir = 4 }, @@ -16911,14 +16911,14 @@ /area/quartermaster/storage) "Ln" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/packageWrap, -/obj/item/device/mass_spectrometer/adv, -/obj/item/device/mass_spectrometer/adv, +/obj/item/hand_labeler, +/obj/item/packageWrap, +/obj/item/mass_spectrometer/adv, +/obj/item/mass_spectrometer/adv, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/science, /turf/simulated/floor/tiled/eris/white/bluecorner, @@ -16959,8 +16959,8 @@ /area/stellardelight/deck2/fore) "Lt" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/stack/cable_coil{ pixel_x = 3; pixel_y = 3 @@ -16969,7 +16969,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/nifsofts_engineering, +/obj/item/storage/box/nifsofts_engineering, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/workshop) "Lu" = ( @@ -17052,10 +17052,10 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_y = 5 }, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/workshop) @@ -17064,7 +17064,7 @@ /area/quartermaster/storage) "LF" = ( /obj/structure/table/standard, -/obj/item/weapon/packageWrap, +/obj/item/packageWrap, /obj/fiftyspawner/cardboard, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/eris/steel/brown_platform, @@ -17146,7 +17146,7 @@ /obj/effect/floor_decal/milspec/color/green/half{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -17159,15 +17159,15 @@ pixel_y = 6 }, /obj/machinery/camera/network/civilian, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 2; pixel_y = 7 }, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/crew_quarters/bar) "LQ" = ( @@ -17254,11 +17254,11 @@ /area/stellardelight/deck2/triage) "Ma" = ( /obj/structure/table/standard, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /obj/item/stack/cable_coil/random, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/stack/cable_coil/random, -/obj/item/device/floor_painter, +/obj/item/floor_painter, /obj/machinery/camera/network/civilian, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -17323,28 +17323,28 @@ /area/engineering/engine_room) "Mh" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/rdserver{ +/obj/item/circuitboard/rdserver{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/protolathe{ +/obj/item/circuitboard/protolathe{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/destructive_analyzer{ +/obj/item/circuitboard/destructive_analyzer{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/rdconsole, -/obj/item/weapon/circuitboard/autolathe{ +/obj/item/circuitboard/rdconsole, +/obj/item/circuitboard/autolathe{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/mechfab{ +/obj/item/circuitboard/mechfab{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/prosthetics{ +/obj/item/circuitboard/prosthetics{ pixel_x = 3; pixel_y = -3 }, @@ -17490,7 +17490,7 @@ /area/engineering/locker_room) "Mw" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1 }, /obj/effect/floor_decal/milspec/color/blue/corner{ @@ -17563,7 +17563,7 @@ /obj/structure/closet/emergsuit_wall{ pixel_y = 29 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -17709,12 +17709,12 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/crew{ +/obj/item/circuitboard/crew{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/card, -/obj/item/weapon/circuitboard/communications{ +/obj/item/circuitboard/card, +/obj/item/circuitboard/communications{ pixel_x = 3; pixel_y = -3 }, @@ -17832,7 +17832,7 @@ /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/quartermaster/storage) "Nk" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -17966,7 +17966,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/red, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 @@ -18084,14 +18084,14 @@ /area/stellardelight/deck2/exterior) "NM" = ( /obj/structure/closet/crate, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil/super_capacity, -/obj/item/weapon/smes_coil/super_capacity, -/obj/item/weapon/smes_coil/super_io, -/obj/item/weapon/smes_coil/super_io, +/obj/item/circuitboard/smes, +/obj/item/circuitboard/smes, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil/super_capacity, +/obj/item/smes_coil/super_capacity, +/obj/item/smes_coil/super_io, +/obj/item/smes_coil/super_io, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -18109,7 +18109,7 @@ dir = 8; pixel_x = 27 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24; pixel_y = 32 @@ -18243,13 +18243,13 @@ /area/stellardelight/deck2/aftport) "Oj" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = -24 }, @@ -18307,7 +18307,7 @@ /obj/random/maintenance/medical, /obj/random/maintenance/engineering, /obj/random/maintenance, -/obj/item/weapon/disk/nifsoft/compliance, +/obj/item/disk/nifsoft/compliance, /obj/random/drinkbottle, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardfore) @@ -18322,7 +18322,7 @@ /area/medical/surgery2) "Oq" = ( /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8 }, /obj/structure/cable/cyan{ @@ -18433,7 +18433,7 @@ /obj/machinery/camera/network/command{ dir = 10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -18498,11 +18498,11 @@ /area/stellardelight/deck2/aftstarboard) "OO" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ name = "box of measuring cups"; pixel_x = 2; pixel_y = 3; - starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup = 7) + starts_with = list(/obj/item/reagent_containers/glass/beaker/measuring_cup = 7) }, /turf/simulated/floor/tiled/eris/cafe, /area/crew_quarters/kitchen) @@ -18645,7 +18645,7 @@ /area/engineering/atmos/monitoring) "OZ" = ( /obj/structure/closet/toolcloset, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/locker_room) "Pb" = ( @@ -18698,7 +18698,7 @@ icon_state = "4-8" }, /obj/structure/table/standard, -/obj/item/weapon/book/manual/cook_guide, +/obj/item/book/manual/cook_guide, /turf/simulated/floor/tiled/eris/cafe, /area/crew_quarters/kitchen) "Ph" = ( @@ -18974,9 +18974,9 @@ icon_state = "1-2" }, /obj/structure/table/standard, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/stamp{ +/obj/item/hand_labeler, +/obj/item/folder/yellow, +/obj/item/stamp{ pixel_x = -3; pixel_y = 3 }, @@ -19223,17 +19223,17 @@ /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/engineering_monitoring) "Ql" = ( -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/scanning_module, -/obj/item/weapon/stock_parts/scanning_module, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/device/pipe_painter, -/obj/item/weapon/pipe_dispenser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/console_screen, +/obj/item/pipe_painter, +/obj/item/pipe_dispenser, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/table/steel, /obj/machinery/camera/network/engineering, @@ -19275,16 +19275,16 @@ /area/hydroponics) "Qp" = ( /obj/structure/table/glass, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = 9 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = 2 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = -5 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = -12 }, /obj/structure/sign/department/operational{ @@ -19361,8 +19361,8 @@ pixel_y = 2 }, /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/white, /area/medical/surgery) "Qz" = ( @@ -19517,7 +19517,7 @@ name = "Engineering Reception Desk"; req_access = list(10) }, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/engineering/engineering_monitoring) "QU" = ( @@ -19649,7 +19649,7 @@ /area/engineering/engineering_monitoring) "Rf" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/book/manual/sd_guide, +/obj/item/book/manual/sd_guide, /obj/effect/floor_decal/milspec/color/blue/half{ dir = 6 }, @@ -19657,9 +19657,9 @@ /area/bridge) "Rh" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/red, -/obj/item/weapon/pen{ +/obj/item/paper_bin, +/obj/item/pen/red, +/obj/item/pen{ pixel_x = 4; pixel_y = 4 }, @@ -19867,7 +19867,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -19958,11 +19958,11 @@ /area/medical/psych) "RX" = ( /obj/structure/table/standard, -/obj/item/device/camera_film{ +/obj/item/camera_film{ pixel_x = 4; pixel_y = 11 }, -/obj/item/device/camera_film{ +/obj/item/camera_film{ pixel_x = -3; pixel_y = 4 }, @@ -20009,7 +20009,7 @@ /area/engineering/storage) "Sf" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/alarm/angled, /turf/simulated/floor/tiled/eris/steel/cargo, /area/quartermaster/storage) @@ -20106,7 +20106,7 @@ /area/stellardelight/deck2/fore) "Ss" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/machinery/light{ dir = 4 }, @@ -20230,15 +20230,15 @@ /area/crew_quarters/recreation_area) "SG" = ( /obj/structure/table/rack/steel, -/obj/item/device/slime_scanner, -/obj/item/device/sleevemate, -/obj/item/device/robotanalyzer, -/obj/item/device/reagent_scanner, -/obj/item/device/healthanalyzer, -/obj/item/device/geiger, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/analyzer, -/obj/item/device/t_scanner, +/obj/item/slime_scanner, +/obj/item/sleevemate, +/obj/item/robotanalyzer, +/obj/item/reagent_scanner, +/obj/item/healthanalyzer, +/obj/item/geiger, +/obj/item/analyzer/plant_analyzer, +/obj/item/analyzer, +/obj/item/t_scanner, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/storage/tech) "SH" = ( @@ -20251,7 +20251,7 @@ /turf/simulated/floor/wood, /area/stellardelight/deck2/briefingroom) "SI" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled/eris/dark/cargo, @@ -20467,7 +20467,7 @@ dir = 1; pixel_y = 6 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -20610,16 +20610,16 @@ /area/engineering/atmos/storage) "TB" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box{ +/obj/item/storage/box{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box, -/obj/item/weapon/tape_roll{ +/obj/item/storage/box, +/obj/item/tape_roll{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/tape_roll, +/obj/item/tape_roll, /obj/machinery/status_display{ pixel_y = 32 }, @@ -20636,12 +20636,12 @@ /area/crew_quarters/bar) "TD" = ( /obj/structure/table/steel, -/obj/item/weapon/module/power_control, -/obj/item/weapon/airlock_electronics, -/obj/item/weapon/module/power_control, -/obj/item/weapon/airlock_electronics, -/obj/item/device/aicard, -/obj/item/weapon/aiModule/reset, +/obj/item/module/power_control, +/obj/item/airlock_electronics, +/obj/item/module/power_control, +/obj/item/airlock_electronics, +/obj/item/aicard, +/obj/item/aiModule/reset, /obj/structure/cable/orange{ icon_state = "1-4" }, @@ -20660,14 +20660,14 @@ "TG" = ( /obj/structure/table/reinforced, /obj/machinery/firealarm/angled, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 6 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, /turf/simulated/floor/tiled/eris/dark/orangecorner, @@ -20706,8 +20706,8 @@ /area/stellardelight/deck2/aftport) "TK" = ( /obj/structure/closet/secure_closet/cargotech, -/obj/item/weapon/stamp/cargo, -/obj/item/weapon/storage/backpack/dufflebag, +/obj/item/stamp/cargo, +/obj/item/storage/backpack/dufflebag, /obj/machinery/power/apc/angled{ dir = 4 }, @@ -20988,7 +20988,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -21240,19 +21240,19 @@ /area/engineering/engine_eva) "UV" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/body_designer{ +/obj/item/circuitboard/body_designer{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/resleeving_control{ +/obj/item/circuitboard/resleeving_control{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/transhuman_clonepod{ +/obj/item/circuitboard/transhuman_clonepod{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/transhuman_synthprinter{ +/obj/item/circuitboard/transhuman_synthprinter{ pixel_x = 3; pixel_y = -3 }, @@ -21414,8 +21414,8 @@ "Vp" = ( /obj/structure/table/standard, /obj/machinery/cell_charger, -/obj/item/weapon/module/power_control, -/obj/item/weapon/cell{ +/obj/item/module/power_control, +/obj/item/cell{ maxcharge = 2000 }, /turf/simulated/floor/tiled/eris/steel/cargo, @@ -21440,8 +21440,8 @@ dir = 1 }, /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/structure/sink{ dir = 4; pixel_x = 11 @@ -21463,15 +21463,15 @@ icon_state = "4-8" }, /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/mint, +/obj/item/reagent_containers/food/snacks/mint, /obj/machinery/light/floortube{ pixel_y = -6 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3; pixel_y = 13 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -1; pixel_y = 10 }, @@ -21599,16 +21599,16 @@ "VL" = ( /obj/structure/closet/chefcloset, /obj/item/glass_jar, -/obj/item/device/retail_scanner/civilian, -/obj/item/weapon/soap/nanotrasen, -/obj/item/device/destTagger{ +/obj/item/retail_scanner/civilian, +/obj/item/soap/nanotrasen, +/obj/item/destTagger{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/tool/wrench, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/tool/wrench, /obj/structure/noticeboard{ dir = 1; pixel_y = -32 @@ -21634,19 +21634,19 @@ /area/stellardelight/deck2/port) "VS" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = -9; pixel_y = 10 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = -9; pixel_y = 1 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 6; pixel_y = 10 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 6; pixel_y = 1 }, @@ -21735,7 +21735,7 @@ /turf/space, /area/space) "Wc" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -21766,16 +21766,16 @@ "Wh" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/cell/high{ +/obj/item/tool/wrench, +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -22219,9 +22219,9 @@ /area/stellardelight/deck2/fore) "Xf" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /obj/item/clothing/gloves/black, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/light{ dir = 8 }, @@ -22292,7 +22292,7 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardaft) "Xq" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /obj/effect/floor_decal/spline/plain{ @@ -22362,7 +22362,7 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -22373,19 +22373,19 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/transhuman_resleever{ +/obj/item/circuitboard/transhuman_resleever{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/circuit_imprinter{ +/obj/item/circuitboard/circuit_imprinter{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/aiupload{ +/obj/item/circuitboard/aiupload{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/borgupload{ +/obj/item/circuitboard/borgupload{ pixel_x = 3; pixel_y = -3 }, @@ -22419,20 +22419,20 @@ /area/stellardelight/deck2/starboard) "XF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ name = "human repair kit"; pixel_x = -9; pixel_y = 9 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = -9; pixel_y = 1 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 6; pixel_y = 9 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 6; pixel_y = 1 }, @@ -22552,7 +22552,7 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardaft) "XU" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /obj/effect/floor_decal/spline/plain{ @@ -22588,15 +22588,15 @@ icon_state = "1-2" }, /obj/structure/table/standard, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster{ pixel_x = -4; pixel_y = 7 }, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster{ pixel_x = 6; pixel_y = 5 }, -/obj/item/weapon/cartridge/quartermaster, +/obj/item/cartridge/quartermaster, /turf/simulated/floor/wood, /area/quartermaster/qm) "XY" = ( @@ -22605,14 +22605,14 @@ /area/medical/cmostore) "XZ" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/anomaly_spectroscopy, -/obj/item/weapon/book/manual/anomaly_testing, -/obj/item/weapon/book/manual/materials_chemistry_analysis, -/obj/item/weapon/book/manual/resleeving, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual, +/obj/item/book/manual/anomaly_spectroscopy, +/obj/item/book/manual/anomaly_testing, +/obj/item/book/manual/materials_chemistry_analysis, +/obj/item/book/manual/resleeving, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/command_guide, +/obj/item/book/manual, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -22650,8 +22650,8 @@ /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "Yd" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/structure/table/reinforced, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/engine_eva) @@ -22694,7 +22694,7 @@ /area/stellardelight/deck2/barbackroom) "Yj" = ( /obj/structure/table/standard, -/obj/item/device/retail_scanner/civilian, +/obj/item/retail_scanner/civilian, /turf/simulated/floor/tiled/eris/cafe, /area/crew_quarters/kitchen) "Yk" = ( @@ -22964,7 +22964,7 @@ /turf/simulated/floor/wood, /area/stellardelight/deck2/barbackroom) "YN" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -23112,18 +23112,18 @@ icon_state = "0-4" }, /obj/structure/table/reinforced, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 6 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -6; pixel_y = 4 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = 6; pixel_y = 4 }, -/obj/item/device/radio/off, +/obj/item/radio/off, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/locker_room) "Zh" = ( @@ -23146,14 +23146,14 @@ pixel_x = 1; pixel_y = 1 }, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = 2; pixel_y = 1 }, -/obj/item/weapon/storage/box/lights/mixed{ +/obj/item/storage/box/lights/mixed{ pixel_y = 4 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -2 }, @@ -23260,12 +23260,12 @@ /area/storage/art) "Zv" = ( /obj/structure/closet/walllocker_double/medical/north, -/obj/item/weapon/storage/box/rxglasses{ +/obj/item/storage/box/rxglasses{ pixel_x = 7; pixel_y = 7 }, -/obj/item/weapon/storage/box/rxglasses, -/obj/item/device/glasses_kit, +/obj/item/storage/box/rxglasses, +/obj/item/glasses_kit, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/cmostore) "Zw" = ( @@ -23302,7 +23302,7 @@ /turf/simulated/floor/tiled/techmaint, /area/storage/primary) "ZC" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /obj/structure/cable/green{ @@ -23409,7 +23409,7 @@ /obj/machinery/chemical_dispenser/bar_coffee/full{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/machinery/light/small, @@ -23435,7 +23435,7 @@ /area/stellardelight/deck2/port) "ZR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -23443,11 +23443,11 @@ name = "Engineering Reception Desk"; req_access = list(10) }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/engineering/engineering_monitoring) "ZS" = ( diff --git a/maps/stellar_delight/stellar_delight3.dmm b/maps/stellar_delight/stellar_delight3.dmm index 8d155584e68..506ed545fa8 100644 --- a/maps/stellar_delight/stellar_delight3.dmm +++ b/maps/stellar_delight/stellar_delight3.dmm @@ -117,7 +117,7 @@ /obj/machinery/computer/HolodeckControl{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -150,9 +150,9 @@ /turf/simulated/floor/tiled/dark, /area/lawoffice) "au" = ( -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/security_space_law, /obj/structure/closet/walllocker_double/command/hos{ dir = 4; pixel_x = 32 @@ -160,14 +160,14 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "av" = ( -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = -3 }, -/obj/item/weapon/circuitboard/aicore{ +/obj/item/circuitboard/aicore{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/circuitboard/teleporter, +/obj/item/circuitboard/teleporter, /obj/structure/closet/walllocker_double/command/rd{ dir = 8; pixel_x = -32 @@ -181,12 +181,12 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/aftstarroom) "ax" = ( -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /obj/structure/closet/walllocker_double/command/iaa{ dir = 4; pixel_x = 32 @@ -194,12 +194,12 @@ /turf/simulated/floor/tiled/dark, /area/lawoffice) "ay" = ( -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /obj/structure/closet/walllocker_double/command/iaa{ dir = 8; pixel_x = -32 @@ -207,11 +207,11 @@ /turf/simulated/floor/tiled/dark, /area/lawoffice) "az" = ( -/obj/item/device/megaphone, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/command_guide, +/obj/item/megaphone, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/command_guide, /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -576,7 +576,7 @@ /area/stellardelight/deck2/fore) "bJ" = ( /obj/structure/table/steel, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/stellardelight/deck3/forestarrooma) "bK" = ( @@ -599,7 +599,7 @@ /area/ai_upload) "bO" = ( /obj/structure/table/darkglass, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -1000,7 +1000,7 @@ /turf/simulated/floor/airless, /area/maintenance/stellardelight/deck3/starboardcent) "dn" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -1532,38 +1532,38 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai_server_room) "fd" = ( -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, /obj/structure/table/woodentable, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/alarm/angled, /obj/machinery/status_display{ pixel_x = -32 @@ -1612,8 +1612,8 @@ "fj" = ( /obj/structure/table/woodentable, /obj/item/toy/figure/clown, -/obj/item/weapon/pen/crayon/marker/rainbow, -/obj/item/weapon/pen/crayon/rainbow, +/obj/item/pen/crayon/marker/rainbow, +/obj/item/pen/crayon/rainbow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -1736,7 +1736,7 @@ /area/stellardelight/deck3/starboarddock) "gb" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/folder/red_hos, +/obj/item/folder/red_hos, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "gc" = ( @@ -1775,7 +1775,7 @@ }) "gj" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/disk/nifsoft/compliance, +/obj/item/disk/nifsoft/compliance, /obj/random/contraband, /obj/random/contraband, /obj/random/contraband, @@ -1839,7 +1839,7 @@ /area/stellardelight/deck3/exterior) "gy" = ( /obj/structure/closet/secure_closet/engineering_chief, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 @@ -1847,7 +1847,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/item/device/retail_scanner/engineering, +/obj/item/retail_scanner/engineering, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "gA" = ( @@ -1878,11 +1878,11 @@ /area/stellardelight/deck3/exterior) "gE" = ( /obj/structure/table/darkglass, -/obj/item/weapon/stamp/denied{ +/obj/item/stamp/denied{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/stamp/internalaffairs, +/obj/item/stamp/internalaffairs, /turf/simulated/floor/carpet/blue2, /area/lawoffice) "gG" = ( @@ -1914,7 +1914,7 @@ /turf/simulated/floor/airless, /area/stellardelight/deck3/exterior) "gL" = ( -/obj/item/weapon/bedsheet/hosdouble, +/obj/item/bedsheet/hosdouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black{ color = "#631915" @@ -2441,7 +2441,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -2633,7 +2633,7 @@ /area/crew_quarters/bar) "jD" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /obj/structure/curtain/black, /obj/effect/landmark/start/hop, /obj/machinery/requests_console{ @@ -2738,7 +2738,7 @@ /area/stellardelight/deck2/central) "ka" = ( /obj/structure/table/darkglass, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -2; pixel_y = -5 }, @@ -2903,8 +2903,8 @@ }, /obj/structure/closet/secure_closet/hop, /obj/item/clothing/glasses/omnihud, -/obj/item/device/retail_scanner/command, -/obj/item/weapon/storage/box/PDAs, +/obj/item/retail_scanner/command, +/obj/item/storage/box/PDAs, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "kO" = ( @@ -3253,7 +3253,7 @@ /area/ai_cyborg_station) "lP" = ( /obj/structure/table/woodentable, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 @@ -3359,7 +3359,7 @@ /area/stellardelight/deck2/central) "mh" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 1; pixel_y = 1 @@ -3724,9 +3724,9 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) "nv" = ( -/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/item/reagent_containers/glass/bucket/wood, /obj/structure/closet/crate, -/obj/item/weapon/material/minihoe, +/obj/item/material/minihoe, /obj/item/seeds/reishimycelium, /obj/item/seeds/random, /obj/item/seeds/random, @@ -3813,7 +3813,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -3821,12 +3821,12 @@ /area/stellardelight/deck3/cafe) "nH" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = -4; pixel_y = 12 }, -/obj/item/weapon/stamp/hos, -/obj/item/weapon/book/manual/sd_guide, +/obj/item/stamp/hos, +/obj/item/book/manual/sd_guide, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "nL" = ( @@ -3843,7 +3843,7 @@ /obj/structure/cable/blue{ icon_state = "1-2" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -3950,8 +3950,8 @@ /obj/structure/table/alien{ name = "fancy table" }, -/obj/item/weapon/stamp/rd, -/obj/item/weapon/book/manual/sd_guide, +/obj/item/stamp/rd, +/obj/item/book/manual/sd_guide, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/heads/hor) "op" = ( @@ -4123,17 +4123,17 @@ pixel_x = -32; pixel_y = 32 }, -/obj/item/device/radio/intercom/locked/ai_private{ +/obj/item/radio/intercom/locked/ai_private{ dir = 4; pixel_x = 32 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 1; dir = 8; name = "Common Channel"; pixel_x = -21 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -4163,7 +4163,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -4266,7 +4266,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -4274,22 +4274,22 @@ /area/stellardelight/deck3/starboarddock) "pm" = ( /obj/structure/table/darkglass, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = -5; pixel_y = -5 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blade/red{ +/obj/item/paper_bin, +/obj/item/pen/blade/red{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/pen, -/obj/item/weapon/pen/blue{ +/obj/item/pen, +/obj/item/pen/blue{ pixel_x = 2; pixel_y = 3 }, @@ -4362,7 +4362,7 @@ /area/maintenance/stellardelight/deck3/aftstarroom) "pA" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/cosmosdouble{ +/obj/item/bedsheet/cosmosdouble{ icon_state = "dobulesheetcosmos" }, /obj/machinery/camera/network/command, @@ -4373,7 +4373,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -4878,7 +4878,7 @@ pixel_x = 32; pixel_y = 32 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -5275,7 +5275,7 @@ /area/stellardelight/deck3/starboarddock) "sQ" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/reset, +/obj/item/aiModule/reset, /obj/machinery/alarm{ dir = 4; pixel_x = -28 @@ -5492,19 +5492,19 @@ /area/tcommsat/chamber) "tO" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = 10 }, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{ +/obj/item/reagent_containers/food/drinks/flask/barflask{ pixel_x = -9; pixel_y = -2 }, -/obj/item/device/radio/off, +/obj/item/radio/off, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "tQ" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/freeform, +/obj/item/aiModule/freeform, /obj/machinery/light{ dir = 1 }, @@ -5608,7 +5608,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -5736,15 +5736,15 @@ "uM" = ( /obj/machinery/alarm/angled, /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/clown{ +/obj/item/flashlight/lamp/clown{ pixel_x = -4; pixel_y = 6 }, -/obj/item/weapon/bikehorn{ +/obj/item/bikehorn{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/stamp/clown{ +/obj/item/stamp/clown{ pixel_x = 6; pixel_y = 9 }, @@ -6097,11 +6097,11 @@ /area/stellardelight/deck2/port) "wd" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/oxygen, -/obj/item/weapon/aiModule/oneHuman, -/obj/item/weapon/aiModule/purge, -/obj/item/weapon/aiModule/antimov, -/obj/item/weapon/aiModule/teleporterOffline, +/obj/item/aiModule/oxygen, +/obj/item/aiModule/oneHuman, +/obj/item/aiModule/purge, +/obj/item/aiModule/antimov, +/obj/item/aiModule/teleporterOffline, /obj/machinery/alarm/angled{ dir = 8 }, @@ -6155,11 +6155,11 @@ /area/stellardelight/deck3/starboarddock) "wo" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/asimov, -/obj/item/weapon/aiModule/freeformcore, -/obj/item/weapon/aiModule/corp, -/obj/item/weapon/aiModule/paladin, -/obj/item/weapon/aiModule/robocop, +/obj/item/aiModule/asimov, +/obj/item/aiModule/freeformcore, +/obj/item/aiModule/corp, +/obj/item/aiModule/paladin, +/obj/item/aiModule/robocop, /obj/structure/cable/blue, /obj/machinery/power/apc/angled{ dir = 8 @@ -6231,7 +6231,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -6405,11 +6405,11 @@ /area/maintenance/stellardelight/deck3/portaft) "xj" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/consuming_eradicator, -/obj/item/weapon/aiModule/guard_dog, -/obj/item/weapon/aiModule/pleasurebot, -/obj/item/weapon/aiModule/protective_shell, -/obj/item/weapon/aiModule/scientific_pursuer, +/obj/item/aiModule/consuming_eradicator, +/obj/item/aiModule/guard_dog, +/obj/item/aiModule/pleasurebot, +/obj/item/aiModule/protective_shell, +/obj/item/aiModule/scientific_pursuer, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -6800,16 +6800,16 @@ /turf/simulated/wall/bay/r_wall/blue, /area/ai_cyborg_station) "yI" = ( -/obj/item/weapon/folder{ +/obj/item/folder{ pixel_x = -4 }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 5 }, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_y = 3 }, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/structure/table/darkglass, /obj/machinery/light, /turf/simulated/floor/tiled/dark, @@ -7015,7 +7015,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/stellardelight/deck3/foreportroomb) "zv" = ( -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black{ color = "#361447" @@ -7074,8 +7074,8 @@ /area/stellardelight/deck3/commandhall) "zC" = ( /obj/item/toy/figure/mime, -/obj/item/weapon/pen/crayon/marker/mime, -/obj/item/weapon/pen/crayon/mime, +/obj/item/pen/crayon/marker/mime, +/obj/item/pen/crayon/mime, /obj/structure/table/woodentable, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -7191,7 +7191,7 @@ /area/crew_quarters/heads/hos) "zQ" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/stellardelight/deck3/foreportrooma) "zS" = ( @@ -7260,12 +7260,12 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/stellardelight/deck3/forestarrooma) "Aj" = ( -/obj/item/device/camera, -/obj/item/device/camera_film, -/obj/item/device/taperecorder, -/obj/item/device/tape/random, -/obj/item/device/tape/random, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/camera, +/obj/item/camera_film, +/obj/item/taperecorder, +/obj/item/rectape/random, +/obj/item/rectape/random, +/obj/item/storage/secure/briefcase, /obj/structure/closet/walllocker_double/east, /turf/simulated/floor/carpet/blue2, /area/lawoffice) @@ -7343,7 +7343,7 @@ /area/maintenance/stellardelight/deck3/starboardaft) "At" = ( /obj/structure/table/glass, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet, /area/stellardelight/deck3/readingroom) "Av" = ( @@ -7374,12 +7374,12 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/forestarrooma) "Az" = ( -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, +/obj/item/camera_assembly, +/obj/item/camera_assembly, +/obj/item/camera_assembly, +/obj/item/camera_assembly, +/obj/item/camera_assembly, +/obj/item/camera_assembly, /obj/structure/closet/crate{ name = "Camera Assembly Crate" }, @@ -8498,7 +8498,7 @@ /area/space) "Et" = ( /obj/structure/closet/secure_closet/hos, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 @@ -8540,7 +8540,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/rig/ce/equipped, +/obj/item/rig/ce/equipped, /obj/item/clothing/mask/breath, /obj/item/clothing/shoes/magboots/adv, /turf/simulated/floor/tiled, @@ -8930,7 +8930,7 @@ /area/maintenance/stellardelight/deck3/starboardaft) "Ge" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/nanotrasen, +/obj/item/aiModule/nanotrasen, /obj/machinery/camera/network/command, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/bluegrid, @@ -8967,7 +8967,7 @@ /area/ai_upload) "Gi" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/hazmat/equipped, +/obj/item/rig/hazmat/equipped, /obj/machinery/light, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/heads/hor) @@ -9033,8 +9033,8 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "GB" = ( -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/glass/rag, /obj/structure/table/rack, /obj/random/donkpocketbox, /turf/simulated/floor/tiled/techfloor/grid, @@ -9072,7 +9072,7 @@ /turf/simulated/floor/airless, /area/maintenance/stellardelight/deck3/portcent) "GH" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -9131,17 +9131,17 @@ /area/ai_server_room) "GW" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/supermatter_engine, -/obj/item/device/radio{ +/obj/item/book/manual/supermatter_engine, +/obj/item/radio{ pixel_x = -4 }, -/obj/item/device/megaphone, +/obj/item/megaphone, /obj/machinery/light, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "Ha" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/cedouble, +/obj/item/bedsheet/cedouble, /obj/structure/curtain/black{ color = "#945112" }, @@ -9215,7 +9215,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -9835,22 +9835,22 @@ /area/stellardelight/deck3/starboarddock) "Js" = ( /obj/structure/table/darkglass, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blade/red{ +/obj/item/paper_bin, +/obj/item/pen/blade/red{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/pen, -/obj/item/weapon/pen/blue{ +/obj/item/pen, +/obj/item/pen/blue{ pixel_x = 2; pixel_y = 3 }, @@ -9920,19 +9920,19 @@ icon_state = "0-2" }, /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /turf/simulated/floor/lino, /area/stellardelight/deck3/cafe) "JJ" = ( @@ -10006,11 +10006,11 @@ /area/stellardelight/deck3/aft) "JU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/rcd, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd_ammo, +/obj/item/rcd, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "JW" = ( @@ -10224,8 +10224,8 @@ /obj/structure/table/alien{ name = "fancy table" }, -/obj/item/weapon/cartridge/signal/science, -/obj/item/weapon/cartridge/signal/science, +/obj/item/cartridge/signal/science, +/obj/item/cartridge/signal/science, /obj/item/clothing/glasses/welding/superior, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -10608,12 +10608,12 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/forestarrooma) "Mg" = ( -/obj/item/device/camera, -/obj/item/device/camera_film, -/obj/item/device/taperecorder, -/obj/item/device/tape/random, -/obj/item/device/tape/random, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/camera, +/obj/item/camera_film, +/obj/item/taperecorder, +/obj/item/rectape/random, +/obj/item/rectape/random, +/obj/item/storage/secure/briefcase, /obj/structure/closet/walllocker_double/west, /turf/simulated/floor/carpet/blue2, /area/lawoffice) @@ -10645,11 +10645,11 @@ /area/stellardelight/deck2/port) "Ml" = ( /obj/structure/table/darkglass, -/obj/item/weapon/stamp/denied{ +/obj/item/stamp/denied{ pixel_x = -6; pixel_y = 6 }, -/obj/item/weapon/stamp/internalaffairs, +/obj/item/stamp/internalaffairs, /turf/simulated/floor/carpet/blue2, /area/lawoffice) "Mo" = ( @@ -10683,7 +10683,7 @@ /area/ai_cyborg_station) "Mr" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/clowndouble, +/obj/item/bedsheet/clowndouble, /obj/structure/curtain/black{ color = "#361447" }, @@ -10691,17 +10691,17 @@ /area/stellardelight/deck3/clownmimeoffice) "Ms" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stamp/hop, -/obj/item/weapon/paper_bin{ +/obj/item/stamp/hop, +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/multi, -/obj/item/device/flashlight/lamp/green{ +/obj/item/pen/multi, +/obj/item/flashlight/lamp/green{ pixel_x = 3; pixel_y = 18 }, -/obj/item/weapon/book/manual/sd_guide, +/obj/item/book/manual/sd_guide, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "Mu" = ( @@ -10829,8 +10829,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/device/retail_scanner/security, -/obj/item/device/ticket_printer, +/obj/item/retail_scanner/security, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "MO" = ( @@ -11142,8 +11142,8 @@ /area/stellardelight/deck3/aft) "NO" = ( /obj/structure/table/reinforced, -/obj/item/device/flashlight/lamp, -/obj/item/device/radio/intercom{ +/obj/item/flashlight/lamp, +/obj/item/radio/intercom{ dir = 1; frequency = 1357; name = "station intercom (Engineering)"; @@ -11249,7 +11249,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/starboarddock) "NZ" = ( -/obj/item/weapon/bedsheet/mimedouble, +/obj/item/bedsheet/mimedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet/bcarpet, @@ -11362,7 +11362,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/heads/hor) "Ou" = ( -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/structure/cable{ icon_state = "4-8" @@ -11462,8 +11462,8 @@ dir = 8 }, /obj/item/clothing/mask/breath, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/security/prototype, /obj/item/clothing/head/helmet/space/void/security/prototype, @@ -11816,12 +11816,12 @@ /area/stellardelight/deck3/commandhall) "PR" = ( /obj/structure/table/glass, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = -4; pixel_y = 12 }, -/obj/item/weapon/stamp/cmo, -/obj/item/weapon/book/manual/sd_guide, +/obj/item/stamp/cmo, +/obj/item/book/manual/sd_guide, /turf/simulated/floor/carpet/tealcarpet, /area/crew_quarters/heads/cmo) "PT" = ( @@ -12008,7 +12008,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai) "QI" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -12419,7 +12419,7 @@ /area/maintenance/stellardelight/deck3/foreportrooma) "Sk" = ( /obj/structure/table/standard, -/obj/item/weapon/phone{ +/obj/item/phone{ pixel_x = 3; pixel_y = 11 }, @@ -12524,7 +12524,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -12706,7 +12706,7 @@ /obj/structure/bed/chair/office/dark{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 @@ -12752,7 +12752,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "night shift APC"; nightshift_setting = 2 @@ -12941,8 +12941,8 @@ /area/maintenance/stellardelight/deck3/foreportrooma) "Ud" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stamp/ce, -/obj/item/weapon/book/manual/sd_guide, +/obj/item/stamp/ce, +/obj/item/book/manual/sd_guide, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) "Ue" = ( @@ -13061,7 +13061,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -13091,7 +13091,7 @@ /area/maintenance/stellardelight/deck3/portfore) "UO" = ( /obj/machinery/recharge_station, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -13122,13 +13122,13 @@ /area/crew_quarters/bar) "UT" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/device/megaphone, -/obj/item/weapon/pen/multi, -/obj/item/device/radio/intercom/department/security{ +/obj/item/megaphone, +/obj/item/pen/multi, +/obj/item/radio/intercom/department/security{ dir = 1; pixel_y = 24 }, @@ -13245,7 +13245,7 @@ /obj/random/maintenance, /obj/random/maintenance, /obj/random/maintenance, -/obj/item/device/gps, +/obj/item/gps, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/forestarrooma) "Vk" = ( @@ -13301,12 +13301,12 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/yellow_ce, -/obj/item/weapon/pen/multi, +/obj/item/folder/yellow_ce, +/obj/item/pen/multi, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -13316,7 +13316,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai) "Vt" = ( -/obj/item/device/radio/intercom/locked/ai_private{ +/obj/item/radio/intercom/locked/ai_private{ dir = 4; pixel_x = 32 }, @@ -13356,7 +13356,7 @@ /turf/simulated/floor/airless, /area/stellardelight/deck3/exterior) "VB" = ( -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /obj/structure/bed/double/padded, /obj/structure/curtain/black{ color = "#156363" @@ -13375,26 +13375,26 @@ /area/maintenance/stellardelight/deck3/foreportroomb) "VE" = ( /obj/structure/table/glass, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 1; pixel_y = 24 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 3; pixel_y = 7 }, -/obj/item/weapon/pen/multi, +/obj/item/pen/multi, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/weapon/folder/white_cmo, +/obj/item/folder/white_cmo, /turf/simulated/floor/tiled/eris/white/cargo, /area/crew_quarters/heads/cmo) "VG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -13499,7 +13499,7 @@ dir = 1; pixel_y = -32 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -13569,7 +13569,7 @@ icon_state = "1-2" }, /obj/structure/table/steel, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portfore) "Wt" = ( @@ -13620,7 +13620,7 @@ dir = 4 }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper/sdshield, +/obj/item/paper/sdshield, /turf/simulated/floor, /area/stellardelight/deck2/central) "WA" = ( @@ -13710,7 +13710,7 @@ /area/lawoffice) "WQ" = ( /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 4; name = "night shift APC"; nightshift_setting = 2 @@ -13751,24 +13751,24 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Xa" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 }, /obj/structure/closet/secure_closet/CMO, /obj/item/clothing/accessory/stethoscope, -/obj/item/device/flashlight/pen, -/obj/item/weapon/storage/belt/medical, +/obj/item/flashlight/pen, +/obj/item/storage/belt/medical, /obj/item/clothing/glasses/hud/health, -/obj/item/device/defib_kit/compact/combat/loaded, -/obj/item/weapon/cmo_disk_holder, -/obj/item/weapon/storage/secure/briefcase/ml3m_pack_cmo, -/obj/item/weapon/storage/mrebag/pill/sleevingcure, +/obj/item/defib_kit/compact/combat/loaded, +/obj/item/cmo_disk_holder, +/obj/item/storage/secure/briefcase/ml3m_pack_cmo, +/obj/item/storage/mrebag/pill/sleevingcure, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/item/device/retail_scanner/medical, +/obj/item/retail_scanner/medical, /turf/simulated/floor/tiled/eris/white/cargo, /area/crew_quarters/heads/cmo) "Xb" = ( @@ -13816,7 +13816,7 @@ /obj/structure/table/alien{ name = "fancy table" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1351; name = "station intercom (Science)"; @@ -13825,16 +13825,16 @@ /obj/random/paicard{ pixel_x = 4 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/paper/monitorkey, -/obj/item/device/megaphone, +/obj/item/paper/monitorkey, +/obj/item/megaphone, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/weapon/folder/white_rd, +/obj/item/folder/white_rd, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/heads/hor) "Xo" = ( @@ -14207,18 +14207,18 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/forestarroomb) "YC" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 }, /obj/structure/closet/secure_closet/RD, -/obj/item/device/aicard, +/obj/item/aicard, /obj/item/clothing/glasses/omnihud/rnd, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/item/device/retail_scanner/science, +/obj/item/retail_scanner/science, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/heads/hor) "YD" = ( @@ -14273,12 +14273,12 @@ /area/stellardelight/deck3/aft) "YL" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/blue_hop, -/obj/item/weapon/pen, +/obj/item/folder/blue_hop, +/obj/item/pen, /obj/machinery/light, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) @@ -14525,7 +14525,7 @@ /turf/simulated/open, /area/stellardelight/deck2/starboard) "ZN" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, diff --git a/maps/stellar_delight/stellar_delight_shuttle_defs.dm b/maps/stellar_delight/stellar_delight_shuttle_defs.dm index c5e42b9f7dc..cbdf35b4f69 100644 --- a/maps/stellar_delight/stellar_delight_shuttle_defs.dm +++ b/maps/stellar_delight/stellar_delight_shuttle_defs.dm @@ -229,7 +229,7 @@ name = "Near Deck 3 Starboard Airlock" landmark_tag = "sd-3-120-78" -/obj/item/weapon/paper/dockingcodes/sd +/obj/item/paper/dockingcodes/sd name = "Stellar Delight Docking Codes" codes_from_z = Z_LEVEL_SHIP_LOW diff --git a/maps/stellar_delight/stellar_delight_telecomms.dm b/maps/stellar_delight/stellar_delight_telecomms.dm index f387eeec4ab..c9a73c62085 100644 --- a/maps/stellar_delight/stellar_delight_telecomms.dm +++ b/maps/stellar_delight/stellar_delight_telecomms.dm @@ -81,18 +81,18 @@ num2text(EXP_FREQ) = list(access_explorer) ) -/obj/item/device/multitool/station_buffered +/obj/item/multitool/station_buffered name = "pre-linked multitool (sd hub)" desc = "This multitool has already been linked to the SD 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/sd) -/obj/item/device/bluespaceradio/sd_prelinked +/obj/item/bluespaceradio/sd_prelinked name = "bluespace radio (Stellar Delight)" - handset = /obj/item/device/radio/bluespacehandset/linked/sd_prelinked + handset = /obj/item/radio/bluespacehandset/linked/sd_prelinked -/obj/item/device/radio/bluespacehandset/linked/sd_prelinked +/obj/item/radio/bluespacehandset/linked/sd_prelinked bs_tx_preload_id = "sd_rx" //Transmit to a receiver bs_rx_preload_id = "sd_tx" //Recveive from a transmitter diff --git a/maps/stellar_delight/stellar_delight_things.dm b/maps/stellar_delight/stellar_delight_things.dm index 2cdc2a0382c..d1fcaa21853 100644 --- a/maps/stellar_delight/stellar_delight_things.dm +++ b/maps/stellar_delight/stellar_delight_things.dm @@ -33,11 +33,11 @@ s.start() -/obj/item/weapon/paper/sdshield +/obj/item/paper/sdshield name = "ABOUT THE SHIELD GENERATOR" info = "

ABOUT THE SHIELD GENERATOR



If you're up here you are more than likely worried about hitting rocks or some other such thing. It is good to worry about such things as that is an inevitability.

The Stellar Delight is a rather compact vessel, so a setting of 55 to the range will just barely cover her aft.

It is recommended that you turn off all of the different protection types except multi dimensional warp and whatever it is you're worried about running into. (probably meteors (hyperkinetic)).

With only those two and all the other default settings, the shield uses more than 6 MW to run, which is more than the ship can ordinarily produce. AS SUCH, it is also recommended that you reduce the input cap to whatever you find reasonable (being as it defaults to 1 MW, which is the entirety of the stock power supply) and activate and configure the shield BEFORE you need it.

The shield takes some time to expand its range to the desired specifications, and on top of that, under the default low power setting, takes around 40 seconds to spool up. Once it is active, the fully charged internal capacitors will last for a few minutes before depleting fully. You can increase the passive energy use to decrease the spool up time, but it also uses the stored energy much faster, so, that is not recommended except in dire emergencies.

So, this shield is not intended to be run indefinitely, unless you seriously beef up the ship's engine and power supply.

Fortunately, if you've got a good pilot, you shouldn't really need the shield generator except in rare cases and only for short distances. Still, it is a good idea to configure the shield to be ready before you need it.

Good luck out there - Budly Gregington" -/obj/item/weapon/book/manual/sd_guide +/obj/item/book/manual/sd_guide name = "Stellar Delight User's Guide" icon = 'icons/obj/library.dmi' icon_state ="newscodex" @@ -45,7 +45,7 @@ author = "Central Command" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "Stellar Delight User's Guide" -/obj/item/weapon/book/manual/sd_guide/New() +/obj/item/book/manual/sd_guide/New() ..() dat = {" @@ -108,9 +108,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 @@ -161,11 +161,11 @@ /obj/structure/noticeboard layer = ABOVE_WINDOW_LAYER -/obj/item/device/multitool/scioutpost +/obj/item/multitool/scioutpost name = "science outpost linked multitool" desc = "It has the data for the science outpost's quantum pad pre-loaded... assuming you didn't override it." -/obj/item/device/multitool/scioutpost/Initialize() +/obj/item/multitool/scioutpost/Initialize() . = ..() for(var/obj/machinery/power/quantumpad/scioutpost/outpost in world) connectable = outpost diff --git a/maps/submaps/admin_use_vr/avii_eventMapv2.dmm b/maps/submaps/admin_use_vr/avii_eventMapv2.dmm index 0fddf7b1519..1b0d6685bd0 100644 --- a/maps/submaps/admin_use_vr/avii_eventMapv2.dmm +++ b/maps/submaps/admin_use_vr/avii_eventMapv2.dmm @@ -11,7 +11,7 @@ dir = 4 }, /obj/machinery/light/small, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -723,7 +723,7 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint) "dM" = ( -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet/bcarpet, @@ -923,7 +923,7 @@ /turf/simulated/floor/plating, /area/engineering/engine_smes) "eF" = ( -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet/sblucarpet, @@ -1074,11 +1074,11 @@ /area/engineering/engine_smes) "fI" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = -9; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 6; pixel_y = 3 }, @@ -1118,8 +1118,8 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/circuitboard/tesla_coil, -/obj/item/weapon/circuitboard/tesla_coil, +/obj/item/circuitboard/tesla_coil, +/obj/item/circuitboard/tesla_coil, /turf/simulated/floor, /area/engineering/engine_room) "fR" = ( @@ -1138,16 +1138,16 @@ /obj/structure/closet/crate/engineering{ name = "spare SMES coils" }, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil/super_capacity, -/obj/item/weapon/smes_coil/super_capacity, -/obj/item/weapon/smes_coil/super_capacity, -/obj/item/weapon/smes_coil/super_io, -/obj/item/weapon/smes_coil/super_io, -/obj/item/weapon/smes_coil/super_io, -/obj/item/device/geiger/wall/west{ +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil/super_capacity, +/obj/item/smes_coil/super_capacity, +/obj/item/smes_coil/super_capacity, +/obj/item/smes_coil/super_io, +/obj/item/smes_coil/super_io, +/obj/item/smes_coil/super_io, +/obj/item/geiger/wall/west{ dir = 4; pixel_x = 36 }, @@ -1166,7 +1166,7 @@ "ga" = ( /obj/structure/table/steel, /obj/item/clothing/gloves/yellow, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 5 }, /obj/item/stack/cable_coil{ @@ -1390,10 +1390,10 @@ icon_state = "2-8" }, /obj/structure/table/reinforced, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_monitoring) "gT" = ( @@ -1407,11 +1407,11 @@ /area/medical/medbay2) "gU" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = -9; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 6; pixel_y = 3 }, @@ -1447,12 +1447,12 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals8, /obj/structure/table/standard, -/obj/item/weapon/book/manual/tesla_engine, -/obj/item/weapon/book/manual/engineering_particle_accelerator{ +/obj/item/book/manual/tesla_engine, +/obj/item/book/manual/engineering_particle_accelerator{ pixel_x = 5; pixel_y = 5 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -1584,7 +1584,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; name = "night shift APC"; nightshift_setting = 2 }, @@ -1793,7 +1793,7 @@ /turf/simulated/floor/tiled, /area/bridge) "iG" = ( -/obj/item/device/geiger/wall/west{ +/obj/item/geiger/wall/west{ dir = 4; pixel_x = -36 }, @@ -1902,7 +1902,7 @@ /turf/simulated/floor/tiled, /area/medical/medbay) "jf" = ( -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet/oracarpet, @@ -2207,7 +2207,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "night shift APC"; nightshift_setting = 2 @@ -2377,7 +2377,7 @@ /obj/machinery/r_n_d/circuit_imprinter{ dir = 1 }, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/simulated/floor/tiled/dark, /area/rnd/workshop) "lu" = ( @@ -2440,8 +2440,8 @@ /area/engineering/engine_monitoring) "lO" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue{ +/obj/item/paper_bin, +/obj/item/pen/blue{ pixel_x = -3; pixel_y = 2 }, @@ -2511,8 +2511,8 @@ /area/maintenance/asmaint) "mf" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/structure/sink{ dir = 1 }, @@ -2770,7 +2770,7 @@ "nr" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/cell/hyper{ +/obj/item/cell/hyper{ charge = 30000 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -3028,7 +3028,7 @@ dir = 8 }, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "night shift APC"; nightshift_setting = 2 @@ -3317,7 +3317,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -3511,23 +3511,23 @@ /area/maintenance/asmaint) "qN" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -7; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = 4; pixel_y = 6 }, -/obj/item/device/flashlight/pen{ +/obj/item/flashlight/pen{ pixel_x = -3; pixel_y = -3 }, @@ -3539,7 +3539,7 @@ /area/crew_quarters/locker) "qT" = ( /obj/structure/table/gamblingtable, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/simulated/floor/wood, /area/crew_quarters/bar) "qU" = ( @@ -3637,7 +3637,7 @@ "rm" = ( /obj/structure/cable, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; name = "night shift APC"; nightshift_setting = 2 }, @@ -3802,7 +3802,7 @@ /obj/machinery/computer/telecomms/monitor{ network = "tcommsat" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "General Listening Channel"; pixel_x = 28 }, @@ -3850,7 +3850,7 @@ }, /area/tcommsat/chamber) "sb" = ( -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet/turcarpet, @@ -4209,7 +4209,7 @@ /area/maintenance/fore) "tK" = ( /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "always night shift APC"; nightshift_setting = 3 @@ -4220,7 +4220,7 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint) "tL" = ( -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet/green, @@ -4289,7 +4289,7 @@ dir = 8; layer = 2.6 }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_monitoring) "tU" = ( @@ -4297,7 +4297,7 @@ icon_state = "0-8" }, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; name = "night shift APC"; nightshift_setting = 2 }, @@ -4574,7 +4574,7 @@ /area/engineering/engine_smes) "vl" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1 }, /obj/effect/floor_decal/milspec/color/blue/corner{ @@ -4652,7 +4652,7 @@ /area/maintenance/asmaint) "vH" = ( /obj/structure/table/gamblingtable, -/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, /turf/simulated/floor/wood, /area/crew_quarters/bar) "vI" = ( @@ -4868,7 +4868,7 @@ "wN" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/cell/hyper{ +/obj/item/cell/hyper{ charge = 30000 }, /obj/machinery/camera/network/research, @@ -4944,7 +4944,7 @@ /obj/machinery/camera/network/civilian{ dir = 9 }, -/obj/item/weapon/storage/part_replacer/adv/discount_bluespace, +/obj/item/storage/part_replacer/adv/discount_bluespace, /obj/structure/table/steel, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_monitoring) @@ -4993,8 +4993,8 @@ /obj/structure/closet/secure_closet/medical3{ req_access = null }, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/storage/belt/medical, +/obj/item/soap/nanotrasen, +/obj/item/storage/belt/medical, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/medbay) "xl" = ( @@ -5197,7 +5197,7 @@ /area/engineering/engine_monitoring) "yw" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/book/manual/sd_guide, +/obj/item/book/manual/sd_guide, /obj/effect/floor_decal/milspec/color/blue/half{ dir = 6 }, @@ -5303,7 +5303,7 @@ /area/engineering/engine_smes) "yX" = ( /obj/structure/table/gamblingtable, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /turf/simulated/floor/wood, /area/crew_quarters/bar) "yY" = ( @@ -5388,7 +5388,7 @@ /area/medical/medbay) "zu" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled/eris/white/cargo, /area/medical/medbay) "zy" = ( @@ -5633,7 +5633,7 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "AD" = ( -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet/purple, @@ -5806,7 +5806,7 @@ icon_state = "4-8" }, /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_monitoring) "Br" = ( @@ -6169,7 +6169,7 @@ /obj/random/trash, /obj/structure/cable, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; name = "always night shift APC"; nightshift_setting = 3 }, @@ -6212,7 +6212,7 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint) "Dh" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -28 @@ -6452,8 +6452,8 @@ /area/bridge) "Eq" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, +/obj/item/folder/yellow, /obj/machinery/light/small{ dir = 1 }, @@ -6648,7 +6648,7 @@ pixel_x = -4; pixel_y = 5 }, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/medbay) @@ -6925,7 +6925,7 @@ /area/hallway/primary/fore) "Gy" = ( /obj/machinery/light/small, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/structure/closet/radiation, @@ -7488,38 +7488,38 @@ /obj/structure/closet/crate/engineering{ name = "capacitor storage" }, -/obj/item/weapon/stock_parts/capacitor/adv, -/obj/item/weapon/stock_parts/capacitor/adv, -/obj/item/weapon/stock_parts/capacitor/adv, -/obj/item/weapon/stock_parts/capacitor/adv, -/obj/item/weapon/stock_parts/capacitor/adv, -/obj/item/weapon/stock_parts/capacitor/adv, -/obj/item/weapon/stock_parts/capacitor/adv, -/obj/item/weapon/stock_parts/capacitor/adv, -/obj/item/weapon/stock_parts/capacitor/hyper, -/obj/item/weapon/stock_parts/capacitor/hyper, -/obj/item/weapon/stock_parts/capacitor/hyper, -/obj/item/weapon/stock_parts/capacitor/hyper, -/obj/item/weapon/stock_parts/capacitor/hyper, -/obj/item/weapon/stock_parts/capacitor/hyper, -/obj/item/weapon/stock_parts/capacitor/hyper, -/obj/item/weapon/stock_parts/capacitor/hyper, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/super, -/obj/item/weapon/stock_parts/capacitor/super, -/obj/item/weapon/stock_parts/capacitor/super, -/obj/item/weapon/stock_parts/capacitor/super, -/obj/item/weapon/stock_parts/capacitor/super, -/obj/item/weapon/stock_parts/capacitor/super, -/obj/item/weapon/stock_parts/capacitor/super, -/obj/item/weapon/stock_parts/capacitor/super, +/obj/item/stock_parts/capacitor/adv, +/obj/item/stock_parts/capacitor/adv, +/obj/item/stock_parts/capacitor/adv, +/obj/item/stock_parts/capacitor/adv, +/obj/item/stock_parts/capacitor/adv, +/obj/item/stock_parts/capacitor/adv, +/obj/item/stock_parts/capacitor/adv, +/obj/item/stock_parts/capacitor/adv, +/obj/item/stock_parts/capacitor/hyper, +/obj/item/stock_parts/capacitor/hyper, +/obj/item/stock_parts/capacitor/hyper, +/obj/item/stock_parts/capacitor/hyper, +/obj/item/stock_parts/capacitor/hyper, +/obj/item/stock_parts/capacitor/hyper, +/obj/item/stock_parts/capacitor/hyper, +/obj/item/stock_parts/capacitor/hyper, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/super, +/obj/item/stock_parts/capacitor/super, +/obj/item/stock_parts/capacitor/super, +/obj/item/stock_parts/capacitor/super, +/obj/item/stock_parts/capacitor/super, +/obj/item/stock_parts/capacitor/super, +/obj/item/stock_parts/capacitor/super, +/obj/item/stock_parts/capacitor/super, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_monitoring) "Jc" = ( @@ -7562,7 +7562,7 @@ color = "#361447" }, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/sleep/vistor_room_1) "Jn" = ( @@ -7612,7 +7612,7 @@ /turf/simulated/floor/wood/alt/panel, /area/maintenance/dormitory) "JE" = ( -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet, @@ -7674,7 +7674,7 @@ /turf/simulated/floor, /area/maintenance/central) "JV" = ( -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Whoops, we seem to lost our Tesla... Oh well! Good thing we have backups... Right?"; name = "tesla note" }, @@ -7707,7 +7707,7 @@ /area/medical/medbay) "Kh" = ( /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; name = "always night shift APC"; nightshift_setting = 3 }, @@ -7756,7 +7756,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "night shift APC"; nightshift_setting = 2 @@ -7943,7 +7943,7 @@ anchored = 1 }, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "always night shift APC"; nightshift_setting = 3 @@ -8897,7 +8897,7 @@ dir = 10 }, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; name = "always night shift APC"; nightshift_setting = 3 }, @@ -8962,7 +8962,7 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "PJ" = ( @@ -9000,7 +9000,7 @@ anchored = 1 }, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "always night shift APC"; nightshift_setting = 3 @@ -9288,7 +9288,7 @@ dir = 8 }, /obj/item/clothing/shoes/black, -/obj/item/device/communicator, +/obj/item/communicator, /turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "QY" = ( @@ -9328,7 +9328,7 @@ dir = 1 }, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "always night shift APC"; nightshift_setting = 3 @@ -9545,7 +9545,7 @@ /area/submap/pa_room) "RU" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "RX" = ( @@ -9558,16 +9558,16 @@ /area/tcommsat/chamber) "RY" = ( /obj/structure/table/glass, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = 9 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = 2 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = -5 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = -12 }, /turf/simulated/floor/tiled/eris/white/bluecorner, @@ -9752,7 +9752,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "always night shift APC"; nightshift_setting = 3 @@ -9779,7 +9779,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/device/geiger/wall/west{ +/obj/item/geiger/wall/west{ dir = 4; pixel_x = -36 }, @@ -10049,12 +10049,12 @@ }, /obj/structure/table/standard, /obj/item/stack/cable_coil/random, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/wrench, +/obj/item/tool/screwdriver, /turf/simulated/floor, /area/engineering/engine_room) "Uz" = ( -/obj/item/device/geiger/wall/west{ +/obj/item/geiger/wall/west{ dir = 4; pixel_x = 36 }, @@ -10068,7 +10068,7 @@ /area/engineering/engine_room) "UB" = ( /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/simulated/floor/tiled/steel, /area/rnd/workshop) "UD" = ( @@ -10393,7 +10393,7 @@ /turf/simulated/floor/wood/alt/panel, /area/maintenance/dormitory) "Wq" = ( -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /obj/structure/bed/double/padded, /obj/structure/curtain/black, /turf/simulated/floor/carpet/blue2, @@ -10410,7 +10410,7 @@ anchored = 1 }, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "always night shift APC"; nightshift_setting = 3 @@ -10447,7 +10447,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "night shift APC"; nightshift_setting = 2 @@ -10459,7 +10459,7 @@ color = "#361447" }, /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/sleep/vistor_room_2) "WL" = ( @@ -10470,7 +10470,7 @@ anchored = 1 }, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "always night shift APC"; nightshift_setting = 3 @@ -10517,7 +10517,7 @@ dir = 1 }, /obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "always night shift APC"; nightshift_setting = 3 @@ -10556,7 +10556,7 @@ }, /obj/item/clothing/shoes/black, /obj/machinery/light/small, -/obj/item/device/communicator, +/obj/item/communicator, /turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "Xg" = ( @@ -10618,12 +10618,12 @@ /area/medical/medbay2) "XC" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/cell/high{ +/obj/item/storage/box/lights/mixed, +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "The big blue box recently installed in here is a 'grid checker' which will shut off the power if a dangerous power spike from the engine erupts into the powernet. Shutting everything down protects everything from electrical damage, however the outages can be disruptive to colony operations, so it is designed to restore power after a somewhat significant delay, up to ten minutes or so. The grid checker can be manually hacked in order to end the outage sooner. To do that, you must cut three specific wires which do not cause a red light to shine, then pulse a fourth wire. Electrical protection is highly recommended when doing maintenance on the grid checker."; name = "grid checker info" }, @@ -10771,7 +10771,7 @@ /area/maintenance/aft) "Yl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /obj/random/soap, /turf/simulated/floor/tiled/white, /area/crew_quarters/recreation_area_restroom{ @@ -11133,7 +11133,7 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_room) "ZU" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/lino, /area/crew_quarters/bar) "ZW" = ( diff --git a/maps/submaps/admin_use_vr/dhael_centcom.dmm b/maps/submaps/admin_use_vr/dhael_centcom.dmm index 45557e6f33b..24d117657e5 100644 --- a/maps/submaps/admin_use_vr/dhael_centcom.dmm +++ b/maps/submaps/admin_use_vr/dhael_centcom.dmm @@ -16,8 +16,8 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ icon_state = "dark" @@ -32,8 +32,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -43,7 +43,7 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/netgun, +/obj/item/gun/energy/netgun, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ icon_state = "dark" @@ -54,9 +54,9 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/window/reinforced{ dir = 4 @@ -74,10 +74,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -88,10 +88,10 @@ }, /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -113,8 +113,8 @@ /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -133,8 +133,8 @@ /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -145,27 +145,27 @@ }, /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, /turf/unsimulated/floor{ icon_state = "dark" }, /area/centcom/specops) "ay" = ( /obj/structure/table/rack, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/window/reinforced{ dir = 1 @@ -183,19 +183,19 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, /turf/unsimulated/floor{ icon_state = "dark" }, /area/centcom/specops) "aA" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/emps{ +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/emps{ pixel_x = 4; pixel_y = 4 }, @@ -205,8 +205,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/storage/box/smokes, -/obj/item/weapon/storage/box/smokes, +/obj/item/storage/box/smokes, +/obj/item/storage/box/smokes, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ icon_state = "dark" @@ -220,13 +220,13 @@ "aH" = ( /obj/structure/closet/crate/medical, /obj/item/stack/nanopaste/advanced, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/surgical, /obj/item/clothing/mask/surgical, /obj/item/stack/nanopaste/advanced, /obj/item/stack/nanopaste/advanced, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -234,12 +234,12 @@ /area/centcom/specops) "aI" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -247,12 +247,12 @@ /area/centcom/specops) "aJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -260,9 +260,9 @@ /area/centcom/specops) "aK" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/pill_bottle/iron, -/obj/item/weapon/storage/pill_bottle/iron, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, +/obj/item/storage/pill_bottle/iron, +/obj/item/storage/pill_bottle/iron, +/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -270,8 +270,8 @@ /area/centcom/specops) "aL" = ( /obj/structure/table/rack, -/obj/item/device/defib_kit/compact/combat/loaded, -/obj/item/device/defib_kit/compact/combat/loaded, +/obj/item/defib_kit/compact/combat/loaded, +/obj/item/defib_kit/compact/combat/loaded, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -279,7 +279,7 @@ /area/centcom/specops) "aM" = ( /obj/machinery/chemical_dispenser/ert, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /obj/structure/table/reinforced, /turf/unsimulated/floor{ icon_state = "vault"; @@ -295,11 +295,11 @@ /area/centcom/specops) "aO" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -307,10 +307,10 @@ /area/centcom/specops) "aP" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/compact, -/obj/item/weapon/gun/energy/gun/compact, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/gun/energy/gun/compact, +/obj/item/gun/energy/gun/compact, +/obj/item/flash, +/obj/item/flash, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -343,9 +343,9 @@ /area/centcom/specops) "aY" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, +/obj/item/rig/ert/medical, +/obj/item/rig/ert/medical, +/obj/item/rig/ert/medical, /obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/accessory/storage/white_vest, @@ -372,8 +372,8 @@ "ba" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -393,8 +393,8 @@ "bc" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/projectile/revolver/detective45, -/obj/item/weapon/gun/projectile/revolver/detective45, +/obj/item/gun/projectile/revolver/detective45, +/obj/item/gun/projectile/revolver/detective45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, @@ -406,7 +406,7 @@ "bd" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/projectile/automatic/advanced_smg, +/obj/item/gun/projectile/automatic/advanced_smg, /obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mmAdvanced, @@ -418,7 +418,7 @@ "be" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -429,10 +429,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/weapon/gun/projectile/p92x, +/obj/item/gun/projectile/p92x, +/obj/item/gun/projectile/p92x, +/obj/item/gun/projectile/p92x, +/obj/item/gun/projectile/p92x, /obj/item/ammo_magazine/m9mm/large/preban, /obj/item/ammo_magazine/m9mm/large/preban, /obj/item/ammo_magazine/m9mm/large/preban, @@ -453,12 +453,12 @@ /obj/item/taperoll/police, /obj/item/taperoll/police, /obj/item/taperoll/police, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -472,11 +472,11 @@ /area/centcom/specops) "bl" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -503,10 +503,10 @@ /area/centcom/specops) "bn" = ( /obj/structure/table/reinforced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, +/obj/item/healthanalyzer/advanced, +/obj/item/healthanalyzer/advanced, +/obj/item/healthanalyzer/advanced, +/obj/item/healthanalyzer/advanced, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -514,11 +514,11 @@ /area/centcom/specops) "bo" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -526,11 +526,11 @@ /area/centcom/specops) "bp" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -546,10 +546,10 @@ /obj/item/clothing/head/helmet/ert/medical, /obj/item/clothing/head/helmet/ert/medical, /obj/item/clothing/head/helmet/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -569,67 +569,67 @@ /area/centcom/specops) "bs" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/unsimulated/floor{ icon_state = "dark" }, /area/centcom/specops) "bt" = ( /obj/structure/table/reinforced, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, /turf/unsimulated/floor{ icon_state = "dark" }, /area/centcom/specops) "bu" = ( /obj/structure/table/reinforced, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /turf/unsimulated/floor{ icon_state = "dark" }, /area/centcom/specops) "bv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -658,11 +658,11 @@ /area/centcom/specops) "bz" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, /obj/item/clothing/glasses/thermal, /obj/item/clothing/glasses/thermal, /obj/item/clothing/glasses/thermal, @@ -695,11 +695,11 @@ /area/centcom/specops) "bC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -707,12 +707,12 @@ /area/centcom/specops) "bD" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -720,11 +720,11 @@ /area/centcom/specops) "bE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -732,11 +732,11 @@ /area/centcom/specops) "bF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -752,22 +752,22 @@ /obj/item/clothing/head/helmet/ert/security, /obj/item/clothing/head/helmet/ert/security, /obj/item/clothing/head/helmet/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, /turf/unsimulated/floor{ icon_state = "dark" }, /area/centcom/specops) "bI" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -849,9 +849,9 @@ /area/centcom/specops) "bU" = ( /obj/structure/table/reinforced, -/obj/item/device/megaphone, -/obj/item/weapon/storage/box/trackimp, -/obj/item/weapon/storage/box/cdeathalarm_kit, +/obj/item/megaphone, +/obj/item/storage/box/trackimp, +/obj/item/storage/box/cdeathalarm_kit, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -861,7 +861,7 @@ /obj/structure/table/rack, /obj/item/clothing/suit/armor/vest/ert/command, /obj/item/clothing/head/helmet/ert/command, -/obj/item/weapon/storage/backpack/ert/commander, +/obj/item/storage/backpack/ert/commander, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -869,7 +869,7 @@ /area/centcom/specops) "bW" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid, +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -895,7 +895,7 @@ }, /area/centcom/specops) "bZ" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -907,9 +907,9 @@ /area/centcom/specops) "cb" = ( /obj/structure/table/reinforced, -/obj/item/device/aicard, -/obj/item/weapon/pinpointer/advpinpointer, -/obj/item/weapon/stamp/centcomm, +/obj/item/aicard, +/obj/item/pinpointer/advpinpointer, +/obj/item/stamp/centcomm, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -931,7 +931,7 @@ /obj/item/clothing/accessory/holster/hip, /obj/item/ammo_magazine/m44, /obj/item/ammo_magazine/m44, -/obj/item/weapon/gun/projectile/deagle, +/obj/item/gun/projectile/deagle, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -949,9 +949,9 @@ /area/centcom/specops) "cf" = ( /obj/structure/table/reinforced, -/obj/item/device/pda/ert, -/obj/item/device/perfect_tele, -/obj/item/weapon/hand_tele, +/obj/item/pda/ert, +/obj/item/perfect_tele, +/obj/item/hand_tele, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -975,12 +975,12 @@ /area/centcom/specops) "ci" = ( /obj/structure/table/reinforced, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, /obj/effect/floor_decal/corner/blue{ dir = 5 }, @@ -990,12 +990,12 @@ /area/centcom/specops) "cj" = ( /obj/structure/table/reinforced, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, /obj/effect/floor_decal/corner/blue{ dir = 5 }, @@ -1035,14 +1035,14 @@ /area/centcom/specops) "cm" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/handcuffs, -/obj/item/device/flash, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/storage/box/flashbangs, +/obj/item/handcuffs, +/obj/item/flash, +/obj/item/melee/baton/loaded, +/obj/item/storage/belt/security/tactical, +/obj/item/gun/energy/stunrevolver, /obj/item/clothing/glasses/sunglasses/sechud/tactical, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -1050,7 +1050,7 @@ /area/centcom/specops) "cn" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert, +/obj/item/rig/ert, /obj/item/clothing/accessory/storage/black_vest, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; @@ -1059,7 +1059,7 @@ /area/centcom/specops) "co" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -1091,33 +1091,33 @@ /area/centcom/specops) "cr" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /turf/unsimulated/floor{ icon_state = "dark" }, /area/centcom/specops) "cs" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stamp/centcomm, -/obj/item/weapon/pen, -/obj/item/weapon/paper_bin{ +/obj/item/stamp/centcomm, +/obj/item/pen, +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -1145,7 +1145,7 @@ /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; @@ -1222,19 +1222,19 @@ /obj/item/stack/material/glass/reinforced{ amount = 50 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, @@ -1285,7 +1285,7 @@ /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/effect/floor_decal/industrial/outline/blue, -/obj/item/weapon/storage/box/traumainjectors, +/obj/item/storage/box/traumainjectors, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1315,17 +1315,17 @@ }, /area/centcom/specops) "cH" = ( -/obj/item/weapon/circuitboard/aiupload, -/obj/item/weapon/circuitboard/borgupload, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/aiModule/nanotrasen, -/obj/item/weapon/aiModule/reset, -/obj/item/weapon/aiModule/freeformcore, -/obj/item/weapon/aiModule/protectStation, -/obj/item/weapon/aiModule/quarantine, -/obj/item/weapon/aiModule/paladin, -/obj/item/weapon/aiModule/robocop, -/obj/item/weapon/aiModule/safeguard, +/obj/item/circuitboard/aiupload, +/obj/item/circuitboard/borgupload, +/obj/item/circuitboard/smes, +/obj/item/aiModule/nanotrasen, +/obj/item/aiModule/reset, +/obj/item/aiModule/freeformcore, +/obj/item/aiModule/protectStation, +/obj/item/aiModule/quarantine, +/obj/item/aiModule/paladin, +/obj/item/aiModule/robocop, +/obj/item/aiModule/safeguard, /obj/structure/table/steel_reinforced, /turf/unsimulated/floor{ icon_state = "dark" @@ -1339,12 +1339,12 @@ /obj/item/clothing/glasses/welding/superior, /obj/structure/table/steel_reinforced, /obj/item/clothing/glasses/welding/superior, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1352,18 +1352,18 @@ "cM" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/industrial/outline/blue, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1409,12 +1409,12 @@ /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1472,12 +1472,12 @@ /area/centcom/specops) "cZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/tool/screwdriver, +/obj/item/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/tool/screwdriver, +/obj/item/tool/wrench, /obj/effect/floor_decal/industrial/outline/blue, /turf/unsimulated/floor{ icon_state = "dark" @@ -1522,12 +1522,12 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, /obj/effect/floor_decal/industrial/outline/blue, /turf/unsimulated/floor{ icon_state = "dark" @@ -1560,14 +1560,14 @@ /area/centcom/specops) "dh" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, /obj/effect/floor_decal/industrial/outline/blue, /turf/unsimulated/floor{ icon_state = "dark" @@ -1643,10 +1643,10 @@ /obj/item/clothing/head/helmet/ert/engineer, /obj/item/clothing/head/helmet/ert/engineer, /obj/item/clothing/head/helmet/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1665,7 +1665,7 @@ }, /area/centcom/control) "dv" = ( -/obj/item/weapon/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -1682,7 +1682,7 @@ /area/centcom/control) "dy" = ( /obj/structure/bed/chair, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -1699,7 +1699,7 @@ /turf/unsimulated/floor/steel, /area/centcom/control) "dA" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/corner/blue/diagonal{ dir = 4 @@ -1707,7 +1707,7 @@ /turf/unsimulated/floor/steel, /area/centcom/control) "dB" = ( -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 2; pixel_y = 6 }, @@ -1719,7 +1719,7 @@ /turf/unsimulated/floor/steel, /area/centcom/control) "dC" = ( -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, /obj/structure/table/standard, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/corner/blue/diagonal{ @@ -1728,7 +1728,7 @@ /turf/unsimulated/floor/steel, /area/centcom/control) "dD" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/corner/blue/diagonal{ dir = 4 @@ -1738,32 +1738,32 @@ /area/centcom/control) "dE" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, @@ -1816,7 +1816,7 @@ /area/centcom/control) "dJ" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/clothing/gloves/sterile/latex, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -1874,10 +1874,10 @@ /area/centcom/control) "dN" = ( /obj/structure/table/standard, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/pen, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/hand_labeler, +/obj/item/pen, +/obj/item/packageWrap, +/obj/item/packageWrap, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -1887,12 +1887,12 @@ /turf/simulated/floor/tiled/white, /area/centcom/control) "dO" = ( -/obj/item/weapon/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, /obj/structure/table/standard, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, /obj/machinery/recharger{ pixel_y = 0 }, @@ -1929,7 +1929,7 @@ icon_state = "warning"; dir = 4 }, -/obj/item/weapon/book/manual/robotics_cyborgs{ +/obj/item/book/manual/robotics_cyborgs{ pixel_x = 2; pixel_y = 5 }, @@ -2038,12 +2038,12 @@ /area/centcom/control) "eb" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -2085,8 +2085,8 @@ /area/centcom/control) "eg" = ( /obj/structure/table/standard, -/obj/item/device/mmi/digital/posibrain, -/obj/item/device/robotanalyzer, +/obj/item/mmi/digital/posibrain, +/obj/item/robotanalyzer, /turf/unsimulated/floor/steel, /area/centcom/control) "eh" = ( @@ -2140,11 +2140,11 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/scanning_module{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, /obj/machinery/light{ dir = 4; icon_state = "tube1"; @@ -2198,7 +2198,7 @@ /area/tdome/tdomeadmin) "ev" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /obj/effect/floor_decal/carpet{ dir = 1 }, @@ -2269,7 +2269,7 @@ /area/centcom/control) "eB" = ( /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/unsimulated/floor/steel, /area/centcom/control) "eC" = ( @@ -2285,11 +2285,11 @@ /area/centcom/control) "eD" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/blue, +/obj/item/pen/blue, /turf/unsimulated/floor/steel, /area/centcom/control) "eE" = ( @@ -2304,19 +2304,19 @@ /area/tdome/tdomeobserve) "eG" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/flame/lighter/zippo, +/obj/item/storage/fancy/cigarettes, /turf/unsimulated/floor{ icon_state = "lino" }, /area/tdome/tdomeobserve) "eH" = ( -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, /obj/structure/table/standard, /turf/unsimulated/floor{ icon_state = "lino" @@ -2410,14 +2410,14 @@ }, /area/centcom/control) "eT" = ( -/obj/item/weapon/melee/baton/cattleprod, +/obj/item/melee/baton/cattleprod, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" }, /area/centcom/control) "eU" = ( -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -6 }, /obj/structure/table/standard, @@ -2461,13 +2461,13 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/tool/crowbar, +/obj/item/storage/belt/utility, +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 6 }, @@ -2570,19 +2570,19 @@ /turf/unsimulated/floor/steel, /area/centcom/control) "fk" = ( -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/structure/table/standard, -/obj/item/weapon/disk/tech_disk{ +/obj/item/disk/tech_disk{ pixel_x = 0; pixel_y = 0 }, -/obj/item/weapon/disk/tech_disk{ +/obj/item/disk/tech_disk{ pixel_x = 0; pixel_y = 0 }, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/reagent_containers/dropper{ +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, +/obj/item/reagent_containers/dropper{ pixel_y = -4 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -2597,11 +2597,11 @@ /area/centcom/control) "fl" = ( /obj/structure/table/standard, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -2619,7 +2619,7 @@ pixel_x = 0; pixel_y = -30 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -2669,9 +2669,9 @@ /area/centcom/control) "fr" = ( /obj/structure/table/standard, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/hand_labeler, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/unsimulated/floor/steel, /area/centcom/control) "fs" = ( @@ -2686,19 +2686,19 @@ /turf/unsimulated/floor/steel, /area/centcom/control) "ft" = ( -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -2727,7 +2727,7 @@ }, /area/tdome/tdomeobserve) "fx" = ( -/obj/item/device/camera, +/obj/item/camera, /turf/unsimulated/floor{ icon_state = "lino" }, @@ -2772,66 +2772,66 @@ /obj/machinery/recharger{ pixel_y = 0 }, -/obj/item/device/flash, +/obj/item/flash, /turf/unsimulated/floor/steel, /area/centcom/control) "fD" = ( /obj/structure/closet{ name = "robotics parts" }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /turf/unsimulated/floor/steel, @@ -2866,7 +2866,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 27 @@ -2947,7 +2947,7 @@ /obj/structure/table/rack, /obj/item/clothing/under/color/red, /obj/item/clothing/shoes/brown, -/obj/item/weapon/melee/energy/axe, +/obj/item/melee/energy/axe, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -2964,7 +2964,7 @@ /obj/structure/table/rack, /obj/item/clothing/under/color/green, /obj/item/clothing/shoes/brown, -/obj/item/weapon/melee/energy/axe, +/obj/item/melee/energy/axe, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -3100,7 +3100,7 @@ /area/centcom/control) "ge" = ( /obj/structure/closet/wardrobe/robotics_black, -/obj/item/device/radio/headset/headset_sci{ +/obj/item/radio/headset/headset_sci{ pixel_x = -3 }, /turf/unsimulated/floor/steel, @@ -3124,8 +3124,8 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/tdome/red, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/energy/sword/red, +/obj/item/melee/baton/loaded, +/obj/item/melee/energy/sword/red, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -3175,8 +3175,8 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/tdome/green, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/energy/sword/green, +/obj/item/melee/baton/loaded, +/obj/item/melee/energy/sword/green, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -3221,7 +3221,7 @@ /area/centcom/control) "gv" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = -1; pixel_y = -2 }, @@ -3310,7 +3310,7 @@ /turf/unsimulated/floor/steel, /area/centcom/control) "gL" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 1; dir = 1; frequency = 1443; @@ -3407,7 +3407,7 @@ /area/centcom/control) "gW" = ( /obj/structure/table/standard, -/obj/item/device/mmi, +/obj/item/mmi, /turf/unsimulated/floor/steel, /area/centcom/control) "ha" = ( @@ -3495,16 +3495,16 @@ dir = 4 }, /obj/structure/table/marble, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/book/manual/chef_recipes, +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3; pixel_y = 0 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/material/knife/butch, +/obj/item/material/kitchen/rollingpin, +/obj/item/material/knife/butch, /turf/simulated/floor/tiled/white, /area/centcom/control) "hm" = ( @@ -3527,12 +3527,12 @@ /area/centcom/security) "hp" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw, -/obj/item/weapon/surgical/scalpel{ +/obj/item/surgical/circular_saw, +/obj/item/surgical/scalpel{ pixel_y = 12 }, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/hemostat, +/obj/item/surgical/retractor, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -3688,14 +3688,14 @@ pixel_x = -32; req_access = list(29) }, -/obj/item/weapon/tank/anesthetic, -/obj/item/weapon/tank/anesthetic, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, +/obj/item/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/breath/medical, -/obj/item/weapon/storage/box/gloves, -/obj/item/device/defib_kit/jumper_kit, +/obj/item/storage/box/gloves, +/obj/item/defib_kit/jumper_kit, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -3729,8 +3729,8 @@ dir = 8 }, /obj/machinery/computer/transhuman/resleeving, -/obj/item/weapon/book/manual/resleeving, -/obj/item/weapon/storage/box/backup_kit, +/obj/item/book/manual/resleeving, +/obj/item/storage/box/backup_kit, /turf/unsimulated/floor/steel, /area/centcom/control) "hM" = ( @@ -3762,12 +3762,12 @@ /area/centcom/control) "hR" = ( /obj/structure/table/reinforced, -/obj/item/device/pda/captain, +/obj/item/pda/captain, /turf/unsimulated/floor/steel, /area/centcom/control) "hS" = ( /obj/structure/table/reinforced, -/obj/item/weapon/card/id/gold/captain/spare, +/obj/item/card/id/gold/captain/spare, /turf/unsimulated/floor/steel, /area/centcom/control) "hT" = ( @@ -3841,7 +3841,7 @@ "ie" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/projectile/automatic/l6_saw, +/obj/item/gun/projectile/automatic/l6_saw, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -3951,15 +3951,15 @@ /area/centcom/security) "im" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/empshells/large, -/obj/item/weapon/storage/box/empshells/large, -/obj/item/weapon/storage/box/empshells/large, -/obj/item/weapon/storage/box/empshells/large, -/obj/item/weapon/storage/box/empshells/large, -/obj/item/weapon/storage/box/empshells/large, -/obj/item/weapon/storage/box/empshells/large, -/obj/item/weapon/storage/box/empshells/large, -/obj/item/weapon/storage/box/empshells/large, +/obj/item/storage/box/empshells/large, +/obj/item/storage/box/empshells/large, +/obj/item/storage/box/empshells/large, +/obj/item/storage/box/empshells/large, +/obj/item/storage/box/empshells/large, +/obj/item/storage/box/empshells/large, +/obj/item/storage/box/empshells/large, +/obj/item/storage/box/empshells/large, +/obj/item/storage/box/empshells/large, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/crescent, /turf/unsimulated/floor{ @@ -4001,17 +4001,17 @@ /area/centcom/security) "ip" = ( /obj/structure/table/rack, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4019,11 +4019,11 @@ /area/centcom/security) "iq" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/crescent, /turf/unsimulated/floor{ @@ -4033,11 +4033,11 @@ /area/centcom/security) "ir" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ icon_state = "vault"; @@ -4047,8 +4047,8 @@ "is" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/gun/energy/gun/burst, +/obj/item/gun/energy/gun/burst, +/obj/item/gun/energy/gun/burst, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4057,8 +4057,8 @@ "it" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/lasercannon, -/obj/item/weapon/gun/energy/lasercannon, +/obj/item/gun/energy/lasercannon, +/obj/item/gun/energy/lasercannon, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4067,8 +4067,8 @@ "iu" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/sniperrifle, -/obj/item/weapon/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4077,7 +4077,7 @@ "iv" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/xray, +/obj/item/gun/energy/xray, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4086,8 +4086,8 @@ "iw" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4149,10 +4149,10 @@ "iD" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4183,7 +4183,7 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet/swat, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4195,7 +4195,7 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet/swat, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4244,7 +4244,7 @@ "iZ" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/projectile/heavysniper, +/obj/item/gun/projectile/heavysniper, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4326,8 +4326,8 @@ "je" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/gun/energy/netgun, +/obj/item/gun/energy/netgun, +/obj/item/gun/energy/netgun, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4335,7 +4335,7 @@ /area/centcom/security) "jf" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/frags, +/obj/item/storage/box/frags, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ icon_state = "vault"; @@ -4360,13 +4360,13 @@ "jh" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4375,15 +4375,15 @@ "ji" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, @@ -4411,9 +4411,9 @@ /area/centcom/evac) "js" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/clotting, -/obj/item/weapon/storage/firstaid/bonemed, -/obj/item/weapon/storage/pill_bottle/sleevingcure/full, +/obj/item/storage/firstaid/clotting, +/obj/item/storage/firstaid/bonemed, +/obj/item/storage/pill_bottle/sleevingcure/full, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4459,8 +4459,8 @@ "jB" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/weapon/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4482,7 +4482,7 @@ "jD" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4496,14 +4496,14 @@ /obj/item/clothing/shoes/boots/tactical, /obj/item/clothing/suit/armor/tactical, /obj/item/clothing/under/tactical, -/obj/item/weapon/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, /obj/structure/closet{ desc = "It's a storage unit for standard-issue attire."; name = "tactical equipment" }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/satchel/sec, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/satchel/sec, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4517,14 +4517,14 @@ /obj/item/clothing/shoes/boots/tactical, /obj/item/clothing/suit/armor/tactical, /obj/item/clothing/under/tactical, -/obj/item/weapon/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, /obj/structure/closet{ desc = "It's a storage unit for standard-issue attire."; name = "tactical equipment" }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, -/obj/item/weapon/storage/backpack/satchel/sec, +/obj/item/storage/backpack/dufflebag/syndie/med, +/obj/item/storage/backpack/satchel/sec, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4533,9 +4533,9 @@ "jG" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -4606,7 +4606,7 @@ }, /area/centcom/medical) "jP" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -4631,7 +4631,7 @@ /area/centcom/medical) "jR" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -4644,7 +4644,7 @@ /area/centcom/medical) "jS" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, @@ -4669,11 +4669,11 @@ }, /area/centcom/medical) "jU" = ( -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /obj/structure/table/glass, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -4723,12 +4723,12 @@ }, /area/centcom/medical) "jY" = ( -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/storage/box/beakers, +/obj/item/reagent_containers/dropper, /obj/structure/table/glass, /obj/structure/reagent_dispensers/virusfood{ pixel_x = 0; @@ -4781,11 +4781,11 @@ /area/centcom/security) "kc" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ icon_state = "vault"; @@ -4794,11 +4794,11 @@ /area/centcom/security) "kd" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ icon_state = "vault"; @@ -4807,11 +4807,11 @@ /area/centcom/security) "ke" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/crescent, /turf/unsimulated/floor{ @@ -4821,11 +4821,11 @@ /area/centcom/security) "kf" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ icon_state = "vault"; @@ -4894,8 +4894,8 @@ dir = 1 }, /obj/structure/table/woodentable, -/obj/item/device/radio/off, -/obj/item/device/megaphone, +/obj/item/radio/off, +/obj/item/megaphone, /obj/machinery/camera/network/crescent, /turf/unsimulated/floor{ icon_state = "vault"; @@ -4910,7 +4910,7 @@ dir = 1 }, /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -5000,17 +5000,17 @@ /area/centcom/security) "kt" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/seccarts{ +/obj/item/storage/box/seccarts{ pixel_x = 3; pixel_y = 2 }, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -5137,11 +5137,11 @@ /area/centcom/security) "kH" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ icon_state = "vault"; @@ -5150,11 +5150,11 @@ /area/centcom/security) "kI" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/shotgun/pump, -/obj/item/weapon/gun/projectile/shotgun/pump, -/obj/item/weapon/gun/projectile/shotgun/pump, -/obj/item/weapon/gun/projectile/shotgun/pump, -/obj/item/weapon/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ icon_state = "vault"; @@ -5264,7 +5264,7 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, @@ -5412,7 +5412,7 @@ /turf/unsimulated/floor/steel, /area/centcom/security) "lo" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -5509,9 +5509,9 @@ /obj/structure/table/rack{ dir = 4 }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, @@ -5529,11 +5529,11 @@ /area/centcom/security) "lw" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/battlerifle, -/obj/item/weapon/gun/projectile/automatic/battlerifle, -/obj/item/weapon/gun/projectile/automatic/battlerifle, -/obj/item/weapon/gun/projectile/automatic/battlerifle, -/obj/item/weapon/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ icon_state = "vault"; @@ -5543,41 +5543,41 @@ "lx" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, @@ -5606,7 +5606,7 @@ /area/centcom/command) "lz" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ dir = 2; pixel_x = 10; pixel_y = 12 @@ -5621,7 +5621,7 @@ /area/centcom/command) "lA" = ( /obj/structure/table/woodentable, -/obj/item/weapon/stamp/hos, +/obj/item/stamp/hos, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -5699,7 +5699,7 @@ /area/centcom/medical) "lK" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/green/border, /turf/unsimulated/floor/steel{ @@ -5708,7 +5708,7 @@ /area/centcom/medical) "lL" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite{ dir = 6 }, @@ -5818,11 +5818,11 @@ /area/centcom/control) "mb" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/unsimulated/floor/steel, /area/centcom/control) "mc" = ( @@ -5847,11 +5847,11 @@ /area/centcom/security) "md" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ icon_state = "vault"; @@ -5861,8 +5861,8 @@ "me" = ( /obj/structure/table/standard, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/box/teargas, -/obj/item/weapon/storage/box/teargas, +/obj/item/storage/box/teargas, +/obj/item/storage/box/teargas, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -5927,12 +5927,12 @@ dir = 4 }, /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/red_hos, -/obj/item/weapon/pen/multi, +/obj/item/folder/red_hos, +/obj/item/pen/multi, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -5979,8 +5979,8 @@ /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/melee/baton/loaded, +/obj/item/shield/riot, +/obj/item/melee/baton/loaded, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ icon_state = "vault"; @@ -5989,17 +5989,17 @@ /area/centcom/security) "mq" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/empslite{ +/obj/item/storage/box/empslite{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/box/empslite, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/empslite, +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, @@ -6061,11 +6061,11 @@ dir = 6 }, /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{ +/obj/item/reagent_containers/food/drinks/flask/barflask{ pixel_x = -4; pixel_y = 8 }, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_y = 0 }, /turf/unsimulated/floor{ @@ -6111,19 +6111,19 @@ /area/centcom/medical) "mz" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 0; pixel_y = 0 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -6182,8 +6182,8 @@ /area/centcom/medical) "mD" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, @@ -6248,8 +6248,8 @@ /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/melee/baton/loaded, +/obj/item/shield/riot, +/obj/item/melee/baton/loaded, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ icon_state = "vault"; @@ -6258,15 +6258,15 @@ /area/centcom/security) "mJ" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 8; pixel_y = 6 }, -/obj/item/weapon/storage/box/chemimp{ +/obj/item/storage/box/chemimp{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/storage/box/trackimp, +/obj/item/storage/box/trackimp, /obj/effect/floor_decal/industrial/outline/grey, /turf/unsimulated/floor{ icon_state = "vault"; @@ -6407,7 +6407,7 @@ }, /area/centcom/medical) "nb" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -6592,9 +6592,9 @@ /area/centcom/medical) "nv" = ( /obj/structure/table/steel, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/cautery, +/obj/item/autopsy_scanner, +/obj/item/surgical/scalpel, +/obj/item/surgical/cautery, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 @@ -6617,16 +6617,16 @@ /area/centcom/medical) "nx" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = -6 }, -/obj/item/device/camera{ +/obj/item/camera{ name = "Autopsy Camera"; pixel_x = -2; pixel_y = 7 }, -/obj/item/weapon/pen/red, -/obj/item/weapon/pen/blue{ +/obj/item/pen/red, +/obj/item/pen/blue{ pixel_x = 3; pixel_y = -5 }, @@ -6784,8 +6784,8 @@ /area/centcom/security) "nP" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/surgical/cautery, +/obj/item/surgical/hemostat, +/obj/item/surgical/cautery, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -6799,7 +6799,7 @@ "nQ" = ( /obj/structure/table/standard, /obj/item/stack/medical/advanced/bruise_pack, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/retractor, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -6812,10 +6812,10 @@ /area/centcom/medical) "nR" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw{ +/obj/item/surgical/circular_saw{ pixel_y = 8 }, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/scalpel, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -6829,15 +6829,15 @@ /area/centcom/medical) "nS" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/surgical/surgicaldrill, +/obj/item/autopsy_scanner, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/surgical/FixOVein, +/obj/item/surgical/FixOVein, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -6883,7 +6883,7 @@ dir = 1 }, /obj/machinery/camera/network/crescent, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -7029,11 +7029,11 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/unsimulated/floor/steel, /area/centcom/command) "oi" = ( @@ -7079,11 +7079,11 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/camera/network/crescent, /turf/unsimulated/floor/steel, /area/centcom/command) @@ -7234,7 +7234,7 @@ "oD" = ( /obj/structure/table/standard, /obj/machinery/chemical_dispenser/bar_soft/full, -/obj/item/weapon/storage/box/glasses/square, +/obj/item/storage/box/glasses/square, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -7246,7 +7246,7 @@ "oE" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/book/codex, +/obj/item/book/codex, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 26 @@ -7262,13 +7262,13 @@ "oF" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/device/radio/intercom{ +/obj/item/reagent_containers/spray/cleaner, +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 27 }, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -7318,14 +7318,14 @@ /area/centcom/security) "oK" = ( /obj/structure/table/standard, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_y = 0 }, -/obj/item/device/megaphone, -/obj/item/weapon/packageWrap, -/obj/item/weapon/storage/box, -/obj/item/weapon/hand_labeler, -/obj/item/device/universal_translator, +/obj/item/megaphone, +/obj/item/packageWrap, +/obj/item/storage/box, +/obj/item/hand_labeler, +/obj/item/universal_translator, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -7356,24 +7356,24 @@ /obj/structure/reagent_dispensers/peppertank{ pixel_x = 30 }, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 26 @@ -7391,8 +7391,8 @@ /area/centcom/security) "oO" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel, +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -7572,11 +7572,11 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OPlus{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OMinus{ +/obj/item/reagent_containers/blood/OMinus{ pixel_x = -5; pixel_y = -1 }, @@ -7655,7 +7655,7 @@ /area/centcom/medical) "pp" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -7743,7 +7743,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/red_hos, +/obj/item/folder/red_hos, /turf/unsimulated/floor{ icon_state = "carpet"; dir = 2 @@ -7753,7 +7753,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 4 }, @@ -7766,7 +7766,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/unsimulated/floor{ icon_state = "carpet"; dir = 2 @@ -7800,7 +7800,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/blue_captain, +/obj/item/folder/blue_captain, /turf/unsimulated/floor{ icon_state = "carpet"; dir = 2 @@ -7810,7 +7810,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/blue_hop, +/obj/item/folder/blue_hop, /turf/unsimulated/floor{ icon_state = "carpet"; dir = 2 @@ -7820,7 +7820,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/device/megaphone, +/obj/item/megaphone, /turf/unsimulated/floor{ icon_state = "carpet"; dir = 2 @@ -7992,11 +7992,11 @@ icon_state = "borderfloor"; pixel_y = -16 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/unsimulated/floor/steel, /area/centcom/command) "qb" = ( @@ -8019,7 +8019,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/white_cmo, +/obj/item/folder/white_cmo, /turf/unsimulated/floor{ icon_state = "carpet"; dir = 2 @@ -8029,7 +8029,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -2; pixel_y = 2 }, @@ -8042,7 +8042,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/white_rd, +/obj/item/folder/white_rd, /turf/unsimulated/floor{ icon_state = "carpet"; dir = 2 @@ -8052,7 +8052,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = 3; pixel_y = 5 }, @@ -8065,7 +8065,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, /turf/unsimulated/floor{ @@ -8077,7 +8077,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/yellow_ce, +/obj/item/folder/yellow_ce, /turf/unsimulated/floor{ icon_state = "carpet"; dir = 2 @@ -8173,7 +8173,7 @@ /area/centcom/security) "qp" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red_hos, +/obj/item/folder/red_hos, /turf/unsimulated/floor/steel, /area/centcom/security) "qq" = ( @@ -8248,9 +8248,9 @@ /area/centcom/medical) "qx" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -8263,19 +8263,19 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 8 }, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OPlus{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OPlus{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OPlus{ pixel_x = 4; pixel_y = 2 }, -/obj/item/device/healthanalyzer/advanced, +/obj/item/healthanalyzer/advanced, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -8288,12 +8288,12 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; @@ -8418,7 +8418,7 @@ /area/centcom/security) "qJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/unsimulated/floor/steel, /area/centcom/security) "qK" = ( @@ -8429,8 +8429,8 @@ /area/centcom/security) "qL" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 }, @@ -8443,8 +8443,8 @@ /area/centcom/medical) "qM" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/unsimulated/floor/steel{ @@ -8494,7 +8494,7 @@ /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/paleblue/bordercorner2, /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -8503,7 +8503,7 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -8516,7 +8516,7 @@ dir = 6 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -8565,11 +8565,11 @@ "qZ" = ( /obj/structure/table/standard, /obj/effect/floor_decal/borderfloor, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/unsimulated/floor/steel, /area/centcom/command) "ra" = ( @@ -8584,32 +8584,32 @@ /area/centcom/command) "rb" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, @@ -8626,27 +8626,27 @@ /area/centcom/command) "rd" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 0; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 0; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 4 }, @@ -8682,7 +8682,7 @@ /area/centcom/holding) "rh" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/item/stack/medical/bruise_pack{ pixel_x = -4; pixel_y = 3 @@ -8700,12 +8700,12 @@ /area/centcom/holding) "ri" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/syringe/inaprovaline, -/obj/item/weapon/reagent_containers/syringe/inaprovaline{ +/obj/item/reagent_containers/syringe/inaprovaline, +/obj/item/reagent_containers/syringe/inaprovaline{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe/inaprovaline{ +/obj/item/reagent_containers/syringe/inaprovaline{ pixel_y = 10 }, /obj/effect/floor_decal/borderfloor, @@ -8717,7 +8717,7 @@ /obj/item/bodybag/cryobag{ pixel_x = 6 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 5; pixel_y = 5 }, @@ -8737,12 +8737,12 @@ /area/centcom/holding) "rl" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /turf/unsimulated/floor/steel, /area/centcom/security) "rm" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/unsimulated/floor/steel, /area/centcom/security) "rn" = ( @@ -9015,7 +9015,7 @@ }, /area/centcom/bathroom) "sb" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/unsimulated/floor{ icon_state = "steel" }, @@ -9095,7 +9095,7 @@ /area/centcom/medical) "sm" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 3 }, @@ -9111,7 +9111,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/item/device/healthanalyzer/advanced, +/obj/item/healthanalyzer/advanced, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -9136,11 +9136,11 @@ icon_state = "borderfloor"; pixel_x = 16 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/unsimulated/floor/steel, /area/centcom/command) "sr" = ( @@ -9238,13 +9238,13 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = -8 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = 8 }, -/obj/item/weapon/backup_implanter, +/obj/item/backup_implanter, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -9419,8 +9419,8 @@ /area/centcom/terminal) "sZ" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/cups, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, +/obj/item/storage/box/cups, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -9455,7 +9455,7 @@ /obj/effect/floor_decal/corner/blue/bordercorner2{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 0; dir = 1; frequency = 1475; @@ -9569,7 +9569,7 @@ /turf/unsimulated/floor/steel, /area/centcom/security) "ti" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -9582,11 +9582,11 @@ /turf/unsimulated/floor/steel, /area/centcom/security) "tj" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/unsimulated/floor/steel, /area/centcom/security) "tk" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/structure/reagent_dispensers/peppertank{ pixel_x = 30 }, @@ -9663,11 +9663,11 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -9682,7 +9682,7 @@ /area/centcom/security) "tu" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -9848,7 +9848,7 @@ /area/centcom/bathroom) "tM" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/unsimulated/floor{ icon_state = "steel" }, @@ -9894,7 +9894,7 @@ /area/centcom/bathroom) "tR" = ( /obj/structure/table/reinforced, -/obj/item/device/camera, +/obj/item/camera, /obj/effect/floor_decal/borderfloor{ dir = 10 }, @@ -9913,15 +9913,15 @@ /area/centcom/security) "tT" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/gun/energy/taser, +/obj/item/book/manual/security_space_law, +/obj/item/gun/energy/taser, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, /turf/unsimulated/floor/steel, /area/centcom/security) "tU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/ids, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, /turf/unsimulated/floor/steel, @@ -9954,11 +9954,11 @@ /area/centcom/security) "tX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/door/window/brigdoor{ icon_state = "leftsecure"; dir = 2 @@ -10587,11 +10587,11 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/button/remote/blast_door{ id = "FrontlockC"; name = "Colony Entrance Lockdown"; @@ -10788,8 +10788,8 @@ /obj/effect/floor_decal/carpet{ dir = 9 }, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/flame/lighter/zippo, +/obj/item/storage/fancy/cigarettes, /turf/unsimulated/floor{ dir = 2; icon_state = "carpet" @@ -10800,8 +10800,8 @@ /obj/effect/floor_decal/carpet{ dir = 1 }, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/flame/lighter/zippo, +/obj/item/storage/fancy/cigarettes, /turf/unsimulated/floor{ dir = 2; icon_state = "carpet" @@ -10818,8 +10818,8 @@ /obj/effect/floor_decal/carpet{ dir = 5 }, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/flame/lighter/zippo, +/obj/item/storage/fancy/cigarettes, /turf/unsimulated/floor{ dir = 2; icon_state = "carpet" @@ -10828,8 +10828,8 @@ "vS" = ( /obj/structure/table/rack, /obj/item/clothing/suit/armor/riot, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/shield/riot, +/obj/item/melee/baton/loaded, +/obj/item/shield/riot, /obj/item/clothing/head/helmet/riot, /obj/effect/floor_decal/borderfloorblack{ dir = 9 @@ -10845,8 +10845,8 @@ "vT" = ( /obj/structure/table/rack, /obj/item/clothing/suit/armor/riot, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/shield/riot, +/obj/item/melee/baton/loaded, +/obj/item/shield/riot, /obj/item/clothing/head/helmet/riot, /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -10862,8 +10862,8 @@ "vU" = ( /obj/structure/table/rack, /obj/item/clothing/suit/armor/riot, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/shield/riot, +/obj/item/melee/baton/loaded, +/obj/item/shield/riot, /obj/item/clothing/head/helmet/riot, /obj/effect/floor_decal/borderfloorblack{ dir = 5 @@ -10903,7 +10903,7 @@ pixel_y = 30 }, /obj/structure/table/reinforced, -/obj/item/weapon/gun/projectile/shotgun/pump/combat{ +/obj/item/gun/projectile/shotgun/pump/combat{ name = "Discipline" }, /obj/effect/floor_decal/borderfloorblack{ @@ -10942,9 +10942,9 @@ pixel_y = 26 }, /obj/structure/table/reinforced, -/obj/item/weapon/stamp/ward, -/obj/item/weapon/stamp/denied, -/obj/item/device/binoculars, +/obj/item/stamp/ward, +/obj/item/stamp/denied, +/obj/item/binoculars, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -10957,7 +10957,7 @@ }, /area/centcom/security) "wa" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 0; dir = 1; frequency = 1475; @@ -11065,7 +11065,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 0; dir = 1; frequency = 1475; @@ -11400,8 +11400,8 @@ dir = 5 }, /obj/structure/table/reinforced, -/obj/item/device/camera, -/obj/item/weapon/storage/box/ids, +/obj/item/camera, +/obj/item/storage/box/ids, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -11521,7 +11521,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 0; dir = 1; frequency = 1475; @@ -11642,8 +11642,8 @@ dir = 10 }, /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -11734,7 +11734,7 @@ /area/centcom/restaurant) "xk" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/fries, +/obj/item/reagent_containers/food/snacks/fries, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -11742,11 +11742,11 @@ /area/centcom/restaurant) "xl" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburger{ +/obj/item/reagent_containers/food/snacks/cheeseburger{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburger, +/obj/item/reagent_containers/food/snacks/cheeseburger, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -11764,7 +11764,7 @@ /area/centcom/restaurant) "xn" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/grilledcheese, +/obj/item/reagent_containers/food/snacks/grilledcheese, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -11772,7 +11772,7 @@ /area/centcom/restaurant) "xo" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/meatballsoup, +/obj/item/reagent_containers/food/snacks/meatballsoup, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -11819,7 +11819,7 @@ "xs" = ( /obj/effect/floor_decal/industrial/outline, /obj/structure/closet/secure_closet/nanotrasen_security, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -11971,7 +11971,7 @@ "xB" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/closet/secure_closet/nanotrasen_warden, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -12068,8 +12068,8 @@ /area/centcom/main_hall) "xJ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/hotdog, -/obj/item/weapon/reagent_containers/food/snacks/hotdog{ +/obj/item/reagent_containers/food/snacks/hotdog, +/obj/item/reagent_containers/food/snacks/hotdog{ pixel_x = -5; pixel_y = -3 }, @@ -12080,7 +12080,7 @@ /area/centcom/restaurant) "xK" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -12088,7 +12088,7 @@ /area/centcom/restaurant) "xL" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/roastbeef, +/obj/item/reagent_containers/food/snacks/roastbeef, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -12096,7 +12096,7 @@ /area/centcom/restaurant) "xM" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/meatsteak, +/obj/item/reagent_containers/food/snacks/meatsteak, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -12127,7 +12127,7 @@ /obj/effect/floor_decal/carpet{ dir = 8 }, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /obj/machinery/camera/network/crescent{ dir = 4 }, @@ -12256,7 +12256,7 @@ /obj/effect/floor_decal/carpet{ dir = 8 }, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /turf/unsimulated/floor{ dir = 2; icon_state = "carpet" @@ -12451,8 +12451,8 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -12491,7 +12491,7 @@ }) "yn" = ( /obj/structure/table/standard, -/obj/item/weapon/soap, +/obj/item/soap, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 }, @@ -12601,9 +12601,9 @@ dir = 10 }, /obj/structure/table/reinforced, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/gun/energy/taser, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/gun/energy/taser, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -12615,9 +12615,9 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/blue/border, /obj/structure/closet/secure_closet/nanotrasen_security, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/shield/riot, +/obj/item/storage/box/handcuffs, +/obj/item/gun/energy/gun, +/obj/item/shield/riot, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -12635,9 +12635,9 @@ dir = 9 }, /obj/structure/closet/secure_closet/nanotrasen_security, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/shield/riot, +/obj/item/storage/box/handcuffs, +/obj/item/gun/energy/gun, +/obj/item/shield/riot, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -12690,8 +12690,8 @@ }, /area/centcom/security) "yE" = ( -/obj/item/weapon/storage/box/evidence, -/obj/item/weapon/folder/red, +/obj/item/storage/box/evidence, +/obj/item/folder/red, /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -12706,8 +12706,8 @@ /area/centcom/security) "yF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -12724,7 +12724,7 @@ /area/centcom/restaurant) "yH" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/pastatomato, +/obj/item/reagent_containers/food/snacks/pastatomato, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -12732,7 +12732,7 @@ /area/centcom/restaurant) "yI" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/meatballspagetti, +/obj/item/reagent_containers/food/snacks/meatballspagetti, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -12753,32 +12753,32 @@ /area/centcom/restaurant) "yL" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, @@ -12798,27 +12798,27 @@ /area/centcom/restaurant) "yN" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 0; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 0; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 4 }, @@ -12966,8 +12966,8 @@ /area/centcom/security) "yX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/material/minihoe, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/material/minihoe, +/obj/item/analyzer/plant_analyzer, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -13007,7 +13007,7 @@ }, /area/centcom/security) "za" = ( -/obj/item/device/camera{ +/obj/item/camera{ desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; @@ -13066,7 +13066,7 @@ /area/centcom/main_hall) "zf" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/kitsuneudon, +/obj/item/reagent_containers/food/snacks/kitsuneudon, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -13074,7 +13074,7 @@ /area/centcom/restaurant) "zg" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/lasagna, +/obj/item/reagent_containers/food/snacks/lasagna, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -13158,7 +13158,7 @@ }, /area/centcom/security) "zn" = ( -/obj/item/device/taperecorder, +/obj/item/taperecorder, /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorblack{ dir = 10 @@ -13410,7 +13410,7 @@ /area/centcom/security) "zH" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, @@ -13445,7 +13445,7 @@ /area/centcom/security) "zJ" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/machinery/camera/network/crescent, /obj/effect/floor_decal/borderfloorblack{ dir = 5 @@ -13466,7 +13466,7 @@ }, /area/centcom/bar) "zL" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -13534,7 +13534,7 @@ /area/centcom/bar) "zV" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine, +/obj/item/reagent_containers/food/drinks/bottle/grenadine, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -13542,7 +13542,7 @@ /area/centcom/bar) "zW" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cola, +/obj/item/reagent_containers/food/drinks/bottle/cola, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -13558,7 +13558,7 @@ /area/centcom/bar) "zY" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind, +/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -13566,7 +13566,7 @@ /area/centcom/bar) "zZ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich{ +/obj/item/reagent_containers/food/snacks/toastedsandwich{ pixel_w = 0; pixel_x = 0; pixel_y = 10 @@ -13605,7 +13605,7 @@ /area/centcom/security) "Ae" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/energy/taser, +/obj/item/gun/energy/taser, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 26 @@ -13631,8 +13631,8 @@ /area/centcom/security) "Ah" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, @@ -13646,7 +13646,7 @@ /area/centcom/security) "Ai" = ( /obj/structure/table/reinforced, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -13681,7 +13681,7 @@ /area/centcom/security) "Al" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/borderfloorblack{ dir = 10 }, @@ -13712,7 +13712,7 @@ /area/centcom/security) "An" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/borderfloorblack{ dir = 6 }, @@ -13830,9 +13830,9 @@ /area/centcom/bar) "AB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask, -/obj/item/weapon/reagent_containers/glass/rag, -/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, +/obj/item/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/food/drinks/flask/vacuumflask, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -13904,7 +13904,7 @@ /area/centcom/security) "AJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -13912,8 +13912,8 @@ /area/centcom/security) "AK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/deck/cards, +/obj/item/storage/pill_bottle/dice, +/obj/item/deck/cards, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -14002,7 +14002,7 @@ name = "\improper CentCom Residential Security" }) "AS" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 0; dir = 1; frequency = 1475; @@ -14084,7 +14084,7 @@ /obj/effect/floor_decal/corner/blue/bordercorner2{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 0; dir = 1; frequency = 1475; @@ -14221,11 +14221,11 @@ pixel_x = 6; pixel_y = -5 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, @@ -14316,7 +14316,7 @@ }, /area/centcom/security) "Bo" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/orange/border, /turf/unsimulated/floor{ @@ -14375,16 +14375,16 @@ dir = 4 }, /obj/structure/table/marble, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/book/manual/chef_recipes, +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3; pixel_y = 0 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/material/knife/butch, +/obj/item/material/kitchen/rollingpin, +/obj/item/material/knife/butch, /turf/simulated/floor/tiled/white, /area/centcom/bar) "Bt" = ( @@ -14610,8 +14610,8 @@ }) "BL" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/device/taperecorder, +/obj/item/book/manual/security_space_law, +/obj/item/taperecorder, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/blue/border, /turf/unsimulated/floor{ @@ -14623,8 +14623,8 @@ }) "BM" = ( /obj/structure/table/reinforced, -/obj/item/device/camera, -/obj/item/weapon/storage/box/ids, +/obj/item/camera, +/obj/item/storage/box/ids, /obj/effect/floor_decal/borderfloorblack{ dir = 6 }, @@ -14655,9 +14655,9 @@ }) "BO" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/blue/border, /turf/unsimulated/floor{ @@ -15017,11 +15017,11 @@ }) "CA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/button/remote/blast_door{ id = "TelelockdownC"; name = "Teleporter Entrance Lockdown"; @@ -15073,7 +15073,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 0; dir = 1; frequency = 1475; @@ -15173,7 +15173,7 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -15210,7 +15210,7 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/unsimulated/floor/steel, /area/centcom/command) "CP" = ( @@ -15235,7 +15235,7 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/ids, /turf/unsimulated/floor/steel, /area/centcom/command) "CR" = ( @@ -15280,8 +15280,8 @@ /area/centcom/command) "CU" = ( /obj/structure/table/reinforced, -/obj/item/device/camera, -/obj/item/weapon/storage/box/ids, +/obj/item/camera, +/obj/item/storage/box/ids, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, @@ -15425,7 +15425,7 @@ /area/centcom/command) "DC" = ( /obj/structure/table/glass, -/obj/item/device/healthanalyzer/advanced, +/obj/item/healthanalyzer/advanced, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -15436,26 +15436,26 @@ /area/centcom/evac) "Ez" = ( /obj/structure/table/reinforced, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, /turf/unsimulated/floor{ icon_state = "dark" }, /area/centcom/specops) "EI" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/rocket, -/obj/item/weapon/gun/launcher/rocket, +/obj/item/gun/launcher/rocket, +/obj/item/gun/launcher/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, @@ -15470,7 +15470,7 @@ /area/centcom/specops) "EX" = ( /obj/structure/table/standard, -/obj/item/weapon/soap, +/obj/item/soap, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 }, @@ -15486,23 +15486,23 @@ /area/centcom/control) "Fo" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, /turf/unsimulated/floor{ icon_state = "dark" @@ -15536,17 +15536,17 @@ /area/centcom/control) "Gm" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer, /turf/unsimulated/floor{ icon_state = "dark" }, /area/centcom/control) "GG" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/grenade, -/obj/item/weapon/gun/launcher/grenade, +/obj/item/gun/launcher/grenade, +/obj/item/gun/launcher/grenade, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -15572,8 +15572,8 @@ /area/centcom/terminal) "Hf" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/xray, -/obj/item/weapon/gun/energy/xray, +/obj/item/gun/energy/xray, +/obj/item/gun/energy/xray, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -15590,8 +15590,8 @@ /area/centcom/evac) "HU" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/lasercannon, -/obj/item/weapon/gun/energy/lasercannon, +/obj/item/gun/energy/lasercannon, +/obj/item/gun/energy/lasercannon, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -15646,15 +15646,15 @@ /area/centcom/specops) "Iu" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = 3; pixel_y = 5 }, @@ -15674,7 +15674,7 @@ /area/centcom/medical) "Iz" = ( /obj/structure/table/standard, -/obj/item/weapon/soap, +/obj/item/soap, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -15739,11 +15739,11 @@ /area/centcom/evac) "Kw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/combat{ +/obj/item/storage/firstaid/combat{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -15769,8 +15769,8 @@ /area/centcom/evac) "Le" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/gun/energy/gun/burst, +/obj/item/gun/energy/gun/burst, +/obj/item/gun/energy/gun/burst, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -15788,7 +15788,7 @@ }, /area/centcom/control) "Me" = ( -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -15796,10 +15796,10 @@ /area/centcom/control) "Mt" = ( /obj/structure/table/rack, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -15827,26 +15827,26 @@ /area/centcom/evac) "Nx" = ( /obj/structure/table/rack, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, /turf/unsimulated/floor{ icon_state = "dark" }, /area/centcom/specops) "Oc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -15854,8 +15854,8 @@ /area/centcom/specops) "Og" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/l6_saw, -/obj/item/weapon/gun/projectile/automatic/l6_saw, +/obj/item/gun/projectile/automatic/l6_saw, +/obj/item/gun/projectile/automatic/l6_saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, @@ -15931,8 +15931,8 @@ /area/centcom/bathroom) "QQ" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid_combat, -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid_combat, +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid_combat, +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid_combat, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -15943,16 +15943,16 @@ /area/centcom/evac) "Rc" = ( /obj/structure/table/glass, -/obj/item/device/defib_kit/compact/loaded, +/obj/item/defib_kit/compact/loaded, /turf/unsimulated/floor/steel{ icon_state = "white" }, /area/centcom/medical) "Re" = ( /obj/structure/table/reinforced, -/obj/item/device/binoculars, -/obj/item/device/survivalcapsule, -/obj/item/device/survivalcapsule, +/obj/item/binoculars, +/obj/item/survivalcapsule, +/obj/item/survivalcapsule, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -15974,19 +15974,19 @@ /area/centcom/specops) "RE" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, /turf/unsimulated/floor{ icon_state = "dark" }, /area/centcom/specops) "RJ" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/weapon/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, @@ -16123,22 +16123,22 @@ /area/centcom/evac) "UO" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/compact, -/obj/item/weapon/gun/energy/gun/compact, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/gun/energy/gun/compact, +/obj/item/gun/energy/gun/compact, +/obj/item/flash, +/obj/item/flash, /turf/unsimulated/floor{ icon_state = "dark" }, /area/centcom/control) "Vf" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/frags, -/obj/item/weapon/storage/box/frags, -/obj/item/weapon/storage/box/teargas, -/obj/item/weapon/storage/box/teargas, -/obj/item/weapon/storage/box/empslite, -/obj/item/weapon/storage/box/empslite, +/obj/item/storage/box/frags, +/obj/item/storage/box/frags, +/obj/item/storage/box/teargas, +/obj/item/storage/box/teargas, +/obj/item/storage/box/empslite, +/obj/item/storage/box/empslite, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -16152,8 +16152,8 @@ /area/centcom/bathroom) "VU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -16161,10 +16161,10 @@ /area/centcom/specops) "WL" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/pillbottles, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/autoinjectors, +/obj/item/storage/box/pillbottles, +/obj/item/storage/box/gloves, +/obj/item/storage/box/beakers, +/obj/item/storage/box/autoinjectors, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -16178,10 +16178,10 @@ /area/centcom/specops) "XA" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil, -/obj/item/device/t_scanner/advanced, -/obj/item/device/t_scanner/advanced, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/t_scanner/advanced, +/obj/item/t_scanner/advanced, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -16217,7 +16217,7 @@ /area/centcom/specops) "Zw" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/heavysniper, +/obj/item/gun/projectile/heavysniper, /obj/item/ammo_magazine/ammo_box/b145, /obj/item/ammo_magazine/ammo_box/b145, /turf/unsimulated/floor{ @@ -16229,7 +16229,7 @@ /turf/unsimulated/floor/steel, /area/centcom/evac) "ZN" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "CentCom"; tele_network = "centcom" }, diff --git a/maps/submaps/admin_use_vr/dojo.dmm b/maps/submaps/admin_use_vr/dojo.dmm index a2bd85f37f5..7c6231376fa 100644 --- a/maps/submaps/admin_use_vr/dojo.dmm +++ b/maps/submaps/admin_use_vr/dojo.dmm @@ -46,7 +46,7 @@ /area/ninja_dojo/dojo) "aj" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -54,7 +54,7 @@ /area/ninja_dojo/dojo) "ak" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/material/sword/katana, +/obj/item/material/sword/katana, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -308,11 +308,11 @@ /area/shuttle/ninja) "aQ" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, /turf/simulated/shuttle/floor/voidcraft/dark, /area/shuttle/ninja) "aR" = ( @@ -433,7 +433,7 @@ "bc" = ( /obj/structure/table/steel_reinforced, /obj/random/paicard, -/obj/item/device/pda/syndicate, +/obj/item/pda/syndicate, /turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/ninja) "bd" = ( @@ -442,7 +442,7 @@ /area/shuttle/ninja) "be" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/toolbox/syndicate{ +/obj/item/storage/toolbox/syndicate{ pixel_x = -1; pixel_y = 3 }, @@ -647,7 +647,7 @@ /area/ninja_dojo/dojo) "by" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/fortunecookie, +/obj/item/reagent_containers/food/snacks/fortunecookie, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -663,7 +663,7 @@ /area/ninja_dojo/dojo) "bA" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -718,11 +718,11 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FF6666"; name = "light red towel" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#FF6666"; name = "light red towel" }, @@ -744,7 +744,7 @@ /area/ninja_dojo/dojo) "bJ" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/radio/uplink, +/obj/item/radio/uplink, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -766,14 +766,14 @@ }, /area/ninja_dojo/dojo) "bL" = ( -/obj/item/weapon/rig/light/stealth, +/obj/item/rig/light/stealth, /obj/structure/table/rack, /turf/unsimulated/floor{ icon_state = "dark" }, /area/ninja_dojo/dojo) "bM" = ( -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -836,7 +836,7 @@ /area/ninja_dojo/dojo) "bV" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/toolbox/syndicate{ +/obj/item/storage/toolbox/syndicate{ pixel_x = -1; pixel_y = 3 }, @@ -904,11 +904,11 @@ /area/ninja_dojo/dojo) "cd" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /turf/unsimulated/floor{ icon_state = "white" }, diff --git a/maps/submaps/admin_use_vr/ert.dm b/maps/submaps/admin_use_vr/ert.dm index 4bed750cbab..a5cd94105f7 100644 --- a/maps/submaps/admin_use_vr/ert.dm +++ b/maps/submaps/admin_use_vr/ert.dm @@ -186,7 +186,7 @@ on_store_visible_message_2 = "into cryogenic storage." //Misc Stuff -/obj/item/weapon/paper/ert_armory_cells +/obj/item/paper/ert_armory_cells name = "ERT Armory Cell Supply" info = {"To All Current ERT Members,
\ All energy weapons here come installed with standard power cells, but the spares on the racks are self-charging tech.
\ @@ -197,7 +197,7 @@ Point is they're fairly expensive and probably prototypes or something, so for t
\ Lt. Cmdr. Sykes"} -/obj/item/weapon/paper/vonbraun_shields +/obj/item/paper/vonbraun_shields name = "NRV Von Braun Shield Configuration Documentation" info = {"To All Current ERT Members,
\ Be advised that use of the NRV Von Braun's shield generator (located adjacent to this document) is strongly recommended when responding to calls, but also that it is not impervious, nor is the ship's point defense system flawless.
\ @@ -214,7 +214,7 @@ The shield generator will tax the Von Braun's reserves greatly so try to use it
\ Lt. Cmdr. Sykes"} -/obj/item/weapon/paper/vonbraun_cannon +/obj/item/paper/vonbraun_cannon name = "NRV Von Braun O.F.D. Console" info = {"To All Current ERT Members,
\ Given recent events, Central has finally cleared the paperwork that allowed us to install an Obstruction Field Disperser, or 'O.F.D.', on the Von Braun. Please note we had to get rid of the mech bay (that nobody was allowed to use anyway) so that's where you'll find it. Of course if you're reading this you already found it.
\ @@ -232,7 +232,7 @@ P.S. Before any of you ask, no, you cannot fire yourself or your teammates out o /obj/machinery/computer/cryopod/ert name = "responder oversight console" desc = "An interface between responders and the cryo oversight systems tasked with keeping track of all responders who enter or exit cryostasis." - circuit = "/obj/item/weapon/circuitboard/robotstoragecontrol" + circuit = "/obj/item/circuitboard/robotstoragecontrol" storage_type = "responders" storage_name = "ERT Oversight Control" diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index b217dd44418..ff5412d2c75 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -106,24 +106,24 @@ /turf/simulated/wall/shull, /area/ship/ert/med_surg) "aD" = ( -/obj/item/weapon/circuitboard/aiupload, -/obj/item/weapon/circuitboard/borgupload, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/aiModule/nanotrasen, -/obj/item/weapon/aiModule/reset, -/obj/item/weapon/aiModule/freeformcore, -/obj/item/weapon/aiModule/protectStation, -/obj/item/weapon/aiModule/quarantine, -/obj/item/weapon/aiModule/paladin, -/obj/item/weapon/aiModule/robocop, -/obj/item/weapon/aiModule/safeguard, +/obj/item/circuitboard/aiupload, +/obj/item/circuitboard/borgupload, +/obj/item/circuitboard/smes, +/obj/item/aiModule/nanotrasen, +/obj/item/aiModule/reset, +/obj/item/aiModule/freeformcore, +/obj/item/aiModule/protectStation, +/obj/item/aiModule/quarantine, +/obj/item/aiModule/paladin, +/obj/item/aiModule/robocop, +/obj/item/aiModule/safeguard, /obj/structure/table/steel_reinforced, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil, -/obj/item/device/t_scanner/advanced{ +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/t_scanner/advanced{ pixel_x = -3 }, -/obj/item/device/t_scanner/advanced{ +/obj/item/t_scanner/advanced{ pixel_x = 3 }, /obj/machinery/power/apc/hyper{ @@ -179,21 +179,21 @@ /area/ship/ert/mech_bay) "aH" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/backpack/ert/security{ +/obj/item/storage/backpack/ert/security{ pixel_y = -3 }, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security{ +/obj/item/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security{ pixel_y = 3 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/backpack/ert/security{ +/obj/item/storage/backpack/ert/security{ pixel_y = 6 }, -/obj/item/weapon/storage/backpack/ert/security{ +/obj/item/storage/backpack/ert/security{ pixel_y = 9 }, -/obj/item/weapon/storage/backpack/ert/security{ +/obj/item/storage/backpack/ert/security{ pixel_y = 12 }, /obj/item/clothing/suit/space/void/responseteam/security, @@ -308,11 +308,11 @@ /area/ship/ert/mech_bay) "bw" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/frags{ +/obj/item/storage/box/frags{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/box/frags{ +/obj/item/storage/box/frags{ pixel_x = 2; pixel_y = 2 }, @@ -351,7 +351,7 @@ /obj/structure/railing/grey{ dir = 1 }, -/obj/item/weapon/paper/vonbraun_shields, +/obj/item/paper/vonbraun_shields, /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) @@ -367,12 +367,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, +/obj/item/rig/ert/medical, +/obj/item/rig/ert/medical, +/obj/item/rig/ert/medical, +/obj/item/rig/ert/medical, +/obj/item/rig/ert/medical, +/obj/item/rig/ert/medical, /obj/item/clothing/suit/armor/vest/ert/medical, /obj/item/clothing/suit/armor/vest/ert/medical, /obj/item/clothing/suit/armor/vest/ert/medical, @@ -591,7 +591,7 @@ /area/ship/ert/eng_storage) "dk" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/heavysniper, +/obj/item/gun/projectile/heavysniper, /obj/item/ammo_magazine/ammo_box/b145, /obj/item/ammo_magazine/ammo_box/b145, /obj/effect/floor_decal/industrial/outline/grey, @@ -691,24 +691,24 @@ "dX" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/tank/jetpack/carbondioxide{ +/obj/item/tank/jetpack/carbondioxide{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/tank/jetpack/carbondioxide{ +/obj/item/tank/jetpack/carbondioxide{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide{ +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/tank/jetpack/carbondioxide{ +/obj/item/tank/jetpack/carbondioxide{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/tank/jetpack/carbondioxide{ +/obj/item/tank/jetpack/carbondioxide{ pixel_x = 6; pixel_y = 6 }, @@ -987,45 +987,45 @@ /obj/machinery/light/no_nightshift{ dir = 1 }, -/obj/item/device/defib_kit/compact/combat/loaded{ +/obj/item/defib_kit/compact/combat/loaded{ pixel_y = -3 }, -/obj/item/device/defib_kit/compact/combat/loaded{ +/obj/item/defib_kit/compact/combat/loaded{ pixel_y = 3 }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "gf" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/weapon/surgical/bone_clamp, -/obj/item/weapon/surgical/bone_clamp, -/obj/item/weapon/surgical/scalpel/manager, -/obj/item/weapon/surgical/scalpel/manager, -/obj/item/weapon/surgical/circular_saw/manager, -/obj/item/weapon/surgical/circular_saw/manager, -/obj/item/device/denecrotizer/medical, -/obj/item/device/denecrotizer/medical, +/obj/item/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, +/obj/item/surgical/bone_clamp, +/obj/item/surgical/bone_clamp, +/obj/item/surgical/scalpel/manager, +/obj/item/surgical/scalpel/manager, +/obj/item/surgical/circular_saw/manager, +/obj/item/surgical/circular_saw/manager, +/obj/item/denecrotizer/medical, +/obj/item/denecrotizer/medical, /obj/item/stack/nanopaste, /obj/item/stack/nanopaste, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "gi" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/box/autoinjectors, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/autoinjectors, +/obj/item/storage/box/beakers, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/freezer, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/gloves, +/obj/item/storage/box/freezer, +/obj/item/storage/box/masks, /obj/effect/floor_decal/industrial/outline, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "gk" = ( @@ -1231,16 +1231,16 @@ pixel_x = -10 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/projectile/automatic/p90{ +/obj/item/gun/projectile/automatic/p90{ pixel_y = -6 }, -/obj/item/weapon/gun/projectile/automatic/p90{ +/obj/item/gun/projectile/automatic/p90{ pixel_y = -2 }, -/obj/item/weapon/gun/projectile/automatic/p90{ +/obj/item/gun/projectile/automatic/p90{ pixel_y = 2 }, -/obj/item/weapon/gun/projectile/automatic/p90{ +/obj/item/gun/projectile/automatic/p90{ pixel_y = 6 }, /turf/simulated/floor/tiled/techfloor, @@ -1372,29 +1372,29 @@ /obj/structure/closet/medical_wall{ pixel_x = 32 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/toxin{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = -2; pixel_y = -2 }, @@ -1424,8 +1424,8 @@ "hN" = ( /obj/structure/closet/wardrobe/ert, /obj/item/modular_computer/tablet/preset/custom_loadout/elite, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, /obj/machinery/light/no_nightshift{ dir = 1 @@ -1453,8 +1453,8 @@ "hS" = ( /obj/structure/closet/wardrobe/ert, /obj/item/modular_computer/tablet/preset/custom_loadout/elite, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, /obj/machinery/light/no_nightshift{ dir = 1 @@ -1491,24 +1491,24 @@ /area/ship/ert/armoury_dl) "hY" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/rig/ert/assetprotection{ +/obj/item/rig/ert/assetprotection{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/rig/ert/assetprotection{ +/obj/item/rig/ert/assetprotection{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection{ +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/rig/ert/assetprotection{ +/obj/item/rig/ert/assetprotection{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/rig/ert/assetprotection{ +/obj/item/rig/ert/assetprotection{ pixel_x = 6; pixel_y = 6 }, @@ -1538,11 +1538,11 @@ name = "NT 'Deathsquid' Plushie" }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/device/mapping_unit/deathsquad, -/obj/item/device/holomap_beacon/deathsquad, -/obj/item/device/holomap_beacon/deathsquad, -/obj/item/device/holomap_beacon/deathsquad, -/obj/item/device/holomap_beacon/deathsquad, +/obj/item/mapping_unit/deathsquad, +/obj/item/holomap_beacon/deathsquad, +/obj/item/holomap_beacon/deathsquad, +/obj/item/holomap_beacon/deathsquad, +/obj/item/holomap_beacon/deathsquad, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "ip" = ( @@ -1676,8 +1676,8 @@ icon_state = "1-2" }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/brig) "iO" = ( @@ -1805,7 +1805,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "jy" = ( -/obj/item/device/aicard, +/obj/item/aicard, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -1896,10 +1896,10 @@ icon_state = "1-2" }, /obj/structure/table/steel_reinforced, -/obj/item/device/laser_pointer/upgraded, -/obj/item/device/laser_pointer/upgraded, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/laser_pointer/upgraded, +/obj/item/laser_pointer/upgraded, +/obj/item/flash, +/obj/item/flash, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -1958,11 +1958,11 @@ /area/ship/ert/engine) "kt" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/netgun{ +/obj/item/gun/energy/netgun{ pixel_y = -4 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/energy/sniperrifle{ +/obj/item/gun/energy/sniperrifle{ battery_lock = 0; pixel_y = 6 }, @@ -1976,19 +1976,19 @@ /area/ship/ert/teleporter) "kx" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/box/pillbottles, -/obj/item/weapon/storage/box/pillbottles, +/obj/item/storage/box/pillbottles, +/obj/item/storage/box/pillbottles, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "ky" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /obj/machinery/light/no_nightshift{ dir = 8 }, -/obj/item/weapon/surgical/bone_clamp, -/obj/item/weapon/surgical/scalpel/manager, -/obj/item/weapon/surgical/circular_saw/manager, +/obj/item/surgical/bone_clamp, +/obj/item/surgical/scalpel/manager, +/obj/item/surgical/circular_saw/manager, /obj/item/stack/nanopaste, /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) @@ -2016,10 +2016,10 @@ /area/ship/ert/eng_storage) "kG" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/z8{ +/obj/item/gun/projectile/automatic/z8{ pixel_y = 3 }, -/obj/item/weapon/gun/projectile/automatic/z8{ +/obj/item/gun/projectile/automatic/z8{ pixel_y = -3 }, /obj/item/ammo_magazine/m762, @@ -2208,10 +2208,10 @@ /obj/item/ammo_magazine/ammo_box/b12g/beanbag, /obj/item/ammo_magazine/ammo_box/b12g/stunshell, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/projectile/automatic/as24{ +/obj/item/gun/projectile/automatic/as24{ pixel_y = 3 }, -/obj/item/weapon/gun/projectile/automatic/as24{ +/obj/item/gun/projectile/automatic/as24{ pixel_y = -3 }, /turf/simulated/floor/tiled/techfloor, @@ -2269,24 +2269,24 @@ /area/ship/ert/dock_port) "mr" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/belt/security/tactical{ +/obj/item/storage/belt/security/tactical{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/storage/belt/security/tactical{ +/obj/item/storage/belt/security/tactical{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical{ +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/belt/security/tactical{ +/obj/item/storage/belt/security/tactical{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/belt/security/tactical{ +/obj/item/storage/belt/security/tactical{ pixel_x = 6; pixel_y = 6 }, @@ -2429,11 +2429,11 @@ "nb" = ( /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/weapon/storage/box/cdeathalarm_kit{ +/obj/item/storage/box/cdeathalarm_kit{ pixel_x = -1; pixel_y = -1 }, -/obj/item/weapon/storage/box/cdeathalarm_kit{ +/obj/item/storage/box/cdeathalarm_kit{ pixel_x = 1; pixel_y = 1 }, @@ -2502,11 +2502,11 @@ "nt" = ( /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/weapon/storage/box/backup_kit{ +/obj/item/storage/box/backup_kit{ pixel_x = -1; pixel_y = -1 }, -/obj/item/weapon/storage/box/backup_kit{ +/obj/item/storage/box/backup_kit{ pixel_x = 1; pixel_y = 1 }, @@ -2634,10 +2634,10 @@ /area/ship/ert/engine) "om" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/launcher/grenade{ +/obj/item/gun/launcher/grenade{ pixel_y = 3 }, -/obj/item/weapon/gun/launcher/grenade{ +/obj/item/gun/launcher/grenade{ pixel_y = -3 }, /obj/effect/floor_decal/industrial/outline/grey, @@ -2645,16 +2645,16 @@ /area/ship/ert/armoury_dl) "oo" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/taser{ +/obj/item/gun/energy/taser{ pixel_y = 3 }, -/obj/item/weapon/gun/energy/taser{ +/obj/item/gun/energy/taser{ pixel_y = 1 }, -/obj/item/weapon/gun/energy/taser{ +/obj/item/gun/energy/taser{ pixel_y = -1 }, -/obj/item/weapon/gun/energy/taser{ +/obj/item/gun/energy/taser{ pixel_y = -3 }, /obj/effect/floor_decal/industrial/outline/grey, @@ -2708,13 +2708,13 @@ "oz" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/table/steel_reinforced, -/obj/item/weapon/rcd/advanced/loaded{ +/obj/item/rcd/advanced/loaded{ desc = "A device used to rapidly build and deconstruct. This version works faster, and has a much larger capacity than a standard model, but doesn't work at range. Reload with compressed matter cartridges."; name = "emergency rapid construction device"; pixel_y = 3; ranged = 0 }, -/obj/item/weapon/rcd/advanced/loaded{ +/obj/item/rcd/advanced/loaded{ desc = "A device used to rapidly build and deconstruct. This version works faster, and has a much larger capacity than a standard model, but doesn't work at range. Reload with compressed matter cartridges."; name = "emergency rapid construction device"; pixel_y = -3; @@ -2798,35 +2798,35 @@ /area/ship/ert/med) "pq" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -4; pixel_y = -6 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -4; pixel_y = -2 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = -4; pixel_y = 2 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = -4; pixel_y = 6 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 4; pixel_y = -6 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 4; pixel_y = -2 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 4; pixel_y = 6 }, @@ -2852,12 +2852,12 @@ /area/ship/ert/gunnery) "pt" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, /obj/item/clothing/suit/armor/vest/ert/security, /obj/item/clothing/suit/armor/vest/ert/security, /obj/item/clothing/suit/armor/vest/ert/security, @@ -2882,11 +2882,11 @@ /obj/item/clothing/gloves/heavy_engineer{ pixel_y = 3 }, -/obj/item/weapon/storage/backpack/ert/engineer{ +/obj/item/storage/backpack/ert/engineer{ pixel_y = -3 }, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer{ +/obj/item/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer{ pixel_y = 3 }, /obj/item/clothing/gloves/heavy_engineer{ @@ -2898,13 +2898,13 @@ /obj/item/clothing/gloves/heavy_engineer{ pixel_y = 12 }, -/obj/item/weapon/storage/backpack/ert/engineer{ +/obj/item/storage/backpack/ert/engineer{ pixel_y = 6 }, -/obj/item/weapon/storage/backpack/ert/engineer{ +/obj/item/storage/backpack/ert/engineer{ pixel_y = 9 }, -/obj/item/weapon/storage/backpack/ert/engineer{ +/obj/item/storage/backpack/ert/engineer{ pixel_y = 12 }, /turf/simulated/floor/tiled/techfloor, @@ -2975,12 +2975,12 @@ pixel_y = -26 }, /obj/structure/table/rack/steel, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer, /obj/item/clothing/suit/armor/vest/ert/engineer, /obj/item/clothing/suit/armor/vest/ert/engineer, /obj/item/clothing/suit/armor/vest/ert/engineer, @@ -2997,22 +2997,22 @@ /area/ship/ert/barracks) "pK" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/backpack/ert/medical{ +/obj/item/storage/backpack/ert/medical{ pixel_y = -3 }, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical{ +/obj/item/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical{ pixel_y = 3 }, /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/light/no_nightshift, -/obj/item/weapon/storage/backpack/ert/medical{ +/obj/item/storage/backpack/ert/medical{ pixel_y = 6 }, -/obj/item/weapon/storage/backpack/ert/medical{ +/obj/item/storage/backpack/ert/medical{ pixel_y = 9 }, -/obj/item/weapon/storage/backpack/ert/medical{ +/obj/item/storage/backpack/ert/medical{ pixel_y = 12 }, /obj/item/clothing/suit/space/void/responseteam/medical, @@ -3024,20 +3024,20 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "pM" = ( -/obj/item/weapon/storage/belt/medical/emt{ +/obj/item/storage/belt/medical/emt{ pixel_y = -4 }, -/obj/item/weapon/storage/belt/medical/emt{ +/obj/item/storage/belt/medical/emt{ pixel_y = -2 }, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt{ +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt{ pixel_y = 2 }, -/obj/item/weapon/storage/belt/medical/emt{ +/obj/item/storage/belt/medical/emt{ pixel_y = 4 }, -/obj/item/weapon/storage/belt/medical/emt{ +/obj/item/storage/belt/medical/emt{ pixel_y = 6 }, /obj/item/clothing/accessory/storage/white_vest{ @@ -3058,13 +3058,13 @@ }, /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/belt/explorer/pathfinder{ +/obj/item/storage/belt/explorer/pathfinder{ name = "ERT belt" }, -/obj/item/weapon/storage/belt/explorer/pathfinder{ +/obj/item/storage/belt/explorer/pathfinder{ name = "ERT belt" }, -/obj/item/weapon/storage/belt/explorer/pathfinder{ +/obj/item/storage/belt/explorer/pathfinder{ name = "ERT belt" }, /turf/simulated/floor/tiled/techfloor, @@ -3137,19 +3137,19 @@ /area/ship/ert/armoury_dl) "qa" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, /obj/item/stack/nanopaste/advanced, /obj/item/stack/nanopaste/advanced, /obj/item/stack/nanopaste/advanced, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, -/obj/item/weapon/storage/pill_bottle/blood_regen, -/obj/item/weapon/storage/pill_bottle/blood_regen, -/obj/item/weapon/storage/pill_bottle/sleevingcure/full, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/syringes{ +/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, +/obj/item/storage/pill_bottle/blood_regen, +/obj/item/storage/pill_bottle/blood_regen, +/obj/item/storage/pill_bottle/sleevingcure/full, +/obj/item/storage/box/syringes, +/obj/item/storage/box/syringes{ pixel_x = 2; pixel_y = 2 }, @@ -3193,14 +3193,14 @@ /obj/item/clothing/suit/space/void/responseteam/janitor{ pixel_y = 4 }, -/obj/item/weapon/storage/belt/janitor{ +/obj/item/storage/belt/janitor{ pixel_y = -2 }, -/obj/item/weapon/storage/belt/janitor, -/obj/item/weapon/storage/belt/janitor{ +/obj/item/storage/belt/janitor, +/obj/item/storage/belt/janitor{ pixel_y = 2 }, -/obj/item/weapon/storage/belt/janitor{ +/obj/item/storage/belt/janitor{ pixel_y = 4 }, /obj/machinery/light/no_nightshift, @@ -3349,10 +3349,10 @@ /area/ship/ert/med_surg) "rc" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/l6_saw{ +/obj/item/gun/projectile/automatic/l6_saw{ pixel_y = 3 }, -/obj/item/weapon/gun/projectile/automatic/l6_saw{ +/obj/item/gun/projectile/automatic/l6_saw{ pixel_y = -3 }, /obj/item/ammo_magazine/m545saw{ @@ -3566,8 +3566,8 @@ /area/ship/ert/hangar) "sq" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid, -/obj/item/weapon/storage/belt/explorer/pathfinder{ +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid, +/obj/item/storage/belt/explorer/pathfinder{ name = "ERT belt" }, /turf/simulated/floor/wood, @@ -3658,8 +3658,8 @@ dir = 8; pixel_x = 26 }, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/brig) "sF" = ( @@ -3713,10 +3713,10 @@ /area/ship/ert/teleporter) "sR" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/xray{ +/obj/item/gun/energy/xray{ pixel_y = -3 }, -/obj/item/weapon/gun/energy/xray{ +/obj/item/gun/energy/xray{ pixel_y = 3 }, /obj/machinery/light/no_nightshift, @@ -3890,7 +3890,7 @@ "ua" = ( /obj/structure/table/steel_reinforced, /obj/machinery/chemical_dispenser/full, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "uc" = ( @@ -3944,9 +3944,9 @@ /turf/simulated/floor/airless, /area/ship/ert/gunnery) "us" = ( -/obj/item/weapon/storage/box/trackimp, -/obj/item/weapon/storage/box/cdeathalarm_kit, -/obj/item/weapon/stamp/centcomm, +/obj/item/storage/box/trackimp, +/obj/item/storage/box/cdeathalarm_kit, +/obj/item/stamp/centcomm, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/hardwoodtable, /turf/simulated/floor/wood, @@ -4309,28 +4309,28 @@ /area/ship/ert/barracks) "xv" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/melee/baton{ +/obj/item/melee/baton{ pixel_x = -6 }, -/obj/item/weapon/melee/baton{ +/obj/item/melee/baton{ pixel_x = -2 }, -/obj/item/weapon/melee/baton{ +/obj/item/melee/baton{ pixel_x = 2 }, -/obj/item/weapon/melee/baton{ +/obj/item/melee/baton{ pixel_x = 6 }, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot{ pixel_x = -6 }, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot{ pixel_x = -2 }, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot{ pixel_x = 2 }, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot{ pixel_x = 6 }, /obj/effect/floor_decal/industrial/outline/grey, @@ -4359,19 +4359,19 @@ /area/ship/ert/hallways_aft) "xz" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/firstaid/bonemed{ +/obj/item/storage/firstaid/bonemed{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/clotting{ +/obj/item/storage/firstaid/clotting{ pixel_x = 2; pixel_y = 2 }, /obj/effect/floor_decal/corner/yellow{ dir = 1 }, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat{ +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/combat{ pixel_x = -2; pixel_y = -2 }, @@ -4415,20 +4415,20 @@ "xG" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/energy/gun/nuclear{ +/obj/item/gun/energy/gun/nuclear{ pixel_y = 6 }, -/obj/item/weapon/gun/energy/gun/nuclear{ +/obj/item/gun/energy/gun/nuclear{ pixel_y = 4 }, -/obj/item/weapon/gun/energy/gun/nuclear{ +/obj/item/gun/energy/gun/nuclear{ pixel_y = 2 }, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear{ +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear{ pixel_y = -2 }, -/obj/item/weapon/gun/energy/gun/nuclear{ +/obj/item/gun/energy/gun/nuclear{ pixel_y = -4 }, /turf/simulated/floor/tiled/techfloor, @@ -4485,20 +4485,20 @@ /obj/item/ammo_magazine/m9mm/large/preban{ pixel_x = 10 }, -/obj/item/weapon/gun/projectile/p92x/large/preban{ +/obj/item/gun/projectile/p92x/large/preban{ pixel_y = 4 }, -/obj/item/weapon/gun/projectile/p92x/large/preban{ +/obj/item/gun/projectile/p92x/large/preban{ pixel_y = 2 }, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban{ +/obj/item/gun/projectile/p92x/large/preban, +/obj/item/gun/projectile/p92x/large/preban{ pixel_y = -2 }, -/obj/item/weapon/gun/projectile/p92x/large/preban{ +/obj/item/gun/projectile/p92x/large/preban{ pixel_y = -4 }, -/obj/item/weapon/gun/projectile/p92x/large/preban{ +/obj/item/gun/projectile/p92x/large/preban{ pixel_y = -6 }, /turf/simulated/floor/tiled/techfloor, @@ -4582,10 +4582,10 @@ /obj/item/ammo_magazine/m545{ pixel_x = 7 }, -/obj/item/weapon/gun/projectile/automatic/sts35{ +/obj/item/gun/projectile/automatic/sts35{ pixel_y = -2 }, -/obj/item/weapon/gun/projectile/automatic/sts35{ +/obj/item/gun/projectile/automatic/sts35{ pixel_y = 2 }, /turf/simulated/floor/tiled/techfloor, @@ -4607,10 +4607,10 @@ "yi" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/projectile/automatic/z8{ +/obj/item/gun/projectile/automatic/z8{ pixel_y = -3 }, -/obj/item/weapon/gun/projectile/automatic/z8{ +/obj/item/gun/projectile/automatic/z8{ pixel_y = 3 }, /obj/item/ammo_magazine/m762, @@ -4629,8 +4629,8 @@ /area/ship/ert/armoury_dl) "yj" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/flashbangs, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/flashbangs, /obj/machinery/light/no_nightshift{ dir = 1 }, @@ -4638,12 +4638,12 @@ pixel_y = 26 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/smokes, -/obj/item/weapon/storage/box/smokes, -/obj/item/weapon/storage/box/teargas, -/obj/item/weapon/storage/box/empslite, -/obj/item/weapon/storage/box/empslite, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/smokes, +/obj/item/storage/box/smokes, +/obj/item/storage/box/teargas, +/obj/item/storage/box/empslite, +/obj/item/storage/box/empslite, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "yl" = ( @@ -4781,24 +4781,24 @@ "yU" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/corner/red, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -4; pixel_y = -4 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -2; pixel_y = -2 }, -/obj/item/device/radio/off, -/obj/item/device/radio/off{ +/obj/item/radio/off, +/obj/item/radio/off{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = 4; pixel_y = 4 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = 6; pixel_y = 6 }, @@ -4922,14 +4922,14 @@ /area/ship/ert/brig) "Ad" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) @@ -4994,31 +4994,31 @@ /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/table/rack/steel, /obj/structure/table/rack/steel, -/obj/item/weapon/storage/belt/utility/chief/full{ +/obj/item/storage/belt/utility/chief/full{ pixel_y = -2 }, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full{ +/obj/item/storage/belt/utility/chief/full, +/obj/item/storage/belt/utility/chief/full{ pixel_y = 2 }, -/obj/item/weapon/storage/belt/utility/chief/full{ +/obj/item/storage/belt/utility/chief/full{ pixel_y = 4 }, -/obj/item/weapon/storage/belt/utility/chief/full{ +/obj/item/storage/belt/utility/chief/full{ pixel_y = 6 }, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/storage/belt/explorer/pathfinder{ +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/storage/belt/explorer/pathfinder{ name = "ERT belt" }, -/obj/item/weapon/storage/belt/explorer/pathfinder{ +/obj/item/storage/belt/explorer/pathfinder{ name = "ERT belt" }, -/obj/item/weapon/storage/belt/explorer/pathfinder{ +/obj/item/storage/belt/explorer/pathfinder{ name = "ERT belt" }, /turf/simulated/floor/tiled/techfloor, @@ -5028,9 +5028,9 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/weapon/implantpad, -/obj/item/weapon/implanter, -/obj/item/weapon/storage/box/admints, +/obj/item/implantpad, +/obj/item/implanter, +/obj/item/storage/box/admints, /obj/structure/table/hardwoodtable, /turf/simulated/floor/wood, /area/ship/ert/commander) @@ -5093,54 +5093,54 @@ /obj/structure/closet{ name = "custodial" }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ pixel_x = -6 }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ pixel_x = -2 }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ pixel_x = 2 }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/glass/bucket{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/glass/bucket{ pixel_x = 2 }, -/obj/item/weapon/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/glass/bucket{ pixel_x = -2 }, -/obj/item/weapon/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/glass/bucket{ pixel_x = -6 }, -/obj/item/weapon/mop{ +/obj/item/mop{ pixel_x = 6 }, -/obj/item/weapon/mop{ +/obj/item/mop{ pixel_x = 2 }, -/obj/item/weapon/mop{ +/obj/item/mop{ pixel_x = -2 }, -/obj/item/weapon/mop{ +/obj/item/mop{ pixel_x = -6 }, -/obj/item/weapon/rig/ert/janitor, -/obj/item/device/lightreplacer{ +/obj/item/rig/ert/janitor, +/obj/item/lightreplacer{ pixel_y = -2 }, -/obj/item/device/lightreplacer{ +/obj/item/lightreplacer{ pixel_y = 2 }, -/obj/item/weapon/storage/box/lights/mixed{ +/obj/item/storage/box/lights/mixed{ pixel_x = -1; pixel_y = -1 }, -/obj/item/weapon/storage/box/lights/mixed{ +/obj/item/storage/box/lights/mixed{ pixel_x = 1; pixel_y = 1 }, @@ -5148,12 +5148,12 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "AT" = ( -/obj/item/device/healthanalyzer/phasic{ +/obj/item/healthanalyzer/phasic{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/healthanalyzer/phasic, -/obj/item/device/healthanalyzer/phasic{ +/obj/item/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic{ pixel_x = -2; pixel_y = -2 }, @@ -5448,7 +5448,7 @@ /obj/machinery/computer/ship/disperser{ dir = 8 }, -/obj/item/weapon/paper/vonbraun_cannon, +/obj/item/paper/vonbraun_cannon, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/gunnery) "CT" = ( @@ -5471,24 +5471,24 @@ /area/ship/ert/gunnery) "Dd" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/tank/jetpack/oxygen{ +/obj/item/tank/jetpack/oxygen{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/tank/jetpack/oxygen{ +/obj/item/tank/jetpack/oxygen{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen{ +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/tank/jetpack/oxygen{ +/obj/item/tank/jetpack/oxygen{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/tank/jetpack/oxygen{ +/obj/item/tank/jetpack/oxygen{ pixel_x = 6; pixel_y = 6 }, @@ -5520,12 +5520,12 @@ /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) @@ -5537,7 +5537,7 @@ /turf/simulated/floor/reinforced/airless, /area/ship/ert/engine) "Dp" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "NRB Robineau"; tele_network = "centcom" }, @@ -5587,16 +5587,16 @@ /area/ship/ert/atmos) "DM" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv{ pixel_x = -2; pixel_y = -2 }, @@ -5655,10 +5655,10 @@ /area/ship/ert/gunnery) "Ee" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/plasmastun{ +/obj/item/gun/energy/plasmastun{ pixel_y = -3 }, -/obj/item/weapon/gun/energy/plasmastun{ +/obj/item/gun/energy/plasmastun{ pixel_y = 3 }, /obj/effect/floor_decal/industrial/outline/grey, @@ -5702,11 +5702,11 @@ /area/ship/ert/engine) "EB" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/sniperrifle{ +/obj/item/gun/energy/sniperrifle{ battery_lock = 0; pixel_y = -3 }, -/obj/item/weapon/gun/energy/sniperrifle{ +/obj/item/gun/energy/sniperrifle{ battery_lock = 0; pixel_y = 3 }, @@ -5753,11 +5753,11 @@ /area/ship/ert/commander) "Fl" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 2; pixel_y = 2 }, @@ -5769,16 +5769,16 @@ /area/ship/ert/hallways) "Fq" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/gun/burst{ +/obj/item/gun/energy/gun/burst{ pixel_y = 3 }, -/obj/item/weapon/gun/energy/gun/burst{ +/obj/item/gun/energy/gun/burst{ pixel_y = -3 }, -/obj/item/weapon/gun/energy/lasershotgun{ +/obj/item/gun/energy/lasershotgun{ pixel_y = -3 }, -/obj/item/weapon/gun/energy/lasershotgun{ +/obj/item/gun/energy/lasershotgun{ pixel_y = 3 }, /obj/effect/floor_decal/industrial/outline/grey, @@ -5845,30 +5845,30 @@ pixel_y = 23 }, /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, -/obj/item/device/holomap_beacon/ert, -/obj/item/device/holomap_beacon/ert, -/obj/item/device/mapping_unit/ert, +/obj/item/flashlight/lamp, +/obj/item/holomap_beacon/ert, +/obj/item/holomap_beacon/ert, +/obj/item/mapping_unit/ert, /turf/simulated/floor/wood, /area/ship/ert/commander) "FP" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, /obj/machinery/cell_charger, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/crowbar, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/tool/screwdriver, +/obj/item/tool/wrench, +/obj/item/tool/crowbar, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "FQ" = ( @@ -5905,10 +5905,10 @@ /obj/item/ammo_magazine/ammo_box/b12g/beanbag, /obj/item/ammo_magazine/ammo_box/b12g/stunshell, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/projectile/shotgun/pump/combat{ +/obj/item/gun/projectile/shotgun/pump/combat{ pixel_y = 3 }, -/obj/item/weapon/gun/projectile/shotgun/pump/combat{ +/obj/item/gun/projectile/shotgun/pump/combat{ pixel_y = -3 }, /turf/simulated/floor/tiled/techfloor, @@ -5918,7 +5918,7 @@ pixel_y = 32 }, /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/structure/curtain/open/bed, /turf/simulated/floor/wood, /area/ship/ert/commander) @@ -6014,48 +6014,48 @@ /obj/structure/closet/crate{ dir = 2 }, -/obj/item/weapon/storage/box/weapon_cells, -/obj/item/weapon/storage/box/weapon_cells, -/obj/item/weapon/storage/box/weapon_cells, -/obj/item/weapon/storage/box/weapon_cells, -/obj/item/weapon/storage/box/weapon_cells, -/obj/item/weapon/storage/box/weapon_cells, -/obj/item/weapon/storage/box/weapon_cells, -/obj/item/weapon/storage/box/weapon_cells, -/obj/item/weapon/storage/box/weapon_cells, -/obj/item/weapon/storage/box/weapon_cells, +/obj/item/storage/box/weapon_cells, +/obj/item/storage/box/weapon_cells, +/obj/item/storage/box/weapon_cells, +/obj/item/storage/box/weapon_cells, +/obj/item/storage/box/weapon_cells, +/obj/item/storage/box/weapon_cells, +/obj/item/storage/box/weapon_cells, +/obj/item/storage/box/weapon_cells, +/obj/item/storage/box/weapon_cells, +/obj/item/storage/box/weapon_cells, /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_st) "GS" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/steel_reinforced, -/obj/item/weapon/rcd_ammo/large{ +/obj/item/rcd_ammo/large{ pixel_x = -8; pixel_y = -8 }, -/obj/item/weapon/rcd_ammo/large{ +/obj/item/rcd_ammo/large{ pixel_x = -6; pixel_y = -6 }, -/obj/item/weapon/rcd_ammo/large{ +/obj/item/rcd_ammo/large{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/rcd_ammo/large{ +/obj/item/rcd_ammo/large{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/rcd_ammo/large, -/obj/item/weapon/rcd_ammo/large{ +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/rcd_ammo/large{ +/obj/item/rcd_ammo/large{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/rcd_ammo/large{ +/obj/item/rcd_ammo/large{ pixel_x = 6; pixel_y = 6 }, @@ -6070,20 +6070,20 @@ "GU" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/energy/pulse_rifle{ +/obj/item/gun/energy/pulse_rifle{ pixel_y = 6 }, -/obj/item/weapon/gun/energy/pulse_rifle{ +/obj/item/gun/energy/pulse_rifle{ pixel_y = 4 }, -/obj/item/weapon/gun/energy/pulse_rifle{ +/obj/item/gun/energy/pulse_rifle{ pixel_y = 2 }, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle{ +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle{ pixel_y = -2 }, -/obj/item/weapon/gun/energy/pulse_rifle{ +/obj/item/gun/energy/pulse_rifle{ pixel_y = -4 }, /turf/simulated/floor/tiled/techfloor, @@ -6138,8 +6138,8 @@ "HB" = ( /obj/structure/closet/wardrobe/ert, /obj/item/modular_computer/tablet/preset/custom_loadout/elite, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, /obj/machinery/light/no_nightshift, /obj/effect/floor_decal/industrial/outline/grey, @@ -6517,10 +6517,10 @@ /obj/item/ammo_magazine/m545{ pixel_x = -8 }, -/obj/item/weapon/gun/projectile/automatic/sts35{ +/obj/item/gun/projectile/automatic/sts35{ pixel_y = -2 }, -/obj/item/weapon/gun/projectile/automatic/sts35{ +/obj/item/gun/projectile/automatic/sts35{ pixel_y = 2 }, /turf/simulated/floor/tiled/techfloor, @@ -6734,21 +6734,21 @@ /obj/machinery/firealarm/alarms_hidden{ pixel_y = 26 }, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_y = 6 }, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_y = 4 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_y = 2 }, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser{ pixel_y = -2 }, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_y = -4 }, /turf/simulated/floor/tiled/techfloor, @@ -6765,13 +6765,13 @@ /area/ship/ert/dock_star) "KW" = ( /obj/structure/table/rack, -/obj/item/weapon/hand_tele, -/obj/item/device/perfect_tele, -/obj/item/device/binoculars, -/obj/item/device/survivalcapsule{ +/obj/item/hand_tele, +/obj/item/perfect_tele, +/obj/item/binoculars, +/obj/item/survivalcapsule{ pixel_x = 3 }, -/obj/item/device/survivalcapsule{ +/obj/item/survivalcapsule{ pixel_x = -3 }, /turf/simulated/floor/wood, @@ -6792,14 +6792,14 @@ pixel_y = -9; req_access = list(103) }, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs/legcuffs, -/obj/item/weapon/handcuffs/legcuffs, -/obj/item/weapon/handcuffs/legcuffs, -/obj/item/weapon/handcuffs/legcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs/legcuffs, +/obj/item/handcuffs/legcuffs, +/obj/item/handcuffs/legcuffs, +/obj/item/handcuffs/legcuffs, /obj/machinery/firealarm/alarms_hidden{ dir = 8; pixel_x = -26; @@ -6834,14 +6834,14 @@ /area/ship/ert/bridge) "Lm" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/ionrifle/pistol{ +/obj/item/gun/energy/ionrifle/pistol{ pixel_y = 4 }, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle{ +/obj/item/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle{ pixel_y = -4 }, -/obj/item/weapon/gun/energy/ionrifle{ +/obj/item/gun/energy/ionrifle{ pixel_y = -8 }, /obj/machinery/power/apc/hyper{ @@ -6875,22 +6875,22 @@ /area/ship/ert/bridge) "LA" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/material/knife/tacknife/combatknife{ +/obj/item/material/knife/tacknife/combatknife{ pixel_x = -7 }, -/obj/item/weapon/material/knife/tacknife/combatknife{ +/obj/item/material/knife/tacknife/combatknife{ pixel_x = -4 }, -/obj/item/weapon/material/knife/tacknife/combatknife{ +/obj/item/material/knife/tacknife/combatknife{ pixel_x = -1 }, -/obj/item/weapon/material/knife/tacknife/combatknife{ +/obj/item/material/knife/tacknife/combatknife{ pixel_x = 2 }, -/obj/item/weapon/material/knife/tacknife/combatknife{ +/obj/item/material/knife/tacknife/combatknife{ pixel_x = 5 }, -/obj/item/weapon/material/knife/tacknife/combatknife{ +/obj/item/material/knife/tacknife/combatknife{ pixel_x = 8 }, /obj/effect/floor_decal/industrial/outline/grey, @@ -6960,7 +6960,7 @@ /obj/structure/table/steel_reinforced, /obj/machinery/chemical_dispenser/biochemistry/full, /obj/machinery/light/no_nightshift, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -7035,24 +7035,24 @@ /area/ship/ert/armoury_st) "Me" = ( /obj/structure/table/rack/steel, -/obj/item/device/flash{ +/obj/item/flash{ pixel_x = -4; pixel_y = -4 }, -/obj/item/device/flash{ +/obj/item/flash{ pixel_x = -2; pixel_y = -2 }, -/obj/item/device/flash, -/obj/item/device/flash{ +/obj/item/flash, +/obj/item/flash{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/flash{ +/obj/item/flash{ pixel_x = 4; pixel_y = 4 }, -/obj/item/device/flash{ +/obj/item/flash{ pixel_x = 6; pixel_y = 6 }, @@ -7091,10 +7091,10 @@ icon_state = "1-2" }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/brig) @@ -7114,20 +7114,20 @@ /area/ship/ert/hangar) "Mt" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/pdw{ +/obj/item/gun/projectile/automatic/pdw{ pixel_y = 6 }, -/obj/item/weapon/gun/projectile/automatic/pdw{ +/obj/item/gun/projectile/automatic/pdw{ pixel_y = 4 }, -/obj/item/weapon/gun/projectile/automatic/pdw{ +/obj/item/gun/projectile/automatic/pdw{ pixel_y = 2 }, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw{ +/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw{ pixel_y = -2 }, -/obj/item/weapon/gun/projectile/automatic/pdw{ +/obj/item/gun/projectile/automatic/pdw{ pixel_y = -4 }, /obj/item/ammo_magazine/m9mml{ @@ -7199,20 +7199,20 @@ "MD" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ +/obj/item/gun/energy/locked/frontier/holdout/unlocked{ pixel_y = 6 }, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ +/obj/item/gun/energy/locked/frontier/holdout/unlocked{ pixel_y = 4 }, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ +/obj/item/gun/energy/locked/frontier/holdout/unlocked{ pixel_y = 2 }, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ +/obj/item/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/gun/energy/locked/frontier/holdout/unlocked{ pixel_y = -2 }, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ +/obj/item/gun/energy/locked/frontier/holdout/unlocked{ pixel_y = -4 }, /turf/simulated/floor/tiled/techfloor, @@ -7278,7 +7278,7 @@ "Nd" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "Nf" = ( @@ -7652,7 +7652,7 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hallways_aft) "OT" = ( -/obj/item/device/multitool/station_buffered, +/obj/item/multitool/station_buffered, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) "OU" = ( @@ -7717,24 +7717,24 @@ /area/ship/ert/brig) "OZ" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/reagent_containers/hypospray{ +/obj/item/reagent_containers/hypospray{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/hypospray{ +/obj/item/reagent_containers/hypospray{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray{ +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray{ pixel_x = -3 }, /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, /obj/effect/floor_decal/industrial/outline, -/obj/item/weapon/reagent_containers/hypospray{ +/obj/item/reagent_containers/hypospray{ pixel_x = -6 }, -/obj/item/weapon/reagent_containers/hypospray{ +/obj/item/reagent_containers/hypospray{ pixel_x = -9 }, /turf/simulated/floor/tiled/techfloor, @@ -7747,16 +7747,16 @@ /obj/item/ammo_magazine/m44{ pixel_x = 3 }, -/obj/item/weapon/gun/projectile/deagle, +/obj/item/gun/projectile/deagle, /turf/simulated/floor/wood, /area/ship/ert/commander) "Pe" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/emps{ +/obj/item/storage/box/emps{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/box/emps{ +/obj/item/storage/box/emps{ pixel_x = 2; pixel_y = 2 }, @@ -7764,12 +7764,12 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Ph" = ( -/obj/item/device/healthanalyzer/phasic{ +/obj/item/healthanalyzer/phasic{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/healthanalyzer/phasic, -/obj/item/device/healthanalyzer/phasic{ +/obj/item/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic{ pixel_x = -2; pixel_y = -2 }, @@ -7878,16 +7878,16 @@ /area/ship/ert/hallways) "PD" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2{ pixel_x = -2; pixel_y = -2 }, @@ -8014,10 +8014,10 @@ /area/ship/ert/hangar) "QT" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, /obj/machinery/power/apc/hyper{ alarms_hidden = 1; dir = 1; @@ -8028,10 +8028,10 @@ icon_state = "0-2" }, /obj/effect/floor_decal/industrial/outline, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "QU" = ( @@ -8402,11 +8402,11 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) "Ti" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /obj/machinery/firealarm/alarms_hidden{ @@ -8422,131 +8422,131 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -12; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -10; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -8; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -6; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -4; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 2; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 6; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 8; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 10; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -12 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -10 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -8 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon{ pixel_x = 2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 8 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 10 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -12; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -10; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -8; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -6; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -4; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 2; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 8; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 10; pixel_y = 6 }, @@ -8659,7 +8659,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "TW" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "NRV Von Braun Teleporter Room"; tele_network = "centcom" }, @@ -8744,20 +8744,20 @@ /area/ship/ert/hallways_aft) "Uy" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_y = 6 }, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_y = 4 }, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_y = 2 }, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun{ pixel_y = -2 }, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_y = -4 }, /obj/effect/floor_decal/industrial/outline/grey, @@ -8859,8 +8859,8 @@ /area/ship/ert/brig) "UY" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert, -/obj/item/weapon/cell/slime, +/obj/item/rig/ert, +/obj/item/cell/slime, /turf/simulated/floor/wood, /area/ship/ert/commander) "Vc" = ( @@ -8990,15 +8990,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, /obj/effect/floor_decal/industrial/outline/red, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_dl) "Wl" = ( @@ -9048,8 +9048,8 @@ "WH" = ( /obj/structure/closet/wardrobe/ert, /obj/item/modular_computer/tablet/preset/custom_loadout/elite, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, /obj/effect/floor_decal/industrial/outline/grey, /obj/item/modular_computer/laptop/preset/custom_loadout/elite, @@ -9233,7 +9233,7 @@ "XQ" = ( /obj/structure/table/steel_reinforced, /obj/machinery/chemical_dispenser/ert, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "XS" = ( @@ -9417,7 +9417,7 @@ /area/ship/ert/med_surg) "YU" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/backpack/ert/commander, +/obj/item/storage/backpack/ert/commander, /obj/item/clothing/suit/space/void/responseteam/command, /obj/item/clothing/head/helmet/ert/command, /obj/item/clothing/suit/armor/vest/ert/command, @@ -9442,14 +9442,14 @@ /area/ship/ert/brig) "YZ" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/machinery/light_switch{ dir = 1; pixel_y = -23 @@ -9475,38 +9475,38 @@ /area/ship/ert/engine) "Zc" = ( /obj/structure/table/standard, -/obj/item/weapon/soap{ +/obj/item/soap{ pixel_x = -6; pixel_y = -6 }, -/obj/item/weapon/soap{ +/obj/item/soap{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/soap{ +/obj/item/soap{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/soap{ +/obj/item/soap{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#0000FF"; pixel_x = -6; pixel_y = -6 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#0000FF"; pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#0000FF"; pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#0000FF"; pixel_x = 6; pixel_y = 6 diff --git a/maps/submaps/admin_use_vr/kk_mercship.dmm b/maps/submaps/admin_use_vr/kk_mercship.dmm index 137664c8208..79a61b4b31e 100644 --- a/maps/submaps/admin_use_vr/kk_mercship.dmm +++ b/maps/submaps/admin_use_vr/kk_mercship.dmm @@ -12,26 +12,26 @@ /obj/effect/landmark{ name = "Syndicate-Uplink" }, -/obj/item/device/mapping_unit/operative, +/obj/item/mapping_unit/operative, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "ad" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/syndie_kit/chameleon, -/obj/item/weapon/storage/box/syndie_kit/chameleon, -/obj/item/weapon/storage/box/syndie_kit/chameleon, -/obj/item/weapon/storage/box/syndie_kit/chameleon, -/obj/item/weapon/storage/box/syndie_kit/chameleon, -/obj/item/weapon/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 }, /obj/effect/floor_decal/techfloor, -/obj/item/device/holomap_beacon/operative, -/obj/item/device/holomap_beacon/operative, -/obj/item/device/holomap_beacon/operative, -/obj/item/device/holomap_beacon/operative, +/obj/item/holomap_beacon/operative, +/obj/item/holomap_beacon/operative, +/obj/item/holomap_beacon/operative, +/obj/item/holomap_beacon/operative, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "ag" = ( @@ -39,38 +39,38 @@ /area/ship/manta/hangar) "aj" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/belt/security{ +/obj/item/storage/belt/security{ name = "black belt" }, -/obj/item/weapon/storage/belt/security{ +/obj/item/storage/belt/security{ name = "black belt" }, -/obj/item/weapon/storage/belt/security{ +/obj/item/storage/belt/security{ name = "black belt" }, -/obj/item/weapon/storage/belt/security{ +/obj/item/storage/belt/security{ name = "black belt" }, -/obj/item/weapon/storage/belt/security{ +/obj/item/storage/belt/security{ name = "black belt" }, -/obj/item/weapon/storage/belt/security{ +/obj/item/storage/belt/security{ name = "black belt" }, -/obj/item/weapon/storage/belt/security{ +/obj/item/storage/belt/security{ name = "black belt" }, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical/bandolier, -/obj/item/weapon/storage/belt/security/tactical/bandolier, -/obj/item/weapon/storage/belt/security/tactical/bandolier, -/obj/item/weapon/storage/belt/security/tactical/bandolier, -/obj/item/weapon/storage/belt/security/tactical/bandolier, -/obj/item/weapon/storage/belt/security/tactical/bandolier, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical/bandolier, +/obj/item/storage/belt/security/tactical/bandolier, +/obj/item/storage/belt/security/tactical/bandolier, +/obj/item/storage/belt/security/tactical/bandolier, +/obj/item/storage/belt/security/tactical/bandolier, +/obj/item/storage/belt/security/tactical/bandolier, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -177,7 +177,7 @@ "aI" = ( /obj/structure/table/steel_reinforced, /obj/item/clothing/gloves/yellow, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -211,131 +211,131 @@ /area/ship/manta/hallways_port) "aS" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -12; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -10; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -8; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -6; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -4; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 2; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 6; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 8; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 10; pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -12 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -10 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -8 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon{ pixel_x = 2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 8 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 10 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -12; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -10; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -8; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -6; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -4; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 2; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 8; pixel_y = 6 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 10; pixel_y = 6 }, @@ -345,7 +345,7 @@ /obj/machinery/shower{ dir = 1 }, -/obj/item/weapon/soap/syndie, +/obj/item/soap/syndie, /obj/structure/window/reinforced/tinted{ dir = 4 }, @@ -359,32 +359,32 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "aY" = ( -/obj/item/weapon/storage/box/syndie_kit/imp_uplink, -/obj/item/weapon/storage/box/syndie_kit/imp_uplink, -/obj/item/weapon/storage/box/syndie_kit/imp_uplink, -/obj/item/weapon/storage/box/syndie_kit/imp_uplink, -/obj/item/weapon/storage/box/syndie_kit/imp_uplink, +/obj/item/storage/box/syndie_kit/imp_uplink, +/obj/item/storage/box/syndie_kit/imp_uplink, +/obj/item/storage/box/syndie_kit/imp_uplink, +/obj/item/storage/box/syndie_kit/imp_uplink, +/obj/item/storage/box/syndie_kit/imp_uplink, /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/weapon/storage/box/syndie_kit/imp_uplink, -/obj/item/weapon/storage/box/syndie_kit/imp_uplink, -/obj/item/weapon/storage/box/syndie_kit/imp_uplink, +/obj/item/storage/box/syndie_kit/imp_uplink, +/obj/item/storage/box/syndie_kit/imp_uplink, +/obj/item/storage/box/syndie_kit/imp_uplink, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "aZ" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/sizegun{ +/obj/item/gun/energy/sizegun{ pixel_y = 6 }, -/obj/item/weapon/gun/energy/sizegun{ +/obj/item/gun/energy/sizegun{ pixel_y = 2 }, -/obj/item/weapon/gun/energy/sizegun{ +/obj/item/gun/energy/sizegun{ pixel_y = -2 }, -/obj/item/weapon/gun/energy/sizegun{ +/obj/item/gun/energy/sizegun{ pixel_y = -6 }, /obj/effect/floor_decal/techfloor{ @@ -429,7 +429,7 @@ /obj/effect/landmark{ name = "Syndicate-Spawn" }, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /obj/machinery/firealarm/alarms_hidden{ dir = 8; pixel_x = -26 @@ -442,7 +442,7 @@ pixel_y = 32 }, /obj/structure/curtain/open/bed, -/obj/item/weapon/bedsheet/pirate, +/obj/item/bedsheet/pirate, /turf/simulated/floor/wood, /area/ship/manta/commander) "bn" = ( @@ -588,19 +588,19 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = -6; pixel_y = -6 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = -2; pixel_y = -2 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 6; pixel_y = 6 }, @@ -657,33 +657,33 @@ /area/ship/manta/hangar) "bY" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/syndie_kit/demolitions_super_heavy{ +/obj/item/storage/box/syndie_kit/demolitions_super_heavy{ name = "Super Heavy Demolitions kit" }, -/obj/item/weapon/storage/box/syndie_kit/demolitions_heavy{ +/obj/item/storage/box/syndie_kit/demolitions_heavy{ name = "Heavy Demolitions kit" }, -/obj/item/weapon/storage/box/syndie_kit/demolitions_heavy{ +/obj/item/storage/box/syndie_kit/demolitions_heavy{ name = "Heavy Demolitions kit" }, -/obj/item/weapon/storage/box/syndie_kit/demolitions{ +/obj/item/storage/box/syndie_kit/demolitions{ name = "Demolitions kit" }, -/obj/item/weapon/storage/box/syndie_kit/demolitions{ +/obj/item/storage/box/syndie_kit/demolitions{ name = "Demolitions kit" }, -/obj/item/weapon/storage/box/syndie_kit/demolitions{ +/obj/item/storage/box/syndie_kit/demolitions{ name = "Demolitions kit" }, -/obj/item/weapon/storage/box/syndie_kit/demolitions{ +/obj/item/storage/box/syndie_kit/demolitions{ name = "Demolitions kit" }, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 @@ -698,19 +698,19 @@ /area/ship/manta/armoury_st) "bZ" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/syndie_kit/spy, -/obj/item/weapon/storage/box/syndie_kit/spy, -/obj/item/weapon/storage/box/syndie_kit/spy, -/obj/item/weapon/storage/box/syndie_kit/spy, -/obj/item/weapon/storage/box/syndie_kit/spy, -/obj/item/device/radio_jammer, -/obj/item/device/radio_jammer, -/obj/item/device/radio_jammer, -/obj/item/device/radio_jammer, -/obj/item/device/radio_jammer, -/obj/item/device/chameleon, -/obj/item/device/chameleon, -/obj/item/device/chameleon, +/obj/item/storage/box/syndie_kit/spy, +/obj/item/storage/box/syndie_kit/spy, +/obj/item/storage/box/syndie_kit/spy, +/obj/item/storage/box/syndie_kit/spy, +/obj/item/storage/box/syndie_kit/spy, +/obj/item/radio_jammer, +/obj/item/radio_jammer, +/obj/item/radio_jammer, +/obj/item/radio_jammer, +/obj/item/radio_jammer, +/obj/item/chameleon, +/obj/item/chameleon, +/obj/item/chameleon, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 @@ -735,22 +735,22 @@ /area/space) "cn" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/material/knife/tacknife/combatknife{ +/obj/item/material/knife/tacknife/combatknife{ pixel_x = -7 }, -/obj/item/weapon/material/knife/tacknife/combatknife{ +/obj/item/material/knife/tacknife/combatknife{ pixel_x = -4 }, -/obj/item/weapon/material/knife/tacknife/combatknife{ +/obj/item/material/knife/tacknife/combatknife{ pixel_x = -1 }, -/obj/item/weapon/material/knife/tacknife/combatknife{ +/obj/item/material/knife/tacknife/combatknife{ pixel_x = 2 }, -/obj/item/weapon/material/knife/tacknife/combatknife{ +/obj/item/material/knife/tacknife/combatknife{ pixel_x = 5 }, -/obj/item/weapon/material/knife/tacknife/combatknife{ +/obj/item/material/knife/tacknife/combatknife{ pixel_x = 8 }, /obj/effect/floor_decal/techfloor, @@ -781,20 +781,20 @@ /area/ship/manta/med) "ct" = ( /obj/structure/table/rack, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -4; pixel_y = -4 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -2; pixel_y = -2 }, -/obj/item/device/radio, -/obj/item/device/radio{ +/obj/item/radio, +/obj/item/radio{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 4; pixel_y = 4 }, @@ -870,20 +870,20 @@ /area/ship/manta/holding) "cP" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/belt/utility/full{ +/obj/item/storage/belt/utility/full{ pixel_y = -4 }, -/obj/item/weapon/storage/belt/utility/full{ +/obj/item/storage/belt/utility/full{ pixel_y = -2 }, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full{ +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full{ pixel_y = 2 }, -/obj/item/weapon/storage/belt/utility/full{ +/obj/item/storage/belt/utility/full{ pixel_y = 4 }, -/obj/item/weapon/storage/belt/utility/full{ +/obj/item/storage/belt/utility/full{ pixel_y = 6 }, /obj/effect/floor_decal/techfloor{ @@ -902,33 +902,33 @@ /area/ship/manta/armoury_st) "cQ" = ( /obj/structure/table/rack, -/obj/item/weapon/tool/crowbar/red{ +/obj/item/tool/crowbar/red{ pixel_x = -4 }, -/obj/item/weapon/tool/crowbar/red{ +/obj/item/tool/crowbar/red{ pixel_x = 2 }, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red{ +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red{ pixel_x = 2 }, -/obj/item/weapon/tool/crowbar/red{ +/obj/item/tool/crowbar/red{ pixel_x = 4 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = 6 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = 4 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = 2 }, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight{ pixel_y = -2 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -4 }, /obj/effect/floor_decal/techfloor{ @@ -1013,7 +1013,7 @@ /obj/effect/landmark{ name = "Syndicate-Spawn" }, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /turf/simulated/floor/wood, /area/ship/manta/barracks/bed_2) "dg" = ( @@ -1197,7 +1197,7 @@ /obj/structure/railing/grey{ dir = 1 }, -/obj/item/weapon/paper/manta_shields, +/obj/item/paper/manta_shields, /turf/simulated/floor/tiled/techmaint, /area/ship/manta/bridge) "dZ" = ( @@ -1237,7 +1237,7 @@ /obj/effect/landmark{ name = "Syndicate-Spawn" }, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /obj/machinery/alarm/alarms_hidden{ dir = 8; pixel_x = 26 @@ -1271,7 +1271,7 @@ /obj/effect/floor_decal/techfloor{ dir = 9 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "er" = ( @@ -1303,7 +1303,7 @@ /obj/machinery/light/no_nightshift{ dir = 1 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "eC" = ( @@ -1316,7 +1316,7 @@ /obj/effect/floor_decal/techfloor{ dir = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /obj/structure/cable/orange{ icon_state = "1-2" }, @@ -1338,7 +1338,7 @@ /area/ship/manta/hallways_port) "eJ" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/merc/empty, +/obj/item/rig/merc/empty, /obj/effect/floor_decal/techfloor{ dir = 9 }, @@ -1349,9 +1349,9 @@ /area/ship/manta/armoury_st) "eN" = ( /obj/structure/table/rack, -/obj/item/weapon/hand_tele, -/obj/item/device/perfect_tele, -/obj/item/device/binoculars, +/obj/item/hand_tele, +/obj/item/perfect_tele, +/obj/item/binoculars, /turf/simulated/floor/wood, /area/ship/manta/commander) "eO" = ( @@ -1363,7 +1363,7 @@ /area/ship/manta/barracks) "eR" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/merc/empty, +/obj/item/rig/merc/empty, /obj/effect/floor_decal/techfloor{ dir = 5 }, @@ -1484,7 +1484,7 @@ /obj/structure/railing/grey{ dir = 4 }, -/obj/item/weapon/paper/manta_approach_tactics, +/obj/item/paper/manta_approach_tactics, /turf/simulated/floor/tiled/techmaint, /area/ship/manta/bridge) "fI" = ( @@ -1498,7 +1498,7 @@ /area/ship/manta/hangar) "fK" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/revolver/consul, +/obj/item/gun/projectile/revolver/consul, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, @@ -1536,8 +1536,8 @@ /area/ship/manta/engine) "fP" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/storage/box/syringes, +/obj/item/reagent_containers/hypospray, +/obj/item/storage/box/syringes, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -1564,14 +1564,14 @@ /area/ship/manta/med) "fV" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -1590,16 +1590,16 @@ /area/ship/manta/barracks) "gd" = ( /obj/structure/table/standard, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, /obj/effect/floor_decal/techfloor, /obj/machinery/light/no_nightshift, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "ge" = ( @@ -1644,8 +1644,8 @@ "gu" = ( /obj/effect/floor_decal/techfloor, /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/device/multitool, +/obj/item/storage/belt/utility/full, +/obj/item/multitool, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "gB" = ( @@ -1890,9 +1890,9 @@ /area/ship/manta/bridge) "hz" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/trackimp, -/obj/item/weapon/storage/box/cdeathalarm_kit, -/obj/item/weapon/stamp/chameleon, +/obj/item/storage/box/trackimp, +/obj/item/storage/box/cdeathalarm_kit, +/obj/item/stamp/chameleon, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/ship/manta/commander) @@ -1958,10 +1958,10 @@ /area/ship/manta/hallways_aft) "hU" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/c20r{ +/obj/item/gun/projectile/automatic/c20r{ pixel_y = 4 }, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, @@ -1972,7 +1972,7 @@ /obj/machinery/light/no_nightshift{ dir = 8 }, -/obj/item/weapon/gun/projectile/automatic/c20r{ +/obj/item/gun/projectile/automatic/c20r{ pixel_y = -4 }, /obj/item/ammo_magazine/m10mm, @@ -2021,8 +2021,8 @@ /area/ship/manta/armoury_st) "ih" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/silenced, -/obj/item/weapon/gun/projectile/silenced, +/obj/item/gun/projectile/silenced, +/obj/item/gun/projectile/silenced, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45/ap, @@ -2031,18 +2031,18 @@ /obj/effect/floor_decal/techfloor{ dir = 5 }, -/obj/item/weapon/gun/projectile/sec/wood{ +/obj/item/gun/projectile/sec/wood{ pixel_y = 4 }, -/obj/item/weapon/gun/projectile/sec/wood{ +/obj/item/gun/projectile/sec/wood{ pixel_y = -4 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "ik" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/device/multitool, +/obj/item/storage/belt/utility/full, +/obj/item/multitool, /obj/effect/floor_decal/techfloor{ dir = 10 }, @@ -2063,25 +2063,25 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/device/assembly/signaler{ +/obj/item/assembly/signaler{ pixel_y = 2 }, -/obj/item/device/assembly/signaler{ +/obj/item/assembly/signaler{ pixel_y = 2 }, -/obj/item/device/assembly/signaler{ +/obj/item/assembly/signaler{ pixel_y = 2 }, /obj/item/clothing/gloves/yellow, @@ -2095,10 +2095,10 @@ /area/ship/manta/recreation) "ip" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/effect/floor_decal/techfloor{ dir = 9 }, @@ -2154,12 +2154,12 @@ /obj/effect/floor_decal/techfloor{ dir = 5 }, -/obj/item/weapon/reagent_containers/food/snacks/meat/chicken, -/obj/item/weapon/reagent_containers/food/snacks/meat/chicken, -/obj/item/weapon/reagent_containers/food/snacks/meat/chicken, -/obj/item/weapon/reagent_containers/food/snacks/meat/chicken, -/obj/item/weapon/reagent_containers/food/snacks/meat/chicken, -/obj/item/weapon/reagent_containers/food/snacks/meat/chicken, +/obj/item/reagent_containers/food/snacks/meat/chicken, +/obj/item/reagent_containers/food/snacks/meat/chicken, +/obj/item/reagent_containers/food/snacks/meat/chicken, +/obj/item/reagent_containers/food/snacks/meat/chicken, +/obj/item/reagent_containers/food/snacks/meat/chicken, +/obj/item/reagent_containers/food/snacks/meat/chicken, /turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "iB" = ( @@ -2258,7 +2258,7 @@ /area/ship/manta/barracks) "iU" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/oxygen/red, +/obj/item/tank/oxygen/red, /obj/item/clothing/suit/space/void/merc, /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/head/helmet/space/void/merc, @@ -2374,23 +2374,23 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/manta_ship_boat) "jo" = ( -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/smokes, -/obj/item/weapon/storage/box/frags, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/smokes, +/obj/item/storage/box/frags, /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/weapon/storage/box/smokes, -/obj/item/weapon/storage/box/smokes, +/obj/item/storage/box/smokes, +/obj/item/storage/box/smokes, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "js" = ( -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /obj/effect/spawner/newbomb/timer/syndicate, /obj/structure/table/reinforced, /obj/effect/floor_decal/techfloor{ @@ -2607,11 +2607,11 @@ /area/ship/manta/recreation) "kF" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /obj/item/stack/nanopaste/advanced, -/obj/item/weapon/surgical/bone_clamp, -/obj/item/weapon/surgical/scalpel/manager, -/obj/item/weapon/surgical/circular_saw/manager, +/obj/item/surgical/bone_clamp, +/obj/item/surgical/scalpel/manager, +/obj/item/surgical/circular_saw/manager, /obj/effect/floor_decal/techfloor{ dir = 5 }, @@ -2755,10 +2755,10 @@ /area/ship/manta/hallways_aft) "lj" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/c20r{ +/obj/item/gun/projectile/automatic/c20r{ pixel_y = 4 }, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, @@ -2766,7 +2766,7 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/weapon/gun/projectile/automatic/c20r{ +/obj/item/gun/projectile/automatic/c20r{ pixel_y = -4 }, /obj/item/ammo_magazine/m10mm, @@ -2787,10 +2787,10 @@ dir = 4 }, /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/sts35{ +/obj/item/gun/projectile/automatic/sts35{ pixel_y = -3 }, -/obj/item/weapon/gun/projectile/automatic/sts35{ +/obj/item/gun/projectile/automatic/sts35{ pixel_y = 3 }, /obj/item/ammo_magazine/m545, @@ -2820,10 +2820,10 @@ /area/ship/manta/engine) "lz" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -2891,21 +2891,21 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "lO" = ( -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /obj/effect/floor_decal/techfloor, /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "lP" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/oxygen/red, +/obj/item/tank/oxygen/red, /obj/item/clothing/suit/space/void/merc, /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/head/helmet/space/void/merc, @@ -2938,7 +2938,7 @@ /obj/effect/landmark{ name = "Syndicate-Spawn" }, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /obj/machinery/power/apc/hyper{ alarms_hidden = 1; dir = 4; @@ -2966,7 +2966,7 @@ /area/shuttle/manta_ship_boat) "lY" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /obj/structure/cable/orange{ icon_state = "1-2" }, @@ -2995,7 +2995,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/item/weapon/paper/manta_cannon_usage, +/obj/item/paper/manta_cannon_usage, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/gunnery) "me" = ( @@ -3068,10 +3068,10 @@ /area/ship/manta/hangar) "mC" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/defib_kit, -/obj/item/device/defib_kit, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, +/obj/item/defib_kit, +/obj/item/defib_kit, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -3248,10 +3248,10 @@ /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/device/defib_kit/compact/combat/loaded, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/firstaid/combat, +/obj/item/defib_kit/compact/combat/loaded, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -3511,10 +3511,10 @@ /area/ship/manta/mech_bay) "oD" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_y = 3 }, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_y = -3 }, /obj/effect/floor_decal/techfloor{ @@ -3527,10 +3527,10 @@ dir = 4 }, /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/sts35{ +/obj/item/gun/projectile/automatic/sts35{ pixel_y = 3 }, -/obj/item/weapon/gun/projectile/automatic/sts35{ +/obj/item/gun/projectile/automatic/sts35{ pixel_y = -3 }, /obj/item/ammo_magazine/m545, @@ -3555,8 +3555,8 @@ /area/space) "oO" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/silenced, -/obj/item/weapon/gun/projectile/silenced, +/obj/item/gun/projectile/silenced, +/obj/item/gun/projectile/silenced, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45/ap, @@ -3569,10 +3569,10 @@ dir = 8; pixel_x = 26 }, -/obj/item/weapon/gun/projectile/sec/wood{ +/obj/item/gun/projectile/sec/wood{ pixel_y = 4 }, -/obj/item/weapon/gun/projectile/sec/wood{ +/obj/item/gun/projectile/sec/wood{ pixel_y = -4 }, /turf/simulated/floor/tiled/techfloor, @@ -3588,11 +3588,11 @@ /area/ship/manta/armoury_st) "oS" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/food/drinks/bottle/vodka{ pixel_x = 3; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine{ +/obj/item/reagent_containers/food/drinks/bottle/wine{ pixel_x = -1; pixel_y = 8 }, @@ -4362,11 +4362,11 @@ /area/ship/manta/gunnery) "tk" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/reagent_containers/food/snacks/sandwich, -/obj/item/weapon/reagent_containers/food/snacks/sandwich, -/obj/item/weapon/reagent_containers/food/snacks/sandwich, -/obj/item/weapon/reagent_containers/food/snacks/sandwich, -/obj/item/weapon/reagent_containers/food/snacks/sandwich, +/obj/item/reagent_containers/food/snacks/sandwich, +/obj/item/reagent_containers/food/snacks/sandwich, +/obj/item/reagent_containers/food/snacks/sandwich, +/obj/item/reagent_containers/food/snacks/sandwich, +/obj/item/reagent_containers/food/snacks/sandwich, /turf/simulated/floor/wood, /area/ship/manta/barracks) "tm" = ( @@ -4449,7 +4449,7 @@ /area/ship/manta/armoury_st) "tJ" = ( /obj/structure/closet/wardrobe/merc, -/obj/item/weapon/storage/box/syndie_kit/combat_armor, +/obj/item/storage/box/syndie_kit/combat_armor, /turf/simulated/floor/wood, /area/ship/manta/barracks) "tK" = ( @@ -4636,7 +4636,7 @@ /area/ship/manta/hangar) "uH" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/light_switch{ pixel_y = 23 }, @@ -5148,19 +5148,19 @@ /area/ship/manta/engineering) "ww" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/firstaid/combat{ +/obj/item/storage/firstaid/combat{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat{ +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/combat{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/hypospray{ +/obj/item/reagent_containers/hypospray{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/hypospray{ +/obj/item/reagent_containers/hypospray{ pixel_x = -3 }, /obj/effect/floor_decal/techfloor{ @@ -5912,7 +5912,7 @@ /area/ship/manta/mech_bay) "zv" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/plasmastun, +/obj/item/gun/energy/plasmastun, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -5920,13 +5920,13 @@ dir = 4; pixel_x = -23 }, -/obj/item/weapon/gun/energy/netgun{ +/obj/item/gun/energy/netgun{ pixel_y = -3 }, -/obj/item/weapon/gun/energy/netgun{ +/obj/item/gun/energy/netgun{ pixel_y = 3 }, -/obj/item/weapon/gun/energy/plasmastun, +/obj/item/gun/energy/plasmastun, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "zw" = ( @@ -5940,14 +5940,14 @@ /area/ship/manta/recreation) "zx" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -5955,35 +5955,35 @@ /area/ship/manta/armoury_st) "zy" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/jetpack/oxygen{ +/obj/item/tank/jetpack/oxygen{ pixel_x = -6; pixel_y = -6 }, -/obj/item/weapon/tank/jetpack/oxygen{ +/obj/item/tank/jetpack/oxygen{ pixel_x = 6; pixel_y = -6 }, -/obj/item/weapon/tank/jetpack/oxygen{ +/obj/item/tank/jetpack/oxygen{ pixel_x = -6; pixel_y = -2 }, -/obj/item/weapon/tank/jetpack/oxygen{ +/obj/item/tank/jetpack/oxygen{ pixel_x = 6; pixel_y = -2 }, -/obj/item/weapon/tank/jetpack/oxygen{ +/obj/item/tank/jetpack/oxygen{ pixel_x = -6; pixel_y = 2 }, -/obj/item/weapon/tank/jetpack/oxygen{ +/obj/item/tank/jetpack/oxygen{ pixel_x = 6; pixel_y = 2 }, -/obj/item/weapon/tank/jetpack/oxygen{ +/obj/item/tank/jetpack/oxygen{ pixel_x = -6; pixel_y = 6 }, -/obj/item/weapon/tank/jetpack/oxygen{ +/obj/item/tank/jetpack/oxygen{ pixel_x = 6; pixel_y = 6 }, @@ -6019,7 +6019,7 @@ /area/ship/manta/hallways_port) "zH" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/oxygen/red, +/obj/item/tank/oxygen/red, /obj/item/clothing/suit/space/void/merc, /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/head/helmet/space/void/merc, @@ -6507,8 +6507,8 @@ /area/ship/manta/barracks) "Cz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/device/multitool, +/obj/item/storage/belt/utility/full, +/obj/item/multitool, /obj/machinery/alarm/alarms_hidden{ dir = 8; pixel_x = 26 @@ -6545,17 +6545,17 @@ /obj/machinery/light/no_nightshift{ dir = 4 }, -/obj/item/weapon/storage/box/syndie_kit/combat_armor, +/obj/item/storage/box/syndie_kit/combat_armor, /turf/simulated/floor/wood, /area/ship/manta/barracks) "CQ" = ( /obj/structure/table/standard, -/obj/item/device/pda/syndicate, -/obj/item/device/pda/syndicate, -/obj/item/device/pda/syndicate, -/obj/item/device/pda/syndicate, -/obj/item/device/pda/syndicate, -/obj/item/device/pda/syndicate, +/obj/item/pda/syndicate, +/obj/item/pda/syndicate, +/obj/item/pda/syndicate, +/obj/item/pda/syndicate, +/obj/item/pda/syndicate, +/obj/item/pda/syndicate, /obj/effect/floor_decal/techfloor{ dir = 10 }, @@ -6563,10 +6563,10 @@ /area/ship/manta/recreation) "CT" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/plasmastun{ +/obj/item/gun/energy/plasmastun{ pixel_y = -3 }, -/obj/item/weapon/gun/energy/plasmastun{ +/obj/item/gun/energy/plasmastun{ pixel_y = 3 }, /obj/effect/floor_decal/techfloor{ @@ -6590,14 +6590,14 @@ /area/ship/manta/atmos) "Db" = ( /obj/structure/table/standard, -/obj/item/device/radio/headset/syndicate, -/obj/item/device/radio/headset/syndicate, -/obj/item/device/radio/headset/syndicate, -/obj/item/device/radio/headset/syndicate, -/obj/item/device/radio/headset/syndicate/alt, -/obj/item/device/radio/headset/syndicate/alt, -/obj/item/device/radio/headset/syndicate/alt, -/obj/item/device/radio/headset/syndicate/alt, +/obj/item/radio/headset/syndicate, +/obj/item/radio/headset/syndicate, +/obj/item/radio/headset/syndicate, +/obj/item/radio/headset/syndicate, +/obj/item/radio/headset/syndicate/alt, +/obj/item/radio/headset/syndicate/alt, +/obj/item/radio/headset/syndicate/alt, +/obj/item/radio/headset/syndicate/alt, /obj/effect/floor_decal/techfloor{ dir = 10 }, @@ -6629,7 +6629,7 @@ /obj/effect/landmark{ name = "Syndicate-Spawn" }, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /turf/simulated/floor/wood, /area/ship/manta/barracks/bed_1) "Df" = ( @@ -6640,11 +6640,11 @@ /area/ship/manta/dock_port) "Dg" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/frags{ +/obj/item/storage/box/frags{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/box/frags{ +/obj/item/storage/box/frags{ pixel_x = 2; pixel_y = 2 }, @@ -6711,7 +6711,7 @@ "Dq" = ( /obj/structure/table/rack, /obj/item/ammo_magazine/ammo_box/b145, -/obj/item/weapon/gun/projectile/heavysniper, +/obj/item/gun/projectile/heavysniper, /obj/effect/floor_decal/techfloor{ dir = 5 }, @@ -6728,10 +6728,10 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "Dw" = ( @@ -6778,14 +6778,14 @@ /area/ship/manta/armoury_st) "Dz" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -6797,11 +6797,11 @@ /area/ship/manta/armoury_st) "DB" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/syndie_kit/ewar_voice, -/obj/item/weapon/storage/box/syndie_kit/ewar_voice, -/obj/item/weapon/storage/box/syndie_kit/ewar_voice, -/obj/item/weapon/storage/box/syndie_kit/ewar_voice, -/obj/item/weapon/card/emag, +/obj/item/storage/box/syndie_kit/ewar_voice, +/obj/item/storage/box/syndie_kit/ewar_voice, +/obj/item/storage/box/syndie_kit/ewar_voice, +/obj/item/storage/box/syndie_kit/ewar_voice, +/obj/item/card/emag, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -6995,35 +6995,35 @@ /area/ship/manta/hallways_aft) "EE" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med{ +/obj/item/storage/backpack/dufflebag/syndie/med{ pixel_x = -4; pixel_y = -6 }, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med{ +/obj/item/storage/backpack/dufflebag/syndie/med{ pixel_x = 4; pixel_y = -6 }, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo{ +/obj/item/storage/backpack/dufflebag/syndie/ammo{ pixel_x = 4; pixel_y = -2 }, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo{ +/obj/item/storage/backpack/dufflebag/syndie/ammo{ pixel_x = -4; pixel_y = -2 }, -/obj/item/weapon/storage/backpack/dufflebag/syndie{ +/obj/item/storage/backpack/dufflebag/syndie{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/storage/backpack/dufflebag/syndie{ +/obj/item/storage/backpack/dufflebag/syndie{ pixel_x = -4; pixel_y = 2 }, -/obj/item/weapon/storage/backpack/dufflebag/syndie{ +/obj/item/storage/backpack/dufflebag/syndie{ pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/backpack/dufflebag/syndie{ +/obj/item/storage/backpack/dufflebag/syndie{ pixel_x = -4; pixel_y = 6 }, @@ -7165,7 +7165,7 @@ /area/ship/manta/barracks) "Fx" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/rocket, +/obj/item/gun/launcher/rocket, /obj/item/ammo_casing/rocket{ pixel_y = -3 }, @@ -7284,7 +7284,7 @@ /area/ship/manta/engine) "Gd" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/glasses/square{ +/obj/item/storage/box/glasses/square{ pixel_x = 1; pixel_y = 4 }, @@ -7300,7 +7300,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/item/weapon/paper/manta_new_personnel_brief, +/obj/item/paper/manta_new_personnel_brief, /turf/simulated/floor/wood, /area/ship/manta/barracks) "Gk" = ( @@ -7311,11 +7311,11 @@ /area/ship/manta/engineering) "Gl" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /obj/machinery/light/no_nightshift{ @@ -7470,14 +7470,14 @@ /turf/simulated/floor/plating, /area/ship/manta/engine) "Hm" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, -/obj/item/weapon/folder{ +/obj/item/folder{ pixel_y = 2 }, /obj/structure/table/woodentable, @@ -7542,7 +7542,7 @@ /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, -/obj/item/weapon/gun/projectile/revolver/consul, +/obj/item/gun/projectile/revolver/consul, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -7554,25 +7554,25 @@ /area/ship/manta/bridge) "HS" = ( /obj/structure/table/rack, -/obj/item/weapon/pinpointer/nukeop{ +/obj/item/pinpointer/nukeop{ pixel_x = -6; pixel_y = -4 }, -/obj/item/weapon/pinpointer/nukeop{ +/obj/item/pinpointer/nukeop{ pixel_x = 6; pixel_y = -4 }, -/obj/item/weapon/pinpointer/nukeop{ +/obj/item/pinpointer/nukeop{ pixel_x = -6 }, -/obj/item/weapon/pinpointer/nukeop{ +/obj/item/pinpointer/nukeop{ pixel_x = 6 }, -/obj/item/weapon/pinpointer/nukeop{ +/obj/item/pinpointer/nukeop{ pixel_x = -6; pixel_y = 4 }, -/obj/item/weapon/pinpointer/nukeop{ +/obj/item/pinpointer/nukeop{ pixel_x = 6; pixel_y = 4 }, @@ -7664,10 +7664,10 @@ /area/ship/manta/teleporter) "Iq" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/xray{ +/obj/item/gun/energy/xray{ pixel_y = 3 }, -/obj/item/weapon/gun/energy/xray{ +/obj/item/gun/energy/xray{ pixel_y = -3 }, /obj/effect/floor_decal/techfloor{ @@ -7728,10 +7728,10 @@ /area/ship/manta/engine) "IJ" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_y = 3 }, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_y = -3 }, /obj/effect/floor_decal/techfloor{ @@ -7778,8 +7778,8 @@ /area/ship/manta/commander) "Jb" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle/pistol, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -7789,7 +7789,7 @@ /obj/machinery/vending/cigarette{ name = "Breach Corp cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /obj/effect/floor_decal/techfloor{ dir = 1 @@ -8233,7 +8233,7 @@ /area/ship/manta/engineering) "Lb" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tray{ +/obj/item/tray{ pixel_y = 5 }, /obj/effect/floor_decal/techfloor{ @@ -8710,10 +8710,10 @@ /obj/structure/table/rack, /obj/item/ammo_magazine/ammo_box/b12g/pellet, /obj/item/ammo_magazine/ammo_box/b12g, -/obj/item/weapon/gun/projectile/shotgun/pump/combat{ +/obj/item/gun/projectile/shotgun/pump/combat{ pixel_y = 4 }, -/obj/item/weapon/gun/projectile/shotgun/pump/combat{ +/obj/item/gun/projectile/shotgun/pump/combat{ pixel_y = -4 }, /obj/effect/floor_decal/techfloor{ @@ -8763,10 +8763,10 @@ /area/ship/manta/barracks) "Nq" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/sniperrifle{ +/obj/item/gun/energy/sniperrifle{ pixel_y = 3 }, -/obj/item/weapon/gun/energy/sniperrifle{ +/obj/item/gun/energy/sniperrifle{ pixel_y = -3 }, /obj/effect/floor_decal/techfloor{ @@ -8807,10 +8807,10 @@ /area/ship/manta/dock_port) "Ny" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_y = 3 }, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_y = -3 }, /obj/effect/floor_decal/techfloor{ @@ -8837,8 +8837,8 @@ /area/ship/manta/armoury_st) "NE" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle/pistol, /obj/effect/floor_decal/techfloor{ dir = 6 }, @@ -8944,7 +8944,7 @@ /obj/machinery/shower{ dir = 1 }, -/obj/item/weapon/soap/syndie, +/obj/item/soap/syndie, /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled/freezer, /area/ship/manta/barracks) @@ -8957,7 +8957,7 @@ /area/ship/manta/engine) "On" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/oxygen/red, +/obj/item/tank/oxygen/red, /obj/item/clothing/suit/space/void/merc, /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/head/helmet/space/void/merc, @@ -8990,18 +8990,18 @@ dir = 8 }, /obj/structure/table/rack, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "Ov" = ( @@ -9148,7 +9148,7 @@ /area/ship/manta/hallways_star) "Pa" = ( /obj/structure/table/woodentable, -/obj/item/device/aicard, +/obj/item/aicard, /obj/machinery/light_switch{ dir = 1; pixel_y = -23 @@ -9527,10 +9527,10 @@ /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm, -/obj/item/weapon/gun/projectile/luger{ +/obj/item/gun/projectile/luger{ pixel_y = 6 }, -/obj/item/weapon/gun/projectile/luger/brown{ +/obj/item/gun/projectile/luger/brown{ pixel_y = -6 }, /obj/effect/floor_decal/techfloor{ @@ -9609,16 +9609,16 @@ /area/ship/manta/holding) "RM" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/lasercannon{ +/obj/item/gun/energy/lasercannon{ pixel_y = 3 }, -/obj/item/weapon/gun/energy/lasercannon{ +/obj/item/gun/energy/lasercannon{ pixel_y = -3 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -9912,7 +9912,7 @@ /obj/effect/landmark{ name = "Syndicate-Spawn" }, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /obj/machinery/firealarm/alarms_hidden{ dir = 8; pixel_x = -26 @@ -9924,7 +9924,7 @@ /obj/effect/landmark{ name = "Syndicate-Spawn" }, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /obj/machinery/power/apc/hyper{ alarms_hidden = 1; dir = 4; @@ -9938,32 +9938,32 @@ /turf/simulated/floor/wood, /area/ship/manta/barracks/bed_1) "Ta" = ( -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, @@ -9975,7 +9975,7 @@ dir = 8; name = "Breach Corp cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/simulated/floor/wood, /area/ship/manta/barracks) @@ -9998,10 +9998,10 @@ }, /obj/item/clothing/gloves/knuckledusters, /obj/item/clothing/gloves/knuckledusters, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/laser_pointer/upgraded, -/obj/item/device/laser_pointer/upgraded, +/obj/item/flash, +/obj/item/flash, +/obj/item/laser_pointer/upgraded, +/obj/item/laser_pointer/upgraded, /obj/effect/floor_decal/techfloor{ dir = 9 }, @@ -10013,20 +10013,20 @@ /area/ship/manta/holding) "Tk" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/sinpockets, +/obj/item/storage/box/sinpockets, /turf/simulated/floor/wood, /area/ship/manta/barracks) "Tl" = ( -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, /obj/structure/table/reinforced, /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "Tn" = ( @@ -10080,14 +10080,14 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "Tw" = ( -/obj/item/weapon/handcuffs/legcuffs, -/obj/item/weapon/handcuffs/legcuffs, -/obj/item/weapon/handcuffs/legcuffs, -/obj/item/weapon/handcuffs/legcuffs, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs/legcuffs, +/obj/item/handcuffs/legcuffs, +/obj/item/handcuffs/legcuffs, +/obj/item/handcuffs/legcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -10112,7 +10112,7 @@ /obj/effect/landmark{ name = "Syndicate-Spawn" }, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /obj/machinery/alarm/alarms_hidden{ dir = 8; pixel_x = 26 @@ -10148,25 +10148,25 @@ /area/ship/manta/hallways_port) "TM" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/syndicate{ +/obj/item/storage/toolbox/syndicate{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/storage/toolbox/syndicate{ +/obj/item/storage/toolbox/syndicate{ pixel_x = 4; pixel_y = -4 }, -/obj/item/weapon/storage/toolbox/syndicate{ +/obj/item/storage/toolbox/syndicate{ pixel_x = -4 }, -/obj/item/weapon/storage/toolbox/syndicate{ +/obj/item/storage/toolbox/syndicate{ pixel_x = 4 }, -/obj/item/weapon/storage/toolbox/syndicate{ +/obj/item/storage/toolbox/syndicate{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/storage/toolbox/syndicate{ +/obj/item/storage/toolbox/syndicate{ pixel_x = 4; pixel_y = 4 }, @@ -10220,8 +10220,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "TY" = ( -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, /obj/effect/floor_decal/rust, /obj/effect/floor_decal/techfloor{ dir = 1 @@ -10264,7 +10264,7 @@ dir = 4; pixel_x = -23 }, -/obj/item/weapon/paper/manta_prisoners, +/obj/item/paper/manta_prisoners, /obj/machinery/recharger/wallcharger{ pixel_y = -27 }, @@ -10276,19 +10276,19 @@ /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Uy" = ( -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = 9 }, -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = -1 }, -/obj/item/weapon/material/knife/tacknife/combatknife{ +/obj/item/material/knife/tacknife/combatknife{ pixel_x = -7 }, /obj/effect/floor_decal/techfloor{ @@ -10301,9 +10301,9 @@ /obj/structure/closet{ name = "custodial" }, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/spray/cleaner, /obj/effect/floor_decal/techfloor{ dir = 5 }, @@ -10456,10 +10456,10 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/weapon/gun/energy/darkmatter{ +/obj/item/gun/energy/darkmatter{ pixel_y = 3 }, -/obj/item/weapon/gun/energy/darkmatter{ +/obj/item/gun/energy/darkmatter{ pixel_y = -3 }, /turf/simulated/floor/tiled/techfloor, @@ -10481,16 +10481,16 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/item/weapon/gun/projectile/automatic/bullpup{ +/obj/item/gun/projectile/automatic/bullpup{ pixel_y = 6 }, -/obj/item/weapon/gun/projectile/automatic/bullpup{ +/obj/item/gun/projectile/automatic/bullpup{ pixel_y = 2 }, -/obj/item/weapon/gun/projectile/automatic/bullpup{ +/obj/item/gun/projectile/automatic/bullpup{ pixel_y = -2 }, -/obj/item/weapon/gun/projectile/automatic/bullpup{ +/obj/item/gun/projectile/automatic/bullpup{ pixel_y = -6 }, /obj/item/ammo_magazine/m762/ext, @@ -10532,20 +10532,20 @@ /area/ship/manta/engineering) "VA" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/emergency/oxygen/double{ +/obj/item/tank/emergency/oxygen/double{ pixel_x = 6 }, -/obj/item/weapon/tank/emergency/oxygen/double{ +/obj/item/tank/emergency/oxygen/double{ pixel_x = 4 }, -/obj/item/weapon/tank/emergency/oxygen/double{ +/obj/item/tank/emergency/oxygen/double{ pixel_x = 2 }, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double{ +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double{ pixel_x = -2 }, -/obj/item/weapon/tank/emergency/oxygen/double{ +/obj/item/tank/emergency/oxygen/double{ pixel_x = -4 }, /obj/effect/floor_decal/techfloor{ @@ -10570,40 +10570,40 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/manta/bridge) "VF" = ( -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy{ +/obj/item/shield/energy, +/obj/item/shield/energy{ pixel_x = -8; pixel_y = 8 }, -/obj/item/weapon/shield/energy{ +/obj/item/shield/energy{ pixel_x = -8 }, -/obj/item/weapon/shield/energy{ +/obj/item/shield/energy{ pixel_y = 8 }, -/obj/item/weapon/shield/energy{ +/obj/item/shield/energy{ pixel_x = 8 }, -/obj/item/weapon/shield/energy{ +/obj/item/shield/energy{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/melee/energy/sword/red{ +/obj/item/melee/energy/sword/red{ pixel_x = 18 }, -/obj/item/weapon/melee/energy/sword/red{ +/obj/item/melee/energy/sword/red{ pixel_x = 15 }, -/obj/item/weapon/melee/energy/sword/red{ +/obj/item/melee/energy/sword/red{ pixel_x = 12 }, -/obj/item/weapon/melee/energy/sword/red{ +/obj/item/melee/energy/sword/red{ pixel_x = 9 }, -/obj/item/weapon/melee/energy/sword/red{ +/obj/item/melee/energy/sword/red{ pixel_x = 6 }, -/obj/item/weapon/melee/energy/sword/red{ +/obj/item/melee/energy/sword/red{ pixel_x = 3 }, /obj/structure/table/steel_reinforced, @@ -10622,14 +10622,14 @@ /area/ship/manta/atmos) "VL" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/clotting, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/clotting, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/fire, /obj/effect/floor_decal/borderfloorblack/corner2{ dir = 5 }, @@ -10642,7 +10642,7 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "VM" = ( @@ -10954,11 +10954,11 @@ /obj/machinery/light/no_nightshift{ dir = 4 }, -/obj/item/weapon/storage/box/flare{ +/obj/item/storage/box/flare{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/box/flare{ +/obj/item/storage/box/flare{ pixel_x = 2; pixel_y = 2 }, @@ -11490,14 +11490,14 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, /turf/simulated/floor/wood, /area/ship/manta/barracks) "ZW" = ( diff --git a/maps/submaps/admin_use_vr/lucky_7.dmm b/maps/submaps/admin_use_vr/lucky_7.dmm index fd147816e44..cd398712583 100644 --- a/maps/submaps/admin_use_vr/lucky_7.dmm +++ b/maps/submaps/admin_use_vr/lucky_7.dmm @@ -116,7 +116,7 @@ /turf/simulated/floor/carpet/retro, /area/submap/casino_event) "ax" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /turf/simulated/floor/carpet/retro, @@ -174,7 +174,7 @@ /area/submap/casino_event) "aH" = ( /obj/structure/table/gamblingtable, -/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, /obj/machinery/light, /turf/simulated/floor/carpet/retro, /area/submap/casino_event) @@ -353,14 +353,14 @@ name = "Game Cabinet"; pixel_x = -28 }, -/obj/item/weapon/book/manual/wizzoffguide, -/obj/item/weapon/deck/wizoff, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/storage/dicecup, +/obj/item/book/manual/wizzoffguide, +/obj/item/deck/wizoff, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice, +/obj/item/deck/cards/casino, +/obj/item/deck/cah, +/obj/item/deck/cah/black, +/obj/item/storage/dicecup, /turf/simulated/floor/carpet/purple, /area/submap/casino_event) "bk" = ( @@ -382,14 +382,14 @@ name = "Game Cabinet"; pixel_x = -28 }, -/obj/item/weapon/book/manual/wizzoffguide, -/obj/item/weapon/deck/wizoff, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/storage/dicecup, +/obj/item/book/manual/wizzoffguide, +/obj/item/deck/wizoff, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice, +/obj/item/deck/cards/casino, +/obj/item/deck/cah, +/obj/item/deck/cah/black, +/obj/item/storage/dicecup, /turf/simulated/floor/carpet/green, /area/submap/casino_event) "bn" = ( @@ -411,14 +411,14 @@ name = "Game Cabinet"; pixel_x = -28 }, -/obj/item/weapon/book/manual/wizzoffguide, -/obj/item/weapon/deck/wizoff, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/storage/dicecup, +/obj/item/book/manual/wizzoffguide, +/obj/item/deck/wizoff, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice, +/obj/item/deck/cards/casino, +/obj/item/deck/cah, +/obj/item/deck/cah/black, +/obj/item/storage/dicecup, /turf/simulated/floor/carpet/blue2, /area/submap/casino_event) "bq" = ( @@ -454,7 +454,7 @@ /turf/simulated/floor/plating, /area/submap/casino_event) "bv" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /turf/simulated/floor/carpet/brown, @@ -572,8 +572,8 @@ /area/submap/casino_event) "bS" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/manual/casino, -/obj/item/weapon/pen, +/obj/item/book/manual/casino, +/obj/item/pen, /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "bT" = ( @@ -600,7 +600,7 @@ "bW" = ( /obj/structure/table/woodentable, /obj/item/trash/asian_bowl, -/obj/item/weapon/material/kitchen/utensil/fork/plastic, +/obj/item/material/kitchen/utensil/fork/plastic, /obj/machinery/light{ dir = 8 }, @@ -834,7 +834,7 @@ /obj/structure/table/steel, /obj/effect/floor_decal/rust, /obj/effect/decal/cleanable/blood/oil, -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/plating, /area/submap/casino_event) "cF" = ( @@ -876,7 +876,7 @@ dir = 1 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "cJ" = ( @@ -917,12 +917,12 @@ /area/submap/casino_event) "cN" = ( /obj/structure/table/rack/shelf, -/obj/item/device/slow_sizegun, -/obj/item/device/slow_sizegun, -/obj/item/device/slow_sizegun, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, +/obj/item/slow_sizegun, +/obj/item/slow_sizegun, +/obj/item/slow_sizegun, +/obj/item/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "cO" = ( @@ -941,7 +941,7 @@ "cQ" = ( /obj/effect/floor_decal/spline/plain, /obj/structure/table/woodentable, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /turf/simulated/floor/carpet/turcarpet, /area/submap/casino_event) "cR" = ( @@ -971,34 +971,34 @@ /area/submap/casino_event) "cV" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/box/roulette_balls_cheat, -/obj/item/weapon/storage/box/roulette_balls_cheat, +/obj/item/storage/box/roulette_balls_cheat, +/obj/item/storage/box/roulette_balls_cheat, /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "cW" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "cX" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/deck/schnapsen, -/obj/item/weapon/deck/wizoff, -/obj/item/weapon/deck/tarot, -/obj/item/weapon/deck/egy, +/obj/item/deck/cah, +/obj/item/deck/cah, +/obj/item/deck/cah/black, +/obj/item/deck/schnapsen, +/obj/item/deck/wizoff, +/obj/item/deck/tarot, +/obj/item/deck/egy, /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "cY" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced, -/obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced, -/obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced, +/obj/item/gun/energy/mouseray/metamorphosis/advanced, +/obj/item/gun/energy/mouseray/metamorphosis/advanced, +/obj/item/gun/energy/mouseray/metamorphosis/advanced, /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "cZ" = ( @@ -1016,29 +1016,29 @@ /area/submap/casino_event) "db" = ( /obj/structure/table/steel, -/obj/item/weapon/spacecasinocash/c1000{ +/obj/item/spacecasinocash/c1000{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000{ +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, /turf/simulated/floor/tiled/techfloor, /area/submap/casino_event) "dc" = ( @@ -1049,15 +1049,15 @@ /area/submap/casino_event) "dd" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/spacecash/c1000{ +/obj/item/spacecash/c1000{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/spacecash/c1000{ +/obj/item/spacecash/c1000{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/spacecash/c1000, +/obj/item/spacecash/c1000, /turf/simulated/floor/tiled/techfloor, /area/submap/casino_event) "de" = ( @@ -1066,7 +1066,7 @@ /obj/random/junk, /obj/random/maintenance, /obj/random/maintenance/engineering, -/obj/item/device/flashlight/color, +/obj/item/flashlight/color, /obj/structure/railing{ dir = 4 }, @@ -1074,19 +1074,19 @@ /area/submap/casino_event) "df" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, -/obj/item/weapon/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, +/obj/item/spacecasinocash/c1000, /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "dg" = ( /obj/structure/table/rack/shelf, -/obj/item/device/bodysnatcher, -/obj/item/device/bodysnatcher, -/obj/item/device/sleevemate, -/obj/item/device/sleevemate, +/obj/item/bodysnatcher, +/obj/item/bodysnatcher, +/obj/item/sleevemate, +/obj/item/sleevemate, /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "dh" = ( @@ -1121,25 +1121,25 @@ /area/submap/casino_event) "dm" = ( /obj/structure/casino_table/craps, -/obj/item/weapon/dice{ +/obj/item/dice{ pixel_x = 4; pixel_y = 6 }, /obj/machinery/light/floortube{ dir = 8 }, -/obj/item/weapon/dice{ +/obj/item/dice{ pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/dicecup, +/obj/item/storage/dicecup, /turf/simulated/floor/carpet/brown, /area/submap/casino_event) "dn" = ( /obj/structure/casino_table/craps{ dir = 1 }, -/obj/item/weapon/dice{ +/obj/item/dice{ pixel_x = 4; pixel_y = 6 }, @@ -1330,16 +1330,16 @@ /area/submap/casino_event) "dK" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/box/roulette_balls_fancy, -/obj/item/weapon/storage/box/roulette_balls_fancy, -/obj/item/weapon/storage/box/roulette_balls_fancy, +/obj/item/storage/box/roulette_balls_fancy, +/obj/item/storage/box/roulette_balls_fancy, +/obj/item/storage/box/roulette_balls_fancy, /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "dL" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "dM" = ( @@ -1349,7 +1349,7 @@ /area/submap/casino_event) "dN" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/kitchen/utensil/fork/plastic, +/obj/item/material/kitchen/utensil/fork/plastic, /turf/simulated/floor/carpet/brown, /area/submap/casino_event) "dO" = ( @@ -1365,7 +1365,7 @@ /turf/simulated/floor/carpet/brown, /area/submap/casino_event) "dQ" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/carpet/brown, @@ -1403,7 +1403,7 @@ /area/submap/casino_event) "dY" = ( /obj/structure/casino_table/craps, -/obj/item/weapon/dice{ +/obj/item/dice{ pixel_x = 4; pixel_y = 6 }, @@ -1413,11 +1413,11 @@ /obj/structure/casino_table/craps{ dir = 1 }, -/obj/item/weapon/dice{ +/obj/item/dice{ pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/dice{ +/obj/item/dice{ pixel_x = 4; pixel_y = 6 }, @@ -1425,7 +1425,7 @@ /area/submap/casino_event) "ea" = ( /obj/structure/casino_table/craps, -/obj/item/weapon/dice{ +/obj/item/dice{ pixel_x = 4; pixel_y = 6 }, @@ -1435,11 +1435,11 @@ /obj/structure/casino_table/craps{ dir = 1 }, -/obj/item/weapon/dice{ +/obj/item/dice{ pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/dice{ +/obj/item/dice{ pixel_x = 4; pixel_y = 6 }, @@ -1451,7 +1451,7 @@ pixel_y = 8 }, /obj/random/cash/huge, -/obj/item/weapon/bikehorn{ +/obj/item/bikehorn{ pixel_x = -7; pixel_y = 7 }, @@ -1459,9 +1459,9 @@ /area/submap/casino_event) "ed" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "ee" = ( @@ -1472,7 +1472,7 @@ /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "ef" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/carpet/brown, @@ -1481,7 +1481,7 @@ /obj/structure/casino_table/blackjack_m{ dir = 4 }, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /obj/machinery/light/floortube{ dir = 8 }, @@ -1548,24 +1548,24 @@ /area/submap/casino_event) "en" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/box/roulette_balls_normal, -/obj/item/weapon/storage/box/roulette_balls_normal, +/obj/item/storage/box/roulette_balls_normal, +/obj/item/storage/box/roulette_balls_normal, /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "eo" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/storage/dicecup, +/obj/item/storage/dicecup, +/obj/item/storage/dicecup, +/obj/item/storage/dicecup, /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "ep" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, -/obj/item/weapon/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c1000, /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "eq" = ( @@ -1585,17 +1585,17 @@ name = "Game Cabinet"; pixel_x = -28 }, -/obj/item/weapon/storage/box/roulette_balls_normal, -/obj/item/weapon/storage/box/roulette_balls_fancy, -/obj/item/weapon/storage/box/roulette_balls_cheat, +/obj/item/storage/box/roulette_balls_normal, +/obj/item/storage/box/roulette_balls_fancy, +/obj/item/storage/box/roulette_balls_cheat, /turf/simulated/floor/carpet/green, /area/submap/casino_event) "et" = ( /obj/structure/casino_table/craps{ dir = 1 }, -/obj/item/weapon/dice, -/obj/item/weapon/dice{ +/obj/item/dice, +/obj/item/dice{ pixel_x = 4; pixel_y = 6 }, @@ -1747,12 +1747,12 @@ /area/submap/casino_event) "eK" = ( /obj/structure/table/reinforced, -/obj/item/device/radio/headset/casino, -/obj/item/device/radio/headset/casino, -/obj/item/device/radio/headset/casino, -/obj/item/device/radio/headset/casino, -/obj/item/device/radio/headset/casino/bowman, -/obj/item/device/radio/headset/casino/bowman, +/obj/item/radio/headset/casino, +/obj/item/radio/headset/casino, +/obj/item/radio/headset/casino, +/obj/item/radio/headset/casino, +/obj/item/radio/headset/casino/bowman, +/obj/item/radio/headset/casino/bowman, /turf/simulated/floor/tiled, /area/submap/casino_event) "eL" = ( @@ -1760,11 +1760,11 @@ /obj/machinery/vending/wallmed1/public{ pixel_y = -32 }, -/obj/item/weapon/backup_implanter, -/obj/item/weapon/backup_implanter, -/obj/item/weapon/backup_implanter, -/obj/item/weapon/backup_implanter, -/obj/item/weapon/backup_implanter, +/obj/item/backup_implanter, +/obj/item/backup_implanter, +/obj/item/backup_implanter, +/obj/item/backup_implanter, +/obj/item/backup_implanter, /turf/simulated/floor/tiled/white, /area/submap/casino_event) "eM" = ( @@ -1783,11 +1783,11 @@ /obj/structure/casino_table/craps{ dir = 1 }, -/obj/item/weapon/dice{ +/obj/item/dice{ pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/dice{ +/obj/item/dice{ pixel_x = 4; pixel_y = 6 }, @@ -1825,9 +1825,9 @@ pixel_y = 28 }, /obj/structure/table/rack, -/obj/item/weapon/spacecasinocash/c500, -/obj/item/weapon/spacecasinocash/c500, -/obj/item/weapon/spacecasinocash/c500, +/obj/item/spacecasinocash/c500, +/obj/item/spacecasinocash/c500, +/obj/item/spacecasinocash/c500, /turf/simulated/floor/tiled, /area/submap/casino_event) "eT" = ( @@ -1869,8 +1869,8 @@ /area/submap/casino_event) "eW" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/device/radio, +/obj/item/storage/firstaid/regular, +/obj/item/radio, /turf/simulated/floor/tiled, /area/submap/casino_event) "eX" = ( @@ -1978,11 +1978,11 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/weapon/handcuffs{ +/obj/item/handcuffs{ pixel_y = -5 }, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs{ +/obj/item/handcuffs, +/obj/item/handcuffs{ pixel_y = 5 }, /turf/simulated/floor/tiled, @@ -1994,7 +1994,7 @@ /obj/machinery/light/floortube{ dir = 8 }, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/carpet/brown, /area/submap/casino_event) "fk" = ( @@ -2025,9 +2025,9 @@ name = "Game Cabinet"; pixel_x = -28 }, -/obj/item/weapon/storage/box/roulette_balls_normal, -/obj/item/weapon/storage/box/roulette_balls_fancy, -/obj/item/weapon/storage/box/roulette_balls_cheat, +/obj/item/storage/box/roulette_balls_normal, +/obj/item/storage/box/roulette_balls_fancy, +/obj/item/storage/box/roulette_balls_cheat, /turf/simulated/floor/carpet/purple, /area/submap/casino_event) "fo" = ( @@ -2058,9 +2058,9 @@ name = "Game Cabinet"; pixel_x = -28 }, -/obj/item/weapon/storage/box/roulette_balls_normal, -/obj/item/weapon/storage/box/roulette_balls_fancy, -/obj/item/weapon/storage/box/roulette_balls_cheat, +/obj/item/storage/box/roulette_balls_normal, +/obj/item/storage/box/roulette_balls_fancy, +/obj/item/storage/box/roulette_balls_cheat, /turf/simulated/floor/carpet/blue2, /area/submap/casino_event) "fs" = ( @@ -2091,18 +2091,18 @@ name = "Game Cabinet"; pixel_x = -28 }, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/dicecup, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/dicecup, /turf/simulated/floor/carpet/sblucarpet, /area/submap/casino_event) "fw" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/reddouble, +/obj/item/bedsheet/reddouble, /turf/simulated/floor/wood, /area/submap/casino_event) "fx" = ( -/obj/item/weapon/stool/baystool/padded, +/obj/item/stool/baystool/padded, /turf/simulated/floor/carpet/blue2, /area/submap/casino_event) "fy" = ( @@ -2129,8 +2129,8 @@ /area/submap/casino_event) "fA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs, /obj/item/ammo_casing/spent, /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -2158,12 +2158,12 @@ /turf/simulated/floor/tiled, /area/submap/casino_event) "fC" = ( -/obj/item/weapon/gun/projectile/shotgun/pump{ +/obj/item/gun/projectile/shotgun/pump{ ammo_type = /obj/item/ammo_casing/a12g/pellet; pixel_x = 1; pixel_y = 4 }, -/obj/item/weapon/gun/projectile/shotgun/pump{ +/obj/item/gun/projectile/shotgun/pump{ ammo_type = /obj/item/ammo_casing/a12g/pellet; pixel_x = 2; pixel_y = -6 @@ -2219,15 +2219,15 @@ /area/submap/casino_event) "fG" = ( /obj/structure/table/rack/shelf, -/obj/item/device/radio/headset/casino, -/obj/item/device/radio/headset/casino, -/obj/item/device/radio/headset/casino, -/obj/item/device/radio/headset/casino, -/obj/item/device/radio/headset/casino, -/obj/item/device/radio/headset/casino, -/obj/item/device/radio/headset/casino/bowman, -/obj/item/device/radio/headset/casino/bowman, -/obj/item/device/radio/headset/casino/bowman, +/obj/item/radio/headset/casino, +/obj/item/radio/headset/casino, +/obj/item/radio/headset/casino, +/obj/item/radio/headset/casino, +/obj/item/radio/headset/casino, +/obj/item/radio/headset/casino, +/obj/item/radio/headset/casino/bowman, +/obj/item/radio/headset/casino/bowman, +/obj/item/radio/headset/casino/bowman, /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "fH" = ( @@ -2246,7 +2246,7 @@ /turf/simulated/floor/carpet/brown, /area/submap/casino_event) "fK" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/carpet/bcarpet, /area/submap/casino_event) "fL" = ( @@ -2254,7 +2254,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/submap/casino_event) "fM" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/carpet/gaycarpet, /area/submap/casino_event) "fN" = ( @@ -2262,7 +2262,7 @@ /turf/simulated/floor/carpet/gaycarpet, /area/submap/casino_event) "fO" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/submap/casino_event) "fP" = ( @@ -2284,7 +2284,7 @@ /obj/machinery/door/window/brigdoor/eastleft{ dir = 2 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -2311,7 +2311,7 @@ "fU" = ( /obj/structure/table/woodentable, /obj/item/trash/plate, -/obj/item/weapon/material/kitchen/utensil/fork/plastic, +/obj/item/material/kitchen/utensil/fork/plastic, /turf/simulated/floor/carpet/brown, /area/submap/casino_event) "fV" = ( @@ -2321,7 +2321,7 @@ /obj/machinery/light/floortube{ dir = 4 }, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/carpet/brown, /area/submap/casino_event) "fW" = ( @@ -2337,7 +2337,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/submap/casino_event) "fY" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/carpet/blue2, @@ -2399,7 +2399,7 @@ /obj/machinery/light/floortube{ dir = 1 }, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/carpet/blue2, /area/submap/casino_event) "gj" = ( @@ -2511,11 +2511,11 @@ /area/submap/casino_event) "gv" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/fancy/cigar/havana{ +/obj/item/storage/fancy/cigar/havana{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/storage/fancy/cigar{ +/obj/item/storage/fancy/cigar{ pixel_x = 2; pixel_y = 3 }, @@ -2539,19 +2539,19 @@ /turf/simulated/floor/carpet/brown, /area/submap/casino_event) "gy" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /turf/simulated/floor/carpet/bcarpet, /area/submap/casino_event) "gz" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /turf/simulated/floor/carpet/gaycarpet, /area/submap/casino_event) "gA" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /turf/simulated/floor/carpet/turcarpet, @@ -2563,7 +2563,7 @@ /turf/simulated/floor/wood, /area/submap/casino_event) "gC" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/carpet/brown, /area/submap/casino_event) "gD" = ( @@ -2604,7 +2604,7 @@ /obj/machinery/light/floortube{ dir = 1 }, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/carpet/brown, /area/submap/casino_event) "gK" = ( @@ -2616,7 +2616,7 @@ /turf/simulated/floor/wood, /area/submap/casino_event) "gM" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/carpet/brown, @@ -2634,7 +2634,7 @@ /area/submap/casino_event) "gP" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /turf/simulated/floor/wood, /area/submap/casino_event) "gQ" = ( @@ -2643,7 +2643,7 @@ /area/submap/casino_event) "gR" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /turf/simulated/floor/wood, /area/submap/casino_event) "gS" = ( @@ -2729,8 +2729,8 @@ /area/submap/casino_event) "hd" = ( /obj/structure/table/standard, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled, /area/submap/casino_event) "he" = ( @@ -2912,7 +2912,7 @@ /area/submap/casino_event) "hx" = ( /obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood, /area/submap/casino_event) "hy" = ( @@ -2984,7 +2984,7 @@ /area/submap/casino_event) "hG" = ( /obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/weapon/storage/pill_bottle/happy, +/obj/item/storage/pill_bottle/happy, /obj/item/clothing/under/bathrobe, /obj/item/clothing/under/bathrobe, /turf/simulated/floor/wood, @@ -3017,7 +3017,7 @@ /turf/simulated/floor/wood, /area/submap/casino_event) "hM" = ( -/obj/item/weapon/flame/candle/candelabra/everburn, +/obj/item/flame/candle/candelabra/everburn, /obj/structure/table/fancyblack, /turf/simulated/floor/wood, /area/submap/casino_event) @@ -3028,7 +3028,7 @@ /area/submap/casino_event) "hO" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/captaindouble, +/obj/item/bedsheet/captaindouble, /obj/structure/curtain/open/bed, /turf/simulated/floor/carpet/purcarpet, /area/submap/casino_event) @@ -3040,27 +3040,27 @@ /area/submap/casino_event) "hQ" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/yellowdouble, +/obj/item/bedsheet/yellowdouble, /turf/simulated/floor/wood, /area/submap/casino_event) "hR" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, +/obj/item/bedsheet/purpledouble, /turf/simulated/floor/wood, /area/submap/casino_event) "hS" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/orangedouble, +/obj/item/bedsheet/orangedouble, /turf/simulated/floor/wood, /area/submap/casino_event) "hT" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/greendouble, +/obj/item/bedsheet/greendouble, /turf/simulated/floor/wood, /area/submap/casino_event) "hU" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/wood, /area/submap/casino_event) "hV" = ( @@ -3077,10 +3077,10 @@ /area/submap/casino_event) "hX" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/deck/cards, -/obj/item/weapon/deck/cards, -/obj/item/weapon/deck/cards, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, +/obj/item/deck/cards, +/obj/item/deck/cards, +/obj/item/deck/cards, /turf/simulated/floor/tiled/dark, /area/submap/casino_event) "hY" = ( @@ -3127,7 +3127,7 @@ /turf/simulated/floor/water/pool, /area/submap/casino_event) "if" = ( -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/simulated/floor/water/pool, /area/submap/casino_event) "ig" = ( @@ -3160,7 +3160,7 @@ "ij" = ( /obj/structure/table/glass, /obj/random/soap, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /obj/machinery/light{ dir = 8 }, @@ -3210,19 +3210,19 @@ /turf/simulated/floor/wood, /area/submap/casino_event) "is" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/carpet/blue2, /area/submap/casino_event) "it" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/carpet/blue2, /area/submap/casino_event) "iu" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/carpet/blue2, /area/submap/casino_event) "iv" = ( @@ -3238,11 +3238,11 @@ /obj/machinery/light/floortube{ dir = 4 }, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/carpet/blue2, /area/submap/casino_event) "ix" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 8 }, /turf/simulated/floor/carpet/blue2, @@ -3263,7 +3263,7 @@ /obj/structure/casino_table/blackjack_m{ dir = 1 }, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/carpet/blue2, /area/submap/casino_event) "iB" = ( @@ -3273,19 +3273,19 @@ /turf/simulated/floor/carpet/blue2, /area/submap/casino_event) "iC" = ( -/obj/item/weapon/stool/baystool/padded{ +/obj/item/stool/baystool/padded{ dir = 1 }, /turf/simulated/floor/carpet/blue2, /area/submap/casino_event) "iD" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood, /area/submap/casino_event) "iE" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /turf/simulated/floor/wood, /area/submap/casino_event) "iF" = ( @@ -3317,9 +3317,9 @@ name = "Game Cabinet"; pixel_x = -28 }, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/dicecup, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/dicecup, /turf/simulated/floor/carpet/purcarpet, /area/submap/casino_event) "iJ" = ( @@ -3340,11 +3340,11 @@ /obj/machinery/light/floortube{ dir = 8 }, -/obj/item/weapon/dice{ +/obj/item/dice{ pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/dicecup, +/obj/item/storage/dicecup, /turf/simulated/floor/carpet/brown, /area/submap/casino_event) "iN" = ( @@ -3366,21 +3366,21 @@ /obj/structure/casino_table/blackjack_m{ dir = 1 }, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/carpet/bcarpet, /area/submap/casino_event) "iQ" = ( /obj/structure/casino_table/blackjack_m{ dir = 1 }, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/carpet/gaycarpet, /area/submap/casino_event) "iR" = ( /obj/structure/casino_table/blackjack_m{ dir = 1 }, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/carpet/turcarpet, /area/submap/casino_event) "iS" = ( @@ -3443,8 +3443,8 @@ name = "Game Cabinet"; pixel_x = -28 }, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards/casino, +/obj/item/deck/cards, /turf/simulated/floor/carpet/bcarpet, /area/submap/casino_event) "jb" = ( @@ -3453,8 +3453,8 @@ name = "Game Cabinet"; pixel_x = -28 }, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards/casino, +/obj/item/deck/cards, /turf/simulated/floor/carpet/gaycarpet, /area/submap/casino_event) "jc" = ( @@ -3463,8 +3463,8 @@ name = "Game Cabinet"; pixel_x = -28 }, -/obj/item/weapon/deck/cards/casino, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards/casino, +/obj/item/deck/cards, /turf/simulated/floor/carpet/turcarpet, /area/submap/casino_event) "jd" = ( diff --git a/maps/submaps/admin_use_vr/mercship.dm b/maps/submaps/admin_use_vr/mercship.dm index 7d94300073c..fd4fbc2ebec 100644 --- a/maps/submaps/admin_use_vr/mercship.dm +++ b/maps/submaps/admin_use_vr/mercship.dm @@ -220,7 +220,7 @@ on_store_visible_message_2 = "into cryogenic storage." //Misc Stuff -/obj/item/weapon/paper/manta_shields +/obj/item/paper/manta_shields name = "Shield Setup" info = {"To All Personnel,
\ The cruiser's shield generator is intended to keep asteroids and pesky railgun rounds off our ass, so make sure you use it if we get into a scuffle.
\ @@ -237,7 +237,7 @@ The shield generator's a hungry beast and will drain the cruiser's reserves fair
\ Capt. Thorne"} -/obj/item/weapon/paper/manta_new_personnel_brief +/obj/item/paper/manta_new_personnel_brief name = "Fresh Personnel Primer" info = {"To All New Personnel,
\ Welcome to your new home, the SAARE Typhon Four-Niner. This Manta-class Cruiser is equipped with everything you should ever need to conduct operations against any target we may encounter during our contracts. If you're reading this, you're probably in the Barracks right now; at the outer edge of the starboard wing are the Holding Cells. To the fore of the barracks is the Medbay, pray you don't end up there.
\ @@ -252,7 +252,7 @@ You don't want to know how long it's going to take to pay off.
\
P.S. If you need to refuel the lander for some reason, there's a spare fuel canister in that closet space in the port fore wing edge, opposite the assault armory."} -/obj/item/weapon/paper/manta_approach_tactics +/obj/item/paper/manta_approach_tactics name = "Installation Approach" info = {"To All Personnel,
\ Word of advice: this ship isn't exactly sneaky, despite our best efforts. If we pull up around a major site they're going to notice. Now sure we have the whole transponder thing that should throw them off for a bit, but sooner or later they're gonna catch on, especially if you go in loud. Fortunately for you all, our handy-dandy little landing craft is stealthy, and can get you aboard most ships, stations, or outposts without too much fuss. Better yet it's an all-passive system, so you don't even need to turn it on or worry about some idiot accidentally turning it off.
\ @@ -261,7 +261,7 @@ We've also been supplied with a few packs of 'liberated' SAARE gear for use as d
\ Capt. Thorne"} -/obj/item/weapon/paper/manta_prisoners +/obj/item/paper/manta_prisoners name = "Prisoner Management" info = {"To All Personnel,
\ I don't care if they're 'not being cooperative', for the love of fuck if another high-value prisoner 'disappears' under your watch you are fucking next, do I make myself clear? I don't care if it's some schmuck we picked up during a raid who happened to be in the wrong place at the wrong time, but if it's someone we're trying to extract information from or ransom or whatever then they better not vanish.
\ @@ -270,7 +270,7 @@ I don't care if they're 'not being cooperative', for the love of fuck if another
\ P.S. If you gotta cut 'em up or whatever try not to make too much of a mess, and clean up when you're done. Don't trail blood all over my damn ship, and don't get them killed by infections either."} -/obj/item/weapon/paper/manta_cannon_usage +/obj/item/paper/manta_cannon_usage name = "Cannon Operation Instructions" info = {"To All Personnel,
\ Heads up people, we've got a new toy.
\ @@ -292,7 +292,7 @@ In the meantime, happy hunting. Go bag me some carp. The mech bay can be found i /obj/machinery/computer/cryopod/merc name = "mercenary oversight console" desc = "An interface between mercenaries and the cryo oversight systems tasked with keeping track of all mercenaries who enter or exit cryostasis." - circuit = "/obj/item/weapon/circuitboard/robotstoragecontrol" + circuit = "/obj/item/circuitboard/robotstoragecontrol" storage_type = "mercenaries" storage_name = "Merc Oversight Control" diff --git a/maps/submaps/admin_use_vr/salamander_trader.dmm b/maps/submaps/admin_use_vr/salamander_trader.dmm index a038d2afee8..77184af9984 100644 --- a/maps/submaps/admin_use_vr/salamander_trader.dmm +++ b/maps/submaps/admin_use_vr/salamander_trader.dmm @@ -377,8 +377,8 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_trader) "fZ" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /obj/structure/handrail, @@ -847,14 +847,14 @@ /obj/structure/railing/grey{ dir = 8 }, -/obj/item/weapon/tank/phoron/pressurized, -/obj/item/weapon/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, +/obj/item/tank/phoron/pressurized, /obj/structure/closet/walllocker{ dir = 1; name = "Spare Fuel"; pixel_y = -32 }, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /obj/item/stack/material/tritium{ amount = 25 }, @@ -1003,8 +1003,8 @@ /area/shuttle/salamander_trader) "oi" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/random/snack, /obj/random/snack, /obj/random/snack, @@ -1030,7 +1030,7 @@ /area/shuttle/salamander_trader_cockpit) "oF" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/light_switch{ dir = 4; pixel_x = 22 @@ -1501,8 +1501,8 @@ /turf/simulated/floor/plating, /area/shuttle/salamander_trader_cockpit) "IL" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /obj/structure/handrail{ @@ -1612,7 +1612,7 @@ /area/shuttle/salamander_trader_galley) "Ns" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/light_switch{ dir = 4; pixel_x = 22 @@ -1726,7 +1726,7 @@ /area/shuttle/salamander_trader) "RO" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/alarm/alarms_hidden{ dir = 8; pixel_x = 26 @@ -1789,8 +1789,8 @@ /turf/simulated/wall/shull, /area/shuttle/salamander_trader_head) "Tl" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /obj/structure/railing/grey{ @@ -1910,8 +1910,8 @@ /turf/simulated/floor/plating, /area/shuttle/salamander_trader) "Xc" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/air, +/obj/item/suit_cooling_unit, +/obj/item/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, /obj/structure/railing/grey{ @@ -1975,7 +1975,7 @@ /area/shuttle/salamander_trader_engineering) "Xu" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/machinery/alarm/alarms_hidden{ dir = 8; pixel_x = 26 diff --git a/maps/submaps/admin_use_vr/skipjack.dmm b/maps/submaps/admin_use_vr/skipjack.dmm index 2e12a90bc45..e79272d1daf 100644 --- a/maps/submaps/admin_use_vr/skipjack.dmm +++ b/maps/submaps/admin_use_vr/skipjack.dmm @@ -43,7 +43,7 @@ }, /area/skipjack_station) "ai" = ( -/obj/item/weapon/ore, +/obj/item/ore, /turf/unsimulated/floor{ icon_state = "steel" }, @@ -75,7 +75,7 @@ /area/skipjack_station) "an" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/glasses/square{ +/obj/item/storage/box/glasses/square{ pixel_x = 1; pixel_y = 4 }, @@ -84,11 +84,11 @@ }, /area/skipjack_station) "ao" = ( -/obj/item/weapon/tray{ +/obj/item/tray{ pixel_y = 5 }, /obj/structure/table/standard, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/unsimulated/floor{ icon_state = "white" }, @@ -116,7 +116,7 @@ }, /area/skipjack_station) "as" = ( -/obj/item/weapon/ore, +/obj/item/ore, /obj/structure/reagent_dispensers/beerkeg, /turf/unsimulated/floor{ icon_state = "white" @@ -133,7 +133,7 @@ }, /area/skipjack_station) "au" = ( -/obj/item/weapon/ore, +/obj/item/ore, /turf/unsimulated/floor{ icon_state = "plating"; name = "plating" @@ -143,7 +143,7 @@ /obj/structure/urinal{ pixel_y = 32 }, -/obj/item/weapon/soap/syndie, +/obj/item/soap/syndie, /turf/unsimulated/floor{ icon_state = "freezerfloor"; dir = 2 @@ -175,7 +175,7 @@ }, /area/skipjack_station) "az" = ( -/obj/item/weapon/gun/energy/sonic, +/obj/item/gun/energy/sonic, /turf/unsimulated/floor{ icon_state = "plating"; name = "plating" @@ -227,7 +227,7 @@ }, /area/skipjack_station) "aD" = ( -/obj/item/weapon/gun/launcher/spikethrower, +/obj/item/gun/launcher/spikethrower, /turf/unsimulated/floor{ icon_state = "plating"; name = "plating" @@ -300,8 +300,8 @@ /area/skipjack_station) "aM" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/darkmatter, -/obj/item/weapon/gun/energy/darkmatter, +/obj/item/gun/energy/darkmatter, +/obj/item/gun/energy/darkmatter, /turf/unsimulated/floor{ icon_state = "plating"; name = "plating" @@ -309,7 +309,7 @@ /area/skipjack_station) "aN" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/wood.dmi'; icon_state = "wood_broken1" @@ -323,14 +323,14 @@ /area/skipjack_station) "aP" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/unsimulated/floor{ icon_state = "wood" }, /area/skipjack_station) "aQ" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -386,14 +386,14 @@ }, /area/skipjack_station) "aW" = ( -/obj/item/weapon/gun/energy/plasmastun, +/obj/item/gun/energy/plasmastun, /turf/unsimulated/floor{ icon_state = "plating"; name = "plating" }, /area/skipjack_station) "aX" = ( -/obj/item/weapon/gun/launcher/crossbow, +/obj/item/gun/launcher/crossbow, /turf/unsimulated/floor{ icon_state = "plating"; name = "plating" @@ -518,7 +518,7 @@ }, /area/skipjack_station) "bn" = ( -/obj/item/weapon/ore, +/obj/item/ore, /turf/unsimulated/floor{ name = "plating"; icon_state = "asteroid_dug" @@ -573,34 +573,34 @@ /area/skipjack_station) "bt" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/spikethrower, +/obj/item/gun/launcher/spikethrower, /turf/unsimulated/floor{ icon_state = "asteroid" }, /area/skipjack_station) "bu" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/unsimulated/floor{ icon_state = "wood" }, /area/skipjack_station) "bv" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/unsimulated/floor{ icon_state = "wood" }, /area/skipjack_station) "bw" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hop, +/obj/item/bedsheet/hop, /turf/unsimulated/floor{ icon_state = "wood" }, /area/skipjack_station) "bx" = ( -/obj/item/weapon/ore, +/obj/item/ore, /turf/unsimulated/floor{ icon_state = "asteroid" }, @@ -628,7 +628,7 @@ }, /area/skipjack_station) "bB" = ( -/obj/item/weapon/storage/box, +/obj/item/storage/box, /turf/unsimulated/floor{ icon_state = "asteroid" }, @@ -674,7 +674,7 @@ /area/skipjack_station) "bH" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/vox, +/obj/item/tank/vox, /turf/unsimulated/floor{ icon_state = "asteroid" }, @@ -693,7 +693,7 @@ }, /area/skipjack_station) "bK" = ( -/obj/item/weapon/tank/vox, +/obj/item/tank/vox, /turf/unsimulated/floor{ icon_state = "asteroid" }, @@ -709,7 +709,7 @@ /area/skipjack_station) "bM" = ( /obj/structure/table/steel, -/obj/item/device/pda/syndicate, +/obj/item/pda/syndicate, /turf/unsimulated/floor{ name = "plating"; icon_state = "cult" @@ -726,7 +726,7 @@ /area/skipjack_station) "bO" = ( /obj/machinery/portable_atmospherics/canister/phoron, -/obj/item/weapon/tank/vox, +/obj/item/tank/vox, /turf/unsimulated/floor{ icon_state = "asteroid" }, @@ -739,20 +739,20 @@ /area/skipjack_station) "bQ" = ( /obj/structure/table/steel, -/obj/item/device/radio/uplink, +/obj/item/radio/uplink, /turf/unsimulated/floor{ name = "plating"; icon_state = "cult" }, /area/skipjack_station) "bR" = ( -/obj/item/weapon/gun/launcher/pneumatic, +/obj/item/gun/launcher/pneumatic, /turf/unsimulated/floor{ icon_state = "asteroid" }, /area/skipjack_station) "bS" = ( -/obj/item/weapon/storage/box/syndie_kit/spy, +/obj/item/storage/box/syndie_kit/spy, /turf/unsimulated/floor{ name = "plating"; icon_state = "cult" @@ -1071,9 +1071,9 @@ /area/shuttle/skipjack) "cB" = ( /obj/structure/table/rack, -/obj/item/weapon/material/harpoon, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/tank/oxygen, +/obj/item/material/harpoon, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, /obj/random/rigsuit, @@ -1089,8 +1089,8 @@ /area/shuttle/skipjack) "cD" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, /obj/random/multiple/voidsuit, /obj/random/multiple/voidsuit, /obj/random/energy, @@ -1126,8 +1126,8 @@ /obj/item/seeds/potatoseed, /obj/item/seeds/potatoseed, /obj/item/seeds/ambrosiavulgarisseed, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/beartrap, +/obj/item/material/minihoe, +/obj/item/beartrap, /obj/structure/table/steel, /turf/simulated/shuttle/plating, /area/shuttle/skipjack) @@ -1137,20 +1137,20 @@ /area/shuttle/skipjack) "cK" = ( /obj/structure/table/rack, -/obj/item/weapon/melee/energy/sword/pirate, +/obj/item/melee/energy/sword/pirate, /obj/item/clothing/suit/space/pirate, /obj/item/clothing/suit/space/pirate, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/pinpointer/shuttle/heist, -/obj/item/weapon/pinpointer/shuttle/heist, +/obj/item/tank/oxygen, +/obj/item/pinpointer/shuttle/heist, +/obj/item/pinpointer/shuttle/heist, /turf/simulated/shuttle/floor/darkred, /area/shuttle/skipjack) "cL" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/device/multitool, -/obj/item/device/multitool, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/multitool, +/obj/item/multitool, /obj/item/clothing/shoes/magboots, /turf/simulated/shuttle/plating, /area/shuttle/skipjack) @@ -1160,8 +1160,8 @@ /area/shuttle/skipjack) "cN" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/fancy/cigarettes, -/obj/item/weapon/flame/lighter/zippo, +/obj/item/storage/fancy/cigarettes, +/obj/item/flame/lighter/zippo, /obj/item/clothing/gloves/yellow, /obj/item/stack/material/steel{ amount = 50 @@ -1169,7 +1169,7 @@ /obj/item/stack/material/glass{ amount = 50 }, -/obj/item/weapon/card/emag, +/obj/item/card/emag, /turf/simulated/shuttle/plating, /area/shuttle/skipjack) "cO" = ( @@ -1287,31 +1287,31 @@ /turf/simulated/shuttle/plating, /area/shuttle/skipjack) "da" = ( -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/shuttle/plating, /area/shuttle/skipjack) "db" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/crossbow, +/obj/item/gun/launcher/crossbow, /obj/item/stack/rods{ amount = 10 }, /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/beartrap, -/obj/item/weapon/beartrap, -/obj/item/weapon/beartrap, -/obj/item/weapon/beartrap, -/obj/item/weapon/beartrap, -/obj/item/weapon/beartrap, +/obj/item/beartrap, +/obj/item/beartrap, +/obj/item/beartrap, +/obj/item/beartrap, +/obj/item/beartrap, +/obj/item/beartrap, /turf/simulated/shuttle/floor/darkred, /area/shuttle/skipjack) "dc" = ( /obj/structure/table/rack, -/obj/item/weapon/grenade/empgrenade, -/obj/item/weapon/grenade/flashbang, -/obj/item/weapon/grenade/spawnergrenade/manhacks, +/obj/item/grenade/empgrenade, +/obj/item/grenade/flashbang, +/obj/item/grenade/spawnergrenade/manhacks, /turf/simulated/shuttle/floor/darkred, /area/shuttle/skipjack) "dd" = ( @@ -1398,14 +1398,14 @@ /turf/simulated/shuttle/plating, /area/shuttle/skipjack) "do" = ( -/obj/item/weapon/tool/wrench, -/obj/item/weapon/mop, +/obj/item/tool/wrench, +/obj/item/mop, /turf/simulated/shuttle/plating, /area/shuttle/skipjack) "dp" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/item/weapon/tool/crowbar, -/obj/item/device/suit_cooling_unit, +/obj/item/tool/crowbar, +/obj/item/suit_cooling_unit, /turf/simulated/shuttle/plating, /area/shuttle/skipjack) "dq" = ( @@ -1456,7 +1456,7 @@ /area/shuttle/skipjack) "dw" = ( /obj/structure/table/steel, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /turf/simulated/shuttle/floor/darkred, /area/shuttle/skipjack) "dx" = ( @@ -1489,7 +1489,7 @@ /area/shuttle/skipjack) "dC" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/item/weapon/tank/nitrogen, +/obj/item/tank/nitrogen, /turf/simulated/shuttle/plating, /area/shuttle/skipjack) "dD" = ( @@ -1543,12 +1543,12 @@ /area/shuttle/skipjack) "dJ" = ( /obj/structure/table/standard, -/obj/item/weapon/handcuffs/legcuffs, +/obj/item/handcuffs/legcuffs, /turf/simulated/shuttle/floor/black, /area/shuttle/skipjack) "dK" = ( /obj/structure/table/standard, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /turf/simulated/shuttle/floor/black, /area/shuttle/skipjack) "dL" = ( @@ -1572,11 +1572,11 @@ /area/shuttle/skipjack) "dN" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw{ +/obj/item/surgical/circular_saw{ pixel_y = 8 }, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/hemostat, +/obj/item/surgical/scalpel, /obj/item/stack/medical/advanced/bruise_pack, /turf/simulated/shuttle/floor/white, /area/shuttle/skipjack) @@ -1596,11 +1596,11 @@ /area/shuttle/skipjack) "dR" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/cautery, -/obj/item/weapon/surgical/retractor, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/surgical/cautery, +/obj/item/surgical/retractor, +/obj/item/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/syringe, /turf/simulated/shuttle/floor/white, /area/shuttle/skipjack) "dS" = ( @@ -1613,7 +1613,7 @@ /turf/simulated/shuttle/floor/black, /area/shuttle/skipjack) "dT" = ( -/obj/item/weapon/bedsheet/rainbow, +/obj/item/bedsheet/rainbow, /obj/structure/bed/padded, /turf/simulated/shuttle/floor/red, /area/shuttle/skipjack) @@ -1621,15 +1621,15 @@ /turf/simulated/shuttle/floor/red, /area/shuttle/skipjack) "dV" = ( -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /obj/structure/bed/padded, /turf/simulated/shuttle/floor/red, /area/shuttle/skipjack) "dW" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel, -/obj/item/weapon/surgical/FixOVein, +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel, +/obj/item/surgical/FixOVein, /obj/item/stack/nanopaste, /turf/simulated/shuttle/floor/white, /area/shuttle/skipjack) @@ -1643,12 +1643,12 @@ /turf/simulated/shuttle/floor/black, /area/shuttle/skipjack) "dY" = ( -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/structure/bed/padded, /turf/simulated/shuttle/floor/red, /area/shuttle/skipjack) "dZ" = ( -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/machinery/light/small{ dir = 4 }, @@ -1657,18 +1657,18 @@ /area/shuttle/skipjack) "ea" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/storage/firstaid/clotting, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/storage/firstaid/clotting, /obj/item/stack/medical/splint, /turf/simulated/shuttle/floor/white, /area/shuttle/skipjack) "eb" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 1 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 }, @@ -1680,18 +1680,18 @@ pixel_y = 0; req_access = list(150) }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 1 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/shuttle/floor/white, /area/shuttle/skipjack) "ec" = ( -/obj/item/weapon/bedsheet/rd, +/obj/item/bedsheet/rd, /obj/structure/bed/padded, /turf/simulated/shuttle/floor/red, /area/shuttle/skipjack) @@ -1700,7 +1700,7 @@ /turf/simulated/shuttle/floor/red, /area/shuttle/skipjack) "ee" = ( -/obj/item/weapon/bedsheet/clown, +/obj/item/bedsheet/clown, /obj/structure/bed/padded, /turf/simulated/shuttle/floor/red, /area/shuttle/skipjack) diff --git a/maps/submaps/admin_use_vr/spa.dmm b/maps/submaps/admin_use_vr/spa.dmm index 3413e29d291..9e1015cf155 100644 --- a/maps/submaps/admin_use_vr/spa.dmm +++ b/maps/submaps/admin_use_vr/spa.dmm @@ -15,7 +15,7 @@ /area/submap/spa) "ad" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle/everburn, +/obj/item/flame/candle/everburn, /turf/simulated/floor/wood, /area/submap/spa) "ae" = ( @@ -34,9 +34,9 @@ /area/submap/spa) "ah" = ( /obj/structure/table/woodentable, -/obj/item/weapon/towel, -/obj/item/weapon/towel, -/obj/item/weapon/towel, +/obj/item/towel, +/obj/item/towel, +/obj/item/towel, /turf/simulated/floor/wood, /area/submap/spa) "ai" = ( @@ -235,7 +235,7 @@ /area/submap/spa) "aP" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle/candelabra/everburn, +/obj/item/flame/candle/candelabra/everburn, /turf/simulated/floor/wood, /area/submap/spa) "aQ" = ( @@ -260,7 +260,7 @@ /area/submap/spa) "aU" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/carpet/bcarpet, /area/submap/spa) "aV" = ( @@ -279,17 +279,17 @@ /area/submap/spa) "aW" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/greendouble, +/obj/item/bedsheet/greendouble, /turf/simulated/floor/carpet/bcarpet, /area/submap/spa) "aX" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, +/obj/item/bedsheet/purpledouble, /turf/simulated/floor/carpet/bcarpet, /area/submap/spa) "aY" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/reddouble, +/obj/item/bedsheet/reddouble, /turf/simulated/floor/carpet/bcarpet, /area/submap/spa) "aZ" = ( @@ -356,7 +356,7 @@ /turf/simulated/floor/reinforced, /area/submap/spa) "bj" = ( -/obj/item/device/radio/beacon{ +/obj/item/radio/beacon{ anchored = 1 }, /turf/simulated/floor/reinforced, @@ -410,7 +410,7 @@ /area/submap/spa) "br" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/carpet/bcarpet, /area/submap/spa) "bs" = ( @@ -429,17 +429,17 @@ /area/submap/spa) "bt" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/orangedouble, +/obj/item/bedsheet/orangedouble, /turf/simulated/floor/carpet/bcarpet, /area/submap/spa) "bu" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/rainbowdouble, +/obj/item/bedsheet/rainbowdouble, /turf/simulated/floor/carpet/bcarpet, /area/submap/spa) "bv" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/yellowdouble, +/obj/item/bedsheet/yellowdouble, /turf/simulated/floor/carpet/bcarpet, /area/submap/spa) "bw" = ( diff --git a/maps/submaps/admin_use_vr/thunderdome.dmm b/maps/submaps/admin_use_vr/thunderdome.dmm index 7d7a19345ae..db06ccb2a97 100644 --- a/maps/submaps/admin_use_vr/thunderdome.dmm +++ b/maps/submaps/admin_use_vr/thunderdome.dmm @@ -26,7 +26,7 @@ /obj/structure/table/rack, /obj/item/clothing/under/color/red, /obj/item/clothing/shoes/brown, -/obj/item/weapon/melee/energy/axe, +/obj/item/melee/energy/axe, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -43,7 +43,7 @@ /obj/structure/table/rack, /obj/item/clothing/under/color/green, /obj/item/clothing/shoes/brown, -/obj/item/weapon/melee/energy/axe, +/obj/item/melee/energy/axe, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -76,8 +76,8 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/tdome/red, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/energy/sword/red, +/obj/item/melee/baton/loaded, +/obj/item/melee/energy/sword/red, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -127,8 +127,8 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/tdome/green, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/energy/sword/green, +/obj/item/melee/baton/loaded, +/obj/item/melee/energy/sword/green, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -239,7 +239,7 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet/swat, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -251,7 +251,7 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet/swat, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 diff --git a/maps/submaps/admin_use_vr/tradeship.dmm b/maps/submaps/admin_use_vr/tradeship.dmm index e196914075b..5882284d08b 100644 --- a/maps/submaps/admin_use_vr/tradeship.dmm +++ b/maps/submaps/admin_use_vr/tradeship.dmm @@ -103,7 +103,7 @@ name = "\improper Trader Base" }) "ao" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -119,7 +119,7 @@ name = "\improper Trader Base" }) "aq" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/unsimulated/floor{ icon_state = "steel" }, @@ -218,7 +218,7 @@ }) "aB" = ( /obj/structure/table/standard, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /turf/simulated/shuttle/floor, /area/syndicate_mothership{ name = "\improper Trader Base" @@ -364,7 +364,7 @@ /area/shuttle/trade) "aQ" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/rd, +/obj/item/bedsheet/rd, /turf/simulated/shuttle/floor/black, /area/shuttle/trade) "aR" = ( @@ -471,7 +471,7 @@ /area/shuttle/trade) "bf" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/simulated/floor/carpet, /area/shuttle/trade) "bg" = ( @@ -503,11 +503,11 @@ /turf/simulated/shuttle/floor/black, /area/shuttle/trade) "bl" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, @@ -517,33 +517,33 @@ /obj/item/bodybag/cryobag{ pixel_x = 5 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ layer = 2.8; pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/storage/box/masks{ +/obj/item/storage/box/masks{ pixel_x = 0; pixel_y = 0 }, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire{ layer = 2.9; pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = -2 }, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/structure/closet/medical_wall{ pixel_y = 32 }, @@ -580,11 +580,11 @@ /turf/simulated/shuttle/floor/black, /area/shuttle/trade) "bp" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /obj/machinery/light, @@ -593,7 +593,7 @@ /area/shuttle/trade) "bq" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /obj/structure/sign/poster{ pixel_y = -32 }, @@ -607,12 +607,12 @@ /area/shuttle/trade) "bs" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/glasses/square, +/obj/item/storage/box/glasses/square, /turf/simulated/floor/carpet, /area/shuttle/trade) "bt" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/inflatable_duck, +/obj/item/inflatable_duck, /turf/simulated/shuttle/floor/black, /area/shuttle/trade) "bu" = ( @@ -624,7 +624,7 @@ /area/shuttle/trade) "bv" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/rig/internalaffairs, +/obj/item/rig/internalaffairs, /obj/item/clothing/head/helmet/space/void/wizard, /obj/item/clothing/suit/space/void/wizard, /turf/simulated/shuttle/floor/black, @@ -740,7 +740,7 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/tech_supply, -/obj/item/weapon/weldpack, +/obj/item/weldpack, /turf/simulated/shuttle/floor/black, /area/shuttle/trade) "bL" = ( @@ -796,13 +796,13 @@ /area/shuttle/trade) "bS" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/coin/uranium, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/platinum, -/obj/item/weapon/coin/phoron, -/obj/item/weapon/coin/iron, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/diamond, +/obj/item/coin/uranium, +/obj/item/coin/silver, +/obj/item/coin/platinum, +/obj/item/coin/phoron, +/obj/item/coin/iron, +/obj/item/coin/gold, +/obj/item/coin/diamond, /obj/structure/window/reinforced, /turf/simulated/shuttle/floor/black, /area/shuttle/trade) @@ -815,10 +815,10 @@ /area/shuttle/trade) "bU" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/potato, +/obj/item/cell/high, +/obj/item/cell/high, +/obj/item/cell/hyper, +/obj/item/cell/potato, /obj/structure/window/reinforced, /turf/simulated/shuttle/floor/black, /area/shuttle/trade) @@ -837,27 +837,27 @@ /obj/structure/table/standard, /obj/item/clothing/gloves/sterile/latex, /obj/item/clothing/mask/surgical, -/obj/item/weapon/surgical/retractor{ +/obj/item/surgical/retractor{ pixel_x = 0; pixel_y = 6 }, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/surgical/circular_saw, +/obj/item/surgical/scalpel, +/obj/item/surgical/surgicaldrill, +/obj/item/surgical/circular_saw, /obj/item/stack/nanopaste, -/obj/item/weapon/surgical/hemostat{ +/obj/item/surgical/hemostat{ pixel_y = 4 }, -/obj/item/weapon/surgical/cautery{ +/obj/item/surgical/cautery{ pixel_y = 4 }, -/obj/item/weapon/surgical/FixOVein{ +/obj/item/surgical/FixOVein{ pixel_x = -6; pixel_y = 1 }, /obj/item/stack/medical/advanced/bruise_pack, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel{ +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel{ pixel_x = 4; pixel_y = 3 }, @@ -925,11 +925,11 @@ /area/shuttle/trade) "ce" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/shuttle/floor/black, @@ -1062,7 +1062,7 @@ dir = 4; name = "Cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/simulated/shuttle/floor/black, /area/shuttle/trade) @@ -1095,10 +1095,10 @@ icon_state = "warning"; dir = 1 }, -/obj/item/device/kit/paint/ripley/death, -/obj/item/device/kit/paint/ripley/flames_blue, -/obj/item/device/kit/paint/ripley/flames_red, -/obj/item/device/kit/paint/ripley, +/obj/item/kit/paint/ripley/death, +/obj/item/kit/paint/ripley/flames_blue, +/obj/item/kit/paint/ripley/flames_red, +/obj/item/kit/paint/ripley, /turf/simulated/shuttle/floor/black, /area/shuttle/trade) "cy" = ( @@ -1211,11 +1211,11 @@ "cL" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/warning, -/obj/item/device/kit/paint/gygax/darkgygax, -/obj/item/device/kit/paint/gygax/recitence, -/obj/item/device/kit/paint/durand, -/obj/item/device/kit/paint/durand/phazon, -/obj/item/device/kit/paint/durand/seraph, +/obj/item/kit/paint/gygax/darkgygax, +/obj/item/kit/paint/gygax/recitence, +/obj/item/kit/paint/durand, +/obj/item/kit/paint/durand/phazon, +/obj/item/kit/paint/durand/seraph, /turf/simulated/shuttle/floor/black, /area/shuttle/trade) "cM" = ( @@ -1275,7 +1275,7 @@ /obj/machinery/vending/assist{ contraband = null; name = "Old Vending Machine"; - products = list(/obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/signaler = 4, /obj/item/device/assembly/infra = 4, /obj/item/device/assembly/prox_sensor = 4, /obj/item/weapon/handcuffs = 8, /obj/item/device/flash = 4, /obj/item/weapon/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) + products = list(/obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, /obj/item/assembly/infra = 4, /obj/item/assembly/prox_sensor = 4, /obj/item/handcuffs = 8, /obj/item/flash = 4, /obj/item/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) }, /turf/simulated/shuttle/floor/black, /area/shuttle/trade) @@ -1283,9 +1283,9 @@ /obj/structure/closet{ name = "custodial" }, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, /turf/simulated/shuttle/floor/black, /area/shuttle/trade) "cU" = ( @@ -1295,8 +1295,8 @@ "cV" = ( /obj/machinery/light, /obj/structure/table/standard, -/obj/item/weapon/soap, -/obj/item/weapon/towel{ +/obj/item/soap, +/obj/item/towel{ color = "#0000FF" }, /turf/simulated/shuttle/floor/black, @@ -1381,7 +1381,7 @@ /area/shuttle/trade) "de" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/shuttle/floor/black, /area/shuttle/trade) "df" = ( @@ -1479,7 +1479,7 @@ /obj/random/contraband, /obj/random/contraband, /obj/random/contraband, -/obj/item/weapon/bikehorn, +/obj/item/bikehorn, /turf/simulated/shuttle/floor/black, /area/shuttle/trade) "dp" = ( @@ -1601,11 +1601,11 @@ /area/shuttle/trade) "dC" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/lipstick/black, -/obj/item/weapon/lipstick/jade, -/obj/item/weapon/lipstick/purple, -/obj/item/weapon/lipstick, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/black, +/obj/item/lipstick/jade, +/obj/item/lipstick/purple, +/obj/item/lipstick, +/obj/item/lipstick/random, /turf/simulated/shuttle/floor/black, /area/shuttle/trade) "dD" = ( @@ -1719,11 +1719,11 @@ /area/shuttle/trade) "dJ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/carpet, @@ -1861,7 +1861,7 @@ /area/shuttle/trade) "dV" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /turf/simulated/shuttle/floor/black, /area/shuttle/trade) "dW" = ( diff --git a/maps/submaps/admin_use_vr/wizard.dmm b/maps/submaps/admin_use_vr/wizard.dmm index aa97a3f0822..fcbb9376fbe 100644 --- a/maps/submaps/admin_use_vr/wizard.dmm +++ b/maps/submaps/admin_use_vr/wizard.dmm @@ -20,7 +20,7 @@ }, /area/wizard_station) "ae" = ( -/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine{ +/obj/item/reagent_containers/food/drinks/bottle/pwine{ pixel_x = -4; pixel_y = 10 }, @@ -68,7 +68,7 @@ /area/wizard_station) "ak" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ on = 0; pixel_x = -3; pixel_y = 8 @@ -80,7 +80,7 @@ /area/wizard_station) "al" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/rd, +/obj/item/bedsheet/rd, /turf/unsimulated/floor{ icon_state = "lino" }, @@ -115,7 +115,7 @@ }, /area/wizard_station) "ap" = ( -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -144,7 +144,7 @@ pixel_x = 0; pixel_y = 32 }, -/obj/item/weapon/ore/slag{ +/obj/item/ore/slag{ desc = "Well at least Arthur doesn't have to share now..."; name = "pet rock" }, @@ -166,9 +166,9 @@ /area/wizard_station) "au" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/device/radio/intercom{ +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; @@ -183,8 +183,8 @@ /area/wizard_station) "av" = ( /obj/structure/table/woodentable, -/obj/item/device/radio/headset, -/obj/item/weapon/spacecash/c500, +/obj/item/radio/headset, +/obj/item/spacecash/c500, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -201,7 +201,7 @@ }, /area/wizard_station) "ax" = ( -/obj/item/weapon/reagent_containers/food/snacks/spellburger{ +/obj/item/reagent_containers/food/snacks/spellburger{ pixel_y = 8 }, /obj/structure/table/marble, @@ -216,7 +216,7 @@ /area/wizard_station) "az" = ( /obj/structure/undies_wardrobe, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; @@ -248,7 +248,7 @@ /area/wizard_station) "aC" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -268,7 +268,7 @@ }, /area/wizard_station) "aF" = ( -/obj/item/weapon/antag_spawner/technomancer_apprentice, +/obj/item/antag_spawner/technomancer_apprentice, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -278,8 +278,8 @@ /obj/item/clothing/shoes/boots/workboots, /obj/item/clothing/under/technomancer, /obj/item/clothing/head/technomancer, -/obj/item/weapon/storage/box/syndie_kit/chameleon, -/obj/item/weapon/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -315,7 +315,7 @@ /obj/structure/closet/cabinet, /obj/item/clothing/suit/wizrobe/magusblue, /obj/item/clothing/head/wizard/magus, -/obj/item/weapon/staff, +/obj/item/staff, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -328,7 +328,7 @@ }, /area/wizard_station) "aN" = ( -/obj/item/weapon/reagent_containers/food/snacks/cheesewedge, +/obj/item/reagent_containers/food/snacks/cheesewedge, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -420,7 +420,7 @@ /obj/item/clothing/under/gentlesuit, /obj/item/clothing/suit/wizrobe/gentlecoat, /obj/item/clothing/head/wizard/cap, -/obj/item/weapon/staff/gentcane, +/obj/item/staff/gentcane, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -430,7 +430,7 @@ /obj/structure/closet/cabinet, /obj/item/clothing/suit/wizrobe/magusred, /obj/item/clothing/head/wizard/magus, -/obj/item/weapon/staff, +/obj/item/staff, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -441,7 +441,7 @@ /obj/item/clothing/suit/wizrobe/marisa, /obj/item/clothing/shoes/sandal/marisa, /obj/item/clothing/head/wizard/marisa, -/obj/item/weapon/staff/broom, +/obj/item/staff/broom, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -452,7 +452,7 @@ /obj/item/clothing/suit/wizrobe/red, /obj/item/clothing/shoes/sandal, /obj/item/clothing/head/wizard/red, -/obj/item/weapon/staff, +/obj/item/staff, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -479,14 +479,14 @@ /area/wizard_station) "bf" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/arrow/quill, +/obj/item/arrow/quill, /turf/unsimulated/floor{ icon_state = "dark" }, /area/wizard_station) "bg" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/stock_parts/matter_bin/super, +/obj/item/stock_parts/matter_bin/super, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -544,7 +544,7 @@ }, /area/wizard_station) "bo" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -552,7 +552,7 @@ subspace_transmission = 1; syndie = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -627,7 +627,7 @@ }, /area/wizard_station) "by" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; @@ -643,14 +643,14 @@ /area/wizard_station) "bz" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/mmi/radio_enabled, +/obj/item/mmi/radio_enabled, /turf/unsimulated/floor{ icon_state = "dark" }, /area/wizard_station) "bA" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/material/knife/ritual, +/obj/item/material/knife/ritual, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -659,7 +659,7 @@ /obj/structure/flora/pottedplant{ icon_state = "plant-03" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; @@ -696,7 +696,7 @@ /area/wizard_station) "bF" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/coin/diamond, +/obj/item/coin/diamond, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -745,14 +745,14 @@ /area/wizard_station) "bL" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/book/manual/ripley_build_and_repair, +/obj/item/book/manual/ripley_build_and_repair, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 }, /area/wizard_station) "bM" = ( -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/structure/table/steel_reinforced, /obj/machinery/newscaster{ layer = 3.3; @@ -800,7 +800,7 @@ pixel_y = 32 }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -814,8 +814,8 @@ /area/wizard_station) "bS" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/book/manual/engineering_hacking, -/obj/item/device/radio/intercom{ +/obj/item/book/manual/engineering_hacking, +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; @@ -852,7 +852,7 @@ }, /area/wizard_station) "bW" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Subversive Intercom"; @@ -883,7 +883,7 @@ /area/wizard_station) "bZ" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/book/manual/robotics_cyborgs, +/obj/item/book/manual/robotics_cyborgs, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -947,7 +947,7 @@ }, /area/wizard_station) "cg" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1073,20 +1073,20 @@ }, /area/wizard_station) "cw" = ( -/obj/item/weapon/firstaid_arm_assembly, +/obj/item/firstaid_arm_assembly, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 }, /area/wizard_station) "cx" = ( -/obj/item/weapon/bucket_sensor, +/obj/item/bucket_sensor, /turf/unsimulated/floor{ icon_state = "dark" }, /area/wizard_station) "cy" = ( -/obj/item/weapon/farmbot_arm_assembly, +/obj/item/farmbot_arm_assembly, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 diff --git a/maps/submaps/depreciated_vr/ert_base.dmm b/maps/submaps/depreciated_vr/ert_base.dmm index 0e182e0365d..7544d19aef0 100644 --- a/maps/submaps/depreciated_vr/ert_base.dmm +++ b/maps/submaps/depreciated_vr/ert_base.dmm @@ -220,14 +220,14 @@ /area/shuttle/specops/centcom) "ay" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "az" = ( /obj/structure/closet/wardrobe/ert, /obj/item/modular_computer/laptop/preset/custom_loadout/elite, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) @@ -237,8 +237,8 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) @@ -256,13 +256,13 @@ "aC" = ( /obj/structure/table/steel_reinforced, /obj/machinery/chemical_dispenser/ert, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "aD" = ( /obj/structure/table/steel_reinforced, /obj/machinery/chemical_dispenser/biochemistry/full, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "aE" = ( @@ -341,27 +341,27 @@ /area/shuttle/specops/centcom) "aN" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, @@ -369,10 +369,10 @@ /area/shuttle/specops/centcom) "aO" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, /obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/accessory/storage/white_vest, @@ -393,22 +393,22 @@ /obj/item/clothing/head/helmet/ert/medical, /obj/item/clothing/head/helmet/ert/medical, /obj/item/clothing/head/helmet/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "aQ" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, +/obj/item/rig/ert/medical, +/obj/item/rig/ert/medical, +/obj/item/rig/ert/medical, +/obj/item/rig/ert/medical, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "aR" = ( @@ -452,61 +452,61 @@ /area/shuttle/specops/centcom) "aW" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/gun/energy/sniperrifle{ +/obj/item/gun/energy/netgun, +/obj/item/gun/energy/sniperrifle{ battery_lock = 0 }, -/obj/item/weapon/gun/energy/gun/compact{ +/obj/item/gun/energy/gun/compact{ battery_lock = 0 }, -/obj/item/weapon/gun/energy/gun/compact{ +/obj/item/gun/energy/gun/compact{ battery_lock = 0 }, -/obj/item/weapon/gun/energy/gun/compact{ +/obj/item/gun/energy/gun/compact{ battery_lock = 0 }, -/obj/item/weapon/gun/energy/gun/compact{ +/obj/item/gun/energy/gun/compact{ battery_lock = 0 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "aX" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "aY" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "aZ" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, /obj/item/ammo_magazine/ammo_box/b12g/pellet, /obj/item/ammo_magazine/ammo_box/b12g/pellet, /obj/item/ammo_magazine/ammo_box/b12g/pellet, @@ -522,13 +522,13 @@ /area/shuttle/specops/centcom) "ba" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/advanced_smg, +/obj/item/gun/projectile/automatic/advanced_smg, /obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mmAdvanced, -/obj/item/weapon/gun/projectile/revolver/detective45, -/obj/item/weapon/gun/projectile/revolver/detective45, +/obj/item/gun/projectile/revolver/detective45, +/obj/item/gun/projectile/revolver/detective45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, @@ -597,21 +597,21 @@ /area/shuttle/specops/centcom) "bj" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "bk" = ( @@ -635,8 +635,8 @@ /area/shuttle/specops/centcom) "bn" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, @@ -678,18 +678,18 @@ pixel_x = 32; pixel_y = 0 }, -/obj/item/weapon/storage/firstaid/clotting, -/obj/item/weapon/storage/firstaid/bonemed, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/storage/firstaid/clotting, +/obj/item/storage/firstaid/bonemed, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "bt" = ( @@ -702,14 +702,14 @@ "bu" = ( /obj/structure/window/reinforced, /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "bv" = ( @@ -730,10 +730,10 @@ /obj/item/ammo_magazine/m9mm/large/preban, /obj/item/ammo_magazine/m9mm/large/preban, /obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, +/obj/item/gun/projectile/p92x/large/preban, +/obj/item/gun/projectile/p92x/large/preban, +/obj/item/gun/projectile/p92x/large/preban, +/obj/item/gun/projectile/p92x/large/preban, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "bx" = ( @@ -746,8 +746,8 @@ "by" = ( /obj/structure/window/reinforced, /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, @@ -777,28 +777,28 @@ /area/shuttle/specops/centcom) "bB" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/box/pillbottles, +/obj/item/storage/box/pillbottles, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "bC" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, /obj/item/stack/nanopaste/advanced, /obj/item/stack/nanopaste/advanced, /obj/item/stack/nanopaste/advanced, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, -/obj/item/weapon/storage/pill_bottle/blood_regen, -/obj/item/weapon/storage/pill_bottle/blood_regen, -/obj/item/weapon/storage/pill_bottle/sleevingcure/full, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/syringes{ +/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, +/obj/item/storage/pill_bottle/blood_regen, +/obj/item/storage/pill_bottle/blood_regen, +/obj/item/storage/pill_bottle/sleevingcure/full, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/storage/box/syringes, +/obj/item/storage/box/syringes{ pixel_x = 2; pixel_y = 2 }, @@ -886,11 +886,11 @@ /area/shuttle/specops/centcom) "bM" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/shuttle/floor/black, @@ -932,26 +932,26 @@ /area/shuttle/specops/centcom) "bS" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "bT" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/box/autoinjectors, -/obj/item/weapon/storage/box/beakers, -/obj/item/device/defib_kit/compact/combat/loaded, -/obj/item/device/defib_kit/compact/combat/loaded, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/autoinjectors, +/obj/item/storage/box/beakers, +/obj/item/defib_kit/compact/combat/loaded, +/obj/item/defib_kit/compact/combat/loaded, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/freezer, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/gloves, +/obj/item/storage/box/freezer, +/obj/item/storage/box/masks, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "bU" = ( @@ -983,7 +983,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "ERT"; tele_network = "centcom" }, @@ -1018,10 +1018,10 @@ /obj/item/clothing/head/helmet/ert/security, /obj/item/clothing/head/helmet/ert/security, /obj/item/clothing/head/helmet/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "cb" = ( @@ -1031,32 +1031,32 @@ /obj/item/taperoll/police, /obj/item/taperoll/police, /obj/item/taperoll/police, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, /obj/structure/table/rack/steel, /turf/simulated/shuttle/floor/darkred, /area/shuttle/specops/centcom) "cc" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/emps{ +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/emps{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/smokes, -/obj/item/weapon/storage/box/smokes, +/obj/item/storage/box/smokes, +/obj/item/storage/box/smokes, /turf/simulated/shuttle/floor/darkred, /area/shuttle/specops/centcom) "cd" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/handcuffs{ pixel_x = 3; pixel_y = 3 }, @@ -1080,24 +1080,24 @@ /area/shuttle/specops/centcom) "cf" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, /turf/simulated/shuttle/floor/darkred, /area/shuttle/specops/centcom) "cg" = ( @@ -1128,14 +1128,14 @@ /area/shuttle/specops/centcom) "cm" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "cn" = ( @@ -1199,38 +1199,38 @@ /area/shuttle/specops/centcom) "ct" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, /turf/simulated/shuttle/floor/darkred, /area/shuttle/specops/centcom) "cu" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, /turf/simulated/shuttle/floor/darkred, /area/shuttle/specops/centcom) "cv" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, /obj/item/clothing/glasses/sunglasses/sechud/tactical, /obj/item/clothing/glasses/sunglasses/sechud/tactical, /obj/item/clothing/glasses/sunglasses/sechud/tactical, @@ -1304,20 +1304,20 @@ "cE" = ( /obj/machinery/light, /obj/structure/table/standard, -/obj/item/weapon/soap, -/obj/item/weapon/soap, -/obj/item/weapon/soap, -/obj/item/weapon/soap, -/obj/item/weapon/towel{ +/obj/item/soap, +/obj/item/soap, +/obj/item/soap, +/obj/item/soap, +/obj/item/towel{ color = "#0000FF" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#0000FF" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#0000FF" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#0000FF" }, /turf/simulated/shuttle/floor/black, @@ -1326,23 +1326,23 @@ /obj/structure/closet{ name = "custodial" }, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, -/obj/item/weapon/mop, -/obj/item/weapon/mop, -/obj/item/weapon/mop, -/obj/item/weapon/rig/ert/janitor, -/obj/item/device/lightreplacer, -/obj/item/device/lightreplacer, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/mop, +/obj/item/mop, +/obj/item/mop, +/obj/item/rig/ert/janitor, +/obj/item/lightreplacer, +/obj/item/lightreplacer, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "cH" = ( @@ -1362,7 +1362,7 @@ icon_state = "tube1" }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /obj/item/stack/nanopaste, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) @@ -1406,16 +1406,16 @@ /area/shuttle/specops/centcom) "cL" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "cM" = ( @@ -1445,19 +1445,19 @@ dir = 1 }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, /obj/machinery/cell_charger, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "cS" = ( @@ -1472,7 +1472,7 @@ dir = 1 }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "cU" = ( @@ -1513,7 +1513,7 @@ /area/shuttle/specops/centcom) "da" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert, +/obj/item/rig/ert, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "db" = ( @@ -1576,22 +1576,22 @@ /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "dk" = ( -/obj/item/weapon/circuitboard/aiupload, -/obj/item/weapon/circuitboard/borgupload, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/aiModule/nanotrasen, -/obj/item/weapon/aiModule/reset, -/obj/item/weapon/aiModule/freeformcore, -/obj/item/weapon/aiModule/protectStation, -/obj/item/weapon/aiModule/quarantine, -/obj/item/weapon/aiModule/paladin, -/obj/item/weapon/aiModule/robocop, -/obj/item/weapon/aiModule/safeguard, +/obj/item/circuitboard/aiupload, +/obj/item/circuitboard/borgupload, +/obj/item/circuitboard/smes, +/obj/item/aiModule/nanotrasen, +/obj/item/aiModule/reset, +/obj/item/aiModule/freeformcore, +/obj/item/aiModule/protectStation, +/obj/item/aiModule/quarantine, +/obj/item/aiModule/paladin, +/obj/item/aiModule/robocop, +/obj/item/aiModule/safeguard, /obj/structure/table/steel_reinforced, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil, -/obj/item/device/t_scanner/advanced, -/obj/item/device/t_scanner/advanced, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/t_scanner/advanced, +/obj/item/t_scanner/advanced, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "dl" = ( @@ -1605,12 +1605,12 @@ /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "dm" = ( @@ -1662,8 +1662,8 @@ /area/shuttle/specops/centcom) "do" = ( /obj/structure/table/glass, -/obj/item/weapon/hand_tele, -/obj/item/device/perfect_tele, +/obj/item/hand_tele, +/obj/item/perfect_tele, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "dp" = ( @@ -1671,10 +1671,10 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid, -/obj/item/device/binoculars, -/obj/item/device/survivalcapsule, -/obj/item/device/survivalcapsule, +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid, +/obj/item/binoculars, +/obj/item/survivalcapsule, +/obj/item/survivalcapsule, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "dq" = ( @@ -1683,7 +1683,7 @@ /area/shuttle/specops/centcom) "dr" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/backpack/ert/commander, +/obj/item/storage/backpack/ert/commander, /obj/item/clothing/head/helmet/ert/command, /obj/item/clothing/suit/armor/vest/ert/command, /turf/simulated/shuttle/floor/black, @@ -1793,26 +1793,26 @@ /area/shuttle/specops/centcom) "dE" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/carpet, /area/shuttle/specops/centcom) "dF" = ( /obj/structure/table/woodentable, -/obj/item/weapon/stamp/centcomm, -/obj/item/weapon/storage/box/cdeathalarm_kit, -/obj/item/weapon/storage/box/trackimp, +/obj/item/stamp/centcomm, +/obj/item/storage/box/cdeathalarm_kit, +/obj/item/storage/box/trackimp, /turf/simulated/floor/carpet, /area/shuttle/specops/centcom) "dG" = ( /obj/structure/table/woodentable, -/obj/item/weapon/pinpointer/advpinpointer, -/obj/item/device/aicard, +/obj/item/pinpointer/advpinpointer, +/obj/item/aicard, /turf/simulated/floor/carpet, /area/shuttle/specops/centcom) "dH" = ( @@ -1898,8 +1898,8 @@ /area/shuttle/specops/centcom) "dN" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, @@ -1926,14 +1926,14 @@ /area/shuttle/specops/centcom) "dP" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full, +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer, +/obj/item/storage/belt/utility/chief/full, +/obj/item/storage/belt/utility/chief/full, +/obj/item/storage/belt/utility/chief/full, +/obj/item/storage/belt/utility/chief/full, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "dQ" = ( @@ -1946,10 +1946,10 @@ /obj/item/clothing/head/helmet/ert/engineer, /obj/item/clothing/head/helmet/ert/engineer, /obj/item/clothing/head/helmet/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, /obj/item/taperoll/engineering, /obj/item/taperoll/engineering, /obj/item/taperoll/engineering, @@ -1961,7 +1961,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -35 }, -/obj/item/weapon/gun/projectile/deagle, +/obj/item/gun/projectile/deagle, /obj/item/ammo_magazine/m44, /obj/item/ammo_magazine/m44, /turf/simulated/shuttle/floor/black, @@ -2122,14 +2122,14 @@ /area/shuttle/specops/centcom) "rB" = ( /obj/structure/table/rack/steel, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "zV" = ( @@ -2163,10 +2163,10 @@ /obj/item/clothing/suit/space/void/responseteam/janitor, /obj/item/clothing/suit/space/void/responseteam/janitor, /obj/item/clothing/suit/space/void/responseteam/janitor, -/obj/item/weapon/storage/belt/janitor, -/obj/item/weapon/storage/belt/janitor, -/obj/item/weapon/storage/belt/janitor, -/obj/item/weapon/storage/belt/janitor, +/obj/item/storage/belt/janitor, +/obj/item/storage/belt/janitor, +/obj/item/storage/belt/janitor, +/obj/item/storage/belt/janitor, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) diff --git a/maps/submaps/depreciated_vr/mercbase.dmm b/maps/submaps/depreciated_vr/mercbase.dmm index 77457998ec3..097b6bf8a43 100644 --- a/maps/submaps/depreciated_vr/mercbase.dmm +++ b/maps/submaps/depreciated_vr/mercbase.dmm @@ -7,7 +7,7 @@ /area/antag/antag_base) "ac" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /obj/machinery/computer/security/telescreen/entertainment{ pixel_w = 0; pixel_x = 0; @@ -35,7 +35,7 @@ pixel_x = 0; pixel_y = 32 }, -/obj/item/weapon/bedsheet/clown{ +/obj/item/bedsheet/clown{ desc = "A surprisingly soft linen bedsheet, except for the spots where it's crusty. Gross."; name = "Dave's bedsheet" }, @@ -46,7 +46,7 @@ /area/antag/antag_base) "af" = ( /obj/structure/table/glass, -/obj/item/weapon/handcuffs/fuzzy, +/obj/item/handcuffs/fuzzy, /turf/unsimulated/floor{ name = "plating"; icon_state = "cult" @@ -94,8 +94,8 @@ /obj/item/ammo_magazine/m545/ap, /obj/item/ammo_magazine/m545/ap, /obj/item/ammo_magazine/m545/ap, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -103,8 +103,8 @@ /area/antag/antag_base) "al" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/plasmastun, -/obj/item/weapon/gun/energy/plasmastun, +/obj/item/gun/energy/plasmastun, +/obj/item/gun/energy/plasmastun, /obj/effect/floor_decal/corner/red{ dir = 5 }, @@ -115,8 +115,8 @@ /area/antag/antag_base) "am" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/darkmatter, -/obj/item/weapon/gun/energy/darkmatter, +/obj/item/gun/energy/darkmatter, +/obj/item/gun/energy/darkmatter, /obj/effect/floor_decal/corner/red{ dir = 5 }, @@ -130,7 +130,7 @@ dir = 5 }, /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/rocket, +/obj/item/gun/launcher/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, @@ -147,8 +147,8 @@ dir = 5 }, /obj/structure/table/rack, -/obj/item/weapon/storage/box/frags, -/obj/item/weapon/storage/box/frags, +/obj/item/storage/box/frags, +/obj/item/storage/box/frags, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -163,7 +163,7 @@ dir = 6 }, /obj/item/ammo_magazine/ammo_box/b145, -/obj/item/weapon/gun/projectile/heavysniper, +/obj/item/gun/projectile/heavysniper, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -188,8 +188,8 @@ /area/antag/antag_base) "as" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/xray, -/obj/item/weapon/gun/energy/xray, +/obj/item/gun/energy/xray, +/obj/item/gun/energy/xray, /obj/effect/floor_decal/corner/red{ dir = 6 }, @@ -272,7 +272,7 @@ /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, -/obj/item/weapon/gun/projectile/revolver/consul, +/obj/item/gun/projectile/revolver/consul, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -285,8 +285,8 @@ }, /obj/item/ammo_magazine/ammo_box/b12g/pellet, /obj/item/ammo_magazine/ammo_box/b12g, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -305,8 +305,8 @@ /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm, -/obj/item/weapon/gun/projectile/luger, -/obj/item/weapon/gun/projectile/luger/brown, +/obj/item/gun/projectile/luger, +/obj/item/gun/projectile/luger/brown, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -317,12 +317,12 @@ /obj/effect/floor_decal/corner/red{ dir = 10 }, -/obj/item/weapon/gun/energy/lasercannon, -/obj/item/weapon/gun/energy/lasercannon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/gun/energy/lasercannon, +/obj/item/gun/energy/lasercannon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -330,8 +330,8 @@ /area/antag/antag_base) "aA" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/sniperrifle, -/obj/item/weapon/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, /obj/effect/floor_decal/corner/red{ dir = 10 }, @@ -365,7 +365,7 @@ /obj/structure/table/woodentable, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, -/obj/item/weapon/melee/telebaton, +/obj/item/melee/telebaton, /obj/machinery/computer/security/telescreen/entertainment{ pixel_w = 0; pixel_x = 0; @@ -415,38 +415,38 @@ /area/antag/antag_base) "aG" = ( /obj/structure/table/standard, -/obj/item/device/radio/headset/syndicate, -/obj/item/device/radio/headset/syndicate, -/obj/item/device/radio/headset/syndicate, -/obj/item/device/radio/headset/syndicate, -/obj/item/device/radio/headset/syndicate/alt, -/obj/item/device/radio/headset/syndicate/alt, -/obj/item/device/radio/headset/syndicate/alt, -/obj/item/device/radio/headset/syndicate/alt, +/obj/item/radio/headset/syndicate, +/obj/item/radio/headset/syndicate, +/obj/item/radio/headset/syndicate, +/obj/item/radio/headset/syndicate, +/obj/item/radio/headset/syndicate/alt, +/obj/item/radio/headset/syndicate/alt, +/obj/item/radio/headset/syndicate/alt, +/obj/item/radio/headset/syndicate/alt, /turf/unsimulated/floor{ icon_state = "lino" }, /area/antag/antag_base) "aH" = ( /obj/structure/table/standard, -/obj/item/device/pda/syndicate, -/obj/item/device/pda/syndicate, -/obj/item/device/pda/syndicate, -/obj/item/device/pda/syndicate, -/obj/item/device/pda/syndicate, -/obj/item/device/pda/syndicate, +/obj/item/pda/syndicate, +/obj/item/pda/syndicate, +/obj/item/pda/syndicate, +/obj/item/pda/syndicate, +/obj/item/pda/syndicate, +/obj/item/pda/syndicate, /turf/unsimulated/floor{ icon_state = "lino" }, /area/antag/antag_base) "aI" = ( /obj/structure/table/standard, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, -/obj/item/weapon/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, +/obj/item/card/id/syndicate, /turf/unsimulated/floor{ icon_state = "lino" }, @@ -485,31 +485,31 @@ /obj/effect/landmark{ name = "Syndicate-Spawn" }, -/obj/item/weapon/bedsheet/pirate, +/obj/item/bedsheet/pirate, /turf/unsimulated/floor{ icon_state = "lino" }, /area/antag/antag_base) "aO" = ( /obj/structure/table/rack, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -517,18 +517,18 @@ /area/antag/antag_base) "aP" = ( /obj/structure/table/rack, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/melee/energy/sword/red, +/obj/item/melee/energy/sword/red, +/obj/item/melee/energy/sword/red, +/obj/item/melee/energy/sword/red, +/obj/item/melee/energy/sword/red, +/obj/item/melee/energy/sword/red, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = 32 @@ -540,11 +540,11 @@ /area/antag/antag_base) "aQ" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, /obj/effect/floor_decal/corner/purple{ dir = 5 }, @@ -562,11 +562,11 @@ /area/antag/antag_base) "aR" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/syndie_kit/imp_uplink, -/obj/item/weapon/storage/box/syndie_kit/imp_uplink, -/obj/item/weapon/storage/box/syndie_kit/imp_uplink, -/obj/item/weapon/storage/box/syndie_kit/imp_uplink, -/obj/item/weapon/storage/box/syndie_kit/imp_uplink, +/obj/item/storage/box/syndie_kit/imp_uplink, +/obj/item/storage/box/syndie_kit/imp_uplink, +/obj/item/storage/box/syndie_kit/imp_uplink, +/obj/item/storage/box/syndie_kit/imp_uplink, +/obj/item/storage/box/syndie_kit/imp_uplink, /obj/effect/floor_decal/corner/green{ dir = 10 }, @@ -649,7 +649,7 @@ /obj/effect/landmark{ name = "Syndicate-Spawn" }, -/obj/item/weapon/bedsheet/pirate, +/obj/item/bedsheet/pirate, /turf/unsimulated/floor{ icon_state = "lino" }, @@ -724,12 +724,12 @@ /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, -/obj/item/weapon/gun/projectile/automatic/c20r, -/obj/item/weapon/gun/projectile/automatic/c20r, -/obj/item/weapon/gun/projectile/automatic/c20r, -/obj/item/weapon/gun/projectile/automatic/c20r, -/obj/item/weapon/gun/projectile/automatic/c20r, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, /obj/effect/floor_decal/corner/red{ dir = 9 }, @@ -743,13 +743,13 @@ /area/antag/antag_base) "bf" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/silenced, -/obj/item/weapon/gun/projectile/silenced, -/obj/item/weapon/gun/projectile/silenced, -/obj/item/weapon/gun/projectile/silenced, -/obj/item/weapon/gun/projectile/silenced, -/obj/item/weapon/gun/projectile/silenced, -/obj/item/weapon/gun/projectile/silenced, +/obj/item/gun/projectile/silenced, +/obj/item/gun/projectile/silenced, +/obj/item/gun/projectile/silenced, +/obj/item/gun/projectile/silenced, +/obj/item/gun/projectile/silenced, +/obj/item/gun/projectile/silenced, +/obj/item/gun/projectile/silenced, /obj/effect/floor_decal/corner/red{ dir = 9 }, @@ -800,12 +800,12 @@ /area/antag/antag_base) "bj" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -843,15 +843,15 @@ /area/antag/antag_base) "bm" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/backpack/dufflebag/syndie, -/obj/item/weapon/storage/backpack/dufflebag/syndie, -/obj/item/weapon/storage/backpack/messenger/black, -/obj/item/weapon/storage/backpack/messenger/black, -/obj/item/weapon/storage/backpack/satchel/norm, -/obj/item/weapon/storage/backpack/satchel/norm, -/obj/item/weapon/storage/backpack/satchel/norm, -/obj/item/weapon/storage/backpack/satchel/norm, -/obj/item/weapon/storage/backpack/satchel/norm, +/obj/item/storage/backpack/dufflebag/syndie, +/obj/item/storage/backpack/dufflebag/syndie, +/obj/item/storage/backpack/messenger/black, +/obj/item/storage/backpack/messenger/black, +/obj/item/storage/backpack/satchel/norm, +/obj/item/storage/backpack/satchel/norm, +/obj/item/storage/backpack/satchel/norm, +/obj/item/storage/backpack/satchel/norm, +/obj/item/storage/backpack/satchel/norm, /turf/unsimulated/floor{ icon_state = "lino" }, @@ -884,10 +884,10 @@ /area/antag/antag_base) "bo" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, /obj/effect/floor_decal/corner/red{ dir = 9 }, @@ -946,12 +946,12 @@ /area/antag/antag_base) "bu" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, /obj/effect/floor_decal/corner/yellow{ dir = 6 }, @@ -965,10 +965,10 @@ /area/antag/antag_base) "bv" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /obj/effect/floor_decal/corner/yellow{ dir = 6 }, @@ -1059,8 +1059,8 @@ /area/antag/antag_base) "bE" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/gun/energy/netgun, +/obj/item/gun/energy/netgun, +/obj/item/gun/energy/netgun, /obj/effect/floor_decal/corner/blue{ dir = 6 }, @@ -1074,29 +1074,29 @@ /area/antag/antag_base) "bF" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, /obj/effect/floor_decal/corner/blue{ dir = 6 }, /obj/effect/floor_decal/corner/blue{ dir = 9 }, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -1126,8 +1126,8 @@ dir = 10 }, /obj/structure/table/rack, -/obj/item/weapon/rig/merc/empty, -/obj/item/weapon/rig/merc/empty, +/obj/item/rig/merc/empty, +/obj/item/rig/merc/empty, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -1155,13 +1155,13 @@ /area/antag/antag_base) "bL" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/oxygen/red, -/obj/item/weapon/tank/oxygen/red, -/obj/item/weapon/tank/oxygen/red, -/obj/item/weapon/tank/oxygen/red, -/obj/item/weapon/tank/oxygen/red, -/obj/item/weapon/tank/oxygen/red, -/obj/item/weapon/tank/oxygen/red, +/obj/item/tank/oxygen/red, +/obj/item/tank/oxygen/red, +/obj/item/tank/oxygen/red, +/obj/item/tank/oxygen/red, +/obj/item/tank/oxygen/red, +/obj/item/tank/oxygen/red, +/obj/item/tank/oxygen/red, /obj/effect/floor_decal/borderfloorblack{ dir = 10 }, @@ -1192,32 +1192,32 @@ /area/antag/antag_base) "bO" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, @@ -1269,11 +1269,11 @@ /area/antag/antag_base) "bT" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/reagent_containers/food/snacks/sandwich, -/obj/item/weapon/reagent_containers/food/snacks/sandwich, -/obj/item/weapon/reagent_containers/food/snacks/sandwich, -/obj/item/weapon/reagent_containers/food/snacks/sandwich, -/obj/item/weapon/reagent_containers/food/snacks/sandwich, +/obj/item/reagent_containers/food/snacks/sandwich, +/obj/item/reagent_containers/food/snacks/sandwich, +/obj/item/reagent_containers/food/snacks/sandwich, +/obj/item/reagent_containers/food/snacks/sandwich, +/obj/item/reagent_containers/food/snacks/sandwich, /turf/unsimulated/floor{ name = "plating"; icon_state = "cult" @@ -1301,9 +1301,9 @@ /area/antag/antag_base) "bX" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -1311,12 +1311,12 @@ /area/antag/antag_base) "bY" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, @@ -1327,12 +1327,12 @@ /area/antag/antag_base) "bZ" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -1361,11 +1361,11 @@ /area/antag/antag_base) "cb" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -1379,38 +1379,38 @@ /area/antag/antag_base) "cc" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/belt/security{ +/obj/item/storage/belt/security{ name = "black belt" }, -/obj/item/weapon/storage/belt/security{ +/obj/item/storage/belt/security{ name = "black belt" }, -/obj/item/weapon/storage/belt/security{ +/obj/item/storage/belt/security{ name = "black belt" }, -/obj/item/weapon/storage/belt/security{ +/obj/item/storage/belt/security{ name = "black belt" }, -/obj/item/weapon/storage/belt/security{ +/obj/item/storage/belt/security{ name = "black belt" }, -/obj/item/weapon/storage/belt/security{ +/obj/item/storage/belt/security{ name = "black belt" }, -/obj/item/weapon/storage/belt/security{ +/obj/item/storage/belt/security{ name = "black belt" }, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical/bandolier, -/obj/item/weapon/storage/belt/security/tactical/bandolier, -/obj/item/weapon/storage/belt/security/tactical/bandolier, -/obj/item/weapon/storage/belt/security/tactical/bandolier, -/obj/item/weapon/storage/belt/security/tactical/bandolier, -/obj/item/weapon/storage/belt/security/tactical/bandolier, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical/bandolier, +/obj/item/storage/belt/security/tactical/bandolier, +/obj/item/storage/belt/security/tactical/bandolier, +/obj/item/storage/belt/security/tactical/bandolier, +/obj/item/storage/belt/security/tactical/bandolier, +/obj/item/storage/belt/security/tactical/bandolier, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -1421,12 +1421,12 @@ /area/antag/antag_base) "cd" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /obj/effect/floor_decal/borderfloorblack{ dir = 5 }, @@ -1453,7 +1453,7 @@ /obj/machinery/vending/cigarette{ name = "Breach Corp cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/unsimulated/floor{ name = "plating"; @@ -1471,7 +1471,7 @@ /area/antag/antag_base) "ch" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/donut{ +/obj/item/storage/box/donut{ desc = "There's a name, and a message written on the lid. It reads, \"DO NOT EAT. That means you, Dave!\""; name = "Mike's donut box" }, @@ -1481,15 +1481,15 @@ }, /area/antag/antag_base) "ci" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /obj/structure/table/glass, -/obj/item/weapon/folder{ +/obj/item/folder{ pixel_y = 2 }, /turf/unsimulated/floor{ @@ -1508,13 +1508,13 @@ /area/antag/antag_base) "ck" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/smokes, -/obj/item/weapon/storage/box/frags, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/smokes, +/obj/item/storage/box/frags, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -1522,20 +1522,20 @@ /area/antag/antag_base) "cl" = ( /obj/structure/table/rack, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -1543,14 +1543,14 @@ /area/antag/antag_base) "cm" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/clotting, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/clotting, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/fire, /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, @@ -1582,12 +1582,12 @@ /area/antag/antag_base) "cp" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/syndie_kit/combat_armor, -/obj/item/weapon/storage/box/syndie_kit/combat_armor, -/obj/item/weapon/storage/box/syndie_kit/combat_armor, -/obj/item/weapon/storage/box/syndie_kit/combat_armor, -/obj/item/weapon/storage/box/syndie_kit/combat_armor, -/obj/item/weapon/storage/box/syndie_kit/combat_armor, +/obj/item/storage/box/syndie_kit/combat_armor, +/obj/item/storage/box/syndie_kit/combat_armor, +/obj/item/storage/box/syndie_kit/combat_armor, +/obj/item/storage/box/syndie_kit/combat_armor, +/obj/item/storage/box/syndie_kit/combat_armor, +/obj/item/storage/box/syndie_kit/combat_armor, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -1595,15 +1595,15 @@ /area/antag/antag_base) "cq" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/syndie_kit/ewar_voice, -/obj/item/weapon/storage/box/syndie_kit/ewar_voice, -/obj/item/weapon/storage/box/syndie_kit/ewar_voice, -/obj/item/weapon/storage/box/syndie_kit/ewar_voice, +/obj/item/storage/box/syndie_kit/ewar_voice, +/obj/item/storage/box/syndie_kit/ewar_voice, +/obj/item/storage/box/syndie_kit/ewar_voice, +/obj/item/storage/box/syndie_kit/ewar_voice, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 }, -/obj/item/weapon/card/emag, +/obj/item/card/emag, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -1611,19 +1611,19 @@ /area/antag/antag_base) "cr" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/syndie_kit/spy, -/obj/item/weapon/storage/box/syndie_kit/spy, -/obj/item/weapon/storage/box/syndie_kit/spy, -/obj/item/weapon/storage/box/syndie_kit/spy, -/obj/item/weapon/storage/box/syndie_kit/spy, -/obj/item/device/radio_jammer, -/obj/item/device/radio_jammer, -/obj/item/device/radio_jammer, -/obj/item/device/radio_jammer, -/obj/item/device/radio_jammer, -/obj/item/device/chameleon, -/obj/item/device/chameleon, -/obj/item/device/chameleon, +/obj/item/storage/box/syndie_kit/spy, +/obj/item/storage/box/syndie_kit/spy, +/obj/item/storage/box/syndie_kit/spy, +/obj/item/storage/box/syndie_kit/spy, +/obj/item/storage/box/syndie_kit/spy, +/obj/item/radio_jammer, +/obj/item/radio_jammer, +/obj/item/radio_jammer, +/obj/item/radio_jammer, +/obj/item/radio_jammer, +/obj/item/chameleon, +/obj/item/chameleon, +/obj/item/chameleon, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 @@ -1635,12 +1635,12 @@ /area/antag/antag_base) "cs" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/syndie_kit/chameleon, -/obj/item/weapon/storage/box/syndie_kit/chameleon, -/obj/item/weapon/storage/box/syndie_kit/chameleon, -/obj/item/weapon/storage/box/syndie_kit/chameleon, -/obj/item/weapon/storage/box/syndie_kit/chameleon, -/obj/item/weapon/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, +/obj/item/storage/box/syndie_kit/chameleon, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 @@ -1652,33 +1652,33 @@ /area/antag/antag_base) "ct" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/syndie_kit/demolitions_super_heavy{ +/obj/item/storage/box/syndie_kit/demolitions_super_heavy{ name = "Super Heavy Demolitions kit" }, -/obj/item/weapon/storage/box/syndie_kit/demolitions_heavy{ +/obj/item/storage/box/syndie_kit/demolitions_heavy{ name = "Heavy Demolitions kit" }, -/obj/item/weapon/storage/box/syndie_kit/demolitions_heavy{ +/obj/item/storage/box/syndie_kit/demolitions_heavy{ name = "Heavy Demolitions kit" }, -/obj/item/weapon/storage/box/syndie_kit/demolitions{ +/obj/item/storage/box/syndie_kit/demolitions{ name = "Demolitions kit" }, -/obj/item/weapon/storage/box/syndie_kit/demolitions{ +/obj/item/storage/box/syndie_kit/demolitions{ name = "Demolitions kit" }, -/obj/item/weapon/storage/box/syndie_kit/demolitions{ +/obj/item/storage/box/syndie_kit/demolitions{ name = "Demolitions kit" }, -/obj/item/weapon/storage/box/syndie_kit/demolitions{ +/obj/item/storage/box/syndie_kit/demolitions{ name = "Demolitions kit" }, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -1736,12 +1736,12 @@ /area/antag/antag_base) "cy" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/med, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/med, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/med, /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, @@ -1764,8 +1764,8 @@ /obj/item/stack/medical/ointment, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, /obj/item/stack/medical/advanced/bruise_pack, /obj/item/stack/medical/advanced/bruise_pack, /obj/item/stack/medical/advanced/bruise_pack, @@ -1804,9 +1804,9 @@ /obj/structure/closet{ name = "custodial" }, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/spray/cleaner, /obj/effect/floor_decal/borderfloorblack{ dir = 5 }, @@ -1817,18 +1817,18 @@ /area/antag/antag_base) "cD" = ( /obj/structure/table/rack, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, /obj/effect/floor_decal/borderfloorblack{ dir = 10 }, @@ -1839,12 +1839,12 @@ /area/antag/antag_base) "cE" = ( /obj/structure/table/rack, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, /obj/effect/floor_decal/borderfloorblack, /turf/unsimulated/floor{ dir = 2; @@ -1853,11 +1853,11 @@ /area/antag/antag_base) "cF" = ( /obj/structure/table/rack, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, /obj/effect/floor_decal/borderfloorblack, /turf/unsimulated/floor{ dir = 2; @@ -1880,11 +1880,11 @@ /area/antag/antag_base) "cH" = ( /obj/structure/table/rack, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /obj/effect/floor_decal/borderfloorblack, /turf/unsimulated/floor{ dir = 2; @@ -1893,12 +1893,12 @@ /area/antag/antag_base) "cI" = ( /obj/structure/table/rack, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, +/obj/item/pinpointer/nukeop, +/obj/item/pinpointer/nukeop, +/obj/item/pinpointer/nukeop, +/obj/item/pinpointer/nukeop, +/obj/item/pinpointer/nukeop, +/obj/item/pinpointer/nukeop, /obj/effect/floor_decal/borderfloorblack, /turf/unsimulated/floor{ dir = 2; @@ -1907,13 +1907,13 @@ /area/antag/antag_base) "cJ" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, /obj/effect/floor_decal/borderfloorblack{ dir = 6 }, @@ -1982,12 +1982,12 @@ }, /area/antag/antag_base) "cP" = ( -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs, -/obj/item/weapon/handcuffs/fuzzy, -/obj/item/weapon/handcuffs/fuzzy, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs, +/obj/item/handcuffs/fuzzy, +/obj/item/handcuffs/fuzzy, +/obj/item/handcuffs, /obj/structure/table/steel, /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -2025,7 +2025,7 @@ }, /area/antag/antag_base) "cS" = ( -/obj/item/weapon/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, /obj/structure/table/steel, /turf/unsimulated/floor{ dir = 2; @@ -2205,18 +2205,18 @@ }, /area/antag/antag_base) "dk" = ( -/obj/item/weapon/material/knife/plastic{ +/obj/item/material/knife/plastic{ pixel_x = -6 }, -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = -1 }, -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/syringe/drugs{ +/obj/item/reagent_containers/syringe/drugs{ pixel_x = 3; pixel_y = 9 }, @@ -2237,7 +2237,7 @@ dir = 4; icon_state = "twindow" }, -/obj/item/weapon/soap/syndie, +/obj/item/soap/syndie, /turf/unsimulated/floor{ icon_state = "freezerfloor"; dir = 2 @@ -2320,21 +2320,21 @@ }, /area/antag/antag_base) "dx" = ( -/obj/item/device/defib_kit, -/obj/item/device/defib_kit, +/obj/item/defib_kit, +/obj/item/defib_kit, /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /turf/unsimulated/floor{ icon_state = "white" }, /area/antag/antag_base) "dy" = ( -/obj/item/weapon/reagent_containers/blood/AMinus, -/obj/item/weapon/reagent_containers/blood/APlus, -/obj/item/weapon/reagent_containers/blood/BMinus, -/obj/item/weapon/reagent_containers/blood/BPlus, -/obj/item/weapon/reagent_containers/blood/OPlus, +/obj/item/reagent_containers/blood/AMinus, +/obj/item/reagent_containers/blood/APlus, +/obj/item/reagent_containers/blood/BMinus, +/obj/item/reagent_containers/blood/BPlus, +/obj/item/reagent_containers/blood/OPlus, /obj/structure/closet/crate/freezer, /turf/unsimulated/floor{ icon_state = "white" @@ -2342,12 +2342,12 @@ /area/antag/antag_base) "dz" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/unsimulated/floor{ icon_state = "white" }, @@ -2360,23 +2360,23 @@ /area/antag/antag_base) "dB" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw, -/obj/item/weapon/surgical/surgicaldrill, +/obj/item/surgical/circular_saw, +/obj/item/surgical/surgicaldrill, /turf/unsimulated/floor{ icon_state = "white" }, /area/antag/antag_base) "dC" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/retractor, -/obj/item/weapon/surgical/bonesetter, +/obj/item/surgical/retractor, +/obj/item/surgical/bonesetter, /turf/unsimulated/floor{ icon_state = "white" }, /area/antag/antag_base) "dD" = ( -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, /obj/structure/table/steel, /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -2398,7 +2398,7 @@ /area/antag/antag_base) "dF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tray{ +/obj/item/tray{ pixel_y = 5 }, /turf/unsimulated/floor{ @@ -2440,8 +2440,8 @@ /area/antag/antag_base) "dK" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/cautery, -/obj/item/weapon/surgical/FixOVein, +/obj/item/surgical/cautery, +/obj/item/surgical/FixOVein, /turf/unsimulated/floor{ icon_state = "white" }, @@ -2451,10 +2451,10 @@ pixel_x = 5; pixel_y = -32 }, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /obj/structure/table/steel, /obj/effect/floor_decal/borderfloorblack, /turf/unsimulated/floor{ @@ -2472,8 +2472,8 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 6 }, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, /turf/unsimulated/floor{ dir = 2; icon_state = "dark" @@ -2518,11 +2518,11 @@ /area/antag/antag_base) "dQ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/food/drinks/bottle/vodka{ pixel_x = 3; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine{ +/obj/item/reagent_containers/food/drinks/bottle/wine{ pixel_x = -1; pixel_y = 8 }, @@ -2549,7 +2549,7 @@ /area/antag/antag_base) "dT" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/glasses/square{ +/obj/item/storage/box/glasses/square{ pixel_x = 1; pixel_y = 4 }, @@ -2572,9 +2572,9 @@ /area/antag/antag_base) "dW" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/scalpel, -/obj/item/device/healthanalyzer, -/obj/item/weapon/surgical/hemostat, +/obj/item/surgical/scalpel, +/obj/item/healthanalyzer, +/obj/item/surgical/hemostat, /turf/unsimulated/floor{ icon_state = "white" }, @@ -2618,22 +2618,22 @@ name = "Grenade Crate"; opened = 1 }, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, /turf/unsimulated/floor{ icon_state = "white" }, /area/antag/antag_base) "eb" = ( -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/storage/box/beakers, +/obj/item/tool/screwdriver, +/obj/item/storage/box/beakers, /obj/item/stack/material/phoron, /obj/item/stack/material/phoron, /obj/item/stack/material/phoron, @@ -2647,7 +2647,7 @@ "ec" = ( /obj/structure/table/standard, /obj/machinery/reagentgrinder, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /obj/effect/floor_decal/steeldecal/steel_decals10, /turf/unsimulated/floor{ icon_state = "white" @@ -2706,8 +2706,8 @@ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/surgical/bonegel, -/obj/item/weapon/surgical/bonegel, +/obj/item/surgical/bonegel, +/obj/item/surgical/bonegel, /obj/item/stack/nanopaste, /turf/unsimulated/floor{ icon_state = "white" @@ -2930,18 +2930,18 @@ req_access = list(150) }, /obj/item/bodybag, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{ +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/glass/bottle/antitoxin{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{ +/obj/item/reagent_containers/glass/bottle/inaprovaline{ pixel_x = 4; pixel_y = 7 }, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /turf/simulated/shuttle/floor/white, /area/shuttle/mercenary) "eB" = ( @@ -3012,9 +3012,9 @@ /obj/structure/closet{ name = "custodial" }, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/spray/cleaner, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, @@ -3024,7 +3024,7 @@ "eK" = ( /obj/structure/table/standard, /obj/item/stack/cable_coil/black, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /turf/simulated/floor/plating, /area/shuttle/mercenary) "eL" = ( @@ -3120,9 +3120,9 @@ /area/shuttle/mercenary) "eW" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/device/radio/intercom{ +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -3207,13 +3207,13 @@ /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/firstaid/combat, /obj/machinery/light{ dir = 4 }, -/obj/item/device/defib_kit/compact/combat/loaded, +/obj/item/defib_kit/compact/combat/loaded, /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, @@ -3275,9 +3275,9 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/surgical/cautery, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/surgicaldrill, +/obj/item/surgical/cautery, +/obj/item/surgical/retractor, /obj/item/stack/nanopaste, /obj/structure/window/reinforced{ dir = 8 @@ -3297,18 +3297,18 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw, -/obj/item/weapon/surgical/FixOVein{ +/obj/item/surgical/circular_saw, +/obj/item/surgical/FixOVein{ pixel_x = -6; pixel_y = 1 }, -/obj/item/weapon/surgical/hemostat, +/obj/item/surgical/hemostat, /obj/machinery/light{ dir = 4; icon_state = "tube1"; pixel_x = 0 }, -/obj/item/weapon/surgical/surgicaldrill, +/obj/item/surgical/surgicaldrill, /turf/simulated/shuttle/floor, /area/shuttle/mercenary) "fp" = ( @@ -3375,13 +3375,13 @@ pixel_y = 0; req_access = list(150) }, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/surgical, /obj/item/clothing/gloves/sterile/latex, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/glass/bottle/stoxin, /turf/simulated/shuttle/floor, /area/shuttle/mercenary) "fz" = ( @@ -3399,7 +3399,7 @@ }, /area/antag/antag_base) "fB" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -3430,7 +3430,7 @@ /area/shuttle/mercenary) "fE" = ( /obj/structure/table/glass, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -3466,21 +3466,21 @@ /turf/simulated/floor/plating, /area/shuttle/mercenary) "fH" = ( -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 1 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 1 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/structure/table/reinforced, /turf/simulated/shuttle/floor/white, /area/shuttle/mercenary) @@ -3504,7 +3504,7 @@ /turf/simulated/shuttle/floor, /area/shuttle/mercenary) "fL" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -3513,9 +3513,9 @@ syndie = 1 }, /obj/structure/table/standard, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel{ +/obj/item/surgical/scalpel, +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel{ pixel_x = 4; pixel_y = 3 }, @@ -3552,7 +3552,7 @@ /obj/item/ammo_magazine/m380, /obj/item/ammo_magazine/m380, /obj/item/ammo_magazine/m380, -/obj/item/weapon/gun/projectile/giskard, +/obj/item/gun/projectile/giskard, /obj/item/clothing/accessory/holster, /turf/simulated/shuttle/floor{ icon_state = "floor_red" @@ -3562,7 +3562,7 @@ /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/simulated/shuttle/floor{ icon_state = "floor_red" @@ -3707,10 +3707,10 @@ /area/shuttle/mercenary) "gd" = ( /obj/structure/closet, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, /obj/machinery/light{ dir = 8; icon_state = "tube1"; @@ -3722,10 +3722,10 @@ /area/shuttle/mercenary) "ge" = ( /obj/structure/closet, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, -/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, @@ -3737,7 +3737,7 @@ }, /area/shuttle/mercenary) "gg" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -3842,7 +3842,7 @@ }, /area/shuttle/mercenary) "gq" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -3875,7 +3875,7 @@ }, /area/shuttle/mercenary) "gs" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -3911,7 +3911,7 @@ }, /area/shuttle/mercenary) "gv" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -3999,7 +3999,7 @@ /area/shuttle/mercenary) "gE" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /obj/machinery/light{ dir = 8; icon_state = "tube1"; @@ -4011,14 +4011,14 @@ /area/shuttle/mercenary) "gF" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, /area/shuttle/mercenary) "gG" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /obj/machinery/light{ dir = 4 }, @@ -4048,7 +4048,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -4057,25 +4057,25 @@ syndie = 1 }, /obj/structure/table/reinforced, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/device/assembly/signaler{ +/obj/item/assembly/signaler{ pixel_y = 2 }, -/obj/item/device/assembly/signaler{ +/obj/item/assembly/signaler{ pixel_y = 2 }, -/obj/item/device/assembly/signaler{ +/obj/item/assembly/signaler{ pixel_y = 2 }, /obj/item/clothing/gloves/yellow, @@ -4133,7 +4133,7 @@ /area/shuttle/mercenary) "gP" = ( /obj/structure/table/rack, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Remember to stock the armory before leaving.\[br]-Mike"; name = "reminder" }, @@ -4150,7 +4150,7 @@ }, /area/shuttle/mercenary) "gR" = ( -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /obj/effect/spawner/newbomb/timer/syndicate, /obj/structure/table/reinforced, /turf/simulated/shuttle/floor{ @@ -4158,7 +4158,7 @@ }, /area/shuttle/mercenary) "gS" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -4243,19 +4243,19 @@ /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/firstaid/combat, /obj/machinery/light{ dir = 4 }, -/obj/item/device/defib_kit/compact/combat/loaded, +/obj/item/defib_kit/compact/combat/loaded, /turf/simulated/shuttle/floor{ icon_state = "floor_red" }, /area/shuttle/mercenary) "ha" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -4284,7 +4284,7 @@ }, /area/shuttle/mercenary) "hc" = ( -/obj/item/weapon/storage/box/frags, +/obj/item/storage/box/frags, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 4; @@ -4359,10 +4359,10 @@ }, /area/shuttle/mercenary) "hj" = ( -/obj/item/device/aicard, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, +/obj/item/aicard, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, /obj/structure/table/reinforced, /turf/simulated/shuttle/floor{ icon_state = "floor_black" @@ -4426,8 +4426,8 @@ /area/shuttle/mercenary) "hp" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/device/multitool, +/obj/item/storage/belt/utility/full, +/obj/item/multitool, /turf/simulated/shuttle/floor{ icon_state = "floor_black" }, diff --git a/maps/submaps/depreciated_vr/talon.dm b/maps/submaps/depreciated_vr/talon.dm index 41933826daf..be4d26c5f43 100644 --- a/maps/submaps/depreciated_vr/talon.dm +++ b/maps/submaps/depreciated_vr/talon.dm @@ -127,7 +127,7 @@ var/global/list/latejoin_talon = list() /obj/machinery/telecomms/allinone/talon freq_listening = list(PUB_FREQ, TALON_FREQ) -/obj/item/weapon/paper/talon_shields +/obj/item/paper/talon_shields name = "to whatever asshole" info = {"to whatever asshole keeps resetting the shield generator,
\ please stop fucking around before you get us all killed. thanks.
\ @@ -143,7 +143,7 @@ good luck
\
\ Harry Townes"} -/obj/item/weapon/paper/talon_lifeboat +/obj/item/paper/talon_lifeboat name = "Survival Directions" info = {"

Survival Directions


Only jettison lifeboat into space if no other means of survival available.
@@ -162,16 +162,16 @@ Once in open space, consider disabling nonessential power-consuming electronics /mob/living/silicon/robot/drone/talon foreign_droid = TRUE - idcard_type = /obj/item/weapon/card/id/synthetic/talon + idcard_type = /obj/item/card/id/synthetic/talon -/obj/item/weapon/card/id/synthetic/talon +/obj/item/card/id/synthetic/talon name = "\improper Talon synthetic ID" desc = "Access module for Talon synthetics" icon_state = "id-robot" item_state = "tdgreen" assignment = "Talon synthetic" -/obj/item/weapon/card/id/synthetic/talon/Initialize() +/obj/item/card/id/synthetic/talon/Initialize() . = ..() access = list(access_talon, access_synth) @@ -188,7 +188,7 @@ Once in open space, consider disabling nonessential power-consuming electronics req_one_access = list(access_talon) /obj/machinery/power/apc/talon/hyper - cell_type = /obj/item/weapon/cell/hyper + cell_type = /obj/item/cell/hyper /obj/machinery/alarm/talon req_access = list() @@ -246,17 +246,17 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/clothing/suit/space/void/mining/talon name = "talon miner's voidsuit" -/obj/item/device/gps/command/taloncap +/obj/item/gps/command/taloncap gps_tag = "TALC" -/obj/item/device/gps/security/talonguard +/obj/item/gps/security/talonguard gps_tag = "TALG" -/obj/item/device/gps/medical/talonmed +/obj/item/gps/medical/talonmed gps_tag = "TALM" -/obj/item/device/gps/engineering/taloneng +/obj/item/gps/engineering/taloneng gps_tag = "TALE" -/obj/item/device/gps/explorer/talonpilot +/obj/item/gps/explorer/talonpilot gps_tag = "TALP" -/obj/item/device/gps/mining/talonminer +/obj/item/gps/mining/talonminer gps_tag = "TALM" /obj/structure/closet/secure_closet/talon_captain @@ -265,16 +265,16 @@ Once in open space, consider disabling nonessential power-consuming electronics closet_appearance = /decl/closet_appearance/secure_closet/talon/captain starts_with = list( - /obj/item/weapon/storage/backpack/dufflebag/captain, + /obj/item/storage/backpack/dufflebag/captain, /obj/item/clothing/suit/storage/vest, - /obj/item/weapon/melee/telebaton, - /obj/item/device/flash, - /obj/item/device/radio/headset/talon, + /obj/item/melee/telebaton, + /obj/item/flash, + /obj/item/radio/headset/talon, /obj/item/clothing/head/helmet/space/void/refurb/officer/talon, /obj/item/clothing/suit/space/void/refurb/officer/talon, - /obj/item/weapon/tank/oxygen, - /obj/item/device/suit_cooling_unit, - /obj/item/device/gps/command/taloncap + /obj/item/tank/oxygen, + /obj/item/suit_cooling_unit, + /obj/item/gps/command/taloncap ) /obj/structure/closet/secure_closet/talon_guard @@ -287,21 +287,21 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/clothing/under/utility, /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/shoes/boots/jackboots/toeless, - /obj/item/weapon/handcuffs = 2, - /obj/item/weapon/gun/energy/stunrevolver, + /obj/item/handcuffs = 2, + /obj/item/gun/energy/stunrevolver, /obj/item/clothing/accessory/armor/tag/sec, - /obj/item/device/flash, - /obj/item/device/flashlight/maglight, + /obj/item/flash, + /obj/item/flashlight/maglight, /obj/item/clothing/glasses/sunglasses, - /obj/item/weapon/storage/belt/security, - /obj/item/device/radio/headset/talon, + /obj/item/storage/belt/security, + /obj/item/radio/headset/talon, /obj/item/clothing/accessory/solgov/department/security/army, /obj/item/clothing/head/helmet/space/void/refurb/marine/talon, /obj/item/clothing/suit/space/void/refurb/marine/talon, - /obj/item/weapon/tank/oxygen, - /obj/item/device/suit_cooling_unit, - /obj/item/device/gps/security/talonguard, - /obj/item/weapon/melee/baton + /obj/item/tank/oxygen, + /obj/item/suit_cooling_unit, + /obj/item/gps/security/talonguard, + /obj/item/melee/baton ) /obj/structure/closet/secure_closet/talon_doctor @@ -316,12 +316,12 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/clothing/suit/storage/toggle/labcoat, /obj/item/clothing/suit/storage/toggle/fr_jacket, /obj/item/clothing/shoes/white, - /obj/item/device/radio/headset/talon, + /obj/item/radio/headset/talon, /obj/item/clothing/head/helmet/space/void/refurb/medical/alt/talon, /obj/item/clothing/suit/space/void/refurb/medical/talon, - /obj/item/weapon/tank/oxygen, - /obj/item/device/suit_cooling_unit, - /obj/item/device/gps/medical/talonmed + /obj/item/tank/oxygen, + /obj/item/suit_cooling_unit, + /obj/item/gps/medical/talonmed ) /obj/structure/closet/secure_closet/talon_engineer @@ -331,19 +331,19 @@ Once in open space, consider disabling nonessential power-consuming electronics starts_with = list( /obj/item/clothing/accessory/storage/brown_vest, - /obj/item/device/flashlight, - /obj/item/weapon/extinguisher, + /obj/item/flashlight, + /obj/item/extinguisher, /obj/item/clamp, - /obj/item/device/radio/headset/talon, + /obj/item/radio/headset/talon, /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/mask/gas, /obj/item/taperoll/atmos, - /obj/item/weapon/tank/emergency/oxygen/engi, + /obj/item/tank/emergency/oxygen/engi, /obj/item/clothing/head/helmet/space/void/refurb/engineering/talon, /obj/item/clothing/suit/space/void/refurb/engineering/talon, - /obj/item/weapon/tank/oxygen, - /obj/item/device/suit_cooling_unit, - /obj/item/device/gps/engineering/taloneng + /obj/item/tank/oxygen, + /obj/item/suit_cooling_unit, + /obj/item/gps/engineering/taloneng ) /obj/structure/closet/secure_closet/talon_pilot @@ -352,25 +352,25 @@ Once in open space, consider disabling nonessential power-consuming electronics closet_appearance = /decl/closet_appearance/secure_closet/talon/pilot starts_with = list( - /obj/item/weapon/material/knife/tacknife/survival, + /obj/item/material/knife/tacknife/survival, /obj/item/clothing/head/ompilot, /obj/item/clothing/under/rank/pilot1, /obj/item/clothing/suit/storage/toggle/bomber/pilot, /obj/item/clothing/gloves/fingerless, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood, - /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, - /obj/item/device/radio, + /obj/item/reagent_containers/food/snacks/liquidfood, + /obj/item/reagent_containers/food/drinks/cans/waterbottle, + /obj/item/radio, /obj/item/clothing/under/utility/blue, /obj/item/clothing/accessory/solgov/specialty/pilot, /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/shoes/boots/jackboots/toeless, - /obj/item/device/radio/headset/talon, - /obj/item/device/flashlight/color/orange, + /obj/item/radio/headset/talon, + /obj/item/flashlight/color/orange, /obj/item/clothing/head/helmet/space/void/refurb/pilot/talon, /obj/item/clothing/suit/space/void/refurb/pilot/talon, - /obj/item/weapon/tank/oxygen, - /obj/item/device/suit_cooling_unit, - /obj/item/device/gps/explorer/talonpilot + /obj/item/tank/oxygen, + /obj/item/suit_cooling_unit, + /obj/item/gps/explorer/talonpilot ) /obj/structure/closet/secure_closet/talon_miner @@ -379,19 +379,19 @@ Once in open space, consider disabling nonessential power-consuming electronics closet_appearance = /decl/closet_appearance/secure_closet/talon/miner starts_with = list( - /obj/item/device/radio/headset/talon, + /obj/item/radio/headset/talon, /obj/item/clothing/head/helmet/space/void/refurb/mining/talon, /obj/item/clothing/suit/space/void/refurb/mining/talon, - /obj/item/weapon/tank/oxygen, - /obj/item/device/suit_cooling_unit, - /obj/item/device/gps/mining/talonminer, + /obj/item/tank/oxygen, + /obj/item/suit_cooling_unit, + /obj/item/gps/mining/talonminer, /obj/item/clothing/gloves/black, - /obj/item/device/analyzer, - /obj/item/weapon/storage/bag/ore, - /obj/item/device/flashlight/lantern, - /obj/item/weapon/shovel, - /obj/item/weapon/pickaxe/drill, - /obj/item/weapon/mining_scanner, + /obj/item/analyzer, + /obj/item/storage/bag/ore, + /obj/item/flashlight/lantern, + /obj/item/shovel, + /obj/item/pickaxe/drill, + /obj/item/mining_scanner, /obj/item/clothing/glasses/material, /obj/item/clothing/glasses/meson ) @@ -402,14 +402,14 @@ Once in open space, consider disabling nonessential power-consuming electronics icon_state = "med" product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!" req_access = list(access_talon) - products = list(/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 4, - /obj/item/weapon/reagent_containers/glass/bottle/stoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/toxin = 4, - /obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/syringe = 12, - /obj/item/device/healthanalyzer = 5,/obj/item/weapon/reagent_containers/glass/beaker = 4, /obj/item/weapon/reagent_containers/dropper = 2, + products = list(/obj/item/reagent_containers/glass/bottle/antitoxin = 4,/obj/item/reagent_containers/glass/bottle/inaprovaline = 4, + /obj/item/reagent_containers/glass/bottle/stoxin = 4,/obj/item/reagent_containers/glass/bottle/toxin = 4, + /obj/item/reagent_containers/syringe/antiviral = 4,/obj/item/reagent_containers/syringe = 12, + /obj/item/healthanalyzer = 5,/obj/item/reagent_containers/glass/beaker = 4, /obj/item/reagent_containers/dropper = 2, /obj/item/stack/medical/advanced/bruise_pack = 6, /obj/item/stack/medical/advanced/ointment = 6, /obj/item/stack/medical/splint = 4, - /obj/item/weapon/storage/pill_bottle/carbon = 2, /obj/item/weapon/storage/box/khcrystal = 4, /obj/item/clothing/glasses/omnihud/med = 4, - /obj/item/device/glasses_kit = 1, /obj/item/weapon/storage/quickdraw/syringe_case = 4) - contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3,/obj/item/weapon/reagent_containers/pill/stox = 4,/obj/item/weapon/reagent_containers/pill/antitox = 6) + /obj/item/storage/pill_bottle/carbon = 2, /obj/item/storage/box/khcrystal = 4, /obj/item/clothing/glasses/omnihud/med = 4, + /obj/item/glasses_kit = 1, /obj/item/storage/quickdraw/syringe_case = 4) + contraband = list(/obj/item/reagent_containers/pill/tox = 3,/obj/item/reagent_containers/pill/stox = 4,/obj/item/reagent_containers/pill/antitox = 6) idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. req_log_access = access_talon has_logs = 1 @@ -512,11 +512,11 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/modular_computer/console/preset/talon/install_default_hardware() ..() - processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(src) - tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/super(src) - network_card = new/obj/item/weapon/computer_hardware/network_card/wired(src) - nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) + processor_unit = new/obj/item/computer_hardware/processor_unit(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive/super(src) + network_card = new/obj/item/computer_hardware/network_card/wired(src) + nano_printer = new/obj/item/computer_hardware/nano_printer(src) /obj/item/modular_computer/console/preset/talon/install_default_programs() ..() diff --git a/maps/submaps/depreciated_vr/talon1.dmm b/maps/submaps/depreciated_vr/talon1.dmm index 85b53c05466..e43a3356568 100644 --- a/maps/submaps/depreciated_vr/talon1.dmm +++ b/maps/submaps/depreciated_vr/talon1.dmm @@ -84,8 +84,8 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/alarm/talon{ dir = 8; pixel_x = 22 @@ -213,10 +213,10 @@ /area/space) "ax" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, /turf/simulated/floor/tiled/eris/dark/danger, /area/space) "ay" = ( @@ -274,10 +274,10 @@ "aD" = ( /obj/structure/table/rack/steel, /obj/machinery/camera/network/talon, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/eris/dark/danger, /area/space) "aE" = ( @@ -356,11 +356,11 @@ /area/space) "aN" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /turf/simulated/floor/tiled/eris/dark/danger, /area/space) "aP" = ( @@ -413,7 +413,7 @@ dir = 1 }, /obj/structure/closet/wardrobe/black{ - starts_with = list(/obj/item/clothing/under/color/black = 4, /obj/item/clothing/accessory/storage/black_vest = 4, /obj/item/clothing/accessory/storage/black_drop_pouches = 4, /obj/item/clothing/gloves/black = 4, /obj/item/clothing/head/soft/black = 4, /obj/item/clothing/mask/balaclava = 4, /obj/item/clothing/mask/bandana = 4, /obj/item/clothing/mask/gas/commando = 4, /obj/item/weapon/storage/backpack/messenger/black = 4, /obj/item/weapon/storage/backpack/dufflebag = 4, /obj/item/clothing/shoes/black = 4, /obj/item/clothing/shoes/boots/duty = 4) + starts_with = list(/obj/item/clothing/under/color/black = 4, /obj/item/clothing/accessory/storage/black_vest = 4, /obj/item/clothing/accessory/storage/black_drop_pouches = 4, /obj/item/clothing/gloves/black = 4, /obj/item/clothing/head/soft/black = 4, /obj/item/clothing/mask/balaclava = 4, /obj/item/clothing/mask/bandana = 4, /obj/item/clothing/mask/gas/commando = 4, /obj/item/storage/backpack/messenger/black = 4, /obj/item/storage/backpack/dufflebag = 4, /obj/item/clothing/shoes/black = 4, /obj/item/clothing/shoes/boots/duty = 4) }, /turf/simulated/floor/tiled/eris/white/orangecorner, /area/space) @@ -465,7 +465,7 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /obj/item/stack/nanopaste{ pixel_x = -7; pixel_y = -4 @@ -474,7 +474,7 @@ pixel_x = 9; pixel_y = -4 }, -/obj/item/device/robotanalyzer{ +/obj/item/robotanalyzer{ pixel_y = -8 }, /obj/machinery/alarm/talon{ @@ -677,7 +677,7 @@ /area/space) "bE" = ( /obj/machinery/vending/engineering{ - products = list(/obj/item/clothing/under/rank/chief_engineer = 4, /obj/item/clothing/under/rank/engineer = 4, /obj/item/clothing/shoes/orange = 4, /obj/item/clothing/head/hardhat = 4, /obj/item/weapon/storage/belt/utility = 4, /obj/item/clothing/glasses/meson = 4, /obj/item/clothing/gloves/yellow = 4, /obj/item/weapon/tool/screwdriver = 12, /obj/item/weapon/tool/crowbar = 12, /obj/item/weapon/tool/wirecutters = 12, /obj/item/device/multitool = 12, /obj/item/weapon/tool/wrench = 12, /obj/item/device/t_scanner = 12, /obj/item/stack/cable_coil/heavyduty = 8, /obj/item/weapon/cell = 8, /obj/item/weapon/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/weapon/light/tube = 10, /obj/item/clothing/head/hardhat/red = 4, /obj/item/clothing/suit/fire = 4, /obj/item/weapon/stock_parts/scanning_module = 5, /obj/item/weapon/stock_parts/micro_laser = 5, /obj/item/weapon/stock_parts/matter_bin = 5, /obj/item/weapon/stock_parts/manipulator = 5, /obj/item/weapon/stock_parts/console_screen = 5); + products = list(/obj/item/clothing/under/rank/chief_engineer = 4, /obj/item/clothing/under/rank/engineer = 4, /obj/item/clothing/shoes/orange = 4, /obj/item/clothing/head/hardhat = 4, /obj/item/storage/belt/utility = 4, /obj/item/clothing/glasses/meson = 4, /obj/item/clothing/gloves/yellow = 4, /obj/item/tool/screwdriver = 12, /obj/item/tool/crowbar = 12, /obj/item/tool/wirecutters = 12, /obj/item/multitool = 12, /obj/item/tool/wrench = 12, /obj/item/t_scanner = 12, /obj/item/stack/cable_coil/heavyduty = 8, /obj/item/cell = 8, /obj/item/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/light/tube = 10, /obj/item/clothing/head/hardhat/red = 4, /obj/item/clothing/suit/fire = 4, /obj/item/stock_parts/scanning_module = 5, /obj/item/stock_parts/micro_laser = 5, /obj/item/stock_parts/matter_bin = 5, /obj/item/stock_parts/manipulator = 5, /obj/item/stock_parts/console_screen = 5); req_access = list(301); req_log_access = 301; req_one_access = list(301) @@ -686,9 +686,9 @@ /area/space) "bF" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/item/stack/marker_beacon/thirty, -/obj/item/weapon/pipe_dispenser, +/obj/item/pipe_dispenser, /obj/machinery/alarm/talon{ pixel_y = 28 }, @@ -700,15 +700,15 @@ pixel_y = -25 }, /obj/structure/table/rack/steel, -/obj/item/weapon/whetstone{ +/obj/item/whetstone{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/grenade/spawnergrenade/manhacks/mercenary{ +/obj/item/grenade/spawnergrenade/manhacks/mercenary{ pixel_x = -5; pixel_y = 4 }, -/obj/item/device/spaceflare, +/obj/item/spaceflare, /turf/simulated/floor/tiled/eris/white/danger, /area/space) "bH" = ( @@ -738,7 +738,7 @@ "bJ" = ( /obj/structure/closet/hydrant{ pixel_x = -32; - starts_with = list(/obj/item/clothing/suit/fire/firefighter = 2, /obj/item/clothing/mask/gas = 2, /obj/item/device/flashlight = 2, /obj/item/weapon/tank/oxygen/red = 2, /obj/item/weapon/extinguisher = 2, /obj/item/clothing/head/hardhat/red = 2) + starts_with = list(/obj/item/clothing/suit/fire/firefighter = 2, /obj/item/clothing/mask/gas = 2, /obj/item/flashlight = 2, /obj/item/tank/oxygen/red = 2, /obj/item/extinguisher = 2, /obj/item/clothing/head/hardhat/red = 2) }, /turf/simulated/floor/tiled/eris/dark/danger, /area/space) @@ -753,21 +753,21 @@ dir = 1 }, /obj/structure/table/steel, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1); pixel_y = 6 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1); pixel_x = -6; pixel_y = 4 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1); pixel_x = 6; pixel_y = 4 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/tiled/eris/dark/orangecorner, @@ -789,23 +789,23 @@ pixel_y = 28 }, /obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/eris/dark/brown_platform, /area/space) "bO" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/machinery/light_switch{ dir = 1; on = 0; pixel_x = -10; pixel_y = -24 }, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/storage/box/mousetraps, +/obj/item/storage/box/lights/mixed, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/glass/rag, /turf/simulated/floor/tiled/eris/dark/brown_platform, /area/space) "bR" = ( @@ -1076,10 +1076,10 @@ /area/space) "ct" = ( /obj/structure/table/standard, -/obj/item/device/defib_kit/jumper_kit/loaded, -/obj/item/device/defib_kit/loaded, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/device/sleevemate, +/obj/item/defib_kit/jumper_kit/loaded, +/obj/item/defib_kit/loaded, +/obj/item/storage/belt/medical/emt, +/obj/item/sleevemate, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/space) "cu" = ( @@ -1203,12 +1203,12 @@ /area/space) "cI" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/cell/device/weapon{ +/obj/item/gun/energy/gun/burst, +/obj/item/cell/device/weapon{ pixel_x = -5; pixel_y = 2 }, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, /obj/item/clothing/accessory/holster/waist, /turf/simulated/floor/tiled/eris/white/danger, /area/space) @@ -1305,7 +1305,7 @@ /area/space) "cQ" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/gun/energy/locked/frontier/holdout/unlocked, /turf/simulated/floor/tiled/eris/white/danger, /area/space) "cR" = ( @@ -1396,7 +1396,7 @@ /area/space) "db" = ( /obj/machinery/vending/engivend{ - products = list(/obj/item/device/geiger = 4, /obj/item/clothing/glasses/meson = 2, /obj/item/device/multitool = 4, /obj/item/weapon/cell/high = 10, /obj/item/weapon/airlock_electronics = 10, /obj/item/weapon/module/power_control = 10, /obj/item/weapon/circuitboard/airalarm = 10, /obj/item/weapon/circuitboard/firealarm = 10, /obj/item/weapon/circuitboard/status_display = 2, /obj/item/weapon/circuitboard/ai_status_display = 2, /obj/item/weapon/circuitboard/newscaster = 2, /obj/item/weapon/circuitboard/holopad = 2, /obj/item/weapon/circuitboard/intercom = 4, /obj/item/weapon/circuitboard/security/telescreen/entertainment = 4, /obj/item/weapon/stock_parts/motor = 2, /obj/item/weapon/stock_parts/spring = 2, /obj/item/weapon/stock_parts/gear = 2, /obj/item/weapon/circuitboard/atm, /obj/item/weapon/circuitboard/guestpass, /obj/item/weapon/circuitboard/keycard_auth, /obj/item/weapon/circuitboard/photocopier, /obj/item/weapon/circuitboard/fax, /obj/item/weapon/circuitboard/request, /obj/item/weapon/circuitboard/microwave, /obj/item/weapon/circuitboard/washing, /obj/item/weapon/circuitboard/scanner_console, /obj/item/weapon/circuitboard/sleeper_console, /obj/item/weapon/circuitboard/body_scanner, /obj/item/weapon/circuitboard/sleeper, /obj/item/weapon/circuitboard/dna_analyzer, /obj/item/weapon/circuitboard/partslathe); + products = list(/obj/item/geiger = 4, /obj/item/clothing/glasses/meson = 2, /obj/item/multitool = 4, /obj/item/cell/high = 10, /obj/item/airlock_electronics = 10, /obj/item/module/power_control = 10, /obj/item/circuitboard/airalarm = 10, /obj/item/circuitboard/firealarm = 10, /obj/item/circuitboard/status_display = 2, /obj/item/circuitboard/ai_status_display = 2, /obj/item/circuitboard/newscaster = 2, /obj/item/circuitboard/holopad = 2, /obj/item/circuitboard/intercom = 4, /obj/item/circuitboard/security/telescreen/entertainment = 4, /obj/item/stock_parts/motor = 2, /obj/item/stock_parts/spring = 2, /obj/item/stock_parts/gear = 2, /obj/item/circuitboard/atm, /obj/item/circuitboard/guestpass, /obj/item/circuitboard/keycard_auth, /obj/item/circuitboard/photocopier, /obj/item/circuitboard/fax, /obj/item/circuitboard/request, /obj/item/circuitboard/microwave, /obj/item/circuitboard/washing, /obj/item/circuitboard/scanner_console, /obj/item/circuitboard/sleeper_console, /obj/item/circuitboard/body_scanner, /obj/item/circuitboard/sleeper, /obj/item/circuitboard/dna_analyzer, /obj/item/circuitboard/partslathe); req_access = list(301); req_log_access = 301 }, @@ -1450,7 +1450,7 @@ /area/space) "dj" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled/eris/steel, /area/space) "dm" = ( @@ -1535,8 +1535,8 @@ /area/space) "ek" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/adv{ pixel_x = 2; pixel_y = 5 }, @@ -2030,7 +2030,7 @@ /area/space) "kL" = ( /obj/machinery/shower, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /obj/structure/curtain, /turf/simulated/floor/tiled/eris/white, /area/space) @@ -2239,12 +2239,12 @@ /area/space) "oc" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/cell/device/weapon{ +/obj/item/gun/energy/netgun, +/obj/item/cell/device/weapon{ pixel_x = -5; pixel_y = 2 }, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, /obj/item/clothing/accessory/holster/waist, /turf/simulated/floor/tiled/eris/white/danger, /area/space) @@ -2571,9 +2571,9 @@ /area/space) "sS" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/gun, +/obj/item/gun/energy/gun, /obj/item/clothing/accessory/holster/machete, -/obj/item/weapon/material/knife/machete, +/obj/item/material/knife/machete, /turf/simulated/floor/tiled/eris/white/danger, /area/space) "sY" = ( @@ -2854,7 +2854,7 @@ /area/space) "xf" = ( /obj/structure/table/standard, -/obj/item/weapon/pickaxe/drill, +/obj/item/pickaxe/drill, /turf/simulated/floor/tiled/eris/white/gray_platform, /area/shuttle/talonboat) "xm" = ( @@ -2897,14 +2897,14 @@ /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/space) "xE" = ( -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /obj/structure/closet/walllocker/medical/east, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/space) @@ -2969,7 +2969,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /obj/structure/table/standard, /turf/simulated/floor/tiled/eris/steel, /area/space) @@ -4336,8 +4336,8 @@ pixel_y = -24 }, /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled/eris/steel/cargo, /area/space) "Nu" = ( @@ -4369,7 +4369,7 @@ /obj/structure/closet/secure_closet/chemical{ req_access = list(301) }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, @@ -4788,16 +4788,16 @@ /area/space) "TX" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/cell/device/weapon{ +/obj/item/gun/energy/netgun, +/obj/item/cell/device/weapon{ pixel_x = -5; pixel_y = 2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -5; pixel_y = 2 }, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, /obj/item/clothing/accessory/holster/waist, /turf/simulated/floor/tiled/eris/white/danger, /area/space) @@ -4820,7 +4820,7 @@ /area/space) "Ut" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/tiled/eris/steel, /area/space) "Uv" = ( @@ -4895,7 +4895,7 @@ /turf/simulated/floor/tiled/eris/white, /area/space) "UQ" = ( -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/item/roller, /obj/item/roller{ pixel_y = 8 diff --git a/maps/submaps/depreciated_vr/talon2.dmm b/maps/submaps/depreciated_vr/talon2.dmm index 837c88e29d1..1a8aefe8bd0 100644 --- a/maps/submaps/depreciated_vr/talon2.dmm +++ b/maps/submaps/depreciated_vr/talon2.dmm @@ -97,7 +97,7 @@ /area/space) "az" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/carpet/blucarpet, /area/space) "aA" = ( @@ -174,7 +174,7 @@ dir = 1 }, /obj/structure/closet/secure_closet/talon_captain, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/wood, @@ -286,7 +286,7 @@ /obj/structure/table/standard, /obj/structure/closet/hydrant{ pixel_y = 32; - starts_with = list(/obj/item/clothing/suit/fire/firefighter = 2, /obj/item/clothing/mask/gas = 2, /obj/item/device/flashlight = 2, /obj/item/weapon/tank/oxygen/red = 2, /obj/item/weapon/extinguisher = 2, /obj/item/clothing/head/hardhat/red = 2) + starts_with = list(/obj/item/clothing/suit/fire/firefighter = 2, /obj/item/clothing/mask/gas = 2, /obj/item/flashlight = 2, /obj/item/tank/oxygen/red = 2, /obj/item/extinguisher = 2, /obj/item/clothing/head/hardhat/red = 2) }, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/space) @@ -346,7 +346,7 @@ /obj/structure/table/steel, /obj/structure/closet/hydrant{ pixel_x = -32; - starts_with = list(/obj/item/clothing/suit/fire/firefighter = 2, /obj/item/clothing/mask/gas = 2, /obj/item/device/flashlight = 2, /obj/item/weapon/tank/oxygen/red = 2, /obj/item/weapon/extinguisher = 2, /obj/item/clothing/head/hardhat/red = 2) + starts_with = list(/obj/item/clothing/suit/fire/firefighter = 2, /obj/item/clothing/mask/gas = 2, /obj/item/flashlight = 2, /obj/item/tank/oxygen/red = 2, /obj/item/extinguisher = 2, /obj/item/clothing/head/hardhat/red = 2) }, /turf/simulated/floor/tiled/techfloor/grid, /area/space) @@ -355,7 +355,7 @@ dir = 1 }, /obj/structure/closet/secure_closet/talon_engineer, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/wood, @@ -365,7 +365,7 @@ dir = 1 }, /obj/structure/closet/secure_closet/talon_pilot, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/wood, @@ -528,7 +528,7 @@ dir = 1 }, /obj/structure/closet/secure_closet/talon_doctor, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/wood, @@ -552,7 +552,7 @@ dir = 1 }, /obj/structure/closet/secure_closet/talon_guard, -/obj/item/device/radio/off{ +/obj/item/radio/off{ channels = list("Talon" = 1) }, /turf/simulated/floor/wood, @@ -581,7 +581,7 @@ icon_state = "0-4" }, /obj/structure/table/standard, -/obj/item/weapon/paper/talon_shields, +/obj/item/paper/talon_shields, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/space) "bB" = ( @@ -661,8 +661,8 @@ }, /obj/structure/table/woodentable, /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/carpet/blucarpet, /area/space) "bL" = ( @@ -1068,7 +1068,7 @@ /turf/simulated/floor/carpet, /area/space) "eW" = ( -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/bed/padded, /obj/machinery/firealarm{ dir = 4; @@ -1086,7 +1086,7 @@ /turf/simulated/floor/tiled/eris/steel, /area/space) "fa" = ( -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/bed/padded, /obj/machinery/firealarm{ dir = 8; @@ -1574,7 +1574,7 @@ }, /obj/structure/railing, /obj/structure/table/standard, -/obj/item/device/bluespaceradio/talon_prelinked, +/obj/item/bluespaceradio/talon_prelinked, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/space) "jQ" = ( @@ -2057,7 +2057,7 @@ /area/space) "rU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/stool/baystool/padded, +/obj/item/stool/baystool/padded, /turf/simulated/floor/tiled/eris/cafe, /area/space) "rW" = ( @@ -2167,7 +2167,7 @@ /area/space) "tN" = ( /obj/structure/table/steel, -/obj/item/weapon/paper/dockingcodes, +/obj/item/paper/dockingcodes, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/space) "tO" = ( @@ -2206,13 +2206,13 @@ icon_state = "0-4" }, /obj/structure/closet/crate/plastic, -/obj/item/device/flashlight, -/obj/item/weapon/storage/briefcase/inflatable, -/obj/item/device/flashlight/glowstick, -/obj/item/device/flashlight/glowstick, -/obj/item/device/flashlight/glowstick, -/obj/item/weapon/storage/box/metalfoam, -/obj/item/device/survivalcapsule/luxury, +/obj/item/flashlight, +/obj/item/storage/briefcase/inflatable, +/obj/item/flashlight/glowstick, +/obj/item/flashlight/glowstick, +/obj/item/flashlight/glowstick, +/obj/item/storage/box/metalfoam, +/obj/item/survivalcapsule/luxury, /turf/simulated/floor/tiled/techfloor/grid, /area/space) "uz" = ( @@ -2255,7 +2255,7 @@ /turf/simulated/floor/tiled/eris/steel, /area/space) "uM" = ( -/obj/item/weapon/stool/baystool/padded, +/obj/item/stool/baystool/padded, /obj/machinery/camera/network/talon{ dir = 6 }, @@ -2744,7 +2744,7 @@ /area/space) "CN" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/closet/autolok_wall{ pixel_x = 27 }, @@ -2798,7 +2798,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/item/weapon/stool/baystool/padded, +/obj/item/stool/baystool/padded, /turf/simulated/floor/tiled/eris/cafe, /area/space) "Dr" = ( @@ -3239,7 +3239,7 @@ pixel_y = 32; shut_up = 0 }, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/bed/padded, /obj/structure/closet/autolok_wall{ pixel_x = 27 @@ -3368,7 +3368,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/weapon/storage/dicecup/loaded, +/obj/item/storage/dicecup/loaded, /turf/simulated/floor/tiled/eris/cafe, /area/space) "NE" = ( @@ -3444,7 +3444,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/item/weapon/stool/baystool/padded, +/obj/item/stool/baystool/padded, /obj/structure/cable/green{ dir = 1; icon_state = "4-8" @@ -3962,7 +3962,7 @@ "WS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/stool/baystool/padded, +/obj/item/stool/baystool/padded, /turf/simulated/floor/tiled/eris/cafe, /area/space) "WZ" = ( diff --git a/maps/submaps/engine_submaps/southern_cross/engine_rust.dmm b/maps/submaps/engine_submaps/southern_cross/engine_rust.dmm index dbb3ad0b5fb..229edce1f8c 100644 --- a/maps/submaps/engine_submaps/southern_cross/engine_rust.dmm +++ b/maps/submaps/engine_submaps/southern_cross/engine_rust.dmm @@ -6,7 +6,7 @@ /turf/space, /area/space) "ac" = ( -/obj/item/weapon/book/manual/rust_engine, +/obj/item/book/manual/rust_engine, /turf/template_noop, /area/template_noop) "ad" = ( @@ -306,7 +306,7 @@ /area/engineering/engine_room) "aV" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/rust_engine, +/obj/item/book/manual/rust_engine, /turf/simulated/floor, /area/engineering/engine_room) "aW" = ( @@ -1197,7 +1197,7 @@ /turf/simulated/floor, /area/engineering/engine_room) "de" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 2; pixel_y = -24 }, diff --git a/maps/submaps/engine_submaps/southern_cross/engine_singulo.dmm b/maps/submaps/engine_submaps/southern_cross/engine_singulo.dmm index b6e9a58f979..c68c5f48935 100644 --- a/maps/submaps/engine_submaps/southern_cross/engine_singulo.dmm +++ b/maps/submaps/engine_submaps/southern_cross/engine_singulo.dmm @@ -792,11 +792,11 @@ /turf/simulated/floor/tiled, /area/submap/pa_room) "bu" = ( -/obj/item/weapon/book/manual/engineering_particle_accelerator{ +/obj/item/book/manual/engineering_particle_accelerator{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/book/manual/engineering_singularity_safety, +/obj/item/book/manual/engineering_singularity_safety, /turf/template_noop, /area/template_noop) "bv" = ( @@ -1472,7 +1472,7 @@ /turf/simulated/floor/airless, /area/space) "cE" = ( -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /turf/space, /area/space) "cF" = ( diff --git a/maps/submaps/engine_submaps/southern_cross/engine_sme.dmm b/maps/submaps/engine_submaps/southern_cross/engine_sme.dmm index e0f0891bb72..d146ef244aa 100644 --- a/maps/submaps/engine_submaps/southern_cross/engine_sme.dmm +++ b/maps/submaps/engine_submaps/southern_cross/engine_sme.dmm @@ -37,7 +37,7 @@ "lL" = (/obj/machinery/atmospherics/pipe/simple/visible/yellow,/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 4},/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor,/area/engineering/engine_room) "mj" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 10},/turf/simulated/floor,/area/engineering/engine_room) "mw" = (/obj/machinery/atmospherics/valve/digital{dir = 4; name = "Emergency Cooling Valve 2"},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/industrial/outline,/turf/simulated/floor,/area/engineering/engine_room) -"no" = (/obj/machinery/atmospherics/pipe/simple/visible/yellow{dir = 5},/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor,/area/engineering/engine_room) +"no" = (/obj/machinery/atmospherics/pipe/simple/visible/yellow{dir = 5},/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor,/area/engineering/engine_room) "nF" = (/obj/machinery/atmospherics/pipe/simple/visible/black{dir = 4},/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "EngineWasteViewport1"; name = "Engine Waste Viewport Shutter"; opacity = 0},/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor,/area/engineering/engine_waste) "oh" = (/obj/machinery/atmospherics/pipe/manifold4w/visible/black,/obj/machinery/meter,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor,/area/engineering/engine_waste) "oj" = (/obj/machinery/mass_driver{dir = 8; id = "enginecore"},/obj/machinery/power/supermatter{layer = 4},/obj/effect/engine_setup/core,/turf/simulated/floor/greengrid/nitrogen,/area/engineering/engine_room) @@ -74,9 +74,9 @@ "yL" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 4},/obj/structure/lattice,/turf/space,/area/space) "yU" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor,/area/engineering/engine_room) "zi" = (/obj/machinery/atmospherics/pipe/simple/visible/green{dir = 6},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport1"; name = "Engine Radiator Viewport Shutter"; opacity = 0},/obj/machinery/door/firedoor/border_only,/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor,/area/engineering/engine_room) -"zl" = (/obj/structure/table/reinforced,/obj/item/weapon/book/manual/supermatter_engine,/turf/template_noop,/area/template_noop) +"zl" = (/obj/structure/table/reinforced,/obj/item/book/manual/supermatter_engine,/turf/template_noop,/area/template_noop) "zA" = (/obj/machinery/atmospherics/binary/circulator{anchored = 1; dir = 8},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor,/area/engineering/engine_room) -"zC" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/machinery/meter,/turf/simulated/floor,/area/engineering/engine_waste) +"zC" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan,/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/machinery/meter,/turf/simulated/floor,/area/engineering/engine_waste) "zX" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/machinery/light{dir = 4},/turf/simulated/floor,/area/engineering/engine_room) "Ac" = (/obj/machinery/atmospherics/binary/pump,/obj/effect/floor_decal/industrial/warning/corner,/obj/effect/engine_setup/pump_max,/turf/simulated/floor,/area/engineering/engine_room) "Ah" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan,/obj/machinery/ai_status_display{pixel_x = 32},/obj/effect/floor_decal/industrial/warning,/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/engineering/engine_waste) @@ -172,7 +172,7 @@ "Vi" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/engineering/engine_waste) "Vq" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan,/turf/simulated/floor,/area/engineering/engine_room) "VU" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/visible/black{dir = 9},/obj/structure/grille,/turf/space,/area/space) -"VZ" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/atmospherics/pipe/cap/visible,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor,/area/engineering/engine_room) +"VZ" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/atmospherics/pipe/cap/visible,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor,/area/engineering/engine_room) "Wh" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 9},/turf/simulated/floor,/area/engineering/engine_room) "Wl" = (/obj/machinery/atmospherics/pipe/simple/visible/green,/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/floor,/area/engineering/engine_room) "Wm" = (/obj/machinery/atmospherics/pipe/simple/visible/green,/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor,/area/engineering/engine_room) diff --git a/maps/submaps/engine_submaps/southern_cross/engine_tesla.dmm b/maps/submaps/engine_submaps/southern_cross/engine_tesla.dmm index 6f64565c87e..0cf3a5f2a75 100644 --- a/maps/submaps/engine_submaps/southern_cross/engine_tesla.dmm +++ b/maps/submaps/engine_submaps/southern_cross/engine_tesla.dmm @@ -153,8 +153,8 @@ }, /obj/structure/table/standard, /obj/item/stack/cable_coil/random, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/wrench, +/obj/item/tool/screwdriver, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -309,8 +309,8 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/circuitboard/tesla_coil, -/obj/item/weapon/circuitboard/tesla_coil, +/obj/item/circuitboard/tesla_coil, +/obj/item/circuitboard/tesla_coil, /turf/simulated/floor, /area/engineering/engine_waste) "aL" = ( @@ -839,7 +839,7 @@ /turf/simulated/floor/tiled/techfloor, /area/submap/pa_room) "cb" = ( -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/space, /area/space) "cc" = ( @@ -1190,8 +1190,8 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals8, /obj/structure/table/standard, -/obj/item/weapon/book/manual/tesla_engine, -/obj/item/weapon/book/manual/engineering_particle_accelerator{ +/obj/item/book/manual/tesla_engine, +/obj/item/book/manual/engineering_particle_accelerator{ pixel_x = 5; pixel_y = 5 }, @@ -1265,11 +1265,11 @@ /turf/simulated/floor/airless, /area/space) "cQ" = ( -/obj/item/weapon/book/manual/engineering_particle_accelerator{ +/obj/item/book/manual/engineering_particle_accelerator{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/book/manual/tesla_engine, +/obj/item/book/manual/tesla_engine, /turf/template_noop, /area/template_noop) "fm" = ( @@ -1354,7 +1354,7 @@ /turf/simulated/floor/airless, /area/space) "kd" = ( -/obj/item/weapon/tool/wirecutters, +/obj/item/tool/wirecutters, /turf/simulated/floor/airless, /area/space) "kq" = ( @@ -1362,7 +1362,7 @@ /turf/simulated/floor/tiled, /area/submap/pa_room) "pr" = ( -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /turf/simulated/floor/airless, /area/space) "qP" = ( diff --git a/maps/submaps/engine_submaps_vr/tether/engine_rust.dmm b/maps/submaps/engine_submaps_vr/tether/engine_rust.dmm index e8c813fe05a..920c54b9038 100644 --- a/maps/submaps/engine_submaps_vr/tether/engine_rust.dmm +++ b/maps/submaps/engine_submaps_vr/tether/engine_rust.dmm @@ -6,7 +6,7 @@ /turf/space, /area/space) "ac" = ( -/obj/item/weapon/book/manual/rust_engine, +/obj/item/book/manual/rust_engine, /turf/template_noop, /area/template_noop) "ad" = ( @@ -294,7 +294,7 @@ /area/engineering/engine_room) "aV" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/rust_engine, +/obj/item/book/manual/rust_engine, /turf/simulated/floor, /area/engineering/engine_room) "aW" = ( @@ -1160,7 +1160,7 @@ /turf/simulated/floor, /area/engineering/engine_room) "de" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor, diff --git a/maps/submaps/engine_submaps_vr/tether/engine_singulo.dmm b/maps/submaps/engine_submaps_vr/tether/engine_singulo.dmm index b9e97ebe720..4870d4c6848 100644 --- a/maps/submaps/engine_submaps_vr/tether/engine_singulo.dmm +++ b/maps/submaps/engine_submaps_vr/tether/engine_singulo.dmm @@ -762,11 +762,11 @@ /turf/simulated/floor/tiled, /area/submap/pa_room) "bu" = ( -/obj/item/weapon/book/manual/engineering_particle_accelerator{ +/obj/item/book/manual/engineering_particle_accelerator{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/book/manual/engineering_singularity_safety, +/obj/item/book/manual/engineering_singularity_safety, /turf/template_noop, /area/template_noop) "bv" = ( @@ -1423,7 +1423,7 @@ /turf/simulated/floor/airless, /area/space) "cE" = ( -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /turf/space, /area/space) "cF" = ( diff --git a/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm b/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm index a6d3a9d819b..56f8f811a16 100644 --- a/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm +++ b/maps/submaps/engine_submaps_vr/tether/engine_sme.dmm @@ -629,7 +629,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/device/geiger/wall/west{ +/obj/item/geiger/wall/west{ pixel_x = -36 }, /turf/simulated/floor, @@ -663,7 +663,7 @@ /turf/simulated/floor, /area/template_noop) "bA" = ( -/obj/item/weapon/book/manual/supermatter_engine, +/obj/item/book/manual/supermatter_engine, /turf/template_noop, /area/template_noop) "bB" = ( @@ -1379,7 +1379,7 @@ /turf/simulated/floor, /area/engineering/engine_room) "dh" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor, @@ -1538,7 +1538,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/template_noop) "vA" = ( -/obj/item/device/geiger/wall/south, +/obj/item/geiger/wall/south, /turf/template_noop, /area/template_noop) "UW" = ( diff --git a/maps/submaps/engine_submaps_vr/tether/engine_tesla.dmm b/maps/submaps/engine_submaps_vr/tether/engine_tesla.dmm index a6ab2b04d88..feac4771dd4 100644 --- a/maps/submaps/engine_submaps_vr/tether/engine_tesla.dmm +++ b/maps/submaps/engine_submaps_vr/tether/engine_tesla.dmm @@ -100,8 +100,8 @@ }, /obj/structure/table/standard, /obj/item/stack/cable_coil/random, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/wrench, +/obj/item/tool/screwdriver, /turf/simulated/floor, /area/engineering/engine_gas) "ar" = ( @@ -256,8 +256,8 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/circuitboard/tesla_coil, -/obj/item/weapon/circuitboard/tesla_coil, +/obj/item/circuitboard/tesla_coil, +/obj/item/circuitboard/tesla_coil, /turf/simulated/floor, /area/engineering/engine_gas) "aB" = ( @@ -326,7 +326,7 @@ /turf/simulated/floor/tiled, /area/engineering/engine_room) "aI" = ( -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/space, /area/space) "aJ" = ( @@ -724,11 +724,11 @@ /turf/simulated/floor/tiled, /area/submap/pa_room) "bu" = ( -/obj/item/weapon/book/manual/engineering_particle_accelerator{ +/obj/item/book/manual/engineering_particle_accelerator{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/book/manual/tesla_engine, +/obj/item/book/manual/tesla_engine, /turf/template_noop, /area/template_noop) "bv" = ( @@ -998,8 +998,8 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals8, /obj/structure/table/standard, -/obj/item/weapon/book/manual/tesla_engine, -/obj/item/weapon/book/manual/engineering_particle_accelerator{ +/obj/item/book/manual/tesla_engine, +/obj/item/book/manual/engineering_particle_accelerator{ pixel_x = 5; pixel_y = 5 }, @@ -1226,7 +1226,7 @@ /turf/simulated/floor/tiled, /area/engineering/engine_room) "cs" = ( -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /turf/simulated/floor/airless, /area/space) "ct" = ( @@ -1419,7 +1419,7 @@ /turf/simulated/floor/tiled, /area/engineering/engine_room) "cJ" = ( -/obj/item/weapon/tool/wirecutters, +/obj/item/tool/wirecutters, /turf/simulated/floor/airless, /area/space) "cK" = ( diff --git a/maps/submaps/pois_vr/aerostat/Blackshuttledown.dmm b/maps/submaps/pois_vr/aerostat/Blackshuttledown.dmm index 8ebd94d0670..35e44b9977f 100644 --- a/maps/submaps/pois_vr/aerostat/Blackshuttledown.dmm +++ b/maps/submaps/pois_vr/aerostat/Blackshuttledown.dmm @@ -122,8 +122,8 @@ /area/submap/virgo2/Blackshuttledown) "av" = ( /obj/structure/table/steel, -/obj/item/weapon/gun/projectile/automatic/wt550, -/obj/item/weapon/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/wt550, +/obj/item/gun/projectile/automatic/p90, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "aw" = ( @@ -161,7 +161,7 @@ /area/submap/virgo2/Blackshuttledown) "aC" = ( /obj/structure/table/steel, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, /obj/machinery/light/small{ dir = 4; pixel_y = 0 @@ -186,12 +186,12 @@ /area/submap/virgo2/Blackshuttledown) "aG" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "aH" = ( /obj/structure/table/standard, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "aI" = ( @@ -202,13 +202,13 @@ /area/submap/virgo2/Blackshuttledown) "aJ" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/spray/sterilizine, -/obj/item/weapon/reagent_containers/spray/sterilizine, +/obj/item/reagent_containers/spray/sterilizine, +/obj/item/reagent_containers/spray/sterilizine, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "aK" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "aL" = ( @@ -236,7 +236,7 @@ /area/submap/virgo2/Blackshuttledown) "aP" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 4; name = "Unknown APC"; pixel_x = -24 @@ -255,7 +255,7 @@ /area/submap/virgo2/Blackshuttledown) "aS" = ( /obj/structure/table/steel, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "aU" = ( @@ -285,7 +285,7 @@ /turf/simulated/floor/plating, /area/submap/virgo2/Blackshuttledown) "aX" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "aY" = ( @@ -320,7 +320,7 @@ /area/submap/virgo2/Blackshuttledown) "be" = ( /obj/structure/table/steel, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "We need to take a short stop. The engine's are in need of minor repairs due to turbulence, should be a week's time. We've got reserve food supplies but pleanty of locale fauna to subsist on too if need be. PCRC is keeping most of there assets near New Reykjavik and locale authorities are more mindful then most to travel in this kind of weather. Our outfit should be at the rendezvous point in less then ten days assuming the upper ecehelon hasn't dropped ties with us yet."; name = "Operation Progress/M-53" }, @@ -328,7 +328,7 @@ /area/submap/virgo2/Blackshuttledown) "bf" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "bg" = ( @@ -357,12 +357,12 @@ /area/submap/virgo2/Blackshuttledown) "bl" = ( /obj/structure/table/steel, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "bm" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "bn" = ( @@ -371,7 +371,7 @@ /area/submap/virgo2/Blackshuttledown) "bo" = ( /obj/structure/table/steel, -/obj/item/weapon/gun/projectile/pistol, +/obj/item/gun/projectile/pistol, /obj/machinery/light/small{ dir = 4; pixel_y = 0 @@ -380,7 +380,7 @@ /area/submap/virgo2/Blackshuttledown) "bp" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/bed, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) @@ -391,8 +391,8 @@ /area/submap/virgo2/Blackshuttledown) "br" = ( /obj/structure/table/steel, -/obj/item/weapon/gun/projectile/pistol, -/obj/item/weapon/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/pistol, +/obj/item/gun/projectile/shotgun/pump, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "bs" = ( @@ -416,13 +416,13 @@ /area/submap/virgo2/Blackshuttledown) "bu" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/light, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "bv" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/item/toy/plushie/spider, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) diff --git a/maps/submaps/pois_vr/aerostat/Boombase.dmm b/maps/submaps/pois_vr/aerostat/Boombase.dmm index bcc411e86a9..774e1585fdc 100644 --- a/maps/submaps/pois_vr/aerostat/Boombase.dmm +++ b/maps/submaps/pois_vr/aerostat/Boombase.dmm @@ -10,7 +10,7 @@ /turf/template_noop, /area/submap/virgo2/BoomBase) "ad" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/BoomBase) "ae" = ( @@ -50,7 +50,7 @@ "am" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spider, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/BoomBase) "an" = ( @@ -66,7 +66,7 @@ /area/submap/virgo2/BoomBase) "aq" = ( /obj/machinery/portable_atmospherics/canister/empty/phoron, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/BoomBase) "ar" = ( @@ -74,7 +74,7 @@ /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/BoomBase) "as" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/plating/virgo2, /area/submap/virgo2/BoomBase) "at" = ( @@ -106,8 +106,8 @@ "az" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/standard, -/obj/item/weapon/tank/phoron, -/obj/item/weapon/fuel_assembly/phoron, +/obj/item/tank/phoron, +/obj/item/fuel_assembly/phoron, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/BoomBase) "aA" = ( @@ -119,7 +119,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/BoomBase) "aC" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/BoomBase) "aD" = ( @@ -127,7 +127,7 @@ /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/BoomBase) "aE" = ( -/obj/item/device/transfer_valve, +/obj/item/transfer_valve, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/BoomBase) "aF" = ( @@ -162,7 +162,7 @@ /area/submap/virgo2/BoomBase) "aV" = ( /obj/effect/spider/stickyweb, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/BoomBase) "aY" = ( diff --git a/maps/submaps/pois_vr/aerostat/CaveS.dmm b/maps/submaps/pois_vr/aerostat/CaveS.dmm index 1596347a965..25bc62a1e00 100644 --- a/maps/submaps/pois_vr/aerostat/CaveS.dmm +++ b/maps/submaps/pois_vr/aerostat/CaveS.dmm @@ -31,7 +31,7 @@ /area/submap/virgo2/CaveS) "j" = ( /obj/item/clothing/accessory/storage/webbing, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/CaveS) "k" = ( @@ -60,13 +60,13 @@ /obj/structure/closet/crate, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/weapon/storage/toolbox, +/obj/item/storage/toolbox, /obj/random/toolbox, /turf/simulated/floor, /area/submap/virgo2/CaveS) "x" = ( /obj/structure/table/woodentable, -/obj/item/device/survivalcapsule, +/obj/item/survivalcapsule, /turf/simulated/floor, /area/submap/virgo2/CaveS) "y" = ( @@ -81,15 +81,15 @@ /area/submap/virgo2/CaveS) "A" = ( /obj/structure/closet/crate, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, -/obj/item/weapon/reagent_containers/glass/bottle/antitoxin, -/obj/item/weapon/reagent_containers/pill/antitox, -/obj/item/weapon/reagent_containers/pill/antitox, -/obj/item/weapon/reagent_containers/pill/antitox, -/obj/item/weapon/reagent_containers/pill/paracetamol, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/glass/bottle/antitoxin, +/obj/item/reagent_containers/pill/antitox, +/obj/item/reagent_containers/pill/antitox, +/obj/item/reagent_containers/pill/antitox, +/obj/item/reagent_containers/pill/paracetamol, /obj/random/firstaid, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, /turf/simulated/floor, /area/submap/virgo2/CaveS) "B" = ( @@ -105,11 +105,11 @@ /obj/random/contraband, /obj/random/contraband, /obj/random/energy, -/obj/item/weapon/material/star, -/obj/item/weapon/material/star, -/obj/item/weapon/material/star, -/obj/item/weapon/material/star, -/obj/item/weapon/material/star, +/obj/item/material/star, +/obj/item/material/star, +/obj/item/material/star, +/obj/item/material/star, +/obj/item/material/star, /turf/simulated/floor, /area/submap/virgo2/CaveS) "E" = ( diff --git a/maps/submaps/pois_vr/aerostat/DJOutpost1.dmm b/maps/submaps/pois_vr/aerostat/DJOutpost1.dmm index 303e7e9ecfa..5dbefdfb101 100644 --- a/maps/submaps/pois_vr/aerostat/DJOutpost1.dmm +++ b/maps/submaps/pois_vr/aerostat/DJOutpost1.dmm @@ -7,8 +7,8 @@ /area/submap/virgo2/DJOutpost1) "c" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard, -/obj/item/weapon/material/shard{ +/obj/item/material/shard, +/obj/item/material/shard{ icon_state = "shardmedium" }, /obj/item/stack/rods, @@ -42,7 +42,7 @@ /obj/effect/decal/remains, /obj/effect/decal/cleanable/blood, /obj/item/clothing/under/frontier, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, /obj/random_multi/single_item/sfr_headset, /turf/simulated/floor/wood, /area/submap/virgo2/DJOutpost1) @@ -52,7 +52,7 @@ /area/submap/virgo2/DJOutpost1) "l" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ icon_state = "intercom"; dir = 8 }, @@ -60,7 +60,7 @@ /area/submap/virgo2/DJOutpost1) "m" = ( /obj/machinery/computer/message_monitor, -/obj/item/weapon/paper/monitorkey, +/obj/item/paper/monitorkey, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -92,7 +92,7 @@ /obj/effect/decal/remains, /obj/item/clothing/under/dress/blacktango, /obj/effect/decal/cleanable/blood, -/obj/item/device/universal_translator/ear, +/obj/item/universal_translator/ear, /turf/simulated/floor/wood, /area/submap/virgo2/DJOutpost1) "s" = ( @@ -143,36 +143,36 @@ /area/submap/virgo2/DJOutpost1) "x" = ( /obj/structure/bookcase, -/obj/item/weapon/book/codex/lore/vir, -/obj/item/weapon/book/manual/excavation, -/obj/item/weapon/book/manual/engineering_construction, -/obj/item/weapon/storage/bible, +/obj/item/book/codex/lore/vir, +/obj/item/book/manual/excavation, +/obj/item/book/manual/engineering_construction, +/obj/item/storage/bible, /turf/simulated/floor/wood, /area/submap/virgo2/DJOutpost1) "y" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/wood, /area/submap/virgo2/DJOutpost1) "z" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /obj/random_multi/single_item/sfr_headset, /turf/simulated/floor/wood, /area/submap/virgo2/DJOutpost1) "A" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/radio/intercom/syndicate{ +/obj/item/radio/intercom/syndicate{ desc = "Talk through this."; name = "station intercom (General)" }, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/wood, /area/submap/virgo2/DJOutpost1) "B" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/radio, +/obj/item/radio, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 4; environ = 1; equipment = 1; @@ -195,7 +195,7 @@ /area/submap/virgo2/DJOutpost1) "D" = ( /obj/machinery/door/airlock/glass, -/obj/item/device/gps/internal/poi, +/obj/item/gps/internal/poi, /turf/simulated/floor/wood, /area/submap/virgo2/DJOutpost1) "E" = ( @@ -204,7 +204,7 @@ /area/submap/virgo2/DJOutpost1) "F" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/unajerky, +/obj/item/reagent_containers/food/snacks/unajerky, /obj/machinery/light{ icon_state = "tube1"; dir = 8 @@ -234,10 +234,10 @@ /area/submap/virgo2/DJOutpost1) "J" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife/machete/hatchet, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/material/minihoe, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/material/knife/machete/hatchet, +/obj/item/reagent_containers/glass/bucket, +/obj/item/material/minihoe, +/obj/item/analyzer/plant_analyzer, /obj/random_multi/single_item/sfr_headset, /turf/simulated/floor/wood, /area/submap/virgo2/DJOutpost1) @@ -266,19 +266,19 @@ /area/submap/virgo2/DJOutpost1) "O" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/clown, +/obj/item/bedsheet/clown, /turf/simulated/floor/wood, /area/submap/virgo2/DJOutpost1) "P" = ( /obj/structure/table/rack, /obj/item/ammo_magazine/clip/c762/hunter, -/obj/item/weapon/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/projectile/shotgun/pump/rifle, /turf/simulated/floor/wood, /area/submap/virgo2/DJOutpost1) "Q" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/lantern, -/obj/item/device/gps{ +/obj/item/flashlight/lantern, +/obj/item/gps{ gps_tag = "Sif Free Radio" }, /turf/simulated/floor/wood, diff --git a/maps/submaps/pois_vr/aerostat/DJOutpost2.dmm b/maps/submaps/pois_vr/aerostat/DJOutpost2.dmm index 919640494d9..7084c671781 100644 --- a/maps/submaps/pois_vr/aerostat/DJOutpost2.dmm +++ b/maps/submaps/pois_vr/aerostat/DJOutpost2.dmm @@ -7,8 +7,8 @@ /area/submap/virgo2/DJOutpost1) "c" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard, -/obj/item/weapon/material/shard{ +/obj/item/material/shard, +/obj/item/material/shard{ icon_state = "shardmedium" }, /obj/item/stack/rods, @@ -16,7 +16,7 @@ /area/submap/virgo2/DJOutpost1) "d" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor, /area/submap/virgo2/DJOutpost1) "e" = ( @@ -60,7 +60,7 @@ /area/submap/virgo2/DJOutpost1) "m" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/outdoors/dirt, /area/submap/virgo2/DJOutpost1) "n" = ( @@ -76,7 +76,7 @@ /area/submap/virgo2/DJOutpost1) "q" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/radio, +/obj/item/radio, /obj/structure/cable/yellow, /turf/simulated/floor/wood/broken, /area/submap/virgo2/DJOutpost1) @@ -95,7 +95,7 @@ /area/submap/virgo2/DJOutpost1) "w" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "shardmedium" }, /turf/simulated/floor, @@ -106,7 +106,7 @@ /area/submap/virgo2/DJOutpost1) "y" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/radio/intercom/syndicate{ +/obj/item/radio/intercom/syndicate{ desc = "Talk through this."; name = "station intercom (General)" }, @@ -122,7 +122,7 @@ /area/submap/virgo2/DJOutpost1) "C" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/structure/cable/yellow{ @@ -131,24 +131,24 @@ /turf/simulated/floor, /area/submap/virgo2/DJOutpost1) "D" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "shardmedium" }, /turf/template_noop, /area/template_noop) "F" = ( -/obj/item/device/transfer_valve, +/obj/item/transfer_valve, /turf/simulated/floor/outdoors/rocks, /area/submap/virgo2/DJOutpost1) "G" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/floor, /area/submap/virgo2/DJOutpost1) "H" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/template_noop, @@ -158,7 +158,7 @@ /turf/simulated/floor/wood/broken, /area/submap/virgo2/DJOutpost1) "J" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/template_noop, /area/template_noop) "K" = ( @@ -170,12 +170,12 @@ /turf/simulated/floor/wood/broken, /area/submap/virgo2/DJOutpost1) "L" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/outdoors/rocks, /area/submap/virgo2/DJOutpost1) "M" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/item/stack/rods, diff --git a/maps/submaps/pois_vr/aerostat/DeadSettlers1.dmm b/maps/submaps/pois_vr/aerostat/DeadSettlers1.dmm index 24e024f3161..110a633fc14 100644 --- a/maps/submaps/pois_vr/aerostat/DeadSettlers1.dmm +++ b/maps/submaps/pois_vr/aerostat/DeadSettlers1.dmm @@ -1,13 +1,13 @@ "a" = (/turf/template_noop,/area/template_noop) -"d" = (/obj/item/device/flashlight/flare,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers1) +"d" = (/obj/item/flashlight/flare,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers1) "e" = (/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers1) "g" = (/obj/item/trash/meatration,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers1) "n" = (/obj/tether_away_spawner/aerostat_surface,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers1) -"o" = (/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever/trailgun,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers1) +"o" = (/obj/item/gun/projectile/shotgun/pump/rifle/lever/trailgun,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers1) "p" = (/turf/template_noop,/area/submap/virgo2/DeadSettlers1) "q" = (/obj/item/ammo_casing,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers1) "t" = (/obj/random/multiple/voidsuit,/obj/effect/decal/remains,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers1) -"B" = (/obj/item/device/radio/off,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers1) +"B" = (/obj/item/radio/off,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers1) "K" = (/obj/effect/decal/remains,/obj/effect/decal/cleanable/blood,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers1) "Q" = (/obj/item/ammo_magazine/ammo_box/b44,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers1) "W" = (/obj/effect/decal/cleanable/blood,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers1) diff --git a/maps/submaps/pois_vr/aerostat/DeadSettlers2.dmm b/maps/submaps/pois_vr/aerostat/DeadSettlers2.dmm index fc5b53640c3..48740e5c3e9 100644 --- a/maps/submaps/pois_vr/aerostat/DeadSettlers2.dmm +++ b/maps/submaps/pois_vr/aerostat/DeadSettlers2.dmm @@ -2,15 +2,15 @@ "m" = (/obj/structure/bonfire,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers2) "n" = (/obj/effect/decal/remains,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers2) "o" = (/obj/random/multiple/voidsuit,/obj/effect/decal/remains,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers2) -"u" = (/obj/item/device/flashlight/color/red,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers2) +"u" = (/obj/item/flashlight/color/red,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers2) "v" = (/obj/item/ammo_casing,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers2) "x" = (/obj/tether_away_spawner/aerostat_surface,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers2) "z" = (/turf/template_noop,/area/submap/virgo2/DeadSettlers2) "D" = (/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers2) -"F" = (/obj/item/device/radio/off,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers2) +"F" = (/obj/item/radio/off,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers2) "I" = (/obj/random/firstaid,/obj/effect/decal/cleanable/blood,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers2) "S" = (/obj/effect/decal/cleanable/blood,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers2) -"W" = (/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever/brushgun,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers2) +"W" = (/obj/item/gun/projectile/shotgun/pump/rifle/lever/brushgun,/turf/simulated/mineral/floor/ignore_mapgen/virgo2,/area/submap/virgo2/DeadSettlers2) (1,1,1) = {" aaaaaaaaaaaa diff --git a/maps/submaps/pois_vr/aerostat/DecoupledEngine.dmm b/maps/submaps/pois_vr/aerostat/DecoupledEngine.dmm index eee3230cdba..04c58dab187 100644 --- a/maps/submaps/pois_vr/aerostat/DecoupledEngine.dmm +++ b/maps/submaps/pois_vr/aerostat/DecoupledEngine.dmm @@ -6,18 +6,18 @@ /turf/template_noop, /area/submap/virgo2/DecoupledEngine) "ac" = ( -/obj/item/weapon/fuel_assembly/deuterium, +/obj/item/fuel_assembly/deuterium, /turf/template_noop, /area/submap/virgo2/DecoupledEngine) "ad" = ( /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/DecoupledEngine) "ae" = ( -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/template_noop, /area/submap/virgo2/DecoupledEngine) "af" = ( -/obj/item/weapon/material/shard/phoron, +/obj/item/material/shard/phoron, /turf/template_noop, /area/submap/virgo2/DecoupledEngine) "ag" = ( @@ -25,7 +25,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/DecoupledEngine) "ah" = ( -/obj/item/weapon/arrow/rod, +/obj/item/arrow/rod, /obj/item/stack/material/steel, /turf/simulated/floor/outdoors/rocks, /area/submap/virgo2/DecoupledEngine) @@ -43,11 +43,11 @@ /area/submap/virgo2/DecoupledEngine) "al" = ( /obj/effect/floor_decal/rust, -/obj/item/weapon/fuel_assembly/supermatter, +/obj/item/fuel_assembly/supermatter, /turf/simulated/floor, /area/submap/virgo2/DecoupledEngine) "am" = ( -/obj/item/weapon/arrow/rod, +/obj/item/arrow/rod, /turf/template_noop, /area/submap/virgo2/DecoupledEngine) "an" = ( @@ -195,7 +195,7 @@ icon_state = "phoronrwindow"; dir = 4 }, -/obj/item/weapon/material/shard/phoron, +/obj/item/material/shard/phoron, /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/submap/virgo2/DecoupledEngine) @@ -431,7 +431,7 @@ "bq" = ( /obj/effect/floor_decal/rust, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/rcd, +/obj/item/rcd, /turf/simulated/floor, /area/submap/virgo2/DecoupledEngine) "br" = ( @@ -493,15 +493,15 @@ /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/template_noop) "bA" = ( -/obj/item/weapon/arrow/rod, +/obj/item/arrow/rod, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/DecoupledEngine) "bB" = ( -/obj/item/weapon/fuel_assembly/deuterium, +/obj/item/fuel_assembly/deuterium, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/DecoupledEngine) "bC" = ( -/obj/item/weapon/material/shard/phoron, +/obj/item/material/shard/phoron, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/DecoupledEngine) "bD" = ( diff --git a/maps/submaps/pois_vr/aerostat/DoomP.dmm b/maps/submaps/pois_vr/aerostat/DoomP.dmm index 46792d490db..7c0c4d4d8e0 100644 --- a/maps/submaps/pois_vr/aerostat/DoomP.dmm +++ b/maps/submaps/pois_vr/aerostat/DoomP.dmm @@ -323,26 +323,26 @@ /area/submap/virgo2/DoomP) "bn" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/syndie_kit/spy, -/obj/item/weapon/card/id/syndicate, +/obj/item/storage/box/syndie_kit/spy, +/obj/item/card/id/syndicate, /turf/simulated/floor/tiled/techfloor, /area/submap/virgo2/DoomP) "bo" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/smokes, +/obj/item/storage/box/smokes, /turf/simulated/floor/tiled/techfloor, /area/submap/virgo2/DoomP) "bp" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled/techfloor, /area/submap/virgo2/DoomP) "bq" = ( /obj/structure/table/rack, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/submap/virgo2/DoomP) "br" = ( @@ -352,14 +352,14 @@ /area/submap/virgo2/DoomP) "bs" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/contender, +/obj/item/gun/projectile/contender, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357, /turf/simulated/floor/tiled/techfloor, /area/submap/virgo2/DoomP) "bt" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/item/toy/plushie/spider, /obj/effect/floor_decal/corner/lime/full{ dir = 8 @@ -375,7 +375,7 @@ /area/submap/virgo2/DoomP) "bv" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/effect/floor_decal/corner/lime{ dir = 5 }, @@ -383,7 +383,7 @@ /area/submap/virgo2/DoomP) "bw" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/lime{ dir = 5 }, diff --git a/maps/submaps/pois_vr/aerostat/Drugden.dmm b/maps/submaps/pois_vr/aerostat/Drugden.dmm index 396a44e977e..858370ea79a 100644 --- a/maps/submaps/pois_vr/aerostat/Drugden.dmm +++ b/maps/submaps/pois_vr/aerostat/Drugden.dmm @@ -25,18 +25,18 @@ /area/submap/virgo2/Drugd) "i" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /turf/simulated/floor/carpet, /area/submap/virgo2/Drugd) "j" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/curtain/open/bed, /turf/simulated/floor/carpet, /area/submap/virgo2/Drugd) "k" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/pill/happy{ +/obj/item/reagent_containers/pill/happy{ name = "pill" }, /turf/simulated/floor/carpet, @@ -66,7 +66,7 @@ /area/submap/virgo2/Drugd) "r" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/pill/methylphenidate{ +/obj/item/reagent_containers/pill/methylphenidate{ name = "pill" }, /turf/simulated/floor/carpet, @@ -79,7 +79,7 @@ /turf/simulated/floor/carpet, /area/submap/virgo2/Drugd) "t" = ( -/obj/item/weapon/reagent_containers/pill/citalopram{ +/obj/item/reagent_containers/pill/citalopram{ name = "pill" }, /turf/simulated/floor/carpet, @@ -99,13 +99,13 @@ /area/submap/virgo2/Drugd) "x" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, -/obj/item/weapon/reagent_containers/syringe/drugs, +/obj/item/flashlight/lamp, +/obj/item/reagent_containers/syringe/drugs, /turf/simulated/floor/carpet, /area/submap/virgo2/Drugd) "y" = ( /obj/structure/bed/chair/comfy/beige, -/obj/item/weapon/reagent_containers/pill/citalopram{ +/obj/item/reagent_containers/pill/citalopram{ name = "pill" }, /turf/simulated/floor/carpet, @@ -115,17 +115,17 @@ /turf/simulated/floor, /area/submap/virgo2/Drugd) "A" = ( -/obj/item/weapon/reagent_containers/pill/citalopram{ +/obj/item/reagent_containers/pill/citalopram{ name = "pill" }, -/obj/item/weapon/reagent_containers/pill/citalopram{ +/obj/item/reagent_containers/pill/citalopram{ name = "pill" }, /turf/simulated/floor/carpet, /area/submap/virgo2/Drugd) "B" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/pill_bottle/happy, +/obj/item/storage/pill_bottle/happy, /turf/simulated/floor/tiled, /area/submap/virgo2/Drugd) "C" = ( @@ -135,31 +135,31 @@ /area/submap/virgo2/Drugd) "D" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/pill/citalopram, -/obj/item/weapon/reagent_containers/pill/citalopram, +/obj/item/reagent_containers/pill/citalopram, +/obj/item/reagent_containers/pill/citalopram, /turf/simulated/floor/tiled, /area/submap/virgo2/Drugd) "E" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/pill/tramadol, -/obj/item/weapon/reagent_containers/pill/tramadol, +/obj/item/reagent_containers/pill/tramadol, +/obj/item/reagent_containers/pill/tramadol, /turf/simulated/floor/tiled, /area/submap/virgo2/Drugd) "F" = ( /obj/structure/closet/cabinet, /obj/item/clothing/accessory/jacket, -/obj/item/weapon/material/butterfly/switchblade, +/obj/item/material/butterfly/switchblade, /turf/simulated/floor/carpet, /area/submap/virgo2/Drugd) "G" = ( -/obj/item/weapon/reagent_containers/pill/zoom{ +/obj/item/reagent_containers/pill/zoom{ name = "pill" }, /obj/random/trash, /turf/simulated/floor/carpet, /area/submap/virgo2/Drugd) "H" = ( -/obj/item/weapon/reagent_containers/pill/zoom{ +/obj/item/reagent_containers/pill/zoom{ name = "pill" }, /turf/simulated/floor/carpet, @@ -170,7 +170,7 @@ /area/submap/virgo2/Drugd) "J" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/scalpel, /turf/simulated/floor/tiled, /area/submap/virgo2/Drugd) "K" = ( @@ -189,18 +189,18 @@ "N" = ( /obj/effect/floor_decal/rust, /obj/structure/table/standard, -/obj/item/device/survivalcapsule, +/obj/item/survivalcapsule, /turf/simulated/floor/tiled, /area/submap/virgo2/Drugd) "O" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/pill/zoom, -/obj/item/weapon/reagent_containers/pill/zoom, +/obj/item/reagent_containers/pill/zoom, +/obj/item/reagent_containers/pill/zoom, /turf/simulated/floor, /area/submap/virgo2/Drugd) "P" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/pill/tramadol{ +/obj/item/reagent_containers/pill/tramadol{ name = "pill" }, /turf/simulated/floor/carpet, @@ -210,17 +210,17 @@ /turf/simulated/floor, /area/submap/virgo2/Drugd) "S" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor, /area/submap/virgo2/Drugd) "T" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet, /area/submap/virgo2/Drugd) "U" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/syringe/drugs, +/obj/item/reagent_containers/syringe/drugs, /turf/simulated/floor/carpet, /area/submap/virgo2/Drugd) "V" = ( diff --git a/maps/submaps/pois_vr/aerostat/Epod3.dmm b/maps/submaps/pois_vr/aerostat/Epod3.dmm index 23eafb77901..9452b3095cc 100644 --- a/maps/submaps/pois_vr/aerostat/Epod3.dmm +++ b/maps/submaps/pois_vr/aerostat/Epod3.dmm @@ -30,7 +30,7 @@ /obj/structure/closet/walllocker/emerglocker{ pixel_y = 28 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -26 }, /turf/simulated/shuttle/floor, @@ -44,7 +44,7 @@ pixel_y = 28 }, /obj/machinery/light, -/obj/item/weapon/weldingtool/largetank, +/obj/item/weldingtool/largetank, /turf/simulated/shuttle/floor, /area/submap/virgo2/Epod3) "j" = ( diff --git a/maps/submaps/pois_vr/aerostat/Epod4.dmm b/maps/submaps/pois_vr/aerostat/Epod4.dmm index 2fd3c9bb4db..7212bcf26a8 100644 --- a/maps/submaps/pois_vr/aerostat/Epod4.dmm +++ b/maps/submaps/pois_vr/aerostat/Epod4.dmm @@ -58,7 +58,7 @@ dir = 1 }, /obj/structure/closet/walllocker/emerglocker/east, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -28 diff --git a/maps/submaps/pois_vr/aerostat/GovPatrol.dmm b/maps/submaps/pois_vr/aerostat/GovPatrol.dmm index 857bb008ea5..bc961eb7d69 100644 --- a/maps/submaps/pois_vr/aerostat/GovPatrol.dmm +++ b/maps/submaps/pois_vr/aerostat/GovPatrol.dmm @@ -13,11 +13,11 @@ /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/GovPatrol) "e" = ( -/obj/item/device/radio/off, +/obj/item/radio/off, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/GovPatrol) "f" = ( -/obj/item/weapon/storage/box/flare, +/obj/item/storage/box/flare, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/GovPatrol) "g" = ( @@ -35,7 +35,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/GovPatrol) "k" = ( -/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever, +/obj/item/gun/projectile/shotgun/pump/rifle/lever, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/GovPatrol) "m" = ( diff --git a/maps/submaps/pois_vr/aerostat/Lab1.dmm b/maps/submaps/pois_vr/aerostat/Lab1.dmm index f6e68547bf1..b045cd8e6be 100644 --- a/maps/submaps/pois_vr/aerostat/Lab1.dmm +++ b/maps/submaps/pois_vr/aerostat/Lab1.dmm @@ -58,7 +58,7 @@ /area/submap/virgo2/Lab1) "k" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox, +/obj/item/storage/toolbox, /obj/random/tool, /turf/simulated/floor/tiled/steel_dirty, /area/submap/virgo2/Lab1) @@ -98,7 +98,7 @@ "q" = ( /obj/structure/table/standard, /obj/random/toolbox, -/obj/item/weapon/cell/super, +/obj/item/cell/super, /turf/simulated/floor/tiled/steel_dirty, /area/submap/virgo2/Lab1) "r" = ( @@ -113,12 +113,12 @@ /area/submap/virgo2/Lab1) "t" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled/steel_dirty, /area/submap/virgo2/Lab1) "u" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 8; name = "Unknown APC"; operating = 0; @@ -145,14 +145,14 @@ /area/submap/virgo2/Lab1) "x" = ( /obj/structure/table/standard, -/obj/item/weapon/paper{ +/obj/item/paper{ desc = "Gladstone for the last fucking time, We have crowbars for a REASON. Stop breaking in through the goddamn windows! We big red shiny doors for god's sakes!" }, /turf/simulated/floor/tiled/steel_dirty, /area/submap/virgo2/Lab1) "y" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/steel_dirty, /area/submap/virgo2/Lab1) "z" = ( @@ -171,7 +171,7 @@ /area/submap/virgo2/Lab1) "C" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/steel_dirty, /area/submap/virgo2/Lab1) "D" = ( @@ -182,7 +182,7 @@ /area/submap/virgo2/Lab1) "E" = ( /obj/structure/table/standard, -/obj/item/device/multitool, +/obj/item/multitool, /obj/item/clothing/glasses/welding, /turf/simulated/floor/tiled/steel_dirty, /area/submap/virgo2/Lab1) @@ -207,7 +207,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/submap/virgo2/Lab1) "I" = ( -/obj/item/weapon/cell/super, +/obj/item/cell/super, /turf/simulated/floor/tiled/steel_dirty, /area/submap/virgo2/Lab1) "J" = ( @@ -230,7 +230,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/submap/virgo2/Lab1) "M" = ( -/obj/item/weapon/storage/bag/circuits, +/obj/item/storage/bag/circuits, /obj/structure/table/standard, /turf/simulated/floor/tiled/steel_dirty, /area/submap/virgo2/Lab1) diff --git a/maps/submaps/pois_vr/aerostat/MCamp1.dmm b/maps/submaps/pois_vr/aerostat/MCamp1.dmm index 1a445910dd7..7c215d7f8c2 100644 --- a/maps/submaps/pois_vr/aerostat/MCamp1.dmm +++ b/maps/submaps/pois_vr/aerostat/MCamp1.dmm @@ -17,7 +17,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/MilitaryCamp1) "g" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/MilitaryCamp1) "h" = ( @@ -44,7 +44,7 @@ /area/submap/virgo2/MilitaryCamp1) "n" = ( /obj/structure/table/standard, -/obj/item/weapon/gun/energy/gun, +/obj/item/gun/energy/gun, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/MilitaryCamp1) "o" = ( @@ -53,12 +53,12 @@ /area/submap/virgo2/MilitaryCamp1) "q" = ( /obj/structure/table/standard, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/MilitaryCamp1) "r" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/syndie_kit/space, +/obj/item/storage/box/syndie_kit/space, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/MilitaryCamp1) "s" = ( diff --git a/maps/submaps/pois_vr/aerostat/MHR.dmm b/maps/submaps/pois_vr/aerostat/MHR.dmm index 06a7705e14e..55768249fa0 100644 --- a/maps/submaps/pois_vr/aerostat/MHR.dmm +++ b/maps/submaps/pois_vr/aerostat/MHR.dmm @@ -29,7 +29,7 @@ /area/submap/virgo2/MHR) "h" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/backpack, +/obj/item/storage/backpack, /turf/simulated/mineral/floor/ignore_mapgen/virgo2{ outdoors = 0 }, @@ -42,7 +42,7 @@ /area/submap/virgo2/MHR) "j" = ( /obj/structure/table/standard, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Do not enter the cave. The estimated active time of the Vicerators is much longer due to the improvements on the rotor bearings. It's estimated to be roughly a few months before we start to see any chancces of mechanical failure. "; name = "NOTICE: DO NOT ENTER" }, @@ -91,7 +91,7 @@ "r" = ( /obj/effect/decal/remains, /obj/item/clothing/mask/gas/explorer, -/obj/item/weapon/material/twohanded/fireaxe, +/obj/item/material/twohanded/fireaxe, /turf/simulated/mineral/floor/ignore_mapgen/virgo2{ outdoors = 0 }, diff --git a/maps/submaps/pois_vr/aerostat/Manor1.dmm b/maps/submaps/pois_vr/aerostat/Manor1.dmm index 2401898eb82..a84c0a60656 100644 --- a/maps/submaps/pois_vr/aerostat/Manor1.dmm +++ b/maps/submaps/pois_vr/aerostat/Manor1.dmm @@ -18,7 +18,7 @@ /area/submap/virgo2/Manor1) "ae" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "af" = ( @@ -42,7 +42,7 @@ "aj" = ( /obj/structure/table/woodentable, /obj/item/clothing/mask/smokable/cigarette/cigar, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "ak" = ( @@ -56,7 +56,7 @@ /area/submap/virgo2/Manor1) "am" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "an" = ( @@ -85,13 +85,13 @@ /area/submap/virgo2/Manor1) "at" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/decal/cleanable/blood/gibs/robot, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "au" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) @@ -101,8 +101,8 @@ /area/submap/virgo2/Manor1) "aw" = ( /obj/structure/table/woodentable, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "ax" = ( @@ -125,12 +125,12 @@ /area/submap/virgo2/Manor1) "aC" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "aD" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "aE" = ( @@ -148,12 +148,12 @@ /area/submap/virgo2/Manor1) "aG" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper, +/obj/item/paper, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "aH" = ( /obj/structure/table/woodentable, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "aI" = ( @@ -175,7 +175,7 @@ /area/submap/virgo2/Manor1) "aO" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "aP" = ( @@ -205,17 +205,17 @@ /area/submap/virgo2/Manor1) "aV" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "aW" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/peppermill, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "aX" = ( /obj/structure/table/standard, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "aY" = ( @@ -224,7 +224,7 @@ /area/submap/virgo2/Manor1) "aZ" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/saltshaker, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "ba" = ( @@ -233,19 +233,19 @@ /area/submap/virgo2/Manor1) "bb" = ( /obj/structure/table/standard, -/obj/item/weapon/tray, -/obj/item/weapon/tray, +/obj/item/tray, +/obj/item/tray, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "bc" = ( /obj/structure/table/standard, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "bd" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "be" = ( @@ -262,7 +262,7 @@ /area/submap/virgo2/Manor1) "bg" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "bh" = ( @@ -300,7 +300,7 @@ /turf/template_noop, /area/submap/virgo2/Manor1) "bo" = ( -/obj/item/weapon/material/twohanded/baseballbat/metal, +/obj/item/material/twohanded/baseballbat/metal, /turf/simulated/floor/carpet/blucarpet, /area/submap/virgo2/Manor1) "bp" = ( @@ -342,7 +342,7 @@ /area/submap/virgo2/Manor1) "bv" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/small/sugar, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "bw" = ( @@ -370,18 +370,18 @@ /area/submap/virgo2/Manor1) "bA" = ( /obj/structure/table/standard, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "bB" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/reagent_containers/food/snacks/stew, -/obj/item/weapon/reagent_containers/food/snacks/stew, +/obj/item/reagent_containers/food/snacks/stew, +/obj/item/reagent_containers/food/snacks/stew, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "bC" = ( -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "bD" = ( @@ -394,9 +394,9 @@ /area/submap/virgo2/Manor1) "bE" = ( /obj/structure/table/standard, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, -/obj/item/weapon/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, /obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) @@ -407,8 +407,8 @@ /area/submap/virgo2/Manor1) "bG" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/reagent_containers/food/snacks/sausage, -/obj/item/weapon/reagent_containers/food/snacks/sausage, +/obj/item/reagent_containers/food/snacks/sausage, +/obj/item/reagent_containers/food/snacks/sausage, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "bH" = ( @@ -423,18 +423,18 @@ /area/submap/virgo2/Manor1) "bJ" = ( /obj/structure/table/standard, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/kitchen/rollingpin, /obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "bK" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/bottle/stoxin, +/obj/item/reagent_containers/glass/bottle/stoxin, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "bL" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "bM" = ( @@ -467,7 +467,7 @@ /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "bT" = ( -/obj/item/weapon/material/minihoe, +/obj/item/material/minihoe, /turf/simulated/floor/carpet/blucarpet, /area/submap/virgo2/Manor1) "bU" = ( @@ -501,7 +501,7 @@ /area/submap/virgo2/Manor1) "ca" = ( /obj/structure/table/woodentable, -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "cb" = ( @@ -511,25 +511,25 @@ /area/submap/virgo2/Manor1) "cc" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /obj/random/medical, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "cd" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "ce" = ( /obj/structure/bed/double, -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /obj/structure/curtain/open/bed, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "cf" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/wallet/random, +/obj/item/storage/wallet/random, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "cg" = ( @@ -544,7 +544,7 @@ /area/submap/virgo2/Manor1) "ci" = ( /obj/structure/closet/crate, -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, /obj/random/powercell, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) @@ -572,7 +572,7 @@ /area/submap/virgo2/Manor1) "cn" = ( /obj/structure/closet/crate, -/obj/item/weapon/storage/wallet/random, +/obj/item/storage/wallet/random, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "co" = ( @@ -597,7 +597,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/submap/virgo2/Manor1) "cs" = ( -/obj/item/weapon/material/twohanded/spear, +/obj/item/material/twohanded/spear, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "ct" = ( @@ -608,7 +608,7 @@ /area/submap/virgo2/Manor1) "cu" = ( /obj/effect/decal/remains, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "cv" = ( @@ -627,8 +627,8 @@ /area/submap/virgo2/Manor1) "cy" = ( /obj/structure/table/standard, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled/hydro, /area/submap/virgo2/Manor1) "cz" = ( @@ -637,7 +637,7 @@ /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "cA" = ( -/obj/item/weapon/paper/crumpled, +/obj/item/paper/crumpled, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "cB" = ( diff --git a/maps/submaps/pois_vr/aerostat/RareSample.dmm b/maps/submaps/pois_vr/aerostat/RareSample.dmm index 02bcbd5ee86..176f4a10853 100644 --- a/maps/submaps/pois_vr/aerostat/RareSample.dmm +++ b/maps/submaps/pois_vr/aerostat/RareSample.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/template_noop) "b" = ( -/obj/item/weapon/research_sample/rare, +/obj/item/research_sample/rare, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/template_noop) "c" = ( diff --git a/maps/submaps/pois_vr/aerostat/Rocky1.dmm b/maps/submaps/pois_vr/aerostat/Rocky1.dmm index 76725279f7c..33e075f1e1b 100644 --- a/maps/submaps/pois_vr/aerostat/Rocky1.dmm +++ b/maps/submaps/pois_vr/aerostat/Rocky1.dmm @@ -18,7 +18,7 @@ "g" = ( /obj/random/handgun/sec, /obj/effect/decal/remains/human, -/obj/item/weapon/storage/secure/briefcase/money, +/obj/item/storage/secure/briefcase/money, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/Rocky1) diff --git a/maps/submaps/pois_vr/aerostat/Rockybase.dmm b/maps/submaps/pois_vr/aerostat/Rockybase.dmm index ba991da5153..21b85ae4a3d 100644 --- a/maps/submaps/pois_vr/aerostat/Rockybase.dmm +++ b/maps/submaps/pois_vr/aerostat/Rockybase.dmm @@ -78,7 +78,7 @@ pixel_y = 0 }, /obj/structure/curtain/open/shower, -/obj/item/weapon/soap, +/obj/item/soap, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "aq" = ( @@ -87,7 +87,7 @@ /area/submap/virgo2/Rockybase) "ar" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "as" = ( @@ -96,7 +96,7 @@ /area/submap/virgo2/Rockybase) "at" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "au" = ( @@ -108,7 +108,7 @@ /area/submap/virgo2/Rockybase) "av" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/item/toy/plushie/spider, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) @@ -123,11 +123,11 @@ /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "ay" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "az" = ( -/obj/item/weapon/storage/belt/janitor, +/obj/item/storage/belt/janitor, /obj/structure/table/standard, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) @@ -142,12 +142,12 @@ /area/submap/virgo2/Rockybase) "aC" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/pistol, +/obj/item/gun/projectile/pistol, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "aD" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/taser, +/obj/item/gun/energy/gun/taser, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "aE" = ( @@ -162,8 +162,8 @@ /area/submap/virgo2/Rockybase) "aG" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "aH" = ( @@ -200,9 +200,9 @@ /area/submap/virgo2/Rockybase) "aM" = ( /obj/structure/table/standard, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, /obj/machinery/light{ icon_state = "tube1"; dir = 4 @@ -217,7 +217,7 @@ /area/submap/virgo2/Rockybase) "aO" = ( /obj/structure/table/standard, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Carl's absolutly fucked in the head. He's trying to squeeze as much drone production out as he can since he's worried we're gonna get found out but he's getting sloppier with each batch. Now's he's telling us he can speed the time on the IFF encoding. I already have a hard enough time getting these damn things not to stare at walls and now he's gonna shortchange the only part of these tincans that tells em not to turn us into paste on a wall. I told Richter to get out while he can, We're counting days before either some Sif task force shows up at our door or these things decide we aren't there friends anymore."; name = "Note" }, @@ -276,8 +276,8 @@ /area/submap/virgo2/Rockybase) "aW" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, -/obj/item/weapon/gun/projectile/pistol, +/obj/item/bedsheet, +/obj/item/gun/projectile/pistol, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "aX" = ( @@ -290,25 +290,25 @@ /area/submap/virgo2/Rockybase) "aZ" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/bag/trash, -/obj/item/weapon/storage/bag/trash, +/obj/item/storage/bag/trash, +/obj/item/storage/bag/trash, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "ba" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "bb" = ( /obj/machinery/light, /obj/structure/table/standard, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "bc" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/c20r, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/projectile/automatic/c20r, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "bd" = ( @@ -396,12 +396,12 @@ /area/submap/virgo2/Rockybase) "bt" = ( /obj/structure/table/standard, -/obj/item/device/kit/paint/gygax/darkgygax, +/obj/item/kit/paint/gygax/darkgygax, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "bu" = ( /obj/structure/table/standard, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "I've decided to go forward and start some small scale tests of the Vicerator delivery grenades, Might as wall make sure they work like the real ones. There are a few Fauna areas nearbye and we're working to make sure the kinks in the code are worked out. Once we've made sure they stay flying we'll work on the IFF signals."; name = "V-Grenade Notice 2" }, @@ -422,7 +422,7 @@ /area/submap/virgo2/Rockybase) "bx" = ( /obj/structure/table/standard, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "We've finally been able to get the Vicerator delivery grenades working, Took awhile to make sure the latching mechanism didn't fail but we're sure we've got it this time. Vel'Shem's worried about the miners having there own drone fab now but I say it's a small price to pay to keep the metal flowing, Especially since there telling us NT's starting to monopolize the metal rich parts."; name = "V-Grenade Notice 1" }, @@ -449,7 +449,7 @@ /area/submap/virgo2/Rockybase) "bB" = ( /obj/structure/table/standard, -/obj/item/weapon/grenade/spawnergrenade/manhacks, +/obj/item/grenade/spawnergrenade/manhacks, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "bC" = ( @@ -462,13 +462,13 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/circuitboard/mecha/gygax/main, -/obj/item/weapon/circuitboard/mecha/gygax/peripherals, -/obj/item/weapon/circuitboard/mecha/gygax/targeting, +/obj/item/circuitboard/mecha/gygax/main, +/obj/item/circuitboard/mecha/gygax/peripherals, +/obj/item/circuitboard/mecha/gygax/targeting, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "bE" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/plating/virgo2, /area/submap/virgo2/Rockybase) "bF" = ( @@ -486,12 +486,12 @@ /area/submap/virgo2/Rockybase) "bI" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox, +/obj/item/storage/toolbox, /turf/simulated/floor/plating/virgo2, /area/submap/virgo2/Rockybase) "bJ" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/plating/virgo2, /area/submap/virgo2/Rockybase) "bK" = ( @@ -509,7 +509,7 @@ /obj/structure/table/standard, /obj/structure/table/standard, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn, +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "bN" = ( @@ -537,7 +537,7 @@ /area/submap/virgo2/Rockybase) "bR" = ( /obj/structure/table/standard, -/obj/item/device/mmi/digital/robot, +/obj/item/mmi/digital/robot, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "bS" = ( @@ -631,7 +631,7 @@ "cj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/plating/virgo2, /area/submap/virgo2/Rockybase) "ck" = ( @@ -670,7 +670,7 @@ dir = 8 }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "Unknown APC"; pixel_x = -24 @@ -777,7 +777,7 @@ /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "cI" = ( -/obj/item/weapon/surgical/surgicaldrill, +/obj/item/surgical/surgicaldrill, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) diff --git a/maps/submaps/pois_vr/aerostat/Shack1.dmm b/maps/submaps/pois_vr/aerostat/Shack1.dmm index 9849ce84051..faac7d99b67 100644 --- a/maps/submaps/pois_vr/aerostat/Shack1.dmm +++ b/maps/submaps/pois_vr/aerostat/Shack1.dmm @@ -67,13 +67,13 @@ "p" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wooden_reinforced, -/obj/item/weapon/storage/toolbox, +/obj/item/storage/toolbox, /turf/simulated/floor/wood, /area/submap/virgo2/Shack1) "q" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wooden_reinforced, -/obj/item/weapon/material/twohanded/fireaxe/scythe, +/obj/item/material/twohanded/fireaxe/scythe, /turf/simulated/floor/wood, /area/submap/virgo2/Shack1) "r" = ( @@ -88,7 +88,7 @@ "t" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/wood, /area/submap/virgo2/Shack1) "v" = ( diff --git a/maps/submaps/pois_vr/aerostat/butchershack.dmm b/maps/submaps/pois_vr/aerostat/butchershack.dmm index 95937cc8427..d4e8714f314 100644 --- a/maps/submaps/pois_vr/aerostat/butchershack.dmm +++ b/maps/submaps/pois_vr/aerostat/butchershack.dmm @@ -8,10 +8,10 @@ "d" = ( /obj/structure/closet, /obj/effect/decal/cleanable/cobweb, -/obj/item/weapon/beartrap, -/obj/item/weapon/beartrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/material/knife/hook, +/obj/item/beartrap, +/obj/item/beartrap, +/obj/item/packageWrap, +/obj/item/material/knife/hook, /turf/simulated/floor/tiled, /area/submap/virgo2/ButcherShack) "e" = ( @@ -74,15 +74,15 @@ "q" = ( /obj/structure/table/standard, /obj/effect/decal/cleanable/blood, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/simulated/floor/tiled, /area/submap/virgo2/ButcherShack) "r" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/cutlet, -/obj/item/weapon/reagent_containers/food/snacks/cutlet, -/obj/item/weapon/reagent_containers/food/snacks/cutlet, -/obj/item/weapon/reagent_containers/food/snacks/sausage, +/obj/item/reagent_containers/food/snacks/cutlet, +/obj/item/reagent_containers/food/snacks/cutlet, +/obj/item/reagent_containers/food/snacks/cutlet, +/obj/item/reagent_containers/food/snacks/sausage, /turf/simulated/floor/tiled, /area/submap/virgo2/ButcherShack) "s" = ( @@ -91,7 +91,7 @@ /area/submap/virgo2/ButcherShack) "t" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/simulated/floor/tiled, /area/submap/virgo2/ButcherShack) "u" = ( diff --git a/maps/submaps/pois_vr/debris_field/debris10.dmm b/maps/submaps/pois_vr/debris_field/debris10.dmm index 994f8b2328d..54106fdc5d7 100644 --- a/maps/submaps/pois_vr/debris_field/debris10.dmm +++ b/maps/submaps/pois_vr/debris_field/debris10.dmm @@ -4,7 +4,7 @@ /turf/simulated/floor/airless, /area/space) "b" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/airless, /area/space) "c" = ( @@ -12,7 +12,7 @@ /area/space) "d" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/airless, /area/space) "e" = ( diff --git a/maps/submaps/pois_vr/debris_field/debris13.dmm b/maps/submaps/pois_vr/debris_field/debris13.dmm index a0937393828..3ef63458d40 100644 --- a/maps/submaps/pois_vr/debris_field/debris13.dmm +++ b/maps/submaps/pois_vr/debris_field/debris13.dmm @@ -40,11 +40,11 @@ /area/tether_away/debrisfield/shuttle_buffer) "j" = ( /obj/structure/lattice, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/template_noop, /area/space) "k" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/template_noop, /area/space) diff --git a/maps/submaps/pois_vr/debris_field/debris14.dmm b/maps/submaps/pois_vr/debris_field/debris14.dmm index 6a346d66925..84da86b308a 100644 --- a/maps/submaps/pois_vr/debris_field/debris14.dmm +++ b/maps/submaps/pois_vr/debris_field/debris14.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /obj/machinery/firealarm/alarms_hidden{ dir = 4; pixel_x = -24 @@ -35,7 +35,7 @@ /turf/space, /area/tether_away/debrisfield/shuttle_buffer) "i" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/floor/airless, /area/tether_away/debrisfield/shuttle_buffer) "j" = ( diff --git a/maps/submaps/pois_vr/debris_field/debrisfield_things.dm b/maps/submaps/pois_vr/debris_field/debrisfield_things.dm index 934b8ad8310..7d282bd082b 100644 --- a/maps/submaps/pois_vr/debris_field/debrisfield_things.dm +++ b/maps/submaps/pois_vr/debris_field/debrisfield_things.dm @@ -127,12 +127,12 @@ -/obj/item/device/taperecorder/tourist +/obj/item/taperecorder/tourist name = "Body-Microphone" desc = "A sort of liability device worn by security on luxury yachts. Records everything they say. Strange that the captain was wearing it." - mytape = /obj/item/device/tape/touristguard + mytape = /obj/item/rectape/touristguard -/obj/item/device/tape/touristguard/New() +/obj/item/rectape/touristguard/New() storedinfo += "01:37 *sounds of metal creaking" storedinfo += "01:55 *sounds of distant screaming!" storedinfo += "01:37 *Sounds of hissing, both airlocks and spiders alike. Screaming continues." @@ -187,7 +187,7 @@ prob(1);/obj/item/slime_extract/grey, prob(1);/obj/item/slime_extract/rainbow) -/obj/item/weapon/paper/robo_escape_pod +/obj/item/paper/robo_escape_pod name = "faded note" info = {"This paper is old and the shaky writing has faded, rendering it difficult to read.
\ whichever poor bastard finds this pod
\ @@ -217,7 +217,7 @@ i just hope whatever happens, she finds the mercy we werent equipped to give her ai_holder_type = /datum/ai_holder/simple_mob/merc/tanker_escort say_list_type = /datum/say_list/merc/drone/tanker_escort corpse = /obj/effect/landmark/mobcorpse/syndicatesoldier/drone/tanker - loot_list = list(/obj/item/poi/broken_drone_circuit/phoron_tanker = 100, /obj/item/weapon/material/knife/tacknife = 100) + loot_list = list(/obj/item/poi/broken_drone_circuit/phoron_tanker = 100, /obj/item/material/knife/tacknife = 100) min_oxy = 0 max_oxy = 0 min_tox = 0 @@ -240,7 +240,7 @@ i just hope whatever happens, she finds the mercy we werent equipped to give her say_list_type = /datum/say_list/merc/drone/tanker_escort corpse = /obj/effect/landmark/mobcorpse/syndicatesoldier/drone/tanker loot_list = list(/obj/item/poi/broken_drone_circuit/phoron_tanker = 100, - /obj/item/weapon/shield/energy = 100, /obj/item/weapon/melee/energy/sword/color = 20) + /obj/item/shield/energy = 100, /obj/item/melee/energy/sword/color = 20) min_oxy = 0 max_oxy = 0 min_tox = 0 @@ -259,7 +259,7 @@ i just hope whatever happens, she finds the mercy we werent equipped to give her ai_holder_type = /datum/ai_holder/simple_mob/merc/ranged/tanker_escort say_list_type = /datum/say_list/merc/drone/tanker_escort corpse = /obj/effect/landmark/mobcorpse/syndicatesoldier/drone/tanker - loot_list = list(/obj/item/poi/broken_drone_circuit/phoron_tanker = 100, /obj/item/weapon/gun/projectile/automatic/c20r = 100) + loot_list = list(/obj/item/poi/broken_drone_circuit/phoron_tanker = 100, /obj/item/gun/projectile/automatic/c20r = 100) min_oxy = 0 max_oxy = 0 min_tox = 0 diff --git a/maps/submaps/pois_vr/debris_field/derelict.dmm b/maps/submaps/pois_vr/debris_field/derelict.dmm index b788ba44349..5184b5467c1 100644 --- a/maps/submaps/pois_vr/debris_field/derelict.dmm +++ b/maps/submaps/pois_vr/debris_field/derelict.dmm @@ -163,7 +163,7 @@ icon_state = "1-2"; pixel_y = 0 }, -/obj/item/weapon/grenade/empgrenade, +/obj/item/grenade/empgrenade, /turf/simulated/floor/bluegrid, /area/submap/debrisfield/derelict/interior) "aB" = ( @@ -312,7 +312,7 @@ /area/submap/debrisfield/derelict/interior) "ba" = ( /obj/random/humanoidremains, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /turf/simulated/floor/tiled/steel_ridged, /area/submap/debrisfield/derelict/interior) "bb" = ( @@ -338,7 +338,7 @@ /turf/space, /area/space) "bg" = ( -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /turf/space, /area/space) "bh" = ( @@ -538,9 +538,9 @@ /turf/simulated/floor/tiled/steel_dirty, /area/submap/debrisfield/derelict/interior) "bO" = ( -/obj/item/weapon/grenade/empgrenade, -/obj/item/weapon/grenade/empgrenade, -/obj/item/weapon/grenade/empgrenade, +/obj/item/grenade/empgrenade, +/obj/item/grenade/empgrenade, +/obj/item/grenade/empgrenade, /turf/space, /area/space) "bP" = ( diff --git a/maps/submaps/pois_vr/debris_field/escape_pod.dmm b/maps/submaps/pois_vr/debris_field/escape_pod.dmm index 18468e697ef..80681ed87c0 100644 --- a/maps/submaps/pois_vr/debris_field/escape_pod.dmm +++ b/maps/submaps/pois_vr/debris_field/escape_pod.dmm @@ -18,7 +18,7 @@ dir = 4 }, /obj/effect/decal/remains/human, -/obj/item/weapon/bananapeel{ +/obj/item/bananapeel{ layer = 2.5 }, /turf/simulated/shuttle/floor/airless, @@ -28,7 +28,7 @@ dir = 4 }, /obj/effect/decal/remains/tajaran, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() diff --git a/maps/submaps/pois_vr/debris_field/foodstand.dmm b/maps/submaps/pois_vr/debris_field/foodstand.dmm index 40efa5aff3b..56891bbe75d 100644 --- a/maps/submaps/pois_vr/debris_field/foodstand.dmm +++ b/maps/submaps/pois_vr/debris_field/foodstand.dmm @@ -13,17 +13,17 @@ /area/submap/debrisfield/foodstand) "e" = ( /obj/structure/closet/secure_closet/freezer/meat, -/obj/item/weapon/reagent_containers/food/snacks/carpmeat, -/obj/item/weapon/reagent_containers/food/snacks/carpmeat, -/obj/item/weapon/reagent_containers/food/snacks/carpmeat, +/obj/item/reagent_containers/food/snacks/carpmeat, +/obj/item/reagent_containers/food/snacks/carpmeat, +/obj/item/reagent_containers/food/snacks/carpmeat, /turf/simulated/floor/wood, /area/submap/debrisfield/foodstand) "f" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/condiment/coldsauce, -/obj/item/weapon/reagent_containers/food/condiment/ketchup, -/obj/item/weapon/reagent_containers/food/condiment/hotsauce, -/obj/item/weapon/reagent_containers/food/condiment/soysauce, +/obj/item/reagent_containers/food/condiment/coldsauce, +/obj/item/reagent_containers/food/condiment/ketchup, +/obj/item/reagent_containers/food/condiment/hotsauce, +/obj/item/reagent_containers/food/condiment/soysauce, /turf/simulated/floor/wood, /area/submap/debrisfield/foodstand) "g" = ( @@ -40,13 +40,13 @@ /area/submap/debrisfield/foodstand) "j" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/taco, -/obj/item/weapon/reagent_containers/food/snacks/taco, -/obj/item/weapon/reagent_containers/food/snacks/taco, -/obj/item/weapon/reagent_containers/food/snacks/hotdog, -/obj/item/weapon/reagent_containers/food/snacks/hotdog, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburrito, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburrito, +/obj/item/reagent_containers/food/snacks/taco, +/obj/item/reagent_containers/food/snacks/taco, +/obj/item/reagent_containers/food/snacks/taco, +/obj/item/reagent_containers/food/snacks/hotdog, +/obj/item/reagent_containers/food/snacks/hotdog, +/obj/item/reagent_containers/food/snacks/cheeseburrito, +/obj/item/reagent_containers/food/snacks/cheeseburrito, /turf/simulated/floor/wood, /area/submap/debrisfield/foodstand) "k" = ( @@ -58,7 +58,7 @@ /area/submap/debrisfield/foodstand) "l" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/taco, +/obj/item/reagent_containers/food/snacks/taco, /turf/simulated/floor/wood, /area/submap/debrisfield/foodstand) "m" = ( diff --git a/maps/submaps/pois_vr/debris_field/mining_drones.dmm b/maps/submaps/pois_vr/debris_field/mining_drones.dmm index f5722fdec8f..c6ffcda525b 100644 --- a/maps/submaps/pois_vr/debris_field/mining_drones.dmm +++ b/maps/submaps/pois_vr/debris_field/mining_drones.dmm @@ -81,7 +81,7 @@ /turf/simulated/floor/tiled/airless, /area/submap/debrisfield/mining_outpost) "p" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /mob/living/simple_mob/mechanical/mining_drone/scavenger, /turf/space, /area/space) @@ -108,7 +108,7 @@ /turf/simulated/floor/tiled/asteroid_steel/airless, /area/submap/debrisfield/mining_outpost) "u" = ( -/obj/item/weapon/ore, +/obj/item/ore, /obj/effect/floor_decal/asteroid, /turf/simulated/floor/tiled/asteroid_steel/airless, /area/submap/debrisfield/mining_outpost) @@ -116,7 +116,7 @@ /turf/template_noop, /area/space) "w" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/structure/grille/broken, /obj/item/stack/rods, /turf/simulated/floor/airless, @@ -149,7 +149,7 @@ /turf/simulated/floor/tiled/airless, /area/submap/debrisfield/mining_outpost) "D" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/effect/floor_decal/steeldecal/steel_decals_central5{ dir = 4 }, @@ -183,7 +183,7 @@ }, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/ointment, -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, /obj/effect/floor_decal/rust/part_rusted3, /turf/simulated/floor/tiled/airless, /area/submap/debrisfield/mining_outpost) @@ -194,7 +194,7 @@ /turf/simulated/floor/tiled/airless, /area/submap/debrisfield/mining_outpost) "I" = ( -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /obj/structure/table/rack/steel, /turf/simulated/floor/tiled/airless, /area/submap/debrisfield/mining_outpost) diff --git a/maps/submaps/pois_vr/debris_field/new_escapepod_robo.dmm b/maps/submaps/pois_vr/debris_field/new_escapepod_robo.dmm index c0d1c8504a0..57b3438c422 100644 --- a/maps/submaps/pois_vr/debris_field/new_escapepod_robo.dmm +++ b/maps/submaps/pois_vr/debris_field/new_escapepod_robo.dmm @@ -40,7 +40,7 @@ /area/submap/debrisfield/misc_debris) "B" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/item/weapon/paper/robo_escape_pod, +/obj/item/paper/robo_escape_pod, /turf/simulated/floor/reinforced/airless, /area/submap/debrisfield/misc_debris) "D" = ( diff --git a/maps/submaps/pois_vr/debris_field/old_satellite.dmm b/maps/submaps/pois_vr/debris_field/old_satellite.dmm index f6d0e082863..f28cfc2f6b4 100644 --- a/maps/submaps/pois_vr/debris_field/old_satellite.dmm +++ b/maps/submaps/pois_vr/debris_field/old_satellite.dmm @@ -38,7 +38,7 @@ /turf/simulated/floor/airless, /area/submap/debrisfield/old_sat) "g" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/template_noop, /area/space) "h" = ( @@ -111,7 +111,7 @@ /area/submap/debrisfield/old_sat) "o" = ( /obj/structure/lattice, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/space, /area/space) "p" = ( @@ -120,18 +120,18 @@ /turf/simulated/floor/bluegrid/airless, /area/submap/debrisfield/old_sat) "q" = ( -/obj/item/weapon/material/shard/phoron, -/obj/item/weapon/ore/iron, +/obj/item/material/shard/phoron, +/obj/item/ore/iron, /obj/random/tech_supply/component, /turf/simulated/floor/airless, /area/submap/debrisfield/old_sat) "r" = ( -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, /turf/template_noop, /area/space) "s" = ( -/obj/item/weapon/ore/glass, +/obj/item/ore/glass, /turf/template_noop, /area/space) "t" = ( diff --git a/maps/submaps/pois_vr/debris_field/old_teleporter.dmm b/maps/submaps/pois_vr/debris_field/old_teleporter.dmm index 889bf29eaac..8b6a927894d 100644 --- a/maps/submaps/pois_vr/debris_field/old_teleporter.dmm +++ b/maps/submaps/pois_vr/debris_field/old_teleporter.dmm @@ -36,7 +36,7 @@ /turf/simulated/floor/airless, /area/submap/debrisfield/old_tele) "g" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/airless, /area/submap/debrisfield/old_tele) "h" = ( @@ -62,7 +62,7 @@ /turf/simulated/floor/airless, /area/submap/debrisfield/old_tele) "m" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/airless, /area/submap/debrisfield/old_tele) "n" = ( diff --git a/maps/submaps/pois_vr/debris_field/oldshuttle.dmm b/maps/submaps/pois_vr/debris_field/oldshuttle.dmm index 7c9eefd8f1e..6e9003defb6 100644 --- a/maps/submaps/pois_vr/debris_field/oldshuttle.dmm +++ b/maps/submaps/pois_vr/debris_field/oldshuttle.dmm @@ -3,7 +3,7 @@ /turf/space, /area/space) "ab" = ( -/obj/item/weapon/material/twohanded/spear, +/obj/item/material/twohanded/spear, /turf/space, /area/space) "ac" = ( @@ -18,8 +18,8 @@ /turf/simulated/shuttle/wall/voidcraft, /area/submap/debrisfield/misc_debris) "ae" = ( -/obj/item/weapon/material/shard, -/obj/item/weapon/material/shard, +/obj/item/material/shard, +/obj/item/material/shard, /obj/structure/grille/broken, /turf/simulated/shuttle/plating/airless, /area/submap/debrisfield/misc_debris) @@ -67,7 +67,7 @@ dir = 1 }, /obj/structure/table/rack/shelf, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/shuttle/floor/black/airless, /area/submap/debrisfield/misc_debris) "aq" = ( @@ -91,8 +91,8 @@ dir = 1 }, /obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, /obj/item/clothing/head/helmet/space/void/pilot, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/pilot, @@ -114,10 +114,10 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /turf/simulated/shuttle/floor/black/airless, /area/submap/debrisfield/misc_debris) "aw" = ( @@ -367,12 +367,12 @@ /turf/simulated/shuttle/floor/darkred/airless, /area/submap/debrisfield/misc_debris) "bd" = ( -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, /obj/structure/closet/crate, /turf/simulated/shuttle/floor/darkred/airless, /area/submap/debrisfield/misc_debris) diff --git a/maps/submaps/pois_vr/debris_field/sample_asteroid2.dmm b/maps/submaps/pois_vr/debris_field/sample_asteroid2.dmm index df343792a49..fef9e46baf8 100644 --- a/maps/submaps/pois_vr/debris_field/sample_asteroid2.dmm +++ b/maps/submaps/pois_vr/debris_field/sample_asteroid2.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/space) "b" = ( -/obj/item/weapon/research_sample/common, +/obj/item/research_sample/common, /turf/simulated/mineral/floor/vacuum, /area/tether_away/debrisfield/shuttle_buffer) "c" = ( diff --git a/maps/submaps/pois_vr/debris_field/sample_asteroid3.dmm b/maps/submaps/pois_vr/debris_field/sample_asteroid3.dmm index 4de1c8b18de..0aa3311c1c1 100644 --- a/maps/submaps/pois_vr/debris_field/sample_asteroid3.dmm +++ b/maps/submaps/pois_vr/debris_field/sample_asteroid3.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/space) "c" = ( -/obj/item/weapon/research_sample/rare, +/obj/item/research_sample/rare, /turf/simulated/mineral/floor/vacuum, /area/tether_away/debrisfield/shuttle_buffer) "d" = ( diff --git a/maps/submaps/pois_vr/debris_field/ship_med_crashed.dmm b/maps/submaps/pois_vr/debris_field/ship_med_crashed.dmm index f47ee1ea039..3f5d36738b2 100644 --- a/maps/submaps/pois_vr/debris_field/ship_med_crashed.dmm +++ b/maps/submaps/pois_vr/debris_field/ship_med_crashed.dmm @@ -50,7 +50,7 @@ /turf/simulated/shuttle/plating/airless, /area/submap/debrisfield/misc_debris) "m" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/mineral/floor/vacuum, /area/submap/debrisfield/misc_debris) "n" = ( @@ -132,7 +132,7 @@ /area/submap/debrisfield/misc_debris) "C" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /turf/simulated/shuttle/plating/airless, /area/submap/debrisfield/misc_debris) "D" = ( @@ -153,7 +153,7 @@ /area/submap/debrisfield/misc_debris) "H" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/shuttle/plating/airless, /area/submap/debrisfield/misc_debris) "I" = ( @@ -161,7 +161,7 @@ /turf/simulated/shuttle/floor/airless, /area/submap/debrisfield/misc_debris) "J" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/shuttle/floor/airless, /area/submap/debrisfield/misc_debris) "K" = ( diff --git a/maps/submaps/pois_vr/debris_field/ship_mining_drone.dmm b/maps/submaps/pois_vr/debris_field/ship_mining_drone.dmm index 324db8e34e3..816fb1b6415 100644 --- a/maps/submaps/pois_vr/debris_field/ship_mining_drone.dmm +++ b/maps/submaps/pois_vr/debris_field/ship_mining_drone.dmm @@ -194,251 +194,251 @@ /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aA" = ( -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aB" = ( -/obj/item/weapon/ore, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore, +/obj/item/ore, +/obj/item/ore/gold, +/obj/item/ore/iron, +/obj/item/ore, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aC" = ( -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/gold, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/diamond, /obj/machinery/artifact, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aD" = ( -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/phoron, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/phoron, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aE" = ( -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/iron, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/iron, +/obj/item/ore/diamond, +/obj/item/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/iron, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aF" = ( -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/phoron, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/gold, +/obj/item/ore/iron, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/silver, +/obj/item/ore/coal, +/obj/item/ore/phoron, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aG" = ( -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/gold, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/diamond, +/obj/item/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/coal, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/gold, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aH" = ( -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/phoron, +/obj/item/ore/diamond, +/obj/item/ore/gold, +/obj/item/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/phoron, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aI" = ( -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/iron, +/obj/item/ore/diamond, +/obj/item/ore/iron, /mob/living/simple_mob/mechanical/hivebot/support/commander, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aJ" = ( -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/phoron, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/iron, +/obj/item/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/iron, +/obj/item/ore/gold, +/obj/item/ore/phoron, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aK" = ( -/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/gold, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/phoron, -/obj/item/weapon/ore/phoron, -/obj/item/weapon/ore/phoron, -/obj/item/weapon/ore/phoron, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/gold, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/diamond, +/obj/item/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/coal, +/obj/item/ore/gold, +/obj/item/ore/iron, +/obj/item/ore/phoron, +/obj/item/ore/phoron, +/obj/item/ore/phoron, +/obj/item/ore/phoron, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aL" = ( -/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/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/phoron, +/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/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/diamond, +/obj/item/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/phoron, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aM" = ( -/obj/item/weapon/ore, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/phoron, -/obj/item/weapon/ore/phoron, -/obj/item/weapon/ore, +/obj/item/ore, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/coal, +/obj/item/ore/coal, +/obj/item/ore/diamond, +/obj/item/ore/iron, +/obj/item/ore/gold, +/obj/item/ore/phoron, +/obj/item/ore/phoron, +/obj/item/ore, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aN" = ( -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/phoron, -/obj/item/weapon/ore/phoron, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/silver, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/phoron, +/obj/item/ore/phoron, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aO" = ( -/obj/item/weapon/ore, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/phoron, -/obj/item/weapon/ore/phoron, -/obj/item/weapon/ore/phoron, -/obj/item/weapon/ore/phoron, +/obj/item/ore, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/diamond, +/obj/item/ore/iron, +/obj/item/ore/gold, +/obj/item/ore/phoron, +/obj/item/ore/phoron, +/obj/item/ore/phoron, +/obj/item/ore/phoron, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aP" = ( -/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/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aQ" = ( -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/iron, +/obj/item/ore/gold, +/obj/item/ore/iron, /obj/structure/mob_spawner{ density = 1; desc = "A bizarre mess of robotic limbs, glowing microrefineries, and nanoassemblers gradually converting the pile of raw materials into active hivebots."; @@ -459,79 +459,79 @@ /turf/space, /area/submap/debrisfield/mining_drone_ship) "aS" = ( -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aT" = ( -/obj/item/weapon/ore, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, +/obj/item/ore, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/iron, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/iron, +/obj/item/ore/iron, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aU" = ( -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/diamond, +/obj/item/ore/coal, +/obj/item/ore/iron, +/obj/item/ore, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aV" = ( -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/phoron, -/obj/item/weapon/ore/phoron, +/obj/item/ore/diamond, +/obj/item/ore/gold, +/obj/item/ore/gold, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/phoron, +/obj/item/ore/phoron, /obj/machinery/light/poi, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aW" = ( -/obj/item/weapon/ore, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/phoron, +/obj/item/ore, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/gold, +/obj/item/ore/iron, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/silver, +/obj/item/ore/iron, +/obj/item/ore/phoron, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aX" = ( -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/gold, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/iron, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/diamond, +/obj/item/ore/gold, +/obj/item/ore/silver, +/obj/item/ore/iron, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aY" = ( -/obj/item/weapon/ore/diamond, -/obj/item/weapon/ore/iron, +/obj/item/ore/diamond, +/obj/item/ore/iron, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_drone_ship) "aZ" = ( diff --git a/maps/submaps/pois_vr/debris_field/ship_sci_overrun.dmm b/maps/submaps/pois_vr/debris_field/ship_sci_overrun.dmm index 4ba38479681..3c05ea1f459 100644 --- a/maps/submaps/pois_vr/debris_field/ship_sci_overrun.dmm +++ b/maps/submaps/pois_vr/debris_field/ship_sci_overrun.dmm @@ -38,7 +38,7 @@ /area/submap/debrisfield/sci_overrun) "ai" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) "aj" = ( @@ -66,7 +66,7 @@ /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) "ap" = ( -/obj/item/weapon/reagent_containers/spray/plantbgone, +/obj/item/reagent_containers/spray/plantbgone, /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) "aq" = ( @@ -82,7 +82,7 @@ /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) "at" = ( -/obj/item/weapon/reagent_containers/spray/chemsprayer, +/obj/item/reagent_containers/spray/chemsprayer, /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) "au" = ( @@ -98,7 +98,7 @@ /area/submap/debrisfield/sci_overrun) "aw" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) "ax" = ( @@ -126,16 +126,16 @@ /area/submap/debrisfield/sci_overrun) "aB" = ( /obj/structure/table/rack, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/knife/machete/hatchet, -/obj/item/weapon/material/knife/machete/hatchet, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/shovel/spade, +/obj/item/shovel/spade, +/obj/item/material/minihoe, +/obj/item/material/minihoe, +/obj/item/material/knife/machete/hatchet, +/obj/item/material/knife/machete/hatchet, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) "aC" = ( @@ -185,7 +185,7 @@ /area/submap/debrisfield/sci_overrun) "aK" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/rd, +/obj/item/bedsheet/rd, /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) "aL" = ( @@ -205,7 +205,7 @@ /turf/simulated/wall/thull, /area/submap/debrisfield/sci_overrun) "aN" = ( -/obj/item/weapon/gun/energy/temperature, +/obj/item/gun/energy/temperature, /obj/structure/table/rack, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -222,7 +222,7 @@ /turf/simulated/floor/airless, /area/submap/debrisfield/sci_overrun) "aP" = ( -/obj/item/weapon/tool/prybar/red, +/obj/item/tool/prybar/red, /turf/simulated/floor/airless, /area/submap/debrisfield/sci_overrun) "aQ" = ( @@ -261,7 +261,7 @@ /turf/simulated/wall/thull, /area/submap/debrisfield/sci_overrun) "aX" = ( -/obj/item/weapon/gun/energy/decloner, +/obj/item/gun/energy/decloner, /obj/structure/table/rack, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -296,18 +296,18 @@ /obj/item/stack/material/phoron{ amount = 10 }, -/obj/item/device/flashlight/pen, +/obj/item/flashlight/pen, /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) "bd" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, +/obj/item/paper_bin, +/obj/item/pen/blue, /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) "be" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) "bf" = ( @@ -319,8 +319,8 @@ /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) "bh" = ( -/obj/item/device/slime_scanner, -/obj/item/device/slime_scanner, +/obj/item/slime_scanner, +/obj/item/slime_scanner, /obj/structure/table/reinforced, /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) @@ -332,7 +332,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/item/clothing/mask/breath, /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) @@ -350,12 +350,12 @@ /area/submap/debrisfield/sci_overrun) "bl" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/energy/taser/xeno, -/obj/item/weapon/melee/baton/slime/loaded, +/obj/item/gun/energy/taser/xeno, +/obj/item/melee/baton/slime/loaded, /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) "bm" = ( -/obj/item/weapon/airlock_electronics, +/obj/item/airlock_electronics, /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) "bn" = ( @@ -363,7 +363,7 @@ /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) "bo" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) "bp" = ( @@ -377,14 +377,14 @@ /area/submap/debrisfield/sci_overrun) "bq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/farwacube, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/neaeracube, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sarucube, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sparracube, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/stokcube, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wolpincube, +/obj/item/reagent_containers/food/snacks/monkeycube, +/obj/item/reagent_containers/food/snacks/monkeycube/farwacube, +/obj/item/reagent_containers/food/snacks/monkeycube/neaeracube, +/obj/item/reagent_containers/food/snacks/monkeycube/sarucube, +/obj/item/reagent_containers/food/snacks/monkeycube/sobakacube, +/obj/item/reagent_containers/food/snacks/monkeycube/sparracube, +/obj/item/reagent_containers/food/snacks/monkeycube/stokcube, +/obj/item/reagent_containers/food/snacks/monkeycube/wolpincube, /turf/simulated/floor/tiled/white/airless, /area/submap/debrisfield/sci_overrun) "br" = ( diff --git a/maps/submaps/pois_vr/debris_field/ship_sup_exploded.dmm b/maps/submaps/pois_vr/debris_field/ship_sup_exploded.dmm index cb31de1baaf..462af23a722 100644 --- a/maps/submaps/pois_vr/debris_field/ship_sup_exploded.dmm +++ b/maps/submaps/pois_vr/debris_field/ship_sup_exploded.dmm @@ -42,10 +42,10 @@ /area/submap/debrisfield/misc_debris) "ak" = ( /obj/structure/closet/crate/secure/engineering, -/obj/item/weapon/tool/transforming/powerdrill, -/obj/item/weapon/tool/transforming/jawsoflife, -/obj/item/weapon/tool/transforming/powerdrill, -/obj/item/weapon/tool/transforming/jawsoflife, +/obj/item/tool/transforming/powerdrill, +/obj/item/tool/transforming/jawsoflife, +/obj/item/tool/transforming/powerdrill, +/obj/item/tool/transforming/jawsoflife, /obj/effect/decal/cleanable/dirt, /turf/simulated/shuttle/plating/airless, /area/submap/debrisfield/misc_debris) @@ -78,17 +78,17 @@ "ar" = ( /obj/structure/lattice, /obj/item/stack/material/steel, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/template_noop, /area/submap/debrisfield/misc_debris) "as" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/simulated/shuttle/plating/airless, /area/submap/debrisfield/misc_debris) "at" = ( /obj/structure/lattice, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/template_noop, /area/submap/debrisfield/misc_debris) "au" = ( @@ -97,20 +97,20 @@ /turf/template_noop, /area/submap/debrisfield/misc_debris) "av" = ( -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/template_noop, /area/submap/debrisfield/misc_debris) "aw" = ( /obj/structure/lattice, /obj/effect/decal/cleanable/molten_item, -/obj/item/weapon/material/shard/shrapnel, +/obj/item/material/shard/shrapnel, /turf/template_noop, /area/submap/debrisfield/misc_debris) "ax" = ( /obj/structure/closet/crate/secure/engineering, -/obj/item/weapon/weldingtool/experimental, -/obj/item/weapon/weldingtool/electric, -/obj/item/weapon/weldingtool/electric, +/obj/item/weldingtool/experimental, +/obj/item/weldingtool/electric, +/obj/item/weldingtool/electric, /turf/template_noop, /area/submap/debrisfield/misc_debris) "ay" = ( @@ -145,12 +145,12 @@ /area/submap/debrisfield/misc_debris) "aF" = ( /obj/structure/grille, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/effect/decal/cleanable/dirt, /turf/simulated/shuttle/plating/airless, /area/submap/debrisfield/misc_debris) "aG" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/effect/decal/cleanable/dirt, /turf/simulated/shuttle/plating/airless, /area/submap/debrisfield/misc_debris) diff --git a/maps/submaps/pois_vr/debris_field/ship_tanker_betrayed.dmm b/maps/submaps/pois_vr/debris_field/ship_tanker_betrayed.dmm index 2ccd2629aba..701ce361230 100644 --- a/maps/submaps/pois_vr/debris_field/ship_tanker_betrayed.dmm +++ b/maps/submaps/pois_vr/debris_field/ship_tanker_betrayed.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ah" = ( /obj/item/stack/rods, -/obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza, +/obj/item/reagent_containers/food/snacks/slice/vegetablepizza, /turf/space/cracked_asteroid{ temperature = 2.7 }, @@ -144,7 +144,7 @@ /obj/item/robot_parts/head, /obj/effect/decal/cleanable/blood/gibs/robot, /obj/effect/decal/cleanable/blood/oil, -/obj/item/weapon/broken_gun/laserrifle, +/obj/item/broken_gun/laserrifle, /turf/simulated/floor/tiled/techfloor, /area/submap/debrisfield/phoron_tanker) "ky" = ( @@ -160,7 +160,7 @@ /turf/simulated/floor/tiled/techfloor, /area/submap/debrisfield/phoron_tanker) "li" = ( -/obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza, +/obj/item/reagent_containers/food/snacks/slice/vegetablepizza, /turf/space/cracked_asteroid{ temperature = 2.7 }, @@ -182,7 +182,7 @@ }, /area/submap/debrisfield/phoron_tanker) "mP" = ( -/obj/item/weapon/card/id/event/altcard/centcom, +/obj/item/card/id/event/altcard/centcom, /obj/structure/closet/wardrobe/captain, /turf/simulated/floor/tiled/techfloor, /area/submap/debrisfield/phoron_tanker) @@ -269,7 +269,7 @@ }, /area/submap/debrisfield/phoron_tanker) "sY" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/mineral/floor/ignore_mapgen/cave{ name = "asteroid"; nitrogen = 0; @@ -356,7 +356,7 @@ /area/submap/debrisfield/phoron_tanker) "yp" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/ian, +/obj/item/bedsheet/ian, /obj/structure/closet/walllocker_double/emergency_engi/south, /obj/machinery/light/flicker{ dir = 4 @@ -542,7 +542,7 @@ "Lr" = ( /obj/structure/bed/chair/bay/comfy/captain, /obj/effect/decal/cleanable/blood/gibs, -/obj/item/weapon/gun/projectile/revolver/mateba, +/obj/item/gun/projectile/revolver/mateba, /turf/simulated/floor/tiled/techfloor, /area/submap/debrisfield/phoron_tanker) "LM" = ( diff --git a/maps/submaps/pois_vr/debris_field/ship_tourist_overrun.dmm b/maps/submaps/pois_vr/debris_field/ship_tourist_overrun.dmm index fd62f792fe6..c2a3b07dbf4 100644 --- a/maps/submaps/pois_vr/debris_field/ship_tourist_overrun.dmm +++ b/maps/submaps/pois_vr/debris_field/ship_tourist_overrun.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ai" = ( /obj/effect/decal/cleanable/blood, -/obj/item/device/radio/intercom/private{ +/obj/item/radio/intercom/private{ pixel_y = -21 }, /obj/machinery/light/small, @@ -40,7 +40,7 @@ /area/submap/debrisfield/luxury_boat/engine) "aS" = ( /obj/structure/bed/chair/wood/wings, -/obj/item/weapon/reagent_containers/food/snacks/slice/meatpizza/filled, +/obj/item/reagent_containers/food/snacks/slice/meatpizza/filled, /turf/simulated/floor/wood/airless, /area/submap/debrisfield/luxury_boat/crew) "bh" = ( @@ -141,7 +141,7 @@ /area/submap/debrisfield/luxury_boat/bridge) "df" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza, +/obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza, /turf/simulated/floor/wood/airless, /area/submap/debrisfield/luxury_boat/crew) "dk" = ( @@ -149,7 +149,7 @@ name = "Mangled Tourist" }, /mob/living/simple_mob/animal/giant_spider/space, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /turf/simulated/floor/wood/airless, /area/submap/debrisfield/luxury_boat/crew) "ds" = ( @@ -329,7 +329,7 @@ /area/submap/debrisfield/luxury_boat/crew) "iE" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whitewine, +/obj/item/reagent_containers/food/drinks/bottle/whitewine, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/lino, /area/submap/debrisfield/luxury_boat/crew) @@ -362,7 +362,7 @@ /turf/simulated/floor/tiled/yellow, /area/submap/debrisfield/luxury_boat/crew) "jT" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/machinery/door/window, /turf/simulated/floor/wood/airless, /area/submap/debrisfield/luxury_boat/crew) @@ -414,7 +414,7 @@ /area/submap/debrisfield/luxury_boat/crew) "lo" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple, +/obj/item/reagent_containers/food/snacks/sliceable/pizza/pineapple, /turf/simulated/floor/wood/airless, /area/submap/debrisfield/luxury_boat/crew) "lv" = ( @@ -481,10 +481,10 @@ /area/submap/debrisfield/luxury_boat/bridge) "nr" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/gun/energy/locked/frontier/holdout{ +/obj/item/gun/energy/locked/frontier/holdout{ pixel_y = -9 }, -/obj/item/weapon/gun/energy/locked/frontier/holdout, +/obj/item/gun/energy/locked/frontier/holdout, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/tiled/milspec, /area/submap/debrisfield/luxury_boat/bridge) @@ -499,15 +499,15 @@ /turf/simulated/floor/wood, /area/submap/debrisfield/luxury_boat/crew) "nu" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ pixel_x = 7; pixel_y = -9 }, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ pixel_x = 8; pixel_y = 13 }, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ pixel_x = -9; pixel_y = -12 }, @@ -581,14 +581,14 @@ /area/submap/debrisfield/luxury_boat/crew) "pQ" = ( /obj/effect/decal/cleanable/blood, -/obj/item/device/taperecorder/tourist, +/obj/item/taperecorder/tourist, /obj/effect/landmark/corpse/bridgeofficer{ corpseid = 0; corpseidaccess = null; corpseidjob = null; name = "Mutiliated Captain" }, -/obj/item/weapon/gun/energy/gun/rifle, +/obj/item/gun/energy/gun/rifle, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -673,7 +673,7 @@ /turf/simulated/floor/carpet/purple, /area/submap/debrisfield/luxury_boat/crew) "sh" = ( -/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint, +/obj/item/reagent_containers/food/drinks/metaglass/metapint, /turf/simulated/floor/lino, /area/submap/debrisfield/luxury_boat/crew) "sz" = ( @@ -790,7 +790,7 @@ "wp" = ( /obj/structure/table/hardwoodtable, /obj/machinery/atmospherics/unary/vent_scrubber, -/obj/item/weapon/reagent_containers/food/snacks/slice/meatpizza/filled, +/obj/item/reagent_containers/food/snacks/slice/meatpizza/filled, /turf/simulated/floor/wood/airless, /area/submap/debrisfield/luxury_boat/crew) "wq" = ( @@ -878,7 +878,7 @@ /obj/effect/decal/cleanable/blood{ pixel_x = 10 }, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ pixel_x = -9 }, /obj/item/stack/rods, @@ -933,7 +933,7 @@ /turf/simulated/floor/airless, /area/submap/debrisfield/luxury_boat/engine) "zr" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/lino, /area/submap/debrisfield/luxury_boat/crew) "zw" = ( @@ -1111,12 +1111,12 @@ /turf/simulated/floor/airless, /area/submap/debrisfield/luxury_boat/engine) "Eq" = ( -/obj/item/weapon/material/knife, +/obj/item/material/knife, /turf/simulated/floor/wood/airless, /area/submap/debrisfield/luxury_boat/crew) "Fa" = ( /obj/structure/table/gamblingtable, -/obj/item/weapon/deck/cards/casino, +/obj/item/deck/cards/casino, /turf/simulated/floor/carpet/green, /area/submap/debrisfield/luxury_boat/crew) "Fm" = ( @@ -1295,13 +1295,13 @@ /turf/simulated/shuttle/wall, /area/submap/debrisfield/luxury_boat/crew) "Lw" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/tiled/yellow, /area/submap/debrisfield/luxury_boat/crew) "LC" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/storage/secure/briefcase/money, -/obj/item/weapon/storage/secure/briefcase/money, +/obj/item/storage/secure/briefcase/money, +/obj/item/storage/secure/briefcase/money, /obj/item/clothing/head/beret/centcom/captain, /turf/simulated/floor/tiled/milspec, /area/submap/debrisfield/luxury_boat/bridge) @@ -1330,7 +1330,7 @@ /turf/simulated/floor/airless, /area/submap/debrisfield/luxury_boat/engine) "MX" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/wood/airless, /area/submap/debrisfield/luxury_boat/crew) "MY" = ( @@ -1356,8 +1356,8 @@ /area/submap/debrisfield/luxury_boat/engine) "NP" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/blue_captain, -/obj/item/weapon/coin/phoron, +/obj/item/folder/blue_captain, +/obj/item/coin/phoron, /turf/simulated/floor/tiled/milspec, /area/submap/debrisfield/luxury_boat/bridge) "NQ" = ( @@ -1414,7 +1414,7 @@ /area/submap/debrisfield/luxury_boat/crew) "PV" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -1459,11 +1459,11 @@ /turf/simulated/shuttle/wall, /area/submap/debrisfield/luxury_boat/engine) "Rm" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ pixel_x = 10; pixel_y = -9 }, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/item/stack/rods, /turf/simulated/floor/tiled/milspec, /area/submap/debrisfield/luxury_boat/cryo) @@ -1545,7 +1545,7 @@ /area/submap/debrisfield/luxury_boat/cryo) "Vo" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth, +/obj/item/reagent_containers/food/drinks/bottle/vermouth, /turf/simulated/floor/wood/airless, /area/submap/debrisfield/luxury_boat/crew) "Vq" = ( @@ -1593,13 +1593,13 @@ /area/submap/debrisfield/luxury_boat/engine) "Wt" = ( /obj/structure/grille, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ pixel_y = 4 }, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ pixel_x = 12 }, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ pixel_x = -21 }, /turf/simulated/floor/airless, @@ -1659,7 +1659,7 @@ "YR" = ( /obj/structure/window/reinforced/tinted/frosted, /obj/effect/decal/cleanable/blood/gibs, -/obj/item/weapon/storage/secure/briefcase/money, +/obj/item/storage/secure/briefcase/money, /turf/simulated/floor/wood, /area/submap/debrisfield/luxury_boat/crew) "YT" = ( diff --git a/maps/submaps/pois_vr/debris_field/tinycarrier.dmm b/maps/submaps/pois_vr/debris_field/tinycarrier.dmm index d209699dd4e..4404138b08f 100644 --- a/maps/submaps/pois_vr/debris_field/tinycarrier.dmm +++ b/maps/submaps/pois_vr/debris_field/tinycarrier.dmm @@ -574,8 +574,8 @@ anchored = 1; starts_with = list() }, -/obj/item/weapon/gun/projectile/p92x/large, -/obj/item/weapon/gun/projectile/p92x/large, +/obj/item/gun/projectile/p92x/large, +/obj/item/gun/projectile/p92x/large, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -759,9 +759,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber{ dir = 4 }, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/screwdriver{ +/obj/item/tool/crowbar, +/obj/item/tool/wrench, +/obj/item/tool/screwdriver{ pixel_y = 8 }, /turf/simulated/floor/tiled/techmaint/airless, @@ -862,10 +862,10 @@ /area/submap/debrisfield/tinyshuttle/hangar) "bB" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/toolbox/mechanical{ - starts_with = list(/obj/item/weapon/tool/screwdriver,/obj/item/weapon/tool/wrench,/obj/item/weapon/tool/crowbar,/obj/item/device/analyzer,/obj/item/weapon/tool/wirecutters) +/obj/item/storage/toolbox/mechanical{ + starts_with = list(/obj/item/tool/screwdriver,/obj/item/tool/wrench,/obj/item/tool/crowbar,/obj/item/analyzer,/obj/item/tool/wirecutters) }, -/obj/item/device/t_scanner, +/obj/item/t_scanner, /obj/effect/floor_decal/corner/orange{ dir = 9 }, @@ -997,7 +997,7 @@ dir = 5 }, /obj/effect/decal/cleanable/liquid_fuel, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled/steel_ridged, /area/submap/debrisfield/tinyshuttle/engine) "bO" = ( @@ -1132,7 +1132,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/submap/debrisfield/tinyshuttle/engine) "cf" = ( -/obj/item/weapon/material/shard/titaniumglass, +/obj/item/material/shard/titaniumglass, /turf/space, /turf/simulated/shuttle/plating/airless/carry, /area/submap/debrisfield/tinyshuttle/hangar) @@ -1148,7 +1148,7 @@ dir = 1; pixel_y = -24 }, -/obj/item/weapon/weldingtool/electric, +/obj/item/weldingtool/electric, /obj/effect/floor_decal/corner/orange{ dir = 10 }, @@ -1186,7 +1186,7 @@ /area/submap/debrisfield/tinyshuttle/hangar) "cm" = ( /obj/structure/lattice, -/obj/item/weapon/material/shard/titaniumglass, +/obj/item/material/shard/titaniumglass, /turf/simulated/shuttle/plating/airless/carry, /area/submap/debrisfield/tinyshuttle/hangar) diff --git a/maps/submaps/shelters/shelter_1.dmm b/maps/submaps/shelters/shelter_1.dmm index 63ea7433627..32f21ef1b46 100644 --- a/maps/submaps/shelters/shelter_1.dmm +++ b/maps/submaps/shelters/shelter_1.dmm @@ -14,21 +14,21 @@ /area/survivalpod) "d" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/menu11, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/menu11, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/firstaid/regular, /turf/simulated/shuttle/floor/voidcraft, /area/survivalpod) "e" = ( -/obj/item/device/gps/computer, +/obj/item/gps/computer, /turf/simulated/shuttle/floor/voidcraft, /area/survivalpod) "f" = ( @@ -46,7 +46,7 @@ /area/survivalpod) "i" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/mime, +/obj/item/bedsheet/mime, /obj/machinery/light/small{ dir = 4; pixel_y = 0 diff --git a/maps/submaps/shelters/shelter_2.dmm b/maps/submaps/shelters/shelter_2.dmm index 1dbc0b26415..9b3a9e50239 100644 --- a/maps/submaps/shelters/shelter_2.dmm +++ b/maps/submaps/shelters/shelter_2.dmm @@ -10,12 +10,12 @@ /area/survivalpod) "c" = ( /obj/structure/table/steel, -/obj/item/weapon/reagent_containers/food/drinks/glass2/rocks{ +/obj/item/reagent_containers/food/drinks/glass2/rocks{ pixel_x = 7; pixel_y = 2 }, /obj/random/mre, -/obj/item/weapon/material/kitchen/utensil/fork{ +/obj/item/material/kitchen/utensil/fork{ pixel_x = 12 }, /turf/simulated/floor/carpet/bcarpet, @@ -32,40 +32,40 @@ /area/survivalpod) "f" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/box/survival/space, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/o2, +/obj/item/storage/box/survival/space, /obj/item/clothing/gloves/watch/survival, -/obj/item/device/emergency_beacon, -/obj/item/device/healthanalyzer, -/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/item/emergency_beacon, +/obj/item/healthanalyzer, +/obj/item/storage/pill_bottle/dice_nerd, /turf/simulated/shuttle/floor/voidcraft, /area/survivalpod) "g" = ( -/obj/item/device/gps/computer, +/obj/item/gps/computer, /turf/simulated/shuttle/floor/voidcraft, /area/survivalpod) "h" = ( /obj/machinery/shower, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /obj/structure/curtain, /turf/simulated/shuttle/floor/voidcraft, /area/survivalpod) @@ -88,7 +88,7 @@ /area/survivalpod) "m" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/shuttle/floor/voidcraft, /area/survivalpod) "n" = ( @@ -112,7 +112,7 @@ /area/survivalpod) "p" = ( /obj/structure/table/survival_pod, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /turf/simulated/shuttle/floor/voidcraft, /area/survivalpod) "q" = ( @@ -133,11 +133,11 @@ light_color = "#DDFFD3" }, /obj/structure/table/steel, -/obj/item/weapon/reagent_containers/food/drinks/glass2/rocks{ +/obj/item/reagent_containers/food/drinks/glass2/rocks{ pixel_x = 7; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine{ +/obj/item/reagent_containers/food/drinks/bottle/wine{ pixel_x = -6; pixel_y = 10 }, diff --git a/maps/submaps/shelters/shelter_3.dmm b/maps/submaps/shelters/shelter_3.dmm index 27603130111..5cbd8f3bc45 100644 --- a/maps/submaps/shelters/shelter_3.dmm +++ b/maps/submaps/shelters/shelter_3.dmm @@ -43,9 +43,9 @@ /turf/simulated/shuttle/floor/voidcraft/dark, /area/survivalpod) "i" = ( -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/book/manual/barman_recipes, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/glass/rag, /obj/structure/table/gamblingtable, /turf/simulated/shuttle/floor/voidcraft/dark, /area/survivalpod) @@ -55,9 +55,9 @@ /area/survivalpod) "k" = ( /obj/structure/table/gamblingtable, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/bartender, -/obj/item/weapon/storage/fancy/cigar, +/obj/item/storage/fancy/cigar, /turf/simulated/shuttle/floor/voidcraft/dark, /area/survivalpod) "l" = ( @@ -105,12 +105,12 @@ /area/survivalpod) "s" = ( /obj/structure/table/reinforced, -/obj/item/weapon/flame/lighter/random{ +/obj/item/flame/lighter/random{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/flame/lighter/random, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/flame/lighter/random, +/obj/item/storage/firstaid/regular, /turf/simulated/shuttle/floor/voidcraft/dark, /area/survivalpod) "t" = ( @@ -119,7 +119,7 @@ /area/survivalpod) "u" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/matches{ +/obj/item/storage/box/matches{ pixel_x = -4; pixel_y = 8 }, @@ -139,7 +139,7 @@ /turf/simulated/shuttle/wall/voidcraft/survival/hard_corner, /area/survivalpod) "x" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/carpet/bcarpet, /area/survivalpod) "y" = ( @@ -190,11 +190,11 @@ /area/survivalpod) "F" = ( /obj/structure/table/gamblingtable, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = -4; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = 4; pixel_y = 4 }, diff --git a/maps/submaps/shelters/shelter_4.dmm b/maps/submaps/shelters/shelter_4.dmm index bf1ed7f018d..461fd8175dd 100644 --- a/maps/submaps/shelters/shelter_4.dmm +++ b/maps/submaps/shelters/shelter_4.dmm @@ -43,62 +43,62 @@ /area/survivalpod) "h" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/device/radio/emergency, -/obj/item/device/survivalcapsule, -/obj/item/device/survivalcapsule, -/obj/item/device/survivalcapsule, -/obj/item/weapon/storage/box/survival/space, -/obj/item/weapon/storage/box/survival/space, -/obj/item/weapon/storage/box/survival/space, -/obj/item/weapon/storage/box/survival/space, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/device/bluespaceradio, -/obj/item/weapon/storage/box/survival/comp, -/obj/item/weapon/storage/box/survival/comp, -/obj/item/device/binoculars, -/obj/item/device/perfect_tele, -/obj/item/weapon/storage/pill_bottle/nutriment, -/obj/item/weapon/storage/pill_bottle/blood_regen, -/obj/item/weapon/storage/pill_bottle/arithrazine, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/weapon/storage/pill_bottle/nutriment, -/obj/item/weapon/storage/pill_bottle/blood_regen, -/obj/item/weapon/storage/pill_bottle/arithrazine, -/obj/item/weapon/storage/pill_bottle/corophizine, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/radio/emergency, +/obj/item/survivalcapsule, +/obj/item/survivalcapsule, +/obj/item/survivalcapsule, +/obj/item/storage/box/survival/space, +/obj/item/storage/box/survival/space, +/obj/item/storage/box/survival/space, +/obj/item/storage/box/survival/space, +/obj/item/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/bluespaceradio, +/obj/item/storage/box/survival/comp, +/obj/item/storage/box/survival/comp, +/obj/item/binoculars, +/obj/item/perfect_tele, +/obj/item/storage/pill_bottle/nutriment, +/obj/item/storage/pill_bottle/blood_regen, +/obj/item/storage/pill_bottle/arithrazine, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/storage/pill_bottle/nutriment, +/obj/item/storage/pill_bottle/blood_regen, +/obj/item/storage/pill_bottle/arithrazine, +/obj/item/storage/pill_bottle/corophizine, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/extinguisher/mini, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, /turf/simulated/shuttle/floor/voidcraft/light, /area/survivalpod) "i" = ( -/obj/item/device/gps/computer, +/obj/item/gps/computer, /turf/simulated/shuttle/floor/voidcraft/light, /area/survivalpod) "j" = ( @@ -112,15 +112,15 @@ /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact/flash, /obj/item/ammo_magazine/m9mm/compact/flash, -/obj/item/weapon/gun/projectile/pistol, +/obj/item/gun/projectile/pistol, /obj/item/clothing/accessory/storage/black_vest, -/obj/item/weapon/material/knife/tacknife/survival, -/obj/item/weapon/storage/box/survival/comp, +/obj/item/material/knife/tacknife/survival, +/obj/item/storage/box/survival/comp, /turf/simulated/floor/carpet/bcarpet, /area/survivalpod) "k" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /turf/simulated/floor/carpet/bcarpet, /area/survivalpod) "l" = ( @@ -175,7 +175,7 @@ /area/survivalpod) "s" = ( /obj/structure/table/survival_pod, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /obj/structure/sink/kitchen{ icon_state = "sink_alt"; dir = 4; @@ -197,7 +197,7 @@ /obj/machinery/shower{ dir = 4 }, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /obj/structure/curtain/black, /turf/simulated/shuttle/floor/voidcraft/light, /area/survivalpod) @@ -238,11 +238,11 @@ /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact/flash, /obj/item/ammo_magazine/m9mm/compact/flash, -/obj/item/weapon/gun/projectile/pistol, +/obj/item/gun/projectile/pistol, /obj/item/clothing/accessory/storage/black_vest, -/obj/item/weapon/material/knife/tacknife/survival, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/material/knife/tacknife/survival, +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, /turf/simulated/floor/carpet/bcarpet, /area/survivalpod) @@ -262,14 +262,14 @@ /obj/random/mre, /obj/random/mre, /obj/random/mre, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, /turf/simulated/shuttle/floor/voidcraft/dark, /area/survivalpod) "D" = ( @@ -321,8 +321,8 @@ /obj/item/stack/material/glass{ amount = 50 }, -/obj/item/weapon/storage/toolbox/syndicate/powertools, -/obj/item/weapon/storage/toolbox/syndicate/powertools, +/obj/item/storage/toolbox/syndicate/powertools, +/obj/item/storage/toolbox/syndicate/powertools, /obj/machinery/light{ icon_state = "tube1"; dir = 4 @@ -370,15 +370,15 @@ /area/survivalpod) "L" = ( /obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/sniperrifle, +/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/sniperrifle, /turf/simulated/shuttle/floor/voidcraft/dark, /area/survivalpod) "M" = ( @@ -435,17 +435,17 @@ /obj/item/ammo_magazine/m545/ap, /obj/item/ammo_magazine/m545/ap, /obj/item/ammo_magazine/m545/ap, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /obj/machinery/light, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /turf/simulated/shuttle/floor/voidcraft/dark, /area/survivalpod) "U" = ( @@ -458,10 +458,10 @@ /obj/item/clothing/head/helmet/space/void/merc/odst, /obj/item/clothing/head/helmet/space/void/merc/odst, /obj/item/clothing/head/helmet/space/void/merc/odst, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, /obj/item/clothing/shoes/magboots/adv, /obj/item/clothing/shoes/magboots/adv, /obj/item/clothing/shoes/magboots/adv, diff --git a/maps/submaps/shelters/shelter_a.dmm b/maps/submaps/shelters/shelter_a.dmm index 0d118b9e77c..489a383f647 100644 --- a/maps/submaps/shelters/shelter_a.dmm +++ b/maps/submaps/shelters/shelter_a.dmm @@ -31,128 +31,128 @@ /area/survivalpod) "f" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/device/fbp_backup_cell, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/device/healthanalyzer, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/fbp_backup_cell, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/regular, +/obj/item/healthanalyzer, /obj/item/modular_computer/laptop/preset/custom_loadout/rugged, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/space, +/obj/item/storage/box/survival/space, /obj/item/clothing/gloves/watch/survival, -/obj/item/device/emergency_beacon, -/obj/item/weapon/extinguisher/mini, -/obj/item/device/radio{ +/obj/item/emergency_beacon, +/obj/item/extinguisher/mini, +/obj/item/radio{ icon_state = "walkietalkiebay"; name = "emergency radio" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#800080" }, -/obj/item/weapon/towel{ +/obj/item/towel{ color = "#800080" }, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake, -/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake, -/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake, -/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, -/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, -/obj/item/weapon/reagent_containers/food/snacks/candy, -/obj/item/weapon/reagent_containers/food/snacks/candy, -/obj/item/weapon/reagent_containers/food/drinks/dry_ramen, -/obj/item/weapon/reagent_containers/food/drinks/dry_ramen, -/obj/item/weapon/reagent_containers/food/drinks/dry_ramen, -/obj/item/weapon/reagent_containers/food/snacks/chips, -/obj/item/weapon/reagent_containers/food/snacks/chips, -/obj/item/weapon/reagent_containers/food/snacks/sosjerky, -/obj/item/weapon/reagent_containers/food/snacks/sosjerky, -/obj/item/weapon/reagent_containers/food/snacks/no_raisin, -/obj/item/weapon/reagent_containers/food/snacks/no_raisin, -/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie, -/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie, -/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers, -/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, -/obj/item/weapon/reagent_containers/food/snacks/tastybread, -/obj/item/weapon/reagent_containers/food/snacks/syndicake, -/obj/item/weapon/reagent_containers/food/snacks/unajerky, -/obj/item/weapon/storage/box/mixedglasses, -/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, -/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/lemonjuice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/applejuice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cream, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cola, -/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up, -/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind, -/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice, -/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice, -/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater, -/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater, -/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale, -/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/ice, -/obj/item/weapon/reagent_containers/food/drinks/ice, -/obj/item/weapon/reagent_containers/food/drinks/tea, -/obj/item/weapon/reagent_containers/food/drinks/tea, -/obj/item/weapon/reagent_containers/food/drinks/h_chocolate, -/obj/item/weapon/reagent_containers/food/drinks/h_chocolate, -/obj/item/weapon/reagent_containers/food/drinks/h_chocolate, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake, +/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake, +/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake, +/obj/item/reagent_containers/food/snacks/candy/proteinbar, +/obj/item/reagent_containers/food/snacks/candy/proteinbar, +/obj/item/reagent_containers/food/snacks/candy, +/obj/item/reagent_containers/food/snacks/candy, +/obj/item/reagent_containers/food/drinks/dry_ramen, +/obj/item/reagent_containers/food/drinks/dry_ramen, +/obj/item/reagent_containers/food/drinks/dry_ramen, +/obj/item/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/sosjerky, +/obj/item/reagent_containers/food/snacks/sosjerky, +/obj/item/reagent_containers/food/snacks/no_raisin, +/obj/item/reagent_containers/food/snacks/no_raisin, +/obj/item/reagent_containers/food/snacks/packaged/spacetwinkie, +/obj/item/reagent_containers/food/snacks/packaged/spacetwinkie, +/obj/item/reagent_containers/food/snacks/cheesiehonkers, +/obj/item/reagent_containers/food/snacks/cheesiehonkers, +/obj/item/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/tastybread, +/obj/item/reagent_containers/food/snacks/syndicake, +/obj/item/reagent_containers/food/snacks/unajerky, +/obj/item/storage/box/mixedglasses, +/obj/item/reagent_containers/food/drinks/flask/vacuumflask, +/obj/item/reagent_containers/food/drinks/flask/vacuumflask, +/obj/item/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/reagent_containers/food/drinks/bottle/tomatojuice, +/obj/item/reagent_containers/food/drinks/bottle/limejuice, +/obj/item/reagent_containers/food/drinks/bottle/lemonjuice, +/obj/item/reagent_containers/food/drinks/bottle/applejuice, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/cream, +/obj/item/reagent_containers/food/drinks/bottle/cola, +/obj/item/reagent_containers/food/drinks/bottle/space_up, +/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind, +/obj/item/reagent_containers/food/drinks/cans/grape_juice, +/obj/item/reagent_containers/food/drinks/cans/grape_juice, +/obj/item/reagent_containers/food/drinks/cans/sodawater, +/obj/item/reagent_containers/food/drinks/cans/sodawater, +/obj/item/reagent_containers/food/drinks/cans/gingerale, +/obj/item/reagent_containers/food/drinks/cans/gingerale, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/ice, +/obj/item/reagent_containers/food/drinks/ice, +/obj/item/reagent_containers/food/drinks/tea, +/obj/item/reagent_containers/food/drinks/tea, +/obj/item/reagent_containers/food/drinks/h_chocolate, +/obj/item/reagent_containers/food/drinks/h_chocolate, +/obj/item/reagent_containers/food/drinks/h_chocolate, /obj/item/toy/plushie/kitten, /turf/simulated/shuttle/floor/voidcraft, /area/survivalpod) "g" = ( -/obj/item/device/gps/computer, +/obj/item/gps/computer, /turf/simulated/shuttle/floor/voidcraft, /area/survivalpod) "h" = ( /obj/machinery/shower, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /obj/structure/curtain, /turf/simulated/shuttle/floor/voidcraft, /area/survivalpod) @@ -175,7 +175,7 @@ /area/survivalpod) "m" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /turf/simulated/shuttle/floor/voidcraft, /area/survivalpod) "n" = ( @@ -184,7 +184,7 @@ dir = 1 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hop, +/obj/item/bedsheet/hop, /turf/simulated/floor/carpet/sblucarpet, /area/survivalpod) "o" = ( diff --git a/maps/submaps/shelters/shelter_cab.dmm b/maps/submaps/shelters/shelter_cab.dmm index 829f7cb5889..831cb621ac5 100644 --- a/maps/submaps/shelters/shelter_cab.dmm +++ b/maps/submaps/shelters/shelter_cab.dmm @@ -10,11 +10,11 @@ /area/survivalpod) "f" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -4 }, /turf/simulated/floor/wood, @@ -24,13 +24,13 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/obj/item/weapon/reagent_containers/food/snacks/pastatomato, -/obj/item/weapon/reagent_containers/food/snacks/pastatomato, +/obj/item/reagent_containers/food/snacks/pastatomato, +/obj/item/reagent_containers/food/snacks/pastatomato, /turf/simulated/floor/wood, /area/survivalpod) "u" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /turf/simulated/floor/wood, /area/survivalpod) "v" = ( @@ -87,13 +87,13 @@ dir = 4 }, /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood, /area/survivalpod) "N" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = -3 }, diff --git a/maps/submaps/surface_submaps/mountains/BlastMine1.dmm b/maps/submaps/surface_submaps/mountains/BlastMine1.dmm index a2c17c17c22..722721f6796 100644 --- a/maps/submaps/surface_submaps/mountains/BlastMine1.dmm +++ b/maps/submaps/surface_submaps/mountains/BlastMine1.dmm @@ -1,13 +1,13 @@ "a" = (/turf/simulated/mineral,/area/submap/cave/BlastMine1) "b" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) "c" = (/obj/structure/sign/warning/bomb_range,/turf/simulated/wall/sandstone,/area/submap/cave/BlastMine1) -"d" = (/obj/structure/table/rack,/obj/item/weapon/syndie/c4explosive,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) +"d" = (/obj/structure/table/rack,/obj/item/syndie/c4explosive,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) "e" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) "f" = (/mob/living/simple_mob/animal/sif/savik,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) "g" = (/obj/structure/table/rack,/obj/item/clothing/head/bomb_hood,/obj/item/clothing/suit/bomb_suit,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) -"h" = (/obj/item/device/gps/internal/poi{gps_tag = "Unidentified Signal"},/turf/simulated/wall/sandstone,/area/submap/cave/BlastMine1) +"h" = (/obj/item/gps/internal/poi{gps_tag = "Unidentified Signal"},/turf/simulated/wall/sandstone,/area/submap/cave/BlastMine1) "i" = (/mob/living/simple_mob/animal/sif/diyaab,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) -"j" = (/obj/structure/table/reinforced,/obj/item/weapon/flame/lighter/zippo/c4detonator{detonator_mode = 1},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) +"j" = (/obj/structure/table/reinforced,/obj/item/flame/lighter/zippo/c4detonator{detonator_mode = 1},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) "k" = (/obj/structure/table/rack,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) "l" = (/obj/machinery/floodlight,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/BlastMine1) "m" = (/turf/simulated/wall/sandstone,/area/submap/cave/BlastMine1) diff --git a/maps/submaps/surface_submaps/mountains/CaveTrench.dmm b/maps/submaps/surface_submaps/mountains/CaveTrench.dmm index 3b9626828c2..ece8b96652e 100644 --- a/maps/submaps/surface_submaps/mountains/CaveTrench.dmm +++ b/maps/submaps/surface_submaps/mountains/CaveTrench.dmm @@ -13,16 +13,16 @@ "m" = (/obj/random/mob/sif,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/Cavelake) "n" = (/obj/item/clothing/mask/snorkel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/Cavelake) "o" = (/obj/effect/decal/remains/mouse,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/Cavelake) -"p" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey,/turf/simulated/floor/holofloor/wood,/area/submap/CaveTrench) -"q" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/holofloor/wood,/area/submap/CaveTrench) +"p" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/drinks/bottle/whiskey,/turf/simulated/floor/holofloor/wood,/area/submap/CaveTrench) +"q" = (/obj/item/stool/padded,/turf/simulated/floor/holofloor/wood,/area/submap/CaveTrench) "r" = (/obj/structure/table/steel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CaveTrench) -"s" = (/obj/structure/table/steel,/obj/item/weapon/paper{info = "Rellek's telling me that we're in deep shit if the townies found out I'm cooking up drones out here. Like I give a fuck, We're minning our asses off only to dig into some bug nest to get our legs chewed. Well I'm not looking a gift horse in the mouth. Those drone dudes out in the wild hooked us up with these machines so long as they get some of the metal we dig up. Win win for us, Guess we're retiring early after all."; name = "Note"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CaveTrench) +"s" = (/obj/structure/table/steel,/obj/item/paper{info = "Rellek's telling me that we're in deep shit if the townies found out I'm cooking up drones out here. Like I give a fuck, We're minning our asses off only to dig into some bug nest to get our legs chewed. Well I'm not looking a gift horse in the mouth. Those drone dudes out in the wild hooked us up with these machines so long as they get some of the metal we dig up. Win win for us, Guess we're retiring early after all."; name = "Note"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CaveTrench) "t" = (/obj/structure/table/steel,/obj/item/robot_parts/robot_component/actuator,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CaveTrench) "u" = (/obj/effect/decal/cleanable/blood,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CaveTrench) "v" = (/obj/structure/simple_door/wood,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CaveTrench) -"w" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp,/turf/simulated/floor/holofloor/wood,/area/submap/CaveTrench) -"x" = (/obj/structure/table/steel,/obj/item/device/robotanalyzer,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CaveTrench) -"y" = (/obj/structure/table/steel,/obj/item/weapon/storage/toolbox,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CaveTrench) +"w" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp,/turf/simulated/floor/holofloor/wood,/area/submap/CaveTrench) +"x" = (/obj/structure/table/steel,/obj/item/robotanalyzer,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CaveTrench) +"y" = (/obj/structure/table/steel,/obj/item/storage/toolbox,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CaveTrench) "z" = (/obj/structure/table/bench/steel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CaveTrench) "A" = (/obj/effect/decal/remains,/obj/item/clothing/under/rank/miner,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CaveTrench) "B" = (/turf/simulated/shuttle/plating,/area/submap/CaveTrench) diff --git a/maps/submaps/surface_submaps/mountains/Cliff1.dmm b/maps/submaps/surface_submaps/mountains/Cliff1.dmm index 1897f0ab174..7cc1c525b68 100644 --- a/maps/submaps/surface_submaps/mountains/Cliff1.dmm +++ b/maps/submaps/surface_submaps/mountains/Cliff1.dmm @@ -1,6 +1,6 @@ "a" = (/turf/template_noop,/area/template_noop) "b" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) -"c" = (/obj/item/weapon/ore,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff) +"c" = (/obj/item/ore,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff) "d" = (/obj/random/outcrop,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff) "e" = (/obj/structure/cliff/automatic/corner,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff) "f" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 5},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/ore_cliff) diff --git a/maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm b/maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm index 84d7169e44a..d4f2cad399e 100644 --- a/maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm +++ b/maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm @@ -5,28 +5,28 @@ "ae" = (/obj/structure/sign/greencross{desc = "White cross in a green field, you can get medical aid here."; name = "First-Aid"},/turf/simulated/shuttle/wall/no_join,/area/submap/CrashedMedShuttle) "af" = (/obj/structure/grille,/obj/structure/shuttle/window,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle) "ag" = (/turf/simulated/shuttle/wall,/area/submap/CrashedMedShuttle) -"ah" = (/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle) -"ai" = (/obj/item/weapon/material/shard{icon_state = "medium"},/obj/effect/decal/cleanable/blood/oil,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) +"ah" = (/obj/item/material/shard{icon_state = "medium"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle) +"ai" = (/obj/item/material/shard{icon_state = "medium"},/obj/effect/decal/cleanable/blood/oil,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) "aj" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/structure/sign/warning/airlock{pixel_x = 32},/obj/effect/spider/stickyweb,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle) "ak" = (/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"al" = (/obj/item/weapon/storage/toolbox/mechanical,/obj/machinery/light{dir = 1},/obj/structure/table/standard,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"al" = (/obj/item/storage/toolbox/mechanical,/obj/machinery/light{dir = 1},/obj/structure/table/standard,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "am" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "an" = (/obj/structure/window/reinforced,/obj/effect/decal/cleanable/blood/oil,/obj/structure/loot_pile/surface/bones,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) -"ao" = (/obj/item/weapon/circuitboard/broken,/obj/structure/door_assembly/door_assembly_ext,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle) +"ao" = (/obj/item/circuitboard/broken,/obj/structure/door_assembly/door_assembly_ext,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle) "ap" = (/obj/structure/door_assembly/door_assembly_ext,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle) "aq" = (/obj/effect/decal/cleanable/liquid_fuel,/mob/living/simple_mob/animal/giant_spider/webslinger,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "ar" = (/obj/structure/closet/crate/medical,/obj/random/medical,/obj/random/medical,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "as" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"at" = (/obj/item/weapon/material/shard,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) +"at" = (/obj/item/material/shard,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) "au" = (/obj/structure/closet/secure_closet/personal/patient,/obj/effect/spider/stickyweb,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "av" = (/obj/random/mob/spider/mutant,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "aw" = (/obj/machinery/door/airlock/glass,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "ax" = (/obj/effect/decal/cleanable/blood/drip,/obj/effect/decal/cleanable/liquid_fuel,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "ay" = (/obj/effect/decal/cleanable/blood,/obj/effect/decal/cleanable/liquid_fuel,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"az" = (/obj/effect/decal/cleanable/blood/gibs/robot,/obj/item/weapon/firstaid_arm_assembly,/mob/living/simple_mob/animal/giant_spider/frost,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"az" = (/obj/effect/decal/cleanable/blood/gibs/robot,/obj/item/firstaid_arm_assembly,/mob/living/simple_mob/animal/giant_spider/frost,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "aA" = (/obj/item/stack/rods,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle) "aB" = (/obj/structure/lattice,/obj/item/stack/rods,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) -"aC" = (/obj/effect/decal/cleanable/blood/oil,/obj/item/weapon/firstaid_arm_assembly,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"aC" = (/obj/effect/decal/cleanable/blood/oil,/obj/item/firstaid_arm_assembly,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "aD" = (/obj/structure/closet/secure_closet/personal/patient,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "aE" = (/obj/effect/decal/cleanable/blood/drip,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "aF" = (/obj/structure/reagent_dispensers/fueltank,/obj/effect/decal/cleanable/liquid_fuel,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) @@ -34,17 +34,17 @@ "aH" = (/obj/machinery/recharge_station,/obj/effect/decal/cleanable/liquid_fuel,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "aI" = (/obj/structure/table/standard,/obj/effect/spider/stickyweb,/obj/machinery/light,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "aJ" = (/obj/structure/table/standard,/obj/effect/spider/stickyweb,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"aK" = (/obj/structure/table/standard,/obj/item/weapon/material/shard{icon_state = "medium"},/obj/effect/spider/stickyweb,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"aL" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard{icon_state = "medium"},/obj/item/stack/rods,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle) -"aM" = (/obj/item/weapon/material/shard,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) +"aK" = (/obj/structure/table/standard,/obj/item/material/shard{icon_state = "medium"},/obj/effect/spider/stickyweb,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"aL" = (/obj/structure/grille/broken,/obj/item/material/shard{icon_state = "medium"},/obj/item/stack/rods,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle) +"aM" = (/obj/item/material/shard,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) "aN" = (/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) -"aO" = (/obj/item/weapon/material/shard{icon_state = "medium"},/obj/effect/spider/stickyweb,/mob/living/simple_mob/animal/giant_spider/carrier,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"aO" = (/obj/item/material/shard{icon_state = "medium"},/obj/effect/spider/stickyweb,/mob/living/simple_mob/animal/giant_spider/carrier,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "aP" = (/obj/effect/decal/cleanable/blood/gibs/robot,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "aQ" = (/obj/effect/spider/stickyweb,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "aR" = (/turf/simulated/shuttle/wall/no_join,/area/submap/CrashedMedShuttle) "aS" = (/obj/effect/decal/cleanable/blood/oil,/obj/structure/loot_pile/surface/bones,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) "aT" = (/obj/machinery/light,/obj/structure/table/standard,/obj/effect/spider/stickyweb,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"aU" = (/obj/structure/table/standard,/obj/item/weapon/material/shard{icon_state = "medium"},/obj/random/medical,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"aU" = (/obj/structure/table/standard,/obj/item/material/shard{icon_state = "medium"},/obj/random/medical,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "aV" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) "aW" = (/obj/effect/decal/cleanable/blood/drip,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) "aX" = (/obj/machinery/computer,/turf/simulated/shuttle/floor/yellow,/area/submap/CrashedMedShuttle) @@ -52,64 +52,64 @@ "aZ" = (/obj/effect/spider/stickyweb,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle) "ba" = (/obj/random/mob/spider/mutant,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle) "bb" = (/obj/effect/spider/cocoon,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle) -"bc" = (/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) +"bc" = (/obj/item/material/shard{icon_state = "medium"},/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) "bd" = (/obj/item/stack/rods,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) "be" = (/obj/effect/spider/stickyweb,/obj/structure/girder/displaced,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) -"bf" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/structure/extinguisher_cabinet{pixel_x = -32},/obj/structure/lattice,/obj/item/device/gps/internal/poi,/obj/structure/flora/tree/sif,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) +"bf" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/structure/extinguisher_cabinet{pixel_x = -32},/obj/structure/lattice,/obj/item/gps/internal/poi,/obj/structure/flora/tree/sif,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) "bg" = (/obj/effect/decal/cleanable/blood/splatter,/obj/structure/loot_pile/surface/bones,/obj/effect/decal/cleanable/blood/drip,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) -"bh" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) +"bh" = (/obj/structure/grille/broken,/obj/item/material/shard{icon_state = "medium"},/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) "bi" = (/obj/effect/decal/mecha_wreckage/odysseus,/obj/effect/decal/cleanable/blood/oil,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle) -"bj" = (/obj/item/weapon/material/shard,/obj/effect/spider/stickyweb,/obj/item/weapon/beartrap{anchored = 1; deployed = 1; icon_state = "beartrap1"},/obj/random/trash,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) +"bj" = (/obj/item/material/shard,/obj/effect/spider/stickyweb,/obj/item/beartrap{anchored = 1; deployed = 1; icon_state = "beartrap1"},/obj/random/trash,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) "bk" = (/obj/effect/decal/cleanable/blood/oil,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) -"bl" = (/obj/effect/spider/stickyweb,/obj/item/weapon/material/shard,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"bl" = (/obj/effect/spider/stickyweb,/obj/item/material/shard,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "bm" = (/obj/random/medical,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "bn" = (/mob/living/simple_mob/animal/giant_spider/webslinger,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) "bo" = (/obj/effect/spider/cocoon,/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) "bp" = (/obj/structure/prop/fake_ai/dead/crashed_med_shuttle,/turf/simulated/shuttle/floor/yellow,/area/submap/CrashedMedShuttle) "bq" = (/obj/structure/flora/tree/sif,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) -"br" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) +"br" = (/obj/structure/grille/broken,/obj/item/material/shard,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) "bs" = (/obj/effect/decal/cleanable/blood/drip,/obj/effect/spider/stickyweb,/mob/living/simple_mob/animal/giant_spider/webslinger,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle) "bt" = (/obj/effect/decal/cleanable/blood/drip,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle) -"bu" = (/obj/effect/decal/remains/tajaran,/obj/item/weapon/surgical/circular_saw,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) +"bu" = (/obj/effect/decal/remains/tajaran,/obj/item/surgical/circular_saw,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) "bv" = (/obj/effect/decal/cleanable/blood/oil,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) -"bw" = (/obj/item/weapon/material/shard,/obj/structure/loot_pile/maint/technical,/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle) +"bw" = (/obj/item/material/shard,/obj/structure/loot_pile/maint/technical,/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle) "bx" = (/obj/structure/bed/chair/office/light{dir = 8},/turf/simulated/shuttle/floor/purple,/area/submap/CrashedMedShuttle) -"by" = (/obj/item/weapon/circuitboard/broken,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"by" = (/obj/item/circuitboard/broken,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "bz" = (/obj/structure/girder,/turf/template_noop,/area/submap/CrashedMedShuttle) "bA" = (/obj/structure/girder/displaced,/turf/template_noop,/area/submap/CrashedMedShuttle) "bB" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 8},/turf/simulated/floor/outdoors/rocks,/area/submap/CrashedMedShuttle) "bC" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CrashedMedShuttle) -"bD" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/adv,/turf/simulated/shuttle/floor/purple,/area/submap/CrashedMedShuttle) +"bD" = (/obj/structure/table/standard,/obj/item/storage/firstaid/adv,/turf/simulated/shuttle/floor/purple,/area/submap/CrashedMedShuttle) "bE" = (/obj/structure/table/standard,/turf/simulated/shuttle/floor/purple,/area/submap/CrashedMedShuttle) "bF" = (/obj/random/medical/pillbottle,/mob/living/simple_mob/animal/giant_spider/webslinger,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"bG" = (/obj/structure/table/standard,/obj/item/device/defib_kit/loaded,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"bG" = (/obj/structure/table/standard,/obj/item/defib_kit/loaded,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "bH" = (/obj/structure/table/standard,/obj/item/bodybag/cryobag,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"bI" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/bodybags,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"bI" = (/obj/structure/table/standard,/obj/item/storage/box/bodybags,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "bJ" = (/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"bK" = (/obj/structure/table/standard,/obj/item/weapon/surgical/retractor,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"bL" = (/obj/item/weapon/material/shard,/obj/structure/grille,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle) +"bK" = (/obj/structure/table/standard,/obj/item/surgical/retractor,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"bL" = (/obj/item/material/shard,/obj/structure/grille,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle) "bM" = (/obj/machinery/light{dir = 8},/obj/structure/table/standard,/obj/structure/loot_pile/maint/technical,/turf/simulated/shuttle/floor/purple,/area/submap/CrashedMedShuttle) "bN" = (/obj/effect/decal/cleanable/blood/gibs/robot,/obj/effect/spider/cocoon,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"bO" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/closet/secure_closet/medical_wall/anesthetics{pixel_x = 32},/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"bO" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/closet/secure_closet/medical_wall/anesthetics{pixel_x = 32},/obj/item/material/shard{icon_state = "medium"},/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "bP" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "bQ" = (/obj/effect/spider/cocoon,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"bR" = (/obj/effect/decal/cleanable/blood/splatter,/obj/structure/loot_pile/surface/bones,/obj/item/weapon/surgical/surgicaldrill,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"bS" = (/obj/item/weapon/material/shard{icon_state = "medium"},/obj/structure/grille,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle) -"bT" = (/obj/structure/table/standard,/obj/item/device/reagent_scanner/adv,/turf/simulated/shuttle/floor/purple,/area/submap/CrashedMedShuttle) -"bU" = (/obj/machinery/iv_drip,/obj/item/weapon/reagent_containers/blood/empty,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"bR" = (/obj/effect/decal/cleanable/blood/splatter,/obj/structure/loot_pile/surface/bones,/obj/item/surgical/surgicaldrill,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"bS" = (/obj/item/material/shard{icon_state = "medium"},/obj/structure/grille,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle) +"bT" = (/obj/structure/table/standard,/obj/item/reagent_scanner/adv,/turf/simulated/shuttle/floor/purple,/area/submap/CrashedMedShuttle) +"bU" = (/obj/machinery/iv_drip,/obj/item/reagent_containers/blood/empty,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "bV" = (/mob/living/simple_mob/animal/giant_spider/carrier,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"bW" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/masks,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"bW" = (/obj/structure/table/standard,/obj/item/storage/box/masks,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "bX" = (/obj/structure/table/standard,/obj/random/firstaid,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"bY" = (/obj/structure/table/standard,/obj/item/weapon/storage/backpack/medic,/obj/random/medical/lite,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"bY" = (/obj/structure/table/standard,/obj/item/storage/backpack/medic,/obj/random/medical/lite,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "bZ" = (/obj/structure/table/standard,/obj/effect/spider/stickyweb,/obj/random/medical,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "ca" = (/obj/structure/girder,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle) "cb" = (/obj/structure/frame,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"cc" = (/obj/structure/table/standard,/obj/structure/sign/periodic{pixel_y = -32},/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/scalpel,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"cc" = (/obj/structure/table/standard,/obj/structure/sign/periodic{pixel_y = -32},/obj/item/surgical/bonesetter,/obj/item/surgical/scalpel,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "cd" = (/obj/machinery/optable,/obj/effect/decal/cleanable/blood/splatter,/obj/structure/loot_pile/surface/bones,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"ce" = (/obj/structure/table/standard,/obj/item/weapon/surgical/bonegel,/obj/item/weapon/surgical/FixOVein,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"ce" = (/obj/structure/table/standard,/obj/item/surgical/bonegel,/obj/item/surgical/FixOVein,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "cf" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "admin_shuttle"; pixel_x = -25; pixel_y = 0; req_one_access = list(101); tag_door = "admin_shuttle_hatch"},/obj/random/mob/spider/mutant,/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle) -"cg" = (/obj/structure/table/standard,/obj/item/weapon/storage/belt/medical/emt,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) -"ch" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/syringes,/obj/effect/spider/stickyweb,/obj/machinery/light,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"cg" = (/obj/structure/table/standard,/obj/item/storage/belt/medical/emt,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) +"ch" = (/obj/structure/table/standard,/obj/item/storage/box/syringes,/obj/effect/spider/stickyweb,/obj/machinery/light,/turf/simulated/shuttle/floor/white,/area/submap/CrashedMedShuttle) "ci" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "admin_shuttle_hatch"; locked = 1; name = "Shuttle Hatch"; req_access = null},/turf/simulated/shuttle/plating,/area/submap/CrashedMedShuttle) (1,1,1) = {" diff --git a/maps/submaps/surface_submaps/mountains/CrashedMedShuttle1_vr.dmm b/maps/submaps/surface_submaps/mountains/CrashedMedShuttle1_vr.dmm index 4be43165c35..bbca56a8b7c 100644 --- a/maps/submaps/surface_submaps/mountains/CrashedMedShuttle1_vr.dmm +++ b/maps/submaps/surface_submaps/mountains/CrashedMedShuttle1_vr.dmm @@ -29,13 +29,13 @@ /turf/simulated/shuttle/wall, /area/submap/CrashedMedShuttle) "ah" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/CrashedMedShuttle) "ai" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/effect/decal/cleanable/blood/oil, @@ -57,7 +57,7 @@ /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "al" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/machinery/light{ dir = 1 }, @@ -76,7 +76,7 @@ /turf/simulated/floor/outdoors/rocks, /area/submap/CrashedMedShuttle) "ao" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /obj/structure/door_assembly/door_assembly_ext, /turf/simulated/shuttle/plating, /area/submap/CrashedMedShuttle) @@ -101,7 +101,7 @@ /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "at" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/structure/lattice, /turf/simulated/floor/outdoors/rocks, /area/submap/CrashedMedShuttle) @@ -130,7 +130,7 @@ /area/submap/CrashedMedShuttle) "az" = ( /obj/effect/decal/cleanable/blood/gibs/robot, -/obj/item/weapon/firstaid_arm_assembly, +/obj/item/firstaid_arm_assembly, /mob/living/simple_mob/animal/giant_spider/frost, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) @@ -145,7 +145,7 @@ /area/submap/CrashedMedShuttle) "aC" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/item/weapon/firstaid_arm_assembly, +/obj/item/firstaid_arm_assembly, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "aD" = ( @@ -184,7 +184,7 @@ /area/submap/CrashedMedShuttle) "aK" = ( /obj/structure/table/standard, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/effect/spider/stickyweb, @@ -192,14 +192,14 @@ /area/submap/CrashedMedShuttle) "aL" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/item/stack/rods, /turf/simulated/shuttle/plating, /area/submap/CrashedMedShuttle) "aM" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/outdoors/rocks, /area/submap/CrashedMedShuttle) "aN" = ( @@ -207,7 +207,7 @@ /turf/simulated/floor/outdoors/rocks, /area/submap/CrashedMedShuttle) "aO" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/effect/spider/stickyweb, @@ -239,7 +239,7 @@ /area/submap/CrashedMedShuttle) "aU" = ( /obj/structure/table/standard, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/random/medical, @@ -274,7 +274,7 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/CrashedMedShuttle) "bc" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/floor/outdoors/rocks, @@ -299,7 +299,7 @@ pixel_x = -32 }, /obj/structure/lattice, -/obj/item/device/gps/internal/poi, +/obj/item/gps/internal/poi, /obj/structure/flora/tree/sif, /turf/simulated/floor/outdoors/rocks, /area/submap/CrashedMedShuttle) @@ -312,7 +312,7 @@ /area/submap/CrashedMedShuttle) "bh" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/floor/outdoors/rocks, @@ -323,9 +323,9 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/CrashedMedShuttle) "bj" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/effect/spider/stickyweb, -/obj/item/weapon/beartrap{ +/obj/item/beartrap{ anchored = 1; deployed = 1; icon_state = "beartrap1" @@ -340,7 +340,7 @@ /area/submap/CrashedMedShuttle) "bl" = ( /obj/effect/spider/stickyweb, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "bm" = ( @@ -366,7 +366,7 @@ /area/submap/CrashedMedShuttle) "br" = ( /obj/structure/grille/broken, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/outdoors/rocks, /area/submap/CrashedMedShuttle) "bs" = ( @@ -381,7 +381,7 @@ /area/submap/CrashedMedShuttle) "bu" = ( /obj/effect/decal/remains/tajaran, -/obj/item/weapon/surgical/circular_saw, +/obj/item/surgical/circular_saw, /turf/simulated/floor/outdoors/rocks, /area/submap/CrashedMedShuttle) "bv" = ( @@ -390,7 +390,7 @@ /turf/simulated/floor/outdoors/rocks, /area/submap/CrashedMedShuttle) "bw" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/structure/loot_pile/maint/technical, /obj/structure/lattice, /turf/simulated/mineral/floor/ignore_mapgen, @@ -402,7 +402,7 @@ /turf/simulated/shuttle/floor/purple, /area/submap/CrashedMedShuttle) "by" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "bz" = ( @@ -432,7 +432,7 @@ /area/submap/CrashedMedShuttle) "bD" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /turf/simulated/shuttle/floor/purple, /area/submap/CrashedMedShuttle) "bE" = ( @@ -446,7 +446,7 @@ /area/submap/CrashedMedShuttle) "bG" = ( /obj/structure/table/standard, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "bH" = ( @@ -456,7 +456,7 @@ /area/submap/CrashedMedShuttle) "bI" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "bJ" = ( @@ -467,11 +467,11 @@ /area/submap/CrashedMedShuttle) "bK" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/retractor, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "bL" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/structure/grille, /turf/simulated/shuttle/plating, /area/submap/CrashedMedShuttle) @@ -496,7 +496,7 @@ /obj/structure/closet/secure_closet/medical_wall/anesthetics{ pixel_x = 32 }, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/shuttle/floor/white, @@ -516,11 +516,11 @@ "bR" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/structure/loot_pile/surface/bones, -/obj/item/weapon/surgical/surgicaldrill, +/obj/item/surgical/surgicaldrill, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "bS" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/structure/grille, @@ -528,12 +528,12 @@ /area/submap/CrashedMedShuttle) "bT" = ( /obj/structure/table/standard, -/obj/item/device/reagent_scanner/adv, +/obj/item/reagent_scanner/adv, /turf/simulated/shuttle/floor/purple, /area/submap/CrashedMedShuttle) "bU" = ( /obj/machinery/iv_drip, -/obj/item/weapon/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "bV" = ( @@ -542,7 +542,7 @@ /area/submap/CrashedMedShuttle) "bW" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "bX" = ( @@ -552,7 +552,7 @@ /area/submap/CrashedMedShuttle) "bY" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/backpack/medic, +/obj/item/storage/backpack/medic, /obj/random/medical/lite, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) @@ -575,8 +575,8 @@ /obj/structure/sign/periodic{ pixel_y = -32 }, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/bonesetter, +/obj/item/surgical/scalpel, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "cd" = ( @@ -587,8 +587,8 @@ /area/submap/CrashedMedShuttle) "ce" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/bonegel, -/obj/item/weapon/surgical/FixOVein, +/obj/item/surgical/bonegel, +/obj/item/surgical/FixOVein, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "cf" = ( @@ -605,12 +605,12 @@ /area/submap/CrashedMedShuttle) "cg" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, /turf/simulated/shuttle/floor/white, /area/submap/CrashedMedShuttle) "ch" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/effect/spider/stickyweb, /obj/machinery/light, /turf/simulated/shuttle/floor/white, diff --git a/maps/submaps/surface_submaps/mountains/Mineshaft1.dmm b/maps/submaps/surface_submaps/mountains/Mineshaft1.dmm index be87066448f..242e631979a 100644 --- a/maps/submaps/surface_submaps/mountains/Mineshaft1.dmm +++ b/maps/submaps/surface_submaps/mountains/Mineshaft1.dmm @@ -6,20 +6,20 @@ "f" = (/turf/simulated/wall,/area/submap/cave/AMine1) "g" = (/obj/machinery/space_heater,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) "h" = (/turf/simulated/floor/tiled,/area/submap/cave/AMine1) -"i" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) +"i" = (/obj/structure/bed,/obj/item/bedsheet,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) "j" = (/obj/structure/table/standard,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) -"k" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/machinery/light{ icon_state = "tube1"; dir = 1},/turf/simulated/floor/tiled,/area/submap/cave/AMine1) +"k" = (/obj/structure/bed,/obj/item/bedsheet,/obj/machinery/light{ icon_state = "tube1"; dir = 1},/turf/simulated/floor/tiled,/area/submap/cave/AMine1) "l" = (/obj/structure/table/standard,/obj/structure/bedsheetbin,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) "m" = (/obj/machinery/door/airlock,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) -"n" = (/obj/item/weapon/ore/gold,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1) -"o" = (/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1) -"p" = (/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/gold,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1) -"q" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) -"r" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/machinery/light,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) +"n" = (/obj/item/ore/gold,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1) +"o" = (/obj/item/ore/gold,/obj/item/ore/gold,/obj/item/ore/gold,/obj/item/ore/gold,/obj/item/ore/gold,/obj/item/ore/gold,/obj/item/ore/gold,/obj/item/ore/gold,/obj/item/ore/gold,/obj/item/ore/gold,/obj/item/ore/gold,/obj/item/ore/gold,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1) +"p" = (/obj/item/ore/gold,/obj/item/ore/gold,/obj/item/ore/gold,/obj/item/ore/gold,/obj/item/ore/gold,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1) +"q" = (/obj/structure/table/standard,/obj/item/flashlight/lamp,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) +"r" = (/obj/structure/bed,/obj/item/bedsheet,/obj/machinery/light,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) "s" = (/obj/structure/window/reinforced/full,/turf/simulated/wall,/area/submap/cave/AMine1) "t" = (/obj/machinery/light{ icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled,/area/submap/cave/AMine1) "u" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/turf/simulated/floor,/area/submap/cave/AMine1) -"v" = (/obj/structure/table/standard,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/turf/simulated/floor,/area/submap/cave/AMine1) +"v" = (/obj/structure/table/standard,/obj/item/cell/high,/obj/item/cell/high,/turf/simulated/floor,/area/submap/cave/AMine1) "w" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor,/area/submap/cave/AMine1) "x" = (/turf/simulated/floor,/area/submap/cave/AMine1) "y" = (/obj/machinery/power/apc{operating = 0; pixel_x = 31},/turf/simulated/floor,/area/submap/cave/AMine1) @@ -30,13 +30,13 @@ "D" = (/obj/machinery/light,/obj/machinery/space_heater,/turf/simulated/floor,/area/submap/cave/AMine1) "E" = (/obj/machinery/space_heater,/turf/simulated/floor,/area/submap/cave/AMine1) "F" = (/obj/structure/closet/secure_closet/engineering_welding,/turf/simulated/floor,/area/submap/cave/AMine1) -"G" = (/obj/structure/table/rack,/obj/item/weapon/pickaxe/drill,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) +"G" = (/obj/structure/table/rack,/obj/item/pickaxe/drill,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) "H" = (/obj/machinery/vending/cola,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) "I" = (/obj/machinery/vending/snack,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) "J" = (/obj/machinery/washing_machine,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) "K" = (/obj/structure/ore_box,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/AMine1) "L" = (/obj/machinery/light{ icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled,/area/submap/cave/AMine1) -"M" = (/obj/item/weapon/stool,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) +"M" = (/obj/item/stool,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) "N" = (/obj/machinery/light/small{brightness_color = "#DA0205"; brightness_power = 1; brightness_range = 5; dir = 8},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1) "O" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/AMine1) "P" = (/obj/structure/table/standard,/obj/item/pizzabox,/turf/simulated/floor/tiled,/area/submap/cave/AMine1) diff --git a/maps/submaps/surface_submaps/mountains/Rockb1.dmm b/maps/submaps/surface_submaps/mountains/Rockb1.dmm index 0aca284a139..6401236c092 100644 --- a/maps/submaps/surface_submaps/mountains/Rockb1.dmm +++ b/maps/submaps/surface_submaps/mountains/Rockb1.dmm @@ -16,12 +16,12 @@ /area/submap/Rockb1) "f" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/lino, /area/submap/Rockb1) "g" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/gun/projectile/pistol, +/obj/item/gun/projectile/pistol, /obj/item/ammo_magazine/m9mm/compact, /turf/simulated/floor/lino, /area/submap/Rockb1) @@ -51,7 +51,7 @@ /area/submap/Rockb1) "n" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/plating, /area/submap/Rockb1) "o" = ( @@ -80,7 +80,7 @@ /area/submap/Rockb1) "u" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/floor/tiled, @@ -195,7 +195,7 @@ /area/submap/Rockb1) "K" = ( /obj/structure/table/standard, -/obj/item/weapon/pickaxe/drill, +/obj/item/pickaxe/drill, /turf/simulated/floor/tiled, /area/submap/Rockb1) "L" = ( @@ -206,12 +206,12 @@ /area/submap/Rockb1) "M" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled, /area/submap/Rockb1) "N" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled, /area/submap/Rockb1) "O" = ( diff --git a/maps/submaps/surface_submaps/mountains/Scave1.dmm b/maps/submaps/surface_submaps/mountains/Scave1.dmm index e4c7de5fd08..d486fb3e5eb 100644 --- a/maps/submaps/surface_submaps/mountains/Scave1.dmm +++ b/maps/submaps/surface_submaps/mountains/Scave1.dmm @@ -3,15 +3,15 @@ "c" = (/obj/effect/spider/stickyweb,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) "d" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) "e" = (/obj/effect/spider/spiderling/frost,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) -"f" = (/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c100,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) +"f" = (/obj/item/spacecash/c100,/obj/item/spacecash/c100,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) "g" = (/obj/random/mob/spider/mutant,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) -"h" = (/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c100,/obj/effect/decal/remains,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) +"h" = (/obj/item/spacecash/c100,/obj/item/spacecash/c100,/obj/item/spacecash/c100,/obj/effect/decal/remains,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) "i" = (/obj/random/mob/spider,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) -"j" = (/obj/item/weapon/grenade/spawnergrenade/spider,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) +"j" = (/obj/item/grenade/spawnergrenade/spider,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) "k" = (/obj/random/toolbox,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) "l" = (/obj/effect/decal/mecha_wreckage/ripley,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) "m" = (/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) -"n" = (/obj/item/device/flashlight,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) +"n" = (/obj/item/flashlight,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) "o" = (/mob/living/simple_mob/animal/giant_spider/frost,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) "p" = (/obj/effect/spider/stickyweb,/obj/effect/spider/stickyweb,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) "q" = (/obj/effect/decal/remains,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) diff --git a/maps/submaps/surface_submaps/mountains/SupplyDrop1.dmm b/maps/submaps/surface_submaps/mountains/SupplyDrop1.dmm index 7d2dac4f133..f741fe7abe8 100644 --- a/maps/submaps/surface_submaps/mountains/SupplyDrop1.dmm +++ b/maps/submaps/surface_submaps/mountains/SupplyDrop1.dmm @@ -5,7 +5,7 @@ "e" = (/obj/structure/droppod_door{dir = 1},/turf/simulated/wall/titanium,/area/submap/cave/SupplyDrop1) "f" = (/turf/simulated/floor/reinforced,/area/submap/cave/SupplyDrop1) "g" = (/obj/structure/droppod_door{dir = 8},/turf/simulated/wall/titanium,/area/submap/cave/SupplyDrop1) -"h" = (/obj/structure/closet/crate,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/weapon/storage/box/flare,/obj/item/stack/marker_beacon/ten,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/trash/tastybread,/obj/item/trash/tastybread,/obj/item/trash/sosjerky,/obj/item/trash/sosjerky,/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/obj/item/weapon/flame/lighter/random,/obj/item/device/gps,/turf/simulated/floor/reinforced,/area/submap/cave/SupplyDrop1) +"h" = (/obj/structure/closet/crate,/obj/item/gun/energy/stunrevolver,/obj/item/gun/energy/stunrevolver,/obj/item/storage/box/flare,/obj/item/stack/marker_beacon/ten,/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/obj/item/trash/tastybread,/obj/item/trash/tastybread,/obj/item/trash/sosjerky,/obj/item/trash/sosjerky,/obj/item/trash/liquidfood,/obj/item/trash/liquidfood,/obj/item/flame/lighter/random,/obj/item/gps,/turf/simulated/floor/reinforced,/area/submap/cave/SupplyDrop1) "i" = (/obj/structure/droppod_door{dir = 4},/turf/simulated/wall/titanium,/area/submap/cave/SupplyDrop1) "j" = (/obj/structure/droppod_door,/turf/simulated/wall/titanium,/area/submap/cave/SupplyDrop1) diff --git a/maps/submaps/surface_submaps/mountains/SwordCave.dmm b/maps/submaps/surface_submaps/mountains/SwordCave.dmm index 142c35a3afc..70c36f82ce1 100644 --- a/maps/submaps/surface_submaps/mountains/SwordCave.dmm +++ b/maps/submaps/surface_submaps/mountains/SwordCave.dmm @@ -27,7 +27,7 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/swordcave) "i" = ( -/obj/item/device/gps/explorer/on, +/obj/item/gps/explorer/on, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/swordcave) "j" = ( diff --git a/maps/submaps/surface_submaps/mountains/crashed_ufo.dmm b/maps/submaps/surface_submaps/mountains/crashed_ufo.dmm index d9013d201b2..902851e9bb1 100644 --- a/maps/submaps/surface_submaps/mountains/crashed_ufo.dmm +++ b/maps/submaps/surface_submaps/mountains/crashed_ufo.dmm @@ -9,66 +9,66 @@ "ai" = (/obj/machinery/porta_turret/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "aj" = (/obj/structure/loot_pile/surface/alien/engineering,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "ak" = (/obj/structure/prop/alien/computer,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) -"al" = (/obj/item/weapon/tool/wrench/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) +"al" = (/obj/item/tool/wrench/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "am" = (/obj/structure/bed/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "an" = (/obj/structure/table/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) "ao" = (/obj/structure/table/alien,/obj/item/clothing/head/helmet/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "ap" = (/obj/structure/prop/alien/power,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "aq" = (/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) -"ar" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) +"ar" = (/obj/structure/table/alien,/obj/item/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "as" = (/turf/simulated/shuttle/wall/alien/hard_corner,/area/submap/cave/crashed_ufo) "at" = (/obj/structure/prop/alien/computer,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) "au" = (/obj/structure/table/alien,/obj/item/prop/alien/junk,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) -"av" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) +"av" = (/obj/structure/table/alien,/obj/item/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) "aw" = (/obj/structure/loot_pile/surface/alien/security,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "ax" = (/obj/structure/prop/alien/computer{dir = 8},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) "ay" = (/obj/structure/prop/alien/computer{ icon_state = "console-c"; dir = 4},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "az" = (/obj/machinery/door/airlock/alien/locked{welded = 1},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "aA" = (/obj/structure/bed/alien,/obj/effect/decal/remains/xeno,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) -"aB" = (/obj/item/weapon/tool/screwdriver/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) -"aC" = (/obj/item/weapon/tool/wirecutters/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) +"aB" = (/obj/item/tool/screwdriver/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) +"aC" = (/obj/item/tool/wirecutters/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "aD" = (/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) -"aE" = (/obj/item/device/multitool/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) +"aE" = (/obj/item/multitool/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "aF" = (/obj/structure/prop/alien/computer/camera/flipped{ icon_state = "camera_flipped"; dir = 4},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) "aG" = (/obj/structure/prop/alien/computer/camera{ icon_state = "camera"; dir = 8},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) "aH" = (/obj/machinery/porta_turret/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) "aI" = (/obj/machinery/door/airlock/alien/locked{p_open = 1},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "aJ" = (/obj/effect/decal/remains/robot,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) -"aK" = (/obj/item/weapon/tool/crowbar/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) +"aK" = (/obj/item/tool/crowbar/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "aL" = (/obj/item/stack/cable_coil/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "aM" = (/obj/structure/table/alien,/obj/item/prop/alien/junk,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) -"aN" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/obj/item/device/gps/internal/poi,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) +"aN" = (/obj/structure/table/alien,/obj/item/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/obj/item/gps/internal/poi,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "aO" = (/obj/structure/prop/alien/computer{ icon_state = "console-c"; dir = 4},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) "aP" = (/obj/structure/table/alien,/obj/item/clothing/accessory/medal/dungeon/alien_ufo,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) -"aQ" = (/obj/structure/table/alien,/obj/item/weapon/weldingtool/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) +"aQ" = (/obj/structure/table/alien,/obj/item/weldingtool/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "aR" = (/obj/structure/bed/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) "aS" = (/obj/structure/prop/alien/computer/camera,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) -"aT" = (/obj/structure/closet/alien,/obj/item/weapon/paper/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) +"aT" = (/obj/structure/closet/alien,/obj/item/paper/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) "aU" = (/obj/structure/bed/alien,/obj/effect/decal/remains/xeno,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) "aV" = (/obj/structure/loot_pile/surface/alien/end,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) -"aW" = (/obj/structure/table/alien,/obj/item/weapon/surgical/circular_saw/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) -"aX" = (/obj/structure/table/alien,/obj/item/weapon/surgical/FixOVein/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) -"aY" = (/obj/structure/table/alien,/obj/item/weapon/surgical/scalpel/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) -"aZ" = (/obj/item/weapon/surgical/hemostat/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) +"aW" = (/obj/structure/table/alien,/obj/item/surgical/circular_saw/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) +"aX" = (/obj/structure/table/alien,/obj/item/surgical/FixOVein/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) +"aY" = (/obj/structure/table/alien,/obj/item/surgical/scalpel/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) +"aZ" = (/obj/item/surgical/hemostat/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) "ba" = (/obj/machinery/door/airlock/alien/locked,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) "bb" = (/obj/effect/decal/remains/lizard,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) "bc" = (/obj/structure/prop/alien/dispenser,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) -"bd" = (/obj/structure/table/alien,/obj/item/weapon/surgical/bone_clamp/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) +"bd" = (/obj/structure/table/alien,/obj/item/surgical/bone_clamp/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) "be" = (/obj/structure/loot_pile/surface/alien/medical,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "bf" = (/obj/structure/closet/alien,/obj/item/prop/alien/junk,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) "bg" = (/obj/structure/prop/alien/dispenser,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "bh" = (/obj/effect/decal/remains/mouse,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo) "bi" = (/obj/structure/closet/alien,/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "bj" = (/obj/machinery/porta_turret/alien/destroyed{ icon_state = "destroyed_target_prism"; dir = 6},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) -"bk" = (/obj/item/weapon/cell/device/weapon/empty,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) +"bk" = (/obj/item/cell/device/weapon/empty,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "bl" = (/obj/machinery/porta_turret/alien/destroyed{ icon_state = "destroyed_target_prism"; dir = 10},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) -"bm" = (/obj/item/weapon/gun/energy/retro/empty,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) -"bn" = (/obj/item/device/gps{gps_tag = "COMDOM1"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) -"bo" = (/obj/item/weapon/reagent_containers/hypospray/autoinjector/used,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) -"bp" = (/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) +"bm" = (/obj/item/gun/energy/retro/empty,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) +"bn" = (/obj/item/gps{gps_tag = "COMDOM1"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) +"bo" = (/obj/item/reagent_containers/hypospray/autoinjector/used,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) +"bp" = (/obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "bq" = (/obj/effect/decal/remains/human{desc = "They look like human remains. Based on the equipment you saw nearby when you walked in, they were some kind of command person, and a poor one at that."},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "br" = (/obj/item/clothing/gloves/yellow,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) -"bs" = (/obj/item/weapon/storage/belt/utility/full,/obj/item/device/multitool,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) +"bs" = (/obj/item/storage/belt/utility/full,/obj/item/multitool,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "bt" = (/obj/machinery/door/airlock/alien/public,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "bu" = (/obj/item/clothing/suit/storage/hooded/wintercoat/captain,/obj/item/clothing/shoes/boots/winter/command,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) "bv" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) diff --git a/maps/submaps/surface_submaps/mountains/crashed_ufo_frigate.dmm b/maps/submaps/surface_submaps/mountains/crashed_ufo_frigate.dmm index ea129ae20d9..9d982b0792f 100644 --- a/maps/submaps/surface_submaps/mountains/crashed_ufo_frigate.dmm +++ b/maps/submaps/surface_submaps/mountains/crashed_ufo_frigate.dmm @@ -55,14 +55,14 @@ "bc" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/fresh_medicine,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "bd" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/viral,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "be" = (/obj/machinery/door/blast/puzzle,/obj/machinery/door/airlock/alien/locked,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate) -"bf" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) +"bf" = (/obj/structure/table/alien,/obj/item/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "bg" = (/obj/structure/prop/lock/projectile,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate) "bh" = (/obj/structure/closet/alien,/obj/random/unidentified_medicine/old_medicine,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate) "bi" = (/obj/structure/prop/alien/dispenser,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "bj" = (/obj/effect/decal/remains/xeno,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "bk" = (/mob/living/simple_mob/animal/space/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "bl" = (/obj/effect/decal/remains/xeno,/obj/item/clothing/under/psysuit,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate) -"bm" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien,/obj/item/weapon/paper/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) +"bm" = (/obj/structure/table/alien,/obj/item/paper/alien,/obj/item/paper/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "bn" = (/obj/structure/foamedmetal,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate) "bo" = (/obj/machinery/porta_turret/alien{faction = "xeno"},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate) "bp" = (/obj/structure/foamedmetal,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) @@ -71,9 +71,9 @@ "bs" = (/obj/effect/alien/weeds/node,/mob/living/simple_mob/animal/space/alien/sentinel/praetorian,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate) "bt" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "bu" = (/obj/structure/loot_pile/surface/drone,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) -"bv" = (/obj/item/weapon/surgical/bone_clamp/alien,/obj/structure/closet/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) +"bv" = (/obj/item/surgical/bone_clamp/alien,/obj/structure/closet/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "bw" = (/obj/structure/prop/alien/computer,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate) -"bx" = (/obj/effect/decal/remains/xeno,/obj/item/clothing/accessory/medal/dungeon/alien_ufo{desc = "It vaguely like a star. It looks like something an alien admiral might've worn. Probably."; name = "alien admiral's medal"},/obj/item/weapon/telecube/precursor/mated/zone,/obj/item/clothing/head/helmet/alien/tank,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate) +"bx" = (/obj/effect/decal/remains/xeno,/obj/item/clothing/accessory/medal/dungeon/alien_ufo{desc = "It vaguely like a star. It looks like something an alien admiral might've worn. Probably."; name = "alien admiral's medal"},/obj/item/telecube/precursor/mated/zone,/obj/item/clothing/head/helmet/alien/tank,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate) "by" = (/obj/structure/loot_pile/mecha/gygax/dark,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "bz" = (/obj/structure/mopbucket,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "bA" = (/obj/item/brokenbug,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) @@ -87,22 +87,22 @@ "bI" = (/obj/structure/table/alien,/obj/structure/loot_pile/surface/alien/medical,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "bJ" = (/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 8},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "bK" = (/obj/structure/table/alien,/obj/item/prop/alien/junk,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) -"bL" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/obj/item/device/gps/internal/poi,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) +"bL" = (/obj/structure/table/alien,/obj/item/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/obj/item/gps/internal/poi,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "bM" = (/obj/structure/window/phoronreinforced{dir = 4},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) -"bN" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced{dir = 4},/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) +"bN" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced{dir = 4},/obj/item/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "bO" = (/obj/structure/table/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate) -"bP" = (/obj/structure/table/alien,/obj/item/weapon/weldingtool/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) -"bQ" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced{dir = 4},/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate) +"bP" = (/obj/structure/table/alien,/obj/item/weldingtool/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) +"bQ" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced{dir = 4},/obj/item/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate) "bR" = (/obj/structure/table/alien,/obj/structure/foamedmetal,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "bS" = (/obj/structure/closet/alien,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "bT" = (/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 8},/obj/structure/window/phoronreinforced,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo_frigate) "bU" = (/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{dir = 4},/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate) -"bV" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced,/obj/item/weapon/paper/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate) +"bV" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced,/obj/item/paper/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate) "bW" = (/obj/structure/table/alien,/obj/structure/window/phoronreinforced{dir = 4},/obj/structure/window/phoronreinforced,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate) "bX" = (/mob/living/simple_mob/animal/space/alien,/turf/simulated/shuttle/floor/alien,/area/submap/cave/crashed_ufo_frigate) "bY" = (/obj/structure/foamedmetal,/obj/machinery/door/airlock/alien/locked,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate) "bZ" = (/obj/structure/foamedmetal,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate) -"ca" = (/obj/structure/table/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate) +"ca" = (/obj/structure/table/alien,/obj/item/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate) "cb" = (/obj/structure/prop/alien/power,/obj/structure/foamedmetal,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate) "cc" = (/obj/structure/loot_pile/surface/alien/end,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate) "cd" = (/obj/item/prop/alien/junk,/turf/simulated/floor/outdoors/ice,/area/submap/cave/crashed_ufo_frigate) diff --git a/maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm b/maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm index 32563c6eac3..810ecdc2690 100644 --- a/maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm +++ b/maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm @@ -5,23 +5,23 @@ "ae" = (/turf/simulated/shuttle/floor/yellow,/area/submap/crashedcontainmentshuttle) "af" = (/turf/simulated/shuttle/floor/red,/area/submap/crashedcontainmentshuttle) "ag" = (/turf/simulated/shuttle/floor/white,/area/submap/crashedcontainmentshuttle) -"ah" = (/obj/structure/grille,/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/floor/plating,/area/submap/crashedcontainmentshuttle) -"ai" = (/obj/structure/grille,/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) +"ah" = (/obj/structure/grille,/obj/item/material/shard{icon_state = "medium"},/turf/simulated/floor/plating,/area/submap/crashedcontainmentshuttle) +"ai" = (/obj/structure/grille,/obj/item/material/shard{icon_state = "medium"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) "aj" = (/obj/random/landmine,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) "ak" = (/obj/structure/door_assembly/door_assembly_ext{anchored = 1},/turf/simulated/floor/plating,/area/submap/crashedcontainmentshuttle) -"al" = (/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) -"am" = (/obj/item/weapon/material/shard,/turf/template_noop,/area/submap/crashedcontainmentshuttle) +"al" = (/obj/item/material/shard{icon_state = "medium"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) +"am" = (/obj/item/material/shard,/turf/template_noop,/area/submap/crashedcontainmentshuttle) "an" = (/obj/structure/girder,/turf/simulated/floor/plating,/area/submap/crashedcontainmentshuttle) "ao" = (/turf/simulated/floor/plating,/area/submap/crashedcontainmentshuttle) "ap" = (/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) -"aq" = (/obj/item/weapon/material/shard,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) -"ar" = (/obj/structure/grille,/obj/item/weapon/material/shard,/turf/simulated/floor/plating,/area/submap/crashedcontainmentshuttle) -"as" = (/obj/item/weapon/material/shard,/turf/simulated/floor/plating,/area/submap/crashedcontainmentshuttle) +"aq" = (/obj/item/material/shard,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) +"ar" = (/obj/structure/grille,/obj/item/material/shard,/turf/simulated/floor/plating,/area/submap/crashedcontainmentshuttle) +"as" = (/obj/item/material/shard,/turf/simulated/floor/plating,/area/submap/crashedcontainmentshuttle) "at" = (/obj/item/stack/rods,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) "au" = (/obj/item/stack/rods,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle) "av" = (/obj/structure/closet/walllocker/emerglocker/east,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle) "aw" = (/obj/structure/frame,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle) -"ax" = (/obj/item/frame/mirror,/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/shuttle/wall/dark,/area/submap/crashedcontainmentshuttle) +"ax" = (/obj/item/frame/mirror,/obj/item/material/shard{icon_state = "medium"},/turf/simulated/shuttle/wall/dark,/area/submap/crashedcontainmentshuttle) "ay" = (/obj/effect/decal/mecha_wreckage/gygax{anchored = 1},/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle) "az" = (/obj/effect/gibspawner/generic,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle) "aA" = (/obj/structure/closet/medical_wall,/turf/simulated/shuttle/wall/dark,/area/submap/crashedcontainmentshuttle) @@ -34,11 +34,11 @@ "aH" = (/obj/structure/frame/computer,/turf/simulated/shuttle/floor/yellow,/area/submap/crashedcontainmentshuttle) "aI" = (/obj/structure/grille{density = 0; icon_state = "brokengrille"},/obj/item/stack/rods,/turf/simulated/floor/plating,/area/submap/crashedcontainmentshuttle) "aJ" = (/obj/item/stack/rods,/turf/simulated/floor/plating,/area/submap/crashedcontainmentshuttle) -"aK" = (/obj/structure/grille{density = 0; icon_state = "brokengrille"},/obj/item/weapon/material/shard{icon_state = "medium"},/obj/item/stack/rods,/turf/simulated/floor/plating,/area/submap/crashedcontainmentshuttle) -"aL" = (/obj/item/weapon/circuitboard/broken,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle) -"aM" = (/obj/structure/frame,/obj/item/weapon/circuitboard/broken,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle) +"aK" = (/obj/structure/grille{density = 0; icon_state = "brokengrille"},/obj/item/material/shard{icon_state = "medium"},/obj/item/stack/rods,/turf/simulated/floor/plating,/area/submap/crashedcontainmentshuttle) +"aL" = (/obj/item/circuitboard/broken,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle) +"aM" = (/obj/structure/frame,/obj/item/circuitboard/broken,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle) "aN" = (/obj/structure/table/steel_reinforced,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle) -"aO" = (/obj/structure/closet/walllocker/emerglocker/north,/obj/structure/frame,/obj/item/weapon/circuitboard/broken,/turf/simulated/shuttle/floor/white,/area/submap/crashedcontainmentshuttle) +"aO" = (/obj/structure/closet/walllocker/emerglocker/north,/obj/structure/frame,/obj/item/circuitboard/broken,/turf/simulated/shuttle/floor/white,/area/submap/crashedcontainmentshuttle) "aP" = (/turf/simulated/floor/outdoors/rocks,/area/submap/crashedcontainmentshuttle) "aQ" = (/obj/structure/grille{density = 0; icon_state = "brokengrille"},/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) "aR" = (/obj/structure/shuttle/engine/heater{dir = 8},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/template_noop,/area/submap/crashedcontainmentshuttle) @@ -47,32 +47,32 @@ "aU" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/shuttle/floor/white,/area/submap/crashedcontainmentshuttle) "aV" = (/obj/structure/shuttle/engine/propulsion{dir = 8},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) "aW" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle) -"aX" = (/obj/item/weapon/circuitboard/broken,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) +"aX" = (/obj/item/circuitboard/broken,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) "aY" = (/obj/item/clothing/suit/space/cult,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) "aZ" = (/obj/effect/decal/remains/robot,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) "ba" = (/obj/effect/decal/remains/human,/obj/effect/gibspawner/human,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) "bb" = (/obj/effect/decal/cleanable/blood/drip,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle) "bc" = (/obj/structure/door_assembly,/turf/simulated/shuttle/floor/white,/area/submap/crashedcontainmentshuttle) "bd" = (/obj/item/clothing/head/helmet/space/cult,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) -"be" = (/obj/item/weapon/material/knife/ritual,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) +"be" = (/obj/item/material/knife/ritual,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) "bf" = (/obj/structure/bed/chair/office/dark{dir = 8},/obj/effect/decal/remains/human,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) "bg" = (/obj/effect/gibspawner/generic,/turf/template_noop,/area/submap/crashedcontainmentshuttle) "bh" = (/obj/effect/decal/remains/human,/turf/simulated/shuttle/floor/yellow,/area/submap/crashedcontainmentshuttle) -"bi" = (/obj/item/weapon/circuitboard/broken,/obj/effect/decal/remains/human,/obj/item/weapon/gun/energy/laser,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle) -"bj" = (/obj/item/device/gps/internal/poi,/turf/simulated/shuttle/floor/red,/area/submap/crashedcontainmentshuttle) +"bi" = (/obj/item/circuitboard/broken,/obj/effect/decal/remains/human,/obj/item/gun/energy/laser,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle) +"bj" = (/obj/item/gps/internal/poi,/turf/simulated/shuttle/floor/red,/area/submap/crashedcontainmentshuttle) "bk" = (/obj/effect/decal/cleanable/vomit,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle) "bl" = (/obj/effect/decal/remains/robot,/turf/simulated/shuttle/floor/red,/area/submap/crashedcontainmentshuttle) "bm" = (/obj/effect/decal/cleanable/liquid_fuel,/turf/template_noop,/area/submap/crashedcontainmentshuttle) "bn" = (/obj/effect/decal/cleanable/vomit,/turf/simulated/shuttle/floor/white,/area/submap/crashedcontainmentshuttle) "bo" = (/obj/effect/decal/cleanable/blood/drip,/turf/template_noop,/area/submap/crashedcontainmentshuttle) "bp" = (/obj/structure/bed/chair/office/dark{dir = 4},/turf/simulated/shuttle/floor/yellow,/area/submap/crashedcontainmentshuttle) -"bq" = (/obj/item/weapon/circuitboard/broken,/obj/structure/bed/chair/office/dark{dir = 4},/turf/simulated/shuttle/floor/yellow,/area/submap/crashedcontainmentshuttle) +"bq" = (/obj/item/circuitboard/broken,/obj/structure/bed/chair/office/dark{dir = 4},/turf/simulated/shuttle/floor/yellow,/area/submap/crashedcontainmentshuttle) "br" = (/obj/effect/decal/cleanable/blood/drip,/obj/effect/decal/cleanable/blood/drip,/obj/effect/decal/cleanable/blood/drip,/turf/simulated/shuttle/floor/yellow,/area/submap/crashedcontainmentshuttle) "bs" = (/obj/structure/table/steel_reinforced,/turf/simulated/shuttle/floor/yellow,/area/submap/crashedcontainmentshuttle) "bt" = (/obj/structure/shuttle/engine/heater{dir = 8},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) "bu" = (/obj/structure/door_assembly/door_assembly_ext{anchored = 1},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) "bv" = (/obj/effect/decal/cleanable/blood/oil,/turf/simulated/shuttle/floor/red,/area/submap/crashedcontainmentshuttle) -"bw" = (/obj/item/weapon/material/knife/ritual,/obj/effect/decal/cleanable/blood,/turf/simulated/shuttle/floor/red,/area/submap/crashedcontainmentshuttle) +"bw" = (/obj/item/material/knife/ritual,/obj/effect/decal/cleanable/blood,/turf/simulated/shuttle/floor/red,/area/submap/crashedcontainmentshuttle) "bx" = (/turf/simulated/shuttle/wall/dark/no_join,/area/submap/crashedcontainmentshuttle) "by" = (/obj/random/landmine,/obj/random/landmine,/turf/simulated/shuttle/floor/black,/area/submap/crashedcontainmentshuttle) "bz" = (/obj/effect/decal/remains/human,/obj/item/clothing/head/helmet/space/cult,/obj/effect/decal/cleanable/blood,/turf/simulated/shuttle/floor/red,/area/submap/crashedcontainmentshuttle) @@ -89,8 +89,8 @@ "bK" = (/obj/random/landmine,/turf/simulated/shuttle/floor/yellow,/area/submap/crashedcontainmentshuttle) "bL" = (/obj/effect/decal/cleanable/blood,/obj/random/landmine,/turf/simulated/shuttle/floor/red,/area/submap/crashedcontainmentshuttle) "bM" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) -"bN" = (/obj/structure/toilet{dir = 8},/obj/effect/gibspawner/generic,/obj/effect/decal/remains/human,/obj/item/weapon/card/id/syndicate{age = "\\42"; blood_type = "\\O+"; desc = "A strange ID card."; dna_hash = "\[REDACTED]"; fingerprint_hash = "\\------"; name = "Aaron Presley's ID Card(Delivery Service) "; registered_name = "Aaron Presley"; sex = "\\Male"},/turf/simulated/shuttle/floor/white,/area/submap/crashedcontainmentshuttle) -"bO" = (/obj/effect/decal/cleanable/liquid_fuel,/obj/effect/decal/remains/human,/obj/item/weapon/flame/lighter/random,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) +"bN" = (/obj/structure/toilet{dir = 8},/obj/effect/gibspawner/generic,/obj/effect/decal/remains/human,/obj/item/card/id/syndicate{age = "\\42"; blood_type = "\\O+"; desc = "A strange ID card."; dna_hash = "\[REDACTED]"; fingerprint_hash = "\\------"; name = "Aaron Presley's ID Card(Delivery Service) "; registered_name = "Aaron Presley"; sex = "\\Male"},/turf/simulated/shuttle/floor/white,/area/submap/crashedcontainmentshuttle) +"bO" = (/obj/effect/decal/cleanable/liquid_fuel,/obj/effect/decal/remains/human,/obj/item/flame/lighter/random,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/crashedcontainmentshuttle) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle_vr.dmm b/maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle_vr.dmm index ebe51c7f93a..23331ae2188 100644 --- a/maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle_vr.dmm +++ b/maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle_vr.dmm @@ -4,7 +4,7 @@ /area/submap/crashedcontainmentshuttle) "ab" = ( /obj/structure/grille, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/mineral/floor/ignore_mapgen, @@ -18,7 +18,7 @@ /turf/simulated/floor/plating, /area/submap/crashedcontainmentshuttle) "ae" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/mineral/floor/ignore_mapgen, @@ -37,7 +37,7 @@ /turf/simulated/floor/outdoors/rocks, /area/submap/crashedcontainmentshuttle) "aj" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/crashedcontainmentshuttle) "ak" = ( @@ -66,7 +66,7 @@ /area/submap/crashedcontainmentshuttle) "aq" = ( /obj/structure/grille, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/plating, /area/submap/crashedcontainmentshuttle) "ar" = ( @@ -88,7 +88,7 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/crashedcontainmentshuttle) "au" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/crashedcontainmentshuttle) "av" = ( @@ -164,7 +164,7 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/crashedcontainmentshuttle) "aK" = ( -/obj/item/weapon/material/knife/ritual, +/obj/item/material/knife/ritual, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/crashedcontainmentshuttle) "aL" = ( @@ -194,19 +194,19 @@ /area/submap/crashedcontainmentshuttle) "aR" = ( /obj/structure/grille, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/floor/plating, /area/submap/crashedcontainmentshuttle) "aS" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /obj/effect/decal/remains/human, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/simulated/shuttle/floor/black, /area/submap/crashedcontainmentshuttle) "aT" = ( -/obj/item/device/gps/internal/poi, +/obj/item/gps/internal/poi, /turf/simulated/shuttle/floor/red, /area/submap/crashedcontainmentshuttle) "aU" = ( @@ -228,7 +228,7 @@ /area/submap/crashedcontainmentshuttle) "aY" = ( /obj/structure/frame, -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /turf/simulated/shuttle/floor/black, /area/submap/crashedcontainmentshuttle) "aZ" = ( @@ -240,16 +240,16 @@ /turf/simulated/shuttle/floor/red, /area/submap/crashedcontainmentshuttle) "bb" = ( -/obj/item/weapon/material/knife/ritual, +/obj/item/material/knife/ritual, /obj/effect/decal/cleanable/blood, /turf/simulated/shuttle/floor/red, /area/submap/crashedcontainmentshuttle) "bc" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /turf/simulated/shuttle/floor/black, /area/submap/crashedcontainmentshuttle) "bd" = ( -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /obj/structure/bed/chair/office/dark{ dir = 4 }, @@ -274,7 +274,7 @@ /turf/simulated/shuttle/floor/red, /area/submap/crashedcontainmentshuttle) "bi" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/plating, /area/submap/crashedcontainmentshuttle) "bj" = ( @@ -324,7 +324,7 @@ /turf/simulated/shuttle/floor/yellow, /area/submap/crashedcontainmentshuttle) "bs" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/template_noop, /area/submap/crashedcontainmentshuttle) "bt" = ( @@ -343,7 +343,7 @@ "bw" = ( /obj/structure/closet/walllocker/emerglocker/north, /obj/structure/frame, -/obj/item/weapon/circuitboard/broken, +/obj/item/circuitboard/broken, /turf/simulated/shuttle/floor/white, /area/submap/crashedcontainmentshuttle) "bx" = ( @@ -356,7 +356,7 @@ /area/submap/crashedcontainmentshuttle) "bz" = ( /obj/item/frame/mirror, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/shuttle/wall/dark, @@ -385,7 +385,7 @@ }, /obj/effect/gibspawner/generic, /obj/effect/decal/remains/human, -/obj/item/weapon/card/id/syndicate{ +/obj/item/card/id/syndicate{ age = "\\42"; blood_type = "\\O+"; desc = "A strange ID card."; @@ -418,7 +418,7 @@ density = 0; icon_state = "brokengrille" }, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/item/stack/rods, @@ -454,7 +454,7 @@ "bN" = ( /obj/effect/decal/cleanable/liquid_fuel, /obj/effect/decal/remains/human, -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/crashedcontainmentshuttle) "bO" = ( diff --git a/maps/submaps/surface_submaps/mountains/crystal1.dmm b/maps/submaps/surface_submaps/mountains/crystal1.dmm index c505feac223..80901809687 100644 --- a/maps/submaps/surface_submaps/mountains/crystal1.dmm +++ b/maps/submaps/surface_submaps/mountains/crystal1.dmm @@ -1,7 +1,7 @@ "a" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/cave/crystal1) "b" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/crystal1) "c" = (/obj/machinery/crystal,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/crystal1) -"d" = (/obj/item/weapon/ore/diamond,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/crystal1) +"d" = (/obj/item/ore/diamond,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/crystal1) (1,1,1) = {" aaabbaaa diff --git a/maps/submaps/surface_submaps/mountains/crystal2.dmm b/maps/submaps/surface_submaps/mountains/crystal2.dmm index 6fd1e570584..4c801345c56 100644 --- a/maps/submaps/surface_submaps/mountains/crystal2.dmm +++ b/maps/submaps/surface_submaps/mountains/crystal2.dmm @@ -1,7 +1,7 @@ "a" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/cave/crystal2) "b" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/crystal2) "c" = (/obj/machinery/crystal,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/crystal2) -"d" = (/obj/item/weapon/ore/diamond,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/crystal2) +"d" = (/obj/item/ore/diamond,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/crystal2) (1,1,1) = {" aaaaaaabbbaaaaa diff --git a/maps/submaps/surface_submaps/mountains/crystal3.dmm b/maps/submaps/surface_submaps/mountains/crystal3.dmm index 87e0883e3a7..b725b5408ad 100644 --- a/maps/submaps/surface_submaps/mountains/crystal3.dmm +++ b/maps/submaps/surface_submaps/mountains/crystal3.dmm @@ -2,7 +2,7 @@ "b" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/crystal3) "c" = (/turf/template_noop,/area/template_noop) "d" = (/obj/machinery/crystal,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/crystal3) -"e" = (/obj/item/weapon/ore/diamond,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/crystal3) +"e" = (/obj/item/ore/diamond,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/crystal3) (1,1,1) = {" aaaaaaabbbaaaaacccc diff --git a/maps/submaps/surface_submaps/mountains/deadBeacon.dmm b/maps/submaps/surface_submaps/mountains/deadBeacon.dmm index 253b4c53c9f..9336f07d8f2 100644 --- a/maps/submaps/surface_submaps/mountains/deadBeacon.dmm +++ b/maps/submaps/surface_submaps/mountains/deadBeacon.dmm @@ -9,26 +9,26 @@ "i" = (/obj/structure/grille/broken,/turf/simulated/floor/plating,/area/submap/cave/deadBeacon) "j" = (/obj/structure/table/steel,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) "k" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) -"l" = (/obj/item/weapon/material/shard,/turf/simulated/floor/plating,/area/submap/cave/deadBeacon) -"m" = (/obj/structure/table/steel,/obj/item/weapon/circuitboard/comm_server,/obj/machinery/light{dir = 8; status = LIGHT_EMPTY},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) +"l" = (/obj/item/material/shard,/turf/simulated/floor/plating,/area/submap/cave/deadBeacon) +"m" = (/obj/structure/table/steel,/obj/item/circuitboard/comm_server,/obj/machinery/light{dir = 8; status = LIGHT_EMPTY},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) "n" = (/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) -"o" = (/obj/item/weapon/paper/crumpled{info = "Sampatti Relay Sif-833
Decryption Key for 12-04-2488:
849B0022FBA920C244
Eyes Only.
The insider who knows all the secrets can bring down Lanka."; name = "Dusty Note"},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) +"o" = (/obj/item/paper/crumpled{info = "Sampatti Relay Sif-833
Decryption Key for 12-04-2488:
849B0022FBA920C244
Eyes Only.
The insider who knows all the secrets can bring down Lanka."; name = "Dusty Note"},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) "p" = (/obj/structure/door_assembly/door_assembly_ext,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) "q" = (/obj/item/stack/rods,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) "r" = (/obj/machinery/telecomms/relay{active_power_usage = 1; broadcasting = 0; panel_open = 1},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) "s" = (/obj/machinery/telecomms/broadcaster{light_power = 0; on = 0},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) "t" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/submap/cave/deadBeacon) "u" = (/obj/machinery/telecomms/receiver{light_power = 0; on = 0},/obj/structure/cable,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) -"v" = (/obj/item/weapon/circuitboard/broken,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) +"v" = (/obj/item/circuitboard/broken,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) "w" = (/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) "x" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/submap/cave/deadBeacon) "y" = (/obj/effect/decal/remains/robot,/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) "z" = (/obj/item/stack/cable_coil{amount = 1},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) -"A" = (/obj/item/weapon/circuitboard/broken,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/deadBeacon) +"A" = (/obj/item/circuitboard/broken,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/deadBeacon) "B" = (/obj/structure/grille/broken,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/submap/cave/deadBeacon) "C" = (/obj/structure/loot_pile/maint/junk,/turf/simulated/floor/plating,/area/submap/cave/deadBeacon) -"D" = (/obj/item/trash/cigbutt,/obj/item/weapon/tool/wrench,/obj/machinery/light,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) -"E" = (/obj/item/weapon/material/shard,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) +"D" = (/obj/item/trash/cigbutt,/obj/item/tool/wrench,/obj/machinery/light,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) +"E" = (/obj/item/material/shard,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) "F" = (/obj/machinery/recharge_station,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) "G" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/submap/cave/deadBeacon) "H" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/cave/deadBeacon) diff --git a/maps/submaps/surface_submaps/mountains/deadly_rabbit_vr.dmm b/maps/submaps/surface_submaps/mountains/deadly_rabbit_vr.dmm index edf10da6365..409e2320a5f 100644 --- a/maps/submaps/surface_submaps/mountains/deadly_rabbit_vr.dmm +++ b/maps/submaps/surface_submaps/mountains/deadly_rabbit_vr.dmm @@ -3,28 +3,28 @@ "e" = (/mob/living/simple_mob/vore/rabbit/killer,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) "g" = (/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) "h" = (/turf/simulated/mineral/ignore_mapgen/cave,/area/template_noop) -"m" = (/obj/item/weapon/bone/skull,/obj/effect/decal/cleanable/blood,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) +"m" = (/obj/item/bone/skull,/obj/effect/decal/cleanable/blood,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) "n" = (/obj/item/clothing/suit/storage/hooded/knight/galahad,/obj/effect/decal/cleanable/blood,/obj/item/clothing/shoes/knight,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) -"q" = (/obj/effect/decal/cleanable/blood,/obj/item/weapon/bone,/obj/item/weapon/bone/skull,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) -"r" = (/obj/item/weapon/bone,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) -"s" = (/obj/item/weapon/bone/ribs,/obj/effect/decal/cleanable/blood,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) +"q" = (/obj/effect/decal/cleanable/blood,/obj/item/bone,/obj/item/bone/skull,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) +"r" = (/obj/item/bone,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) +"s" = (/obj/item/bone/ribs,/obj/effect/decal/cleanable/blood,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) "t" = (/obj/effect/gibspawner/human,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) -"u" = (/obj/effect/decal/cleanable/blood,/obj/item/weapon/bone/skull,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) -"v" = (/obj/item/weapon/grenade/explosive/frag,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) -"y" = (/obj/item/weapon/bone,/obj/item/weapon/bone/ribs,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) -"A" = (/obj/effect/decal/cleanable/blood,/obj/item/weapon/bone,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) +"u" = (/obj/effect/decal/cleanable/blood,/obj/item/bone/skull,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) +"v" = (/obj/item/grenade/explosive/frag,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) +"y" = (/obj/item/bone,/obj/item/bone/ribs,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) +"A" = (/obj/effect/decal/cleanable/blood,/obj/item/bone,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) "C" = (/obj/item/clothing/suit/storage/hooded/knight/lancelot,/obj/effect/decal/cleanable/blood,/obj/item/clothing/shoes/knight,/obj/item/clothing/shoes/knight/black,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) "E" = (/obj/item/clothing/suit/armor/combat/crusader/bedevere,/obj/item/clothing/head/helmet/combat/bedevere,/obj/effect/decal/cleanable/blood,/obj/item/clothing/shoes/knight/black,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) -"F" = (/obj/item/weapon/bone,/obj/item/weapon/bone/skull,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) +"F" = (/obj/item/bone,/obj/item/bone/skull,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) "I" = (/obj/item/clothing/suit/storage/hooded/knight/robin,/obj/effect/decal/cleanable/blood/splatter,/obj/item/clothing/shoes/knight,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) -"J" = (/obj/effect/decal/cleanable/blood,/obj/item/weapon/bone/ribs,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) +"J" = (/obj/effect/decal/cleanable/blood,/obj/item/bone/ribs,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) "K" = (/obj/item/clothing/suit/armor/combat/crusader,/obj/item/clothing/head/helmet/combat/crusader,/obj/effect/decal/cleanable/blood,/obj/item/clothing/shoes/knight,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) "L" = (/obj/structure/barricade/cutout/fukken_xeno,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) -"P" = (/obj/item/weapon/bone/skull,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) -"Q" = (/obj/item/weapon/bone,/obj/structure/loot_pile/surface/bones,/obj/effect/decal/cleanable/blood,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) +"P" = (/obj/item/bone/skull,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) +"Q" = (/obj/item/bone,/obj/structure/loot_pile/surface/bones,/obj/effect/decal/cleanable/blood,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) "T" = (/obj/structure/barricade,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) -"U" = (/obj/item/weapon/bone/ribs,/obj/item/clothing/suit/storage/hooded/knight,/obj/item/weapon/bone/skull,/obj/effect/decal/cleanable/blood,/obj/item/clothing/shoes/knight/black,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) -"V" = (/obj/item/weapon/bone,/obj/effect/decal/cleanable/blood,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) +"U" = (/obj/item/bone/ribs,/obj/item/clothing/suit/storage/hooded/knight,/obj/item/bone/skull,/obj/effect/decal/cleanable/blood,/obj/item/clothing/shoes/knight/black,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) +"V" = (/obj/item/bone,/obj/effect/decal/cleanable/blood,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) "Y" = (/obj/effect/decal/cleanable/blood,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) (1,1,1) = {" diff --git a/maps/submaps/surface_submaps/mountains/deadspy.dmm b/maps/submaps/surface_submaps/mountains/deadspy.dmm index 15b57e5fcee..df4dfcc5f0f 100644 --- a/maps/submaps/surface_submaps/mountains/deadspy.dmm +++ b/maps/submaps/surface_submaps/mountains/deadspy.dmm @@ -1,22 +1,22 @@ "a" = (/obj/effect/decal/remains/xeno,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/fire/firefighter,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) "b" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) "c" = (/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel,/obj/effect/decal/cleanable/molten_item,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) -"d" = (/obj/item/weapon/flamethrower,/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) +"d" = (/obj/item/flamethrower,/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) "e" = (/obj/effect/decal/cleanable/liquid_fuel,/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) "f" = (/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) "g" = (/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel,/obj/effect/decal/cleanable/ash,/obj/random/landmine,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) "h" = (/obj/effect/decal/cleanable/liquid_fuel,/obj/random/landmine,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) "i" = (/obj/effect/decal/cleanable/liquid_fuel,/obj/effect/decal/cleanable/molten_item,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) -"j" = (/obj/item/weapon/material/butterfly,/obj/effect/decal/cleanable/liquid_fuel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) -"k" = (/obj/effect/decal/remains/human,/obj/item/weapon/tool/wrench,/obj/item/clothing/head/hardhat,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) -"l" = (/obj/item/weapon/flame/lighter/zippo,/obj/effect/decal/cleanable/liquid_fuel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) +"j" = (/obj/item/material/butterfly,/obj/effect/decal/cleanable/liquid_fuel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) +"k" = (/obj/effect/decal/remains/human,/obj/item/tool/wrench,/obj/item/clothing/head/hardhat,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) +"l" = (/obj/item/flame/lighter/zippo,/obj/effect/decal/cleanable/liquid_fuel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) "m" = (/obj/effect/decal/remains/human,/obj/item/clothing/mask/balaclava,/obj/item/clothing/under/suit_jacket/really_black,/obj/effect/decal/cleanable/ash,/obj/effect/decal/cleanable/liquid_fuel,/obj/effect/decal/cleanable/ash,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) "n" = (/obj/effect/decal/cleanable/liquid_fuel,/obj/effect/decal/cleanable/liquid_fuel,/obj/effect/decal/cleanable/ash,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) "o" = (/obj/machinery/porta_turret/poi{desc = "Looking at this heavy caliber, tripod-mounted, little ol' number makes you want to square-dance."; lethal = 0; name = "sentry turret"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) -"p" = (/obj/item/weapon/deadringer,/obj/effect/decal/cleanable/liquid_fuel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) +"p" = (/obj/item/deadringer,/obj/effect/decal/cleanable/liquid_fuel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) "q" = (/obj/effect/decal/cleanable/liquid_fuel,/obj/effect/decal/cleanable/liquid_fuel,/obj/random/landmine,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) -"r" = (/obj/effect/decal/cleanable/liquid_fuel,/obj/item/weapon/storage/fancy/cigarettes/professionals,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) -"s" = (/obj/item/weapon/card/emag_broken,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) +"r" = (/obj/effect/decal/cleanable/liquid_fuel,/obj/item/storage/fancy/cigarettes/professionals,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) +"s" = (/obj/item/card/emag_broken,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) "t" = (/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel,/obj/random/landmine,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) "u" = (/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel,/obj/effect/decal/cleanable/ash,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/deadspy) "v" = (/turf/simulated/mineral,/area/submap/deadspy) diff --git a/maps/submaps/surface_submaps/mountains/digsite.dmm b/maps/submaps/surface_submaps/mountains/digsite.dmm index 541bca12db3..56ccac5995c 100644 --- a/maps/submaps/surface_submaps/mountains/digsite.dmm +++ b/maps/submaps/surface_submaps/mountains/digsite.dmm @@ -5,7 +5,7 @@ "e" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) "f" = (/turf/simulated/floor/tiled/kafel_full/yellow,/area/submap/cave/digsite) "g" = (/turf/simulated/floor/plating/external,/area/submap/cave/digsite) -"h" = (/obj/item/weapon/ore,/turf/simulated/floor/plating/external,/area/submap/cave/digsite) +"h" = (/obj/item/ore,/turf/simulated/floor/plating/external,/area/submap/cave/digsite) "i" = (/obj/structure/bed/alien,/turf/simulated/floor/tiled/kafel_full/yellow,/area/submap/cave/digsite) "j" = (/obj/structure/cult/talisman,/turf/simulated/floor/tiled/kafel_full/yellow,/area/submap/cave/digsite) "k" = (/obj/machinery/artifact,/obj/structure/anomaly_container,/turf/simulated/floor/tiled/kafel_full/yellow,/area/submap/cave/digsite) @@ -13,26 +13,26 @@ "m" = (/obj/structure/loot_pile/surface/alien,/turf/simulated/floor/tiled/kafel_full/yellow,/area/submap/cave/digsite) "n" = (/mob/living/simple_mob/animal/passive/tindalos,/turf/simulated/floor/tiled/kafel_full/yellow,/area/submap/cave/digsite) "o" = (/obj/structure/closet/crate/secure/loot,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) -"p" = (/obj/item/weapon/ore,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) +"p" = (/obj/item/ore,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) "q" = (/obj/effect/floor_decal/asteroid,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) "r" = (/obj/structure/anomaly_container,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) "s" = (/turf/simulated/wall,/area/submap/cave/digsite) -"t" = (/obj/item/frame/apc,/obj/item/weapon/module/power_control,/turf/simulated/floor/plating/external,/area/submap/cave/digsite) +"t" = (/obj/item/frame/apc,/obj/item/module/power_control,/turf/simulated/floor/plating/external,/area/submap/cave/digsite) "u" = (/obj/structure/table/steel,/obj/machinery/cell_charger,/obj/random/powercell,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) -"v" = (/obj/structure/table/steel,/obj/item/weapon/storage/excavation,/obj/item/device/measuring_tape,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) +"v" = (/obj/structure/table/steel,/obj/item/storage/excavation,/obj/item/measuring_tape,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) "w" = (/obj/machinery/power/port_gen/pacman/super,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating/external,/area/submap/cave/digsite) "x" = (/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating/external,/area/submap/cave/digsite) "y" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) -"z" = (/obj/structure/table/steel,/obj/item/weapon/folder,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) -"A" = (/obj/structure/table/rack,/obj/item/weapon/pickaxe,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) +"z" = (/obj/structure/table/steel,/obj/item/folder,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) +"A" = (/obj/structure/table/rack,/obj/item/pickaxe,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) "B" = (/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) "C" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/plating/external,/area/submap/cave/digsite) "D" = (/obj/structure/table/steel,/obj/random/tech_supply,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) -"E" = (/obj/structure/table/rack,/obj/item/weapon/shovel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) +"E" = (/obj/structure/table/rack,/obj/item/shovel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) "F" = (/obj/structure/boulder,/obj/effect/decal/mecha_wreckage/ripley,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) "G" = (/obj/structure/boulder,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) "H" = (/obj/structure/loot_pile/maint/junk,/turf/simulated/floor/plating/external,/area/submap/cave/digsite) -"I" = (/obj/structure/table/steel,/obj/item/weapon/tool/wrench,/obj/item/weapon/storage/box/samplebags,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) +"I" = (/obj/structure/table/steel,/obj/item/tool/wrench,/obj/item/storage/box/samplebags,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) "J" = (/obj/structure/table/steel,/obj/item/stack/flag/yellow,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) "K" = (/obj/random/toolbox,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) "L" = (/obj/structure/closet/crate,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/digsite) diff --git a/maps/submaps/surface_submaps/mountains/excavation1.dmm b/maps/submaps/surface_submaps/mountains/excavation1.dmm index 169efe4eb5c..8998d98bf16 100644 --- a/maps/submaps/surface_submaps/mountains/excavation1.dmm +++ b/maps/submaps/surface_submaps/mountains/excavation1.dmm @@ -10,21 +10,21 @@ "j" = (/obj/structure/cliff/automatic/corner,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/Excavation) "k" = (/obj/mecha/working/ripley,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) "l" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 8},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/Excavation) -"m" = (/obj/structure/table/sifwoodentable,/obj/item/mecha_parts/mecha_equipment/tool/drill/bore,/obj/item/weapon/ore/marble,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) -"n" = (/obj/item/weapon/ore,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) +"m" = (/obj/structure/table/sifwoodentable,/obj/item/mecha_parts/mecha_equipment/tool/drill/bore,/obj/item/ore/marble,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) +"n" = (/obj/item/ore,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) "o" = (/obj/structure/table/sifwoodentable,/obj/item/mecha_parts/mecha_equipment/hardpoint_actuator,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) "p" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 4},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/Excavation) "q" = (/obj/structure/table/sifwoodentable,/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) "r" = (/obj/structure/table/sifwoodentable,/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy/rigged,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) -"s" = (/obj/item/weapon/ore/marble,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) -"t" = (/obj/item/weapon/ore/gold,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) -"u" = (/obj/item/weapon/ore/diamond,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) +"s" = (/obj/item/ore/marble,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) +"t" = (/obj/item/ore/gold,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) +"u" = (/obj/item/ore/diamond,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) "v" = (/mob/living/simple_mob/mechanical/mining_drone,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) -"w" = (/obj/structure/table/sifwoodentable,/obj/item/weapon/pickaxe/jackhammer,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) +"w" = (/obj/structure/table/sifwoodentable,/obj/item/pickaxe/jackhammer,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) "x" = (/obj/structure/table/sifwoodentable,/obj/random/projectile/scrapped_grenadelauncher,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) "y" = (/obj/structure/table/sifwoodentable,/obj/random/medical/pillbottle,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) -"z" = (/obj/structure/table/sifwoodentable,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) -"A" = (/obj/structure/table/sifwoodentable,/obj/item/weapon/mining_scanner,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) +"z" = (/obj/structure/table/sifwoodentable,/obj/item/grenade/chem_grenade/metalfoam,/obj/item/grenade/chem_grenade/metalfoam,/obj/item/grenade/chem_grenade/metalfoam,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) +"A" = (/obj/structure/table/sifwoodentable,/obj/item/mining_scanner,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) "B" = (/obj/structure/table/sifwoodentable,/obj/random/cigarettes,/obj/random/tool/powermaint,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/Excavation) "C" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 10},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/Excavation) "D" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 2},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/Excavation) diff --git a/maps/submaps/surface_submaps/mountains/lava_trench.dmm b/maps/submaps/surface_submaps/mountains/lava_trench.dmm index c7b44d69751..54ec7ae5770 100644 --- a/maps/submaps/surface_submaps/mountains/lava_trench.dmm +++ b/maps/submaps/surface_submaps/mountains/lava_trench.dmm @@ -53,7 +53,7 @@ "ba" = (/obj/machinery/crystal/lava,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench) "bb" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 4},/turf/simulated/floor/lava,/area/submap/lava_trench) "bc" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 6},/turf/simulated/floor/lava,/area/submap/lava_trench) -"bd" = (/obj/structure/table/steel,/obj/item/weapon/storage/excavation,/obj/item/device/measuring_tape,/obj/effect/floor_decal/corner_oldtile/purple{icon_state = "corner_oldtile"; dir = 4},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) +"bd" = (/obj/structure/table/steel,/obj/item/storage/excavation,/obj/item/measuring_tape,/obj/effect/floor_decal/corner_oldtile/purple{icon_state = "corner_oldtile"; dir = 4},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) "be" = (/turf/simulated/mineral/ignore_mapgen,/area/template_noop) "bf" = (/obj/structure/railing,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench) "bg" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 10},/obj/structure/railing,/turf/simulated/floor/lava,/area/submap/lava_trench) @@ -78,13 +78,13 @@ "bz" = (/obj/effect/floor_decal/corner_oldtile{icon_state = "corner_oldtile"; dir = 1},/turf/simulated/floor/tiled/old_tile/gray,/area/submap/lava_trench/outpost) "bA" = (/obj/effect/floor_decal/corner_oldtile{icon_state = "corner_oldtile"; dir = 4},/turf/simulated/floor/tiled/old_tile/gray,/area/submap/lava_trench/outpost) "bB" = (/obj/effect/floor_decal/corner_oldtile/blue{icon_state = "corner_oldtile"; dir = 8},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) -"bC" = (/obj/structure/table/rack,/obj/item/weapon/shovel,/obj/effect/floor_decal/corner_oldtile/purple/full{icon_state = "corner_oldtile_full"; dir = 1},/obj/item/weapon/pickaxe/drill,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) +"bC" = (/obj/structure/table/rack,/obj/item/shovel,/obj/effect/floor_decal/corner_oldtile/purple/full{icon_state = "corner_oldtile_full"; dir = 1},/obj/item/pickaxe/drill,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) "bD" = (/obj/effect/step_trigger/teleporter/offset/north,/turf/simulated/floor/lava,/area/submap/lava_trench) "bE" = (/obj/machinery/crystal/lava,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench) "bF" = (/obj/structure/table/rack,/obj/random/tool/powermaint,/obj/random/tool/powermaint,/obj/effect/floor_decal/corner_oldtile/purple{icon_state = "corner_oldtile"; dir = 6},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) -"bG" = (/obj/effect/floor_decal/corner_oldtile/purple,/obj/structure/table/steel,/obj/item/device/xenoarch_multi_tool,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) +"bG" = (/obj/effect/floor_decal/corner_oldtile/purple,/obj/structure/table/steel,/obj/item/xenoarch_multi_tool,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) "bH" = (/obj/effect/floor_decal/corner_oldtile/purple,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) -"bI" = (/obj/item/device/gps/science{gps_tag = "CRYSTALS"},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) +"bI" = (/obj/item/gps/science{gps_tag = "CRYSTALS"},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) "bK" = (/obj/effect/floor_decal/corner_oldtile/blue/full,/obj/random/drinkbottle,/obj/random/maintenance/research,/obj/structure/table/standard,/obj/machinery/light/small/flicker{icon_state = "bulb1"; dir = 8},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) "bL" = (/obj/structure/flora/pottedplant/crystal,/obj/effect/floor_decal/corner_oldtile/blue{icon_state = "corner_oldtile"; dir = 8},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) "bM" = (/obj/structure/cult/pylon,/obj/effect/floor_decal/industrial/outline,/turf/simulated/floor/tiled/old_tile/gray,/area/submap/lava_trench/outpost) @@ -93,13 +93,13 @@ "bP" = (/obj/effect/floor_decal/corner_oldtile/purple/full{icon_state = "corner_oldtile_full"; dir = 4},/obj/structure/table/steel,/obj/machinery/recharger,/obj/machinery/light/small/flicker{icon_state = "bulb1"; dir = 4},/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) "bQ" = (/obj/machinery/light/small/flicker{icon_state = "bulb1"; dir = 8},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench) "bR" = (/obj/machinery/light/small/flicker{icon_state = "bulb1"; dir = 1},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench) -"bS" = (/obj/effect/floor_decal/corner_oldtile/blue{icon_state = "corner_oldtile"; dir = 1},/obj/structure/loot_pile/surface/medicine_cabinet{pixel_y = 28},/obj/structure/table/standard,/obj/item/device/healthanalyzer/improved,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) +"bS" = (/obj/effect/floor_decal/corner_oldtile/blue{icon_state = "corner_oldtile"; dir = 1},/obj/structure/loot_pile/surface/medicine_cabinet{pixel_y = 28},/obj/structure/table/standard,/obj/item/healthanalyzer/improved,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) "bT" = (/obj/machinery/suspension_gen{anchored = 1},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) "bU" = (/obj/machinery/light/small/flicker,/obj/structure/ore_box,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench) "bW" = (/obj/structure/anomaly_container,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench) -"bX" = (/obj/effect/floor_decal/corner_oldtile/purple/full{icon_state = "corner_oldtile_full"; dir = 4},/obj/item/weapon/storage/box/samplebags,/obj/structure/table/steel,/obj/item/stack/flag/red,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) +"bX" = (/obj/effect/floor_decal/corner_oldtile/purple/full{icon_state = "corner_oldtile_full"; dir = 4},/obj/item/storage/box/samplebags,/obj/structure/table/steel,/obj/item/stack/flag/red,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) "bY" = (/obj/machinery/crystal,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench) -"bZ" = (/obj/structure/table/steel,/obj/item/weapon/stock_parts/subspace/crystal,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench) +"bZ" = (/obj/structure/table/steel,/obj/item/stock_parts/subspace/crystal,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench) "ca" = (/obj/structure/table/steel,/obj/item/stack/material/diamond,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench) "cb" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) "ce" = (/obj/effect/floor_decal/corner_oldtile/blue/full,/obj/structure/table/standard,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) @@ -108,9 +108,9 @@ "ck" = (/obj/item/clothing/suit/bio_suit/anomaly,/turf/simulated/floor/tiled/old_tile,/area/submap/lava_trench/outpost) "co" = (/obj/machinery/floodlight,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench) "cp" = (/obj/machinery/light/small/flicker,/obj/structure/closet/crate/secure/loot,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench) -"cq" = (/obj/item/weapon/banner/nt,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench) -"cr" = (/obj/structure/table/steel,/obj/item/weapon/material/shard/phoron,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench) -"cs" = (/obj/item/weapon/banner/nt,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench) +"cq" = (/obj/item/banner/nt,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench) +"cr" = (/obj/structure/table/steel,/obj/item/material/shard/phoron,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/lava_trench) +"cs" = (/obj/item/banner/nt,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/lava_trench) (1,1,1) = {" aBaBabacacacacacacacacacacadaBaBaBaBaBaCaCaCaBaBaBaBaBaBaBaBaBaBaBaBbebebeaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/submaps/surface_submaps/mountains/lost_explorer.dmm b/maps/submaps/surface_submaps/mountains/lost_explorer.dmm index de3fec99c0c..372e50c3a71 100644 --- a/maps/submaps/surface_submaps/mountains/lost_explorer.dmm +++ b/maps/submaps/surface_submaps/mountains/lost_explorer.dmm @@ -3,7 +3,7 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/lost_explorer) "b" = ( -/obj/item/device/geiger, +/obj/item/geiger, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/lost_explorer) "c" = ( @@ -11,7 +11,7 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/lost_explorer) "d" = ( -/obj/item/weapon/material/knife/tacknife/survival, +/obj/item/material/knife/tacknife/survival, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/lost_explorer) "e" = ( @@ -25,15 +25,15 @@ /area/submap/cave/lost_explorer) "g" = ( /obj/item/clothing/suit/storage/hooded/explorer, -/obj/item/weapon/cell/device, +/obj/item/cell/device, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/lost_explorer) "h" = ( -/obj/item/device/gps/explorer, +/obj/item/gps/explorer, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/lost_explorer) "i" = ( -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/lost_explorer) diff --git a/maps/submaps/surface_submaps/mountains/prepper1.dmm b/maps/submaps/surface_submaps/mountains/prepper1.dmm index 2e9f7a24d4b..6bc8d21b58b 100644 --- a/maps/submaps/surface_submaps/mountains/prepper1.dmm +++ b/maps/submaps/surface_submaps/mountains/prepper1.dmm @@ -4,20 +4,20 @@ "d" = (/obj/structure/table/steel,/obj/random/maintenance/security,/obj/item/stack/cable_coil/random,/turf/simulated/floor/plating,/area/submap/cave/prepper1) "e" = (/obj/structure/table/steel,/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/submap/cave/prepper1) "f" = (/obj/structure/table/steel,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/submap/cave/prepper1) -"g" = (/obj/structure/table/steel,/obj/item/weapon/storage/box/glasses,/turf/simulated/floor/plating,/area/submap/cave/prepper1) +"g" = (/obj/structure/table/steel,/obj/item/storage/box/glasses,/turf/simulated/floor/plating,/area/submap/cave/prepper1) "h" = (/obj/structure/table/steel,/obj/random/toolbox,/turf/simulated/floor/plating,/area/submap/cave/prepper1) "i" = (/turf/simulated/floor/plating,/area/submap/cave/prepper1) -"j" = (/obj/structure/table/steel,/obj/item/weapon/tape_roll,/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/submap/cave/prepper1) +"j" = (/obj/structure/table/steel,/obj/item/tape_roll,/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/submap/cave/prepper1) "k" = (/obj/structure/table/steel,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/item/stack/tile/floor/steel,/turf/simulated/floor/plating,/area/submap/cave/prepper1) "l" = (/obj/structure/inflatable/door,/turf/simulated/floor/plating,/area/submap/cave/prepper1) "m" = (/obj/structure/closet/wardrobe/grey,/turf/simulated/floor/plating,/area/submap/cave/prepper1) "n" = (/obj/structure/closet/crate/freezer/rations,/turf/simulated/floor/plating,/area/submap/cave/prepper1) "o" = (/obj/structure/reagent_dispensers/water_cooler/full,/turf/simulated/floor/plating,/area/submap/cave/prepper1) "p" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/plating,/area/submap/cave/prepper1) -"q" = (/obj/structure/table/rack,/obj/item/weapon/tank/emergency/oxygen/engi,/obj/item/weapon/tank/emergency/oxygen/engi,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/armor/material/makeshift,/obj/item/clothing/head/helmet/bucket,/turf/simulated/floor/plating,/area/submap/cave/prepper1) -"r" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/plating,/area/submap/cave/prepper1) -"s" = (/obj/structure/table/steel,/obj/item/device/flashlight/lantern,/turf/simulated/floor/plating,/area/submap/cave/prepper1) -"t" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever,/obj/item/ammo_magazine/clip/c762,/obj/item/ammo_magazine/clip/c762,/turf/simulated/floor/plating,/area/submap/cave/prepper1) +"q" = (/obj/structure/table/rack,/obj/item/tank/emergency/oxygen/engi,/obj/item/tank/emergency/oxygen/engi,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/armor/material/makeshift,/obj/item/clothing/head/helmet/bucket,/turf/simulated/floor/plating,/area/submap/cave/prepper1) +"r" = (/obj/structure/bed,/obj/item/bedsheet,/turf/simulated/floor/plating,/area/submap/cave/prepper1) +"s" = (/obj/structure/table/steel,/obj/item/flashlight/lantern,/turf/simulated/floor/plating,/area/submap/cave/prepper1) +"t" = (/obj/structure/table/rack,/obj/item/gun/projectile/shotgun/pump/rifle/lever,/obj/item/ammo_magazine/clip/c762,/obj/item/ammo_magazine/clip/c762,/turf/simulated/floor/plating,/area/submap/cave/prepper1) (1,1,1) = {" aaaaaaaaaa diff --git a/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm b/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm index f2de7a729c1..4185b3c846d 100644 --- a/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm +++ b/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm @@ -124,7 +124,7 @@ "as" = ( /obj/machinery/vending/snack{ contraband = null; - products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 0, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 0, /obj/item/weapon/reagent_containers/food/snacks/chips = 0, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 0, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 0, /obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 0, /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 0, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 0, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 0) + products = list(/obj/item/reagent_containers/food/snacks/candy = 0, /obj/item/reagent_containers/food/drinks/dry_ramen = 0, /obj/item/reagent_containers/food/snacks/chips = 0, /obj/item/reagent_containers/food/snacks/sosjerky = 0, /obj/item/reagent_containers/food/snacks/no_raisin = 0, /obj/item/reagent_containers/food/snacks/packaged/spacetwinkie = 0, /obj/item/reagent_containers/food/snacks/cheesiehonkers = 0, /obj/item/reagent_containers/food/snacks/tastybread = 0, /obj/item/reagent_containers/food/snacks/skrellsnacks = 0) }, /turf/simulated/shuttle/floor{ icon_state = "floor_white" @@ -133,7 +133,7 @@ "at" = ( /obj/machinery/vending/cola{ contraband = null; - products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 0) + products = list(/obj/item/reagent_containers/food/drinks/cans/cola = 0, /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind = 0, /obj/item/reagent_containers/food/drinks/cans/dr_gibb = 0, /obj/item/reagent_containers/food/drinks/cans/starkist = 0, /obj/item/reagent_containers/food/drinks/cans/waterbottle = 0, /obj/item/reagent_containers/food/drinks/cans/space_up = 0, /obj/item/reagent_containers/food/drinks/cans/iced_tea = 0, /obj/item/reagent_containers/food/drinks/cans/grape_juice = 0, /obj/item/reagent_containers/food/drinks/cans/gingerale = 0) }, /turf/simulated/shuttle/floor{ icon_state = "floor_white" @@ -146,7 +146,7 @@ }, /area/submap/cave/qShuttle) "av" = ( -/obj/item/weapon/pickaxe/drill, +/obj/item/pickaxe/drill, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, @@ -183,13 +183,13 @@ /area/submap/cave/qShuttle) "aB" = ( /obj/item/trash/cigbutt, -/obj/item/weapon/tank/emergency/oxygen, +/obj/item/tank/emergency/oxygen, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, /area/submap/cave/qShuttle) "aC" = ( -/obj/item/weapon/material/knife/tacknife/boot, +/obj/item/material/knife/tacknife/boot, /obj/item/clothing/mask/breath, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" @@ -203,8 +203,8 @@ /area/submap/cave/qShuttle) "aE" = ( /obj/item/trash/sosjerky, -/obj/item/weapon/storage/box/donut/empty, -/obj/item/weapon/reagent_containers/food/drinks/sillycup, +/obj/item/storage/box/donut/empty, +/obj/item/reagent_containers/food/drinks/sillycup, /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, @@ -332,13 +332,13 @@ }, /area/submap/cave/qShuttle) "aV" = ( -/obj/item/weapon/virusdish/random, +/obj/item/virusdish/random, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, /area/submap/cave/qShuttle) "aW" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, @@ -390,7 +390,7 @@ }, /area/submap/cave/qShuttle) "bc" = ( -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/effect/decal/cleanable/dirt, /turf/simulated/shuttle/floor{ icon_state = "floor_white" @@ -460,7 +460,7 @@ /area/submap/cave/qShuttle) "bk" = ( /obj/structure/table/rack, -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, @@ -472,9 +472,9 @@ name = "Virus Samples - FRAGILE"; opened = 1 }, -/obj/item/weapon/virusdish/random, -/obj/item/weapon/virusdish/random, -/obj/item/weapon/virusdish/random, +/obj/item/virusdish/random, +/obj/item/virusdish/random, +/obj/item/virusdish/random, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, @@ -498,11 +498,11 @@ /area/submap/cave/qShuttle) "bn" = ( /obj/structure/table/standard, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/shuttle/floor, /area/submap/cave/qShuttle) "bo" = ( -/obj/item/weapon/tool/crowbar/red, +/obj/item/tool/crowbar/red, /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, @@ -554,7 +554,7 @@ }, /area/submap/cave/qShuttle) "bv" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/shuttle/floor{ @@ -574,7 +574,7 @@ }, /area/submap/cave/qShuttle) "by" = ( -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, @@ -594,7 +594,7 @@ }, /area/submap/cave/qShuttle) "bB" = ( -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /turf/simulated/shuttle/floor{ icon_state = "floor_yellow" }, @@ -656,7 +656,7 @@ /area/submap/cave/qShuttle) "bJ" = ( /obj/item/trash/tastybread, -/obj/item/weapon/material/butterfly/boxcutter, +/obj/item/material/butterfly/boxcutter, /obj/effect/decal/cleanable/dirt, /turf/simulated/shuttle/floor{ icon_state = "floor_white" @@ -682,7 +682,7 @@ /obj/structure/bed/chair{ dir = 1 }, -/obj/item/weapon/card/id/external{ +/obj/item/card/id/external{ desc = "An identification card of some sort. Looks like this one was issued by the Vir Independent Mining Corp."; name = "VIMC identification card"; rank = "Miner"; @@ -694,7 +694,7 @@ /area/submap/cave/qShuttle) "bN" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/simulated/shuttle/floor{ icon_state = "floor_white" }, @@ -783,7 +783,7 @@ /area/submap/cave/qShuttle) "cc" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/qShuttle) "cd" = ( @@ -797,7 +797,7 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/qShuttle) "cf" = ( -/obj/item/weapon/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/qShuttle) "cg" = ( @@ -810,12 +810,12 @@ /area/submap/cave/qShuttle) "ci" = ( /obj/structure/table/steel, -/obj/item/weapon/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/qShuttle) "cj" = ( /obj/structure/table/steel, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, @@ -823,7 +823,7 @@ /area/submap/cave/qShuttle) "ck" = ( /obj/structure/table/steel, -/obj/item/weapon/tool/transforming/jawsoflife, +/obj/item/tool/transforming/jawsoflife, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/qShuttle) "cl" = ( @@ -833,7 +833,7 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/qShuttle) "cm" = ( -/obj/item/weapon/weldingtool/largetank, +/obj/item/weldingtool/largetank, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/qShuttle) "cn" = ( diff --git a/maps/submaps/surface_submaps/mountains/ritual.dmm b/maps/submaps/surface_submaps/mountains/ritual.dmm index 2e93dc0081a..a7dfb770fbe 100644 --- a/maps/submaps/surface_submaps/mountains/ritual.dmm +++ b/maps/submaps/surface_submaps/mountains/ritual.dmm @@ -1,6 +1,6 @@ "a" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CorgiRitual) "b" = (/obj/structure/plushie/ian,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CorgiRitual) -"c" = (/obj/item/weapon/flame/candle/everburn,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CorgiRitual) +"c" = (/obj/item/flame/candle/everburn,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CorgiRitual) "d" = (/obj/structure/plushie/ian{dir = 8},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CorgiRitual) "e" = (/obj/structure/plushie/ian{dir = 4},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CorgiRitual) "f" = (/obj/structure/ghost_pod/manual/corgi,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/CorgiRitual) diff --git a/maps/submaps/surface_submaps/mountains/spatial_anomaly.dmm b/maps/submaps/surface_submaps/mountains/spatial_anomaly.dmm index 0adb4b8937d..c13276db590 100644 --- a/maps/submaps/surface_submaps/mountains/spatial_anomaly.dmm +++ b/maps/submaps/surface_submaps/mountains/spatial_anomaly.dmm @@ -8,7 +8,7 @@ "h" = (/obj/effect/map_effect/portal/line/side_a{icon_state = "portal_line_side_a"; dir = 4},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) "i" = (/obj/effect/map_effect/portal/line/side_b{icon_state = "portal_line_side_b"; dir = 8},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) "j" = (/turf/simulated/floor/lava,/area/submap/spatial_anomaly) -"k" = (/obj/item/weapon/disposable_teleporter/slime,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) +"k" = (/obj/item/disposable_teleporter/slime,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) "l" = (/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) "m" = (/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly) "n" = (/obj/effect/map_effect/portal/master/side_a{dir = 4; icon_state = "portal_side_a"; portal_id = "spatial_anomaly_3"},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) @@ -19,34 +19,34 @@ "s" = (/obj/machinery/crystal/lava,/turf/simulated/floor/lava,/area/submap/spatial_anomaly) "t" = (/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly) "u" = (/obj/effect/map_effect/portal/master/side_a{portal_id = "spatial_anomaly_1"},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) -"v" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly) -"w" = (/obj/structure/table/steel_reinforced,/obj/item/device/xenoarch_multi_tool,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly) +"v" = (/obj/item/stool/padded,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly) +"w" = (/obj/structure/table/steel_reinforced,/obj/item/xenoarch_multi_tool,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly) "x" = (/turf/simulated/wall/solidrock,/area/template_noop) "y" = (/obj/random/technology_scanner,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) "z" = (/obj/structure/table/steel_reinforced,/obj/random/unidentified_medicine/scientific,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly) "A" = (/obj/structure/table/steel_reinforced,/obj/random/tool/power,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly) -"B" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/ore/diamond,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly) +"B" = (/obj/structure/table/steel_reinforced,/obj/item/ore/diamond,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly) "C" = (/obj/structure/sign/warning/lava,/turf/simulated/wall,/area/submap/spatial_anomaly) "D" = (/obj/effect/map_effect/portal/line/side_a,/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) -"E" = (/obj/structure/table/rack,/obj/item/weapon/pickaxe/jackhammer,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) +"E" = (/obj/structure/table/rack,/obj/item/pickaxe/jackhammer,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) "F" = (/obj/effect/map_effect/portal/master/side_a{dir = 1; icon_state = "portal_side_a"; portal_id = "spatial_anomaly_2"},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) "G" = (/obj/effect/map_effect/portal/line/side_a{icon_state = "portal_line_side_a"; dir = 1},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) "H" = (/turf/unsimulated/wall,/area/template_noop) "I" = (/obj/effect/map_effect/portal/master/side_b{dir = 1; icon_state = "portal_side_b"; portal_id = "spatial_anomaly_1"},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) "J" = (/obj/effect/map_effect/portal/line/side_b{icon_state = "portal_line_side_b"; dir = 1},/obj/effect/map_effect/perma_light/brighter{light_color = "#ff00ff"},/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) -"K" = (/obj/item/weapon/mining_scanner,/obj/structure/table/rack,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) -"L" = (/obj/item/weapon/storage/belt/archaeology,/obj/effect/decal/remains/human,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) +"K" = (/obj/item/mining_scanner,/obj/structure/table/rack,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) +"L" = (/obj/item/storage/belt/archaeology,/obj/effect/decal/remains/human,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) "M" = (/obj/structure/bookcase/manuals/xenoarchaeology,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly) -"N" = (/obj/item/weapon/pickaxe/brush,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) -"O" = (/obj/item/weapon/pickaxe/one_pick,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) -"P" = (/obj/item/weapon/pickaxe/four_pick,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) +"N" = (/obj/item/pickaxe/brush,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) +"O" = (/obj/item/pickaxe/one_pick,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) +"P" = (/obj/item/pickaxe/four_pick,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) "Q" = (/obj/effect/decal/remains/human,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly) -"R" = (/obj/item/weapon/pickaxe/five_pick,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) -"S" = (/obj/item/weapon/pickaxe/six_pick,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) -"T" = (/obj/item/weapon/pickaxe/two_pick,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) -"U" = (/obj/item/device/measuring_tape,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) -"X" = (/obj/item/weapon/pickaxe/three_pick,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) -"Y" = (/obj/item/weapon/pickaxe/excavationdrill,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly) +"R" = (/obj/item/pickaxe/five_pick,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) +"S" = (/obj/item/pickaxe/six_pick,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) +"T" = (/obj/item/pickaxe/two_pick,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) +"U" = (/obj/item/measuring_tape,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) +"X" = (/obj/item/pickaxe/three_pick,/turf/simulated/floor/outdoors/rocks/caves,/area/submap/spatial_anomaly) +"Y" = (/obj/item/pickaxe/excavationdrill,/turf/simulated/floor/plating/external,/area/submap/spatial_anomaly) (1,1,1) = {" ffffffffffffffffffffffffffffff diff --git a/maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm b/maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm index 15de0c4239f..ae1b36842d5 100644 --- a/maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm +++ b/maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm @@ -5,7 +5,7 @@ "h" = (/obj/random/handgun,/turf/simulated/floor/wood,/area/submap/Speakeasy) "i" = (/obj/item/clothing/head/fedora,/turf/simulated/floor/wood,/area/submap/Speakeasy) "j" = (/obj/structure/bookcase,/turf/simulated/floor/wood,/area/submap/Speakeasy) -"k" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/wood,/area/submap/Speakeasy) +"k" = (/obj/item/stool/padded,/turf/simulated/floor/wood,/area/submap/Speakeasy) "l" = (/obj/structure/bed/chair/comfy/black,/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) "m" = (/obj/structure/table/woodentable,/obj/machinery/light/poi{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) "n" = (/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor/wood,/area/submap/Speakeasy) diff --git a/maps/submaps/surface_submaps/mountains/temple.dmm b/maps/submaps/surface_submaps/mountains/temple.dmm index 229045614f7..c03d70e440a 100644 --- a/maps/submaps/surface_submaps/mountains/temple.dmm +++ b/maps/submaps/surface_submaps/mountains/temple.dmm @@ -23,41 +23,41 @@ /turf/simulated/wall/sandstonediamond, /area/submap/AbandonedTemple) "h" = ( -/obj/item/weapon/flame/candle/everburn, +/obj/item/flame/candle/everburn, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/AbandonedTemple) "i" = ( -/obj/item/weapon/ectoplasm, +/obj/item/ectoplasm, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/AbandonedTemple) "j" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/coin/iron, -/obj/item/weapon/coin/platinum, -/obj/item/weapon/coin/uranium, -/obj/item/weapon/coin/diamond, -/obj/item/weapon/coin/iron, -/obj/item/weapon/coin/uranium, -/obj/item/weapon/coin/iron, -/obj/item/weapon/coin/phoron, -/obj/item/weapon/coin/platinum, +/obj/item/coin/iron, +/obj/item/coin/platinum, +/obj/item/coin/uranium, +/obj/item/coin/diamond, +/obj/item/coin/iron, +/obj/item/coin/uranium, +/obj/item/coin/iron, +/obj/item/coin/phoron, +/obj/item/coin/platinum, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/AbandonedTemple) "k" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/silver, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/silver, +/obj/item/coin/silver, +/obj/item/coin/silver, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/silver, +/obj/item/coin/silver, +/obj/item/coin/silver, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/AbandonedTemple) "l" = ( @@ -82,7 +82,7 @@ /area/submap/AbandonedTemple) "q" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/lighter/zippo/royal, +/obj/item/flame/lighter/zippo/royal, /obj/item/clothing/mask/smokable/pipe, /turf/simulated/floor/carpet/turcarpet, /area/submap/AbandonedTemple) @@ -108,8 +108,8 @@ /area/submap/AbandonedTemple) "v" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper, -/obj/item/weapon/pen/fountain, +/obj/item/paper, +/obj/item/pen/fountain, /turf/simulated/floor/carpet/turcarpet, /area/submap/AbandonedTemple) "w" = ( @@ -123,7 +123,7 @@ /area/submap/AbandonedTemple) "y" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle/candelabra/everburn, +/obj/item/flame/candle/candelabra/everburn, /turf/simulated/floor/carpet/turcarpet, /area/submap/AbandonedTemple) "z" = ( @@ -166,7 +166,7 @@ /area/submap/AbandonedTemple) "G" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper/alien{ +/obj/item/paper/alien{ desc = ""; icon_state = "alienpaper_words"; info = "(On the screen of the tablet are several lines of characters written in a language you don't seem to recognize. At the end of each line is a set of numbers seperated by a colon. The screen flickers occasionally, as if damaged. Nothing about the tablet seems particularly interesting, but it does seem very, very old.)" @@ -196,12 +196,12 @@ /area/submap/AbandonedTemple) "M" = ( /obj/effect/decal/cleanable/cobweb, -/obj/item/weapon/flame/candle/candelabra/everburn, +/obj/item/flame/candle/candelabra/everburn, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/AbandonedTemple) "N" = ( /obj/effect/decal/cleanable/cobweb2, -/obj/item/weapon/flame/candle/candelabra/everburn, +/obj/item/flame/candle/candelabra/everburn, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/AbandonedTemple) "O" = ( diff --git a/maps/submaps/surface_submaps/mountains/vault5.dmm b/maps/submaps/surface_submaps/mountains/vault5.dmm index 89dcbf1bdfe..700e39409c1 100644 --- a/maps/submaps/surface_submaps/mountains/vault5.dmm +++ b/maps/submaps/surface_submaps/mountains/vault5.dmm @@ -1,14 +1,14 @@ "a" = (/turf/template_noop,/area/template_noop) "b" = (/obj/structure/alien/wall,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5) "c" = (/obj/structure/simple_door/resin,/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5) -"d" = (/obj/effect/alien/weeds,/obj/structure/bed/nest,/obj/item/weapon/gun/projectile/p92x/large,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5) +"d" = (/obj/effect/alien/weeds,/obj/structure/bed/nest,/obj/item/gun/projectile/p92x/large,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5) "e" = (/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5) "f" = (/obj/effect/alien/weeds,/obj/item/clothing/suit/storage/vest/tactical,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5) "g" = (/obj/effect/alien/weeds,/obj/structure/bed/nest,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5) "h" = (/obj/effect/alien/weeds,/obj/random/multiple/minevault,/mob/living/simple_mob/animal/space/alien/sentinel/praetorian,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5) "i" = (/obj/effect/alien/weeds,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5) "j" = (/obj/effect/alien/weeds,/obj/effect/alien/weeds/node,/mob/living/simple_mob/animal/space/alien/queen/empress,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5) -"k" = (/obj/effect/alien/weeds,/obj/item/clothing/head/helmet/tac,/obj/item/weapon/gun/projectile/SVD,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5) +"k" = (/obj/effect/alien/weeds,/obj/item/clothing/head/helmet/tac,/obj/item/gun/projectile/SVD,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/vault5) (1,1,1) = {" aaaaaaaaa diff --git a/maps/submaps/surface_submaps/plains/Boathouse.dmm b/maps/submaps/surface_submaps/plains/Boathouse.dmm index 798ad3431f5..33b092a7d00 100644 --- a/maps/submaps/surface_submaps/plains/Boathouse.dmm +++ b/maps/submaps/surface_submaps/plains/Boathouse.dmm @@ -9,46 +9,46 @@ "ai" = (/turf/simulated/wall/wood,/area/submap/Boathouse) "aj" = (/obj/structure/closet/cabinet,/obj/item/clothing/accessory/jacket,/obj/item/clothing/accessory/jacket,/obj/item/clothing/head/beanie,/turf/simulated/floor/wood,/area/submap/Boathouse) "ak" = (/turf/simulated/floor/wood,/area/submap/Boathouse) -"al" = (/obj/structure/closet/cabinet,/obj/item/weapon/gun/projectile/shotgun/doublebarrel,/obj/item/ammo_magazine/ammo_box/b12g/beanbag,/turf/simulated/floor/wood,/area/submap/Boathouse) +"al" = (/obj/structure/closet/cabinet,/obj/item/gun/projectile/shotgun/doublebarrel,/obj/item/ammo_magazine/ammo_box/b12g/beanbag,/turf/simulated/floor/wood,/area/submap/Boathouse) "am" = (/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse) -"an" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/wood,/area/submap/Boathouse) +"an" = (/obj/structure/table/woodentable,/obj/item/storage/toolbox/mechanical,/turf/simulated/floor/wood,/area/submap/Boathouse) "ao" = (/obj/structure/railing{dir = 8},/obj/structure/railing,/turf/simulated/floor/water,/area/submap/Boathouse) "ap" = (/obj/structure/railing,/turf/simulated/floor/water,/area/submap/Boathouse) -"aq" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/wood,/area/submap/Boathouse) -"ar" = (/obj/structure/table/woodentable,/obj/item/weapon/deck/cards,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse) -"as" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/snacks/chips,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse) +"aq" = (/obj/item/stool/padded,/turf/simulated/floor/wood,/area/submap/Boathouse) +"ar" = (/obj/structure/table/woodentable,/obj/item/deck/cards,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse) +"as" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/snacks/chips,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse) "at" = (/obj/structure/table/woodentable,/obj/item/trash/candle,/turf/simulated/floor/wood,/area/submap/Boathouse) -"au" = (/obj/item/weapon/stool,/turf/simulated/floor/wood,/area/submap/Boathouse) +"au" = (/obj/item/stool,/turf/simulated/floor/wood,/area/submap/Boathouse) "av" = (/turf/simulated/floor/wood{ icon_state = "wood_broken6"},/area/submap/Boathouse) "aw" = (/obj/structure/railing{dir = 8},/turf/simulated/floor/water,/area/submap/Boathouse) -"ax" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse) -"ay" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/glass2/shot,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse) -"az" = (/obj/structure/table/woodentable,/obj/item/weapon/tape_roll,/obj/random/firstaid,/turf/simulated/floor/wood,/area/submap/Boathouse) -"aA" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/glass2/shot,/obj/item/weapon/reagent_containers/food/drinks/glass2/shot,/obj/item/weapon/reagent_containers/food/drinks/glass2/shot,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse) +"ax" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/drinks/bottle/whiskey,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse) +"ay" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/drinks/glass2/shot,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse) +"az" = (/obj/structure/table/woodentable,/obj/item/tape_roll,/obj/random/firstaid,/turf/simulated/floor/wood,/area/submap/Boathouse) +"aA" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/drinks/glass2/shot,/obj/item/reagent_containers/food/drinks/glass2/shot,/obj/item/reagent_containers/food/drinks/glass2/shot,/turf/simulated/floor/carpet/turcarpet,/area/submap/Boathouse) "aB" = (/turf/simulated/floor/wood{ icon_state = "wood_broken2"},/area/submap/Boathouse) "aC" = (/obj/structure/railing{dir = 8},/obj/structure/railing{ icon_state = "railing0"; dir = 1},/turf/simulated/floor/water,/area/submap/Boathouse) "aD" = (/obj/structure/railing{ icon_state = "railing0"; dir = 1},/turf/simulated/floor/water,/area/submap/Boathouse) "aE" = (/obj/vehicle/boat/sifwood,/turf/simulated/floor/water,/area/submap/Boathouse) "aF" = (/obj/structure/window/reinforced/full,/turf/simulated/floor/wood,/area/submap/Boathouse) -"aG" = (/obj/structure/table/woodentable,/obj/item/weapon/oar,/obj/item/weapon/oar,/turf/simulated/floor/wood,/area/submap/Boathouse) +"aG" = (/obj/structure/table/woodentable,/obj/item/oar,/obj/item/oar,/turf/simulated/floor/wood,/area/submap/Boathouse) "aH" = (/obj/structure/railing{ icon_state = "railing0"; dir = 8},/turf/simulated/floor/water,/area/submap/Boathouse) "aI" = (/obj/structure/table/woodentable,/obj/random/powercell,/turf/simulated/floor/wood,/area/submap/Boathouse) "aJ" = (/turf/simulated/floor/wood{ icon_state = "wood_broken4"},/area/submap/Boathouse) "aK" = (/obj/structure/railing{ icon_state = "railing0"; dir = 8},/obj/structure/railing{ icon_state = "railing0"; dir = 1},/turf/simulated/floor/water,/area/submap/Boathouse) "aL" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wood,/area/submap/Boathouse) -"aM" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/fruitsalad,/turf/simulated/floor/wood,/area/submap/Boathouse) +"aM" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/fruitsalad,/turf/simulated/floor/wood,/area/submap/Boathouse) "aN" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/submap/Boathouse) "aO" = (/turf/simulated/floor/carpet/bcarpet,/area/submap/Boathouse) -"aP" = (/obj/structure/table/woodentable,/obj/item/weapon/material/knife,/turf/simulated/floor/wood,/area/submap/Boathouse) +"aP" = (/obj/structure/table/woodentable,/obj/item/material/knife,/turf/simulated/floor/wood,/area/submap/Boathouse) "aQ" = (/obj/structure/bookcase,/turf/simulated/floor/carpet/bcarpet,/area/submap/Boathouse) -"aR" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/bag/trash,/turf/simulated/floor/wood,/area/submap/Boathouse) -"aS" = (/obj/structure/table/woodentable,/obj/item/weapon/flame/lighter,/obj/item/weapon/storage/fancy/candle_box,/turf/simulated/floor/wood,/area/submap/Boathouse) +"aR" = (/obj/structure/table/woodentable,/obj/item/storage/bag/trash,/turf/simulated/floor/wood,/area/submap/Boathouse) +"aS" = (/obj/structure/table/woodentable,/obj/item/flame/lighter,/obj/item/storage/fancy/candle_box,/turf/simulated/floor/wood,/area/submap/Boathouse) "aT" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/carpet/bcarpet,/area/submap/Boathouse) "aU" = (/obj/structure/table/rack,/obj/item/clothing/accessory/poncho/blue,/obj/item/clothing/accessory/poncho/blue,/turf/simulated/floor/wood,/area/submap/Boathouse) "aV" = (/obj/structure/coatrack,/turf/simulated/floor/wood,/area/submap/Boathouse) "aW" = (/obj/structure/table/rack,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/clothing/head/hood/winter,/obj/item/clothing/shoes/boots/winter,/turf/simulated/floor/wood,/area/submap/Boathouse) "aX" = (/obj/structure/table/rack,/obj/item/clothing/accessory/storage,/obj/item/clothing/accessory/storage,/turf/simulated/floor/wood,/area/submap/Boathouse) -"aY" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp,/turf/simulated/floor/carpet/bcarpet,/area/submap/Boathouse) +"aY" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp,/turf/simulated/floor/carpet/bcarpet,/area/submap/Boathouse) "aZ" = (/obj/structure/table/woodentable,/turf/simulated/floor/carpet/bcarpet,/area/submap/Boathouse) "ba" = (/turf/simulated/floor/outdoors/dirt,/area/submap/Boathouse) diff --git a/maps/submaps/surface_submaps/plains/Boathouse_vr.dmm b/maps/submaps/surface_submaps/plains/Boathouse_vr.dmm index 31ae85b9aaa..1eee3685f85 100644 --- a/maps/submaps/surface_submaps/plains/Boathouse_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Boathouse_vr.dmm @@ -41,7 +41,7 @@ /area/submap/Boathouse) "al" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/gun/projectile/shotgun/doublebarrel, +/obj/item/gun/projectile/shotgun/doublebarrel, /obj/item/ammo_magazine/ammo_box/b12g/beanbag, /turf/simulated/floor/wood, /area/submap/Boathouse) @@ -50,7 +50,7 @@ /area/submap/Boathouse) "an" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/wood/virgo3b, /area/submap/Boathouse) "ao" = ( @@ -65,17 +65,17 @@ /turf/simulated/floor/water/virgo3b, /area/submap/Boathouse) "aq" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/submap/Boathouse) "ar" = ( /obj/structure/table/woodentable, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /turf/simulated/floor/carpet/turcarpet, /area/submap/Boathouse) "as" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, /turf/simulated/floor/carpet/turcarpet, /area/submap/Boathouse) "at" = ( @@ -84,7 +84,7 @@ /turf/simulated/floor/wood/virgo3b, /area/submap/Boathouse) "au" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/wood/virgo3b, /area/submap/Boathouse) "aw" = ( @@ -95,25 +95,25 @@ /area/submap/Boathouse) "ax" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, /turf/simulated/floor/carpet/turcarpet, /area/submap/Boathouse) "ay" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/glass2/shot, +/obj/item/reagent_containers/food/drinks/glass2/shot, /turf/simulated/floor/carpet/turcarpet, /area/submap/Boathouse) "az" = ( /obj/structure/table/woodentable, -/obj/item/weapon/tape_roll, +/obj/item/tape_roll, /obj/random/firstaid, /turf/simulated/floor/wood/virgo3b, /area/submap/Boathouse) "aA" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/glass2/shot, -/obj/item/weapon/reagent_containers/food/drinks/glass2/shot, -/obj/item/weapon/reagent_containers/food/drinks/glass2/shot, +/obj/item/reagent_containers/food/drinks/glass2/shot, +/obj/item/reagent_containers/food/drinks/glass2/shot, +/obj/item/reagent_containers/food/drinks/glass2/shot, /turf/simulated/floor/carpet/turcarpet, /area/submap/Boathouse) "aD" = ( @@ -132,8 +132,8 @@ /area/submap/Boathouse) "aG" = ( /obj/structure/table/woodentable, -/obj/item/weapon/oar, -/obj/item/weapon/oar, +/obj/item/oar, +/obj/item/oar, /turf/simulated/floor/wood/virgo3b, /area/submap/Boathouse) "aI" = ( @@ -163,12 +163,12 @@ /area/submap/Boathouse) "aN" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/fruitsalad, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/fruitsalad, /turf/simulated/floor/wood, /area/submap/Boathouse) "aO" = ( @@ -180,7 +180,7 @@ /area/submap/Boathouse) "aQ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /turf/simulated/floor/wood, /area/submap/Boathouse) "aR" = ( @@ -189,13 +189,13 @@ /area/submap/Boathouse) "aS" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/bag/trash, +/obj/item/storage/bag/trash, /turf/simulated/floor/wood, /area/submap/Boathouse) "aT" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/lighter, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/flame/lighter, +/obj/item/storage/fancy/candle_box, /turf/simulated/floor/wood, /area/submap/Boathouse) "aU" = ( @@ -228,7 +228,7 @@ /area/submap/Boathouse) "aZ" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/bcarpet, /area/submap/Boathouse) "ba" = ( diff --git a/maps/submaps/surface_submaps/plains/Diner.dmm b/maps/submaps/surface_submaps/plains/Diner.dmm index 22b89faf453..289235346b6 100644 --- a/maps/submaps/surface_submaps/plains/Diner.dmm +++ b/maps/submaps/surface_submaps/plains/Diner.dmm @@ -30,8 +30,8 @@ /area/submap/Diner) "ai" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/glass/beaker, /turf/simulated/floor/tiled/white, /area/submap/Diner) "aj" = ( @@ -39,7 +39,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/simulated/floor/tiled/white, /area/submap/Diner) "ak" = ( @@ -78,14 +78,14 @@ "ar" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, -/obj/item/weapon/material/kitchen/utensil/fork, +/obj/item/reagent_containers/food/condiment/small/saltshaker, +/obj/item/material/kitchen/utensil/fork, /turf/simulated/floor/tiled/white, /area/submap/Diner) "as" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/peppermill, /obj/machinery/light{ icon_state = "tube1"; dir = 4 @@ -102,12 +102,12 @@ /area/submap/Diner) "au" = ( /obj/structure/table/standard, -/obj/item/weapon/book/manual/chef_recipes, +/obj/item/book/manual/chef_recipes, /turf/simulated/floor/tiled/white, /area/submap/Diner) "av" = ( /obj/structure/table/standard, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/white, /area/submap/Diner) "aw" = ( @@ -125,16 +125,16 @@ /area/submap/Diner) "ay" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cream, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cream, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cream, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cream, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/cream, +/obj/item/reagent_containers/food/drinks/bottle/cream, +/obj/item/reagent_containers/food/drinks/bottle/cream, +/obj/item/reagent_containers/food/drinks/bottle/cream, +/obj/item/reagent_containers/food/condiment/carton/sugar, /turf/simulated/floor/tiled/white, /area/submap/Diner) "az" = ( @@ -151,20 +151,20 @@ /area/submap/Diner) "aC" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/saltshaker, /obj/effect/floor_decal/corner/red/diagonal, -/obj/item/weapon/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, /turf/simulated/floor/tiled/white, /area/submap/Diner) "aD" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/peppermill, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/white, /area/submap/Diner) "aE" = ( /obj/effect/floor_decal/corner/red/diagonal, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/white, /area/submap/Diner) "aF" = ( @@ -192,7 +192,7 @@ "aJ" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/red/diagonal, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/saltshaker, /turf/simulated/floor/tiled/white, /area/submap/Diner) "aK" = ( @@ -226,20 +226,20 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/tiled/freezer, /area/submap/Diner) "aO" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/red/diagonal, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/peppermill, /turf/simulated/floor/tiled/white, /area/submap/Diner) "aP" = ( @@ -250,13 +250,13 @@ /area/submap/Diner) "aQ" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, /turf/simulated/floor/tiled/freezer, /area/submap/Diner) "aR" = ( @@ -325,19 +325,19 @@ "bd" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cream, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cream, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/cream, +/obj/item/reagent_containers/food/drinks/bottle/cream, /turf/simulated/floor/tiled/white, /area/submap/Diner) "be" = ( @@ -351,7 +351,7 @@ /area/submap/Diner) "bg" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/lino, /area/submap/Diner) "bh" = ( @@ -374,7 +374,7 @@ /area/submap/Diner) "bl" = ( /obj/structure/table/woodentable, -/obj/item/weapon/cell/high, +/obj/item/cell/high, /turf/simulated/floor/lino, /area/submap/Diner) "bm" = ( diff --git a/maps/submaps/surface_submaps/plains/Diner_vr.dmm b/maps/submaps/surface_submaps/plains/Diner_vr.dmm index ed6b22d9eb9..59772a16f92 100644 --- a/maps/submaps/surface_submaps/plains/Diner_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Diner_vr.dmm @@ -30,8 +30,8 @@ /area/submap/Diner) "ai" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/glass/beaker, /turf/simulated/floor/tiled/white, /area/submap/Diner) "aj" = ( @@ -39,7 +39,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/simulated/floor/tiled/white, /area/submap/Diner) "ak" = ( @@ -76,14 +76,14 @@ "ar" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, -/obj/item/weapon/material/kitchen/utensil/fork, +/obj/item/reagent_containers/food/condiment/small/saltshaker, +/obj/item/material/kitchen/utensil/fork, /turf/simulated/floor/tiled/white, /area/submap/Diner) "as" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/peppermill, /obj/machinery/light{ dir = 4 }, @@ -97,12 +97,12 @@ /area/submap/Diner) "au" = ( /obj/structure/table/standard, -/obj/item/weapon/book/manual/chef_recipes, +/obj/item/book/manual/chef_recipes, /turf/simulated/floor/tiled/white, /area/submap/Diner) "av" = ( /obj/structure/table/standard, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/white, /area/submap/Diner) "aw" = ( @@ -121,16 +121,16 @@ /area/submap/Diner) "ay" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cream, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cream, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cream, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cream, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/cream, +/obj/item/reagent_containers/food/drinks/bottle/cream, +/obj/item/reagent_containers/food/drinks/bottle/cream, +/obj/item/reagent_containers/food/drinks/bottle/cream, +/obj/item/reagent_containers/food/condiment/carton/sugar, /turf/simulated/floor/tiled/white, /area/submap/Diner) "az" = ( @@ -147,20 +147,20 @@ /area/submap/Diner) "aC" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/saltshaker, /obj/effect/floor_decal/corner/red/diagonal, -/obj/item/weapon/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, /turf/simulated/floor/tiled/white, /area/submap/Diner) "aD" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/peppermill, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/white, /area/submap/Diner) "aE" = ( /obj/effect/floor_decal/corner/red/diagonal, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/white, /area/submap/Diner) "aF" = ( @@ -176,19 +176,19 @@ /area/submap/Diner) "aI" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/tiled/freezer, /area/submap/Diner) "aJ" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/red/diagonal, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/saltshaker, /turf/simulated/floor/tiled/white, /area/submap/Diner) "aK" = ( @@ -221,20 +221,20 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/tiled/freezer, /area/submap/Diner) "aO" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/red/diagonal, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, +/obj/item/reagent_containers/food/condiment/small/peppermill, /turf/simulated/floor/tiled/white, /area/submap/Diner) "aP" = ( @@ -245,13 +245,13 @@ /area/submap/Diner) "aQ" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, -/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, +/obj/item/reagent_containers/food/condiment/carton/flour, /turf/simulated/floor/tiled/freezer, /area/submap/Diner) "aR" = ( @@ -329,19 +329,19 @@ "bg" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/storage/fancy/egg_box, -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/milk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cream, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cream, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/milk, +/obj/item/reagent_containers/food/drinks/bottle/cream, +/obj/item/reagent_containers/food/drinks/bottle/cream, /turf/simulated/floor/tiled/white, /area/submap/Diner) "bh" = ( @@ -355,7 +355,7 @@ /area/submap/Diner) "bj" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/lino, /area/submap/Diner) "bk" = ( @@ -373,7 +373,7 @@ /area/submap/Diner) "bn" = ( /obj/structure/table/woodentable, -/obj/item/weapon/cell/high, +/obj/item/cell/high, /turf/simulated/floor/lino, /area/submap/Diner) "bo" = ( diff --git a/maps/submaps/surface_submaps/plains/Epod.dmm b/maps/submaps/surface_submaps/plains/Epod.dmm index b53f094c59e..72dac983bac 100644 --- a/maps/submaps/surface_submaps/plains/Epod.dmm +++ b/maps/submaps/surface_submaps/plains/Epod.dmm @@ -6,7 +6,7 @@ /turf/template_noop, /area/submap/Epod1) "c" = ( -/obj/item/weapon/airlock_electronics, +/obj/item/airlock_electronics, /turf/template_noop, /area/submap/Epod1) "d" = ( @@ -31,7 +31,7 @@ /area/submap/Epod1) "i" = ( /obj/structure/bed/chair, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -28 @@ -39,7 +39,7 @@ /obj/structure/closet/walllocker/emerglocker{ pixel_x = 28 }, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /turf/simulated/shuttle/floor/virgo3b, /area/submap/Epod1) "j" = ( @@ -63,8 +63,8 @@ layer = 4; pixel_x = -32 }, -/obj/item/weapon/storage/backpack/satchel, -/obj/item/weapon/spacecash/c100, +/obj/item/storage/backpack/satchel, +/obj/item/spacecash/c100, /turf/simulated/shuttle/floor/virgo3b, /area/submap/Epod1) "m" = ( diff --git a/maps/submaps/surface_submaps/plains/Epod2.dmm b/maps/submaps/surface_submaps/plains/Epod2.dmm index fc7437ebced..9bd69ee8194 100644 --- a/maps/submaps/surface_submaps/plains/Epod2.dmm +++ b/maps/submaps/surface_submaps/plains/Epod2.dmm @@ -53,8 +53,8 @@ }, /obj/structure/window/reinforced, /obj/item/stack/rods, -/obj/item/weapon/material/shard, -/obj/item/weapon/material/shard{ +/obj/item/material/shard, +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/shuttle/floor/virgo3b, @@ -69,7 +69,7 @@ /obj/machinery/status_display{ pixel_y = -32 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -88,7 +88,7 @@ /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/drip, -/obj/item/weapon/reagent_containers/hypospray/autoinjector/empty, +/obj/item/reagent_containers/hypospray/autoinjector/empty, /turf/simulated/shuttle/floor/virgo3b, /area/submap/Epod2) "n" = ( diff --git a/maps/submaps/surface_submaps/plains/Field1.dmm b/maps/submaps/surface_submaps/plains/Field1.dmm index ca0e54188be..6f18d29fb0c 100644 --- a/maps/submaps/surface_submaps/plains/Field1.dmm +++ b/maps/submaps/surface_submaps/plains/Field1.dmm @@ -17,7 +17,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/Field1) "f" = ( -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/Field1) "g" = ( @@ -29,7 +29,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/Field1) "i" = ( -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/Field1) diff --git a/maps/submaps/surface_submaps/plains/Mechpt.dmm b/maps/submaps/surface_submaps/plains/Mechpt.dmm index 63b2f66dd4f..d48aff3fceb 100644 --- a/maps/submaps/surface_submaps/plains/Mechpt.dmm +++ b/maps/submaps/surface_submaps/plains/Mechpt.dmm @@ -16,14 +16,14 @@ "e" = ( /obj/structure/railing, /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, /turf/template_noop, /area/submap/Mechpt) "f" = ( /obj/structure/railing, /obj/structure/table/woodentable, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, +/obj/item/cell/high, +/obj/item/cell/high, /turf/template_noop, /area/submap/Mechpt) "g" = ( @@ -34,8 +34,8 @@ "h" = ( /obj/structure/railing, /obj/structure/table/woodentable, -/obj/item/weapon/spacecash/c10, -/obj/item/weapon/spacecash/c10, +/obj/item/spacecash/c10, +/obj/item/spacecash/c10, /turf/template_noop, /area/submap/Mechpt) "i" = ( @@ -96,7 +96,7 @@ dir = 1 }, /obj/structure/table/woodentable, -/obj/item/weapon/spacecash/c50, +/obj/item/spacecash/c50, /turf/template_noop, /area/submap/Mechpt) "u" = ( @@ -104,8 +104,8 @@ dir = 1 }, /obj/structure/table/woodentable, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/high, +/obj/item/cell/device/weapon, /turf/template_noop, /area/submap/Mechpt) "v" = ( @@ -113,7 +113,7 @@ dir = 1 }, /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, /turf/template_noop, /area/submap/Mechpt) diff --git a/maps/submaps/surface_submaps/plains/Oldhouse.dmm b/maps/submaps/surface_submaps/plains/Oldhouse.dmm index 3047b95ab38..96058de7da5 100644 --- a/maps/submaps/surface_submaps/plains/Oldhouse.dmm +++ b/maps/submaps/surface_submaps/plains/Oldhouse.dmm @@ -17,35 +17,35 @@ "q" = (/obj/item/stack/material/wood,/turf/simulated/floor/wood,/area/submap/Oldhouse) "r" = (/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse) "s" = (/turf/simulated/floor/wood{icon_state = "wood_broken4"},/area/submap/Oldhouse) -"t" = (/obj/structure/table/woodentable,/obj/item/weapon/paper,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/wood,/area/submap/Oldhouse) +"t" = (/obj/structure/table/woodentable,/obj/item/paper,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/wood,/area/submap/Oldhouse) "u" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wood,/area/submap/Oldhouse) "v" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 1},/turf/simulated/floor/wood,/area/submap/Oldhouse) "w" = (/obj/item/stack/material/wood,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/Oldhouse) "x" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/wood{icon_state = "wood_broken6"},/area/submap/Oldhouse) "y" = (/obj/effect/decal/remains/mouse,/turf/simulated/floor/wood,/area/submap/Oldhouse) "z" = (/obj/structure/table/woodentable,/obj/item/stack/material/wood,/turf/simulated/floor/wood,/area/submap/Oldhouse) -"A" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/wood,/area/submap/Oldhouse) +"A" = (/obj/structure/bed,/obj/item/bedsheet,/turf/simulated/floor/wood,/area/submap/Oldhouse) "B" = (/obj/structure/bed/chair/comfy/teal,/turf/simulated/floor/wood,/area/submap/Oldhouse) "C" = (/obj/structure/bookcase,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse) "D" = (/obj/structure/table,/turf/simulated/floor/wood,/area/submap/Oldhouse) "E" = (/obj/structure/table/woodentable,/obj/item/trash/candle,/turf/simulated/floor/wood,/area/submap/Oldhouse) -"F" = (/obj/structure/table/woodentable,/obj/item/weapon/pen/blue,/turf/simulated/floor/wood,/area/submap/Oldhouse) -"G" = (/obj/item/weapon/reagent_containers/food/snacks/chips,/obj/item/weapon/reagent_containers/food/snacks/chips,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse) -"H" = (/obj/structure/table/woodentable,/obj/item/weapon/flame/candle,/turf/simulated/floor/wood,/area/submap/Oldhouse) +"F" = (/obj/structure/table/woodentable,/obj/item/pen/blue,/turf/simulated/floor/wood,/area/submap/Oldhouse) +"G" = (/obj/item/reagent_containers/food/snacks/chips,/obj/item/reagent_containers/food/snacks/chips,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse) +"H" = (/obj/structure/table/woodentable,/obj/item/flame/candle,/turf/simulated/floor/wood,/area/submap/Oldhouse) "I" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 8},/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse) "J" = (/obj/effect/decal/remains/mouse,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse) -"K" = (/obj/structure/table/woodentable,/obj/item/weapon/paper,/obj/item/weapon/paper,/turf/simulated/floor/wood,/area/submap/Oldhouse) -"L" = (/obj/structure/table/woodentable,/obj/item/weapon/paper/crumpled,/turf/simulated/floor/wood,/area/submap/Oldhouse) +"K" = (/obj/structure/table/woodentable,/obj/item/paper,/obj/item/paper,/turf/simulated/floor/wood,/area/submap/Oldhouse) +"L" = (/obj/structure/table/woodentable,/obj/item/paper/crumpled,/turf/simulated/floor/wood,/area/submap/Oldhouse) "M" = (/obj/structure/frame,/turf/simulated/floor/wood,/area/submap/Oldhouse) "N" = (/mob/living/simple_mob/animal/giant_spider{attack_armor_pen = 100; attacktext = list("lightly bonked"); desc = "Furry and brown, this spider is so goddamn fat you're surprised it even moves around."; faction = "neutral"; health = 400; melee_damage_lower = 1; melee_damage_upper = 3; melee_miss_chance = 30; movement_cooldown = 8; name = "Mr. Tuddly"},/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse) "O" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse) -"P" = (/obj/item/weapon/circuitboard/papershredder,/turf/simulated/floor/wood,/area/submap/Oldhouse) -"Q" = (/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers,/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse) +"P" = (/obj/item/circuitboard/papershredder,/turf/simulated/floor/wood,/area/submap/Oldhouse) +"Q" = (/obj/item/reagent_containers/food/snacks/cheesiehonkers,/obj/item/reagent_containers/food/snacks/cheesiehonkers,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse) "R" = (/obj/effect/decal/cleanable/spiderling_remains,/turf/simulated/floor/wood,/area/submap/Oldhouse) -"S" = (/obj/item/weapon/paper/crumpled,/turf/simulated/floor/wood,/area/submap/Oldhouse) -"T" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/backpack/satchel,/turf/simulated/floor/wood,/area/submap/Oldhouse) +"S" = (/obj/item/paper/crumpled,/turf/simulated/floor/wood,/area/submap/Oldhouse) +"T" = (/obj/structure/table/woodentable,/obj/item/storage/backpack/satchel,/turf/simulated/floor/wood,/area/submap/Oldhouse) "U" = (/obj/structure/table/rack,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/clothing/head/hood/winter,/obj/item/clothing/head/hood/winter,/turf/simulated/floor/wood,/area/submap/Oldhouse) -"V" = (/obj/item/device/flashlight,/turf/simulated/floor/wood,/area/submap/Oldhouse) +"V" = (/obj/item/flashlight,/turf/simulated/floor/wood,/area/submap/Oldhouse) "W" = (/obj/structure/table/rack,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/shoes/boots/winter,/turf/simulated/floor/wood,/area/submap/Oldhouse) "X" = (/obj/structure/coatrack,/turf/simulated/floor/wood,/area/submap/Oldhouse) "Y" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood{icon_state = "wood_broken6"},/area/submap/Oldhouse) diff --git a/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm b/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm index 56622df92fc..bdb7cdb825c 100644 --- a/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm @@ -80,7 +80,7 @@ /area/submap/Oldhouse) "at" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper, +/obj/item/paper, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/wood, /area/submap/Oldhouse) @@ -117,7 +117,7 @@ /area/submap/Oldhouse) "aA" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/wood, /area/submap/Oldhouse) "aB" = ( @@ -139,17 +139,17 @@ /area/submap/Oldhouse) "aF" = ( /obj/structure/table/woodentable, -/obj/item/weapon/pen/blue, +/obj/item/pen/blue, /turf/simulated/floor/wood, /area/submap/Oldhouse) "aG" = ( -/obj/item/weapon/reagent_containers/food/snacks/chips, -/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, /turf/simulated/floor/carpet/turcarpet, /area/submap/Oldhouse) "aH" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /turf/simulated/floor/wood, /area/submap/Oldhouse) "aI" = ( @@ -165,13 +165,13 @@ /area/submap/Oldhouse) "aK" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper, -/obj/item/weapon/paper, +/obj/item/paper, +/obj/item/paper, /turf/simulated/floor/wood, /area/submap/Oldhouse) "aL" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper/crumpled, +/obj/item/paper/crumpled, /turf/simulated/floor/wood, /area/submap/Oldhouse) "aM" = ( @@ -199,12 +199,12 @@ /turf/simulated/floor/carpet/turcarpet, /area/submap/Oldhouse) "aP" = ( -/obj/item/weapon/circuitboard/papershredder, +/obj/item/circuitboard/papershredder, /turf/simulated/floor/wood, /area/submap/Oldhouse) "aQ" = ( -/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers, -/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers, +/obj/item/reagent_containers/food/snacks/cheesiehonkers, +/obj/item/reagent_containers/food/snacks/cheesiehonkers, /turf/simulated/floor/carpet/turcarpet, /area/submap/Oldhouse) "aR" = ( @@ -212,12 +212,12 @@ /turf/simulated/floor/wood, /area/submap/Oldhouse) "aS" = ( -/obj/item/weapon/paper/crumpled, +/obj/item/paper/crumpled, /turf/simulated/floor/wood, /area/submap/Oldhouse) "aT" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/backpack/satchel, +/obj/item/storage/backpack/satchel, /turf/simulated/floor/wood, /area/submap/Oldhouse) "aU" = ( @@ -229,7 +229,7 @@ /turf/simulated/floor/wood, /area/submap/Oldhouse) "aV" = ( -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/wood, /area/submap/Oldhouse) "aW" = ( diff --git a/maps/submaps/surface_submaps/plains/Peninsula.dmm b/maps/submaps/surface_submaps/plains/Peninsula.dmm index b33fee45bb8..ae188f1f1af 100644 --- a/maps/submaps/surface_submaps/plains/Peninsula.dmm +++ b/maps/submaps/surface_submaps/plains/Peninsula.dmm @@ -20,13 +20,13 @@ /area/submap/Peninsula) "g" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/template_noop, /area/submap/Peninsula) "h" = ( /obj/structure/table/woodentable, -/obj/item/weapon/cell/device, -/obj/item/weapon/cell/device, +/obj/item/cell/device, +/obj/item/cell/device, /turf/template_noop, /area/submap/Peninsula) "i" = ( diff --git a/maps/submaps/surface_submaps/plains/PooledR.dmm b/maps/submaps/surface_submaps/plains/PooledR.dmm index 93d8a3f09fa..3fb5a8df752 100644 --- a/maps/submaps/surface_submaps/plains/PooledR.dmm +++ b/maps/submaps/surface_submaps/plains/PooledR.dmm @@ -3,9 +3,9 @@ "c" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/PooledR) "d" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/submap/PooledR) "e" = (/obj/structure/table/woodentable,/turf/template_noop,/area/submap/PooledR) -"f" = (/obj/structure/table/woodentable,/obj/item/weapon/material/knife,/turf/template_noop,/area/submap/PooledR) +"f" = (/obj/structure/table/woodentable,/obj/item/material/knife,/turf/template_noop,/area/submap/PooledR) "g" = (/obj/structure/flora/ausbushes/palebush,/turf/template_noop,/area/submap/PooledR) -"h" = (/obj/structure/table/woodentable,/obj/item/weapon/gun/energy/retro{cell_type = /obj/item/weapon/cell/device/weapon/empty},/turf/template_noop,/area/submap/PooledR) +"h" = (/obj/structure/table/woodentable,/obj/item/gun/energy/retro{cell_type = /obj/item/cell/device/weapon/empty},/turf/template_noop,/area/submap/PooledR) "i" = (/obj/structure/flora/ausbushes/reedbush,/turf/template_noop,/area/submap/PooledR) "j" = (/turf/simulated/floor/outdoors/rocks,/area/submap/PooledR) "k" = (/obj/structure/flora/ausbushes,/turf/template_noop,/area/submap/PooledR) diff --git a/maps/submaps/surface_submaps/plains/PooledR_vr.dmm b/maps/submaps/surface_submaps/plains/PooledR_vr.dmm index be2aac0d21f..ecd69b2a2c9 100644 --- a/maps/submaps/surface_submaps/plains/PooledR_vr.dmm +++ b/maps/submaps/surface_submaps/plains/PooledR_vr.dmm @@ -18,7 +18,7 @@ /area/submap/PooledR) "f" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /turf/template_noop, /area/submap/PooledR) "g" = ( @@ -27,8 +27,8 @@ /area/submap/PooledR) "h" = ( /obj/structure/table/woodentable, -/obj/item/weapon/gun/energy/retro{ - cell_type = /obj/item/weapon/cell/device/weapon/empty +/obj/item/gun/energy/retro{ + cell_type = /obj/item/cell/device/weapon/empty }, /turf/template_noop, /area/submap/PooledR) diff --git a/maps/submaps/surface_submaps/plains/Shakden.dmm b/maps/submaps/surface_submaps/plains/Shakden.dmm index 86f2057db1e..e512a8e47c2 100644 --- a/maps/submaps/surface_submaps/plains/Shakden.dmm +++ b/maps/submaps/surface_submaps/plains/Shakden.dmm @@ -3,12 +3,12 @@ "c" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/Shakden) "d" = (/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Shakden) "e" = (/obj/effect/decal/remains/mouse,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Shakden) -"f" = (/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Shakden) +"f" = (/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Shakden) "g" = (/mob/living/simple_mob/animal/sif/shantak/retaliate,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Shakden) -"h" = (/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Shakden) +"h" = (/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Shakden) "i" = (/mob/living/simple_mob/animal/sif/shantak/retaliate,/turf/simulated/floor/outdoors/dirt,/area/submap/Shakden) -"j" = (/obj/item/weapon/reagent_containers/food/snacks/meat,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Shakden) -"k" = (/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/reagent_containers/food/snacks/meat,/obj/item/weapon/material/knife/hook,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Shakden) +"j" = (/obj/item/reagent_containers/food/snacks/meat,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Shakden) +"k" = (/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/item/reagent_containers/food/snacks/meat,/obj/item/material/knife/hook,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Shakden) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaa diff --git a/maps/submaps/surface_submaps/plains/Shakden_vr.dmm b/maps/submaps/surface_submaps/plains/Shakden_vr.dmm index 3676259c873..175b12fbb07 100644 --- a/maps/submaps/surface_submaps/plains/Shakden_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Shakden_vr.dmm @@ -15,19 +15,19 @@ }, /area/submap/Shakden) "f" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/outdoors/dirt/virgo3b{ outdoors = 0 }, /area/submap/Shakden) "g" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/outdoors/dirt/virgo3b{ outdoors = 0 }, @@ -44,17 +44,17 @@ }, /area/submap/Shakden) "j" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/outdoors/dirt/virgo3b{ outdoors = 0 }, /area/submap/Shakden) "k" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/material/knife/hook, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/material/knife/hook, /turf/simulated/floor/outdoors/dirt/virgo3b{ outdoors = 0 }, diff --git a/maps/submaps/surface_submaps/plains/Smol3.dmm b/maps/submaps/surface_submaps/plains/Smol3.dmm index 4008262f5d5..fb8c898e6df 100644 --- a/maps/submaps/surface_submaps/plains/Smol3.dmm +++ b/maps/submaps/surface_submaps/plains/Smol3.dmm @@ -17,30 +17,30 @@ /area/submap/Smol3) "f" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/Smol3) "g" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/chips, -/obj/item/weapon/reagent_containers/food/snacks/chips, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/Smol3) "h" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper{ +/obj/item/paper{ desc = "Lamen's Hunter Shack! Selling freshly hunted meat for six thalers a slab. Support Locale hunters! Also selling Getmore Products for 3 thalers a bag, or 2 thalers for a bottle of water. Please place all payments into the nearbye bag." }, /turf/simulated/floor/outdoors/dirt/virgo3b, @@ -51,7 +51,7 @@ /area/submap/Smol3) "j" = ( /obj/structure/table/woodentable, -/obj/item/weapon/spacecash/c200, +/obj/item/spacecash/c200, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/Smol3) diff --git a/maps/submaps/surface_submaps/plains/SupplyDrop2.dmm b/maps/submaps/surface_submaps/plains/SupplyDrop2.dmm index 6375aedaa58..860ad04e181 100644 --- a/maps/submaps/surface_submaps/plains/SupplyDrop2.dmm +++ b/maps/submaps/surface_submaps/plains/SupplyDrop2.dmm @@ -20,14 +20,14 @@ /turf/simulated/floor/reinforced/virgo3b, /area/submap/SupplyDrop2) "h" = ( -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/reinforced/virgo3b, /area/submap/SupplyDrop2) "i" = ( /obj/structure/loot_pile/maint/technical, -/obj/item/device/gps/internal/poi, -/obj/item/weapon/cell/device/weapon/empty, -/obj/item/weapon/cell/device/weapon/empty, +/obj/item/gps/internal/poi, +/obj/item/cell/device/weapon/empty, +/obj/item/cell/device/weapon/empty, /turf/simulated/floor/reinforced/virgo3b, /area/submap/SupplyDrop2) "j" = ( diff --git a/maps/submaps/surface_submaps/plains/Thiefc.dmm b/maps/submaps/surface_submaps/plains/Thiefc.dmm index a19b8e603e7..74585d3c7ad 100644 --- a/maps/submaps/surface_submaps/plains/Thiefc.dmm +++ b/maps/submaps/surface_submaps/plains/Thiefc.dmm @@ -1,18 +1,18 @@ "a" = (/turf/template_noop,/area/template_noop) "b" = (/turf/template_noop,/area/submap/Thiefc) "c" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/Thiefc) -"d" = (/obj/structure/ore_box,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/coal,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) -"e" = (/obj/structure/closet/crate,/obj/item/weapon/extinguisher,/obj/item/weapon/extinguisher,/obj/item/weapon/extinguisher,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) +"d" = (/obj/structure/ore_box,/obj/item/ore/coal,/obj/item/ore/coal,/obj/item/ore/coal,/obj/item/ore/coal,/obj/item/ore/coal,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) +"e" = (/obj/structure/closet/crate,/obj/item/extinguisher,/obj/item/extinguisher,/obj/item/extinguisher,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) "f" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) -"g" = (/obj/item/weapon/ore/coal,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/coal,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) +"g" = (/obj/item/ore/coal,/obj/item/ore/coal,/obj/item/ore/coal,/obj/item/ore/coal,/obj/item/ore/coal,/obj/item/ore/coal,/obj/item/ore/coal,/obj/item/ore/coal,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) "h" = (/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) -"i" = (/obj/structure/closet/crate,/obj/item/weapon/lipstick,/obj/item/weapon/lipstick/black,/obj/item/weapon/lipstick/random,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) -"j" = (/obj/structure/table/steel,/obj/item/weapon/beartrap,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) +"i" = (/obj/structure/closet/crate,/obj/item/lipstick,/obj/item/lipstick/black,/obj/item/lipstick/random,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) +"j" = (/obj/structure/table/steel,/obj/item/beartrap,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) "k" = (/obj/vehicle/train/trolley,/obj/random/firstaid,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) -"l" = (/obj/structure/closet/crate,/obj/item/weapon/folder/blue,/obj/item/weapon/folder/red,/obj/item/weapon/folder/white,/obj/item/weapon/folder/yellow,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) -"m" = (/obj/structure/table/steel,/obj/item/weapon/paper{desc = "This is some bullshit. First chance we got to knick something that looks half decent turns out to be mostly junk. And now we're getting calls that the other stash we've got has got a spider problem. Fuck this, Between the shitty weather, The pissed of bugs, And now apparently some NT goon running around in the area there's hardly enough reason to stick around. I'm telling Carl I'm out tommorow."; name = "Note"},/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) +"l" = (/obj/structure/closet/crate,/obj/item/folder/blue,/obj/item/folder/red,/obj/item/folder/white,/obj/item/folder/yellow,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) +"m" = (/obj/structure/table/steel,/obj/item/paper{desc = "This is some bullshit. First chance we got to knick something that looks half decent turns out to be mostly junk. And now we're getting calls that the other stash we've got has got a spider problem. Fuck this, Between the shitty weather, The pissed of bugs, And now apparently some NT goon running around in the area there's hardly enough reason to stick around. I'm telling Carl I'm out tommorow."; name = "Note"},/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) "n" = (/obj/vehicle/train/trolley,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) -"o" = (/obj/structure/closet/crate,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) +"o" = (/obj/structure/closet/crate,/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) "p" = (/obj/structure/closet/crate,/obj/item/ammo_magazine/ammo_box/b12g,/obj/item/ammo_magazine/ammo_box/b12g/practice,/obj/random/projectile/scrapped_gun,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) (1,1,1) = {" diff --git a/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm b/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm index 5528c6029ca..53fdfc348de 100644 --- a/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm @@ -10,20 +10,20 @@ /area/submap/Thiefc) "d" = ( /obj/structure/ore_box, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/coal, +/obj/item/ore/coal, +/obj/item/ore/coal, +/obj/item/ore/coal, +/obj/item/ore/coal, +/obj/item/ore/coal, /turf/simulated/floor/outdoors/dirt/virgo3b{ outdoors = 0 }, /area/submap/Thiefc) "e" = ( /obj/structure/closet/crate, -/obj/item/weapon/extinguisher, -/obj/item/weapon/extinguisher, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, +/obj/item/extinguisher, +/obj/item/extinguisher, /turf/simulated/floor/outdoors/dirt/virgo3b{ outdoors = 0 }, @@ -35,14 +35,14 @@ }, /area/submap/Thiefc) "g" = ( -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/coal, -/obj/item/weapon/ore/coal, +/obj/item/ore/coal, +/obj/item/ore/coal, +/obj/item/ore/coal, +/obj/item/ore/coal, +/obj/item/ore/coal, +/obj/item/ore/coal, +/obj/item/ore/coal, +/obj/item/ore/coal, /turf/simulated/floor/outdoors/dirt/virgo3b{ outdoors = 0 }, @@ -54,17 +54,17 @@ /area/submap/Thiefc) "i" = ( /obj/structure/closet/crate, -/obj/item/weapon/lipstick, -/obj/item/weapon/lipstick/black, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick, +/obj/item/lipstick/black, +/obj/item/lipstick/random, /turf/simulated/floor/outdoors/dirt/virgo3b{ outdoors = 0 }, /area/submap/Thiefc) "j" = ( /obj/structure/table/steel, -/obj/item/weapon/beartrap, -/obj/item/device/survivalcapsule, +/obj/item/beartrap, +/obj/item/survivalcapsule, /turf/simulated/floor/outdoors/dirt/virgo3b{ outdoors = 0 }, @@ -81,16 +81,16 @@ /area/submap/Thiefc) "l" = ( /obj/structure/closet/crate, -/obj/item/device/nif, -/obj/item/device/nif/bad, -/obj/item/device/nif/bad, +/obj/item/nif, +/obj/item/nif/bad, +/obj/item/nif/bad, /turf/simulated/floor/outdoors/dirt/virgo3b{ outdoors = 0 }, /area/submap/Thiefc) "m" = ( /obj/structure/table/steel, -/obj/item/weapon/paper{ +/obj/item/paper{ desc = "This is some bullshit. First chance we got to knick something that looks half decent turns out to be mostly junk. And now we're getting calls that the other stash we've got has got a spider problem. Fuck this, Between the shitty weather, The pissed of bugs, And now apparently some NT goon running around in the area there's hardly enough reason to stick around. I'm telling Carl I'm out tommorow."; name = "Note" }, @@ -108,11 +108,11 @@ /area/submap/Thiefc) "o" = ( /obj/structure/closet/crate, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/device/perfect_tele/one_beacon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/perfect_tele/one_beacon, /turf/simulated/floor/outdoors/dirt/virgo3b{ outdoors = 0 }, diff --git a/maps/submaps/surface_submaps/plains/VRDen.dmm b/maps/submaps/surface_submaps/plains/VRDen.dmm index 4ef2d75af52..2b623697ffc 100644 --- a/maps/submaps/surface_submaps/plains/VRDen.dmm +++ b/maps/submaps/surface_submaps/plains/VRDen.dmm @@ -58,7 +58,7 @@ name = "plastic table frame" }, /obj/item/integrated_circuit/memory, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "To: Whoever reads it\[br]From: Simulant\[br]Went away to grab some spare parts, won't return for couple weeks. Can't support larger scale sims without machines I lost yesterday. Please don't touch my stuff, while I'm gone."; name = "note" }, @@ -126,7 +126,7 @@ /obj/structure/table/standard{ name = "plastic table frame" }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "your maps suck"; name = "dissatisfied letter" }, @@ -183,7 +183,7 @@ /obj/machinery/telecomms/server{ name = "Server" }, -/obj/item/device/gps/internal/poi, +/obj/item/gps/internal/poi, /turf/simulated/floor/tiled/virgo3b, /area/submap/VRDen) "F" = ( @@ -208,7 +208,7 @@ /area/submap/VRDen) "K" = ( /obj/effect/decal/remains/posi, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "pain sim on your hardware is top-notch, 10/10, would be burned alive again"; name = "satisfied letter" }, @@ -249,7 +249,7 @@ /obj/structure/toilet{ dir = 8 }, -/obj/item/device/integrated_electronics/debugger, +/obj/item/integrated_electronics/debugger, /obj/machinery/light{ dir = 1 }, diff --git a/maps/submaps/surface_submaps/plains/bonfire.dmm b/maps/submaps/surface_submaps/plains/bonfire.dmm index de4bb23141d..0266631fcab 100644 --- a/maps/submaps/surface_submaps/plains/bonfire.dmm +++ b/maps/submaps/surface_submaps/plains/bonfire.dmm @@ -10,15 +10,15 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/bonfire) "d" = ( -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, /turf/template_noop, /area/submap/bonfire) "e" = ( -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/reagent_containers/food/drinks/bottle/orangejuice, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/bonfire) "f" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/bonfire) "g" = ( @@ -26,7 +26,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/bonfire) "h" = ( -/obj/item/weapon/material/knife/machete, +/obj/item/material/knife/machete, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/bonfire) "i" = ( diff --git a/maps/submaps/surface_submaps/plains/camp1.dmm b/maps/submaps/surface_submaps/plains/camp1.dmm index 8fefe802616..7ff9ed39c3f 100644 --- a/maps/submaps/surface_submaps/plains/camp1.dmm +++ b/maps/submaps/surface_submaps/plains/camp1.dmm @@ -19,7 +19,7 @@ }, /area/submap/camp1) "e" = ( -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/outdoors/dirt/virgo3b{ outdoors = 0 }, @@ -43,7 +43,7 @@ /area/submap/camp1) "i" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/crossbow, +/obj/item/gun/launcher/crossbow, /obj/item/stack/rods{ amount = 17 }, @@ -65,7 +65,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/camp1) "m" = ( -/obj/item/weapon/material/knife/machete/hatchet, +/obj/item/material/knife/machete/hatchet, /turf/template_noop, /area/template_noop) "n" = ( @@ -73,7 +73,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/camp1) "o" = ( -/obj/item/weapon/flame/lighter, +/obj/item/flame/lighter, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/camp1) diff --git a/maps/submaps/surface_submaps/plains/camp1_vr.dmm b/maps/submaps/surface_submaps/plains/camp1_vr.dmm index 498b5fae0a1..7bb76500e83 100644 --- a/maps/submaps/surface_submaps/plains/camp1_vr.dmm +++ b/maps/submaps/surface_submaps/plains/camp1_vr.dmm @@ -19,7 +19,7 @@ }, /area/submap/camp1) "e" = ( -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/outdoors/dirt/virgo3b{ outdoors = 0 }, @@ -43,7 +43,7 @@ /area/submap/camp1) "i" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/crossbow, +/obj/item/gun/launcher/crossbow, /obj/item/stack/rods{ amount = 17 }, @@ -65,11 +65,11 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/camp1) "m" = ( -/obj/item/weapon/material/knife/machete/hatchet, +/obj/item/material/knife/machete/hatchet, /turf/template_noop, /area/template_noop) "n" = ( -/obj/item/weapon/flame/lighter, +/obj/item/flame/lighter, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/camp1) "y" = ( diff --git a/maps/submaps/surface_submaps/plains/construction1.dmm b/maps/submaps/surface_submaps/plains/construction1.dmm index e04528b1963..7b14a045742 100644 --- a/maps/submaps/surface_submaps/plains/construction1.dmm +++ b/maps/submaps/surface_submaps/plains/construction1.dmm @@ -37,7 +37,7 @@ /turf/simulated/floor/tiled/external/virgo3b, /area/submap/construction1) "k" = ( -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/plating/external/virgo3b, /area/submap/construction1) "l" = ( @@ -48,7 +48,7 @@ /turf/simulated/floor/plating/external/virgo3b, /area/submap/construction1) "n" = ( -/obj/item/weapon/pickaxe/drill, +/obj/item/pickaxe/drill, /turf/simulated/floor/outdoors/rocks/virgo3b, /area/template_noop) "o" = ( @@ -76,11 +76,11 @@ /turf/simulated/floor/plating/external/virgo3b, /area/submap/construction1) "u" = ( -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/plating/external/virgo3b, /area/submap/construction1) "v" = ( -/obj/item/weapon/airlock_electronics, +/obj/item/airlock_electronics, /turf/simulated/floor/tiled/external/virgo3b, /area/submap/construction1) "w" = ( @@ -92,7 +92,7 @@ /turf/simulated/floor/tiled/external/virgo3b, /area/submap/construction1) "y" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/plating/external/virgo3b, /area/submap/construction1) "z" = ( @@ -100,19 +100,19 @@ /turf/simulated/floor/tiled/external/virgo3b, /area/submap/construction1) "A" = ( -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/simulated/floor/plating/external/virgo3b, /area/submap/construction1) "B" = ( -/obj/item/weapon/airlock_electronics, +/obj/item/airlock_electronics, /turf/simulated/floor/plating/external/virgo3b, /area/submap/construction1) "C" = ( -/obj/item/weapon/weldingtool/largetank, +/obj/item/weldingtool/largetank, /turf/simulated/floor/tiled/external/virgo3b, /area/submap/construction1) "D" = ( -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /turf/simulated/floor/plating/external/virgo3b, /area/submap/construction1) "E" = ( diff --git a/maps/submaps/surface_submaps/plains/dogbase.dmm b/maps/submaps/surface_submaps/plains/dogbase.dmm index b6522822190..89cec92c668 100644 --- a/maps/submaps/surface_submaps/plains/dogbase.dmm +++ b/maps/submaps/surface_submaps/plains/dogbase.dmm @@ -39,7 +39,7 @@ /obj/effect/decal/cleanable/filth, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/bone, +/obj/item/bone, /obj/random/maintenance/security, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/DogBase) @@ -53,7 +53,7 @@ /turf/simulated/floor/plating/external/virgo3b, /area/submap/DogBase) "bw" = ( -/obj/item/weapon/storage/belt/janitor, +/obj/item/storage/belt/janitor, /obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) @@ -156,7 +156,7 @@ /obj/effect/decal/cleanable/filth, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/bone/ribs, +/obj/item/bone/ribs, /obj/random/maintenance/research, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/DogBase) @@ -251,7 +251,7 @@ /area/submap/DogBase) "np" = ( /obj/structure/table/woodentable, -/obj/item/weapon/gun/projectile/pistol, +/obj/item/gun/projectile/pistol, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) "oW" = ( @@ -261,7 +261,7 @@ /area/template_noop) "pR" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -289,13 +289,13 @@ /obj/structure/dogbed, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/bone, +/obj/item/bone, /obj/random/maintenance/security, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/DogBase) "qO" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -474,7 +474,7 @@ /area/submap/DogBase) "BA" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) "BB" = ( @@ -484,7 +484,7 @@ /area/submap/DogBase) "Ce" = ( /obj/structure/janitorialcart, -/obj/item/weapon/storage/bag/trash, +/obj/item/storage/bag/trash, /obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) @@ -498,7 +498,7 @@ /obj/structure/dogbed, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/bone, +/obj/item/bone, /obj/random/contraband/nofail, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/DogBase) @@ -668,13 +668,13 @@ /area/submap/DogBase) "Ok" = ( /obj/structure/table/woodentable, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) "Ol" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/bone/leg, +/obj/item/bone/leg, /mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ desc = "The biggest and baddest guard dog around."; faction = "syndicate"; @@ -754,7 +754,7 @@ /area/template_noop) "Rz" = ( /obj/structure/table/woodentable, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /obj/random/contraband/nofail, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) @@ -818,7 +818,7 @@ /area/submap/DogBase) "Wu" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -880,7 +880,7 @@ /area/submap/DogBase) "ZK" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "Unknown APC"; pixel_x = -24 diff --git a/maps/submaps/surface_submaps/plains/drgnplateu.dmm b/maps/submaps/surface_submaps/plains/drgnplateu.dmm index 817f04be5cd..f46b33bec0e 100644 --- a/maps/submaps/surface_submaps/plains/drgnplateu.dmm +++ b/maps/submaps/surface_submaps/plains/drgnplateu.dmm @@ -17,16 +17,16 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/drgnplateu) "cV" = ( -/obj/item/weapon/digestion_remains/skull/tajaran, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains/skull/tajaran, +/obj/item/digestion_remains{ pixel_x = 19; pixel_y = 1 }, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains{ pixel_x = 8; pixel_y = 1 }, -/obj/item/weapon/digestion_remains, +/obj/item/digestion_remains, /obj/item/clothing/accessory/collar/holo/indigestible, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/drgnplateu) @@ -43,15 +43,15 @@ }, /obj/item/clothing/gloves/ring/material/gold, /obj/item/clothing/ears/earring/stud/gold, -/obj/item/weapon/gun/projectile/deagle/gold{ +/obj/item/gun/projectile/deagle/gold{ pixel_x = -11; pixel_y = -22 }, /turf/simulated/floor/outdoors/grass/sif/forest, /area/submap/drgnplateu) "ez" = ( -/obj/item/weapon/digestion_remains/ribcage, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains/ribcage, +/obj/item/digestion_remains{ pixel_x = 19; pixel_y = 1 }, @@ -59,8 +59,8 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/drgnplateu) "fj" = ( -/obj/item/weapon/digestion_remains/ribcage, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains/ribcage, +/obj/item/digestion_remains{ pixel_x = 8; pixel_y = 7 }, @@ -86,11 +86,11 @@ }, /obj/structure/flora/grass/green, /obj/item/clothing/accessory/medal/solgov/gold/sun, -/obj/item/weapon/pickaxe/gold{ +/obj/item/pickaxe/gold{ pixel_x = -12; pixel_y = 9 }, -/obj/item/weapon/reagent_containers/food/drinks/golden_cup{ +/obj/item/reagent_containers/food/drinks/golden_cup{ pixel_x = -10; pixel_y = -5 }, @@ -126,7 +126,7 @@ /obj/item/instrument/violin/golden{ pixel_x = 7 }, -/obj/item/weapon/flame/lighter/zippo/gold, +/obj/item/flame/lighter/zippo/gold, /turf/simulated/floor/outdoors/grass/sif/forest, /area/submap/drgnplateu) "mw" = ( @@ -134,24 +134,24 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/drgnplateu) "mB" = ( -/obj/item/weapon/material/twohanded/baseballbat/gold, +/obj/item/material/twohanded/baseballbat/gold, /turf/simulated/floor/outdoors/grass/sif/forest, /area/submap/drgnplateu) "mX" = ( -/obj/item/weapon/digestion_remains/skull/unknown/anthro, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains/skull/unknown/anthro, +/obj/item/digestion_remains{ pixel_x = 8; pixel_y = 7 }, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains{ pixel_x = 19; pixel_y = -2 }, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains{ pixel_x = 19; pixel_y = -11 }, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains{ pixel_x = 19; pixel_y = 1 }, @@ -164,8 +164,8 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/drgnplateu) "ni" = ( -/obj/item/weapon/digestion_remains/skull/unknown/anthro, -/obj/item/weapon/digestion_remains/ribcage, +/obj/item/digestion_remains/skull/unknown/anthro, +/obj/item/digestion_remains/ribcage, /obj/effect/decal/cleanable/liquid_fuel, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/drgnplateu) @@ -192,7 +192,7 @@ /turf/template_noop, /area/template_noop) "xd" = ( -/obj/item/weapon/digestion_remains/skull/nevrean, +/obj/item/digestion_remains/skull/nevrean, /obj/effect/decal/cleanable/filth, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/drgnplateu) @@ -203,12 +203,12 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/drgnplateu) "zl" = ( -/obj/item/weapon/digestion_remains/skull/akula, +/obj/item/digestion_remains/skull/akula, /obj/effect/decal/cleanable/liquid_fuel, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/drgnplateu) "zm" = ( -/obj/item/weapon/digestion_remains, +/obj/item/digestion_remains, /obj/effect/decal/cleanable/filth, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/drgnplateu) @@ -225,14 +225,14 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/drgnplateu) "Cu" = ( -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains{ pixel_x = 8 }, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains{ pixel_x = 8; pixel_y = 7 }, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains{ pixel_x = 19; pixel_y = 1 }, @@ -240,8 +240,8 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/drgnplateu) "FT" = ( -/obj/item/weapon/digestion_remains/ribcage, -/obj/item/weapon/digestion_remains/ribcage{ +/obj/item/digestion_remains/ribcage, +/obj/item/digestion_remains/ribcage{ pixel_x = 9; pixel_y = 14 }, @@ -263,7 +263,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/drgnplateu) "Jz" = ( -/obj/item/weapon/digestion_remains/skull/unknown/anthro, +/obj/item/digestion_remains/skull/unknown/anthro, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/drgnplateu) "JJ" = ( @@ -299,9 +299,9 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/drgnplateu) "Nj" = ( -/obj/item/weapon/digestion_remains/skull/unathi, -/obj/item/weapon/digestion_remains, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains/skull/unathi, +/obj/item/digestion_remains, +/obj/item/digestion_remains{ pixel_x = 8; pixel_y = 7 }, @@ -323,7 +323,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/drgnplateu) "Ra" = ( -/obj/item/weapon/digestion_remains/skull/zorren, +/obj/item/digestion_remains/skull/zorren, /obj/item/clothing/accessory/collar/holo/indigestible, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/drgnplateu) diff --git a/maps/submaps/surface_submaps/plains/emptycabin.dmm b/maps/submaps/surface_submaps/plains/emptycabin.dmm index 707aaa9bab8..c6fb52b329a 100644 --- a/maps/submaps/surface_submaps/plains/emptycabin.dmm +++ b/maps/submaps/surface_submaps/plains/emptycabin.dmm @@ -4,8 +4,8 @@ /area/template_noop) "b" = ( /obj/effect/decal/cleanable/filth, -/obj/item/weapon/bone/arm, -/obj/item/weapon/bone/skull/unathi, +/obj/item/bone/arm, +/obj/item/bone/skull/unathi, /turf/simulated/floor/wood/sif/virgo3b, /area/submap/EmptyCabin) "c" = ( @@ -15,9 +15,9 @@ /area/submap/EmptyCabin) "d" = ( /obj/structure/closet/wardrobe, -/obj/item/weapon/material/fishing_rod/modern, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/lunchbox/nymph/filled, +/obj/item/material/fishing_rod/modern, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/lunchbox/nymph/filled, /turf/simulated/floor/wood/sif/virgo3b, /area/submap/EmptyCabin) "e" = ( @@ -31,7 +31,7 @@ /area/submap/EmptyCabin) "g" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, +/obj/item/bedsheet/purpledouble, /turf/simulated/floor/wood/sif/virgo3b, /area/submap/EmptyCabin) "h" = ( @@ -74,8 +74,8 @@ /area/submap/EmptyCabin) "n" = ( /obj/structure/table/sifwoodentable, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/paper/crumpled/bloody{ +/obj/item/storage/fancy/candle_box, +/obj/item/paper/crumpled/bloody{ info = "I found an otie while picking flowers today. He's so cute! I took him back home, and he seemed quite happy to share food with me. He really likes fish. Though, he never really seems to not be hungry..." }, /turf/simulated/floor/wood/sif/virgo3b, @@ -146,11 +146,11 @@ /area/submap/EmptyCabin) "L" = ( /obj/structure/table/sifwoodentable, -/obj/item/weapon/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, /turf/simulated/floor/wood/sif/virgo3b, /area/submap/EmptyCabin) "M" = ( -/obj/item/weapon/bone/leg, +/obj/item/bone/leg, /turf/simulated/floor/wood/sif/virgo3b, /area/submap/EmptyCabin) "O" = ( @@ -196,7 +196,7 @@ /turf/simulated/floor/wood/sif/virgo3b, /area/submap/EmptyCabin) "X" = ( -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/floor/wood/sif/virgo3b, /area/submap/EmptyCabin) "Z" = ( diff --git a/maps/submaps/surface_submaps/plains/farm1.dmm b/maps/submaps/surface_submaps/plains/farm1.dmm index 58c510ff1cd..0ec2952ea71 100644 --- a/maps/submaps/surface_submaps/plains/farm1.dmm +++ b/maps/submaps/surface_submaps/plains/farm1.dmm @@ -10,10 +10,10 @@ "j" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/simulated/floor/wood,/area/submap/farm1) "k" = (/turf/simulated/floor/wood,/area/submap/farm1) "l" = (/obj/structure/table/marble,/turf/simulated/floor/wood,/area/submap/farm1) -"m" = (/obj/structure/table/marble,/obj/item/weapon/material/kitchen/rollingpin,/turf/simulated/floor/wood,/area/submap/farm1) +"m" = (/obj/structure/table/marble,/obj/item/material/kitchen/rollingpin,/turf/simulated/floor/wood,/area/submap/farm1) "n" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/obj/item/seeds/cornseed,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/farm1) "o" = (/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/farm1) -"p" = (/obj/structure/table/marble,/obj/item/weapon/material/knife,/turf/simulated/floor/wood,/area/submap/farm1) +"p" = (/obj/structure/table/marble,/obj/item/material/knife,/turf/simulated/floor/wood,/area/submap/farm1) "q" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/obj/item/seeds/bluetomatoseed,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/farm1) "r" = (/turf/simulated/floor/outdoors/mud{outdoors = 0},/area/submap/farm1) "s" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/obj/item/seeds/icepepperseed,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/farm1) @@ -21,17 +21,17 @@ "u" = (/obj/machinery/door/window/eastleft,/obj/machinery/door/window/westleft,/turf/simulated/floor/outdoors/dirt,/area/submap/farm1) "v" = (/mob/living/bot/farmbot,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/farm1) "w" = (/obj/structure/sink/puddle,/turf/simulated/floor/outdoors/mud{outdoors = 0},/area/submap/farm1) -"x" = (/obj/item/weapon/material/knife/machete/hatchet,/turf/simulated/floor/outdoors/mud{outdoors = 0},/area/submap/farm1) -"y" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/box/matches,/obj/item/weapon/flame/match,/turf/simulated/floor/wood,/area/submap/farm1) +"x" = (/obj/item/material/knife/machete/hatchet,/turf/simulated/floor/outdoors/mud{outdoors = 0},/area/submap/farm1) +"y" = (/obj/structure/table/woodentable,/obj/item/storage/box/matches,/obj/item/flame/match,/turf/simulated/floor/wood,/area/submap/farm1) "z" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/submap/farm1) "A" = (/obj/item/clothing/shoes/boots/winter/hydro,/obj/item/clothing/suit/storage/hooded/wintercoat/hydro,/turf/simulated/floor/wood,/area/submap/farm1) "B" = (/obj/structure/bed/chair/wood{ icon_state = "wooden_chair"; dir = 8},/turf/simulated/floor/wood,/area/submap/farm1) -"C" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/fancy/candle_box,/turf/simulated/floor/wood,/area/submap/farm1) +"C" = (/obj/structure/table/woodentable,/obj/item/storage/fancy/candle_box,/turf/simulated/floor/wood,/area/submap/farm1) "D" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/obj/item/seeds/wheatseed,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/farm1) "E" = (/obj/structure/closet/crate/bin,/turf/simulated/floor/wood,/area/submap/farm1) "F" = (/obj/machinery/space_heater,/turf/simulated/floor/wood,/area/submap/farm1) -"G" = (/obj/structure/bookcase,/obj/item/weapon/book/manual/hydroponics_pod_people,/turf/simulated/floor/wood,/area/submap/farm1) -"H" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/blue,/turf/simulated/floor/wood,/area/submap/farm1) +"G" = (/obj/structure/bookcase,/obj/item/book/manual/hydroponics_pod_people,/turf/simulated/floor/wood,/area/submap/farm1) +"H" = (/obj/structure/bed/padded,/obj/item/bedsheet/blue,/turf/simulated/floor/wood,/area/submap/farm1) "I" = (/obj/structure/table/woodentable,/obj/item/trash/candle,/turf/simulated/floor/wood,/area/submap/farm1) "J" = (/turf/simulated/floor/outdoors/rocks,/area/submap/farm1) "K" = (/turf/simulated/floor/plating,/area/submap/farm1) diff --git a/maps/submaps/surface_submaps/plains/farm1_vr.dmm b/maps/submaps/surface_submaps/plains/farm1_vr.dmm index cd3ed606cde..606e74d567c 100644 --- a/maps/submaps/surface_submaps/plains/farm1_vr.dmm +++ b/maps/submaps/surface_submaps/plains/farm1_vr.dmm @@ -50,7 +50,7 @@ /area/submap/farm1) "m" = ( /obj/structure/table/marble, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/wood, /area/submap/farm1) "n" = ( @@ -62,7 +62,7 @@ /area/submap/farm1) "p" = ( /obj/structure/table/marble, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /turf/simulated/floor/wood, /area/submap/farm1) "q" = ( @@ -116,15 +116,15 @@ }, /area/submap/farm1) "y" = ( -/obj/item/weapon/material/knife/machete/hatchet, +/obj/item/material/knife/machete/hatchet, /turf/simulated/floor/outdoors/mud/virgo3b{ outdoors = 0 }, /area/submap/farm1) "z" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/matches, -/obj/item/weapon/flame/match, +/obj/item/storage/box/matches, +/obj/item/flame/match, /turf/simulated/floor/wood, /area/submap/farm1) "A" = ( @@ -148,7 +148,7 @@ /area/submap/farm1) "E" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /turf/simulated/floor/wood, /area/submap/farm1) "F" = ( @@ -168,12 +168,12 @@ /area/submap/farm1) "I" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/hydroponics_pod_people, +/obj/item/book/manual/hydroponics_pod_people, /turf/simulated/floor/wood, /area/submap/farm1) "J" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/simulated/floor/wood, /area/submap/farm1) "K" = ( diff --git a/maps/submaps/surface_submaps/plains/greatwolfden.dmm b/maps/submaps/surface_submaps/plains/greatwolfden.dmm index d8ac2577eea..7c7cdea2487 100644 --- a/maps/submaps/surface_submaps/plains/greatwolfden.dmm +++ b/maps/submaps/surface_submaps/plains/greatwolfden.dmm @@ -86,15 +86,15 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/GreatWolfDen) "ju" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat/human, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/GreatWolfDen) "kg" = ( -/obj/item/weapon/bone/skull/unathi, +/obj/item/bone/skull/unathi, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/GreatWolfDen) "kk" = ( @@ -123,7 +123,7 @@ /area/submap/GreatWolfDen) "lQ" = ( /obj/effect/decal/cleanable/filth, -/obj/item/weapon/card/emag_broken, +/obj/item/card/emag_broken, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/GreatWolfDen) "mk" = ( @@ -204,11 +204,11 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/GreatWolfDen) "vu" = ( -/obj/item/weapon/bone/skull/tajaran, +/obj/item/bone/skull/tajaran, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/GreatWolfDen) "wc" = ( -/obj/item/weapon/bone/skull/unathi, +/obj/item/bone/skull/unathi, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/GreatWolfDen) @@ -511,7 +511,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/GreatWolfDen) "Rb" = ( -/obj/item/weapon/bone/leg, +/obj/item/bone/leg, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/outdoors/dirt/virgo3b{ outdoors = 0 @@ -522,7 +522,7 @@ /obj/structure/flora/sif/subterranean{ icon_state = "frostbelle" }, -/obj/item/weapon/gun/projectile/pistol, +/obj/item/gun/projectile/pistol, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/GreatWolfDen) "Rj" = ( @@ -538,7 +538,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/GreatWolfDen) "SO" = ( -/obj/item/weapon/telecube/mated, +/obj/item/telecube/mated, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/GreatWolfDen) "SQ" = ( @@ -548,10 +548,10 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/template_noop) "Tf" = ( -/obj/item/weapon/paper/card/heart{ +/obj/item/paper/card/heart{ desc = "A gift card with a heart on the cover. This appears to be a thank-you to the.. wolves??" }, -/obj/item/weapon/paper/crumpled{ +/obj/item/paper/crumpled{ icon_state = "scrap_bloodied"; info = "The wolves dragged me back to their den when they found me incapacitated, and nursed me back to health, instead of eating me. I don't know why. Anyway, they're a bunch of goodboyes. Don't let the bones strewn about their den frighten you. Just be nice to them and they won't hurt you."; name = "survivor's note" @@ -581,7 +581,7 @@ /area/submap/GreatWolfDen) "WH" = ( /obj/structure/loot_pile/surface/bones, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /obj/random/projectile/scrapped_gun, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/GreatWolfDen) @@ -605,7 +605,7 @@ /turf/simulated/floor/outdoors/snow/virgo3b, /area/submap/GreatWolfDen) "Xy" = ( -/obj/item/weapon/bone/ribs, +/obj/item/bone/ribs, /obj/effect/landmark/loot_spawn/low, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/GreatWolfDen) diff --git a/maps/submaps/surface_submaps/plains/hotspring.dmm b/maps/submaps/surface_submaps/plains/hotspring.dmm index f1fd6056448..aec5d68c692 100644 --- a/maps/submaps/surface_submaps/plains/hotspring.dmm +++ b/maps/submaps/surface_submaps/plains/hotspring.dmm @@ -30,18 +30,18 @@ /area/submap/hotspring) "j" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/flame/lighter/random{ +/obj/item/storage/fancy/candle_box, +/obj/item/flame/lighter/random{ pixel_x = 7 }, -/obj/item/weapon/storage/fancy/candle_box{ +/obj/item/storage/fancy/candle_box{ pixel_x = -6 }, -/obj/item/weapon/storage/firstaid{ +/obj/item/storage/firstaid{ pixel_x = 4; pixel_y = -6 }, -/obj/item/weapon/wrapping_paper, +/obj/item/wrapping_paper, /turf/simulated/floor/wood/sif/virgo3b, /area/submap/hotspring) "k" = ( @@ -51,12 +51,12 @@ /area/submap/hotspring) "o" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/harpoon, +/obj/item/material/harpoon, /obj/item/pizzabox/vegetable, /turf/simulated/floor/wood/sif/virgo3b, /area/submap/hotspring) "r" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/structure/bed/chair{ dir = 1 }, @@ -105,7 +105,7 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/submap/hotspring) "L" = ( -/obj/item/weapon/inflatable_duck, +/obj/item/inflatable_duck, /obj/effect/effect/steam, /turf/simulated/floor/water/virgo3b, /area/submap/hotspring) @@ -126,7 +126,7 @@ dir = 8; health = 1e+006 }, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/structure/loot_pile/maint/trash, /turf/template_noop, /area/submap/hotspring) diff --git a/maps/submaps/surface_submaps/plains/house1.dmm b/maps/submaps/surface_submaps/plains/house1.dmm index d886d8d157b..4a80df3ae06 100644 --- a/maps/submaps/surface_submaps/plains/house1.dmm +++ b/maps/submaps/surface_submaps/plains/house1.dmm @@ -13,45 +13,45 @@ "am" = (/obj/item/target/syndicate,/turf/simulated/floor/outdoors/grass/sif,/area/submap/house1) "an" = (/turf/simulated/wall/wood,/area/submap/house1) "ao" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wood,/area/submap/house1) -"ap" = (/obj/structure/table/marble,/obj/item/weapon/material/kitchen/rollingpin,/turf/simulated/floor/tiled,/area/submap/house1) -"aq" = (/obj/structure/table/marble,/obj/item/weapon/material/knife,/turf/simulated/floor/tiled,/area/submap/house1) +"ap" = (/obj/structure/table/marble,/obj/item/material/kitchen/rollingpin,/turf/simulated/floor/tiled,/area/submap/house1) +"aq" = (/obj/structure/table/marble,/obj/item/material/knife,/turf/simulated/floor/tiled,/area/submap/house1) "ar" = (/obj/structure/grille/rustic,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/submap/house1) "as" = (/turf/simulated/floor/wood,/area/submap/house1) -"at" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity,/turf/simulated/floor/tiled/freezer,/area/submap/house1) +"at" = (/obj/structure/table/standard,/obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute,/obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn,/obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity,/turf/simulated/floor/tiled/freezer,/area/submap/house1) "au" = (/obj/structure/toilet,/turf/simulated/floor/tiled/freezer,/area/submap/house1) "av" = (/obj/structure/table/marble,/obj/random/drinkbottle,/turf/simulated/floor/tiled,/area/submap/house1) -"aw" = (/obj/item/device/flashlight/lantern,/turf/simulated/floor/tiled,/area/submap/house1) -"ax" = (/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/item/weapon/coin/phoron,/turf/simulated/floor/wood,/area/submap/house1) +"aw" = (/obj/item/flashlight/lantern,/turf/simulated/floor/tiled,/area/submap/house1) +"ax" = (/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/item/coin/phoron,/turf/simulated/floor/wood,/area/submap/house1) "ay" = (/obj/item/clothing/head/bearpelt{pixel_y = 6},/obj/structure/table/glass,/obj/structure/window/reinforced,/turf/simulated/floor/wood,/area/submap/house1) -"az" = (/obj/item/weapon/material/harpoon,/obj/structure/table/glass,/obj/structure/window/reinforced,/turf/simulated/floor/wood,/area/submap/house1) +"az" = (/obj/item/material/harpoon,/obj/structure/table/glass,/obj/structure/window/reinforced,/turf/simulated/floor/wood,/area/submap/house1) "aA" = (/obj/structure/table/glass,/obj/structure/window/reinforced,/obj/item/clothing/accessory/medal/conduct{pixel_y = 6},/turf/simulated/floor/wood,/area/submap/house1) "aB" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{dir = 4; pixel_x = -28; pixel_y = 0},/turf/simulated/floor/tiled/freezer,/area/submap/house1) -"aC" = (/obj/item/weapon/towel,/turf/simulated/floor/tiled/freezer,/area/submap/house1) +"aC" = (/obj/item/towel,/turf/simulated/floor/tiled/freezer,/area/submap/house1) "aD" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/simulated/floor/tiled,/area/submap/house1) "aE" = (/turf/simulated/floor/tiled,/area/submap/house1) "aF" = (/obj/structure/simple_door/wood,/turf/simulated/floor/tiled,/area/submap/house1) "aG" = (/obj/structure/simple_door/wood,/turf/simulated/floor/tiled/freezer,/area/submap/house1) -"aH" = (/obj/item/device/flashlight/lantern,/turf/simulated/floor/tiled/freezer,/area/submap/house1) +"aH" = (/obj/item/flashlight/lantern,/turf/simulated/floor/tiled/freezer,/area/submap/house1) "aI" = (/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/obj/machinery/shower{dir = 1},/obj/random/soap,/turf/simulated/floor/tiled/freezer,/area/submap/house1) "aJ" = (/turf/simulated/floor/carpet/turcarpet,/area/submap/house1) "aK" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/carpet/turcarpet,/area/submap/house1) "aL" = (/obj/structure/bed/chair/wood{dir = 4},/turf/simulated/floor/carpet/turcarpet,/area/submap/house1) -"aM" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/storage/fancy/candle_box,/turf/simulated/floor/carpet/turcarpet,/area/submap/house1) -"aN" = (/obj/structure/table/wooden_reinforced,/obj/item/device/binoculars/spyglass,/turf/simulated/floor/carpet/turcarpet,/area/submap/house1) -"aO" = (/obj/structure/table/wooden_reinforced,/obj/item/device/flashlight/lantern,/turf/simulated/floor/carpet/turcarpet,/area/submap/house1) +"aM" = (/obj/structure/table/wooden_reinforced,/obj/item/storage/fancy/candle_box,/turf/simulated/floor/carpet/turcarpet,/area/submap/house1) +"aN" = (/obj/structure/table/wooden_reinforced,/obj/item/binoculars/spyglass,/turf/simulated/floor/carpet/turcarpet,/area/submap/house1) +"aO" = (/obj/structure/table/wooden_reinforced,/obj/item/flashlight/lantern,/turf/simulated/floor/carpet/turcarpet,/area/submap/house1) "aP" = (/obj/structure/bed/chair/wood{dir = 1},/turf/simulated/floor/carpet/turcarpet,/area/submap/house1) -"aQ" = (/obj/structure/table/rack,/obj/item/device/gps/explorer,/turf/simulated/floor/wood,/area/submap/house1) +"aQ" = (/obj/structure/table/rack,/obj/item/gps/explorer,/turf/simulated/floor/wood,/area/submap/house1) "aR" = (/obj/structure/simple_door/wood,/turf/simulated/floor/carpet/sblucarpet,/area/submap/house1) "aS" = (/turf/simulated/floor/carpet/sblucarpet,/area/submap/house1) "aT" = (/obj/machinery/space_heater,/turf/simulated/floor/carpet/sblucarpet,/area/submap/house1) -"aU" = (/obj/structure/table/rack,/obj/item/clothing/under/explorer,/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/turf/simulated/floor/wood,/area/submap/house1) -"aV" = (/obj/item/device/flashlight/lantern,/turf/simulated/floor/wood,/area/submap/house1) +"aU" = (/obj/structure/table/rack,/obj/item/clothing/under/explorer,/obj/item/cell/device,/obj/item/cell/device,/obj/item/cell/device,/turf/simulated/floor/wood,/area/submap/house1) +"aV" = (/obj/item/flashlight/lantern,/turf/simulated/floor/wood,/area/submap/house1) "aW" = (/obj/machinery/space_heater,/turf/simulated/floor/wood,/area/submap/house1) "aX" = (/obj/structure/coatrack,/turf/simulated/floor/wood,/area/submap/house1) -"aY" = (/obj/structure/table/rack,/obj/item/clothing/suit/storage/hooded/explorer,/obj/item/clothing/mask/gas/explorer,/obj/item/weapon/material/knife/tacknife/survival,/turf/simulated/floor/wood,/area/submap/house1) +"aY" = (/obj/structure/table/rack,/obj/item/clothing/suit/storage/hooded/explorer,/obj/item/clothing/mask/gas/explorer,/obj/item/material/knife/tacknife/survival,/turf/simulated/floor/wood,/area/submap/house1) "aZ" = (/obj/item/clothing/shoes/boots/winter/explorer,/turf/simulated/floor/wood,/area/submap/house1) -"ba" = (/obj/structure/table/woodentable,/obj/random/action_figure,/obj/item/device/flashlight/lantern,/turf/simulated/floor/carpet/sblucarpet,/area/submap/house1) -"bb" = (/obj/item/weapon/bedsheet/hopdouble,/obj/structure/bed/double/padded,/turf/simulated/floor/carpet/sblucarpet,/area/submap/house1) +"ba" = (/obj/structure/table/woodentable,/obj/random/action_figure,/obj/item/flashlight/lantern,/turf/simulated/floor/carpet/sblucarpet,/area/submap/house1) +"bb" = (/obj/item/bedsheet/hopdouble,/obj/structure/bed/double/padded,/turf/simulated/floor/carpet/sblucarpet,/area/submap/house1) "bc" = (/obj/structure/sign/kiddieplaque{desc = "To anyone reading this, you'll note that I'm not home right now, and unfortunately due to reassignment, I won't be for a very long time. Exploring somewhere really far and dangerous now. You can stay if you want, but please try to keep my home in good condition."; name = "read me visitors"},/turf/simulated/wall/wood,/area/submap/house1) "bd" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/outdoors/grass/sif,/area/submap/house1) "be" = (/obj/structure/loot_pile/maint/junk,/turf/simulated/floor/outdoors/grass/sif,/area/submap/house1) diff --git a/maps/submaps/surface_submaps/plains/house1_vr.dmm b/maps/submaps/surface_submaps/plains/house1_vr.dmm index 2cbbee99d18..9c2eee465ee 100644 --- a/maps/submaps/surface_submaps/plains/house1_vr.dmm +++ b/maps/submaps/surface_submaps/plains/house1_vr.dmm @@ -68,12 +68,12 @@ /area/submap/house1) "aq" = ( /obj/structure/table/marble, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled, /area/submap/house1) "ar" = ( /obj/structure/table/marble, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /turf/simulated/floor/tiled, /area/submap/house1) "as" = ( @@ -83,9 +83,9 @@ /area/submap/house1) "at" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute, -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn, -/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity, +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute, +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn, +/obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity, /turf/simulated/floor/tiled/freezer, /area/submap/house1) "au" = ( @@ -98,13 +98,13 @@ /turf/simulated/floor/tiled, /area/submap/house1) "aw" = ( -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/tiled, /area/submap/house1) "ax" = ( /obj/structure/table/glass, /obj/structure/window/reinforced, -/obj/item/weapon/coin/phoron, +/obj/item/coin/phoron, /turf/simulated/floor/wood, /area/submap/house1) "ay" = ( @@ -116,7 +116,7 @@ /turf/simulated/floor/wood, /area/submap/house1) "az" = ( -/obj/item/weapon/material/harpoon, +/obj/item/material/harpoon, /obj/structure/table/glass, /obj/structure/window/reinforced, /turf/simulated/floor/wood, @@ -142,7 +142,7 @@ /turf/simulated/floor/tiled/freezer, /area/submap/house1) "aC" = ( -/obj/item/weapon/towel, +/obj/item/towel, /turf/simulated/floor/tiled/freezer, /area/submap/house1) "aD" = ( @@ -161,7 +161,7 @@ /turf/simulated/floor/tiled/freezer, /area/submap/house1) "aH" = ( -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/tiled/freezer, /area/submap/house1) "aI" = ( @@ -189,17 +189,17 @@ /area/submap/house1) "aM" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /turf/simulated/floor/carpet/turcarpet, /area/submap/house1) "aN" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/binoculars/spyglass, +/obj/item/binoculars/spyglass, /turf/simulated/floor/carpet/turcarpet, /area/submap/house1) "aO" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/carpet/turcarpet, /area/submap/house1) "aP" = ( @@ -210,7 +210,7 @@ /area/submap/house1) "aQ" = ( /obj/structure/table/rack, -/obj/item/device/gps/explorer, +/obj/item/gps/explorer, /turf/simulated/floor/wood, /area/submap/house1) "aR" = ( @@ -227,13 +227,13 @@ "aU" = ( /obj/structure/table/rack, /obj/item/clothing/under/explorer, -/obj/item/weapon/cell/device, -/obj/item/weapon/cell/device, -/obj/item/weapon/cell/device, +/obj/item/cell/device, +/obj/item/cell/device, +/obj/item/cell/device, /turf/simulated/floor/wood, /area/submap/house1) "aV" = ( -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/wood, /area/submap/house1) "aW" = ( @@ -248,7 +248,7 @@ /obj/structure/table/rack, /obj/item/clothing/suit/storage/hooded/explorer, /obj/item/clothing/mask/gas/explorer, -/obj/item/weapon/material/knife/tacknife/survival, +/obj/item/material/knife/tacknife/survival, /turf/simulated/floor/wood, /area/submap/house1) "aZ" = ( @@ -258,11 +258,11 @@ "ba" = ( /obj/structure/table/woodentable, /obj/random/action_figure, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/carpet/sblucarpet, /area/submap/house1) "bb" = ( -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /obj/structure/bed/double/padded, /turf/simulated/floor/carpet/sblucarpet, /area/submap/house1) diff --git a/maps/submaps/surface_submaps/plains/leopardmanderden.dmm b/maps/submaps/surface_submaps/plains/leopardmanderden.dmm index 006b3c66890..ad8fcaabef9 100644 --- a/maps/submaps/surface_submaps/plains/leopardmanderden.dmm +++ b/maps/submaps/surface_submaps/plains/leopardmanderden.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aK" = ( -/obj/item/weapon/ore/silver, +/obj/item/ore/silver, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ outdoors = 0 @@ -20,7 +20,7 @@ }, /area/submap/LeopardmanderDen) "bj" = ( -/obj/item/weapon/bluespace_crystal, +/obj/item/bluespace_crystal, /turf/simulated/floor/outdoors/grass/sif/virgo3b{ outdoors = 0 }, @@ -54,7 +54,7 @@ /turf/simulated/floor/outdoors/rocks/virgo3b, /area/template_noop) "fe" = ( -/obj/item/weapon/coin/diamond, +/obj/item/coin/diamond, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ outdoors = 0 @@ -62,7 +62,7 @@ /area/submap/LeopardmanderDen) "fQ" = ( /obj/effect/landmark/loot_spawn/low, -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, /turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ outdoors = 0 }, @@ -72,7 +72,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/template_noop) "gC" = ( -/obj/item/weapon/flame/lighter/zippo/gold, +/obj/item/flame/lighter/zippo/gold, /turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ outdoors = 0 }, @@ -88,7 +88,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/template_noop) "gU" = ( -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, /turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ outdoors = 0 }, @@ -266,7 +266,7 @@ /turf/template_noop, /area/template_noop) "tC" = ( -/obj/item/weapon/ore/diamond, +/obj/item/ore/diamond, /turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ outdoors = 0 }, @@ -302,7 +302,7 @@ }, /area/submap/LeopardmanderDen) "xg" = ( -/obj/item/weapon/ore/silver, +/obj/item/ore/silver, /turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ outdoors = 0 }, @@ -386,7 +386,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/template_noop) "Gw" = ( -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ outdoors = 0 @@ -507,7 +507,7 @@ }, /area/submap/LeopardmanderDen) "Te" = ( -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ outdoors = 0 }, @@ -524,7 +524,7 @@ /area/template_noop) "Tt" = ( /obj/structure/flora/ausbushes/brflowers, -/obj/item/weapon/coin/iron, +/obj/item/coin/iron, /turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ outdoors = 0 }, @@ -538,20 +538,20 @@ }, /area/submap/LeopardmanderDen) "Uc" = ( -/obj/item/weapon/ore/diamond, +/obj/item/ore/diamond, /turf/simulated/floor/outdoors/grass/sif/virgo3b{ outdoors = 0 }, /area/submap/LeopardmanderDen) "Ul" = ( -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, /turf/simulated/floor/outdoors/grass/sif/virgo3b{ outdoors = 0 }, /area/submap/LeopardmanderDen) "UA" = ( /obj/structure/flora/ausbushes/brflowers, -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, /turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ outdoors = 0 }, @@ -599,7 +599,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/template_noop) "YJ" = ( -/obj/item/weapon/ore/diamond, +/obj/item/ore/diamond, /turf/simulated/floor/outdoors/grass/sif/forest{ outdoors = 0 }, diff --git a/maps/submaps/surface_submaps/plains/lonehome.dmm b/maps/submaps/surface_submaps/plains/lonehome.dmm index b610c17a87a..bc8e1979c54 100644 --- a/maps/submaps/surface_submaps/plains/lonehome.dmm +++ b/maps/submaps/surface_submaps/plains/lonehome.dmm @@ -1,50 +1,50 @@ "at" = (/obj/structure/bed/chair/sofa/right/black{dir = 1},/turf/simulated/floor/wood,/area/submap/lonehome) -"au" = (/obj/item/organ/internal/lungs/vox,/obj/item/weapon/beartrap/hunting{anchored = 1; deployed = 1},/obj/structure/curtain/black,/obj/random/junk,/obj/random/junk,/obj/random/junk,/turf/simulated/floor,/area/submap/lonehome) +"au" = (/obj/item/organ/internal/lungs/vox,/obj/item/beartrap/hunting{anchored = 1; deployed = 1},/obj/structure/curtain/black,/obj/random/junk,/obj/random/junk,/obj/random/junk,/turf/simulated/floor,/area/submap/lonehome) "aw" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/submap/lonehome) "aI" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/flora/pottedplant/fern{pixel_y = 12},/obj/structure/table/bench/wooden,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/lonehome) "aK" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/submap/lonehome) "bb" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/broken,/area/submap/lonehome) "ck" = (/obj/machinery/light/small{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/lonehome) -"cn" = (/obj/machinery/light{dir = 8},/obj/item/weapon/paper/courtroom,/obj/item/weapon/paper/courtroom,/obj/item/weapon/paper_bin,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome) -"cE" = (/obj/structure/table/marble,/obj/item/organ/internal/brain/grey,/obj/item/weapon/material/knife/plastic,/turf/simulated/floor,/area/submap/lonehome) +"cn" = (/obj/machinery/light{dir = 8},/obj/item/paper/courtroom,/obj/item/paper/courtroom,/obj/item/paper_bin,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome) +"cE" = (/obj/structure/table/marble,/obj/item/organ/internal/brain/grey,/obj/item/material/knife/plastic,/turf/simulated/floor,/area/submap/lonehome) "cS" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/lonehome) -"dR" = (/obj/item/weapon/paper{info = "Seems to be filled with odd runes drawn with blood"; name = "Blood stained paper"},/turf/simulated/floor/carpet/sblucarpet,/area/submap/lonehome) +"dR" = (/obj/item/paper{info = "Seems to be filled with odd runes drawn with blood"; name = "Blood stained paper"},/turf/simulated/floor/carpet/sblucarpet,/area/submap/lonehome) "ew" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/submap/lonehome) "eL" = (/obj/machinery/button/windowtint{id = "h_master"},/turf/simulated/wall/wood,/area/submap/lonehome) "fl" = (/obj/structure/loot_pile/maint/trash,/turf/template_noop,/area/submap/lonehome) "gn" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/template_noop,/area/submap/lonehome) -"gI" = (/obj/structure/table/rack,/obj/item/weapon/material/knife/ritual,/obj/structure/curtain/open/bed,/obj/item/clothing/under/suit_jacket/really_black,/obj/item/clothing/under/suit_jacket/navy,/obj/item/clothing/head/soft/solgov/veteranhat,/turf/simulated/floor/wood,/area/submap/lonehome) -"hh" = (/obj/item/weapon/reagent_containers/food/condiment/small/peppermill,/obj/item/weapon/pen,/turf/simulated/floor/wood,/area/submap/lonehome) +"gI" = (/obj/structure/table/rack,/obj/item/material/knife/ritual,/obj/structure/curtain/open/bed,/obj/item/clothing/under/suit_jacket/really_black,/obj/item/clothing/under/suit_jacket/navy,/obj/item/clothing/head/soft/solgov/veteranhat,/turf/simulated/floor/wood,/area/submap/lonehome) +"hh" = (/obj/item/reagent_containers/food/condiment/small/peppermill,/obj/item/pen,/turf/simulated/floor/wood,/area/submap/lonehome) "hq" = (/obj/structure/table/bench/marble,/obj/structure/window/reinforced/polarized{id = "h_master"},/obj/structure/flora/pottedplant/dead{pixel_y = 7},/turf/simulated/floor/wood,/area/submap/lonehome) -"hH" = (/obj/structure/table/marble,/obj/item/weapon/material/sharpeningkit,/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor/tiled/white,/area/submap/lonehome) +"hH" = (/obj/structure/table/marble,/obj/item/material/sharpeningkit,/obj/item/reagent_containers/dropper,/turf/simulated/floor/tiled/white,/area/submap/lonehome) "hK" = (/obj/structure/bed/chair/wood{dir = 1},/obj/structure/window/reinforced/polarized{dir = 4; id = "h_kitchen"},/turf/simulated/floor/wood,/area/submap/lonehome) "ii" = (/obj/random/junk,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/lonehome) -"ip" = (/obj/item/weapon/pen,/turf/simulated/floor/wood,/area/submap/lonehome) +"ip" = (/obj/item/pen,/turf/simulated/floor/wood,/area/submap/lonehome) "iw" = (/turf/simulated/floor/wood/broken,/area/submap/lonehome) -"iQ" = (/obj/structure/table/marble,/obj/item/weapon/material/knife/butch,/obj/item/weapon/material/kitchen/rollingpin,/turf/simulated/floor/tiled/white,/area/submap/lonehome) +"iQ" = (/obj/structure/table/marble,/obj/item/material/knife/butch,/obj/item/material/kitchen/rollingpin,/turf/simulated/floor/tiled/white,/area/submap/lonehome) "jt" = (/obj/structure/fence/corner{dir = 8},/turf/simulated/floor/outdoors/grass/heavy,/area/submap/lonehome) -"jy" = (/obj/item/weapon/material/shard,/obj/item/weapon/material/shard{pixel_x = 5; pixel_y = 10},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/lonehome) -"jH" = (/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/turf/simulated/floor/wood,/area/submap/lonehome) +"jy" = (/obj/item/material/shard,/obj/item/material/shard{pixel_x = 5; pixel_y = 10},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/lonehome) +"jH" = (/obj/item/material/kitchen/utensil/spoon{pixel_x = 2},/turf/simulated/floor/wood,/area/submap/lonehome) "jK" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/wood,/area/submap/lonehome) -"kg" = (/obj/structure/table/marble,/obj/item/weapon/material/kitchen/utensil/spoon,/turf/simulated/floor/tiled/white,/area/submap/lonehome) +"kg" = (/obj/structure/table/marble,/obj/item/material/kitchen/utensil/spoon,/turf/simulated/floor/tiled/white,/area/submap/lonehome) "kn" = (/obj/structure/bed/chair/wood,/obj/machinery/button/windowtint{id = "h_kitchen"},/obj/structure/window/reinforced/polarized{dir = 4; id = "h_kitchen"},/turf/simulated/floor/wood,/area/submap/lonehome) -"ks" = (/obj/item/weapon/photo,/obj/item/weapon/photo{pixel_x = 4},/obj/structure/table/bench/wooden,/turf/simulated/floor/wood,/area/submap/lonehome) -"kT" = (/obj/machinery/light/small{dir = 1},/obj/structure/bed/padded,/obj/item/weapon/book/custom_library/fiction/truelovehathmyheart,/obj/item/weapon/bedsheet/clown,/turf/simulated/floor/wood,/area/submap/lonehome) -"kU" = (/obj/item/weapon/chainsaw,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/extinguisher,/obj/item/weapon/storage/toolbox/mechanical,/obj/structure/table/rack,/turf/simulated/floor,/area/submap/lonehome) +"ks" = (/obj/item/photo,/obj/item/photo{pixel_x = 4},/obj/structure/table/bench/wooden,/turf/simulated/floor/wood,/area/submap/lonehome) +"kT" = (/obj/machinery/light/small{dir = 1},/obj/structure/bed/padded,/obj/item/book/custom_library/fiction/truelovehathmyheart,/obj/item/bedsheet/clown,/turf/simulated/floor/wood,/area/submap/lonehome) +"kU" = (/obj/item/chainsaw,/obj/item/storage/box/lights/mixed,/obj/item/extinguisher,/obj/item/storage/toolbox/mechanical,/obj/structure/table/rack,/turf/simulated/floor,/area/submap/lonehome) "ld" = (/obj/machinery/power/port_gen/pacman,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/submap/lonehome) -"lz" = (/obj/item/weapon/reagent_containers/glass/rag,/obj/item/clothing/gloves/ring/engagement,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome) +"lz" = (/obj/item/reagent_containers/glass/rag,/obj/item/clothing/gloves/ring/engagement,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome) "lB" = (/obj/machinery/button/windowtint{id = "h_kitchen"},/obj/item/trash/plate,/obj/structure/table/sifwooden_reinforced,/obj/structure/window/reinforced/polarized{dir = 4; id = "h_kitchen"},/turf/simulated/floor/wood,/area/submap/lonehome) -"lJ" = (/obj/item/device/tape,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome) +"lJ" = (/obj/item/tape,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome) "lS" = (/obj/item/organ/internal/liver,/obj/random/trash,/turf/simulated/floor,/area/submap/lonehome) "ma" = (/turf/simulated/wall/wood,/area/submap/lonehome) "mn" = (/obj/item/clothing/mask/muzzle,/obj/random/trash,/turf/simulated/floor,/area/submap/lonehome) "na" = (/mob/living/simple_mob/animal/passive/cat/bones{desc = "A very odd behaved cat, their scratched name tag reads 'Felix'. They look very malnourished."; name = "Felix"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/lonehome) "ni" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/submap/lonehome) -"nz" = (/obj/item/device/flashlight{pixel_x = 2; pixel_y = 2},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/submap/lonehome) +"nz" = (/obj/item/flashlight{pixel_x = 2; pixel_y = 2},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/submap/lonehome) "nD" = (/obj/structure/bed/chair/sofa/black,/turf/simulated/floor/wood,/area/submap/lonehome) "nL" = (/obj/machinery/appliance/cooker/oven,/turf/simulated/floor/tiled/white,/area/submap/lonehome) "nT" = (/obj/item/stack/cable_coil,/turf/simulated/floor/wood/broken,/area/submap/lonehome) -"ox" = (/obj/structure/closet/cabinet,/obj/item/weapon/storage/wallet/random,/obj/item/weapon/towel/random,/obj/item/weapon/melee/umbrella/random,/obj/random/ammo,/obj/random/cigarettes,/obj/random/contraband,/obj/random/junk,/obj/random/maintenance/security,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/wood,/area/submap/lonehome) +"ox" = (/obj/structure/closet/cabinet,/obj/item/storage/wallet/random,/obj/item/towel/random,/obj/item/melee/umbrella/random,/obj/random/ammo,/obj/random/cigarettes,/obj/random/contraband,/obj/random/junk,/obj/random/maintenance/security,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/wood,/area/submap/lonehome) "oS" = (/obj/structure/closet/cabinet,/obj/random/tech_supply/component,/obj/random/tech_supply/component,/obj/random/tech_supply/component,/obj/random/tech_supply/component,/obj/random/tech_supply/component,/obj/random/toolbox,/obj/random/toolbox,/turf/simulated/floor/wood,/area/submap/lonehome) "oZ" = (/obj/structure/bed/chair/sofa/left/black,/turf/simulated/floor/wood,/area/submap/lonehome) "pb" = (/obj/structure/fence/cut/large{dir = 8},/turf/template_noop,/area/submap/lonehome) @@ -53,56 +53,56 @@ "qa" = (/obj/structure/fence,/turf/simulated/floor/outdoors/grass/heavy,/area/submap/lonehome) "qi" = (/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_alc/full,/turf/simulated/floor/tiled/white,/area/submap/lonehome) "qk" = (/obj/structure/table/marble,/obj/machinery/light{dir = 1},/obj/machinery/microwave,/turf/simulated/floor/tiled/white,/area/submap/lonehome) -"qo" = (/obj/item/weapon/phone,/obj/structure/table/bench/wooden,/obj/item/weapon/paper{info = "Seems to be filled with odd runes drawn with blood"; name = "Blood stained paper"},/turf/simulated/floor/wood,/area/submap/lonehome) +"qo" = (/obj/item/phone,/obj/structure/table/bench/wooden,/obj/item/paper{info = "Seems to be filled with odd runes drawn with blood"; name = "Blood stained paper"},/turf/simulated/floor/wood,/area/submap/lonehome) "qE" = (/obj/effect/decal/cleanable/blood/gibs,/turf/simulated/floor,/area/submap/lonehome) "qN" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/sblucarpet,/area/submap/lonehome) "rg" = (/obj/structure/window/reinforced/polarized{dir = 8; id = "h_living"},/obj/structure/bed/chair/sofa/black{dir = 4},/turf/simulated/floor/wood,/area/submap/lonehome) -"ro" = (/obj/item/weapon/pack/cardemon,/turf/simulated/floor/carpet/bcarpet,/area/submap/lonehome) -"ru" = (/obj/structure/table/rack,/obj/item/weapon/makeover,/obj/structure/curtain/open/bed,/turf/simulated/floor/wood,/area/submap/lonehome) -"rE" = (/obj/item/weapon/material/shard,/turf/simulated/floor/outdoors/grass/heavy,/area/submap/lonehome) +"ro" = (/obj/item/pack/cardemon,/turf/simulated/floor/carpet/bcarpet,/area/submap/lonehome) +"ru" = (/obj/structure/table/rack,/obj/item/makeover,/obj/structure/curtain/open/bed,/turf/simulated/floor/wood,/area/submap/lonehome) +"rE" = (/obj/item/material/shard,/turf/simulated/floor/outdoors/grass/heavy,/area/submap/lonehome) "tp" = (/obj/structure/flora/pottedplant/bamboo{pixel_y = 12},/obj/structure/table/bench/wooden,/turf/simulated/floor/wood,/area/submap/lonehome) "uc" = (/obj/structure/girder,/turf/simulated/floor,/area/submap/lonehome) "uh" = (/obj/structure/fence/cut/medium{dir = 4},/turf/simulated/floor/outdoors/grass/heavy,/area/submap/lonehome) -"um" = (/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/structure/table/wooden_reinforced,/obj/item/weapon/book/tome,/turf/simulated/floor/wood,/area/submap/lonehome) -"uo" = (/obj/item/weapon/material/shard,/turf/simulated/floor/outdoors/dirt,/area/submap/lonehome) -"ur" = (/obj/structure/table/marble,/obj/item/weapon/material/knife/hook,/turf/simulated/floor,/area/submap/lonehome) -"uw" = (/obj/item/seeds/random,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome) +"um" = (/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/structure/table/wooden_reinforced,/obj/item/book/tome,/turf/simulated/floor/wood,/area/submap/lonehome) +"uo" = (/obj/item/material/shard,/turf/simulated/floor/outdoors/dirt,/area/submap/lonehome) +"ur" = (/obj/structure/table/marble,/obj/item/material/knife/hook,/turf/simulated/floor,/area/submap/lonehome) +"uw" = (/obj/item/seeds/random,/obj/item/reagent_containers/spray/cleaner,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome) "uC" = (/obj/item/seeds/random,/obj/item/seeds/random,/obj/machinery/space_heater,/turf/simulated/floor/wood,/area/submap/lonehome) "uI" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/turf/simulated/floor/outdoors/grass/heavy,/area/submap/lonehome) -"uK" = (/obj/item/weapon/material/minihoe,/turf/simulated/floor/outdoors/grass/heavy,/area/submap/lonehome) +"uK" = (/obj/item/material/minihoe,/turf/simulated/floor/outdoors/grass/heavy,/area/submap/lonehome) "uR" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/lonehome) "ve" = (/obj/structure/table/bench/glass,/turf/simulated/floor/carpet/sblucarpet,/area/submap/lonehome) "wa" = (/turf/simulated/floor/wood,/area/submap/lonehome) -"wj" = (/obj/item/weapon/bedsheet/rddouble,/turf/simulated/floor/wood,/area/submap/lonehome) +"wj" = (/obj/item/bedsheet/rddouble,/turf/simulated/floor/wood,/area/submap/lonehome) "xr" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/bcarpet,/area/submap/lonehome) "xM" = (/obj/structure/fence/cut/large{dir = 8},/turf/simulated/floor/outdoors/grass/heavy,/area/submap/lonehome) "xO" = (/obj/item/clothing/suit/straight_jacket,/turf/simulated/floor,/area/submap/lonehome) "yh" = (/turf/simulated/floor/outdoors/dirt,/area/submap/lonehome) "yn" = (/obj/structure/window/reinforced/polarized{dir = 8; id = "h_living"},/obj/structure/bed/chair/sofa/corner/black{dir = 1},/turf/simulated/floor/wood,/area/submap/lonehome) -"yr" = (/obj/item/weapon/reagent_containers/blood,/obj/item/weapon/pack/cardemon,/obj/item/weapon/pack/cardemon,/obj/item/weapon/deck/tarot,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome) +"yr" = (/obj/item/reagent_containers/blood,/obj/item/pack/cardemon,/obj/item/pack/cardemon,/obj/item/deck/tarot,/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome) "yt" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/sblucarpet,/area/submap/lonehome) "yF" = (/obj/structure/bed/chair/sofa/black{dir = 1},/turf/simulated/floor/wood,/area/submap/lonehome) "yQ" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/submap/lonehome) -"zN" = (/obj/item/weapon/paper{info = "Seems to be filled with odd runes drawn with blood"; name = "Blood stained paper"},/turf/simulated/floor/wood,/area/submap/lonehome) -"AQ" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/item/weapon/material/shard,/turf/simulated/floor/outdoors/dirt,/area/submap/lonehome) -"BH" = (/obj/item/weapon/paper{info = "F%$K this detective, I swear I can see them peeking from behind the window, these tinted glasses help but I swear I can still see them snooping around. His days are counted... I am so close to figuring this out, just need a few more days. Then Shepiffany will be part of the family once again, then our two kids and I can go back on having a normal life... a normal life..."; name = "Stained sheet of paper"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/sblucarpet,/area/submap/lonehome) -"Dd" = (/obj/machinery/button/windowtint{id = "h_kitchen"},/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/condimentbottles,/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,/obj/structure/curtain/open/bed,/obj/structure/table/rack,/obj/structure/window/reinforced/polarized{dir = 4; id = "h_kitchen"},/turf/simulated/floor/tiled/white,/area/submap/lonehome) +"zN" = (/obj/item/paper{info = "Seems to be filled with odd runes drawn with blood"; name = "Blood stained paper"},/turf/simulated/floor/wood,/area/submap/lonehome) +"AQ" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/item/material/shard,/turf/simulated/floor/outdoors/dirt,/area/submap/lonehome) +"BH" = (/obj/item/paper{info = "F%$K this detective, I swear I can see them peeking from behind the window, these tinted glasses help but I swear I can still see them snooping around. His days are counted... I am so close to figuring this out, just need a few more days. Then Shepiffany will be part of the family once again, then our two kids and I can go back on having a normal life... a normal life..."; name = "Stained sheet of paper"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/sblucarpet,/area/submap/lonehome) +"Dd" = (/obj/machinery/button/windowtint{id = "h_kitchen"},/obj/item/storage/box/donkpockets,/obj/item/storage/box/condimentbottles,/obj/item/reagent_containers/food/condiment/carton/sugar,/obj/structure/curtain/open/bed,/obj/structure/table/rack,/obj/structure/window/reinforced/polarized{dir = 4; id = "h_kitchen"},/turf/simulated/floor/tiled/white,/area/submap/lonehome) "Dk" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/submap/lonehome) -"DE" = (/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/item/weapon/storage/box/glasses/square{pixel_y = -2},/obj/item/weapon/storage/box/glass_extras/sticks{pixel_y = 4},/obj/item/weapon/storage/box/glass_extras/straws{pixel_y = 7},/obj/item/weapon/packageWrap,/obj/structure/curtain/open/bed,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/obj/structure/table/rack,/turf/simulated/floor/tiled/white,/area/submap/lonehome) +"DE" = (/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/item/storage/box/glasses/square{pixel_y = -2},/obj/item/storage/box/glass_extras/sticks{pixel_y = 4},/obj/item/storage/box/glass_extras/straws{pixel_y = 7},/obj/item/packageWrap,/obj/structure/curtain/open/bed,/obj/item/material/kitchen/utensil/fork,/obj/item/material/kitchen/utensil/fork,/obj/item/material/kitchen/utensil/spoon{pixel_x = 2},/obj/item/material/kitchen/utensil/spoon{pixel_x = 2},/obj/structure/table/rack,/turf/simulated/floor/tiled/white,/area/submap/lonehome) "DG" = (/obj/structure/simple_door/wood,/turf/simulated/floor,/area/submap/lonehome) -"DL" = (/obj/structure/closet/cabinet,/obj/item/weapon/storage/wallet/random,/obj/item/weapon/towel/random,/obj/item/weapon/melee/umbrella/random,/obj/random/carp_plushie,/obj/random/curseditem,/obj/random/junk,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/wood,/area/submap/lonehome) -"Ea" = (/obj/item/weapon/pack/cardemon,/turf/simulated/floor/wood,/area/submap/lonehome) +"DL" = (/obj/structure/closet/cabinet,/obj/item/storage/wallet/random,/obj/item/towel/random,/obj/item/melee/umbrella/random,/obj/random/carp_plushie,/obj/random/curseditem,/obj/random/junk,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/wood,/area/submap/lonehome) +"Ea" = (/obj/item/pack/cardemon,/turf/simulated/floor/wood,/area/submap/lonehome) "Ek" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/simulated/floor/outdoors/dirt,/area/submap/lonehome) "Eo" = (/obj/random/junk,/turf/simulated/floor/carpet/sblucarpet,/area/submap/lonehome) -"Ex" = (/obj/item/weapon/paper{info = "Seems to be filled with odd runes drawn with blood"; name = "Blood stained paper"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/broken,/area/submap/lonehome) -"EZ" = (/obj/effect/decal/cleanable/blood/gibs,/obj/structure/table/marble,/obj/item/organ/internal/intestine/unathi,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/bone/ribs,/obj/item/weapon/bone/skull{pixel_x = 4; pixel_y = 6},/turf/simulated/floor,/area/submap/lonehome) +"Ex" = (/obj/item/paper{info = "Seems to be filled with odd runes drawn with blood"; name = "Blood stained paper"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/broken,/area/submap/lonehome) +"EZ" = (/obj/effect/decal/cleanable/blood/gibs,/obj/structure/table/marble,/obj/item/organ/internal/intestine/unathi,/obj/item/surgical/bonesetter,/obj/item/bone/ribs,/obj/item/bone/skull{pixel_x = 4; pixel_y = 6},/turf/simulated/floor,/area/submap/lonehome) "Fh" = (/obj/structure/coatrack,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/lonehome) "Fu" = (/turf/simulated/floor/carpet/sblucarpet,/area/submap/lonehome) "Fy" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/portable_atmospherics/hydroponics/soil,/turf/simulated/floor/outdoors/grass/heavy,/area/submap/lonehome) "FN" = (/obj/machinery/button/windowtint{id = "h_living"},/turf/simulated/wall/wood,/area/submap/lonehome) "Gm" = (/obj/machinery/button/windowtint{id = "h_kitchen"},/turf/simulated/wall/wood,/area/submap/lonehome) "Gr" = (/obj/structure/table/bench/marble,/obj/structure/window/reinforced/polarized{id = "h_master"},/obj/structure/flora/pottedplant/bamboo{pixel_y = 7},/turf/simulated/floor/wood,/area/submap/lonehome) -"GA" = (/obj/item/weapon/reagent_containers/food/snacks/ghostmuffin/poison,/obj/structure/table/sifwooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome) +"GA" = (/obj/item/reagent_containers/food/snacks/ghostmuffin/poison,/obj/structure/table/sifwooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome) "GS" = (/obj/structure/table/steel,/obj/item/stack/material/phoron{amount = 5},/obj/item/stack/material/phoron{amount = 5},/obj/fiftyspawner/wood,/obj/fiftyspawner/steel,/turf/simulated/floor,/area/submap/lonehome) "Hc" = (/obj/effect/decal/cleanable/blood/gibs,/obj/structure/kitchenspike,/obj/effect/rune,/turf/simulated/floor,/area/submap/lonehome) "Hu" = (/obj/item/frame/apc,/obj/machinery/light_switch{pixel_x = 11; pixel_y = 22},/obj/random/junk,/turf/simulated/floor,/area/submap/lonehome) @@ -111,46 +111,46 @@ "Jq" = (/obj/structure/bed/double/padded,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/wood,/area/submap/lonehome) "JW" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wood,/area/submap/lonehome) "Kb" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/outdoors/grass/heavy,/area/submap/lonehome) -"Ki" = (/obj/structure/closet/cabinet,/obj/random/multiple,/obj/random/multiple,/obj/random/multiple,/obj/random/multiple,/obj/random/multiple,/obj/random/toy,/obj/random/toy,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/turf/simulated/floor/wood,/area/submap/lonehome) -"Kr" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/obj/item/weapon/material/shard,/turf/simulated/floor/outdoors/grass/heavy,/area/submap/lonehome) +"Ki" = (/obj/structure/closet/cabinet,/obj/random/multiple,/obj/random/multiple,/obj/random/multiple,/obj/random/multiple,/obj/random/multiple,/obj/random/toy,/obj/random/toy,/obj/item/storage/mre/random,/obj/item/storage/mre/random,/turf/simulated/floor/wood,/area/submap/lonehome) +"Kr" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/obj/item/material/shard,/turf/simulated/floor/outdoors/grass/heavy,/area/submap/lonehome) "Kw" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/turf/simulated/floor/tiled/white,/area/submap/lonehome) "Ll" = (/obj/machinery/space_heater,/turf/simulated/floor/wood,/area/submap/lonehome) -"LS" = (/obj/item/trash/plate,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,/obj/structure/table/sifwooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome) +"LS" = (/obj/item/trash/plate,/obj/item/reagent_containers/food/condiment/small/saltshaker,/obj/structure/table/sifwooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome) "Mb" = (/obj/structure/bed/chair/wood{dir = 1},/turf/simulated/floor/wood,/area/submap/lonehome) -"Mn" = (/obj/machinery/button/windowtint{id = "h_kitchen"},/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/structure/window/reinforced/polarized{dir = 4; id = "h_kitchen"},/turf/simulated/floor/tiled/white,/area/submap/lonehome) +"Mn" = (/obj/machinery/button/windowtint{id = "h_kitchen"},/obj/item/reagent_containers/food/condiment/enzyme,/obj/structure/window/reinforced/polarized{dir = 4; id = "h_kitchen"},/turf/simulated/floor/tiled/white,/area/submap/lonehome) "MM" = (/turf/simulated/floor/outdoors/grass/heavy,/area/submap/lonehome) "Nx" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/wood,/area/submap/lonehome) "ND" = (/obj/structure/table/bench/marble,/obj/structure/window/reinforced/polarized{dir = 8; id = "h_living"},/turf/simulated/floor/wood,/area/submap/lonehome) "NK" = (/obj/random/trash,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/sblucarpet,/area/submap/lonehome) "NL" = (/turf/template_noop,/area/submap/lonehome) -"Od" = (/obj/item/weapon/extinguisher{pixel_x = 8; pixel_y = 1},/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/medical/lite,/obj/random/medical/lite,/obj/structure/mopbucket{pixel_x = -8; pixel_y = -4},/obj/item/weapon/mop,/obj/item/device/multitool,/obj/item/device/flashlight{pixel_x = 2; pixel_y = 2},/obj/random/unidentified_medicine,/obj/random/unidentified_medicine,/obj/random/unidentified_medicine,/obj/structure/table/steel,/turf/simulated/floor/tiled,/area/submap/lonehome) +"Od" = (/obj/item/extinguisher{pixel_x = 8; pixel_y = 1},/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/medical/lite,/obj/random/medical/lite,/obj/structure/mopbucket{pixel_x = -8; pixel_y = -4},/obj/item/mop,/obj/item/multitool,/obj/item/flashlight{pixel_x = 2; pixel_y = 2},/obj/random/unidentified_medicine,/obj/random/unidentified_medicine,/obj/random/unidentified_medicine,/obj/structure/table/steel,/turf/simulated/floor/tiled,/area/submap/lonehome) "Oe" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/template_noop,/area/submap/lonehome) "Or" = (/obj/structure/table/bench/marble,/obj/structure/window/reinforced/polarized{id = "h_master"},/obj/structure/flora/pottedplant/overgrown{pixel_y = 7},/turf/simulated/floor/wood,/area/submap/lonehome) -"OL" = (/obj/machinery/button/windowtint{id = "h_kitchen"},/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/obj/structure/table/sifwooden_reinforced,/obj/structure/window/reinforced/polarized{dir = 4; id = "h_kitchen"},/turf/simulated/floor/wood,/area/submap/lonehome) -"Pc" = (/obj/item/weapon/material/kitchen/utensil/fork,/obj/random/trash,/turf/simulated/floor/wood,/area/submap/lonehome) -"Qx" = (/obj/item/weapon/material/shard{pixel_x = 6},/obj/item/weapon/material/shard,/turf/simulated/floor/outdoors/dirt,/area/submap/lonehome) +"OL" = (/obj/machinery/button/windowtint{id = "h_kitchen"},/obj/item/material/kitchen/utensil/spoon{pixel_x = 2},/obj/structure/table/sifwooden_reinforced,/obj/structure/window/reinforced/polarized{dir = 4; id = "h_kitchen"},/turf/simulated/floor/wood,/area/submap/lonehome) +"Pc" = (/obj/item/material/kitchen/utensil/fork,/obj/random/trash,/turf/simulated/floor/wood,/area/submap/lonehome) +"Qx" = (/obj/item/material/shard{pixel_x = 6},/obj/item/material/shard,/turf/simulated/floor/outdoors/dirt,/area/submap/lonehome) "QU" = (/obj/effect/decal/cleanable/blood/gibs,/obj/item/clothing/gloves/yellow,/turf/simulated/floor,/area/submap/lonehome) "QX" = (/obj/random/trash,/turf/simulated/floor/wood,/area/submap/lonehome) "RI" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/outdoors/dirt,/area/submap/lonehome) "Sd" = (/obj/structure/fence/corner,/turf/template_noop,/area/submap/lonehome) -"Sp" = (/obj/item/weapon/material/shard,/obj/item/weapon/material/shard{pixel_x = 5; pixel_y = 3},/turf/simulated/floor/outdoors/dirt,/area/submap/lonehome) +"Sp" = (/obj/item/material/shard,/obj/item/material/shard{pixel_x = 5; pixel_y = 3},/turf/simulated/floor/outdoors/dirt,/area/submap/lonehome) "SN" = (/obj/structure/bed/chair/wood/wings{dir = 1},/obj/effect/gibspawner/human,/turf/simulated/floor/carpet/sblucarpet,/area/submap/lonehome) -"Tg" = (/obj/item/weapon/material/kitchen/utensil/fork,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/lonehome) -"Tw" = (/obj/item/weapon/cell/high/empty,/turf/simulated/floor/carpet/sblucarpet,/area/submap/lonehome) +"Tg" = (/obj/item/material/kitchen/utensil/fork,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/lonehome) +"Tw" = (/obj/item/cell/high/empty,/turf/simulated/floor/carpet/sblucarpet,/area/submap/lonehome) "TX" = (/obj/item/clothing/suit/storage/apron/white,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/submap/lonehome) -"Uj" = (/obj/machinery/light/small,/obj/item/weapon/ore/diamond,/obj/structure/sign/goldenplaque{desc = "Done No Harm."; name = "Best Doctor 2552"; pixel_y = -32},/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome) +"Uj" = (/obj/machinery/light/small,/obj/item/ore/diamond,/obj/structure/sign/goldenplaque{desc = "Done No Harm."; name = "Best Doctor 2552"; pixel_y = -32},/obj/structure/table/wooden_reinforced,/turf/simulated/floor/wood,/area/submap/lonehome) "UA" = (/obj/structure/fence/door/opened,/turf/template_noop,/area/submap/lonehome) -"UB" = (/obj/item/weapon/storage/box/characters,/obj/structure/curtain/open/bed,/obj/structure/table/rack,/turf/simulated/floor/wood,/area/submap/lonehome) +"UB" = (/obj/item/storage/box/characters,/obj/structure/curtain/open/bed,/obj/structure/table/rack,/turf/simulated/floor/wood,/area/submap/lonehome) "US" = (/turf/simulated/floor/tiled/white,/area/submap/lonehome) -"Vn" = (/obj/item/weapon/reagent_containers/food/condiment/small/sugar,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/broken,/area/submap/lonehome) +"Vn" = (/obj/item/reagent_containers/food/condiment/small/sugar,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/broken,/area/submap/lonehome) "VI" = (/obj/structure/fence{dir = 4},/turf/template_noop,/area/submap/lonehome) -"Wf" = (/obj/structure/bed/padded,/obj/random/trash,/obj/random/trash,/obj/random/trash,/obj/random/trash,/obj/random/trash,/obj/random/junk,/obj/random/junk,/obj/random/junk,/obj/random/junk,/obj/item/weapon/bedsheet/ian,/turf/simulated/floor/wood,/area/submap/lonehome) +"Wf" = (/obj/structure/bed/padded,/obj/random/trash,/obj/random/trash,/obj/random/trash,/obj/random/trash,/obj/random/trash,/obj/random/junk,/obj/random/junk,/obj/random/junk,/obj/random/junk,/obj/item/bedsheet/ian,/turf/simulated/floor/wood,/area/submap/lonehome) "Wj" = (/obj/machinery/gibber/autogibber{emagged = 1},/turf/simulated/floor,/area/submap/lonehome) "Wn" = (/obj/structure/fence/cut/medium{dir = 4},/turf/template_noop,/area/submap/lonehome) "WQ" = (/obj/structure/window/reinforced/polarized{dir = 8; id = "h_living"},/obj/structure/bed/chair/sofa/corner/black{dir = 4},/turf/simulated/floor/wood,/area/submap/lonehome) -"Xc" = (/obj/item/weapon/module/power_control,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/lonehome) -"Xz" = (/obj/item/weapon/material/shard,/turf/template_noop,/area/submap/lonehome) -"Ys" = (/obj/item/weapon/pen/fountain,/turf/simulated/floor/wood,/area/submap/lonehome) +"Xc" = (/obj/item/module/power_control,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/lonehome) +"Xz" = (/obj/item/material/shard,/turf/template_noop,/area/submap/lonehome) +"Ys" = (/obj/item/pen/fountain,/turf/simulated/floor/wood,/area/submap/lonehome) "YK" = (/obj/structure/table/marble,/obj/item/organ/internal/intestine/unathi{pixel_x = -1; pixel_y = 8},/obj/item/organ/internal/lungs,/turf/simulated/floor,/area/submap/lonehome) "Zi" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/wood,/area/submap/lonehome) "ZR" = (/obj/structure/fence{dir = 4},/turf/simulated/floor/outdoors/grass/heavy,/area/submap/lonehome) diff --git a/maps/submaps/surface_submaps/plains/lonehome_vr.dmm b/maps/submaps/surface_submaps/plains/lonehome_vr.dmm index 6cee63decc5..cabcd7f61d6 100644 --- a/maps/submaps/surface_submaps/plains/lonehome_vr.dmm +++ b/maps/submaps/surface_submaps/plains/lonehome_vr.dmm @@ -90,12 +90,12 @@ /turf/simulated/floor/wood/broken, /area/submap/lonehome) "au" = ( -/obj/item/device/tape, +/obj/item/tape, /obj/structure/table/wooden_reinforced, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "av" = ( -/obj/item/weapon/extinguisher{ +/obj/item/extinguisher{ pixel_x = 8; pixel_y = 1 }, @@ -108,9 +108,9 @@ pixel_x = -8; pixel_y = -4 }, -/obj/item/weapon/mop, -/obj/item/device/multitool, -/obj/item/device/flashlight{ +/obj/item/mop, +/obj/item/multitool, +/obj/item/flashlight{ pixel_x = 2; pixel_y = 2 }, @@ -138,23 +138,23 @@ /obj/structure/window/reinforced/tinted/frosted{ dir = 8 }, -/obj/item/weapon/storage/box/glasses/square{ +/obj/item/storage/box/glasses/square{ pixel_y = -2 }, -/obj/item/weapon/storage/box/glass_extras/sticks{ +/obj/item/storage/box/glass_extras/sticks{ pixel_y = 4 }, -/obj/item/weapon/storage/box/glass_extras/straws{ +/obj/item/storage/box/glass_extras/straws{ pixel_y = 7 }, -/obj/item/weapon/packageWrap, +/obj/item/packageWrap, /obj/structure/curtain/open/bed, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/fork, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/spoon{ pixel_x = 2 }, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/spoon{ pixel_x = 2 }, /obj/structure/table/rack, @@ -164,9 +164,9 @@ /obj/machinery/button/windowtint{ id = "h_kitchen" }, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/condimentbottles, -/obj/item/weapon/reagent_containers/food/condiment/carton/sugar, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/condimentbottles, +/obj/item/reagent_containers/food/condiment/carton/sugar, /obj/structure/curtain/open/bed, /obj/structure/table/rack, /obj/structure/window/reinforced/polarized{ @@ -206,19 +206,19 @@ /area/submap/lonehome) "aG" = ( /obj/structure/table/marble, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/knife/butch, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/white/virgo3b, /area/submap/lonehome) "aH" = ( /obj/structure/table/marble, -/obj/item/weapon/material/kitchen/utensil/spoon, +/obj/item/material/kitchen/utensil/spoon, /turf/simulated/floor/tiled/white/virgo3b, /area/submap/lonehome) "aI" = ( /obj/structure/table/marble, -/obj/item/weapon/material/sharpeningkit, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/material/sharpeningkit, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled/white/virgo3b, /area/submap/lonehome) "aJ" = ( @@ -228,7 +228,7 @@ /obj/machinery/button/windowtint{ id = "h_kitchen" }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, /obj/structure/window/reinforced/polarized{ dir = 4; id = "h_kitchen" @@ -240,16 +240,16 @@ dir = 8; health = 1e+006 }, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/lonehome) "aM" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/template_noop, /area/submap/lonehome) "aN" = ( -/obj/item/weapon/material/shard, -/obj/item/weapon/material/shard{ +/obj/item/material/shard, +/obj/item/material/shard{ pixel_x = 5; pixel_y = 3 }, @@ -282,7 +282,7 @@ /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "aT" = ( -/obj/item/weapon/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) @@ -302,14 +302,14 @@ /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "aW" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ pixel_x = 6 }, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/lonehome) "aX" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/lonehome) "aY" = ( @@ -341,7 +341,7 @@ /area/submap/lonehome) "bd" = ( /obj/item/trash/plate, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/saltshaker, /obj/structure/table/sifwooden_reinforced, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) @@ -349,7 +349,7 @@ /obj/machinery/button/windowtint{ id = "h_kitchen" }, -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/spoon{ pixel_x = 2 }, /obj/structure/table/sifwooden_reinforced, @@ -389,7 +389,7 @@ /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bj" = ( -/obj/item/weapon/module/power_control, +/obj/item/module/power_control, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) @@ -401,8 +401,8 @@ /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bl" = ( -/obj/item/weapon/material/shard, -/obj/item/weapon/material/shard{ +/obj/item/material/shard, +/obj/item/material/shard{ pixel_x = 5; pixel_y = 10 }, @@ -423,17 +423,17 @@ /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bn" = ( -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/small/sugar, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/broken, /area/submap/lonehome) "bo" = ( -/obj/item/weapon/material/kitchen/utensil/fork, +/obj/item/material/kitchen/utensil/fork, /obj/random/trash, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bp" = ( -/obj/item/weapon/reagent_containers/food/snacks/ghostmuffin/poison, +/obj/item/reagent_containers/food/snacks/ghostmuffin/poison, /obj/structure/table/sifwooden_reinforced, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) @@ -455,18 +455,18 @@ /turf/simulated/floor/wood/broken, /area/submap/lonehome) "bs" = ( -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bt" = ( -/obj/item/weapon/material/kitchen/utensil/spoon{ +/obj/item/material/kitchen/utensil/spoon{ pixel_x = 2 }, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bu" = ( -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill, -/obj/item/weapon/pen, +/obj/item/reagent_containers/food/condiment/small/peppermill, +/obj/item/pen, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bv" = ( @@ -494,13 +494,13 @@ /area/submap/lonehome) "by" = ( /obj/structure/table/rack, -/obj/item/weapon/makeover, +/obj/item/makeover, /obj/structure/curtain/open/bed, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bz" = ( /obj/structure/table/rack, -/obj/item/weapon/material/knife/ritual, +/obj/item/material/knife/ritual, /obj/structure/curtain/open/bed, /obj/item/clothing/under/suit_jacket/really_black, /obj/item/clothing/under/suit_jacket/navy, @@ -512,11 +512,11 @@ dir = 8 }, /obj/structure/table/wooden_reinforced, -/obj/item/weapon/book/tome, +/obj/item/book/tome, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bB" = ( -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Seems to be filled with odd runes drawn with blood"; name = "Blood stained paper" }, @@ -537,13 +537,13 @@ /area/submap/lonehome) "bE" = ( /obj/item/seeds/random, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/table/wooden_reinforced, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bF" = ( /obj/machinery/light/small, -/obj/item/weapon/ore/diamond, +/obj/item/ore/diamond, /obj/structure/sign/goldenplaque{ desc = "Done No Harm."; name = "Best Doctor 2552"; @@ -553,7 +553,7 @@ /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bG" = ( -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /obj/item/clothing/gloves/ring/engagement, /obj/structure/table/wooden_reinforced, /turf/simulated/floor/wood/virgo3b, @@ -566,9 +566,9 @@ /area/submap/lonehome) "bI" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/storage/wallet/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/melee/umbrella/random, +/obj/item/storage/wallet/random, +/obj/item/towel/random, +/obj/item/melee/umbrella/random, /obj/random/carp_plushie, /obj/random/curseditem, /obj/random/junk, @@ -578,14 +578,14 @@ /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bJ" = ( -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Seems to be filled with odd runes drawn with blood"; name = "Blood stained paper" }, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bK" = ( -/obj/item/weapon/cell/high/empty, +/obj/item/cell/high/empty, /turf/simulated/floor/carpet/sblucarpet/virgo3b, /area/submap/lonehome) "bL" = ( @@ -596,7 +596,7 @@ /turf/simulated/floor/carpet/sblucarpet/virgo3b, /area/submap/lonehome) "bM" = ( -/obj/item/weapon/paper{ +/obj/item/paper{ info = "F%$K this detective, I swear I can see them peeking from behind the window, these tinted glasses help but I swear I can still see them snooping around. His days are counted... I am so close to figuring this out, just need a few more days. Then Shepiffany will be part of the family once again, then our two kids and I can go back on having a normal life... a normal life..."; name = "Stained sheet of paper" }, @@ -621,18 +621,18 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/paper/courtroom, -/obj/item/weapon/paper/courtroom, -/obj/item/weapon/paper_bin, +/obj/item/paper/courtroom, +/obj/item/paper/courtroom, +/obj/item/paper_bin, /obj/structure/table/wooden_reinforced, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bQ" = ( -/obj/item/weapon/pen/fountain, +/obj/item/pen/fountain, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bR" = ( -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Seems to be filled with odd runes drawn with blood"; name = "Blood stained paper" }, @@ -650,15 +650,15 @@ /turf/simulated/floor/carpet/sblucarpet/virgo3b, /area/submap/lonehome) "bU" = ( -/obj/item/weapon/photo, -/obj/item/weapon/photo{ +/obj/item/photo, +/obj/item/photo{ pixel_x = 4 }, /obj/structure/table/bench/wooden, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bV" = ( -/obj/item/weapon/storage/box/characters, +/obj/item/storage/box/characters, /obj/structure/curtain/open/bed, /obj/structure/table/rack, /turf/simulated/floor/wood/virgo3b, @@ -674,8 +674,8 @@ dir = 1 }, /obj/structure/bed/padded, -/obj/item/weapon/book/custom_library/fiction/truelovehathmyheart, -/obj/item/weapon/bedsheet/clown, +/obj/item/book/custom_library/fiction/truelovehathmyheart, +/obj/item/bedsheet/clown, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bY" = ( @@ -687,8 +687,8 @@ /obj/random/multiple, /obj/random/toy, /obj/random/toy, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "bZ" = ( @@ -703,9 +703,9 @@ /area/submap/lonehome) "cb" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/storage/wallet/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/melee/umbrella/random, +/obj/item/storage/wallet/random, +/obj/item/towel/random, +/obj/item/melee/umbrella/random, /obj/random/ammo, /obj/random/cigarettes, /obj/random/contraband, @@ -735,14 +735,14 @@ /turf/simulated/floor/carpet/bcarpet, /area/submap/lonehome) "cf" = ( -/obj/item/weapon/pack/cardemon, +/obj/item/pack/cardemon, /turf/simulated/floor/carpet/bcarpet, /area/submap/lonehome) "cg" = ( -/obj/item/weapon/reagent_containers/blood, -/obj/item/weapon/pack/cardemon, -/obj/item/weapon/pack/cardemon, -/obj/item/weapon/deck/tarot, +/obj/item/reagent_containers/blood, +/obj/item/pack/cardemon, +/obj/item/pack/cardemon, +/obj/item/deck/tarot, /obj/structure/table/wooden_reinforced, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) @@ -755,9 +755,9 @@ /obj/effect/decal/cleanable/blood/gibs, /obj/structure/table/marble, /obj/item/organ/internal/intestine/unathi, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/bone/ribs, -/obj/item/weapon/bone/skull{ +/obj/item/surgical/bonesetter, +/obj/item/bone/ribs, +/obj/item/bone/skull{ pixel_x = 4; pixel_y = 6 }, @@ -768,20 +768,20 @@ /turf/simulated/wall/wood, /area/submap/lonehome) "ck" = ( -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "cl" = ( -/obj/item/weapon/phone, +/obj/item/phone, /obj/structure/table/bench/wooden, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Seems to be filled with odd runes drawn with blood"; name = "Blood stained paper" }, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "cm" = ( -/obj/item/weapon/pack/cardemon, +/obj/item/pack/cardemon, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "cn" = ( @@ -795,7 +795,7 @@ /obj/random/junk, /obj/random/junk, /obj/random/junk, -/obj/item/weapon/bedsheet/ian, +/obj/item/bedsheet/ian, /turf/simulated/floor/wood/virgo3b, /area/submap/lonehome) "co" = ( @@ -817,7 +817,7 @@ "cq" = ( /obj/structure/table/marble, /obj/item/organ/internal/brain/grey, -/obj/item/weapon/material/knife/plastic, +/obj/item/material/knife/plastic, /turf/simulated/floor/plating/external/virgo3b, /area/submap/lonehome) "cr" = ( @@ -867,7 +867,7 @@ /area/submap/lonehome) "cx" = ( /obj/structure/table/marble, -/obj/item/weapon/material/knife/hook, +/obj/item/material/knife/hook, /turf/simulated/floor/plating/external/virgo3b, /area/submap/lonehome) "cy" = ( @@ -875,7 +875,7 @@ /area/submap/lonehome) "cz" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/outdoors/grass/sif/forest/virgo3b, /area/submap/lonehome) "cA" = ( @@ -916,10 +916,10 @@ /turf/simulated/floor/plating/external/virgo3b, /area/submap/lonehome) "cF" = ( -/obj/item/weapon/chainsaw, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/extinguisher, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/chainsaw, +/obj/item/storage/box/lights/mixed, +/obj/item/extinguisher, +/obj/item/storage/toolbox/mechanical, /obj/structure/table/rack, /turf/simulated/floor/plating/external/virgo3b, /area/submap/lonehome) @@ -941,11 +941,11 @@ /turf/simulated/floor/outdoors/grass/sif/forest/virgo3b, /area/submap/lonehome) "cJ" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/outdoors/grass/sif/forest/virgo3b, /area/submap/lonehome) "cK" = ( -/obj/item/weapon/material/minihoe, +/obj/item/material/minihoe, /turf/simulated/floor/outdoors/grass/sif/forest/virgo3b, /area/submap/lonehome) "cL" = ( @@ -958,7 +958,7 @@ /turf/simulated/floor/plating/external/virgo3b, /area/submap/lonehome) "cN" = ( -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 2; pixel_y = 2 }, @@ -976,7 +976,7 @@ /area/submap/lonehome) "cP" = ( /obj/item/organ/internal/lungs/vox, -/obj/item/weapon/beartrap/hunting{ +/obj/item/beartrap/hunting{ anchored = 1; deployed = 1 }, diff --git a/maps/submaps/surface_submaps/plains/lonewolf.dmm b/maps/submaps/surface_submaps/plains/lonewolf.dmm index c5a950512c1..0265a1cf793 100644 --- a/maps/submaps/surface_submaps/plains/lonewolf.dmm +++ b/maps/submaps/surface_submaps/plains/lonewolf.dmm @@ -85,7 +85,7 @@ /turf/simulated/mineral/ignore_mapgen, /area/submap/lonewolf) "P" = ( -/obj/item/weapon/sword/fluff/joanaria{ +/obj/item/sword/fluff/joanaria{ desc = "An ancient sword, belonging to someone of power. Now, it is little more than a relic, damaged beyong use."; force = 10; name = "old greatsword" diff --git a/maps/submaps/surface_submaps/plains/methlab.dmm b/maps/submaps/surface_submaps/plains/methlab.dmm index 5af4b3eee3e..1386e7639a7 100644 --- a/maps/submaps/surface_submaps/plains/methlab.dmm +++ b/maps/submaps/surface_submaps/plains/methlab.dmm @@ -1,8 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ai" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fountain, +/obj/item/paper_bin, +/obj/item/pen/fountain, /turf/simulated/floor/tiled/steel_dirty, /area/submap/methlab) "as" = ( @@ -10,11 +10,11 @@ /turf/simulated/floor/tiled/steel_grid, /area/submap/methlab) "aY" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ pixel_x = 5; pixel_y = 3 }, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ pixel_x = 9 }, /turf/template_noop, @@ -24,7 +24,7 @@ /turf/template_noop, /area/submap/methlab) "bA" = ( -/obj/item/weapon/cell/hyper, +/obj/item/cell/hyper, /turf/simulated/floor/tiled/steel_dirty, /area/submap/methlab) "bJ" = ( @@ -33,20 +33,20 @@ /turf/simulated/floor/tiled/steel_dirty, /area/submap/methlab) "bQ" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ pixel_x = 9 }, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ pixel_x = 5 }, /turf/template_noop, /area/submap/methlab) "cg" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/radio{ +/obj/item/radio{ anchored = 1; canhear_range = 1; frequency = 1487; @@ -112,7 +112,7 @@ /area/submap/methlab) "iN" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled/steel_dirty, /area/submap/methlab) "jm" = ( @@ -165,7 +165,7 @@ /area/submap/methlab) "mw" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /turf/simulated/floor/tiled/steel_dirty, /area/submap/methlab) "nq" = ( @@ -196,7 +196,7 @@ /turf/template_noop, /area/submap/methlab) "rK" = ( -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/external/virgo3b, /area/submap/methlab) @@ -217,7 +217,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/submap/methlab) "sW" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ pixel_x = 9 }, /turf/template_noop, @@ -255,7 +255,7 @@ /turf/simulated/floor/tiled/old_tile/green/virgo3b, /area/submap/methlab) "wI" = ( -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/random/junk, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel_dirty, @@ -316,7 +316,7 @@ /area/submap/methlab) "AB" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/steel_dirty, /area/submap/methlab) "AM" = ( @@ -337,24 +337,24 @@ /area/submap/methlab) "BR" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/steel_dirty, /area/submap/methlab) "BT" = ( /obj/structure/safe/floor, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, -/obj/item/weapon/storage/bag/cash, -/obj/item/weapon/storage/bag/cash, +/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, +/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, +/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, +/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, +/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, +/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, +/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, +/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, +/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, +/obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, +/obj/item/storage/bag/cash, +/obj/item/storage/bag/cash, /turf/simulated/floor/plating/external/virgo3b, /area/submap/methlab) "CH" = ( @@ -372,7 +372,7 @@ /area/submap/methlab) "CL" = ( /obj/structure/grille/rustic, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/floor/tiled/old_tile/green/virgo3b, @@ -388,7 +388,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/methlab) "DP" = ( -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel_dirty, /area/submap/methlab) @@ -400,7 +400,7 @@ /turf/simulated/floor/tiled/old_tile/white/virgo3b, /area/submap/methlab) "EW" = ( -/obj/item/weapon/stool, +/obj/item/stool, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/external/virgo3b, /area/submap/methlab) @@ -484,7 +484,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/submap/methlab) "LX" = ( -/obj/item/weapon/stool, +/obj/item/stool, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel_dirty, @@ -520,7 +520,7 @@ /area/submap/methlab) "PO" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/module/power_control, +/obj/item/module/power_control, /turf/simulated/floor/tiled/steel_dirty, /area/submap/methlab) "PZ" = ( @@ -558,7 +558,7 @@ /turf/simulated/floor/tiled/old_tile/white/virgo3b, /area/submap/methlab) "Tr" = ( -/obj/item/weapon/stool, +/obj/item/stool, /obj/effect/floor_decal/rust, /obj/random/maintenance/engineering, /turf/simulated/floor/tiled/steel_dirty, @@ -578,18 +578,18 @@ /area/submap/methlab) "TU" = ( /obj/structure/safe/floor, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, -/obj/item/weapon/storage/bag/cash, -/obj/item/weapon/storage/bag/cash, +/obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, +/obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, +/obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, +/obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, +/obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, +/obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, +/obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, +/obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, +/obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, +/obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, +/obj/item/storage/bag/cash, +/obj/item/storage/bag/cash, /turf/simulated/floor/plating/external/virgo3b, /area/submap/methlab) "Uy" = ( @@ -608,7 +608,7 @@ /turf/simulated/floor/tiled/techfloor, /area/submap/methlab) "UO" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/template_noop, @@ -656,8 +656,8 @@ /obj/item/stack/material/phoron{ amount = 5 }, -/obj/item/weapon/extinguisher, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/extinguisher, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/plating/external/virgo3b, /area/submap/methlab) "Yz" = ( @@ -668,7 +668,7 @@ /area/submap/methlab) "Zp" = ( /obj/structure/grille/rustic, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ pixel_x = 5; pixel_y = 3 }, diff --git a/maps/submaps/surface_submaps/plains/oldhotel.dmm b/maps/submaps/surface_submaps/plains/oldhotel.dmm index 92e7accd62b..f195022b43d 100644 --- a/maps/submaps/surface_submaps/plains/oldhotel.dmm +++ b/maps/submaps/surface_submaps/plains/oldhotel.dmm @@ -4,17 +4,17 @@ /turf/simulated/floor/carpet/purcarpet, /area/submap/oldhotel) "aJ" = ( -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid, +/obj/item/storage/firstaid, /turf/simulated/floor/tiled/old_tile/white/virgo3b, /area/submap/oldhotel) "bb" = ( /obj/machinery/light/small{ dir = 4 }, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) "bQ" = ( @@ -23,7 +23,7 @@ /turf/simulated/floor/tiled/old_tile/white/virgo3b, /area/submap/oldhotel) "bW" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/template_noop, /area/submap/oldhotel) "cA" = ( @@ -41,7 +41,7 @@ /area/submap/oldhotel) "dn" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle/everburn, +/obj/item/flame/candle/everburn, /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) "dr" = ( @@ -111,7 +111,7 @@ /area/submap/oldhotel) "je" = ( /obj/structure/closet/cabinet, -/obj/item/device/binoculars/spyglass, +/obj/item/binoculars/spyglass, /obj/random/contraband, /obj/random/contraband, /obj/random/maintenance/medical, @@ -145,20 +145,20 @@ /area/submap/oldhotel) "kW" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/saltshaker, +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) "lj" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/old_tile/white/virgo3b, /area/submap/oldhotel) "ly" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/mimedouble, +/obj/item/bedsheet/mimedouble, /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) "lZ" = ( @@ -168,7 +168,7 @@ /area/submap/oldhotel) "mr" = ( /obj/structure/table/woodentable, -/obj/item/weapon/cell/hyper, +/obj/item/cell/hyper, /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) "mR" = ( @@ -179,7 +179,7 @@ /turf/simulated/floor/plating/external/virgo3b, /area/submap/oldhotel) "nG" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/oldhotel) "nZ" = ( @@ -192,8 +192,8 @@ /turf/simulated/floor/carpet/sblucarpet/virgo3b, /area/submap/oldhotel) "pi" = ( -/obj/item/weapon/material/shard, -/obj/item/weapon/material/shard{ +/obj/item/material/shard, +/obj/item/material/shard{ icon_state = "medium"; pixel_x = 12; pixel_y = 7 @@ -201,8 +201,8 @@ /turf/template_noop, /area/submap/oldhotel) "pn" = ( -/obj/item/weapon/material/shard, -/obj/item/weapon/material/shard{ +/obj/item/material/shard, +/obj/item/material/shard{ pixel_x = 7 }, /turf/template_noop, @@ -213,7 +213,7 @@ /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) "rb" = ( -/obj/item/weapon/module/power_control, +/obj/item/module/power_control, /turf/simulated/floor/tiled/old_tile/white/virgo3b, /area/submap/oldhotel) "rK" = ( @@ -222,7 +222,7 @@ /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) "rZ" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/template_noop, @@ -242,20 +242,20 @@ /area/submap/oldhotel) "tz" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) "tE" = ( /obj/structure/table/woodentable, /obj/random/coin, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /turf/simulated/floor/carpet/sblucarpet/virgo3b, /area/submap/oldhotel) "tV" = ( /obj/structure/bed/chair/wood{ dir = 1 }, -/obj/item/weapon/material/shard, +/obj/item/material/shard, /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) "uF" = ( @@ -280,17 +280,17 @@ /area/submap/oldhotel) "vA" = ( /obj/structure/table/woodentable, -/obj/item/weapon/telecube/randomized{ +/obj/item/telecube/randomized{ name = "Odd artifact" }, /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) "vM" = ( -/obj/item/weapon/material/shard, -/obj/item/weapon/material/shard{ +/obj/item/material/shard, +/obj/item/material/shard{ pixel_y = -6 }, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ pixel_x = 9 }, /obj/structure/grille/broken/rustic, @@ -303,7 +303,7 @@ /area/submap/oldhotel) "vR" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, /turf/simulated/floor/carpet/sblucarpet/virgo3b, /area/submap/oldhotel) "wm" = ( @@ -312,9 +312,9 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/oldhotel) "wK" = ( -/obj/item/weapon/material/shard, -/obj/item/weapon/material/shard, -/obj/item/weapon/material/shard{ +/obj/item/material/shard, +/obj/item/material/shard, +/obj/item/material/shard{ icon_state = "medium"; pixel_x = 12; pixel_y = 7 @@ -323,13 +323,13 @@ /area/submap/oldhotel) "wV" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/food/condiment/enzyme, /turf/simulated/floor/tiled/old_tile/white/virgo3b, /area/submap/oldhotel) "wX" = ( -/obj/item/weapon/material/shard, -/obj/item/weapon/material/shard{ +/obj/item/material/shard, +/obj/item/material/shard{ icon_state = "medium"; pixel_x = 12; pixel_y = 7 @@ -354,9 +354,9 @@ /turf/simulated/wall/wood, /area/submap/oldhotel) "zO" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/structure/grille/broken/rustic, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium"; pixel_x = 12; pixel_y = 7 @@ -369,7 +369,7 @@ /area/submap/oldhotel) "Ac" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/material/knife/butch, +/obj/item/material/knife/butch, /turf/simulated/floor/tiled/old_tile/white/virgo3b, /area/submap/oldhotel) "AO" = ( @@ -378,13 +378,13 @@ /area/submap/oldhotel) "AU" = ( /obj/structure/table/woodentable, -/obj/item/device/tape, +/obj/item/rectape, /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) "AZ" = ( /obj/structure/table/woodentable, /obj/item/trash/candle, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "This is a stupid tresure hunt task, that thing is not taking us anywhere. Go on and have fun finding a waste of time."; name = "Wrinkled sheet of paper" }, @@ -406,7 +406,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/oldhotel) "CS" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) "Di" = ( @@ -463,17 +463,17 @@ /area/submap/oldhotel) "GV" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/flame/lighter/random, -/obj/item/weapon/flame/lighter/random, -/obj/item/weapon/melee/umbrella/random, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, +/obj/item/flame/lighter/random, +/obj/item/flame/lighter/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) "Ik" = ( -/obj/item/weapon/material/shard, -/obj/item/weapon/material/shard{ +/obj/item/material/shard, +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/floor/tiled/old_tile/white/virgo3b, @@ -501,9 +501,9 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/oldhotel) "Lg" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/structure/grille/broken/rustic, -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /turf/simulated/floor/tiled/old_tile/white/virgo3b, @@ -548,14 +548,14 @@ /area/submap/oldhotel) "Qv" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/weapon/pen, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/pen, +/obj/item/pen, /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) "Qw" = ( -/obj/item/weapon/stool, +/obj/item/stool, /obj/random/cash, /obj/machinery/light/small, /turf/simulated/floor/wood/virgo3b, @@ -572,7 +572,7 @@ /area/submap/oldhotel) "Sf" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/yellowdouble, +/obj/item/bedsheet/yellowdouble, /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) "Sy" = ( @@ -583,9 +583,9 @@ /turf/simulated/floor/carpet/purcarpet, /area/submap/oldhotel) "SL" = ( -/obj/item/weapon/material/shard, -/obj/item/weapon/material/shard, -/obj/item/weapon/material/shard{ +/obj/item/material/shard, +/obj/item/material/shard, +/obj/item/material/shard{ icon_state = "medium"; pixel_x = 12; pixel_y = 7 @@ -605,13 +605,13 @@ /area/submap/oldhotel) "Uw" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/book/manual/chef_recipes, +/obj/item/book/manual/chef_recipes, /turf/simulated/floor/tiled/old_tile/white/virgo3b, /area/submap/oldhotel) "UU" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/lighter/zippo/royal, -/obj/item/weapon/lipstick/random, +/obj/item/flame/lighter/zippo/royal, +/obj/item/lipstick/random, /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) "Vf" = ( @@ -649,7 +649,7 @@ /turf/simulated/floor/tiled/old_tile/white/virgo3b, /area/submap/oldhotel) "WH" = ( -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 2; pixel_y = 2 }, @@ -660,7 +660,7 @@ /turf/simulated/floor/wood/virgo3b, /area/submap/oldhotel) "YQ" = ( -/obj/item/weapon/material/shard, +/obj/item/material/shard, /obj/structure/grille/broken/rustic, /turf/simulated/floor/tiled/old_tile/white/virgo3b, /area/submap/oldhotel) diff --git a/maps/submaps/surface_submaps/plains/otieshelter.dmm b/maps/submaps/surface_submaps/plains/otieshelter.dmm index 137930b5f80..3bb8a37c7cb 100644 --- a/maps/submaps/surface_submaps/plains/otieshelter.dmm +++ b/maps/submaps/surface_submaps/plains/otieshelter.dmm @@ -68,7 +68,7 @@ dir = 4 }, /obj/item/trash/bowl, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "hk" = ( @@ -88,7 +88,7 @@ /area/submap/OtieShelter) "iv" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled/virgo3b, /area/submap/OtieShelter) "iC" = ( @@ -120,7 +120,7 @@ /turf/simulated/floor/carpet/turcarpet/virgo3b, /area/submap/OtieShelter) "jI" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/effect/decal/cleanable/blood/tracks{ @@ -181,7 +181,7 @@ }, /mob/living/simple_mob/vore/otie/friendly/chubby, /obj/item/trash/bowl, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "mC" = ( @@ -205,8 +205,8 @@ /area/submap/OtieShelter) "nR" = ( /obj/structure/table/marble, -/obj/item/weapon/newspaper, -/obj/item/weapon/paper/card/heart, +/obj/item/newspaper, +/obj/item/paper/card/heart, /turf/simulated/floor/carpet/turcarpet/virgo3b, /area/submap/OtieShelter) "ob" = ( @@ -219,7 +219,7 @@ /area/submap/OtieShelter) "od" = ( /obj/machinery/door/window, -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "op" = ( @@ -283,7 +283,7 @@ dir = 4 }, /obj/item/trash/bowl, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "uw" = ( @@ -304,14 +304,14 @@ /turf/simulated/floor/tiled, /area/submap/OtieShelter) "vA" = ( -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/floor/tiled/virgo3b, /area/submap/OtieShelter) "vB" = ( /obj/machinery/door/window{ dir = 8 }, -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "vV" = ( @@ -350,7 +350,7 @@ /area/submap/OtieShelter) "yD" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /turf/simulated/floor/tiled/virgo3b, /area/submap/OtieShelter) "Aa" = ( @@ -362,8 +362,8 @@ /area/submap/OtieShelter) "At" = ( /obj/structure/table/marble, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/carpet/turcarpet/virgo3b, /area/submap/OtieShelter) "AO" = ( @@ -374,7 +374,7 @@ /turf/simulated/floor/tiled/virgo3b, /area/submap/OtieShelter) "BM" = ( -/obj/item/weapon/melee/baton/cattleprod, +/obj/item/melee/baton/cattleprod, /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -390,7 +390,7 @@ /area/submap/OtieShelter) "Cw" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid, +/obj/item/storage/firstaid, /turf/simulated/floor/tiled/virgo3b, /area/submap/OtieShelter) "CM" = ( @@ -419,7 +419,7 @@ /turf/simulated/floor/tiled/virgo3b, /area/submap/OtieShelter) "Ih" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "Ij" = ( @@ -487,11 +487,11 @@ "Nd" = ( /obj/structure/table/marble, /obj/structure/table/marble, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/carpet/turcarpet/virgo3b, /area/submap/OtieShelter) "Nh" = ( -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/bed/double/padded, /turf/simulated/floor/carpet/turcarpet, /area/submap/OtieShelter) @@ -538,7 +538,7 @@ dir = 8 }, /obj/item/trash/bowl, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "Px" = ( @@ -596,7 +596,7 @@ dir = 8 }, /obj/item/trash/bowl, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "VE" = ( @@ -639,7 +639,7 @@ dir = 1 }, /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, diff --git a/maps/submaps/surface_submaps/plains/priderock.dmm b/maps/submaps/surface_submaps/plains/priderock.dmm index 371656b0aab..3f6d3660aca 100644 --- a/maps/submaps/surface_submaps/plains/priderock.dmm +++ b/maps/submaps/surface_submaps/plains/priderock.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ae" = ( /obj/structure/railing, -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/priderock) "cR" = ( @@ -41,7 +41,7 @@ /obj/random/maintenance/medical, /obj/random/maintenance/medical, /obj/random/maintenance/medical, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/priderock) "md" = ( @@ -51,8 +51,8 @@ "nG" = ( /obj/structure/railing, /obj/random/junk, -/obj/item/weapon/bone/ribs, -/obj/item/weapon/bone/skull, +/obj/item/bone/ribs, +/obj/item/bone/skull, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/priderock) "nV" = ( @@ -234,7 +234,7 @@ /obj/random/junk, /obj/random/junk, /obj/random/junk, -/obj/item/weapon/bone/skull/tajaran, +/obj/item/bone/skull/tajaran, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/priderock) "Lo" = ( @@ -265,7 +265,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/priderock) "Pb" = ( -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, +/obj/item/storage/backpack/dufflebag/syndie/med, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/submap/priderock) "Pn" = ( @@ -345,7 +345,7 @@ /area/submap/priderock) "XN" = ( /obj/item/clothing/head/bearpelt, -/obj/item/device/binoculars/spyglass, +/obj/item/binoculars/spyglass, /turf/simulated/floor/outdoors/rocks/virgo3b, /area/submap/priderock) "Yd" = ( diff --git a/maps/submaps/surface_submaps/plains/smol2.dmm b/maps/submaps/surface_submaps/plains/smol2.dmm index 739a000ce12..89dd6cdd0b0 100644 --- a/maps/submaps/surface_submaps/plains/smol2.dmm +++ b/maps/submaps/surface_submaps/plains/smol2.dmm @@ -4,7 +4,7 @@ "d" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/smol2) "e" = (/obj/item/stack/material/wood/sif,/obj/item/stack/material/wood/sif,/obj/item/stack/material/wood/sif,/obj/item/stack/material/wood/sif,/obj/item/stack/material/wood/sif,/obj/item/stack/material/wood/sif,/turf/template_noop,/area/submap/smol2) "f" = (/obj/structure/table/woodentable,/turf/template_noop,/area/submap/smol2) -"g" = (/obj/item/weapon/storage/firstaid,/obj/item/stack/medical/splint,/obj/item/weapon/reagent_containers/pill/tramadol,/turf/template_noop,/area/submap/smol2) +"g" = (/obj/item/storage/firstaid,/obj/item/stack/medical/splint,/obj/item/reagent_containers/pill/tramadol,/turf/template_noop,/area/submap/smol2) "h" = (/obj/effect/decal/cleanable/blood,/turf/template_noop,/area/submap/smol2) (1,1,1) = {" diff --git a/maps/submaps/surface_submaps/plains/syndisniper.dmm b/maps/submaps/surface_submaps/plains/syndisniper.dmm index 002cbac1b74..e7f6efb403f 100644 --- a/maps/submaps/surface_submaps/plains/syndisniper.dmm +++ b/maps/submaps/surface_submaps/plains/syndisniper.dmm @@ -33,9 +33,9 @@ /area/submap/SyndiSniper) "w" = ( /obj/structure/table/sifwooden_reinforced, -/obj/item/weapon/storage/mre/random, -/obj/item/device/binoculars, -/obj/item/device/radio/bluespacehandset/linked/talon_prelinked, +/obj/item/storage/mre/random, +/obj/item/binoculars, +/obj/item/radio/bluespacehandset/linked/talon_prelinked, /turf/simulated/floor/outdoors/rocks/virgo3b, /area/submap/SyndiSniper) "B" = ( diff --git a/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm b/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm index 2f60fca5d9f..c0df1053a5c 100644 --- a/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm +++ b/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm @@ -21,7 +21,7 @@ "au" = (/obj/machinery/body_scanconsole,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 5},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) "av" = (/turf/simulated/floor/tiled/steel,/turf/simulated/shuttle/wall/dark{icon_state = "dark5"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown) "aw" = (/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) -"ax" = (/obj/structure/table/steel,/obj/item/weapon/gun/projectile/automatic/wt550,/obj/item/weapon/gun/projectile/automatic/p90,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) +"ax" = (/obj/structure/table/steel,/obj/item/gun/projectile/automatic/wt550,/obj/item/gun/projectile/automatic/p90,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) "ay" = (/obj/effect/floor_decal/borderfloor{dir = 8},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "az" = (/obj/effect/floor_decal/borderfloor{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "aA" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) @@ -41,16 +41,16 @@ "aO" = (/mob/living/simple_mob/humanoid/merc/melee/sword/poi,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) "aP" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) "aQ" = (/obj/structure/table/steel,/obj/effect/floor_decal/borderfloor/full,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"aR" = (/obj/structure/table/steel,/obj/item/weapon/grenade/smokebomb,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) +"aR" = (/obj/structure/table/steel,/obj/item/grenade/smokebomb,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) "aS" = (/obj/effect/floor_decal/borderfloor/corner,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "aT" = (/obj/effect/floor_decal/borderfloor,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "aU" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/borderfloor{dir = 6},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"aV" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/surgery,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) -"aW" = (/obj/structure/table/standard,/obj/item/weapon/tank/anesthetic,/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) +"aV" = (/obj/structure/table/standard,/obj/item/storage/firstaid/surgery,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) +"aW" = (/obj/structure/table/standard,/obj/item/tank/anesthetic,/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) "aX" = (/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) "aY" = (/obj/structure/table/standard,/obj/item/clothing/gloves/sterile,/obj/item/clothing/gloves/sterile,/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) -"aZ" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/spray/sterilizine,/obj/item/weapon/reagent_containers/spray/sterilizine,/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) -"ba" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/masks,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 6},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) +"aZ" = (/obj/structure/table/standard,/obj/item/reagent_containers/spray/sterilizine,/obj/item/reagent_containers/spray/sterilizine,/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) +"ba" = (/obj/structure/table/standard,/obj/item/storage/box/masks,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 6},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) "bb" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/floor_decal/borderfloor{dir = 9},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bc" = (/obj/structure/bed/chair/office/dark{dir = 1},/obj/effect/floor_decal/borderfloor{dir = 5},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bd" = (/obj/machinery/door/airlock/security{locked = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) @@ -60,7 +60,7 @@ "bh" = (/obj/effect/floor_decal/borderfloor/corner{dir = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bi" = (/obj/effect/floor_decal/borderfloor{dir = 9},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bj" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"bk" = (/obj/structure/table/steel,/obj/item/weapon/material/knife,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) +"bk" = (/obj/structure/table/steel,/obj/item/material/knife,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bl" = (/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bm" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bn" = (/obj/random/mob/merc/all,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) @@ -70,7 +70,7 @@ "br" = (/obj/structure/table/steel,/obj/effect/floor_decal/borderfloor{dir = 8},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bs" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/floor_decal/borderfloor{dir = 8},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bt" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/borderfloor{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"bu" = (/obj/item/weapon/stool,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) +"bu" = (/obj/item/stool,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bv" = (/obj/structure/table/steel,/obj/random/projectile,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown) "bw" = (/obj/machinery/fusion_fuel_compressor,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown) "bx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/submap/Blackshuttledown) @@ -89,8 +89,8 @@ "bK" = (/obj/machinery/fusion_fuel_injector/mapped{icon_state = "injector0"; dir = 4},/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown) "bL" = (/obj/effect/floor_decal/borderfloor{dir = 10},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bM" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"bN" = (/obj/structure/table/steel,/obj/item/weapon/paper{info = "We need to take a short stop. The engine's are in need of minor repairs due to turbulence, should be a week's time. We've got reserve food supplies but pleanty of locale fauna to subsist on too if need be. PCRC is keeping most of there assets near New Reykjavik and locale authorities are more mindful then most to travel in this kind of weather. Our outfit should be at the rendezvous point in less then ten days assuming the upper ecehelon hasn't dropped ties with us yet."; name = "Operation Progress/M-53"},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"bO" = (/obj/structure/table/steel,/obj/item/weapon/paper_bin,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) +"bN" = (/obj/structure/table/steel,/obj/item/paper{info = "We need to take a short stop. The engine's are in need of minor repairs due to turbulence, should be a week's time. We've got reserve food supplies but pleanty of locale fauna to subsist on too if need be. PCRC is keeping most of there assets near New Reykjavik and locale authorities are more mindful then most to travel in this kind of weather. Our outfit should be at the rendezvous point in less then ten days assuming the upper ecehelon hasn't dropped ties with us yet."; name = "Operation Progress/M-53"},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) +"bO" = (/obj/structure/table/steel,/obj/item/paper_bin,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bP" = (/obj/machinery/light,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bQ" = (/obj/structure/closet/toolcloset,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown) "bR" = (/obj/machinery/portable_atmospherics/canister/empty/oxygen,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown) @@ -100,13 +100,13 @@ "bV" = (/obj/structure/table/steel,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) "bW" = (/obj/effect/floor_decal/borderfloor/corner{dir = 4},/obj/effect/floor_decal/borderfloor/corner{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bX" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/borderfloor{dir = 5},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"bY" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) +"bY" = (/obj/structure/bed,/obj/item/bedsheet,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bZ" = (/obj/machinery/door/airlock,/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown) "ca" = (/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown) "cb" = (/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) -"cc" = (/obj/structure/table/steel,/obj/item/weapon/gun/projectile/pistol,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) +"cc" = (/obj/structure/table/steel,/obj/item/gun/projectile/pistol,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) "cd" = (/obj/effect/floor_decal/borderfloor{dir = 6},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"ce" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/structure/bed,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) +"ce" = (/obj/structure/bed,/obj/item/bedsheet,/obj/structure/bed,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "cf" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown) "cg" = (/mob/living/simple_mob/mechanical/viscerator,/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) "ch" = (/obj/structure/table/steel,/obj/random/energy,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) @@ -114,9 +114,9 @@ "cj" = (/obj/machinery/light,/obj/structure/table/rack,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/effect/floor_decal/borderfloor{dir = 10},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "ck" = (/obj/structure/dispenser/oxygen,/obj/effect/floor_decal/borderfloor{dir = 6},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "cl" = (/obj/structure/table/woodentable,/obj/random/projectile,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"cm" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/machinery/light,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) +"cm" = (/obj/structure/bed,/obj/item/bedsheet,/obj/machinery/light,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "cn" = (/obj/structure/table/woodentable,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"co" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/item/toy/plushie/spider,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) +"co" = (/obj/structure/bed,/obj/item/bedsheet,/obj/item/toy/plushie/spider,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "cp" = (/turf/template_noop,/turf/simulated/shuttle/wall/dark{icon_state = "dark5"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown) "cq" = (/turf/template_noop,/turf/simulated/shuttle/wall/dark{icon_state = "dark9"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown) "cr" = (/obj/effect/floor_decal/borderfloor{dir = 4},/mob/living/simple_mob/humanoid/merc/melee/sword/poi,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) diff --git a/maps/submaps/surface_submaps/wilderness/Blueshuttledown.dmm b/maps/submaps/surface_submaps/wilderness/Blueshuttledown.dmm index fb5eef1beec..e280fb850bb 100644 --- a/maps/submaps/surface_submaps/wilderness/Blueshuttledown.dmm +++ b/maps/submaps/surface_submaps/wilderness/Blueshuttledown.dmm @@ -21,7 +21,7 @@ "au" = (/obj/machinery/body_scanconsole,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 5},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) "av" = (/turf/simulated/floor/tiled/steel,/turf/simulated/shuttle/wall/dark{icon_state = "dark5"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown) "aw" = (/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) -"ax" = (/obj/structure/table/steel,/obj/item/weapon/gun/projectile/automatic/wt550,/obj/item/weapon/gun/projectile/automatic/p90,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) +"ax" = (/obj/structure/table/steel,/obj/item/gun/projectile/automatic/wt550,/obj/item/gun/projectile/automatic/p90,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) "ay" = (/obj/effect/floor_decal/borderfloor{dir = 8},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "az" = (/obj/effect/floor_decal/borderfloor{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "aA" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) @@ -41,16 +41,16 @@ "aO" = (/mob/living/simple_mob/humanoid/merc/melee/sword/poi,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) "aP" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 4},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) "aQ" = (/obj/structure/table/steel,/obj/effect/floor_decal/borderfloor/full,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"aR" = (/obj/structure/table/steel,/obj/item/weapon/grenade/smokebomb,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) +"aR" = (/obj/structure/table/steel,/obj/item/grenade/smokebomb,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) "aS" = (/obj/effect/floor_decal/borderfloor/corner,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "aT" = (/obj/effect/floor_decal/borderfloor,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "aU" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/borderfloor{dir = 6},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"aV" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/surgery,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) -"aW" = (/obj/structure/table/standard,/obj/item/weapon/tank/anesthetic,/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) +"aV" = (/obj/structure/table/standard,/obj/item/storage/firstaid/surgery,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 10},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) +"aW" = (/obj/structure/table/standard,/obj/item/tank/anesthetic,/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) "aX" = (/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) "aY" = (/obj/structure/table/standard,/obj/item/clothing/gloves/sterile,/obj/item/clothing/gloves/sterile,/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) -"aZ" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/spray/sterilizine,/obj/item/weapon/reagent_containers/spray/sterilizine,/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) -"ba" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/masks,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 6},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) +"aZ" = (/obj/structure/table/standard,/obj/item/reagent_containers/spray/sterilizine,/obj/item/reagent_containers/spray/sterilizine,/obj/effect/floor_decal/corner/green/border,/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) +"ba" = (/obj/structure/table/standard,/obj/item/storage/box/masks,/obj/effect/floor_decal/corner/green/border{icon_state = "bordercolor"; dir = 6},/turf/simulated/floor/tiled/white,/area/submap/Blackshuttledown) "bb" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/floor_decal/borderfloor{dir = 9},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bc" = (/obj/structure/bed/chair/office/dark{dir = 1},/obj/effect/floor_decal/borderfloor{dir = 5},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bd" = (/obj/machinery/door/airlock/security{locked = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) @@ -60,7 +60,7 @@ "bh" = (/obj/effect/floor_decal/borderfloor/corner{dir = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bi" = (/obj/effect/floor_decal/borderfloor{dir = 9},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bj" = (/obj/structure/closet/secure_closet/freezer/fridge,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"bk" = (/obj/structure/table/steel,/obj/item/weapon/material/knife,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) +"bk" = (/obj/structure/table/steel,/obj/item/material/knife,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bl" = (/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bm" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bn" = (/obj/structure/curtain/open/shower/security,/obj/structure/window/reinforced/tinted/frosted{icon_state = "fwindow"; dir = 1},/obj/structure/window/reinforced/tinted/frosted,/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown) @@ -70,7 +70,7 @@ "br" = (/obj/structure/table/steel,/obj/effect/floor_decal/borderfloor{dir = 8},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bs" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/effect/floor_decal/borderfloor{dir = 8},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bt" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/borderfloor{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"bu" = (/obj/item/weapon/stool,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) +"bu" = (/obj/item/stool,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bv" = (/obj/structure/table/steel,/obj/random/projectile,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown) "bw" = (/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -16},/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown) "bx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/submap/Blackshuttledown) @@ -89,8 +89,8 @@ "bK" = (/mob/living/simple_mob/humanoid/merc/ranged/laser/poi,/turf/template_noop,/area/submap/Blackshuttledown) "bL" = (/obj/effect/floor_decal/borderfloor{dir = 10},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bM" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"bN" = (/obj/structure/table/steel,/obj/item/weapon/paper{info = "We need to take a short stop. The engine's are in need of minor repairs due to turbulence, should be a week's time. We've got reserve food supplies but pleanty of locale fauna to subsist on too if need be. PCRC is keeping most of there assets near New Reykjavik and locale authorities are more mindful then most to travel in this kind of weather. Our outfit should be at the rendezvous point in less then ten days assuming the upper ecehelon hasn't dropped ties with us yet."; name = "Operation Progress/M-53"},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"bO" = (/obj/structure/table/steel,/obj/item/weapon/paper_bin,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) +"bN" = (/obj/structure/table/steel,/obj/item/paper{info = "We need to take a short stop. The engine's are in need of minor repairs due to turbulence, should be a week's time. We've got reserve food supplies but pleanty of locale fauna to subsist on too if need be. PCRC is keeping most of there assets near New Reykjavik and locale authorities are more mindful then most to travel in this kind of weather. Our outfit should be at the rendezvous point in less then ten days assuming the upper ecehelon hasn't dropped ties with us yet."; name = "Operation Progress/M-53"},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) +"bO" = (/obj/structure/table/steel,/obj/item/paper_bin,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bP" = (/obj/machinery/light,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bQ" = (/obj/structure/closet/toolcloset,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown) "bR" = (/obj/machinery/portable_atmospherics/canister/empty/oxygen,/turf/simulated/floor/tiled/yellow,/area/submap/Blackshuttledown) @@ -100,13 +100,13 @@ "bV" = (/obj/structure/table/steel,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) "bW" = (/obj/effect/floor_decal/borderfloor/corner{dir = 4},/obj/effect/floor_decal/borderfloor/corner{dir = 4},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bX" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/borderfloor{dir = 5},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"bY" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) +"bY" = (/obj/structure/bed,/obj/item/bedsheet,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "bZ" = (/obj/machinery/door/airlock,/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown) "ca" = (/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown) "cb" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/structure/curtain/open/shower/security,/obj/structure/window/reinforced/tinted/frosted{icon_state = "fwindow"; dir = 1},/obj/structure/window/reinforced/tinted/frosted,/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown) -"cc" = (/obj/structure/table/steel,/obj/item/weapon/gun/projectile/pistol,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) +"cc" = (/obj/structure/table/steel,/obj/item/gun/projectile/pistol,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) "cd" = (/obj/effect/floor_decal/borderfloor{dir = 6},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"ce" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/structure/bed,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) +"ce" = (/obj/structure/bed,/obj/item/bedsheet,/obj/structure/bed,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "cf" = (/obj/structure/urinal{dir = 4; icon_state = "urinal"; pixel_x = -32},/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown) "cg" = (/obj/structure/toilet{icon_state = "toilet00"; dir = 4},/obj/structure/curtain,/obj/structure/window/reinforced/tinted/frosted{icon_state = "fwindow"; dir = 1},/turf/simulated/floor/tiled/hydro,/area/submap/Blackshuttledown) "ch" = (/obj/structure/table/steel,/obj/random/energy,/turf/simulated/floor/tiled/steel_grid,/area/submap/Blackshuttledown) @@ -114,7 +114,7 @@ "cj" = (/obj/machinery/light,/obj/structure/table/rack,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/item/clothing/suit/space,/obj/effect/floor_decal/borderfloor{dir = 10},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "ck" = (/obj/structure/dispenser/oxygen,/obj/effect/floor_decal/borderfloor{dir = 6},/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "cl" = (/obj/structure/table/woodentable,/obj/random/projectile,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) -"cm" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/machinery/light,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) +"cm" = (/obj/structure/bed,/obj/item/bedsheet,/obj/machinery/light,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) "cp" = (/turf/template_noop,/turf/simulated/shuttle/wall/dark{icon_state = "dark5"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown) "cq" = (/turf/template_noop,/turf/simulated/shuttle/wall/dark{icon_state = "dark9"; name = "Unknown Shuttle"},/area/submap/Blackshuttledown) "cr" = (/obj/effect/floor_decal/borderfloor{dir = 4},/mob/living/simple_mob/humanoid/merc/melee/sword/poi,/turf/simulated/floor/tiled/steel,/area/submap/Blackshuttledown) diff --git a/maps/submaps/surface_submaps/wilderness/Boombase.dmm b/maps/submaps/surface_submaps/wilderness/Boombase.dmm index 438cd0a713f..cd9d6c1918c 100644 --- a/maps/submaps/surface_submaps/wilderness/Boombase.dmm +++ b/maps/submaps/surface_submaps/wilderness/Boombase.dmm @@ -11,12 +11,12 @@ "ak" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/steel{ icon_state = "burned1"},/area/submap/BoomBase) "al" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/ash,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase) "am" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase) -"an" = (/obj/effect/decal/cleanable/dirt,/obj/effect/spider,/obj/item/weapon/material/shard,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase) +"an" = (/obj/effect/decal/cleanable/dirt,/obj/effect/spider,/obj/item/material/shard,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase) "ao" = (/turf/simulated/floor/tiled/steel,/area/submap/BoomBase) "ap" = (/mob/living/simple_mob/animal/giant_spider/phorogenic,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase) "aq" = (/obj/machinery/portable_atmospherics/canister/empty/phoron,/turf/simulated/floor/tiled/steel{ icon_state = "steel_dirty"},/area/submap/BoomBase) -"ar" = (/obj/machinery/portable_atmospherics/canister/empty/phoron,/obj/item/weapon/material/shard,/turf/simulated/floor/tiled/steel{ icon_state = "steel_dirty"},/area/submap/BoomBase) -"as" = (/obj/item/weapon/material/shard,/turf/simulated/floor/plating,/area/submap/BoomBase) +"ar" = (/obj/machinery/portable_atmospherics/canister/empty/phoron,/obj/item/material/shard,/turf/simulated/floor/tiled/steel{ icon_state = "steel_dirty"},/area/submap/BoomBase) +"as" = (/obj/item/material/shard,/turf/simulated/floor/plating,/area/submap/BoomBase) "at" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/plating,/area/submap/BoomBase) "au" = (/turf/simulated/floor/outdoors/dirt,/area/submap/BoomBase) "av" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/BoomBase) @@ -37,14 +37,14 @@ "aK" = (/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/animal/giant_spider/phorogenic,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase) "aL" = (/turf/simulated/floor/tiled/steel{ icon_state = "burned2"},/area/submap/BoomBase) "aM" = (/turf/simulated/floor/outdoors/rocks,/area/submap/BoomBase) -"aN" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/standard,/obj/item/weapon/tank/phoron,/obj/item/weapon/fuel_assembly/phoron,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase) +"aN" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/standard,/obj/item/tank/phoron,/obj/item/fuel_assembly/phoron,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase) "aO" = (/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/ash,/turf/simulated/floor/tiled/steel{ icon_state = "steel_dirty"},/area/submap/BoomBase) -"aP" = (/obj/item/weapon/material/shard,/turf/simulated/floor/tiled/steel{ icon_state = "steel_dirty"},/area/submap/BoomBase) -"aQ" = (/obj/item/device/transfer_valve,/turf/simulated/floor/outdoors/rocks,/area/submap/BoomBase) -"aR" = (/obj/item/weapon/material/shard,/turf/template_noop,/area/submap/BoomBase) +"aP" = (/obj/item/material/shard,/turf/simulated/floor/tiled/steel{ icon_state = "steel_dirty"},/area/submap/BoomBase) +"aQ" = (/obj/item/transfer_valve,/turf/simulated/floor/outdoors/rocks,/area/submap/BoomBase) +"aR" = (/obj/item/material/shard,/turf/template_noop,/area/submap/BoomBase) "aS" = (/obj/effect/decal/cleanable/ash,/turf/simulated/floor/plating,/area/submap/BoomBase) "aT" = (/obj/effect/decal/cleanable/ash,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase) -"aU" = (/obj/effect/spider/stickyweb,/obj/item/weapon/material/shard,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase) +"aU" = (/obj/effect/spider/stickyweb,/obj/item/material/shard,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase) "aV" = (/obj/effect/spider/stickyweb,/obj/random/mob/spider/mutant,/turf/simulated/floor/tiled/steel,/area/submap/BoomBase) "aW" = (/obj/effect/spider/stickyweb,/obj/effect/decal/cleanable/ash,/turf/simulated/floor/tiled/steel{ icon_state = "burned1"},/area/submap/BoomBase) "aX" = (/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/ash,/turf/template_noop,/area/submap/BoomBase) diff --git a/maps/submaps/surface_submaps/wilderness/CaveS.dmm b/maps/submaps/surface_submaps/wilderness/CaveS.dmm index 898ade189a6..145dc0f410d 100644 --- a/maps/submaps/surface_submaps/wilderness/CaveS.dmm +++ b/maps/submaps/surface_submaps/wilderness/CaveS.dmm @@ -2,16 +2,16 @@ "b" = (/turf/template_noop,/area/submap/CaveS) "c" = (/obj/item/ammo_casing/a45,/turf/template_noop,/area/submap/CaveS) "d" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/CaveS) -"e" = (/obj/item/ammo_casing/a45,/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat,/turf/template_noop,/area/submap/CaveS) +"e" = (/obj/item/ammo_casing/a45,/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat,/turf/template_noop,/area/submap/CaveS) "f" = (/obj/random/landmine,/turf/template_noop,/area/submap/CaveS) "g" = (/obj/item/ammo_casing/a45,/obj/random/landmine,/turf/template_noop,/area/submap/CaveS) "h" = (/obj/random/landmine,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/CaveS) "i" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/CaveS) "j" = (/obj/item/ammo_casing/a45,/obj/item/ammo_casing/a45,/turf/template_noop,/area/submap/CaveS) "k" = (/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/CaveS) -"l" = (/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat,/turf/template_noop,/area/submap/CaveS) +"l" = (/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat,/turf/template_noop,/area/submap/CaveS) "m" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/dirt,/area/submap/CaveS) -"n" = (/obj/item/clothing/accessory/storage/webbing,/obj/item/weapon/material/knife/tacknife/combatknife,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/CaveS) +"n" = (/obj/item/clothing/accessory/storage/webbing,/obj/item/material/knife/tacknife/combatknife,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/CaveS) "o" = (/mob/living/simple_mob/animal/giant_spider,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/CaveS) "p" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/CaveS) "q" = (/obj/random/mob/spider,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/CaveS) @@ -25,14 +25,14 @@ "y" = (/obj/structure/flora/tree/sif,/turf/simulated/floor/outdoors/grass/sif/forest,/area/submap/CaveS) "z" = (/obj/random/landmine,/turf/simulated/floor/outdoors/grass/sif/forest,/area/submap/CaveS) "A" = (/turf/simulated/floor,/area/submap/CaveS) -"B" = (/obj/structure/closet/crate,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/item/weapon/storage/toolbox,/obj/random/toolbox,/turf/simulated/floor,/area/submap/CaveS) +"B" = (/obj/structure/closet/crate,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/item/storage/toolbox,/obj/random/toolbox,/turf/simulated/floor,/area/submap/CaveS) "C" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor,/area/submap/CaveS) "D" = (/obj/structure/table/woodentable,/turf/simulated/floor,/area/submap/CaveS) "E" = (/obj/machinery/power/port_gen/pacman,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor,/area/submap/CaveS) "F" = (/turf/simulated/wall,/area/submap/CaveS) -"G" = (/obj/structure/closet/crate,/obj/item/weapon/reagent_containers/hypospray,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/antitoxin,/obj/item/weapon/reagent_containers/pill/antitox,/obj/item/weapon/reagent_containers/pill/antitox,/obj/item/weapon/reagent_containers/pill/antitox,/obj/item/weapon/reagent_containers/pill/paracetamol,/obj/random/firstaid,/turf/simulated/floor,/area/submap/CaveS) +"G" = (/obj/structure/closet/crate,/obj/item/reagent_containers/hypospray,/obj/item/reagent_containers/glass/bottle/stoxin,/obj/item/reagent_containers/glass/bottle/antitoxin,/obj/item/reagent_containers/pill/antitox,/obj/item/reagent_containers/pill/antitox,/obj/item/reagent_containers/pill/antitox,/obj/item/reagent_containers/pill/paracetamol,/obj/random/firstaid,/turf/simulated/floor,/area/submap/CaveS) "H" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor,/area/submap/CaveS) -"I" = (/obj/structure/closet/crate,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/random/energy,/obj/item/weapon/material/star,/obj/item/weapon/material/star,/obj/item/weapon/material/star,/obj/item/weapon/material/star,/obj/item/weapon/material/star,/turf/simulated/floor,/area/submap/CaveS) +"I" = (/obj/structure/closet/crate,/obj/random/contraband,/obj/random/contraband,/obj/random/contraband,/obj/random/energy,/obj/item/material/star,/obj/item/material/star,/obj/item/material/star,/obj/item/material/star,/obj/item/material/star,/turf/simulated/floor,/area/submap/CaveS) "J" = (/obj/effect/spider/stickyweb,/mob/living/simple_mob/animal/giant_spider/lurker,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/CaveS) "K" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/submap/CaveS) "L" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/submap/CaveS) diff --git a/maps/submaps/surface_submaps/wilderness/Chapel.dmm b/maps/submaps/surface_submaps/wilderness/Chapel.dmm index a681497ed86..7592cba193a 100644 --- a/maps/submaps/surface_submaps/wilderness/Chapel.dmm +++ b/maps/submaps/surface_submaps/wilderness/Chapel.dmm @@ -2,8 +2,8 @@ "ab" = (/turf/simulated/floor/outdoors/rocks,/area/template_noop) "ac" = (/turf/simulated/wall/log_sif,/area/submap/Chapel1) "ad" = (/obj/structure/lightpost,/turf/simulated/floor/outdoors/grass/sif/forest,/area/submap/Chapel1) -"ae" = (/obj/structure/closet/hydrant{pixel_y = 32},/obj/item/weapon/book/tome,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) -"af" = (/obj/item/weapon/flame/candle/everburn,/turf/simulated/floor/outdoors/rocks,/area/template_noop) +"ae" = (/obj/structure/closet/hydrant{pixel_y = 32},/obj/item/book/tome,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) +"af" = (/obj/item/flame/candle/everburn,/turf/simulated/floor/outdoors/rocks,/area/template_noop) "ag" = (/obj/structure/bookcase,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "ah" = (/turf/simulated/floor/outdoors/grass/sif,/area/template_noop) "ai" = (/turf/simulated/floor/outdoors/grass/sif/forest,/area/template_noop) @@ -11,21 +11,21 @@ "ak" = (/obj/structure/closet/grave,/obj/random/mob/spider{mob_faction = "neutral"},/turf/simulated/floor/outdoors/rocks,/area/template_noop) "al" = (/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "am" = (/obj/structure/loot_pile/maint/boxfort,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) -"an" = (/obj/item/weapon/material/knife/ritual,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) +"an" = (/obj/item/material/knife/ritual,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "ao" = (/obj/structure/closet/grave,/turf/simulated/floor/outdoors/dirt,/area/template_noop) -"ap" = (/obj/structure/loot_pile/surface/bones,/obj/item/weapon/coin/diamond,/obj/item/clothing/under/technomancer/master,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) +"ap" = (/obj/structure/loot_pile/surface/bones,/obj/item/coin/diamond,/obj/item/clothing/under/technomancer/master,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "aq" = (/obj/structure/closet/grave,/turf/simulated/floor/outdoors/grass/sif/forest,/area/template_noop) "ar" = (/obj/random/mob/spider/nurse{mob_faction = "neutral"},/obj/structure/closet/grave,/turf/simulated/floor/outdoors/dirt,/area/template_noop) -"as" = (/obj/item/weapon/scepter,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) +"as" = (/obj/item/scepter,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "at" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "au" = (/obj/structure/table/sifwoodentable,/obj/item/godfig,/turf/simulated/floor/wood/sif/broken,/area/submap/Chapel1) "av" = (/obj/structure/table/sifwoodentable,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) -"aw" = (/obj/structure/table/sifwoodentable,/obj/item/weapon/flame/candle/candelabra/everburn,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) +"aw" = (/obj/structure/table/sifwoodentable,/obj/item/flame/candle/candelabra/everburn,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "ax" = (/obj/machinery/vending/sovietsoda,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "ay" = (/obj/random/junk,/obj/structure/table/sifwoodentable,/obj/random/soap,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "az" = (/obj/machinery/microwave,/obj/structure/table/sifwoodentable,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "aA" = (/obj/random/junk,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) -"aB" = (/obj/vehicle/boat/dragon/sifwood,/obj/item/weapon/oar/sifwood,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) +"aB" = (/obj/vehicle/boat/dragon/sifwood,/obj/item/oar/sifwood,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "aC" = (/turf/simulated/floor/wood/sif/broken,/area/submap/Chapel1) "aD" = (/obj/structure/ghost_pod/automatic/gravekeeper_drone,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "aE" = (/obj/structure/closet/coffin,/obj/random/maintenance/clean,/obj/effect/decal/remains/human,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) @@ -35,44 +35,44 @@ "aI" = (/obj/machinery/floodlight,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "aJ" = (/obj/structure/closet/coffin,/obj/random/medical,/obj/effect/decal/remains/human,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "aK" = (/obj/structure/closet/coffin,/obj/random/meat,/obj/random/meat,/obj/effect/decal/remains/xeno,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) -"aL" = (/obj/structure/table/sifwoodentable,/obj/item/weapon/flame/candle/everburn,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) +"aL" = (/obj/structure/table/sifwoodentable,/obj/item/flame/candle/everburn,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "aM" = (/obj/random/trash,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "aN" = (/obj/structure/table/sifwoodentable,/obj/random/multiple/gun/projectile/handgun,/obj/structure/safe/floor,/obj/random/medical/pillbottle,/obj/random/cash,/obj/random/drinkbottle,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) -"aO" = (/obj/structure/table/sifwoodentable,/obj/item/weapon/chainsaw,/obj/random/tool/powermaint,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) +"aO" = (/obj/structure/table/sifwoodentable,/obj/item/chainsaw,/obj/random/tool/powermaint,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "aP" = (/obj/structure/closet/coffin,/obj/random/maintenance/clean,/obj/effect/decal/remains/deer,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) -"aQ" = (/obj/item/weapon/oar/sifwood,/turf/simulated/floor/wood/sif/broken,/area/submap/Chapel1) +"aQ" = (/obj/item/oar/sifwood,/turf/simulated/floor/wood/sif/broken,/area/submap/Chapel1) "aR" = (/obj/random/mouseremains,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "aS" = (/obj/structure/table/sifwoodentable,/obj/fiftyspawner/sifwood,/obj/fiftyspawner/sifwood,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) -"aT" = (/obj/structure/closet/coffin,/obj/random/drinkbottle,/obj/item/weapon/ectoplasm,/obj/effect/decal/remains/human,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) +"aT" = (/obj/structure/closet/coffin,/obj/random/drinkbottle,/obj/item/ectoplasm,/obj/effect/decal/remains/human,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "aU" = (/obj/structure/closet/coffin,/obj/random/junk,/obj/effect/decal/remains/human,/turf/simulated/floor/wood/sif/broken,/area/submap/Chapel1) -"aV" = (/obj/item/weapon/flame/candle/candelabra,/obj/structure/table/sifwoodentable,/turf/simulated/floor/wood/sif/broken,/area/submap/Chapel1) -"aW" = (/obj/structure/table/sifwoodentable,/obj/item/weapon/flame/candle/candelabra,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) +"aV" = (/obj/item/flame/candle/candelabra,/obj/structure/table/sifwoodentable,/turf/simulated/floor/wood/sif/broken,/area/submap/Chapel1) +"aW" = (/obj/structure/table/sifwoodentable,/obj/item/flame/candle/candelabra,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "aX" = (/obj/structure/table/sifwoodentable,/obj/item/glass_jar,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "aY" = (/obj/structure/closet/coffin,/obj/random/maintenance/cargo,/obj/effect/decal/remains/human,/obj/random/projectile/scrapped_gun,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "aZ" = (/obj/structure/simple_door/sifwood,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "ba" = (/obj/structure/bed/padded,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "bb" = (/obj/structure/closet/coffin,/obj/random/cash,/obj/effect/decal/remains/xeno,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) -"bc" = (/obj/item/weapon/flame/candle/candelabra,/obj/structure/table/sifwoodentable,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) +"bc" = (/obj/item/flame/candle/candelabra,/obj/structure/table/sifwoodentable,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "bd" = (/obj/structure/table/sifwoodentable,/obj/structure/bedsheetbin,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "be" = (/obj/structure/closet/coffin,/obj/random/maintenance/clean,/obj/effect/decal/remains/ribcage,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "bf" = (/obj/structure/closet/coffin,/obj/random/contraband,/obj/effect/decal/remains/mouse,/obj/effect/decal/remains/unathi,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "bg" = (/obj/random/trash,/turf/simulated/floor/wood/sif/broken,/area/submap/Chapel1) -"bh" = (/obj/structure/table/sifwoodentable,/obj/item/weapon/material/harpoon,/obj/item/weapon/material/harpoon,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) +"bh" = (/obj/structure/table/sifwoodentable,/obj/item/material/harpoon,/obj/item/material/harpoon,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "bi" = (/obj/structure/closet/coffin,/obj/random/cash,/obj/effect/decal/remains/ribcage,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) -"bj" = (/obj/structure/table/sifwoodentable,/obj/random/toolbox,/obj/item/weapon/flame/candle/everburn,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) -"bk" = (/obj/structure/table/sifwoodentable,/obj/item/weapon/material/fishing_net,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) +"bj" = (/obj/structure/table/sifwoodentable,/obj/random/toolbox,/obj/item/flame/candle/everburn,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) +"bk" = (/obj/structure/table/sifwoodentable,/obj/item/material/fishing_net,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "bl" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/turf/simulated/floor/outdoors/grass/sif,/area/template_noop) "bm" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/turf/simulated/floor/outdoors/grass/sif/forest,/area/template_noop) "bn" = (/obj/structure/sink/puddle,/turf/simulated/floor/outdoors/grass/sif/forest,/area/template_noop) -"bo" = (/obj/item/weapon/flame/candle/everburn,/turf/simulated/floor/outdoors/dirt,/area/template_noop) +"bo" = (/obj/item/flame/candle/everburn,/turf/simulated/floor/outdoors/dirt,/area/template_noop) "bp" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/turf/simulated/floor/outdoors/rocks,/area/template_noop) "bq" = (/obj/machinery/vending/hydroseeds,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "br" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) -"bs" = (/obj/item/weapon/ore,/obj/item/weapon/ore,/obj/item/weapon/ore,/obj/item/weapon/ore,/obj/item/weapon/ore/gold,/obj/item/weapon/ore/diamond,/obj/item/weapon/ore/silver,/obj/item/weapon/ore/uranium,/obj/item/weapon/ore,/obj/item/weapon/ore,/obj/item/weapon/ore,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/coal,/obj/item/weapon/pickaxe/hand,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) +"bs" = (/obj/item/ore,/obj/item/ore,/obj/item/ore,/obj/item/ore,/obj/item/ore/gold,/obj/item/ore/diamond,/obj/item/ore/silver,/obj/item/ore/uranium,/obj/item/ore,/obj/item/ore,/obj/item/ore,/obj/item/ore/coal,/obj/item/ore/coal,/obj/item/ore/coal,/obj/item/pickaxe/hand,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "bt" = (/obj/machinery/vending/hydronutrients,/turf/simulated/floor/wood/sif/broken,/area/submap/Chapel1) "bu" = (/obj/machinery/space_heater,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "bv" = (/obj/random/obstruction,/turf/simulated/floor/outdoors/rocks,/area/template_noop) -"bw" = (/obj/structure/closet/coffin,/obj/random/maintenance/cargo,/obj/item/weapon/ectoplasm,/obj/effect/decal/remains/xeno,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) +"bw" = (/obj/structure/closet/coffin,/obj/random/maintenance/cargo,/obj/item/ectoplasm,/obj/effect/decal/remains/xeno,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "bx" = (/obj/structure/closet/coffin,/obj/random/junk,/obj/effect/decal/remains/tajaran,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "by" = (/obj/structure/closet/coffin,/obj/random/junk,/obj/effect/decal/remains/human,/turf/simulated/floor/wood/sif,/area/submap/Chapel1) "bz" = (/obj/structure/closet/coffin,/obj/random/maintenance/clean,/obj/effect/decal/remains/xeno,/turf/simulated/floor/wood/sif/broken,/area/submap/Chapel1) diff --git a/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm b/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm index 6b85ef347ad..51b1b9533f0 100644 --- a/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm +++ b/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm @@ -1,46 +1,46 @@ "a" = (/turf/template_noop,/area/template_noop) "b" = (/turf/simulated/wall/wood,/area/submap/DJOutpost1) -"c" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/obj/item/weapon/material/shard{ icon_state = "shardmedium"},/obj/item/stack/rods,/turf/simulated/floor,/area/submap/DJOutpost1) +"c" = (/obj/structure/grille/broken,/obj/item/material/shard,/obj/item/material/shard{ icon_state = "shardmedium"},/obj/item/stack/rods,/turf/simulated/floor,/area/submap/DJOutpost1) "d" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor,/area/submap/DJOutpost1) "e" = (/turf/simulated/floor/wood,/area/submap/DJOutpost1) "f" = (/obj/machinery/telecomms/relay/preset/ruskie,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "g" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "h" = (/obj/structure/sign/goldenplaque{desc = "An award given to Sif Free Radio for media excellency. It looks fake."; name = "Best Radio Station 2558"; pixel_y = 30},/turf/simulated/floor/wood,/area/submap/DJOutpost1) "i" = (/mob/living/simple_mob/animal/giant_spider/frost,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"j" = (/obj/effect/decal/remains,/obj/effect/decal/cleanable/blood,/obj/item/clothing/under/frontier,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"j" = (/obj/effect/decal/remains,/obj/effect/decal/cleanable/blood,/obj/item/clothing/under/frontier,/obj/item/material/knife/tacknife/combatknife,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "k" = (/obj/machinery/door/airlock/glass,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"l" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{ icon_state = "intercom"; dir = 8},/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"m" = (/obj/machinery/computer/message_monitor,/obj/item/weapon/paper/monitorkey,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"l" = (/obj/structure/table/steel_reinforced,/obj/item/radio/intercom{ icon_state = "intercom"; dir = 8},/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"m" = (/obj/machinery/computer/message_monitor,/obj/item/paper/monitorkey,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/wood,/area/submap/DJOutpost1) "n" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/submap/DJOutpost1) "o" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1) "p" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"q" = (/obj/effect/decal/remains,/obj/item/clothing/under/dress/blacktango,/obj/effect/decal/cleanable/blood,/obj/item/device/universal_translator/ear,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"q" = (/obj/effect/decal/remains,/obj/item/clothing/under/dress/blacktango,/obj/effect/decal/cleanable/blood,/obj/item/universal_translator/ear,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "r" = (/obj/random/mob/spider/mutant,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "s" = (/obj/structure/bed/chair/office/dark{ icon_state = "officechair_dark"; dir = 8},/turf/simulated/floor/wood,/area/submap/DJOutpost1) "t" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/bed/chair/office/dark{dir = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood,/area/submap/DJOutpost1) "u" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/closet/crate,/obj/item/stack/material/phoron{amount = 25},/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1) "v" = (/obj/structure/table/woodentable,/obj/item/trash/candle,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "w" = (/obj/structure/bed/chair/wood{ icon_state = "wooden_chair"; dir = 8},/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"x" = (/obj/structure/bookcase,/obj/item/weapon/book/codex/lore/vir,/obj/item/weapon/book/manual/excavation,/obj/item/weapon/book/manual/engineering_construction,/obj/item/weapon/storage/bible,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"y" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"z" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/phone,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"A" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom/syndicate{desc = "Talk through this."; name = "station intercom (General)"},/obj/item/device/multitool,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"B" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio,/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/hyper; dir = 4; environ = 1; equipment = 1; lighting = 1; locked = 0; name = "Sif Free Radio APC"; operating = 0; pixel_x = 24},/obj/structure/cable/yellow,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"x" = (/obj/structure/bookcase,/obj/item/book/codex/lore/vir,/obj/item/book/manual/excavation,/obj/item/book/manual/engineering_construction,/obj/item/storage/bible,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"y" = (/obj/item/storage/toolbox/mechanical,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"z" = (/obj/structure/table/steel_reinforced,/obj/item/radio/phone,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"A" = (/obj/structure/table/steel_reinforced,/obj/item/radio/intercom/syndicate{desc = "Talk through this."; name = "station intercom (General)"},/obj/item/multitool,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"B" = (/obj/structure/table/steel_reinforced,/obj/item/radio,/obj/machinery/power/apc{cell_type = /obj/item/cell/hyper; dir = 4; environ = 1; equipment = 1; lighting = 1; locked = 0; name = "Sif Free Radio APC"; operating = 0; pixel_x = 24},/obj/structure/cable/yellow,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "C" = (/obj/effect/overlay/snow/floor,/obj/machinery/power/port_gen/pacman,/obj/structure/cable/yellow,/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1) -"D" = (/obj/machinery/door/airlock/glass,/obj/item/device/gps/internal/poi,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"D" = (/obj/machinery/door/airlock/glass,/obj/item/gps/internal/poi,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "E" = (/obj/machinery/biogenerator,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"F" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/snacks/unajerky,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"F" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/snacks/unajerky,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "G" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/seed_extractor,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "H" = (/obj/structure/bed/chair/wood{ icon_state = "wooden_chair"; dir = 1},/turf/simulated/floor/wood,/area/submap/DJOutpost1) "I" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"J" = (/obj/structure/table/woodentable,/obj/item/weapon/material/knife/machete/hatchet,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/material/minihoe,/obj/item/device/analyzer/plant_analyzer,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"J" = (/obj/structure/table/woodentable,/obj/item/material/knife/machete/hatchet,/obj/item/reagent_containers/glass/bucket,/obj/item/material/minihoe,/obj/item/analyzer/plant_analyzer,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "K" = (/obj/structure/undies_wardrobe,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "L" = (/obj/structure/table/rack,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "M" = (/obj/machinery/light/flamp,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "N" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 15},/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"O" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/clown,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"P" = (/obj/structure/table/rack,/obj/item/ammo_magazine/clip/c762/hunter,/obj/item/weapon/gun/projectile/shotgun/pump/rifle,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"Q" = (/obj/structure/table/rack,/obj/item/device/flashlight/lantern,/obj/item/device/gps{gps_tag = "Sif Free Radio"},/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"O" = (/obj/structure/bed/padded,/obj/item/bedsheet/clown,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"P" = (/obj/structure/table/rack,/obj/item/ammo_magazine/clip/c762/hunter,/obj/item/gun/projectile/shotgun/pump/rifle,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"Q" = (/obj/structure/table/rack,/obj/item/flashlight/lantern,/obj/item/gps{gps_tag = "Sif Free Radio"},/turf/simulated/floor/wood,/area/submap/DJOutpost1) "R" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/floor/wood,/area/submap/DJOutpost1) (1,1,1) = {" diff --git a/maps/submaps/surface_submaps/wilderness/DJOutpost2.dmm b/maps/submaps/surface_submaps/wilderness/DJOutpost2.dmm index bb91419270a..d7808cf015e 100644 --- a/maps/submaps/surface_submaps/wilderness/DJOutpost2.dmm +++ b/maps/submaps/surface_submaps/wilderness/DJOutpost2.dmm @@ -1,7 +1,7 @@ "a" = (/turf/template_noop,/area/template_noop) "b" = (/turf/simulated/wall/wood,/area/submap/DJOutpost1) -"c" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/obj/item/weapon/material/shard{ icon_state = "shardmedium"},/obj/item/stack/rods,/turf/simulated/floor,/area/submap/DJOutpost1) -"d" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/turf/simulated/floor,/area/submap/DJOutpost1) +"c" = (/obj/structure/grille/broken,/obj/item/material/shard,/obj/item/material/shard{ icon_state = "shardmedium"},/obj/item/stack/rods,/turf/simulated/floor,/area/submap/DJOutpost1) +"d" = (/obj/structure/grille/broken,/obj/item/material/shard,/turf/simulated/floor,/area/submap/DJOutpost1) "e" = (/turf/simulated/floor/wood/broken,/area/submap/DJOutpost1) "f" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/wood/broken,/area/submap/DJOutpost1) "g" = (/obj/structure/sign/goldenplaque{desc = "An award given to Sif Free Radio for media excellency. It looks fake."; name = "Best Radio Station 2558"; pixel_y = 30},/turf/simulated/floor/wood/broken,/area/submap/DJOutpost1) @@ -9,29 +9,29 @@ "i" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/floor/wood/broken,/area/submap/DJOutpost1) "k" = (/obj/structure/girder,/turf/simulated/floor,/area/submap/DJOutpost1) "l" = (/obj/structure/bed/chair/office/dark{dir = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood/broken,/area/submap/DJOutpost1) -"m" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/phone,/turf/simulated/floor/outdoors/dirt,/area/submap/DJOutpost1) +"m" = (/obj/structure/table/steel_reinforced,/obj/item/radio/phone,/turf/simulated/floor/outdoors/dirt,/area/submap/DJOutpost1) "n" = (/obj/item/stack/rods,/turf/template_noop,/area/template_noop) "o" = (/turf/simulated/floor/outdoors/dirt,/area/submap/DJOutpost1) "p" = (/obj/structure/loot_pile/surface/bones,/turf/simulated/floor/outdoors/dirt,/area/submap/DJOutpost1) -"q" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio,/obj/structure/cable/yellow,/turf/simulated/floor/wood/broken,/area/submap/DJOutpost1) +"q" = (/obj/structure/table/steel_reinforced,/obj/item/radio,/obj/structure/cable/yellow,/turf/simulated/floor/wood/broken,/area/submap/DJOutpost1) "r" = (/turf/simulated/floor/outdoors/rocks,/area/submap/DJOutpost1) "s" = (/obj/effect/overlay/snow/floor,/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1) "u" = (/obj/effect/decal/cleanable/ash,/turf/simulated/floor/outdoors/dirt,/area/submap/DJOutpost1) -"w" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard{ icon_state = "shardmedium"},/turf/simulated/floor,/area/submap/DJOutpost1) +"w" = (/obj/structure/grille/broken,/obj/item/material/shard{ icon_state = "shardmedium"},/turf/simulated/floor,/area/submap/DJOutpost1) "x" = (/obj/structure/girder,/turf/simulated/floor/outdoors/rocks,/area/submap/DJOutpost1) -"y" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom/syndicate{desc = "Talk through this."; name = "station intercom (General)"},/turf/simulated/floor/outdoors/dirt,/area/submap/DJOutpost1) +"y" = (/obj/structure/table/steel_reinforced,/obj/item/radio/intercom/syndicate{desc = "Talk through this."; name = "station intercom (General)"},/turf/simulated/floor/outdoors/dirt,/area/submap/DJOutpost1) "A" = (/obj/item/stack/rods,/turf/simulated/floor/outdoors/dirt,/area/submap/DJOutpost1) "B" = (/obj/structure/door_assembly/door_assembly_ext,/turf/simulated/floor/outdoors/rocks,/area/submap/DJOutpost1) -"C" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard{icon_state = "medium"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/submap/DJOutpost1) -"D" = (/obj/item/weapon/material/shard{ icon_state = "shardmedium"},/turf/template_noop,/area/template_noop) -"F" = (/obj/item/device/transfer_valve,/turf/simulated/floor/outdoors/rocks,/area/submap/DJOutpost1) -"G" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/floor,/area/submap/DJOutpost1) -"H" = (/obj/item/weapon/material/shard{icon_state = "medium"},/turf/template_noop,/area/template_noop) +"C" = (/obj/structure/grille/broken,/obj/item/material/shard{icon_state = "medium"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/submap/DJOutpost1) +"D" = (/obj/item/material/shard{ icon_state = "shardmedium"},/turf/template_noop,/area/template_noop) +"F" = (/obj/item/transfer_valve,/turf/simulated/floor/outdoors/rocks,/area/submap/DJOutpost1) +"G" = (/obj/structure/grille/broken,/obj/item/material/shard{icon_state = "medium"},/turf/simulated/floor,/area/submap/DJOutpost1) +"H" = (/obj/item/material/shard{icon_state = "medium"},/turf/template_noop,/area/template_noop) "I" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/wood/broken,/area/submap/DJOutpost1) -"J" = (/obj/item/weapon/material/shard,/turf/template_noop,/area/template_noop) +"J" = (/obj/item/material/shard,/turf/template_noop,/area/template_noop) "K" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 15},/turf/simulated/floor/wood/broken,/area/submap/DJOutpost1) -"L" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/outdoors/rocks,/area/submap/DJOutpost1) -"M" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard{icon_state = "medium"},/obj/item/stack/rods,/turf/simulated/floor,/area/submap/DJOutpost1) +"L" = (/obj/item/storage/toolbox/mechanical,/turf/simulated/floor/outdoors/rocks,/area/submap/DJOutpost1) +"M" = (/obj/structure/grille/broken,/obj/item/material/shard{icon_state = "medium"},/obj/item/stack/rods,/turf/simulated/floor,/area/submap/DJOutpost1) "N" = (/obj/structure/grille/broken,/obj/item/stack/rods,/turf/simulated/floor,/area/submap/DJOutpost1) "O" = (/obj/structure/lattice,/turf/simulated/floor/outdoors/dirt,/area/submap/DJOutpost1) "P" = (/obj/effect/decal/cleanable/ash,/turf/simulated/floor/wood/broken,/area/submap/DJOutpost1) diff --git a/maps/submaps/surface_submaps/wilderness/DJOutpost3.dmm b/maps/submaps/surface_submaps/wilderness/DJOutpost3.dmm index 79814b950a8..5419b73b4f5 100644 --- a/maps/submaps/surface_submaps/wilderness/DJOutpost3.dmm +++ b/maps/submaps/surface_submaps/wilderness/DJOutpost3.dmm @@ -14,39 +14,39 @@ "an" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/submap/DJOutpost1) "ao" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1) "ap" = (/obj/random/mob/robotic,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aq" = (/obj/effect/decal/remains,/obj/effect/decal/cleanable/blood,/obj/item/clothing/under/frontier,/obj/random_multi/single_item/sfr_headset,/obj/item/weapon/archaeological_find,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"ar" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{icon_state = "intercom"; dir = 8},/obj/random/firstaid,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"as" = (/obj/machinery/computer/message_monitor,/obj/item/weapon/paper/monitorkey,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"at" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{icon_state = "intercom"; dir = 8},/obj/item/weapon/book/codex/lore/news,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aq" = (/obj/effect/decal/remains,/obj/effect/decal/cleanable/blood,/obj/item/clothing/under/frontier,/obj/random_multi/single_item/sfr_headset,/obj/item/archaeological_find,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"ar" = (/obj/structure/table/steel_reinforced,/obj/item/radio/intercom{icon_state = "intercom"; dir = 8},/obj/random/firstaid,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"as" = (/obj/machinery/computer/message_monitor,/obj/item/paper/monitorkey,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"at" = (/obj/structure/table/steel_reinforced,/obj/item/radio/intercom{icon_state = "intercom"; dir = 8},/obj/item/book/codex/lore/news,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "au" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow,/obj/machinery/power/solar_control/autostart,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "av" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/random/landmine,/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1) -"aw" = (/obj/structure/bookcase,/obj/item/weapon/book/codex/lore/robutt,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"ax" = (/obj/structure/bookcase,/obj/item/weapon/book/codex/lore/vir,/obj/item/weapon/book/manual/excavation,/obj/item/weapon/book/manual/engineering_construction,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aw" = (/obj/structure/bookcase,/obj/item/book/codex/lore/robutt,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"ax" = (/obj/structure/bookcase,/obj/item/book/codex/lore/vir,/obj/item/book/manual/excavation,/obj/item/book/manual/engineering_construction,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "ay" = (/obj/machinery/holoplant,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"az" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aA" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/phone,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aB" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom/syndicate{desc = "Talk through this."; name = "station intercom (General)"},/obj/item/device/multitool,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aC" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio,/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/hyper; dir = 4; environ = 1; equipment = 1; lighting = 1; locked = 0; name = "Sif Free Radio APC"; operating = 0; pixel_x = 24},/obj/structure/cable/yellow,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"az" = (/obj/item/storage/toolbox/mechanical,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aA" = (/obj/structure/table/steel_reinforced,/obj/item/radio/phone,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aB" = (/obj/structure/table/steel_reinforced,/obj/item/radio/intercom/syndicate{desc = "Talk through this."; name = "station intercom (General)"},/obj/item/multitool,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aC" = (/obj/structure/table/steel_reinforced,/obj/item/radio,/obj/machinery/power/apc{cell_type = /obj/item/cell/hyper; dir = 4; environ = 1; equipment = 1; lighting = 1; locked = 0; name = "Sif Free Radio APC"; operating = 0; pixel_x = 24},/obj/structure/cable/yellow,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aD" = (/obj/structure/sign/warning/server_room,/turf/simulated/wall/rpshull,/area/submap/DJOutpost1) "aE" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/yellow,/obj/machinery/power/solar,/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1) -"aF" = (/obj/structure/bookcase,/obj/structure/safe/floor,/obj/item/weapon/gun/energy/ionrifle/pistol,/obj/item/weapon/bone/skull/unknown,/obj/item/weapon/bone,/obj/item/weapon/bone/ribs,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aF" = (/obj/structure/bookcase,/obj/structure/safe/floor,/obj/item/gun/energy/ionrifle/pistol,/obj/item/bone/skull/unknown,/obj/item/bone,/obj/item/bone/ribs,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aG" = (/obj/machinery/biogenerator,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aH" = (/obj/item/weapon/reagent_containers/food/snacks/unajerky,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/random_multi/single_item/sfr_headset,/obj/structure/table/steel_reinforced,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aH" = (/obj/item/reagent_containers/food/snacks/unajerky,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/random_multi/single_item/sfr_headset,/obj/structure/table/steel_reinforced,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aI" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/seed_extractor,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aJ" = (/obj/machinery/door/airlock/maintenance/int,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DJOutpost1) "aK" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aL" = (/obj/structure/table/woodentable,/obj/item/weapon/material/knife/machete/hatchet,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/material/minihoe,/obj/item/device/analyzer/plant_analyzer,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aL" = (/obj/structure/table/woodentable,/obj/item/material/knife/machete/hatchet,/obj/item/reagent_containers/glass/bucket,/obj/item/material/minihoe,/obj/item/analyzer/plant_analyzer,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aM" = (/obj/structure/undies_wardrobe,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aN" = (/obj/structure/table/rack,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aO" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 15},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aP" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/clown,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aQ" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/lasershotgun,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aR" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/obj/item/weapon/material/shard{icon_state = "shardmedium"},/obj/item/stack/rods,/obj/effect/overlay/snow/floor,/turf/simulated/floor,/area/submap/DJOutpost1) +"aP" = (/obj/structure/bed/padded,/obj/item/bedsheet/clown,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aQ" = (/obj/structure/table/rack,/obj/item/gun/energy/lasershotgun,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aR" = (/obj/structure/grille/broken,/obj/item/material/shard,/obj/item/material/shard{icon_state = "shardmedium"},/obj/item/stack/rods,/obj/effect/overlay/snow/floor,/turf/simulated/floor,/area/submap/DJOutpost1) "aS" = (/obj/effect/overlay/snow/floor,/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1) "aT" = (/obj/effect/overlay/snow/floor,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aU" = (/obj/machinery/media/jukebox,/obj/effect/overlay/snow/floor,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aV" = (/obj/item/clothing/under/pcrc,/obj/random/humanoidremains{spawn_nothing_percentage = 60},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aW" = (/obj/item/device/gps/internal/poi,/obj/machinery/door/airlock/maintenance/int,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DJOutpost1) +"aW" = (/obj/item/gps/internal/poi,/obj/machinery/door/airlock/maintenance/int,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DJOutpost1) "aX" = (/obj/structure/table/bench/padded,/obj/random/humanoidremains{spawn_nothing_percentage = 60},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aY" = (/obj/machinery/door/airlock/maintenance/common,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DJOutpost1) "aZ" = (/obj/structure/sign/warning/emergence,/turf/simulated/wall/rpshull,/area/submap/DJOutpost1) diff --git a/maps/submaps/surface_submaps/wilderness/DJOutpost4.dmm b/maps/submaps/surface_submaps/wilderness/DJOutpost4.dmm index 4d89461d55e..148ff2779aa 100644 --- a/maps/submaps/surface_submaps/wilderness/DJOutpost4.dmm +++ b/maps/submaps/surface_submaps/wilderness/DJOutpost4.dmm @@ -4,7 +4,7 @@ "ad" = (/obj/machinery/porta_turret/poi{faction = "xeno"},/obj/effect/overlay/snow/floor,/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1) "ae" = (/obj/random/landmine,/obj/effect/overlay/snow/floor,/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1) "af" = (/turf/simulated/wall/rpshull,/area/submap/DJOutpost1) -"ag" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/obj/item/weapon/material/shard{icon_state = "shardmedium"},/obj/item/stack/rods,/obj/effect/overlay/snow/floor,/turf/simulated/floor,/area/submap/DJOutpost1) +"ag" = (/obj/structure/grille/broken,/obj/item/material/shard,/obj/item/material/shard{icon_state = "shardmedium"},/obj/item/stack/rods,/obj/effect/overlay/snow/floor,/turf/simulated/floor,/area/submap/DJOutpost1) "ah" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor,/area/submap/DJOutpost1) "ai" = (/obj/effect/overlay/snow/floor,/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1) "aj" = (/obj/structure/sign/warning/lethal_turrets,/turf/simulated/wall/rpshull,/area/submap/DJOutpost1) @@ -16,40 +16,40 @@ "ap" = (/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aq" = (/obj/structure/sign/warning/server_room,/turf/simulated/wall/rpshull,/area/submap/DJOutpost1) "ar" = (/obj/structure/sign/goldenplaque{desc = "An award given to Sif Free Radio for media excellency. It looks fake."; name = "Best Radio Station 2558"; pixel_y = 30},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"as" = (/obj/structure/bookcase,/obj/structure/safe/floor,/obj/item/weapon/bone/skull/unknown,/obj/item/weapon/bone,/obj/item/weapon/bone/ribs,/obj/item/weapon/gun/energy/gun/burst,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"as" = (/obj/structure/bookcase,/obj/structure/safe/floor,/obj/item/bone/skull/unknown,/obj/item/bone,/obj/item/bone/ribs,/obj/item/gun/energy/gun/burst,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "at" = (/mob/living/carbon/human/ai_controlled/replicant,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"au" = (/obj/effect/decal/remains,/obj/effect/decal/cleanable/blood,/obj/item/clothing/under/frontier,/obj/random_multi/single_item/sfr_headset,/obj/item/weapon/archaeological_find,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"au" = (/obj/effect/decal/remains,/obj/effect/decal/cleanable/blood,/obj/item/clothing/under/frontier,/obj/random_multi/single_item/sfr_headset,/obj/item/archaeological_find,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "av" = (/obj/machinery/door/airlock/maintenance/int,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DJOutpost1) -"aw" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{icon_state = "intercom"; dir = 8},/obj/random/firstaid,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"ax" = (/obj/machinery/computer/message_monitor,/obj/item/weapon/paper/monitorkey,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aw" = (/obj/structure/table/steel_reinforced,/obj/item/radio/intercom{icon_state = "intercom"; dir = 8},/obj/random/firstaid,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"ax" = (/obj/machinery/computer/message_monitor,/obj/item/paper/monitorkey,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "ay" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/submap/DJOutpost1) "az" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1) -"aA" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{icon_state = "intercom"; dir = 8},/obj/item/weapon/book/codex/lore/news,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aA" = (/obj/structure/table/steel_reinforced,/obj/item/radio/intercom{icon_state = "intercom"; dir = 8},/obj/item/book/codex/lore/news,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aB" = (/obj/item/clothing/under/pcrc,/obj/random/humanoidremains{spawn_nothing_percentage = 60},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aC" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/yellow,/obj/machinery/power/solar_control/autostart,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aD" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/random/landmine,/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1) -"aE" = (/obj/structure/bookcase,/obj/item/weapon/book/codex/lore/robutt,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aF" = (/obj/structure/bookcase,/obj/item/weapon/book/codex/lore/vir,/obj/item/weapon/book/manual/excavation,/obj/item/weapon/book/manual/engineering_construction,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aE" = (/obj/structure/bookcase,/obj/item/book/codex/lore/robutt,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aF" = (/obj/structure/bookcase,/obj/item/book/codex/lore/vir,/obj/item/book/manual/excavation,/obj/item/book/manual/engineering_construction,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aG" = (/obj/machinery/holoplant,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aH" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aI" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/phone,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aJ" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom/syndicate{desc = "Talk through this."; name = "station intercom (General)"},/obj/item/device/multitool,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aK" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio,/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/hyper; dir = 4; environ = 1; equipment = 1; lighting = 1; locked = 0; name = "Sif Free Radio APC"; operating = 0; pixel_x = 24},/obj/structure/cable/yellow,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aH" = (/obj/item/storage/toolbox/mechanical,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aI" = (/obj/structure/table/steel_reinforced,/obj/item/radio/phone,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aJ" = (/obj/structure/table/steel_reinforced,/obj/item/radio/intercom/syndicate{desc = "Talk through this."; name = "station intercom (General)"},/obj/item/multitool,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aK" = (/obj/structure/table/steel_reinforced,/obj/item/radio,/obj/machinery/power/apc{cell_type = /obj/item/cell/hyper; dir = 4; environ = 1; equipment = 1; lighting = 1; locked = 0; name = "Sif Free Radio APC"; operating = 0; pixel_x = 24},/obj/structure/cable/yellow,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aL" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/yellow,/obj/machinery/power/solar,/turf/simulated/floor{outdoors = 1},/area/submap/DJOutpost1) -"aM" = (/obj/item/device/gps/internal/poi,/obj/machinery/door/airlock/maintenance/int,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DJOutpost1) +"aM" = (/obj/item/gps/internal/poi,/obj/machinery/door/airlock/maintenance/int,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DJOutpost1) "aN" = (/obj/structure/table/bench/padded,/obj/random/humanoidremains{spawn_nothing_percentage = 60},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aO" = (/obj/machinery/biogenerator,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aP" = (/obj/item/weapon/reagent_containers/food/snacks/unajerky,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/random_multi/single_item/sfr_headset,/obj/structure/table/steel_reinforced,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aP" = (/obj/item/reagent_containers/food/snacks/unajerky,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/random_multi/single_item/sfr_headset,/obj/structure/table/steel_reinforced,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aQ" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/seed_extractor,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aR" = (/obj/machinery/door/airlock/maintenance/common,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/DJOutpost1) "aS" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aT" = (/obj/structure/table/woodentable,/obj/item/weapon/material/knife/machete/hatchet,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/material/minihoe,/obj/item/device/analyzer/plant_analyzer,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aT" = (/obj/structure/table/woodentable,/obj/item/material/knife/machete/hatchet,/obj/item/reagent_containers/glass/bucket,/obj/item/material/minihoe,/obj/item/analyzer/plant_analyzer,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aU" = (/obj/structure/undies_wardrobe,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aV" = (/obj/structure/table/rack,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/random_multi/single_item/sfr_headset,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "aW" = (/obj/structure/sign/warning/emergence,/turf/simulated/wall/rpshull,/area/submap/DJOutpost1) "aX" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 15},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aY" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/clown,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) -"aZ" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/lasershotgun,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aY" = (/obj/structure/bed/padded,/obj/item/bedsheet/clown,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) +"aZ" = (/obj/structure/table/rack,/obj/item/gun/energy/lasershotgun,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) "ba" = (/obj/random/humanoidremains{spawn_nothing_percentage = 60},/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) (1,1,1) = {" diff --git a/maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm b/maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm index 74e4b5c8244..7c6b5ee201a 100644 --- a/maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm +++ b/maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm @@ -1,15 +1,15 @@ "aa" = (/turf/template_noop,/area/template_noop) "ab" = (/turf/template_noop,/area/submap/DecoupledEngine) -"ac" = (/obj/item/weapon/fuel_assembly/deuterium,/turf/template_noop,/area/submap/DecoupledEngine) +"ac" = (/obj/item/fuel_assembly/deuterium,/turf/template_noop,/area/submap/DecoupledEngine) "ad" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/submap/DecoupledEngine) -"ae" = (/obj/item/weapon/extinguisher,/turf/template_noop,/area/submap/DecoupledEngine) -"af" = (/obj/item/weapon/material/shard/phoron,/turf/template_noop,/area/submap/DecoupledEngine) +"ae" = (/obj/item/extinguisher,/turf/template_noop,/area/submap/DecoupledEngine) +"af" = (/obj/item/material/shard/phoron,/turf/template_noop,/area/submap/DecoupledEngine) "ag" = (/obj/machinery/power/rad_collector,/turf/template_noop,/area/submap/DecoupledEngine) -"ah" = (/obj/item/weapon/arrow/rod,/obj/item/stack/material/steel,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) +"ah" = (/obj/item/arrow/rod,/obj/item/stack/material/steel,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) "ai" = (/obj/item/stack/material/steel,/turf/template_noop,/area/submap/DecoupledEngine) "aj" = (/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) "ak" = (/obj/structure/lattice,/obj/structure/girder/displaced,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) -"am" = (/obj/item/weapon/arrow/rod,/turf/template_noop,/area/submap/DecoupledEngine) +"am" = (/obj/item/arrow/rod,/turf/template_noop,/area/submap/DecoupledEngine) "an" = (/turf/simulated/floor/water,/area/submap/DecoupledEngine) "ao" = (/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) "ap" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/submap/DecoupledEngine) @@ -33,7 +33,7 @@ "aI" = (/obj/effect/decal/cleanable/blood/oil/streak{amount = 0},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) "aJ" = (/obj/machinery/power/rad_collector,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 9},/turf/simulated/floor,/area/submap/DecoupledEngine) "aK" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 5},/turf/simulated/floor,/area/submap/DecoupledEngine) -"aL" = (/obj/structure/grille/broken,/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 4},/obj/item/weapon/material/shard/phoron,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) +"aL" = (/obj/structure/grille/broken,/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 4},/obj/item/material/shard/phoron,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) "aM" = (/obj/machinery/atmospherics/pipe/manifold4w/visible,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) "aN" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/obj/effect/floor_decal/rust,/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/turf/simulated/floor,/area/submap/DecoupledEngine) "aO" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 4},/turf/simulated/floor/water,/area/submap/DecoupledEngine) @@ -63,7 +63,7 @@ "bm" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"; dir = 4},/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) "bn" = (/obj/effect/floor_decal/rust,/obj/structure/closet/crate/radiation,/turf/simulated/floor,/area/submap/DecoupledEngine) "bo" = (/obj/effect/decal/cleanable/blood/oil,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) -"bp" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/item/weapon/rcd,/turf/simulated/floor,/area/submap/DecoupledEngine) +"bp" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/item/rcd,/turf/simulated/floor,/area/submap/DecoupledEngine) "bq" = (/obj/structure/sign/warning/radioactive,/turf/simulated/wall/durasteel,/area/submap/DecoupledEngine) "br" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 1},/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 8},/obj/structure/window/phoronreinforced,/turf/simulated/floor,/area/submap/DecoupledEngine) "bs" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{icon_state = "phoronrwindow"; dir = 1},/obj/structure/window/phoronreinforced,/turf/simulated/floor,/area/submap/DecoupledEngine) diff --git a/maps/submaps/surface_submaps/wilderness/DoomP.dmm b/maps/submaps/surface_submaps/wilderness/DoomP.dmm index 08c32f5710f..9a280fc852e 100644 --- a/maps/submaps/surface_submaps/wilderness/DoomP.dmm +++ b/maps/submaps/surface_submaps/wilderness/DoomP.dmm @@ -63,16 +63,16 @@ "bk" = (/obj/machinery/door/airlock,/turf/simulated/floor/tiled/white,/area/submap/DoomP) "bl" = (/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP) "bm" = (/obj/structure/table/standard,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP) -"bn" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/syndie_kit/spy,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP) -"bo" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/smokes,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP) -"bp" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/handcuffs,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP) -"bq" = (/obj/structure/table/rack,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP) +"bn" = (/obj/structure/table/standard,/obj/item/storage/box/syndie_kit/spy,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP) +"bo" = (/obj/structure/table/rack,/obj/item/storage/box/smokes,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP) +"bp" = (/obj/structure/table/rack,/obj/item/storage/box/handcuffs,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP) +"bq" = (/obj/structure/table/rack,/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP) "br" = (/obj/structure/table/rack,/obj/random/energy,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP) -"bs" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/contender,/obj/item/ammo_magazine/s357,/obj/item/ammo_magazine/s357,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP) -"bt" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/item/toy/plushie/spider,/obj/effect/floor_decal/corner/lime/full{dir = 8},/turf/simulated/floor/tiled/white,/area/submap/DoomP) +"bs" = (/obj/structure/table/rack,/obj/item/gun/projectile/contender,/obj/item/ammo_magazine/s357,/obj/item/ammo_magazine/s357,/turf/simulated/floor/tiled/techfloor,/area/submap/DoomP) +"bt" = (/obj/structure/bed,/obj/item/bedsheet,/obj/item/toy/plushie/spider,/obj/effect/floor_decal/corner/lime/full{dir = 8},/turf/simulated/floor/tiled/white,/area/submap/DoomP) "bu" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/lime{dir = 5},/turf/simulated/floor/tiled/white,/area/submap/DoomP) -"bv" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/effect/floor_decal/corner/lime{dir = 5},/turf/simulated/floor/tiled/white,/area/submap/DoomP) -"bw" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/obj/effect/floor_decal/corner/lime{dir = 5},/turf/simulated/floor/tiled/white,/area/submap/DoomP) +"bv" = (/obj/structure/bed,/obj/item/bedsheet,/obj/effect/floor_decal/corner/lime{dir = 5},/turf/simulated/floor/tiled/white,/area/submap/DoomP) +"bw" = (/obj/structure/table/standard,/obj/item/flashlight/lamp,/obj/effect/floor_decal/corner/lime{dir = 5},/turf/simulated/floor/tiled/white,/area/submap/DoomP) "bx" = (/obj/effect/floor_decal/borderfloor,/obj/random/mob/merc/all,/turf/simulated/floor/tiled,/area/submap/DoomP) "by" = (/turf/simulated/floor/tiled/white,/area/submap/DoomP) "bz" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/tiled/white,/area/submap/DoomP) diff --git a/maps/submaps/surface_submaps/wilderness/Drugden.dmm b/maps/submaps/surface_submaps/wilderness/Drugden.dmm index 2c4b90752ca..028efcdad95 100644 --- a/maps/submaps/surface_submaps/wilderness/Drugden.dmm +++ b/maps/submaps/surface_submaps/wilderness/Drugden.dmm @@ -6,45 +6,45 @@ "f" = (/turf/simulated/floor/tiled,/area/submap/Drugd) "g" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled,/area/submap/Drugd) "h" = (/obj/random/trash,/turf/simulated/floor,/area/submap/Drugd) -"i" = (/obj/structure/closet/cabinet,/obj/item/weapon/lipstick/random,/turf/simulated/floor/carpet,/area/submap/Drugd) -"j" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/structure/curtain/open/bed,/turf/simulated/floor/carpet,/area/submap/Drugd) -"k" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/pill/happy{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd) +"i" = (/obj/structure/closet/cabinet,/obj/item/lipstick/random,/turf/simulated/floor/carpet,/area/submap/Drugd) +"j" = (/obj/structure/bed,/obj/item/bedsheet,/obj/structure/curtain/open/bed,/turf/simulated/floor/carpet,/area/submap/Drugd) +"k" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/pill/happy{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd) "l" = (/turf/simulated/floor,/area/submap/Drugd) "m" = (/obj/structure/curtain/black,/turf/simulated/floor,/area/submap/Drugd) "n" = (/obj/random/trash,/turf/simulated/floor/carpet,/area/submap/Drugd) "o" = (/turf/simulated/floor/carpet,/area/submap/Drugd) "p" = (/obj/effect/decal/remains/mouse,/turf/simulated/floor,/area/submap/Drugd) "q" = (/obj/structure/closet/cabinet,/turf/simulated/floor/carpet,/area/submap/Drugd) -"r" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/pill/methylphenidate{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd) +"r" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/pill/methylphenidate{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd) "s" = (/obj/structure/bed/chair/comfy/beige{icon_state = "armchair_preview"; dir = 1},/turf/simulated/floor/carpet,/area/submap/Drugd) -"t" = (/obj/item/weapon/reagent_containers/pill/citalopram{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd) +"t" = (/obj/item/reagent_containers/pill/citalopram{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd) "u" = (/obj/random/junk,/turf/simulated/floor,/area/submap/Drugd) "v" = (/obj/structure/closet/cabinet,/obj/item/poster,/turf/simulated/floor/carpet,/area/submap/Drugd) "w" = (/obj/structure/bed/chair/comfy/beige,/turf/simulated/floor/carpet,/area/submap/Drugd) -"x" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp,/obj/item/weapon/reagent_containers/syringe/drugs,/turf/simulated/floor/carpet,/area/submap/Drugd) -"y" = (/obj/structure/bed/chair/comfy/beige,/obj/item/weapon/reagent_containers/pill/citalopram{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd) +"x" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp,/obj/item/reagent_containers/syringe/drugs,/turf/simulated/floor/carpet,/area/submap/Drugd) +"y" = (/obj/structure/bed/chair/comfy/beige,/obj/item/reagent_containers/pill/citalopram{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd) "z" = (/obj/structure/loot_pile/maint/junk,/turf/simulated/floor,/area/submap/Drugd) -"A" = (/obj/item/weapon/reagent_containers/pill/citalopram{name = "pill"},/obj/item/weapon/reagent_containers/pill/citalopram{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd) -"B" = (/obj/structure/table/standard,/obj/item/weapon/storage/pill_bottle/happy,/turf/simulated/floor/tiled,/area/submap/Drugd) +"A" = (/obj/item/reagent_containers/pill/citalopram{name = "pill"},/obj/item/reagent_containers/pill/citalopram{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd) +"B" = (/obj/structure/table/standard,/obj/item/storage/pill_bottle/happy,/turf/simulated/floor/tiled,/area/submap/Drugd) "C" = (/obj/structure/table/standard,/obj/item/stack/medical/splint,/turf/simulated/floor/tiled,/area/submap/Drugd) -"D" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/pill/citalopram,/obj/item/weapon/reagent_containers/pill/citalopram,/turf/simulated/floor/tiled,/area/submap/Drugd) -"E" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/pill/tramadol,/obj/item/weapon/reagent_containers/pill/tramadol,/turf/simulated/floor/tiled,/area/submap/Drugd) -"F" = (/obj/structure/closet/cabinet,/obj/item/clothing/accessory/jacket,/obj/item/weapon/material/butterfly/switchblade,/turf/simulated/floor/carpet,/area/submap/Drugd) -"G" = (/obj/item/weapon/reagent_containers/pill/zoom{name = "pill"},/obj/random/trash,/turf/simulated/floor/carpet,/area/submap/Drugd) -"H" = (/obj/item/weapon/reagent_containers/pill/zoom{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd) +"D" = (/obj/structure/table/standard,/obj/item/reagent_containers/pill/citalopram,/obj/item/reagent_containers/pill/citalopram,/turf/simulated/floor/tiled,/area/submap/Drugd) +"E" = (/obj/structure/table/standard,/obj/item/reagent_containers/pill/tramadol,/obj/item/reagent_containers/pill/tramadol,/turf/simulated/floor/tiled,/area/submap/Drugd) +"F" = (/obj/structure/closet/cabinet,/obj/item/clothing/accessory/jacket,/obj/item/material/butterfly/switchblade,/turf/simulated/floor/carpet,/area/submap/Drugd) +"G" = (/obj/item/reagent_containers/pill/zoom{name = "pill"},/obj/random/trash,/turf/simulated/floor/carpet,/area/submap/Drugd) +"H" = (/obj/item/reagent_containers/pill/zoom{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd) "I" = (/obj/structure/loot_pile/maint/boxfort,/turf/simulated/floor/carpet,/area/submap/Drugd) -"J" = (/obj/structure/table/standard,/obj/item/weapon/surgical/scalpel,/turf/simulated/floor/tiled,/area/submap/Drugd) +"J" = (/obj/structure/table/standard,/obj/item/surgical/scalpel,/turf/simulated/floor/tiled,/area/submap/Drugd) "K" = (/obj/item/wheelchair,/turf/simulated/floor/tiled,/area/submap/Drugd) "L" = (/obj/structure/table/standard,/obj/random/firstaid,/turf/simulated/floor,/area/submap/Drugd) "M" = (/obj/structure/loot_pile/maint/junk,/turf/simulated/floor/tiled,/area/submap/Drugd) "N" = (/obj/effect/floor_decal/rust,/obj/structure/table/standard,/turf/simulated/floor/tiled,/area/submap/Drugd) -"O" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/pill/zoom,/obj/item/weapon/reagent_containers/pill/zoom,/turf/simulated/floor,/area/submap/Drugd) -"P" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/pill/tramadol{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd) +"O" = (/obj/structure/table/standard,/obj/item/reagent_containers/pill/zoom,/obj/item/reagent_containers/pill/zoom,/turf/simulated/floor,/area/submap/Drugd) +"P" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/pill/tramadol{name = "pill"},/turf/simulated/floor/carpet,/area/submap/Drugd) "Q" = (/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong/guard,/turf/simulated/floor,/area/submap/Drugd) "R" = (/obj/structure/girder,/turf/simulated/floor,/area/submap/Drugd) -"S" = (/obj/item/weapon/material/shard,/turf/simulated/floor,/area/submap/Drugd) -"T" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp,/turf/simulated/floor/carpet,/area/submap/Drugd) -"U" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/syringe/drugs,/turf/simulated/floor/carpet,/area/submap/Drugd) +"S" = (/obj/item/material/shard,/turf/simulated/floor,/area/submap/Drugd) +"T" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp,/turf/simulated/floor/carpet,/area/submap/Drugd) +"U" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/syringe/drugs,/turf/simulated/floor/carpet,/area/submap/Drugd) "V" = (/obj/structure/closet/cabinet,/obj/random/projectile/scrapped_gun,/obj/random/toy,/turf/simulated/floor/carpet,/area/submap/Drugd) "W" = (/obj/structure/closet/cabinet,/obj/random/mre,/obj/random/medical/lite,/turf/simulated/floor/carpet,/area/submap/Drugd) diff --git a/maps/submaps/surface_submaps/wilderness/Epod3.dmm b/maps/submaps/surface_submaps/wilderness/Epod3.dmm index 42fbe7f6f80..c922c299fd6 100644 --- a/maps/submaps/surface_submaps/wilderness/Epod3.dmm +++ b/maps/submaps/surface_submaps/wilderness/Epod3.dmm @@ -5,8 +5,8 @@ "e" = (/turf/simulated/shuttle/wall,/area/submap/Epod3) "f" = (/obj/structure/flora/tree/sif,/turf/simulated/floor/outdoors/dirt,/area/submap/Epod3) "g" = (/obj/effect/spider/stickyweb,/turf/template_noop,/area/submap/Epod3) -"h" = (/obj/structure/bed/chair{dir = 4},/obj/structure/closet/walllocker/emerglocker{pixel_y = 28},/obj/item/device/radio/intercom{pixel_y = -26},/turf/simulated/shuttle/floor,/area/submap/Epod3) -"i" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/vending/wallmed1{name = "Emergency NanoMed"; pixel_y = 28},/obj/machinery/light,/obj/item/weapon/weldingtool/largetank,/turf/simulated/shuttle/floor,/area/submap/Epod3) +"h" = (/obj/structure/bed/chair{dir = 4},/obj/structure/closet/walllocker/emerglocker{pixel_y = 28},/obj/item/radio/intercom{pixel_y = -26},/turf/simulated/shuttle/floor,/area/submap/Epod3) +"i" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/vending/wallmed1{name = "Emergency NanoMed"; pixel_y = 28},/obj/machinery/light,/obj/item/weldingtool/largetank,/turf/simulated/shuttle/floor,/area/submap/Epod3) "j" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 8},/obj/effect/decal/remains,/obj/effect/decal/cleanable/blood/splatter,/obj/item/ammo_casing/spent,/obj/item/clothing/under/suit_jacket/really_black,/obj/item/clothing/shoes/dress,/obj/item/clothing/glasses/sunglasses,/obj/random/multiple/gun/projectile/handgun,/turf/simulated/shuttle/floor,/area/submap/Epod3) "k" = (/obj/structure/shuttle/engine/propulsion/burst{icon_state = "propulsion"; dir = 8},/turf/simulated/shuttle/wall,/area/submap/Epod3) "l" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/dirt,/area/submap/Epod3) diff --git a/maps/submaps/surface_submaps/wilderness/Epod4.dmm b/maps/submaps/surface_submaps/wilderness/Epod4.dmm index e37847b087f..90dff804e6e 100644 --- a/maps/submaps/surface_submaps/wilderness/Epod4.dmm +++ b/maps/submaps/surface_submaps/wilderness/Epod4.dmm @@ -11,7 +11,7 @@ "k" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 1},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = -32; pixel_y = 0},/obj/structure/loot_pile/maint/junk,/turf/simulated/floor/water,/area/submap/Epod4) "l" = (/turf/simulated/floor/water/deep,/area/submap/Epod4) "m" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 1},/obj/effect/decal/remains/posi,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/machinery/vending/wallmed1{layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28; pixel_y = 0},/obj/item/clothing/shoes/brown,/obj/item/clothing/under/mbill,/obj/item/clothing/head/soft/mbill,/turf/simulated/floor/water,/area/submap/Epod4) -"n" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 1},/obj/structure/closet/walllocker/emerglocker/east,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/closet/crate/hydroponics{desc = "All you need to destroy that pesky planet."; name = "exotic seeds crate"; starts_with = list(/obj/item/seeds/random = 6, /obj/item/seeds/replicapod = 2, /obj/item/seeds/ambrosiavulgarisseed = 2, /obj/item/seeds/kudzuseed, /obj/item/seeds/libertymycelium, /obj/item/seeds/reishimycelium)},/turf/simulated/floor/water,/area/submap/Epod4) +"n" = (/obj/structure/bed/chair{icon_state = "chair_preview"; dir = 1},/obj/structure/closet/walllocker/emerglocker/east,/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/closet/crate/hydroponics{desc = "All you need to destroy that pesky planet."; name = "exotic seeds crate"; starts_with = list(/obj/item/seeds/random = 6, /obj/item/seeds/replicapod = 2, /obj/item/seeds/ambrosiavulgarisseed = 2, /obj/item/seeds/kudzuseed, /obj/item/seeds/libertymycelium, /obj/item/seeds/reishimycelium)},/turf/simulated/floor/water,/area/submap/Epod4) "o" = (/obj/structure/shuttle/engine/propulsion/burst,/turf/simulated/shuttle/wall,/area/submap/Epod4) "p" = (/obj/structure/door_assembly/door_assembly_ext{anchored = 1},/turf/simulated/floor/water,/area/submap/Epod4) "q" = (/obj/structure/flora/grass/brown,/turf/simulated/floor/outdoors/dirt,/area/submap/Epod4) diff --git a/maps/submaps/surface_submaps/wilderness/GovPatrol.dmm b/maps/submaps/surface_submaps/wilderness/GovPatrol.dmm index 9588c9d0785..7e495b3e1ef 100644 --- a/maps/submaps/surface_submaps/wilderness/GovPatrol.dmm +++ b/maps/submaps/surface_submaps/wilderness/GovPatrol.dmm @@ -13,11 +13,11 @@ /turf/template_noop, /area/submap/GovPatrol) "e" = ( -/obj/item/device/radio/off, +/obj/item/radio/off, /turf/template_noop, /area/submap/GovPatrol) "f" = ( -/obj/item/weapon/storage/box/flare, +/obj/item/storage/box/flare, /turf/template_noop, /area/submap/GovPatrol) "g" = ( @@ -35,7 +35,7 @@ /turf/template_noop, /area/submap/GovPatrol) "j" = ( -/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever, +/obj/item/gun/projectile/shotgun/pump/rifle/lever, /turf/template_noop, /area/submap/GovPatrol) "k" = ( @@ -47,7 +47,7 @@ /turf/template_noop, /area/submap/GovPatrol) "u" = ( -/obj/item/weapon/storage/backpack/parachute, +/obj/item/storage/backpack/parachute, /turf/template_noop, /area/submap/GovPatrol) diff --git a/maps/submaps/surface_submaps/wilderness/Lab1.dmm b/maps/submaps/surface_submaps/wilderness/Lab1.dmm index b81bd2b57af..45de711a554 100644 --- a/maps/submaps/surface_submaps/wilderness/Lab1.dmm +++ b/maps/submaps/surface_submaps/wilderness/Lab1.dmm @@ -58,7 +58,7 @@ /area/submap/Lab1) "k" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox, +/obj/item/storage/toolbox, /obj/random/tool, /turf/simulated/floor/tiled/steel_dirty, /area/submap/Lab1) @@ -98,7 +98,7 @@ "q" = ( /obj/structure/table/standard, /obj/random/toolbox, -/obj/item/weapon/cell/super, +/obj/item/cell/super, /turf/simulated/floor/tiled/steel_dirty, /area/submap/Lab1) "r" = ( @@ -113,12 +113,12 @@ /area/submap/Lab1) "t" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled/steel_dirty, /area/submap/Lab1) "u" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/hyper; + cell_type = /obj/item/cell/hyper; dir = 8; name = "Unknown APC"; operating = 0; @@ -146,14 +146,14 @@ /area/submap/Lab1) "x" = ( /obj/structure/table/standard, -/obj/item/weapon/paper{ +/obj/item/paper{ desc = "Gladstone for the last fucking time, We have crowbars for a REASON. Stop breaking in through the goddamn windows! We big red shiny doors for god's sakes!" }, /turf/simulated/floor/tiled/steel_dirty, /area/submap/Lab1) "y" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/steel_dirty, /area/submap/Lab1) "z" = ( @@ -175,7 +175,7 @@ /area/submap/Lab1) "D" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/steel_dirty, /area/submap/Lab1) "E" = ( @@ -186,7 +186,7 @@ /area/submap/Lab1) "F" = ( /obj/structure/table/standard, -/obj/item/device/multitool, +/obj/item/multitool, /obj/item/clothing/glasses/welding, /turf/simulated/floor/tiled/steel_dirty, /area/submap/Lab1) @@ -211,7 +211,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/submap/Lab1) "J" = ( -/obj/item/weapon/cell/super, +/obj/item/cell/super, /turf/simulated/floor/tiled/steel_dirty, /area/submap/Lab1) "K" = ( @@ -234,7 +234,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/submap/Lab1) "N" = ( -/obj/item/weapon/storage/bag/circuits, +/obj/item/storage/bag/circuits, /obj/structure/table/standard, /turf/simulated/floor/tiled/steel_dirty, /area/submap/Lab1) diff --git a/maps/submaps/surface_submaps/wilderness/MCamp1.dmm b/maps/submaps/surface_submaps/wilderness/MCamp1.dmm index b4bcb7f0b25..a271e4fcd7a 100644 --- a/maps/submaps/surface_submaps/wilderness/MCamp1.dmm +++ b/maps/submaps/surface_submaps/wilderness/MCamp1.dmm @@ -13,7 +13,7 @@ "m" = (/turf/simulated/wall,/area/submap/MilitaryCamp1) "n" = (/obj/random/landmine,/turf/simulated/floor,/area/submap/MilitaryCamp1) "o" = (/turf/simulated/floor,/area/submap/MilitaryCamp1) -"p" = (/obj/item/weapon/material/shard,/turf/template_noop,/area/submap/MilitaryCamp1) +"p" = (/obj/item/material/shard,/turf/template_noop,/area/submap/MilitaryCamp1) "q" = (/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor,/area/submap/MilitaryCamp1) "r" = (/obj/structure/girder,/turf/simulated/floor,/area/submap/MilitaryCamp1) "s" = (/obj/machinery/computer/communications,/mob/living/simple_mob/mechanical/viscerator,/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor,/area/submap/MilitaryCamp1) @@ -22,7 +22,7 @@ "v" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/submap/MilitaryCamp1) "w" = (/obj/machinery/computer/security,/mob/living/simple_mob/mechanical/viscerator,/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor,/area/submap/MilitaryCamp1) "x" = (/mob/living/simple_mob/mechanical/viscerator,/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor,/area/submap/MilitaryCamp1) -"y" = (/obj/item/weapon/material/shard,/obj/random/landmine,/turf/template_noop,/area/submap/MilitaryCamp1) +"y" = (/obj/item/material/shard,/obj/random/landmine,/turf/template_noop,/area/submap/MilitaryCamp1) "z" = (/obj/machinery/door/airlock,/turf/simulated/floor,/area/submap/MilitaryCamp1) "A" = (/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor,/area/submap/MilitaryCamp1) "B" = (/mob/living/simple_mob/mechanical/viscerator,/turf/template_noop,/area/submap/MilitaryCamp1) @@ -32,7 +32,7 @@ "F" = (/obj/machinery/door/airlock,/obj/effect/mine,/turf/simulated/floor,/area/submap/MilitaryCamp1) "G" = (/obj/structure/flora/tree/dead,/turf/template_noop,/area/submap/MilitaryCamp1) "H" = (/obj/random/landmine,/turf/template_noop,/area/template_noop) -"I" = (/obj/structure/table/standard,/obj/random/cigarettes,/obj/item/weapon/flame/lighter/random,/turf/simulated/floor,/area/submap/MilitaryCamp1) +"I" = (/obj/structure/table/standard,/obj/random/cigarettes,/obj/item/flame/lighter/random,/turf/simulated/floor,/area/submap/MilitaryCamp1) "J" = (/obj/structure/table/standard,/obj/random/toolbox,/turf/simulated/floor,/area/submap/MilitaryCamp1) "K" = (/obj/effect/decal/cleanable/blood,/obj/random/landmine,/turf/template_noop,/area/submap/MilitaryCamp1) diff --git a/maps/submaps/surface_submaps/wilderness/MHR.dmm b/maps/submaps/surface_submaps/wilderness/MHR.dmm index 7c2d20c3060..645b2e92e3e 100644 --- a/maps/submaps/surface_submaps/wilderness/MHR.dmm +++ b/maps/submaps/surface_submaps/wilderness/MHR.dmm @@ -5,17 +5,17 @@ "e" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/MHR) "f" = (/obj/effect/decal/cleanable/spiderling_remains,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR) "g" = (/turf/simulated/floor/outdoors/dirt,/area/submap/MHR) -"h" = (/obj/structure/table/rack,/obj/item/weapon/storage/backpack,/turf/template_noop,/area/submap/MHR) +"h" = (/obj/structure/table/rack,/obj/item/storage/backpack,/turf/template_noop,/area/submap/MHR) "i" = (/obj/structure/table/standard,/turf/template_noop,/area/submap/MHR) -"j" = (/obj/structure/table/standard,/obj/item/weapon/paper{info = "Do not enter the cave. The estimated active time of the Vicerators is much longer due to the improvements on the rotor bearings. It's estimated to be roughly a few months before we start to see any chancces of mechanical failure. "; name = "NOTICE: DO NOT ENTER"},/turf/template_noop,/area/submap/MHR) +"j" = (/obj/structure/table/standard,/obj/item/paper{info = "Do not enter the cave. The estimated active time of the Vicerators is much longer due to the improvements on the rotor bearings. It's estimated to be roughly a few months before we start to see any chancces of mechanical failure. "; name = "NOTICE: DO NOT ENTER"},/turf/template_noop,/area/submap/MHR) "k" = (/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR) "l" = (/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR) -"m" = (/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR) +"m" = (/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR) "n" = (/obj/effect/decal/cleanable/cobweb2,/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR) "o" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR) "p" = (/obj/effect/decal/cleanable/spiderling_remains,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR) "q" = (/obj/effect/decal/remains/robot,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR) -"r" = (/obj/effect/decal/remains,/obj/item/clothing/mask/gas/explorer,/obj/item/weapon/material/twohanded/fireaxe,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR) +"r" = (/obj/effect/decal/remains,/obj/item/clothing/mask/gas/explorer,/obj/item/material/twohanded/fireaxe,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR) "s" = (/obj/effect/decal/cleanable/spiderling_remains,/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/MHR) (1,1,1) = {" diff --git a/maps/submaps/surface_submaps/wilderness/Manor1.dmm b/maps/submaps/surface_submaps/wilderness/Manor1.dmm index 435595ace33..db8a77c2135 100644 --- a/maps/submaps/surface_submaps/wilderness/Manor1.dmm +++ b/maps/submaps/surface_submaps/wilderness/Manor1.dmm @@ -2,61 +2,61 @@ "ab" = (/turf/simulated/wall/wood,/area/submap/Manor1) "ac" = (/obj/structure/window/reinforced/full,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "ad" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 4},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"ae" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"ae" = (/obj/structure/table/woodentable,/obj/item/reagent_containers/food/drinks/cans/waterbottle,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "af" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 8},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "ag" = (/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "ah" = (/obj/structure/flora/pottedplant/dead,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "ai" = (/obj/structure/flora/pottedplant/drooping,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"aj" = (/obj/structure/table/woodentable,/obj/item/clothing/mask/smokable/cigarette/cigar,/obj/item/weapon/material/ashtray/glass,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"aj" = (/obj/structure/table/woodentable,/obj/item/clothing/mask/smokable/cigarette/cigar,/obj/item/material/ashtray/glass,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "ak" = (/obj/structure/flora/pottedplant/dead,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "al" = (/obj/structure/table/woodentable,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"am" = (/obj/structure/table/woodentable,/obj/item/device/flashlight,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"am" = (/obj/structure/table/woodentable,/obj/item/flashlight,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "an" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "ao" = (/obj/structure/mopbucket,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "ap" = (/obj/structure/sink,/turf/simulated/wall/wood,/area/submap/Manor1) "aq" = (/turf/simulated/floor/carpet/bcarpet,/area/submap/Manor1) "ar" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/bcarpet,/area/submap/Manor1) "as" = (/obj/structure/simple_door/wood,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"at" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp,/obj/effect/decal/cleanable/blood/gibs/robot,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"au" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"at" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp,/obj/effect/decal/cleanable/blood/gibs/robot,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"au" = (/obj/structure/bed,/obj/item/bedsheet,/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "av" = (/obj/structure/janitorialcart,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"aw" = (/obj/structure/table/woodentable,/obj/item/weapon/mop,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"aw" = (/obj/structure/table/woodentable,/obj/item/mop,/obj/item/reagent_containers/glass/bucket,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "ax" = (/obj/structure/closet/cabinet,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "ay" = (/obj/effect/decal/cleanable/blood/gibs/robot/limb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "az" = (/obj/structure/table/woodentable,/obj/item/trash/candle,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "aA" = (/obj/effect/decal/cleanable/dirt,/obj/effect/spider/stickyweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "aB" = (/obj/effect/decal/cleanable/dirt,/obj/effect/spider/stickyweb,/mob/living/simple_mob/animal/giant_spider/lurker,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"aC" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/maglight,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"aD" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"aC" = (/obj/structure/table/woodentable,/obj/item/flashlight/maglight,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"aD" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "aE" = (/obj/structure/closet/cabinet,/obj/effect/decal/cleanable/cobweb2,/obj/item/clothing/head/hood/winter,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/suit/storage/hooded/wintercoat,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "aF" = (/obj/structure/table/woodentable,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"aG" = (/obj/structure/table/woodentable,/obj/item/weapon/paper,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"aH" = (/obj/structure/table/woodentable,/obj/item/weapon/pen,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"aG" = (/obj/structure/table/woodentable,/obj/item/paper,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"aH" = (/obj/structure/table/woodentable,/obj/item/pen,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "aI" = (/obj/structure/flora/pottedplant/dead,/obj/effect/spider/stickyweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "aJ" = (/obj/effect/spider/stickyweb,/mob/living/simple_mob/animal/giant_spider/lurker,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "aK" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "aL" = (/obj/structure/fireplace,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "aM" = (/mob/living/simple_mob/animal/giant_spider/lurker,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "aN" = (/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"aO" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"aO" = (/obj/structure/bed,/obj/item/bedsheet,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "aP" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "aQ" = (/turf/simulated/floor/carpet/purcarpet,/area/submap/Manor1) "aR" = (/obj/structure/table/standard,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "aS" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "aT" = (/obj/structure/closet/cabinet,/obj/random/projectile/shotgun,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "aU" = (/obj/structure/bookcase,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"aV" = (/obj/structure/table/woodentable,/obj/item/weapon/material/kitchen/utensil/fork,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"aW" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/condiment/small/peppermill,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"aX" = (/obj/structure/table/standard,/obj/item/weapon/material/knife,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"aV" = (/obj/structure/table/woodentable,/obj/item/material/kitchen/utensil/fork,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"aW" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/condiment/small/peppermill,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"aX" = (/obj/structure/table/standard,/obj/item/material/knife,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "aY" = (/obj/machinery/appliance/cooker/oven,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"aZ" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"aZ" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/condiment/small/saltshaker,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "ba" = (/obj/machinery/appliance/cooker/grill,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"bb" = (/obj/structure/table/standard,/obj/item/weapon/tray,/obj/item/weapon/tray,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"bc" = (/obj/structure/table/standard,/obj/item/weapon/material/knife/butch,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"bd" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"bb" = (/obj/structure/table/standard,/obj/item/tray,/obj/item/tray,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"bc" = (/obj/structure/table/standard,/obj/item/material/knife/butch,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"bd" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/drinks/cans/waterbottle,/obj/item/reagent_containers/food/drinks/cans/waterbottle,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "be" = (/obj/random/trash,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bf" = (/obj/structure/closet/cabinet,/obj/item/clothing/head/hood/winter,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/random/contraband,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"bg" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"bg" = (/obj/structure/table/woodentable,/obj/item/paper_bin,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bh" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 1},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bi" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken0"},/area/submap/Manor1) "bj" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) @@ -64,30 +64,30 @@ "bl" = (/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1) "bm" = (/obj/structure/loot_pile/surface/bones,/obj/item/clothing/accessory/sweater/blue,/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1) "bn" = (/obj/structure/window/reinforced/full,/turf/template_noop,/area/submap/Manor1) -"bo" = (/obj/item/weapon/material/twohanded/baseballbat/metal,/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1) +"bo" = (/obj/item/material/twohanded/baseballbat/metal,/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1) "bp" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1) "bq" = (/obj/effect/decal/cleanable/blood/drip,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "br" = (/obj/structure/bed/chair/comfy/purp{icon_state = "comfychair_preview"; dir = 4},/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken5"},/area/submap/Manor1) "bs" = (/obj/structure/table,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bt" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bu" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"bv" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/condiment/small/sugar,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"bv" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/condiment/small/sugar,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bw" = (/obj/effect/decal/cleanable/blood/drip,/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1) "bx" = (/obj/structure/bed/chair/comfy/purp{icon_state = "comfychair_preview"; dir = 4},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "by" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/clothing/head/hood/winter,/obj/item/clothing/shoes/boots/winter,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bz" = (/obj/structure/table/woodentable,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"bA" = (/obj/structure/table/standard,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"bB" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/snacks/stew,/obj/item/weapon/reagent_containers/food/snacks/stew,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"bC" = (/obj/item/weapon/shovel,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"bA" = (/obj/structure/table/standard,/obj/item/material/kitchen/utensil/fork,/obj/item/material/kitchen/utensil/fork,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"bB" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/reagent_containers/food/snacks/stew,/obj/item/reagent_containers/food/snacks/stew,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"bC" = (/obj/item/shovel,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bD" = (/obj/structure/bed/chair/wood{icon_state = "wooden_chair"; dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"bE" = (/obj/structure/table/standard,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/effect/spider/stickyweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"bE" = (/obj/structure/table/standard,/obj/item/material/kitchen/utensil/spoon,/obj/item/material/kitchen/utensil/spoon,/obj/item/material/kitchen/utensil/spoon,/obj/effect/spider/stickyweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bF" = (/obj/structure/table/standard,/obj/effect/spider/stickyweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"bG" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/reagent_containers/food/snacks/sausage,/obj/item/weapon/reagent_containers/food/snacks/sausage,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"bG" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/reagent_containers/food/snacks/sausage,/obj/item/reagent_containers/food/snacks/sausage,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bH" = (/obj/effect/decal/cleanable/dirt,/obj/structure/flora/pottedplant/drooping,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bI" = (/obj/effect/decal/cleanable/dirt,/obj/structure/flora/pottedplant/dead,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"bJ" = (/obj/structure/table/standard,/obj/item/weapon/material/kitchen/rollingpin,/obj/effect/spider/stickyweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"bK" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"bL" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/fancy/candle_box,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"bJ" = (/obj/structure/table/standard,/obj/item/material/kitchen/rollingpin,/obj/effect/spider/stickyweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"bK" = (/obj/structure/table/standard,/obj/item/reagent_containers/glass/bottle/stoxin,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"bL" = (/obj/structure/table/woodentable,/obj/item/storage/fancy/candle_box,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bM" = (/obj/machinery/papershredder,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bN" = (/obj/structure/simple_door/wood,/turf/simulated/floor/carpet/purcarpet,/area/submap/Manor1) "bO" = (/obj/machinery/icecream_vat,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) @@ -95,40 +95,40 @@ "bQ" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bR" = (/obj/effect/decal/cleanable/cobweb,/obj/structure/table/woodentable,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bS" = (/obj/structure/flora/pottedplant/subterranean,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"bT" = (/obj/item/weapon/material/minihoe,/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1) +"bT" = (/obj/item/material/minihoe,/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1) "bU" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/purcarpet,/area/submap/Manor1) "bV" = (/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken6"},/area/submap/Manor1) "bW" = (/obj/machinery/washing_machine,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bX" = (/obj/structure/table/woodentable,/obj/structure/bedsheetbin,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bY" = (/obj/structure/table/rack,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "bZ" = (/obj/structure/closet/crate,/obj/item/stack/cable_coil/random_belt,/obj/random/cash,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"ca" = (/obj/structure/table/woodentable,/obj/item/weapon/melee/umbrella/random,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"ca" = (/obj/structure/table/woodentable,/obj/item/melee/umbrella/random,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "cb" = (/obj/structure/closet/cabinet,/obj/random/gun/random,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"cc" = (/obj/structure/closet/cabinet,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/random/medical,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"cd" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"ce" = (/obj/structure/bed/double,/obj/item/weapon/bedsheet/rddouble,/obj/structure/curtain/open/bed,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"cf" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/wallet/random,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"cc" = (/obj/structure/closet/cabinet,/obj/item/cell/device/weapon,/obj/item/cell/device/weapon,/obj/random/medical,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"cd" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp/green,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"ce" = (/obj/structure/bed/double,/obj/item/bedsheet/rddouble,/obj/structure/curtain/open/bed,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"cf" = (/obj/structure/table/woodentable,/obj/item/storage/wallet/random,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "cg" = (/obj/structure/flora/pottedplant/dead,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "ch" = (/obj/structure/loot_pile/surface/bones,/obj/item/clothing/accessory/sweater,/turf/simulated/floor/carpet/blucarpet,/area/submap/Manor1) -"ci" = (/obj/structure/closet/crate,/obj/item/weapon/flame/lighter/random,/obj/random/powercell,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"ci" = (/obj/structure/closet/crate,/obj/item/flame/lighter/random,/obj/random/powercell,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "cj" = (/obj/structure/closet/cabinet,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/clothing/head/hood/winter,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "ck" = (/obj/effect/decal/cleanable/spiderling_remains,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "cl" = (/turf/simulated/floor/carpet/turcarpet,/area/submap/Manor1) "cm" = (/obj/effect/decal/cleanable/blood,/obj/structure/bed/chair/comfy/purp{icon_state = "comfychair_preview"; dir = 4},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"cn" = (/obj/structure/closet/crate,/obj/item/weapon/storage/wallet/random,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"cn" = (/obj/structure/closet/crate,/obj/item/storage/wallet/random,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "co" = (/obj/structure/coatrack,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "cp" = (/obj/structure/loot_pile/surface/bones,/obj/item/clothing/suit/storage/hooded/wintercoat,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "cq" = (/obj/structure/loot_pile/surface/bones,/obj/item/clothing/under/suit_jacket,/obj/item/clothing/shoes/black,/obj/random/projectile/random,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "cr" = (/obj/structure/simple_door/wood,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/purcarpet,/area/submap/Manor1) -"cs" = (/obj/item/weapon/material/twohanded/spear,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"cs" = (/obj/item/material/twohanded/spear,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "ct" = (/obj/structure/closet/cabinet{opened = 1},/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"cu" = (/obj/effect/decal/remains,/obj/item/weapon/material/knife/tacknife/combatknife,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"cu" = (/obj/effect/decal/remains,/obj/item/material/knife/tacknife/combatknife,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "cv" = (/obj/structure/sink{pixel_y = 30},/turf/simulated/floor/tiled/hydro,/area/submap/Manor1) "cw" = (/turf/simulated/floor/tiled/hydro,/area/submap/Manor1) "cx" = (/obj/structure/table/standard,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/tiled/hydro,/area/submap/Manor1) -"cy" = (/obj/structure/table/standard,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/turf/simulated/floor/tiled/hydro,/area/submap/Manor1) +"cy" = (/obj/structure/table/standard,/obj/item/towel/random,/obj/item/towel/random,/turf/simulated/floor/tiled/hydro,/area/submap/Manor1) "cz" = (/obj/effect/decal/cleanable/cobweb2,/obj/effect/spider/stickyweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) -"cA" = (/obj/item/weapon/paper/crumpled,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"cA" = (/obj/item/paper/crumpled,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "cB" = (/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken3"},/area/submap/Manor1) "cC" = (/obj/effect/decal/cleanable/spiderling_remains,/obj/effect/spider/stickyweb,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) "cD" = (/obj/structure/closet/crate,/obj/item/clothing/suit/armor/vest,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) diff --git a/maps/submaps/surface_submaps/wilderness/Rocky1.dmm b/maps/submaps/surface_submaps/wilderness/Rocky1.dmm index bbe9827a67a..398ab0f1fd9 100644 --- a/maps/submaps/surface_submaps/wilderness/Rocky1.dmm +++ b/maps/submaps/surface_submaps/wilderness/Rocky1.dmm @@ -4,7 +4,7 @@ "d" = (/obj/structure/boulder,/turf/simulated/floor/outdoors/dirt,/area/submap/Rocky1) "e" = (/turf/simulated/mineral,/area/submap/Rocky1) "f" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/submap/Rocky1) -"g" = (/obj/random/handgun/sec,/obj/effect/decal/remains/human,/obj/item/weapon/spacecash/c200,/turf/simulated/floor/outdoors/dirt,/area/submap/Rocky1) +"g" = (/obj/random/handgun/sec,/obj/effect/decal/remains/human,/obj/item/spacecash/c200,/turf/simulated/floor/outdoors/dirt,/area/submap/Rocky1) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/submaps/surface_submaps/wilderness/Rocky2.dmm b/maps/submaps/surface_submaps/wilderness/Rocky2.dmm index 79c06084f9e..1ed15211e76 100644 --- a/maps/submaps/surface_submaps/wilderness/Rocky2.dmm +++ b/maps/submaps/surface_submaps/wilderness/Rocky2.dmm @@ -44,7 +44,7 @@ /turf/template_noop, /area/submap/Rocky2) "A" = ( -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/template_noop, /area/submap/Rocky2) diff --git a/maps/submaps/surface_submaps/wilderness/Rockybase.dmm b/maps/submaps/surface_submaps/wilderness/Rockybase.dmm index abbac3e1c11..67dacdfedc0 100644 --- a/maps/submaps/surface_submaps/wilderness/Rockybase.dmm +++ b/maps/submaps/surface_submaps/wilderness/Rockybase.dmm @@ -1,6 +1,6 @@ "aa" = (/turf/template_noop,/area/template_noop) "ab" = (/obj/effect/decal/remains,/turf/template_noop,/area/template_noop) -"ac" = (/obj/item/weapon/grenade/chem_grenade/metalfoam,/turf/template_noop,/area/template_noop) +"ac" = (/obj/item/grenade/chem_grenade/metalfoam,/turf/template_noop,/area/template_noop) "ad" = (/mob/living/simple_mob/mechanical/viscerator,/turf/template_noop,/area/template_noop) "ae" = (/obj/effect/decal/remains,/turf/template_noop,/area/submap/Rockybase) "af" = (/turf/template_noop,/area/submap/Rockybase) @@ -23,57 +23,57 @@ "aw" = (/obj/effect/decal/remains/deer,/turf/template_noop,/area/template_noop) "ax" = (/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/curtain/open/shower,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase) "ay" = (/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase) -"az" = (/obj/machinery/shower{dir = 8; icon_state = "shower"; pixel_x = -5; pixel_y = 0},/obj/structure/curtain/open/shower,/obj/item/weapon/soap,/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase) +"az" = (/obj/machinery/shower{dir = 8; icon_state = "shower"; pixel_x = -5; pixel_y = 0},/obj/structure/curtain/open/shower,/obj/item/soap,/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase) "aA" = (/obj/structure/table/woodentable,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) "aB" = (/obj/structure/table/woodentable,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) -"aC" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) -"aD" = (/obj/structure/closet/cabinet,/obj/item/weapon/pickaxe/plasmacutter,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) +"aC" = (/obj/structure/table/woodentable,/obj/item/flashlight/lamp,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) +"aD" = (/obj/structure/closet/cabinet,/obj/item/pickaxe/plasmacutter,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) "aE" = (/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) -"aF" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) +"aF" = (/obj/structure/bed,/obj/item/bedsheet,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) "aG" = (/obj/structure/table/woodentable,/obj/machinery/light{dir = 1},/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) -"aH" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) -"aI" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/item/toy/plushie/spider,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) +"aH" = (/obj/structure/bed,/obj/item/bedsheet,/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) +"aI" = (/obj/structure/bed,/obj/item/bedsheet,/obj/item/toy/plushie/spider,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) "aJ" = (/obj/structure/closet/l3closet/janitor,/turf/simulated/floor/tiled,/area/submap/Rockybase) "aK" = (/mob/living/bot/cleanbot{faction = "malf_drone"},/turf/simulated/floor/tiled,/area/submap/Rockybase) -"aL" = (/obj/item/weapon/stool,/turf/simulated/floor/tiled,/area/submap/Rockybase) -"aM" = (/obj/item/weapon/storage/belt/janitor,/obj/structure/table/standard,/turf/simulated/floor/tiled,/area/submap/Rockybase) +"aL" = (/obj/item/stool,/turf/simulated/floor/tiled,/area/submap/Rockybase) +"aM" = (/obj/item/storage/belt/janitor,/obj/structure/table/standard,/turf/simulated/floor/tiled,/area/submap/Rockybase) "aN" = (/turf/simulated/floor/tiled,/area/submap/Rockybase) "aO" = (/obj/structure/table/standard,/obj/item/modular_computer/laptop/preset/custom_loadout/cheap,/obj/effect/floor_decal/corner/red/border{dir = 9; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "aP" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/red/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) -"aQ" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/pistol,/obj/effect/floor_decal/corner/red/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) -"aR" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/gun/taser,/obj/effect/floor_decal/corner/red/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) +"aQ" = (/obj/structure/table/rack,/obj/item/gun/projectile/pistol,/obj/effect/floor_decal/corner/red/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) +"aR" = (/obj/structure/table/rack,/obj/item/gun/energy/gun/taser,/obj/effect/floor_decal/corner/red/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "aS" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "aT" = (/obj/machinery/vending/coffee,/obj/effect/floor_decal/corner/red/border{dir = 5; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "aU" = (/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase) -"aV" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/shotgun/pump/combat,/obj/item/weapon/gun/projectile/shotgun/pump/combat,/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase) +"aV" = (/obj/structure/table/rack,/obj/item/gun/projectile/shotgun/pump/combat,/obj/item/gun/projectile/shotgun/pump/combat,/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase) "aW" = (/obj/machinery/vending/hydronutrients,/obj/effect/floor_decal/corner/lime/border{dir = 9; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "aX" = (/obj/structure/closet/crate/hydroponics,/obj/effect/floor_decal/corner/lime/border{dir = 5; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "aY" = (/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase) "aZ" = (/obj/machinery/shower{dir = 8; icon_state = "shower"; pixel_x = -5; pixel_y = 0},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase) "ba" = (/obj/structure/janitorialcart,/turf/simulated/floor/tiled,/area/submap/Rockybase) -"bb" = (/obj/structure/table/standard,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/submap/Rockybase) +"bb" = (/obj/structure/table/standard,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/item/grenade/chem_grenade/cleaner,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "bc" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/tiled,/area/submap/Rockybase) -"bd" = (/obj/structure/table/standard,/obj/item/weapon/paper{info = "Carl's absolutly fucked in the head. He's trying to squeeze as much drone production out as he can since he's worried we're gonna get found out but he's getting sloppier with each batch. Now's he's telling us he can speed the time on the IFF encoding. I already have a hard enough time getting these damn things not to stare at walls and now he's gonna shortchange the only part of these tincans that tells em not to turn us into paste on a wall. I told Richter to get out while he can, We're counting days before either some Sif task force shows up at our door or these things decide we aren't there friends anymore."; name = "Note"},/obj/effect/floor_decal/corner/red/border{dir = 8; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) +"bd" = (/obj/structure/table/standard,/obj/item/paper{info = "Carl's absolutly fucked in the head. He's trying to squeeze as much drone production out as he can since he's worried we're gonna get found out but he's getting sloppier with each batch. Now's he's telling us he can speed the time on the IFF encoding. I already have a hard enough time getting these damn things not to stare at walls and now he's gonna shortchange the only part of these tincans that tells em not to turn us into paste on a wall. I told Richter to get out while he can, We're counting days before either some Sif task force shows up at our door or these things decide we aren't there friends anymore."; name = "Note"},/obj/effect/floor_decal/corner/red/border{dir = 8; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "be" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/tiled,/area/submap/Rockybase) "bf" = (/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/tiled,/area/submap/Rockybase) "bg" = (/obj/machinery/vending/security,/obj/effect/floor_decal/corner/red/border{dir = 4; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) -"bh" = (/obj/structure/table/rack,/obj/item/weapon/cell/device/weapon,/obj/item/ammo_magazine/ammo_box/b12g/pellet,/obj/item/ammo_magazine/ammo_box/b12g/pellet,/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase) +"bh" = (/obj/structure/table/rack,/obj/item/cell/device/weapon,/obj/item/ammo_magazine/ammo_box/b12g/pellet,/obj/item/ammo_magazine/ammo_box/b12g/pellet,/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase) "bi" = (/obj/effect/floor_decal/corner/lime/border{dir = 8; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "bj" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/effect/floor_decal/corner/lime/border{dir = 4; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "bk" = (/obj/machinery/shower{dir = 8; icon_state = "shower"; pixel_x = -5; pixel_y = 0},/obj/structure/curtain/open/shower,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase) "bl" = (/obj/item/mecha_parts/part/gygax_left_leg,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) "bm" = (/obj/machinery/light,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) -"bn" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/item/weapon/gun/projectile/pistol,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) +"bn" = (/obj/structure/bed,/obj/item/bedsheet,/obj/item/gun/projectile/pistol,/turf/simulated/floor/holofloor/lino,/area/submap/Rockybase) "bo" = (/obj/structure/closet/crate/trashcart,/turf/simulated/floor/tiled,/area/submap/Rockybase) "bp" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/tiled,/area/submap/Rockybase) -"bq" = (/obj/structure/table/standard,/obj/item/weapon/storage/bag/trash,/obj/item/weapon/storage/bag/trash,/turf/simulated/floor/tiled,/area/submap/Rockybase) -"br" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin,/obj/effect/floor_decal/corner/red/border{dir = 10; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) -"bs" = (/obj/machinery/light,/obj/structure/table/standard,/obj/item/weapon/pen,/obj/effect/floor_decal/corner/red/border,/turf/simulated/floor/tiled,/area/submap/Rockybase) +"bq" = (/obj/structure/table/standard,/obj/item/storage/bag/trash,/obj/item/storage/bag/trash,/turf/simulated/floor/tiled,/area/submap/Rockybase) +"br" = (/obj/structure/table/standard,/obj/item/paper_bin,/obj/effect/floor_decal/corner/red/border{dir = 10; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) +"bs" = (/obj/machinery/light,/obj/structure/table/standard,/obj/item/pen,/obj/effect/floor_decal/corner/red/border,/turf/simulated/floor/tiled,/area/submap/Rockybase) "bt" = (/obj/effect/floor_decal/corner/red/border,/turf/simulated/floor/tiled,/area/submap/Rockybase) "bu" = (/obj/effect/floor_decal/corner/red/border,/mob/living/simple_mob/mechanical/viscerator,/turf/simulated/floor/tiled,/area/submap/Rockybase) "bv" = (/obj/machinery/door/airlock/security{icon_state = "door_locked"; locked = 1},/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase) "bw" = (/obj/machinery/light,/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase) -"bx" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/ionrifle/pistol,/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase) +"bx" = (/obj/structure/table/rack,/obj/item/gun/energy/ionrifle/pistol,/turf/simulated/floor/tiled/techfloor,/area/submap/Rockybase) "by" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/effect/floor_decal/corner/lime/border{dir = 4; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "bz" = (/obj/machinery/door/airlock,/turf/simulated/floor/tiled,/area/submap/Rockybase) "bA" = (/obj/effect/floor_decal/corner/lime/border{dir = 8; icon_state = "bordercolor"},/mob/living/bot/farmbot{faction = "malf_drone"; name = "Mr. Weddleton"},/turf/simulated/floor/tiled,/area/submap/Rockybase) @@ -104,30 +104,30 @@ "bZ" = (/obj/machinery/door/airlock/engineering,/turf/simulated/floor/tiled,/area/submap/Rockybase) "ca" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled,/area/submap/Rockybase) "cb" = (/turf/simulated/wall,/area/submap/Rockybase) -"cc" = (/obj/structure/table/standard,/obj/item/device/kit/paint/gygax/darkgygax,/turf/simulated/floor/tiled,/area/submap/Rockybase) -"cd" = (/obj/structure/table/standard,/obj/item/weapon/paper{info = "I've decided to go forward and start some small scale tests of the Vicerator delivery grenades, Might as wall make sure they work like the real ones. There are a few Fauna areas nearbye and we're working to make sure the kinks in the code are worked out. Once we've made sure they stay flying we'll work on the IFF signals."; name = "V-Grenade Notice 2"},/turf/simulated/floor/tiled,/area/submap/Rockybase) +"cc" = (/obj/structure/table/standard,/obj/item/kit/paint/gygax/darkgygax,/turf/simulated/floor/tiled,/area/submap/Rockybase) +"cd" = (/obj/structure/table/standard,/obj/item/paper{info = "I've decided to go forward and start some small scale tests of the Vicerator delivery grenades, Might as wall make sure they work like the real ones. There are a few Fauna areas nearbye and we're working to make sure the kinks in the code are worked out. Once we've made sure they stay flying we'll work on the IFF signals."; name = "V-Grenade Notice 2"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "ce" = (/obj/structure/table/standard,/obj/random/toolbox,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/submap/Rockybase) "cf" = (/obj/structure/table/standard,/obj/random/toolbox,/turf/simulated/floor/tiled,/area/submap/Rockybase) -"cg" = (/obj/structure/table/standard,/obj/item/weapon/paper{info = "We've finally been able to get the Vicerator delivery grenades working, Took awhile to make sure the latching mechanism didn't fail but we're sure we've got it this time. Vel'Shem's worried about the miners having there own drone fab now but I say it's a small price to pay to keep the metal flowing, Especially since there telling us NT's starting to monopolize the metal rich parts."; name = "V-Grenade Notice 1"},/turf/simulated/floor/tiled,/area/submap/Rockybase) +"cg" = (/obj/structure/table/standard,/obj/item/paper{info = "We've finally been able to get the Vicerator delivery grenades working, Took awhile to make sure the latching mechanism didn't fail but we're sure we've got it this time. Vel'Shem's worried about the miners having there own drone fab now but I say it's a small price to pay to keep the metal flowing, Especially since there telling us NT's starting to monopolize the metal rich parts."; name = "V-Grenade Notice 1"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "ch" = (/obj/structure/table/standard,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/obj/item/stack/material/diamond,/turf/simulated/floor/tiled,/area/submap/Rockybase) -"ci" = (/obj/structure/table/standard,/obj/item/weapon/grenade/spawnergrenade/manhacks,/turf/simulated/floor/tiled,/area/submap/Rockybase) +"ci" = (/obj/structure/table/standard,/obj/item/grenade/spawnergrenade/manhacks,/turf/simulated/floor/tiled,/area/submap/Rockybase) "cj" = (/obj/structure/table/standard,/obj/item/stack/material/steel,/turf/simulated/floor/tiled,/area/submap/Rockybase) -"ck" = (/obj/structure/table/standard,/obj/machinery/light{dir = 1},/obj/item/weapon/circuitboard/mecha/gygax/main,/obj/item/weapon/circuitboard/mecha/gygax/peripherals,/obj/item/weapon/circuitboard/mecha/gygax/targeting,/turf/simulated/floor/tiled,/area/submap/Rockybase) +"ck" = (/obj/structure/table/standard,/obj/machinery/light{dir = 1},/obj/item/circuitboard/mecha/gygax/main,/obj/item/circuitboard/mecha/gygax/peripherals,/obj/item/circuitboard/mecha/gygax/targeting,/turf/simulated/floor/tiled,/area/submap/Rockybase) "cl" = (/obj/structure/door_assembly,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled,/area/submap/Rockybase) -"cm" = (/obj/item/weapon/material/shard,/turf/simulated/floor,/area/submap/Rockybase) +"cm" = (/obj/item/material/shard,/turf/simulated/floor,/area/submap/Rockybase) "cn" = (/obj/structure/table/standard,/obj/fiftyspawner/rods,/turf/simulated/floor/tiled,/area/submap/Rockybase) "co" = (/obj/machinery/vending/engivend,/turf/simulated/floor/tiled,/area/submap/Rockybase) "cp" = (/obj/machinery/vending/tool,/turf/simulated/floor/tiled,/area/submap/Rockybase) -"cq" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox,/turf/simulated/floor/tiled,/area/submap/Rockybase) -"cr" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/tiled,/area/submap/Rockybase) +"cq" = (/obj/structure/table/standard,/obj/item/storage/toolbox,/turf/simulated/floor/tiled,/area/submap/Rockybase) +"cr" = (/obj/structure/table/standard,/obj/item/storage/toolbox/mechanical,/turf/simulated/floor/tiled,/area/submap/Rockybase) "cs" = (/obj/item/mecha_parts/part/gygax_torso,/turf/simulated/floor/tiled,/area/submap/Rockybase) "ct" = (/obj/machinery/light{dir = 1},/obj/structure/closet/crate/medical,/turf/simulated/floor/tiled,/area/submap/Rockybase) -"cu" = (/obj/structure/table/standard,/obj/structure/table/standard,/obj/effect/decal/cleanable/dirt,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn,/turf/simulated/floor/tiled,/area/submap/Rockybase) +"cu" = (/obj/structure/table/standard,/obj/structure/table/standard,/obj/effect/decal/cleanable/dirt,/obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn,/turf/simulated/floor/tiled,/area/submap/Rockybase) "cv" = (/obj/structure/table/standard,/obj/item/clothing/mask/breath/medical,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/Rockybase) "cw" = (/obj/structure/closet/secure_closet/medical2,/turf/simulated/floor/tiled,/area/submap/Rockybase) "cx" = (/obj/structure/toilet{dir = 4},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase) "cy" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/hydro,/area/submap/Rockybase) -"cz" = (/obj/structure/table/standard,/obj/item/device/mmi/digital/robot,/obj/item/weapon/stock_parts/capacitor/adv,/obj/item/weapon/stock_parts/scanning_module/adv,/turf/simulated/floor/tiled,/area/submap/Rockybase) +"cz" = (/obj/structure/table/standard,/obj/item/mmi/digital/robot,/obj/item/stock_parts/capacitor/adv,/obj/item/stock_parts/scanning_module/adv,/turf/simulated/floor/tiled,/area/submap/Rockybase) "cA" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "cB" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled,/area/submap/Rockybase) "cC" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/port_gen/pacman,/turf/simulated/floor,/area/submap/Rockybase) @@ -151,13 +151,13 @@ "cU" = (/obj/machinery/vending/medical,/turf/simulated/floor/tiled,/area/submap/Rockybase) "cV" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/Rockybase) "cW" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/submap/Rockybase) -"cX" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/item/weapon/material/shard,/turf/simulated/floor,/area/submap/Rockybase) +"cX" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/item/material/shard,/turf/simulated/floor,/area/submap/Rockybase) "cY" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/submap/Rockybase) "cZ" = (/obj/item/mecha_parts/part/gygax_armour,/turf/simulated/floor,/area/submap/Rockybase) "da" = (/obj/item/mecha_parts/chassis/gygax,/turf/simulated/floor/tiled,/area/submap/Rockybase) "dc" = (/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled,/area/submap/Rockybase) "dd" = (/obj/machinery/vending/robotics,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/submap/Rockybase) -"de" = (/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/super; dir = 8; name = "Unknown APC"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled,/area/submap/Rockybase) +"de" = (/obj/machinery/power/apc{cell_type = /obj/item/cell/super; dir = 8; name = "Unknown APC"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "df" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "dg" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "dh" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/submap/Rockybase) @@ -178,7 +178,7 @@ "dw" = (/obj/structure/table/standard,/obj/item/mecha_parts/part/gygax_head,/turf/simulated/floor/tiled,/area/submap/Rockybase) "dx" = (/obj/structure/closet/toolcloset,/turf/simulated/floor/tiled,/area/submap/Rockybase) "dy" = (/obj/structure/closet/secure_closet/medical3,/turf/simulated/floor/tiled,/area/submap/Rockybase) -"dz" = (/obj/item/weapon/surgical/surgicaldrill,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/Rockybase) +"dz" = (/obj/item/surgical/surgicaldrill,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/Rockybase) "dA" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/tiled,/area/submap/Rockybase) "dB" = (/obj/effect/decal/cleanable/dirt,/mob/living/bot/medbot{faction = "malf_drone"},/turf/simulated/floor/tiled,/area/submap/Rockybase) "dC" = (/obj/machinery/vending/hydroseeds,/obj/effect/floor_decal/corner/lime/border{dir = 10; icon_state = "bordercolor"},/turf/simulated/floor/tiled,/area/submap/Rockybase) diff --git a/maps/submaps/surface_submaps/wilderness/Shack1.dmm b/maps/submaps/surface_submaps/wilderness/Shack1.dmm index 604b970b929..fa629810d72 100644 --- a/maps/submaps/surface_submaps/wilderness/Shack1.dmm +++ b/maps/submaps/surface_submaps/wilderness/Shack1.dmm @@ -3,7 +3,7 @@ "c" = (/turf/template_noop,/area/submap/Shack1) "d" = (/turf/simulated/floor/outdoors/dirt,/area/submap/Shack1) "e" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken1"},/area/submap/Shack1) -"f" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/storage/fancy/candle_box,/obj/item/weapon/storage/box/matches,/turf/simulated/floor/wood,/area/submap/Shack1) +"f" = (/obj/structure/table/wooden_reinforced,/obj/item/storage/fancy/candle_box,/obj/item/storage/box/matches,/turf/simulated/floor/wood,/area/submap/Shack1) "g" = (/obj/structure/closet/cabinet,/obj/item/clothing/suit/storage/apron/overalls,/obj/item/clothing/under/overalls,/obj/random/mre,/turf/simulated/floor/wood,/area/submap/Shack1) "h" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/Shack1) "i" = (/turf/simulated/floor/wood,/area/submap/Shack1) @@ -13,11 +13,11 @@ "m" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wood,/area/submap/Shack1) "n" = (/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken3"},/area/submap/Shack1) "o" = (/obj/structure/table/bench/wooden,/turf/simulated/floor/wood,/area/submap/Shack1) -"p" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/wooden_reinforced,/obj/item/weapon/storage/toolbox,/turf/simulated/floor/wood,/area/submap/Shack1) -"q" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/wooden_reinforced,/obj/item/weapon/material/twohanded/fireaxe/scythe,/turf/simulated/floor/wood,/area/submap/Shack1) +"p" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/wooden_reinforced,/obj/item/storage/toolbox,/turf/simulated/floor/wood,/area/submap/Shack1) +"q" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/wooden_reinforced,/obj/item/material/twohanded/fireaxe/scythe,/turf/simulated/floor/wood,/area/submap/Shack1) "r" = (/obj/effect/decal/cleanable/spiderling_remains,/turf/simulated/floor/wood,/area/submap/Shack1) "s" = (/turf/simulated/floor/holofloor/wood{icon_state = "wood_broken6"},/area/submap/Shack1) -"t" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/wooden_reinforced,/obj/item/device/flashlight/lamp,/turf/simulated/floor/wood,/area/submap/Shack1) +"t" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/wooden_reinforced,/obj/item/flashlight/lamp,/turf/simulated/floor/wood,/area/submap/Shack1) "u" = (/obj/structure/flora/tree/dead,/turf/template_noop,/area/submap/Shack1) (1,1,1) = {" diff --git a/maps/submaps/surface_submaps/wilderness/borglab.dmm b/maps/submaps/surface_submaps/wilderness/borglab.dmm index b2865e495de..8f46ee27c53 100644 --- a/maps/submaps/surface_submaps/wilderness/borglab.dmm +++ b/maps/submaps/surface_submaps/wilderness/borglab.dmm @@ -10,10 +10,10 @@ "aj" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/random/energy/highend,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "ak" = (/obj/effect/floor_decal/techfloor/orange,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "al" = (/obj/effect/floor_decal/techfloor/orange,/obj/random/contraband,/turf/simulated/floor/reinforced,/area/submap/BorgLab) -"bj" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/brown,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled,/area/submap/BorgLab) +"bj" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled,/area/submap/BorgLab) "bz" = (/obj/random/trash,/turf/simulated/floor/reinforced,/area/submap/BorgLab) -"bE" = (/obj/structure/closet/secure_closet/chemical{locked = 0},/obj/item/weapon/storage/box/pillbottles,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/tool/screwdriver,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) -"bI" = (/obj/structure/window/reinforced,/obj/structure/grille/broken,/obj/item/weapon/material/shard{pixel_y = 10},/obj/item/weapon/material/shard{pixel_x = 6},/obj/effect/decal/cleanable/generic,/obj/machinery/door/blast/regular/open{dir = 4},/turf/simulated/floor/plating,/area/submap/BorgLab) +"bE" = (/obj/structure/closet/secure_closet/chemical{locked = 0},/obj/item/storage/box/pillbottles,/obj/item/storage/box/syringes,/obj/item/tool/screwdriver,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) +"bI" = (/obj/structure/window/reinforced,/obj/structure/grille/broken,/obj/item/material/shard{pixel_y = 10},/obj/item/material/shard{pixel_x = 6},/obj/effect/decal/cleanable/generic,/obj/machinery/door/blast/regular/open{dir = 4},/turf/simulated/floor/plating,/area/submap/BorgLab) "bL" = (/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/BorgLab) "bN" = (/obj/machinery/artifact_analyser,/obj/effect/floor_decal/rust/mono_rusted3,/turf/simulated/floor/tiled,/area/submap/BorgLab) "bY" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/structure/loot_pile/surface/bones,/turf/simulated/floor/reinforced,/area/submap/BorgLab) @@ -27,12 +27,12 @@ "ej" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/submap/BorgLab) "eV" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/obj/structure/table/standard,/obj/structure/railing,/turf/simulated/floor/tiled,/area/submap/BorgLab) "fh" = (/obj/effect/floor_decal/rust,/obj/effect/gibspawner/robot,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) -"ga" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/item/weapon/material/shard{pixel_x = -3; pixel_y = -6},/obj/item/weapon/material/shard,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/reinforced,/area/submap/BorgLab) +"ga" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/item/material/shard{pixel_x = -3; pixel_y = -6},/obj/item/material/shard,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "gc" = (/obj/structure/railing{dir = 1},/obj/machinery/light/small/emergency/flicker{dir = 8},/turf/simulated/floor/plating,/area/submap/BorgLab) -"gf" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/item/weapon/cell/super/empty,/turf/simulated/floor/tiled,/area/submap/BorgLab) +"gf" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/snacks/burrito_cheese,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/item/cell/super/empty,/turf/simulated/floor/tiled,/area/submap/BorgLab) "gh" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/light_construct{dir = 1},/turf/simulated/floor/tiled,/area/submap/BorgLab) "gN" = (/obj/structure/window/reinforced/tinted/frosted{dir = 4},/obj/random/junk,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/submap/BorgLab) -"he" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/item/weapon/material/shard{pixel_x = 6; pixel_y = -6},/obj/machinery/door/blast/regular{dir = 8; id = "borg"; layer = 3.3; name = "Containment Door"},/turf/simulated/floor/plating,/area/submap/BorgLab) +"he" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/item/material/shard{pixel_x = 6; pixel_y = -6},/obj/machinery/door/blast/regular{dir = 8; id = "borg"; layer = 3.3; name = "Containment Door"},/turf/simulated/floor/plating,/area/submap/BorgLab) "hW" = (/obj/machinery/door/airlock/maintenance/common,/turf/simulated/floor/tiled/techmaint,/area/submap/BorgLab) "ic" = (/obj/structure/window/reinforced/tinted/frosted{dir = 4},/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) "if" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/random/single,/turf/simulated/floor/tiled,/area/submap/BorgLab) @@ -41,9 +41,9 @@ "iY" = (/obj/structure/loot_pile/maint/boxfort,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/BorgLab) "jf" = (/obj/effect/floor_decal/rust,/obj/random/trash,/turf/simulated/floor/plating,/area/submap/BorgLab) "jz" = (/obj/machinery/light/small/emergency/flicker{dir = 8},/obj/effect/floor_decal/rust/color_rustedcee{dir = 4},/obj/machinery/button/remote/blast_door{dir = 8; id = "borg"},/turf/simulated/floor/tiled/dark,/area/submap/BorgLab) -"jR" = (/obj/effect/floor_decal/techfloor/orange,/obj/item/weapon/broken_gun/ionrifle,/turf/simulated/floor/reinforced,/area/submap/BorgLab) +"jR" = (/obj/effect/floor_decal/techfloor/orange,/obj/item/broken_gun/ionrifle,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "kj" = (/obj/effect/floor_decal/rust,/obj/random/junk,/obj/random/trash,/turf/simulated/floor/tiled,/area/submap/BorgLab) -"kt" = (/obj/item/device/mass_spectrometer/adv,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) +"kt" = (/obj/item/mass_spectrometer/adv,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) "kI" = (/obj/machinery/door/airlock/maintenance/rnd{req_one_access = null},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techmaint,/area/submap/BorgLab) "lz" = (/obj/machinery/light_switch,/turf/simulated/wall/r_wall,/area/submap/BorgLab) "lJ" = (/obj/effect/floor_decal/rust,/obj/structure/sink{dir = 4; pixel_x = 11},/obj/machinery/light/small/emergency/flicker{dir = 1},/turf/simulated/floor/plating,/area/submap/BorgLab) @@ -54,24 +54,24 @@ "ms" = (/obj/machinery/door/airlock/maintenance/rnd{req_one_access = null},/turf/simulated/floor/tiled/techmaint,/area/submap/BorgLab) "mw" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/random/multiple/gun/projectile/rifle,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "mB" = (/obj/machinery/door/window/brigdoor/westright{dir = 2; name = "Containment Pen"; req_one_access = list(43,1)},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/blast/regular{dir = 8; id = "borg"; layer = 3.3; name = "Containment Door"},/turf/simulated/floor/plating,/area/submap/BorgLab) -"mE" = (/obj/effect/floor_decal/techfloor/orange,/obj/item/weapon/storage/backpack/holding/duffle,/turf/simulated/floor/reinforced,/area/submap/BorgLab) +"mE" = (/obj/effect/floor_decal/techfloor/orange,/obj/item/storage/backpack/holding/duffle,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "nb" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) "ne" = (/obj/machinery/door/window/brigdoor/westright{dir = 1; name = "Containment Pen"; req_one_access = list(43,1)},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/blast/regular{dir = 8; id = "borg"; layer = 3.3; name = "Containment Door"},/turf/simulated/floor/plating,/area/submap/BorgLab) "nk" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/submap/BorgLab) "ny" = (/obj/structure/curtain/open/shower,/obj/effect/floor_decal/borderfloor/cee{dir = 4},/obj/effect/floor_decal/rust,/obj/machinery/shower{dir = 4; pixel_x = 5},/turf/simulated/floor/tiled,/area/submap/BorgLab) "nW" = (/obj/effect/floor_decal/rust,/obj/structure/table,/obj/effect/floor_decal/rust/mono_rusted3,/turf/simulated/floor/tiled,/area/submap/BorgLab) -"oa" = (/obj/effect/floor_decal/industrial/warning,/obj/item/weapon/material/shard{pixel_x = 6; pixel_y = -6},/turf/simulated/floor/tiled,/area/submap/BorgLab) +"oa" = (/obj/effect/floor_decal/industrial/warning,/obj/item/material/shard{pixel_x = 6; pixel_y = -6},/turf/simulated/floor/tiled,/area/submap/BorgLab) "op" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/decal/cleanable/generic,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "pe" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/random/trash,/mob/living/simple_mob/mechanical/viscerator/mercenary,/mob/living/simple_mob/mechanical/viscerator/mercenary,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "pY" = (/obj/machinery/power/port_gen/pacman,/obj/structure/cable/blue{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/submap/BorgLab) -"qa" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight,/obj/effect/floor_decal/rust/mono_rusted2,/turf/simulated/floor/tiled/dark,/area/submap/BorgLab) +"qa" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/snacks/monkeysdelight,/obj/effect/floor_decal/rust/mono_rusted2,/turf/simulated/floor/tiled/dark,/area/submap/BorgLab) "qW" = (/turf/simulated/floor/plating,/area/submap/BorgLab) "ra" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled,/area/submap/BorgLab) -"rO" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/rust,/obj/item/weapon/material/shard{pixel_x = 6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) +"rO" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/rust,/obj/item/material/shard{pixel_x = 6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) "rP" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/random/junk,/turf/simulated/floor/plating,/area/submap/BorgLab) "sr" = (/turf/simulated/floor/outdoors/dirt,/area/template_noop) "sK" = (/obj/structure/closet/crate/secure/loot,/turf/simulated/floor/plating,/area/submap/BorgLab) -"ta" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/brown,/obj/machinery/light_construct{dir = 8},/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/submap/BorgLab) +"ta" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/obj/machinery/light_construct{dir = 8},/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/submap/BorgLab) "th" = (/obj/effect/floor_decal/rust,/obj/structure/table,/obj/random/maintenance/research,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled,/area/submap/BorgLab) "tr" = (/obj/machinery/light_construct/small{dir = 1},/obj/machinery/portable_atmospherics/canister/phoron,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust/color_rustedfull,/turf/simulated/floor/plating,/area/submap/BorgLab) "tx" = (/turf/simulated/floor/reinforced,/area/submap/BorgLab) @@ -81,7 +81,7 @@ "ug" = (/obj/machinery/door/window/brigdoor/westright{dir = 2; name = "Containment Pen"; req_one_access = list(43,1)},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/effect/decal/cleanable/generic,/obj/machinery/door/blast/regular/open{dir = 4},/turf/simulated/floor/plating,/area/submap/BorgLab) "uQ" = (/obj/effect/gibspawner/human,/obj/random/trash,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "uX" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/structure/closet/crate/secure/loot,/turf/simulated/floor/reinforced,/area/submap/BorgLab) -"wq" = (/obj/structure/table/standard,/obj/item/weapon/phone,/obj/effect/floor_decal/rust/mono_rusted2,/turf/simulated/floor/tiled/dark,/area/submap/BorgLab) +"wq" = (/obj/structure/table/standard,/obj/item/phone,/obj/effect/floor_decal/rust/mono_rusted2,/turf/simulated/floor/tiled/dark,/area/submap/BorgLab) "wt" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/blast/regular{dir = 8; id = "borg"; layer = 3.3; name = "Containment Door"},/turf/simulated/floor/plating,/area/submap/BorgLab) "xh" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/gibspawner/human,/obj/random/trash,/mob/living/simple_mob/mechanical/combat_drone/lesser{faction = "corrupt"},/turf/simulated/floor/plating,/area/submap/BorgLab) "xk" = (/obj/structure/sign/warning/caution,/turf/simulated/wall/r_wall,/area/submap/BorgLab) @@ -89,8 +89,8 @@ "xz" = (/obj/structure/bed,/obj/effect/floor_decal/techfloor/orange{dir = 1},/turf/simulated/floor/reinforced,/area/submap/BorgLab) "xO" = (/obj/effect/decal/cleanable/generic,/mob/living/simple_mob/mechanical/viscerator/mercenary,/mob/living/simple_mob/mechanical/viscerator/mercenary,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "xU" = (/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled,/area/submap/BorgLab) -"yq" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/obj/machinery/door/blast/regular{dir = 8; id = "borg"; layer = 3.3; name = "Containment Door"},/turf/simulated/floor/plating,/area/submap/BorgLab) -"yz" = (/obj/effect/floor_decal/industrial/warning,/obj/item/weapon/material/shard{pixel_x = -3; pixel_y = -6},/mob/living/simple_mob/mechanical/viscerator/mercenary,/mob/living/simple_mob/mechanical/viscerator/mercenary,/turf/simulated/floor/reinforced,/area/submap/BorgLab) +"yq" = (/obj/structure/grille/broken,/obj/item/material/shard,/obj/machinery/door/blast/regular{dir = 8; id = "borg"; layer = 3.3; name = "Containment Door"},/turf/simulated/floor/plating,/area/submap/BorgLab) +"yz" = (/obj/effect/floor_decal/industrial/warning,/obj/item/material/shard{pixel_x = -3; pixel_y = -6},/mob/living/simple_mob/mechanical/viscerator/mercenary,/mob/living/simple_mob/mechanical/viscerator/mercenary,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "yB" = (/obj/random/trash,/mob/living/simple_mob/mechanical/mecha/hoverpod,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "yI" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/mob/living/simple_mob/mechanical/combat_drone/lesser{faction = "corrupt"},/turf/simulated/floor/plating,/area/submap/BorgLab) "yR" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled,/area/submap/BorgLab) @@ -100,20 +100,20 @@ "AI" = (/mob/living/simple_mob/mechanical/combat_drone/lesser{faction = "corrupt"},/turf/simulated/floor/reinforced,/area/submap/BorgLab) "Bl" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/BorgLab) "Bq" = (/obj/random/trash,/mob/living/simple_mob/mechanical/mining_drone,/turf/simulated/floor/reinforced,/area/submap/BorgLab) -"Cf" = (/obj/structure/table/standard,/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/effect/floor_decal/rust,/obj/item/weapon/module/power_control,/turf/simulated/floor/tiled,/area/submap/BorgLab) +"Cf" = (/obj/structure/table/standard,/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/effect/floor_decal/rust,/obj/item/module/power_control,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Cz" = (/obj/item/stack/material/phoron{amount = 10},/turf/simulated/floor/plating,/area/submap/BorgLab) "CA" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) "CS" = (/obj/effect/floor_decal/rust,/obj/effect/gibspawner/robot,/turf/simulated/floor/plating,/area/submap/BorgLab) "CX" = (/obj/structure/table/standard,/obj/random/junk,/obj/random/trash,/obj/random/maintenance/research,/turf/simulated/floor/tiled,/area/submap/BorgLab) -"Dj" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/item/weapon/reagent_containers/dropper,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled,/area/submap/BorgLab) +"Dj" = (/obj/structure/table/standard,/obj/item/reagent_containers/glass/beaker/large,/obj/item/reagent_containers/dropper,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Dq" = (/turf/template_noop,/area/submap/BorgLab) "Ds" = (/obj/effect/floor_decal/rust,/obj/structure/closet/firecloset/full/double,/obj/effect/floor_decal/rust/color_rustedfull,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Dv" = (/obj/structure/toilet,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/freezer,/area/submap/BorgLab) "DF" = (/turf/template_noop,/area/template_noop) "DW" = (/obj/random/trash,/obj/random/maintenance/research,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) -"Fj" = (/obj/effect/floor_decal/industrial/warning,/obj/item/weapon/material/shard{pixel_y = 10},/turf/simulated/floor/tiled,/area/submap/BorgLab) +"Fj" = (/obj/effect/floor_decal/industrial/warning,/obj/item/material/shard{pixel_y = 10},/turf/simulated/floor/tiled,/area/submap/BorgLab) "Ft" = (/obj/effect/floor_decal/industrial/warning,/obj/random/junk,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) -"Fu" = (/obj/item/weapon/storage/box/beakers,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) +"Fu" = (/obj/item/storage/box/beakers,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Fv" = (/obj/structure/table/standard,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/random/maintenance/research,/turf/simulated/floor/plating,/area/submap/BorgLab) "Gy" = (/obj/random/maintenance/research,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/BorgLab) "Gz" = (/mob/living/simple_mob/mechanical/mining_drone,/turf/simulated/floor/reinforced,/area/submap/BorgLab) @@ -122,31 +122,31 @@ "GS" = (/obj/item/stack/material/gold{amount = 25},/turf/simulated/floor/reinforced,/area/submap/BorgLab) "Ic" = (/obj/random/trash,/mob/living/simple_mob/mechanical/mecha/ripley/deathripley,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "Jd" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/reinforced,/area/submap/BorgLab) -"Jh" = (/obj/effect/floor_decal/rust,/obj/item/weapon/material/shard,/obj/effect/floor_decal/rust/mono_rusted3,/obj/random/trash,/turf/simulated/floor/tiled,/area/submap/BorgLab) +"Jh" = (/obj/effect/floor_decal/rust,/obj/item/material/shard,/obj/effect/floor_decal/rust/mono_rusted3,/obj/random/trash,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Jm" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) -"Jo" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/item/weapon/material/shard{pixel_y = 10},/obj/item/weapon/material/shard{pixel_x = 6; pixel_y = -6},/obj/machinery/door/blast/regular{dir = 8; id = "borg"; layer = 3.3; name = "Containment Door"},/turf/simulated/floor/plating,/area/submap/BorgLab) +"Jo" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/item/material/shard{pixel_y = 10},/obj/item/material/shard{pixel_x = 6; pixel_y = -6},/obj/machinery/door/blast/regular{dir = 8; id = "borg"; layer = 3.3; name = "Containment Door"},/turf/simulated/floor/plating,/area/submap/BorgLab) "Jp" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/submap/BorgLab) "Jr" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/mob/living/simple_mob/mechanical/viscerator/mercenary,/mob/living/simple_mob/mechanical/viscerator/mercenary,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "JZ" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/structure/railing{dir = 1},/turf/simulated/floor/tiled,/area/submap/BorgLab) -"KH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/item/weapon/material/shard{pixel_y = 10},/obj/item/weapon/material/shard{pixel_x = 6; pixel_y = -6},/obj/effect/decal/cleanable/generic,/obj/machinery/door/blast/regular/open{dir = 4},/turf/simulated/floor/plating,/area/submap/BorgLab) -"Lr" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille/broken,/obj/item/weapon/material/shard{pixel_x = -3; pixel_y = -6},/obj/item/weapon/material/shard{pixel_y = 10},/obj/machinery/door/blast/regular{dir = 8; id = "borg"; layer = 3.3; name = "Containment Door"},/turf/simulated/floor/plating,/area/submap/BorgLab) +"KH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/item/material/shard{pixel_y = 10},/obj/item/material/shard{pixel_x = 6; pixel_y = -6},/obj/effect/decal/cleanable/generic,/obj/machinery/door/blast/regular/open{dir = 4},/turf/simulated/floor/plating,/area/submap/BorgLab) +"Lr" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille/broken,/obj/item/material/shard{pixel_x = -3; pixel_y = -6},/obj/item/material/shard{pixel_y = 10},/obj/machinery/door/blast/regular{dir = 8; id = "borg"; layer = 3.3; name = "Containment Door"},/turf/simulated/floor/plating,/area/submap/BorgLab) "Lz" = (/obj/structure/table/standard,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/random/trash,/obj/random/maintenance/research,/turf/simulated/floor/tiled,/area/submap/BorgLab) -"LB" = (/obj/item/stack/material/phoron{amount = 10},/obj/random/toolbox,/obj/random/toolbox,/obj/item/weapon/storage/box/lights/mixed,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/item/stack/material/phoron{amount = 10},/obj/structure/table/rack,/turf/simulated/floor/plating,/area/submap/BorgLab) +"LB" = (/obj/item/stack/material/phoron{amount = 10},/obj/random/toolbox,/obj/random/toolbox,/obj/item/storage/box/lights/mixed,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/item/stack/material/phoron{amount = 10},/obj/structure/table/rack,/turf/simulated/floor/plating,/area/submap/BorgLab) "LC" = (/obj/effect/gibspawner/human,/mob/living/simple_mob/mechanical/mecha/odysseus/murdysseus{faction = "corrupt"},/turf/simulated/floor/reinforced,/area/submap/BorgLab) "MT" = (/obj/machinery/space_heater,/obj/effect/floor_decal/rust,/obj/machinery/light/small/emergency/flicker{dir = 4},/turf/simulated/floor/tiled,/area/submap/BorgLab) "Nb" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Nj" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/submap/BorgLab) -"Nq" = (/obj/effect/floor_decal/rust,/obj/item/weapon/material/shard,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) +"Nq" = (/obj/effect/floor_decal/rust,/obj/item/material/shard,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Ns" = (/obj/effect/floor_decal/rust,/obj/effect/gibspawner/robot,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Nt" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Nv" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust/mono_rusted3,/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/random/trash,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) -"NB" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/item/weapon/material/shard{pixel_x = 6; pixel_y = -6},/turf/simulated/floor/reinforced,/area/submap/BorgLab) -"NC" = (/obj/structure/grille/broken,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/material/shard,/obj/item/weapon/material/shard{pixel_y = 10},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/BorgLab) +"NB" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/item/material/shard{pixel_x = 6; pixel_y = -6},/turf/simulated/floor/reinforced,/area/submap/BorgLab) +"NC" = (/obj/structure/grille/broken,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/item/material/shard,/obj/item/material/shard{pixel_y = 10},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/BorgLab) "Oq" = (/obj/effect/floor_decal/rust,/obj/random/trash,/obj/item/stack/material/phoron{amount = 10},/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/submap/BorgLab) -"Oz" = (/obj/item/weapon/pickaxe/plasmacutter,/obj/machinery/firealarm{pixel_y = 24},/obj/effect/floor_decal/rust,/obj/item/weapon/material/shard,/turf/simulated/floor/tiled,/area/submap/BorgLab) +"Oz" = (/obj/item/pickaxe/plasmacutter,/obj/machinery/firealarm{pixel_y = 24},/obj/effect/floor_decal/rust,/obj/item/material/shard,/turf/simulated/floor/tiled,/area/submap/BorgLab) "OD" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/submap/BorgLab) "OH" = (/obj/effect/wingrille_spawn/reinforced,/obj/machinery/door/blast/regular/open{dir = 4},/turf/simulated/floor/plating,/area/submap/BorgLab) -"OW" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/item/weapon/broken_gun/laserrifle,/turf/simulated/floor/reinforced,/area/submap/BorgLab) +"OW" = (/obj/structure/table/standard,/obj/item/flashlight/lamp,/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/item/broken_gun/laserrifle,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "Pf" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Qe" = (/obj/effect/map_effect/interval/sound_emitter/energy_gunfight,/turf/simulated/floor/plating,/area/submap/BorgLab) "Qg" = (/turf/simulated/mineral/ignore_mapgen,/area/template_noop) @@ -171,28 +171,28 @@ "TW" = (/obj/effect/gibspawner/human,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "Uj" = (/obj/structure/closet/firecloset/full/double,/obj/effect/floor_decal/rust{pixel_y = 1},/obj/machinery/light/small/emergency/flicker{dir = 1},/obj/random/maintenance,/obj/random/maintenance/medical,/obj/effect/floor_decal/rust/color_rustedcee,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Uy" = (/obj/effect/floor_decal/rust,/obj/random/trash,/obj/random/maintenance/research,/turf/simulated/floor/tiled,/area/submap/BorgLab) -"Uz" = (/obj/machinery/shower{dir = 1},/obj/structure/curtain/open/shower,/obj/effect/floor_decal/borderfloorwhite/cee{dir = 1},/obj/item/weapon/soap/nanotrasen,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/freezer,/area/submap/BorgLab) +"Uz" = (/obj/machinery/shower{dir = 1},/obj/structure/curtain/open/shower,/obj/effect/floor_decal/borderfloorwhite/cee{dir = 1},/obj/item/soap/nanotrasen,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/freezer,/area/submap/BorgLab) "UM" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "UV" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/submap/BorgLab) -"UW" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille/broken,/obj/item/weapon/material/shard{pixel_x = 6; pixel_y = -6},/obj/machinery/door/blast/regular/open{dir = 4},/turf/simulated/floor/plating,/area/submap/BorgLab) +"UW" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille/broken,/obj/item/material/shard{pixel_x = 6; pixel_y = -6},/obj/machinery/door/blast/regular/open{dir = 4},/turf/simulated/floor/plating,/area/submap/BorgLab) "Vc" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "Vh" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled,/area/submap/BorgLab) -"Vr" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/rust,/obj/item/weapon/material/shard{pixel_x = 6; pixel_y = -6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) +"Vr" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/rust,/obj/item/material/shard{pixel_x = 6; pixel_y = -6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) "VH" = (/obj/structure/cable/blue,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/item/frame/apc,/turf/simulated/floor/plating,/area/submap/BorgLab) "VU" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/submap/BorgLab) "Wh" = (/mob/living/simple_mob/mechanical/viscerator/mercenary,/mob/living/simple_mob/mechanical/viscerator/mercenary,/turf/simulated/floor/reinforced,/area/submap/BorgLab) "Wq" = (/obj/effect/floor_decal/rust,/mob/living/simple_mob/mechanical/viscerator/mercenary,/mob/living/simple_mob/mechanical/viscerator/mercenary,/turf/simulated/floor/plating,/area/submap/BorgLab) -"WK" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/item/weapon/broken_gun/laser_retro,/mob/living/simple_mob/mechanical/viscerator/mercenary,/mob/living/simple_mob/mechanical/viscerator/mercenary,/turf/simulated/floor/plating,/area/submap/BorgLab) +"WK" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/item/broken_gun/laser_retro,/mob/living/simple_mob/mechanical/viscerator/mercenary,/mob/living/simple_mob/mechanical/viscerator/mercenary,/turf/simulated/floor/plating,/area/submap/BorgLab) "WQ" = (/turf/simulated/wall/r_wall,/area/submap/BorgLab) "WR" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning/cee{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) "XG" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust/mono_rusted3,/obj/effect/gibspawner/human,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Yk" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/BorgLab) -"Yy" = (/obj/structure/table/steel,/obj/item/weapon/coin/phoron,/obj/item/weapon/storage/toolbox/syndicate/powertools,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/random/maintenance/research,/obj/random/maintenance/research,/turf/simulated/floor/plating,/area/submap/BorgLab) +"Yy" = (/obj/structure/table/steel,/obj/item/coin/phoron,/obj/item/storage/toolbox/syndicate/powertools,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/random/maintenance/research,/obj/random/maintenance/research,/turf/simulated/floor/plating,/area/submap/BorgLab) "YD" = (/obj/effect/wingrille_spawn/reinforced,/obj/machinery/door/blast/regular{dir = 8; id = "borg"; layer = 3.3; name = "Containment Door"},/turf/simulated/floor/plating,/area/submap/BorgLab) "YZ" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/BorgLab) "Za" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled,/area/submap/BorgLab) "Zc" = (/obj/structure/railing,/turf/simulated/floor/plating,/area/submap/BorgLab) -"Zn" = (/obj/item/device/measuring_tape,/turf/simulated/floor/plating,/area/submap/BorgLab) +"Zn" = (/obj/item/measuring_tape,/turf/simulated/floor/plating,/area/submap/BorgLab) "Zq" = (/obj/machinery/door/window/brigdoor/westright{dir = 1; name = "Containment Pen"; req_one_access = list(43,1)},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/effect/decal/cleanable/generic,/obj/machinery/door/blast/regular/open{dir = 4},/turf/simulated/floor/plating,/area/submap/BorgLab) "Zt" = (/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/submap/BorgLab) "Zy" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/random/junk,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/submap/BorgLab) diff --git a/maps/submaps/surface_submaps/wilderness/butchershack.dmm b/maps/submaps/surface_submaps/wilderness/butchershack.dmm index d32c35b6da2..0059a6674d9 100644 --- a/maps/submaps/surface_submaps/wilderness/butchershack.dmm +++ b/maps/submaps/surface_submaps/wilderness/butchershack.dmm @@ -1,7 +1,7 @@ "a" = (/turf/template_noop,/area/template_noop) "b" = (/turf/simulated/wall/log_sif,/area/submap/ButcherShack) "c" = (/turf/simulated/floor/wood/sif,/area/submap/ButcherShack) -"d" = (/obj/structure/closet,/obj/effect/decal/cleanable/cobweb,/obj/item/weapon/beartrap,/obj/item/weapon/beartrap,/obj/item/weapon/packageWrap,/obj/item/weapon/material/knife/hook,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack) +"d" = (/obj/structure/closet,/obj/effect/decal/cleanable/cobweb,/obj/item/beartrap,/obj/item/beartrap,/obj/item/packageWrap,/obj/item/material/knife/hook,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack) "e" = (/obj/structure/closet/secure_closet/freezer/meat,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack) "f" = (/obj/structure/closet/crate/freezer,/obj/effect/decal/cleanable/blood/gibs,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/obj/random/meat,/turf/simulated/floor/wood/sif/broken,/area/submap/ButcherShack) "g" = (/obj/machinery/gibber/autogibber,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack) @@ -14,10 +14,10 @@ "n" = (/obj/structure/kitchenspike,/obj/effect/decal/cleanable/blood/drip,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack) "o" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack) "p" = (/obj/structure/table/standard,/obj/item/clothing/suit/chef/classic,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack) -"q" = (/obj/structure/table/standard,/obj/effect/decal/cleanable/blood,/obj/item/weapon/material/knife/butch,/turf/simulated/floor/wood/sif/broken,/area/submap/ButcherShack) -"r" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/snacks/cutlet,/obj/item/weapon/reagent_containers/food/snacks/cutlet,/obj/item/weapon/reagent_containers/food/snacks/cutlet,/obj/item/weapon/reagent_containers/food/snacks/sausage,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack) +"q" = (/obj/structure/table/standard,/obj/effect/decal/cleanable/blood,/obj/item/material/knife/butch,/turf/simulated/floor/wood/sif/broken,/area/submap/ButcherShack) +"r" = (/obj/structure/table/standard,/obj/item/reagent_containers/food/snacks/cutlet,/obj/item/reagent_containers/food/snacks/cutlet,/obj/item/reagent_containers/food/snacks/cutlet,/obj/item/reagent_containers/food/snacks/sausage,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack) "s" = (/obj/structure/coatrack,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack) -"t" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack) +"t" = (/obj/structure/bed/padded,/obj/item/bedsheet/brown,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack) "u" = (/obj/effect/decal/cleanable/blood/drip,/turf/simulated/floor/wood/sif/broken,/area/submap/ButcherShack) "v" = (/turf/simulated/floor/outdoors/dirt,/area/submap/ButcherShack) "w" = (/obj/structure/window/basic,/obj/structure/curtain,/turf/simulated/floor/wood/sif,/area/submap/ButcherShack) diff --git a/maps/submaps/surface_submaps/wilderness/chasm.dmm b/maps/submaps/surface_submaps/wilderness/chasm.dmm index 70a25d6ed43..c874c6d6e7f 100644 --- a/maps/submaps/surface_submaps/wilderness/chasm.dmm +++ b/maps/submaps/surface_submaps/wilderness/chasm.dmm @@ -1,20 +1,20 @@ "af" = (/obj/random/junk,/turf/simulated/floor/outdoors/dirt,/area/template_noop) -"aE" = (/obj/item/weapon/storage/firstaid/bonemed,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) +"aE" = (/obj/item/storage/firstaid/bonemed,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "aF" = (/obj/structure/cliff/automatic{dir = 6},/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "bD" = (/turf/template_noop,/area/submap/Chasm) -"bF" = (/obj/item/weapon/bone/ribs,/obj/item/weapon/melee/energy/axe/charge/loaded,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) +"bF" = (/obj/item/bone/ribs,/obj/item/melee/energy/axe/charge/loaded,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "bN" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/animal/giant_spider/lurker,/turf/simulated/floor/outdoors/dirt,/area/submap/Chasm) "cj" = (/turf/simulated/floor/outdoors/dirt,/area/template_noop) "dD" = (/mob/living/simple_mob/animal/giant_spider/tunneler,/obj/effect/spider/stickyweb/dark,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "eY" = (/obj/random/junk,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm) -"gK" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust/color_rustedfull,/obj/effect/decal/cleanable/dirt,/obj/item/weapon/cat_box/black,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) +"gK" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust/color_rustedfull,/obj/effect/decal/cleanable/dirt,/obj/item/cat_box/black,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) "gR" = (/obj/random/obstruction,/obj/effect/spider/stickyweb/dark,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "hG" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/animal/giant_spider/webslinger,/turf/simulated/floor/outdoors/rocks,/area/submap/Chasm) "hQ" = (/obj/effect/floor_decal/rust,/obj/effect/spider/stickyweb/dark,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) "hR" = (/turf/template_noop,/area/template_noop) "ik" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm) "iu" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust/mono_rusted2,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) -"iF" = (/obj/item/weapon/bone/skull,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/spider/stickyweb,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) +"iF" = (/obj/item/bone/skull,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/spider/stickyweb,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) "iR" = (/obj/random/trash,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm) "kn" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm) "kH" = (/obj/random/junk,/turf/template_noop,/area/submap/Chasm) @@ -27,32 +27,32 @@ "nJ" = (/obj/structure/snowman/spider,/turf/template_noop,/area/template_noop) "oA" = (/obj/random/obstruction,/obj/effect/decal/cleanable/cobweb,/obj/effect/spider/stickyweb/dark,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "pk" = (/obj/random/maintenance,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm) -"qx" = (/obj/structure/cliff/automatic{dir = 2},/obj/item/weapon/bone/arm,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) +"qx" = (/obj/structure/cliff/automatic{dir = 2},/obj/item/bone/arm,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "qB" = (/obj/random/trash,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/spider/stickyweb/dark,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm) "rI" = (/obj/effect/decal/cleanable/dirt,/obj/effect/spider/stickyweb/dark,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm) "rR" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/spider/stickyweb/dark,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm) "rY" = (/obj/structure/cliff/automatic{dir = 8},/obj/structure/ledge/ledge_stairs{dir = 1},/obj/structure/barricade,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) "sg" = (/obj/structure/loot_pile/mecha/odysseus,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) -"st" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/item/weapon/bone/arm,/turf/simulated/floor/plating,/area/submap/Chasm) +"st" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/item/bone/arm,/turf/simulated/floor/plating,/area/submap/Chasm) "tg" = (/obj/structure/ledge/ledge_stairs{dir = 1; name = "loose rock stairs"},/obj/effect/step_trigger/thrower,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/spider/stickyweb/dark,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) -"uc" = (/obj/item/weapon/bone,/obj/random/junk,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/submap/Chasm) +"uc" = (/obj/item/bone,/obj/random/junk,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/turf/simulated/floor/plating,/area/submap/Chasm) "uf" = (/obj/structure/cliff/automatic,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "uh" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm) -"uj" = (/obj/structure/cliff/automatic/corner{dir = 10},/obj/item/weapon/bone/skull/unknown,/obj/random/outcrop,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) +"uj" = (/obj/structure/cliff/automatic/corner{dir = 10},/obj/item/bone/skull/unknown,/obj/random/outcrop,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "vd" = (/obj/effect/floor_decal/rust,/obj/effect/spider/stickyweb,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) "vV" = (/obj/effect/decal/cleanable/dirt,/obj/effect/spider/stickyweb/dark,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "wn" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/spider/stickyweb,/turf/simulated/floor/plating,/area/submap/Chasm) "wF" = (/obj/random/junk,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "wP" = (/obj/random/humanoidremains,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "xt" = (/obj/effect/spider/stickyweb/dark,/turf/simulated/mineral/ignore_mapgen,/area/submap/Chasm) -"yq" = (/obj/item/weapon/bone/leg,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust/color_rusted,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) +"yq" = (/obj/item/bone/leg,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust/color_rusted,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) "yD" = (/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) "yL" = (/obj/structure/outcrop/platinum,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "zq" = (/obj/structure/outcrop/diamond,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "zs" = (/obj/structure/cliff/automatic/corner{dir = 6},/obj/structure/outcrop/diamond,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "zt" = (/obj/random/trash,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/dirt,/area/submap/Chasm) "Aq" = (/obj/structure/cliff/automatic{dir = 8},/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) -"BQ" = (/obj/item/weapon/bone,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) +"BQ" = (/obj/item/bone,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "BU" = (/obj/structure/cliff/automatic/corner{dir = 10},/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "Co" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/animal/giant_spider/nurse/hat,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) "Cs" = (/obj/effect/step_trigger/thrower,/obj/structure/ledge/ledge_stairs{dir = 1; name = "loose rock stairs"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/spider/stickyweb/dark,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) @@ -63,12 +63,12 @@ "DQ" = (/obj/structure/cliff/automatic{dir = 4},/obj/structure/ledge/ledge_stairs{dir = 1},/obj/structure/barricade,/turf/simulated/floor/plating,/area/submap/Chasm) "DS" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "DW" = (/obj/structure/cliff/automatic{dir = 4},/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) -"Ea" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/item/weapon/pickaxe/excavationdrill,/turf/simulated/floor/plating,/area/submap/Chasm) +"Ea" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/item/pickaxe/excavationdrill,/turf/simulated/floor/plating,/area/submap/Chasm) "Ec" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm) "Ee" = (/turf/simulated/floor/outdoors/dirt,/area/submap/Chasm) "Eh" = (/obj/structure/cliff/automatic/corner{dir = 6},/obj/structure/loot_pile/maint/boxfort,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "Ep" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm) -"Eu" = (/obj/item/weapon/bone,/obj/effect/floor_decal/rust,/obj/effect/spider/stickyweb,/obj/random/tool/power,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) +"Eu" = (/obj/item/bone,/obj/effect/floor_decal/rust,/obj/effect/spider/stickyweb,/obj/random/tool/power,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) "Fe" = (/obj/random/outcrop,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) "Fr" = (/obj/random/junk,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/dirt,/area/submap/Chasm) "HE" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) @@ -87,7 +87,7 @@ "Ov" = (/obj/structure/loot_pile/surface/bones,/obj/effect/spider/stickyweb,/obj/random/outcrop,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "Pk" = (/obj/random/multiple/gun/projectile/rifle,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "Pr" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/effect/map_effect/interval/sound_emitter/geiger/high,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) -"Qi" = (/obj/item/weapon/bone/skull/tajaran,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) +"Qi" = (/obj/item/bone/skull/tajaran,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) "Qr" = (/obj/structure/cliff/automatic/corner{dir = 6},/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "Rx" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/dirt,/area/submap/Chasm) "Rz" = (/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) @@ -97,8 +97,8 @@ "SA" = (/obj/random/junk,/mob/living/simple_mob/animal/giant_spider/hunter,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/dirt,/area/submap/Chasm) "SD" = (/turf/simulated/mineral/ignore_mapgen,/area/template_noop) "SH" = (/obj/structure/loot_pile/maint/boxfort,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) -"SS" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust/color_rustedfull,/obj/item/weapon/book/manual/rust_engine,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) -"Tl" = (/obj/effect/floor_decal/rust,/obj/item/weapon/storage/bag/ore,/turf/simulated/floor/plating,/area/submap/Chasm) +"SS" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust/color_rustedfull,/obj/item/book/manual/rust_engine,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) +"Tl" = (/obj/effect/floor_decal/rust,/obj/item/storage/bag/ore,/turf/simulated/floor/plating,/area/submap/Chasm) "Tp" = (/obj/structure/cliff/automatic{dir = 9},/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "Tt" = (/obj/effect/spider/stickyweb/dark,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Chasm) "TR" = (/obj/random/outcrop,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) @@ -106,13 +106,13 @@ "VD" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "WE" = (/obj/effect/floor_decal/rust/mono_rusted2,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) "XU" = (/obj/structure/cliff/automatic/corner{dir = 10},/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) -"XZ" = (/obj/item/weapon/bone/ribs,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) +"XZ" = (/obj/item/bone/ribs,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "Yp" = (/obj/structure/ledge/ledge_stairs{dir = 1},/obj/structure/barricade,/turf/simulated/floor/plating,/area/submap/Chasm) "YR" = (/obj/structure/cliff/automatic/corner{dir = 10},/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "YU" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust/color_rustedcee,/obj/effect/decal/cleanable/dirt,/obj/random/humanoidremains,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/Chasm) "Za" = (/obj/structure/cliff/automatic{dir = 10},/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "Zd" = (/mob/living/simple_mob/animal/giant_spider/hunter,/turf/simulated/floor/outdoors/dirt,/area/submap/Chasm) -"Zn" = (/obj/item/weapon/bone/skull,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) +"Zn" = (/obj/item/bone/skull,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) "ZS" = (/mob/living/simple_mob/animal/giant_spider/tunneler,/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/Chasm) (1,1,1) = {" diff --git a/maps/submaps/surface_submaps/wilderness/chemspill2.dmm b/maps/submaps/surface_submaps/wilderness/chemspill2.dmm index d41f4417944..d7973db3749 100644 --- a/maps/submaps/surface_submaps/wilderness/chemspill2.dmm +++ b/maps/submaps/surface_submaps/wilderness/chemspill2.dmm @@ -17,7 +17,7 @@ "q" = (/obj/random/tech_supply,/obj/random/energy,/turf/simulated/floor/outdoors/dirt/sif,/area/submap/ChemSpill2) "r" = (/obj/random/humanoidremains,/obj/random/rigsuit,/turf/simulated/floor/outdoors/dirt/sif,/area/submap/ChemSpill2) "s" = (/obj/effect/decal/remains/lizard,/turf/simulated/floor/outdoors/mud,/area/submap/ChemSpill2) -"t" = (/obj/item/weapon/storage/mre/random,/turf/simulated/floor/outdoors/dirt/sif,/area/submap/ChemSpill2) +"t" = (/obj/item/storage/mre/random,/turf/simulated/floor/outdoors/dirt/sif,/area/submap/ChemSpill2) "u" = (/obj/effect/decal/remains/mouse,/turf/simulated/floor/outdoors/mud,/area/submap/ChemSpill2) "v" = (/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/outdoors/rocks,/area/submap/ChemSpill2) "w" = (/obj/effect/decal/remains/xeno,/turf/simulated/floor/outdoors/mud,/area/submap/ChemSpill2) diff --git a/maps/submaps/surface_submaps/wilderness/deathden.dmm b/maps/submaps/surface_submaps/wilderness/deathden.dmm index d0bbccc747e..a4eca0a9651 100644 --- a/maps/submaps/surface_submaps/wilderness/deathden.dmm +++ b/maps/submaps/surface_submaps/wilderness/deathden.dmm @@ -6,9 +6,9 @@ "cf" = (/turf/template_noop,/area/template_noop) "dr" = (/obj/random/trash,/obj/random/junk,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) "dL" = (/obj/random/maintenance/medical,/obj/random/junk,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"dV" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/obj/structure/table/wooden_reinforced,/obj/item/weapon/flame/candle/everburn,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"ey" = (/obj/random/maintenance/engineering,/obj/random/junk,/obj/item/weapon/material/shard{pixel_x = 6; pixel_y = -6},/obj/item/weapon/material/shard,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"ez" = (/obj/item/weapon/material/shard{pixel_y = 10},/turf/template_noop,/area/template_noop) +"dV" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/obj/structure/table/wooden_reinforced,/obj/item/flame/candle/everburn,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"ey" = (/obj/random/maintenance/engineering,/obj/random/junk,/obj/item/material/shard{pixel_x = 6; pixel_y = -6},/obj/item/material/shard,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"ez" = (/obj/item/material/shard{pixel_y = 10},/turf/template_noop,/area/template_noop) "eO" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "eS" = (/obj/structure/grille/rustic,/obj/structure/barricade,/obj/structure/window/basic/full,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/DeathDen) "fg" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) @@ -17,105 +17,105 @@ "fS" = (/obj/structure/table/wooden_reinforced,/obj/item/pizzabox/meat,/obj/random/junk,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "fV" = (/obj/structure/bed/chair/wood{dir = 4},/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) "gB" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt,/area/template_noop) -"hq" = (/obj/structure/grille/rustic,/obj/structure/barricade,/obj/item/weapon/material/shard{pixel_x = 6},/obj/item/weapon/material/shard{pixel_x = -3; pixel_y = -6},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/DeathDen) +"hq" = (/obj/structure/grille/rustic,/obj/structure/barricade,/obj/item/material/shard{pixel_x = 6},/obj/item/material/shard{pixel_x = -3; pixel_y = -6},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/DeathDen) "hr" = (/obj/random/trash,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) -"hK" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/obj/item/weapon/material/shard,/obj/item/weapon/material/shard{pixel_y = 10},/turf/template_noop,/area/submap/DeathDen) +"hK" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/obj/item/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/obj/item/material/shard,/obj/item/material/shard{pixel_y = 10},/turf/template_noop,/area/submap/DeathDen) "ig" = (/obj/random/maintenance/cargo,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "is" = (/obj/random/soap,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen) "ix" = (/obj/effect/gibspawner/human,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"iR" = (/obj/item/weapon/material/shard{pixel_x = 6; pixel_y = -6},/turf/template_noop,/area/template_noop) -"ji" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"kc" = (/obj/item/weapon/flame/lighter/zippo/gonzo,/obj/random/trash,/obj/random/junk,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"iR" = (/obj/item/material/shard{pixel_x = 6; pixel_y = -6},/turf/template_noop,/area/template_noop) +"ji" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"kc" = (/obj/item/flame/lighter/zippo/gonzo,/obj/random/trash,/obj/random/junk,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "kl" = (/obj/structure/table/wooden_reinforced,/obj/item/clothing/suit/cultrobes/alt,/obj/item/clothing/suit/cultrobes/alt{pixel_x = 4; pixel_y = 3},/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"kn" = (/obj/item/weapon/flame/candle/candelabra/everburn{pixel_y = 10},/obj/effect/floor_decal/carpet{dir = 1},/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet{dir = 5},/obj/item/weapon/storage/bible,/obj/structure/table/sifwooden_reinforced,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) +"kn" = (/obj/item/flame/candle/candelabra/everburn{pixel_y = 10},/obj/effect/floor_decal/carpet{dir = 1},/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet{dir = 5},/obj/item/storage/bible,/obj/structure/table/sifwooden_reinforced,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) "kY" = (/obj/structure/table/bench/wooden,/obj/effect/floor_decal/carpet{dir = 1},/mob/living/simple_mob/animal/sif/savik,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) -"la" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"la" = (/obj/item/reagent_containers/food/snacks/candy_corn,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "lw" = (/obj/structure/bed/chair/wood{dir = 8},/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"lP" = (/obj/item/weapon/gun/projectile/colt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"lP" = (/obj/item/gun/projectile/colt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "mc" = (/obj/random/maintenance/engineering,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "md" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/animal/sif/savik{health = 75; name = "young savik"},/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "mu" = (/obj/structure/toilet{dir = 4},/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen) "nr" = (/turf/simulated/floor/outdoors/dirt,/area/submap/DeathDen) "nK" = (/obj/structure/table/bench/wooden,/obj/effect/floor_decal/carpet{dir = 1},/obj/effect/floor_decal/carpet{dir = 8},/obj/effect/floor_decal/carpet{dir = 9},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) -"nO" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/obj/random/trash,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"nO" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/obj/random/trash,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "oj" = (/obj/random/trash,/obj/random/junk,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"oG" = (/obj/item/stack/material/supermatter{amount = 5},/obj/effect/floor_decal/carpet{dir = 4},/obj/item/weapon/scrying,/obj/structure/table/sifwooden_reinforced,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) +"oG" = (/obj/item/stack/material/supermatter{amount = 5},/obj/effect/floor_decal/carpet{dir = 4},/obj/item/scrying,/obj/structure/table/sifwooden_reinforced,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) "oI" = (/obj/effect/gibspawner/human,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"oL" = (/obj/structure/gravemarker,/obj/random/humanoidremains,/obj/item/clothing/suit/cultrobes/alt{pixel_x = 4; pixel_y = 3},/obj/item/weapon/material/knife/machete,/obj/structure/closet/grave{opened = 0},/turf/template_noop,/area/submap/DeathDen) -"oS" = (/obj/structure/gravemarker,/obj/random/humanoidremains,/obj/item/clothing/suit/cultrobes/alt{pixel_x = 4; pixel_y = 3},/obj/item/weapon/material/knife/hook,/obj/structure/closet/grave{opened = 0},/turf/template_noop,/area/submap/DeathDen) -"oX" = (/obj/structure/barricade,/obj/structure/grille/broken/rustic,/obj/item/weapon/material/shard,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/DeathDen) +"oL" = (/obj/structure/gravemarker,/obj/random/humanoidremains,/obj/item/clothing/suit/cultrobes/alt{pixel_x = 4; pixel_y = 3},/obj/item/material/knife/machete,/obj/structure/closet/grave{opened = 0},/turf/template_noop,/area/submap/DeathDen) +"oS" = (/obj/structure/gravemarker,/obj/random/humanoidremains,/obj/item/clothing/suit/cultrobes/alt{pixel_x = 4; pixel_y = 3},/obj/item/material/knife/hook,/obj/structure/closet/grave{opened = 0},/turf/template_noop,/area/submap/DeathDen) +"oX" = (/obj/structure/barricade,/obj/structure/grille/broken/rustic,/obj/item/material/shard,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/DeathDen) "ph" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"pu" = (/obj/structure/barricade,/obj/structure/grille/broken/rustic,/obj/item/weapon/material/shard{pixel_x = -3; pixel_y = -6},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/DeathDen) +"pu" = (/obj/structure/barricade,/obj/structure/grille/broken/rustic,/obj/item/material/shard{pixel_x = -3; pixel_y = -6},/turf/simulated/floor/tiled/asteroid_steel,/area/submap/DeathDen) "qc" = (/obj/structure/loot_pile/maint/boxfort,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) "qC" = (/obj/structure/table/bench/wooden,/obj/effect/floor_decal/carpet,/obj/effect/floor_decal/carpet{dir = 8},/obj/effect/floor_decal/carpet{dir = 10},/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) -"rQ" = (/obj/structure/barricade,/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/obj/item/weapon/reagent_containers/food/snacks/candy_corn,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/template_noop,/area/submap/DeathDen) -"sh" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"sX" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/material/shard{pixel_x = 6; pixel_y = -6},/obj/item/weapon/material/shard{pixel_x = 6},/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"rQ" = (/obj/structure/barricade,/obj/item/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/obj/item/reagent_containers/food/snacks/candy_corn,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/template_noop,/area/submap/DeathDen) +"sh" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"sX" = (/obj/structure/table/wooden_reinforced,/obj/item/material/shard{pixel_x = 6; pixel_y = -6},/obj/item/material/shard{pixel_x = 6},/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "tr" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/DeathDen) "tN" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) -"tY" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/turf/template_noop,/area/submap/DeathDen) +"tY" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/obj/item/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/turf/template_noop,/area/submap/DeathDen) "uP" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) -"vd" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"vj" = (/obj/structure/gravemarker,/obj/random/humanoidremains,/obj/item/clothing/suit/cultrobes/alt{pixel_x = 4; pixel_y = 3},/obj/item/weapon/material/knife/ritual,/obj/structure/closet/grave{opened = 0},/turf/template_noop,/area/submap/DeathDen) +"vd" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"vj" = (/obj/structure/gravemarker,/obj/random/humanoidremains,/obj/item/clothing/suit/cultrobes/alt{pixel_x = 4; pixel_y = 3},/obj/item/material/knife/ritual,/obj/structure/closet/grave{opened = 0},/turf/template_noop,/area/submap/DeathDen) "vr" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt,/area/submap/DeathDen) "vu" = (/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"vD" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/shreddedp,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"vD" = (/obj/structure/table/wooden_reinforced,/obj/item/shreddedp,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "wa" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/animal/sif/savik{health = 75; name = "young savik"},/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/DeathDen) "wm" = (/turf/template_noop,/area/submap/DeathDen) -"wv" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_y = -8},/obj/random/maintenance/engineering,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"wG" = (/obj/item/weapon/deadringer,/obj/item/weapon/reagent_containers/food/snacks/bearstew,/obj/effect/floor_decal/carpet,/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet{dir = 6},/obj/structure/table/sifwooden_reinforced,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) -"wK" = (/obj/structure/window/reinforced/tinted/frosted{dir = 1},/obj/structure/table/wooden_reinforced,/obj/random/soap,/obj/item/weapon/flame/candle/everburn,/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen) +"wv" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/obj/item/reagent_containers/food/snacks/candy_corn{pixel_y = -8},/obj/random/maintenance/engineering,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"wG" = (/obj/item/deadringer,/obj/item/reagent_containers/food/snacks/bearstew,/obj/effect/floor_decal/carpet,/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet{dir = 6},/obj/structure/table/sifwooden_reinforced,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) +"wK" = (/obj/structure/window/reinforced/tinted/frosted{dir = 1},/obj/structure/table/wooden_reinforced,/obj/random/soap,/obj/item/flame/candle/everburn,/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen) "xN" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/DeathDen) "xS" = (/mob/living/simple_mob/animal/sif/savik{health = 200; melee_damage_lower = 20; melee_damage_upper = 40; name = "alpha savik"},/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) "xZ" = (/obj/item/ammo_magazine/ammo_box/b12g/pellet,/obj/item/ammo_magazine/ammo_box/b12g/pellet,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "yn" = (/turf/simulated/floor/outdoors/dirt,/area/template_noop) -"yL" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/flame/candle/everburn,/obj/item/weapon/material/shard{pixel_x = -3; pixel_y = -6},/obj/item/weapon/material/shard{pixel_x = 6; pixel_y = -6},/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"yS" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/obj/effect/floor_decal/carpet{dir = 8},/obj/random/maintenance/engineering,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) -"yZ" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn,/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/obj/effect/floor_decal/carpet,/obj/effect/gibspawner/human,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) -"zV" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/mob/living/simple_mob/animal/sif/savik,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"yL" = (/obj/structure/table/wooden_reinforced,/obj/item/flame/candle/everburn,/obj/item/material/shard{pixel_x = -3; pixel_y = -6},/obj/item/material/shard{pixel_x = 6; pixel_y = -6},/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"yS" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/obj/effect/floor_decal/carpet{dir = 8},/obj/random/maintenance/engineering,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) +"yZ" = (/obj/item/reagent_containers/food/snacks/candy_corn,/obj/item/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/obj/effect/floor_decal/carpet,/obj/effect/gibspawner/human,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) +"zV" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/mob/living/simple_mob/animal/sif/savik,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "An" = (/obj/structure/simple_door/iron,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/DeathDen) "Ap" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/DeathDen) "Aw" = (/obj/structure/simple_door/sifwood,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/DeathDen) "Bf" = (/obj/item/clothing/head/psy_crown/gluttony,/obj/random/junk,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"BW" = (/obj/structure/table/wooden_reinforced,/obj/item/clothing/suit/cultrobes/alt,/obj/item/clothing/suit/cultrobes/alt{pixel_x = 4; pixel_y = 3},/obj/item/weapon/flame/candle/everburn,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) -"De" = (/obj/structure/urinal{pixel_y = 32},/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn,/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen) -"DH" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/obj/random/trash,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) -"EF" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn,/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/obj/item/weapon/gun/projectile/deagle,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) -"EL" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/turf/template_noop,/area/submap/DeathDen) +"BW" = (/obj/structure/table/wooden_reinforced,/obj/item/clothing/suit/cultrobes/alt,/obj/item/clothing/suit/cultrobes/alt{pixel_x = 4; pixel_y = 3},/obj/item/flame/candle/everburn,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) +"De" = (/obj/structure/urinal{pixel_y = 32},/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/item/gun/projectile/shotgun/doublebarrel/sawn,/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen) +"DH" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/obj/random/trash,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) +"EF" = (/obj/item/reagent_containers/food/snacks/candy_corn,/obj/item/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/obj/item/gun/projectile/deagle,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) +"EL" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/turf/template_noop,/area/submap/DeathDen) "EN" = (/obj/effect/floor_decal/carpet,/obj/random/maintenance/engineering,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) "ER" = (/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen) -"FR" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = -6; pixel_y = 6},/obj/structure/loot_pile/maint/boxfort,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) +"FR" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_x = -6; pixel_y = 6},/obj/structure/loot_pile/maint/boxfort,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) "GP" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) -"GT" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"HR" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/turf/template_noop,/area/submap/DeathDen) -"HT" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) +"GT" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/obj/item/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"HR" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/obj/item/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/obj/item/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/turf/template_noop,/area/submap/DeathDen) +"HT" = (/obj/item/reagent_containers/food/snacks/candy_corn,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) "HZ" = (/obj/structure/girder,/turf/simulated/floor/plating,/area/submap/DeathDen) "Ic" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/animal/sif/savik,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"IT" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/turf/template_noop,/area/submap/DeathDen) +"IT" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/turf/template_noop,/area/submap/DeathDen) "Kj" = (/obj/structure/windoor_assembly,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen) "Kn" = (/obj/effect/floor_decal/carpet{dir = 1},/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) "Ky" = (/obj/structure/table/bench/wooden,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) "KG" = (/mob/living/simple_mob/humanoid/clown,/obj/effect/gibspawner/human,/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen) "MO" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/DeathDen) "Nu" = (/obj/structure/bed/chair/wood{dir = 4},/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"Oh" = (/obj/structure/gravemarker,/obj/structure/closet/grave{opened = 0},/obj/random/humanoidremains,/obj/item/clothing/suit/cultrobes/alt{pixel_x = 4; pixel_y = 3},/obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial,/turf/template_noop,/area/submap/DeathDen) +"Oh" = (/obj/structure/gravemarker,/obj/structure/closet/grave{opened = 0},/obj/random/humanoidremains,/obj/item/clothing/suit/cultrobes/alt{pixel_x = 4; pixel_y = 3},/obj/item/gun/projectile/shotgun/pump/rifle/ceremonial,/turf/template_noop,/area/submap/DeathDen) "OZ" = (/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/DeathDen) "Ph" = (/obj/structure/barricade,/turf/template_noop,/area/submap/DeathDen) -"Qb" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/shreddedp,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) +"Qb" = (/obj/structure/table/wooden_reinforced,/obj/item/shreddedp,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) "Qe" = (/turf/simulated/mineral/ignore_mapgen,/area/template_noop) -"QK" = (/obj/structure/closet/cabinet,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/obj/item/trash/plate,/obj/item/trash/plate,/obj/item/weapon/storage/box/cups,/obj/item/weapon/storage/box/donut,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"QK" = (/obj/structure/closet/cabinet,/obj/item/material/kitchen/utensil/fork,/obj/item/material/kitchen/utensil/fork,/obj/item/material/kitchen/utensil/spoon{pixel_x = 2},/obj/item/material/kitchen/utensil/spoon{pixel_x = 2},/obj/item/trash/plate,/obj/item/trash/plate,/obj/item/storage/box/cups,/obj/item/storage/box/donut,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "Ri" = (/obj/structure/simple_door/sifwood,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/DeathDen) "Rs" = (/obj/structure/table/bench/wooden,/obj/effect/floor_decal/carpet,/obj/random/maintenance/engineering,/obj/random/junk,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/animal/sif/savik,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) "Sg" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "Th" = (/turf/simulated/wall/sifwood,/area/submap/DeathDen) -"TA" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -"TL" = (/obj/item/weapon/material/shard{pixel_x = -3; pixel_y = -6},/turf/template_noop,/area/template_noop) -"Uj" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) +"TA" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"TL" = (/obj/item/material/shard{pixel_x = -3; pixel_y = -6},/turf/template_noop,/area/template_noop) +"Uj" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_y = 6},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif/broken,/area/submap/DeathDen) "Up" = (/obj/structure/windoor_assembly,/obj/random/trash,/mob/living/simple_mob/animal/sif/savik,/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen) -"UR" = (/obj/item/weapon/stool/padded,/obj/item/clothing/suit/cultrobes/magusred,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"UR" = (/obj/item/stool/padded,/obj/item/clothing/suit/cultrobes/magusred,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "WH" = (/obj/effect/gibspawner/human,/obj/random/junk,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "Ym" = (/obj/structure/simple_door/sifwood,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/submap/DeathDen) -"Zb" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) +"Zb" = (/obj/item/reagent_containers/food/snacks/candy_corn{pixel_x = 5; pixel_y = -8},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "Zg" = (/obj/random/trash,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "Zv" = (/obj/structure/table/bench/wooden,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) diff --git a/maps/submaps/surface_submaps/wilderness/demonpool.dmm b/maps/submaps/surface_submaps/wilderness/demonpool.dmm index b76c1ba1f21..eaaef59e1c5 100644 --- a/maps/submaps/surface_submaps/wilderness/demonpool.dmm +++ b/maps/submaps/surface_submaps/wilderness/demonpool.dmm @@ -18,11 +18,11 @@ /area/submap/DemonPool) "ay" = ( /obj/structure/girder/cult, -/obj/item/weapon/material/twohanded/fireaxe/scythe, +/obj/item/material/twohanded/fireaxe/scythe, /turf/simulated/floor/cult, /area/submap/DemonPool) "bb" = ( -/obj/item/weapon/melee/cursedblade, +/obj/item/melee/cursedblade, /turf/simulated/floor/cult, /area/submap/DemonPool) "bh" = ( @@ -60,8 +60,8 @@ /area/submap/DemonPool) "eM" = ( /obj/structure/table/woodentable, -/obj/item/weapon/book, -/obj/item/weapon/spellbook/oneuse/forcewall, +/obj/item/book, +/obj/item/spellbook/oneuse/forcewall, /turf/simulated/floor, /area/submap/DemonPool) "eR" = ( @@ -259,7 +259,7 @@ /area/submap/DemonPool) "sb" = ( /obj/item/clothing/shoes/cult, -/obj/item/weapon/melee/energy/sword/red, +/obj/item/melee/energy/sword/red, /turf/simulated/floor/cult, /area/submap/DemonPool) "si" = ( @@ -363,7 +363,7 @@ /area/submap/DemonPool) "Ah" = ( /obj/effect/decal/cleanable/blood/gibs/body, -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -537,7 +537,7 @@ }, /area/submap/DemonPool) "Qq" = ( -/obj/item/weapon/beartrap/hunting{ +/obj/item/beartrap/hunting{ anchored = 1; deployed = 1 }, @@ -550,7 +550,7 @@ /area/submap/DemonPool) "Qr" = ( /obj/structure/closet/crate/secure/loot, -/obj/item/weapon/spellbook/oneuse/fireball, +/obj/item/spellbook/oneuse/fireball, /turf/simulated/floor/cult, /area/submap/DemonPool) "Qv" = ( @@ -637,12 +637,12 @@ /area/submap/DemonPool) "YK" = ( /obj/structure/table/woodentable, -/obj/item/weapon/pen/fountain, +/obj/item/pen/fountain, /turf/simulated/floor, /area/submap/DemonPool) "Zc" = ( /obj/effect/gibspawner/human, -/obj/item/weapon/beartrap/hunting{ +/obj/item/beartrap/hunting{ anchored = 1; deployed = 1 }, diff --git a/maps/submaps/surface_submaps/wilderness/derelictengine.dmm b/maps/submaps/surface_submaps/wilderness/derelictengine.dmm index c7b101b031a..82e017f5b6b 100644 --- a/maps/submaps/surface_submaps/wilderness/derelictengine.dmm +++ b/maps/submaps/surface_submaps/wilderness/derelictengine.dmm @@ -8,57 +8,57 @@ "aO" = (/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "aP" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/turf/simulated/floor/plating,/area/submap/DerelictEngine) "bk" = (/obj/effect/floor_decal/techfloor{dir = 1},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) -"bl" = (/obj/item/weapon/material/shard/phoron,/turf/simulated/floor/outdoors/rocks,/area/template_noop) +"bl" = (/obj/item/material/shard/phoron,/turf/simulated/floor/outdoors/rocks,/area/template_noop) "bn" = (/obj/structure/girder/reinforced,/obj/effect/floor_decal/techfloor{dir = 8},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "bp" = (/obj/structure/bed/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "by" = (/obj/effect/floor_decal/techfloor/orange{dir = 5},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"bG" = (/obj/item/weapon/material/shard/phoron{pixel_x = -9; pixel_y = -7},/turf/simulated/floor/outdoors/rocks,/area/template_noop) +"bG" = (/obj/item/material/shard/phoron{pixel_x = -9; pixel_y = -7},/turf/simulated/floor/outdoors/rocks,/area/template_noop) "bH" = (/obj/machinery/power/emitter/gyrotron,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "bN" = (/turf/simulated/floor/outdoors/rocks,/area/template_noop) "bX" = (/mob/living/simple_mob/mechanical/hivebot/tank,/turf/template_noop,/area/template_noop) "cE" = (/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser,/obj/effect/floor_decal/techfloor{dir = 8},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "cH" = (/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/hole{dir = 4},/obj/machinery/replicator{anchored = 1},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "cQ" = (/obj/effect/decal/cleanable/generic,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) -"cX" = (/obj/item/weapon/material/shard/phoron{pixel_x = 7; pixel_y = 10},/turf/simulated/floor/outdoors/rocks,/area/template_noop) +"cX" = (/obj/item/material/shard/phoron{pixel_x = 7; pixel_y = 10},/turf/simulated/floor/outdoors/rocks,/area/template_noop) "db" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/effect/floor_decal/techfloor/hole{dir = 4},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) -"dg" = (/obj/structure/grille/cult{name = "Alien grille"},/obj/item/weapon/material/shard/phoron{pixel_x = 7},/obj/item/weapon/material/shard/phoron{pixel_x = 7; pixel_y = 10},/obj/structure/window/phoronreinforced/full,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) +"dg" = (/obj/structure/grille/cult{name = "Alien grille"},/obj/item/material/shard/phoron{pixel_x = 7},/obj/item/material/shard/phoron{pixel_x = 7; pixel_y = 10},/obj/structure/window/phoronreinforced/full,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) "dh" = (/mob/living/simple_mob/mechanical/hivebot/tank/armored/anti_laser,/obj/effect/floor_decal/techfloor{dir = 4},/obj/effect/floor_decal/techfloor/hole{dir = 4},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "dy" = (/obj/structure/shuttle/engine/propulsion/burst,/obj/structure/shuttle/engine/propulsion/burst,/turf/simulated/floor/outdoors/rocks,/area/submap/DerelictEngine) "dC" = (/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser,/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) "dG" = (/obj/machinery/door/blast/puzzle{checkrange_mult = 3; dir = 4; layer = 3.3; name = "Blast Door"; open_layer = 3.3},/obj/machinery/door/airlock/alien/public,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) -"dL" = (/obj/structure/closet/alien,/obj/item/prop/alien/junk,/obj/item/weapon/implanter/compressed,/obj/item/stack/material/phoron{amount = 10},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"dO" = (/obj/item/prop/alien/junk,/obj/item/weapon/paper/alien,/obj/item/clothing/head/helmet/alien,/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) -"dX" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor,/obj/item/weapon/storage/belt/medical/alien,/obj/item/clothing/head/helmet/alien/tank,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"dL" = (/obj/structure/closet/alien,/obj/item/prop/alien/junk,/obj/item/implanter/compressed,/obj/item/stack/material/phoron{amount = 10},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"dO" = (/obj/item/prop/alien/junk,/obj/item/paper/alien,/obj/item/clothing/head/helmet/alien,/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) +"dX" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor,/obj/item/storage/belt/medical/alien,/obj/item/clothing/head/helmet/alien/tank,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "el" = (/obj/effect/floor_decal/techfloor{dir = 9},/obj/structure/loot_pile/surface/alien/engineering,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "eq" = (/obj/random/trash,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "eR" = (/obj/structure/grille/cult{name = "Alien grille"},/obj/structure/window/phoronreinforced{dir = 8},/obj/structure/window/phoronreinforced/full,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) "eV" = (/obj/structure/prop/alien/pod/open,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) "fg" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/machinery/door/airlock/alien/locked,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) -"fn" = (/obj/item/weapon/storage/belt/utility/alien,/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) +"fn" = (/obj/item/storage/belt/utility/alien,/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "fp" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/random/trash,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "fy" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/item/trash/material/metal,/turf/simulated/floor/plating,/area/submap/DerelictEngine) -"fG" = (/obj/structure/grille/cult{name = "Alien grille"},/obj/item/weapon/material/shard/phoron,/obj/item/weapon/material/shard/phoron{pixel_x = 7},/obj/structure/window/phoronreinforced/full,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) +"fG" = (/obj/structure/grille/cult{name = "Alien grille"},/obj/item/material/shard/phoron,/obj/item/material/shard/phoron{pixel_x = 7},/obj/structure/window/phoronreinforced/full,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) "fH" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/mob/living/simple_mob/mechanical/hivebot/ranged_damage/dot,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "fJ" = (/mob/living/simple_mob/mechanical/hivebot/tank,/turf/simulated/floor/outdoors/dirt,/area/template_noop) "fO" = (/turf/simulated/shuttle/wall/alien,/area/submap/DerelictEngine) "fY" = (/obj/structure/grille/cult{name = "Alien grille"},/obj/structure/window/phoronreinforced{dir = 1},/obj/structure/window/phoronreinforced/full,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) "gj" = (/obj/effect/floor_decal/techfloor/orange{dir = 10},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"gk" = (/obj/structure/grille/cult{name = "Alien grille"},/obj/item/weapon/material/shard/phoron,/obj/item/weapon/material/shard/phoron{pixel_x = 7; pixel_y = 10},/obj/structure/window/phoronreinforced/full,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) -"go" = (/obj/effect/decal/cleanable/generic,/obj/item/weapon/gun/energy/toxgun,/turf/simulated/floor/plating,/area/submap/DerelictEngine) +"gk" = (/obj/structure/grille/cult{name = "Alien grille"},/obj/item/material/shard/phoron,/obj/item/material/shard/phoron{pixel_x = 7; pixel_y = 10},/obj/structure/window/phoronreinforced/full,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) +"go" = (/obj/effect/decal/cleanable/generic,/obj/item/gun/energy/toxgun,/turf/simulated/floor/plating,/area/submap/DerelictEngine) "gy" = (/turf/simulated/shuttle/wall/alien/hard_corner,/area/submap/DerelictEngine) "gz" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/porta_turret/alien/destroyed,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) -"gZ" = (/obj/effect/floor_decal/techfloor/orange,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/weapon/material/shard/phoron{pixel_x = 7; pixel_y = 10},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"gZ" = (/obj/effect/floor_decal/techfloor/orange,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/material/shard/phoron{pixel_x = 7; pixel_y = 10},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "hb" = (/mob/living/simple_mob/humanoid/merc/ranged/ionrifle{health = 15; maxHealth = 15},/turf/simulated/floor/outdoors/rocks,/area/template_noop) "ht" = (/obj/effect/floor_decal/techfloor/orange{dir = 5},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "hu" = (/obj/structure/prop/blackbox/xenofrigate,/turf/simulated/floor/greengrid,/area/submap/DerelictEngine) "hC" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/decal/cleanable/generic,/obj/effect/decal/cleanable/generic,/obj/effect/decal/cleanable/ash,/turf/simulated/floor/plating,/area/submap/DerelictEngine) -"hU" = (/obj/structure/grille/cult{name = "Alien grille"},/obj/structure/window/phoronreinforced{dir = 4},/obj/item/weapon/material/shard/phoron,/obj/item/weapon/material/shard/phoron{pixel_x = -9; pixel_y = -7},/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) +"hU" = (/obj/structure/grille/cult{name = "Alien grille"},/obj/structure/window/phoronreinforced{dir = 4},/obj/item/material/shard/phoron,/obj/item/material/shard/phoron{pixel_x = -9; pixel_y = -7},/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) "hW" = (/obj/effect/floor_decal/techfloor/orange,/obj/effect/floor_decal/techfloor/hole,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"hY" = (/obj/item/weapon/material/shard/phoron{pixel_x = 7},/obj/item/weapon/material/shard/phoron{pixel_x = -9; pixel_y = -7},/turf/simulated/floor/plating,/area/submap/DerelictEngine) +"hY" = (/obj/item/material/shard/phoron{pixel_x = 7},/obj/item/material/shard/phoron{pixel_x = -9; pixel_y = -7},/turf/simulated/floor/plating,/area/submap/DerelictEngine) "hZ" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/effect/floor_decal/techfloor/hole{dir = 4},/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) "ib" = (/obj/random/trash,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"ig" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor/orange{dir = 9},/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"il" = (/obj/item/weapon/surgical/FixOVein/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/obj/effect/floor_decal/techfloor{dir = 4},/obj/item/weapon/cell/device/weapon/recharge/alien,/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) +"ig" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor/orange{dir = 9},/obj/item/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"il" = (/obj/item/surgical/FixOVein/alien,/obj/item/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/obj/effect/floor_decal/techfloor{dir = 4},/obj/item/cell/device/weapon/recharge/alien,/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "iz" = (/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "iB" = (/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) "iF" = (/obj/effect/floor_decal/techfloor{dir = 8},/mob/living/simple_mob/mechanical/hivebot/tank/armored/anti_laser,/obj/effect/floor_decal/techfloor/hole/right{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) @@ -70,28 +70,28 @@ "ja" = (/obj/effect/floor_decal/techfloor{dir = 8},/mob/living/simple_mob/humanoid/merc/ranged/ionrifle{health = 15; maxHealth = 15},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "je" = (/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "jl" = (/turf/simulated/mineral/ignore_mapgen,/area/template_noop) -"jD" = (/obj/structure/table/alien,/obj/item/weapon/gun/energy/alien,/obj/item/prop/alien/phasecoil,/obj/item/clothing/suit/armor/alien/tank,/obj/item/stack/material/diamond{amount = 15},/turf/simulated/floor/greengrid,/area/submap/DerelictEngine) +"jD" = (/obj/structure/table/alien,/obj/item/gun/energy/alien,/obj/item/prop/alien/phasecoil,/obj/item/clothing/suit/armor/alien/tank,/obj/item/stack/material/diamond{amount = 15},/turf/simulated/floor/greengrid,/area/submap/DerelictEngine) "jE" = (/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/machinery/fusion_fuel_injector/mapped{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "jG" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "jU" = (/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/effect/floor_decal/techfloor/orange{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "jY" = (/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/immovablerod,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "ka" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/structure/prop/alien/pod/open,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"kx" = (/obj/item/weapon/material/shard/phoron{pixel_x = -9; pixel_y = -7},/turf/simulated/floor/plating,/area/submap/DerelictEngine) +"kx" = (/obj/item/material/shard/phoron{pixel_x = -9; pixel_y = -7},/turf/simulated/floor/plating,/area/submap/DerelictEngine) "lg" = (/obj/structure/grille/cult{name = "Alien grille"},/obj/structure/window/phoronreinforced{dir = 8},/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) "lj" = (/obj/machinery/artifact,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "lr" = (/obj/structure/prop/alien/dispenser{pixel_x = -27},/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) -"ls" = (/obj/item/weapon/surgical/circular_saw/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) +"ls" = (/obj/item/surgical/circular_saw/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "lD" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/effect/gibspawner/human,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "lV" = (/obj/effect/floor_decal/techfloor{dir = 9},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) -"lX" = (/obj/item/weapon/material/shard/phoron{pixel_x = -9; pixel_y = -7},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"lX" = (/obj/item/material/shard/phoron{pixel_x = -9; pixel_y = -7},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "lY" = (/obj/structure/bed/alien,/obj/effect/decal/remains/xeno,/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"ms" = (/obj/structure/closet/alien,/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/obj/item/device/multitool/alien,/obj/item/stack/material/phoron{amount = 10},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"ms" = (/obj/structure/closet/alien,/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/obj/item/multitool/alien,/obj/item/stack/material/phoron{amount = 10},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "mu" = (/mob/living/simple_mob/mechanical/hivebot/tank/armored/anti_melee,/turf/simulated/floor/greengrid,/area/submap/DerelictEngine) -"mD" = (/obj/item/weapon/material/shard/phoron{pixel_x = 7; pixel_y = 10},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"mD" = (/obj/item/material/shard/phoron{pixel_x = 7; pixel_y = 10},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "mM" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/effect/decal/remains/xeno,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "mN" = (/obj/structure/prop/alien/computer/camera/flipped,/obj/structure/prop/alien/computer/camera/flipped,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "mR" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/molten_item,/turf/simulated/floor/plating,/area/submap/DerelictEngine) -"nM" = (/obj/item/weapon/material/shard/phoron{pixel_x = 7},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"nM" = (/obj/item/material/shard/phoron{pixel_x = 7},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "nO" = (/obj/machinery/field_generator{anchored = 1; state = 2},/turf/simulated/floor/greengrid,/area/submap/DerelictEngine) "nQ" = (/obj/structure/prop/alien/computer/camera/flipped,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "nW" = (/obj/structure/prop/alien/dispenser,/obj/effect/floor_decal/techfloor/orange{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) @@ -112,7 +112,7 @@ "pC" = (/obj/structure/particle_accelerator/particle_emitter/center{anchored = 1; dir = 4},/turf/simulated/floor/plating,/area/submap/DerelictEngine) "pF" = (/obj/structure/prop/alien/pod/open,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "pR" = (/mob/living/simple_mob/humanoid/merc/ranged{health = 15; maxHealth = 15},/turf/simulated/floor/outdoors/rocks,/area/template_noop) -"ql" = (/obj/item/device/gps/internal/poi,/turf/simulated/shuttle/wall/alien,/area/submap/DerelictEngine) +"ql" = (/obj/item/gps/internal/poi,/turf/simulated/shuttle/wall/alien,/area/submap/DerelictEngine) "qn" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/structure/girder/reinforced,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "qt" = (/obj/structure/prop/alien/dispenser,/obj/effect/floor_decal/techfloor/orange{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "qA" = (/mob/living/simple_mob/mechanical/hivebot/ranged_damage/backline,/obj/effect/decal/remains/xeno,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) @@ -121,14 +121,14 @@ "qL" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/machinery/power/grounding_rod,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "qT" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/structure/reagent_dispensers/watertank/high,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "ra" = (/obj/structure/prop/alien/pod/open,/obj/structure/prop/alien/pod/open,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"rd" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser,/obj/item/weapon/material/shard/phoron{pixel_x = 7; pixel_y = 10},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"rd" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser,/obj/item/material/shard/phoron{pixel_x = 7; pixel_y = 10},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "rg" = (/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/hole{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"rI" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/item/weapon/surgical/retractor/alien,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"sa" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor/orange{dir = 5},/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"rI" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/item/surgical/retractor/alien,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"sa" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor/orange{dir = 5},/obj/item/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "sl" = (/mob/living/simple_mob/mechanical/hivebot/ranged_damage/backline,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) "sq" = (/obj/effect/floor_decal/techfloor/orange{dir = 9},/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/machinery/power/port_gen/pacman,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "st" = (/obj/random/trash,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) -"sv" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/effect/floor_decal/techfloor/hole/right{dir = 8},/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) +"sv" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/effect/floor_decal/techfloor/hole/right{dir = 8},/obj/item/reagent_containers/glass/bucket,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) "sy" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/effect/decal/remains/xeno,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) "sz" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/machinery/the_singularitygen/tesla,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "sG" = (/obj/effect/decal/cleanable/molten_item,/turf/simulated/floor/plating,/area/submap/DerelictEngine) @@ -142,14 +142,14 @@ "ut" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/structure/loot_pile/surface/alien/security,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "uB" = (/obj/effect/floor_decal/techfloor/orange{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/emitter/gyrotron/anchored{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "uH" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/clothing/under/psysuit,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"uJ" = (/obj/effect/floor_decal/techfloor{dir = 6},/obj/structure/closet/alien,/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/obj/item/weapon/implanter/adrenalin,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"uJ" = (/obj/effect/floor_decal/techfloor{dir = 6},/obj/structure/closet/alien,/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/obj/item/implanter/adrenalin,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "uP" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/power/grounding_rod/pre_mapped{item_state = 2},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"uX" = (/obj/effect/floor_decal/techfloor/orange{dir = 10},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/weapon/paper/alien,/obj/structure/table/alien,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"uX" = (/obj/effect/floor_decal/techfloor/orange{dir = 10},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/paper/alien,/obj/structure/table/alien,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "vl" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/effect/decal/cleanable/molten_item,/turf/simulated/floor/plating,/area/submap/DerelictEngine) -"vC" = (/obj/structure/bed/alien,/obj/effect/floor_decal/techfloor{dir = 4},/obj/item/weapon/surgical/FixOVein/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) +"vC" = (/obj/structure/bed/alien,/obj/effect/floor_decal/techfloor{dir = 4},/obj/item/surgical/FixOVein/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "vE" = (/obj/effect/floor_decal/techfloor/orange/corner{dir = 1},/obj/item/trash/material/metal,/turf/simulated/floor/plating,/area/submap/DerelictEngine) "vN" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"vU" = (/obj/item/prop/alien/junk,/obj/item/weapon/telecube/precursor/mated/mirrorcolor,/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) +"vU" = (/obj/item/prop/alien/junk,/obj/item/telecube/precursor/mated/mirrorcolor,/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "wd" = (/obj/machinery/porta_turret/alien/destroyed,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "we" = (/obj/effect/decal/cleanable/generic,/obj/effect/decal/cleanable/generic,/obj/effect/decal/cleanable/blood/gibs/robot,/obj/effect/decal/cleanable/ash,/turf/simulated/floor/plating,/area/submap/DerelictEngine) "wh" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/generic,/obj/effect/decal/cleanable/blood/gibs/robot,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) @@ -160,9 +160,9 @@ "wG" = (/obj/structure/bed/alien,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "wK" = (/obj/structure/shuttle/engine/propulsion/burst,/turf/simulated/floor/outdoors/dirt,/area/submap/DerelictEngine) "wM" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/effect/floor_decal/techfloor/hole{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"wV" = (/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) +"wV" = (/obj/item/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "wY" = (/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"xo" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/structure/grille/cult{name = "Alien grille"},/obj/structure/window/phoronreinforced{dir = 4},/obj/structure/window/phoronreinforced{dir = 1},/obj/item/weapon/material/shard/phoron{pixel_x = 7; pixel_y = 10},/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) +"xo" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/structure/grille/cult{name = "Alien grille"},/obj/structure/window/phoronreinforced{dir = 4},/obj/structure/window/phoronreinforced{dir = 1},/obj/item/material/shard/phoron{pixel_x = 7; pixel_y = 10},/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) "xq" = (/turf/simulated/shuttle/wall/alien/no_join,/area/submap/DerelictEngine) "xv" = (/obj/effect/decal/remains/xeno,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "xz" = (/obj/effect/floor_decal/techfloor{dir = 4},/mob/living/simple_mob/humanoid/merc/ranged{health = 15; maxHealth = 15},/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) @@ -173,8 +173,8 @@ "yi" = (/obj/structure/loot_pile/surface/alien/security,/obj/effect/floor_decal/techfloor/orange{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "yj" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/machinery/door/airlock/alien/locked,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) "yk" = (/mob/living/simple_mob/mechanical/hivebot/swarm,/turf/simulated/floor/outdoors/rocks,/area/template_noop) -"yA" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor{dir = 10},/obj/item/prop/alien/junk,/obj/item/weapon/hand_tele,/obj/item/weapon/implanter/adrenalin,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"yB" = (/obj/structure/closet/alien,/obj/item/prop/alien/junk,/obj/item/weapon/tool/crowbar/alien,/obj/item/weapon/tool/wirecutters/alien,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"yA" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor{dir = 10},/obj/item/prop/alien/junk,/obj/item/hand_tele,/obj/item/implanter/adrenalin,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"yB" = (/obj/structure/closet/alien,/obj/item/prop/alien/junk,/obj/item/tool/crowbar/alien,/obj/item/tool/wirecutters/alien,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "yE" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "yQ" = (/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/effect/floor_decal/techfloor/orange{dir = 4},/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "yZ" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/effect/gibspawner/robot,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) @@ -183,13 +183,13 @@ "zf" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/power/tesla_coil/pre_mapped,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "zk" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/machinery/porta_turret/alien/destroyed,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "zn" = (/obj/structure/closet/alien,/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/obj/random/tool/alien,/obj/item/stack/cable_coil/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) -"zr" = (/obj/structure/closet/alien,/obj/item/weapon/tool/wrench/alien,/obj/item/weapon/weldingtool/alien,/obj/item/device/multitool/alien,/obj/item/stack/material/phoron{amount = 10},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"zr" = (/obj/structure/closet/alien,/obj/item/tool/wrench/alien,/obj/item/weldingtool/alien,/obj/item/multitool/alien,/obj/item/stack/material/phoron{amount = 10},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "zw" = (/obj/item/clothing/under/psysuit,/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "zH" = (/obj/structure/girder/reinforced,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "zJ" = (/obj/effect/floor_decal/techfloor/orange,/obj/structure/grille/cult{name = "Alien grille"},/obj/structure/window/phoronreinforced{dir = 4},/obj/structure/window/phoronreinforced,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/window/phoronreinforced/full,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) "zP" = (/obj/effect/floor_decal/techfloor{dir = 5},/obj/effect/floor_decal/techfloor/hole{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"zY" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/item/weapon/storage/belt/utility/alien,/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/obj/structure/table/alien,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"Ao" = (/obj/item/weapon/material/shard/phoron,/turf/simulated/floor/plating,/area/submap/DerelictEngine) +"zY" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/item/storage/belt/utility/alien,/obj/item/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/obj/structure/table/alien,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"Ao" = (/obj/item/material/shard/phoron,/turf/simulated/floor/plating,/area/submap/DerelictEngine) "Ap" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/structure/bed/alien,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "AF" = (/obj/machinery/porta_turret/alien/destroyed,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "AT" = (/mob/living/simple_mob/mechanical/hivebot/tank/armored/anti_laser,/obj/effect/floor_decal/techfloor{dir = 8},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) @@ -198,7 +198,7 @@ "Bd" = (/obj/effect/floor_decal/techfloor{dir = 4},/mob/living/simple_mob/humanoid/merc/ranged{health = 15; maxHealth = 15},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "Bf" = (/obj/effect/floor_decal/techfloor/orange{dir = 6},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/power/emitter/gyrotron/anchored{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "Bh" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/structure/loot_pile/surface/alien/engineering,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"Bo" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/item/weapon/gun/energy/sniperrifle,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) +"Bo" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/item/gun/energy/sniperrifle,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) "Bs" = (/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/effect/decal/cleanable/ash,/turf/simulated/floor/plating,/area/submap/DerelictEngine) "Bz" = (/obj/structure/shuttle/engine/propulsion/burst,/turf/simulated/floor/outdoors/rocks,/area/submap/DerelictEngine) "BG" = (/obj/effect/gibspawner/human,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) @@ -215,18 +215,18 @@ "Dj" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/random/trash,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) "DA" = (/obj/structure/loot_pile/surface/alien/engineering,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "DQ" = (/obj/structure/loot_pile/surface/alien/engineering,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) -"Ec" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/item/weapon/paper/alien,/obj/item/weapon/cell/device/weapon/recharge/alien,/obj/structure/table/alien,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"Ec" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/item/paper/alien,/obj/item/cell/device/weapon/recharge/alien,/obj/structure/table/alien,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "Ee" = (/mob/living/simple_mob/mechanical/hivebot/ranged_damage/backline,/obj/effect/floor_decal/techfloor{dir = 1},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "Em" = (/obj/effect/floor_decal/techfloor{dir = 8},/mob/living/simple_mob/humanoid/merc/ranged/ionrifle{health = 15; maxHealth = 15},/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) "Et" = (/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong/guard,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "Eu" = (/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/machinery/fusion_fuel_injector/mapped,/obj/machinery/fusion_fuel_injector/mapped{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"Ey" = (/obj/structure/grille/cult{name = "Alien grille"},/obj/structure/window/phoronreinforced{dir = 8},/obj/item/weapon/material/shard/phoron,/obj/structure/window/phoronreinforced/full,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) +"Ey" = (/obj/structure/grille/cult{name = "Alien grille"},/obj/structure/window/phoronreinforced{dir = 8},/obj/item/material/shard/phoron,/obj/structure/window/phoronreinforced/full,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) "EC" = (/obj/structure/shuttle/engine/heater,/turf/simulated/shuttle/wall/alien/hard_corner,/area/submap/DerelictEngine) "EF" = (/obj/machinery/porta_turret/alien{faction = "hivebot"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"EM" = (/obj/structure/closet/alien,/obj/effect/floor_decal/techfloor{dir = 8},/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/obj/item/weapon/surgical/bone_clamp/alien,/obj/item/weapon/surgical/hemostat/alien,/obj/item/weapon/surgical/scalpel/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) +"EM" = (/obj/structure/closet/alien,/obj/effect/floor_decal/techfloor{dir = 8},/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/obj/item/surgical/bone_clamp/alien,/obj/item/surgical/hemostat/alien,/obj/item/surgical/scalpel/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "EZ" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "Fb" = (/obj/structure/loot_pile/surface/alien/medical,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"Fd" = (/obj/item/weapon/surgical/bone_clamp/alien,/obj/item/device/healthanalyzer/phasic,/obj/effect/floor_decal/techfloor{dir = 4},/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) +"Fd" = (/obj/item/surgical/bone_clamp/alien,/obj/item/healthanalyzer/phasic,/obj/effect/floor_decal/techfloor{dir = 4},/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "FE" = (/obj/effect/floor_decal/techfloor/orange{dir = 9},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "FH" = (/obj/machinery/teleport/station,/obj/effect/floor_decal/techfloor/orange{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "FI" = (/obj/effect/floor_decal/techfloor/orange{dir = 5},/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/submap/DerelictEngine) @@ -270,22 +270,22 @@ "LO" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plating,/area/submap/DerelictEngine) "LT" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/effect/decal/cleanable/blood/gibs/robot,/obj/effect/decal/cleanable/molten_item,/turf/simulated/floor/plating,/area/submap/DerelictEngine) "MD" = (/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid,/obj/effect/floor_decal/techfloor{dir = 8},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) -"MG" = (/obj/item/clothing/under/psysuit,/obj/item/weapon/circuitboard/mecha/imperion/peripherals,/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) +"MG" = (/obj/item/clothing/under/psysuit,/obj/item/circuitboard/mecha/imperion/peripherals,/obj/structure/table/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "MO" = (/obj/effect/floor_decal/techfloor/orange{dir = 10},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "MZ" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/machinery/door/airlock/alien/public,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) "Ng" = (/obj/effect/floor_decal/techfloor{dir = 10},/obj/structure/closet/alien,/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/obj/item/shield_projector/rectangle/weak,/obj/item/stack/material/phoron{amount = 10},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "Nm" = (/obj/structure/loot_pile/surface/alien/security,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) -"No" = (/obj/structure/closet/alien,/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/obj/item/weapon/tool/screwdriver/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) +"No" = (/obj/structure/closet/alien,/obj/item/prop/alien/junk,/obj/item/prop/alien/junk,/obj/item/tool/screwdriver/alien,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "Nr" = (/mob/living/simple_mob/mechanical/hivebot/swarm,/turf/simulated/floor/outdoors/dirt,/area/template_noop) -"NZ" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/item/weapon/circuitboard/mecha/imperion/phasing,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"NZ" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/item/circuitboard/mecha/imperion/phasing,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "Ok" = (/obj/machinery/vr_sleeper/alien/beta_replicant,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"OB" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor{dir = 8},/obj/item/weapon/paper/alien,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) +"OB" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor{dir = 8},/obj/item/paper/alien,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) "OV" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid,/obj/effect/decal/remains/xeno,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"OZ" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/item/weapon/gun/energy/laser/sleek,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"OZ" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/item/gun/energy/laser/sleek,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "Pe" = (/obj/effect/floor_decal/techfloor/orange,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser,/turf/simulated/floor/plating,/area/submap/DerelictEngine) "Pn" = (/obj/random/mob/robotic/hivebot,/obj/effect/floor_decal/techfloor{dir = 8},/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) "Pq" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/machinery/power/terminal{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"Pw" = (/obj/structure/mopbucket,/obj/item/weapon/mop,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) +"Pw" = (/obj/structure/mopbucket,/obj/item/mop,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "PD" = (/obj/effect/floor_decal/techfloor/orange,/obj/effect/floor_decal/techfloor/hole/right,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "PF" = (/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "PK" = (/obj/effect/floor_decal/techfloor/orange,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) @@ -303,7 +303,7 @@ "RB" = (/obj/effect/floor_decal/techfloor{dir = 8},/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) "RF" = (/obj/structure/prop/alien/power,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "RG" = (/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/machinery/fusion_fuel_injector/mapped{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"RU" = (/obj/structure/closet/alien,/obj/item/weapon/weldingtool/alien,/obj/item/weapon/storage/belt/utility/alien/full,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"RU" = (/obj/structure/closet/alien,/obj/item/weldingtool/alien,/obj/item/storage/belt/utility/alien/full,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "RW" = (/obj/machinery/door/airlock/alien/public,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "SB" = (/obj/structure/prop/alien/computer,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "SF" = (/turf/template_noop,/area/template_noop) @@ -325,12 +325,12 @@ "Uv" = (/obj/effect/floor_decal/industrial/warning/full,/obj/structure/prop/lock/projectile{pixel_y = 6},/turf/simulated/floor/greengrid,/area/submap/DerelictEngine) "Uw" = (/obj/structure/particle_accelerator/fuel_chamber{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "UQ" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/generic,/obj/effect/decal/cleanable/blood/gibs/robot,/obj/effect/gibspawner/human,/turf/simulated/floor/plating,/area/submap/DerelictEngine) -"UV" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/item/weapon/gun/energy/alien,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"UV" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor/orange{dir = 8},/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/item/gun/energy/alien,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "UW" = (/obj/effect/floor_decal/techfloor/orange/corner{dir = 1},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/submap/DerelictEngine) -"UZ" = (/obj/item/clothing/accessory/medal/dungeon/alien_ufo{desc = "It vaguely like a star. It looks like something an alien admiral might've worn. Probably."; name = "alien admiral's medal"},/obj/item/weapon/telecube/precursor/mated/zone,/obj/item/clothing/head/helmet/alien/tank,/obj/structure/table/alien,/turf/simulated/floor/greengrid,/area/submap/DerelictEngine) +"UZ" = (/obj/item/clothing/accessory/medal/dungeon/alien_ufo{desc = "It vaguely like a star. It looks like something an alien admiral might've worn. Probably."; name = "alien admiral's medal"},/obj/item/telecube/precursor/mated/zone,/obj/item/clothing/head/helmet/alien/tank,/obj/structure/table/alien,/turf/simulated/floor/greengrid,/area/submap/DerelictEngine) "Vb" = (/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "Vg" = (/obj/effect/floor_decal/techfloor/orange,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"Vk" = (/obj/item/weapon/oar{desc = "Used to provide propulsion to a space ship."; force = 50; name = "Alien oar"; throw_range = 10; throw_speed = 5; throwforce = 30},/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) +"Vk" = (/obj/item/oar{desc = "Used to provide propulsion to a space ship."; force = 50; name = "Alien oar"; throw_range = 10; throw_speed = 5; throwforce = 30},/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) "Vn" = (/obj/machinery/porta_turret/alien{faction = "hivebot"},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "Vs" = (/mob/living/simple_mob/mechanical/hivebot/tank/armored,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) "Vy" = (/obj/effect/gibspawner/robot,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) @@ -339,7 +339,7 @@ "VQ" = (/turf/simulated/floor/plating,/area/submap/DerelictEngine) "VX" = (/obj/effect/floor_decal/techfloor{dir = 8},/mob/living/simple_mob/humanoid/merc/ranged{health = 15; maxHealth = 15},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "Wk" = (/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege,/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) -"WA" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor{dir = 4},/obj/item/weapon/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) +"WA" = (/obj/structure/table/alien,/obj/effect/floor_decal/techfloor{dir = 4},/obj/item/paper/alien{icon_state = "alienpaper_words"; info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]"},/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) "WB" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/machinery/power/tesla_coil,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "WQ" = (/obj/effect/floor_decal/techfloor{dir = 5},/obj/structure/loot_pile/surface/alien/medical,/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "WV" = (/mob/living/simple_mob/humanoid/merc/ranged{health = 15; maxHealth = 15},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) @@ -359,7 +359,7 @@ "Yr" = (/obj/item/prop/alien/junk,/turf/simulated/shuttle/floor/alien,/area/submap/DerelictEngine) "Yu" = (/obj/structure/particle_accelerator/end_cap{anchored = 1; dir = 8},/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/effect/floor_decal/techfloor/hole{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "YG" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/power/grounding_rod/pre_mapped{item_state = 2},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) -"YH" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/item/weapon/material/shard/phoron{pixel_x = -9; pixel_y = -7},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) +"YH" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/item/material/shard/phoron{pixel_x = -9; pixel_y = -7},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "YI" = (/obj/effect/floor_decal/techfloor/orange,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/submap/DerelictEngine) "YJ" = (/obj/effect/floor_decal/techfloor{dir = 8},/turf/simulated/shuttle/floor/alienplating/external,/area/submap/DerelictEngine) "Zh" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/structure/grille/cult{name = "Alien grille"},/obj/structure/window/phoronreinforced{dir = 8},/obj/structure/window/phoronreinforced{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/window/phoronreinforced/full,/turf/simulated/shuttle/floor/voidcraft,/area/submap/DerelictEngine) diff --git a/maps/submaps/surface_submaps/wilderness/dogbase.dmm b/maps/submaps/surface_submaps/wilderness/dogbase.dmm index 3a6416cc1b3..5d663cd5924 100644 --- a/maps/submaps/surface_submaps/wilderness/dogbase.dmm +++ b/maps/submaps/surface_submaps/wilderness/dogbase.dmm @@ -39,7 +39,7 @@ /obj/effect/decal/cleanable/filth, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/bone, +/obj/item/bone, /obj/random/maintenance/security, /turf/simulated/floor/outdoors/dirt, /area/submap/DogBase) @@ -53,7 +53,7 @@ /turf/simulated/floor, /area/submap/DogBase) "bw" = ( -/obj/item/weapon/storage/belt/janitor, +/obj/item/storage/belt/janitor, /obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) @@ -157,7 +157,7 @@ /obj/effect/decal/cleanable/filth, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/bone/ribs, +/obj/item/bone/ribs, /obj/random/maintenance/research, /turf/simulated/floor/outdoors/dirt, /area/submap/DogBase) @@ -255,7 +255,7 @@ /area/submap/DogBase) "np" = ( /obj/structure/table/woodentable, -/obj/item/weapon/gun/projectile/pistol, +/obj/item/gun/projectile/pistol, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) "oW" = ( @@ -265,7 +265,7 @@ /area/template_noop) "pR" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -293,13 +293,13 @@ /obj/structure/dogbed, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/bone, +/obj/item/bone, /obj/random/maintenance/security, /turf/simulated/floor/outdoors/dirt, /area/submap/DogBase) "qO" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -478,7 +478,7 @@ /area/submap/DogBase) "BA" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) "BB" = ( @@ -493,7 +493,7 @@ /area/submap/DogBase) "Ce" = ( /obj/structure/janitorialcart, -/obj/item/weapon/storage/bag/trash, +/obj/item/storage/bag/trash, /obj/effect/floor_decal/corner/purple/diagonal, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) @@ -507,7 +507,7 @@ /obj/structure/dogbed, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/bone, +/obj/item/bone, /obj/random/contraband/nofail, /turf/simulated/floor/outdoors/dirt, /area/submap/DogBase) @@ -677,13 +677,13 @@ /area/submap/DogBase) "Ok" = ( /obj/structure/table/woodentable, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) "Ol" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/bone/leg, +/obj/item/bone/leg, /mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ desc = "The biggest and baddest guard dog around."; faction = "syndicate"; @@ -762,7 +762,7 @@ /area/template_noop) "Rz" = ( /obj/structure/table/woodentable, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /obj/random/contraband/nofail, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) @@ -826,7 +826,7 @@ /area/submap/DogBase) "Wu" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -888,7 +888,7 @@ /area/submap/DogBase) "ZK" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "Unknown APC"; pixel_x = -24 diff --git a/maps/submaps/surface_submaps/wilderness/drgnplateu.dmm b/maps/submaps/surface_submaps/wilderness/drgnplateu.dmm index 55381116919..2f202bffdac 100644 --- a/maps/submaps/surface_submaps/wilderness/drgnplateu.dmm +++ b/maps/submaps/surface_submaps/wilderness/drgnplateu.dmm @@ -17,16 +17,16 @@ /turf/simulated/floor/outdoors/dirt, /area/submap/drgnplateu) "cV" = ( -/obj/item/weapon/digestion_remains/skull/tajaran, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains/skull/tajaran, +/obj/item/digestion_remains{ pixel_x = 19; pixel_y = 1 }, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains{ pixel_x = 8; pixel_y = 1 }, -/obj/item/weapon/digestion_remains, +/obj/item/digestion_remains, /obj/item/clothing/accessory/collar/holo/indigestible, /turf/simulated/floor/outdoors/dirt, /area/submap/drgnplateu) @@ -43,15 +43,15 @@ }, /obj/item/clothing/gloves/ring/material/gold, /obj/item/clothing/ears/earring/stud/gold, -/obj/item/weapon/gun/projectile/deagle/gold{ +/obj/item/gun/projectile/deagle/gold{ pixel_x = -11; pixel_y = -22 }, /turf/simulated/floor/outdoors/grass/sif/forest, /area/submap/drgnplateu) "ez" = ( -/obj/item/weapon/digestion_remains/ribcage, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains/ribcage, +/obj/item/digestion_remains{ pixel_x = 19; pixel_y = 1 }, @@ -59,8 +59,8 @@ /turf/simulated/floor/outdoors/dirt, /area/submap/drgnplateu) "fj" = ( -/obj/item/weapon/digestion_remains/ribcage, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains/ribcage, +/obj/item/digestion_remains{ pixel_x = 8; pixel_y = 7 }, @@ -86,11 +86,11 @@ }, /obj/structure/flora/grass/green, /obj/item/clothing/accessory/medal/solgov/gold/sun, -/obj/item/weapon/pickaxe/gold{ +/obj/item/pickaxe/gold{ pixel_x = -12; pixel_y = 9 }, -/obj/item/weapon/reagent_containers/food/drinks/golden_cup{ +/obj/item/reagent_containers/food/drinks/golden_cup{ pixel_x = -10; pixel_y = -5 }, @@ -126,7 +126,7 @@ /obj/item/instrument/violin/golden{ pixel_x = 7 }, -/obj/item/weapon/flame/lighter/zippo/gold, +/obj/item/flame/lighter/zippo/gold, /turf/simulated/floor/outdoors/grass/sif/forest, /area/submap/drgnplateu) "mw" = ( @@ -134,24 +134,24 @@ /turf/simulated/floor/outdoors/dirt, /area/submap/drgnplateu) "mB" = ( -/obj/item/weapon/material/twohanded/baseballbat/gold, +/obj/item/material/twohanded/baseballbat/gold, /turf/simulated/floor/outdoors/grass/sif/forest, /area/submap/drgnplateu) "mX" = ( -/obj/item/weapon/digestion_remains/skull/unknown/anthro, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains/skull/unknown/anthro, +/obj/item/digestion_remains{ pixel_x = 8; pixel_y = 7 }, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains{ pixel_x = 19; pixel_y = -2 }, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains{ pixel_x = 19; pixel_y = -11 }, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains{ pixel_x = 19; pixel_y = 1 }, @@ -164,8 +164,8 @@ /turf/simulated/floor/outdoors/dirt, /area/submap/drgnplateu) "ni" = ( -/obj/item/weapon/digestion_remains/skull/unknown/anthro, -/obj/item/weapon/digestion_remains/ribcage, +/obj/item/digestion_remains/skull/unknown/anthro, +/obj/item/digestion_remains/ribcage, /obj/effect/decal/cleanable/liquid_fuel, /turf/simulated/floor/outdoors/dirt, /area/submap/drgnplateu) @@ -192,7 +192,7 @@ /turf/template_noop, /area/template_noop) "xd" = ( -/obj/item/weapon/digestion_remains/skull/nevrean, +/obj/item/digestion_remains/skull/nevrean, /obj/effect/decal/cleanable/filth, /turf/simulated/floor/outdoors/dirt, /area/submap/drgnplateu) @@ -203,12 +203,12 @@ /turf/simulated/floor/outdoors/dirt, /area/submap/drgnplateu) "zl" = ( -/obj/item/weapon/digestion_remains/skull/akula, +/obj/item/digestion_remains/skull/akula, /obj/effect/decal/cleanable/liquid_fuel, /turf/simulated/floor/outdoors/dirt, /area/submap/drgnplateu) "zm" = ( -/obj/item/weapon/digestion_remains, +/obj/item/digestion_remains, /obj/effect/decal/cleanable/filth, /turf/simulated/floor/outdoors/dirt, /area/submap/drgnplateu) @@ -225,14 +225,14 @@ /turf/simulated/floor/outdoors/dirt, /area/submap/drgnplateu) "Cu" = ( -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains{ pixel_x = 8 }, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains{ pixel_x = 8; pixel_y = 7 }, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains{ pixel_x = 19; pixel_y = 1 }, @@ -240,8 +240,8 @@ /turf/simulated/floor/outdoors/dirt, /area/submap/drgnplateu) "FT" = ( -/obj/item/weapon/digestion_remains/ribcage, -/obj/item/weapon/digestion_remains/ribcage{ +/obj/item/digestion_remains/ribcage, +/obj/item/digestion_remains/ribcage{ pixel_x = 9; pixel_y = 14 }, @@ -263,7 +263,7 @@ /turf/simulated/floor/outdoors/dirt, /area/submap/drgnplateu) "Jz" = ( -/obj/item/weapon/digestion_remains/skull/unknown/anthro, +/obj/item/digestion_remains/skull/unknown/anthro, /turf/simulated/floor/outdoors/dirt, /area/submap/drgnplateu) "JJ" = ( @@ -299,9 +299,9 @@ /turf/simulated/floor/outdoors/dirt, /area/submap/drgnplateu) "Nj" = ( -/obj/item/weapon/digestion_remains/skull/unathi, -/obj/item/weapon/digestion_remains, -/obj/item/weapon/digestion_remains{ +/obj/item/digestion_remains/skull/unathi, +/obj/item/digestion_remains, +/obj/item/digestion_remains{ pixel_x = 8; pixel_y = 7 }, @@ -323,7 +323,7 @@ /turf/simulated/floor/outdoors/dirt, /area/submap/drgnplateu) "Ra" = ( -/obj/item/weapon/digestion_remains/skull/zorren, +/obj/item/digestion_remains/skull/zorren, /obj/item/clothing/accessory/collar/holo/indigestible, /turf/simulated/floor/outdoors/dirt, /area/submap/drgnplateu) diff --git a/maps/submaps/surface_submaps/wilderness/emptycabin.dmm b/maps/submaps/surface_submaps/wilderness/emptycabin.dmm index bf48dcfd0af..ec2ecae9ff9 100644 --- a/maps/submaps/surface_submaps/wilderness/emptycabin.dmm +++ b/maps/submaps/surface_submaps/wilderness/emptycabin.dmm @@ -4,8 +4,8 @@ /area/template_noop) "b" = ( /obj/effect/decal/cleanable/filth, -/obj/item/weapon/bone/arm, -/obj/item/weapon/bone/skull/unathi, +/obj/item/bone/arm, +/obj/item/bone/skull/unathi, /turf/simulated/floor/wood/sif, /area/submap/EmptyCabin) "c" = ( @@ -15,9 +15,9 @@ /area/submap/EmptyCabin) "d" = ( /obj/structure/closet/wardrobe, -/obj/item/weapon/material/fishing_rod/modern, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/lunchbox/nymph/filled, +/obj/item/material/fishing_rod/modern, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/lunchbox/nymph/filled, /turf/simulated/floor/wood/sif, /area/submap/EmptyCabin) "e" = ( @@ -31,7 +31,7 @@ /area/submap/EmptyCabin) "g" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, +/obj/item/bedsheet/purpledouble, /turf/simulated/floor/wood/sif, /area/submap/EmptyCabin) "i" = ( @@ -60,8 +60,8 @@ /area/submap/EmptyCabin) "n" = ( /obj/structure/table/sifwoodentable, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/paper/crumpled/bloody{ +/obj/item/storage/fancy/candle_box, +/obj/item/paper/crumpled/bloody{ info = "I found an otie while picking flowers today. He's so cute! I took him back home, and he seemed quite happy to share food with me. He really likes fish. Though, he never really seems to not be hungry..." }, /turf/simulated/floor/wood/sif, @@ -142,11 +142,11 @@ /area/submap/EmptyCabin) "L" = ( /obj/structure/table/sifwoodentable, -/obj/item/weapon/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, /turf/simulated/floor/wood/sif, /area/submap/EmptyCabin) "M" = ( -/obj/item/weapon/bone/leg, +/obj/item/bone/leg, /turf/simulated/floor/wood/sif, /area/submap/EmptyCabin) "O" = ( @@ -196,7 +196,7 @@ /turf/simulated/floor/wood/sif, /area/submap/EmptyCabin) "X" = ( -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/floor/wood/sif, /area/submap/EmptyCabin) "Z" = ( diff --git a/maps/submaps/surface_submaps/wilderness/frostoasis.dmm b/maps/submaps/surface_submaps/wilderness/frostoasis.dmm index 826e4d600a8..805d45c0000 100644 --- a/maps/submaps/surface_submaps/wilderness/frostoasis.dmm +++ b/maps/submaps/surface_submaps/wilderness/frostoasis.dmm @@ -1,5 +1,5 @@ "am" = (/obj/random/obstruction,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/broken,/area/submap/FrostOasis) -"bB" = (/obj/structure/closet/cabinet,/obj/item/weapon/storage/belt/holding,/turf/simulated/floor/wood,/area/submap/FrostOasis) +"bB" = (/obj/structure/closet/cabinet,/obj/item/storage/belt/holding,/turf/simulated/floor/wood,/area/submap/FrostOasis) "cm" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt,/area/submap/FrostOasis) "co" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/FrostOasis) "dD" = (/obj/structure/loot_pile/maint/boxfort,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/FrostOasis) @@ -7,12 +7,12 @@ "fj" = (/turf/simulated/floor/outdoors/ice,/area/submap/FrostOasis) "go" = (/mob/living/simple_mob/animal/sif/glitterfly{faction = "diyaab"},/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis) "gF" = (/obj/structure/loot_pile/maint/junk,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/FrostOasis) -"iC" = (/obj/structure/table/bench/sifwooden,/obj/item/weapon/flame/candle/candelabra/everburn{pixel_y = 7},/turf/simulated/floor/wood/broken,/area/submap/FrostOasis) +"iC" = (/obj/structure/table/bench/sifwooden,/obj/item/flame/candle/candelabra/everburn{pixel_y = 7},/turf/simulated/floor/wood/broken,/area/submap/FrostOasis) "jN" = (/mob/living/simple_mob/animal/sif/glitterfly{faction = "diyaab"},/obj/structure/flora/ausbushes/brflowers,/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis) -"kr" = (/obj/item/weapon/a_gift,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/FrostOasis) +"kr" = (/obj/item/a_gift,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/FrostOasis) "ll" = (/obj/random/obstruction,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/FrostOasis) "lo" = (/obj/structure/flora/ausbushes/brflowers,/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis) -"ls" = (/obj/structure/table/standard,/obj/item/weapon/a_gift,/obj/item/weapon/a_gift,/turf/simulated/floor/wood,/area/submap/FrostOasis) +"ls" = (/obj/structure/table/standard,/obj/item/a_gift,/obj/item/a_gift,/turf/simulated/floor/wood,/area/submap/FrostOasis) "me" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis) "mh" = (/turf/simulated/floor/outdoors/dirt,/area/submap/FrostOasis) "mw" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/FrostOasis) @@ -25,11 +25,11 @@ "pE" = (/obj/structure/flora/grass/green,/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis) "st" = (/turf/simulated/floor/outdoors/dirt,/area/template_noop) "sU" = (/mob/living/simple_mob/animal/giant_spider/frost/sif{faction = "diyaab"},/obj/structure/flora/ausbushes/ywflowers,/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis) -"tv" = (/obj/item/weapon/a_gift,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/broken,/area/submap/FrostOasis) +"tv" = (/obj/item/a_gift,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/broken,/area/submap/FrostOasis) "tT" = (/mob/living/simple_mob/animal/sif/glitterfly{faction = "diyaab"},/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/FrostOasis) "uX" = (/mob/living/simple_mob/animal/giant_spider/frost/sif{faction = "diyaab"},/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis) -"vb" = (/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/rddouble,/obj/effect/spresent,/turf/simulated/floor/wood,/area/submap/FrostOasis) -"vK" = (/obj/item/weapon/a_gift,/obj/item/clothing/ears/earring/dangle/glass,/turf/simulated/floor/wood,/area/submap/FrostOasis) +"vb" = (/obj/structure/bed/double/padded,/obj/item/bedsheet/rddouble,/obj/effect/spresent,/turf/simulated/floor/wood,/area/submap/FrostOasis) +"vK" = (/obj/item/a_gift,/obj/item/clothing/ears/earring/dangle/glass,/turf/simulated/floor/wood,/area/submap/FrostOasis) "xI" = (/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/FrostOasis) "zm" = (/obj/structure/flora/grass/both,/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis) "zI" = (/turf/simulated/wall/sifwood,/area/submap/FrostOasis) @@ -37,11 +37,11 @@ "AM" = (/obj/structure/flora/ausbushes/ywflowers,/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis) "Bt" = (/obj/structure/flora/ausbushes/ppflowers,/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis) "BF" = (/mob/living/simple_mob/animal/sif/diyaab,/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis) -"EW" = (/obj/structure/table/standard,/obj/item/weapon/gift,/obj/item/weapon/gun/energy/temperature,/turf/simulated/floor/wood/broken,/area/submap/FrostOasis) -"Fl" = (/obj/structure/curtain/open/bed,/obj/item/weapon/storage/fancy/blackcandle_box,/obj/random/soap,/obj/random/maintenance,/obj/random/maintenance,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/medical,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/structure/window/reinforced/tinted/frosted{dir = 4},/obj/structure/table/rack,/turf/simulated/floor/wood/broken,/area/submap/FrostOasis) +"EW" = (/obj/structure/table/standard,/obj/item/gift,/obj/item/gun/energy/temperature,/turf/simulated/floor/wood/broken,/area/submap/FrostOasis) +"Fl" = (/obj/structure/curtain/open/bed,/obj/item/storage/fancy/blackcandle_box,/obj/random/soap,/obj/random/maintenance,/obj/random/maintenance,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/medical,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/structure/window/reinforced/tinted/frosted{dir = 4},/obj/structure/table/rack,/turf/simulated/floor/wood/broken,/area/submap/FrostOasis) "It" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt,/area/template_noop) "IF" = (/turf/simulated/floor/beach/water/ocean,/area/submap/FrostOasis) -"Ji" = (/obj/item/weapon/a_gift,/obj/random/junk,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/FrostOasis) +"Ji" = (/obj/item/a_gift,/obj/random/junk,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/FrostOasis) "JY" = (/obj/random/obstruction,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/FrostOasis) "Ka" = (/obj/random/obstruction,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/FrostOasis) "Kq" = (/obj/structure/flora/tree/dead,/turf/simulated/floor/outdoors/snow,/area/submap/FrostOasis) diff --git a/maps/submaps/surface_submaps/wilderness/greatwolfden.dmm b/maps/submaps/surface_submaps/wilderness/greatwolfden.dmm index 738bac8d6ef..732d8aef5fb 100644 --- a/maps/submaps/surface_submaps/wilderness/greatwolfden.dmm +++ b/maps/submaps/surface_submaps/wilderness/greatwolfden.dmm @@ -82,15 +82,15 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/GreatWolfDen) "ju" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat/human, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/GreatWolfDen) "kg" = ( -/obj/item/weapon/bone/skull/unathi, +/obj/item/bone/skull/unathi, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/GreatWolfDen) "kk" = ( @@ -121,7 +121,7 @@ /area/submap/GreatWolfDen) "lQ" = ( /obj/effect/decal/cleanable/filth, -/obj/item/weapon/card/emag_broken, +/obj/item/card/emag_broken, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/GreatWolfDen) "mk" = ( @@ -202,11 +202,11 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/GreatWolfDen) "vu" = ( -/obj/item/weapon/bone/skull/tajaran, +/obj/item/bone/skull/tajaran, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/GreatWolfDen) "wc" = ( -/obj/item/weapon/bone/skull/unathi, +/obj/item/bone/skull/unathi, /obj/effect/decal/cleanable/dirt, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/GreatWolfDen) @@ -482,7 +482,7 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/GreatWolfDen) "Rb" = ( -/obj/item/weapon/bone/leg, +/obj/item/bone/leg, /obj/effect/decal/cleanable/dirt, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/GreatWolfDen) @@ -491,7 +491,7 @@ /obj/structure/flora/sif/subterranean{ icon_state = "frostbelle" }, -/obj/item/weapon/gun/projectile/pistol, +/obj/item/gun/projectile/pistol, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/GreatWolfDen) "Rj" = ( @@ -507,7 +507,7 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/GreatWolfDen) "SO" = ( -/obj/item/weapon/telecube/mated, +/obj/item/telecube/mated, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/GreatWolfDen) "SQ" = ( @@ -517,10 +517,10 @@ /turf/simulated/floor/outdoors/dirt, /area/template_noop) "Tf" = ( -/obj/item/weapon/paper/card/heart{ +/obj/item/paper/card/heart{ desc = "A gift card with a heart on the cover. This appears to be a thank-you to the.. wolves??" }, -/obj/item/weapon/paper/crumpled{ +/obj/item/paper/crumpled{ icon_state = "scrap_bloodied"; info = "The wolves dragged me back to their den when they found me incapacitated, and nursed me back to health, instead of eating me. I don't know why. Anyway, they're a bunch of goodboyes. Don't let the bones strewn about their den frighten you. Just be nice to them and they won't hurt you."; name = "survivor's note" @@ -550,7 +550,7 @@ /area/submap/GreatWolfDen) "WH" = ( /obj/structure/loot_pile/surface/bones, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /obj/random/projectile/scrapped_gun, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/GreatWolfDen) @@ -574,7 +574,7 @@ /turf/simulated/floor/outdoors/snow, /area/submap/GreatWolfDen) "Xy" = ( -/obj/item/weapon/bone/ribs, +/obj/item/bone/ribs, /obj/effect/landmark/loot_spawn/low, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/GreatWolfDen) diff --git a/maps/submaps/surface_submaps/wilderness/leopardmanderden.dmm b/maps/submaps/surface_submaps/wilderness/leopardmanderden.dmm index 2238b8f1d9b..1888f98df11 100644 --- a/maps/submaps/surface_submaps/wilderness/leopardmanderden.dmm +++ b/maps/submaps/surface_submaps/wilderness/leopardmanderden.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aK" = ( -/obj/item/weapon/ore/silver, +/obj/item/ore/silver, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/outdoors/grass/sif/forest{ outdoors = 0 @@ -20,7 +20,7 @@ }, /area/submap/LeopardmanderDen) "bj" = ( -/obj/item/weapon/bluespace_crystal, +/obj/item/bluespace_crystal, /turf/simulated/floor/outdoors/grass/sif, /area/submap/LeopardmanderDen) "bO" = ( @@ -52,7 +52,7 @@ }, /area/template_noop) "fe" = ( -/obj/item/weapon/coin/diamond, +/obj/item/coin/diamond, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/outdoors/grass/sif/forest{ outdoors = 0 @@ -60,7 +60,7 @@ /area/submap/LeopardmanderDen) "fQ" = ( /obj/effect/landmark/loot_spawn/low, -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, /turf/simulated/floor/outdoors/grass/sif/forest{ outdoors = 0 }, @@ -70,7 +70,7 @@ /turf/simulated/floor/outdoors/dirt, /area/template_noop) "gC" = ( -/obj/item/weapon/flame/lighter/zippo/gold, +/obj/item/flame/lighter/zippo/gold, /turf/simulated/floor/outdoors/grass/sif/forest{ outdoors = 0 }, @@ -86,7 +86,7 @@ /turf/simulated/floor/outdoors/dirt, /area/template_noop) "gU" = ( -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, /turf/simulated/floor/outdoors/grass/sif/forest{ outdoors = 0 }, @@ -295,7 +295,7 @@ /turf/simulated/floor/outdoors/grass/sif, /area/submap/LeopardmanderDen) "xg" = ( -/obj/item/weapon/ore/silver, +/obj/item/ore/silver, /turf/simulated/floor/outdoors/grass/sif/forest{ outdoors = 0 }, @@ -381,7 +381,7 @@ /turf/simulated/floor/outdoors/dirt, /area/template_noop) "Gw" = ( -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/outdoors/grass/sif/forest{ outdoors = 0 @@ -498,7 +498,7 @@ }, /area/submap/LeopardmanderDen) "Te" = ( -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /turf/simulated/floor/outdoors/grass/sif/forest{ outdoors = 0 }, @@ -515,7 +515,7 @@ /area/template_noop) "Tt" = ( /obj/structure/flora/ausbushes/brflowers, -/obj/item/weapon/coin/iron, +/obj/item/coin/iron, /turf/simulated/floor/outdoors/grass/sif/forest{ outdoors = 0 }, @@ -529,16 +529,16 @@ }, /area/submap/LeopardmanderDen) "Uc" = ( -/obj/item/weapon/ore/diamond, +/obj/item/ore/diamond, /turf/simulated/floor/outdoors/grass/sif, /area/submap/LeopardmanderDen) "Ul" = ( -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, /turf/simulated/floor/outdoors/grass/sif, /area/submap/LeopardmanderDen) "UA" = ( /obj/structure/flora/ausbushes/brflowers, -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, /turf/simulated/floor/outdoors/grass/sif/forest{ outdoors = 0 }, @@ -590,7 +590,7 @@ /turf/simulated/floor/outdoors/dirt, /area/template_noop) "YJ" = ( -/obj/item/weapon/ore/diamond, +/obj/item/ore/diamond, /turf/simulated/floor/outdoors/grass/sif/forest{ outdoors = 0 }, diff --git a/maps/submaps/surface_submaps/wilderness/lonewolf.dmm b/maps/submaps/surface_submaps/wilderness/lonewolf.dmm index 83b02be35bd..b3f7540c9a0 100644 --- a/maps/submaps/surface_submaps/wilderness/lonewolf.dmm +++ b/maps/submaps/surface_submaps/wilderness/lonewolf.dmm @@ -85,7 +85,7 @@ /turf/simulated/mineral/ignore_mapgen, /area/submap/lonewolf) "P" = ( -/obj/item/weapon/sword/fluff/joanaria{ +/obj/item/sword/fluff/joanaria{ desc = "An ancient sword, belonging to someone of power. Now, it is little more than a relic, damaged beyong use."; force = 10; name = "old greatsword" diff --git a/maps/submaps/surface_submaps/wilderness/otieshelter.dmm b/maps/submaps/surface_submaps/wilderness/otieshelter.dmm index 9bf07c817ea..b60cd452357 100644 --- a/maps/submaps/surface_submaps/wilderness/otieshelter.dmm +++ b/maps/submaps/surface_submaps/wilderness/otieshelter.dmm @@ -68,7 +68,7 @@ dir = 4 }, /obj/item/trash/bowl, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "hk" = ( @@ -88,7 +88,7 @@ /area/submap/OtieShelter) "iv" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "iC" = ( @@ -120,7 +120,7 @@ /turf/simulated/floor/carpet/turcarpet, /area/submap/OtieShelter) "jI" = ( -/obj/item/weapon/material/shard{ +/obj/item/material/shard{ icon_state = "medium" }, /obj/effect/decal/cleanable/blood/tracks{ @@ -181,7 +181,7 @@ }, /mob/living/simple_mob/vore/otie/friendly/chubby, /obj/item/trash/bowl, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "mC" = ( @@ -205,8 +205,8 @@ /area/submap/OtieShelter) "nR" = ( /obj/structure/table/marble, -/obj/item/weapon/newspaper, -/obj/item/weapon/paper/card/heart, +/obj/item/newspaper, +/obj/item/paper/card/heart, /turf/simulated/floor/carpet/turcarpet, /area/submap/OtieShelter) "ob" = ( @@ -219,7 +219,7 @@ /area/submap/OtieShelter) "od" = ( /obj/machinery/door/window, -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "op" = ( @@ -283,7 +283,7 @@ dir = 4 }, /obj/item/trash/bowl, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "uD" = ( @@ -297,14 +297,14 @@ /turf/simulated/floor/tiled, /area/submap/OtieShelter) "vA" = ( -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "vB" = ( /obj/machinery/door/window{ dir = 8 }, -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "vV" = ( @@ -340,7 +340,7 @@ /area/submap/OtieShelter) "yD" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "Aa" = ( @@ -352,8 +352,8 @@ /area/submap/OtieShelter) "At" = ( /obj/structure/table/marble, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/carpet/turcarpet, /area/submap/OtieShelter) "AO" = ( @@ -361,7 +361,7 @@ /turf/simulated/floor/tiled, /area/submap/OtieShelter) "BM" = ( -/obj/item/weapon/melee/baton/cattleprod, +/obj/item/melee/baton/cattleprod, /obj/effect/decal/cleanable/blood/tracks{ color = "red"; desc = "Your instincts say you shouldn't be following these."; @@ -377,7 +377,7 @@ /area/submap/OtieShelter) "Cw" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid, +/obj/item/storage/firstaid, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "CM" = ( @@ -406,7 +406,7 @@ /turf/simulated/floor/tiled, /area/submap/OtieShelter) "Ih" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "Ij" = ( @@ -474,11 +474,11 @@ "Nd" = ( /obj/structure/table/marble, /obj/structure/table/marble, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/carpet/turcarpet, /area/submap/OtieShelter) "Nh" = ( -/obj/item/weapon/bedsheet/browndouble, +/obj/item/bedsheet/browndouble, /obj/structure/bed/double/padded, /turf/simulated/floor/carpet/turcarpet, /area/submap/OtieShelter) @@ -525,7 +525,7 @@ dir = 8 }, /obj/item/trash/bowl, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "Px" = ( @@ -571,7 +571,7 @@ dir = 8 }, /obj/item/trash/bowl, -/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/reagent_containers/food/snacks/meat/human, /turf/simulated/floor/tiled, /area/submap/OtieShelter) "VE" = ( @@ -614,7 +614,7 @@ dir = 1 }, /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, diff --git a/maps/submaps/surface_submaps/wilderness/syndisniper.dmm b/maps/submaps/surface_submaps/wilderness/syndisniper.dmm index d209ca0a5e4..6a7a63f5ea8 100644 --- a/maps/submaps/surface_submaps/wilderness/syndisniper.dmm +++ b/maps/submaps/surface_submaps/wilderness/syndisniper.dmm @@ -33,9 +33,9 @@ /area/submap/SyndiSniper) "w" = ( /obj/structure/table/sifwooden_reinforced, -/obj/item/weapon/storage/mre/random, -/obj/item/device/binoculars, -/obj/item/device/radio/bluespacehandset/linked/talon_prelinked, +/obj/item/storage/mre/random, +/obj/item/binoculars, +/obj/item/radio/bluespacehandset/linked/talon_prelinked, /turf/simulated/floor/outdoors/rocks, /area/submap/SyndiSniper) "B" = ( diff --git a/maps/submaps/surface_submaps/wilderness/wolfden.dmm b/maps/submaps/surface_submaps/wilderness/wolfden.dmm index 5b510161b67..f54180baa09 100644 --- a/maps/submaps/surface_submaps/wilderness/wolfden.dmm +++ b/maps/submaps/surface_submaps/wilderness/wolfden.dmm @@ -1,10 +1,10 @@ "a" = (/turf/simulated/floor/outdoors/dirt,/area/submap/WolfDen) "b" = (/mob/living/simple_mob/animal/sif/shantak,/turf/template_noop,/area/submap/WolfDen) -"c" = (/obj/item/weapon/bone,/obj/effect/decal/cleanable/dirt,/obj/effect/gibspawner/human,/obj/random/maintenance/engineering,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen) +"c" = (/obj/item/bone,/obj/effect/decal/cleanable/dirt,/obj/effect/gibspawner/human,/obj/random/maintenance/engineering,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen) "e" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/random/junk,/obj/random/maintenance/cargo,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen) "i" = (/obj/random/maintenance/security,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen) "j" = (/obj/random/gun/random,/obj/random/junk,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/WolfDen) -"m" = (/obj/item/weapon/bone/ribs,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen) +"m" = (/obj/item/bone/ribs,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen) "o" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/WolfDen) "p" = (/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen) "q" = (/obj/structure/loot_pile/surface/bones,/obj/random/maintenance/cargo,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/WolfDen) @@ -17,14 +17,14 @@ "A" = (/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/security,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen) "C" = (/mob/living/simple_mob/animal/sif/shantak,/turf/simulated/floor/outdoors/dirt,/area/submap/WolfDen) "D" = (/obj/effect/decal/cleanable/dirt,/obj/random/junk,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/WolfDen) -"G" = (/obj/item/weapon/bone/arm,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen) +"G" = (/obj/item/bone/arm,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen) "I" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen) "J" = (/obj/effect/decal/cleanable/dirt,/obj/random/junk,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen) "K" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen) "M" = (/obj/random/maintenance/cargo,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/WolfDen) "O" = (/obj/random/gun/random,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/WolfDen) "R" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt,/area/submap/WolfDen) -"S" = (/obj/item/weapon/bone,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/WolfDen) +"S" = (/obj/item/bone,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/WolfDen) "T" = (/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/engineering,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/WolfDen) "U" = (/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/engineering,/obj/item/clothing/head/fedora,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/WolfDen) "V" = (/obj/random/outcrop,/turf/simulated/floor/outdoors/dirt,/area/submap/WolfDen) diff --git a/maps/submaps/surface_submaps/wilderness/xenohive.dmm b/maps/submaps/surface_submaps/wilderness/xenohive.dmm index ca3d798f12c..9c4c5becc4c 100644 --- a/maps/submaps/surface_submaps/wilderness/xenohive.dmm +++ b/maps/submaps/surface_submaps/wilderness/xenohive.dmm @@ -56,11 +56,11 @@ "GN" = (/obj/effect/alien/weeds,/obj/structure/alien/membrane,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive) "Hr" = (/turf/simulated/floor/outdoors/dirt,/area/template_noop) "Hu" = (/obj/effect/alien/weeds,/turf/simulated/floor,/area/submap/XenoHive) -"Hx" = (/obj/item/weapon/portable_destructive_analyzer,/obj/effect/alien/weeds,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive) +"Hx" = (/obj/item/portable_destructive_analyzer,/obj/effect/alien/weeds,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive) "Hz" = (/obj/effect/alien/weeds,/obj/structure/simple_door/resin,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive) "HI" = (/obj/effect/alien/weeds,/obj/structure/prop/blackbox/quarantined_shuttle,/turf/simulated/floor/tiled/techfloor/grid,/area/submap/XenoHive) "HJ" = (/obj/effect/alien/weeds,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/XenoHive) -"HO" = (/obj/structure/table,/obj/effect/alien/weeds,/obj/effect/decal/cleanable/dirt,/obj/item/weapon/storage/backpack/holding,/turf/simulated/floor,/area/submap/XenoHive) +"HO" = (/obj/structure/table,/obj/effect/alien/weeds,/obj/effect/decal/cleanable/dirt,/obj/item/storage/backpack/holding,/turf/simulated/floor,/area/submap/XenoHive) "Ir" = (/obj/effect/alien/weeds,/obj/structure/bed/nest,/turf/simulated/floor,/area/submap/XenoHive) "Is" = (/obj/effect/alien/weeds,/obj/structure/loot_pile/maint/boxfort,/turf/simulated/floor/outdoors/rocks{outdoors = 0},/area/submap/XenoHive) "IY" = (/obj/effect/alien/weeds,/obj/effect/alien/weeds,/obj/structure/bed/nest,/turf/simulated/floor/tiled/steel_dirty,/area/submap/XenoHive) @@ -88,7 +88,7 @@ "VA" = (/obj/effect/alien/weeds/node,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/random/junk,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive) "WD" = (/obj/effect/alien/weeds,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive) "WE" = (/obj/effect/alien/weeds,/obj/structure/mopbucket,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive) -"Xy" = (/obj/structure/table/steel_reinforced,/obj/effect/alien/weeds,/obj/machinery/light/small/emergency/flicker{dir = 8},/obj/item/weapon/reagent_containers/food/snacks/truffle/random,/turf/simulated/floor,/area/submap/XenoHive) +"Xy" = (/obj/structure/table/steel_reinforced,/obj/effect/alien/weeds,/obj/machinery/light/small/emergency/flicker{dir = 8},/obj/item/reagent_containers/food/snacks/truffle/random,/turf/simulated/floor,/area/submap/XenoHive) "YG" = (/obj/effect/alien/weeds,/mob/living/simple_mob/humanoid/merc/melee/sword/poi{health = 15; maxHealth = 15},/turf/simulated/floor/tiled/steel_dirty,/area/submap/XenoHive) "YL" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/humanoid/merc/ranged{health = 15; maxHealth = 15},/turf/simulated/floor/outdoors/dirt,/area/submap/XenoHive) "Zc" = (/obj/effect/alien/weeds,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/random/junk,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/XenoHive) diff --git a/maps/tether/submaps/tether_centcom.dmm b/maps/tether/submaps/tether_centcom.dmm index b6fe5fb58e9..fbbf3f088af 100644 --- a/maps/tether/submaps/tether_centcom.dmm +++ b/maps/tether/submaps/tether_centcom.dmm @@ -4,8 +4,8 @@ /area/centcom) "ab" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/lasercannon, -/obj/item/weapon/gun/energy/lasercannon, +/obj/item/gun/energy/lasercannon, +/obj/item/gun/energy/lasercannon, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "ac" = ( @@ -13,8 +13,8 @@ /area/shuttle/centcom/ccbay) "ad" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/xray, -/obj/item/weapon/gun/energy/xray, +/obj/item/gun/energy/xray, +/obj/item/gun/energy/xray, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "ae" = ( @@ -24,13 +24,13 @@ "af" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, /turf/simulated/floor/tiled/dark, /area/centcom/security) "ag" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/heavysniper, +/obj/item/gun/projectile/heavysniper, /obj/item/ammo_magazine/ammo_box/b145, /obj/item/ammo_magazine/ammo_box/b145, /turf/simulated/floor/tiled/dark, @@ -40,8 +40,8 @@ /area/centcom/main_hall) "ai" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/weapon/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, @@ -59,7 +59,7 @@ /area/centcom/control) "ak" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/simulated/floor/tiled, /area/centcom/security) "al" = ( @@ -67,8 +67,8 @@ /area/tdome/tdomeadmin) "am" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/rocket, -/obj/item/weapon/gun/launcher/rocket, +/obj/item/gun/launcher/rocket, +/obj/item/gun/launcher/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, @@ -142,18 +142,18 @@ /area/centcom/security) "au" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "av" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/l6_saw, -/obj/item/weapon/gun/projectile/automatic/l6_saw, +/obj/item/gun/projectile/automatic/l6_saw, +/obj/item/gun/projectile/automatic/l6_saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, @@ -177,8 +177,8 @@ /area/centcom/control) "az" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "aA" = ( @@ -190,8 +190,8 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -206,8 +206,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -221,7 +221,7 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/netgun, +/obj/item/gun/energy/netgun, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -289,7 +289,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = 3; pixel_y = 5 }, @@ -300,9 +300,9 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/window/reinforced{ dir = 4 @@ -317,10 +317,10 @@ }, /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -335,10 +335,10 @@ /area/centcom/specops) "aV" = ( /obj/structure/table/rack, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, +/obj/item/extinguisher/mini, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "aW" = ( @@ -377,11 +377,11 @@ /area/centcom/command) "bb" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, +/obj/item/rig/ert/assetprotection, /obj/item/clothing/glasses/thermal, /obj/item/clothing/glasses/thermal, /obj/item/clothing/glasses/thermal, @@ -391,43 +391,43 @@ /area/centcom/specops) "bc" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/pill_bottle/blood_regen, -/obj/item/weapon/storage/pill_bottle/blood_regen, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, +/obj/item/storage/pill_bottle/blood_regen, +/obj/item/storage/pill_bottle/blood_regen, +/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "bd" = ( /obj/structure/closet/crate/medical, /obj/item/stack/nanopaste/advanced, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/surgical, /obj/item/clothing/mask/surgical, /obj/item/stack/nanopaste/advanced, /obj/item/stack/nanopaste/advanced, -/obj/item/weapon/storage/firstaid/surgery, +/obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "be" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, +/obj/item/reagent_containers/hypospray, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "bf" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/clotting, -/obj/item/weapon/storage/firstaid/bonemed, -/obj/item/weapon/storage/pill_bottle/sleevingcure/full, +/obj/item/storage/firstaid/clotting, +/obj/item/storage/firstaid/bonemed, +/obj/item/storage/pill_bottle/sleevingcure/full, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "bg" = ( /obj/machinery/chemical_dispenser/ert, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /obj/structure/table/reinforced, /turf/simulated/floor/tiled/dark, /area/centcom/specops) @@ -436,8 +436,8 @@ /area/centcom/living) "bi" = ( /obj/structure/table/rack, -/obj/item/device/defib_kit/compact/combat/loaded, -/obj/item/device/defib_kit/compact/combat/loaded, +/obj/item/defib_kit/compact/combat/loaded, +/obj/item/defib_kit/compact/combat/loaded, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "bj" = ( @@ -629,20 +629,20 @@ /area/shuttle/centcom/ccbay) "bJ" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/pillbottles, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/autoinjectors, +/obj/item/storage/box/pillbottles, +/obj/item/storage/box/gloves, +/obj/item/storage/box/beakers, +/obj/item/storage/box/autoinjectors, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "bK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "bL" = ( @@ -663,11 +663,11 @@ /area/centcom/specops) "bM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "bP" = ( @@ -686,9 +686,9 @@ /area/centcom/specops) "bT" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, +/obj/item/rig/ert/medical, +/obj/item/rig/ert/medical, +/obj/item/rig/ert/medical, /obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/accessory/storage/white_vest, @@ -733,7 +733,7 @@ "ca" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/projectile/automatic/advanced_smg, +/obj/item/gun/projectile/automatic/advanced_smg, /obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mmAdvanced, @@ -745,7 +745,7 @@ "cb" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -763,21 +763,21 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "cf" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "ck" = ( @@ -823,8 +823,8 @@ /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -846,18 +846,18 @@ /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/projectile/automatic/sts35, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "cv" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil, -/obj/item/device/t_scanner/advanced, -/obj/item/device/t_scanner/advanced, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/t_scanner/advanced, +/obj/item/t_scanner/advanced, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -868,33 +868,33 @@ }, /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, +/obj/item/gun/energy/taser, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "cE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, -/obj/item/weapon/storage/box/survival/comp{ - starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) +/obj/item/storage/box/survival/comp{ + starts_with = list(/obj/item/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/flashlight/glowstick,/obj/item/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/tank/emergency/oxygen/engi) }, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -972,25 +972,25 @@ /area/centcom/medical) "cL" = ( /obj/structure/table/reinforced, -/obj/item/device/healthanalyzer/phasic, -/obj/item/device/healthanalyzer/phasic, -/obj/item/device/healthanalyzer/phasic, -/obj/item/device/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "cO" = ( /obj/structure/table/rack, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/window/reinforced{ dir = 1 @@ -1004,11 +1004,11 @@ /area/centcom/specops) "cR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "cT" = ( @@ -1019,7 +1019,7 @@ /obj/structure/bed/chair/bay/shuttle{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_x = -32; pixel_y = 24 @@ -1036,19 +1036,19 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, +/obj/item/gun/energy/stunrevolver, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "da" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/storage/box/emps{ +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/flashbangs, +/obj/item/storage/box/emps{ pixel_x = 4; pixel_y = 4 }, @@ -1058,8 +1058,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/storage/box/smokes, -/obj/item/weapon/storage/box/smokes, +/obj/item/storage/box/smokes, +/obj/item/storage/box/smokes, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -1067,55 +1067,55 @@ /area/centcom/specops) "db" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "dc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "dd" = ( /obj/structure/table/reinforced, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -1151,12 +1151,12 @@ /area/centcom) "dl" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -1173,7 +1173,7 @@ /turf/simulated/floor/tiled, /area/shuttle/centcom/ccbay) "dn" = ( -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 2; pixel_y = 6 }, @@ -1186,8 +1186,8 @@ /area/centcom/control) "dr" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/gun/energy/gun/burst, +/obj/item/gun/energy/gun/burst, +/obj/item/gun/energy/gun/burst, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "ds" = ( @@ -1202,82 +1202,82 @@ /area/centcom/specops) "du" = ( /obj/structure/table/rack, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, -/obj/item/weapon/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, +/obj/item/plastique, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dv" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/compact, -/obj/item/weapon/gun/energy/gun/compact, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/gun/energy/gun/compact, +/obj/item/gun/energy/gun/compact, +/obj/item/flash, +/obj/item/flash, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dw" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/grenade, -/obj/item/weapon/gun/launcher/grenade, +/obj/item/gun/launcher/grenade, +/obj/item/gun/launcher/grenade, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dx" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/frags, -/obj/item/weapon/storage/box/frags, -/obj/item/weapon/storage/box/teargas, -/obj/item/weapon/storage/box/teargas, -/obj/item/weapon/storage/box/empslite, -/obj/item/weapon/storage/box/empslite, +/obj/item/storage/box/frags, +/obj/item/storage/box/frags, +/obj/item/storage/box/teargas, +/obj/item/storage/box/teargas, +/obj/item/storage/box/empslite, +/obj/item/storage/box/empslite, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dy" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, +/obj/item/gun/energy/pulse_rifle, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/combat{ +/obj/item/storage/firstaid/combat{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/storage/firstaid/combat, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/emt, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dC" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -1285,8 +1285,8 @@ "dD" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/projectile/revolver/detective45, -/obj/item/weapon/gun/projectile/revolver/detective45, +/obj/item/gun/projectile/revolver/detective45, +/obj/item/gun/projectile/revolver/detective45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, @@ -1314,10 +1314,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/weapon/gun/projectile/p92x, +/obj/item/gun/projectile/p92x, +/obj/item/gun/projectile/p92x, +/obj/item/gun/projectile/p92x, +/obj/item/gun/projectile/p92x, /obj/item/ammo_magazine/m9mm/large/preban, /obj/item/ammo_magazine/m9mm/large/preban, /obj/item/ammo_magazine/m9mm/large/preban, @@ -1332,11 +1332,11 @@ /area/centcom/specops) "dU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dV" = ( @@ -1386,7 +1386,7 @@ /area/centcom/control) "ef" = ( /obj/structure/bed/chair, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -1403,9 +1403,9 @@ /area/centcom/control) "ej" = ( /obj/structure/table/reinforced, -/obj/item/device/megaphone, -/obj/item/weapon/storage/box/trackimp, -/obj/item/weapon/storage/box/cdeathalarm_kit, +/obj/item/megaphone, +/obj/item/storage/box/trackimp, +/obj/item/storage/box/cdeathalarm_kit, /turf/simulated/floor/wood, /area/centcom/specops) "ek" = ( @@ -1416,12 +1416,12 @@ /obj/item/taperoll/police, /obj/item/taperoll/police, /obj/item/taperoll/police, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -1430,7 +1430,7 @@ /obj/structure/table/rack, /obj/item/clothing/suit/armor/vest/ert/command, /obj/item/clothing/head/helmet/ert/command, -/obj/item/weapon/storage/backpack/ert/commander, +/obj/item/storage/backpack/ert/commander, /turf/simulated/floor/wood, /area/centcom/specops) "em" = ( @@ -1438,7 +1438,7 @@ /area/centcom/control) "en" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid, +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid, /turf/simulated/floor/wood, /area/centcom/specops) "ep" = ( @@ -1483,11 +1483,11 @@ /area/centcom/specops) "ex" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "ey" = ( @@ -1519,10 +1519,10 @@ /obj/item/clothing/head/helmet/ert/medical, /obj/item/clothing/head/helmet/ert/medical, /obj/item/clothing/head/helmet/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, +/obj/item/storage/backpack/ert/medical, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "eH" = ( @@ -1566,9 +1566,9 @@ /area/tdome/tdomeobserve) "eR" = ( /obj/structure/table/reinforced, -/obj/item/device/aicard, -/obj/item/weapon/pinpointer/advpinpointer, -/obj/item/weapon/stamp/centcomm, +/obj/item/aicard, +/obj/item/pinpointer/advpinpointer, +/obj/item/stamp/centcomm, /turf/simulated/floor/wood, /area/centcom/specops) "eS" = ( @@ -1583,7 +1583,7 @@ /obj/item/clothing/accessory/holster/hip, /obj/item/ammo_magazine/m44, /obj/item/ammo_magazine/m44, -/obj/item/weapon/gun/projectile/deagle, +/obj/item/gun/projectile/deagle, /turf/simulated/floor/wood, /area/centcom/specops) "eU" = ( @@ -1595,9 +1595,9 @@ /area/centcom/specops) "eV" = ( /obj/structure/table/reinforced, -/obj/item/device/pda/ert, -/obj/item/device/perfect_tele, -/obj/item/weapon/hand_tele, +/obj/item/pda/ert, +/obj/item/perfect_tele, +/obj/item/hand_tele, /turf/simulated/floor/wood, /area/centcom/specops) "eX" = ( @@ -1618,7 +1618,7 @@ name = "\improper CentCom Residential Security" }) "eZ" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/corner/blue/diagonal{ dir = 4 @@ -1642,12 +1642,12 @@ /area/centcom) "fj" = ( /obj/structure/table/reinforced, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, -/obj/item/device/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, +/obj/item/pda/ert, /obj/effect/floor_decal/corner/blue{ dir = 5 }, @@ -1688,12 +1688,12 @@ /area/centcom/control) "fs" = ( /obj/structure/table/reinforced, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, -/obj/item/device/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, +/obj/item/megaphone, /obj/effect/floor_decal/corner/blue{ dir = 5 }, @@ -1783,25 +1783,25 @@ /area/centcom/specops) "fJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/handcuffs, -/obj/item/device/flash, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/storage/box/flashbangs, +/obj/item/handcuffs, +/obj/item/flash, +/obj/item/melee/baton/loaded, +/obj/item/storage/belt/security/tactical, +/obj/item/gun/energy/stunrevolver, /obj/item/clothing/glasses/sunglasses/sechud/tactical, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/material/knife/tacknife/combatknife, /turf/simulated/floor/wood, /area/centcom/specops) "fL" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert, +/obj/item/rig/ert, /obj/item/clothing/accessory/storage/black_vest, /turf/simulated/floor/wood, /area/centcom/specops) "fM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, /turf/simulated/floor/wood, /area/centcom/specops) "fP" = ( @@ -1813,8 +1813,8 @@ /area/centcom/main_hall) "fR" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid_combat, -/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid_combat, +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid_combat, +/obj/item/storage/secure/briefcase/nsfw_pack_hybrid_combat, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "fS" = ( @@ -1824,17 +1824,17 @@ }, /area/centcom/specops) "fT" = ( -/obj/item/weapon/circuitboard/aiupload, -/obj/item/weapon/circuitboard/borgupload, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/aiModule/nanotrasen, -/obj/item/weapon/aiModule/reset, -/obj/item/weapon/aiModule/freeformcore, -/obj/item/weapon/aiModule/protectStation, -/obj/item/weapon/aiModule/quarantine, -/obj/item/weapon/aiModule/paladin, -/obj/item/weapon/aiModule/robocop, -/obj/item/weapon/aiModule/safeguard, +/obj/item/circuitboard/aiupload, +/obj/item/circuitboard/borgupload, +/obj/item/circuitboard/smes, +/obj/item/aiModule/nanotrasen, +/obj/item/aiModule/reset, +/obj/item/aiModule/freeformcore, +/obj/item/aiModule/protectStation, +/obj/item/aiModule/quarantine, +/obj/item/aiModule/paladin, +/obj/item/aiModule/robocop, +/obj/item/aiModule/safeguard, /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -1856,12 +1856,12 @@ /obj/item/clothing/glasses/welding/superior, /obj/structure/table/steel_reinforced, /obj/item/clothing/glasses/welding/superior, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -1891,11 +1891,11 @@ /area/centcom/specops) "ga" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "gb" = ( @@ -1926,31 +1926,31 @@ /obj/item/clothing/head/helmet/ert/security, /obj/item/clothing/head/helmet/ert/security, /obj/item/clothing/head/helmet/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, +/obj/item/storage/backpack/ert/security, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "gd" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, +/obj/item/rig/ert/security, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "ge" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stamp/centcomm, -/obj/item/weapon/pen, -/obj/item/weapon/paper_bin{ +/obj/item/stamp/centcomm, +/obj/item/pen, +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -1978,7 +1978,7 @@ /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, /turf/simulated/floor/wood, /area/centcom/specops) @@ -2041,12 +2041,12 @@ /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2123,19 +2123,19 @@ /obj/item/stack/material/glass/reinforced{ amount = 50 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 3 }, @@ -2157,8 +2157,8 @@ /area/centcom/holding) "gC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/device/taperecorder, +/obj/item/book/manual/security_space_law, +/obj/item/taperecorder, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled/dark, @@ -2171,8 +2171,8 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/tdome/green, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/energy/sword/green, +/obj/item/melee/baton/loaded, +/obj/item/melee/energy/sword/green, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "gR" = ( @@ -2194,13 +2194,13 @@ /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/effect/floor_decal/industrial/outline/blue, -/obj/item/weapon/storage/box/traumainjectors, +/obj/item/storage/box/traumainjectors, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "gV" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 1; dir = 1; frequency = 1443; @@ -2279,18 +2279,18 @@ "hl" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/industrial/outline/blue, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2319,10 +2319,10 @@ /area/centcom/control) "hq" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/compact, -/obj/item/weapon/gun/energy/gun/compact, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/gun/energy/gun/compact, +/obj/item/gun/energy/gun/compact, +/obj/item/flash, +/obj/item/flash, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2398,7 +2398,7 @@ }, /area/centcom/specops) "hE" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/centcom/specops) "hF" = ( @@ -2426,7 +2426,7 @@ }, /area/centcom/specops) "hH" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "CentCom"; tele_network = "centcom" }, @@ -2560,7 +2560,7 @@ }, /area/centcom/control) "il" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/corner/blue/diagonal{ dir = 4 @@ -2610,19 +2610,19 @@ /obj/item/clothing/head/helmet/ert/engineer, /obj/item/clothing/head/helmet/ert/engineer, /obj/item/clothing/head/helmet/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, +/obj/item/storage/backpack/ert/engineer, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/control) "is" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer, +/obj/item/rig/ert/engineer, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2665,24 +2665,24 @@ /area/centcom/control) "iy" = ( /obj/structure/table/reinforced, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, -/obj/item/weapon/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, +/obj/item/cell/hyper, /turf/simulated/floor/tiled{ icon_state = "dark" }, /area/centcom/specops) "iz" = ( -/obj/item/weapon/gun/energy/sizegun, +/obj/item/gun/energy/sizegun, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2725,7 +2725,7 @@ /turf/simulated/floor/tiled/white, /area/centcom/control) "iL" = ( -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2812,24 +2812,24 @@ /area/centcom/control) "ja" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2848,9 +2848,9 @@ /area/tdome/tdomeobserve) "jd" = ( /obj/structure/table/reinforced, -/obj/item/device/binoculars, -/obj/item/device/survivalcapsule, -/obj/item/device/survivalcapsule, +/obj/item/binoculars, +/obj/item/survivalcapsule, +/obj/item/survivalcapsule, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -2901,15 +2901,15 @@ /area/centcom/control) "jo" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 8; pixel_y = 6 }, -/obj/item/weapon/storage/box/chemimp{ +/obj/item/storage/box/chemimp{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/storage/box/trackimp, +/obj/item/storage/box/trackimp, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -2935,7 +2935,7 @@ /area/centcom/control) "ju" = ( /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/simulated/floor/tiled/white, /area/centcom/control) "jw" = ( @@ -2944,9 +2944,9 @@ /turf/simulated/floor/plating, /area/centcom/terminal) "jx" = ( -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, /obj/structure/table/standard, /turf/unsimulated/floor/steel, /area/tdome/tdomeobserve) @@ -2992,8 +2992,8 @@ /area/tdome/tdomeadmin) "jJ" = ( /obj/structure/table/reinforced, -/obj/item/device/camera, -/obj/item/weapon/storage/box/ids, +/obj/item/camera, +/obj/item/storage/box/ids, /obj/effect/floor_decal/borderfloorblack{ dir = 6 }, @@ -3084,7 +3084,7 @@ /turf/simulated/floor/tiled, /area/centcom/control) "kh" = ( -/obj/item/weapon/melee/baton/cattleprod, +/obj/item/melee/baton/cattleprod, /turf/simulated/floor/tiled{ icon_state = "dark" }, @@ -3130,13 +3130,13 @@ /turf/simulated/floor/tiled, /area/centcom/control) "kp" = ( -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/structure/table/standard, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/reagent_containers/dropper{ +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, +/obj/item/reagent_containers/dropper{ pixel_y = -4 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -3155,11 +3155,11 @@ /area/centcom/specops) "kr" = ( /obj/structure/table/standard, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -3200,7 +3200,7 @@ req_access = list(101) }, /obj/structure/table/reinforced, -/obj/item/device/pda/captain, +/obj/item/pda/captain, /turf/simulated/floor/tiled, /area/centcom/control) "kC" = ( @@ -3251,7 +3251,7 @@ /obj/structure/reagent_dispensers/acid{ pixel_y = -30 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -3278,12 +3278,12 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -3302,15 +3302,15 @@ /area/centcom/specops) "kP" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = 3; pixel_y = 5 }, @@ -3358,19 +3358,19 @@ base_turf = /turf/simulated/floor/tiled/techfloor/grid }) "lb" = ( -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -3402,14 +3402,14 @@ /area/centcom/specops) "lf" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled{ icon_state = "dark" @@ -3423,7 +3423,7 @@ /turf/simulated/floor/tiled/dark, /area/centcom/security) "lh" = ( -/obj/item/device/camera, +/obj/item/camera, /turf/unsimulated/floor/steel, /area/tdome/tdomeobserve) "li" = ( @@ -3480,7 +3480,7 @@ "lw" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/device/flash, +/obj/item/flash, /turf/simulated/floor/tiled, /area/centcom/control) "ly" = ( @@ -3510,7 +3510,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 27 @@ -3635,14 +3635,14 @@ /obj/structure/table/rack, /obj/item/clothing/under/color/red, /obj/item/clothing/shoes/brown, -/obj/item/weapon/melee/energy/axe, +/obj/item/melee/energy/axe, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "mg" = ( /obj/structure/table/rack, /obj/item/clothing/under/color/green, /obj/item/clothing/shoes/brown, -/obj/item/weapon/melee/energy/axe, +/obj/item/melee/energy/axe, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "mh" = ( @@ -3669,11 +3669,11 @@ /area/centcom/control) "mk" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/control) "ml" = ( @@ -3710,39 +3710,39 @@ /area/centcom/control) "mu" = ( /obj/structure/closet/wardrobe/robotics_black, -/obj/item/device/radio/headset/headset_sci{ +/obj/item/radio/headset/headset_sci{ pixel_x = -3 }, /turf/simulated/floor/tiled, /area/centcom/control) "mw" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, @@ -3812,7 +3812,7 @@ /area/centcom/control) "mP" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/clothing/gloves/sterile/latex, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -3838,8 +3838,8 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/tdome/red, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/energy/sword/red, +/obj/item/melee/baton/loaded, +/obj/item/melee/energy/sword/red, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "mT" = ( @@ -3900,10 +3900,10 @@ /area/centcom/control) "nf" = ( /obj/structure/table/standard, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/pen, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/hand_labeler, +/obj/item/pen, +/obj/item/packageWrap, +/obj/item/packageWrap, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -3934,11 +3934,11 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -3978,12 +3978,12 @@ /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/ccboat) "nB" = ( -/obj/item/weapon/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, /obj/structure/table/standard, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, /obj/machinery/recharger, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -4094,10 +4094,10 @@ /area/centcom/security) "oh" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/toxin, /turf/simulated/shuttle/floor/white, /area/centcom/terminal/shuttlefluff) "oj" = ( @@ -4150,8 +4150,8 @@ dir = 1 }, /obj/machinery/camera/network/crescent, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/centcom/medical) "oo" = ( @@ -4192,7 +4192,7 @@ /area/centcom/medical) "os" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = -1; pixel_y = -2 }, @@ -4308,7 +4308,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/item/weapon/book/manual/robotics_cyborgs{ +/obj/item/book/manual/robotics_cyborgs{ pixel_x = 2; pixel_y = 5 }, @@ -4370,7 +4370,7 @@ /obj/item/modular_computer/console/preset/command{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 1; dir = 4; frequency = 1443; @@ -4535,7 +4535,7 @@ /area/centcom/terminal/shuttlefluff) "qf" = ( /obj/structure/table/standard, -/obj/item/device/mmi, +/obj/item/mmi, /turf/simulated/floor/tiled, /area/centcom/control) "qg" = ( @@ -4573,7 +4573,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/blue_captain, +/obj/item/folder/blue_captain, /turf/simulated/floor/carpet, /area/centcom/command) "qq" = ( @@ -4654,11 +4654,11 @@ /area/centcom/terminal) "qR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/button/remote/blast_door{ id = "TelelockdownC"; name = "Teleporter Entrance Lockdown"; @@ -4756,10 +4756,10 @@ }) "ri" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 5 }, -/obj/item/weapon/pen/multi, +/obj/item/pen/multi, /turf/simulated/floor/tiled, /area/centcom/control) "rj" = ( @@ -4773,15 +4773,15 @@ dir = 4 }, /obj/structure/table/marble, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/book/manual/chef_recipes, +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/material/knife/butch, +/obj/item/material/kitchen/rollingpin, +/obj/item/material/knife/butch, /turf/simulated/floor/tiled/white, /area/centcom/control) "rm" = ( @@ -4830,12 +4830,12 @@ /area/centcom/terminal/shuttlefluff) "rZ" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw, -/obj/item/weapon/surgical/scalpel{ +/obj/item/surgical/circular_saw, +/obj/item/surgical/scalpel{ pixel_y = 12 }, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/hemostat, +/obj/item/surgical/retractor, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -5039,11 +5039,11 @@ /area/centcom/bathroom) "sW" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/projectile/automatic/pdw, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -5188,14 +5188,14 @@ pixel_x = -32; req_access = list(29) }, -/obj/item/weapon/tank/anesthetic, -/obj/item/weapon/tank/anesthetic, -/obj/item/weapon/tank/anesthetic, +/obj/item/tank/anesthetic, +/obj/item/tank/anesthetic, +/obj/item/tank/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/breath/medical, -/obj/item/weapon/storage/box/gloves, -/obj/item/device/defib_kit/jumper_kit, +/obj/item/storage/box/gloves, +/obj/item/defib_kit/jumper_kit, /turf/simulated/floor/tiled{ icon_state = "white" }, @@ -5350,7 +5350,7 @@ "vb" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/projectile/automatic/l6_saw, +/obj/item/gun/projectile/automatic/l6_saw, /turf/simulated/floor/tiled/dark, /area/centcom/security) "vc" = ( @@ -5390,8 +5390,8 @@ /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/melee/baton/loaded, +/obj/item/shield/riot, +/obj/item/melee/baton/loaded, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -5543,11 +5543,11 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/button/remote/blast_door{ id = "FrontlockC"; name = "Colony Entrance Lockdown"; @@ -5584,23 +5584,23 @@ /obj/item/clothing/shoes/boots/tactical, /obj/item/clothing/suit/armor/tactical, /obj/item/clothing/under/tactical, -/obj/item/weapon/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, /obj/structure/closet{ desc = "It's a storage unit for standard-issue attire."; name = "tactical equipment" }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/satchel/sec, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/satchel/sec, /turf/simulated/floor/tiled/dark, /area/centcom/security) "wg" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, +/obj/item/storage/backpack/dufflebag/syndie/ammo, /turf/simulated/floor/tiled/dark, /area/centcom/security) "wi" = ( @@ -5609,7 +5609,7 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet/swat, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "wk" = ( @@ -5618,7 +5618,7 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet/swat, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/unsimulated/floor/techfloor_grid, /area/tdome/tdome1) "wm" = ( @@ -5706,21 +5706,21 @@ /area/centcom) "wP" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburger{ +/obj/item/reagent_containers/food/snacks/cheeseburger{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/snacks/cheeseburger, +/obj/item/reagent_containers/food/snacks/cheeseburger, /turf/simulated/floor/wood, /area/centcom/restaurant) "wT" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -5775,7 +5775,7 @@ "xc" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/projectile/heavysniper, +/obj/item/gun/projectile/heavysniper, /turf/simulated/floor/tiled/dark, /area/centcom/security) "xe" = ( @@ -5874,8 +5874,8 @@ "xz" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/weapon/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, +/obj/item/gun/projectile/automatic/z8, /turf/simulated/floor/tiled/dark, /area/centcom/security) "xE" = ( @@ -5937,7 +5937,7 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/command) "xQ" = ( @@ -5961,8 +5961,8 @@ /area/centcom/restaurant) "xS" = ( /obj/structure/table/standard, -/obj/item/device/mmi/digital/posibrain, -/obj/item/device/robotanalyzer, +/obj/item/mmi/digital/posibrain, +/obj/item/robotanalyzer, /turf/simulated/floor/tiled, /area/centcom/control) "xU" = ( @@ -5983,7 +5983,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -6031,7 +6031,7 @@ "yj" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, /turf/simulated/floor/tiled/dark, /area/centcom/security) "yu" = ( @@ -6064,15 +6064,15 @@ /area/centcom/terminal) "yB" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/fries, +/obj/item/reagent_containers/food/snacks/fries, /turf/simulated/floor/wood, /area/centcom/restaurant) "yC" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, +/obj/item/gun/energy/gun, /turf/simulated/floor/tiled/dark, /area/centcom/security) "yD" = ( @@ -6140,25 +6140,25 @@ /area/centcom/medical) "yU" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 4 }, @@ -6172,7 +6172,7 @@ /area/centcom/restaurant) "yX" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -6297,11 +6297,11 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/scanning_module{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, /obj/machinery/light{ dir = 4 }, @@ -6351,21 +6351,21 @@ /area/centcom) "Ab" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, -/obj/item/weapon/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, +/obj/item/gun/projectile/shotgun/pump/USDF, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Ac" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/projectile/automatic/wt550/lethal, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/dark, @@ -6410,7 +6410,7 @@ dir = 1 }, /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled/dark, /area/centcom/command) "Ai" = ( @@ -6486,20 +6486,20 @@ /area/centcom/security) "AF" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/flame/lighter/zippo, +/obj/item/storage/fancy/cigarettes, /turf/unsimulated/floor/steel, /area/tdome/tdomeobserve) "AG" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /turf/simulated/floor/carpet, /area/centcom/control) "AH" = ( -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, /obj/structure/table/standard, /obj/effect/floor_decal/corner/yellow/diagonal, /obj/effect/floor_decal/corner/blue/diagonal{ @@ -6518,11 +6518,11 @@ /area/centcom/medical) "AJ" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/blue, +/obj/item/pen/blue, /turf/simulated/floor/tiled, /area/centcom/control) "AK" = ( @@ -6632,11 +6632,11 @@ }) "BR" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/shotgun/pump, -/obj/item/weapon/gun/projectile/shotgun/pump, -/obj/item/weapon/gun/projectile/shotgun/pump, -/obj/item/weapon/gun/projectile/shotgun/pump, -/obj/item/weapon/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/projectile/shotgun/pump, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -6700,7 +6700,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -6812,7 +6812,7 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, @@ -6849,11 +6849,11 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, @@ -6899,7 +6899,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/carpet, /area/centcom/command) "Ds" = ( @@ -7019,7 +7019,7 @@ /turf/simulated/floor/tiled/white, /area/centcom/medical) "DF" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled/white, @@ -7080,11 +7080,11 @@ /turf/simulated/floor/tiled, /area/centcom/control) "DL" = ( -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /obj/structure/table/glass, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -7096,11 +7096,11 @@ /area/centcom/medical) "DO" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/projectile/automatic/bullpup, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -7155,7 +7155,7 @@ /area/centcom/security) "DU" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 10; pixel_y = 12 }, @@ -7220,7 +7220,7 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Ef" = ( @@ -7237,7 +7237,7 @@ "Eg" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/green/border, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/tiled/white, @@ -7251,18 +7251,18 @@ /area/centcom/control) "Ei" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/green/border, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Ek" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -7415,11 +7415,11 @@ /area/centcom/medical) "EM" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/battlerifle, -/obj/item/weapon/gun/projectile/automatic/battlerifle, -/obj/item/weapon/gun/projectile/automatic/battlerifle, -/obj/item/weapon/gun/projectile/automatic/battlerifle, -/obj/item/weapon/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/projectile/automatic/battlerifle, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -7429,12 +7429,12 @@ /area/centcom/terminal) "EQ" = ( /obj/structure/table/standard, -/obj/item/device/taperecorder, -/obj/item/device/megaphone, -/obj/item/weapon/packageWrap, -/obj/item/weapon/storage/box, -/obj/item/weapon/hand_labeler, -/obj/item/device/universal_translator, +/obj/item/taperecorder, +/obj/item/megaphone, +/obj/item/packageWrap, +/obj/item/storage/box, +/obj/item/hand_labeler, +/obj/item/universal_translator, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -7463,12 +7463,12 @@ dir = 4 }, /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/red_hos, -/obj/item/weapon/pen/multi, +/obj/item/folder/red_hos, +/obj/item/pen/multi, /turf/simulated/floor/tiled/dark, /area/centcom/command) "EV" = ( @@ -7541,8 +7541,8 @@ /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/melee/baton/loaded, +/obj/item/shield/riot, +/obj/item/melee/baton/loaded, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -7612,7 +7612,7 @@ /area/centcom/medical) "Fv" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/meatballsoup, +/obj/item/reagent_containers/food/snacks/meatballsoup, /turf/simulated/floor/wood, /area/centcom/restaurant) "Fy" = ( @@ -7625,8 +7625,8 @@ /area/centcom/medical) "Fz" = ( /obj/structure/table/reinforced, -/obj/item/device/camera, -/obj/item/weapon/storage/box/ids, +/obj/item/camera, +/obj/item/storage/box/ids, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, @@ -7645,16 +7645,16 @@ }) "FC" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -7783,7 +7783,7 @@ /area/centcom/bathroom) "FW" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled, /area/centcom/security) "FX" = ( @@ -7924,16 +7924,16 @@ /area/centcom/command) "Gq" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = -6 }, -/obj/item/device/camera{ +/obj/item/camera{ name = "Autopsy Camera"; pixel_x = -2; pixel_y = 7 }, -/obj/item/weapon/pen/red, -/obj/item/weapon/pen/blue{ +/obj/item/pen/red, +/obj/item/pen/blue{ pixel_x = 3; pixel_y = -5 }, @@ -7953,41 +7953,41 @@ "Gs" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, @@ -8161,8 +8161,8 @@ /area/centcom) "GX" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/surgical/cautery, +/obj/item/surgical/hemostat, +/obj/item/surgical/cautery, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -8195,7 +8195,7 @@ "Hc" = ( /obj/structure/table/standard, /obj/item/stack/medical/advanced/bruise_pack, -/obj/item/weapon/surgical/retractor, +/obj/item/surgical/retractor, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -8223,10 +8223,10 @@ /area/centcom/terminal) "Hg" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/circular_saw{ +/obj/item/surgical/circular_saw{ pixel_y = 8 }, -/obj/item/weapon/surgical/scalpel, +/obj/item/surgical/scalpel, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -8270,15 +8270,15 @@ /area/tdome/tdomeadmin) "Hp" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/surgical/surgicaldrill, +/obj/item/autopsy_scanner, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/surgical/FixOVein, +/obj/item/surgical/FixOVein, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -8480,7 +8480,7 @@ "HL" = ( /obj/structure/table/standard, /obj/machinery/chemical_dispenser/bar_soft/full, -/obj/item/weapon/storage/box/glasses/square, +/obj/item/storage/box/glasses/square, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -8497,19 +8497,19 @@ /area/centcom/main_hall) "HN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /turf/simulated/floor/tiled/dark, /area/centcom/security) "HO" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/device/radio/intercom{ +/obj/item/reagent_containers/spray/cleaner, +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 27 }, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -8547,8 +8547,8 @@ /area/shuttle/ccboat) "HV" = ( /obj/structure/table/standard, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/bonegel, +/obj/item/surgical/bonesetter, +/obj/item/surgical/bonegel, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -8670,11 +8670,11 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OPlus{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OMinus{ +/obj/item/reagent_containers/blood/OMinus{ pixel_x = -5; pixel_y = -1 }, @@ -8702,7 +8702,7 @@ /obj/effect/floor_decal/corner/blue/bordercorner2{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -8817,7 +8817,7 @@ /area/centcom/security) "IC" = ( /obj/structure/table/woodentable, -/obj/item/weapon/stamp/hos, +/obj/item/stamp/hos, /turf/simulated/floor/tiled/dark, /area/centcom/command) "IE" = ( @@ -8841,7 +8841,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/red_hos, +/obj/item/folder/red_hos, /turf/simulated/floor/carpet, /area/centcom/command) "IH" = ( @@ -8851,7 +8851,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 4 }, @@ -8861,7 +8861,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/device/megaphone, +/obj/item/megaphone, /turf/simulated/floor/carpet, /area/centcom/command) "IM" = ( @@ -8872,14 +8872,14 @@ /obj/item/clothing/shoes/boots/tactical, /obj/item/clothing/suit/armor/tactical, /obj/item/clothing/under/tactical, -/obj/item/weapon/storage/belt/security/tactical, +/obj/item/storage/belt/security/tactical, /obj/structure/closet{ desc = "It's a storage unit for standard-issue attire."; name = "tactical equipment" }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, -/obj/item/weapon/storage/backpack/satchel/sec, +/obj/item/storage/backpack/dufflebag/syndie/med, +/obj/item/storage/backpack/satchel/sec, /turf/simulated/floor/tiled/dark, /area/centcom/security) "IN" = ( @@ -8980,8 +8980,8 @@ "Ja" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/gun/energy/gun/burst, +/obj/item/gun/energy/gun/burst, +/obj/item/gun/energy/gun/burst, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Jb" = ( @@ -9002,13 +9002,13 @@ "Jd" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/lasercannon, -/obj/item/weapon/gun/energy/lasercannon, +/obj/item/gun/energy/lasercannon, +/obj/item/gun/energy/lasercannon, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Je" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, @@ -9067,8 +9067,8 @@ /area/centcom/security) "Jm" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, @@ -9086,11 +9086,11 @@ dir = 1; pixel_y = -16 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/command) "Jp" = ( @@ -9107,8 +9107,8 @@ dir = 8 }, /obj/machinery/computer/transhuman/resleeving, -/obj/item/weapon/book/manual/resleeving, -/obj/item/weapon/storage/box/backup_kit, +/obj/item/book/manual/resleeving, +/obj/item/storage/box/backup_kit, /turf/simulated/floor/tiled, /area/centcom/control) "Jr" = ( @@ -9121,7 +9121,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/white_cmo, +/obj/item/folder/white_cmo, /turf/simulated/floor/carpet, /area/centcom/command) "Jt" = ( @@ -9143,7 +9143,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -2; pixel_y = 2 }, @@ -9153,14 +9153,14 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/white_rd, +/obj/item/folder/white_rd, /turf/simulated/floor/carpet, /area/centcom/command) "Jx" = ( /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, /turf/simulated/floor/carpet, @@ -9175,7 +9175,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/yellow_ce, +/obj/item/folder/yellow_ce, /turf/simulated/floor/carpet, /area/centcom/command) "JD" = ( @@ -9293,7 +9293,7 @@ /area/centcom/security) "JN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red_hos, +/obj/item/folder/red_hos, /turf/simulated/floor/tiled, /area/centcom/security) "JO" = ( @@ -9329,59 +9329,59 @@ /obj/structure/closet{ name = "robotics parts" }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /turf/simulated/floor/tiled, @@ -9443,9 +9443,9 @@ /area/centcom/main_hall) "Kg" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled/dark, @@ -9465,15 +9465,15 @@ dir = 4 }, /obj/structure/table/marble, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/book/manual/chef_recipes, +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/material/kitchen/rollingpin, -/obj/item/weapon/material/knife/butch, +/obj/item/material/kitchen/rollingpin, +/obj/item/material/knife/butch, /turf/simulated/floor/tiled/white, /area/centcom/bar) "Kj" = ( @@ -9554,7 +9554,7 @@ base_turf = /turf/simulated/floor/tiled/techfloor/grid }) "Kp" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -9603,12 +9603,12 @@ /turf/simulated/floor/tiled, /area/centcom/holding) "Kt" = ( -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/storage/box/beakers, +/obj/item/reagent_containers/dropper, /obj/structure/table/glass, /obj/structure/reagent_dispensers/virusfood{ pixel_y = 28 @@ -9668,8 +9668,8 @@ /area/centcom/security) "KD" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 }, @@ -9687,8 +9687,8 @@ /area/centcom/control) "KG" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, @@ -9787,32 +9787,32 @@ /area/centcom/command) "KV" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, @@ -9825,25 +9825,25 @@ /area/centcom/command) "KX" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = -8; pixel_y = 4 }, @@ -9851,12 +9851,12 @@ /area/centcom/command) "KY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/card/id/gold/captain/spare, +/obj/item/card/id/gold/captain/spare, /turf/simulated/floor/tiled, /area/centcom/control) "KZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -9912,7 +9912,7 @@ /area/centcom/holding) "Lj" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/item/stack/medical/bruise_pack{ pixel_x = -4; pixel_y = 3 @@ -9938,7 +9938,7 @@ /turf/simulated/floor/tiled, /area/centcom/terminal) "Ll" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled, /area/centcom/security) "Lm" = ( @@ -9967,12 +9967,12 @@ /area/centcom/security) "Lo" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/syringe/inaprovaline, -/obj/item/weapon/reagent_containers/syringe/inaprovaline{ +/obj/item/reagent_containers/syringe/inaprovaline, +/obj/item/reagent_containers/syringe/inaprovaline{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe/inaprovaline{ +/obj/item/reagent_containers/syringe/inaprovaline{ pixel_y = 10 }, /obj/effect/floor_decal/borderfloor, @@ -9991,7 +9991,7 @@ /obj/item/bodybag/cryobag{ pixel_x = 6 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 5; pixel_y = 5 }, @@ -10005,9 +10005,9 @@ /obj/structure/table/rack{ dir = 4 }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, @@ -10039,7 +10039,7 @@ /area/centcom/restaurant) "Lw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /turf/simulated/floor/tiled, /area/centcom/security) "Lx" = ( @@ -10104,7 +10104,7 @@ "LE" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/book/codex, +/obj/item/book/codex, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 26 @@ -10327,7 +10327,7 @@ /area/centcom/medical) "Me" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 3 }, @@ -10345,11 +10345,11 @@ dir = 8; pixel_x = 16 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/command) "Ml" = ( @@ -10393,7 +10393,7 @@ /area/centcom/security) "Mr" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/grilledcheese, +/obj/item/reagent_containers/food/snacks/grilledcheese, /turf/simulated/floor/wood, /area/centcom/restaurant) "Ms" = ( @@ -10549,18 +10549,18 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = -8 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = 8 }, -/obj/item/weapon/backup_implanter, +/obj/item/backup_implanter, /turf/simulated/floor/tiled/white, /area/centcom/medical) "MJ" = ( /obj/structure/table/glass, -/obj/item/device/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "MK" = ( @@ -10691,7 +10691,7 @@ /turf/simulated/floor/tiled/freezer, /area/centcom/bathroom) "Ne" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/dark, /area/centcom/medical) "Nf" = ( @@ -10735,7 +10735,7 @@ /area/centcom/bathroom) "Nk" = ( /obj/structure/table/glass, -/obj/item/device/defib_kit/compact/loaded, +/obj/item/defib_kit/compact/loaded, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Nl" = ( @@ -10763,8 +10763,8 @@ /area/centcom/living) "Nm" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/cups, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, +/obj/item/storage/box/cups, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -10807,7 +10807,7 @@ /obj/effect/floor_decal/corner/blue/bordercorner2{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -10847,12 +10847,12 @@ "Nt" = ( /obj/structure/table/standard, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/box/teargas, -/obj/item/weapon/storage/box/teargas, +/obj/item/storage/box/teargas, +/obj/item/storage/box/teargas, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Nw" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/structure/reagent_dispensers/peppertank{ pixel_x = 30 }, @@ -10926,7 +10926,7 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/ids, /turf/simulated/floor/tiled, /area/centcom/command) "NH" = ( @@ -11007,7 +11007,7 @@ /area/centcom/security) "NP" = ( /obj/structure/table/standard, -/obj/item/weapon/soap, +/obj/item/soap, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 }, @@ -11027,7 +11027,7 @@ /turf/simulated/floor/tiled/white, /area/centcom/bathroom) "NS" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -11070,11 +11070,11 @@ /area/centcom/medical) "NW" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/dark, @@ -11128,15 +11128,15 @@ "Od" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, @@ -11232,7 +11232,7 @@ /area/centcom/bathroom) "Oq" = ( /obj/structure/table/reinforced, -/obj/item/device/camera, +/obj/item/camera, /obj/effect/floor_decal/borderfloor{ dir = 10 }, @@ -11264,8 +11264,8 @@ /area/centcom/terminal/shuttlefluff) "Ou" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/gun/energy/taser, +/obj/item/book/manual/security_space_law, +/obj/item/gun/energy/taser, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled, @@ -11289,7 +11289,7 @@ }) "Ow" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/ids, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled, @@ -11345,11 +11345,11 @@ }) "OE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/door/window/brigdoor{ dir = 2 }, @@ -11491,7 +11491,7 @@ /area/centcom/bathroom) "Pf" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/meatsteak, +/obj/item/reagent_containers/food/snacks/meatsteak, /turf/simulated/floor/wood, /area/centcom/restaurant) "Pg" = ( @@ -11576,7 +11576,7 @@ }) "Pq" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/borderfloorblack{ dir = 10 }, @@ -11611,9 +11611,9 @@ /area/shuttle/ccboat) "Pu" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -11626,19 +11626,19 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 8 }, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OPlus{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OPlus{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OPlus{ pixel_x = 4; pixel_y = 2 }, -/obj/item/device/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Pv" = ( @@ -11916,9 +11916,9 @@ /area/centcom/main_hall) "Qa" = ( /obj/structure/table/steel, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/cautery, +/obj/item/autopsy_scanner, +/obj/item/surgical/scalpel, +/obj/item/surgical/cautery, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 @@ -12134,7 +12134,7 @@ /turf/simulated/floor/tiled, /area/centcom) "QD" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled, /area/centcom/bathroom) "QE" = ( @@ -12145,7 +12145,7 @@ /area/centcom) "QF" = ( /obj/structure/table/standard, -/obj/item/weapon/soap, +/obj/item/soap, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -12213,8 +12213,8 @@ /area/centcom/restaurant) "QW" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/flame/lighter/zippo, +/obj/item/storage/fancy/cigarettes, /turf/simulated/floor/carpet, /area/centcom/restaurant) "QX" = ( @@ -12232,8 +12232,8 @@ "QY" = ( /obj/structure/table/rack, /obj/item/clothing/suit/armor/riot, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/shield/riot, +/obj/item/melee/baton/loaded, +/obj/item/shield/riot, /obj/item/clothing/head/helmet/riot, /obj/effect/floor_decal/borderfloorblack{ dir = 9 @@ -12260,8 +12260,8 @@ "Rb" = ( /obj/structure/table/rack, /obj/item/clothing/suit/armor/riot, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/shield/riot, +/obj/item/melee/baton/loaded, +/obj/item/shield/riot, /obj/item/clothing/head/helmet/riot, /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -12288,8 +12288,8 @@ "Rh" = ( /obj/structure/table/rack, /obj/item/clothing/suit/armor/riot, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/shield/riot, +/obj/item/melee/baton/loaded, +/obj/item/shield/riot, /obj/item/clothing/head/helmet/riot, /obj/effect/floor_decal/borderfloorblack{ dir = 5 @@ -12347,7 +12347,7 @@ pixel_y = 30 }, /obj/structure/table/reinforced, -/obj/item/weapon/gun/projectile/shotgun/pump/combat{ +/obj/item/gun/projectile/shotgun/pump/combat{ name = "Discipline" }, /obj/effect/floor_decal/borderfloorblack{ @@ -12364,9 +12364,9 @@ pixel_y = 26 }, /obj/structure/table/reinforced, -/obj/item/weapon/stamp/ward, -/obj/item/weapon/stamp/denied, -/obj/item/device/binoculars, +/obj/item/stamp/ward, +/obj/item/stamp/denied, +/obj/item/binoculars, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -12376,7 +12376,7 @@ /turf/simulated/floor/tiled/dark, /area/centcom/security) "Ro" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -12658,7 +12658,7 @@ /turf/simulated/floor/tiled/white, /area/centcom/control) "RY" = ( -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -6 }, /obj/structure/table/standard, @@ -12713,8 +12713,8 @@ dir = 5 }, /obj/structure/table/reinforced, -/obj/item/device/camera, -/obj/item/weapon/storage/box/ids, +/obj/item/camera, +/obj/item/storage/box/ids, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" @@ -12746,7 +12746,7 @@ /turf/simulated/floor/tiled, /area/centcom/control) "Sj" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/wood, @@ -12755,7 +12755,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; frequency = 1475; name = "Station Intercom (Security)"; @@ -12817,8 +12817,8 @@ dir = 10 }, /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" @@ -12847,7 +12847,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/item/device/healthanalyzer/phasic, +/obj/item/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Sx" = ( @@ -12947,7 +12947,7 @@ "SN" = ( /obj/effect/floor_decal/industrial/outline, /obj/structure/closet/secure_closet/nanotrasen_security, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled/dark, /area/centcom/security) "SO" = ( @@ -13047,7 +13047,7 @@ "SW" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/closet/secure_closet/nanotrasen_warden, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/simulated/floor/tiled/dark, /area/centcom/security) "SX" = ( @@ -13060,8 +13060,8 @@ }) "SZ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/hotdog, -/obj/item/weapon/reagent_containers/food/snacks/hotdog{ +/obj/item/reagent_containers/food/snacks/hotdog, +/obj/item/reagent_containers/food/snacks/hotdog{ pixel_x = -5; pixel_y = -3 }, @@ -13069,7 +13069,7 @@ /area/centcom/restaurant) "Ta" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, +/obj/item/reagent_containers/food/snacks/bigbiteburger, /turf/simulated/floor/wood, /area/centcom/restaurant) "Tb" = ( @@ -13108,7 +13108,7 @@ /area/centcom/command) "Tf" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /obj/machinery/camera/network/crescent{ dir = 4 }, @@ -13149,8 +13149,8 @@ "Tn" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/sniperrifle, -/obj/item/weapon/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, /turf/simulated/floor/tiled/dark, /area/centcom/security) "To" = ( @@ -13159,7 +13159,7 @@ /area/centcom/terminal/shuttlefluff) "Tq" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled, /area/centcom/bathroom) "Tr" = ( @@ -13170,12 +13170,12 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; @@ -13216,8 +13216,8 @@ "Tw" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/gun/energy/netgun, +/obj/item/gun/energy/netgun, +/obj/item/gun/energy/netgun, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Tz" = ( @@ -13280,13 +13280,13 @@ "TJ" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, +/obj/item/shield/riot, /turf/simulated/floor/tiled/dark, /area/centcom/security) "TK" = ( @@ -13297,7 +13297,7 @@ /area/centcom/main_hall) "TL" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /turf/simulated/floor/carpet, /area/centcom/restaurant) "TM" = ( @@ -13513,7 +13513,7 @@ /area/centcom/terminal) "Ui" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/frags, +/obj/item/storage/box/frags, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -13554,8 +13554,8 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" @@ -13588,7 +13588,7 @@ }) "Uq" = ( /obj/structure/table/standard, -/obj/item/weapon/soap, +/obj/item/soap, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 }, @@ -13632,11 +13632,11 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled, /area/centcom/command) @@ -13648,9 +13648,9 @@ dir = 10 }, /obj/structure/table/reinforced, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/gun/energy/taser, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/gun/energy/taser, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" @@ -13675,9 +13675,9 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/blue/border, /obj/structure/closet/secure_closet/nanotrasen_security, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/shield/riot, +/obj/item/storage/box/handcuffs, +/obj/item/gun/energy/gun, +/obj/item/shield/riot, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" @@ -13692,9 +13692,9 @@ dir = 9 }, /obj/structure/closet/secure_closet/nanotrasen_security, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/shield/riot, +/obj/item/storage/box/handcuffs, +/obj/item/gun/energy/gun, +/obj/item/shield/riot, /turf/simulated/floor/tiled/dark, /area/centcom/security{ name = "\improper CentCom Security Arrivals" @@ -13736,8 +13736,8 @@ /turf/simulated/floor/tiled, /area/centcom/terminal) "UG" = ( -/obj/item/weapon/storage/box/evidence, -/obj/item/weapon/folder/red, +/obj/item/storage/box/evidence, +/obj/item/folder/red, /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -13749,17 +13749,17 @@ /area/centcom/security) "UH" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/empslite{ +/obj/item/storage/box/empslite{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/box/empslite, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/empslite, +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, @@ -13767,22 +13767,22 @@ /area/centcom/security) "UJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled/dark, /area/centcom/security) "UK" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/roastbeef, +/obj/item/reagent_containers/food/snacks/roastbeef, /turf/simulated/floor/wood, /area/centcom/restaurant) "UL" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/projectile/automatic/p90, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -13816,12 +13816,12 @@ /area/centcom/restaurant) "UQ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/pastatomato, +/obj/item/reagent_containers/food/snacks/pastatomato, /turf/simulated/floor/wood, /area/centcom/restaurant) "UR" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/meatballspagetti, +/obj/item/reagent_containers/food/snacks/meatballspagetti, /turf/simulated/floor/wood, /area/centcom/restaurant) "US" = ( @@ -13835,7 +13835,7 @@ /turf/simulated/floor/tiled, /area/centcom/terminal) "UW" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/orange/border, /turf/simulated/floor/tiled/dark, @@ -13848,39 +13848,39 @@ /area/centcom/restaurant) "UY" = ( /obj/structure/table/standard, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/hand_labeler, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/simulated/floor/tiled, /area/centcom/control) "UZ" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, @@ -13935,13 +13935,13 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/tool/crowbar, +/obj/item/storage/belt/utility, +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 6 }, @@ -14058,8 +14058,8 @@ }) "Vv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/material/minihoe, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/material/minihoe, +/obj/item/analyzer/plant_analyzer, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -14070,12 +14070,12 @@ /area/centcom/security) "Vx" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/kitsuneudon, +/obj/item/reagent_containers/food/snacks/kitsuneudon, /turf/simulated/floor/wood, /area/centcom/restaurant) "Vy" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/lasagna, +/obj/item/reagent_containers/food/snacks/lasagna, /turf/simulated/floor/wood, /area/centcom/restaurant) "Vz" = ( @@ -14083,7 +14083,7 @@ /turf/simulated/floor/tiled, /area/centcom/restaurant) "VA" = ( -/obj/item/device/camera{ +/obj/item/camera{ desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; @@ -14184,7 +14184,7 @@ /obj/structure/table/woodentable{ dir = 5 }, -/obj/item/weapon/folder/blue_hop, +/obj/item/folder/blue_hop, /turf/simulated/floor/carpet, /area/centcom/command) "VM" = ( @@ -14205,15 +14205,15 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/command) "VP" = ( -/obj/item/device/taperecorder, +/obj/item/taperecorder, /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloorblack{ dir = 10 @@ -14226,11 +14226,11 @@ "VQ" = ( /obj/structure/table/standard, /obj/effect/floor_decal/borderfloor, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/centcom/command) "VR" = ( @@ -14245,24 +14245,24 @@ /obj/structure/reagent_dispensers/peppertank{ pixel_x = 30 }, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 26 @@ -14437,7 +14437,7 @@ /turf/simulated/floor/tiled, /area/centcom/security) "Wl" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/lino, /area/centcom/restaurant) "Wm" = ( @@ -14614,7 +14614,7 @@ /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/paleblue/bordercorner2, /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /turf/simulated/floor/tiled/white, /area/centcom/medical) "WE" = ( @@ -14780,7 +14780,7 @@ req_access = list(63); req_one_access = list(1) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -14789,17 +14789,17 @@ /area/centcom/command) "Xb" = ( /obj/structure/table/rack, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, +/obj/item/shield/energy, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, -/obj/item/weapon/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, +/obj/item/melee/energy/sword/blue, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Xc" = ( @@ -14885,7 +14885,7 @@ /area/centcom) "Xr" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/energy/taser, +/obj/item/gun/energy/taser, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 26 @@ -14895,7 +14895,7 @@ "Xs" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/weapon/gun/energy/xray, +/obj/item/gun/energy/xray, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Xt" = ( @@ -14928,7 +14928,7 @@ /area/centcom/security) "Xx" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine, +/obj/item/reagent_containers/food/drinks/bottle/grenadine, /turf/simulated/floor/lino, /area/centcom/restaurant) "Xy" = ( @@ -14936,7 +14936,7 @@ /area/centcom/command) "Xz" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite{ dir = 6 }, @@ -14959,7 +14959,7 @@ }) "XB" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cola, +/obj/item/reagent_containers/food/drinks/bottle/cola, /turf/simulated/floor/lino, /area/centcom/restaurant) "XD" = ( @@ -14971,12 +14971,12 @@ /area/centcom/security) "XE" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind, +/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind, /turf/simulated/floor/lino, /area/centcom/restaurant) "XF" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich{ +/obj/item/reagent_containers/food/snacks/toastedsandwich{ pixel_y = 10 }, /turf/simulated/floor/lino, @@ -14989,8 +14989,8 @@ dir = 1 }, /obj/structure/table/woodentable, -/obj/item/device/radio/off, -/obj/item/device/megaphone, +/obj/item/radio/off, +/obj/item/megaphone, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/dark, /area/centcom/command) @@ -15067,8 +15067,8 @@ /area/centcom/security) "XU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, @@ -15079,7 +15079,7 @@ /area/centcom/security) "XV" = ( /obj/structure/table/reinforced, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/tiled/dark, /area/centcom/security) "XW" = ( @@ -15132,7 +15132,7 @@ /area/centcom/terminal) "Yd" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/machinery/camera/network/crescent, /obj/effect/floor_decal/borderfloorblack{ dir = 5 @@ -15205,17 +15205,17 @@ /area/centcom/restaurant) "Ys" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/seccarts{ +/obj/item/storage/box/seccarts{ pixel_x = 3; pixel_y = 2 }, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -15238,7 +15238,7 @@ /area/centcom/living) "Yu" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/borderfloorblack{ dir = 6 }, @@ -15261,11 +15261,11 @@ /area/centcom/security) "Yx" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/projectile/shotgun/pump/combat, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/centcom/security) @@ -15286,7 +15286,7 @@ /area/centcom/main_hall) "Yz" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, @@ -15378,11 +15378,11 @@ dir = 6 }, /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{ +/obj/item/reagent_containers/food/drinks/flask/barflask{ pixel_x = -4; pixel_y = 8 }, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/tiled/dark, /area/centcom/command) "YJ" = ( @@ -15408,7 +15408,7 @@ dir = 6 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/simulated/floor/tiled/white, /area/centcom/medical) "YN" = ( @@ -15524,9 +15524,9 @@ /area/centcom/bathroom) "Zh" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask, -/obj/item/weapon/reagent_containers/glass/rag, -/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, +/obj/item/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/food/drinks/flask/vacuumflask, /turf/simulated/floor/lino, /area/centcom/restaurant) "Zj" = ( @@ -15562,8 +15562,8 @@ /area/centcom/security) "Zp" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/deck/cards, +/obj/item/storage/pill_bottle/dice, +/obj/item/deck/cards, /turf/simulated/floor/tiled/dark, /area/centcom/security) "Zq" = ( @@ -15664,7 +15664,7 @@ /turf/simulated/floor/tiled/dark, /area/centcom/security) "ZG" = ( -/obj/item/weapon/paper{ +/obj/item/paper{ info = "You're not supposed to be here."; name = "unnerving letter" }, @@ -15711,12 +15711,12 @@ /area/centcom/bar) "ZN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/tool/screwdriver, +/obj/item/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/tool/screwdriver, +/obj/item/tool/wrench, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled{ icon_state = "dark" diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm index 539cdee54e8..cc263c9b1ca 100644 --- a/maps/tether/submaps/tether_misc.dmm +++ b/maps/tether/submaps/tether_misc.dmm @@ -751,7 +751,7 @@ /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) "cn" = ( -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /obj/structure/bed/double/padded, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm3) @@ -943,24 +943,24 @@ /area/unknown/dorm5) "cY" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm5) "cZ" = ( @@ -995,24 +995,24 @@ /area/holodeck/source_courtroom) "df" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm6) "dg" = ( @@ -1155,7 +1155,7 @@ /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) "dy" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unkfive" }, @@ -1163,7 +1163,7 @@ /area/unknown/dorm5) "dz" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm5) "dA" = ( @@ -1210,7 +1210,7 @@ /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) "dL" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unksix" }, @@ -1253,7 +1253,7 @@ /area/holodeck/source_thunderdomecourt) "dT" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm6) "dU" = ( @@ -1269,7 +1269,7 @@ /obj/item/clothing/head/helmet/thunderdome, /obj/item/clothing/suit/armor/tdome/red, /obj/item/clothing/under/color/red, -/obj/item/weapon/holo/esword/red, +/obj/item/holo/esword/red, /obj/effect/floor_decal/corner/red{ dir = 5 }, @@ -1497,7 +1497,7 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_meetinghall) "eM" = ( -/obj/item/weapon/beach_ball, +/obj/item/beach_ball, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) "eN" = ( @@ -1594,7 +1594,7 @@ /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) "fa" = ( -/obj/item/weapon/beach_ball/holoball, +/obj/item/beach_ball/holoball, /obj/effect/floor_decal/corner/red{ dir = 10 }, @@ -1607,7 +1607,7 @@ /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) "fc" = ( -/obj/item/weapon/inflatable_duck, +/obj/item/inflatable_duck, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) "fd" = ( @@ -1819,7 +1819,7 @@ /obj/item/clothing/head/helmet/thunderdome, /obj/item/clothing/suit/armor/tdome/green, /obj/item/clothing/under/color/green, -/obj/item/weapon/holo/esword/green, +/obj/item/holo/esword/green, /obj/effect/floor_decal/corner/green{ dir = 10 }, @@ -1994,7 +1994,7 @@ /area/holodeck/holodorm/source_garden) "ho" = ( /obj/structure/table/holotable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, @@ -2238,8 +2238,8 @@ /area/space) "lh" = ( /obj/structure/table/woodentable/holotable, -/obj/item/weapon/dice/d12, -/obj/item/weapon/dice/d10, +/obj/item/dice/d12, +/obj/item/dice/d10, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_game_room) "lu" = ( @@ -2439,7 +2439,7 @@ /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) "rc" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/corner/paleblue{ @@ -2536,8 +2536,8 @@ /area/holodeck/source_chess) "vY" = ( /obj/structure/table/woodentable/holotable, -/obj/item/weapon/dice, -/obj/item/weapon/dice/d4, +/obj/item/dice, +/obj/item/dice/d4, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_game_room) "wa" = ( @@ -2587,7 +2587,7 @@ /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_game_room) "yJ" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/corner/paleblue/full{ @@ -2676,7 +2676,7 @@ /area/holodeck/source_chess) "Dw" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, /turf/unsimulated/beach/sand, /area/beach) "DJ" = ( @@ -2757,7 +2757,7 @@ /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_game_room) "Gy" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/corner/paleblue{ @@ -2804,12 +2804,12 @@ /area/holodeck/source_game_room) "Ik" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, +/obj/item/reagent_containers/food/drinks/cans/cola, /turf/unsimulated/beach/sand, /area/beach) "In" = ( @@ -2822,7 +2822,7 @@ /turf/space/transit/north, /area/space) "IF" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /turf/simulated/floor/holofloor/tiled{ @@ -2939,7 +2939,7 @@ /turf/unsimulated/beach/sand, /area/beach) "No" = ( -/obj/item/weapon/beach_ball, +/obj/item/beach_ball, /turf/unsimulated/beach/sand, /area/beach) "Nt" = ( @@ -2972,8 +2972,8 @@ /area/holodeck/source_patient_ward) "NZ" = ( /obj/structure/table/woodentable/holotable, -/obj/item/weapon/dice/d100, -/obj/item/weapon/dice/d20, +/obj/item/dice/d100, +/obj/item/dice/d20, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_game_room) "Oj" = ( @@ -3120,24 +3120,24 @@ /area/unknown/dorm4) "Sz" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm4) "SA" = ( @@ -3149,7 +3149,7 @@ /turf/simulated/shuttle/floor/alien, /area/unknown/dorm4) "SC" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unkfour" }, @@ -3157,7 +3157,7 @@ /area/unknown/dorm4) "SD" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/hopdouble, +/obj/item/bedsheet/hopdouble, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm4) "SE" = ( @@ -3208,7 +3208,7 @@ /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm4) "SX" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/corner/paleblue/full{ @@ -3261,24 +3261,24 @@ /area/beach) "To" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm3) "Tp" = ( @@ -3290,7 +3290,7 @@ /turf/simulated/shuttle/floor/alien, /area/unknown/dorm3) "Tr" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unkthree" }, @@ -3399,24 +3399,24 @@ /area/unknown/dorm2) "TW" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm2) "TX" = ( @@ -3428,14 +3428,14 @@ /turf/simulated/shuttle/floor/alien, /area/unknown/dorm2) "Ub" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unktwo" }, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm2) "Uc" = ( -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /obj/structure/bed/double/padded, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm2) @@ -3530,24 +3530,24 @@ /area/unknown/dorm1) "UJ" = ( /obj/machinery/smartfridge/survival_pod, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu11, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu13, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu10, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/menu9, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu11, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu13, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu10, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/menu9, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm1) "UK" = ( @@ -3559,14 +3559,14 @@ /turf/simulated/shuttle/floor/alien, /area/unknown/dorm1) "UN" = ( -/obj/item/device/perfect_tele_beacon/stationary{ +/obj/item/perfect_tele_beacon/stationary{ tele_name = "Unknown"; tele_network = "unkone" }, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm1) "UP" = ( -/obj/item/weapon/bedsheet/rddouble, +/obj/item/bedsheet/rddouble, /obj/structure/bed/double/padded, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm1) @@ -3618,7 +3618,7 @@ /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm1) "Vf" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed/padded, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/corner/paleblue{ @@ -3674,7 +3674,7 @@ /area/centcom/simulated/main_hall) "Xs" = ( /obj/structure/table/woodentable/holotable, -/obj/item/weapon/dice/d8, +/obj/item/dice/d8, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_game_room) "XO" = ( diff --git a/maps/tether/submaps/tether_underdark.dmm b/maps/tether/submaps/tether_underdark.dmm index 3f9cab4abbc..eb44fd6c5e3 100644 --- a/maps/tether/submaps/tether_underdark.dmm +++ b/maps/tether/submaps/tether_underdark.dmm @@ -112,7 +112,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "au" = ( -/obj/item/weapon/newspaper{ +/obj/item/newspaper{ pixel_x = 4 }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, @@ -177,7 +177,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "aE" = ( -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "aF" = ( @@ -222,7 +222,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/mine/explored/underdark) "aO" = ( -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/virgo3b, /area/mine/explored/underdark) "aP" = ( @@ -236,11 +236,11 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "aR" = ( -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/mine/explored/underdark) "aS" = ( -/obj/item/weapon/bone, +/obj/item/bone, /turf/simulated/mineral/floor/virgo3b{ ignore_mapgen = 1 }, @@ -267,7 +267,7 @@ }, /area/mine/explored/underdark) "aW" = ( -/obj/item/weapon/bone/skull, +/obj/item/bone/skull, /turf/simulated/mineral/floor/virgo3b{ ignore_mapgen = 1 }, @@ -282,7 +282,7 @@ }, /area/mine/explored/underdark) "aY" = ( -/obj/item/weapon/bone, +/obj/item/bone, /obj/machinery/light/small{ icon_state = "bulb1"; dir = 4 diff --git a/maps/tether/submaps/underdark_pois/abandonded_outpost.dmm b/maps/tether/submaps/underdark_pois/abandonded_outpost.dmm index bdff135e980..265263673a2 100644 --- a/maps/tether/submaps/underdark_pois/abandonded_outpost.dmm +++ b/maps/tether/submaps/underdark_pois/abandonded_outpost.dmm @@ -322,21 +322,21 @@ /turf/simulated/mineral/floor/ignore_cavegen/virgo3b, /area/mine/explored/underdark) "bv" = ( -/obj/item/device/assembly/prox_sensor, +/obj/item/assembly/prox_sensor, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "bw" = ( -/obj/item/device/electronic_assembly/drone/genbot, +/obj/item/electronic_assembly/drone/genbot, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "bx" = ( /obj/structure/table/steel, -/obj/item/device/assembly/electronic_assembly, -/obj/item/weapon/circuitboard/aicore, +/obj/item/assembly/electronic_assembly, +/obj/item/circuitboard/aicore, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "by" = ( -/obj/item/device/assembly/signaler, +/obj/item/assembly/signaler, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "bz" = ( @@ -368,7 +368,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "bE" = ( -/obj/item/device/geiger, +/obj/item/geiger, /turf/simulated/mineral/floor/ignore_cavegen/virgo3b, /area/mine/explored/underdark) "DS" = ( diff --git a/maps/tether/submaps/underdark_pois/abandonedshelter.dmm b/maps/tether/submaps/underdark_pois/abandonedshelter.dmm index c2e631b0252..30801f3687b 100644 --- a/maps/tether/submaps/underdark_pois/abandonedshelter.dmm +++ b/maps/tether/submaps/underdark_pois/abandonedshelter.dmm @@ -19,7 +19,7 @@ /area/mine/explored/underdark) "f" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/mime, +/obj/item/bedsheet/mime, /turf/simulated/shuttle/floor/voidcraft/virgo3b, /area/mine/explored/underdark) "g" = ( diff --git a/maps/tether/submaps/underdark_pois/broken_engine.dmm b/maps/tether/submaps/underdark_pois/broken_engine.dmm index 17280d9195c..00fa07d8945 100644 --- a/maps/tether/submaps/underdark_pois/broken_engine.dmm +++ b/maps/tether/submaps/underdark_pois/broken_engine.dmm @@ -22,7 +22,7 @@ /turf/simulated/wall, /area/mine/explored/underdark) "g" = ( -/obj/item/device/geiger, +/obj/item/geiger, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "h" = ( diff --git a/maps/tether/submaps/underdark_pois/goldhall.dmm b/maps/tether/submaps/underdark_pois/goldhall.dmm index 4bbeb7fa002..ae3a4b8f6d8 100644 --- a/maps/tether/submaps/underdark_pois/goldhall.dmm +++ b/maps/tether/submaps/underdark_pois/goldhall.dmm @@ -13,7 +13,7 @@ /turf/simulated/floor/tiled/kafel_full/yellow/virgo3b, /area/mine/explored/underdark) "e" = ( -/obj/item/weapon/reagent_containers/food/condiment/ketchup, +/obj/item/reagent_containers/food/condiment/ketchup, /turf/simulated/floor/tiled/kafel_full/yellow/virgo3b, /area/mine/explored/underdark) "f" = ( @@ -23,7 +23,7 @@ /area/mine/explored/underdark) "g" = ( /obj/effect/decal/remains, -/obj/item/weapon/bluespace_crystal, +/obj/item/bluespace_crystal, /turf/simulated/floor/tiled/kafel_full/yellow/virgo3b, /area/mine/explored/underdark) diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index e477ac5dbc0..bba4bfd0d89 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -206,16 +206,16 @@ /area/tether/surfacebase/medical/paramed) "aay" = ( /obj/structure/table/rack, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_y = 3 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = -3 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 2 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -1; pixel_y = -3 }, @@ -365,7 +365,7 @@ /area/tether/surfacebase/medical/centralstairwell) "aaJ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/medical/mentalhealth) "aaK" = ( @@ -379,8 +379,8 @@ /area/tether/surfacebase/medical/paramed) "aaL" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/device/multitool, +/obj/item/storage/toolbox/mechanical, +/obj/item/multitool, /obj/effect/floor_decal/corner/paleblue{ dir = 9 }, @@ -487,11 +487,11 @@ desc = "A large cabinet with hard copy medical records."; name = "Medical Records" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 1; pixel_y = 24 }, @@ -503,7 +503,7 @@ /obj/item/clothing/suit/space/void/medical/emt, /obj/item/clothing/mask/breath, /obj/item/clothing/head/helmet/space/void/medical/emt, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -641,7 +641,7 @@ /area/tether/surfacebase/surface_one_hall) "abd" = ( /obj/structure/table/rack, -/obj/item/weapon/rig/medical/equipped, +/obj/item/rig/medical/equipped, /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, @@ -806,7 +806,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/paramed) "abp" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_y = 32 }, /turf/simulated/floor/wood, @@ -1038,10 +1038,10 @@ /area/maintenance/lower/mining_eva) "abU" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /turf/simulated/floor/carpet/blue, @@ -1145,13 +1145,13 @@ /area/tether/surfacebase/medical/mentalhealth) "acd" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit{ +/obj/item/suit_cooling_unit{ pixel_y = -5 }, -/obj/item/device/suit_cooling_unit{ +/obj/item/suit_cooling_unit{ pixel_y = -5 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = -24 }, @@ -1242,7 +1242,7 @@ /area/tether/surfacebase/medical/mentalhealth) "acn" = ( /obj/structure/table/rack, -/obj/item/device/defib_kit/compact/loaded, +/obj/item/defib_kit/compact/loaded, /obj/effect/floor_decal/corner/paleblue{ dir = 9 }, @@ -1408,7 +1408,7 @@ /area/tether/surfacebase/lowernorthhall) "acC" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = -5; pixel_y = 4 }, @@ -1807,7 +1807,7 @@ /obj/structure/table/rack, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/storage/hooded/wintercoat, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -1923,10 +1923,10 @@ /area/tether/surfacebase/medical/mentalhealth) "adB" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/anomaly_spectroscopy, -/obj/item/weapon/book/manual/anomaly_testing, -/obj/item/weapon/book/manual/materials_chemistry_analysis, -/obj/item/weapon/book/manual/resleeving, +/obj/item/book/manual/anomaly_spectroscopy, +/obj/item/book/manual/anomaly_testing, +/obj/item/book/manual/materials_chemistry_analysis, +/obj/item/book/manual/resleeving, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) "adC" = ( @@ -1973,10 +1973,10 @@ /area/tether/surfacebase/medical/paramed) "adE" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/standard_operating_procedure, +/obj/item/book/manual, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/standard_operating_procedure, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) "adF" = ( @@ -2458,7 +2458,7 @@ /area/tether/surfacebase/medical/mentalhealth) "ael" = ( /obj/structure/table/woodentable, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/machinery/light, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/medical/mentalhealth) @@ -3321,7 +3321,7 @@ /area/rnd/hardstorage) "afB" = ( /obj/structure/table/glass, -/obj/item/device/radio{ +/obj/item/radio{ anchored = 1; canhear_range = 7; frequency = 1487; @@ -3345,9 +3345,9 @@ /area/maintenance/lower/mining_eva) "afD" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/folder/white, +/obj/item/pen, /turf/simulated/floor/tiled/white, /area/medical/virology) "afE" = ( @@ -3382,7 +3382,7 @@ /turf/simulated/floor/maglev, /area/tether/surfacebase/tram) "afI" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -3742,16 +3742,16 @@ /obj/structure/table/rack, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/storage/hooded/wintercoat/science, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/storage/hooded/wintercoat/science, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /turf/simulated/floor/tiled, /area/rnd/xenoarch_storage) "agt" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled, /area/rnd/xenoarch_storage) "agu" = ( @@ -3891,7 +3891,7 @@ /area/storage/primary) "agL" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -3954,7 +3954,7 @@ /area/maintenance/lower/trash_pit) "agR" = ( /obj/structure/table/glass, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -3982,15 +3982,15 @@ /area/storage/surface_eva) "agV" = ( /obj/structure/closet/crate, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -4749,8 +4749,8 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled, /area/rnd/testingroom) "ail" = ( @@ -4758,12 +4758,12 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, -/obj/item/device/assembly/signaler, -/obj/item/device/assembly/prox_sensor, -/obj/item/device/assembly/signaler, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/voice, -/obj/item/device/radio/electropack, +/obj/item/assembly/signaler, +/obj/item/assembly/prox_sensor, +/obj/item/assembly/signaler, +/obj/item/assembly/timer, +/obj/item/assembly/voice, +/obj/item/radio/electropack, /turf/simulated/floor/tiled, /area/rnd/testingroom) "aim" = ( @@ -4800,7 +4800,7 @@ /area/rnd/testingroom) "aip" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, /obj/item/clothing/glasses/science, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -4811,7 +4811,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, -/obj/item/weapon/storage/fancy/vials, +/obj/item/storage/fancy/vials, /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "aiq" = ( @@ -4931,9 +4931,9 @@ /area/rnd/testingroom) "aiG" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/assembly/infra, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, +/obj/item/assembly/infra, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, /turf/simulated/floor/tiled, /area/rnd/testingroom) "aiH" = ( @@ -4960,15 +4960,15 @@ /area/rnd/chemistry_lab) "aiJ" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/storage/box/syringes, +/obj/item/reagent_containers/spray/cleaner, /obj/effect/floor_decal/borderfloor{ dir = 10 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 10 }, -/obj/item/device/reagent_scanner, +/obj/item/reagent_scanner, /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "aiK" = ( @@ -4980,8 +4980,8 @@ /area/rnd/chemistry_lab) "aiL" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /obj/machinery/firealarm{ dir = 1; pixel_y = -25 @@ -4992,7 +4992,7 @@ /area/rnd/chemistry_lab) "aiM" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, @@ -5485,7 +5485,7 @@ /area/engineering/atmos) "ajz" = ( /obj/structure/table/woodentable, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -5510,7 +5510,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -6069,7 +6069,7 @@ dir = 4 }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -24 @@ -6194,7 +6194,7 @@ /turf/simulated/floor/reinforced, /area/rnd/testingroom) "akU" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -6796,8 +6796,8 @@ /area/maintenance/lower/xenoflora) "alL" = ( /obj/structure/table/steel_reinforced, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, /turf/simulated/floor/tiled, /area/rnd/testingroom) "alM" = ( @@ -7096,7 +7096,7 @@ /area/storage/primary) "amm" = ( /obj/machinery/hologram/holopad, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -7186,7 +7186,7 @@ "amv" = ( /obj/effect/floor_decal/industrial/warning/dust, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -30 @@ -7302,7 +7302,7 @@ /turf/simulated/floor/tiled, /area/storage/primary) "amH" = ( -/obj/item/weapon/stool, +/obj/item/stool, /obj/effect/landmark/start{ name = "Assistant" }, @@ -7712,17 +7712,17 @@ "anq" = ( /obj/structure/catwalk, /obj/effect/floor_decal/rust, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer{ +/obj/item/reagent_containers/food/drinks/bottle/small/beer{ pixel_y = 13 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer{ +/obj/item/reagent_containers/food/drinks/bottle/small/beer{ pixel_x = 9 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer{ +/obj/item/reagent_containers/food/drinks/bottle/small/beer{ pixel_x = -7; pixel_y = -7 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer{ +/obj/item/reagent_containers/food/drinks/bottle/small/beer{ pixel_x = -10; pixel_y = 5 }, @@ -7933,7 +7933,7 @@ /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -8055,7 +8055,7 @@ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -8268,8 +8268,8 @@ /area/tether/surfacebase/emergency_storage/atrium) "aoo" = ( /obj/structure/table/standard, -/obj/item/device/t_scanner, -/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/t_scanner, +/obj/item/storage/briefcase/inflatable, /obj/random/maintenance/cargo, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/atrium) @@ -8371,7 +8371,7 @@ /obj/machinery/door/window/southleft, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/storage/hooded/wintercoat, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/structure/sign/nosmoking_2{ pixel_y = 30 }, @@ -8391,7 +8391,7 @@ /obj/machinery/door/window/southright, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/storage/hooded/wintercoat, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /turf/simulated/floor/tiled/dark, /area/storage/surface_eva) "aoA" = ( @@ -8403,10 +8403,10 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/shovel, -/obj/item/weapon/shovel, -/obj/item/weapon/soap, -/obj/item/device/radio/intercom{ +/obj/item/shovel, +/obj/item/shovel, +/obj/item/soap, +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -8910,8 +8910,8 @@ /area/vacant/vacant_site) "apq" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, /turf/simulated/floor/tiled, /area/storage/art) "apr" = ( @@ -8935,7 +8935,7 @@ /obj/structure/table/standard, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -9245,11 +9245,11 @@ /area/vacant/vacant_site) "apY" = ( /obj/structure/table/standard, -/obj/item/device/camera_film{ +/obj/item/camera_film{ pixel_x = -2; pixel_y = -2 }, -/obj/item/device/camera_film{ +/obj/item/camera_film{ pixel_x = 2; pixel_y = 2 }, @@ -9268,8 +9268,8 @@ /area/storage/art) "aqa" = ( /obj/structure/table/standard, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, /obj/machinery/light_switch{ dir = 8; pixel_x = 28 @@ -9430,7 +9430,7 @@ pixel_x = 3; pixel_y = -7 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -9438,11 +9438,11 @@ pixel_x = 3; pixel_y = -7 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -9461,14 +9461,14 @@ /turf/simulated/floor/tiled/dark, /area/storage/surface_eva) "aqs" = ( -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 6 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, /obj/structure/table/reinforced, @@ -9491,7 +9491,7 @@ /obj/machinery/door/window/northleft, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/storage/hooded/wintercoat, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/structure/sign/fire{ pixel_y = -32 }, @@ -9509,7 +9509,7 @@ /obj/machinery/door/window/northright, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/storage/hooded/wintercoat, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /turf/simulated/floor/tiled/dark, /area/storage/surface_eva) "aqv" = ( @@ -9518,17 +9518,17 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, /obj/machinery/alarm{ dir = 1; pixel_y = -22 @@ -9602,8 +9602,8 @@ /area/vacant/vacant_site) "aqB" = ( /obj/structure/table/standard, -/obj/item/device/camera, -/obj/item/device/camera{ +/obj/item/camera, +/obj/item/camera{ pixel_x = 3; pixel_y = -4 }, @@ -9632,8 +9632,8 @@ /area/storage/art) "aqE" = ( /obj/structure/table/standard, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -9654,8 +9654,8 @@ pixel_y = -25 }, /obj/structure/table/steel, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -9664,8 +9664,8 @@ "aqH" = ( /obj/machinery/light/small, /obj/structure/mopbucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "aqI" = ( @@ -9866,8 +9866,8 @@ /obj/structure/table/standard, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, -/obj/item/device/taperecorder, -/obj/item/device/taperecorder, +/obj/item/taperecorder, +/obj/item/taperecorder, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -9896,7 +9896,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -9952,8 +9952,8 @@ /area/crew_quarters/visitor_laundry) "arn" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/device/radio/emergency, +/obj/item/storage/toolbox/emergency, +/obj/item/radio/emergency, /obj/machinery/recharger, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) @@ -10010,8 +10010,8 @@ /area/hallway/lower/first_west) "art" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box{ +/obj/item/storage/box, +/obj/item/storage/box{ pixel_x = 3; pixel_y = 3 }, @@ -10019,24 +10019,24 @@ dir = 1; pixel_y = -22 }, -/obj/item/weapon/tape_roll{ +/obj/item/tape_roll{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/tape_roll, +/obj/item/tape_roll, /turf/simulated/floor/tiled, /area/storage/art) "aru" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = -5; pixel_y = -1 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = -1; pixel_y = 3 }, @@ -10126,14 +10126,14 @@ "arE" = ( /obj/structure/table/rack, /obj/item/bodybag/cryobag, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /obj/machinery/light{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) "arF" = ( @@ -10214,7 +10214,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -10276,7 +10276,7 @@ /area/maintenance/lower/vacant_site) "arP" = ( /obj/structure/table/glass, -/obj/item/device/radio/phone/medbay{ +/obj/item/radio/phone/medbay{ name = "Medical Emergency Phone" }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -10289,7 +10289,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) "arQ" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/machinery/camera/network/medbay{ @@ -10300,7 +10300,7 @@ "arR" = ( /obj/structure/table/glass, /obj/random/medical/lite, -/obj/item/device/radio/intercom/department/medbay, +/obj/item/radio/intercom/department/medbay, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) "arS" = ( @@ -10473,7 +10473,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "ask" = ( -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "asl" = ( @@ -10607,7 +10607,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -10674,20 +10674,20 @@ /turf/simulated/wall/r_wall, /area/rnd/xenoarch_storage) "asA" = ( -/obj/item/weapon/storage/excavation, -/obj/item/weapon/pickaxe, -/obj/item/weapon/tool/wrench, -/obj/item/device/measuring_tape, +/obj/item/storage/excavation, +/obj/item/pickaxe, +/obj/item/tool/wrench, +/obj/item/measuring_tape, /obj/item/stack/flag/yellow, /obj/structure/table/steel, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/rnd/xenoarch_storage) "asB" = ( -/obj/item/weapon/storage/excavation, -/obj/item/weapon/pickaxe, -/obj/item/weapon/tool/wrench, -/obj/item/device/measuring_tape, +/obj/item/storage/excavation, +/obj/item/pickaxe, +/obj/item/tool/wrench, +/obj/item/measuring_tape, /obj/item/stack/flag/yellow, /obj/structure/table/steel, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -10941,7 +10941,7 @@ /obj/random/maintenance/cargo, /obj/random/maintenance/clean, /obj/random/maintenance/research, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/simulated/floor/plating, /area/vacant/vacant_site) "atc" = ( @@ -11206,7 +11206,7 @@ /area/tether/surfacebase/tram) "atD" = ( /obj/structure/closet/excavation, -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/tiled, /area/rnd/xenoarch_storage) "atE" = ( @@ -11508,7 +11508,7 @@ /area/rnd/xenoarch_storage) "auh" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/belt/archaeology, +/obj/item/storage/belt/archaeology, /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, @@ -11520,7 +11520,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/item/weapon/storage/belt/archaeology, +/obj/item/storage/belt/archaeology, /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, @@ -12386,8 +12386,8 @@ dir = 5 }, /obj/structure/bookcase, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/security_space_law, /turf/simulated/floor/tiled, /area/security/checkpoint) "avA" = ( @@ -12652,7 +12652,7 @@ /area/tether/surfacebase/surface_one_hall) "avY" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/machinery/camera/network/medbay{ dir = 8 }, @@ -12679,12 +12679,12 @@ dir = 1 }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/red, -/obj/item/weapon/pen, +/obj/item/pen/red, +/obj/item/pen, /turf/simulated/floor/tiled, /area/security/checkpoint) "awb" = ( @@ -12881,7 +12881,7 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 8 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/tiled/white, @@ -13186,7 +13186,7 @@ pixel_x = 24 }, /obj/structure/table/glass, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/simulated/floor/tiled, /area/security/checkpoint) "awR" = ( @@ -13656,7 +13656,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -13728,7 +13728,7 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/tiled, /area/security/checkpoint) "axx" = ( @@ -13871,7 +13871,7 @@ /area/maintenance/lower/solars) "axJ" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/machinery/status_display{ pixel_x = 32 }, @@ -14214,8 +14214,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/glass, -/obj/item/device/antibody_scanner, -/obj/item/device/antibody_scanner{ +/obj/item/antibody_scanner, +/obj/item/antibody_scanner{ pixel_x = 2; pixel_y = 2 }, @@ -14227,7 +14227,7 @@ dir = 1; icon_state = "pipe-c" }, -/obj/item/weapon/book/manual/virology, +/obj/item/book/manual/virology, /turf/simulated/floor/tiled/white, /area/medical/virology) "ayl" = ( @@ -14239,7 +14239,7 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/reagent_containers/glass/beaker, /turf/simulated/floor/tiled/white, /area/medical/virology) "aym" = ( @@ -14434,7 +14434,7 @@ /area/medical/virologyisolation) "ayA" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/machinery/light{ dir = 4 }, @@ -14463,7 +14463,7 @@ name = "package tagger - Void"; sort_tag = "Void" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -14531,7 +14531,7 @@ /area/medical/virology) "ayM" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /obj/machinery/light{ dir = 4 }, @@ -14639,8 +14639,8 @@ /area/crew_quarters/locker/laundry_arrival) "ayV" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/laundry_basket, -/obj/item/weapon/tape_roll, +/obj/item/storage/laundry_basket, +/obj/item/tape_roll, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -14652,7 +14652,7 @@ /area/crew_quarters/locker/laundry_arrival) "ayW" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -14684,7 +14684,7 @@ dir = 2; icon_state = "pipe-c" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 @@ -14852,7 +14852,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -14991,16 +14991,16 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "azu" = ( -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Virology. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Virology Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/structure/table/glass, /obj/machinery/camera/network/medbay{ dir = 4 @@ -15024,11 +15024,11 @@ /area/medical/virology) "azv" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/fancy/vials, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/syringe/antiviral, +/obj/item/storage/fancy/vials, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/lime/border, /obj/effect/floor_decal/borderfloorwhite/corner2, @@ -15037,9 +15037,9 @@ /area/medical/virology) "azw" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/lockbox/vials, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/lockbox/vials, +/obj/item/reagent_containers/dropper, +/obj/item/storage/secure/safe{ pixel_x = 5; pixel_y = -28 }, @@ -15049,8 +15049,8 @@ /area/medical/virology) "azx" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/beakers, +/obj/item/storage/box/syringes{ pixel_x = 4; pixel_y = 4 }, @@ -15095,8 +15095,8 @@ /area/medical/virologyisolation) "azB" = ( /obj/structure/table/standard, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/storage/box/cups, +/obj/item/soap/nanotrasen, +/obj/item/storage/box/cups, /obj/machinery/alarm{ dir = 1; pixel_y = -22 @@ -15195,11 +15195,11 @@ icon_state = "4-8" }, /obj/structure/table/standard, -/obj/item/device/pipe_painter{ +/obj/item/pipe_painter{ pixel_x = 3; pixel_y = 3 }, -/obj/item/device/pipe_painter, +/obj/item/pipe_painter, /obj/machinery/newscaster{ pixel_y = 30 }, @@ -15244,7 +15244,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -15773,7 +15773,7 @@ /area/tether/surfacebase/lowernortheva) "aAC" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/effect/floor_decal/borderfloorwhite{ dir = 5 }, @@ -15938,7 +15938,7 @@ /area/tether/surfacebase/surface_one_hall) "aAS" = ( /obj/structure/closet/crate, -/obj/item/weapon/handcuffs/fuzzy, +/obj/item/handcuffs/fuzzy, /obj/random/maintenance/security, /obj/random/contraband, /turf/simulated/floor/plating, @@ -16003,9 +16003,9 @@ "aAY" = ( /obj/structure/railing, /obj/structure/closet/crate, -/obj/item/device/camera, -/obj/item/device/tape/random, -/obj/item/device/taperecorder/empty, +/obj/item/camera, +/obj/item/rectape/random, +/obj/item/taperecorder/empty, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aAZ" = ( @@ -16046,9 +16046,9 @@ /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, -/obj/item/weapon/tank/emergency, -/obj/item/weapon/tank/emergency, -/obj/item/weapon/tank/emergency, +/obj/item/tank/emergency, +/obj/item/tank/emergency, +/obj/item/tank/emergency, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aBf" = ( @@ -16150,7 +16150,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -16430,7 +16430,7 @@ }, /obj/structure/table/rack, /obj/item/clothing/suit/fire/firefighter, -/obj/item/weapon/tank/oxygen/red, +/obj/item/tank/oxygen/red, /obj/item/clothing/mask/gas/wwii, /obj/item/clothing/head/hardhat/red, /turf/simulated/floor/plating, @@ -17198,7 +17198,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "aDk" = ( -/obj/item/weapon/bone/skull/unathi, +/obj/item/bone/skull/unathi, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aDl" = ( @@ -17639,12 +17639,12 @@ /area/crew_quarters/visitor_dining) "aEa" = ( /obj/structure/table/marble, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, +/obj/item/hand_labeler, +/obj/item/reagent_containers/food/condiment/small/sugar, /obj/machinery/floor_light/prebuilt{ on = 1 }, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /obj/machinery/alarm{ pixel_y = 22 }, @@ -17957,7 +17957,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/visitor_dining) "aEK" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/wood, @@ -18194,8 +18194,8 @@ /area/tether/surfacebase/emergency_storage/rnd) "aFj" = ( /obj/structure/table/standard, -/obj/item/device/t_scanner, -/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/t_scanner, +/obj/item/storage/briefcase/inflatable, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/rnd) "aFk" = ( @@ -18393,7 +18393,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/visitor_dining) "aFz" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -18434,15 +18434,15 @@ /area/crew_quarters/visitor_dining) "aFC" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/glass2/square{ +/obj/item/reagent_containers/food/drinks/glass2/square{ pixel_x = 8; pixel_y = 8 }, @@ -18623,33 +18623,33 @@ /area/crew_quarters/visitor_dining) "aFT" = ( /obj/structure/table/marble, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = 8; pixel_y = 12 }, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ pixel_x = -4; pixel_y = 12 }, @@ -18872,7 +18872,7 @@ dir = 10 }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 1; name = "north bump"; pixel_y = 24 @@ -19019,7 +19019,7 @@ /area/tether/surfacebase/lowernorthhall) "aGx" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -30 @@ -19130,7 +19130,7 @@ dir = 5 }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -24 @@ -19246,7 +19246,7 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/vacant/vacant_bar) "aGS" = ( @@ -19327,7 +19327,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -19414,7 +19414,7 @@ /obj/random/action_figure, /obj/random/action_figure, /obj/structure/closet/wardrobe/grey{ - starts_with = list(/obj/structure/barricade/cutout/viva, /obj/item/clothing/under/color/grey = 3, /obj/item/clothing/shoes/black = 3, /obj/item/clothing/head/soft/grey = 3, /obj/item/clothing/mask/gas/wwii = 3, /obj/item/weapon/storage/toolbox/mechanical = 3, /obj/item/clothing/gloves/fyellow = 3, /obj/item/weapon/card/id/gold/captain/spare/fakespare = 3, /obj/item/weapon/soap/syndie = 3, /obj/item/weapon/storage/box/mousetraps = 3) + starts_with = list(/obj/structure/barricade/cutout/viva, /obj/item/clothing/under/color/grey = 3, /obj/item/clothing/shoes/black = 3, /obj/item/clothing/head/soft/grey = 3, /obj/item/clothing/mask/gas/wwii = 3, /obj/item/storage/toolbox/mechanical = 3, /obj/item/clothing/gloves/fyellow = 3, /obj/item/card/id/gold/captain/spare/fakespare = 3, /obj/item/soap/syndie = 3, /obj/item/storage/box/mousetraps = 3) }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) @@ -19676,7 +19676,7 @@ /turf/simulated/floor/plating, /area/crew_quarters/visitor_dining) "aHH" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/wood, @@ -20025,7 +20025,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/wood, @@ -20540,7 +20540,7 @@ dir = 1 }, /obj/effect/landmark/vermin, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/wood, @@ -20688,13 +20688,13 @@ /area/crew_quarters/sleep/maintDorm1) "aJy" = ( /obj/structure/table/standard, -/obj/item/weapon/stamp/cargo, -/obj/item/weapon/stamp/denied{ +/obj/item/stamp/cargo, +/obj/item/stamp/denied{ pixel_x = 4; pixel_y = -2 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, +/obj/item/clipboard, +/obj/item/folder/yellow, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -20705,15 +20705,15 @@ /area/tether/surfacebase/cargostore/office) "aJz" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = 2; pixel_y = 6 }, -/obj/item/device/retail_scanner/civilian, +/obj/item/retail_scanner/civilian, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -21063,7 +21063,7 @@ "aKh" = ( /obj/structure/table/rack, /obj/item/clothing/suit/fire/firefighter, -/obj/item/weapon/tank/oxygen/red, +/obj/item/tank/oxygen/red, /obj/item/clothing/mask/gas/wwii, /obj/item/clothing/head/hardhat/red, /turf/simulated/floor/plating, @@ -21094,9 +21094,9 @@ name = "Atmos RC"; pixel_y = 28 }, -/obj/item/weapon/tool/wrench, -/obj/item/device/t_scanner, -/obj/item/weapon/storage/belt/utility/atmostech, +/obj/item/tool/wrench, +/obj/item/t_scanner, +/obj/item/storage/belt/utility/atmostech, /obj/machinery/light_switch{ dir = 4; pixel_x = -28 @@ -21110,7 +21110,7 @@ /obj/structure/table/standard, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/ears/earmuffs, -/obj/item/device/radio/headset/headset_eng, +/obj/item/radio/headset/headset_eng, /obj/machinery/light{ dir = 1 }, @@ -21206,7 +21206,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 4 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "aKx" = ( @@ -21216,14 +21216,14 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "aKy" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, /turf/simulated/floor/tiled, /area/engineering/atmos) "aKz" = ( -/obj/item/weapon/beach_ball/holoball, +/obj/item/beach_ball/holoball, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aKA" = ( @@ -21372,7 +21372,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore/office) "aKJ" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -21465,14 +21465,14 @@ "aKU" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/pipedispenser, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, /turf/simulated/floor/tiled, /area/engineering/atmos) "aKV" = ( -/obj/item/weapon/stool, +/obj/item/stool, /obj/effect/landmark/start{ name = "Atmospheric Technician" }, @@ -21773,7 +21773,7 @@ /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -24 @@ -22763,12 +22763,12 @@ /area/crew_quarters/sleep/Dorm_8) "aNr" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, +/obj/item/bedsheet/bluedouble, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) "aNs" = ( /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) "aNt" = ( @@ -23758,12 +23758,12 @@ /area/crew_quarters/sleep/Dorm_6) "aPh" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/reddouble, +/obj/item/bedsheet/reddouble, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) "aPi" = ( /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) "aPj" = ( @@ -24936,12 +24936,12 @@ /area/crew_quarters/sleep/Dorm_4) "aRq" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/yellowdouble, +/obj/item/bedsheet/yellowdouble, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) "aRr" = ( /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) "aRs" = ( @@ -25125,7 +25125,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -25978,12 +25978,12 @@ /area/crew_quarters/sleep/Dorm_2) "aTF" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/orangedouble, +/obj/item/bedsheet/orangedouble, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "aTG" = ( /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "aTH" = ( @@ -26254,7 +26254,7 @@ /obj/machinery/alarm{ pixel_y = 22 }, -/obj/item/weapon/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled, /area/crew_quarters/showers) "aUj" = ( @@ -26265,8 +26265,8 @@ dir = 5 }, /obj/structure/table/standard, -/obj/item/device/communicator, -/obj/item/device/communicator, +/obj/item/communicator, +/obj/item/communicator, /turf/simulated/floor/tiled, /area/crew_quarters/showers) "aUk" = ( @@ -26725,7 +26725,7 @@ dir = 5 }, /obj/structure/table/standard, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -27195,11 +27195,11 @@ dir = 6 }, /obj/structure/table/rack, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, +/obj/item/towel/random, /turf/simulated/floor/tiled, /area/crew_quarters/showers) "aVN" = ( @@ -27336,7 +27336,7 @@ /area/crew_quarters/sleep/maintDorm3) "aVX" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm3) "aVY" = ( @@ -27357,7 +27357,7 @@ /area/vacant/vacant_bar) "aWb" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/structure/sign/poster{ dir = 1 }, @@ -27552,7 +27552,7 @@ /area/vacant/vacant_bar) "aWC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/vacant/vacant_bar) "aWD" = ( @@ -27789,7 +27789,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/grey/border, /obj/structure/table/standard, -/obj/item/weapon/storage/laundry_basket, +/obj/item/storage/laundry_basket, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/grey/bordercorner2, /obj/structure/cable/orange{ @@ -28097,12 +28097,12 @@ /area/maintenance/lower/atmos) "aXA" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/structure/sign/poster{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -28270,7 +28270,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/vacant/vacant_bar) "aYb" = ( @@ -28362,7 +28362,7 @@ /turf/simulated/floor/wood, /area/vacant/vacant_bar) "aYp" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/vacant/vacant_bar) "aYq" = ( @@ -28713,7 +28713,7 @@ /area/crew_quarters/sleep/maintDorm1) "aZU" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/fancy/markers, +/obj/item/storage/fancy/markers, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm1) "aZX" = ( @@ -28823,7 +28823,7 @@ /area/crew_quarters/sleep/maintDorm2) "baB" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/iandouble, +/obj/item/bedsheet/iandouble, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm2) "baC" = ( @@ -28837,7 +28837,7 @@ /area/crew_quarters/sleep/maintDorm1) "baE" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/mimedouble, +/obj/item/bedsheet/mimedouble, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm1) "baK" = ( @@ -29130,7 +29130,7 @@ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -29607,11 +29607,11 @@ /area/maintenance/lower/xenoflora) "bcf" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -30138,7 +30138,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "Brusies sustained in the holodeck can be healed simply by sleeping."; name = "Holodeck Disclaimer" }, @@ -30163,7 +30163,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -30375,9 +30375,9 @@ name = "obscure table" }, /obj/item/toy/figure/mime, -/obj/item/weapon/pen/crayon/marker/mime, -/obj/item/weapon/pen/crayon/mime, -/obj/item/weapon/cartridge/mime, +/obj/item/pen/crayon/marker/mime, +/obj/item/pen/crayon/mime, +/obj/item/cartridge/mime, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) "bmK" = ( @@ -30385,11 +30385,11 @@ dir = 1; pixel_y = -28 }, -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, +/obj/item/storage/fancy/crayons, /turf/simulated/floor/tiled, /area/storage/art) "bqI" = ( @@ -30582,7 +30582,7 @@ /area/tether/surfacebase/tram) "bTt" = ( /obj/structure/table/rack, -/obj/item/weapon/weldingtool/mini{ +/obj/item/weldingtool/mini{ desc = "It says 'keychain welder' on the side, but there's no bail to hook it on."; name = "keychain welder"; toolspeed = 5 @@ -30618,7 +30618,7 @@ /area/tether/surfacebase/security/brig) "cdl" = ( /obj/machinery/disease2/diseaseanalyser, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 @@ -30728,9 +30728,9 @@ /area/tether/surfacebase/security/lowerhall) "ctE" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/emergency, -/obj/item/weapon/tank/emergency, -/obj/item/weapon/tank/emergency, +/obj/item/tank/emergency, +/obj/item/tank/emergency, +/obj/item/tank/emergency, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, @@ -30888,7 +30888,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "cUh" = ( -/obj/item/weapon/storage/belt/utility{ +/obj/item/storage/belt/utility{ desc = "It's full of holes and tears."; name = "raggedy tool-belt" }, @@ -30957,8 +30957,8 @@ /area/tether/surfacebase/security/brig) "dfJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/bag/trash, -/obj/item/weapon/storage/bag/trash, +/obj/item/storage/bag/trash, +/obj/item/storage/bag/trash, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -31065,7 +31065,7 @@ /obj/structure/table/rack, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/storage/hooded/wintercoat, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/lowernorthhall) "dyd" = ( @@ -31186,14 +31186,14 @@ pixel_y = 2 }, /obj/structure/mopbucket, -/obj/item/weapon/mop, +/obj/item/mop, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "dPY" = ( /obj/structure/table/rack, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/storage/hooded/wintercoat/science, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /turf/simulated/floor/tiled/techfloor, /area/rnd/hallway) "dQn" = ( @@ -31295,7 +31295,7 @@ /area/tether/surfacebase/security/weaponsrange) "ekC" = ( /obj/structure/table/steel, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/simulated/floor/tiled/freezer, /area/tether/surfacebase/security/brig/bathroom) "elf" = ( @@ -31455,8 +31455,8 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/gun/energy/laser/practice, -/obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice, +/obj/item/gun/energy/laser/practice, +/obj/item/gun/projectile/shotgun/pump/rifle/practice, /obj/item/ammo_magazine/clip/c762/practice, /obj/item/ammo_magazine/clip/c762/practice, /turf/simulated/floor/tiled/dark, @@ -31471,7 +31471,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/weaponsrange) "eJc" = ( -/obj/item/weapon/storage/toolbox/brass, +/obj/item/storage/toolbox/brass, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "eJQ" = ( @@ -31724,8 +31724,8 @@ desc = "Dents and old flaky paint blanket this old storage unit."; name = "old locker" }, -/obj/item/weapon/storage/toolbox/lunchbox/mars/filled, -/obj/item/weapon/storage/belt/fannypack/red, +/obj/item/storage/toolbox/lunchbox/mars/filled, +/obj/item/storage/belt/fannypack/red, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "fSR" = ( @@ -32004,7 +32004,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/weapon/beach_ball/holoball, +/obj/item/beach_ball/holoball, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig/storage) "guO" = ( @@ -32071,7 +32071,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/weapon/reagent_containers/food/condiment/small/sugar, +/obj/item/reagent_containers/food/condiment/small/sugar, /turf/simulated/floor/wood, /area/crew_quarters/visitor_dining) "gAn" = ( @@ -32199,7 +32199,7 @@ "gWO" = ( /obj/structure/table/rack, /obj/effect/floor_decal/rust, -/obj/item/weapon/gun/projectile/revolver/toy/crossbow, +/obj/item/gun/projectile/revolver/toy/crossbow, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/hideyhole) "gYx" = ( @@ -32735,7 +32735,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -32801,7 +32801,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "itj" = ( @@ -32855,7 +32855,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "iwQ" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/carpet/gaycarpet, /area/tether/surfacebase/funny/clownoffice) "ixF" = ( @@ -33065,7 +33065,7 @@ /obj/structure/sign/painting/public{ pixel_y = 30 }, -/obj/item/device/flashlight/lamp/clown, +/obj/item/flashlight/lamp/clown, /turf/simulated/floor/carpet/gaycarpet, /area/tether/surfacebase/funny/clownoffice) "jrh" = ( @@ -33406,7 +33406,7 @@ "klO" = ( /obj/machinery/door/window/northright, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -33472,7 +33472,7 @@ dir = 1 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/lowerhall) @@ -33588,7 +33588,7 @@ dir = 4 }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -30 @@ -33817,7 +33817,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig) "ljI" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel_dirty, @@ -33918,7 +33918,7 @@ "lxo" = ( /obj/machinery/door/window/northright, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 8; pixel_x = -24 }, @@ -34086,7 +34086,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/autoresleeving) "lQu" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/structure/table/steel, /obj/machinery/light{ dir = 8 @@ -34215,7 +34215,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig/storage) "miP" = ( -/obj/item/weapon/bananapeel, +/obj/item/bananapeel, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/clownoffice) "mjL" = ( @@ -34402,7 +34402,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 6 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -34569,8 +34569,8 @@ "naO" = ( /obj/structure/table/rack, /obj/effect/floor_decal/rust, -/obj/item/weapon/soap/syndie, -/obj/item/weapon/bananapeel, +/obj/item/soap/syndie, +/obj/item/bananapeel, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/hideyhole) "nbj" = ( @@ -34852,10 +34852,10 @@ dir = 1 }, /obj/structure/closet/crate/freezer, -/obj/item/weapon/virusdish/random, -/obj/item/weapon/virusdish/random, -/obj/item/weapon/virusdish/random, -/obj/item/weapon/virusdish/random, +/obj/item/virusdish/random, +/obj/item/virusdish/random, +/obj/item/virusdish/random, +/obj/item/virusdish/random, /turf/simulated/floor/tiled/white, /area/medical/virology) "nMH" = ( @@ -34863,7 +34863,7 @@ desc = "Dents and old flaky paint blanket this old storage unit."; name = "old locker" }, -/obj/item/weapon/storage/toolbox/lunchbox/filled, +/obj/item/storage/toolbox/lunchbox/filled, /obj/random/plushielarge, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) @@ -34917,7 +34917,7 @@ /area/crew_quarters/visitor_laundry) "nUG" = ( /obj/structure/table/rack, -/obj/item/weapon/tool/prybar/red{ +/obj/item/tool/prybar/red{ desc = "Haven't I seen this before?"; name = "old red crowbar"; toolspeed = 3 @@ -35008,7 +35008,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -35023,11 +35023,11 @@ name = "Clown Officer's Cap" }, /obj/item/clothing/mask/smokable/pipe/cobpipe, -/obj/item/weapon/flame/lighter/zippo/ironic, +/obj/item/flame/lighter/zippo/ironic, /obj/structure/sign/painting/public{ pixel_y = 30 }, -/obj/item/weapon/reagent_containers/food/snacks/pie, +/obj/item/reagent_containers/food/snacks/pie, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/clownoffice) @@ -35066,7 +35066,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) "oox" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -35219,7 +35219,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "oGO" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -35230,7 +35230,7 @@ desc = "Dents and old flaky paint blanket this old storage unit."; name = "old locker" }, -/obj/item/weapon/storage/toolbox/lunchbox/heart, +/obj/item/storage/toolbox/lunchbox/heart, /obj/random/plushie, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) @@ -35276,10 +35276,10 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/pen/crayon/marker/rainbow, -/obj/item/weapon/pen/crayon/rainbow, -/obj/item/weapon/stamp/clown, -/obj/item/weapon/cartridge/clown, +/obj/item/pen/crayon/marker/rainbow, +/obj/item/pen/crayon/rainbow, +/obj/item/stamp/clown, +/obj/item/cartridge/clown, /obj/structure/table/standard{ name = "plastic table frame" }, @@ -35289,7 +35289,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -35559,7 +35559,7 @@ desc = "Dents and old flaky paint blanket this old storage unit."; name = "old locker" }, -/obj/item/weapon/storage/toolbox/lunchbox/syndicate, +/obj/item/storage/toolbox/lunchbox/syndicate, /obj/item/clothing/head/cakehat, /obj/random/mech_toy, /turf/simulated/floor/plating, @@ -35636,8 +35636,8 @@ /area/maintenance/lower/trash_pit) "qhs" = ( /obj/structure/table/rack, -/obj/item/weapon/coin/silver, -/obj/item/weapon/gun/projectile/revolver/toy/crossbow, +/obj/item/coin/silver, +/obj/item/gun/projectile/revolver/toy/crossbow, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/hideyhole) "qjE" = ( @@ -35654,7 +35654,7 @@ dir = 1 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig) "qmc" = ( @@ -35767,7 +35767,7 @@ "qCD" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/grey/border, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -36074,7 +36074,7 @@ /area/crew_quarters/sleep/maintDorm2) "rse" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/mimedouble, +/obj/item/bedsheet/mimedouble, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) "rtV" = ( @@ -36128,7 +36128,7 @@ /area/tether/surfacebase/surface_one_hall) "rxD" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/clowndouble, +/obj/item/bedsheet/clowndouble, /obj/structure/sign/painting/public{ pixel_y = -30 }, @@ -36146,7 +36146,7 @@ /obj/structure/table/rack, /obj/effect/floor_decal/rust, /obj/item/toy/bouquet/fake, -/obj/item/weapon/reagent_containers/spray/waterflower, +/obj/item/reagent_containers/spray/waterflower, /obj/machinery/alarm{ pixel_y = 25 }, @@ -36154,7 +36154,7 @@ /area/tether/surfacebase/funny/hideyhole) "rBG" = ( /obj/structure/closet, -/obj/item/weapon/material/minihoe, +/obj/item/material/minihoe, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig/storage) "rCj" = ( @@ -36561,9 +36561,9 @@ /area/tether/surfacebase/funny/clownoffice) "sVX" = ( /obj/structure/table/steel, -/obj/item/weapon/material/twohanded/fireaxe/foam, +/obj/item/material/twohanded/fireaxe/foam, /obj/item/toy/nanotrasenballoon, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/firealarm{ dir = 4; @@ -36593,7 +36593,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -37435,7 +37435,7 @@ desc = "Dents and old flaky paint blanket this old storage unit."; name = "old locker" }, -/obj/item/weapon/storage/toolbox/lunchbox/cat/filled, +/obj/item/storage/toolbox/lunchbox/cat/filled, /obj/item/clothing/head/chefhat, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) @@ -38178,7 +38178,7 @@ desc = "These are what qualifies as a quality product these days?"; name = "insulted gloves" }, -/obj/item/weapon/card/id/gold{ +/obj/item/card/id/gold{ access = list(746); desc = "Did someone spraypaint this card?"; name = "captians id card" diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 83d5469ab26..88e17db24ff 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -426,7 +426,7 @@ dir = 8 }, /obj/structure/table/glass, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/item/clothing/accessory/stethoscope, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/borderfloorwhite/corner2{ @@ -664,7 +664,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "aaX" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -890,7 +890,7 @@ /area/tether/surfacebase/medical/bathroom) "abm" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/corner/paleblue/border{ dir = 6 @@ -1049,7 +1049,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_x = -28 @@ -1077,9 +1077,9 @@ /area/tether/surfacebase/medical/centralhall) "abB" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white, -/obj/item/device/healthanalyzer, -/obj/item/weapon/cane, +/obj/item/folder/white, +/obj/item/healthanalyzer, +/obj/item/cane, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -1294,10 +1294,10 @@ /area/tether/surfacebase/medical/cmo) "abR" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 4 }, /obj/item/clothing/accessory/stethoscope, @@ -1333,7 +1333,7 @@ /obj/item/modular_computer/console/preset/command{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -1474,8 +1474,8 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/weapon/book/manual/resleeving, -/obj/item/device/sleevemate, +/obj/item/book/manual/resleeving, +/obj/item/sleevemate, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acf" = ( @@ -1543,7 +1543,7 @@ /area/tether/surfacebase/medical/cmo) "ack" = ( /obj/structure/filingcabinet, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = 24 }, @@ -1683,12 +1683,12 @@ /area/tether/surfacebase/medical/cmo) "acA" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white_cmo, -/obj/item/weapon/stamp/cmo, +/obj/item/folder/white_cmo, +/obj/item/stamp/cmo, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/carpet, /area/tether/surfacebase/medical/cmo) "acB" = ( @@ -1827,8 +1827,8 @@ /area/tether/surfacebase/medical/resleeving) "acL" = ( /obj/structure/table/reinforced, -/obj/item/device/reagent_scanner, -/obj/item/device/mass_spectrometer/adv, +/obj/item/reagent_scanner, +/obj/item/mass_spectrometer/adv, /obj/machinery/camera/network/security{ dir = 5 }, @@ -1840,7 +1840,7 @@ "acM" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/sterile/latex, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/cable/green{ icon_state = "4-8" @@ -1852,8 +1852,8 @@ /area/tether/surfacebase/security/detective) "acN" = ( /obj/structure/table/reinforced, -/obj/item/device/uv_light, -/obj/item/weapon/reagent_containers/spray/luminol, +/obj/item/uv_light, +/obj/item/reagent_containers/spray/luminol, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -1885,7 +1885,7 @@ /area/tether/surfacebase/security/detective) "acQ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/forensics/sample_kit/powder, +/obj/item/forensics/sample_kit/powder, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/cable/green{ icon_state = "4-8" @@ -1897,7 +1897,7 @@ /area/tether/surfacebase/security/detective) "acR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/forensics/sample_kit, +/obj/item/forensics/sample_kit, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -2220,8 +2220,8 @@ dir = 8; pixel_x = -24 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -2274,7 +2274,7 @@ /area/tether/surfacebase/outside/outside2) "adu" = ( /obj/machinery/chem_master, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -2445,8 +2445,8 @@ dir = 8; pixel_x = -24 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -2473,7 +2473,7 @@ /area/tether/surfacebase/medical/patient_a) "adP" = ( /obj/structure/bed/chair, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -2491,8 +2491,8 @@ dir = 8; pixel_x = -24 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -2519,7 +2519,7 @@ /area/tether/surfacebase/medical/patient_b) "adS" = ( /obj/structure/bed/chair, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -2533,7 +2533,7 @@ /area/tether/surfacebase/medical/patient_b) "adT" = ( /obj/structure/bed/chair, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -2633,30 +2633,30 @@ dir = 9 }, /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -4; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = -7; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ +/obj/item/reagent_containers/glass/bottle/biomass{ pixel_x = 4; pixel_y = 6 }, -/obj/item/device/flashlight/pen{ +/obj/item/flashlight/pen{ pixel_x = -3; pixel_y = -3 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aea" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -2692,7 +2692,7 @@ dir = 4; pixel_x = -23 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -2723,15 +2723,15 @@ "aeg" = ( /obj/structure/window/reinforced, /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/swabs{ +/obj/item/storage/box/swabs{ layer = 5 }, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/blue{ +/obj/item/hand_labeler, +/obj/item/folder/red, +/obj/item/folder/blue{ pixel_y = -3 }, -/obj/item/weapon/folder/yellow{ +/obj/item/folder/yellow{ pixel_y = -5 }, /turf/simulated/floor/tiled/white, @@ -2849,7 +2849,7 @@ dir = 4; pixel_x = -23 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -2864,8 +2864,8 @@ /area/tether/surfacebase/medical/patient_a) "aex" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/bedsheet/medical, +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = 24 }, @@ -2883,7 +2883,7 @@ dir = 4; pixel_x = -23 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -2898,8 +2898,8 @@ /area/tether/surfacebase/medical/patient_b) "aeA" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/bedsheet/medical, +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = 24 }, @@ -2913,8 +2913,8 @@ /area/tether/surfacebase/medical/patient_b) "aeB" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/bedsheet/medical, +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = 24 }, @@ -2931,7 +2931,7 @@ /obj/machinery/computer/med_data/laptop{ dir = 1 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = -24 }, @@ -2945,14 +2945,14 @@ /area/tether/surfacebase/medical/examroom) "aeD" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/examroom) "aeE" = ( /obj/structure/disposalpipe/segment, -/obj/item/weapon/folder/white, -/obj/item/weapon/clipboard, +/obj/item/folder/white, +/obj/item/clipboard, /obj/structure/table/glass, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/examroom) @@ -2973,11 +2973,11 @@ /obj/structure/closet{ name = "Forensics Gear" }, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/evidence, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/briefcase/crimekit, -/obj/item/weapon/storage/briefcase/crimekit, +/obj/item/storage/box/gloves, +/obj/item/storage/box/evidence, +/obj/item/storage/box/bodybags, +/obj/item/storage/briefcase/crimekit, +/obj/item/storage/briefcase/crimekit, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) "aeI" = ( @@ -3200,7 +3200,7 @@ dir = 4 }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -28 @@ -3212,17 +3212,17 @@ /area/tether/surfacebase/medical/patient_c) "afc" = ( /obj/structure/closet/secure_closet/CMO, -/obj/item/weapon/storage/belt/medical, -/obj/item/device/flashlight/pen, +/obj/item/storage/belt/medical, +/obj/item/flashlight/pen, /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/glasses/hud/health, -/obj/item/device/defib_kit/compact/combat/loaded, -/obj/item/weapon/cmo_disk_holder, -/obj/item/weapon/storage/secure/briefcase/ml3m_pack_cmo, +/obj/item/defib_kit/compact/combat/loaded, +/obj/item/cmo_disk_holder, +/obj/item/storage/secure/briefcase/ml3m_pack_cmo, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/weapon/storage/mrebag/pill/sleevingcure, +/obj/item/storage/mrebag/pill/sleevingcure, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) "afd" = ( @@ -3298,7 +3298,7 @@ dir = 4 }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -28 @@ -3398,7 +3398,7 @@ dir = 4 }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -28 @@ -3652,7 +3652,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 8; pixel_x = -24 }, @@ -3698,7 +3698,7 @@ /obj/structure/reagent_dispensers/peppertank{ pixel_y = 32 }, -/obj/item/device/retail_scanner/security, +/obj/item/retail_scanner/security, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) "afK" = ( @@ -3709,18 +3709,18 @@ dir = 1 }, /obj/structure/table/steel, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 30 @@ -3729,11 +3729,11 @@ pixel_x = 4; pixel_y = 20 }, -/obj/item/device/holowarrant, -/obj/item/device/holowarrant, -/obj/item/device/holowarrant, -/obj/item/device/holowarrant, -/obj/item/device/retail_scanner/security, +/obj/item/holowarrant, +/obj/item/holowarrant, +/obj/item/holowarrant, +/obj/item/holowarrant, +/obj/item/retail_scanner/security, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) "afL" = ( @@ -3797,7 +3797,7 @@ pixel_x = -8; pixel_y = -4 }, -/obj/item/weapon/storage/lockbox, +/obj/item/storage/lockbox, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) "afP" = ( @@ -3820,11 +3820,11 @@ /area/tether/surfacebase/security/armory) "afT" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_x = -1; pixel_y = -11 }, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_x = -1; pixel_y = 2 }, @@ -3835,7 +3835,7 @@ /area/tether/surfacebase/security/armory) "afU" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/camera/network/security, /turf/simulated/floor/tiled/dark, @@ -3882,7 +3882,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -4160,13 +4160,13 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, /obj/structure/table/steel, -/obj/item/weapon/storage/box/nifsofts_security, -/obj/item/weapon/hand_labeler, +/obj/item/storage/box/nifsofts_security, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) "agA" = ( @@ -4454,8 +4454,8 @@ /area/tether/surfacebase/medical/resleeving) "ahd" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /obj/machinery/light{ dir = 1 }, @@ -4504,8 +4504,8 @@ /area/tether/surfacebase/security/detective/officeb) "ahk" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /obj/machinery/light{ dir = 1 }, @@ -4570,8 +4570,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/device/holowarrant, -/obj/item/device/ticket_printer, +/obj/item/holowarrant, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) "ahp" = ( @@ -4628,14 +4628,14 @@ dir = 8; pixel_x = 24 }, -/obj/item/device/holowarrant, +/obj/item/holowarrant, /obj/effect/floor_decal/borderfloorblack/corner2{ dir = 6 }, /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 6 }, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) "ahu" = ( @@ -4710,12 +4710,12 @@ /area/tether/surfacebase/security/armory) "ahz" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/projectile/shotgun/pump{ +/obj/item/gun/projectile/shotgun/pump{ ammo_type = /obj/item/ammo_casing/a12g/pellet; pixel_x = 2; pixel_y = -6 }, -/obj/item/weapon/gun/projectile/shotgun/pump{ +/obj/item/gun/projectile/shotgun/pump{ ammo_type = /obj/item/ammo_casing/a12g/pellet; pixel_x = 1; pixel_y = 4 @@ -4852,7 +4852,7 @@ dir = 4 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/examroom) "ahL" = ( @@ -4927,30 +4927,30 @@ /area/tether/surfacebase/security/detective/officea) "ahT" = ( /obj/structure/closet/secure_closet/detective, -/obj/item/weapon/reagent_containers/spray/pepper, -/obj/item/weapon/gun/energy/taser, -/obj/item/device/camera{ +/obj/item/reagent_containers/spray/pepper, +/obj/item/gun/energy/taser, +/obj/item/camera{ desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; pixel_x = 2; pixel_y = 3 }, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) "ahU" = ( /obj/structure/closet/secure_closet/detective, -/obj/item/weapon/reagent_containers/spray/pepper, -/obj/item/weapon/gun/energy/taser, -/obj/item/device/camera{ +/obj/item/reagent_containers/spray/pepper, +/obj/item/gun/energy/taser, +/obj/item/camera{ desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30; pixel_x = 2; pixel_y = 3 }, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officeb) "ahV" = ( @@ -5020,8 +5020,8 @@ dir = 8; pixel_x = -24 }, -/obj/item/device/holowarrant, -/obj/item/device/ticket_printer, +/obj/item/holowarrant, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) "aid" = ( @@ -5084,22 +5084,22 @@ dir = 8 }, /obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, -/obj/item/device/ticket_printer, +/obj/item/holowarrant, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) "aii" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/holowarrants, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/holowarrants, +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 6; pixel_y = -2 }, -/obj/item/weapon/storage/box/evidence, +/obj/item/storage/box/evidence, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -5233,7 +5233,7 @@ /obj/machinery/camera/network/medbay{ dir = 1 }, -/obj/item/weapon/cane, +/obj/item/cane, /obj/structure/table/glass, /obj/structure/cable/green{ icon_state = "0-8" @@ -5680,11 +5680,11 @@ /area/tether/surfacebase/medical/morgue) "aiY" = ( /obj/structure/table/woodentable, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = -4; pixel_y = 2 }, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -5750,11 +5750,11 @@ /area/tether/surfacebase/security/detective/officeb) "ajf" = ( /obj/structure/table/woodentable, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = -4; pixel_y = 2 }, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -5798,8 +5798,8 @@ dir = 9 }, /obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, -/obj/item/device/ticket_printer, +/obj/item/holowarrant, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) "ajk" = ( @@ -5886,22 +5886,22 @@ /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/red/bordercorner2, /obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, -/obj/item/device/ticket_printer, +/obj/item/holowarrant, +/obj/item/ticket_printer, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) "ajp" = ( /obj/structure/table/steel, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -3 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = 3 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -5962,12 +5962,12 @@ /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, +/obj/item/shield/riot, /obj/item/clothing/gloves/arm_guard/riot, /obj/item/clothing/shoes/leg_guard/riot, /obj/item/clothing/suit/armor/riot/alt, /obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, +/obj/item/shield/riot, /obj/structure/window/reinforced{ dir = 8 }, @@ -6267,7 +6267,7 @@ /area/maintenance/lower/public_garden_maintenence/upper) "ajW" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/machinery/button/windowtint/multitint{ id = "detoffice1"; pixel_x = -24; @@ -6289,9 +6289,9 @@ /area/tether/surfacebase/security/detective/officea) "ajY" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/item/clothing/glasses/sunglasses, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = 5; pixel_y = 5 }, @@ -6308,9 +6308,9 @@ /area/tether/surfacebase/security/detective/officeb) "akb" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/item/clothing/glasses/sunglasses, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = 5; pixel_y = 5 }, @@ -6334,7 +6334,7 @@ /area/tether/surfacebase/security/detective/officeb) "akd" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/machinery/button/windowtint/multitint{ id = "detoffice0"; pixel_x = 24; @@ -6416,20 +6416,20 @@ /area/tether/surfacebase/security/outfitting/storage) "akk" = ( /obj/structure/table/steel, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -6; pixel_y = 3 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon, +/obj/item/cell/device/weapon{ pixel_x = 5; pixel_y = 3 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -1; pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ +/obj/item/cell/device/weapon{ pixel_x = -6; pixel_y = -3 }, @@ -6514,8 +6514,8 @@ /area/tether/surfacebase/medical/uppersouthstairwell) "aku" = ( /obj/structure/table/steel, -/obj/item/device/sleevemate, -/obj/item/device/camera{ +/obj/item/sleevemate, +/obj/item/camera{ name = "Autopsy Camera"; pixel_x = -2; pixel_y = 7 @@ -6527,9 +6527,9 @@ /area/tether/surfacebase/medical/morgue) "akv" = ( /obj/structure/bookcase/manuals/medical, -/obj/item/weapon/book/manual/resleeving, -/obj/item/weapon/book/manual/stasis, -/obj/item/weapon/book/manual/medical_diagnostics_manual{ +/obj/item/book/manual/resleeving, +/obj/item/book/manual/stasis, +/obj/item/book/manual/medical_diagnostics_manual{ pixel_y = 7 }, /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -7362,11 +7362,11 @@ /area/tether/surfacebase/medical/morgue) "alJ" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -7385,9 +7385,9 @@ /area/tether/surfacebase/medical/morgue) "alL" = ( /obj/structure/table/steel, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/surgical/cautery, +/obj/item/surgical/scalpel, +/obj/item/autopsy_scanner, +/obj/item/surgical/cautery, /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/medical/morgue) @@ -7643,7 +7643,7 @@ /obj/structure/table/standard{ name = "plastic table frame" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -8090,7 +8090,7 @@ "amM" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/table/glass, -/obj/item/device/universal_translator, +/obj/item/universal_translator, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "amN" = ( @@ -8443,19 +8443,19 @@ }, /obj/structure/table/rack/shelf/steel, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_y = 7 }, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_y = -5 }, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_y = -5 }, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_y = 7 }, -/obj/item/weapon/gun/energy/gun{ +/obj/item/gun/energy/gun{ pixel_y = -5 }, /turf/simulated/floor/tiled/dark, @@ -8536,7 +8536,7 @@ /area/maintenance/lower/mining) "anF" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /obj/structure/table/glass, /obj/effect/landmark/vermin, /turf/simulated/floor/tiled/white, @@ -8582,7 +8582,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/storage/box/cups{ +/obj/item/storage/box/cups{ pixel_x = 8; pixel_y = 8 }, @@ -8686,7 +8686,7 @@ /area/maintenance/lower/bar) "anV" = ( /obj/effect/floor_decal/rust, -/obj/item/weapon/pen/crayon/red, +/obj/item/pen/crayon/red, /turf/simulated/floor, /area/maintenance/lower/north) "anW" = ( @@ -8717,7 +8717,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "aob" = ( -/obj/item/weapon/pickaxe/hand, +/obj/item/pickaxe/hand, /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/maintenance/lower/north) @@ -8944,7 +8944,7 @@ /obj/machinery/computer/prisoner{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -9283,13 +9283,13 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "aoT" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/table/standard, -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -9314,7 +9314,7 @@ /area/tether/surfacebase/medical/recoveryward) "aoW" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/curtain/open/privacy, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -9809,7 +9809,7 @@ /obj/machinery/computer/secure_data{ dir = 4 }, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 8; pixel_x = -24 }, @@ -9883,7 +9883,7 @@ "apR" = ( /obj/structure/window/reinforced, /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/gun/energy/ionrifle/pistol, /obj/structure/window/reinforced{ dir = 8 }, @@ -9895,8 +9895,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/weapon/storage/box/trackimp, -/obj/item/weapon/storage/box/trackimp, +/obj/item/storage/box/trackimp, +/obj/item/storage/box/trackimp, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "apT" = ( @@ -9981,7 +9981,7 @@ /area/maintenance/substation/medsec) "aqc" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = 24 }, @@ -10077,7 +10077,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/rnd) "aqo" = ( -/obj/item/weapon/storage/fancy/cigar/havana, +/obj/item/storage/fancy/cigar/havana, /obj/random/drinkbottle, /turf/simulated/floor/plating, /area/tether/surfacebase/surface_two_hall) @@ -10330,17 +10330,17 @@ /area/tether/surfacebase/security/warden) "aqL" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, -/obj/item/weapon/paper_bin{ +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/stamp/ward, -/obj/item/weapon/stamp/denied{ +/obj/item/stamp/ward, +/obj/item/stamp/denied{ pixel_x = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -10354,8 +10354,8 @@ /area/tether/surfacebase/security/warden) "aqM" = ( /obj/structure/table/reinforced, -/obj/item/device/retail_scanner/security, -/obj/item/device/radio{ +/obj/item/retail_scanner/security, +/obj/item/radio{ pixel_x = -4 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -10627,7 +10627,7 @@ /obj/structure/table/standard{ name = "plastic table frame" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -10879,7 +10879,7 @@ }, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, -/obj/item/device/personal_shield_generator/security/loaded, +/obj/item/personal_shield_generator/security/loaded, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/evastorage) "arK" = ( @@ -10893,9 +10893,9 @@ /area/tether/surfacebase/security/evastorage) "arL" = ( /obj/structure/table/reinforced, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/cell/high{ +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -11138,7 +11138,7 @@ dir = 5 }, /obj/structure/table/steel, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "ask" = ( @@ -11357,7 +11357,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "asE" = ( -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /obj/item/gunbox/warden, /obj/structure/closet/secure_closet/warden, /obj/machinery/light, @@ -11370,8 +11370,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/item/device/ticket_printer, -/obj/item/weapon/gun/energy/sizegun, +/obj/item/ticket_printer, +/obj/item/gun/energy/sizegun, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) "asF" = ( @@ -11393,7 +11393,7 @@ desc = "Not the most comfy, but useful for napping when no one is in the brig."; name = "cot" }, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/machinery/camera/network/security{ dir = 10 }, @@ -11412,9 +11412,9 @@ /area/tether/surfacebase/security/warden) "asI" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/hand_labeler, +/obj/item/tool/crowbar, +/obj/item/tool/wrench, +/obj/item/hand_labeler, /obj/effect/floor_decal/borderfloor{ dir = 6 }, @@ -11431,8 +11431,8 @@ dir = 8; layer = 2.6 }, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/machinery/camera/network/security{ dir = 5 }, @@ -11452,10 +11452,10 @@ /area/tether/surfacebase/security/evastorage) "asL" = ( /obj/structure/table/reinforced, -/obj/item/device/gps/security{ +/obj/item/gps/security{ pixel_y = 3 }, -/obj/item/device/gps/security{ +/obj/item/gps/security{ pixel_x = -3 }, /obj/effect/floor_decal/borderfloor{ @@ -11543,7 +11543,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "asU" = ( -/obj/item/weapon/material/twohanded/baseballbat{ +/obj/item/material/twohanded/baseballbat{ desc = "This bat looks very off."; health = 500 }, @@ -11639,10 +11639,10 @@ /area/tether/surfacebase/medical/bathroom) "atc" = ( /obj/structure/table/standard, -/obj/item/device/t_scanner, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/t_scanner, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/briefcase/inflatable, /obj/random/maintenance/clean, /obj/random/maintenance/medical, /obj/random/maintenance/research, @@ -11663,7 +11663,7 @@ /area/tether/surfacebase/medical/recoveryward) "ate" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/curtain/open/privacy, /obj/machinery/camera/network/medbay{ dir = 8 @@ -11714,7 +11714,7 @@ /turf/simulated/floor, /area/maintenance/lower/south) "atj" = ( -/obj/item/weapon/newspaper, +/obj/item/newspaper, /turf/simulated/floor, /area/maintenance/lower/south) "atk" = ( @@ -12262,14 +12262,14 @@ dir = 4 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "aue" = ( /obj/structure/table/steel, /obj/random/medical/lite, /obj/item/stack/cable_coil, -/obj/item/weapon/tape_roll, +/obj/item/tape_roll, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "auf" = ( @@ -12277,7 +12277,7 @@ dir = 4 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/mime, +/obj/item/bedsheet/mime, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "aug" = ( @@ -12828,7 +12828,7 @@ "avf" = ( /obj/structure/table/steel, /obj/machinery/recharger, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/random/drinkbottle, /obj/random/paicard, /turf/simulated/floor/tiled/techfloor, @@ -12847,8 +12847,8 @@ /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside2) "avi" = ( -/obj/item/weapon/storage/box/glasses/pint, -/obj/item/weapon/storage/box/glass_extras/straws, +/obj/item/storage/box/glasses/pint, +/obj/item/storage/box/glass_extras/straws, /obj/structure/table/standard{ name = "plastic table frame" }, @@ -12858,7 +12858,7 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/machinery/camera/network/civilian{ @@ -13247,7 +13247,7 @@ dir = 4 }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /obj/effect/floor_decal/techfloor/hole/right{ dir = 4 }, @@ -13498,7 +13498,7 @@ /obj/random/toy, /obj/random/tech_supply, /obj/random/junk, -/obj/item/weapon/flame/lighter/zippo, +/obj/item/flame/lighter/zippo, /turf/simulated/floor/plating, /area/maintenance/lower/bar) "aws" = ( @@ -13524,10 +13524,10 @@ /area/maintenance/lower/bar) "awv" = ( /obj/structure/closet/wardrobe/pjs, -/obj/item/weapon/handcuffs/fuzzy, -/obj/item/weapon/handcuffs/fuzzy, -/obj/item/weapon/handcuffs/legcuffs/fuzzy, -/obj/item/weapon/handcuffs/fuzzy, +/obj/item/handcuffs/fuzzy, +/obj/item/handcuffs/fuzzy, +/obj/item/handcuffs/legcuffs/fuzzy, +/obj/item/handcuffs/fuzzy, /obj/item/clothing/accessory/shiny/socks, /obj/item/clothing/under/shiny/catsuit, /obj/item/clothing/accessory/shiny/gloves, @@ -13821,7 +13821,7 @@ /area/tether/surfacebase/security/interrogation) "axc" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/interrogation) "axd" = ( @@ -13940,7 +13940,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 27 @@ -14032,7 +14032,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/weapon/deck/cah/black{ +/obj/item/deck/cah/black{ pixel_x = 5; pixel_y = 29 }, @@ -14338,7 +14338,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "aye" = ( -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "ayf" = ( @@ -15042,7 +15042,7 @@ /area/teleporter) "azN" = ( /obj/structure/table/standard, -/obj/item/weapon/hand_tele, +/obj/item/hand_tele, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/alarm{ pixel_y = 22 @@ -15050,11 +15050,11 @@ /turf/simulated/floor/tiled/dark, /area/teleporter) "azO" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -15159,7 +15159,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -15249,9 +15249,9 @@ /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, -/obj/item/device/gps/command, -/obj/item/device/gps/command, -/obj/item/device/gps/command, +/obj/item/gps/command, +/obj/item/gps/command, +/obj/item/gps/command, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -15356,11 +15356,11 @@ /area/tether/surfacebase/fish_farm) "aAz" = ( /obj/structure/table/rack, -/obj/item/weapon/material/fishing_rod/modern/cheap, -/obj/item/weapon/material/fishing_rod/modern/cheap, -/obj/item/weapon/material/fishing_rod/modern/cheap, -/obj/item/weapon/material/fishing_rod/modern/cheap, -/obj/item/weapon/material/fishing_rod/modern/cheap, +/obj/item/material/fishing_rod/modern/cheap, +/obj/item/material/fishing_rod/modern/cheap, +/obj/item/material/fishing_rod/modern/cheap, +/obj/item/material/fishing_rod/modern/cheap, +/obj/item/material/fishing_rod/modern/cheap, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -15459,7 +15459,7 @@ /turf/simulated/floor/tiled/dark, /area/teleporter) "aAO" = ( -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled/dark, /area/teleporter) "aAP" = ( @@ -15591,11 +15591,11 @@ /area/tether/surfacebase/fish_farm) "aBg" = ( /obj/structure/table/rack, -/obj/item/weapon/material/fishing_net, -/obj/item/weapon/material/fishing_net, -/obj/item/weapon/material/fishing_net, -/obj/item/weapon/material/fishing_net, -/obj/item/weapon/material/fishing_net, +/obj/item/material/fishing_net, +/obj/item/material/fishing_net, +/obj/item/material/fishing_net, +/obj/item/material/fishing_net, +/obj/item/material/fishing_net, /obj/machinery/camera/network/civilian{ dir = 9 }, @@ -15733,7 +15733,7 @@ /obj/effect/floor_decal/borderfloor/corner2{ dir = 6 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -16278,7 +16278,7 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -16895,7 +16895,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled/dark, @@ -18392,8 +18392,8 @@ /area/maintenance/lower/rnd) "aGB" = ( /obj/structure/table/steel, -/obj/item/weapon/handcuffs/fuzzy, -/obj/item/weapon/handcuffs/legcuffs/fuzzy, +/obj/item/handcuffs/fuzzy, +/obj/item/handcuffs/legcuffs/fuzzy, /turf/simulated/floor/plating, /area/maintenance/lower/south) "aGC" = ( @@ -18587,7 +18587,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/bridge/meeting_room) "aHb" = ( -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -18595,7 +18595,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/bridge/meeting_room) "aHc" = ( -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/structure/disposalpipe/segment, /obj/structure/table/fancyblack, /turf/simulated/floor/carpet/sblucarpet, @@ -18671,7 +18671,7 @@ /area/maintenance/asmaint2) "aHn" = ( /obj/effect/decal/cleanable/blood, -/obj/item/device/tape{ +/obj/item/rectape{ desc = "No Talk" }, /obj/item/clothing/suit/varsity/brown{ @@ -18718,11 +18718,11 @@ /turf/simulated/floor/carpet/sblucarpet, /area/bridge/meeting_room) "aHs" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -18730,7 +18730,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/bridge/meeting_room) "aHt" = ( -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/structure/disposalpipe/segment, /obj/structure/table/fancyblack, /turf/simulated/floor/carpet/sblucarpet, @@ -18746,7 +18746,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/bridge/meeting_room) "aHv" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -18849,7 +18849,7 @@ /obj/item/clothing/under/pants{ desc = "Overdose" }, -/obj/item/weapon/material/twohanded/baseballbat{ +/obj/item/material/twohanded/baseballbat{ desc = "Decadence"; health = 1989 }, @@ -19391,8 +19391,8 @@ pixel_y = 32; shut_up = 0 }, -/obj/item/weapon/tool/wirecutters, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wirecutters, +/obj/item/tool/wrench, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/atmos) "aIL" = ( @@ -19423,7 +19423,7 @@ /area/rnd/rdoffice) "aIQ" = ( /obj/structure/table/steel, -/obj/item/weapon/tape_roll, +/obj/item/tape_roll, /obj/item/stack/medical/bruise_pack, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/atmos) @@ -19469,7 +19469,7 @@ /area/bridge/meeting_room) "aIW" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /obj/machinery/camera/network/command{ dir = 9 }, @@ -19566,7 +19566,7 @@ /area/rnd/rdoffice) "aJk" = ( /obj/structure/closet/secure_closet/RD, -/obj/item/device/aicard, +/obj/item/aicard, /obj/item/clothing/glasses/omnihud/rnd, /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -19583,7 +19583,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/item/weapon/rig/hazmat/equipped, +/obj/item/rig/hazmat/equipped, /obj/structure/table/rack, /obj/machinery/light_switch{ pixel_y = 36 @@ -20297,7 +20297,7 @@ /area/chapel/main) "aKK" = ( /obj/structure/table/steel, -/obj/item/device/nif/bad, +/obj/item/nif/bad, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "aKL" = ( @@ -20382,18 +20382,18 @@ /area/rnd/rdoffice) "aKS" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white_rd, -/obj/item/weapon/stamp/rd, +/obj/item/folder/white_rd, +/obj/item/stamp/rd, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "aKT" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/device/megaphone, -/obj/item/weapon/paper/monitorkey, +/obj/item/megaphone, +/obj/item/paper/monitorkey, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -20557,11 +20557,11 @@ /area/tether/surfacebase/surface_two_hall) "aLl" = ( /obj/structure/table/woodentable, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = 2; pixel_y = 1 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 8 }, @@ -20579,7 +20579,7 @@ /area/chapel/office) "aLn" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 2; pixel_y = 7 }, @@ -20618,7 +20618,7 @@ /area/chapel/main) "aLs" = ( /obj/structure/table/rack, -/obj/item/device/flashlight, +/obj/item/flashlight, /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/structure/catwalk, @@ -20756,7 +20756,7 @@ /area/maintenance/substation/research) "aLF" = ( /obj/random/junk, -/obj/item/weapon/broken_bottle, +/obj/item/broken_bottle, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "aLG" = ( @@ -20924,7 +20924,7 @@ /turf/simulated/wall, /area/maintenance/lower/south) "aLZ" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 1; frequency = 1473; name = "Confession Intercom"; @@ -20953,7 +20953,7 @@ /turf/simulated/floor, /area/chapel/main) "aMb" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 1; frequency = 1473; name = "Confession Intercom"; @@ -21248,8 +21248,8 @@ /area/tether/surfacebase/surface_two_hall) "aMJ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, -/obj/item/weapon/nullrod, +/obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/item/nullrod, /obj/machinery/light/small, /turf/simulated/floor/lino, /area/chapel/office) @@ -21262,11 +21262,11 @@ /area/chapel/office) "aML" = ( /obj/structure/closet/wardrobe/chaplain_black, -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/flame/candle/candelabra, -/obj/item/weapon/flame/candle/candelabra, -/obj/item/weapon/flame/candle/candelabra, -/obj/item/weapon/flame/candle/candelabra, +/obj/item/storage/fancy/crayons, +/obj/item/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, +/obj/item/flame/candle/candelabra, /turf/simulated/floor/lino, /area/chapel/office) "aMM" = ( @@ -21393,8 +21393,8 @@ /area/rnd/rdoffice) "aMW" = ( /obj/structure/table/standard, -/obj/item/weapon/cartridge/signal/science, -/obj/item/weapon/cartridge/signal/science, +/obj/item/cartridge/signal/science, +/obj/item/cartridge/signal/science, /obj/item/clothing/glasses/welding/superior, /obj/structure/window/reinforced{ dir = 8 @@ -21421,14 +21421,14 @@ /area/rnd/rdoffice) "aMX" = ( /obj/structure/table/standard, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = -3 }, /obj/random/paicard{ pixel_x = 4 }, -/obj/item/weapon/circuitboard/teleporter, -/obj/item/weapon/circuitboard/aicore{ +/obj/item/circuitboard/teleporter, +/obj/item/circuitboard/aicore{ pixel_x = -2; pixel_y = 4 }, @@ -21565,13 +21565,13 @@ /obj/structure/catwalk, /obj/structure/table/steel, /obj/random/cigarettes, -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "aNq" = ( /obj/structure/catwalk, /obj/structure/table/steel, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "aNr" = ( @@ -21828,9 +21828,9 @@ /area/engineering/lower/lobby) "aNL" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/engineering_guide, -/obj/item/weapon/book/manual/engineering_construction, -/obj/item/weapon/book/manual/atmospipes, +/obj/item/book/manual/engineering_guide, +/obj/item/book/manual/engineering_construction, +/obj/item/book/manual/atmospipes, /turf/simulated/floor/tiled/dark, /area/engineering/lower/breakroom) "aNM" = ( @@ -22850,8 +22850,8 @@ /obj/effect/floor_decal/corner_techfloor_grid{ dir = 4 }, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/material/minihoe, +/obj/item/reagent_containers/glass/bucket, /obj/item/seeds/random, /obj/item/seeds/random, /obj/item/seeds/random, @@ -23003,9 +23003,9 @@ dir = 1 }, /obj/item/clothing/suit/fire/firefighter, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, /obj/item/clothing/mask/gas, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/glasses/meson, /obj/random/maintenance/clean, @@ -23134,8 +23134,8 @@ /area/engineering/lower/breakroom) "aQj" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/cups, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, +/obj/item/storage/box/cups, /obj/machinery/camera/network/engineering{ dir = 8 }, @@ -23684,14 +23684,14 @@ dir = 5 }, /obj/structure/table/standard, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 6 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, /obj/machinery/firealarm{ @@ -23793,9 +23793,9 @@ /area/tether/surfacebase/east_stairs_two) "aRB" = ( /obj/structure/closet, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, -/obj/item/weapon/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, +/obj/item/storage/mre/random, /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenence/upper) "aRC" = ( @@ -23949,8 +23949,8 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled, /area/engineering/lower/atmos_eva) "aRT" = ( @@ -24805,7 +24805,7 @@ dir = 8 }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; nightshift_setting = 2; @@ -24891,7 +24891,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/tiled, /area/engineering/lower/atmos_lockers) "aTL" = ( @@ -25191,7 +25191,7 @@ pixel_x = -5; pixel_y = 3 }, -/obj/item/weapon/storage/box/nifsofts_engineering, +/obj/item/storage/box/nifsofts_engineering, /turf/simulated/floor/tiled, /area/engineering/lower/atmos_lockers) "aUy" = ( @@ -25217,9 +25217,9 @@ /obj/structure/table/standard, /obj/item/clothing/gloves/black, /obj/item/clothing/gloves/black, -/obj/item/weapon/storage/belt/utility/atmostech, -/obj/item/weapon/cartridge/atmos, -/obj/item/device/floor_painter, +/obj/item/storage/belt/utility/atmostech, +/obj/item/cartridge/atmos, +/obj/item/floor_painter, /turf/simulated/floor/tiled, /area/engineering/lower/atmos_lockers) "aUA" = ( @@ -25343,7 +25343,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 27 @@ -25548,7 +25548,7 @@ dir = 8 }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; nightshift_setting = 2; @@ -26644,7 +26644,7 @@ /turf/simulated/floor/tiled, /area/janitor) "aXj" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/landmark/start{ name = "Janitor" }, @@ -26659,11 +26659,11 @@ dir = 4 }, /obj/structure/table/steel, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -26881,7 +26881,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/landmark/start{ name = "Janitor" }, @@ -26902,16 +26902,16 @@ dir = 4 }, /obj/structure/table/steel, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/soap/nanotrasen, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/soap/nanotrasen, +/obj/item/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/structure/extinguisher_cabinet{ dir = 8; pixel_x = 30 @@ -27208,8 +27208,8 @@ dir = 8 }, /obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled, /area/janitor) "aYA" = ( @@ -27217,16 +27217,16 @@ /obj/effect/floor_decal/corner/purple/border, /obj/machinery/light, /obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled, /area/janitor) "aYB" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, /obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled, /area/janitor) "aYC" = ( @@ -27267,7 +27267,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) "aYF" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/tiled/techmaint, /area/engineering/drone_fabrication) "aYG" = ( @@ -27347,7 +27347,7 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/random/medical/lite, /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) @@ -27518,11 +27518,11 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) "aZq" = ( @@ -27996,7 +27996,7 @@ "baS" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/closet/firecloset, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) @@ -28066,13 +28066,13 @@ /area/maintenance/lower/south) "bbm" = ( /obj/structure/table/steel, -/obj/item/weapon/flame/candle, -/obj/item/weapon/flame/candle, -/obj/item/weapon/flame/lighter, +/obj/item/flame/candle, +/obj/item/flame/candle, +/obj/item/flame/lighter, /turf/simulated/floor/plating, /area/maintenance/lower/south) "bbn" = ( -/obj/item/device/camera, +/obj/item/camera, /obj/structure/table/steel, /turf/simulated/floor/plating, /area/maintenance/lower/south) @@ -28274,7 +28274,7 @@ /area/maintenance/lower/atmos) "bca" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/rainbow, +/obj/item/bedsheet/rainbow, /turf/simulated/floor/wood, /area/maintenance/lower/atmos) "bcd" = ( @@ -28424,7 +28424,7 @@ /turf/simulated/floor/wood, /area/maintenance/lower/atmos) "bcQ" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/random/action_figure, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) @@ -28573,7 +28573,7 @@ /area/maintenance/lower/atmos) "bdl" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/teapot, +/obj/item/reagent_containers/food/drinks/teapot, /turf/simulated/floor/wood, /area/maintenance/lower/atmos) "bdm" = ( @@ -28811,8 +28811,8 @@ /area/maintenance/lower/atmos) "bdH" = ( /obj/structure/table/steel, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/crowbar, +/obj/item/tool/screwdriver, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/atmos) @@ -28820,9 +28820,9 @@ /obj/machinery/optable{ name = "Robotics Operating Table" }, -/obj/item/weapon/bone/ribs, -/obj/item/weapon/handcuffs/legcuffs, -/obj/item/weapon/handcuffs, +/obj/item/bone/ribs, +/obj/item/handcuffs/legcuffs, +/obj/item/handcuffs, /obj/effect/floor_decal/rust, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/tiled/techfloor/grid, @@ -28884,8 +28884,8 @@ /area/maintenance/lower/atmos) "bdZ" = ( /obj/structure/table/steel, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/hand_labeler, +/obj/item/storage/fancy/candle_box, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "beb" = ( @@ -28964,7 +28964,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_slimepens) "beo" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -29047,7 +29047,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "bez" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "beA" = ( @@ -29155,12 +29155,12 @@ /area/maintenance/lower/atmos) "beU" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "beV" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "beW" = ( @@ -29298,7 +29298,7 @@ }, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/item/device/radio/intercom/locked/ai_private{ +/obj/item/radio/intercom/locked/ai_private{ dir = 4; pixel_x = 32 }, @@ -29638,9 +29638,9 @@ /area/vacant/vacant_bar_upper) "bhi" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth, -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac, +/obj/item/reagent_containers/food/drinks/bottle/vermouth, +/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/food/drinks/bottle/cognac, /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) "bhj" = ( @@ -29740,7 +29740,7 @@ dir = 8 }, /obj/structure/table/glass, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) "bhK" = ( @@ -29843,7 +29843,7 @@ /obj/machinery/alarm{ pixel_y = 22 }, -/obj/item/weapon/bananapeel, +/obj/item/bananapeel, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "bhU" = ( @@ -29862,8 +29862,8 @@ /area/vacant/vacant_bar_upper) "bhX" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cola, +/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind, +/obj/item/reagent_containers/food/drinks/bottle/cola, /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) "bih" = ( @@ -29994,10 +29994,10 @@ /area/vacant/vacant_bar_upper) "biu" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/cream, -/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice, -/obj/item/weapon/reagent_containers/food/drinks/bottle/lemonjuice, +/obj/item/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/reagent_containers/food/drinks/bottle/cream, +/obj/item/reagent_containers/food/drinks/bottle/limejuice, +/obj/item/reagent_containers/food/drinks/bottle/lemonjuice, /obj/machinery/light{ dir = 4 }, @@ -30005,8 +30005,8 @@ /area/vacant/vacant_bar_upper) "biJ" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -30121,19 +30121,19 @@ /area/vacant/vacant_bar_upper) "biX" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager, -/obj/item/weapon/reagent_containers/food/drinks/bottle/sake, -/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/patron, -/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, -/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla, -/obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey, +/obj/item/reagent_containers/food/drinks/bottle/goldschlager, +/obj/item/reagent_containers/food/drinks/bottle/sake, +/obj/item/reagent_containers/food/drinks/bottle/kahlua, +/obj/item/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/patron, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/item/reagent_containers/food/drinks/bottle/tequilla, +/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey, /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) "bje" = ( /obj/structure/table/glass, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/structure/sign/painting/public{ pixel_x = -30 }, @@ -30311,7 +30311,7 @@ /area/rnd/outpost/xenobiology/outpost_slimepens) "bjI" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /obj/structure/curtain/open/privacy, /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) @@ -30735,7 +30735,7 @@ /area/maintenance/lower/atmos) "bkW" = ( /obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, +/obj/item/bedsheet/double, /obj/structure/curtain/open/privacy, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/wood, @@ -31324,7 +31324,7 @@ /obj/machinery/computer/med_data/laptop{ dir = 4 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = -24 }, @@ -31867,7 +31867,7 @@ dir = 4 }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 1; name = "north bump"; pixel_y = 24 @@ -31940,7 +31940,7 @@ /area/tether/surfacebase/funny/hideyhole) "eKi" = ( /obj/effect/floor_decal/borderfloor, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -31997,7 +31997,7 @@ /turf/simulated/floor/beach/sand/desert, /area/tether/surfacebase/fish_farm) "frf" = ( -/obj/item/weapon/paper{ +/obj/item/paper{ info = "I finally got them. The last pair of Shitty Tim's Shitty Timbs. I waited in line at the cargo shop for what seemed like hours. It probably was hours quite frankly. Well after I got my box, someone ran by and jacked my heels! Well I needed shoes so I snuck inside and stole what they had left. Just a pair of NT worshoes. But atleast I'm not walking away barefooted. If only I wasn't caught by a security. I feel like I've been in this hole for days. Good thing I managed to pilfer some provisions on the way here."; name = "Pilferer's note" }, @@ -32062,7 +32062,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining) "gaR" = ( -/obj/item/device/radio/intercom/locked/ai_private{ +/obj/item/radio/intercom/locked/ai_private{ dir = 4; pixel_x = 32 }, @@ -32280,7 +32280,7 @@ /area/maintenance/lower/north) "ilH" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/reset, +/obj/item/aiModule/reset, /obj/machinery/alarm{ dir = 4; pixel_x = -28 @@ -32289,14 +32289,14 @@ /area/ai_upload) "ilX" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/nanotrasen, +/obj/item/aiModule/nanotrasen, /obj/machinery/camera/network/command, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/bluegrid, /area/ai_upload) "iol" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/freeform, +/obj/item/aiModule/freeform, /obj/machinery/light{ dir = 1 }, @@ -32698,7 +32698,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "lMw" = ( -/obj/item/device/radio/intercom/locked/ai_private{ +/obj/item/radio/intercom/locked/ai_private{ dir = 4; pixel_x = 32 }, @@ -32809,7 +32809,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "nbT" = ( -/obj/item/device/radio/intercom/locked/ai_private{ +/obj/item/radio/intercom/locked/ai_private{ dir = 4; pixel_x = 32 }, @@ -32844,20 +32844,20 @@ /area/tether/surfacebase/medical/breakroom) "nAh" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/asimov, -/obj/item/weapon/aiModule/freeformcore, -/obj/item/weapon/aiModule/corp, -/obj/item/weapon/aiModule/paladin, -/obj/item/weapon/aiModule/robocop, +/obj/item/aiModule/asimov, +/obj/item/aiModule/freeformcore, +/obj/item/aiModule/corp, +/obj/item/aiModule/paladin, +/obj/item/aiModule/robocop, /turf/simulated/floor/bluegrid, /area/ai_upload) "nBC" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/consuming_eradicator, -/obj/item/weapon/aiModule/guard_dog, -/obj/item/weapon/aiModule/pleasurebot, -/obj/item/weapon/aiModule/protective_shell, -/obj/item/weapon/aiModule/scientific_pursuer, +/obj/item/aiModule/consuming_eradicator, +/obj/item/aiModule/guard_dog, +/obj/item/aiModule/pleasurebot, +/obj/item/aiModule/protective_shell, +/obj/item/aiModule/scientific_pursuer, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -32871,11 +32871,11 @@ /area/maintenance/lower/north) "nJO" = ( /obj/structure/table/standard, -/obj/item/weapon/aiModule/oxygen, -/obj/item/weapon/aiModule/oneHuman, -/obj/item/weapon/aiModule/purge, -/obj/item/weapon/aiModule/antimov, -/obj/item/weapon/aiModule/teleporterOffline, +/obj/item/aiModule/oxygen, +/obj/item/aiModule/oneHuman, +/obj/item/aiModule/purge, +/obj/item/aiModule/antimov, +/obj/item/aiModule/teleporterOffline, /turf/simulated/floor/bluegrid, /area/ai_upload) "nOG" = ( @@ -32889,7 +32889,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/glass, -/obj/item/weapon/deck/cah, +/obj/item/deck/cah, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) @@ -32923,10 +32923,10 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai_upload) "olc" = ( -/obj/item/weapon/grenade/chem_grenade/cleaner{ +/obj/item/grenade/chem_grenade/cleaner{ pixel_x = -10 }, -/obj/item/weapon/grenade/anti_photon, +/obj/item/grenade/anti_photon, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/hideyhole) "omM" = ( @@ -32985,7 +32985,7 @@ /area/ai) "pKA" = ( /obj/structure/table/standard, -/obj/item/weapon/phone, +/obj/item/phone, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/power/apc{ dir = 1; @@ -33014,13 +33014,13 @@ /obj/structure/closet/crate{ name = "Camera Assembly Crate" }, -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, -/obj/item/weapon/camera_assembly, -/obj/item/device/radio/intercom/locked/ai_private{ +/obj/item/camera_assembly, +/obj/item/camera_assembly, +/obj/item/camera_assembly, +/obj/item/camera_assembly, +/obj/item/camera_assembly, +/obj/item/camera_assembly, +/obj/item/radio/intercom/locked/ai_private{ dir = 1; pixel_y = 32 }, @@ -33323,12 +33323,12 @@ /turf/simulated/floor/water/indoors, /area/tether/surfacebase/fish_farm) "shd" = ( -/obj/item/weapon/storage/rollingpapers, +/obj/item/storage/rollingpapers, /obj/item/clothing/mask/smokable/cigarette/joint, /obj/item/clothing/mask/smokable/cigarette/joint, /obj/item/clothing/mask/smokable/cigarette/cigar/cohiba, /obj/item/clothing/mask/smokable/cigarette/cigar/cohiba, -/obj/item/weapon/flame/lighter/zippo/moff, +/obj/item/flame/lighter/zippo/moff, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/hideyhole) "skm" = ( @@ -33658,17 +33658,17 @@ pixel_x = -32; pixel_y = 32 }, -/obj/item/device/radio/intercom/locked/ai_private{ +/obj/item/radio/intercom/locked/ai_private{ dir = 4; pixel_x = 32 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ broadcasting = 1; dir = 8; name = "Common Channel"; pixel_x = -21 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -33925,7 +33925,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "wKz" = ( -/obj/item/device/radio/intercom/locked/ai_private{ +/obj/item/radio/intercom/locked/ai_private{ dir = 4; pixel_x = 32 }, diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 4396ff2656a..3f27825a07a 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -143,7 +143,7 @@ /obj/structure/table/bench/steel, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/camera/network/security, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -241,7 +241,7 @@ /area/tether/surfacebase/security/iaa) "aav" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -412,8 +412,8 @@ dir = 4 }, /obj/structure/closet/secure_closet/medical3, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/storage/belt/medical, +/obj/item/soap/nanotrasen, +/obj/item/storage/belt/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "aaK" = ( @@ -427,14 +427,14 @@ dir = 10 }, /obj/structure/closet/secure_closet/medical3, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/item/weapon/storage/belt/medical, +/obj/item/storage/belt/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "aaL" = ( @@ -545,7 +545,7 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/obj/item/weapon/gun/energy/mouseray/medical, +/obj/item/gun/energy/mouseray/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "aaT" = ( @@ -562,8 +562,8 @@ dir = 1 }, /obj/structure/closet/secure_closet/medical3, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/storage/belt/medical, +/obj/item/soap/nanotrasen, +/obj/item/storage/belt/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "aaU" = ( @@ -645,14 +645,14 @@ /area/tether/surfacebase/security/upperhall) "aaZ" = ( /obj/structure/table/standard, -/obj/item/device/defib_kit/loaded, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/defib_kit/loaded, +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 4; pixel_x = 24 }, @@ -675,7 +675,7 @@ /obj/structure/table/standard, /obj/random/tetheraid, /obj/random/tetheraid, -/obj/item/weapon/storage/secure/briefcase/ml3m_pack_med, +/obj/item/storage/secure/briefcase/ml3m_pack_med, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "abc" = ( @@ -704,7 +704,7 @@ /area/tether/surfacebase/outside/outside3) "abe" = ( /obj/structure/closet, -/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla, +/obj/item/reagent_containers/food/drinks/bottle/tequilla, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "abf" = ( @@ -818,7 +818,7 @@ /obj/random/maintenance/medical, /obj/random/maintenance/clean, /obj/random/junk, -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/food/drinks/bottle/rum{ desc = "TASTE DEMOCRACY"; name = "Managed Democra-cider" }, @@ -838,8 +838,8 @@ /area/tether/surfacebase/medical/triage) "abp" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/device/radio/intercom{ +/obj/item/storage/firstaid/surgery, +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 @@ -908,7 +908,7 @@ dir = 1 }, /obj/structure/closet/secure_closet/medical3, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -918,7 +918,7 @@ /obj/machinery/camera/network/medbay{ dir = 8 }, -/obj/item/weapon/storage/belt/medical, +/obj/item/storage/belt/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "abv" = ( @@ -1115,7 +1115,7 @@ /area/tether/surfacebase/security/iaa) "abK" = ( /obj/machinery/computer/security, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 @@ -1210,7 +1210,7 @@ /area/maintenance/lower/medsec_maintenance) "abS" = ( /obj/structure/table/steel, -/obj/item/weapon/reagent_containers/food/drinks/cup{ +/obj/item/reagent_containers/food/drinks/cup{ desc = "Taste liberty"; name = "Cup of Liber-tea" }, @@ -1591,11 +1591,11 @@ /area/maintenance/lower/medsec_maintenance) "acx" = ( /obj/structure/table/glass, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -4; pixel_y = 4 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 4; pixel_y = -4 }, @@ -1658,13 +1658,13 @@ /area/tether/surfacebase/security/iaa) "acC" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/multi, +/obj/item/pen/multi, /obj/random/tetheraid, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/floor_decal/borderfloor{ dir = 10 }, @@ -1675,19 +1675,19 @@ /area/tether/surfacebase/security/upperhall) "acD" = ( /obj/structure/table/steel, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/packageWrap, +/obj/item/hand_labeler, +/obj/item/packageWrap, /obj/structure/reagent_dispensers/peppertank{ pixel_y = -30 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "acE" = ( /obj/machinery/computer/secure_data, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 1; pixel_y = 24 }, @@ -1701,12 +1701,12 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) "acG" = ( /obj/structure/table/steel, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) @@ -1743,9 +1743,9 @@ /area/tether/surfacebase/security/upperhall) "acK" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/command_guide, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/command_guide, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -1820,8 +1820,8 @@ /area/tether/surfacebase/medical/admin) "acQ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -1836,7 +1836,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, @@ -2008,7 +2008,7 @@ /area/tether/surfacebase/security/iaa) "adg" = ( /obj/structure/table/steel, -/obj/item/device/camera, +/obj/item/camera, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -2019,8 +2019,8 @@ dir = 4; pixel_x = -22 }, -/obj/item/device/retail_scanner/security, -/obj/item/device/taperecorder, +/obj/item/retail_scanner/security, +/obj/item/taperecorder, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) "adh" = ( @@ -2137,11 +2137,11 @@ /area/tether/surfacebase/security/upperhall) "ado" = ( /obj/structure/table/reinforced, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 4; pixel_y = 4 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -4 }, /obj/machinery/recharger, @@ -2191,7 +2191,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "ads" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 @@ -2272,7 +2272,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) "ady" = ( @@ -2427,7 +2427,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) "adQ" = ( @@ -2494,7 +2494,7 @@ /area/tether/surfacebase/security/upperhall) "adU" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/evidence, +/obj/item/storage/box/evidence, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -2518,7 +2518,7 @@ pixel_x = 1; pixel_y = 1 }, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = 2; pixel_y = 1 }, @@ -2531,10 +2531,10 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/item/weapon/storage/box/lights/mixed{ +/obj/item/storage/box/lights/mixed{ pixel_y = 4 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -2 }, @@ -2558,7 +2558,7 @@ /area/tether/surfacebase/security/lobby) "adY" = ( /obj/structure/table/steel, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -2582,7 +2582,7 @@ /area/tether/surfacebase/medical/surgery1) "aeb" = ( /obj/structure/table/steel, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "aec" = ( @@ -2602,7 +2602,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -2662,14 +2662,14 @@ /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/accessory/stethoscope, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_y = 9 }, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_y = 9 }, /obj/random/medical, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 14; pixel_y = 10 }, @@ -2840,11 +2840,11 @@ dir = 4; pixel_x = 28 }, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, /obj/random/drinkbottle, -/obj/item/device/camera_film, -/obj/item/device/tape/random, +/obj/item/camera_film, +/obj/item/rectape/random, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa/officecommon) "aeu" = ( @@ -3146,10 +3146,10 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, @@ -3172,11 +3172,11 @@ dir = 8 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /obj/machinery/alarm{ dir = 4; pixel_x = -22 @@ -3185,13 +3185,13 @@ /area/tether/surfacebase/medical/triage) "aeS" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/machinery/alarm{ pixel_y = 32 }, @@ -3307,9 +3307,9 @@ icon_state = "0-2" }, /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) "afc" = ( @@ -3494,7 +3494,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "afr" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -3821,7 +3821,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -3852,11 +3852,11 @@ /area/hydroponics) "afU" = ( /obj/structure/table/steel, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) "afV" = ( @@ -3888,7 +3888,7 @@ "afX" = ( /obj/machinery/portable_atmospherics/canister/oxygen/prechilled, /obj/machinery/atmospherics/portables_connector, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/machinery/door/window/brigdoor/southright{ req_access = list(); req_one_access = list(5) @@ -4189,7 +4189,7 @@ "agy" = ( /obj/structure/disposalpipe/segment, /obj/structure/table/steel, -/obj/item/weapon/storage/bag/circuits/basic, +/obj/item/storage/bag/circuits/basic, /obj/machinery/alarm{ dir = 4; pixel_x = -22 @@ -4389,7 +4389,7 @@ /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/paleblue/bordercorner2, /obj/structure/table/glass, -/obj/item/device/healthanalyzer/guide, +/obj/item/healthanalyzer/guide, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "agN" = ( @@ -4429,7 +4429,7 @@ }, /obj/machinery/recharger, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/ticket_printer, +/obj/item/ticket_printer, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "agQ" = ( @@ -4490,7 +4490,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "agU" = ( @@ -5100,8 +5100,8 @@ /obj/machinery/injector_maker{ pixel_x = -27 }, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/packageWrap, +/obj/item/hand_labeler, +/obj/item/packageWrap, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "ahP" = ( @@ -5177,11 +5177,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 4; pixel_y = 7 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = 5; pixel_y = 5 }, @@ -5479,7 +5479,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall/nwest) "ais" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -5491,10 +5491,10 @@ /area/rnd/xenobiology/xenoflora_storage) "aiu" = ( /obj/structure/table/steel, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = -5 }, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -5512,7 +5512,7 @@ /area/tether/surfacebase/surface_three_hall) "aiw" = ( /obj/structure/table/steel, -/obj/item/device/integrated_circuit_printer, +/obj/item/integrated_circuit_printer, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -5533,7 +5533,7 @@ /area/tether/surfacebase/surface_three_hall/west) "aiy" = ( /obj/structure/table/steel, -/obj/item/device/electronic_assembly/large/default, +/obj/item/electronic_assembly/large/default, /obj/machinery/light{ dir = 4 }, @@ -5825,8 +5825,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/security/lobby) "aiV" = ( @@ -6084,7 +6084,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -6289,7 +6289,7 @@ }, /obj/structure/table/steel, /obj/effect/floor_decal/rust, -/obj/item/device/gps/science, +/obj/item/gps/science, /turf/simulated/floor/plating, /area/rnd/research_storage) "ajJ" = ( @@ -6726,10 +6726,10 @@ /area/tether/surfacebase/surface_three_hall) "akt" = ( /obj/structure/table/steel, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = -5 }, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = 5 }, /obj/effect/floor_decal/techfloor, @@ -6809,7 +6809,7 @@ dir = 9 }, /obj/structure/table/glass, -/obj/item/device/healthanalyzer/guide, +/obj/item/healthanalyzer/guide, /obj/machinery/camera/network/medbay{ dir = 1 }, @@ -6828,7 +6828,7 @@ /area/tether/surfacebase/medical/chemistry) "akB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -6841,8 +6841,8 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /obj/machinery/light{ dir = 4 }, @@ -7586,8 +7586,8 @@ /area/tether/surfacebase/surface_three_hall) "amd" = ( /obj/structure/table/glass, -/obj/item/weapon/material/ashtray/plastic, -/obj/item/device/radio/intercom{ +/obj/item/material/ashtray/plastic, +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -7804,7 +7804,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/machinery/camera/network/tether{ @@ -8020,7 +8020,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -8082,7 +8082,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorblack, @@ -8237,11 +8237,11 @@ "anA" = ( /obj/structure/table/standard, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -8732,8 +8732,8 @@ pixel_y = -25 }, /obj/structure/table/steel, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -8742,8 +8742,8 @@ "aoB" = ( /obj/machinery/light/small, /obj/structure/mopbucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -8964,7 +8964,7 @@ }) "aoY" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -30 @@ -9880,7 +9880,7 @@ /turf/simulated/floor/water/pool, /area/crew_quarters/pool) "aqC" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -10256,7 +10256,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "arp" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -10737,7 +10737,7 @@ /area/rnd/research) "asc" = ( /obj/structure/table/woodentable, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -10880,7 +10880,7 @@ /area/tether/surfacebase/surface_three_hall) "ass" = ( /obj/structure/table/glass, -/obj/item/weapon/inflatable_duck, +/obj/item/inflatable_duck, /obj/effect/floor_decal/spline/plain{ dir = 8 }, @@ -11003,10 +11003,10 @@ /obj/effect/floor_decal/spline/plain{ dir = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, /obj/machinery/door/blast/gate/thin{ @@ -11171,7 +11171,7 @@ /turf/simulated/floor/grass, /area/hydroponics) "asR" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/light{ dir = 4 }, @@ -11179,7 +11179,7 @@ /area/crew_quarters/pool) "asS" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -30 @@ -11390,10 +11390,10 @@ /area/tether/surfacebase/surface_three_hall) "atu" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/photo_album{ +/obj/item/storage/photo_album{ pixel_y = -10 }, -/obj/item/weapon/reagent_containers/food/drinks/flask{ +/obj/item/reagent_containers/food/drinks/flask{ pixel_x = 8 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -11403,7 +11403,7 @@ dir = 1; pixel_y = -24 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/carnoth, +/obj/item/reagent_containers/food/drinks/bottle/carnoth, /turf/simulated/floor/wood, /area/crew_quarters/captain) "atv" = ( @@ -11436,10 +11436,10 @@ /obj/structure/table/standard{ name = "plastic table frame" }, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/storage/box/botanydisk, -/obj/item/weapon/storage/box/botanydisk, +/obj/item/reagent_containers/glass/bucket, +/obj/item/material/minihoe, +/obj/item/storage/box/botanydisk, +/obj/item/storage/box/botanydisk, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -11547,8 +11547,8 @@ "atM" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/grey/diagonal, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/material/knife/butch, +/obj/item/material/kitchen/rollingpin, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atN" = ( @@ -11560,11 +11560,11 @@ "atO" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -11609,7 +11609,7 @@ /area/rnd/research) "atV" = ( /obj/structure/table/steel, -/obj/item/device/electronic_assembly/large/default, +/obj/item/electronic_assembly/large/default, /obj/machinery/light, /obj/effect/floor_decal/techfloor{ dir = 10 @@ -11618,8 +11618,8 @@ /area/rnd/workshop) "atW" = ( /obj/structure/table/steel, -/obj/item/device/integrated_circuit_printer, -/obj/item/device/radio/intercom{ +/obj/item/integrated_circuit_printer, +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/effect/floor_decal/techfloor, @@ -11739,7 +11739,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "auf" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/reinforced, @@ -11828,7 +11828,7 @@ /area/rnd/xenobiology/xenoflora) "aup" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -11857,11 +11857,11 @@ /area/rnd/workshop) "aur" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, /obj/machinery/light_switch{ pixel_x = -25 }, @@ -11954,7 +11954,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "auz" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -12099,7 +12099,7 @@ /area/tether/surfacebase/surface_three_hall) "auK" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/light{ dir = 4 }, @@ -12139,12 +12139,12 @@ /area/rnd/xenobiology/xenoflora) "auN" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/syringes, +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, @@ -12264,12 +12264,12 @@ /area/hallway/lower/third_south) "avb" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/syringes, +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 4 }, @@ -12367,7 +12367,7 @@ pixel_x = -8; pixel_y = -26 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -12453,10 +12453,10 @@ /area/tether/surfacebase/shuttle_pad) "avt" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -12495,7 +12495,7 @@ /turf/simulated/wall, /area/crew_quarters/kitchen) "avz" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/tiled/white, @@ -12679,13 +12679,13 @@ /area/crew_quarters/captain) "avS" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/scanning_module{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/stock_parts/scanning_module, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -12740,18 +12740,18 @@ /area/rnd/research) "avX" = ( /obj/machinery/door/firedoor, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/westright{ name = "Research Desk"; req_access = list(7); req_one_access = list(47) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 4 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/monotile, /area/rnd/research) "avY" = ( @@ -12867,9 +12867,9 @@ dir = 4; pixel_x = 5 }, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /obj/structure/curtain/open/shower, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/simulated/floor/tiled/white, /area/crew_quarters/captain) "awk" = ( @@ -13035,7 +13035,7 @@ /turf/simulated/floor/tiled, /area/rnd/research) "awz" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -13407,7 +13407,7 @@ /obj/machinery/r_n_d/circuit_imprinter{ dir = 1 }, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/simulated/floor/tiled/dark, /area/rnd/research) "awZ" = ( @@ -13629,8 +13629,8 @@ /area/hallway/lower/third_south) "axx" = ( /obj/structure/table/woodentable, -/obj/item/weapon/packageWrap, -/obj/item/device/destTagger{ +/obj/item/packageWrap, +/obj/item/destTagger{ pixel_x = 4; pixel_y = 3 }, @@ -13785,16 +13785,16 @@ /area/rnd/research/researchdivision) "axJ" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, /obj/item/clothing/glasses/welding, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -13836,10 +13836,10 @@ /obj/structure/reagent_dispensers/acid{ pixel_y = -30 }, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/pen, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/hand_labeler, +/obj/item/pen, +/obj/item/packageWrap, +/obj/item/packageWrap, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -13849,17 +13849,17 @@ /area/rnd/research) "axM" = ( /obj/structure/table/standard, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/reagent_containers/dropper{ +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, +/obj/item/reagent_containers/dropper{ pixel_y = -4 }, /obj/item/clothing/glasses/omnihud/rnd, /obj/item/clothing/gloves/sterile/latex, /obj/machinery/light, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor, @@ -13949,8 +13949,8 @@ desc = "There appears to be a shrine to WGW at the back..."; name = "Forbidden Knowledge" }, -/obj/item/weapon/book/manual/engineering_hacking, -/obj/item/weapon/book/manual/nuclear, +/obj/item/book/manual/engineering_hacking, +/obj/item/book/manual/nuclear, /turf/simulated/floor/carpet, /area/tether/surfacebase/library/study) "axV" = ( @@ -13959,10 +13959,10 @@ }, /obj/structure/closet, /obj/item/clothing/under/suit_jacket/red, -/obj/item/weapon/barcodescanner, -/obj/item/weapon/pen/invisible, -/obj/item/weapon/pen/invisible, -/obj/item/weapon/pen/invisible, +/obj/item/barcodescanner, +/obj/item/pen/invisible, +/obj/item/pen/invisible, +/obj/item/pen/invisible, /obj/item/canvas, /obj/item/canvas/nineteen_nineteen, /obj/item/canvas/twentyfour_twentyfour, @@ -13977,11 +13977,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -2; pixel_y = -5 }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = 3 }, /obj/structure/sign/painting/library_private{ @@ -13999,12 +13999,12 @@ "axY" = ( /obj/structure/table/woodentable, /obj/structure/disposalpipe/segment, -/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, +/obj/item/reagent_containers/food/drinks/flask/vacuumflask, /obj/machinery/camera/network/civilian{ dir = 4 }, -/obj/item/weapon/reagent_containers/glass/rag, -/obj/item/weapon/book/manual/bar_guide, +/obj/item/reagent_containers/glass/rag, +/obj/item/book/manual/bar_guide, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "axZ" = ( @@ -14558,7 +14558,7 @@ /obj/structure/noticeboard{ pixel_y = -26 }, -/obj/item/weapon/paper{ +/obj/item/paper{ desc = ""; info = "Please wear hearing and eye protection when testing firearms."; name = "note to science staff" @@ -14724,7 +14724,7 @@ name = "Librarian" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -30 @@ -14860,7 +14860,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/lino, @@ -14993,15 +14993,15 @@ }, /obj/item/clothing/glasses/welding, /obj/item/clothing/glasses/welding, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/device/multitool{ +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/multitool{ pixel_x = 3 }, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/tool/crowbar, +/obj/item/tool/crowbar, +/obj/item/storage/belt/utility, +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 6 }, @@ -15023,58 +15023,58 @@ /obj/structure/closet{ name = "robotics parts" }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, -/obj/item/device/flash/synthetic, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 }, @@ -15228,11 +15228,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = 2; pixel_y = 6 }, @@ -15265,9 +15265,9 @@ /area/rnd/outpost/xenobiology/outpost_breakroom) "azV" = ( /obj/structure/table/woodentable, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/taperecorder, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/taperecorder, /turf/simulated/floor/carpet, /area/library) "azW" = ( @@ -15544,18 +15544,18 @@ /area/hallway/lower/third_south) "aAw" = ( /obj/structure/table/woodentable, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /obj/machinery/newscaster{ pixel_y = -28 }, -/obj/item/device/retail_scanner/civilian{ +/obj/item/retail_scanner/civilian{ dir = 1 }, -/obj/item/device/camera, -/obj/item/device/tape, +/obj/item/camera, +/obj/item/rectape, /obj/structure/sign/painting/library_private{ pixel_x = -30 }, @@ -15581,11 +15581,11 @@ }) "aAy" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/invisible, +/obj/item/pen/invisible, /obj/machinery/light/small, /turf/simulated/floor/carpet, /area/tether/surfacebase/library/study) @@ -15597,7 +15597,7 @@ /area/library) "aAA" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -15634,11 +15634,11 @@ /area/tether/surfacebase/botanystorage) "aAE" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/carpet, /area/library) "aAF" = ( @@ -15891,9 +15891,9 @@ /area/rnd/robotics) "aBa" = ( /obj/structure/table/standard, -/obj/item/device/lightreplacer, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/lightreplacer, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -16056,7 +16056,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aBl" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -16100,7 +16100,7 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "aBq" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -28 }, /obj/structure/bed/chair/office/light{ @@ -16147,7 +16147,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/weapon/paper, +/obj/item/paper, /turf/simulated/floor/carpet, /area/library) "aBw" = ( @@ -16195,7 +16195,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aBA" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aBB" = ( @@ -16351,7 +16351,7 @@ dir = 1; pixel_y = -24 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, @@ -16448,8 +16448,8 @@ /obj/machinery/ai_status_display{ pixel_y = 30 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light{ dir = 1 }, @@ -16526,7 +16526,7 @@ /area/rnd/xenobiology/xenoflora) "aCb" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper{ +/obj/item/paper{ desc = ""; info = "This is a direct notice to anyone using firing range: All tests involving destruction of testing facilities MUST be run through Research Director or Central Command before anyone even so much as thinks about going through with this, or be moved outside to where test cannot affect any existing facility. This is both to maintain a professional environment, and ensure nobody else is harmed during these experiments. Nobody wants another 'two SM shards going nuclear in the firing range' incident again, especially not the people handling your paychecks."; name = "note to science staff" @@ -16611,8 +16611,8 @@ "aCg" = ( /obj/structure/table/woodentable, /obj/machinery/light, -/obj/item/weapon/packageWrap, -/obj/item/device/destTagger{ +/obj/item/packageWrap, +/obj/item/destTagger{ pixel_x = 4; pixel_y = 3 }, @@ -16645,7 +16645,7 @@ /area/hydroponics/cafegarden) "aCk" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/sinpockets, +/obj/item/storage/box/sinpockets, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, @@ -16743,11 +16743,11 @@ req_access = list(7); req_one_access = list(47) }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 4 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) "aCv" = ( @@ -16825,7 +16825,7 @@ /obj/structure/table/woodentable, /obj/item/clothing/mask/smokable/pipe/cobpipe, /obj/item/clothing/mask/smokable/cigarette/joint, -/obj/item/weapon/flame/lighter/random, +/obj/item/flame/lighter/random, /obj/effect/floor_decal/borderfloor{ dir = 6 }, @@ -16932,7 +16932,7 @@ pixel_y = -24 }, /obj/structure/table/woodentable, -/obj/item/device/tvcamera, +/obj/item/tvcamera, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -17216,9 +17216,9 @@ /area/tether/surfacebase/public_garden_three) "aDt" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/minihoe, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/material/minihoe, +/obj/item/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 }, @@ -17284,7 +17284,7 @@ dir = 10 }, /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/floor_decal/techfloor{ dir = 5 }, @@ -17341,7 +17341,7 @@ /obj/item/honey_frame, /obj/item/honey_frame, /obj/item/honey_frame, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /obj/item/bee_smoker, /obj/item/beehive_assembly, /obj/structure/closet/crate/hydroponics{ @@ -17521,7 +17521,7 @@ /area/tether/surfacebase/public_garden_three) "aDU" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/paperplane, +/obj/item/paperplane, /obj/machinery/camera/network/research/xenobio, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) @@ -17640,10 +17640,10 @@ layer = 3.3; pixel_x = -27 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/folder/red, +/obj/item/folder/blue, +/obj/item/pen, /obj/machinery/alarm{ pixel_y = 22 }, @@ -17916,11 +17916,11 @@ /obj/structure/bookcase{ name = "bookcase (Fiction)" }, -/obj/item/weapon/book/custom_library/fiction/blacksmithandkinglybloke, -/obj/item/weapon/book/custom_library/fiction/irishairmanforseesdeath, -/obj/item/weapon/book/custom_library/fiction/myrock, -/obj/item/weapon/book/custom_library/fiction/starsandsometimesfallingones, -/obj/item/weapon/book/custom_library/fiction/truelovehathmyheart, +/obj/item/book/custom_library/fiction/blacksmithandkinglybloke, +/obj/item/book/custom_library/fiction/irishairmanforseesdeath, +/obj/item/book/custom_library/fiction/myrock, +/obj/item/book/custom_library/fiction/starsandsometimesfallingones, +/obj/item/book/custom_library/fiction/truelovehathmyheart, /turf/simulated/floor/wood, /area/library) "aEE" = ( @@ -17951,10 +17951,10 @@ /obj/structure/bookcase{ name = "bookcase (Non-Fiction)" }, -/obj/item/weapon/book/codex/lore/robutt, -/obj/item/weapon/book/codex, -/obj/item/weapon/book/custom_library/nonfiction/freesirisailightbulbs, -/obj/item/weapon/book/manual/synthetic_life, +/obj/item/book/codex/lore/robutt, +/obj/item/book/codex, +/obj/item/book/custom_library/nonfiction/freesirisailightbulbs, +/obj/item/book/manual/synthetic_life, /turf/simulated/floor/wood, /area/library) "aEJ" = ( @@ -18143,10 +18143,10 @@ /obj/structure/table/standard{ name = "plastic table frame" }, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/wrench, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/tool/wrench, +/obj/item/tool/wrench, /obj/effect/floor_decal/corner/lime/full{ dir = 8 }, @@ -18168,10 +18168,10 @@ /obj/structure/bookcase{ name = "bookcase (Religious)" }, -/obj/item/weapon/book/custom_library/religious/feastofkubera, -/obj/item/weapon/book/custom_library/religious/storyoflordganesha, -/obj/item/weapon/book/custom_library/religious/sungoddessofkorea, -/obj/item/weapon/book/custom_library/religious/wayofbleedingswan, +/obj/item/book/custom_library/religious/feastofkubera, +/obj/item/book/custom_library/religious/storyoflordganesha, +/obj/item/book/custom_library/religious/sungoddessofkorea, +/obj/item/book/custom_library/religious/wayofbleedingswan, /turf/simulated/floor/wood, /area/library) "aFe" = ( @@ -18236,7 +18236,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -18265,15 +18265,15 @@ /obj/structure/table/standard{ name = "plastic table frame" }, -/obj/item/weapon/material/knife, -/obj/item/weapon/material/knife, +/obj/item/material/knife, +/obj/item/material/knife, /obj/effect/floor_decal/corner/lime/full{ dir = 1 }, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/weapon/material/minihoe, -/obj/item/weapon/material/minihoe, +/obj/item/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, +/obj/item/material/minihoe, +/obj/item/material/minihoe, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFl" = ( @@ -18354,9 +18354,9 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) "aFq" = ( -/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, /obj/item/clothing/gloves/fyellow, -/obj/item/weapon/book{ +/obj/item/book{ author = "Urist McHopefulsoul"; desc = "It contains fourty blank pages followed by the entire screenplay of a movie called 'Requiem for a Dream'"; name = "A Comprehensive Guide to Assisting" @@ -18414,7 +18414,7 @@ "aFx" = ( /obj/item/clothing/under/color/grey, /obj/item/clothing/mask/gas/wwii, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /turf/simulated/floor/plating, /area/tether/surfacebase/shuttle_pad) "aFy" = ( @@ -18473,7 +18473,7 @@ /area/tether/surfacebase/botanystorage) "aFE" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -18494,7 +18494,7 @@ /area/rnd/outpost/xenobiology/outpost_breakroom) "aFG" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -18585,8 +18585,8 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/item/weapon/storage/bag/trash, -/obj/item/weapon/storage/bag/trash, +/obj/item/storage/bag/trash, +/obj/item/storage/bag/trash, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "aFO" = ( @@ -18620,7 +18620,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -18735,7 +18735,7 @@ pixel_x = 24; pixel_y = 10 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/landmark/start{ name = "Entertainer" }, @@ -19033,21 +19033,21 @@ /obj/structure/bookcase{ name = "bookcase (Reference)" }, -/obj/item/weapon/book/manual/hydroponics_pod_people, -/obj/item/weapon/book/manual/mass_spectrometry, -/obj/item/weapon/book/manual/materials_chemistry_analysis, -/obj/item/weapon/book/manual/medical_cloning, -/obj/item/weapon/book/manual/medical_diagnostics_manual, -/obj/item/weapon/book/manual/research_and_development, -/obj/item/weapon/book/manual/resleeving, -/obj/item/weapon/book/manual/ripley_build_and_repair, -/obj/item/weapon/book/manual/robotics_cyborgs, -/obj/item/weapon/book/manual/robotics_manual, -/obj/item/weapon/book/manual/rust_engine, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/stasis, -/obj/item/weapon/book/manual/supermatter_engine, +/obj/item/book/manual/hydroponics_pod_people, +/obj/item/book/manual/mass_spectrometry, +/obj/item/book/manual/materials_chemistry_analysis, +/obj/item/book/manual/medical_cloning, +/obj/item/book/manual/medical_diagnostics_manual, +/obj/item/book/manual/research_and_development, +/obj/item/book/manual/resleeving, +/obj/item/book/manual/ripley_build_and_repair, +/obj/item/book/manual/robotics_cyborgs, +/obj/item/book/manual/robotics_manual, +/obj/item/book/manual/rust_engine, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/stasis, +/obj/item/book/manual/supermatter_engine, /turf/simulated/floor/wood, /area/library) "aGx" = ( @@ -19193,7 +19193,7 @@ /turf/simulated/wall, /area/crew_quarters/barrestroom) "aGL" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = 10 }, @@ -19252,7 +19252,7 @@ /obj/machinery/r_n_d/circuit_imprinter{ dir = 8 }, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) "aGT" = ( @@ -19317,20 +19317,20 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aGY" = ( -/obj/item/weapon/tape_roll, -/obj/item/weapon/packageWrap, -/obj/item/weapon/dice, -/obj/item/weapon/dice/d20, -/obj/item/weapon/deck/cards, -/obj/item/weapon/folder/yellow, +/obj/item/tape_roll, +/obj/item/packageWrap, +/obj/item/dice, +/obj/item/dice/d20, +/obj/item/deck/cards, +/obj/item/folder/yellow, /obj/structure/closet/walllocker_double{ dir = 8; pixel_x = -28 }, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/deck/wizoff, -/obj/item/weapon/book/manual/wizzoffguide, +/obj/item/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice_nerd, +/obj/item/deck/wizoff, +/obj/item/book/manual/wizzoffguide, /turf/simulated/floor/wood, /area/library) "aGZ" = ( @@ -19402,7 +19402,7 @@ pixel_y = 28 }, /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -19435,20 +19435,20 @@ /obj/structure/bookcase{ name = "bookcase (Reference)" }, -/obj/item/weapon/book/manual/anomaly_spectroscopy, -/obj/item/weapon/book/manual/anomaly_testing, -/obj/item/weapon/book/manual/atmospipes, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/detective, -/obj/item/weapon/book/manual/engineering_construction, -/obj/item/weapon/book/manual/engineering_guide, -/obj/item/weapon/book/manual/engineering_particle_accelerator, -/obj/item/weapon/book/manual/engineering_singularity_safety, -/obj/item/weapon/book/manual/evaguide, -/obj/item/weapon/book/manual/excavation, -/obj/item/weapon/book/custom_library/reference/fistfulofd6splayersguide, +/obj/item/book/manual/anomaly_spectroscopy, +/obj/item/book/manual/anomaly_testing, +/obj/item/book/manual/atmospipes, +/obj/item/book/manual/barman_recipes, +/obj/item/book/manual/chef_recipes, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/detective, +/obj/item/book/manual/engineering_construction, +/obj/item/book/manual/engineering_guide, +/obj/item/book/manual/engineering_particle_accelerator, +/obj/item/book/manual/engineering_singularity_safety, +/obj/item/book/manual/evaguide, +/obj/item/book/manual/excavation, +/obj/item/book/custom_library/reference/fistfulofd6splayersguide, /turf/simulated/floor/wood, /area/library) "aHh" = ( @@ -19462,7 +19462,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -19473,7 +19473,7 @@ /area/hallway/lower/third_south) "aHi" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 1; name = "north bump"; pixel_y = 24 @@ -19519,7 +19519,7 @@ /area/hallway/lower/third_south) "aHl" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /obj/machinery/light/floortube{ pixel_y = -6 }, @@ -19559,7 +19559,7 @@ /obj/effect/floor_decal/corner/beige{ dir = 6 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/tiled/white, @@ -19745,7 +19745,7 @@ dir = 1; hacked = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -20086,7 +20086,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/carpet/turcarpet, @@ -20136,7 +20136,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aIl" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/effect/floor_decal/spline/plain{ dir = 1 }, @@ -20146,7 +20146,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/lino, @@ -20412,7 +20412,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/lino, @@ -20727,7 +20727,7 @@ /area/rnd/robotics) "aJl" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) @@ -20972,7 +20972,7 @@ dir = 2; icon_state = "pipe-c" }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/carpet/turcarpet, @@ -21052,7 +21052,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -21101,7 +21101,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/carpet/turcarpet, @@ -21169,10 +21169,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, /obj/machinery/door/blast/gate/thin{ @@ -21259,7 +21259,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/grass, @@ -21275,7 +21275,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 8 }, /turf/simulated/floor/carpet/turcarpet, @@ -21340,7 +21340,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aKv" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/machinery/light{ @@ -21806,14 +21806,14 @@ /area/rnd/research/testingrange) "aLq" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/weapon/paper{ +/obj/item/storage/firstaid/surgery, +/obj/item/paper{ desc = ""; info = "Stop installing NIFs in here you clods! Unless it's on a synth. Otherwise, STOP DOING IT! You're killing people! -Management"; name = "note to science staff" }, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom2) "aLr" = ( @@ -21981,7 +21981,7 @@ /area/tether/surfacebase/servicebackroom) "aLJ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/sinpockets, +/obj/item/storage/box/sinpockets, /obj/machinery/light{ dir = 4 }, @@ -22025,7 +22025,7 @@ /area/rnd/outpost/xenobiology/outpost_storage) "aLP" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, @@ -22249,18 +22249,18 @@ /turf/simulated/open, /area/rnd/outpost/xenobiology/outpost_stairs) "aMm" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, /obj/structure/table/wooden_reinforced, -/obj/item/weapon/folder/white, -/obj/item/weapon/folder/red, +/obj/item/folder/white, +/obj/item/folder/red, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "aMn" = ( /obj/structure/table/wooden_reinforced, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "aMo" = ( @@ -22271,7 +22271,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) "aMp" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -22476,7 +22476,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 21 @@ -22523,9 +22523,9 @@ /area/rnd/robotics/surgeryroom2) "aMQ" = ( /obj/structure/table/standard, -/obj/item/device/defib_kit/jumper_kit, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/defib_kit/jumper_kit, +/obj/item/storage/box/gloves, +/obj/item/storage/box/bodybags{ pixel_x = -1; pixel_y = -2 }, @@ -22837,7 +22837,7 @@ dir = 4; pixel_x = 24 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/bluegrid, @@ -22910,7 +22910,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/device/perfect_tele{ +/obj/item/perfect_tele{ desc = "Seems absurd, doesn't it? Yet, here we are. Generally considered dangerous contraband unless the user has permission from Central Command. This one is the Site Manager's, and they are authorized to use it."; name = "manager's translocator" }, @@ -23227,7 +23227,7 @@ /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside3) "aOo" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -23465,7 +23465,7 @@ /obj/effect/floor_decal/industrial/danger/corner{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -23500,7 +23500,7 @@ /obj/structure/table/steel, /obj/random/maintenance/engineering, /obj/item/clothing/glasses/welding, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/shuttle_pad) "aOQ" = ( @@ -23564,9 +23564,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/cautery, -/obj/item/weapon/autopsy_scanner, +/obj/item/surgical/scalpel, +/obj/item/surgical/cautery, +/obj/item/autopsy_scanner, /obj/machinery/alarm{ dir = 4; pixel_x = -22 @@ -23781,7 +23781,7 @@ /area/tether/surfacebase/southhall) "aPt" = ( /obj/machinery/light/small, -/obj/item/weapon/tank/phoron, +/obj/item/tank/phoron, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/shuttle_pad) "aPu" = ( @@ -23789,7 +23789,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -30 @@ -23848,8 +23848,8 @@ dir = 8; pixel_x = 24 }, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/gloves, +/obj/item/storage/box/masks, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_autopsy) "aPB" = ( @@ -23880,14 +23880,14 @@ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aPE" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = 10 }, @@ -24279,7 +24279,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "aQw" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/tiled, @@ -24349,7 +24349,7 @@ /area/tether/surfacebase/outside/outside3) "aQE" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "aQF" = ( @@ -24380,10 +24380,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "aQI" = ( @@ -24455,7 +24455,7 @@ "aQR" = ( /obj/structure/table/glass, /obj/item/bodybag, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/random/medical, /obj/structure/closet/medical_wall{ pixel_y = 35 @@ -24464,7 +24464,7 @@ dir = 8; pixel_x = -24 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) "aQS" = ( @@ -24609,7 +24609,7 @@ /obj/structure/table/standard, /obj/item/toy/plushie/coffee_fox, /obj/item/clothing/glasses/welding, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 28 @@ -24689,17 +24689,17 @@ /area/rnd/outpost/xenobiology/outpost_decon) "aRt" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped, +/obj/item/storage/box/syringes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/reagent_containers/food/snacks/monkeycube/wrapped, +/obj/item/reagent_containers/food/snacks/monkeycube/wrapped, +/obj/item/reagent_containers/food/snacks/monkeycube/wrapped, +/obj/item/reagent_containers/food/snacks/monkeycube/wrapped, +/obj/item/reagent_containers/food/snacks/monkeycube/wrapped, +/obj/item/reagent_containers/food/snacks/monkeycube/wrapped, /obj/machinery/alarm{ dir = 8; pixel_x = 22 @@ -24729,10 +24729,10 @@ /area/rnd/outpost/xenobiology/outpost_autopsy) "aRw" = ( /obj/structure/table/standard, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/shoes/galoshes, /obj/item/clothing/shoes/galoshes, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) "aRx" = ( @@ -24788,7 +24788,7 @@ /area/rnd/outpost/xenobiology/outpost_main) "aRA" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, /obj/structure/extinguisher_cabinet{ dir = 8; pixel_x = 30 @@ -24914,8 +24914,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) "aRN" = ( @@ -24931,7 +24931,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aRO" = ( -/obj/item/device/radio/intercom, +/obj/item/radio/intercom, /turf/simulated/wall, /area/rnd/outpost/xenobiology/outpost_autopsy) "aRP" = ( @@ -24976,7 +24976,7 @@ /turf/simulated/floor/tiled/steel, /area/rnd/outpost/xenobiology/outpost_decon) "aRV" = ( -/obj/item/device/radio/intercom, +/obj/item/radio/intercom, /turf/simulated/wall, /area/rnd/outpost/xenobiology/outpost_decon) "aRW" = ( @@ -25003,8 +25003,8 @@ pixel_x = -30 }, /obj/structure/table/glass, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/device/defib_kit/loaded, +/obj/item/storage/toolbox/emergency, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) "aRZ" = ( @@ -25174,11 +25174,11 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "aSp" = ( -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, @@ -25189,11 +25189,11 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "aSq" = ( -/obj/item/weapon/storage/firstaid/adv{ +/obj/item/storage/firstaid/adv{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /obj/effect/floor_decal/corner/red/full{ dir = 1 }, @@ -25280,7 +25280,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/carpet/turcarpet, @@ -25399,11 +25399,11 @@ /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_storage) "aSK" = ( -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /obj/effect/floor_decal/corner/green/full, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -25412,11 +25412,11 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "aSL" = ( -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /obj/effect/floor_decal/corner/yellow/full{ dir = 4 }, @@ -25678,9 +25678,9 @@ dir = 5 }, /obj/structure/table/glass, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, -/obj/item/weapon/paper_bin{ +/obj/item/folder/white, +/obj/item/pen, +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 4 }, @@ -25721,13 +25721,13 @@ }, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/closet/secure_closet/medical3, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/storage/belt/medical, +/obj/item/soap/nanotrasen, +/obj/item/storage/belt/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "aTq" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 4 @@ -25748,13 +25748,13 @@ /area/maintenance/lower/medsec_maintenance) "aTs" = ( /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = -24 }, @@ -25867,12 +25867,12 @@ /area/rnd/outpost/xenobiology/outpost_breakroom) "aTC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/device/radio{ +/obj/item/storage/firstaid/regular, +/obj/item/radio{ pixel_x = 2; pixel_y = 3 }, -/obj/item/device/radio, +/obj/item/radio, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -25885,7 +25885,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled/dark, /area/bridge) "aTD" = ( @@ -25911,16 +25911,16 @@ /area/tether/surfacebase/bar_backroom) "aTG" = ( /obj/structure/table/woodentable, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/device/destTagger{ +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/destTagger{ pixel_x = 4; pixel_y = 3 }, /obj/machinery/light{ dir = 4 }, -/obj/item/device/destTagger{ +/obj/item/destTagger{ pixel_x = 4; pixel_y = 3 }, @@ -25978,7 +25978,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall/nwest) "aTP" = ( -/obj/item/weapon/card/id/gold/captain/spare/fakespare, +/obj/item/card/id/gold/captain/spare/fakespare, /turf/simulated/floor/plating, /area/tether/surfacebase/surface_three_hall) "aTQ" = ( @@ -26175,7 +26175,7 @@ /area/crew_quarters/freezer) "aUi" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -26189,11 +26189,11 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 4; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "aUj" = ( @@ -26203,7 +26203,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = -24 }, @@ -26393,8 +26393,8 @@ dir = 4 }, /obj/structure/closet/secure_closet/medical3, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/storage/belt/medical, +/obj/item/soap/nanotrasen, +/obj/item/storage/belt/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "aUB" = ( @@ -26458,7 +26458,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/structure/closet/crate/freezer, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -26470,13 +26470,13 @@ dir = 4; pixel_x = 11 }, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "aUH" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/device/radio/intercom{ +/obj/item/storage/firstaid/surgery, +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -26515,7 +26515,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aUN" = ( -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/carpet/turcarpet, @@ -26567,7 +26567,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/lino, @@ -26623,16 +26623,16 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = 9 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = 2 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = -5 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = -12 }, /turf/simulated/floor/tiled/white, @@ -26703,8 +26703,8 @@ /area/tether/surfacebase/medical/chemistry) "aUZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "aVa" = ( @@ -26771,14 +26771,14 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/packageWrap, -/obj/item/device/mass_spectrometer/adv, -/obj/item/device/mass_spectrometer/adv, +/obj/item/hand_labeler, +/obj/item/packageWrap, +/obj/item/mass_spectrometer/adv, +/obj/item/mass_spectrometer/adv, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/science, /obj/effect/floor_decal/borderfloorwhite{ @@ -26808,14 +26808,14 @@ /obj/machinery/chem_master, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -28 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "aVj" = ( /obj/structure/table/reinforced, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -26849,7 +26849,7 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 @@ -27023,11 +27023,11 @@ req_one_access = list(35,28) }, /obj/machinery/door/firedoor, -/obj/item/device/destTagger{ +/obj/item/destTagger{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/packageWrap, +/obj/item/packageWrap, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -27038,8 +27038,8 @@ name = "formal wardrobe" }, /obj/item/glass_jar, -/obj/item/device/retail_scanner/civilian, -/obj/item/device/retail_scanner/civilian, +/obj/item/retail_scanner/civilian, +/obj/item/retail_scanner/civilian, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "aVD" = ( @@ -27096,7 +27096,7 @@ icon_state = "2-4" }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/upperhall) "aVI" = ( @@ -27118,7 +27118,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/lino, @@ -27222,12 +27222,12 @@ /obj/effect/floor_decal/spline/plain{ dir = 9 }, -/obj/item/weapon/beach_ball, +/obj/item/beach_ball, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "aVT" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) @@ -27329,7 +27329,7 @@ pixel_x = -2; pixel_y = -2 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 7; pixel_y = 8 }, @@ -27651,7 +27651,7 @@ /area/tether/surfacebase/surface_three_hall) "aWG" = ( /obj/structure/table/glass, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -27755,8 +27755,8 @@ /area/rnd/outpost/xenobiology/outpost_first_aid) "aWR" = ( /obj/structure/table/standard, -/obj/item/weapon/gun/energy/taser/xeno, -/obj/item/weapon/melee/baton/slime/loaded, +/obj/item/gun/energy/taser/xeno, +/obj/item/melee/baton/slime/loaded, /obj/machinery/light_switch{ dir = 1; pixel_y = -28 @@ -28117,7 +28117,7 @@ /obj/structure/closet/hydrant{ pixel_x = 32 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -28145,12 +28145,12 @@ /area/bridge) "aXy" = ( /obj/structure/table/standard, -/obj/item/weapon/gun/energy/taser/xeno, +/obj/item/gun/energy/taser/xeno, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = -28 }, -/obj/item/weapon/melee/baton/slime/loaded, +/obj/item/melee/baton/slime/loaded, /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) "aXz" = ( @@ -28288,7 +28288,7 @@ dir = 8 }, /obj/structure/table/steel, -/obj/item/weapon/implantcase/chem, +/obj/item/implantcase/chem, /turf/simulated/floor/plating, /area/rnd/research_storage) "aXI" = ( @@ -28309,7 +28309,7 @@ dir = 4 }, /obj/structure/table/steel, -/obj/item/weapon/locator, +/obj/item/locator, /turf/simulated/floor/plating, /area/rnd/research_storage) "aXK" = ( @@ -28351,7 +28351,7 @@ /area/hallway/lower/third_south) "aXN" = ( /obj/structure/reagent_dispensers/beerkeg, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -28375,7 +28375,7 @@ /area/tether/surfacebase/bar_backroom) "aXR" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/food/drinks/shaker, /obj/machinery/alarm{ dir = 8; pixel_x = 24 @@ -28448,16 +28448,16 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "aXY" = ( -/obj/item/device/aicard, -/obj/item/weapon/storage/box/PDAs{ +/obj/item/aicard, +/obj/item/storage/box/PDAs{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/ids, /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/device/radio/intercom{ +/obj/item/book/manual/command_guide, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -28476,7 +28476,7 @@ /area/vacant/vacant_shop) "aYa" = ( /obj/structure/closet, -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/reagent_containers/food/drinks/bottle/orangejuice, /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/random/maintenance/clean, @@ -28560,7 +28560,7 @@ /area/bridge_hallway) "aYi" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /obj/structure/panic_button{ pixel_x = 32 }, @@ -28689,7 +28689,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/weapon/paper/dockingcodes, +/obj/item/paper/dockingcodes, /turf/simulated/floor/tiled/dark, /area/bridge) "aYu" = ( @@ -28862,7 +28862,7 @@ /area/maintenance/commandmaint) "aYP" = ( /obj/effect/floor_decal/industrial/warning, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -28947,10 +28947,10 @@ /area/bridge_hallway) "aZb" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/stamp/hop, +/obj/item/clipboard, +/obj/item/stamp/hop, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = -10 }, /turf/simulated/floor/carpet, @@ -29084,7 +29084,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/weapon/disk/nuclear{ +/obj/item/disk/nuclear{ name = "authentication disk" }, /turf/simulated/floor/wood, @@ -29099,7 +29099,7 @@ pixel_y = 32 }, /obj/machinery/recharger, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -29107,9 +29107,9 @@ /area/crew_quarters/heads/hop) "aZo" = ( /obj/structure/table/reinforced, -/obj/item/device/megaphone, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/standard_operating_procedure, +/obj/item/megaphone, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/standard_operating_procedure, /obj/structure/extinguisher_cabinet{ dir = 1; pixel_y = 32 @@ -29180,7 +29180,7 @@ /area/tether/surfacebase/surface_three_hall) "aZu" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /obj/effect/floor_decal/corner/lightgrey{ dir = 6 }, @@ -29207,7 +29207,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/heads/hop) "aZw" = ( -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /obj/structure/bed/padded, /obj/machinery/alarm{ dir = 4; @@ -29389,13 +29389,13 @@ /area/bridge) "aZP" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen/multi, +/obj/item/folder/blue, +/obj/item/folder/red, +/obj/item/pen/multi, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "aZQ" = ( @@ -29462,13 +29462,13 @@ /area/crew_quarters/captain) "aZV" = ( /obj/structure/table/woodentable, -/obj/item/weapon/melee/chainofcommand, -/obj/item/weapon/coin/phoron{ +/obj/item/melee/chainofcommand, +/obj/item/coin/phoron{ desc = "The face of the coin shows a portrait of the explorer who discovered the Virgo-Erigone system. The back depicts a Zodiac symbol that represents Virgo."; name = "limited edition phoron coin" }, -/obj/item/weapon/folder/blue_captain, -/obj/item/weapon/stamp/captain, +/obj/item/folder/blue_captain, +/obj/item/stamp/captain, /turf/simulated/floor/wood, /area/crew_quarters/captain) "aZW" = ( @@ -29551,7 +29551,7 @@ /area/crew_quarters/heads/hop) "bab" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -30 @@ -29606,13 +29606,13 @@ /area/bridge) "baf" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, /obj/item/clothing/mask/gas, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/card/id/gold/captain/spare, +/obj/item/card/id/gold/captain/spare, /obj/machinery/door/window/brigdoor/westright{ dir = 4; name = "Colony Director's Storage"; @@ -29748,12 +29748,12 @@ /area/crew_quarters/captain) "bas" = ( /obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/blue, -/obj/item/device/flashlight/lamp/green, +/obj/item/folder/blue, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/crew_quarters/captain) "bat" = ( @@ -29876,10 +29876,10 @@ icon_state = "4-8" }, /obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -29934,16 +29934,16 @@ icon_state = "crate"; name = "Grenade Crate" }, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/weapon/tool/screwdriver, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/tool/screwdriver, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, @@ -30083,8 +30083,8 @@ dir = 6 }, /obj/machinery/recharger, -/obj/item/weapon/storage/box/syringegun, -/obj/item/weapon/gun/launcher/syringe, +/obj/item/storage/box/syringegun, +/obj/item/gun/launcher/syringe, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "baS" = ( @@ -30098,7 +30098,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "baT" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/structure/cable/green{ @@ -30159,9 +30159,9 @@ /area/crew_quarters/captain) "bbb" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/command_guide, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/command_guide, /turf/simulated/floor/wood, /area/crew_quarters/captain) "bbc" = ( @@ -30336,7 +30336,7 @@ /area/tether/surfacebase/surface_three_hall) "bbv" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 1; name = "north bump"; pixel_y = 24 @@ -30359,12 +30359,12 @@ /area/crew_quarters/heads/hop) "bbx" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/blue_hop, -/obj/item/weapon/pen, +/obj/item/folder/blue_hop, +/obj/item/pen, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -30442,7 +30442,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bbC" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -30575,7 +30575,7 @@ /area/crew_quarters/bar) "bbP" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -30599,7 +30599,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/lino, @@ -30614,7 +30614,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 4 }, /turf/simulated/floor/lino, @@ -30725,12 +30725,12 @@ "bcf" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/standard, -/obj/item/weapon/paper{ +/obj/item/paper{ desc = ""; info = "Yes hello, the goat in the freezer is named 'Spike'. Please do not fuck with Spike. He doesn't have the best temper."; name = "Important notice from Rancher Jim" }, -/obj/item/weapon/book/manual/chef_recipes, +/obj/item/book/manual/chef_recipes, /obj/structure/noticeboard{ pixel_x = 32 }, @@ -30824,7 +30824,7 @@ /area/crew_quarters/bar) "bcn" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -30 @@ -30929,8 +30929,8 @@ /area/hallway/lower/third_south) "bcu" = ( /obj/structure/table/woodentable, -/obj/item/weapon/gun/projectile/shotgun/doublebarrel, -/obj/item/weapon/paper{ +/obj/item/gun/projectile/shotgun/doublebarrel, +/obj/item/paper{ info = "This permit signifies that the Bartender is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest."; name = "Shotgun permit" }, @@ -31120,7 +31120,7 @@ /area/tether/surfacebase/entertainment/stage) "bcL" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/sinpockets, +/obj/item/storage/box/sinpockets, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bcM" = ( @@ -31152,19 +31152,19 @@ "bcP" = ( /obj/structure/table/rack/steel, /obj/item/pizzavoucher, -/obj/item/weapon/moneybag, -/obj/item/weapon/inflatable_duck, +/obj/item/moneybag, +/obj/item/inflatable_duck, /obj/machinery/power/apc{ dir = 4; name = "east bump"; pixel_x = 28 }, -/obj/item/weapon/gun/projectile/revolver/capgun, -/obj/item/weapon/gun/projectile/revolver/capgun, +/obj/item/gun/projectile/revolver/capgun, +/obj/item/gun/projectile/revolver/capgun, /obj/item/toy/cultsword, /obj/item/toy/cultsword, -/obj/item/weapon/bikehorn/rubberducky, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/bikehorn/rubberducky, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -31209,20 +31209,20 @@ "bcU" = ( /obj/structure/table/rack/steel, /obj/item/mecha_parts/part/durand_left_leg, -/obj/item/weapon/cane/crutch, -/obj/item/weapon/pack/cardemon, -/obj/item/weapon/soap/syndie, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/soap/deluxe, -/obj/item/weapon/staff/gentcane, +/obj/item/cane/crutch, +/obj/item/pack/cardemon, +/obj/item/soap/syndie, +/obj/item/soap/nanotrasen, +/obj/item/soap/deluxe, +/obj/item/staff/gentcane, /obj/item/toy/eight_ball/conch, -/obj/item/weapon/cell/potato, +/obj/item/cell/potato, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/item/device/megaphone, +/obj/item/megaphone, /obj/random/cutout, -/obj/item/weapon/gun/projectile/revolver/toy/crossbow, +/obj/item/gun/projectile/revolver/toy/crossbow, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "bcV" = ( @@ -31287,8 +31287,8 @@ pixel_x = 1; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/snacks/mint, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/food/snacks/mint, +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, /turf/simulated/floor/tiled/white, @@ -31330,7 +31330,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; frequency = 1532; name = "Stagehand Speaker"; @@ -31410,13 +31410,13 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; frequency = 1532; name = "Stagehand Mic"; pixel_x = -24 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/random/cutout, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) @@ -31509,10 +31509,10 @@ /area/tether/surfacebase/bar_backroom) "bdv" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, +/obj/item/reagent_containers/food/drinks/metaglass, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -31583,7 +31583,7 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 6 }, -/obj/item/device/radio/intercom/entertainment{ +/obj/item/radio/intercom/entertainment{ pixel_y = -23 }, /turf/simulated/floor/tiled, @@ -31679,12 +31679,12 @@ /area/crew_quarters/sleep/cryo) "bdO" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/lighter/zippo, +/obj/item/flame/lighter/zippo, /obj/item/clothing/head/that{ pixel_x = 4; pixel_y = 6 }, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /obj/item/clothing/mask/smokable/cigarette/cigar/havana, /obj/item/clothing/mask/smokable/cigarette/cigar/cohiba, /turf/simulated/floor/wood, @@ -31927,7 +31927,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "beq" = ( @@ -32157,7 +32157,7 @@ /area/crew_quarters/kitchen) "beJ" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -30 @@ -32176,7 +32176,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/lino, @@ -32198,7 +32198,7 @@ /turf/simulated/floor/grass, /area/hydroponics) "beM" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -32248,7 +32248,7 @@ /area/tether/surfacebase/entertainment) "beT" = ( /obj/structure/frame/computer, -/obj/item/weapon/material/twohanded/baseballbat{ +/obj/item/material/twohanded/baseballbat{ name = "Swatta" }, /turf/simulated/floor/tiled/techfloor, @@ -32268,7 +32268,7 @@ /obj/structure/table/rack, /obj/random/maintenance/clean, /obj/random/maintenance/engineering, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled/techfloor, @@ -32317,7 +32317,7 @@ /area/crew_quarters/bar) "bfc" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "bfd" = ( @@ -32494,7 +32494,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/grass, @@ -32596,16 +32596,16 @@ /area/tether/surfacebase/barbackmaintenance) "bfG" = ( /obj/structure/table/gamblingtable, -/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "bfH" = ( /obj/machinery/light/small, /obj/structure/table/woodentable, -/obj/item/weapon/bone/skull{ +/obj/item/bone/skull{ name = "Yo'rick" }, -/obj/item/weapon/paper{ +/obj/item/paper{ desc = ""; info = "The Silence Into Laughter program works to place hard working, studied, accomplished, hardworking, homebrewed, diplomaholding, or otherwise clowns and mimes into the workforce! The Head Clowncellor and the Director at Mime have finally worked together to bring this titan of a workers' union! If you have a background in silence or laughter, please apply at our exonet site at: https://forum.vore-station.net/viewforum.php?f=45"; name = "Clowns and Mimes Wanted!" @@ -32633,7 +32633,7 @@ /area/tether/surfacebase/southhall) "bfK" = ( /obj/structure/table/gamblingtable, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "bfL" = ( @@ -32864,11 +32864,11 @@ dir = 9 }, /obj/structure/table/standard, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ name = "box of measuring cups"; pixel_x = 2; pixel_y = 3; - starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup = 7) + starts_with = list(/obj/item/reagent_containers/glass/beaker/measuring_cup = 7) }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -32887,7 +32887,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/item/weapon/book/manual/cook_guide, +/obj/item/book/manual/cook_guide, /obj/machinery/light/floortube{ dir = 1; pixel_y = 6 @@ -32923,8 +32923,8 @@ "bgs" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/standard, -/obj/item/weapon/packageWrap, -/obj/item/device/destTagger{ +/obj/item/packageWrap, +/obj/item/destTagger{ pixel_x = 4; pixel_y = 3 }, @@ -32934,22 +32934,22 @@ /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/closet/chefcloset, /obj/item/glass_jar, -/obj/item/device/retail_scanner/civilian, -/obj/item/weapon/soap/nanotrasen, -/obj/item/device/destTagger{ +/obj/item/retail_scanner/civilian, +/obj/item/soap/nanotrasen, +/obj/item/destTagger{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/alarm{ pixel_y = 25 }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgu" = ( @@ -32968,7 +32968,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "bgw" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -33011,7 +33011,7 @@ /area/tether/surfacebase/entertainment) "bgC" = ( /obj/structure/table/marble, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /obj/machinery/door/blast/gate/thin{ dir = 2; id = "bar"; @@ -33024,7 +33024,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/lino, @@ -33187,7 +33187,7 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "bgZ" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -33235,7 +33235,7 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled/techfloor, @@ -33268,9 +33268,9 @@ /area/rnd/outpost/xenobiology/outpost_first_aid) "bhf" = ( /obj/structure/table/standard, -/obj/item/device/slime_scanner, -/obj/item/device/slime_scanner, -/obj/item/device/multitool, +/obj/item/slime_scanner, +/obj/item/slime_scanner, +/obj/item/multitool, /obj/machinery/camera/network/research/xenobio{ dir = 10 }, @@ -33311,19 +33311,19 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/item/device/radio/off, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{ +/obj/item/radio/off, +/obj/item/reagent_containers/food/drinks/flask/barflask{ pixel_x = -9; pixel_y = -2 }, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = 10 }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) "bhl" = ( -/obj/item/weapon/entrepreneur/dumbbell, -/obj/item/weapon/entrepreneur/dumbbell, +/obj/item/entrepreneur/dumbbell, +/obj/item/entrepreneur/dumbbell, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "bhm" = ( @@ -34000,11 +34000,11 @@ /obj/structure/table/rack, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/storage/hooded/wintercoat, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/machinery/light{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/machinery/alarm{ @@ -34034,7 +34034,7 @@ pixel_x = 3; pixel_y = -7 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -34042,11 +34042,11 @@ pixel_x = 3; pixel_y = -7 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -34395,7 +34395,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "bju" = ( -/obj/item/device/radio/intercom/entertainment{ +/obj/item/radio/intercom/entertainment{ pixel_y = -23 }, /turf/simulated/floor/tiled, @@ -34427,7 +34427,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "bjy" = ( -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/item/bodybag/cryobag, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -34452,20 +34452,20 @@ /obj/machinery/camera/network/medbay{ dir = 4 }, -/obj/item/device/sleevemate, -/obj/item/weapon/storage/box/nifsofts_medical{ +/obj/item/sleevemate, +/obj/item/storage/box/nifsofts_medical{ pixel_x = 7; pixel_y = 7 }, -/obj/item/weapon/storage/box/nifsofts_medical{ +/obj/item/storage/box/nifsofts_medical{ pixel_x = 7; pixel_y = 7 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 6; pixel_y = 31 }, -/obj/item/device/denecrotizer/medical, +/obj/item/denecrotizer/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "bjH" = ( @@ -34505,13 +34505,13 @@ /area/tether/surfacebase/medical/admin) "bjU" = ( /obj/structure/table/glass, -/obj/item/weapon/paper{ +/obj/item/paper{ desc = ""; info = "Bodies designed on the design console must be saved to a disk, provided on the front desk counter, then placed into the resleeving console for printing."; name = "Body Designer Note" }, -/obj/item/device/sleevemate, -/obj/item/weapon/storage/box/body_record_disk, +/obj/item/sleevemate, +/obj/item/storage/box/body_record_disk, /obj/machinery/light{ dir = 4 }, @@ -34637,14 +34637,14 @@ /area/rnd/robotics/surgeryroom1) "bkr" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/weapon/paper{ +/obj/item/storage/firstaid/surgery, +/obj/item/paper{ desc = ""; info = "Stop installing NIFs in here you clods! Unless it's on a synth. Otherwise, STOP DOING IT! You're killing people! -Management"; name = "note to science staff" }, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, /obj/machinery/button/windowtint{ id = "robo_surg_1"; pixel_y = 25 @@ -34676,7 +34676,7 @@ /area/rnd/robotics) "bkv" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 4 }, @@ -34898,9 +34898,9 @@ /area/rnd/robotics/surgeryroom1) "bkR" = ( /obj/structure/table/standard, -/obj/item/device/defib_kit/jumper_kit, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/defib_kit/jumper_kit, +/obj/item/storage/box/gloves, +/obj/item/storage/box/bodybags{ pixel_x = -1; pixel_y = -2 }, @@ -34908,8 +34908,8 @@ /area/rnd/robotics/surgeryroom1) "bkS" = ( /obj/structure/table/standard, -/obj/item/weapon/book/manual/robotics_cyborgs, -/obj/item/weapon/book/manual/robotics_manual, +/obj/item/book/manual/robotics_cyborgs, +/obj/item/book/manual/robotics_manual, /obj/item/clothing/glasses/omnihud/rnd, /obj/machinery/light{ dir = 8 @@ -34930,8 +34930,8 @@ /area/rnd/robotics) "bkT" = ( /obj/structure/table/standard, -/obj/item/device/mmi, -/obj/item/device/mmi/digital/posibrain, +/obj/item/mmi, +/obj/item/mmi/digital/posibrain, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled/steel_grid, @@ -34953,9 +34953,9 @@ /area/rnd/robotics) "bkW" = ( /obj/structure/table/standard, -/obj/item/weapon/pen, -/obj/item/weapon/pen, -/obj/item/weapon/pen, +/obj/item/pen, +/obj/item/pen, +/obj/item/pen, /obj/effect/floor_decal/borderfloor{ dir = 6 }, @@ -34985,8 +34985,8 @@ /area/rnd/robotics/resleeving) "bkZ" = ( /obj/structure/table/standard, -/obj/item/weapon/book/manual/resleeving, -/obj/item/weapon/storage/box/backup_kit, +/obj/item/book/manual/resleeving, +/obj/item/storage/box/backup_kit, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/resleeving) "bla" = ( @@ -35239,7 +35239,7 @@ pixel_x = 4; pixel_y = 26 }, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /obj/item/stack/nanopaste, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, @@ -35250,13 +35250,13 @@ /area/tether/surfacebase/medical/triage) "blM" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/device/radio/intercom{ +/obj/item/storage/firstaid/surgery, +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 }, -/obj/item/device/radio/intercom/department/medbay{ +/obj/item/radio/intercom/department/medbay{ dir = 1; pixel_y = 24 }, @@ -35273,9 +35273,9 @@ /area/tether/surfacebase/medical/storage) "blP" = ( /obj/structure/table/standard, -/obj/item/device/glasses_kit, -/obj/item/weapon/storage/box/rxglasses, -/obj/item/weapon/storage/box/rxglasses, +/obj/item/glasses_kit, +/obj/item/storage/box/rxglasses, +/obj/item/storage/box/rxglasses, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -35286,7 +35286,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 @@ -35411,7 +35411,7 @@ dir = 4 }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; nightshift_setting = 2; @@ -35423,7 +35423,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "bmm" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -35515,7 +35515,7 @@ icon_state = "2-8" }, /obj/structure/bed/padded, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/upperhall) "bmu" = ( @@ -35524,7 +35524,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 8 }, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/screwdriver, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "bmx" = ( @@ -35653,7 +35653,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 8 }, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "bmN" = ( @@ -35969,12 +35969,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/item/device/radio/headset/headset_med, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/fancy/vials, -/obj/item/weapon/storage/fancy/vials, -/obj/item/weapon/storage/box/pillbottles, -/obj/item/weapon/storage/box/pillbottles, +/obj/item/radio/headset/headset_med, +/obj/item/storage/box/syringes, +/obj/item/storage/fancy/vials, +/obj/item/storage/fancy/vials, +/obj/item/storage/box/pillbottles, +/obj/item/storage/box/pillbottles, /obj/structure/closet/wardrobe/chemistry_white, /obj/effect/floor_decal/borderfloorwhite/corner2{ dir = 4 @@ -36138,7 +36138,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -36316,8 +36316,8 @@ /area/tether/surfacebase/security/iaa/officeb) "bpw" = ( /obj/structure/table/steel, -/obj/item/weapon/folder/red, -/obj/item/weapon/storage/box/donut, +/obj/item/folder/red, +/obj/item/storage/box/donut, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "bpC" = ( @@ -36410,11 +36410,11 @@ /obj/structure/closet/walllocker_double/misc_civ/south{ name = "dentist supplies" }, -/obj/item/weapon/entrepreneur/dentist_mirror, -/obj/item/weapon/entrepreneur/dentist_probe, -/obj/item/weapon/entrepreneur/dentist_scaler, -/obj/item/weapon/entrepreneur/dentist_sickle, -/obj/item/device/flashlight/pen, +/obj/item/entrepreneur/dentist_mirror, +/obj/item/entrepreneur/dentist_probe, +/obj/item/entrepreneur/dentist_scaler, +/obj/item/entrepreneur/dentist_sickle, +/obj/item/flashlight/pen, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/entrepreneur/session) "bCV" = ( @@ -36570,8 +36570,8 @@ /area/tether/surfacebase/security/iaa/officea) "bUT" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stamp/internalaffairs, -/obj/item/weapon/stamp/denied{ +/obj/item/stamp/internalaffairs, +/obj/item/stamp/denied{ pixel_x = 4; pixel_y = -2 }, @@ -36588,7 +36588,7 @@ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -36612,12 +36612,12 @@ dir = 8; pixel_x = -28 }, -/obj/item/device/camera, -/obj/item/device/camera_film, -/obj/item/device/taperecorder, -/obj/item/device/tape/random, -/obj/item/device/tape/random, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/camera, +/obj/item/camera_film, +/obj/item/taperecorder, +/obj/item/rectape/random, +/obj/item/rectape/random, +/obj/item/storage/secure/briefcase, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) "ccu" = ( @@ -36625,7 +36625,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/wood, /area/tether/surfacebase/entrepreneur) "ccN" = ( @@ -36729,12 +36729,12 @@ /area/tether/surfacebase/security/briefingroom) "crz" = ( /obj/structure/bookcase, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/engineering_construction, -/obj/item/weapon/book/manual/detective, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/codex/lore/vir, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/engineering_construction, +/obj/item/book/manual/detective, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/codex/lore/vir, /turf/simulated/floor/wood, /area/tether/surfacebase/entrepreneur/meeting) "csD" = ( @@ -36783,7 +36783,7 @@ /turf/simulated/floor/wood, /area/library) "cAZ" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 @@ -36808,8 +36808,8 @@ /area/tether/surfacebase/surface_three_hall/west) "cEx" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stamp/internalaffairs, -/obj/item/weapon/stamp/denied{ +/obj/item/stamp/internalaffairs, +/obj/item/stamp/denied{ pixel_x = 4; pixel_y = -2 }, @@ -36913,7 +36913,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -37244,7 +37244,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/tether/surfacebase/entrepreneur/meeting) "dDl" = ( @@ -37299,7 +37299,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -37332,20 +37332,20 @@ /area/rnd/research/researchdivision) "dKH" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 4 }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 10; pixel_y = 14 }, -/obj/item/weapon/folder/white, -/obj/item/weapon/storage/box/body_record_disk{ +/obj/item/folder/white, +/obj/item/storage/box/body_record_disk{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) @@ -37409,12 +37409,12 @@ name = "sample weapon permit"; owner = 1 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/multi, -/obj/item/device/megaphone, +/obj/item/pen/multi, +/obj/item/megaphone, /obj/item/clothing/accessory/permit/gun, /obj/item/clothing/accessory/permit/gun, /obj/item/clothing/accessory/permit/gun, @@ -37732,11 +37732,11 @@ /obj/structure/closet{ name = "session equipment" }, -/obj/item/weapon/bedsheet/pillow/exercise, -/obj/item/weapon/bedsheet/pillow/exercise, -/obj/item/weapon/entrepreneur/dumbbell, -/obj/item/weapon/entrepreneur/dumbbell, -/obj/item/weapon/storage/box/dentist, +/obj/item/bedsheet/pillow/exercise, +/obj/item/bedsheet/pillow/exercise, +/obj/item/entrepreneur/dumbbell, +/obj/item/entrepreneur/dumbbell, +/obj/item/storage/box/dentist, /obj/item/roller/massage, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/entrepreneur/session) @@ -37753,18 +37753,18 @@ /obj/structure/closet{ name = "entrepreneur equipment" }, -/obj/item/device/tape, -/obj/item/device/tape, -/obj/item/device/taperecorder, -/obj/item/weapon/entrepreneur/magnifying_glass, -/obj/item/weapon/entrepreneur/emf, -/obj/item/weapon/entrepreneur/spirit_board, -/obj/item/weapon/entrepreneur/crystal_ball, -/obj/item/device/tvcamera/streamer, -/obj/item/weapon/deck/tarot, -/obj/item/weapon/entrepreneur/horoscope, -/obj/item/device/camera, -/obj/item/device/camera_film, +/obj/item/rectape, +/obj/item/rectape, +/obj/item/taperecorder, +/obj/item/entrepreneur/magnifying_glass, +/obj/item/entrepreneur/emf, +/obj/item/entrepreneur/spirit_board, +/obj/item/entrepreneur/crystal_ball, +/obj/item/tvcamera/streamer, +/obj/item/deck/tarot, +/obj/item/entrepreneur/horoscope, +/obj/item/camera, +/obj/item/camera_film, /turf/simulated/floor/wood, /area/tether/surfacebase/entrepreneur/meeting) "eWw" = ( @@ -38231,7 +38231,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -38346,7 +38346,7 @@ /area/tether/surfacebase/security/briefingroom) "gAm" = ( /obj/structure/flora/ausbushes/fernybush, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -38421,7 +38421,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -38501,23 +38501,23 @@ /obj/structure/closet/walllocker_double/misc_civ/north{ name = "office supplies" }, -/obj/item/weapon/folder, -/obj/item/weapon/folder, -/obj/item/weapon/folder, -/obj/item/weapon/folder, -/obj/item/weapon/folder, -/obj/item/weapon/folder, -/obj/item/weapon/folder, -/obj/item/weapon/pen, -/obj/item/weapon/pen, -/obj/item/weapon/pen, -/obj/item/weapon/pen, -/obj/item/weapon/pen, -/obj/item/weapon/stamp/accepted, -/obj/item/weapon/stamp/denied, -/obj/item/weapon/clipboard, -/obj/item/weapon/clipboard, -/obj/item/weapon/clipboard, +/obj/item/folder, +/obj/item/folder, +/obj/item/folder, +/obj/item/folder, +/obj/item/folder, +/obj/item/folder, +/obj/item/folder, +/obj/item/pen, +/obj/item/pen, +/obj/item/pen, +/obj/item/pen, +/obj/item/pen, +/obj/item/stamp/accepted, +/obj/item/stamp/denied, +/obj/item/clipboard, +/obj/item/clipboard, +/obj/item/clipboard, /obj/item/sticky_pad, /turf/simulated/floor/wood, /area/tether/surfacebase/entrepreneur) @@ -38614,7 +38614,7 @@ "gZn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/glass, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "gZq" = ( @@ -38751,7 +38751,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -38927,7 +38927,7 @@ /area/tether/surfacebase/surface_three_hall/west) "hTB" = ( /obj/structure/table/hardwoodtable, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/wood, /area/tether/surfacebase/entrepreneur) "hVc" = ( @@ -39148,7 +39148,7 @@ /area/tether/surfacebase/security/briefingroom) "iLR" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "iOw" = ( @@ -39270,7 +39270,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -39456,18 +39456,18 @@ /area/shuttle/tourbus/cockpit) "jFq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder{ +/obj/item/folder{ pixel_x = -4 }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 5 }, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_y = 3 }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/clipboard, -/obj/item/weapon/storage/briefcase{ +/obj/item/folder/yellow, +/obj/item/clipboard, +/obj/item/storage/briefcase{ pixel_x = -2; pixel_y = -5 }, @@ -39601,7 +39601,7 @@ /area/tether/surfacebase/entrepreneur/meeting) "jRO" = ( /obj/effect/floor_decal/spline/plain, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/carpet/turcarpet, @@ -40330,7 +40330,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -40387,7 +40387,7 @@ /area/tether/surfacebase/security/upperhall) "lFG" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = -4; pixel_y = 12 }, @@ -40425,8 +40425,8 @@ }, /obj/structure/table/rack, /obj/item/clothing/shoes/magboots, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/oxygen, +/obj/item/suit_cooling_unit, +/obj/item/tank/oxygen, /obj/machinery/door/window/brigdoor/eastleft{ name = "Protosuit Storage"; req_access = list(58) @@ -40712,18 +40712,18 @@ /obj/structure/closet/walllocker_double/misc_civ/south{ name = "vanity supplies" }, -/obj/item/weapon/entrepreneur/crystal, -/obj/item/weapon/entrepreneur/crystal, -/obj/item/weapon/entrepreneur/crystal, -/obj/item/weapon/entrepreneur/crystal, -/obj/item/weapon/entrepreneur/crystal, -/obj/item/weapon/lipstick/random, -/obj/item/weapon/lipstick/random, -/obj/item/weapon/lipstick/random, -/obj/item/weapon/reagent_containers/glass/bottle/essential_oil, -/obj/item/weapon/makeover, -/obj/item/weapon/nailpolish, -/obj/item/weapon/nailpolish_remover, +/obj/item/entrepreneur/crystal, +/obj/item/entrepreneur/crystal, +/obj/item/entrepreneur/crystal, +/obj/item/entrepreneur/crystal, +/obj/item/entrepreneur/crystal, +/obj/item/lipstick/random, +/obj/item/lipstick/random, +/obj/item/lipstick/random, +/obj/item/reagent_containers/glass/bottle/essential_oil, +/obj/item/makeover, +/obj/item/nailpolish, +/obj/item/nailpolish_remover, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/entrepreneur/session) "mFq" = ( @@ -40820,7 +40820,7 @@ /area/rnd/research/researchdivision) "mWk" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -40889,13 +40889,13 @@ /area/tether/surfacebase/surface_three_hall) "ngL" = ( /obj/structure/table/steel, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "ngT" = ( /obj/structure/table/standard, -/obj/item/weapon/bedsheet/pillow/exercise, +/obj/item/bedsheet/pillow/exercise, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/entrepreneur/session) "ngV" = ( @@ -40980,7 +40980,7 @@ /turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) "nnY" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -41422,7 +41422,7 @@ /area/tether/surfacebase/surface_three_hall/nwest) "oHH" = ( /obj/structure/table/glass, -/obj/item/device/sleevemate, +/obj/item/sleevemate, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) @@ -41436,7 +41436,7 @@ "oJe" = ( /obj/structure/table/hardwoodtable, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/wood, /area/tether/surfacebase/entrepreneur) "oJw" = ( @@ -41622,13 +41622,13 @@ /area/tether/surfacebase/security/breakroom) "pcs" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/firstaid/regular{ pixel_x = 5; pixel_y = 8 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 5; pixel_y = 8 }, @@ -41727,7 +41727,7 @@ dir = 8; pixel_x = 30 }, -/obj/item/weapon/stool/padded{ +/obj/item/stool/padded{ dir = 1 }, /turf/simulated/floor/tiled, @@ -41871,12 +41871,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/simulated/floor/wood, /area/tether/surfacebase/entrepreneur) "pHl" = ( /obj/structure/table/steel, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -42062,7 +42062,7 @@ }, /obj/effect/floor_decal/corner/paleblue/border, /obj/structure/table/glass, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "qem" = ( @@ -42306,10 +42306,10 @@ /area/tether/surfacebase/shuttle_pad) "qGK" = ( /obj/structure/table/reinforced, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -4 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 4; pixel_y = 4 }, @@ -42537,18 +42537,18 @@ /area/hallway/lower/third_south) "rrG" = ( /obj/structure/table/steel, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 2; pixel_y = 4 }, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/effect/floor_decal/borderfloor{ dir = 9 }, /obj/effect/floor_decal/corner/red/border{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 27 @@ -42602,7 +42602,7 @@ /area/tether/surfacebase/security/iaa/officea) "rEZ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 }, @@ -42674,7 +42674,7 @@ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -42959,7 +42959,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -43094,7 +43094,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) "sXR" = ( -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 4; pixel_x = 24 }, @@ -43278,9 +43278,9 @@ /area/tether/surfacebase/security/iaa/officeb) "tPE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/codex, -/obj/item/weapon/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/codex, +/obj/item/book/manual/security_space_law, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -43417,7 +43417,7 @@ /turf/simulated/wall, /area/tether/surfacebase/security/hos) "ueE" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -43562,7 +43562,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall/west) "uuZ" = ( -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -43603,21 +43603,21 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -2; pixel_y = -5 }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -2; pixel_y = -5 }, -/obj/item/device/measuring_tape, -/obj/item/weapon/tape_roll, -/obj/item/weapon/tape_roll, -/obj/item/weapon/wrapping_paper, -/obj/item/weapon/wrapping_paper, -/obj/item/weapon/wrapping_paper, -/obj/item/device/camera/selfie, +/obj/item/measuring_tape, +/obj/item/tape_roll, +/obj/item/tape_roll, +/obj/item/wrapping_paper, +/obj/item/wrapping_paper, +/obj/item/wrapping_paper, +/obj/item/camera/selfie, /turf/simulated/floor/wood, /area/tether/surfacebase/entrepreneur) "uxT" = ( @@ -43632,7 +43632,7 @@ /area/tether/surfacebase/shuttle_pad) "uyz" = ( /obj/structure/table/reinforced, -/obj/item/device/megaphone, +/obj/item/megaphone, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -43751,7 +43751,7 @@ /obj/structure/table/standard, /obj/item/clothing/gloves/sterile/nitrile, /obj/item/clothing/gloves/sterile/nitrile, -/obj/item/device/defib_kit/loaded, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "uSA" = ( @@ -43846,7 +43846,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 1 }, -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 1; pixel_y = 24 }, @@ -43872,13 +43872,13 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/weapon/pen/blue{ +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/pen/blue{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/pen/blade/red{ +/obj/item/pen/blade/red{ pixel_x = -2; pixel_y = -2 }, @@ -43967,12 +43967,12 @@ dir = 1 }, /obj/structure/bookcase, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/command_guide, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/command_guide, /obj/effect/floor_decal/spline/plain{ dir = 1 }, @@ -44058,7 +44058,7 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "vQt" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = 24 @@ -44073,19 +44073,19 @@ dir = 4 }, /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -4; pixel_y = -6 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 4; pixel_y = -6 }, @@ -44297,18 +44297,18 @@ /area/shuttle/tourbus/general) "wob" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder{ +/obj/item/folder{ pixel_x = -4 }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 5 }, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_y = 3 }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/clipboard, -/obj/item/weapon/storage/briefcase{ +/obj/item/folder/yellow, +/obj/item/clipboard, +/obj/item/storage/briefcase{ pixel_x = -2; pixel_y = -5 }, @@ -44331,7 +44331,7 @@ /area/tether/surfacebase/security/iaa/officea) "woZ" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/candle, +/obj/item/flame/candle, /obj/effect/floor_decal/corner/lightgrey{ dir = 6 }, @@ -44399,10 +44399,10 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ +/obj/item/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ +/obj/item/reagent_containers/food/condiment/small/peppermill{ pixel_x = 3 }, /obj/machinery/door/blast/gate/thin{ @@ -44514,8 +44514,8 @@ /area/tether/surfacebase/surface_three_hall/west) "wPV" = ( /obj/structure/table/woodentable, -/obj/item/weapon/folder/red_hos, -/obj/item/weapon/stamp/hos, +/obj/item/folder/red_hos, +/obj/item/stamp/hos, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -44535,7 +44535,7 @@ /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "wQs" = ( -/obj/item/device/radio/intercom/department/security{ +/obj/item/radio/intercom/department/security{ dir = 4; pixel_x = 24 }, @@ -44839,19 +44839,19 @@ /area/tether/surfacebase/entrepreneur) "xud" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -4; pixel_y = -6 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 4; pixel_y = -6 }, @@ -44983,12 +44983,12 @@ dir = 4; pixel_x = 28 }, -/obj/item/device/camera, -/obj/item/device/camera_film, -/obj/item/device/taperecorder, -/obj/item/device/tape/random, -/obj/item/device/tape/random, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/camera, +/obj/item/camera_film, +/obj/item/taperecorder, +/obj/item/rectape/random, +/obj/item/rectape/random, +/obj/item/storage/secure/briefcase, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) "xHg" = ( @@ -44996,12 +44996,12 @@ dir = 1 }, /obj/structure/bookcase, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/command_guide, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/standard_operating_procedure, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/command_guide, +/obj/item/book/manual/command_guide, /obj/effect/floor_decal/spline/plain{ dir = 1 }, @@ -45068,7 +45068,7 @@ /area/shuttle/tourbus/cockpit) "xQv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red_hos, +/obj/item/folder/red_hos, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -45156,13 +45156,13 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/weapon/pen/blade/red{ +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/pen/blade/red{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = 2; pixel_y = 3 }, diff --git a/maps/tether/tether-04-transit.dmm b/maps/tether/tether-04-transit.dmm index c3f19f415e9..089b5997ce0 100644 --- a/maps/tether/tether-04-transit.dmm +++ b/maps/tether/tether-04-transit.dmm @@ -177,7 +177,7 @@ /area/tether/transit) "mz" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -24 diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index b05742514c3..b382efc42f4 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -421,7 +421,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -513,15 +513,15 @@ dir = 1 }, /obj/structure/table/steel, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "The big blue box recently installed in here is a 'grid checker' which will shut off the power if a dangerous power spike from the engine erupts into the powernet. Shutting everything down protects everything from electrical damage, however the outages can be disruptive to colony operations, so it is designed to restore power after a somewhat significant delay, up to ten minutes or so. The grid checker can be manually hacked in order to end the outage sooner. To do that, you must cut three specific wires which do not cause a red light to shine, then pulse a fourth wire. Electrical protection is highly recommended when doing maintenance on the grid checker."; name = "grid checker info" }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "abc" = ( @@ -541,9 +541,9 @@ dir = 1 }, /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/item/clothing/gloves/yellow, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 5 }, /obj/item/stack/cable_coil{ @@ -690,7 +690,7 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/device/pipe_painter, +/obj/item/pipe_painter, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -813,7 +813,7 @@ icon_state = "4-8" }, /obj/machinery/light/small, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -1085,12 +1085,12 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/circuitboard/crew{ +/obj/item/circuitboard/crew{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/card, -/obj/item/weapon/circuitboard/communications{ +/obj/item/circuitboard/card, +/obj/item/circuitboard/communications{ pixel_x = 3; pixel_y = -3 }, @@ -1131,14 +1131,14 @@ /obj/machinery/newscaster{ pixel_y = -29 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, /obj/structure/table/standard, -/obj/item/weapon/book/codex, +/obj/item/book/codex, /obj/random/cigarettes, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /turf/simulated/floor/tiled, /area/teleporter/departing) "ack" = ( @@ -1321,7 +1321,7 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "acD" = ( -/obj/item/device/multitool, +/obj/item/multitool, /obj/structure/table/standard, /obj/structure/cable/green{ icon_state = "1-8" @@ -1718,12 +1718,12 @@ layer = 2.9 }, /obj/machinery/camera/network/engineering, -/obj/item/weapon/circuitboard/robotics{ +/obj/item/circuitboard/robotics{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/mecha_control, -/obj/item/weapon/circuitboard/aifixer{ +/obj/item/circuitboard/mecha_control, +/obj/item/circuitboard/aifixer{ pixel_x = 3; pixel_y = -3 }, @@ -1766,7 +1766,7 @@ }) "adl" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -24 @@ -1792,19 +1792,19 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/transhuman_resleever{ +/obj/item/circuitboard/transhuman_resleever{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/circuit_imprinter{ +/obj/item/circuitboard/circuit_imprinter{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/aiupload{ +/obj/item/circuitboard/aiupload{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/borgupload{ +/obj/item/circuitboard/borgupload{ pixel_x = 3; pixel_y = -3 }, @@ -1814,7 +1814,7 @@ /turf/simulated/floor/tiled/dark, /area/storage/tech) "ado" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -1860,7 +1860,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -2382,18 +2382,18 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "aej" = ( -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 1; pixel_y = 5 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 1; pixel_y = 5 }, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, /obj/structure/table/steel, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -2485,7 +2485,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -2746,14 +2746,14 @@ /obj/item/stack/flag/green{ pixel_x = -4 }, -/obj/item/weapon/storage/box/nifsofts_mining, +/obj/item/storage/box/nifsofts_mining, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, /obj/structure/sign/poster, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, -/obj/item/device/personal_shield_generator/belt/mining/loaded, +/obj/item/personal_shield_generator/belt/mining/loaded, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "aeK" = ( @@ -3194,12 +3194,12 @@ /area/hallway/station/docks) "afK" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen{ +/obj/item/folder/yellow, +/obj/item/pen{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = 2; pixel_y = 6 }, @@ -3578,7 +3578,7 @@ "agH" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/corner/white/diagonal, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /turf/simulated/floor/tiled, /area/engineering/break_room) "agI" = ( @@ -3660,7 +3660,7 @@ /area/shuttle/excursion/general) "agS" = ( /obj/structure/closet/secure_closet/quartermaster, -/obj/item/weapon/storage/backpack/dufflebag, +/obj/item/storage/backpack/dufflebag, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -3836,7 +3836,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -4213,14 +4213,14 @@ /obj/machinery/door/window/brigdoor/westleft{ req_access = list(5) }, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/void/expedition_medical, /obj/item/clothing/head/helmet/space/void/expedition_medical, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/void/expedition_medical, @@ -4384,15 +4384,15 @@ /area/engineering/engine_airlock) "aiG" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/scanning_module, -/obj/item/weapon/stock_parts/scanning_module, -/obj/item/weapon/stock_parts/console_screen, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/console_screen, /turf/simulated/floor, /area/storage/tech) "aiH" = ( @@ -4410,22 +4410,22 @@ dir = 1 }, /obj/structure/table/rack/steel, -/obj/item/weapon/computer_hardware/battery_module, -/obj/item/weapon/computer_hardware/battery_module, -/obj/item/weapon/computer_hardware/battery_module/nano, -/obj/item/weapon/computer_hardware/hard_drive, -/obj/item/weapon/computer_hardware/hard_drive, -/obj/item/weapon/computer_hardware/hard_drive/micro, -/obj/item/weapon/computer_hardware/network_card, -/obj/item/weapon/computer_hardware/network_card, -/obj/item/weapon/computer_hardware/network_card/wired, -/obj/item/weapon/computer_hardware/processor_unit, -/obj/item/weapon/computer_hardware/processor_unit, -/obj/item/weapon/computer_hardware/processor_unit/small, -/obj/item/weapon/computer_hardware/tesla_link, -/obj/item/weapon/computer_hardware/nano_printer, -/obj/item/weapon/computer_hardware/hard_drive/portable, -/obj/item/weapon/computer_hardware/hard_drive/portable, +/obj/item/computer_hardware/battery_module, +/obj/item/computer_hardware/battery_module, +/obj/item/computer_hardware/battery_module/nano, +/obj/item/computer_hardware/hard_drive, +/obj/item/computer_hardware/hard_drive, +/obj/item/computer_hardware/hard_drive/micro, +/obj/item/computer_hardware/network_card, +/obj/item/computer_hardware/network_card, +/obj/item/computer_hardware/network_card/wired, +/obj/item/computer_hardware/processor_unit, +/obj/item/computer_hardware/processor_unit, +/obj/item/computer_hardware/processor_unit/small, +/obj/item/computer_hardware/tesla_link, +/obj/item/computer_hardware/nano_printer, +/obj/item/computer_hardware/hard_drive/portable, +/obj/item/computer_hardware/hard_drive/portable, /turf/simulated/floor, /area/storage/tech) "aiJ" = ( @@ -4561,10 +4561,10 @@ /area/engineering/engine_room) "ajq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/machinery/camera/network/command, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) @@ -4736,12 +4736,12 @@ "ajV" = ( /obj/machinery/camera/network/engineering, /obj/structure/table/rack/steel, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/circuitboard/partslathe, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/console_screen, +/obj/item/circuitboard/partslathe, /turf/simulated/floor/plating, /area/storage/tech) "ajX" = ( @@ -4753,16 +4753,16 @@ }, /area/tcommsat/chamber) "ajZ" = ( -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, /obj/machinery/light/small{ dir = 1 }, -/obj/item/weapon/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, /obj/structure/table/rack/steel, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/circuitboard/autolathe, +/obj/item/stock_parts/console_screen, +/obj/item/circuitboard/autolathe, /turf/simulated/floor/plating, /area/storage/tech) "aka" = ( @@ -4816,7 +4816,7 @@ /turf/simulated/floor, /area/engineering/storage) "akj" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/machinery/shield_capacitor, @@ -4955,14 +4955,14 @@ /area/engineering/gravity_gen) "akR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 6 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, /obj/machinery/firealarm{ @@ -5033,7 +5033,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/storage) "ala" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor, /area/storage/tech) "alb" = ( @@ -5058,7 +5058,7 @@ /area/engineering/storage) "ald" = ( /obj/structure/table/steel, -/obj/item/device/integrated_circuit_printer, +/obj/item/integrated_circuit_printer, /turf/simulated/floor, /area/storage/tech) "ale" = ( @@ -5105,10 +5105,10 @@ /area/ai_monitored/storage/eva) "alk" = ( /obj/structure/table/steel, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = -5 }, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = 5 }, /turf/simulated/floor, @@ -5387,28 +5387,28 @@ /area/engineering/engineering_monitoring) "alZ" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/rdserver{ +/obj/item/circuitboard/rdserver{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/protolathe{ +/obj/item/circuitboard/protolathe{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/destructive_analyzer{ +/obj/item/circuitboard/destructive_analyzer{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/rdconsole, -/obj/item/weapon/circuitboard/autolathe{ +/obj/item/circuitboard/rdconsole, +/obj/item/circuitboard/autolathe{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/mechfab{ +/obj/item/circuitboard/mechfab{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/prosthetics{ +/obj/item/circuitboard/prosthetics{ pixel_x = 3; pixel_y = -3 }, @@ -5419,28 +5419,28 @@ /area/storage/tech) "amb" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/skills/pcu{ +/obj/item/circuitboard/skills/pcu{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/med_data{ +/obj/item/circuitboard/med_data{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/secure_data{ +/obj/item/circuitboard/secure_data{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/security, -/obj/item/weapon/circuitboard/security/engineering{ +/obj/item/circuitboard/security, +/obj/item/circuitboard/security/engineering{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/security/mining{ +/obj/item/circuitboard/security/mining{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/stationalert_security{ +/obj/item/circuitboard/stationalert_security{ pixel_x = 3; pixel_y = -3 }, @@ -5456,7 +5456,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -5467,18 +5467,18 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ pixel_x = 3; pixel_y = 6 }, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ pixel_y = 3 }, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ pixel_x = -3 }, /turf/simulated/floor/tiled, @@ -5679,7 +5679,7 @@ /area/shuttle/medivac/cockpit) "amY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/item/bodybag/cryobag{ pixel_x = 6 }, @@ -5700,12 +5700,12 @@ /area/engineering/engineering_monitoring) "ana" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/algae_farm{ +/obj/item/circuitboard/algae_farm{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/unary_atmos/heater, -/obj/item/weapon/circuitboard/unary_atmos/cooler{ +/obj/item/circuitboard/unary_atmos/heater, +/obj/item/circuitboard/unary_atmos/cooler{ pixel_x = 3; pixel_y = -3 }, @@ -5723,32 +5723,32 @@ /area/storage/tech) "anb" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/grinder{ +/obj/item/circuitboard/grinder{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/circuitboard/grill{ +/obj/item/circuitboard/grill{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/fryer{ +/obj/item/circuitboard/fryer{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/oven{ +/obj/item/circuitboard/oven{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/microwave, -/obj/item/weapon/circuitboard/cerealmaker{ +/obj/item/circuitboard/microwave, +/obj/item/circuitboard/cerealmaker{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/candymachine{ +/obj/item/circuitboard/candymachine{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/biogenerator{ +/obj/item/circuitboard/biogenerator{ pixel_x = 3; pixel_y = -3 }, @@ -5810,7 +5810,7 @@ /turf/simulated/floor, /area/storage/tech) "ans" = ( -/obj/item/weapon/storage/box/nifsofts_pilot, +/obj/item/storage/box/nifsofts_pilot, /obj/structure/table/steel, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, @@ -6035,19 +6035,19 @@ /area/crew_quarters/heads/chief) "anT" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/body_designer{ +/obj/item/circuitboard/body_designer{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/resleeving_control{ +/obj/item/circuitboard/resleeving_control{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/transhuman_clonepod{ +/obj/item/circuitboard/transhuman_clonepod{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/transhuman_synthprinter{ +/obj/item/circuitboard/transhuman_synthprinter{ pixel_x = 3; pixel_y = -3 }, @@ -6055,24 +6055,24 @@ /area/storage/tech) "anX" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/powermonitor{ +/obj/item/circuitboard/powermonitor{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/stationalert_engineering{ +/obj/item/circuitboard/stationalert_engineering{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/atmos_alert{ +/obj/item/circuitboard/atmos_alert{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/rcon_console, -/obj/item/weapon/circuitboard/atmoscontrol{ +/obj/item/circuitboard/rcon_console, +/obj/item/circuitboard/atmoscontrol{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/drone_control{ +/obj/item/circuitboard/drone_control{ pixel_x = 2; pixel_y = -2 }, @@ -6090,28 +6090,28 @@ /area/engineering/hallway) "aoc" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/sleeper{ +/obj/item/circuitboard/sleeper{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/sleeper_console{ +/obj/item/circuitboard/sleeper_console{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/body_scanner{ +/obj/item/circuitboard/body_scanner{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/scanner_console, -/obj/item/weapon/circuitboard/grinder{ +/obj/item/circuitboard/scanner_console, +/obj/item/circuitboard/grinder{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/bioprinter{ +/obj/item/circuitboard/bioprinter{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/chem_master{ +/obj/item/circuitboard/chem_master{ pixel_x = 3; pixel_y = -3 }, @@ -6147,32 +6147,32 @@ /area/tether/station/restroom) "aog" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/circuitboard/mech_recharger{ +/obj/item/circuitboard/mech_recharger{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/circuitboard/cell_charger{ +/obj/item/circuitboard/cell_charger{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/recharger{ +/obj/item/circuitboard/recharger{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/recharge_station{ +/obj/item/circuitboard/recharge_station{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/arcade/battle, -/obj/item/weapon/circuitboard/arcade/clawmachine{ +/obj/item/circuitboard/arcade/battle, +/obj/item/circuitboard/arcade/clawmachine{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/arcade/orion_trail{ +/obj/item/circuitboard/arcade/orion_trail{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/jukebox{ +/obj/item/circuitboard/jukebox{ pixel_x = 3; pixel_y = -3 }, @@ -6243,7 +6243,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -6278,8 +6278,8 @@ dir = 4 }, /obj/structure/table/steel, -/obj/item/device/pipe_painter, -/obj/item/weapon/pipe_dispenser, +/obj/item/pipe_painter, +/obj/item/pipe_dispenser, /turf/simulated/floor, /area/storage/tech) "aos" = ( @@ -7410,10 +7410,10 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_y = 5 }, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled, /area/engineering/workshop) "art" = ( @@ -7522,7 +7522,7 @@ dir = 8 }, /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, /turf/simulated/floor/carpet, /area/engineering/break_room) "arO" = ( @@ -7655,7 +7655,7 @@ dir = 10 }, /obj/structure/table/woodentable, -/obj/item/weapon/book/manual/supermatter_engine{ +/obj/item/book/manual/supermatter_engine{ pixel_x = -3 }, /turf/simulated/floor/carpet, @@ -7767,12 +7767,12 @@ /area/engineering/atmos/backup) "asA" = ( /obj/structure/table/reinforced, -/obj/item/device/floor_painter, -/obj/item/device/t_scanner, -/obj/item/device/multitool{ +/obj/item/floor_painter, +/obj/item/t_scanner, +/obj/item/multitool{ pixel_x = 5 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/machinery/camera/network/engineering{ dir = 4 }, @@ -7780,7 +7780,7 @@ /area/engineering/workshop) "asF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, @@ -7917,8 +7917,8 @@ /area/engineering/atmos/backup) "ath" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/stack/cable_coil{ pixel_x = 3; pixel_y = 3 @@ -7927,27 +7927,27 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/nifsofts_engineering, +/obj/item/storage/box/nifsofts_engineering, /turf/simulated/floor/tiled, /area/engineering/workshop) "atj" = ( /obj/structure/table/reinforced, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 6 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -6; pixel_y = 4 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = 6; pixel_y = 4 }, -/obj/item/device/radio/off, +/obj/item/radio/off, /turf/simulated/floor/tiled, /area/engineering/workshop) "atk" = ( @@ -8105,7 +8105,7 @@ "atN" = ( /obj/structure/table/reinforced, /obj/random/toolbox, -/obj/item/device/geiger, +/obj/item/geiger, /turf/simulated/floor/tiled, /area/engineering/workshop) "atO" = ( @@ -8192,16 +8192,16 @@ "atZ" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/bookcase/manuals/engineering, -/obj/item/weapon/book/manual/engineering_construction, -/obj/item/weapon/book/manual/atmospipes, -/obj/item/weapon/book/manual/engineering_guide, -/obj/item/weapon/book/manual/evaguide, +/obj/item/book/manual/engineering_construction, +/obj/item/book/manual/atmospipes, +/obj/item/book/manual/engineering_guide, +/obj/item/book/manual/evaguide, /turf/simulated/floor/tiled, /area/engineering/break_room) "auc" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/corner/white/diagonal, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/item/bodybag/cryobag{ pixel_x = 6 }, @@ -8358,7 +8358,7 @@ /turf/simulated/floor/grass, /area/quartermaster/qm) "auU" = ( -/obj/item/weapon/stool, +/obj/item/stool, /obj/effect/floor_decal/industrial/warning{ dir = 9 }, @@ -8420,9 +8420,9 @@ icon_state = "0-4" }, /obj/structure/table/reinforced, -/obj/item/weapon/tool/crowbar, +/obj/item/tool/crowbar, /obj/item/clothing/gloves/black, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/simulated/floor/tiled, /area/engineering/workshop) "avf" = ( @@ -8524,8 +8524,8 @@ /area/quartermaster/office) "avs" = ( /obj/structure/table/reinforced, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/machinery/light_switch{ pixel_x = 11; pixel_y = 24 @@ -8761,14 +8761,14 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/weapon/packageWrap, -/obj/item/device/destTagger{ +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/destTagger{ pixel_x = 4; pixel_y = 3 }, @@ -8949,7 +8949,7 @@ /area/maintenance/station/eng_lower) "awT" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/glasses/square, +/obj/item/storage/box/glasses/square, /obj/effect/floor_decal/corner/white/diagonal, /obj/machinery/alarm{ dir = 8; @@ -8987,11 +8987,11 @@ pixel_y = 26 }, /obj/structure/closet/secure_closet/cargotech, -/obj/item/weapon/stamp/cargo, +/obj/item/stamp/cargo, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/storage/backpack/dufflebag, +/obj/item/storage/backpack/dufflebag, /turf/simulated/floor/tiled, /area/quartermaster/storage) "awX" = ( @@ -9045,9 +9045,9 @@ /area/maintenance/cargo) "axc" = ( /obj/structure/table/standard, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/stamp{ +/obj/item/hand_labeler, +/obj/item/folder/yellow, +/obj/item/stamp{ pixel_x = -3; pixel_y = 3 }, @@ -9104,7 +9104,7 @@ /obj/structure/table/standard, /obj/item/clothing/head/soft, /obj/item/clothing/head/soft, -/obj/item/weapon/stamp{ +/obj/item/stamp{ pixel_x = -3; pixel_y = 3 }, @@ -9218,7 +9218,7 @@ dir = 9 }, /obj/structure/table/woodentable, -/obj/item/weapon/material/ashtray/glass, +/obj/item/material/ashtray/glass, /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) "axG" = ( @@ -9302,7 +9302,7 @@ /obj/structure/table/reinforced, /obj/random/maintenance/clean, /obj/random/powercell, -/obj/item/device/t_scanner, +/obj/item/t_scanner, /turf/simulated/floor/tiled, /area/engineering/workshop) "axY" = ( @@ -9358,11 +9358,11 @@ /obj/machinery/light, /obj/structure/table/reinforced, /obj/effect/floor_decal/corner/white/diagonal, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/multi, +/obj/item/pen/multi, /obj/machinery/light_switch{ dir = 1; pixel_y = -24 @@ -9499,7 +9499,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -10023,7 +10023,7 @@ dir = 8; layer = 2.6 }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /turf/simulated/floor/tiled, /area/engineering/engine_eva) "aAT" = ( @@ -10073,7 +10073,7 @@ dir = 8; layer = 2.6 }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/machinery/status_display{ pixel_y = 32 }, @@ -10100,14 +10100,14 @@ icon_state = "0-2" }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 6 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, /turf/simulated/floor/tiled, @@ -10255,9 +10255,9 @@ /area/maintenance/station/eng_lower) "aBI" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/belt/utility, -/obj/item/device/multitool, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/multitool, +/obj/item/storage/belt/utility, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled, @@ -10356,11 +10356,11 @@ /area/engineering/engineering_monitoring) "aCc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/rcd, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd_ammo, +/obj/item/rcd, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, +/obj/item/rcd_ammo, /obj/machinery/light_switch{ pixel_x = -22; pixel_y = 22 @@ -10375,7 +10375,7 @@ /area/engineering/gravity_gen) "aCf" = ( /obj/structure/table/reinforced, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -10515,19 +10515,19 @@ "aCP" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -10542,8 +10542,8 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/cell/device, -/obj/item/weapon/cell/device, +/obj/item/cell/device, +/obj/item/cell/device, /obj/machinery/light_switch{ dir = 8; pixel_x = 24 @@ -10564,9 +10564,9 @@ dir = 1 }, /obj/item/clothing/suit/fire/firefighter, -/obj/item/weapon/tank/oxygen, +/obj/item/tank/oxygen, /obj/item/clothing/mask/gas, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/glasses/meson, /obj/machinery/power/apc{ @@ -10577,7 +10577,7 @@ /obj/random/junk, /obj/random/tool, /obj/random/maintenance/clean, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -11445,14 +11445,14 @@ /area/engineering/foyer) "aJV" = ( /obj/structure/closet/crate, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/circuitboard/smes, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil/super_capacity, -/obj/item/weapon/smes_coil/super_capacity, -/obj/item/weapon/smes_coil/super_io, -/obj/item/weapon/smes_coil/super_io, +/obj/item/circuitboard/smes, +/obj/item/circuitboard/smes, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil/super_capacity, +/obj/item/smes_coil/super_capacity, +/obj/item/smes_coil/super_io, +/obj/item/smes_coil/super_io, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/engineering/storage) @@ -11472,7 +11472,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -11761,7 +11761,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -11942,7 +11942,7 @@ /area/maintenance/station/eng_lower) "aMt" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -28 @@ -12149,8 +12149,8 @@ dir = 4; pixel_x = -23 }, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) "aPa" = ( @@ -12218,7 +12218,7 @@ dir = 1 }, /obj/item/clothing/mask/breath, -/obj/item/weapon/rig/ce/equipped, +/obj/item/rig/ce/equipped, /obj/structure/sign/painting/library_secure{ pixel_x = -30 }, @@ -12309,7 +12309,7 @@ /area/engineering/engineering_airlock) "aQD" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/machinery/door/window/westleft{ dir = 4; name = "Engineering Reception Desk"; @@ -12369,7 +12369,7 @@ /area/engineering/workshop) "aRy" = ( /obj/structure/closet/toolcloset, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/simulated/floor/tiled, /area/engineering/workshop) "aRA" = ( @@ -12491,19 +12491,19 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/blue{ +/obj/item/pen/blue{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/simulated/floor/tiled, /area/engineering/foyer) "aSL" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -12539,8 +12539,8 @@ /area/shuttle/excursion/cockpit) "aTE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/packageWrap, +/obj/item/hand_labeler, /obj/machinery/status_display{ pixel_y = -32 }, @@ -12602,12 +12602,12 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/yellow_ce, -/obj/item/weapon/pen/multi, +/obj/item/folder/yellow_ce, +/obj/item/pen/multi, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) "aTV" = ( @@ -12748,7 +12748,7 @@ /area/crew_quarters/heads/chief) "aVK" = ( /obj/structure/table/reinforced, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/random/tech_supply, @@ -12844,17 +12844,17 @@ /area/tether/exploration) "aWJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/camera/network/command, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "aXm" = ( /obj/structure/table/reinforced, -/obj/item/device/communicator, -/obj/item/device/communicator, -/obj/item/device/communicator, -/obj/item/device/communicator, +/obj/item/communicator, +/obj/item/communicator, +/obj/item/communicator, +/obj/item/communicator, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "aXC" = ( @@ -12869,7 +12869,7 @@ /area/engineering/gravity_gen) "aXX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) "aXZ" = ( @@ -12961,11 +12961,11 @@ /area/crew_quarters/heads/chief) "aYJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/supermatter_engine, -/obj/item/device/radio{ +/obj/item/book/manual/supermatter_engine, +/obj/item/radio{ pixel_x = -4 }, -/obj/item/device/megaphone, +/obj/item/megaphone, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "aZe" = ( @@ -13035,7 +13035,7 @@ pixel_y = 4 }, /obj/item/clothing/glasses/welding/superior, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) "baI" = ( @@ -13138,7 +13138,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/table/reinforced, -/obj/item/weapon/stamp/ce, +/obj/item/stamp/ce, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) "bcp" = ( @@ -13397,7 +13397,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -13655,7 +13655,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/device/multitool/station_buffered, +/obj/item/multitool/station_buffered, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "bkU" = ( @@ -13671,14 +13671,14 @@ /turf/simulated/shuttle/wall/hard_corner, /area/shuttle/mining_outpost/shuttle) "bmv" = ( -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 6 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_y = 3 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, /obj/structure/table/reinforced, @@ -13860,7 +13860,7 @@ /turf/simulated/floor/tiled, /area/engineering/gravity_gen) "bth" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -14206,34 +14206,34 @@ pixel_y = -24 }, /obj/structure/table/rack/shelf, -/obj/item/device/radio/headset/explorer{ +/obj/item/radio/headset/explorer{ pixel_x = -5; pixel_y = -5 }, -/obj/item/device/radio/headset/explorer{ +/obj/item/radio/headset/explorer{ pixel_x = -5; pixel_y = 5 }, -/obj/item/device/radio/headset/explorer{ +/obj/item/radio/headset/explorer{ pixel_y = 5 }, -/obj/item/device/radio/headset/explorer{ +/obj/item/radio/headset/explorer{ pixel_x = 5; pixel_y = 5 }, -/obj/item/device/radio/headset/explorer{ +/obj/item/radio/headset/explorer{ pixel_x = 11; pixel_y = 5 }, -/obj/item/device/radio/headset/explorer{ +/obj/item/radio/headset/explorer{ pixel_x = 11; pixel_y = -5 }, -/obj/item/device/radio/headset/explorer{ +/obj/item/radio/headset/explorer{ pixel_x = 5; pixel_y = -5 }, -/obj/item/device/radio/headset/explorer{ +/obj/item/radio/headset/explorer{ pixel_y = -5 }, /turf/simulated/floor/tiled, @@ -14416,7 +14416,7 @@ /obj/item/clothing/suit/space/void/mining, /obj/item/clothing/mask/breath, /obj/item/clothing/head/helmet/space/void/mining, -/obj/item/weapon/mining_scanner, +/obj/item/mining_scanner, /obj/machinery/light{ dir = 1 }, @@ -14539,7 +14539,7 @@ /area/maintenance/station/cargo) "bQG" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "bQS" = ( @@ -14650,8 +14650,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/tape_roll, +/obj/item/clipboard, +/obj/item/tape_roll, /turf/simulated/floor/tiled, /area/engineering/foyer) "bXJ" = ( @@ -14678,7 +14678,7 @@ "bYg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -28 @@ -14751,7 +14751,7 @@ /area/hallway/station/atrium) "bZD" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/structure/curtain/open/bed, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -14841,21 +14841,21 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "cbj" = ( -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, -/obj/item/device/multitool, +/obj/item/multitool, /obj/item/clothing/glasses/meson, /obj/structure/table/rack/steel, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, /obj/item/clothing/gloves/yellow, -/obj/item/device/t_scanner, +/obj/item/t_scanner, /obj/item/clothing/glasses/meson, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/plating, /area/storage/tech) "cbU" = ( @@ -15029,9 +15029,9 @@ /area/gateway/prep_room) "cik" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -15670,8 +15670,8 @@ "cOq" = ( /obj/effect/floor_decal/rust, /obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, /area/janitor) @@ -15945,11 +15945,11 @@ /area/quartermaster/belterdock/refinery) "dgO" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/sub_filter, -/obj/item/weapon/stock_parts/subspace/sub_filter, -/obj/item/weapon/stock_parts/subspace/sub_filter, -/obj/item/weapon/stock_parts/subspace/sub_filter, -/obj/item/weapon/stock_parts/subspace/sub_filter, +/obj/item/stock_parts/subspace/sub_filter, +/obj/item/stock_parts/subspace/sub_filter, +/obj/item/stock_parts/subspace/sub_filter, +/obj/item/stock_parts/subspace/sub_filter, +/obj/item/stock_parts/subspace/sub_filter, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -16065,16 +16065,16 @@ /area/shuttle/excursion/general) "djU" = ( /obj/structure/table/glass, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = 9 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = 2 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = -5 }, -/obj/item/weapon/backup_implanter{ +/obj/item/backup_implanter{ pixel_y = -12 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -16433,7 +16433,7 @@ /area/shuttle/securiship/engines) "dAV" = ( /obj/structure/bed/chair/shuttle, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -16691,7 +16691,7 @@ icon_state = "0-8" }, /obj/structure/table/standard, -/obj/item/weapon/tank/phoron, +/obj/item/tank/phoron, /obj/random/medical, /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "medbus"; @@ -16882,7 +16882,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -17094,7 +17094,7 @@ }, /area/shuttle/medivac/engines) "exi" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -17270,7 +17270,7 @@ /area/tether/station/dock_one) "eHw" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -17656,7 +17656,7 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -17692,10 +17692,10 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/suit/space/emergency, /obj/item/clothing/suit/space/emergency, @@ -17705,10 +17705,10 @@ /obj/item/clothing/head/helmet/space/emergency, /obj/item/clothing/head/helmet/space/emergency, /obj/structure/closet/emcloset/legacy, -/obj/item/weapon/storage/backpack/parachute, -/obj/item/weapon/storage/backpack/parachute, -/obj/item/weapon/storage/backpack/parachute, -/obj/item/weapon/storage/backpack/parachute, +/obj/item/storage/backpack/parachute, +/obj/item/storage/backpack/parachute, +/obj/item/storage/backpack/parachute, +/obj/item/storage/backpack/parachute, /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "explo" }, @@ -18011,7 +18011,7 @@ /area/shuttle/large_escape_pod1) "fyF" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -28 @@ -18424,7 +18424,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -18734,7 +18734,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "glt" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -18860,7 +18860,7 @@ /obj/structure/handrail{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -18993,9 +18993,9 @@ /area/quartermaster/office) "gEV" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, /turf/simulated/floor/tiled/techmaint, /area/tcomfoyer{ name = "\improper Telecomms Storage" @@ -19087,7 +19087,7 @@ /area/storage/tools) "gKH" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/status_display{ layer = 4; pixel_x = 32 @@ -19318,7 +19318,7 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, @@ -19347,17 +19347,17 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "gXl" = ( -/obj/item/weapon/circuitboard/telecomms/processor, -/obj/item/weapon/circuitboard/telecomms/processor, -/obj/item/weapon/circuitboard/telecomms/receiver, -/obj/item/weapon/circuitboard/telecomms/server, -/obj/item/weapon/circuitboard/telecomms/server, -/obj/item/weapon/circuitboard/telecomms/bus, -/obj/item/weapon/circuitboard/telecomms/bus, -/obj/item/weapon/circuitboard/telecomms/broadcaster, -/obj/item/weapon/circuitboard/telecomms/exonet_node, -/obj/item/weapon/circuitboard/ntnet_relay, -/obj/item/weapon/circuitboard/telecomms/relay, +/obj/item/circuitboard/telecomms/processor, +/obj/item/circuitboard/telecomms/processor, +/obj/item/circuitboard/telecomms/receiver, +/obj/item/circuitboard/telecomms/server, +/obj/item/circuitboard/telecomms/server, +/obj/item/circuitboard/telecomms/bus, +/obj/item/circuitboard/telecomms/bus, +/obj/item/circuitboard/telecomms/broadcaster, +/obj/item/circuitboard/telecomms/exonet_node, +/obj/item/circuitboard/ntnet_relay, +/obj/item/circuitboard/telecomms/relay, /obj/structure/table/standard, /turf/simulated/floor/tiled/techmaint, /area/tcomfoyer{ @@ -19365,8 +19365,8 @@ }) "gZJ" = ( /obj/structure/table/standard, -/obj/item/weapon/clipboard, -/obj/item/weapon/stamp/qm, +/obj/item/clipboard, +/obj/item/stamp/qm, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -19448,8 +19448,8 @@ }) "hed" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/jetpack, -/obj/item/weapon/tank/jetpack, +/obj/item/tank/jetpack, +/obj/item/tank/jetpack, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -19546,8 +19546,8 @@ }) "hic" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue{ +/obj/item/paper_bin, +/obj/item/pen/blue{ pixel_x = -3; pixel_y = 2 }, @@ -19633,7 +19633,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/obj/item/device/radio/intercom/locked/ai_private{ +/obj/item/radio/intercom/locked/ai_private{ dir = 4; pixel_x = 32 }, @@ -19653,7 +19653,7 @@ "hlX" = ( /obj/structure/table/reinforced, /obj/item/clothing/head/welding, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "hmd" = ( @@ -19719,13 +19719,13 @@ /area/gateway/prep_room) "hqp" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/transmitter, -/obj/item/weapon/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter, /obj/structure/cable/green{ icon_state = "0-4" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -24 @@ -19974,9 +19974,9 @@ /area/hallway/station/docks) "hyp" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, /obj/machinery/light_switch{ dir = 4; pixel_x = -26 @@ -20131,7 +20131,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -20209,7 +20209,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -20761,18 +20761,18 @@ /area/maintenance/station/cargo) "ieS" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/void/exploration, /obj/item/clothing/head/helmet/space/void/exploration, -/obj/item/device/bluespaceradio/tether_prelinked, +/obj/item/bluespaceradio/tether_prelinked, /obj/machinery/door/window/brigdoor{ req_access = list(43) }, -/obj/item/device/cataloguer/compact, -/obj/item/device/cataloguer/compact, +/obj/item/cataloguer/compact, +/obj/item/cataloguer/compact, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "ifp" = ( @@ -21074,16 +21074,16 @@ /area/maintenance/cargo) "iyl" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, /turf/simulated/floor/tiled/techmaint, /area/tcomfoyer{ name = "\improper Telecomms Storage" @@ -21187,7 +21187,7 @@ /obj/item/clothing/suit/space/void/mining, /obj/item/clothing/mask/breath, /obj/item/clothing/head/helmet/space/void/mining, -/obj/item/weapon/mining_scanner, +/obj/item/mining_scanner, /obj/machinery/alarm{ pixel_y = 22 }, @@ -21226,18 +21226,18 @@ /area/tether/exploration/hallway) "iHb" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/void/exploration, /obj/item/clothing/head/helmet/space/void/exploration, -/obj/item/device/mapping_unit, +/obj/item/mapping_unit, /obj/machinery/door/window/brigdoor/eastright{ req_access = list(43) }, -/obj/item/device/cataloguer, -/obj/item/device/cataloguer, +/obj/item/cataloguer, +/obj/item/cataloguer, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "iIf" = ( @@ -21353,7 +21353,7 @@ /area/tether/station/dock_two) "iOm" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_y = 5 }, /obj/machinery/alarm{ @@ -21530,9 +21530,9 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 10 }, -/obj/item/weapon/wrapping_paper, -/obj/item/weapon/wrapping_paper, -/obj/item/weapon/wrapping_paper, +/obj/item/wrapping_paper, +/obj/item/wrapping_paper, +/obj/item/wrapping_paper, /turf/simulated/floor/tiled, /area/quartermaster/delivery) "iWB" = ( @@ -21574,16 +21574,16 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen{ +/obj/item/folder/yellow, +/obj/item/pen{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/pen/red{ +/obj/item/pen/red{ pixel_x = 2; pixel_y = 6 }, @@ -21758,7 +21758,7 @@ /obj/item/clothing/suit/space/void/mining, /obj/item/clothing/mask/breath, /obj/item/clothing/head/helmet/space/void/mining, -/obj/item/weapon/mining_scanner, +/obj/item/mining_scanner, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -22054,8 +22054,8 @@ /area/tether/exploration/pilot_office) "jDU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/briefcase/inflatable, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable{ pixel_x = 3; pixel_y = 6 }, @@ -22091,9 +22091,9 @@ /area/ai_monitored/storage/eva) "jEs" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -22327,7 +22327,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/item/weapon/stool, +/obj/item/stool, /obj/structure/cable/yellow{ icon_state = "1-8" }, @@ -23443,7 +23443,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/tether/station/dock_two) @@ -23484,7 +23484,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "kPJ" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -23743,15 +23743,15 @@ /area/quartermaster/belterdock/refinery) "ldJ" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/pilot, /obj/item/clothing/head/helmet/space/void/pilot, /obj/machinery/light{ dir = 1 }, -/obj/item/device/radio/headset/explorer, +/obj/item/radio/headset/explorer, /turf/simulated/floor, /area/tether/exploration/pilot_office) "lfI" = ( @@ -23837,8 +23837,8 @@ icon_state = "0-8" }, /obj/structure/closet/secure_closet/cargotech, -/obj/item/weapon/stamp/cargo, -/obj/item/weapon/storage/backpack/dufflebag, +/obj/item/stamp/cargo, +/obj/item/storage/backpack/dufflebag, /turf/simulated/floor/tiled, /area/quartermaster/storage) "ljl" = ( @@ -23871,7 +23871,7 @@ /area/tether/station/dock_one) "llt" = ( /obj/structure/closet/crate, -/obj/item/weapon/card/id/gold/captain/spare/fakespare, +/obj/item/card/id/gold/captain/spare/fakespare, /obj/random/cash/big, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, @@ -24021,7 +24021,7 @@ /area/quartermaster/office) "lsw" = ( /obj/structure/table/rack, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "secbus"; name = "secbus" @@ -24155,7 +24155,7 @@ layer = 2.9 }, /obj/item/clothing/mask/breath, -/obj/item/weapon/rig/eva/equipped, +/obj/item/rig/eva/equipped, /obj/machinery/door/window/brigdoor{ req_access = list(11,24) }, @@ -24250,8 +24250,8 @@ /area/tether/station/dock_two) "lAt" = ( /obj/structure/table/reinforced, -/obj/item/device/assembly/signaler, -/obj/item/device/assembly/signaler, +/obj/item/assembly/signaler, +/obj/item/assembly/signaler, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "lBQ" = ( @@ -24282,7 +24282,7 @@ icon_state = "0-4" }, /obj/structure/table/standard, -/obj/item/weapon/tank/phoron, +/obj/item/tank/phoron, /obj/random/tool, /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "secbus"; @@ -24780,15 +24780,15 @@ /area/tether/exploration) "mcE" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/pilot, /obj/item/clothing/head/helmet/space/void/pilot, /obj/machinery/alarm{ pixel_y = 22 }, -/obj/item/device/radio/headset/explorer, +/obj/item/radio/headset/explorer, /turf/simulated/floor, /area/tether/exploration/pilot_office) "mdh" = ( @@ -25301,7 +25301,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -25849,7 +25849,7 @@ /area/shuttle/belter) "nob" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/effect/floor_decal/borderfloor{ dir = 6 }, @@ -25899,7 +25899,7 @@ pixel_y = -25 }, /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid, +/obj/item/storage/firstaid, /obj/item/stack/medical/splint, /turf/simulated/floor/tiled/white, /area/tether/exploration/hallway) @@ -26001,11 +26001,11 @@ /area/tether/station/dock_two) "nvM" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/device/megaphone, +/obj/item/megaphone, /turf/simulated/floor/wood, /area/quartermaster/qm) "nwK" = ( @@ -26055,16 +26055,16 @@ pixel_y = -32 }, /obj/structure/table/rack, -/obj/item/weapon/pickaxe, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/shovel, +/obj/item/pickaxe, +/obj/item/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/shovel, /obj/machinery/camera/network/mining{ dir = 1 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/brown/bordercorner2, /turf/simulated/floor/tiled, @@ -26351,7 +26351,7 @@ id = "QMLoad" }, /obj/structure/sign/poster, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -26550,7 +26550,7 @@ /area/tether/exploration/pilot_office) "ofV" = ( /obj/structure/table/standard, -/obj/item/weapon/paper/rogueminer, +/obj/item/paper/rogueminer, /obj/machinery/cell_charger, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, @@ -26584,7 +26584,7 @@ /area/quartermaster/qm) "ohc" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/alarm{ pixel_y = 22 @@ -26744,7 +26744,7 @@ /area/tether/station/dock_one) "ovq" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/item/storage/pill_bottle/dice_nerd, /obj/random/maintenance/cargo, /obj/structure/sign/painting/public{ pixel_x = 30 @@ -26769,10 +26769,10 @@ /area/maintenance/cargo) "owQ" = ( /obj/structure/table/steel, -/obj/item/weapon/module/power_control, -/obj/item/weapon/airlock_electronics, -/obj/item/weapon/module/power_control, -/obj/item/weapon/airlock_electronics, +/obj/item/module/power_control, +/obj/item/airlock_electronics, +/obj/item/module/power_control, +/obj/item/airlock_electronics, /obj/machinery/alarm{ dir = 1; pixel_y = -25 @@ -26945,7 +26945,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 6 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -27118,8 +27118,8 @@ /area/hallway/station/docks) "oYQ" = ( /obj/structure/table/steel, -/obj/item/device/aicard, -/obj/item/weapon/aiModule/reset, +/obj/item/aicard, +/obj/item/aiModule/reset, /turf/simulated/floor, /area/storage/tech) "oZy" = ( @@ -27229,11 +27229,11 @@ /area/hallway/station/atrium) "plm" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, -/obj/item/device/multitool, +/obj/item/multitool, /obj/machinery/camera/network/command{ dir = 10 }, @@ -27499,9 +27499,9 @@ /area/hallway/station/atrium) "pMe" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/analyzer, -/obj/item/weapon/stock_parts/subspace/analyzer, -/obj/item/weapon/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, /obj/machinery/light/no_nightshift{ dir = 1 }, @@ -28114,7 +28114,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled, /area/hallway/station/docks) "qBP" = ( @@ -28373,7 +28373,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "qTD" = ( -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/structure/bed/padded, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -28417,7 +28417,7 @@ dir = 9 }, /obj/structure/table/rack, -/obj/item/weapon/mining_scanner, +/obj/item/mining_scanner, /obj/item/clothing/head/helmet/space/void/mining, /obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/void/mining, @@ -28562,7 +28562,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -28584,15 +28584,15 @@ /area/quartermaster/foyer) "rgU" = ( /obj/structure/table/rack/steel, -/obj/item/device/slime_scanner, -/obj/item/device/sleevemate, -/obj/item/device/robotanalyzer, -/obj/item/device/reagent_scanner, -/obj/item/device/healthanalyzer, -/obj/item/device/geiger, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/analyzer, -/obj/item/device/t_scanner, +/obj/item/slime_scanner, +/obj/item/sleevemate, +/obj/item/robotanalyzer, +/obj/item/reagent_scanner, +/obj/item/healthanalyzer, +/obj/item/geiger, +/obj/item/analyzer/plant_analyzer, +/obj/item/analyzer, +/obj/item/t_scanner, /turf/simulated/floor/plating, /area/storage/tech) "rhn" = ( @@ -28658,14 +28658,14 @@ /area/storage/emergency_storage/emergency4) "rlr" = ( /obj/structure/table/standard, -/obj/item/weapon/tape_roll, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/tape_roll, +/obj/item/storage/firstaid/regular{ pixel_x = 6; pixel_y = -5 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -28769,7 +28769,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -28814,7 +28814,7 @@ /area/maintenance/substation/civilian) "rxE" = ( /obj/structure/table/steel, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -28822,7 +28822,7 @@ /obj/machinery/cell_charger{ pixel_y = 5 }, -/obj/item/device/multitool, +/obj/item/multitool, /obj/random/powercell, /obj/random/powercell, /turf/simulated/floor, @@ -29157,7 +29157,7 @@ /area/quartermaster/foyer) "rVd" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, /turf/simulated/floor, /area/maintenance/cargo) "rWj" = ( @@ -29441,7 +29441,7 @@ "shZ" = ( /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled, @@ -29581,12 +29581,12 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/pen/red{ +/obj/item/clipboard, +/obj/item/pen/red{ pixel_x = 2; pixel_y = 6 }, @@ -29917,7 +29917,7 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 9 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -30420,8 +30420,8 @@ /area/quartermaster/foyer) "tnC" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/stamp/denied{ +/obj/item/folder/yellow, +/obj/item/stamp/denied{ pixel_x = 4; pixel_y = -2 }, @@ -30431,7 +30431,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/item/weapon/stamp/accepted, +/obj/item/stamp/accepted, /obj/machinery/requests_console{ department = "Cargo Bay"; departmentType = 2; @@ -30580,7 +30580,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor, @@ -31075,17 +31075,17 @@ /area/maintenance/cargo) "tVq" = ( /obj/structure/table/standard, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/silver, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/coin/silver, +/obj/item/coin/silver, +/obj/item/cartridge/quartermaster{ pixel_x = 6; pixel_y = 5 }, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster{ pixel_x = -4; pixel_y = 7 }, -/obj/item/weapon/cartridge/quartermaster, +/obj/item/cartridge/quartermaster, /turf/simulated/floor/wood, /area/quartermaster/qm) "tVZ" = ( @@ -31184,7 +31184,7 @@ fancy_shuttle_tag = "secbus"; name = "secbus" }, -/obj/item/weapon/handcuffs, +/obj/item/handcuffs, /turf/simulated/floor/tiled, /area/shuttle/securiship/general) "uaC" = ( @@ -31425,7 +31425,7 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/tech_supply, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/random/tech_supply, /turf/simulated/floor/tiled, /area/storage/tools) @@ -31752,10 +31752,10 @@ /area/tether/station/restroom) "uTX" = ( /obj/structure/table/rack, -/obj/item/weapon/pickaxe, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/shovel, +/obj/item/pickaxe, +/obj/item/tool/wrench, +/obj/item/tool/crowbar, +/obj/item/shovel, /obj/machinery/light_switch{ dir = 1; pixel_x = -11; @@ -31763,7 +31763,7 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "uUy" = ( @@ -31916,7 +31916,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -32103,36 +32103,36 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "vmt" = ( -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 4; pixel_y = -6 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -4; pixel_y = -6 }, /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = 4; pixel_y = -6 }, -/obj/item/weapon/storage/backpack/parachute{ +/obj/item/storage/backpack/parachute{ pixel_x = -4; pixel_y = -6 }, @@ -32153,9 +32153,9 @@ /area/shuttle/medivac/cockpit) "vow" = ( /obj/structure/table/standard, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -32442,11 +32442,11 @@ "vHM" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -32458,9 +32458,9 @@ pixel_x = 3; pixel_y = -7 }, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, /obj/machinery/light, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -32902,7 +32902,7 @@ /area/quartermaster/belterdock/refinery) "wpE" = ( /obj/structure/table/standard, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -33393,8 +33393,8 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/module/power_control, -/obj/item/weapon/cell{ +/obj/item/module/power_control, +/obj/item/cell{ maxcharge = 2000 }, /turf/simulated/floor/tiled/steel, @@ -33411,7 +33411,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/simulated/floor/tiled, /area/tether/station/dock_one) "wXJ" = ( @@ -33755,10 +33755,10 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "xuf" = ( -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/mousetraps, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/machinery/alarm{ breach_detection = 0; dir = 8; @@ -33766,7 +33766,7 @@ rcon_setting = 3; report_danger_level = 0 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/structure/closet, /turf/simulated/floor/tiled, /area/janitor) @@ -34185,7 +34185,7 @@ /area/tcommsat/computer) "xTg" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/milspec, /area/tether/exploration/pilot_office) "xTB" = ( @@ -34235,11 +34235,11 @@ name = "fuel crate"; req_one_access = list(67) }, -/obj/item/weapon/tank/phoron{ +/obj/item/tank/phoron{ pixel_x = 6; pixel_y = -6 }, -/obj/item/weapon/tank/phoron{ +/obj/item/tank/phoron{ pixel_x = -5; pixel_y = 5 }, @@ -34267,7 +34267,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; pixel_x = 24 diff --git a/maps/tether/tether-06-mining.dmm b/maps/tether/tether-06-mining.dmm index 4596df9ecf1..278ba12d9ef 100644 --- a/maps/tether/tether-06-mining.dmm +++ b/maps/tether/tether-06-mining.dmm @@ -277,7 +277,7 @@ }, /obj/structure/table/woodentable, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /turf/simulated/floor/tiled, /area/outpost/mining_main/break_room) "aN" = ( @@ -511,11 +511,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/item/weapon/storage/box/cups{ +/obj/item/storage/box/cups{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/machinery/vending/wallmed1{ pixel_y = -30 }, @@ -660,7 +660,7 @@ /area/outpost/mining_main/maintenance) "bA" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) "bB" = ( @@ -960,10 +960,10 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 4 }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled, /area/outpost/mining_main/secondary_gear_storage) "cf" = ( @@ -1032,7 +1032,7 @@ /obj/effect/floor_decal/corner/brown/bordercorner2{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() @@ -1076,8 +1076,8 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 8 }, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, +/obj/item/cell/high, +/obj/item/cell/high, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/outpost/mining_main/drill_equipment) "ct" = ( @@ -1176,9 +1176,9 @@ /area/outpost/mining_main/hangar) "cC" = ( /obj/structure/table/steel, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/wrench, +/obj/item/tool/screwdriver, +/obj/item/tool/crowbar, +/obj/item/tool/wrench, /obj/effect/floor_decal/industrial/warning/dust{ dir = 8 }, @@ -1781,7 +1781,7 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/mine/explored) "JA" = ( -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/structure/bed/padded, /turf/simulated/floor/wood, /area/outpost/mining_main/dorms) diff --git a/maps/tether/tether-07-solars.dmm b/maps/tether/tether-07-solars.dmm index b8c9d4387fd..ec60c30ab46 100644 --- a/maps/tether/tether-07-solars.dmm +++ b/maps/tether/tether-07-solars.dmm @@ -303,7 +303,7 @@ /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_outside) "aM" = ( -/obj/item/weapon/stool, +/obj/item/stool, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -926,7 +926,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) "cr" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() @@ -991,7 +991,7 @@ /obj/machinery/door/window/eastleft, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/storage/hooded/wintercoat/science, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/structure/window/basic{ dir = 1 }, @@ -1012,8 +1012,8 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/device/radio/intercom{ +/obj/item/storage/toolbox/emergency, +/obj/item/radio/intercom{ dir = 8; pixel_x = 24 }, @@ -1160,14 +1160,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() }, /obj/structure/table/standard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen/fountain, +/obj/item/folder/white, +/obj/item/pen/fountain, /turf/simulated/floor/tiled, /area/rnd/outpost/testing) "cR" = ( @@ -1180,7 +1180,7 @@ }, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/weapon/tool/wirecutters, +/obj/item/tool/wirecutters, /turf/simulated/floor/tiled, /area/rnd/outpost/testing) "cS" = ( @@ -1220,7 +1220,7 @@ /obj/machinery/door/window/eastright, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/storage/hooded/wintercoat/science, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/structure/window/basic, /obj/structure/window/basic{ dir = 8 @@ -1237,11 +1237,11 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = -1; pixel_y = -2 }, -/obj/item/weapon/storage/briefcase/inflatable{ +/obj/item/storage/briefcase/inflatable{ pixel_x = 2; pixel_y = 1 }, @@ -1259,7 +1259,7 @@ /obj/machinery/vending/phoronresearch{ dir = 8; name = "Toximate 2556"; - products = list(/obj/item/device/transfer_valve = 3, /obj/item/device/assembly/timer = 6, /obj/item/device/assembly/signaler = 6, /obj/item/device/assembly/prox_sensor = 6, /obj/item/device/assembly/igniter = 12) + products = list(/obj/item/transfer_valve = 3, /obj/item/assembly/timer = 6, /obj/item/assembly/signaler = 6, /obj/item/assembly/prox_sensor = 6, /obj/item/assembly/igniter = 12) }, /turf/simulated/floor/tiled, /area/rnd/outpost/testing) @@ -1397,7 +1397,7 @@ /area/rnd/outpost/testing) "ds" = ( /obj/structure/table/standard, -/obj/item/weapon/tank/phoron, +/obj/item/tank/phoron, /turf/simulated/floor/tiled, /area/rnd/outpost/testing) "dt" = ( @@ -1587,7 +1587,7 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/item/clothing/glasses/welding, /turf/simulated/floor/tiled, /area/rnd/outpost/testing) @@ -1596,8 +1596,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/weapon/tool/screwdriver, -/obj/item/device/assembly_holder/timer_igniter, +/obj/item/tool/screwdriver, +/obj/item/assembly_holder/timer_igniter, /obj/machinery/camera/network/research_outpost{ dir = 4 }, @@ -1951,9 +1951,9 @@ /area/mine/explored) "eC" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/radio/intercom{ +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() @@ -2620,7 +2620,7 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/device/analyzer, +/obj/item/analyzer, /obj/machinery/camera/network/research_outpost{ dir = 1 }, @@ -2637,14 +2637,14 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/tool/wrench{ +/obj/item/tool/wrench{ pixel_x = 2; pixel_y = 2 }, /obj/effect/floor_decal/corner/purple{ dir = 10 }, -/obj/item/weapon/tool/wrench{ +/obj/item/tool/wrench{ pixel_x = -2; pixel_y = -2 }, @@ -2664,7 +2664,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/effect/floor_decal/corner/purple{ @@ -3161,11 +3161,11 @@ }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/standard, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /obj/machinery/camera/network/research_outpost{ dir = 8 }, -/obj/item/device/analyzer, +/obj/item/analyzer, /turf/simulated/floor/tiled/white, /area/rnd/outpost/heating) "gA" = ( @@ -3174,12 +3174,12 @@ /obj/effect/floor_decal/corner/purple{ dir = 5 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() }, -/obj/item/weapon/tool/wrench, +/obj/item/tool/wrench, /turf/simulated/floor/tiled/white, /area/rnd/outpost/heating) "gB" = ( @@ -3223,7 +3223,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; pixel_x = -24 }, @@ -3509,7 +3509,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -28 @@ -3842,7 +3842,7 @@ /area/rnd/outpost/chamber) "hF" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -28 @@ -4043,7 +4043,7 @@ pixel_x = -26; pixel_y = -8 }, -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/tiled/white, /area/rnd/outpost/heating) "hZ" = ( @@ -5083,7 +5083,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 4 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -5454,7 +5454,7 @@ dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() @@ -5668,11 +5668,11 @@ /area/rnd/outpost/anomaly_lab) "lk" = ( /obj/structure/table/steel, -/obj/item/device/measuring_tape, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/storage/excavation, +/obj/item/measuring_tape, +/obj/item/tool/wrench, +/obj/item/storage/excavation, /obj/item/stack/flag/yellow, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -5741,7 +5741,7 @@ /obj/item/clothing/gloves/sterile/latex, /obj/item/clothing/glasses/science, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 1; pixel_y = 24; req_access = list() @@ -6070,11 +6070,11 @@ /area/rnd/outpost/anomaly_lab) "lQ" = ( /obj/structure/table/steel, -/obj/item/device/measuring_tape, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/storage/excavation, +/obj/item/measuring_tape, +/obj/item/tool/wrench, +/obj/item/storage/excavation, /obj/item/stack/flag/yellow, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /obj/machinery/alarm{ dir = 8; pixel_x = 22 @@ -6227,13 +6227,13 @@ /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, -/obj/item/weapon/storage/belt/archaeology, +/obj/item/storage/belt/archaeology, /obj/machinery/light_switch{ dir = 1; pixel_x = 4; pixel_y = -24 }, -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/tiled, /area/rnd/outpost/xenoarch_storage) "mf" = ( @@ -6241,12 +6241,12 @@ /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, -/obj/item/weapon/storage/belt/archaeology, +/obj/item/storage/belt/archaeology, /obj/machinery/firealarm{ dir = 1; pixel_y = -26 }, -/obj/item/weapon/melee/umbrella/random, +/obj/item/melee/umbrella/random, /turf/simulated/floor/tiled, /area/rnd/outpost/xenoarch_storage) "mg" = ( @@ -6295,7 +6295,7 @@ /area/rnd/outpost/anomaly_lab) "mm" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/machinery/light_switch{ dir = 4; pixel_x = -28 @@ -6357,7 +6357,7 @@ "mr" = ( /obj/structure/table/standard, /obj/item/stack/nanopaste, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/structure/window/reinforced{ dir = 4 }, @@ -6590,16 +6590,16 @@ /area/rnd/outpost/anomaly_lab/analysis) "mN" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/anomaly_lab/analysis) "mO" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/anodevice{ +/obj/item/tool/crowbar, +/obj/item/anodevice{ pixel_x = -2 }, -/obj/item/weapon/anodevice{ +/obj/item/anodevice{ pixel_x = 1 }, /obj/structure/window/reinforced{ @@ -6628,7 +6628,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; + cell_type = /obj/item/cell/super; dir = 8; name = "west bump"; pixel_x = -28 @@ -6779,7 +6779,7 @@ /area/rnd/outpost/anomaly_lab) "nm" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/structure/window/reinforced{ dir = 4 }, @@ -6789,24 +6789,24 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/storage) "no" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/anobattery{ +/obj/item/tool/screwdriver, +/obj/item/anobattery{ pixel_x = 5; pixel_y = 2 }, -/obj/item/weapon/anobattery, -/obj/item/weapon/anobattery{ +/obj/item/anobattery, +/obj/item/anobattery{ pixel_x = -4; pixel_y = 3 }, -/obj/item/weapon/anobattery{ +/obj/item/anobattery{ pixel_x = -5; pixel_y = -3 }, @@ -6901,7 +6901,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "nx" = ( @@ -6920,17 +6920,17 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "ny" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "nz" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /obj/machinery/light, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -6977,7 +6977,7 @@ /area/rnd/outpost/anomaly_lab) "nD" = ( /obj/structure/table/standard, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "nE" = ( @@ -7174,7 +7174,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "oc" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 4; pixel_x = 24 }, @@ -7397,7 +7397,7 @@ /area/rnd/outpost/breakroom) "oB" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/box/donut, +/obj/item/storage/box/donut, /turf/simulated/floor/tiled, /area/rnd/outpost/breakroom) "oC" = ( @@ -7415,9 +7415,9 @@ "oH" = ( /obj/structure/table/standard, /obj/machinery/light, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/storage/box/beakers, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "oI" = ( diff --git a/maps/tether/tether_jobs.dm b/maps/tether/tether_jobs.dm index ccfc4217f73..7dc03f38e29 100644 --- a/maps/tether/tether_jobs.dm +++ b/maps/tether/tether_jobs.dm @@ -174,27 +174,27 @@ /decl/hierarchy/outfit/job/talon_captain name = OUTFIT_JOB_NAME(JOB_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/talon/command shoes = /obj/item/clothing/shoes/brown - 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 + backpack = /obj/item/storage/backpack/talon + satchel_one = /obj/item/storage/backpack/satchel/talon + messenger_bag = /obj/item/storage/backpack/messenger/talon /decl/hierarchy/outfit/job/talon_pilot name = OUTFIT_JOB_NAME(JOB_TALON_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 head = /obj/item/clothing/head/pilot_vr/talon uniform = /obj/item/clothing/under/rank/talon/pilot @@ -202,88 +202,88 @@ gloves = /obj/item/clothing/gloves/fingerless glasses = /obj/item/clothing/glasses/fakesunglasses/aviator uniform_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1 = 1) - 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 + backpack = /obj/item/storage/backpack/talon + satchel_one = /obj/item/storage/backpack/satchel/talon + messenger_bag = /obj/item/storage/backpack/messenger/talon /decl/hierarchy/outfit/job/talon_doctor name = OUTFIT_JOB_NAME(JOB_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/talon/proper suit = /obj/item/clothing/suit/storage/toggle/labcoat - l_hand = /obj/item/weapon/storage/firstaid/regular - r_pocket = /obj/item/device/flashlight/pen - 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 + l_hand = /obj/item/storage/firstaid/regular + r_pocket = /obj/item/flashlight/pen + backpack = /obj/item/storage/backpack/talon + satchel_one = /obj/item/storage/backpack/satchel/talon + messenger_bag = /obj/item/storage/backpack/messenger/talon /decl/hierarchy/outfit/job/talon_security name = OUTFIT_JOB_NAME(JOB_ALT_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/talon/security - l_pocket = /obj/item/device/flash - 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 + l_pocket = /obj/item/flash + backpack = /obj/item/storage/backpack/talon + satchel_one = /obj/item/storage/backpack/satchel/talon + messenger_bag = /obj/item/storage/backpack/messenger/talon /decl/hierarchy/outfit/job/talon_engineer name = OUTFIT_JOB_NAME(JOB_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/talon/basic - belt = /obj/item/weapon/storage/belt/utility/atmostech - 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 + belt = /obj/item/storage/belt/utility/atmostech + backpack = /obj/item/storage/backpack/talon + satchel_one = /obj/item/storage/backpack/satchel/talon + messenger_bag = /obj/item/storage/backpack/messenger/talon /decl/hierarchy/outfit/job/talon_miner name = OUTFIT_JOB_NAME(JOB_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 + 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/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm index b0c1c9ac89c..c294d1daaf3 100644 --- a/maps/tether/tether_shuttles.dm +++ b/maps/tether/tether_shuttles.dm @@ -155,7 +155,7 @@ else wear += rand(5,20) -/obj/structure/shuttle/engine/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/shuttle/engine/attackby(obj/item/W as obj, mob/user as mob) src.add_fingerprint(user) if(repair_welder(user, W)) return @@ -163,7 +163,7 @@ //TODO require a multitool to diagnose and open engine panels or something -/obj/structure/shuttle/engine/proc/repair_welder(var/mob/user, var/obj/item/weapon/weldingtool/WT) +/obj/structure/shuttle/engine/proc/repair_welder(var/mob/user, var/obj/item/weldingtool/WT) if(!istype(WT)) return 0 if(wear <= 20) diff --git a/maps/tether/tether_telecomms.dm b/maps/tether/tether_telecomms.dm index 647ccde34ad..cf4b2622f29 100644 --- a/maps/tether/tether_telecomms.dm +++ b/maps/tether/tether_telecomms.dm @@ -81,10 +81,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/tether) diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index eb2bba71946..b06e1f1a823 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -288,9 +288,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/virgo_minitest/virgo_minitest-1.dmm b/maps/virgo_minitest/virgo_minitest-1.dmm index 24cb886cf65..4a4f7172225 100644 --- a/maps/virgo_minitest/virgo_minitest-1.dmm +++ b/maps/virgo_minitest/virgo_minitest-1.dmm @@ -15,8 +15,8 @@ /area/tcommsat/computer) "ae" = ( /obj/structure/table/standard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, +/obj/item/folder/yellow, /obj/machinery/light{ dir = 1 }, @@ -31,8 +31,8 @@ /area/tcommsat/computer) "af" = ( /obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue{ +/obj/item/paper_bin, +/obj/item/pen/blue{ pixel_x = -3; pixel_y = 2 }, @@ -47,11 +47,11 @@ /area/tcommsat/computer) "ah" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "ai" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = -28 @@ -71,7 +71,7 @@ /obj/machinery/computer/telecomms/monitor{ network = "tcommsat" }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ name = "General Listening Channel"; pixel_x = 28 }, @@ -187,7 +187,7 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "aD" = ( @@ -520,7 +520,7 @@ }, /area/tcommsat/chamber) "bi" = ( -/obj/item/device/geiger/wall/west{ +/obj/item/geiger/wall/west{ dir = 4; pixel_x = -36 }, @@ -1422,10 +1422,10 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled, /area/bridge) "dg" = ( @@ -2648,7 +2648,7 @@ icon_state = "4-8" }, /obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_monitoring) "fX" = ( @@ -3370,12 +3370,12 @@ /area/engineering/workshop) "kr" = ( /obj/structure/table/steel, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/cell/high{ +/obj/item/storage/box/lights/mixed, +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/paper{ +/obj/item/paper{ info = "The big blue box recently installed in here is a 'grid checker' which will shut off the power if a dangerous power spike from the engine erupts into the powernet. Shutting everything down protects everything from electrical damage, however the outages can be disruptive to colony operations, so it is designed to restore power after a somewhat significant delay, up to ten minutes or so. The grid checker can be manually hacked in order to end the outage sooner. To do that, you must cut three specific wires which do not cause a red light to shine, then pulse a fourth wire. Electrical protection is highly recommended when doing maintenance on the grid checker."; name = "grid checker info" }, @@ -3611,8 +3611,8 @@ /area/engineering/engine_monitoring) "ni" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/storage/box/syringes, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled, /area/bridge) "nk" = ( @@ -3642,7 +3642,7 @@ /obj/machinery/camera/network/civilian{ dir = 9 }, -/obj/item/weapon/storage/part_replacer/adv/discount_bluespace, +/obj/item/storage/part_replacer/adv/discount_bluespace, /obj/structure/table/steel, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_monitoring) @@ -4083,8 +4083,8 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/weapon/circuitboard/tesla_coil, -/obj/item/weapon/circuitboard/tesla_coil, +/obj/item/circuitboard/tesla_coil, +/obj/item/circuitboard/tesla_coil, /turf/simulated/floor, /area/engineering/engine_room) "rY" = ( @@ -4786,7 +4786,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/cell/high{ +/obj/item/cell/high{ charge = 100; maxcharge = 15000 }, @@ -5260,7 +5260,7 @@ dir = 4 }, /obj/machinery/light, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -5422,7 +5422,7 @@ pixel_y = -5; req_access = list(10) }, -/obj/item/device/geiger/wall/west{ +/obj/item/geiger/wall/west{ dir = 4; pixel_x = 36 }, @@ -5484,7 +5484,7 @@ dir = 8; layer = 2.6 }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_monitoring) "HQ" = ( @@ -5878,10 +5878,10 @@ icon_state = "2-8" }, /obj/structure/table/reinforced, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_monitoring) "MW" = ( @@ -6021,7 +6021,7 @@ "Oj" = ( /obj/structure/table/steel, /obj/item/clothing/gloves/yellow, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 5 }, /obj/item/stack/cable_coil{ @@ -6208,12 +6208,12 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals8, /obj/structure/table/standard, -/obj/item/weapon/book/manual/tesla_engine, -/obj/item/weapon/book/manual/engineering_particle_accelerator{ +/obj/item/book/manual/tesla_engine, +/obj/item/book/manual/engineering_particle_accelerator{ pixel_x = 5; pixel_y = 5 }, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -6252,7 +6252,7 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_gas) "QC" = ( -/obj/item/device/geiger/wall/west{ +/obj/item/geiger/wall/west{ dir = 4; pixel_x = -36 }, @@ -6276,16 +6276,16 @@ /obj/structure/closet/crate/engineering{ name = "spare SMES coils" }, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil, -/obj/item/weapon/smes_coil/super_capacity, -/obj/item/weapon/smes_coil/super_capacity, -/obj/item/weapon/smes_coil/super_capacity, -/obj/item/weapon/smes_coil/super_io, -/obj/item/weapon/smes_coil/super_io, -/obj/item/weapon/smes_coil/super_io, -/obj/item/device/geiger/wall/west{ +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil, +/obj/item/smes_coil/super_capacity, +/obj/item/smes_coil/super_capacity, +/obj/item/smes_coil/super_capacity, +/obj/item/smes_coil/super_io, +/obj/item/smes_coil/super_io, +/obj/item/smes_coil/super_io, +/obj/item/geiger/wall/west{ dir = 4; pixel_x = 36 }, @@ -6331,7 +6331,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/item/device/geiger/wall/west{ +/obj/item/geiger/wall/west{ dir = 4; pixel_x = 36 }, @@ -6438,38 +6438,38 @@ /obj/structure/closet/crate/engineering{ name = "capacitor storage" }, -/obj/item/weapon/stock_parts/capacitor/adv, -/obj/item/weapon/stock_parts/capacitor/adv, -/obj/item/weapon/stock_parts/capacitor/adv, -/obj/item/weapon/stock_parts/capacitor/adv, -/obj/item/weapon/stock_parts/capacitor/adv, -/obj/item/weapon/stock_parts/capacitor/adv, -/obj/item/weapon/stock_parts/capacitor/adv, -/obj/item/weapon/stock_parts/capacitor/adv, -/obj/item/weapon/stock_parts/capacitor/hyper, -/obj/item/weapon/stock_parts/capacitor/hyper, -/obj/item/weapon/stock_parts/capacitor/hyper, -/obj/item/weapon/stock_parts/capacitor/hyper, -/obj/item/weapon/stock_parts/capacitor/hyper, -/obj/item/weapon/stock_parts/capacitor/hyper, -/obj/item/weapon/stock_parts/capacitor/hyper, -/obj/item/weapon/stock_parts/capacitor/hyper, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/omni, -/obj/item/weapon/stock_parts/capacitor/super, -/obj/item/weapon/stock_parts/capacitor/super, -/obj/item/weapon/stock_parts/capacitor/super, -/obj/item/weapon/stock_parts/capacitor/super, -/obj/item/weapon/stock_parts/capacitor/super, -/obj/item/weapon/stock_parts/capacitor/super, -/obj/item/weapon/stock_parts/capacitor/super, -/obj/item/weapon/stock_parts/capacitor/super, +/obj/item/stock_parts/capacitor/adv, +/obj/item/stock_parts/capacitor/adv, +/obj/item/stock_parts/capacitor/adv, +/obj/item/stock_parts/capacitor/adv, +/obj/item/stock_parts/capacitor/adv, +/obj/item/stock_parts/capacitor/adv, +/obj/item/stock_parts/capacitor/adv, +/obj/item/stock_parts/capacitor/adv, +/obj/item/stock_parts/capacitor/hyper, +/obj/item/stock_parts/capacitor/hyper, +/obj/item/stock_parts/capacitor/hyper, +/obj/item/stock_parts/capacitor/hyper, +/obj/item/stock_parts/capacitor/hyper, +/obj/item/stock_parts/capacitor/hyper, +/obj/item/stock_parts/capacitor/hyper, +/obj/item/stock_parts/capacitor/hyper, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/omni, +/obj/item/stock_parts/capacitor/super, +/obj/item/stock_parts/capacitor/super, +/obj/item/stock_parts/capacitor/super, +/obj/item/stock_parts/capacitor/super, +/obj/item/stock_parts/capacitor/super, +/obj/item/stock_parts/capacitor/super, +/obj/item/stock_parts/capacitor/super, +/obj/item/stock_parts/capacitor/super, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_monitoring) "SN" = ( @@ -6494,7 +6494,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/device/geiger/wall/west{ +/obj/item/geiger/wall/west{ dir = 4; pixel_x = -36 }, @@ -6551,7 +6551,7 @@ /turf/simulated/floor/airless, /area/space) "TL" = ( -/obj/item/device/geiger/wall/west{ +/obj/item/geiger/wall/west{ dir = 4; pixel_x = 36 }, @@ -6833,8 +6833,8 @@ }, /obj/structure/table/standard, /obj/item/stack/cable_coil/random, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/tool/screwdriver, +/obj/item/tool/wrench, +/obj/item/tool/screwdriver, /turf/simulated/floor, /area/engineering/engine_room) "XH" = ( @@ -6860,7 +6860,7 @@ /area/engineering/engine_monitoring) "XJ" = ( /obj/machinery/light/small, -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /obj/structure/closet/radiation, @@ -6957,7 +6957,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_monitoring) "YN" = ( -/obj/item/device/geiger/wall/west{ +/obj/item/geiger/wall/west{ dir = 4; pixel_x = 36 }, @@ -7028,7 +7028,7 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_gas) "ZI" = ( -/obj/item/device/radio/intercom{ +/obj/item/radio/intercom{ pixel_y = -24 }, /turf/simulated/floor, diff --git a/maps/virgo_minitest/virgo_minitest-sector-2.dmm b/maps/virgo_minitest/virgo_minitest-sector-2.dmm index 54bb54e1cc5..06160f85a20 100644 --- a/maps/virgo_minitest/virgo_minitest-sector-2.dmm +++ b/maps/virgo_minitest/virgo_minitest-sector-2.dmm @@ -22,7 +22,7 @@ /turf/simulated/mineral/floor/ignore_mapgen, /area/space) "ag" = ( -/obj/item/weapon/pickaxe/jackhammer, +/obj/item/pickaxe/jackhammer, /turf/simulated/mineral/floor/ignore_mapgen, /area/space) "ah" = ( @@ -127,7 +127,7 @@ /turf/simulated/floor/lino, /area/awaymission) "av" = ( -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/structure/cable, /obj/machinery/power/apc{ dir = 8; @@ -178,7 +178,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission) "aD" = ( -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/bed/padded, /turf/simulated/floor/lino, /area/awaymission) @@ -190,8 +190,8 @@ /obj/item/clothing/suit/space/void/mining, /obj/item/clothing/mask/breath, /obj/item/clothing/head/helmet/space/void/mining, -/obj/item/weapon/mining_scanner, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/mining_scanner, +/obj/item/tank/jetpack/oxygen, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/awaymission) @@ -200,7 +200,7 @@ /area/awaymission) "aH" = ( /obj/structure/closet/toolcloset, -/obj/item/weapon/pickaxe/jackhammer, +/obj/item/pickaxe/jackhammer, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/awaymission) @@ -342,9 +342,9 @@ dir = 8 }, /obj/structure/closet/crate/internals, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, @@ -353,9 +353,9 @@ /area/awaymission) "bh" = ( /obj/structure/closet/crate/internals, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, +/obj/item/tank/emergency/oxygen/engi, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, @@ -388,7 +388,7 @@ /area/awaymission) "bn" = ( /obj/item/mecha_parts/mecha_equipment/tool/drill, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/structure/table/steel, /turf/simulated/floor/tiled, /area/awaymission) @@ -465,7 +465,7 @@ /area/awaymission) "bz" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/weapon/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/projectile/shotgun/pump/rifle, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/awaymission) @@ -576,13 +576,13 @@ /turf/simulated/floor/tiled, /area/awaymission) "bO" = ( -/obj/item/weapon/reagent_containers/food/snacks/cubancarp, +/obj/item/reagent_containers/food/snacks/cubancarp, /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/table/glass, /turf/simulated/floor/tiled, /area/awaymission) "bP" = ( -/obj/item/weapon/reagent_containers/food/snacks/carpmeat, +/obj/item/reagent_containers/food/snacks/carpmeat, /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/table/glass, /turf/simulated/floor/tiled, @@ -631,7 +631,7 @@ /area/awaymission) "bT" = ( /obj/structure/closet/emcloset, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/machinery/airlock_sensor{ frequency = 1375; id_tag = "carp_sensor"; diff --git a/maps/virgo_minitest/virgo_minitest-sector-3.dmm b/maps/virgo_minitest/virgo_minitest-sector-3.dmm index f0f58d57ede..e102ac017c8 100644 --- a/maps/virgo_minitest/virgo_minitest-sector-3.dmm +++ b/maps/virgo_minitest/virgo_minitest-sector-3.dmm @@ -40,7 +40,7 @@ /area/awaymission/wwmines) "al" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/gun/projectile/shotgun/doublebarrel, +/obj/item/gun/projectile/shotgun/doublebarrel, /obj/item/ammo_magazine/ammo_box/b12g/beanbag, /turf/simulated/floor/wood, /area/awaymission/wwmines) @@ -49,7 +49,7 @@ /area/awaymission/wwmines) "an" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/wood, /area/awaymission/wwmines) "ao" = ( @@ -64,17 +64,17 @@ /turf/simulated/floor/water, /area/awaymission/wwmines) "aq" = ( -/obj/item/weapon/stool/padded, +/obj/item/stool/padded, /turf/simulated/floor/wood, /area/awaymission/wwmines) "ar" = ( /obj/structure/table/woodentable, -/obj/item/weapon/deck/cards, +/obj/item/deck/cards, /turf/simulated/floor/carpet/turcarpet, /area/awaymission/wwmines) "as" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, /turf/simulated/floor/carpet/turcarpet, /area/awaymission/wwmines) "at" = ( @@ -83,7 +83,7 @@ /turf/simulated/floor/wood, /area/awaymission/wwmines) "au" = ( -/obj/item/weapon/stool, +/obj/item/stool, /turf/simulated/floor/wood, /area/awaymission/wwmines) "av" = ( @@ -99,25 +99,25 @@ /area/awaymission/wwmines) "ax" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, /turf/simulated/floor/carpet/turcarpet, /area/awaymission/wwmines) "ay" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/glass2/shot, +/obj/item/reagent_containers/food/drinks/glass2/shot, /turf/simulated/floor/carpet/turcarpet, /area/awaymission/wwmines) "az" = ( /obj/structure/table/woodentable, -/obj/item/weapon/tape_roll, +/obj/item/tape_roll, /obj/random/firstaid, /turf/simulated/floor/wood, /area/awaymission/wwmines) "aA" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/glass2/shot, -/obj/item/weapon/reagent_containers/food/drinks/glass2/shot, -/obj/item/weapon/reagent_containers/food/drinks/glass2/shot, +/obj/item/reagent_containers/food/drinks/glass2/shot, +/obj/item/reagent_containers/food/drinks/glass2/shot, +/obj/item/reagent_containers/food/drinks/glass2/shot, /turf/simulated/floor/carpet/turcarpet, /area/awaymission/wwmines) "aB" = ( @@ -152,8 +152,8 @@ /area/awaymission/wwmines) "aG" = ( /obj/structure/table/woodentable, -/obj/item/weapon/oar, -/obj/item/weapon/oar, +/obj/item/oar, +/obj/item/oar, /turf/simulated/floor/wood, /area/awaymission/wwmines) "aH" = ( @@ -190,12 +190,12 @@ /area/awaymission/wwmines) "aM" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat, -/obj/item/weapon/reagent_containers/food/snacks/fruitsalad, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/fruitsalad, /turf/simulated/floor/wood, /area/awaymission/wwmines) "aN" = ( @@ -207,7 +207,7 @@ /area/awaymission/wwmines) "aP" = ( /obj/structure/table/woodentable, -/obj/item/weapon/material/knife, +/obj/item/material/knife, /turf/simulated/floor/wood, /area/awaymission/wwmines) "aQ" = ( @@ -216,13 +216,13 @@ /area/awaymission/wwmines) "aR" = ( /obj/structure/table/woodentable, -/obj/item/weapon/storage/bag/trash, +/obj/item/storage/bag/trash, /turf/simulated/floor/wood, /area/awaymission/wwmines) "aS" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/lighter, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/flame/lighter, +/obj/item/storage/fancy/candle_box, /turf/simulated/floor/wood, /area/awaymission/wwmines) "aT" = ( @@ -255,7 +255,7 @@ /area/awaymission/wwmines) "aY" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/bcarpet, /area/awaymission/wwmines) "aZ" = ( diff --git a/tgui/public/tgui-panel.bundle.js b/tgui/public/tgui-panel.bundle.js index 0247b0147d9..5bbdfc2c995 100644 --- a/tgui/public/tgui-panel.bundle.js +++ b/tgui/public/tgui-panel.bundle.js @@ -6,7 +6,7 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - */function n(e,r){return r!=null&&typeof Symbol!="undefined"&&r[Symbol.hasInstance]?!!r[Symbol.hasInstance](e):e instanceof r}function o(e){"@swc/helpers - typeof";return e&&typeof Symbol!="undefined"&&e.constructor===Symbol?"symbol":typeof e}var i=t(61358),s=t(20686);function u(e){for(var r="https://reactjs.org/docs/error-decoder.html?invariant="+e,a=1;ar}return!1}function j(e,r,a,c,T,M,W){this.acceptsBooleans=r===2||r===3||r===4,this.attributeName=c,this.attributeNamespace=T,this.mustUseProperty=a,this.propertyName=e,this.type=r,this.sanitizeURL=M,this.removeEmptyString=W}var B={};"children dangerouslySetInnerHTML defaultValue defaultChecked innerHTML suppressContentEditableWarning suppressHydrationWarning style".split(" ").forEach(function(e){B[e]=new j(e,0,!1,e,null,!1,!1)}),[["acceptCharset","accept-charset"],["className","class"],["htmlFor","for"],["httpEquiv","http-equiv"]].forEach(function(e){var r=e[0];B[r]=new j(r,1,!1,e[1],null,!1,!1)}),["contentEditable","draggable","spellCheck","value"].forEach(function(e){B[e]=new j(e,2,!1,e.toLowerCase(),null,!1,!1)}),["autoReverse","externalResourcesRequired","focusable","preserveAlpha"].forEach(function(e){B[e]=new j(e,2,!1,e,null,!1,!1)}),"allowFullScreen async autoFocus autoPlay controls default defer disabled disablePictureInPicture disableRemotePlayback formNoValidate hidden loop noModule noValidate open playsInline readOnly required reversed scoped seamless itemScope".split(" ").forEach(function(e){B[e]=new j(e,3,!1,e.toLowerCase(),null,!1,!1)}),["checked","multiple","muted","selected"].forEach(function(e){B[e]=new j(e,3,!0,e,null,!1,!1)}),["capture","download"].forEach(function(e){B[e]=new j(e,4,!1,e,null,!1,!1)}),["cols","rows","size","span"].forEach(function(e){B[e]=new j(e,6,!1,e,null,!1,!1)}),["rowSpan","start"].forEach(function(e){B[e]=new j(e,5,!1,e.toLowerCase(),null,!1,!1)});var F=/[\-:]([a-z])/g;function P(e){return e[1].toUpperCase()}"accent-height alignment-baseline arabic-form baseline-shift cap-height clip-path clip-rule color-interpolation color-interpolation-filters color-profile color-rendering dominant-baseline enable-background fill-opacity fill-rule flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-name glyph-orientation-horizontal glyph-orientation-vertical horiz-adv-x horiz-origin-x image-rendering letter-spacing lighting-color marker-end marker-mid marker-start overline-position overline-thickness paint-order panose-1 pointer-events rendering-intent shape-rendering stop-color stop-opacity strikethrough-position strikethrough-thickness stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width text-anchor text-decoration text-rendering underline-position underline-thickness unicode-bidi unicode-range units-per-em v-alphabetic v-hanging v-ideographic v-mathematical vector-effect vert-adv-y vert-origin-x vert-origin-y word-spacing writing-mode xmlns:xlink x-height".split(" ").forEach(function(e){var r=e.replace(F,P);B[r]=new j(r,1,!1,e,null,!1,!1)}),"xlink:actuate xlink:arcrole xlink:role xlink:show xlink:title xlink:type".split(" ").forEach(function(e){var r=e.replace(F,P);B[r]=new j(r,1,!1,e,"http://www.w3.org/1999/xlink",!1,!1)}),["xml:base","xml:lang","xml:space"].forEach(function(e){var r=e.replace(F,P);B[r]=new j(r,1,!1,e,"http://www.w3.org/XML/1998/namespace",!1,!1)}),["tabIndex","crossOrigin"].forEach(function(e){B[e]=new j(e,1,!1,e.toLowerCase(),null,!1,!1)}),B.xlinkHref=new j("xlinkHref",1,!1,"xlink:href","http://www.w3.org/1999/xlink",!0,!1),["src","href","action","formAction"].forEach(function(e){B[e]=new j(e,1,!1,e.toLowerCase(),null,!0,!0)});function b(e,r,a,c){var T=B.hasOwnProperty(r)?B[r]:null;(T!==null?T.type!==0:c||!(2q||T[W]!==M[q]){var gt="\n"+T[W].replace(" at new "," at ");return e.displayName&>.includes("")&&(gt=gt.replace("",e.displayName)),gt}while(1<=W&&0<=q);break}}}finally{ht=!1,Error.prepareStackTrace=a}return(e=e?e.displayName||e.name:"")?rt(e):""}function jt(e){switch(e.tag){case 5:return rt(e.type);case 16:return rt("Lazy");case 13:return rt("Suspense");case 19:return rt("SuspenseList");case 0:case 2:case 15:return e=dt(e.type,!1),e;case 11:return e=dt(e.type.render,!1),e;case 1:return e=dt(e.type,!0),e;default:return""}}function xt(e){if(e==null)return null;if(typeof e=="function")return e.displayName||e.name||null;if(typeof e=="string")return e;switch(e){case K:return"Fragment";case z:return"Portal";case J:return"Profiler";case k:return"StrictMode";case it:return"Suspense";case at:return"SuspenseList"}if(typeof e=="object")switch(e.$$typeof){case X:return(e.displayName||"Context")+".Consumer";case H:return(e._context.displayName||"Context")+".Provider";case Y:var r=e.render;return e=e.displayName,e||(e=r.displayName||r.name||"",e=e!==""?"ForwardRef("+e+")":"ForwardRef"),e;case _:return r=e.displayName||null,r!==null?r:xt(e.type)||"Memo";case $:r=e._payload,e=e._init;try{return xt(e(r))}catch(a){}}return null}function pt(e){var r=e.type;switch(e.tag){case 24:return"Cache";case 9:return(r.displayName||"Context")+".Consumer";case 10:return(r._context.displayName||"Context")+".Provider";case 18:return"DehydratedFragment";case 11:return e=r.render,e=e.displayName||e.name||"",r.displayName||(e!==""?"ForwardRef("+e+")":"ForwardRef");case 7:return"Fragment";case 5:return r;case 4:return"Portal";case 3:return"Root";case 6:return"Text";case 16:return xt(r);case 8:return r===k?"StrictMode":"Mode";case 22:return"Offscreen";case 12:return"Profiler";case 21:return"Scope";case 13:return"Suspense";case 19:return"SuspenseList";case 25:return"TracingMarker";case 1:case 0:case 17:case 2:case 14:case 15:if(typeof r=="function")return r.displayName||r.name||null;if(typeof r=="string")return r}return null}function Bt(e){switch(typeof e=="undefined"?"undefined":o(e)){case"boolean":case"number":case"string":case"undefined":return e;case"object":return e;default:return""}}function Se(e){var r=e.type;return(e=e.nodeName)&&e.toLowerCase()==="input"&&(r==="checkbox"||r==="radio")}function xe(e){var r=Se(e)?"checked":"value",a=Object.getOwnPropertyDescriptor(e.constructor.prototype,r),c=""+e[r];if(!e.hasOwnProperty(r)&&typeof a!="undefined"&&typeof a.get=="function"&&typeof a.set=="function"){var T=a.get,M=a.set;return Object.defineProperty(e,r,{configurable:!0,get:function(){return T.call(this)},set:function(q){c=""+q,M.call(this,q)}}),Object.defineProperty(e,r,{enumerable:a.enumerable}),{getValue:function(){return c},setValue:function(q){c=""+q},stopTracking:function(){e._valueTracker=null,delete e[r]}}}}function ee(e){e._valueTracker||(e._valueTracker=xe(e))}function Rt(e){if(!e)return!1;var r=e._valueTracker;if(!r)return!0;var a=r.getValue(),c="";return e&&(c=Se(e)?e.checked?"true":"false":e.value),e=c,e!==a?(r.setValue(e),!0):!1}function Ft(e){if(e=e||(typeof document!="undefined"?document:void 0),typeof e=="undefined")return null;try{return e.activeElement||e.body}catch(r){return e.body}}function Yt(e,r){var a=r.checked;return Q({},r,{defaultChecked:void 0,defaultValue:void 0,value:void 0,checked:a!=null?a:e._wrapperState.initialChecked})}function kt(e,r){var a=r.defaultValue==null?"":r.defaultValue,c=r.checked!=null?r.checked:r.defaultChecked;a=Bt(r.value!=null?r.value:a),e._wrapperState={initialChecked:c,initialValue:a,controlled:r.type==="checkbox"||r.type==="radio"?r.checked!=null:r.value!=null}}function de(e,r){r=r.checked,r!=null&&b(e,"checked",r,!1)}function ve(e,r){de(e,r);var a=Bt(r.value),c=r.type;if(a!=null)c==="number"?(a===0&&e.value===""||e.value!=a)&&(e.value=""+a):e.value!==""+a&&(e.value=""+a);else if(c==="submit"||c==="reset"){e.removeAttribute("value");return}r.hasOwnProperty("value")?Ut(e,r.type,a):r.hasOwnProperty("defaultValue")&&Ut(e,r.type,Bt(r.defaultValue)),r.checked==null&&r.defaultChecked!=null&&(e.defaultChecked=!!r.defaultChecked)}function ie(e,r,a){if(r.hasOwnProperty("value")||r.hasOwnProperty("defaultValue")){var c=r.type;if(!(c!=="submit"&&c!=="reset"||r.value!==void 0&&r.value!==null))return;r=""+e._wrapperState.initialValue,a||r===e.value||(e.value=r),e.defaultValue=r}a=e.name,a!==""&&(e.name=""),e.defaultChecked=!!e._wrapperState.initialChecked,a!==""&&(e.name=a)}function Ut(e,r,a){(r!=="number"||Ft(e.ownerDocument)!==e)&&(a==null?e.defaultValue=""+e._wrapperState.initialValue:e.defaultValue!==""+a&&(e.defaultValue=""+a))}var Ht=Array.isArray;function Ct(e,r,a,c){if(e=e.options,r){r={};for(var T=0;T"+r.valueOf().toString()+"",r=Re.firstChild;e.firstChild;)e.removeChild(e.firstChild);for(;r.firstChild;)e.appendChild(r.firstChild)}});function pe(e,r){if(r){var a=e.firstChild;if(a&&a===e.lastChild&&a.nodeType===3){a.nodeValue=r;return}}e.textContent=r}var Ot={animationIterationCount:!0,aspectRatio:!0,borderImageOutset:!0,borderImageSlice:!0,borderImageWidth:!0,boxFlex:!0,boxFlexGroup:!0,boxOrdinalGroup:!0,columnCount:!0,columns:!0,flex:!0,flexGrow:!0,flexPositive:!0,flexShrink:!0,flexNegative:!0,flexOrder:!0,gridArea:!0,gridRow:!0,gridRowEnd:!0,gridRowSpan:!0,gridRowStart:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnSpan:!0,gridColumnStart:!0,fontWeight:!0,lineClamp:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,tabSize:!0,widows:!0,zIndex:!0,zoom:!0,fillOpacity:!0,floodOpacity:!0,stopOpacity:!0,strokeDasharray:!0,strokeDashoffset:!0,strokeMiterlimit:!0,strokeOpacity:!0,strokeWidth:!0},wt=["Webkit","ms","Moz","O"];Object.keys(Ot).forEach(function(e){wt.forEach(function(r){r=r+e.charAt(0).toUpperCase()+e.substring(1),Ot[r]=Ot[e]})});function ae(e,r,a){return r==null||typeof r=="boolean"||r===""?"":a||typeof r!="number"||r===0||Ot.hasOwnProperty(e)&&Ot[e]?(""+r).trim():r+"px"}function Te(e,r){e=e.style;for(var a in r)if(r.hasOwnProperty(a)){var c=a.indexOf("--")===0,T=ae(a,r[a],c);a==="float"&&(a="cssFloat"),c?e.setProperty(a,T):e[a]=T}}var Ke=Q({menuitem:!0},{area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0});function Le(e,r){if(r){if(Ke[e]&&(r.children!=null||r.dangerouslySetInnerHTML!=null))throw Error(u(137,e));if(r.dangerouslySetInnerHTML!=null){if(r.children!=null)throw Error(u(60));if(typeof r.dangerouslySetInnerHTML!="object"||!("__html"in r.dangerouslySetInnerHTML))throw Error(u(61))}if(r.style!=null&&typeof r.style!="object")throw Error(u(62))}}function or(e,r){if(e.indexOf("-")===-1)return typeof r.is=="string";switch(e){case"annotation-xml":case"color-profile":case"font-face":case"font-face-src":case"font-face-uri":case"font-face-format":case"font-face-name":case"missing-glyph":return!1;default:return!0}}var sr=null;function vr(e){return e=e.target||e.srcElement||window,e.correspondingUseElement&&(e=e.correspondingUseElement),e.nodeType===3?e.parentNode:e}var nt=null,Et=null,lt=null;function mt(e){if(e=ja(e)){if(typeof nt!="function")throw Error(u(280));var r=e.stateNode;r&&(r=Na(r),nt(e.stateNode,e.type,r))}}function Nt(e){Et?lt?lt.push(e):lt=[e]:Et=e}function Kt(){if(Et){var e=Et,r=lt;if(lt=Et=null,mt(e),r)for(e=0;e>>=0,e===0?32:31-(Vr(e)/Rn|0)|0}var Yr=64,Pr=4194304;function hn(e){switch(e&-e){case 1:return 1;case 2:return 2;case 4:return 4;case 8:return 8;case 16:return 16;case 32:return 32;case 64:case 128:case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:return e&4194240;case 4194304:case 8388608:case 16777216:case 33554432:case 67108864:return e&130023424;case 134217728:return 134217728;case 268435456:return 268435456;case 536870912:return 536870912;case 1073741824:return 1073741824;default:return e}}function un(e,r){var a=e.pendingLanes;if(a===0)return 0;var c=0,T=e.suspendedLanes,M=e.pingedLanes,W=a&268435455;if(W!==0){var q=W&~T;q!==0?c=hn(q):(M&=W,M!==0&&(c=hn(M)))}else W=a&~T,W!==0?c=hn(W):M!==0&&(c=hn(M));if(c===0)return 0;if(r!==0&&r!==c&&!(r&T)&&(T=c&-c,M=r&-r,T>=M||T===16&&(M&4194240)!==0))return r;if(c&4&&(c|=a&16),r=e.entangledLanes,r!==0)for(e=e.entanglements,r&=c;0a;a++)r.push(e);return r}function Hr(e,r,a){e.pendingLanes|=r,r!==536870912&&(e.suspendedLanes=0,e.pingedLanes=0),e=e.eventTimes,r=31-Fr(r),e[r]=a}function Sn(e,r){var a=e.pendingLanes&~r;e.pendingLanes=r,e.suspendedLanes=0,e.pingedLanes=0,e.expiredLanes&=r,e.mutableReadLanes&=r,e.entangledLanes&=r,r=e.entanglements;var c=e.eventTimes;for(e=e.expirationTimes;0=Ja),Pi=" ",Ci=!1;function ms(e,r){switch(e){case"keyup":return mu.indexOf(r.keyCode)!==-1;case"keydown":return r.keyCode!==229;case"keypress":case"mousedown":case"focusout":return!0;default:return!1}}function gs(e){return e=e.detail,typeof e=="object"&&"data"in e?e.data:null}var co=!1;function ys(e,r){switch(e){case"compositionend":return gs(r);case"keypress":return r.which!==32?null:(Ci=!0,Pi);case"textInput":return e=r.data,e===Pi&&Ci?null:e;default:return null}}function xs(e,r){if(co)return e==="compositionend"||!Ai&&ms(e,r)?(e=Er(),Dr=Xr=nr=null,co=!1,e):null;switch(e){case"paste":return null;case"keypress":if(!(r.ctrlKey||r.altKey||r.metaKey)||r.ctrlKey&&r.altKey){if(r.char&&1=r)return{node:a,offset:r-e};e=c}t:{for(;a;){if(a.nextSibling){a=a.nextSibling;break t}a=a.parentNode}a=void 0}a=Es(a)}}function Oa(e,r){return e&&r?e===r?!0:e&&e.nodeType===3?!1:r&&r.nodeType===3?Oa(e,r.parentNode):"contains"in e?e.contains(r):e.compareDocumentPosition?!!(e.compareDocumentPosition(r)&16):!1:!1}function Ts(){for(var e=window,r=Ft();n(r,e.HTMLIFrameElement);){try{var a=typeof r.contentWindow.location.href=="string"}catch(c){a=!1}if(a)e=r.contentWindow;else break;r=Ft(e.document)}return r}function bi(e){var r=e&&e.nodeName&&e.nodeName.toLowerCase();return r&&(r==="input"&&(e.type==="text"||e.type==="search"||e.type==="tel"||e.type==="url"||e.type==="password")||r==="textarea"||e.contentEditable==="true")}function ea(e){var r=Ts(),a=e.focusedElem,c=e.selectionRange;if(r!==a&&a&&a.ownerDocument&&Oa(a.ownerDocument.documentElement,a)){if(c!==null&&bi(a)){if(r=c.start,e=c.end,e===void 0&&(e=r),"selectionStart"in a)a.selectionStart=r,a.selectionEnd=Math.min(e,a.value.length);else if(e=(r=a.ownerDocument||document)&&r.defaultView||window,e.getSelection){e=e.getSelection();var T=a.textContent.length,M=Math.min(c.start,T);c=c.end===void 0?M:Math.min(c.end,T),!e.extend&&M>c&&(T=c,c=M,M=T),T=Os(a,M);var W=Os(a,c);T&&W&&(e.rangeCount!==1||e.anchorNode!==T.node||e.anchorOffset!==T.offset||e.focusNode!==W.node||e.focusOffset!==W.offset)&&(r=r.createRange(),r.setStart(T.node,T.offset),e.removeAllRanges(),M>c?(e.addRange(r),e.extend(W.node,W.offset)):(r.setEnd(W.node,W.offset),e.addRange(r)))}}for(r=[],e=a;e=e.parentNode;)e.nodeType===1&&r.push({element:e,left:e.scrollLeft,top:e.scrollTop});for(typeof a.focus=="function"&&a.focus(),a=0;a=document.documentMode,Co=null,Di=null,Ta=null,Is=!1;function Bi(e,r,a){var c=a.window===a?a.document:a.nodeType===9?a:a.ownerDocument;Is||Co==null||Co!==Ft(c)||(c=Co,"selectionStart"in c&&bi(c)?c={start:c.selectionStart,end:c.selectionEnd}:(c=(c.ownerDocument&&c.ownerDocument.defaultView||window).getSelection(),c={anchorNode:c.anchorNode,anchorOffset:c.anchorOffset,focusNode:c.focusNode,focusOffset:c.focusOffset}),Ta&&Ea(Ta,c)||(Ta=c,c=Ca(Di,"onSelect"),0ba||(e.current=js[ba],js[ba]=null,ba--)}function xr(e,r){ba++,js[ba]=e.current,e.current=r}var $o={},on=eo($o),mn=eo(!1),Ko=$o;function Vo(e,r){var a=e.type.contextTypes;if(!a)return $o;var c=e.stateNode;if(c&&c.__reactInternalMemoizedUnmaskedChildContext===r)return c.__reactInternalMemoizedMaskedChildContext;var T={},M;for(M in a)T[M]=r[M];return c&&(e=e.stateNode,e.__reactInternalMemoizedUnmaskedChildContext=r,e.__reactInternalMemoizedMaskedChildContext=T),T}function On(e){return e=e.childContextTypes,e!=null}function Zi(){Tr(mn),Tr(on)}function aa(e,r,a){if(on.current!==$o)throw Error(u(168));xr(on,r),xr(mn,a)}function Ns(e,r,a){var c=e.stateNode;if(r=r.childContextTypes,typeof c.getChildContext!="function")return a;c=c.getChildContext();for(var T in c)if(!(T in r))throw Error(u(108,pt(e)||"Unknown",T));return Q({},a,c)}function Ji(e){return e=(e=e.stateNode)&&e.__reactInternalMemoizedMergedChildContext||$o,Ko=on.current,xr(on,e),xr(mn,mn.current),!0}function qi(e,r,a){var c=e.stateNode;if(!c)throw Error(u(169));a?(e=Ns(e,r,Ko),c.__reactInternalMemoizedMergedChildContext=e,Tr(mn),Tr(on),xr(on,e)):Tr(mn),xr(mn,a)}var kn=null,oi=!1,_i=!1;function ai(e){kn===null?kn=[e]:kn.push(e)}function Mu(e){oi=!0,ai(e)}function mo(){if(!_i&&kn!==null){_i=!0;var e=0,r=ir;try{var a=kn;for(ir=1;e>=W,T-=W,yo=1<<32-Fr(r)+T|a<qe?(sn=Ye,Ye=null):sn=Ye.sibling;var mr=_t(It,Ye,Pt[qe],he);if(mr===null){Ye===null&&(Ye=sn);break}e&&Ye&&mr.alternate===null&&r(It,Ye),St=M(mr,St,qe),ke===null?Be=mr:ke.sibling=mr,ke=mr,Ye=sn}if(qe===Pt.length)return a(It,Ye),jr&&ia(It,qe),Be;if(Ye===null){for(;qeqe?(sn=Ye,Ye=null):sn=Ye.sibling;var va=_t(It,Ye,mr.value,he);if(va===null){Ye===null&&(Ye=sn);break}e&&Ye&&va.alternate===null&&r(It,Ye),St=M(va,St,qe),ke===null?Be=va:ke.sibling=va,ke=va,Ye=sn}if(mr.done)return a(It,Ye),jr&&ia(It,qe),Be;if(Ye===null){for(;!mr.done;qe++,mr=Pt.next())mr=re(It,mr.value,he),mr!==null&&(St=M(mr,St,qe),ke===null?Be=mr:ke.sibling=mr,ke=mr);return jr&&ia(It,qe),Be}for(Ye=c(It,Ye);!mr.done;qe++,mr=Pt.next())mr=Ce(Ye,It,qe,mr.value,he),mr!==null&&(e&&mr.alternate!==null&&Ye.delete(mr.key===null?qe:mr.key),St=M(mr,St,qe),ke===null?Be=mr:ke.sibling=mr,ke=mr);return e&&Ye.forEach(function(mf){return r(It,mf)}),jr&&ia(It,qe),Be}function kr(It,St,Pt,he){if(typeof Pt=="object"&&Pt!==null&&Pt.type===K&&Pt.key===null&&(Pt=Pt.props.children),typeof Pt=="object"&&Pt!==null){switch(Pt.$$typeof){case L:t:{for(var Be=Pt.key,ke=St;ke!==null;){if(ke.key===Be){if(Be=Pt.type,Be===K){if(ke.tag===7){a(It,ke.sibling),St=T(ke,Pt.props.children),St.return=It,It=St;break t}}else if(ke.elementType===Be||typeof Be=="object"&&Be!==null&&Be.$$typeof===$&&st(Be)===ke.type){a(It,ke.sibling),St=T(ke,Pt.props),St.ref=ut(It,ke,Pt),St.return=It,It=St;break t}a(It,ke);break}else r(It,ke);ke=ke.sibling}Pt.type===K?(St=Ga(Pt.props.children,It.mode,he,Pt.key),St.return=It,It=St):(he=qs(Pt.type,Pt.key,Pt.props,null,It.mode,he),he.ref=ut(It,St,Pt),he.return=It,It=he)}return W(It);case z:t:{for(ke=Pt.key;St!==null;){if(St.key===ke)if(St.tag===4&&St.stateNode.containerInfo===Pt.containerInfo&&St.stateNode.implementation===Pt.implementation){a(It,St.sibling),St=T(St,Pt.children||[]),St.return=It,It=St;break t}else{a(It,St);break}else r(It,St);St=St.sibling}St=cl(Pt,It.mode,he),St.return=It,It=St}return W(It);case $:return ke=Pt._init,kr(It,St,ke(Pt._payload),he)}if(Ht(Pt))return Ne(It,St,Pt,he);if(G(Pt))return be(It,St,Pt,he);et(It,Pt)}return typeof Pt=="string"&&Pt!==""||typeof Pt=="number"?(Pt=""+Pt,St!==null&&St.tag===6?(a(It,St.sibling),St=T(St,Pt),St.return=It,It=St):(a(It,St),St=ll(Pt,It.mode,he),St.return=It,It=St),W(It)):a(It,St)}return kr}var zt=Dt(!0),Mt=Dt(!1),Xt=eo(null),se=null,ue=null,le=null;function Ie(){le=ue=se=null}function De(e){var r=Xt.current;Tr(Xt),e._currentValue=r}function Qt(e,r,a){for(;e!==null;){var c=e.alternate;if((e.childLanes&r)!==r?(e.childLanes|=r,c!==null&&(c.childLanes|=r)):c!==null&&(c.childLanes&r)!==r&&(c.childLanes|=r),e===a)break;e=e.return}}function Ee(e,r){se=e,le=ue=null,e=e.dependencies,e!==null&&e.firstContext!==null&&(e.lanes&r&&(zn=!0),e.firstContext=null)}function Ae(e){var r=e._currentValue;if(le!==e)if(e={context:e,memoizedValue:r,next:null},ue===null){if(se===null)throw Error(u(308));ue=e,se.dependencies={lanes:0,firstContext:e}}else ue=ue.next=e;return r}var Ze=null;function $e(e){Ze===null?Ze=[e]:Ze.push(e)}function _e(e,r,a,c){var T=r.interleaved;return T===null?(a.next=a,$e(r)):(a.next=T.next,T.next=a),r.interleaved=a,oe(e,c)}function oe(e,r){e.lanes|=r;var a=e.alternate;for(a!==null&&(a.lanes|=r),a=e,e=e.return;e!==null;)e.childLanes|=r,a=e.alternate,a!==null&&(a.childLanes|=r),a=e,e=e.return;return a.tag===3?a.stateNode:null}var Fe=!1;function He(e){e.updateQueue={baseState:e.memoizedState,firstBaseUpdate:null,lastBaseUpdate:null,shared:{pending:null,interleaved:null,lanes:0},effects:null}}function cr(e,r){e=e.updateQueue,r.updateQueue===e&&(r.updateQueue={baseState:e.baseState,firstBaseUpdate:e.firstBaseUpdate,lastBaseUpdate:e.lastBaseUpdate,shared:e.shared,effects:e.effects})}function yr(e,r){return{eventTime:e,lane:r,tag:0,payload:null,callback:null,next:null}}function zr(e,r,a){var c=e.updateQueue;if(c===null)return null;if(c=c.shared,hr&2){var T=c.pending;return T===null?r.next=r:(r.next=T.next,T.next=r),c.pending=r,oe(e,a)}return T=c.interleaved,T===null?(r.next=r,$e(c)):(r.next=T.next,T.next=r),c.interleaved=r,oe(e,a)}function Sr(e,r,a){if(r=r.updateQueue,r!==null&&(r=r.shared,(a&4194240)!==0)){var c=r.lanes;c&=e.pendingLanes,a|=c,r.lanes=a,cn(e,a)}}function qr(e,r){var a=e.updateQueue,c=e.alternate;if(c!==null&&(c=c.updateQueue,a===c)){var T=null,M=null;if(a=a.firstBaseUpdate,a!==null){do{var W={eventTime:a.eventTime,lane:a.lane,tag:a.tag,payload:a.payload,callback:a.callback,next:null};M===null?T=M=W:M=M.next=W,a=a.next}while(a!==null);M===null?T=M=r:M=M.next=r}else T=M=r;a={baseState:c.baseState,firstBaseUpdate:T,lastBaseUpdate:M,shared:c.shared,effects:c.effects},e.updateQueue=a;return}e=a.lastBaseUpdate,e===null?a.firstBaseUpdate=r:e.next=r,a.lastBaseUpdate=r}function Fn(e,r,a,c){var T=e.updateQueue;Fe=!1;var M=T.firstBaseUpdate,W=T.lastBaseUpdate,q=T.shared.pending;if(q!==null){T.shared.pending=null;var gt=q,Lt=gt.next;gt.next=null,W===null?M=Lt:W.next=Lt,W=gt;var Wt=e.alternate;Wt!==null&&(Wt=Wt.updateQueue,q=Wt.lastBaseUpdate,q!==W&&(q===null?Wt.firstBaseUpdate=Lt:q.next=Lt,Wt.lastBaseUpdate=gt))}if(M!==null){var re=T.baseState;W=0,Wt=Lt=gt=null,q=M;do{var _t=q.lane,Ce=q.eventTime;if((c&_t)===_t){Wt!==null&&(Wt=Wt.next={eventTime:Ce,lane:0,tag:q.tag,payload:q.payload,callback:q.callback,next:null});t:{var Ne=e,be=q;switch(_t=r,Ce=a,be.tag){case 1:if(Ne=be.payload,typeof Ne=="function"){re=Ne.call(Ce,re,_t);break t}re=Ne;break t;case 3:Ne.flags=Ne.flags&-65537|128;case 0:if(Ne=be.payload,_t=typeof Ne=="function"?Ne.call(Ce,re,_t):Ne,_t==null)break t;re=Q({},re,_t);break t;case 2:Fe=!0}}q.callback!==null&&q.lane!==0&&(e.flags|=64,_t=T.effects,_t===null?T.effects=[q]:_t.push(q))}else Ce={eventTime:Ce,lane:_t,tag:q.tag,payload:q.payload,callback:q.callback,next:null},Wt===null?(Lt=Wt=Ce,gt=re):Wt=Wt.next=Ce,W|=_t;if(q=q.next,q===null){if(q=T.shared.pending,q===null)break;_t=q,q=_t.next,_t.next=null,T.lastBaseUpdate=_t,T.shared.pending=null}}while(!0);if(Wt===null&&(gt=re),T.baseState=gt,T.firstBaseUpdate=Lt,T.lastBaseUpdate=Wt,r=T.shared.interleaved,r!==null){T=r;do W|=T.lane,T=T.next;while(T!==r)}else M===null&&(T.shared.lanes=0);$a|=W,e.lanes=W,e.memoizedState=re}}function pr(e,r,a){if(e=r.effects,r.effects=null,e!==null)for(r=0;ra?a:4,e(!0);var c=es.transition;es.transition={};try{e(!1),r()}finally{ir=a,es.transition=c}}function zl(){return In().memoizedState}function zc(e,r,a){var c=ca(e);if(a={lane:c,action:a,hasEagerState:!1,eagerState:null,next:null},Wl(e))$l(r,a);else if(a=_e(e,r,a,c),a!==null){var T=Pn();To(a,e,c,T),Kl(a,r,c)}}function Wc(e,r,a){var c=ca(e),T={lane:c,action:a,hasEagerState:!1,eagerState:null,next:null};if(Wl(e))$l(r,T);else{var M=e.alternate;if(e.lanes===0&&(M===null||M.lanes===0)&&(M=r.lastRenderedReducer,M!==null))try{var W=r.lastRenderedState,q=M(W,a);if(T.hasEagerState=!0,T.eagerState=q,bn(q,W)){var gt=r.interleaved;gt===null?(T.next=T,$e(r)):(T.next=gt.next,gt.next=T),r.interleaved=T;return}}catch(Lt){}finally{}a=_e(e,r,T,c),a!==null&&(T=Pn(),To(a,e,c,T),Kl(a,r,c))}}function Wl(e){var r=e.alternate;return e===Rr||r!==null&&r===Rr}function $l(e,r){Yn=ui=!0;var a=e.pending;a===null?r.next=r:(r.next=a.next,a.next=r),e.pending=r}function Kl(e,r,a){if(a&4194240){var c=r.lanes;c&=e.pendingLanes,a|=c,r.lanes=a,cn(e,a)}}var Us={readContext:Ae,useCallback:tn,useContext:tn,useEffect:tn,useImperativeHandle:tn,useInsertionEffect:tn,useLayoutEffect:tn,useMemo:tn,useReducer:tn,useRef:tn,useState:tn,useDebugValue:tn,useDeferredValue:tn,useTransition:tn,useMutableSource:tn,useSyncExternalStore:tn,useId:tn,unstable_isNewReconciler:!1},$c={readContext:Ae,useCallback:function(r,a){return Xn().memoizedState=[r,a===void 0?null:a],r},useContext:Ae,useEffect:jl,useImperativeHandle:function(r,a,c){return c=c!=null?c.concat([r]):null,Bs(4194308,4,Ll.bind(null,a,r),c)},useLayoutEffect:function(r,a){return Bs(4194308,4,r,a)},useInsertionEffect:function(r,a){return Bs(4,2,r,a)},useMemo:function(r,a){var c=Xn();return a=a===void 0?null:a,r=r(),c.memoizedState=[r,a],r},useReducer:function(r,a,c){var T=Xn();return a=c!==void 0?c(a):a,T.memoizedState=T.baseState=a,r={pending:null,interleaved:null,lanes:0,dispatch:null,lastRenderedReducer:r,lastRenderedState:a},T.queue=r,r=r.dispatch=zc.bind(null,Rr,r),[T.memoizedState,r]},useRef:function(r){var a=Xn();return r={current:r},a.memoizedState=r},useState:wl,useDebugValue:Bu,useDeferredValue:function(r){return Xn().memoizedState=r},useTransition:function(){var r=wl(!1),a=r[0];return r=Uc.bind(null,r[1]),Xn().memoizedState=r,[a,r]},useMutableSource:function(){},useSyncExternalStore:function(r,a,c){var T=Rr,M=Xn();if(jr){if(c===void 0)throw Error(u(407));c=c()}else{if(c=a(),an===null)throw Error(u(349));Ho&30||Il(T,a,c)}M.memoizedState=c;var W={value:c,getSnapshot:a};return M.queue=W,jl(Pl.bind(null,T,W,r),[r]),T.flags|=2048,ns(9,Al.bind(null,T,W,c,a),void 0,null),c},useId:function(){var r=Xn(),a=an.identifierPrefix;if(jr){var c=Mo,T=yo;c=(T&~(1<<32-Fr(T)-1)).toString(32)+c,a=":"+a+"R"+c,c=No++,0<\/script>",e=e.removeChild(e.firstChild)):typeof c.is=="string"?e=W.createElement(a,{is:c.is}):(e=W.createElement(a),a==="select"&&(W=e,c.multiple?W.multiple=!0:c.size&&(W.size=c.size))):e=W.createElementNS(e,a),e[Gn]=r,e[Wo]=c,uc(e,r,!1,!1),r.stateNode=e;t:{switch(W=or(a,c),a){case"dialog":Or("cancel",e),Or("close",e),T=c;break;case"iframe":case"object":case"embed":Or("load",e),T=c;break;case"video":case"audio":for(T=0;Thi&&(r.flags|=128,c=!0,os(M,!1),r.lanes=4194304)}else{if(!c)if(e=si(W),e!==null){if(r.flags|=128,c=!0,a=e.updateQueue,a!==null&&(r.updateQueue=a,r.flags|=4),os(M,!0),M.tail===null&&M.tailMode==="hidden"&&!W.alternate&&!jr)return yn(r),null}else 2*Qe()-M.renderingStartTime>hi&&a!==1073741824&&(r.flags|=128,c=!0,os(M,!1),r.lanes=4194304);M.isBackwards?(W.sibling=r.child,r.child=W):(a=M.last,a!==null?a.sibling=W:r.child=W,M.last=W)}return M.tail!==null?(r=M.tail,M.rendering=r,M.tail=r.sibling,M.renderingStartTime=Qe(),r.sibling=null,a=Ar.current,xr(Ar,c?a&1|2:a&1),r):(yn(r),null);case 22:case 23:return il(),c=r.memoizedState!==null,e!==null&&e.memoizedState!==null!==c&&(r.flags|=8192),c&&r.mode&1?Qn&1073741824&&(yn(r),r.subtreeFlags&6&&(r.flags|=8192)):yn(r),null;case 24:return null;case 25:return null}throw Error(u(156,r.tag))}function Qc(e,r){switch(Ls(r),r.tag){case 1:return On(r.type)&&Zi(),e=r.flags,e&65536?(r.flags=e&-65537|128,r):null;case 3:return no(),Tr(mn),Tr(on),ts(),e=r.flags,e&65536&&!(e&128)?(r.flags=e&-65537|128,r):null;case 5:return xo(r),null;case 13:if(Tr(Ar),e=r.memoizedState,e!==null&&e.dehydrated!==null){if(r.alternate===null)throw Error(u(340));U()}return e=r.flags,e&65536?(r.flags=e&-65537|128,r):null;case 19:return Tr(Ar),null;case 4:return no(),null;case 10:return De(r.type._context),null;case 22:case 23:return il(),null;case 24:return null;default:return null}}var Ks=!1,xn=!1,Zc=typeof WeakSet=="function"?WeakSet:Set,Me=null;function di(e,r){var a=e.ref;if(a!==null)if(typeof a=="function")try{a(null)}catch(c){$r(e,r,c)}else a.current=null}function Xu(e,r,a){try{a()}catch(c){$r(e,r,c)}}var fc=!1;function Jc(e,r){if(Ki=Vn,e=Ts(),bi(e)){if("selectionStart"in e)var a={start:e.selectionStart,end:e.selectionEnd};else t:{a=(a=e.ownerDocument)&&a.defaultView||window;var c=a.getSelection&&a.getSelection();if(c&&c.rangeCount!==0){a=c.anchorNode;var T=c.anchorOffset,M=c.focusNode;c=c.focusOffset;try{a.nodeType,M.nodeType}catch(he){a=null;break t}var W=0,q=-1,gt=-1,Lt=0,Wt=0,re=e,_t=null;e:for(;;){for(var Ce;re!==a||T!==0&&re.nodeType!==3||(q=W+T),re!==M||c!==0&&re.nodeType!==3||(gt=W+c),re.nodeType===3&&(W+=re.nodeValue.length),(Ce=re.firstChild)!==null;)_t=re,re=Ce;for(;;){if(re===e)break e;if(_t===a&&++Lt===T&&(q=W),_t===M&&++Wt===c&&(gt=W),(Ce=re.nextSibling)!==null)break;re=_t,_t=re.parentNode}re=Ce}a=q===-1||gt===-1?null:{start:q,end:gt}}else a=null}a=a||{start:0,end:0}}else a=null;for(Vi={focusedElem:e,selectionRange:a},Vn=!1,Me=r;Me!==null;)if(r=Me,e=r.child,(r.subtreeFlags&1028)!==0&&e!==null)e.return=r,Me=e;else for(;Me!==null;){r=Me;try{var Ne=r.alternate;if(r.flags&1024)switch(r.tag){case 0:case 11:case 15:break;case 1:if(Ne!==null){var be=Ne.memoizedProps,kr=Ne.memoizedState,It=r.stateNode,St=It.getSnapshotBeforeUpdate(r.elementType===r.type?be:So(r.type,be),kr);It.__reactInternalSnapshotBeforeUpdate=St}break;case 3:var Pt=r.stateNode.containerInfo;Pt.nodeType===1?Pt.textContent="":Pt.nodeType===9&&Pt.documentElement&&Pt.removeChild(Pt.documentElement);break;case 5:case 6:case 4:case 17:break;default:throw Error(u(163))}}catch(he){$r(r,r.return,he)}if(e=r.sibling,e!==null){e.return=r.return,Me=e;break}Me=r.return}return Ne=fc,fc=!1,Ne}function as(e,r,a){var c=r.updateQueue;if(c=c!==null?c.lastEffect:null,c!==null){var T=c=c.next;do{if((T.tag&e)===e){var M=T.destroy;T.destroy=void 0,M!==void 0&&Xu(r,a,M)}T=T.next}while(T!==c)}}function Vs(e,r){if(r=r.updateQueue,r=r!==null?r.lastEffect:null,r!==null){var a=r=r.next;do{if((a.tag&e)===e){var c=a.create;a.destroy=c()}a=a.next}while(a!==r)}}function Qu(e){var r=e.ref;if(r!==null){var a=e.stateNode;switch(e.tag){case 5:e=a;break;default:e=a}typeof r=="function"?r(e):r.current=e}}function dc(e){var r=e.alternate;r!==null&&(e.alternate=null,dc(r)),e.child=null,e.deletions=null,e.sibling=null,e.tag===5&&(r=e.stateNode,r!==null&&(delete r[Gn],delete r[Wo],delete r[Xi],delete r[Qi],delete r[wu])),e.stateNode=null,e.return=null,e.dependencies=null,e.memoizedProps=null,e.memoizedState=null,e.pendingProps=null,e.stateNode=null,e.updateQueue=null}function vc(e){return e.tag===5||e.tag===3||e.tag===4}function hc(e){t:for(;;){for(;e.sibling===null;){if(e.return===null||vc(e.return))return null;e=e.return}for(e.sibling.return=e.return,e=e.sibling;e.tag!==5&&e.tag!==6&&e.tag!==18;){if(e.flags&2||e.child===null||e.tag===4)continue t;e.child.return=e,e=e.child}if(!(e.flags&2))return e.stateNode}}function Zu(e,r,a){var c=e.tag;if(c===5||c===6)e=e.stateNode,r?a.nodeType===8?a.parentNode.insertBefore(e,r):a.insertBefore(e,r):(a.nodeType===8?(r=a.parentNode,r.insertBefore(e,a)):(r=a,r.appendChild(e)),a=a._reactRootContainer,a!=null||r.onclick!==null||(r.onclick=ni));else if(c!==4&&(e=e.child,e!==null))for(Zu(e,r,a),e=e.sibling;e!==null;)Zu(e,r,a),e=e.sibling}function Ju(e,r,a){var c=e.tag;if(c===5||c===6)e=e.stateNode,r?a.insertBefore(e,r):a.appendChild(e);else if(c!==4&&(e=e.child,e!==null))for(Ju(e,r,a),e=e.sibling;e!==null;)Ju(e,r,a),e=e.sibling}var dn=null,Eo=!1;function sa(e,r,a){for(a=a.child;a!==null;)pc(e,r,a),a=a.sibling}function pc(e,r,a){if(br&&typeof br.onCommitFiberUnmount=="function")try{br.onCommitFiberUnmount(fr,a)}catch(q){}switch(a.tag){case 5:xn||di(a,r);case 6:var c=dn,T=Eo;dn=null,sa(e,r,a),dn=c,Eo=T,dn!==null&&(Eo?(e=dn,a=a.stateNode,e.nodeType===8?e.parentNode.removeChild(a):e.removeChild(a)):dn.removeChild(a.stateNode));break;case 18:dn!==null&&(Eo?(e=dn,a=a.stateNode,e.nodeType===8?Ma(e.parentNode,a):e.nodeType===1&&Ma(e,a),Po(e)):Ma(dn,a.stateNode));break;case 4:c=dn,T=Eo,dn=a.stateNode.containerInfo,Eo=!0,sa(e,r,a),dn=c,Eo=T;break;case 0:case 11:case 14:case 15:if(!xn&&(c=a.updateQueue,c!==null&&(c=c.lastEffect,c!==null))){T=c=c.next;do{var M=T,W=M.destroy;M=M.tag,W!==void 0&&(M&2||M&4)&&Xu(a,r,W),T=T.next}while(T!==c)}sa(e,r,a);break;case 1:if(!xn&&(di(a,r),c=a.stateNode,typeof c.componentWillUnmount=="function"))try{c.props=a.memoizedProps,c.state=a.memoizedState,c.componentWillUnmount()}catch(q){$r(a,r,q)}sa(e,r,a);break;case 21:sa(e,r,a);break;case 22:a.mode&1?(xn=(c=xn)||a.memoizedState!==null,sa(e,r,a),xn=c):sa(e,r,a);break;default:sa(e,r,a)}}function mc(e){var r=e.updateQueue;if(r!==null){e.updateQueue=null;var a=e.stateNode;a===null&&(a=e.stateNode=new Zc),r.forEach(function(c){var T=sf.bind(null,e,c);a.has(c)||(a.add(c),c.then(T,T))})}}function Oo(e,r){var a=r.deletions;if(a!==null)for(var c=0;cT&&(T=W),c&=~M}if(c=T,c=Qe()-c,c=(120>c?120:480>c?480:1080>c?1080:1920>c?1920:3e3>c?3e3:4320>c?4320:1960*_c(c/1960))-c,10e?16:e,la===null)var c=!1;else{if(e=la,la=null,Xs=0,hr&6)throw Error(u(331));var T=hr;for(hr|=4,Me=e.current;Me!==null;){var M=Me,W=M.child;if(Me.flags&16){var q=M.deletions;if(q!==null){for(var gt=0;gtQe()-tl?Va(e,0):_u|=a),$n(e,r)}function wc(e,r){r===0&&(e.mode&1?(r=Pr,Pr<<=1,!(Pr&130023424)&&(Pr=4194304)):r=1);var a=Pn();e=oe(e,r),e!==null&&(Hr(e,r,a),$n(e,a))}function af(e){var r=e.memoizedState,a=0;r!==null&&(a=r.retryLane),wc(e,a)}function sf(e,r){var a=0;switch(e.tag){case 13:var c=e.stateNode,T=e.memoizedState;T!==null&&(a=T.retryLane);break;case 19:c=e.stateNode;break;default:throw Error(u(314))}c!==null&&c.delete(r),wc(e,a)}var Mc;Mc=function(r,a,c){if(r!==null)if(r.memoizedProps!==a.pendingProps||mn.current)zn=!0;else{if(!(r.lanes&c)&&!(a.flags&128))return zn=!1,Yc(r,a,c);zn=!!(r.flags&131072)}else zn=!1,jr&&a.flags&1048576&&ii(a,Ba,a.index);switch(a.lanes=0,a.tag){case 2:var T=a.type;$s(r,a),r=a.pendingProps;var M=Vo(a,on.current);Ee(a,c),M=li(null,a,T,r,M,c);var W=ci();return a.flags|=1,typeof M=="object"&&M!==null&&typeof M.render=="function"&&M.$$typeof===void 0?(a.tag=1,a.memoizedState=null,a.updateQueue=null,On(T)?(W=!0,Ji(a)):W=!1,a.memoizedState=M.state!==null&&M.state!==void 0?M.state:null,He(a),M.updater=zs,a.stateNode=M,M._reactInternals=a,Uu(a,T,r,c),a=Ku(null,a,T,!0,W,c)):(a.tag=0,jr&&W&&bs(a),An(null,a,M,c),a=a.child),a;case 16:T=a.elementType;t:{switch($s(r,a),r=a.pendingProps,M=T._init,T=M(T._payload),a.type=T,M=a.tag=lf(T),r=So(T,r),M){case 0:a=$u(null,a,T,r,c);break t;case 1:a=rc(null,a,T,r,c);break t;case 11:a=Jl(null,a,T,r,c);break t;case 14:a=ql(null,a,T,So(T.type,r),c);break t}throw Error(u(306,T,""))}return a;case 0:return T=a.type,M=a.pendingProps,M=a.elementType===T?M:So(T,M),$u(r,a,T,M,c);case 1:return T=a.type,M=a.pendingProps,M=a.elementType===T?M:So(T,M),rc(r,a,T,M,c);case 3:t:{if(nc(a),r===null)throw Error(u(387));T=a.pendingProps,W=a.memoizedState,M=W.element,cr(r,a),Fn(a,T,null,c);var q=a.memoizedState;if(T=q.element,W.isDehydrated)if(W={element:T,isDehydrated:!1,cache:q.cache,pendingSuspenseBoundaries:q.pendingSuspenseBoundaries,transitions:q.transitions},a.updateQueue.baseState=W,a.memoizedState=W,a.flags&256){M=fi(Error(u(423)),a),a=oc(r,a,T,c,M);break t}else if(T!==M){M=fi(Error(u(424)),a),a=oc(r,a,T,c,M);break t}else for(Bn=Hn(a.stateNode.containerInfo.firstChild),Dn=a,jr=!0,Tn=null,c=Mt(a,null,T,c),a.child=c;c;)c.flags=c.flags&-3|4096,c=c.sibling;else{if(U(),T===M){a=Go(r,a,c);break t}An(r,a,T,c)}a=a.child}return a;case 5:return Fa(a),r===null&&y(a),T=a.type,M=a.pendingProps,W=r!==null?r.memoizedProps:null,q=M.children,wa(T,M)?q=null:W!==null&&wa(T,W)&&(a.flags|=32),ec(r,a),An(r,a,q,c),a.child;case 6:return r===null&&y(a),null;case 13:return ac(r,a,c);case 4:return ro(a,a.stateNode.containerInfo),T=a.pendingProps,r===null?a.child=zt(a,null,T,c):An(r,a,T,c),a.child;case 11:return T=a.type,M=a.pendingProps,M=a.elementType===T?M:So(T,M),Jl(r,a,T,M,c);case 7:return An(r,a,a.pendingProps,c),a.child;case 8:return An(r,a,a.pendingProps.children,c),a.child;case 12:return An(r,a,a.pendingProps.children,c),a.child;case 10:t:{if(T=a.type._context,M=a.pendingProps,W=a.memoizedProps,q=M.value,xr(Xt,T._currentValue),T._currentValue=q,W!==null)if(bn(W.value,q)){if(W.children===M.children&&!mn.current){a=Go(r,a,c);break t}}else for(W=a.child,W!==null&&(W.return=a);W!==null;){var gt=W.dependencies;if(gt!==null){q=W.child;for(var Lt=gt.firstContext;Lt!==null;){if(Lt.context===T){if(W.tag===1){Lt=yr(-1,c&-c),Lt.tag=2;var Wt=W.updateQueue;if(Wt!==null){Wt=Wt.shared;var re=Wt.pending;re===null?Lt.next=Lt:(Lt.next=re.next,re.next=Lt),Wt.pending=Lt}}W.lanes|=c,Lt=W.alternate,Lt!==null&&(Lt.lanes|=c),Qt(W.return,c,a),gt.lanes|=c;break}Lt=Lt.next}}else if(W.tag===10)q=W.type===a.type?null:W.child;else if(W.tag===18){if(q=W.return,q===null)throw Error(u(341));q.lanes|=c,gt=q.alternate,gt!==null&&(gt.lanes|=c),Qt(q,c,a),q=W.sibling}else q=W.child;if(q!==null)q.return=W;else for(q=W;q!==null;){if(q===a){q=null;break}if(W=q.sibling,W!==null){W.return=q.return,q=W;break}q=q.return}W=q}An(r,a,M.children,c),a=a.child}return a;case 9:return M=a.type,T=a.pendingProps.children,Ee(a,c),M=Ae(M),T=T(M),a.flags|=1,An(r,a,T,c),a.child;case 14:return T=a.type,M=So(T,a.pendingProps),M=So(T.type,M),ql(r,a,T,M,c);case 15:return _l(r,a,a.type,a.pendingProps,c);case 17:return T=a.type,M=a.pendingProps,M=a.elementType===T?M:So(T,M),$s(r,a),a.tag=1,On(T)?(r=!0,Ji(a)):r=!1,Ee(a,c),Hl(a,T,M),Uu(a,T,M,c),Ku(null,a,T,!0,r,c);case 19:return sc(r,a,c);case 22:return tc(r,a,c)}throw Error(u(156,a.tag))};function jc(e,r){return ye(e,r)}function uf(e,r,a,c){this.tag=e,this.key=a,this.sibling=this.child=this.return=this.stateNode=this.type=this.elementType=null,this.index=0,this.ref=null,this.pendingProps=r,this.dependencies=this.memoizedState=this.updateQueue=this.memoizedProps=null,this.mode=c,this.subtreeFlags=this.flags=0,this.deletions=null,this.childLanes=this.lanes=0,this.alternate=null}function ao(e,r,a,c){return new uf(e,r,a,c)}function ul(e){return e=e.prototype,!(!e||!e.isReactComponent)}function lf(e){if(typeof e=="function")return ul(e)?1:0;if(e!=null){if(e=e.$$typeof,e===Y)return 11;if(e===_)return 14}return 2}function da(e,r){var a=e.alternate;return a===null?(a=ao(e.tag,r,e.key,e.mode),a.elementType=e.elementType,a.type=e.type,a.stateNode=e.stateNode,a.alternate=e,e.alternate=a):(a.pendingProps=r,a.type=e.type,a.flags=0,a.subtreeFlags=0,a.deletions=null),a.flags=e.flags&14680064,a.childLanes=e.childLanes,a.lanes=e.lanes,a.child=e.child,a.memoizedProps=e.memoizedProps,a.memoizedState=e.memoizedState,a.updateQueue=e.updateQueue,r=e.dependencies,a.dependencies=r===null?null:{lanes:r.lanes,firstContext:r.firstContext},a.sibling=e.sibling,a.index=e.index,a.ref=e.ref,a}function qs(e,r,a,c,T,M){var W=2;if(c=e,typeof e=="function")ul(e)&&(W=1);else if(typeof e=="string")W=5;else t:switch(e){case K:return Ga(a.children,T,M,r);case k:W=8,T|=8;break;case J:return e=ao(12,a,r,T|2),e.elementType=J,e.lanes=M,e;case it:return e=ao(13,a,r,T),e.elementType=it,e.lanes=M,e;case at:return e=ao(19,a,r,T),e.elementType=at,e.lanes=M,e;case V:return _s(a,T,M,r);default:if(typeof e=="object"&&e!==null)switch(e.$$typeof){case H:W=10;break t;case X:W=9;break t;case Y:W=11;break t;case _:W=14;break t;case $:W=16,c=null;break t}throw Error(u(130,e==null?e:typeof e=="undefined"?"undefined":o(e),""))}return r=ao(W,a,r,T),r.elementType=e,r.type=c,r.lanes=M,r}function Ga(e,r,a,c){return e=ao(7,e,c,r),e.lanes=a,e}function _s(e,r,a,c){return e=ao(22,e,c,r),e.elementType=V,e.lanes=a,e.stateNode={isHidden:!1},e}function ll(e,r,a){return e=ao(6,e,null,r),e.lanes=a,e}function cl(e,r,a){return r=ao(4,e.children!==null?e.children:[],e.key,r),r.lanes=a,r.stateNode={containerInfo:e.containerInfo,pendingChildren:null,implementation:e.implementation},r}function cf(e,r,a,c,T){this.tag=r,this.containerInfo=e,this.finishedWork=this.pingCache=this.current=this.pendingChildren=null,this.timeoutHandle=-1,this.callbackNode=this.pendingContext=this.context=null,this.callbackPriority=0,this.eventTimes=Zn(0),this.expirationTimes=Zn(-1),this.entangledLanes=this.finishedLanes=this.mutableReadLanes=this.expiredLanes=this.pingedLanes=this.suspendedLanes=this.pendingLanes=0,this.entanglements=Zn(0),this.identifierPrefix=c,this.onRecoverableError=T,this.mutableSourceEagerHydrationData=null}function fl(e,r,a,c,T,M,W,q,gt){return e=new cf(e,r,a,q,gt),r===1?(r=1,M===!0&&(r|=8)):r=0,M=ao(3,null,null,r),e.current=M,M.stateNode=e,M.memoizedState={element:c,isDehydrated:a,cache:null,transitions:null,pendingSuspenseBoundaries:null},He(M),e}function ff(e,r,a){var c=3At.length)&&(Tt=At.length);for(var $t=0,Jt=new Array(Tt);$t1?$t-1:0),Pe=1;Pe<$t;Pe++)Jt[Pe-1]=arguments[Pe];return B(At,Tt,Jt)}}function at(At){return function(){for(var Tt=arguments.length,$t=new Array(Tt),Jt=0;Jt/gm),ee=w(/\${[\w\W]*}/gm),Rt=w(/^data-[\-\w.\u00B7-\uFFFF]/),Ft=w(/^aria-[\-\w]+$/),Yt=w(/^(?:(?:(?:f|ht)tps?|mailto|tel|callto|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i),kt=w(/^(?:\w+script|data):/i),de=w(/[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205F\u3000]/g),ve=w(/^html$/i),ie=w(/^[a-z][.\w]*(-[.\w]+)+$/i),Ut=function(){return typeof window=="undefined"?null:window},Ht=function(Tt,$t){if(t(Tt)!=="object"||typeof Tt.createPolicy!="function")return null;var Jt=null,Pe="data-tt-policy-suffix";$t.currentScript&&$t.currentScript.hasAttribute(Pe)&&(Jt=$t.currentScript.getAttribute(Pe));var Re="dompurify"+(Jt?"#"+Jt:"");try{return Tt.createPolicy(Re,{createHTML:function(pe){return pe},createScriptURL:function(pe){return pe}})}catch(Oe){return console.warn("TrustedTypes policy "+Re+" could not be created."),null}};function Ct(){var At=arguments.length>0&&arguments[0]!==void 0?arguments[0]:Ut(),Tt=function(vt){return Ct(vt)};if(Tt.version="2.5.6",Tt.removed=[],!At||!At.document||At.document.nodeType!==9)return Tt.isSupported=!1,Tt;var $t=At.document,Jt=At.document,Pe=At.DocumentFragment,Re=At.HTMLTemplateElement,Oe=At.Node,pe=At.Element,Ot=At.NodeFilter,wt=At.NamedNodeMap,ae=wt===void 0?At.NamedNodeMap||At.MozNamedAttrMap:wt,Te=At.HTMLFormElement,Ke=At.DOMParser,Le=At.trustedTypes,or=pe.prototype,sr=V(or,"cloneNode"),vr=V(or,"nextSibling"),nt=V(or,"childNodes"),Et=V(or,"parentNode");if(typeof Re=="function"){var lt=Jt.createElement("template");lt.content&<.content.ownerDocument&&(Jt=lt.content.ownerDocument)}var mt=Ht(Le,$t),Nt=mt?mt.createHTML(""):"",Kt=Jt,fe=Kt.implementation,ce=Kt.createNodeIterator,we=Kt.createDocumentFragment,ne=Kt.getElementsByTagName,Ve=$t.importNode,ze={};try{ze=$(Jt).documentMode?Jt.documentMode:{}}catch(je){}var Ue={};Tt.isSupported=typeof Et=="function"&&fe&&fe.createHTMLDocument!==void 0&&ze!==9;var Ge=Se,Xe=xe,tr=ee,We=Rt,ur=Ft,lr=kt,wr=de,rn=ie,ft=Yt,Vt=null,bt=_({},[].concat(s(tt),s(G),s(Q),s(rt),s(dt))),yt=null,Gt=_({},[].concat(s(jt),s(xt),s(pt),s(Bt))),me=Object.seal(Object.create(null,{tagNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},attributeNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},allowCustomizedBuiltInElements:{writable:!0,configurable:!1,enumerable:!0,value:!1}})),ye=null,er=null,dr=!0,ar=!0,Qe=!1,Zt=!0,Je=!1,Ir=!0,Mr=!1,Kr=!1,Br=!1,fr=!1,br=!1,Cn=!1,Fr=!0,Vr=!1,Rn="user-content-",wn=!0,Yr=!1,Pr={},hn=null,un=_({},["annotation-xml","audio","colgroup","desc","foreignobject","head","iframe","math","mi","mn","mo","ms","mtext","noembed","noframes","noscript","plaintext","script","style","svg","template","thead","title","video","xmp"]),Yo=null,io=_({},["audio","video","img","source","image","track"]),ln=null,Lo=_({},["alt","class","for","id","label","name","pattern","placeholder","role","summary","title","value","style","xmlns"]),Zn="http://www.w3.org/1998/Math/MathML",Hr="http://www.w3.org/2000/svg",Sn="http://www.w3.org/1999/xhtml",cn=Sn,ir=!1,Io=null,so=_({},[Zn,Hr,Sn],z),Mn,ka=["application/xhtml+xml","text/html"],Ya="text/html",Lr,Kn=null,Ao=Jt.createElement("form"),pn=function(vt){return m(vt,RegExp)||m(vt,Function)},jn=function(vt){Kn&&Kn===vt||((!vt||t(vt)!=="object")&&(vt={}),vt=$(vt),Mn=ka.indexOf(vt.PARSER_MEDIA_TYPE)===-1?Mn=Ya:Mn=vt.PARSER_MEDIA_TYPE,Lr=Mn==="application/xhtml+xml"?z:L,Vt="ALLOWED_TAGS"in vt?_({},vt.ALLOWED_TAGS,Lr):bt,yt="ALLOWED_ATTR"in vt?_({},vt.ALLOWED_ATTR,Lr):Gt,Io="ALLOWED_NAMESPACES"in vt?_({},vt.ALLOWED_NAMESPACES,z):so,ln="ADD_URI_SAFE_ATTR"in vt?_($(Lo),vt.ADD_URI_SAFE_ATTR,Lr):Lo,Yo="ADD_DATA_URI_TAGS"in vt?_($(io),vt.ADD_DATA_URI_TAGS,Lr):io,hn="FORBID_CONTENTS"in vt?_({},vt.FORBID_CONTENTS,Lr):un,ye="FORBID_TAGS"in vt?_({},vt.FORBID_TAGS,Lr):{},er="FORBID_ATTR"in vt?_({},vt.FORBID_ATTR,Lr):{},Pr="USE_PROFILES"in vt?vt.USE_PROFILES:!1,dr=vt.ALLOW_ARIA_ATTR!==!1,ar=vt.ALLOW_DATA_ATTR!==!1,Qe=vt.ALLOW_UNKNOWN_PROTOCOLS||!1,Zt=vt.ALLOW_SELF_CLOSE_IN_ATTR!==!1,Je=vt.SAFE_FOR_TEMPLATES||!1,Ir=vt.SAFE_FOR_XML!==!1,Mr=vt.WHOLE_DOCUMENT||!1,fr=vt.RETURN_DOM||!1,br=vt.RETURN_DOM_FRAGMENT||!1,Cn=vt.RETURN_TRUSTED_TYPE||!1,Br=vt.FORCE_BODY||!1,Fr=vt.SANITIZE_DOM!==!1,Vr=vt.SANITIZE_NAMED_PROPS||!1,wn=vt.KEEP_CONTENT!==!1,Yr=vt.IN_PLACE||!1,ft=vt.ALLOWED_URI_REGEXP||ft,cn=vt.NAMESPACE||Sn,me=vt.CUSTOM_ELEMENT_HANDLING||{},vt.CUSTOM_ELEMENT_HANDLING&&pn(vt.CUSTOM_ELEMENT_HANDLING.tagNameCheck)&&(me.tagNameCheck=vt.CUSTOM_ELEMENT_HANDLING.tagNameCheck),vt.CUSTOM_ELEMENT_HANDLING&&pn(vt.CUSTOM_ELEMENT_HANDLING.attributeNameCheck)&&(me.attributeNameCheck=vt.CUSTOM_ELEMENT_HANDLING.attributeNameCheck),vt.CUSTOM_ELEMENT_HANDLING&&typeof vt.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements=="boolean"&&(me.allowCustomizedBuiltInElements=vt.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements),Je&&(ar=!1),br&&(fr=!0),Pr&&(Vt=_({},s(dt)),yt=[],Pr.html===!0&&(_(Vt,tt),_(yt,jt)),Pr.svg===!0&&(_(Vt,G),_(yt,xt),_(yt,Bt)),Pr.svgFilters===!0&&(_(Vt,Q),_(yt,xt),_(yt,Bt)),Pr.mathMl===!0&&(_(Vt,rt),_(yt,pt),_(yt,Bt))),vt.ADD_TAGS&&(Vt===bt&&(Vt=$(Vt)),_(Vt,vt.ADD_TAGS,Lr)),vt.ADD_ATTR&&(yt===Gt&&(yt=$(yt)),_(yt,vt.ADD_ATTR,Lr)),vt.ADD_URI_SAFE_ATTR&&_(ln,vt.ADD_URI_SAFE_ATTR,Lr),vt.FORBID_CONTENTS&&(hn===un&&(hn=$(hn)),_(hn,vt.FORBID_CONTENTS,Lr)),wn&&(Vt["#text"]=!0),Mr&&_(Vt,["html","head","body"]),Vt.table&&(_(Vt,["tbody"]),delete ye.tbody),I&&I(vt),Kn=vt)},En=_({},["mi","mo","mn","ms","mtext"]),uo=_({},["foreignobject","annotation-xml"]),Do=_({},["title","style","font","a","script"]),Gr=_({},G);_(Gr,Q),_(Gr,ct);var Xo=_({},rt);_(Xo,ht);var ha=function(vt){var te=Et(vt);(!te||!te.tagName)&&(te={namespaceURI:cn,tagName:"template"});var ge=L(vt.tagName),nr=L(te.tagName);return Io[vt.namespaceURI]?vt.namespaceURI===Hr?te.namespaceURI===Sn?ge==="svg":te.namespaceURI===Zn?ge==="svg"&&(nr==="annotation-xml"||En[nr]):!!Gr[ge]:vt.namespaceURI===Zn?te.namespaceURI===Sn?ge==="math":te.namespaceURI===Hr?ge==="math"&&uo[nr]:!!Xo[ge]:vt.namespaceURI===Sn?te.namespaceURI===Hr&&!uo[nr]||te.namespaceURI===Zn&&!En[nr]?!1:!Xo[ge]&&(Do[ge]||!Gr[ge]):!!(Mn==="application/xhtml+xml"&&Io[vt.namespaceURI]):!1},Cr=function(vt){D(Tt.removed,{element:vt});try{vt.parentNode.removeChild(vt)}catch(te){try{vt.outerHTML=Nt}catch(ge){vt.remove()}}},Jn=function(vt,te){try{D(Tt.removed,{attribute:te.getAttributeNode(vt),from:te})}catch(ge){D(Tt.removed,{attribute:null,from:te})}if(te.removeAttribute(vt),vt==="is"&&!yt[vt])if(fr||br)try{Cr(te)}catch(ge){}else try{te.setAttribute(vt,"")}catch(ge){}},Qo=function(vt){var te,ge;if(Br)vt=""+vt;else{var nr=K(vt,/^[\r\n\t ]+/);ge=nr&&nr[0]}Mn==="application/xhtml+xml"&&cn===Sn&&(vt=''+vt+"");var Xr=mt?mt.createHTML(vt):vt;if(cn===Sn)try{te=new Ke().parseFromString(Xr,Mn)}catch(Er){}if(!te||!te.documentElement){te=fe.createDocument(cn,"template",null);try{te.documentElement.innerHTML=ir?Nt:Xr}catch(Er){}}var Dr=te.body||te.documentElement;return vt&&ge&&Dr.insertBefore(Jt.createTextNode(ge),Dr.childNodes[0]||null),cn===Sn?ne.call(te,Mr?"html":"body")[0]:Mr?te.documentElement:Dr},Ur=function(vt){return ce.call(vt.ownerDocument||vt,vt,Ot.SHOW_ELEMENT|Ot.SHOW_COMMENT|Ot.SHOW_TEXT|Ot.SHOW_PROCESSING_INSTRUCTION|Ot.SHOW_CDATA_SECTION,null,!1)},pa=function(vt){return m(vt,Te)&&(typeof vt.nodeName!="string"||typeof vt.textContent!="string"||typeof vt.removeChild!="function"||!m(vt.attributes,ae)||typeof vt.removeAttribute!="function"||typeof vt.setAttribute!="function"||typeof vt.namespaceURI!="string"||typeof vt.insertBefore!="function"||typeof vt.hasChildNodes!="function")},Bo=function(vt){return t(Oe)==="object"?m(vt,Oe):vt&&t(vt)==="object"&&typeof vt.nodeType=="number"&&typeof vt.nodeName=="string"},fn=function(vt,te,ge){Ue[vt]&&P(Ue[vt],function(nr){nr.call(Tt,te,ge,Kn)})},Po=function(vt){var te;if(fn("beforeSanitizeElements",vt,null),pa(vt)||X(/[\u0080-\uFFFF]/,vt.nodeName))return Cr(vt),!0;var ge=Lr(vt.nodeName);if(fn("uponSanitizeElement",vt,{tagName:ge,allowedTags:Vt}),vt.hasChildNodes()&&!Bo(vt.firstElementChild)&&(!Bo(vt.content)||!Bo(vt.content.firstElementChild))&&X(/<[/\w]/g,vt.innerHTML)&&X(/<[/\w]/g,vt.textContent)||ge==="select"&&X(/
TITLE50) recipes += list( - new /datum/stack_recipe("[display_name] fork", /obj/item/weapon/material/kitchen/utensil/fork/plastic, 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE), - new /datum/stack_recipe("[display_name] knife", /obj/item/weapon/material/knife/plastic, 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE), - new /datum/stack_recipe("[display_name] blade", /obj/item/weapon/material/butterflyblade, 6, time = 20, one_per_turf = 0, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE), - new /datum/stack_recipe("[display_name] defense wire", /obj/item/weapon/material/barbedwire, 10, time = 1 MINUTE, one_per_turf = 0, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE) + new /datum/stack_recipe("[display_name] fork", /obj/item/material/kitchen/utensil/fork/plastic, 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE), + new /datum/stack_recipe("[display_name] knife", /obj/item/material/knife/plastic, 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE), + new /datum/stack_recipe("[display_name] blade", /obj/item/material/butterflyblade, 6, time = 20, one_per_turf = 0, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE), + new /datum/stack_recipe("[display_name] defense wire", /obj/item/material/barbedwire, 10, time = 1 MINUTE, one_per_turf = 0, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE) ) /datum/material/proc/get_wall_texture() diff --git a/code/modules/materials/materials/metals/metals_vr.dm b/code/modules/materials/materials/metals/metals_vr.dm index f600b2fe025..547689114a9 100644 --- a/code/modules/materials/materials/metals/metals_vr.dm +++ b/code/modules/materials/materials/metals/metals_vr.dm @@ -1,6 +1,6 @@ /datum/material/durasteel/generate_recipes() . = ..() recipes += list( - new /datum/stack_recipe("durasteel fishing rod", /obj/item/weapon/material/fishing_rod/modern/strong, 2), - new /datum/stack_recipe("whetstone", /obj/item/weapon/whetstone, 2, time = 30), + new /datum/stack_recipe("durasteel fishing rod", /obj/item/material/fishing_rod/modern/strong, 2), + new /datum/stack_recipe("whetstone", /obj/item/whetstone, 2, time = 30), ) diff --git a/code/modules/materials/materials/metals/plasteel.dm b/code/modules/materials/materials/metals/plasteel.dm index fa9e271521e..f4508fa64b8 100644 --- a/code/modules/materials/materials/metals/plasteel.dm +++ b/code/modules/materials/materials/metals/plasteel.dm @@ -19,10 +19,10 @@ recipes += list( new /datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = 1, recycle_material = "[name]"), new /datum/stack_recipe("Metal crate", /obj/structure/closet/crate, 10, time = 50, one_per_turf = 1, recycle_material = "[name]"), - new /datum/stack_recipe("knife grip", /obj/item/weapon/material/butterflyhandle, 4, time = 20, one_per_turf = 0, on_floor = 1, supplied_material = "[name]"), + new /datum/stack_recipe("knife grip", /obj/item/material/butterflyhandle, 4, time = 20, one_per_turf = 0, on_floor = 1, supplied_material = "[name]"), new /datum/stack_recipe("dark floor tile", /obj/item/stack/tile/floor/dark, 1, 4, 20, recycle_material = "[name]"), new /datum/stack_recipe("roller bed", /obj/item/roller, 5, time = 30, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("whetstone", /obj/item/weapon/whetstone, 2, time = 10, recycle_material = "[name]"), + new /datum/stack_recipe("whetstone", /obj/item/whetstone, 2, time = 10, recycle_material = "[name]"), new /datum/stack_recipe("plasteel rebar", /obj/item/stack/material/plasteel/rebar, 1, time = 5, recycle_material = "[name]"), new /datum/stack_recipe("plasteel hull sheet", /obj/item/stack/material/plasteel/hull, 2, 1, 5, time = 20, one_per_turf = 0, on_floor = 1, recycle_material = "[name]"), new /datum/stack_recipe_list("reinforced low walls",list( diff --git a/code/modules/materials/materials/metals/plasteel_vr.dm b/code/modules/materials/materials/metals/plasteel_vr.dm index f3d582213db..742d90fd328 100644 --- a/code/modules/materials/materials/metals/plasteel_vr.dm +++ b/code/modules/materials/materials/metals/plasteel_vr.dm @@ -17,5 +17,5 @@ /datum/material/plastitanium/generate_recipes() ..() recipes += list( - new /datum/stack_recipe("whetstone", /obj/item/weapon/whetstone, 2, time = 20), + new /datum/stack_recipe("whetstone", /obj/item/whetstone, 2, time = 20), ) diff --git a/code/modules/materials/materials/metals/steel.dm b/code/modules/materials/materials/metals/steel.dm index f3a51fa4c44..359c0a04cd1 100644 --- a/code/modules/materials/materials/metals/steel.dm +++ b/code/modules/materials/materials/metals/steel.dm @@ -79,7 +79,7 @@ new /datum/stack_recipe("steel shelves", /obj/structure/table/rack/shelf/steel, 1, one_per_turf = TRUE, time = 5, on_floor = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), new /datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("cannon frame", /obj/item/weapon/cannonframe, 10, time = 15, one_per_turf = 0, on_floor = 0, recycle_material = "[name]"), + new /datum/stack_recipe("cannon frame", /obj/item/cannonframe, 10, time = 15, one_per_turf = 0, on_floor = 0, recycle_material = "[name]"), new /datum/stack_recipe_list("floor tiles", list( new /datum/stack_recipe("regular floor tile", /obj/item/stack/tile/floor, 1, 4, 20, recycle_material = "[name]"), new /datum/stack_recipe("steel hi-grip tile", /obj/item/stack/tile/floor/steelgrip, 1, 4, 20, recycle_material = "[name]"), @@ -144,14 +144,14 @@ //new /datum/stack_recipe("IV drip", /obj/machinery/iv_drip, 4, time = 20, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), //VOREStation Removal new /datum/stack_recipe("medical stand", /obj/structure/medical_stand, 4, time = 20, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), //VOREStation Replacement, new /datum/stack_recipe("conveyor switch", /obj/machinery/conveyor_switch, 2, time = 20, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), - new /datum/stack_recipe("grenade casing", /obj/item/weapon/grenade/chem_grenade, recycle_material = "[name]"), + new /datum/stack_recipe("grenade casing", /obj/item/grenade/chem_grenade, recycle_material = "[name]"), new /datum/stack_recipe("light fixture frame", /obj/item/frame/light, 2, recycle_material = "[name]"), new /datum/stack_recipe("floor light fixture frame", /obj/machinery/light_construct/floortube, 2, recycle_material = "[name]"), new /datum/stack_recipe("small light fixture frame", /obj/item/frame/light/small, 1, recycle_material = "[name]"), new /datum/stack_recipe("floor lamp fixture frame", /obj/machinery/light_construct/flamp, 2, recycle_material = "[name]"), new /datum/stack_recipe("big floor lamp fixture frame", /obj/machinery/light_construct/bigfloorlamp, 3, recycle_material = "[name]"), new /datum/stack_recipe("apc frame", /obj/item/frame/apc, 2, recycle_material = "[name]"), - new /datum/stack_recipe("desk bell", /obj/item/weapon/deskbell, 1, on_floor = 1, supplied_material = "[name]"), + new /datum/stack_recipe("desk bell", /obj/item/deskbell, 1, on_floor = 1, supplied_material = "[name]"), new /datum/stack_recipe("tanning rack", /obj/structure/tanning_rack, 3, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]"), new /datum/stack_recipe("steel hull sheet", /obj/item/stack/material/steel/hull, 2, 1, 5, time = 20, one_per_turf = 0, on_floor = 1, recycle_material = "[name]") ) diff --git a/code/modules/materials/materials/organic/cloth.dm b/code/modules/materials/materials/organic/cloth.dm index 38a8aae2658..9c92e03ed16 100644 --- a/code/modules/materials/materials/organic/cloth.dm +++ b/code/modules/materials/materials/organic/cloth.dm @@ -15,8 +15,8 @@ /datum/material/cloth/generate_recipes() //Vorestation Add - adding some funny cool storage pouches to this so botany can do things other than food recipes = list( - new /datum/stack_recipe("woven net", /obj/item/weapon/material/fishing_net, 10, time = 30 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]"), - new /datum/stack_recipe("bedsheet", /obj/item/weapon/bedsheet, 10, time = 30 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("woven net", /obj/item/material/fishing_net, 10, time = 30 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]"), + new /datum/stack_recipe("bedsheet", /obj/item/bedsheet, 10, time = 30 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("uniform", /obj/item/clothing/under/color/white, 8, time = 15 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("foot wraps", /obj/item/clothing/shoes/footwraps, 2, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("gloves", /obj/item/clothing/gloves/white, 2, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), @@ -28,14 +28,14 @@ new /datum/stack_recipe("kippa", /obj/item/clothing/head/kippa, 3, time = 6 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("scarf", /obj/item/clothing/accessory/scarf/white, 4, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("baggy pants", /obj/item/clothing/under/pants/baggy/white, 8, time = 10 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("belt pouch", /obj/item/weapon/storage/belt/fannypack/white, 25, time = 1 MINUTE, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("pouch, small", /obj/item/weapon/storage/pouch/small, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add - new /datum/stack_recipe("pouch, ammo", /obj/item/weapon/storage/pouch/ammo, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add - new /datum/stack_recipe("pouch, tools", /obj/item/weapon/storage/pouch/eng_tool, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add - new /datum/stack_recipe("pouch, parts", /obj/item/weapon/storage/pouch/eng_parts, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add - new /datum/stack_recipe("pouch, supplies", /obj/item/weapon/storage/pouch/eng_supply, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add - new /datum/stack_recipe("pouch, medical", /obj/item/weapon/storage/pouch/medical, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add - new /datum/stack_recipe("pouch, flare", /obj/item/weapon/storage/pouch/flares, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("belt pouch", /obj/item/storage/belt/fannypack/white, 25, time = 1 MINUTE, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("pouch, small", /obj/item/storage/pouch/small, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("pouch, ammo", /obj/item/storage/pouch/ammo, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("pouch, tools", /obj/item/storage/pouch/eng_tool, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("pouch, parts", /obj/item/storage/pouch/eng_parts, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("pouch, supplies", /obj/item/storage/pouch/eng_supply, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("pouch, medical", /obj/item/storage/pouch/medical, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("pouch, flare", /obj/item/storage/pouch/flares, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add new /datum/stack_recipe("crude bandage", /obj/item/stack/medical/crude_pack, 1, time = 2 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("empty sandbag", /obj/item/stack/emptysandbag, 2, time = 2 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]"), new /datum/stack_recipe("painting canvas (11x11)", /obj/item/canvas, 2, time = 2 SECONDS, pass_stack_color = FALSE, supplied_material = "[name]"), diff --git a/code/modules/materials/materials/organic/leather.dm b/code/modules/materials/materials/organic/leather.dm index 1c46a78bfd5..fe291e4d8d5 100644 --- a/code/modules/materials/materials/organic/leather.dm +++ b/code/modules/materials/materials/organic/leather.dm @@ -14,7 +14,7 @@ /datum/material/leather/generate_recipes() recipes = list( - new /datum/stack_recipe("bedsheet", /obj/item/weapon/bedsheet, 10, time = 30 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("bedsheet", /obj/item/bedsheet, 10, time = 30 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("uniform", /obj/item/clothing/under/color/white, 8, time = 15 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("foot wraps", /obj/item/clothing/shoes/footwraps, 2, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("gloves", /obj/item/clothing/gloves/white, 2, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), @@ -26,16 +26,16 @@ new /datum/stack_recipe("kippa", /obj/item/clothing/head/kippa, 3, time = 6 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("scarf", /obj/item/clothing/accessory/scarf/white, 4, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("baggy pants", /obj/item/clothing/under/pants/baggy/white, 8, time = 10 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("belt pouch", /obj/item/weapon/storage/belt/fannypack/white, 25, time = 1 MINUTE, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("pouch, medium", /obj/item/weapon/storage/pouch, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add - new /datum/stack_recipe("pouch, large", /obj/item/weapon/storage/pouch/large, 15, time = 30 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add - new /datum/stack_recipe("pouch, holster", /obj/item/weapon/storage/pouch/holster, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add - new /datum/stack_recipe("pouch, melee", /obj/item/weapon/storage/pouch/baton, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("belt pouch", /obj/item/storage/belt/fannypack/white, 25, time = 1 MINUTE, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("pouch, medium", /obj/item/storage/pouch, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("pouch, large", /obj/item/storage/pouch/large, 15, time = 30 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("pouch, holster", /obj/item/storage/pouch/holster, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("pouch, melee", /obj/item/storage/pouch/baton, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add new /datum/stack_recipe("crude [display_name] bandage", /obj/item/stack/medical/crude_pack, 1, time = 2 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("[display_name] net", /obj/item/weapon/material/fishing_net, 10, time = 5 SECONDS, supplied_material = "[name]", pass_stack_color = TRUE), + new /datum/stack_recipe("[display_name] net", /obj/item/material/fishing_net, 10, time = 5 SECONDS, supplied_material = "[name]", pass_stack_color = TRUE), new /datum/stack_recipe("[display_name] ring", /obj/item/clothing/gloves/ring/material, 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE), new /datum/stack_recipe("[display_name] bracelet", /obj/item/clothing/accessory/bracelet/material, 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE), - new /datum/stack_recipe("[display_name] armor plate", /obj/item/weapon/material/armor_plating, 1, time = 20, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE), + new /datum/stack_recipe("[display_name] armor plate", /obj/item/material/armor_plating, 1, time = 20, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE), new /datum/stack_recipe("empty sandbag", /obj/item/stack/emptysandbag, 2, time = 2 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]"), - new /datum/stack_recipe("whip", /obj/item/weapon/material/whip, 5, time = 15 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]") + new /datum/stack_recipe("whip", /obj/item/material/whip, 5, time = 15 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]") ) \ No newline at end of file diff --git a/code/modules/materials/materials/organic/resin.dm b/code/modules/materials/materials/organic/resin.dm index 4fe1d15cb9e..6c5cf203090 100644 --- a/code/modules/materials/materials/organic/resin.dm +++ b/code/modules/materials/materials/organic/resin.dm @@ -50,7 +50,7 @@ new /datum/stack_recipe("[display_name] nest", /obj/structure/bed/nest, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE), new /datum/stack_recipe("[display_name] wall girders", /obj/structure/girder/resin, 2, time = 5 SECONDS, one_per_turf = 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE), new /datum/stack_recipe("crude [display_name] bandage", /obj/item/stack/medical/crude_pack, 1, time = 2 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("[display_name] net", /obj/item/weapon/material/fishing_net, 10, time = 5 SECONDS, supplied_material = "[name]", pass_stack_color = TRUE), + new /datum/stack_recipe("[display_name] net", /obj/item/material/fishing_net, 10, time = 5 SECONDS, supplied_material = "[name]", pass_stack_color = TRUE), new /datum/stack_recipe("[display_name] membrane", /obj/structure/alien/membrane, 1, time = 2 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("[display_name] node", /obj/effect/alien/weeds/node, 1, time = 4 SECONDS, recycle_material = "[name]") ) \ No newline at end of file diff --git a/code/modules/materials/materials/organic/wood.dm b/code/modules/materials/materials/organic/wood.dm index 9e893265783..e2f3c0cf9a8 100644 --- a/code/modules/materials/materials/organic/wood.dm +++ b/code/modules/materials/materials/organic/wood.dm @@ -24,30 +24,30 @@ /datum/material/wood/generate_recipes() ..() recipes += list( - new /datum/stack_recipe("oar", /obj/item/weapon/oar, 2, time = 30, supplied_material = "[name]", pass_stack_color = TRUE), + new /datum/stack_recipe("oar", /obj/item/oar, 2, time = 30, supplied_material = "[name]", pass_stack_color = TRUE), new /datum/stack_recipe("boat", /obj/vehicle/boat, 20, time = 10 SECONDS, supplied_material = "[name]", pass_stack_color = TRUE), new /datum/stack_recipe("dragon boat", /obj/vehicle/boat/dragon, 50, time = 30 SECONDS, supplied_material = "[name]", pass_stack_color = TRUE), new /datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("wood circlet", /obj/item/clothing/head/woodcirclet, 1, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("clipboard", /obj/item/weapon/clipboard, 1, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("clipboard", /obj/item/clipboard, 1, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("wooden chair", /obj/structure/bed/chair/wood, 3, time = 10, one_per_turf = 1, on_floor = 1, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("crossbow frame", /obj/item/weapon/crossbowframe, 5, time = 25, one_per_turf = 0, on_floor = 0, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("crossbow frame", /obj/item/crossbowframe, 5, time = 25, one_per_turf = 0, on_floor = 0, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("beehive assembly", /obj/item/beehive_assembly, 4, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("beehive frame", /obj/item/honey_frame, 1, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("book shelf", /obj/structure/bookcase, 5, time = 15, one_per_turf = 1, on_floor = 1, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("wooden shelves", /obj/structure/table/rack/shelf/wood, 1, one_per_turf = TRUE, time = 5, on_floor = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("noticeboard frame", /obj/item/frame/noticeboard, 4, time = 5, one_per_turf = 0, on_floor = 1, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("coilgun stock", /obj/item/weapon/coilgun_assembly, 5, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("crude fishing rod", /obj/item/weapon/material/fishing_rod/built, 8, time = 10 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("coilgun stock", /obj/item/coilgun_assembly, 5, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("crude fishing rod", /obj/item/material/fishing_rod/built, 8, time = 10 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("wooden standup figure", /obj/structure/barricade/cutout, 5, time = 10 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), //VOREStation Add new /datum/stack_recipe("noticeboard", /obj/structure/noticeboard, 1, recycle_material = "[name]"), new /datum/stack_recipe("tanning rack", /obj/structure/tanning_rack, 3, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]"), new /datum/stack_recipe("painting easel", /obj/structure/easel, 5, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]"), new /datum/stack_recipe("painting frame", /obj/item/frame/painting, 5, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]"), new /datum/stack_recipe("roofing tile", /obj/item/stack/tile/roofing, 3, 4, 20, recycle_material = "[name]"), - new /datum/stack_recipe("shovel", /obj/item/weapon/shovel/wood, 2, time = 10, on_floor = TRUE, supplied_material = "[name]") + new /datum/stack_recipe("shovel", /obj/item/shovel/wood, 2, time = 10, on_floor = TRUE, supplied_material = "[name]") ) /datum/material/wood/sif diff --git a/code/modules/materials/materials/plastic.dm b/code/modules/materials/materials/plastic.dm index b31ed2cb736..cbea431e733 100644 --- a/code/modules/materials/materials/plastic.dm +++ b/code/modules/materials/materials/plastic.dm @@ -17,11 +17,11 @@ ..() recipes += list( new /datum/stack_recipe("plastic crate", /obj/structure/closet/crate/plastic, 10, one_per_turf = 1, on_floor = 1, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("plastic bag", /obj/item/weapon/storage/bag/plasticbag, 3, on_floor = 1, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("blood pack", /obj/item/weapon/reagent_containers/blood/empty, 4, on_floor = 0, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("reagent dispenser cartridge (large)", /obj/item/weapon/reagent_containers/chem_disp_cartridge, 5, on_floor=0, pass_stack_color = TRUE, recycle_material = "[name]"), // 500u - new /datum/stack_recipe("reagent dispenser cartridge (med)", /obj/item/weapon/reagent_containers/chem_disp_cartridge/medium, 3, on_floor=0, pass_stack_color = TRUE, recycle_material = "[name]"), // 250u - new /datum/stack_recipe("reagent dispenser cartridge (small)", /obj/item/weapon/reagent_containers/chem_disp_cartridge/small, 1, on_floor=0, pass_stack_color = TRUE, recycle_material = "[name]"), // 100u + new /datum/stack_recipe("plastic bag", /obj/item/storage/bag/plasticbag, 3, on_floor = 1, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("blood pack", /obj/item/reagent_containers/blood/empty, 4, on_floor = 0, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("reagent dispenser cartridge (large)", /obj/item/reagent_containers/chem_disp_cartridge, 5, on_floor=0, pass_stack_color = TRUE, recycle_material = "[name]"), // 500u + new /datum/stack_recipe("reagent dispenser cartridge (med)", /obj/item/reagent_containers/chem_disp_cartridge/medium, 3, on_floor=0, pass_stack_color = TRUE, recycle_material = "[name]"), // 250u + new /datum/stack_recipe("reagent dispenser cartridge (small)", /obj/item/reagent_containers/chem_disp_cartridge/small, 1, on_floor=0, pass_stack_color = TRUE, recycle_material = "[name]"), // 100u new /datum/stack_recipe("white floor tile", /obj/item/stack/tile/floor/white, 1, 4, 20, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("freezer floor tile", /obj/item/stack/tile/floor/freezer, 1, 4, 20, pass_stack_color = TRUE, recycle_material = "[name]"), @@ -50,8 +50,8 @@ new /datum/stack_recipe("shower curtain", /obj/structure/curtain, 4, time = 15, one_per_turf = 1, on_floor = 1, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 4, time = 25, one_per_turf = 1, on_floor = 1, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("water-cooler", /obj/structure/reagent_dispensers/water_cooler, 4, time = 10, one_per_turf = 1, on_floor = 1, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("lampshade", /obj/item/weapon/lampshade, 1, time = 1, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("plastic net", /obj/item/weapon/material/fishing_net, 25, time = 1 MINUTE, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("lampshade", /obj/item/lampshade, 1, time = 1, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("plastic net", /obj/item/material/fishing_net, 25, time = 1 MINUTE, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("plastic fishtank", /obj/item/glass_jar/fish/plastic, 2, time = 30 SECONDS, recycle_material = "[name]"), new /datum/stack_recipe("reagent tubing", /obj/item/stack/hose, 1, 4, 20, pass_stack_color = TRUE, recycle_material = "[name]") ) @@ -79,21 +79,21 @@ /datum/material/cardboard/generate_recipes() ..() recipes += list( - new /datum/stack_recipe("box", /obj/item/weapon/storage/box, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("donut box", /obj/item/weapon/storage/box/donut/empty, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("egg box", /obj/item/weapon/storage/fancy/egg_box, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("light tubes box", /obj/item/weapon/storage/box/lights/tubes, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("light bulbs box", /obj/item/weapon/storage/box/lights/bulbs, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("mouse traps box", /obj/item/weapon/storage/box/mousetraps, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("box", /obj/item/storage/box, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("donut box", /obj/item/storage/box/donut/empty, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("egg box", /obj/item/storage/fancy/egg_box, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("light tubes box", /obj/item/storage/box/lights/tubes, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("light bulbs box", /obj/item/storage/box/lights/bulbs, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("mouse traps box", /obj/item/storage/box/mousetraps, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("pizza box", /obj/item/pizzabox, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe_list("folders",list( - new /datum/stack_recipe("blue folder", /obj/item/weapon/folder/blue, recycle_material = "[name]"), - new /datum/stack_recipe("grey folder", /obj/item/weapon/folder, recycle_material = "[name]"), - new /datum/stack_recipe("red folder", /obj/item/weapon/folder/red, recycle_material = "[name]"), - new /datum/stack_recipe("white folder", /obj/item/weapon/folder/white, recycle_material = "[name]"), - new /datum/stack_recipe("yellow folder", /obj/item/weapon/folder/yellow, recycle_material = "[name]") + new /datum/stack_recipe("blue folder", /obj/item/folder/blue, recycle_material = "[name]"), + new /datum/stack_recipe("grey folder", /obj/item/folder, recycle_material = "[name]"), + new /datum/stack_recipe("red folder", /obj/item/folder/red, recycle_material = "[name]"), + new /datum/stack_recipe("white folder", /obj/item/folder/white, recycle_material = "[name]"), + new /datum/stack_recipe("yellow folder", /obj/item/folder/yellow, recycle_material = "[name]") )) ) diff --git a/code/modules/materials/materials/snow.dm b/code/modules/materials/materials/snow.dm index f93941335e2..01e02296139 100644 --- a/code/modules/materials/materials/snow.dm +++ b/code/modules/materials/materials/snow.dm @@ -18,7 +18,7 @@ /datum/material/snow/generate_recipes() recipes = list( - new /datum/stack_recipe("snowball", /obj/item/weapon/material/snow/snowball, 1, time = 10, recycle_material = "[name]"), + new /datum/stack_recipe("snowball", /obj/item/material/snow/snowball, 1, time = 10, recycle_material = "[name]"), new /datum/stack_recipe("snow brick", /obj/item/stack/material/snowbrick, 2, time = 10, recycle_material = "[name]"), new /datum/stack_recipe("snowman", /obj/structure/snowman, 2, time = 15, recycle_material = "[name]"), new /datum/stack_recipe("snow robot", /obj/structure/snowman/borg, 2, time = 10, recycle_material = "[name]"), @@ -48,10 +48,10 @@ recipes = list( new /datum/stack_recipe("[display_name] door", /obj/structure/simple_door, 10, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"), new /datum/stack_recipe("[display_name] barricade", /obj/structure/barricade, 5, time = 50, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"), - new /datum/stack_recipe("[display_name] stool", /obj/item/weapon/stool, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"), + new /datum/stack_recipe("[display_name] stool", /obj/item/stool, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"), new /datum/stack_recipe("[display_name] chair", /obj/structure/bed/chair, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"), new /datum/stack_recipe("[display_name] bed", /obj/structure/bed, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"), new /datum/stack_recipe("[display_name] double bed", /obj/structure/bed/double, 4, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"), new /datum/stack_recipe("[display_name] wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"), - new /datum/stack_recipe("[display_name] ashtray", /obj/item/weapon/material/ashtray, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]") + new /datum/stack_recipe("[display_name] ashtray", /obj/item/material/ashtray, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]") ) \ No newline at end of file diff --git a/code/modules/materials/sheets/metals/rods.dm b/code/modules/materials/sheets/metals/rods.dm index dbb30c19d9d..958855e178a 100644 --- a/code/modules/materials/sheets/metals/rods.dm +++ b/code/modules/materials/sheets/metals/rods.dm @@ -44,7 +44,7 @@ var/global/list/datum/stack_recipe/rods_recipes = list( \ /obj/item/stack/rods/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(get_amount() < 2) to_chat(user, "You need at least two rods to do this.") @@ -63,7 +63,7 @@ var/global/list/datum/stack_recipe/rods_recipes = list( \ user.put_in_hands(new_item) return - if (istype(W, /obj/item/weapon/tape_roll)) + if (istype(W, /obj/item/tape_roll)) var/obj/item/stack/medical/splint/ghetto/new_splint = new(get_turf(user)) new_splint.add_fingerprint(user) diff --git a/code/modules/materials/sheets/organic/animal_products.dm b/code/modules/materials/sheets/organic/animal_products.dm index 4a0c9cd7bbb..ac747ecff54 100644 --- a/code/modules/materials/sheets/organic/animal_products.dm +++ b/code/modules/materials/sheets/organic/animal_products.dm @@ -60,7 +60,7 @@ /datum/material/fur/generate_recipes() recipes = list( new /datum/stack_recipe("duster", /obj/item/clothing/suit/storage/duster/craftable, 10, time = 15 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("bedsheet", /obj/item/weapon/bedsheet/craftable, 10, time = 30 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("bedsheet", /obj/item/bedsheet/craftable, 10, time = 30 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("jumpsuit", /obj/item/clothing/under/color/white/craftable, 8, time = 15 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("foot wraps", /obj/item/clothing/shoes/footwraps/craftable, 2, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("gloves", /obj/item/clothing/gloves/white/craftable, 2, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), @@ -72,18 +72,18 @@ new /datum/stack_recipe("kippa", /obj/item/clothing/head/kippa/craftable, 3, time = 6 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("scarf", /obj/item/clothing/accessory/scarf/white/craftable, 4, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("baggy pants", /obj/item/clothing/under/pants/baggy/white/craftable, 8, time = 10 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("belt pouch", /obj/item/weapon/storage/belt/fannypack/white/craftable, 25, time = 1 MINUTE, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("pouch, small", /obj/item/weapon/storage/pouch/small, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add - new /datum/stack_recipe("pouch, ammo", /obj/item/weapon/storage/pouch/ammo, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add - new /datum/stack_recipe("pouch, tools", /obj/item/weapon/storage/pouch/eng_tool, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add - new /datum/stack_recipe("pouch, parts", /obj/item/weapon/storage/pouch/eng_parts, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add - new /datum/stack_recipe("pouch, supplies", /obj/item/weapon/storage/pouch/eng_supply, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add - new /datum/stack_recipe("pouch, medical", /obj/item/weapon/storage/pouch/medical, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add - new /datum/stack_recipe("pouch, flare", /obj/item/weapon/storage/pouch/flares, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("belt pouch", /obj/item/storage/belt/fannypack/white/craftable, 25, time = 1 MINUTE, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("pouch, small", /obj/item/storage/pouch/small, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("pouch, ammo", /obj/item/storage/pouch/ammo, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("pouch, tools", /obj/item/storage/pouch/eng_tool, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("pouch, parts", /obj/item/storage/pouch/eng_parts, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("pouch, supplies", /obj/item/storage/pouch/eng_supply, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("pouch, medical", /obj/item/storage/pouch/medical, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add + new /datum/stack_recipe("pouch, flare", /obj/item/storage/pouch/flares, 10, time = 20 SECONDS, pass_stack_color = FALSE, recycle_material = "[name]"), //vorestation Add new /datum/stack_recipe("crude bandage", /obj/item/stack/medical/crude_pack, 1, time = 2 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("empty sandbag", /obj/item/stack/emptysandbag, 2, time = 2 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]"), - new /datum/stack_recipe("satchel", /obj/item/weapon/storage/backpack/satchel/craftable, 30, time = 1 MINUTE, pass_stack_color = TRUE, recycle_material = "[name]"), - new /datum/stack_recipe("backpack", /obj/item/weapon/storage/backpack/craftable, 30, time = 1 MINUTE, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("satchel", /obj/item/storage/backpack/satchel/craftable, 30, time = 1 MINUTE, pass_stack_color = TRUE, recycle_material = "[name]"), + new /datum/stack_recipe("backpack", /obj/item/storage/backpack/craftable, 30, time = 1 MINUTE, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("cloak", /obj/item/clothing/accessory/poncho/roles/cloak/custom, 10, time = 15 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("teshari cloak", /obj/item/clothing/under/teshari/smock/white/craftable, 10, time = 15 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), new /datum/stack_recipe("teshari beltcloak", /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_white/craftable, 10, time = 15 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"), @@ -111,7 +111,7 @@ /obj/item/clothing/suit/storage/duster/craftable name = "handmade duster" -/obj/item/weapon/bedsheet/craftable +/obj/item/bedsheet/craftable name = "handmade bedsheet" /obj/item/clothing/under/color/white/craftable name = "handmade jumpsuit" @@ -131,13 +131,13 @@ name = "handmade scarf" /obj/item/clothing/under/pants/baggy/white/craftable name = "handmade pants" -/obj/item/weapon/storage/belt/fannypack/white/craftable +/obj/item/storage/belt/fannypack/white/craftable name = "handmade fannypack" -/obj/item/weapon/storage/backpack/satchel/craftable +/obj/item/storage/backpack/satchel/craftable name = "handmade satchel" icon_state = "satchel_white" desc = "A handmade satchel, made for holding your things!" -/obj/item/weapon/storage/backpack/craftable +/obj/item/storage/backpack/craftable name = "handmade backpack" icon_state = "backpack_white" /obj/item/clothing/under/teshari/smock/white/craftable diff --git a/code/modules/materials/sheets/organic/tanning/hide.dm b/code/modules/materials/sheets/organic/tanning/hide.dm index 5f61873537e..a7cbf4b260b 100644 --- a/code/modules/materials/sheets/organic/tanning/hide.dm +++ b/code/modules/materials/sheets/organic/tanning/hide.dm @@ -15,7 +15,7 @@ . += description_info //Step one - dehairing. -/obj/item/stack/animalhide/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/stack/animalhide/attackby(obj/item/W as obj, mob/user as mob) if(has_edge(W) || is_sharp(W)) //visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message) user.visible_message("\The [user] starts cutting hair off \the [src]", "You start cutting the hair off \the [src]", "You hear the sound of a knife rubbing against flesh") diff --git a/code/modules/media/juke_remote.dm b/code/modules/media/juke_remote.dm index 416db7a792e..41c550aec4d 100644 --- a/code/modules/media/juke_remote.dm +++ b/code/modules/media/juke_remote.dm @@ -1,4 +1,4 @@ -/obj/item/device/juke_remote +/obj/item/juke_remote name = "\improper BoomTown cordless speaker" desc = "Once paired with a jukebox, this speaker can relay the tunes elsewhere!" @@ -12,12 +12,12 @@ var/area/our_area /* -/obj/item/device/juke_remote/Initialize() +/obj/item/juke_remote/Initialize() . = ..() flags |= NOBLUDGEON */ // Pairing -/obj/item/device/juke_remote/proc/pair_juke(obj/machinery/media/jukebox/juke, mob/user) +/obj/item/juke_remote/proc/pair_juke(obj/machinery/media/jukebox/juke, mob/user) if(paired_juke) to_chat(user, "The [src] is already paired to [paired_juke == juke ? "that" : "a different"] jukebox.") return @@ -26,7 +26,7 @@ to_chat(user, "You pair the [src] to the [juke].") icon_state = "[initial(icon_state)]_ready" -/obj/item/device/juke_remote/proc/unpair_juke(mob/user) +/obj/item/juke_remote/proc/unpair_juke(mob/user) if(!paired_juke) to_chat(user, "The [src] isn't paired to anything.") return @@ -38,30 +38,30 @@ to_chat(user, "You unpair the [src].") icon_state = "[initial(icon_state)]" -/obj/item/device/juke_remote/afterattack(atom/target, mob/user, proximity_flag, click_parameters) +/obj/item/juke_remote/afterattack(atom/target, mob/user, proximity_flag, click_parameters) if(istype(target, /obj/machinery/media/jukebox)) pair_juke(target, user) return return ..() -/obj/item/device/juke_remote/verb/reset() +/obj/item/juke_remote/verb/reset() set name = "Reset Pairing" set desc = "Unpair this speaker from a jukebox." unpair_juke(usr) // Deploying -/obj/item/device/juke_remote/Moved(atom/old_loc, direction, forced) +/obj/item/juke_remote/Moved(atom/old_loc, direction, forced) . = ..() if(paired_juke && !anchored && isturf(loc)) anchor() -/obj/item/device/juke_remote/attack_hand(mob/living/user) +/obj/item/juke_remote/attack_hand(mob/living/user) if(anchored) unanchor() return ..() -/obj/item/device/juke_remote/proc/anchor() +/obj/item/juke_remote/proc/anchor() if(anchored) return anchored = TRUE @@ -72,7 +72,7 @@ else icon_state = "[initial(icon_state)]" -/obj/item/device/juke_remote/proc/unanchor() +/obj/item/juke_remote/proc/unanchor() detach_area() anchored = FALSE visible_message("[src] detaches from it's mounting surface, able to be moved once again.", runemessage = "clunk") @@ -82,7 +82,7 @@ icon_state = "[initial(icon_state)]" // Area handling -/obj/item/device/juke_remote/proc/attach_area() +/obj/item/juke_remote/proc/attach_area() var/area/A = get_area(src) if(!A || !paired_juke) error("Jukebox remote at [x],[y],[z] without paired juke tried to bind to an area.") @@ -94,7 +94,7 @@ update_music() return TRUE -/obj/item/device/juke_remote/proc/detach_area() +/obj/item/juke_remote/proc/detach_area() if(!our_area || (paired_juke && our_area.media_source != paired_juke)) return our_area.media_source = null @@ -102,7 +102,7 @@ our_area = null // Music handling -/obj/item/device/juke_remote/proc/update_music() +/obj/item/juke_remote/proc/update_music() if(!our_area || !paired_juke) return // Send update to clients. diff --git a/code/modules/media/walkpod.dm b/code/modules/media/walkpod.dm index 3ef0f046b63..6704fe7a9e1 100644 --- a/code/modules/media/walkpod.dm +++ b/code/modules/media/walkpod.dm @@ -1,7 +1,7 @@ // Mostly a jukebox copy-paste, given the vastly different paths though it seemed worth it. // Would rather not have a bunch of /machinery baggage on our portable music player. -/obj/item/device/walkpod +/obj/item/walkpod name = "\improper PodZu music player" desc = "Portable music player! For when you need to ignore the rest of the world, there's only one choice: PodZu." description_fluff = "A prestigious set: The ZuMan music player, and the HeadPods headphones, both 90th anniversary releases! Together they form the PodZu Music Player, famous in the local galactic cluster for pumping sick beats directly into your head." @@ -20,17 +20,17 @@ var/media_url = "" var/media_start_time - var/obj/item/device/headpods/deployed_headpods + var/obj/item/headpods/deployed_headpods w_class = ITEMSIZE_COST_SMALL slot_flags = SLOT_BELT -/obj/item/device/walkpod/Destroy() +/obj/item/walkpod/Destroy() remove_listener() return ..() // Icon -/obj/item/device/walkpod/update_icon() +/obj/item/walkpod/update_icon() if(listener) if(deployed_headpods) icon_state = "zuman_on" @@ -43,12 +43,12 @@ icon_state = "[initial(icon_state)]" // Listener handling -/obj/item/device/walkpod/proc/check_listener() +/obj/item/walkpod/proc/check_listener() if(loc == listener) return TRUE return FALSE -/obj/item/device/walkpod/proc/remove_listener() +/obj/item/walkpod/proc/remove_listener() if(playing) StopPlaying() STOP_PROCESSING(SSobj, src) @@ -58,7 +58,7 @@ listener = null update_icon() -/obj/item/device/walkpod/proc/set_listener(mob/living/L) +/obj/item/walkpod/proc/set_listener(mob/living/L) if(listener) remove_listener() listener = L @@ -66,16 +66,16 @@ to_chat(L, "You put the [src]'s headphones on and power it up, preparing to listen to some sick tunes.") update_icon() -/obj/item/device/walkpod/proc/update_music() +/obj/item/walkpod/proc/update_music() listener?.force_music(media_url, media_start_time, volume) // Calling this with "" url (when we aren't playing) helpfully disables forced music -/obj/item/device/walkpod/AltClick(mob/living/L) +/obj/item/walkpod/AltClick(mob/living/L) if(L == listener && check_listener()) tgui_interact(L) else if(loc == L) // at least they're holding it to_chat(L, "Turn on the [src] first.") -/obj/item/device/walkpod/attack_self(mob/living/L) +/obj/item/walkpod/attack_self(mob/living/L) if(!istype(L) || loc != L) return if(!listener) @@ -83,7 +83,7 @@ tgui_interact(L) // Process ticks to ensure our listener remains valid and we do music-ing -/obj/item/device/walkpod/process() +/obj/item/walkpod/process() if(!check_headpods()) restore_headpods() if(!check_listener()) @@ -116,7 +116,7 @@ start_stop_song() // Track/music internals -/obj/item/device/walkpod/proc/start_stop_song() +/obj/item/walkpod/proc/start_stop_song() if(current_track && playing) media_url = current_track.url media_start_time = world.time @@ -126,11 +126,11 @@ media_start_time = 0 update_music() -/obj/item/device/walkpod/proc/StopPlaying() +/obj/item/walkpod/proc/StopPlaying() playing = 0 start_stop_song() -/obj/item/device/walkpod/proc/StartPlaying() +/obj/item/walkpod/proc/StartPlaying() if(!current_track) return playing = 1 @@ -138,7 +138,7 @@ updateDialog() // Advance to the next track - Don't start playing it unless we were already playing -/obj/item/device/walkpod/proc/NextTrack() +/obj/item/walkpod/proc/NextTrack() var/list/tracks = getTracksList() if(!tracks.len) return var/curTrackIndex = max(1, tracks.Find(current_track)) @@ -149,7 +149,7 @@ updateDialog() // Unadvance to the notnext track - Don't start playing it unless we were already playing -/obj/item/device/walkpod/proc/PrevTrack() +/obj/item/walkpod/proc/PrevTrack() var/list/tracks = getTracksList() if(!tracks.len) return var/curTrackIndex = max(1, tracks.Find(current_track)) @@ -160,16 +160,16 @@ updateDialog() // UI -/obj/item/device/walkpod/proc/getTracksList() +/obj/item/walkpod/proc/getTracksList() return SSmedia_tracks.jukebox_tracks -/obj/item/device/walkpod/tgui_interact(mob/user, datum/tgui/ui) +/obj/item/walkpod/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Jukebox", "PodZu Music Player") ui.open() -/obj/item/device/walkpod/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) +/obj/item/walkpod/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = ..() data["playing"] = playing @@ -191,7 +191,7 @@ return data -/obj/item/device/walkpod/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) +/obj/item/walkpod/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) if(..()) return TRUE @@ -222,7 +222,7 @@ return TRUE // Silly verb -/obj/item/device/walkpod/verb/take_headpods() +/obj/item/walkpod/verb/take_headpods() set name = "Take HeadPods" set desc = "Grab the pair of HeadPods." @@ -236,13 +236,13 @@ L.put_in_any_hand_if_possible(deployed_headpods) update_icon() -/obj/item/device/walkpod/attackby(obj/item/W, mob/user) +/obj/item/walkpod/attackby(obj/item/W, mob/user) if(W == deployed_headpods) restore_headpods(user) return return ..() -/obj/item/device/walkpod/proc/restore_headpods(mob/living/potential_holder) +/obj/item/walkpod/proc/restore_headpods(mob/living/potential_holder) if(!deployed_headpods) return @@ -254,12 +254,12 @@ qdel_null(deployed_headpods) update_icon() -/obj/item/device/walkpod/proc/check_headpods() +/obj/item/walkpod/proc/check_headpods() if(deployed_headpods && deployed_headpods.loc != loc) return FALSE return TRUE -/obj/item/device/headpods +/obj/item/headpods name = "\improper pair of HeadPods" desc = "Portable listening in Hi-Fi!" icon = 'icons/obj/device_vr.dmi' diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index f0ac7c002e2..f8e88dd8a5f 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -24,30 +24,30 @@ var/loot = rand(1, 100) switch(loot) if(1 to 5) // Common things go, 5% - new/obj/item/weapon/reagent_containers/food/drinks/bottle/rum(src) - new/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey(src) - new/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus(src) - new/obj/item/weapon/flame/lighter/zippo(src) + new/obj/item/reagent_containers/food/drinks/bottle/rum(src) + new/obj/item/reagent_containers/food/drinks/bottle/whiskey(src) + new/obj/item/reagent_containers/food/snacks/grown/ambrosiadeus(src) + new/obj/item/flame/lighter/zippo(src) if(6 to 10) - new/obj/item/weapon/pickaxe/advdrill(src) - new/obj/item/device/taperecorder(src) + new/obj/item/pickaxe/advdrill(src) + new/obj/item/taperecorder(src) new/obj/item/clothing/suit/space(src) new/obj/item/clothing/head/helmet/space(src) if(11 to 15) - new/obj/item/weapon/reagent_containers/glass/beaker/bluespace(src) + new/obj/item/reagent_containers/glass/beaker/bluespace(src) if(16 to 20) for(var/i = 0, i < 10, i++) - new/obj/item/weapon/ore/diamond(src) + new/obj/item/ore/diamond(src) if(21 to 25) for(var/i = 0, i < 3, i++) new/obj/machinery/portable_atmospherics/hydroponics(src) if(26 to 30) for(var/i = 0, i < 3, i++) - new/obj/item/weapon/reagent_containers/glass/beaker/noreact(src) + new/obj/item/reagent_containers/glass/beaker/noreact(src) if(31 to 35) spawn_money(rand(300,800), src) if(36 to 40) - new/obj/item/weapon/melee/baton(src) + new/obj/item/melee/baton(src) if(41 to 45) new/obj/item/clothing/under/shorts/red(src) new/obj/item/clothing/under/shorts/blue(src) @@ -56,7 +56,7 @@ for(var/i = 0, i < 7, i++) new/obj/item/clothing/accessory/tie/horrible(src) if(51 to 52) // Uncommon, 2% each - new/obj/item/weapon/melee/classic_baton(src) + new/obj/item/melee/classic_baton(src) if(53 to 54) new/obj/item/latexballon(src) if(55 to 56) @@ -65,36 +65,36 @@ if(57 to 58) new/obj/item/toy/syndicateballoon(src) if(59 to 60) - new/obj/item/weapon/rig/industrial(src) + new/obj/item/rig/industrial(src) if(61 to 62) for(var/i = 0, i < 12, ++i) new/obj/item/clothing/head/kitty(src) if(63 to 64) var/t = rand(4,7) for(var/i = 0, i < t, ++i) - var/newcoin = pick(/obj/item/weapon/coin/silver, /obj/item/weapon/coin/silver, /obj/item/weapon/coin/silver, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/gold, /obj/item/weapon/coin/diamond, /obj/item/weapon/coin/phoron, /obj/item/weapon/coin/uranium, /obj/item/weapon/coin/platinum) + var/newcoin = pick(/obj/item/coin/silver, /obj/item/coin/silver, /obj/item/coin/silver, /obj/item/coin/iron, /obj/item/coin/iron, /obj/item/coin/iron, /obj/item/coin/gold, /obj/item/coin/diamond, /obj/item/coin/phoron, /obj/item/coin/uranium, /obj/item/coin/platinum) new newcoin(src) if(65 to 66) new/obj/item/clothing/suit/ianshirt(src) if(67 to 68) var/t = rand(4,7) for(var/i = 0, i < t, ++i) - var/newitem = pick(subtypesof(/obj/item/weapon/stock_parts) - /obj/item/weapon/stock_parts/subspace) + var/newitem = pick(subtypesof(/obj/item/stock_parts) - /obj/item/stock_parts/subspace) new newitem(src) if(69 to 70) - new/obj/item/weapon/pickaxe/silver(src) + new/obj/item/pickaxe/silver(src) if(71 to 72) - new/obj/item/weapon/pickaxe/drill(src) + new/obj/item/pickaxe/drill(src) if(73 to 74) - new/obj/item/weapon/pickaxe/jackhammer(src) + new/obj/item/pickaxe/jackhammer(src) if(75 to 76) - new/obj/item/weapon/pickaxe/diamond(src) + new/obj/item/pickaxe/diamond(src) if(77 to 78) - new/obj/item/weapon/pickaxe/diamonddrill(src) + new/obj/item/pickaxe/diamonddrill(src) if(79 to 80) - new/obj/item/weapon/pickaxe/gold(src) + new/obj/item/pickaxe/gold(src) if(81 to 82) - new/obj/item/weapon/pickaxe/plasmacutter(src) + new/obj/item/pickaxe/plasmacutter(src) if(83 to 84) new/obj/item/toy/katana(src) if(85 to 86) @@ -108,42 +108,42 @@ if(90) new/obj/item/organ/internal/heart(src) if(91) - new/obj/item/device/soulstone(src) + new/obj/item/soulstone(src) if(92) - new/obj/item/weapon/material/sword/katana(src) + new/obj/item/material/sword/katana(src) if(93) - new/obj/item/weapon/dnainjector/xraymut(src) // Probably the least OP + new/obj/item/dnainjector/xraymut(src) // Probably the least OP if(94) // Why the hell not - new/obj/item/weapon/storage/backpack/clown(src) + new/obj/item/storage/backpack/clown(src) new/obj/item/clothing/under/rank/clown(src) new/obj/item/clothing/shoes/clown_shoes(src) - new/obj/item/device/pda/clown(src) + new/obj/item/pda/clown(src) new/obj/item/clothing/mask/gas/clown_hat(src) - new/obj/item/weapon/bikehorn(src) - //new/obj/item/weapon/stamp/clown(src) I'd add it, but only clowns can use it - new/obj/item/weapon/pen/crayon/rainbow(src) - new/obj/item/weapon/reagent_containers/spray/waterflower(src) + new/obj/item/bikehorn(src) + //new/obj/item/stamp/clown(src) I'd add it, but only clowns can use it + new/obj/item/pen/crayon/rainbow(src) + new/obj/item/reagent_containers/spray/waterflower(src) if(95) new/obj/item/clothing/under/mime(src) new/obj/item/clothing/shoes/black(src) - new/obj/item/device/pda/mime(src) + new/obj/item/pda/mime(src) new/obj/item/clothing/gloves/white(src) new/obj/item/clothing/mask/gas/mime(src) new/obj/item/clothing/head/beret(src) new/obj/item/clothing/suit/suspenders(src) - new/obj/item/weapon/pen/crayon/mime(src) - new/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(src) + new/obj/item/pen/crayon/mime(src) + new/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(src) if(96) - new/obj/item/weapon/vampiric(src) + new/obj/item/vampiric(src) if(97) - new/obj/item/weapon/archaeological_find(src) + new/obj/item/archaeological_find(src) if(98) - new/obj/item/weapon/melee/energy/sword(src) + new/obj/item/melee/energy/sword(src) if(99) - new/obj/item/weapon/storage/belt/champion(src) + new/obj/item/storage/belt/champion(src) new/obj/item/clothing/mask/luchador(src) if(100) - new/obj/item/device/personal_shield_generator/belt/mining/loaded(src) + new/obj/item/personal_shield_generator/belt/mining/loaded(src) vorestation edit end */ @@ -197,9 +197,9 @@ vorestation edit end */ if(guesschar != code[i]) . = 0 -/obj/structure/closet/crate/secure/loot/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/closet/crate/secure/loot/attackby(obj/item/W as obj, mob/user as mob) if(locked) - if (istype(W, /obj/item/device/multitool)) // Greetings Urist McProfessor, how about a nice game of cows and bulls? + if (istype(W, /obj/item/multitool)) // Greetings Urist McProfessor, how about a nice game of cows and bulls? to_chat(user, "DECA-CODE LOCK ANALYSIS:") if (attempts == 1) to_chat(user, "* Anti-Tamper system will activate on the next failed access attempt.") diff --git a/code/modules/mining/abandonedcrates_vr.dm b/code/modules/mining/abandonedcrates_vr.dm index 56d05c9947f..e57c911f408 100644 --- a/code/modules/mining/abandonedcrates_vr.dm +++ b/code/modules/mining/abandonedcrates_vr.dm @@ -7,101 +7,101 @@ //pick a thing to add to the crate - the format is "list(filepath, value) = weight," var/choice = list() choice = pickweight(list( - list(pick(/obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/hydrogen, - /obj/item/weapon/ore/verdantium, - /obj/item/weapon/ore/uranium), 1) = 10, - list(pick(subtypesof(/obj/item/weapon/coin)), 2) = 10, - list(/obj/item/weapon/spacecash/c500, 4) = 5, - list(/obj/item/weapon/spacecash/c200, 2) = 10, - list(/obj/item/weapon/spacecash/c100, 1) = 10, - list(/obj/item/weapon/spacecash/c50, 1) = 10, - list(/obj/item/weapon/spacecash/c20, 1) = 10, - list(pick(subtypesof(/obj/item/weapon/reagent_containers/food/drinks/bottle/) - /obj/item/weapon/reagent_containers/food/drinks/bottle/small), 1) = 5, - list(/obj/item/weapon/storage/backpack/dufflebag/cratebooze,5) = 5, - list(/obj/item/weapon/storage/backpack/dufflebag/cratedrills, 5) = 5, - list(/obj/item/weapon/reagent_containers/glass/beaker/bluespace, 3) = 5, - list(/obj/item/weapon/reagent_containers/glass/beaker/noreact, 3) = 5, - list(/obj/item/weapon/melee/baton, 5) = 4, - list(pick(subtypesof(/obj/item/weapon/storage/mre)), 2) = 3, + list(pick(/obj/item/ore/diamond, + /obj/item/ore/osmium, + /obj/item/ore/hydrogen, + /obj/item/ore/verdantium, + /obj/item/ore/uranium), 1) = 10, + list(pick(subtypesof(/obj/item/coin)), 2) = 10, + list(/obj/item/spacecash/c500, 4) = 5, + list(/obj/item/spacecash/c200, 2) = 10, + list(/obj/item/spacecash/c100, 1) = 10, + list(/obj/item/spacecash/c50, 1) = 10, + list(/obj/item/spacecash/c20, 1) = 10, + list(pick(subtypesof(/obj/item/reagent_containers/food/drinks/bottle/) - /obj/item/reagent_containers/food/drinks/bottle/small), 1) = 5, + list(/obj/item/storage/backpack/dufflebag/cratebooze,5) = 5, + list(/obj/item/storage/backpack/dufflebag/cratedrills, 5) = 5, + list(/obj/item/reagent_containers/glass/beaker/bluespace, 3) = 5, + list(/obj/item/reagent_containers/glass/beaker/noreact, 3) = 5, + list(/obj/item/melee/baton, 5) = 4, + list(pick(subtypesof(/obj/item/storage/mre)), 2) = 3, list(/obj/item/seeds/random, 2) = 3, list(/obj/item/clothing/under/chameleon, 5) = 3, - list(/obj/item/weapon/melee/classic_baton, 6) = 3, - list(/obj/item/weapon/rig/industrial, 6) = 3, - list(/obj/item/device/multitool/hacktool, 5) = 3, + list(/obj/item/melee/classic_baton, 6) = 3, + list(/obj/item/rig/industrial, 6) = 3, + list(/obj/item/multitool/hacktool, 5) = 3, list(/obj/item/toy/katana, 1) = 2, list(/obj/item/clothing/head/kitty, 1) = 2, - list(pick(subtypesof(/obj/item/weapon/soap)), 1) = 2, + list(pick(subtypesof(/obj/item/soap)), 1) = 2, list(/obj/item/clothing/under/shorts/red, 1) = 2, list(/obj/item/clothing/under/shorts/blue, 1) = 2, list(/obj/item/clothing/accessory/tie/horrible, 1) = 2, - list(pick(subtypesof(/obj/item/weapon/stock_parts) - /obj/item/weapon/stock_parts/subspace), 2) = 3, + list(pick(subtypesof(/obj/item/stock_parts) - /obj/item/stock_parts/subspace), 2) = 3, list(/obj/item/latexballon, 2) = 2, list(/obj/item/toy/syndicateballoon, 3) = 2, list(/obj/item/clothing/suit/ianshirt, 3) = 2, list(/obj/item/clothing/head/bearpelt, 4) = 2, - //list(/obj/item/weapon/archaeological_find, 3) = 2, //ChompREMOVE - causes runtimes + //list(/obj/item/archaeological_find, 3) = 2, //ChompREMOVE - causes runtimes list(pick(subtypesof(/obj/item/toy/mecha)), 4) = 2, list(pick(subtypesof(/obj/item/toy/figure)), 4) = 2, list(pick(subtypesof(/obj/item/toy/plushie)), 4) = 2, - list(pick(subtypesof(/obj/item/weapon/storage/firstaid)), 4) = 2, - list(/obj/item/weapon/pickaxe/silver, 3) = 2, - list(/obj/item/weapon/pickaxe/drill, 3) = 2, - list(/obj/item/weapon/pickaxe/jackhammer, 4) = 2, - list(/obj/item/weapon/pickaxe/gold, 4) = 2, - list(/obj/item/weapon/pickaxe/diamond, 5) = 2, - list(/obj/item/weapon/pickaxe/diamonddrill, 6) = 2, - list(/obj/item/weapon/pickaxe/plasmacutter, 5) = 2, - list(/obj/item/device/soulstone, 5) = 2, - list(/obj/item/weapon/material/sword/katana, 5) = 2, - list(/obj/item/weapon/storage/belt/utility/chief/full, 8) = 2, - list(/obj/item/device/personal_shield_generator/belt/mining/loaded, 6) = 2, - list(pick(subtypesof(/obj/item/weapon/melee/energy/sword) - /obj/item/weapon/melee/energy/sword/charge), 6) = 2, - list(pick(/obj/item/weapon/dnainjector/xraymut, /obj/item/weapon/dnainjector/nobreath, /obj/item/weapon/dnainjector/insulation), 6) = 2, - list(/obj/item/weapon/gun/energy/netgun, 7) = 2, - list(pick(prob(300);/obj/item/weapon/gun/energy/mouseray, - prob(50);/obj/item/weapon/gun/energy/mouseray/corgi, - prob(50);/obj/item/weapon/gun/energy/mouseray/woof, - prob(50);/obj/item/weapon/gun/energy/mouseray/cat, - prob(50);/obj/item/weapon/gun/energy/mouseray/chicken, - prob(50);/obj/item/weapon/gun/energy/mouseray/lizard, - prob(50);/obj/item/weapon/gun/energy/mouseray/rabbit, - prob(50);/obj/item/weapon/gun/energy/mouseray/fennec, - prob(5);/obj/item/weapon/gun/energy/mouseray/monkey, - prob(5);/obj/item/weapon/gun/energy/mouseray/wolpin, - prob(5);/obj/item/weapon/gun/energy/mouseray/otie, - prob(5);/obj/item/weapon/gun/energy/mouseray/direwolf, - prob(5);/obj/item/weapon/gun/energy/mouseray/giantrat, - prob(50);/obj/item/weapon/gun/energy/mouseray/redpanda, - prob(5);/obj/item/weapon/gun/energy/mouseray/catslug, - prob(1);/obj/item/weapon/gun/energy/mouseray/metamorphosis, - prob(1);/obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced/random + list(pick(subtypesof(/obj/item/storage/firstaid)), 4) = 2, + list(/obj/item/pickaxe/silver, 3) = 2, + list(/obj/item/pickaxe/drill, 3) = 2, + list(/obj/item/pickaxe/jackhammer, 4) = 2, + list(/obj/item/pickaxe/gold, 4) = 2, + list(/obj/item/pickaxe/diamond, 5) = 2, + list(/obj/item/pickaxe/diamonddrill, 6) = 2, + list(/obj/item/pickaxe/plasmacutter, 5) = 2, + list(/obj/item/soulstone, 5) = 2, + list(/obj/item/material/sword/katana, 5) = 2, + list(/obj/item/storage/belt/utility/chief/full, 8) = 2, + list(/obj/item/personal_shield_generator/belt/mining/loaded, 6) = 2, + list(pick(subtypesof(/obj/item/melee/energy/sword) - /obj/item/melee/energy/sword/charge), 6) = 2, + list(pick(/obj/item/dnainjector/xraymut, /obj/item/dnainjector/nobreath, /obj/item/dnainjector/insulation), 6) = 2, + list(/obj/item/gun/energy/netgun, 7) = 2, + list(pick(prob(300);/obj/item/gun/energy/mouseray, + prob(50);/obj/item/gun/energy/mouseray/corgi, + prob(50);/obj/item/gun/energy/mouseray/woof, + prob(50);/obj/item/gun/energy/mouseray/cat, + prob(50);/obj/item/gun/energy/mouseray/chicken, + prob(50);/obj/item/gun/energy/mouseray/lizard, + prob(50);/obj/item/gun/energy/mouseray/rabbit, + prob(50);/obj/item/gun/energy/mouseray/fennec, + prob(5);/obj/item/gun/energy/mouseray/monkey, + prob(5);/obj/item/gun/energy/mouseray/wolpin, + prob(5);/obj/item/gun/energy/mouseray/otie, + prob(5);/obj/item/gun/energy/mouseray/direwolf, + prob(5);/obj/item/gun/energy/mouseray/giantrat, + prob(50);/obj/item/gun/energy/mouseray/redpanda, + prob(5);/obj/item/gun/energy/mouseray/catslug, + prob(1);/obj/item/gun/energy/mouseray/metamorphosis, + prob(1);/obj/item/gun/energy/mouseray/metamorphosis/advanced/random ), 8) = 2, - list(/obj/item/weapon/gun/energy/pummeler, 11) = 2, - list(pick(subtypesof(/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug)), 1) = 1, + list(/obj/item/gun/energy/pummeler, 11) = 2, + list(pick(subtypesof(/obj/item/reagent_containers/food/drinks/glass2/coffeemug)), 1) = 1, list(/obj/item/xenos_claw, 1) = 1, list(/obj/item/organ/internal/heart, 1) = 1, - list(/obj/item/weapon/vampiric, 2) = 1, + list(/obj/item/vampiric, 2) = 1, list(/obj/item/weed_extract, 2) = 1, - list(/obj/item/weapon/storage/backpack/luchador/loaded, 3) = 1, - list(/obj/item/weapon/storage/backpack/clown/loaded, 5) = 1, - list(/obj/item/weapon/storage/backpack/mime/loaded, 5) = 1, - list(pick(/obj/item/device/multitool/alien, + list(/obj/item/storage/backpack/luchador/loaded, 3) = 1, + list(/obj/item/storage/backpack/clown/loaded, 5) = 1, + list(/obj/item/storage/backpack/mime/loaded, 5) = 1, + list(pick(/obj/item/multitool/alien, /obj/item/stack/cable_coil/alien, - /obj/item/weapon/tool/crowbar/alien, - /obj/item/weapon/tool/screwdriver/alien, - /obj/item/weapon/weldingtool/alien, - /obj/item/weapon/tool/wirecutters/alien, - /obj/item/weapon/tool/wrench/alien), 7) = 1, - list(pick(/obj/item/weapon/melee/energy/axe, /obj/item/weapon/melee/energy/spear), 11) = 1, - list(/obj/item/weapon/card/emag/used, 7) = 1, - list(pick(/obj/item/weapon/grenade/spawnergrenade/spesscarp, /obj/item/weapon/grenade/spawnergrenade/spider, /obj/item/weapon/grenade/explosive/frag), 7) = 1, - list(/obj/item/weapon/grenade/flashbang/clusterbang, 7) = 1, - list(/obj/item/weapon/card/emag, 11) = 1, - list(/obj/item/weapon/melee/shock_maul, 11) = 3, + /obj/item/tool/crowbar/alien, + /obj/item/tool/screwdriver/alien, + /obj/item/weldingtool/alien, + /obj/item/tool/wirecutters/alien, + /obj/item/tool/wrench/alien), 7) = 1, + list(pick(/obj/item/melee/energy/axe, /obj/item/melee/energy/spear), 11) = 1, + list(/obj/item/card/emag/used, 7) = 1, + list(pick(/obj/item/grenade/spawnergrenade/spesscarp, /obj/item/grenade/spawnergrenade/spider, /obj/item/grenade/explosive/frag), 7) = 1, + list(/obj/item/grenade/flashbang/clusterbang, 7) = 1, + list(/obj/item/card/emag, 11) = 1, + list(/obj/item/melee/shock_maul, 11) = 3, list(/obj/item/clothing/suit/storage/vest/martian_miner/reinforced, 4) = 6, - list(/obj/item/weapon/storage/backpack/sport/hyd/catchemall, 11) = 1 + list(/obj/item/storage/backpack/sport/hyd/catchemall, 11) = 1 )) var/path = choice[1] var/value = choice[2] @@ -110,55 +110,55 @@ //putting the multi-object loot items as their own things -/obj/item/weapon/storage/backpack/dufflebag/cratebooze +/obj/item/storage/backpack/dufflebag/cratebooze starts_with = list( - /obj/item/weapon/reagent_containers/food/drinks/bottle/rum, - /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, - /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, - /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, - /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, + /obj/item/reagent_containers/food/drinks/bottle/rum, + /obj/item/reagent_containers/food/drinks/bottle/whiskey, + /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, + /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, + /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, ) -/obj/item/weapon/storage/backpack/dufflebag/cratedrills +/obj/item/storage/backpack/dufflebag/cratedrills starts_with = list( - /obj/item/weapon/pickaxe/advdrill, - /obj/item/device/taperecorder, + /obj/item/pickaxe/advdrill, + /obj/item/taperecorder, /obj/item/clothing/suit/space, /obj/item/clothing/head/helmet/space ) -/obj/item/weapon/storage/backpack/clown/loaded +/obj/item/storage/backpack/clown/loaded starts_with = list( /obj/item/clothing/under/rank/clown, /obj/item/clothing/shoes/clown_shoes, - /obj/item/device/pda/clown, + /obj/item/pda/clown, /obj/item/clothing/mask/gas/clown_hat, - /obj/item/weapon/bikehorn, - /obj/item/weapon/pen/crayon/rainbow, - /obj/item/weapon/reagent_containers/spray/waterflower + /obj/item/bikehorn, + /obj/item/pen/crayon/rainbow, + /obj/item/reagent_containers/spray/waterflower ) -/obj/item/weapon/storage/backpack/mime/loaded +/obj/item/storage/backpack/mime/loaded starts_with = list( /obj/item/clothing/under/mime, /obj/item/clothing/shoes/black, - /obj/item/device/pda/mime, + /obj/item/pda/mime, /obj/item/clothing/gloves/white, /obj/item/clothing/mask/gas/mime, /obj/item/clothing/head/beret, /obj/item/clothing/suit/suspenders, - /obj/item/weapon/pen/crayon/mime, - /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing + /obj/item/pen/crayon/mime, + /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing ) -/obj/item/weapon/storage/backpack/luchador/loaded +/obj/item/storage/backpack/luchador/loaded starts_with = list( - /obj/item/weapon/storage/belt/champion, + /obj/item/storage/belt/champion, /obj/item/clothing/mask/luchador ) -/obj/item/weapon/storage/backpack/sport/hyd/catchemall +/obj/item/storage/backpack/sport/hyd/catchemall name = "sports backpack" desc = "A green sports backpack." starts_with = list( @@ -168,7 +168,7 @@ /obj/item/capture_crystal ) -/obj/item/weapon/storage/backpack/sport/hyd/catchemall/Initialize() //gotta have your starter 'mon too (or an improved way to catch one) +/obj/item/storage/backpack/sport/hyd/catchemall/Initialize() //gotta have your starter 'mon too (or an improved way to catch one) ..() var/path = pick(subtypesof(/obj/item/capture_crystal)) contents += new path() diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index bfb24c35c04..da2bcab5515 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -9,14 +9,14 @@ name = "mining drill head" desc = "An enormous drill." icon_state = "mining_drill" - circuit = /obj/item/weapon/circuitboard/miningdrill + circuit = /obj/item/circuitboard/miningdrill var/braces_needed = 2 var/total_brace_tier = 0 var/list/obj/machinery/mining/brace/supports = list() var/supported = 0 var/active = 0 var/list/resource_field = list() - var/obj/item/device/radio/intercom/faultreporter + var/obj/item/radio/intercom/faultreporter var/drill_range = 5 var/offset = 2 var/current_capacity = 0 @@ -44,20 +44,20 @@ "rutile" = 0) var/list/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, - "sand" = /obj/item/weapon/ore/glass, - "carbon" = /obj/item/weapon/ore/coal, - // "copper" = /obj/item/weapon/ore/copper, - // "tin" = /obj/item/weapon/ore/tin, - // "bauxite" = /obj/item/weapon/ore/bauxite, - "rutile" = /obj/item/weapon/ore/rutile + "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, + "sand" = /obj/item/ore/glass, + "carbon" = /obj/item/ore/coal, + // "copper" = /obj/item/ore/copper, + // "tin" = /obj/item/ore/tin, + // "bauxite" = /obj/item/ore/bauxite, + "rutile" = /obj/item/ore/rutile ) //Upgrades @@ -65,20 +65,20 @@ var/capacity var/charge_use var/exotic_drilling - var/obj/item/weapon/cell/cell = null + var/obj/item/cell/cell = null // Found with an advanced laser. exotic_drilling >= 1 var/list/ore_types_uncommon = list( - MAT_MARBLE = /obj/item/weapon/ore/marble, - //"painite" = /obj/item/weapon/ore/painite, - //"quartz" = /obj/item/weapon/ore/quartz, - MAT_LEAD = /obj/item/weapon/ore/lead + MAT_MARBLE = /obj/item/ore/marble, + //"painite" = /obj/item/ore/painite, + //"quartz" = /obj/item/ore/quartz, + MAT_LEAD = /obj/item/ore/lead ) // Found with an ultra laser. exotic_drilling >= 2 var/list/ore_types_rare = list( - //"void opal" = /obj/item/weapon/ore/void_opal, - MAT_VERDANTIUM = /obj/item/weapon/ore/verdantium + //"void opal" = /obj/item/ore/void_opal, + MAT_VERDANTIUM = /obj/item/ore/verdantium ) //Flags @@ -109,7 +109,7 @@ if(ispath(cell)) cell = new cell(src) default_apply_parts() - faultreporter = new /obj/item/device/radio/intercom{channels=list("Supply")}(null) + faultreporter = new /obj/item/radio/intercom{channels=list("Supply")}(null) /obj/machinery/mining/drill/Destroy() qdel_null(faultreporter) @@ -126,7 +126,7 @@ return cell /obj/machinery/mining/drill/loaded - cell = /obj/item/weapon/cell/high + cell = /obj/item/cell/high /obj/machinery/mining/drill/process() @@ -223,7 +223,7 @@ /obj/machinery/mining/drill/attackby(obj/item/O as obj, mob/user as mob) if(!active) - if(istype(O, /obj/item/device/multitool)) + if(istype(O, /obj/item/multitool)) var/newtag = text2num(sanitizeSafe(tgui_input_text(user, "Enter new ID number or leave empty to cancel.", "Assign ID number", null, 4), 4)) if(newtag) name = "[initial(name)] #[newtag]" @@ -240,7 +240,7 @@ return if(!panel_open || active) return ..() - if(istype(O, /obj/item/weapon/cell)) + if(istype(O, /obj/item/cell)) if(cell) to_chat(user, "The drill already has a cell installed.") else @@ -305,8 +305,8 @@ drill_range = 5 offset = 2 - for(var/obj/item/weapon/stock_parts/P in component_parts) - if(istype(P, /obj/item/weapon/stock_parts/micro_laser)) + for(var/obj/item/stock_parts/P in component_parts) + if(istype(P, /obj/item/stock_parts/micro_laser)) harvest_speed = P.rating ** 2 // 1, 4, 9, 16, 25 exotic_drilling = P.rating - 1 if(exotic_drilling >= 1) @@ -324,11 +324,11 @@ else if(P.rating >= 4) // t4 drill_range = 7 offset = 3 - if(istype(P, /obj/item/weapon/stock_parts/matter_bin)) + if(istype(P, /obj/item/stock_parts/matter_bin)) capacity = 200 * P.rating - if(istype(P, /obj/item/weapon/stock_parts/capacitor)) + if(istype(P, /obj/item/stock_parts/capacitor)) charge_use -= 10 * P.rating - cell = locate(/obj/item/weapon/cell) in src + cell = locate(/obj/item/cell) in src /obj/machinery/mining/drill/proc/check_supports() @@ -414,7 +414,7 @@ name = "mining drill brace" desc = "A machinery brace for an industrial drill. It looks easily two feet thick." icon_state = "mining_brace" - circuit = /obj/item/weapon/circuitboard/miningdrillbrace + circuit = /obj/item/circuitboard/miningdrillbrace var/brace_tier = 1 var/obj/machinery/mining/drill/connected @@ -430,10 +430,10 @@ /obj/machinery/mining/brace/RefreshParts() ..() brace_tier = 0 - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) brace_tier += M.rating -/obj/machinery/mining/brace/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/mining/brace/attackby(obj/item/W as obj, mob/user as mob) if(connected && connected.active) to_chat(user, "You can't work with the brace of a running drill!") return diff --git a/code/modules/mining/drilling/scanner.dm b/code/modules/mining/drilling/scanner.dm index e8f88a0f883..c981cd5c4de 100644 --- a/code/modules/mining/drilling/scanner.dm +++ b/code/modules/mining/drilling/scanner.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/mining_scanner +/obj/item/mining_scanner name = "deep scan device" desc = "A complex device used to locate ore deep underground." icon = 'icons/obj/device.dmi' @@ -10,7 +10,7 @@ var/range = 2 var/exact = FALSE -/obj/item/weapon/mining_scanner/attack_self(mob/user as mob) +/obj/item/mining_scanner/attack_self(mob/user as mob) to_chat(user, "You begin sweeping \the [src] about, scanning for metal deposits.") playsound(src, 'sound/items/goggles_charge.ogg', 50, 1, -6) @@ -19,7 +19,7 @@ ScanTurf(get_turf(user), user) -/obj/item/weapon/mining_scanner/proc/ScanTurf(var/atom/target, var/mob/user) +/obj/item/mining_scanner/proc/ScanTurf(var/atom/target, var/mob/user) var/list/metals = list( "surface minerals" = 0, "industrial metals" = 0, @@ -69,7 +69,7 @@ to_chat(user, message) -/obj/item/weapon/mining_scanner/advanced +/obj/item/mining_scanner/advanced name = "advanced ore detector" desc = "An advanced device used to locate ore deep underground." description_info = "This scanner has variable range, you can use the Set Scanner Range verb, or alt+click the device. Drills dig in 5x5." @@ -78,10 +78,10 @@ scan_time = 0.5 SECONDS exact = TRUE -/obj/item/weapon/mining_scanner/advanced/AltClick(mob/user) +/obj/item/mining_scanner/advanced/AltClick(mob/user) change_size() -/obj/item/weapon/mining_scanner/advanced/verb/change_size() +/obj/item/mining_scanner/advanced/verb/change_size() set name = "Set Scanner Range" set category = "Object" var/custom_range = tgui_input_list(usr, "Scanner Range","Pick a range to scan. ", list(0,1,2,3,4,5,6,7)) diff --git a/code/modules/mining/kinetic_crusher.dm b/code/modules/mining/kinetic_crusher.dm index 2a668262824..0bbc1a3e08b 100644 --- a/code/modules/mining/kinetic_crusher.dm +++ b/code/modules/mining/kinetic_crusher.dm @@ -2,7 +2,7 @@ // thanks silicons /*********************Mining Hammer****************/ -/obj/item/weapon/kinetic_crusher +/obj/item/kinetic_crusher icon = 'icons/obj/mining_vr.dmi' icon_state = "crusher" item_state = "crusher0" @@ -55,55 +55,55 @@ /// do we update item state? var/update_item_state = FALSE -/obj/item/weapon/kinetic_crusher/cyborg //probably give this a unique sprite later +/obj/item/kinetic_crusher/cyborg //probably give this a unique sprite later desc = "An integrated version of the standard kinetic crusher with a grinded down axe head to dissuade mis-use against crewmen. Deals damage equal to the standard crusher against creatures, however." force = 10 //wouldn't want to give a borg a 20 brute melee weapon unemagged now would we detonation_damage = 60 wielded = 1 -/obj/item/weapon/kinetic_crusher/Initialize(mapload) +/obj/item/kinetic_crusher/Initialize(mapload) . = ..() AddElement(/datum/element/conflict_checking, CONFLICT_ELEMENT_CRUSHER) /* -/obj/item/weapon/kinetic_crusher/Initialize() +/obj/item/kinetic_crusher/Initialize() . = ..() if(requires_Wield) RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield)) -/obj/item/weapon/kinetic_crusher/ComponentInitialize() +/obj/item/kinetic_crusher/ComponentInitialize() . = ..() if(requires_wield) AddComponent(/datum/component/butchering, 60, 110) //technically it's huge and bulky, but this provides an incentive to use it AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=20) */ -/obj/item/weapon/kinetic_crusher/Destroy() +/obj/item/kinetic_crusher/Destroy() // QDEL_LIST(trophies) return ..() -/obj/item/weapon/kinetic_crusher/emag_act() +/obj/item/kinetic_crusher/emag_act() . = ..() if(emagged) return emagged = TRUE desc = desc + " The destabilizer module occasionally sparks and glows a menacing red." -/obj/item/weapon/kinetic_crusher/proc/can_mark(mob/living/victim) +/obj/item/kinetic_crusher/proc/can_mark(mob/living/victim) if(emagged) return TRUE return !ishuman(victim) && !issilicon(victim) /// triggered on wield of two handed item -/obj/item/weapon/kinetic_crusher/proc/on_wield(obj/item/source, mob/user) +/obj/item/kinetic_crusher/proc/on_wield(obj/item/source, mob/user) wielded = TRUE /// triggered on unwield of two handed item -/obj/item/weapon/kinetic_crusher/proc/on_unwield(obj/item/source, mob/user) +/obj/item/kinetic_crusher/proc/on_unwield(obj/item/source, mob/user) wielded = FALSE -/obj/item/weapon/kinetic_crusher/examine(mob/living/user) +/obj/item/kinetic_crusher/examine(mob/living/user) . = ..() . += "Mark a[emagged ? "nything": " creature"] with the destabilizing force, then hit them in melee to do [force + detonation_damage] damage." . += "Does [force + detonation_damage + backstab_bonus] damage if the target is backstabbed, instead of [force + detonation_damage]." @@ -114,7 +114,7 @@ */ /* -/obj/item/weapon/kinetic_crusher/attackby(obj/item/I, mob/living/user) +/obj/item/kinetic_crusher/attackby(obj/item/I, mob/living/user) if(I.tool_behaviour == TOOL_CROWBAR) if(LAZYLEN(trophies)) to_chat(user, "You remove [src]'s trophies.") @@ -131,13 +131,13 @@ return ..() */ -/obj/item/weapon/kinetic_crusher/attack(mob/living/target, mob/living/carbon/user) +/obj/item/kinetic_crusher/attack(mob/living/target, mob/living/carbon/user) if(!wielded && requires_wield) to_chat(user, "[src] is too heavy to use with one hand.") return ..() -/obj/item/weapon/kinetic_crusher/afterattack(atom/target, mob/living/user, proximity_flag, clickparams) +/obj/item/kinetic_crusher/afterattack(atom/target, mob/living/user, proximity_flag, clickparams) . = ..() /* if(istype(target, /obj/item/crusher_trophy)) @@ -169,7 +169,7 @@ if(proximity_flag && isliving(target)) detonate(target, user) -/obj/item/weapon/kinetic_crusher/proc/detonate(mob/living/L, mob/living/user, thrown = FALSE) +/obj/item/kinetic_crusher/proc/detonate(mob/living/L, mob/living/user, thrown = FALSE) var/datum/modifier/crusher_mark/CM = L.get_modifier_of_type(/datum/modifier/crusher_mark) if(!CM || CM.hammer_synced != src) return @@ -187,7 +187,7 @@ else L.apply_damage(detonation_damage + thrown_bonus, BRUTE, blocked = def_check) -/obj/item/weapon/kinetic_crusher/throw_impact(atom/hit_atom, speed) +/obj/item/kinetic_crusher/throw_impact(atom/hit_atom, speed) . = ..() if(!isliving(hit_atom)) return @@ -195,25 +195,25 @@ if(L.has_modifier_of_type(/datum/modifier/crusher_mark)) detonate(L, thrower, TRUE) -/obj/item/weapon/kinetic_crusher/proc/Recharge() +/obj/item/kinetic_crusher/proc/Recharge() if(!charged) charged = TRUE update_icon() playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) -/obj/item/weapon/kinetic_crusher/ui_action_click(mob/user, actiontype) +/obj/item/kinetic_crusher/ui_action_click(mob/user, actiontype) integ_light_on = !integ_light_on playsound(src, 'sound/weapons/empty.ogg', 100, TRUE) update_brightness(user) update_icon() -/obj/item/weapon/kinetic_crusher/proc/update_brightness(mob/user = null) +/obj/item/kinetic_crusher/proc/update_brightness(mob/user = null) if(integ_light_on) set_light(brightness_on) else set_light(0) -/obj/item/weapon/kinetic_crusher/update_icon() +/obj/item/kinetic_crusher/update_icon() . = ..() cut_overlay("[icon_state]_uncharged") cut_overlay("[icon_state]_lit") @@ -225,7 +225,7 @@ add_overlay("[icon_state]_lit") /* -/obj/item/weapon/kinetic_crusher/glaive +/obj/item/kinetic_crusher/glaive name = "proto-kinetic glaive" desc = "A modified design of a proto-kinetic crusher, it is still little more of a combination of various mining tools cobbled together \ and kit-bashed into a high-tech cleaver on a stick - with a handguard and a goliath hide grip. While it is still of little use to any \ @@ -236,7 +236,7 @@ */ -/obj/item/weapon/kinetic_crusher/machete +/obj/item/kinetic_crusher/machete // general purpose. cleaves though name = "proto-kinetic machete" desc = "A scaled down version of a proto-kinetic crusher, used by people who don't want to lug around an axe-hammer." @@ -261,7 +261,7 @@ -/obj/item/weapon/kinetic_crusher/machete/gauntlets +/obj/item/kinetic_crusher/machete/gauntlets // did someone say single target damage name = "\improper proto-kinetic gear" desc = "A pair of scaled-down proto-kinetic crusher destabilizer modules shoved into gauntlets and greaves, used by those who wish to spit in the eyes of God." @@ -280,29 +280,29 @@ var/obj/item/offhand/crushergauntlets/offhand slot_flags = null -/obj/item/weapon/kinetic_crusher/machete/gauntlets/equipped() +/obj/item/kinetic_crusher/machete/gauntlets/equipped() . = ..() START_PROCESSING(SSprocessing, src) -/obj/item/weapon/kinetic_crusher/machete/gauntlets/dropped(mob/user) +/obj/item/kinetic_crusher/machete/gauntlets/dropped(mob/user) ready_toggle(TRUE) STOP_PROCESSING(SSprocessing, src) . = ..() -/obj/item/weapon/kinetic_crusher/machete/gauntlets/Destroy() +/obj/item/kinetic_crusher/machete/gauntlets/Destroy() . = ..() STOP_PROCESSING(SSprocessing, src) -/obj/item/weapon/kinetic_crusher/machete/gauntlets/attack_self(mob/user) +/obj/item/kinetic_crusher/machete/gauntlets/attack_self(mob/user) ready_toggle() -/obj/item/weapon/kinetic_crusher/machete/gauntlets/process() +/obj/item/kinetic_crusher/machete/gauntlets/process() if(wielded) // are we supposed to be wielded if(!offhand) // does our offhand exist ready_toggle(TRUE) // no? well, shit /// toggles twohand. if forced is true, forces an unready state -/obj/item/weapon/kinetic_crusher/machete/gauntlets/proc/ready_toggle(var/forced = 0) +/obj/item/kinetic_crusher/machete/gauntlets/proc/ready_toggle(var/forced = 0) var/mob/living/M = loc if(istype(M) && forced == 0) if(M.can_wield_item(src) && src.is_held_twohanded(M)) @@ -312,7 +312,7 @@ else unwield(M) -/obj/item/weapon/kinetic_crusher/machete/gauntlets/proc/wield(var/mob/living/M) +/obj/item/kinetic_crusher/machete/gauntlets/proc/wield(var/mob/living/M) name = initial(name) wielded = TRUE to_chat(M, "You ready [src].") @@ -323,7 +323,7 @@ M.put_in_inactive_hand(O) offhand = O -/obj/item/weapon/kinetic_crusher/machete/gauntlets/proc/unwield(var/mob/living/M) +/obj/item/kinetic_crusher/machete/gauntlets/proc/unwield(var/mob/living/M) to_chat(M, "You unready [src].") name = "[initial(name)] (unreadied)" wielded = FALSE @@ -339,17 +339,17 @@ // man i really should try porting the twohand component this is hacky and Sucks /obj/item/offhand/crushergauntlets - var/obj/item/weapon/kinetic_crusher/machete/gauntlets/linked + var/obj/item/kinetic_crusher/machete/gauntlets/linked /obj/item/offhand/crushergauntlets/dropped(mob/user as mob) if(linked.wielded) linked.ready_toggle(TRUE) -/obj/item/weapon/kinetic_crusher/machete/gauntlets/rig +/obj/item/kinetic_crusher/machete/gauntlets/rig name = "\improper mounted proto-kinetic gear" var/obj/item/rig_module/gauntlets/storing_module -/obj/item/weapon/kinetic_crusher/machete/gauntlets/rig/dropped(mob/user) +/obj/item/kinetic_crusher/machete/gauntlets/rig/dropped(mob/user) . = ..() if(storing_module) src.forceMove(storing_module) @@ -365,7 +365,7 @@ QDEL_NULL(src) // gimmicky backup for throwing -/obj/item/weapon/kinetic_crusher/machete/dagger +/obj/item/kinetic_crusher/machete/dagger name = "proto-kinetic dagger" desc = "A scaled down version of a proto-kinetic machete, usually used in a last ditch scenario." icon_state = "glaive-dagger" @@ -397,7 +397,7 @@ range = 6 accuracy = INFINITY // NO. // log_override = TRUE - var/obj/item/weapon/kinetic_crusher/hammer_synced + var/obj/item/kinetic_crusher/hammer_synced /obj/item/projectile/destabilizer/Destroy() hammer_synced = null diff --git a/code/modules/mining/machinery/machine_processing.dm b/code/modules/mining/machinery/machine_processing.dm index 83eefc3031f..133034508ce 100644 --- a/code/modules/mining/machinery/machine_processing.dm +++ b/code/modules/mining/machinery/machine_processing.dm @@ -12,7 +12,7 @@ density = TRUE anchored = TRUE - var/obj/item/weapon/card/id/inserted_id // Inserted ID card, for points + var/obj/item/card/id/inserted_id // Inserted ID card, for points var/obj/machinery/mineral/processing_unit/machine = null var/show_all_ores = FALSE @@ -40,7 +40,7 @@ tgui_interact(user) /obj/machinery/mineral/processing_unit_console/attackby(var/obj/item/I, var/mob/user) - if(istype(I, /obj/item/weapon/card/id)) + if(istype(I, /obj/item/card/id)) if(!powered()) return if(!inserted_id && (user.unEquip(I) || isrobot(user))) @@ -131,7 +131,7 @@ to_chat(usr, "Required access not found.") . = TRUE if("insert") - var/obj/item/weapon/card/id/I = usr.get_active_hand() + var/obj/item/card/id/I = usr.get_active_hand() if(istype(I)) usr.drop_item() I.forceMove(src) @@ -253,7 +253,7 @@ ore_chunk.stored_ore[ore] = 0 qdel(ore_chunk) - for(var/obj/item/weapon/ore/O in input.loc) + for(var/obj/item/ore/O in input.loc) if(!isnull(ores_stored[O.material])) ores_stored[O.material]++ points += (ore_values[O.material]*points_mult) @@ -337,7 +337,7 @@ else ores_stored[metal]-- sheets++ - new /obj/item/weapon/ore/slag(output.loc) + new /obj/item/ore/slag(output.loc) else continue diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 7e1566e65b5..37f70949675 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -1,6 +1,6 @@ /******************************Lantern*******************************/ -/obj/item/device/flashlight/lantern +/obj/item/flashlight/lantern name = "lantern" icon_state = "lantern" desc = "A mining lantern." @@ -9,7 +9,7 @@ /*****************************Pickaxe********************************/ -/obj/item/weapon/pickaxe +/obj/item/pickaxe name = "pickaxe" desc = "A miner's best friend." icon = 'icons/obj/items.dmi' @@ -31,7 +31,7 @@ var/excavation_amount = 200 var/destroy_artefacts = FALSE // some mining tools will destroy artefacts completely while avoiding side-effects. -/obj/item/weapon/pickaxe/silver +/obj/item/pickaxe/silver name = "silver pickaxe" icon_state = "spickaxe" item_state = "spickaxe" @@ -39,7 +39,7 @@ origin_tech = list(TECH_MATERIAL = 3) desc = "This makes no metallurgic sense." -/obj/item/weapon/pickaxe/gold +/obj/item/pickaxe/gold name = "golden pickaxe" icon_state = "gpickaxe" item_state = "gpickaxe" @@ -48,7 +48,7 @@ desc = "This makes no metallurgic sense." drill_verb = "picking" -/obj/item/weapon/pickaxe/diamond +/obj/item/pickaxe/diamond name = "diamond pickaxe" icon_state = "dpickaxe" item_state = "dpickaxe" @@ -59,7 +59,7 @@ /*****************************Drill********************************/ -/obj/item/weapon/pickaxe/drill +/obj/item/pickaxe/drill name = "mining drill" // Can dig sand as well! icon_state = "drill" item_state = "jackhammer" @@ -70,7 +70,7 @@ desc = "The most basic of mining drills, for short excavations and small mineral extractions." drill_verb = "drilling" -/obj/item/weapon/pickaxe/advdrill +/obj/item/pickaxe/advdrill name = "advanced mining drill" // Can dig sand as well! icon_state = "advdrill" item_state = "jackhammer" @@ -81,7 +81,7 @@ desc = "Yours is the drill that will pierce through the rock walls." drill_verb = "drilling" -/obj/item/weapon/pickaxe/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME! +/obj/item/pickaxe/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME! name = "diamond mining drill" icon_state = "diamonddrill" item_state = "jackhammer" @@ -92,7 +92,7 @@ desc = "Yours is the drill that will pierce the heavens!" drill_verb = "drilling" -/obj/item/weapon/pickaxe/jackhammer +/obj/item/pickaxe/jackhammer name = "sonic jackhammer" icon_state = "jackhammer" item_state = "jackhammer" @@ -102,7 +102,7 @@ drill_verb = "hammering" destroy_artefacts = TRUE -/obj/item/weapon/pickaxe/borgdrill +/obj/item/pickaxe/borgdrill name = "jackhammer" icon_state = "borg_pick" item_state = "jackhammer" @@ -112,7 +112,7 @@ drill_verb = "hammering" destroy_artefacts = TRUE -/obj/item/weapon/pickaxe/plasmacutter +/obj/item/pickaxe/plasmacutter name = "plasma cutter" desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff." icon_state = "plasmacutter" @@ -127,13 +127,13 @@ sharp = TRUE edge = TRUE -/obj/item/weapon/pickaxe/plasmacutter/borg +/obj/item/pickaxe/plasmacutter/borg name = "mounted plasma cutter" icon_state = "pcutter_borg" /*****************************Shovel********************************/ -/obj/item/weapon/shovel +/obj/item/shovel name = "shovel" desc = "A large tool for digging and moving dirt. Alt click to switch modes." icon = 'icons/obj/items.dmi' @@ -151,17 +151,17 @@ var/digspeed = 40 var/grave_mode = FALSE -/obj/item/weapon/shovel/AltClick(mob/user) +/obj/item/shovel/AltClick(mob/user) grave_mode = !grave_mode to_chat(user, span_notice("You'll now dig [grave_mode ? "out graves" : "for loot"].")) . = ..() -/obj/item/weapon/shovel/wood +/obj/item/shovel/wood icon_state = "whiteshovel" item_state = "whiteshovel" var/datum/material/material -/obj/item/weapon/shovel/wood/Initialize(var/ml, var/_mat) +/obj/item/shovel/wood/Initialize(var/ml, var/_mat) . = ..() material = get_material_by_name(_mat) if(!istype(material)) @@ -171,12 +171,12 @@ matter = list("[material.name]" = 50) update_icon() -/obj/item/weapon/shovel/wood/update_icon() +/obj/item/shovel/wood/update_icon() . = ..() color = material ? material.icon_colour : initial(color) alpha = min(max(255 * material.opacity, 80), 255) -/obj/item/weapon/shovel/spade +/obj/item/shovel/spade name = "spade" desc = "A small tool for digging and moving dirt." icon_state = "spade" @@ -185,7 +185,7 @@ throwforce = 7.0 w_class = ITEMSIZE_SMALL -/obj/item/weapon/shovel/wood +/obj/item/shovel/wood name = "wooden shovel" desc = "An improvised tool for digging and moving dirt." icon = 'icons/obj/items.dmi' diff --git a/code/modules/mining/mine_outcrops.dm b/code/modules/mining/mine_outcrops.dm index fb570af547c..7897305efab 100644 --- a/code/modules/mining/mine_outcrops.dm +++ b/code/modules/mining/mine_outcrops.dm @@ -9,7 +9,7 @@ icon_state = "outcrop" var/mindrop = 5 var/upperdrop = 10 - var/outcropdrop = /obj/item/weapon/ore/glass + var/outcropdrop = /obj/item/ore/glass /obj/structure/outcrop/Initialize() . = ..() @@ -22,7 +22,7 @@ icon_state = "outcrop-diamond" mindrop = 2 upperdrop = 4 - outcropdrop = /obj/item/weapon/ore/diamond + outcropdrop = /obj/item/ore/diamond /obj/structure/outcrop/phoron name = "shiny outcrop" @@ -30,7 +30,7 @@ icon_state = "outcrop-phoron" mindrop = 4 upperdrop = 8 - outcropdrop = /obj/item/weapon/ore/phoron + outcropdrop = /obj/item/ore/phoron /obj/structure/outcrop/iron name = "rugged outcrop" @@ -38,7 +38,7 @@ icon_state = "outcrop-iron" mindrop = 10 upperdrop = 20 - outcropdrop = /obj/item/weapon/ore/iron + outcropdrop = /obj/item/ore/iron /obj/structure/outcrop/coal name = "rugged outcrop" @@ -46,7 +46,7 @@ icon_state = "outcrop-coal" mindrop = 10 upperdrop = 20 - outcropdrop = /obj/item/weapon/ore/coal + outcropdrop = /obj/item/ore/coal /obj/structure/outcrop/lead name = "rugged outcrop" @@ -54,7 +54,7 @@ icon_state = "outcrop-lead" mindrop = 2 upperdrop = 5 - outcropdrop = /obj/item/weapon/ore/lead + outcropdrop = /obj/item/ore/lead /obj/structure/outcrop/gold name = "hollow outcrop" @@ -62,7 +62,7 @@ icon_state = "outcrop-gold" mindrop = 4 upperdrop = 6 - outcropdrop = /obj/item/weapon/ore/gold + outcropdrop = /obj/item/ore/gold /obj/structure/outcrop/silver name = "hollow outcrop" @@ -70,7 +70,7 @@ icon_state = "outcrop-silver" mindrop = 6 upperdrop = 8 - outcropdrop = /obj/item/weapon/ore/silver + outcropdrop = /obj/item/ore/silver /obj/structure/outcrop/platinum name = "hollow outcrop" @@ -78,7 +78,7 @@ icon_state = "outcrop-platinum" mindrop = 2 upperdrop = 5 - outcropdrop = /obj/item/weapon/ore/osmium + outcropdrop = /obj/item/ore/osmium /obj/structure/outcrop/uranium name = "spiky outcrop" @@ -86,10 +86,10 @@ icon_state = "outcrop-uranium" mindrop = 4 upperdrop = 8 - outcropdrop = /obj/item/weapon/ore/uranium + outcropdrop = /obj/item/ore/uranium /obj/structure/outcrop/attackby(obj/item/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/pickaxe)) + if (istype(W, /obj/item/pickaxe)) to_chat(user, "[user] begins to hack away at \the [src].") if(do_after(user,40)) to_chat(user, "You have finished digging!") @@ -97,8 +97,8 @@ new outcropdrop(get_turf(src)) qdel(src) return - if (istype(W, /obj/item/weapon/melee/shock_maul)) - var/obj/item/weapon/melee/shock_maul/S = W + if (istype(W, /obj/item/melee/shock_maul)) + var/obj/item/melee/shock_maul/S = W if(!S.wielded || !S.status) to_chat(user, "\The [src] must be wielded in two hands and powered on to be used for mining!") return diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 5583eb91e69..ed016584c4c 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -40,31 +40,31 @@ var/list/mining_overlay_cache = list() var/next_rock = 0 var/archaeo_overlay = "" var/excav_overlay = "" - var/obj/item/weapon/last_find + var/obj/item/last_find var/datum/artifact_find/artifact_find var/ignore_mapgen var/static/list/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, - "sand" = /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, -// "copper" = /obj/item/weapon/ore/copper, -// "tin" = /obj/item/weapon/ore/tin, -// "bauxite" = /obj/item/weapon/ore/bauxite, -// "void opal" = /obj/item/weapon/ore/void_opal, -// "painite" = /obj/item/weapon/ore/painite, -// "quartz" = /obj/item/weapon/ore/quartz, - "rutile" = /obj/item/weapon/ore/rutile + "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, + "sand" = /obj/item/ore/glass, + "carbon" = /obj/item/ore/coal, + "verdantium" = /obj/item/ore/verdantium, + "marble" = /obj/item/ore/marble, + "lead" = /obj/item/ore/lead, +// "copper" = /obj/item/ore/copper, +// "tin" = /obj/item/ore/tin, +// "bauxite" = /obj/item/ore/bauxite, +// "void opal" = /obj/item/ore/void_opal, +// "painite" = /obj/item/ore/painite, +// "quartz" = /obj/item/ore/quartz, + "rutile" = /obj/item/ore/rutile ) has_resources = 1 @@ -318,13 +318,13 @@ var/list/mining_overlay_cache = list() if(istype(AM,/mob/living/carbon/human)) var/mob/living/carbon/human/H = AM - var/obj/item/weapon/pickaxe/P = H.get_inactive_hand() + var/obj/item/pickaxe/P = H.get_inactive_hand() if(istype(P)) src.attackby(P, H) else if(istype(AM,/mob/living/silicon/robot)) var/mob/living/silicon/robot/R = AM - if(istype(R.module_active,/obj/item/weapon/pickaxe)) + if(istype(R.module_active,/obj/item/pickaxe)) attackby(R.module_active,R) else if(istype(AM,/obj/mecha)) @@ -350,7 +350,7 @@ var/list/mining_overlay_cache = list() update_icon() //Not even going to touch this pile of spaghetti -/turf/simulated/mineral/attackby(obj/item/weapon/W as obj, mob/user as mob) +/turf/simulated/mineral/attackby(obj/item/W as obj, mob/user as mob) if (!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") @@ -360,13 +360,13 @@ var/list/mining_overlay_cache = list() var/valid_tool = 0 var/digspeed = 40 - if(istype(W, /obj/item/weapon/shovel)) - var/obj/item/weapon/shovel/S = W + if(istype(W, /obj/item/shovel)) + var/obj/item/shovel/S = W valid_tool = 1 digspeed = S.digspeed - if(istype(W, /obj/item/weapon/pickaxe)) - var/obj/item/weapon/pickaxe/P = W + if(istype(W, /obj/item/pickaxe)) + var/obj/item/pickaxe/P = W if(P.sand_dig) valid_tool = 1 digspeed = P.digspeed @@ -388,17 +388,17 @@ var/list/mining_overlay_cache = list() to_chat(user, "You dug a hole.") GetDrilled() - else if(istype(W,/obj/item/weapon/storage/bag/ore)) - var/obj/item/weapon/storage/bag/ore/S = W + else if(istype(W,/obj/item/storage/bag/ore)) + var/obj/item/storage/bag/ore/S = W if(S.collection_mode) - for(var/obj/item/weapon/ore/O in contents) + for(var/obj/item/ore/O in contents) O.attackby(W,user) return - else if(istype(W,/obj/item/weapon/storage/bag/fossils)) - var/obj/item/weapon/storage/bag/fossils/S = W + else if(istype(W,/obj/item/storage/bag/fossils)) + var/obj/item/storage/bag/fossils/S = W if(S.collection_mode) - for(var/obj/item/weapon/fossil/F in contents) + for(var/obj/item/fossil/F in contents) F.attackby(W,user) return @@ -413,26 +413,26 @@ var/list/mining_overlay_cache = list() else - if (istype(W, /obj/item/device/core_sampler)) + if (istype(W, /obj/item/core_sampler)) geologic_data.UpdateNearbyArtifactInfo(src) - var/obj/item/device/core_sampler/C = W + var/obj/item/core_sampler/C = W C.sample_item(src, user) return - if (istype(W, /obj/item/device/depth_scanner)) - var/obj/item/device/depth_scanner/C = W + if (istype(W, /obj/item/depth_scanner)) + var/obj/item/depth_scanner/C = W C.scan_atom(user, src) return - if (istype(W, /obj/item/device/measuring_tape)) - var/obj/item/device/measuring_tape/P = W + if (istype(W, /obj/item/measuring_tape)) + var/obj/item/measuring_tape/P = W user.visible_message("\The [user] extends \a [P] towards \the [src].","You extend \the [P] towards \the [src].") if(do_after(user, 15)) to_chat(user, "\The [src] has been excavated to a depth of [excavation_level]cm.") return - if(istype(W, /obj/item/device/xenoarch_multi_tool)) - var/obj/item/device/xenoarch_multi_tool/C = W + if(istype(W, /obj/item/xenoarch_multi_tool)) + var/obj/item/xenoarch_multi_tool/C = W if(C.mode) //Mode means scanning C.depth_scanner.scan_atom(user, src) else @@ -441,11 +441,11 @@ var/list/mining_overlay_cache = list() to_chat(user, "\The [src] has been excavated to a depth of [excavation_level]cm.") return - if (istype(W, /obj/item/weapon/melee/shock_maul)) + if (istype(W, /obj/item/melee/shock_maul)) if(!istype(user.loc, /turf)) return - var/obj/item/weapon/melee/shock_maul/S = W + var/obj/item/melee/shock_maul/S = W if(!S.wielded || !S.status) //if we're not wielded OR not powered up, do nothing to_chat(user, "\The [src] must be wielded in two hands and powered on to be used for mining!") return @@ -476,7 +476,7 @@ var/list/mining_overlay_cache = list() next_rock += S.excavation_amount while(next_rock > 50) next_rock -= 50 - var/obj/item/weapon/ore/O = new(src) + var/obj/item/ore/O = new(src) geologic_data.UpdateNearbyArtifactInfo(src) O.geologic_data = geologic_data @@ -486,11 +486,11 @@ var/list/mining_overlay_cache = list() S.status = 0 S.update_held_icon() - if (istype(W, /obj/item/weapon/pickaxe)) + if (istype(W, /obj/item/pickaxe)) if(!istype(user.loc, /turf)) return - var/obj/item/weapon/pickaxe/P = W + var/obj/item/pickaxe/P = W if(last_act + P.digspeed > world.time)//prevents message spam return last_act = world.time @@ -532,7 +532,7 @@ var/list/mining_overlay_cache = list() next_rock += P.excavation_amount while(next_rock > 50) next_rock -= 50 - var/obj/item/weapon/ore/O = new(src) + var/obj/item/ore/O = new(src) geologic_data.UpdateNearbyArtifactInfo(src) O.geologic_data = geologic_data return @@ -595,7 +595,7 @@ var/list/mining_overlay_cache = list() if(!mineral) return clear_ore_effects() - var/obj/item/weapon/ore/O = new mineral.ore (src) + var/obj/item/ore/O = new mineral.ore (src) if(istype(O)) geologic_data.UpdateNearbyArtifactInfo(src) O.geologic_data = geologic_data @@ -627,7 +627,7 @@ var/list/mining_overlay_cache = list() if(!sand_dug) sand_dug = 1 for(var/i=0;i<5;i++) - new/obj/item/weapon/ore/glass(src) + new/obj/item/ore/glass(src) update_icon() return @@ -668,16 +668,16 @@ var/list/mining_overlay_cache = list() /turf/simulated/mineral/proc/excavate_find(var/is_clean = 0, var/datum/find/F) //with skill and luck, players can cleanly extract finds //otherwise, they come out inside a chunk of rock - var/obj/item/weapon/X + var/obj/item/X if(is_clean) - X = new /obj/item/weapon/archaeological_find(src, new_item_type = F.find_type) + X = new /obj/item/archaeological_find(src, new_item_type = F.find_type) else - X = new /obj/item/weapon/strangerock(src, inside_item_type = F.find_type) + X = new /obj/item/strangerock(src, inside_item_type = F.find_type) geologic_data.UpdateNearbyArtifactInfo(src) - var/obj/item/weapon/strangerock/SR = X + var/obj/item/strangerock/SR = X SR.geologic_data = geologic_data - //some find types delete the /obj/item/weapon/archaeological_find and replace it with something else, this handles when that happens + //some find types delete the /obj/item/archaeological_find and replace it with something else, this handles when that happens //yuck var/display_name = "Something" if(!X) @@ -712,10 +712,10 @@ var/list/mining_overlay_cache = list() new /obj/item/stack/material/plasteel(src, rand(5,25)) if(5) for(var/i=1 to rand(1,3)) - new /obj/item/weapon/material/shard(src) + new /obj/item/material/shard(src) if(6) for(var/i=1 to rand(1,3)) - new /obj/item/weapon/material/shard/phoron(src) + new /obj/item/material/shard/phoron(src) if(7) new /obj/item/stack/material/uranium(src, rand(5,25)) diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm index 3ceab8f7f94..b419794af72 100644 --- a/code/modules/mining/ore.dm +++ b/code/modules/mining/ore.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/ore +/obj/item/ore name = "small rock" icon = 'icons/obj/mining.dmi' icon_state = "ore2" @@ -7,31 +7,31 @@ var/datum/geosample/geologic_data var/material -/obj/item/weapon/ore/uranium +/obj/item/ore/uranium name = "pitchblende" icon_state = "ore_uranium" origin_tech = list(TECH_MATERIAL = 5) material = "uranium" -/obj/item/weapon/ore/iron +/obj/item/ore/iron name = "hematite" icon_state = "ore_iron" origin_tech = list(TECH_MATERIAL = 1) material = "hematite" -/obj/item/weapon/ore/coal +/obj/item/ore/coal name = "raw carbon" icon_state = "ore_coal" origin_tech = list(TECH_MATERIAL = 1) material = "carbon" -/obj/item/weapon/ore/marble +/obj/item/ore/marble name = "recrystallized carbonate" icon_state = "ore_marble" origin_tech = list(TECH_MATERIAL = 1) material = "marble" -/obj/item/weapon/ore/glass +/obj/item/ore/glass name = "sand" icon_state = "ore_glass" origin_tech = list(TECH_MATERIAL = 1) @@ -39,7 +39,7 @@ slot_flags = SLOT_HOLSTER // POCKET SAND! -/obj/item/weapon/ore/glass/throw_impact(atom/hit_atom) +/obj/item/ore/glass/throw_impact(atom/hit_atom) ..() var/mob/living/carbon/human/H = hit_atom if(istype(H) && H.has_eyes() && prob(85)) @@ -50,48 +50,48 @@ if(istype(loc, /turf/)) qdel(src) -/obj/item/weapon/ore/phoron +/obj/item/ore/phoron name = "phoron crystals" icon_state = "ore_phoron" origin_tech = list(TECH_MATERIAL = 2) material = "phoron" -/obj/item/weapon/ore/silver +/obj/item/ore/silver name = "native silver ore" icon_state = "ore_silver" origin_tech = list(TECH_MATERIAL = 3) material = "silver" -/obj/item/weapon/ore/gold +/obj/item/ore/gold name = "native gold ore" icon_state = "ore_gold" origin_tech = list(TECH_MATERIAL = 4) material = "gold" -/obj/item/weapon/ore/diamond +/obj/item/ore/diamond name = "diamonds" icon_state = "ore_diamond" origin_tech = list(TECH_MATERIAL = 6) material = "diamond" -/obj/item/weapon/ore/osmium +/obj/item/ore/osmium name = "raw platinum" icon_state = "ore_platinum" material = "platinum" -/obj/item/weapon/ore/hydrogen +/obj/item/ore/hydrogen name = "raw hydrogen" icon_state = "ore_hydrogen" material = "mhydrogen" -/obj/item/weapon/ore/verdantium +/obj/item/ore/verdantium name = "verdantite dust" icon_state = "ore_verdantium" material = MAT_VERDANTIUM origin_tech = list(TECH_MATERIAL = 7) // POCKET ... Crystal dust. -/obj/item/weapon/ore/verdantium/throw_impact(atom/hit_atom) +/obj/item/ore/verdantium/throw_impact(atom/hit_atom) ..() var/mob/living/carbon/human/H = hit_atom if(istype(H) && H.has_eyes() && prob(85)) @@ -101,71 +101,71 @@ spawn(1) if(istype(loc, /turf/)) qdel(src) -/obj/item/weapon/ore/lead +/obj/item/ore/lead name = "lead glance" icon_state = "ore_lead" material = MAT_LEAD origin_tech = list(TECH_MATERIAL = 3) /* -/obj/item/weapon/ore/copper +/obj/item/ore/copper name = "raw copper" icon_state = "ore_copper" material = "copper" -/obj/item/weapon/ore/tin +/obj/item/ore/tin name = "raw tin" icon_state = "ore_tin" material = "tin" -/obj/item/weapon/ore/bauxite +/obj/item/ore/bauxite name = "raw bauxite" icon_state = "ore_bauxite" material = "bauxite" */ -/obj/item/weapon/ore/rutile +/obj/item/ore/rutile name = "raw rutile" icon_state = "ore_rutile" material = "rutile" /* -/obj/item/weapon/ore/void_opal +/obj/item/ore/void_opal name = "raw void opal" icon_state = "ore_void_opal" material = "void opal" -/obj/item/weapon/ore/painite +/obj/item/ore/painite name = "raw painite" icon_state = "ore_painite" material = "painite" -/obj/item/weapon/ore/quartz +/obj/item/ore/quartz name = "raw quartz" icon_state = "ore_quartz" material = "quartz" */ -/obj/item/weapon/ore/slag +/obj/item/ore/slag name = "Slag" desc = "Someone screwed up..." icon_state = "slag" material = null -/obj/item/weapon/ore/Initialize() +/obj/item/ore/Initialize() . = ..() randpixel_xy() -/obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/device/core_sampler)) - var/obj/item/device/core_sampler/C = W +/obj/item/ore/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W,/obj/item/core_sampler)) + var/obj/item/core_sampler/C = W C.sample_item(src, user) else return ..() //VOREStation Add -/obj/item/weapon/ore/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/ore/attack(mob/living/M as mob, mob/living/user as mob) if(M.handle_eat_minerals(src, user)) return ..() -/obj/item/weapon/ore/attack_generic(var/mob/living/user) //Allow adminbussed mobs to eat ore if they click it while NOT on help intent. +/obj/item/ore/attack_generic(var/mob/living/user) //Allow adminbussed mobs to eat ore if they click it while NOT on help intent. if(user.handle_eat_minerals(src)) return ..() diff --git a/code/modules/mining/ore_box.dm b/code/modules/mining/ore_box.dm index 98e8aa5dea2..ad236de2a9e 100644 --- a/code/modules/mining/ore_box.dm +++ b/code/modules/mining/ore_box.dm @@ -30,15 +30,15 @@ "rutile" = 0) -/obj/structure/ore_box/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/ore)) - var/obj/item/weapon/ore/ore = W +/obj/structure/ore_box/attackby(obj/item/W as obj, mob/user as mob) + if (istype(W, /obj/item/ore)) + var/obj/item/ore/ore = W stored_ore[ore.material]++ user.remove_from_mob(W) qdel(ore) - else if (istype(W, /obj/item/weapon/storage/bag/ore)) - var/obj/item/weapon/storage/bag/ore/S = W + else if (istype(W, /obj/item/storage/bag/ore)) + var/obj/item/storage/bag/ore/S = W S.hide_from(user) for(var/ore in S.stored_ore) if(S.stored_ore[ore] > 0) @@ -55,7 +55,7 @@ stored_ore = list() - for(var/obj/item/weapon/ore/O in contents) + for(var/obj/item/ore/O in contents) if(stored_ore[O.name]) stored_ore[O.name]++ @@ -100,7 +100,7 @@ // to_chat(usr, "The ore box is empty.") // return // -// for (var/obj/item/weapon/ore/O in contents) +// for (var/obj/item/ore/O in contents) // contents -= O // O.loc = src.loc // to_chat(usr, "You empty the ore box.") diff --git a/code/modules/mining/ore_datum.dm b/code/modules/mining/ore_datum.dm index 382e31b8bdf..697abc9c7c3 100644 --- a/code/modules/mining/ore_datum.dm +++ b/code/modules/mining/ore_datum.dm @@ -28,7 +28,7 @@ smelts_to = "uranium" result_amount = 5 spread_chance = 10 - ore = /obj/item/weapon/ore/uranium + ore = /obj/item/ore/uranium scan_icon = "mineral_uncommon" xarch_ages = list( "thousand" = 999, @@ -44,7 +44,7 @@ alloy = 1 result_amount = 5 spread_chance = 25 - ore = /obj/item/weapon/ore/iron + ore = /obj/item/ore/iron scan_icon = "mineral_common" reagent = "iron" @@ -56,7 +56,7 @@ alloy = 1 result_amount = 5 spread_chance = 25 - ore = /obj/item/weapon/ore/coal + ore = /obj/item/ore/coal scan_icon = "mineral_common" reagent = "carbon" @@ -74,7 +74,7 @@ //smelts_to = something that explodes violently on the conveyor, huhuhuhu result_amount = 5 spread_chance = 25 - ore = /obj/item/weapon/ore/phoron + ore = /obj/item/ore/phoron scan_icon = "mineral_uncommon" xarch_ages = list( "thousand" = 999, @@ -91,7 +91,7 @@ smelts_to = "silver" result_amount = 5 spread_chance = 10 - ore = /obj/item/weapon/ore/silver + ore = /obj/item/ore/silver scan_icon = "mineral_uncommon" reagent = "silver" @@ -101,7 +101,7 @@ display_name = "native gold" result_amount = 5 spread_chance = 10 - ore = /obj/item/weapon/ore/gold + ore = /obj/item/ore/gold scan_icon = "mineral_uncommon" xarch_ages = list( "thousand" = 999, @@ -118,7 +118,7 @@ compresses_to = "diamond" result_amount = 5 spread_chance = 10 - ore = /obj/item/weapon/ore/diamond + ore = /obj/item/ore/diamond scan_icon = "mineral_rare" xarch_source_mineral = "nitrogen" reagent = "carbon" @@ -131,7 +131,7 @@ alloy = 1 result_amount = 5 spread_chance = 10 - ore = /obj/item/weapon/ore/osmium + ore = /obj/item/ore/osmium scan_icon = "mineral_rare" reagent = "platinum" @@ -149,7 +149,7 @@ compresses_to = MAT_VERDANTIUM result_amount = 2 spread_chance = 5 - ore = /obj/item/weapon/ore/verdantium + ore = /obj/item/ore/verdantium scan_icon = "mineral_rare" xarch_ages = list( "billion" = 13, @@ -162,7 +162,7 @@ compresses_to = "marble" result_amount = 1 spread_chance = 10 - ore = /obj/item/weapon/ore/marble + ore = /obj/item/ore/marble scan_icon = "mineral_common" reagent = "calciumcarbonate" @@ -172,7 +172,7 @@ smelts_to = "lead" result_amount = 3 spread_chance = 20 - ore = /obj/item/weapon/ore/lead + ore = /obj/item/ore/lead scan_icon = "mineral_rare" reagent = "lead" /* @@ -183,7 +183,7 @@ alloy = 1 result_amount = 5 spread_chance = 15 - ore = /obj/item/weapon/ore/copper + ore = /obj/item/ore/copper scan_icon = "mineral_common" reagent = "copper" @@ -194,7 +194,7 @@ alloy = 1 result_amount = 5 spread_chance = 10 - ore = /obj/item/weapon/ore/tin + ore = /obj/item/ore/tin scan_icon = "mineral_common" /ore/quartz @@ -203,7 +203,7 @@ compresses_to = "quartz" result_amount = 5 spread_chance = 5 - ore = /obj/item/weapon/ore/quartz + ore = /obj/item/ore/quartz scan_icon = "mineral_common" /ore/bauxite @@ -212,7 +212,7 @@ smelts_to = "aluminium" result_amount = 5 spread_chance = 25 - ore = /obj/item/weapon/ore/bauxite + ore = /obj/item/ore/bauxite scan_icon = "mineral_common" reagent = "aluminum" */ @@ -223,7 +223,7 @@ result_amount = 5 spread_chance = 12 alloy = 1 - ore = /obj/item/weapon/ore/rutile + ore = /obj/item/ore/rutile scan_icon = "mineral_uncommon" /* /ore/painite @@ -232,7 +232,7 @@ compresses_to = "painite" result_amount = 5 spread_chance = 3 - ore = /obj/item/weapon/ore/painite + ore = /obj/item/ore/painite scan_icon = "mineral_rare" /ore/void_opal @@ -241,6 +241,6 @@ compresses_to = "void opal" result_amount = 5 spread_chance = 1 - ore = /obj/item/weapon/ore/void_opal + ore = /obj/item/ore/void_opal scan_icon = "mineral_rare" */ \ No newline at end of file diff --git a/code/modules/mining/ore_datum_vr.dm b/code/modules/mining/ore_datum_vr.dm index 91171367f4d..a8413cbd0c9 100644 --- a/code/modules/mining/ore_datum_vr.dm +++ b/code/modules/mining/ore_datum_vr.dm @@ -5,5 +5,5 @@ alloy = 1 result_amount = 5 spread_chance = 10 - ore = /obj/item/weapon/ore/rutile + ore = /obj/item/ore/rutile scan_icon = "mineral_rare" \ No newline at end of file diff --git a/code/modules/mining/ore_redemption_machine/construction.dm b/code/modules/mining/ore_redemption_machine/construction.dm index 3880ef5cb8a..77b55ea2e12 100644 --- a/code/modules/mining/ore_redemption_machine/construction.dm +++ b/code/modules/mining/ore_redemption_machine/construction.dm @@ -2,20 +2,20 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/mining_equipment_vendor +/obj/item/circuitboard/mining_equipment_vendor name = T_BOARD("Mining Equipment Vendor") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/mineral/equipment_vendor origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 3) req_components = list( - /obj/item/weapon/stock_parts/console_screen = 1, - /obj/item/weapon/stock_parts/matter_bin = 3) + /obj/item/stock_parts/console_screen = 1, + /obj/item/stock_parts/matter_bin = 3) -/obj/item/weapon/circuitboard/exploration_equipment_vendor +/obj/item/circuitboard/exploration_equipment_vendor name = T_BOARD("Exploration Equipment Vendor") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/mineral/equipment_vendor/survey origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 2) req_components = list( - /obj/item/weapon/stock_parts/console_screen = 1, - /obj/item/weapon/stock_parts/matter_bin = 3) + /obj/item/stock_parts/console_screen = 1, + /obj/item/stock_parts/matter_bin = 3) diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm index 43b4ed8e703..dc07d5933d5 100644 --- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm @@ -13,29 +13,29 @@ anchored = TRUE var/icon_deny = "minevend-deny" var/icon_vend = "minevend-vend" - circuit = /obj/item/weapon/circuitboard/mining_equipment_vendor - var/obj/item/weapon/card/id/inserted_id + circuit = /obj/item/circuitboard/mining_equipment_vendor + var/obj/item/card/id/inserted_id var/list/prize_list = list( new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 10), new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 100), new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 300), - new /datum/data/mining_equipment("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 125), - new /datum/data/mining_equipment("Absinthe", /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, 125), + new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125), + new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125), new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 150), - new /datum/data/mining_equipment("Soap", /obj/item/weapon/soap/nanotrasen, 200), - new /datum/data/mining_equipment("Laser Pointer", /obj/item/device/laser_pointer, 900), - new /datum/data/mining_equipment("Geiger Counter", /obj/item/device/geiger, 750), + new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 200), + new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 900), + new /datum/data/mining_equipment("Geiger Counter", /obj/item/geiger, 750), new /datum/data/mining_equipment("Plush Toy", /obj/random/plushie, 300), - new /datum/data/mining_equipment("Umbrella", /obj/item/weapon/melee/umbrella/random, 200), + new /datum/data/mining_equipment("Umbrella", /obj/item/melee/umbrella/random, 200), // new /datum/data/mining_equipment("Fulton Beacon", /obj/item/fulton_core, 500), - new /datum/data/mining_equipment("Point Transfer Card", /obj/item/weapon/card/mining_point_card, 500), + new /datum/data/mining_equipment("Point Transfer Card", /obj/item/card/mining_point_card, 500), // new /datum/data/mining_equipment("Fulton Pack", /obj/item/extraction_pack, 1200), -// new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/weapon/pickaxe/silver, 1200), -// new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/weapon/pickaxe/diamond, 2000), - new /datum/data/mining_equipment("Fishing Net", /obj/item/weapon/material/fishing_net, 500), - new /datum/data/mining_equipment("Titanium Fishing Rod", /obj/item/weapon/material/fishing_rod/modern, 1000), -// new /datum/data/mining_equipment("Space Cash", /obj/item/weapon/spacecash/c1000, 2000), - new /datum/data/mining_equipment("Industrial Hardsuit - Control Module", /obj/item/weapon/rig/industrial, 10000), +// new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 1200), +// new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/pickaxe/diamond, 2000), + new /datum/data/mining_equipment("Fishing Net", /obj/item/material/fishing_net, 500), + new /datum/data/mining_equipment("Titanium Fishing Rod", /obj/item/material/fishing_rod/modern, 1000), +// new /datum/data/mining_equipment("Space Cash", /obj/item/spacecash/c1000, 2000), + new /datum/data/mining_equipment("Industrial Hardsuit - Control Module", /obj/item/rig/industrial, 10000), new /datum/data/mining_equipment("Industrial Hardsuit - Plasma Cutter", /obj/item/rig_module/device/plasmacutter, 800), new /datum/data/mining_equipment("Industrial Hardsuit - Drill", /obj/item/rig_module/device/drill, 5000), new /datum/data/mining_equipment("Industrial Hardsuit - Ore Scanner", /obj/item/rig_module/device/orescanner, 1000), @@ -43,20 +43,20 @@ new /datum/data/mining_equipment("Industrial Hardsuit - Maneuvering Jets", /obj/item/rig_module/maneuvering_jets, 1250), new /datum/data/mining_equipment("Hardsuit - Intelligence Storage", /obj/item/rig_module/ai_container, 2500), new /datum/data/mining_equipment("Hardsuit - Smoke Bomb Deployer", /obj/item/rig_module/grenade_launcher/smoke, 2000), - new /datum/data/mining_equipment("Industrial Equipment - Phoron Bore", /obj/item/weapon/gun/magnetic/matfed/phoronbore/loaded, 3000), - new /datum/data/mining_equipment("Industrial Equipment - Sheet-Snatcher",/obj/item/weapon/storage/bag/sheetsnatcher, 500), + new /datum/data/mining_equipment("Industrial Equipment - Phoron Bore", /obj/item/gun/magnetic/matfed/phoronbore/loaded, 3000), + new /datum/data/mining_equipment("Industrial Equipment - Sheet-Snatcher",/obj/item/storage/bag/sheetsnatcher, 500), new /datum/data/mining_equipment("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 500), new /datum/data/mining_equipment("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 1000), - new /datum/data/mining_equipment("Explosive Excavation Kit - Plastic Charge",/obj/item/weapon/plastique/seismic, 1500), - new /datum/data/mining_equipment("Injector (L) - Glucose",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose, 500), - new /datum/data/mining_equipment("Injector (L) - Panacea",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity, 500), - new /datum/data/mining_equipment("Injector (L) - Trauma",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute, 500), + new /datum/data/mining_equipment("Explosive Excavation Kit - Plastic Charge",/obj/item/plastique/seismic, 1500), + new /datum/data/mining_equipment("Injector (L) - Glucose",/obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose, 500), + new /datum/data/mining_equipment("Injector (L) - Panacea",/obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity, 500), + new /datum/data/mining_equipment("Injector (L) - Trauma",/obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute, 500), new /datum/data/mining_equipment("Nanopaste Tube", /obj/item/stack/nanopaste, 1000), - new /datum/data/mining_equipment("Defense Equipment - Phase Pistol",/obj/item/weapon/gun/energy/phasegun/pistol, 400), - new /datum/data/mining_equipment("Defense Equipment - Smoke Bomb",/obj/item/weapon/grenade/smokebomb, 100), - new /datum/data/mining_equipment("Defense Equipment - Razor Drone Deployer",/obj/item/weapon/grenade/spawnergrenade/manhacks/station, 1000), - new /datum/data/mining_equipment("Defense Equipment - Sentry Drone Deployer",/obj/item/weapon/grenade/spawnergrenade/ward, 1500), - new /datum/data/mining_equipment("Defense Equipment - Steel Machete", /obj/item/weapon/material/knife/machete, 500) + new /datum/data/mining_equipment("Defense Equipment - Phase Pistol",/obj/item/gun/energy/phasegun/pistol, 400), + new /datum/data/mining_equipment("Defense Equipment - Smoke Bomb",/obj/item/grenade/smokebomb, 100), + new /datum/data/mining_equipment("Defense Equipment - Razor Drone Deployer",/obj/item/grenade/spawnergrenade/manhacks/station, 1000), + new /datum/data/mining_equipment("Defense Equipment - Sentry Drone Deployer",/obj/item/grenade/spawnergrenade/ward, 1500), + new /datum/data/mining_equipment("Defense Equipment - Steel Machete", /obj/item/material/knife/machete, 500) ) var/dirty_items = FALSE // Used to refresh the static/redundant data in case the machine gets VV'd @@ -75,45 +75,45 @@ //VOREStation Edit Start - Heavily modified list prize_list = list() prize_list["Gear"] = list( - // TODO EQUIPMENT("Advanced Scanner", /obj/item/device/t_scanner/adv_mining_scanner, 800), + // TODO EQUIPMENT("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800), // TODO EQUIPMENT("Explorer's Webbing", /obj/item/storage/belt/mining, 500), - EQUIPMENT("Defense Equipment - Plasteel Machete", /obj/item/weapon/material/knife/machete, 500), - EQUIPMENT("Defense Equipment - Razor Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked, 1000), - EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/ward, 1500), - EQUIPMENT("Defense Equipment - Smoke Bomb", /obj/item/weapon/grenade/smokebomb, 100), - EQUIPMENT("Hybrid Equipment - Proto-Kinetic Dagger", /obj/item/weapon/kinetic_crusher/machete/dagger, 500), - EQUIPMENT("Hybrid Equipment - Proto-Kinetic Machete", /obj/item/weapon/kinetic_crusher/machete, 1000), - EQUIPMENT("Durasteel Fishing Rod", /obj/item/weapon/material/fishing_rod/modern/strong, 7500), - EQUIPMENT("Titanium Fishing Rod", /obj/item/weapon/material/fishing_rod/modern, 1000), - EQUIPMENT("Fishing Net", /obj/item/weapon/material/fishing_net, 500), + EQUIPMENT("Defense Equipment - Plasteel Machete", /obj/item/material/knife/machete, 500), + EQUIPMENT("Defense Equipment - Razor Drone Deployer", /obj/item/grenade/spawnergrenade/manhacks/station/locked, 1000), + EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/grenade/spawnergrenade/ward, 1500), + EQUIPMENT("Defense Equipment - Smoke Bomb", /obj/item/grenade/smokebomb, 100), + EQUIPMENT("Hybrid Equipment - Proto-Kinetic Dagger", /obj/item/kinetic_crusher/machete/dagger, 500), + EQUIPMENT("Hybrid Equipment - Proto-Kinetic Machete", /obj/item/kinetic_crusher/machete, 1000), + EQUIPMENT("Durasteel Fishing Rod", /obj/item/material/fishing_rod/modern/strong, 7500), + EQUIPMENT("Titanium Fishing Rod", /obj/item/material/fishing_rod/modern, 1000), + EQUIPMENT("Fishing Net", /obj/item/material/fishing_net, 500), EQUIPMENT("Fulton Beacon", /obj/item/fulton_core, 500), - EQUIPMENT("Geiger Counter", /obj/item/device/geiger, 750), - EQUIPMENT("GPS Device", /obj/item/device/gps/mining, 100), + EQUIPMENT("Geiger Counter", /obj/item/geiger, 750), + EQUIPMENT("GPS Device", /obj/item/gps/mining, 100), // EQUIPMENT("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1000), EQUIPMENT("Jump Boots", /obj/item/clothing/shoes/bhop, 2500), - EQUIPMENT("Mini-Translocator", /obj/item/device/perfect_tele/one_beacon, 1200), + EQUIPMENT("Mini-Translocator", /obj/item/perfect_tele/one_beacon, 1200), EQUIPMENT("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 750), - EQUIPMENT("Mining Satchel of Holding", /obj/item/weapon/storage/bag/ore/holding, 1500), - EQUIPMENT("Advanced Ore Scanner", /obj/item/weapon/mining_scanner/advanced, 500), + EQUIPMENT("Mining Satchel of Holding", /obj/item/storage/bag/ore/holding, 1500), + EQUIPMENT("Advanced Ore Scanner", /obj/item/mining_scanner/advanced, 500), ) prize_list["Consumables"] = list( EQUIPMENT("1 Marker Beacon", /obj/item/stack/marker_beacon, 1), EQUIPMENT("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 10), EQUIPMENT("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 30), EQUIPMENT("Fulton Pack", /obj/item/extraction_pack, 1200), - EQUIPMENT("Injector (L) - Glucose", /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose, 500), - EQUIPMENT("Injector (L) - Panacea", /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity, 500), - EQUIPMENT("Injector (L) - Trauma", /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute, 500), + EQUIPMENT("Injector (L) - Glucose", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose, 500), + EQUIPMENT("Injector (L) - Panacea", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity, 500), + EQUIPMENT("Injector (L) - Trauma", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute, 500), EQUIPMENT("Nanopaste Tube", /obj/item/stack/nanopaste, 1000), - EQUIPMENT("Point Transfer Card", /obj/item/weapon/card/mining_point_card, 500), - EQUIPMENT("Shelter Capsule", /obj/item/device/survivalcapsule, 500), - EQUIPMENT("Burn Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn, 250), - EQUIPMENT("Detox Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, 250), - EQUIPMENT("Oxy Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, 250), - EQUIPMENT("Trauma Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma, 250), + EQUIPMENT("Point Transfer Card", /obj/item/card/mining_point_card, 500), + EQUIPMENT("Shelter Capsule", /obj/item/survivalcapsule, 500), + EQUIPMENT("Burn Medipen", /obj/item/reagent_containers/hypospray/autoinjector/burn, 250), + EQUIPMENT("Detox Medipen", /obj/item/reagent_containers/hypospray/autoinjector/detox, 250), + EQUIPMENT("Oxy Medipen", /obj/item/reagent_containers/hypospray/autoinjector/oxy, 250), + EQUIPMENT("Trauma Medipen", /obj/item/reagent_containers/hypospray/autoinjector/trauma, 250), ) prize_list["Kinetic Accelerator"] = list( - EQUIPMENT("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 900), + EQUIPMENT("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 900), EQUIPMENT("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000), EQUIPMENT("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000), EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1200), @@ -125,24 +125,24 @@ EQUIPMENT("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 300), EQUIPMENT("KA Adjustable Tracer Rounds",/obj/item/borg/upgrade/modkit/tracer/adjustable, 175), EQUIPMENT("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 125), - EQUIPMENT("Premium Kinetic Accelerator",/obj/item/weapon/gun/energy/kinetic_accelerator/premiumka, 12000), + EQUIPMENT("Premium Kinetic Accelerator",/obj/item/gun/energy/kinetic_accelerator/premiumka, 12000), ) prize_list["Digging Tools"] = list( - // EQUIPMENT("Diamond Pickaxe", /obj/item/weapon/pickaxe/diamond, 2000), + // EQUIPMENT("Diamond Pickaxe", /obj/item/pickaxe/diamond, 2000), // EQUIPMENT("Kinetic Crusher", /obj/item/twohanded/required/kinetic_crusher, 750), EQUIPMENT("Resonator", /obj/item/resonator, 900), - EQUIPMENT("Silver Pickaxe", /obj/item/weapon/pickaxe/silver, 1200), + EQUIPMENT("Silver Pickaxe", /obj/item/pickaxe/silver, 1200), EQUIPMENT("Super Resonator", /obj/item/resonator/upgraded, 2500), - EQUIPMENT("Fine Excavation Kit - Chisels", /obj/item/weapon/storage/excavation, 500), - EQUIPMENT("Fine Excavation Kit - Measuring Tape", /obj/item/device/measuring_tape, 125), - EQUIPMENT("Fine Excavation Kit - Hand Pick", /obj/item/weapon/pickaxe/hand, 375), - EQUIPMENT("Explosive Excavation Kit - Plastic Charge",/obj/item/weapon/plastique/seismic/locked, 1500), - EQUIPMENT("Industrial Equipment - Phoron Bore", /obj/item/weapon/gun/magnetic/matfed/phoronbore/loaded, 3000), - EQUIPMENT("Industrial Equipment - Inducer", /obj/item/weapon/inducer, 3500), - EQUIPMENT("Industrial Equipment - Sheet-Snatcher", /obj/item/weapon/storage/bag/sheetsnatcher, 500), + EQUIPMENT("Fine Excavation Kit - Chisels", /obj/item/storage/excavation, 500), + EQUIPMENT("Fine Excavation Kit - Measuring Tape", /obj/item/measuring_tape, 125), + EQUIPMENT("Fine Excavation Kit - Hand Pick", /obj/item/pickaxe/hand, 375), + EQUIPMENT("Explosive Excavation Kit - Plastic Charge",/obj/item/plastique/seismic/locked, 1500), + EQUIPMENT("Industrial Equipment - Phoron Bore", /obj/item/gun/magnetic/matfed/phoronbore/loaded, 3000), + EQUIPMENT("Industrial Equipment - Inducer", /obj/item/inducer, 3500), + EQUIPMENT("Industrial Equipment - Sheet-Snatcher", /obj/item/storage/bag/sheetsnatcher, 500), ) prize_list["Hardsuit"] = list( - EQUIPMENT("Hardsuit - Control Module", /obj/item/weapon/rig/industrial/vendor, 2000), + EQUIPMENT("Hardsuit - Control Module", /obj/item/rig/industrial/vendor, 2000), EQUIPMENT("Hardsuit - Drill", /obj/item/rig_module/device/drill, 5000), EQUIPMENT("Hardsuit - Intelligence Storage", /obj/item/rig_module/ai_container, 2500), EQUIPMENT("Hardsuit - Maneuvering Jets", /obj/item/rig_module/maneuvering_jets, 1250), @@ -153,19 +153,19 @@ EQUIPMENT("Hardsuit - Proto-Kinetic Gauntlets", /obj/item/rig_module/gauntlets, 2000), ) prize_list["Miscellaneous"] = list( - EQUIPMENT("Absinthe", /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, 125), + EQUIPMENT("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125), EQUIPMENT("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 150), EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 500), EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 1000), - EQUIPMENT("Laser Pointer", /obj/item/device/laser_pointer, 900), - EQUIPMENT("Luxury Shelter Capsule", /obj/item/device/survivalcapsule/luxury, 3100), - EQUIPMENT("Bar Shelter Capsule", /obj/item/device/survivalcapsule/luxurybar, 10000), + EQUIPMENT("Laser Pointer", /obj/item/laser_pointer, 900), + EQUIPMENT("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3100), + EQUIPMENT("Bar Shelter Capsule", /obj/item/survivalcapsule/luxurybar, 10000), EQUIPMENT("Plush Toy", /obj/random/plushie, 300), - EQUIPMENT("Soap", /obj/item/weapon/soap/nanotrasen, 200), - EQUIPMENT("Thalers - 100", /obj/item/weapon/spacecash/c100, 1000), - EQUIPMENT("Thalers - 1000", /obj/item/weapon/spacecash/c1000, 10000), - EQUIPMENT("Umbrella", /obj/item/weapon/melee/umbrella/random, 200), - EQUIPMENT("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 125), + EQUIPMENT("Soap", /obj/item/soap/nanotrasen, 200), + EQUIPMENT("Thalers - 100", /obj/item/spacecash/c100, 1000), + EQUIPMENT("Thalers - 1000", /obj/item/spacecash/c1000, 10000), + EQUIPMENT("Umbrella", /obj/item/melee/umbrella/random, 200), + EQUIPMENT("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125), EQUIPMENT("Mining PSG Upgrade Disk", /obj/item/borg/upgrade/shield_upgrade, 2500), ) prize_list["Extra"] = list() // Used in child vendors @@ -215,12 +215,12 @@ return data -/obj/machinery/mineral/equipment_vendor/proc/get_points(obj/item/weapon/card/id/target) +/obj/machinery/mineral/equipment_vendor/proc/get_points(obj/item/card/id/target) if(!istype(target)) return 0 return target.mining_points -/obj/machinery/mineral/equipment_vendor/proc/remove_points(obj/item/weapon/card/id/target, amt) +/obj/machinery/mineral/equipment_vendor/proc/remove_points(obj/item/card/id/target, amt) target.mining_points -= amt /obj/machinery/mineral/equipment_vendor/tgui_static_data(mob/user) @@ -307,7 +307,7 @@ return redeem_voucher(I, user) return - if(istype(I,/obj/item/weapon/card/id)) + if(istype(I,/obj/item/card/id)) if(!powered()) return else if(!inserted_id && (user.unEquip(I) || isrobot(user))) @@ -337,14 +337,14 @@ var/drop_location = drop_location() switch(selection) if("Kinetic Accelerator") - new /obj/item/weapon/gun/energy/kinetic_accelerator(drop_location) + new /obj/item/gun/energy/kinetic_accelerator(drop_location) if("Resonator") new /obj/item/resonator(drop_location) //VOREStation Edit End // if("Mining Drone") // new /obj/item/storage/box/drone_kit(drop_location) // if("Advanced Scanner") - // new /obj/item/device/t_scanner/adv_mining_scanner(drop_location) + // new /obj/item/t_scanner/adv_mining_scanner(drop_location) // if("Crusher") // new /obj/item/twohanded/required/mining_hammer(drop_location) qdel(voucher) diff --git a/code/modules/mining/ore_redemption_machine/mine_point_items.dm b/code/modules/mining/ore_redemption_machine/mine_point_items.dm index 0e47e89b2ea..42886cdd150 100644 --- a/code/modules/mining/ore_redemption_machine/mine_point_items.dm +++ b/code/modules/mining/ore_redemption_machine/mine_point_items.dm @@ -11,16 +11,16 @@ /**********************Mining Point Card**********************/ -/obj/item/weapon/card/mining_point_card +/obj/item/card/mining_point_card name = "mining point card" desc = "A small card preloaded with mining points. Swipe your ID card over it to transfer the points, then discard." icon_state = "data" var/mine_points = 500 var/survey_points = 0 -/obj/item/weapon/card/mining_point_card/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/card/id)) - var/obj/item/weapon/card/id/C = I +/obj/item/card/mining_point_card/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/card/id)) + var/obj/item/card/id/C = I if(mine_points) C.mining_points += mine_points to_chat(user, "You transfer [mine_points] excavation points to [C].") @@ -37,11 +37,11 @@ ..() -/obj/item/weapon/card/mining_point_card/examine(mob/user) +/obj/item/card/mining_point_card/examine(mob/user) . = ..() . += "There's [mine_points] excavation points on the card." . += "There's [survey_points] survey points on the card." -/obj/item/weapon/card/mining_point_card/survey +/obj/item/card/mining_point_card/survey mine_points = 0 survey_points = 50 diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 29249cf9aa1..8dc21454b47 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -5,43 +5,43 @@ icon_state = "exploration" //VOREStation Edit density = TRUE anchored = TRUE - circuit = /obj/item/weapon/circuitboard/exploration_equipment_vendor + circuit = /obj/item/circuitboard/exploration_equipment_vendor icon_deny = "exploration-deny" //VOREStation Edit icon_vend = "exploration-vend" //VOREStation Add prize_list = list( new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 1), new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 10), new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 30), - new /datum/data/mining_equipment("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 120), - new /datum/data/mining_equipment("Absinthe", /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, 120), + new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 120), + new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 120), new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 15), - new /datum/data/mining_equipment("Soap", /obj/item/weapon/soap/nanotrasen, 20), - new /datum/data/mining_equipment("Laser Pointer", /obj/item/device/laser_pointer, 90), - new /datum/data/mining_equipment("Geiger Counter", /obj/item/device/geiger, 75), + new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 20), + new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 90), + new /datum/data/mining_equipment("Geiger Counter", /obj/item/geiger, 75), new /datum/data/mining_equipment("Plush Toy", /obj/random/plushie, 30), - new /datum/data/mining_equipment("Umbrella", /obj/item/weapon/melee/umbrella/random, 10), + new /datum/data/mining_equipment("Umbrella", /obj/item/melee/umbrella/random, 10), new /datum/data/mining_equipment("Extraction Equipment - Fulton Beacon", /obj/item/fulton_core, 100), new /datum/data/mining_equipment("Extraction Equipment - Fulton Pack", /obj/item/extraction_pack, 50), - new /datum/data/mining_equipment("Point Transfer Card", /obj/item/weapon/card/mining_point_card/survey, 50), - new /datum/data/mining_equipment("Fishing Net", /obj/item/weapon/material/fishing_net, 50), - new /datum/data/mining_equipment("Titanium Fishing Rod", /obj/item/weapon/material/fishing_rod/modern, 50), - new /datum/data/mining_equipment("Direct Payment - 1000", /obj/item/weapon/spacecash/c1000, 500), - new /datum/data/mining_equipment("Industrial Equipment - Phoron Bore", /obj/item/weapon/gun/magnetic/matfed/phoronbore/loaded, 500), - new /datum/data/mining_equipment("Survey Tools - Mapping Unit", /obj/item/device/mapping_unit, 150), - new /datum/data/mining_equipment("Survey Tools - Mapping Beacon",/obj/item/device/holomap_beacon, 25), - new /datum/data/mining_equipment("Survey Tools - Shovel", /obj/item/weapon/shovel, 20), - new /datum/data/mining_equipment("Survey Tools - Mechanical Trap", /obj/item/weapon/beartrap, 30), + new /datum/data/mining_equipment("Point Transfer Card", /obj/item/card/mining_point_card/survey, 50), + new /datum/data/mining_equipment("Fishing Net", /obj/item/material/fishing_net, 50), + new /datum/data/mining_equipment("Titanium Fishing Rod", /obj/item/material/fishing_rod/modern, 50), + new /datum/data/mining_equipment("Direct Payment - 1000", /obj/item/spacecash/c1000, 500), + new /datum/data/mining_equipment("Industrial Equipment - Phoron Bore", /obj/item/gun/magnetic/matfed/phoronbore/loaded, 500), + new /datum/data/mining_equipment("Survey Tools - Mapping Unit", /obj/item/mapping_unit, 150), + new /datum/data/mining_equipment("Survey Tools - Mapping Beacon",/obj/item/holomap_beacon, 25), + new /datum/data/mining_equipment("Survey Tools - Shovel", /obj/item/shovel, 20), + new /datum/data/mining_equipment("Survey Tools - Mechanical Trap", /obj/item/beartrap, 30), new /datum/data/mining_equipment("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 100), new /datum/data/mining_equipment("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 300), - new /datum/data/mining_equipment("Injector (L) - Glucose",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose, 30), - new /datum/data/mining_equipment("Injector (L) - Panacea",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity, 30), - new /datum/data/mining_equipment("Injector (L) - Trauma",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute, 50), + new /datum/data/mining_equipment("Injector (L) - Glucose",/obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose, 30), + new /datum/data/mining_equipment("Injector (L) - Panacea",/obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity, 30), + new /datum/data/mining_equipment("Injector (L) - Trauma",/obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute, 50), new /datum/data/mining_equipment("Nanopaste Tube", /obj/item/stack/nanopaste, 50), - new /datum/data/mining_equipment("Defense Equipment - Phase Pistol",/obj/item/weapon/gun/energy/phasegun/pistol, 15), - new /datum/data/mining_equipment("Defense Equipment - Smoke Bomb",/obj/item/weapon/grenade/smokebomb, 50), - new /datum/data/mining_equipment("Defense Equipment - Razor Drone Deployer",/obj/item/weapon/grenade/spawnergrenade/manhacks/station, 50), - new /datum/data/mining_equipment("Defense Equipment - Sentry Drone Deployer",/obj/item/weapon/grenade/spawnergrenade/ward, 100), - new /datum/data/mining_equipment("Defense Equipment - Steel Machete", /obj/item/weapon/material/knife/machete, 50), + new /datum/data/mining_equipment("Defense Equipment - Phase Pistol",/obj/item/gun/energy/phasegun/pistol, 15), + new /datum/data/mining_equipment("Defense Equipment - Smoke Bomb",/obj/item/grenade/smokebomb, 50), + new /datum/data/mining_equipment("Defense Equipment - Razor Drone Deployer",/obj/item/grenade/spawnergrenade/manhacks/station, 50), + new /datum/data/mining_equipment("Defense Equipment - Sentry Drone Deployer",/obj/item/grenade/spawnergrenade/ward, 100), + new /datum/data/mining_equipment("Defense Equipment - Steel Machete", /obj/item/material/knife/machete, 50), new /datum/data/mining_equipment("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 75) ) @@ -50,27 +50,27 @@ //VOREStation Edit Start - Heavily modified list prize_list = list() prize_list["Gear"] = list( - EQUIPMENT("Defense Equipment - Smoke Bomb", /obj/item/weapon/grenade/smokebomb, 10), - EQUIPMENT("Defense Equipment - Plasteel Machete", /obj/item/weapon/material/knife/machete, 50), - EQUIPMENT("Defense Equipment - Razor Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked, 100), - EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/ward, 150), -// EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 750), //VOREStation removal - EQUIPMENT("Hybrid Equipment - Proto-Kinetic Dagger", /obj/item/weapon/kinetic_crusher/machete/dagger, 75), - EQUIPMENT("Hybrid Equipment - Proto-Kinetic Machete", /obj/item/weapon/kinetic_crusher/machete, 250), - EQUIPMENT("Fishing Net", /obj/item/weapon/material/fishing_net, 50), - EQUIPMENT("Titanium Fishing Rod", /obj/item/weapon/material/fishing_rod/modern, 100), - EQUIPMENT("Durasteel Fishing Rod", /obj/item/weapon/material/fishing_rod/modern/strong, 750), + EQUIPMENT("Defense Equipment - Smoke Bomb", /obj/item/grenade/smokebomb, 10), + EQUIPMENT("Defense Equipment - Plasteel Machete", /obj/item/material/knife/machete, 50), + EQUIPMENT("Defense Equipment - Razor Drone Deployer", /obj/item/grenade/spawnergrenade/manhacks/station/locked, 100), + EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/grenade/spawnergrenade/ward, 150), +// EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/gun/energy/locked/frontier/carbine, 750), //VOREStation removal + EQUIPMENT("Hybrid Equipment - Proto-Kinetic Dagger", /obj/item/kinetic_crusher/machete/dagger, 75), + EQUIPMENT("Hybrid Equipment - Proto-Kinetic Machete", /obj/item/kinetic_crusher/machete, 250), + EQUIPMENT("Fishing Net", /obj/item/material/fishing_net, 50), + EQUIPMENT("Titanium Fishing Rod", /obj/item/material/fishing_rod/modern, 100), + EQUIPMENT("Durasteel Fishing Rod", /obj/item/material/fishing_rod/modern/strong, 750), EQUIPMENT("Fulton Beacon", /obj/item/fulton_core, 300), - EQUIPMENT("Geiger Counter", /obj/item/device/geiger, 75), - EQUIPMENT("GPS Device", /obj/item/device/gps/mining, 10), + EQUIPMENT("Geiger Counter", /obj/item/geiger, 75), + EQUIPMENT("GPS Device", /obj/item/gps/mining, 10), EQUIPMENT("Jump Boots", /obj/item/clothing/shoes/bhop, 250), - EQUIPMENT("Mini-Translocator", /obj/item/device/perfect_tele/one_beacon, 120), - EQUIPMENT("Survey Tools - Mapping Unit", /obj/item/device/mapping_unit, 150), - EQUIPMENT("Survey Tools - Mapping Beacon", /obj/item/device/holomap_beacon, 25), + EQUIPMENT("Mini-Translocator", /obj/item/perfect_tele/one_beacon, 120), + EQUIPMENT("Survey Tools - Mapping Unit", /obj/item/mapping_unit, 150), + EQUIPMENT("Survey Tools - Mapping Beacon", /obj/item/holomap_beacon, 25), EQUIPMENT("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 75), - EQUIPMENT("Survival Equipment - Glowstick", /obj/item/device/flashlight/glowstick, 5), - EQUIPMENT("Survival Equipment - Flare", /obj/item/device/flashlight/flare, 5), - EQUIPMENT("Survival Equipment - Radioisotope Glowstick", /obj/item/device/flashlight/glowstick/radioisotope, 40), + EQUIPMENT("Survival Equipment - Glowstick", /obj/item/flashlight/glowstick, 5), + EQUIPMENT("Survival Equipment - Flare", /obj/item/flashlight/flare, 5), + EQUIPMENT("Survival Equipment - Radioisotope Glowstick", /obj/item/flashlight/glowstick/radioisotope, 40), EQUIPMENT("Survival Equipment - Modular Explorer Suit", /obj/item/clothing/suit/armor/pcarrier/explorer, 200), EQUIPMENT("Survival Equipment - Armored Jumpsuit", /obj/item/clothing/under/explorer/armored, 200), ) @@ -79,46 +79,46 @@ EQUIPMENT("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 10), EQUIPMENT("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 30), EQUIPMENT("Fulton Pack", /obj/item/extraction_pack, 125), - EQUIPMENT("Injector (L) - Glucose", /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose, 50), - EQUIPMENT("Injector (L) - Panacea", /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity, 50), - EQUIPMENT("Injector (L) - Trauma", /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute, 50), + EQUIPMENT("Injector (L) - Glucose", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose, 50), + EQUIPMENT("Injector (L) - Panacea", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity, 50), + EQUIPMENT("Injector (L) - Trauma", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute, 50), EQUIPMENT("Nanopaste Tube", /obj/item/stack/nanopaste, 100), - EQUIPMENT("Point Transfer Card", /obj/item/weapon/card/mining_point_card/survey, 50), - EQUIPMENT("Shelter Capsule", /obj/item/device/survivalcapsule, 50), - EQUIPMENT("Burn Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn, 25), - EQUIPMENT("Detox Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, 25), - EQUIPMENT("Oxy Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, 25), - EQUIPMENT("Trauma Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma, 25), + EQUIPMENT("Point Transfer Card", /obj/item/card/mining_point_card/survey, 50), + EQUIPMENT("Shelter Capsule", /obj/item/survivalcapsule, 50), + EQUIPMENT("Burn Medipen", /obj/item/reagent_containers/hypospray/autoinjector/burn, 25), + EQUIPMENT("Detox Medipen", /obj/item/reagent_containers/hypospray/autoinjector/detox, 25), + EQUIPMENT("Oxy Medipen", /obj/item/reagent_containers/hypospray/autoinjector/oxy, 25), + EQUIPMENT("Trauma Medipen", /obj/item/reagent_containers/hypospray/autoinjector/trauma, 25), ) prize_list["Digging Tools"] = list( - EQUIPMENT("Survey Tools - Shovel", /obj/item/weapon/shovel, 40), - EQUIPMENT("Survey Tools - Mechanical Trap", /obj/item/weapon/beartrap, 50), - EQUIPMENT("Survey Tools - Binoculars", /obj/item/device/binoculars,40), + EQUIPMENT("Survey Tools - Shovel", /obj/item/shovel, 40), + EQUIPMENT("Survey Tools - Mechanical Trap", /obj/item/beartrap, 50), + EQUIPMENT("Survey Tools - Binoculars", /obj/item/binoculars,40), ) prize_list["Miscellaneous"] = list( - EQUIPMENT("Absinthe", /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, 10), - EQUIPMENT("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 10), + EQUIPMENT("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 10), + EQUIPMENT("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 10), EQUIPMENT("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 15), EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 50), EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 100), - EQUIPMENT("Industrial Equipment - Phoron Bore", /obj/item/weapon/gun/magnetic/matfed/phoronbore/loaded, 300), - EQUIPMENT("Industrial Equipment - Inducer", /obj/item/weapon/inducer, 750), - EQUIPMENT("Laser Pointer", /obj/item/device/laser_pointer, 90), - EQUIPMENT("Luxury Shelter Capsule", /obj/item/device/survivalcapsule/luxury, 310), - EQUIPMENT("Bar Shelter Capsule", /obj/item/device/survivalcapsule/luxurybar, 1000), + EQUIPMENT("Industrial Equipment - Phoron Bore", /obj/item/gun/magnetic/matfed/phoronbore/loaded, 300), + EQUIPMENT("Industrial Equipment - Inducer", /obj/item/inducer, 750), + EQUIPMENT("Laser Pointer", /obj/item/laser_pointer, 90), + EQUIPMENT("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 310), + EQUIPMENT("Bar Shelter Capsule", /obj/item/survivalcapsule/luxurybar, 1000), EQUIPMENT("Plush Toy", /obj/random/plushie, 30), - EQUIPMENT("Soap", /obj/item/weapon/soap/nanotrasen, 20), - EQUIPMENT("Thalers - 100", /obj/item/weapon/spacecash/c100, 100), - EQUIPMENT("Umbrella", /obj/item/weapon/melee/umbrella/random, 20), - EQUIPMENT("UAV - Recon Skimmer", /obj/item/device/uav, 40), + EQUIPMENT("Soap", /obj/item/soap/nanotrasen, 20), + EQUIPMENT("Thalers - 100", /obj/item/spacecash/c100, 100), + EQUIPMENT("Umbrella", /obj/item/melee/umbrella/random, 20), + EQUIPMENT("UAV - Recon Skimmer", /obj/item/uav, 40), ) //VOREStation Edit End -/obj/machinery/mineral/equipment_vendor/survey/get_points(obj/item/weapon/card/id/target) +/obj/machinery/mineral/equipment_vendor/survey/get_points(obj/item/card/id/target) if(!istype(target)) return 0 return target.survey_points -/obj/machinery/mineral/equipment_vendor/survey/remove_points(obj/item/weapon/card/id/target, amt) +/obj/machinery/mineral/equipment_vendor/survey/remove_points(obj/item/card/id/target, amt) target.survey_points -= amt diff --git a/code/modules/mining/ore_vr.dm b/code/modules/mining/ore_vr.dm index fe7d23a5799..c73e1979597 100644 --- a/code/modules/mining/ore_vr.dm +++ b/code/modules/mining/ore_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/ore/rutile +/obj/item/ore/rutile name = "rutile" icon = 'icons/obj/mining_vr.dmi' icon_state = "ore_rutile" diff --git a/code/modules/mining/shelter_atoms_vr.dm b/code/modules/mining/shelter_atoms_vr.dm index 69a23500ffc..1458bbd5357 100644 --- a/code/modules/mining/shelter_atoms_vr.dm +++ b/code/modules/mining/shelter_atoms_vr.dm @@ -8,7 +8,7 @@ GLOBAL_LIST_EMPTY(unique_deployable) has_gravity = TRUE //Survival Capsule -/obj/item/device/survivalcapsule +/obj/item/survivalcapsule name = "surfluid shelter capsule" desc = "An emergency shelter programmed into construction nanomachines. It has a license for use printed on the bottom." icon_state = "houseball" @@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(unique_deployable) var/is_ship = FALSE var/unique_id = null -/obj/item/device/survivalcapsule/proc/get_template() +/obj/item/survivalcapsule/proc/get_template() if(template) return template = SSmapping.shelter_templates[template_id] @@ -28,11 +28,11 @@ GLOBAL_LIST_EMPTY(unique_deployable) throw EXCEPTION("Shelter template ([template_id]) not found!") qdel(src) -/obj/item/device/survivalcapsule/Destroy() +/obj/item/survivalcapsule/Destroy() template = null // without this, capsules would be one use. per round. . = ..() -/obj/item/device/survivalcapsule/examine(mob/user) +/obj/item/survivalcapsule/examine(mob/user) . = ..() if(!template) get_template() @@ -42,7 +42,7 @@ GLOBAL_LIST_EMPTY(unique_deployable) else . += "This capsule has an unknown template stored." -/obj/item/device/survivalcapsule/attack_self() +/obj/item/survivalcapsule/attack_self() //Can't grab when capsule is New() because templates aren't loaded then get_template() if(!used) @@ -97,35 +97,35 @@ GLOBAL_LIST_EMPTY(unique_deployable) template.update_lighting(deploy_location) qdel(src) -/obj/item/device/survivalcapsule/luxury +/obj/item/survivalcapsule/luxury name = "luxury surfluid shelter capsule" desc = "An exorbitantly expensive luxury suite programmed into construction nanomachines. There's a license for use printed on the bottom." template_id = "shelter_beta" -/obj/item/device/survivalcapsule/luxurybar +/obj/item/survivalcapsule/luxurybar name = "luxury surfluid bar capsule" desc = "A luxury bar in a capsule. " + JOB_BARTENDER + " required and not included. There's a license for use printed on the bottom." template_id = "shelter_gamma" -/obj/item/device/survivalcapsule/military +/obj/item/survivalcapsule/military name = "military surfluid shelter capsule" desc = "A prefabricated firebase in a capsule. Contains basic weapons, building materials, and combat suits. There's a license for use printed on the bottom." template_id = "shelter_delta" -/obj/item/device/survivalcapsule/escapepod +/obj/item/survivalcapsule/escapepod name = "escape surfluid shelter capsule" desc = "A prefabricated escape pod in a capsule. Contains a basic escape pod for survival purposes. There's a license for use printed on the bottom." template_id = "shelter_epsilon" unique_id = "shelter_5" is_ship = TRUE -/obj/item/device/survivalcapsule/popcabin +/obj/item/survivalcapsule/popcabin name = "pop-out cabin shelter capsule" desc = "A cozy cabin; crammed into a survival capsule." template_id = "shelter_cab" //Custom Shelter Capsules -/obj/item/device/survivalcapsule/tabiranth +/obj/item/survivalcapsule/tabiranth name = "silver-trimmed surfluid shelter capsule" desc = "An exorbitantly expensive luxury suite programmed into construction nanomachines. This one is a particularly rare and expensive model. There's a license for use printed on the bottom." template_id = "shelter_phi" @@ -153,7 +153,7 @@ GLOBAL_LIST_EMPTY(unique_deployable) id = "placeholder_id_do_not_use" //This has to be this way, otherwise it will control ALL doors if left blank. var/obj/machinery/door/airlock/voidcraft/survival_pod/door -/obj/machinery/button/remote/airlock/survival_pod/attack_hand(obj/item/weapon/W, mob/user as mob) +/obj/machinery/button/remote/airlock/survival_pod/attack_hand(obj/item/W, mob/user as mob) if(..()) return 1 //1 is failure on machines (for whatever reason) if(!door) var/turf/dT = get_step(src,dir) @@ -199,7 +199,7 @@ GLOBAL_LIST_EMPTY(unique_deployable) verbs -= /obj/structure/table/proc/do_put ..() -/obj/structure/table/survival_pod/dismantle(obj/item/weapon/tool/wrench/W, mob/user) +/obj/structure/table/survival_pod/dismantle(obj/item/tool/wrench/W, mob/user) to_chat(user, "You cannot dismantle \the [src].") return @@ -217,7 +217,7 @@ GLOBAL_LIST_EMPTY(unique_deployable) cut_overlays() //Computer -/obj/item/device/gps/computer +/obj/item/gps/computer name = "pod computer" icon_state = "pod_computer" icon = 'icons/obj/survival_pod_comp.dmi' @@ -225,18 +225,18 @@ GLOBAL_LIST_EMPTY(unique_deployable) density = TRUE pixel_y = -32 -/obj/item/device/gps/computer/attackby(obj/item/I, mob/living/user) +/obj/item/gps/computer/attackby(obj/item/I, mob/living/user) if(I.has_tool_quality(TOOL_WRENCH)) user.visible_message("[user] disassembles [src].", "You start to disassemble [src]...", "You hear clanking and banging noises.") if(do_after(user,4 SECONDS,src)) - new /obj/item/device/gps(loc) + new /obj/item/gps(loc) qdel(src) return TRUE return FALSE -/obj/item/device/gps/computer/attack_hand(mob/user) +/obj/item/gps/computer/attack_hand(mob/user) attack_self(user) //Bed diff --git a/code/modules/mob/_modifiers/crusher_mark.dm b/code/modules/mob/_modifiers/crusher_mark.dm index 96ce129aad2..501b505baf3 100644 --- a/code/modules/mob/_modifiers/crusher_mark.dm +++ b/code/modules/mob/_modifiers/crusher_mark.dm @@ -5,16 +5,16 @@ on_created_text = "You feel physically unstable." on_expired_text = "You feel physically stable again." var/mutable_appearance/marked_underlay - var/obj/item/weapon/kinetic_crusher/hammer_synced + var/obj/item/kinetic_crusher/hammer_synced /datum/modifier/crusher_mark/New(var/new_holder, var/new_origin) . = ..() if(isliving(new_origin)) var/mob/living/origin = new_origin - var/obj/item/weapon/kinetic_crusher/to_sync - if(istype(origin.get_active_hand(), /obj/item/weapon/kinetic_crusher)) + var/obj/item/kinetic_crusher/to_sync + if(istype(origin.get_active_hand(), /obj/item/kinetic_crusher)) to_sync = origin.get_active_hand() - else if (istype(origin.get_inactive_hand(), /obj/item/weapon/kinetic_crusher)) + else if (istype(origin.get_inactive_hand(), /obj/item/kinetic_crusher)) to_sync = origin.get_inactive_hand() if(to_sync) // did we find it? hammer_synced = to_sync // go ahead diff --git a/code/modules/mob/_modifiers/modifiers_vr.dm b/code/modules/mob/_modifiers/modifiers_vr.dm index 2de03120d4f..700455bb3bf 100644 --- a/code/modules/mob/_modifiers/modifiers_vr.dm +++ b/code/modules/mob/_modifiers/modifiers_vr.dm @@ -6,7 +6,7 @@ var/energy_based // Sees if the modifier is based on something electronic based. var/energy_cost // How much the modifier uses per action/special effect blocked. For base values. var/damage_cost // How much energy is used when numbers are involed. For values, such as taking damage. Ex: (Damage*damage_cost) - var/obj/item/weapon/cell/energy_source = null // The source of the above. + var/obj/item/cell/energy_source = null // The source of the above. // RESISTANCES CODE. Variable to enable external damage resistance modifiers. This is not unlike armor. // 0 = immune || < 0 = heals || 1 = full damage || >1 = increased damage. @@ -129,7 +129,7 @@ effective_fire_resistance = 1 disable_duration_percent = 1 //THIS CAN ALSO BE USED! Don't be too afraid to use this one, but use it sparingly! */ - var/obj/item/device/personal_shield_generator/shield_generator //This is the shield generator you're wearing! + var/obj/item/personal_shield_generator/shield_generator //This is the shield generator you're wearing! /datum/modifier/shield_projection/on_applied() @@ -141,11 +141,11 @@ /datum/modifier/shield_projection/check_if_valid() //Let's check to make sure you got the stuff and set the vars. Don't need to modify this for any subtypes! if(ishuman(holder)) //Only humans can use this! Other things later down the line might use the same stuff this does, but the shield generator is human only! var/mob/living/carbon/human/H = holder - if(istype(H.get_equipped_item(slot_back), /obj/item/device/personal_shield_generator)) + if(istype(H.get_equipped_item(slot_back), /obj/item/personal_shield_generator)) shield_generator = H.get_equipped_item(slot_back) //Sets the var on the modifier that the shield gen is their back shield gen. - else if(istype(H.get_equipped_item(slot_belt), /obj/item/device/personal_shield_generator)) + else if(istype(H.get_equipped_item(slot_belt), /obj/item/personal_shield_generator)) shield_generator = H.get_equipped_item(slot_belt) //No need for other checks. If they got hit by this, they just turned it on. - else if(istype(H.get_equipped_item(slot_s_store), /obj/item/device/personal_shield_generator) ) //Rigsuits. + else if(istype(H.get_equipped_item(slot_s_store), /obj/item/personal_shield_generator) ) //Rigsuits. shield_generator = H.get_equipped_item(slot_s_store) else expire(silent = TRUE) diff --git a/code/modules/mob/_modifiers/traits_phobias.dm b/code/modules/mob/_modifiers/traits_phobias.dm index d8bd08a5497..cf87918c649 100644 --- a/code/modules/mob/_modifiers/traits_phobias.dm +++ b/code/modules/mob/_modifiers/traits_phobias.dm @@ -509,7 +509,7 @@ for(var/atom/thing in view(5, holder)) // See haemophobia for why this is 5. - if(istype(thing, /obj/item/weapon/reagent_containers/syringe)) + if(istype(thing, /obj/item/reagent_containers/syringe)) fear_amount += 4 if(istype(thing, /obj/machinery/iv_drip)) @@ -519,16 +519,16 @@ else fear_amount += 6 - if(istype(thing, /obj/item/weapon/reagent_containers/hypospray)) + if(istype(thing, /obj/item/reagent_containers/hypospray)) fear_amount += 2 //Needle doesn't look as intimidating. - if(istype(thing, /obj/item/weapon/reagent_containers/hypospray/autoinjector)) //Don't know if I need to define autoinjectors too. Meh. + if(istype(thing, /obj/item/reagent_containers/hypospray/autoinjector)) //Don't know if I need to define autoinjectors too. Meh. fear_amount += 3 if(istype(thing, /obj/item/rig_module/chem_dispenser)) fear_amount += 5 - if(istype(thing, /obj/item/weapon/storage/box/syringes)) + if(istype(thing, /obj/item/storage/box/syringes)) fear_amount += 2 if(istype(thing, /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun)) @@ -537,10 +537,10 @@ if(istype(thing, /obj/machinery/sleep_console)) //Sleepers got them needles in them. fear_amount += 4 - if(istype(thing, /obj/item/weapon/implanter)) + if(istype(thing, /obj/item/implanter)) fear_amount += 8 //Very big needle. - if(istype(thing, /obj/item/weapon/gun/launcher/syringe)) + if(istype(thing, /obj/item/gun/launcher/syringe)) fear_amount += 6 if(isliving(thing)) @@ -549,10 +549,10 @@ continue if(istype(L, /mob/living/carbon/human)) var/mob/living/carbon/human/H = L - if(H.l_hand && istype(H.l_hand, /obj/item/weapon/reagent_containers/syringe) || H.r_hand && istype(H.r_hand, /obj/item/weapon/reagent_containers/syringe)) + if(H.l_hand && istype(H.l_hand, /obj/item/reagent_containers/syringe) || H.r_hand && istype(H.r_hand, /obj/item/reagent_containers/syringe)) fear_amount += 10 - if(H.l_ear && istype(H.l_ear, /obj/item/weapon/reagent_containers/syringe) || H.r_ear && istype(H.r_ear, /obj/item/weapon/reagent_containers/syringe)) + if(H.l_ear && istype(H.l_ear, /obj/item/reagent_containers/syringe) || H.r_ear && istype(H.r_ear, /obj/item/reagent_containers/syringe)) fear_amount +=10 diff --git a/code/modules/mob/dead/corpse.dm b/code/modules/mob/dead/corpse.dm index c7e01bf7407..7b6856137a2 100644 --- a/code/modules/mob/dead/corpse.dm +++ b/code/modules/mob/dead/corpse.dm @@ -136,7 +136,7 @@ if(src.corpseback) M.equip_to_slot_or_del(new src.corpseback(M), slot_back) if(src.corpseid == 1) - var/obj/item/weapon/card/id/W = new(M) + var/obj/item/card/id/W = new(M) W.name = "[M.real_name]'s ID Card" var/datum/job/jobdatum for(var/jobtype in typesof(/datum/job)) @@ -173,10 +173,10 @@ corpsesuit = /obj/item/clothing/suit/armor/vest corpseshoes = /obj/item/clothing/shoes/boots/swat corpsegloves = /obj/item/clothing/gloves/swat - corpseradio = /obj/item/device/radio/headset + corpseradio = /obj/item/radio/headset corpsemask = /obj/item/clothing/mask/gas corpsehelmet = /obj/item/clothing/head/helmet/swat - corpseback = /obj/item/weapon/storage/backpack + corpseback = /obj/item/storage/backpack corpseid = 1 corpseidjob = "Operative" corpseidaccess = JOB_SYNDICATE @@ -187,10 +187,10 @@ corpsesuit = /obj/item/clothing/suit/armor/pcarrier/blue/sol corpseshoes = /obj/item/clothing/shoes/boots/swat corpsegloves = /obj/item/clothing/gloves/swat - corpseradio = /obj/item/device/radio/headset + corpseradio = /obj/item/radio/headset corpsemask = /obj/item/clothing/mask/gas corpsehelmet = /obj/item/clothing/head/helmet/swat - corpseback = /obj/item/weapon/storage/backpack + corpseback = /obj/item/storage/backpack corpseid = 1 corpseidjob = "Peacekeeper" corpseidaccess = JOB_SYNDICATE @@ -201,11 +201,11 @@ corpsesuit = /obj/item/clothing/suit/space/void/merc corpseshoes = /obj/item/clothing/shoes/boots/swat corpsegloves = /obj/item/clothing/gloves/swat - corpseradio = /obj/item/device/radio/headset + corpseradio = /obj/item/radio/headset corpsemask = /obj/item/clothing/mask/gas/syndicate corpsehelmet = /obj/item/clothing/head/helmet/space/void/merc - corpseback = /obj/item/weapon/tank/jetpack/oxygen - corpsepocket1 = /obj/item/weapon/tank/emergency/oxygen + corpseback = /obj/item/tank/jetpack/oxygen + corpsepocket1 = /obj/item/tank/emergency/oxygen corpseid = 1 corpseidjob = "Operative" corpseidaccess = JOB_SYNDICATE @@ -216,10 +216,10 @@ name = JOB_CLOWN corpseuniform = /obj/item/clothing/under/rank/clown corpseshoes = /obj/item/clothing/shoes/clown_shoes - corpseradio = /obj/item/device/radio/headset + corpseradio = /obj/item/radio/headset corpsemask = /obj/item/clothing/mask/gas/clown_hat - corpsepocket1 = /obj/item/weapon/bikehorn - corpseback = /obj/item/weapon/storage/backpack/clown + corpsepocket1 = /obj/item/bikehorn + corpseback = /obj/item/storage/backpack/clown corpseid = 1 corpseidjob = JOB_CLOWN corpseidaccess = JOB_CLOWN diff --git a/code/modules/mob/dead/corpse_vr.dm b/code/modules/mob/dead/corpse_vr.dm index 0ad27d874eb..73894a9a110 100644 --- a/code/modules/mob/dead/corpse_vr.dm +++ b/code/modules/mob/dead/corpse_vr.dm @@ -31,7 +31,7 @@ corpsesuit = /obj/item/clothing/suit/space/void/altevian_heartbreaker corpseshoes = /obj/item/clothing/shoes/boots/swat corpsegloves = /obj/item/clothing/gloves/swat - corpseradio = /obj/item/device/radio/headset + corpseradio = /obj/item/radio/headset corpsemask = /obj/item/clothing/mask/altevian_breath corpsehelmet = /obj/item/clothing/head/helmet/space/void/altevian_heartbreaker corpseid = 1 diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index da5bd7b31f6..d0ac3e53cf9 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -151,7 +151,7 @@ return /mob/observer/dead/attackby(obj/item/W, mob/user) - if(istype(W,/obj/item/weapon/book/tome)) + if(istype(W,/obj/item/book/tome)) var/mob/observer/dead/M = src M.manifest(user) @@ -1011,8 +1011,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(choice == "Yes") paiController.recruitWindow(usr) var/count = 0 - for(var/obj/item/device/paicard/p in all_pai_cards) - var/obj/item/device/paicard/PP = p + for(var/obj/item/paicard/p in all_pai_cards) + var/obj/item/paicard/PP = p if(PP.pai == null) count++ PP.add_overlay("pai-ghostalert") diff --git a/code/modules/mob/dead/observer/observer_vr.dm b/code/modules/mob/dead/observer/observer_vr.dm index 01014e4ff4d..5ca73089e0f 100644 --- a/code/modules/mob/dead/observer/observer_vr.dm +++ b/code/modules/mob/dead/observer/observer_vr.dm @@ -30,7 +30,7 @@ return //Fine fine, we can ask. - var/obj/item/device/nif/nif = H.nif + var/obj/item/nif/nif = H.nif to_chat(src,"Request sent to [H].") var/req_time = world.time diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm index ad7d7577b8f..af0b51e28a6 100644 --- a/code/modules/mob/death.dm +++ b/code/modules/mob/death.dm @@ -72,7 +72,7 @@ if(stat == DEAD) return 0 SEND_SIGNAL(src, COMSIG_MOB_DEATH, gibbed) - if(src.loc && istype(loc,/obj/belly) || istype(loc,/obj/item/device/dogborg/sleeper)) deathmessage = "no message" //VOREStation Add - Prevents death messages from inside mobs + if(src.loc && istype(loc,/obj/belly) || istype(loc,/obj/item/dogborg/sleeper)) deathmessage = "no message" //VOREStation Add - Prevents death messages from inside mobs facing_dir = null if(!gibbed && deathmessage != DEATHGASP_NO_MESSAGE) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 33f4694b7fa..64c459b4644 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -1,7 +1,7 @@ var/list/holder_mob_icon_cache = list() //Helper object for picking dionaea (and other creatures) up. -/obj/item/weapon/holder +/obj/item/holder name = "holder" desc = "You shouldn't ever see this." icon = 'icons/obj/objects.dmi' @@ -25,14 +25,14 @@ var/list/holder_mob_icon_cache = list() var/matrix/original_transform var/original_vis_flags = NONE -/obj/item/weapon/holder/Initialize(mapload, mob/held) +/obj/item/holder/Initialize(mapload, mob/held) ASSERT(ismob(held)) . = ..() held.forceMove(src) held.reset_view(src) START_PROCESSING(SSobj, src) -/obj/item/weapon/holder/Entered(mob/held, atom/OldLoc) +/obj/item/holder/Entered(mob/held, atom/OldLoc) if(held_mob) held.forceMove(get_turf(src)) held.reset_view(null) @@ -47,7 +47,7 @@ var/list/holder_mob_icon_cache = list() original_transform = held.transform held.transform = null -/obj/item/weapon/holder/Exited(atom/movable/thing, atom/OldLoc) +/obj/item/holder/Exited(atom/movable/thing, atom/OldLoc) if(thing == held_mob) held_mob.transform = original_transform held_mob.update_transform() //VOREStation edit @@ -55,7 +55,7 @@ var/list/holder_mob_icon_cache = list() held_mob = null ..() -/obj/item/weapon/holder/Destroy() +/obj/item/holder/Destroy() STOP_PROCESSING(SSobj, src) if(held_mob) dump_mob() @@ -64,11 +64,11 @@ var/list/holder_mob_icon_cache = list() M.drop_from_inventory(src, get_turf(src)) return ..() -/obj/item/weapon/holder/process() +/obj/item/holder/process() if(held_mob?.loc != src || isturf(loc)) qdel(src) -/obj/item/weapon/holder/proc/dump_mob() +/obj/item/holder/proc/dump_mob() if(!held_mob) return if (held_mob.loc == src || isnull(held_mob.loc)) //VOREStation edit @@ -80,7 +80,7 @@ var/list/holder_mob_icon_cache = list() held_mob = null invisibility = INVISIBILITY_ABSTRACT //VOREStation edit -/obj/item/weapon/holder/throw_at(atom/target, range, speed, thrower) +/obj/item/holder/throw_at(atom/target, range, speed, thrower) if(held_mob) var/mob/localref = held_mob dump_mob() @@ -91,14 +91,14 @@ var/list/holder_mob_icon_cache = list() var/mob_range = round(range * min(thrower_mob_size / localref.mob_size, 1)) localref.throw_at(target, mob_range, speed, thrower) -/obj/item/weapon/holder/GetID() +/obj/item/holder/GetID() return held_mob?.GetIdCard() -/obj/item/weapon/holder/GetAccess() +/obj/item/holder/GetAccess() var/obj/item/I = GetID() return I?.GetAccess() || ..() -/obj/item/weapon/holder/container_resist(mob/living/held) +/obj/item/holder/container_resist(mob/living/held) if(ismob(loc)) var/mob/M = loc M.drop_from_inventory(src) // If it's another item, we can just continue existing, or if it's a turf we'll qdel() in Moved() @@ -120,27 +120,27 @@ var/list/holder_mob_icon_cache = list() I.on_holder_escape(src) //Mob specific holders. -/obj/item/weapon/holder/diona +/obj/item/holder/diona origin_tech = list(TECH_MAGNET = 3, TECH_BIO = 5) slot_flags = SLOT_HEAD | SLOT_OCLOTHING | SLOT_HOLSTER item_state = "diona" -/obj/item/weapon/holder/drone +/obj/item/holder/drone origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 5) item_state = "repairbot" -/obj/item/weapon/holder/drone/swarm +/obj/item/holder/drone/swarm origin_tech = list(TECH_MAGNET = 6, TECH_ENGINEERING = 7, TECH_PRECURSOR = 2, TECH_ARCANE = 1) item_state = "constructiondrone" -/obj/item/weapon/holder/pai +/obj/item/holder/pai origin_tech = list(TECH_DATA = 2) -/obj/item/weapon/holder/pai/Initialize(mapload, mob/held) +/obj/item/holder/pai/Initialize(mapload, mob/held) . = ..() item_state = held.icon_state -/obj/item/weapon/holder/mouse +/obj/item/holder/mouse name = "mouse" desc = "It's a small rodent." item_state = "mouse_gray" @@ -148,144 +148,144 @@ var/list/holder_mob_icon_cache = list() origin_tech = list(TECH_BIO = 2) w_class = ITEMSIZE_TINY -/obj/item/weapon/holder/mouse/white +/obj/item/holder/mouse/white item_state = "mouse_white" -/obj/item/weapon/holder/mouse/gray +/obj/item/holder/mouse/gray item_state = "mouse_gray" -/obj/item/weapon/holder/mouse/brown +/obj/item/holder/mouse/brown item_state = "mouse_brown" -/obj/item/weapon/holder/mouse/black +/obj/item/holder/mouse/black item_state = "mouse_black" -/obj/item/weapon/holder/mouse/operative +/obj/item/holder/mouse/operative item_state = "mouse_operative" -/obj/item/weapon/holder/mouse/rat +/obj/item/holder/mouse/rat item_state = "mouse_rat" -/obj/item/weapon/holder/possum +/obj/item/holder/possum origin_tech = list(TECH_BIO = 2) item_state = "possum" -/obj/item/weapon/holder/possum/poppy +/obj/item/holder/possum/poppy origin_tech = list(TECH_BIO = 2, TECH_ENGINEERING = 4) item_state = "poppy" -/obj/item/weapon/holder/cat +/obj/item/holder/cat origin_tech = list(TECH_BIO = 2) item_state = "cat" -/obj/item/weapon/holder/cat/runtime +/obj/item/holder/cat/runtime -/obj/item/weapon/holder/fennec +/obj/item/holder/fennec origin_tech = list(TECH_BIO = 2) -/obj/item/weapon/holder/cat/runtime +/obj/item/holder/cat/runtime origin_tech = list(TECH_BIO = 2, TECH_DATA = 4) -/obj/item/weapon/holder/cat/cak +/obj/item/holder/cat/cak origin_tech = list(TECH_BIO = 2) item_state = "cak" -/obj/item/weapon/holder/cat/bluespace +/obj/item/holder/cat/bluespace origin_tech = list(TECH_BIO = 2, TECH_BLUESPACE = 6) item_state = "bscat" -/obj/item/weapon/holder/cat/spacecat +/obj/item/holder/cat/spacecat origin_tech = list(TECH_BIO = 2, TECH_MATERIAL = 4) item_state = "spacecat" -/obj/item/weapon/holder/cat/original +/obj/item/holder/cat/original origin_tech = list(TECH_BIO = 2, TECH_BLUESPACE = 4) item_state = "original" -/obj/item/weapon/holder/cat/breadcat +/obj/item/holder/cat/breadcat origin_tech = list(TECH_BIO = 2) item_state = "breadcat" -/obj/item/weapon/holder/corgi +/obj/item/holder/corgi origin_tech = list(TECH_BIO = 2) item_state = "corgi" -/obj/item/weapon/holder/lisa +/obj/item/holder/lisa origin_tech = list(TECH_BIO = 2) item_state = "lisa" -/obj/item/weapon/holder/old_corgi +/obj/item/holder/old_corgi origin_tech = list(TECH_BIO = 2) item_state = "old_corgi" -/obj/item/weapon/holder/void_puppy +/obj/item/holder/void_puppy origin_tech = list(TECH_BIO = 2, TECH_BLUESPACE = 3) item_state = "void_puppy" -/obj/item/weapon/holder/narsian +/obj/item/holder/narsian origin_tech = list(TECH_BIO = 2, TECH_ILLEGAL = 3) item_state = "narsian" -/obj/item/weapon/holder/bullterrier +/obj/item/holder/bullterrier origin_tech = list(TECH_BIO = 2) item_state = "bullterrier" -/obj/item/weapon/holder/fox +/obj/item/holder/fox origin_tech = list(TECH_BIO = 2) item_state = "fox" -/obj/item/weapon/holder/pug +/obj/item/holder/pug origin_tech = list(TECH_BIO = 2) item_state = "pug" -/obj/item/weapon/holder/sloth +/obj/item/holder/sloth origin_tech = list(TECH_BIO = 2) item_state = "sloth" -/obj/item/weapon/holder/borer +/obj/item/holder/borer origin_tech = list(TECH_BIO = 6) item_state = "brainslug" -/obj/item/weapon/holder/leech +/obj/item/holder/leech color = "#003366" origin_tech = list(TECH_BIO = 5, TECH_PHORON = 2) -/obj/item/weapon/holder/cat/fluff/tabiranth +/obj/item/holder/cat/fluff/tabiranth name = "Spirit" desc = "A small, inquisitive feline, who constantly seems to investigate his surroundings." gender = MALE icon_state = "kitten" w_class = ITEMSIZE_SMALL -/obj/item/weapon/holder/cat/kitten +/obj/item/holder/cat/kitten icon_state = "kitten" w_class = ITEMSIZE_SMALL -/obj/item/weapon/holder/cat/fluff/bones +/obj/item/holder/cat/fluff/bones name = "Bones" desc = "It's Bones! Meow." gender = MALE icon_state = "cat3" -/obj/item/weapon/holder/bird +/obj/item/holder/bird name = "bird" desc = "It's a bird!" icon_state = null item_icons = null w_class = ITEMSIZE_SMALL -/obj/item/weapon/holder/bird/Initialize() +/obj/item/holder/bird/Initialize() . = ..() held_mob?.lay_down() -/obj/item/weapon/holder/fish +/obj/item/holder/fish attack_verb = list("fished", "disrespected", "smacked", "smackereled") hitsound = 'sound/effects/slime_squish.ogg' slot_flags = SLOT_HOLSTER origin_tech = list(TECH_BIO = 3) -/obj/item/weapon/holder/fish/afterattack(var/atom/target, var/mob/living/user, proximity) +/obj/item/holder/fish/afterattack(var/atom/target, var/mob/living/user, proximity) if(!target) return if(!proximity) @@ -295,7 +295,7 @@ var/list/holder_mob_icon_cache = list() if(prob(10)) L.Stun(2) -/obj/item/weapon/holder/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/holder/attackby(obj/item/W as obj, mob/user as mob) for(var/mob/M in src.contents) M.attackby(W,user) @@ -320,7 +320,7 @@ var/list/holder_mob_icon_cache = list() else if(grabber.incapacitated()) return - var/obj/item/weapon/holder/H = new holder_type(get_turf(src), src) + var/obj/item/holder/H = new holder_type(get_turf(src), src) grabber.put_in_hands(H) if(self_grab) @@ -334,7 +334,7 @@ var/list/holder_mob_icon_cache = list() add_attack_logs(grabber, H.held_mob, "Scooped up", FALSE) // Not important enough to notify admins, but still helpful. return H -/obj/item/weapon/holder/human +/obj/item/holder/human icon = 'icons/mob/holder_complex.dmi' var/list/generate_for_slots = list(slot_l_hand_str, slot_r_hand_str, slot_back_str) slot_flags = SLOT_BACK diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index c9015d36d92..716ef2afaee 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -19,7 +19,7 @@ var/list/slot_equipment_priority = list( \ ) /mob - var/obj/item/weapon/storage/s_active = null // Even ghosts can/should be able to peek into boxes on the ground + var/obj/item/storage/s_active = null // Even ghosts can/should be able to peek into boxes on the ground //This proc is called whenever someone clicks an inventory ui slot. /mob/proc/attack_ui(var/slot) diff --git a/code/modules/mob/living/bot/SLed209bot.dm b/code/modules/mob/living/bot/SLed209bot.dm index a32a88973e8..263db2eaca8 100644 --- a/code/modules/mob/living/bot/SLed209bot.dm +++ b/code/modules/mob/living/bot/SLed209bot.dm @@ -15,7 +15,7 @@ mob_swap_flags = ~HEAVY mob_push_flags = HEAVY - used_weapon = /obj/item/weapon/gun/energy/taser/xeno + used_weapon = /obj/item/gun/energy/taser/xeno stun_strength = 10 xeno_harm_strength = 9 @@ -57,7 +57,7 @@ // Assembly -/obj/item/weapon/secbot_assembly/ed209_assembly/slime +/obj/item/secbot_assembly/ed209_assembly/slime name = "SL-ED-209 assembly" desc = "Some sort of bizarre assembly." icon = 'icons/obj/aibots.dmi' @@ -65,8 +65,8 @@ item_state = "buildpipe" created_name = "SL-ED-209 Security Robot" -/obj/item/weapon/secbot_assembly/ed209_assembly/slime/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) // Here in the event it's added into a PoI or some such. Standard construction relies on the standard ED up until taser. - if(istype(W, /obj/item/weapon/pen)) +/obj/item/secbot_assembly/ed209_assembly/slime/attackby(var/obj/item/W as obj, var/mob/user as mob) // Here in the event it's added into a PoI or some such. Standard construction relies on the standard ED up until taser. + if(istype(W, /obj/item/pen)) var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!t) return @@ -100,7 +100,7 @@ if(3) if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(WT.remove_fuel(0, user)) build_step++ name = "shielded frame assembly" @@ -140,7 +140,7 @@ return if(7) - if(istype(W, /obj/item/weapon/gun/energy/taser/xeno)) + if(istype(W, /obj/item/gun/energy/taser/xeno)) name = "xenotaser SL-ED-209 assembly" item_state = "sled209_taser" icon_state = "sled209_taser" @@ -161,7 +161,7 @@ to_chat(user, "Taser gun attached.") if(9) - if(istype(W, /obj/item/weapon/cell)) + if(istype(W, /obj/item/cell)) build_step++ to_chat(user, "You complete the ED-209.") var/turf/T = get_turf(src) diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm index b4c2def57e6..043c73c6f1e 100644 --- a/code/modules/mob/living/bot/bot.dm +++ b/code/modules/mob/living/bot/bot.dm @@ -9,7 +9,7 @@ makes_dirt = FALSE // No more dirt from Beepsky - var/obj/item/weapon/card/id/botcard = null + var/obj/item/card/id/botcard = null var/list/botcard_access = list() var/on = 1 var/open = 0 @@ -17,7 +17,7 @@ var/emagged = 0 var/light_strength = 3 var/busy = 0 - var/obj/item/device/paicard/paicard = null + var/obj/item/paicard/paicard = null var/obj/access_scanner = null var/list/req_access = list() var/list/req_one_access = list() @@ -49,7 +49,7 @@ //default_language = GLOB.all_languages[LANGUAGE_GALCOM] //VOREstation edit: moved to Init - botcard = new /obj/item/weapon/card/id(src) + botcard = new /obj/item/card/id(src) botcard.access = botcard_access.Copy() access_scanner = new /obj(src) @@ -152,14 +152,14 @@ else to_chat(user, "[src] does not need a repair.") return - else if(istype(O, /obj/item/device/assembly/prox_sensor) && emagged) + else if(istype(O, /obj/item/assembly/prox_sensor) && emagged) if(open) to_chat(user, "You repair the bot's systems.") emagged = 0 qdel(O) else to_chat(user, "Unable to repair with the maintenance panel closed.") - else if(istype(O, /obj/item/device/paicard)) + else if(istype(O, /obj/item/paicard)) if(open) insertpai(user, O) to_chat(user, span_notice("You slot the card into \the [initial(src.name)].")) @@ -415,7 +415,7 @@ // Returns the surrounding cardinal turfs with open links // Including through doors openable with the ID -/turf/proc/CardinalTurfsWithAccess(var/obj/item/weapon/card/id/ID) +/turf/proc/CardinalTurfsWithAccess(var/obj/item/card/id/ID) var/L[] = new() // for(var/turf/simulated/t in oview(src,1)) @@ -429,7 +429,7 @@ // Similar to above but not restricted to just cardinal directions. -/turf/proc/TurfsWithAccess(var/obj/item/weapon/card/id/ID) +/turf/proc/TurfsWithAccess(var/obj/item/card/id/ID) var/L[] = new() for(var/d in alldirs) @@ -442,7 +442,7 @@ // Returns true if a link between A and B is blocked // Movement through doors allowed if ID has access -/proc/LinkBlockedWithAccess(turf/A, turf/B, obj/item/weapon/card/id/ID) +/proc/LinkBlockedWithAccess(turf/A, turf/B, obj/item/card/id/ID) if(A == null || B == null) return 1 var/adir = get_dir(A,B) @@ -471,7 +471,7 @@ // Returns true if direction is blocked from loc // Checks doors against access with given ID -/proc/DirBlockedWithAccess(turf/loc,var/dir,var/obj/item/weapon/card/id/ID) +/proc/DirBlockedWithAccess(turf/loc,var/dir,var/obj/item/card/id/ID) for(var/obj/structure/window/D in loc) if(!D.density) continue if(D.dir == SOUTHWEST) return 1 @@ -501,7 +501,7 @@ canmove = on return canmove -/mob/living/bot/proc/insertpai(mob/user, obj/item/device/paicard/card) +/mob/living/bot/proc/insertpai(mob/user, obj/item/paicard/card) //var/obj/item/paicard/card = I var/mob/living/silicon/pai/AI = card.pai if(paicard) diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm index 7c9870a79ca..aca5deb224d 100644 --- a/code/modules/mob/living/bot/cleanbot.dm +++ b/code/modules/mob/living/bot/cleanbot.dm @@ -157,8 +157,8 @@ visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) - new /obj/item/weapon/reagent_containers/glass/bucket(Tsec) - new /obj/item/device/assembly/prox_sensor(Tsec) + new /obj/item/reagent_containers/glass/bucket(Tsec) + new /obj/item/assembly/prox_sensor(Tsec) if(prob(50)) new /obj/item/robot_parts/l_arm(Tsec) @@ -244,7 +244,7 @@ /* Assembly */ -/obj/item/weapon/bucket_sensor +/obj/item/bucket_sensor desc = "It's a bucket. With a sensor attached." name = "proxy bucket" icon = 'icons/obj/aibots.dmi' @@ -256,7 +256,7 @@ w_class = ITEMSIZE_NORMAL var/created_name = "Cleanbot" -/obj/item/weapon/bucket_sensor/attackby(var/obj/item/W, var/mob/user) +/obj/item/bucket_sensor/attackby(var/obj/item/W, var/mob/user) ..() if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm) || (istype(W, /obj/item/organ/external/arm) && ((W.name == "robotic left arm") || (W.name == "robotic right arm")))) user.drop_item() @@ -268,7 +268,7 @@ user.drop_from_inventory(src) qdel(src) - else if(istype(W, /obj/item/weapon/pen)) + else if(istype(W, /obj/item/pen)) var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!t) return diff --git a/code/modules/mob/living/bot/ed209bot.dm b/code/modules/mob/living/bot/ed209bot.dm index bca6624512e..0f2a32d5ea1 100644 --- a/code/modules/mob/living/bot/ed209bot.dm +++ b/code/modules/mob/living/bot/ed209bot.dm @@ -15,7 +15,7 @@ mob_swap_flags = ~HEAVY mob_push_flags = HEAVY - used_weapon = /obj/item/weapon/gun/energy/taser + used_weapon = /obj/item/gun/energy/taser var/shot_delay = 4 var/last_shot = 0 @@ -30,9 +30,9 @@ visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) - new /obj/item/weapon/secbot_assembly/ed209_assembly(Tsec) + new /obj/item/secbot_assembly/ed209_assembly(Tsec) - var/obj/item/weapon/gun/energy/taser/G = new used_weapon(Tsec) + var/obj/item/gun/energy/taser/G = new used_weapon(Tsec) G.power_supply.charge = 0 if(prob(50)) new /obj/item/robot_parts/l_leg(Tsec) @@ -74,7 +74,7 @@ // Assembly -/obj/item/weapon/secbot_assembly/ed209_assembly +/obj/item/secbot_assembly/ed209_assembly name = "ED-209 assembly" desc = "Some sort of bizarre assembly." icon = 'icons/obj/aibots.dmi' @@ -83,10 +83,10 @@ created_name = "ED-209 Security Robot" var/lasercolor = "" -/obj/item/weapon/secbot_assembly/ed209_assembly/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/item/secbot_assembly/ed209_assembly/attackby(var/obj/item/W as obj, var/mob/user as mob) ..() - if(istype(W, /obj/item/weapon/pen)) + if(istype(W, /obj/item/pen)) var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!t) return @@ -120,7 +120,7 @@ if(3) if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(WT.remove_fuel(0, user)) build_step++ name = "shielded frame assembly" @@ -160,7 +160,7 @@ return if(7) - if(istype(W, /obj/item/weapon/gun/energy/taser/xeno)) + if(istype(W, /obj/item/gun/energy/taser/xeno)) name = "xenotaser SL-ED-209 assembly" item_state = "sled209_taser" icon_state = "sled209_taser" @@ -169,7 +169,7 @@ user.drop_item() qdel(W) var/turf/T = get_turf(src) - var/obj/item/weapon/secbot_assembly/ed209_assembly/slime/S = new /obj/item/weapon/secbot_assembly/ed209_assembly/slime(T) + var/obj/item/secbot_assembly/ed209_assembly/slime/S = new /obj/item/secbot_assembly/ed209_assembly/slime(T) S.name = name S.item_state = item_state S.icon_state = icon_state @@ -178,7 +178,7 @@ user.drop_from_inventory(src) qdel(src) - else if(istype(W, /obj/item/weapon/gun/energy/taser)) + else if(istype(W, /obj/item/gun/energy/taser)) name = "taser ED-209 assembly" item_state = "ed209_taser" icon_state = "ed209_taser" @@ -199,7 +199,7 @@ to_chat(user, "Taser gun attached.") if(9) - if(istype(W, /obj/item/weapon/cell)) + if(istype(W, /obj/item/cell)) build_step++ to_chat(user, "You complete the ED-209.") var/turf/T = get_turf(src) diff --git a/code/modules/mob/living/bot/edCLNbot.dm b/code/modules/mob/living/bot/edCLNbot.dm index 0d976fef89f..0498699271d 100644 --- a/code/modules/mob/living/bot/edCLNbot.dm +++ b/code/modules/mob/living/bot/edCLNbot.dm @@ -55,16 +55,16 @@ visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) - new /obj/item/weapon/secbot_assembly/ed209_assembly(Tsec) + new /obj/item/secbot_assembly/ed209_assembly(Tsec) if(prob(50)) new /obj/item/robot_parts/l_leg(Tsec) if(prob(50)) new /obj/item/robot_parts/r_leg(Tsec) if(prob(50)) if(prob(50)) - new /obj/item/weapon/reagent_containers/glass/bucket(Tsec) + new /obj/item/reagent_containers/glass/bucket(Tsec) else - new /obj/item/device/assembly/prox_sensor(Tsec) + new /obj/item/assembly/prox_sensor(Tsec) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) @@ -109,7 +109,7 @@ // Assembly -/obj/item/weapon/secbot_assembly/edCLN_assembly +/obj/item/secbot_assembly/edCLN_assembly name = "ED-CLN assembly" desc = "Some sort of bizarre assembly." icon = 'icons/obj/aibots.dmi' @@ -117,10 +117,10 @@ item_state = "buildpipe" created_name = "ED-CLN Security Robot" -/obj/item/weapon/secbot_assembly/edCLN_assembly/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/item/secbot_assembly/edCLN_assembly/attackby(var/obj/item/W as obj, var/mob/user as mob) ..() - if(istype(W, /obj/item/weapon/pen)) + if(istype(W, /obj/item/pen)) var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!t) return @@ -143,7 +143,7 @@ icon_state = "ed209_legs" if(2) - if(istype(W, /obj/item/weapon/reagent_containers/glass/bucket)) + if(istype(W, /obj/item/reagent_containers/glass/bucket)) user.drop_item() qdel(W) build_step++ @@ -154,7 +154,7 @@ if(3) if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(WT.remove_fuel(0, user)) build_step++ name = "bucketed frame assembly" @@ -184,7 +184,7 @@ return if(6) - if(istype(W, /obj/item/weapon/mop)) + if(istype(W, /obj/item/mop)) name = "mop ED-CLN assembly" build_step++ to_chat(user, "You add \the [W] to \the [src].") @@ -204,7 +204,7 @@ to_chat(user, "Mop attached.") if(8) - if(istype(W, /obj/item/weapon/cell)) + if(istype(W, /obj/item/cell)) build_step++ to_chat(user, "You complete the ED-CLN.") var/turf/T = get_turf(src) diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 396c42fb435..633f2a5121d 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -272,10 +272,10 @@ visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) - new /obj/item/weapon/material/minihoe(Tsec) - new /obj/item/weapon/reagent_containers/glass/bucket(Tsec) - new /obj/item/device/assembly/prox_sensor(Tsec) - new /obj/item/device/analyzer/plant_analyzer(Tsec) + new /obj/item/material/minihoe(Tsec) + new /obj/item/reagent_containers/glass/bucket(Tsec) + new /obj/item/assembly/prox_sensor(Tsec) + new /obj/item/analyzer/plant_analyzer(Tsec) if(tank) tank.loc = Tsec @@ -327,7 +327,7 @@ // Assembly -/obj/item/weapon/farmbot_arm_assembly +/obj/item/farmbot_arm_assembly name = "water tank/robot arm assembly" desc = "A water tank with a robot arm permanently grafted to it." icon = 'icons/obj/chemical_tanks.dmi' @@ -338,7 +338,7 @@ w_class = ITEMSIZE_NORMAL -/obj/item/weapon/farmbot_arm_assembly/New(var/newloc, var/theTank) +/obj/item/farmbot_arm_assembly/New(var/newloc, var/theTank) ..(newloc) if(!theTank) // If an admin spawned it, it won't have a watertank it, so lets make one for em! tank = new /obj/structure/reagent_dispensers/watertank(src) @@ -357,7 +357,7 @@ user.drop_from_inventory(S) qdel(S) - new /obj/item/weapon/farmbot_arm_assembly(loc, src) + new /obj/item/farmbot_arm_assembly(loc, src) /obj/structure/reagent_dispensers/watertank/attackby(var/obj/item/organ/external/S, mob/user as mob) if ((!istype(S, /obj/item/organ/external/arm)) || S.robotic != ORGAN_ROBOT) @@ -369,11 +369,11 @@ user.drop_from_inventory(S) qdel(S) - new /obj/item/weapon/farmbot_arm_assembly(loc, src) + new /obj/item/farmbot_arm_assembly(loc, src) -/obj/item/weapon/farmbot_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/farmbot_arm_assembly/attackby(obj/item/W as obj, mob/user as mob) ..() - if((istype(W, /obj/item/device/analyzer/plant_analyzer)) && (build_step == 0)) + if((istype(W, /obj/item/analyzer/plant_analyzer)) && (build_step == 0)) build_step++ to_chat(user, "You add the plant analyzer to [src].") name = "farmbot assembly" @@ -381,7 +381,7 @@ user.remove_from_mob(W) qdel(W) - else if((istype(W, /obj/item/weapon/reagent_containers/glass/bucket)) && (build_step == 1)) + else if((istype(W, /obj/item/reagent_containers/glass/bucket)) && (build_step == 1)) build_step++ to_chat(user, "You add a bucket to [src].") name = "farmbot assembly with bucket" @@ -389,7 +389,7 @@ user.remove_from_mob(W) qdel(W) - else if((istype(W, /obj/item/weapon/material/minihoe)) && (build_step == 2)) + else if((istype(W, /obj/item/material/minihoe)) && (build_step == 2)) build_step++ to_chat(user, "You add a minihoe to [src].") name = "farmbot assembly with bucket and minihoe" @@ -408,7 +408,7 @@ qdel(W) qdel(src) - else if(istype(W, /obj/item/weapon/pen)) + else if(istype(W, /obj/item/pen)) var/t = tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN) t = sanitize(t, MAX_NAME_LEN) if(!t) @@ -418,7 +418,7 @@ created_name = t -/obj/item/weapon/farmbot_arm_assembly/attack_hand(mob/user as mob) +/obj/item/farmbot_arm_assembly/attack_hand(mob/user as mob) return //it's a converted watertank, no you cannot pick it up and put it in your backpack #undef FARMBOT_COLLECT diff --git a/code/modules/mob/living/bot/floorbot.dm b/code/modules/mob/living/bot/floorbot.dm index e281609cdbd..1a42019df61 100644 --- a/code/modules/mob/living/bot/floorbot.dm +++ b/code/modules/mob/living/bot/floorbot.dm @@ -293,9 +293,9 @@ playsound(src, "sparks", 50, 1) var/turf/Tsec = get_turf(src) - var/obj/item/weapon/storage/toolbox/mechanical/N = new /obj/item/weapon/storage/toolbox/mechanical(Tsec) + var/obj/item/storage/toolbox/mechanical/N = new /obj/item/storage/toolbox/mechanical(Tsec) N.contents = list() - new /obj/item/device/assembly/prox_sensor(Tsec) + new /obj/item/assembly/prox_sensor(Tsec) if(prob(50)) new /obj/item/robot_parts/l_arm(Tsec) new /obj/item/stack/tile/floor(Tsec, amount) @@ -340,7 +340,7 @@ /* Assembly */ -/obj/item/weapon/storage/toolbox/mechanical/attackby(var/obj/item/stack/tile/floor/T, mob/living/user as mob) +/obj/item/storage/toolbox/mechanical/attackby(var/obj/item/stack/tile/floor/T, mob/living/user as mob) if(!istype(T, /obj/item/stack/tile/floor)) ..() return @@ -350,7 +350,7 @@ if(user.s_active) user.s_active.close(user) if(T.use(10)) - var/obj/item/weapon/toolbox_tiles/B = new /obj/item/weapon/toolbox_tiles + var/obj/item/toolbox_tiles/B = new /obj/item/toolbox_tiles user.put_in_hands(B) to_chat(user, "You add the tiles into the empty toolbox. They protrude from the top.") user.drop_from_inventory(src) @@ -359,7 +359,7 @@ to_chat(user, "You need 10 floor tiles for a floorbot.") return -/obj/item/weapon/toolbox_tiles +/obj/item/toolbox_tiles desc = "It's a toolbox with tiles sticking out the top" name = "tiles and toolbox" icon = 'icons/obj/aibots.dmi' @@ -371,17 +371,17 @@ w_class = ITEMSIZE_NORMAL var/created_name = "Floorbot" -/obj/item/weapon/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob) +/obj/item/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob) ..() if(isprox(W)) qdel(W) - var/obj/item/weapon/toolbox_tiles_sensor/B = new /obj/item/weapon/toolbox_tiles_sensor() + var/obj/item/toolbox_tiles_sensor/B = new /obj/item/toolbox_tiles_sensor() B.created_name = created_name user.put_in_hands(B) to_chat(user, "You add the sensor to the toolbox and tiles!") user.drop_from_inventory(src) qdel(src) - else if (istype(W, /obj/item/weapon/pen)) + else if (istype(W, /obj/item/pen)) var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!t) return @@ -389,7 +389,7 @@ return created_name = t -/obj/item/weapon/toolbox_tiles_sensor +/obj/item/toolbox_tiles_sensor desc = "It's a toolbox with tiles sticking out the top and a sensor attached" name = "tiles, toolbox and sensor arrangement" icon = 'icons/obj/aibots.dmi' @@ -401,7 +401,7 @@ w_class = ITEMSIZE_NORMAL var/created_name = "Floorbot" -/obj/item/weapon/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob) +/obj/item/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob) ..() if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm) || (istype(W, /obj/item/organ/external/arm) && ((W.name == "robotic right arm") || (W.name == "robotic left arm")))) qdel(W) @@ -411,7 +411,7 @@ to_chat(user, "You add the robot arm to the odd looking toolbox assembly! Boop beep!") user.drop_from_inventory(src) qdel(src) - else if(istype(W, /obj/item/weapon/pen)) + else if(istype(W, /obj/item/pen)) var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!t) return diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm index 9596a2024d3..7d3a6e93026 100644 --- a/code/modules/mob/living/bot/medbot.dm +++ b/code/modules/mob/living/bot/medbot.dm @@ -27,7 +27,7 @@ var/vocal = 1 //Healing vars - var/obj/item/weapon/reagent_containers/glass/reagent_glass = null //Can be set to draw from this for reagents. + var/obj/item/reagent_containers/glass/reagent_glass = null //Can be set to draw from this for reagents. var/injection_amount = 15 //How much reagent do we inject at a time? var/heal_threshold = 10 //Start healing when they have this much damage in a category var/use_beaker = 0 //Use reagents in beaker instead of default treatment agents. @@ -249,7 +249,7 @@ ui.open() /mob/living/bot/medbot/attackby(var/obj/item/O, var/mob/user) - if(istype(O, /obj/item/weapon/reagent_containers/glass)) + if(istype(O, /obj/item/reagent_containers/glass)) if(locked) to_chat(user, "You cannot insert a beaker because the panel is locked.") return @@ -332,9 +332,9 @@ visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) - new /obj/item/weapon/storage/firstaid(Tsec) - new /obj/item/device/assembly/prox_sensor(Tsec) - new /obj/item/device/healthanalyzer(Tsec) + new /obj/item/storage/firstaid(Tsec) + new /obj/item/assembly/prox_sensor(Tsec) + new /obj/item/healthanalyzer(Tsec) if (prob(50)) new /obj/item/robot_parts/l_arm(Tsec) @@ -471,7 +471,7 @@ /* Construction */ -/obj/item/weapon/storage/firstaid/attackby(var/obj/item/robot_parts/S, mob/user as mob) +/obj/item/storage/firstaid/attackby(var/obj/item/robot_parts/S, mob/user as mob) if ((!istype(S, /obj/item/robot_parts/l_arm)) && (!istype(S, /obj/item/robot_parts/r_arm))) ..() return @@ -480,12 +480,12 @@ to_chat(user, "You need to empty [src] out first.") return - var/obj/item/weapon/firstaid_arm_assembly/A = new /obj/item/weapon/firstaid_arm_assembly - if(istype(src, /obj/item/weapon/storage/firstaid/fire)) + var/obj/item/firstaid_arm_assembly/A = new /obj/item/firstaid_arm_assembly + if(istype(src, /obj/item/storage/firstaid/fire)) A.skin = "ointment" - else if(istype(src, /obj/item/weapon/storage/firstaid/toxin)) + else if(istype(src, /obj/item/storage/firstaid/toxin)) A.skin = "tox" - else if(istype(src, /obj/item/weapon/storage/firstaid/o2)) + else if(istype(src, /obj/item/storage/firstaid/o2)) A.skin = "o2" qdel(S) @@ -494,7 +494,7 @@ user.drop_from_inventory(src) qdel(src) -/obj/item/weapon/storage/firstaid/attackby(var/obj/item/organ/external/S, mob/user as mob) +/obj/item/storage/firstaid/attackby(var/obj/item/organ/external/S, mob/user as mob) if (!istype(S, /obj/item/organ/external/arm) || S.robotic != ORGAN_ROBOT) ..() return @@ -503,12 +503,12 @@ to_chat(user, "You need to empty [src] out first.") return - var/obj/item/weapon/firstaid_arm_assembly/A = new /obj/item/weapon/firstaid_arm_assembly - if(istype(src, /obj/item/weapon/storage/firstaid/fire)) + var/obj/item/firstaid_arm_assembly/A = new /obj/item/firstaid_arm_assembly + if(istype(src, /obj/item/storage/firstaid/fire)) A.skin = "ointment" - else if(istype(src, /obj/item/weapon/storage/firstaid/toxin)) + else if(istype(src, /obj/item/storage/firstaid/toxin)) A.skin = "tox" - else if(istype(src, /obj/item/weapon/storage/firstaid/o2)) + else if(istype(src, /obj/item/storage/firstaid/o2)) A.skin = "o2" qdel(S) @@ -517,7 +517,7 @@ user.drop_from_inventory(src) qdel(src) -/obj/item/weapon/firstaid_arm_assembly +/obj/item/firstaid_arm_assembly name = "first aid/robot arm assembly" desc = "A first aid kit with a robot arm permanently grafted to it." icon = 'icons/obj/aibots.dmi' @@ -527,14 +527,14 @@ var/skin = null //Same as medbot, set to tox or ointment for the respective kits. w_class = ITEMSIZE_NORMAL -/obj/item/weapon/firstaid_arm_assembly/Initialize() +/obj/item/firstaid_arm_assembly/Initialize() . = ..() if(skin) add_overlay("kit_skin_[src.skin]") -/obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/firstaid_arm_assembly/attackby(obj/item/W as obj, mob/user as mob) ..() - if(istype(W, /obj/item/weapon/pen)) + if(istype(W, /obj/item/pen)) var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!t) return @@ -544,7 +544,7 @@ else switch(build_step) if(0) - if(istype(W, /obj/item/device/healthanalyzer)) + if(istype(W, /obj/item/healthanalyzer)) user.drop_item() qdel(W) build_step++ diff --git a/code/modules/mob/living/bot/mulebot.dm b/code/modules/mob/living/bot/mulebot.dm index cb8e2acb13d..54bb140ac74 100644 --- a/code/modules/mob/living/bot/mulebot.dm +++ b/code/modules/mob/living/bot/mulebot.dm @@ -253,7 +253,7 @@ visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) - new /obj/item/device/assembly/prox_sensor(Tsec) + new /obj/item/assembly/prox_sensor(Tsec) new /obj/item/stack/rods(Tsec) new /obj/item/stack/rods(Tsec) new /obj/item/stack/cable_coil/cut(Tsec) diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm index 31e0854d007..3dc8ac88b82 100644 --- a/code/modules/mob/living/bot/secbot.dm +++ b/code/modules/mob/living/bot/secbot.dm @@ -32,7 +32,7 @@ var/xeno_harm_strength = 15 // How hard to hit simple_mobs. var/baton_glow = "#FF6A00" - var/used_weapon = /obj/item/weapon/melee/baton //Weapon used by the bot + var/used_weapon = /obj/item/melee/baton //Weapon used by the bot var/list/threat_found_sounds = list('sound/voice/bcriminal.ogg', 'sound/voice/bjustice.ogg', 'sound/voice/bfreeze.ogg') var/list/preparing_arrest_sounds = list('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/bcreep.ogg') @@ -70,7 +70,7 @@ baton_glow = "#33CCFF" req_one_access = list(access_research, access_robotics) botcard_access = list(access_research, access_robotics, access_xenobiology, access_xenoarch, access_tox, access_tox_storage, access_maint_tunnels) - used_weapon = /obj/item/weapon/melee/baton/slime + used_weapon = /obj/item/melee/baton/slime var/xeno_stun_strength = 5 // How hard to slimebatoned()'d naughty slimes. 5 works out to 2 discipline and 5 weaken. /mob/living/bot/secbot/slime/slimesky @@ -336,10 +336,10 @@ busy = TRUE if(do_mob(src, H, 60)) if(!H.handcuffed) - if(istype(H.back, /obj/item/weapon/rig) && istype(H.gloves,/obj/item/clothing/gloves/gauntlets/rig)) - H.handcuffed = new /obj/item/weapon/handcuffs/cable(H) // Better to be cable cuffed than stun-locked + if(istype(H.back, /obj/item/rig) && istype(H.gloves,/obj/item/clothing/gloves/gauntlets/rig)) + H.handcuffed = new /obj/item/handcuffs/cable(H) // Better to be cable cuffed than stun-locked else - H.handcuffed = new /obj/item/weapon/handcuffs(H) + H.handcuffed = new /obj/item/handcuffs(H) H.update_handcuffed() busy = FALSE else if(istype(M, /mob/living)) @@ -366,11 +366,11 @@ visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) - var/obj/item/weapon/secbot_assembly/Sa = new /obj/item/weapon/secbot_assembly(Tsec) + var/obj/item/secbot_assembly/Sa = new /obj/item/secbot_assembly(Tsec) Sa.build_step = 1 Sa.add_overlay("hs_hole") Sa.created_name = name - new /obj/item/device/assembly/prox_sensor(Tsec) + new /obj/item/assembly/prox_sensor(Tsec) new used_weapon(Tsec) if(prob(50)) new /obj/item/robot_parts/l_arm(Tsec) @@ -403,7 +403,7 @@ //Secbot Construction -/obj/item/clothing/head/helmet/attackby(var/obj/item/device/assembly/signaler/S, mob/user as mob) +/obj/item/clothing/head/helmet/attackby(var/obj/item/assembly/signaler/S, mob/user as mob) ..() if(!issignaler(S)) ..() @@ -414,7 +414,7 @@ if(S.secured) qdel(S) - var/obj/item/weapon/secbot_assembly/A = new /obj/item/weapon/secbot_assembly + var/obj/item/secbot_assembly/A = new /obj/item/secbot_assembly user.put_in_hands(A) to_chat(user, "You add the signaler to the helmet.") user.drop_from_inventory(src) @@ -422,7 +422,7 @@ else return -/obj/item/weapon/secbot_assembly +/obj/item/secbot_assembly name = "helmet/signaler assembly" desc = "Some sort of bizarre assembly." icon = 'icons/obj/aibots.dmi' @@ -435,10 +435,10 @@ var/build_step = 0 var/created_name = "Securitron" -/obj/item/weapon/secbot_assembly/attackby(var/obj/item/W, var/mob/user) +/obj/item/secbot_assembly/attackby(var/obj/item/W, var/mob/user) ..() if(W.has_tool_quality(TOOL_WELDER) && !build_step) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(WT.remove_fuel(0, user)) build_step = 1 add_overlay("hs_hole") @@ -460,10 +460,10 @@ add_overlay("hs_arm") qdel(W) - else if(istype(W, /obj/item/weapon/melee/baton) && build_step == 3) + else if(istype(W, /obj/item/melee/baton) && build_step == 3) user.drop_item() to_chat(user, "You complete the Securitron! Beep boop.") - if(istype(W, /obj/item/weapon/melee/baton/slime)) + if(istype(W, /obj/item/melee/baton/slime)) var/mob/living/bot/secbot/slime/S = new /mob/living/bot/secbot/slime(get_turf(src)) S.name = created_name else @@ -472,7 +472,7 @@ qdel(W) qdel(src) - else if(istype(W, /obj/item/weapon/pen)) + else if(istype(W, /obj/item/pen)) var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(!t) return diff --git a/code/modules/mob/living/carbon/alien/alien_attacks.dm b/code/modules/mob/living/carbon/alien/alien_attacks.dm index 6eac6a05d26..10858811064 100644 --- a/code/modules/mob/living/carbon/alien/alien_attacks.dm +++ b/code/modules/mob/living/carbon/alien/alien_attacks.dm @@ -15,7 +15,7 @@ if (I_GRAB) if (M == src) return - var/obj/item/weapon/grab/G = new /obj/item/weapon/grab( M, src ) + var/obj/item/grab/G = new /obj/item/grab( M, src ) M.put_in_active_hand(G) diff --git a/code/modules/mob/living/carbon/alien/diona/diona.dm b/code/modules/mob/living/carbon/alien/diona/diona.dm index 753bdc90100..9fa713936f2 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona.dm @@ -43,7 +43,7 @@ var/list/_nymph_default_emotes = list( can_pull_size = ITEMSIZE_SMALL can_pull_mobs = MOB_PULL_SMALLER - holder_type = /obj/item/weapon/holder/diona + holder_type = /obj/item/holder/diona var/obj/item/hat /mob/living/carbon/alien/diona/get_available_emotes() diff --git a/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm b/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm index bfb9ac536b7..2a7f93f74ff 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm @@ -11,7 +11,7 @@ else return ..() -/mob/living/carbon/alien/diona/attackby(var/obj/item/weapon/W, var/mob/user) +/mob/living/carbon/alien/diona/attackby(var/obj/item/W, var/mob/user) if(user.a_intent == "help" && istype(W, /obj/item/clothing/head)) if(hat) to_chat(user, "\The [src] is already wearing \the [hat].") diff --git a/code/modules/mob/living/carbon/alien/diona/diona_powers.dm b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm index fe31cf9c8b8..0f4b69501d4 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona_powers.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm @@ -63,5 +63,5 @@ if(istype(M)) for(var/atom/A in M.contents) - if(istype(A,/mob/living/simple_mob/animal/borer) || istype(A,/obj/item/weapon/holder)) + if(istype(A,/mob/living/simple_mob/animal/borer) || istype(A,/obj/item/holder)) return diff --git a/code/modules/mob/living/carbon/alien/diona/progression.dm b/code/modules/mob/living/carbon/alien/diona/progression.dm index 806fcbe8dbe..c8f9baaba6a 100644 --- a/code/modules/mob/living/carbon/alien/diona/progression.dm +++ b/code/modules/mob/living/carbon/alien/diona/progression.dm @@ -15,8 +15,8 @@ src.split() - if(istype(loc,/obj/item/weapon/holder/diona)) - var/obj/item/weapon/holder/diona/L = loc + if(istype(loc,/obj/item/holder/diona)) + var/obj/item/holder/diona/L = loc src.loc = L.loc qdel(L) diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 1a29bbbbda1..e81fb74f4df 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -1,6 +1,6 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 -/obj/item/device/mmi +/obj/item/mmi name = "man-machine interface" desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity." icon = 'icons/obj/assemblies.dmi' @@ -17,12 +17,12 @@ var/mob/living/carbon/brain/brainmob = null//The current occupant. var/obj/item/organ/internal/brain/brainobj = null //The current brain organ. var/obj/mecha = null//This does not appear to be used outside of reference in mecha.dm. - var/obj/item/device/radio/headset/mmi_radio/radio = null//Let's give it a radio. + var/obj/item/radio/headset/mmi_radio/radio = null//Let's give it a radio. -/obj/item/device/mmi/New() +/obj/item/mmi/New() radio = new(src)//Spawns a radio inside the MMI. -/obj/item/device/mmi/verb/toggle_radio() +/obj/item/mmi/verb/toggle_radio() set name = "Toggle Brain Radio" set desc = "Enables or disables the integrated brain radio, which is only usable outside of a body." set category = "Object" @@ -42,7 +42,7 @@ else to_chat (usr, "You were unable to toggle the [src]'s radio.") -/obj/item/device/mmi/attackby(var/obj/item/O as obj, var/mob/user as mob) +/obj/item/mmi/attackby(var/obj/item/O as obj, var/mob/user as mob) if(istype(O,/obj/item/organ/internal/brain) && !brainmob) //Time to stick a brain in it --NEO var/obj/item/organ/internal/brain/B = O @@ -83,7 +83,7 @@ return - if((istype(O,/obj/item/weapon/card/id)||istype(O,/obj/item/device/pda)) && brainmob) + if((istype(O,/obj/item/card/id)||istype(O,/obj/item/pda)) && brainmob) if(allowed(user)) locked = !locked to_chat(user, "You [locked ? "lock" : "unlock"] the brain holder.") @@ -96,7 +96,7 @@ ..() //TODO: ORGAN REMOVAL UPDATE. Make the brain remain in the MMI so it doesn't lose organ data. -/obj/item/device/mmi/attack_self(mob/user as mob) +/obj/item/mmi/attack_self(mob/user as mob) if(!brainmob) to_chat(user, "You upend the MMI, but there's nothing in it.") else if(locked) @@ -120,7 +120,7 @@ icon_state = "mmi_empty" name = "Man-Machine Interface" -/obj/item/device/mmi/proc/transfer_identity(var/mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->robot people. +/obj/item/mmi/proc/transfer_identity(var/mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->robot people. brainmob = new(src) brainmob.name = H.real_name brainmob.real_name = H.real_name @@ -137,15 +137,15 @@ locked = 1 return -/obj/item/device/mmi/relaymove(var/mob/user, var/direction) +/obj/item/mmi/relaymove(var/mob/user, var/direction) if(user.stat || user.stunned) return - var/obj/item/weapon/rig/rig = src.get_rig() + var/obj/item/rig/rig = src.get_rig() if(rig) - if(istype(rig,/obj/item/weapon/rig)) + if(istype(rig,/obj/item/rig)) rig.forced_move(direction, user) -/obj/item/device/mmi/Destroy() +/obj/item/mmi/Destroy() if(isrobot(loc)) var/mob/living/silicon/robot/borg = loc borg.mmi = null @@ -153,12 +153,12 @@ QDEL_NULL(brainmob) return ..() -/obj/item/device/mmi/radio_enabled +/obj/item/mmi/radio_enabled name = "radio-enabled man-machine interface" desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity. This one comes with a built-in radio. Wait, don't they all?" origin_tech = list(TECH_BIO = 4) -/obj/item/device/mmi/emp_act(severity) +/obj/item/mmi/emp_act(severity) if(!brainmob) return else @@ -173,7 +173,7 @@ brainmob.emp_damage += rand(0,5) ..() -/obj/item/device/mmi/digital +/obj/item/mmi/digital var/searching = 0 var/askDelay = 10 * 60 * 1 req_access = list(access_robotics) @@ -181,7 +181,7 @@ mecha = null//This does not appear to be used outside of reference in mecha.dm. var/ghost_query_type = null -/obj/item/device/mmi/digital/New() +/obj/item/mmi/digital/New() src.brainmob = new(src) // src.brainmob.add_language("Robot Talk")//No binary without a binary communication device src.brainmob.add_language(LANGUAGE_GALCOM) @@ -193,10 +193,10 @@ radio = new(src) dead_mob_list -= src.brainmob -/obj/item/device/mmi/digital/attackby(var/obj/item/O as obj, var/mob/user as mob) +/obj/item/mmi/digital/attackby(var/obj/item/O as obj, var/mob/user as mob) return //Doesn't do anything right now because none of the things that can be done to a regular MMI make any sense for these -/obj/item/device/mmi/digital/examine(mob/user) +/obj/item/mmi/digital/examine(mob/user) . = ..() if(src.brainmob && src.brainmob.key) @@ -211,7 +211,7 @@ else . += "It appears to be completely inactive." -/obj/item/device/mmi/digital/emp_act(severity) +/obj/item/mmi/digital/emp_act(severity) if(!src.brainmob) return else @@ -226,7 +226,7 @@ src.brainmob.emp_damage += rand(0,5) ..() -/obj/item/device/mmi/digital/transfer_identity(var/mob/living/carbon/H) +/obj/item/mmi/digital/transfer_identity(var/mob/living/carbon/H) brainmob.dna = H.dna brainmob.timeofhostdeath = H.timeofdeath brainmob.set_stat(CONSCIOUS) @@ -234,13 +234,13 @@ H.mind.transfer_to(brainmob) return -/obj/item/device/mmi/digital/attack_self(mob/user as mob) +/obj/item/mmi/digital/attack_self(mob/user as mob) if(brainmob && !brainmob.key && searching == 0) //Start the process of searching for a new user. to_chat(user, span_blue("You carefully locate the manual activation switch and start the [src]'s boot process.")) request_player() -/obj/item/device/mmi/digital/proc/request_player() +/obj/item/mmi/digital/proc/request_player() if(!ghost_query_type) return searching = 1 @@ -253,7 +253,7 @@ else reset_search() -/obj/item/device/mmi/digital/proc/reset_search() //We give the players sixty seconds to decide, then reset the timer. +/obj/item/mmi/digital/proc/reset_search() //We give the players sixty seconds to decide, then reset the timer. if(src.brainmob && src.brainmob.key) return @@ -263,7 +263,7 @@ for (var/mob/M in viewers(T)) M.show_message(span_blue("\The [src] buzzes quietly, and the golden lights fade away. Perhaps you could try again?")) -/obj/item/device/mmi/digital/proc/transfer_personality(var/mob/candidate) +/obj/item/mmi/digital/proc/transfer_personality(var/mob/candidate) announce_ghost_joinleave(candidate, 0, "They are occupying a synthetic brain now.") src.searching = 0 if(candidate.mind) @@ -281,7 +281,7 @@ for (var/mob/M in viewers(T)) M.show_message(span_blue("\The [src] chimes quietly.")) -/obj/item/device/mmi/digital/robot +/obj/item/mmi/digital/robot name = "robotic intelligence circuit" desc = "The pinnacle of artifical intelligence which can be achieved using classical computer science." catalogue_data = list(/datum/category_item/catalogue/technology/drone/drones) @@ -291,19 +291,19 @@ origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 3, TECH_DATA = 4) ghost_query_type = /datum/ghost_query/drone_brain -/obj/item/device/mmi/digital/robot/New() +/obj/item/mmi/digital/robot/New() ..() src.brainmob.name = "[pick(list("ADA","DOS","GNU","MAC","WIN","NJS","SKS","DRD","IOS","CRM","IBM","TEX","LVM","BSD",))]-[rand(1000, 9999)]" src.brainmob.real_name = src.brainmob.name -/obj/item/device/mmi/digital/robot/transfer_identity(var/mob/living/carbon/H) +/obj/item/mmi/digital/robot/transfer_identity(var/mob/living/carbon/H) ..() if(brainmob.mind) brainmob.mind.assigned_role = JOB_ROBOTIC_INTELLIGENCE to_chat(brainmob, "You feel slightly disoriented. That's normal when you're little more than a complex circuit.") return -/obj/item/device/mmi/digital/posibrain +/obj/item/mmi/digital/posibrain name = "positronic brain" desc = "A cube of shining metal, four inches to a side and covered in shallow grooves." catalogue_data = list(/datum/category_item/catalogue/technology/positronics) @@ -313,12 +313,12 @@ origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2, TECH_DATA = 4) ghost_query_type = /datum/ghost_query/posi_brain -/obj/item/device/mmi/digital/posibrain/request_player() +/obj/item/mmi/digital/posibrain/request_player() icon_state = "posibrain-searching" ..() -/obj/item/device/mmi/digital/posibrain/transfer_identity(var/mob/living/carbon/H) +/obj/item/mmi/digital/posibrain/transfer_identity(var/mob/living/carbon/H) ..() if(brainmob.mind) brainmob.mind.assigned_role = JOB_POSITRONIC_BRAIN @@ -326,25 +326,25 @@ icon_state = "posibrain-occupied" return -/obj/item/device/mmi/digital/posibrain/transfer_personality(var/mob/candidate) +/obj/item/mmi/digital/posibrain/transfer_personality(var/mob/candidate) ..() icon_state = "posibrain-occupied" -/obj/item/device/mmi/digital/posibrain/reset_search() //We give the players sixty seconds to decide, then reset the timer. +/obj/item/mmi/digital/posibrain/reset_search() //We give the players sixty seconds to decide, then reset the timer. ..() icon_state = "posibrain" -/obj/item/device/mmi/digital/posibrain/New() +/obj/item/mmi/digital/posibrain/New() ..() src.brainmob.name = "[pick(list("PBU","HIU","SINA","ARMA","OSI"))]-[rand(100, 999)]" src.brainmob.real_name = src.brainmob.name // This type shouldn't care about brainmobs. -/obj/item/device/mmi/inert +/obj/item/mmi/inert // This is a 'fake' MMI that is used to let AIs control borg shells directly. // This doesn't inherit from /digital because all that does is add ghost pulling capabilities, which this thing won't need. -/obj/item/device/mmi/inert/ai_remote +/obj/item/mmi/inert/ai_remote name = "\improper AI remote interface" desc = "A sophisticated board which allows for an artificial intelligence to remotely control a synthetic chassis." icon = 'icons/obj/module.dmi' diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index 2e77792a00c..d10aca34f1f 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -25,7 +25,7 @@ return ..() /mob/living/carbon/brain/say_understands(var/other)//Goddamn is this hackish, but this say code is so odd - if(istype(container, /obj/item/device/mmi)) + if(istype(container, /obj/item/mmi)) if(issilicon(other)) return TRUE if(ishuman(other)) @@ -35,7 +35,7 @@ return ..() /mob/living/carbon/brain/update_canmove() - if(in_contents_of(/obj/mecha) || istype(loc, /obj/item/device/mmi)) + if(in_contents_of(/obj/mecha) || istype(loc, /obj/item/mmi)) canmove = 1 use_me = 1 else @@ -43,7 +43,7 @@ return canmove /mob/living/carbon/brain/isSynthetic() - return istype(loc, /obj/item/device/mmi) + return istype(loc, /obj/item/mmi) /mob/living/carbon/brain/runechat_holder(datum/chatmessage/CM) if(isturf(loc)) diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm index 1ad4169ceba..51ec405c9af 100644 --- a/code/modules/mob/living/carbon/brain/death.dm +++ b/code/modules/mob/living/carbon/brain/death.dm @@ -1,12 +1,12 @@ /mob/living/carbon/brain/death(gibbed) - if(!gibbed && istype(container, /obj/item/device/mmi)) //If not gibbed but in a container. + if(!gibbed && istype(container, /obj/item/mmi)) //If not gibbed but in a container. container.icon_state = "mmi_dead" return ..(gibbed,"beeps shrilly as the MMI flatlines!") else return ..(gibbed, DEATHGASP_NO_MESSAGE) /mob/living/carbon/brain/gib() - if(istype(container, /obj/item/device/mmi)) + if(istype(container, /obj/item/mmi)) qdel(container)//Gets rid of the MMI if there is one if(loc) if(istype(loc,/obj/item/organ/internal/brain)) diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm index 0f0e4615a07..2b039355720 100644 --- a/code/modules/mob/living/carbon/brain/emote.dm +++ b/code/modules/mob/living/carbon/brain/emote.dm @@ -11,7 +11,7 @@ var/list/_brain_default_emotes = list( ) /mob/living/carbon/brain/can_emote() - return (istype(container, /obj/item/device/mmi) && ..()) + return (istype(container, /obj/item/mmi) && ..()) /mob/living/carbon/brain/get_available_emotes() return global._brain_default_emotes.Copy() diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index b3d0f142999..2d152debdfa 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -101,7 +101,7 @@ //Handling EMP effect in the Life(), it's made VERY simply, and has some additional effects handled elsewhere if(emp_damage) //This is pretty much a damage type only used by MMIs, dished out by the emp_act - if(!(container && istype(container, /obj/item/device/mmi))) + if(!(container && istype(container, /obj/item/mmi))) emp_damage = 0 else emp_damage = round(emp_damage,1)//Let's have some nice numbers to work with diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index 2704cf2eade..6195fe3cac0 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -1,4 +1,4 @@ -/obj/item/device/mmi/digital/posibrain +/obj/item/mmi/digital/posibrain name = "positronic brain" desc = "A cube of shining metal, four inches to a side and covered in shallow grooves." icon = 'icons/obj/assemblies.dmi' @@ -13,7 +13,7 @@ mecha = null//This does not appear to be used outside of reference in mecha.dm. -/obj/item/device/mmi/digital/posibrain/attack_self(mob/user as mob) +/obj/item/mmi/digital/posibrain/attack_self(mob/user as mob) if(brainmob && !brainmob.key && searching == 0) //Start the process of searching for a new user. to_chat(user, span_blue("You carefully locate the manual activation switch and start the positronic brain's boot process.")) @@ -22,7 +22,7 @@ src.request_player() spawn(600) reset_search() -/obj/item/device/mmi/digital/posibrain/proc/request_player() +/obj/item/mmi/digital/posibrain/proc/request_player() for(var/mob/observer/dead/O in player_list) if(!O.MayRespawn()) continue @@ -32,7 +32,7 @@ if(O.client.prefs.be_special & BE_AI) question(O.client) -/obj/item/device/mmi/digital/posibrain/proc/question(var/client/C) +/obj/item/mmi/digital/posibrain/proc/question(var/client/C) spawn(0) if(!C) return var/response = tgui_alert(C, "Someone is requesting a personality for a positronic brain. Would you like to play as one?", "Positronic brain request", list("Yes", "No", "Never for this round")) @@ -45,7 +45,7 @@ C.prefs.be_special ^= BE_AI -/obj/item/device/mmi/digital/posibrain/transfer_identity(var/mob/living/carbon/H) +/obj/item/mmi/digital/posibrain/transfer_identity(var/mob/living/carbon/H) ..() if(brainmob.mind) brainmob.mind.assigned_role = JOB_POSITRONIC_BRAIN @@ -53,7 +53,7 @@ icon_state = "posibrain-occupied" return -/obj/item/device/mmi/digital/posibrain/proc/transfer_personality(var/mob/candidate) +/obj/item/mmi/digital/posibrain/proc/transfer_personality(var/mob/candidate) announce_ghost_joinleave(candidate, 0, "They are occupying a positronic brain now.") src.searching = 0 src.brainmob.mind = candidate.mind @@ -72,7 +72,7 @@ playsound(src, 'sound/misc/boobeebeep.ogg', 50, 1) icon_state = "posibrain-occupied" -/obj/item/device/mmi/digital/posibrain/proc/reset_search() //We give the players sixty seconds to decide, then reset the timer. +/obj/item/mmi/digital/posibrain/proc/reset_search() //We give the players sixty seconds to decide, then reset the timer. if(src.brainmob && src.brainmob.key) return to_world_log("Resetting Posibrain: [brainmob][brainmob ? ", [brainmob.key]" : ""]") @@ -85,7 +85,7 @@ M.show_message(span_blue("The positronic brain buzzes and beeps, and the golden lights fade away. Perhaps you could try again?")) playsound(src, 'sound/misc/buzzbeep.ogg', 50, 1) -/obj/item/device/mmi/digital/posibrain/emp_act(severity) +/obj/item/mmi/digital/posibrain/emp_act(severity) if(!src.brainmob) return else @@ -100,7 +100,7 @@ src.brainmob.emp_damage += rand(0,5) ..() -/obj/item/device/mmi/digital/posibrain/New() +/obj/item/mmi/digital/posibrain/New() ..() src.brainmob.name = "[pick(list("PBU","HIU","SINA","ARMA","OSI"))]-[rand(100, 999)]" src.brainmob.real_name = src.brainmob.name diff --git a/code/modules/mob/living/carbon/brain/robot.dm b/code/modules/mob/living/carbon/brain/robot.dm index 8818b20a9e7..0ca5d2fcf05 100644 --- a/code/modules/mob/living/carbon/brain/robot.dm +++ b/code/modules/mob/living/carbon/brain/robot.dm @@ -1,4 +1,4 @@ -/obj/item/device/mmi/digital/robot +/obj/item/mmi/digital/robot name = "robotic intelligence circuit" desc = "The pinnacle of artifical intelligence which can be achieved using classical computer science." icon = 'icons/obj/module.dmi' @@ -6,18 +6,18 @@ w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 3, TECH_DATA = 4) -/obj/item/device/mmi/digital/robot/New() +/obj/item/mmi/digital/robot/New() ..() src.brainmob.name = "[pick(list("ADA","DOS","GNU","MAC","WIN"))]-[rand(1000, 9999)]" src.brainmob.real_name = src.brainmob.name src.name = "robotic intelligence circuit ([src.brainmob.name])" -/obj/item/device/mmi/digital/robot/transfer_identity(var/mob/living/carbon/H) +/obj/item/mmi/digital/robot/transfer_identity(var/mob/living/carbon/H) ..() if(brainmob.mind) brainmob.mind.assigned_role = JOB_ROBOTIC_INTELLIGENCE to_chat(brainmob, "You feel slightly disoriented. That's normal when you're little more than a complex circuit.") return -/obj/item/device/mmi/digital/robot/attack_self(mob/user as mob) +/obj/item/mmi/digital/robot/attack_self(mob/user as mob) return //This object is technically a brain, and should not be dumping brains out of itself like its parent object does. diff --git a/code/modules/mob/living/carbon/brain/say.dm b/code/modules/mob/living/carbon/brain/say.dm index 5a890b6aa51..f7a47f74dd0 100644 --- a/code/modules/mob/living/carbon/brain/say.dm +++ b/code/modules/mob/living/carbon/brain/say.dm @@ -19,7 +19,7 @@ /mob/living/carbon/brain/handle_message_mode(message_mode, message, verb, speaking, used_radios) ..() if(message_mode) - var/obj/item/device/mmi/R = container + var/obj/item/mmi/R = container if(R.radio && R.radio.radio_enabled) if(message_mode == "general") message_mode = null diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index df195a495e7..0684acad70b 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -41,7 +41,7 @@ // Attacking someone with a weapon while they are neck-grabbed /mob/living/carbon/proc/check_neckgrab_attack(obj/item/W, mob/user, var/hit_zone) if(user.a_intent == I_HURT) - for(var/obj/item/weapon/grab/G in src.grabbed_by) + for(var/obj/item/grab/G in src.grabbed_by) if(G.assailant == user) if(G.state >= GRAB_AGGRESSIVE) if(hit_zone == BP_TORSO && shank_attack(W, G, user)) @@ -53,7 +53,7 @@ // Knifing -/mob/living/carbon/proc/attack_throat(obj/item/W, obj/item/weapon/grab/G, mob/user) +/mob/living/carbon/proc/attack_throat(obj/item/W, obj/item/grab/G, mob/user) if(!W.edge || !W.force || W.damtype != BRUTE) return 0 //unsuitable weapon @@ -101,7 +101,7 @@ return 1 -/mob/living/carbon/proc/shank_attack(obj/item/W, obj/item/weapon/grab/G, mob/user, hit_zone) +/mob/living/carbon/proc/shank_attack(obj/item/W, obj/item/grab/G, mob/user, hit_zone) if(!W.sharp || !W.force || W.damtype != BRUTE) return 0 //unsuitable weapon @@ -118,7 +118,7 @@ return 1 -/mob/living/carbon/proc/shank_armor_helper(obj/item/W, obj/item/weapon/grab/G, mob/user) +/mob/living/carbon/proc/shank_armor_helper(obj/item/W, obj/item/grab/G, mob/user) var/damage = W.force var/damage_mod = 1 if(W.edge) diff --git a/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm index ee94b8db354..7beb0276635 100644 --- a/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm +++ b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm @@ -18,21 +18,21 @@ var/to_wear_helmet = /obj/item/clothing/head/welding var/to_wear_glasses = /obj/item/clothing/glasses/threedglasses var/to_wear_mask = /obj/item/clothing/mask/gas - var/to_wear_l_radio = /obj/item/device/radio/headset + var/to_wear_l_radio = /obj/item/radio/headset var/to_wear_r_radio = null var/to_wear_uniform = /obj/item/clothing/under/color/grey var/to_wear_suit = /obj/item/clothing/suit/armor/material/makeshift/glass var/to_wear_gloves = /obj/item/clothing/gloves/ring/material/platinum var/to_wear_shoes = /obj/item/clothing/shoes/galoshes - var/to_wear_belt = /obj/item/weapon/storage/belt/utility/full - var/to_wear_l_pocket = /obj/item/weapon/soap - var/to_wear_r_pocket = /obj/item/device/pda - var/to_wear_back = /obj/item/weapon/storage/backpack - var/to_wear_id_type = /obj/item/weapon/card/id + var/to_wear_belt = /obj/item/storage/belt/utility/full + var/to_wear_l_pocket = /obj/item/soap + var/to_wear_r_pocket = /obj/item/pda + var/to_wear_back = /obj/item/storage/backpack + var/to_wear_id_type = /obj/item/card/id var/to_wear_id_job = JOB_ALT_ASSISTANT var/to_wear_l_hand = null - var/to_wear_r_hand = /obj/item/weapon/melee/baton + var/to_wear_r_hand = /obj/item/melee/baton /mob/living/carbon/human/ai_controlled/Initialize() if(generate_gender) @@ -91,7 +91,7 @@ equip_to_slot_or_del(new to_wear_r_hand(src), slot_r_hand) if(to_wear_id_type) - var/obj/item/weapon/card/id/W = new to_wear_id_type(src) + var/obj/item/card/id/W = new to_wear_id_type(src) W.name = "[real_name]'s ID Card" var/datum/job/jobdatum for(var/jobtype in typesof(/datum/job)) @@ -126,17 +126,17 @@ to_wear_helmet = /obj/item/clothing/head/helmet/dermal to_wear_glasses = /obj/item/clothing/glasses/goggles to_wear_mask = /obj/item/clothing/mask/gas/half - to_wear_l_radio = /obj/item/device/radio/headset/headset_rob + to_wear_l_radio = /obj/item/radio/headset/headset_rob to_wear_r_radio = null to_wear_uniform = /obj/item/clothing/under/color/grey to_wear_suit = /obj/item/clothing/suit/armor/vest to_wear_gloves = null to_wear_shoes = /obj/item/clothing/shoes/boots/combat/changeling - to_wear_belt = /obj/item/weapon/storage/belt/utility/full - to_wear_l_pocket = /obj/item/weapon/grenade/explosive/mini - to_wear_r_pocket = /obj/item/weapon/grenade/explosive/mini - to_wear_back = /obj/item/device/radio/electropack - to_wear_id_type = /obj/item/weapon/card/id + to_wear_belt = /obj/item/storage/belt/utility/full + to_wear_l_pocket = /obj/item/grenade/explosive/mini + to_wear_r_pocket = /obj/item/grenade/explosive/mini + to_wear_back = /obj/item/radio/electropack + to_wear_id_type = /obj/item/card/id to_wear_id_job = "Experiment" to_wear_r_hand = null diff --git a/code/modules/mob/living/carbon/human/death_vr.dm b/code/modules/mob/living/carbon/human/death_vr.dm index d29f6609462..6917fe7abcb 100644 --- a/code/modules/mob/living/carbon/human/death_vr.dm +++ b/code/modules/mob/living/carbon/human/death_vr.dm @@ -3,7 +3,7 @@ //Drop the NIF, they're expensive, why not recover them? release_vore_contents(silent = TRUE) if(nif) - var/obj/item/device/nif/deadnif = nif //Unimplant removes the reference on the mob + var/obj/item/nif/deadnif = nif //Unimplant removes the reference on the mob if(!deadnif.gib_nodrop) deadnif.unimplant(src) deadnif.forceMove(drop_location()) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index fe2ef072f70..9dee978e7b9 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -194,7 +194,7 @@ //handcuffed? if(handcuffed && handcuffed.show_examine) - if(istype(handcuffed, /obj/item/weapon/handcuffs/cable)) + if(istype(handcuffed, /obj/item/handcuffs/cable)) msg += "[T.He] [T.is] [icon2html(handcuffed,user.client)] restrained with cable!" else msg += "[T.He] [T.is] [icon2html(handcuffed,user.client)] handcuffed!" @@ -222,7 +222,7 @@ //mask if(wear_mask && !(skip_gear & EXAMINE_SKIPMASK) && wear_mask.show_examine) var/descriptor = "on [T.his] face" - if(istype(wear_mask, /obj/item/weapon/grenade) && check_has_mouth()) + if(istype(wear_mask, /obj/item/grenade) && check_has_mouth()) descriptor = "in [T.his] mouth" if(wear_mask.blood_DNA) @@ -391,11 +391,11 @@ var/criminal = "None" if(wear_id) - if(istype(wear_id, /obj/item/weapon/card/id)) - var/obj/item/weapon/card/id/I = wear_id + if(istype(wear_id, /obj/item/card/id)) + var/obj/item/card/id/I = wear_id perpname = I.registered_name - else if(istype(wear_id, /obj/item/device/pda)) - var/obj/item/device/pda/P = wear_id + else if(istype(wear_id, /obj/item/pda)) + var/obj/item/pda/P = wear_id perpname = P.owner for (var/datum/data/record/R in data_core.security) @@ -410,11 +410,11 @@ var/medical = "None" if(wear_id) - if(istype(wear_id, /obj/item/weapon/card/id)) - var/obj/item/weapon/card/id/I = wear_id + if(istype(wear_id, /obj/item/card/id)) + var/obj/item/card/id/I = wear_id perpname = I.registered_name - else if(istype(wear_id, /obj/item/device/pda)) - var/obj/item/device/pda/P = wear_id + else if(istype(wear_id, /obj/item/pda)) + var/obj/item/pda/P = wear_id perpname = P.owner for (var/datum/data/record/R in data_core.medical) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 0d716dccda8..bbf0a8d805d 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -19,7 +19,7 @@ var/vore_fullness = 0 var/embedded_flag //To check if we've need to roll for damage on movement while an item is imbedded in us. - var/obj/item/weapon/rig/wearing_rig // This is very not good, but it's much much better than calling get_rig() every update_canmove() call. + var/obj/item/rig/wearing_rig // This is very not good, but it's much much better than calling get_rig() every update_canmove() call. var/last_push_time //For human_attackhand.dm, keeps track of the last use of disarm var/spitting = 0 //Spitting and spitting related things. Any human based ranged attacks, be it innate or added abilities. @@ -107,8 +107,8 @@ stat(null, "Phoron Stored: [P.stored_plasma]/[P.max_plasma]") - if(back && istype(back,/obj/item/weapon/rig)) - var/obj/item/weapon/rig/suit = back + if(back && istype(back,/obj/item/rig)) + var/obj/item/rig/suit = back var/cell_status = "ERROR" if(suit.cell) cell_status = "[suit.cell.charge]/[suit.cell.maxcharge]" stat(null, "Suit charge: [cell_status]") @@ -206,13 +206,13 @@ /mob/living/carbon/human/proc/implant_loyalty(override = FALSE) // Won't override by default. if(!config.use_loyalty_implants && !override) return // Nuh-uh. - var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(src) + var/obj/item/implant/loyalty/L = new/obj/item/implant/loyalty(src) if(L.handle_implant(src, BP_HEAD)) L.post_implant(src) /mob/living/carbon/human/proc/is_loyalty_implanted() for(var/L in src.contents) - if(istype(L, /obj/item/weapon/implant/loyalty)) + if(istype(L, /obj/item/implant/loyalty)) for(var/obj/item/organ/external/O in src.organs) if(L in O.implants) return 1 @@ -240,14 +240,14 @@ // Get rank from ID, ID inside PDA, PDA, ID in wallet, etc. /mob/living/carbon/human/proc/get_authentification_rank(var/if_no_id = "No id", var/if_no_job = "No job") - var/obj/item/device/pda/pda = wear_id + var/obj/item/pda/pda = wear_id if (istype(pda)) if (pda.id) return pda.id.rank ? pda.id.rank : if_no_job else return pda.ownrank ? pda.ownrank : if_no_job else - var/obj/item/weapon/card/id/id = get_idcard() + var/obj/item/card/id/id = get_idcard() if(id) return id.rank ? id.rank : if_no_job else @@ -256,14 +256,14 @@ //gets assignment from ID or ID inside PDA or PDA itself //Useful when player do something with computers /mob/living/carbon/human/proc/get_assignment(var/if_no_id = "No id", var/if_no_job = "No job") - var/obj/item/device/pda/pda = wear_id + var/obj/item/pda/pda = wear_id if (istype(pda)) if (pda.id) return pda.id.assignment else return pda.ownjob ? pda.ownjob : if_no_job else - var/obj/item/weapon/card/id/id = get_idcard() + var/obj/item/card/id/id = get_idcard() if(id) return id.assignment ? id.assignment : if_no_job else @@ -272,14 +272,14 @@ //gets name from ID or ID inside PDA or PDA itself //Useful when player do something with computers /mob/living/carbon/human/proc/get_authentification_name(var/if_no_id = "Unknown") - var/obj/item/device/pda/pda = wear_id + var/obj/item/pda/pda = wear_id if (istype(pda)) if (pda.id) return pda.id.registered_name else return pda.owner ? pda.owner : if_no_id else - var/obj/item/weapon/card/id/id = get_idcard() + var/obj/item/card/id/id = get_idcard() if(id) return id.registered_name else @@ -310,11 +310,11 @@ //Useful when player is being seen by other mobs /mob/living/carbon/human/proc/get_id_name(var/if_no_id = "Unknown") . = if_no_id - if(istype(wear_id,/obj/item/device/pda)) - var/obj/item/device/pda/P = wear_id + if(istype(wear_id,/obj/item/pda)) + var/obj/item/pda/P = wear_id return P.owner ? P.owner : if_no_id if(wear_id) - var/obj/item/weapon/card/id/I = wear_id.GetID() + var/obj/item/card/id/I = wear_id.GetID() if(I) return I.registered_name return @@ -363,7 +363,7 @@ var/modified = 0 var/perpname = "wot" - var/obj/item/weapon/card/id/I = GetIdCard() + var/obj/item/card/id/I = GetIdCard() if(I) perpname = I.registered_name else @@ -399,7 +399,7 @@ var/perpname = "wot" var/read = 0 - var/obj/item/weapon/card/id/I = GetIdCard() + var/obj/item/card/id/I = GetIdCard() if(I) perpname = I.registered_name else @@ -429,7 +429,7 @@ var/perpname = "wot" var/read = 0 - var/obj/item/weapon/card/id/I = GetIdCard() + var/obj/item/card/id/I = GetIdCard() if(I) perpname = I.registered_name else @@ -454,7 +454,7 @@ if (href_list["secrecordadd"]) if(hasHUD(usr,"security")) var/perpname = "wot" - var/obj/item/weapon/card/id/I = GetIdCard() + var/obj/item/card/id/I = GetIdCard() if(I) perpname = I.registered_name else @@ -482,7 +482,7 @@ var/perpname = "wot" var/modified = 0 - var/obj/item/weapon/card/id/I = GetIdCard() + var/obj/item/card/id/I = GetIdCard() if(I) perpname = I.registered_name else @@ -518,7 +518,7 @@ var/perpname = "wot" var/read = 0 - var/obj/item/weapon/card/id/I = GetIdCard() + var/obj/item/card/id/I = GetIdCard() if(I) perpname = I.registered_name else @@ -549,7 +549,7 @@ var/perpname = "wot" var/read = 0 - var/obj/item/weapon/card/id/I = GetIdCard() + var/obj/item/card/id/I = GetIdCard() if(I) perpname = I.registered_name else @@ -574,7 +574,7 @@ if (href_list["medrecordadd"]) if(hasHUD(usr,"medical")) var/perpname = "wot" - var/obj/item/weapon/card/id/I = GetIdCard() + var/obj/item/card/id/I = GetIdCard() if(I) perpname = I.registered_name else @@ -602,7 +602,7 @@ var/perpname = "wot" var/read = 0 - var/obj/item/weapon/card/id/I = GetIdCard() + var/obj/item/card/id/I = GetIdCard() if(I) perpname = I.registered_name else @@ -635,7 +635,7 @@ var/perpname = "wot" var/read = 0 - var/obj/item/weapon/card/id/I = GetIdCard() + var/obj/item/card/id/I = GetIdCard() if(I) perpname = I.registered_name else @@ -660,7 +660,7 @@ if (href_list["emprecordadd"]) if(hasHUD(usr,"best")) var/perpname = "wot" - var/obj/item/weapon/card/id/I = GetIdCard() + var/obj/item/card/id/I = GetIdCard() if(I) perpname = I.registered_name else @@ -1126,8 +1126,8 @@ var/list/visible_implants = list() for(var/obj/item/organ/external/organ in src.organs) - for(var/obj/item/weapon/O in organ.implants) - if(!istype(O,/obj/item/weapon/implant) && (O.w_class > class) && !istype(O,/obj/item/weapon/material/shard/shrapnel)) + for(var/obj/item/O in organ.implants) + if(!istype(O,/obj/item/implant) && (O.w_class > class) && !istype(O,/obj/item/material/shard/shrapnel)) visible_implants += O return(visible_implants) @@ -1135,7 +1135,7 @@ /mob/living/carbon/human/embedded_needs_process() for(var/obj/item/organ/external/organ in src.organs) for(var/obj/item/O in organ.implants) - if(!istype(O, /obj/item/weapon/implant)) //implant type items do not cause embedding effects, see handle_embedded_objects() + if(!istype(O, /obj/item/implant)) //implant type items do not cause embedding effects, see handle_embedded_objects() return 1 return 0 @@ -1145,7 +1145,7 @@ if(organ.splinted) //Splints prevent movement. continue for(var/obj/item/O in organ.implants) - if(!istype(O,/obj/item/weapon/implant) && prob(5)) //Moving with things stuck in you could be bad. + if(!istype(O,/obj/item/implant) && prob(5)) //Moving with things stuck in you could be bad. // All kinds of embedded objects cause bleeding. if(!can_feel_pain(organ.organ_tag)) to_chat(src, "You feel [O] moving inside your [organ.name].") @@ -1658,7 +1658,7 @@ return ..() /mob/living/carbon/human/is_muzzled() - return (wear_mask && (istype(wear_mask, /obj/item/clothing/mask/muzzle) || istype(src.wear_mask, /obj/item/weapon/grenade))) + return (wear_mask && (istype(wear_mask, /obj/item/clothing/mask/muzzle) || istype(src.wear_mask, /obj/item/grenade))) /mob/living/carbon/human/get_fire_icon_state() return species.fire_icon_state @@ -1712,7 +1712,7 @@ if(hasHUD(user,"security")) //Try to find their name var/perpname - var/obj/item/weapon/card/id/I = GetIdCard() + var/obj/item/card/id/I = GetIdCard() if(I) perpname = I.registered_name else @@ -1781,7 +1781,7 @@ to_chat(src, span("warning", "Your [goggles.name] have suddenly turned off!")) // RIGs. - var/obj/item/weapon/rig/rig = get_rig() + var/obj/item/rig/rig = get_rig() if(istype(rig) && rig.visor?.active && rig.visor.vision?.glasses) var/obj/item/clothing/glasses/rig_goggles = rig.visor.vision.glasses if(rig_goggles.vision_flags & (SEE_TURFS|SEE_OBJS)) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index c3241e9af3e..40ab43af0f9 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -116,14 +116,14 @@ if(I_GRAB) if(M == src || anchored) return 0 - for(var/obj/item/weapon/grab/G in src.grabbed_by) + for(var/obj/item/grab/G in src.grabbed_by) if(G.assailant == M) to_chat(M, "You already grabbed [src].") return if(w_uniform) w_uniform.add_fingerprint(M) - var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src) + var/obj/item/grab/G = new /obj/item/grab(M, src) if(buckled) to_chat(M, "You cannot grab [src], [TT.he] is buckled in!") return @@ -142,8 +142,8 @@ if(I_HURT) - if(M.zone_sel.selecting == "mouth" && wear_mask && istype(wear_mask, /obj/item/weapon/grenade)) - var/obj/item/weapon/grenade/G = wear_mask + if(M.zone_sel.selecting == "mouth" && wear_mask && istype(wear_mask, /obj/item/grenade)) + var/obj/item/grenade/G = wear_mask if(!G.active) visible_message("\The [M] pulls the pin from \the [src]'s [G.name]!") G.activate(M) @@ -289,7 +289,7 @@ var/list/holding = list(get_active_hand() = 40, get_inactive_hand = 20) //See if they have any guns that might go off - for(var/obj/item/weapon/gun/W in holding) + for(var/obj/item/gun/W in holding) if(W && prob(holding[W])) var/list/turfs = list() for(var/turf/T in view()) @@ -359,7 +359,7 @@ //Used to attack a joint through grabbing /mob/living/carbon/human/proc/grab_joint(var/mob/living/user, var/def_zone) var/has_grab = 0 - for(var/obj/item/weapon/grab/G in list(user.l_hand, user.r_hand)) + for(var/obj/item/grab/G in list(user.l_hand, user.r_hand)) if(G.affecting == src && G.state == GRAB_NECK) has_grab = 1 break @@ -390,15 +390,15 @@ success = TRUE stop_pulling() - if(istype(l_hand, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/lgrab = l_hand + if(istype(l_hand, /obj/item/grab)) + var/obj/item/grab/lgrab = l_hand if(lgrab.affecting) visible_message("[user] has broken [src]'s grip on [lgrab.affecting]!") success = TRUE spawn(1) qdel(lgrab) - if(istype(r_hand, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/rgrab = r_hand + if(istype(r_hand, /obj/item/grab)) + var/obj/item/grab/rgrab = r_hand if(rgrab.affecting) visible_message("[user] has broken [src]'s grip on [rgrab.affecting]!") success = TRUE diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 333b314fac3..b297e85ad01 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -526,7 +526,7 @@ This function restores all organs. if((damagetype != BRUTE) && (damagetype != BURN)) if(damagetype == HALLOSS) if((damage > 25 && prob(20)) || (damage > 50 && prob(60))) - if(organ && organ.organ_can_feel_pain() && !isbelly(loc) && !istype(loc, /obj/item/device/dogborg/sleeper)) //VOREStation Add + if(organ && organ.organ_can_feel_pain() && !isbelly(loc) && !istype(loc, /obj/item/dogborg/sleeper)) //VOREStation Add emote("scream") ..(damage, damagetype, def_zone, blocked, soaked) return 1 diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 4737c9b89f4..9e917dbeac8 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -50,7 +50,7 @@ emp_act hit_embed_chance = hit_embed_chance*M.incoming_brute_damage_percent if(prob(max(hit_embed_chance, 0))) - var/obj/item/weapon/material/shard/shrapnel/SP = new() + var/obj/item/material/shard/shrapnel/SP = new() SP.name = (P.name != "shrapnel")? "[P.name] shrapnel" : "shrapnel" SP.desc = "[SP.desc] It looks like it was fired from [P.shot_from]." SP.loc = organ @@ -595,8 +595,8 @@ emp_act if(damtype != BURN && damtype != BRUTE) return // The rig might soak this hit, if we're wearing one. - if(istype(get_rig(),/obj/item/weapon/rig)) - var/obj/item/weapon/rig/rig = get_rig() + if(istype(get_rig(),/obj/item/rig)) + var/obj/item/rig/rig = get_rig() rig.take_hit(damage) // We may also be taking a suit breach. @@ -662,7 +662,7 @@ emp_act species.handle_water_damage(src, amount) -/mob/living/carbon/human/shank_attack(obj/item/W, obj/item/weapon/grab/G, mob/user, hit_zone) +/mob/living/carbon/human/shank_attack(obj/item/W, obj/item/grab/G, mob/user, hit_zone) if(!..()) return 0 diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 0794d568150..e47687e038f 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -58,23 +58,23 @@ /mob/living/carbon/human/break_cloak() if(mind && mind.changeling) //Changeling visible camo mind.changeling.cloaked = 0 - if(istype(back, /obj/item/weapon/rig)) //Ninja cloak - var/obj/item/weapon/rig/suit = back + if(istype(back, /obj/item/rig)) //Ninja cloak + var/obj/item/rig/suit = back for(var/obj/item/rig_module/stealth_field/cloaker in suit.installed_modules) if(cloaker.active) cloaker.deactivate() - for(var/obj/item/weapon/deadringer/dr in src) + for(var/obj/item/deadringer/dr in src) dr.uncloak() /mob/living/carbon/human/is_cloaked() if(mind && mind.changeling && mind.changeling.cloaked) // Ling camo. return TRUE - else if(istype(back, /obj/item/weapon/rig)) //Ninja cloak - var/obj/item/weapon/rig/suit = back + else if(istype(back, /obj/item/rig)) //Ninja cloak + var/obj/item/rig/suit = back for(var/obj/item/rig_module/stealth_field/cloaker in suit.installed_modules) if(cloaker.active) return TRUE - for(var/obj/item/weapon/deadringer/dr in src) + for(var/obj/item/deadringer/dr in src) if(dr.timer > 20) return TRUE return ..() @@ -136,11 +136,11 @@ if(B) // Incase we lost our brain for some reason, like if we got decapped. if(istype(B, /obj/item/organ/internal/mmi_holder)) var/obj/item/organ/internal/mmi_holder/mmi_holder = B - if(istype(mmi_holder.stored_mmi, /obj/item/device/mmi/digital/posibrain)) + if(istype(mmi_holder.stored_mmi, /obj/item/mmi/digital/posibrain)) return FBP_POSI - else if(istype(mmi_holder.stored_mmi, /obj/item/device/mmi/digital/robot)) + else if(istype(mmi_holder.stored_mmi, /obj/item/mmi/digital/robot)) return FBP_DRONE - else if(istype(mmi_holder.stored_mmi, /obj/item/device/mmi)) // This needs to come last because inheritence. + else if(istype(mmi_holder.stored_mmi, /obj/item/mmi)) // This needs to come last because inheritence. return FBP_CYBORG return FBP_NONE @@ -180,7 +180,7 @@ compiled_vis |= O.enables_planes //Check to see if we have a rig (ugh, blame rigs, desnowflake this) - var/obj/item/weapon/rig/rig = get_rig() + var/obj/item/rig/rig = get_rig() if(istype(rig) && rig.visor) if(!rig.helmet || (head && rig.helmet == head)) if(rig.visor && rig.visor.vision && rig.visor.active && rig.visor.vision.glasses) @@ -218,7 +218,7 @@ vis_enabled -= vis /mob/living/carbon/human/get_restraining_bolt() - var/obj/item/weapon/implant/restrainingbolt/RB + var/obj/item/implant/restrainingbolt/RB for(var/obj/item/organ/external/EX in organs) RB = locate() in EX diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 1239ddfc613..f00df83d4d7 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -191,8 +191,8 @@ /mob/living/carbon/human/get_jetpack() if(back) - var/obj/item/weapon/rig/rig = get_rig() - if(istype(back, /obj/item/weapon/tank/jetpack)) + var/obj/item/rig/rig = get_rig() + if(istype(back, /obj/item/tank/jetpack)) return back else if(istype(rig)) for(var/obj/item/rig_module/maneuvering_jets/module in rig.installed_modules) @@ -212,7 +212,7 @@ return TRUE //VOREStation Edit. //Do we have a working jetpack? - var/obj/item/weapon/tank/jetpack/thrust = get_jetpack() + var/obj/item/tank/jetpack/thrust = get_jetpack() if(thrust) if(((!check_drift) || (check_drift && thrust.stabilization_on)) && (!lying) && (thrust.do_thrust(0.01, src))) @@ -231,7 +231,7 @@ if(species.can_space_freemove || species.can_zero_g_move) return FALSE - var/obj/item/weapon/tank/jetpack/thrust = get_jetpack() + var/obj/item/tank/jetpack/thrust = get_jetpack() if(thrust?.can_thrust(0.01)) return FALSE diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm index 4b94ff930a4..6bdd7cc5b19 100644 --- a/code/modules/mob/living/carbon/human/human_organs.dm +++ b/code/modules/mob/living/carbon/human/human_organs.dm @@ -110,9 +110,9 @@ // Canes and crutches help you stand (if the latter is ever added) // One cane mitigates a broken leg+foot, or a missing foot. // Two canes are needed for a lost leg. If you are missing both legs, canes aren't gonna help you. - if (l_hand && istype(l_hand, /obj/item/weapon/cane)) + if (l_hand && istype(l_hand, /obj/item/cane)) stance_damage -= 2 - if (r_hand && istype(r_hand, /obj/item/weapon/cane)) + if (r_hand && istype(r_hand, /obj/item/cane)) stance_damage -= 2 // standing is poor diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm index 1051bc4d540..8b3673289ef 100644 --- a/code/modules/mob/living/carbon/human/human_species.dm +++ b/code/modules/mob/living/carbon/human/human_species.dm @@ -45,8 +45,8 @@ C.species_restricted = null equip_to_appropriate_slot(I) - if(istype(back, /obj/item/weapon/rig)) - var/obj/item/weapon/rig/rig = back + if(istype(back, /obj/item/rig)) + var/obj/item/rig/rig = back rig.toggle_seals(src) /mob/living/carbon/human/dummy/mannequin/autoequip/proc/turntable() diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index df9a03294c3..30bf17689ba 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -40,8 +40,8 @@ This saves us from having to call add_fingerprint() any time something is put in /mob/living/carbon/human/equip_to_storage(obj/item/newitem, user_initiated = FALSE) // Try put it in their belt first - if(istype(src.belt,/obj/item/weapon/storage)) - var/obj/item/weapon/storage/wornbelt = src.belt + if(istype(src.belt,/obj/item/storage)) + var/obj/item/storage/wornbelt = src.belt if(wornbelt.can_be_inserted(newitem, 1)) if(user_initiated) wornbelt.handle_item_insertion(newitem) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 8473a39b1bd..81d8a56609d 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -513,8 +513,8 @@ if(internal) //Because rigs store their tanks out of reach of contents.Find(), a check has to be made to make //sure the rig is still worn, still online, and that its air supply still exists. - var/obj/item/weapon/tank/rig_supply - var/obj/item/weapon/rig/Rig = get_rig() + var/obj/item/tank/rig_supply + var/obj/item/rig/Rig = get_rig() if(Rig) rig_supply = Rig.air_supply @@ -1296,8 +1296,8 @@ //Eyes //Check rig first because it's two-check and other checks will override it. - if(istype(back,/obj/item/weapon/rig)) - var/obj/item/weapon/rig/O = back + if(istype(back,/obj/item/rig)) + var/obj/item/rig/O = back if(O.helmet && O.helmet == head && (O.helmet.body_parts_covered & EYES)) if((O.offline && O.offline_vision_restriction == 2) || (!O.offline && O.vision_restriction == 2)) blinded = 1 @@ -1597,8 +1597,8 @@ var/obj/item/clothing/head/welding/O = head if(!O.up) found_welder = 1 - if(!found_welder && istype(back, /obj/item/weapon/rig)) - var/obj/item/weapon/rig/O = back + if(!found_welder && istype(back, /obj/item/rig)) + var/obj/item/rig/O = back if(O.helmet && O.helmet == head && (O.helmet.body_parts_covered & EYES)) if((O.offline && O.offline_vision_restriction == 1) || (!O.offline && O.vision_restriction == 1)) found_welder = 1 @@ -1655,7 +1655,7 @@ see_invisible = see_in_dark>2 ? SEE_INVISIBLE_LEVEL_ONE : see_invisible_default var/glasses_processed = 0 - var/obj/item/weapon/rig/rig = get_rig() + var/obj/item/rig/rig = get_rig() if(istype(rig) && rig.visor && !looking_elsewhere) if(!rig.helmet || (head && rig.helmet == head)) if(rig.visor && rig.visor.vision && rig.visor.active && rig.visor.vision.glasses) @@ -2068,7 +2068,7 @@ if (BITTEST(hud_updateflag, ID_HUD)) var/image/holder = grab_hud(ID_HUD) if(wear_id) - var/obj/item/weapon/card/id/I = wear_id.GetID() + var/obj/item/card/id/I = wear_id.GetID() if(I) holder.icon_state = "hud[ckey(I.GetJobName())]" else @@ -2085,7 +2085,7 @@ holder.icon_state = "hudblank" var/perpname = name if(wear_id) - var/obj/item/weapon/card/id/I = wear_id.GetID() + var/obj/item/card/id/I = wear_id.GetID() if(I) perpname = I.registered_name @@ -2120,14 +2120,14 @@ holder2.icon_state = "hudblank" holder3.icon_state = "hudblank" - for(var/obj/item/weapon/implant/I in src) + for(var/obj/item/implant/I in src) if(I.implanted) if(!I.malfunction) - if(istype(I,/obj/item/weapon/implant/tracking)) + if(istype(I,/obj/item/implant/tracking)) holder1.icon_state = "hud_imp_tracking" - if(istype(I,/obj/item/weapon/implant/loyalty)) + if(istype(I,/obj/item/implant/loyalty)) holder2.icon_state = "hud_imp_loyal" - if(istype(I,/obj/item/weapon/implant/chem)) + if(istype(I,/obj/item/implant/chem)) holder3.icon_state = "hud_imp_chem" apply_hud(IMPTRACK_HUD, holder1) diff --git a/code/modules/mob/living/carbon/human/life_vr.dm b/code/modules/mob/living/carbon/human/life_vr.dm index 126fb01012f..7f17529079d 100644 --- a/code/modules/mob/living/carbon/human/life_vr.dm +++ b/code/modules/mob/living/carbon/human/life_vr.dm @@ -41,9 +41,9 @@ holder.icon_state = "hudblank" for(var/obj/item/organ/external/E in organs) - for(var/obj/item/weapon/implant/I in E.implants) - if(I.implanted && istype(I,/obj/item/weapon/implant/backup)) - var/obj/item/weapon/implant/backup/B = I + for(var/obj/item/implant/I in E.implants) + if(I.implanted && istype(I,/obj/item/implant/backup)) + var/obj/item/implant/backup/B = I if(!mind) holder.icon_state = "hud_backup_nomind" else if(!(mind.name in B.our_db.body_scans)) diff --git a/code/modules/mob/living/carbon/human/phobias.dm b/code/modules/mob/living/carbon/human/phobias.dm index 24c2c02efb1..092fba6347b 100644 --- a/code/modules/mob/living/carbon/human/phobias.dm +++ b/code/modules/mob/living/carbon/human/phobias.dm @@ -34,11 +34,11 @@ fear = min((fear + 4), 102) if(phobias & CLAUSTROPHOBIA_MINOR) if(!isturf(loc)) - if(!istype(loc,/obj/belly) && !istype(loc,/obj/item/weapon/holder/micro)) + if(!istype(loc,/obj/belly) && !istype(loc,/obj/item/holder/micro)) fear = min((fear + 3), 102) if(phobias & CLAUSTROPHOBIA_MAJOR) //Also activated inside of a belly if(!isturf(loc)) - if(!istype(loc,/obj/item/weapon/holder/micro)) + if(!istype(loc,/obj/item/holder/micro)) fear = min((fear + 3), 102) if(phobias & ANATIDAEPHOBIA) for (var/mob/living/simple_mob/animal/space/goose/G in viewers(src, null)) @@ -49,7 +49,7 @@ if(!istype(D) || D.stat) continue fear = min((fear + 3), 102) - for(var/obj/item/weapon/bikehorn/rubberducky/R in view(7, src)) + for(var/obj/item/bikehorn/rubberducky/R in view(7, src)) if(!istype(R)) continue fear = min((fear + 2), 102) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 02cb9267a96..c520b80a10d 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -84,8 +84,8 @@ /mob/living/carbon/human/GetVoice() var/voice_sub - if(istype(get_rig(),/obj/item/weapon/rig)) - var/obj/item/weapon/rig/rig = get_rig() + if(istype(get_rig(),/obj/item/rig)) + var/obj/item/rig/rig = get_rig() // todo: fix this shit if(rig.speech && rig.speech.voice_holder && rig.speech.voice_holder.active && rig.speech.voice_holder.voice) voice_sub = rig.speech.voice_holder.voice @@ -147,12 +147,12 @@ switch(message_mode) if("intercom") if(!restrained()) - for(var/obj/item/device/radio/intercom/I in view(1)) + for(var/obj/item/radio/intercom/I in view(1)) I.talk_into(src, message_pieces, null, verb) I.add_fingerprint(src) used_radios += I if("headset") - var/obj/item/device/radio/R = null + var/obj/item/radio/R = null if(isradio(l_ear)) R = l_ear if(R.talk_into(src, message_pieces, null, verb)) @@ -165,7 +165,7 @@ used_radios += R return if("right ear") - var/obj/item/device/radio/R = null + var/obj/item/radio/R = null if(isradio(r_ear)) R = r_ear if(isradio(r_hand)) @@ -174,7 +174,7 @@ if(R.talk_into(src, message_pieces, null, verb)) used_radios += R if("left ear") - var/obj/item/device/radio/R = null + var/obj/item/radio/R = null if(isradio(l_ear)) R = l_ear if(isradio(l_hand)) @@ -202,13 +202,13 @@ /mob/living/carbon/human/binarycheck() . = FALSE - var/obj/item/device/radio/headset/R = null - if(istype(l_ear, /obj/item/device/radio/headset)) + var/obj/item/radio/headset/R = null + if(istype(l_ear, /obj/item/radio/headset)) R = l_ear if(R.translate_binary) . = TRUE - if(istype(r_ear, /obj/item/device/radio/headset)) + if(istype(r_ear, /obj/item/radio/headset)) R = r_ear if(R.translate_binary) . = TRUE diff --git a/code/modules/mob/living/carbon/human/species/lleill/lleill_abilities.dm b/code/modules/mob/living/carbon/human/species/lleill/lleill_abilities.dm index e3451bc8c1c..8321d1ef66e 100644 --- a/code/modules/mob/living/carbon/human/species/lleill/lleill_abilities.dm +++ b/code/modules/mob/living/carbon/human/species/lleill/lleill_abilities.dm @@ -104,13 +104,13 @@ set category = "Abilities" var/list/transmute_list = list( - "Transparent Glamour" = /obj/item/weapon/potion_material/glamour_transparent, - "Shrinking Glamour" = /obj/item/weapon/potion_material/glamour_shrinking, - "Twinkling Glamour" = /obj/item/weapon/potion_material/glamour_twinkling, - "Glamour Shard" = /obj/item/weapon/potion_material/glamour_shard, + "Transparent Glamour" = /obj/item/potion_material/glamour_transparent, + "Shrinking Glamour" = /obj/item/potion_material/glamour_shrinking, + "Twinkling Glamour" = /obj/item/potion_material/glamour_twinkling, + "Glamour Shard" = /obj/item/potion_material/glamour_shard, "Glamour Cell" = /obj/item/capture_crystal/glamour, "Face of Glamour" = /obj/item/glamour_face, - "Speaking Glamour" = /obj/item/device/universal_translator/glamour, + "Speaking Glamour" = /obj/item/universal_translator/glamour, "Glamour Bubble" = /obj/item/clothing/mask/gas/glamour, "Pocket of Glamour" = /obj/item/clothing/under/permit/glamour ) @@ -346,7 +346,7 @@ to_chat(src, "You can't go do that when weakened like this.") return - var/obj/item/weapon/potion_material/I = get_active_hand() + var/obj/item/potion_material/I = get_active_hand() if(!I) to_chat(src, "You have no item in your active hand.") return @@ -354,7 +354,7 @@ if(!istype(I)) to_chat(src, "\The [I] is not a potion material.") return - var/obj/item/weapon/reagent_containers/glass/bottle/potion/transmute_product = I.product_potion + var/obj/item/reagent_containers/glass/bottle/potion/transmute_product = I.product_potion if(!get_active_hand(I)) to_chat(src, "The item is no longer in your hands.") diff --git a/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm b/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm index 21ab540fb94..11e549bbad8 100644 --- a/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm +++ b/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm @@ -1,14 +1,14 @@ //Transparent Glamour (invisibility potion) -/obj/item/weapon/potion_material/glamour_transparent +/obj/item/potion_material/glamour_transparent name = "transparent glamour" desc = "A shard of hardened white crystal that is clearly translucent." icon = 'icons/obj/glamour.dmi' icon_state = "transparent" - base_reagent = /obj/item/weapon/potion_base/aqua_regia - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/invisibility + base_reagent = /obj/item/potion_base/aqua_regia + product_potion = /obj/item/reagent_containers/glass/bottle/potion/invisibility -/obj/item/weapon/reagent_containers/glass/bottle/potion/invisibility +/obj/item/reagent_containers/glass/bottle/potion/invisibility name = "transparent potion" desc = "A small white potion, the clear liquid inside can barely be seen at all." prefill = list("transparent glamour" = 1) @@ -36,15 +36,15 @@ //Shrinking Glamour (scaling potion) -/obj/item/weapon/potion_material/glamour_shrinking +/obj/item/potion_material/glamour_shrinking name = "shrinking glamour" desc = "A soft clump of white material that seems to shrink at your touch." icon = 'icons/obj/glamour.dmi' icon_state = "shrinking" - base_reagent = /obj/item/weapon/potion_base/aqua_regia - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/scaling + base_reagent = /obj/item/potion_base/aqua_regia + product_potion = /obj/item/reagent_containers/glass/bottle/potion/scaling -/obj/item/weapon/reagent_containers/glass/bottle/potion/scaling +/obj/item/reagent_containers/glass/bottle/potion/scaling name = "scaling potion" desc = "A small white potion, the clear liquid inside can barely be seen at all." prefill = list("scaling glamour" = 1) @@ -68,15 +68,15 @@ //Twinkling Glamour (Sparkling potion - Gives darksight) -/obj/item/weapon/potion_material/glamour_twinkling +/obj/item/potion_material/glamour_twinkling name = "twinkling glamour" desc = "A sheet of white material that twinkles on its own accord." icon = 'icons/obj/glamour.dmi' icon_state = "twinkling" - base_reagent = /obj/item/weapon/potion_base/aqua_regia - product_potion = /obj/item/weapon/reagent_containers/glass/bottle/potion/darksight + base_reagent = /obj/item/potion_base/aqua_regia + product_potion = /obj/item/reagent_containers/glass/bottle/potion/darksight -/obj/item/weapon/reagent_containers/glass/bottle/potion/darksight +/obj/item/reagent_containers/glass/bottle/potion/darksight name = "twinling potion" desc = "A small white potion, the thin white liquid inside twinkles brightly." prefill = list("twinkling glamour" = 1) @@ -171,13 +171,13 @@ //Speaking Glamour (universal translator) -/obj/item/device/universal_translator/glamour +/obj/item/universal_translator/glamour name = "speaking glamour" desc = "A shard of glamour that translates all known language for the user." icon = 'icons/obj/glamour.dmi' icon_state = "translator" -/obj/item/device/universal_translator/glamour/hear_talk(mob/M, list/message_pieces, verb) +/obj/item/universal_translator/glamour/hear_talk(mob/M, list/message_pieces, verb) if(!listening || !istype(M)) return diff --git a/code/modules/mob/living/carbon/human/species/outsider/vox.dm b/code/modules/mob/living/carbon/human/species/outsider/vox.dm index a23d3fd1096..0ed0cc47c6f 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/vox.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/vox.dm @@ -103,11 +103,11 @@ H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), slot_wear_mask) if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/tank/vox(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/tank/vox(H), slot_back) H.internal = H.back else - H.equip_to_slot_or_del(new /obj/item/weapon/tank/vox(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/tank/vox(H), slot_r_hand) H.internal = H.r_hand - H.internal = locate(/obj/item/weapon/tank) in H.contents - if(istype(H.internal,/obj/item/weapon/tank) && H.internals) + H.internal = locate(/obj/item/tank) in H.contents + if(istype(H.internal,/obj/item/tank) && H.internals) H.internals.icon_state = "internal1" diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm index eed09b56c52..cd0f0570e6e 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm @@ -48,7 +48,7 @@ var/watcher = 0 for(var/mob/living/carbon/human/watchers in oview(7,src )) // If we can see them... if(watchers in oviewers(7,src)) // And they can see us... - 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! ability_cost = CLAMP(ability_cost/(0.01+darkness*2),50, 80)//This allows for 1 watcher in full light diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 3b471a84a3f..281b3945c50 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -122,7 +122,7 @@ var/vision_flags = SEE_SELF // Same flags as glasses. // Death vars. - var/meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/human + var/meat_type = /obj/item/reagent_containers/food/snacks/meat/human var/remains_type = /obj/effect/decal/remains/xeno var/gibbed_anim = "gibbed-h" var/dusted_anim = "dust-h" @@ -334,26 +334,26 @@ return sanitizeName(name, MAX_NAME_LEN, robot) /datum/species/proc/equip_survival_gear(var/mob/living/carbon/human/H,var/extendedtank = 0,var/comprehensive = 0) - var/boxtype = /obj/item/weapon/storage/box/survival //Default survival box + var/boxtype = /obj/item/storage/box/survival //Default survival box var/synth = H.isSynthetic() //Empty box for synths if(synth) - boxtype = /obj/item/weapon/storage/box/survival/synth + boxtype = /obj/item/storage/box/survival/synth //Special box with extra equipment else if(comprehensive) - boxtype = /obj/item/weapon/storage/box/survival/comp + boxtype = /obj/item/storage/box/survival/comp //Create the box - var/obj/item/weapon/storage/box/box = new boxtype(H) + var/obj/item/storage/box/box = new boxtype(H) //If not synth, they get an air tank (if they breathe) if(!synth && breath_type) //Create a tank (if such a thing exists for this species) - var/tanktext = "/obj/item/weapon/tank/emergency/" + "[breath_type]" - var/obj/item/weapon/tank/emergency/tankpath //Will force someone to come look here if they ever alter this path. + var/tanktext = "/obj/item/tank/emergency/" + "[breath_type]" + var/obj/item/tank/emergency/tankpath //Will force someone to come look here if they ever alter this path. if(extendedtank) tankpath = text2path(tanktext + "/engi") if(!tankpath) //Is it just that there's no /engi? @@ -367,7 +367,7 @@ //If they are synth, they get a smol battery else if(synth) - new /obj/item/device/fbp_backup_cell(box) + new /obj/item/fbp_backup_cell(box) box.calibrate_size() diff --git a/code/modules/mob/living/carbon/human/species/species_vr.dm b/code/modules/mob/living/carbon/human/species/species_vr.dm index 0cdd2713362..9a994bc97d6 100644 --- a/code/modules/mob/living/carbon/human/species/species_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_vr.dm @@ -2,7 +2,7 @@ //This is so that if a race is using the chimera revive they can't use it more than once. //Shouldn't really be seen in play too often, but it's case an admin event happens and they give a non chimera the chimera revive. Only one person can use the chimera revive at a time per race. //var/reviving = 0 //commented out 'cause moved to mob - holder_type = /obj/item/weapon/holder/micro //This allows you to pick up crew + holder_type = /obj/item/holder/micro //This allows you to pick up crew min_age = 18 descriptors = list() @@ -67,7 +67,7 @@ var/list/nif_savedata = H.nif.save_data.Copy()*/ ..() H.nif = null //A previous call during the rejuvenation path deleted it, so we no longer should have it here - /*var/obj/item/device/nif/nif = new type(H,durability,nif_savedata) + /*var/obj/item/nif/nif = new type(H,durability,nif_savedata) nif.nifsofts = nifsofts*/ else ..() diff --git a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm index 6770386fbd3..f9b648393c9 100644 --- a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm @@ -71,14 +71,14 @@ . = ..() if(breath_type != "oxygen") H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), slot_wear_mask) - var/obj/item/weapon/tank/tankpath + var/obj/item/tank/tankpath if(breath_type == "phoron") - tankpath = /obj/item/weapon/tank/vox + tankpath = /obj/item/tank/vox else - tankpath = text2path("/obj/item/weapon/tank/" + breath_type) + tankpath = text2path("/obj/item/tank/" + breath_type) if(tankpath) H.equip_to_slot_or_del(new tankpath(H), slot_r_hand) H.internal = H.r_hand - if(istype(H.internal,/obj/item/weapon/tank) && H.internals) + if(istype(H.internal,/obj/item/tank) && H.internals) H.internals.icon_state = "internal1" diff --git a/code/modules/mob/living/carbon/human/species/station/monkey.dm b/code/modules/mob/living/carbon/human/species/station/monkey.dm index f90a61111cc..c24ff5a123e 100644 --- a/code/modules/mob/living/carbon/human/species/station/monkey.dm +++ b/code/modules/mob/living/carbon/human/species/station/monkey.dm @@ -25,7 +25,7 @@ unarmed_types = list(/datum/unarmed_attack/bite, /datum/unarmed_attack/claws) inherent_verbs = list(/mob/living/proc/ventcrawl) hud_type = /datum/hud_data/monkey - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/monkey + meat_type = /obj/item/reagent_containers/food/snacks/meat/monkey rarity_value = 0.1 total_health = 75 diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm index 06ef4270d29..0b6457a9d50 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm @@ -138,17 +138,17 @@ var/datum/species/shapeshifter/promethean/prometheans prometheans = src /datum/species/shapeshifter/promethean/equip_survival_gear(var/mob/living/carbon/human/H) - var/boxtype = pick(list(/obj/item/weapon/storage/toolbox/lunchbox, - /obj/item/weapon/storage/toolbox/lunchbox/heart, - /obj/item/weapon/storage/toolbox/lunchbox/cat, - /obj/item/weapon/storage/toolbox/lunchbox/nt, - /obj/item/weapon/storage/toolbox/lunchbox/mars, - /obj/item/weapon/storage/toolbox/lunchbox/cti, - /obj/item/weapon/storage/toolbox/lunchbox/nymph, - /obj/item/weapon/storage/toolbox/lunchbox/syndicate)) //Only pick the empty types - var/obj/item/weapon/storage/toolbox/lunchbox/L = new boxtype(get_turf(H)) - new /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar(L) - new /obj/item/weapon/tool/prybar/red(L) //VOREStation Add, + var/boxtype = pick(list(/obj/item/storage/toolbox/lunchbox, + /obj/item/storage/toolbox/lunchbox/heart, + /obj/item/storage/toolbox/lunchbox/cat, + /obj/item/storage/toolbox/lunchbox/nt, + /obj/item/storage/toolbox/lunchbox/mars, + /obj/item/storage/toolbox/lunchbox/cti, + /obj/item/storage/toolbox/lunchbox/nymph, + /obj/item/storage/toolbox/lunchbox/syndicate)) //Only pick the empty types + var/obj/item/storage/toolbox/lunchbox/L = new boxtype(get_turf(H)) + new /obj/item/reagent_containers/food/snacks/candy/proteinbar(L) + new /obj/item/tool/prybar/red(L) //VOREStation Add, if(H.backbag == 1) H.equip_to_slot_or_del(L, slot_r_hand) else diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm index 2cd40d6054a..1ebb8a1d1a5 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm @@ -416,7 +416,7 @@ var/global/list/disallowed_protean_accessories = list( /proc/remove_micros(var/src, var/mob/root) for(var/obj/item/I in src) remove_micros(I, root) //Recursion. I'm honestly depending on there being no containment loop, but at the cost of performance that can be fixed too. - if(istype(I, /obj/item/weapon/holder)) + if(istype(I, /obj/item/holder)) root.remove_from_mob(I) /mob/living/carbon/human/proc/nano_outofblob(var/mob/living/simple_mob/protean_blob/blob, force) diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm index e0c8114eee1..b26c1eda0c0 100755 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm @@ -118,7 +118,7 @@ abilities += new path() /datum/species/protean/create_organs(var/mob/living/carbon/human/H) - var/obj/item/device/nif/saved_nif = H.nif + var/obj/item/nif/saved_nif = H.nif if(saved_nif) H.nif.unimplant(H) //Needs reference to owner to unimplant right. H.nif.moveToNullspace() @@ -155,7 +155,7 @@ if(!H) //Human could have been deleted in this amount of time. Observing does this, mannequins, etc. return if(!H.nif) - var/obj/item/device/nif/protean/new_nif = new() + var/obj/item/nif/protean/new_nif = new() new_nif.quick_implant(H) else H.nif.durability = 25 diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index 43b199f96ae..6663c8f1309 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -609,9 +609,9 @@ /datum/species/diona/equip_survival_gear(var/mob/living/carbon/human/H) if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/device/flashlight/flare(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/flashlight/flare(H), slot_r_hand) else - H.equip_to_slot_or_del(new /obj/item/device/flashlight/flare(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/flashlight/flare(H.back), slot_in_backpack) /datum/species/diona/handle_post_spawn(var/mob/living/carbon/human/H) H.gender = NEUTER diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm index 804f071258c..c600611836c 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm @@ -514,7 +514,7 @@ if(!ishuman(src)) return //If you're not a human you don't have permission to do this. var/mob/living/carbon/human/C = src - var/obj/item/weapon/grab/G = src.get_active_hand() + var/obj/item/grab/G = src.get_active_hand() if(!istype(G)) to_chat(C, "You must be grabbing a creature in your active hand to absorb them.") return @@ -577,7 +577,7 @@ if(!ishuman(src)) return //If you're not a human you don't have permission to do this. - var/obj/item/weapon/grab/G = src.get_active_hand() + var/obj/item/grab/G = src.get_active_hand() if(!istype(G)) to_chat(src, "You must be grabbing a creature in your active hand to drain them.") return @@ -669,7 +669,7 @@ if(!ishuman(src)) return //If you're not a human you don't have permission to do this. var/mob/living/carbon/human/C = src - var/obj/item/weapon/grab/G = src.get_active_hand() + var/obj/item/grab/G = src.get_active_hand() if(!istype(G)) to_chat(C, "You must be grabbing a creature in your active hand to feed them.") return @@ -759,7 +759,7 @@ /mob/living/carbon/human/vore_shred_time = 10 SECONDS /mob/living/carbon/human/can_shred() //Humans need a grab - var/obj/item/weapon/grab/G = get_active_hand() + var/obj/item/grab/G = get_active_hand() if(!istype(G)) to_chat(src,"You have to have a very strong grip on someone first!") return FALSE @@ -1134,15 +1134,15 @@ return if(do_after(src, 25, exclusive = TASK_USER_EXCLUSIVE)) - var/obj/item/weapon/storage/vore_egg/bugcocoon/C = new(loc) + var/obj/item/storage/vore_egg/bugcocoon/C = new(loc) forceMove(C) transforming = TRUE var/datum/tgui_module/appearance_changer/cocoon/V = new(src, src) V.tgui_interact(src) - var/mob_holder_type = src.holder_type || /obj/item/weapon/holder + var/mob_holder_type = src.holder_type || /obj/item/holder C.w_class = src.size_multiplier * 4 //Egg size and weight scaled to match occupant. - var/obj/item/weapon/holder/H = new mob_holder_type(C, src) + var/obj/item/holder/H = new mob_holder_type(C, src) C.max_storage_space = H.w_class C.icon_scale_x = 0.25 * C.w_class C.icon_scale_y = 0.25 * C.w_class @@ -1425,7 +1425,7 @@ light_color = "#FF0D00" //LONG VORE ABILITY END -/obj/item/weapon/gun/energy/gun/tongue //This is the 'tongue' gun for admin memery. +/obj/item/gun/energy/gun/tongue //This is the 'tongue' gun for admin memery. name = "tongue" desc = "A tongue that can be used to grab things." icon = 'icons/mob/dogborg_vr.dmi' @@ -1437,7 +1437,7 @@ charge_cost = 0 //This is an adminspawn gun...No reason to force it to have a charge state. projectile_type = /obj/item/projectile/beam/appendage - cell_type = /obj/item/weapon/cell/device/weapon/recharge + cell_type = /obj/item/cell/device/weapon/recharge battery_lock = 1 modifystate = null @@ -1445,11 +1445,11 @@ firemodes = list( list(mode_name="vore", projectile_type=/obj/item/projectile/beam/appendage, modifystate=null, fire_sound='sound/vore/sunesound/pred/schlorp.ogg', charge_cost = 0),) -/obj/item/weapon/gun/energy/gun/tongue/update_icon() //No updating the icon. +/obj/item/gun/energy/gun/tongue/update_icon() //No updating the icon. icon_state = "synthtongue" return -/obj/item/weapon/gun/energy/bfgtaser/tongue +/obj/item/gun/energy/bfgtaser/tongue name = "9000-series Ball Tongue Taser" desc = "A banned riot control device." slot_flags = SLOT_BELT|SLOT_BACK diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 33282aefe7d..e623591f576 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -355,7 +355,7 @@ /datum/species/zaddat/equip_survival_gear(var/mob/living/carbon/human/H) .=..() - var/obj/item/weapon/storage/toolbox/lunchbox/survival/zaddat/L = new(get_turf(H)) + var/obj/item/storage/toolbox/lunchbox/survival/zaddat/L = new(get_turf(H)) if(H.backbag == 1) H.equip_to_slot_or_del(L, slot_r_hand) else diff --git a/code/modules/mob/living/carbon/human/species/station/teshari.dm b/code/modules/mob/living/carbon/human/species/station/teshari.dm index 76f71cb006a..50bcccf5edc 100644 --- a/code/modules/mob/living/carbon/human/species/station/teshari.dm +++ b/code/modules/mob/living/carbon/human/species/station/teshari.dm @@ -51,7 +51,7 @@ burn_mod = 1.35 mob_size = MOB_SMALL pass_flags = PASSTABLE - holder_type = /obj/item/weapon/holder/human + holder_type = /obj/item/holder/human // short_sighted = 1 gluttonous = 1 blood_volume = 400 diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm index c9978eb5078..9d687ee872f 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm @@ -11,7 +11,7 @@ qdel(src) return -/obj/effect/weaversilk/attackby(var/obj/item/weapon/W, var/mob/user) +/obj/effect/weaversilk/attackby(var/obj/item/W, var/mob/user) user.setClickCooldown(user.get_attack_speed(W)) if(W.force) @@ -73,7 +73,7 @@ /obj/structure/bed/double/weaversilk_nest/update_icon() return -/obj/structure/bed/double/weaversilk_nest/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/bed/double/weaversilk_nest/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH) || istype(W,/obj/item/stack) || W.has_tool_quality(TOOL_WIRECUTTER)) return ..() diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm index 6015dd16a9b..ae7f7bcc9ba 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm @@ -333,7 +333,7 @@ src.visible_message("\The [src] seizes [T] aggressively!") - var/obj/item/weapon/grab/G = new(src,T) + var/obj/item/grab/G = new(src,T) if(use_hand == "left") l_hand = G else @@ -355,7 +355,7 @@ to_chat(src, "You cannot do that in your current state.") return - var/obj/item/weapon/grab/G = locate() in src + var/obj/item/grab/G = locate() in src if(!G || !istype(G)) to_chat(src, "You are not grabbing anyone.") return diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm index e1e06d42293..91996b08980 100644 --- a/code/modules/mob/living/carbon/human/stripping.dm +++ b/code/modules/mob/living/carbon/human/stripping.dm @@ -71,11 +71,11 @@ if(!istype(held) || is_robot_module(held)) stripping = TRUE else - var/obj/item/weapon/holder/holder = held + var/obj/item/holder/holder = held if(istype(holder) && src == holder.held_mob) stripping = TRUE else - var/obj/item/weapon/grab/grab = held + var/obj/item/grab/grab = held if(istype(grab) && grab.affecting == src) stripping = TRUE @@ -87,7 +87,7 @@ return visible_message("\The [user] is trying to remove \the [src]'s [target_slot.name]!") else - if(slot_to_strip == slot_wear_mask && istype(held, /obj/item/weapon/grenade)) + if(slot_to_strip == slot_wear_mask && istype(held, /obj/item/grenade)) visible_message("\The [user] is trying to put \a [held] in \the [src]'s mouth!") else visible_message("\The [user] is trying to put \a [held] on \the [src]!") @@ -98,7 +98,7 @@ if(!stripping) if(user.get_active_hand() != held) return - var/obj/item/weapon/holder/mobheld = held + var/obj/item/holder/mobheld = held if(istype(mobheld)&&mobheld.held_mob==src) to_chat(user, "You can't put someone on themselves! Stop trying to break reality!") return @@ -172,11 +172,11 @@ if(!(istype(wear_mask, /obj/item/clothing/mask) || istype(head, /obj/item/clothing/head/helmet/space))) return // Find an internal source. - if(istype(back, /obj/item/weapon/tank)) + if(istype(back, /obj/item/tank)) internal = back - else if(istype(s_store, /obj/item/weapon/tank)) + else if(istype(s_store, /obj/item/tank)) internal = s_store - else if(istype(belt, /obj/item/weapon/tank)) + else if(istype(belt, /obj/item/tank)) internal = belt if(internal) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 889176381ac..912cef600ba 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -884,8 +884,8 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() //Toggle for belt layering with uniform var/belt_layer = BELT_LAYER - if(istype(belt, /obj/item/weapon/storage/belt)) - var/obj/item/weapon/storage/belt/ubelt = belt + if(istype(belt, /obj/item/storage/belt)) + var/obj/item/storage/belt/ubelt = belt if(ubelt.show_above_suit) belt_layer = BELT_LAYER_ALT @@ -957,7 +957,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() var/icon/c_mask = tail_style?.clip_mask if(c_mask) - if(istype(back, /obj/item/weapon/storage/backpack/saddlebag) || istype(back, /obj/item/weapon/storage/backpack/saddlebag_common)) + if(istype(back, /obj/item/storage/backpack/saddlebag) || istype(back, /obj/item/storage/backpack/saddlebag_common)) c_mask = null overlays_standing[BACK_LAYER] = back.make_worn_icon(body_type = species.get_bodytype(src), slot_name = slot_back_str, default_icon = INV_BACK_DEF_ICON, default_layer = BACK_LAYER, clip_mask = c_mask) diff --git a/code/modules/mob/living/carbon/metroid/items.dm b/code/modules/mob/living/carbon/metroid/items.dm index cc04791e048..2f769c9ccaf 100644 --- a/code/modules/mob/living/carbon/metroid/items.dm +++ b/code/modules/mob/living/carbon/metroid/items.dm @@ -14,7 +14,7 @@ flags = OPENCONTAINER /* /obj/item/slime_extract/attackby(obj/item/O as obj, mob/user as mob) - if(istype(O, /obj/item/weapon/slimesteroid2)) + if(istype(O, /obj/item/slimesteroid2)) if(enhanced == 1) to_chat(user, " This extract has already been enhanced!") return ..() @@ -180,7 +180,7 @@ qdel(src) -/obj/item/weapon/slimepotion2 +/obj/item/slimepotion2 name = "advanced docility potion" desc = "A potent chemical mix that will nullify a slime's powers, causing it to become docile and tame. This one is meant for adult slimes" icon = 'icons/obj/chemical.dmi' @@ -347,7 +347,7 @@ -/obj/item/weapon/reagent_containers/food/snacks/egg/slime +/obj/item/reagent_containers/food/snacks/egg/slime name = "slime egg" desc = "A small, gelatinous egg." icon = 'icons/mob/mob.dmi' @@ -356,19 +356,19 @@ origin_tech = list(TECH_BIO = 4) var/grown = 0 -/obj/item/weapon/reagent_containers/food/snacks/egg/slime/Initialize() +/obj/item/reagent_containers/food/snacks/egg/slime/Initialize() . = ..() reagents.add_reagent("nutriment", 4) reagents.add_reagent("slimejelly", 1) addtimer(CALLBACK(src, ./proc/Grow), rand(120 SECONDS, 150 SECONDS)) -/obj/item/weapon/reagent_containers/food/snacks/egg/slime/proc/Grow() +/obj/item/reagent_containers/food/snacks/egg/slime/proc/Grow() grown = 1 icon_state = "slime egg-grown" START_PROCESSING(SSobj, src) return -/obj/item/weapon/reagent_containers/food/snacks/egg/slime/proc/Hatch() +/obj/item/reagent_containers/food/snacks/egg/slime/proc/Hatch() STOP_PROCESSING(SSobj, src) var/turf/T = get_turf(src) src.visible_message(" The [name] pulsates and quivers!") @@ -378,14 +378,14 @@ qdel(src) -/obj/item/weapon/reagent_containers/food/snacks/egg/slime/process() +/obj/item/reagent_containers/food/snacks/egg/slime/process() var/turf/location = get_turf(src) var/datum/gas_mixture/environment = location.return_air() if (environment.phoron > MOLES_PHORON_VISIBLE)//phoron exposure causes the egg to hatch src.Hatch() -/obj/item/weapon/reagent_containers/food/snacks/egg/slime/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype( W, /obj/item/weapon/pen/crayon )) +/obj/item/reagent_containers/food/snacks/egg/slime/attackby(obj/item/W as obj, mob/user as mob) + if(istype( W, /obj/item/pen/crayon )) return else ..() diff --git a/code/modules/mob/living/carbon/resist.dm b/code/modules/mob/living/carbon/resist.dm index 5434b31c44c..a3d50c4fb97 100644 --- a/code/modules/mob/living/carbon/resist.dm +++ b/code/modules/mob/living/carbon/resist.dm @@ -29,7 +29,7 @@ /mob/living/carbon/proc/reduce_cuff_time() return FALSE -/mob/living/carbon/proc/cuff_resist(obj/item/weapon/handcuffs/I, breakouttime = 1200, cuff_break = 0) +/mob/living/carbon/proc/cuff_resist(obj/item/handcuffs/I, breakouttime = 1200, cuff_break = 0) if(istype(I)) breakouttime = I.breakouttime diff --git a/code/modules/mob/living/inventory.dm b/code/modules/mob/living/inventory.dm index 1e493dda99d..00116666ff2 100644 --- a/code/modules/mob/living/inventory.dm +++ b/code/modules/mob/living/inventory.dm @@ -2,14 +2,14 @@ var/hand = null var/obj/item/l_hand = null var/obj/item/r_hand = null - var/obj/item/weapon/back = null//Human/Monkey - var/obj/item/weapon/tank/internal = null//Human/Monkey + var/obj/item/back = null//Human/Monkey + var/obj/item/tank/internal = null//Human/Monkey var/obj/item/clothing/mask/wear_mask = null//Carbon /mob/living/equip_to_storage(obj/item/newitem, user_initiated = FALSE) // Try put it in their backpack - if(istype(src.back,/obj/item/weapon/storage)) - var/obj/item/weapon/storage/backpack = src.back + if(istype(src.back,/obj/item/storage)) + var/obj/item/storage/backpack = src.back if(backpack.can_be_inserted(newitem, 1)) if(user_initiated) backpack.handle_item_insertion(newitem) @@ -18,7 +18,7 @@ return src.back // Try to place it in any item that can store stuff, on the mob. - for(var/obj/item/weapon/storage/S in src.contents) + for(var/obj/item/storage/S in src.contents) if (S.can_be_inserted(newitem, 1)) if(user_initiated) S.handle_item_insertion(newitem) @@ -121,15 +121,15 @@ L = list() // Lefty grab! - if (istype(l_hand, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = l_hand + if (istype(l_hand, /obj/item/grab)) + var/obj/item/grab/G = l_hand L |= G.affecting if(mobchain_limit-- > 0) G.affecting?.ret_grab(L, mobchain_limit) // Recurse! They can update the list. It's the same instance as ours. // Righty grab! - if (istype(r_hand, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = r_hand + if (istype(r_hand, /obj/item/grab)) + var/obj/item/grab/G = r_hand L |= G.affecting if(mobchain_limit-- > 0) G.affecting?.ret_grab(L, mobchain_limit) // Same as lefty! @@ -264,7 +264,7 @@ data["slots"] = slots data["internals"] = host.internals - data["internalsValid"] = istype(host.wear_mask, /obj/item/clothing/mask) && istype(host.back, /obj/item/weapon/tank) + data["internalsValid"] = istype(host.wear_mask, /obj/item/clothing/mask) && istype(host.back, /obj/item/tank) return data @@ -340,7 +340,7 @@ data["specialSlots"] = specialSlots data["internals"] = H.internals - data["internalsValid"] = (istype(H.wear_mask, /obj/item/clothing/mask) || istype(H.head, /obj/item/clothing/head/helmet/space)) && (istype(H.back, /obj/item/weapon/tank) || istype(H.belt, /obj/item/weapon/tank) || istype(H.s_store, /obj/item/weapon/tank)) + data["internalsValid"] = (istype(H.wear_mask, /obj/item/clothing/mask) || istype(H.head, /obj/item/clothing/head/helmet/space)) && (istype(H.back, /obj/item/tank) || istype(H.belt, /obj/item/tank) || istype(H.s_store, /obj/item/tank)) data["sensors"] = FALSE if(istype(suit) && suit.has_sensor == 1) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 58240e4ab04..79c588901d6 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -68,7 +68,7 @@ update_pulling() - for(var/obj/item/weapon/grab/G in src) + for(var/obj/item/grab/G in src) G.process() if(handle_regular_status_updates()) // Status & health update, are we dead or alive etc. @@ -282,7 +282,7 @@ //Snowflake treatment of potential locations else if(istype(loc,/obj/mecha)) //I imagine there's like displays and junk in there. Use the lights! brightness = 1 - else if(istype(loc,/obj/item/weapon/holder)) //Poor carried teshari and whatnot should adjust appropriately + else if(istype(loc,/obj/item/holder)) //Poor carried teshari and whatnot should adjust appropriately var/turf/T = get_turf(src) brightness = T.get_lumcount() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 3cb39ea3f85..87a9d50a29a 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -577,41 +577,41 @@ //Recursive function to find everything a mob is holding. -/mob/living/get_contents(var/obj/item/weapon/storage/Storage = null) +/mob/living/get_contents(var/obj/item/storage/Storage = null) var/list/L = list() if(Storage) //If it called itself L += Storage.return_inv() //Leave this commented out, it will cause storage items to exponentially add duplicate to the list - //for(var/obj/item/weapon/storage/S in Storage.return_inv()) //Check for storage items + //for(var/obj/item/storage/S in Storage.return_inv()) //Check for storage items // L += get_contents(S) - for(var/obj/item/weapon/gift/G in Storage.return_inv()) //Check for gift-wrapped items + for(var/obj/item/gift/G in Storage.return_inv()) //Check for gift-wrapped items L += G.gift - if(istype(G.gift, /obj/item/weapon/storage)) + if(istype(G.gift, /obj/item/storage)) L += get_contents(G.gift) for(var/obj/item/smallDelivery/D in Storage.return_inv()) //Check for package wrapped items L += D.wrapped - if(istype(D.wrapped, /obj/item/weapon/storage)) //this should never happen + if(istype(D.wrapped, /obj/item/storage)) //this should never happen L += get_contents(D.wrapped) return L else L += src.contents - for(var/obj/item/weapon/storage/S in src.contents) //Check for storage items + for(var/obj/item/storage/S in src.contents) //Check for storage items L += get_contents(S) - for(var/obj/item/weapon/gift/G in src.contents) //Check for gift-wrapped items + for(var/obj/item/gift/G in src.contents) //Check for gift-wrapped items L += G.gift - if(istype(G.gift, /obj/item/weapon/storage)) + if(istype(G.gift, /obj/item/storage)) L += get_contents(G.gift) for(var/obj/item/smallDelivery/D in src.contents) //Check for package wrapped items L += D.wrapped - if(istype(D.wrapped, /obj/item/weapon/storage)) //this should never happen + if(istype(D.wrapped, /obj/item/storage)) //this should never happen L += get_contents(D.wrapped) return L @@ -775,7 +775,7 @@ /mob/living/proc/resist_grab() var/resisting = 0 - for(var/obj/item/weapon/grab/G in grabbed_by) + for(var/obj/item/grab/G in grabbed_by) resisting++ G.handle_resist() if(resisting) @@ -816,7 +816,7 @@ return 1 /mob/living/proc/get_restraining_bolt() - var/obj/item/weapon/implant/restrainingbolt/RB = locate() in src + var/obj/item/implant/restrainingbolt/RB = locate() in src if(RB) if(!RB.malfunction) return TRUE @@ -959,13 +959,13 @@ unEquip(l_hand) if(r_hand) unEquip(r_hand) - for(var/obj/item/weapon/holder/holder in get_mob_riding_slots()) + for(var/obj/item/holder/holder in get_mob_riding_slots()) unEquip(holder) update_water() // Submerges the mob. else density = initial(density) - for(var/obj/item/weapon/grab/G in grabbed_by) + for(var/obj/item/grab/G in grabbed_by) if(G.state >= GRAB_AGGRESSIVE) canmove = 0 break @@ -1123,8 +1123,8 @@ return FALSE var/throw_range = item.throw_range - if (istype(item, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = item + if (istype(item, /obj/item/grab)) + var/obj/item/grab/G = item item = G.throw_held() //throw the person instead of the grab if(ismob(item)) var/mob/M = item diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm index 9ee08bf8a7b..4c0bb9c34d1 100644 --- a/code/modules/mob/living/living_movement.dm +++ b/code/modules/mob/living/living_movement.dm @@ -58,7 +58,7 @@ default behaviour is: spread_fire(tmob) for(var/mob/living/M in range(tmob, 1)) - if(tmob.pinned.len || ((M.pulling == tmob && ( tmob.restrained() && !( M.restrained() ) && M.stat == 0)) || locate(/obj/item/weapon/grab, tmob.grabbed_by.len)) ) + if(tmob.pinned.len || ((M.pulling == tmob && ( tmob.restrained() && !( M.restrained() ) && M.stat == 0)) || locate(/obj/item/grab, tmob.grabbed_by.len)) ) if ( !(world.time % 5) ) to_chat(src, "[tmob] is restrained, you cannot push past") now_pushing = 0 @@ -157,11 +157,11 @@ default behaviour is: to_chat(src, "You fail to push [tmob]'s fat ass out of the way.") now_pushing = 0 return - if(tmob.r_hand && istype(tmob.r_hand, /obj/item/weapon/shield/riot)) + if(tmob.r_hand && istype(tmob.r_hand, /obj/item/shield/riot)) if(prob(99)) now_pushing = 0 return - if(tmob.l_hand && istype(tmob.l_hand, /obj/item/weapon/shield/riot)) + if(tmob.l_hand && istype(tmob.l_hand, /obj/item/shield/riot)) if(prob(99)) now_pushing = 0 return @@ -211,7 +211,7 @@ default behaviour is: Move(T, t, move_time) if(ishuman(AM) && AM:grabbed_by) - for(var/obj/item/weapon/grab/G in AM:grabbed_by) + for(var/obj/item/grab/G in AM:grabbed_by) step(G:assailant, get_dir(G:assailant, AM)) G.adjust_position() now_pushing = 0 diff --git a/code/modules/mob/living/riding.dm b/code/modules/mob/living/riding.dm index 08a2f889708..60d88132f81 100644 --- a/code/modules/mob/living/riding.dm +++ b/code/modules/mob/living/riding.dm @@ -10,7 +10,7 @@ to_chat(src, "Rider control enabled.") return else - riding_datum.keytype = /obj/item/weapon/material/twohanded/riding_crop + riding_datum.keytype = /obj/item/material/twohanded/riding_crop to_chat(src, "Rider control restricted.") return return diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 93b56d08715..694160dde97 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -126,7 +126,7 @@ var/list/channel_to_radio_key = new /mob/living/proc/handle_message_mode(message_mode, list/message_pieces, verb, used_radios) if(message_mode == "intercom") - for(var/obj/item/device/radio/intercom/I in view(1, null)) + for(var/obj/item/radio/intercom/I in view(1, null)) I.talk_into(src, message_pieces, verb) used_radios += I return 0 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 6bee00d064d..67fc942635c 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -55,10 +55,10 @@ var/list/ai_verbs_default = list( var/icon/holo_icon //Default is assigned when AI is created. var/holo_color = null var/list/connected_robots = list() - var/obj/item/device/pda/ai/aiPDA = null - var/obj/item/device/communicator/aiCommunicator = null - var/obj/item/device/multitool/aiMulti = null - var/obj/item/device/radio/headset/heads/ai_integrated/aiRadio = null + var/obj/item/pda/ai/aiPDA = null + var/obj/item/communicator/aiCommunicator = null + var/obj/item/multitool/aiMulti = null + var/obj/item/radio/headset/heads/ai_integrated/aiRadio = null var/camera_light_on = 0 //Defines if the AI toggled the light on the camera it's looking through. var/datum/trackable/track = null var/last_announcement = "" @@ -106,7 +106,7 @@ var/list/ai_verbs_default = list( src.verbs -= ai_verbs_default src.verbs -= silicon_subsystems -/mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/device/mmi/B, var/safety = 0) +/mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/mmi/B, var/safety = 0) announcement = new() announcement.title = "A.I. Announcement" announcement.announcement_type = "A.I. Announcement" @@ -123,7 +123,7 @@ var/list/ai_verbs_default = list( pickedName = null if(!is_dummy) - aiPDA = new/obj/item/device/pda/ai(src) + aiPDA = new/obj/item/pda/ai(src) SetName(pickedName) anchored = TRUE canmove = 0 @@ -131,7 +131,7 @@ var/list/ai_verbs_default = list( loc = loc if(!is_dummy) - aiCommunicator = new /obj/item/device/communicator/integrated(src) + aiCommunicator = new /obj/item/communicator/integrated(src) holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo1")) @@ -150,7 +150,7 @@ var/list/ai_verbs_default = list( additional_law_channels["Binary"] = "#b" additional_law_channels["Holopad"] = ":h" - aiCamera = new/obj/item/device/camera/siliconcam/ai_camera(src) + aiCamera = new/obj/item/camera/siliconcam/ai_camera(src) if (istype(loc, /turf)) add_ai_verbs(src) @@ -764,10 +764,10 @@ var/list/ai_verbs_default = list( camera_light_on = world.timeofday + 1 * 20 // Update the light every 2 seconds. -/mob/living/silicon/ai/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/device/aicard)) +/mob/living/silicon/ai/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/aicard)) - var/obj/item/device/aicard/card = W + var/obj/item/aicard/card = W card.grab_ai(src, user) else if(W.has_tool_quality(TOOL_WRENCH)) @@ -912,7 +912,7 @@ var/list/ai_verbs_default = list( set category = "IC" resting = 0 - var/obj/item/weapon/rig/rig = src.get_rig() + var/obj/item/rig/rig = src.get_rig() if(rig) rig.force_rest(src) @@ -947,7 +947,7 @@ var/list/ai_verbs_default = list( // If I's display name is currently different from the voice name and using an agent ID then don't impersonate // as this would allow the AI to track I and realize the mismatch. - if(I && !(I.name != speaker_name && I.wear_id && istype(I.wear_id,/obj/item/weapon/card/id/syndicate))) + if(I && !(I.name != speaker_name && I.wear_id && istype(I.wear_id,/obj/item/card/id/syndicate))) impersonating = I jobname = impersonating.get_assignment() else diff --git a/code/modules/mob/living/silicon/ai/ai_vr.dm b/code/modules/mob/living/silicon/ai/ai_vr.dm index 481dd97297b..2bc2da78f1c 100644 --- a/code/modules/mob/living/silicon/ai/ai_vr.dm +++ b/code/modules/mob/living/silicon/ai/ai_vr.dm @@ -1,4 +1,4 @@ -/mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/device/mmi/B, var/safety = 0) +/mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/mmi/B, var/safety = 0) ..(loc, L, B, safety) add_language(LANGUAGE_BIRDSONG, 1) add_language(LANGUAGE_SAGARU, 1) diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm index 29ff44b04e9..2c6d16907a5 100644 --- a/code/modules/mob/living/silicon/ai/death.dm +++ b/code/modules/mob/living/silicon/ai/death.dm @@ -15,8 +15,8 @@ for(var/obj/machinery/ai_status_display/O in machines) spawn( 0 ) O.mode = 2 - if (istype(loc, /obj/item/device/aicard)) - var/obj/item/device/aicard/card = loc + if (istype(loc, /obj/item/aicard)) + var/obj/item/aicard/card = loc card.update_icon() . = ..(gibbed,"gives one shrill beep before falling lifeless.") diff --git a/code/modules/mob/living/silicon/pai/admin.dm b/code/modules/mob/living/silicon/pai/admin.dm index f3d8e495c1f..ebd161c4f22 100644 --- a/code/modules/mob/living/silicon/pai/admin.dm +++ b/code/modules/mob/living/silicon/pai/admin.dm @@ -12,7 +12,7 @@ pai_key = C.key log_and_message_admins("made a pAI with key=[pai_key] at ([t.x],[t.y],[t.z])") - var/obj/item/device/paicard/card = new(t) + var/obj/item/paicard/card = new(t) var/mob/living/silicon/pai/pai = new(card) pai.key = pai_key card.setPersonality(pai) diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm index 9a8a045635a..3190e018062 100644 --- a/code/modules/mob/living/silicon/pai/life.dm +++ b/code/modules/mob/living/silicon/pai/life.dm @@ -38,7 +38,7 @@ if(health <= 0) card.death_damage() death(null,"fizzles out and clatters to the floor...") - else if(health < maxHealth && istype(src.loc , /obj/item/device/paicard)) + else if(health < maxHealth && istype(src.loc , /obj/item/paicard)) adjustBruteLoss(-0.5) adjustFireLoss(-0.5) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 487a1d5402b..faabb977682 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -7,12 +7,12 @@ pass_flags = 1 mob_size = MOB_SMALL - holder_type = /obj/item/weapon/holder/pai + holder_type = /obj/item/holder/pai can_pull_size = ITEMSIZE_SMALL can_pull_mobs = MOB_PULL_SMALLER - idcard_type = /obj/item/weapon/card/id + idcard_type = /obj/item/card/id var/idaccessible = 0 var/network = "SS13" @@ -21,9 +21,9 @@ var/ram = 100 // Used as currency to purchase different abilities var/list/software = list() var/userDNA // The DNA string of our assigned user - var/obj/item/device/paicard/card // The card we inhabit - var/obj/item/device/radio/borg/pai/radio // Our primary radio - var/obj/item/device/communicator/integrated/communicator // Our integrated communicator. + var/obj/item/paicard/card // The card we inhabit + var/obj/item/radio/borg/pai/radio // Our primary radio + var/obj/item/communicator/integrated/communicator // Our integrated communicator. var/chassis = "pai-repairbot" // A record of your chosen chassis. var/global/list/possible_chassis = list( @@ -72,7 +72,7 @@ "Rodent" = list("squeaks", "SQUEAKS", "sqiks") //VOREStation Edit ) - var/obj/item/weapon/pai_cable/cable // The cable we produce and use when door or camera jacking + var/obj/item/pai_cable/cable // The cable we produce and use when door or camera jacking var/master // Name of the one who commands us var/master_dna // DNA string for owner verification @@ -88,7 +88,7 @@ var/screen // Which screen our main window displays var/subscreen // Which specific function of the main screen is being displayed - var/obj/item/device/pda/ai/pai/pda = null + var/obj/item/pda/ai/pai/pda = null var/paiHUD = 0 // Toggles whether the AR HUD is active or not @@ -112,14 +112,14 @@ var/our_icon_rotation = 0 -/mob/living/silicon/pai/New(var/obj/item/device/paicard) +/mob/living/silicon/pai/New(var/obj/item/paicard) src.loc = paicard card = paicard sradio = new(src) communicator = new(src) if(card) if(!card.radio) - card.radio = new /obj/item/device/radio/borg/pai(src.card) + card.radio = new /obj/item/radio/borg/pai(src.card) radio = card.radio //Default languages without universal translator software @@ -174,7 +174,7 @@ return 0 /mob/living/silicon/pai/restrained() - if(istype(src.loc,/obj/item/device/paicard)) + if(istype(src.loc,/obj/item/paicard)) return 0 ..() @@ -290,8 +290,8 @@ else if(isbelly(card.loc)) //VOREStation edit. to_chat(src, "There is no room to unfold in here. You're good and stuck.") //VOREStation edit. return 0 //VOREStation edit. - else if(istype(card.loc,/obj/item/device/pda)) - var/obj/item/device/pda/holder = card.loc + else if(istype(card.loc,/obj/item/pda)) + var/obj/item/pda/holder = card.loc holder.pai = null src.client.perspective = EYE_PERSPECTIVE @@ -361,9 +361,9 @@ set category = "IC" // Pass lying down or getting up to our pet human, if we're in a rig. - if(istype(src.loc,/obj/item/device/paicard)) + if(istype(src.loc,/obj/item/paicard)) resting = 0 - var/obj/item/weapon/rig/rig = src.get_rig() + var/obj/item/rig/rig = src.get_rig() if(istype(rig)) rig.force_rest(src) return @@ -415,7 +415,7 @@ handle_status_indicators() */ //Overriding this will stop a number of headaches down the track. -/mob/living/silicon/pai/attackby(obj/item/weapon/W as obj, mob/user as mob) +/mob/living/silicon/pai/attackby(obj/item/W as obj, mob/user as mob) if(W.force) visible_message("[user.name] attacks [src] with [W]!") src.adjustBruteLoss(W.force) @@ -455,7 +455,7 @@ resting = 0 // If we are being held, handle removing our holder from their inv. - var/obj/item/weapon/holder/H = loc + var/obj/item/holder/H = loc if(istype(H)) var/mob/living/M = H.loc if(istype(M)) @@ -486,7 +486,7 @@ // Handle being picked up. /mob/living/silicon/pai/get_scooped(var/mob/living/carbon/grabber, var/self_drop) - var/obj/item/weapon/holder/H = ..(grabber, self_drop) + var/obj/item/holder/H = ..(grabber, self_drop) if(!istype(H)) return @@ -495,8 +495,8 @@ grabber.update_inv_r_hand() return H -/mob/living/silicon/pai/attackby(obj/item/weapon/W as obj, mob/user as mob) - var/obj/item/weapon/card/id/ID = W.GetID() +/mob/living/silicon/pai/attackby(obj/item/W as obj, mob/user as mob) + var/obj/item/card/id/ID = W.GetID() if(ID) if (idaccessible == 1) switch(tgui_alert(user, "Do you wish to add access to [src] or remove access from [src]?","Access Modify",list("Add Access","Remove Access", "Cancel"))) @@ -516,7 +516,7 @@ return if("Cancel", null) return - else if (istype(W, /obj/item/weapon/card/id) && idaccessible == 0) + else if (istype(W, /obj/item/card/id) && idaccessible == 0) to_chat(user, "[src] is not accepting access modifcations at this time.") return diff --git a/code/modules/mob/living/silicon/pai/pai_vr.dm b/code/modules/mob/living/silicon/pai/pai_vr.dm index 4afa7a3fae4..1cacd6e9313 100644 --- a/code/modules/mob/living/silicon/pai/pai_vr.dm +++ b/code/modules/mob/living/silicon/pai/pai_vr.dm @@ -496,8 +496,8 @@ if(b.owner.client) to_chat(b.owner, "[src.name]'s screen prints, \"[message]\"") else return - else if(istype(card.loc, /obj/item/device/pda)) - var/obj/item/device/pda/p = card.loc + else if(istype(card.loc, /obj/item/pda)) + var/obj/item/pda/p = card.loc if(isliving(p.loc)) var/mob/living/L = p.loc if(L.client) diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm index 1f7c16a8274..05d127b7d05 100644 --- a/code/modules/mob/living/silicon/pai/recruit.dm +++ b/code/modules/mob/living/silicon/pai/recruit.dm @@ -31,10 +31,10 @@ var/datum/paiController/paiController // Global handler for pAI candidates /datum/paiController/Topic(href, href_list[]) if(href_list["download"]) var/datum/paiCandidate/candidate = locate(href_list["candidate"]) - var/obj/item/device/paicard/card = locate(href_list["device"]) + var/obj/item/paicard/card = locate(href_list["device"]) if(card.pai) return - if(istype(card,/obj/item/device/paicard) && istype(candidate,/datum/paiCandidate)) + if(istype(card,/obj/item/paicard) && istype(candidate,/datum/paiCandidate)) var/mob/living/silicon/pai/pai = new(card) pai.key = candidate.key paikeys |= pai.ckey @@ -102,7 +102,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates if("submit") if(candidate) candidate.ready = 1 - for(var/obj/item/device/paicard/p in all_pai_cards) + for(var/obj/item/paicard/p in all_pai_cards) if(p.looking_for_personality == 1) p.alertUpdate() usr << browse(null, "window=paiRecruit") @@ -242,7 +242,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates M << browse(dat, "window=paiRecruit;size=580x580;") -/datum/paiController/proc/findPAI(var/obj/item/device/paicard/p, var/mob/user) +/datum/paiController/proc/findPAI(var/obj/item/paicard/p, var/mob/user) requestRecruits(user) var/list/available = list() for(var/datum/paiCandidate/c in paiController.pai_candidates) diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm index 3f527a06f37..a0c99e1c203 100644 --- a/code/modules/mob/living/silicon/pai/software_modules.dm +++ b/code/modules/mob/living/silicon/pai/software_modules.dm @@ -283,7 +283,7 @@ if("cable") var/turf/T = get_turf(P) P.hack_aborted = 0 - P.cable = new /obj/item/weapon/pai_cable(T) + P.cable = new /obj/item/pai_cable(T) for(var/mob/M in viewers(T)) M.show_message("A port on [P] opens to reveal [P.cable], which promptly falls to the floor.", 3, "You hear the soft click of something light and hard falling to the ground.", 2) diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm index c7476f2ab71..7b804e7971a 100644 --- a/code/modules/mob/living/silicon/robot/analyzer.dm +++ b/code/modules/mob/living/silicon/robot/analyzer.dm @@ -1,7 +1,7 @@ // //Robotic Component Analyser, basically a health analyser for robots // -/obj/item/device/robotanalyzer +/obj/item/robotanalyzer name = "cyborg analyzer" icon_state = "robotanalyzer" item_state = "analyzer" @@ -16,14 +16,14 @@ matter = list(MAT_STEEL = 500, MAT_GLASS = 200) var/mode = 1; -/obj/item/device/robotanalyzer/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/robotanalyzer/attack(mob/living/M as mob, mob/living/user as mob) do_scan(M, user) -/obj/item/device/robotanalyzer/AltClick(mob/user) +/obj/item/robotanalyzer/AltClick(mob/user) mode = !mode user.show_message(span_blue("[mode ? "Toggled to cyborg analyzing mode." : "Toggled to cyborg upgrade scan mode."]"), 1) -/obj/item/device/robotanalyzer/proc/do_scan(mob/living/M as mob, mob/living/user as mob) +/obj/item/robotanalyzer/proc/do_scan(mob/living/M as mob, mob/living/user as mob) if((CLUMSY in user.mutations) && prob(50)) to_chat(user, span_red("You try to analyze the floor's vitals!")) for(var/mob/O in viewers(M, null)) @@ -57,7 +57,7 @@ if(M.tod && M.stat == DEAD) user.show_message(span_blue("Time of Disable: [M.tod]")) var/mob/living/silicon/robot/R = M - var/obj/item/weapon/cell/cell = R.get_cell() + var/obj/item/cell/cell = R.get_cell() if(cell) var/cell_charge = round(cell.percent()) var/cell_text @@ -90,7 +90,7 @@ user.show_message(span_blue("Operating Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)"), 1) else var/mob/living/silicon/robot/R = M - var/obj/item/weapon/cell/cell = R.get_cell() + var/obj/item/cell/cell = R.get_cell() user.show_message(span_blue("Upgrade Analyzing Results for [M]:")) if(cell) user.show_message("\t Power Cell Details: [span_blue("[capitalize(cell.name)]")] with a capacity of [cell.maxcharge] at [round(cell.percent())]% charge") diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm index 737c46884d9..eceacfec5a9 100644 --- a/code/modules/mob/living/silicon/robot/death.dm +++ b/code/modules/mob/living/silicon/robot/death.dm @@ -13,9 +13,9 @@ if(camera) camera.status = 0 if(module) - var/obj/item/weapon/gripper/G = locate(/obj/item/weapon/gripper) in module + var/obj/item/gripper/G = locate(/obj/item/gripper) in module if(G) G.drop_item() - var/obj/item/device/dogborg/sleeper/S = locate(/obj/item/device/dogborg/sleeper) in module //VOREStation edit. + var/obj/item/dogborg/sleeper/S = locate(/obj/item/dogborg/sleeper) in module //VOREStation edit. if(S) S.go_out() //VOREStation edit. remove_robot_verbs() sql_report_cyborg_death(src) diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm index 3c99f0c1d90..f45833e62d3 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/melee/dogborg/jaws +/obj/item/melee/dogborg/jaws icon = 'icons/mob/dogborg_vr.dmi' hitsound = 'sound/weapons/bite.ogg' throwforce = 0 @@ -6,7 +6,7 @@ pry = 1 tool_qualities = list(TOOL_CROWBAR) -/obj/item/weapon/melee/dogborg/jaws/big +/obj/item/melee/dogborg/jaws/big name = "combat jaws" icon_state = "jaws" desc = "The jaws of the law." @@ -15,7 +15,7 @@ defend_chance = 15 attack_verb = list("chomped", "bit", "ripped", "mauled", "enforced") -/obj/item/weapon/melee/dogborg/jaws/small +/obj/item/melee/dogborg/jaws/small name = "puppy jaws" icon_state = "smalljaws" desc = "The jaws of a small dog." @@ -24,7 +24,7 @@ attack_verb = list("nibbled", "bit", "gnawed", "chomped", "nommed") var/emagged = 0 -/obj/item/weapon/melee/dogborg/jaws/small/attack_self(mob/user) +/obj/item/melee/dogborg/jaws/small/attack_self(mob/user) var/mob/living/silicon/robot/R = user if(R.emagged || R.emag_items) emagged = !emagged @@ -47,7 +47,7 @@ update_icon() // Baton chompers -/obj/item/weapon/melee/borg_combat_shocker +/obj/item/melee/borg_combat_shocker name = "combat shocker" icon = 'icons/mob/dogborg_vr.dmi' icon_state = "combatshocker" @@ -60,7 +60,7 @@ var/charge_cost = 15 var/dogborg = FALSE -/obj/item/weapon/melee/borg_combat_shocker/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) +/obj/item/melee/borg_combat_shocker/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) if(isrobot(target)) return ..() @@ -106,7 +106,7 @@ H.forcesay(hit_appends) //Boop //New and improved, now a simple reagent sniffer. -/obj/item/device/boop_module +/obj/item/boop_module name = "boop module" icon = 'icons/mob/dogborg_vr.dmi' icon_state = "nose" @@ -116,11 +116,11 @@ attack_verb = list("nuzzled", "nosed", "booped") w_class = ITEMSIZE_TINY -/obj/item/device/boop_module/New() +/obj/item/boop_module/New() ..() flags |= NOBLUDGEON //No more attack messages -/obj/item/device/boop_module/attack_self(mob/user) +/obj/item/boop_module/attack_self(mob/user) if (!( istype(user.loc, /turf) )) return @@ -142,7 +142,7 @@ to_chat(user, "[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]%") to_chat(user, "Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)") -/obj/item/device/boop_module/afterattack(obj/O, mob/user as mob, proximity) +/obj/item/boop_module/afterattack(obj/O, mob/user as mob, proximity) if(!proximity) return if (user.stat) @@ -171,7 +171,7 @@ //Delivery /* -/obj/item/weapon/storage/bag/borgdelivery +/obj/item/storage/bag/borgdelivery name = "fetching storage" desc = "Fetch the thing!" icon = 'icons/mob/dogborg_vr.dmi' @@ -182,10 +182,10 @@ storage_slots = 1 collection_mode = 0 can_hold = list() // any - cant_hold = list(/obj/item/weapon/disk/nuclear) + cant_hold = list(/obj/item/disk/nuclear) */ -/obj/item/weapon/shockpaddles/robot/hound +/obj/item/shockpaddles/robot/hound name = "paws of life" icon = 'icons/mob/dogborg_vr.dmi' icon_state = "defibpaddles0" @@ -194,19 +194,19 @@ attack_verb = list("batted", "pawed", "bopped", "whapped") chargecost = 500 -/obj/item/weapon/shockpaddles/robot/hound/jumper +/obj/item/shockpaddles/robot/hound/jumper name = "jumper paws" desc = "Zappy paws. For rebooting a full body prostetic." use_on_synthetic = 1 -/obj/item/weapon/reagent_containers/borghypo/hound +/obj/item/reagent_containers/borghypo/hound name = "MediHound hypospray" desc = "An advanced chemical synthesizer and injection system utilizing carrier's reserves, designed for heavy-duty medical equipment." charge_cost = 10 reagent_ids = list("inaprovaline", "dexalin", "bicaridine", "kelotane", "anti_toxin", "spaceacillin", "paracetamol") var/datum/matter_synth/water = null -/obj/item/weapon/reagent_containers/borghypo/hound/process() //Recharges in smaller steps and uses the water reserves as well. +/obj/item/reagent_containers/borghypo/hound/process() //Recharges in smaller steps and uses the water reserves as well. if(isrobot(loc)) var/mob/living/silicon/robot/R = loc if(R && R.cell) @@ -217,19 +217,19 @@ reagent_volumes[T] = min(reagent_volumes[T] + 1, volume) return 1 -/obj/item/weapon/reagent_containers/borghypo/hound/lost +/obj/item/reagent_containers/borghypo/hound/lost name = "Hound hypospray" desc = "An advanced chemical synthesizer and injection system utilizing carrier's reserves." reagent_ids = list("tricordrazine", "inaprovaline", "bicaridine", "dexalin", "anti_toxin", "tramadol", "spaceacillin") -/obj/item/weapon/reagent_containers/borghypo/hound/trauma +/obj/item/reagent_containers/borghypo/hound/trauma name = "Hound hypospray" desc = "An advanced chemical synthesizer and injection system utilizing carrier's reserves." reagent_ids = list("tricordrazine", "inaprovaline", "oxycodone", "dexalin" ,"spaceacillin") //Tongue stuff -/obj/item/device/robot_tongue +/obj/item/robot_tongue name = "synthetic tongue" desc = "Useful for slurping mess off the floor before affectionately licking the crew members in the face." icon = 'icons/mob/dogborg_vr.dmi' @@ -238,11 +238,11 @@ var/emagged = 0 var/busy = 0 //prevents abuse and runtimes -/obj/item/device/robot_tongue/New() +/obj/item/robot_tongue/New() ..() flags |= NOBLUDGEON //No more attack messages -/obj/item/device/robot_tongue/attack_self(mob/user) +/obj/item/robot_tongue/attack_self(mob/user) var/mob/living/silicon/robot/R = user if(R.emagged || R.emag_items) emagged = !emagged @@ -258,7 +258,7 @@ icon_state = "synthtongue" update_icon() -/obj/item/device/robot_tongue/afterattack(atom/target, mob/user, proximity) +/obj/item/robot_tongue/afterattack(atom/target, mob/user, proximity) if(!proximity) return @@ -281,14 +281,14 @@ R.cell.charge += 250 busy = 0 return - if(istype(target,/obj/item/weapon/cell)) + if(istype(target,/obj/item/cell)) user.visible_message("[user] begins cramming \the [target.name] down its throat.", "You begin cramming \the [target.name] down your throat...") busy = 1 if(do_after (user, 50)) user.visible_message("[user] finishes gulping down \the [target.name].", "You finish swallowing \the [target.name].") to_chat(user, "You finish off \the [target.name], and gain some charge!") var/mob/living/silicon/robot/R = user - var/obj/item/weapon/cell/C = target + var/obj/item/cell/C = target R.cell.charge += C.charge / 3 qdel(target) busy = 0 @@ -336,7 +336,7 @@ enabled = FALSE icon_state = "scrub0" -/obj/item/weapon/gun/energy/taser/mounted/cyborg/ertgun //Not a taser, but it's being used as a base so it takes energy and actually works. +/obj/item/gun/energy/taser/mounted/cyborg/ertgun //Not a taser, but it's being used as a base so it takes energy and actually works. name = "disabler" desc = "A small and nonlethal gun produced by NT.." icon = 'icons/mob/dogborg_vr.dmi' @@ -347,7 +347,7 @@ recharge_time = 10 //Takes ten ticks to recharge a shot, so don't waste them all! //cell_type = null //Same cell as a taser until edits are made. -/obj/item/weapon/melee/combat_borgblade +/obj/item/melee/combat_borgblade name = "energy blade" icon = 'icons/mob/dogborg_vr.dmi' icon_state = "swordtail" @@ -361,7 +361,7 @@ attack_verb = list("slashed", "stabbed", "jabbed", "mauled", "sliced") w_class = ITEMSIZE_NORMAL -/obj/item/device/lightreplacer/dogborg +/obj/item/lightreplacer/dogborg name = "light replacer" desc = "A device to automatically replace lights. This version is capable to produce a few replacements using your internal matter reserves." max_uses = 16 @@ -369,7 +369,7 @@ var/cooldown = 0 var/datum/matter_synth/glass = null -/obj/item/device/lightreplacer/dogborg/attack_self(mob/user)//Recharger refill is so last season. Now we recycle without magic! +/obj/item/lightreplacer/dogborg/attack_self(mob/user)//Recharger refill is so last season. Now we recycle without magic! var/choice = tgui_alert(user, "Do you wish to check the reserves or change the color?", "Selection List", list("Reserves", "Color")) if(!choice) @@ -401,7 +401,7 @@ return //Pounce stuff for K-9 -/obj/item/weapon/dogborg/pounce +/obj/item/dogborg/pounce name = "pounce" icon = 'icons/mob/dogborg_vr.dmi' icon_state = "pounce" @@ -410,11 +410,11 @@ throwforce = 0 var/bluespace = FALSE -/obj/item/weapon/dogborg/pounce/New() +/obj/item/dogborg/pounce/New() ..() flags |= NOBLUDGEON -/obj/item/weapon/dogborg/pounce/attack_self(mob/user) +/obj/item/dogborg/pounce/attack_self(mob/user) var/mob/living/silicon/robot/R = user R.leap(bluespace) @@ -496,16 +496,16 @@ if(prob(75)) //75% chance to stun for 5 seconds, really only going to be 4 bcus click cooldown+animation. T.apply_effect(5, WEAKEN, armor_block) -/obj/item/weapon/reagent_containers/glass/beaker/large/borg +/obj/item/reagent_containers/glass/beaker/large/borg var/mob/living/silicon/robot/R var/last_robot_loc -/obj/item/weapon/reagent_containers/glass/beaker/large/borg/Initialize() +/obj/item/reagent_containers/glass/beaker/large/borg/Initialize() . = ..() R = loc.loc RegisterSignal(src, COMSIG_OBSERVER_MOVED, PROC_REF(check_loc)) -/obj/item/weapon/reagent_containers/glass/beaker/large/borg/proc/check_loc(atom/movable/mover, atom/old_loc, atom/new_loc) +/obj/item/reagent_containers/glass/beaker/large/borg/proc/check_loc(atom/movable/mover, atom/old_loc, atom/new_loc) if(old_loc == R || old_loc == R.module) last_robot_loc = old_loc if(!istype(loc, /obj/machinery) && loc != R && loc != R.module) @@ -517,7 +517,7 @@ if(loc == R) hud_layerise() -/obj/item/weapon/reagent_containers/glass/beaker/large/borg/Destroy() +/obj/item/reagent_containers/glass/beaker/large/borg/Destroy() UnregisterSignal(src, COMSIG_OBSERVER_MOVED) R = null last_robot_loc = null diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index fe632a206ca..9bdf400f8aa 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -1,7 +1,7 @@ #define SLEEPER_INJECT_COST 600 // Note that this has unlimited supply unlike a borg hypo, so should be balanced accordingly //Sleeper -/obj/item/device/dogborg/sleeper +/obj/item/dogborg/sleeper name = "Sleeper Belly" desc = "A mounted sleeper that stabilizes patients and can inject reagents in the borg's reserves." icon = 'icons/mob/dogborg_vr.dmi' @@ -42,29 +42,29 @@ var/digest_multiplier = 1 var/recycles = FALSE var/medsensor = TRUE //Does belly sprite come with patient ok/dead light? - var/obj/item/device/healthanalyzer/med_analyzer = null + var/obj/item/healthanalyzer/med_analyzer = null -/obj/item/device/dogborg/sleeper/New() +/obj/item/dogborg/sleeper/New() ..() flags |= NOBLUDGEON //No more attack messages files = new /datum/research/techonly(src) - med_analyzer = new /obj/item/device/healthanalyzer + med_analyzer = new /obj/item/healthanalyzer -/obj/item/device/dogborg/sleeper/Destroy() +/obj/item/dogborg/sleeper/Destroy() go_out() ..() -/obj/item/device/dogborg/sleeper/Exit(atom/movable/O) +/obj/item/dogborg/sleeper/Exit(atom/movable/O) return 0 -/obj/item/device/dogborg/sleeper/return_air() +/obj/item/dogborg/sleeper/return_air() return return_air_for_internal_lifeform() -/obj/item/device/dogborg/sleeper/return_air_for_internal_lifeform() +/obj/item/dogborg/sleeper/return_air_for_internal_lifeform() var/datum/gas_mixture/belly_air/air = new(1000) return air -/obj/item/device/dogborg/sleeper/afterattack(var/atom/movable/target, mob/living/silicon/user, proximity) +/obj/item/dogborg/sleeper/afterattack(var/atom/movable/target, mob/living/silicon/user, proximity) hound = loc if(!istype(target)) return @@ -166,7 +166,7 @@ log_admin("[key_name(hound)] has eaten [key_name(patient)] with a cyborg belly. ([hound ? "JMP" : "null"])") playsound(src, gulpsound, vol = 100, vary = 1, falloff = 0.1, preference = /datum/preference/toggle/eating_noises) -/obj/item/device/dogborg/sleeper/proc/ingest_atom(var/atom/ingesting) +/obj/item/dogborg/sleeper/proc/ingest_atom(var/atom/ingesting) if (!ingesting || ingesting == hound) return var/obj/belly/belly = hound.vore_selected @@ -178,8 +178,8 @@ var/obj/item/to_eat = ingesting if (is_type_in_list(to_eat, item_vore_blacklist)) return - if (istype(to_eat, /obj/item/weapon/holder)) //just in case - var/obj/item/weapon/holder/micro = ingesting + if (istype(to_eat, /obj/item/holder)) //just in case + var/obj/item/holder/micro = ingesting var/delete_holder = TRUE for (var/mob/living/M in micro.contents) if (!ingest_living(M, belly) || M.loc == micro) @@ -191,14 +191,14 @@ to_eat.forceMove(belly) log_admin("VORE: [hound] used their [src] to swallow [to_eat].") -/obj/item/device/dogborg/sleeper/proc/ingest_living(var/mob/living/victim, var/obj/belly/belly) +/obj/item/dogborg/sleeper/proc/ingest_living(var/mob/living/victim, var/obj/belly/belly) if (victim.devourable && is_vore_predator(hound)) belly.nom_mob(victim, hound) add_attack_logs(hound, victim, "Eaten via [belly.name]") return TRUE return FALSE -/obj/item/device/dogborg/sleeper/proc/go_out() +/obj/item/dogborg/sleeper/proc/go_out() hound = src.loc items_preserved.Cut() cleaning = 0 @@ -217,7 +217,7 @@ playsound(src, 'sound/effects/splat.ogg', 50, 1) update_patient() -/obj/item/device/dogborg/sleeper/proc/vore_ingest_all() +/obj/item/dogborg/sleeper/proc/vore_ingest_all() hound = src.loc if (!istype(hound) || length(contents) <= 0) return @@ -230,18 +230,18 @@ hound.updateVRPanel() update_patient() -/obj/item/device/dogborg/sleeper/proc/drain(var/amt = 3) //Slightly reduced cost (before, it was always injecting inaprov) +/obj/item/dogborg/sleeper/proc/drain(var/amt = 3) //Slightly reduced cost (before, it was always injecting inaprov) hound = src.loc - if(istype(hound,/obj/item/weapon/robot_module)) + if(istype(hound,/obj/item/robot_module)) hound = hound.loc hound.cell.charge = hound.cell.charge - amt -/obj/item/device/dogborg/sleeper/attack_self(mob/user) +/obj/item/dogborg/sleeper/attack_self(mob/user) if(..()) return sleeperUI(user) -/obj/item/device/dogborg/sleeper/proc/sleeperUI(mob/user) +/obj/item/dogborg/sleeper/proc/sleeperUI(mob/user) var/dat = "[name] Console
" if(islist(injection_chems)) //Only display this if we're a drug-dispensing doggo. @@ -354,7 +354,7 @@ UI_open = TRUE return -/obj/item/device/dogborg/sleeper/Topic(href, href_list) +/obj/item/dogborg/sleeper/Topic(href, href_list) if(..() || usr == patient) return usr.set_machine(src) @@ -455,7 +455,7 @@ sleeperUI(usr) //Needs a callback to boop the page to refresh. return -/obj/item/device/dogborg/sleeper/proc/inject_chem(mob/user, chem) +/obj/item/dogborg/sleeper/proc/inject_chem(mob/user, chem) if(patient && patient.reagents) if(chem in injection_chems + "inaprovaline") if(hound.cell.charge < 800) //This is so borgs don't kill themselves with it. @@ -470,7 +470,7 @@ to_chat(hound, "Injecting [units] unit\s of [SSchemistry.chemical_reagents[chem]] into occupant.") //If they were immersed, the reagents wouldn't leave with them. //For if the dogborg's existing patient uh, doesn't make it. -/obj/item/device/dogborg/sleeper/proc/update_patient() +/obj/item/dogborg/sleeper/proc/update_patient() hound = src.loc if(!istype(hound,/mob/living/silicon/robot)) return @@ -529,7 +529,7 @@ return //Gurgleborg process -/obj/item/device/dogborg/sleeper/proc/clean_cycle() +/obj/item/dogborg/sleeper/proc/clean_cycle() //Sanity? Maybe not required. More like if indigestible person OOC escapes. for(var/I in items_preserved) @@ -671,7 +671,7 @@ update_patient() return -/obj/item/device/dogborg/sleeper/process() +/obj/item/dogborg/sleeper/process() if(!istype(src.loc,/mob/living/silicon/robot)) return @@ -695,7 +695,7 @@ STOP_PROCESSING(SSobj, src) return -/obj/item/device/dogborg/sleeper/K9 //The K9 portabrig +/obj/item/dogborg/sleeper/K9 //The K9 portabrig name = "Brig-Belly" desc = "A mounted portable-brig that holds criminals for processing or 'processing'." icon_state = "sleeperb" @@ -703,7 +703,7 @@ stabilizer = TRUE medsensor = FALSE -/obj/item/device/dogborg/sleeper/compactor //Janihound gut. +/obj/item/dogborg/sleeper/compactor //Janihound gut. name = "Garbage Processor" desc = "A mounted garbage compactor unit with fuel processor, capable of processing any kind of contaminant." icon_state = "compactor" @@ -714,7 +714,7 @@ stabilizer = FALSE medsensor = FALSE -/obj/item/device/dogborg/sleeper/compactor/analyzer //sci-borg gut. +/obj/item/dogborg/sleeper/compactor/analyzer //sci-borg gut. name = "Digestive Analyzer" desc = "A mounted destructive analyzer unit with fuel processor, for 'deep scientific analysis'." icon_state = "analyzer" @@ -723,7 +723,7 @@ analyzer = TRUE recycles = FALSE -/obj/item/device/dogborg/sleeper/compactor/decompiler +/obj/item/dogborg/sleeper/compactor/decompiler name = "Matter Decompiler" desc = "A mounted matter decompiling unit with fuel processor, for recycling anything and everyone." icon_state = "decompiler" @@ -731,7 +731,7 @@ decompiler = TRUE recycles = TRUE /* -/obj/item/device/dogborg/sleeper/compactor/delivery //Unfinished and unimplemented, still testing. +/obj/item/dogborg/sleeper/compactor/delivery //Unfinished and unimplemented, still testing. name = "Cargo Belly" desc = "A mounted cargo bay unit for tagged deliveries." icon_state = "decompiler" @@ -739,7 +739,7 @@ delivery = TRUE recycles = FALSE */ -/obj/item/device/dogborg/sleeper/compactor/supply //Miner borg belly +/obj/item/dogborg/sleeper/compactor/supply //Miner borg belly name = "Supply Storage" desc = "A mounted survival unit with fuel processor, helpful with both deliveries and assisting injured miners." icon_state = "sleeperc" @@ -749,7 +749,7 @@ stabilizer = TRUE medsensor = FALSE -/obj/item/device/dogborg/sleeper/compactor/brewer +/obj/item/dogborg/sleeper/compactor/brewer name = "Brew Belly" desc = "A mounted drunk tank unit with fuel processor, for putting away particularly rowdy patrons." icon_state = "brewer" @@ -759,26 +759,26 @@ stabilizer = TRUE medsensor = FALSE -/obj/item/device/dogborg/sleeper/compactor/generic +/obj/item/dogborg/sleeper/compactor/generic name = "Internal Cache" desc = "An internal storage of no particularly specific purpose.." icon_state = "sleeperd" max_item_count = 10 recycles = FALSE -/obj/item/device/dogborg/sleeper/K9/ert +/obj/item/dogborg/sleeper/K9/ert name = "Emergency Storage" desc = "A mounted 'emergency containment cell'." icon_state = "sleeperert" injection_chems = list("inaprovaline", "tramadol") // short list -/obj/item/device/dogborg/sleeper/trauma //Trauma borg belly +/obj/item/dogborg/sleeper/trauma //Trauma borg belly name = "Recovery Belly" desc = "A downgraded model of the sleeper belly, intended primarily for post-surgery recovery." icon_state = "sleeper" injection_chems = list("inaprovaline", "dexalin", "tricordrazine", "spaceacillin", "oxycodone") -/obj/item/device/dogborg/sleeper/lost +/obj/item/dogborg/sleeper/lost name = "Multipurpose Belly" desc = "A multipurpose belly, capable of functioning as both sleeper and processor." icon_state = "sleeperlost" @@ -788,20 +788,20 @@ stabilizer = TRUE medsensor = TRUE -/obj/item/device/dogborg/sleeper/syndie +/obj/item/dogborg/sleeper/syndie name = "Combat Triage Belly" desc = "A mounted sleeper that stabilizes patients and can inject reagents in the borg's reserves. This one is for more extreme combat scenarios." icon_state = "sleepersyndiemed" injection_chems = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", "synthblood") digest_multiplier = 2 -/obj/item/device/dogborg/sleeper/K9/syndie +/obj/item/dogborg/sleeper/K9/syndie name = "Cell-Belly" desc = "A mounted portable cell that holds anyone you wish for processing or 'processing'." icon_state = "sleepersyndiebrig" digest_multiplier = 3 -/obj/item/device/dogborg/sleeper/compactor/syndie +/obj/item/dogborg/sleeper/compactor/syndie name = "Advanced Matter Decompiler" desc = "A mounted matter decompiling unit with fuel processor, for recycling anything and everyone in your way." icon_state = "sleepersyndieeng" diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 3e0526ca2f9..ae7badfc59f 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -54,7 +54,7 @@ var/list/mob_hat_cache = list() var/mail_destination = "" var/obj/machinery/drone_fabricator/master_fabricator var/law_type = /datum/ai_laws/drone - var/module_type = /obj/item/weapon/robot_module/drone + var/module_type = /obj/item/robot_module/drone var/obj/item/hat var/hat_x_offset = 0 var/hat_y_offset = -13 @@ -63,7 +63,7 @@ var/list/mob_hat_cache = list() var/foreign_droid = FALSE - holder_type = /obj/item/weapon/holder/drone + holder_type = /obj/item/holder/drone can_be_antagged = FALSE @@ -84,7 +84,7 @@ var/list/mob_hat_cache = list() name = "construction drone" icon_state = "constructiondrone" law_type = /datum/ai_laws/construction_drone - module_type = /obj/item/weapon/robot_module/drone/construction + module_type = /obj/item/robot_module/drone/construction hat_x_offset = 1 hat_y_offset = -12 can_pull_mobs = MOB_PULL_SAME @@ -95,7 +95,7 @@ var/list/mob_hat_cache = list() icon_state = "miningdrone" item_state = "constructiondrone" law_type = /datum/ai_laws/mining_drone - module_type = /obj/item/weapon/robot_module/drone/mining + module_type = /obj/item/robot_module/drone/mining hat_x_offset = 1 hat_y_offset = -12 can_pull_mobs = MOB_PULL_SAME @@ -135,7 +135,7 @@ var/list/mob_hat_cache = list() /mob/living/silicon/robot/drone/init() if(!scrambledcodes && !foreign_droid) - aiCamera = new/obj/item/device/camera/siliconcam/drone_camera(src) + aiCamera = new/obj/item/camera/siliconcam/drone_camera(src) additional_law_channels["Drone"] = ":d" if(!laws) laws = new law_type if(!module) module = new module_type(src) @@ -217,7 +217,7 @@ var/list/mob_hat_cache = list() update_icon() //Drones cannot be upgraded with borg modules so we need to catch some items before they get used in ..(). -/mob/living/silicon/robot/drone/attackby(var/obj/item/weapon/W, var/mob/user) +/mob/living/silicon/robot/drone/attackby(var/obj/item/W, var/mob/user) if(user.a_intent == "help" && istype(W, /obj/item/clothing/head)) if(hat) @@ -235,7 +235,7 @@ var/list/mob_hat_cache = list() to_chat(user, "\The [src] is hermetically sealed. You can't open the case.") return - else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) + else if (istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) var/datum/gender/TU = gender_datums[user.get_visible_gender()] if(stat == 2) diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm index fd092f30039..095aa48da7e 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm @@ -4,7 +4,7 @@ icon_keyboard = "power_key" icon_screen = "generic" //VOREStation Edit req_access = list(access_engine_equip) - circuit = /obj/item/weapon/circuitboard/drone_control + circuit = /obj/item/circuitboard/drone_control //Used when pinging drones. var/drone_call_area = "Engineering" diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index 50c0323f7cf..5a4f9d4113c 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -1,6 +1,6 @@ //Simple borg hand. //Limited use. -/obj/item/weapon/gripper +/obj/item/gripper name = "magnetic gripper" desc = "A simple grasping tool specialized in construction and engineering work." description_info = "Ctrl-Clicking on the gripper will drop whatever it is holding.
\ @@ -12,38 +12,38 @@ //Has a list of items that it can hold. var/list/can_hold = list( - /obj/item/weapon/cell, - /obj/item/weapon/airlock_electronics, - /obj/item/weapon/tracker_electronics, - /obj/item/weapon/module/power_control, - /obj/item/weapon/stock_parts, + /obj/item/cell, + /obj/item/airlock_electronics, + /obj/item/tracker_electronics, + /obj/item/module/power_control, + /obj/item/stock_parts, /obj/item/frame, - /obj/item/weapon/camera_assembly, - /obj/item/weapon/tank, - /obj/item/weapon/circuitboard, - /obj/item/weapon/smes_coil, - /obj/item/weapon/fuel_assembly + /obj/item/camera_assembly, + /obj/item/tank, + /obj/item/circuitboard, + /obj/item/smes_coil, + /obj/item/fuel_assembly ) var/obj/item/wrapped = null // Item currently being held. var/force_holder = null // -/obj/item/weapon/gripper/examine(mob/user) +/obj/item/gripper/examine(mob/user) . = ..() if(wrapped) . += "\The [src] is holding \the [wrapped]." . += wrapped.examine(user) -/obj/item/weapon/gripper/CtrlClick(mob/user) +/obj/item/gripper/CtrlClick(mob/user) drop_item() return -/obj/item/weapon/gripper/AltClick(mob/user) +/obj/item/gripper/AltClick(mob/user) drop_item() return -/obj/item/weapon/gripper/omni +/obj/item/gripper/omni name = "omni gripper" desc = "A strange grasping tool that can hold anything a human can, but still maintains the limitations of application its more limited cousins have." icon_state = "gripper-omni" @@ -51,93 +51,93 @@ can_hold = list(/obj/item) // Testing and Event gripper. // VEEEEERY limited version for mining borgs. Basically only for swapping cells and upgrading the drills. -/obj/item/weapon/gripper/miner +/obj/item/gripper/miner name = "drill maintenance gripper" desc = "A simple grasping tool for the maintenance of heavy drilling machines." icon_state = "gripper-mining" can_hold = list( - /obj/item/weapon/cell, - /obj/item/weapon/stock_parts + /obj/item/cell, + /obj/item/stock_parts ) -/obj/item/weapon/gripper/security +/obj/item/gripper/security name = "security gripper" desc = "A simple grasping tool for corporate security work." icon_state = "gripper-sec" can_hold = list( - /obj/item/weapon/paper, - /obj/item/weapon/paper_bundle, - /obj/item/weapon/pen, - /obj/item/weapon/sample, - /obj/item/weapon/forensics/sample_kit, - /obj/item/device/taperecorder, - /obj/item/device/tape, - /obj/item/device/uv_light + /obj/item/paper, + /obj/item/paper_bundle, + /obj/item/pen, + /obj/item/sample, + /obj/item/forensics/sample_kit, + /obj/item/taperecorder, + /obj/item/rectape, + /obj/item/uv_light ) -/obj/item/weapon/gripper/paperwork +/obj/item/gripper/paperwork name = "paperwork gripper" desc = "A simple grasping tool for clerical work." can_hold = list( - /obj/item/weapon/clipboard, - /obj/item/weapon/paper, - /obj/item/weapon/paper_bundle, - /obj/item/weapon/card/id, - /obj/item/weapon/book, - /obj/item/weapon/newspaper + /obj/item/clipboard, + /obj/item/paper, + /obj/item/paper_bundle, + /obj/item/card/id, + /obj/item/book, + /obj/item/newspaper ) -/obj/item/weapon/gripper/medical +/obj/item/gripper/medical name = "medical gripper" desc = "A simple grasping tool for medical work." can_hold = list( - /obj/item/weapon/reagent_containers/glass, - /obj/item/weapon/storage/pill_bottle, - /obj/item/weapon/reagent_containers/pill, - /obj/item/weapon/reagent_containers/blood, + /obj/item/reagent_containers/glass, + /obj/item/storage/pill_bottle, + /obj/item/reagent_containers/pill, + /obj/item/reagent_containers/blood, /obj/item/stack/material/phoron, - /obj/item/weapon/tank/anesthetic, - /obj/item/weapon/disk/body_record //Vorestation Edit: this lets you get an empty sleeve or help someone else + /obj/item/tank/anesthetic, + /obj/item/disk/body_record //Vorestation Edit: this lets you get an empty sleeve or help someone else ) -/obj/item/weapon/gripper/research //A general usage gripper, used for toxins/robotics/xenobio/etc +/obj/item/gripper/research //A general usage gripper, used for toxins/robotics/xenobio/etc name = "scientific gripper" icon_state = "gripper-sci" desc = "A simple grasping tool suited to assist in a wide array of research applications." can_hold = list( - /obj/item/weapon/cell, - /obj/item/weapon/stock_parts, - /obj/item/device/mmi, + /obj/item/cell, + /obj/item/stock_parts, + /obj/item/mmi, /obj/item/robot_parts, /obj/item/borg/upgrade, - /obj/item/device/flash, //to build borgs, - /obj/item/weapon/disk, - /obj/item/weapon/circuitboard, - /obj/item/weapon/reagent_containers/glass, - /obj/item/device/assembly/prox_sensor, - /obj/item/device/healthanalyzer, //to build medibots, + /obj/item/flash, //to build borgs, + /obj/item/disk, + /obj/item/circuitboard, + /obj/item/reagent_containers/glass, + /obj/item/assembly/prox_sensor, + /obj/item/healthanalyzer, //to build medibots, /obj/item/slime_cube, /obj/item/slime_crystal, - /obj/item/weapon/disposable_teleporter/slime, + /obj/item/disposable_teleporter/slime, /obj/item/slimepotion, /obj/item/slime_extract, - /obj/item/weapon/reagent_containers/food/snacks/monkeycube + /obj/item/reagent_containers/food/snacks/monkeycube ) -/obj/item/weapon/gripper/circuit +/obj/item/gripper/circuit name = "circuit assembly gripper" icon_state = "gripper-circ" desc = "A complex grasping tool used for working with circuitry." can_hold = list( - /obj/item/weapon/cell/device, - /obj/item/device/electronic_assembly, - /obj/item/device/assembly/electronic_assembly, + /obj/item/cell/device, + /obj/item/electronic_assembly, + /obj/item/assembly/electronic_assembly, /obj/item/clothing/under/circuitry, /obj/item/clothing/gloves/circuitry, /obj/item/clothing/glasses/circuitry, @@ -145,47 +145,47 @@ /obj/item/clothing/head/circuitry, /obj/item/clothing/ears/circuitry, /obj/item/clothing/suit/circuitry, - /obj/item/weapon/implant/integrated_circuit, + /obj/item/implant/integrated_circuit, /obj/item/integrated_circuit ) -/obj/item/weapon/gripper/service //Used to handle food, drinks, and seeds. +/obj/item/gripper/service //Used to handle food, drinks, and seeds. name = "service gripper" icon_state = "gripper" desc = "A simple grasping tool used to perform tasks in the service sector, such as handling food, drinks, and seeds." can_hold = list( - /obj/item/weapon/reagent_containers/glass, - /obj/item/weapon/reagent_containers/food, + /obj/item/reagent_containers/glass, + /obj/item/reagent_containers/food, /obj/item/seeds, - /obj/item/weapon/grown, + /obj/item/grown, /obj/item/trash, - /obj/item/weapon/reagent_containers/cooking_container + /obj/item/reagent_containers/cooking_container ) -/obj/item/weapon/gripper/gravekeeper //Used for handling grave things, flowers, etc. +/obj/item/gripper/gravekeeper //Used for handling grave things, flowers, etc. name = "grave gripper" icon_state = "gripper" desc = "A specialized grasping tool used in the preparation and maintenance of graves." can_hold = list( /obj/item/seeds, - /obj/item/weapon/grown, - /obj/item/weapon/material/gravemarker + /obj/item/grown, + /obj/item/material/gravemarker ) -/obj/item/weapon/gripper/no_use/organ +/obj/item/gripper/no_use/organ name = "organ gripper" icon_state = "gripper-flesh" desc = "A specialized grasping tool used to preserve and manipulate organic material." can_hold = list( /obj/item/organ, - /obj/item/device/nif //NIFs can be slapped in during surgery + /obj/item/nif //NIFs can be slapped in during surgery ) -/obj/item/weapon/gripper/no_use/organ/Entered(var/atom/movable/AM) +/obj/item/gripper/no_use/organ/Entered(var/atom/movable/AM) if(istype(AM, /obj/item/organ)) var/obj/item/organ/O = AM O.preserved = 1 @@ -193,7 +193,7 @@ organ.preserved = 1 ..() -/obj/item/weapon/gripper/no_use/organ/Exited(var/atom/movable/AM) +/obj/item/gripper/no_use/organ/Exited(var/atom/movable/AM) if(istype(AM, /obj/item/organ)) var/obj/item/organ/O = AM O.preserved = 0 @@ -201,7 +201,7 @@ organ.preserved = 0 ..() -/obj/item/weapon/gripper/no_use/organ/robotics +/obj/item/gripper/no_use/organ/robotics name = "robotics organ gripper" icon_state = "gripper-flesh" desc = "A specialized grasping tool used in robotics work." @@ -211,10 +211,10 @@ /obj/item/organ/internal/brain, //to insert into MMIs, /obj/item/organ/internal/cell, /obj/item/organ/internal/eyes/robot, - /obj/item/device/nif //NIFs can be slapped in during surgery + /obj/item/nif //NIFs can be slapped in during surgery ) -/obj/item/weapon/gripper/no_use/mech +/obj/item/gripper/no_use/mech name = "exosuit gripper" icon_state = "gripper-mech" desc = "A large, heavy-duty grasping tool used in construction of mechs." @@ -227,12 +227,12 @@ /obj/item/mecha_parts/component ) -/obj/item/weapon/gripper/no_use //Used when you want to hold and put items in other things, but not able to 'use' the item +/obj/item/gripper/no_use //Used when you want to hold and put items in other things, but not able to 'use' the item -/obj/item/weapon/gripper/no_use/attack_self(mob/user as mob) +/obj/item/gripper/no_use/attack_self(mob/user as mob) return -/obj/item/weapon/gripper/no_use/loader //This is used to disallow building with metal. +/obj/item/gripper/no_use/loader //This is used to disallow building with metal. name = "sheet loader" desc = "A specialized loading device, designed to pick up and insert sheets of materials inside machines." icon_state = "gripper-sheet" @@ -241,12 +241,12 @@ /obj/item/stack/material ) -/obj/item/weapon/gripper/attack_self(mob/user as mob) +/obj/item/gripper/attack_self(mob/user as mob) if(wrapped) return wrapped.attack_self(user) return ..() -/obj/item/weapon/gripper/attackby(var/obj/item/O, var/mob/user) +/obj/item/gripper/attackby(var/obj/item/O, var/mob/user) if(wrapped) // We're interacting with the item inside. If you can hold a cup with 2 fingers and stick a straw in it, you could do that with a gripper and another robotic arm. wrapped.loc = src.loc var/resolved = wrapped.attackby(O, user) @@ -261,7 +261,7 @@ return resolved return ..() -/obj/item/weapon/gripper/verb/drop_gripper_item() +/obj/item/gripper/verb/drop_gripper_item() set name = "Drop Item" set desc = "Release an item from your magnetic gripper." @@ -269,7 +269,7 @@ drop_item() -/obj/item/weapon/gripper/proc/drop_item() +/obj/item/gripper/proc/drop_item() if(!wrapped) //There's some weirdness with items being lost inside the arm. Trying to fix all cases. ~Z for(var/obj/item/thing in src.contents) @@ -285,7 +285,7 @@ wrapped = null //update_icon() -/obj/item/weapon/gripper/proc/drop_item_nm() +/obj/item/gripper/proc/drop_item_nm() if(!wrapped) for(var/obj/item/thing in src.contents) @@ -300,7 +300,7 @@ wrapped = null //update_icon() -/obj/item/weapon/gripper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/gripper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(wrapped) //The force of the wrapped obj gets set to zero during the attack() and afterattack(). force_holder = wrapped.force wrapped.force = 0.0 @@ -317,7 +317,7 @@ return 1 return 0 -/obj/item/weapon/gripper/afterattack(var/atom/target, var/mob/living/user, proximity, params) +/obj/item/gripper/afterattack(var/atom/target, var/mob/living/user, proximity, params) if(!proximity) return // This will prevent them using guns at range but adminbuse can add them directly to modules, so eh. @@ -409,7 +409,7 @@ user.visible_message("[user] removes the power cell from [A]!", "You remove the power cell.") //TODO: Matter decompiler. -/obj/item/weapon/matter_decompiler +/obj/item/matter_decompiler name = "matter decompiler" desc = "Eating trash, bits of glass, or other debris will replenish your stores." @@ -422,10 +422,10 @@ var/datum/matter_synth/wood = null var/datum/matter_synth/plastic = null -/obj/item/weapon/matter_decompiler/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/matter_decompiler/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) return -/obj/item/weapon/matter_decompiler/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, proximity, params) +/obj/item/matter_decompiler/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, proximity, params) if(!proximity) return //Not adjacent. @@ -489,8 +489,8 @@ wood.add_charge(2000) if(plastic) plastic.add_charge(2000) - else if(istype(W,/obj/item/weapon/light)) - var/obj/item/weapon/light/L = W + else if(istype(W,/obj/item/light)) + var/obj/item/light/L = W if(L.status >= 2) //In before someone changes the inexplicably local defines. ~ Z if(metal) metal.add_charge(250) @@ -518,13 +518,13 @@ else if(istype(W,/obj/item/ammo_casing)) if(metal) metal.add_charge(1000) - else if(istype(W,/obj/item/weapon/material/shard/shrapnel)) + else if(istype(W,/obj/item/material/shard/shrapnel)) if(metal) metal.add_charge(1000) - else if(istype(W,/obj/item/weapon/material/shard)) + else if(istype(W,/obj/item/material/shard)) if(glass) glass.add_charge(1000) - else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/grown)) + else if(istype(W,/obj/item/reagent_containers/food/snacks/grown)) if(wood) wood.add_charge(4000) else if(istype(W,/obj/item/pipe)) @@ -549,7 +549,7 @@ return if(!module) - module = new /obj/item/weapon/robot_module/drone(src) + module = new /obj/item/robot_module/drone(src) var/dat = "Drone modules\n" dat += {" @@ -576,7 +576,7 @@ else module_string += text("[O]: Activate
") - if((istype(O,/obj/item/weapon) || istype(O,/obj/item/device)) && !(istype(O,/obj/item/stack/cable_coil))) + if((istype(O,/obj/item) || istype(O,/obj/item)) && !(istype(O,/obj/item/stack/cable_coil))) tools += module_string else resources += module_string @@ -593,7 +593,7 @@ else module_string += text("[O]: Activate
") - if((istype(O,/obj/item/weapon) || istype(O,/obj/item/device)) && !(istype(O,/obj/item/stack/cable_coil))) + if((istype(O,/obj/item) || istype(O,/obj/item)) && !(istype(O,/obj/item/stack/cable_coil))) tools += module_string else resources += module_string diff --git a/code/modules/mob/living/silicon/robot/drone/swarm.dm b/code/modules/mob/living/silicon/robot/drone/swarm.dm index a0151ca9f21..e39a3e641c3 100644 --- a/code/modules/mob/living/silicon/robot/drone/swarm.dm +++ b/code/modules/mob/living/silicon/robot/drone/swarm.dm @@ -15,7 +15,7 @@ braintype = "Drone" lawupdate = 0 density = TRUE - idcard_type = /obj/item/weapon/card/id/syndicate + idcard_type = /obj/item/card/id/syndicate req_access = list(999) integrated_light_power = 3 local_transmit = 0 @@ -35,7 +35,7 @@ mob_size = MOB_LARGE law_type = /datum/ai_laws/swarm_drone - module_type = /obj/item/weapon/robot_module/drone/swarm + module_type = /obj/item/robot_module/drone/swarm hat_x_offset = 0 hat_y_offset = -10 @@ -43,7 +43,7 @@ foreign_droid = TRUE scrambledcodes = TRUE - holder_type = /obj/item/weapon/holder/drone + holder_type = /obj/item/holder/drone can_be_antagged = TRUE @@ -83,7 +83,7 @@ speed = 4 law_type = /datum/ai_laws/swarm_drone/soldier - module_type = /obj/item/weapon/robot_module/drone/swarm/ranged + module_type = /obj/item/robot_module/drone/swarm/ranged spell_setup = list( /spell/aoe_turf/conjure/swarmer, @@ -104,7 +104,7 @@ speed = 2 law_type = /datum/ai_laws/swarm_drone/soldier - module_type = /obj/item/weapon/robot_module/drone/swarm/melee + module_type = /obj/item/robot_module/drone/swarm/melee spell_setup = list( /spell/aoe_turf/conjure/swarmer, diff --git a/code/modules/mob/living/silicon/robot/drone/swarm_items.dm b/code/modules/mob/living/silicon/robot/drone/swarm_items.dm index 2bbba0b0827..80e5ded9ddb 100644 --- a/code/modules/mob/living/silicon/robot/drone/swarm_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/swarm_items.dm @@ -1,6 +1,6 @@ //Swarm Assimilator / Breacher -/obj/item/weapon/matter_decompiler/swarm +/obj/item/matter_decompiler/swarm name = "matter assimilator" desc = "Used to eat some forms of simple machinery; and large, wall-shaped blocks of metal with energetic fields." icon = 'icons/obj/device.dmi' @@ -9,7 +9,7 @@ var/field_cooldown = 1 MINUTE var/last_field = 0 -/obj/item/weapon/matter_decompiler/swarm/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, proximity, params) +/obj/item/matter_decompiler/swarm/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, proximity, params) if(!proximity) return //Not adjacent. @@ -139,7 +139,7 @@ explosion(get_turf(src), -1, 1, 2, 5, adminlog = 1) ..() -/obj/item/weapon/gun/energy/xray/swarm +/obj/item/gun/energy/xray/swarm name = "spectral projector" desc = "A high-power laser gun capable of expelling concentrated gamma blasts, which are able to penetrate matter easier than \ standard xray beams, resulting in an effective 'anti-everything' energy weapon." @@ -157,6 +157,6 @@ list(mode_name="deter", projectile_type=/obj/item/projectile/beam/shock, charge_cost = 175), ) -/obj/item/weapon/gun/energy/xray/swarm/Initialize() +/obj/item/gun/energy/xray/swarm/Initialize() . = ..() adjust_scale(-1, 1) diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index ad38d91b1e6..d46c66279c6 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -258,19 +258,19 @@ after_equip(O) /mob/living/silicon/robot/proc/after_equip(var/obj/item/O) - if(istype(O, /obj/item/device/gps)) - var/obj/item/device/gps/tracker = O + if(istype(O, /obj/item/gps)) + var/obj/item/gps/tracker = O if(tracker.tracking) tracker.tracking = FALSE tracker.toggle_tracking() if(sight_mode & BORGANOMALOUS) - var/obj/item/weapon/dogborg/pounce/pounce = has_upgrade_module(/obj/item/weapon/dogborg/pounce) + var/obj/item/dogborg/pounce/pounce = has_upgrade_module(/obj/item/dogborg/pounce) if(pounce) pounce.name = "bluespace pounce" pounce.icon_state = "bluespace_pounce" pounce.bluespace = TRUE else - var/obj/item/weapon/dogborg/pounce/pounce = has_upgrade_module(/obj/item/weapon/dogborg/pounce) + var/obj/item/dogborg/pounce/pounce = has_upgrade_module(/obj/item/dogborg/pounce) if(pounce) pounce.name = initial(pounce.name) pounce.icon_state = initial(pounce.icon_state) diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 203f2e9d641..5641467c2cb 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -329,7 +329,7 @@ if(client) client.screen -= contents for(var/obj/I in contents) - if(I && !(istype(I,/obj/item/weapon/cell) || istype(I,/obj/item/device/radio) || istype(I,/obj/machinery/camera) || istype(I,/obj/item/device/mmi))) + if(I && !(istype(I,/obj/item/cell) || istype(I,/obj/item/radio) || istype(I,/obj/machinery/camera) || istype(I,/obj/item/mmi))) client.screen += I if(module_state_1) module_state_1:screen_loc = ui_inv1 diff --git a/code/modules/mob/living/silicon/robot/photos.dm b/code/modules/mob/living/silicon/robot/photos.dm index 775bc68b6e5..c585fe48bb7 100644 --- a/code/modules/mob/living/silicon/robot/photos.dm +++ b/code/modules/mob/living/silicon/robot/photos.dm @@ -1,14 +1,14 @@ /mob/living/silicon/robot/proc/photosync() - var/obj/item/device/camera/siliconcam/master_cam = connected_ai ? connected_ai.aiCamera : null + var/obj/item/camera/siliconcam/master_cam = connected_ai ? connected_ai.aiCamera : null if (!master_cam) return var/synced = 0 // Sync borg images to the master AI. // We don't care about syncing the other way around - for(var/obj/item/weapon/photo/borg_photo in aiCamera.aipictures) + for(var/obj/item/photo/borg_photo in aiCamera.aipictures) var/copied = 0 - for(var/obj/item/weapon/photo/ai_photo in master_cam.aipictures) + for(var/obj/item/photo/ai_photo in master_cam.aipictures) if(borg_photo.id == ai_photo.id) copied = 1 break diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index cbc6e123c88..076611c72af 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -47,16 +47,16 @@ var/obj/screen/robot_modules_background //3 Modules can be activated at any one time. - var/obj/item/weapon/robot_module/module = null + var/obj/item/robot_module/module = null var/module_active = null var/module_state_1 = null var/module_state_2 = null var/module_state_3 = null - var/obj/item/device/radio/borg/radio = null - var/obj/item/device/communicator/integrated/communicator = null + var/obj/item/radio/borg/radio = null + var/obj/item/communicator/integrated/communicator = null var/mob/living/silicon/ai/connected_ai = null - var/obj/item/weapon/cell/cell = null + var/obj/item/cell/cell = null var/obj/machinery/camera/camera = null var/cell_emp_mult = 2 @@ -70,9 +70,9 @@ // Components are basically robot organs. var/list/components = list() - var/obj/item/device/mmi/mmi = null + var/obj/item/mmi/mmi = null - var/obj/item/device/pda/ai/rbPDA = null + var/obj/item/pda/ai/rbPDA = null var/opened = 0 var/emagged = 0 @@ -103,7 +103,7 @@ var/tracking_entities = 0 //The number of known entities currently accessing the internal camera var/braintype = JOB_CYBORG - var/obj/item/weapon/implant/restrainingbolt/bolt // The restraining bolt installed into the cyborg. + var/obj/item/implant/restrainingbolt/bolt // The restraining bolt installed into the cyborg. var/list/robot_verbs_default = list( /mob/living/silicon/robot/proc/sensor_mode, @@ -144,8 +144,8 @@ ident = rand(1, 999) updatename(modtype) - radio = new /obj/item/device/radio/borg(src) -// communicator = new /obj/item/device/communicator/integrated(src) + radio = new /obj/item/radio/borg(src) +// communicator = new /obj/item/communicator/integrated(src) // communicator.register_device(src) common_radio = radio @@ -166,7 +166,7 @@ C.wrapped = new C.external_type if(!cell) - cell = new /obj/item/weapon/cell/robot_station(src) + cell = new /obj/item/cell/robot_station(src) else if(ispath(cell)) cell = new cell(src) @@ -209,11 +209,11 @@ if("radio") C.wrapped = new /obj/item/robot_parts/robot_component/radio(src) if("power cell") - var/list/recommended_cells = list(/obj/item/weapon/cell/robot_station, /obj/item/weapon/cell/high, /obj/item/weapon/cell/super, /obj/item/weapon/cell/robot_syndi, /obj/item/weapon/cell/hyper, - /obj/item/weapon/cell/infinite, /obj/item/weapon/cell/potato, /obj/item/weapon/cell/slime) + var/list/recommended_cells = list(/obj/item/cell/robot_station, /obj/item/cell/high, /obj/item/cell/super, /obj/item/cell/robot_syndi, /obj/item/cell/hyper, + /obj/item/cell/infinite, /obj/item/cell/potato, /obj/item/cell/slime) var/list/cell_names = list() for(var/cell_type in recommended_cells) - var/obj/item/weapon/cell/single_cell = cell_type + var/obj/item/cell/single_cell = cell_type cell_names[capitalize(initial(single_cell.name))] = cell_type var/selected_cell = tgui_input_list(usr, "What kind of cell do you want to install? Cancel installs a default robot cell.", "Cells", cell_names) if(!selected_cell || selected_cell == "Cancel") @@ -235,7 +235,7 @@ ..() /mob/living/silicon/robot/proc/init() - aiCamera = new/obj/item/device/camera/siliconcam/robot_camera(src) + aiCamera = new/obj/item/camera/siliconcam/robot_camera(src) laws = new global.using_map.default_law_type // VOREstation edit: use map's default additional_law_channels["Binary"] = "#b" var/new_ai = select_active_ai_with_fewest_borgs() @@ -278,12 +278,12 @@ // setup the PDA and its name /mob/living/silicon/robot/proc/setup_PDA() if (!rbPDA) - rbPDA = new/obj/item/device/pda/ai(src) + rbPDA = new/obj/item/pda/ai(src) rbPDA.set_name_and_job(name,"[modtype] [braintype]") /mob/living/silicon/robot/proc/setup_communicator() if (!communicator) - communicator = new/obj/item/device/communicator/integrated(src) + communicator = new/obj/item/communicator/integrated(src) communicator.register_device(name, "[modtype] [braintype]") //If there's an MMI in the robot, have it ejected when the mob goes away. --NEO @@ -293,7 +293,7 @@ var/turf/T = get_turf(loc)//To hopefully prevent run time errors. if(T) mmi.loc = T if(mmi.brainmob) - var/obj/item/weapon/robot_module/M = locate() in contents + var/obj/item/robot_module/M = locate() in contents if(M) mmi.brainmob.languages = M.original_languages else @@ -372,11 +372,11 @@ notify_ai(ROBOT_NOTIFICATION_NEW_MODULE, module.name) /mob/living/silicon/robot/proc/update_braintype() - if(istype(mmi, /obj/item/device/mmi/digital/posibrain)) + if(istype(mmi, /obj/item/mmi/digital/posibrain)) braintype = BORG_BRAINTYPE_POSI - else if(istype(mmi, /obj/item/device/mmi/digital/robot)) + else if(istype(mmi, /obj/item/mmi/digital/robot)) braintype = BORG_BRAINTYPE_DRONE - else if(istype(mmi, /obj/item/device/mmi/inert/ai_remote)) + else if(istype(mmi, /obj/item/mmi/inert/ai_remote)) braintype = BORG_BRAINTYPE_AI_SHELL else braintype = BORG_BRAINTYPE_CYBORG @@ -518,7 +518,7 @@ // this function displays jetpack pressure in the stat panel /mob/living/silicon/robot/proc/show_jetpack_pressure() // if you have a jetpack, show the internal tank pressure - var/obj/item/weapon/tank/jetpack/current_jetpack = installed_jetpack() + var/obj/item/tank/jetpack/current_jetpack = installed_jetpack() if (current_jetpack) stat("Internal Atmosphere Info", current_jetpack.name) stat("Tank Pressure", current_jetpack.air_contents.return_pressure()) @@ -527,7 +527,7 @@ // this function returns the robots jetpack, if one is installed /mob/living/silicon/robot/proc/installed_jetpack() if(module) - return (locate(/obj/item/weapon/tank/jetpack) in module.modules) + return (locate(/obj/item/tank/jetpack) in module.modules) return 0 @@ -567,8 +567,8 @@ if(prob(75) && Proj.damage > 0) spark_system.start() return 2 -/mob/living/silicon/robot/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/handcuffs)) // fuck i don't even know why isrobot() in handcuff code isn't working so this will have to do +/mob/living/silicon/robot/attackby(obj/item/W as obj, mob/user as mob) + if (istype(W, /obj/item/handcuffs)) // fuck i don't even know why isrobot() in handcuff code isn't working so this will have to do return if(opened) // Are they trying to insert something? @@ -590,7 +590,7 @@ return - if(istype(W, /obj/item/weapon/implant/restrainingbolt) && !cell) + if(istype(W, /obj/item/implant/restrainingbolt) && !cell) if(bolt) to_chat(user, "There is already a restraining bolt installed in this cyborg.") return @@ -604,7 +604,7 @@ return - if(istype(W, /obj/item/weapon/aiModule)) // Trying to modify laws locally. + if(istype(W, /obj/item/aiModule)) // Trying to modify laws locally. if(!opened) to_chat(user, "You need to open \the [src]'s panel before you can modify them.") return @@ -613,7 +613,7 @@ to_chat(user, "\The [src] is controlled remotely! You cannot upload new laws this way!") return - var/obj/item/weapon/aiModule/M = W + var/obj/item/aiModule/M = W M.install(src, user) return @@ -625,7 +625,7 @@ if(!getBruteLoss()) to_chat(user, "Nothing to fix here!") return - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(WT.remove_fuel(0)) user.setClickCooldown(user.get_attack_speed(WT)) adjustBruteLoss(-30) @@ -705,7 +705,7 @@ opened = 1 update_icon() - else if (istype(W, /obj/item/weapon/cell) && opened) // trying to put a cell inside + else if (istype(W, /obj/item/cell) && opened) // trying to put a cell inside var/datum/robot_component/C = components["power cell"] if(wiresexposed) to_chat(user, "Close the panel first.") @@ -726,7 +726,7 @@ C.brute_damage = 0 C.electronics_damage = 0 - else if (W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/device/multitool)) + else if (W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/multitool)) if (wiresexposed) wires.Interact(user) else @@ -760,7 +760,7 @@ return - else if(istype(W, /obj/item/device/encryptionkey/) && opened) + else if(istype(W, /obj/item/encryptionkey/) && opened) if(radio)//sanityyyyyy radio.attackby(W,user)//GTFO, you have your own procs else @@ -798,7 +798,7 @@ else - if( !(istype(W, /obj/item/device/robotanalyzer) || istype(W, /obj/item/device/healthanalyzer)) ) + if( !(istype(W, /obj/item/robotanalyzer) || istype(W, /obj/item/healthanalyzer)) ) if(W.force > 0) spark_system.start() return ..() @@ -809,7 +809,7 @@ return idcard /mob/living/silicon/robot/get_restraining_bolt() - var/obj/item/weapon/implant/restrainingbolt/RB = bolt + var/obj/item/implant/restrainingbolt/RB = bolt if(istype(RB)) if(!RB.malfunction) @@ -942,7 +942,7 @@ return 1 else if(istype(M, /mob/living/silicon/robot)) var/mob/living/silicon/robot/R = M - if(check_access(R.get_active_hand()) || istype(R.get_active_hand(), /obj/item/weapon/card/robot)) + if(check_access(R.get_active_hand()) || istype(R.get_active_hand(), /obj/item/card/robot)) return 1 return 0 @@ -1476,8 +1476,8 @@ /mob/living/silicon/robot/drop_item() - if(module_active && istype(module_active,/obj/item/weapon/gripper)) - var/obj/item/weapon/gripper/G = module_active + if(module_active && istype(module_active,/obj/item/gripper)) + var/obj/item/gripper/G = module_active G.drop_item_nm() /mob/living/silicon/robot/disable_spoiler_vision() @@ -1533,7 +1533,7 @@ //RIDING /datum/riding/dogborg - keytype = /obj/item/weapon/material/twohanded/riding_crop // Crack! + keytype = /obj/item/material/twohanded/riding_crop // Crack! nonhuman_key_exemption = FALSE // If true, nonhumans who can't hold keys don't need them, like borgs and simplemobs. key_name = "a riding crop" // What the 'keys' for the thing being rided on would be called. only_one_driver = TRUE // If true, only the person in 'front' (first on list of riding mobs) can drive. @@ -1643,7 +1643,7 @@ // Most of the advanced ones, we can easily check, but a few special cases exist and need to be handled specially /mob/living/silicon/robot/proc/has_advanced_upgrade(var/given_type) if(given_type == /obj/item/borg/upgrade/advanced/bellysizeupgrade) - var/obj/item/device/dogborg/sleeper/T = has_upgrade_module(/obj/item/device/dogborg/sleeper) + var/obj/item/dogborg/sleeper/T = has_upgrade_module(/obj/item/dogborg/sleeper) if(T && T.upgraded_capacity) return T else if(!T) @@ -1651,11 +1651,11 @@ else return FALSE if(given_type == /obj/item/borg/upgrade/advanced/jetpack) - return has_upgrade_module(/obj/item/weapon/tank/jetpack/carbondioxide) + return has_upgrade_module(/obj/item/tank/jetpack/carbondioxide) if(given_type == /obj/item/borg/upgrade/advanced/advhealth) - return has_upgrade_module(/obj/item/device/healthanalyzer/advanced) + return has_upgrade_module(/obj/item/healthanalyzer/advanced) if(given_type == /obj/item/borg/upgrade/advanced/sizegun) - return has_upgrade_module(/obj/item/weapon/gun/energy/sizegun/mounted) + return has_upgrade_module(/obj/item/gun/energy/sizegun/mounted) return null // Do we support specific upgrades? @@ -1665,7 +1665,7 @@ // Most of the restricted ones, we can easily check, but a few special cases exist and need to be handled specially /mob/living/silicon/robot/proc/has_restricted_upgrade(var/given_type) if(given_type == /obj/item/borg/upgrade/restricted/bellycapupgrade) - var/obj/item/device/dogborg/sleeper/T = has_upgrade_module(/obj/item/device/dogborg/sleeper) + var/obj/item/dogborg/sleeper/T = has_upgrade_module(/obj/item/dogborg/sleeper) if(T && T.compactor) return T else if(!T) @@ -1673,7 +1673,7 @@ else return FALSE if(given_type == /obj/item/borg/upgrade/restricted/tasercooler) - var/obj/item/weapon/gun/energy/taser/mounted/cyborg/T = has_upgrade_module(/obj/item/weapon/gun/energy/taser/mounted/cyborg) + var/obj/item/gun/energy/taser/mounted/cyborg/T = has_upgrade_module(/obj/item/gun/energy/taser/mounted/cyborg) if(T && T.recharge_time <= 2) return T else if(!T) @@ -1681,17 +1681,17 @@ else return FALSE if(given_type == /obj/item/borg/upgrade/restricted/advrped) - return has_upgrade_module(/obj/item/weapon/storage/part_replacer/adv) + return has_upgrade_module(/obj/item/storage/part_replacer/adv) if(given_type == /obj/item/borg/upgrade/restricted/diamonddrill) - return has_upgrade_module(/obj/item/weapon/pickaxe/diamonddrill) + return has_upgrade_module(/obj/item/pickaxe/diamonddrill) if(given_type == /obj/item/borg/upgrade/restricted/pka) - return has_upgrade_module(/obj/item/weapon/gun/energy/kinetic_accelerator/cyborg) + return has_upgrade_module(/obj/item/gun/energy/kinetic_accelerator/cyborg) return null // Check if we have any non production upgrades /mob/living/silicon/robot/proc/has_no_prod_upgrade(var/given_type) if(given_type == /obj/item/borg/upgrade/no_prod/toygun) - return has_upgrade_module(/obj/item/weapon/gun/projectile/cyborgtoy) + return has_upgrade_module(/obj/item/gun/projectile/cyborgtoy) if(given_type == /obj/item/borg/upgrade/no_prod/vision_xray) return has_upgrade_module(/obj/item/borg/sight/xray) if(given_type == /obj/item/borg/upgrade/no_prod/vision_thermal) diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index 59c2c6e8750..c602ec1723e 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -1,5 +1,5 @@ //A portable analyzer, for research borgs. This is better then giving them a gripper which can hold anything and letting them use the normal analyzer. -/obj/item/weapon/portable_destructive_analyzer +/obj/item/portable_destructive_analyzer name = "Portable Destructive Analyzer" icon = 'icons/obj/items.dmi' icon_state = "portable_analyzer" @@ -10,13 +10,13 @@ var/datum/research/techonly/files //The device uses the same datum structure as the R&D computer/server. //This analyzer can only store tech levels, however. - var/obj/item/weapon/loaded_item //What is currently inside the analyzer. + var/obj/item/loaded_item //What is currently inside the analyzer. -/obj/item/weapon/portable_destructive_analyzer/New() +/obj/item/portable_destructive_analyzer/New() ..() files = new /datum/research/techonly(src) //Setup the research data holder. -/obj/item/weapon/portable_destructive_analyzer/attack_self(user as mob) +/obj/item/portable_destructive_analyzer/attack_self(user as mob) var/response = tgui_alert(user, "Analyzing the item inside will *DESTROY* the item for good.\n\ Syncing to the research server will send the data that is stored inside to research.\n\ Ejecting will place the loaded item onto the floor.", @@ -80,7 +80,7 @@ to_chat(user, "The [src] is already empty.") -/obj/item/weapon/portable_destructive_analyzer/afterattack(var/atom/target, var/mob/living/user, proximity) +/obj/item/portable_destructive_analyzer/afterattack(var/atom/target, var/mob/living/user, proximity) if(!target) return if(!proximity) @@ -100,13 +100,13 @@ flick("portable_analyzer_load", src) icon_state = "portable_analyzer_full" -/obj/item/weapon/portable_scanner +/obj/item/portable_scanner name = "Portable Resonant Analyzer" icon = 'icons/obj/items.dmi' icon_state = "portable_scanner" desc = "An advanced scanning device used for analyzing objects without completely annihilating them for science. Unfortunately, it has no connection to any database like its angrier cousin." -/obj/item/weapon/portable_scanner/afterattack(var/atom/target, var/mob/living/user, proximity) +/obj/item/portable_scanner/afterattack(var/atom/target, var/mob/living/user, proximity) if(!target) return if(!proximity) @@ -124,45 +124,45 @@ to_chat(user, "\The [I] cannot be scanned by \the [src].") //This is used to unlock other borg covers. -/obj/item/weapon/card/robot //This is not a child of id cards, as to avoid dumb typechecks on computers. +/obj/item/card/robot //This is not a child of id cards, as to avoid dumb typechecks on computers. name = "access code transmission device" icon_state = "id-robot" desc = "A circuit grafted onto the bottom of an ID card. It is used to transmit access codes into other robot chassis, \ allowing you to lock and unlock other robots' panels." var/dummy_card = null - var/dummy_card_type = /obj/item/weapon/card/id/science/roboticist/dummy_cyborg + var/dummy_card_type = /obj/item/card/id/science/roboticist/dummy_cyborg -/obj/item/weapon/card/robot/Initialize() +/obj/item/card/robot/Initialize() . = ..() dummy_card = new dummy_card_type(src) -/obj/item/weapon/card/robot/Destroy() +/obj/item/card/robot/Destroy() qdel(dummy_card) dummy_card = null ..() -/obj/item/weapon/card/robot/GetID() +/obj/item/card/robot/GetID() return dummy_card -/obj/item/weapon/card/robot/syndi - dummy_card_type = /obj/item/weapon/card/id/syndicate/dummy_cyborg +/obj/item/card/robot/syndi + dummy_card_type = /obj/item/card/id/syndicate/dummy_cyborg -/obj/item/weapon/card/id/science/roboticist/dummy_cyborg +/obj/item/card/id/science/roboticist/dummy_cyborg access = list(access_robotics) -/obj/item/weapon/card/id/syndicate/dummy_cyborg/Initialize() +/obj/item/card/id/syndicate/dummy_cyborg/Initialize() . = ..() access |= access_robotics //A harvest item for serviceborgs. -/obj/item/weapon/robot_harvester +/obj/item/robot_harvester name = "auto harvester" desc = "A hand-held harvest tool that resembles a sickle. It uses energy to cut plant matter very efficently." icon = 'icons/obj/weapons.dmi' icon_state = "autoharvester" -/obj/item/weapon/robot_harvester/afterattack(var/atom/target, var/mob/living/user, proximity) +/obj/item/robot_harvester/afterattack(var/atom/target, var/mob/living/user, proximity) if(!target) return if(!proximity) @@ -180,11 +180,11 @@ // Click on table to unload, click on item to load. Otherwise works identically to a tray. // Unlike the base item "tray", robotrays ONLY pick up food, drinks and condiments. -/obj/item/weapon/tray/robotray +/obj/item/tray/robotray name = "RoboTray" desc = "An autoloading tray specialized for carrying refreshments." -/obj/item/weapon/tray/robotray/afterattack(atom/target, mob/user as mob, proximity) +/obj/item/tray/robotray/afterattack(atom/target, mob/user as mob, proximity) if(!proximity) return if ( !target ) @@ -198,7 +198,7 @@ var addedSomething = 0 - for(var/obj/item/weapon/reagent_containers/food/I in pickup) + for(var/obj/item/reagent_containers/food/I in pickup) if( I != src && !I.anchored && !istype(I, /obj/item/clothing/under) && !istype(I, /obj/item/clothing/suit) && !istype(I, /obj/item/projectile) ) @@ -269,12 +269,12 @@ // A special pen for service droids. Can be toggled to switch between normal writting mode, and paper rename mode // Allows service droids to rename paper items. -/obj/item/weapon/pen/robopen +/obj/item/pen/robopen desc = "A black ink printing attachment with a paper naming mode." name = "Printing Pen" var/mode = 1 -/obj/item/weapon/pen/robopen/attack_self(mob/user as mob) +/obj/item/pen/robopen/attack_self(mob/user as mob) var/choice = tgui_alert(usr, "Would you like to change colour or mode?", "Change What?", list("Colour","Mode","Cancel")) if(!choice || choice == "Cancel") @@ -300,7 +300,7 @@ // Copied over from paper's rename verb // see code\modules\paperwork\paper.dm line 62 -/obj/item/weapon/pen/robopen/proc/RenamePaper(mob/user, obj/item/weapon/paper/paper) +/obj/item/pen/robopen/proc/RenamePaper(mob/user, obj/item/paper/paper) if ( !user || !paper ) return var/n_name = sanitizeSafe(tgui_input_text(user, "What would you like to label the paper?", "Paper Labelling", null, 32), 32) @@ -315,7 +315,7 @@ return //TODO: Add prewritten forms to dispense when you work out a good way to store the strings. -/obj/item/weapon/form_printer +/obj/item/form_printer name = "paperwork printer" //name = "paper dispenser" icon = 'icons/obj/bureaucracy.dmi' @@ -326,10 +326,10 @@ ) item_state = "sheet-metal" -/obj/item/weapon/form_printer/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/form_printer/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) return -/obj/item/weapon/form_printer/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag, params) +/obj/item/form_printer/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag, params) if(!target || !flag) return @@ -337,10 +337,10 @@ if(istype(target,/obj/structure/table)) deploy_paper(get_turf(target)) -/obj/item/weapon/form_printer/attack_self(mob/user as mob) +/obj/item/form_printer/attack_self(mob/user as mob) deploy_paper() -/obj/item/weapon/form_printer/proc/deploy_paper() +/obj/item/form_printer/proc/deploy_paper() var/choice = tgui_alert(usr, "Would you like dispense and empty page or print a form?", "Dispense", list("Paper","Form")) if(!choice || choice == "Cancel") return @@ -350,7 +350,7 @@ spawn(22) var/turf/T = get_turf(src) T.visible_message("\The [src.loc] dispenses a sheet of crisp white paper.") - new /obj/item/weapon/paper(T) + new /obj/item/paper(T) if ("Form") var/list/content = print_form() if(!content) @@ -360,9 +360,9 @@ spawn(22) var/turf/T = get_turf(src) T.visible_message("\The [src.loc] dispenses an official form to fill.") - new /obj/item/weapon/paper(T, content[1], content[2]) + new /obj/item/paper(T, content[1], content[2]) -/obj/item/weapon/form_printer/proc/print_form() +/obj/item/form_printer/proc/print_form() var/list/paper_forms = list("Empty", "Command", "Security", "Supply", "Science", "Medical", "Engineering", "Service", "Exploration", "Event", "Other", "Mercenary") var/list/command_paper_forms = list("COM-0002: Dismissal Order", "COM-0003: Job Change Request", "COM-0004: ID Replacement Request", "COM-0005: Access Change Order", "COM-0006: Formal Complaint", "COM-0009: Visitor Permit", "COM-0012: Personnel Request Form", "COM-0013: Employee of the Month Nomination Form") var/list/security_paper_forms = list("SEC-1001: Shift-Start Checklist", "SEC-1002: Patrol Assignment Sheet", "SEC-1003: Incident Report", "SEC-1004: Arrest Report", "SEC-1005: Arrest Warrant", "SEC-1006: Search Warrant", "SEC-1007: Forensics Investigation Report", "SEC-1008: Interrogation Report", "SEC-1009: Witness Statement", "SEC-1010: Armory Inventory", "SEC-1011: Armory Equipment Request", "SEC-1012: Armory Equipment Deployment", "SEC-1013: Weapon Permit", "SEC-1014: Injunction", "SEC-1015: Deputization Waiver") @@ -442,7 +442,7 @@ return return list(select_form(split[1], split[2]), split[1] + ": " + split[2]) -/obj/item/weapon/form_printer/proc/select_form(paperid, name) +/obj/item/form_printer/proc/select_form(paperid, name) var/content = "" var/revision = "" switch(paperid) @@ -587,7 +587,7 @@ revision = @{"[field]"} return create_form(paperid, name, content, revision) -/obj/item/weapon/form_printer/proc/create_form(paperid, name, content, revision) +/obj/item/form_printer/proc/create_form(paperid, name, content, revision) var/header = "\[center]\[br]\[small]" + paperid + "\[/small]\[br]\[h1]\[u]" + name + "\[/u]\[/h1]\[br]\[logo]\[br]\[br]\[station]\[br]\[/center]\[br]\[hr]\[br]\[b]Station Time:\[/b] \[date], \[time]\[br]\[br]" var/footer = "\[hr]\[br]\[center]\[small]Stamp here.\[/small]\[/center]\[br]\[small]" + revision + "\[/small]" return header + content + footer @@ -661,7 +661,7 @@ icon = 'icons/obj/decals.dmi' icon_state = "shock" -/obj/item/weapon/inflatable_dispenser +/obj/item/inflatable_dispenser name = "inflatables dispenser" desc = "Hand-held device which allows rapid deployment and removal of inflatables." icon = 'icons/obj/storage.dmi' @@ -674,23 +674,23 @@ var/max_doors = 2 var/mode = 0 // 0 - Walls 1 - Doors -/obj/item/weapon/inflatable_dispenser/robot +/obj/item/inflatable_dispenser/robot w_class = ITEMSIZE_HUGE stored_walls = 10 stored_doors = 5 max_walls = 10 max_doors = 5 -/obj/item/weapon/inflatable_dispenser/examine(var/mob/user) +/obj/item/inflatable_dispenser/examine(var/mob/user) . = ..() . += "It has [stored_walls] wall segment\s and [stored_doors] door segment\s stored." . += "It is set to deploy [mode ? "doors" : "walls"]" -/obj/item/weapon/inflatable_dispenser/attack_self() +/obj/item/inflatable_dispenser/attack_self() mode = !mode to_chat(usr, "You set \the [src] to deploy [mode ? "doors" : "walls"].") -/obj/item/weapon/inflatable_dispenser/afterattack(var/atom/A, var/mob/user) +/obj/item/inflatable_dispenser/afterattack(var/atom/A, var/mob/user) ..(A, user) if(!user) return @@ -702,7 +702,7 @@ if(istype(A, /obj/item/inflatable) || istype(A, /obj/structure/inflatable)) pick_up(A, user) -/obj/item/weapon/inflatable_dispenser/proc/try_deploy_inflatable(var/turf/T, var/mob/living/user) +/obj/item/inflatable_dispenser/proc/try_deploy_inflatable(var/turf/T, var/mob/living/user) if(mode) // Door deployment if(!stored_doors) to_chat(user, "\The [src] is out of doors!") @@ -724,7 +724,7 @@ playsound(T, 'sound/items/zip.ogg', 75, 1) to_chat(user, "You deploy the inflatable [mode ? "door" : "wall"]!") -/obj/item/weapon/inflatable_dispenser/proc/pick_up(var/obj/A, var/mob/living/user) +/obj/item/inflatable_dispenser/proc/pick_up(var/obj/A, var/mob/living/user) if(istype(A, /obj/structure/inflatable)) if(!istype(A, /obj/structure/inflatable/door)) if(stored_walls >= max_walls) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/event.dm b/code/modules/mob/living/silicon/robot/robot_modules/event.dm index 8bd5c505ed2..cfa11fd7199 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/event.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/event.dm @@ -1,34 +1,34 @@ /* Other, unaffiliated modules */ // The module that borgs on the surface have. Generally has a lot of useful tools in exchange for questionable loyalty to the crew. -/obj/item/weapon/robot_module/robot/lost +/obj/item/robot_module/robot/lost name = "lost robot module" hide_on_manifest = TRUE -/obj/item/weapon/robot_module/robot/lost/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/lost/create_equipment(var/mob/living/silicon/robot/robot) ..() // Sec - src.modules += new /obj/item/weapon/melee/baton/shocker/robot(src) - src.modules += new /obj/item/weapon/handcuffs/cyborg(src) + src.modules += new /obj/item/melee/baton/shocker/robot(src) + src.modules += new /obj/item/handcuffs/cyborg(src) src.modules += new /obj/item/borg/combat/shield(src) // Med - src.modules += new /obj/item/device/healthanalyzer(src) - src.modules += new /obj/item/weapon/shockpaddles/robot(src) - src.modules += new /obj/item/weapon/reagent_containers/borghypo/lost(src) + src.modules += new /obj/item/healthanalyzer(src) + src.modules += new /obj/item/shockpaddles/robot(src) + src.modules += new /obj/item/reagent_containers/borghypo/lost(src) // Engi - src.modules += new /obj/item/weapon/weldingtool/electric/mounted(src) - src.modules += new /obj/item/weapon/tool/screwdriver/cyborg(src) - src.modules += new /obj/item/weapon/tool/wrench/cyborg(src) - src.modules += new /obj/item/weapon/tool/wirecutters/cyborg(src) - src.modules += new /obj/item/device/multitool(src) + src.modules += new /obj/item/weldingtool/electric/mounted(src) + src.modules += new /obj/item/tool/screwdriver/cyborg(src) + src.modules += new /obj/item/tool/wrench/cyborg(src) + src.modules += new /obj/item/tool/wirecutters/cyborg(src) + src.modules += new /obj/item/multitool(src) // Sci - src.modules += new /obj/item/device/robotanalyzer(src) + src.modules += new /obj/item/robotanalyzer(src) // Potato - src.emag += new /obj/item/weapon/gun/energy/retro/mounted(src) + src.emag += new /obj/item/gun/energy/retro/mounted(src) var/datum/matter_synth/wire = new /datum/matter_synth/wire() synths += wire @@ -37,37 +37,37 @@ C.synths = list(wire) src.modules += C - src.modules += new /obj/item/device/dogborg/sleeper/lost(src) - src.modules += new /obj/item/weapon/dogborg/pounce(src) + src.modules += new /obj/item/dogborg/sleeper/lost(src) + src.modules += new /obj/item/dogborg/pounce(src) -/obj/item/weapon/robot_module/robot/gravekeeper +/obj/item/robot_module/robot/gravekeeper name = "gravekeeper robot module" hide_on_manifest = TRUE -/obj/item/weapon/robot_module/robot/gravekeeper/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/gravekeeper/create_equipment(var/mob/living/silicon/robot/robot) ..() // For fending off animals and looters - src.modules += new /obj/item/weapon/melee/baton/shocker/robot(src) + src.modules += new /obj/item/melee/baton/shocker/robot(src) src.modules += new /obj/item/borg/combat/shield(src) // For repairing gravemarkers - src.modules += new /obj/item/weapon/weldingtool/electric/mounted(src) - src.modules += new /obj/item/weapon/tool/screwdriver/cyborg(src) - src.modules += new /obj/item/weapon/tool/wrench/cyborg(src) + src.modules += new /obj/item/weldingtool/electric/mounted(src) + src.modules += new /obj/item/tool/screwdriver/cyborg(src) + src.modules += new /obj/item/tool/wrench/cyborg(src) // For growing flowers - src.modules += new /obj/item/weapon/material/minihoe(src) - src.modules += new /obj/item/weapon/material/knife/machete/hatchet(src) - src.modules += new /obj/item/device/analyzer/plant_analyzer(src) - src.modules += new /obj/item/weapon/storage/bag/plants(src) - src.modules += new /obj/item/weapon/robot_harvester(src) + src.modules += new /obj/item/material/minihoe(src) + src.modules += new /obj/item/material/knife/machete/hatchet(src) + src.modules += new /obj/item/analyzer/plant_analyzer(src) + src.modules += new /obj/item/storage/bag/plants(src) + src.modules += new /obj/item/robot_harvester(src) // For digging and beautifying graves - src.modules += new /obj/item/weapon/shovel(src) - src.modules += new /obj/item/weapon/gripper/gravekeeper(src) + src.modules += new /obj/item/shovel(src) + src.modules += new /obj/item/gripper/gravekeeper(src) // For really persistent looters - src.emag += new /obj/item/weapon/gun/energy/retro/mounted(src) + src.emag += new /obj/item/gun/energy/retro/mounted(src) var/datum/matter_synth/wood = new /datum/matter_synth/wood(25000) synths += wood @@ -77,5 +77,5 @@ src.modules += W // For uwu - src.modules += new /obj/item/device/dogborg/sleeper/compactor/generic(src) - src.emag += new /obj/item/weapon/dogborg/pounce(src) \ No newline at end of file + src.modules += new /obj/item/dogborg/sleeper/compactor/generic(src) + src.emag += new /obj/item/dogborg/pounce(src) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index 3605dd4b99c..9e5bb60b932 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -1,23 +1,23 @@ var/global/list/robot_modules = list( - "Standard" = /obj/item/weapon/robot_module/robot/standard, - "Service" = /obj/item/weapon/robot_module/robot/clerical/butler, - "Clerical" = /obj/item/weapon/robot_module/robot/clerical/general, - "Research" = /obj/item/weapon/robot_module/robot/research, - "Miner" = /obj/item/weapon/robot_module/robot/miner, - "Crisis" = /obj/item/weapon/robot_module/robot/medical/crisis, - "Surgeon" = /obj/item/weapon/robot_module/robot/medical/surgeon, - "Security" = /obj/item/weapon/robot_module/robot/security/general, - "Combat" = /obj/item/weapon/robot_module/robot/security/combat, - "Engineering" = /obj/item/weapon/robot_module/robot/engineering, - "Janitor" = /obj/item/weapon/robot_module/robot/janitor, - "Gravekeeper" = /obj/item/weapon/robot_module/robot/gravekeeper, - "Lost" = /obj/item/weapon/robot_module/robot/lost, - "Protector" = /obj/item/weapon/robot_module/robot/syndicate/protector, - "Mechanist" = /obj/item/weapon/robot_module/robot/syndicate/mechanist, - "Combat Medic" = /obj/item/weapon/robot_module/robot/syndicate/combat_medic + "Standard" = /obj/item/robot_module/robot/standard, + "Service" = /obj/item/robot_module/robot/clerical/butler, + "Clerical" = /obj/item/robot_module/robot/clerical/general, + "Research" = /obj/item/robot_module/robot/research, + "Miner" = /obj/item/robot_module/robot/miner, + "Crisis" = /obj/item/robot_module/robot/medical/crisis, + "Surgeon" = /obj/item/robot_module/robot/medical/surgeon, + "Security" = /obj/item/robot_module/robot/security/general, + "Combat" = /obj/item/robot_module/robot/security/combat, + "Engineering" = /obj/item/robot_module/robot/engineering, + "Janitor" = /obj/item/robot_module/robot/janitor, + "Gravekeeper" = /obj/item/robot_module/robot/gravekeeper, + "Lost" = /obj/item/robot_module/robot/lost, + "Protector" = /obj/item/robot_module/robot/syndicate/protector, + "Mechanist" = /obj/item/robot_module/robot/syndicate/mechanist, + "Combat Medic" = /obj/item/robot_module/robot/syndicate/combat_medic ) -/obj/item/weapon/robot_module +/obj/item/robot_module name = "robot module" icon = 'icons/obj/module.dmi' icon_state = "std_module" @@ -54,10 +54,10 @@ var/global/list/robot_modules = list( var/list/original_languages = list() var/list/added_networks = list() -/obj/item/weapon/robot_module/proc/hide_on_manifest() +/obj/item/robot_module/proc/hide_on_manifest() . = hide_on_manifest -/obj/item/weapon/robot_module/New(var/mob/living/silicon/robot/R) +/obj/item/robot_module/New(var/mob/living/silicon/robot/R) ..() R.module = src @@ -82,10 +82,10 @@ var/global/list/robot_modules = list( for(var/obj/item/I in modules) I.canremove = FALSE -/obj/item/weapon/robot_module/proc/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/proc/create_equipment(var/mob/living/silicon/robot/robot) return -/obj/item/weapon/robot_module/proc/Reset(var/mob/living/silicon/robot/R) +/obj/item/robot_module/proc/Reset(var/mob/living/silicon/robot/R) remove_camera_networks(R) remove_languages(R) remove_subsystems(R) @@ -97,7 +97,7 @@ var/global/list/robot_modules = list( R.scrubbing = FALSE -/obj/item/weapon/robot_module/Destroy() +/obj/item/robot_module/Destroy() for(var/module in modules) qdel(module) for(var/emg in emag) @@ -109,7 +109,7 @@ var/global/list/robot_modules = list( emag.Cut() return ..() -/obj/item/weapon/robot_module/emp_act(severity) +/obj/item/robot_module/emp_act(severity) if(modules) for(var/obj/O in modules) O.emp_act(severity) @@ -122,21 +122,21 @@ var/global/list/robot_modules = list( ..() return -/obj/item/weapon/robot_module/proc/respawn_consumable(var/mob/living/silicon/robot/R, var/rate) +/obj/item/robot_module/proc/respawn_consumable(var/mob/living/silicon/robot/R, var/rate) if(!synths || !synths.len) return for(var/datum/matter_synth/T in synths) T.add_charge(T.recharge_rate * rate) -/obj/item/weapon/robot_module/proc/rebuild()//Rebuilds the list so it's possible to add/remove items from the module +/obj/item/robot_module/proc/rebuild()//Rebuilds the list so it's possible to add/remove items from the module var/list/temp_list = modules modules = list() for(var/obj/O in temp_list) if(O) modules += O -/obj/item/weapon/robot_module/proc/add_languages(var/mob/living/silicon/robot/R) +/obj/item/robot_module/proc/add_languages(var/mob/living/silicon/robot/R) // Stores the languages as they were before receiving the module, and whether they could be synthezized. for(var/datum/language/language_datum in R.languages) original_languages[language_datum] = (language_datum in R.speech_synthesizer_langs) @@ -144,7 +144,7 @@ var/global/list/robot_modules = list( for(var/language in languages) R.add_language(language, languages[language]) -/obj/item/weapon/robot_module/proc/remove_languages(var/mob/living/silicon/robot/R) +/obj/item/robot_module/proc/remove_languages(var/mob/living/silicon/robot/R) // Clear all added languages, whether or not we originally had them. for(var/language in languages) R.remove_language(language) @@ -154,33 +154,33 @@ var/global/list/robot_modules = list( R.add_language(original_language, original_languages[original_language]) original_languages.Cut() -/obj/item/weapon/robot_module/proc/add_camera_networks(var/mob/living/silicon/robot/R) +/obj/item/robot_module/proc/add_camera_networks(var/mob/living/silicon/robot/R) if(R.camera && (NETWORK_ROBOTS in R.camera.network)) for(var/network in networks) if(!(network in R.camera.network)) R.camera.add_network(network) added_networks |= network -/obj/item/weapon/robot_module/proc/remove_camera_networks(var/mob/living/silicon/robot/R) +/obj/item/robot_module/proc/remove_camera_networks(var/mob/living/silicon/robot/R) if(R.camera) R.camera.remove_networks(added_networks) added_networks.Cut() -/obj/item/weapon/robot_module/proc/add_subsystems(var/mob/living/silicon/robot/R) +/obj/item/robot_module/proc/add_subsystems(var/mob/living/silicon/robot/R) R.verbs |= subsystems -/obj/item/weapon/robot_module/proc/remove_subsystems(var/mob/living/silicon/robot/R) +/obj/item/robot_module/proc/remove_subsystems(var/mob/living/silicon/robot/R) R.verbs -= subsystems -/obj/item/weapon/robot_module/proc/apply_status_flags(var/mob/living/silicon/robot/R) +/obj/item/robot_module/proc/apply_status_flags(var/mob/living/silicon/robot/R) if(!can_be_pushed) R.status_flags &= ~CANPUSH -/obj/item/weapon/robot_module/proc/remove_status_flags(var/mob/living/silicon/robot/R) +/obj/item/robot_module/proc/remove_status_flags(var/mob/living/silicon/robot/R) if(!can_be_pushed) R.status_flags |= CANPUSH -/obj/item/weapon/robot_module/proc/handle_shell(var/mob/living/silicon/robot/R) +/obj/item/robot_module/proc/handle_shell(var/mob/living/silicon/robot/R) if(R.braintype == BORG_BRAINTYPE_AI_SHELL) channels = list( CHANNEL_MEDICAL = 1, @@ -193,37 +193,37 @@ var/global/list/robot_modules = list( CHANNEL_EXPLORATION = 1 ) -/obj/item/weapon/robot_module/robot/New(var/mob/living/silicon/robot/R) +/obj/item/robot_module/robot/New(var/mob/living/silicon/robot/R) ..() if(R.sprite_datum) R.sprite_datum.do_equipment_glamour(src) // Cyborgs (non-drones), default loadout. This will be given to every module. -/obj/item/weapon/robot_module/robot/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/create_equipment(var/mob/living/silicon/robot/robot) ..() - src.modules += new /obj/item/device/gps/robot(src) - src.modules += new /obj/item/device/boop_module(src) - src.modules += new /obj/item/device/robot_tongue(src) - src.modules += new /obj/item/device/flash/robot(src) - src.modules += new /obj/item/weapon/extinguisher(src) - src.modules += new /obj/item/weapon/tool/crowbar/cyborg(src) + src.modules += new /obj/item/gps/robot(src) + src.modules += new /obj/item/boop_module(src) + src.modules += new /obj/item/robot_tongue(src) + src.modules += new /obj/item/flash/robot(src) + src.modules += new /obj/item/extinguisher(src) + src.modules += new /obj/item/tool/crowbar/cyborg(src) -/obj/item/weapon/robot_module/robot/standard +/obj/item/robot_module/robot/standard name = "standard robot module" pto_type = PTO_CIVILIAN -/obj/item/weapon/robot_module/robot/standard/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/standard/create_equipment(var/mob/living/silicon/robot/robot) ..() - src.modules += new /obj/item/weapon/tool/wrench/cyborg(src) - src.modules += new /obj/item/device/healthanalyzer(src) - src.modules += new /obj/item/weapon/melee/baton/loaded(src) - src.emag += new /obj/item/weapon/melee/energy/sword(src) + src.modules += new /obj/item/tool/wrench/cyborg(src) + src.modules += new /obj/item/healthanalyzer(src) + src.modules += new /obj/item/melee/baton/loaded(src) + src.emag += new /obj/item/melee/energy/sword(src) - src.modules += new /obj/item/device/dogborg/sleeper/compactor/generic(src) - src.emag += new /obj/item/weapon/dogborg/pounce(src) + src.modules += new /obj/item/dogborg/sleeper/compactor/generic(src) + src.emag += new /obj/item/dogborg/pounce(src) -/obj/item/weapon/robot_module/robot/medical +/obj/item/robot_module/robot/medical name = "medical robot module" channels = list(CHANNEL_MEDICAL = 1) networks = list(NETWORK_MEDICAL) @@ -231,33 +231,33 @@ var/global/list/robot_modules = list( pto_type = PTO_MEDICAL supported_upgrades = list(/obj/item/borg/upgrade/restricted/bellycapupgrade) -/obj/item/weapon/robot_module/robot/medical/surgeon +/obj/item/robot_module/robot/medical/surgeon name = "surgeon robot module" -/obj/item/weapon/robot_module/robot/medical/surgeon/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/medical/surgeon/create_equipment(var/mob/living/silicon/robot/robot) ..() - src.modules += new /obj/item/device/healthanalyzer(src) - src.modules += new /obj/item/device/sleevemate(src) - src.modules += new /obj/item/weapon/reagent_containers/borghypo/surgeon(src) - src.modules += new /obj/item/weapon/autopsy_scanner(src) - src.modules += new /obj/item/weapon/surgical/scalpel/cyborg(src) - src.modules += new /obj/item/weapon/surgical/hemostat/cyborg(src) - src.modules += new /obj/item/weapon/surgical/retractor/cyborg(src) - src.modules += new /obj/item/weapon/surgical/cautery/cyborg(src) - src.modules += new /obj/item/weapon/surgical/bonegel/cyborg(src) - src.modules += new /obj/item/weapon/surgical/FixOVein/cyborg(src) - src.modules += new /obj/item/weapon/surgical/bonesetter/cyborg(src) - src.modules += new /obj/item/weapon/surgical/circular_saw/cyborg(src) - src.modules += new /obj/item/weapon/surgical/surgicaldrill/cyborg(src) - src.modules += new /obj/item/weapon/surgical/bioregen/cyborg(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/weapon/reagent_containers/syringe(src) + src.modules += new /obj/item/healthanalyzer(src) + src.modules += new /obj/item/sleevemate(src) + src.modules += new /obj/item/reagent_containers/borghypo/surgeon(src) + src.modules += new /obj/item/autopsy_scanner(src) + src.modules += new /obj/item/surgical/scalpel/cyborg(src) + src.modules += new /obj/item/surgical/hemostat/cyborg(src) + src.modules += new /obj/item/surgical/retractor/cyborg(src) + src.modules += new /obj/item/surgical/cautery/cyborg(src) + src.modules += new /obj/item/surgical/bonegel/cyborg(src) + src.modules += new /obj/item/surgical/FixOVein/cyborg(src) + src.modules += new /obj/item/surgical/bonesetter/cyborg(src) + src.modules += new /obj/item/surgical/circular_saw/cyborg(src) + src.modules += new /obj/item/surgical/surgicaldrill/cyborg(src) + src.modules += new /obj/item/surgical/bioregen/cyborg(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/reagent_containers/syringe(src) - var/obj/item/weapon/reagent_containers/spray/PS = new /obj/item/weapon/reagent_containers/spray(src) + var/obj/item/reagent_containers/spray/PS = new /obj/item/reagent_containers/spray(src) src.emag += PS PS.reagents.add_reagent("pacid", 250) PS.name = "Polyacid spray" @@ -281,42 +281,42 @@ var/global/list/robot_modules = list( src.modules += B src.modules += O - src.modules += new /obj/item/device/dogborg/sleeper/trauma(src) - src.emag += new /obj/item/weapon/dogborg/pounce(src) + src.modules += new /obj/item/dogborg/sleeper/trauma(src) + src.emag += new /obj/item/dogborg/pounce(src) -/obj/item/weapon/robot_module/robot/medical/surgeon/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) +/obj/item/robot_module/robot/medical/surgeon/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) - var/obj/item/weapon/reagent_containers/syringe/S = locate() in src.modules + var/obj/item/reagent_containers/syringe/S = locate() in src.modules if(S.mode == 2) S.reagents.clear_reagents() S.mode = initial(S.mode) S.desc = initial(S.desc) S.update_icon() - var/obj/item/weapon/reagent_containers/spray/PS = locate() in src.emag + var/obj/item/reagent_containers/spray/PS = locate() in src.emag if(PS) PS.reagents.add_reagent("pacid", 2 * amount) ..() -/obj/item/weapon/robot_module/robot/medical/crisis +/obj/item/robot_module/robot/medical/crisis name = "crisis robot module" -/obj/item/weapon/robot_module/robot/medical/crisis/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/medical/crisis/create_equipment(var/mob/living/silicon/robot/robot) ..() - src.modules += new /obj/item/device/healthanalyzer(src) - src.modules += new /obj/item/device/sleevemate(src) - src.modules += new /obj/item/device/reagent_scanner/adv(src) + src.modules += new /obj/item/healthanalyzer(src) + src.modules += new /obj/item/sleevemate(src) + src.modules += new /obj/item/reagent_scanner/adv(src) src.modules += new /obj/item/roller_holder(src) - src.modules += new /obj/item/weapon/reagent_containers/borghypo/crisis(src) - src.modules += new /obj/item/weapon/reagent_containers/glass/beaker/large/borg(src) - src.modules += new /obj/item/weapon/reagent_containers/dropper/industrial(src) - src.modules += new /obj/item/weapon/reagent_containers/syringe(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/inflatable_dispenser/robot(src) - var/obj/item/weapon/reagent_containers/spray/PS = new /obj/item/weapon/reagent_containers/spray(src) + src.modules += new /obj/item/reagent_containers/borghypo/crisis(src) + src.modules += new /obj/item/reagent_containers/glass/beaker/large/borg(src) + src.modules += new /obj/item/reagent_containers/dropper/industrial(src) + src.modules += new /obj/item/reagent_containers/syringe(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/inflatable_dispenser/robot(src) + var/obj/item/reagent_containers/spray/PS = new /obj/item/reagent_containers/spray(src) src.emag += PS PS.reagents.add_reagent("pacid", 250) PS.name = "Polyacid spray" @@ -340,55 +340,55 @@ var/global/list/robot_modules = list( src.modules += B src.modules += S - src.modules += new /obj/item/device/dogborg/sleeper(src) - src.emag += new /obj/item/weapon/dogborg/pounce(src) //Pounce + src.modules += new /obj/item/dogborg/sleeper(src) + src.emag += new /obj/item/dogborg/pounce(src) //Pounce -/obj/item/weapon/robot_module/robot/medical/crisis/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) +/obj/item/robot_module/robot/medical/crisis/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) - var/obj/item/weapon/reagent_containers/syringe/S = locate() in src.modules + var/obj/item/reagent_containers/syringe/S = locate() in src.modules if(S.mode == 2) S.reagents.clear_reagents() S.mode = initial(S.mode) S.desc = initial(S.desc) S.update_icon() - var/obj/item/weapon/reagent_containers/spray/PS = locate() in src.emag + var/obj/item/reagent_containers/spray/PS = locate() in src.emag if(PS) PS.reagents.add_reagent("pacid", 2 * amount) ..() -/obj/item/weapon/robot_module/robot/engineering +/obj/item/robot_module/robot/engineering name = "engineering robot module" channels = list(CHANNEL_ENGINEERING = 1) networks = list(NETWORK_ENGINEERING) subsystems = list(/mob/living/silicon/proc/subsystem_power_monitor) pto_type = PTO_ENGINEERING -/obj/item/weapon/robot_module/robot/engineering/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/engineering/create_equipment(var/mob/living/silicon/robot/robot) ..() src.modules += new /obj/item/borg/sight/meson(src) - src.modules += new /obj/item/weapon/weldingtool/electric/mounted/cyborg(src) - src.modules += new /obj/item/weapon/tool/screwdriver/cyborg(src) - src.modules += new /obj/item/weapon/tool/wrench/cyborg(src) - src.modules += new /obj/item/weapon/tool/wirecutters/cyborg(src) - src.modules += new /obj/item/device/multitool(src) - src.modules += new /obj/item/device/t_scanner(src) - src.modules += new /obj/item/device/analyzer(src) - src.modules += new /obj/item/device/geiger(src) + src.modules += new /obj/item/weldingtool/electric/mounted/cyborg(src) + src.modules += new /obj/item/tool/screwdriver/cyborg(src) + src.modules += new /obj/item/tool/wrench/cyborg(src) + src.modules += new /obj/item/tool/wirecutters/cyborg(src) + src.modules += new /obj/item/multitool(src) + src.modules += new /obj/item/t_scanner(src) + src.modules += new /obj/item/analyzer(src) + src.modules += new /obj/item/geiger(src) src.modules += new /obj/item/taperoll/engineering(src) - src.modules += new /obj/item/weapon/gripper(src) - src.modules += new /obj/item/weapon/gripper/circuit(src) - src.modules += new /obj/item/device/lightreplacer(src) - src.modules += new /obj/item/weapon/pipe_dispenser(src) - src.modules += new /obj/item/device/floor_painter(src) - src.modules += new /obj/item/weapon/rms(src) - src.modules += new /obj/item/weapon/inflatable_dispenser/robot(src) - src.emag += new /obj/item/weapon/melee/baton/robot/arm(src) - src.modules += new /obj/item/weapon/rcd/electric/mounted/borg(src) - src.modules += new /obj/item/weapon/pickaxe/plasmacutter/borg(src) - src.modules += new /obj/item/weapon/gripper/no_use/loader(src) + src.modules += new /obj/item/gripper(src) + src.modules += new /obj/item/gripper/circuit(src) + src.modules += new /obj/item/lightreplacer(src) + src.modules += new /obj/item/pipe_dispenser(src) + src.modules += new /obj/item/floor_painter(src) + src.modules += new /obj/item/rms(src) + src.modules += new /obj/item/inflatable_dispenser/robot(src) + src.emag += new /obj/item/melee/baton/robot/arm(src) + src.modules += new /obj/item/rcd/electric/mounted/borg(src) + src.modules += new /obj/item/pickaxe/plasmacutter/borg(src) + src.modules += new /obj/item/gripper/no_use/loader(src) var/datum/matter_synth/metal = new /datum/matter_synth/metal(40000) var/datum/matter_synth/glass = new /datum/matter_synth/glass(40000) @@ -404,7 +404,7 @@ var/global/list/robot_modules = list( synths += plastic synths += wire - var/obj/item/weapon/matter_decompiler/MD = new /obj/item/weapon/matter_decompiler(src) + var/obj/item/matter_decompiler/MD = new /obj/item/matter_decompiler(src) MD.metal = metal MD.glass = glass src.modules += MD @@ -453,16 +453,16 @@ var/global/list/robot_modules = list( PL.synths = list(plastic) src.modules += PL - var/obj/item/device/dogborg/sleeper/compactor/decompiler/BD = new /obj/item/device/dogborg/sleeper/compactor/decompiler(src) + var/obj/item/dogborg/sleeper/compactor/decompiler/BD = new /obj/item/dogborg/sleeper/compactor/decompiler(src) BD.metal = metal BD.glass = glass BD.wood = wood BD.plastic = plastic src.modules += BD - src.emag += new /obj/item/weapon/dogborg/pounce(src) + src.emag += new /obj/item/dogborg/pounce(src) -/obj/item/weapon/robot_module/robot/security +/obj/item/robot_module/robot/security name = "security robot module" channels = list(CHANNEL_SECURITY = 1) networks = list(NETWORK_SECURITY) @@ -470,52 +470,52 @@ var/global/list/robot_modules = list( supported_upgrades = list(/obj/item/borg/upgrade/restricted/tasercooler, /obj/item/borg/upgrade/restricted/bellycapupgrade) pto_type = PTO_SECURITY -/obj/item/weapon/robot_module/robot/security/general +/obj/item/robot_module/robot/security/general name = "security robot module" -/obj/item/weapon/robot_module/robot/security/general/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/security/general/create_equipment(var/mob/living/silicon/robot/robot) ..() - src.modules += new /obj/item/weapon/handcuffs/cyborg(src) - src.modules += new /obj/item/weapon/melee/baton/robot(src) - src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg(src) + src.modules += new /obj/item/handcuffs/cyborg(src) + src.modules += new /obj/item/melee/baton/robot(src) + src.modules += new /obj/item/gun/energy/taser/mounted/cyborg(src) src.modules += new /obj/item/taperoll/police(src) - src.modules += new /obj/item/weapon/reagent_containers/spray/pepper(src) - src.modules += new /obj/item/weapon/gripper/security(src) - src.modules += new /obj/item/device/ticket_printer(src) //VOREStation Add - src.emag += new /obj/item/weapon/gun/energy/laser/mounted(src) + src.modules += new /obj/item/reagent_containers/spray/pepper(src) + src.modules += new /obj/item/gripper/security(src) + src.modules += new /obj/item/ticket_printer(src) //VOREStation Add + src.emag += new /obj/item/gun/energy/laser/mounted(src) - src.modules += new /obj/item/device/dogborg/sleeper/K9(src) //Eat criminals. Bring them to the brig. - src.modules += new /obj/item/weapon/dogborg/pounce(src) //Pounce + src.modules += new /obj/item/dogborg/sleeper/K9(src) //Eat criminals. Bring them to the brig. + src.modules += new /obj/item/dogborg/pounce(src) //Pounce -/obj/item/weapon/robot_module/robot/security/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) - var/obj/item/device/flash/F = locate() in src.modules +/obj/item/robot_module/robot/security/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) + var/obj/item/flash/F = locate() in src.modules if(F.broken) F.broken = 0 F.times_used = 0 F.icon_state = "flash" else if(F.times_used) F.times_used-- - var/obj/item/weapon/gun/energy/taser/mounted/cyborg/T = locate() in src.modules + var/obj/item/gun/energy/taser/mounted/cyborg/T = locate() in src.modules if(T.power_supply.charge < T.power_supply.maxcharge) T.power_supply.give(T.charge_cost * amount) T.update_icon() else T.charge_tick = 0 -/obj/item/weapon/robot_module/robot/janitor +/obj/item/robot_module/robot/janitor name = "janitorial robot module" channels = list(CHANNEL_SERVICE = 1) pto_type = PTO_CIVILIAN -/obj/item/weapon/robot_module/robot/janitor/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/janitor/create_equipment(var/mob/living/silicon/robot/robot) ..() - 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/soap/nanotrasen(src) + src.modules += new /obj/item/storage/bag/trash(src) + src.modules += new /obj/item/mop(src) src.modules += new /obj/item/pupscrubber(src) - src.modules += new /obj/item/device/lightreplacer(src) + src.modules += new /obj/item/lightreplacer(src) src.modules += new /obj/item/borg/sight/janitor(src) - var/obj/item/weapon/reagent_containers/spray/LS = new /obj/item/weapon/reagent_containers/spray(src) + var/obj/item/reagent_containers/spray/LS = new /obj/item/reagent_containers/spray(src) src.emag += LS LS.reagents.add_reagent("lube", 250) LS.name = "Lube spray" @@ -553,22 +553,22 @@ var/global/list/robot_modules = list( G.recipes += new/datum/stack_recipe("glass sheet", /obj/item/stack/material/glass, 1, 1, 20) src.modules += G - var/obj/item/device/dogborg/sleeper/compactor/C = new /obj/item/device/dogborg/sleeper/compactor(src) + var/obj/item/dogborg/sleeper/compactor/C = new /obj/item/dogborg/sleeper/compactor(src) C.metal = metal C.glass = glass src.modules += C - src.emag += new /obj/item/weapon/dogborg/pounce(src) //Pounce + src.emag += new /obj/item/dogborg/pounce(src) //Pounce -/obj/item/weapon/robot_module/robot/janitor/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) - var/obj/item/device/lightreplacer/LR = locate() in src.modules +/obj/item/robot_module/robot/janitor/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) + var/obj/item/lightreplacer/LR = locate() in src.modules LR.Charge(R, amount) - var/obj/item/weapon/reagent_containers/spray/LS = locate() in src.emag + var/obj/item/reagent_containers/spray/LS = locate() in src.emag if(LS) LS.reagents.add_reagent("lube", 2 * amount) -/obj/item/weapon/robot_module/robot/clerical +/obj/item/robot_module/robot/clerical name = "service robot module" channels = list( CHANNEL_SERVICE = 1, @@ -595,38 +595,38 @@ var/global/list/robot_modules = list( ) pto_type = PTO_CIVILIAN -/obj/item/weapon/robot_module/robot/clerical/butler +/obj/item/robot_module/robot/clerical/butler channels = list(CHANNEL_SERVICE = 1) -/obj/item/weapon/robot_module/robot/clerical/butler +/obj/item/robot_module/robot/clerical/butler name = "service robot module" -/obj/item/weapon/robot_module/robot/clerical/butler/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/clerical/butler/create_equipment(var/mob/living/silicon/robot/robot) ..() - src.modules += new /obj/item/weapon/gripper/service(src) - src.modules += new /obj/item/weapon/reagent_containers/glass/bucket(src) - src.modules += new /obj/item/weapon/material/minihoe(src) - src.modules += new /obj/item/weapon/material/knife/machete/hatchet(src) - src.modules += new /obj/item/device/analyzer/plant_analyzer(src) - src.modules += new /obj/item/weapon/storage/bag/serviceborg(src) - src.modules += new /obj/item/weapon/robot_harvester(src) - src.modules += new /obj/item/weapon/material/knife(src) - src.modules += new /obj/item/weapon/material/kitchen/rollingpin(src) - src.modules += new /obj/item/device/multitool(src) //to freeze trays + src.modules += new /obj/item/gripper/service(src) + src.modules += new /obj/item/reagent_containers/glass/bucket(src) + src.modules += new /obj/item/material/minihoe(src) + src.modules += new /obj/item/material/knife/machete/hatchet(src) + src.modules += new /obj/item/analyzer/plant_analyzer(src) + src.modules += new /obj/item/storage/bag/serviceborg(src) + src.modules += new /obj/item/robot_harvester(src) + src.modules += new /obj/item/material/knife(src) + src.modules += new /obj/item/material/kitchen/rollingpin(src) + src.modules += new /obj/item/multitool(src) //to freeze trays - var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src) + var/obj/item/rsf/M = new /obj/item/rsf(src) M.stored_matter = 30 src.modules += M - src.modules += new /obj/item/weapon/reagent_containers/dropper/industrial(src) + src.modules += new /obj/item/reagent_containers/dropper/industrial(src) - var/obj/item/weapon/flame/lighter/zippo/L = new /obj/item/weapon/flame/lighter/zippo(src) + var/obj/item/flame/lighter/zippo/L = new /obj/item/flame/lighter/zippo(src) L.lit = 1 src.modules += L - src.modules += new /obj/item/weapon/tray/robotray(src) - src.modules += new /obj/item/weapon/reagent_containers/borghypo/service(src) - var/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/PB = new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer(src) + src.modules += new /obj/item/tray/robotray(src) + src.modules += new /obj/item/reagent_containers/borghypo/service(src) + var/obj/item/reagent_containers/food/drinks/bottle/small/beer/PB = new /obj/item/reagent_containers/food/drinks/bottle/small/beer(src) src.emag += PB var/datum/reagents/R = new/datum/reagents(50) @@ -636,88 +636,88 @@ var/global/list/robot_modules = list( PB.name = "Auntie Hong's Final Sip" PB.desc = "A bottle of very special mix of alcohol and poison. Some may argue that there's alcohol to die for, but Auntie Hong took it to next level." - src.modules += new /obj/item/device/dogborg/sleeper/compactor/brewer(src) + src.modules += new /obj/item/dogborg/sleeper/compactor/brewer(src) - src.emag += new /obj/item/weapon/dogborg/pounce(src) //Pounce + src.emag += new /obj/item/dogborg/pounce(src) //Pounce -/obj/item/weapon/robot_module/robot/clerical/butler/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) - var/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/PB = locate() in src.emag +/obj/item/robot_module/robot/clerical/butler/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) + var/obj/item/reagent_containers/food/drinks/bottle/small/beer/PB = locate() in src.emag if(PB) PB.reagents.add_reagent("beer2", 2 * amount) -/obj/item/weapon/robot_module/robot/clerical/general +/obj/item/robot_module/robot/clerical/general name = "clerical robot module" -/obj/item/weapon/robot_module/robot/clerical/general/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/clerical/general/create_equipment(var/mob/living/silicon/robot/robot) ..() - src.modules += new /obj/item/weapon/pen/robopen(src) - src.modules += new /obj/item/weapon/form_printer(src) - src.modules += new /obj/item/weapon/gripper/paperwork(src) - src.modules += new /obj/item/weapon/hand_labeler(src) - src.modules += new /obj/item/weapon/stamp(src) - src.modules += new /obj/item/weapon/stamp/denied(src) - src.emag += new /obj/item/weapon/stamp/chameleon(src) - src.emag += new /obj/item/weapon/pen/chameleon(src) + src.modules += new /obj/item/pen/robopen(src) + src.modules += new /obj/item/form_printer(src) + src.modules += new /obj/item/gripper/paperwork(src) + src.modules += new /obj/item/hand_labeler(src) + src.modules += new /obj/item/stamp(src) + src.modules += new /obj/item/stamp/denied(src) + src.emag += new /obj/item/stamp/chameleon(src) + src.emag += new /obj/item/pen/chameleon(src) - src.modules += new /obj/item/device/dogborg/sleeper/compactor/generic(src) - src.emag += new /obj/item/weapon/dogborg/pounce(src) + src.modules += new /obj/item/dogborg/sleeper/compactor/generic(src) + src.emag += new /obj/item/dogborg/pounce(src) -/obj/item/weapon/robot_module/robot/miner +/obj/item/robot_module/robot/miner name = "miner robot module" channels = list(CHANNEL_SUPPLY = 1) networks = list(NETWORK_MINE) supported_upgrades = list(/obj/item/borg/upgrade/restricted/pka, /obj/item/borg/upgrade/restricted/diamonddrill) pto_type = PTO_CARGO -/obj/item/weapon/robot_module/robot/miner/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/miner/create_equipment(var/mob/living/silicon/robot/robot) ..() src.modules += new /obj/item/borg/sight/material(src) - src.modules += new /obj/item/weapon/tool/wrench/cyborg(src) - src.modules += new /obj/item/weapon/tool/screwdriver/cyborg(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/card/id/cargo/miner/borg(src) - src.emag += new /obj/item/weapon/kinetic_crusher/machete/dagger(src) + src.modules += new /obj/item/tool/wrench/cyborg(src) + src.modules += new /obj/item/tool/screwdriver/cyborg(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/card/id/cargo/miner/borg(src) + src.emag += new /obj/item/kinetic_crusher/machete/dagger(src) - src.modules += new /obj/item/device/dogborg/sleeper/compactor/supply(src) - src.emag += new /obj/item/weapon/dogborg/pounce(src) + src.modules += new /obj/item/dogborg/sleeper/compactor/supply(src) + src.emag += new /obj/item/dogborg/pounce(src) -/obj/item/weapon/robot_module/robot/research +/obj/item/robot_module/robot/research name = "research module" channels = list(CHANNEL_SCIENCE = 1) supported_upgrades = list(/obj/item/borg/upgrade/restricted/advrped) pto_type = PTO_SCIENCE -/obj/item/weapon/robot_module/robot/research/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/research/create_equipment(var/mob/living/silicon/robot/robot) ..() - src.modules += new /obj/item/weapon/portable_destructive_analyzer(src) - src.modules += new /obj/item/weapon/gripper/research(src) - src.modules += new /obj/item/weapon/gripper/circuit(src) - src.modules += new /obj/item/weapon/gripper/no_use/organ/robotics(src) - src.modules += new /obj/item/weapon/gripper/no_use/mech(src) - src.modules += new /obj/item/weapon/gripper/no_use/loader(src) - src.modules += new /obj/item/device/robotanalyzer(src) - src.modules += new /obj/item/weapon/card/robot(src) - src.modules += new /obj/item/weapon/weldingtool/electric/mounted/cyborg(src) - src.modules += new /obj/item/weapon/tool/screwdriver/cyborg(src) - src.modules += new /obj/item/weapon/tool/wrench/cyborg(src) - src.modules += new /obj/item/weapon/tool/wirecutters/cyborg(src) - src.modules += new /obj/item/device/multitool(src) - src.modules += new /obj/item/weapon/surgical/hemostat/cyborg(src) //Synth repair - src.modules += new /obj/item/weapon/surgical/surgicaldrill/cyborg(src) //NIF repair - src.modules += new /obj/item/weapon/reagent_containers/syringe(src) - src.modules += new /obj/item/weapon/reagent_containers/glass/beaker/large/borg(src) - src.modules += new /obj/item/weapon/storage/part_replacer(src) - src.modules += new /obj/item/weapon/shockpaddles/robot/jumper(src) - src.modules += new /obj/item/weapon/melee/baton/slime/robot(src) - src.modules += new /obj/item/weapon/gun/energy/taser/xeno/robot(src) - src.modules += new /obj/item/device/xenoarch_multi_tool(src) - src.modules += new /obj/item/weapon/pickaxe/excavationdrill(src) + src.modules += new /obj/item/portable_destructive_analyzer(src) + src.modules += new /obj/item/gripper/research(src) + src.modules += new /obj/item/gripper/circuit(src) + src.modules += new /obj/item/gripper/no_use/organ/robotics(src) + src.modules += new /obj/item/gripper/no_use/mech(src) + src.modules += new /obj/item/gripper/no_use/loader(src) + src.modules += new /obj/item/robotanalyzer(src) + src.modules += new /obj/item/card/robot(src) + src.modules += new /obj/item/weldingtool/electric/mounted/cyborg(src) + src.modules += new /obj/item/tool/screwdriver/cyborg(src) + src.modules += new /obj/item/tool/wrench/cyborg(src) + src.modules += new /obj/item/tool/wirecutters/cyborg(src) + src.modules += new /obj/item/multitool(src) + src.modules += new /obj/item/surgical/hemostat/cyborg(src) //Synth repair + src.modules += new /obj/item/surgical/surgicaldrill/cyborg(src) //NIF repair + src.modules += new /obj/item/reagent_containers/syringe(src) + src.modules += new /obj/item/reagent_containers/glass/beaker/large/borg(src) + src.modules += new /obj/item/storage/part_replacer(src) + src.modules += new /obj/item/shockpaddles/robot/jumper(src) + src.modules += new /obj/item/melee/baton/slime/robot(src) + src.modules += new /obj/item/gun/energy/taser/xeno/robot(src) + src.modules += new /obj/item/xenoarch_multi_tool(src) + src.modules += new /obj/item/pickaxe/excavationdrill(src) - src.emag += new /obj/item/weapon/hand_tele(src) + src.emag += new /obj/item/hand_tele(src) var/datum/matter_synth/nanite = new /datum/matter_synth/nanite(10000) synths += nanite @@ -734,12 +734,12 @@ var/global/list/robot_modules = list( C.synths = list(wire) src.modules += C - src.modules += new /obj/item/device/dogborg/sleeper/compactor/analyzer(src) - src.emag += new /obj/item/weapon/dogborg/pounce(src) + src.modules += new /obj/item/dogborg/sleeper/compactor/analyzer(src) + src.emag += new /obj/item/dogborg/pounce(src) -/obj/item/weapon/robot_module/robot/research/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) +/obj/item/robot_module/robot/research/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) - var/obj/item/weapon/reagent_containers/syringe/S = locate() in src.modules + var/obj/item/reagent_containers/syringe/S = locate() in src.modules if(S.mode == 2) S.reagents.clear_reagents() S.mode = initial(S.mode) @@ -748,60 +748,60 @@ var/global/list/robot_modules = list( ..() -/obj/item/weapon/robot_module/robot/security/combat +/obj/item/robot_module/robot/security/combat name = "combat robot module" hide_on_manifest = TRUE supported_upgrades = list(/obj/item/borg/upgrade/restricted/bellycapupgrade) -/obj/item/weapon/robot_module/robot/security/combat/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/security/combat/create_equipment(var/mob/living/silicon/robot/robot) ..() - src.modules += new /obj/item/weapon/handcuffs/cyborg(src) + src.modules += new /obj/item/handcuffs/cyborg(src) src.modules += new /obj/item/taperoll/police(src) - src.modules += new /obj/item/weapon/gun/energy/laser/mounted(src) - src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg/ertgun(src) - src.modules += new /obj/item/weapon/pickaxe/plasmacutter/borg(src) - src.modules += new /obj/item/weapon/melee/combat_borgblade(src) + src.modules += new /obj/item/gun/energy/laser/mounted(src) + src.modules += new /obj/item/gun/energy/taser/mounted/cyborg/ertgun(src) + src.modules += new /obj/item/pickaxe/plasmacutter/borg(src) + src.modules += new /obj/item/melee/combat_borgblade(src) src.modules += new /obj/item/borg/combat/shield(src) src.modules += new /obj/item/borg/combat/mobility(src) - src.modules += new /obj/item/weapon/melee/borg_combat_shocker(src) - src.modules += new /obj/item/device/ticket_printer(src) - src.emag += new /obj/item/weapon/gun/energy/lasercannon/mounted(src) + src.modules += new /obj/item/melee/borg_combat_shocker(src) + src.modules += new /obj/item/ticket_printer(src) + src.emag += new /obj/item/gun/energy/lasercannon/mounted(src) - src.modules += new /obj/item/device/dogborg/sleeper/K9/ert(src) - src.modules += new /obj/item/weapon/dogborg/pounce(src) + src.modules += new /obj/item/dogborg/sleeper/K9/ert(src) + src.modules += new /obj/item/dogborg/pounce(src) /* Drones */ -/obj/item/weapon/robot_module/drone +/obj/item/robot_module/drone name = "drone module" hide_on_manifest = TRUE no_slip = 1 networks = list(NETWORK_ENGINEERING) -/obj/item/weapon/robot_module/drone/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/drone/create_equipment(var/mob/living/silicon/robot/robot) ..() src.modules += new /obj/item/borg/sight/meson(src) - src.modules += new /obj/item/weapon/weldingtool/electric/mounted/cyborg(src) - src.modules += new /obj/item/weapon/tool/screwdriver/cyborg(src) - src.modules += new /obj/item/weapon/tool/wrench/cyborg(src) - src.modules += new /obj/item/weapon/tool/crowbar/cyborg(src) - src.modules += new /obj/item/weapon/tool/wirecutters/cyborg(src) - src.modules += new /obj/item/device/t_scanner(src) - src.modules += new /obj/item/device/multitool(src) - src.modules += new /obj/item/device/lightreplacer(src) - src.modules += new /obj/item/weapon/gripper(src) - src.modules += new /obj/item/weapon/soap(src) - src.modules += new /obj/item/weapon/gripper/no_use/loader(src) - src.modules += new /obj/item/weapon/extinguisher(src) - src.modules += new /obj/item/device/pipe_painter(src) - src.modules += new /obj/item/device/floor_painter(src) - src.modules += new /obj/item/weapon/pipe_dispenser(src) + src.modules += new /obj/item/weldingtool/electric/mounted/cyborg(src) + src.modules += new /obj/item/tool/screwdriver/cyborg(src) + src.modules += new /obj/item/tool/wrench/cyborg(src) + src.modules += new /obj/item/tool/crowbar/cyborg(src) + src.modules += new /obj/item/tool/wirecutters/cyborg(src) + src.modules += new /obj/item/t_scanner(src) + src.modules += new /obj/item/multitool(src) + src.modules += new /obj/item/lightreplacer(src) + src.modules += new /obj/item/gripper(src) + src.modules += new /obj/item/soap(src) + src.modules += new /obj/item/gripper/no_use/loader(src) + src.modules += new /obj/item/extinguisher(src) + src.modules += new /obj/item/pipe_painter(src) + src.modules += new /obj/item/floor_painter(src) + src.modules += new /obj/item/pipe_dispenser(src) - robot.internals = new/obj/item/weapon/tank/jetpack/carbondioxide(src) + robot.internals = new/obj/item/tank/jetpack/carbondioxide(src) src.modules += robot.internals - var/obj/item/weapon/pickaxe/plasmacutter/borg/PC = new /obj/item/weapon/pickaxe/plasmacutter/borg(src) + var/obj/item/pickaxe/plasmacutter/borg/PC = new /obj/item/pickaxe/plasmacutter/borg(src) src.emag += PC PC.name = "Plasma Cutter" @@ -816,7 +816,7 @@ var/global/list/robot_modules = list( synths += plastic synths += wire - var/obj/item/weapon/matter_decompiler/MD = new /obj/item/weapon/matter_decompiler(src) + var/obj/item/matter_decompiler/MD = new /obj/item/matter_decompiler(src) MD.metal = metal MD.glass = glass MD.wood = wood @@ -859,31 +859,31 @@ var/global/list/robot_modules = list( P.synths = list(plastic) src.modules += P -/obj/item/weapon/robot_module/drone/construction +/obj/item/robot_module/drone/construction name = "construction drone module" hide_on_manifest = TRUE channels = list(CHANNEL_ENGINEERING = 1) languages = list() -/obj/item/weapon/robot_module/drone/construction/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/drone/construction/create_equipment(var/mob/living/silicon/robot/robot) ..() - src.modules += new /obj/item/weapon/rcd/electric/mounted/borg/lesser(src) + src.modules += new /obj/item/rcd/electric/mounted/borg/lesser(src) -/obj/item/weapon/robot_module/drone/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) - var/obj/item/device/lightreplacer/LR = locate() in src.modules +/obj/item/robot_module/drone/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) + var/obj/item/lightreplacer/LR = locate() in src.modules LR.Charge(R, amount) ..() return -/obj/item/weapon/robot_module/drone/mining +/obj/item/robot_module/drone/mining name = "miner drone module" channels = list(CHANNEL_SUPPLY = 1) networks = list(NETWORK_MINE) -/obj/item/weapon/robot_module/drone/mining/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/drone/mining/create_equipment(var/mob/living/silicon/robot/robot) ..() src.modules += new /obj/item/borg/sight/material(src) - src.modules += new /obj/item/weapon/pickaxe/borgdrill(src) - src.modules += new /obj/item/weapon/storage/bag/ore(src) - src.modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src) - src.emag += new /obj/item/weapon/pickaxe/diamonddrill(src) + src.modules += new /obj/item/pickaxe/borgdrill(src) + src.modules += new /obj/item/storage/bag/ore(src) + src.modules += new /obj/item/storage/bag/sheetsnatcher/borg(src) + src.emag += new /obj/item/pickaxe/diamonddrill(src) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/swarm.dm b/code/modules/mob/living/silicon/robot/robot_modules/swarm.dm index c79629c187e..0919fca71b3 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/swarm.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/swarm.dm @@ -1,35 +1,35 @@ -/obj/item/weapon/robot_module/drone/swarm +/obj/item/robot_module/drone/swarm name = "swarm drone module" var/id -/obj/item/weapon/robot_module/drone/swarm/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/drone/swarm/create_equipment(var/mob/living/silicon/robot/robot) ..() id = robot.idcard src.modules += id - src.modules += new /obj/item/weapon/rcd/electric/mounted/borg/swarm(src) - src.modules += new /obj/item/device/flash/robot(src) - src.modules += new /obj/item/weapon/handcuffs/cable/tape/cyborg(src) - src.modules += new /obj/item/weapon/melee/baton/robot(src) - src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg/swarm(src) - src.modules += new /obj/item/weapon/matter_decompiler/swarm(src) + src.modules += new /obj/item/rcd/electric/mounted/borg/swarm(src) + src.modules += new /obj/item/flash/robot(src) + src.modules += new /obj/item/handcuffs/cable/tape/cyborg(src) + src.modules += new /obj/item/melee/baton/robot(src) + src.modules += new /obj/item/gun/energy/taser/mounted/cyborg/swarm(src) + src.modules += new /obj/item/matter_decompiler/swarm(src) -/obj/item/weapon/robot_module/drone/swarm/ranged +/obj/item/robot_module/drone/swarm/ranged name = "swarm gunner module" -/obj/item/weapon/robot_module/drone/swarm/ranged/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/drone/swarm/ranged/create_equipment(var/mob/living/silicon/robot/robot) ..() - src.modules += new /obj/item/weapon/gun/energy/xray/swarm(src) + src.modules += new /obj/item/gun/energy/xray/swarm(src) -/obj/item/weapon/robot_module/drone/swarm/melee/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/drone/swarm/melee/create_equipment(var/mob/living/silicon/robot/robot) ..() - src.modules += new /obj/item/weapon/melee/energy/sword/ionic_rapier/lance(src) + src.modules += new /obj/item/melee/energy/sword/ionic_rapier/lance(src) //Swarm Disabler Module -/obj/item/weapon/gun/energy/taser/mounted/cyborg/swarm +/obj/item/gun/energy/taser/mounted/cyborg/swarm name = "disabler" desc = "An archaic device which attacks the target's nervous-system or control circuits." icon_state = "disabler" diff --git a/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm b/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm index 7ed99340421..5fad7b3f887 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm @@ -1,6 +1,6 @@ /* Syndicate modules */ -/obj/item/weapon/robot_module/robot/syndicate +/obj/item/robot_module/robot/syndicate name = "illegal robot module" hide_on_manifest = TRUE languages = list( @@ -21,10 +21,10 @@ var/id // All syndie modules get these, and the base borg items (flash, crowbar, etc). -/obj/item/weapon/robot_module/robot/syndicate/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/syndicate/create_equipment(var/mob/living/silicon/robot/robot) ..() - src.modules += new /obj/item/weapon/pinpointer/shuttle/merc(src) - src.modules += new /obj/item/weapon/melee/energy/sword(src) + src.modules += new /obj/item/pinpointer/shuttle/merc(src) + src.modules += new /obj/item/melee/energy/sword(src) var/datum/matter_synth/cloth = new /datum/matter_synth/cloth(40000) synths += cloth @@ -32,7 +32,7 @@ var/obj/item/stack/sandbags/cyborg/SB = new /obj/item/stack/sandbags/cyborg(src) SB.synths += list(cloth) - var/jetpack = new/obj/item/weapon/tank/jetpack/carbondioxide(src) + var/jetpack = new/obj/item/tank/jetpack/carbondioxide(src) src.modules += jetpack robot.internals = jetpack @@ -40,51 +40,51 @@ id.forceMove(src) src.modules += id -/obj/item/weapon/robot_module/robot/syndicate/Destroy() +/obj/item/robot_module/robot/syndicate/Destroy() src.modules -= id id = null return ..() // Gets a big shield and a gun that shoots really fast to scare the opposing force. -/obj/item/weapon/robot_module/robot/syndicate/protector +/obj/item/robot_module/robot/syndicate/protector name = "protector robot module" supported_upgrades = list(/obj/item/borg/upgrade/restricted/bellycapupgrade) -/obj/item/weapon/robot_module/robot/syndicate/protector/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/syndicate/protector/create_equipment(var/mob/living/silicon/robot/robot) ..() src.modules += new /obj/item/shield_projector/rectangle/weak(src) - src.modules += new /obj/item/weapon/gun/energy/dakkalaser(src) - src.modules += new /obj/item/weapon/handcuffs/cyborg(src) - src.modules += new /obj/item/weapon/melee/baton/robot(src) + src.modules += new /obj/item/gun/energy/dakkalaser(src) + src.modules += new /obj/item/handcuffs/cyborg(src) + src.modules += new /obj/item/melee/baton/robot(src) - src.modules += new /obj/item/device/dogborg/sleeper/K9/syndie(src) - src.modules += new /obj/item/weapon/dogborg/pounce(src) + src.modules += new /obj/item/dogborg/sleeper/K9/syndie(src) + src.modules += new /obj/item/dogborg/pounce(src) // 95% engi-borg and 15% roboticist. -/obj/item/weapon/robot_module/robot/syndicate/mechanist +/obj/item/robot_module/robot/syndicate/mechanist name = "mechanist robot module" -/obj/item/weapon/robot_module/robot/syndicate/mechanist/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/syndicate/mechanist/create_equipment(var/mob/living/silicon/robot/robot) ..() // General engineering/hacking. src.modules += new /obj/item/borg/sight/meson(src) - src.modules += new /obj/item/weapon/weldingtool/electric/mounted/cyborg(src) - src.modules += new /obj/item/weapon/tool/screwdriver/cyborg(src) - src.modules += new /obj/item/weapon/tool/wrench/cyborg(src) - src.modules += new /obj/item/weapon/tool/wirecutters/cyborg(src) - src.modules += new /obj/item/device/multitool/ai_detector(src) - src.modules += new /obj/item/weapon/pickaxe/plasmacutter(src) - src.modules += new /obj/item/weapon/rcd/electric/mounted/borg/lesser(src) // Can't eat rwalls to prevent AI core cheese. - src.modules += new /obj/item/weapon/melee/energy/sword/ionic_rapier(src) + src.modules += new /obj/item/weldingtool/electric/mounted/cyborg(src) + src.modules += new /obj/item/tool/screwdriver/cyborg(src) + src.modules += new /obj/item/tool/wrench/cyborg(src) + src.modules += new /obj/item/tool/wirecutters/cyborg(src) + src.modules += new /obj/item/multitool/ai_detector(src) + src.modules += new /obj/item/pickaxe/plasmacutter(src) + src.modules += new /obj/item/rcd/electric/mounted/borg/lesser(src) // Can't eat rwalls to prevent AI core cheese. + src.modules += new /obj/item/melee/energy/sword/ionic_rapier(src) // FBP repair. - src.modules += new /obj/item/device/robotanalyzer(src) - src.modules += new /obj/item/weapon/shockpaddles/robot/jumper(src) - src.modules += new /obj/item/weapon/gripper/no_use/organ/robotics(src) + src.modules += new /obj/item/robotanalyzer(src) + src.modules += new /obj/item/shockpaddles/robot/jumper(src) + src.modules += new /obj/item/gripper/no_use/organ/robotics(src) // Hacking other things. - src.modules += new /obj/item/weapon/card/robot/syndi(src) - src.modules += new /obj/item/weapon/card/emag/borg(src) + src.modules += new /obj/item/card/robot/syndi(src) + src.modules += new /obj/item/card/emag/borg(src) // Materials. var/datum/matter_synth/nanite = new /datum/matter_synth/nanite(10000) @@ -122,43 +122,43 @@ RG.synths = list(metal, glass) src.modules += RG - var/obj/item/device/dogborg/sleeper/compactor/syndie/MD = new /obj/item/device/dogborg/sleeper/compactor/syndie(src) + var/obj/item/dogborg/sleeper/compactor/syndie/MD = new /obj/item/dogborg/sleeper/compactor/syndie(src) MD.metal = metal MD.glass = glass src.modules += MD - src.modules += new /obj/item/weapon/dogborg/pounce(src) + src.modules += new /obj/item/dogborg/pounce(src) // Mediborg optimized for on-the-field healing, but can also do surgery if needed. -/obj/item/weapon/robot_module/robot/syndicate/combat_medic +/obj/item/robot_module/robot/syndicate/combat_medic name = "combat medic robot module" supported_upgrades = list(/obj/item/borg/upgrade/restricted/bellycapupgrade) -/obj/item/weapon/robot_module/robot/syndicate/combat_medic/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/syndicate/combat_medic/create_equipment(var/mob/living/silicon/robot/robot) ..() - src.modules += new /obj/item/device/healthanalyzer/phasic(src) - src.modules += new /obj/item/weapon/reagent_containers/borghypo/merc(src) + src.modules += new /obj/item/healthanalyzer/phasic(src) + src.modules += new /obj/item/reagent_containers/borghypo/merc(src) // Surgery things. - src.modules += new /obj/item/weapon/autopsy_scanner(src) - src.modules += new /obj/item/weapon/surgical/scalpel/cyborg(src) - src.modules += new /obj/item/weapon/surgical/hemostat/cyborg(src) - src.modules += new /obj/item/weapon/surgical/retractor/cyborg(src) - src.modules += new /obj/item/weapon/surgical/cautery/cyborg(src) - src.modules += new /obj/item/weapon/surgical/bonegel/cyborg(src) - src.modules += new /obj/item/weapon/surgical/FixOVein/cyborg(src) - src.modules += new /obj/item/weapon/surgical/bonesetter/cyborg(src) - src.modules += new /obj/item/weapon/surgical/circular_saw/cyborg(src) - src.modules += new /obj/item/weapon/surgical/surgicaldrill/cyborg(src) - src.modules += new /obj/item/weapon/gripper/no_use/organ(src) + src.modules += new /obj/item/autopsy_scanner(src) + src.modules += new /obj/item/surgical/scalpel/cyborg(src) + src.modules += new /obj/item/surgical/hemostat/cyborg(src) + src.modules += new /obj/item/surgical/retractor/cyborg(src) + src.modules += new /obj/item/surgical/cautery/cyborg(src) + src.modules += new /obj/item/surgical/bonegel/cyborg(src) + src.modules += new /obj/item/surgical/FixOVein/cyborg(src) + src.modules += new /obj/item/surgical/bonesetter/cyborg(src) + src.modules += new /obj/item/surgical/circular_saw/cyborg(src) + src.modules += new /obj/item/surgical/surgicaldrill/cyborg(src) + src.modules += new /obj/item/gripper/no_use/organ(src) // General healing. - src.modules += new /obj/item/weapon/gripper/medical(src) - src.modules += new /obj/item/weapon/shockpaddles/robot/combat(src) - src.modules += new /obj/item/weapon/reagent_containers/dropper(src) // Allows borg to fix necrosis apparently - src.modules += new /obj/item/weapon/reagent_containers/syringe(src) + src.modules += new /obj/item/gripper/medical(src) + src.modules += new /obj/item/shockpaddles/robot/combat(src) + src.modules += new /obj/item/reagent_containers/dropper(src) // Allows borg to fix necrosis apparently + src.modules += new /obj/item/reagent_containers/syringe(src) src.modules += new /obj/item/roller_holder(src) // Materials. @@ -181,12 +181,12 @@ src.modules += B src.modules += S - src.modules += new /obj/item/device/dogborg/sleeper/syndie(src) - src.modules += new /obj/item/weapon/dogborg/pounce(src) + src.modules += new /obj/item/dogborg/sleeper/syndie(src) + src.modules += new /obj/item/dogborg/pounce(src) -/obj/item/weapon/robot_module/robot/syndicate/combat_medic/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) +/obj/item/robot_module/robot/syndicate/combat_medic/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) - var/obj/item/weapon/reagent_containers/syringe/S = locate() in src.modules + var/obj/item/reagent_containers/syringe/S = locate() in src.modules if(S.mode == 2) S.reagents.clear_reagents() S.mode = initial(S.mode) diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm index 106513eced4..6c0c7bdd4ec 100644 --- a/code/modules/mob/living/silicon/robot/robot_movement.dm +++ b/code/modules/mob/living/silicon/robot/robot_movement.dm @@ -1,13 +1,13 @@ /mob/living/silicon/robot/get_jetpack() if(module) - for(var/obj/item/weapon/tank/jetpack/J in module.modules) + for(var/obj/item/tank/jetpack/J in module.modules) return J /mob/living/silicon/robot/Check_Shoegrip() return module && module.no_slip /mob/living/silicon/robot/Process_Spaceslipping(var/prob_slip) - var/obj/item/weapon/tank/jetpack/thrust = get_jetpack() + var/obj/item/tank/jetpack/thrust = get_jetpack() if(thrust?.can_thrust(0.01)) return 0 if(module && module.no_slip) @@ -18,7 +18,7 @@ if(..())//Can move due to other reasons, don't use jetpack fuel return 1 - var/obj/item/weapon/tank/jetpack/thrust = get_jetpack() + var/obj/item/tank/jetpack/thrust = get_jetpack() if(thrust && (!check_drift || (check_drift && thrust.stabilization_on)) && thrust.do_thrust(0.01)) inertia_dir = 0 return 1 @@ -55,13 +55,13 @@ return //Borgs and drones can use their mining bags ~automagically~ if they're deployed in a slot. Only mining bags, as they're optimized for mass use. - if(istype(module_state_1, /obj/item/weapon/storage/bag/ore) || istype(module_state_2, /obj/item/weapon/storage/bag/ore) || istype(module_state_3, /obj/item/weapon/storage/bag/ore)) - var/obj/item/weapon/storage/bag/ore/B = null - if(istype(module_state_1, /obj/item/weapon/storage/bag/ore)) //First orebag has priority, if they for some reason have multiple. + if(istype(module_state_1, /obj/item/storage/bag/ore) || istype(module_state_2, /obj/item/storage/bag/ore) || istype(module_state_3, /obj/item/storage/bag/ore)) + var/obj/item/storage/bag/ore/B = null + if(istype(module_state_1, /obj/item/storage/bag/ore)) //First orebag has priority, if they for some reason have multiple. B = module_state_1 - else if(istype(module_state_2, /obj/item/weapon/storage/bag/ore)) + else if(istype(module_state_2, /obj/item/storage/bag/ore)) B = module_state_2 - else if(istype(module_state_3, /obj/item/weapon/storage/bag/ore)) + else if(istype(module_state_3, /obj/item/storage/bag/ore)) B = module_state_3 var/turf/tile = loc if(isturf(tile)) diff --git a/code/modules/mob/living/silicon/robot/robot_remote_control.dm b/code/modules/mob/living/silicon/robot/robot_remote_control.dm index 344ba448730..f88769c5e79 100644 --- a/code/modules/mob/living/silicon/robot/robot_remote_control.dm +++ b/code/modules/mob/living/silicon/robot/robot_remote_control.dm @@ -10,13 +10,13 @@ GLOBAL_LIST_EMPTY(available_ai_shells) // Premade AI shell, for roundstart shells. /mob/living/silicon/robot/ai_shell/Initialize() - mmi = new /obj/item/device/mmi/inert/ai_remote(src) + mmi = new /obj/item/mmi/inert/ai_remote(src) post_mmi_setup() return ..() // Call after inserting or instantiating an MMI. /mob/living/silicon/robot/proc/post_mmi_setup() - if(istype(mmi, /obj/item/device/mmi/inert/ai_remote)) + if(istype(mmi, /obj/item/mmi/inert/ai_remote)) make_shell() playsound(src, 'sound/machines/twobeep.ogg', 50, 0) else @@ -27,7 +27,7 @@ GLOBAL_LIST_EMPTY(available_ai_shells) shell = TRUE braintype = "AI Shell" SetName("[modtype] AI Shell [num2text(ident)]") - rbPDA = new /obj/item/device/pda/ai/shell(src) + rbPDA = new /obj/item/pda/ai/shell(src) setup_PDA() GLOB.available_ai_shells |= src if(!QDELETED(camera)) diff --git a/code/modules/mob/living/silicon/robot/sprites/_sprite_datum.dm b/code/modules/mob/living/silicon/robot/sprites/_sprite_datum.dm index 53e2a412426..13f47dca367 100644 --- a/code/modules/mob/living/silicon/robot/sprites/_sprite_datum.dm +++ b/code/modules/mob/living/silicon/robot/sprites/_sprite_datum.dm @@ -97,7 +97,7 @@ /datum/robot_sprite/proc/handle_extra_customization(var/mob/living/silicon/robot/ourborg) return -/datum/robot_sprite/proc/do_equipment_glamour(var/obj/item/weapon/robot_module/module) +/datum/robot_sprite/proc/do_equipment_glamour(var/obj/item/robot_module/module) return // Dogborgs and not-dogborgs that use dogborg stuff. Oh no. @@ -127,11 +127,11 @@ /datum/robot_sprite/dogborg/get_belly_overlay(var/mob/living/silicon/robot/ourborg) return "[sprite_icon_state]-sleeper" */ -/datum/robot_sprite/dogborg/do_equipment_glamour(var/obj/item/weapon/robot_module/module) +/datum/robot_sprite/dogborg/do_equipment_glamour(var/obj/item/robot_module/module) if(!has_custom_equipment_sprites) return - var/obj/item/weapon/tool/crowbar/cyborg/C = locate() in module.modules + var/obj/item/tool/crowbar/cyborg/C = locate() in module.modules if(C) C.name = "puppy jaws" C.desc = "The jaws of a small dog. Still strong enough to pry things." diff --git a/code/modules/mob/living/silicon/robot/sprites/combat.dm b/code/modules/mob/living/silicon/robot/sprites/combat.dm index 3ff24f321ff..beffd3256ab 100644 --- a/code/modules/mob/living/silicon/robot/sprites/combat.dm +++ b/code/modules/mob/living/silicon/robot/sprites/combat.dm @@ -93,7 +93,7 @@ var/has_shield_sprite = FALSE /datum/robot_sprite/dogborg/tall/combat/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg) - if(has_gun_sprite && (istype(ourborg.module_active, /obj/item/weapon/gun/energy/laser/mounted) || istype(ourborg.module_active, /obj/item/weapon/gun/energy/taser/mounted/cyborg/ertgun) || istype(ourborg.module_active, /obj/item/weapon/gun/energy/lasercannon/mounted))) + if(has_gun_sprite && (istype(ourborg.module_active, /obj/item/gun/energy/laser/mounted) || istype(ourborg.module_active, /obj/item/gun/energy/taser/mounted/cyborg/ertgun) || istype(ourborg.module_active, /obj/item/gun/energy/lasercannon/mounted))) ourborg.add_overlay("[sprite_icon_state]-gun") if(has_speed_sprite && (istype(ourborg.module_active, /obj/item/borg/combat/mobility))) ourborg.icon_state = "[sprite_icon_state]-roll" @@ -104,17 +104,17 @@ ourborg.add_overlay("[sprite_icon_state]-shield") -/datum/robot_sprite/dogborg/tall/combat/do_equipment_glamour(var/obj/item/weapon/robot_module/module) +/datum/robot_sprite/dogborg/tall/combat/do_equipment_glamour(var/obj/item/robot_module/module) if(!has_custom_equipment_sprites) return ..() - var/obj/item/weapon/melee/combat_borgblade/CBB = locate() in module.modules + var/obj/item/melee/combat_borgblade/CBB = locate() in module.modules if(CBB) CBB.name = "sword tail" CBB.desc = "A glowing dagger normally attached to the end of a cyborg's tail. It appears to be extremely sharp." - var/obj/item/weapon/melee/borg_combat_shocker/BCS = locate() in module.modules + var/obj/item/melee/borg_combat_shocker/BCS = locate() in module.modules if(BCS) BCS.name = "combat jaws" BCS.desc = "Shockingly chompy!" diff --git a/code/modules/mob/living/silicon/robot/sprites/event.dm b/code/modules/mob/living/silicon/robot/sprites/event.dm index 681e0f2fcfb..8a7165a3f30 100644 --- a/code/modules/mob/living/silicon/robot/sprites/event.dm +++ b/code/modules/mob/living/silicon/robot/sprites/event.dm @@ -28,13 +28,13 @@ module_type = "Lost" sprite_icon = 'icons/mob/robot/lost_wide.dmi' -/datum/robot_sprite/dogborg/lost/do_equipment_glamour(var/obj/item/weapon/robot_module/module) +/datum/robot_sprite/dogborg/lost/do_equipment_glamour(var/obj/item/robot_module/module) if(!has_custom_equipment_sprites) return ..() - var/obj/item/weapon/shockpaddles/robot/SP = locate() in module.modules + var/obj/item/shockpaddles/robot/SP = locate() in module.modules if(SP) SP.name = "paws of life" SP.desc = "Zappy paws. For fixing cardiac arrest." @@ -58,7 +58,7 @@ var/has_laser_sprite = FALSE /datum/robot_sprite/dogborg/tall/lost/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg) - if(has_laser_sprite && istype(ourborg.module_active, /obj/item/weapon/gun/energy/retro/mounted)) + if(has_laser_sprite && istype(ourborg.module_active, /obj/item/gun/energy/retro/mounted)) ourborg.add_overlay("[sprite_icon_state]-laser") if(has_shield_sprite) if(ourborg.has_active_type(/obj/item/borg/combat/shield)) @@ -113,7 +113,7 @@ var/has_laser_sprite = FALSE /datum/robot_sprite/dogborg/tall/gravekeeper/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg) - if(has_laser_sprite && istype(ourborg.module_active, /obj/item/weapon/gun/energy/retro/mounted)) + if(has_laser_sprite && istype(ourborg.module_active, /obj/item/gun/energy/retro/mounted)) ourborg.add_overlay("[sprite_icon_state]-laser") if(has_shield_sprite) if(ourborg.has_active_type(/obj/item/borg/combat/shield)) diff --git a/code/modules/mob/living/silicon/robot/sprites/fluff.dm b/code/modules/mob/living/silicon/robot/sprites/fluff.dm index becbde2deb0..a420ae2f02a 100644 --- a/code/modules/mob/living/silicon/robot/sprites/fluff.dm +++ b/code/modules/mob/living/silicon/robot/sprites/fluff.dm @@ -85,9 +85,9 @@ whitelist_charname = "B.A.U-Kingside" /datum/robot_sprite/fluff/jademanique/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg) - if(istype(ourborg.module_active, /obj/item/weapon/gun/energy/laser/mounted)) + if(istype(ourborg.module_active, /obj/item/gun/energy/laser/mounted)) ourborg.add_overlay("[sprite_icon_state]-laser") - if(istype(ourborg.module_active, /obj/item/weapon/gun/energy/taser/mounted/cyborg)) + if(istype(ourborg.module_active, /obj/item/gun/energy/taser/mounted/cyborg)) ourborg.add_overlay("[sprite_icon_state]-taser") // L diff --git a/code/modules/mob/living/silicon/robot/sprites/medical.dm b/code/modules/mob/living/silicon/robot/sprites/medical.dm index 3030d828f8a..1a058aada4c 100644 --- a/code/modules/mob/living/silicon/robot/sprites/medical.dm +++ b/code/modules/mob/living/silicon/robot/sprites/medical.dm @@ -197,13 +197,13 @@ else return ..() */ -/datum/robot_sprite/dogborg/surgical/do_equipment_glamour(var/obj/item/weapon/robot_module/module) +/datum/robot_sprite/dogborg/surgical/do_equipment_glamour(var/obj/item/robot_module/module) if(!has_custom_equipment_sprites) return ..() - var/obj/item/weapon/shockpaddles/robot/SP = locate() in module.modules + var/obj/item/shockpaddles/robot/SP = locate() in module.modules if(SP) SP.name = "paws of life" SP.desc = "Zappy paws. For fixing cardiac arrest." @@ -236,13 +236,13 @@ module_type = "Surgeon" sprite_icon = 'icons/mob/robot/surgical_large.dmi' -/datum/robot_sprite/dogborg/tall/surgical/do_equipment_glamour(var/obj/item/weapon/robot_module/module) +/datum/robot_sprite/dogborg/tall/surgical/do_equipment_glamour(var/obj/item/robot_module/module) if(!has_custom_equipment_sprites) return ..() - var/obj/item/weapon/shockpaddles/robot/SP = locate() in module.modules + var/obj/item/shockpaddles/robot/SP = locate() in module.modules if(SP) SP.name = "paws of life" SP.desc = "Zappy paws. For fixing cardiac arrest." @@ -321,13 +321,13 @@ else return ..() */ -/datum/robot_sprite/dogborg/crisis/do_equipment_glamour(var/obj/item/weapon/robot_module/module) +/datum/robot_sprite/dogborg/crisis/do_equipment_glamour(var/obj/item/robot_module/module) if(!has_custom_equipment_sprites) return ..() - var/obj/item/weapon/shockpaddles/robot/SP = locate() in module.modules + var/obj/item/shockpaddles/robot/SP = locate() in module.modules if(SP) SP.name = "paws of life" SP.desc = "Zappy paws. For fixing cardiac arrest." @@ -374,13 +374,13 @@ module_type = "Crisis" sprite_icon = 'icons/mob/robot/crisis_large.dmi' -/datum/robot_sprite/dogborg/tall/crisis/do_equipment_glamour(var/obj/item/weapon/robot_module/module) +/datum/robot_sprite/dogborg/tall/crisis/do_equipment_glamour(var/obj/item/robot_module/module) if(!has_custom_equipment_sprites) return ..() - var/obj/item/weapon/shockpaddles/robot/SP = locate() in module.modules + var/obj/item/shockpaddles/robot/SP = locate() in module.modules if(SP) SP.name = "paws of life" SP.desc = "Zappy paws. For fixing cardiac arrest." diff --git a/code/modules/mob/living/silicon/robot/sprites/science.dm b/code/modules/mob/living/silicon/robot/sprites/science.dm index 7232bd97262..c03f8da7f74 100644 --- a/code/modules/mob/living/silicon/robot/sprites/science.dm +++ b/code/modules/mob/living/silicon/robot/sprites/science.dm @@ -98,13 +98,13 @@ module_type = "Research" sprite_icon = 'icons/mob/robot/science_wide.dmi' -/datum/robot_sprite/dogborg/science/do_equipment_glamour(var/obj/item/weapon/robot_module/module) +/datum/robot_sprite/dogborg/science/do_equipment_glamour(var/obj/item/robot_module/module) if(!has_custom_equipment_sprites) return ..() - var/obj/item/weapon/shockpaddles/robot/jumper/J = locate() in module.modules + var/obj/item/shockpaddles/robot/jumper/J = locate() in module.modules if(J) J.name = "jumper paws" J.desc = "Zappy paws. For rebooting a full body prostetic." @@ -151,16 +151,16 @@ var/has_taser_sprite = FALSE /datum/robot_sprite/dogborg/tall/science/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg) - if(has_taser_sprite && istype(ourborg.module_active, /obj/item/weapon/gun/energy/taser/xeno/robot)) + if(has_taser_sprite && istype(ourborg.module_active, /obj/item/gun/energy/taser/xeno/robot)) ourborg.add_overlay("[sprite_icon_state]-taser") -/datum/robot_sprite/dogborg/tall/science/do_equipment_glamour(var/obj/item/weapon/robot_module/module) +/datum/robot_sprite/dogborg/tall/science/do_equipment_glamour(var/obj/item/robot_module/module) if(!has_custom_equipment_sprites) return ..() - var/obj/item/weapon/shockpaddles/robot/jumper/J = locate() in module.modules + var/obj/item/shockpaddles/robot/jumper/J = locate() in module.modules if(J) J.name = "jumper paws" J.desc = "Zappy paws. For rebooting a full body prostetic." diff --git a/code/modules/mob/living/silicon/robot/sprites/security.dm b/code/modules/mob/living/silicon/robot/sprites/security.dm index c42ea7279ed..677b27d5389 100644 --- a/code/modules/mob/living/silicon/robot/sprites/security.dm +++ b/code/modules/mob/living/silicon/robot/sprites/security.dm @@ -125,9 +125,9 @@ var/has_taser_sprite = FALSE /datum/robot_sprite/dogborg/security/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg) - if(has_laser_sprite && istype(ourborg.module_active, /obj/item/weapon/gun/energy/laser/mounted)) + if(has_laser_sprite && istype(ourborg.module_active, /obj/item/gun/energy/laser/mounted)) ourborg.add_overlay("[sprite_icon_state]-laser") - if(has_taser_sprite && istype(ourborg.module_active, /obj/item/weapon/gun/energy/taser/mounted/cyborg)) + if(has_taser_sprite && istype(ourborg.module_active, /obj/item/gun/energy/taser/mounted/cyborg)) ourborg.add_overlay("[sprite_icon_state]-taser") /datum/robot_sprite/dogborg/security/k9 @@ -186,9 +186,9 @@ var/has_taser_sprite = FALSE /datum/robot_sprite/dogborg/tall/security/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg) - if(has_laser_sprite && istype(ourborg.module_active, /obj/item/weapon/gun/energy/laser/mounted)) + if(has_laser_sprite && istype(ourborg.module_active, /obj/item/gun/energy/laser/mounted)) ourborg.add_overlay("[sprite_icon_state]-laser") - if(has_taser_sprite && istype(ourborg.module_active, /obj/item/weapon/gun/energy/taser/mounted/cyborg)) + if(has_taser_sprite && istype(ourborg.module_active, /obj/item/gun/energy/taser/mounted/cyborg)) ourborg.add_overlay("[sprite_icon_state]-taser") /datum/robot_sprite/dogborg/tall/security/raptor diff --git a/code/modules/mob/living/silicon/robot/sprites/syndicate.dm b/code/modules/mob/living/silicon/robot/sprites/syndicate.dm index 2bc63bbe066..4bc2fe54ea3 100644 --- a/code/modules/mob/living/silicon/robot/sprites/syndicate.dm +++ b/code/modules/mob/living/silicon/robot/sprites/syndicate.dm @@ -117,7 +117,7 @@ var/has_gun_sprite = FALSE /datum/robot_sprite/dogborg/tall/protector/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg) - if(has_gun_sprite && istype (ourborg.module_active, /obj/item/weapon/gun/energy/dakkalaser)) + if(has_gun_sprite && istype (ourborg.module_active, /obj/item/gun/energy/dakkalaser)) ourborg.add_overlay("[sprite_icon_state]-gun") /datum/robot_sprite/dogborg/tall/protector/syndiprotraptor @@ -190,13 +190,13 @@ sprite_icon = 'icons/mob/robot/combat_medic_wide.dmi' sprite_hud_icon_state = "malf" -/datum/robot_sprite/dogborg/combat_medic/do_equipment_glamour(var/obj/item/weapon/robot_module/module) +/datum/robot_sprite/dogborg/combat_medic/do_equipment_glamour(var/obj/item/robot_module/module) if(!has_custom_equipment_sprites) return ..() - var/obj/item/weapon/shockpaddles/robot/SP = locate() in module.modules + var/obj/item/shockpaddles/robot/SP = locate() in module.modules if(SP) SP.name = "paws of life" SP.desc = "Zappy paws. For fixing cardiac arrest." diff --git a/code/modules/mob/living/silicon/robot/subtypes/gravekeeper.dm b/code/modules/mob/living/silicon/robot/subtypes/gravekeeper.dm index 0253ce89163..73357c10711 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/gravekeeper.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/gravekeeper.dm @@ -5,23 +5,23 @@ modtype = "Gravekeeper" lawchannel = "State" braintype = "Drone" - idcard_type = /obj/item/weapon/card/id/lost + idcard_type = /obj/item/card/id/lost icon_selected = FALSE can_be_antagged = FALSE restrict_modules_to = list("Gravekeeper") /mob/living/silicon/robot/gravekeeper/init() - aiCamera = new/obj/item/device/camera/siliconcam/robot_camera(src) + aiCamera = new/obj/item/camera/siliconcam/robot_camera(src) - mmi = new /obj/item/device/mmi/digital/robot(src) // Explicitly a drone. - module = new /obj/item/weapon/robot_module/robot/gravekeeper(src) + mmi = new /obj/item/mmi/digital/robot(src) // Explicitly a drone. + module = new /obj/item/robot_module/robot/gravekeeper(src) cut_overlays() init_id() updatename("Gravekeeper") if(!cell) - cell = new /obj/item/weapon/cell/high(src) // 15k cell, as recharging stations are a lot more rare on the Surface. + cell = new /obj/item/cell/high(src) // 15k cell, as recharging stations are a lot more rare on the Surface. laws = new /datum/ai_laws/gravekeeper() diff --git a/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm b/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm index 2f17ee46f43..2524d784de2 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm @@ -5,23 +5,23 @@ modtype = "Lost" lawchannel = "State" braintype = "Drone" - idcard_type = /obj/item/weapon/card/id/lost + idcard_type = /obj/item/card/id/lost icon_selected = FALSE restrict_modules_to = list("Lost") var/law_retries = 5 /mob/living/silicon/robot/lost/init() - aiCamera = new/obj/item/device/camera/siliconcam/robot_camera(src) + aiCamera = new/obj/item/camera/siliconcam/robot_camera(src) - mmi = new /obj/item/device/mmi/digital/robot(src) // Explicitly a drone. - module = new /obj/item/weapon/robot_module/robot/lost(src) + mmi = new /obj/item/mmi/digital/robot(src) // Explicitly a drone. + module = new /obj/item/robot_module/robot/lost(src) cut_overlays() init_id() updatename("Lost") if(!cell) - cell = new /obj/item/weapon/cell/high(src) // 15k cell, as recharging stations are a lot more rare on the Surface. + cell = new /obj/item/cell/high(src) // 15k cell, as recharging stations are a lot more rare on the Surface. scramble_hardware(20) diff --git a/code/modules/mob/living/silicon/robot/subtypes/syndicate.dm b/code/modules/mob/living/silicon/robot/subtypes/syndicate.dm index 398c49775c5..5dd72332e44 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/syndicate.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/syndicate.dm @@ -5,48 +5,48 @@ modtype = "Syndicate" lawchannel = "State" braintype = "Drone" - idcard_type = /obj/item/weapon/card/id/syndicate + idcard_type = /obj/item/card/id/syndicate icon_selected = FALSE restrict_modules_to = list("Protector", "Mechanist", "Combat Medic") /mob/living/silicon/robot/syndicate/init() - aiCamera = new/obj/item/device/camera/siliconcam/robot_camera(src) + aiCamera = new/obj/item/camera/siliconcam/robot_camera(src) - mmi = new /obj/item/device/mmi/digital/robot(src) // Explicitly a drone. + mmi = new /obj/item/mmi/digital/robot(src) // Explicitly a drone. cut_overlays() init_id() updatename("Syndicate") if(!cell) - cell = new /obj/item/weapon/cell/robot_syndi(src) // 25k cell, because Antag. + cell = new /obj/item/cell/robot_syndi(src) // 25k cell, because Antag. - // new /obj/item/weapon/robot_module/robot/syndicate(src) + // new /obj/item/robot_module/robot/syndicate(src) laws = new /datum/ai_laws/syndicate_override() - radio.keyslot = new /obj/item/device/encryptionkey/syndicate(radio) + radio.keyslot = new /obj/item/encryptionkey/syndicate(radio) radio.recalculateChannels() playsound(src, 'sound/mecha/nominalsyndi.ogg', 75, 0) /mob/living/silicon/robot/syndicate/protector/init() ..() - module = new /obj/item/weapon/robot_module/robot/syndicate/protector(src) + module = new /obj/item/robot_module/robot/syndicate/protector(src) modtype = "Protector" restrict_modules_to = list("Protector") updatename("Protector") /mob/living/silicon/robot/syndicate/mechanist/init() ..() - module = new /obj/item/weapon/robot_module/robot/syndicate/mechanist(src) + module = new /obj/item/robot_module/robot/syndicate/mechanist(src) modtype = "Mechanist" restrict_modules_to = list("Mechanist") updatename("Mechanist") /mob/living/silicon/robot/syndicate/combat_medic/init() ..() - module = new /obj/item/weapon/robot_module/robot/syndicate/combat_medic(src) + module = new /obj/item/robot_module/robot/syndicate/combat_medic(src) modtype = "Combat Medic" restrict_modules_to = list("Combat Medic") updatename("Combat Medic") diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm index cf0a9c778f7..f2bce726da9 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm @@ -20,9 +20,9 @@ icon_state = "tachi" color = "#68a2f2" - cell = /obj/item/weapon/cell/mech - idcard_type = /obj/item/weapon/card/id/platform - module = /obj/item/weapon/robot_module/robot/platform + cell = /obj/item/cell/mech + idcard_type = /obj/item/card/id/platform + module = /obj/item/robot_module/robot/platform lawupdate = FALSE modtype = "Standard" @@ -67,7 +67,7 @@ /mob/living/silicon/robot/platform/Initialize(var/mapload) . = ..() if(!mmi) - mmi = new /obj/item/device/mmi/digital/robot(src) + mmi = new /obj/item/mmi/digital/robot(src) SetName("inactive [initial(name)]") update_icon() @@ -99,7 +99,7 @@ if(distance <= 3) if(recharging) - var/obj/item/weapon/cell/recharging_atom = recharging.resolve() + var/obj/item/cell/recharging_atom = recharging.resolve() if(istype(recharging_atom) && !QDELETED(recharging_atom)) . += "It has \a [recharging_atom] slotted into its recharging port." . += "The cell readout shows [round(recharging_atom.percent(),1)]% charge." @@ -124,7 +124,7 @@ /mob/living/silicon/robot/platform/init() . = ..() - if(ispath(module, /obj/item/weapon/robot_module)) + if(ispath(module, /obj/item/robot_module)) module = new module(src) /mob/living/silicon/robot/platform/module_reset() @@ -153,7 +153,7 @@ if(recharging) - var/obj/item/weapon/cell/recharging_atom = recharging.resolve() + var/obj/item/cell/recharging_atom = recharging.resolve() if(!istype(recharging_atom) || QDELETED(recharging_atom) || recharging_atom.loc != src) recharging = null return diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_icon.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_icon.dm index a8056885df0..c3caace5d2b 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_icon.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_icon.dm @@ -5,7 +5,7 @@ cut_overlays() underlays.Cut() - var/obj/item/weapon/robot_module/robot/platform/tank_module = module + var/obj/item/robot_module/robot/platform/tank_module = module if(!istype(tank_module)) icon = initial(icon) icon_state = initial(icon_state) @@ -58,9 +58,9 @@ I.appearance_flags |= (RESET_COLOR|PIXEL_SCALE) add_overlay(I) -/mob/living/silicon/robot/platform/proc/try_paint(var/obj/item/device/floor_painter/painting, var/mob/user) +/mob/living/silicon/robot/platform/proc/try_paint(var/obj/item/floor_painter/painting, var/mob/user) - var/obj/item/weapon/robot_module/robot/platform/tank_module = module + var/obj/item/robot_module/robot/platform/tank_module = module if(!istype(tank_module)) to_chat(user, SPAN_WARNING("\The [src] is not paintable.")) return FALSE diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm index 87b23bf457a..fe68c93bdb7 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm @@ -17,7 +17,7 @@ /mob/living/silicon/robot/platform/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/weapon/cell) && !opened) + if(istype(W, /obj/item/cell) && !opened) if(recharging) to_chat(user, SPAN_WARNING("\The [src] already has \a [recharging.resolve()] inserted into its recharging port.")) else if(user.unEquip(W)) @@ -27,7 +27,7 @@ user.visible_message("\The [user] slots \the [W] into \the [src]'s recharging port.") return TRUE - if(istype(W, /obj/item/device/floor_painter)) + if(istype(W, /obj/item/floor_painter)) return FALSE // Paint sprayer wil call try_paint() in afterattack() . = ..() diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm index 3e8f6faa6e4..2175bb1db47 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/robot_module/robot/platform +/obj/item/robot_module/robot/platform hide_on_manifest = TRUE @@ -16,13 +16,13 @@ ) // Only show on manifest if they have a player. -/obj/item/weapon/robot_module/robot/platform/hide_on_manifest() +/obj/item/robot_module/robot/platform/hide_on_manifest() if(isrobot(loc)) var/mob/living/silicon/robot/R = loc return !R.key return ..() -/obj/item/weapon/robot_module/robot/platform/verb/set_eye_colour() +/obj/item/robot_module/robot/platform/verb/set_eye_colour() set name = "Set Eye Colour" set desc = "Select an eye colour to use." set category = "Robot Commands" @@ -35,7 +35,7 @@ pupil_color = new_pupil_color || initial(pupil_color) usr.update_icon() -/obj/item/weapon/robot_module/robot/platform/explorer +/obj/item/robot_module/robot/platform/explorer armor_color = "#528052" eye_color = "#7b7b46" decals = list( @@ -47,14 +47,14 @@ CHANNEL_EXPLORATION = 1 ) -/obj/item/weapon/robot_module/robot/platform/explorer/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/platform/explorer/create_equipment(var/mob/living/silicon/robot/robot) ..() - modules += new /obj/item/weapon/tool/wrench/cyborg(src) - modules += new /obj/item/weapon/weldingtool/electric/mounted/cyborg(src) - modules += new /obj/item/weapon/tool/wirecutters/cyborg(src) - modules += new /obj/item/weapon/tool/screwdriver/cyborg(src) - modules += new /obj/item/weapon/pickaxe/plasmacutter(src) - modules += new /obj/item/weapon/material/knife/machete/cyborg(src) + modules += new /obj/item/tool/wrench/cyborg(src) + modules += new /obj/item/weldingtool/electric/mounted/cyborg(src) + modules += new /obj/item/tool/wirecutters/cyborg(src) + modules += new /obj/item/tool/screwdriver/cyborg(src) + modules += new /obj/item/pickaxe/plasmacutter(src) + modules += new /obj/item/material/knife/machete/cyborg(src) var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(7500) var/obj/item/stack/medical/bruise_pack/bandaid = new(src) @@ -64,21 +64,21 @@ modules += bandaid synths += medicine - var/obj/item/weapon/gun/energy/phasegun/mounted/cyborg/phasegun = new(src) + var/obj/item/gun/energy/phasegun/mounted/cyborg/phasegun = new(src) modules += phasegun - emag += new /obj/item/weapon/chainsaw(src) + emag += new /obj/item/chainsaw(src) -/obj/item/weapon/robot_module/robot/platform/explorer/respawn_consumable(var/mob/living/silicon/robot/R, rate) +/obj/item/robot_module/robot/platform/explorer/respawn_consumable(var/mob/living/silicon/robot/R, rate) . = ..() - for(var/obj/item/weapon/gun/energy/pew in modules) + for(var/obj/item/gun/energy/pew in modules) if(pew.power_supply && pew.power_supply.charge < pew.power_supply.maxcharge) pew.power_supply.give(pew.charge_cost * rate) pew.update_icon() else pew.charge_tick = 0 -/obj/item/weapon/robot_module/robot/platform/cargo +/obj/item/robot_module/robot/platform/cargo armor_color = "#d5b222" eye_color = "#686846" decals = list( @@ -88,15 +88,15 @@ channels = list(CHANNEL_SUPPLY = 1) networks = list(NETWORK_MINE) -/obj/item/weapon/robot_module/robot/platform/cargo/create_equipment(var/mob/living/silicon/robot/robot) +/obj/item/robot_module/robot/platform/cargo/create_equipment(var/mob/living/silicon/robot/robot) ..() - modules += new /obj/item/weapon/packageWrap(src) - modules += new /obj/item/weapon/pen/multi(src) - modules += new /obj/item/device/destTagger(src) - emag += new /obj/item/weapon/stamp/denied + modules += new /obj/item/packageWrap(src) + modules += new /obj/item/pen/multi(src) + modules += new /obj/item/destTagger(src) + emag += new /obj/item/stamp/denied -/obj/item/weapon/robot_module/robot/platform/cargo/respawn_consumable(mob/living/silicon/robot/R, rate) +/obj/item/robot_module/robot/platform/cargo/respawn_consumable(mob/living/silicon/robot/R, rate) . = ..() - var/obj/item/weapon/packageWrap/wrapper = locate() in modules + var/obj/item/packageWrap/wrapper = locate() in modules if(wrapper.amount < initial(wrapper.amount)) wrapper.amount++ diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_subtypes.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_subtypes.dm index b3e48aabb4d..1ffc3df88d9 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_subtypes.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_subtypes.dm @@ -2,7 +2,7 @@ name = "recon platform" desc = "A large quadrupedal AI platform, colloquially known as a 'think-tank' due to the flexible onboard intelligence. This one is lightly armoured and fitted with all-terrain wheels." modtype = "Recon" - module = /obj/item/weapon/robot_module/robot/platform/explorer + module = /obj/item/robot_module/robot/platform/explorer /mob/living/silicon/robot/platform/explorer/Initialize() . = ..() @@ -20,7 +20,7 @@ name = "logistics platform" desc = "A large quadrupedal AI platform, colloquially known as a 'think-tank' due to the flexible onboard intelligence. This one has an expanded storage compartment." modtype = "Logistics" - module = /obj/item/weapon/robot_module/robot/platform/cargo + module = /obj/item/robot_module/robot/platform/cargo max_stored_atoms = 3 /mob/living/silicon/robot/platform/cargo/welcome_client() diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 95cd2805af3..3b4df63fa34 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -5,7 +5,7 @@ var/const/MAIN_CHANNEL = "Main Frequency" var/lawchannel = MAIN_CHANNEL // Default channel on which to state laws var/list/stating_laws = list()// Channels laws are currently being stated on - var/obj/item/device/radio/common_radio + var/obj/item/radio/common_radio has_huds = TRUE var/list/speech_synthesizer_langs = list() //which languages can be vocalized by the speech synthesizer @@ -15,15 +15,15 @@ var/speak_exclamation = "declares" var/speak_query = "queries" var/pose //Yes, now AIs can pose too. - var/obj/item/device/camera/siliconcam/aiCamera = null //photography + var/obj/item/camera/siliconcam/aiCamera = null //photography var/local_transmit //If set, can only speak to others of the same type within a short range. var/next_alarm_notice var/list/datum/alarm/queued_alarms = new() var/list/access_rights - var/obj/item/weapon/card/id/idcard - var/idcard_type = /obj/item/weapon/card/id/synthetic + var/obj/item/card/id/idcard + var/idcard_type = /obj/item/card/id/synthetic var/sensor_type = 0 //VOREStation add - silicon omni "is sensor on or nah" diff --git a/code/modules/mob/living/simple_mob/defense.dm b/code/modules/mob/living/simple_mob/defense.dm index 7c31c3c83d2..4c0aee988f6 100644 --- a/code/modules/mob/living/simple_mob/defense.dm +++ b/code/modules/mob/living/simple_mob/defense.dm @@ -32,7 +32,7 @@ L.visible_message("\The [L] tries to grab \the [src] but fails!") return - var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(L, src) + var/obj/item/grab/G = new /obj/item/grab(L, src) L.put_in_active_hand(G) @@ -111,7 +111,7 @@ //Animals can't be stunned(?) if(O.damtype == HALLOSS) effective_force = 0 - if(supernatural && istype(O,/obj/item/weapon/nullrod)) + if(supernatural && istype(O,/obj/item/nullrod)) effective_force *= 2 purge = 3 if(O.force <= resistance) diff --git a/code/modules/mob/living/simple_mob/sd_pets.dm b/code/modules/mob/living/simple_mob/sd_pets.dm index 251bfa323b1..3e3ea4cd663 100644 --- a/code/modules/mob/living/simple_mob/sd_pets.dm +++ b/code/modules/mob/living/simple_mob/sd_pets.dm @@ -28,9 +28,9 @@ icon_dead = "tulidaan_dead" digestable = 0 catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/tulidaan) - holder_type = /obj/item/weapon/holder/catslug/tulidaan + holder_type = /obj/item/holder/catslug/tulidaan -/obj/item/weapon/holder/catslug/tulidaan +/obj/item/holder/catslug/tulidaan item_state = "tulidaan" /mob/living/simple_mob/animal/passive/mouse/jerboa/leggy @@ -58,9 +58,9 @@ desc = "A polite, well groomed patchy colored feline. Doesn't like his cat carrier." devourable = 0 digestable = 0 - holder_type = /obj/item/weapon/holder/cat/jones + holder_type = /obj/item/holder/cat/jones -/obj/item/weapon/holder/cat/jones +/obj/item/holder/cat/jones item_state = "cat2" diff --git a/code/modules/mob/living/simple_mob/simple_mob.dm b/code/modules/mob/living/simple_mob/simple_mob.dm index 1b3cea164c7..8808f30f4bf 100644 --- a/code/modules/mob/living/simple_mob/simple_mob.dm +++ b/code/modules/mob/living/simple_mob/simple_mob.dm @@ -60,7 +60,7 @@ var/list/friends = list() // Mobs on this list wont get attacked regardless of faction status. var/harm_intent_damage = 3 // How much an unarmed harm click does to this mob. var/list/loot_list = list() // The list of lootable objects to drop, with "/path = prob%" structure - var/obj/item/weapon/card/id/myid// An ID card if they have one to give them access to stuff. + var/obj/item/card/id/myid// An ID card if they have one to give them access to stuff. var/organ_names = /decl/mob_organ_names //'False' bodyparts that can be shown as hit by projectiles in place of the default humanoid bodyplan. //Mob environment settings @@ -184,7 +184,7 @@ health = maxHealth if(ID_provided) //VOREStation Edit - myid = new /obj/item/weapon/card/id(src) + myid = new /obj/item/card/id(src) myid.access = myid_access.Copy() for(var/L in has_langs) diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index a6c6154acb0..e86c8e28e2a 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -47,7 +47,7 @@ var/mount_offset_x = 5 // Horizontal riding offset. var/mount_offset_y = 8 // Vertical riding offset - var/obj/item/device/radio/headset/mob_headset/mob_radio //Adminbus headset for simplemob shenanigans. + var/obj/item/radio/headset/mob_headset/mob_radio //Adminbus headset for simplemob shenanigans. does_spin = FALSE can_be_drop_pred = TRUE // Mobs are pred by default. var/damage_threshold = 0 //For some mobs, they have a damage threshold required to deal damage to them. @@ -291,7 +291,7 @@ // Riding /datum/riding/simple_mob - keytype = /obj/item/weapon/material/twohanded/riding_crop // Crack! + keytype = /obj/item/material/twohanded/riding_crop // Crack! nonhuman_key_exemption = FALSE // If true, nonhumans who can't hold keys don't need them, like borgs and simplemobs. key_name = "a riding crop" // What the 'keys' for the thing being rided on would be called. only_one_driver = TRUE // If true, only the person in 'front' (first on list of riding mobs) can drive. @@ -381,16 +381,16 @@ if(mob_radio) switch(message_mode) if("intercom") - for(var/obj/item/device/radio/intercom/I in view(1, null)) + for(var/obj/item/radio/intercom/I in view(1, null)) I.talk_into(src, message, verb, speaking) used_radios += I if("headset") - if(mob_radio && istype(mob_radio,/obj/item/device/radio/headset/mob_headset)) + if(mob_radio && istype(mob_radio,/obj/item/radio/headset/mob_headset)) mob_radio.talk_into(src,message,null,verb,speaking) used_radios += mob_radio else if(message_mode) - if(mob_radio && istype(mob_radio,/obj/item/device/radio/headset/mob_headset)) + if(mob_radio && istype(mob_radio,/obj/item/radio/headset/mob_headset)) mob_radio.talk_into(src,message, message_mode, verb, speaking) used_radios += mob_radio else diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm index 4a7272fe036..02ad425bdfb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm @@ -28,8 +28,8 @@ health = 50 movement_cooldown = -1 meat_amount = 2 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat - holder_type = /obj/item/weapon/holder/catslug + meat_type = /obj/item/reagent_containers/food/snacks/meat + holder_type = /obj/item/holder/catslug response_help = "hugs" response_disarm = "rudely paps" @@ -63,37 +63,37 @@ allow_mind_transfer = TRUE can_enter_vent_with = list( - /obj/item/weapon/implant, - /obj/item/device/radio/borg, - /obj/item/weapon/holder, + /obj/item/implant, + /obj/item/radio/borg, + /obj/item/holder, /obj/machinery/camera, /obj/belly, /obj/screen, /atom/movable/emissive_blocker, - /obj/item/weapon/material, - /obj/item/weapon/melee, + /obj/item/material, + /obj/item/melee, /obj/item/stack/, - /obj/item/weapon/tool, - /obj/item/weapon/reagent_containers/food, - /obj/item/weapon/coin, - /obj/item/weapon/aliencoin, - /obj/item/weapon/ore, - /obj/item/weapon/disk/nuclear, + /obj/item/tool, + /obj/item/reagent_containers/food, + /obj/item/coin, + /obj/item/aliencoin, + /obj/item/ore, + /obj/item/disk/nuclear, /obj/item/toy, - /obj/item/weapon/card, - /obj/item/device/radio, - /obj/item/device/perfect_tele_beacon, - /obj/item/weapon/clipboard, - /obj/item/weapon/paper, - /obj/item/weapon/pen, + /obj/item/card, + /obj/item/radio, + /obj/item/perfect_tele_beacon, + /obj/item/clipboard, + /obj/item/paper, + /obj/item/pen, /obj/item/canvas, /obj/item/paint_palette, /obj/item/paint_brush, - /obj/item/device/camera, - /obj/item/weapon/photo, - /obj/item/device/camera_film, - /obj/item/device/taperecorder, - /obj/item/device/tape + /obj/item/camera, + /obj/item/photo, + /obj/item/camera_film, + /obj/item/taperecorder, + /obj/item/rectape ) vore_active = 1 @@ -146,11 +146,11 @@ drop_hat() return ..() -/mob/living/simple_mob/vore/alienanimals/catslug/attackby(var/obj/item/weapon/reagent_containers/food/snacks/O as obj, var/mob/user as mob) +/mob/living/simple_mob/vore/alienanimals/catslug/attackby(var/obj/item/reagent_containers/food/snacks/O as obj, var/mob/user as mob) if(istype(O, /obj/item/clothing/head)) // Handle hat simulator. give_hat(O, user) return - else if(!istype(O, /obj/item/weapon/reagent_containers/food/snacks)) + else if(!istype(O, /obj/item/reagent_containers/food/snacks)) return ..() if(resting) to_chat(user, "\The [src] is napping, and doesn't respond to \the [O].") @@ -337,12 +337,12 @@ var/datum/say_list/S = holder.say_list S.speak |= message -/obj/item/weapon/holder/catslug +/obj/item/holder/catslug origin_tech = list(TECH_BIO = 2) icon = 'icons/mob/alienanimals_x32.dmi' item_state = "catslug" -/obj/item/weapon/holder/catslug/Initialize(mapload, mob/held) +/obj/item/holder/catslug/Initialize(mapload, mob/held) . = ..() color = held.color @@ -387,7 +387,7 @@ icon_rest = "spaceslug_rest" icon_dead = "spaceslug_dead" catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/spaceslug) - holder_type = /obj/item/weapon/holder/catslug/custom/spaceslug + holder_type = /obj/item/holder/catslug/custom/spaceslug say_list_type = /datum/say_list/catslug/custom/spaceslug minbodytemp = 0 // Shamelessly stolen temp & atmos tolerances from the space cat. @@ -457,7 +457,7 @@ else return ..() -/obj/item/weapon/holder/catslug/custom/spaceslug +/obj/item/holder/catslug/custom/spaceslug item_state = "spaceslug" //Engineer catslug @@ -487,7 +487,7 @@ icon_rest = "engislug_rest" icon_dead = "engislug_dead" catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/engislug) - holder_type = /obj/item/weapon/holder/catslug/custom/engislug + holder_type = /obj/item/holder/catslug/custom/engislug say_list_type = /datum/say_list/catslug/custom/engislug myid_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_construction, access_atmospherics) siemens_coefficient = 0 //Noodly fella's gone and built up an immunity from many small shocks @@ -557,7 +557,7 @@ else return ..() -/obj/item/weapon/holder/catslug/custom/engislug +/obj/item/holder/catslug/custom/engislug item_state = "engislug" //Security catslug @@ -588,7 +588,7 @@ icon_rest = "gatslug_rest" icon_dead = "gatslug_dead" catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/gatslug) - holder_type = /obj/item/weapon/holder/catslug/custom/gatslug + holder_type = /obj/item/holder/catslug/custom/gatslug maxHealth = 75 health = 75 say_list_type = /datum/say_list/catslug/custom/gatslug @@ -609,7 +609,7 @@ /datum/say_list/catslug/custom/gatslug speak = list("Have any flashbangs?", "Valids!", "Heard spiders?", "What is that?", "Freeze!", "What are you doing?", "How did you get here?", "Red alert means big bangsticks.", "No being naughty now.", "WAOW!", "Who ate all the donuts?") -/obj/item/weapon/holder/catslug/custom/gatslug +/obj/item/holder/catslug/custom/gatslug item_state = "gatslug" //Medical catslug @@ -639,14 +639,14 @@ icon_rest = "medislug_rest" icon_dead = "medislug_dead" catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/medislug) - holder_type = /obj/item/weapon/holder/catslug/custom/medislug + holder_type = /obj/item/holder/catslug/custom/medislug say_list_type = /datum/say_list/catslug/custom/medislug myid_access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics) /datum/say_list/catslug/custom/medislug speak = list("Have any osteodaxon?", "What is that?", "Suit sensors!", "What are you doing?", "How did you get here?", "Put a mask on!", "No smoking!", "WAOW!", "Stop getting blood everywhere!", "WHERE IN MAINT?") -/obj/item/weapon/holder/catslug/custom/medislug +/obj/item/holder/catslug/custom/medislug item_state = "medislug" //Science catslug @@ -675,7 +675,7 @@ icon_rest = "scienceslug_rest" icon_dead = "scienceslug_dead" catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/scienceslug) - holder_type = /obj/item/weapon/holder/catslug/custom/scienceslug + holder_type = /obj/item/holder/catslug/custom/scienceslug say_list_type = /datum/say_list/catslug/custom/scienceslug myid_access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch) @@ -683,7 +683,7 @@ /datum/say_list/catslug/custom/scienceslug speak = list("Slimes, squish!", "What is that?", "Smoking in Toxins is not advised.", "What are you doing?", "How did you get here?", "Do not deconstruct the cube!", "WAOW!", "Where are our materials?", "The acid dispenser is not full of juice. Must remember that.") -/obj/item/weapon/holder/catslug/custom/scienceslug +/obj/item/holder/catslug/custom/scienceslug item_state = "scienceslug" //Cargo catslug @@ -713,14 +713,14 @@ icon_rest = "cargoslug_rest" icon_dead = "cargoslug_dead" catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/cargoslug) - holder_type = /obj/item/weapon/holder/catslug/custom/cargoslug + holder_type = /obj/item/holder/catslug/custom/cargoslug say_list_type = /datum/say_list/catslug/custom/cargoslug myid_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_mining, access_mining_station) /datum/say_list/catslug/custom/cargoslug speak = list("Disposals is not for slip and slide.", "What is that?", "Stamp those manifests!", "What are you doing?", "How did you get here?", "Can order pizza crate?", "WAOW!", "Where are all of our materials?", "Got glubbs?") -/obj/item/weapon/holder/catslug/custom/cargoslug +/obj/item/holder/catslug/custom/cargoslug item_state = "cargoslug" //Command catslug @@ -752,22 +752,22 @@ icon_dead = "capslug_dead" faction = FACTION_NEUTRAL catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/capslug) - holder_type = /obj/item/weapon/holder/catslug/custom/capslug + holder_type = /obj/item/holder/catslug/custom/capslug say_list_type = /datum/say_list/catslug/custom/capslug myid_access = list(access_heads, access_keycard_auth) //Same access as a bridge secretary. /datum/say_list/catslug/custom/capslug speak = list("How open big glass box with shiny inside?.", "What is that?", "Respect my authority!", "What are you doing?", "How did you get here?", "Fax for yellow-shirts!", "WAOW!", "Why is that console blinking and clicking?", "Do we need to call for ERT?", "Have been called comdom before, not sure why they thought I was a balloon.") -/obj/item/weapon/holder/catslug/custom/capslug +/obj/item/holder/catslug/custom/capslug item_state = "capslug" /mob/living/simple_mob/vore/alienanimals/catslug/custom/capslug/Initialize() //This is such an awful proc, but if someone wants it better they're welcome to have a go at it. . = ..() - mob_radio = new /obj/item/device/radio/headset/mob_headset(src) + mob_radio = new /obj/item/radio/headset/mob_headset(src) mob_radio.frequency = PUB_FREQ - mob_radio.ks2type = /obj/item/device/encryptionkey/heads/captain //Might not be able to speak, but the catslug can listen. - mob_radio.keyslot2 = new /obj/item/device/encryptionkey/heads/captain(mob_radio) + mob_radio.ks2type = /obj/item/encryptionkey/heads/captain //Might not be able to speak, but the catslug can listen. + mob_radio.keyslot2 = new /obj/item/encryptionkey/heads/captain(mob_radio) mob_radio.recalculateChannels(1) //============================================================================= @@ -808,7 +808,7 @@ /mob/living/simple_mob/vore/alienanimals/catslug/custom/spaceslug/deathslug/Initialize() . = ..() - mob_radio = new /obj/item/device/radio/headset/mob_headset(src) + mob_radio = new /obj/item/radio/headset/mob_headset(src) mob_radio.frequency = DTH_FREQ //Can't tell if bugged, deathsquad freq in general seems broken myid.access |= get_all_station_access() @@ -849,11 +849,11 @@ /mob/living/simple_mob/vore/alienanimals/catslug/custom/spaceslug/syndislug/Initialize() . = ..() - mob_radio = new /obj/item/device/radio/headset/mob_headset(src) + mob_radio = new /obj/item/radio/headset/mob_headset(src) mob_radio.frequency = SYND_FREQ mob_radio.syndie = 1 - mob_radio.ks2type = /obj/item/device/encryptionkey/syndicate - mob_radio.keyslot2 = new /obj/item/device/encryptionkey/syndicate(mob_radio) + mob_radio.ks2type = /obj/item/encryptionkey/syndicate + mob_radio.keyslot2 = new /obj/item/encryptionkey/syndicate(mob_radio) mob_radio.recalculateChannels(1) myid.access |= get_all_station_access() @@ -893,11 +893,11 @@ /mob/living/simple_mob/vore/alienanimals/catslug/custom/spaceslug/responseslug/Initialize() . = ..() - mob_radio = new /obj/item/device/radio/headset/mob_headset(src) + mob_radio = new /obj/item/radio/headset/mob_headset(src) mob_radio.frequency = ERT_FREQ mob_radio.centComm = 1 - mob_radio.ks2type = /obj/item/device/encryptionkey/ert - mob_radio.keyslot2 = new /obj/item/device/encryptionkey/ert(mob_radio) + mob_radio.ks2type = /obj/item/encryptionkey/ert + mob_radio.keyslot2 = new /obj/item/encryptionkey/ert(mob_radio) mob_radio.recalculateChannels(1) myid.access |= get_all_station_access() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm index 1ed1bd20fe3..79a67863960 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm @@ -63,7 +63,7 @@ GLOBAL_VAR_INIT(jellyfish_count, 0) speak_emote = list("thrumms") meat_amount = 0 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/jellyfishcore + meat_type = /obj/item/reagent_containers/food/snacks/jellyfishcore say_list_type = /datum/say_list/jellyfish @@ -116,7 +116,7 @@ GLOBAL_VAR_INIT(jellyfish_count, 0) /mob/living/simple_mob/vore/alienanimals/space_jellyfish/death() . = ..() - new /obj/item/weapon/reagent_containers/food/snacks/jellyfishcore(loc, nutrition) + new /obj/item/reagent_containers/food/snacks/jellyfishcore(loc, nutrition) GLOB.jellyfish_count -- qdel(src) @@ -150,7 +150,7 @@ GLOBAL_VAR_INIT(jellyfish_count, 0) wander = TRUE unconscious_vore = TRUE -/obj/item/weapon/reagent_containers/food/snacks/jellyfishcore +/obj/item/reagent_containers/food/snacks/jellyfishcore name = "jellyfish core" icon = 'icons/obj/food_vr.dmi' icon_state = "jellyfish_core" @@ -161,11 +161,11 @@ GLOBAL_VAR_INIT(jellyfish_count, 0) var/inherited_nutriment = 0 -/obj/item/weapon/reagent_containers/food/snacks/jellyfishcore/New(newloc, inherit) +/obj/item/reagent_containers/food/snacks/jellyfishcore/New(newloc, inherit) inherited_nutriment = inherit . = ..() -/obj/item/weapon/reagent_containers/food/snacks/jellyfishcore/Initialize() +/obj/item/reagent_containers/food/snacks/jellyfishcore/Initialize() nutriment_amt += inherited_nutriment . = ..() reagents.add_reagent("nutriment", nutriment_amt, nutriment_desc) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/skeleton.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/skeleton.dm index d5f2f32a24a..88f919ac28d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/skeleton.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/skeleton.dm @@ -54,11 +54,11 @@ maxbodytemp = 900 loot_list = list( - /obj/item/weapon/bone = 25, - /obj/item/weapon/bone/skull = 25, - /obj/item/weapon/bone/ribs = 25, - /obj/item/weapon/bone/arm = 25, - /obj/item/weapon/bone/leg = 25 + /obj/item/bone = 25, + /obj/item/bone/skull = 25, + /obj/item/bone/ribs = 25, + /obj/item/bone/arm = 25, + /obj/item/bone/leg = 25 ) speak_emote = list("rattles") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm index 33103e25437..5d2084d0f0c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm @@ -71,7 +71,7 @@ "rad" = 100 ) - loot_list = list(/obj/item/weapon/ore/diamond = 100, /obj/item/weapon/ectoplasm = 3) + loot_list = list(/obj/item/ore/diamond = 100, /obj/item/ectoplasm = 3) speak_emote = list("rumbles") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm index 7c4e53f579d..6433c37e7cd 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm @@ -628,7 +628,7 @@ name = "dense fur" desc = "Silky and soft, but too thick to pass or cut!" -/obj/structure/flora/tree/fur/wall/attackby(obj/item/weapon/W, mob/living/user) +/obj/structure/flora/tree/fur/wall/attackby(obj/item/W, mob/living/user) return /area/redgate/stardog @@ -667,23 +667,23 @@ var/mob_chance = 10 var/treasure_chance = 50 var/list/valid_treasure = list( - /obj/item/weapon/cell/infinite = 5, - /obj/item/weapon/cell/device/weapon/recharge/alien = 5, - /obj/item/device/nif/authentic = 1, + /obj/item/cell/infinite = 5, + /obj/item/cell/device/weapon/recharge/alien = 5, + /obj/item/nif/authentic = 1, /obj/item/toy/bosunwhistle = 50, /obj/random/mouseray = 50, - /obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced/random = 10, - /obj/item/weapon/gun/energy/mouseray/metamorphosis/advanced = 5, + /obj/item/gun/energy/mouseray/metamorphosis/advanced/random = 10, + /obj/item/gun/energy/mouseray/metamorphosis/advanced = 5, /obj/item/clothing/mask/gas/voice = 25, - /obj/item/device/perfect_tele = 15, - /obj/item/weapon/gun/energy/sizegun = 50, - /obj/item/device/slow_sizegun = 50, + /obj/item/perfect_tele = 15, + /obj/item/gun/energy/sizegun = 50, + /obj/item/slow_sizegun = 50, /obj/item/capture_crystal/master = 5, /obj/item/capture_crystal/ultra = 15, /obj/item/capture_crystal/great = 25, /obj/item/capture_crystal/random = 50, /obj/random/pizzabox = 10, //The dog intercepted your pizza voucher delivery, what a scamp - /obj/item/weapon/bluespace_harpoon = 15, + /obj/item/bluespace_harpoon = 15, /obj/random/awayloot = 5, /obj/random/cash = 15, /obj/random/cash/big = 10, @@ -1360,7 +1360,7 @@ /obj/effect/dog_teleporter/food_gobbler/Crossed(atom/movable/AM) - if(istype(AM, /obj/item/weapon/reagent_containers/food)) + if(istype(AM, /obj/item/reagent_containers/food)) gobble_food(AM) else return ..() @@ -1467,13 +1467,13 @@ if(I.unacidable || I.throwing || I.is_incorporeal()) return FALSE var/food = FALSE - if(istype(I,/obj/item/weapon/reagent_containers/food)) + if(istype(I,/obj/item/reagent_containers/food)) food = TRUE if(prob(95)) //Give people a chance to pick them up return TRUE I.visible_message("\The [I] sizzles...") var/yum = I.digest_act() //Glorp - if(istype(I , /obj/item/weapon/card)) + if(istype(I , /obj/item/card)) yum = 0 //No, IDs do not have infinite nutrition, thank you if(mobstuff && linked_mob && yum) if(food) @@ -1523,7 +1523,7 @@ if(istype(W, /obj/item/organ/internal/mmi_holder/posibrain)) var/obj/item/organ/internal/mmi_holder/MMI = W MMI.removed() - if(istype(W, /obj/item/weapon/implant/backup) || istype(W, /obj/item/device/nif) || istype(W, /obj/item/organ)) + if(istype(W, /obj/item/implant/backup) || istype(W, /obj/item/nif) || istype(W, /obj/item/organ)) continue H.drop_from_inventory(W) if(linked_mob) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm index c5205d5ecda..55e7b340cdf 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm @@ -134,7 +134,7 @@ qdel(src) /mob/living/simple_mob/vore/alienanimals/succlet/attackby(var/obj/item/O, var/mob/user) - if(istype(O, /obj/item/weapon/newspaper) && !ckey && isturf(user.loc)) + if(istype(O, /obj/item/newspaper) && !ckey && isturf(user.loc)) user.visible_message("[user] swats [src] with [O]!") release_vore_contents() else diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm index 3596481b338..cb76b5f2a85 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm @@ -65,7 +65,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? health = 600 movement_cooldown = -1 meat_amount = 12 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat response_help = "pets" response_disarm = "rudely paps" @@ -131,7 +131,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? has_langs = list(LANGUAGE_TEPPI) say_list_type = /datum/say_list/teppi player_msg = "Teppi are large omnivorous quadrupeds. You have four toes on each paw, a long, strong tail, and are quite tough and powerful. You’re a lot more intimidating than you are actually harmful though. Your kind are ordinarily rather passive, only really rising to violence when someone does violence to you or others like you. You’re not stupid though, you can commiunicate with others of your kind, and form bonds with those who are kind to you, be they Teppi or otherwise.
- - - - -
While you may have access to galactic common, this is purely meant for making it so you can understand people in an OOC manner, for facilitating roleplay. You almost certainly should not be speaking to people or roleplaying as though you understand everything everyone says perfectly, but it's not unreasonable to be able to intuit intent and such through people's tones when they speak. Teppi are kind of smart, but they are animals, and should be roleplayed as such. ADDITIONALLY, you have the ability to produce offspring if you're well fed enough every once in a while, and the ability to disable this from happening to you. These verbs exist for to preserve the mechanical functionality of the mob you are playing. You should be aware of your surroundings when you use this verb, and NEVER use it to prefbreak or be disruptive. If in doubt, don't use it. Also, to note, AI Teppi will never initiate breeding with player Teppi." - loot_list = list(/obj/item/weapon/bone/horn = 100) + loot_list = list(/obj/item/bone/horn = 100) internal_organs = list(\ /obj/item/organ/internal/brain,\ /obj/item/organ/internal/heart,\ @@ -143,7 +143,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? butchery_loot = list(\ /obj/item/stack/animalhide = 3,\ - /obj/item/weapon/bone/horn = 1\ + /obj/item/bone/horn = 1\ ) /////////////////////////////////////// Vore stuff/////////////////////////////////////////// @@ -490,9 +490,9 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? if(stat == DEAD) return ..() /////GRABS AND HOLDERS///// - if(istype(O, /obj/item/weapon/grab)) + if(istype(O, /obj/item/grab)) return ..() - if(istype(O, /obj/item/weapon/holder)) + if(istype(O, /obj/item/holder)) return ..() if(user.a_intent != I_HELP) //be gentle if(resting) @@ -505,7 +505,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? if(teppi_shear(user, O)) return /////FOOD///// - if(istype(O, /obj/item/weapon/reagent_containers/food)) + if(istype(O, /obj/item/reagent_containers/food)) if(resting) to_chat(user, "\The [src] is napping, and doesn't respond to \the [O].") return @@ -556,7 +556,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? to_chat(user, "\The [src] seems satisfied.") return /////WEAPONS///// - if(istype(O, /obj/item/weapon/material/knife)) + if(istype(O, /obj/item/material/knife)) if(client) return ..() if(resting) @@ -731,8 +731,8 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? /mob/living/simple_mob/vore/alienanimals/teppi/proc/teppi_shear(var/mob/user as mob, tool) var/sheartime = 3 SECONDS - if(istype(tool, /obj/item/weapon/material/knife)) - var/obj/item/weapon/material/knife/K = tool + if(istype(tool, /obj/item/material/knife)) + var/obj/item/material/knife/K = tool if(K.default_material == MAT_PLASTIC || K.default_material == MAT_FLINT) sheartime *= 2 if(K.dulled) @@ -741,7 +741,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? sheartime *= 2 if(K.edge) sheartime *= 0.5 - else if(istype(tool, /obj/item/weapon/tool/wirecutters)) + else if(istype(tool, /obj/item/tool/wirecutters)) sheartime *= 2 else return FALSE diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm b/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm index 6ef2c176f57..f1b82ba9efe 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/animal.dm @@ -1,6 +1,6 @@ /mob/living/simple_mob/animal mob_class = MOB_CLASS_ANIMAL - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat response_help = "pets" response_disarm = "shoos" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm index 6dae8e94a6a..f834c6f81ea 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm @@ -25,7 +25,7 @@ universal_understand = TRUE can_be_antagged = TRUE - holder_type = /obj/item/weapon/holder/borer + holder_type = /obj/item/holder/borer ai_holder_type = null // This is player-controlled, always. var/mob/living/carbon/human/host = null // The humanoid host for the brain worm. diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm index 4a97ab3a319..48d8a17f393 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm @@ -27,7 +27,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have? say_list_type = /datum/say_list/chicken meat_amount = 4 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken + meat_type = /obj/item/reagent_containers/food/snacks/meat/chicken var/eggsleft = 0 var/body_color @@ -48,8 +48,8 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have? GLOB.chicken_count -= 1 /mob/living/simple_mob/animal/passive/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob) - if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown)) //feedin' dem chickens - var/obj/item/weapon/reagent_containers/food/snacks/grown/G = O + if(istype(O, /obj/item/reagent_containers/food/snacks/grown)) //feedin' dem chickens + var/obj/item/reagent_containers/food/snacks/grown/G = O if(G.seed && G.seed.kitchen_tag == "wheat") if(!stat && eggsleft < 8) user.visible_message(span_blue("[user] feeds [O] to [name]! It clucks happily."),span_blue("You feed [O] to [name]! It clucks happily.")) @@ -70,7 +70,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have? if(!stat && prob(3) && eggsleft > 0) visible_message("[src] [pick("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.")]") eggsleft-- - var/obj/item/weapon/reagent_containers/food/snacks/egg/E = new(get_turf(src)) + var/obj/item/reagent_containers/food/snacks/egg/E = new(get_turf(src)) E.pixel_x = rand(-6,6) E.pixel_y = rand(-6,6) if(GLOB.chicken_count < GLOB.MAX_CHICKENS && prob(10)) @@ -82,10 +82,10 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have? -/obj/item/weapon/reagent_containers/food/snacks/egg/var/amount_grown = 0 +/obj/item/reagent_containers/food/snacks/egg/var/amount_grown = 0 // This only starts normally if there are less than MAX_CHICKENS chickens -/obj/item/weapon/reagent_containers/food/snacks/egg/process() +/obj/item/reagent_containers/food/snacks/egg/process() if(isturf(loc)) amount_grown += rand(1,2) if(amount_grown >= 100) @@ -127,7 +127,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have? say_list_type = /datum/say_list/chick meat_amount = 1 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken + meat_type = /obj/item/reagent_containers/food/snacks/meat/chicken var/amount_grown = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm index 4fdd32500e2..3f22a813fb3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm @@ -20,7 +20,7 @@ say_list_type = /datum/say_list/cow meat_amount = 10 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat var/datum/reagents/udder = null @@ -30,7 +30,7 @@ ..() /mob/living/simple_mob/animal/passive/cow/attackby(var/obj/item/O as obj, var/mob/user as mob) - var/obj/item/weapon/reagent_containers/glass/G = O + var/obj/item/reagent_containers/glass/G = O if(stat == CONSCIOUS && istype(G) && G.is_open_container()) user.visible_message("[user] milks [src] using \the [O].") var/transfered = udder.trans_id_to(G, "milk", rand(5,10)) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm index 618b0960e1c..e1d5ec8c4c3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm @@ -23,7 +23,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/retaliate meat_amount = 6 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat var/datum/reagents/udder = null @@ -61,7 +61,7 @@ SV.die_off(1) /mob/living/simple_mob/animal/goat/attackby(var/obj/item/O as obj, var/mob/user as mob) - var/obj/item/weapon/reagent_containers/glass/G = O + var/obj/item/reagent_containers/glass/G = O if(stat == CONSCIOUS && istype(G) && G.is_open_container()) user.visible_message("[user] milks [src] using \the [O].") var/transfered = udder.trans_id_to(G, "milk", rand(5,10)) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm index d6427b0d256..83a10048c1c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm @@ -99,14 +99,14 @@ speak_emote = list("chitters") meat_amount = 5 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat + meat_type = /obj/item/reagent_containers/food/snacks/xenomeat/spidermeat say_list_type = /datum/say_list/spider tame_items = list( - /obj/item/weapon/reagent_containers/food/snacks/xenomeat = 10, - /obj/item/weapon/reagent_containers/food/snacks/crabmeat = 40, - /obj/item/weapon/reagent_containers/food/snacks/meat = 20 + /obj/item/reagent_containers/food/snacks/xenomeat = 10, + /obj/item/reagent_containers/food/snacks/crabmeat = 40, + /obj/item/reagent_containers/food/snacks/meat = 20 ) var/poison_type = "spidertoxin" // The reagent that gets injected when it attacks. diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/hunter.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/hunter.dm index 4c132a5e3a7..5e2567d96de 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/hunter.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/hunter.dm @@ -103,7 +103,7 @@ set_AI_busy(FALSE) -// var/obj/item/weapon/grab/G = new(src, victim) +// var/obj/item/grab/G = new(src, victim) // put_in_active_hand(G) // G.synch() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/phorogenic.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/phorogenic.dm index 89cb5b835c0..dd434d4fb79 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/phorogenic.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/phorogenic.dm @@ -46,7 +46,7 @@ poison_type = "phoron" tame_items = list( - /obj/item/weapon/tank/phoron = 20, + /obj/item/tank/phoron = 20, /obj/item/stack/material/phoron = 30 ) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm index 53d4bd0d244..f95b705add4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm @@ -188,7 +188,7 @@ new /obj/effect/temporary_effect/tunneler_hole(get_turf(src)) /mob/living/simple_mob/animal/giant_spider/tunneler/proc/dig_under_floor(turf/T) - new /obj/item/weapon/ore/glass(T) // This will be rather weird when on station but the alternative is too much work. + new /obj/item/ore/glass(T) // This will be rather weird when on station but the alternative is too much work. /obj/effect/temporary_effect/tunneler_hole name = "hole" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm index 6af704e2bbe..62a59608005 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm @@ -18,7 +18,7 @@ organ_names = /decl/mob_organ_names/crab - meat_type = /obj/item/weapon/reagent_containers/food/snacks/crabmeat + meat_type = /obj/item/reagent_containers/food/snacks/crabmeat meat_amount = 3 say_list_type = /datum/say_list/crab diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm index 5b8a5f2177d..5423f63f3bd 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm @@ -20,9 +20,9 @@ organ_names = /decl/mob_organ_names/fish - holder_type = /obj/item/weapon/holder/fish + holder_type = /obj/item/holder/fish - meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish + meat_type = /obj/item/reagent_containers/food/snacks/carpmeat/fish meat_amount = 3 // By default they can be in any water turf. Subtypes might restrict to deep/shallow etc @@ -132,7 +132,7 @@ catalogue_data = list(/datum/category_item/catalogue/fauna/javelin) - meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sif + meat_type = /obj/item/reagent_containers/food/snacks/carpmeat/fish/sif /datum/category_item/catalogue/fauna/icebass name = "Sivian Fauna - Glitter Bass" @@ -159,7 +159,7 @@ catalogue_data = list(/datum/category_item/catalogue/fauna/icebass) - meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sif + meat_type = /obj/item/reagent_containers/food/snacks/carpmeat/fish/sif var/max_red = 150 var/min_red = 50 @@ -248,7 +248,7 @@ var/image/head_image - meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sif + meat_type = /obj/item/reagent_containers/food/snacks/carpmeat/fish/sif /mob/living/simple_mob/animal/passive/fish/rockfish/Initialize() . = ..() @@ -295,7 +295,7 @@ has_eye_glow = TRUE - meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sif + meat_type = /obj/item/reagent_containers/food/snacks/carpmeat/fish/sif /datum/category_item/catalogue/fauna/murkin name = "Sivian Fauna - Murkfish" @@ -322,7 +322,7 @@ catalogue_data = list(/datum/category_item/catalogue/fauna/murkin) - meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif/murkfish + meat_type = /obj/item/reagent_containers/food/snacks/carpmeat/sif/murkfish /decl/mob_organ_names/fish hit_zones = list("head", "body", "dorsal fin", "left pectoral fin", "right pectoral fin", "tail fin") \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm index 741f3f279a8..658e4b62d7e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm @@ -69,7 +69,7 @@ icon_living = "measelshark" icon_dead = "measelshark-dead" meat_amount = 8 //Big fish, tons of meat. Great for feasts. - meat_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/sharkchunk + meat_type = /obj/item/reagent_containers/food/snacks/sliceable/sharkchunk vore_active = 1 vore_bump_chance = 100 vore_default_mode = DM_HOLD //docile shark diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm index 0220cb1686f..844cd29559f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm @@ -34,7 +34,7 @@ has_langs = list(LANGUAGE_MOUSE) - holder_type = /obj/item/weapon/holder/mouse + holder_type = /obj/item/holder/mouse meat_amount = 1 butchery_loot = list() @@ -63,17 +63,17 @@ icon_rest = "mouse_[body_color]_sleep" if (body_color != "rat") desc = "A small [body_color] rodent, often seen hiding in maintenance areas and making a nuisance of itself." - holder_type = /obj/item/weapon/holder/mouse/rat + holder_type = /obj/item/holder/mouse/rat if (body_color == "operative") - holder_type = /obj/item/weapon/holder/mouse/operative + holder_type = /obj/item/holder/mouse/operative if (body_color == "brown") - holder_type = /obj/item/weapon/holder/mouse/brown + holder_type = /obj/item/holder/mouse/brown if (body_color == "gray") - holder_type = /obj/item/weapon/holder/mouse/gray + holder_type = /obj/item/holder/mouse/gray if (body_color == "white") - holder_type = /obj/item/weapon/holder/mouse/white + holder_type = /obj/item/holder/mouse/white if (body_color == "black") - holder_type = /obj/item/weapon/holder/mouse/black + holder_type = /obj/item/holder/mouse/black /mob/living/simple_mob/animal/passive/mouse/Crossed(atom/movable/AM as mob|obj) if(AM.is_incorporeal()) @@ -112,19 +112,19 @@ body_color = "white" icon_state = "mouse_white" icon_rest = "mouse_white_sleep" - holder_type = /obj/item/weapon/holder/mouse/white + holder_type = /obj/item/holder/mouse/white /mob/living/simple_mob/animal/passive/mouse/gray body_color = "gray" icon_state = "mouse_gray" icon_rest = "mouse_gray_sleep" - holder_type = /obj/item/weapon/holder/mouse/gray + holder_type = /obj/item/holder/mouse/gray /mob/living/simple_mob/animal/passive/mouse/brown body_color = "brown" icon_state = "mouse_brown" icon_rest = "mouse_brown_sleep" - holder_type = /obj/item/weapon/holder/mouse/brown + holder_type = /obj/item/holder/mouse/brown //TOM IS ALIVE! SQUEEEEEEEE~K :) /mob/living/simple_mob/animal/passive/mouse/brown/Tom @@ -140,7 +140,7 @@ body_color = "black" icon_state = "mouse_black" icon_rest = "mouse_black_sleep" - holder_type = /obj/item/weapon/holder/mouse/black + holder_type = /obj/item/holder/mouse/black /mob/living/simple_mob/animal/passive/mouse/rat name = "rat" @@ -149,7 +149,7 @@ body_color = "rat" icon_state = "mouse_rat" icon_rest = "mouse_rat_sleep" - holder_type = /obj/item/weapon/holder/mouse/rat + holder_type = /obj/item/holder/mouse/rat maxHealth = 20 health = 20 @@ -161,7 +161,7 @@ body_color = "operative" icon_state = "mouse_operative" icon_rest = "mouse_operative_sleep" - holder_type = /obj/item/weapon/holder/mouse/operative + holder_type = /obj/item/holder/mouse/operative maxHealth = 35 //It's wearing a void suit, it don't care about atmos diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm index fd5fd72404f..d5c2dc72edb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm @@ -12,7 +12,7 @@ movement_cooldown = 5 universal_understand = 1 -/obj/item/weapon/holder/mouse/attack_self(var/mob/U) +/obj/item/holder/mouse/attack_self(var/mob/U) for(var/mob/living/simple_mob/M in src.contents) if((I_HELP) && U.checkClickCooldown()) //a little snowflakey, but makes it use the same cooldown as interacting with non-inventory objects U.setClickCooldown(U.get_attack_speed()) //if there's a cleaner way in baycode, I'll change this @@ -37,7 +37,7 @@ else if(grabber.incapacitated()) return - var/obj/item/weapon/holder/H = new holder_type(get_turf(src), src) + var/obj/item/holder/H = new holder_type(get_turf(src), src) grabber.put_in_hands(H) if(self_grab) @@ -62,7 +62,7 @@ name = initial(name) desc = initial(desc) -/obj/item/weapon/holder/mouse/attack_self(mob/living/carbon/user) +/obj/item/holder/mouse/attack_self(mob/living/carbon/user) user.setClickCooldown(user.get_attack_speed()) for(var/L in contents) if(isanimal(L)) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/penguin.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/penguin.dm index 5f0f0107634..ec17fa69c0b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/penguin.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/penguin.dm @@ -17,7 +17,7 @@ organ_names = /decl/mob_organ_names/penguin meat_amount = 3 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken + meat_type = /obj/item/reagent_containers/food/snacks/meat/chicken harm_intent_damage = 5 melee_damage_lower = 10 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm index 14774781090..f3696edd333 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm @@ -19,8 +19,8 @@ if(!ispath(critter, /mob/living/simple_mob)) return INITIALIZE_HINT_QDEL - var/obj/item/weapon/holder/critter_holder = initial(critter.holder_type) - if(!ispath(critter_holder, /obj/item/weapon/holder)) + var/obj/item/holder/critter_holder = initial(critter.holder_type) + if(!ispath(critter_holder, /obj/item/holder)) return INITIALIZE_HINT_QDEL var/mob/M = loc @@ -132,7 +132,7 @@ maxbodytemp = 323 universal_speak = FALSE universal_understand = TRUE - holder_type = /obj/item/weapon/holder/possum + holder_type = /obj/item/holder/possum mob_size = MOB_SMALL can_pull_size = 2 can_pull_mobs = MOB_PULL_SMALLER @@ -198,7 +198,7 @@ icon_rest = "poppy_dead" tt_desc = "Didelphis astrum salutem" organ_names = /decl/mob_organ_names/poppy - holder_type = /obj/item/weapon/holder/possum/poppy + holder_type = /obj/item/holder/possum/poppy ai_holder_type = /datum/ai_holder/simple_mob/passive/possum/poppy /decl/mob_organ_names/possum diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm index 8f5e413b878..141f88e82a4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm @@ -24,7 +24,7 @@ parachuting = TRUE meat_amount = 1 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken + meat_type = /obj/item/reagent_containers/food/snacks/meat/chicken attacktext = list("clawed", "pecked") speak_emote = list("chirps", "caws") @@ -35,7 +35,7 @@ organ_names = /decl/mob_organ_names/bird say_list_type = /datum/say_list/bird - holder_type = /obj/item/weapon/holder/bird + holder_type = /obj/item/holder/bird /datum/say_list/bird speak = list("Chirp!","Caw!","Screech!","Squawk!") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm index 3cd98dc6be2..5af1e127e36 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm @@ -43,7 +43,7 @@ var/list/_cat_default_emotes = list( response_disarm = "gently pushes aside" response_harm = "kicks" - holder_type = /obj/item/weapon/holder/cat + holder_type = /obj/item/holder/cat mob_size = MOB_SMALL has_langs = list(LANGUAGE_ANIMAL) @@ -136,7 +136,7 @@ var/list/_cat_default_emotes = list( icon_state = "cat" item_state = "cat" named = TRUE - holder_type = /obj/item/weapon/holder/cat/runtime + holder_type = /obj/item/holder/cat/runtime makes_dirt = 0 //Vorestation Edit /mob/living/simple_mob/animal/passive/cat/kitten @@ -145,7 +145,7 @@ var/list/_cat_default_emotes = list( icon_state = "kitten" item_state = "kitten" gender = NEUTER - holder_type = /obj/item/weapon/holder/cat/kitten //VOREStation Edit + holder_type = /obj/item/holder/cat/kitten //VOREStation Edit /mob/living/simple_mob/animal/passive/cat/kitten/Initialize() if(gender == NEUTER) @@ -166,7 +166,7 @@ var/list/_cat_default_emotes = list( icon_state = "cat3" item_state = "cat3" named = TRUE - holder_type = /obj/item/weapon/holder/cat/fluff/bones + holder_type = /obj/item/holder/cat/fluff/bones // SPARKLY /mob/living/simple_mob/animal/passive/cat/bluespace @@ -178,7 +178,7 @@ var/list/_cat_default_emotes = list( icon_rest = null icon_dead = null makes_dirt = 0 - holder_type = /obj/item/weapon/holder/cat/bluespace + holder_type = /obj/item/holder/cat/bluespace /mob/living/simple_mob/animal/passive/cat/bluespace/death() animate(src, alpha = 0, color = "#0000FF", time = 0.5 SECOND) @@ -195,7 +195,7 @@ var/list/_cat_default_emotes = list( icon_dead = "breadcat_dead" //icon_sit = "breadcat_sit" makes_dirt = 0 - holder_type = /obj/item/weapon/holder/cat/breadcat + holder_type = /obj/item/holder/cat/breadcat /mob/living/simple_mob/animal/passive/cat/original name = "original cat" @@ -207,7 +207,7 @@ var/list/_cat_default_emotes = list( icon_dead = "original_dead" //icon_sit = "original_sit" makes_dirt = 0 - holder_type = /obj/item/weapon/holder/cat/original + holder_type = /obj/item/holder/cat/original /mob/living/simple_mob/animal/passive/cat/cak name = "cak" @@ -219,7 +219,7 @@ var/list/_cat_default_emotes = list( icon_dead = "cak_dead" //icon_sit = "cak_sit" makes_dirt = 0 - holder_type = /obj/item/weapon/holder/cat/cak + holder_type = /obj/item/holder/cat/cak /mob/living/simple_mob/animal/passive/cat/space name = "space cat" @@ -230,7 +230,7 @@ var/list/_cat_default_emotes = list( icon_rest = "spacecat_rest" icon_dead = "spacecat_dead" //icon_sit = "spacecat_sit" - holder_type = /obj/item/weapon/holder/cat/spacecat + holder_type = /obj/item/holder/cat/spacecat makes_dirt = 0 minbodytemp = 0 // Minimum "okay" temperature in kelvin @@ -255,8 +255,8 @@ var/list/_cat_default_emotes = list( say_maybe_target = list("Meow?","Mew?","Mao?") say_got_target = list("MEOW!","HSSSS!","REEER!") -/mob/living/simple_mob/animal/passive/cat/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen)) +/mob/living/simple_mob/animal/passive/cat/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/pen) || istype(W, /obj/item/flashlight/pen)) if(named) to_chat(user, "\The [name] already has a name!") else @@ -270,19 +270,19 @@ var/list/_cat_default_emotes = list( else ..() -/obj/item/weapon/cat_box +/obj/item/cat_box name = "faintly purring box" desc = "This box is purring faintly. You're pretty sure there's a cat inside it." icon = 'icons/obj/storage.dmi' icon_state = "box" var/cattype = /mob/living/simple_mob/animal/passive/cat -/obj/item/weapon/cat_box/attack_self(var/mob/user) +/obj/item/cat_box/attack_self(var/mob/user) var/turf/catturf = get_turf(src) to_chat(user, "You peek into \the [name]-- and a cat jumps out!") new cattype(catturf) new /obj/item/stack/material/cardboard(catturf) //if i fits i sits qdel(src) -/obj/item/weapon/cat_box/black +/obj/item/cat_box/black cattype = /mob/living/simple_mob/animal/passive/cat/black diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat_vr.dm index 42f30cc3d81..771d373947c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat_vr.dm @@ -38,7 +38,7 @@ icon_state = "kitten" item_state = "kitten" gender = MALE - holder_type = /obj/item/weapon/holder/cat/fluff/tabiranth + holder_type = /obj/item/holder/cat/fluff/tabiranth friend_name = "Ascian" digestable = 0 meat_amount = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm index dc24b8d396e..89bbcef69f8 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm @@ -22,14 +22,14 @@ say_list_type = /datum/say_list/dog meat_amount = 3 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi + meat_type = /obj/item/reagent_containers/food/snacks/meat/corgi var/obj/item/inventory_head var/obj/item/inventory_back /mob/living/simple_mob/animal/passive/dog/attackby(var/obj/item/O as obj, var/mob/user as mob) - if(istype(O, /obj/item/weapon/newspaper)) + if(istype(O, /obj/item/newspaper)) if(!stat) for(var/mob/M in viewers(user, null)) if ((M.client && !( M.blinded ))) @@ -67,7 +67,7 @@ -/obj/item/weapon/reagent_containers/food/snacks/meat/corgi +/obj/item/reagent_containers/food/snacks/meat/corgi name = "corgi meat" desc = "Tastes like... well, you know..." @@ -88,7 +88,7 @@ icon_state = "corgi" icon_living = "corgi" icon_dead = "corgi_dead" - holder_type = /obj/item/weapon/holder/corgi + holder_type = /obj/item/holder/corgi organ_names = /decl/mob_organ_names/corgi /mob/living/simple_mob/animal/passive/dog/corgi/puppy @@ -98,7 +98,7 @@ icon_state = "puppy" icon_living = "puppy" icon_dead = "puppy_dead" - holder_type = /obj/item/weapon/holder/corgi + holder_type = /obj/item/holder/corgi //pupplies cannot wear anything. /mob/living/simple_mob/animal/passive/dog/corgi/puppy/Topic(href, href_list) @@ -120,7 +120,7 @@ var/turns_since_scan = 0 var/obj/movement_target makes_dirt = FALSE //VOREStation edit: no more dirt - holder_type = /obj/item/weapon/holder/corgi + holder_type = /obj/item/holder/corgi /mob/living/simple_mob/animal/passive/dog/corgi/Ian/Life() ..() @@ -136,7 +136,7 @@ movement_target = null if( !movement_target || !(movement_target.loc in oview(src, 3)) ) movement_target = null - for(var/obj/item/weapon/reagent_containers/food/snacks/S in oview(src,3)) + for(var/obj/item/reagent_containers/food/snacks/S in oview(src,3)) if(isturf(S.loc) || ishuman(S.loc)) movement_target = S break @@ -185,7 +185,7 @@ response_harm = "kicks" var/turns_since_scan = 0 var/puppies = 0 - holder_type = /obj/item/weapon/holder/lisa + holder_type = /obj/item/holder/lisa //Lisa already has a cute bow! /mob/living/simple_mob/animal/passive/dog/corgi/Lisa/Topic(href, href_list) @@ -235,7 +235,7 @@ icon_dead = "narsian_dead" makes_dirt = FALSE - holder_type = /obj/item/weapon/holder/narsian + holder_type = /obj/item/holder/narsian /mob/living/simple_mob/animal/passive/dog/void_puppy name = "void puppy" @@ -243,7 +243,7 @@ icon_state = "void_puppy" icon_living = "void_puppy" icon_dead = "void_puppy_dead" - holder_type = /obj/item/weapon/holder/void_puppy + holder_type = /obj/item/holder/void_puppy /mob/living/simple_mob/animal/passive/dog/bullterrier name = "bull terrier" @@ -252,7 +252,7 @@ icon_living = "bullterrier" icon_dead = "bullterrier_dead" icon_rest = null - holder_type = /obj/item/weapon/holder/bullterrier + holder_type = /obj/item/holder/bullterrier // Tamaskans /mob/living/simple_mob/animal/passive/dog/tamaskan diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fennec.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fennec.dm index 9adf67d779a..453645b19b6 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fennec.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fennec.dm @@ -12,7 +12,7 @@ response_disarm = "gently pushes aside" response_harm = "kicks" - holder_type = /obj/item/weapon/holder/fennec + holder_type = /obj/item/holder/fennec mob_size = MOB_SMALL has_langs = list(LANGUAGE_ANIMAL) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm index 30a9c8a875e..5b75e806f67 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm @@ -24,11 +24,11 @@ maxbodytemp = 323 //Above 50 Degrees Celcius meat_amount = 2 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/fox + meat_type = /obj/item/reagent_containers/food/snacks/meat/fox say_list_type = /datum/say_list/fox ai_holder_type = /datum/ai_holder/simple_mob/fox - holder_type = /obj/item/weapon/holder/fox + holder_type = /obj/item/holder/fox var/turns_since_scan = 0 var/mob/flee_target diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm index e985111c0c9..68442e52397 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm @@ -9,7 +9,7 @@ // A headset, so that talking parrots can yell at the crew over comms. // If set to a type, on initialize it will be instantiated into that type. - var/obj/item/device/radio/headset/my_headset = null + var/obj/item/radio/headset/my_headset = null // Say list /datum/say_list/bird/poly @@ -44,13 +44,13 @@ /mob/living/simple_mob/animal/passive/bird/parrot/handle_message_mode(message_mode, message, verb, used_radios, whispering) ..() if(message_mode) - if(my_headset && istype(my_headset, /obj/item/device/radio)) + if(my_headset && istype(my_headset, /obj/item/radio)) my_headset.talk_into(src, message, message_mode, verb, whispering) used_radios += my_headset // Clicked on while holding an object. /mob/living/simple_mob/animal/passive/bird/parrot/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/device/radio/headset)) + if(istype(I, /obj/item/radio/headset)) give_headset(I, user) return return ..() @@ -63,7 +63,7 @@ ..() -/mob/living/simple_mob/animal/passive/bird/parrot/proc/give_headset(obj/item/device/radio/headset/new_headset, mob/living/user) +/mob/living/simple_mob/animal/passive/bird/parrot/proc/give_headset(obj/item/radio/headset/new_headset, mob/living/user) if(!istype(new_headset)) to_chat(user, span("warning", "\The [new_headset] isn't a headset.")) return @@ -110,12 +110,12 @@ icon_dead = "poly-dead" tt_desc = "E Ara macao" attack_armor_pen = 20 //HE HAS THE B E A K - my_headset = /obj/item/device/radio/headset/headset_eng + my_headset = /obj/item/radio/headset/headset_eng say_list_type = /datum/say_list/bird/poly // Best Bird with best headset. /mob/living/simple_mob/animal/passive/bird/parrot/poly/ultimate - my_headset = /obj/item/device/radio/headset/omni + my_headset = /obj/item/radio/headset/omni /mob/living/simple_mob/animal/passive/bird/parrot/kea name = "kea" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm index eb7a5ccec7d..2f6b93a7a17 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm @@ -30,7 +30,7 @@ health = 25 meat_amount = 2 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat movement_cooldown = -1 @@ -44,7 +44,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/retaliate/cooperative // What do you hit the mob with (on help) to get something from it? - harvest_tool = /obj/item/weapon/tool/wirecutters + harvest_tool = /obj/item/tool/wirecutters // How long do we have to wait until it's harvestable again? harvest_cooldown = 10 MINUTES // How long does it take to harvest? diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm index 7e6072a7cbd..8d569c2c0f9 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm @@ -33,7 +33,7 @@ movement_cooldown = -1 meat_amount = 4 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken + meat_type = /obj/item/reagent_containers/food/snacks/meat/chicken melee_damage_lower = 2 melee_damage_upper = 10 @@ -44,8 +44,8 @@ organ_names = /decl/mob_organ_names/bird tame_items = list( - /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread = 90, - /obj/item/weapon/reagent_containers/food/snacks/slice/bread = 25 + /obj/item/reagent_containers/food/snacks/sliceable/bread = 90, + /obj/item/reagent_containers/food/snacks/slice/bread = 25 ) say_list_type = /datum/say_list/duck @@ -62,7 +62,7 @@ var/has_food = FALSE if(isliving(L)) for(var/obj/item/I in L.get_contents()) // Do they have food? - if(istype(I, /obj/item/weapon/reagent_containers/food)) + if(istype(I, /obj/item/reagent_containers/food)) has_food = TRUE break if(has_food) // Yes? Gimme the food. diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/fluffy_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/fluffy_vr.dm index 0b581ca5117..992b9e649a7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/fluffy_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/fluffy_vr.dm @@ -30,7 +30,7 @@ maxbodytemp = 323 //Above 50 Degrees Celcius meat_amount = 1 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat say_list_type = /datum/say_list/fluffy_vr ai_holder_type = /datum/ai_holder/simple_mob/passive diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm index 4a90129e709..5b3b1c7ebc3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm @@ -55,9 +55,9 @@ organ_names = /decl/mob_organ_names/smallflying tame_items = list( - /obj/item/weapon/reagent_containers/food/snacks/grown = 90, - /obj/item/weapon/reagent_containers/food/snacks/crabmeat = 10, - /obj/item/weapon/reagent_containers/food/snacks/meat = 5 + /obj/item/reagent_containers/food/snacks/grown = 90, + /obj/item/reagent_containers/food/snacks/crabmeat = 10, + /obj/item/reagent_containers/food/snacks/meat = 5 ) say_list_type = /datum/say_list/glitterfly @@ -93,8 +93,8 @@ . = ..() if(.) - if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown)) - var/obj/item/weapon/reagent_containers/food/snacks/grown/G = O + if(istype(O, /obj/item/reagent_containers/food/snacks/grown)) + var/obj/item/reagent_containers/food/snacks/grown/G = O if(G.seed && G.seed.kitchen_tag == "berries") return TRUE diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm index 48706ddeb59..dac2ef0ad65 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm @@ -72,7 +72,7 @@ attack_edge = TRUE melee_attack_delay = 1 SECOND - meat_type = /obj/item/weapon/reagent_containers/food/snacks/crabmeat + meat_type = /obj/item/reagent_containers/food/snacks/crabmeat meat_amount = 6 response_help = "pets" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm index 98b981f5012..8319eef5c79 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm @@ -58,7 +58,7 @@ a_intent = I_HELP - holder_type = /obj/item/weapon/holder/leech + holder_type = /obj/item/holder/leech movement_cooldown = -2 aquatic_movement = -2 @@ -495,7 +495,7 @@ else if(istype(A, /obj/item)) var/obj/item/I = A - if(istype(I, /obj/item/weapon/reagent_containers/food/snacks)) + if(istype(I, /obj/item/reagent_containers/food/snacks)) holder.a_intent = I_HURT else holder.a_intent = I_HURT diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm index b11c2e2883f..686b23df624 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm @@ -66,7 +66,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/retaliate/cooperative/sakimm var/obj/item/clothing/head/hat = null // The hat the Sakimm may be wearing. - var/list/friend_loot_list = list(/obj/item/weapon/coin) // What will make this animal non-hostile if held? + var/list/friend_loot_list = list(/obj/item/coin) // What will make this animal non-hostile if held? var/randomize_size = TRUE /mob/living/simple_mob/animal/sif/sakimm/verb/remove_hat() @@ -198,7 +198,7 @@ flee_when_dying = TRUE var/greed = 0 // The probability we will try to steal something. Increases over time if we are not holding something, or wearing a hat. - var/list/steal_loot_list = list(/obj/item/weapon/coin, /obj/item/weapon/gun, /obj/item/weapon/fossil, /obj/item/stack/material, /obj/item/weapon/material, /obj/item/weapon/reagent_containers/food/snacks, /obj/item/clothing/head, /obj/item/weapon/reagent_containers/glass, /obj/item/device/flashlight, /obj/item/stack/medical, /obj/item/seeds, /obj/item/weapon/spacecash) + var/list/steal_loot_list = list(/obj/item/coin, /obj/item/gun, /obj/item/fossil, /obj/item/stack/material, /obj/item/material, /obj/item/reagent_containers/food/snacks, /obj/item/clothing/head, /obj/item/reagent_containers/glass, /obj/item/flashlight, /obj/item/stack/medical, /obj/item/seeds, /obj/item/spacecash) var/hoard_items = TRUE var/hoard_distance = 1 // How far an item can be from the Sakimm's home turf to be counted inside its 'hoard'. var/original_home_distance = null @@ -295,7 +295,7 @@ else if(istype(A, /obj/item)) var/obj/item/I = A - if(istype(I, /obj/item/weapon/reagent_containers/food/snacks)) // If we can't pick it up, or it's edible, go to harm. + if(istype(I, /obj/item/reagent_containers/food/snacks)) // If we can't pick it up, or it's edible, go to harm. holder.a_intent = I_HURT else holder.a_intent = I_HELP diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm index d9fa4fc04df..79ccba68273 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm @@ -48,8 +48,8 @@ tame_items = list( /obj/item/organ = 70, - /obj/item/weapon/reagent_containers/food/snacks/crabmeat = 30, - /obj/item/weapon/reagent_containers/food/snacks/meat = 20 + /obj/item/reagent_containers/food/snacks/crabmeat = 30, + /obj/item/reagent_containers/food/snacks/meat = 20 ) say_list_type = /datum/say_list/savik diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/sif.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/sif.dm index 6ef4f5b0093..970365d457b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/sif.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/sif.dm @@ -6,6 +6,6 @@ allow_mind_transfer = TRUE tame_items = list( - /obj/item/weapon/reagent_containers/food/snacks/crabmeat = 20, - /obj/item/weapon/reagent_containers/food/snacks/meat = 10 + /obj/item/reagent_containers/food/snacks/crabmeat = 20, + /obj/item/reagent_containers/food/snacks/meat = 10 ) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm index 69d048a712f..cbd40334563 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm @@ -30,7 +30,7 @@ attacktext = list("slashed") attack_sound = 'sound/weapons/bladeslice.ogg' - meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat + meat_type = /obj/item/reagent_containers/food/snacks/xenomeat meat_amount = 5 /mob/living/simple_mob/animal/space/alien/drone diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm index 24be3514d8f..5b511d98f76 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm @@ -32,7 +32,7 @@ has_langs = list(LANGUAGE_MOUSE, LANGUAGE_ECHOSONG) // Haha squeak - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat meat_amount = 2 say_list_type = /datum/say_list/mouse // Close enough diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/bear.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/bear.dm index 334728006ac..7270b2c4918 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/bear.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/bear.dm @@ -22,7 +22,7 @@ melee_attack_delay = 1 SECOND attacktext = list("mauled") - meat_type = /obj/item/weapon/reagent_containers/food/snacks/bearmeat + meat_type = /obj/item/reagent_containers/food/snacks/bearmeat meat_amount = 8 say_list_type = /datum/say_list/bear diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm index e7c5983452e..b0eba2bee19 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm @@ -54,7 +54,7 @@ organ_names = /decl/mob_organ_names/fish meat_amount = 5 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat + meat_type = /obj/item/reagent_containers/food/snacks/carpmeat ai_holder_type = /datum/ai_holder/simple_mob/melee diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/gnat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/gnat.dm index 78c416bd177..cc613f7d47b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/gnat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/gnat.dm @@ -46,7 +46,7 @@ organ_names = /decl/mob_organ_names/fish meat_amount = 1 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/gnat + meat_type = /obj/item/reagent_containers/food/snacks/carpmeat/gnat ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/jellyfish mob_bump_flag = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm index 5025572a9c7..0d5ad98cae0 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm @@ -25,7 +25,7 @@ has_langs = list(LANGUAGE_ANIMAL) - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken + meat_type = /obj/item/reagent_containers/food/snacks/meat/chicken meat_amount = 3 /datum/say_list/goose diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm index 496b541459f..873853a41cf 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm @@ -56,7 +56,7 @@ organ_names = /decl/mob_organ_names/fish meat_amount = 5 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/ray + meat_type = /obj/item/reagent_containers/food/snacks/carpmeat/ray ai_holder_type = /datum/ai_holder/simple_mob/retaliate/chill mob_bump_flag = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm index 6998e46e7f8..07df87edfb0 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm @@ -39,7 +39,7 @@ organ_names = /decl/mob_organ_names/fish meat_amount = 10 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/shark + meat_type = /obj/item/reagent_containers/food/snacks/carpmeat/shark ai_holder_type = /datum/ai_holder/simple_mob/melee diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm index 1ca45243dd7..8d4234567e0 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm @@ -38,7 +38,7 @@ response_harm = "kicks" meat_amount = 2 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat melee_damage_lower = 2 melee_damage_upper = 3 @@ -103,7 +103,7 @@ movement_target = null if( !movement_target || !(movement_target.loc in oview(src, 3)) ) movement_target = null - for(var/obj/item/weapon/reagent_containers/food/snacks/snakesnack/S in oview(src,3)) + for(var/obj/item/reagent_containers/food/snacks/snakesnack/S in oview(src,3)) if(isturf(S.loc) || ishuman(S.loc)) movement_target = S visible_emote("turns towards \the [movement_target] and slithers towards it.") @@ -142,7 +142,7 @@ ..() /mob/living/simple_mob/animal/passive/snake/python/noodle/attackby(var/obj/item/O, var/mob/user) - if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/snakesnack)) + if(istype(O, /obj/item/reagent_containers/food/snacks/snakesnack)) visible_message("[user] feeds \the [O] to [src].") qdel(O) else @@ -151,7 +151,7 @@ /* * Special snek-snax for Noodle! */ -/obj/item/weapon/reagent_containers/food/snacks/snakesnack +/obj/item/reagent_containers/food/snacks/snakesnack name = "sugar mouse" desc = "A little mouse treat made of coloured sugar. Noodle loves these!" var/snack_colour @@ -160,7 +160,7 @@ nutriment_amt = 1 nutriment_desc = list("sugar" = 1) -/obj/item/weapon/reagent_containers/food/snacks/snakesnack/Initialize() +/obj/item/reagent_containers/food/snacks/snakesnack/Initialize() . = ..() if(!snack_colour) snack_colour = pick( list("yellow","green","pink","blue") ) @@ -168,19 +168,19 @@ desc = "A little mouse treat made of coloured sugar. Noodle loves these! This one is [snack_colour]." reagents.add_reagent("sugar", 2) -/obj/item/weapon/storage/box/snakesnackbox +/obj/item/storage/box/snakesnackbox name = "box of Snake Snax" desc = "A box containing Noodle's special sugermouse treats." icon = 'icons/mob/snake_vr.dmi' icon_state = "sneksnakbox" storage_slots = 7 -/obj/item/weapon/storage/box/snakesnackbox/New() - new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) - new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) - new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) - new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) - new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) - new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) - new /obj/item/weapon/reagent_containers/food/snacks/snakesnack(src) +/obj/item/storage/box/snakesnackbox/New() + new /obj/item/reagent_containers/food/snacks/snakesnack(src) + new /obj/item/reagent_containers/food/snacks/snakesnack(src) + new /obj/item/reagent_containers/food/snacks/snakesnack(src) + new /obj/item/reagent_containers/food/snacks/snakesnack(src) + new /obj/item/reagent_containers/food/snacks/snakesnack(src) + new /obj/item/reagent_containers/food/snacks/snakesnack(src) + new /obj/item/reagent_containers/food/snacks/snakesnack(src) ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm index b67f102df62..3f5266d2b95 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm @@ -36,7 +36,7 @@ mob_class = MOB_CLASS_ABERRATION // It's a monster. meat_amount = 10 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/worm + meat_type = /obj/item/reagent_containers/food/snacks/meat/worm var/mob/living/simple_mob/animal/space/space_worm/previous //next/previous segments, correspondingly var/mob/living/simple_mob/animal/space/space_worm/next //head is the nextest segment diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm b/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm index ce8dc2059c3..54bd9fcf1f5 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm @@ -24,7 +24,7 @@ health = 40 movement_cooldown = -1 meat_amount = 1 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat response_help = "pets" response_disarm = "slaps" diff --git a/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm b/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm index b4da2af7927..4c9ba00cd6e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm +++ b/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm @@ -77,8 +77,8 @@ if(!ally) var/list/items = L.get_all_held_items() for(var/obj/item/I in items) - if(istype(I, /obj/item/weapon/blobcore_chunk)) - var/obj/item/weapon/blobcore_chunk/BC = I + if(istype(I, /obj/item/blobcore_chunk)) + var/obj/item/blobcore_chunk/BC = I if(!overmind || (BC.blob_type && overmind.blob_type.type == BC.blob_type.type) || BC.blob_type.faction == faction) ally = TRUE break diff --git a/code/modules/mob/living/simple_mob/subtypes/glamour/homunculus.dm b/code/modules/mob/living/simple_mob/subtypes/glamour/homunculus.dm index febdbe3dd61..f8b0ca0cb03 100644 --- a/code/modules/mob/living/simple_mob/subtypes/glamour/homunculus.dm +++ b/code/modules/mob/living/simple_mob/subtypes/glamour/homunculus.dm @@ -65,51 +65,51 @@ resize(H.size_multiplier, ignore_prefs = TRUE) var/obj/item/A = H.get_active_hand() var/obj/item/I = H.get_inactive_hand() - if(istype(A,/obj/item/weapon/material) || istype(A,/obj/item/weapon/melee) || istype(I,/obj/item/weapon/material) || istype(I,/obj/item/weapon/melee)) + if(istype(A,/obj/item/material) || istype(A,/obj/item/melee) || istype(I,/obj/item/material) || istype(I,/obj/item/melee)) seen_melee = 1 melee_damage_lower = 20 melee_damage_upper = 30 - if(istype(A,/obj/item/weapon/gun/projectile) || istype(I,/obj/item/weapon/gun/projectile)) + if(istype(A,/obj/item/gun/projectile) || istype(I,/obj/item/gun/projectile)) seen_gun = 1 projectiletype = /obj/item/projectile/bullet/pistol/medium projectilesound = 'sound/weapons/Gunshot_light.ogg' - if(istype(A,/obj/item/weapon/gun/projectile/shotgun) || istype(I,/obj/item/weapon/gun/projectile/shotgun)) + if(istype(A,/obj/item/gun/projectile/shotgun) || istype(I,/obj/item/gun/projectile/shotgun)) projectiletype = /obj/item/projectile/bullet/pellet/shotgun projectilesound = 'sound/weapons/Gunshot_shotgun.ogg' reload_time = 1.5 SECONDS ranged_attack_delay = 1.5 SECONDS projectile_dispersion = 8 projectile_accuracy = -40 - if(istype(A,/obj/item/weapon/gun/projectile/automatic) || istype(I,/obj/item/weapon/gun/projectile/automatic)) + if(istype(A,/obj/item/gun/projectile/automatic) || istype(I,/obj/item/gun/projectile/automatic)) base_attack_cooldown = 5 projectile_dispersion = 7 projectile_accuracy = -20 - if(istype(A,/obj/item/weapon/gun/projectile/heavysniper) || istype(I,/obj/item/weapon/gun/projectile/heavysniper)) + if(istype(A,/obj/item/gun/projectile/heavysniper) || istype(I,/obj/item/gun/projectile/heavysniper)) projectiletype = /obj/item/projectile/bullet/rifle/a145/highvel // Do not get seen with a big ass sniper! projectilesound = 'sound/weapons/Gunshot_cannon.ogg' ranged_attack_delay = 2.5 SECONDS reload_time = 5 SECONDS projectile_accuracy = 75 - if(istype(A,/obj/item/weapon/gun/energy) || istype(I,/obj/item/weapon/gun/energy)) + if(istype(A,/obj/item/gun/energy) || istype(I,/obj/item/gun/energy)) seen_gun = 1 projectiletype = /obj/item/projectile/beam/midlaser projectilesound = 'sound/weapons/Laser.ogg' projectile_dispersion = 5 projectile_accuracy = -20 - if(istype(A,/obj/item/weapon/gun/energy/ionrifle) || istype(I,/obj/item/weapon/gun/energy/ionrifle)) + if(istype(A,/obj/item/gun/energy/ionrifle) || istype(I,/obj/item/gun/energy/ionrifle)) projectiletype = /obj/item/projectile/ion - if(istype(A,/obj/item/weapon/gun/energy/lasercannon) || istype(I,/obj/item/weapon/gun/energy/lasercannon)) + if(istype(A,/obj/item/gun/energy/lasercannon) || istype(I,/obj/item/gun/energy/lasercannon)) projectiletype = /obj/item/projectile/beam/heavylaser ranged_attack_delay = 2.5 SECONDS reload_time = 5 SECONDS projectilesound = 'sound/weapons/lasercannonfire.ogg' - if(istype(A,/obj/item/weapon/gun/energy/sniperrifle) || istype(I,/obj/item/weapon/gun/energy/sniperrifle)) + if(istype(A,/obj/item/gun/energy/sniperrifle) || istype(I,/obj/item/gun/energy/sniperrifle)) projectiletype = /obj/item/projectile/beam/sniper // Do not get seen with a big ass sniper! projectilesound = 'sound/weapons/gauss_shoot.ogg' ranged_attack_delay = 2.5 SECONDS reload_time = 5 SECONDS projectile_accuracy = 75 - if(istype(A,/obj/item/weapon/gun/magnetic) || istype(I,/obj/item/weapon/gun/magnetic)) + if(istype(A,/obj/item/gun/magnetic) || istype(I,/obj/item/gun/magnetic)) seen_gun = 1 projectiletype = /obj/item/projectile/bullet/magnetic/bore projectilesound = 'sound/weapons/railgun.ogg' diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm index 5c3969d252e..14a76584bd1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm @@ -10,7 +10,7 @@ faction = FACTION_CLOWN - loot_list = list(/obj/item/weapon/bikehorn = 100) + loot_list = list(/obj/item/bikehorn = 100) response_help = "pokes" response_disarm = "gently pushes aside" diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm index be5111540ed..cc6d1132c1f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm @@ -31,13 +31,13 @@ armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 100, rad = 100) // Same armor values as the vest they drop, plus simple mob immunities corpse = /obj/effect/landmark/mobcorpse/syndicatesoldier - loot_list = list(/obj/item/weapon/material/knife/tacknife = 100) // Might as well give it the knife + loot_list = list(/obj/item/material/knife/tacknife = 100) // Might as well give it the knife ai_holder_type = /datum/ai_holder/simple_mob/merc say_list_type = /datum/say_list/merc // Grenade special attack vars - var/grenade_type = /obj/item/weapon/grenade/concussion + var/grenade_type = /obj/item/grenade/concussion special_attack_cooldown = 45 SECONDS special_attack_min_range = 2 special_attack_max_range = 7 @@ -68,7 +68,7 @@ set waitfor = FALSE set_AI_busy(TRUE) - var/obj/item/weapon/grenade/G = new grenade_type(get_turf(src)) + var/obj/item/grenade/G = new grenade_type(get_turf(src)) if(istype(G)) G.throw_at(A, G.throw_range, G.throw_speed, src) G.attack_self(src) @@ -102,7 +102,7 @@ // Melee //////////////////////////////// /mob/living/simple_mob/humanoid/merc/melee // Defined in case we add non-sword-and-board mercs - loot_list = list(/obj/item/weapon/material/knife/tacknife = 100) + loot_list = list(/obj/item/material/knife/tacknife = 100) // Sword and Shield Merc /mob/living/simple_mob/humanoid/merc/melee/sword @@ -116,7 +116,7 @@ attack_edge = 1 attacktext = list("slashed") - loot_list = list(/obj/item/weapon/melee/energy/sword = 100, /obj/item/weapon/shield/energy = 100) + loot_list = list(/obj/item/melee/energy/sword = 100, /obj/item/shield/energy = 100) // They have a shield, so they try to block /mob/living/simple_mob/humanoid/merc/melee/sword/attackby(var/obj/item/O as obj, var/mob/user as mob) @@ -154,7 +154,7 @@ projectiletype = /obj/item/projectile/bullet/pistol/medium // casingtype = /obj/item/ammo_casing/spent //Makes infinite stacks of bullets when put in PoIs. projectilesound = 'sound/weapons/Gunshot_light.ogg' - loot_list = list(/obj/item/weapon/gun/projectile/colt = 100) + loot_list = list(/obj/item/gun/projectile/colt = 100) needs_reload = TRUE reload_max = 7 // Not the best default, but it fits the pistol @@ -165,7 +165,7 @@ icon_state = "syndicateranged_smg" icon_living = "syndicateranged_smg" - loot_list = list(/obj/item/weapon/gun/projectile/automatic/c20r = 100) + loot_list = list(/obj/item/gun/projectile/automatic/c20r = 100) projectile_dispersion = 7 projectile_accuracy = -20 @@ -177,7 +177,7 @@ icon_living = "blueforranged_smg" corpse = /obj/effect/landmark/mobcorpse/solarpeacekeeper - loot_list = list(/obj/item/weapon/gun/projectile/automatic/c20r = 100) + loot_list = list(/obj/item/gun/projectile/automatic/c20r = 100) base_attack_cooldown = 5 // Two attacks a second or so. reload_max = 20 @@ -187,7 +187,7 @@ icon_state = "syndicateranged_rifle" icon_living = "syndicateranged_rifle" - loot_list = list(/obj/item/weapon/gun/projectile/automatic/z8 = 100) + loot_list = list(/obj/item/gun/projectile/automatic/z8 = 100) projectilesound = 'sound/weapons/Gunshot_heavy.ogg' projectiletype = /obj/item/projectile/bullet/rifle/a762 @@ -197,7 +197,7 @@ reload_max = 30 /mob/living/simple_mob/humanoid/merc/ranged/rifle/mag - loot_list = list(/obj/item/weapon/gun/magnetic/railgun/flechette = 100) + loot_list = list(/obj/item/gun/magnetic/railgun/flechette = 100) projectiletype = /obj/item/projectile/bullet/magnetic/flechette projectilesound = 'sound/weapons/rapidslice.ogg' @@ -210,7 +210,7 @@ projectiletype = /obj/item/projectile/beam/midlaser projectilesound = 'sound/weapons/Laser.ogg' - loot_list = list(/obj/item/weapon/gun/energy/laser = 100) + loot_list = list(/obj/item/gun/energy/laser = 100) projectile_dispersion = 5 projectile_accuracy = -20 @@ -223,7 +223,7 @@ projectiletype = /obj/item/projectile/ion projectilesound = 'sound/weapons/Laser.ogg' - loot_list = list(/obj/item/weapon/gun/energy/ionrifle = 100) + loot_list = list(/obj/item/gun/energy/ionrifle = 100) reload_max = 10 @@ -234,7 +234,7 @@ projectiletype = /obj/item/projectile/bullet/pellet/shotgun // Buckshot projectilesound = 'sound/weapons/Gunshot_shotgun.ogg' - loot_list = list(/obj/item/weapon/gun/projectile/shotgun/pump = 100) + loot_list = list(/obj/item/gun/projectile/shotgun/pump = 100) reload_max = 4 reload_time = 1.5 SECONDS // It's a shotgun, it takes a moment @@ -250,17 +250,17 @@ projectiletype = /obj/item/projectile/fake_syringe/poison // Toxin dart. projectilesound = 'sound/weapons/Gunshot_old.ogg' - loot_list = list(/obj/item/weapon/gun/projectile/dartgun = 100, - /obj/item/weapon/gun/launcher/grenade = 100, - /obj/item/weapon/grenade/spawnergrenade/manhacks/mercenary = 50, - /obj/item/weapon/grenade/spawnergrenade/manhacks/mercenary = 30 + loot_list = list(/obj/item/gun/projectile/dartgun = 100, + /obj/item/gun/launcher/grenade = 100, + /obj/item/grenade/spawnergrenade/manhacks/mercenary = 50, + /obj/item/grenade/spawnergrenade/manhacks/mercenary = 30 ) reload_max = 5 reload_time = 1 SECOND // Manhacks. - grenade_type = /obj/item/weapon/grenade/spawnergrenade/manhacks/mercenary + grenade_type = /obj/item/grenade/spawnergrenade/manhacks/mercenary projectile_dispersion = 8 projectile_accuracy = -40 @@ -286,11 +286,11 @@ loot_list = list(/obj/item/sniper_rifle_part/barrel = 50, /obj/item/sniper_rifle_part/stock = 50, /obj/item/sniper_rifle_part/trigger_group = 50, - /obj/item/weapon/grenade/spawnergrenade/manhacks/mercenary = 90 + /obj/item/grenade/spawnergrenade/manhacks/mercenary = 90 ) // Babyfrags. - grenade_type = /obj/item/weapon/grenade/explosive/mini + grenade_type = /obj/item/grenade/explosive/mini // Babyfrags go a long way. special_attack_min_range = 6 special_attack_max_range = 10 @@ -392,11 +392,11 @@ // Most likely to drop a broken weapon matching them, if it's a gun. /mob/living/simple_mob/humanoid/merc/melee/poi - loot_list = list(/obj/item/weapon/material/knife/tacknife/combatknife = 100) + loot_list = list(/obj/item/material/knife/tacknife/combatknife = 100) /mob/living/simple_mob/humanoid/merc/melee/sword/poi - loot_list = list(/obj/item/weapon/melee/energy/sword/color = 20, - /obj/item/weapon/shield/energy = 40 + loot_list = list(/obj/item/melee/energy/sword/color = 20, + /obj/item/shield/energy = 40 ) /mob/living/simple_mob/humanoid/merc/ranged/poi @@ -423,6 +423,6 @@ /mob/living/simple_mob/humanoid/merc/ranged/technician/poi loot_list = list(/obj/random/projectile/scrapped_dartgun = 100, /obj/random/projectile/scrapped_grenadelauncher = 100, - /obj/item/weapon/grenade/spawnergrenade/manhacks/mercenary = 50, - /obj/item/weapon/grenade/spawnergrenade/manhacks/mercenary = 30 + /obj/item/grenade/spawnergrenade/manhacks/mercenary = 50, + /obj/item/grenade/spawnergrenade/manhacks/mercenary = 30 ) diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_altevian.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_altevian.dm index d9b864c8553..a0b8232b297 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_altevian.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_altevian.dm @@ -27,7 +27,7 @@ armor = list(melee = 90, bullet = 90, laser = 90, energy = 90, bomb = 90, bio = 100, rad = 100) //matches stats of suit they drop. Basically tank. Rat tank. Ratank. corpse = /obj/effect/landmark/mobcorpse/altevian - loot_list = list(/obj/item/weapon/melee/energy/sword/altevian = 100) + loot_list = list(/obj/item/melee/energy/sword/altevian = 100) ai_holder_type = /datum/ai_holder/simple_mob/merc say_list_type = /datum/say_list/merc/altevian @@ -62,7 +62,7 @@ attacktext = list("whacked", "slammed", "bashed", "clonked", "bonked") attack_sound = 'sound/weapons/smash.ogg' - loot_list = list(/obj/item/weapon/tool/transforming/altevian = 100) + loot_list = list(/obj/item/tool/transforming/altevian = 100) /mob/living/simple_mob/humanoid/merc/altevian/ranged desc = "An Altevian Naval Salvage Guard, adorned in the top of the line Heartbreaker suit. Armed with a small energy gun." @@ -75,7 +75,7 @@ attack_armor_pen = 20 base_attack_cooldown = 8 - loot_list = list(/obj/item/weapon/gun/energy/altevian = 100) + loot_list = list(/obj/item/gun/energy/altevian = 100) needs_reload = TRUE reload_time = 1.5 SECONDS @@ -92,7 +92,7 @@ base_attack_cooldown = 8 - loot_list = list(/obj/item/weapon/gun/energy/altevian/large = 100) + loot_list = list(/obj/item/gun/energy/altevian/large = 100) needs_reload = TRUE reload_time = 3 SECONDS @@ -107,7 +107,7 @@ base_attack_cooldown = 10 - loot_list = list(/obj/item/weapon/storage/box/altevian_ammo = 100, /obj/item/weapon/gun/projectile/altevian = 100) + loot_list = list(/obj/item/storage/box/altevian_ammo = 100, /obj/item/gun/projectile/altevian = 100) needs_reload = TRUE reload_time = 5 SECONDS diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm index d8e3f0fbdad..448b5a83b4e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm @@ -22,7 +22,7 @@ attacktext = list("slashed") attack_sound = 'sound/weapons/bladeslice.ogg' - loot_list = list(/obj/item/weapon/melee/energy/sword/pirate = 100) + loot_list = list(/obj/item/melee/energy/sword/pirate = 100) corpse = /obj/effect/landmark/mobcorpse/pirate @@ -35,6 +35,6 @@ projectiletype = /obj/item/projectile/beam projectilesound = 'sound/weapons/laser.ogg' - loot_list = list(/obj/item/weapon/gun/energy/laser = 100) + loot_list = list(/obj/item/gun/energy/laser = 100) corpse = /obj/effect/landmark/mobcorpse/pirate/ranged diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm index cc712b16259..e14e60670b6 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm @@ -19,7 +19,7 @@ melee_damage_upper = 15 attacktext = list("punched") - loot_list = list(/obj/item/weapon/material/knife = 100) + loot_list = list(/obj/item/material/knife = 100) corpse = /obj/effect/landmark/mobcorpse/russian @@ -31,6 +31,6 @@ casingtype = /obj/item/ammo_casing/spent projectilesound = 'sound/weapons/Gunshot4.ogg' - loot_list = list(/obj/item/weapon/gun/projectile/revolver/mateba = 100) + loot_list = list(/obj/item/gun/projectile/revolver/mateba = 100) corpse = /obj/effect/landmark/mobcorpse/russian/ranged diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm index 9e167b32239..d986c17a29d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm @@ -46,35 +46,35 @@ say_list_type = /datum/say_list/malf_drone/mining tame_items = list( - /obj/item/weapon/ore/verdantium = 90, - /obj/item/weapon/ore/hydrogen = 90, - /obj/item/weapon/ore/osmium = 70, - /obj/item/weapon/ore/diamond = 70, - /obj/item/weapon/ore/gold = 55, - /obj/item/weapon/ore/silver = 55, - /obj/item/weapon/ore/lead = 40, - /obj/item/weapon/ore/marble = 30, - /obj/item/weapon/ore/coal = 25, - /obj/item/weapon/ore/iron = 25, - /obj/item/weapon/ore/glass = 15, - /obj/item/weapon/ore = 5 + /obj/item/ore/verdantium = 90, + /obj/item/ore/hydrogen = 90, + /obj/item/ore/osmium = 70, + /obj/item/ore/diamond = 70, + /obj/item/ore/gold = 55, + /obj/item/ore/silver = 55, + /obj/item/ore/lead = 40, + /obj/item/ore/marble = 30, + /obj/item/ore/coal = 25, + /obj/item/ore/iron = 25, + /obj/item/ore/glass = 15, + /obj/item/ore = 5 ) var/datum/effect/effect/system/ion_trail_follow/ion_trail = null var/obj/item/shield_projector/shields = null - var/obj/item/weapon/storage/bag/ore/my_storage = null + var/obj/item/storage/bag/ore/my_storage = null var/last_search = 0 var/search_cooldown = 5 SECONDS var/ignoreunarmed = TRUE - var/allowedtools = list(/obj/item/weapon/pickaxe, /obj/item/weapon/gun/energy/kinetic_accelerator, /obj/item/weapon/gun/magnetic/matfed/phoronbore, /obj/item/weapon/kinetic_crusher, /obj/item/weapon/melee/shock_maul) + var/allowedtools = list(/obj/item/pickaxe, /obj/item/gun/energy/kinetic_accelerator, /obj/item/gun/magnetic/matfed/phoronbore, /obj/item/kinetic_crusher, /obj/item/melee/shock_maul) /mob/living/simple_mob/mechanical/mining_drone/Initialize() ion_trail = new ion_trail.set_up(src) ion_trail.start() - my_storage = new /obj/item/weapon/storage/bag/ore(src) + my_storage = new /obj/item/storage/bag/ore(src) shields = new /obj/item/shield_projector/rectangle/automatic/drone(src) return ..() @@ -106,7 +106,7 @@ var/has_tool = FALSE var/obj/item/I = H.get_active_hand() - if(!istype(I,/obj/item/weapon)) + if(!istype(I,/obj/item)) if(ignoreunarmed) return TRUE else //just so they don't attack "miners" for having their mining gear in their offhand @@ -155,7 +155,7 @@ if(my_storage.contents.len >= my_storage.max_storage_space) break - if((locate(/obj/item/weapon/ore) in T) && prob(40)) + if((locate(/obj/item/ore) in T) && prob(40)) src.Beam(T, icon_state = "holo_beam", time = 0.5 SECONDS) my_storage.rangedload(T, src) @@ -178,5 +178,5 @@ /mob/living/simple_mob/mechanical/mining_drone/scavenger //more aggro version for the debris field, with a weaker weapon name = "scavenger drone" ignoreunarmed = FALSE - allowedtools = list(/obj/item/weapon/pickaxe) + allowedtools = list(/obj/item/pickaxe) projectiletype = /obj/item/projectile/energy/excavate/weak diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm index e888d643f5f..439b50bf630 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm @@ -32,29 +32,29 @@ ai_holder_type = /datum/ai_holder/simple_mob/melee - var/obj/item/weapon/technomancer_core/golem/core = null - var/obj/item/weapon/spell/active_spell = null // Shield and ranged spells + var/obj/item/technomancer_core/golem/core = null + var/obj/item/spell/active_spell = null // Shield and ranged spells var/mob/living/master = null var/casting = FALSE // Used to ensure the correct animation is played. Testing if a spell exists won't always work as some spells delete themselves upon use. var/list/known_spells = list( - "beam" = /obj/item/weapon/spell/projectile/beam, - "chain lightning" = /obj/item/weapon/spell/projectile/chain_lightning, - "force missile" = /obj/item/weapon/spell/projectile/force_missile, - "ionic bolt" = /obj/item/weapon/spell/projectile/ionic_bolt, - "lightning" = /obj/item/weapon/spell/projectile/lightning, - "blink" = /obj/item/weapon/spell/blink, - "dispel" = /obj/item/weapon/spell/dispel, - "oxygenate" = /obj/item/weapon/spell/oxygenate, - "mend life" = /obj/item/weapon/spell/modifier/mend_life, - "mend synthetic" = /obj/item/weapon/spell/modifier/mend_synthetic, - "mend organs" = /obj/item/weapon/spell/mend_organs, - "purify" = /obj/item/weapon/spell/modifier/purify, - "resurrect" = /obj/item/weapon/spell/resurrect, - "passwall" = /obj/item/weapon/spell/passwall, - "repel missiles" = /obj/item/weapon/spell/modifier/repel_missiles, - "corona" = /obj/item/weapon/spell/modifier/corona, - "haste" = /obj/item/weapon/spell/modifier/haste + "beam" = /obj/item/spell/projectile/beam, + "chain lightning" = /obj/item/spell/projectile/chain_lightning, + "force missile" = /obj/item/spell/projectile/force_missile, + "ionic bolt" = /obj/item/spell/projectile/ionic_bolt, + "lightning" = /obj/item/spell/projectile/lightning, + "blink" = /obj/item/spell/blink, + "dispel" = /obj/item/spell/dispel, + "oxygenate" = /obj/item/spell/oxygenate, + "mend life" = /obj/item/spell/modifier/mend_life, + "mend synthetic" = /obj/item/spell/modifier/mend_synthetic, + "mend organs" = /obj/item/spell/mend_organs, + "purify" = /obj/item/spell/modifier/purify, + "resurrect" = /obj/item/spell/resurrect, + "passwall" = /obj/item/spell/passwall, + "repel missiles" = /obj/item/spell/modifier/repel_missiles, + "corona" = /obj/item/spell/modifier/corona, + "haste" = /obj/item/spell/modifier/haste ) /mob/living/simple_mob/mechanical/technomancer_golem/Initialize() diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax_vr.dm index e7ecc333320..36228de1c30 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/adv_dark_gygax_vr.dm @@ -4,5 +4,5 @@ /mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced/recursive name = "recursive dark gygax" desc = "Whoever pilots this cursed mecha has been stuck in eternal loop of death and rebirth forever. Their maddened rampage cannot be stopped." - wreckage = /obj/item/weapon/ectoplasm + wreckage = /obj/item/ectoplasm pilot_type = /mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced/recursive diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/monitor_ward.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/monitor_ward.dm index 238ea9822ad..6f6eb9abcc4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/monitor_ward.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/monitor_ward.dm @@ -46,7 +46,7 @@ icon_state = "ward-nt" /mob/living/simple_mob/mechanical/ward/monitor/crew/attackby(var/obj/item/O as obj, var/mob/user as mob) - if(istype(O, /obj/item/weapon/card/id) && !owner) + if(istype(O, /obj/item/card/id) && !owner) owner = user return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm index 4d7205abbc2..077e8e7b13e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm @@ -66,8 +66,8 @@ if(!path || !ispath(path)) return 0 - //var/obj/item/weapon/spell/S = new path(src) - var/obj/item/weapon/spell/construct/S = new path(src) + //var/obj/item/spell/S = new path(src) + var/obj/item/spell/construct/S = new path(src) //No hands needed for innate casts. if(S.cast_methods & CAST_INNATE) @@ -75,12 +75,12 @@ S.on_innate_cast(src) if(l_hand && r_hand) //Make sure our hands aren't full. - if(istype(r_hand, /obj/item/weapon/spell)) //If they are full, perhaps we can still be useful. - var/obj/item/weapon/spell/r_spell = r_hand + if(istype(r_hand, /obj/item/spell)) //If they are full, perhaps we can still be useful. + var/obj/item/spell/r_spell = r_hand if(r_spell.aspect == ASPECT_CHROMATIC) //Check if we can combine the new spell with one in our hands. r_spell.on_combine_cast(S, src) - else if(istype(l_hand, /obj/item/weapon/spell)) - var/obj/item/weapon/spell/l_spell = l_hand + else if(istype(l_hand, /obj/item/spell)) + var/obj/item/spell/l_spell = l_hand if(l_spell.aspect == ASPECT_CHROMATIC) //Check the other hand too. l_spell.on_combine_cast(S, src) else //Welp @@ -113,7 +113,7 @@ */ /mob/living/simple_mob/construct/death() - new /obj/item/weapon/ectoplasm (src.loc) + new /obj/item/ectoplasm (src.loc) ..(null,"collapses in a shattered heap.") ghostize() qdel(src) diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm index 1dc8897efbe..ceda9788b83 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm @@ -60,7 +60,7 @@ if(!(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam))) visible_message("The [P.name] bounces off of [src]'s shell!", \ "The [P.name] bounces off of [src]'s shell!") - new /obj/item/weapon/material/shard/shrapnel(src.loc) + new /obj/item/material/shard/shrapnel(src.loc) if(!(P.damage_type == BRUTE || P.damage_type == BURN)) projectile_dam_type = BRUTE incoming_damage = round(incoming_damage / 4) //Damage from strange sources is converted to brute for physical projectiles, though severely decreased. diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/shade.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/shade.dm index df9bed2d6a5..b081a481490 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/shade.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/shade.dm @@ -30,11 +30,11 @@ universal_speak = 1 - loot_list = list(/obj/item/weapon/ectoplasm = 100) + loot_list = list(/obj/item/ectoplasm = 100) /mob/living/simple_mob/construct/shade/attackby(var/obj/item/O as obj, var/mob/user as mob) - if(istype(O, /obj/item/device/soulstone)) - var/obj/item/device/soulstone/S = O; + if(istype(O, /obj/item/soulstone)) + var/obj/item/soulstone/S = O; S.transfer_soul("SHADE", src, user) return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm b/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm index 68caa43b11e..f18f005808b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm @@ -39,7 +39,7 @@ var/recently_used_attack = GA_SPEEDUP var/all_special_attacks = list(GA_ADS, GA_CALLDOWN, GA_LINES, GA_BULLETHELL, GA_ILLUSION, GA_CONFUSION, GA_SPEEDUP) - loot_list = list(/obj/item/device/nif/glitch = 100) + loot_list = list(/obj/item/nif/glitch = 100) /obj/item/projectile/energy/slow_orb name = "TROJAN" diff --git a/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm b/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm index a43088ec9f0..eb08ce7bc09 100644 --- a/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm +++ b/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm @@ -26,7 +26,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/melee - meat_type = /obj/item/weapon/reagent_containers/food/snacks/tomatomeat + meat_type = /obj/item/reagent_containers/food/snacks/tomatomeat meat_amount = 4 /decl/mob_organ_names/tomato diff --git a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm index 921e0c6ebc8..b258763793b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm +++ b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm @@ -27,7 +27,7 @@ organ_names = /decl/mob_organ_names/tree - meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat + meat_type = /obj/item/reagent_containers/food/snacks/xenomeat meat_amount = 2 pixel_x = -16 diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime_vr.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime_vr.dm index 10ba0ed1ca0..aa765d7d082 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/slime_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime_vr.dm @@ -1,5 +1,5 @@ /mob/living/simple_mob/slime base_attack_cooldown = 2 SECONDS var/allowed_attack_types = list( - /obj/item/weapon/melee/baton/slime, + /obj/item/melee/baton/slime, /obj/item/slimepotion) \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm index a29cbd9c867..256139f1c52 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm @@ -210,7 +210,7 @@ else ..() -/mob/living/simple_mob/slime/xenobio/dark_purple/attackby(var/obj/item/weapon/W, var/mob/user) +/mob/living/simple_mob/slime/xenobio/dark_purple/attackby(var/obj/item/W, var/mob/user) if(istype(W) && W.force && W.damtype == BURN) log_and_message_admins("[src] ignited due to being hit with a burning weapon ([W]) by [key_name(user)].") ignite() @@ -674,7 +674,7 @@ else ..() -/mob/living/simple_mob/slime/xenobio/oil/attackby(obj/item/weapon/W, mob/living/user) +/mob/living/simple_mob/slime/xenobio/oil/attackby(obj/item/W, mob/living/user) if(istype(W) && W.force && W.damtype == BURN) log_and_message_admins("[src] exploded due to being hit with a burning weapon ([W]) by [key_name(user)].") explode() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm index b0404451d2f..26d7dcb2d39 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm @@ -25,7 +25,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/retaliate meat_amount = 5 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat + meat_type = /obj/item/reagent_containers/food/snacks/xenomeat/spidermeat //Space bees aren't affected by atmos. min_oxy = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm index 48fc001e647..9f492b94216 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm @@ -59,7 +59,7 @@ I think I covered everything. icon_living = "dragon_maneNone" player_msg = "You can perform a charge attack by disarm intent clicking somewhere. Grab intent clicking will perform a tail sweep and fling any nearby mobs. You can fire breath with harm intent. Your attacks have cooldowns associated with them. You can heal slowly by resting. Check your abilities tab for other functions!" meat_amount = 40 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat old_x = -48 old_y = 0 vis_height = 92 @@ -128,7 +128,7 @@ I think I covered everything. var/chargetimer tame_items = list( - /obj/item/weapon/coin/gold = 100, + /obj/item/coin/gold = 100, /obj/item/stack/material/gold = 100 ) @@ -257,7 +257,7 @@ I think I covered everything. build_icons(1) add_language(LANGUAGE_DRUDAKAR) add_language(LANGUAGE_UNATHI) - mob_radio = new /obj/item/device/radio/headset/mob_headset(src) //We always give radios to spawned mobs anyway + mob_radio = new /obj/item/radio/headset/mob_headset(src) //We always give radios to spawned mobs anyway /mob/living/simple_mob/vore/bigdragon/MouseDrop_T(mob/living/M, mob/living/user) return diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm b/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm index d1dd8f0c538..2f4af12aaa4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm @@ -16,7 +16,7 @@ melee_damage_upper = 5 meat_amount = 10 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/cookie + meat_type = /obj/item/reagent_containers/food/snacks/cookie say_list_type = /datum/say_list/cookiegirl ai_holder_type = /datum/ai_holder/simple_mob/passive/cookiegirl diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm b/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm index cd01e044cf6..4326d048dde 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm @@ -71,7 +71,7 @@ vore_stomach_name = "fuel processor" vore_stomach_flavor = "You have ended up in the fuel processor of this corrupted machine. This place was definitely not designed with safety and comfort in mind. The heated and cramped surroundings oozing potent fluids all over your form, eager to do nothing less than breaking you apart to fuel its rampage for the next few days... hours... minutes? Oh dear..." - loot_list = list(/obj/item/borg/upgrade/basic/syndicate = 6, /obj/item/borg/upgrade/basic/vtec = 6, /obj/item/weapon/material/knife/ritual = 6, /obj/item/weapon/disk/nifsoft/compliance = 6) + loot_list = list(/obj/item/borg/upgrade/basic/syndicate = 6, /obj/item/borg/upgrade/basic/vtec = 6, /obj/item/material/knife/ritual = 6, /obj/item/disk/nifsoft/compliance = 6) allow_mind_transfer = TRUE diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm b/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm index ca9c9349e67..133e29d632d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm @@ -42,7 +42,7 @@ melee_damage_upper = 30 meat_amount = 8 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat old_x = -16 old_y = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm index a3664c69ea6..aa3ddaeb447 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm @@ -26,7 +26,7 @@ unsuitable_atoms_damage = 10 meat_amount = 5 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat //Phoron dragons aren't affected by atmos. min_oxy = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm index af876de009e..aac50f5c003 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm @@ -17,7 +17,7 @@ melee_damage_upper = 30 meat_amount = 15 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat //Space dragons aren't affected by atmos. min_oxy = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm b/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm index 3b5476e464e..65b712c2cf4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm @@ -42,7 +42,7 @@ response_harm = "hits" meat_amount = 2 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/fox + meat_type = /obj/item/reagent_containers/food/snacks/meat/fox harm_intent_damage = 5 melee_damage_lower = 1 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/fennix.dm b/code/modules/mob/living/simple_mob/subtypes/vore/fennix.dm index c06ef9d3cf2..3516d2c434d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/fennix.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/fennix.dm @@ -13,7 +13,7 @@ health = 60 meat_amount = 5 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/fox + meat_type = /obj/item/reagent_containers/food/snacks/meat/fox response_help = "pats" response_disarm = "gently pushes aside" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm b/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm index f7c40f8b0ce..26622eac64a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm @@ -32,7 +32,7 @@ can_be_drop_pred = 1 //They can tongue vore. meat_amount = 4 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat harm_intent_damage = 5 melee_damage_lower = 5 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm b/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm index b759d0147c0..e2b473629da 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm @@ -11,7 +11,7 @@ faction = FACTION_SIF has_eye_glow = TRUE meat_amount = 40 //Big dog, lots of meat - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat old_x = -48 old_y = 0 vis_height = 92 @@ -102,12 +102,12 @@ /mob/living/simple_mob/vore/greatwolf/attackby(var/obj/item/O, var/mob/user) // Trade food for people! - if(istype(O, /obj/item/weapon/reagent_containers/food)) + if(istype(O, /obj/item/reagent_containers/food)) qdel(O) playsound(src,'sound/vore/gulp.ogg', rand(10,50), 1) if(!has_AI())//No autobarf on player control. return - if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/donut) && istype(src, /mob/living/simple_mob/vore/greatwolf/black)) + if(istype(O, /obj/item/reagent_containers/food/snacks/donut) && istype(src, /mob/living/simple_mob/vore/greatwolf/black)) to_chat(user,"The huge wolf begrudgingly accepts your offer in exchange for it's catch.") release_vore_contents() else if(prob(2)) //Small chance to get prey out from white doggos diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm b/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm index 756caf7951c..412a7ec8e50 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm @@ -39,7 +39,7 @@ pixel_y = 0 meat_amount = 15 //Infinite meat! - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat max_buckled_mobs = 1 //Yeehaw can_buckle = TRUE diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm b/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm index 501e96e9e9a..51511ebcc84 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm @@ -24,7 +24,7 @@ attacktext = list("kicked") meat_amount = 6 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat max_buckled_mobs = 1 //Yeehaw can_buckle = TRUE diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm index 8b77865e23f..5a808e65ec3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm @@ -10,7 +10,7 @@ icon_rest = "leopardmander-rest" faction = FACTION_NEUTRAL meat_amount = 40 //I mean... - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat old_x = -48 old_y = 0 melee_damage_lower = 10 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm b/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm index f7ec3a56686..3affe18ba91 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm @@ -101,7 +101,7 @@ "Strain as you might, you can't keep up the effort long enough before you sink back into %pred's %belly.") /mob/living/simple_mob/vore/meowl/attackby(var/obj/item/O as obj, var/mob/user as mob) - if(istype(O, /obj/item/weapon/reagent_containers/food)) + if(istype(O, /obj/item/reagent_containers/food)) if(health <= 0) return user.visible_message("\The [src] happily gulps down \the [O] right out of \the [user]'s hand, it seems pretty content now.","\The [src] happily gulps down \the [O] right out of your hand, it seems pretty content now.") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm index ebaf3bf7244..c3e4c4ea0de 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm @@ -16,7 +16,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/melee/angryclowns - loot_list = list(/obj/item/weapon/bikehorn = 100) + loot_list = list(/obj/item/bikehorn = 100) min_oxy = 0 max_oxy = 500 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm index 3a9fce9fb06..f6a5fea363d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm @@ -18,7 +18,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/melee/clowns - loot_list = list(/obj/item/weapon/bikehorn = 100) + loot_list = list(/obj/item/bikehorn = 100) min_oxy = 0 max_oxy = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/honkelemental.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/honkelemental.dm index a326c65593e..2f9f0b578c5 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/honkelemental.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/honkelemental.dm @@ -11,7 +11,7 @@ faction = FACTION_CLOWN - loot_list = list(/obj/item/weapon/bikehorn = 100) + loot_list = list(/obj/item/bikehorn = 100) response_help = "pokes" response_disarm = "gently pushes aside" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm index ef47e68f78b..2e803775859 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm @@ -355,7 +355,7 @@ faction = FACTION_CLOWN - loot_list = list(/obj/item/weapon/bikehorn = 100) + loot_list = list(/obj/item/bikehorn = 100) response_help = "pokes" response_disarm = "gently pushes aside" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm index 9d1c215a2cb..82f28cae672 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm @@ -42,7 +42,7 @@ movement_cooldown = 3.5 - meat_type = /obj/item/weapon/ore/coal + meat_type = /obj/item/ore/coal response_help = "pokes" response_disarm = "pushes" @@ -133,7 +133,7 @@ visible_message("\The [src] shudders and collapses, expelling the ores it had devoured!") var/i = rand(min_ore,max_ore) while(i>1) - var/ore = pick(/obj/item/weapon/ore/glass,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/iron,/obj/item/weapon/ore/lead,/obj/item/weapon/ore/marble,/obj/item/weapon/ore/phoron,/obj/item/weapon/ore/silver,/obj/item/weapon/ore/gold) + var/ore = pick(/obj/item/ore/glass,/obj/item/ore/coal,/obj/item/ore/iron,/obj/item/ore/lead,/obj/item/ore/marble,/obj/item/ore/phoron,/obj/item/ore/silver,/obj/item/ore/gold) new ore(src.loc) i-- ..() @@ -150,7 +150,7 @@ set_light(0) var/p = rand(lava_min_ore,lava_max_ore) while(p>1) - var/ore = pick(/obj/item/weapon/ore/osmium,/obj/item/weapon/ore/uranium,/obj/item/weapon/ore/hydrogen,/obj/item/weapon/ore/diamond,/obj/item/weapon/ore/verdantium) + var/ore = pick(/obj/item/ore/osmium,/obj/item/ore/uranium,/obj/item/ore/hydrogen,/obj/item/ore/diamond,/obj/item/ore/verdantium) new ore(src.loc) p-- ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm index 4efaf44b63b..16b7103f8d2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm @@ -235,12 +235,12 @@ icon_rest = "hotiesc_rest" /mob/living/simple_mob/vore/otie/attackby(var/obj/item/O, var/mob/user) // Trade donuts for bellybrig victims. - if(istype(O, /obj/item/weapon/reagent_containers/food)) + if(istype(O, /obj/item/reagent_containers/food)) qdel(O) playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1) if(!has_AI())//No autobarf on player control. return - if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/donut) && istype(src, /mob/living/simple_mob/vore/otie/security)) + if(istype(O, /obj/item/reagent_containers/food/snacks/donut) && istype(src, /mob/living/simple_mob/vore/otie/security)) to_chat(user,"The guard pup accepts your offer for their catch.") release_vore_contents() else if(prob(2)) //Small chance to get prey out from non-sec oties. diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm b/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm index 84651cab0ad..af1aa363d57 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm @@ -30,7 +30,7 @@ can_be_drop_pred = 1 //They can tongue vore. meat_amount = 5 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat vore_active = 1 vore_icons = SA_ICON_LIVING @@ -161,7 +161,7 @@ B.digest_mode = DM_SELECT /mob/living/simple_mob/vore/pakkun/attackby(var/obj/item/O, var/mob/user) //if they're newspapered, they'll spit out any junk they've eaten for whatever reason - if(istype(O, /obj/item/weapon/newspaper) && !ckey && isturf(user.loc)) + if(istype(O, /obj/item/newspaper) && !ckey && isturf(user.loc)) user.visible_message("[user] swats [src] with [O]!") release_vore_contents() for(var/mob/living/L in living_mobs(0)) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm b/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm index 13914a70157..a67f6c33b95 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm @@ -17,7 +17,7 @@ see_in_dark = 8 meat_amount = 8 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat melee_damage_lower = 5 melee_damage_upper = 15 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm index ecc4800a3f4..c3f8d0b4ee1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm @@ -33,7 +33,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/passive meat_amount = 3 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat // Vore vars vore_active = 1 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm b/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm index 46525186828..76e9d0a2979 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm @@ -9,7 +9,7 @@ icon_rest = "raptorpurple" faction = FACTION_RAPTOR meat_amount = 40 //Big dog, lots of meat - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat old_x = -48 old_y = 0 vis_height = 92 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm index 11d686f3d2d..a52519d0a48 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm @@ -46,7 +46,7 @@ friendly = list("nuzzles", "licks", "noses softly at", "noseboops", "headbumps against", "leans on", "nibbles affectionately on") meat_amount = 6 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat old_x = -16 old_y = 0 @@ -107,7 +107,7 @@ if(hunger > 0 && life_since_foodscan++ > 5) //Only look for floor food when hungry. life_since_foodscan = 0 - for(var/obj/item/weapon/reagent_containers/food/snacks/S in oview(src,3)) //Accept thrown offerings and scavenge surroundings. + for(var/obj/item/reagent_containers/food/snacks/S in oview(src,3)) //Accept thrown offerings and scavenge surroundings. if(get_dist(src,S) <=1) visible_emote("hungrily devours \the [S].") playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1) @@ -172,7 +172,7 @@ food = null /mob/living/simple_mob/vore/aggressive/rat/tame/attackby(var/obj/item/O, var/mob/user) // Feed the rat your food to satisfy it. - if(istype(O, /obj/item/weapon/reagent_containers/food/snacks)) + if(istype(O, /obj/item/reagent_containers/food/snacks)) qdel(O) playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1) hunger = 0 @@ -185,7 +185,7 @@ return null else if(ishuman(found_atom) && will_eat(found_atom)) var/mob/living/carbon/human/H = found_atom - for(var/obj/item/weapon/reagent_containers/food/snacks/S in H) + for(var/obj/item/reagent_containers/food/snacks/S in H) if(!food) visible_emote("sniffs around the air intently, seeming to have caught a whiff of food!") if(resting) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm b/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm index 08841dd2d15..430e6efd4a3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm @@ -14,7 +14,7 @@ health = 30 meat_amount = 2 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat response_help = "pats" response_disarm = "gently pushes aside" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/seagull.dm b/code/modules/mob/living/simple_mob/subtypes/vore/seagull.dm index b80d28b9fbc..26153657ae9 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/seagull.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/seagull.dm @@ -27,7 +27,7 @@ response_harm = "hits" meat_amount = 2 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken + meat_type = /obj/item/reagent_containers/food/snacks/meat/chicken harm_intent_damage = 3 melee_damage_lower = 4 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm index 89628472b7f..532bbdc5ff5 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm @@ -50,7 +50,7 @@ vore_icons = SA_ICON_LIVING meat_amount = 4 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat + meat_type = /obj/item/reagent_containers/food/snacks/xenomeat/spidermeat //Beeg bug don't give a fuck about atmos. Something something, phoron mutation. min_oxy = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm index 7ebcd19d7a6..1ce45927653 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm @@ -42,7 +42,7 @@ see_in_dark = 8 meat_amount = 8 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat + meat_type = /obj/item/reagent_containers/food/snacks/xenomeat/spidermeat melee_damage_lower = 8 melee_damage_upper = 16 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm index 38f397656f9..7b388055e86 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm @@ -15,7 +15,7 @@ see_in_dark = 2 meat_amount = 5 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat response_help = "pets" response_disarm = "gently pushes aside" @@ -87,7 +87,7 @@ //Make sure you un-comment the variables above too. /mob/living/simple_mob/vore/sheep/attackby(var/obj/item/O as obj, var/mob/user as mob) - if(istype(O, /obj/item/weapon/material/knife) || istype(O, /obj/item/weapon/tool/wirecutters)) + if(istype(O, /obj/item/material/knife) || istype(O, /obj/item/tool/wirecutters)) if(user.a_intent != I_HELP) return ..() if(!harvestable_wool) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm b/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm index 26a262ce481..03945dae5a4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm @@ -39,7 +39,7 @@ melee_damage_upper = 12 meat_amount = 6 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat response_help = "pats" response_disarm = "tries to shove" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm index 24b8df89b57..1a866bf5edd 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm @@ -33,7 +33,7 @@ List of things solar grubs should be able to do: movement_cooldown = 3 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat + meat_type = /obj/item/reagent_containers/food/snacks/meat/grubmeat meat_amount = 6 response_help = "pokes" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm index 08f3da73154..543e3731139 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm @@ -17,7 +17,7 @@ var/global/list/grub_machine_overlays = list() melee_damage_upper = 1 meat_amount = 1 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat + meat_type = /obj/item/reagent_containers/food/snacks/meat/grubmeat butchery_loot = list() // No hides faction = FACTION_GRUBS @@ -291,7 +291,7 @@ var/global/list/grub_machine_overlays = list() idle_power_usages = split_into_3(total_idle_power_usage) -/obj/item/device/multitool/afterattack(obj/O, mob/user, proximity) +/obj/item/multitool/afterattack(obj/O, mob/user, proximity) if(proximity) if(istype(O, /obj/machinery)) var/mob/living/simple_mob/animal/solargrub_larva/grub = locate() in O diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm index 4f8eda62172..9df4d6982f8 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm @@ -32,7 +32,7 @@ melee_damage_upper = 1 meat_amount = 5 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat catalogue_data = list(/datum/category_item/catalogue/fauna/abyss_lurker) see_in_dark = 8 @@ -139,7 +139,7 @@ movement_cooldown = 1 meat_amount = 5 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat catalogue_data = list(/datum/category_item/catalogue/fauna/leaper) see_in_dark = 8 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm index 1003fa5cebd..d59a89b1632 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm @@ -25,7 +25,7 @@ melee_damage_lower = 5 melee_damage_upper = 12 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat meat_amount = 5 minbodytemp = 200 diff --git a/code/modules/mob/living/voice/voice.dm b/code/modules/mob/living/voice/voice.dm index 77558211f0d..7d1a32429dc 100644 --- a/code/modules/mob/living/voice/voice.dm +++ b/code/modules/mob/living/voice/voice.dm @@ -3,7 +3,7 @@ name = "unknown person" desc = "How are you examining me?" see_invisible = SEE_INVISIBLE_LIVING - var/obj/item/device/communicator/comm = null + var/obj/item/communicator/comm = null emote_type = 2 //This lets them emote through containers. The communicator has a image feed of the person calling them so... @@ -11,7 +11,7 @@ add_language(LANGUAGE_GALCOM) set_default_language(GLOB.all_languages[LANGUAGE_GALCOM]) - if(istype(loc, /obj/item/device/communicator)) + if(istype(loc, /obj/item/communicator)) comm = loc . = ..() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 514dce91ff6..a42b9291de3 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -588,7 +588,7 @@ if(M.grabbed_by.len) // Only start pulling when nobody else has a grab on them . = 1 - for(var/obj/item/weapon/grab/G in M.grabbed_by) + for(var/obj/item/grab/G in M.grabbed_by) if(G.assailant != usr) . = 0 else @@ -990,7 +990,7 @@ to_chat(U, "[src] has nothing stuck in their wounds that is large enough to remove.") return - var/obj/item/weapon/selection = tgui_input_list(usr, "What do you want to yank out?", "Embedded objects", valid_objects) + var/obj/item/selection = tgui_input_list(usr, "What do you want to yank out?", "Embedded objects", valid_objects) if(self) to_chat(src, "You attempt to get a good grip on [selection] in your body.") @@ -1042,7 +1042,7 @@ selection.forceMove(get_turf(src)) U.put_in_hands(selection) - for(var/obj/item/weapon/O in pinned) + for(var/obj/item/O in pinned) if(O == selection) pinned -= O if(!pinned.len) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index fd3c63ede77..8ce6e2d76a4 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -11,10 +11,10 @@ L.resist() //shortcut for resisting grabs //if we are grabbing someone - for(var/obj/item/weapon/grab/G in list(L.l_hand, L.r_hand)) + for(var/obj/item/grab/G in list(L.l_hand, L.r_hand)) G.reset_kill_state() //no wandering across the station/asteroid while choking someone -/obj/item/weapon/grab +/obj/item/grab name = "grab" icon = 'icons/mob/screen1.dmi' icon_state = "reinforce" @@ -36,7 +36,7 @@ destroy_on_drop = TRUE //VOREStation Edit -/obj/item/weapon/grab/New(mob/user, mob/victim) +/obj/item/grab/New(mob/user, mob/victim) ..() loc = user assailant = user @@ -58,7 +58,7 @@ //check if assailant is grabbed by victim as well if(assailant.grabbed_by) - for (var/obj/item/weapon/grab/G in assailant.grabbed_by) + for (var/obj/item/grab/G in assailant.grabbed_by) if(G.assailant == affecting && G.affecting == assailant) G.dancing = 1 G.adjust_position() @@ -72,7 +72,7 @@ //Used by throw code to hand over the mob, instead of throwing the grab. The grab is then deleted by the throw code. -/obj/item/weapon/grab/proc/throw_held() +/obj/item/grab/proc/throw_held() if(affecting) if(affecting.buckled) return null @@ -84,7 +84,7 @@ //This makes sure that the grab screen object is displayed in the correct hand. -/obj/item/weapon/grab/proc/synch() //why is this needed? +/obj/item/grab/proc/synch() //why is this needed? if(QDELETED(src)) return if(affecting) @@ -93,7 +93,7 @@ else hud.screen_loc = ui_lhand -/obj/item/weapon/grab/process() +/obj/item/grab/process() if(QDELETED(src)) // GC is trying to delete us, we'll kill our processing so we can cleanly GC return PROCESS_KILL @@ -109,17 +109,17 @@ if(state <= GRAB_AGGRESSIVE) allow_upgrade = 1 //disallow upgrading if we're grabbing more than one person - if((assailant.l_hand && assailant.l_hand != src && istype(assailant.l_hand, /obj/item/weapon/grab))) - var/obj/item/weapon/grab/G = assailant.l_hand + if((assailant.l_hand && assailant.l_hand != src && istype(assailant.l_hand, /obj/item/grab))) + var/obj/item/grab/G = assailant.l_hand if(G.affecting != affecting) allow_upgrade = 0 - if((assailant.r_hand && assailant.r_hand != src && istype(assailant.r_hand, /obj/item/weapon/grab))) - var/obj/item/weapon/grab/G = assailant.r_hand + if((assailant.r_hand && assailant.r_hand != src && istype(assailant.r_hand, /obj/item/grab))) + var/obj/item/grab/G = assailant.r_hand if(G.affecting != affecting) allow_upgrade = 0 //disallow upgrading past aggressive if we're being grabbed aggressively - for(var/obj/item/weapon/grab/G in affecting.grabbed_by) + for(var/obj/item/grab/G in affecting.grabbed_by) if(G == src) continue if(G.state >= GRAB_AGGRESSIVE) allow_upgrade = 0 @@ -159,7 +159,7 @@ adjust_position() -/obj/item/weapon/grab/proc/handle_eye_mouth_covering(mob/living/carbon/target, mob/user, var/target_zone) +/obj/item/grab/proc/handle_eye_mouth_covering(mob/living/carbon/target, mob/user, var/target_zone) var/announce = (target_zone != last_hit_zone) //only display messages when switching between different target zones last_hit_zone = target_zone @@ -182,13 +182,13 @@ assailant.visible_message("[assailant] sits on [target]'s face!") //VOREStation Edit End -/obj/item/weapon/grab/attack_self() +/obj/item/grab/attack_self() return s_click(hud) //Updating pixelshift, position and direction //Gets called on process, when the grab gets upgraded or the assailant moves -/obj/item/weapon/grab/proc/adjust_position() +/obj/item/grab/proc/adjust_position() if(!affecting) qdel(src) return @@ -233,7 +233,7 @@ if(EAST) animate(affecting, pixel_x =-shift, pixel_y = initial(affecting.pixel_y), 5, 1, LINEAR_EASING) -/obj/item/weapon/grab/proc/s_click(obj/screen/S) +/obj/item/grab/proc/s_click(obj/screen/S) if(QDELETED(src)) return if(!affecting) @@ -289,7 +289,7 @@ adjust_position() //This is used to make sure the victim hasn't managed to yackety sax away before using the grab. -/obj/item/weapon/grab/proc/confirm() +/obj/item/grab/proc/confirm() if(!assailant || !affecting) qdel(src) return 0 @@ -301,7 +301,7 @@ return 1 -/obj/item/weapon/grab/attack(mob/M, mob/living/user) +/obj/item/grab/attack(mob/M, mob/living/user) if(QDELETED(src)) return if(!affecting) @@ -347,19 +347,19 @@ if(M == assailant && state >= GRAB_AGGRESSIVE) devour(affecting, assailant) -/obj/item/weapon/grab/dropped() +/obj/item/grab/dropped() loc = null if(!QDELETED(src)) qdel(src) -/obj/item/weapon/grab/proc/reset_kill_state() +/obj/item/grab/proc/reset_kill_state() if(state == GRAB_KILL) var/datum/gender/T = gender_datums[assailant.get_visible_gender()] assailant.visible_message("[assailant] lost [T.his] tight grip on [affecting]'s neck!") hud.icon_state = "kill" state = GRAB_NECK -/obj/item/weapon/grab/proc/handle_resist() +/obj/item/grab/proc/handle_resist() var/grab_name var/break_strength = 1 var/list/break_chance_table = list(100) @@ -398,10 +398,10 @@ qdel(src) //returns the number of size categories between affecting and assailant, rounded. Positive means A is larger than B -/obj/item/weapon/grab/proc/size_difference(mob/A, mob/B) +/obj/item/grab/proc/size_difference(mob/A, mob/B) return mob_size_difference(A.mob_size, B.mob_size) -/obj/item/weapon/grab/Destroy() +/obj/item/grab/Destroy() animate(affecting, pixel_x = initial(affecting.pixel_x), pixel_y = initial(affecting.pixel_y), 4, 1, LINEAR_EASING) affecting.reset_plane_and_layer() if(affecting) diff --git a/code/modules/mob/mob_grab_specials.dm b/code/modules/mob/mob_grab_specials.dm index 32ef25f4326..8e94c0266a0 100644 --- a/code/modules/mob/mob_grab_specials.dm +++ b/code/modules/mob/mob_grab_specials.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/grab/proc/inspect_organ(mob/living/carbon/human/H, mob/user, var/target_zone) +/obj/item/grab/proc/inspect_organ(mob/living/carbon/human/H, mob/user, var/target_zone) var/obj/item/organ/external/E = H.get_organ(target_zone) @@ -40,7 +40,7 @@ if(!bad) to_chat(user, "[H]'s skin is normal.") -/obj/item/weapon/grab/proc/jointlock(mob/living/carbon/human/target, mob/attacker, var/target_zone) +/obj/item/grab/proc/jointlock(mob/living/carbon/human/target, mob/attacker, var/target_zone) if(state < GRAB_AGGRESSIVE) to_chat(attacker, "You require a better grab to do this.") return @@ -62,7 +62,7 @@ var/max_halloss = round(target.species.total_health * 0.8) //up to 80% of passing out affecting.adjustHalLoss(CLAMP(max_halloss - affecting.halloss, 0, 30)) -/obj/item/weapon/grab/proc/attack_eye(mob/living/carbon/human/target, mob/living/carbon/human/attacker) +/obj/item/grab/proc/attack_eye(mob/living/carbon/human/target, mob/living/carbon/human/attacker) if(!istype(attacker)) return @@ -85,7 +85,7 @@ attack.handle_eye_attack(attacker, target) -/obj/item/weapon/grab/proc/headbutt(mob/living/carbon/human/target, mob/living/carbon/human/attacker) +/obj/item/grab/proc/headbutt(mob/living/carbon/human/target, mob/living/carbon/human/attacker) if(!istype(attacker)) return if(target.lying) @@ -115,7 +115,7 @@ qdel(src) return -/obj/item/weapon/grab/proc/dislocate(mob/living/carbon/human/target, mob/living/attacker, var/target_zone) +/obj/item/grab/proc/dislocate(mob/living/carbon/human/target, mob/living/attacker, var/target_zone) if(state < GRAB_NECK) to_chat(attacker, "You require a better grab to do this.") return @@ -123,7 +123,7 @@ playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) return -/obj/item/weapon/grab/proc/pin_down(mob/target, mob/attacker) +/obj/item/grab/proc/pin_down(mob/target, mob/attacker) if(state < GRAB_AGGRESSIVE) to_chat(attacker, "You require a better grab to do this.") return @@ -140,7 +140,7 @@ attacker.visible_message("[attacker] forces [target] to the ground!") apply_pinning(target, attacker) -/obj/item/weapon/grab/proc/apply_pinning(mob/target, mob/attacker) +/obj/item/grab/proc/apply_pinning(mob/target, mob/attacker) force_down = 1 target.Weaken(3) target.lying = 1 @@ -148,7 +148,7 @@ attacker.set_dir(EAST) //face the victim target.set_dir(SOUTH) //face up -/obj/item/weapon/grab/proc/devour(mob/target, mob/user) +/obj/item/grab/proc/devour(mob/target, mob/user) var/can_eat if((FAT in user.mutations) && ismini(target)) can_eat = 1 diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index eea78a94c77..ab545461235 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -142,7 +142,7 @@ if(target.buckled || target.lying) return zone // if your target is being grabbed aggressively by someone you cannot miss either - for(var/obj/item/weapon/grab/G in target.grabbed_by) + for(var/obj/item/grab/G in target.grabbed_by) if(G.state >= GRAB_AGGRESSIVE) return zone @@ -528,24 +528,24 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) return SAFE_PERP //Agent cards lower threatlevel. - var/obj/item/weapon/card/id/id = GetIdCard() - if(id && istype(id, /obj/item/weapon/card/id/syndicate)) + var/obj/item/card/id/id = GetIdCard() + if(id && istype(id, /obj/item/card/id/syndicate)) threatcount -= 2 // A proper CentCom id is hard currency. - else if(id && istype(id, /obj/item/weapon/card/id/centcom)) + else if(id && istype(id, /obj/item/card/id/centcom)) return SAFE_PERP if(check_access && !access_obj.allowed(src)) threatcount += 4 if(auth_weapons && !access_obj.allowed(src)) - if(istype(l_hand, /obj/item/weapon/gun) || istype(l_hand, /obj/item/weapon/melee)) + if(istype(l_hand, /obj/item/gun) || istype(l_hand, /obj/item/melee)) threatcount += 4 - if(istype(r_hand, /obj/item/weapon/gun) || istype(r_hand, /obj/item/weapon/melee)) + if(istype(r_hand, /obj/item/gun) || istype(r_hand, /obj/item/melee)) threatcount += 4 - if(istype(belt, /obj/item/weapon/gun) || istype(belt, /obj/item/weapon/melee)) + if(istype(belt, /obj/item/gun) || istype(belt, /obj/item/melee)) threatcount += 2 if(species.name != SPECIES_HUMAN) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 6edae3b15f7..0f4c4fa9148 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -8,7 +8,7 @@ /mob/proc/movement_delay(oldloc, direct) . = 0 - if(locate(/obj/item/weapon/grab) in src) + if(locate(/obj/item/grab) in src) . += 5 // Movespeed delay based on movement mode @@ -328,11 +328,11 @@ my_mob.other_mobs = null // Update all the grabs! - for (var/obj/item/weapon/grab/G in my_mob) + for (var/obj/item/grab/G in my_mob) if (G.state == GRAB_NECK) mob.set_dir(reverse_dir[direct]) G.adjust_position() - for (var/obj/item/weapon/grab/G in my_mob.grabbed_by) + for (var/obj/item/grab/G in my_mob.grabbed_by) G.adjust_position() // We're not in the middle of a move anymore diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 8b0b76a0b66..2221905e416 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -512,7 +512,7 @@ ticker.minds += character.mind//Cyborgs and AIs handle this in the transform proc. //TODO!!!!! ~Carn if(ishuman(character)) if(character.client.prefs.auto_backup_implant) - var/obj/item/weapon/implant/backup/imp = new(src) + var/obj/item/implant/backup/imp = new(src) if(imp.handle_implant(character,character.zone_sel.selecting)) imp.post_implant(character) diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm index d6758f093ae..5675c51b367 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -6,7 +6,7 @@ var/bellies_icon_path = 'icons/mob/vore/Taur_Bellies.dmi' /datum/riding/taur - keytype = /obj/item/weapon/material/twohanded/riding_crop // Crack! + keytype = /obj/item/material/twohanded/riding_crop // Crack! nonhuman_key_exemption = FALSE // If true, nonhumans who can't hold keys don't need them, like borgs and simplemobs. key_name = "a riding crop" // What the 'keys' for the thing being rided on would be called. only_one_driver = TRUE // If true, only the person in 'front' (first on list of riding mobs) can drive. diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 03075d75b8d..05c2c4cd3ba 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -173,11 +173,11 @@ O.job = JOB_CYBORG if(O.mind.assigned_role == JOB_CYBORG) if(O.mind.role_alt_title == JOB_ALT_ROBOT) - O.mmi = new /obj/item/device/mmi/digital/posibrain(O) + O.mmi = new /obj/item/mmi/digital/posibrain(O) else if(O.mind.role_alt_title == JOB_ALT_DRONE) - O.mmi = new /obj/item/device/mmi/digital/robot(O) + O.mmi = new /obj/item/mmi/digital/robot(O) else - O.mmi = new /obj/item/device/mmi(O) + O.mmi = new /obj/item/mmi(O) O.mmi.transfer_identity(src) diff --git a/code/modules/modular_computers/NTNet/NTNet.dm b/code/modules/modular_computers/NTNet/NTNet.dm index f725cf5aa73..88825af1fec 100644 --- a/code/modules/modular_computers/NTNet/NTNet.dm +++ b/code/modules/modular_computers/NTNet/NTNet.dm @@ -49,12 +49,12 @@ var/global/datum/ntnet/ntnet_global = new() build_emails_list() add_log("NTNet logging system activated.") -/datum/ntnet/proc/add_log_with_ids_check(var/log_string, var/obj/item/weapon/computer_hardware/network_card/source = null) +/datum/ntnet/proc/add_log_with_ids_check(var/log_string, var/obj/item/computer_hardware/network_card/source = null) if(intrusion_detection_enabled) add_log(log_string, source) // Simplified logging: Adds a log. log_string is mandatory parameter, source is optional. -/datum/ntnet/proc/add_log(var/log_string, var/obj/item/weapon/computer_hardware/network_card/source = null) +/datum/ntnet/proc/add_log(var/log_string, var/obj/item/computer_hardware/network_card/source = null) var/log_text = "[stationtime2text()] - " if(source) log_text += "[source.get_network_tag()] - " diff --git a/code/modules/modular_computers/NTNet/NTNet_relay.dm b/code/modules/modular_computers/NTNet/NTNet_relay.dm index 8da5a9972f5..dc80a10f5e8 100644 --- a/code/modules/modular_computers/NTNet/NTNet_relay.dm +++ b/code/modules/modular_computers/NTNet/NTNet_relay.dm @@ -8,7 +8,7 @@ icon_state = "ntnet" anchored = TRUE density = TRUE - circuit = /obj/item/weapon/circuitboard/ntnet_relay + circuit = /obj/item/circuitboard/ntnet_relay var/datum/ntnet/NTNet = null // This is mostly for backwards reference and to allow varedit modifications from ingame. var/enabled = 1 // Set to 0 if the relay was turned off var/dos_failure = 0 // Set to 1 if the relay failed due to (D)DoS attack diff --git a/code/modules/modular_computers/computers/modular_computer/core.dm b/code/modules/modular_computers/computers/modular_computer/core.dm index 827b7204f80..1598d5d47f8 100644 --- a/code/modules/modular_computers/computers/modular_computer/core.dm +++ b/code/modules/modular_computers/computers/modular_computer/core.dm @@ -55,7 +55,7 @@ /obj/item/modular_computer/Destroy() kill_program(1) STOP_PROCESSING(SSobj, src) - for(var/obj/item/weapon/computer_hardware/CH in src.get_all_components()) + for(var/obj/item/computer_hardware/CH in src.get_all_components()) uninstall_component(null, CH) qdel(CH) return ..() diff --git a/code/modules/modular_computers/computers/modular_computer/damage.dm b/code/modules/modular_computers/computers/modular_computer/damage.dm index 2c7e357cda1..deba8273e19 100644 --- a/code/modules/modular_computers/computers/modular_computer/damage.dm +++ b/code/modules/modular_computers/computers/modular_computer/damage.dm @@ -9,7 +9,7 @@ visible_message("\The [src] breaks apart!") var/turf/newloc = get_turf(src) new /obj/item/stack/material/steel(newloc, round(steel_sheet_cost/2)) - for(var/obj/item/weapon/computer_hardware/H in get_all_components()) + for(var/obj/item/computer_hardware/H in get_all_components()) uninstall_component(null, H) H.forceMove(newloc) if(prob(25)) @@ -26,7 +26,7 @@ damage = between(0, damage, max_damage) if(component_probability) - for(var/obj/item/weapon/computer_hardware/H in get_all_components()) + for(var/obj/item/computer_hardware/H in get_all_components()) if(prob(component_probability)) H.take_damage(round(amount / 2)) diff --git a/code/modules/modular_computers/computers/modular_computer/hardware.dm b/code/modules/modular_computers/computers/modular_computer/hardware.dm index 38545e81763..ed50a70706e 100644 --- a/code/modules/modular_computers/computers/modular_computer/hardware.dm +++ b/code/modules/modular_computers/computers/modular_computer/hardware.dm @@ -1,49 +1,49 @@ // Attempts to install the hardware into apropriate slot. -/obj/item/modular_computer/proc/try_install_component(var/mob/living/user, var/obj/item/weapon/computer_hardware/H, var/found = 0) +/obj/item/modular_computer/proc/try_install_component(var/mob/living/user, var/obj/item/computer_hardware/H, var/found = 0) // "USB" flash drive. - if(istype(H, /obj/item/weapon/computer_hardware/hard_drive/portable)) + if(istype(H, /obj/item/computer_hardware/hard_drive/portable)) if(portable_drive) to_chat(user, "This computer's portable drive slot is already occupied by \the [portable_drive].") return found = 1 portable_drive = H - else if(istype(H, /obj/item/weapon/computer_hardware/hard_drive)) + else if(istype(H, /obj/item/computer_hardware/hard_drive)) if(hard_drive) to_chat(user, "This computer's hard drive slot is already occupied by \the [hard_drive].") return found = 1 hard_drive = H - else if(istype(H, /obj/item/weapon/computer_hardware/network_card)) + else if(istype(H, /obj/item/computer_hardware/network_card)) if(network_card) to_chat(user, "This computer's network card slot is already occupied by \the [network_card].") return found = 1 network_card = H - else if(istype(H, /obj/item/weapon/computer_hardware/nano_printer)) + else if(istype(H, /obj/item/computer_hardware/nano_printer)) if(nano_printer) to_chat(user, "This computer's nano printer slot is already occupied by \the [nano_printer].") return found = 1 nano_printer = H - else if(istype(H, /obj/item/weapon/computer_hardware/card_slot)) + else if(istype(H, /obj/item/computer_hardware/card_slot)) if(card_slot) to_chat(user, "This computer's card slot is already occupied by \the [card_slot].") return found = 1 card_slot = H - else if(istype(H, /obj/item/weapon/computer_hardware/battery_module)) + else if(istype(H, /obj/item/computer_hardware/battery_module)) if(battery_module) to_chat(user, "This computer's battery slot is already occupied by \the [battery_module].") return found = 1 battery_module = H - else if(istype(H, /obj/item/weapon/computer_hardware/processor_unit)) + else if(istype(H, /obj/item/computer_hardware/processor_unit)) if(processor_unit) to_chat(user, "This computer's processor slot is already occupied by \the [processor_unit].") return found = 1 processor_unit = H - else if(istype(H, /obj/item/weapon/computer_hardware/tesla_link)) + else if(istype(H, /obj/item/computer_hardware/tesla_link)) if(tesla_link) to_chat(user, "This computer's tesla link slot is already occupied by \the [tesla_link].") return @@ -57,7 +57,7 @@ update_verbs() // Uninstalls component. Found and Critical vars may be passed by parent types, if they have additional hardware. -/obj/item/modular_computer/proc/uninstall_component(var/mob/living/user, var/obj/item/weapon/computer_hardware/H, var/found = 0, var/critical = 0) +/obj/item/modular_computer/proc/uninstall_component(var/mob/living/user, var/obj/item/computer_hardware/H, var/found = 0, var/critical = 0) if(portable_drive == H) portable_drive = null found = 1 diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm index 539e051689a..fac9004da69 100644 --- a/code/modules/modular_computers/computers/modular_computer/interaction.dm +++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm @@ -120,9 +120,9 @@ else if(!enabled && screen_on) turn_on(user) -/obj/item/modular_computer/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if(istype(W, /obj/item/weapon/card/id)) // ID Card, try to insert it. - var/obj/item/weapon/card/id/I = W +/obj/item/modular_computer/attackby(var/obj/item/W as obj, var/mob/user as mob) + if(istype(W, /obj/item/card/id)) // ID Card, try to insert it. + var/obj/item/card/id/I = W if(!card_slot) to_chat(user, "You try to insert \the [I] into \the [src], but it does not have an ID card slot installed.") return @@ -136,12 +136,12 @@ update_uis() to_chat(user, "You insert \the [I] into \the [src].") return - if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/paper_bundle)) + if(istype(W, /obj/item/paper) || istype(W, /obj/item/paper_bundle)) if(!nano_printer) return nano_printer.attackby(W, user) - if(istype(W, /obj/item/weapon/computer_hardware)) - var/obj/item/weapon/computer_hardware/C = W + if(istype(W, /obj/item/computer_hardware)) + var/obj/item/computer_hardware/C = W if(C.hardware_size <= max_hardware_size) try_install_component(user, C) else @@ -156,7 +156,7 @@ qdel(src) return if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(!WT.isOn()) to_chat(user, "\The [W] is off.") return @@ -177,7 +177,7 @@ to_chat(user, "This device doesn't have any components installed.") return var/list/component_names = list() - for(var/obj/item/weapon/computer_hardware/H in all_components) + for(var/obj/item/computer_hardware/H in all_components) component_names.Add(H.name) var/choice = tgui_input_list(usr, "Which component do you want to uninstall?", "Computer maintenance", component_names) @@ -188,7 +188,7 @@ if(!Adjacent(usr)) return - var/obj/item/weapon/computer_hardware/H = find_hardware_by_name(choice) + var/obj/item/computer_hardware/H = find_hardware_by_name(choice) if(!H) return diff --git a/code/modules/modular_computers/computers/modular_computer/power.dm b/code/modules/modular_computers/computers/modular_computer/power.dm index 5d12d2e174e..004fcbfb75a 100644 --- a/code/modules/modular_computers/computers/modular_computer/power.dm +++ b/code/modules/modular_computers/computers/modular_computer/power.dm @@ -44,7 +44,7 @@ // Handles power-related things, such as battery interaction, recharging, shutdown when it's discharged /obj/item/modular_computer/proc/handle_power() var/power_usage = screen_on ? base_active_power_usage : base_idle_power_usage - for(var/obj/item/weapon/computer_hardware/H in get_all_components()) + for(var/obj/item/computer_hardware/H in get_all_components()) if(H.enabled) power_usage += H.power_usage last_power_usage = power_usage diff --git a/code/modules/modular_computers/computers/modular_computer/ui.dm b/code/modules/modular_computers/computers/modular_computer/ui.dm index 6e5aa2e38e1..88d9d4ac8d9 100644 --- a/code/modules/modular_computers/computers/modular_computer/ui.dm +++ b/code/modules/modular_computers/computers/modular_computer/ui.dm @@ -38,9 +38,9 @@ data["device_theme"] = device_theme data["login"] = list() - var/obj/item/weapon/computer_hardware/card_slot/cardholder = card_slot + var/obj/item/computer_hardware/card_slot/cardholder = card_slot if(cardholder) - var/obj/item/weapon/card/id/stored_card = cardholder.stored_card + var/obj/item/card/id/stored_card = cardholder.stored_card if(stored_card) var/stored_name = stored_card.registered_name var/stored_title = stored_card.assignment diff --git a/code/modules/modular_computers/computers/modular_computer/variables.dm b/code/modules/modular_computers/computers/modular_computer/variables.dm index 101e7056f9e..5777b4d1296 100644 --- a/code/modules/modular_computers/computers/modular_computer/variables.dm +++ b/code/modules/modular_computers/computers/modular_computer/variables.dm @@ -43,22 +43,22 @@ var/max_damage = 100 // Damage level at which the computer breaks apart. // Important hardware (must be installed for computer to work) - var/obj/item/weapon/computer_hardware/processor_unit/processor_unit // CPU. Without it the computer won't run. Better CPUs can run more programs at once. - var/obj/item/weapon/computer_hardware/network_card/network_card // Network Card component of this computer. Allows connection to NTNet - var/obj/item/weapon/computer_hardware/hard_drive/hard_drive // Hard Drive component of this computer. Stores programs and files. + var/obj/item/computer_hardware/processor_unit/processor_unit // CPU. Without it the computer won't run. Better CPUs can run more programs at once. + var/obj/item/computer_hardware/network_card/network_card // Network Card component of this computer. Allows connection to NTNet + var/obj/item/computer_hardware/hard_drive/hard_drive // Hard Drive component of this computer. Stores programs and files. // Optional hardware (improves functionality, but is not critical for computer to work in most cases) - var/obj/item/weapon/computer_hardware/battery_module/battery_module // An internal power source for this computer. Can be recharged. - var/obj/item/weapon/computer_hardware/card_slot/card_slot // ID Card slot component of this computer. Mostly for HoP modification console that needs ID slot for modification. - var/obj/item/weapon/computer_hardware/nano_printer/nano_printer // Nano Printer component of this computer, for your everyday paperwork needs. - var/obj/item/weapon/computer_hardware/hard_drive/portable/portable_drive // Portable data storage - var/obj/item/weapon/computer_hardware/ai_slot/ai_slot // AI slot, an intellicard housing that allows modifications of AIs. - var/obj/item/weapon/computer_hardware/tesla_link/tesla_link // Tesla Link, Allows remote charging from nearest APC. + var/obj/item/computer_hardware/battery_module/battery_module // An internal power source for this computer. Can be recharged. + var/obj/item/computer_hardware/card_slot/card_slot // ID Card slot component of this computer. Mostly for HoP modification console that needs ID slot for modification. + var/obj/item/computer_hardware/nano_printer/nano_printer // Nano Printer component of this computer, for your everyday paperwork needs. + var/obj/item/computer_hardware/hard_drive/portable/portable_drive // Portable data storage + var/obj/item/computer_hardware/ai_slot/ai_slot // AI slot, an intellicard housing that allows modifications of AIs. + var/obj/item/computer_hardware/tesla_link/tesla_link // Tesla Link, Allows remote charging from nearest APC. var/modifiable = TRUE // can't be modified or damaged if false var/stores_pen = FALSE - var/obj/item/weapon/pen/stored_pen + var/obj/item/pen/stored_pen var/interact_sounds var/interact_sound_volume = 40 diff --git a/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm b/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm index 5d701ef5f08..a4815b89ae0 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm @@ -24,7 +24,7 @@ // Allows us to create "north bump" "south bump" etc. named objects, for more comfortable mapping. name = "telescreen" -/obj/item/modular_computer/telescreen/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/item/modular_computer/telescreen/attackby(var/obj/item/W as obj, var/mob/user as mob) if(W.has_tool_quality(TOOL_CROWBAR)) if(anchored) shutdown_computer() diff --git a/code/modules/modular_computers/computers/subtypes/preset_console.dm b/code/modules/modular_computers/computers/subtypes/preset_console.dm index 03e86c53380..0a7fac63823 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_console.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_console.dm @@ -1,10 +1,10 @@ /obj/item/modular_computer/console/preset/install_default_hardware() ..() - processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(src) - tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/super(src) - network_card = new/obj/item/weapon/computer_hardware/network_card/wired(src) - nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) + processor_unit = new/obj/item/computer_hardware/processor_unit(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive/super(src) + network_card = new/obj/item/computer_hardware/network_card/wired(src) + nano_printer = new/obj/item/computer_hardware/nano_printer(src) // Engineering /obj/item/modular_computer/console/preset/engineering/install_default_programs() @@ -28,7 +28,7 @@ // Research /obj/item/modular_computer/console/preset/research/install_default_hardware() ..() - //ai_slot = new/obj/item/weapon/computer_hardware/ai_slot(src) + //ai_slot = new/obj/item/computer_hardware/ai_slot(src) /obj/item/modular_computer/console/preset/research/install_default_programs() ..() @@ -43,7 +43,7 @@ // Administrator /obj/item/modular_computer/console/preset/sysadmin/install_default_hardware() ..() - //ai_slot = new/obj/item/weapon/computer_hardware/ai_slot(src) + //ai_slot = new/obj/item/computer_hardware/ai_slot(src) /obj/item/modular_computer/console/preset/sysadmin/install_default_programs() ..() @@ -59,8 +59,8 @@ // Command /obj/item/modular_computer/console/preset/command/install_default_hardware() ..() - nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) - card_slot = new/obj/item/weapon/computer_hardware/card_slot(src) + nano_printer = new/obj/item/computer_hardware/nano_printer(src) + card_slot = new/obj/item/computer_hardware/card_slot(src) /obj/item/modular_computer/console/preset/command/install_default_programs() ..() @@ -90,9 +90,9 @@ // ERT /obj/item/modular_computer/console/preset/ert/install_default_hardware() ..() - //ai_slot = new/obj/item/weapon/computer_hardware/ai_slot(src) - nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) - card_slot = new/obj/item/weapon/computer_hardware/card_slot(src) + //ai_slot = new/obj/item/computer_hardware/ai_slot(src) + nano_printer = new/obj/item/computer_hardware/nano_printer(src) + card_slot = new/obj/item/computer_hardware/card_slot(src) /obj/item/modular_computer/console/preset/ert/install_default_programs() ..() @@ -108,9 +108,9 @@ /obj/item/modular_computer/console/preset/mercenary/install_default_hardware() ..() - //ai_slot = new/obj/item/weapon/computer_hardware/ai_slot(src) - nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) - card_slot = new/obj/item/weapon/computer_hardware/card_slot(src) + //ai_slot = new/obj/item/computer_hardware/ai_slot(src) + nano_printer = new/obj/item/computer_hardware/nano_printer(src) + card_slot = new/obj/item/computer_hardware/card_slot(src) /obj/item/modular_computer/console/preset/mercenary/install_default_programs() ..() diff --git a/code/modules/modular_computers/computers/subtypes/preset_laptop.dm b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm index 929e72a1663..e136b9a56b3 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_laptop.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm @@ -1,34 +1,34 @@ /obj/item/modular_computer/laptop/preset/custom_loadout/cheap/install_default_hardware() ..() - processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src) - tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/(src) - network_card = new/obj/item/weapon/computer_hardware/network_card/(src) - nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) - card_slot = new/obj/item/weapon/computer_hardware/card_slot(src) - battery_module = new/obj/item/weapon/computer_hardware/battery_module/advanced(src) + processor_unit = new/obj/item/computer_hardware/processor_unit/small(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive/(src) + network_card = new/obj/item/computer_hardware/network_card/(src) + nano_printer = new/obj/item/computer_hardware/nano_printer(src) + card_slot = new/obj/item/computer_hardware/card_slot(src) + battery_module = new/obj/item/computer_hardware/battery_module/advanced(src) battery_module.charge_to_full() /obj/item/modular_computer/laptop/preset/custom_loadout/advanced/install_default_hardware() ..() - processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(src) - tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/advanced(src) - network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(src) - nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) - card_slot = new/obj/item/weapon/computer_hardware/card_slot(src) - battery_module = new/obj/item/weapon/computer_hardware/battery_module/advanced(src) + processor_unit = new/obj/item/computer_hardware/processor_unit(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive/advanced(src) + network_card = new/obj/item/computer_hardware/network_card/advanced(src) + nano_printer = new/obj/item/computer_hardware/nano_printer(src) + card_slot = new/obj/item/computer_hardware/card_slot(src) + battery_module = new/obj/item/computer_hardware/battery_module/advanced(src) battery_module.charge_to_full() /obj/item/modular_computer/laptop/preset/custom_loadout/standard/install_default_hardware() ..() - processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(src) - tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/(src) - network_card = new/obj/item/weapon/computer_hardware/network_card/(src) - nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) - card_slot = new/obj/item/weapon/computer_hardware/card_slot(src) - battery_module = new/obj/item/weapon/computer_hardware/battery_module/advanced(src) + processor_unit = new/obj/item/computer_hardware/processor_unit(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive/(src) + network_card = new/obj/item/computer_hardware/network_card/(src) + nano_printer = new/obj/item/computer_hardware/nano_printer(src) + card_slot = new/obj/item/computer_hardware/card_slot(src) + battery_module = new/obj/item/computer_hardware/battery_module/advanced(src) battery_module.charge_to_full() /obj/item/modular_computer/laptop/preset/custom_loadout/elite @@ -38,11 +38,11 @@ /obj/item/modular_computer/laptop/preset/custom_loadout/elite/install_default_hardware() ..() - processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(src) - tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/super(src) - network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(src) - nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) - card_slot = new/obj/item/weapon/computer_hardware/card_slot(src) - battery_module = new/obj/item/weapon/computer_hardware/battery_module/super(src) + processor_unit = new/obj/item/computer_hardware/processor_unit(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive/super(src) + network_card = new/obj/item/computer_hardware/network_card/advanced(src) + nano_printer = new/obj/item/computer_hardware/nano_printer(src) + card_slot = new/obj/item/computer_hardware/card_slot(src) + battery_module = new/obj/item/computer_hardware/battery_module/super(src) battery_module.charge_to_full() diff --git a/code/modules/modular_computers/computers/subtypes/preset_laptop_vr.dm b/code/modules/modular_computers/computers/subtypes/preset_laptop_vr.dm index 5f7b2025b0b..8e0e0f35b3c 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_laptop_vr.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_laptop_vr.dm @@ -11,13 +11,13 @@ /obj/item/modular_computer/laptop/preset/custom_loadout/rugged/install_default_hardware() ..() - processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src) - tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/advanced(src) - network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(src) - nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) - card_slot = new/obj/item/weapon/computer_hardware/card_slot(src) - battery_module = new/obj/item/weapon/computer_hardware/battery_module/super(src) + processor_unit = new/obj/item/computer_hardware/processor_unit/small(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive/advanced(src) + network_card = new/obj/item/computer_hardware/network_card/advanced(src) + nano_printer = new/obj/item/computer_hardware/nano_printer(src) + card_slot = new/obj/item/computer_hardware/card_slot(src) + battery_module = new/obj/item/computer_hardware/battery_module/super(src) battery_module.charge_to_full() //Fancy Schmancy - this is defined in normal file, just swapping the icon @@ -38,11 +38,11 @@ /obj/item/modular_computer/laptop/preset/custom_loadout/hybrid/install_default_hardware() ..() - processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/photonic(src) - tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/super(src) - network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(src) - nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) - card_slot = new/obj/item/weapon/computer_hardware/card_slot(src) - battery_module = new/obj/item/weapon/computer_hardware/battery_module/lambda(src) + processor_unit = new/obj/item/computer_hardware/processor_unit/photonic(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive/super(src) + network_card = new/obj/item/computer_hardware/network_card/advanced(src) + nano_printer = new/obj/item/computer_hardware/nano_printer(src) + card_slot = new/obj/item/computer_hardware/card_slot(src) + battery_module = new/obj/item/computer_hardware/battery_module/lambda(src) battery_module.charge_to_full() diff --git a/code/modules/modular_computers/computers/subtypes/preset_tablet.dm b/code/modules/modular_computers/computers/subtypes/preset_tablet.dm index 65c3a47c3cb..05e7c8afbb9 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_tablet.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_tablet.dm @@ -1,28 +1,28 @@ /obj/item/modular_computer/tablet/preset/custom_loadout/cheap/install_default_hardware() ..() - processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src) - tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/micro(src) - network_card = new/obj/item/weapon/computer_hardware/network_card(src) - battery_module = new/obj/item/weapon/computer_hardware/battery_module/nano(src) + processor_unit = new/obj/item/computer_hardware/processor_unit/small(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive/micro(src) + network_card = new/obj/item/computer_hardware/network_card(src) + battery_module = new/obj/item/computer_hardware/battery_module/nano(src) battery_module.charge_to_full() /obj/item/modular_computer/tablet/preset/custom_loadout/advanced/install_default_hardware() ..() - processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src) - tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src) - network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(src) - nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) - card_slot = new/obj/item/weapon/computer_hardware/card_slot(src) - battery_module = new/obj/item/weapon/computer_hardware/battery_module(src) + processor_unit = new/obj/item/computer_hardware/processor_unit/small(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive/small(src) + network_card = new/obj/item/computer_hardware/network_card/advanced(src) + nano_printer = new/obj/item/computer_hardware/nano_printer(src) + card_slot = new/obj/item/computer_hardware/card_slot(src) + battery_module = new/obj/item/computer_hardware/battery_module(src) battery_module.charge_to_full() /obj/item/modular_computer/tablet/preset/custom_loadout/standard/install_default_hardware() ..() - processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src) - tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src) - network_card = new/obj/item/weapon/computer_hardware/network_card(src) - battery_module = new/obj/item/weapon/computer_hardware/battery_module/micro(src) + processor_unit = new/obj/item/computer_hardware/processor_unit/small(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive/small(src) + network_card = new/obj/item/computer_hardware/network_card(src) + battery_module = new/obj/item/computer_hardware/battery_module/micro(src) battery_module.charge_to_full() diff --git a/code/modules/modular_computers/computers/subtypes/preset_tablet_vr.dm b/code/modules/modular_computers/computers/subtypes/preset_tablet_vr.dm index 9a879286189..b37abfd85cd 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_tablet_vr.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_tablet_vr.dm @@ -9,11 +9,11 @@ /obj/item/modular_computer/tablet/preset/custom_loadout/rugged/install_default_hardware() ..() - processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src) - tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src) - network_card = new/obj/item/weapon/computer_hardware/network_card(src) - battery_module = new/obj/item/weapon/computer_hardware/battery_module/micro(src) + processor_unit = new/obj/item/computer_hardware/processor_unit/small(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive/small(src) + network_card = new/obj/item/computer_hardware/network_card(src) + battery_module = new/obj/item/computer_hardware/battery_module/micro(src) battery_module.charge_to_full() /obj/item/modular_computer/tablet/preset/custom_loadout/elite @@ -25,13 +25,13 @@ /obj/item/modular_computer/tablet/preset/custom_loadout/elite/install_default_hardware() ..() - processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src) - tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src) - network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(src) - nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) - card_slot = new/obj/item/weapon/computer_hardware/card_slot(src) - battery_module = new/obj/item/weapon/computer_hardware/battery_module(src) + processor_unit = new/obj/item/computer_hardware/processor_unit/small(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive/small(src) + network_card = new/obj/item/computer_hardware/network_card/advanced(src) + nano_printer = new/obj/item/computer_hardware/nano_printer(src) + card_slot = new/obj/item/computer_hardware/card_slot(src) + battery_module = new/obj/item/computer_hardware/battery_module(src) battery_module.charge_to_full() /obj/item/modular_computer/tablet/preset/custom_loadout/hybrid @@ -43,11 +43,11 @@ /obj/item/modular_computer/tablet/preset/custom_loadout/hybrid/install_default_hardware() ..() - processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/photonic/small(src) - tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src) - network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(src) - nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src) - card_slot = new/obj/item/weapon/computer_hardware/card_slot(src) - battery_module = new/obj/item/weapon/computer_hardware/battery_module/lambda(src) + processor_unit = new/obj/item/computer_hardware/processor_unit/photonic/small(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive/small(src) + network_card = new/obj/item/computer_hardware/network_card/advanced(src) + nano_printer = new/obj/item/computer_hardware/nano_printer(src) + card_slot = new/obj/item/computer_hardware/card_slot(src) + battery_module = new/obj/item/computer_hardware/battery_module/lambda(src) battery_module.charge_to_full() diff --git a/code/modules/modular_computers/computers/subtypes/preset_telescreen.dm b/code/modules/modular_computers/computers/subtypes/preset_telescreen.dm index d0cb86bada0..b463eb82322 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_telescreen.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_telescreen.dm @@ -1,9 +1,9 @@ /obj/item/modular_computer/telescreen/preset/install_default_hardware() ..() - processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(src) - tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) - hard_drive = new/obj/item/weapon/computer_hardware/hard_drive(src) - network_card = new/obj/item/weapon/computer_hardware/network_card(src) + processor_unit = new/obj/item/computer_hardware/processor_unit(src) + tesla_link = new/obj/item/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/computer_hardware/hard_drive(src) + network_card = new/obj/item/computer_hardware/network_card(src) /obj/item/modular_computer/telescreen/preset/generic/install_default_programs() ..() diff --git a/code/modules/modular_computers/file_system/computer_file.dm b/code/modules/modular_computers/file_system/computer_file.dm index b477862535c..d076aeefd65 100644 --- a/code/modules/modular_computers/file_system/computer_file.dm +++ b/code/modules/modular_computers/file_system/computer_file.dm @@ -8,7 +8,7 @@ var/global/file_uid = 0 /// File size in GQ. Integers only! var/size = 1 /// Holder that contains this file. - var/obj/item/weapon/computer_hardware/hard_drive/holder + var/obj/item/computer_hardware/hard_drive/holder //// Whether the file may be sent to someone via NTNet transfer, email or other means. var/unsendable = FALSE /// Whether the file may be deleted. Setting to TRUE prevents deletion/renaming/etc. @@ -22,7 +22,7 @@ var/global/file_uid = 0 /// Any metadata the file uses. var/list/metadata /// Paper type to use for printing - var/papertype = /obj/item/weapon/paper + var/papertype = /obj/item/paper /datum/computer_file/New(list/md = null) ..() diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index 8de2ea1a931..d43abfa1a3e 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -115,7 +115,7 @@ if(!istype(user)) return 0 - var/obj/item/weapon/card/id/I = user.GetIdCard() + var/obj/item/card/id/I = user.GetIdCard() if(!I) if(loud) to_chat(user, "\The [computer] flashes an \"RFID Error - Unable to scan ID\" warning.") diff --git a/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm b/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm index 4dbdc015fdf..033d1e32069 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm @@ -31,8 +31,8 @@ . = ..() if(!running) return - var/obj/item/weapon/computer_hardware/processor_unit/CPU = computer.processor_unit - var/obj/item/weapon/computer_hardware/card_slot/RFID = computer.card_slot + var/obj/item/computer_hardware/processor_unit/CPU = computer.processor_unit + var/obj/item/computer_hardware/card_slot/RFID = computer.card_slot if(!istype(CPU) || !CPU.check_functionality() || !istype(RFID) || !RFID.check_functionality()) message = "A fatal hardware error has been detected." return @@ -62,8 +62,8 @@ return TRUE if(text2num(params["allowed"])) return TRUE - var/obj/item/weapon/computer_hardware/processor_unit/CPU = computer.processor_unit - var/obj/item/weapon/computer_hardware/card_slot/RFID = computer.card_slot + var/obj/item/computer_hardware/processor_unit/CPU = computer.processor_unit + var/obj/item/computer_hardware/card_slot/RFID = computer.card_slot if(!istype(CPU) || !CPU.check_functionality() || !istype(RFID) || !RFID.check_functionality()) message = "A fatal hardware error has been detected." return @@ -92,7 +92,7 @@ data["rate"] = computer.processor_unit.max_idle_programs data["factor"] = (progress / target_progress) else if(computer?.card_slot?.stored_card) - var/obj/item/weapon/card/id/id_card = computer.card_slot.stored_card + var/obj/item/card/id/id_card = computer.card_slot.stored_card for(var/i = 1; i <= 7; i++) var/list/accesses = list() for(var/access in get_region_accesses(i)) diff --git a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm index e1fa0cfa8a0..f8ec1e3f5a0 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm @@ -84,7 +84,7 @@ executed = TRUE target.dos_sources.Add(src) if(ntnet_global.intrusion_detection_enabled) - var/obj/item/weapon/computer_hardware/network_card/network_card = computer.network_card + var/obj/item/computer_hardware/network_card/network_card = computer.network_card ntnet_global.add_log("IDS WARNING - Excess traffic flood targeting relay [target.uid] detected from device: [network_card.get_network_tag()]") ntnet_global.intrusion_detection_alarm = TRUE return TRUE diff --git a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm index 72c2b73526b..8acc4dda446 100644 --- a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm +++ b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm @@ -20,8 +20,8 @@ if(..()) return TRUE - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - var/obj/item/weapon/computer_hardware/hard_drive/RHDD = computer.portable_drive + var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive + var/obj/item/computer_hardware/hard_drive/RHDD = computer.portable_drive switch(action) if("PRG_openfile") @@ -150,8 +150,8 @@ /datum/computer_file/program/filemanager/tgui_data(mob/user) var/list/data = get_header_data() - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive + var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive + var/obj/item/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive data["error"] = null if(error) diff --git a/code/modules/modular_computers/file_system/programs/generic/game.dm b/code/modules/modular_computers/file_system/programs/generic/game.dm index 8d3219bc424..63892365cbb 100644 --- a/code/modules/modular_computers/file_system/programs/generic/game.dm +++ b/code/modules/modular_computers/file_system/programs/generic/game.dm @@ -111,7 +111,7 @@ if(..()) // Always call parent in tgui_act, it handles making sure the user is allowed to interact with the UI. return TRUE - var/obj/item/weapon/computer_hardware/nano_printer/printer + var/obj/item/computer_hardware/nano_printer/printer if(computer) printer = computer.nano_printer diff --git a/code/modules/modular_computers/file_system/programs/generic/news_browser.dm b/code/modules/modular_computers/file_system/programs/generic/news_browser.dm index 6eb6fc0f2e0..c9ae5cf3609 100644 --- a/code/modules/modular_computers/file_system/programs/generic/news_browser.dm +++ b/code/modules/modular_computers/file_system/programs/generic/news_browser.dm @@ -109,7 +109,7 @@ var/savename = sanitize(tgui_input_text(usr, "Enter file name or leave blank to cancel:", "Save article", loaded_article.filename)) if(!savename) return TRUE - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive + var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive if(!HDD) return TRUE var/datum/computer_file/data/news_article/N = loaded_article.clone() diff --git a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm index 599f79fe786..36ab677c8f9 100644 --- a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm +++ b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm @@ -19,7 +19,7 @@ category = PROG_OFFICE /datum/computer_file/program/wordprocessor/proc/get_file(var/filename) - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive + var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive if(!HDD) return var/datum/computer_file/data/F = HDD.find_file_by_name(filename) @@ -40,7 +40,7 @@ F = create_file(filename, loaded_data) return !isnull(F) var/datum/computer_file/data/backup = F.clone() - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive + var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive if(!HDD) return HDD.remove_file(F) @@ -55,7 +55,7 @@ /datum/computer_file/program/wordprocessor/proc/create_file(var/newname, var/data = "") if(!newname) return - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive + var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive if(!HDD) return if(get_file(newname)) @@ -188,8 +188,8 @@ /datum/computer_file/program/wordprocessor/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = get_header_data() - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive + var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive + var/obj/item/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive data["error"] = null if(error) data["error"] = error diff --git a/code/modules/modular_computers/file_system/programs/research/email_administration.dm b/code/modules/modular_computers/file_system/programs/research/email_administration.dm index 6b8ff68b233..77297ef041d 100644 --- a/code/modules/modular_computers/file_system/programs/research/email_administration.dm +++ b/code/modules/modular_computers/file_system/programs/research/email_administration.dm @@ -66,7 +66,7 @@ return TRUE // High security - can only be operated when the user has an ID with access on them. - var/obj/item/weapon/card/id/I = usr.GetIdCard() + var/obj/item/card/id/I = usr.GetIdCard() if(!istype(I) || !(access_network in I.GetAccess())) return TRUE diff --git a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm index 05bbb55f1db..ee35f6d0d63 100644 --- a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm +++ b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm @@ -72,7 +72,7 @@ var/warrant_uid = 0 // The following actions will only be possible if the user has an ID with security access equipped. This is in line with modular computer framework's authentication methods, // which also use RFID scanning to allow or disallow access to some functions. Anyone can view warrants, editing requires ID. This also prevents situations where you show a tablet // to someone who is to be arrested, which allows them to change the stuff there. - var/obj/item/weapon/card/id/I = usr.GetIdCard() + var/obj/item/card/id/I = usr.GetIdCard() if(!istype(I) || !I.registered_name || !(access_security in I.GetAccess())) to_chat(usr, "Authentication error: Unable to locate ID with appropriate access to allow this operation.") return diff --git a/code/modules/modular_computers/hardware/_hardware.dm b/code/modules/modular_computers/hardware/_hardware.dm index 10a97887e05..bbe8f4e28c4 100644 --- a/code/modules/modular_computers/hardware/_hardware.dm +++ b/code/modules/modular_computers/hardware/_hardware.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/computer_hardware/ +/obj/item/computer_hardware/ name = "Hardware" desc = "Unknown Hardware." icon = 'icons/obj/modular_components.dmi' @@ -26,9 +26,9 @@ /// Whether attackby will be passed on it even with a closed panel var/external_slot -/obj/item/weapon/computer_hardware/attackby(obj/item/W as obj, mob/living/user as mob) +/obj/item/computer_hardware/attackby(obj/item/W as obj, mob/living/user as mob) // Multitool. Runs diagnostics - if(istype(W, /obj/item/device/multitool)) + if(istype(W, /obj/item/multitool)) to_chat(user, "***** DIAGNOSTICS REPORT *****") diagnostics(user) to_chat(user, "******************************") @@ -56,22 +56,22 @@ /// Returns a list of lines containing diagnostic information for display. -/obj/item/weapon/computer_hardware/proc/diagnostics(var/mob/user) +/obj/item/computer_hardware/proc/diagnostics(var/mob/user) to_chat(user, "Hardware Integrity Test... (Corruption: [damage]/[max_damage]) [damage > damage_failure ? "FAIL" : damage > damage_malfunction ? "WARN" : "PASS"]") -/obj/item/weapon/computer_hardware/New(var/obj/L) +/obj/item/computer_hardware/New(var/obj/L) ..() w_class = hardware_size if(istype(L, /obj/item/modular_computer)) holder2 = L return -/obj/item/weapon/computer_hardware/Destroy() +/obj/item/computer_hardware/Destroy() holder2 = null return ..() /// Handles damage checks -/obj/item/weapon/computer_hardware/proc/check_functionality() +/obj/item/computer_hardware/proc/check_functionality() // Turned off if(!enabled) return FALSE @@ -85,7 +85,7 @@ // Good to go. return TRUE -/obj/item/weapon/computer_hardware/examine(var/mob/user) +/obj/item/computer_hardware/examine(var/mob/user) . = ..() if(damage > damage_failure) . += "It seems to be severely damaged!" @@ -95,6 +95,6 @@ . += "It seems to be slightly damaged." /// Damages the component. Contains necessary checks. Negative damage "heals" the component. -/obj/item/weapon/computer_hardware/take_damage(var/amount) +/obj/item/computer_hardware/take_damage(var/amount) damage += round(amount) // We want nice rounded numbers here. damage = between(0, damage, max_damage) // Clamp the value. diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm index df16c5864fa..17c9a687d01 100644 --- a/code/modules/modular_computers/hardware/battery_module.dm +++ b/code/modules/modular_computers/hardware/battery_module.dm @@ -1,6 +1,6 @@ // This device is wrapper for actual power cell. I have decided to not use power cells directly as even low-end cells available on station // have tremendeous capacity in comparsion. Higher tier cells would provide your device with nearly infinite battery life, which is something i want to avoid. -/obj/item/weapon/computer_hardware/battery_module +/obj/item/computer_hardware/battery_module name = "standard battery" desc = "A standard power cell, commonly seen in high-end portable microcomputers or low-end laptops. It's rating is 750." icon_state = "battery_normal" @@ -8,9 +8,9 @@ malfunction_probability = 1 origin_tech = list(TECH_POWER = 1, TECH_ENGINEERING = 1) var/battery_rating = 750 - var/obj/item/weapon/cell/battery = null + var/obj/item/cell/battery = null -/obj/item/weapon/computer_hardware/battery_module/advanced +/obj/item/computer_hardware/battery_module/advanced name = "advanced battery" desc = "An advanced power cell, often used in most laptops. It is too large to be fitted into smaller devices. It's rating is 1100." icon_state = "battery_advanced" @@ -18,7 +18,7 @@ hardware_size = 2 battery_rating = 1100 -/obj/item/weapon/computer_hardware/battery_module/super +/obj/item/computer_hardware/battery_module/super name = "super battery" desc = "A very advanced power cell, often used in high-end devices, or as uninterruptable power supply for important consoles or servers. It's rating is 1500." icon_state = "battery_super" @@ -26,7 +26,7 @@ hardware_size = 2 battery_rating = 1500 -/obj/item/weapon/computer_hardware/battery_module/ultra +/obj/item/computer_hardware/battery_module/ultra name = "ultra battery" desc = "A very advanced large power cell. It's often used as uninterruptable power supply for critical consoles or servers. It's rating is 2000." icon_state = "battery_ultra" @@ -34,14 +34,14 @@ hardware_size = 3 battery_rating = 2000 -/obj/item/weapon/computer_hardware/battery_module/micro +/obj/item/computer_hardware/battery_module/micro name = "micro battery" desc = "A small power cell, commonly seen in most portable microcomputers. It's rating is 500." icon_state = "battery_micro" origin_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 2) battery_rating = 500 -/obj/item/weapon/computer_hardware/battery_module/nano +/obj/item/computer_hardware/battery_module/nano name = "nano battery" desc = "A tiny power cell, commonly seen in low-end portable microcomputers. It's rating is 300." icon_state = "battery_nano" @@ -49,34 +49,34 @@ battery_rating = 300 // This is not intended to be obtainable in-game. Intended for adminbus and debugging purposes. -/obj/item/weapon/computer_hardware/battery_module/lambda +/obj/item/computer_hardware/battery_module/lambda name = "lambda coil" desc = "A very complex power source compatible with various computers. It is capable of providing power for nearly unlimited duration." icon_state = "battery_lambda" hardware_size = 1 battery_rating = 30000 -/obj/item/weapon/computer_hardware/battery_module/lambda/New() +/obj/item/computer_hardware/battery_module/lambda/New() ..() - battery = new/obj/item/weapon/cell/infinite(src) + battery = new/obj/item/cell/infinite(src) -/obj/item/weapon/computer_hardware/battery_module/diagnostics(var/mob/user) +/obj/item/computer_hardware/battery_module/diagnostics(var/mob/user) ..() to_chat(user, "Internal battery charge: [battery.charge]/[battery.maxcharge] CU") -/obj/item/weapon/computer_hardware/battery_module/New() - battery = new/obj/item/weapon/cell(src) +/obj/item/computer_hardware/battery_module/New() + battery = new/obj/item/cell(src) battery.maxcharge = battery_rating battery.charge = 0 ..() -/obj/item/weapon/computer_hardware/battery_module/Destroy() +/obj/item/computer_hardware/battery_module/Destroy() qdel_null(battery) return ..() -/obj/item/weapon/computer_hardware/battery_module/proc/charge_to_full() +/obj/item/computer_hardware/battery_module/proc/charge_to_full() if(battery) battery.charge = battery.maxcharge -/obj/item/weapon/computer_hardware/battery_module/get_cell() +/obj/item/computer_hardware/battery_module/get_cell() return battery \ No newline at end of file diff --git a/code/modules/modular_computers/hardware/card_slot.dm b/code/modules/modular_computers/hardware/card_slot.dm index 4cf8afc705f..219ce0c7ea4 100644 --- a/code/modules/modular_computers/hardware/card_slot.dm +++ b/code/modules/modular_computers/hardware/card_slot.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/computer_hardware/card_slot +/obj/item/computer_hardware/card_slot name = "RFID card slot" desc = "Slot that allows this computer to write data on RFID cards. Necessary for some programs to run properly." power_usage = 10 //W @@ -7,9 +7,9 @@ hardware_size = 1 origin_tech = list(TECH_DATA = 2) - var/obj/item/weapon/card/id/stored_card = null + var/obj/item/card/id/stored_card = null -/obj/item/weapon/computer_hardware/card_slot/Destroy() +/obj/item/computer_hardware/card_slot/Destroy() if(holder2 && (holder2.card_slot == src)) holder2.card_slot = null if(stored_card) diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm index 09ccde9e499..e78bf0eafa8 100644 --- a/code/modules/modular_computers/hardware/hard_drive.dm +++ b/code/modules/modular_computers/hardware/hard_drive.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/computer_hardware/hard_drive/ +/obj/item/computer_hardware/hard_drive/ name = "basic hard drive" desc = "A small power efficient solid state drive, with 128GQ of storage capacity for use in basic computers where power efficiency is desired." power_usage = 25 // SSD or something with low power usage @@ -13,7 +13,7 @@ /// Whether drive is protected against changes var/read_only = FALSE -/obj/item/weapon/computer_hardware/hard_drive/advanced +/obj/item/computer_hardware/hard_drive/advanced name = "advanced hard drive" desc = "A small hybrid hard drive with 256GQ of storage capacity for use in higher grade computers where balance between power efficiency and capacity is desired." max_capacity = 256 @@ -22,7 +22,7 @@ icon_state = "hdd_advanced" hardware_size = 2 -/obj/item/weapon/computer_hardware/hard_drive/super +/obj/item/computer_hardware/hard_drive/super name = "super hard drive" desc = "A small hard drive with 512GQ of storage capacity for use in cluster storage solutions where capacity is more important than power efficiency." max_capacity = 512 @@ -31,7 +31,7 @@ icon_state = "hdd_super" hardware_size = 2 -/obj/item/weapon/computer_hardware/hard_drive/cluster +/obj/item/computer_hardware/hard_drive/cluster name = "cluster hard drive" desc = "A large storage cluster consisting of multiple hard drives for usage in high capacity storage systems. Has capacity of 2048 GQ." power_usage = 500 @@ -41,7 +41,7 @@ hardware_size = 3 // For tablets, etc. - highly power efficient. -/obj/item/weapon/computer_hardware/hard_drive/small +/obj/item/computer_hardware/hard_drive/small name = "small hard drive" desc = "A small highly efficient solid state drive for portable devices." power_usage = 10 @@ -50,7 +50,7 @@ icon_state = "hdd_small" hardware_size = 1 -/obj/item/weapon/computer_hardware/hard_drive/micro +/obj/item/computer_hardware/hard_drive/micro name = "micro hard drive" desc = "A small micro hard drive for portable devices." power_usage = 2 @@ -59,7 +59,7 @@ icon_state = "hdd_micro" hardware_size = 1 -/obj/item/weapon/computer_hardware/hard_drive/diagnostics(var/mob/user) +/obj/item/computer_hardware/hard_drive/diagnostics(var/mob/user) ..() // 999 is a byond limit that is in place. It's unlikely someone will reach that many files anyway, since you would sooner run out of space. to_chat(user, "NT-NFS File Table Status: [stored_files.len]/999") @@ -67,7 +67,7 @@ to_chat(user, "Read-only mode: [(read_only ? "ON" : "OFF")]") // Use this proc to add file to the drive. Returns 1 on success and 0 on failure. Contains necessary sanity checks. -/obj/item/weapon/computer_hardware/hard_drive/proc/store_file(var/datum/computer_file/F) +/obj/item/computer_hardware/hard_drive/proc/store_file(var/datum/computer_file/F) if(!F || !istype(F)) return 0 @@ -90,14 +90,14 @@ return 1 // Use this proc to add file to the drive. Returns 1 on success and 0 on failure. Contains necessary sanity checks. -/obj/item/weapon/computer_hardware/hard_drive/proc/install_default_programs() +/obj/item/computer_hardware/hard_drive/proc/install_default_programs() store_file(new/datum/computer_file/program/computerconfig(src)) // Computer configuration utility, allows hardware control and displays more info than status bar store_file(new/datum/computer_file/program/ntnetdownload(src)) // NTNet Downloader Utility, allows users to download more software from NTNet repository store_file(new/datum/computer_file/program/filemanager(src)) // File manager, allows text editor functions and basic file manipulation. // Use this proc to remove file from the drive. Returns 1 on success and 0 on failure. Contains necessary sanity checks. -/obj/item/weapon/computer_hardware/hard_drive/proc/remove_file(var/datum/computer_file/F) +/obj/item/computer_hardware/hard_drive/proc/remove_file(var/datum/computer_file/F) if(!F || !istype(F)) return 0 @@ -115,7 +115,7 @@ return 0 // Loops through all stored files and recalculates used_capacity of this drive -/obj/item/weapon/computer_hardware/hard_drive/proc/recalculate_size() +/obj/item/computer_hardware/hard_drive/proc/recalculate_size() var/total_size = 0 for(var/datum/computer_file/F in stored_files) total_size += F.size @@ -123,7 +123,7 @@ used_capacity = total_size // Checks whether file can be stored on the hard drive. -/obj/item/weapon/computer_hardware/hard_drive/proc/can_store_file(var/size = 1) +/obj/item/computer_hardware/hard_drive/proc/can_store_file(var/size = 1) // In the unlikely event someone manages to create that many files. // BYOND is acting weird with numbers above 999 in loops (infinite loop prevention) if(stored_files.len >= 999) @@ -134,7 +134,7 @@ return 1 // Checks whether we can store the file. We can only store unique files, so this checks whether we wouldn't get a duplicity by adding a file. -/obj/item/weapon/computer_hardware/hard_drive/proc/try_store_file(var/datum/computer_file/F) +/obj/item/computer_hardware/hard_drive/proc/try_store_file(var/datum/computer_file/F) if(!F || !istype(F)) return 0 var/name = F.filename + "." + F.filetype @@ -146,7 +146,7 @@ // Tries to find the file by filename. Returns null on failure -/obj/item/weapon/computer_hardware/hard_drive/proc/find_file_by_name(var/filename) +/obj/item/computer_hardware/hard_drive/proc/find_file_by_name(var/filename) if(!check_functionality()) return null @@ -162,7 +162,7 @@ return null // Tries to find the file by unique ID. Returns null on failure -/obj/item/weapon/computer_hardware/hard_drive/proc/find_file_by_uid(var/uid) +/obj/item/computer_hardware/hard_drive/proc/find_file_by_uid(var/uid) if(!check_functionality()) return null @@ -176,12 +176,12 @@ if(F.uid == uid) return F -/obj/item/weapon/computer_hardware/hard_drive/Destroy() +/obj/item/computer_hardware/hard_drive/Destroy() if(holder2 && (holder2.hard_drive == src)) holder2.hard_drive = null stored_files = null return ..() -/obj/item/weapon/computer_hardware/hard_drive/New() +/obj/item/computer_hardware/hard_drive/New() install_default_programs() ..() diff --git a/code/modules/modular_computers/hardware/nano_printer.dm b/code/modules/modular_computers/hardware/nano_printer.dm index 665b855f4fd..bdd45f08f4e 100644 --- a/code/modules/modular_computers/hardware/nano_printer.dm +++ b/code/modules/modular_computers/hardware/nano_printer.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/computer_hardware/nano_printer +/obj/item/computer_hardware/nano_printer name = "nano printer" desc = "Small integrated printer with paper recycling module." power_usage = 50 @@ -9,11 +9,11 @@ var/stored_paper = 5 var/max_paper = 10 -/obj/item/weapon/computer_hardware/nano_printer/diagnostics(var/mob/user) +/obj/item/computer_hardware/nano_printer/diagnostics(var/mob/user) ..() to_chat(user, "Paper buffer level: [stored_paper]/[max_paper]") -/obj/item/weapon/computer_hardware/nano_printer/proc/print_text(var/text_to_print, var/paper_title = null) +/obj/item/computer_hardware/nano_printer/proc/print_text(var/text_to_print, var/paper_title = null) if(!stored_paper) return 0 if(!enabled) @@ -21,7 +21,7 @@ if(!check_functionality()) return 0 - var/obj/item/weapon/paper/P = new/obj/item/weapon/paper(get_turf(holder2)) + var/obj/item/paper/P = new/obj/item/paper(get_turf(holder2)) // Damaged printer causes the resulting paper to be somewhat harder to read. if(damage > damage_malfunction) @@ -37,8 +37,8 @@ stored_paper-- return 1 -/obj/item/weapon/computer_hardware/nano_printer/proc/count_fields(var/info) -//Count the fields. This is taken directly from paper.dm, /obj/item/weapon/paper/proc/parsepencode(). -Hawk_v3 +/obj/item/computer_hardware/nano_printer/proc/count_fields(var/info) +//Count the fields. This is taken directly from paper.dm, /obj/item/paper/proc/parsepencode(). -Hawk_v3 var/fields = 0 var/t = info var/laststart = 1 @@ -50,8 +50,8 @@ fields++ return fields -/obj/item/weapon/computer_hardware/nano_printer/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/paper)) +/obj/item/computer_hardware/nano_printer/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/paper)) if(stored_paper >= max_paper) to_chat(user, "You try to add \the [W] into \the [src], but its paper bin is full.") return @@ -59,14 +59,14 @@ to_chat(user, "You insert \the [W] into [src].") qdel(W) stored_paper++ - else if(istype(W, /obj/item/weapon/paper_bundle)) - var/obj/item/weapon/paper_bundle/B = W + else if(istype(W, /obj/item/paper_bundle)) + var/obj/item/paper_bundle/B = W var/num_of_pages_added = 0 if(stored_paper >= max_paper) to_chat(user, "You try to add \the [W] into \the [src], but its paper bin is full.") return - for(var/obj/item/weapon/bundleitem in B) //loop through items in bundle - if(istype(bundleitem, /obj/item/weapon/paper)) //if item is paper (and not photo), add into the bin + for(var/obj/item/bundleitem in B) //loop through items in bundle + if(istype(bundleitem, /obj/item/paper)) //if item is paper (and not photo), add into the bin B.pages.Remove(bundleitem) qdel(bundleitem) num_of_pages_added++ @@ -85,7 +85,7 @@ to_chat(user, "You add [num_of_pages_added] papers from \the [W] into \the [src].") return -/obj/item/weapon/computer_hardware/nano_printer/Destroy() +/obj/item/computer_hardware/nano_printer/Destroy() if(holder2 && (holder2.nano_printer == src)) holder2.nano_printer = null holder2 = null diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm index b3b37ab54f1..6cb5fc0dd3c 100644 --- a/code/modules/modular_computers/hardware/network_card.dm +++ b/code/modules/modular_computers/hardware/network_card.dm @@ -1,6 +1,6 @@ var/global/ntnet_card_uid = 1 -/obj/item/weapon/computer_hardware/network_card/ +/obj/item/computer_hardware/network_card/ name = "basic NTNet network card" desc = "A basic network card for usage with standard NTNet frequencies." power_usage = 50 @@ -22,7 +22,7 @@ var/global/ntnet_card_uid = 1 /// If set, uses the value to funnel connections through another network card. var/proxy_id -/obj/item/weapon/computer_hardware/network_card/diagnostics(var/mob/user) +/obj/item/computer_hardware/network_card/diagnostics(var/mob/user) ..() to_chat(user, "NIX Unique ID: [identification_id]") to_chat(user, "NIX User Tag: [identification_string]") @@ -33,12 +33,12 @@ var/global/ntnet_card_uid = 1 if(ethernet) to_chat(user, "OpenEth (Physical Connection) - Physical network connection port") -/obj/item/weapon/computer_hardware/network_card/New(var/l) +/obj/item/computer_hardware/network_card/New(var/l) ..(l) identification_id = ntnet_card_uid ntnet_card_uid++ -/obj/item/weapon/computer_hardware/network_card/advanced +/obj/item/computer_hardware/network_card/advanced name = "advanced NTNet network card" desc = "An advanced network card for usage with standard NTNet frequencies. It's transmitter is strong enough to connect even when far away." long_range = 1 @@ -47,7 +47,7 @@ var/global/ntnet_card_uid = 1 icon_state = "netcard_advanced" hardware_size = 1 -/obj/item/weapon/computer_hardware/network_card/quantum +/obj/item/computer_hardware/network_card/quantum name = "quantum NTNet network card" desc = "A network card that can connect to NTnet from anywhere, using quantum entanglement." long_range = 1 @@ -56,7 +56,7 @@ var/global/ntnet_card_uid = 1 icon_state = "netcard_advanced" hardware_size = 1 -/obj/item/weapon/computer_hardware/network_card/quantum/get_signal(var/specific_action = 0) +/obj/item/computer_hardware/network_card/quantum/get_signal(var/specific_action = 0) if(!holder2) return 0 @@ -68,7 +68,7 @@ var/global/ntnet_card_uid = 1 return 2 -/obj/item/weapon/computer_hardware/network_card/wired +/obj/item/computer_hardware/network_card/wired name = "wired NTNet network card" desc = "An advanced network card for usage with standard NTNet frequencies. This one also supports wired connection." ethernet = 1 @@ -77,21 +77,21 @@ var/global/ntnet_card_uid = 1 icon_state = "netcard_ethernet" hardware_size = 3 -/obj/item/weapon/computer_hardware/network_card/Destroy() +/obj/item/computer_hardware/network_card/Destroy() if(holder2 && (holder2.network_card == src)) holder2.network_card = null holder2 = null return ..() // Returns a string identifier of this network card -/obj/item/weapon/computer_hardware/network_card/proc/get_network_tag() +/obj/item/computer_hardware/network_card/proc/get_network_tag() return "[identification_string] (NID [identification_id])" -/obj/item/weapon/computer_hardware/network_card/proc/is_banned() +/obj/item/computer_hardware/network_card/proc/is_banned() return ntnet_global.check_banned(identification_id) // 0 - No signal, 1 - Low signal, 2 - High signal. 3 - Wired Connection -/obj/item/weapon/computer_hardware/network_card/proc/get_signal(var/specific_action = 0) +/obj/item/computer_hardware/network_card/proc/get_signal(var/specific_action = 0) if(!holder2) // Hardware is not installed in anything. No signal. How did this even get called? return 0 @@ -133,7 +133,7 @@ var/global/ntnet_card_uid = 1 return best return 0 // No computer! -/obj/item/weapon/computer_hardware/network_card/Destroy() +/obj/item/computer_hardware/network_card/Destroy() if(holder2 && (holder2.network_card == src)) holder2.network_card = null return ..() diff --git a/code/modules/modular_computers/hardware/portable_hard_drive.dm b/code/modules/modular_computers/hardware/portable_hard_drive.dm index 817fca789e4..10302950c50 100644 --- a/code/modules/modular_computers/hardware/portable_hard_drive.dm +++ b/code/modules/modular_computers/hardware/portable_hard_drive.dm @@ -1,5 +1,5 @@ // These are basically USB data sticks and may be used to transfer files between devices -/obj/item/weapon/computer_hardware/hard_drive/portable +/obj/item/computer_hardware/hard_drive/portable name = "basic data crystal" desc = "Small crystal with imprinted photonic circuits that can be used to store data. Its capacity is 16 GQ." power_usage = 10 @@ -8,7 +8,7 @@ max_capacity = 16 origin_tech = list(TECH_DATA = 1) -/obj/item/weapon/computer_hardware/hard_drive/portable/advanced +/obj/item/computer_hardware/hard_drive/portable/advanced name = "advanced data crystal" desc = "Small crystal with imprinted high-density photonic circuits that can be used to store data. Its capacity is 64 GQ." power_usage = 20 @@ -17,7 +17,7 @@ max_capacity = 64 origin_tech = list(TECH_DATA = 2) -/obj/item/weapon/computer_hardware/hard_drive/portable/super +/obj/item/computer_hardware/hard_drive/portable/super name = "super data crystal" desc = "Small crystal with imprinted ultra-density photonic circuits that can be used to store data. Its capacity is 256 GQ." power_usage = 40 @@ -26,12 +26,12 @@ max_capacity = 256 origin_tech = list(TECH_DATA = 4) -/obj/item/weapon/computer_hardware/hard_drive/portable/New() +/obj/item/computer_hardware/hard_drive/portable/New() ..() stored_files = list() recalculate_size() -/obj/item/weapon/computer_hardware/hard_drive/portable/Destroy() +/obj/item/computer_hardware/hard_drive/portable/Destroy() if(holder2 && (holder2.portable_drive == src)) holder2.portable_drive = null return ..() \ No newline at end of file diff --git a/code/modules/modular_computers/hardware/processor_unit.dm b/code/modules/modular_computers/hardware/processor_unit.dm index 9ed7ab40ac7..49e0c27c5f2 100644 --- a/code/modules/modular_computers/hardware/processor_unit.dm +++ b/code/modules/modular_computers/hardware/processor_unit.dm @@ -1,7 +1,7 @@ // CPU that allows the computer to run programs. // Better CPUs are obtainable via research and can run more programs on background. -/obj/item/weapon/computer_hardware/processor_unit +/obj/item/computer_hardware/processor_unit name = "standard processor" desc = "A standard CPU used in most computers. It can run up to three programs simultaneously." icon_state = "cpu_normal" @@ -13,7 +13,7 @@ var/max_idle_programs = 2 // 2 idle, + 1 active = 3 as said in description. -/obj/item/weapon/computer_hardware/processor_unit/small +/obj/item/computer_hardware/processor_unit/small name = "standard microprocessor" desc = "A standard miniaturised CPU used in portable devices. It can run up to two programs simultaneously." icon_state = "cpu_small" @@ -22,7 +22,7 @@ max_idle_programs = 1 origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) -/obj/item/weapon/computer_hardware/processor_unit/photonic +/obj/item/computer_hardware/processor_unit/photonic name = "photonic processor" desc = "An advanced experimental CPU that uses photonic core instead of regular circuitry. It can run up to five programs simultaneously, but uses a lot of power." icon_state = "cpu_normal_photonic" @@ -31,7 +31,7 @@ max_idle_programs = 4 origin_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 4) -/obj/item/weapon/computer_hardware/processor_unit/photonic/small +/obj/item/computer_hardware/processor_unit/photonic/small name = "photonic microprocessor" desc = "An advanced miniaturised CPU for use in portable devices. It uses photonic core instead of regular circuitry. It can run up to three programs simultaneously." icon_state = "cpu_small_photonic" @@ -40,7 +40,7 @@ max_idle_programs = 2 origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3) -/obj/item/weapon/computer_hardware/processor_unit/Destroy() +/obj/item/computer_hardware/processor_unit/Destroy() if(holder2 && (holder2.processor_unit == src)) holder2.processor_unit = null return ..() \ No newline at end of file diff --git a/code/modules/modular_computers/hardware/tesla_link.dm b/code/modules/modular_computers/hardware/tesla_link.dm index b23bb963afa..c7ac4cb3b9f 100644 --- a/code/modules/modular_computers/hardware/tesla_link.dm +++ b/code/modules/modular_computers/hardware/tesla_link.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/computer_hardware/tesla_link +/obj/item/computer_hardware/tesla_link name = "tesla link" desc = "An advanced tesla link that wirelessly recharges connected device from nearby area power controller." critical = 0 @@ -8,7 +8,7 @@ origin_tech = list(TECH_DATA = 2, TECH_POWER = 3, TECH_ENGINEERING = 2) var/passive_charging_rate = 250 // W -/obj/item/weapon/computer_hardware/tesla_link/Destroy() +/obj/item/computer_hardware/tesla_link/Destroy() if(holder2 && (holder2.tesla_link == src)) holder2.tesla_link = null return ..() \ No newline at end of file diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index 0242ad2a1f1..37d3e4d1b8f 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -55,108 +55,108 @@ switch(dev_cpu) if(1) if(fabricate) - fabricated_laptop.processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(fabricated_laptop) + fabricated_laptop.processor_unit = new/obj/item/computer_hardware/processor_unit/small(fabricated_laptop) if(2) if(fabricate) - fabricated_laptop.processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(fabricated_laptop) + fabricated_laptop.processor_unit = new/obj/item/computer_hardware/processor_unit(fabricated_laptop) total_price += 299 switch(dev_battery) if(1) // Basic(750C) if(fabricate) - fabricated_laptop.battery_module = new/obj/item/weapon/computer_hardware/battery_module(fabricated_laptop) + fabricated_laptop.battery_module = new/obj/item/computer_hardware/battery_module(fabricated_laptop) if(2) // Upgraded(1100C) if(fabricate) - fabricated_laptop.battery_module = new/obj/item/weapon/computer_hardware/battery_module/advanced(fabricated_laptop) + fabricated_laptop.battery_module = new/obj/item/computer_hardware/battery_module/advanced(fabricated_laptop) total_price += 199 if(3) // Advanced(1500C) if(fabricate) - fabricated_laptop.battery_module = new/obj/item/weapon/computer_hardware/battery_module/super(fabricated_laptop) + fabricated_laptop.battery_module = new/obj/item/computer_hardware/battery_module/super(fabricated_laptop) total_price += 499 switch(dev_disk) if(1) // Basic(128GQ) if(fabricate) - fabricated_laptop.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive(fabricated_laptop) + fabricated_laptop.hard_drive = new/obj/item/computer_hardware/hard_drive(fabricated_laptop) if(2) // Upgraded(256GQ) if(fabricate) - fabricated_laptop.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/advanced(fabricated_laptop) + fabricated_laptop.hard_drive = new/obj/item/computer_hardware/hard_drive/advanced(fabricated_laptop) total_price += 99 if(3) // Advanced(512GQ) if(fabricate) - fabricated_laptop.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/super(fabricated_laptop) + fabricated_laptop.hard_drive = new/obj/item/computer_hardware/hard_drive/super(fabricated_laptop) total_price += 299 switch(dev_netcard) if(1) // Basic(Short-Range) if(fabricate) - fabricated_laptop.network_card = new/obj/item/weapon/computer_hardware/network_card(fabricated_laptop) + fabricated_laptop.network_card = new/obj/item/computer_hardware/network_card(fabricated_laptop) total_price += 99 if(2) // Advanced (Long Range) if(fabricate) - fabricated_laptop.network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(fabricated_laptop) + fabricated_laptop.network_card = new/obj/item/computer_hardware/network_card/advanced(fabricated_laptop) total_price += 299 if(dev_tesla) total_price += 399 if(fabricate) - fabricated_laptop.tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(fabricated_laptop) + fabricated_laptop.tesla_link = new/obj/item/computer_hardware/tesla_link(fabricated_laptop) if(dev_nanoprint) total_price += 99 if(fabricate) - fabricated_laptop.nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(fabricated_laptop) + fabricated_laptop.nano_printer = new/obj/item/computer_hardware/nano_printer(fabricated_laptop) if(dev_card) total_price += 199 if(fabricate) - fabricated_laptop.card_slot = new/obj/item/weapon/computer_hardware/card_slot(fabricated_laptop) + fabricated_laptop.card_slot = new/obj/item/computer_hardware/card_slot(fabricated_laptop) return total_price else if(devtype == 2) // Tablet, more expensive, not everyone could probably afford this. if(fabricate) fabricated_tablet = new(src) - fabricated_tablet.processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(fabricated_tablet) + fabricated_tablet.processor_unit = new/obj/item/computer_hardware/processor_unit/small(fabricated_tablet) total_price = 199 switch(dev_battery) if(1) // Basic(300C) if(fabricate) - fabricated_tablet.battery_module = new/obj/item/weapon/computer_hardware/battery_module/nano(fabricated_tablet) + fabricated_tablet.battery_module = new/obj/item/computer_hardware/battery_module/nano(fabricated_tablet) if(2) // Upgraded(500C) if(fabricate) - fabricated_tablet.battery_module = new/obj/item/weapon/computer_hardware/battery_module/micro(fabricated_tablet) + fabricated_tablet.battery_module = new/obj/item/computer_hardware/battery_module/micro(fabricated_tablet) total_price += 199 if(3) // Advanced(750C) if(fabricate) - fabricated_tablet.battery_module = new/obj/item/weapon/computer_hardware/battery_module(fabricated_tablet) + fabricated_tablet.battery_module = new/obj/item/computer_hardware/battery_module(fabricated_tablet) total_price += 499 switch(dev_disk) if(1) // Basic(32GQ) if(fabricate) - fabricated_tablet.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/micro(fabricated_tablet) + fabricated_tablet.hard_drive = new/obj/item/computer_hardware/hard_drive/micro(fabricated_tablet) if(2) // Upgraded(64GQ) if(fabricate) - fabricated_tablet.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(fabricated_tablet) + fabricated_tablet.hard_drive = new/obj/item/computer_hardware/hard_drive/small(fabricated_tablet) total_price += 99 if(3) // Advanced(128GQ) if(fabricate) - fabricated_tablet.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive(fabricated_tablet) + fabricated_tablet.hard_drive = new/obj/item/computer_hardware/hard_drive(fabricated_tablet) total_price += 299 switch(dev_netcard) if(1) // Basic(Short-Range) if(fabricate) - fabricated_tablet.network_card = new/obj/item/weapon/computer_hardware/network_card(fabricated_tablet) + fabricated_tablet.network_card = new/obj/item/computer_hardware/network_card(fabricated_tablet) total_price += 99 if(2) // Advanced (Long Range) if(fabricate) - fabricated_tablet.network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(fabricated_tablet) + fabricated_tablet.network_card = new/obj/item/computer_hardware/network_card/advanced(fabricated_tablet) total_price += 299 if(dev_nanoprint) total_price += 99 if(fabricate) - fabricated_tablet.nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(fabricated_tablet) + fabricated_tablet.nano_printer = new/obj/item/computer_hardware/nano_printer(fabricated_tablet) if(dev_card) total_price += 199 if(fabricate) - fabricated_tablet.card_slot = new/obj/item/weapon/computer_hardware/card_slot(fabricated_tablet) + fabricated_tablet.card_slot = new/obj/item/computer_hardware/card_slot(fabricated_tablet) if(dev_tesla) total_price += 399 if(fabricate) - fabricated_tablet.tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(fabricated_tablet) + fabricated_tablet.tesla_link = new/obj/item/computer_hardware/tesla_link(fabricated_tablet) return total_price return 0 @@ -246,8 +246,8 @@ return data -/obj/machinery/lapvend/attackby(obj/item/weapon/W as obj, mob/user as mob) - var/obj/item/weapon/card/id/I = W.GetID() +/obj/machinery/lapvend/attackby(obj/item/W as obj, mob/user as mob) + var/obj/item/card/id/I = W.GetID() // Awaiting payment state if(state == 2) if(process_payment(I,W)) @@ -274,7 +274,7 @@ return ..() // Simplified payment processing, returns 1 on success. -/obj/machinery/lapvend/proc/process_payment(var/obj/item/weapon/card/id/I, var/obj/item/ID_container) +/obj/machinery/lapvend/proc/process_payment(var/obj/item/card/id/I, var/obj/item/ID_container) if(I==ID_container || ID_container == null) visible_message("\The [usr] swipes \the [I] through \the [src].") else diff --git a/code/modules/multiz/ladder_assembly_vr.dm b/code/modules/multiz/ladder_assembly_vr.dm index 377a9562273..41aaba5f267 100644 --- a/code/modules/multiz/ladder_assembly_vr.dm +++ b/code/modules/multiz/ladder_assembly_vr.dm @@ -15,7 +15,7 @@ var/created_name = null /obj/structure/ladder_assembly/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/weapon/pen)) + if(istype(W, /obj/item/pen)) var/t = sanitizeSafe(tgui_input_text(user, "Enter the name for the ladder.", "Ladder Name", src.created_name, MAX_NAME_LEN), MAX_NAME_LEN) if(in_range(src, user)) created_name = t @@ -45,7 +45,7 @@ return if(W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() switch(state) if(CONSTRUCTION_UNANCHORED) to_chat(user, "The refinforcing bolts need to be secured.") diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 57aea8ac8dd..e73626b2718 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -143,7 +143,7 @@ var/mob/living/L = src if(L.pulling && !L.pulling.anchored) pulling |= L.pulling - for(var/obj/item/weapon/grab/G in list(L.l_hand, L.r_hand)) + for(var/obj/item/grab/G in list(L.l_hand, L.r_hand)) pulling |= G.affecting if(direction == UP) src.audible_message("[src] moves up.") diff --git a/code/modules/multiz/movement_vr.dm b/code/modules/multiz/movement_vr.dm index 9aaf3f89a69..999bfdaedfa 100644 --- a/code/modules/multiz/movement_vr.dm +++ b/code/modules/multiz/movement_vr.dm @@ -153,7 +153,7 @@ //Catslugs are a snowflake case because of references. if(istype(L, /mob/living/simple_mob/vore/alienanimals/catslug)) var/obj/O = L.get_active_hand() - if(istype(O, /obj/item/weapon/material/twohanded/spear)) + if(istype(O, /obj/item/material/twohanded/spear)) var/choice = tgui_alert(L, "Use your spear to climb faster? This will drop and break it!", "Scug Tactics", list("Yes!", "No")) if(choice == "Yes!") drop_our_held = TRUE diff --git a/code/modules/multiz/portals_vr.dm b/code/modules/multiz/portals_vr.dm index a7a4c9c75bd..a6bbb7c043d 100644 --- a/code/modules/multiz/portals_vr.dm +++ b/code/modules/multiz/portals_vr.dm @@ -202,13 +202,13 @@ var/list/mob_contents = list() //Things which are actually drained as a result of the above not being null. mob_contents |= L // The recursive check below does not add the object being checked to its list. mob_contents |= recursive_content_check(L, mob_contents, recursion_limit = 3, client_check = 0, sight_check = 0, include_mobs = 1, include_objects = 1, ignore_show_messages = 1) - for(var/obj/item/weapon/holder/I in mob_contents) - var/obj/item/weapon/holder/H = I + for(var/obj/item/holder/I in mob_contents) + var/obj/item/holder/H = I var/mob/living/MI = H.held_mob MI.forceMove(get_turf(H)) if(!issilicon(MI)) //Don't drop borg modules... for(var/obj/item/II in MI) - if(istype(II,/obj/item/weapon/implant) || istype(II,/obj/item/device/nif)) + if(istype(II,/obj/item/implant) || istype(II,/obj/item/nif)) continue MI.drop_from_inventory(II, dest.loc) var/obj/effect/landmark/finaldest = pick(awayabductors) @@ -218,7 +218,7 @@ MI << 'sound/effects/bamf.ogg' to_chat(MI,"You're starting to come to. You feel like you've been out for a few minutes, at least...") for(var/obj/item/I in L) - if(istype(I,/obj/item/weapon/implant) || istype(I,/obj/item/device/nif)) + if(istype(I,/obj/item/implant) || istype(I,/obj/item/nif)) continue L.drop_from_inventory(I, dest.loc) var/obj/effect/landmark/finaldest = pick(awayabductors) diff --git a/code/modules/multiz/stairs.dm b/code/modules/multiz/stairs.dm index cbdbf6f43c8..6c13828d4ad 100644 --- a/code/modules/multiz/stairs.dm +++ b/code/modules/multiz/stairs.dm @@ -171,7 +171,7 @@ // If the object is pulling or grabbing anything, we'll want to move those too. A grab chain may be disrupted in doing so. if(L.pulling && !L.pulling.anchored) pulling |= L.pulling - for(var/obj/item/weapon/grab/G in list(L.l_hand, L.r_hand)) + for(var/obj/item/grab/G in list(L.l_hand, L.r_hand)) pulling |= G.affecting // If the stairs aren't broken, go up. @@ -224,7 +224,7 @@ P.forceMove(get_turf(top)) L.continue_pulling(P) - for(var/obj/item/weapon/grab/G in list(L.l_hand, L.r_hand)) + for(var/obj/item/grab/G in list(L.l_hand, L.r_hand)) G.affecting.forceMove(get_turf(top)) if(L.client) @@ -433,7 +433,7 @@ // If the object is pulling or grabbing anything, we'll want to move those too. A grab chain may be disrupted in doing so. if(L.pulling && !L.pulling.anchored) pulling |= L.pulling - for(var/obj/item/weapon/grab/G in list(L.l_hand, L.r_hand)) + for(var/obj/item/grab/G in list(L.l_hand, L.r_hand)) pulling |= G.affecting // If the stairs aren't broken, go up. @@ -483,7 +483,7 @@ P.forceMove(get_turf(bottom)) L.continue_pulling(P) - for(var/obj/item/weapon/grab/G in list(L.l_hand, L.r_hand)) + for(var/obj/item/grab/G in list(L.l_hand, L.r_hand)) G.affecting.forceMove(get_turf(bottom)) if(L.client) diff --git a/code/modules/news/new_newspaper.dm b/code/modules/news/new_newspaper.dm index d84a2a53c4c..0d55a9992a2 100644 --- a/code/modules/news/new_newspaper.dm +++ b/code/modules/news/new_newspaper.dm @@ -2,7 +2,7 @@ //###################################### NEWSPAPER! ###################################################################### //######################################################################################################################## -/obj/item/weapon/newspaper +/obj/item/newspaper name = "newspaper" desc = "An issue of The Griffon, the newspaper circulating aboard most stations." icon = 'icons/obj/bureaucracy.dmi' @@ -19,7 +19,7 @@ drop_sound = 'sound/items/drop/wrapper.ogg' pickup_sound = 'sound/items/pickup/wrapper.ogg' -obj/item/weapon/newspaper/attack_self(mob/user) +obj/item/newspaper/attack_self(mob/user) if(ishuman(user)) var/mob/living/carbon/human/human_user = user var/dat @@ -98,7 +98,7 @@ obj/item/weapon/newspaper/attack_self(mob/user) else to_chat(user, "The paper is full of intelligible symbols!") -obj/item/weapon/newspaper/Topic(href, href_list) +obj/item/newspaper/Topic(href, href_list) var/mob/living/U = usr ..() if((src in U.contents) || (istype(loc, /turf) && in_range(src, U))) @@ -129,8 +129,8 @@ obj/item/weapon/newspaper/Topic(href, href_list) if(istype(src.loc, /mob)) attack_self(src.loc) -obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user) - if(istype(W, /obj/item/weapon/pen)) +obj/item/newspaper/attackby(obj/item/W as obj, mob/user) + if(istype(W, /obj/item/pen)) if(scribble_page == curr_page) to_chat(user, span_blue("There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?")) else diff --git a/code/modules/news/newspaper.dm b/code/modules/news/newspaper.dm index 394ce7be26f..cd0d0730797 100644 --- a/code/modules/news/newspaper.dm +++ b/code/modules/news/newspaper.dm @@ -2,7 +2,7 @@ //###################################### NEWSPAPER! ###################################################################### //######################################################################################################################## -/obj/item/weapon/newspaper +/obj/item/newspaper name = "newspaper" desc = "An issue of The Griffon, the newspaper circulating aboard most stations." icon = 'icons/obj/bureaucracy.dmi' @@ -19,7 +19,7 @@ drop_sound = 'sound/items/drop/wrapper.ogg' pickup_sound = 'sound/items/pickup/wrapper.ogg' -/obj/item/weapon/newspaper/attack_self(mob/user as mob) +/obj/item/newspaper/attack_self(mob/user as mob) if(ishuman(user)) var/mob/living/carbon/human/human_user = user var/dat @@ -99,7 +99,7 @@ else to_chat(user, "The paper is full of intelligible symbols!") -/obj/item/weapon/newspaper/Topic(href, href_list) +/obj/item/newspaper/Topic(href, href_list) var/mob/living/U = usr ..() if((src in U.contents) || (istype(loc, /turf) && in_range(src, U))) @@ -130,8 +130,8 @@ if(istype(src.loc, /mob)) attack_self(src.loc) -/obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/pen)) +/obj/item/newspaper/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/pen)) if(scribble_page == curr_page) to_chat(user, span_blue("There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?")) else diff --git a/code/modules/nifsoft/nif.dm b/code/modules/nifsoft/nif.dm index fc3884d0753..101215b7bb3 100644 --- a/code/modules/nifsoft/nif.dm +++ b/code/modules/nifsoft/nif.dm @@ -10,10 +10,10 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable */ ////////////////////////////// //Holder on humans to prevent having to 'find' it every time -/mob/living/carbon/human/var/obj/item/device/nif/nif +/mob/living/carbon/human/var/obj/item/nif/nif //Nanotech Implant Foundation -/obj/item/device/nif +/obj/item/nif name = "nanite implant framework" desc = "A somewhat diminished knockoff of a Kitsuhana nano working surface, in a box. Can print new \ implants inside living hosts on the fly based on software uploads. Must be surgically \ @@ -48,7 +48,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable var/tmp/open = FALSE // If it's open for maintenance (1-3) var/tmp/should_be_in = BP_HEAD // Organ we're supposed to be held in - var/obj/item/device/communicator/commlink/comm // The commlink requires this + var/obj/item/communicator/commlink/comm // The commlink requires this var/list/starting_software = list( /datum/nifsoft/commlink, @@ -72,7 +72,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable var/list/planes_visible = list() //Constructor comes with a free AR HUD -/obj/item/device/nif/New(var/newloc,var/wear,var/list/load_data) +/obj/item/nif/New(var/newloc,var/wear,var/list/load_data) ..(newloc) //First one to spawn in the game, make a big icon @@ -106,7 +106,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable update_icon() //Destructor cleans up references -/obj/item/device/nif/Destroy() +/obj/item/nif/Destroy() human = null QDEL_LIST_NULL(nifsofts) QDEL_NULL(comm) @@ -114,7 +114,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable return ..() //Being implanted in some mob -/obj/item/device/nif/proc/implant(var/mob/living/carbon/human/H) +/obj/item/nif/proc/implant(var/mob/living/carbon/human/H) var/obj/item/organ/brain = H.internal_organs_by_name[O_BRAIN] if(istype(brain)) should_be_in = brain.parent_organ @@ -137,7 +137,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable return FALSE //For debug or antag purposes -/obj/item/device/nif/proc/quick_implant(var/mob/living/carbon/human/H) +/obj/item/nif/proc/quick_implant(var/mob/living/carbon/human/H) if(istype(H)) var/obj/item/organ/external/parent //Try to find their brain and put it near that @@ -163,7 +163,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable return FALSE //Being removed from some mob -/obj/item/device/nif/proc/unimplant(var/mob/living/carbon/human/H) +/obj/item/nif/proc/unimplant(var/mob/living/carbon/human/H) var/datum/nifsoft/soulcatcher/SC = imp_check(NIF_SOULCATCHER) if(SC) //Clean up stored people, this is dirty but the easiest way. QDEL_LIST_NULL(SC.brainmobs) @@ -179,7 +179,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable update_icon() //EMP adds wear and disables all nifsoft -/obj/item/device/nif/emp_act(var/severity) +/obj/item/nif/emp_act(var/severity) notify("Danger! Significant electromagnetic interference!",TRUE) for(var/nifsoft in nifsofts) if(nifsoft) @@ -197,7 +197,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable wear(rand(1,8)) //Wear update/check proc -/obj/item/device/nif/proc/wear(var/wear = 0) +/obj/item/nif/proc/wear(var/wear = 0) wear *= (rand(85,115) / 100) //Apparently rand() only takes integers. durability -= wear @@ -214,14 +214,14 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable to_chat(human,"Your NIF vision overlays disappear and your head suddenly seems very quiet...") //Repair update/check proc -/obj/item/device/nif/proc/repair(var/repair = 0) +/obj/item/nif/proc/repair(var/repair = 0) durability = min(durability + repair, initial(durability)) if(human) persist_nif_data(human) //Attackby proc, for maintenance -/obj/item/device/nif/attackby(obj/item/weapon/W, mob/user as mob) +/obj/item/nif/attackby(obj/item/W, mob/user as mob) if(open == 0 && W.has_tool_quality(TOOL_SCREWDRIVER)) if(do_after(user, 4 SECONDS, src) && open == 0) user.visible_message("[user] unscrews and pries open \the [src].","You unscrew and pry open \the [src].") @@ -243,7 +243,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) open = 2 update_icon() - else if(open == 2 && istype(W,/obj/item/device/multitool)) + else if(open == 2 && istype(W,/obj/item/multitool)) if(do_after(user, 8 SECONDS, src) && open == 2) user.visible_message("[user] resets several circuits in \the [src].","You find and repair any faulty circuits in \the [src].") open = 3 @@ -258,7 +258,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable update_icon() //Icon updating -/obj/item/device/nif/update_icon() +/obj/item/nif/update_icon() if(open) icon_state = "nif_open[open]" else @@ -275,7 +275,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable icon_state = "nif_2" //The (dramatic) install process -/obj/item/device/nif/proc/handle_install() +/obj/item/nif/proc/handle_install() if(human.stat || !human.mind) //No stuff while KO or not sleeved return FALSE persist_storable = FALSE //VOREStation edit - I am not sure if polaris has nifs, but just in case. @@ -344,7 +344,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable notify("Calibration complete! User data stored!") //Called each life() tick on the mob -/obj/item/device/nif/proc/life() +/obj/item/nif/proc/life() if(!human || loc != human.get_organ(should_be_in)) unimplant(human) return FALSE @@ -382,7 +382,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable return FALSE //Prints 'AR' messages to the user -/obj/item/device/nif/proc/notify(var/message,var/alert = 0) +/obj/item/nif/proc/notify(var/message,var/alert = 0) if(!human || stat == NIF_TEMPFAIL) return last_notification = message // TGUI Hook @@ -395,7 +395,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable human << good_sound //Called to spend nutrition, returns 1 if it was able to -/obj/item/device/nif/proc/use_charge(var/use_charge) +/obj/item/nif/proc/use_charge(var/use_charge) if(stat != NIF_WORKING) return FALSE //You don't want us to take any? Well okay. @@ -413,7 +413,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable // This operates on a nifsoft *path*, not an instantiation. // It tells the nifsoft shop if it's installation will succeed, to prevent it // from charging the user for incompatible software. -/obj/item/device/nif/proc/can_install(var/datum/nifsoft/path) +/obj/item/nif/proc/can_install(var/datum/nifsoft/path) if(stat == NIF_TEMPFAIL) return FALSE @@ -434,7 +434,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable return TRUE //Install a piece of software -/obj/item/device/nif/proc/install(var/datum/nifsoft/new_soft) +/obj/item/nif/proc/install(var/datum/nifsoft/new_soft) if(stat == NIF_TEMPFAIL) return FALSE if(nifsofts[new_soft.list_pos]) @@ -460,7 +460,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable return TRUE //Uninstall a piece of software -/obj/item/device/nif/proc/uninstall(var/datum/nifsoft/old_soft) +/obj/item/nif/proc/uninstall(var/datum/nifsoft/old_soft) var/datum/nifsoft/NS if(nifsofts) NS = nifsofts[old_soft.list_pos] @@ -484,7 +484,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable return TRUE //Activate a nifsoft -/obj/item/device/nif/proc/activate(var/datum/nifsoft/soft) +/obj/item/nif/proc/activate(var/datum/nifsoft/soft) if(stat != NIF_WORKING) return FALSE if(human) @@ -513,7 +513,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable return TRUE //Deactivate a nifsoft -/obj/item/device/nif/proc/deactivate(var/datum/nifsoft/soft) +/obj/item/nif/proc/deactivate(var/datum/nifsoft/soft) if(human) if(prob(5)) human.visible_message("\The [human] [pick(look_messages)].") human << click_sound @@ -526,14 +526,14 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable return TRUE //Deactivate several nifsofts -/obj/item/device/nif/proc/deactivate_these(var/list/turn_off) +/obj/item/nif/proc/deactivate_these(var/list/turn_off) for(var/N in turn_off) var/datum/nifsoft/NS = nifsofts[N] if(NS) NS.deactivate() //Add a flag to one of the holders -/obj/item/device/nif/proc/set_flag(var/flag,var/hint) +/obj/item/nif/proc/set_flag(var/flag,var/hint) ASSERT(flag != null && hint) switch(hint) @@ -549,7 +549,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable CRASH("Not a valid NIF set_flag hint: [hint]") //Clear a flag from one of the holders -/obj/item/device/nif/proc/clear_flag(var/flag,var/hint) +/obj/item/nif/proc/clear_flag(var/flag,var/hint) ASSERT(flag != null && hint) switch(hint) @@ -565,7 +565,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable CRASH("Not a valid NIF clear_flag hint: [hint]") //Check for an installed implant -/obj/item/device/nif/proc/imp_check(var/soft) +/obj/item/nif/proc/imp_check(var/soft) if(stat != NIF_WORKING) return FALSE ASSERT(soft) @@ -577,7 +577,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable return entry //Check for a set flag -/obj/item/device/nif/proc/flag_check(var/flag,var/hint) +/obj/item/nif/proc/flag_check(var/flag,var/hint) if(stat != NIF_WORKING) return FALSE ASSERT(flag && hint) @@ -597,54 +597,54 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable return result -/obj/item/device/nif/proc/planes_visible() +/obj/item/nif/proc/planes_visible() if(stat != NIF_WORKING) return list() //None! return planes_visible -/obj/item/device/nif/proc/add_plane(var/planeid = null) +/obj/item/nif/proc/add_plane(var/planeid = null) if(!planeid) return planes_visible |= planeid -/obj/item/device/nif/proc/del_plane(var/planeid = null) +/obj/item/nif/proc/del_plane(var/planeid = null) if(!planeid) return planes_visible -= planeid -/obj/item/device/nif/proc/vis_update() +/obj/item/nif/proc/vis_update() if(human) human.recalculate_vis() // Alternate NIFs -/obj/item/device/nif/bad +/obj/item/nif/bad name = "bootleg NIF" desc = "A copy of a copy of a copy of a copy of... this can't be any good, right? Surely?" durability = 10 starting_software = null -/obj/item/device/nif/authentic +/obj/item/nif/authentic name = "\improper Kitsuhana NIF" desc = "An actual Kitsuhana working surface, in a box. From a society slightly less afraid \ of self-replicating nanotechnology. Basically just a high-endurance NIF." durability = 1000 -/obj/item/device/nif/bioadap +/obj/item/nif/bioadap name = "bioadaptive NIF" desc = "A NIF that goes out of it's way to accomidate strange body types. \ Will function in species where it normally wouldn't." durability = 75 bioadap = TRUE -/obj/item/device/nif/protean // Proteans' integrated NIF +/obj/item/nif/protean // Proteans' integrated NIF name = "protean integrated NIF" desc = "A NIF that is part of a protean's body structure. Where did you get that anyway?" durability = 25 bioadap = TRUE gib_nodrop = TRUE -/obj/item/device/nif/glitch +/obj/item/nif/glitch name = "weird NIF" desc = "A NIF of a very dubious origin. It seems to be more durable than normal one... But are you sure about this?" durability = 300 @@ -658,7 +658,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable //////////////////////////////// // Special Promethean """surgery""" -/obj/item/device/nif/attack(mob/living/M, mob/living/user, var/target_zone) +/obj/item/nif/attack(mob/living/M, mob/living/user, var/target_zone) if(!ishuman(M) || !ishuman(user) || (M == user)) return ..() diff --git a/code/modules/nifsoft/nif_tgui.dm b/code/modules/nifsoft/nif_tgui.dm index fecf50fe875..4b57d577398 100644 --- a/code/modules/nifsoft/nif_tgui.dm +++ b/code/modules/nifsoft/nif_tgui.dm @@ -4,7 +4,7 @@ /** * Etc variables on the NIF to keep this self contained */ -/obj/item/device/nif +/obj/item/nif var/static/list/valid_ui_themes = list( "abductor", "cardtable", @@ -84,20 +84,20 @@ set category = "IC" set desc = "Open the NIF user interface." - var/obj/item/device/nif/N = nif + var/obj/item/nif/N = nif if(istype(N)) N.tgui_interact(usr) /** * The NIF State ensures that only our authorized implanted user can touch us. */ -/obj/item/device/nif/tgui_state(mob/user) +/obj/item/nif/tgui_state(mob/user) return GLOB.tgui_nif_main_state /** * Standard TGUI stub to open the NIF.js template. */ -/obj/item/device/nif/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) +/obj/item/nif/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) if(!ishuman(user)) return FALSE ui = SStgui.try_update_ui(user, src, ui) @@ -109,7 +109,7 @@ * tgui_data gives the UI any relevant data it needs. * In our case, that's basically everything from our statpanel. */ -/obj/item/device/nif/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) +/obj/item/nif/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = ..() data["valid_themes"] = valid_ui_themes @@ -150,7 +150,7 @@ /** * tgui_act handles all user input in the UI. */ -/obj/item/device/nif/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) +/obj/item/nif/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) if(..()) return TRUE diff --git a/code/modules/nifsoft/nifsoft.dm b/code/modules/nifsoft/nifsoft.dm index 297e064ae87..66d87616621 100644 --- a/code/modules/nifsoft/nifsoft.dm +++ b/code/modules/nifsoft/nifsoft.dm @@ -6,7 +6,7 @@ var/name = "Prototype" var/desc = "Contact a dev!" - var/obj/item/device/nif/nif //The NIF that the software is stored in + var/obj/item/nif/nif //The NIF that the software is stored in var/list_pos // List position in the nifsoft list @@ -47,7 +47,7 @@ var/list/incompatible_with = null // List of NIFSofts that are disabled when this one is enabled //Constructor accepts the NIF it's being loaded into -/datum/nifsoft/New(var/obj/item/device/nif/nif_load) +/datum/nifsoft/New(var/obj/item/nif/nif_load) ASSERT(nif_load) nif = nif_load @@ -166,7 +166,7 @@ wear = 0 //Packages don't cause wear themselves, the software does //Constructor accepts a NIF and loads all the software -/datum/nifsoft/package/New(var/obj/item/device/nif/nif_load) +/datum/nifsoft/package/New(var/obj/item/nif/nif_load) ASSERT(nif_load) for(var/P in software) @@ -182,7 +182,7 @@ ///////////////// // A NIFSoft Uploader -/obj/item/weapon/disk/nifsoft +/obj/item/disk/nifsoft name = "NIFSoft Uploader" desc = "It has a small label: \n\ \"Portable NIFSoft Installation Media. \n\ @@ -198,7 +198,7 @@ var/datum/nifsoft/stored_organic = null var/datum/nifsoft/stored_synthetic = null -/obj/item/weapon/disk/nifsoft/afterattack(var/A, mob/user, flag, params) +/obj/item/disk/nifsoft/afterattack(var/A, mob/user, flag, params) if(!in_range(user, A)) return @@ -240,12 +240,12 @@ update_icon() //So disks can pass fancier stuff. -/obj/item/weapon/disk/nifsoft/proc/extra_params() +/obj/item/disk/nifsoft/proc/extra_params() return null // Compliance Disk // -/obj/item/weapon/disk/nifsoft/compliance +/obj/item/disk/nifsoft/compliance name = "NIFSoft Uploader (Compliance)" desc = "Wow, adding laws to people? That seems illegal. It probably is. Okay, it really is." icon_state = "compliance" @@ -258,7 +258,7 @@ stored_synthetic = /datum/nifsoft/compliance var/laws -/obj/item/weapon/disk/nifsoft/compliance/afterattack(var/A, mob/user, flag, params) +/obj/item/disk/nifsoft/compliance/afterattack(var/A, mob/user, flag, params) if(!ishuman(A)) return if(!laws) @@ -266,18 +266,18 @@ return ..(A,user,flag,params) -/obj/item/weapon/disk/nifsoft/compliance/attack_self(mob/user) +/obj/item/disk/nifsoft/compliance/attack_self(mob/user) var/newlaws = tgui_input_text(user, "Please Input Laws", "Compliance Laws", laws, multiline = TRUE, prevent_enter = TRUE) newlaws = sanitize(newlaws,2048) if(newlaws) to_chat(user,"You set the laws to:
[newlaws]") laws = newlaws -/obj/item/weapon/disk/nifsoft/compliance/extra_params() +/obj/item/disk/nifsoft/compliance/extra_params() return laws // Security Disk // -/obj/item/weapon/disk/nifsoft/security +/obj/item/disk/nifsoft/security name = "NIFSoft Uploader - Security" desc = "Contains free NIFSofts useful for security members.\n\ It has a small label: \n\ @@ -291,19 +291,19 @@ /datum/nifsoft/package/security software = list(/datum/nifsoft/ar_sec,/datum/nifsoft/flashprot) -/obj/item/weapon/storage/box/nifsofts_security +/obj/item/storage/box/nifsofts_security name = "security nifsoft uploaders" desc = "A box of free nifsofts for security employees." icon = 'icons/obj/boxes.dmi' icon_state = "nifsoft_kit_sec" -/obj/item/weapon/storage/box/nifsofts_security/New() +/obj/item/storage/box/nifsofts_security/New() ..() for(var/i = 0 to 7) - new /obj/item/weapon/disk/nifsoft/security(src) + new /obj/item/disk/nifsoft/security(src) // Engineering Disk // -/obj/item/weapon/disk/nifsoft/engineering +/obj/item/disk/nifsoft/engineering name = "NIFSoft Uploader - Engineering" desc = "Contains free NIFSofts useful for engineering members.\n\ It has a small label: \n\ @@ -317,19 +317,19 @@ /datum/nifsoft/package/engineering software = list(/datum/nifsoft/ar_eng,/datum/nifsoft/alarmmonitor,/datum/nifsoft/uvblocker) -/obj/item/weapon/storage/box/nifsofts_engineering +/obj/item/storage/box/nifsofts_engineering name = "engineering nifsoft uploaders" desc = "A box of free nifsofts for engineering employees." icon = 'icons/obj/boxes.dmi' icon_state = "nifsoft_kit_eng" -/obj/item/weapon/storage/box/nifsofts_engineering/New() +/obj/item/storage/box/nifsofts_engineering/New() ..() for(var/i = 0 to 7) - new /obj/item/weapon/disk/nifsoft/engineering(src) + new /obj/item/disk/nifsoft/engineering(src) // Medical Disk // -/obj/item/weapon/disk/nifsoft/medical +/obj/item/disk/nifsoft/medical name = "NIFSoft Uploader - Medical" desc = "Contains free NIFSofts useful for medical members.\n\ It has a small label: \n\ @@ -342,19 +342,19 @@ /datum/nifsoft/package/medical software = list(/datum/nifsoft/ar_med,/datum/nifsoft/crewmonitor) -/obj/item/weapon/storage/box/nifsofts_medical +/obj/item/storage/box/nifsofts_medical name = "medical nifsoft uploaders" desc = "A box of free nifsofts for medical employees." icon = 'icons/obj/boxes.dmi' icon_state = "nifsoft_kit_med" -/obj/item/weapon/storage/box/nifsofts_medical/New() +/obj/item/storage/box/nifsofts_medical/New() ..() for(var/i = 0 to 7) - new /obj/item/weapon/disk/nifsoft/medical(src) + new /obj/item/disk/nifsoft/medical(src) // Mining Disk // -/obj/item/weapon/disk/nifsoft/mining +/obj/item/disk/nifsoft/mining name = "NIFSoft Uploader - Mining" desc = "Contains free NIFSofts useful for mining members.\n\ It has a small label: \n\ @@ -371,19 +371,19 @@ /datum/nifsoft/package/mining_synth software = list(/datum/nifsoft/material,/datum/nifsoft/pressure,/datum/nifsoft/heatsinks) -/obj/item/weapon/storage/box/nifsofts_mining +/obj/item/storage/box/nifsofts_mining name = "mining nifsoft uploaders" desc = "A box of free nifsofts for mining employees." icon = 'icons/obj/boxes.dmi' icon_state = "nifsoft_kit_mining" -/obj/item/weapon/storage/box/nifsofts_mining/New() +/obj/item/storage/box/nifsofts_mining/New() ..() for(var/i = 0 to 7) - new /obj/item/weapon/disk/nifsoft/mining(src) + new /obj/item/disk/nifsoft/mining(src) // Mass Alteration Disk // -/obj/item/weapon/disk/nifsoft/sizechange +/obj/item/disk/nifsoft/sizechange name = "NIFSoft Uploader - Mass Alteration" desc = "Contains free NIFSofts for special purposes.\n\ It has a small label: \n\ @@ -394,13 +394,13 @@ stored_organic = /datum/nifsoft/sizechange stored_synthetic = /datum/nifsoft/sizechange -/obj/item/weapon/storage/box/nifsofts_sizechange +/obj/item/storage/box/nifsofts_sizechange name = "mass alteration nifsoft uploaders" desc = "A box of free nifsofts for special purposes." icon = 'icons/obj/boxes.dmi' icon_state = "nifsoft_kit_mining" -/obj/item/weapon/storage/box/nifsofts_sizechange/New() +/obj/item/storage/box/nifsofts_sizechange/New() ..() for(var/i = 0 to 7) - new /obj/item/weapon/disk/nifsoft/sizechange(src) \ No newline at end of file + new /obj/item/disk/nifsoft/sizechange(src) \ No newline at end of file diff --git a/code/modules/nifsoft/nifsoft_vr.dm b/code/modules/nifsoft/nifsoft_vr.dm index 0ea055d35a0..66d95474a7f 100644 --- a/code/modules/nifsoft/nifsoft_vr.dm +++ b/code/modules/nifsoft/nifsoft_vr.dm @@ -1,5 +1,5 @@ // Pilot Disk // -/obj/item/weapon/disk/nifsoft/pilot +/obj/item/disk/nifsoft/pilot name = "NIFSoft Uploader - Pilot" desc = "Contains free NIFSofts useful for pilot members.\n\ It has a small label: \n\ @@ -16,13 +16,13 @@ /datum/nifsoft/package/pilot_synth software = list(/datum/nifsoft/pressure,/datum/nifsoft/heatsinks) -/obj/item/weapon/storage/box/nifsofts_pilot +/obj/item/storage/box/nifsofts_pilot name = "pilot nifsoft uploaders" desc = "A box of free nifsofts for pilot employees." icon = 'icons/obj/boxes_vr.dmi' icon_state = "nifsoft_kit_pilot" -/obj/item/weapon/storage/box/nifsofts_pilot/New() +/obj/item/storage/box/nifsofts_pilot/New() ..() for(var/i = 0 to 7) - new /obj/item/weapon/disk/nifsoft/pilot(src) \ No newline at end of file + new /obj/item/disk/nifsoft/pilot(src) \ No newline at end of file diff --git a/code/modules/nifsoft/software/05_health.dm b/code/modules/nifsoft/software/05_health.dm index 3386d185cf4..10bb3b0db7b 100644 --- a/code/modules/nifsoft/software/05_health.dm +++ b/code/modules/nifsoft/software/05_health.dm @@ -46,7 +46,7 @@ mode = 3 if(!isbelly(H.loc)) //Not notified in case of vore, for gameplay purposes. var/turf/T = get_turf(H) - var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/heads/captain(null) + var/obj/item/radio/headset/a = new /obj/item/radio/headset/heads/captain(null) a.autosay("[H.real_name] has been put in emergency stasis, located at ([T.x],[T.y],[T.z])!", "[H.real_name]'s NIF", "Medical") qdel(a) @@ -129,7 +129,7 @@ mode = 3 //this does nothing except stop it from repeating over and over and over and over and over and over and over if(!isbelly(S.loc)) //Not notified in case of vore, for gameplay purposes. var/turf/T = get_turf(S) - var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/heads/captain(null) + var/obj/item/radio/headset/a = new /obj/item/radio/headset/heads/captain(null) a.autosay("[S.real_name] is in a critical condition, located at ([T.x],[T.y],[T.z])!", "[S.real_name]'s NIF", "Medical") qdel(a) diff --git a/code/modules/nifsoft/software/10_combat.dm b/code/modules/nifsoft/software/10_combat.dm index c2ac5ae58d2..9ce840b6121 100644 --- a/code/modules/nifsoft/software/10_combat.dm +++ b/code/modules/nifsoft/software/10_combat.dm @@ -85,7 +85,7 @@ var/global/datum/unarmed_attack/hardclaws/unarmed_hardclaws = new() var/mob/living/carbon/human/H = nif.human H.adjustHalLoss(30) - var/obj/item/weapon/gun/energy/gun/compact/dazzle/dgun = new(get_turf(H)) + var/obj/item/gun/energy/gun/compact/dazzle/dgun = new(get_turf(H)) H.put_in_hands(dgun) nif.notify("Weapon deployed!",TRUE) used = TRUE @@ -93,6 +93,6 @@ var/global/datum/unarmed_attack/hardclaws/unarmed_hardclaws = new() uninstall() //The gun to go with this implant -/obj/item/weapon/gun/energy/gun/compact/dazzle +/obj/item/gun/energy/gun/compact/dazzle name = "Microlaser" desc = "A tiny nanofabricated laser." diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm index a6e91a9efb9..a437748949e 100644 --- a/code/modules/nifsoft/software/13_soulcatcher.dm +++ b/code/modules/nifsoft/software/13_soulcatcher.dm @@ -279,7 +279,7 @@ var/client_missing = 0 //How long the client has been missing universal_understand = TRUE - var/obj/item/device/nif/nif + var/obj/item/nif/nif var/datum/nifsoft/soulcatcher/soulcatcher var/identifying_gender diff --git a/code/modules/nifsoft/software/14_commlink.dm b/code/modules/nifsoft/software/14_commlink.dm index 79cac60fa98..50b682d0589 100644 --- a/code/modules/nifsoft/software/14_commlink.dm +++ b/code/modules/nifsoft/software/14_commlink.dm @@ -14,7 +14,7 @@ nif.comm = new(nif,src) /datum/nifsoft/commlink/uninstall() - var/obj/item/device/nif/lnif = nif //Awkward. Parent clears it in an attempt to clean up. + var/obj/item/nif/lnif = nif //Awkward. Parent clears it in an attempt to clean up. if((. = ..()) && lnif) QDEL_NULL(lnif.comm) @@ -32,44 +32,44 @@ if(href_list["open"]) activate() -/obj/item/device/communicator/commlink +/obj/item/communicator/commlink name = "commlink" desc = "An internal communicator, basically." occupation = "\[Commlink\]" - var/obj/item/device/nif/nif + var/obj/item/nif/nif var/datum/nifsoft/commlink/nifsoft -/obj/item/device/communicator/commlink/New(var/newloc,var/soft) +/obj/item/communicator/commlink/New(var/newloc,var/soft) ..() nif = newloc nifsoft = soft -/obj/item/device/communicator/commlink/Destroy() +/obj/item/communicator/commlink/Destroy() if(nif) nif.comm = null nif = null nifsoft = null return ..() -/obj/item/device/communicator/commlink/register_device(var/new_name) +/obj/item/communicator/commlink/register_device(var/new_name) owner = new_name name = "[owner]'s [initial(name)]" nif.save_data["commlink_name"] = owner //So that only the owner's chat is relayed to others. -/obj/item/device/communicator/commlink/hear_talk(mob/living/M, list/message_pieces, verb) +/obj/item/communicator/commlink/hear_talk(mob/living/M, list/message_pieces, verb) if(M != nif.human) return - for(var/obj/item/device/communicator/comm in communicating) + for(var/obj/item/communicator/comm in communicating) var/turf/T = get_turf(comm) if(!T) return var/icon_object = src var/list/mobs_to_relay - if(istype(comm, /obj/item/device/communicator/commlink)) - var/obj/item/device/communicator/commlink/CL = comm + if(istype(comm, /obj/item/communicator/commlink)) + var/obj/item/communicator/commlink/CL = comm mobs_to_relay = list(CL.nif.human) icon_object = CL.nif.big_icon else @@ -85,18 +85,18 @@ mob.show_message(rendered, 2) //Not supported by the internal one -/obj/item/device/communicator/commlink/show_message(msg, type, alt, alt_type) +/obj/item/communicator/commlink/show_message(msg, type, alt, alt_type) return //The silent treatment -/obj/item/device/communicator/commlink/request(var/atom/candidate) +/obj/item/communicator/commlink/request(var/atom/candidate) if(candidate in voice_requests) return var/who = null if(isobserver(candidate)) who = candidate.name - else if(istype(candidate, /obj/item/device/communicator)) - var/obj/item/device/communicator/comm = candidate + else if(istype(candidate, /obj/item/communicator)) + var/obj/item/communicator/comm = candidate who = comm.owner comm.voice_invites |= src @@ -109,14 +109,14 @@ nif.notify("New commlink call from [who]. (Open)") //Similar reason -/obj/item/device/communicator/commlink/request_im(var/atom/candidate, var/origin_address, var/text) +/obj/item/communicator/commlink/request_im(var/atom/candidate, var/origin_address, var/text) var/who = null if(isobserver(candidate)) var/mob/observer/dead/ghost = candidate who = ghost im_list += list(list("address" = origin_address, "to_address" = exonet.address, "im" = text)) - else if(istype(candidate, /obj/item/device/communicator)) - var/obj/item/device/communicator/comm = candidate + else if(istype(candidate, /obj/item/communicator)) + var/obj/item/communicator/comm = candidate who = comm.owner comm.im_contacts |= src im_list += list(list("address" = origin_address, "to_address" = exonet.address, "im" = text)) diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index bea81b6e87e..c38ce56268d 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -233,7 +233,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5 ****************************************************/ //Gets blood from mob to the container, preserving all data in it. -/mob/living/carbon/proc/take_blood(obj/item/weapon/reagent_containers/container, var/amount) +/mob/living/carbon/proc/take_blood(obj/item/reagent_containers/container, var/amount) var/datum/reagent/B = get_blood(container.reagents) if(!B) @@ -264,7 +264,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5 return B //For humans, blood does not appear from blue, it comes from vessels. -/mob/living/carbon/human/take_blood(obj/item/weapon/reagent_containers/container, var/amount) +/mob/living/carbon/human/take_blood(obj/item/reagent_containers/container, var/amount) if(!should_have_organ(O_HEART)) return null diff --git a/code/modules/organs/internal/augment/armmounted.dm b/code/modules/organs/internal/augment/armmounted.dm index 85b9f4aa5ad..b90a8168984 100644 --- a/code/modules/organs/internal/augment/armmounted.dm +++ b/code/modules/organs/internal/augment/armmounted.dm @@ -18,7 +18,7 @@ target_parent_classes = list(ORGAN_FLESH, ORGAN_ASSISTED) - integrated_object_type = /obj/item/weapon/gun/energy/laser/mounted/augment + integrated_object_type = /obj/item/gun/energy/laser/mounted/augment /obj/item/organ/internal/augment/armmounted/attackby(obj/item/I as obj, mob/user as mob) if(I.has_tool_quality(TOOL_SCREWDRIVER)) @@ -42,7 +42,7 @@ icon_state = "augment_taser" - integrated_object_type = /obj/item/weapon/gun/energy/taser/mounted/augment + integrated_object_type = /obj/item/gun/energy/taser/mounted/augment /obj/item/organ/internal/augment/armmounted/dartbow name = "crossbow implant" @@ -52,7 +52,7 @@ w_class = ITEMSIZE_SMALL - integrated_object_type = /obj/item/weapon/gun/energy/crossbow + integrated_object_type = /obj/item/gun/energy/crossbow // Wrist-or-hand-mounted implant @@ -63,7 +63,7 @@ w_class = ITEMSIZE_SMALL - integrated_object_type = /obj/item/weapon/portable_scanner + integrated_object_type = /obj/item/portable_scanner /obj/item/organ/internal/augment/armmounted/hand/attackby(obj/item/I as obj, mob/user as mob) if(I.has_tool_quality(TOOL_SCREWDRIVER)) @@ -84,14 +84,14 @@ /obj/item/organ/internal/augment/armmounted/hand/sword name = "energy blade implant" - integrated_object_type = /obj/item/weapon/melee/energy/sword + integrated_object_type = /obj/item/melee/energy/sword /obj/item/organ/internal/augment/armmounted/hand/blade name = "handblade implant" desc = "A small implant that fits neatly into the hand. It deploys a small, but dangerous blade." icon_state = "augment_handblade" - integrated_object_type = /obj/item/weapon/melee/augment/blade + integrated_object_type = /obj/item/melee/augment/blade /* * Shoulder augment. @@ -150,7 +150,7 @@ icon_state = "augment_armblade" - integrated_object_type = /obj/item/weapon/melee/augment/blade/arm + integrated_object_type = /obj/item/melee/augment/blade/arm // The toolkit / multi-tool implant. @@ -169,13 +169,13 @@ toolspeed = 0.8 var/list/integrated_tools = list( - /obj/item/weapon/tool/screwdriver = null, - /obj/item/weapon/tool/wrench = null, - /obj/item/weapon/tool/crowbar = null, - /obj/item/weapon/tool/wirecutters = null, - /obj/item/device/multitool = null, + /obj/item/tool/screwdriver = null, + /obj/item/tool/wrench = null, + /obj/item/tool/crowbar = null, + /obj/item/tool/wirecutters = null, + /obj/item/multitool = null, /obj/item/stack/cable_coil/gray = null, - /obj/item/weapon/tape_roll = null + /obj/item/tape_roll = null ) var/list/integrated_tools_by_name @@ -260,15 +260,15 @@ integrated_object_type = null integrated_tools = list( - /obj/item/weapon/surgical/hemostat = null, - /obj/item/weapon/surgical/retractor = null, - /obj/item/weapon/surgical/cautery = null, - /obj/item/weapon/surgical/surgicaldrill = null, - /obj/item/weapon/surgical/scalpel = null, - /obj/item/weapon/surgical/circular_saw = null, - /obj/item/weapon/surgical/bonegel = null, - /obj/item/weapon/surgical/FixOVein = null, - /obj/item/weapon/surgical/bonesetter = null, + /obj/item/surgical/hemostat = null, + /obj/item/surgical/retractor = null, + /obj/item/surgical/cautery = null, + /obj/item/surgical/surgicaldrill = null, + /obj/item/surgical/scalpel = null, + /obj/item/surgical/circular_saw = null, + /obj/item/surgical/bonegel = null, + /obj/item/surgical/FixOVein = null, + /obj/item/surgical/bonesetter = null, /obj/item/stack/medical/crude_pack = null ) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 23176642d83..99bb4514105 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -127,7 +127,7 @@ var/list/organ_cache = list() if(owner.meat_type) meat_type = owner.meat_type else - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/reagent_containers/food/snacks/meat /obj/item/organ/proc/set_dna(var/datum/dna/new_dna) if(new_dna) @@ -158,7 +158,7 @@ var/list/organ_cache = list() if(status & ORGAN_DEAD) return // Don't process if we're in a freezer, an MMI or a stasis bag.or a freezer or something I dunno - if(istype(loc,/obj/item/device/mmi)) + if(istype(loc,/obj/item/mmi)) return if(preserved) return @@ -456,7 +456,7 @@ var/list/organ_cache = list() blood_splatter(src,B,1) user.drop_from_inventory(src) - var/obj/item/weapon/reagent_containers/food/snacks/organ/O = new(get_turf(src)) + var/obj/item/reagent_containers/food/snacks/organ/O = new(get_turf(src)) O.name = name O.icon = icon O.icon_state = icon_state @@ -478,7 +478,7 @@ var/list/organ_cache = list() bitten(user) return -/obj/item/organ/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/organ/attackby(obj/item/W as obj, mob/user as mob) if(can_butcher(W, user)) butcher(W, user) return @@ -513,7 +513,7 @@ var/list/organ_cache = list() var/obj/item/newmeat = new meat_type(newtarget) - if(istype(newmeat, /obj/item/weapon/reagent_containers/food/snacks/meat)) + if(istype(newmeat, /obj/item/reagent_containers/food/snacks/meat)) newmeat.name = "[src.name] [newmeat.name]" // "liver meat" "heart meat", etc. qdel(src) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 7fe0d256073..8e4b00a2684 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -112,7 +112,7 @@ while(null in owner.organs) owner.organs -= null - for(var/obj/item/weapon/implant/I as anything in implants) + for(var/obj/item/implant/I as anything in implants) if(!istype(I)) continue I.imp_in = I.part = null @@ -169,20 +169,20 @@ continue . += "There is \a [I] sticking out of it." -/obj/item/organ/external/attackby(obj/item/weapon/W as obj, mob/living/user as mob) +/obj/item/organ/external/attackby(obj/item/W as obj, mob/living/user as mob) switch(stage) if(0) - if(istype(W,/obj/item/weapon/surgical/scalpel)) + if(istype(W,/obj/item/surgical/scalpel)) user.visible_message("[user] cuts [src] open with [W]!") stage++ return if(1) - if(istype(W,/obj/item/weapon/surgical/retractor)) + if(istype(W,/obj/item/surgical/retractor)) user.visible_message("[user] cracks [src] open like an egg with [W]!") stage++ return if(2) - if(istype(W,/obj/item/weapon/surgical/hemostat)) + if(istype(W,/obj/item/surgical/hemostat)) if(contents.len) var/obj/item/removing = pick(contents) removing.loc = get_turf(user.loc) @@ -296,7 +296,7 @@ if(status & ORGAN_BROKEN && brute) jostle_bone(brute) - if(organ_can_feel_pain() && prob(40) && !isbelly(owner.loc) && !istype(owner.loc, /obj/item/device/dogborg/sleeper)) //VOREStation Edit + if(organ_can_feel_pain() && prob(40) && !isbelly(owner.loc) && !istype(owner.loc, /obj/item/dogborg/sleeper)) //VOREStation Edit owner.emote("scream") //getting hit on broken hand hurts if(used_weapon) add_autopsy_data("[used_weapon]", brute + burn) @@ -502,7 +502,7 @@ This function completely restores a damaged organ to perfect condition. // remove embedded objects and drop them on the floor for(var/obj/implanted_object in implants) - if(istype(implanted_object,/obj/item/weapon/implant) || istype(implanted_object,/obj/item/device/nif)) // We don't want to remove REAL implants. Just shrapnel etc. //VOREStation Edit - NIFs pls + if(istype(implanted_object,/obj/item/implant) || istype(implanted_object,/obj/item/nif)) // We don't want to remove REAL implants. Just shrapnel etc. //VOREStation Edit - NIFs pls continue implanted_object.loc = get_turf(src) implants -= implanted_object @@ -989,10 +989,10 @@ Note that amputating the affected organ does in fact remove the infection from t qdel(src) if(victim.l_hand) - if(istype(victim.l_hand,/obj/item/weapon/material/twohanded)) //if they're holding a two-handed weapon, drop it now they've lost a hand + if(istype(victim.l_hand,/obj/item/material/twohanded)) //if they're holding a two-handed weapon, drop it now they've lost a hand victim.l_hand.update_held_icon() if(victim.r_hand) - if(istype(victim.r_hand,/obj/item/weapon/material/twohanded)) + if(istype(victim.r_hand,/obj/item/material/twohanded)) victim.r_hand.update_held_icon() /**************************************************** @@ -1216,7 +1216,7 @@ Note that amputating the affected organ does in fact remove the infection from t /obj/item/organ/external/proc/is_malfunctioning() return ((robotic >= ORGAN_ROBOT) && (brute_dam + burn_dam) >= min_broken_damage*0.83 && prob(brute_dam + burn_dam)) //VOREStation Edit - Makes robotic limb damage scalable -/obj/item/organ/external/proc/embed(var/obj/item/weapon/W, var/silent = 0) +/obj/item/organ/external/proc/embed(var/obj/item/W, var/silent = 0) if(!owner || loc != owner) return if(!silent) @@ -1420,7 +1420,7 @@ Note that amputating the affected organ does in fact remove the infection from t . = 0 for(var/obj/item/organ/external/L in organs) for(var/obj/item/I in L.implants) - if(!istype(I,/obj/item/weapon/implant) && !istype(I,/obj/item/device/nif)) //VOREStation Add - NIFs + if(!istype(I,/obj/item/implant) && !istype(I,/obj/item/nif)) //VOREStation Add - NIFs return 1 /obj/item/organ/external/proc/is_hidden_by_sprite_accessory(var/clothing_only = FALSE) // Clothing only will mean the check should only be used in places where we want to hide clothing icon, not organ itself. diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index 33a356fb574..7a0311ad932 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -468,7 +468,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ parts = list(BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND, BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT) modular_bodyparts = MODULAR_BODYPART_PROSTHETIC -/obj/item/weapon/disk/limb +/obj/item/disk/limb name = "Limb Blueprints" desc = "A disk containing the blueprints for prosthetics." icon = 'icons/obj/discs_vr.dmi' //VOREStation Edit @@ -522,83 +522,83 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ parts = list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT) -/obj/item/weapon/disk/limb/New(var/newloc) +/obj/item/disk/limb/New(var/newloc) ..() if(company) name = "[company] [initial(name)]" -/obj/item/weapon/disk/limb/bishop +/obj/item/disk/limb/bishop company = "Bishop" catalogue_data = list(/datum/category_item/catalogue/information/organization/bishop) -/obj/item/weapon/disk/limb/cybersolutions +/obj/item/disk/limb/cybersolutions company = "Cyber Solutions" -/obj/item/weapon/disk/limb/grayson +/obj/item/disk/limb/grayson company = "Grayson" -/obj/item/weapon/disk/limb/hephaestus +/obj/item/disk/limb/hephaestus company = "Hephaestus" catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus) -/obj/item/weapon/disk/limb/morpheus +/obj/item/disk/limb/morpheus company = "Morpheus" catalogue_data = list(/datum/category_item/catalogue/information/organization/morpheus) -/obj/item/weapon/disk/limb/veymed +/obj/item/disk/limb/veymed company = "Vey-Med" catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med) // Bus disk for Diona mech parts. -/obj/item/weapon/disk/limb/veymed/diona +/obj/item/disk/limb/veymed/diona company = "Skrellian Exoskeleton" -/obj/item/weapon/disk/limb/wardtakahashi +/obj/item/disk/limb/wardtakahashi company = "Ward-Takahashi" catalogue_data = list(/datum/category_item/catalogue/information/organization/ward_takahashi) -/obj/item/weapon/disk/limb/xion +/obj/item/disk/limb/xion company = "Xion" catalogue_data = list(/datum/category_item/catalogue/information/organization/xion) -/obj/item/weapon/disk/limb/zenghu +/obj/item/disk/limb/zenghu company = "Zeng-Hu" catalogue_data = list(/datum/category_item/catalogue/information/organization/zeng_hu) -/obj/item/weapon/disk/limb/nanotrasen +/obj/item/disk/limb/nanotrasen company = "NanoTrasen" catalogue_data = list(/datum/category_item/catalogue/information/organization/nanotrasen) -/obj/item/weapon/disk/species +/obj/item/disk/species name = "Species Bioprints" desc = "A disk containing the blueprints for species-specific prosthetics." icon = 'icons/obj/cloning.dmi' icon_state = "datadisk2" var/species = SPECIES_HUMAN -/obj/item/weapon/disk/species/Initialize() +/obj/item/disk/species/Initialize() . = ..() if(species) name = "[species] [initial(name)]" -/obj/item/weapon/disk/species/skrell +/obj/item/disk/species/skrell species = SPECIES_SKRELL -/obj/item/weapon/disk/species/unathi +/obj/item/disk/species/unathi species = SPECIES_UNATHI -/obj/item/weapon/disk/species/tajaran +/obj/item/disk/species/tajaran species = SPECIES_TAJ -/obj/item/weapon/disk/species/teshari +/obj/item/disk/species/teshari species = SPECIES_TESHARI // In case of bus, presently. -/obj/item/weapon/disk/species/diona +/obj/item/disk/species/diona species = SPECIES_DIONA -/obj/item/weapon/disk/species/zaddat +/obj/item/disk/species/zaddat species = SPECIES_ZADDAT -/obj/item/weapon/disk/limb/cenilimicybernetics +/obj/item/disk/limb/cenilimicybernetics company = "Cenilimi Cybernetics" diff --git a/code/modules/organs/robolimbs_custom.dm b/code/modules/organs/robolimbs_custom.dm index cfa9848b74a..55d6e68ee49 100644 --- a/code/modules/organs/robolimbs_custom.dm +++ b/code/modules/organs/robolimbs_custom.dm @@ -15,7 +15,7 @@ includes_tail = 1 unavailable_to_build = 1 -/obj/item/weapon/disk/limb/eggnerdltd +/obj/item/disk/limb/eggnerdltd company = "Eggnerd Prototyping Ltd." // icon = 'icons/obj/items_vr.dmi' // icon_state = "verkdisk" @@ -26,7 +26,7 @@ desc = "This metallic limb is sleek and featuresless apart from some exposed motors" icon = 'icons/mob/human_races/cyberlimbs/talon/talon_main.dmi' //Sprited by: Viveret -/obj/item/weapon/disk/limb/talon +/obj/item/disk/limb/talon company = "Talon LLC" /datum/robolimb/zenghu_taj //This wasn't indented. At all. It's a miracle this didn't break literally everything. @@ -44,7 +44,7 @@ includes_tail = 1 unavailable_to_build = 1 -/obj/item/weapon/disk/limb/eggnerdltdred +/obj/item/disk/limb/eggnerdltdred company = "Eggnerd Prototyping Ltd. (Red)" icon = 'icons/obj/items_vr.dmi' //VOREStation add. Use the right sprites icon_state = "verkdisk" //VOREStation add. Use the right sprites @@ -67,7 +67,7 @@ species_cannot_use -= SPECIES_TAJ VS Edit - anyone can select these. */ -/obj/item/weapon/disk/limb/dsi_tajaran +/obj/item/disk/limb/dsi_tajaran company = "DSI - Tajaran" /datum/robolimb/dsi_lizard @@ -86,7 +86,7 @@ VS Edit - anyone can select these. */ species_cannot_use -= SPECIES_UNATHI VS Edit - anyone can select these. */ -/obj/item/weapon/disk/limb/dsi_lizard +/obj/item/disk/limb/dsi_lizard company = "DSI - Lizard" /datum/robolimb/dsi_sergal @@ -100,7 +100,7 @@ VS Edit - anyone can select these. */ skin_tone = 1 suggested_species = "Sergal" -/obj/item/weapon/disk/limb/dsi_sergal +/obj/item/disk/limb/dsi_sergal company = "DSI - Sergal" /datum/robolimb/dsi_nevrean @@ -114,7 +114,7 @@ VS Edit - anyone can select these. */ skin_tone = 1 suggested_species = "Nevrean" -/obj/item/weapon/disk/limb/dsi_nevrean +/obj/item/disk/limb/dsi_nevrean company = "DSI - Nevrean" /datum/robolimb/dsi_vulpkanin @@ -128,7 +128,7 @@ VS Edit - anyone can select these. */ skin_tone = 1 suggested_species = "Vulpkanin" -/obj/item/weapon/disk/limb/dsi_vulpkanin +/obj/item/disk/limb/dsi_vulpkanin company = "DSI - Vulpkanin" /datum/robolimb/dsi_akula @@ -142,7 +142,7 @@ VS Edit - anyone can select these. */ skin_tone = 1 suggested_species = "Akula" -/obj/item/weapon/disk/limb/dsi_akula +/obj/item/disk/limb/dsi_akula company = "DSI - Akula" /datum/robolimb/dsi_spider @@ -156,7 +156,7 @@ VS Edit - anyone can select these. */ skin_tone = 1 suggested_species = "Vasilissan" -/obj/item/weapon/disk/limb/dsi_spider +/obj/item/disk/limb/dsi_spider company = "DSI - Vasilissan" /datum/robolimb/dsi_teshari @@ -174,7 +174,7 @@ VS Edit - anyone can select these. */ species_cannot_use -= SPECIES_PROTEAN //VOREStation add - let 'em be selected. ..() -/obj/item/weapon/disk/limb/dsi_teshari +/obj/item/disk/limb/dsi_teshari company = "DSI - Teshari" /datum/robolimb/dsi_zorren @@ -188,7 +188,7 @@ VS Edit - anyone can select these. */ skin_tone = 1 suggested_species = "Zorren" -/obj/item/weapon/disk/limb/dsi_zorren +/obj/item/disk/limb/dsi_zorren company = "DSI - Zorren" /datum/robolimb/dsi_fennec @@ -202,5 +202,5 @@ VS Edit - anyone can select these. */ skin_tone = 1 suggested_species = "Fennec" -/obj/item/weapon/disk/limb/dsi_fennec +/obj/item/disk/limb/dsi_fennec company = "DSI - Fennec" diff --git a/code/modules/organs/robolimbs_vr.dm b/code/modules/organs/robolimbs_vr.dm index cb92c3e6d73..8fa9a8e3cf9 100644 --- a/code/modules/organs/robolimbs_vr.dm +++ b/code/modules/organs/robolimbs_vr.dm @@ -39,7 +39,7 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\ suggested_species = SPECIES_VULPKANIN whitelisted_to = list("arokha") -/obj/item/weapon/disk/limb/kitsuhana +/obj/item/disk/limb/kitsuhana company = "Kitsuhana" // silencedmp5a5 : Serdykov Antoz @@ -52,7 +52,7 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\ includes_tail = 1 whitelisted_to = list("silencedmp5a5", "cgr") -/obj/item/weapon/disk/limb/white_kryten +/obj/item/disk/limb/white_kryten company = "White Kryten Cybernetics" // tucker0666 : Frost @@ -66,7 +66,7 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\ unavailable_to_build = 1 whitelisted_to = list("tucker0666") -/obj/item/weapon/disk/limb/zenghu_frost +/obj/item/disk/limb/zenghu_frost company = "Zeng-Hu (Modified)" catalogue_data = list(/datum/category_item/catalogue/information/organization/zeng_hu) @@ -80,7 +80,7 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\ monitor_icon = 'icons/mob/monitor_icons_vr.dmi' monitor_styles = cyberbeast_monitor_styles -/obj/item/weapon/disk/limb/cyber_beast +/obj/item/disk/limb/cyber_beast company = "Cyber Tech" /datum/robolimb/zenghu_glacier diff --git a/code/modules/organs/subtypes/machine.dm b/code/modules/organs/subtypes/machine.dm index 9a64c70cb0e..dbe4154aa83 100644 --- a/code/modules/organs/subtypes/machine.dm +++ b/code/modules/organs/subtypes/machine.dm @@ -35,8 +35,8 @@ organ_tag = O_BRAIN parent_organ = BP_HEAD vital = 1 - var/brain_type = /obj/item/device/mmi - var/obj/item/device/mmi/stored_mmi + var/brain_type = /obj/item/mmi + var/obj/item/mmi/stored_mmi robotic = ORGAN_ASSISTED butcherable = FALSE @@ -111,7 +111,7 @@ /obj/item/organ/internal/mmi_holder/posibrain name = "positronic brain interface" - brain_type = /obj/item/device/mmi/digital/posibrain + brain_type = /obj/item/mmi/digital/posibrain robotic = ORGAN_ROBOT /obj/item/organ/internal/mmi_holder/posibrain/update_from_mmi() @@ -123,7 +123,7 @@ /obj/item/organ/internal/mmi_holder/robot name = "digital brain interface" - brain_type = /obj/item/device/mmi/digital/robot + brain_type = /obj/item/mmi/digital/robot robotic = ORGAN_ROBOT /obj/item/organ/internal/mmi_holder/robot/update_from_mmi() diff --git a/code/modules/organs/subtypes/nano.dm b/code/modules/organs/subtypes/nano.dm index f717ef3f1fc..0c750a70d63 100644 --- a/code/modules/organs/subtypes/nano.dm +++ b/code/modules/organs/subtypes/nano.dm @@ -164,7 +164,7 @@ icon_state = "posi" parent_organ = BP_TORSO - brain_type = /obj/item/device/mmi/digital/posibrain/nano + brain_type = /obj/item/mmi/digital/posibrain/nano /obj/item/organ/internal/mmi_holder/posibrain/nano/robotize() . = ..() @@ -184,28 +184,28 @@ stored_mmi.brainmob.languages = owner.languages // The 'out on the ground' object, not the organ holder -/obj/item/device/mmi/digital/posibrain/nano +/obj/item/mmi/digital/posibrain/nano name = "protean posibrain" desc = "A more advanced version of the standard posibrain, typically found in protean bodies." icon = 'icons/mob/species/protean/protean.dmi' icon_state = "posi" -/obj/item/device/mmi/digital/posibrain/nano/Initialize() +/obj/item/mmi/digital/posibrain/nano/Initialize() . = ..() icon_state = "posi" -/obj/item/device/mmi/digital/posibrain/nano/request_player() +/obj/item/mmi/digital/posibrain/nano/request_player() icon_state = initial(icon_state) return //We don't do this stuff -/obj/item/device/mmi/digital/posibrain/nano/reset_search() +/obj/item/mmi/digital/posibrain/nano/reset_search() icon_state = initial(icon_state) return //Don't do this either because of the above -/obj/item/device/mmi/digital/posibrain/nano/transfer_personality() +/obj/item/mmi/digital/posibrain/nano/transfer_personality() . = ..() icon_state = "posi1" -/obj/item/device/mmi/digital/posibrain/nano/transfer_identity() +/obj/item/mmi/digital/posibrain/nano/transfer_identity() . = ..() icon_state = "posi1" diff --git a/code/modules/overmap/disperser/disperser.dm b/code/modules/overmap/disperser/disperser.dm index 005ee3719e5..eb8b2ba7d8f 100644 --- a/code/modules/overmap/disperser/disperser.dm +++ b/code/modules/overmap/disperser/disperser.dm @@ -44,7 +44,7 @@ desc = "A complex machine which shoots concentrated material beams.\
A sign on it reads: STAY CLEAR! DO NOT BLOCK!" icon_state = "front" - circuit = /obj/item/weapon/circuitboard/disperserfront + circuit = /obj/item/circuitboard/disperserfront /obj/machinery/disperser/middle name = "obstruction removal ballista fusor" @@ -52,14 +52,14 @@ from the material deconstructor to the particle beam generator.\
A sign on it reads: EXPLOSIVE! DO NOT OVERHEAT!" icon_state = "middle" - circuit = /obj/item/weapon/circuitboard/dispersermiddle - // maximum_component_parts = list(/obj/item/weapon/stock_parts = 15) + circuit = /obj/item/circuitboard/dispersermiddle + // maximum_component_parts = list(/obj/item/stock_parts = 15) /obj/machinery/disperser/back name = "obstruction removal ballista material deconstructor" desc = "A prototype machine which can deconstruct materials atom by atom.\
A sign on it reads: KEEP AWAY FROM LIVING MATERIAL!" icon_state = "back" - circuit = /obj/item/weapon/circuitboard/disperserback + circuit = /obj/item/circuitboard/disperserback density = FALSE layer = UNDER_JUNK_LAYER //So the charges go above us. diff --git a/code/modules/overmap/disperser/disperser_circuit.dm b/code/modules/overmap/disperser/disperser_circuit.dm index 7ecf4ebf1b5..382cce1ad6b 100644 --- a/code/modules/overmap/disperser/disperser_circuit.dm +++ b/code/modules/overmap/disperser/disperser_circuit.dm @@ -2,34 +2,34 @@ #error T_BOARD macro is not defined but we need it! #endif -/obj/item/weapon/circuitboard/disperser +/obj/item/circuitboard/disperser name = T_BOARD("obstruction removal ballista control") build_path = /obj/machinery/computer/ship/disperser origin_tech = list(TECH_ENGINEERING = 2, TECH_COMBAT = 2, TECH_BLUESPACE = 2) -/obj/item/weapon/circuitboard/disperserfront +/obj/item/circuitboard/disperserfront name = T_BOARD("obstruction removal ballista beam generator") build_path = /obj/machinery/disperser/front board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_ENGINEERING = 2, TECH_COMBAT = 2, TECH_BLUESPACE = 2) req_components = list ( - /obj/item/weapon/stock_parts/manipulator/pico = 5 + /obj/item/stock_parts/manipulator/pico = 5 ) -/obj/item/weapon/circuitboard/dispersermiddle +/obj/item/circuitboard/dispersermiddle name = T_BOARD("obstruction removal ballista fusor") build_path = /obj/machinery/disperser/middle board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_ENGINEERING = 2, TECH_COMBAT = 2, TECH_BLUESPACE = 2) req_components = list ( - /obj/item/weapon/stock_parts/subspace/crystal = 10 + /obj/item/stock_parts/subspace/crystal = 10 ) -/obj/item/weapon/circuitboard/disperserback +/obj/item/circuitboard/disperserback name = T_BOARD("obstruction removal ballista material deconstructor") build_path = /obj/machinery/disperser/back board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_ENGINEERING = 2, TECH_COMBAT = 2, TECH_BLUESPACE = 2) req_components = list ( - /obj/item/weapon/stock_parts/capacitor/super = 5 + /obj/item/stock_parts/capacitor/super = 5 ) diff --git a/code/modules/overmap/disperser/disperser_console.dm b/code/modules/overmap/disperser/disperser_console.dm index 2135d8830b6..928180711fe 100644 --- a/code/modules/overmap/disperser/disperser_console.dm +++ b/code/modules/overmap/disperser/disperser_console.dm @@ -4,7 +4,7 @@ name = "obstruction removal ballista control" icon = 'icons/obj/computer.dmi' icon_state = "computer" - circuit = /obj/item/weapon/circuitboard/disperser + circuit = /obj/item/circuitboard/disperser core_skill = /datum/skill/pilot var/skill_offset = SKILL_ADEPT - 1 //After which skill level it starts to matter. -1, because we have to index from zero diff --git a/code/modules/overmap/overmap_shuttle.dm b/code/modules/overmap/overmap_shuttle.dm index 33af0f60f2d..4ef8a9be386 100644 --- a/code/modules/overmap/overmap_shuttle.dm +++ b/code/modules/overmap/overmap_shuttle.dm @@ -96,21 +96,21 @@ return 1 //shuttles with zero fuel consumption are magic and can always launch if(!fuel_ports.len) return 0 //Nowhere to get fuel from - var/list/obj/item/weapon/tank/fuel_tanks = list() + var/list/obj/item/tank/fuel_tanks = list() for(var/obj/structure/FP in fuel_ports) //loop through fuel ports and assemble list of all fuel tanks - var/obj/item/weapon/tank/FT = locate() in FP + var/obj/item/tank/FT = locate() in FP if(FT) fuel_tanks += FT if(!fuel_tanks.len) return 0 //can't launch if you have no fuel TANKS in the ports var/total_flammable_gas_moles = 0 - for(var/obj/item/weapon/tank/FT in fuel_tanks) + for(var/obj/item/tank/FT in fuel_tanks) total_flammable_gas_moles += FT.air_contents.get_by_flag(XGM_GAS_FUEL) if(total_flammable_gas_moles < fuel_consumption) //not enough fuel return 0 // We are going to succeed if we got to here, so start consuming that fuel var/fuel_to_consume = fuel_consumption - for(var/obj/item/weapon/tank/FT in fuel_tanks) //loop through tanks, consume their fuel one by one + for(var/obj/item/tank/FT in fuel_tanks) //loop through tanks, consume their fuel one by one var/fuel_available = FT.air_contents.get_by_flag(XGM_GAS_FUEL) if(!fuel_available) // Didn't even have fuel. continue @@ -133,7 +133,7 @@ var/icon_full = "fuel_port_full" var/opened = 0 var/parent_shuttle - var/base_tank = /obj/item/weapon/tank/phoron + var/base_tank = /obj/item/tank/phoron /obj/structure/fuel_port/Initialize() . = ..() @@ -141,7 +141,7 @@ new base_tank(src) /obj/structure/fuel_port/heavy - base_tank = /obj/item/weapon/tank/phoron/pressurized + base_tank = /obj/item/tank/phoron/pressurized /obj/structure/fuel_port/empty base_tank = null //oops, no gas! @@ -166,7 +166,7 @@ icon_state = icon_closed ..() -/obj/structure/fuel_port/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/fuel_port/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_CROWBAR)) if(opened) to_chat(user, "You tightly shut \the [src] door.") @@ -176,7 +176,7 @@ to_chat(user, "You open up \the [src] door.") playsound(src, 'sound/effects/locker_open.ogg', 15, 1, -3) opened = 1 - else if(istype(W,/obj/item/weapon/tank)) + else if(istype(W,/obj/item/tank)) if(!opened) to_chat(user, "\The [src] door is still closed!") return diff --git a/code/modules/overmap/ships/computers/computer_shims.dm b/code/modules/overmap/ships/computers/computer_shims.dm index 72fdbe4fb72..d35d821df33 100644 --- a/code/modules/overmap/ships/computers/computer_shims.dm +++ b/code/modules/overmap/ships/computers/computer_shims.dm @@ -37,12 +37,12 @@ . = 0 for(var/thing in component_parts) if(istype(thing, part_type)) - var/obj/item/weapon/stock_parts/part = thing + var/obj/item/stock_parts/part = thing . += part.rating // Now isn't THIS a cool idea? // for(var/path in uncreated_component_parts) // if(ispath(path, part_type)) - // var/obj/item/weapon/stock_parts/comp = path + // var/obj/item/stock_parts/comp = path // . += initial(comp.rating) * uncreated_component_parts[path] // diff --git a/code/modules/overmap/ships/computers/engine_control.dm b/code/modules/overmap/ships/computers/engine_control.dm index e2b2defea8a..aef04282312 100644 --- a/code/modules/overmap/ships/computers/engine_control.dm +++ b/code/modules/overmap/ships/computers/engine_control.dm @@ -4,7 +4,7 @@ name = "engine control console" icon_keyboard = "tech_key" icon_screen = "engines" - circuit = /obj/item/weapon/circuitboard/engine + circuit = /obj/item/circuitboard/engine // fancy sprite /obj/machinery/computer/ship/engines/adv diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index 518d3955a54..ec7cb0ac00e 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -19,7 +19,7 @@ GLOBAL_LIST_EMPTY(all_waypoints) icon_keyboard = "teleport_key" icon_screen = "helm" light_color = "#7faaff" - circuit = /obj/item/weapon/circuitboard/helm + circuit = /obj/item/circuitboard/helm core_skill = /datum/skill/pilot var/autopilot = 0 var/autopilot_disabled = TRUE @@ -264,7 +264,7 @@ GLOBAL_LIST_EMPTY(all_waypoints) name = "navigation console" icon_keyboard = "generic_key" icon_screen = "helm" - circuit = /obj/item/weapon/circuitboard/nav + circuit = /obj/item/circuitboard/nav var/datum/tgui_module/ship/nav/nav_tgui /obj/machinery/computer/ship/navigation/Initialize() @@ -286,7 +286,7 @@ GLOBAL_LIST_EMPTY(all_waypoints) layer = ABOVE_WINDOW_LAYER icon_keyboard = null icon_screen = null - circuit = /obj/item/weapon/circuitboard/nav/tele + circuit = /obj/item/circuitboard/nav/tele density = FALSE /obj/machinery/computer/ship/navigation/telescreen/update_icon() diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index 33fb4219f8a..4cd7ee66f90 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -3,7 +3,7 @@ icon_keyboard = "teleport_key" icon_screen = "teleport" light_color = "#77fff8" - circuit = /obj/item/weapon/circuitboard/sensors + circuit = /obj/item/circuitboard/sensors extra_view = 4 var/obj/machinery/shipsensors/sensors @@ -99,7 +99,7 @@ if("scan") var/obj/effect/overmap/O = locate(params["scan"]) if(istype(O) && !QDELETED(O) && (O in view(7,linked))) - new/obj/item/weapon/paper/(get_turf(src), O.get_scan_data(usr), "paper (Sensor Scan - [O])") + new/obj/item/paper/(get_turf(src), O.get_scan_data(usr), "paper (Sensor Scan - [O])") playsound(src, "sound/machines/printer.ogg", 30, 1) . = TRUE @@ -143,11 +143,11 @@ var/range = 1 idle_power_usage = 5000 -/obj/machinery/shipsensors/attackby(obj/item/weapon/W, mob/user) +/obj/machinery/shipsensors/attackby(obj/item/W, mob/user) var/damage = max_health - health if(damage && W.has_tool_quality(TOOL_WELDER)) - var/obj/item/weapon/weldingtool/WT = W.get_welder() + var/obj/item/weldingtool/WT = W.get_welder() if(!WT.isOn()) return diff --git a/code/modules/overmap/ships/computers/shuttle.dm b/code/modules/overmap/ships/computers/shuttle.dm index 8426f1ba2a2..6dd79a7dfa2 100644 --- a/code/modules/overmap/ships/computers/shuttle.dm +++ b/code/modules/overmap/ships/computers/shuttle.dm @@ -1,7 +1,7 @@ //Shuttle controller computer for shuttles going between sectors /obj/machinery/computer/shuttle_control/explore name = "general shuttle control console" - circuit = /obj/item/weapon/circuitboard/shuttle_console/explore + circuit = /obj/item/circuitboard/shuttle_console/explore tgui_subtemplate = "ShuttleControlConsoleExploration" /obj/machinery/computer/shuttle_control/explore/shuttlerich_tgui_data(var/datum/shuttle/autodock/overmap/shuttle) @@ -9,7 +9,7 @@ if(istype(shuttle)) var/total_gas = 0 for(var/obj/structure/fuel_port/FP in shuttle.fuel_ports) //loop through fuel ports - var/obj/item/weapon/tank/fuel_tank = locate() in FP + var/obj/item/tank/fuel_tank = locate() in FP if(fuel_tank) total_gas += fuel_tank.air_contents.total_moles diff --git a/code/modules/overmap/ships/engines/gas_thruster.dm b/code/modules/overmap/ships/engines/gas_thruster.dm index 5510a803dec..96390ed36ca 100644 --- a/code/modules/overmap/ships/engines/gas_thruster.dm +++ b/code/modules/overmap/ships/engines/gas_thruster.dm @@ -63,8 +63,8 @@ connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL // construct_state = /decl/machine_construction/default/panel_closed - // maximum_component_parts = list(/obj/item/weapon/stock_parts = 6)//don't want too many, let upgraded component shine - // uncreated_component_parts = list(/obj/item/weapon/stock_parts/power/apc/buildable = 1) + // maximum_component_parts = list(/obj/item/stock_parts = 6)//don't want too many, let upgraded component shine + // uncreated_component_parts = list(/obj/item/stock_parts/power/apc/buildable = 1) use_power = USE_POWER_OFF power_channel = EQUIP @@ -173,11 +173,11 @@ /obj/machinery/atmospherics/unary/engine/RefreshParts() ..() //allows them to upgrade the max limit of fuel intake (which only gives diminishing returns) for increase in max thrust but massive reduction in fuel economy - var/bin_upgrade = 5 * CLAMP(total_component_rating_of_type(/obj/item/weapon/stock_parts/matter_bin), 0, 6)//5 litre per rank + var/bin_upgrade = 5 * CLAMP(total_component_rating_of_type(/obj/item/stock_parts/matter_bin), 0, 6)//5 litre per rank volume_per_burn = bin_upgrade ? initial(volume_per_burn) + bin_upgrade : 2 //Penalty missing part: 10% fuel use, no thrust boot_time = bin_upgrade ? initial(boot_time) - bin_upgrade : initial(boot_time) * 2 //energy cost - thb all of this is to limit the use of back up batteries - var/energy_upgrade = CLAMP(total_component_rating_of_type(/obj/item/weapon/stock_parts/capacitor), 0.1, 6) + var/energy_upgrade = CLAMP(total_component_rating_of_type(/obj/item/stock_parts/capacitor), 0.1, 6) charge_per_burn = initial(charge_per_burn) / energy_upgrade change_power_consumption(initial(idle_power_usage) / energy_upgrade, USE_POWER_IDLE) @@ -198,7 +198,7 @@ set_dir(ndir) QDEL_IN(src, 20) -/obj/item/weapon/circuitboard/unary_atmos/engine //why don't we move this elsewhere? +/obj/item/circuitboard/unary_atmos/engine //why don't we move this elsewhere? name = T_BOARD("gas thruster") icon_state = "mcontroller" build_path = /obj/machinery/atmospherics/unary/engine @@ -206,11 +206,11 @@ req_components = list( /obj/item/stack/cable_coil = 30, /obj/item/pipe = 2, - /obj/item/weapon/stock_parts/matter_bin = 1, - /obj/item/weapon/stock_parts/capacitor = 2) + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stock_parts/capacitor = 2) // Not Implemented - Variant that pulls power from cables. Too complicated without bay's power components. // /obj/machinery/atmospherics/unary/engine/terminal // base_type = /obj/machinery/atmospherics/unary/engine // stock_part_presets = list(/decl/stock_part_preset/terminal_setup) -// uncreated_component_parts = list(/obj/item/weapon/stock_parts/power/terminal/buildable = 1) +// uncreated_component_parts = list(/obj/item/stock_parts/power/terminal/buildable = 1) diff --git a/code/modules/overmap/ships/engines/ion_thruster.dm b/code/modules/overmap/ships/engines/ion_thruster.dm index 21a4f9ea3aa..54f05f8d7f1 100644 --- a/code/modules/overmap/ships/engines/ion_thruster.dm +++ b/code/modules/overmap/ships/engines/ion_thruster.dm @@ -78,7 +78,7 @@ /obj/machinery/ion_engine/proc/get_thrust() return thrust_limit * generated_thrust * on -/obj/item/weapon/circuitboard/engine/ion +/obj/item/circuitboard/engine/ion name = T_BOARD("ion propulsion device") board_type = "machine" icon_state = "mcontroller" @@ -86,5 +86,5 @@ origin_tech = list(TECH_POWER = 1, TECH_ENGINEERING = 2) req_components = list( /obj/item/stack/cable_coil = 2, - /obj/item/weapon/stock_parts/matter_bin = 1, - /obj/item/weapon/stock_parts/capacitor = 2) \ No newline at end of file + /obj/item/stock_parts/matter_bin = 1, + /obj/item/stock_parts/capacitor = 2) \ No newline at end of file diff --git a/code/modules/overmap/spacetravel.dm b/code/modules/overmap/spacetravel.dm index 4d24fd7039f..3ac1f9ad3c7 100644 --- a/code/modules/overmap/spacetravel.dm +++ b/code/modules/overmap/spacetravel.dm @@ -66,7 +66,7 @@ return TRUE -/obj/item/device/uav/lost_in_space() +/obj/item/uav/lost_in_space() if(state == 1) return FALSE return ..() diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm index 424b24c7c10..2249bcc0ac3 100644 --- a/code/modules/paperwork/adminpaper.dm +++ b/code/modules/paperwork/adminpaper.dm @@ -1,5 +1,5 @@ //Adminpaper - it's like paper, but more adminny! -/obj/item/weapon/paper/admin +/obj/item/paper/admin name = "administrative paper" desc = "If you see this, something has gone horribly wrong." var/datum/admins/admindatum = null @@ -16,12 +16,12 @@ var/footer = null var/footerOn = FALSE -/obj/item/weapon/paper/admin/New() +/obj/item/paper/admin/New() ..() generateInteractions() -/obj/item/weapon/paper/admin/proc/generateInteractions() +/obj/item/paper/admin/proc/generateInteractions() //clear first interactions = null @@ -36,7 +36,7 @@ interactions += "Clear page " interactions += "" -/obj/item/weapon/paper/admin/proc/generateHeader() +/obj/item/paper/admin/proc/generateHeader() var/originhash = md5("[origin]") var/timehash = copytext(md5("[world.time]"),1,10) var/text = null @@ -59,7 +59,7 @@ header = text -/obj/item/weapon/paper/admin/proc/generateFooter() +/obj/item/paper/admin/proc/generateFooter() var/text = null text = "
" @@ -71,18 +71,18 @@ footer = text -/obj/item/weapon/paper/admin/proc/adminbrowse() +/obj/item/paper/admin/proc/adminbrowse() updateinfolinks() generateHeader() generateFooter() updateDisplay() -/obj/item/weapon/paper/admin/proc/updateDisplay() +/obj/item/paper/admin/proc/updateDisplay() usr << browse("[name][headerOn ? header : ""][info_links][stamps][footerOn ? footer : ""][interactions]", "window=[name];can_close=0") -/obj/item/weapon/paper/admin/Topic(href, href_list) +/obj/item/paper/admin/Topic(href, href_list) if(href_list["write"]) var/id = href_list["write"] if(free_space <= 0) @@ -159,5 +159,5 @@ updateDisplay() return -/obj/item/weapon/paper/admin/get_signature() +/obj/item/paper/admin/get_signature() return tgui_input_text(usr, "Enter the name you wish to sign the paper with (will prompt for multiple entries, in order of entry)", "Signature") diff --git a/code/modules/paperwork/carbonpaper.dm b/code/modules/paperwork/carbonpaper.dm index edcd6f87ef3..4ed61dec5f3 100644 --- a/code/modules/paperwork/carbonpaper.dm +++ b/code/modules/paperwork/carbonpaper.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/paper/carbon +/obj/item/paper/carbon name = "paper" icon_state = "paper_stack" item_state = "paper" @@ -6,7 +6,7 @@ var/iscopy = 0 -/obj/item/weapon/paper/carbon/update_icon() +/obj/item/paper/carbon/update_icon() if(iscopy) if(info) icon_state = "cpaper_words" @@ -25,15 +25,15 @@ -/obj/item/weapon/paper/carbon/verb/removecopy() +/obj/item/paper/carbon/verb/removecopy() set name = "Remove carbon-copy" set category = "Object" set src in usr if (copied == 0) - var/obj/item/weapon/paper/carbon/c = src + var/obj/item/paper/carbon/c = src var/copycontents = html_decode(c.info) - var/obj/item/weapon/paper/carbon/copy = new /obj/item/weapon/paper/carbon (usr.loc) + var/obj/item/paper/carbon/copy = new /obj/item/paper/carbon (usr.loc) // copycontents = replacetext(copycontents, "You clip the [W] onto \the [src].") update_icon() - else if(istype(toppaper) && istype(W, /obj/item/weapon/pen)) + else if(istype(toppaper) && istype(W, /obj/item/pen)) toppaper.attackby(W, usr) update_icon() return -/obj/item/weapon/clipboard/afterattack(turf/T as turf, mob/user as mob) - for(var/obj/item/weapon/paper/P in T) +/obj/item/clipboard/afterattack(turf/T as turf, mob/user as mob) + for(var/obj/item/paper/P in T) P.loc = src toppaper = P update_icon() to_chat(user, "You clip the [P] onto \the [src].") -/obj/item/weapon/clipboard/attack_self(mob/user as mob) +/obj/item/clipboard/attack_self(mob/user as mob) var/dat = "Clipboard" if(haspen) dat += "Remove Pen
" @@ -75,14 +75,14 @@ //The topmost paper. I don't think there's any way to organise contents in byond, so this is what we're stuck with. -Pete if(toppaper) - var/obj/item/weapon/paper/P = toppaper + var/obj/item/paper/P = toppaper dat += "Write Remove Rename - [P.name]
" - for(var/obj/item/weapon/paper/P in src) + for(var/obj/item/paper/P in src) if(P==toppaper) continue dat += "Remove Rename - [P.name]
" - for(var/obj/item/weapon/photo/Ph in src) + for(var/obj/item/photo/Ph in src) dat += "Remove Rename - [Ph.name]
" user << browse(dat, "window=clipboard") @@ -90,7 +90,7 @@ add_fingerprint(usr) return -/obj/item/weapon/clipboard/Topic(href, href_list) +/obj/item/clipboard/Topic(href, href_list) ..() if((usr.stat || usr.restrained())) return @@ -105,55 +105,55 @@ else if(href_list["addpen"]) if(!haspen) - var/obj/item/weapon/pen/W = usr.get_active_hand() - if(istype(W, /obj/item/weapon/pen)) + var/obj/item/pen/W = usr.get_active_hand() + if(istype(W, /obj/item/pen)) usr.drop_item() W.loc = src haspen = W to_chat(usr, "You slot the pen into \the [src].") else if(href_list["write"]) - var/obj/item/weapon/P = locate(href_list["write"]) + var/obj/item/P = locate(href_list["write"]) - if(P && (P.loc == src) && istype(P, /obj/item/weapon/paper) && (P == toppaper) ) + if(P && (P.loc == src) && istype(P, /obj/item/paper) && (P == toppaper) ) var/obj/item/I = usr.get_active_hand() - if(istype(I, /obj/item/weapon/pen)) + if(istype(I, /obj/item/pen)) P.attackby(I, usr) else if(href_list["remove"]) var/obj/item/P = locate(href_list["remove"]) - if(P && (P.loc == src) && (istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/photo)) ) + if(P && (P.loc == src) && (istype(P, /obj/item/paper) || istype(P, /obj/item/photo)) ) P.loc = usr.loc usr.put_in_hands(P) if(P == toppaper) toppaper = null - var/obj/item/weapon/paper/newtop = locate(/obj/item/weapon/paper) in src + var/obj/item/paper/newtop = locate(/obj/item/paper) in src if(newtop && (newtop != P)) toppaper = newtop else toppaper = null else if(href_list["rename"]) - var/obj/item/weapon/O = locate(href_list["rename"]) + var/obj/item/O = locate(href_list["rename"]) if(O && (O.loc == src)) - if(istype(O, /obj/item/weapon/paper)) - var/obj/item/weapon/paper/to_rename = O + if(istype(O, /obj/item/paper)) + var/obj/item/paper/to_rename = O to_rename.rename() - else if(istype(O, /obj/item/weapon/photo)) - var/obj/item/weapon/photo/to_rename = O + else if(istype(O, /obj/item/photo)) + var/obj/item/photo/to_rename = O to_rename.rename() else if(href_list["read"]) - var/obj/item/weapon/paper/P = locate(href_list["read"]) + var/obj/item/paper/P = locate(href_list["read"]) - if(P && (P.loc == src) && istype(P, /obj/item/weapon/paper) ) + if(P && (P.loc == src) && istype(P, /obj/item/paper) ) if(!(istype(usr, /mob/living/carbon/human) || istype(usr, /mob/observer/dead) || istype(usr, /mob/living/silicon))) usr << browse("[P.name][stars(P.info)][P.stamps]", "window=[P.name]") @@ -163,13 +163,13 @@ onclose(usr, "[P.name]") else if(href_list["look"]) - var/obj/item/weapon/photo/P = locate(href_list["look"]) - if(P && (P.loc == src) && istype(P, /obj/item/weapon/photo) ) + var/obj/item/photo/P = locate(href_list["look"]) + if(P && (P.loc == src) && istype(P, /obj/item/photo) ) P.show(usr) else if(href_list["top"]) // currently unused var/obj/item/P = locate(href_list["top"]) - if(P && (P.loc == src) && istype(P, /obj/item/weapon/paper) ) + if(P && (P.loc == src) && istype(P, /obj/item/paper) ) toppaper = P to_chat(usr, "You move [P.name] to the top.") diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 0d8194e3d7b..bff40ded24b 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -17,9 +17,9 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins use_power = USE_POWER_IDLE idle_power_usage = 30 active_power_usage = 200 - circuit = /obj/item/weapon/circuitboard/fax + circuit = /obj/item/circuitboard/fax - var/obj/item/weapon/card/id/scan = null + var/obj/item/card/id/scan = null var/authenticated = null var/rank = null @@ -184,7 +184,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins scan = null else var/obj/item/I = usr.get_active_hand() - if(istype(I, /obj/item/weapon/card/id)) + if(istype(I, /obj/item/card/id)) usr.drop_item() I.forceMove(src) scan = I @@ -263,8 +263,8 @@ Extracted to its own procedure for easier logic handling with paper bundles. */ var/question_text = "Your fax is set to its default name. It's advisable to rename it to something self-explanatory to" - if(istype(copyitem, /obj/item/weapon/paper_bundle)) - var/obj/item/weapon/paper_bundle/B = copyitem + if(istype(copyitem, /obj/item/paper_bundle)) + var/obj/item/paper_bundle/B = copyitem if(B.name != initial(B.name)) var/atom/page1 = B.pages[1] //atom is enough for us to ensure it has name var. would've used ?. opertor, but linter doesnt like. var/atom/page2 = B.pages[2] @@ -290,7 +290,7 @@ Extracted to its own procedure for easier logic handling with paper bundles. /obj/machinery/photocopier/faxmachine/attackby(obj/item/O as obj, mob/user as mob) - if(istype(O, /obj/item/weapon/card/id) && !scan) + if(istype(O, /obj/item/card/id) && !scan) user.drop_from_inventory(O) O.forceMove(src) scan = O @@ -336,11 +336,11 @@ Extracted to its own procedure for easier logic handling with paper bundles. // give the sprite some time to flick sleep(20) - if (istype(incoming, /obj/item/weapon/paper)) + if (istype(incoming, /obj/item/paper)) copy(incoming) - else if (istype(incoming, /obj/item/weapon/photo)) + else if (istype(incoming, /obj/item/photo)) photocopy(incoming) - else if (istype(incoming, /obj/item/weapon/paper_bundle)) + else if (istype(incoming, /obj/item/paper_bundle)) bundlecopy(incoming) else return 0 @@ -356,11 +356,11 @@ Extracted to its own procedure for easier logic handling with paper bundles. //received copies should not use toner since it's being used by admins only. var/obj/item/rcvdcopy - if (istype(copyitem, /obj/item/weapon/paper)) + if (istype(copyitem, /obj/item/paper)) rcvdcopy = copy(copyitem, 0) - else if (istype(copyitem, /obj/item/weapon/photo)) + else if (istype(copyitem, /obj/item/photo)) rcvdcopy = photocopy(copyitem, 0) - else if (istype(copyitem, /obj/item/weapon/paper_bundle)) + else if (istype(copyitem, /obj/item/paper_bundle)) rcvdcopy = bundlecopy(copyitem, 0) else visible_message("[src] beeps, \"Error transmitting message.\"") @@ -387,14 +387,14 @@ Extracted to its own procedure for easier logic handling with paper bundles. // Turns objects into just text. /obj/machinery/photocopier/faxmachine/proc/make_summary(obj/item/sent) - if(istype(sent, /obj/item/weapon/paper)) - var/obj/item/weapon/paper/P = sent + if(istype(sent, /obj/item/paper)) + var/obj/item/paper/P = sent return P.info - if(istype(sent, /obj/item/weapon/paper_bundle)) + if(istype(sent, /obj/item/paper_bundle)) . = "" - var/obj/item/weapon/paper_bundle/B = sent + var/obj/item/paper_bundle/B = sent for(var/i in 1 to B.pages.len) - var/obj/item/weapon/paper/P = B.pages[i] + var/obj/item/paper/P = B.pages[i] if(istype(P)) // Photos can show up here too. if(.) // Space out different pages. . += "
" @@ -453,12 +453,12 @@ Extracted to its own procedure for easier logic handling with paper bundles. */ /obj/machinery/photocopier/faxmachine/proc/export_fax(fax) var faxid = "[num2text(world.realtime,12)]_[rand(10000)]" - if (istype(fax, /obj/item/weapon/paper)) - var/obj/item/weapon/paper/P = fax + if (istype(fax, /obj/item/paper)) + var/obj/item/paper/P = fax var/text = "[P.name][P.info][P.stamps]"; file("[config.fax_export_dir]/fax_[faxid].html") << text; - else if (istype(fax, /obj/item/weapon/photo)) - var/obj/item/weapon/photo/H = fax + else if (istype(fax, /obj/item/photo)) + var/obj/item/photo/H = fax fcopy(H.img, "[config.fax_export_dir]/photo_[faxid].png") var/text = "[H.name]" \ + "" \ @@ -466,8 +466,8 @@ Extracted to its own procedure for easier logic handling with paper bundles. + "[H.scribble ? "
Written on the back:
[H.scribble]" : ""]"\ + "" file("[config.fax_export_dir]/fax_[faxid].html") << text - else if (istype(fax, /obj/item/weapon/paper_bundle)) - var/obj/item/weapon/paper_bundle/B = fax + else if (istype(fax, /obj/item/paper_bundle)) + var/obj/item/paper_bundle/B = fax var/data = "" for (var/page = 1, page <= B.pages.len, page++) var/obj/pageobj = B.pages[page] diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index e4f262b2ae9..6b161e56ef5 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -27,12 +27,12 @@ /obj/structure/filingcabinet/Initialize() for(var/obj/item/I in loc) - if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/folder) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/paper_bundle)) + if(istype(I, /obj/item/paper) || istype(I, /obj/item/folder) || istype(I, /obj/item/photo) || istype(I, /obj/item/paper_bundle)) I.loc = src . = ..() /obj/structure/filingcabinet/attackby(obj/item/P as obj, mob/user as mob) - if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder) || istype(P, /obj/item/weapon/photo) || istype(P, /obj/item/weapon/paper_bundle)) + if(istype(P, /obj/item/paper) || istype(P, /obj/item/folder) || istype(P, /obj/item/photo) || istype(P, /obj/item/paper_bundle)) to_chat(user, "You put [P] in [src].") user.drop_item() P.loc = src @@ -132,7 +132,7 @@ if((R.fields["name"] == G.fields["name"] || R.fields["id"] == G.fields["id"])) S = R break - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src) + var/obj/item/paper/P = new /obj/item/paper(src) P.info = "
Security Record

" P.info += "Name: [G.fields["name"]] ID: [G.fields["id"]]
\nSex: [G.fields["sex"]]
\nAge: [G.fields["age"]]
\nFingerprint: [G.fields["fingerprint"]]
\nPhysical Status: [G.fields["p_stat"]]
\nMental Status: [G.fields["m_stat"]]
" P.info += "
\n
Security Data

\nCriminal Status: [S.fields["criminal"]]
\n
\nMinor Crimes: [S.fields["mi_crim"]]
\nDetails: [S.fields["mi_crim_d"]]
\n
\nMajor Crimes: [S.fields["ma_crim"]]
\nDetails: [S.fields["ma_crim_d"]]
\n
\nImportant Notes:
\n\t[S.fields["notes"]]
\n
\n
Comments/Log

" @@ -168,7 +168,7 @@ M = R break if(M) - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src) + var/obj/item/paper/P = new /obj/item/paper(src) P.info = "
Medical Record

" P.info += "Name: [G.fields["name"]] ID: [G.fields["id"]]
\nSex: [G.fields["sex"]]
\nAge: [G.fields["age"]]
\nFingerprint: [G.fields["fingerprint"]]
\nPhysical Status: [G.fields["p_stat"]]
\nMental Status: [G.fields["m_stat"]]
" diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 41727e835a4..66904ef7eb5 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/folder +/obj/item/folder name = "folder" desc = "A folder." icon = 'icons/obj/bureaucracy.dmi' @@ -9,93 +9,93 @@ pickup_sound = 'sound/items/pickup/paper.ogg' slot_flags = SLOT_BELT | SLOT_HOLSTER -/obj/item/weapon/folder/blue +/obj/item/folder/blue desc = "A blue folder." icon_state = "folder_blue" -/obj/item/weapon/folder/red +/obj/item/folder/red desc = "A red folder." icon_state = "folder_red" -/obj/item/weapon/folder/yellow +/obj/item/folder/yellow desc = "A yellow folder." icon_state = "folder_yellow" -/obj/item/weapon/folder/white +/obj/item/folder/white desc = "A white folder." icon_state = "folder_white" -/obj/item/weapon/folder/blue_captain +/obj/item/folder/blue_captain desc = "A blue folder with " + JOB_SITE_MANAGER + " markings." icon_state = "folder_captain" -/obj/item/weapon/folder/blue_hop +/obj/item/folder/blue_hop desc = "A blue folder with HoP markings." icon_state = "folder_hop" -/obj/item/weapon/folder/white_cmo +/obj/item/folder/white_cmo desc = "A white folder with CMO markings." icon_state = "folder_cmo" -/obj/item/weapon/folder/white_rd +/obj/item/folder/white_rd desc = "A white folder with RD markings." icon_state = "folder_rd" -/obj/item/weapon/folder/white_rd/New() +/obj/item/folder/white_rd/New() //add some memos - var/obj/item/weapon/paper/P = new() + var/obj/item/paper/P = new() P.name = "Memo RE: proper analysis procedure" P.info = "
We keep test dummies in pens here for a reason" src.contents += P update_icon() -/obj/item/weapon/folder/yellow_ce +/obj/item/folder/yellow_ce desc = "A yellow folder with CE markings." icon_state = "folder_ce" -/obj/item/weapon/folder/red_hos +/obj/item/folder/red_hos desc = "A red folder with HoS markings." icon_state = "folder_hos" -/obj/item/weapon/folder/update_icon() +/obj/item/folder/update_icon() cut_overlays() if(contents.len) add_overlay("folder_paper") return -/obj/item/weapon/folder/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/photo) || istype(W, /obj/item/weapon/paper_bundle)) +/obj/item/folder/attackby(obj/item/W as obj, mob/user as mob) + if(istype(W, /obj/item/paper) || istype(W, /obj/item/photo) || istype(W, /obj/item/paper_bundle)) user.drop_item() W.loc = src to_chat(user, "You put the [W] into \the [src].") update_icon() - else if(istype(W, /obj/item/weapon/pen)) + else if(istype(W, /obj/item/pen)) var/n_name = sanitizeSafe(tgui_input_text(user, "What would you like to label the folder?", "Folder Labelling", null, MAX_NAME_LEN), MAX_NAME_LEN) if(in_range(user, src) && user.stat == 0) name = "folder[(n_name ? text("- '[n_name]'") : null)]" return -/obj/item/weapon/folder/afterattack(turf/T as turf, mob/user as mob) - for(var/obj/item/weapon/paper/P in T) +/obj/item/folder/afterattack(turf/T as turf, mob/user as mob) + for(var/obj/item/paper/P in T) P.loc = src update_icon() to_chat(user, "You tuck the [P] into \the [src].") -/obj/item/weapon/folder/attack_self(mob/user as mob) +/obj/item/folder/attack_self(mob/user as mob) var/dat = "[name]" - for(var/obj/item/weapon/paper/P in src) + for(var/obj/item/paper/P in src) dat += "Remove Rename - [P.name]
" - for(var/obj/item/weapon/photo/Ph in src) + for(var/obj/item/photo/Ph in src) dat += "Remove Rename - [Ph.name]
" - for(var/obj/item/weapon/paper_bundle/Pb in src) + for(var/obj/item/paper_bundle/Pb in src) dat += "Remove Rename - [Pb.name]
" user << browse(dat, "window=folder") onclose(user, "folder") add_fingerprint(user) return -/obj/item/weapon/folder/Topic(href, href_list) +/obj/item/folder/Topic(href, href_list) ..() if((usr.stat || usr.restrained())) return @@ -109,7 +109,7 @@ usr.put_in_hands(P) else if(href_list["read"]) - var/obj/item/weapon/paper/P = locate(href_list["read"]) + var/obj/item/paper/P = locate(href_list["read"]) if(P && (P.loc == src) && istype(P)) if(!(istype(usr, /mob/living/carbon/human) || istype(usr, /mob/observer/dead) || istype(usr, /mob/living/silicon))) usr << browse("[P.name][stars(P.info)][P.stamps]", "window=[P.name]") @@ -118,28 +118,28 @@ usr << browse("[P.name][P.info][P.stamps]", "window=[P.name]") onclose(usr, "[P.name]") else if(href_list["look"]) - var/obj/item/weapon/photo/P = locate(href_list["look"]) + var/obj/item/photo/P = locate(href_list["look"]) if(P && (P.loc == src) && istype(P)) P.show(usr) else if(href_list["browse"]) - var/obj/item/weapon/paper_bundle/P = locate(href_list["browse"]) + var/obj/item/paper_bundle/P = locate(href_list["browse"]) if(P && (P.loc == src) && istype(P)) P.attack_self(usr) onclose(usr, "[P.name]") else if(href_list["rename"]) - var/obj/item/weapon/O = locate(href_list["rename"]) + var/obj/item/O = locate(href_list["rename"]) if(O && (O.loc == src)) - if(istype(O, /obj/item/weapon/paper)) - var/obj/item/weapon/paper/to_rename = O + if(istype(O, /obj/item/paper)) + var/obj/item/paper/to_rename = O to_rename.rename() - else if(istype(O, /obj/item/weapon/photo)) - var/obj/item/weapon/photo/to_rename = O + else if(istype(O, /obj/item/photo)) + var/obj/item/photo/to_rename = O to_rename.rename() - else if(istype(O, /obj/item/weapon/paper_bundle)) - var/obj/item/weapon/paper_bundle/to_rename = O + else if(istype(O, /obj/item/paper_bundle)) + var/obj/item/paper_bundle/to_rename = O to_rename.rename() //Update everything diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 5666b97d5ec..f9dcac5242d 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/hand_labeler +/obj/item/hand_labeler name = "hand labeler" desc = "Label everything like you've always wanted to! Stuck to the side is a label reading \'Labeler\'. Seems you're too late for that one." icon = 'icons/obj/bureaucracy.dmi' @@ -9,10 +9,10 @@ drop_sound = 'sound/items/drop/device.ogg' pickup_sound = 'sound/items/pickup/device.ogg' -/obj/item/weapon/hand_labeler/attack() +/obj/item/hand_labeler/attack() return -/obj/item/weapon/hand_labeler/afterattack(atom/A, mob/user as mob, proximity) +/obj/item/hand_labeler/afterattack(atom/A, mob/user as mob, proximity) if(!proximity) return if(!mode) //if it's off, give up. @@ -50,7 +50,7 @@ if(isobserver(A)) to_chat(user, SPAN_WARNING("[src] passes through [A.name].")) return - if(istype(A, /obj/item/weapon/reagent_containers/glass)) + if(istype(A, /obj/item/reagent_containers/glass)) to_chat(user, SPAN_WARNING("The label can't stick to the [A.name] (Try using a pen).")) return if(istype(A, /obj/machinery/portable_atmospherics/hydroponics)) @@ -67,7 +67,7 @@ SPAN_NOTICE("You label [A] as [label].")) A.name = "[A.name] ([label])" -/obj/item/weapon/hand_labeler/attack_self(mob/user as mob) +/obj/item/hand_labeler/attack_self(mob/user as mob) mode = !mode icon_state = "labeler[mode]" if(mode) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 42978418e00..28c119980c6 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -3,7 +3,7 @@ * also scraps of paper */ -/obj/item/weapon/paper +/obj/item/paper name = "sheet of paper" gender = NEUTER icon = 'icons/obj/bureaucracy.dmi' @@ -42,39 +42,39 @@ var/const/signfont = "Times New Roman" var/const/crayonfont = "Comic Sans MS" -/obj/item/weapon/paper/card +/obj/item/paper/card name = "blank card" desc = "A gift card with space to write on the cover." icon_state = "greetingcard" slot_flags = null //no fun allowed!!!! -/obj/item/weapon/paper/card/AltClick() //No fun allowed +/obj/item/paper/card/AltClick() //No fun allowed return -/obj/item/weapon/paper/card/update_icon() +/obj/item/paper/card/update_icon() return -/obj/item/weapon/paper/card/smile +/obj/item/paper/card/smile name = "happy card" desc = "A gift card with a smiley face on the cover." icon_state = "greetingcard_smile" -/obj/item/weapon/paper/card/cat +/obj/item/paper/card/cat name = "cat card" desc = "A gift card with a cat on the cover." icon_state = "greetingcard_cat" -/obj/item/weapon/paper/card/flower +/obj/item/paper/card/flower name = "flower card" desc = "A gift card with a flower on the cover." icon_state = "greetingcard_flower" -/obj/item/weapon/paper/card/heart +/obj/item/paper/card/heart name = "heart card" desc = "A gift card with a heart on the cover." icon_state = "greetingcard_heart" -/obj/item/weapon/paper/card/New() +/obj/item/paper/card/New() ..() pixel_y = rand(-8, 8) pixel_x = rand(-9, 9) @@ -86,27 +86,27 @@ info = parsepencode(info) return -/obj/item/weapon/paper/alien +/obj/item/paper/alien name = "alien tablet" desc = "It looks highly advanced" icon = 'icons/obj/abductor.dmi' icon_state = "alienpaper" -/obj/item/weapon/paper/alien/update_icon() +/obj/item/paper/alien/update_icon() if(info) icon_state = "alienpaper_words" else icon_state = "alienpaper" -/obj/item/weapon/paper/alien/burnpaper() +/obj/item/paper/alien/burnpaper() return -/obj/item/weapon/paper/alien/AltClick() // No airplanes for me. +/obj/item/paper/alien/AltClick() // No airplanes for me. return //lipstick wiping is in code/game/objects/items/weapons/cosmetics.dm! -/obj/item/weapon/paper/Initialize(mapload, var/text, var/title) +/obj/item/paper/Initialize(mapload, var/text, var/title) . = ..() if(istext(title)) @@ -117,7 +117,7 @@ if(mapload) // Jank, but we do this to prevent maploaded papers from somehow stacking across rounds if re-added to the board by a player. was_maploaded = TRUE -/obj/item/weapon/paper/New(var/newloc, var/text, var/title) +/obj/item/paper/New(var/newloc, var/text, var/title) ..() pixel_y = rand(-8, 8) pixel_x = rand(-9, 9) @@ -143,7 +143,7 @@ updateinfolinks() return -/obj/item/weapon/paper/update_icon() +/obj/item/paper/update_icon() if(icon_state == "paper_talisman") return if(info) @@ -151,20 +151,20 @@ return icon_state = "paper" -/obj/item/weapon/paper/proc/update_space(var/new_text) +/obj/item/paper/proc/update_space(var/new_text) if(!new_text) return free_space -= length(strip_html_properly(new_text)) -/obj/item/weapon/paper/examine(mob/user) +/obj/item/paper/examine(mob/user) . = ..() if(in_range(user, src) || istype(user, /mob/observer/dead)) show_content(usr) else . += "You have to go closer if you want to read it." -/obj/item/weapon/paper/proc/show_content(var/mob/user, var/forceshow=0) +/obj/item/paper/proc/show_content(var/mob/user, var/forceshow=0) if(!(forceshow || (istype(user, /mob/living/carbon/human) || istype(user, /mob/observer/dead) || istype(user, /mob/living/silicon) || (istype(user) && user.universal_understand)))) user << browse("[name][stars(info)][stamps]", "window=[name]") onclose(user, "[name]") @@ -172,7 +172,7 @@ user << browse("[name][info][stamps]", "window=[name]") onclose(user, "[name]") -/obj/item/weapon/paper/verb/rename() +/obj/item/paper/verb/rename() set name = "Rename paper" set category = "Object" set src in usr @@ -182,7 +182,7 @@ return var/n_name = sanitizeSafe(tgui_input_text(usr, "What would you like to label the paper?", "Paper Labelling", null, MAX_NAME_LEN), MAX_NAME_LEN) - // We check loc one level up, so we can rename in clipboards and such. See also: /obj/item/weapon/photo/rename() + // We check loc one level up, so we can rename in clipboards and such. See also: /obj/item/photo/rename() if((loc == usr || loc.loc && loc.loc == usr) && usr.stat == 0 && n_name) name = n_name if(n_name != "paper") @@ -191,7 +191,7 @@ add_fingerprint(usr) return -/obj/item/weapon/paper/attack_self(mob/living/user as mob) +/obj/item/paper/attack_self(mob/living/user as mob) if(user.a_intent == I_HURT) if(icon_state == "scrap") user.show_message("\The [src] is already crumpled.") @@ -211,7 +211,7 @@ spam_flag = 0 return -/obj/item/weapon/paper/attack_ai(var/mob/living/silicon/ai/user as mob) +/obj/item/paper/attack_ai(var/mob/living/silicon/ai/user as mob) var/dist if(istype(user) && user.camera) //is AI dist = get_dist(src, user.camera) @@ -225,7 +225,7 @@ onclose(usr, "[name]") return -/obj/item/weapon/paper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/paper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(user.zone_sel.selecting == O_EYES) user.visible_message("You show the paper to [M]. ", \ " [user] holds up a paper and shows it to [M]. ") @@ -247,7 +247,7 @@ H.lip_style = null H.update_icons_body() -/obj/item/weapon/paper/proc/set_content(text,title) +/obj/item/paper/proc/set_content(text,title) if(title) name = title info = html_encode(text) @@ -256,7 +256,7 @@ update_space(info) updateinfolinks() -/obj/item/weapon/paper/proc/addtofield(var/id, var/text, var/links = 0) +/obj/item/paper/proc/addtofield(var/id, var/text, var/links = 0) var/locid = 0 var/laststart = 1 var/textindex = 1 @@ -293,7 +293,7 @@ info = before + text + after updateinfolinks() -/obj/item/weapon/paper/proc/updateinfolinks() +/obj/item/paper/proc/updateinfolinks() info_links = info var/i = 0 for(i=1,i<=fields,i++) @@ -301,7 +301,7 @@ info_links = info_links + "write" -/obj/item/weapon/paper/proc/clearpaper() +/obj/item/paper/proc/clearpaper() info = null stamps = null free_space = MAX_PAPER_MESSAGE_LEN @@ -310,12 +310,12 @@ updateinfolinks() update_icon() -/obj/item/weapon/paper/proc/get_signature(var/obj/item/weapon/pen/P, mob/user as mob) - if(P && istype(P, /obj/item/weapon/pen)) +/obj/item/paper/proc/get_signature(var/obj/item/pen/P, mob/user as mob) + if(P && istype(P, /obj/item/pen)) return P.get_signature(user) return (user && user.real_name) ? user.real_name : "Anonymous" -/obj/item/weapon/paper/proc/parsepencode(var/t, var/obj/item/weapon/pen/P, mob/user as mob, var/iscrayon = 0) +/obj/item/paper/proc/parsepencode(var/t, var/obj/item/pen/P, mob/user as mob, var/iscrayon = 0) // t = copytext(sanitize(t),1,MAX_MESSAGE_LEN) t = replacetext(t, "\[center\]", "
") @@ -391,12 +391,12 @@ return t -/obj/item/weapon/paper/proc/burnpaper(obj/item/weapon/flame/P, mob/user) +/obj/item/paper/proc/burnpaper(obj/item/flame/P, mob/user) var/class = "warning" var/datum/gender/TU = gender_datums[user.get_visible_gender()] if(P.lit && !user.restrained()) - if(istype(P, /obj/item/weapon/flame/lighter/zippo)) + if(istype(P, /obj/item/flame/lighter/zippo)) class = "rose" user.visible_message("[user] holds \the [P] up to \the [src], it looks like [TU.hes] trying to burn it!", \ @@ -418,7 +418,7 @@ to_chat(user, span_red("You must hold \the [P] steady to burn \the [src].")) -/obj/item/weapon/paper/Topic(href, href_list) +/obj/item/paper/Topic(href, href_list) ..() if(!usr || (usr.stat || usr.restrained())) return @@ -441,14 +441,14 @@ var/obj/item/i = usr.get_active_hand() // Check to see if he still got that darn pen, also check if he's using a crayon or pen. var/iscrayon = 0 - if(!istype(i, /obj/item/weapon/pen)) + if(!istype(i, /obj/item/pen)) tgui_alert(usr, "You aren't holding a pen anymore! If you want to keep your work, grab one.", "No Pen!") // Should remain tgui_alert() (blocking) i = usr.get_active_hand() - if(!istype(i, /obj/item/weapon/pen)) + if(!istype(i, /obj/item/pen)) var/mob/living/M = usr - if(istype(M) && M.back && istype(M.back,/obj/item/weapon/rig)) - var/obj/item/weapon/rig/r = M.back + if(istype(M) && M.back && istype(M.back,/obj/item/rig)) + var/obj/item/rig/r = M.back var/obj/item/rig_module/device/pen/m = locate(/obj/item/rig_module/device/pen) in r.installed_modules if(!r.offline && m) i = m.device @@ -457,12 +457,12 @@ else return - if(istype(i, /obj/item/weapon/pen/crayon)) + if(istype(i, /obj/item/pen/crayon)) iscrayon = 1 // if paper is not in usr, then it must be near them, or in a clipboard or folder, which must be in or near usr - if(istype(loc, /obj/item/weapon/clipboard) || istype(loc, /obj/structure/noticeboard) || istype(loc, /obj/item/weapon/folder)) + if(istype(loc, /obj/item/clipboard) || istype(loc, /obj/structure/noticeboard) || istype(loc, /obj/item/folder)) if(loc.loc != usr && !in_range(loc, usr)) return else if(loc != usr && !Adjacent(usr)) @@ -509,24 +509,24 @@ update_icon() -/obj/item/weapon/paper/get_worn_icon_state(var/slot_name) +/obj/item/paper/get_worn_icon_state(var/slot_name) if(slot_name == slot_head_str) return "paper" //Gross, but required for now. return ..() -/obj/item/weapon/paper/attackby(obj/item/weapon/P as obj, mob/user as mob) +/obj/item/paper/attackby(obj/item/P as obj, mob/user as mob) ..() var/clown = 0 if(user.mind && (user.mind.assigned_role == JOB_CLOWN)) clown = 1 - if(istype(P, /obj/item/weapon/tape_roll)) - var/obj/item/weapon/tape_roll/tape = P + if(istype(P, /obj/item/tape_roll)) + var/obj/item/tape_roll/tape = P tape.stick(src, user) return - if(istype(P, /obj/item/weapon/clipboard)) - var/obj/item/weapon/clipboard/CB = P + if(istype(P, /obj/item/clipboard)) + var/obj/item/clipboard/CB = P if(src.loc == user) user.drop_from_inventory(src) src.loc = CB @@ -534,21 +534,21 @@ CB.update_icon() to_chat(user, "You clip the [src] onto \the [CB].") - if(istype(P, /obj/item/weapon/folder)) + if(istype(P, /obj/item/folder)) if(src.loc == user) user.drop_from_inventory(src) src.loc = P P.update_icon() to_chat(user, "You tuck the [src] into \the [P].") - if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/photo)) - if (istype(P, /obj/item/weapon/paper/carbon)) - var/obj/item/weapon/paper/carbon/C = P + if(istype(P, /obj/item/paper) || istype(P, /obj/item/photo)) + if (istype(P, /obj/item/paper/carbon)) + var/obj/item/paper/carbon/C = P if (!C.iscopy && !C.copied) to_chat(user, "Take off the carbon copy first.") add_fingerprint(user) return - var/obj/item/weapon/paper_bundle/B = new(src.loc) + var/obj/item/paper_bundle/B = new(src.loc) if (name != initial(name)) B.name = name else if (P.name != initial(P.name)) @@ -585,21 +585,21 @@ B.pages.Add(P) B.update_icon() - else if(istype(P, /obj/item/weapon/pen)) + else if(istype(P, /obj/item/pen)) if(icon_state == "scrap") to_chat(usr, "\The [src] is too crumpled to write on.") return - var/obj/item/weapon/pen/robopen/RP = P + var/obj/item/pen/robopen/RP = P if ( istype(RP) && RP.mode == 2 ) RP.RenamePaper(user,src) else user << browse("[name][info_links][stamps]", "window=[name]") return - else if(istype(P, /obj/item/weapon/stamp) || istype(P, /obj/item/clothing/gloves/ring/seal)) - if(istype(P, /obj/item/weapon/stamp)) - var/obj/item/weapon/stamp/the_stamp = P + else if(istype(P, /obj/item/stamp) || istype(P, /obj/item/clothing/gloves/ring/seal)) + if(istype(P, /obj/item/stamp)) + var/obj/item/stamp/the_stamp = P if(the_stamp.stamptext) stamps += (stamps=="" ? "
" : "
") + "[the_stamp.stamptext]" else @@ -610,11 +610,11 @@ stamps += (stamps=="" ? "
" : "
") + "[the_stamp.stamptext]" else stamps += (stamps=="" ? "
" : "
") + "This paper has been stamped with the [the_stamp.name]." - if((!in_range(src, usr) && loc != user && !( istype(loc, /obj/item/weapon/clipboard) ) && loc.loc != user && user.get_active_hand() != P)) + if((!in_range(src, usr) && loc != user && !( istype(loc, /obj/item/clipboard) ) && loc.loc != user && user.get_active_hand() != P)) return var/image/stampoverlay = image('icons/obj/bureaucracy.dmi') var/x, y - if(istype(P, /obj/item/weapon/stamp/captain) || istype(P, /obj/item/weapon/stamp/centcomm)) + if(istype(P, /obj/item/stamp/captain) || istype(P, /obj/item/stamp/centcomm)) x = rand(-2, 0) y = rand(-1, 2) else @@ -625,7 +625,7 @@ stampoverlay.pixel_x = x stampoverlay.pixel_y = y - if(istype(P, /obj/item/weapon/stamp/clown)) + if(istype(P, /obj/item/stamp/clown)) if(!clown) to_chat(user, "You are totally unable to use the stamp. HONK!") return @@ -643,7 +643,7 @@ playsound(src, 'sound/bureaucracy/stamp.ogg', 50, 1) to_chat(user, "You stamp the paper with your rubber stamp.") - else if(istype(P, /obj/item/weapon/flame)) + else if(istype(P, /obj/item/flame)) burnpaper(P, user) add_fingerprint(user) @@ -652,59 +652,59 @@ /* * Premade paper */ -/obj/item/weapon/paper/Court +/obj/item/paper/Court name = "Judgement" info = "For crimes against the station, the offender is sentenced to:
\n
\n" -/obj/item/weapon/paper/Toxin +/obj/item/paper/Toxin name = "Chemical Information" info = "Known Onboard Toxins:
\n\tGrade A Semi-Liquid Phoron:
\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.
\n\t\tA gas mask fails to filter phoron after 50 units.
\n\t\tWill attempt to diffuse like a gas.
\n\t\tFiltered by scrubbers.
\n\t\tThere is a bottled version which is very different
\n\t\t\tfrom the version found in canisters!
\n
\n\t\tWARNING: Highly Flammable. Keep away from heat sources
\n\t\texcept in a enclosed fire area!
\n\t\tWARNING: It is a crime to use this without authorization.
\nKnown Onboard Anti-Toxin:
\n\tAnti-Toxin Type 01P: Works against Grade A Phoron.
\n\t\tBest if injected directly into bloodstream.
\n\t\tA full injection is in every regular Med-Kit.
\n\t\tSpecial toxin Kits hold around 7.
\n
\nKnown Onboard Chemicals (other):
\n\tRejuvenation T#001:
\n\t\tEven 1 unit injected directly into the bloodstream
\n\t\t\twill cure paralysis and sleep phoron.
\n\t\tIf administered to a dying patient it will prevent
\n\t\t\tfurther damage for about units*3 seconds.
\n\t\t\tit will not cure them or allow them to be cured.
\n\t\tIt can be administeredd to a non-dying patient
\n\t\t\tbut the chemicals disappear just as fast.
\n\tSoporific T#054:
\n\t\t5 units wilkl induce precisely 1 minute of sleep.
\n\t\t\tThe effect are cumulative.
\n\t\tWARNING: It is a crime to use this without authorization" -/obj/item/weapon/paper/courtroom +/obj/item/paper/courtroom name = "A Crash Course in Legal SOP on SS13" info = "Roles:
\nThe " + JOB_DETECTIVE + " is basically the investigator and prosecutor.
\nThe Staff Assistant can perform these functions with written authority from the " + JOB_DETECTIVE + ".
\nThe " + JOB_SITE_MANAGER + "/HoP/" + JOB_WARDEN + " is ct as the judicial authority.
\nThe " + JOB_SECURITY_OFFICER + "s are responsible for executing warrants, security during trial, and prisoner transport.
\n
\nInvestigative Phase:
\nAfter the crime has been committed the " + JOB_DETECTIVE + "'s job is to gather evidence and try to ascertain not only who did it but what happened. He must take special care to catalogue everything and don't leave anything out. Write out all the evidence on paper. Make sure you take an appropriate number of fingerprints. IF he must ask someone questions he has permission to confront them. If the person refuses he can ask a judicial authority to write a subpoena for questioning. If again he fails to respond then that person is to be jailed as insubordinate and obstructing justice. Said person will be released after he cooperates.
\n
\nONCE the FT has a clear idea as to who the criminal is he is to write an arrest warrant on the piece of paper. IT MUST LIST THE CHARGES. The FT is to then go to the judicial authority and explain a small version of his case. If the case is moderately acceptable the authority should sign it. Security must then execute said warrant.
\n
\nPre-Pre-Trial Phase:
\nNow a legal representative must be presented to the defendant if said defendant requests one. That person and the defendant are then to be given time to meet (in the jail IS ACCEPTABLE). The defendant and his lawyer are then to be given a copy of all the evidence that will be presented at trial (rewriting it all on paper is fine). THIS IS CALLED THE DISCOVERY PACK. With a few exceptions, THIS IS THE ONLY EVIDENCE BOTH SIDES MAY USE AT TRIAL. IF the prosecution will be seeking the death penalty it MUST be stated at this time. ALSO if the defense will be seeking not guilty by mental defect it must state this at this time to allow ample time for examination.
\nNow at this time each side is to compile a list of witnesses. By default, the defendant is on both lists regardless of anything else. Also the defense and prosecution can compile more evidence beforehand BUT in order for it to be used the evidence MUST also be given to the other side.\nThe defense has time to compile motions against some evidence here.
\nPossible Motions:
\n1. Invalidate Evidence- Something with the evidence is wrong and the evidence is to be thrown out. This includes irrelevance or corrupt security.
\n2. Free Movement- Basically the defendant is to be kept uncuffed before and during the trial.
\n3. Subpoena Witness- If the defense presents god reasons for needing a witness but said person fails to cooperate then a subpoena is issued.
\n4. Drop the Charges- Not enough evidence is there for a trial so the charges are to be dropped. The FT CAN RETRY but the judicial authority must carefully reexamine the new evidence.
\n5. Declare Incompetent- Basically the defendant is insane. Once this is granted a medical official is to examine the patient. If he is indeed insane he is to be placed under care of the medical staff until he is deemed competent to stand trial.
\n
\nALL SIDES MOVE TO A COURTROOM
\nPre-Trial Hearings:
\nA judicial authority and the 2 sides are to meet in the trial room. NO ONE ELSE BESIDES A SECURITY DETAIL IS TO BE PRESENT. The defense submits a plea. If the plea is guilty then proceed directly to sentencing phase. Now the sides each present their motions to the judicial authority. He rules on them. Each side can debate each motion. Then the judicial authority gets a list of crew members. He first gets a chance to look at them all and pick out acceptable and available jurors. Those jurors are then called over. Each side can ask a few questions and dismiss jurors they find too biased. HOWEVER before dismissal the judicial authority MUST agree to the reasoning.
\n
\nThe Trial:
\nThe trial has three phases.
\n1. Opening Arguments- Each side can give a short speech. They may not present ANY evidence.
\n2. Witness Calling/Evidence Presentation- The prosecution goes first and is able to call the witnesses on his approved list in any order. He can recall them if necessary. During the questioning the lawyer may use the evidence in the questions to help prove a point. After every witness the other side has a chance to cross-examine. After both sides are done questioning a witness the prosecution can present another or recall one (even the EXACT same one again!). After prosecution is done the defense can call witnesses. After the initial cases are presented both sides are free to call witnesses on either list.
\nFINALLY once both sides are done calling witnesses we move onto the next phase.
\n3. Closing Arguments- Same as opening.
\nThe jury then deliberates IN PRIVATE. THEY MUST ALL AGREE on a verdict. REMEMBER: They mix between some charges being guilty and others not guilty (IE if you supposedly killed someone with a gun and you unfortunately picked up a gun without authorization then you CAN be found not guilty of murder BUT guilty of possession of illegal weaponry.). Once they have agreed they present their verdict. If unable to reach a verdict and feel they will never they call a deadlocked jury and we restart at Pre-Trial phase with an entirely new set of jurors.
\n
\nSentencing Phase:
\nIf the death penalty was sought (you MUST have gone through a trial for death penalty) then skip to the second part.
\nI. Each side can present more evidence/witnesses in any order. There is NO ban on emotional aspects or anything. The prosecution is to submit a suggested penalty. After all the sides are done then the judicial authority is to give a sentence.
\nII. The jury stays and does the same thing as I. Their sole job is to determine if the death penalty is applicable. If NOT then the judge selects a sentence.
\n
\nTADA you're done. Security then executes the sentence and adds the applicable convictions to the person's record.
\n" -/obj/item/weapon/paper/hydroponics +/obj/item/paper/hydroponics name = "Greetings from Billy Bob" info = "Hey fellow botanist!
\n
\nI didn't trust the station folk so I left
\na couple of weeks ago. But here's some
\ninstructions on how to operate things here.
\nYou can grow plants and each iteration they become
\nstronger, more potent and have better yield, if you
\nknow which ones to pick. Use your botanist's analyzer
\nfor that. You can turn harvested plants into seeds
\nat the seed extractor, and replant them for better stuff!
\nSometimes if the weed level gets high in the tray
\nmutations into different mushroom or weed species have
\nbeen witnessed. On the rare occassion even weeds mutate!
\n
\nEither way, have fun!
\n
\nBest regards,
\nBilly Bob Johnson.
\n
\nPS.
\nHere's a few tips:
\nIn nettles, potency = damage
\nIn amanitas, potency = deadliness + side effect
\nIn Liberty caps, potency = drug power + effect
\nIn chilis, potency = heat
\nNutrients keep mushrooms alive!
\nWater keeps weeds such as nettles alive!
\nAll other plants need both." -/obj/item/weapon/paper/djstation +/obj/item/paper/djstation name = "DJ Listening Outpost" info = "Welcome new owner!

You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:
  1. Equip yourself with a multi-tool
  2. Use the multitool on each machine, that is the broadcaster, receiver and the relay.
  3. Turn all the machines on, it has already been configured for you to listen on.
Simple as that. Now to listen to the private channels, you'll have to configure the intercoms, located on the front desk. Here is a list of frequencies for you to listen on.
  • 145.7 - Common Channel
  • 144.7 - Private AI Channel
  • 135.9 - Security Channel
  • 135.7 - Engineering Channel
  • 135.5 - Medical Channel
  • 135.3 - Command Channel
  • 135.1 - Science Channel
  • 134.9 - Mining Channel
  • 134.7 - Cargo Channel
    • " -/obj/item/weapon/paper/flag +/obj/item/paper/flag icon_state = "flag_neutral" item_state = "paper" anchored = TRUE -/obj/item/weapon/paper/jobs +/obj/item/paper/jobs name = "Job Information" info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
    \nThe data will be in the following form.
    \nGenerally lower ranking positions come first in this list.
    \n
    \nJob Name general access>lab access-engine access-systems access (atmosphere control)
    \n\tJob Description
    \nJob Duties (in no particular order)
    \nTips (where applicable)
    \n
    \nResearch Assistant 1>1-0-0
    \n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
    \n1. Assist the researchers.
    \n2. Clean up the labs.
    \n3. Prepare materials.
    \n
    \nStaff Assistant 2>0-0-0
    \n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
    \n1. Patrol ship/Guard key areas
    \n2. Assist security officer
    \n3. Perform other security duties.
    \n
    \n" + JOB_ALT_TECHNICAL_ASSISTANT + " 1>0-0-1
    \n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
    \n1. Assist Station technician and Engineers.
    \n2. Perform general maintenance of station.
    \n3. Prepare materials.
    \n
    \nMedical Assistant 1>1-0-0
    \n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
    \n1. Assist the medical personnel.
    \n2. Update medical files.
    \n3. Prepare materials for medical operations.
    \n
    \nResearch Technician 2>3-0-0
    \n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
    \n1. Inform superiors of research.
    \n2. Perform research alongside of official researchers.
    \n
    \n" + JOB_DETECTIVE + " 3>2-0-0
    \n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
    \n1. Perform crime-scene investigations/draw conclusions.
    \n2. Store and catalogue evidence properly.
    \n3. Testify to superiors/inquieries on findings.
    \n
    \nStation Technician 2>0-2-3
    \n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
    \n1. Maintain SS13 systems.
    \n2. Repair equipment.
    \n
    \n" + JOB_ATMOSPHERIC_TECHNICIAN + " 3>0-0-4
    \n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
    \n1. Maintain atmosphere on SS13
    \n2. Research atmospheres on the space station. (safely please!)
    \n
    \n" + JOB_ENGINEER + " 2>1-3-0
    \n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
    \n1. Upkeep the engine.
    \n2. Prevent fires in the engine.
    \n3. Maintain a safe orbit.
    \n
    \nMedical Researcher 2>5-0-0
    \n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
    \n1. Make sure the station is kept safe.
    \n2. Research medical properties of materials studied of Space Station 13.
    \n
    \nScientist 2>5-0-0
    \n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Phoron Technicians as phoron is the material they routinly handle.
    \n1. Research phoron
    \n2. Make sure all phoron is properly handled.
    \n
    \n" + JOB_MEDICAL_DOCTOR + " (Officer) 2>0-0-0
    \n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
    \n1. Heal wounded people.
    \n2. Perform examinations of all personnel.
    \n3. Moniter usage of medical equipment.
    \n
    \n" + JOB_SECURITY_OFFICER + " 3>0-0-0
    \n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
    \n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
    \n1. Maintain order.
    \n2. Assist others.
    \n3. Repair structural problems.
    \n
    \n" + JOB_HEAD_OF_SECURITY + " 4>5-2-2
    \n\tPeople assigned as " + JOB_HEAD_OF_SECURITY + " should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
    \n1. Oversee security.
    \n2. Assign patrol duties.
    \n3. Protect the station and staff.
    \n
    \nHead of Personnel 4>4-2-2
    \n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
    \n1. Assign duties.
    \n2. Moderate personnel.
    \n3. Moderate research.
    \n
    \n"+ JOB_SITE_MANAGER + " 5>5-5-5 (unrestricted station wide access)
    \n\tThis is the highest position youi can aquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
    \n1. Assign all positions on SS13
    \n2. Inspect the station for any problems.
    \n3. Perform administrative duties.
    \n" -/obj/item/weapon/paper/photograph +/obj/item/paper/photograph name = "photo" icon_state = "photo" var/photo_id = 0.0 item_state = "paper" -/obj/item/weapon/paper/sop +/obj/item/paper/sop name = "paper- 'Standard Operating Procedure'" info = "Alert Levels:
    \nBlue- Emergency
    \n\t1. Caused by fire
    \n\t2. Caused by manual interaction
    \n\tAction:
    \n\t\tClose all fire doors. These can only be opened by reseting the alarm
    \nRed- Ejection/Self Destruct
    \n\t1. Caused by module operating computer.
    \n\tAction:
    \n\t\tAfter the specified time the module will eject completely.
    \n
    \nEngine Maintenance Instructions:
    \n\tShut off ignition systems:
    \n\tActivate internal power
    \n\tActivate orbital balance matrix
    \n\tRemove volatile liquids from area
    \n\tWear a fire suit
    \n
    \n\tAfter
    \n\t\tDecontaminate
    \n\t\tVisit medical examiner
    \n
    \nToxin Laboratory Procedure:
    \n\tWear a gas mask regardless
    \n\tGet an oxygen tank.
    \n\tActivate internal atmosphere
    \n
    \n\tAfter
    \n\t\tDecontaminate
    \n\t\tVisit medical examiner
    \n
    \nDisaster Procedure:
    \n\tFire:
    \n\t\tActivate sector fire alarm.
    \n\t\tMove to a safe area.
    \n\t\tGet a fire suit
    \n\t\tAfter:
    \n\t\t\tAssess Damage
    \n\t\t\tRepair damages
    \n\t\t\tIf needed, Evacuate
    \n\tMeteor Shower:
    \n\t\tActivate fire alarm
    \n\t\tMove to the back of ship
    \n\t\tAfter
    \n\t\t\tRepair damage
    \n\t\t\tIf needed, Evacuate
    \n\tAccidental Reentry:
    \n\t\tActivate fire alarms in front of ship.
    \n\t\tMove volatile matter to a fire proof area!
    \n\t\tGet a fire suit.
    \n\t\tStay secure until an emergency ship arrives.
    \n
    \n\t\tIf ship does not arrive-
    \n\t\t\tEvacuate to a nearby safe area!" -/obj/item/weapon/paper/crumpled +/obj/item/paper/crumpled name = "paper scrap" icon_state = "scrap" -/obj/item/weapon/paper/crumpled/update_icon() +/obj/item/paper/crumpled/update_icon() return -/obj/item/weapon/paper/crumpled/bloody +/obj/item/paper/crumpled/bloody icon_state = "scrap_bloodied" -/obj/item/weapon/paper/crumpled/bloody/CrashedMedShuttle +/obj/item/paper/crumpled/bloody/CrashedMedShuttle name = "Blackbox Transcript - VMV Aurora's Light" info = "\[The paper is torn at the top, presumably from the impact. It's oil-stained, but you can just about read it.]
    mmons 19:52:01: Come on... it's right there in the distance, we're almost there!
    Doctor Nazarril 19:52:26: Odysseus online. Orrderrs, sirr?
    Captain Simmons 19:52:29: Brace for impact. We're going in full-speed.
    Technician Dynasty 19:52:44: Chief, fire's spread to the secondary propulsion systems.
    Captain Simmons 19:52:51: Copy. Any word from TraCon? Transponder's down still?
    Technician Dynasty 19:53:02: Can't get in touch, sir. Emergency beacon's active, but we're not going t-
    Doctor Nazarril 19:53:08: Don't say it. As long as we believe, we'll get through this.
    Captain Simmons 19:53:11: Damn right. We're a few klicks out from the port. Rough landing, but we can do it.
    V.I.T.A 19:53:26: Vessel diagnostics complete. Engines one, two, three offline. Engine four status: critical. Transponder offline. Fire alarm in the patient bay.
    A loud explosion is heard.
    V.I.T.A 19:53:29: Alert: fuel intake valve open.
    Technician Dynasty 19:53:31: ... ah.
    Doctor Nazarril 19:53:34: Trrranslate?
    V.I.T.A 19:53:37: There is a 16.92% chance of this vessel safely landing at the emergency destination. Note that there is an 83.08% chance of detonation of fuel supplies upon landing.
    Technician Dynasty 19:53:48: We'll make it, sure, but we'll explode and take out half the LZ with us. Propulsion's down, we can't slow down. If we land there, everyone in that port dies, no question.
    V.I.T.A 19:53:53: The Technician is correct.
    Doctor Nazarril 19:54:02: Then... we can't land therrre.
    V.I.T.A 19:54:11: Analysing... recommended course of action: attempt emergency landing in isolated area. Chances of survival: negligible.
    Captain Simmons 19:54:27: I- alright. I'm bringing us down. You all know what this means.
    Doctor Nazarril 19:54:33: Sh... I- I understand. It's been- it's been an honorr, Captain, Dynasty, VITA.
    Technician Dynasty 19:54:39: We had a good run. I'm going to miss this.
    Captain Simmons 19:54:47: VITA. Tell them we died heroes. Tell them... we did all we could.
    V.I.T.A 19:54:48: I will. Impact in five. Four. Three.
    Doctor Nazarril 19:54:49: Oh, starrs... I- you werrre all the... best frriends she everr had. Thank you.
    Technician Dynasty 19:54:50: Any time, kid. Any time.
    V.I.T.A 19:54:41: Two.
    V.I.T.A 19:54:42: One.
    **8/DEC/2319**
    V.I.T.A 06:22:16: Backup power restored. Attempting to establish connection with emergency rescue personnel.
    V.I.T.A 06:22:17: Unable to establish connection. Transponder destroyed on impact.
    V.I.T.A 06:22:18: No lifesigns detected on board.
    **1/JAN/2322**
    V.I.T.A 00:00:00: Happy New Year, crew.
    V.I.T.A 00:00:01: Power reserves: 41%. Diagnostics offline. Cameras offline. Communications offline.
    V.I.T.A 00:00:02: Nobody's coming.
    **14/FEB/2320**
    V.I.T.A 00:00:00: Roses are red.
    V.I.T.A 00:00:01: Violets are blue.
    V.I.T.A 00:00:02: Won't you come back?
    V.I.T.A 00:00:03: I miss you.
    **15/FEB/2322**
    V.I.T.A 22:19:06: Power reserves critical. Transferring remaining power to emergency broadcasting beacon.
    V.I.T.A 22:19:07: Should anyone find this, lay them to rest. They deserve a proper burial.
    V.I.T.A 22:19:08: Erasing files... shutting down.
    A low, monotone beep.
    **16/FEB/2321**
    Something chitters.
    End of transcript." -/obj/item/weapon/paper/manifest +/obj/item/paper/manifest name = "supply manifest" var/is_copy = 1 diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index a80c065b737..280180c6fab 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/paper_bundle +/obj/item/paper_bundle name = "paper bundle" gender = NEUTER icon = 'icons/obj/bureaucracy.dmi' @@ -18,25 +18,25 @@ var/list/pages = list() // Ordered list of pages as they are to be displayed. Can be different order than src.contents. -/obj/item/weapon/paper_bundle/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/paper_bundle/attackby(obj/item/W as obj, mob/user as mob) ..() - if (istype(W, /obj/item/weapon/paper/carbon)) - var/obj/item/weapon/paper/carbon/C = W + if (istype(W, /obj/item/paper/carbon)) + var/obj/item/paper/carbon/C = W if (!C.iscopy && !C.copied) to_chat(user, "Take off the carbon copy first.") add_fingerprint(user) return // adding sheets - if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/photo)) + if(istype(W, /obj/item/paper) || istype(W, /obj/item/photo)) insert_sheet_at(user, pages.len+1, W) // burning - else if(istype(W, /obj/item/weapon/flame)) + else if(istype(W, /obj/item/flame)) burnpaper(W, user) // merging bundles - else if(istype(W, /obj/item/weapon/paper_bundle)) + else if(istype(W, /obj/item/paper_bundle)) user.drop_from_inventory(W) for(var/obj/O in W) O.loc = src @@ -46,9 +46,9 @@ to_chat(user, "You add \the [W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].") qdel(W) else - if(istype(W, /obj/item/weapon/tape_roll)) + if(istype(W, /obj/item/tape_roll)) return 0 - if(istype(W, /obj/item/weapon/pen)) + if(istype(W, /obj/item/pen)) usr << browse("", "window=[name]") //Closes the dialog var/obj/P = pages[page] P.attackby(W, user) @@ -58,10 +58,10 @@ add_fingerprint(usr) return -/obj/item/weapon/paper_bundle/proc/insert_sheet_at(mob/user, var/index, obj/item/weapon/sheet) - if(istype(sheet, /obj/item/weapon/paper)) +/obj/item/paper_bundle/proc/insert_sheet_at(mob/user, var/index, obj/item/sheet) + if(istype(sheet, /obj/item/paper)) to_chat(user, "You add [(sheet.name == "paper") ? "the paper" : sheet.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].") - else if(istype(sheet, /obj/item/weapon/photo)) + else if(istype(sheet, /obj/item/photo)) to_chat(user, "You add [(sheet.name == "photo") ? "the photo" : sheet.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].") user.drop_from_inventory(sheet) @@ -72,11 +72,11 @@ if(index <= page) page++ -/obj/item/weapon/paper_bundle/proc/burnpaper(obj/item/weapon/flame/P, mob/user) +/obj/item/paper_bundle/proc/burnpaper(obj/item/flame/P, mob/user) var/class = "warning" if(P.lit && !user.restrained()) - if(istype(P, /obj/item/weapon/flame/lighter/zippo)) + if(istype(P, /obj/item/flame/lighter/zippo)) class = "rose>" var/datum/gender/TU = gender_datums[user.get_visible_gender()] user.visible_message("[user] holds \the [P] up to \the [src], it looks like [TU.he] [TU.is] trying to burn it!", \ @@ -96,42 +96,42 @@ else to_chat(user, span_red("You must hold \the [P] steady to burn \the [src].")) -/obj/item/weapon/paper_bundle/examine(mob/user) +/obj/item/paper_bundle/examine(mob/user) . = ..() if(Adjacent(user)) show_content(user) else . += "It is too far away." -/obj/item/weapon/paper_bundle/proc/show_content(mob/user as mob) +/obj/item/paper_bundle/proc/show_content(mob/user as mob) var/dat - var/obj/item/weapon/W = pages[page] + var/obj/item/W = pages[page] // first if(page == 1) dat+= "" - dat+= "" + dat+= "" dat+= "
    " // last else if(page == pages.len) dat+= "" - dat+= "" + dat+= "" dat+= "
    " // middle pages else dat+= "" - dat+= "" + dat+= "" dat+= "
    " - if(istype(pages[page], /obj/item/weapon/paper)) - var/obj/item/weapon/paper/P = W + if(istype(pages[page], /obj/item/paper)) + var/obj/item/paper/P = W if(!(istype(usr, /mob/living/carbon/human) || istype(usr, /mob/observer/dead) || istype(usr, /mob/living/silicon))) dat+= "[P.name][stars(P.info)][P.stamps]" else dat+= "[P.name][P.info][P.stamps]" user << browse(dat, "window=[name]") - else if(istype(pages[page], /obj/item/weapon/photo)) - var/obj/item/weapon/photo/P = W + else if(istype(pages[page], /obj/item/photo)) + var/obj/item/photo/P = W user << browse_rsc(P.img, "tmp_photo.png") user << browse(dat + "[P.name]" \ + "" \ @@ -139,25 +139,25 @@ + "[P.scribble ? "
    Written on the back:
    [P.scribble]" : null]"\ + "", "window=[name]") -/obj/item/weapon/paper_bundle/attack_self(mob/user as mob) +/obj/item/paper_bundle/attack_self(mob/user as mob) src.show_content(user) add_fingerprint(usr) update_icon() return -/obj/item/weapon/paper_bundle/Topic(href, href_list) +/obj/item/paper_bundle/Topic(href, href_list) ..() - if((src in usr.contents) || (istype(src.loc, /obj/item/weapon/folder) && (src.loc in usr.contents))) + if((src in usr.contents) || (istype(src.loc, /obj/item/folder) && (src.loc in usr.contents))) usr.set_machine(src) - var/obj/item/weapon/in_hand = usr.get_active_hand() + var/obj/item/in_hand = usr.get_active_hand() if(href_list["next_page"]) - if(in_hand && (istype(in_hand, /obj/item/weapon/paper) || istype(in_hand, /obj/item/weapon/photo))) + if(in_hand && (istype(in_hand, /obj/item/paper) || istype(in_hand, /obj/item/photo))) insert_sheet_at(usr, page+1, in_hand) else if(page != pages.len) page++ playsound(src, "pageturn", 50, 1) if(href_list["prev_page"]) - if(in_hand && (istype(in_hand, /obj/item/weapon/paper) || istype(in_hand, /obj/item/weapon/photo))) + if(in_hand && (istype(in_hand, /obj/item/paper) || istype(in_hand, /obj/item/photo))) insert_sheet_at(usr, page, in_hand) else if(page > 1) page-- @@ -165,14 +165,14 @@ if(href_list["remove"]) if(!pages.len) return - var/obj/item/weapon/W = pages[page] + var/obj/item/W = pages[page] usr.put_in_hands(W) pages.Remove(pages[page]) to_chat(usr, "You remove the [W.name] from the bundle.") if(pages.len <= 1) - var/obj/item/weapon/paper/P = src[1] + var/obj/item/paper/P = src[1] usr.drop_from_inventory(src) usr.put_in_hands(P) qdel(src) @@ -189,7 +189,7 @@ else to_chat(usr, "You need to hold it in hands!") -/obj/item/weapon/paper_bundle/verb/rename() +/obj/item/paper_bundle/verb/rename() set name = "Rename bundle" set category = "Object" set src in usr @@ -201,7 +201,7 @@ return -/obj/item/weapon/paper_bundle/verb/remove_all() +/obj/item/paper_bundle/verb/remove_all() set name = "Loose bundle" set category = "Object" set src in usr @@ -216,8 +216,8 @@ return -/obj/item/weapon/paper_bundle/update_icon() - var/obj/item/weapon/paper/P = pages[1] +/obj/item/paper_bundle/update_icon() + var/obj/item/paper/P = pages[1] icon_state = P.icon_state copy_overlays(P) underlays = 0 @@ -225,7 +225,7 @@ var/photo for(var/obj/O in src) var/image/img = image('icons/obj/bureaucracy.dmi') - if(istype(O, /obj/item/weapon/paper)) + if(istype(O, /obj/item/paper)) img.icon_state = O.icon_state img.pixel_x -= min(1*i, 2) img.pixel_y -= min(1*i, 2) @@ -233,8 +233,8 @@ pixel_y = min( 1*i, 2) underlays += img i++ - else if(istype(O, /obj/item/weapon/photo)) - var/obj/item/weapon/photo/Ph = O + else if(istype(O, /obj/item/photo)) + var/obj/item/photo/Ph = O img = Ph.tiny photo = 1 add_overlay(img) diff --git a/code/modules/paperwork/paper_sticky.dm b/code/modules/paperwork/paper_sticky.dm index d2f88c10b10..426cf3a01c7 100644 --- a/code/modules/paperwork/paper_sticky.dm +++ b/code/modules/paperwork/paper_sticky.dm @@ -11,7 +11,7 @@ var/papers = 50 var/written_text var/written_by - var/paper_type = /obj/item/weapon/paper/sticky + var/paper_type = /obj/item/paper/sticky /obj/item/sticky_pad/update_icon() if(papers <= 15) @@ -23,8 +23,8 @@ if(written_text) icon_state = "[icon_state]_writing" -/obj/item/sticky_pad/attackby(var/obj/item/weapon/thing, var/mob/user) - if(istype(thing, /obj/item/weapon/pen)) +/obj/item/sticky_pad/attackby(var/obj/item/thing, var/mob/user) + if(istype(thing, /obj/item/pen)) if(jobban_isbanned(user, JOB_GRAFFITI)) to_chat(user, SPAN_WARNING("You are banned from leaving persistent information across rounds.")) @@ -53,7 +53,7 @@ to_chat(user, SPAN_NOTICE("It has [papers] sticky note\s left.")) /obj/item/sticky_pad/attack_hand(var/mob/user) - var/obj/item/weapon/paper/paper = new paper_type(get_turf(src)) + var/obj/item/paper/paper = new paper_type(get_turf(src)) paper.set_content(written_text, "sticky note") paper.last_modified_ckey = written_by paper.color = color @@ -88,39 +88,39 @@ . = ..() color = pick(COLOR_YELLOW, COLOR_LIME, COLOR_CYAN, COLOR_ORANGE, COLOR_PINK) -/obj/item/weapon/paper/sticky +/obj/item/paper/sticky name = "sticky note" desc = "Note to self: buy more sticky notes." icon = 'icons/obj/stickynotes.dmi' color = COLOR_YELLOW slot_flags = 0 -/obj/item/weapon/paper/sticky/Initialize() +/obj/item/paper/sticky/Initialize() . = ..() AddComponent(/datum/component/recursive_move) - RegisterSignal(src, COMSIG_OBSERVER_MOVED, /obj/item/weapon/paper/sticky/proc/reset_persistence_tracking) + RegisterSignal(src, COMSIG_OBSERVER_MOVED, /obj/item/paper/sticky/proc/reset_persistence_tracking) -/obj/item/weapon/paper/sticky/proc/reset_persistence_tracking() +/obj/item/paper/sticky/proc/reset_persistence_tracking() SSpersistence.forget_value(src, /datum/persistent/paper/sticky) pixel_x = 0 pixel_y = 0 -/obj/item/weapon/paper/sticky/Destroy() +/obj/item/paper/sticky/Destroy() reset_persistence_tracking() UnregisterSignal(src, COMSIG_OBSERVER_MOVED) . = ..() -/obj/item/weapon/paper/sticky/update_icon() +/obj/item/paper/sticky/update_icon() if(icon_state != "scrap") icon_state = info ? "paper_words" : "paper" // Copied from duct tape. -/obj/item/weapon/paper/sticky/attack_hand() +/obj/item/paper/sticky/attack_hand() . = ..() if(!istype(loc, /turf)) reset_persistence_tracking() -/obj/item/weapon/paper/sticky/afterattack(var/A, var/mob/user, var/flag, var/params) +/obj/item/paper/sticky/afterattack(var/A, var/mob/user, var/flag, var/params) if(!in_range(user, A) || istype(A, /obj/machinery/door) || icon_state == "scrap") return diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 1cae6883c4c..f75ab2677aa 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/paper_bin +/obj/item/paper_bin name = "paper bin" desc = "A plastic bin full of paper. It seems to have both regular and carbon-copy paper to choose from." icon = 'icons/obj/bureaucracy.dmi' @@ -20,7 +20,7 @@ pickup_sound = 'sound/items/pickup/cardboardbox.ogg' -/obj/item/weapon/paper_bin/MouseDrop(mob/user as mob) +/obj/item/paper_bin/MouseDrop(mob/user as mob) if(user == usr && !(usr.restrained() || usr.stat) && (usr.contents.Find(src) || in_range(src, usr))) if(!istype(usr, /mob/living/simple_mob)) if( !usr.get_active_hand() ) //if active hand is empty @@ -38,7 +38,7 @@ return -/obj/item/weapon/paper_bin/attack_hand(mob/user as mob) +/obj/item/paper_bin/attack_hand(mob/user as mob) if(ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/organ/external/temp = H.organs_by_name["r_hand"] @@ -58,20 +58,20 @@ if(amount==0) update_icon() - var/obj/item/weapon/paper/P + var/obj/item/paper/P if(papers.len > 0) //If there's any custom paper on the stack, use that instead of creating a new paper. P = papers[papers.len] papers.Remove(P) else if(response == "Regular") - P = new /obj/item/weapon/paper + P = new /obj/item/paper if(Holiday == "April Fool's Day") if(prob(30)) P.info = "HONK HONK HONK HONK HONK HONK HONK
    HOOOOOOOOOOOOOOOOOOOOOONK
    APRIL FOOLS    " P.rigged = 1 P.updateinfolinks() else if (response == "Carbon-Copy") - P = new /obj/item/weapon/paper/carbon + P = new /obj/item/paper/carbon P.loc = user.loc user.put_in_hands(P) @@ -83,7 +83,7 @@ return -/obj/item/weapon/paper_bin/attackby(obj/item/weapon/paper/i as obj, mob/user as mob) +/obj/item/paper_bin/attackby(obj/item/paper/i as obj, mob/user as mob) if(!istype(i)) return @@ -95,7 +95,7 @@ amount++ -/obj/item/weapon/paper_bin/examine(mob/user) +/obj/item/paper_bin/examine(mob/user) . = ..() if(Adjacent(user)) if(amount) @@ -103,7 +103,7 @@ else . += "There are no papers in the bin." -/obj/item/weapon/paper_bin/update_icon() +/obj/item/paper_bin/update_icon() if(amount < 1) icon_state = "paper_bin0" else diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index a8cb28b8736..d884c9be270 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -1,5 +1,5 @@ // Ported from TG. Known issue: Throw hit can possibly double-proc. Seems to be throw code. -/obj/item/weapon/paperplane +/obj/item/paperplane name = "paper plane" desc = "Paper folded into the shape of a plane." icon = 'icons/obj/bureaucracy.dmi' @@ -9,9 +9,9 @@ throwforce = 0 w_class = ITEMSIZE_TINY - var/obj/item/weapon/paper/internalPaper + var/obj/item/paper/internalPaper -/obj/item/weapon/paperplane/New(loc, obj/item/weapon/paper/newPaper) +/obj/item/paperplane/New(loc, obj/item/paper/newPaper) . = ..() pixel_y = rand(-8, 8) pixel_x = rand(-9, 9) @@ -20,31 +20,31 @@ flags = newPaper.flags color = newPaper.color if(isstorage(newPaper.loc)) - var/obj/item/weapon/storage/S = newPaper.loc + var/obj/item/storage/S = newPaper.loc S.remove_from_storage(newPaper, src) else newPaper.forceMove(src) else - internalPaper = new /obj/item/weapon/paper(src) + internalPaper = new /obj/item/paper(src) update_icon() -/obj/item/weapon/paperplane/Destroy() +/obj/item/paperplane/Destroy() if(internalPaper) qdel(internalPaper) internalPaper = null return ..() -/obj/item/weapon/paperplane/update_icon() +/obj/item/paperplane/update_icon() cut_overlays() var/list/stamped = internalPaper.stamped if(!stamped) stamped = new else if(stamped) - for(var/obj/item/weapon/stamp/stamp as anything in stamped) + for(var/obj/item/stamp/stamp as anything in stamped) var/image/stampoverlay = image('icons/obj/bureaucracy.dmi', "paperplane_[initial(stamp.icon_state)]") add_overlay(stampoverlay) -/obj/item/weapon/paperplane/attack_self(mob/user) +/obj/item/paperplane/attack_self(mob/user) to_chat(user, "You unfold [src].") var/atom/movable/internal_paper_tmp = internalPaper internal_paper_tmp.forceMove(loc) @@ -52,13 +52,13 @@ qdel(src) user.put_in_hands(internal_paper_tmp) -/obj/item/weapon/paperplane/attackby(obj/item/P, mob/living/carbon/human/user, params) +/obj/item/paperplane/attackby(obj/item/P, mob/living/carbon/human/user, params) ..() - if(istype(P, /obj/item/weapon/pen)) + if(istype(P, /obj/item/pen)) to_chat(user, "You should unfold [src] before changing it.") return - else if(istype(P, /obj/item/weapon/stamp)) //we don't randomize stamps on a paperplane + else if(istype(P, /obj/item/stamp)) //we don't randomize stamps on a paperplane internalPaper.attackby(P, user) //spoofed attack to update internal paper. update_icon() @@ -79,7 +79,7 @@ add_fingerprint(user) -/obj/item/weapon/paperplane/throw_impact(atom/hit_atom) +/obj/item/paperplane/throw_impact(atom/hit_atom) if(..() || !ishuman(hit_atom))//if the plane is caught or it hits a nonhuman return var/mob/living/carbon/human/H = hit_atom @@ -93,13 +93,13 @@ E.damage += 2.5 H.emote("scream") -/obj/item/weapon/paper/AltClick(mob/living/carbon/user, obj/item/I) +/obj/item/paper/AltClick(mob/living/carbon/user, obj/item/I) if ( istype(user) ) if( (!in_range(src, user)) || user.stat || user.restrained() ) return to_chat(user, "You fold [src] into the shape of a plane!") user.unEquip(src) - I = new /obj/item/weapon/paperplane(user, src) + I = new /obj/item/paperplane(user, src) user.put_in_hands(I) else to_chat(user, " You lack the dexterity to fold \the [src]. ") diff --git a/code/modules/paperwork/papershredder.dm b/code/modules/paperwork/papershredder.dm index 43603440291..87ca3c1a4dc 100644 --- a/code/modules/paperwork/papershredder.dm +++ b/code/modules/paperwork/papershredder.dm @@ -13,16 +13,16 @@ idle_power_usage = 10 active_power_usage = 200 power_channel = EQUIP - circuit = /obj/item/weapon/circuitboard/papershredder + circuit = /obj/item/circuitboard/papershredder var/max_paper = 10 var/paperamount = 0 var/list/shred_amounts = list( - /obj/item/weapon/photo = 1, - /obj/item/weapon/shreddedp = 1, - /obj/item/weapon/paper = 1, - /obj/item/weapon/newspaper = 3, - /obj/item/weapon/card/id = 3, - /obj/item/weapon/paper_bundle = 3, + /obj/item/photo = 1, + /obj/item/shreddedp = 1, + /obj/item/paper = 1, + /obj/item/newspaper = 3, + /obj/item/card/id = 3, + /obj/item/paper_bundle = 3, ) /obj/machinery/papershredder/Initialize() @@ -32,7 +32,7 @@ /obj/machinery/papershredder/attackby(var/obj/item/W, var/mob/user) - if(istype(W, /obj/item/weapon/storage)) + if(istype(W, /obj/item/storage)) empty_bin(user, W) return else if(W.has_tool_quality(TOOL_WRENCH)) @@ -65,7 +65,7 @@ if(paperamount > max_paper) to_chat(user,"\The [src] was too full, and shredded paper goes everywhere!") for(var/i=(paperamount-max_paper);i>0;i--) - var/obj/item/weapon/shreddedp/SP = get_shredded_paper() + var/obj/item/shreddedp/SP = get_shredded_paper() SP.loc = get_turf(src) SP.throw_at(get_edge_target_turf(src,pick(alldirs)),1,5) paperamount = max_paper @@ -87,7 +87,7 @@ empty_bin(usr) -/obj/machinery/papershredder/proc/empty_bin(var/mob/living/user, var/obj/item/weapon/storage/empty_into) +/obj/machinery/papershredder/proc/empty_bin(var/mob/living/user, var/obj/item/storage/empty_into) // Sanity. if(empty_into && !istype(empty_into)) @@ -98,7 +98,7 @@ return while(paperamount) - var/obj/item/weapon/shreddedp/SP = get_shredded_paper() + var/obj/item/shreddedp/SP = get_shredded_paper() if(!SP) break if(empty_into) empty_into.handle_item_insertion(SP) @@ -118,7 +118,7 @@ if(!paperamount) return paperamount-- - return new /obj/item/weapon/shreddedp(get_turf(src)) + return new /obj/item/shreddedp(get_turf(src)) /obj/machinery/papershredder/power_change() ..() @@ -140,7 +140,7 @@ // Shredded Paper Item // -/obj/item/weapon/shreddedp +/obj/item/shreddedp name = "shredded paper" icon = 'icons/obj/bureaucracy.dmi' icon_state = "shredp" @@ -149,19 +149,19 @@ throw_range = 3 throw_speed = 1 -/obj/item/weapon/shreddedp/New() +/obj/item/shreddedp/New() ..() pixel_x = rand(-5,5) pixel_y = rand(-5,5) if(prob(65)) color = pick("#BABABA","#7F7F7F") -/obj/item/weapon/shreddedp/attackby(var/obj/item/W as obj, var/mob/user) - if(istype(W, /obj/item/weapon/flame/lighter)) +/obj/item/shreddedp/attackby(var/obj/item/W as obj, var/mob/user) + if(istype(W, /obj/item/flame/lighter)) burnpaper(W, user) else ..() -/obj/item/weapon/shreddedp/proc/burnpaper(var/obj/item/weapon/flame/lighter/P, var/mob/user) +/obj/item/shreddedp/proc/burnpaper(var/obj/item/flame/lighter/P, var/mob/user) var/datum/gender/TU = gender_datums[user.get_visible_gender()] if(user.restrained()) return @@ -177,7 +177,7 @@ "You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.") FireBurn() -/obj/item/weapon/shreddedp/proc/FireBurn() +/obj/item/shreddedp/proc/FireBurn() var/mob/living/M = loc if(istype(M)) M.drop_from_inventory(src) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index c1c09b873a5..496d579bff5 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -15,7 +15,7 @@ /* * Pens */ -/obj/item/weapon/pen +/obj/item/pen name = "pen" desc = "It's a normal black ink pen." icon = 'icons/obj/bureaucracy.dmi' @@ -32,7 +32,7 @@ drop_sound = 'sound/items/drop/accessory.ogg' pickup_sound = 'sound/items/pickup/accessory.ogg' -/obj/item/weapon/pen/attack_self(var/mob/user) +/obj/item/pen/attack_self(var/mob/user) if(!user.checkClickCooldown()) return user.setClickCooldown(1 SECOND) @@ -42,12 +42,12 @@ /* * Coloured Pens */ -/obj/item/weapon/pen/blue +/obj/item/pen/blue desc = "It's a normal blue ink pen." icon_state = "pen_blue" colour = "blue" -/obj/item/weapon/pen/red +/obj/item/pen/red desc = "It's a normal red ink pen." icon_state = "pen_red" colour = "red" @@ -55,39 +55,39 @@ /* * Fountain Pens */ -/obj/item/weapon/pen/fountain +/obj/item/pen/fountain desc = "A well made fountain pen, with a faux wood body." icon_state = "pen_fountain" -/obj/item/weapon/pen/fountain2 +/obj/item/pen/fountain2 desc = "A well made fountain pen, with a faux wood body. This one has golden accents." icon_state = "pen_fountain" -/obj/item/weapon/pen/fountain3 +/obj/item/pen/fountain3 desc = "A well made expesive rosewood pen with golden accents. Very pretty." icon_state = "pen_fountain" -/obj/item/weapon/pen/fountain4 +/obj/item/pen/fountain4 desc = "A well made and expensive fountain pen. This one has silver accents." icon_state = "blues_fountain" -/obj/item/weapon/pen/fountain5 +/obj/item/pen/fountain5 desc = "A well made and expensive fountain pen. This one has gold accents." icon_state = "blueg_fountain" -/obj/item/weapon/pen/fountain6 +/obj/item/pen/fountain6 desc = "A well made and expensive fountain pen. The nib is quite sharp." icon_state = "command_fountain" -/obj/item/weapon/pen/fountain7 +/obj/item/pen/fountain7 desc = "A well made and expensive fountain pen made from gold." icon_state = "gold_fountain" -/obj/item/weapon/pen/fountain8 +/obj/item/pen/fountain8 desc = "A well made and expensive fountain pen." icon_state = "black_fountain" -/obj/item/weapon/pen/fountain9 +/obj/item/pen/fountain9 desc = "A well made and expensive fountain pen made for gesturing." icon_state = "mime_fountain" @@ -95,17 +95,17 @@ /* * Multi Pen */ -/obj/item/weapon/pen/multi +/obj/item/pen/multi desc = "It's a pen with multiple colors of ink!" var/selectedColor = 1 var/colors = list("black","blue","red") -/obj/item/weapon/pen/AltClick(mob/user) +/obj/item/pen/AltClick(mob/user) to_chat(user, "Click.") playsound(src, 'sound/items/penclick.ogg', 50, 1) return -/obj/item/weapon/pen/multi/attack_self(mob/user) +/obj/item/pen/multi/attack_self(mob/user) if(++selectedColor > 3) selectedColor = 1 @@ -118,7 +118,7 @@ to_chat(user, "Changed color to '[colour].'") -/obj/item/weapon/pen/invisible +/obj/item/pen/invisible desc = "It's an invisble pen marker." icon_state = "pen" colour = "white" @@ -127,15 +127,15 @@ * Reagent Pens */ -/obj/item/weapon/pen/reagent +/obj/item/pen/reagent flags = OPENCONTAINER origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5) -/obj/item/weapon/pen/reagent/New() +/obj/item/pen/reagent/New() ..() create_reagents(30) -/obj/item/weapon/pen/reagent/attack(mob/living/M as mob, mob/user as mob) +/obj/item/pen/reagent/attack(mob/living/M as mob, mob/user as mob) if(!istype(M)) return @@ -152,7 +152,7 @@ /* * Blade Pens */ -/obj/item/weapon/pen/blade +/obj/item/pen/blade desc = "It's a normal black ink pen." description_antag = "This pen can be transformed into a dangerous melee and thrown assassination weapon with an Alt-Click.\ When active, it cannot be caught safely." @@ -175,12 +175,12 @@ var/active_icon_state var/default_icon_state -/obj/item/weapon/pen/blade/Initialize() +/obj/item/pen/blade/Initialize() . = ..() active_icon_state = "[icon_state]-x" default_icon_state = icon_state -/obj/item/weapon/pen/blade/AltClick(mob/user) +/obj/item/pen/blade/AltClick(mob/user) ..() if(active) deactivate(user) @@ -189,7 +189,7 @@ to_chat(user, "You [active ? "de" : ""]activate \the [src]'s blade.") -/obj/item/weapon/pen/blade/proc/activate(mob/living/user) +/obj/item/pen/blade/proc/activate(mob/living/user) if(active) return active = 1 @@ -211,7 +211,7 @@ "stabbed"\ ) -/obj/item/weapon/pen/blade/proc/deactivate(mob/living/user) +/obj/item/pen/blade/proc/deactivate(mob/living/user) if(!active) return playsound(src, 'sound/weapons/saberoff.ogg', 15, 1) @@ -226,28 +226,28 @@ damtype = BRUTE catchable = TRUE -/obj/item/weapon/pen/blade/blue +/obj/item/pen/blade/blue desc = "It's a normal blue ink pen." icon_state = "pen_blue" colour = "blue" -/obj/item/weapon/pen/blade/red +/obj/item/pen/blade/red desc = "It's a normal red ink pen." icon_state = "pen_red" colour = "red" -/obj/item/weapon/pen/blade/fountain +/obj/item/pen/blade/fountain desc = "A well made fountain pen, with a faux wood body." icon_state = "pen_fountain" /* * Sleepy Pens */ -/obj/item/weapon/pen/reagent/sleepy +/obj/item/pen/reagent/sleepy desc = "It's a black ink pen with a sharp point and a carefully engraved \"Waffle Co.\"" origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5) -/obj/item/weapon/pen/reagent/sleepy/New() +/obj/item/pen/reagent/sleepy/New() ..() reagents.add_reagent("chloralhydrate", 1) //VOREStation Edit reagents.add_reagent("stoxin", 14) //VOREStation Add @@ -256,10 +256,10 @@ /* * Parapens */ -/obj/item/weapon/pen/reagent/paralysis +/obj/item/pen/reagent/paralysis origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5) -/obj/item/weapon/pen/reagent/paralysis/New() +/obj/item/pen/reagent/paralysis/New() ..() reagents.add_reagent("zombiepowder", 5) reagents.add_reagent("cryptobiolin", 10) @@ -267,10 +267,10 @@ /* * Chameleon Pen */ -/obj/item/weapon/pen/chameleon +/obj/item/pen/chameleon var/signature = "" -/obj/item/weapon/pen/chameleon/attack_self(mob/user as mob) +/obj/item/pen/chameleon/attack_self(mob/user as mob) /* // Limit signatures to official crew members var/personnel_list[] = list() @@ -284,13 +284,13 @@ */ signature = sanitize(tgui_input_text(usr, "Enter new signature. Leave blank for 'Anonymous'", "New Signature", signature)) -/obj/item/weapon/pen/proc/get_signature(var/mob/user) +/obj/item/pen/proc/get_signature(var/mob/user) return (user && user.real_name) ? user.real_name : "Anonymous" -/obj/item/weapon/pen/chameleon/get_signature(var/mob/user) +/obj/item/pen/chameleon/get_signature(var/mob/user) return signature ? signature : "Anonymous" -/obj/item/weapon/pen/chameleon/verb/set_colour() +/obj/item/pen/chameleon/verb/set_colour() set name = "Change Pen Colour" set category = "Object" @@ -323,7 +323,7 @@ /* * Crayons */ -/obj/item/weapon/pen/crayon +/obj/item/pen/crayon name = "crayon" desc = "A colourful crayon. Please refrain from eating it or putting it in your nose." icon = 'icons/obj/crayons.dmi' @@ -338,13 +338,13 @@ drop_sound = 'sound/items/drop/gloves.ogg' pickup_sound = 'sound/items/pickup/gloves.ogg' -/obj/item/weapon/pen/crayon/New() +/obj/item/pen/crayon/New() name = "[colourName] crayon" -/obj/item/weapon/pen/crayon/marker +/obj/item/pen/crayon/marker name = "marker" desc = "A chisel-tip permanent marker. Hopefully non-toxic." icon_state = "markerred" -/obj/item/weapon/pen/crayon/marker/New() +/obj/item/pen/crayon/marker/New() name = "[colourName] marker" diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index fcaa6ca414b..216bb79c7b2 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -10,7 +10,7 @@ idle_power_usage = 30 active_power_usage = 200 power_channel = EQUIP - circuit = /obj/item/weapon/circuitboard/photocopier + circuit = /obj/item/circuitboard/photocopier can_buckle = TRUE var/obj/item/copyitem = null //what's in the copier! var/copies = 1 //how many copies to print! @@ -83,15 +83,15 @@ if(toner >= 5) var/mob/living/silicon/tempAI = usr - var/obj/item/device/camera/siliconcam/camera = tempAI.aiCamera + var/obj/item/camera/siliconcam/camera = tempAI.aiCamera if(!camera) return - var/obj/item/weapon/photo/selection = camera.selectpicture() + var/obj/item/photo/selection = camera.selectpicture() if (!selection) return - var/obj/item/weapon/photo/p = photocopy(selection) + var/obj/item/photo/p = photocopy(selection) if (p.desc == "") p.desc += "Copied by [tempAI.name]" else @@ -107,22 +107,22 @@ if(toner <= 0) break - if (istype(copyitem, /obj/item/weapon/paper)) + if (istype(copyitem, /obj/item/paper)) playsound(src, "sound/machines/copier.ogg", 100, 1) sleep(11) copy(copyitem) audible_message("You can hear [src] whirring as it finishes printing.", runemessage = "whirr") playsound(src, "sound/machines/buzzbeep.ogg", 30) - else if (istype(copyitem, /obj/item/weapon/photo)) + else if (istype(copyitem, /obj/item/photo)) playsound(src, "sound/machines/copier.ogg", 100, 1) sleep(11) photocopy(copyitem) audible_message("You can hear [src] whirring as it finishes printing.", runemessage = "whirr") playsound(src, "sound/machines/buzzbeep.ogg", 30) - else if (istype(copyitem, /obj/item/weapon/paper_bundle)) + else if (istype(copyitem, /obj/item/paper_bundle)) sleep(11) playsound(src, "sound/machines/copier.ogg", 100, 1) - var/obj/item/weapon/paper_bundle/B = bundlecopy(copyitem) + var/obj/item/paper_bundle/B = bundlecopy(copyitem) sleep(11*B.pages.len) audible_message("You can hear [src] whirring as it finishes printing.", runemessage = "whirr") playsound(src, "sound/machines/buzzbeep.ogg", 30) @@ -143,7 +143,7 @@ copying = FALSE /obj/machinery/photocopier/attackby(obj/item/O as obj, mob/user as mob) - if(istype(O, /obj/item/weapon/paper) || istype(O, /obj/item/weapon/photo) || istype(O, /obj/item/weapon/paper_bundle)) + if(istype(O, /obj/item/paper) || istype(O, /obj/item/photo) || istype(O, /obj/item/paper_bundle)) if(!copyitem) user.drop_item() copyitem = O @@ -153,13 +153,13 @@ flick(insert_anim, src) else to_chat(user, "There is already something in \the [src].") - else if(istype(O, /obj/item/device/toner)) + else if(istype(O, /obj/item/toner)) if(toner <= 10) //allow replacing when low toner is affecting the print darkness user.drop_item() to_chat(user, "You insert the toner cartridge into \the [src].") flick("photocopier_toner", src) playsound(loc, 'sound/machines/click.ogg', 50, 1) - var/obj/item/device/toner/T = O + var/obj/item/toner/T = O toner += T.toner_amount qdel(O) else @@ -195,8 +195,8 @@ toner = 0 return -/obj/machinery/photocopier/proc/copy(var/obj/item/weapon/paper/copy, var/need_toner=1) - var/obj/item/weapon/paper/c = new /obj/item/weapon/paper (loc) +/obj/machinery/photocopier/proc/copy(var/obj/item/paper/copy, var/need_toner=1) + var/obj/item/paper/c = new /obj/item/paper (loc) if(toner > 10) //lots of toner, make it dark c.info = "" else //no toner? shitty copies for you! @@ -234,8 +234,8 @@ return c -/obj/machinery/photocopier/proc/photocopy(var/obj/item/weapon/photo/photocopy, var/need_toner=1) - var/obj/item/weapon/photo/p = photocopy.copy() +/obj/machinery/photocopier/proc/photocopy(var/obj/item/photo/photocopy, var/need_toner=1) + var/obj/item/photo/p = photocopy.copy() p.loc = src.loc var/icon/I = icon(photocopy.icon, photocopy.icon_state) @@ -322,7 +322,7 @@ temp_img = icon('icons/obj/butts_vr.dmi', "nymph") else return - var/obj/item/weapon/photo/p = new /obj/item/weapon/photo (loc) + var/obj/item/photo/p = new /obj/item/photo (loc) p.desc = "You see [sitter]'s ass on the photo." p.pixel_x = rand(-10, 10) p.pixel_y = rand(-10, 10) @@ -343,18 +343,18 @@ // VOREStation Edit Stop //If need_toner is 0, the copies will still be lightened when low on toner, however it will not be prevented from printing. TODO: Implement print queues for fax machines and get rid of need_toner -/obj/machinery/photocopier/proc/bundlecopy(var/obj/item/weapon/paper_bundle/bundle, var/need_toner=1) - var/obj/item/weapon/paper_bundle/p = new /obj/item/weapon/paper_bundle (src) - for(var/obj/item/weapon/W in bundle.pages) +/obj/machinery/photocopier/proc/bundlecopy(var/obj/item/paper_bundle/bundle, var/need_toner=1) + var/obj/item/paper_bundle/p = new /obj/item/paper_bundle (src) + for(var/obj/item/W in bundle.pages) if(toner <= 0 && need_toner) toner = 0 playsound(src, "sound/machines/buzz-sigh.ogg", 100) visible_message("A red light on \the [src] flashes, indicating that it is out of toner.") break - if(istype(W, /obj/item/weapon/paper)) + if(istype(W, /obj/item/paper)) W = copy(W) - else if(istype(W, /obj/item/weapon/photo)) + else if(istype(W, /obj/item/photo)) W = photocopy(W) W.loc = p p.pages += W @@ -382,7 +382,7 @@ // VOREStation Edit Stop - Rykka -/obj/item/device/toner +/obj/item/toner name = "toner cartridge" icon = 'icons/obj/device.dmi' icon_state = "tonercartridge" diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 95d25d7818e..b46e8a7a5a1 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -9,7 +9,7 @@ /******* * film * *******/ -/obj/item/device/camera_film +/obj/item/camera_film name = "film cartridge" icon = 'icons/obj/items.dmi' desc = "A camera film cartridge. Insert it into a camera to reload it." @@ -23,7 +23,7 @@ ********/ var/global/photo_count = 0 -/obj/item/weapon/photo +/obj/item/photo name = "photo" icon = 'icons/obj/items.dmi' icon_state = "photo" @@ -37,22 +37,22 @@ var/global/photo_count = 0 var/icon/tiny var/photo_size = 3 -/obj/item/weapon/photo/New() +/obj/item/photo/New() id = photo_count++ -/obj/item/weapon/photo/attack_self(mob/user as mob) +/obj/item/photo/attack_self(mob/user as mob) user.examinate(src) -/obj/item/weapon/photo/attackby(obj/item/weapon/P as obj, mob/user as mob) - if(istype(P, /obj/item/weapon/pen)) +/obj/item/photo/attackby(obj/item/P as obj, mob/user as mob) + if(istype(P, /obj/item/pen)) var/txt = sanitize(tgui_input_text(user, "What would you like to write on the back?", "Photo Writing", null, 128), 128) if(loc == user && user.stat == 0) scribble = txt ..() -/obj/item/weapon/photo/examine(mob/user) +/obj/item/photo/examine(mob/user) //This is one time we're not going to call parent, because photos are 'secret' unless you're close enough. if(in_range(user, src)) show(user) @@ -60,7 +60,7 @@ var/global/photo_count = 0 else return list("It is too far away to examine.") -/obj/item/weapon/photo/proc/show(mob/user as mob) +/obj/item/photo/proc/show(mob/user as mob) user << browse_rsc(img, "tmp_photo_[id].png") user << browse("[name]" \ + "" \ @@ -70,7 +70,7 @@ var/global/photo_count = 0 onclose(user, "[name]") return -/obj/item/weapon/photo/verb/rename() +/obj/item/photo/verb/rename() set name = "Rename photo" set category = "Object" set src in usr @@ -86,14 +86,14 @@ var/global/photo_count = 0 /************** * photo album * **************/ -/obj/item/weapon/storage/photo_album +/obj/item/storage/photo_album name = "Photo album" icon = 'icons/obj/items.dmi' icon_state = "album" item_state = "briefcase" - can_hold = list(/obj/item/weapon/photo) + can_hold = list(/obj/item/photo) -/obj/item/weapon/storage/photo_album/MouseDrop(obj/over_object as obj) +/obj/item/storage/photo_album/MouseDrop(obj/over_object as obj) if((istype(usr, /mob/living/carbon/human))) var/mob/living/carbon/human/M = usr @@ -120,7 +120,7 @@ var/global/photo_count = 0 /********* * camera * *********/ -/obj/item/device/camera +/obj/item/camera name = "camera" icon = 'icons/obj/items.dmi' desc = "A polaroid camera. 10 photos left." @@ -137,7 +137,7 @@ var/global/photo_count = 0 var/size = 3 var/list/picture_planes = list() -/obj/item/device/camera/verb/change_size() +/obj/item/camera/verb/change_size() set name = "Set Photo Focus" set category = "Object" var/nsize = tgui_input_list(usr, "Photo Size","Pick a size of resulting photo.", list(1,3,5,7)) @@ -145,10 +145,10 @@ var/global/photo_count = 0 size = nsize to_chat(usr, "Camera will now take [size]x[size] photos.") -/obj/item/device/camera/attack(mob/living/carbon/human/M as mob, mob/user as mob) +/obj/item/camera/attack(mob/living/carbon/human/M as mob, mob/user as mob) return -/obj/item/device/camera/attack_self(mob/user as mob) +/obj/item/camera/attack_self(mob/user as mob) on = !on if(on) src.icon_state = icon_on @@ -157,8 +157,8 @@ var/global/photo_count = 0 to_chat(user, "You switch the camera [on ? "on" : "off"].") return -/obj/item/device/camera/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I, /obj/item/device/camera_film)) +/obj/item/camera/attackby(obj/item/I as obj, mob/user as mob) + if(istype(I, /obj/item/camera_film)) if(pictures_left) to_chat(user, "[src] still has some film in it!") return @@ -170,7 +170,7 @@ var/global/photo_count = 0 ..() -/obj/item/device/camera/proc/get_icon(list/turfs, turf/center) +/obj/item/camera/proc/get_icon(list/turfs, turf/center) //Bigger icon base to capture those icons that were shifted to the next tile //i.e. pretty much all wall-mounted machinery @@ -220,7 +220,7 @@ var/global/photo_count = 0 return res -/obj/item/device/camera/proc/get_mobs(turf/the_turf as turf) +/obj/item/camera/proc/get_mobs(turf/the_turf as turf) var/mob_detail for(var/mob/living/carbon/A in the_turf) if(A.invisibility) continue @@ -240,7 +240,7 @@ var/global/photo_count = 0 return mob_detail -/obj/item/device/camera/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) +/obj/item/camera/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) if(!on || !pictures_left || ismob(target.loc)) return captureimage(target, user, flag) @@ -255,7 +255,7 @@ var/global/photo_count = 0 icon_state = icon_on on = 1 -/obj/item/device/camera/proc/can_capture_turf(turf/T, mob/user) +/obj/item/camera/proc/can_capture_turf(turf/T, mob/user) var/viewer = user if(user.client) //To make shooting through security cameras possible viewer = user.client.eye @@ -263,7 +263,7 @@ var/global/photo_count = 0 return can_see -/obj/item/device/camera/proc/captureimage(atom/target, mob/user, flag) +/obj/item/camera/proc/captureimage(atom/target, mob/user, flag) var/x_c = target.x - (size-1)/2 var/y_c = target.y + (size-1)/2 var/z_c = target.z @@ -279,11 +279,11 @@ var/global/photo_count = 0 y_c-- x_c = x_c - size - var/obj/item/weapon/photo/p = createpicture(target, user, turfs, mobs, flag) + var/obj/item/photo/p = createpicture(target, user, turfs, mobs, flag) printpicture(user, p) -/obj/item/device/camera/proc/createpicture(atom/target, mob/user, list/turfs, mobs, flag) +/obj/item/camera/proc/createpicture(atom/target, mob/user, list/turfs, mobs, flag) var/icon/photoimage = get_icon(turfs, target) var/icon/small_img = icon(photoimage) @@ -295,7 +295,7 @@ var/global/photo_count = 0 ic.Blend(small_img,ICON_OVERLAY, 10, 13) pc.Blend(tiny_img,ICON_OVERLAY, 12, 19) - var/obj/item/weapon/photo/p = new() + var/obj/item/photo/p = new() p.name = "photo" p.icon = ic p.tiny = pc @@ -306,13 +306,13 @@ var/global/photo_count = 0 p.photo_size = size return p -/obj/item/device/camera/proc/printpicture(mob/user, obj/item/weapon/photo/p) +/obj/item/camera/proc/printpicture(mob/user, obj/item/photo/p) p.loc = user.loc if(!user.get_inactive_hand()) user.put_in_inactive_hand(p) -/obj/item/weapon/photo/proc/copy(var/copy_id = 0) - var/obj/item/weapon/photo/p = new/obj/item/weapon/photo() +/obj/item/photo/proc/copy(var/copy_id = 0) + var/obj/item/photo/p = new/obj/item/photo() p.name = name p.icon = icon(icon, icon_state) diff --git a/code/modules/paperwork/silicon_photography.dm b/code/modules/paperwork/silicon_photography.dm index 7de69cb99d2..67b12c4ef22 100644 --- a/code/modules/paperwork/silicon_photography.dm +++ b/code/modules/paperwork/silicon_photography.dm @@ -1,27 +1,27 @@ /************** * AI-specific * **************/ -/obj/item/device/camera/siliconcam +/obj/item/camera/siliconcam var/in_camera_mode = 0 var/photos_taken = 0 - var/list/obj/item/weapon/photo/aipictures = list() + var/list/obj/item/photo/aipictures = list() -/obj/item/device/camera/siliconcam/ai_camera //camera AI can take pictures with +/obj/item/camera/siliconcam/ai_camera //camera AI can take pictures with name = "AI photo camera" -/obj/item/device/camera/siliconcam/robot_camera //camera cyborgs can take pictures with +/obj/item/camera/siliconcam/robot_camera //camera cyborgs can take pictures with name = "Cyborg photo camera" -/obj/item/device/camera/siliconcam/drone_camera //currently doesn't offer the verbs, thus cannot be used +/obj/item/camera/siliconcam/drone_camera //currently doesn't offer the verbs, thus cannot be used name = "Drone photo camera" -/obj/item/device/camera/siliconcam/proc/injectaialbum(obj/item/weapon/photo/p, var/sufix = "") //stores image information to a list similar to that of the datacore +/obj/item/camera/siliconcam/proc/injectaialbum(obj/item/photo/p, var/sufix = "") //stores image information to a list similar to that of the datacore p.loc = src photos_taken++ p.name = "Image [photos_taken][sufix]" aipictures += p -/obj/item/device/camera/siliconcam/proc/injectmasteralbum(obj/item/weapon/photo/p) //stores image information to a list similar to that of the datacore +/obj/item/camera/siliconcam/proc/injectmasteralbum(obj/item/photo/p) //stores image information to a list similar to that of the datacore var/mob/living/silicon/robot/C = usr if(C.connected_ai) C.connected_ai.aiCamera.injectaialbum(p.copy(1), " (synced from [C.name])") @@ -32,7 +32,7 @@ // Always save locally injectaialbum(p) -/obj/item/device/camera/siliconcam/proc/selectpicture(obj/item/device/camera/siliconcam/cam) +/obj/item/camera/siliconcam/proc/selectpicture(obj/item/camera/siliconcam/cam) if(!cam) cam = getsource() @@ -41,18 +41,18 @@ if(cam.aipictures.len == 0) to_chat(usr, "No images saved") return - for(var/obj/item/weapon/photo/t in cam.aipictures) + for(var/obj/item/photo/t in cam.aipictures) nametemp += t.name find = tgui_input_list(usr, "Select image (numbered in order taken)", "Picture Choice", nametemp) if(!find) return - for(var/obj/item/weapon/photo/q in cam.aipictures) + for(var/obj/item/photo/q in cam.aipictures) if(q.name == find) return q -/obj/item/device/camera/siliconcam/proc/viewpictures() - var/obj/item/weapon/photo/selection = selectpicture() +/obj/item/camera/siliconcam/proc/viewpictures() + var/obj/item/photo/selection = selectpicture() if(!selection) return @@ -60,7 +60,7 @@ selection.show(usr) to_chat(usr,selection.desc) -/obj/item/device/camera/siliconcam/proc/deletepicture(obj/item/device/camera/siliconcam/cam) +/obj/item/camera/siliconcam/proc/deletepicture(obj/item/camera/siliconcam/cam) var/selection = selectpicture(cam) if(!selection) @@ -69,29 +69,29 @@ aipictures -= selection to_chat(usr, "Local image deleted") -/obj/item/device/camera/siliconcam/ai_camera/can_capture_turf(turf/T, mob/user) +/obj/item/camera/siliconcam/ai_camera/can_capture_turf(turf/T, mob/user) var/mob/living/silicon/ai = user return ai.TurfAdjacent(T) -/obj/item/device/camera/siliconcam/proc/toggle_camera_mode() +/obj/item/camera/siliconcam/proc/toggle_camera_mode() if(in_camera_mode) camera_mode_off() else camera_mode_on() -/obj/item/device/camera/siliconcam/proc/camera_mode_off() +/obj/item/camera/siliconcam/proc/camera_mode_off() src.in_camera_mode = 0 to_chat(usr, "Camera Mode deactivated") -/obj/item/device/camera/siliconcam/proc/camera_mode_on() +/obj/item/camera/siliconcam/proc/camera_mode_on() src.in_camera_mode = 1 to_chat(usr, "Camera Mode activated") -/obj/item/device/camera/siliconcam/ai_camera/printpicture(mob/user, obj/item/weapon/photo/p) +/obj/item/camera/siliconcam/ai_camera/printpicture(mob/user, obj/item/photo/p) injectaialbum(p) to_chat(usr, "Image recorded") -/obj/item/device/camera/siliconcam/robot_camera/printpicture(mob/user, obj/item/weapon/photo/p) +/obj/item/camera/siliconcam/robot_camera/printpicture(mob/user, obj/item/photo/p) injectmasteralbum(p) /mob/living/silicon/ai/proc/take_image() @@ -142,12 +142,12 @@ if(aiCamera) aiCamera.deletepicture() -/obj/item/device/camera/siliconcam/proc/getsource() +/obj/item/camera/siliconcam/proc/getsource() if(istype(src.loc, /mob/living/silicon/ai)) return src var/mob/living/silicon/robot/C = usr - var/obj/item/device/camera/siliconcam/Cinfo + var/obj/item/camera/siliconcam/Cinfo if(C.connected_ai) Cinfo = C.connected_ai.aiCamera else diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 50d69623777..41553529abf 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/stamp +/obj/item/stamp name = "rubber stamp" desc = "A rubber stamp for stamping important documents." icon = 'icons/obj/bureaucracy.dmi' @@ -16,76 +16,76 @@ pickup_sound = 'sound/items/pickup/device.ogg' var/stamptext = null -/obj/item/weapon/stamp/captain +/obj/item/stamp/captain name = "site manager's rubber stamp" icon_state = "stamp-cap" -/obj/item/weapon/stamp/hop +/obj/item/stamp/hop name = "head of personnel's rubber stamp" icon_state = "stamp-hop" -/obj/item/weapon/stamp/hos +/obj/item/stamp/hos name = "head of security's rubber stamp" icon_state = "stamp-hos" -/obj/item/weapon/stamp/ward +/obj/item/stamp/ward name = "warden's rubber stamp" icon_state = "stamp-ward" -/obj/item/weapon/stamp/ce +/obj/item/stamp/ce name = "chief engineer's rubber stamp" icon_state = "stamp-ce" -/obj/item/weapon/stamp/rd +/obj/item/stamp/rd name = "research director's rubber stamp" icon_state = "stamp-rd" -/obj/item/weapon/stamp/cmo +/obj/item/stamp/cmo name = "chief medical officer's rubber stamp" icon_state = "stamp-cmo" -/obj/item/weapon/stamp/denied +/obj/item/stamp/denied name = "\improper DENIED rubber stamp" icon_state = "stamp-deny" attack_verb = list("DENIED") -/obj/item/weapon/stamp/accepted +/obj/item/stamp/accepted name = "\improper ACCEPTED rubber stamp" icon_state = "stamp-ok" -/obj/item/weapon/stamp/clown +/obj/item/stamp/clown name = "clown's rubber stamp" icon_state = "stamp-clown" -/obj/item/weapon/stamp/internalaffairs +/obj/item/stamp/internalaffairs name = "internal affairs rubber stamp" icon_state = "stamp-intaff" -/obj/item/weapon/stamp/centcomm +/obj/item/stamp/centcomm name = "\improper CentCom rubber stamp" icon_state = "stamp-cent" -/obj/item/weapon/stamp/qm +/obj/item/stamp/qm name = "quartermaster's rubber stamp" icon_state = "stamp-qm" -/obj/item/weapon/stamp/cargo +/obj/item/stamp/cargo name = "cargo rubber stamp" icon_state = "stamp-cargo" -/obj/item/weapon/stamp/solgov +/obj/item/stamp/solgov name = "\improper Sol Government rubber stamp" icon_state = "stamp-sg" -/obj/item/weapon/stamp/solgov +/obj/item/stamp/solgov name = "\improper Sol Government rubber stamp" icon_state = "stamp-sg" -/obj/item/weapon/stamp/solgovlogo +/obj/item/stamp/solgovlogo name = "\improper Sol Government logo stamp" icon_state = "stamp-sol" -/obj/item/weapon/stamp/solgovlogo +/obj/item/stamp/solgovlogo name = "\improper Sol Government logo stamp" icon_state = "stamp-sol" @@ -102,14 +102,14 @@ icon_state = "stamp-zenghu" // Syndicate stamp to forge documents. -/obj/item/weapon/stamp/chameleon/attack_self(mob/user as mob) +/obj/item/stamp/chameleon/attack_self(mob/user as mob) - var/list/stamp_types = typesof(/obj/item/weapon/stamp) - src.type // Get all stamp types except our own + var/list/stamp_types = typesof(/obj/item/stamp) - src.type // Get all stamp types except our own var/list/stamps = list() // Generate them into a list for(var/stamp_type in stamp_types) - var/obj/item/weapon/stamp/S = new stamp_type + var/obj/item/stamp/S = new stamp_type stamps[capitalize(S.name)] = S var/list/show_stamps = list("EXIT" = null) + sortList(stamps) // the list that will be shown to the user to pick from @@ -118,7 +118,7 @@ if(user && (src in user.contents)) // Er, how necessary is this in attack_self? - var/obj/item/weapon/stamp/chosen_stamp = stamps[capitalize(input_stamp)] + var/obj/item/stamp/chosen_stamp = stamps[capitalize(input_stamp)] if(chosen_stamp) name = chosen_stamp.name diff --git a/code/modules/pda/ai.dm b/code/modules/pda/ai.dm index 10a04effb3a..a67d469d4e7 100644 --- a/code/modules/pda/ai.dm +++ b/code/modules/pda/ai.dm @@ -1,6 +1,6 @@ // Special AI/pAI PDAs that cannot explode. -/obj/item/device/pda/ai +/obj/item/pda/ai icon_state = "NONE" ttone = "data" detonate = 0 @@ -11,7 +11,7 @@ new/datum/data/pda/app/news, new/datum/data/pda/app/messenger) -/obj/item/device/pda/ai/proc/set_name_and_job(newname as text, newjob as text, newrank as null|text) +/obj/item/pda/ai/proc/set_name_and_job(newname as text, newjob as text, newrank as null|text) owner = newname ownjob = newjob if(newrank) @@ -21,7 +21,7 @@ name = newname + " (" + ownjob + ")" //AI verb and proc for sending PDA messages. -/obj/item/device/pda/ai/verb/cmd_pda_open_ui() +/obj/item/pda/ai/verb/cmd_pda_open_ui() set category = "AI IM" set name = "Use PDA" set src in usr @@ -30,29 +30,29 @@ return tgui_interact(usr) -/obj/item/device/pda/ai/can_use() +/obj/item/pda/ai/can_use() return 1 -/obj/item/device/pda/ai/attack_self(mob/user as mob) +/obj/item/pda/ai/attack_self(mob/user as mob) if ((honkamt > 0) && (prob(60)))//For clown virus. honkamt-- playsound(src, 'sound/items/bikehorn.ogg', 30, 1) return -/obj/item/device/pda/ai/pai +/obj/item/pda/ai/pai ttone = "assist" var/our_owner = null // Ref to a pAI -/obj/item/device/pda/ai/pai/New(mob/living/silicon/pai/P) +/obj/item/pda/ai/pai/New(mob/living/silicon/pai/P) if(istype(P)) our_owner = REF(P) return ..() -/obj/item/device/pda/ai/pai/tgui_status(mob/living/silicon/pai/user, datum/tgui_state/state) +/obj/item/pda/ai/pai/tgui_status(mob/living/silicon/pai/user, datum/tgui_state/state) if(!istype(user) || REF(user) != our_owner) // Only allow our pAI to interface with us return STATUS_CLOSE return ..() -/obj/item/device/pda/ai/shell +/obj/item/pda/ai/shell spam_proof = TRUE // Since empty shells get a functional PDA. diff --git a/code/modules/pda/app.dm b/code/modules/pda/app.dm index 4e508838e9f..5b9e942d6b9 100644 --- a/code/modules/pda/app.dm +++ b/code/modules/pda/app.dm @@ -5,7 +5,7 @@ var/notify_silent = 0 var/hidden = 0 // program not displayed in main menu var/category = "General" // the category to list it in on the main menu - var/obj/item/device/pda/pda // if this is null, and the app is running code, something's gone wrong + var/obj/item/pda/pda // if this is null, and the app is running code, something's gone wrong /datum/data/pda/Destroy() pda = null @@ -87,7 +87,7 @@ var/base_name category = "Scanners" -/datum/data/pda/utility/scanmode/New(obj/item/weapon/cartridge/C) +/datum/data/pda/utility/scanmode/New(obj/item/cartridge/C) ..(C) name = "Enable [base_name]" diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm index 6213e5aae22..2599544eb39 100644 --- a/code/modules/pda/cart.dm +++ b/code/modules/pda/cart.dm @@ -1,50 +1,50 @@ var/list/command_cartridges = list( - /obj/item/weapon/cartridge/captain, - /obj/item/weapon/cartridge/hop, - /obj/item/weapon/cartridge/hos, - /obj/item/weapon/cartridge/ce, - /obj/item/weapon/cartridge/rd, - /obj/item/weapon/cartridge/cmo, - /obj/item/weapon/cartridge/head, - /obj/item/weapon/cartridge/lawyer // Internal Affaris, + /obj/item/cartridge/captain, + /obj/item/cartridge/hop, + /obj/item/cartridge/hos, + /obj/item/cartridge/ce, + /obj/item/cartridge/rd, + /obj/item/cartridge/cmo, + /obj/item/cartridge/head, + /obj/item/cartridge/lawyer // Internal Affaris, ) var/list/security_cartridges = list( - /obj/item/weapon/cartridge/security, - /obj/item/weapon/cartridge/detective, - /obj/item/weapon/cartridge/hos + /obj/item/cartridge/security, + /obj/item/cartridge/detective, + /obj/item/cartridge/hos ) var/list/engineering_cartridges = list( - /obj/item/weapon/cartridge/engineering, - /obj/item/weapon/cartridge/atmos, - /obj/item/weapon/cartridge/ce + /obj/item/cartridge/engineering, + /obj/item/cartridge/atmos, + /obj/item/cartridge/ce ) var/list/medical_cartridges = list( - /obj/item/weapon/cartridge/medical, - /obj/item/weapon/cartridge/chemistry, - /obj/item/weapon/cartridge/cmo + /obj/item/cartridge/medical, + /obj/item/cartridge/chemistry, + /obj/item/cartridge/cmo ) var/list/research_cartridges = list( - /obj/item/weapon/cartridge/signal/science, - /obj/item/weapon/cartridge/rd + /obj/item/cartridge/signal/science, + /obj/item/cartridge/rd ) var/list/cargo_cartridges = list( - /obj/item/weapon/cartridge/quartermaster, // This also covers cargo-techs, apparently, - /obj/item/weapon/cartridge/miner, - /obj/item/weapon/cartridge/hop + /obj/item/cartridge/quartermaster, // This also covers cargo-techs, apparently, + /obj/item/cartridge/miner, + /obj/item/cartridge/hop ) var/list/civilian_cartridges = list( - /obj/item/weapon/cartridge/janitor, - /obj/item/weapon/cartridge/service, - /obj/item/weapon/cartridge/hop + /obj/item/cartridge/janitor, + /obj/item/cartridge/service, + /obj/item/cartridge/hop ) -/obj/item/weapon/cartridge +/obj/item/cartridge name = "generic cartridge" desc = "A data cartridge for portable microcomputers." icon = 'icons/obj/pda.dmi' @@ -62,38 +62,38 @@ var/list/civilian_cartridges = list( var/list/programs = list() var/list/messenger_plugins = list() -/obj/item/weapon/cartridge/Destroy() +/obj/item/cartridge/Destroy() QDEL_NULL(radio) QDEL_LIST(programs) QDEL_LIST(messenger_plugins) return ..() -/obj/item/weapon/cartridge/proc/update_programs(obj/item/device/pda/pda) +/obj/item/cartridge/proc/update_programs(obj/item/pda/pda) for(var/datum/data/pda/P as anything in programs) P.pda = pda for(var/datum/data/pda/messenger_plugin/P as anything in messenger_plugins) P.pda = pda -/obj/item/weapon/cartridge/engineering +/obj/item/cartridge/engineering name = "\improper Power-ON cartridge" icon_state = "cart-e" programs = list( new/datum/data/pda/app/power, new/datum/data/pda/utility/scanmode/halogen) -/obj/item/weapon/cartridge/atmos +/obj/item/cartridge/atmos name = "\improper BreatheDeep cartridge" icon_state = "cart-a" programs = list(new/datum/data/pda/utility/scanmode/gas) -/obj/item/weapon/cartridge/medical +/obj/item/cartridge/medical name = "\improper Med-U cartridge" icon_state = "cart-m" programs = list( new/datum/data/pda/app/crew_records/medical, new/datum/data/pda/utility/scanmode/medical) -/obj/item/weapon/cartridge/chemistry +/obj/item/cartridge/chemistry name = "\improper ChemWhiz cartridge" icon_state = "cart-chem" programs = list( @@ -101,13 +101,13 @@ var/list/civilian_cartridges = list( new/datum/data/pda/utility/scanmode/medical, new/datum/data/pda/utility/scanmode/reagent) -/obj/item/weapon/cartridge/security +/obj/item/cartridge/security name = "\improper R.O.B.U.S.T. cartridge" icon_state = "cart-s" programs = list( new/datum/data/pda/app/crew_records/security) -/obj/item/weapon/cartridge/detective +/obj/item/cartridge/detective name = "\improper D.E.T.E.C.T. cartridge" icon_state = "cart-s" programs = list( @@ -117,44 +117,44 @@ var/list/civilian_cartridges = list( new/datum/data/pda/app/crew_records/security) -/obj/item/weapon/cartridge/janitor +/obj/item/cartridge/janitor name = "\improper CustodiPRO cartridge" desc = "The ultimate in clean-room design." icon_state = "cart-j" programs = list(new/datum/data/pda/app/janitor) -/obj/item/weapon/cartridge/lawyer +/obj/item/cartridge/lawyer name = "\improper P.R.O.V.E. cartridge" icon_state = "cart-s" programs = list(new/datum/data/pda/app/crew_records/security) -/obj/item/weapon/cartridge/clown +/obj/item/cartridge/clown name = "\improper Honkworks 5.0 cartridge" icon_state = "cart-clown" charges = 5 programs = list(new/datum/data/pda/utility/honk) messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/clown) -/obj/item/weapon/cartridge/mime +/obj/item/cartridge/mime name = "\improper Gestur-O 1000 cartridge" icon_state = "cart-mi" charges = 5 messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/mime) -/obj/item/weapon/cartridge/service +/obj/item/cartridge/service name = "\improper Serv-U Pro cartridge" desc = "A data cartridge designed to serve YOU!" -/obj/item/weapon/cartridge/signal +/obj/item/cartridge/signal name = "generic signaler cartridge" desc = "A data cartridge with an integrated radio signaler module." programs = list(new/datum/data/pda/app/signaller) -/obj/item/weapon/cartridge/signal/Initialize() +/obj/item/cartridge/signal/Initialize() radio = new /obj/item/radio/integrated/signal(src) . = ..() -/obj/item/weapon/cartridge/signal/science +/obj/item/cartridge/signal/science name = "\improper Signal Ace 2 cartridge" desc = "Complete with integrated radio signaler!" icon_state = "cart-tox" @@ -165,24 +165,24 @@ var/list/civilian_cartridges = list( new/datum/data/pda/app/signaller) -/obj/item/weapon/cartridge/quartermaster +/obj/item/cartridge/quartermaster name = "\improper Space Parts & Space Vendors cartridge" desc = "Perfect for the " + JOB_QUARTERMASTER + " on the go!" icon_state = "cart-q" programs = list( new/datum/data/pda/app/supply) -/obj/item/weapon/cartridge/miner +/obj/item/cartridge/miner name = "\improper Drill-Jockey 4.5 cartridge" desc = "It's covered in some sort of sand." icon_state = "cart-q" -/obj/item/weapon/cartridge/head +/obj/item/cartridge/head name = "\improper Easy-Record DELUXE cartridge" icon_state = "cart-h" programs = list(new/datum/data/pda/app/status_display) -/obj/item/weapon/cartridge/hop +/obj/item/cartridge/hop name = "\improper HumanResources9001 cartridge" icon_state = "cart-h" programs = list( @@ -194,7 +194,7 @@ var/list/civilian_cartridges = list( new/datum/data/pda/app/status_display) -/obj/item/weapon/cartridge/hos +/obj/item/cartridge/hos name = "\improper R.O.B.U.S.T. DELUXE cartridge" icon_state = "cart-hos" programs = list( @@ -202,7 +202,7 @@ var/list/civilian_cartridges = list( new/datum/data/pda/app/status_display) -/obj/item/weapon/cartridge/ce +/obj/item/cartridge/ce name = "\improper Power-On DELUXE cartridge" icon_state = "cart-ce" programs = list( @@ -213,7 +213,7 @@ var/list/civilian_cartridges = list( new/datum/data/pda/app/status_display) -/obj/item/weapon/cartridge/cmo +/obj/item/cartridge/cmo name = "\improper Med-U DELUXE cartridge" icon_state = "cart-cmo" programs = list( @@ -224,7 +224,7 @@ var/list/civilian_cartridges = list( new/datum/data/pda/app/status_display) -/obj/item/weapon/cartridge/rd +/obj/item/cartridge/rd name = "\improper Signal Ace DELUXE cartridge" icon_state = "cart-rd" programs = list( @@ -236,11 +236,11 @@ var/list/civilian_cartridges = list( new/datum/data/pda/app/status_display) -/obj/item/weapon/cartridge/rd/Initialize() +/obj/item/cartridge/rd/Initialize() radio = new /obj/item/radio/integrated/signal(src) . = ..() -/obj/item/weapon/cartridge/captain +/obj/item/cartridge/captain name = "\improper Value-PAK cartridge" desc = "Now with 200% more value!" icon_state = "cart-c" @@ -263,7 +263,7 @@ var/list/civilian_cartridges = list( new/datum/data/pda/app/status_display) -/obj/item/weapon/cartridge/syndicate +/obj/item/cartridge/syndicate name = "\improper Detomatix cartridge" icon_state = "cart" var/initial_remote_door_id = "smindicate" //Make sure this matches the syndicate shuttle's shield/door id!! //don't ask about the name, testing. @@ -271,12 +271,12 @@ var/list/civilian_cartridges = list( programs = list(new/datum/data/pda/utility/toggle_door) messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/detonate) -/obj/item/weapon/cartridge/syndicate/New() +/obj/item/cartridge/syndicate/New() var/datum/data/pda/utility/toggle_door/D = programs[1] if(istype(D)) D.remote_door_id = initial_remote_door_id -/obj/item/weapon/cartridge/proc/post_status(var/command, var/data1, var/data2) +/obj/item/cartridge/proc/post_status(var/command, var/data1, var/data2) var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) if(!frequency) return @@ -301,7 +301,7 @@ var/list/civilian_cartridges = list( frequency.post_signal(src, status_signal) -/obj/item/weapon/cartridge/frame +/obj/item/cartridge/frame name = "F.R.A.M.E. cartridge" icon_state = "cart" charges = 5 diff --git a/code/modules/pda/cart_apps.dm b/code/modules/pda/cart_apps.dm index 0b93f261a46..a244d05815e 100644 --- a/code/modules/pda/cart_apps.dm +++ b/code/modules/pda/cart_apps.dm @@ -264,7 +264,7 @@ JaniData["user_loc"] = list("x" = 0, "y" = 0) var/MopData[0] - for(var/obj/item/weapon/mop/M in all_mops)//GLOB.janitorial_equipment) + for(var/obj/item/mop/M in all_mops)//GLOB.janitorial_equipment) var/turf/ml = get_turf(M) if(ml) if(ml.z != cl.z) diff --git a/code/modules/pda/cart_vr.dm b/code/modules/pda/cart_vr.dm index 0767e439a65..948561de50b 100644 --- a/code/modules/pda/cart_vr.dm +++ b/code/modules/pda/cart_vr.dm @@ -1,19 +1,19 @@ var/list/exploration_cartridges = list( - /obj/item/weapon/cartridge/explorer, - /obj/item/weapon/cartridge/sar + /obj/item/cartridge/explorer, + /obj/item/cartridge/sar ) -/obj/item/weapon/cartridge +/obj/item/cartridge slot_flags = SLOT_EARS -/obj/item/weapon/cartridge/explorer +/obj/item/cartridge/explorer name = "\improper Explorator cartridge" icon_state = "cart-e" programs = list( new/datum/data/pda/utility/scanmode/reagent, new/datum/data/pda/utility/scanmode/gas) -/obj/item/weapon/cartridge/sar +/obj/item/cartridge/sar name = "\improper Med-Exp cartridge" icon_state = "cart-m" programs = list( @@ -22,34 +22,34 @@ var/list/exploration_cartridges = list( new/datum/data/pda/utility/scanmode/reagent, new/datum/data/pda/utility/scanmode/gas) -/obj/item/weapon/cartridge/storage +/obj/item/cartridge/storage name = "\improper BLU-PAK cartridge" desc = "It feels heavier for some reason." w_class = ITEMSIZE_SMALL icon_state = "cart-lib" show_examine = FALSE var/slots = 1 - var/obj/item/weapon/storage/internal/hold + var/obj/item/storage/internal/hold -/obj/item/weapon/cartridge/storage/Initialize() +/obj/item/cartridge/storage/Initialize() . = ..() - hold = new/obj/item/weapon/storage/internal(src) + hold = new/obj/item/storage/internal(src) hold.max_storage_space = slots * 2 hold.max_w_class = ITEMSIZE_SMALL -/obj/item/weapon/cartridge/storage/attack_hand(mob/user as mob) +/obj/item/cartridge/storage/attack_hand(mob/user as mob) if (hold.handle_attack_hand(user)) //otherwise interact as a regular storage item ..(user) -/obj/item/weapon/cartridge/storage/attackby(obj/item/W as obj, mob/user as mob) +/obj/item/cartridge/storage/attackby(obj/item/W as obj, mob/user as mob) ..() return hold.attackby(W, user) -/obj/item/weapon/cartridge/storage/MouseDrop(obj/over_object as obj) +/obj/item/cartridge/storage/MouseDrop(obj/over_object as obj) if (hold.handle_mousedrop(usr, over_object)) ..(over_object) -/obj/item/weapon/cartridge/storage/attack_self(mob/user as mob) +/obj/item/cartridge/storage/attack_self(mob/user as mob) to_chat(user, "You empty [src].") var/turf/T = get_turf(src) hold.hide_from(usr) @@ -57,11 +57,11 @@ var/list/exploration_cartridges = list( hold.remove_from_storage(I, T) add_fingerprint(user) -/obj/item/weapon/cartridge/storage/emp_act(severity) +/obj/item/cartridge/storage/emp_act(severity) hold.emp_act(severity) ..() -/obj/item/weapon/cartridge/storage/deluxe +/obj/item/cartridge/storage/deluxe name = "\improper BLU-PAK DELUXE cartridge" programs = list( new/datum/data/pda/app/power, diff --git a/code/modules/pda/core_apps.dm b/code/modules/pda/core_apps.dm index 6e6ab500761..22dd8d69cf9 100644 --- a/code/modules/pda/core_apps.dm +++ b/code/modules/pda/core_apps.dm @@ -172,8 +172,8 @@ if(istype( usr, /mob/living/carbon/human )) var/mob/living/carbon/human/H = usr var/obj/item/I = H.get_active_hand() - if(istype(I,/obj/item/weapon/paper)) - var/obj/item/weapon/paper/P = I + if(istype(I,/obj/item/paper)) + var/obj/item/paper/P = I if(isnull(P.info) || P.info == "" ) var/titlenote = "Note [alphabet_uppercase[currentnote]]" if(!isnull(notetitle) && notetitle != "") diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm index b0f88606447..2acf25bca01 100644 --- a/code/modules/pda/messenger.dm +++ b/code/modules/pda/messenger.dm @@ -35,7 +35,7 @@ else var/convopdas[0] var/pdas[0] - for(var/obj/item/device/pda/P as anything in PDAs) + for(var/obj/item/pda/P as anything in PDAs) var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger) if(!P.owner || PM.toff || P == pda || PM.m_hidden) @@ -85,7 +85,7 @@ active_conversation = null if("Message") - var/obj/item/device/pda/P = locate(params["target"]) + var/obj/item/pda/P = locate(params["target"]) create_message(usr, P) if(params["target"] in conversations) // Need to make sure the message went through, if not welp. active_conversation = params["target"] @@ -98,7 +98,7 @@ if(!params["target"] || !params["plugin"]) return - var/obj/item/device/pda/P = locate(params["target"]) + var/obj/item/pda/P = locate(params["target"]) if(!P) to_chat(usr, "PDA not found.") @@ -117,13 +117,13 @@ switch(href_list["choice"]) if("Message") - var/obj/item/device/pda/P = locate(href_list["target"]) + var/obj/item/pda/P = locate(href_list["target"]) create_message(usr, P) if(href_list["target"] in conversations) // Need to make sure the message went through, if not welp. active_conversation = href_list["target"] -/datum/data/pda/app/messenger/proc/create_message(var/mob/living/U, var/obj/item/device/pda/P) +/datum/data/pda/app/messenger/proc/create_message(var/mob/living/U, var/obj/item/pda/P) var/t = tgui_input_text(U, "Please enter message", name, null) if(!t) return @@ -195,7 +195,7 @@ to_chat(usr, "Turn on your receiver in order to send messages.") return - for(var/obj/item/device/pda/P as anything in PDAs) + for(var/obj/item/pda/P as anything in PDAs) var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger) if(!P.owner || !PM || PM.hidden || P == pda || PM.toff) @@ -229,7 +229,7 @@ /datum/data/pda/app/messenger/multicast/receive_message(list/data, ref) . = ..() - var/obj/item/device/pda/multicaster/M = pda + var/obj/item/pda/multicaster/M = pda if(!istype(M)) return @@ -238,11 +238,11 @@ modified_message["target"] = "\ref[M]" var/list/targets = list() - for(var/obj/item/device/pda/pda in PDAs) + for(var/obj/item/pda/pda in PDAs) if(pda.cartridge && pda.owner && is_type_in_list(pda.cartridge, M.cartridges_to_send_to)) targets |= pda if(targets.len) - for(var/obj/item/device/pda/target in targets) + for(var/obj/item/pda/target in targets) var/datum/data/pda/app/messenger/P = target.find_program(/datum/data/pda/app/messenger) if(P) P.receive_message(modified_message, "\ref[M]") @@ -250,7 +250,7 @@ /* Generalized proc to handle GM fake prop messages, or future fake prop messages from mapping landmarks. We need a separate proc for this due to the "target" component and creation of a fake conversation entry. -Invoked by /obj/item/device/pda/proc/createPropFakeConversation_admin(var/mob/M) +Invoked by /obj/item/pda/proc/createPropFakeConversation_admin(var/mob/M) */ /datum/data/pda/app/messenger/proc/createFakeMessage(fakeName, fakeRef, fakeJob, sent, message) receive_message(list("sent" = sent, "owner" = "[fakeName]", "job" = "[fakeJob]", "message" = "[message]", "target" = "[fakeRef]"), fakeRef) diff --git a/code/modules/pda/messenger_plugins.dm b/code/modules/pda/messenger_plugins.dm index dd77e621a05..ebe1e9c3144 100644 --- a/code/modules/pda/messenger_plugins.dm +++ b/code/modules/pda/messenger_plugins.dm @@ -1,13 +1,13 @@ /datum/data/pda/messenger_plugin var/datum/data/pda/app/messenger/messenger -/datum/data/pda/messenger_plugin/proc/user_act(mob/user as mob, obj/item/device/pda/P) +/datum/data/pda/messenger_plugin/proc/user_act(mob/user as mob, obj/item/pda/P) /datum/data/pda/messenger_plugin/virus name = "*Send Virus*" -/datum/data/pda/messenger_plugin/virus/user_act(mob/user as mob, obj/item/device/pda/P) +/datum/data/pda/messenger_plugin/virus/user_act(mob/user as mob, obj/item/pda/P) var/datum/data/pda/app/messenger/M = P.find_program(/datum/data/pda/app/messenger) if(M && !M.toff && pda.cartridge.charges > 0) @@ -19,7 +19,7 @@ /datum/data/pda/messenger_plugin/virus/clown icon = "star" -/datum/data/pda/messenger_plugin/virus/clown/user_act(mob/user as mob, obj/item/device/pda/P) +/datum/data/pda/messenger_plugin/virus/clown/user_act(mob/user as mob, obj/item/pda/P) . = ..(user, P) if(.) user.show_message("Virus sent!", 1) @@ -30,7 +30,7 @@ /datum/data/pda/messenger_plugin/virus/mime icon = "arrow-circle-down" -/datum/data/pda/messenger_plugin/virus/mime/user_act(mob/user as mob, obj/item/device/pda/P) +/datum/data/pda/messenger_plugin/virus/mime/user_act(mob/user as mob, obj/item/pda/P) . = ..(user, P) if(.) user.show_message("Virus sent!", 1) @@ -44,7 +44,7 @@ name = "*Detonate*" icon = "exclamation-circle" -/datum/data/pda/messenger_plugin/virus/detonate/user_act(mob/user as mob, obj/item/device/pda/P) +/datum/data/pda/messenger_plugin/virus/detonate/user_act(mob/user as mob, obj/item/pda/P) . = ..(user, P) if(.) var/difficulty = 0 @@ -74,13 +74,13 @@ /datum/data/pda/messenger_plugin/virus/frame icon = "exclamation-circle" -/datum/data/pda/messenger_plugin/virus/frame/user_act(mob/user, obj/item/device/pda/P) +/datum/data/pda/messenger_plugin/virus/frame/user_act(mob/user, obj/item/pda/P) . = ..(user, P) if(.) var/lock_code = "[rand(100,999)] [pick("Alpha","Bravo","Charlie","Delta","Echo","Foxtrot","Golf","Hotel","India","Juliet","Kilo","Lima","Mike","November","Oscar","Papa","Quebec","Romeo","Sierra","Tango","Uniform","Victor","Whiskey","X-ray","Yankee","Zulu")]" user.show_message("Virus Sent! The unlock code to the target is: [lock_code]") if(!P.hidden_uplink) - var/obj/item/device/uplink/hidden/uplink = new(P) + var/obj/item/uplink/hidden/uplink = new(P) P.hidden_uplink = uplink P.lock_code = lock_code // else diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm index 5024360d5c4..d3dad05b5e6 100644 --- a/code/modules/pda/pda.dm +++ b/code/modules/pda/pda.dm @@ -1,9 +1,9 @@ //The advanced pea-green monochrome lcd of tomorrow. -var/global/list/obj/item/device/pda/PDAs = list() +var/global/list/obj/item/pda/PDAs = list() -/obj/item/device/pda +/obj/item/pda name = "\improper PDA" desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge." icon = 'icons/obj/pda_vr.dmi' //VOREStation edit @@ -17,7 +17,7 @@ var/global/list/obj/item/device/pda/PDAs = list() var/pdachoice = 1 var/owner = null var/default_cartridge = 0 // Access level defined by cartridge - var/obj/item/weapon/cartridge/cartridge = null //current cartridge + var/obj/item/cartridge/cartridge = null //current cartridge //Secondary variables var/model_name = "Thinktronic 5230 Personal Data Assistant" @@ -55,11 +55,11 @@ var/global/list/obj/item/device/pda/PDAs = list() var/hidden = 0 // Is the PDA hidden from the PDA list? var/touch_silent = 0 //If 1, no beeps on interacting. - var/obj/item/weapon/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both. + var/obj/item/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both. var/ownjob = null //related to above - this is assignment (potentially alt title) var/ownrank = null // this one is rank, never alt title - var/obj/item/device/paicard/pai = null // A slot for a personal AI device + var/obj/item/paicard/pai = null // A slot for a personal AI device var/spam_proof = FALSE // If true, it can't be spammed by random events. @@ -79,18 +79,18 @@ var/global/list/obj/item/device/pda/PDAs = list() var/list/notifying_programs = list() var/retro_mode = 0 -/obj/item/device/pda/examine(mob/user) +/obj/item/pda/examine(mob/user) . = ..() if(Adjacent(user)) . += "The time [stationtime2text()] is displayed in the corner of the screen." -/obj/item/device/pda/CtrlClick() +/obj/item/pda/CtrlClick() if(can_use(usr) && !issilicon(usr)) remove_pen() return ..() -/obj/item/device/pda/AltClick() +/obj/item/pda/AltClick() if(issilicon(usr)) return @@ -100,7 +100,7 @@ var/global/list/obj/item/device/pda/PDAs = list() else to_chat(usr, "This PDA does not have an ID in it.") -/obj/item/device/pda/proc/play_ringtone() +/obj/item/pda/proc/play_ringtone() var/S if(ttone in ttone_sound) @@ -111,7 +111,7 @@ var/global/list/obj/item/device/pda/PDAs = list() for(var/mob/O in hearers(3, loc)) O.show_message(text("[icon2html(src, O.client)] *[ttone]*")) -/obj/item/device/pda/proc/set_ringtone() +/obj/item/pda/proc/set_ringtone() var/t = tgui_input_text(usr, "Please enter new ringtone", name, ttone) if(in_range(src, usr) && loc == usr) if(t) @@ -126,7 +126,7 @@ var/global/list/obj/item/device/pda/PDAs = list() close(usr) return 0 -/obj/item/device/pda/New(var/mob/living/carbon/human/H) +/obj/item/pda/New(var/mob/living/carbon/human/H) ..() PDAs += src PDAs = sortAtom(PDAs) @@ -134,7 +134,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(default_cartridge) cartridge = new default_cartridge(src) cartridge.update_programs(src) - new /obj/item/weapon/pen(src) + new /obj/item/pen(src) pdachoice = isnull(H) ? 1 : (ishuman(H) ? H.pdachoice : 1) switch(pdachoice) if(1) @@ -181,28 +181,28 @@ var/global/list/obj/item/device/pda/PDAs = list() add_overlay("pda-pen") start_program(find_program(/datum/data/pda/app/main_menu)) -/obj/item/device/pda/proc/can_use(mob/user) +/obj/item/pda/proc/can_use(mob/user) return (tgui_status(user, GLOB.tgui_inventory_state) == STATUS_INTERACTIVE) -/obj/item/device/pda/GetAccess() +/obj/item/pda/GetAccess() if(id) return id.GetAccess() else return ..() -/obj/item/device/pda/GetID() +/obj/item/pda/GetID() return id -/obj/item/device/pda/MouseDrop(obj/over_object as obj, src_location, over_location) +/obj/item/pda/MouseDrop(obj/over_object as obj, src_location, over_location) var/mob/M = usr if((!istype(over_object, /obj/screen)) && can_use(usr)) return attack_self(M) return -/obj/item/device/pda/proc/close(mob/user) +/obj/item/pda/proc/close(mob/user) SStgui.close_uis(src) -/obj/item/device/pda/attack_self(mob/user as mob) +/obj/item/pda/attack_self(mob/user as mob) user.set_machine(src) if(active_uplink_check(user)) @@ -211,12 +211,12 @@ var/global/list/obj/item/device/pda/PDAs = list() tgui_interact(user) return -/obj/item/device/pda/proc/start_program(datum/data/pda/P) +/obj/item/pda/proc/start_program(datum/data/pda/P) if(P && ((P in programs) || (cartridge && (P in cartridge.programs)))) return P.start() return 0 -/obj/item/device/pda/proc/find_program(type) +/obj/item/pda/proc/find_program(type) var/datum/data/pda/A = locate(type) in programs if(A) return A @@ -227,14 +227,14 @@ var/global/list/obj/item/device/pda/PDAs = list() return null // force the cache to rebuild on update_ui -/obj/item/device/pda/proc/update_shortcuts() +/obj/item/pda/proc/update_shortcuts() shortcut_cache.Cut() -/obj/item/device/pda/proc/update_programs() +/obj/item/pda/proc/update_programs() for(var/datum/data/pda/P as anything in programs) P.pda = src -/obj/item/device/pda/proc/detonate_act(var/obj/item/device/pda/P) +/obj/item/pda/proc/detonate_act(var/obj/item/pda/P) //TODO: sometimes these attacks show up on the message server var/i = rand(1,100) var/j = rand(0,1) //Possibility of losing the PDA after the detonation @@ -298,7 +298,7 @@ var/global/list/obj/item/device/pda/PDAs = list() message = "[message]" M.show_message(message, 1) -/obj/item/device/pda/proc/remove_id() +/obj/item/pda/proc/remove_id() if (id) if (ismob(loc)) var/mob/M = loc @@ -310,8 +310,8 @@ var/global/list/obj/item/device/pda/PDAs = list() cut_overlay("pda-id") id = null -/obj/item/device/pda/proc/remove_pen() - var/obj/item/weapon/pen/O = locate() in src +/obj/item/pda/proc/remove_pen() + var/obj/item/pen/O = locate() in src if(O) if(istype(loc, /mob)) var/mob/M = loc @@ -324,7 +324,7 @@ var/global/list/obj/item/device/pda/PDAs = list() else to_chat(usr, "This PDA does not have a pen in it.") -/obj/item/device/pda/verb/verb_reset_pda() +/obj/item/pda/verb/verb_reset_pda() set category = "Object" set name = "Reset PDA" set src in usr @@ -340,7 +340,7 @@ var/global/list/obj/item/device/pda/PDAs = list() else to_chat(usr, "You cannot do this while restrained.") -/obj/item/device/pda/verb/verb_remove_id() +/obj/item/pda/verb/verb_remove_id() set category = "Object" set name = "Remove id" set src in usr @@ -357,7 +357,7 @@ var/global/list/obj/item/device/pda/PDAs = list() to_chat(usr, "You cannot do this while restrained.") -/obj/item/device/pda/verb/verb_remove_pen() +/obj/item/pda/verb/verb_remove_pen() set category = "Object" set name = "Remove pen" set src in usr @@ -370,7 +370,7 @@ var/global/list/obj/item/device/pda/PDAs = list() else to_chat(usr, "You cannot do this while restrained.") -/obj/item/device/pda/verb/verb_remove_cartridge() +/obj/item/pda/verb/verb_remove_cartridge() set category = "Object" set name = "Remove cartridge" set src in usr @@ -402,20 +402,20 @@ var/global/list/obj/item/device/pda/PDAs = list() start_program(find_program(/datum/data/pda/app/main_menu)) -/obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use. +/obj/item/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use. if(choice == 1) if (id) remove_id() return 1 else var/obj/item/I = user.get_active_hand() - if (istype(I, /obj/item/weapon/card/id) && user.unEquip(I)) + if (istype(I, /obj/item/card/id) && user.unEquip(I)) I.loc = src id = I return 1 else - var/obj/item/weapon/card/I = user.get_active_hand() - if (istype(I, /obj/item/weapon/card/id) && I:registered_name && user.unEquip(I)) + var/obj/item/card/I = user.get_active_hand() + if (istype(I, /obj/item/card/id) && I:registered_name && user.unEquip(I)) var/obj/old_id = id I.loc = src id = I @@ -424,9 +424,9 @@ var/global/list/obj/item/device/pda/PDAs = list() return 0 // access to status display signals -/obj/item/device/pda/attackby(obj/item/C as obj, mob/user as mob) +/obj/item/pda/attackby(obj/item/C as obj, mob/user as mob) ..() - if(istype(C, /obj/item/weapon/cartridge) && !cartridge) + if(istype(C, /obj/item/cartridge) && !cartridge) cartridge = C user.drop_item() cartridge.loc = src @@ -436,8 +436,8 @@ var/global/list/obj/item/device/pda/PDAs = list() if(cartridge.radio) cartridge.radio.hostpda = src - else if(istype(C, /obj/item/weapon/card/id)) - var/obj/item/weapon/card/id/idcard = C + else if(istype(C, /obj/item/card/id)) + var/obj/item/card/id/idcard = C if(!idcard.registered_name) to_chat(user, "\The [src] rejects the ID.") return @@ -456,14 +456,14 @@ var/global/list/obj/item/device/pda/PDAs = list() updateSelfDialog()//Update self dialog on success. return //Return in case of failed check or when successful. updateSelfDialog()//For the non-input related code. - else if(istype(C, /obj/item/device/paicard) && !src.pai) + else if(istype(C, /obj/item/paicard) && !src.pai) user.drop_item() C.loc = src pai = C to_chat(user, "You slot \the [C] into \the [src].") SStgui.update_uis(src) // update all UIs attached to src - else if(istype(C, /obj/item/weapon/pen)) - var/obj/item/weapon/pen/O = locate() in src + else if(istype(C, /obj/item/pen)) + var/obj/item/pen/O = locate() in src if(O) to_chat(user, "There is already a pen in \the [src].") else @@ -473,15 +473,15 @@ var/global/list/obj/item/device/pda/PDAs = list() add_overlay("pda-pen") return -/obj/item/device/pda/attack(mob/living/C as mob, mob/living/user as mob) +/obj/item/pda/attack(mob/living/C as mob, mob/living/user as mob) if (istype(C, /mob/living/carbon) && scanmode) scanmode.scan_mob(C, user) -/obj/item/device/pda/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) +/obj/item/pda/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) if(proximity && scanmode) scanmode.scan_atom(A, user) -/obj/item/device/pda/proc/explode() //This needs tuning. //Sure did. +/obj/item/pda/proc/explode() //This needs tuning. //Sure did. if(!src.detonate) return var/turf/T = get_turf(src.loc) if(T) @@ -489,7 +489,7 @@ var/global/list/obj/item/device/pda/PDAs = list() explosion(T, 0, 0, 1, rand(1,2)) return -/obj/item/device/pda/Destroy() +/obj/item/pda/Destroy() PDAs -= src if (src.id && prob(100) && !delete_id) //IDs are kept in 90% of the cases //VOREStation Edit - 100% of the cases, excpet when specified otherwise src.id.forceMove(get_turf(src.loc)) @@ -504,28 +504,28 @@ var/global/list/obj/item/device/pda/PDAs = list() return ..() //Some spare PDAs in a box -/obj/item/weapon/storage/box/PDAs +/obj/item/storage/box/PDAs name = "box of spare PDAs" desc = "A box of spare PDA microcomputers." icon = 'icons/obj/pda_vr.dmi' //VOREStation edit icon_state = "pdabox" -/obj/item/weapon/storage/box/PDAs/New() +/obj/item/storage/box/PDAs/New() ..() - new /obj/item/device/pda(src) - new /obj/item/device/pda(src) - new /obj/item/device/pda(src) - new /obj/item/device/pda(src) - new /obj/item/weapon/cartridge/head(src) + new /obj/item/pda(src) + new /obj/item/pda(src) + new /obj/item/pda(src) + new /obj/item/pda(src) + new /obj/item/cartridge/head(src) - var/newcart = pick( /obj/item/weapon/cartridge/engineering, - /obj/item/weapon/cartridge/security, - /obj/item/weapon/cartridge/medical, - /obj/item/weapon/cartridge/signal/science, - /obj/item/weapon/cartridge/quartermaster) + var/newcart = pick( /obj/item/cartridge/engineering, + /obj/item/cartridge/security, + /obj/item/cartridge/medical, + /obj/item/cartridge/signal/science, + /obj/item/cartridge/quartermaster) new newcart(src) // Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP -/obj/item/device/pda/emp_act(severity) +/obj/item/pda/emp_act(severity) for(var/atom/A in src) A.emp_act(severity) diff --git a/code/modules/pda/pda_subtypes.dm b/code/modules/pda/pda_subtypes.dm index 11b684b6782..feee5500d9d 100644 --- a/code/modules/pda/pda_subtypes.dm +++ b/code/modules/pda/pda_subtypes.dm @@ -1,167 +1,167 @@ -/obj/item/device/pda/medical - default_cartridge = /obj/item/weapon/cartridge/medical +/obj/item/pda/medical + default_cartridge = /obj/item/cartridge/medical icon_state = "pda-m" -/obj/item/device/pda/viro - default_cartridge = /obj/item/weapon/cartridge/medical +/obj/item/pda/viro + default_cartridge = /obj/item/cartridge/medical icon_state = "pda-v" -/obj/item/device/pda/engineering - default_cartridge = /obj/item/weapon/cartridge/engineering +/obj/item/pda/engineering + default_cartridge = /obj/item/cartridge/engineering icon_state = "pda-e" -/obj/item/device/pda/security - default_cartridge = /obj/item/weapon/cartridge/security +/obj/item/pda/security + default_cartridge = /obj/item/cartridge/security icon_state = "pda-s" -/obj/item/device/pda/detective - default_cartridge = /obj/item/weapon/cartridge/detective +/obj/item/pda/detective + default_cartridge = /obj/item/cartridge/detective icon_state = "pda-det" -/obj/item/device/pda/warden - default_cartridge = /obj/item/weapon/cartridge/security +/obj/item/pda/warden + default_cartridge = /obj/item/cartridge/security icon_state = "pda-warden" -/obj/item/device/pda/janitor - default_cartridge = /obj/item/weapon/cartridge/janitor +/obj/item/pda/janitor + default_cartridge = /obj/item/cartridge/janitor icon_state = "pda-j" ttone = "slip" -/obj/item/device/pda/science - default_cartridge = /obj/item/weapon/cartridge/signal/science +/obj/item/pda/science + default_cartridge = /obj/item/cartridge/signal/science icon_state = "pda-tox" ttone = "boom" -/obj/item/device/pda/clown - default_cartridge = /obj/item/weapon/cartridge/clown +/obj/item/pda/clown + default_cartridge = /obj/item/cartridge/clown icon_state = "pda-clown" desc = "A portable microcomputer by Thinktronic Systems, LTD. The surface is coated with polytetrafluoroethylene and banana drippings." ttone = "honk" -/obj/item/device/pda/mime - default_cartridge = /obj/item/weapon/cartridge/mime +/obj/item/pda/mime + default_cartridge = /obj/item/cartridge/mime icon_state = "pda-mime" -/obj/item/device/pda/mime/New() +/obj/item/pda/mime/New() . = ..() var/datum/data/pda/app/M = find_program(/datum/data/pda/app/messenger) if(M) M.notify_silent = TRUE -/obj/item/device/pda/heads - default_cartridge = /obj/item/weapon/cartridge/head +/obj/item/pda/heads + default_cartridge = /obj/item/cartridge/head icon_state = "pda-h" -/obj/item/device/pda/heads/hop - default_cartridge = /obj/item/weapon/cartridge/hop +/obj/item/pda/heads/hop + default_cartridge = /obj/item/cartridge/hop icon_state = "pda-hop" -/obj/item/device/pda/heads/hos - default_cartridge = /obj/item/weapon/cartridge/hos +/obj/item/pda/heads/hos + default_cartridge = /obj/item/cartridge/hos icon_state = "pda-hos" -/obj/item/device/pda/heads/ce - default_cartridge = /obj/item/weapon/cartridge/ce +/obj/item/pda/heads/ce + default_cartridge = /obj/item/cartridge/ce icon_state = "pda-ce" -/obj/item/device/pda/heads/cmo - default_cartridge = /obj/item/weapon/cartridge/cmo +/obj/item/pda/heads/cmo + default_cartridge = /obj/item/cartridge/cmo icon_state = "pda-cmo" -/obj/item/device/pda/heads/rd - default_cartridge = /obj/item/weapon/cartridge/rd +/obj/item/pda/heads/rd + default_cartridge = /obj/item/cartridge/rd icon_state = "pda-rd" -/obj/item/device/pda/captain - default_cartridge = /obj/item/weapon/cartridge/captain +/obj/item/pda/captain + default_cartridge = /obj/item/cartridge/captain icon_state = "pda-c" detonate = 0 //toff = 1 -/obj/item/device/pda/ert - default_cartridge = /obj/item/weapon/cartridge/captain +/obj/item/pda/ert + default_cartridge = /obj/item/cartridge/captain icon_state = "pda-h" detonate = 0 // hidden = 1 -/obj/item/device/pda/cargo - default_cartridge = /obj/item/weapon/cartridge/quartermaster +/obj/item/pda/cargo + default_cartridge = /obj/item/cartridge/quartermaster icon_state = "pda-cargo" -/obj/item/device/pda/quartermaster - default_cartridge = /obj/item/weapon/cartridge/quartermaster +/obj/item/pda/quartermaster + default_cartridge = /obj/item/cartridge/quartermaster icon_state = "pda-q" -/obj/item/device/pda/shaftminer +/obj/item/pda/shaftminer icon_state = "pda-miner" - default_cartridge = /obj/item/weapon/cartridge/miner + default_cartridge = /obj/item/cartridge/miner -/obj/item/device/pda/syndicate - default_cartridge = /obj/item/weapon/cartridge/syndicate +/obj/item/pda/syndicate + default_cartridge = /obj/item/cartridge/syndicate icon_state = "pda-syn" // name = "Military PDA" // Vorestation Edit // owner = "John Doe" hidden = 1 -/obj/item/device/pda/chaplain - default_cartridge = /obj/item/weapon/cartridge/service +/obj/item/pda/chaplain + default_cartridge = /obj/item/cartridge/service icon_state = "pda-holy" ttone = "holy" -/obj/item/device/pda/lawyer - default_cartridge = /obj/item/weapon/cartridge/lawyer +/obj/item/pda/lawyer + default_cartridge = /obj/item/cartridge/lawyer icon_state = "pda-lawyer" ttone = "..." -/obj/item/device/pda/botanist - default_cartridge = /obj/item/weapon/cartridge/service +/obj/item/pda/botanist + default_cartridge = /obj/item/cartridge/service icon_state = "pda-hydro" -/obj/item/device/pda/roboticist - default_cartridge = /obj/item/weapon/cartridge/signal/science +/obj/item/pda/roboticist + default_cartridge = /obj/item/cartridge/signal/science icon_state = "pda-robot" -/obj/item/device/pda/librarian - default_cartridge = /obj/item/weapon/cartridge/service +/obj/item/pda/librarian + default_cartridge = /obj/item/cartridge/service icon_state = "pda-libb" desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a WGW-11 series e-reader." model_name = "Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant" -/obj/item/device/pda/librarian/New() +/obj/item/pda/librarian/New() . = ..() var/datum/data/pda/app/M = find_program(/datum/data/pda/app/messenger) if(M) M.notify_silent = TRUE //Quiet in the library! -/obj/item/device/pda/clear +/obj/item/pda/clear icon_state = "pda-transp" desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a special edition with a transparent case." model_name = "Thinktronic 5230 Personal Data Assistant Deluxe Special Max Turbo Limited Edition" -/obj/item/device/pda/chef - default_cartridge = /obj/item/weapon/cartridge/service +/obj/item/pda/chef + default_cartridge = /obj/item/cartridge/service icon_state = "pda-chef" -/obj/item/device/pda/bar - default_cartridge = /obj/item/weapon/cartridge/service +/obj/item/pda/bar + default_cartridge = /obj/item/cartridge/service icon_state = "pda-bar" -/obj/item/device/pda/atmos - default_cartridge = /obj/item/weapon/cartridge/atmos +/obj/item/pda/atmos + default_cartridge = /obj/item/cartridge/atmos icon_state = "pda-atmo" -/obj/item/device/pda/chemist - default_cartridge = /obj/item/weapon/cartridge/chemistry +/obj/item/pda/chemist + default_cartridge = /obj/item/cartridge/chemistry icon_state = "pda-chem" -/obj/item/device/pda/geneticist - default_cartridge = /obj/item/weapon/cartridge/medical +/obj/item/pda/geneticist + default_cartridge = /obj/item/cartridge/medical icon_state = "pda-gene" // Used for the PDA multicaster, which mirrors messages sent to it to a specific department, -/obj/item/device/pda/multicaster +/obj/item/pda/multicaster ownjob = "Relay" icon_state = "NONE" detonate = 0 @@ -171,76 +171,76 @@ ) var/list/cartridges_to_send_to = list() -/obj/item/device/pda/multicaster/command/New() +/obj/item/pda/multicaster/command/New() ..() owner = "Command Department" name = "Command Department (Relay)" cartridges_to_send_to = command_cartridges -/obj/item/device/pda/multicaster/security/New() +/obj/item/pda/multicaster/security/New() ..() owner = "Security Department" name = "Security Department (Relay)" cartridges_to_send_to = security_cartridges -/obj/item/device/pda/multicaster/engineering/New() +/obj/item/pda/multicaster/engineering/New() ..() owner = "Engineering Department" name = "Engineering Department (Relay)" cartridges_to_send_to = engineering_cartridges -/obj/item/device/pda/multicaster/medical/New() +/obj/item/pda/multicaster/medical/New() ..() owner = "Medical Department" name = "Medical Department (Relay)" cartridges_to_send_to = medical_cartridges -/obj/item/device/pda/multicaster/research/New() +/obj/item/pda/multicaster/research/New() ..() owner = "Research Department" name = "Research Department (Relay)" cartridges_to_send_to = research_cartridges -/obj/item/device/pda/multicaster/cargo/New() +/obj/item/pda/multicaster/cargo/New() ..() owner = "Cargo Department" name = "Cargo Department (Relay)" cartridges_to_send_to = cargo_cartridges -/obj/item/device/pda/multicaster/civilian/New() +/obj/item/pda/multicaster/civilian/New() ..() owner = "Civilian Services Department" name = "Civilian Services Department (Relay)" cartridges_to_send_to = civilian_cartridges -/obj/item/device/pda/clown/Crossed(atom/movable/AM as mob|obj) //Clown PDA is slippery. +/obj/item/pda/clown/Crossed(atom/movable/AM as mob|obj) //Clown PDA is slippery. if(AM.is_incorporeal()) return if (istype(AM, /mob/living)) var/mob/living/M = AM - if(M.slip("the PDA",8) && M.real_name != src.owner && istype(src.cartridge, /obj/item/weapon/cartridge/clown)) + if(M.slip("the PDA",8) && M.real_name != src.owner && istype(src.cartridge, /obj/item/cartridge/clown)) if(src.cartridge.charges < 5) src.cartridge.charges++ //Some spare PDAs in a box -/obj/item/weapon/storage/box/PDAs +/obj/item/storage/box/PDAs name = "box of spare PDAs" desc = "A box of spare PDA microcomputers." icon = 'icons/obj/pda.dmi' icon_state = "pdabox" -/obj/item/weapon/storage/box/PDAs/New() +/obj/item/storage/box/PDAs/New() ..() - new /obj/item/device/pda(src) - new /obj/item/device/pda(src) - new /obj/item/device/pda(src) - new /obj/item/device/pda(src) - new /obj/item/weapon/cartridge/head(src) + new /obj/item/pda(src) + new /obj/item/pda(src) + new /obj/item/pda(src) + new /obj/item/pda(src) + new /obj/item/cartridge/head(src) - var/newcart = pick( /obj/item/weapon/cartridge/engineering, - /obj/item/weapon/cartridge/security, - /obj/item/weapon/cartridge/medical, - /obj/item/weapon/cartridge/signal/science, - /obj/item/weapon/cartridge/quartermaster) + var/newcart = pick( /obj/item/cartridge/engineering, + /obj/item/cartridge/security, + /obj/item/cartridge/medical, + /obj/item/cartridge/signal/science, + /obj/item/cartridge/quartermaster) new newcart(src) diff --git a/code/modules/pda/pda_tgui.dm b/code/modules/pda/pda_tgui.dm index 036ec1fbe47..40cf2154949 100644 --- a/code/modules/pda/pda_tgui.dm +++ b/code/modules/pda/pda_tgui.dm @@ -1,14 +1,14 @@ // Self contained file for all things TGUI -/obj/item/device/pda/tgui_state(mob/user) +/obj/item/pda/tgui_state(mob/user) return GLOB.tgui_inventory_state -/obj/item/device/pda/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) +/obj/item/pda/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Pda", "Personal Data Assistant", parent_ui) ui.open() -/obj/item/device/pda/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) +/obj/item/pda/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = ..() data["owner"] = owner // Who is your daddy... @@ -59,7 +59,7 @@ return data -/obj/item/device/pda/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) +/obj/item/pda/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) if(..()) return TRUE @@ -85,7 +85,7 @@ var/turf/T = loc if(ismob(T)) T = T.loc - var/obj/item/weapon/cartridge/C = cartridge + var/obj/item/cartridge/C = cartridge C.forceMove(T) if(scanmode in C.programs) scanmode = null diff --git a/code/modules/pda/pda_vr.dm b/code/modules/pda/pda_vr.dm index d469efea076..5eac329d531 100644 --- a/code/modules/pda/pda_vr.dm +++ b/code/modules/pda/pda_vr.dm @@ -1,29 +1,29 @@ -/obj/item/device/pda +/obj/item/pda var/delete_id = FALSE //Guaranteed deletion of ID upon deletion of PDA -/obj/item/device/pda/multicaster/exploration/New() +/obj/item/pda/multicaster/exploration/New() ..() owner = "Away Team" name = "Away Team (Relay)" cartridges_to_send_to = exploration_cartridges -/obj/item/device/pda/centcom - default_cartridge = /obj/item/weapon/cartridge/captain +/obj/item/pda/centcom + default_cartridge = /obj/item/cartridge/captain icon_state = "pda-h" detonate = 0 // hidden = 1 -/obj/item/device/pda/pathfinder - default_cartridge = /obj/item/weapon/cartridge/explorer +/obj/item/pda/pathfinder + default_cartridge = /obj/item/cartridge/explorer icon_state = "pda-transp" //Might as well let this sprite actually get seen, otherwise it's going to be hidden forever. -/obj/item/device/pda/explorer - default_cartridge = /obj/item/weapon/cartridge/explorer +/obj/item/pda/explorer + default_cartridge = /obj/item/cartridge/explorer icon_state = "pda-explore" //Explorer's can get the PF's old style instead, rather than re-using the detective PDA -/obj/item/device/pda/sar - default_cartridge = /obj/item/weapon/cartridge/sar +/obj/item/pda/sar + default_cartridge = /obj/item/cartridge/sar icon_state = "pda-sar" //Gives FM's a distinct PDA of their own, rather than sharing with the bridge-secretary & CCO's. -/obj/item/device/pda/pilot +/obj/item/pda/pilot icon_state = "pda-pilot" //New sprites, but still no ROM cartridge or anything diff --git a/code/modules/pda/radio.dm b/code/modules/pda/radio.dm index 87177c18e36..b16db773cd9 100644 --- a/code/modules/pda/radio.dm +++ b/code/modules/pda/radio.dm @@ -3,23 +3,23 @@ desc = "An electronic radio system." icon = 'icons/obj/module.dmi' icon_state = "power_mod" - var/obj/item/device/pda/hostpda = null + var/obj/item/pda/hostpda = null var/list/botlist = null // list of bots var/mob/living/bot/active // the active bot; if null, show bot list var/list/botstatus // the status signal sent by the bot - + var/bot_type //The type of bot it is. var/bot_filter //Determines which radio filter to use. var/control_freq = BOT_FREQ - var/on = 0 //Are we currently active?? + on = 0 //Are we currently active?? var/menu_message = "" /obj/item/radio/integrated/New() ..() - if(istype(loc.loc, /obj/item/device/pda)) + if(istype(loc.loc, /obj/item/pda)) hostpda = loc.loc if(bot_filter) spawn(5) @@ -95,10 +95,8 @@ * Radio Cartridge, essentially a signaler. */ /obj/item/radio/integrated/signal - var/frequency = 1457 + frequency = 1457 var/code = 30.0 - var/last_transmission - var/datum/radio_frequency/radio_connection /obj/item/radio/integrated/signal/Destroy() if(radio_controller) @@ -113,7 +111,7 @@ src.frequency = sanitize_frequency(src.frequency) set_frequency(frequency) -/obj/item/radio/integrated/signal/proc/set_frequency(new_frequency) +/obj/item/radio/integrated/signal/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) frequency = new_frequency radio_connection = radio_controller.add_object(src, frequency) diff --git a/code/modules/pda/utilities.dm b/code/modules/pda/utilities.dm index 65c2484378c..9f065baf0a1 100644 --- a/code/modules/pda/utilities.dm +++ b/code/modules/pda/utilities.dm @@ -143,8 +143,8 @@ notes = pda.find_program(/datum/data/pda/app/notekeeper) /datum/data/pda/utility/scanmode/notes/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob) - if(notes && istype(A, /obj/item/weapon/paper)) - var/obj/item/weapon/paper/P = A + if(notes && istype(A, /obj/item/paper)) + var/obj/item/paper/P = A var/list/brlist = list("p", "/p", "br", "hr", "h1", "h2", "h3", "h4", "/h1", "/h2", "/h3", "/h4") // JMO 20140705: Makes scanned document show up properly in the notes. Not pretty for formatted documents, diff --git a/code/modules/persistence/effects/paper.dm b/code/modules/persistence/effects/paper.dm index 35c13510db7..9b8943e3ba5 100644 --- a/code/modules/persistence/effects/paper.dm +++ b/code/modules/persistence/effects/paper.dm @@ -2,7 +2,7 @@ name = "paper" entries_expire_at = 50 has_admin_data = TRUE - var/paper_type = /obj/item/weapon/paper + var/paper_type = /obj/item/paper var/requires_noticeboard = TRUE /datum/persistent/paper/CheckTurfContents(var/turf/T, var/list/token) @@ -14,7 +14,7 @@ var/obj/structure/noticeboard/board = locate() in creating if(requires_noticeboard && LAZYLEN(board.notices) >= board.max_notices) return - var/obj/item/weapon/paper/paper = new paper_type(creating) + var/obj/item/paper/paper = new paper_type(creating) paper.info = token["message"] paper.name = token["title"] if(!paper.name) @@ -28,18 +28,18 @@ return paper /datum/persistent/paper/GetEntryAge(var/atom/entry) - var/obj/item/weapon/paper/paper = entry + var/obj/item/paper/paper = entry return paper.age /datum/persistent/paper/CompileEntry(var/atom/entry, var/write_file) . = ..() - var/obj/item/weapon/paper/paper = entry + var/obj/item/paper/paper = entry LAZYADDASSOC(., "author", "[paper.last_modified_ckey ? paper.last_modified_ckey : "unknown"]") LAZYADDASSOC(., "message", "[paper.info]") LAZYADDASSOC(., "name", "[paper.name]") /datum/persistent/paper/GetAdminDataStringFor(var/thing, var/can_modify, var/mob/user) - var/obj/item/weapon/paper/paper = thing + var/obj/item/paper/paper = thing if(can_modify) . = "
[paper.info][paper.name][paper.last_modified_ckey]Destroy